diff --git a/configure.py b/configure.py
index 0200b527bf..9318d6967c 100755
--- a/configure.py
+++ b/configure.py
@@ -392,14 +392,12 @@ cflags_revolution_base = [
 cflags_revolution_retail = [
     *cflags_revolution_base,
     "-O4,p",
-    "-DSDK_SEP2006",
 ]
 
 cflags_revolution_debug = [
     *cflags_revolution_base,
     "-opt off",
     "-DDEBUG=1",
-    "-DSDK_AUG2010",
 ]
 
 # Framework flags
@@ -475,7 +473,15 @@ def RevolutionLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
         return {
             "lib": lib_name,
             "mw_version": "Wii/1.0",
-            "cflags": cflags_revolution_debug,
+            "cflags": [*cflags_revolution_debug, "-DSDK_AUG2010"],
+            "progress_category": "sdk",
+            "objects": objects,
+        }
+    elif config.version == "Shield":
+        return {
+            "lib": lib_name,
+            "mw_version": "Wii/1.0",
+            "cflags": [*cflags_revolution_retail, "-DSDK_AUG2010"],
             "progress_category": "sdk",
             "objects": objects,
         }
@@ -483,7 +489,7 @@ def RevolutionLib(lib_name: str, objects: List[Object]) -> Dict[str, Any]:
         return {
             "lib": lib_name,
             "mw_version": "GC/3.0a3",
-            "cflags": cflags_revolution_retail,
+            "cflags": [*cflags_revolution_retail, "-DSDK_SEP2006"],
             "progress_category": "sdk",
             "objects": objects,
         }
@@ -1458,29 +1464,29 @@ config.libs = [
             Object(MatchingFor("ShieldD"), "revolution/os/OS.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSAddress.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSAlarm.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSAlloc.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSArena.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSAudioSystem.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSCache.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSAlloc.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSArena.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSAudioSystem.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSCache.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSContext.c"),
             Object(NonMatching, "revolution/os/OSError.c"),
             Object(NonMatching, "revolution/os/OSExec.c"),
             Object(NonMatching, "revolution/os/OSFatal.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSFont.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSInterrupt.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSLink.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSMessage.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSFont.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSInterrupt.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSLink.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSMessage.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSMemory.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSMutex.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSMutex.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSReboot.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSReset.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSRtc.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSRtc.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSStopwatch.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSSync.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSSync.c"),
             Object(NonMatching, "revolution/os/OSThread.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSTime.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSUtf.c"),
-            Object(MatchingFor("ShieldD"), "revolution/os/OSIpc.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSTime.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSUtf.c"),
+            Object(MatchingFor("ShieldD", "RZDE01_00"), "revolution/os/OSIpc.c"),
             Object(NonMatching, "revolution/os/OSStateTM.c"),
             Object(NonMatching, "revolution/os/OSPlayRecord.c"),
             Object(MatchingFor("ShieldD"), "revolution/os/OSStateFlags.c"),
diff --git a/include/DynamicLink.h b/include/DynamicLink.h
index fc07cec7d4..faf9a14322 100644
--- a/include/DynamicLink.h
+++ b/include/DynamicLink.h
@@ -16,28 +16,28 @@ struct DynamicModuleControlBase {
     /* 0x08 */ DynamicModuleControlBase* mNext;
 
     /* 0x0C */ /*vtable*/
-    /* 802621CC */ virtual ~DynamicModuleControlBase();
-    /* 800188DC */ virtual const char* getModuleName() const { return NULL; };
-    /* 80263210 */ virtual int getModuleSize() const { return 0; };
-    /* 80263200 */ virtual const char* getModuleTypeString() const {return "Base";};
+    virtual ~DynamicModuleControlBase();
+    virtual const char* getModuleName() const { return NULL; };
+    virtual int getModuleSize() const { return 0; };
+    virtual const char* getModuleTypeString() const {return "Base";};
 #if __MWERKS__ && __MWERKS__ < 0x4200
     // This is illegal function overloading, but MWCC for GC allows it. MWCC for Wii does not.
     virtual void dump();
 #endif
-    /* 80262470 */ static void dump();
+    static void dump();
     static void dump(char*);
 
-    /* 802631FC */ virtual void dump2() {};
-    /* 802631DC */ virtual bool do_load() {return true;};
-    /* 802631F4 */ virtual BOOL do_load_async() {return true;};
-    /* 802631E4 */ virtual bool do_unload() {return true;};
-    /* 802631D4 */ virtual BOOL do_link() {return TRUE;};
-    /* 802631EC */ virtual bool do_unlink() {return true; };
-    /* 80262284 */ DynamicModuleControlBase();
-    /* 802622D0 */ BOOL link();
-    /* 80262364 */ BOOL unlink();
-    /* 802623EC */ BOOL load_async();
-    /* 8026242C */ bool force_unlink();
+    virtual void dump2() {};
+    virtual bool do_load() {return true;};
+    virtual BOOL do_load_async() {return true;};
+    virtual bool do_unload() {return true;};
+    virtual BOOL do_link() {return TRUE;};
+    virtual bool do_unlink() {return true; };
+    DynamicModuleControlBase();
+    BOOL link();
+    BOOL unlink();
+    BOOL load_async();
+    bool force_unlink();
     static JKRHeap* createHeap(u32, JKRHeap*);
 
     static inline DynamicModuleControlBase* getFirstClass() { return mFirst; }
@@ -64,21 +64,21 @@ struct DynamicModuleControlBase {
 };
 
 struct DynamicModuleControl : DynamicModuleControlBase {
-    /* 80263218 */ virtual const char* getModuleName() const { return mName; };
-    /* 800188E4 */ virtual ~DynamicModuleControl() {}
-    /* 80263000 */ virtual int getModuleSize() const;
-    /* 80263070 */ virtual const char* getModuleTypeString() const;
+    virtual const char* getModuleName() const { return mName; };
+    virtual ~DynamicModuleControl() {}
+    virtual int getModuleSize() const;
+    virtual const char* getModuleTypeString() const;
     // virtual void dump();
-    /* 80262C0C */ virtual void dump2();
-    /* 802627E8 */ virtual bool do_load();
-    /* 80262AFC */ virtual BOOL do_load_async();
-    /* 80262BC4 */ virtual bool do_unload();
-    /* 80262C5C */ virtual BOOL do_link();
-    /* 80262F28 */ virtual bool do_unlink();
-    /* 80262660 */ DynamicModuleControl(char const*);
-    /* 802626D0 */ static JKRArchive* mountCallback(void*);
-    /* 8026275C */ static bool initialize();
-    /* 80262794 */ static bool callback(void*);
+    virtual void dump2();
+    virtual bool do_load();
+    virtual BOOL do_load_async();
+    virtual bool do_unload();
+    virtual BOOL do_link();
+    virtual bool do_unlink();
+    DynamicModuleControl(char const*);
+    static JKRArchive* mountCallback(void*);
+    static bool initialize();
+    static bool callback(void*);
 
     /* 0x10 */ OSModuleHeader* mModule;
     /* 0x14 */ void* mBss;
diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h
index e29ddd0e17..35010e62fb 100644
--- a/include/JSystem/J2DGraph/J2DAnimation.h
+++ b/include/JSystem/J2DGraph/J2DAnimation.h
@@ -30,8 +30,8 @@ public:
         mFrame = 0;
         mFrameMax = 0;
     }
-    /* 80053C94 */ virtual ~J2DAnmBase() {}
-    /* 800569B0 */ virtual void searchUpdateMaterialID(J2DScreen*) {}
+    virtual ~J2DAnmBase() {}
+    virtual void searchUpdateMaterialID(J2DScreen*) {}
 
     s16 getFrameMax() const { return mFrameMax; }
     void setFrame(f32 frame) { mFrame = frame; }
@@ -61,8 +61,8 @@ public:
             mVtxColorIndexData[i] = NULL;
         }
     }
-    /* 8030A358 */ virtual ~J2DAnmVtxColor() {}
-    /* 8030363C */ virtual void getColor(u8, u16, _GXColor*) const {}
+    virtual ~J2DAnmVtxColor() {}
+    virtual void getColor(u8, u16, _GXColor*) const {}
     u16 getAnmTableNum(u8 param_0) const { return mAnmTableNum[param_0]; }
     J3DAnmVtxColorIndexData* getAnmVtxColorIndexData(u8 param_1, u16 param_2) const {
         J3D_PANIC(344, param_1 < 2, "Error : range over.");
@@ -90,8 +90,8 @@ public:
             mInfoTable[i] = NULL;
         }
     }
-    /* 8030CC20 */ virtual ~J2DAnmVtxColorKey() {}
-    /* 8030B704 */ virtual void getColor(u8, u16, _GXColor*) const;
+    virtual ~J2DAnmVtxColorKey() {}
+    virtual void getColor(u8, u16, _GXColor*) const;
 
     /* 0x24 */ J3DAnmColorKeyTable* mInfoTable[2];
     /* 0x2C */ s16* mRValues;
@@ -111,8 +111,8 @@ public:
             mInfoTable[i] = NULL;
         }
     }
-    /* 8030CC8C */ virtual ~J2DAnmVtxColorFull() {}
-    /* 8030B4C4 */ virtual void getColor(u8, u16, _GXColor*) const;
+    virtual ~J2DAnmVtxColorFull() {}
+    virtual void getColor(u8, u16, _GXColor*) const;
 
     /* 0x24 */ J3DAnmColorFullTable* mInfoTable[2];
     /* 0x2C */ u8* mRValues;
@@ -134,8 +134,8 @@ public:
         mValues = NULL;
         mKind = KIND_VISIBILITY;
     }
-    /* 8030A3B4 */ virtual ~J2DAnmVisibilityFull() {}
-    /* 8030C048 */ void getVisibility(u16, u8*) const;
+    virtual ~J2DAnmVisibilityFull() {}
+    void getVisibility(u16, u8*) const;
 
     /* 0x10 */ u16 field_0x10;
     /* 0x12 */ u16 field_0x12;
@@ -155,8 +155,8 @@ public:
         mTranslateValues = pTranslateValues;
         mKind = KIND_TRANSFORM;
     }
-    /* 80184370 */ virtual ~J2DAnmTransform() {}
-    /* 80191130 */ virtual void getTransform(u16, J3DTransformInfo*) const {}
+    virtual ~J2DAnmTransform() {}
+    virtual void getTransform(u16, J3DTransformInfo*) const {}
 
     /* 0x10 */ f32* mScaleValues;
     /* 0x14 */ s16* mRotationValues;
@@ -173,11 +173,11 @@ public:
         field_0x24 = 0;
         mInfoTable = NULL;
     }
-    /* 801959C0 */ virtual ~J2DAnmTransformKey() {}
-    /* 8030CD7C */ virtual void getTransform(u16 p1, J3DTransformInfo* pInfo) const {
+    virtual ~J2DAnmTransformKey() {}
+    virtual void getTransform(u16 p1, J3DTransformInfo* pInfo) const {
         this->calcTransform(getFrame(), p1, pInfo);
     }
-    /* 8030AAFC */ virtual void calcTransform(f32, u16, J3DTransformInfo*) const;
+    virtual void calcTransform(f32, u16, J3DTransformInfo*) const;
 
     /* 0x1C */ u8 field_0x1c[6];
     /* 0x22 */ s16 field_0x22;
@@ -192,8 +192,8 @@ public:
 class J2DAnmTransformFull : public J2DAnmTransform {
 public:
     J2DAnmTransformFull() : J2DAnmTransform(NULL, NULL, NULL) { mTableInfo = NULL; }
-    /* 8030CDAC */ virtual ~J2DAnmTransformFull() {}
-    /* 8030A590 */ virtual void getTransform(u16, J3DTransformInfo*) const;
+    virtual ~J2DAnmTransformFull() {}
+    virtual void getTransform(u16, J3DTransformInfo*) const;
 
     /* 0x1C */ u8 field_0x1c[6];
     /* 0x22 */ u16 field_0x22;
@@ -227,10 +227,10 @@ public:
         field_0x7c = 0;
         mKind = KIND_TEXTURE_SRT;
     }
-    /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
+    void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
 
-    /* 80184274 */ virtual ~J2DAnmTextureSRTKey() {}
-    /* 8030BC60 */ virtual void searchUpdateMaterialID(J2DScreen*);
+    virtual ~J2DAnmTextureSRTKey() {}
+    virtual void searchUpdateMaterialID(J2DScreen*);
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum / 3; }
     u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
     u8 getUpdateTexMtxID(u16 i) const { return mUpdateTexMtxID[i]; }
@@ -273,8 +273,8 @@ public:
 class J2DAnmTexPattern : public J2DAnmBase {
 public:
     struct J2DAnmTexPatternTIMGPointer {
-        /* 8030CB2C */ J2DAnmTexPatternTIMGPointer();
-        /* 8030CB3C */ ~J2DAnmTexPatternTIMGPointer();
+        J2DAnmTexPatternTIMGPointer();
+        ~J2DAnmTexPatternTIMGPointer();
 
         /* 0x0 */ ResTIMG* mRes;
         /* 0x4 */ JUTPalette* mPalette;
@@ -289,12 +289,12 @@ public:
         mTIMGPtrArray = NULL;
     }
 
-    /* 8030BEE8 */ void getTexNo(u16, u16*) const;
-    /* 8030BF9C */ ResTIMG* getResTIMG(u16) const;
-    /* 8030BFF0 */ JUTPalette* getPalette(u16) const;
+    void getTexNo(u16, u16*) const;
+    ResTIMG* getResTIMG(u16) const;
+    JUTPalette* getPalette(u16) const;
 
-    /* 8030CB90 */ virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; }
-    /* 8030BD10 */ virtual void searchUpdateMaterialID(J2DScreen*);
+    virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; }
+    virtual void searchUpdateMaterialID(J2DScreen*);
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
     u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
     J3DAnmTexPatternFullTable* getAnmTable() const { return mAnmTable; }
@@ -337,11 +337,11 @@ public:
         mKRValues = NULL;
         mKind = KIND_TEV_REG;
     }
-    /* 8030C0F0 */ void getTevColorReg(u16, _GXColorS10*) const;
-    /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
+    void getTevColorReg(u16, _GXColorS10*) const;
+    void getTevKonstReg(u16, _GXColor*) const;
 
-    /* 801841EC */ virtual ~J2DAnmTevRegKey() {}
-    /* 8030C678 */ virtual void searchUpdateMaterialID(J2DScreen* pScreen);
+    virtual ~J2DAnmTevRegKey() {}
+    virtual void searchUpdateMaterialID(J2DScreen* pScreen);
 
     u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
     u16 getCRegUpdateMaterialID(u16 i) const { return mCRegUpdateMaterialID[i]; }
@@ -393,9 +393,9 @@ public:
         mUpdateMaterialID = NULL;
         mKind = KIND_COLOR;
     }
-    /* 801842FC */ virtual ~J2DAnmColor() {}
-    /* 8030AF24 */ virtual void searchUpdateMaterialID(J2DScreen*);
-    /* 802EB390 */ virtual void getColor(u16, _GXColor*) const {}
+    virtual ~J2DAnmColor() {}
+    virtual void searchUpdateMaterialID(J2DScreen*);
+    virtual void getColor(u16, _GXColor*) const {}
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
     u16 getUpdateMaterialID(u16 i) const { return mUpdateMaterialID[i]; }
 
@@ -421,8 +421,8 @@ public:
         mAValues = NULL;
         mInfoTable = NULL;
     }
-    /* 80239BE0 */ virtual ~J2DAnmColorKey() {}
-    /* 8030B200 */ virtual void getColor(u16, _GXColor*) const;
+    virtual ~J2DAnmColorKey() {}
+    virtual void getColor(u16, _GXColor*) const;
 
     /* 0x30 */ s16* mRValues;
     /* 0x34 */ s16* mGValues;
@@ -459,8 +459,8 @@ public:
         mAValues = NULL;
         mInfoTable = NULL;
     }
-    /* 8030CCF8 */ virtual ~J2DAnmColorFull() {}
-    /* 8030AFC8 */ virtual void getColor(u16, _GXColor*) const;
+    virtual ~J2DAnmColorFull() {}
+    virtual void getColor(u16, _GXColor*) const;
 
     /* 0x30 */ u8* mRValues;
     /* 0x34 */ u8* mGValues;
@@ -482,6 +482,7 @@ template <>
 inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, register s16* pp3,
                                         register s16* pp4, register s16* pp5, register s16* pp6,
                                         register s16* pp7) {
+#ifdef __MWERKS__
     register f32 p1 = pp1;
     register f32 ff8;
     register f32 ff7;
@@ -499,7 +500,6 @@ inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, reg
     register s16* p6 = pp6;
     register s16* p7 = pp7;
     // clang-format off
-#ifdef __MWERKS__
     asm {
         psq_l ff2, 0(p2), 0x1, 5
         psq_l ff0, 0(p5), 0x1, 5
@@ -522,9 +522,9 @@ inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, reg
         fmadds fout, ff4, ff2, fout
         fsubs fout, fout, ff0
     }
-#endif
     // clang-format on
     return fout;
+#endif
 }
 
 #endif /* J2DANIMATION_H */
diff --git a/include/JSystem/J2DGraph/J2DAnmLoader.h b/include/JSystem/J2DGraph/J2DAnmLoader.h
index be7b04ec63..99e400a6ff 100644
--- a/include/JSystem/J2DGraph/J2DAnmLoader.h
+++ b/include/JSystem/J2DGraph/J2DAnmLoader.h
@@ -8,7 +8,7 @@
  * 
  */
 struct J2DAnmLoaderDataBase {
-    /* 80308A6C */ static J2DAnmBase* load(void const*);
+    static J2DAnmBase* load(void const*);
 };
 
 /**
@@ -19,7 +19,7 @@ class J2DAnmLoader {
 public:
     virtual void* load(void const*) = 0;
     virtual void setResource(J2DAnmBase*, void const*) = 0;
-    /* 8030A410 */ virtual ~J2DAnmLoader() {}
+    virtual ~J2DAnmLoader() {}
 
     void* mpResource;
 };
@@ -41,21 +41,21 @@ struct J3DAnmTransformKeyData;
  */
 class J2DAnmKeyLoader_v15 : public J2DAnmLoader {
 public:
-    /* 80309290 */ J2DAnmKeyLoader_v15();
-    /* 80309570 */ void readAnmTransform(J3DAnmTransformKeyData const*);
-    /* 80309598 */ void setAnmTransform(J2DAnmTransformKey*, J3DAnmTransformKeyData const*);
-    /* 80309634 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
-    /* 8030965C */ void setAnmTextureSRT(J2DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
-    /* 80309848 */ void readAnmColor(J3DAnmColorKeyData const*);
-    /* 80309870 */ void setAnmColor(J2DAnmColorKey*, J3DAnmColorKeyData const*);
-    /* 8030995C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
-    /* 80309984 */ void setAnmVtxColor(J2DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
-    /* 80309FDC */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
-    /* 8030A004 */ void setAnmTevReg(J2DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
+    J2DAnmKeyLoader_v15();
+    void readAnmTransform(J3DAnmTransformKeyData const*);
+    void setAnmTransform(J2DAnmTransformKey*, J3DAnmTransformKeyData const*);
+    void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
+    void setAnmTextureSRT(J2DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
+    void readAnmColor(J3DAnmColorKeyData const*);
+    void setAnmColor(J2DAnmColorKey*, J3DAnmColorKeyData const*);
+    void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
+    void setAnmVtxColor(J2DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
+    void readAnmTevReg(J3DAnmTevRegKeyData const*);
+    void setAnmTevReg(J2DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
 
-    /* 80309308 */ virtual void* load(void const*);
-    /* 80309414 */ virtual void setResource(J2DAnmBase*, void const*);
-    /* 803092AC */ virtual ~J2DAnmKeyLoader_v15();
+    virtual void* load(void const*);
+    virtual void setResource(J2DAnmBase*, void const*);
+    virtual ~J2DAnmKeyLoader_v15();
 
     // /* 0x04 */ void* _4;
 };
@@ -66,21 +66,21 @@ public:
  */
 class J2DAnmFullLoader_v15 : public J2DAnmLoader {
 public:
-    /* 80309CE8 */ J2DAnmFullLoader_v15();
-    /* 80309D60 */ void readAnmTransform(J3DAnmTransformFullData const*);
-    /* 80309D88 */ void setAnmTransform(J2DAnmTransformFull*, J3DAnmTransformFullData const*);
-    /* 80309E1C */ void readAnmColor(J3DAnmColorFullData const*);
-    /* 80309E44 */ void setAnmColor(J2DAnmColorFull*, J3DAnmColorFullData const*);
-    /* 80309F10 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
-    /* 80309F38 */ void setAnmTexPattern(J2DAnmTexPattern*, J3DAnmTexPatternFullData const*);
-    /* 8030A190 */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
-    /* 8030A1B8 */ void setAnmVisibility(J2DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
-    /* 8030A234 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
-    /* 8030A25C */ void setAnmVtxColor(J2DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
+    J2DAnmFullLoader_v15();
+    void readAnmTransform(J3DAnmTransformFullData const*);
+    void setAnmTransform(J2DAnmTransformFull*, J3DAnmTransformFullData const*);
+    void readAnmColor(J3DAnmColorFullData const*);
+    void setAnmColor(J2DAnmColorFull*, J3DAnmColorFullData const*);
+    void readAnmTexPattern(J3DAnmTexPatternFullData const*);
+    void setAnmTexPattern(J2DAnmTexPattern*, J3DAnmTexPatternFullData const*);
+    void readAnmVisibility(J3DAnmVisibilityFullData const*);
+    void setAnmVisibility(J2DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
+    void readAnmVtxColor(J3DAnmVtxColorFullData const*);
+    void setAnmVtxColor(J2DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
 
-    /* 80309A80 */ virtual void* load(void const*);
-    /* 80309B8C */ virtual void setResource(J2DAnmBase*, void const*);
-    /* 80309D04 */ virtual ~J2DAnmFullLoader_v15();
+    virtual void* load(void const*);
+    virtual void setResource(J2DAnmBase*, void const*);
+    virtual ~J2DAnmFullLoader_v15();
 
     // void* _4;
 };
diff --git a/include/JSystem/J2DGraph/J2DGrafContext.h b/include/JSystem/J2DGraph/J2DGrafContext.h
index f784a5a5e0..46f30819f4 100644
--- a/include/JSystem/J2DGraph/J2DGrafContext.h
+++ b/include/JSystem/J2DGraph/J2DGrafContext.h
@@ -18,36 +18,36 @@ public:
     };
 
 
-    /* 802E8B08 */ J2DGrafContext(f32 x, f32 y, f32 width, f32 height);
-    /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const& bounds);
+    J2DGrafContext(f32 x, f32 y, f32 width, f32 height);
+    void scissor(JGeometry::TBox2<f32> const& bounds);
     void scissor(f32 x, f32 y, f32 width, f32 height) {
         scissor(JGeometry::TBox2<f32>(x, y, x + width, y + height));
     }
 
     void setColor(JUtility::TColor c) { this->setColor(c, c, c, c); }
-    /* 802E9118 */ void setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
+    void setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
                                  JUtility::TColor colorBR, JUtility::TColor colorBL);
-    /* 802E9234 */ void setLineWidth(u8);
-    /* 802E9260 */ void fillBox(JGeometry::TBox2<f32> const& box);
-    /* 802E9368 */ void drawFrame(JGeometry::TBox2<f32> const& box);
-    /* 802E9488 */ void line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end);
-    /* 802E9564 */ void lineTo(JGeometry::TVec2<f32> pos);
+    void setLineWidth(u8);
+    void fillBox(JGeometry::TBox2<f32> const& box);
+    void drawFrame(JGeometry::TBox2<f32> const& box);
+    void line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end);
+    void lineTo(JGeometry::TVec2<f32> pos);
     void lineTo(f32 x, f32 y) { this->lineTo(JGeometry::TVec2<f32>(x, y)); }
     void moveTo(f32 x, f32 y) { this->moveTo(JGeometry::TVec2<f32>(x, y)); }
 
     void moveTo(JGeometry::TVec2<f32> pos) { mPrevPos = pos; }
 
-    /* 802E95D4 */ virtual ~J2DGrafContext() {}
-    /* 802E90E4 */ virtual void place(JGeometry::TBox2<f32> const& bounds);
-    /* 802E961C */ virtual void place(f32 x, f32 y, f32 width, f32 height) {
+    virtual ~J2DGrafContext() {}
+    virtual void place(JGeometry::TBox2<f32> const& bounds);
+    virtual void place(f32 x, f32 y, f32 width, f32 height) {
         JGeometry::TBox2<f32> box(x, y, x + width, y + height);
         this->place(box);
     }
-    /* 802E8BB4 */ virtual void setPort();
-    /* 802E8C44 */ virtual void setup2D();
-    /* 802E8E20 */ virtual void setScissor();
-    /* 802E9664 */ virtual s32 getGrafType() const { return 0; }
-    /* 802E966C */ virtual void setLookat() {}
+    virtual void setPort();
+    virtual void setup2D();
+    virtual void setScissor();
+    virtual s32 getGrafType() const { return 0; }
+    virtual void setLookat() {}
 
 public:
     /* 0x04 */ JGeometry::TBox2<f32> mBounds;
diff --git a/include/JSystem/J2DGraph/J2DManage.h b/include/JSystem/J2DGraph/J2DManage.h
index 55eae2b1ca..f8d8a20ae2 100644
--- a/include/JSystem/J2DGraph/J2DManage.h
+++ b/include/JSystem/J2DGraph/J2DManage.h
@@ -13,8 +13,8 @@ struct J2DResReference {
     /* 0x00 */ u16 mCount;
     /* 0x02 */ u16 mOffsets[1];
 
-    /* 8030CF10 */ s8* getResReference(u16) const;
-    /* 8030CF44 */ char* getName(u16) const;
+    s8* getResReference(u16) const;
+    char* getName(u16) const;
 };
 
 /**
@@ -36,8 +36,8 @@ private:
     /* 0x00 */ J2DataManageLink* mList;
 
 public:
-    /* 8030CE18 */ void* get(char const*);
-    /* 8030CE7C */ void* get(JSUInputStream*);
+    void* get(char const*);
+    void* get(JSUInputStream*);
 };
 
 #endif /* J2DMANAGE_H */
diff --git a/include/JSystem/J2DGraph/J2DMatBlock.h b/include/JSystem/J2DGraph/J2DMatBlock.h
index f5a5e23db4..4a3fec0c35 100644
--- a/include/JSystem/J2DGraph/J2DMatBlock.h
+++ b/include/JSystem/J2DGraph/J2DMatBlock.h
@@ -17,7 +17,7 @@ struct ResTLUT;
  * 
  */
 struct J2DGXColorS10 : public GXColorS10 {
-    /* 802F1B90 */ J2DGXColorS10() {}
+    J2DGXColorS10() {}
     J2DGXColorS10(const J2DGXColorS10& other) {
         r = other.r;
         g = other.g;
@@ -48,51 +48,51 @@ struct J2DTevSwapModeInfo;
  */
 class J2DTevBlock {
 public:
-    /* 802F2A40 */ virtual void initialize() {}
-    /* 802EB1D0 */ virtual void setGX() {}
-    /* 802F2A44 */ virtual void loadTexture(_GXTexMapID, u32) {}
+    virtual void initialize() {}
+    virtual void setGX() {}
+    virtual void loadTexture(_GXTexMapID, u32) {}
     virtual u32 getType() = 0;
     virtual u8 getMaxStage() = 0;
-    /* 802EB1DC */ virtual void setTexNo(u32, u16) {}
-    /* 802EA170 */ virtual u32 getTexNo(u32) const { return 0xFFFF; }
-    /* 802F2A48 */ virtual void setFontNo(u16) {}
-    /* 802EA164 */ virtual u16 getFontNo() const { return 0xFFFF; }
-    /* 802F2A4C */ virtual void setTevOrder(u32, J2DTevOrder) {}
-    /* 802EA144 */ virtual J2DTevOrder* getTevOrder(u32) { return NULL; }
-    /* 802EB1D8 */ virtual void setTevColor(u32, J2DGXColorS10) {}
-    /* 802EA13C */ virtual J2DGXColorS10* getTevColor(u32) { return NULL; }
-    /* 802EB1D4 */ virtual void setTevKColor(u32, JUtility::TColor) {}
-    /* 802EA15C */ virtual JUtility::TColor* getTevKColor(u32) { return NULL; }
-    /* 802F2A50 */ virtual void setTevKColorSel(u32, u8) {}
-    /* 802EA154 */ virtual u8 getTevKColorSel(u32) { return 0; }
-    /* 802F2A54 */ virtual void setTevKAlphaSel(u32, u8) {}
-    /* 802EA14C */ virtual u8 getTevKAlphaSel(u32) { return 0; }
-    /* 802F2A58 */ virtual void setTevStageNum(u8) {}
-    /* 802EA17C */ virtual u8 getTevStageNum() const { return 1; }
-    /* 802F2A5C */ virtual void setTevStage(u32, J2DTevStage) {}
-    /* 802EA134 */ virtual J2DTevStage* getTevStage(u32) { return NULL; }
-    /* 802F2A60 */ virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo) {}
-    /* 802F2A64 */ virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable) {}
-    /* 802EA12C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
-    /* 802F2A68 */ virtual void setIndTevStage(u32, J2DIndTevStage) {}
-    /* 802EA184 */ virtual J2DIndTevStage* getIndTevStage(u32) { return NULL; }
-    /* 802F2A7C */ virtual bool insertTexture(u32, ResTIMG const*) { return false; }
-    /* 802F2A74 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*) { return false; }
-    /* 802F2A6C */ virtual bool insertTexture(u32, JUTTexture*) { return false; }
-    /* 802F2A8C */ virtual bool setTexture(u32, ResTIMG const*) { return false; }
-    /* 802F2A84 */ virtual bool setTexture(u32, JUTTexture*) { return false; }
-    /* 802F2A94 */ virtual bool removeTexture(u32) { return false; }
-    /* 802F2AA4 */ virtual bool setFont(ResFONT*) { return false; }
-    /* 802F2A9C */ virtual bool setFont(JUTFont*) { return false; }
-    /* 802F2AAC */ virtual bool setPalette(u32, ResTLUT const*) { return false; }
-    /* 802F2AB4 */ virtual bool prepareTexture(u8) { return false; }
-    /* 802EB87C */ virtual JUTTexture* getTexture(u32);
-    /* 802EB884 */ virtual JUTPalette* getPalette(u32);
-    /* 802F2ABC */ virtual JUTFont* getFont() { return NULL; }
-    /* 802F2AC4 */ virtual void shiftDeleteFlag(u8, bool) {}
-    /* 802F2AC8 */ virtual void setUndeleteFlag(u8) {}
-    /* 802F2ACC */ virtual void setFontUndeleteFlag() {}
-    /* 802EB184 */ virtual ~J2DTevBlock() {}
+    virtual void setTexNo(u32, u16) {}
+    virtual u32 getTexNo(u32) const { return 0xFFFF; }
+    virtual void setFontNo(u16) {}
+    virtual u16 getFontNo() const { return 0xFFFF; }
+    virtual void setTevOrder(u32, J2DTevOrder) {}
+    virtual J2DTevOrder* getTevOrder(u32) { return NULL; }
+    virtual void setTevColor(u32, J2DGXColorS10) {}
+    virtual J2DGXColorS10* getTevColor(u32) { return NULL; }
+    virtual void setTevKColor(u32, JUtility::TColor) {}
+    virtual JUtility::TColor* getTevKColor(u32) { return NULL; }
+    virtual void setTevKColorSel(u32, u8) {}
+    virtual u8 getTevKColorSel(u32) { return 0; }
+    virtual void setTevKAlphaSel(u32, u8) {}
+    virtual u8 getTevKAlphaSel(u32) { return 0; }
+    virtual void setTevStageNum(u8) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32, J2DTevStage) {}
+    virtual J2DTevStage* getTevStage(u32) { return NULL; }
+    virtual void setTevSwapModeInfo(u32, J2DTevSwapModeInfo) {}
+    virtual void setTevSwapModeTable(u32, J2DTevSwapModeTable) {}
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
+    virtual void setIndTevStage(u32, J2DIndTevStage) {}
+    virtual J2DIndTevStage* getIndTevStage(u32) { return NULL; }
+    virtual bool insertTexture(u32, ResTIMG const*) { return false; }
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*) { return false; }
+    virtual bool insertTexture(u32, JUTTexture*) { return false; }
+    virtual bool setTexture(u32, ResTIMG const*) { return false; }
+    virtual bool setTexture(u32, JUTTexture*) { return false; }
+    virtual bool removeTexture(u32) { return false; }
+    virtual bool setFont(ResFONT*) { return false; }
+    virtual bool setFont(JUTFont*) { return false; }
+    virtual bool setPalette(u32, ResTLUT const*) { return false; }
+    virtual bool prepareTexture(u8) { return false; }
+    virtual JUTTexture* getTexture(u32);
+    virtual JUTPalette* getPalette(u32);
+    virtual JUTFont* getFont() { return NULL; }
+    virtual void shiftDeleteFlag(u8, bool) {}
+    virtual void setUndeleteFlag(u8) {}
+    virtual void setFontUndeleteFlag() {}
+    virtual ~J2DTevBlock() {}
 };
 
 /**
@@ -101,77 +101,77 @@ public:
  */
 class J2DTevBlock1 : public J2DTevBlock {
 public:
-    /* 802EB88C */ J2DTevBlock1();
+    J2DTevBlock1();
 
-    /* 802EBA50 */ virtual void initialize();
-    /* 802EC328 */ virtual void setGX();
-    /* 802EC570 */ virtual void loadTexture(_GXTexMapID, u32);
-    /* 802F27A0 */ virtual u32 getType() { return 'TVB1'; }
-    /* 802F27AC */ virtual u8 getMaxStage() { return 1; }
-    /* 802F27B4 */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
-    /* 802F27C4 */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
-    /* 802F27D4 */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
-    /* 802F27DC */ virtual u16 getFontNo() const { return mFontNo; }
-    /* 802F27E4 */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual void loadTexture(_GXTexMapID, u32);
+    virtual u32 getType() { return 'TVB1'; }
+    virtual u8 getMaxStage() { return 1; }
+    virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
+    virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
+    virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
+    virtual u16 getFontNo() const { return mFontNo; }
+    virtual void setTevOrder(u32 index, J2DTevOrder order) {
         mTevOrder[index] = order;
     }
-    /* 802F2808 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
-    /* 802F281C */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
+    virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
+    virtual void setTevColor(u32 index, J2DGXColorS10 color) {
         mTevColor[index] = color;
     }
-    /* 802F2848 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
-    /* 802F285C */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
+    virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
+    virtual void setTevKColor(u32 index, JUtility::TColor color) {
         mTevKColor[index] = color;
     }
-    /* 802F2888 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
-    /* 802F289C */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
-    /* 802F28A8 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
-    /* 802F28B4 */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
-    /* 802F28C0 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
-    /* 802F28CC */ virtual void setTevStageNum(u8 num) {}
-    /* 802F28D0 */ virtual u8 getTevStageNum() const { return 1; }
-    /* 802F28D8 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
+    virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
+    virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
+    virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
+    virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
+    virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
+    virtual void setTevStageNum(u8 num) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32 index, J2DTevStage stage) {
         mTevStage[index] = stage;
     }
-    /* 802F2914 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
-    /* 802F2928 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
+    virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
+    virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
         mTevStage[index].setTevSwapModeInfo(info);
     }
-    /* 802F2960 */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
         mTevSwapModeTable[index] = table;
     }
-    /* 802F2970 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
         return &mTevSwapModeTable[index];
     }
-    /* 802F2980 */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
+    virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
         mIndTevStage[index] = stage;
     }
-    /* 802F2994 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
+    virtual J2DIndTevStage* getIndTevStage(u32 index) {
         return &mIndTevStage[index];
     }
-    /* 802F29A8 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
+    virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
         return insertTexture(index, p_timg, NULL);
     }
-    /* 802EBCC0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
-    /* 802EBDE4 */ virtual bool insertTexture(u32, JUTTexture*);
-    /* 802EBE8C */ virtual bool setTexture(u32, ResTIMG const*);
-    /* 802EC01C */ virtual bool setTexture(u32, JUTTexture*);
-    /* 802EC0A8 */ virtual bool removeTexture(u32);
-    /* 802EC124 */ virtual bool setFont(ResFONT*);
-    /* 802EC1D8 */ virtual bool setFont(JUTFont*);
-    /* 802EC258 */ virtual bool setPalette(u32, ResTLUT const*);
-    /* 802EBC0C */ virtual bool prepareTexture(u8);
-    /* 802F29D8 */ virtual JUTTexture* getTexture(u32 index) {
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
+    virtual bool insertTexture(u32, JUTTexture*);
+    virtual bool setTexture(u32, ResTIMG const*);
+    virtual bool setTexture(u32, JUTTexture*);
+    virtual bool removeTexture(u32);
+    virtual bool setFont(ResFONT*);
+    virtual bool setFont(JUTFont*);
+    virtual bool setPalette(u32, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual JUTTexture* getTexture(u32 index) {
         return index >= 1 ? NULL : mTexture[index];
     }
-    /* 802F29F8 */ virtual JUTPalette* getPalette(u32 index) {
+    virtual JUTPalette* getPalette(u32 index) {
         return index >= 1 ? NULL : mPalette[index];
     }
-    /* 802F2A18 */ virtual JUTFont* getFont() { return mFont; }
-    /* 802EC318 */ virtual void shiftDeleteFlag(u8, bool);
-    /* 802F2A20 */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
-    /* 802F2A30 */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
-    /* 802EB998 */ virtual ~J2DTevBlock1();
+    virtual JUTFont* getFont() { return mFont; }
+    virtual void shiftDeleteFlag(u8, bool);
+    virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
+    virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
+    virtual ~J2DTevBlock1();
 
 private:
     /* 0x004 */ u16 mTexNo[1];
@@ -196,77 +196,77 @@ private:
  */
 class J2DTevBlock2 : public J2DTevBlock {
 public:
-    /* 802EC5B8 */ J2DTevBlock2();
+    J2DTevBlock2();
 
-    /* 802EC7A0 */ virtual void initialize();
-    /* 802ED584 */ virtual void setGX();
-    /* 802ED874 */ virtual void loadTexture(_GXTexMapID, u32);
-    /* 802F24FC */ virtual u32 getType() { return 'TVB2'; }
-    /* 802F2508 */ virtual u8 getMaxStage() { return 2; }
-    /* 802F2510 */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
-    /* 802F2520 */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
-    /* 802F2530 */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
-    /* 802F2538 */ virtual u16 getFontNo() const { return mFontNo; }
-    /* 802F2540 */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual void loadTexture(_GXTexMapID, u32);
+    virtual u32 getType() { return 'TVB2'; }
+    virtual u8 getMaxStage() { return 2; }
+    virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
+    virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
+    virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
+    virtual u16 getFontNo() const { return mFontNo; }
+    virtual void setTevOrder(u32 index, J2DTevOrder order) {
         mTevOrder[index] = order;
     }
-    /* 802F2564 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
-    /* 802F2578 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
+    virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
+    virtual void setTevColor(u32 index, J2DGXColorS10 color) {
         mTevColor[index] = color;
     }
-    /* 802F25A4 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
-    /* 802F25B8 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
+    virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
+    virtual void setTevKColor(u32 index, JUtility::TColor color) {
         mTevKColor[index] = color;
     }
-    /* 802F25E4 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
-    /* 802F25F8 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
-    /* 802F2604 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
-    /* 802F2610 */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
-    /* 802F261C */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
-    /* 802F2628 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 802F2630 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 802F2638 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
+    virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
+    virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
+    virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
+    virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
+    virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 index, J2DTevStage stage) {
         mTevStage[index] = stage;
     }
-    /* 802F2674 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
-    /* 802F2688 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
+    virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
+    virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
         mTevStage[index].setTevSwapModeInfo(info);
     }
-    /* 802F26C0 */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
         mTevSwapModeTable[index] = table;
     }
-    /* 802F26D0 */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
         return &mTevSwapModeTable[index];
     }
-    /* 802F26E0 */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
+    virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
         mIndTevStage[index] = stage;
     }
-    /* 802F26F4 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
+    virtual J2DIndTevStage* getIndTevStage(u32 index) {
         return &mIndTevStage[index];
     }
-    /* 802F2708 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
+    virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
         return insertTexture(index, p_timg, NULL);
     }
-    /* 802ECAE8 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
-    /* 802ECDE8 */ virtual bool insertTexture(u32, JUTTexture*);
-    /* 802ECF48 */ virtual bool setTexture(u32, ResTIMG const*);
-    /* 802ED16C */ virtual bool setTexture(u32, JUTTexture*);
-    /* 802ED21C */ virtual bool removeTexture(u32);
-    /* 802ED2F0 */ virtual bool setFont(ResFONT*);
-    /* 802ED3A4 */ virtual bool setFont(JUTFont*);
-    /* 802ED424 */ virtual bool setPalette(u32, ResTLUT const*);
-    /* 802ECA18 */ virtual bool prepareTexture(u8);
-    /* 802F2738 */ virtual JUTTexture* getTexture(u32 index) {
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
+    virtual bool insertTexture(u32, JUTTexture*);
+    virtual bool setTexture(u32, ResTIMG const*);
+    virtual bool setTexture(u32, JUTTexture*);
+    virtual bool removeTexture(u32);
+    virtual bool setFont(ResFONT*);
+    virtual bool setFont(JUTFont*);
+    virtual bool setPalette(u32, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual JUTTexture* getTexture(u32 index) {
         return index >= 2 ? NULL : mTexture[index];
     }
-    /* 802F2758 */ virtual JUTPalette* getPalette(u32 index) {
+    virtual JUTPalette* getPalette(u32 index) {
         return index >= 2 ? NULL : mPalette[index];
     }
-    /* 802F2778 */ virtual JUTFont* getFont() { return mFont; }
-    /* 802ED4FC */ virtual void shiftDeleteFlag(u8, bool);
-    /* 802F2780 */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
-    /* 802F2790 */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
-    /* 802EC6C8 */ virtual ~J2DTevBlock2();
+    virtual JUTFont* getFont() { return mFont; }
+    virtual void shiftDeleteFlag(u8, bool);
+    virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
+    virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
+    virtual ~J2DTevBlock2();
 
 private:
     /* 0x004 */ u16 mTexNo[2];
@@ -293,77 +293,77 @@ private:
  */
 class J2DTevBlock4 : public J2DTevBlock {
 public:
-    /* 802ED8BC */ J2DTevBlock4();
+    J2DTevBlock4();
 
-    /* 802EDAC4 */ virtual void initialize();
-    /* 802EEA2C */ virtual void setGX();
-    /* 802EED1C */ virtual void loadTexture(_GXTexMapID, u32);
-    /* 802F2258 */ virtual u32 getType() { return 'TVB4'; }
-    /* 802F2264 */ virtual u8 getMaxStage() { return 4; }
-    /* 802F226C */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
-    /* 802F227C */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
-    /* 802F228C */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
-    /* 802F2294 */ virtual u16 getFontNo() const { return mFontNo; }
-    /* 802F229C */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual void loadTexture(_GXTexMapID, u32);
+    virtual u32 getType() { return 'TVB4'; }
+    virtual u8 getMaxStage() { return 4; }
+    virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
+    virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
+    virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
+    virtual u16 getFontNo() const { return mFontNo; }
+    virtual void setTevOrder(u32 index, J2DTevOrder order) {
         mTevOrder[index] = order;
     }
-    /* 802F22C0 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
-    /* 802F22D4 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
+    virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
+    virtual void setTevColor(u32 index, J2DGXColorS10 color) {
         mTevColor[index] = color;
     }
-    /* 802F2300 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
-    /* 802F2314 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
+    virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
+    virtual void setTevKColor(u32 index, JUtility::TColor color) {
         mTevKColor[index] = color;
     }
-    /* 802F2340 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
-    /* 802F2354 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
-    /* 802F2360 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
-    /* 802F236C */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
-    /* 802F2378 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
-    /* 802F2384 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 802F238C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 802F2394 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
+    virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
+    virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
+    virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
+    virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
+    virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 index, J2DTevStage stage) {
         mTevStage[index] = stage;
     }
-    /* 802F23D0 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
-    /* 802F23E4 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
+    virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
+    virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
         mTevStage[index].setTevSwapModeInfo(info);
     }
-    /* 802F241C */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
         mTevSwapModeTable[index] = table;
     }
-    /* 802F242C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
         return &mTevSwapModeTable[index];
     }
-    /* 802F243C */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
+    virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
         mIndTevStage[index] = stage;
     }
-    /* 802F2450 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
+    virtual J2DIndTevStage* getIndTevStage(u32 index) {
         return &mIndTevStage[index];
     }
-    /* 802F2464 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
+    virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
         return insertTexture(index, p_timg, NULL);
     }
-    /* 802EDE04 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
-    /* 802EE1D4 */ virtual bool insertTexture(u32, JUTTexture*);
-    /* 802EE364 */ virtual bool setTexture(u32, ResTIMG const*);
-    /* 802EE5F0 */ virtual bool setTexture(u32, JUTTexture*);
-    /* 802EE6A0 */ virtual bool removeTexture(u32);
-    /* 802EE798 */ virtual bool setFont(ResFONT*);
-    /* 802EE84C */ virtual bool setFont(JUTFont*);
-    /* 802EE8CC */ virtual bool setPalette(u32, ResTLUT const*);
-    /* 802EDD34 */ virtual bool prepareTexture(u8);
-    /* 802F2494 */ virtual JUTTexture* getTexture(u32 index) {
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
+    virtual bool insertTexture(u32, JUTTexture*);
+    virtual bool setTexture(u32, ResTIMG const*);
+    virtual bool setTexture(u32, JUTTexture*);
+    virtual bool removeTexture(u32);
+    virtual bool setFont(ResFONT*);
+    virtual bool setFont(JUTFont*);
+    virtual bool setPalette(u32, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual JUTTexture* getTexture(u32 index) {
         return index >= 4 ? NULL : mTexture[index];
     }
-    /* 802F24B4 */ virtual JUTPalette* getPalette(u32 index) {
+    virtual JUTPalette* getPalette(u32 index) {
         return index >= 4 ? NULL : mPalette[index];
     }
-    /* 802F24D4 */ virtual JUTFont* getFont() { return mFont; }
-    /* 802EE9A4 */ virtual void shiftDeleteFlag(u8, bool);
-    /* 802F24DC */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
-    /* 802F24EC */ virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
-    /* 802ED9E4 */ virtual ~J2DTevBlock4();
+    virtual JUTFont* getFont() { return mFont; }
+    virtual void shiftDeleteFlag(u8, bool);
+    virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
+    virtual void setFontUndeleteFlag() { mUndeleteFlag &= 0x7F; }
+    virtual ~J2DTevBlock4();
 
 private:
     /* 0x004 */ u16 mTexNo[4];
@@ -390,77 +390,77 @@ private:
  */
 class J2DTevBlock8 : public J2DTevBlock {
 public:
-    /* 802EED64 */ J2DTevBlock8();
+    J2DTevBlock8();
 
-    /* 802EEF6C */ virtual void initialize();
-    /* 802EFEAC */ virtual void setGX();
-    /* 802F019C */ virtual void loadTexture(_GXTexMapID, u32);
-    /* 802F1FB8 */ virtual u32 getType() { return 'TVB8'; }
-    /* 802F1FC4 */ virtual u8 getMaxStage() { return 8; }
-    /* 802F1FCC */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
-    /* 802F1FDC */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
-    /* 802F1FEC */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
-    /* 802F1FF4 */ virtual u16 getFontNo() const { return mFontNo; }
-    /* 802F1FFC */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual void loadTexture(_GXTexMapID, u32);
+    virtual u32 getType() { return 'TVB8'; }
+    virtual u8 getMaxStage() { return 8; }
+    virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
+    virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
+    virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
+    virtual u16 getFontNo() const { return mFontNo; }
+    virtual void setTevOrder(u32 index, J2DTevOrder order) {
         mTevOrder[index] = order;
     }
-    /* 802F2020 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
-    /* 802F2034 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
+    virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
+    virtual void setTevColor(u32 index, J2DGXColorS10 color) {
         mTevColor[index] = color;
     }
-    /* 802F2060 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
-    /* 802F2074 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
+    virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
+    virtual void setTevKColor(u32 index, JUtility::TColor color) {
         mTevKColor[index] = color;
     }
-    /* 802F20A0 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
-    /* 802F20B4 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
-    /* 802F20C0 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
-    /* 802F20CC */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
-    /* 802F20D8 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
-    /* 802F20E4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 802F20EC */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 802F20F4 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
+    virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
+    virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
+    virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
+    virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
+    virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 index, J2DTevStage stage) {
         mTevStage[index] = stage;
     }
-    /* 802F2130 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
-    /* 802F2144 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
+    virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
+    virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
         mTevStage[index].setTevSwapModeInfo(info);
     }
-    /* 802F217C */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
         mTevSwapModeTable[index] = table;
     }
-    /* 802F218C */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
         return &mTevSwapModeTable[index];
     }
-    /* 802F219C */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
+    virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
         mIndTevStage[index] = stage;
     }
-    /* 802F21B0 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
+    virtual J2DIndTevStage* getIndTevStage(u32 index) {
         return &mIndTevStage[index];
     }
-    /* 802F21C4 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
+    virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
         return insertTexture(index, p_timg, NULL);
     }
-    /* 802EF2B0 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
-    /* 802EF67C */ virtual bool insertTexture(u32, JUTTexture*);
-    /* 802EF80C */ virtual bool setTexture(u32, ResTIMG const*);
-    /* 802EFA98 */ virtual bool setTexture(u32, JUTTexture*);
-    /* 802EFB48 */ virtual bool removeTexture(u32);
-    /* 802EFC40 */ virtual bool setFont(ResFONT*);
-    /* 802EFCEC */ virtual bool setFont(JUTFont*);
-    /* 802EFD68 */ virtual bool setPalette(u32, ResTLUT const*);
-    /* 802EF1E0 */ virtual bool prepareTexture(u8);
-    /* 802F21F4 */ virtual JUTTexture* getTexture(u32 index) {
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
+    virtual bool insertTexture(u32, JUTTexture*);
+    virtual bool setTexture(u32, ResTIMG const*);
+    virtual bool setTexture(u32, JUTTexture*);
+    virtual bool removeTexture(u32);
+    virtual bool setFont(ResFONT*);
+    virtual bool setFont(JUTFont*);
+    virtual bool setPalette(u32, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual JUTTexture* getTexture(u32 index) {
         return index >= 8 ? NULL : mTexture[index];
     }
-    /* 802F2214 */ virtual JUTPalette* getPalette(u32 index) {
+    virtual JUTPalette* getPalette(u32 index) {
         return index >= 8 ? NULL : mPalette[index];
     }
-    /* 802F2234 */ virtual JUTFont* getFont() { return mFont; }
-    /* 802EFE40 */ virtual void shiftDeleteFlag(u8, bool);
-    /* 802F223C */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
-    /* 802F224C */ virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
-    /* 802EEE8C */ virtual ~J2DTevBlock8();
+    virtual JUTFont* getFont() { return mFont; }
+    virtual void shiftDeleteFlag(u8, bool);
+    virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
+    virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
+    virtual ~J2DTevBlock8();
 
 private:
     /* 0x004 */ u16 mTexNo[8];
@@ -488,77 +488,77 @@ private:
  */
 class J2DTevBlock16 : public J2DTevBlock {
 public:
-    /* 802F01E4 */ J2DTevBlock16();
+    J2DTevBlock16();
 
-    /* 802F03EC */ virtual void initialize();
-    /* 802F132C */ virtual void setGX();
-    /* 802F161C */ virtual void loadTexture(_GXTexMapID, u32);
-    /* 802F1D18 */ virtual u32 getType() { return 'TV16'; }
-    /* 802F1D24 */ virtual u8 getMaxStage() { return 16; }
-    /* 802F1D2C */ virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
-    /* 802F1D3C */ virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
-    /* 802F1D4C */ virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
-    /* 802F1D54 */ virtual u16 getFontNo() const { return mFontNo; }
-    /* 802F1D5C */ virtual void setTevOrder(u32 index, J2DTevOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual void loadTexture(_GXTexMapID, u32);
+    virtual u32 getType() { return 'TV16'; }
+    virtual u8 getMaxStage() { return 16; }
+    virtual void setTexNo(u32 index, u16 texNo) { mTexNo[index] = texNo; }
+    virtual u32 getTexNo(u32 index) const { return mTexNo[index]; }
+    virtual void setFontNo(u16 fontNo) { mFontNo = fontNo; }
+    virtual u16 getFontNo() const { return mFontNo; }
+    virtual void setTevOrder(u32 index, J2DTevOrder order) {
         mTevOrder[index] = order;
     }
-    /* 802F1D80 */ virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
-    /* 802F1D94 */ virtual void setTevColor(u32 index, J2DGXColorS10 color) {
+    virtual J2DTevOrder* getTevOrder(u32 index) { return &mTevOrder[index]; }
+    virtual void setTevColor(u32 index, J2DGXColorS10 color) {
         mTevColor[index] = color;
     }
-    /* 802F1DC0 */ virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
-    /* 802F1DD4 */ virtual void setTevKColor(u32 index, JUtility::TColor color) {
+    virtual J2DGXColorS10* getTevColor(u32 index) { return &mTevColor[index]; }
+    virtual void setTevKColor(u32 index, JUtility::TColor color) {
         mTevKColor[index] = color;
     }
-    /* 802F1E00 */ virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
-    /* 802F1E14 */ virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
-    /* 802F1E20 */ virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
-    /* 802F1E2C */ virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
-    /* 802F1E38 */ virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
-    /* 802F1E44 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 802F1E4C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 802F1E54 */ virtual void setTevStage(u32 index, J2DTevStage stage) {
+    virtual JUtility::TColor* getTevKColor(u32 index) { return &mTevKColor[index]; }
+    virtual void setTevKColorSel(u32 index, u8 sel) { mTevKColorSel[index] = sel; }
+    virtual u8 getTevKColorSel(u32 index) { return mTevKColorSel[index]; }
+    virtual void setTevKAlphaSel(u32 index, u8 sel) { mTevKAlphaSel[index] = sel; }
+    virtual u8 getTevKAlphaSel(u32 index) { return mTevKAlphaSel[index]; }
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 index, J2DTevStage stage) {
         mTevStage[index] = stage;
     }
-    /* 802F1E90 */ virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
-    /* 802F1EA4 */ virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
+    virtual J2DTevStage* getTevStage(u32 index) { return &mTevStage[index]; }
+    virtual void setTevSwapModeInfo(u32 index, J2DTevSwapModeInfo info) {
         mTevStage[index].setTevSwapModeInfo(info);
     }
-    /* 802F1EDC */ virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 index, J2DTevSwapModeTable table) {
         mTevSwapModeTable[index] = table;
     }
-    /* 802F1EEC */ virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
+    virtual J2DTevSwapModeTable* getTevSwapModeTable(u32 index) {
         return &mTevSwapModeTable[index];
     }
-    /* 802F1EFC */ virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
+    virtual void setIndTevStage(u32 index, J2DIndTevStage stage) {
         mIndTevStage[index] = stage;
     }
-    /* 802F1F10 */ virtual J2DIndTevStage* getIndTevStage(u32 index) {
+    virtual J2DIndTevStage* getIndTevStage(u32 index) {
         return &mIndTevStage[index];
     }
-    /* 802F1F24 */ virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
+    virtual bool insertTexture(u32 index, ResTIMG const* p_timg) {
         return insertTexture(index, p_timg, NULL);
     }
-    /* 802F0730 */ virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
-    /* 802F0AFC */ virtual bool insertTexture(u32, JUTTexture*);
-    /* 802F0C8C */ virtual bool setTexture(u32, ResTIMG const*);
-    /* 802F0F18 */ virtual bool setTexture(u32, JUTTexture*);
-    /* 802F0FC8 */ virtual bool removeTexture(u32);
-    /* 802F10C0 */ virtual bool setFont(ResFONT*);
-    /* 802F116C */ virtual bool setFont(JUTFont*);
-    /* 802F11E8 */ virtual bool setPalette(u32, ResTLUT const*);
-    /* 802F0660 */ virtual bool prepareTexture(u8);
-    /* 802F1F54 */ virtual JUTTexture* getTexture(u32 index) {
+    virtual bool insertTexture(u32, ResTIMG const*, JUTPalette*);
+    virtual bool insertTexture(u32, JUTTexture*);
+    virtual bool setTexture(u32, ResTIMG const*);
+    virtual bool setTexture(u32, JUTTexture*);
+    virtual bool removeTexture(u32);
+    virtual bool setFont(ResFONT*);
+    virtual bool setFont(JUTFont*);
+    virtual bool setPalette(u32, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual JUTTexture* getTexture(u32 index) {
         return index >= 8 ? NULL : mTexture[index];
     }
-    /* 802F1F74 */ virtual JUTPalette* getPalette(u32 index) {
+    virtual JUTPalette* getPalette(u32 index) {
         return index >= 8 ? NULL : mPalette[index];
     }
-    /* 802F1F94 */ virtual JUTFont* getFont() { return mFont; }
-    /* 802F12C0 */ virtual void shiftDeleteFlag(u8, bool);
-    /* 802F1F9C */ virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
-    /* 802F1FAC */ virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
-    /* 802F030C */ virtual ~J2DTevBlock16();
+    virtual JUTFont* getFont() { return mFont; }
+    virtual void shiftDeleteFlag(u8, bool);
+    virtual void setUndeleteFlag(u8 flag) { mUndeleteFlag &= flag; }
+    virtual void setFontUndeleteFlag() { mFontUndeleteFlag = false; }
+    virtual ~J2DTevBlock16();
 
 public:
     /* 0x004 */ u16 mTexNo[8];
@@ -669,8 +669,8 @@ class J2DPEBlock {
 public:
     J2DPEBlock() { initialize(); }
 
-    /* 802F17FC */ void initialize();
-    /* 802F1840 */ void setGX();
+    void initialize();
+    void setGX();
     void setAlphaComp(J2DAlphaComp comp) { mAlphaComp = comp; }
     void setBlend(J2DBlend blend) { mBlend = blend; }
     void setDither(u8 dither) { mDither = dither; }
@@ -687,18 +687,18 @@ private:
  */
 class J2DIndBlock {
 public:
-    /* 802EB24C */ virtual void initialize() {}
-    /* 802EB1CC */ virtual void setGX() {}
+    virtual void initialize() {}
+    virtual void setGX() {}
     virtual u32 getType() = 0;
-    /* 802EB250 */ virtual void setIndTexStageNum(u8) {}
-    /* 802EA1A4 */ virtual u8 getIndTexStageNum() const { return 0; }
-    /* 802EB254 */ virtual void setIndTexOrder(u32, J2DIndTexOrder) {}
-    /* 802EA19C */ virtual J2DIndTexOrder* getIndTexOrder(u32) { return NULL; }
-    /* 802EB258 */ virtual void setIndTexMtx(u32, J2DIndTexMtx) {}
-    /* 802EA194 */ virtual J2DIndTexMtx* getIndTexMtx(u32) { return NULL; }
-    /* 802EB25C */ virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale) {}
-    /* 802EA18C */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
-    /* 802EB13C */ virtual ~J2DIndBlock() {}
+    virtual void setIndTexStageNum(u8) {}
+    virtual u8 getIndTexStageNum() const { return 0; }
+    virtual void setIndTexOrder(u32, J2DIndTexOrder) {}
+    virtual J2DIndTexOrder* getIndTexOrder(u32) { return NULL; }
+    virtual void setIndTexMtx(u32, J2DIndTexMtx) {}
+    virtual J2DIndTexMtx* getIndTexMtx(u32) { return NULL; }
+    virtual void setIndTexCoordScale(u32, J2DIndTexCoordScale) {}
+    virtual J2DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
+    virtual ~J2DIndBlock() {}
 };
 
 /**
@@ -709,28 +709,28 @@ class J2DIndBlockFull : public J2DIndBlock {
 public:
     J2DIndBlockFull() { initialize(); }
 
-    /* 802F1664 */ virtual void initialize();
-    /* 802F1730 */ virtual void setGX();
-    /* 802F1B94 */ virtual u32 getType() { return 'IBLF'; }
-    /* 802F1BA0 */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
-    /* 802F1BA8 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
-    /* 802F1BB0 */ virtual void setIndTexOrder(u32 index, J2DIndTexOrder order) {
+    virtual void initialize();
+    virtual void setGX();
+    virtual u32 getType() { return 'IBLF'; }
+    virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
+    virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
+    virtual void setIndTexOrder(u32 index, J2DIndTexOrder order) {
         mIndTexOrder[index] = order;
     }
-    /* 802F1BCC */ virtual J2DIndTexOrder* getIndTexOrder(u32 index) {
+    virtual J2DIndTexOrder* getIndTexOrder(u32 index) {
         return &mIndTexOrder[index];
     }
-    /* 802F1BE0 */ virtual void setIndTexMtx(u32 index, J2DIndTexMtx mtx) {
+    virtual void setIndTexMtx(u32 index, J2DIndTexMtx mtx) {
         mIndTexMtx[index] = mtx;
     }
-    /* 802F1C38 */ virtual J2DIndTexMtx* getIndTexMtx(u32 index) { return &mIndTexMtx[index]; }
-    /* 802F1C4C */ virtual void setIndTexCoordScale(u32 index, J2DIndTexCoordScale scale) {
+    virtual J2DIndTexMtx* getIndTexMtx(u32 index) { return &mIndTexMtx[index]; }
+    virtual void setIndTexCoordScale(u32 index, J2DIndTexCoordScale scale) {
         mTexCoordScale[index] = scale;
     }
-    /* 802F1C68 */ virtual J2DIndTexCoordScale* getIndTexCoordScale(u32 index) {
+    virtual J2DIndTexCoordScale* getIndTexCoordScale(u32 index) {
         return &mTexCoordScale[index];
     }
-    /* 802F1C7C */ virtual ~J2DIndBlockFull() {}
+    virtual ~J2DIndBlockFull() {}
 
 private:
     /* 0x04 */ u8 mIndTexStageNum;
@@ -747,9 +747,9 @@ class J2DIndBlockNull : public J2DIndBlock {
 public:
     J2DIndBlockNull() {}
 
-    /* 802EB1E0 */ virtual void setGX() {}
-    /* 802EB1E4 */ virtual u32 getType() { return 'IBLN'; }
-    /* 802EB1F0 */ virtual ~J2DIndBlockNull() {}
+    virtual void setGX() {}
+    virtual u32 getType() { return 'IBLN'; }
+    virtual ~J2DIndBlockNull() {}
 };
 
 /**
@@ -765,10 +765,10 @@ private:
 public:
     J2DTexGenBlock() { initialize(); }
 
-    /* 802EB510 */ void initialize();
-    /* 802EB570 */ void setGX();
-    /* 802EB6A4 */ void setTexMtx(u32, J2DTexMtx&);
-    /* 802EB7E0 */ void getTexMtx(u32, J2DTexMtx&);
+    void initialize();
+    void setGX();
+    void setTexMtx(u32, J2DTexMtx&);
+    void getTexMtx(u32, J2DTexMtx&);
 
     u32 getTexGenNum() const { return mTexGenNum; }
     void setTexGenNum(u32 num) { mTexGenNum = num; }
@@ -778,7 +778,7 @@ public:
     J2DTexMtx& getTexMtx(u32 i) { return *mTexMtx[i]; }
     J2DTexCoord& getTexCoord(u32 i) { return mTexGenCoord[i]; }
 
-    /* 802EB620 */ virtual ~J2DTexGenBlock();
+    virtual ~J2DTexGenBlock();
 };  // Size: 0x48
 
 /**
@@ -795,10 +795,10 @@ private:
 public:
     J2DColorBlock() { initialize(); }
 
-    /* 802EB394 */ void initialize();
-    /* 802EB424 */ void setGX();
+    void initialize();
+    void setGX();
 
-    /* 802EB0F4 */ virtual ~J2DColorBlock() {}
+    virtual ~J2DColorBlock() {}
 
     JUtility::TColor* getMatColor(u32 i) { return &mMatColor[i]; }
     J2DColorChan* getColorChan(u32 i) { return &mColorChan[i]; }
diff --git a/include/JSystem/J2DGraph/J2DMaterial.h b/include/JSystem/J2DGraph/J2DMaterial.h
index 584b3f4c9b..8c6e1b66c0 100644
--- a/include/JSystem/J2DGraph/J2DMaterial.h
+++ b/include/JSystem/J2DGraph/J2DMaterial.h
@@ -11,7 +11,7 @@
 class J2DMaterial {
 public:
     struct J2DMaterialAnmPointer {
-        /* 802EA79C */ J2DMaterialAnmPointer();
+        J2DMaterialAnmPointer();
 
         /* 0x00 */ J2DAnmColor* mColorAnm;
         /* 0x04 */ J2DAnmTextureSRTKey* mSRTAnm;
@@ -24,18 +24,18 @@ public:
         /* 0x3A */ u16 mTevKRegIds[4];
     };  // Size: 0x44
 
-    /* 802EA1AC */ J2DMaterial();
-    /* 802EA38C */ void setGX();
-    /* 802EA410 */ static J2DTevBlock* createTevBlock(int, bool);
-    /* 802EA5C4 */ static J2DIndBlock* createIndBlock(int, bool);
-    /* 802EA84C */ void makeAnmPointer();
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-    /* 802EAC78 */ void animation();
+    J2DMaterial();
+    void setGX();
+    static J2DTevBlock* createTevBlock(int, bool);
+    static J2DIndBlock* createIndBlock(int, bool);
+    void makeAnmPointer();
+    void setAnimation(J2DAnmTextureSRTKey*);
+    void setAnimation(J2DAnmTexPattern*);
+    void setAnimation(J2DAnmTevRegKey*);
+    void setAnimation(J2DAnmColor*);
+    void animation();
 
-    /* 802EA2CC */ virtual ~J2DMaterial();
+    virtual ~J2DMaterial();
 
     u16 getIndex() const { return mIndex; }
     J2DColorBlock* getColorBlock() { return &mColorBlock; }
diff --git a/include/JSystem/J2DGraph/J2DMaterialFactory.h b/include/JSystem/J2DGraph/J2DMaterialFactory.h
index 506dfa0fdb..f51b2176eb 100644
--- a/include/JSystem/J2DGraph/J2DMaterialFactory.h
+++ b/include/JSystem/J2DGraph/J2DMaterialFactory.h
@@ -105,33 +105,33 @@ class JKRArchive;
  */
 class J2DMaterialFactory {
 public:
-    /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
-    /* 802F2C94 */ u32 countStages(int) const;
-    /* 802F2D1C */ J2DMaterial* create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*,
+    J2DMaterialFactory(J2DMaterialBlock const&);
+    u32 countStages(int) const;
+    J2DMaterial* create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*,
                                JKRArchive*) const;
-    /* 802F362C */ JUtility::TColor newMatColor(int, int) const;
-    /* 802F36CC */ u8 newColorChanNum(int) const;
-    /* 802F3704 */ J2DColorChan newColorChan(int, int) const;
-    /* 802F3758 */ u32 newTexGenNum(int) const;
-    /* 802F3790 */ J2DTexCoord newTexCoord(int, int) const;
-    /* 802F3804 */ J2DTexMtx* newTexMtx(int, int) const;
-    /* 802F38E0 */ u8 newCullMode(int) const;
-    /* 802F3920 */ u16 newTexNo(int, int) const;
-    /* 802F3968 */ u16 newFontNo(int) const;
-    /* 802F39A8 */ J2DTevOrder newTevOrder(int, int) const;
-    /* 802F3A1C */ J2DGXColorS10 newTevColor(int, int) const;
-    /* 802F3AB4 */ JUtility::TColor newTevKColor(int, int) const;
-    /* 802F3B54 */ u8 newTevStageNum(int) const;
-    /* 802F3B8C */ J2DTevStage newTevStage(int, int) const;
-    /* 802F3BEC */ J2DTevSwapModeTable newTevSwapModeTable(int, int) const;
-    /* 802F3C88 */ u8 newIndTexStageNum(int) const;
-    /* 802F3CB8 */ J2DIndTexOrder newIndTexOrder(int, int) const;
-    /* 802F3D20 */ J2DIndTexMtx newIndTexMtx(int, int) const;
-    /* 802F3E24 */ J2DIndTevStage newIndTevStage(int, int) const;
-    /* 802F3F78 */ J2DIndTexCoordScale newIndTexCoordScale(int, int) const;
-    /* 802F3FE0 */ J2DAlphaComp newAlphaComp(int) const;
-    /* 802F405C */ J2DBlend newBlend(int) const;
-    /* 802F40D8 */ u8 newDither(int) const;
+    JUtility::TColor newMatColor(int, int) const;
+    u8 newColorChanNum(int) const;
+    J2DColorChan newColorChan(int, int) const;
+    u32 newTexGenNum(int) const;
+    J2DTexCoord newTexCoord(int, int) const;
+    J2DTexMtx* newTexMtx(int, int) const;
+    u8 newCullMode(int) const;
+    u16 newTexNo(int, int) const;
+    u16 newFontNo(int) const;
+    J2DTevOrder newTevOrder(int, int) const;
+    J2DGXColorS10 newTevColor(int, int) const;
+    JUtility::TColor newTevKColor(int, int) const;
+    u8 newTevStageNum(int) const;
+    J2DTevStage newTevStage(int, int) const;
+    J2DTevSwapModeTable newTevSwapModeTable(int, int) const;
+    u8 newIndTexStageNum(int) const;
+    J2DIndTexOrder newIndTexOrder(int, int) const;
+    J2DIndTexMtx newIndTexMtx(int, int) const;
+    J2DIndTevStage newIndTevStage(int, int) const;
+    J2DIndTexCoordScale newIndTexCoordScale(int, int) const;
+    J2DAlphaComp newAlphaComp(int) const;
+    J2DBlend newBlend(int) const;
+    u8 newDither(int) const;
 
     u32 getMaterialMode(int idx) const {
         return field_0x4[field_0x8[idx]].field_0x0;
diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h
index aea5e40f74..8e10a75a8d 100644
--- a/include/JSystem/J2DGraph/J2DOrthoGraph.h
+++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h
@@ -9,15 +9,15 @@
  */
 class J2DOrthoGraph : public J2DGrafContext {
 public:
-    /* 802E9670 */ J2DOrthoGraph();
-    /* 802E96D0 */ J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near);
-    /* 802E980C */ void setOrtho(JGeometry::TBox2<f32> const& bounds, f32 far, f32 near);
-    /* 802E987C */ void scissorBounds(JGeometry::TBox2<f32>*, JGeometry::TBox2<f32> const*);
+    J2DOrthoGraph();
+    J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near);
+    void setOrtho(JGeometry::TBox2<f32> const& bounds, f32 far, f32 near);
+    void scissorBounds(JGeometry::TBox2<f32>*, JGeometry::TBox2<f32> const*);
 
-    /* 8000B118 */ virtual ~J2DOrthoGraph() {}
-    /* 802E97B4 */ virtual void setPort();
-    /* 802E9C88 */ virtual s32 getGrafType() const { return 1; }
-    /* 802E9840 */ virtual void setLookat();
+    virtual ~J2DOrthoGraph() {}
+    virtual void setPort();
+    virtual s32 getGrafType() const { return 1; }
+    virtual void setLookat();
 
     f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); }
     f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); }
diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index c37a8c2d7f..f6e8ec3b31 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -54,67 +54,67 @@ struct J2DScrnBlockPictureParameter {
  */
 class J2DPicture : public J2DPane {
 public:
-    /* 802FCFF0 */ virtual ~J2DPicture();
-    /* 802FF2E8 */ virtual u16 getTypeID() const { return 18; }
-    /* 802FDB28 */ virtual void drawSelf(f32, f32);
-    /* 802FDB90 */ virtual void drawSelf(f32, f32, Mtx*);
-    /* 802FCCDC */ virtual void initiate(ResTIMG const*, ResTLUT const*);
-    /* 802FD098 */ virtual bool prepareTexture(u8);
-    /* 801BDD40 */ virtual bool append(ResTIMG const* param_0, f32 param_1) {
+    virtual ~J2DPicture();
+    virtual u16 getTypeID() const { return 18; }
+    virtual void drawSelf(f32, f32);
+    virtual void drawSelf(f32, f32, Mtx*);
+    virtual void initiate(ResTIMG const*, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual bool append(ResTIMG const* param_0, f32 param_1) {
         return insert(param_0, mTextureNum, param_1);
     }
-    /* 802FF238 */ virtual bool append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
+    virtual bool append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
         return insert(param_0, param_1, mTextureNum, param_2);
     }
-    /* 80020338 */ virtual bool append(char const* param_0, f32 param_1) {
+    virtual bool append(char const* param_0, f32 param_1) {
         return insert(param_0, mTextureNum, param_1);
     }
-    /* 802FF2F0 */ virtual bool append(char const* param_0, JUTPalette* param_1, f32 param_2) {
+    virtual bool append(char const* param_0, JUTPalette* param_1, f32 param_2) {
         return insert(param_0, param_1, mTextureNum, param_2);
     }
-    /* 802FF208 */ virtual bool append(JUTTexture* param_0, f32 param_1) {
+    virtual bool append(JUTTexture* param_0, f32 param_1) {
         return insert(param_0, mTextureNum, param_1);
     }
-    /* 802FF3E0 */ virtual void prepend(ResTIMG const* param_0, f32 param_1) {
+    virtual void prepend(ResTIMG const* param_0, f32 param_1) {
         insert(param_0, 0, param_1);
     }
-    /* 802FF3B0 */ virtual void prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
+    virtual void prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
         insert(param_0, param_1, 0, param_2);
     }
-    /* 802FF380 */ virtual void prepend(char const* param_0, f32 param_1) {
+    virtual void prepend(char const* param_0, f32 param_1) {
         insert(param_0, 0, param_1);
     }
-    /* 802FF350 */ virtual void prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
+    virtual void prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
         insert(param_0, param_1, 0, param_2);
     }
-    /* 802FF320 */ virtual void prepend(JUTTexture* param_0, f32 param_1) {
+    virtual void prepend(JUTTexture* param_0, f32 param_1) {
         insert(param_0, 0, param_1);
     }
-    /* 801BDD70 */ virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
+    virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
         return insert(param_0, NULL, param_1, param_2);
     }
-    /* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
-    /* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
+    virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
+    virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
         return insert(param_0, NULL, param_1, param_2);
     }
-    /* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
-    /* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32);
-    /* 802FD6F4 */ virtual bool remove(u8);
-    /* 802FF410 */ virtual bool remove() { return remove(mTextureNum - 1); }
-    /* 802FD814 */ virtual bool remove(JUTTexture*);
-    /* 802FF4E0 */ virtual void draw(f32 param_0, f32 param_1, bool param_2, bool param_3,
+    virtual bool insert(char const*, JUTPalette*, u8, f32);
+    virtual bool insert(JUTTexture*, u8, f32);
+    virtual bool remove(u8);
+    virtual bool remove() { return remove(mTextureNum - 1); }
+    virtual bool remove(JUTTexture*);
+    virtual void draw(f32 param_0, f32 param_1, bool param_2, bool param_3,
                                      bool param_4) {
         draw(param_0, param_1, 0, param_2, param_3, param_4);
     }
-    /* 802FF448 */ virtual void draw(f32 param_0, f32 param_1, u8 param_2, bool param_3,
+    virtual void draw(f32 param_0, f32 param_1, u8 param_2, bool param_3,
                                      bool param_4, bool param_5) {
         if (param_2 < mTextureNum && mTexture[param_2] != NULL) {
             draw(param_0, param_1, mTexture[param_2]->getWidth(), mTexture[param_2]->getHeight(),
                 param_3, param_4, param_5);
         }
     }
-    /* 802FDC70 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
-    /* 802FF588 */ virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
+    virtual void draw(f32, f32, f32, f32, bool, bool, bool);
+    virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
                                         f32 param_4, f32 param_5) {
         if (mTexture[0] != NULL) {
             drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
@@ -122,80 +122,80 @@ public:
                                         param_5 + mTexture[0]->getHeight()));
         }
     }
-    /* 802FF524 */ virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
+    virtual void drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
                                         f32 param_4, f32 param_5, f32 param_6, f32 param_7) {
         drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
                 JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
     }
-    /* 802FDF88 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 802FF29C */ virtual void load(_GXTexMapID param_0, u8 param_1) {
+    virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    virtual void load(_GXTexMapID param_0, u8 param_1) {
         if (param_1 < mTextureNum && param_1 < 2 && mTexture[param_1] != NULL) {
             mTexture[param_1]->load(param_0);
         }
     }
-    /* 802FF268 */ virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
-    /* 800202CC */ virtual void setBlendRatio(f32 param_0, f32 param_1) {
+    virtual void load(u8 param_0) { load((_GXTexMapID)param_0, param_0); }
+    virtual void setBlendRatio(f32 param_0, f32 param_1) {
         setBlendColorRatio(param_0, param_1);
         setBlendAlphaRatio(param_0, param_1);
     }
-    /* 802FEA74 */ virtual void setBlendColorRatio(f32, f32);
-    /* 802FEA9C */ virtual void setBlendAlphaRatio(f32, f32);
-    /* 802FD874 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
-    /* 802FD964 */ virtual const ResTIMG* changeTexture(char const*, u8);
-    /* 802FD9BC */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
-    /* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
-    /* 800539DC */ virtual JUTTexture* getTexture(u8 param_0) const {
+    virtual void setBlendColorRatio(f32, f32);
+    virtual void setBlendAlphaRatio(f32, f32);
+    virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
+    virtual const ResTIMG* changeTexture(char const*, u8);
+    virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
+    virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
+    virtual JUTTexture* getTexture(u8 param_0) const {
         if (param_0 < 2) {
             return mTexture[param_0];
         }
         return NULL;
     }
-    /* 802FF634 */ virtual u8 getTextureCount() const { return mTextureNum; }
-    /* 80053C6C */ virtual bool setBlack(JUtility::TColor i_black) {
+    virtual u8 getTextureCount() const { return mTextureNum; }
+    virtual bool setBlack(JUtility::TColor i_black) {
         mBlack = i_black;
         return true;
     }
-    /* 80053C44 */ virtual bool setWhite(JUtility::TColor i_white) {
+    virtual bool setWhite(JUtility::TColor i_white) {
         mWhite = i_white;
         return true;
     }
-    /* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
+    virtual bool setBlackWhite(JUtility::TColor i_black, JUtility::TColor i_white) {
         mBlack = i_black;
         mWhite = i_white;
         return true;
     }
-    /* 801DFA4C */ virtual JUtility::TColor getBlack() const {
+    virtual JUtility::TColor getBlack() const {
         return mBlack;
     }
-    /* 801DFA40 */ virtual JUtility::TColor getWhite() const {
+    virtual JUtility::TColor getWhite() const {
         return mWhite;
     }
-    /* 8025603C */ virtual J2DMaterial* getMaterial() const { return NULL; }
-    /* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
-    /* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
+    virtual J2DMaterial* getMaterial() const { return NULL; }
+    virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
+    virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
                                              s16, Mtx*);
-    /* 802FF100 */ virtual u8 getUsableTlut(u8);
-    /* 802FF09C */ virtual bool isUsed(ResTIMG const*);
-    /* 802FF63C */ virtual bool isUsed(ResFONT const* param_0) { return J2DPane::isUsed(param_0); }
-    /* 802FF65C */ virtual void rewriteAlpha() {}
+    virtual u8 getUsableTlut(u8);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const* param_0) { return J2DPane::isUsed(param_0); }
+    virtual void rewriteAlpha() {}
 
-    /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
-    /* 802FC708 */ J2DPicture(ResTIMG const*);
-    /* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 802FC050 */ J2DPicture();
-    /* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*);
-    /* 802FC8E8 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 802FCD70 */ void private_initiate(ResTIMG const*, ResTLUT const*);
-    /* 802FCE9C */ void initinfo();
-    /* 802FE5D0 */ void setTevMode();
-    /* 802FEA60 */ static void swap(f32&, f32&);
-    /* 802FEAC4 */ void setBlendKonstColor();
-    /* 802FEB94 */ void setBlendKonstAlpha();
-    /* 802FEC64 */ void getNewColor(JUtility::TColor*);
-    /* 802FED84 */ void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
+    J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
+    J2DPicture(ResTIMG const*);
+    J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    J2DPicture();
+    J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*);
+    void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    void private_initiate(ResTIMG const*, ResTLUT const*);
+    void initinfo();
+    void setTevMode();
+    static void swap(f32&, f32&);
+    void setBlendKonstColor();
+    void setBlendKonstAlpha();
+    void getNewColor(JUtility::TColor*);
+    void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
                                     J2DMirror, bool);
-    /* 802FED44 */ void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
-    /* 802FF1D0 */ GXTlut getTlutID(ResTIMG const*, u8);
+    void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
+    GXTlut getTlutID(ResTIMG const*, u8);
 
     void setCornerColor(JUtility::TColor c0, JUtility::TColor c1, JUtility::TColor c2,
                         JUtility::TColor c3) {
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h
index 9d7e86bb6f..d58530c037 100644
--- a/include/JSystem/J2DGraph/J2DPictureEx.h
+++ b/include/JSystem/J2DGraph/J2DPictureEx.h
@@ -23,83 +23,83 @@ public:
         STAGE_7,
     };
 
-    /* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
-    /* 803040E4 */ void insertCommon(u8, f32);
-    /* 8030437C */ bool isInsert(u8) const;
-    /* 80304728 */ bool isRemove(u8) const;
-    /* 803052AC */ void setTevOrder(u8, u8, bool);
-    /* 803053E0 */ void setTevStage(u8, u8, bool);
-    /* 80305688 */ void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
-    /* 80305928 */ void setTevKColor(u8);
-    /* 80305C70 */ void setTevKColorSel(u8);
-    /* 80305D18 */ void setTevKAlphaSel(u8);
-    /* 80305DC0 */ void shiftSetBlendRatio(u8, f32, bool, bool);
-    /* 80306664 */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
-    /* 80306824 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
+    J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
+    void insertCommon(u8, f32);
+    bool isInsert(u8) const;
+    bool isRemove(u8) const;
+    void setTevOrder(u8, u8, bool);
+    void setTevStage(u8, u8, bool);
+    void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
+    void setTevKColor(u8);
+    void setTevKColorSel(u8);
+    void setTevKAlphaSel(u8);
+    void shiftSetBlendRatio(u8, f32, bool, bool);
+    bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
+    bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
 
-    /* 8030393C */ virtual ~J2DPictureEx();
-    /* 80307168 */ virtual void setCullBack(bool);
-    /* 803069D8 */ virtual void setCullBack(_GXCullMode);
-    /* 803069B8 */ virtual void setAlpha(u8);
-    /* 80303AB4 */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
-    /* 80306A24 */ virtual bool isUsed(ResTIMG const*);
-    /* 803071A4 */ virtual bool isUsed(ResFONT const*);
-    /* 80306A0C */ virtual void rewriteAlpha();
-    /* 803071C4 */ virtual void setAnimation(J2DAnmBase*);
-    /* 80256064 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
-    /* 80306AC4 */ virtual void setAnimation(J2DAnmColor*);
-    /* 80306B1C */ virtual void setAnimation(J2DAnmTexPattern*);
-    /* 80306AF0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
-    /* 80306B48 */ virtual void setAnimation(J2DAnmTevRegKey*);
-    /* 80306B74 */ virtual void setAnimation(J2DAnmVisibilityFull*);
-    /* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*);
-    /* 80306C70 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
-    /* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*);
-    /* 803039CC */ virtual bool prepareTexture(u8);
-    /* 80306ED4 */ virtual bool append(ResTIMG const*, f32);
-    /* 80303E5C */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
-    /* 80306F04 */ virtual bool append(char const*, f32);
-    /* 80303EA4 */ virtual bool append(char const*, JUTPalette*, f32);
-    /* 80303EEC */ virtual bool append(JUTTexture*, f32);
-    /* 80306FF4 */ virtual void prepend(ResTIMG const*, f32);
-    /* 80306FC4 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
-    /* 80306F94 */ virtual void prepend(char const*, f32);
-    /* 80306F64 */ virtual void prepend(char const*, JUTPalette*, f32);
-    /* 80306F34 */ virtual void prepend(JUTTexture*, f32);
-    /* 80307058 */ virtual bool insert(ResTIMG const*, u8, f32);
-    /* 80303F34 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
-    /* 80307024 */ virtual bool insert(char const*, u8, f32);
-    /* 80303FD8 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
-    /* 80304048 */ virtual bool insert(JUTTexture*, u8, f32);
-    /* 8030446C */ virtual bool remove(u8);
-    /* 80304608 */ virtual bool remove();
-    /* 8030466C */ virtual bool remove(JUTTexture*);
-    /* 8030708C */ virtual void draw(f32, f32, bool, bool, bool);
-    /* 8030477C */ virtual void draw(f32, f32, u8, bool, bool, bool);
-    /* 80304890 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
-    /* 80304D88 */ virtual void drawOut(f32, f32, f32, f32, f32, f32);
-    /* 803070D0 */ virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
-    /* 80304EF0 */ virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 80305264 */ virtual void load(_GXTexMapID, u8);
-    /* 80307134 */ virtual void load(u8);
-    /* 80305ED4 */ virtual void setBlendColorRatio(f32, f32);
-    /* 80305F34 */ virtual void setBlendAlphaRatio(f32, f32);
-    /* 80305F94 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
-    /* 803060DC */ virtual const ResTIMG* changeTexture(char const*, u8);
-    /* 80306134 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
-    /* 80306298 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
-    /* 803062F8 */ virtual JUTTexture* getTexture(u8) const;
-    /* 80306350 */ virtual u8 getTextureCount() const;
-    /* 80306370 */ virtual bool setBlack(JUtility::TColor);
-    /* 803063F8 */ virtual bool setWhite(JUtility::TColor);
-    /* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 803068F8 */ virtual JUtility::TColor getBlack() const;
-    /* 80306958 */ virtual JUtility::TColor getWhite() const;
-    /* 80256034 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
-    /* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
-    /* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
+    virtual ~J2DPictureEx();
+    virtual void setCullBack(bool);
+    virtual void setCullBack(_GXCullMode);
+    virtual void setAlpha(u8);
+    virtual void drawSelf(f32, f32, f32 (*)[3][4]);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void rewriteAlpha();
+    virtual void setAnimation(J2DAnmBase*);
+    virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
+    virtual void setAnimation(J2DAnmColor*);
+    virtual void setAnimation(J2DAnmTexPattern*);
+    virtual void setAnimation(J2DAnmTextureSRTKey*);
+    virtual void setAnimation(J2DAnmTevRegKey*);
+    virtual void setAnimation(J2DAnmVisibilityFull*);
+    virtual void setAnimation(J2DAnmVtxColor*);
+    virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
+    virtual void initiate(ResTIMG const*, ResTLUT const*);
+    virtual bool prepareTexture(u8);
+    virtual bool append(ResTIMG const*, f32);
+    virtual bool append(ResTIMG const*, JUTPalette*, f32);
+    virtual bool append(char const*, f32);
+    virtual bool append(char const*, JUTPalette*, f32);
+    virtual bool append(JUTTexture*, f32);
+    virtual void prepend(ResTIMG const*, f32);
+    virtual void prepend(ResTIMG const*, JUTPalette*, f32);
+    virtual void prepend(char const*, f32);
+    virtual void prepend(char const*, JUTPalette*, f32);
+    virtual void prepend(JUTTexture*, f32);
+    virtual bool insert(ResTIMG const*, u8, f32);
+    virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
+    virtual bool insert(char const*, u8, f32);
+    virtual bool insert(char const*, JUTPalette*, u8, f32);
+    virtual bool insert(JUTTexture*, u8, f32);
+    virtual bool remove(u8);
+    virtual bool remove();
+    virtual bool remove(JUTTexture*);
+    virtual void draw(f32, f32, bool, bool, bool);
+    virtual void draw(f32, f32, u8, bool, bool, bool);
+    virtual void draw(f32, f32, f32, f32, bool, bool, bool);
+    virtual void drawOut(f32, f32, f32, f32, f32, f32);
+    virtual void drawOut(f32, f32, f32, f32, f32, f32, f32, f32);
+    virtual void drawOut(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    virtual void load(_GXTexMapID, u8);
+    virtual void load(u8);
+    virtual void setBlendColorRatio(f32, f32);
+    virtual void setBlendAlphaRatio(f32, f32);
+    virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
+    virtual const ResTIMG* changeTexture(char const*, u8);
+    virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
+    virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
+    virtual JUTTexture* getTexture(u8) const;
+    virtual u8 getTextureCount() const;
+    virtual bool setBlack(JUtility::TColor);
+    virtual bool setWhite(JUtility::TColor);
+    virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
+    virtual JUtility::TColor getBlack() const;
+    virtual JUtility::TColor getWhite() const;
+    virtual J2DMaterial* getMaterial() const { return mMaterial; }
+    virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
+    virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
                                              s16, f32 (*)[3][4]);
-    /* 80306DC8 */ virtual u8 getUsableTlut(u8);
+    virtual u8 getUsableTlut(u8);
 
 private:
     /* 0x150 */ J2DMaterial* mMaterial;
diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index 8f24a0d60c..48bdb59bc9 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -24,21 +24,21 @@ public:
 
     void initiate();
 
-    /* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
-    /* 802F4658 */ static u8* setBuffer(size_t);
-    /* 802F46C4 */ void setFontSize();
-    /* 802F475C */ void locate(f32, f32);
-    /* 802F4778 */ f32 print(f32, f32, u8, char const*, ...);
-    /* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
+    J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor);
+    static u8* setBuffer(size_t);
+    void setFontSize();
+    void locate(f32, f32);
+    f32 print(f32, f32, u8, char const*, ...);
+    void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding,
                                     f32, f32, u8);
-    /* 802F4B4C */ f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
-    /* 802F52E8 */ void doCtrlCode(int);
-    /* 802F5410 */ u16 doEscapeCode(u8 const**, u8);
-    /* 802F594C */ void initchar();
-    /* 802F59C0 */ s32 getNumberS32(u8 const**, s32, s32, int);
-    /* 802F5AC4 */ f32 getNumberF32(u8 const**, f32, f32, int);
+    f32 parse(u8 const*, int, int, u16*, J2DPrint::TSize&, u8, bool);
+    void doCtrlCode(int);
+    u16 doEscapeCode(u8 const**, u8);
+    void initchar();
+    s32 getNumberS32(u8 const**, s32, s32, int);
+    f32 getNumberF32(u8 const**, f32, f32, int);
 
-    /* 802F4420 */ virtual ~J2DPrint();
+    virtual ~J2DPrint();
 
     f32 print_va(u8 alpha, const char* fmt, va_list args) {
         return J2DPrint_print_alpha_va(this, alpha, fmt, args);
@@ -66,7 +66,7 @@ public:
     static size_t mStrBuffSize;
 
 private:
-    /* 802F4468 */ void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
+    void private_initiate(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor,
                                          JUtility::TColor, JUtility::TColor, bool);
 
     /* 0x04 */ JUTFont* mFont;
diff --git a/include/JSystem/J2DGraph/J2DScreen.h b/include/JSystem/J2DGraph/J2DScreen.h
index ed4a0311a5..fbd65db10b 100644
--- a/include/JSystem/J2DGraph/J2DScreen.h
+++ b/include/JSystem/J2DGraph/J2DScreen.h
@@ -47,43 +47,43 @@ struct J2DScrnBlockHeader {
  */
 class J2DScreen : public J2DPane {
 public:
-    /* 802F8540 */ virtual ~J2DScreen();
-    /* 802F9A18 */ virtual u16 getTypeID() const;
-    /* 802F9A20 */ virtual void calcMtx();
-    /* 802F9120 */ virtual void drawSelf(f32, f32, Mtx*);
-    /* 802F90A0 */ virtual J2DPane* search(u64);
-    /* 802F90E0 */ virtual J2DPane* searchUserInfo(u64);
-    /* 802F9600 */ virtual bool isUsed(ResTIMG const*);
-    /* 802F9620 */ virtual bool isUsed(ResFONT const*);
-    /* 80053BA0 */ virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
-    /* 802F9704 */ virtual void setAnimation(J2DAnmColor*);
-    /* 80192414 */ virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
-    /* 802F9798 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802F99A8 */ virtual void setAnimation(J2DAnmVtxColor*);
-    /* 802F9838 */ virtual void setAnimation(J2DAnmTexPattern*);
-    /* 802F99C8 */ virtual void setAnimation(J2DAnmVisibilityFull*);
-    /* 802F98CC */ virtual void setAnimation(J2DAnmTevRegKey*);
-    /* 802F9A54 */ virtual void setAnimation(J2DAnmBase*);
-    /* 802F9A74 */ virtual void setAnimationVF(J2DAnmVisibilityFull*);
-    /* 802F9A78 */ virtual void setAnimationVC(J2DAnmVtxColor*);
-    /* 802F99E8 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
+    virtual ~J2DScreen();
+    virtual u16 getTypeID() const;
+    virtual void calcMtx();
+    virtual void drawSelf(f32, f32, Mtx*);
+    virtual J2DPane* search(u64);
+    virtual J2DPane* searchUserInfo(u64);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void clearAnmTransform() { J2DPane::clearAnmTransform(); }
+    virtual void setAnimation(J2DAnmColor*);
+    virtual void setAnimation(J2DAnmTransform* i_bck) { J2DPane::setAnimation(i_bck); }
+    virtual void setAnimation(J2DAnmTextureSRTKey*);
+    virtual void setAnimation(J2DAnmVtxColor*);
+    virtual void setAnimation(J2DAnmTexPattern*);
+    virtual void setAnimation(J2DAnmVisibilityFull*);
+    virtual void setAnimation(J2DAnmTevRegKey*);
+    virtual void setAnimation(J2DAnmBase*);
+    virtual void setAnimationVF(J2DAnmVisibilityFull*);
+    virtual void setAnimationVC(J2DAnmVtxColor*);
+    virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
                                                J2DPane*, u32);
-    /* 802F8B98 */ virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
+    virtual J2DPane* createPane(J2DScrnBlockHeader const&, JSURandomInputStream*,
                                                J2DPane*, u32, JKRArchive*);
 
-    /* 802F8498 */ J2DScreen();
-    /* 802F85A8 */ void clean();
-    /* 802F8648 */ bool setPriority(char const*, u32, JKRArchive*);
-    /* 802F8748 */ bool setPriority(JSURandomInputStream*, u32, JKRArchive*);
-    /* 802F8778 */ bool private_set(JSURandomInputStream*, u32, JKRArchive*);
-    /* 802F8834 */ bool checkSignature(JSURandomInputStream*);
-    /* 802F8894 */ bool getScreenInformation(JSURandomInputStream*);
-    /* 802F8990 */ s32 makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*);
-    /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
-    /* 802F9280 */ J2DResReference* getResReference(JSURandomInputStream*, u32);
-    /* 802F937C */ bool createMaterial(JSURandomInputStream*, u32, JKRArchive*);
-    /* 802F9640 */ static void* getNameResource(char const*);
-    /* 802F9690 */ void animation();
+    J2DScreen();
+    void clean();
+    bool setPriority(char const*, u32, JKRArchive*);
+    bool setPriority(JSURandomInputStream*, u32, JKRArchive*);
+    bool private_set(JSURandomInputStream*, u32, JKRArchive*);
+    bool checkSignature(JSURandomInputStream*);
+    bool getScreenInformation(JSURandomInputStream*);
+    s32 makeHierarchyPanes(J2DPane*, JSURandomInputStream*, u32, JKRArchive*);
+    void draw(f32, f32, J2DGrafContext const*);
+    J2DResReference* getResReference(JSURandomInputStream*, u32);
+    bool createMaterial(JSURandomInputStream*, u32, JKRArchive*);
+    static void* getNameResource(char const*);
+    void animation();
 
     void setScissor(bool i_scissor) { mScissor = i_scissor; }
 
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index 0bf0b8ed8e..68cf967eb4 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -55,10 +55,10 @@ public:
     J2DTexMtx() { mInfo = j2dDefaultTexMtxInfo; }
     ~J2DTexMtx() {}
     J2DTexMtx(const J2DTexMtxInfo& info) { mInfo = info; }
-    /* 802E9C90 */ void load(u32);
-    /* 802E9CC4 */ void calc();
-    /* 802E9D2C */ void getTextureMtx(J2DTextureSRTInfo const&, Vec, Mtx);
-    /* 802E9EBC */ void getTextureMtxMaya(J2DTextureSRTInfo const&, Mtx);
+    void load(u32);
+    void calc();
+    void getTextureMtx(J2DTextureSRTInfo const&, Vec, Mtx);
+    void getTextureMtxMaya(J2DTextureSRTInfo const&, Mtx);
     J2DTexMtxInfo& getTexMtxInfo() { return mInfo; }
     void setTexMtxInfo(J2DTexMtxInfo info) { mInfo = info; }
 
@@ -92,7 +92,7 @@ extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull;
  */
 class J2DIndTexOrder {
 public:
-    /* 802EB378 */ J2DIndTexOrder() {
+    J2DIndTexOrder() {
         mInfo = j2dDefaultIndTexOrderNull;
     }
     J2DIndTexOrder(const J2DIndTexOrderInfo& info) {
@@ -102,7 +102,7 @@ public:
         mInfo = info;
         return *this;
     }
-    /* 802EA0FC */ void load(u8);
+    void load(u8);
 
 private:
     /* 0x0 */ J2DIndTexOrderInfo mInfo;
@@ -135,8 +135,8 @@ extern J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo;
  */
 class J2DIndTexMtx {
 public:
-    /* 802EB2E4 */ ~J2DIndTexMtx() {}
-    /* 802EB320 */ J2DIndTexMtx() {
+    ~J2DIndTexMtx() {}
+    J2DIndTexMtx() {
         mIndTexMtxInfo = j2dDefaultIndTexMtxInfo;
     }
     J2DIndTexMtx(const J2DIndTexMtxInfo& info) {
@@ -146,9 +146,9 @@ public:
         mIndTexMtxInfo = info;
         return *this;
     }
-    /* 802EA098 */ void load(u8);
-    /* 802E9C90 */ void load(u32);
-    /* 802E9CC4 */ void calc();
+    void load(u8);
+    void load(u32);
+    void calc();
 
 private:
     /* 0x0 */ J2DIndTexMtxInfo mIndTexMtxInfo;
@@ -179,8 +179,8 @@ extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo;
  */
 class J2DIndTexCoordScale {
 public:
-    /* 802EB290 */ ~J2DIndTexCoordScale() {}
-    /* 802EB2CC */ J2DIndTexCoordScale() {
+    ~J2DIndTexCoordScale() {}
+    J2DIndTexCoordScale() {
         mInfo = j2dDefaultIndTexCoordScaleInfo;
     }
     J2DIndTexCoordScale(const J2DIndTexCoordScaleInfo& info) {
@@ -190,7 +190,7 @@ public:
         mInfo = info;
         return *this;
     }
-    /* 802EA0CC */ void load(u8);
+    void load(u8);
 
 private:
     /* 0x0 */ J2DIndTexCoordScaleInfo mInfo;
@@ -229,8 +229,8 @@ extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo;
  */
 class J2DIndTevStage {
 public:
-    /* 802EA044 */ void load(u8);
-    /* 802F18A0 */ J2DIndTevStage() {
+    void load(u8);
+    J2DIndTevStage() {
         mFlags = J2DCalcIndTevStage(j2dDefaultIndTevStageInfo);
     }
     J2DIndTevStage(const J2DIndTevStageInfo& info) {
@@ -279,7 +279,7 @@ extern J2DTexCoordInfo const j2dDefaultTexCoordInfo[8];
  */
 class J2DTexCoord {
 public:
-    /* 802EB260 */ inline J2DTexCoord() {
+    inline J2DTexCoord() {
         mTexCoordInfo = j2dDefaultTexCoordInfo[0];
     }
 
@@ -322,7 +322,7 @@ extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull;
  */
 class J2DTevOrder {
 public:
-    /* 802F1B70 */ J2DTevOrder() {
+    J2DTevOrder() {
         mTevOrderInfo = j2dDefaultTevOrderInfoNull;
     }
 
@@ -386,9 +386,9 @@ extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode;
  */
 class J2DTevStage {
 public:
-    /* 802F4110 */ J2DTevStage(J2DTevStageInfo const&);
-    /* 802F1940 */ J2DTevStage();
-    /* 802F19A8 */ void setTevStageInfo(J2DTevStageInfo const&);
+    J2DTevStage(J2DTevStageInfo const&);
+    J2DTevStage();
+    void setTevStageInfo(J2DTevStageInfo const&);
 
     void setStageNo(u32 param_0) {
         field_0x0 = (param_0 << 1) + 0xc0;
@@ -538,7 +538,7 @@ extern const u8 data_804561AC;
 
 class J2DTevSwapModeTable {
 public:
-    /* 802F1934 */ J2DTevSwapModeTable() { field_0x0 = data_804561AC; }
+    J2DTevSwapModeTable() { field_0x0 = data_804561AC; }
     J2DTevSwapModeTable(const J2DTevSwapModeTableInfo& info) {
         field_0x0 = J2DCalcTevSwapTable(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
     }
@@ -575,7 +575,7 @@ extern const J2DColorChanInfo j2dDefaultColorChanInfo;
  */
 class J2DColorChan {
 public:
-    /* 802EB280 */ J2DColorChan() {
+    J2DColorChan() {
         setColorChanInfo(j2dDefaultColorChanInfo);
     }
     J2DColorChan(const J2DColorChanInfo& info) {
diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h
index 2663da7621..d8327bdff2 100644
--- a/include/JSystem/J2DGraph/J2DTextBox.h
+++ b/include/JSystem/J2DGraph/J2DTextBox.h
@@ -61,45 +61,45 @@ public:
         /* 0x4 */ f32 mSizeY;
     };
 
-    /* 803001E0 */ virtual ~J2DTextBox();
-    /* 80300C68 */ virtual u16 getTypeID() const;
-    /* 80300AF8 */ virtual void resize(f32, f32);
-    /* 80300870 */ virtual bool setConnectParent(bool);
-    /* 80300950 */ virtual void drawSelf(f32, f32, Mtx*);
-    /* 803008E8 */ virtual void drawSelf(f32, f32);
-    /* 80300C70 */ virtual bool isUsed(ResTIMG const*);
-    /* 80300BFC */ virtual bool isUsed(ResFONT const*);
-    /* 80300C90 */ virtual void rewriteAlpha();
-    /* 803002E8 */ virtual void draw(f32, f32);
-    /* 80300490 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
-    /* 80300278 */ virtual void setFont(JUTFont*);
-    /* 8021C7F4 */ virtual JUTFont* getFont() const { return mFont; }
-    /* 80254408 */ virtual bool setBlack(JUtility::TColor);
-    /* 80186C84 */ virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
-    /* 8019230C */ virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
+    virtual ~J2DTextBox();
+    virtual u16 getTypeID() const;
+    virtual void resize(f32, f32);
+    virtual bool setConnectParent(bool);
+    virtual void drawSelf(f32, f32, Mtx*);
+    virtual void drawSelf(f32, f32);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void rewriteAlpha();
+    virtual void draw(f32, f32);
+    virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
+    virtual void setFont(JUTFont*);
+    virtual JUTFont* getFont() const { return mFont; }
+    virtual bool setBlack(JUtility::TColor);
+    virtual bool setWhite(JUtility::TColor white) { mWhiteColor = white; return true; }
+    virtual bool setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
         mBlackColor = black;
         mWhiteColor = white;
         return true;
     }
-    /* 801DFA34 */ virtual JUtility::TColor getBlack() const {
+    virtual JUtility::TColor getBlack() const {
         return mBlackColor;
     }
-    /* 801DFA28 */ virtual JUtility::TColor getWhite() const {
+    virtual JUtility::TColor getWhite() const {
         return mWhiteColor;
     }
-    /* 8025602C */ virtual J2DMaterial* getMaterial() const { return NULL; }
+    virtual J2DMaterial* getMaterial() const { return NULL; }
 
-    /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
+    J2DTextBox(u64, JGeometry::TBox2<f32> const&, ResFONT const*, char const*, s16,
                               J2DTextBoxHBinding, J2DTextBoxVBinding);
-    /* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
-    /* 802FF660 */ J2DTextBox();
-    /* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
+    J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
+    J2DTextBox();
+    void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding,
                                  J2DTextBoxVBinding);
-    /* 802FFE88 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 80300658 */ char* getStringPtr() const;
-    /* 8030074C */ s32 setString(s16, char const*, ...);
-    /* 80300660 */ s32 setString(char const*, ...);
+    void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    char* getStringPtr() const;
+    s32 setString(s16, char const*, ...);
+    s32 setString(char const*, ...);
 
     void setFontSize(f32 sizeX, f32 sizeY) {
         f32 x;
diff --git a/include/JSystem/J2DGraph/J2DTextBoxEx.h b/include/JSystem/J2DGraph/J2DTextBoxEx.h
index 289dbd962d..470704562d 100644
--- a/include/JSystem/J2DGraph/J2DTextBoxEx.h
+++ b/include/JSystem/J2DGraph/J2DTextBoxEx.h
@@ -17,40 +17,40 @@ public:
         STAGE_2,
     };
 
-    /* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
-    /* 80307E0C */ void setTevOrder(bool);
-    /* 80307EF0 */ void setTevStage(bool);
-    /* 80307F94 */ void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum);
-    /* 803084CC */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
-    /* 80308668 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
+    J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
+    void setTevOrder(bool);
+    void setTevStage(bool);
+    void setStage(J2DTevStage*, J2DTextBoxEx::stage_enum);
+    bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
+    bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
 
-    /* 8030751C */ virtual ~J2DTextBoxEx();
-    /* 803089EC */ virtual void setCullBack(bool);
-    /* 803087DC */ virtual void setCullBack(_GXCullMode);
-    /* 803087BC */ virtual void setAlpha(u8);
-    /* 803075AC */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
-    /* 80308A28 */ virtual bool isUsed(ResTIMG const*);
-    /* 80308828 */ virtual bool isUsed(ResFONT const*);
-    /* 80308810 */ virtual void rewriteAlpha();
-    /* 80308A4C */ virtual void setAnimation(J2DAnmBase*);
-    /* 80256044 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
-    /* 803088B4 */ virtual void setAnimation(J2DAnmColor*);
-    /* 8030890C */ virtual void setAnimation(J2DAnmTexPattern*);
-    /* 803088E0 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
-    /* 80308938 */ virtual void setAnimation(J2DAnmTevRegKey*);
-    /* 80308964 */ virtual void setAnimation(J2DAnmVisibilityFull*);
-    /* 80308A48 */ virtual void setAnimation(J2DAnmVtxColor*);
-    /* 8030896C */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
-    /* 803078AC */ virtual void draw(f32, f32);
-    /* 80307AF0 */ virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
-    /* 80307D5C */ virtual void setFont(JUTFont*);
-    /* 80307DC0 */ virtual JUTFont* getFont() const;
-    /* 8030823C */ virtual bool setBlack(JUtility::TColor);
-    /* 803082C4 */ virtual bool setWhite(JUtility::TColor);
-    /* 8030834C */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 803086FC */ virtual JUtility::TColor getBlack() const;
-    /* 8030875C */ virtual JUtility::TColor getWhite() const;
-    /* 80256024 */ virtual J2DMaterial* getMaterial() const { return mMaterial; }
+    virtual ~J2DTextBoxEx();
+    virtual void setCullBack(bool);
+    virtual void setCullBack(_GXCullMode);
+    virtual void setAlpha(u8);
+    virtual void drawSelf(f32, f32, f32 (*)[3][4]);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void rewriteAlpha();
+    virtual void setAnimation(J2DAnmBase*);
+    virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
+    virtual void setAnimation(J2DAnmColor*);
+    virtual void setAnimation(J2DAnmTexPattern*);
+    virtual void setAnimation(J2DAnmTextureSRTKey*);
+    virtual void setAnimation(J2DAnmTevRegKey*);
+    virtual void setAnimation(J2DAnmVisibilityFull*);
+    virtual void setAnimation(J2DAnmVtxColor*);
+    virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
+    virtual void draw(f32, f32);
+    virtual void draw(f32, f32, f32, J2DTextBoxHBinding);
+    virtual void setFont(JUTFont*);
+    virtual JUTFont* getFont() const;
+    virtual bool setBlack(JUtility::TColor);
+    virtual bool setWhite(JUtility::TColor);
+    virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
+    virtual JUtility::TColor getBlack() const;
+    virtual JUtility::TColor getWhite() const;
+    virtual J2DMaterial* getMaterial() const { return mMaterial; }
 
 private:
     /* 0x138 */ J2DMaterial* mMaterial;
diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h
index 20ab4c1c7d..5b03b3ef9a 100644
--- a/include/JSystem/J2DGraph/J2DWindow.h
+++ b/include/JSystem/J2DGraph/J2DWindow.h
@@ -29,41 +29,41 @@ public:
         /* 0xC */ JUtility::TColor field_0xc;
     };  // Size: 0x10
 
-    /* 802F9C10 */ J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*);
-    /* 802F9B74 */ J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 802F9A7C */ J2DWindow();
-    /* 802FA118 */ void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
-    /* 802FA604 */ void initinfo2();
-    /* 802FAA5C */ void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 802FB12C */ void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor,
+    J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*);
+    J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    J2DWindow();
+    void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*);
+    void initinfo2();
+    void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor,
                                          JUtility::TColor);
-    /* 802FB634 */ void drawFrameTexture(JUTTexture*, f32, f32, f32, f32, u16, u16, u16, u16, bool);
-    /* 802FB7C8 */ void drawFrameTexture(JUTTexture*, f32, f32, bool, bool, bool);
-    /* 802FB868 */ void drawContentsTexture(f32, f32, f32, f32);
-    /* 802FBB90 */ void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
+    void drawFrameTexture(JUTTexture*, f32, f32, f32, f32, u16, u16, u16, u16, bool);
+    void drawFrameTexture(JUTTexture*, f32, f32, bool, bool, bool);
+    void drawContentsTexture(f32, f32, f32, f32);
+    void setTevMode(JUTTexture*, JUtility::TColor, JUtility::TColor);
 
-    /* 802FA880 */ virtual ~J2DWindow();
-    /* 802FBF98 */ virtual u16 getTypeID() const;
-    /* 802FB000 */ virtual void resize(f32, f32);
-    /* 802FB1D8 */ virtual void drawSelf(f32, f32);
-    /* 802FB240 */ virtual void drawSelf(f32, f32, Mtx*);
-    /* 802FBEDC */ virtual bool isUsed(ResTIMG const*);
-    /* 802FC02C */ virtual bool isUsed(ResFONT const*);
-    /* 802FC04C */ virtual void rewriteAlpha();
-    /* 802FA928 */ virtual void draw(JGeometry::TBox2<f32> const&);
-    /* 802FAED0 */ virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 802FBFA0 */ virtual void draw(f32, f32, f32, f32);
-    /* 80254430 */ virtual bool setBlack(JUtility::TColor);
-    /* 802543E0 */ virtual bool setWhite(JUtility::TColor);
-    /* 80254568 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 80254000 */ virtual JUtility::TColor getBlack() const;
-    /* 8025400C */ virtual JUtility::TColor getWhite() const;
-    /* 802FBE60 */ virtual JUTTexture* getFrameTexture(u8, u8) const;
-    /* 802FBFE8 */ virtual JUTTexture* getContentsTexture(u8) const;
-    /* 802FC000 */ virtual void getMaterial(J2DWindow::TMaterial&) const;
-    /* 802FC01C */ virtual J2DMaterial* getFrameMaterial(u8) const;
-    /* 802FC024 */ virtual J2DMaterial* getContentsMaterial() const;
-    /* 802FB338 */ virtual void drawContents(JGeometry::TBox2<f32> const&);
+    virtual ~J2DWindow();
+    virtual u16 getTypeID() const;
+    virtual void resize(f32, f32);
+    virtual void drawSelf(f32, f32);
+    virtual void drawSelf(f32, f32, Mtx*);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void rewriteAlpha();
+    virtual void draw(JGeometry::TBox2<f32> const&);
+    virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    virtual void draw(f32, f32, f32, f32);
+    virtual bool setBlack(JUtility::TColor);
+    virtual bool setWhite(JUtility::TColor);
+    virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
+    virtual JUtility::TColor getBlack() const;
+    virtual JUtility::TColor getWhite() const;
+    virtual JUTTexture* getFrameTexture(u8, u8) const;
+    virtual JUTTexture* getContentsTexture(u8) const;
+    virtual void getMaterial(J2DWindow::TMaterial&) const;
+    virtual J2DMaterial* getFrameMaterial(u8) const;
+    virtual J2DMaterial* getContentsMaterial() const;
+    virtual void drawContents(JGeometry::TBox2<f32> const&);
 
     bool isField0x145Set(u8 flag) { return field_0x145 & flag; }
 
diff --git a/include/JSystem/J2DGraph/J2DWindowEx.h b/include/JSystem/J2DGraph/J2DWindowEx.h
index dffa25349c..467d70864e 100644
--- a/include/JSystem/J2DGraph/J2DWindowEx.h
+++ b/include/JSystem/J2DGraph/J2DWindowEx.h
@@ -17,49 +17,49 @@ public:
         STAGE_ENUM_4,
     };
 
-    /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
-    /* 80300F80 */ void setMinSize();
-    /* 803012CC */ void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 80301D74 */ void drawFrameTexture(f32, f32, f32, f32, u16, u16, u16, u16, J2DMaterial*,
+    J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
+    void setMinSize();
+    void draw_private(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    void drawFrameTexture(f32, f32, f32, f32, u16, u16, u16, u16, J2DMaterial*,
                                          bool);
-    /* 80302284 */ void setTevOrder(bool);
-    /* 80302388 */ void setTevStage(bool);
-    /* 803024B4 */ void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
-    /* 80302A4C */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
-    /* 80302BE8 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
-    /* 8030321C */ bool isNeedSetAnm(u8);
+    void setTevOrder(bool);
+    void setTevStage(bool);
+    void setStage(J2DTevStage*, J2DWindowEx::stage_enum);
+    bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
+    bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
+    bool isNeedSetAnm(u8);
 
-    /* 80301144 */ virtual ~J2DWindowEx();
-    /* 803035C0 */ virtual void setCullBack(bool);
-    /* 80302D98 */ virtual void setCullBack(_GXCullMode);
-    /* 80302D48 */ virtual void setAlpha(u8);
-    /* 8030122C */ virtual void drawSelf(f32, f32, f32 (*)[3][4]);
-    /* 80302EDC */ virtual bool isUsed(ResTIMG const*);
-    /* 803035FC */ virtual bool isUsed(ResFONT const*);
-    /* 80302DF4 */ virtual void rewriteAlpha();
-    /* 8030361C */ virtual void setAnimation(J2DAnmBase*);
-    /* 80256084 */ virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
-    /* 80302FFC */ virtual void setAnimation(J2DAnmColor*);
-    /* 8030310C */ virtual void setAnimation(J2DAnmTexPattern*);
-    /* 80303084 */ virtual void setAnimation(J2DAnmTextureSRTKey*);
-    /* 80303194 */ virtual void setAnimation(J2DAnmTevRegKey*);
-    /* 80303274 */ virtual void setAnimation(J2DAnmVisibilityFull*);
-    /* 8030327C */ virtual void setAnimation(J2DAnmVtxColor*);
-    /* 80303370 */ virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
-    /* 80301FC8 */ virtual void draw(JGeometry::TBox2<f32> const&);
-    /* 80302164 */ virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
-    /* 80303568 */ virtual void draw(f32, f32, f32, f32);
-    /* 80302764 */ virtual bool setBlack(JUtility::TColor);
-    /* 803027EC */ virtual bool setWhite(JUtility::TColor);
-    /* 80302874 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 80302C88 */ virtual JUtility::TColor getBlack() const;
-    /* 80302CE8 */ virtual JUtility::TColor getWhite() const;
-    /* 80302E0C */ virtual JUTTexture* getFrameTexture(u8, u8) const;
-    /* 80302E74 */ virtual JUTTexture* getContentsTexture(u8) const;
-    /* 8030353C */ virtual void getMaterial(J2DWindow::TMaterial&) const;
-    /* 80303510 */ virtual J2DMaterial* getFrameMaterial(u8) const;
-    /* 80303534 */ virtual J2DMaterial* getContentsMaterial() const;
-    /* 80301994 */ virtual void drawContents(JGeometry::TBox2<f32> const&);
+    virtual ~J2DWindowEx();
+    virtual void setCullBack(bool);
+    virtual void setCullBack(_GXCullMode);
+    virtual void setAlpha(u8);
+    virtual void drawSelf(f32, f32, f32 (*)[3][4]);
+    virtual bool isUsed(ResTIMG const*);
+    virtual bool isUsed(ResFONT const*);
+    virtual void rewriteAlpha();
+    virtual void setAnimation(J2DAnmBase*);
+    virtual void setAnimation(J2DAnmTransform* transform) { J2DPane::setAnimation(transform); }
+    virtual void setAnimation(J2DAnmColor*);
+    virtual void setAnimation(J2DAnmTexPattern*);
+    virtual void setAnimation(J2DAnmTextureSRTKey*);
+    virtual void setAnimation(J2DAnmTevRegKey*);
+    virtual void setAnimation(J2DAnmVisibilityFull*);
+    virtual void setAnimation(J2DAnmVtxColor*);
+    virtual const J2DAnmTransform* animationPane(J2DAnmTransform const*);
+    virtual void draw(JGeometry::TBox2<f32> const&);
+    virtual void draw(JGeometry::TBox2<f32> const&, JGeometry::TBox2<f32> const&);
+    virtual void draw(f32, f32, f32, f32);
+    virtual bool setBlack(JUtility::TColor);
+    virtual bool setWhite(JUtility::TColor);
+    virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
+    virtual JUtility::TColor getBlack() const;
+    virtual JUtility::TColor getWhite() const;
+    virtual JUTTexture* getFrameTexture(u8, u8) const;
+    virtual JUTTexture* getContentsTexture(u8) const;
+    virtual void getMaterial(J2DWindow::TMaterial&) const;
+    virtual J2DMaterial* getFrameMaterial(u8) const;
+    virtual J2DMaterial* getContentsMaterial() const;
+    virtual void drawContents(JGeometry::TBox2<f32> const&);
 
 private:
     /* 0x148 */ J2DMaterial* mFrameMaterial[4];
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index b614e06b11..a7d140a021 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -503,10 +503,10 @@ public:
  */
 class J3DAnmTransform : public J3DAnmBase {
 public:
-    /* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*);
+    J3DAnmTransform(s16, f32*, s16*, f32*);
 
-    /* 8003B93C */ virtual ~J3DAnmTransform() {}
-    /* 8003C77C */ virtual s32 getKind() const { return 0; }
+    virtual ~J3DAnmTransform() {}
+    virtual s32 getKind() const { return 0; }
     virtual void getTransform(u16, J3DTransformInfo*) const = 0;
 
     /* 0x0C */ f32* mScaleData;
@@ -529,11 +529,11 @@ public:
         mAnmTable = 0;
     }
 
-    /* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const;
+    void calcTransform(f32, u16, J3DTransformInfo*) const;
 
-    /* 8003B8D0 */ virtual ~J3DAnmTransformKey() {}
-    /* 8003C800 */ virtual s32 getKind() const { return 8; }
-    /* 8003C808 */ virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
+    virtual ~J3DAnmTransformKey() {}
+    virtual s32 getKind() const { return 8; }
+    virtual void getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
         calcTransform(mFrame, jointNo, pTransform);
     }
 
@@ -549,9 +549,9 @@ class J3DAnmTransformFull : public J3DAnmTransform {
 public:
     J3DAnmTransformFull() : J3DAnmTransform(0, NULL, NULL, NULL) { mAnmTable = NULL; }
 
-    /* 8032C2AC */ virtual ~J3DAnmTransformFull() {}
-    /* 8032C318 */ virtual s32 getKind() const { return 9; }
-    /* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const;
+    virtual ~J3DAnmTransformFull() {}
+    virtual s32 getKind() const { return 9; }
+    virtual void getTransform(u16, J3DTransformInfo*) const;
 
     /* 0x20 */ J3DAnmTransformFullTable* mAnmTable;
 };  // Size: 0x24
@@ -562,9 +562,9 @@ public:
  */
 class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull {
 public:
-    /* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp() {}
-    /* 8032C2A4 */ virtual s32 getKind() const { return 16; }
-    /* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const;
+    virtual ~J3DAnmTransformFullWithLerp() {}
+    virtual s32 getKind() const { return 16; }
+    virtual void getTransform(u16, J3DTransformInfo*) const;
 };  // Size: 0x24
 
 struct J3DTextureSRTInfo;
@@ -577,13 +577,13 @@ class J3DMaterialTable;
  */
 class J3DAnmTextureSRTKey : public J3DAnmBase {
 public:
-    /* 80329E5C */ J3DAnmTextureSRTKey();
-    /* 80329F14 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
-    /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*);
-    /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*);
+    J3DAnmTextureSRTKey();
+    void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
+    void searchUpdateMaterialID(J3DMaterialTable*);
+    void searchUpdateMaterialID(J3DModelData*);
 
-    /* 8032C198 */ virtual ~J3DAnmTextureSRTKey() {}
-    /* 8032C220 */ virtual s32 getKind() const { return 4; }
+    virtual ~J3DAnmTextureSRTKey() {}
+    virtual s32 getKind() const { return 4; }
 
     void getTransform(u16 jointNo, J3DTextureSRTInfo* pSRTInfo) const {
         calcTransform(getFrame(), jointNo, pSRTInfo);
@@ -641,13 +641,13 @@ public:
  */
 class J3DAnmTexPattern : public J3DAnmBase {
 public:
-    /* 8032AED8 */ J3DAnmTexPattern();
-    /* 8032AF50 */ void getTexNo(u16, u16*) const;
-    /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*);
-    /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*);
+    J3DAnmTexPattern();
+    void getTexNo(u16, u16*) const;
+    void searchUpdateMaterialID(J3DMaterialTable*);
+    void searchUpdateMaterialID(J3DModelData*);
 
-    /* 8032BD20 */ virtual ~J3DAnmTexPattern() {}
-    /* 8032BD94 */ virtual s32 getKind() const { return 2; }
+    virtual ~J3DAnmTexPattern() {}
+    virtual s32 getKind() const { return 2; }
 
     u16 getUpdateMaterialID(u16 idx) const {
         J3D_ASSERT_RANGE(2288, idx < mUpdateMaterialNum);
@@ -671,14 +671,14 @@ public:
  */
 class J3DAnmTevRegKey : public J3DAnmBase {
 public:
-    /* 8032AE18 */ J3DAnmTevRegKey();
-    /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const;
-    /* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const;
-    /* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*);
-    /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
+    J3DAnmTevRegKey();
+    void getTevColorReg(u16, _GXColorS10*) const;
+    void getTevKonstReg(u16, _GXColor*) const;
+    void searchUpdateMaterialID(J3DMaterialTable*);
+    void searchUpdateMaterialID(J3DModelData*);
 
-    /* 8032BD9C */ virtual ~J3DAnmTevRegKey() {}
-    /* 8032BE24 */ virtual s32 getKind() const { return 5; }
+    virtual ~J3DAnmTevRegKey() {}
+    virtual s32 getKind() const { return 5; }
 
     u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; }
     u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; }
@@ -730,12 +730,12 @@ public:
  */
 class J3DAnmColor : public J3DAnmBase {
 public:
-    /* 8032A828 */ J3DAnmColor();
-    /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*);
+    J3DAnmColor();
+    void searchUpdateMaterialID(J3DMaterialTable*);
 
-    /* 8032BCAC */ virtual ~J3DAnmColor() {}
-    /* 8032BF44 */ virtual s32 getKind() const { return 1; }
-    /* 8032BF4C */ virtual void getColor(u16, GXColor*) const {}
+    virtual ~J3DAnmColor() {}
+    virtual s32 getKind() const { return 1; }
+    virtual void getColor(u16, GXColor*) const {}
 
     u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; }
     bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; }
@@ -759,11 +759,11 @@ public:
  */
 class J3DAnmColorKey : public J3DAnmColor {
 public:
-    /* 8032AB00 */ J3DAnmColorKey();
+    J3DAnmColorKey();
 
-    /* 8032BE2C */ virtual ~J3DAnmColorKey() {}
-    /* 8032BEB0 */ virtual s32 getKind() const { return 11; }
-    /* 8032AB54 */ virtual void getColor(u16, GXColor*) const;
+    virtual ~J3DAnmColorKey() {}
+    virtual s32 getKind() const { return 11; }
+    virtual void getColor(u16, GXColor*) const;
 
     /* 0x2C */ s16* mColorR;
     /* 0x30 */ s16* mColorG;
@@ -778,11 +778,11 @@ public:
  */
 class J3DAnmColorFull : public J3DAnmColor {
 public:
-    /* 8032AB00 */ J3DAnmColorFull();
+    J3DAnmColorFull();
 
-    /* 8032BE2C */ virtual ~J3DAnmColorFull() {}
-    /* 8032BEB0 */ virtual s32 getKind() const { return 10; }
-    /* 8032AB54 */ virtual void getColor(u16, GXColor*) const;
+    virtual ~J3DAnmColorFull() {}
+    virtual s32 getKind() const { return 10; }
+    virtual void getColor(u16, GXColor*) const;
 
     /* 0x2C */ u8* mColorR;
     /* 0x30 */ u8* mColorG;
@@ -813,11 +813,11 @@ public:
  */
 class J3DAnmVtxColorKey : public J3DAnmVtxColor {
 public:
-    /* 8032A4E0 */ J3DAnmVtxColorKey();
+    J3DAnmVtxColorKey();
 
-    /* 8032BF50 */ virtual ~J3DAnmVtxColorKey() {}
-    /* 8032BFBC */ virtual s32 getKind() const { return 15; }
-    /* 8032A53C */ virtual void getColor(u8, u16, GXColor*) const;
+    virtual ~J3DAnmVtxColorKey() {}
+    virtual s32 getKind() const { return 15; }
+    virtual void getColor(u8, u16, GXColor*) const;
 
     /* 0x18 */ J3DAnmColorKeyTable* mpTable[2];
     /* 0x20 */ s16* mColorR;
@@ -832,11 +832,11 @@ public:
  */
 class J3DAnmVtxColorFull : public J3DAnmVtxColor {
 public:
-    /* 8032A30C */ J3DAnmVtxColorFull();
+    J3DAnmVtxColorFull();
 
-    /* 8032BFC4 */ virtual ~J3DAnmVtxColorFull() {}
-    /* 8032C030 */ virtual s32 getKind() const { return 14; }
-    /* 8032A368 */ virtual void getColor(u8, u16, GXColor*) const;
+    virtual ~J3DAnmVtxColorFull() {}
+    virtual s32 getKind() const { return 14; }
+    virtual void getColor(u8, u16, GXColor*) const;
 
     /* 0x18 */ J3DAnmColorFullTable* mpTable[2];
     /* 0x20 */ u8* mColorR;
@@ -853,9 +853,9 @@ class J3DAnmCluster : public J3DAnmBase {
 public:
     J3DAnmCluster(s16 frameMax, f32* pWeight) : J3DAnmBase(frameMax) { mWeight = pWeight; }
 
-    /* 8032BCAC */ virtual ~J3DAnmCluster() {}
-    /* 8032BF44 */ virtual s32 getKind() const { return 3; }
-    /* 8032BF4C */ virtual f32 getWeight(u16) const { return 1.0f; }
+    virtual ~J3DAnmCluster() {}
+    virtual s32 getKind() const { return 3; }
+    virtual f32 getWeight(u16) const { return 1.0f; }
 
     /* 0x0C */ f32* mWeight;
 };  // Size: 0x10
@@ -868,9 +868,9 @@ class J3DAnmClusterFull : public J3DAnmCluster {
 public:
     J3DAnmClusterFull() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
 
-    /* 8032BCAC */ virtual ~J3DAnmClusterFull() {}
-    /* 8032BF44 */ virtual s32 getKind() const { return 12; }
-    /* 8032BF4C */ virtual f32 getWeight(u16) const;
+    virtual ~J3DAnmClusterFull() {}
+    virtual s32 getKind() const { return 12; }
+    virtual f32 getWeight(u16) const;
 
     /* 0x10 */ J3DAnmClusterFullTable* mAnmTable;
 };
@@ -883,9 +883,9 @@ class J3DAnmClusterKey : public J3DAnmCluster {
 public:
     J3DAnmClusterKey() : J3DAnmCluster(0, NULL) { mAnmTable = NULL; }
 
-    /* 8032C044 */ virtual ~J3DAnmClusterKey() {}
-    /* 8032C0B0 */ virtual s32 getKind() const { return 13; }
-    /* 8032A218 */ virtual f32 getWeight(u16) const;
+    virtual ~J3DAnmClusterKey() {}
+    virtual s32 getKind() const { return 13; }
+    virtual f32 getWeight(u16) const;
 
     /* 0x10 */ J3DAnmClusterKeyTable* mAnmTable;
 };
@@ -903,8 +903,8 @@ public:
         mVisibility = NULL;
     }
 
-    /* 8033979C */ virtual ~J3DAnmVisibilityFull() {}
-    /* 803397F8 */ virtual s32 getKind() const { return 6; }
+    virtual ~J3DAnmVisibilityFull() {}
+    virtual s32 getKind() const { return 6; }
 
     /* 0x0C */ u16 mUpdateMaterialNum;
     /* 0x0E */ u16 field_0xe;
@@ -968,9 +968,9 @@ public:
 
 struct J3DMtxCalcAnmBase: public J3DMtxCalc {
     J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
-    /* 8000D8EC */ ~J3DMtxCalcAnmBase() {}
-    /* 80014FB8 */ J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
-    /* 80014FC0 */ void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
+    ~J3DMtxCalcAnmBase() {}
+    J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
+    void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
 
     J3DAnmTransform* mAnmTransform;
 };
diff --git a/include/JSystem/J3DGraphAnimator/J3DCluster.h b/include/JSystem/J3DGraphAnimator/J3DCluster.h
index 0ef5185db8..83aec79dc1 100644
--- a/include/JSystem/J3DGraphAnimator/J3DCluster.h
+++ b/include/JSystem/J3DGraphAnimator/J3DCluster.h
@@ -73,11 +73,11 @@ public:
  */
 class J3DDeformData {
 public:
-    /* 8032E1F8 */ J3DDeformData();
-    /* 8032E230 */ void offAllFlag(u32);
-    /* 8032E298 */ void deform(J3DVertexBuffer*);
-    /* 8032E274 */ void deform(J3DModel*);
-    /* 8032E364 */ void setAnm(J3DAnmCluster*);
+    J3DDeformData();
+    void offAllFlag(u32);
+    void deform(J3DVertexBuffer*);
+    void deform(J3DModel*);
+    void setAnm(J3DAnmCluster*);
 
     J3DCluster* getClusterPointer(u16 index) {
         J3D_ASSERT_RANGE(186, (index < mClusterNum));
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index 2ddff2945b..775b46144a 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -16,27 +16,27 @@ class J3DMtxBuffer;
  */
 class J3DMtxCalc {
 public:
-    /* 80325D1C */ static void setMtxBuffer(J3DMtxBuffer*);
+    static void setMtxBuffer(J3DMtxBuffer*);
 
-    /* 8000D948 */ virtual ~J3DMtxCalc() {}
-    /* 80014E90 */ virtual void setAnmTransform(J3DAnmTransform*) {
+    virtual ~J3DMtxCalc() {}
+    virtual void setAnmTransform(J3DAnmTransform*) {
         JUT_ASSERT_MSG(127, FALSE, "You cannot use this method");
     }
-    /* 80014E9C */ virtual J3DAnmTransform* getAnmTransform() {
+    virtual J3DAnmTransform* getAnmTransform() {
         JUT_ASSERT_MSG(131, FALSE, "You cannot use this method");
         return NULL;
     }
-    /* 80014E8C */ virtual void setAnmTransform(u8, J3DAnmTransform*) {
+    virtual void setAnmTransform(u8, J3DAnmTransform*) {
         JUT_ASSERT_MSG(137, FALSE, "You cannot use this method");
     }
-    /* 80014E94 */ virtual J3DAnmTransform* getAnmTransform(u8) {
+    virtual J3DAnmTransform* getAnmTransform(u8) {
         JUT_ASSERT_MSG(141, FALSE, "You cannot use this method");
         return NULL;
     }
-    /* 80014EA4 */ virtual void setWeight(u8, f32) {
+    virtual void setWeight(u8, f32) {
         JUT_ASSERT_MSG(147, FALSE, "You cannot use this method");
     }
-    /* 80014EA8 */ virtual f32 getWeight(u8) const {
+    virtual f32 getWeight(u8) const {
         JUT_ASSERT_MSG(152, FALSE, "You cannot use this method");
         return 0.0f;
     }
@@ -62,10 +62,10 @@ typedef int (*J3DJointCallBack)(J3DJoint*, int);
  */
 class J3DJoint {
 public:
-    /* 8032F13C */ void appendChild(J3DJoint*);
-    /* 8032F170 */ J3DJoint();
-    /* 8032F254 */ void entryIn();
-    /* 8032F3F8 */ void recursiveCalc();
+    void appendChild(J3DJoint*);
+    J3DJoint();
+    void entryIn();
+    void recursiveCalc();
 
     u32 getType() const { return 'NJNT'; }
 
@@ -127,7 +127,7 @@ private:
  */
 class J3DMtxCalcNoAnmBase : public J3DMtxCalc {
 public:
-    /* 8000FA8C */ virtual ~J3DMtxCalcNoAnmBase() {}
+    virtual ~J3DMtxCalcNoAnmBase() {}
 };
 
 /**
@@ -151,7 +151,7 @@ public:
  * 
  */
 struct J3DMtxCalcJ3DSysInitSoftimage {
-    /* 8032ECAC */ static void init(const Vec& param_0, const Mtx& param_1) {
+    static void init(const Vec& param_0, const Mtx& param_1) {
         J3DSys::mCurrentS = param_0;
         MTXCopy(param_1, J3DSys::mCurrentMtx);
     }
@@ -162,7 +162,7 @@ struct J3DMtxCalcJ3DSysInitSoftimage {
  * 
  */
 struct J3DMtxCalcJ3DSysInitMaya {
-    /* 8032ECAC */ static void init(const Vec&, const Mtx& param_1);
+    static void init(const Vec&, const Mtx& param_1);
 };
 
 /**
@@ -170,7 +170,7 @@ struct J3DMtxCalcJ3DSysInitMaya {
  * 
  */
 struct J3DMtxCalcJ3DSysInitBasic {
-    /* 8032EC28 */ static void init(const Vec&, const Mtx& param_1);
+    static void init(const Vec&, const Mtx& param_1);
 };
 
 /**
@@ -178,7 +178,7 @@ struct J3DMtxCalcJ3DSysInitBasic {
  * 
  */
 struct J3DMtxCalcCalcTransformSoftimage {
-    /* 8032EE50 */ static void calcTransform(J3DTransformInfo const&);
+    static void calcTransform(J3DTransformInfo const&);
 };
 
 /**
@@ -186,7 +186,7 @@ struct J3DMtxCalcCalcTransformSoftimage {
  * 
  */
 struct J3DMtxCalcCalcTransformMaya {
-    /* 8032EFBC */ static void calcTransform(J3DTransformInfo const&);
+    static void calcTransform(J3DTransformInfo const&);
 };
 
 /**
@@ -194,7 +194,7 @@ struct J3DMtxCalcCalcTransformMaya {
  * 
  */
 struct J3DMtxCalcCalcTransformBasic {
-    /* 8032ED30 */ static void calcTransform(J3DTransformInfo const&);
+    static void calcTransform(J3DTransformInfo const&);
 };
 
 #endif /* J3DJOINT_H */
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index 1b959ecbb8..04859fd581 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -21,8 +21,8 @@ class J3DMaterialTable;
  * 
  */
 struct J3DDrawMtxData {
-    /* 803115E0 */ J3DDrawMtxData();
-    /* 803115F4 */ ~J3DDrawMtxData();
+    J3DDrawMtxData();
+    ~J3DDrawMtxData();
 
     /* 0x0 */ u16 mEntryNum;
     /* 0x2 */ u16 mDrawFullWgtMtxNum;
@@ -38,13 +38,13 @@ class J3DShapeTable;
  */
 class J3DJointTree {
 public:
-    /* 80325A18 */ J3DJointTree();
-    /* 80325A9C */ void makeHierarchy(J3DJoint*, J3DModelHierarchy const**, J3DMaterialTable*,
+    J3DJointTree();
+    void makeHierarchy(J3DJoint*, J3DModelHierarchy const**, J3DMaterialTable*,
                                       J3DShapeTable*);
-    /* 80325C00 */ void findImportantMtxIndex();
+    void findImportantMtxIndex();
 
-    /* 80325CAC */ virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
-    /* 80325D24 */ virtual ~J3DJointTree() {}
+    virtual void calc(J3DMtxBuffer*, Vec const&, f32 const (&)[3][4]);
+    virtual ~J3DJointTree() {}
 
     J3DModelHierarchy const* getHierarchy() { return mHierarchy; }
     void setHierarchy(J3DModelHierarchy* hierarchy) { mHierarchy = hierarchy; }
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
index 43f6a577da..2403c8384a 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
@@ -9,9 +9,9 @@
  */
 class J3DMatColorAnm {
 public:
-    /* 8003B2B8 */ ~J3DMatColorAnm() {}
+    ~J3DMatColorAnm() {}
 
-    /* 8003B2F4 */ J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
+    J3DMatColorAnm() : field_0x0(0), mAnmFlag(1), mAnmColor(NULL) {}
 
     J3DMatColorAnm(u16 param_1, J3DAnmColor* pAnmColor) {
         field_0x0 = param_1;
@@ -46,8 +46,8 @@ private:
  */
 class J3DTexMtxAnm {
 public:
-    /* 8003B264 */ ~J3DTexMtxAnm() {}
-    /* 8003B2A0 */ J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
+    ~J3DTexMtxAnm() {}
+    J3DTexMtxAnm() : field_0x0(0), mAnmFlag(1), mAnmTransform(NULL) {}
 
     J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* pSRTKey) {
         field_0x0 = param_1;
@@ -83,8 +83,8 @@ private:
  */
 class J3DTexNoAnm {
 public:
-    /* 8003B1F8 */ ~J3DTexNoAnm() {}
-    /* 8003B240 */ J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
+    ~J3DTexNoAnm() {}
+    J3DTexNoAnm() : field_0x4(0), mAnmFlag(1), mAnmTexPattern(NULL) {}
 
     J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* pAnmTexPattern) {
         field_0x4 = param_1;
@@ -93,7 +93,7 @@ public:
         J3D_ASSERT_NULLPTR(214, pAnmTexPattern != NULL);
     }
 
-    /* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
+    virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
 
     void operator=(J3DTexNoAnm const& other) {
         mAnmTexPattern = other.mAnmTexPattern;
@@ -117,8 +117,8 @@ private:
  */
 class J3DTevColorAnm {
 public:
-    /* 8003B1A4 */ ~J3DTevColorAnm() {}
-    /* 8003B1E0 */ J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
+    ~J3DTevColorAnm() {}
+    J3DTevColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
 
     J3DTevColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
         field_0x0 = param_1;
@@ -153,8 +153,8 @@ private:
  */
 class J3DTevKColorAnm {
 public:
-    /* 8003B150 */ ~J3DTevKColorAnm() {}
-    /* 8003B18C */ J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
+    ~J3DTevKColorAnm() {}
+    J3DTevKColorAnm() : field_0x0(0), mAnmFlag(1), mAnmTevReg(NULL) {}
 
     J3DTevKColorAnm(u16 param_1, J3DAnmTevRegKey* pTevRegKey) {
         field_0x0 = param_1;
@@ -191,15 +191,15 @@ class J3DMaterialAnm {
 public:
     J3DMaterialAnm() { initialize(); }
 
-    /* 8032C320 */ void initialize();
-    /* 8032C5A4 */ void setMatColorAnm(int, J3DMatColorAnm*);
-    /* 8032C5E4 */ void setTexMtxAnm(int, J3DTexMtxAnm*);
-    /* 8032C624 */ void setTexNoAnm(int, J3DTexNoAnm*);
-    /* 8032C664 */ void setTevColorAnm(int, J3DTevColorAnm*);
-    /* 8032C6A4 */ void setTevKColorAnm(int, J3DTevKColorAnm*);
+    void initialize();
+    void setMatColorAnm(int, J3DMatColorAnm*);
+    void setTexMtxAnm(int, J3DTexMtxAnm*);
+    void setTexNoAnm(int, J3DTexNoAnm*);
+    void setTevColorAnm(int, J3DTevColorAnm*);
+    void setTevKColorAnm(int, J3DTevKColorAnm*);
 
-    /* 800A4820 */ virtual ~J3DMaterialAnm() {}
-    /* 8032C3C4 */ virtual void calc(J3DMaterial*) const;
+    virtual ~J3DMaterialAnm() {}
+    virtual void calc(J3DMaterial*) const;
 
     const J3DTexMtxAnm& getTexMtxAnm(int i) const { return mTexMtxAnm[i]; }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index 028c81b87c..15128fab34 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -17,19 +17,19 @@ class JUTNameTab;
  */
 class J3DMaterialTable {
 public:
-    /* 8032F5A8 */ void clear();
-    /* 8032F5D0 */ J3DMaterialTable();
-    /* 8032F64C */ int removeMatColorAnimator(J3DAnmColor*);
-    /* 8032F6F8 */ int removeTexNoAnimator(J3DAnmTexPattern*);
-    /* 8032F7B4 */ int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
-    /* 8032F880 */ int removeTevRegAnimator(J3DAnmTevRegKey*);
-    /* 8032F9C0 */ int createTexMtxForAnimator(J3DAnmTextureSRTKey*);
-    /* 8032FAF4 */ int entryMatColorAnimator(J3DAnmColor*);
-    /* 8032FBC8 */ int entryTexNoAnimator(J3DAnmTexPattern*);
-    /* 8032FCC4 */ int entryTexMtxAnimator(J3DAnmTextureSRTKey*);
-    /* 8032FE70 */ int entryTevRegAnimator(J3DAnmTevRegKey*);
+    void clear();
+    J3DMaterialTable();
+    int removeMatColorAnimator(J3DAnmColor*);
+    int removeTexNoAnimator(J3DAnmTexPattern*);
+    int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
+    int removeTevRegAnimator(J3DAnmTevRegKey*);
+    int createTexMtxForAnimator(J3DAnmTextureSRTKey*);
+    int entryMatColorAnimator(J3DAnmColor*);
+    int entryTexNoAnimator(J3DAnmTexPattern*);
+    int entryTexMtxAnimator(J3DAnmTextureSRTKey*);
+    int entryTevRegAnimator(J3DAnmTevRegKey*);
 
-    /* 8032F604 */ virtual ~J3DMaterialTable();
+    virtual ~J3DMaterialTable();
 
     J3DMaterial* getMaterialNodePointer(u16 idx) const {
         J3D_ASSERT_RANGE(92, idx < mMaterialNum);
diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index fadafe7768..1efc718b2d 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -51,32 +51,32 @@ public:
         entryModelData(pModelData, mdlFlags, mtxBufferFlag);
     }
 
-    /* 80327100 */ void initialize();
-    /* 80327184 */ s32 entryModelData(J3DModelData*, u32, u32);
-    /* 80327300 */ s32 createShapePacket(J3DModelData*);
-    /* 803273CC */ s32 createMatPacket(J3DModelData*, u32);
-    /* 803275FC */ s32 newDifferedDisplayList(u32);
-    /* 8032767C */ void lock();
-    /* 803276B4 */ void unlock();
-    /* 803279A0 */ void diff();
-    /* 80327A2C */ s32 setDeformData(J3DDeformData*, u32);
-    /* 80327AA0 */ s32 setSkinDeform(J3DSkinDeform*, u32);
-    /* 80327BD4 */ void calcAnmMtx();
-    /* 80327C58 */ void calcWeightEnvelopeMtx();
-    /* 80328190 */ void calcNrmMtx();
-    /* 803281B4 */ void calcBumpMtx();
-    /* 803282B8 */ void calcBBoardMtx();
-    /* 803282EC */ void prepareShapePackets();
+    void initialize();
+    s32 entryModelData(J3DModelData*, u32, u32);
+    s32 createShapePacket(J3DModelData*);
+    s32 createMatPacket(J3DModelData*, u32);
+    s32 newDifferedDisplayList(u32);
+    void lock();
+    void unlock();
+    void diff();
+    s32 setDeformData(J3DDeformData*, u32);
+    s32 setSkinDeform(J3DSkinDeform*, u32);
+    void calcAnmMtx();
+    void calcWeightEnvelopeMtx();
+    void calcNrmMtx();
+    void calcBumpMtx();
+    void calcBBoardMtx();
+    void prepareShapePackets();
     void ptrToIndex();
     void makeDL();
 
-    /* 80327CA4 */ virtual void update();
-    /* 80327E4C */ virtual void entry();
-    /* 80327CF0 */ virtual void calc();
-    /* 803276EC */ virtual void calcMaterial();
-    /* 80327858 */ virtual void calcDiffTexMtx();
-    /* 80327F40 */ virtual void viewCalc();
-    /* 80328350 */ virtual ~J3DModel() {}
+    virtual void update();
+    virtual void entry();
+    virtual void calc();
+    virtual void calcMaterial();
+    virtual void calcDiffTexMtx();
+    virtual void viewCalc();
+    virtual ~J3DModel() {}
 
     J3DModelData* getModelData() { return mModelData; }
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 643d1f7849..757c472820 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -16,16 +16,16 @@ class JUTNameTab;
  */
 class J3DModelData {
 public:
-    /* 80325D88 */ void clear();
-    /* 80325DA0 */ J3DModelData();
-    /* 80325E14 */ s32 newSharedDisplayList(u32);
-    /* 80325EC8 */ void indexToPtr();
-    /* 80325F94 */ void makeSharedDL();
-    /* 8032600C */ void simpleCalcMaterial(u16, Mtx);
-    /* 803260CC */ void syncJ3DSysPointers() const;
-    /* 803260F8 */ void syncJ3DSysFlags() const;
+    void clear();
+    J3DModelData();
+    s32 newSharedDisplayList(u32);
+    void indexToPtr();
+    void makeSharedDL();
+    void simpleCalcMaterial(u16, Mtx);
+    void syncJ3DSysPointers() const;
+    void syncJ3DSysFlags() const;
 
-    /* 8032617C */ virtual ~J3DModelData() {}
+    virtual ~J3DModelData() {}
 
     void simpleCalcMaterial(Mtx mtx) { simpleCalcMaterial(0, mtx); }
     J3DMaterialTable& getMaterialTable() { return mMaterialTable; }
diff --git a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
index 00f401d673..6158d73d76 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.h
@@ -13,17 +13,17 @@ class J3DMtxBuffer {
 public:
     J3DMtxBuffer() { initialize(); }
 
-    /* 80326214 */ void initialize();
-    /* 80326258 */ s32 create(J3DModelData*, u32);
-    /* 80326364 */ J3DError createAnmMtx(J3DModelData*);
-    /* 803263F0 */ s32 createWeightEnvelopeMtx(J3DModelData*);
-    /* 8032648C */ s32 setNoUseDrawMtx();
-    /* 803264B8 */ s32 createDoubleDrawMtx(J3DModelData*, u32);
-    /* 80326664 */ s32 createBumpMtxArray(J3DModelData*, u32);
-    /* 803268D4 */ void calcWeightEnvelopeMtx();
-    /* 80326ACC */ void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
-    /* 80326D3C */ void calcNrmMtx();
-    /* 80326EF0 */ void calcBBoardMtx();
+    void initialize();
+    s32 create(J3DModelData*, u32);
+    J3DError createAnmMtx(J3DModelData*);
+    s32 createWeightEnvelopeMtx(J3DModelData*);
+    s32 setNoUseDrawMtx();
+    s32 createDoubleDrawMtx(J3DModelData*, u32);
+    s32 createBumpMtxArray(J3DModelData*, u32);
+    void calcWeightEnvelopeMtx();
+    void calcDrawMtx(u32, Vec const&, f32 const (&)[3][4]);
+    void calcNrmMtx();
+    void calcBBoardMtx();
 
     MtxP getAnmMtx(int idx) { return mpAnmMtx[idx]; }
     void setAnmMtx(int i, Mtx m) { MTXCopy(m, (MtxP)mpAnmMtx[i]); }
@@ -79,7 +79,7 @@ public:
     /* 0x34 */ Mtx* mpUserAnmMtx;
 
 public:
-    /* 803283B4 */ virtual ~J3DMtxBuffer() {}
+    virtual ~J3DMtxBuffer() {}
 };
 
 void J3DCalcViewBaseMtx(f32 (*param_0)[4], Vec const& param_1, f32 const (&param_2)[3][4],
diff --git a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
index 6446979e32..ca646e4829 100644
--- a/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
+++ b/include/JSystem/J3DGraphAnimator/J3DShapeTable.h
@@ -18,10 +18,10 @@ public:
         mShapeName = NULL;
     }
 
-    /* 803258A0 */ void hide();
-    /* 803258D8 */ void show();
-    /* 80325910 */ void initShapeNodes(J3DDrawMtxData*, J3DVertexData*);
-    /* 8032597C */ void sortVcdVatCmd();
+    void hide();
+    void show();
+    void initShapeNodes(J3DDrawMtxData*, J3DVertexData*);
+    void sortVcdVatCmd();
 
     virtual ~J3DShapeTable() {}
 
diff --git a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
index d9b743a96c..89331247ec 100644
--- a/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+++ b/include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
@@ -15,9 +15,9 @@ class JUTNameTab;
  * 
  */
 struct J3DSkinNList {
-    /* 8032C6E4 */ J3DSkinNList();
-    /* 8032C85C */ void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
-    /* 8032C8E4 */ void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
+    J3DSkinNList();
+    void calcSkin_VtxPosF32(f32 (*)[4], void*, void*);
+    void calcSkin_VtxNrmF32(f32 (*)[4], void*, void*);
 
     /* 0x00 */ u16* field_0x0;
     /* 0x04 */ u16* field_0x4;
@@ -33,20 +33,20 @@ struct J3DSkinNList {
  */
 class J3DSkinDeform {
 public:
-    /* 8032C96C */ J3DSkinDeform();
-    /* 8032C9B0 */ void initSkinInfo(J3DModelData*);
-    /* 8032CF44 */ int initMtxIndexArray(J3DModelData*);
-    /* 8032D378 */ void changeFastSkinDL(J3DModelData*);
-    /* 8032D5C4 */ void calcNrmMtx(J3DMtxBuffer*);
-    /* 8032D738 */ void transformVtxPosNrm(J3DModelData*);
-    /* 8032D87C */ void calcAnmInvJointMtx(J3DMtxBuffer*);
-    /* 8032D8F4 */ void deformFastVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    /* 8032DA1C */ void deformFastVtxNrm_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    /* 8032DB50 */ void deformVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    /* 8032DC74 */ void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
-    /* 8032DDB8 */ void deformVtxNrm_F32(J3DVertexBuffer*) const;
-    /* 8032DEBC */ void deformVtxNrm_S16(J3DVertexBuffer*) const;
-    /* 8032DFDC */ void deform(J3DModel*);
+    J3DSkinDeform();
+    void initSkinInfo(J3DModelData*);
+    int initMtxIndexArray(J3DModelData*);
+    void changeFastSkinDL(J3DModelData*);
+    void calcNrmMtx(J3DMtxBuffer*);
+    void transformVtxPosNrm(J3DModelData*);
+    void calcAnmInvJointMtx(J3DMtxBuffer*);
+    void deformFastVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
+    void deformFastVtxNrm_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
+    void deformVtxPos_F32(J3DVertexBuffer*, J3DMtxBuffer*) const;
+    void deformVtxPos_S16(J3DVertexBuffer*, J3DMtxBuffer*) const;
+    void deformVtxNrm_F32(J3DVertexBuffer*) const;
+    void deformVtxNrm_S16(J3DVertexBuffer*) const;
+    void deform(J3DModel*);
     void setNrmMtx(int i, MtxP mtx) {
         J3DPSMtx33CopyFrom34(mtx, (Mtx3P)mNrmMtx[i]);
     }
@@ -55,8 +55,8 @@ public:
     void offFlag(u32 flag) { mFlags &= ~flag; }
     bool checkFlag(u32 flag) { return mFlags & flag ? true : false; }
 
-    /* 8032E064 */ virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
-    /* 8032E1B0 */ virtual ~J3DSkinDeform();
+    virtual void deform(J3DVertexBuffer*, J3DMtxBuffer*);
+    virtual ~J3DSkinDeform();
 
     static u16* sWorkArea_WEvlpMixMtx[1024];
     static f32* sWorkArea_WEvlpMixWeight[1024];
@@ -81,12 +81,12 @@ private:
  */
 class J3DDeformer {
 public:
-    /* 8032E39C */ J3DDeformer(J3DDeformData*);
-    /* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*);
-    /* 8032E3BC */ void deform(J3DVertexBuffer*, u16);
-    /* 8032E4A4 */ void deform_VtxPosF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
-    /* 8032E60C */ void deform_VtxNrmF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
-    /* 8032EBCC */ void normalizeWeight(int, f32*);
+    J3DDeformer(J3DDeformData*);
+    void deform(J3DVertexBuffer*, u16, f32*);
+    void deform(J3DVertexBuffer*, u16);
+    void deform_VtxPosF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
+    void deform_VtxNrmF32(J3DVertexBuffer*, J3DCluster*, J3DClusterKey*, f32*);
+    void normalizeWeight(int, f32*);
 
     void offFlag(u32 i_flag) { mFlags &= ~i_flag; }
     bool checkFlag(u32 i_flag) { return mFlags & i_flag ? true : false; }
diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index 3a71f94b45..bb6cbef2dc 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -5,13 +5,13 @@
 
 // matches debug
 inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
+#ifdef __MWERKS__
     register f32 temp_f4;
     register f32 out;
     register f32 temp_f0;
     register f32 temp_f2;
     register f32 temp_f1 = 1.0f;
 
-#ifdef __MWERKS__
     // clang-format off
     asm {
         psq_l temp_f0, 0(v), 0, 0 /* qr0 */
@@ -24,9 +24,9 @@ inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
         ps_sum0 out, out, out, out
     }
     // clang-format on
-#endif
 
     return out;
+#endif
 }
 
 class J3DDrawBuffer;
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index 423ece548a..a911251c58 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -12,7 +12,7 @@
  *
  */
 struct J3DGXColorS10 : public GXColorS10 {
-    /* 8000E460 */ J3DGXColorS10() {}
+    J3DGXColorS10() {}
     J3DGXColorS10(J3DGXColorS10 const& other) { __memcpy(this, &other, sizeof(J3DGXColorS10)); }
     J3DGXColorS10(GXColorS10 const& color) : GXColorS10(color) {}
     J3DGXColorS10& operator=(const GXColorS10& color) {
@@ -28,7 +28,7 @@ struct J3DGXColorS10 : public GXColorS10 {
  *
  */
 struct J3DGXColor : public GXColor {
-    /* 8000E538 */ J3DGXColor() {}
+    J3DGXColor() {}
     J3DGXColor(J3DGXColor const& other) { __memcpy(this, &other, sizeof(J3DGXColor)); }
     J3DGXColor(GXColor const& color) : GXColor(color) {}
     // making color a reference breaks J3DColorBlockLightOff::initialize et al
@@ -120,7 +120,7 @@ static u8 AttnArr[] = {2, 0, 2, 1};
  *
  */
 struct J3DColorChan {
-    /* 8000E47C */ J3DColorChan() {
+    J3DColorChan() {
         setColorChanInfo(j3dDefaultColorChanInfo);
     }
     J3DColorChan(J3DColorChanInfo const& info) {
@@ -170,40 +170,40 @@ struct J3DColorChan {
  */
 class J3DColorBlock {
 public:
-    /* 80317324 */ virtual void load() {}
-    /* 80317358 */ virtual void reset(J3DColorBlock*) {}
-    /* 8031733C */ virtual void patch() {}
-    /* 80317434 */ virtual void patchMatColor() {}
-    /* 8000DBD0 */ virtual void patchLight() {}
-    /* 80317340 */ virtual void diff(u32) {}
-    /* 80317438 */ virtual void diffAmbColor() {}
-    /* 8031743C */ virtual void diffMatColor() {}
-    /* 80317440 */ virtual void diffColorChan() {}
-    /* 80317444 */ virtual void diffLightObj(u32) {}
-    /* 80317304 */ virtual s32 countDLSize() { return 0; }
+    virtual void load() {}
+    virtual void reset(J3DColorBlock*) {}
+    virtual void patch() {}
+    virtual void patchMatColor() {}
+    virtual void patchLight() {}
+    virtual void diff(u32) {}
+    virtual void diffAmbColor() {}
+    virtual void diffMatColor() {}
+    virtual void diffColorChan() {}
+    virtual void diffLightObj(u32) {}
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*) {}
-    /* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor) {}
-    /* 8000E000 */ virtual J3DGXColor* getMatColor(u32) { return NULL; }
-    /* 801A4C0C */ virtual void setAmbColor(u32, J3DGXColor const*) {}
-    /* 8000E0D4 */ virtual void setAmbColor(u32, J3DGXColor) {}
-    /* 8000DFF0 */ virtual J3DGXColor* getAmbColor(u32) { return NULL; }
-    /* 8000E0E0 */ virtual void setColorChanNum(u8) {}
-    /* 8031744C */ virtual void setColorChanNum(u8 const*) {}
-    /* 8000E008 */ virtual u8 getColorChanNum() const { return 0; }
-    /* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&) {}
-    /* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*) {}
-    /* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32) { return NULL; }
-    /* 801A4C08 */ virtual void setLight(u32, J3DLightObj*) {}
-    /* 80317454 */ virtual J3DLightObj* getLight(u32) { return NULL; }
-    /* 80317460 */ virtual void setCullMode(u8 const*) {}
-    /* 8031745C */ virtual void setCullMode(u8) {}
-    /* 80317328 */ virtual u8 getCullMode() const { return 2; }
-    /* 80317464 */ virtual u32 getMatColorOffset() const { return 0; }
-    /* 8031746C */ virtual u32 getColorChanOffset() const { return 0; }
-    /* 80317474 */ virtual void setMatColorOffset(u32) {}
-    /* 80317478 */ virtual void setColorChanOffset(u32) {}
-    /* 80317138 */ virtual ~J3DColorBlock() {}
+    virtual void setMatColor(u32, J3DGXColor const*) {}
+    virtual void setMatColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getMatColor(u32) { return NULL; }
+    virtual void setAmbColor(u32, J3DGXColor const*) {}
+    virtual void setAmbColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getAmbColor(u32) { return NULL; }
+    virtual void setColorChanNum(u8) {}
+    virtual void setColorChanNum(u8 const*) {}
+    virtual u8 getColorChanNum() const { return 0; }
+    virtual void setColorChan(u32, J3DColorChan const&) {}
+    virtual void setColorChan(u32, J3DColorChan const*) {}
+    virtual J3DColorChan* getColorChan(u32) { return NULL; }
+    virtual void setLight(u32, J3DLightObj*) {}
+    virtual J3DLightObj* getLight(u32) { return NULL; }
+    virtual void setCullMode(u8 const*) {}
+    virtual void setCullMode(u8) {}
+    virtual u8 getCullMode() const { return 2; }
+    virtual u32 getMatColorOffset() const { return 0; }
+    virtual u32 getColorChanOffset() const { return 0; }
+    virtual void setMatColorOffset(u32) {}
+    virtual void setColorChanOffset(u32) {}
+    virtual ~J3DColorBlock() {}
 };
 
 /**
@@ -215,61 +215,61 @@ public:
     J3DColorBlockLightOff() {
         initialize();
     }
-    /* 8031747C */ void initialize();
+    void initialize();
 
-    /* 80317B84 */ virtual s32 countDLSize();
-    /* 80317C0C */ virtual void load();
-    /* 8031FD08 */ virtual void reset(J3DColorBlock*);
-    /* 80318EB4 */ virtual void patch();
-    /* 80318F00 */ virtual void patchMatColor();
-    /* 803190AC */ virtual void patchLight();
-    /* 80319B4C */ virtual void diff(u32);
-    /* 80319BB4 */ virtual void diffMatColor();
-    /* 80319D30 */ virtual void diffColorChan();
-    /* 80323560 */ virtual u32 getType() { return 'CLOF'; }
-    /* 80323184 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual void patch();
+    virtual void patchMatColor();
+    virtual void patchLight();
+    virtual void diff(u32);
+    virtual void diffMatColor();
+    virtual void diffColorChan();
+    virtual u32 getType() { return 'CLOF'; }
+    virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x121, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         J3D_ASSERT_NULLPTR(0x122, color != 0);
         mMatColor[idx] = *color;
     }
-    /* 80323158 */ virtual void setMatColor(u32 idx, J3DGXColor color) {
+    virtual void setMatColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x128, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
-    /* 803231B0 */ virtual J3DGXColor* getMatColor(u32 idx) {
+    virtual J3DGXColor* getMatColor(u32 idx) {
         J3D_ASSERT_RANGE(0x12d, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
-    /* 803231D0 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
-    /* 803231C4 */ virtual void setColorChanNum(u8 const* num) {
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x137, num != 0);
         mColorChanNum = *num;
     }
-    /* 803231D8 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
-    /* 803231F4 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
         J3D_ASSERT_RANGE(0x142, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
-    /* 803231E0 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
+    virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x148, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         J3D_ASSERT_NULLPTR(0x149, chan != 0);
         mColorChan[idx] = *chan;
     }
-    /* 80323208 */ virtual J3DColorChan* getColorChan(u32 idx) {
+    virtual J3DColorChan* getColorChan(u32 idx) {
         J3D_ASSERT_RANGE(0x14e, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
-    /* 80323224 */ virtual void setCullMode(u8 const* mode) {
+    virtual void setCullMode(u8 const* mode) {
         J3D_ASSERT_NULLPTR(0x154, mode != 0);
         mCullMode = *mode;
     }
-    /* 8032321C */ virtual void setCullMode(u8 mode) { mCullMode = mode; }
-    /* 80323230 */ virtual u8 getCullMode() const { return mCullMode; }
-    /* 80323238 */ virtual u32 getMatColorOffset() const { return mMatColorOffset; }
-    /* 80323240 */ virtual u32 getColorChanOffset() const { return mColorChanOffset; }
-    /* 80323248 */ virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
-    /* 80323250 */ virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
-    /* 803170DC */ virtual ~J3DColorBlockLightOff() {}
+    virtual void setCullMode(u8 mode) { mCullMode = mode; }
+    virtual u8 getCullMode() const { return mCullMode; }
+    virtual u32 getMatColorOffset() const { return mMatColorOffset; }
+    virtual u32 getColorChanOffset() const { return mColorChanOffset; }
+    virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
+    virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
+    virtual ~J3DColorBlockLightOff() {}
 
     /* 0x04 */ J3DGXColor mMatColor[2];
     /* 0x0C */ u8 mColorChanNum;
@@ -288,26 +288,26 @@ public:
     J3DColorBlockAmbientOn() {
         initialize();
     }
-    /* 803174DC */ void initialize();
+    void initialize();
 
-    /* 8031816C */ virtual void load();
-    /* 8031FDE4 */ virtual void reset(J3DColorBlock*);
-    /* 80317B8C */ virtual s32 countDLSize();
-    /* 80323074 */ virtual u32 getType() { return 'CLAB'; }
-    /* 803230AC */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'CLAB'; }
+    virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1a3, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         J3D_ASSERT_NULLPTR(0x1a4, color != 0);
         mAmbColor[idx] = *color;
     }
-    /* 80323080 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x1aa, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
-    /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32 idx) {
+    virtual J3DGXColor* getAmbColor(u32 idx) {
         J3D_ASSERT_RANGE(0x1af, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
-    /* 803230EC */ virtual ~J3DColorBlockAmbientOn() {}
+    virtual ~J3DColorBlockAmbientOn() {}
 
     /* 0x20 */ J3DGXColor mAmbColor[2];
 };  // Size: 0x28
@@ -321,88 +321,88 @@ public:
     J3DColorBlockLightOn() {
         initialize();
     }
-    /* 80317580 */ void initialize();
+    void initialize();
 
-    /* 803187F4 */ virtual void load();
-    /* 8031FF34 */ virtual void reset(J3DColorBlock*);
-    /* 803194E8 */ virtual void patch();
-    /* 80319534 */ virtual void patchMatColor();
-    /* 803196E0 */ virtual void patchLight();
-    /* 8031A13C */ virtual void diff(u32);
-    /* 8031A1DC */ virtual void diffAmbColor();
-    /* 8031A358 */ virtual void diffMatColor();
-    /* 8031A4D4 */ virtual void diffColorChan();
-    /* 8031A8E0 */ virtual void diffLightObj(u32);
-    /* 80317B94 */ virtual s32 countDLSize();
-    /* 80322E80 */ virtual u32 getType() { return 'CLON'; }
-    /* 80322EB8 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual void patch();
+    virtual void patchMatColor();
+    virtual void patchLight();
+    virtual void diff(u32);
+    virtual void diffAmbColor();
+    virtual void diffMatColor();
+    virtual void diffColorChan();
+    virtual void diffLightObj(u32);
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'CLON'; }
+    virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1e9, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         J3D_ASSERT_NULLPTR(0x1ea, color != 0);
         mMatColor[idx] = *color;
     }
-    /* 80322E8C */ virtual void setMatColor(u32 idx, J3DGXColor color) {
+    virtual void setMatColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x1f0, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
-    /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32 idx) {
+    virtual J3DGXColor* getMatColor(u32 idx) {
         J3D_ASSERT_RANGE(0x1f5, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
-    /* 80322F24 */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1fc, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         J3D_ASSERT_NULLPTR(0x1fd, color != 0);
         mAmbColor[idx] = *color;
     }
-    /* 80322EF8 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x203, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
-    /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32 idx) {
+    virtual J3DGXColor* getAmbColor(u32 idx) {
         J3D_ASSERT_RANGE(0x208, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
-    /* 80322F70 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
-    /* 80322F64 */ virtual void setColorChanNum(u8 const* num) {
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x212, num != 0);
         mColorChanNum = *num;
     }
-    /* 80322F78 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
-    /* 80322F94 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
         J3D_ASSERT_RANGE(0x21d, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
-    /* 80322F80 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
+    virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x223, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         J3D_ASSERT_NULLPTR(0x224, chan != 0);
         mColorChan[idx] = *chan;
     }
-    /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32 idx) {
+    virtual J3DColorChan* getColorChan(u32 idx) {
         J3D_ASSERT_RANGE(0x229, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
-    /* 80322FBC */ virtual void setLight(u32 idx, J3DLightObj* light) {
+    virtual void setLight(u32 idx, J3DLightObj* light) {
         J3D_ASSERT_RANGE(0x230, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         mLight[idx] = light;
     }
-    /* 80322FCC */ virtual J3DLightObj* getLight(u32 idx) {
+    virtual J3DLightObj* getLight(u32 idx) {
         J3D_ASSERT_RANGE(0x235, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         return mLight[idx];
     }
-    /* 80322FE4 */ virtual void setCullMode(u8 const* mode) {
+    virtual void setCullMode(u8 const* mode) {
         J3D_ASSERT_NULLPTR(0x23b, mode != 0);
         mCullMode = *mode;
     }
-    /* 80322FDC */ virtual void setCullMode(u8 mode) {
+    virtual void setCullMode(u8 mode) {
         mCullMode = mode;
     }
-    /* 80322FF0 */ virtual u8 getCullMode() const {
+    virtual u8 getCullMode() const {
         return mCullMode;
     }
-    /* 80322FF8 */ virtual u32 getMatColorOffset() const { return mMatColorOffset; }
-    /* 80323000 */ virtual u32 getColorChanOffset() const { return mColorChanOffset; }
-    /* 80323008 */ virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
-    /* 80323010 */ virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
-    /* 80323018 */ virtual ~J3DColorBlockLightOn() {}
+    virtual u32 getMatColorOffset() const { return mMatColorOffset; }
+    virtual u32 getColorChanOffset() const { return mColorChanOffset; }
+    virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
+    virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
+    virtual ~J3DColorBlockLightOn() {}
 
     /* 0x04 */ J3DGXColor mMatColor[2];
     /* 0x0C */ J3DGXColor mAmbColor[2];
@@ -420,7 +420,7 @@ public:
  */
 class J3DTexGenBlock {
 public:
-    /* 80317354 */ virtual void reset(J3DTexGenBlock*) {}
+    virtual void reset(J3DTexGenBlock*) {}
     virtual void calc(f32 const (*)[4]) = 0;
     virtual void calcWithoutViewMtx(f32 const (*)[4]) = 0;
     virtual void calcPostTexMtx(f32 const (*)[4]) = 0;
@@ -430,35 +430,35 @@ public:
     virtual void diff(u32) = 0;
     virtual void diffTexMtx() = 0;
     virtual void diffTexGen() = 0;
-    /* 803172FC */ virtual s32 countDLSize() { return 0; }
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 8031741C */ virtual void setTexGenNum(u32 const*) {}
-    /* 8000E0D0 */ virtual void setTexGenNum(u32) {}
-    /* 8000DFE8 */ virtual u32 getTexGenNum() const { return 0; }
-    /* 8000E0CC */ virtual void setTexCoord(u32, J3DTexCoord const*) {}
-    /* 8000DFE0 */ virtual J3DTexCoord* getTexCoord(u32) { return NULL; }
-    /* 8003AB2C */ virtual void setTexMtx(u32, J3DTexMtx*) {}
-    /* 8000DFD8 */ virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
-    /* 80317424 */ virtual void setNBTScale(J3DNBTScale const* scale) {}
-    /* 80317420 */ virtual void setNBTScale(J3DNBTScale) {}
-    /* 80317334 */ virtual J3DNBTScale* getNBTScale() { return NULL; }
-    /* 80317428 */ virtual u32 getTexMtxOffset() const { return 0; }
-    /* 80317430 */ virtual void setTexMtxOffset(u32) {}
-    /* 803171DC */ virtual ~J3DTexGenBlock() {}
+    virtual void setTexGenNum(u32 const*) {}
+    virtual void setTexGenNum(u32) {}
+    virtual u32 getTexGenNum() const { return 0; }
+    virtual void setTexCoord(u32, J3DTexCoord const*) {}
+    virtual J3DTexCoord* getTexCoord(u32) { return NULL; }
+    virtual void setTexMtx(u32, J3DTexMtx*) {}
+    virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {}
+    virtual void setNBTScale(J3DNBTScale) {}
+    virtual J3DNBTScale* getNBTScale() { return NULL; }
+    virtual u32 getTexMtxOffset() const { return 0; }
+    virtual void setTexMtxOffset(u32) {}
+    virtual ~J3DTexGenBlock() {}
 };
 
 struct J3DTexGenBlockNull : public J3DTexGenBlock {
-    /* 80332AA0 */ virtual void calc(f32 const (*)[4]) {}
-    /* 80332AA4 */ virtual void calcWithoutViewMtx(f32 const (*)[4]) {}
-    /* 80332AA8 */ virtual void calcPostTexMtx(f32 const (*)[4]) {}
-    /* 80332AAC */ virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]) {}
-    /* 80332AB0 */ virtual void load() {}
-    /* 80332AB4 */ virtual void patch() {}
-    /* 80332AB8 */ virtual void diff(u32) {}
-    /* 80332ABC */ virtual void diffTexMtx() {}
-    /* 80332AC0 */ virtual void diffTexGen() {}
-    /* 80332AC4 */ virtual u32 getType() { return 'TGNL'; }
-    /* 80332AD0 */ virtual ~J3DTexGenBlockNull() {}
+    virtual void calc(f32 const (*)[4]) {}
+    virtual void calcWithoutViewMtx(f32 const (*)[4]) {}
+    virtual void calcPostTexMtx(f32 const (*)[4]) {}
+    virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]) {}
+    virtual void load() {}
+    virtual void patch() {}
+    virtual void diff(u32) {}
+    virtual void diffTexMtx() {}
+    virtual void diffTexGen() {}
+    virtual u32 getType() { return 'TGNL'; }
+    virtual ~J3DTexGenBlockNull() {}
 };
 
 /**
@@ -470,46 +470,46 @@ public:
     J3DTexGenBlockPatched() {
         initialize();
     }
-    /* 80317644 */ void initialize();
+    void initialize();
 
-    /* 80320084 */ virtual void reset(J3DTexGenBlock*);
-    /* 803213C0 */ virtual void calc(f32 const (*)[4]);
-    /* 80321584 */ virtual void calcWithoutViewMtx(f32 const (*)[4]);
-    /* 803216D8 */ virtual void calcPostTexMtx(f32 const (*)[4]);
-    /* 8032181C */ virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]);
-    /* 80322E70 */ virtual void load() {}
-    /* 8031AA88 */ virtual void patch();
-    /* 8031AC68 */ virtual void diff(u32);
-    /* 8031ACD0 */ virtual void diffTexMtx();
-    /* 8031AD30 */ virtual void diffTexGen();
-    /* 80317B9C */ virtual s32 countDLSize();
-    /* 80322E74 */ virtual u32 getType() { return 'TGPT'; }
-    /* 80322D3C */ virtual void setTexGenNum(u32 const* num) {
+    virtual void reset(J3DTexGenBlock*);
+    virtual void calc(f32 const (*)[4]);
+    virtual void calcWithoutViewMtx(f32 const (*)[4]);
+    virtual void calcPostTexMtx(f32 const (*)[4]);
+    virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]);
+    virtual void load() {}
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void diffTexMtx();
+    virtual void diffTexGen();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGPT'; }
+    virtual void setTexGenNum(u32 const* num) {
         J3D_ASSERT_NULLPTR(0x335, num != 0);
         mTexGenNum = *num;
     }
-    /* 80322D34 */ virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
-    /* 80322D48 */ virtual u32 getTexGenNum() const { return mTexGenNum; }
-    /* 80322D50 */ virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
+    virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
+    virtual u32 getTexGenNum() const { return mTexGenNum; }
+    virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
         J3D_ASSERT_RANGE(0x344, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
         J3D_ASSERT_NULLPTR(0x345, coord != 0);
         mTexCoord[idx] = *coord;
     }
-    /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32 idx) {
+    virtual J3DTexCoord* getTexCoord(u32 idx) {
         J3D_ASSERT_RANGE(0x34a, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
         return &mTexCoord[idx];
     }
-    /* 80322D78 */ virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) {
+    virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) {
         J3D_ASSERT_RANGE(0x351, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         mTexMtx[idx] = mtx;
     }
-    /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32 idx) {
+    virtual J3DTexMtx* getTexMtx(u32 idx) {
         J3D_ASSERT_RANGE(0x356, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         return mTexMtx[idx];
     }
-    /* 80322D98 */ virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
-    /* 80322DA0 */ virtual void setTexMtxOffset(u32 offset) { mTexMtxOffset = offset; }
-    /* 80317180 */ virtual ~J3DTexGenBlockPatched() {}
+    virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
+    virtual void setTexMtxOffset(u32 offset) { mTexMtxOffset = offset; }
+    virtual ~J3DTexGenBlockPatched() {}
 
     /* 0x04 */ u32 mTexGenNum;
     /* 0x08 */ J3DTexCoord mTexCoord[8];
@@ -526,20 +526,20 @@ public:
     J3DTexGenBlock4() : mNBTScale() {
         initialize();
     }
-    /* 80317674 */ void initialize();
+    void initialize();
 
-    /* 803201A0 */ virtual void reset(J3DTexGenBlock*);
-    /* 8031A948 */ virtual void load();
-    /* 8031AB18 */ virtual void patch();
-    /* 80317BA4 */ virtual s32 countDLSize();
-    /* 80322DA8 */ virtual u32 getType() { return 'TGB4'; }
-    /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const* scale) {
+    virtual void reset(J3DTexGenBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGB4'; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {
         J3D_ASSERT_NULLPTR(0x393, scale != 0);
         mNBTScale = *scale;
     }
-    /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
-    /* 80322DFC */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
-    /* 80322E04 */ virtual ~J3DTexGenBlock4() {}
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
+    virtual ~J3DTexGenBlock4() {}
 
     /* 0x5C */ J3DNBTScale mNBTScale;
 };  // Size: 0x6C
@@ -553,20 +553,20 @@ public:
     J3DTexGenBlockBasic() : mNBTScale() {
         initialize();
     }
-    /* 803176A4 */ void initialize();
+    void initialize();
 
-    /* 803202DC */ virtual void reset(J3DTexGenBlock*);
-    /* 8031A9E8 */ virtual void load();
-    /* 8031ABC0 */ virtual void patch();
-    /* 80317BAC */ virtual s32 countDLSize();
-    /* 80322C6C */ virtual u32 getType() { return 'TGBC'; }
-    /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const* scale) {
+    virtual void reset(J3DTexGenBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGBC'; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {
         J3D_ASSERT_NULLPTR(0x3ca, scale != 0);
         mNBTScale = *scale;
     }
-    /* 80322C78 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
-    /* 80322CC0 */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
-    /* 80322CC8 */ virtual ~J3DTexGenBlockBasic() {}
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
+    virtual ~J3DTexGenBlockBasic() {}
 
     /* 0x5C */ J3DNBTScale mNBTScale;
 };  // Size: 0x6C
@@ -577,62 +577,62 @@ public:
  */
 class J3DTevBlock {
 public:
-    /* 80317350 */ virtual void reset(J3DTevBlock*) {}
-    /* 80317330 */ virtual void load() {}
-    /* 8031CD44 */ virtual void diff(u32);
-    /* 80321948 */ virtual void diffTexNo();
-    /* 80321938 */ virtual void diffTevReg();
-    /* 80321944 */ virtual void diffTexCoordScale();
-    /* 80321940 */ virtual void diffTevStage();
-    /* 8032193C */ virtual void diffTevStageIndirect();
-    /* 8000DBD4 */ virtual void patch() {}
-    /* 8032353C */ virtual void patchTexNo() {}
-    /* 80323540 */ virtual void patchTevReg() {}
-    /* 8000DBC8 */ virtual void patchTexNoAndTexCoordScale() {}
+    virtual void reset(J3DTevBlock*) {}
+    virtual void load() {}
+    virtual void diff(u32);
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch() {}
+    virtual void patchTexNo() {}
+    virtual void patchTevReg() {}
+    virtual void patchTexNoAndTexCoordScale() {}
     virtual void ptrToIndex() = 0;
     virtual void indexToPtr() = 0;
     virtual u32 getType() = 0;
-    /* 8031730C */ virtual s32 countDLSize() { return 0; }
-    /* 80323544 */ virtual void setTexNo(u32, u16 const*) {}
-    /* 8000E0AC */ virtual void setTexNo(u32, u16) {}
-    /* 8000DF94 */ virtual u16 getTexNo(u32) const { return 0xffff; }
-    /* 80323548 */ virtual void setTevOrder(u32, J3DTevOrder const*) {}
-    /* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder) {}
-    /* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32) { return NULL; }
-    /* 80110E80 */ virtual void setTevColor(u32, J3DGXColorS10 const*) {}
-    /* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10) {}
-    /* 8000DFC8 */ virtual J3DGXColorS10* getTevColor(u32) { return NULL; }
-    /* 800732AC */ virtual void setTevKColor(u32, J3DGXColor const*) {}
-    /* 8000E0C0 */ virtual void setTevKColor(u32, J3DGXColor) {}
-    /* 8000DFC0 */ virtual J3DGXColor* getTevKColor(u32) { return NULL; }
-    /* 80322950 */ virtual void setTevKColorSel(u32, u8 const*) {}
-    /* 8000E0B8 */ virtual void setTevKColorSel(u32, u8) {}
-    /* 8000DFB0 */ virtual u8 getTevKColorSel(u32) { return false; }
-    /* 80322954 */ virtual void setTevKAlphaSel(u32, u8 const*) {}
-    /* 8000E0B4 */ virtual void setTevKAlphaSel(u32, u8) {}
-    /* 8000DFA8 */ virtual u8 getTevKAlphaSel(u32) { return false; }
-    /* 8032354C */ virtual void setTevStageNum(u8 const*) {}
-    /* 8000E0C8 */ virtual void setTevStageNum(u8) {}
-    /* 8000DFD0 */ virtual u8 getTevStageNum() const { return 1; }
-    /* 80323550 */ virtual void setTevStage(u32, J3DTevStage const*) {}
-    /* 8000E0A8 */ virtual void setTevStage(u32, J3DTevStage) {}
-    /* 8000DF8C */ virtual J3DTevStage* getTevStage(u32) { return NULL; }
-    /* 8032295C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*) {}
-    /* 80322958 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo) {}
-    /* 80322960 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*) {}
-    /* 8000E0B0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable) {}
-    /* 8000DFA0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
-    /* 80323554 */ virtual void setIndTevStage(u32, J3DIndTevStage const*) {}
-    /* 8000E0A4 */ virtual void setIndTevStage(u32, J3DIndTevStage) {}
-    /* 8000DF84 */ virtual J3DIndTevStage* getIndTevStage(u32) { return NULL; }
-    /* 80323558 */ virtual u32 getTexNoOffset() const { return 0; }
-    /* 80322964 */ virtual u32 getTevRegOffset() const { return 0; }
-    /* 80321FE0 */ virtual void setTexNoOffset(u32 offset) { mTexNoOffset = offset; }
-    /* 8032296C */ virtual void setTevRegOffset(u32) {}
-    /* 80317224 */ virtual ~J3DTevBlock() {}
+    virtual s32 countDLSize() { return 0; }
+    virtual void setTexNo(u32, u16 const*) {}
+    virtual void setTexNo(u32, u16) {}
+    virtual u16 getTexNo(u32) const { return 0xffff; }
+    virtual void setTevOrder(u32, J3DTevOrder const*) {}
+    virtual void setTevOrder(u32, J3DTevOrder) {}
+    virtual J3DTevOrder* getTevOrder(u32) { return NULL; }
+    virtual void setTevColor(u32, J3DGXColorS10 const*) {}
+    virtual void setTevColor(u32, J3DGXColorS10) {}
+    virtual J3DGXColorS10* getTevColor(u32) { return NULL; }
+    virtual void setTevKColor(u32, J3DGXColor const*) {}
+    virtual void setTevKColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getTevKColor(u32) { return NULL; }
+    virtual void setTevKColorSel(u32, u8 const*) {}
+    virtual void setTevKColorSel(u32, u8) {}
+    virtual u8 getTevKColorSel(u32) { return false; }
+    virtual void setTevKAlphaSel(u32, u8 const*) {}
+    virtual void setTevKAlphaSel(u32, u8) {}
+    virtual u8 getTevKAlphaSel(u32) { return false; }
+    virtual void setTevStageNum(u8 const*) {}
+    virtual void setTevStageNum(u8) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32, J3DTevStage const*) {}
+    virtual void setTevStage(u32, J3DTevStage) {}
+    virtual J3DTevStage* getTevStage(u32) { return NULL; }
+    virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*) {}
+    virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo) {}
+    virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*) {}
+    virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable) {}
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
+    virtual void setIndTevStage(u32, J3DIndTevStage const*) {}
+    virtual void setIndTevStage(u32, J3DIndTevStage) {}
+    virtual J3DIndTevStage* getIndTevStage(u32) { return NULL; }
+    virtual u32 getTexNoOffset() const { return 0; }
+    virtual u32 getTevRegOffset() const { return 0; }
+    virtual void setTexNoOffset(u32 offset) { mTexNoOffset = offset; }
+    virtual void setTevRegOffset(u32) {}
+    virtual ~J3DTevBlock() {}
 
 protected:
-    /* 8031E098 */ void indexToPtr_private(u32);
+    void indexToPtr_private(u32);
 
     /* 0x4 */ u32 mTexNoOffset;
 };
@@ -644,12 +644,12 @@ protected:
 class J3DTevBlockNull : public J3DTevBlock {
 public:
     J3DTevBlockNull() { initialize(); }
-    /* 803176D4 */ void initialize();
-    /* 80332A0C */ virtual void reset(J3DTevBlock*) {}
-    /* 80332A10 */ virtual void ptrToIndex() {}
-    /* 80332A14 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80332A38 */ virtual u32 getType() { return 'TVNL'; }
-    /* 80332A44 */ virtual ~J3DTevBlockNull() {}
+    void initialize();
+    virtual void reset(J3DTevBlock*) {}
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVNL'; }
+    virtual ~J3DTevBlockNull() {}
 };
 
 /**
@@ -661,127 +661,127 @@ public:
     J3DTevBlockPatched() {
         initialize();
     }
-    /* 803176E0 */ void initialize();
+    void initialize();
 
-    /* 80320418 */ virtual void reset(J3DTevBlock*);
-    /* 80322970 */ virtual void load() {}
-    /* 8031CE00 */ virtual void diffTexNo();
-    /* 8031D028 */ virtual void diffTevReg();
-    /* 8031D0C4 */ virtual void diffTexCoordScale();
-    /* 8031CE64 */ virtual void diffTevStage();
-    /* 8031CF78 */ virtual void diffTevStageIndirect();
-    /* 8031C228 */ virtual void patch();
-    /* 8031BF4C */ virtual void patchTexNo();
-    /* 8031BFE0 */ virtual void patchTevReg();
-    /* 8031C0AC */ virtual void patchTexNoAndTexCoordScale();
-    /* 8031DFB4 */ virtual void ptrToIndex();
-    /* 80322974 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322998 */ virtual u32 getType() { return 'TVPT'; }
-    /* 803229AC */ virtual void setTevStageNum(u8 const* num) {
+    virtual void reset(J3DTevBlock*);
+    virtual void load() {}
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex();
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVPT'; }
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x52c, num != 0);
         mTevStageNum = *num;
     }
-    /* 803229A4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 803229B8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 80317BB4 */ virtual s32 countDLSize();
-    /* 803229D0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x53b, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x53c, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 803229C0 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x542, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 803229E4 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(1353, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
-    /* 80322A08 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x550, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x551, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 803229F4 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x557, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x55c, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80322A6C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x563, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x564, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322A30 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x56a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x56f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322AD0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x576, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x577, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 80322ABC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x57d, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x582, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80322B24 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x589, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x58a, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80322AF8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x590, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x595, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80322B90 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x59c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x59d, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 80322B64 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x5a3, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x5a8, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322BDC */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x5af, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x5b0, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322BD0 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x5b6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322BEC */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x5bb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80322BF8 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322C00 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80322C08 */ virtual void setTevRegOffset(u32 offset) {
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) {
         J3D_ASSERT_RANGE(0x53b, offset >= 0);
         mTevRegOffset = offset;
     }
-    /* 80322C10 */ virtual ~J3DTevBlockPatched() {}
+    virtual ~J3DTevBlockPatched() {}
 
     /* 0x08 */ u16 mTexNo[8];
     /* 0x18 */ J3DTevOrder mTevOrder[8];
@@ -803,80 +803,80 @@ public:
     J3DTevBlock1() {
         initialize();
     }
-    /* 803177E8 */ void initialize();
+    void initialize();
 
-    /* 803205D4 */ virtual void reset(J3DTevBlock*);
-    /* 8031AD64 */ virtual void load();
-    /* 8031D1BC */ virtual void diffTexNo();
-    /* 8031D1F4 */ virtual void diffTevReg();
-    /* 8031D368 */ virtual void diffTexCoordScale();
-    /* 8031D1F8 */ virtual void diffTevStage();
-    /* 8031D2E8 */ virtual void diffTevStageIndirect();
-    /* 8031C3CC */ virtual void patch();
-    /* 8031C274 */ virtual void patchTexNo();
-    /* 8031C2E4 */ virtual void patchTevReg();
-    /* 8031C2E8 */ virtual void patchTexNoAndTexCoordScale();
-    /* 80322770 */ virtual void ptrToIndex() {}
-    /* 80322774 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322798 */ virtual u32 getType() { return 'TVB1'; }
-    /* 80317BBC */ virtual s32 countDLSize();
-    /* 803227B4 */ virtual void setTexNo(u32 idx, u16 const* no) {
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB1'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* no) {
         J3D_ASSERT_RANGE(0x618, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x619, no != 0);
         mTexNo[idx] = *no;
     }
-    /* 803227A4 */ virtual void setTexNo(u32 idx, u16 no) {
+    virtual void setTexNo(u32 idx, u16 no) {
         J3D_ASSERT_RANGE(0x61f, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = no;
     }
-    /* 803227C8 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(1574, idx >= 0 && idx < 1);
         return mTexNo[idx];
     }
-    /* 803227EC */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x62d, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x62e, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 803227D8 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x634, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x639, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80322818 */ virtual void setTevStageNum(u8 const* num) {}
-    /* 80322814 */ virtual void setTevStageNum(u8 num) {}
-    /* 8032281C */ virtual u8 getTevStageNum() const { return 1; }
-    /* 80322860 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 const* num) {}
+    virtual void setTevStageNum(u8 num) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x64b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x64c, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322824 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x652, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 8032289C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x657, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 803228C4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x65e, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x65f, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803228B0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x665, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x66a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 803228EC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 803228F4 */ virtual ~J3DTevBlock1() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual ~J3DTevBlock1() {}
 
     /* 0x08 */ u16 mTexNo[1];
     /* 0x0A */ J3DTevOrder mTevOrder[1];
@@ -893,159 +893,159 @@ public:
     J3DTevBlock2() {
         initialize();
     }
-    /* 80317810 */ void initialize();
+    void initialize();
 
-    /* 803206AC */ virtual void reset(J3DTevBlock*);
-    /* 8031AFA4 */ virtual void load();
-    /* 8031D3D0 */ virtual void diffTexNo();
-    /* 8031D434 */ virtual void diffTevReg();
-    /* 8031D694 */ virtual void diffTexCoordScale();
-    /* 8031D4D0 */ virtual void diffTevStage();
-    /* 8031D5E4 */ virtual void diffTevStageIndirect();
-    /* 8031C6A8 */ virtual void patch();
-    /* 8031C3F8 */ virtual void patchTexNo();
-    /* 8031C48C */ virtual void patchTevReg();
-    /* 8031C558 */ virtual void patchTexNoAndTexCoordScale();
-    /* 803223AC */ virtual void ptrToIndex() {}
-    /* 803223B0 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 803223D4 */ virtual u32 getType() { return 'TVB2'; }
-    /* 80317BC4 */ virtual s32 countDLSize();
-    /* 803223F0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB2'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x6b4, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x6b5, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 803223E0 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x6bb, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 80322404 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(0x6c2, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         return mTexNo[idx];
     }
-    /* 80322428 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x6c9, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x6ca, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80322414 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x6d0, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x6d5, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 8032247C */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x6dc, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x6dd, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80322450 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x6e3, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x6e8, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 803224E8 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x6ef, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x6f0, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 803224BC */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x6f6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322514 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x6fb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322534 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x702, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x703, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322528 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x709, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322544 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x70e, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 8032255C */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x715, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x716, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 80322550 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x71c, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 8032256C */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x721, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 80322580 */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x727, num != 0);
         mTevStageNum = *num;
     }
-    /* 80322578 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 8032258C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 803225D0 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x736, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x737, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322594 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x73d, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 8032260C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x742, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322658 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x749, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x74a, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 80322620 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x750, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 803226A0 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x757, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x758, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 80322690 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x75e, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x763, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 803226D4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x76a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x76b, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803226C0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x771, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x776, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 803226FC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322704 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 8032270C */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80322714 */ virtual ~J3DTevBlock2() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock2() {}
 
     /* 0x08 */ u16 mTexNo[2];
     /* 0x0C */ J3DTevOrder mTevOrder[2];
@@ -1069,159 +1069,159 @@ public:
     J3DTevBlock4() {
         initialize();
     }
-    /* 803178EC */ void initialize();
+    void initialize();
 
-    /* 8032098C */ virtual void reset(J3DTevBlock*);
-    /* 8031B4C0 */ virtual void load();
-    /* 8031D758 */ virtual void diffTexNo();
-    /* 8031D7BC */ virtual void diffTevReg();
-    /* 8031DA1C */ virtual void diffTexCoordScale();
-    /* 8031D858 */ virtual void diffTevStage();
-    /* 8031D96C */ virtual void diffTevStageIndirect();
-    /* 8031C9D0 */ virtual void patch();
-    /* 8031C6F4 */ virtual void patchTexNo();
-    /* 8031C788 */ virtual void patchTevReg();
-    /* 8031C854 */ virtual void patchTexNoAndTexCoordScale();
-    /* 80321FE8 */ virtual void ptrToIndex() {}
-    /* 80321FEC */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322010 */ virtual u32 getType() { return 'TVB4'; }
-    /* 80317BCC */ virtual s32 countDLSize();
-    /* 8032202C */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB4'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x7d5, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x7d6, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 8032201C */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x7dc, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 80322040 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(2019, idx >= 0 && idx < 4);
         return mTexNo[idx];
     }
-    /* 80322064 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x7ea, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x7eb, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80322050 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x7f1, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x7f6, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 803220B8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x7fd, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x7fe, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 8032208C */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x804, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x809, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80322124 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x810, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x811, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 803220F8 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x817, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322150 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x81c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322170 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x823, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x824, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322164 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x82a, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322180 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x82f, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80322198 */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x836, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x837, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 8032218C */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x83d, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 803221A8 */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x842, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 803221BC */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x848, num != 0);
         mTevStageNum = *num;
     }
-    /* 803221B4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 803221C8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 8032220C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x857, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x858, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 803221D0 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x85e, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80322248 */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x863, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322294 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x86a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x86b, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 8032225C */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x871, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 803222DC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x878, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x879, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 803222CC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x87f, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x884, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 80322310 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x88b, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x88c, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803222FC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x892, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x897, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80322338 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322340 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80322348 */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80322350 */ virtual ~J3DTevBlock4() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock4() {}
 
     /* 0x08 */ u16 mTexNo[4];
     /* 0x10 */ J3DTevOrder mTevOrder[4];
@@ -1245,159 +1245,159 @@ public:
     J3DTevBlock16() {
         initialize();
     }
-    /* 80317A00 */ void initialize();
+    void initialize();
 
-    /* 80320E24 */ virtual void reset(J3DTevBlock*);
-    /* 8031BA04 */ virtual void load();
-    /* 8031DB14 */ virtual void diffTexNo();
-    /* 8031DB78 */ virtual void diffTevReg();
-    /* 8031DDD8 */ virtual void diffTexCoordScale();
-    /* 8031DC14 */ virtual void diffTevStage();
-    /* 8031DD28 */ virtual void diffTevStageIndirect();
-    /* 8031CCF8 */ virtual void patch();
-    /* 8031CA1C */ virtual void patchTexNo();
-    /* 8031CAB0 */ virtual void patchTevReg();
-    /* 8031CB7C */ virtual void patchTexNoAndTexCoordScale();
-    /* 8031DED0 */ virtual void ptrToIndex();
-    /* 80321C20 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80321C44 */ virtual u32 getType() { return 'TV16'; }
-    /* 80317BD4 */ virtual s32 countDLSize();
-    /* 80321C60 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex();
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TV16'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x8f6, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x8f7, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 80321C50 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x8fd, idx >= 0 && idx < 8);
         mTexNo[idx] = texNo;
     }
-    /* 80321C74 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(2308, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
-    /* 80321C98 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x90b, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x90c, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80321C84 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x912, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x917, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80321CEC */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x91e, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x91f, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80321CC0 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x925, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x92a, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80321D58 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x931, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x932, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 80321D2C */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x938, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x93d, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80321DA4 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x944, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x945, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80321D98 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x94b, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80321DB4 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x950, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80321DCC */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x957, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x958, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 80321DC0 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x95e, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 80321DDC */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x963, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 80321DF0 */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x969, num != 0);
         mTevStageNum = *num;
     }
-    /* 80321DE8 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 80321DFC */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 80321E40 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x978, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x979, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80321E04 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x97f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80321E7C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x984, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80321EC8 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x98b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x98c, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 80321E90 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x992, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 80321F10 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x999, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x99a, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 80321F00 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x9a0, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x9a5, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 80321F44 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x9ac, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x9ad, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 80321F30 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x9b3, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x9b8, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80321F6C */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80321F74 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80321F7C */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80321F84 */ virtual ~J3DTevBlock16() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock16() {}
 
     /* 0x008 */ u16 mTexNo[8];
     /* 0x018 */ J3DTevOrder mTevOrder[16];
@@ -1620,7 +1620,7 @@ extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull;
  *
  */
 struct J3DIndTexOrder : public J3DIndTexOrderInfo {
-    /* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
+    J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
     J3DIndTexOrder& operator=(J3DIndTexOrder const& other) {
         *(u32*)this = *(u32*)&other;
         return *this;
@@ -1637,9 +1637,9 @@ extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo;
  *
  */
 struct J3DIndTexMtx : public J3DIndTexMtxInfo {
-    /* 8000E0F0 */ J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; }
+    J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; }
     J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; }
-    /* 8000E064 */ ~J3DIndTexMtx() {}
+    ~J3DIndTexMtx() {}
     void load(u32 param_1) const {
         J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + GX_ITM_0), (Mtx3P)field_0x0, field_0x18);
     }
@@ -1663,9 +1663,9 @@ extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo;
  *
  */
 struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo {
-    /* 8000E0E4 */ J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {}
+    J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {}
     J3DIndTexCoordScale(J3DIndTexCoordScaleInfo const& info) : J3DIndTexCoordScaleInfo(info) {}
-    /* 8000E024 */ ~J3DIndTexCoordScale() {}
+    ~J3DIndTexCoordScale() {}
     u8 getScaleS() { return mScaleS; }
     u8 getScaleT() { return mScaleT; }
 
@@ -1682,23 +1682,23 @@ struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo {
  */
 class J3DIndBlock {
 public:
-    /* 8031734C */ virtual void reset(J3DIndBlock*) {}
+    virtual void reset(J3DIndBlock*) {}
     virtual void diff(u32) = 0;
     virtual void load() = 0;
-    /* 80317314 */ virtual s32 countDLSize() { return 0; }
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 8000E0A0 */ virtual void setIndTexStageNum(u8) {}
-    /* 8000DF7C */ virtual u8 getIndTexStageNum() const { return 0; }
-    /* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder) {}
-    /* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*) {}
-    /* 8000DF74 */ virtual J3DIndTexOrder* getIndTexOrder(u32) { return NULL; }
-    /* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {}
-    /* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
-    /* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
-    /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
-    /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
-    /* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
-    /* 8031726C */ virtual ~J3DIndBlock() {}
+    virtual void setIndTexStageNum(u8) {}
+    virtual u8 getIndTexStageNum() const { return 0; }
+    virtual void setIndTexOrder(u32, J3DIndTexOrder) {}
+    virtual void setIndTexOrder(u32, J3DIndTexOrder const*) {}
+    virtual J3DIndTexOrder* getIndTexOrder(u32) { return NULL; }
+    virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {}
+    virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
+    virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
+    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
+    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
+    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
+    virtual ~J3DIndBlock() {}
 };
 
 /**
@@ -1707,11 +1707,11 @@ public:
  */
 class J3DIndBlockNull : public J3DIndBlock {
 public:
-    /* 80317398 */ virtual void diff(u32) {}
-    /* 8031739C */ virtual void load() {}
-    /* 803173A0 */ virtual void reset(J3DIndBlock*) {}
-    /* 803173A4 */ virtual u32 getType() { return 'IBLN'; }
-    /* 803173B0 */ virtual ~J3DIndBlockNull() {}
+    virtual void diff(u32) {}
+    virtual void load() {}
+    virtual void reset(J3DIndBlock*) {}
+    virtual u32 getType() { return 'IBLN'; }
+    virtual ~J3DIndBlockNull() {}
 };
 
 /**
@@ -1723,55 +1723,55 @@ public:
     J3DIndBlockFull() {
         initialize();
     }
-    /* 80317B28 */ void initialize();
+    void initialize();
 
-    /* 80317BDC */ virtual s32 countDLSize();
-    /* 803210B0 */ virtual void reset(J3DIndBlock*);
-    /* 8031E328 */ virtual void diff(u32);
-    /* 8031E12C */ virtual void load();
-    /* 80323390 */ virtual u32 getType() { return 'IBLF'; }
-    /* 8032339C */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
-    /* 803233A4 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
-    /* 803233C0 */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
+    virtual s32 countDLSize();
+    virtual void reset(J3DIndBlock*);
+    virtual void diff(u32);
+    virtual void load();
+    virtual u32 getType() { return 'IBLF'; }
+    virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
+    virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
+    virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
         J3D_ASSERT_NULLPTR(0xa94, order != 0);
         J3D_ASSERT_RANGE(0xa95, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = *order;
     }
-    /* 803233AC */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) {
+    virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) {
         J3D_ASSERT_RANGE(0xa9b, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = order;
     }
-    /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32 idx) {
+    virtual J3DIndTexOrder* getIndTexOrder(u32 idx) {
         J3D_ASSERT_RANGE(0xaa0, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         return &mIndTexOrder[idx];
     }
-    /* 8032341C */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
+    virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
         J3D_ASSERT_NULLPTR(0xaa7, mtx != 0);
         J3D_ASSERT_RANGE(0xaa8, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = *mtx;
     }
-    /* 803233E8 */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) {
+    virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) {
         J3D_ASSERT_RANGE(0xaae, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = mtx;
     }
-    /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32 idx) {
+    virtual J3DIndTexMtx* getIndTexMtx(u32 idx) {
         J3D_ASSERT_RANGE(0xab3, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         return &mIndTexMtx[idx];
     }
-    /* 80323478 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
+    virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
         J3D_ASSERT_NULLPTR(0xaba, scale != 0);
         J3D_ASSERT_RANGE(0xabb, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = *scale;
     }
-    /* 80323464 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) {
+    virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) {
         J3D_ASSERT_RANGE(0xac1, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = scale;
     }
-    /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) {
+    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) {
         J3D_ASSERT_RANGE(0xac6, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         return &mIndTexCoordScale[idx];
     }
-    /* 803234A0 */ virtual ~J3DIndBlockFull() {}
+    virtual ~J3DIndBlockFull() {}
 
     /* 0x04 */ u8 mIndTexStageNum;
     /* 0x05 */ J3DIndTexOrder mIndTexOrder[4];
@@ -1785,35 +1785,35 @@ public:
  */
 class J3DPEBlock {
 public:
-    /* 80317348 */ virtual void reset(J3DPEBlock*) {}
+    virtual void reset(J3DPEBlock*) {}
     virtual void load() = 0;
-    /* 8000DBCC */ virtual void patch() {}
-    /* 80317344 */ virtual void diff(u32) {}
-    /* 8031735C */ virtual void diffFog() {}
-    /* 80317360 */ virtual void diffBlend() {}
-    /* 8031731C */ virtual s32 countDLSize() { return 0; }
+    virtual void patch() {}
+    virtual void diff(u32) {}
+    virtual void diffFog() {}
+    virtual void diffBlend() {}
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 80317368 */ virtual void setFog(J3DFog) {}
-    /* 80317364 */ virtual void setFog(J3DFog*) {}
-    /* 8000DF5C */ virtual J3DFog* getFog() { return NULL; }
-    /* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*) {}
-    /* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&) {}
-    /* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp() { return NULL; }
-    /* 80317370 */ virtual void setBlend(J3DBlend const*) {}
-    /* 8000E018 */ virtual void setBlend(J3DBlend const&) {}
-    /* 8000DF4C */ virtual J3DBlend* getBlend() { return NULL; }
-    /* 80317374 */ virtual void setZMode(J3DZMode const*) {}
-    /* 8000E014 */ virtual void setZMode(J3DZMode) {}
-    /* 8000DF44 */ virtual J3DZMode* getZMode() { return NULL; }
-    /* 80317378 */ virtual void setZCompLoc(u8 const*) {}
-    /* 8000E010 */ virtual void setZCompLoc(u8) {}
-    /* 8000DF3C */ virtual u8 getZCompLoc() const { return 0; }
-    /* 80317380 */ virtual void setDither(u8 const*) {}
-    /* 8031737C */ virtual void setDither(u8) {}
-    /* 80317384 */ virtual u8 getDither() const { return 0; }
-    /* 8031738C */ virtual u32 getFogOffset() const { return 0; }
-    /* 80317394 */ virtual void setFogOffset(u32) {}
-    /* 803172B4 */ virtual ~J3DPEBlock() {}
+    virtual void setFog(J3DFog) {}
+    virtual void setFog(J3DFog*) {}
+    virtual J3DFog* getFog() { return NULL; }
+    virtual void setAlphaComp(J3DAlphaComp const*) {}
+    virtual void setAlphaComp(J3DAlphaComp const&) {}
+    virtual J3DAlphaComp* getAlphaComp() { return NULL; }
+    virtual void setBlend(J3DBlend const*) {}
+    virtual void setBlend(J3DBlend const&) {}
+    virtual J3DBlend* getBlend() { return NULL; }
+    virtual void setZMode(J3DZMode const*) {}
+    virtual void setZMode(J3DZMode) {}
+    virtual J3DZMode* getZMode() { return NULL; }
+    virtual void setZCompLoc(u8 const*) {}
+    virtual void setZCompLoc(u8) {}
+    virtual u8 getZCompLoc() const { return 0; }
+    virtual void setDither(u8 const*) {}
+    virtual void setDither(u8) {}
+    virtual u8 getDither() const { return 0; }
+    virtual u32 getFogOffset() const { return 0; }
+    virtual void setFogOffset(u32) {}
+    virtual ~J3DPEBlock() {}
 };
 
 /**
@@ -1821,9 +1821,9 @@ public:
  *
  */
 struct J3DPEBlockNull : public J3DPEBlock {
-    /* 803329A0 */ virtual void load() {}
-    /* 803329A4 */ virtual u32 getType() { return 'PENL'; }
-    /* 803329B0 */ virtual ~J3DPEBlockNull() {}
+    virtual void load() {}
+    virtual u32 getType() { return 'PENL'; }
+    virtual ~J3DPEBlockNull() {}
 };
 
 /**
@@ -1832,10 +1832,10 @@ struct J3DPEBlockNull : public J3DPEBlock {
  */
 class J3DPEBlockOpa : public J3DPEBlock {
 public:
-    /* 80317BE4 */ virtual s32 countDLSize();
-    /* 8031E408 */ virtual void load();
-    /* 80323328 */ virtual u32 getType() { return 'PEOP'; }
-    /* 80323334 */ virtual ~J3DPEBlockOpa() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEOP'; }
+    virtual ~J3DPEBlockOpa() {}
 };
 
 /**
@@ -1844,10 +1844,10 @@ public:
  */
 class J3DPEBlockTexEdge : public J3DPEBlock {
 public:
-    /* 80317BEC */ virtual s32 countDLSize();
-    /* 8031E6C8 */ virtual void load();
-    /* 803232C0 */ virtual u32 getType() { return 'PEED'; }
-    /* 803232CC */ virtual ~J3DPEBlockTexEdge() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEED'; }
+    virtual ~J3DPEBlockTexEdge() {}
 };
 
 /**
@@ -1856,10 +1856,10 @@ public:
  */
 class J3DPEBlockXlu : public J3DPEBlock {
 public:
-    /* 80317BF4 */ virtual s32 countDLSize();
-    /* 8031E98C */ virtual void load();
-    /* 80323258 */ virtual u32 getType() { return 'PEXL'; }
-    /* 80323264 */ virtual ~J3DPEBlockXlu() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEXL'; }
+    virtual ~J3DPEBlockXlu() {}
 };
 
 /**
@@ -1871,45 +1871,45 @@ public:
     J3DPEBlockFogOff() {
         initialize();
     }
-    /* 80317B34 */ void initialize();
+    void initialize();
 
-    /* 803211B4 */ virtual void reset(J3DPEBlock*);
-    /* 8031EC50 */ virtual void load();
-    /* 80321ACC */ virtual void diff(u32 param_0) { if (param_0 & 0x20000000) diffBlend(); };
-    /* 8031F0D8 */ virtual void diffBlend();
-    /* 80317BFC */ virtual s32 countDLSize();
-    /* 80321B00 */ virtual u32 getType() { return 'PEFG'; }
-    /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
+    virtual void reset(J3DPEBlock*);
+    virtual void load();
+    virtual void diff(u32 param_0) { if (param_0 & 0x20000000) diffBlend(); };
+    virtual void diffBlend();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'PEFG'; }
+    virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
         J3D_ASSERT_NULLPTR(0xbf9, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
-    /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
-    /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
-    /* 80321B58 */ virtual void setBlend(J3DBlend const* blend) {
+    virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
+    virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
+    virtual void setBlend(J3DBlend const* blend) {
         J3D_ASSERT_NULLPTR(0xc07, blend != 0);
         mBlend = *blend;
     }
-    /* 80321B4C */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
-    /* 80321B64 */ virtual J3DBlend* getBlend() { return &mBlend; }
-    /* 80321B78 */ virtual void setZMode(J3DZMode const* zMode) {
+    virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
+    virtual J3DBlend* getBlend() { return &mBlend; }
+    virtual void setZMode(J3DZMode const* zMode) {
         J3D_ASSERT_NULLPTR(0xc15, zMode != 0);
         mZMode = *zMode;
     }
-    /* 80321B6C */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
-    /* 80321B84 */ virtual J3DZMode* getZMode() { return &mZMode; }
-    /* 80321B94 */ virtual void setZCompLoc(u8 const* zCompLoc) {
+    virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
+    virtual J3DZMode* getZMode() { return &mZMode; }
+    virtual void setZCompLoc(u8 const* zCompLoc) {
         J3D_ASSERT_NULLPTR(0xc23, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
-    /* 80321B8C */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
-    /* 80321BA0 */ virtual u8 getZCompLoc() const { return mZCompLoc; }
-    /* 80321BB0 */ virtual void setDither(u8 const* dither) {
+    virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
+    virtual u8 getZCompLoc() const { return mZCompLoc; }
+    virtual void setDither(u8 const* dither) {
         J3D_ASSERT_NULLPTR(0xc31, dither != 0);
         mDither = *dither;
     }
-    /* 80321BA8 */ virtual void setDither(u8 dither) { mDither = dither; }
-    /* 80321BBC */ virtual u8 getDither() const { return mDither; }
-    /* 80321BC4 */ virtual ~J3DPEBlockFogOff() {}
+    virtual void setDither(u8 dither) { mDither = dither; }
+    virtual u8 getDither() const { return mDither; }
+    virtual ~J3DPEBlockFogOff() {}
 
     /* 0x04 */ J3DAlphaComp mAlphaComp;
     /* 0x08 */ J3DBlend mBlend;
@@ -1927,52 +1927,52 @@ public:
     J3DPEBlockFull() {
         initialize();
     }
-    /* 80317B58 */ void initialize();
+    void initialize();
 
-    /* 8032129C */ virtual void reset(J3DPEBlock*);
-    /* 8031F3C0 */ virtual void load();
-    /* 8031F890 */ virtual void patch();
-    /* 8031FCA0 */ virtual void diff(u32);
-    /* 8031F940 */ virtual void diffFog();
-    /* 8031F9B8 */ virtual void diffBlend();
-    /* 80317C04 */ virtual s32 countDLSize();
-    /* 8032194C */ virtual u32 getType() { return 'PEFL'; }
-    /* 8032197C */ virtual void setFog(J3DFog fog) { mFog.setFogInfo(fog.getFogInfo()); }
-    /* 80321958 */ virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
-    /* 803219A0 */ virtual J3DFog* getFog() { return &mFog; }
-    /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
+    virtual void reset(J3DPEBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void diffFog();
+    virtual void diffBlend();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'PEFL'; }
+    virtual void setFog(J3DFog fog) { mFog.setFogInfo(fog.getFogInfo()); }
+    virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
+    virtual J3DFog* getFog() { return &mFog; }
+    virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
         J3D_ASSERT_NULLPTR(0xc7d, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
-    /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
-    /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
-    /* 803219F4 */ virtual void setBlend(J3DBlend const* blend) {
+    virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
+    virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
+    virtual void setBlend(J3DBlend const* blend) {
         J3D_ASSERT_NULLPTR(0xc8b, blend != 0);
         mBlend = *blend;
     }
-    /* 803219E8 */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
-    /* 80321A00 */ virtual J3DBlend* getBlend() { return &mBlend; }
-    /* 80321A14 */ virtual void setZMode(J3DZMode const* zMode) {
+    virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
+    virtual J3DBlend* getBlend() { return &mBlend; }
+    virtual void setZMode(J3DZMode const* zMode) {
         J3D_ASSERT_NULLPTR(0xc99, zMode != 0);
         mZMode = *zMode;
     }
-    /* 80321A08 */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
-    /* 80321A20 */ virtual J3DZMode* getZMode() { return &mZMode; }
-    /* 80321A30 */ virtual void setZCompLoc(u8 const* zCompLoc) {
+    virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
+    virtual J3DZMode* getZMode() { return &mZMode; }
+    virtual void setZCompLoc(u8 const* zCompLoc) {
         J3D_ASSERT_NULLPTR(0xca7, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
-    /* 80321A28 */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
-    /* 80321A3C */ virtual u8 getZCompLoc() const { return mZCompLoc; }
-    /* 80321A4C */ virtual void setDither(u8 const* dither) {
+    virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
+    virtual u8 getZCompLoc() const { return mZCompLoc; }
+    virtual void setDither(u8 const* dither) {
         J3D_ASSERT_NULLPTR(0xcb5, dither != 0);
         mDither = *dither;
     }
-    /* 80321A44 */ virtual void setDither(u8 dither) { mDither = dither; }
-    /* 80321A58 */ virtual u8 getDither() const { return mDither; }
-    /* 80321A60 */ virtual u32 getFogOffset() const { return mFogOffset; }
-    /* 80321A68 */ virtual void setFogOffset(u32 fogOffset) { mFogOffset = fogOffset; }
-    /* 80321A70 */ virtual ~J3DPEBlockFull() {}
+    virtual void setDither(u8 dither) { mDither = dither; }
+    virtual u8 getDither() const { return mDither; }
+    virtual u32 getFogOffset() const { return mFogOffset; }
+    virtual void setFogOffset(u32 fogOffset) { mFogOffset = fogOffset; }
+    virtual ~J3DPEBlockFull() {}
 
     /* 0x04 */ J3DFog mFog;
     /* 0x30 */ J3DAlphaComp mAlphaComp;
@@ -1988,8 +1988,8 @@ public:
  *
  */
 struct J3DColorBlockNull : public J3DColorBlock {
-    /* 80332B2C */ virtual u32 getType() { return 'CLNL'; }
-    /* 80332B38 */ virtual ~J3DColorBlockNull() {}
+    virtual u32 getType() { return 'CLNL'; }
+    virtual ~J3DColorBlockNull() {}
 };
 
 #endif /* J3DMATBLOCK_H */
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 5ec56d8c99..39b8be99c2 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -15,35 +15,35 @@ class J3DMaterialAnm;
  */
 class J3DMaterial {
 public:
-    /* 803157A0 */ static J3DColorBlock* createColorBlock(u32);
-    /* 803159A0 */ static J3DTexGenBlock* createTexGenBlock(u32);
-    /* 80315B04 */ static J3DTevBlock* createTevBlock(int);
-    /* 80315E78 */ static J3DIndBlock* createIndBlock(int);
-    /* 80315F60 */ static J3DPEBlock* createPEBlock(u32, u32);
-    /* 80316100 */ static u32 calcSizeColorBlock(u32);
-    /* 80316150 */ static u32 calcSizeTexGenBlock(u32);
-    /* 8031617C */ static u32 calcSizeTevBlock(int);
-    /* 803161C4 */ static u32 calcSizeIndBlock(int);
-    /* 803161D8 */ static u32 calcSizePEBlock(u32, u32);
-    /* 80316240 */ void initialize();
-    /* 80316290 */ u32 countDLSize();
-    /* 80316344 */ void makeDisplayList_private(J3DDisplayListObj*);
-    /* 80316AB0 */ void setCurrentMtx();
-    /* 80316AC8 */ void calcCurrentMtx();
-    /* 80316D68 */ void copy(J3DMaterial*);
-    /* 80316E90 */ s32 newSharedDisplayList(u32);
-    /* 80316F24 */ s32 newSingleSharedDisplayList(u32);
+    static J3DColorBlock* createColorBlock(u32);
+    static J3DTexGenBlock* createTexGenBlock(u32);
+    static J3DTevBlock* createTevBlock(int);
+    static J3DIndBlock* createIndBlock(int);
+    static J3DPEBlock* createPEBlock(u32, u32);
+    static u32 calcSizeColorBlock(u32);
+    static u32 calcSizeTexGenBlock(u32);
+    static u32 calcSizeTevBlock(int);
+    static u32 calcSizeIndBlock(int);
+    static u32 calcSizePEBlock(u32, u32);
+    void initialize();
+    u32 countDLSize();
+    void makeDisplayList_private(J3DDisplayListObj*);
+    void setCurrentMtx();
+    void calcCurrentMtx();
+    void copy(J3DMaterial*);
+    s32 newSharedDisplayList(u32);
+    s32 newSingleSharedDisplayList(u32);
 
-    /* 803169DC */ virtual void calc(f32 const (*)[4]);
-    /* 80316A54 */ virtual void calcDiffTexMtx(f32 const (*)[4]);
-    /* 80316620 */ virtual void makeDisplayList();
-    /* 80316668 */ virtual void makeSharedDisplayList();
-    /* 8031668C */ virtual void load();
-    /* 803166DC */ virtual void loadSharedDL();
-    /* 80316740 */ virtual void patch();
-    /* 803167D8 */ virtual void diff(u32);
-    /* 80316E14 */ virtual void reset();
-    /* 80316E70 */ virtual void change();
+    virtual void calc(f32 const (*)[4]);
+    virtual void calcDiffTexMtx(f32 const (*)[4]);
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void reset();
+    virtual void change();
 
     J3DMaterial() { initialize(); }
     ~J3DMaterial() {}
@@ -132,14 +132,14 @@ public:
 class J3DPatchedMaterial : public J3DMaterial {
 public:
     J3DPatchedMaterial() { initialize(); }
-    /* 80316FB8 */ void initialize();
+    void initialize();
 
-    /* 80316FD8 */ virtual void makeDisplayList();
-    /* 80316FDC */ virtual void makeSharedDisplayList();
-    /* 80316FE0 */ virtual void load();
-    /* 80316FFC */ virtual void loadSharedDL();
-    /* 8031703C */ virtual void reset();
-    /* 80317040 */ virtual void change();
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void reset();
+    virtual void change();
 };
 
 /**
@@ -149,17 +149,17 @@ public:
 class J3DLockedMaterial : public J3DMaterial {
 public:
     J3DLockedMaterial() { initialize(); }
-    /* 80317044 */ void initialize();
+    void initialize();
 
-    /* 803170D0 */ virtual void calc(f32 const (*)[4]);
-    /* 80317064 */ virtual void makeDisplayList();
-    /* 80317068 */ virtual void makeSharedDisplayList();
-    /* 8031706C */ virtual void load();
-    /* 80317088 */ virtual void loadSharedDL();
-    /* 803170C8 */ virtual void patch();
-    /* 803170CC */ virtual void diff(u32);
-    /* 803170D4 */ virtual void reset();
-    /* 803170D8 */ virtual void change();
+    virtual void calc(f32 const (*)[4]);
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void reset();
+    virtual void change();
 };
 
 #endif /* J3DMATERIAL_H */
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 9331f74cb5..afcfa283fe 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -65,17 +65,17 @@ public:
         : mUseMtxIndex(useMtxIndex)
     {}
 
-    /* 803130E4 */ void loadMtxIndx_PNGP(int, u16) const;
-    /* 80313128 */ void loadMtxIndx_PCPU(int, u16) const;
-    /* 80313188 */ void loadMtxIndx_NCPU(int, u16) const;
-    /* 803131D4 */ void loadMtxIndx_PNCPU(int, u16) const;
+    void loadMtxIndx_PNGP(int, u16) const;
+    void loadMtxIndx_PCPU(int, u16) const;
+    void loadMtxIndx_NCPU(int, u16) const;
+    void loadMtxIndx_PNCPU(int, u16) const;
 
-    /* 80314798 */ virtual ~J3DShapeMtx() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMTX'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return 1; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
-    /* 80313B94 */ virtual void load() const;
-    /* 80313BF0 */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    virtual ~J3DShapeMtx() {}
+    virtual u32 getType() const { return 'SMTX'; }
+    virtual u16 getUseMtxNum() const { return 1; }
+    virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
+    virtual void load() const;
+    virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
 
     static J3DShapeMtx_LoadFunc sMtxLoadPipeline[4];
     static u16 sMtxLoadCache[10];
@@ -123,22 +123,22 @@ public:
 
     static const int kVcdVatDLSize = 0xC0;
 
-    /* 80314B48 */ void initialize();
-    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
-    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
-    /* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
-    /* 80314E28 */ u16 countBumpMtxNum() const;
-    /* 80314EEC */ void loadVtxArray() const;
-    /* 80314F5C */ bool isSameVcdVatCmd(J3DShape*);
-    /* 80314F98 */ void makeVtxArrayCmd();
-    /* 80315260 */ void makeVcdVatCmd();
-    /* 80315300 */ void loadPreDrawSetting() const;
-    /* 80315398 */ void setArrayAndBindPipeline() const;
+    void initialize();
+    void addTexMtxIndexInDL(_GXAttr, u32);
+    void addTexMtxIndexInVcd(_GXAttr);
+    void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    u16 countBumpMtxNum() const;
+    void loadVtxArray() const;
+    bool isSameVcdVatCmd(J3DShape*);
+    void makeVtxArrayCmd();
+    void makeVcdVatCmd();
+    void loadPreDrawSetting() const;
+    void setArrayAndBindPipeline() const;
 
-    /* 803155E0 */ virtual void draw() const;
-    /* 8031544C */ virtual void drawFast() const;
-    /* 80315628 */ virtual void simpleDraw() const;
-    /* 803156AC */ virtual void simpleDrawCache() const;
+    virtual void draw() const;
+    virtual void drawFast() const;
+    virtual void simpleDraw() const;
+    virtual void simpleDrawCache() const;
 
     void loadCurrentMtx() const;
 
diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
index 8863f868d8..8d915610bb 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
@@ -9,12 +9,12 @@
  */
 class J3DShapeDraw {
 public:
-    /* 80314924 */ u32 countVertex(u32);
-    /* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
-    /* 80314ABC */ J3DShapeDraw(u8 const*, u32);
-    /* 80314AD4 */ void draw() const;
+    u32 countVertex(u32);
+    void addTexMtxIndexInDL(u32, u32, u32);
+    J3DShapeDraw(u8 const*, u32);
+    void draw() const;
 
-    /* 80314B00 */ virtual ~J3DShapeDraw();
+    virtual ~J3DShapeDraw();
 
     u8* getDisplayList() const { return (u8*)mDisplayList; }
     u32 getDisplayListSize() const { return mDisplayListSize; }
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index f269c0594b..0ce718392f 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -42,7 +42,7 @@ public:
  */
 class J3DDifferedTexMtx {
 public:
-    /* 8031322C */ static void loadExecute(f32 const (*)[4]);
+    static void loadExecute(f32 const (*)[4]);
 
     static inline void load(const Mtx m) {
         if (sTexGenBlock != NULL)
@@ -66,17 +66,17 @@ public:
         : J3DShapeMtx(useMtxIndex)
     {}
 
-    /* 80314730 */ virtual ~J3DShapeMtxConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMCV'; }
-    /* 80313C54 */ virtual void load() const;
-    /* 80314598 */ virtual void loadNrmMtx(int, u16) const {}
-    /* 80313D28 */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
+    virtual ~J3DShapeMtxConcatView() {}
+    virtual u32 getType() const { return 'SMCV'; }
+    virtual void load() const;
+    virtual void loadNrmMtx(int, u16) const {}
+    virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
 
-    /* 80313828 */ void loadMtxConcatView_PNGP(int, u16) const;
-    /* 803138C8 */ void loadMtxConcatView_PCPU(int, u16) const;
-    /* 8031396C */ void loadMtxConcatView_NCPU(int, u16) const;
-    /* 80313A14 */ void loadMtxConcatView_PNCPU(int, u16) const;
-    /* 80313AC8 */ void loadMtxConcatView_PNGP_LOD(int, u16) const;
+    void loadMtxConcatView_PNGP(int, u16) const;
+    void loadMtxConcatView_PCPU(int, u16) const;
+    void loadMtxConcatView_NCPU(int, u16) const;
+    void loadMtxConcatView_PNCPU(int, u16) const;
+    void loadMtxConcatView_PNGP_LOD(int, u16) const;
 
     static J3DShapeMtxConcatView_LoadFunc sMtxLoadPipeline[4];
     static J3DShapeMtxConcatView_LoadFunc sMtxLoadLODPipeline[4];
@@ -93,9 +93,9 @@ public:
         : J3DShapeMtxConcatView(useMtxIndex)
     {}
 
-    /* 80314520 */ virtual ~J3DShapeMtxYBBoardConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMYB'; }
-    /* 803143E4 */ virtual void load() const;
+    virtual ~J3DShapeMtxYBBoardConcatView() {}
+    virtual u32 getType() const { return 'SMYB'; }
+    virtual void load() const;
 };
 
 /**
@@ -108,9 +108,9 @@ public:
         : J3DShapeMtxConcatView(useMtxIndex)
     {}
 
-    /* 803145A4 */ virtual ~J3DShapeMtxBBoardConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMBB'; }
-    /* 803142D4 */ virtual void load() const;
+    virtual ~J3DShapeMtxBBoardConcatView() {}
+    virtual u32 getType() const { return 'SMBB'; }
+    virtual void load() const;
 };
 
 /**
@@ -125,12 +125,12 @@ public:
         , mUseMtxIndexTable(useMtxIndexTable)
     {}
 
-    /* 803146B0 */ virtual ~J3DShapeMtxMulti() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMML'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
-    /* 80313E4C */ virtual void load() const;
-    /* 80313EEC */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    virtual ~J3DShapeMtxMulti() {}
+    virtual u32 getType() const { return 'SMML'; }
+    virtual u16 getUseMtxNum() const { return mUseMtxNum; }
+    virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
+    virtual void load() const;
+    virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
 
 private:
     /* 0x8 */ u16 mUseMtxNum;
@@ -149,13 +149,13 @@ public:
         , mUseMtxIndexTable(useMtxIndexTable)
     {}
 
-    /* 8031461C */ virtual ~J3DShapeMtxMultiConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMMC'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
-    /* 80313FA4 */ virtual void load() const;
-    /* 803146AC */ virtual void loadNrmMtx(int, u16) const {}
-    /* 8031419C */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
+    virtual ~J3DShapeMtxMultiConcatView() {}
+    virtual u32 getType() const { return 'SMMC'; }
+    virtual u16 getUseMtxNum() const { return mUseMtxNum; }
+    virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
+    virtual void load() const;
+    virtual void loadNrmMtx(int, u16) const {}
+    virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
 
 private:
     /* 0x8 */ u16 mUseMtxNum;
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index c8bff4d49f..152cb4d152 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -11,7 +11,7 @@
  */
 class J3DLightInfo {
 public:
-    /* 803256C4 */ J3DLightInfo& operator=(J3DLightInfo const&);
+    J3DLightInfo& operator=(J3DLightInfo const&);
 
     /* 0x00 */ Vec mLightPosition;
     /* 0x0C */ Vec mLightDirection;
@@ -28,8 +28,8 @@ extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
  */
 class J3DLightObj {
 public:
-    /* 80018C0C */ J3DLightObj() { mInfo = j3dDefaultLightInfo; }
-    /* 80323590 */ void load(u32) const;
+    J3DLightObj() { mInfo = j3dDefaultLightInfo; }
+    void load(u32) const;
 
     J3DLightInfo& getLightInfo() { return mInfo; }
     J3DLightObj& operator=(J3DLightObj const& other) {
@@ -53,20 +53,20 @@ struct J3DTextureSRTInfo {
     /* 0x10 */ f32 mTranslationY;
 
     inline void operator=(J3DTextureSRTInfo const& other) {
+#ifdef __MWERKS__
         register const f32* src = &other.mScaleX;
         register f32* dst = &mScaleX;
         register f32 xy;
-#ifdef __MWERKS__
         asm {
             psq_l xy, 0(src), 0, 0
             psq_st xy, 0(dst), 0, 0
         };
-#endif
+
         // Unclear why there's a 4 byte copy here.
         *(u32*)&mRotation = *(u32*)&other.mRotation;
         src = &other.mTranslationX;
         dst = &mTranslationX;
-#ifdef __MWERKS__
+
         asm {
             psq_l xy, 0(src), 0, 0
             psq_st xy, 0(dst), 0, 0
@@ -95,8 +95,8 @@ enum J3DTexMtxMode {
  * 
  */
 struct J3DTexMtxInfo {
-    /* 80325718 */ J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
-    /* 80325794 */ void setEffectMtx(Mtx);
+    J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
+    void setEffectMtx(Mtx);
 
     /* 0x00 */ u8 mProjection;
     /* 0x01 */ u8 mInfo;
@@ -122,7 +122,7 @@ struct J3DIndTexMtxInfo {
  * 
  */
 struct J3DFogInfo {
-    /* 80325800 */ J3DFogInfo& operator=(J3DFogInfo const&);
+    J3DFogInfo& operator=(J3DFogInfo const&);
 
     /* 0x00 */ u8 mType;
     /* 0x01 */ u8 mAdjEnable;
@@ -140,7 +140,7 @@ struct J3DFogInfo {
  * 
  */
 struct J3DNBTScaleInfo {
-    /* 8032587C */ J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
+    J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
 
     /* 0x0 */ u8 mbHasScale;
     /* 0x4 */ Vec mScale;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 2de86ef75f..57e3613ea2 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -70,19 +70,19 @@ struct J3DSys {
     /* 0x114 */ GXColor* mVtxCol;
     /* 0x118 */ Vec* mNBTScale;
 
-    /* 8030FDE8 */ J3DSys();
-    /* 8030FEC0 */ void loadPosMtxIndx(int, u16) const;
-    /* 8030FEE4 */ void loadNrmMtxIndx(int, u16) const;
-    /* 8030FF0C */ void setTexCacheRegion(GXTexCacheSize);
-    /* 803100BC */ void drawInit();
-    /* 8031073C */ void reinitGX();
-    /* 8031079C */ void reinitGenMode();
-    /* 803107E8 */ void reinitLighting();
-    /* 80310894 */ void reinitTransform();
-    /* 80310998 */ void reinitTexture();
-    /* 80310A3C */ void reinitTevStages();
-    /* 80310D44 */ void reinitIndStages();
-    /* 80310E3C */ void reinitPixelProc();
+    J3DSys();
+    void loadPosMtxIndx(int, u16) const;
+    void loadNrmMtxIndx(int, u16) const;
+    void setTexCacheRegion(GXTexCacheSize);
+    void drawInit();
+    void reinitGX();
+    void reinitGenMode();
+    void reinitLighting();
+    void reinitTransform();
+    void reinitTexture();
+    void reinitTevStages();
+    void reinitIndStages();
+    void reinitPixelProc();
 
     enum J3DSysDrawMode {
         J3DSysDrawMode_OpaTexEdge = 3,
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index e5c06c97c7..15c4b6ae10 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -65,7 +65,7 @@ extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode;
  * 
  */
 struct J3DTevStage {
-    /* 8000E230 */ J3DTevStage() {
+    J3DTevStage() {
         setTevStageInfo(j3dDefaultTevStageInfo);
         setTevSwapModeInfo(j3dDefaultTevSwapMode);
     }
@@ -120,7 +120,7 @@ struct J3DTevStage {
         setTevAlphaOp(info.field_0xe, info.field_0xf, info.field_0x10, info.field_0x11, info.field_0x12);
     }
 
-    /* 8003AACC */ J3DTevStage(J3DTevStageInfo const& param_0) {
+    J3DTevStage(J3DTevStageInfo const& param_0) {
         setTevStageInfo(param_0);
         setTevSwapModeInfo(j3dDefaultTevSwapMode);
     }
@@ -197,7 +197,7 @@ extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo;
  * 
  */
 struct J3DIndTevStage {
-    /* 8000E14C */ J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
+    J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
     J3DIndTevStage(J3DIndTevStageInfo const& info) : mInfo(0) { setIndTevStageInfo(info); }
     void setIndTevStageInfo(J3DIndTevStageInfo const& info) {
         setIndStage(info.mIndStage);
@@ -259,7 +259,7 @@ extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
  * 
  */
 struct J3DTevOrder : public J3DTevOrderInfo {
-    /* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
+    J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
     J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
     J3DTevOrderInfo& getTevOrderInfo() { return *this; }
 
@@ -274,7 +274,7 @@ extern u8 const j3dDefaultTevSwapTableID;
  * 
  */
 struct J3DTevSwapModeTable {
-    /* 8000E134 */ J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
+    J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
     J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
         mIdx = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
     }
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 66b6df3a40..63e4f8351e 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -19,10 +19,10 @@ private:
 public:
     J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) {}
 
-    /* 8031204C */ void loadGX(u16, GXTexMapID) const;
-    /* 803121A4 */ void entryNum(u16);
-    /* 8031221C */ void addResTIMG(u16, ResTIMG const*);
-    /* 803366A4 */ virtual ~J3DTexture() {}
+    void loadGX(u16, GXTexMapID) const;
+    void entryNum(u16);
+    void addResTIMG(u16, ResTIMG const*);
+    virtual ~J3DTexture() {}
 
     u16 getNum() const { return mNum; }
 
@@ -54,12 +54,12 @@ public:
         mTexMtxInfo = info;
     }
 
-    /* 803238C4 */ void load(u32) const;
-    /* 80323900 */ void calc(const Mtx);
-    /* 80323920 */ void calcTexMtx(const Mtx);
-    /* 80323C0C */ void calcPostTexMtx(const Mtx);
-    /* 80324358 */ void loadTexMtx(u32) const;
-    /* 803243BC */ void loadPostTexMtx(u32) const;
+    void load(u32) const;
+    void calc(const Mtx);
+    void calcTexMtx(const Mtx);
+    void calcPostTexMtx(const Mtx);
+    void loadTexMtx(u32) const;
+    void loadPostTexMtx(u32) const;
 
     J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
     Mtx& getMtx() { return mMtx; }
@@ -88,7 +88,7 @@ extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8];
  * 
  */
 struct J3DTexCoord : public J3DTexCoordInfo {
-    /* 8000E464 */ J3DTexCoord() {
+    J3DTexCoord() {
         setTexCoordInfo(j3dDefaultTexCoordInfo[0]);
         resetTexMtxReg();
     }
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 5ae91a7bb7..7b54237676 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -65,12 +65,13 @@ void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
 void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32);
 
 inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
+#ifdef __MWERKS__
     register f32 fr4;
     register f32 fr3;
     register f32 fr2;
     register f32 fr1;
     register f32 fr0;
-#ifdef __MWERKS__
+
     asm {
         psq_l fr4, 0(src), 0, 0
         psq_l fr3, 8(src), 0, 0
@@ -87,13 +88,13 @@ inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
 }
 
 inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
+#ifdef __MWERKS__
     register f32 x_y1;
     register f32 z1;
     register f32 x_y2;
     register f32 z2;
     register f32 x_y3;
     register f32 z3;
-#ifdef __MWERKS__
     asm {
         psq_l x_y1, 0(src), 0, 0
         lfs z1, 8(src)
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 38b969f730..0aab64cd8e 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -14,7 +14,7 @@ class J3DVertexBuffer;
  * 
  */
 struct J3DVtxColorCalc {
-    /* 8032E180 */ void calc(J3DModel*);
+    void calc(J3DModel*);
     virtual void calc(J3DVertexBuffer*);
 
     /* 0x0 */ void* vtable;  // inlined vtable?
@@ -77,15 +77,15 @@ class J3DVertexBuffer {
 public:
     J3DVertexBuffer() { init(); }
 
-    /* 80310F78 */ void setVertexData(J3DVertexData*);
-    /* 80310FD8 */ void init();
-    /* 80311030 */ ~J3DVertexBuffer();
-    /* 8031106C */ void setArray() const;
-    /* 80311090 */ s32 copyLocalVtxPosArray(u32);
-    /* 803111B0 */ s32 copyLocalVtxNrmArray(u32);
-    /* 803112D0 */ s32 copyLocalVtxArray(u32);
-    /* 80311478 */ s32 allocTransformedVtxPosArray();
-    /* 8031152C */ s32 allocTransformedVtxNrmArray();
+    void setVertexData(J3DVertexData*);
+    void init();
+    ~J3DVertexBuffer();
+    void setArray() const;
+    s32 copyLocalVtxPosArray(u32);
+    s32 copyLocalVtxNrmArray(u32);
+    s32 copyLocalVtxArray(u32);
+    s32 allocTransformedVtxPosArray();
+    s32 allocTransformedVtxNrmArray();
 
     void setCurrentVtxPos(void* pVtxPos) { mCurrentVtxPos = pVtxPos; }
     void* getCurrentVtxPos() { return mCurrentVtxPos; }
diff --git a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
index b59a6c2cac..cb70bbffa2 100644
--- a/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DAnmLoader.h
@@ -15,8 +15,8 @@ class J3DAnmBase;
  * 
  */
 struct J3DAnmLoaderDataBase {
-    /* 80337B40 */ static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
-    /* 80338134 */ static void setResource(J3DAnmBase*, void const*);
+    static J3DAnmBase* load(void const*, J3DAnmLoaderDataBaseFlag);
+    static void setResource(J3DAnmBase*, void const*);
 
     static J3DAnmBase* load(void const* param_0) { return load(param_0, J3DLOADER_UNK_FLAG0); }
 };
@@ -25,51 +25,51 @@ class J3DAnmLoader {
 public:
     virtual J3DAnmBase* load(const void*) = 0;
     virtual void setResource(J3DAnmBase*, const void*) = 0;
-    /* 80339800 */ virtual ~J3DAnmLoader() {}
+    virtual ~J3DAnmLoader() {}
 };
 
 class J3DAnmKeyLoader_v15 : public J3DAnmLoader {
 public:
-    /* 803384E0 */ J3DAnmKeyLoader_v15();
-    /* 80338FEC */ void readAnmTransform(J3DAnmTransformKeyData const*);
-    /* 80339014 */ void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
-    /* 803390B0 */ void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
-    /* 803390D8 */ void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
-    /* 803392B0 */ void readAnmColor(J3DAnmColorKeyData const*);
-    /* 803392D8 */ void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
-    /* 803393C4 */ void readAnmCluster(J3DAnmClusterKeyData const*);
-    /* 803393EC */ void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
-    /* 80339458 */ void readAnmTevReg(J3DAnmTevRegKeyData const*);
-    /* 80339480 */ void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
-    /* 8033960C */ void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
-    /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
+    J3DAnmKeyLoader_v15();
+    void readAnmTransform(J3DAnmTransformKeyData const*);
+    void setAnmTransform(J3DAnmTransformKey*, J3DAnmTransformKeyData const*);
+    void readAnmTextureSRT(J3DAnmTextureSRTKeyData const*);
+    void setAnmTextureSRT(J3DAnmTextureSRTKey*, J3DAnmTextureSRTKeyData const*);
+    void readAnmColor(J3DAnmColorKeyData const*);
+    void setAnmColor(J3DAnmColorKey*, J3DAnmColorKeyData const*);
+    void readAnmCluster(J3DAnmClusterKeyData const*);
+    void setAnmCluster(J3DAnmClusterKey*, J3DAnmClusterKeyData const*);
+    void readAnmTevReg(J3DAnmTevRegKeyData const*);
+    void setAnmTevReg(J3DAnmTevRegKey*, J3DAnmTevRegKeyData const*);
+    void readAnmVtxColor(J3DAnmVtxColorKeyData const*);
+    void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*);
 
-    /* 80338D44 */ virtual J3DAnmBase* load(void const*);
-    /* 80338E8C */ virtual void setResource(J3DAnmBase*, void const*);
-    /* 803384FC */ virtual ~J3DAnmKeyLoader_v15();
+    virtual J3DAnmBase* load(void const*);
+    virtual void setResource(J3DAnmBase*, void const*);
+    virtual ~J3DAnmKeyLoader_v15();
 
     /* 0x4 */ J3DAnmBase* mAnm;
 };
 
 class J3DAnmFullLoader_v15 : public J3DAnmLoader {
 public:
-    /* 80338468 */ J3DAnmFullLoader_v15();
-    /* 80338800 */ void readAnmTransform(J3DAnmTransformFullData const*);
-    /* 80338828 */ void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
-    /* 803388BC */ void readAnmColor(J3DAnmColorFullData const*);
-    /* 803388E4 */ void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
-    /* 803389B0 */ void readAnmTexPattern(J3DAnmTexPatternFullData const*);
-    /* 803389D8 */ void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
-    /* 80338A7C */ void readAnmVisibility(J3DAnmVisibilityFullData const*);
-    /* 80338AA4 */ void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
-    /* 80338B20 */ void readAnmCluster(J3DAnmClusterFullData const*);
-    /* 80338B48 */ void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
-    /* 80338BB4 */ void readAnmVtxColor(J3DAnmVtxColorFullData const*);
-    /* 80338BDC */ void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
+    J3DAnmFullLoader_v15();
+    void readAnmTransform(J3DAnmTransformFullData const*);
+    void setAnmTransform(J3DAnmTransformFull*, J3DAnmTransformFullData const*);
+    void readAnmColor(J3DAnmColorFullData const*);
+    void setAnmColor(J3DAnmColorFull*, J3DAnmColorFullData const*);
+    void readAnmTexPattern(J3DAnmTexPatternFullData const*);
+    void setAnmTexPattern(J3DAnmTexPattern*, J3DAnmTexPatternFullData const*);
+    void readAnmVisibility(J3DAnmVisibilityFullData const*);
+    void setAnmVisibility(J3DAnmVisibilityFull*, J3DAnmVisibilityFullData const*);
+    void readAnmCluster(J3DAnmClusterFullData const*);
+    void setAnmCluster(J3DAnmClusterFull*, J3DAnmClusterFullData const*);
+    void readAnmVtxColor(J3DAnmVtxColorFullData const*);
+    void setAnmVtxColor(J3DAnmVtxColorFull*, J3DAnmVtxColorFullData const*);
 
-    /* 80338558 */ virtual J3DAnmBase* load(void const*);
-    /* 803386A0 */ virtual void setResource(J3DAnmBase*, void const*);
-    /* 80338484 */ virtual ~J3DAnmFullLoader_v15();
+    virtual J3DAnmBase* load(void const*);
+    virtual void setResource(J3DAnmBase*, void const*);
+    virtual ~J3DAnmFullLoader_v15();
 
     /* 0x4 */ J3DAnmBase* mAnm;
 };
diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
index 45c3bf13e2..d02f38d7a8 100644
--- a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h
@@ -8,7 +8,7 @@
  * 
  */
 struct J3DClusterLoaderDataBase {
-    /* 80334130 */ static void* load(void const*);
+    static void* load(void const*);
 };
 
 /**
@@ -38,7 +38,7 @@ public:
 class J3DClusterLoader {
 public:
     virtual void* load(const void*) = 0;
-    /* 803345FC */ virtual ~J3DClusterLoader() {}
+    virtual ~J3DClusterLoader() {}
 };
 
 class J3DDeformData;
@@ -49,11 +49,11 @@ class J3DDeformData;
  */
 class J3DClusterLoader_v15 : public J3DClusterLoader {
 public:
-    /* 803341CC */ J3DClusterLoader_v15();
-    /* 803342F8 */ void readCluster(J3DClusterBlock const*);
+    J3DClusterLoader_v15();
+    void readCluster(J3DClusterBlock const*);
 
-    /* 80334244 */ virtual void* load(void const*);
-    /* 803341E8 */ virtual ~J3DClusterLoader_v15();
+    virtual void* load(void const*);
+    virtual ~J3DClusterLoader_v15();
 
     /* 0x04 */ J3DDeformData* mpDeformData;
 };
diff --git a/include/JSystem/J3DGraphLoader/J3DJointFactory.h b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
index 4ca8c129a8..fe918fe377 100644
--- a/include/JSystem/J3DGraphLoader/J3DJointFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DJointFactory.h
@@ -24,8 +24,8 @@ struct J3DJointInitData {
  * 
  */
 struct J3DJointFactory {
-    /* 80337178 */ J3DJointFactory(J3DJointBlock const&);
-    /* 803371D0 */ J3DJoint* create(int);
+    J3DJointFactory(J3DJointBlock const&);
+    J3DJoint* create(int);
 
     J3DJointInitData* mJointInitData;
     u16* mIndexTable;
@@ -40,4 +40,4 @@ struct J3DJointFactory {
     Vec& getMax(int no) const { return mJointInitData[mIndexTable[no]].mMax; }
 };
 
-#endif /* J3DJOINTFACTORY_H */
\ No newline at end of file
+#endif /* J3DJOINTFACTORY_H */
diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h
index c82d075f5b..208390a258 100644
--- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h
@@ -98,47 +98,47 @@ public:
         MATERIAL_TYPE_PATCHED = 2,
     };
 
-    /* 80330234 */ J3DMaterialFactory(J3DMaterialDLBlock const&);
-    /* 8032FFEC */ J3DMaterialFactory(J3DMaterialBlock const&);
-    /* 803302BC */ u16 countUniqueMaterials();
-    /* 80330304 */ u32 countTexGens(int) const;
-    /* 8033033C */ u32 countStages(int) const;
-    /* 803303C4 */ J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
-    /* 80330440 */ J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
-    /* 80330D84 */ J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
-    /* 8033168C */ void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
-    /* 803317D4 */ J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
-    /* 80331A7C */ u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
-    /* 80331AFC */ u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
-    /* 80331C30 */ u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
-    /* 80331D00 */ u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
-    /* 80331D18 */ J3DGXColor newMatColor(int, int) const;
-    /* 80331D74 */ u8 newColorChanNum(int) const;
-    /* 80331DAC */ J3DColorChan newColorChan(int, int) const;
-    /* 80331F50 */ J3DGXColor newAmbColor(int, int) const;
-    /* 80331FAC */ u32 newTexGenNum(int) const;
-    /* 80331FE4 */ J3DTexCoord newTexCoord(int, int) const;
-    /* 80332044 */ J3DTexMtx* newTexMtx(int, int) const;
-    /* 803320CC */ u8 newCullMode(int) const;
-    /* 8033210C */ u16 newTexNo(int, int) const;
-    /* 80332154 */ J3DTevOrder newTevOrder(int, int) const;
-    /* 803321A0 */ J3DGXColorS10 newTevColor(int, int) const;
-    /* 80332210 */ J3DGXColor newTevKColor(int, int) const;
-    /* 8033226C */ u8 newTevStageNum(int) const;
-    /* 803322A4 */ J3DTevStage newTevStage(int, int) const;
-    /* 80332304 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
-    /* 803323A0 */ u8 newIndTexStageNum(int) const;
-    /* 803323C8 */ J3DIndTexOrder newIndTexOrder(int, int) const;
-    /* 8033240C */ J3DIndTexMtx newIndTexMtx(int, int) const;
-    /* 803324B4 */ J3DIndTevStage newIndTevStage(int, int) const;
-    /* 80332648 */ J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
-    /* 8033268C */ J3DFog newFog(int) const;
-    /* 80332768 */ J3DAlphaComp newAlphaComp(int) const;
-    /* 803327E8 */ J3DBlend newBlend(int) const;
-    /* 8033282C */ J3DZMode newZMode(int) const;
-    /* 8033288C */ u8 newZCompLoc(int) const;
-    /* 803328C4 */ u8 newDither(int) const;
-    /* 803328FC */ J3DNBTScale newNBTScale(int) const;
+    J3DMaterialFactory(J3DMaterialDLBlock const&);
+    J3DMaterialFactory(J3DMaterialBlock const&);
+    u16 countUniqueMaterials();
+    u32 countTexGens(int) const;
+    u32 countStages(int) const;
+    J3DMaterial* create(J3DMaterial*, MaterialType, int, u32) const;
+    J3DMaterial* createNormalMaterial(J3DMaterial*, int, u32) const;
+    J3DMaterial* createPatchedMaterial(J3DMaterial*, int, u32) const;
+    void modifyPatchedCurrentMtx(J3DMaterial*, int) const;
+    J3DMaterial* createLockedMaterial(J3DMaterial*, int, u32) const;
+    u32 calcSize(J3DMaterial*, MaterialType, int, u32) const;
+    u32 calcSizeNormalMaterial(J3DMaterial*, int, u32) const;
+    u32 calcSizePatchedMaterial(J3DMaterial*, int, u32) const;
+    u32 calcSizeLockedMaterial(J3DMaterial*, int, u32) const;
+    J3DGXColor newMatColor(int, int) const;
+    u8 newColorChanNum(int) const;
+    J3DColorChan newColorChan(int, int) const;
+    J3DGXColor newAmbColor(int, int) const;
+    u32 newTexGenNum(int) const;
+    J3DTexCoord newTexCoord(int, int) const;
+    J3DTexMtx* newTexMtx(int, int) const;
+    u8 newCullMode(int) const;
+    u16 newTexNo(int, int) const;
+    J3DTevOrder newTevOrder(int, int) const;
+    J3DGXColorS10 newTevColor(int, int) const;
+    J3DGXColor newTevKColor(int, int) const;
+    u8 newTevStageNum(int) const;
+    J3DTevStage newTevStage(int, int) const;
+    J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
+    u8 newIndTexStageNum(int) const;
+    J3DIndTexOrder newIndTexOrder(int, int) const;
+    J3DIndTexMtx newIndTexMtx(int, int) const;
+    J3DIndTevStage newIndTevStage(int, int) const;
+    J3DIndTexCoordScale newIndTexCoordScale(int, int) const;
+    J3DFog newFog(int) const;
+    J3DAlphaComp newAlphaComp(int) const;
+    J3DBlend newBlend(int) const;
+    J3DZMode newZMode(int) const;
+    u8 newZCompLoc(int) const;
+    u8 newDither(int) const;
+    J3DNBTScale newNBTScale(int) const;
 
     u16 getMaterialID(int idx) const { return mpMaterialID[idx]; }
     u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }
diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
index 16351f7daa..5ed3539d37 100644
--- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
+++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h
@@ -50,32 +50,32 @@ struct J3DMaterialInitData_v21 {
  */
 class J3DMaterialFactory_v21 {
 public:
-    /* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
-    /* 80332F84 */ u16 countUniqueMaterials();
-    /* 80332FA8 */ u32 countTexGens(int) const;
-    /* 80332FE0 */ u32 countStages(int) const;
-    /* 80333068 */ J3DMaterial* create(J3DMaterial*, int, u32) const;
-    /* 803337D8 */ J3DGXColor newMatColor(int, int) const;
-    /* 80333834 */ u8 newColorChanNum(int) const;
-    /* 8033386C */ J3DColorChan newColorChan(int, int) const;
-    /* 80333A10 */ u32 newTexGenNum(int) const;
-    /* 80333A48 */ J3DTexCoord newTexCoord(int, int) const;
-    /* 80333AA8 */ J3DTexMtx* newTexMtx(int, int) const;
-    /* 80333B30 */ u8 newCullMode(int) const;
-    /* 80333B70 */ u16 newTexNo(int, int) const;
-    /* 80333BB8 */ J3DTevOrder newTevOrder(int, int) const;
-    /* 80333C04 */ J3DGXColorS10 newTevColor(int, int) const;
-    /* 80333C74 */ J3DGXColor newTevKColor(int, int) const;
-    /* 80333CD0 */ u8 newTevStageNum(int) const;
-    /* 80333D08 */ J3DTevStage newTevStage(int, int) const;
-    /* 80333D68 */ J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
-    /* 80333E04 */ J3DFog newFog(int) const;
-    /* 80333EE0 */ J3DAlphaComp newAlphaComp(int) const;
-    /* 80333F60 */ J3DBlend newBlend(int) const;
-    /* 80333FA4 */ J3DZMode newZMode(int) const;
-    /* 80334004 */ u8 newZCompLoc(int) const;
-    /* 8033403C */ u8 newDither(int) const;
-    /* 80334074 */ J3DNBTScale newNBTScale(int) const;
+    J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&);
+    u16 countUniqueMaterials();
+    u32 countTexGens(int) const;
+    u32 countStages(int) const;
+    J3DMaterial* create(J3DMaterial*, int, u32) const;
+    J3DGXColor newMatColor(int, int) const;
+    u8 newColorChanNum(int) const;
+    J3DColorChan newColorChan(int, int) const;
+    u32 newTexGenNum(int) const;
+    J3DTexCoord newTexCoord(int, int) const;
+    J3DTexMtx* newTexMtx(int, int) const;
+    u8 newCullMode(int) const;
+    u16 newTexNo(int, int) const;
+    J3DTevOrder newTevOrder(int, int) const;
+    J3DGXColorS10 newTevColor(int, int) const;
+    J3DGXColor newTevKColor(int, int) const;
+    u8 newTevStageNum(int) const;
+    J3DTevStage newTevStage(int, int) const;
+    J3DTevSwapModeTable newTevSwapModeTable(int, int) const;
+    J3DFog newFog(int) const;
+    J3DAlphaComp newAlphaComp(int) const;
+    J3DBlend newBlend(int) const;
+    J3DZMode newZMode(int) const;
+    u8 newZCompLoc(int) const;
+    u8 newDither(int) const;
+    J3DNBTScale newNBTScale(int) const;
 
     u16 getMaterialID(u16 idx) { return mpMaterialID[idx]; }
     u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; }
diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
index 2a8de73bb8..1e2aa2051a 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
@@ -251,45 +251,45 @@ static inline u32 getMdlDataFlag_MtxLoadType(u32 flags) { return flags & 0x10; }
  */
 class J3DModelLoader {
 public:
-    /* 8033468C */ J3DModelLoader();
-    /* 80335048 */ void readInformation(J3DModelInfoBlock const*, u32);
-    /* 803351D0 */ void readVertex(J3DVertexBlock const*);
-    /* 803353F0 */ void readEnvelop(J3DEnvelopeBlock const*);
-    /* 80335480 */ void readDraw(J3DDrawBlock const*);
-    /* 80335530 */ void readJoint(J3DJointBlock const*);
-    /* 80335AF4 */ void readShape(J3DShapeBlock const*, u32);
-    /* 80335C18 */ void readTexture(J3DTextureBlock const*);
-    /* 80335F5C */ void readTextureTable(J3DTextureBlock const*);
-    /* 80336028 */ void readPatchedMaterial(J3DMaterialBlock const*, u32);
-    /* 80336168 */ void readMaterialDL(J3DMaterialDLBlock const*, u32);
-    /* 8033631C */ void modifyMaterial(u32);
+    J3DModelLoader();
+    void readInformation(J3DModelInfoBlock const*, u32);
+    void readVertex(J3DVertexBlock const*);
+    void readEnvelop(J3DEnvelopeBlock const*);
+    void readDraw(J3DDrawBlock const*);
+    void readJoint(J3DJointBlock const*);
+    void readShape(J3DShapeBlock const*, u32);
+    void readTexture(J3DTextureBlock const*);
+    void readTextureTable(J3DTextureBlock const*);
+    void readPatchedMaterial(J3DMaterialBlock const*, u32);
+    void readMaterialDL(J3DMaterialDLBlock const*, u32);
+    void modifyMaterial(u32);
 
-    /* 80336CD8 */ u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
-    /* 80336D64 */ u32 calcSizeJoint(J3DJointBlock const*);
-    /* 80336D90 */ u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
-    /* 80336DA0 */ u32 calcSizeDraw(J3DDrawBlock const*);
-    /* 80336EA0 */ u32 calcSizeShape(J3DShapeBlock const*, u32);
-    /* 80336F44 */ u32 calcSizeTexture(J3DTextureBlock const*);
-    /* 80336FF0 */ u32 calcSizeTextureTable(J3DTextureBlock const*);
-    /* 80337010 */ u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
-    /* 803370A0 */ u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
+    u32 calcSizeInformation(J3DModelInfoBlock const*, u32);
+    u32 calcSizeJoint(J3DJointBlock const*);
+    u32 calcSizeEnvelope(J3DEnvelopeBlock const*);
+    u32 calcSizeDraw(J3DDrawBlock const*);
+    u32 calcSizeShape(J3DShapeBlock const*, u32);
+    u32 calcSizeTexture(J3DTextureBlock const*);
+    u32 calcSizeTextureTable(J3DTextureBlock const*);
+    u32 calcSizePatchedMaterial(J3DMaterialBlock const*, u32);
+    u32 calcSizeMaterialDL(J3DMaterialDLBlock const*, u32);
 
 
-    /* 803347E0 */ virtual J3DModelData* load(void const*, u32);
-    /* 80334ABC */ virtual J3DMaterialTable* loadMaterialTable(void const*);
-    /* 80334C20 */ virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
-    /* 803367D4 */ virtual u32 calcLoadSize(void const*, u32);
-    /* 803369A0 */ virtual u32 calcLoadMaterialTableSize(void const*);
-    /* 80336A98 */ virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
-    /* 80336794 */ virtual u16 countMaterialNum(void const*);
-    /* 80334EE0 */ virtual void setupBBoardInfo();
-    /* 80336450 */ virtual ~J3DModelLoader() {}
-    /* 8033649C */ virtual void readMaterial(J3DMaterialBlock const*, u32) {}
-    /* 80336498 */ virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
-    /* 803364A4 */ virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
-    /* 803364A0 */ virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
-    /* 803364A8 */ virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
-    /* 803364B0 */ virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
+    virtual J3DModelData* load(void const*, u32);
+    virtual J3DMaterialTable* loadMaterialTable(void const*);
+    virtual J3DModelData* loadBinaryDisplayList(void const*, u32);
+    virtual u32 calcLoadSize(void const*, u32);
+    virtual u32 calcLoadMaterialTableSize(void const*);
+    virtual u32 calcLoadBinaryDisplayListSize(void const*, u32);
+    virtual u16 countMaterialNum(void const*);
+    virtual void setupBBoardInfo();
+    virtual ~J3DModelLoader() {}
+    virtual void readMaterial(J3DMaterialBlock const*, u32) {}
+    virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) {}
+    virtual void readMaterialTable(J3DMaterialBlock const*, u32) {}
+    virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) {}
+    virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { return false; }
+    virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { return false; }
 
     /* 0x04 */ J3DModelData* mpModelData;
     /* 0x08 */ J3DMaterialTable* mpMaterialTable;
@@ -307,9 +307,9 @@ public:
  */
 class J3DModelLoader_v21 : public J3DModelLoader {
 public:
-    /* 803363F4 */ ~J3DModelLoader_v21() {}
-    /* 80335890 */ void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
-    /* 80335E20 */ void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
+    ~J3DModelLoader_v21() {}
+    void readMaterial_v21(J3DMaterialBlock_v21 const*, u32);
+    void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32);
 };
 
 /**
@@ -318,11 +318,11 @@ public:
  */
 class J3DModelLoader_v26 : public J3DModelLoader {
 public:
-    /* 80336398 */ ~J3DModelLoader_v26() {}
-    /* 80335614 */ void readMaterial(J3DMaterialBlock const*, u32);
-    /* 80335CE4 */ void readMaterialTable(J3DMaterialBlock const*, u32);
-    /* 80336DB4 */ u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
-    /* 80336F60 */ u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
+    ~J3DModelLoader_v26() {}
+    void readMaterial(J3DMaterialBlock const*, u32);
+    void readMaterialTable(J3DMaterialBlock const*, u32);
+    u32 calcSizeMaterial(J3DMaterialBlock const*, u32);
+    u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32);
 };
 
 /**
@@ -331,7 +331,7 @@ public:
  */
 class J3DModelLoaderDataBase {
 public:
-    /* 803346BC */ static J3DModelData* load(void const* i_data, u32 i_flags);
+    static J3DModelData* load(void const* i_data, u32 i_flags);
 };
 
 #endif /* J3DMODELLOADER_H */
diff --git a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
index 4887730363..abee1f9bbb 100644
--- a/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
+++ b/include/JSystem/J3DGraphLoader/J3DShapeFactory.h
@@ -48,14 +48,14 @@ struct J3DShapeDrawInitData {
  * 
  */
 struct J3DShapeFactory {
-    /* 80337350 */ J3DShapeFactory(J3DShapeBlock const&);
-    /* 80337400 */ J3DShape* create(int, u32, GXVtxDescList*);
-    /* 803375BC */ J3DShapeMtx* newShapeMtx(u32, int, int) const;
-    /* 8033784C */ J3DShapeDraw* newShapeDraw(int, int) const;
-    /* 803378D8 */ void allocVcdVatCmdBuffer(u32);
-    /* 80337944 */ s32 calcSize(int, u32);
-    /* 803379D8 */ s32 calcSizeVcdVatCmdBuffer(u32);
-    /* 803379E8 */ s32 calcSizeShapeMtx(u32, int, int) const;
+    J3DShapeFactory(J3DShapeBlock const&);
+    J3DShape* create(int, u32, GXVtxDescList*);
+    J3DShapeMtx* newShapeMtx(u32, int, int) const;
+    J3DShapeDraw* newShapeDraw(int, int) const;
+    void allocVcdVatCmdBuffer(u32);
+    s32 calcSize(int, u32);
+    s32 calcSizeVcdVatCmdBuffer(u32);
+    s32 calcSizeShapeMtx(u32, int, int) const;
 
     /* 0x00 */ J3DShapeInitData* mShapeInitData;
     /* 0x04 */ u16* mIndexTable;
diff --git a/include/JSystem/J3DU/J3DUClipper.h b/include/JSystem/J3DU/J3DUClipper.h
index 0a6386b29e..d1910eb45c 100644
--- a/include/JSystem/J3DU/J3DUClipper.h
+++ b/include/JSystem/J3DU/J3DUClipper.h
@@ -11,10 +11,10 @@ class J3DUClipper {
 public:
     J3DUClipper() { init(); }
     virtual ~J3DUClipper() {}
-    /* 80273778 */ void init();
-    /* 8027378C */ void calcViewFrustum();
-    /* 802738FC */ int clip(f32 const (*)[4], Vec, f32) const;
-    /* 80273A44 */ int clip(f32 const (*)[4], Vec*, Vec*) const;
+    void init();
+    void calcViewFrustum();
+    int clip(f32 const (*)[4], Vec, f32) const;
+    int clip(f32 const (*)[4], Vec*, Vec*) const;
 
     void setFovy(f32 fovy) { mFovY = fovy; }
     void setAspect(f32 aspect) { mAspect = aspect; }
diff --git a/include/JSystem/J3DU/J3DUD.h b/include/JSystem/J3DU/J3DUD.h
index f2ea239e25..39496dd500 100644
--- a/include/JSystem/J3DU/J3DUD.h
+++ b/include/JSystem/J3DU/J3DUD.h
@@ -5,8 +5,10 @@
 
 namespace J3DUD {
     inline f32 JMAAbs(f32 x) {
+    #ifdef __MWERKS__
         return __fabsf(x);
+    #endif
     }
 }
 
-#endif /* J3DUD_H */
\ No newline at end of file
+#endif /* J3DUD_H */
diff --git a/include/JSystem/JAudio2/JAISe.h b/include/JSystem/JAudio2/JAISe.h
index 6accefb8fc..e23372410d 100644
--- a/include/JSystem/JAudio2/JAISe.h
+++ b/include/JSystem/JAudio2/JAISe.h
@@ -28,24 +28,24 @@ public:
         /* 0x27c */ JAITempoMgr mTempoMgr;
     };
 
-    /* 8029F6D8 */ virtual s32 getNumChild() const;
-    /* 8029F6E0 */ virtual JAISoundChild* getChild(int);
-    /* 8029F6E8 */ virtual void releaseChild(int);
-    /* 8029F84C */ virtual JASTrack* getTrack();
-    /* 8029F854 */ virtual JASTrack* getChildTrack(int);
-    /* 8029F864 */ virtual JAISe* asSe();
-    /* 8029F868 */ virtual JAITempoMgr* getTempoMgr();
-    /* 8029F5C8 */ virtual bool JAISound_tryDie_();
+    virtual s32 getNumChild() const;
+    virtual JAISoundChild* getChild(int);
+    virtual void releaseChild(int);
+    virtual JASTrack* getTrack();
+    virtual JASTrack* getChildTrack(int);
+    virtual JAISe* asSe();
+    virtual JAITempoMgr* getTempoMgr();
+    virtual bool JAISound_tryDie_();
 
-    /* 8029F03C */ JAISe(JAISeMgr* seMgr, JAISoundStrategyMgr<JAISe>* soundStrategyMgr, u32 priority);
-    /* 8029F0F8 */ void mixOut_(const JASSoundParams& params);
-    /* 8029F214 */ void stopTrack_();
-    /* 8029F250 */ void startTrack_(const JASSoundParams& params);
-    /* 8029F304 */ void JAISeCategoryMgr_mixOut_(bool, const JASSoundParams& params, JAISoundActivity activity);
-    /* 8029F4CC */ void JAISeCategoryMgr_calc_();
-    /* 8029F650 */ void JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
-    /* 8029F6EC */ bool prepare_getSeqData_();
-    /* 8029F78C */ void prepare_();
+    JAISe(JAISeMgr* seMgr, JAISoundStrategyMgr<JAISe>* soundStrategyMgr, u32 priority);
+    void mixOut_(const JASSoundParams& params);
+    void stopTrack_();
+    void startTrack_(const JASSoundParams& params);
+    void JAISeCategoryMgr_mixOut_(bool, const JASSoundParams& params, JAISoundActivity activity);
+    void JAISeCategoryMgr_calc_();
+    void JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
+    bool prepare_getSeqData_();
+    void prepare_();
 
     const JAISeqData* getSeqData() const { return &inner_.mSeqData; }
     u32 JAISeCategoryMgr_getProperPriority_() const { return inner_.mProperPriority; }
diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h
index 733d7ee66c..0ec8a510a8 100644
--- a/include/JSystem/JAudio2/JAISeMgr.h
+++ b/include/JSystem/JAudio2/JAISeMgr.h
@@ -42,24 +42,24 @@ class JAISeMgr;
  */
 class JAISeCategoryMgr : public JAISeqDataUser, public JASNonCopyable {
 public:
-    /* 8029F9C4 */ void JAISeMgr_calc_();
-    /* 8029FB30 */ void JAISeMgr_freeDeadSe_();
-    /* 8029FC88 */ bool JAISeMgr_acceptsNewSe_(u32 priority) const;
-    /* 8029FD40 */ void sortByPriority_();
-    /* 8029FDE0 */ void stop(u32 fadeTime);
-    /* 8029FE34 */ void stop();
-    /* 8029FE78 */ void stopSoundID(JAISoundID id);
-    /* 8029FEEC */ void pause(bool);
-    /* 8029FF18 */ void JAISeMgr_mixOut_(const JAISoundParamsMove& params, JAISoundActivity activity);
-    /* 802A0994 */ JAISeCategoryMgr() {
+    void JAISeMgr_calc_();
+    void JAISeMgr_freeDeadSe_();
+    bool JAISeMgr_acceptsNewSe_(u32 priority) const;
+    void sortByPriority_();
+    void stop(u32 fadeTime);
+    void stop();
+    void stopSoundID(JAISoundID id);
+    void pause(bool);
+    void JAISeMgr_mixOut_(const JAISoundParamsMove& params, JAISoundActivity activity);
+    JAISeCategoryMgr() {
         mParams.init();
         mMaxActiveSe = 0;
         mMaxInactiveSe = 0;
         field_0x0 = 0;
     }
 
-    /* 8029F8B0 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
-    /* 8029F91C */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
 
     JAISoundParamsMove* getParams() { return &mParams; }
     int getMaxSe() const {
@@ -91,22 +91,22 @@ class JAISeMgr : public JASGlobalInstance<JAISeMgr>,
                  public JAISeqDataUser,
                  public JAISoundActivity {
 public:
-    /* 802A0074 */ JAISeMgr(bool setInstance);
-    /* 802A0268 */ void setCategoryArrangement(const JAISeCategoryArrangement& arrangement);
-    /* 802A02A0 */ void stop();
-    /* 802A02F4 */ void stopSoundID(JAISoundID id);
-    /* 802A0358 */ void initParams();
-    /* 802A03D8 */ void setAudience(JAIAudience* audience);
-    /* 802A03E0 */ void setSeqDataMgr(JAISeqDataMgr* seqDataMgr);
-    /* 802A0434 */ void resetSeqDataMgr();
-    /* 802A0484 */ JAISe* newSe_(int category, u32 priority);
-    /* 802A0574 */ void calc();
-    /* 802A0704 */ void mixOut();
-    /* 802A0768 */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
-    /* 802A08D0 */ int getNumActiveSe() const;
+    JAISeMgr(bool setInstance);
+    void setCategoryArrangement(const JAISeCategoryArrangement& arrangement);
+    void stop();
+    void stopSoundID(JAISoundID id);
+    void initParams();
+    void setAudience(JAIAudience* audience);
+    void setSeqDataMgr(JAISeqDataMgr* seqDataMgr);
+    void resetSeqDataMgr();
+    JAISe* newSe_(int category, u32 priority);
+    void calc();
+    void mixOut();
+    bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
+    int getNumActiveSe() const;
 
-    /* 802A0168 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
-    /* 802A01D8 */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
 
     JAISeCategoryMgr* getCategory(int index) { return &mCategoryMgrs[index]; }
     JAIAudience* getAudience() { return mAudience; }
diff --git a/include/JSystem/JAudio2/JAISeq.h b/include/JSystem/JAudio2/JAISeq.h
index b1f602b7aa..b6cb55b5dc 100644
--- a/include/JSystem/JAudio2/JAISeq.h
+++ b/include/JSystem/JAudio2/JAISeq.h
@@ -30,27 +30,27 @@ public:
         /* 0x2FC */ JAISoundStrategyMgr<JAISeq>* strategyMgr;
     };
 
-    /* 802A1570 */ virtual s32 getNumChild() const;
-    /* 802A1578 */ virtual JAISoundChild* getChild(int index);
-    /* 802A165C */ virtual void releaseChild(int index);
-    /* 802A1768 */ virtual JAISeq* asSeq();
-    /* 802A1728 */ virtual JASTrack* getTrack();
-    /* 802A1730 */ virtual JASTrack* getChildTrack(int);
-    /* 802A176C */ virtual JAITempoMgr* getTempoMgr();
-    /* 802A12BC */ virtual bool JAISound_tryDie_();
+    virtual s32 getNumChild() const;
+    virtual JAISoundChild* getChild(int index);
+    virtual void releaseChild(int index);
+    virtual JAISeq* asSeq();
+    virtual JASTrack* getTrack();
+    virtual JASTrack* getChildTrack(int);
+    virtual JAITempoMgr* getTempoMgr();
+    virtual bool JAISound_tryDie_();
 
-    /* 802A0A8C */ JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr);
-    /* 802A0B64 */ void JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
+    JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr);
+    void JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
                                            int category, int);
-    /* 802A0C04 */ void playSeqData_(const JASSoundParams& params, JAISoundActivity activity);
-    /* 802A0CA4 */ void reserveChildTracks_(int);
-    /* 802A0E48 */ void releaseChildTracks_();
-    /* 802A0EDC */ bool prepare_getSeqData_();
-    /* 802A0F90 */ bool prepare_(const JASSoundParams& params, JAISoundActivity activity);
-    /* 802A108C */ void JAISeqMgr_calc_();
-    /* 802A1180 */ void die_();
-    /* 802A1348 */ void mixOut_(const JASSoundParams& params, JAISoundActivity activity);
-    /* 802A14FC */ void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity);
+    void playSeqData_(const JASSoundParams& params, JAISoundActivity activity);
+    void reserveChildTracks_(int);
+    void releaseChildTracks_();
+    bool prepare_getSeqData_();
+    bool prepare_(const JASSoundParams& params, JAISoundActivity activity);
+    void JAISeqMgr_calc_();
+    void die_();
+    void mixOut_(const JASSoundParams& params, JAISoundActivity activity);
+    void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity);
 
     JAISeqData& getSeqData() { return inner_.mSeqData; }
 
diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h
index 1357d7806c..cdbf853a62 100644
--- a/include/JSystem/JAudio2/JAISeqMgr.h
+++ b/include/JSystem/JAudio2/JAISeqMgr.h
@@ -18,20 +18,20 @@ public:
         RELEASE_SEQ_1 = 1,
         RELEASE_SEQ_2 = 2,
     };
-    /* 802A1914 */ JAISeqMgr(bool setInstance);
-    /* 802A1A08 */ void freeDeadSeq_();
-    /* 802A1B48 */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
-    /* 802A1C90 */ void calc();
-    /* 802A1DFC */ void stop();
-    /* 802A1E3C */ void stop(u32 fadeTime);
-    /* 802A1E8C */ void stopSoundID(JAISoundID id);
-    /* 802A1EFC */ void mixOut();
-    /* 802A1F58 */ JAISeq* beginStartSeq_();
-    /* 802A1FE8 */ bool endStartSeq_(JAISeq* seq, JAISoundHandle* handle);
+    JAISeqMgr(bool setInstance);
+    void freeDeadSeq_();
+    bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
+    void calc();
+    void stop();
+    void stop(u32 fadeTime);
+    void stopSoundID(JAISoundID id);
+    void mixOut();
+    JAISeq* beginStartSeq_();
+    bool endStartSeq_(JAISeq* seq, JAISoundHandle* handle);
 
-    /* 802A20F0 */ virtual ~JAISeqMgr() {}
-    /* 802A1804 */ virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
-    /* 802A1870 */ virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual ~JAISeqMgr() {}
+    virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion);
+    virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion);
 
     void setAudience(JAIAudience* audience) { mAudience = audience; }
     JAIAudience* getAudience() { return mAudience; }
diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h
index 10c1eee3a2..171215323f 100644
--- a/include/JSystem/JAudio2/JAISound.h
+++ b/include/JSystem/JAudio2/JAISound.h
@@ -45,8 +45,8 @@ class JASTrack;
  * 
  */
 struct JAISoundStatus_ {
-    /* 802A2220 */ s32 lockWhenPrepared();
-    /* 802A2244 */ s32 unlockIfLocked();
+    s32 lockWhenPrepared();
+    s32 unlockIfLocked();
 
     void init() {
         field_0x0.value = 0;
@@ -233,26 +233,26 @@ class JAITempoMgr;
  */
 class JAISound {
 public:
-    /* 802A21A0 */ void releaseHandle();
-    /* 802A21BC */ void attachHandle(JAISoundHandle* handle);
-    /* 802A22F8 */ JAISound();
-    /* 802A2328 */ void start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
-    /* 802A244C */ bool acceptsNewAudible() const;
-    /* 802A2474 */ void newAudible(const JGeometry::TVec3<f32>&, JGeometry::TVec3<f32> const*, u32,
+    void releaseHandle();
+    void attachHandle(JAISoundHandle* handle);
+    JAISound();
+    void start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience);
+    bool acceptsNewAudible() const;
+    void newAudible(const JGeometry::TVec3<f32>&, JGeometry::TVec3<f32> const*, u32,
                                    JAIAudience*);
-    /* 802A2598 */ void stop();
-    /* 802A24DC */ void stop(u32 fadeTime);
-    /* 802A25F0 */ void die_JAISound_();
-    /* 802A266C */ void increasePrepareCount_JAISound_();
-    /* 802A26B8 */ bool calc_JAISound_();
-    /* 802A29DC */ void initTrack_JAISound_(JASTrack* track);
+    void stop();
+    void stop(u32 fadeTime);
+    void die_JAISound_();
+    void increasePrepareCount_JAISound_();
+    bool calc_JAISound_();
+    void initTrack_JAISound_(JASTrack* track);
 
     virtual s32 getNumChild() const = 0;
     virtual JAISoundChild* getChild(int) = 0;
     virtual void releaseChild(int) = 0;
-    /* 802A25D8 */ virtual JAISe* asSe();
-    /* 802A25E0 */ virtual JAISeq* asSeq();
-    /* 802A25E8 */ virtual JAIStream* asStream();
+    virtual JAISe* asSe();
+    virtual JAISeq* asSeq();
+    virtual JAIStream* asStream();
     virtual JASTrack* getTrack() = 0;
     virtual JASTrack* getChildTrack(int) = 0;
     virtual JAITempoMgr* getTempoMgr() = 0;
diff --git a/include/JSystem/JAudio2/JAISoundChild.h b/include/JSystem/JAudio2/JAISoundChild.h
index c1c77865d4..feeed7f65c 100644
--- a/include/JSystem/JAudio2/JAISoundChild.h
+++ b/include/JSystem/JAudio2/JAISoundChild.h
@@ -11,9 +11,9 @@ struct JASTrack;
  * 
  */
 struct JAISoundChild : JASPoolAllocObject<JAISoundChild> {
-    /* 802A2AB0 */ void init();
-    /* 802A2B28 */ void mixOut(JASTrack*);
-    /* 802A2B7C */ void calc();
+    void init();
+    void mixOut(JASTrack*);
+    void calc();
 
     JAISoundChild() { init(); }
 
diff --git a/include/JSystem/JAudio2/JAISoundInfo.h b/include/JSystem/JAudio2/JAISoundInfo.h
index dd74c06c3c..4f536a0f63 100644
--- a/include/JSystem/JAudio2/JAISoundInfo.h
+++ b/include/JSystem/JAudio2/JAISoundInfo.h
@@ -9,14 +9,14 @@
  * 
  */
 struct JAISoundInfo : public JASGlobalInstance<JAISoundInfo> {
-    /* 802A2D34 */ JAISoundInfo(bool);
+    JAISoundInfo(bool);
     virtual int getSoundType(JAISoundID) const = 0;
     virtual int getCategory(JAISoundID) const = 0;
     virtual u32 getPriority(JAISoundID) const = 0;
     virtual void getSeInfo(JAISoundID, JAISe*) const = 0;
     virtual void getSeqInfo(JAISoundID, JAISeq*) const = 0;
     virtual void getStreamInfo(JAISoundID, JAIStream*) const = 0;
-    /* 802A2D50 */ virtual ~JAISoundInfo();
+    virtual ~JAISoundInfo();
 };
 
 #endif /* JAISOUNDINFO_H */
diff --git a/include/JSystem/JAudio2/JAISoundParams.h b/include/JSystem/JAudio2/JAISoundParams.h
index 1e3189bd8b..22d175154a 100644
--- a/include/JSystem/JAudio2/JAISoundParams.h
+++ b/include/JSystem/JAudio2/JAISoundParams.h
@@ -92,11 +92,11 @@ struct JAISoundParamsMove {
 
     void calc() { transition_.apply(&params_); }
 
-    /* 802A2DB4 */ void moveVolume(f32 newValue, u32 maxSteps);
-    /* 802A2E0C */ void movePitch(f32 newValue, u32 maxSteps);
-    /* 802A2E64 */ void moveFxMix(f32 newValue, u32 maxSteps);
-    /* 802A2EBC */ void movePan(f32 newValue, u32 maxSteps);
-    /* 802A2F14 */ void moveDolby(f32 newValue, u32 maxSteps);
+    void moveVolume(f32 newValue, u32 maxSteps);
+    void movePitch(f32 newValue, u32 maxSteps);
+    void moveFxMix(f32 newValue, u32 maxSteps);
+    void movePan(f32 newValue, u32 maxSteps);
+    void moveDolby(f32 newValue, u32 maxSteps);
 
     /* 0x00 */ JASSoundParams params_;
     /* 0x14 */ JAISoundParamsTransition transition_;
diff --git a/include/JSystem/JAudio2/JAISoundStarter.h b/include/JSystem/JAudio2/JAISoundStarter.h
index ef177adcd1..29a6f2e11a 100644
--- a/include/JSystem/JAudio2/JAISoundStarter.h
+++ b/include/JSystem/JAudio2/JAISoundStarter.h
@@ -9,11 +9,11 @@
  * 
  */
 struct JAISoundStarter : public JASGlobalInstance<JAISoundStarter> {
-    /* 802A2F6C */ JAISoundStarter(bool setInstance);
+    JAISoundStarter(bool setInstance);
 
     virtual ~JAISoundStarter();
     virtual bool startSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr) = 0;
-    /* 802A2FEC */ bool startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr);
+    bool startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr);
 };
 
 #endif /* JAISOUNDSTARTER_H */
diff --git a/include/JSystem/JAudio2/JAIStream.h b/include/JSystem/JAudio2/JAIStream.h
index e430d790f0..3594f05459 100644
--- a/include/JSystem/JAudio2/JAIStream.h
+++ b/include/JSystem/JAudio2/JAIStream.h
@@ -17,24 +17,24 @@ public:
         JASAramStream aramStream_;
     };
 
-    /* 802A3104 */ JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* soundStrategyMgr);
-    /* 802A319C */ void JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
+    JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* soundStrategyMgr);
+    void JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
                                               const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
                                               int category);
-    /* 802A3230 */ bool prepare_prepareStream_();
-    /* 802A33F4 */ void prepare_();
-    /* 802A3498 */ void prepare_startStream_();
-    /* 802A34E4 */ void JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundActivity activity);
-    /* 802A3720 */ void die_JAIStream_();
-    /* 802A37FC */ bool JAISound_tryDie_();
-    /* 802A388C */ void JAIStreamMgr_calc_();
-    /* 802A3948 */ s32 getNumChild() const;
-    /* 802A3950 */ JAISoundChild* getChild(int index);
-    /* 802A3A24 */ void releaseChild(int index);
-    /* 802A3ABC */ JASTrack* getTrack();
-    /* 802A3AC4 */ JASTrack* getChildTrack(int);
-    /* 802A3ACC */ JAIStream* asStream();
-    /* 802A3AD0 */ JAITempoMgr* getTempoMgr();
+    bool prepare_prepareStream_();
+    void prepare_();
+    void prepare_startStream_();
+    void JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundActivity activity);
+    void die_JAIStream_();
+    bool JAISound_tryDie_();
+    void JAIStreamMgr_calc_();
+    s32 getNumChild() const;
+    JAISoundChild* getChild(int index);
+    void releaseChild(int index);
+    JASTrack* getTrack();
+    JASTrack* getChildTrack(int);
+    JAIStream* asStream();
+    JAITempoMgr* getTempoMgr();
 
     void* JAIStreamMgr_getAramAddr_() const { return streamAramAddr_; }
 
diff --git a/include/JSystem/JAudio2/JAIStreamMgr.h b/include/JSystem/JAudio2/JAIStreamMgr.h
index 41ac1b0445..3b2b9c7f42 100644
--- a/include/JSystem/JAudio2/JAIStreamMgr.h
+++ b/include/JSystem/JAudio2/JAIStreamMgr.h
@@ -14,16 +14,16 @@ class JAIStreamDataMgr;
  */
 class JAIStreamMgr : public JASGlobalInstance<JAIStreamMgr> {
 public:
-    /* 802A3B68 */ JAIStreamMgr(bool setInstance);
-    /* 802A3C3C */ bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
-    /* 802A3D70 */ void freeDeadStream_();
-    /* 802A3EBC */ void calc();
-    /* 802A4028 */ void stop();
-    /* 802A4068 */ void stop(u32 fadeTime);
-    /* 802A40B8 */ void stopSoundID(JAISoundID id);
-    /* 802A4118 */ void mixOut();
-    /* 802A4174 */ JAIStream* newStream_();
-    /* 802B9978 */ bool isActive() const { return mStreamList.getNumLinks() != 0; }
+    JAIStreamMgr(bool setInstance);
+    bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
+    void freeDeadStream_();
+    void calc();
+    void stop();
+    void stop(u32 fadeTime);
+    void stopSoundID(JAISoundID id);
+    void mixOut();
+    JAIStream* newStream_();
+    bool isActive() const { return mStreamList.getNumLinks() != 0; }
 
     JAIAudience* getAudience() { return mAudience; }
     JAISoundParamsMove* getParams() { return &mParams; }
diff --git a/include/JSystem/JAudio2/JASAiCtrl.h b/include/JSystem/JAudio2/JASAiCtrl.h
index 8415a9d8af..a13dad1586 100644
--- a/include/JSystem/JAudio2/JASAiCtrl.h
+++ b/include/JSystem/JAudio2/JASAiCtrl.h
@@ -18,26 +18,26 @@ namespace JASDriver {
     typedef s16* (*MixCallback)(s32);
     typedef void (*MixFunc)(s16*, u32, MixCallback);
 
-    /* 8029C388 */ void initAI(void (*)(void));
-    /* 8029C4E4 */ void startDMA();
-    /* 8029C504 */ void stopDMA();
-    /* 8029C524 */ void setOutputRate(JASOutputRate);
-    /* 8029C568 */ void updateDac();
-    /* 8029C6C4 */ void updateDSP();
-    /* 8029C7E0 */ void readDspBuffer(s16*, u32);
-    /* 8029C900 */ void finishDSPFrame();
-    /* 8029C9DC */ void registerMixCallback(MixCallback, JASMixMode);
-    /* 8029C9E8 */ f32 getDacRate();
-    /* 8029C9F0 */ u32 getSubFrames();
-    /* 8029C9F8 */ u32 getDacSize();
-    /* 8029CA04 */ u32 getFrameSamples();
-    /* 8029CA10 */ void mixMonoTrack(s16*, u32, MixCallback);
-    /* 8029CAC0 */ void mixMonoTrackWide(s16*, u32, MixCallback);
-    /* 8029CB70 */ void mixExtraTrack(s16*, u32, MixCallback);
-    /* 8029CC50 */ void mixInterleaveTrack(s16*, u32, MixCallback);
-    /* 8029CCD4 */ u32 getSubFrameCounter();
-    /* 8029E2A8 */ void subframeCallback();
-    /* 8029E2D0 */ void DSPSyncCallback();
+    void initAI(void (*)(void));
+    void startDMA();
+    void stopDMA();
+    void setOutputRate(JASOutputRate);
+    void updateDac();
+    void updateDSP();
+    void readDspBuffer(s16*, u32);
+    void finishDSPFrame();
+    void registerMixCallback(MixCallback, JASMixMode);
+    f32 getDacRate();
+    u32 getSubFrames();
+    u32 getDacSize();
+    u32 getFrameSamples();
+    void mixMonoTrack(s16*, u32, MixCallback);
+    void mixMonoTrackWide(s16*, u32, MixCallback);
+    void mixExtraTrack(s16*, u32, MixCallback);
+    void mixInterleaveTrack(s16*, u32, MixCallback);
+    u32 getSubFrameCounter();
+    void subframeCallback();
+    void DSPSyncCallback();
 
     extern const MixFunc sMixFuncs[4];
     extern s16* sDmaDacBuffer[3];
diff --git a/include/JSystem/JAudio2/JASAramStream.h b/include/JSystem/JAudio2/JASAramStream.h
index 5b9e0969d4..c1268941e4 100644
--- a/include/JSystem/JAudio2/JASAramStream.h
+++ b/include/JSystem/JAudio2/JASAramStream.h
@@ -59,29 +59,29 @@ public:
         } field_0x8[6];
     };  // Size: 0x20
 
-    /* 8029631C */ static void initSystem(u32, u32);
-    /* 802963A8 */ JASAramStream();
-    /* 8029649C */ void init(u32, u32, StreamCallback, void*);
-    /* 8029655C */ bool prepare(s32, int);
-    /* 80296618 */ bool start();
-    /* 8029664C */ bool stop(u16);
-    /* 80296684 */ bool pause(bool);
-    /* 802966CC */ bool cancel();
-    /* 80296710 */ u32 getBlockSamples() const;
-    /* 8029673C */ static void headerLoadTask(void*);
-    /* 8029676C */ static void firstLoadTask(void*);
-    /* 80296848 */ static void loadToAramTask(void*);
-    /* 80296868 */ static void finishTask(void*);
-    /* 802968C8 */ static void prepareFinishTask(void*);
-    /* 80296920 */ bool headerLoad(u32, int);
-    /* 80296AE8 */ bool load();
-    /* 80296D74 */ static s32 channelProcCallback(void*);
-    /* 80296D94 */ static s32 dvdErrorCheck(void*);
-    /* 80296DF0 */ static void channelCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
-    /* 80296E2C */ void updateChannel(u32, JASChannel*, JASDsp::TChannel*);
-    /* 802974AC */ s32 channelProc();
-    /* 80297658 */ void channelStart();
-    /* 80297870 */ void channelStop(u16);
+    static void initSystem(u32, u32);
+    JASAramStream();
+    void init(u32, u32, StreamCallback, void*);
+    bool prepare(s32, int);
+    bool start();
+    bool stop(u16);
+    bool pause(bool);
+    bool cancel();
+    u32 getBlockSamples() const;
+    static void headerLoadTask(void*);
+    static void firstLoadTask(void*);
+    static void loadToAramTask(void*);
+    static void finishTask(void*);
+    static void prepareFinishTask(void*);
+    bool headerLoad(u32, int);
+    bool load();
+    static s32 channelProcCallback(void*);
+    static s32 dvdErrorCheck(void*);
+    static void channelCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
+    void updateChannel(u32, JASChannel*, JASDsp::TChannel*);
+    s32 channelProc();
+    void channelStart();
+    void channelStop(u16);
 
     void setPitch(f32 pitch) { mPitch = pitch; }
     void setVolume(f32 volume) { 
diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h
index 2e4e66f87f..91e34dc8fd 100644
--- a/include/JSystem/JAudio2/JASAudioReseter.h
+++ b/include/JSystem/JAudio2/JASAudioReseter.h
@@ -8,13 +8,13 @@
  * 
  */
 struct JASAudioReseter {
-    /* 8029D0B4 */ JASAudioReseter();
-    /* 8029D0FC */ ~JASAudioReseter();
-    /* 8029D138 */ bool start(u32, bool);
-    /* 8029D1D4 */ void resume();
-    /* 8029D1F8 */ s32 checkDone() const;
-    /* 8029D200 */ s32 calc();
-    /* 8029D2D4 */ static s32 callback(void*);
+    JASAudioReseter();
+    ~JASAudioReseter();
+    bool start(u32, bool);
+    void resume();
+    s32 checkDone() const;
+    s32 calc();
+    static s32 callback(void*);
 
     /* 0x0 */ u32 field_0x0;
     /* 0x4 */ f32 mDSPLevel;
diff --git a/include/JSystem/JAudio2/JASAudioThread.h b/include/JSystem/JAudio2/JASAudioThread.h
index f244b70fe1..8ad61106b3 100644
--- a/include/JSystem/JAudio2/JASAudioThread.h
+++ b/include/JSystem/JAudio2/JASAudioThread.h
@@ -15,13 +15,13 @@ enum JASAudioMessage {
  * 
  */
 struct JASAudioThread : public JKRThread, public JASGlobalInstance<JASAudioThread> {
-    /* 8029CCDC */ JASAudioThread(int, int, u32);
-    /* 8029CD4C */ static void create(s32);
-    /* 8029CDC0 */ void stop();
-    /* 8029CDEC */ virtual void* run();
-    /* 8029CF68 */ static void DMACallback();
-    /* 8029CFBC */ static void DSPCallback(void*);
-    /* 8029D028 */ virtual ~JASAudioThread() {}
+    JASAudioThread(int, int, u32);
+    static void create(s32);
+    void stop();
+    virtual void* run();
+    static void DMACallback();
+    static void DSPCallback(void*);
+    virtual ~JASAudioThread() {}
 
     static JASAudioThread* getThreadPointer() { return getInstance(); }
     static int getDSPSyncCount() { return snIntCount; }
diff --git a/include/JSystem/JAudio2/JASBNKParser.h b/include/JSystem/JAudio2/JASBNKParser.h
index b3a3048a8b..bfbad8376c 100644
--- a/include/JSystem/JAudio2/JASBNKParser.h
+++ b/include/JSystem/JAudio2/JASBNKParser.h
@@ -54,8 +54,8 @@ namespace JASBNKParser {
             /* 0xC */ u32 mOffsets[0];
         };
 
-        /* 80299600 */ TChunk* findChunk(void const*, u32);
-        /* 8029963C */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
+        TChunk* findChunk(void const*, u32);
+        JASBasicBank* createBasicBank(void const*, JKRHeap*);
     };
 
     namespace Ver0 {
@@ -124,13 +124,13 @@ namespace JASBNKParser {
             /* 0x20 */ TOffsetData mOffsets;
         };
 
-        /* 80299A3C */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
-        /* 80299E68 */ JASOscillator::Data* findOscPtr(JASBasicBank*, THeader const*, TOsc const*);
-        /* 80299F8C */ JASOscillator::Point const* getOscTableEndPtr(JASOscillator::Point const*);
+        JASBasicBank* createBasicBank(void const*, JKRHeap*);
+        JASOscillator::Data* findOscPtr(JASBasicBank*, THeader const*, TOsc const*);
+        JASOscillator::Point const* getOscTableEndPtr(JASOscillator::Point const*);
     };
 
-    /* 80299538 */ JASBank* createBank(void const*, JKRHeap*);
-    /* 80299558 */ JASBasicBank* createBasicBank(void const*, JKRHeap*);
+    JASBank* createBank(void const*, JKRHeap*);
+    JASBasicBank* createBasicBank(void const*, JKRHeap*);
 
     inline u32 getBankNumber(const void* param_0) { return ((u32*)param_0)[2]; }
 
diff --git a/include/JSystem/JAudio2/JASBank.h b/include/JSystem/JAudio2/JASBank.h
index b68f7103ec..8daa926938 100644
--- a/include/JSystem/JAudio2/JASBank.h
+++ b/include/JSystem/JAudio2/JASBank.h
@@ -25,9 +25,9 @@ public:
     JASWaveBank* getWaveBank() const { return mWaveBank; }
     void assignWaveBank(JASWaveBank* param_0) { mWaveBank = param_0; }
 
-    /* 80297930 */ static JASChannel* noteOn(JASBank const*, int, u8, u8, u16,
+    static JASChannel* noteOn(JASBank const*, int, u8, u8, u16,
                                 void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void*);
-    /* 80297C40 */ static JASChannel* noteOnOsc(int, u8, u8, u16,
+    static JASChannel* noteOnOsc(int, u8, u8, u16,
                                 void (*)(u32, JASChannel*, JASDsp::TChannel*, void*), void*);
 
 private:
diff --git a/include/JSystem/JAudio2/JASBasicBank.h b/include/JSystem/JAudio2/JASBasicBank.h
index 7aa07fc146..5f0718678f 100644
--- a/include/JSystem/JAudio2/JASBasicBank.h
+++ b/include/JSystem/JAudio2/JASBasicBank.h
@@ -7,13 +7,13 @@
 
 class JASBasicBank : public JASBank {
 public:
-    /* 80297D78 */ JASBasicBank();
-    /* 80297DA4 */ void newInstTable(u8, JKRHeap*);
-    /* 80297E00 */ bool getInstParam(int, int, int, JASInstParam*) const;
-    /* 80297E68 */ void setInst(int, JASInst*);
-    /* 80297E80 */ JASInst* getInst(int) const;
-    /* 80297F0C */ ~JASBasicBank() {}
-    /* 80297F68 */ u32 getType() const { return 'BSIC'; }
+    JASBasicBank();
+    void newInstTable(u8, JKRHeap*);
+    bool getInstParam(int, int, int, JASInstParam*) const;
+    void setInst(int, JASInst*);
+    JASInst* getInst(int) const;
+    ~JASBasicBank() {}
+    u32 getType() const { return 'BSIC'; }
 
     /* 0x8 */ JASInst** mInstTable;
     /* 0xC */ u8 mInstNumMax;
diff --git a/include/JSystem/JAudio2/JASBasicInst.h b/include/JSystem/JAudio2/JASBasicInst.h
index 32f1c2c7ac..c8054c4fd6 100644
--- a/include/JSystem/JAudio2/JASBasicInst.h
+++ b/include/JSystem/JAudio2/JASBasicInst.h
@@ -44,8 +44,8 @@ struct JASInst {
  */
 struct JASBasicInst : public JASInst {
     struct TKeymap {
-        /* 80298250 */ ~TKeymap();
-        /* 802982D4 */ TKeymap() { mHighKey = -1; }
+        ~TKeymap();
+        TKeymap() { mHighKey = -1; }
         void setHighKey(int key) { mHighKey = key; }
 
         /* 0x0 */ s32 mHighKey;
@@ -55,14 +55,14 @@ struct JASBasicInst : public JASInst {
         /* 0xC */ f32 field_0xc;
     };
 
-    /* 80298014 */ JASBasicInst();
-    /* 8029819C */ void setKeyRegionCount(u32, JKRHeap*);
-    /* 8029821C */ void setOsc(int, JASOscillator::Data const*);
-    /* 8029822C */ TKeymap* getKeyRegion(int);
+    JASBasicInst();
+    void setKeyRegionCount(u32, JKRHeap*);
+    void setOsc(int, JASOscillator::Data const*);
+    TKeymap* getKeyRegion(int);
 
-    /* 8029807C */ virtual ~JASBasicInst();
-    /* 802980F8 */ virtual bool getParam(int, int, JASInstParam*) const;
-    /* 802982E0 */ virtual u32 getType() const { return 'BSIC'; };
+    virtual ~JASBasicInst();
+    virtual bool getParam(int, int, JASInstParam*) const;
+    virtual u32 getType() const { return 'BSIC'; };
 
     void setVolume(f32 volume) { mVolume = volume; }
     void setPitch(f32 pitch) { mPitch = pitch; }
diff --git a/include/JSystem/JAudio2/JASBasicWaveBank.h b/include/JSystem/JAudio2/JASBasicWaveBank.h
index cc6db20d3f..820eae2fc3 100644
--- a/include/JSystem/JAudio2/JASBasicWaveBank.h
+++ b/include/JSystem/JAudio2/JASBasicWaveBank.h
@@ -10,9 +10,9 @@
  */
 struct JASBasicWaveBank : public JASWaveBank {
     struct TWaveHandle : public JASWaveHandle {
-        /* 80298B64 */ int getWavePtr() const;
-        /* 80298C18 */ TWaveHandle() { mHeap = NULL; }
-        /* 80298C64 */ const JASWaveInfo* getWaveInfo() const { return &field_0x4; }
+        int getWavePtr() const;
+        TWaveHandle() { mHeap = NULL; }
+        const JASWaveInfo* getWaveInfo() const { return &field_0x4; }
         bool compareHeap(JASHeap* heap) const { return mHeap == heap;}
 
         /* 0x04 */ JASWaveInfo field_0x4;
@@ -20,7 +20,7 @@ struct JASBasicWaveBank : public JASWaveBank {
     };
 
     struct TGroupWaveInfo {
-        /* 80298C4C */ TGroupWaveInfo() {
+        TGroupWaveInfo() {
             field_0x0 = 0xffff;
             field_0x4 = -1;
         }
@@ -30,12 +30,12 @@ struct JASBasicWaveBank : public JASWaveBank {
     };
 
     struct TWaveGroup : JASWaveArc {
-        /* 802989C0 */ TWaveGroup();
-        /* 80298A0C */ ~TWaveGroup();
-        /* 80298A84 */ void setWaveCount(u32, JKRHeap*);
-        /* 80298B04 */ void onLoadDone();
-        /* 80298B2C */ void onEraseDone();
-        /* 80298B54 */ u32 getWaveID(int) const;
+        TWaveGroup();
+        ~TWaveGroup();
+        void setWaveCount(u32, JKRHeap*);
+        void onLoadDone();
+        void onEraseDone();
+        u32 getWaveID(int) const;
 
         /* 0x74 */ JASBasicWaveBank* mBank;
         /* 0x78 */ TGroupWaveInfo* mCtrlWaveArray;
@@ -44,17 +44,17 @@ struct JASBasicWaveBank : public JASWaveBank {
         u32 getWaveCount() const { return mWaveCount; }
     };
 
-    /* 802984F8 */ JASBasicWaveBank();
-    /* 80298558 */ ~JASBasicWaveBank();
-    /* 80298640 */ TWaveGroup* getWaveGroup(u32);
-    /* 80298664 */ void setGroupCount(u32, JKRHeap*);
-    /* 80298710 */ void setWaveTableSize(u32, JKRHeap*);
-    /* 80298790 */ void incWaveTable(JASBasicWaveBank::TWaveGroup const*);
-    /* 8029883C */ void decWaveTable(JASBasicWaveBank::TWaveGroup const*);
-    /* 802988DC */ JASWaveHandle* getWaveHandle(u32) const;
-    /* 80298910 */ void setWaveInfo(JASBasicWaveBank::TWaveGroup*, int, u16, JASWaveInfo const&);
-    /* 80298C6C */ JASWaveArc* getWaveArc(u32 param_0) { return getWaveGroup(param_0); }
-    /* 80298C8C */ u32 getArcCount() const { return mGroupCount; }
+    JASBasicWaveBank();
+    ~JASBasicWaveBank();
+    TWaveGroup* getWaveGroup(u32);
+    void setGroupCount(u32, JKRHeap*);
+    void setWaveTableSize(u32, JKRHeap*);
+    void incWaveTable(JASBasicWaveBank::TWaveGroup const*);
+    void decWaveTable(JASBasicWaveBank::TWaveGroup const*);
+    JASWaveHandle* getWaveHandle(u32) const;
+    void setWaveInfo(JASBasicWaveBank::TWaveGroup*, int, u16, JASWaveInfo const&);
+    JASWaveArc* getWaveArc(u32 param_0) { return getWaveGroup(param_0); }
+    u32 getArcCount() const { return mGroupCount; }
 
     /* 0x04 */ OSMutex field_0x4;
     /* 0x1C */ TWaveHandle* mWaveTable;
diff --git a/include/JSystem/JAudio2/JASCalc.h b/include/JSystem/JAudio2/JASCalc.h
index ea6773821c..7c267268f4 100644
--- a/include/JSystem/JAudio2/JASCalc.h
+++ b/include/JSystem/JAudio2/JASCalc.h
@@ -8,12 +8,12 @@
  * 
  */
 struct JASCalc {
-    /* 8028F2E8 */ static void imixcopy(const s16*, const s16*, s16*, u32);
-    /* 8028F318 */ static void bcopyfast(const void* src, void* dest, u32 size);
-    /* 8028F354 */ static void bcopy(const void* src, void* dest, u32 size);
-    /* 8028F454 */ static void bzerofast(void* dest, u32 size);
-    /* 8028F480 */ static void bzero(void* dest, u32 size);
-    /* 8028F578 */ static f32 pow2(f32);
+    static void imixcopy(const s16*, const s16*, s16*, u32);
+    static void bcopyfast(const void* src, void* dest, u32 size);
+    static void bcopy(const void* src, void* dest, u32 size);
+    static void bzerofast(void* dest, u32 size);
+    static void bzero(void* dest, u32 size);
+    static f32 pow2(f32);
 
     // Could not make it work as inline - specialization is in JASCalc.cpp
     template <typename A, typename B>
diff --git a/include/JSystem/JAudio2/JASChannel.h b/include/JSystem/JAudio2/JASChannel.h
index 6e721a11a2..b54bb428ed 100644
--- a/include/JSystem/JAudio2/JASChannel.h
+++ b/include/JSystem/JAudio2/JASChannel.h
@@ -81,28 +81,28 @@ public:
         } parts;
     };
 
-    /* 8029A800 */ JASChannel(Callback, void*);
-    /* 8029A918 */ ~JASChannel();
-    /* 8029A9F0 */ int play();
-    /* 8029AA60 */ int playForce();
-    /* 8029AAD0 */ void release(u16);
-    /* 8029AB64 */ void setOscInit(u32, JASOscillator::Data const*);
-    /* 8029AB98 */ void setMixConfig(u32, u16);
-    /* 8029ABA8 */ static f32 calcEffect(JASChannel::PanVector const*);
-    /* 8029ABC0 */ static f32 calcPan(JASChannel::PanVector const*);
-    /* 8029ABEC */ void effectOsc(u32, JASOscillator::EffectParams*);
-    /* 8029ACD4 */ void setKeySweepTarget(s32, u32);
-    /* 8029AD38 */ void updateEffectorParam(JASDsp::TChannel*, u16*,
+    JASChannel(Callback, void*);
+    ~JASChannel();
+    int play();
+    int playForce();
+    void release(u16);
+    void setOscInit(u32, JASOscillator::Data const*);
+    void setMixConfig(u32, u16);
+    static f32 calcEffect(JASChannel::PanVector const*);
+    static f32 calcPan(JASChannel::PanVector const*);
+    void effectOsc(u32, JASOscillator::EffectParams*);
+    void setKeySweepTarget(s32, u32);
+    void updateEffectorParam(JASDsp::TChannel*, u16*,
                                             JASOscillator::EffectParams const&);
-    /* 8029AF78 */ static s32 dspUpdateCallback(u32, JASDsp::TChannel*, void*);
-    /* 8029B004 */ s32 initialUpdateDSPChannel(JASDsp::TChannel*);
-    /* 8029B324 */ s32 updateDSPChannel(JASDsp::TChannel*);
-    /* 8029B6A0 */ void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
-    /* 8029B7D8 */ void updateMixer(f32, f32, f32, f32, u16*);
-    /* 8029BBFC */ void free();
-    /* 8029BC0C */ static void initBankDisposeMsgQueue();
-    /* 8029BC48 */ static void receiveBankDisposeMsg();
-    /* 8029BCC0 */ bool checkBankDispose() const;
+    static s32 dspUpdateCallback(u32, JASDsp::TChannel*, void*);
+    s32 initialUpdateDSPChannel(JASDsp::TChannel*);
+    s32 updateDSPChannel(JASDsp::TChannel*);
+    void updateAutoMixer(JASDsp::TChannel*, f32, f32, f32, f32);
+    void updateMixer(f32, f32, f32, f32, u16*);
+    void free();
+    static void initBankDisposeMsgQueue();
+    static void receiveBankDisposeMsg();
+    bool checkBankDispose() const;
 
     void setPauseFlag(bool param_0) { mPauseFlag = param_0; }
     void setUpdateTimer(u32 param_0) { mUpdateTimer = param_0; }
diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/include/JSystem/JAudio2/JASCmdStack.h
index f579e923e9..22664962b6 100644
--- a/include/JSystem/JAudio2/JASCmdStack.h
+++ b/include/JSystem/JAudio2/JASCmdStack.h
@@ -42,7 +42,7 @@ struct JASPortCmd : JSULink<JASPortCmd> {
 		void execCommandStay();
 	};
 
-    /* 80291060 */ static void execAllCommand();
+    static void execAllCommand();
 
     Command _10;
 	JASPortArgs* _14;
diff --git a/include/JSystem/JAudio2/JASDSPChannel.h b/include/JSystem/JAudio2/JASDSPChannel.h
index 155c25b947..dce5c6cd52 100644
--- a/include/JSystem/JAudio2/JASDSPChannel.h
+++ b/include/JSystem/JAudio2/JASDSPChannel.h
@@ -23,21 +23,21 @@ struct JASDSPChannel {
         /* 3 */ CB_DROP,
     };
 
-    /* 8029D2F4 */ JASDSPChannel();
-    /* 8029D320 */ void free();
-    /* 8029D330 */ void start();
-    /* 8029D340 */ void drop();
-    /* 8029D534 */ void setPriority(u8);
-    /* 8029D65C */ void updateProc();
+    JASDSPChannel();
+    void free();
+    void start();
+    void drop();
+    void setPriority(u8);
+    void updateProc();
 
-    /* 8029D3C8 */ static void initAll();
-    /* 8029D44C */ static JASDSPChannel* alloc(u8, Callback, void*);
-    /* 8029D4BC */ static JASDSPChannel* allocForce(u8, Callback, void*);
-    /* 8029D540 */ static JASDSPChannel* getLowestChannel(int);
-    /* 8029D5D0 */ static JASDSPChannel* getLowestActiveChannel();
-    /* 8029D89C */ static void updateAll();
-    /* 8029D910 */ static int killActiveChannel();
-    /* 8029D948 */ static JASDSPChannel* getHandle(u32);
+    static void initAll();
+    static JASDSPChannel* alloc(u8, Callback, void*);
+    static JASDSPChannel* allocForce(u8, Callback, void*);
+    static JASDSPChannel* getLowestChannel(int);
+    static JASDSPChannel* getLowestActiveChannel();
+    static void updateAll();
+    static int killActiveChannel();
+    static JASDSPChannel* getHandle(u32);
 
     static JASDSPChannel* sDspChannels;
 
diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h
index 3925012e2f..c3f843a074 100644
--- a/include/JSystem/JAudio2/JASDSPInterface.h
+++ b/include/JSystem/JAudio2/JASDSPInterface.h
@@ -30,28 +30,28 @@ namespace JASDsp {
     } FxBuf;
 
     struct TChannel {
-        /* 8029DCA4 */ void init();
-        /* 8029DCE0 */ void playStart();
-        /* 8029DD44 */ void playStop();
-        /* 8029DD50 */ void replyFinishRequest();
-        /* 8029DD60 */ void forceStop();
-        /* 8029DD6C */ bool isActive() const;
-        /* 8029DD7C */ bool isFinish() const;
-        /* 8029DD8C */ void setWaveInfo(JASWaveInfo const&, u32, u32);
-        /* 8029DEAC */ void setOscInfo(u32);
-        /* 8029DEC4 */ void initAutoMixer();
-        /* 8029DEF0 */ void setAutoMixer(u16, u8, u8, u8, u8);
-        /* 8029DF1C */ void setPitch(u16);
-        /* 8029DF34 */ void setMixerInitVolume(u8, s16);
-        /* 8029DF54 */ void setMixerVolume(u8, s16);
-        /* 8029DF80 */ void setPauseFlag(u8);
-        /* 8029DF8C */ void flush();
-        /* 8029DFB0 */ void initFilter();
-        /* 8029E00C */ void setFilterMode(u16);
-        /* 8029E044 */ void setIIRFilterParam(s16*);
-        /* 8029E06C */ void setFIR8FilterParam(s16*);
-        /* 8029E094 */ void setDistFilter(s16);
-        /* 8029E09C */ void setBusConnect(u8, u8);
+        void init();
+        void playStart();
+        void playStop();
+        void replyFinishRequest();
+        void forceStop();
+        bool isActive() const;
+        bool isFinish() const;
+        void setWaveInfo(JASWaveInfo const&, u32, u32);
+        void setOscInfo(u32);
+        void initAutoMixer();
+        void setAutoMixer(u16, u8, u8, u8, u8);
+        void setPitch(u16);
+        void setMixerInitVolume(u8, s16);
+        void setMixerVolume(u8, s16);
+        void setPauseFlag(u8);
+        void flush();
+        void initFilter();
+        void setFilterMode(u16);
+        void setIIRFilterParam(s16*);
+        void setFIR8FilterParam(s16*);
+        void setDistFilter(s16);
+        void setBusConnect(u8, u8);
 
         /* 0x000 */ u16 mIsActive;
         /* 0x002 */ u16 mIsFinished;
@@ -99,18 +99,18 @@ namespace JASDsp {
         /* 0x158 */ u8 field_0x158[0x180 - 0x158];
     };
 
-    /* 8029D958 */ void boot(void (*)(void*));
-    /* 8029D9A4 */ void releaseHalt(u32);
-    /* 8029D9C4 */ void finishWork(u16);
-    /* 8029D9E4 */ void syncFrame(u32, u32, u32);
-    /* 8029DA04 */ void setDSPMixerLevel(f32);
-    /* 8029DA30 */ f32 getDSPMixerLevel();
-    /* 8029DA38 */ TChannel* getDSPHandle(int);
-    /* 8029DA48 */ void setFilterTable(s16*, s16*, u32);
-    /* 8029DA6C */ void flushBuffer();
-    /* 8029DAA0 */ void invalChannelAll();
-    /* 8029DAC8 */ void initBuffer();
-    /* 8029DB78 */ int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
+    void boot(void (*)(void*));
+    void releaseHalt(u32);
+    void finishWork(u16);
+    void syncFrame(u32, u32, u32);
+    void setDSPMixerLevel(f32);
+    f32 getDSPMixerLevel();
+    TChannel* getDSPHandle(int);
+    void setFilterTable(s16*, s16*, u32);
+    void flushBuffer();
+    void invalChannelAll();
+    void initBuffer();
+    int setFXLine(u8, s16*, JASDsp::FxlineConfig_*);
 
     extern u8 const DSPADPCM_FILTER[64];
     extern u32 const DSPRES_FILTER[320];
diff --git a/include/JSystem/JAudio2/JASDriverIF.h b/include/JSystem/JAudio2/JASDriverIF.h
index edb4574015..c44dab2b43 100644
--- a/include/JSystem/JAudio2/JASDriverIF.h
+++ b/include/JSystem/JAudio2/JASDriverIF.h
@@ -6,18 +6,18 @@
 typedef s32 (*DriverCallback)(void*);
 
 namespace JASDriver {
-    /* 8029E130 */ void setDSPLevel(f32);
-    /* 8029E150 */ u16 getChannelLevel_dsp();
-    /* 8029E158 */ f32 getDSPLevel();
-    /* 8029E178 */ void setOutputMode(u32);
-    /* 8029E180 */ u32 getOutputMode();
-    /* 8029E188 */ void waitSubFrame();
-    /* 8029E1C4 */ int rejectCallback(DriverCallback, void*);
-    /* 8029E240 */ bool registerDspSyncCallback(DriverCallback, void*);
-    /* 8029E274 */ bool registerSubFrameCallback(DriverCallback, void*);
-    /* 8029E2A8 */ void subframeCallback();
-    /* 8029E2D0 */ void DSPSyncCallback();
-    /* 8029E2F8 */ void updateDacCallback();
+    void setDSPLevel(f32);
+    u16 getChannelLevel_dsp();
+    f32 getDSPLevel();
+    void setOutputMode(u32);
+    u32 getOutputMode();
+    void waitSubFrame();
+    int rejectCallback(DriverCallback, void*);
+    bool registerDspSyncCallback(DriverCallback, void*);
+    bool registerSubFrameCallback(DriverCallback, void*);
+    void subframeCallback();
+    void DSPSyncCallback();
+    void updateDacCallback();
 
     extern JASCallbackMgr sDspSyncCallback;
     extern JASCallbackMgr sSubFrameCallback;
diff --git a/include/JSystem/JAudio2/JASDrumSet.h b/include/JSystem/JAudio2/JASDrumSet.h
index 4d35f9dc6e..4fed94c985 100644
--- a/include/JSystem/JAudio2/JASDrumSet.h
+++ b/include/JSystem/JAudio2/JASDrumSet.h
@@ -11,8 +11,8 @@ struct JKRHeap;
  */
 struct JASDrumSet : public JASInst {
     struct TPerc {
-        /* 802984C4 */ TPerc();
-        /* 802984E4 */ void setRelease(u32);
+        TPerc();
+        void setRelease(u32);
 
         void setVolume(f32 volume) { mVolume = volume; }
         void setPitch(f32 pitch) { mPitch = pitch; }
@@ -27,12 +27,12 @@ struct JASDrumSet : public JASInst {
         /* 0x14 */ f32 field_0x14;
     };
 
-    /* 802982EC */ JASDrumSet();
-    /* 80298314 */ virtual ~JASDrumSet();
-    /* 80298370 */ void newPercArray(u8, JKRHeap*);
-    /* 802983CC */ virtual bool getParam(int, int, JASInstParam*) const;
-    /* 802984B4 */ void setPerc(int, JASDrumSet::TPerc*);
-    /* 802984EC */ virtual u32 getType() const;
+    JASDrumSet();
+    virtual ~JASDrumSet();
+    void newPercArray(u8, JKRHeap*);
+    virtual bool getParam(int, int, JASInstParam*) const;
+    void setPerc(int, JASDrumSet::TPerc*);
+    virtual u32 getType() const;
     
     /* 0x4 */ TPerc** field_0x4;
     /* 0x8 */ u8 field_0x8;
diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h
index 38c022c058..cc82296d3a 100644
--- a/include/JSystem/JAudio2/JASDvdThread.h
+++ b/include/JSystem/JAudio2/JASDvdThread.h
@@ -11,8 +11,8 @@ class JASTaskThread;
  */
 class JASDvd {
 public:
-    /* 8028FEFC */ static JASTaskThread* getThreadPointer();
-    /* 8028FF04 */ static bool createThread(s32 priority, int msgCount, u32 stackSize);
+    static JASTaskThread* getThreadPointer();
+    static bool createThread(s32 priority, int msgCount, u32 stackSize);
 
     static JASTaskThread* sThread;
 };
diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h
index 49e579c403..72cacd14d2 100644
--- a/include/JSystem/JAudio2/JASHeapCtrl.h
+++ b/include/JSystem/JAudio2/JASHeapCtrl.h
@@ -17,15 +17,15 @@ class JKRSolidHeap;
  */
 class JASHeap {
 public:
-    /* 80290140 */ JASHeap(JASDisposer* param_0 = NULL);
-    /* 802901AC */ void initRootHeap(void*, u32);
-    /* 8029021C */ bool alloc(JASHeap*, u32);
-    /* 802903F4 */ bool allocTail(JASHeap*, u32);
-    /* 802904E4 */ bool free();
-    /* 80290608 */ void insertChild(JASHeap*, JASHeap*, void*, u32, bool);
-    /* 802906F0 */ JASHeap* getTailHeap();
-    /* 8029077C */ u32 getTailOffset();
-    /* 802907E0 */ u32 getCurOffset();
+    JASHeap(JASDisposer* param_0 = NULL);
+    void initRootHeap(void*, u32);
+    bool alloc(JASHeap*, u32);
+    bool allocTail(JASHeap*, u32);
+    bool free();
+    void insertChild(JASHeap*, JASHeap*, void*, u32, bool);
+    JASHeap* getTailHeap();
+    u32 getTailOffset();
+    u32 getCurOffset();
 
     void* getBase() { return mBase; }
     bool isAllocated() { return mBase; }
@@ -44,11 +44,11 @@ public:
  * 
  */
 struct JASGenericMemPool {
-    /* 80290848 */ JASGenericMemPool();
-    /* 80290860 */ ~JASGenericMemPool();
-    /* 802908C8 */ void newMemPool(u32, int);
-    /* 80290948 */ void* alloc(u32);
-    /* 80290994 */ void free(void*, u32);
+    JASGenericMemPool();
+    ~JASGenericMemPool();
+    void newMemPool(u32, int);
+    void* alloc(u32);
+    void free(void*, u32);
 
     /* 0x00 */ void* field_0x0;
     /* 0x04 */ u32 freeMemCount;
@@ -235,11 +235,11 @@ public:
 };
 
 namespace JASKernel {
-    /* 802909B8 */ void setupRootHeap(JKRSolidHeap*, u32);
-    /* 80290AC0 */ JKRHeap* getSystemHeap();
-    /* 80290AC8 */ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
-    /* 80290AD0 */ void setupAramHeap(u32, u32);
-    /* 80290B08 */ JASHeap* getAramHeap();
+    void setupRootHeap(JKRSolidHeap*, u32);
+    JKRHeap* getSystemHeap();
+    JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap();
+    void setupAramHeap(u32, u32);
+    JASHeap* getAramHeap();
 
     extern JASHeap audioAramHeap;
     extern u32 sAramBase;
diff --git a/include/JSystem/JAudio2/JASLfo.h b/include/JSystem/JAudio2/JASLfo.h
index fc4c365be8..42c303b73b 100644
--- a/include/JSystem/JAudio2/JASLfo.h
+++ b/include/JSystem/JAudio2/JASLfo.h
@@ -8,10 +8,10 @@
  * 
  */
 struct JASLfo {
-    /* 8029BD14 */ JASLfo();
-    /* 8029BD44 */ f32 getValue() const;
-    /* 8029BDD8 */ void incCounter(f32);
-    /* 8029BE2C */ void resetCounter();
+    JASLfo();
+    f32 getValue() const;
+    void incCounter(f32);
+    void resetCounter();
 
     void setDepth(f32 param_0) { mDepth = param_0; }
     void setPitch(f32 param_0) { mPitch = param_0; }
diff --git a/include/JSystem/JAudio2/JASProbe.h b/include/JSystem/JAudio2/JASProbe.h
index 26d43c20da..ea26f85ef8 100644
--- a/include/JSystem/JAudio2/JASProbe.h
+++ b/include/JSystem/JAudio2/JASProbe.h
@@ -8,10 +8,10 @@
  * 
  */
 struct JASProbe {
-    /* 80290EE4 */ static void start(s32, char const*);
-    /* 80290D74 */ void start(char const*);
-    /* 80290DC4 */ void stop();
-    /* 80290F24 */ static void stop(s32);
+    static void start(s32, char const*);
+    void start(char const*);
+    void stop();
+    static void stop(s32);
 
     static JASProbe* sProbeTable[16];
 
diff --git a/include/JSystem/JAudio2/JASRegisterParam.h b/include/JSystem/JAudio2/JASRegisterParam.h
index 12379b4046..0b5b13b6c8 100644
--- a/include/JSystem/JAudio2/JASRegisterParam.h
+++ b/include/JSystem/JAudio2/JASRegisterParam.h
@@ -16,10 +16,10 @@ public:
         REG3,
     };
 
-    /* 80293644 */ JASRegisterParam();
-    /* 80293664 */ void init();
-    /* 80293684 */ void write(JASRegisterParam::RegID, u32);
-    /* 802937B8 */ u32 read(JASRegisterParam::RegID);
+    JASRegisterParam();
+    void init();
+    void write(JASRegisterParam::RegID, u32);
+    u32 read(JASRegisterParam::RegID);
 
     u16 field_0x0[14];
 };
diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h
index 7d745a00e9..b5602633f8 100644
--- a/include/JSystem/JAudio2/JASResArcLoader.h
+++ b/include/JSystem/JAudio2/JASResArcLoader.h
@@ -5,10 +5,10 @@
 #include <dolphin/os.h>
 
 namespace JASResArcLoader {
-    /* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
-    /* 80290C04 */ size_t getResMaxSize(JKRArchive const*);
-    /* 80290C7C */ static void loadResourceCallback(void*);
-    /* 80290D18 */ int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
+    size_t getResSize(JKRArchive const*, u16);
+    size_t getResMaxSize(JKRArchive const*);
+    static void loadResourceCallback(void*);
+    int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32);
 };
 
 class JKRArchive;
diff --git a/include/JSystem/JAudio2/JASSeqCtrl.h b/include/JSystem/JAudio2/JASSeqCtrl.h
index aea3d2d387..974f1c7065 100644
--- a/include/JSystem/JAudio2/JASSeqCtrl.h
+++ b/include/JSystem/JAudio2/JASSeqCtrl.h
@@ -22,17 +22,17 @@ public:
         INTRTYPE_VALUE_6,
     };
 
-    /* 802938BC */ JASSeqCtrl();
-    /* 80293924 */ void init();
-    /* 80293980 */ void start(void*, u32);
-    /* 802939C4 */ int tickProc(JASTrack*);
-    /* 80293ABC */ void interrupt(JASSeqCtrl::IntrType);
-    /* 80293AE0 */ void setIntrMask(u32);
-    /* 80293AF0 */ void clrIntrMask(u32);
-    /* 80293B00 */ int retIntr();
-    /* 80293B28 */ int findIntr();
-    /* 80293B78 */ void checkIntr();
-    /* 80293BE8 */ void timerProcess();
+    JASSeqCtrl();
+    void init();
+    void start(void*, u32);
+    int tickProc(JASTrack*);
+    void interrupt(JASSeqCtrl::IntrType);
+    void setIntrMask(u32);
+    void clrIntrMask(u32);
+    int retIntr();
+    int findIntr();
+    void checkIntr();
+    void timerProcess();
 
     const JASSeqReader* getSeqReader() const { return &mReader; }
     void* getBase() { return mReader.getBase(); }
diff --git a/include/JSystem/JAudio2/JASSeqParser.h b/include/JSystem/JAudio2/JASSeqParser.h
index 1582997dba..506068d13c 100644
--- a/include/JSystem/JAudio2/JASSeqParser.h
+++ b/include/JSystem/JAudio2/JASSeqParser.h
@@ -19,76 +19,76 @@ public:
         u16 field_0xe;
     };
 
-    /* 80293CAC */ virtual ~JASSeqParser() {}
-    /* 802958D4 */ virtual s32 parse(JASTrack*);
-    /* 80295540 */ virtual s32 execNoteOnMidi(JASTrack*, u32, u32, u32);
-    /* 80295498 */ virtual s32 execNoteOnGate(JASTrack*, u32, u32, u32, u32);
-    /* 80295570 */ virtual s32 execNoteOff(JASTrack*, u32);
-    /* 8029559C */ virtual s32 execCommand(JASTrack*, s32 (JASSeqParser::*)(JASTrack*, u32*), u32, u32*);
+    virtual ~JASSeqParser() {}
+    virtual s32 parse(JASTrack*);
+    virtual s32 execNoteOnMidi(JASTrack*, u32, u32, u32);
+    virtual s32 execNoteOnGate(JASTrack*, u32, u32, u32, u32);
+    virtual s32 execNoteOff(JASTrack*, u32);
+    virtual s32 execCommand(JASTrack*, s32 (JASSeqParser::*)(JASTrack*, u32*), u32, u32*);
 
-    /* 80293CF4 */ bool conditionCheck(JASTrack*, JASSeqParser::BranchCondition);
-    /* 80293DC4 */ void writeReg(JASTrack*, u32, u32);
-    /* 80293FC8 */ u32 readReg(JASTrack*, u32) const;
-    /* 80294188 */ s32 cmdOpenTrack(JASTrack*, u32*);
-    /* 802941F0 */ s32 cmdCloseTrack(JASTrack*, u32*);
-    /* 8029421C */ s32 cmdCall(JASTrack*, u32*);
-    /* 80294248 */ s32 cmdCallF(JASTrack*, u32*);
-    /* 8029429C */ s32 cmdRet(JASTrack*, u32*);
-    /* 802942D4 */ s32 cmdRetF(JASTrack*, u32*);
-    /* 80294328 */ s32 cmdJmp(JASTrack*, u32*);
-    /* 80294340 */ s32 cmdJmpF(JASTrack*, u32*);
-    /* 80294398 */ s32 cmdJmpTable(JASTrack*, u32*);
-    /* 802943CC */ s32 cmdCallTable(JASTrack*, u32*);
-    /* 8029441C */ s32 cmdLoopS(JASTrack*, u32*);
-    /* 80294448 */ s32 cmdLoopE(JASTrack*, u32*);
-    /* 80294470 */ s32 cmdNote(JASTrack*, u32*);
-    /* 802944B4 */ s32 cmdNoteOn(JASTrack*, u32*);
-    /* 802944F4 */ s32 cmdNoteOff(JASTrack*, u32*);
-    /* 80294528 */ s32 cmdReadPort(JASTrack*, u32*);
-    /* 80294588 */ s32 cmdWritePort(JASTrack*, u32*);
-    /* 802945BC */ s32 cmdParentWritePort(JASTrack*, u32*);
-    /* 802945F8 */ s32 cmdChildWritePort(JASTrack*, u32*);
-    /* 80294644 */ s32 cmdParentReadPort(JASTrack*, u32*);
-    /* 802946AC */ s32 cmdChildReadPort(JASTrack*, u32*);
-    /* 80294724 */ s32 cmdCheckPortImport(JASTrack*, u32*);
-    /* 80294770 */ s32 cmdCheckPortExport(JASTrack*, u32*);
-    /* 802947BC */ s32 cmdWait(JASTrack*, u32*);
-    /* 802947F4 */ s32 cmdWaitByte(JASTrack*, u32*);
-    /* 80294804 */ s32 cmdSetLastNote(JASTrack*, u32*);
-    /* 8029483C */ s32 cmdEnvScaleSet(JASTrack*, u32*);
-    /* 8029488C */ s32 cmdEnvSet(JASTrack*, u32*);
-    /* 802948C8 */ s32 cmdSimpleADSR(JASTrack*, u32*);
-    /* 8029491C */ s32 cmdBusConnect(JASTrack*, u32*);
-    /* 8029494C */ s32 cmdSetIntTable(JASTrack*, u32*);
-    /* 8029495C */ s32 cmdSetInterrupt(JASTrack*, u32*);
-    /* 80294988 */ s32 cmdDisInterrupt(JASTrack*, u32*);
-    /* 802949B4 */ s32 cmdClrI(JASTrack*, u32*);
-    /* 802949E4 */ s32 cmdRetI(JASTrack*, u32*);
-    /* 80294A20 */ s32 cmdIntTimer(JASTrack*, u32*);
-    /* 80294A3C */ s32 cmdSyncCPU(JASTrack*, u32*);
-    /* 80294AA4 */ s32 cmdTempo(JASTrack*, u32*);
-    /* 80294AD4 */ s32 cmdFinish(JASTrack*, u32*);
-    /* 80294ADC */ s32 cmdNop(JASTrack*, u32*);
-    /* 80294AE4 */ s32 cmdFIRSet(JASTrack*, u32*);
-    /* 80294B1C */ s32 cmdIIRSet(JASTrack*, u32*);
-    /* 80294B70 */ s32 cmdIIRCutOff(JASTrack*, u32*);
-    /* 80294BB4 */ s32 cmdBankPrg(JASTrack*, u32*);
-    /* 80294BD0 */ s32 cmdBank(JASTrack*, u32*);
-    /* 80294BE4 */ s32 cmdPrg(JASTrack*, u32*);
-    /* 80294BF8 */ s32 cmdParamI(JASTrack*, u32*);
-    /* 80294C54 */ s32 cmdParamII(JASTrack*, u32*);
-    /* 80294CB0 */ s32 cmdParamE(JASTrack*, u32*);
-    /* 80294D2C */ s32 cmdParamEI(JASTrack*, u32*);
-    /* 80294DA8 */ s32 cmdReg(JASTrack*, u32*);
-    /* 80294F10 */ s32 cmdRegLoad(JASTrack*, u32*);
-    /* 80294F40 */ s32 cmdRegUni(JASTrack*, u32*);
-    /* 80294FB4 */ s32 cmdRegTblLoad(JASTrack*, u32*);
-    /* 80295088 */ s32 cmdDump(JASTrack*, u32*);
-    /* 8029526C */ s32 cmdPrintf(JASTrack*, u32*);
-    /* 802955C8 */ s32 parseNoteOff(JASTrack*, u8);
-    /* 80295600 */ s32 parseNoteOn(JASTrack*, u8);
-    /* 802956B0 */ s32 parseCommand(JASTrack*, u8, u16);
-    /* 80295864 */ s32 parseRegCommand(JASTrack*, int);
+    bool conditionCheck(JASTrack*, JASSeqParser::BranchCondition);
+    void writeReg(JASTrack*, u32, u32);
+    u32 readReg(JASTrack*, u32) const;
+    s32 cmdOpenTrack(JASTrack*, u32*);
+    s32 cmdCloseTrack(JASTrack*, u32*);
+    s32 cmdCall(JASTrack*, u32*);
+    s32 cmdCallF(JASTrack*, u32*);
+    s32 cmdRet(JASTrack*, u32*);
+    s32 cmdRetF(JASTrack*, u32*);
+    s32 cmdJmp(JASTrack*, u32*);
+    s32 cmdJmpF(JASTrack*, u32*);
+    s32 cmdJmpTable(JASTrack*, u32*);
+    s32 cmdCallTable(JASTrack*, u32*);
+    s32 cmdLoopS(JASTrack*, u32*);
+    s32 cmdLoopE(JASTrack*, u32*);
+    s32 cmdNote(JASTrack*, u32*);
+    s32 cmdNoteOn(JASTrack*, u32*);
+    s32 cmdNoteOff(JASTrack*, u32*);
+    s32 cmdReadPort(JASTrack*, u32*);
+    s32 cmdWritePort(JASTrack*, u32*);
+    s32 cmdParentWritePort(JASTrack*, u32*);
+    s32 cmdChildWritePort(JASTrack*, u32*);
+    s32 cmdParentReadPort(JASTrack*, u32*);
+    s32 cmdChildReadPort(JASTrack*, u32*);
+    s32 cmdCheckPortImport(JASTrack*, u32*);
+    s32 cmdCheckPortExport(JASTrack*, u32*);
+    s32 cmdWait(JASTrack*, u32*);
+    s32 cmdWaitByte(JASTrack*, u32*);
+    s32 cmdSetLastNote(JASTrack*, u32*);
+    s32 cmdEnvScaleSet(JASTrack*, u32*);
+    s32 cmdEnvSet(JASTrack*, u32*);
+    s32 cmdSimpleADSR(JASTrack*, u32*);
+    s32 cmdBusConnect(JASTrack*, u32*);
+    s32 cmdSetIntTable(JASTrack*, u32*);
+    s32 cmdSetInterrupt(JASTrack*, u32*);
+    s32 cmdDisInterrupt(JASTrack*, u32*);
+    s32 cmdClrI(JASTrack*, u32*);
+    s32 cmdRetI(JASTrack*, u32*);
+    s32 cmdIntTimer(JASTrack*, u32*);
+    s32 cmdSyncCPU(JASTrack*, u32*);
+    s32 cmdTempo(JASTrack*, u32*);
+    s32 cmdFinish(JASTrack*, u32*);
+    s32 cmdNop(JASTrack*, u32*);
+    s32 cmdFIRSet(JASTrack*, u32*);
+    s32 cmdIIRSet(JASTrack*, u32*);
+    s32 cmdIIRCutOff(JASTrack*, u32*);
+    s32 cmdBankPrg(JASTrack*, u32*);
+    s32 cmdBank(JASTrack*, u32*);
+    s32 cmdPrg(JASTrack*, u32*);
+    s32 cmdParamI(JASTrack*, u32*);
+    s32 cmdParamII(JASTrack*, u32*);
+    s32 cmdParamE(JASTrack*, u32*);
+    s32 cmdParamEI(JASTrack*, u32*);
+    s32 cmdReg(JASTrack*, u32*);
+    s32 cmdRegLoad(JASTrack*, u32*);
+    s32 cmdRegUni(JASTrack*, u32*);
+    s32 cmdRegTblLoad(JASTrack*, u32*);
+    s32 cmdDump(JASTrack*, u32*);
+    s32 cmdPrintf(JASTrack*, u32*);
+    s32 parseNoteOff(JASTrack*, u8);
+    s32 parseNoteOn(JASTrack*, u8);
+    s32 parseCommand(JASTrack*, u8, u16);
+    s32 parseRegCommand(JASTrack*, int);
 
     static void registerSeqCallback(u16 (*param_0)(JASTrack*, u16)) { sCallBackFunc = param_0; }
 
diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/include/JSystem/JAudio2/JASSeqReader.h
index 7561093391..8080a4a8b6 100644
--- a/include/JSystem/JAudio2/JASSeqReader.h
+++ b/include/JSystem/JAudio2/JASSeqReader.h
@@ -9,13 +9,13 @@
  */
 class JASSeqReader {
 public:
-    /* 80296108 */ void init();
-    /* 80296148 */ void init(void*);
-    /* 8029618C */ bool call(u32);
-    /* 802961CC */ bool loopStart(u32);
-    /* 80296210 */ bool loopEnd();
-    /* 8029627C */ bool ret();
-    /* 802962B0 */ int readMidiValue();
+    void init();
+    void init(void*);
+    bool call(u32);
+    bool loopStart(u32);
+    bool loopEnd();
+    bool ret();
+    int readMidiValue();
 
     void jump(u32 param_1) {
         field_0x04 = field_0x00 + param_1;
diff --git a/include/JSystem/JAudio2/JASSimpleWaveBank.h b/include/JSystem/JAudio2/JASSimpleWaveBank.h
index c5b1a93458..7860117d87 100644
--- a/include/JSystem/JAudio2/JASSimpleWaveBank.h
+++ b/include/JSystem/JAudio2/JASSimpleWaveBank.h
@@ -7,21 +7,21 @@
 
 struct JASSimpleWaveBank : JASWaveBank, JASWaveArc {
     struct TWaveHandle : JASWaveHandle {
-        /* 80298F38 */ int getWavePtr() const;
-        /* 80298F5C */ TWaveHandle();
-        /* 80298F90 */ const JASWaveInfo* getWaveInfo() const;
+        int getWavePtr() const;
+        TWaveHandle();
+        const JASWaveInfo* getWaveInfo() const;
 
         /* 0x04 */ JASWaveInfo mWaveInfo;
         /* 0x28 */ JASHeap* mHeap;
     };
 
-    /* 80298C94 */ JASSimpleWaveBank();
-    /* 80298CF4 */ ~JASSimpleWaveBank();
-    /* 80298DE0 */ void setWaveTableSize(u32, JKRHeap*);
-    /* 80298E60 */ JASWaveHandle* getWaveHandle(u32) const;
-    /* 80298E84 */ void setWaveInfo(u32, JASWaveInfo const&);
-    /* 80298F18 */ JASWaveArc* getWaveArc(u32);
-    /* 80298F98 */ u32 getArcCount() const;
+    JASSimpleWaveBank();
+    ~JASSimpleWaveBank();
+    void setWaveTableSize(u32, JKRHeap*);
+    JASWaveHandle* getWaveHandle(u32) const;
+    void setWaveInfo(u32, JASWaveInfo const&);
+    JASWaveArc* getWaveArc(u32);
+    u32 getArcCount() const;
 
     /* 0x78 */ TWaveHandle* mWaveTable;
     /* 0x7C */ u32 mWaveTableSize;
diff --git a/include/JSystem/JAudio2/JASSoundParams.h b/include/JSystem/JAudio2/JASSoundParams.h
index d38f32baca..b12857f9f5 100644
--- a/include/JSystem/JAudio2/JASSoundParams.h
+++ b/include/JSystem/JAudio2/JASSoundParams.h
@@ -8,8 +8,8 @@
  * 
  */
 struct JASSoundParams {
-    /* 8029E3B0 */ void clamp();
-    /* 8029E47C */ void combine(JASSoundParams const&, JASSoundParams const&);
+    void clamp();
+    void combine(JASSoundParams const&, JASSoundParams const&);
 
     void initVolume() { mVolume = 1.0f; }
     void initFxMix() { mFxMix = 0.0f; }
diff --git a/include/JSystem/JAudio2/JASTaskThread.h b/include/JSystem/JAudio2/JASTaskThread.h
index 7a16331d8d..a577035cc6 100644
--- a/include/JSystem/JAudio2/JASTaskThread.h
+++ b/include/JSystem/JAudio2/JASTaskThread.h
@@ -23,15 +23,15 @@ private:
 public:
     typedef JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable> ThreadMemPool;
 
-    /* 8028F6C4 */ JASTaskThread(int priority, int msgCount, u32 stackSize);
-    /* 8028F9EC */ void* allocCallStack(JASThreadCallback callback, void* msg);
-    /* 8028F850 */ void* allocCallStack(JASThreadCallback callback, const void* msg, u32 msgSize);
-    /* 8028FC54 */ int sendCmdMsg(JASThreadCallback callback, void* msg);
-    /* 8028FB5C */ int sendCmdMsg(JASThreadCallback callback, const void* msg, u32 msgSize);
-    /* 8028FE88 */ void pause(bool);
+    JASTaskThread(int priority, int msgCount, u32 stackSize);
+    void* allocCallStack(JASThreadCallback callback, void* msg);
+    void* allocCallStack(JASThreadCallback callback, const void* msg, u32 msgSize);
+    int sendCmdMsg(JASThreadCallback callback, void* msg);
+    int sendCmdMsg(JASThreadCallback callback, const void* msg, u32 msgSize);
+    void pause(bool);
 
-    /* 8028F724 */ virtual ~JASTaskThread();
-    /* 8028FD4C */ virtual void* run();
+    virtual ~JASTaskThread();
+    virtual void* run();
 
     /* 0x7C */ OSThreadQueue threadQueue_;
     /* 0x84 */ bool field_0x84;
diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h
index 9a6c14c995..a5eac30c6d 100644
--- a/include/JSystem/JAudio2/JASTrack.h
+++ b/include/JSystem/JAudio2/JASTrack.h
@@ -29,11 +29,11 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
     };
 
     struct TChannelMgr : public JASPoolAllocObject_MultiThreaded<TChannelMgr> {
-        /* 802930DC */ TChannelMgr(JASTrack*);
-        /* 80293148 */ void init();
-        /* 802931B0 */ void releaseAll();
-        /* 80293220 */ bool noteOff(u32, u16);
-        /* 802932A0 */ void setPauseFlag(bool);
+        TChannelMgr(JASTrack*);
+        void init();
+        void releaseAll();
+        bool noteOff(u32, u16);
+        void setPauseFlag(bool);
 
         static const int CHANNEL_MAX = 8;
 
@@ -46,11 +46,11 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
 
     struct TList : JGadget::TLinkList<JASTrack, -0x240> {
         TList() : mCallbackRegistered(false) {}
-        /* 80292F90 */ void append(JASTrack*);
-        /* 8029301C */ void seqMain();
-        /* 8029345C */ ~TList() {}
+        void append(JASTrack*);
+        void seqMain();
+        ~TList() {}
 
-        /* 80292F6C */ static s32 cbSeqMain(void*);
+        static s32 cbSeqMain(void*);
 
         /* 0xC */ bool mCallbackRegistered;
     };
@@ -58,7 +58,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
     struct MoveParam_ {
         // TODO: fix this on debug
 #if VERSION != VERSION_SHIELD_DEBUG
-        /* 802932C8 */ MoveParam_() : mValue(0.0f), mTarget(0.0f), mCount(0) {}
+        MoveParam_() : mValue(0.0f), mTarget(0.0f), mCount(0) {}
 #endif
 
         /* 0x00 */ f32 mValue;
@@ -66,59 +66,59 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded<JASTrack> {
         /* 0x08 */ u32 mCount;
     };
 
-    /* 80291228 */ JASTrack();
-    /* 8029131C */ ~JASTrack();
-    /* 80291444 */ void setChannelMgrCount(u32);
-    /* 802915D4 */ void init();
-    /* 802918FC */ void initTimed();
-    /* 8029194C */ void inherit(JASTrack const&);
-    /* 802919F4 */ void assignExtBuffer(u32, JASSoundParams*);
-    /* 80291A08 */ void setSeqData(void*, u32);
-    /* 80291A28 */ void startSeq();
-    /* 80291A78 */ void stopSeq();
-    /* 80291ABC */ void start();
-    /* 80291AC8 */ void close();
-    /* 80291B8C */ bool connectChild(u32, JASTrack*);
-    /* 80291BB8 */ void closeChild(u32);
-    /* 80291C30 */ JASTrack* openChild(u32);
-    /* 80291DAC */ void connectBus(int, int);
-    /* 80291DBC */ void setLatestKey(u8);
-    /* 80291DF8 */ JASChannel* channelStart(JASTrack::TChannelMgr*, u32, u32, u32);
-    /* 80291F38 */ int noteOn(u32, u32, u32);
-    /* 80292008 */ int gateOn(u32, u32, f32, u32);
-    /* 80292198 */ int noteOff(u32, u16);
-    /* 80292220 */ bool checkNoteStop(u32) const;
-    /* 8029226C */ void overwriteOsc(JASChannel*);
-    /* 802922D8 */ void updateTimedParam();
-    /* 80292348 */ void updateTrack(f32);
-    /* 802924E4 */ void updateTempo();
-    /* 80292580 */ void updateSeq(bool, f32);
-    /* 80292644 */ u32 seqTimeToDspTime(f32);
-    /* 802926E0 */ void setParam(u32, f32, u32);
-    /* 80292708 */ void noteOffAll(u16);
-    /* 802927A0 */ void mute(bool);
-    /* 802927D8 */ void setOscScale(u32, f32);
-    /* 802927E8 */ void setOscTable(u32, JASOscillator::Point const*);
-    /* 80292808 */ void setOscAdsr(s16, s16, s16, s16, u16);
-    /* 8029285C */ void setFIR(s16 const*);
-    /* 8029289C */ void setIIR(s16 const*);
-    /* 802928D0 */ u16 readPortSelf(u32);
-    /* 802928F4 */ void writePortSelf(u32, u16);
-    /* 80292918 */ void writePort(u32, u16);
-    /* 8029297C */ u16 readPort(u32);
-    /* 802929A0 */ void setChannelPauseFlag(bool);
-    /* 80292A3C */ void pause(bool);
-    /* 80292AA4 */ int getTransposeTotal() const;
-    /* 80292AF4 */ bool isMute() const;
-    /* 80292B58 */ void setTempo(u16);
-    /* 80292B8C */ void setTempoRate(f32);
-    /* 80292BC0 */ void setTimebase(u16);
-    /* 80292BF4 */ void updateChannel(JASChannel*, JASDsp::TChannel*);
-    /* 80292D88 */ JASTrack* getRootTrack();
-    /* 80292DA0 */ int tickProc();
-    /* 80292E9C */ int seqMain();
+    JASTrack();
+    ~JASTrack();
+    void setChannelMgrCount(u32);
+    void init();
+    void initTimed();
+    void inherit(JASTrack const&);
+    void assignExtBuffer(u32, JASSoundParams*);
+    void setSeqData(void*, u32);
+    void startSeq();
+    void stopSeq();
+    void start();
+    void close();
+    bool connectChild(u32, JASTrack*);
+    void closeChild(u32);
+    JASTrack* openChild(u32);
+    void connectBus(int, int);
+    void setLatestKey(u8);
+    JASChannel* channelStart(JASTrack::TChannelMgr*, u32, u32, u32);
+    int noteOn(u32, u32, u32);
+    int gateOn(u32, u32, f32, u32);
+    int noteOff(u32, u16);
+    bool checkNoteStop(u32) const;
+    void overwriteOsc(JASChannel*);
+    void updateTimedParam();
+    void updateTrack(f32);
+    void updateTempo();
+    void updateSeq(bool, f32);
+    u32 seqTimeToDspTime(f32);
+    void setParam(u32, f32, u32);
+    void noteOffAll(u16);
+    void mute(bool);
+    void setOscScale(u32, f32);
+    void setOscTable(u32, JASOscillator::Point const*);
+    void setOscAdsr(s16, s16, s16, s16, u16);
+    void setFIR(s16 const*);
+    void setIIR(s16 const*);
+    u16 readPortSelf(u32);
+    void writePortSelf(u32, u16);
+    void writePort(u32, u16);
+    u16 readPort(u32);
+    void setChannelPauseFlag(bool);
+    void pause(bool);
+    int getTransposeTotal() const;
+    bool isMute() const;
+    void setTempo(u16);
+    void setTempoRate(f32);
+    void setTimebase(u16);
+    void updateChannel(JASChannel*, JASDsp::TChannel*);
+    JASTrack* getRootTrack();
+    int tickProc();
+    int seqMain();
 
-    /* 80292CA4 */ static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
+    static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*);
 
     static JASOscillator::Point const sAdsTable[4];
     static JASOscillator::Data const sEnvOsc;
diff --git a/include/JSystem/JAudio2/JASTrackPort.h b/include/JSystem/JAudio2/JASTrackPort.h
index 43a773da99..08ebd4360a 100644
--- a/include/JSystem/JAudio2/JASTrackPort.h
+++ b/include/JSystem/JAudio2/JASTrackPort.h
@@ -9,13 +9,13 @@
  */
 class JASTrackPort {
 public:
-    /* 8029354C */ void init();
-    /* 8029357C */ u16 readImport(u32);
-    /* 802935A0 */ u16 readExport(u32);
-    /* 802935C4 */ void writeImport(u32, u16);
-    /* 802935E8 */ void writeExport(u32, u16);
-    /* 8029360C */ u32 checkImport(u32) const;
-    /* 80293628 */ u32 checkExport(u32) const;
+    void init();
+    u16 readImport(u32);
+    u16 readExport(u32);
+    void writeImport(u32, u16);
+    void writeExport(u32, u16);
+    u32 checkImport(u32) const;
+    u32 checkExport(u32) const;
 
     u16 get(u32 param_0) const { return field_0x4[param_0]; }
     void set(u32 param_0, u16 param_1) { field_0x4[param_0] = param_1; }
diff --git a/include/JSystem/JAudio2/JASVoiceBank.h b/include/JSystem/JAudio2/JASVoiceBank.h
index c951d48f29..f54273e962 100644
--- a/include/JSystem/JAudio2/JASVoiceBank.h
+++ b/include/JSystem/JAudio2/JASVoiceBank.h
@@ -10,9 +10,9 @@
  */
 class JASVoiceBank : public JASBank {
 public:
-    /* 80297F74 */ virtual bool getInstParam(int, int, int, JASInstParam*) const;
-    /* 80297FAC */ virtual ~JASVoiceBank();
-    /* 80298008 */ virtual u32 getType() const;
+    virtual bool getInstParam(int, int, int, JASInstParam*) const;
+    virtual ~JASVoiceBank();
+    virtual u32 getType() const;
 
     static const JASOscillator::Data sOscData;
     static JASOscillator::Data* sOscTable;
diff --git a/include/JSystem/JAudio2/JASWSParser.h b/include/JSystem/JAudio2/JASWSParser.h
index 81e66e47fd..0191ffa625 100644
--- a/include/JSystem/JAudio2/JASWSParser.h
+++ b/include/JSystem/JAudio2/JASWSParser.h
@@ -79,10 +79,10 @@ public:
         /* 0x14 */ TOffset<TCtrlGroup> mCtrlGroupOffset;
     };
 
-    /* 80298FB0 */ static u32 getGroupCount(void const*);
-    /* 80298FD8 */ static JASWaveBank* createWaveBank(void const*, JKRHeap*);
-    /* 80299034 */ static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap*);
-    /* 80299264 */ static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap*);
+    static u32 getGroupCount(void const*);
+    static JASWaveBank* createWaveBank(void const*, JKRHeap*);
+    static JASBasicWaveBank* createBasicWaveBank(void const*, JKRHeap*);
+    static JASSimpleWaveBank* createSimpleWaveBank(void const*, JKRHeap*);
 
     static u32 sUsedHeapSize;
 };
diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/include/JSystem/JAudio2/JASWaveArcLoader.h
index bf8e967b42..42b94790b3 100644
--- a/include/JSystem/JAudio2/JASWaveArcLoader.h
+++ b/include/JSystem/JAudio2/JASWaveArcLoader.h
@@ -2,7 +2,6 @@
 #define JASWAVEARCLOADER_H
 
 #include "JSystem/JAudio2/JASHeapCtrl.h"
-#include "dol2asm.h"
 #include <dolphin/os.h>
 
 class JKRHeap;
@@ -14,8 +13,8 @@ class JKRSolidHeap;
  */
 struct JASDisposer {
     JASDisposer() {}
-    /* 8029A7B8 */ virtual ~JASDisposer() {}
-    /* 80290BCC */ virtual void onDispose() {}
+    virtual ~JASDisposer() {}
+    virtual void onDispose() {}
 };
 
 #define DIR_MAX 64
@@ -25,9 +24,9 @@ struct JASDisposer {
  * 
  */
 struct JASWaveArcLoader {
-    /* 8029A0A0 */ static JASHeap* getRootHeap();
-    /* 8029A0D0 */ static void setCurrentDir(char const*);
-    /* 8029A130 */ static char* getCurrentDir();
+    static JASHeap* getRootHeap();
+    static void setCurrentDir(char const*);
+    static char* getCurrentDir();
 
     static char sCurrentDir[DIR_MAX];
     static JASHeap* sAramHeap;
@@ -38,21 +37,21 @@ struct JASWaveArcLoader {
  * 
  */
 struct JASWaveArc : JASDisposer {
-    /* 8029A13C */ JASWaveArc();
-    /* 8029A258 */ bool loadSetup(u32);
-    /* 8029A2EC */ bool eraseSetup();
-    /* 8029A378 */ static void loadToAramCallback(void*);
-    /* 8029A404 */ bool sendLoadCmd();
-    /* 8029A4C0 */ bool load(JASHeap*);
-    /* 8029A580 */ bool loadTail(JASHeap*);
-    /* 8029A640 */ bool erase();
-    /* 8029A6AC */ void setEntryNum(s32);
-    /* 8029A70C */ void setFileName(char const*);
+    JASWaveArc();
+    bool loadSetup(u32);
+    bool eraseSetup();
+    static void loadToAramCallback(void*);
+    bool sendLoadCmd();
+    bool load(JASHeap*);
+    bool loadTail(JASHeap*);
+    bool erase();
+    void setEntryNum(s32);
+    void setFileName(char const*);
 
-    /* 8029A1B4 */ virtual ~JASWaveArc();
-    /* 8029A664 */ virtual void onDispose();
-    /* 80298FA0 */ virtual void onLoadDone() {}
-    /* 80298FA4 */ virtual void onEraseDone() {}
+    virtual ~JASWaveArc();
+    virtual void onDispose();
+    virtual void onLoadDone() {}
+    virtual void onEraseDone() {}
 
     s32 getStatus() const { return mStatus; }
 
diff --git a/include/JSystem/JAudio2/JASWaveInfo.h b/include/JSystem/JAudio2/JASWaveInfo.h
index 7db3836400..695962ad70 100644
--- a/include/JSystem/JAudio2/JASWaveInfo.h
+++ b/include/JSystem/JAudio2/JASWaveInfo.h
@@ -48,7 +48,7 @@ public:
  */
 class JASWaveBank {
 public:
-    /* 80298B88 */ virtual ~JASWaveBank() {}
+    virtual ~JASWaveBank() {}
     virtual JASWaveHandle* getWaveHandle(u32) const = 0;
     virtual JASWaveArc* getWaveArc(u32) = 0;
     virtual u32 getArcCount() const = 0;
diff --git a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h
index 7be5775766..79d5e6672a 100644
--- a/include/JSystem/JAudio2/JAUAudioArcInterpreter.h
+++ b/include/JSystem/JAudio2/JAUAudioArcInterpreter.h
@@ -9,8 +9,8 @@
  */
 class JAUAudioArcInterpreter {
 public:
-    /* 802A4244 */ JAUAudioArcInterpreter();
-    /* 802A4260 */ virtual ~JAUAudioArcInterpreter();
+    JAUAudioArcInterpreter();
+    virtual ~JAUAudioArcInterpreter();
     virtual void readWS(u32, void const*, u32) = 0;
     virtual void readBNK(u32, void const*) = 0;
     virtual void readBSC(void const*, u32) = 0;
@@ -24,9 +24,9 @@ public:
     virtual void readMaxSeCategory(int, int, int) = 0;
     virtual void beginBNKList(u32, u32) = 0;
     virtual void endBNKList() = 0;
-    /* 802A42A8 */ bool parse(void const*);
-    /* 802A4314 */ virtual bool readCommandMore(u32);
-    /* 802A431C */ bool readCommand_();
+    bool parse(void const*);
+    virtual bool readCommandMore(u32);
+    bool readCommand_();
 
     u8 readU8_() {
         return *mReadPtr++;
diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader.h b/include/JSystem/JAudio2/JAUAudioArcLoader.h
index fd5cc908ca..6e5440626b 100644
--- a/include/JSystem/JAudio2/JAUAudioArcLoader.h
+++ b/include/JSystem/JAudio2/JAUAudioArcLoader.h
@@ -11,22 +11,22 @@ struct JAUSection;
  */
 class JAUAudioArcLoader : public JAUAudioArcInterpreter {
 public:
-    /* 802A4740 */ JAUAudioArcLoader(JAUSection*);
-    /* 802A478C */ bool load(void const*);
-    /* 802A47AC */ virtual void readWS(u32, void const*, u32);
-    /* 802A4804 */ virtual void readBNK(u32, void const*);
-    /* 802A4834 */ virtual void readBSC(void const*, u32);
-    /* 802A4858 */ virtual void readBST(void const*, u32);
-    /* 802A4880 */ virtual void readBSTN(void const*, u32);
-    /* 802A48A8 */ virtual void readBMS(u32, void const*, u32);
-    /* 802A48D4 */ virtual void readBMS_fromArchive(u32);
-    /* 802A4900 */ virtual void newVoiceBank(u32, u32);
-    /* 802A4930 */ virtual void newDynamicSeqBlock(u32);
-    /* 802A4968 */ virtual void readBSFT(void const*);
-    /* 802A4990 */ virtual void beginBNKList(u32, u32);
-    /* 802A49B4 */ virtual void endBNKList();
-    /* 802A49D8 */ virtual void readMaxSeCategory(int, int, int);
-    /* 802A49FC */ virtual ~JAUAudioArcLoader() {}
+    JAUAudioArcLoader(JAUSection*);
+    bool load(void const*);
+    virtual void readWS(u32, void const*, u32);
+    virtual void readBNK(u32, void const*);
+    virtual void readBSC(void const*, u32);
+    virtual void readBST(void const*, u32);
+    virtual void readBSTN(void const*, u32);
+    virtual void readBMS(u32, void const*, u32);
+    virtual void readBMS_fromArchive(u32);
+    virtual void newVoiceBank(u32, u32);
+    virtual void newDynamicSeqBlock(u32);
+    virtual void readBSFT(void const*);
+    virtual void beginBNKList(u32, u32);
+    virtual void endBNKList();
+    virtual void readMaxSeCategory(int, int, int);
+    virtual ~JAUAudioArcLoader() {}
 
     /* 0x0C */ JAUSection* mSection;
 };
diff --git a/include/JSystem/JAudio2/JAUBankTable.h b/include/JSystem/JAudio2/JAUBankTable.h
index a72802474f..602f2e958a 100644
--- a/include/JSystem/JAudio2/JAUBankTable.h
+++ b/include/JSystem/JAudio2/JAUBankTable.h
@@ -16,7 +16,7 @@ public:
     JAUBankTable(u32 param_0, JASBank** param_1, u32 param_2) : mBankPtrTable(param_1, param_2) {
         field_0xc = param_0;
     }
-    /* 802A4AA0 */ const JASBank* getBank(u32 bank) const { return mBankPtrTable.get(bank); }
+    const JASBank* getBank(u32 bank) const { return mBankPtrTable.get(bank); }
     JASBank* getBank(u32 bank) { return mBankPtrTable.get(bank); }
 
     void registBank(u32 param_0, JASBank* param_1) { mBankPtrTable.set(param_0, param_1); }
@@ -39,7 +39,7 @@ public:
  * 
  */
 struct JAUBankTableDictionary : JSUList<JAUBankTable> {
-    /* 802A4A80 */ void appendBankTable(JSULink<JAUBankTable>*);
+    void appendBankTable(JSULink<JAUBankTable>*);
 };
 
 class JASWaveBank;
diff --git a/include/JSystem/JAudio2/JAUInitializer.h b/include/JSystem/JAudio2/JAUInitializer.h
index c0fd32380a..4712ea5d6a 100644
--- a/include/JSystem/JAudio2/JAUInitializer.h
+++ b/include/JSystem/JAudio2/JAUInitializer.h
@@ -11,8 +11,8 @@ class JKRSolidHeap;
  */
 class JAU_JASInitializer {
 public:
-    /* 802A4AD0 */ JAU_JASInitializer();
-    /* 802A4B28 */ void initJASystem(JKRSolidHeap* heap);
+    JAU_JASInitializer();
+    void initJASystem(JKRSolidHeap* heap);
 
     /* 0x00 */ u32 audioMemory_;
     /* 0x04 */ u32 audioMemSize_;
@@ -35,8 +35,8 @@ public:
  */
 class JAU_JAIInitializer {
 public:
-    /* 802A4D3C */ JAU_JAIInitializer();
-    /* 802A4D60 */ void initJAInterface();
+    JAU_JAIInitializer();
+    void initJAInterface();
 
     int field_0x0;
     int field_0x4;
diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h
index 14607e772f..97280f1bf5 100644
--- a/include/JSystem/JAudio2/JAUSectionHeap.h
+++ b/include/JSystem/JAudio2/JAUSectionHeap.h
@@ -26,9 +26,9 @@ class JKRSolidHeap;
 class JAUSection : public JKRDisposer, protected JSULink<JAUSection> {
 public:
     struct TSectionData {
-        /* 802A4EE8 */ TSectionData();
-        /* 802A4F68 */ void resetRegisteredBankTables();
-        /* 802A4FE4 */ void resetRegisteredWaveBankTables();
+        TSectionData();
+        void resetRegisteredBankTables();
+        void resetRegisteredWaveBankTables();
 
         /* 0x00 */ JAUDynamicSeqDataBlocks field_0x00;
         /* 0x28 */ JSUList<JAUSeqDataBlock> field_0x28;
@@ -44,24 +44,24 @@ public:
         /* 0xA0 */ int field_0xa0;
     };
 
-    /* 802A5060 */ JAUSection(JAUSectionHeap*, u32, s32);
-    /* 802A50F8 */ void finishBuild();
-    /* 802A5160 */ virtual void dispose();
-    /* 802A51E4 */ JAUSoundTable* newSoundTable(void const*, u32, bool);
-    /* 802A52A0 */ JAUSoundNameTable* newSoundNameTable(void const*, u32, bool);
-    /* 802A535C */ JAIStreamDataMgr* newStreamFileTable(void const*, bool);
-    /* 802A5500 */ JAISeqDataMgr* newSeSeqCollection(void const*, u32);
-    /* 802A5598 */ u8* newStaticSeqDataBlock_(JAISoundID, u32);
-    /* 802A56C8 */ bool newStaticSeqData(JAISoundID, void const*, u32);
-    /* 802A5730 */ bool newStaticSeqData(JAISoundID);
-    /* 802A57F0 */ void* newCopy(void const*, u32, s32);
-    /* 802A5854 */ JASWaveBank* newWaveBank(u32, void const*);
-    /* 802A5948 */ bool loadWaveArc(u32, u32);
-    /* 802A5A50 */ JASBank* newBank(void const*, u32);
-    /* 802A5B84 */ JASVoiceBank* newVoiceBank(u32, u32);
-    /* 802A5CAC */ bool beginNewBankTable(u32, u32);
-    /* 802A5D9C */ JAUBankTable* endNewBankTable();
-    /* 802A6468 */ virtual ~JAUSection() {}
+    JAUSection(JAUSectionHeap*, u32, s32);
+    void finishBuild();
+    virtual void dispose();
+    JAUSoundTable* newSoundTable(void const*, u32, bool);
+    JAUSoundNameTable* newSoundNameTable(void const*, u32, bool);
+    JAIStreamDataMgr* newStreamFileTable(void const*, bool);
+    JAISeqDataMgr* newSeSeqCollection(void const*, u32);
+    u8* newStaticSeqDataBlock_(JAISoundID, u32);
+    bool newStaticSeqData(JAISoundID, void const*, u32);
+    bool newStaticSeqData(JAISoundID);
+    void* newCopy(void const*, u32, s32);
+    JASWaveBank* newWaveBank(u32, void const*);
+    bool loadWaveArc(u32, u32);
+    JASBank* newBank(void const*, u32);
+    JASVoiceBank* newVoiceBank(u32, u32);
+    bool beginNewBankTable(u32, u32);
+    JAUBankTable* endNewBankTable();
+    virtual ~JAUSection() {}
 
     bool isBuilding() const { return field_0x2c; }
     bool isOpen() const;
@@ -84,7 +84,7 @@ public:
 class JAUSectionHeap : public JAUSection, public JASGlobalInstance<JAUSectionHeap>, public JAISeqDataMgr {
 public:
     struct TSectionHeapData {
-        /* 802A5DF4 */ TSectionHeapData();
+        TSectionHeapData();
 
         /* 0x000 */ JAUWaveBankTable waveBankTable;
         /* 0x404 */ JAISeqDataUser* seqDataUser;
@@ -95,15 +95,15 @@ public:
         /* 0x43C */ JAUSoundNameTable* soundNameTable;
     };
 
-    /* 802A5E60 */ void setSeqDataArchive(JKRArchive*);
-    /* 802A5EC0 */ bool loadDynamicSeq(JAISoundID, bool);
-    /* 802A5EF8 */ u32 releaseIdleDynamicSeqDataBlock();
-    /* 802A5FE0 */ JAUSectionHeap(JKRSolidHeap*, bool, s32);
-    /* 802A6094 */ JAUSection* getOpenSection();
-    /* 802A60A0 */ bool setSeqDataUser(JAISeqDataUser*);
-    /* 802A60AC */ bool newDynamicSeqBlock(u32);
-    /* 802A61D0 */ SeqDataReturnValue getSeqData(JAISoundID, JAISeqData*);
-    /* 802A6270 */ int releaseSeqData();
+    void setSeqDataArchive(JKRArchive*);
+    bool loadDynamicSeq(JAISoundID, bool);
+    u32 releaseIdleDynamicSeqDataBlock();
+    JAUSectionHeap(JKRSolidHeap*, bool, s32);
+    JAUSection* getOpenSection();
+    bool setSeqDataUser(JAISeqDataUser*);
+    bool newDynamicSeqBlock(u32);
+    SeqDataReturnValue getSeqData(JAISoundID, JAISeqData*);
+    int releaseSeqData();
 
     JAISeqDataMgr* getSeqSeqDataMgr() { return this; }
     JAISeqDataMgr* getSeSeqDataMgr() { return sectionHeapData_.seSeqDataMgr_; }
diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/include/JSystem/JAudio2/JAUSeqCollection.h
index 4831e1a020..7cfa1d97ad 100644
--- a/include/JSystem/JAudio2/JAUSeqCollection.h
+++ b/include/JSystem/JAudio2/JAUSeqCollection.h
@@ -24,10 +24,10 @@ struct JAUSeqCollectionData {
  */
 class JAUSeqCollection {
 public:
-    /* 802A66A0 */ JAUSeqCollection();
-    /* 802A66AC */ void init(void const*);
-    /* 802A66FC */ bool getSeqData(int, int, JAISeqData*);
-    /* 802A6754 */ bool getSeqDataRegion(JAISeqDataRegion*);
+    JAUSeqCollection();
+    void init(void const*);
+    bool getSeqData(int, int, JAISeqData*);
+    bool getSeqDataRegion(JAISeqDataRegion*);
 
     bool isValid() { return field_0x8; }
 
@@ -43,11 +43,11 @@ public:
  */
 class JAUSeqDataMgr_SeqCollection : public JAISeqDataMgr, public JAUSeqCollection {
 public:
-    /* 802A677C */ JAUSeqDataMgr_SeqCollection();
-    /* 802A67D0 */ bool setSeqDataUser(JAISeqDataUser*);
-    /* 802A67DC */ int releaseSeqData();
-    /* 802A683C */ SeqDataReturnValue getSeqData(JAISoundID, JAISeqData*);
-    /* 802A6894 */ ~JAUSeqDataMgr_SeqCollection();
+    JAUSeqDataMgr_SeqCollection();
+    bool setSeqDataUser(JAISeqDataUser*);
+    int releaseSeqData();
+    SeqDataReturnValue getSeqData(JAISoundID, JAISeqData*);
+    ~JAUSeqDataMgr_SeqCollection();
 
     const void* getResource() const { return field_0x4; }
 
diff --git a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h
index 9fa0f27917..41a4115040 100644
--- a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h
+++ b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h
@@ -13,7 +13,7 @@ class JKRArchive;
  * 
  */
 struct JAUSeqDataBlock {
-    /* 802A68F4 */ JAUSeqDataBlock();
+    JAUSeqDataBlock();
 
     /* 0x00 */ JSULink<JAUSeqDataBlock> field_0x0;
     /* 0x10 */ JAISoundID field_0x10;
@@ -27,11 +27,11 @@ struct JAUSeqDataBlock {
  */
 class JAUSeqDataBlocks : public JSUList<JAUSeqDataBlock> {
 public:
-    /* 802A6928 */ u8* getSeqData(JAISoundID);
-    /* 802A6974 */ JSULink<JAUSeqDataBlock>* seekFreeBlock(u32);
-    /* 802A69D8 */ bool append(JSULink<JAUSeqDataBlock>*);
-    /* 802A69F8 */ bool remove(JSULink<JAUSeqDataBlock>*);
-    /* 802A6A18 */ bool hasFailedBlock(JAISoundID);
+    u8* getSeqData(JAISoundID);
+    JSULink<JAUSeqDataBlock>* seekFreeBlock(u32);
+    bool append(JSULink<JAUSeqDataBlock>*);
+    bool remove(JSULink<JAUSeqDataBlock>*);
+    bool hasFailedBlock(JAISoundID);
 };
 
 /**
@@ -40,14 +40,14 @@ public:
  */
 class JAUDynamicSeqDataBlocks {
 public:
-    /* 802A6A58 */ JAUDynamicSeqDataBlocks();
-    /* 802A6AA0 */ void setSeqDataArchive(JKRArchive*);
-    /* 802A6AA8 */ s32 getSeqData(JAISoundID, JAISeqDataUser*, JAISeqData*, bool);
-    /* 802A6B8C */ bool appendDynamicSeqDataBlock(JAUSeqDataBlock*);
-    /* 802A6C18 */ bool loadDynamicSeq(JAISoundID, bool, JAISeqDataUser*);
-    /* 802A6D48 */ u32 releaseIdleDynamicSeqDataBlock(JAISeqDataUser*);
-    /* 802A6E00 */ JAUSeqDataBlock* releaseIdleDynamicSeqDataBlock_(JAISeqDataUser*, u32);
-    /* 802A6EDC */ void rearrangeLoadingSeqs_();
+    JAUDynamicSeqDataBlocks();
+    void setSeqDataArchive(JKRArchive*);
+    s32 getSeqData(JAISoundID, JAISeqDataUser*, JAISeqData*, bool);
+    bool appendDynamicSeqDataBlock(JAUSeqDataBlock*);
+    bool loadDynamicSeq(JAISoundID, bool, JAISeqDataUser*);
+    u32 releaseIdleDynamicSeqDataBlock(JAISeqDataUser*);
+    JAUSeqDataBlock* releaseIdleDynamicSeqDataBlock_(JAISeqDataUser*, u32);
+    void rearrangeLoadingSeqs_();
 
     JAUSeqDataBlocks const& getFreeBlocks() const { return mFreeBlocks; }
     JAUSeqDataBlocks const& getLoadedBlocks() const { return mLoadedBlocks; }
diff --git a/include/JSystem/JAudio2/JAUSoundAnimator.h b/include/JSystem/JAudio2/JAUSoundAnimator.h
index b3c4d24515..b9e1d433c9 100644
--- a/include/JSystem/JAudio2/JAUSoundAnimator.h
+++ b/include/JSystem/JAudio2/JAUSoundAnimator.h
@@ -93,8 +93,8 @@ public:
  */
 class JAUSoundAnimation {
 public:
-    /* 802A6F70 */ int getStartSoundIndex(f32) const;
-    /* 802A7044 */ int getEndSoundIndex(f32) const;
+    int getStartSoundIndex(f32) const;
+    int getEndSoundIndex(f32) const;
 
     u16 getNumSounds() const {
         if (mControl != NULL) {
diff --git a/include/JSystem/JAudio2/JAUSoundTable.h b/include/JSystem/JAudio2/JAUSoundTable.h
index 5fb3e275fa..e2dceca7b1 100644
--- a/include/JSystem/JAudio2/JAUSoundTable.h
+++ b/include/JSystem/JAudio2/JAUSoundTable.h
@@ -145,9 +145,9 @@ struct JAUSoundTable : public JASGlobalInstance<JAUSoundTable> {
     }
     ~JAUSoundTable() {}
     
-    /* 802A7114 */ void init(void const*);
-    /* 802A7160 */ u8 getTypeID(JAISoundID) const;
-    /* 802A728C */ JAUSoundTableItem* getData(JAISoundID) const;
+    void init(void const*);
+    u8 getTypeID(JAISoundID) const;
+    JAUSoundTableItem* getData(JAISoundID) const;
 
     JAUSoundTableItem* getItem(JAUSoundTableGroup* group, int index) const {
         u32 offset = group->getItemOffset(index);
@@ -192,7 +192,7 @@ struct JAUSoundNameTable : public JASGlobalInstance<JAUSoundNameTable> {
     JAUSoundNameTable(bool param_0) : JASGlobalInstance<JAUSoundNameTable>(param_0) {
     }
     ~JAUSoundNameTable() {}
-    /* 802A73D4 */ void init(void const*);
+    void init(void const*);
 
     JAUSoundTable_<JAUSoundNameTableRoot,JAUSoundNameTableSection,JAUSoundNameTableGroup,void> field_0x0;
 };
diff --git a/include/JSystem/JAudio2/JAUStreamFileTable.h b/include/JSystem/JAudio2/JAUStreamFileTable.h
index 48c5ebf185..00f660509f 100644
--- a/include/JSystem/JAudio2/JAUStreamFileTable.h
+++ b/include/JSystem/JAudio2/JAUStreamFileTable.h
@@ -14,10 +14,10 @@ struct BinaryStreamFileTable {
  * 
  */
 struct JAUStreamFileTable {
-    /* 802A7420 */ JAUStreamFileTable();
-    /* 802A742C */ void init(void const*);
-    /* 802A7478 */ int getNumFiles() const;
-    /* 802A7484 */ const char* getFilePath(int) const;
+    JAUStreamFileTable();
+    void init(void const*);
+    int getNumFiles() const;
+    const char* getFilePath(int) const;
 
     bool isValid() { return mData; }
 
@@ -29,8 +29,8 @@ struct JAUStreamFileTable {
  * 
  */
 struct JAUStreamDataMgr_StreamFileTable : public JAIStreamDataMgr, JAUStreamFileTable {
-    /* 802A74AC */ virtual s32 getStreamFileEntry(JAISoundID);
-    /* 802A74E8 */ virtual ~JAUStreamDataMgr_StreamFileTable() {}
+    virtual s32 getStreamFileEntry(JAISoundID);
+    virtual ~JAUStreamDataMgr_StreamFileTable() {}
 };
 
 #endif /* JAUSTREAMFILETABLE_H */
diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index 9ba569b6e5..df1917de48 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/include/JSystem/JFramework/JFWDisplay.h
@@ -46,29 +46,29 @@ public:
         /* 0x1 */ UNK_METHOD_1 = 1
     };
 
-    /* 80272040 */ void ctor_subroutine(bool);
-    /* 802720F8 */ JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool);
-    /* 802721DC */ static JFWDisplay* createManager(_GXRenderModeObj const*, JKRHeap*,
+    void ctor_subroutine(bool);
+    JFWDisplay(JKRHeap*, JUTXfb::EXfbNumber, bool);
+    static JFWDisplay* createManager(_GXRenderModeObj const*, JKRHeap*,
                                                     JUTXfb::EXfbNumber, bool);
-    /* 802722B8 */ void prepareCopyDisp();
-    /* 802723AC */ void drawendXfb_single();
-    /* 802723F4 */ void exchangeXfb_double();
-    /* 802724FC */ void exchangeXfb_triple();
-    /* 80272574 */ void copyXfb_triple();
-    /* 802725F8 */ void preGX();
-    /* 8027268C */ void endGX();
-    /* 80272C60 */ void waitBlanking(int);
-    /* 80272E10 */ void threadSleep(s64);
-    /* 80272EB8 */ void clearEfb_init();
-    /* 80272F9C */ void clearEfb(int, int, int, int, _GXColor);
-    /* 80272F2C */ void clearEfb();
-    /* 80272F58 */ void clearEfb(_GXColor);
-    /* 8027331C */ void calcCombinationRatio();
+    void prepareCopyDisp();
+    void drawendXfb_single();
+    void exchangeXfb_double();
+    void exchangeXfb_triple();
+    void copyXfb_triple();
+    void preGX();
+    void endGX();
+    void waitBlanking(int);
+    void threadSleep(s64);
+    void clearEfb_init();
+    void clearEfb(int, int, int, int, _GXColor);
+    void clearEfb();
+    void clearEfb(_GXColor);
+    void calcCombinationRatio();
 
-    /* 80272798 */ virtual void beginRender();
-    /* 80272A04 */ virtual void endRender();
-    /* 80272AB0 */ virtual void endFrame();
-    /* 80272160 */ virtual ~JFWDisplay();
+    virtual void beginRender();
+    virtual void endRender();
+    virtual void endFrame();
+    virtual ~JFWDisplay();
 
     static JFWDisplay* getManager() { return sManager; }
 
diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h
index 98238c1a99..7205453262 100644
--- a/include/JSystem/JFramework/JFWSystem.h
+++ b/include/JSystem/JFramework/JFWSystem.h
@@ -32,8 +32,8 @@ struct JFWSystem {
         static u32 exConsoleBufferSize;
     };
 
-    /* 80271CD0 */ static void firstInit();
-    /* 80271D18 */ static void init();
+    static void firstInit();
+    static void init();
 
     static JUTConsole* getSystemConsole() { return systemConsole; }
     static JKRExpHeap* getSystemHeap() { return systemHeap; }
diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h
index 740671bef2..77b0f8a540 100644
--- a/include/JSystem/JGadget/std-vector.h
+++ b/include/JSystem/JGadget/std-vector.h
@@ -8,7 +8,7 @@
 
 namespace JGadget {
 namespace vector {
-/* 802DCCC8 */ u32 extend_default(u32, u32, u32);
+u32 extend_default(u32, u32, u32);
 };
 
 typedef u32 (*extendFunc)(u32, u32, u32);
diff --git a/include/JSystem/JGadget/vector.h b/include/JSystem/JGadget/vector.h
index e38211f6b5..73a2410885 100644
--- a/include/JSystem/JGadget/vector.h
+++ b/include/JSystem/JGadget/vector.h
@@ -45,9 +45,9 @@ struct TVector {
 };
 
 struct TVector_pointer_void : TVector<void*, TAllocator> {
-    /* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator<void*> const&);
-    /* 802DCCFC */ ~TVector_pointer_void();
-    /* 802DCDC4 */ void erase(void**, void**);
+    TVector_pointer_void(JGadget::TAllocator<void*> const&);
+    ~TVector_pointer_void();
+    void erase(void**, void**);
     void insert(void**, void* const&);
 
     void clear() { erase(begin(), end()); }
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index 72123903fe..9e9662c4f3 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -34,15 +34,18 @@ struct TUtil<f32> {
     static inline f32 epsilon() { return 32.0f * FLT_EPSILON; }
     static inline f32 PI() { return 3.1415927f; }
     static inline f32 inv_sqrt(f32 x) {
+        #ifdef __MWERKS__
         if (x <= 0.0f) {
             return x;
         }
         f32 root = __frsqrte(x);
         root = 0.5f * root * (3.0f - x * (root * root));
         return root;
+        #endif
     }
 
     static inline f32 sqrt(f32 x) {
+        #ifdef __MWERKS__
         if (x <= 0.0f) {
             return x;
         }
@@ -50,6 +53,7 @@ struct TUtil<f32> {
         f32 root = __frsqrte(x);
         root = 0.5f * root * (3.0f - x * (root * root));
         return x * root;
+        #endif
     }
 };
 
@@ -122,13 +126,13 @@ struct TVec3<s16> {
 };
 
 inline void setTVec3f(const f32* vec_a, f32* vec_b) {
+#ifdef __MWERKS__
     const register f32* v_a = vec_a;
     register f32* v_b = vec_b;
 
     register f32 a_x;
     register f32 b_x;
 
-#ifdef __MWERKS__
     asm {
         psq_l a_x, 0(v_a), 0, 0
         lfs b_x, 8(v_a)
@@ -144,18 +148,21 @@ inline void setTVec3f(const Vec& vec_a, Vec& vec_b) {
 }
 
 inline float fsqrt_step(float mag) {
+    #ifdef __MWERKS__
     f32 root = __frsqrte(mag);
     return 0.5f * root * (3.0f - mag * (root * root));
+    #endif
 }
 
 inline void mulInternal(register const f32* a, register const f32* b, register float* dst) {
+#ifdef __MWERKS__
     register f32 a_x_y;
     register f32 b_x_y;
     register f32 x_y;
     register f32 za;
     register f32 zb;
     register f32 z;
-#ifdef __MWERKS__
+
     asm {
         psq_l  a_x_y, 0(a), 0, 0
         psq_l  b_x_y, 0(b), 0, 0
@@ -281,11 +288,12 @@ struct TVec3<f32> : public Vec {
     }
 
     void scale(register f32 sc) {
+#ifdef __MWERKS__
         register f32 z;
         register f32 x_y;
         register f32* dst = &x;
         register f32 zres;
-#ifdef __MWERKS__
+
         asm {
             psq_l    x_y, 0(dst),  0, 0
             psq_l    z,   8(dst),  1, 0
@@ -298,12 +306,13 @@ struct TVec3<f32> : public Vec {
     }
 
     void scale(register f32 sc, const TVec3<f32>& other) {
+#ifdef __MWERKS__
         register const f32* src = &other.x;
         register f32 z;
         register f32 x_y;
         register f32* dst = &x;
         register f32 zres;
-#ifdef __MWERKS__
+
         asm {
             psq_l    x_y, 0(src),  0, 0
             psq_l    z,   8(src),  1, 0
@@ -320,11 +329,12 @@ struct TVec3<f32> : public Vec {
     }
 
     void negateInternal(TVec3<f32>* dst) {
+#ifdef __MWERKS__
         register f32* rdst = &dst->x;
         const register f32* src = &x;
         register f32 x_y;
         register f32 z;
-#ifdef __MWERKS__
+
         asm {
             psq_l  x_y, 0(src), 0, 0
             ps_neg x_y, x_y
diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h
index 7042cd8d6c..fd31a8dd25 100644
--- a/include/JSystem/JMath/JMath.h
+++ b/include/JSystem/JMath/JMath.h
@@ -12,42 +12,49 @@ void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register
                     register f32 scale);
 
 inline int JMAAbs(int value) {
+#ifdef __MWERKS__
     return __abs(value);
+#endif
 }
 
 inline f32 JMAFastReciprocal(f32 value) {
+#ifdef __MWERKS__
     return __fres(value);
+#endif
 }
 
 inline float __frsqrtes(register double f) {
+#ifdef __MWERKS__
     register float out;
     // clang-format off
-#ifdef __MWERKS__
+
     asm {
         frsqrte out, f
     }
-#endif
+
     // clang-format on
     return out;
+#endif
 }
 
 inline f32 JMAFastSqrt(register f32 input) {
+#ifdef __MWERKS__
     if (input > 0.0f) {
         register f32 out;
-#ifdef __MWERKS__
         asm {
             frsqrte out, input
         }
-#endif
         return out * input;
     } else {
         return input;
     }
+#endif
 }
 
 inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f32 p3,
                                    register f32 p4, register f32 p5, register f32 p6,
                                    register f32 p7) {
+#ifdef __MWERKS__
     register f32 ff25;
     register f32 ff31;
     register f32 ff30;
@@ -56,7 +63,6 @@ inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f3
     register f32 ff27;
     register f32 ff26;
     // clang-format off
-#ifdef __MWERKS__
     asm {
         fsubs   ff31, p1, p2
         fsubs   ff30, p5, p2
@@ -73,9 +79,9 @@ inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f3
         fnmsubs ff25,ff31,ff25,ff26
 
     }
-#endif
     // clang-format on
     return ff25;
+#endif
 }
 
 namespace JMath {
@@ -94,9 +100,9 @@ inline void fastVECNormalize(const Vec* src, Vec* dst) {
 }
 
 inline void gekko_ps_copy3(register void* dst, register const void* src) {
+#ifdef __MWERKS__
     register f32 src0;
     register f32 src1;
-#ifdef __MWERKS__
     asm {
         psq_l src0, 0(src), 0, 0
         lfs src1, 8(src)
@@ -107,10 +113,10 @@ inline void gekko_ps_copy3(register void* dst, register const void* src) {
 }
 
 inline void gekko_ps_copy6(register void* dst, register const void* src) {
+#ifdef __MWERKS__
     register f32 src0;
     register f32 src1;
     register f32 src2;
-#ifdef __MWERKS__
     asm {
         psq_l src0, 0(src), 0, 0
         psq_l src1, 8(src), 0, 0
@@ -123,13 +129,13 @@ inline void gekko_ps_copy6(register void* dst, register const void* src) {
 }
 
 inline void gekko_ps_copy12(register void* dst, register const void* src) {
+#ifdef __MWERKS__
     register f32 src0;
     register f32 src1;
     register f32 src2;
     register f32 src3;
     register f32 src4;
     register f32 src5;
-#ifdef __MWERKS__
     asm {
         psq_l src0, 0(src), 0, 0
         psq_l src1, 8(src), 0, 0
@@ -148,6 +154,7 @@ inline void gekko_ps_copy12(register void* dst, register const void* src) {
 }
 
 inline void gekko_ps_copy16(register void* dst, register const void* src) {
+#ifdef __MWERKS__
     register f32 src0;
     register f32 src1;
     register f32 src2;
@@ -156,7 +163,6 @@ inline void gekko_ps_copy16(register void* dst, register const void* src) {
     register f32 src5;
     register f32 src6;
     register f32 src7;
-#ifdef __MWERKS__
     asm {
         psq_l src0, 0(src), 0, 0
         psq_l src1, 8(src), 0, 0
@@ -182,12 +188,12 @@ inline void gekko_ps_copy16(register void* dst, register const void* src) {
 
 namespace JMathInlineVEC {
     inline void C_VECAdd(register const Vec* a, register const Vec* b, register Vec* ab) {
+    #ifdef __MWERKS__
         register f32 axy;
         register f32 bxy;
         register f32 az;
         register f32 sumz;
         register f32 bz;
-    #ifdef __MWERKS__
         asm {
             psq_l axy, 0(a), 0, 0
             psq_l bxy, 0(b), 0, 0
@@ -202,12 +208,12 @@ namespace JMathInlineVEC {
     }
 
     inline void C_VECSubtract(register const Vec* a, register const Vec* b, register Vec* ab) {
+    #ifdef __MWERKS__
         register f32 axy;
         register f32 bxy;
         register f32 az;
         register f32 subz;
         register f32 bz;
-    #ifdef __MWERKS__
         asm {
             psq_l axy, 0(a), 0, 0
             psq_l bxy, 0(b), 0, 0
@@ -222,10 +228,11 @@ namespace JMathInlineVEC {
     }
 
     inline f32 C_VECSquareMag(register const Vec* v) {
+    #ifdef __MWERKS__
         register f32 x_y;
         register f32 z;
         register f32 res;
-    #ifdef __MWERKS__
+    
         asm {
             psq_l   x_y, 0(v), 0, 0
             ps_mul  x_y, x_y, x_y
@@ -233,17 +240,17 @@ namespace JMathInlineVEC {
             ps_madd res, z, z, x_y
             ps_sum0 res, res, x_y, x_y
         }
-    #endif
         return res;
+    #endif
     }
 
     inline f32 C_VECDotProduct(register const Vec *a, register const Vec *b) {
+    #ifdef __MWERKS__
         register f32 res;
         register f32 thisyz;
         register f32 otheryz;
         register f32 otherxy;
         register f32 thisxy;
-#ifdef __MWERKS__
         asm {
             psq_l thisyz, 4(a), 0, 0
             psq_l otheryz, 4(b), 0, 0
@@ -253,8 +260,8 @@ namespace JMathInlineVEC {
             ps_madd otheryz, thisxy, otherxy, thisyz
             ps_sum0 res, otheryz, thisyz, thisyz
         };
-#endif
         return res;
+    #endif
     }
 };
 
diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h
index f832b95e71..c51fc2bb88 100644
--- a/include/JSystem/JMessage/control.h
+++ b/include/JSystem/JMessage/control.h
@@ -10,15 +10,15 @@ namespace JMessage {
  * 
  */
 struct TControl {
-    /* 802A7548 */ TControl();
-    /* 802A758C */ virtual ~TControl();
+    TControl();
+    virtual ~TControl();
 
-    /* 802A75D4 */ void reset();
-    /* 802A7634 */ int update();
-    /* 802A76BC */ void render();
-    /* 802A77E8 */ int setMessageCode(u16 u16GroupID, u16 u16Index);
-    /* 802A78F4 */ int setMessageID(u32 uMsgID, u32 param_1, bool* pbValid);
-    /* 802A7A20 */ bool setMessageCode_inSequence_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index);
+    void reset();
+    int update();
+    void render();
+    int setMessageCode(u16 u16GroupID, u16 u16Index);
+    int setMessageID(u32 uMsgID, u32 param_1, bool* pbValid);
+    bool setMessageCode_inSequence_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index);
 
     bool isReady_update_() const { return pMessageText_begin_ != 0 && pSequenceProcessor_ != NULL; }
     bool isReady_render_() const { return pMessageText_current_ != 0 && pRenderingProcessor_ != NULL; }
diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h
index 80209b50dc..fca67aa3e6 100644
--- a/include/JSystem/JMessage/locale.h
+++ b/include/JSystem/JMessage/locale.h
@@ -16,10 +16,10 @@ struct locale {
         return c >= 0x81 && (c <= 0x9F || (c >= 0xE0 && c <= 0xFC));
     }
 
-    /* 802A9490 */ static int parseCharacter_1Byte(const char** ppszText);
-    /* 802A94A8 */ static int parseCharacter_2Byte(const char** ppszText);
-    /* 802A9528 */ static int parseCharacter_ShiftJIS(const char** ppszText);
-    /* 802A958C */ static int parseCharacter_UTF8(const char** ppszText);
+    static int parseCharacter_1Byte(const char** ppszText);
+    static int parseCharacter_2Byte(const char** ppszText);
+    static int parseCharacter_ShiftJIS(const char** ppszText);
+    static int parseCharacter_UTF8(const char** ppszText);
 };
 };  // namespace JMessage
 
diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h
index 1f470b78ca..feb5be25c4 100644
--- a/include/JSystem/JMessage/processor.h
+++ b/include/JSystem/JMessage/processor.h
@@ -16,8 +16,8 @@ struct TResourceContainer;
 struct TReference {
     TReference() { pcResource_ = NULL; }
 
-    /* 802A7AF8 */ virtual ~TReference();
-    /* 802A7B40 */ virtual const char* do_word(u32) const;
+    virtual ~TReference();
+    virtual const char* do_word(u32) const;
 
     int on_parseCharacter(const char** ppszText) const {
         JUT_ASSERT(97, pcResource_!=NULL);
@@ -109,37 +109,37 @@ struct TProcessor {
         /* 0x4 */ rData;
     };  // Size: 0x14
 
-    /* 802A7B90 */ void reset();
-    /* 802A7BF8 */ void stack_pushCurrent(char const* pszText);
-    /* 802A7C30 */ void stack_popCurrent();
-    /* 802A7C54 */ const TResource* getResource_groupID(u16 u16GroupID) const;
-    /* 802A7CD4 */ u32 toMessageCode_messageID(u32 uMsgID, u32, bool* pbValid) const;
-    /* 802A7E38 */ void on_select_begin(char const* (*pfn)(JMessage::TProcessor*), void const* pOffset,
+    void reset();
+    void stack_pushCurrent(char const* pszText);
+    void stack_popCurrent();
+    const TResource* getResource_groupID(u16 u16GroupID) const;
+    u32 toMessageCode_messageID(u32 uMsgID, u32, bool* pbValid) const;
+    void on_select_begin(char const* (*pfn)(JMessage::TProcessor*), void const* pOffset,
                                         char const* pcBase, u32 uNumber);
-    /* 802A7EDC */ void on_select_end();
-    /* 802A7F34 */ void on_select_separate();
-    /* 802A7FE4 */ void on_tag_();
-    /* 802A81EC */ bool process_character_();
-    /* 802A828C */ static bool process_onCharacterEnd_normal_(JMessage::TProcessor* pThis);
-    /* 802A82F4 */ static bool process_onCharacterEnd_select_(JMessage::TProcessor* pThis);
-    /* 802A833C */ static const char* process_onSelect_limited_(JMessage::TProcessor* pThis);
-    /* 802A8358 */ static const char* process_onSelect_(JMessage::TProcessor* pThis);
-    /* 802A8C24 */ const char* on_message(u32 uCode) const { return getMessageText_messageCode(uCode); }
-    /* 802A8C44 */ const char* getMessageText_messageCode(u32 uCode) const {
+    void on_select_end();
+    void on_select_separate();
+    void on_tag_();
+    bool process_character_();
+    static bool process_onCharacterEnd_normal_(JMessage::TProcessor* pThis);
+    static bool process_onCharacterEnd_select_(JMessage::TProcessor* pThis);
+    static const char* process_onSelect_limited_(JMessage::TProcessor* pThis);
+    static const char* process_onSelect_(JMessage::TProcessor* pThis);
+    const char* on_message(u32 uCode) const { return getMessageText_messageCode(uCode); }
+    const char* getMessageText_messageCode(u32 uCode) const {
         return getMessageText_messageCode(uCode >> 16, uCode & 0xFFFF);
     }
 
-    /* 802A7B48 */ virtual ~TProcessor();
-    /* 802A7FC0 */ virtual void do_reset();
-    /* 802A7FC4 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 802A7FC8 */ virtual void do_end();
-    /* 802A7FCC */ virtual void do_character(int iCharacter);
-    /* 802A7FD0 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
-    /* 802A7FD8 */ virtual void do_select_begin(u32 uNumber);
-    /* 802A7FDC */ virtual void do_select_end();
-    /* 802A7FE0 */ virtual void do_select_separate();
-    /* 802A8084 */ virtual void do_resetStatus_(char const* pszText);
-    /* 802A8088 */ virtual bool do_setBegin_isReady_() const;
+    virtual ~TProcessor();
+    virtual void do_reset();
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual void do_select_begin(u32 uNumber);
+    virtual void do_select_end();
+    virtual void do_select_separate();
+    virtual void do_resetStatus_(char const* pszText);
+    virtual bool do_setBegin_isReady_() const;
     virtual void do_begin_(void const* pEntry, char const* pszText) = 0;
     virtual void do_end_() = 0;
     virtual void do_tag_(u32 uTag, void const* pData, u32 uSize) = 0;
@@ -290,35 +290,35 @@ struct TSequenceProcessor : public TProcessor {
         STATUS_BRANCH,
     };
 
-    /* 802A8374 */ TSequenceProcessor(JMessage::TReference const* pReference, JMessage::TControl* pControl);
-    /* 802A8418 */ const char* process(char const* pszText);
-    /* 802A85A4 */ bool on_isReady();
-    /* 802A85D0 */ void on_jump_register(jumpPfn pfn, u32 u32Target);
-    /* 802A85E4 */ bool on_jump_isReady();
-    /* 802A8610 */ void on_jump(void const* pEntry, char const* pszText);
-    /* 802A8690 */ void on_branch_register(branchPfn pfn, void const* pTarget, u32 uTarget);
-    /* 802A86A0 */ void on_branch_query(u32 uCode);
-    /* 802A86D4 */ u32 on_branch_queryResult();
-    /* 802A8700 */ void on_branch(void const* pEntry, char const* pszText);
-    /* 802A892C */ static void process_setMessageIndex_reserved_(u16 u16Index);
-    /* 802A8944 */ static void* process_setMessageCode_(TSequenceProcessor const* pProcessor, u16 u16GroupID, u16 u16Index);
-    /* 802A89B8 */ static const void* process_onJump_limited_(TSequenceProcessor const* pProcessor);
-    /* 802A89EC */ static const void* process_onJump_(TSequenceProcessor const* pProcessor);
-    /* 802A8A18 */ static const void* process_onBranch_limited_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
-    /* 802A8A50 */ static const void* process_onBranch_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
+    TSequenceProcessor(JMessage::TReference const* pReference, JMessage::TControl* pControl);
+    const char* process(char const* pszText);
+    bool on_isReady();
+    void on_jump_register(jumpPfn pfn, u32 u32Target);
+    bool on_jump_isReady();
+    void on_jump(void const* pEntry, char const* pszText);
+    void on_branch_register(branchPfn pfn, void const* pTarget, u32 uTarget);
+    void on_branch_query(u32 uCode);
+    u32 on_branch_queryResult();
+    void on_branch(void const* pEntry, char const* pszText);
+    static void process_setMessageIndex_reserved_(u16 u16Index);
+    static void* process_setMessageCode_(TSequenceProcessor const* pProcessor, u16 u16GroupID, u16 u16Index);
+    static const void* process_onJump_limited_(TSequenceProcessor const* pProcessor);
+    static const void* process_onJump_(TSequenceProcessor const* pProcessor);
+    static const void* process_onBranch_limited_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
+    static const void* process_onBranch_(TSequenceProcessor const* pProcessor, u32 uTargetIndex);
 
-    /* 802A83B8 */ virtual ~TSequenceProcessor();
-    /* 802A87A4 */ virtual void do_resetStatus_(char const* pszText);
-    /* 802A87C0 */ virtual bool do_setBegin_isReady_() const;
-    /* 802A87D0 */ virtual void do_begin_(void const* pEntry, char const* pszText);
-    /* 802A87D4 */ virtual void do_end_();
-    /* 802A87E0 */ virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
-    /* 802A8780 */ virtual bool do_isReady();
-    /* 802A8788 */ virtual bool do_jump_isReady();
-    /* 802A8790 */ virtual void do_jump(void const* pEntry, char const* pszText);
-    /* 802A8794 */ virtual void do_branch_query(u32 uCode);
-    /* 802A8798 */ virtual s32 do_branch_queryResult();
-    /* 802A87A0 */ virtual void do_branch(void const* pEntry, char const* pszText);
+    virtual ~TSequenceProcessor();
+    virtual void do_resetStatus_(char const* pszText);
+    virtual bool do_setBegin_isReady_() const;
+    virtual void do_begin_(void const* pEntry, char const* pszText);
+    virtual void do_end_();
+    virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
+    virtual bool do_isReady();
+    virtual bool do_jump_isReady();
+    virtual void do_jump(void const* pEntry, char const* pszText);
+    virtual void do_branch_query(u32 uCode);
+    virtual s32 do_branch_queryResult();
+    virtual void do_branch(void const* pEntry, char const* pszText);
 
     TControl* getControl() const { return pControl_; }
 
@@ -341,13 +341,13 @@ struct TSequenceProcessor : public TProcessor {
  * 
  */
 struct TRenderingProcessor : public TProcessor {
-    /* 802A8A84 */ TRenderingProcessor(JMessage::TReference const* pReference);
-    /* 802A8B20 */ int process(char const* pszText);
+    TRenderingProcessor(JMessage::TReference const* pReference);
+    int process(char const* pszText);
 
-    /* 802A8AC0 */ virtual ~TRenderingProcessor();
-    /* 802A8BA4 */ virtual void do_begin_(void const* pEntry, char const* pszText);
-    /* 802A8BA8 */ virtual void do_end_();
-    /* 802A8BAC */ virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
+    virtual ~TRenderingProcessor();
+    virtual void do_begin_(void const* pEntry, char const* pszText);
+    virtual void do_end_();
+    virtual void do_tag_(u32 uTag, void const* pData, u32 uSize);
 
     bool process_messageEntryText(const TProcessor* pProcessor, void const* pEntry, const char* pszText) {
         if (!TProcessor::setBegin_messageEntryText(pProcessor, pEntry, pszText)) {
diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h
index a9c23e011b..7c93347978 100644
--- a/include/JSystem/JMessage/resource.h
+++ b/include/JSystem/JMessage/resource.h
@@ -20,7 +20,7 @@ struct TResource {
           oParse_TBlock_messageID_(NULL)
           {}
 
-    /* 802A8CDC */ u16 toMessageIndex_messageID(u32 uMsgID, u32, bool* pbValid) const;
+    u16 toMessageIndex_messageID(u32 uMsgID, u32, bool* pbValid) const;
 
     bool isContained_messageIndex(u16 uMessageIndex) const {
         return uMessageIndex < getMessageEntryNumber();
@@ -111,17 +111,17 @@ struct TResource_color {
  */
 struct TResourceContainer {
     struct TCResource : public JGadget::TLinkList_factory<TResource, 0> {
-        /* 802A8EC0 */ TCResource();
-        /* 802A8F6C */ TResource* Get_groupID(u16 u16GroupID);
+        TCResource();
+        TResource* Get_groupID(u16 u16GroupID);
 
-        /* 802A8EF8 */ virtual ~TCResource();
-        /* 802A8FFC */ virtual JMessage::TResource* Do_create();
-        /* 802A9048 */ virtual void Do_destroy(JMessage::TResource* pResource);
+        virtual ~TCResource();
+        virtual JMessage::TResource* Do_create();
+        virtual void Do_destroy(JMessage::TResource* pResource);
     };
 
-    /* 802A906C */ TResourceContainer();
-    /* 802A90B8 */ void setEncoding(u8 e);
-    /* 802A90F0 */ void setEncoding_(u8 e);
+    TResourceContainer();
+    void setEncoding(u8 e);
+    void setEncoding_(u8 e);
 
     int parseCharacter(const char** ppszText) const {
         JUT_ASSERT(330, pfnParseCharacter_!=NULL);
@@ -157,11 +157,11 @@ struct TResourceContainer {
  * 
  */
 struct TParse : public JGadget::binary::TParse_header_block {
-    /* 802A9130 */ TParse(JMessage::TResourceContainer* pContainer);
+    TParse(JMessage::TResourceContainer* pContainer);
 
-    /* 802A9158 */ virtual ~TParse();
-    /* 802A91B8 */ virtual bool parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32);
-    /* 802A92F4 */ virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32);
+    virtual ~TParse();
+    virtual bool parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32);
+    virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32);
 
     /* 0x4 */ TResourceContainer* pContainer_;
     /* 0x8 */ TResource* pResource_;
diff --git a/include/JSystem/JParticle/JPABaseShape.h b/include/JSystem/JParticle/JPABaseShape.h
index 6d4dabf2d8..35dcbb83ad 100644
--- a/include/JSystem/JParticle/JPABaseShape.h
+++ b/include/JSystem/JParticle/JPABaseShape.h
@@ -46,8 +46,8 @@ struct JPABaseShapeData {
  */
 struct JPABaseShape {
 public:
-    /* 8027A6DC */ JPABaseShape(u8 const*, JKRHeap*);
-    /* 8027A7E8 */ void setGX(JPAEmitterWorkData*) const;
+    JPABaseShape(u8 const*, JKRHeap*);
+    void setGX(JPAEmitterWorkData*) const;
 
     static GXBlendMode st_bm[3];
     static GXBlendFactor st_bf[10];
diff --git a/include/JSystem/JParticle/JPAChildShape.h b/include/JSystem/JParticle/JPAChildShape.h
index fec4c08a55..9cfc484460 100644
--- a/include/JSystem/JParticle/JPAChildShape.h
+++ b/include/JSystem/JParticle/JPAChildShape.h
@@ -42,7 +42,7 @@ struct JPAChildShapeData {
  */
 class JPAChildShape {
 public:
-    /* 8027B038 */ JPAChildShape(u8 const*);
+    JPAChildShape(u8 const*);
 
     f32 getPosRndm() const { return mpData->mPosRndm; }
     f32 getBaseVel() const { return mpData->mBaseVel; }
diff --git a/include/JSystem/JParticle/JPADynamicsBlock.h b/include/JSystem/JParticle/JPADynamicsBlock.h
index 38805b3b07..41bb17f858 100644
--- a/include/JSystem/JParticle/JPADynamicsBlock.h
+++ b/include/JSystem/JParticle/JPADynamicsBlock.h
@@ -59,9 +59,9 @@ enum {
  */
 class JPADynamicsBlock {
 public:
-    /* 8027BB18 */ JPADynamicsBlock(u8 const*);
-    /* 8027BB4C */ void init();
-    /* 8027BBE8 */ void create(JPAEmitterWorkData*);
+    JPADynamicsBlock(u8 const*);
+    void init();
+    void create(JPAEmitterWorkData*);
 
     void calc(JPAEmitterWorkData* work) { mpCalcVolumeFunc(work); }
 
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
index a9ecdd03b1..22b1edf378 100644
--- a/include/JSystem/JParticle/JPAEmitter.h
+++ b/include/JSystem/JParticle/JPAEmitter.h
@@ -75,12 +75,12 @@ struct JPAEmitterWorkData {
 class JPAEmitterCallBack {
 public:
     virtual ~JPAEmitterCallBack() = 0;
-    /* 80050368 */ virtual void execute(JPABaseEmitter*) {}
-    /* 80050374 */ virtual void executeAfter(JPABaseEmitter*) {}
-    /* 8005036C */ virtual void draw(JPABaseEmitter*) {}
-    /* 80050370 */ virtual void drawAfter(JPABaseEmitter*) {}
+    virtual void execute(JPABaseEmitter*) {}
+    virtual void executeAfter(JPABaseEmitter*) {}
+    virtual void draw(JPABaseEmitter*) {}
+    virtual void drawAfter(JPABaseEmitter*) {}
     
-    /* 8027E6A4 */ //~JPAEmitterCallBack();
+    //~JPAEmitterCallBack();
 };
 
 enum {
@@ -100,18 +100,18 @@ enum {
  */
 class JPABaseEmitter {
 public:
-    /* 8027E5EC */ ~JPABaseEmitter() {}
-    /* 8027E64C */ JPABaseEmitter() : mLink(this), mRndm(0) {}
-    /* 8027E6EC */ void init(JPAEmitterManager*, JPAResource*);
-    /* 8027EDD4 */ bool processTillStartFrame();
-    /* 8027EE14 */ bool processTermination();
-    /* 8027EEB0 */ void calcEmitterGlobalPosition(JGeometry::TVec3<f32>*) const;
-    /* 8027EC60 */ void deleteAllParticle();
-    /* 8027EB60 */ JPABaseParticle* createChild(JPABaseParticle*);
-    /* 8027EA40 */ JPABaseParticle* createParticle();
-    /* 8027EF30 */ u32 getCurrentCreateNumber() const;
-    /* 8027EF40 */ u8 getDrawCount() const;
-    /* 8027EF50 */ bool loadTexture(u8, GXTexMapID);
+    ~JPABaseEmitter() {}
+    JPABaseEmitter() : mLink(this), mRndm(0) {}
+    void init(JPAEmitterManager*, JPAResource*);
+    bool processTillStartFrame();
+    bool processTermination();
+    void calcEmitterGlobalPosition(JGeometry::TVec3<f32>*) const;
+    void deleteAllParticle();
+    JPABaseParticle* createChild(JPABaseParticle*);
+    JPABaseParticle* createParticle();
+    u32 getCurrentCreateNumber() const;
+    u8 getDrawCount() const;
+    bool loadTexture(u8, GXTexMapID);
 
     void initStatus(u32 status) { mStatus = status; }
     void setStatus(u32 status) { mStatus |= status; }
diff --git a/include/JSystem/JParticle/JPAEmitterManager.h b/include/JSystem/JParticle/JPAEmitterManager.h
index 5cd69a286f..f0380d0dbb 100644
--- a/include/JSystem/JParticle/JPAEmitterManager.h
+++ b/include/JSystem/JParticle/JPAEmitterManager.h
@@ -21,17 +21,17 @@ struct JPAEmitterWorkData;
  */
 class JPAEmitterManager {
 public:
-    /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
-    /* 8027DEBC */ JPABaseEmitter* createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
+    JPAEmitterManager(u32, u32, JKRHeap*, u8, u8);
+    JPABaseEmitter* createSimpleEmitterID(JGeometry::TVec3<f32> const&, u16, u8, u8,
                                                          JPAEmitterCallBack*, JPAParticleCallBack*);
-    /* 8027DFA0 */ void calc(u8);
-    /* 8027E028 */ void draw(JPADrawInfo const*, u8);
-    /* 8027E220 */ void forceDeleteAllEmitter();
-    /* 8027E278 */ void forceDeleteGroupEmitter(u8);
-    /* 8027E2D8 */ void forceDeleteEmitter(JPABaseEmitter*);
-    /* 8027E344 */ void entryResourceManager(JPAResourceManager*, u8);
-    /* 8027E354 */ void clearResourceManager(u8);
-    /* 8027E3F4 */ void calcYBBCam();
+    void calc(u8);
+    void draw(JPADrawInfo const*, u8);
+    void forceDeleteAllEmitter();
+    void forceDeleteGroupEmitter(u8);
+    void forceDeleteEmitter(JPABaseEmitter*);
+    void entryResourceManager(JPAResourceManager*, u8);
+    void clearResourceManager(u8);
+    void calcYBBCam();
     JPAResourceManager* getResourceManager(u16 idx) { return pResMgrAry[idx]; }
 
 public:
diff --git a/include/JSystem/JParticle/JPAExTexShape.h b/include/JSystem/JParticle/JPAExTexShape.h
index d1d6013dd1..11825759c1 100644
--- a/include/JSystem/JParticle/JPAExTexShape.h
+++ b/include/JSystem/JParticle/JPAExTexShape.h
@@ -27,7 +27,7 @@ struct JPAExTexShapeData {
  */
 class JPAExTexShape {
 public:
-    /* 8027B13C */ JPAExTexShape(u8 const*);
+    JPAExTexShape(u8 const*);
 
     const f32* getIndTexMtx() const { return &mpData->mIndTexMtx[0][0]; }
     s8 getExpScale() const { return mpData->mExpScale; }
diff --git a/include/JSystem/JParticle/JPAExtraShape.h b/include/JSystem/JParticle/JPAExtraShape.h
index fac178eb6a..e7c619806c 100644
--- a/include/JSystem/JParticle/JPAExtraShape.h
+++ b/include/JSystem/JParticle/JPAExtraShape.h
@@ -46,8 +46,8 @@ struct JPAExtraShapeData {
  */
 class JPAExtraShape {
 public:
-    /* 8027AD88 */ JPAExtraShape(u8 const*);
-    /* 8027ADBC */ void init();
+    JPAExtraShape(u8 const*);
+    void init();
 
     f32 getScaleInTiming() const { return mpData->mScaleInTiming; }
     f32 getScaleOutTiming() const { return mpData->mScaleOutTiming; }
diff --git a/include/JSystem/JParticle/JPAFieldBlock.h b/include/JSystem/JParticle/JPAFieldBlock.h
index 2031ba26b0..20f7b896de 100644
--- a/include/JSystem/JParticle/JPAFieldBlock.h
+++ b/include/JSystem/JParticle/JPAFieldBlock.h
@@ -11,11 +11,11 @@ class JPAFieldBlock;
 
 class JPAFieldBase {
 public:
-    /* 8027BDEC */ void calcAffect(JPAFieldBlock*, JPABaseParticle*);
-    /* 8027BF18 */ f32 calcFadeAffect(JPAFieldBlock*, f32) const;
+    void calcAffect(JPAFieldBlock*, JPABaseParticle*);
+    f32 calcFadeAffect(JPAFieldBlock*, f32) const;
 
-    /* 8027D3AC */ virtual ~JPAFieldBase() {}
-    /* 80276A8C */ virtual void prepare(JPAEmitterWorkData*, JPAFieldBlock*) {}
+    virtual ~JPAFieldBase() {}
+    virtual void prepare(JPAEmitterWorkData*, JPAFieldBlock*) {}
     virtual void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*) = 0;
 
     /* 0x04 */ JGeometry::TVec3<f32> mAccel;
@@ -23,9 +23,9 @@ public:
 
 class JPAFieldVortex : public JPAFieldBase {
 public:
-    /* 8027C56C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027C674 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D564 */ ~JPAFieldVortex() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldVortex() {}
 
     /* 0x10 */ JGeometry::TVec3<f32> field_0x10;
     /* 0x1C */ f32 field_0x1c;
@@ -34,9 +34,9 @@ public:
 
 class JPAFieldSpin : public JPAFieldBase {
 public:
-    /* 8027CE64 */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027CFA8 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D3F4 */ ~JPAFieldSpin() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldSpin() {}
 
     /* 0x10 */ JGeometry::TVec3<f32> field_0x10;
     /* 0x1C */ JGeometry::TVec3<f32> field_0x1c;
@@ -45,15 +45,15 @@ public:
 
 class JPAFieldRandom : public JPAFieldBase {
 public:
-    /* 8027CCCC */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D4AC */ ~JPAFieldRandom() {}
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldRandom() {}
 };
 
 class JPAFieldNewton : public JPAFieldBase {
 public:
-    /* 8027C36C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027C3E0 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D5C0 */ ~JPAFieldNewton() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldNewton() {}
 
     /* 0x10 */ JGeometry::TVec3<f32> mDir;
     /* 0x1C */ f32 mCutoff;
@@ -61,31 +61,31 @@ public:
 
 class JPAFieldMagnet : public JPAFieldBase {
 public:
-    /* 8027C24C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027C29C */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D61C */ ~JPAFieldMagnet() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldMagnet() {}
 
     /* 0x10 */ JGeometry::TVec3<f32> mDir;
 };
 
 class JPAFieldGravity : public JPAFieldBase {
 public:
-    /* 8027BFB4 */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027C054 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D6D4 */ ~JPAFieldGravity() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldGravity() {}
 };
 
 class JPAFieldDrag : public JPAFieldBase {
 public:
-    /* 8027CDE4 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D450 */ ~JPAFieldDrag() {}
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldDrag() {}
 };
 
 class JPAFieldConvection : public JPAFieldBase {
 public:
-    /* 8027C814 */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027CA94 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D508 */ ~JPAFieldConvection() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldConvection() {}
 
     /* 0x10 */ JGeometry::TVec3<f32> field_0x10;
     /* 0x1C */ JGeometry::TVec3<f32> field_0x1c;
@@ -94,9 +94,9 @@ public:
 
 class JPAFieldAir : public JPAFieldBase {
 public:
-    /* 8027C07C */ void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
-    /* 8027C1B8 */ void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
-    /* 8027D678 */ ~JPAFieldAir() {}
+    void prepare(JPAEmitterWorkData*, JPAFieldBlock*);
+    void calc(JPAEmitterWorkData*, JPAFieldBlock*, JPABaseParticle*);
+    ~JPAFieldAir() {}
 };
 
 // unknown name
@@ -119,8 +119,8 @@ public:
 
 class JPAFieldBlock {
 public:
-    /* 8027D088 */ JPAFieldBlock(u8 const*, JKRHeap*);
-    /* 8027D0C0 */ void init(JKRHeap*);
+    JPAFieldBlock(u8 const*, JKRHeap*);
+    void init(JKRHeap*);
 
     u32 getType() { return mpData->mFlags & 0xF; }
     u32 getAddType() { return (mpData->mFlags >> 8) & 3; }
diff --git a/include/JSystem/JParticle/JPAKeyBlock.h b/include/JSystem/JParticle/JPAKeyBlock.h
index 3d79e854f4..39941068d2 100644
--- a/include/JSystem/JParticle/JPAKeyBlock.h
+++ b/include/JSystem/JParticle/JPAKeyBlock.h
@@ -8,8 +8,8 @@
  * 
  */
 struct JPAKeyBlock {
-    /* 8027D730 */ JPAKeyBlock(u8 const*);
-    /* 8027D740 */ f32 calc(f32);
+    JPAKeyBlock(u8 const*);
+    f32 calc(f32);
 
     u8 getID() { return mDataStart[8]; }
 
diff --git a/include/JSystem/JParticle/JPAParticle.h b/include/JSystem/JParticle/JPAParticle.h
index fd43c3bcc5..ac6cd9798f 100644
--- a/include/JSystem/JParticle/JPAParticle.h
+++ b/include/JSystem/JParticle/JPAParticle.h
@@ -20,13 +20,13 @@ struct JPAEmitterWorkData;
 class JPABaseParticle {
 public:
     ~JPABaseParticle() {}
-    /* 8027EFEC */ void init_p(JPAEmitterWorkData*);
-    /* 8027F8C8 */ void init_c(JPAEmitterWorkData*, JPABaseParticle*);
-    /* 8027FFD0 */ bool calc_p(JPAEmitterWorkData*);
-    /* 80280260 */ bool calc_c(JPAEmitterWorkData*);
-    /* 802804C8 */ bool canCreateChild(JPAEmitterWorkData*);
-    /* 80280548 */ f32 getWidth(JPABaseEmitter const*) const;
-    /* 80280568 */ f32 getHeight(JPABaseEmitter const*) const;
+    void init_p(JPAEmitterWorkData*);
+    void init_c(JPAEmitterWorkData*, JPABaseParticle*);
+    bool calc_p(JPAEmitterWorkData*);
+    bool calc_c(JPAEmitterWorkData*);
+    bool canCreateChild(JPAEmitterWorkData*);
+    f32 getWidth(JPABaseEmitter const*) const;
+    f32 getHeight(JPABaseEmitter const*) const;
     int getAge() { return mAge; }
     void setOffsetPosition(const JGeometry::TVec3<f32>& pos) { mOffsetPosition.set(pos); }
     void setOffsetPosition(f32 x, f32 y, f32 z) { mOffsetPosition.set(x, y, z); }
diff --git a/include/JSystem/JParticle/JPAResource.h b/include/JSystem/JParticle/JPAResource.h
index 4b95323338..eec55de945 100644
--- a/include/JSystem/JParticle/JPAResource.h
+++ b/include/JSystem/JParticle/JPAResource.h
@@ -22,20 +22,20 @@ class JPAKeyBlock;
  */
 class JPAResource {
 public:
-    /* 80274010 */ JPAResource();
-    /* 80274080 */ void init(JKRHeap*);
-    /* 802755E8 */ bool calc(JPAEmitterWorkData*, JPABaseEmitter*);
-    /* 80275A94 */ void draw(JPAEmitterWorkData*, JPABaseEmitter*);
-    /* 80275B74 */ void drawP(JPAEmitterWorkData*);
-    /* 80275EB0 */ void drawC(JPAEmitterWorkData*);
-    /* 802761A8 */ void setPTev();
-    /* 8027642C */ void setCTev(JPAEmitterWorkData*);
-    /* 8027658C */ void calc_p(JPAEmitterWorkData*, JPABaseParticle*);
-    /* 80276608 */ void calc_c(JPAEmitterWorkData*, JPABaseParticle*);
-    /* 80276684 */ void calcField(JPAEmitterWorkData*, JPABaseParticle*);
-    /* 80276700 */ void calcKey(JPAEmitterWorkData*);
-    /* 80276840 */ void calcWorkData_c(JPAEmitterWorkData*);
-    /* 80276A0C */ void calcWorkData_d(JPAEmitterWorkData*);
+    JPAResource();
+    void init(JKRHeap*);
+    bool calc(JPAEmitterWorkData*, JPABaseEmitter*);
+    void draw(JPAEmitterWorkData*, JPABaseEmitter*);
+    void drawP(JPAEmitterWorkData*);
+    void drawC(JPAEmitterWorkData*);
+    void setPTev();
+    void setCTev(JPAEmitterWorkData*);
+    void calc_p(JPAEmitterWorkData*, JPABaseParticle*);
+    void calc_c(JPAEmitterWorkData*, JPABaseParticle*);
+    void calcField(JPAEmitterWorkData*, JPABaseParticle*);
+    void calcKey(JPAEmitterWorkData*);
+    void calcWorkData_c(JPAEmitterWorkData*);
+    void calcWorkData_d(JPAEmitterWorkData*);
 
     JPABaseShape* getBsp() const { return mpBaseShape; }
     JPAExtraShape* getEsp() const { return mpExtraShape; }
diff --git a/include/JSystem/JParticle/JPAResourceLoader.h b/include/JSystem/JParticle/JPAResourceLoader.h
index 10ff1e38b6..b958585211 100644
--- a/include/JSystem/JParticle/JPAResourceLoader.h
+++ b/include/JSystem/JParticle/JPAResourceLoader.h
@@ -7,8 +7,8 @@ class JPAResourceManager;
 
 class JPAResourceLoader {
 public:
-    /* 8027D8A0 */ JPAResourceLoader(u8 const*, JPAResourceManager*);
-    /* 8027D8E0 */ void load_jpc(u8 const*, JPAResourceManager*);
+    JPAResourceLoader(u8 const*, JPAResourceManager*);
+    void load_jpc(u8 const*, JPAResourceManager*);
 };
 
 #endif /* JPARESOURCELOADER_H */
diff --git a/include/JSystem/JParticle/JPAResourceManager.h b/include/JSystem/JParticle/JPAResourceManager.h
index 2820c81091..60a027a6b9 100644
--- a/include/JSystem/JParticle/JPAResourceManager.h
+++ b/include/JSystem/JParticle/JPAResourceManager.h
@@ -13,13 +13,13 @@ struct ResTIMG;
  */
 class JPAResourceManager {
 public:
-    /* 80273E10 */ JPAResourceManager(void const*, JKRHeap*);
-    /* 80273E68 */ JPAResource* getResource(u16) const;
-    /* 80273EA8 */ bool checkUserIndexDuplication(u16) const;
-    /* 80273EEC */ const ResTIMG* swapTexture(ResTIMG const*, char const*);
-    /* 80273F8C */ void registRes(JPAResource*);
-    /* 80273FAC */ void registTex(JPATexture*);
-    /* 80273FCC */ u32 getResUserWork(u16) const;
+    JPAResourceManager(void const*, JKRHeap*);
+    JPAResource* getResource(u16) const;
+    bool checkUserIndexDuplication(u16) const;
+    const ResTIMG* swapTexture(ResTIMG const*, char const*);
+    void registRes(JPAResource*);
+    void registTex(JPATexture*);
+    u32 getResUserWork(u16) const;
 
     void load(u16 idx, GXTexMapID texMapID) { mpTexArr[idx]->load(texMapID); }
 
diff --git a/include/JSystem/JStage/JSGActor.h b/include/JSystem/JStage/JSGActor.h
index ed3fc82930..c3b0760232 100644
--- a/include/JSystem/JStage/JSGActor.h
+++ b/include/JSystem/JStage/JSGActor.h
@@ -20,28 +20,28 @@ namespace JStage {
             ID_UNK_6  = 6,
         };
 
-        /* 80280A48 */ virtual ~TActor() = 0;
-        /* 80280AA8 */ virtual s32 JSGFGetType() const;
-        /* 80280AB0 */ virtual void JSGGetTranslation(Vec*) const;
-        /* 80280AB4 */ virtual void JSGSetTranslation(Vec const&);
-        /* 80280AB8 */ virtual void JSGGetScaling(Vec*) const;
-        /* 80280ABC */ virtual void JSGSetScaling(Vec const&);
-        /* 80280AC0 */ virtual void JSGGetRotation(Vec*) const;
-        /* 80280AC4 */ virtual void JSGSetRotation(Vec const&);
-        /* 80280AC8 */ virtual s32 JSGGetShape() const;
-        /* 80280AD0 */ virtual void JSGSetShape(u32);
-        /* 80280AD4 */ virtual s32 JSGGetAnimation() const;
-        /* 80280ADC */ virtual void JSGSetAnimation(u32);
-        /* 80280AE0 */ virtual f32 JSGGetAnimationFrame() const;
-        /* 80280AE8 */ virtual void JSGSetAnimationFrame(f32);
-        /* 80280AEC */ virtual f32 JSGGetAnimationFrameMax() const;
-        /* 80280AF4 */ virtual f32 JSGGetAnimationTransition() const;
-        /* 80280AFC */ virtual void JSGSetAnimationTransition(f32);
-        /* 80280B00 */ virtual s32 JSGGetTextureAnimation() const;
-        /* 80280B08 */ virtual void JSGSetTextureAnimation(u32);
-        /* 80280B0C */ virtual f32 JSGGetTextureAnimationFrame() const;
-        /* 80280B14 */ virtual void JSGSetTextureAnimationFrame(f32);
-        /* 80280B18 */ virtual f32 JSGGetTextureAnimationFrameMax() const;
+        virtual ~TActor() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual void JSGGetTranslation(Vec*) const;
+        virtual void JSGSetTranslation(Vec const&);
+        virtual void JSGGetScaling(Vec*) const;
+        virtual void JSGSetScaling(Vec const&);
+        virtual void JSGGetRotation(Vec*) const;
+        virtual void JSGSetRotation(Vec const&);
+        virtual s32 JSGGetShape() const;
+        virtual void JSGSetShape(u32);
+        virtual s32 JSGGetAnimation() const;
+        virtual void JSGSetAnimation(u32);
+        virtual f32 JSGGetAnimationFrame() const;
+        virtual void JSGSetAnimationFrame(f32);
+        virtual f32 JSGGetAnimationFrameMax() const;
+        virtual f32 JSGGetAnimationTransition() const;
+        virtual void JSGSetAnimationTransition(f32);
+        virtual s32 JSGGetTextureAnimation() const;
+        virtual void JSGSetTextureAnimation(u32);
+        virtual f32 JSGGetTextureAnimationFrame() const;
+        virtual void JSGSetTextureAnimationFrame(f32);
+        virtual f32 JSGGetTextureAnimationFrameMax() const;
     };
 };
 
diff --git a/include/JSystem/JStage/JSGAmbientLight.h b/include/JSystem/JStage/JSGAmbientLight.h
index 08d8bba82a..049ce7a479 100644
--- a/include/JSystem/JStage/JSGAmbientLight.h
+++ b/include/JSystem/JStage/JSGAmbientLight.h
@@ -11,10 +11,10 @@ namespace JStage {
     * 
     */
     struct TAmbientLight : public TObject {
-        /* 80280B20 */ virtual ~TAmbientLight() = 0;
-        /* 80280B80 */ virtual s32 JSGFGetType() const;
-        /* 80280B88 */ virtual GXColor JSGGetColor() const;
-        /* 80280B9C */ virtual void JSGSetColor(GXColor);
+        virtual ~TAmbientLight() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual GXColor JSGGetColor() const;
+        virtual void JSGSetColor(GXColor);
     };
 };
 
diff --git a/include/JSystem/JStage/JSGCamera.h b/include/JSystem/JStage/JSGCamera.h
index aee5f3e969..884efec1c3 100644
--- a/include/JSystem/JStage/JSGCamera.h
+++ b/include/JSystem/JStage/JSGCamera.h
@@ -22,30 +22,30 @@ namespace JStage {
     * 
     */
     struct TCamera : public TObject {
-        /* 80280BA0 */ virtual ~TCamera() = 0;
-        /* 80280C00 */ virtual s32 JSGFGetType() const;
-        /* 80280C08 */ virtual bool JSGGetProjectionType() const;
-        /* 80280C10 */ virtual void JSGSetProjectionType(JStage::TECameraProjection);
-        /* 80280C14 */ virtual f32 JSGGetProjectionNear() const;
-        /* 80280C1C */ virtual void JSGSetProjectionNear(f32);
-        /* 80280C20 */ virtual f32 JSGGetProjectionFar() const;
-        /* 80280C2C */ virtual void JSGSetProjectionFar(f32);
-        /* 80280C30 */ virtual f32 JSGGetProjectionFovy() const;
-        /* 80280C38 */ virtual void JSGSetProjectionFovy(f32);
-        /* 80280C3C */ virtual f32 JSGGetProjectionAspect() const;
-        /* 80280C44 */ virtual void JSGSetProjectionAspect(f32);
-        /* 80280C48 */ virtual void JSGGetProjectionField(f32*) const;
-        /* 80280C4C */ virtual void JSGSetProjectionField(f32 const*);
-        /* 80280C50 */ virtual bool JSGGetViewType() const;
-        /* 80280C58 */ virtual void JSGSetViewType(JStage::TECameraView);
-        /* 80280C5C */ virtual void JSGGetViewPosition(Vec*) const;
-        /* 80280C60 */ virtual void JSGSetViewPosition(Vec const&);
-        /* 80280C64 */ virtual void JSGGetViewUpVector(Vec*) const;
-        /* 80280C68 */ virtual void JSGSetViewUpVector(Vec const&);
-        /* 80280C6C */ virtual void JSGGetViewTargetPosition(Vec*) const;
-        /* 80280C70 */ virtual void JSGSetViewTargetPosition(Vec const&);
-        /* 80280C74 */ virtual f32 JSGGetViewRoll() const;
-        /* 80280C7C */ virtual void JSGSetViewRoll(f32);
+        virtual ~TCamera() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual bool JSGGetProjectionType() const;
+        virtual void JSGSetProjectionType(JStage::TECameraProjection);
+        virtual f32 JSGGetProjectionNear() const;
+        virtual void JSGSetProjectionNear(f32);
+        virtual f32 JSGGetProjectionFar() const;
+        virtual void JSGSetProjectionFar(f32);
+        virtual f32 JSGGetProjectionFovy() const;
+        virtual void JSGSetProjectionFovy(f32);
+        virtual f32 JSGGetProjectionAspect() const;
+        virtual void JSGSetProjectionAspect(f32);
+        virtual void JSGGetProjectionField(f32*) const;
+        virtual void JSGSetProjectionField(f32 const*);
+        virtual bool JSGGetViewType() const;
+        virtual void JSGSetViewType(JStage::TECameraView);
+        virtual void JSGGetViewPosition(Vec*) const;
+        virtual void JSGSetViewPosition(Vec const&);
+        virtual void JSGGetViewUpVector(Vec*) const;
+        virtual void JSGSetViewUpVector(Vec const&);
+        virtual void JSGGetViewTargetPosition(Vec*) const;
+        virtual void JSGSetViewTargetPosition(Vec const&);
+        virtual f32 JSGGetViewRoll() const;
+        virtual void JSGSetViewRoll(f32);
     };
 };
 
diff --git a/include/JSystem/JStage/JSGFog.h b/include/JSystem/JStage/JSGFog.h
index 99a8ce4e6e..1109da9a17 100644
--- a/include/JSystem/JStage/JSGFog.h
+++ b/include/JSystem/JStage/JSGFog.h
@@ -11,16 +11,16 @@ namespace JStage {
     * 
     */
     struct TFog : public TObject {
-        /* 80280C80 */ virtual ~TFog() = 0;
-        /* 80280CE0 */ virtual s32 JSGFGetType() const;
-        /* 80280CE8 */ virtual bool JSGGetFogFunction() const;
-        /* 80280CF0 */ virtual void JSGSetFogFunction(GXFogType);
-        /* 80280CF4 */ virtual f32 JSGGetStartZ() const;
-        /* 80280CFC */ virtual void JSGSetStartZ(f32);
-        /* 80280D00 */ virtual f32 JSGGetEndZ() const;
-        /* 80280D0C */ virtual void JSGSetEndZ(f32);
-        /* 80280D10 */ virtual GXColor JSGGetColor() const;
-        /* 80280D24 */ virtual void JSGSetColor(GXColor);
+        virtual ~TFog() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual bool JSGGetFogFunction() const;
+        virtual void JSGSetFogFunction(GXFogType);
+        virtual f32 JSGGetStartZ() const;
+        virtual void JSGSetStartZ(f32);
+        virtual f32 JSGGetEndZ() const;
+        virtual void JSGSetEndZ(f32);
+        virtual GXColor JSGGetColor() const;
+        virtual void JSGSetColor(GXColor);
     };
 };
 
diff --git a/include/JSystem/JStage/JSGLight.h b/include/JSystem/JStage/JSGLight.h
index 92c9c15386..3400f806d5 100644
--- a/include/JSystem/JStage/JSGLight.h
+++ b/include/JSystem/JStage/JSGLight.h
@@ -17,20 +17,20 @@ namespace JStage {
     * 
     */
     struct TLight : public TObject {
-        /* 80280D28 */ virtual ~TLight() = 0;
-        /* 80280D88 */ virtual s32 JSGFGetType() const;
-        /* 80280D90 */ virtual bool JSGGetLightType() const;
-        /* 80280D98 */ virtual void JSGSetLightType(JStage::TELight);
-        /* 80280DC4 */ virtual void JSGGetPosition(Vec*) const;
-        /* 80280DC8 */ virtual void JSGSetPosition(Vec const&);
-        /* 80280D9C */ virtual GXColor JSGGetColor() const;
-        /* 80280DB0 */ virtual void JSGSetColor(GXColor);
-        /* 80280DB4 */ virtual void JSGGetDistanceAttenuation(f32*, f32*, GXDistAttnFn*) const;
-        /* 80280DB8 */ virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn);
-        /* 80280DBC */ virtual void JSGGetAngleAttenuation(f32*, GXSpotFn*) const;
-        /* 80280DC0 */ virtual void JSGSetAngleAttenuation(f32, GXSpotFn);
-        /* 80280DCC */ virtual void JSGGetDirection(Vec*) const;
-        /* 80280DD0 */ virtual void JSGSetDirection(Vec const&);
+        virtual ~TLight() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual bool JSGGetLightType() const;
+        virtual void JSGSetLightType(JStage::TELight);
+        virtual void JSGGetPosition(Vec*) const;
+        virtual void JSGSetPosition(Vec const&);
+        virtual GXColor JSGGetColor() const;
+        virtual void JSGSetColor(GXColor);
+        virtual void JSGGetDistanceAttenuation(f32*, f32*, GXDistAttnFn*) const;
+        virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn);
+        virtual void JSGGetAngleAttenuation(f32*, GXSpotFn*) const;
+        virtual void JSGSetAngleAttenuation(f32, GXSpotFn);
+        virtual void JSGGetDirection(Vec*) const;
+        virtual void JSGSetDirection(Vec const&);
     };
 };
 
diff --git a/include/JSystem/JStage/JSGObject.h b/include/JSystem/JStage/JSGObject.h
index d4689c16bd..fa9148dc6e 100644
--- a/include/JSystem/JStage/JSGObject.h
+++ b/include/JSystem/JStage/JSGObject.h
@@ -9,19 +9,19 @@ namespace JStage {
     * 
     */
     struct TObject {
-        /* 80280DD4 */ virtual ~TObject() = 0;
+        virtual ~TObject() = 0;
         virtual s32 JSGFGetType() const = 0;
-        /* 80280E1C */ virtual bool JSGGetName() const;
-        /* 80280E24 */ virtual void JSGUpdate();
-        /* 80280E28 */ virtual u32 JSGGetFlag() const;
-        /* 80280E30 */ virtual void JSGSetFlag(u32);
-        /* 80280E34 */ virtual bool JSGGetData(u32, void*, u32) const;
-        /* 80280E3C */ virtual void JSGSetData(u32, void const*, u32);
-        /* 80280E40 */ virtual void JSGGetParent(JStage::TObject**, u32*) const;
-        /* 80280E44 */ virtual void JSGSetParent(JStage::TObject*, u32);
-        /* 80280E48 */ virtual void JSGSetRelation(bool, JStage::TObject*, u32);
-        /* 80280E4C */ virtual s32 JSGFindNodeID(char const*) const;
-        /* 80280E54 */ virtual bool JSGGetNodeTransformation(u32, f32 (*)[4]) const;
+        virtual bool JSGGetName() const;
+        virtual void JSGUpdate();
+        virtual u32 JSGGetFlag() const;
+        virtual void JSGSetFlag(u32);
+        virtual bool JSGGetData(u32, void*, u32) const;
+        virtual void JSGSetData(u32, void const*, u32);
+        virtual void JSGGetParent(JStage::TObject**, u32*) const;
+        virtual void JSGSetParent(JStage::TObject*, u32);
+        virtual void JSGSetRelation(bool, JStage::TObject*, u32);
+        virtual s32 JSGFindNodeID(char const*) const;
+        virtual bool JSGGetNodeTransformation(u32, f32 (*)[4]) const;
 
         void JSGFEnableFlag(u32 flag) {
             JSGSetFlag(JSGGetFlag() | flag);
diff --git a/include/JSystem/JStage/JSGSystem.h b/include/JSystem/JStage/JSGSystem.h
index 1f9fb920aa..ab3a04220d 100644
--- a/include/JSystem/JStage/JSGSystem.h
+++ b/include/JSystem/JStage/JSGSystem.h
@@ -19,13 +19,13 @@ namespace JStage {
     * 
     */
     struct TSystem : public TObject {
-        /* 80280E90 */ virtual ~TSystem() = 0;
-        /* 80280EF0 */ virtual s32 JSGFGetType() const;
-        /* 80280EF8 */ virtual int JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const;
-        /* 80280F00 */ virtual bool JSGCreateObject(char const*, JStage::TEObject, u32);
-        /* 80280F08 */ virtual void JSGDestroyObject(JStage::TObject*);
-        /* 80280F0C */ virtual bool JSGGetSystemData(u32);
-        /* 80280F14 */ virtual void JSGSetSystemData(u32, u32);
+        virtual ~TSystem() = 0;
+        virtual s32 JSGFGetType() const;
+        virtual int JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const;
+        virtual bool JSGCreateObject(char const*, JStage::TEObject, u32);
+        virtual void JSGDestroyObject(JStage::TObject*);
+        virtual bool JSGGetSystemData(u32);
+        virtual void JSGSetSystemData(u32, u32);
     };
 };
 
diff --git a/include/JSystem/JStudio/JStudio/ctb.h b/include/JSystem/JStudio/JStudio/ctb.h
index 5f832af9c5..acb7c06432 100644
--- a/include/JSystem/JStudio/JStudio/ctb.h
+++ b/include/JSystem/JStudio/JStudio/ctb.h
@@ -13,7 +13,7 @@ struct TObject : public object::TObject_ID {
         pData_ = param_2;
         JUT_ASSERT(82, pData_!=NULL);
     }
-    /* 80280F18 */ virtual ~TObject() = 0;
+    virtual ~TObject() = 0;
     virtual int getScheme() const = 0;
     const void* getData() const { return pData_; }
 
@@ -110,29 +110,29 @@ struct data {
 };
 
 struct TObject_TxyzRy : public TObject {
-    /* 80280F60 */ TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const&);
+    TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const&);
     
-    /* 80281554 */ virtual ~TObject_TxyzRy() {}
-    /* 80280FBC */ virtual int getScheme() const;
+    virtual ~TObject_TxyzRy() {}
+    virtual int getScheme() const;
 };
 
 struct TFactory {
     TFactory() {}
 
-    /* 80281274 */ virtual ~TFactory();
-    /* 802812BC */ virtual TObject* create(JStudio::ctb::data::TParse_TBlock const&);
-    /* 80281320 */ virtual void destroy(JStudio::ctb::TObject*);
+    virtual ~TFactory();
+    virtual TObject* create(JStudio::ctb::data::TParse_TBlock const&);
+    virtual void destroy(JStudio::ctb::TObject*);
 };
 
 struct TControl {
-    /* 80280FC4 */ TControl();
-    /* 80280FF4 */ virtual ~TControl();
-    /* 80281060 */ void appendObject(JStudio::ctb::TObject*);
-    /* 802810AC */ void removeObject(JStudio::ctb::TObject*);
-    /* 802810DC */ void destroyObject(JStudio::ctb::TObject*);
-    /* 8028112C */ void destroyObject_all();
-    /* 80281190 */ JStudio::ctb::TObject* getObject(void const*, u32);
-    /* 80281230 */ JStudio::ctb::TObject* getObject_index(u32);
+    TControl();
+    virtual ~TControl();
+    void appendObject(JStudio::ctb::TObject*);
+    void removeObject(JStudio::ctb::TObject*);
+    void destroyObject(JStudio::ctb::TObject*);
+    void destroyObject_all();
+    JStudio::ctb::TObject* getObject(void const*, u32);
+    JStudio::ctb::TObject* getObject_index(u32);
 
     TFactory* getFactory() { return pFactory_; }
     void setFactory(TFactory* factory) { pFactory_ = factory; }
@@ -142,10 +142,10 @@ struct TControl {
 };
 
 struct TParse : public JGadget::binary::TParse_header_block {
-    /* 8028135C */ TParse(JStudio::ctb::TControl*);
-    /* 8028137C */ virtual ~TParse();
-    /* 802813DC */ virtual bool parseHeader_next(void const**, u32*, u32);
-    /* 80281470 */ virtual bool parseBlock_next(void const**, u32*, u32);
+    TParse(JStudio::ctb::TControl*);
+    virtual ~TParse();
+    virtual bool parseHeader_next(void const**, u32*, u32);
+    virtual bool parseBlock_next(void const**, u32*, u32);
 
     TControl* getControl() { return pControl_; }
 
diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h
index ba881ed2d4..25a71de8dd 100644
--- a/include/JSystem/JStudio/JStudio/functionvalue.h
+++ b/include/JSystem/JStudio/JStudio/functionvalue.h
@@ -26,8 +26,8 @@ public:
     enum TEOutside { OUT_INIT };
     enum TEInterpolate {};
 
-    /* 80281690 */ TFunctionValue();
-    /* 802816A0 */ virtual ~TFunctionValue() = 0;
+    TFunctionValue();
+    virtual ~TFunctionValue() = 0;
 
     virtual u32 getType() const = 0;
     virtual TFunctionValueAttributeSet getAttributeSet() = 0;
@@ -35,7 +35,7 @@ public:
     virtual void prepare() = 0;
     virtual f64 getValue(f64 arg1) = 0;
 
-    /* 80281648 */ static ExtrapolateParameter toFunction_outside(int);
+    static ExtrapolateParameter toFunction_outside(int);
 
     static ExtrapolateParameter toFunction(TFunctionValue::TEOutside outside) {
         return toFunction_outside(outside);
@@ -82,7 +82,7 @@ public:
     TFunctionValueAttribute_refer() : JGadget::TVector_pointer<TFunctionValue*>(JGadget::TAllocator<void*>()) {}
     ~TFunctionValueAttribute_refer() {}
 
-    /* 802816E8 */ void refer_initialize();
+    void refer_initialize();
 
     const TFunctionValueAttribute_refer* refer_getContainer() const { return this; }
     JGadget::TVector_pointer<TFunctionValue*>& refer_referContainer() { return *this; }
@@ -91,12 +91,12 @@ public:
 
 class TFunctionValueAttribute_range {
 public:
-    /* 80281D18 */ TFunctionValueAttribute_range();
+    TFunctionValueAttribute_range();
 
-    /* 80281918 */ void range_initialize();
-    /* 8028194C */ void range_prepare();
-    /* 802819F4 */ void range_set(f64, f64);
-    /* 80281A08 */ f64 range_getParameter(f64, f64, f64) const;
+    void range_initialize();
+    void range_prepare();
+    void range_set(f64, f64);
+    f64 range_getParameter(f64, f64, f64) const;
 
     TFunctionValue::TEProgress range_getProgress() const {
         return (TFunctionValue::TEProgress)mProgress;
@@ -156,14 +156,14 @@ private:
 
 class TFunctionValue_constant : public TFunctionValue {
 public:
-    /* 8028236C */ TFunctionValue_constant();
-    /* 80283D44 */ virtual ~TFunctionValue_constant() {}
+    TFunctionValue_constant();
+    virtual ~TFunctionValue_constant() {}
 
-    /* 802823B4 */ virtual u32 getType() const;
-    /* 802823BC */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 802823D0 */ virtual void initialize();
-    /* 802823E0 */ virtual void prepare();
-    /* 802823E4 */ virtual f64 getValue(f64);
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
 
     void data_set(f64 value) { fValue_ = value; }
 
@@ -194,25 +194,25 @@ public:
     typedef f64 (*CompositeFunc)(const JGadget::TVector_pointer<TFunctionValue*>&,
                                  const TFunctionValue_composite::TData&, f64);
 
-    /* 80281D5C */ TFunctionValue_composite();
-    /* 80283DA4 */ virtual ~TFunctionValue_composite() {}
+    TFunctionValue_composite();
+    virtual ~TFunctionValue_composite() {}
 
-    /* 80281DB8 */ virtual u32 getType() const;
-    /* 80281DC0 */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 80281DE0 */ virtual void initialize();
-    /* 80281E24 */ virtual void prepare();
-    /* 80281E28 */ virtual f64 getValue(f64);
-    /* 80281E5C */ static f64 composite_raw(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
-    /* 80281EC8 */ static f64 composite_index(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
-    /* 8028202C */ static f64 composite_parameter(TVector_pointer<TFunctionValue*> const&,
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
+    static f64 composite_raw(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
+    static f64 composite_index(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
+    static f64 composite_parameter(TVector_pointer<TFunctionValue*> const&,
                                                   TData const&, f64);
-    /* 80282094 */ static f64 composite_add(TVector_pointer<JStudio::TFunctionValue*> const&,
+    static f64 composite_add(TVector_pointer<JStudio::TFunctionValue*> const&,
                                             TData const&, f64);
-    /* 80282118 */ static f64 composite_subtract(TVector_pointer<TFunctionValue*> const&, TData const&,
+    static f64 composite_subtract(TVector_pointer<TFunctionValue*> const&, TData const&,
                                            f64);
-    /* 80282200 */ static f64 composite_multiply(TVector_pointer<TFunctionValue*> const&, TData const&,
+    static f64 composite_multiply(TVector_pointer<TFunctionValue*> const&, TData const&,
                                            f64);
-    /* 80282284 */ static f64 composite_divide(TVector_pointer<TFunctionValue*> const&, TData const&,
+    static f64 composite_divide(TVector_pointer<TFunctionValue*> const&, TData const&,
                                          f64);
 
     void data_set(CompositeFunc fn, const TData& dat) {
@@ -231,14 +231,14 @@ class TFunctionValue_transition : public TFunctionValue,
                                   public TFunctionValueAttribute_range,
                                   public TFunctionValueAttribute_interpolate {
 public:
-    /* 802823EC */ TFunctionValue_transition();
-    /* 80283CE4 */ virtual ~TFunctionValue_transition() {}
+    TFunctionValue_transition();
+    virtual ~TFunctionValue_transition() {}
 
-    /* 8028244C */ virtual u32 getType() const;
-    /* 80282454 */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 80282484 */ virtual void initialize();
-    /* 802824D0 */ virtual void prepare();
-    /* 802824F4 */ virtual f64 getValue(f64);
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
 
     void data_set(f64 a1, f64 a2) {
         _48 = a1;
@@ -263,14 +263,14 @@ public:
     };
     typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list&, const TIndexData_&);
 
-    /* 802826BC */ TFunctionValue_list();
+    TFunctionValue_list();
     virtual ~TFunctionValue_list() {}
 
-    /* 80282720 */ virtual u32 getType() const;
-    /* 80282728 */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 80282758 */ virtual void initialize();
-    /* 802827A8 */ virtual void prepare();
-    /* 80282858 */ virtual f64 getValue(f64);
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
 
     void data_set(const f32* pf, u32 u) {
         ASSERT((pf != NULL) || (u == 0));
@@ -283,16 +283,16 @@ public:
         _50 = f;
     }
 
-    /* 80282C10 */ static f64
+    static f64
     update_INTERPOLATE_NONE_(JStudio::TFunctionValue_list const&,
                              JStudio::TFunctionValue_list::TIndexData_ const&);
-    /* 80282C24 */ static f64
+    static f64
     update_INTERPOLATE_LINEAR_(JStudio::TFunctionValue_list const&,
                                JStudio::TFunctionValue_list::TIndexData_ const&);
-    /* 80282C58 */ static f64
+    static f64
     update_INTERPOLATE_PLATEAU_(JStudio::TFunctionValue_list const&,
                                 JStudio::TFunctionValue_list::TIndexData_ const&);
-    /* 80282CA8 */ static f64
+    static f64
     update_INTERPOLATE_BSPLINE_dataMore3_(JStudio::TFunctionValue_list const&,
                                           JStudio::TFunctionValue_list::TIndexData_ const&);
 
@@ -379,23 +379,23 @@ public:
     };
     typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list_parameter&, f64);
 
-    /* 80282D34 */ TFunctionValue_list_parameter();
-    /* 80283C24 */ virtual ~TFunctionValue_list_parameter() {}
+    TFunctionValue_list_parameter();
+    virtual ~TFunctionValue_list_parameter() {}
 
-    /* 80282DA0 */ virtual u32 getType() const;
-    /* 80282DA8 */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 80282DD8 */ void data_set(f32 const*, u32);
-    /* 80282E08 */ virtual void initialize();
-    /* 80282E60 */ virtual void prepare();
-    /* 80282F10 */ virtual f64 getValue(f64);
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    void data_set(f32 const*, u32);
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
 
-    /* 80282FE8 */ static f64
+    static f64
     update_INTERPOLATE_NONE_(JStudio::TFunctionValue_list_parameter const&, f64);
-    /* 80282FF4 */ static f64
+    static f64
     update_INTERPOLATE_LINEAR_(JStudio::TFunctionValue_list_parameter const&, f64);
-    /* 80283024 */ static f64
+    static f64
     update_INTERPOLATE_PLATEAU_(JStudio::TFunctionValue_list_parameter const&, f64);
-    /* 80283060 */ static f64
+    static f64
     update_INTERPOLATE_BSPLINE_dataMore3_(JStudio::TFunctionValue_list_parameter const&, f64);
 
     static const u32 suData_size = 2;
@@ -498,15 +498,15 @@ public:
 #endif
     };
 
-    /* 802832C4 */ TFunctionValue_hermite();
-    /* 80283BC4 */ virtual ~TFunctionValue_hermite() {}
+    TFunctionValue_hermite();
+    virtual ~TFunctionValue_hermite() {}
 
-    /* 80283344 */ virtual u32 getType() const;
-    /* 8028334C */ virtual TFunctionValueAttributeSet getAttributeSet();
-    /* 8028336C */ void data_set(f32 const*, u32, u32);
-    /* 802833BC */ virtual void initialize();
-    /* 80283428 */ virtual void prepare();
-    /* 8028344C */ virtual f64 getValue(f64);
+    virtual u32 getType() const;
+    virtual TFunctionValueAttributeSet getAttributeSet();
+    void data_set(f32 const*, u32, u32);
+    virtual void initialize();
+    virtual void prepare();
+    virtual f64 getValue(f64);
 
     u32 data_getSize() const { return uSize_; }
     f64 data_getValue_back() const { 
diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
index fbb0c568df..7e9ae92f55 100644
--- a/include/JSystem/JStudio/JStudio/fvb-data-parse.h
+++ b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
@@ -41,7 +41,7 @@ public:
     };
     TParse_TParagraph(const void* content) : TParseData_aligned<4>(content) {}
 
-    /* 802850AC */ void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const;
+    void getData(JStudio::fvb::data::TParse_TParagraph::TData*) const;
 };
 
 }  // namespace data
diff --git a/include/JSystem/JStudio/JStudio/fvb.h b/include/JSystem/JStudio/JStudio/fvb.h
index 3536aa018e..8c9aa30d8a 100644
--- a/include/JSystem/JStudio/JStudio/fvb.h
+++ b/include/JSystem/JStudio/JStudio/fvb.h
@@ -12,10 +12,10 @@ class TControl;
 
 class TParse : public TParse_header_block {
 public:
-    /* 80284ADC */ TParse(JStudio::fvb::TControl*);
-    /* 80284AFC */ virtual ~TParse();
-    /* 80284B5C */ virtual bool parseHeader_next(void const**, u32*, u32);
-    /* 80284BF0 */ virtual bool parseBlock_next(void const**, u32*, u32);
+    TParse(JStudio::fvb::TControl*);
+    virtual ~TParse();
+    virtual bool parseHeader_next(void const**, u32*, u32);
+    virtual bool parseBlock_next(void const**, u32*, u32);
 
     TControl* getControl() const { return pControl_; }
 
@@ -50,22 +50,22 @@ class TFactory {
 public:
     TFactory() {}
 
-    /* 80284918 */ virtual ~TFactory();
-    /* 80284960 */ virtual TObject* create(JStudio::fvb::data::TParse_TBlock const&);
-    /* 80284AA0 */ virtual void destroy(JStudio::fvb::TObject*);
+    virtual ~TFactory();
+    virtual TObject* create(JStudio::fvb::data::TParse_TBlock const&);
+    virtual void destroy(JStudio::fvb::TObject*);
 };
 
 class TControl {
 public:
-    /* 80284668 */ TControl();
-    /* 80284698 */ virtual ~TControl();
+    TControl();
+    virtual ~TControl();
 
-    /* 80284704 */ void appendObject(JStudio::fvb::TObject*);
-    /* 80284750 */ void removeObject(JStudio::fvb::TObject*);
-    /* 80284780 */ void destroyObject(JStudio::fvb::TObject*);
-    /* 802847D0 */ void destroyObject_all();
-    /* 80284834 */ TObject* getObject(void const*, u32);
-    /* 802848D4 */ TObject* getObject_index(u32);
+    void appendObject(JStudio::fvb::TObject*);
+    void removeObject(JStudio::fvb::TObject*);
+    void destroyObject(JStudio::fvb::TObject*);
+    void destroyObject_all();
+    TObject* getObject(void const*, u32);
+    TObject* getObject_index(u32);
 
     TFactory* getFactory() const { return pFactory; }
     void setFactory(TFactory* factory) { pFactory = factory; }
@@ -77,10 +77,10 @@ private:
 
 class TObject_composite : public TObject {
 public:
-    /* 80284254 */ TObject_composite(JStudio::fvb::data::TParse_TBlock const&);
-    /* 802842D4 */ virtual void prepare_data_(JStudio::fvb::data::TParse_TParagraph::TData const&,
+    TObject_composite(JStudio::fvb::data::TParse_TBlock const&);
+    virtual void prepare_data_(JStudio::fvb::data::TParse_TParagraph::TData const&,
                                               JStudio::fvb::TControl*);
-    /* 80284F78 */ virtual ~TObject_composite() {}
+    virtual ~TObject_composite() {}
 
 private:
     TFunctionValue_composite fnValue;
@@ -88,10 +88,10 @@ private:
 
 class TObject_constant : public TObject {
 public:
-    /* 80284338 */ TObject_constant(data::TParse_TBlock const&);
-    /* 80284EF4 */ virtual ~TObject_constant() {}
+    TObject_constant(data::TParse_TBlock const&);
+    virtual ~TObject_constant() {}
 
-    /* 802843B8 */ virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
+    virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
 
 private:
     TFunctionValue_constant fnValue;
@@ -99,10 +99,10 @@ private:
 
 class TObject_transition : public TObject {
 public:
-    /* 802843C8 */ TObject_transition(data::TParse_TBlock const&);
-    /* 80284E70 */ virtual ~TObject_transition() {}
+    TObject_transition(data::TParse_TBlock const&);
+    virtual ~TObject_transition() {}
 
-    /* 80284448 */ virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
+    virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
 
 private:
     TFunctionValue_transition fnValue;
@@ -115,10 +115,10 @@ public:
         /* 0x4 */ u32 _4;
         /* 0x8 */ f32 _8[0];
     };
-    /* 80284460 */ TObject_list(data::TParse_TBlock const&);
-    /* 80284DEC */ virtual ~TObject_list() {}
+    TObject_list(data::TParse_TBlock const&);
+    virtual ~TObject_list() {}
 
-    /* 802844E0 */ virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
+    virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
 
 private:
     TFunctionValue_list fnValue;
@@ -130,10 +130,10 @@ public:
         u32 _0;
         f32 _4[0];
     };
-    /* 80284500 */ TObject_list_parameter(data::TParse_TBlock const&);
-    /* 80284D68 */ virtual ~TObject_list_parameter() {}
+    TObject_list_parameter(data::TParse_TBlock const&);
+    virtual ~TObject_list_parameter() {}
 
-    /* 80284580 */ virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
+    virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
 
 private:
     TFunctionValue_list_parameter fnValue;
@@ -145,10 +145,10 @@ public:
         u32 _0;  // u : 28, uSize : 4
         f32 _4[0];
     };
-    /* 802845B0 */ TObject_hermite(data::TParse_TBlock const&);
-    /* 80284CE4 */ virtual ~TObject_hermite() {}
+    TObject_hermite(data::TParse_TBlock const&);
+    virtual ~TObject_hermite() {}
 
-    /* 80284630 */ virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
+    virtual void prepare_data_(data::TParse_TParagraph::TData const&, TControl*);
 
 private:
     TFunctionValue_hermite fnValue;
diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h
index 18bdb16e89..e6fbb99957 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-control.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-control.h
@@ -11,7 +11,7 @@ namespace JStudio {
 struct TObject;
 struct TCreateObject {
     TCreateObject() {}
-    /* 80285488 */ virtual ~TCreateObject() = 0;
+    virtual ~TCreateObject() = 0;
     virtual bool create(TObject**, JStudio::stb::data::TParse_TBlock_object const&) = 0;
 
     template<class AdaptorT>
@@ -30,10 +30,10 @@ struct TCreateObject {
 struct TFactory : public stb::TFactory {
     TFactory() {}
 
-    /* 802854D0 */ virtual ~TFactory();
-    /* 802855AC */ virtual TObject* create(JStudio::stb::data::TParse_TBlock_object const&);
+    virtual ~TFactory();
+    virtual TObject* create(JStudio::stb::data::TParse_TBlock_object const&);
 
-    /* 80285560 */ void appendCreateObject(JStudio::TCreateObject*);
+    void appendCreateObject(JStudio::TCreateObject*);
 
     /* 0x04 */ JGadget::TLinkList<TCreateObject, -4> mList;
     /* 0x10 */ fvb::TFactory fvb_Factory;
@@ -53,13 +53,13 @@ public:
         Vec direction;
     };
 
-    /* 80285114 */ TControl();
-    /* 802851AC */ virtual ~TControl();
-    /* 80285228 */ void setFactory(JStudio::TFactory*);
-    /* 80285250 */ int transformOnSet_setOrigin_TxyzRy(Vec const&, f32);
-    /* 802852D0 */ int transformOnGet_setOrigin_TxyzRy(Vec const&, f32);
-    /* 80285368 */ int transform_setOrigin_ctb(JStudio::ctb::TObject const&);
-    /* 8028543C */ bool transform_setOrigin_ctb_index(u32);
+    TControl();
+    virtual ~TControl();
+    void setFactory(JStudio::TFactory*);
+    int transformOnSet_setOrigin_TxyzRy(Vec const&, f32);
+    int transformOnGet_setOrigin_TxyzRy(Vec const&, f32);
+    int transform_setOrigin_ctb(JStudio::ctb::TObject const&);
+    bool transform_setOrigin_ctb_index(u32);
 
     void stb_destroyObject_all() { stb::TControl::destroyObject_all(); }
     void fvb_destroyObject_all() { fvb_Control.destroyObject_all(); }
@@ -288,13 +288,13 @@ public:
 };
 
 struct TParse : public stb::TParse {
-    /* 8028566C */ TParse(JStudio::TControl*);
-    /* 80285844 */ bool parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const&, u32);
-    /* 802858F0 */ bool parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const&, u32);
+    TParse(JStudio::TControl*);
+    bool parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const&, u32);
+    bool parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const&, u32);
 
-    /* 802856A8 */ virtual ~TParse();
-    /* 80285708 */ virtual bool parseHeader(JStudio::stb::data::TParse_THeader const&, u32);
-    /* 802857E4 */ virtual bool parseBlock_block(JStudio::stb::data::TParse_TBlock const&, u32);
+    virtual ~TParse();
+    virtual bool parseHeader(JStudio::stb::data::TParse_THeader const&, u32);
+    virtual bool parseBlock_block(JStudio::stb::data::TParse_TBlock const&, u32);
 
     TControl* getControl() { return (TControl*)stb::TParse::getControl(); }
 };
diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h
index 0e061b6ab8..73635c990e 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-math.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-math.h
@@ -6,9 +6,9 @@
 
 namespace JStudio {
 namespace math {
-    /* 802859DC */ void getRotation_xyz(MtxP, f32, f32, f32);
-    /* 80285B44 */ void getTransformation_SRxyzT(MtxP, Vec const&, Vec const&, Vec const&);
-    /* 80285BCC */ void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, CMtxP);
+    void getRotation_xyz(MtxP, f32, f32, f32);
+    void getTransformation_SRxyzT(MtxP, Vec const&, Vec const&, Vec const&);
+    void getFromTransformation_SRxyzT(Vec*, Vec*, Vec*, CMtxP);
 
     inline void getRotation_y(Mtx param_0, f32 param_1) {
         MTXRotRad(param_0, 0x79, DEG_TO_RAD(param_1));
diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h
index a85b8dfb57..090d71a3ff 100644
--- a/include/JSystem/JStudio/JStudio/jstudio-object.h
+++ b/include/JSystem/JStudio/JStudio/jstudio-object.h
@@ -26,19 +26,19 @@ struct TAdaptor;
 struct TVariableValue {
     struct TOutput {
         virtual void operator()(f32, JStudio::TAdaptor*) const = 0;
-        /* 80285E0C */ virtual ~TOutput() = 0;
+        virtual ~TOutput() = 0;
     };
 
     struct TOutput_none_ : TOutput {
-        /* 80285F6C */ ~TOutput_none_();
-        /* 80285FCC */ void operator()(f32, JStudio::TAdaptor*) const;
+        ~TOutput_none_();
+        void operator()(f32, JStudio::TAdaptor*) const;
     };
 
-    /* 80285E54 */ void update(f64, JStudio::TAdaptor*);
-    /* 80285EB8 */ static void update_immediate_(JStudio::TVariableValue*, f64);
-    /* 80285ECC */ static void update_time_(JStudio::TVariableValue*, f64);
-    /* 80285F08 */ static void update_functionValue_(JStudio::TVariableValue*, f64);
-    /* 8028B568 */ TVariableValue() : field_0x4(0), field_0x8(NULL), pOutput_(&soOutput_none_) {}
+    void update(f64, JStudio::TAdaptor*);
+    static void update_immediate_(JStudio::TVariableValue*, f64);
+    static void update_time_(JStudio::TVariableValue*, f64);
+    static void update_functionValue_(JStudio::TVariableValue*, f64);
+    TVariableValue() : field_0x4(0), field_0x8(NULL), pOutput_(&soOutput_none_) {}
 
     void setValue_immediate(f32 value) {
         field_0x8 = &update_immediate_;
@@ -109,15 +109,15 @@ typedef void (TObject::*paragraphFunc)(u32, void const*, u32);
 
 class TObject : public stb::TObject {
 public:
-    /* 80286864 */ TObject(JStudio::stb::data::TParse_TBlock_object const&, JStudio::TAdaptor*);
-    /* 80286734 */ void forward_value(u32);
+    TObject(JStudio::stb::data::TParse_TBlock_object const&, JStudio::TAdaptor*);
+    void forward_value(u32);
 
-    /* 802866B0 */ virtual ~TObject() = 0;
-    /* 8028679C */ virtual void do_begin();
-    /* 802867D4 */ virtual void do_end();
+    virtual ~TObject() = 0;
+    virtual void do_begin();
+    virtual void do_end();
     virtual void do_paragraph(u32, void const*, u32) = 0;
-    /* 8028680C */ virtual void do_wait(u32);
-    /* 8028682C */ virtual void do_data(void const*, u32, void const*, u32);
+    virtual void do_wait(u32);
+    virtual void do_data(void const*, u32, void const*, u32);
 
     TAdaptor* getAdaptor() const { return mpAdaptor; }
     TControl* getControl() { return (TControl*)stb::TObject::getControl(); }
@@ -155,34 +155,34 @@ struct TAdaptor {
         pValue_ = param_1;
         uvv_ = param_2;
     }
-    /* 80285FD0 */ virtual ~TAdaptor() = 0;
-    /* 80286018 */ virtual void adaptor_do_prepare();
-    /* 8028601C */ virtual void adaptor_do_begin();
-    /* 80286020 */ virtual void adaptor_do_end();
-    /* 80286024 */ virtual void adaptor_do_update(u32);
-    /* 80286028 */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    virtual ~TAdaptor() = 0;
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
 
-    /* 8028602C */ void adaptor_setVariableValue(JStudio::TControl*, u32,
+    void adaptor_setVariableValue(JStudio::TControl*, u32,
                                                  JStudio::data::TEOperationData, void const*, u32);
-    /* 802860CC */ void adaptor_setVariableValue_n(JStudio::TControl*, u32 const*, u32,
+    void adaptor_setVariableValue_n(JStudio::TControl*, u32 const*, u32,
                                                    JStudio::data::TEOperationData, void const*,
                                                    u32);
-    /* 802861C0 */ void
+    void
     adaptor_setVariableValue_immediate(JStudio::TAdaptor::TSetVariableValue_immediate const*);
-    /* 80286204 */ void adaptor_setVariableValue_Vec(u32 const*, Vec const&);
-    /* 80286274 */ void adaptor_getVariableValue_Vec(Vec*, u32 const*) const;
-    /* 802862AC */ void adaptor_setVariableValue_GXColor(u32 const*, GXColor const&);
-    /* 8028638C */ void adaptor_getVariableValue_GXColor(GXColor*, u32 const*) const;
-    /* 802864D8 */ void adaptor_updateVariableValue(JStudio::TControl*, u32);
-    /* 8028656C */ static void adaptor_setVariableValue_VOID_(JStudio::TAdaptor*, JStudio::TControl*, u32,
+    void adaptor_setVariableValue_Vec(u32 const*, Vec const&);
+    void adaptor_getVariableValue_Vec(Vec*, u32 const*) const;
+    void adaptor_setVariableValue_GXColor(u32 const*, GXColor const&);
+    void adaptor_getVariableValue_GXColor(GXColor*, u32 const*) const;
+    void adaptor_updateVariableValue(JStudio::TControl*, u32);
+    static void adaptor_setVariableValue_VOID_(JStudio::TAdaptor*, JStudio::TControl*, u32,
                                                        void const*, u32);
-    /* 80286584 */ static void adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor*, JStudio::TControl*,
+    static void adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor*, JStudio::TControl*,
                                                             u32, void const*, u32);
-    /* 802865B0 */ static void adaptor_setVariableValue_TIME_(JStudio::TAdaptor*, JStudio::TControl*, u32,
+    static void adaptor_setVariableValue_TIME_(JStudio::TAdaptor*, JStudio::TControl*, u32,
                                                        void const*, u32);
-    /* 802865DC */ static void adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor*, JStudio::TControl*,
+    static void adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor*, JStudio::TControl*,
                                                            u32, void const*, u32);
-    /* 80286648 */ static void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*,
+    static void adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor*, JStudio::TControl*,
                                                             u32, void const*, u32);
 
     const char* adaptor_getID_string() const;
@@ -229,7 +229,7 @@ struct TAdaptor_actor : public TAdaptor {
         , mValue()
     {
     }
-    /* 802868B0 */ virtual ~TAdaptor_actor() = 0;
+    virtual ~TAdaptor_actor() = 0;
     virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32)                 = 0;
     virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32)            = 0;
     virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, const void*, u32)          = 0;
@@ -251,15 +251,15 @@ struct TAdaptor_actor : public TAdaptor {
 };  // Size: 0x128
 
 struct TObject_actor : public TObject {
-    /* 80286910 */ TObject_actor(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_actor(JStudio::stb::data::TParse_TBlock_object const&,
                                  JStudio::TAdaptor_actor*);
     
-    /* 8028694C */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_ambientLight : public TAdaptor {
     TAdaptor_ambientLight() : TAdaptor(mValue, 4) {}
-    /* 80286C9C */ virtual ~TAdaptor_ambientLight()  = 0;
+    virtual ~TAdaptor_ambientLight()  = 0;
 
     /* 0x10 */ TVariableValue mValue[4];
 
@@ -268,10 +268,10 @@ struct TAdaptor_ambientLight : public TAdaptor {
 };
 
 struct TObject_ambientLight : public TObject {
-    /* 80286CFC */ TObject_ambientLight(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_ambientLight(JStudio::stb::data::TParse_TBlock_object const&,
                                         JStudio::TAdaptor_ambientLight*);
     
-    /* 80286D38 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_camera : public TAdaptor {
@@ -283,7 +283,7 @@ struct TAdaptor_camera : public TAdaptor {
     };
 
     TAdaptor_camera() : TAdaptor(mValue, 12) {}
-    /* 80286E1C */ virtual ~TAdaptor_camera() = 0;
+    virtual ~TAdaptor_camera() = 0;
 
     virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, const void*, u32)               = 0;
     virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, const void*, u32)          = 0;
@@ -301,10 +301,10 @@ struct TAdaptor_camera : public TAdaptor {
 };
 
 struct TObject_camera : public TObject {
-    /* 80286E7C */ TObject_camera(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_camera(JStudio::stb::data::TParse_TBlock_object const&,
                                   JStudio::TAdaptor_camera*);
     
-    /* 80286EB8 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_fog : public TAdaptor {
@@ -314,7 +314,7 @@ struct TAdaptor_fog : public TAdaptor {
     };
 
     TAdaptor_fog() : TAdaptor(mValue, 6) {}
-    /* 8028717C */ virtual ~TAdaptor_fog() = 0;
+    virtual ~TAdaptor_fog() = 0;
 
     /* 0x10 */ TVariableValue mValue[6];
 
@@ -324,10 +324,10 @@ struct TAdaptor_fog : public TAdaptor {
 };
 
 struct TObject_fog : public TObject {
-    /* 802871DC */ TObject_fog(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_fog(JStudio::stb::data::TParse_TBlock_object const&,
                                JStudio::TAdaptor_fog*);
     
-    /* 80287218 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_light : public TAdaptor {
@@ -341,7 +341,7 @@ struct TAdaptor_light : public TAdaptor {
     };
 
     TAdaptor_light() : TAdaptor(mValue, 13) {}
-    /* 80287308 */ virtual ~TAdaptor_light() = 0;
+    virtual ~TAdaptor_light() = 0;
     virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, const void*, u32) = 0;
     virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, const void*, u32) = 0;
 
@@ -355,28 +355,28 @@ struct TAdaptor_light : public TAdaptor {
 };
 
 struct TObject_light : public TObject {
-    /* 80287368 */ TObject_light(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_light(JStudio::stb::data::TParse_TBlock_object const&,
                                  JStudio::TAdaptor_light*);
     
-    /* 802873A4 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_message : public TAdaptor {
     TAdaptor_message() : TAdaptor(NULL, 0) {}
-    /* 802875E0 */ virtual ~TAdaptor_message() = 0;
+    virtual ~TAdaptor_message() = 0;
     virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32) = 0;
 };
 
 struct TObject_message : public TObject {
-    /* 80287640 */ TObject_message(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_message(JStudio::stb::data::TParse_TBlock_object const&,
                                    JStudio::TAdaptor_message*);
     
-    /* 8028767C */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_particle : public TAdaptor {
     TAdaptor_particle() : TAdaptor(mValue, 20) {}
-    /* 8028770C */ virtual ~TAdaptor_particle() = 0;
+    virtual ~TAdaptor_particle() = 0;
 
     virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, const void*, u32) = 0;
     virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32) = 0;
@@ -402,10 +402,10 @@ struct TAdaptor_particle : public TAdaptor {
 };
 
 struct TObject_particle : public TObject {
-    /* 8028776C */ TObject_particle(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_particle(JStudio::stb::data::TParse_TBlock_object const&,
                                     JStudio::TAdaptor_particle*);
     
-    /* 802877A8 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 struct TAdaptor_sound : public TAdaptor {
@@ -419,7 +419,7 @@ struct TAdaptor_sound : public TAdaptor {
     };
 
     TAdaptor_sound() : TAdaptor(mValue, 13) {}
-    /* 80287B3C */ virtual ~TAdaptor_sound() = 0;
+    virtual ~TAdaptor_sound() = 0;
 
     virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, const void*, u32) = 0;
     virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, const void*, u32) = 0;
@@ -440,10 +440,10 @@ struct TAdaptor_sound : public TAdaptor {
 };  // Size: 0x114
 
 struct TObject_sound : public TObject {
-    /* 80287B9C */ TObject_sound(JStudio::stb::data::TParse_TBlock_object const&,
+    TObject_sound(JStudio::stb::data::TParse_TBlock_object const&,
                                  JStudio::TAdaptor_sound*);
     
-    /* 80287BD8 */ virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_paragraph(u32, void const*, u32);
 };
 
 };  // namespace JStudio
diff --git a/include/JSystem/JStudio/JStudio/object-id.h b/include/JSystem/JStudio/JStudio/object-id.h
index 5803a872ec..470667030d 100644
--- a/include/JSystem/JStudio/JStudio/object-id.h
+++ b/include/JSystem/JStudio/JStudio/object-id.h
@@ -11,7 +11,7 @@ struct TIDData {
 public:
     TIDData(const void* id, u32 id_size) : mID(id), mID_size(id_size) {}
 
-    /* 80288988 */ static bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&);
+    static bool isEqual(JStudio::object::TIDData const&, JStudio::object::TIDData const&);
     inline const u8* getID() const { return (const u8*)mID; }
 	inline u32 getIDSize() const { return mID_size; }
 
diff --git a/include/JSystem/JStudio/JStudio/stb-data-parse.h b/include/JSystem/JStudio/JStudio/stb-data-parse.h
index 57ba3378d8..80c94eeebf 100644
--- a/include/JSystem/JStudio/JStudio/stb-data-parse.h
+++ b/include/JSystem/JStudio/JStudio/stb-data-parse.h
@@ -46,7 +46,7 @@ public:
     };
 
     TParse_TSequence(const void* content) : TParseData_aligned<4>(content) {}
-    /* 802899BC */ void getData(TData*) const;
+    void getData(TData*) const;
 
     const void* get() const { return getRaw(); }
     u32 get_head() const { return *(u32*)get(); }
@@ -62,7 +62,7 @@ public:
     };
 
     TParse_TParagraph(const void* content) : TParseData_aligned<4>(content) {}
-    /* 80289A08 */ void getData(TData*) const;
+    void getData(TData*) const;
 };
 
 struct TParse_TParagraph_data : public TParseData {
@@ -75,7 +75,7 @@ struct TParse_TParagraph_data : public TParseData {
     };
 
     TParse_TParagraph_data(const void* content) : TParseData(content) {}
-    /* 80289A80 */ void getData(TData* pData) const;
+    void getData(TData* pData) const;
 };
 
 // Parses a TObject ("demo object")
diff --git a/include/JSystem/JStudio/JStudio/stb-data.h b/include/JSystem/JStudio/JStudio/stb-data.h
index 178154d70c..fe85eb671c 100644
--- a/include/JSystem/JStudio/JStudio/stb-data.h
+++ b/include/JSystem/JStudio/JStudio/stb-data.h
@@ -21,7 +21,7 @@ const int BLOCK_NONE = -1;
 
 // Used to expand a signed 24 int to a signed 32 int
 const u32 gu32Mask_TSequence_value_signExpansion = 0xFF000000;
-extern u32 ga4cSignature;  // 'STB/0'
+extern const u32 ga4cSignature;  // 'STB/0'
 extern const s32 gauDataSize_TEParagraph_data[8];
 
 inline void toString_block(char* a5c, u32 arg1) {
diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h
index 8b5b80f69c..72f67c0e19 100644
--- a/include/JSystem/JStudio/JStudio/stb.h
+++ b/include/JSystem/JStudio/JStudio/stb.h
@@ -14,13 +14,13 @@ class TControl;
 
 class TParse : public TParse_header_block {
 public:
-    /* 80289640 */ TParse(TControl*);
-    /* 80289660 */ virtual ~TParse();
-    /* 802896C0 */ virtual bool parseHeader_next(void const**, u32*, u32);
-    /* 8028978C */ virtual bool parseBlock_next(void const**, u32*, u32);
-    /* 802897E0 */ virtual bool parseHeader(data::TParse_THeader const&, u32);
-    /* 802897E8 */ virtual bool parseBlock_block(data::TParse_TBlock const&, u32);
-    /* 80289820 */ virtual bool parseBlock_object(data::TParse_TBlock_object const&, u32);
+    TParse(TControl*);
+    virtual ~TParse();
+    virtual bool parseHeader_next(void const**, u32*, u32);
+    virtual bool parseBlock_next(void const**, u32*, u32);
+    virtual bool parseHeader(data::TParse_THeader const&, u32);
+    virtual bool parseBlock_block(data::TParse_TBlock const&, u32);
+    virtual bool parseBlock_object(data::TParse_TBlock_object const&, u32);
 
     TControl* getControl() const { return pControl; }
 
@@ -38,20 +38,20 @@ public:
         /* 0x8 */ STATUS_INACTIVE = 1 << 3,
     };
 
-    /* 80288AC0 */ TObject(data::TParse_TBlock_object const&);
-    /* 80288A78 */ explicit TObject(u32, void const*, u32);
-    /* 80288B30 */ virtual ~TObject();
+    TObject(data::TParse_TBlock_object const&);
+    explicit TObject(u32, void const*, u32);
+    virtual ~TObject();
 
-    /* 80288B78 */ void setFlag_operation(u8, int);
-    /* 80288BD0 */ void reset(void const*);
-    /* 80288BE8 */ bool forward(u32);
-    /* 80288E18 */ virtual void do_begin();
-    /* 80288E1C */ virtual void do_end();
-    /* 80288E20 */ virtual void do_paragraph(u32, void const*, u32);
-    /* 80288E24 */ virtual void do_wait(u32);
-    /* 80288E28 */ virtual void do_data(void const*, u32, void const*, u32);
-    /* 80288E2C */ void process_sequence_();
-    /* 80288F80 */ void process_paragraph_reserved_(u32, void const*, u32);
+    void setFlag_operation(u8, int);
+    void reset(void const*);
+    bool forward(u32);
+    virtual void do_begin();
+    virtual void do_end();
+    virtual void do_paragraph(u32, void const*, u32);
+    virtual void do_wait(u32);
+    virtual void do_data(void const*, u32, void const*, u32);
+    void process_sequence_();
+    void process_paragraph_reserved_(u32, void const*, u32);
 
     const char* toString_status(int status);
 
@@ -110,29 +110,29 @@ class TFactory {
 public:
     TFactory() {}
 
-    /* 802895B4 */ virtual ~TFactory();
-    /* 802895FC */ virtual JStudio::TObject* create(data::TParse_TBlock_object const&);
-    /* 80289604 */ virtual void destroy(TObject*);
+    virtual ~TFactory();
+    virtual JStudio::TObject* create(data::TParse_TBlock_object const&);
+    virtual void destroy(TObject*);
 };
 
 class TObject_control : public TObject {
 public:
-    /* 80289068 */ TObject_control(void const*, u32);
+    TObject_control(void const*, u32);
 };
 
 // Manages TObjects
 class TControl {
 public:
-    /* 802890B4 */ TControl();
-    /* 80289194 */ virtual ~TControl();
+    TControl();
+    virtual ~TControl();
 
-    /* 80289228 */ void appendObject(TObject*);
-    /* 80289278 */ void removeObject(TObject*);
-    /* 802892B0 */ void destroyObject(TObject*);
-    /* 80289300 */ void destroyObject_all();
-    /* 80289364 */ TObject* getObject(void const*, u32);
-    /* 80289404 */ void reset();
-    /* 802894B4 */ bool forward(u32);
+    void appendObject(TObject*);
+    void removeObject(TObject*);
+    void destroyObject(TObject*);
+    void destroyObject_all();
+    TObject* getObject(void const*, u32);
+    void reset();
+    bool forward(u32);
 
     void setStatus_(u32 status) { mStatus = status; }
     void resetStatus_() { setStatus_(0); }
diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h
index 8753338dee..371aaf437f 100644
--- a/include/JSystem/JStudio/JStudio_JAudio2/control.h
+++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h
@@ -18,10 +18,10 @@ struct TCreateObject : public JStudio::TCreateObject {
         JUT_ASSERT(45, pJAISoundStarter_!=NULL);
     }
 
-    /* 8028D550 */ virtual ~TCreateObject();
-    /* 8028D5B0 */ virtual bool create(JStudio::TObject**,
+    virtual ~TCreateObject();
+    virtual bool create(JStudio::TObject**,
                                        JStudio::stb::data::TParse_TBlock_object const&);
-    /* 8028D624 */ static JStudio::TObject*
+    static JStudio::TObject*
     createObject_JAI_SOUND_(JStudio::stb::data::TParse_TBlock_object const&,
                             JStudio_JAudio2::TCreateObject*);
     JAISoundStarter* get_pJAISoundStarter_() { return pJAISoundStarter_; }
@@ -40,38 +40,38 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound {
     struct TVVOSetValue_ : public JStudio::TVariableValue::TOutput {
         TVVOSetValue_(TEVariableValue param_1, TVVOSoundSetFunc param_2)
             : field_0x04(param_1), field_0x08(param_2) {}
-        /* 8028DECC */ virtual void operator()(f32, JStudio::TAdaptor*) const;
-        /* 8028E094 */ virtual ~TVVOSetValue_() {}
+        virtual void operator()(f32, JStudio::TAdaptor*) const;
+        virtual ~TVVOSetValue_() {}
 
         /* 0x04 */ TEVariableValue field_0x04;
         /* 0x08 */ TVVOSoundSetFunc field_0x08;
     };
 
-    /* 8028D828 */ TAdaptor_sound(JStudio_JAudio2::TCreateObject*);
-    /* 8028DF04 */ void prepareSound_();
-    /* 8028DFA4 */ void beginSound_fadeIn_();
-    /* 8028E054 */ void endSound_fadeOut_(u32);
+    TAdaptor_sound(JStudio_JAudio2::TCreateObject*);
+    void prepareSound_();
+    void beginSound_fadeIn_();
+    void endSound_fadeOut_(u32);
 
-    /* 8028D8F4 */ virtual ~TAdaptor_sound();
-    /* 8028D9A4 */ virtual void adaptor_do_prepare();
-    /* 8028DA74 */ virtual void adaptor_do_end();
-    /* 8028DA78 */ virtual void adaptor_do_update(u32);
-    /* 8028DC20 */ virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DC54 */ virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DC88 */ virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
+    virtual ~TAdaptor_sound();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_SOUND(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028DCD0 */ virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DD00 */ virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
                                                 u32);
-    /* 8028DD48 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DDB4 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
                                                 u32);
-    /* 8028DE34 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028DE50 */ virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DE6C */ virtual void adaptor_do_CONTINUOUS(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DE88 */ virtual void adaptor_do_LOCATED(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028DEB0 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_CONTINUOUS(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_LOCATED(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
                                                     u32);
 
     void beginSound_fadeIn_(u32 param_1) {
diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/include/JSystem/JStudio/JStudio_JParticle/control.h
index 26231aadcf..4dd6433d08 100644
--- a/include/JSystem/JStudio/JStudio_JParticle/control.h
+++ b/include/JSystem/JStudio/JStudio_JParticle/control.h
@@ -17,13 +17,13 @@ struct TCreateObject : public JStudio::TCreateObject {
         JUT_ASSERT(48, pJPAEmitterManager_!=NULL);
     }
 
-    /* 8028E3A0 */ virtual ~TCreateObject();
-    /* 8028E400 */ virtual bool create(JStudio::TObject**,
+    virtual ~TCreateObject();
+    virtual bool create(JStudio::TObject**,
                                        JStudio::stb::data::TParse_TBlock_object const&);
-    /* 8028E474 */ virtual JPABaseEmitter* emitter_create(u32);
-    /* 8028E4E4 */ virtual void emitter_destroy(JPABaseEmitter*);
+    virtual JPABaseEmitter* emitter_create(u32);
+    virtual void emitter_destroy(JPABaseEmitter*);
 
-    /* 8028E508 */ static JStudio::TObject*
+    static JStudio::TObject*
     createObject_JPA_PARTICLE_(JStudio::stb::data::TParse_TBlock_object const&,
                                JStudio_JParticle::TCreateObject*);
 
@@ -44,10 +44,10 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle {
             pOld = NULL;
             JUT_ASSERT(113, pThis_!=NULL);
         }
-        /* 8028ECC0 */ virtual void execute(JPABaseEmitter*);
-        /* 8028F060 */ virtual void executeAfter(JPABaseEmitter*);
-        /* 8028F098 */ virtual void draw(JPABaseEmitter*);
-        /* 8028F0D0 */ virtual void drawAfter(JPABaseEmitter*);
+        virtual void execute(JPABaseEmitter*);
+        virtual void executeAfter(JPABaseEmitter*);
+        virtual void draw(JPABaseEmitter*);
+        virtual void drawAfter(JPABaseEmitter*);
 
         JPAEmitterCallBack* getOld() { return pOld; }
         void setOld(JPAEmitterCallBack* cb) { pOld = cb; }
@@ -67,30 +67,30 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle {
         /* 0x0 */ JPABaseEmitter* pJPAEmitter_;
     };
 
-    /* 8028E60C */ TAdaptor_particle(JStudio_JParticle::TCreateObject*);
-    /* 8028F108 */ void beginParticle_fadeIn_();
-    /* 8028F1C0 */ void endParticle_fadeOut_(u32);
+    TAdaptor_particle(JStudio_JParticle::TCreateObject*);
+    void beginParticle_fadeIn_();
+    void endParticle_fadeOut_(u32);
 
-    /* 8028E760 */ virtual ~TAdaptor_particle();
-    /* 8028E850 */ virtual void adaptor_do_prepare();
-    /* 8028E97C */ virtual void adaptor_do_end();
-    /* 8028E980 */ virtual void adaptor_do_update(u32);
-    /* 8028EA68 */ virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028EA7C */ virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028EAB0 */ virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
+    virtual ~TAdaptor_particle();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_PARTICLE(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_BEGIN(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_BEGIN_FADE_IN(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028EAF8 */ virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028EB24 */ virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_END(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_END_FADE_OUT(JStudio::data::TEOperationData, void const*,
                                                 u32);
-    /* 8028EB6C */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028EBD8 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
                                                 u32);
-    /* 8028EC58 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028EC74 */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028EC88 */ virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028ECA4 */ virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_REPEAT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData, void const*,
                                                     u32);
     
     static bool state_isFade_(u8 param_1) {
diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h
index 80ec31af0f..9b813b5695 100644
--- a/include/JSystem/JStudio/JStudio_JStage/control.h
+++ b/include/JSystem/JStudio/JStudio_JStage/control.h
@@ -20,8 +20,8 @@ struct TCreateObject : public JStudio::TCreateObject {
         JUT_ASSERT(42, pJSGSystem_!=NULL);
     }
 
-    /* 80289B00 */ virtual ~TCreateObject();
-    /* 80289B60 */ virtual bool create(JStudio::TObject**,
+    virtual ~TCreateObject();
+    virtual bool create(JStudio::TObject**,
                                        JStudio::stb::data::TParse_TBlock_object const&);
 
     /* 0x0C */ const JStage::TSystem* pJSGSystem_;
@@ -30,10 +30,10 @@ struct TCreateObject : public JStudio::TCreateObject {
 struct TAdaptor_object_ {
     TAdaptor_object_(JStage::TSystem const*param_2, JStage::TObject *param_3) :
         pJSGSystem_(param_2), pJSGObject_(param_3) {}
-    /* 8028A470 */ void adaptor_object_data_(void const*, u32, void const*, u32);
-    /* 8028A4BC */ JStage::TObject* adaptor_object_findJSGObject_(char const*);
-    /* 8028A50C */ s32 adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*);
-    /* 8028A550 */ void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, u32);
+    void adaptor_object_data_(void const*, u32, void const*, u32);
+    JStage::TObject* adaptor_object_findJSGObject_(char const*);
+    s32 adaptor_object_findJSGObjectNode_(JStage::TObject const*, char const*);
+    void adaptor_object_ENABLE_(JStudio::data::TEOperationData, void const*, u32);
 
     void adaptor_object_begin_() { pJSGObject_->JSGFEnableFlag(1); }
     void adaptor_object_end_() { pJSGObject_->JSGFDisableFlag(1); }
@@ -71,8 +71,8 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
             mMaxGetter = param_5;
         }
 
-        /* 8028B064 */ virtual void operator()(f32, JStudio::TAdaptor*) const;
-        /* 8028B138 */ inline virtual ~TVVOutput_ANIMATION_FRAME_();
+        virtual void operator()(f32, JStudio::TAdaptor*) const;
+        inline virtual ~TVVOutput_ANIMATION_FRAME_();
         
         void adaptor_setOutput_(TAdaptor* adaptor) const {
             adaptor->adaptor_referVariableValue(mValueIndex)->setOutput(this);
@@ -92,39 +92,39 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
         /* 0x24 */ MaxGetter mMaxGetter;
     };
 
-    /* 8028A5F0 */ TAdaptor_actor(JStage::TSystem const*, JStage::TActor*);
+    TAdaptor_actor(JStage::TSystem const*, JStage::TActor*);
 
-    /* 8028A6B4 */ virtual ~TAdaptor_actor();
-    /* 8028A728 */ virtual void adaptor_do_prepare();
-    /* 8028A7B4 */ virtual void adaptor_do_begin();
-    /* 8028A8D8 */ virtual void adaptor_do_end();
-    /* 8028A92C */ virtual void adaptor_do_update(u32);
-    /* 8028A974 */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
-    /* 8028AAC8 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028AB0C */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
+    virtual ~TAdaptor_actor();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*,
                                                 u32);
-    /* 8028AB68 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028ABF0 */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028AC04 */ virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028AC48 */ virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_RELATION(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_RELATION_NODE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028ACA4 */ virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_RELATION_ENABLE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028A998 */ virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028A9F0 */ virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028AA48 */ virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_SHAPE(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_ANIMATION(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData, void const*,
                                                     u32);
-    /* 8028AA5C */ virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData,
+    virtual void adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData,
                                                         void const*, u32);
-    /* 8028AAB4 */ virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData,
+    virtual void adaptor_do_TEXTURE_ANIMATION_MODE(JStudio::data::TEOperationData,
                                                             void const*, u32);
     
-    /* 8028ACFC */ void setJSG_ID_(void (JStage::TActor::*)(u32),
+    void setJSG_ID_(void (JStage::TActor::*)(u32),
                                     JStudio::data::TEOperationData, void const*, u32);
-    /* 8028AD38 */ void setJSG_SRT_(JStudio::TControl const*);
-    /* 8028AECC */ void getJSG_SRT_(JStudio::TControl const*);
+    void setJSG_SRT_(JStudio::TControl const*);
+    void getJSG_SRT_(JStudio::TControl const*);
 
     JStage::TActor* get_pJSG_() { return (JStage::TActor*) pJSGObject_; }
 
@@ -143,14 +143,14 @@ struct TAdaptor_actor : public JStudio::TAdaptor_actor, public JStudio_JStage::T
 
 struct TAdaptor_ambientLight : public JStudio::TAdaptor_ambientLight, public TAdaptor_object_ {
     typedef JStudio::TObject_ambientLight ObjectType;
-    /* 8028B610 */ TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*);
+    TAdaptor_ambientLight(JStage::TSystem const*, JStage::TAmbientLight*);
 
-    /* 8028B6AC */ virtual ~TAdaptor_ambientLight();
-    /* 8028B720 */ virtual void adaptor_do_prepare();
-    /* 8028B724 */ virtual void adaptor_do_begin();
-    /* 8028B7B0 */ virtual void adaptor_do_end();
-    /* 8028B804 */ virtual void adaptor_do_update(u32);
-    /* 8028B87C */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    virtual ~TAdaptor_ambientLight();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
 
     JStage::TAmbientLight* get_pJSG_() { return (JStage::TAmbientLight*)pJSGObject_; }
 };
@@ -159,28 +159,28 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object
     typedef JStudio::TObject_camera ObjectType;
     typedef TVariableValueOutput_object_<TAdaptor_camera, JStage::TCamera> TVVOutput;
 
-    /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*);
-    /* 8028B960 */ virtual ~TAdaptor_camera();
-    /* 8028B9D4 */ virtual void adaptor_do_prepare();
-    /* 8028BA1C */ virtual void adaptor_do_begin();
-    /* 8028BAF8 */ virtual void adaptor_do_end();
-    /* 8028BB4C */ virtual void adaptor_do_update(u32);
-    /* 8028BBAC */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
-    /* 8028BBD0 */ virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028BC14 */ virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028BC70 */ virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028BCEC */ virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
+    TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*);
+    virtual ~TAdaptor_camera();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    virtual void adaptor_do_PARENT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_NODE(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData, void const*,
                                                    u32);
-    /* 8028BD00 */ virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028BD44 */ virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_TARGET_PARENT(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_TARGET_PARENT_NODE(JStudio::data::TEOperationData, void const*,
                                                       u32);
-    /* 8028BDA0 */ virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
+    virtual void adaptor_do_TARGET_PARENT_ENABLE(JStudio::data::TEOperationData, void const*,
                                                         u32);
 
-    /* 8028BDBC */ void setJSG_position_(JStudio::TControl const*);
-    /* 8028BEB8 */ void getJSG_position_(JStudio::TControl const*);
-    /* 8028BFBC */ void setJSG_targetPosition_(JStudio::TControl const*);
-    /* 8028C09C */ void getJSG_targetPosition_(JStudio::TControl const*);
+    void setJSG_position_(JStudio::TControl const*);
+    void getJSG_position_(JStudio::TControl const*);
+    void setJSG_targetPosition_(JStudio::TControl const*);
+    void getJSG_targetPosition_(JStudio::TControl const*);
 
     JStage::TCamera* get_pJSG_() { return (JStage::TCamera*)pJSGObject_; }
 
@@ -198,13 +198,13 @@ struct TAdaptor_camera : public JStudio::TAdaptor_camera, public TAdaptor_object
 struct TAdaptor_fog : public JStudio::TAdaptor_fog, public TAdaptor_object_ {
     typedef JStudio::TObject_fog ObjectType;
 
-    /* 8028C574 */ TAdaptor_fog(JStage::TSystem const*, JStage::TFog*);
-    /* 8028C610 */ virtual ~TAdaptor_fog();
-    /* 8028C684 */ virtual void adaptor_do_prepare();
-    /* 8028C6CC */ virtual void adaptor_do_begin();
-    /* 8028C7B4 */ virtual void adaptor_do_end();
-    /* 8028C808 */ virtual void adaptor_do_update(u32);
-    /* 8028C880 */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    TAdaptor_fog(JStage::TSystem const*, JStage::TFog*);
+    virtual ~TAdaptor_fog();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
 
     JStage::TFog* get_pJSG_() { return (JStage::TFog*)pJSGObject_; }
 
@@ -255,8 +255,8 @@ struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_
             field_0x8 = param_2;
         }
 
-        /* 8028D24C */ virtual void operator()(f32, JStudio::TAdaptor*) const;
-        /* 8028D258 */ virtual ~TVVOutput_direction_() {}
+        virtual void operator()(f32, JStudio::TAdaptor*) const;
+        virtual ~TVVOutput_direction_() {}
 
         void adaptor_setOutput_(TAdaptor* adaptor) {
             adaptor->adaptor_referVariableValue(field_0x4)->setOutput(this);
@@ -268,15 +268,15 @@ struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_
         TEDirection_ field_0x8;
     };
 
-    /* 8028CB50 */ TAdaptor_light(JStage::TSystem const*, JStage::TLight*);
-    /* 8028CBF4 */ virtual ~TAdaptor_light();
-    /* 8028CC68 */ virtual void adaptor_do_prepare();
-    /* 8028CCB0 */ virtual void adaptor_do_begin();
-    /* 8028CF68 */ virtual void adaptor_do_end();
-    /* 8028CFBC */ virtual void adaptor_do_update(u32);
-    /* 8028D18C */ virtual void adaptor_do_data(void const*, u32, void const*, u32);
-    /* 8028D228 */ virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, void const*, u32);
-    /* 8028D1B0 */ virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, void const*, u32);
+    TAdaptor_light(JStage::TSystem const*, JStage::TLight*);
+    virtual ~TAdaptor_light();
+    virtual void adaptor_do_prepare();
+    virtual void adaptor_do_begin();
+    virtual void adaptor_do_end();
+    virtual void adaptor_do_update(u32);
+    virtual void adaptor_do_data(void const*, u32, void const*, u32);
+    virtual void adaptor_do_ENABLE(JStudio::data::TEOperationData, void const*, u32);
+    virtual void adaptor_do_FACULTY(JStudio::data::TEOperationData, void const*, u32);
 
     JStage::TLight* get_pJSG_() { return (JStage::TLight*)pJSGObject_; }
 
@@ -285,11 +285,11 @@ struct TAdaptor_light : public JStudio::TAdaptor_light, public TAdaptor_object_
     static TVVOutput_direction_ saoVVOutput_direction_[6];
 };
 
-/* 8028A1F8 */ bool
+bool
     transform_toGlobalFromLocal(f32 (*)[4],
                                 JStudio::TControl::TTransform_translation_rotation_scaling const&,
                                 JStage::TObject const*, u32);
-/* 8028A290 */ bool transform_toGlobalFromLocal(f32 (*)[4],
+bool transform_toGlobalFromLocal(f32 (*)[4],
                                                 JStudio::TControl::TTransform_position const&,
                                                 JStage::TObject const*, u32);
 
@@ -304,11 +304,11 @@ inline bool transform_toGlobalFromLocal(JStudio::TControl::TTransform_position*
     JStudio::math::getFromTransformation_T(param_1, afStack_38);
     return true;
 }
-/* 8028A328 */ bool
+bool
     transform_toLocalFromGlobal(f32 (*)[4],
                                 JStudio::TControl::TTransform_translation_rotation_scaling const&,
                                 JStage::TObject const*, u32);
-/* 8028A3CC */ bool transform_toLocalFromGlobal(f32 (*)[4],
+bool transform_toLocalFromGlobal(f32 (*)[4],
                                                 JStudio::TControl::TTransform_position const&,
                                                 JStage::TObject const*, u32);
 
diff --git a/include/JSystem/JSupport/JSUFileStream.h b/include/JSystem/JSupport/JSUFileStream.h
index 08bdf64099..bd13d8f51c 100644
--- a/include/JSystem/JSupport/JSUFileStream.h
+++ b/include/JSystem/JSupport/JSUFileStream.h
@@ -12,11 +12,11 @@ class JKRFile;
 class JSUFileInputStream : public JSURandomInputStream {
 public:
     // TODO: fix return values
-    /* 802DC638 */ JSUFileInputStream(JKRFile*);
-    /* 802DC67C */ u32 readData(void*, s32);
-    /* 802DC74C */ s32 seekPos(s32, JSUStreamSeekFrom);
-    /* 802DC82C */ s32 getLength() const;
-    /* 802DC85C */ s32 getPosition() const;
+    JSUFileInputStream(JKRFile*);
+    u32 readData(void*, s32);
+    s32 seekPos(s32, JSUStreamSeekFrom);
+    s32 getLength() const;
+    s32 getPosition() const;
 
 private:
     /* 0x08 */ JKRFile* mFile;
diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h
index dc35d5ab91..2763e7f5aa 100644
--- a/include/JSystem/JSupport/JSUInputStream.h
+++ b/include/JSystem/JSupport/JSUInputStream.h
@@ -94,7 +94,7 @@ public:
     }
 
     // TODO: return value probably wrong
-    /* 802DC298 */ s32 read(void*, s32);
+    s32 read(void*, s32);
     char* read(char*);
 };  // Size = 0x8
 
diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h
index 51b6fb601a..d5da78bfff 100644
--- a/include/JSystem/JSupport/JSUMemoryStream.h
+++ b/include/JSystem/JSupport/JSUMemoryStream.h
@@ -12,12 +12,12 @@ class JSUMemoryInputStream : public JSURandomInputStream {
 public:
     JSUMemoryInputStream(const void* res, s32 size) { setBuffer(res, size); }
 
-    /* 802552B8 */ virtual ~JSUMemoryInputStream() {}
-    /* 802DC520 */ void setBuffer(void const*, s32);
-    /* 802DC534 */ u32 readData(void*, s32);
-    /* 802DC5AC */ s32 seekPos(s32, JSUStreamSeekFrom);
-    /* 802DC628 */ s32 getLength() const;
-    /* 802DC630 */ s32 getPosition() const;
+    virtual ~JSUMemoryInputStream() {}
+    void setBuffer(void const*, s32);
+    u32 readData(void*, s32);
+    s32 seekPos(s32, JSUStreamSeekFrom);
+    s32 getLength() const;
+    s32 getPosition() const;
 
     void* getPointer() const {
         return (u8*)mBuffer + mPosition;
diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream.h
index 3ba5b3cdb2..52f5448b7b 100644
--- a/include/JSystem/JSupport/JSURandomInputStream.h
+++ b/include/JSystem/JSupport/JSURandomInputStream.h
@@ -22,9 +22,9 @@ public:
     /* vt[8] */ virtual s32 seekPos(s32, JSUStreamSeekFrom) = 0;
 
     // TODO: fix return types
-    /* 802DC370 */ s32 align(s32);
-    /* 802DC458 */ s32 peek(void*, s32);
-    /* 802DC4DC */ s32 seek(s32, JSUStreamSeekFrom);
+    s32 align(s32);
+    s32 peek(void*, s32);
+    s32 seek(s32, JSUStreamSeekFrom);
 };  // Size = 0x8
 
 #endif
diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h
index 6fa2d62d5d..503a2a73e7 100644
--- a/include/JSystem/JUtility/JUTAssert.h
+++ b/include/JSystem/JUtility/JUTAssert.h
@@ -49,12 +49,12 @@
 #endif
 
 namespace JUTAssertion {
-    /* 802E495C */ void create();
-    /* 802E4960 */ u32 flush_subroutine();
-    /* 802E499C */ void flushMessage();
-    /* 802E4A54 */ void flushMessage_dbPrint();
-    /* 802E4C34 */ void setVisible(bool);
-    /* 802E4C3C */ void setMessageCount(int);
+    void create();
+    u32 flush_subroutine();
+    void flushMessage();
+    void flushMessage_dbPrint();
+    void setVisible(bool);
+    void setMessageCount(int);
 
     u32 getSDevice();
     void showAssert(u32 device, const char * file, int line, const char * assertion);
diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h
index 47fa00fc8d..1e05200766 100644
--- a/include/JSystem/JUtility/JUTCacheFont.h
+++ b/include/JSystem/JUtility/JUTCacheFont.h
@@ -38,25 +38,25 @@ public:
         PAGE_TYPE_1,
     };
 
-    /* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*);
-    /* 802DD29C */ void deleteMemBlocks_CacheFont();
-    /* 802DD320 */ void initialize_state();
-    /* 802DD35C */ int getMemorySize(ResFONT const*, u16*, u32*, u16*, u32*, u16*, u32*, u32*);
-    /* 802DD4EC */ int initiate(ResFONT const*, void*, u32, JKRHeap*);
-    /* 802DD54C */ bool internal_initiate(ResFONT const*, void*, u32, JKRHeap*);
-    /* 802DD650 */ bool allocArea(void*, u32, JKRHeap*);
-    /* 802DD804 */ bool allocArray(JKRHeap*);
-    /* 802DDB0C */ TGlyphCacheInfo* determineBlankPage();
-    /* 802DDBBC */ void getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo*, JUTCacheFont::TCachePage*,
+    JUTCacheFont(ResFONT const*, u32, JKRHeap*);
+    void deleteMemBlocks_CacheFont();
+    void initialize_state();
+    int getMemorySize(ResFONT const*, u16*, u32*, u16*, u32*, u16*, u32*, u32*);
+    int initiate(ResFONT const*, void*, u32, JKRHeap*);
+    bool internal_initiate(ResFONT const*, void*, u32, JKRHeap*);
+    bool allocArea(void*, u32, JKRHeap*);
+    bool allocArray(JKRHeap*);
+    TGlyphCacheInfo* determineBlankPage();
+    void getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo*, JUTCacheFont::TCachePage*,
                                          int*, int*);
-    /* 802DDD98 */ TCachePage* loadCache_char_subroutine(int*, bool);
-    /* 802DDEE0 */ void invalidiateAllCache();
-    /* 802DDF68 */ void unlink(JUTCacheFont::TGlyphCacheInfo*);
-    /* 802DDFAC */ void prepend(JUTCacheFont::TGlyphCacheInfo*);
+    TCachePage* loadCache_char_subroutine(int*, bool);
+    void invalidiateAllCache();
+    void unlink(JUTCacheFont::TGlyphCacheInfo*);
+    void prepend(JUTCacheFont::TGlyphCacheInfo*);
 
-    /* 802DD208 */ virtual ~JUTCacheFont();
-    /* 802DDCE4 */ virtual void loadImage(int, _GXTexMapID);
-    /* 802DD8EC */ virtual void setBlock();
+    virtual ~JUTCacheFont();
+    virtual void loadImage(int, _GXTexMapID);
+    virtual void setBlock();
 
     void setPagingType(EPagingType type) { mPagingType = type; }
 
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index a1c0cf11d7..9ed5c413e7 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -25,21 +25,21 @@ public:
         /* 0x3 */ OUTPUT_OSR_AND_CONSOLE,
     };
 
-    /* 802E73E4 */ static JUTConsole* create(unsigned int, void*, u32);
-    /* 802E7354 */ static JUTConsole* create(unsigned int, unsigned int, JKRHeap*);
-    /* 802E746C */ JUTConsole(unsigned int, unsigned int, bool);
-    /* 802E75CC */ static size_t getObjectSizeFromBufferSize(unsigned int, unsigned int);
-    /* 802E75DC */ static size_t getLineFromObjectSize(u32, unsigned int);
-    /* 802E75EC */ void clear();
-    /* 802E7648 */ void doDraw(JUTConsole::EConsoleType) const;
-    /* 802E7BB8 */ void print_f(char const*, ...);
-    /* 802E7C38 */ void print(char const*);
-    /* 802E7F7C */ void dumpToTerminal(unsigned int);
-    /* 802E80A8 */ void scroll(int);
-    /* 802E8184 */ int getUsedLine() const;
-    /* 802E81A8 */ int getLineOffset() const;
+    static JUTConsole* create(unsigned int, void*, u32);
+    static JUTConsole* create(unsigned int, unsigned int, JKRHeap*);
+    JUTConsole(unsigned int, unsigned int, bool);
+    static size_t getObjectSizeFromBufferSize(unsigned int, unsigned int);
+    static size_t getLineFromObjectSize(u32, unsigned int);
+    void clear();
+    void doDraw(JUTConsole::EConsoleType) const;
+    void print_f(char const*, ...);
+    void print(char const*);
+    void dumpToTerminal(unsigned int);
+    void scroll(int);
+    int getUsedLine() const;
+    int getLineOffset() const;
 
-    /* 802E755C */ virtual ~JUTConsole();
+    virtual ~JUTConsole();
 
     void setOutput(unsigned int output) { mOutput = output; }
     void setPosition(int x, int y) {
@@ -123,13 +123,13 @@ public:
 */
 class JUTConsoleManager {
 public:
-    /* 802E81CC */ JUTConsoleManager();
-    /* 802E81F4 */ static JUTConsoleManager* createManager(JKRHeap*);
-    /* 802E8240 */ void appendConsole(JUTConsole*);
-    /* 802E82B0 */ void removeConsole(JUTConsole*);
-    /* 802E8384 */ void draw() const;
-    /* 802E8450 */ void drawDirect(bool) const;
-    /* 802E84C4 */ void setDirectConsole(JUTConsole*);
+    JUTConsoleManager();
+    static JUTConsoleManager* createManager(JKRHeap*);
+    void appendConsole(JUTConsole*);
+    void removeConsole(JUTConsole*);
+    void draw() const;
+    void drawDirect(bool) const;
+    void setDirectConsole(JUTConsole*);
 
     JUTConsole* getDirectConsole() const { return mDirectConsole; }
 
diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h
index af8e4e1769..4d5c0749fa 100644
--- a/include/JSystem/JUtility/JUTDbPrint.h
+++ b/include/JSystem/JUtility/JUTDbPrint.h
@@ -25,13 +25,13 @@ struct unk_print {
 */
 class JUTDbPrint {
 public:
-    /* 802E0148 */ JUTDbPrint(JUTFont*, JKRHeap*);
-    /* 802E0190 */ static JUTDbPrint* start(JUTFont*, JKRHeap*);
-    /* 802E0204 */ JUTFont* changeFont(JUTFont*);
-    /* 802E021C */ void enter(int, int, int, char const*, int);
-    /* 802E02DC */ void flush(int, int, int, int);
-    /* 802E02A4 */ void flush();
-    /* 802E0440 */ void drawString(int, int, int, u8 const*);
+    JUTDbPrint(JUTFont*, JKRHeap*);
+    static JUTDbPrint* start(JUTFont*, JKRHeap*);
+    JUTFont* changeFont(JUTFont*);
+    void enter(int, int, int, char const*, int);
+    void flush(int, int, int, int);
+    void flush();
+    void drawString(int, int, int, u8 const*);
 
     static JUTDbPrint* getManager() { return sDebugPrint; }
 
diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h
index b2c8307ab7..e2249f1fcb 100644
--- a/include/JSystem/JUtility/JUTDirectFile.h
+++ b/include/JSystem/JUtility/JUTDirectFile.h
@@ -10,12 +10,12 @@
 * 
 */
 struct JUTDirectFile {
-    /* 802E8730 */ int fetch32byte();
-    /* 802E87F8 */ JUTDirectFile();
-    /* 802E881C */ ~JUTDirectFile();
-    /* 802E8860 */ bool fopen(char const*);
-    /* 802E88FC */ void fclose();
-    /* 802E8958 */ int fgets(void*, int);
+    int fetch32byte();
+    JUTDirectFile();
+    ~JUTDirectFile();
+    bool fopen(char const*);
+    void fclose();
+    int fgets(void*, int);
 
     /* 0x000 */ u8 mBuffer[0x820];
 	/* 0x820 */ u8* mSectorStart;
diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h
index ba1b6bcd45..8d85ba5982 100644
--- a/include/JSystem/JUtility/JUTDirectPrint.h
+++ b/include/JSystem/JUtility/JUTDirectPrint.h
@@ -10,20 +10,20 @@
 */
 class JUTDirectPrint {
 private:
-    /* 802E41E8 */ JUTDirectPrint();
+    JUTDirectPrint();
 
 public:
-    /* 802E4288 */ void erase(int, int, int, int);
-    /* 802E431C */ void drawChar(int, int, int);
-    /* 802E456C */ void changeFrameBuffer(void*, u16, u16);
+    void erase(int, int, int, int);
+    void drawChar(int, int, int);
+    void changeFrameBuffer(void*, u16, u16);
     /* -------- */ void print(u16, u16, char const*, ...);
-    /* 802E45A4 */ void printSub(u16, u16, char const*, va_list, bool);
-    /* 802E46D8 */ void drawString(u16, u16, char*);
-    /* 802E4708 */ void drawString_f(u16, u16, char const*, ...);
-    /* 802E47C8 */ void setCharColor(u8, u8, u8);
-    /* 802E4798 */ void setCharColor(JUtility::TColor);
+    void printSub(u16, u16, char const*, va_list, bool);
+    void drawString(u16, u16, char*);
+    void drawString_f(u16, u16, char const*, ...);
+    void setCharColor(u8, u8, u8);
+    void setCharColor(JUtility::TColor);
 
-    /* 802E4240 */ static JUTDirectPrint* start();
+    static JUTDirectPrint* start();
 
     bool isActive() const { return field_0x00 != 0; }
     JUtility::TColor getCharColor() const { return mCharColor; }
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 6ef9bfc3ca..dc6ef1ac4d 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -18,7 +18,7 @@ class JUTDirectPrint;
 */
 class JUTExternalFB {
 public:
-    /* 802E40CC */ JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
+    JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);
 
 private:
     /* 0x00 */ _GXRenderModeObj* mRenderMode;
@@ -65,39 +65,39 @@ public:
         /* 0x14 */
     };
 
-    /* 802E1D5C */ JUTException(JUTDirectPrint*);
-    /* 802E40EC */ virtual ~JUTException();
+    JUTException(JUTDirectPrint*);
+    virtual ~JUTException();
 
-    /* 802E22C4 */ void showFloatSub(int, f32);
-    /* 802E2454 */ void showFloat(OSContext*);
-    /* 802E26B0 */ void showStack(OSContext*);
-    /* 802E27B0 */ void showMainInfo(u16, OSContext*, u32, u32);
-    /* 802E2A84 */ void showGPR(OSContext*);
-    /* 802E2B44 */ bool showMapInfo_subroutine(u32, bool);
-    /* 802E2CA0 */ void showGPRMap(OSContext*);
-    /* 802E2DAC */ void showSRR0Map(OSContext*);
-    /* 802E2E70 */ void printDebugInfo(JUTException::EInfoPage, OSError, OSContext*, u32, u32);
-    /* 802E2F18 */ bool isEnablePad() const;
-    /* 802E2F54 */ bool readPad(u32*, u32*);
-    /* 802E34C0 */ void printContext(u16, OSContext*, u32, u32);
-    /* 802E3A08 */ void createFB();
+    void showFloatSub(int, f32);
+    void showFloat(OSContext*);
+    void showStack(OSContext*);
+    void showMainInfo(u16, OSContext*, u32, u32);
+    void showGPR(OSContext*);
+    bool showMapInfo_subroutine(u32, bool);
+    void showGPRMap(OSContext*);
+    void showSRR0Map(OSContext*);
+    void printDebugInfo(JUTException::EInfoPage, OSError, OSContext*, u32, u32);
+    bool isEnablePad() const;
+    bool readPad(u32*, u32*);
+    void printContext(u16, OSContext*, u32, u32);
+    void createFB();
 
-    /* 802E1EA8 */ /* vt[03] */ virtual void* run();
+    virtual void* run();
 
-    /* 802E1E40 */ static JUTException* create(JUTDirectPrint*);
-    /* 802E1FCC */ static void errorHandler(OSError, OSContext*, u32, u32);
-    /* 802E20C0 */ static void panic_f_va(char const*, int, char const*, va_list);
-    /* 802E21FC */ static void panic_f(char const*, int, char const*, ...);
-    /* 802E227C */ static void setFPException(u32);
-    /* 802E2578 */ static bool searchPartialModule(u32, u32*, u32*, u32*, u32*);
-    /* 802E3AEC */ static JUTExceptionUserCallback setPreUserCallback(JUTExceptionUserCallback);
-    /* 802E3AFC */ static JUTExceptionUserCallback setPostUserCallback(JUTExceptionUserCallback);
-    /* 802E3B0C */ static void appendMapFile(char const*);
-    /* 802E3BA0 */ static bool queryMapAddress(char*, u32, s32, u32*, u32*, char*, u32, bool, bool);
-    /* 802E3C90 */ static bool queryMapAddress_single(char*, u32, s32, u32*, u32*, char*, u32, bool,
+    static JUTException* create(JUTDirectPrint*);
+    static void errorHandler(OSError, OSContext*, u32, u32);
+    static void panic_f_va(char const*, int, char const*, va_list);
+    static void panic_f(char const*, int, char const*, ...);
+    static void setFPException(u32);
+    static bool searchPartialModule(u32, u32*, u32*, u32*, u32*);
+    static JUTExceptionUserCallback setPreUserCallback(JUTExceptionUserCallback);
+    static JUTExceptionUserCallback setPostUserCallback(JUTExceptionUserCallback);
+    static void appendMapFile(char const*);
+    static bool queryMapAddress(char*, u32, s32, u32*, u32*, char*, u32, bool, bool);
+    static bool queryMapAddress_single(char*, u32, s32, u32*, u32*, char*, u32, bool,
                                                       bool);
-    /* 802E3FEC */ static void createConsole(void*, u32);
-    /* 802E3980 */ static void waitTime(s32);
+    static void createConsole(void*, u32);
+    static void waitTime(s32);
 
     static JUTException* getManager() { return sErrorManager; }
     static JUTConsole* getConsole() { return sConsole; }
diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h
index f6d67ac03b..e68c648442 100644
--- a/include/JSystem/JUtility/JUTFader.h
+++ b/include/JSystem/JUtility/JUTFader.h
@@ -15,14 +15,14 @@ public:
         UNKSTATUS_0 = 0,
     };
 
-    /* 802E5530 */ JUTFader(int, int, int, int, JUtility::TColor);
-    /* 802E55DC */ void control();
-    /* 802E57D0 */ void setStatus(JUTFader::EStatus, int);
+    JUTFader(int, int, int, int, JUtility::TColor);
+    void control();
+    void setStatus(JUTFader::EStatus, int);
 
-    /* 802E5840 */ virtual ~JUTFader();
-    /* 802E576C */ virtual bool startFadeIn(int);
-    /* 802E579C */ virtual bool startFadeOut(int);
-    /* 802E56DC */ virtual void draw();
+    virtual ~JUTFader();
+    virtual bool startFadeIn(int);
+    virtual bool startFadeOut(int);
+    virtual void draw();
 
     s32 getStatus() const { return mStatus; }
     void setColor(JUtility::TColor color) { mColor.set(color); }
diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h
index 3672001890..512e5713ab 100644
--- a/include/JSystem/JUtility/JUTGraphFifo.h
+++ b/include/JSystem/JUtility/JUTGraphFifo.h
@@ -9,9 +9,9 @@
 */
 class JUTGraphFifo {
 public:
-    /* 802DEB58 */ JUTGraphFifo(u32);
+    JUTGraphFifo(u32);
 
-    /* 802DEC34 */ virtual ~JUTGraphFifo();
+    virtual ~JUTGraphFifo();
 
     void getGpStatus() {
         GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2],
diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h
index 3319dd919b..714d069397 100644
--- a/include/JSystem/JUtility/JUTPalette.h
+++ b/include/JSystem/JUtility/JUTPalette.h
@@ -29,9 +29,9 @@ public:
         storeTLUT(tlutNo, p_tlutRes);
     }
 
-    /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*);
-    /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
-    /* 802DE95C */ bool load();
+    void storeTLUT(_GXTlut, ResTLUT*);
+    void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*);
+    bool load();
 
     u8 getTlutName() const { return mTlutName; }
     u8 getFormat() const { return mFormat; }
diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h
index f5099956d4..447f31ce9c 100644
--- a/include/JSystem/JUtility/JUTProcBar.h
+++ b/include/JSystem/JUtility/JUTProcBar.h
@@ -14,7 +14,7 @@ class JUTProcBar {
 public:
     class CTime {
     public:
-        /* 802E7340 */ CTime() { clear(); }
+        CTime() { clear(); }
 
         void clear() {
             mCost = 0;
@@ -71,17 +71,17 @@ public:
         void setUserPosition(int userPos) { mUserPosition = userPos; }
     };
 
-    /* 802E5888 */ JUTProcBar();
-    /* 802E599C */ ~JUTProcBar();
-    /* 802E59E0 */ static JUTProcBar* create();
-    /* 802E5A28 */ static void destroy();
-    /* 802E5A60 */ static void clear();
-    /* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor,
+    JUTProcBar();
+    ~JUTProcBar();
+    static JUTProcBar* create();
+    static void destroy();
+    static void clear();
+    void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor,
                                        JUtility::TColor);
-    /* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*);
-    /* 802E5E08 */ void draw();
-    /* 802E5E3C */ void drawProcessBar();
-    /* 802E6FA0 */ void drawHeapBar();
+    void adjustMeterLength(u32, f32*, f32, f32, int*);
+    void draw();
+    void drawProcessBar();
+    void drawHeapBar();
 
     void cpuStart() { mCpu.start(255, 129, 30); }
     void cpuEnd() { mCpu.end(); }
diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h
index 1d22086992..3b2fd3c4c6 100644
--- a/include/JSystem/JUtility/JUTResFont.h
+++ b/include/JSystem/JUtility/JUTResFont.h
@@ -23,34 +23,34 @@ struct BlockHeader {
 */
 class JUTResFont : public JUTFont {
 public:
-    /* 802DF000 */ virtual ~JUTResFont();
-    /* 802DF48C */ virtual void setGX();
-    /* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor);
-    /* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool);
-    /* 802DDFEC */ virtual int getLeading() const;
-    /* 802DE004 */ virtual s32 getAscent() const;
-    /* 802DE010 */ virtual s32 getDescent() const;
-    /* 802DE01C */ virtual s32 getHeight() const;
-    /* 802DDFF8 */ virtual s32 getWidth() const;
-    /* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const;
-    /* 802DFD0C */ virtual s32 getCellWidth() const;
-    /* 802DFD58 */ virtual s32 getCellHeight() const;
-    /* 802DDFE0 */ virtual int getFontType() const;
-    /* 802DDFD8 */ virtual ResFONT* getResFont() const;
-    /* 802DFDA4 */ virtual bool isLeadByte(int) const;
-    /* 802DFF60 */ virtual void loadImage(int, _GXTexMapID);
-    /* 802DF344 */ virtual void setBlock();
+    virtual ~JUTResFont();
+    virtual void setGX();
+    virtual void setGX(JUtility::TColor, JUtility::TColor);
+    virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool);
+    virtual int getLeading() const;
+    virtual s32 getAscent() const;
+    virtual s32 getDescent() const;
+    virtual s32 getHeight() const;
+    virtual s32 getWidth() const;
+    virtual void getWidthEntry(int, JUTFont::TWidth*) const;
+    virtual s32 getCellWidth() const;
+    virtual s32 getCellHeight() const;
+    virtual int getFontType() const;
+    virtual ResFONT* getResFont() const;
+    virtual bool isLeadByte(int) const;
+    virtual void loadImage(int, _GXTexMapID);
+    virtual void setBlock();
 
-    /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*);
-    /* 802DEF48 */ JUTResFont();
-    /* 802DF08C */ void deleteMemBlocks_ResFont();
-    /* 802DF0B0 */ void initialize_state();
-    /* 802DF0DC */ bool initiate(ResFONT const*, JKRHeap*);
-    /* 802DF13C */ bool protected_initiate(ResFONT const*, JKRHeap*);
-    /* 802DF248 */ void countBlock();
-    /* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
-    /* 802DFDD8 */ int getFontCode(int) const;
-    /* 802E00C4 */ int convertSjis(int, u16*) const;
+    JUTResFont(ResFONT const*, JKRHeap*);
+    JUTResFont();
+    void deleteMemBlocks_ResFont();
+    void initialize_state();
+    bool initiate(ResFONT const*, JKRHeap*);
+    bool protected_initiate(ResFONT const*, JKRHeap*);
+    void countBlock();
+    void loadFont(int, _GXTexMapID, JUTFont::TWidth*);
+    int getFontCode(int) const;
+    int convertSjis(int, u16*) const;
 
     inline void delete_and_initialize() {
         deleteMemBlocks_ResFont();
diff --git a/include/JSystem/JUtility/JUTResource.h b/include/JSystem/JUtility/JUTResource.h
index f5181cbffc..c0898e60b2 100644
--- a/include/JSystem/JUtility/JUTResource.h
+++ b/include/JSystem/JUtility/JUTResource.h
@@ -25,9 +25,9 @@ public:
         RESTYPE_Unk4 = 4,
     };
     JUTResReference() { mType = 0; }
-    /* 802DE078 */ void* getResource(JSUInputStream*, u32, JKRArchive*);
-    /* 802DE120 */ void* getResource(void const*, u32, JKRArchive*);
-    /* 802DE1BC */ void* getResource(u32, JKRArchive*);
+    void* getResource(JSUInputStream*, u32, JKRArchive*);
+    void* getResource(void const*, u32, JKRArchive*);
+    void* getResource(u32, JKRArchive*);
 };
 // only rough size known due to getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive
 
diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h
index 10ae432b4b..46be9eaa40 100644
--- a/include/JSystem/JUtility/JUTVideo.h
+++ b/include/JSystem/JUtility/JUTVideo.h
@@ -19,16 +19,16 @@ public:
     virtual ~JUTVideo();
 
     // TODO: return types not confirmed
-    /* 802E4C54 */ static JUTVideo* createManager(GXRenderModeObj const*);
-    /* 802E4CAC */ static void destroyManager();
-    /* 802E5088 */ static void drawDoneStart();
-    /* 802E50B0 */ static void dummyNoDrawWait();
-    /* 802E5198 */ void setRenderMode(GXRenderModeObj const*);
-    /* 802E5210 */ void waitRetraceIfNeed();
+    static JUTVideo* createManager(GXRenderModeObj const*);
+    static void destroyManager();
+    static void drawDoneStart();
+    static void dummyNoDrawWait();
+    void setRenderMode(GXRenderModeObj const*);
+    void waitRetraceIfNeed();
 
-    /* 802E4E50 */ static void preRetraceProc(u32);
-    /* 802E5144 */ static void postRetraceProc(u32);
-    /* 802E50BC */ static void drawDoneCallback();
+    static void preRetraceProc(u32);
+    static void postRetraceProc(u32);
+    static void drawDoneCallback();
 
     u16 getFbWidth() const { return mRenderObj->fbWidth; }
     u16 getEfbHeight() const { return mRenderObj->efbHeight; }
diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h
index d98f16672c..3ef30186eb 100644
--- a/include/JSystem/JUtility/JUTXfb.h
+++ b/include/JSystem/JUtility/JUTXfb.h
@@ -19,14 +19,14 @@ public:
         UNK_3 = 3,
     };
 
-    /* 802E5214 */ void clearIndex();
-    /* 802E5228 */ void common_init(int);
-    /* 802E5260 */ JUTXfb(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
-    /* 802E5308 */ ~JUTXfb();
-    /* 802E5378 */ void delXfb(int);
-    /* 802E53B8 */ static JUTXfb* createManager(JKRHeap*, JUTXfb::EXfbNumber);
-    /* 802E5424 */ static void destroyManager();
-    /* 802E5454 */ void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber);
+    void clearIndex();
+    void common_init(int);
+    JUTXfb(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber);
+    ~JUTXfb();
+    void delXfb(int);
+    static JUTXfb* createManager(JKRHeap*, JUTXfb::EXfbNumber);
+    static void destroyManager();
+    void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber);
 
     s32 getBufferNum() const { return mBufferNum; }
     s16 getDrawnXfbIndex() const { return mDrawnXfbIndex; }
diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
index 8bcf4f3181..11028c500d 100644
--- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
@@ -7,12 +7,12 @@
 
 class cBgS_GndChk : public cBgS_Chk, public cBgS_PolyInfo {
 public:
-    /* 80267C1C */ cBgS_GndChk();
-    /* 80267D28 */ void SetPos(cXyz const*);
-    /* 80267D0C */ void SetPos(Vec const*);
-    /* 80267D44 */ void PreCheck();
+    cBgS_GndChk();
+    void SetPos(cXyz const*);
+    void SetPos(Vec const*);
+    void PreCheck();
 
-    /* 80267C94 */ virtual ~cBgS_GndChk();
+    virtual ~cBgS_GndChk();
 
     f32 GetNowY() const { return mNowY; }
     void SetNowY(f32 y) { mNowY = y; }
diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index 54f9682c01..44a271052b 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -9,11 +9,11 @@ private:
     /* 0x4 vtable */
 
 public:
-    /* 802681C8 */ void Release();
-    /* 802681D4 */ bool ChkUsed() const;
-    /* 802681C0 */ void Regist(int);
+    void Release();
+    bool ChkUsed() const;
+    void Regist(int);
 
-    /* 8007E5F8 */ virtual ~cBgW_BgId() {}
+    virtual ~cBgW_BgId() {}
 
     cBgW_BgId() { Ct(); }
     void Ct() { m_id = 0x100; }
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 52fac6cdc1..9252ad2048 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -87,8 +87,8 @@ private:
 public:
     cCcD_DivideInfo() {}
     virtual ~cCcD_DivideInfo() {}
-    /* 80263358 */ void Set(u32, u32, u32);
-    /* 80263368 */ bool Chk(cCcD_DivideInfo const&) const;
+    void Set(u32, u32, u32);
+    bool Chk(cCcD_DivideInfo const&) const;
 };  // Size = 0x10
 
 STATIC_ASSERT(0x10 == sizeof(cCcD_DivideInfo));
@@ -108,9 +108,9 @@ private:
 public:
     cCcD_DivideArea() {}
     virtual ~cCcD_DivideArea() {}
-    /* 802633A8 */ void SetArea(cM3dGAab const&);
-    /* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
-    /* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
+    void SetArea(cM3dGAab const&);
+    void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
+    void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
 };  // Size = 0x40
 
 STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea));
@@ -147,7 +147,7 @@ struct cCcD_SrcObj {
 
 class cCcD_GStts {
 public:
-    /* 800837B0 */ virtual ~cCcD_GStts() {}
+    virtual ~cCcD_GStts() {}
 
 private:
     /* 0x00 vtable */
@@ -164,17 +164,17 @@ private:
 
 public:
     cCcD_Stts() {}
-    /* 801410A4 vt[3] */ virtual ~cCcD_Stts() {}
-    /* 80263894 vt[4] */ virtual const cCcD_GStts* GetGStts() const;
-    /* 8026389C vt[5] */ virtual cCcD_GStts* GetGStts();
-    /* 802638A4 */ void Init(int, int, void*, fpc_ProcID);
-    /* 80263904 vt[6] */ virtual void Ct();
-    /* 80263934 */ void PlusCcMove(f32, f32, f32);
-    /* 8026395C */ void ClrCcMove();
-    /* 80263970 */ void PlusDmg(int);
-    /* 80263984 */ f32 GetWeightF() const;
-    /* 802649E8 vt[7] */ virtual void ClrAt() {}
-    /* 802649EC vt[8] */ virtual void ClrTg() { m_dmg = 0; }
+    virtual ~cCcD_Stts() {}
+    virtual const cCcD_GStts* GetGStts() const;
+    virtual cCcD_GStts* GetGStts();
+    void Init(int, int, void*, fpc_ProcID);
+    virtual void Ct();
+    void PlusCcMove(f32, f32, f32);
+    void ClrCcMove();
+    void PlusDmg(int);
+    f32 GetWeightF() const;
+    virtual void ClrAt() {}
+    virtual void ClrTg() { m_dmg = 0; }
 
     u8 GetWeightUc() const { return m_weight; }
     void SetWeight(u8 weight) { m_weight = weight; }
@@ -205,8 +205,8 @@ public:
     };
 
     cCcD_ObjCommonBase() { ct(); }
-    /* 8008409C */ virtual ~cCcD_ObjCommonBase() {}
-    /* 802639B0 */ void ct();
+    virtual ~cCcD_ObjCommonBase() {}
+    void ct();
     void SetSPrm(u32 sprm) { mSPrm = sprm; }
     s32 getSPrm() const { return mSPrm; }
     void setRPrm(s32 rprm) { mRPrm = rprm; }
@@ -229,10 +229,10 @@ STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase));
 class cCcD_ObjAt : public cCcD_ObjCommonBase {
 public:
     cCcD_ObjAt() { mType = 0; }
-    /* 80084040 */ virtual ~cCcD_ObjAt() {}
-    /* 8026483C */ void SetHit(cCcD_Obj*);
-    /* 8026484C */ void Set(cCcD_SrcObjAt const&);
-    /* 80264868 */ void ClrHit();
+    virtual ~cCcD_ObjAt() {}
+    void SetHit(cCcD_Obj*);
+    void Set(cCcD_SrcObjAt const&);
+    void ClrHit();
     int GetType() const { return mType; }
     u32 GetGrp() const { return MskSPrm(0x1E); }
     bool ChkSet() const { return MskSPrm(1); }
@@ -256,11 +256,11 @@ STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt));
 class cCcD_ObjTg : public cCcD_ObjCommonBase {
 public:
     cCcD_ObjTg() { ct(); }
-    /* 80083FE4 */ virtual ~cCcD_ObjTg() {}
-    /* 80264880 */ void Set(cCcD_SrcObjTg const&);
-    /* 80264894 */ void SetGrp(u32);
-    /* 802648B0 */ void ClrHit();
-    /* 802648C8 */ void SetHit(cCcD_Obj*);
+    virtual ~cCcD_ObjTg() {}
+    void Set(cCcD_SrcObjTg const&);
+    void SetGrp(u32);
+    void ClrHit();
+    void SetHit(cCcD_Obj*);
     int GetType() const { return mType; }
     void SetType(u32 type) { mType = type; }
     u32 GetGrp() const { return MskSPrm(0x1E); }
@@ -276,11 +276,11 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg));
 
 class cCcD_ObjCo : public cCcD_ObjCommonBase {
 public:
-    /* 80083F88 */ virtual ~cCcD_ObjCo() {}
-    /* 802648D8 */ void SetHit(cCcD_Obj*);
-    /* 802648E8 */ void ClrHit();
-    /* 80264900 */ void SetIGrp(u32);
-    /* 8026491C */ void SetVsGrp(u32);
+    virtual ~cCcD_ObjCo() {}
+    void SetHit(cCcD_Obj*);
+    void ClrHit();
+    void SetIGrp(u32);
+    void SetVsGrp(u32);
     u32 GetGrp() const { return MskSPrm(0x1E); }
     bool ChkSet() const { return MskSPrm(1); }
     u32 GetVsGrp() const { return MskSPrm(0x70); }
@@ -306,8 +306,8 @@ protected:
     /* 0x02C */ cCcD_ObjCo mObjCo;
     /* 0x03C vtable */
 public:
-    /* 80083EC8 */ virtual ~cCcD_ObjHitInf() {}
-    /* 802639C4 */ void Set(cCcD_SrcObjHitInf const&);
+    virtual ~cCcD_ObjHitInf() {}
+    void Set(cCcD_SrcObjHitInf const&);
     cCcD_ObjAt& GetObjAt() { return mObjAt; }
     cCcD_ObjTg& GetObjTg() { return mObjTg; }
     cCcD_ObjCo& GetObjCo() { return mObjCo; }
@@ -390,7 +390,7 @@ public:
     /* 0x1C vtable */
 
     struct Shape {
-        /* 80167BBC */ ~Shape() {}
+        ~Shape() {}
 
         /* 0x00 */ int _0;
         /* 0x04 */ cXyz _4;
@@ -398,8 +398,8 @@ public:
         /* 0x14 */ f32 _14;
     };
     cCcD_ShapeAttr() {}
-    /* 8008556C vt[2] */ virtual ~cCcD_ShapeAttr() {}
-    /* 802649D8 vt[3] */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const {
+    virtual ~cCcD_ShapeAttr() {}
+    virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const {
         return false;
     }
     /*          vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0;
@@ -434,14 +434,14 @@ class cCcD_GObjInf;
 class cCcD_Obj : public cCcD_ObjHitInf {
 public:
     cCcD_Obj() { ct(); }
-    /* 80083DE0 */ virtual ~cCcD_Obj() {}
-    /* 800851A4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return NULL; }
-    /* 800847C8 */ virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
-    /* 80084BE8 */ virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
-    /* 80085130 */ virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
-    /* 80084BF0 */ virtual void Draw(_GXColor const&) {}
-    /* 80263A10 */ void ct();
-    /* 80263A1C */ void Set(cCcD_SrcObj const&);
+    virtual ~cCcD_Obj() {}
+    virtual cCcD_GObjInf const* GetGObjInf() const { return NULL; }
+    virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
+    virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
+    virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
+    virtual void Draw(_GXColor const&) {}
+    void ct();
+    void Set(cCcD_SrcObj const&);
     fopAc_ac_c* GetAc();
 
     cCcD_Stts* GetStts() { return mStts; }
@@ -461,12 +461,12 @@ STATIC_ASSERT(0x58 == sizeof(cCcD_Obj));
 class cCcD_GObjInf : public cCcD_Obj {
 public:
     cCcD_GObjInf() {}
-    /* 80083CE8 */ virtual ~cCcD_GObjInf() {}
-    /* 80085138 */ virtual void ClrAtHit() { mObjAt.ClrHit(); }
-    /* 80085158 */ virtual void ClrTgHit() { mObjTg.ClrHit(); }
-    /* 8008517C */ virtual void ClrCoHit() { mObjCo.ClrHit(); }
-    /* 80084BE4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return this; }
-    /* 800851A0 */ virtual cCcD_GObjInf* GetGObjInf() { return this; }
+    virtual ~cCcD_GObjInf() {}
+    virtual void ClrAtHit() { mObjAt.ClrHit(); }
+    virtual void ClrTgHit() { mObjTg.ClrHit(); }
+    virtual void ClrCoHit() { mObjCo.ClrHit(); }
+    virtual cCcD_GObjInf const* GetGObjInf() const { return this; }
+    virtual cCcD_GObjInf* GetGObjInf() { return this; }
 };
 
 class cCcD_PntAttr : public cCcD_ShapeAttr, public cM3dGVtx {
@@ -503,84 +503,84 @@ public:
         cM3dGCps::Set(pStart, pEnd, radius);
     }
 
-    /* 80085450 */ virtual ~cCcD_CpsAttr() {}
-    /* 80263DC0 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80263E04 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80084FE4 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_CpsAttr() {}
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084FDC */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084FD4 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80263D38 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80263D7C */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80263F24 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 80263ED4 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80263F74 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 80085034 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 8008502C */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80085024 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 8008501C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80263FC4 */ virtual void CalcAabBox();
-    /* 80264014 */ virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
 };
 
 STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr));
 
 class cCcD_TriAttr : public cCcD_ShapeAttr, public cM3dGTri {
 public:
-    /* 80263C04 */ virtual void CalcAabBox();
-    /* 80263C9C */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 80263A88 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80263BCC */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80263B90 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80084E54 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084E4C */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084E44 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80263B58 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80084EBC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084EB4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084EAC */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const { return false; }
-    /* 80084EA4 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084E9C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80084E94 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; }
-    /* 80084E8C */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; }
-    /* 80264938 */ virtual ~cCcD_TriAttr() {}
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; }
+    virtual ~cCcD_TriAttr() {}
     cCcD_TriAttr() {}
 };
 
 class cCcD_CylAttr : public cCcD_ShapeAttr, public cM3dGCyl {
 public:
     cCcD_CylAttr() {}
-    /* 800854E0 */ virtual ~cCcD_CylAttr() {}
-    /* 80084CC0 */ virtual const cXyz& GetCoCP() const { return *GetCP(); }
-    /* 8026420C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 802641C8 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80264250 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80084CD8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_CylAttr() {}
+    virtual const cXyz& GetCoCP() const { return *GetCP(); }
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084CD0 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084CC8 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 8026417C */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80264288 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 80264310 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80084D28 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084D20 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084D18 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084D10 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 802642CC */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 80037A4C */ virtual cXyz& GetCoCP() { return *GetCP(); }
-    /* 80264368 */ virtual void CalcAabBox();
-    /* 802643D0 */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 802644B8 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual cXyz& GetCoCP() { return *GetCP(); }
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
     const cM3dGCyl* GetShapeP() const { return this; }
 
@@ -593,30 +593,30 @@ public:
     cCcD_SphAttr() {}
     void Set(const cCcD_SrcSphAttr& src) { cM3dGSph::Set(src.mSph); }
 
-    /* 8008721C */ virtual ~cCcD_SphAttr() {}
-    /* 80084B44 */ virtual const cXyz& GetCoCP() const { return *GetCP(); }
-    /* 80037A54 */ virtual cXyz& GetCoCP() { return *GetCP(); }
-    /* 80084B5C */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_SphAttr() {}
+    virtual const cXyz& GetCoCP() const { return *GetCP(); }
+    virtual cXyz& GetCoCP() { return *GetCP(); }
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084B54 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084B4C */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80084BAC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084BA4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084B9C */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084B94 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80264538 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 802645C0 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 802644EC */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 8026457C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80264688 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80264644 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 802645F8 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 802646E0 */ virtual void CalcAabBox();
-    /* 8026476C */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 80264808 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
     const cM3dGSph* GetShapeP() const { return this; }
 
diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h
index 5c5a5921d0..471f2c169a 100644
--- a/include/SSystem/SComponent/c_cc_s.h
+++ b/include/SSystem/SComponent/c_cc_s.h
@@ -31,40 +31,40 @@ public:
     /* 0x2808 */ cCcD_DivideArea mDivideArea;
     /* 0x2848 vtable */
 
-    /* 80264A6C */ cCcS();
-    /* 80264A94 */ void Ct();
-    /* 80264B60 */ void Dt();
-    /* 80264B80 */ WeightType GetWt(u8) const;
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-    /* 80264C5C */ void ClrCoHitInf();
-    /* 80264CF0 */ void ClrTgHitInf();
-    /* 80264D90 */ void ClrAtHitInf();
-    /* 80264E2C */ bool ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
-    /* 80264F40 */ void ChkAtTg();
-    /* 8026515C */ bool ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
-    /* 80265230 */ void ChkCo();
-    /* 802653A0 vt[2] */ virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
-    /* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
-    /* 802655E4 */ void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
+    cCcS();
+    void Ct();
+    void Dt();
+    WeightType GetWt(u8) const;
+    void Set(cCcD_Obj*);
+    void ClrCoHitInf();
+    void ClrTgHitInf();
+    void ClrAtHitInf();
+    bool ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
+    void ChkAtTg();
+    bool ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
+    void ChkCo();
+    virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
+    void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
+    void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
     /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
-    /* 80265BB4 */ void CalcArea();
-    /* 80265CCC */ void Move();
-    /* 80265D30 */ void DrawClear();
-    /* 80265DF8 vt[4] */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*,
+    void CalcArea();
+    void Move();
+    void DrawClear();
+    virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*,
                                                    cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
                                                    cCcD_GStts*);
-    /* 80265DFC vt[5] */ virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*,
+    virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*,
                                                      cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
                                                      cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*);
-    /* 80265E00 vt[6] */ virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*,
+    virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*,
                                                     cCcD_GStts*, cCcD_GStts*);
-    /* 80265E08 vt[7] */ virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
+    virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
                                                            cCcD_GObjInf const*, cCcD_Stts*,
                                                            cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
-    /* 80265E10 vt[8] */ virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
-    /* 80030BDC vt[9] */ virtual ~cCcS() {}
-    /* 80265E18 vt[10] */ virtual void MoveAfterCheck();
-    /* 80265DF4 vt[11] */ virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
+    virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
+    virtual ~cCcS() {}
+    virtual void MoveAfterCheck();
+    virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
 };  // Size = 0x284C
 
 STATIC_ASSERT(sizeof(cCcS) == 0x284C);
diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h
index 0a352b2186..9016215acf 100644
--- a/include/SSystem/SComponent/c_malloc.h
+++ b/include/SSystem/SComponent/c_malloc.h
@@ -7,9 +7,9 @@ class JKRHeap;
 
 struct cMl {
     static JKRHeap* Heap;
-    /* 80263220 */ static void init(JKRHeap*);
-    /* 80263228 */ static void* memalignB(int, u32);
-    /* 80263260 */ static void free(void*);
+    static void init(JKRHeap*);
+    static void* memalignB(int, u32);
+    static void free(void*);
 };
 
 #endif /* C_MALLOC_H */
diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h
index b44d511c10..90811586ce 100644
--- a/include/SSystem/SComponent/c_sxyz.h
+++ b/include/SSystem/SComponent/c_sxyz.h
@@ -10,14 +10,14 @@ struct SVec {
 class csXyz : public SVec {
 public:
     static const csXyz Zero;
-    /* 80018BD0 */ ~csXyz() {}
+    ~csXyz() {}
     /* inline   */ csXyz() {}
     /* inline   */ csXyz(const csXyz& other) : SVec(other){};
-    /* 802673F4 */ csXyz(s16, s16, s16);
-    /* 80267404 */ csXyz operator+(csXyz&);
-    /* 8026745C */ void operator+=(csXyz&);
-    /* 80267490 */ csXyz operator-(csXyz&);
-    /* 802674E8 */ csXyz operator*(f32);
+    csXyz(s16, s16, s16);
+    csXyz operator+(csXyz&);
+    void operator+=(csXyz&);
+    csXyz operator-(csXyz&);
+    csXyz operator*(f32);
     s16 GetX() const { return x; }
     s16 GetY() const { return y; }
     s16 GetZ() const { return z; }
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index b5e2410d71..976fc0faf7 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -41,11 +41,11 @@ struct cXyz : Vec {
         this->y = vec.y;
         this->z = vec.z;
     }
-    /* 80266AE4 */ cXyz operator+(Vec const&) const;
-    /* 80266B34 */ cXyz operator-(Vec const&) const;
-    /* 80266B84 */ cXyz operator*(f32) const;
-    /* 80266BD0 */ cXyz operator*(Vec const&) const;
-    /* 80266C18 */ cXyz operator/(f32) const;
+    cXyz operator+(Vec const&) const;
+    cXyz operator-(Vec const&) const;
+    cXyz operator*(f32) const;
+    cXyz operator*(Vec const&) const;
+    cXyz operator/(f32) const;
 
     void operator+=(f32 f) {
         x += f;
@@ -80,19 +80,19 @@ struct cXyz : Vec {
         PSVECScale(this, this, 1.0f / scale);
         return this;
     }
-    /* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
-    /* 80266CBC */ cXyz outprod(Vec const&) const;
-    /* 80266CE4 */ cXyz norm() const;
-    /* 80266D30 */ cXyz normZP() const;
-    /* 80266DC4 */ cXyz normZC() const;
-    /* 80266EF4 */ cXyz normalize();
-    /* 80266F48 */ cXyz normalizeZP();
-    /* 80266FDC */ bool normalizeRS();
-    /* 8026702C */ bool operator==(Vec const&) const;
-    /* 8026706C */ bool operator!=(Vec const&) const;
-    /* 802670AC */ bool isZero() const;
-    /* 80267128 */ s16 atan2sX_Z() const;
-    /* 80267150 */ s16 atan2sY_XZ() const;
+    cXyz getCrossProduct(Vec const&) const;
+    cXyz outprod(Vec const&) const;
+    cXyz norm() const;
+    cXyz normZP() const;
+    cXyz normZC() const;
+    cXyz normalize();
+    cXyz normalizeZP();
+    bool normalizeRS();
+    bool operator==(Vec const&) const;
+    bool operator!=(Vec const&) const;
+    bool isZero() const;
+    s16 atan2sX_Z() const;
+    s16 atan2sY_XZ() const;
 
     void set(f32 pX, f32 pY, f32 pZ) {
         x = pX;
diff --git a/include/Z2AudioLib/Z2Audience.h b/include/Z2AudioLib/Z2Audience.h
index 9f1ff17d44..8b8dc99805 100644
--- a/include/Z2AudioLib/Z2Audience.h
+++ b/include/Z2AudioLib/Z2Audience.h
@@ -12,8 +12,8 @@
 struct Z2Audible;
 
 struct Z2AudibleAbsPos {
-    /* 802BBCDC */ void calc(const JGeometry::TVec3<f32>& pos);
-    /* 802BBD18 */ void init(JGeometry::TVec3<f32>*, const JGeometry::TVec3<f32>&,
+    void calc(const JGeometry::TVec3<f32>& pos);
+    void init(JGeometry::TVec3<f32>*, const JGeometry::TVec3<f32>&,
                              const JGeometry::TVec3<f32>*);
 
     /* 0x00 */ JGeometry::TVec3<f32> field_0x0;
@@ -21,13 +21,13 @@ struct Z2AudibleAbsPos {
 };
 
 struct Z2AudioCamera {
-    /* 802BC758 */ Z2AudioCamera();
-    /* 802BC788 */ void init();
-    /* 802BC8AC */ void setCameraState(f32 (*)[4], Vec& pos, Vec&, f32, f32, bool, bool);
-    /* 802BC7DC */ void setCameraState(f32 const (*)[4], Vec& pos, bool);
-    /* 802BCBEC */ void convertAbsToRel(Z2Audible* audible, int channelNum);
-    /* 802BCC7C */ bool convertAbsToRel(Vec& src, Vec* dst) const;
-    /* 802BCCC0 */ bool isInSight(Vec&) const;
+    Z2AudioCamera();
+    void init();
+    void setCameraState(f32 (*)[4], Vec& pos, Vec&, f32, f32, bool, bool);
+    void setCameraState(f32 const (*)[4], Vec& pos, bool);
+    void convertAbsToRel(Z2Audible* audible, int channelNum);
+    bool convertAbsToRel(Vec& src, Vec* dst) const;
+    bool isInSight(Vec&) const;
 
     const JGeometry::TVec3<f32>* getPos() const { return &mPos; }
     f32 getVolCenterZ() const { return mVolCenterZ; }
@@ -60,13 +60,13 @@ struct Z2AudioCamera {
 };  // Size: 0x74
 
 struct Z2SpotMic {
-    /* 802BCD28 */ Z2SpotMic();
-    /* 802BCDA8 */ void clearMicState(int camID);
-    /* 802BCDE8 */ void calcVolumeFactor(int camID);
-    /* 802BCE14 */ void setMicState(Z2AudioCamera* camera, int camID);
-    /* 802BCF5C */ f32 calcMicDist(Z2Audible* audible);
-    /* 802BCFE4 */ u32 calcMicPriority(f32);
-    /* 802BD03C */ f32 calcMicVolume(f32, int camID, f32);
+    Z2SpotMic();
+    void clearMicState(int camID);
+    void calcVolumeFactor(int camID);
+    void setMicState(Z2AudioCamera* camera, int camID);
+    f32 calcMicDist(Z2Audible* audible);
+    u32 calcMicPriority(f32);
+    f32 calcMicVolume(f32, int camID, f32);
 
     void setPosPtr(Vec* posPtr) { mPosPtr = posPtr; }
     bool isOn() { return mMicOn; }
@@ -86,12 +86,12 @@ struct Z2SpotMic {
 };  // Size: 0x28
 
 struct Z2Audience3DSetting {
-    /* 802BC248 */ Z2Audience3DSetting();
-    /* 802BC284 */ void init();
-    /* 802BC308 */ void initVolumeDist();
-    /* 802BC4D0 */ void updateVolumeDist(f32);
-    /* 802BC6A4 */ void initDolbyDist();
-    /* 802BC6F8 */ void updateDolbyDist(f32, f32);
+    Z2Audience3DSetting();
+    void init();
+    void initVolumeDist();
+    void updateVolumeDist(f32);
+    void initDolbyDist();
+    void updateDolbyDist(f32, f32);
 
     void calcVolumeFactorAll() {
         field_0x0[1] = 1.25f * field_0x0[0];
@@ -153,7 +153,7 @@ struct Z2AudibleRelPos {
 };
 
 struct Z2AudibleChannel {
-    /* 802BBE74 */ Z2AudibleChannel();
+    Z2AudibleChannel();
     void init() {
         mParams.init();
         field_0x28 = -1.0f;
@@ -171,13 +171,13 @@ struct Z2AudibleChannel {
 };
 
 struct Z2Audible : public JAIAudible, public JASPoolAllocObject<Z2Audible> {
-    /* 802BBD94 */ Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>*, u32 channel, bool);
-    /* 802BBE98 */ void calc();
-    /* 802BBED0 */ JASSoundParams* getOuterParams(int index);
-    /* 802BBEE4 */ void setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams, int index);
-    /* 802BC204 */ Z2AudibleChannel* getChannel(int index);
-    /* 802BC218 */ u32 getDistVolBit();
-    /* 802BD510 */ ~Z2Audible();
+    Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>*, u32 channel, bool);
+    void calc();
+    JASSoundParams* getOuterParams(int index);
+    void setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams, int index);
+    Z2AudibleChannel* getChannel(int index);
+    u32 getDistVolBit();
+    ~Z2Audible();
 
     bool isDoppler() {
         return ((*(u8*)&mParam.field_0x0) >> 4) & 0xf;
@@ -197,29 +197,29 @@ struct Z2Audible : public JAIAudible, public JASPoolAllocObject<Z2Audible> {
 };
 
 struct Z2Audience : public JAIAudience, public JASGlobalInstance<Z2Audience> {
-    /* 802BD130 */ Z2Audience();
-    /* 802BD2DC */ void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int camID, bool);
-    /* 802BD704 */ f32 calcOffMicSound(f32);
-    /* 802BD90C */ void setTargetVolume(f32 volume, int index);
-    /* 802BD92C */ bool convertAbsToRel(Vec& src, Vec* dst, int camID);
-    /* 802BD95C */ f32 calcRelPosVolume(const Vec&, f32, int camID);
-    /* 802BDA44 */ f32 calcRelPosPan(const Vec&, int camID);
-    /* 802BDB44 */ f32 calcRelPosDolby(const Vec&, int camID);
-    /* 802BDBDC */ f32 calcVolume_(f32, int distVolBit) const;
-    /* 802BDC44 */ u32 calcDeltaPriority_(f32, int distVolBit, bool) const;
-    /* 802BDCB0 */ f32 calcPitchDoppler_(const JGeometry::TVec3<f32>&,
+    Z2Audience();
+    void setAudioCamera(f32 (*)[4], Vec&, Vec&, f32, f32, bool, int camID, bool);
+    f32 calcOffMicSound(f32);
+    void setTargetVolume(f32 volume, int index);
+    bool convertAbsToRel(Vec& src, Vec* dst, int camID);
+    f32 calcRelPosVolume(const Vec&, f32, int camID);
+    f32 calcRelPosPan(const Vec&, int camID);
+    f32 calcRelPosDolby(const Vec&, int camID);
+    f32 calcVolume_(f32, int distVolBit) const;
+    u32 calcDeltaPriority_(f32, int distVolBit, bool) const;
+    f32 calcPitchDoppler_(const JGeometry::TVec3<f32>&,
                                           const JGeometry::TVec3<f32>&,
                                           const JGeometry::TVec3<f32>&, f32) const;
-    /* 802BDD00 */ f32 calcFxMix_(f32, int distVolBit) const;
-    /* 802BDD48 */ f32 calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const;
+    f32 calcFxMix_(f32, int distVolBit) const;
+    f32 calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const;
 
-    /* 802BD1FC */ virtual ~Z2Audience();
-    /* 802BD338 */ virtual JAIAudible* newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
+    virtual ~Z2Audience();
+    virtual JAIAudible* newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
                                                   const JGeometry::TVec3<f32>*, u32);
-    /* 802BDED4 */ virtual int getMaxChannels();
-    /* 802BD4D4 */ virtual void deleteAudible(JAIAudible* audible);
-    /* 802BD5B8 */ virtual u32 calcPriority(JAIAudible* audible);
-    /* 802BD71C */ virtual void mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum);
+    virtual int getMaxChannels();
+    virtual void deleteAudible(JAIAudible* audible);
+    virtual u32 calcPriority(JAIAudible* audible);
+    virtual void mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum);
 
     Z2SpotMic* getLinkMic() { return mLinkMic; }
     JGeometry::TVec3<f32> getAudioCamPos(int camID) {
diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
index 0d0b9a2f23..c4f96ca742 100644
--- a/include/Z2AudioLib/Z2Creature.h
+++ b/include/Z2AudioLib/Z2Creature.h
@@ -36,20 +36,20 @@ public:
 
 class Z2CreatureEnemy : public Z2Creature, public JSULink<Z2CreatureEnemy> {
 public:
-    /* 802C0F64 */ Z2CreatureEnemy();
-    /* 802C0FC4 */ virtual void deleteObject();
-    /* 802C1094 */ void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
-    /* 802C10B4 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
-    /* 802C10D4 */ virtual void framework(u32 mapinfo, s8 reverb);
-    /* 802C110C */ virtual Z2SoundHandlePool* startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
-    /* 802C136C */ virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
-    /* 802C168C */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
-    /* 802C1948 */ virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
-    /* 802C199C */ virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
-    /* 802C19D8 */ virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
-    /* 802C1A14 */ virtual Z2SoundHandlePool* startCollisionSE(u32 hitID, u32 mapinfo);
-    /* 802C1B7C */ void setLinkSearch(bool isLinkSearch);
-    /* 802C1B90 */ void setEnemyName(const char* enemyName);
+    Z2CreatureEnemy();
+    virtual void deleteObject();
+    void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
+    void init(Vec*, Vec*, Vec*, u8, u8, u8);
+    virtual void framework(u32 mapinfo, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    virtual Z2SoundHandlePool* startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    virtual Z2SoundHandlePool* startCollisionSE(u32 hitID, u32 mapinfo);
+    void setLinkSearch(bool isLinkSearch);
+    void setEnemyName(const char* enemyName);
 
     /* 0xA0 */ u8 mEnemyID;
     /* 0xA1 */ s8 field_0xa1;
@@ -59,13 +59,13 @@ public:
 
 class Z2CreatureCitizen : public Z2Creature, public JSULink<Z2CreatureCitizen> {
 public:
-    /* 802C0C10 */ Z2CreatureCitizen();
-    /* 802C0C6C */ ~Z2CreatureCitizen();
-    /* 802C0CE4 */ void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
-    /* 802C0D04 */ virtual void deleteObject();
-    /* 802C0D48 */ void setMdlType(s8, bool, bool);
-    /* 802C0E18 */ void playVoice(int);
-    /* 802C0ED8 */ virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
+    Z2CreatureCitizen();
+    ~Z2CreatureCitizen();
+    void init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum);
+    virtual void deleteObject();
+    void setMdlType(s8, bool, bool);
+    void playVoice(int);
+    virtual Z2SoundHandlePool* startCreatureVoice(JAISoundID soundID, s8 reverb);
 
 private:
     /* 0xA0 */ s8 mCitizenID;
@@ -76,26 +76,26 @@ private:
 
 class Z2CreatureSumomo : public Z2Creature {
 public:
-    /* 802C1BE8 */ Z2CreatureSumomo();
-    /* 802C1C24 */ void playSumomoBgm(u32 dist);
-    /* 802C1CA0 */ void deleteObject();
+    Z2CreatureSumomo();
+    void playSumomoBgm(u32 dist);
+    void deleteObject();
 };  // Size: 0x90
 
 class Z2SoundObjBeeGroup : public Z2SoundObjBase {
 public:
-    /* 802C1D10 */ Z2SoundObjBeeGroup();
-    /* 802C1D4C */ void init(Vec* posPtr, u8 handleNum);
-    /* 802C1D6C */ void playBeeGroupSound(JAISoundID soundID, u8);
+    Z2SoundObjBeeGroup();
+    void init(Vec* posPtr, u8 handleNum);
+    void playBeeGroupSound(JAISoundID soundID, u8);
 };  // Size: 0x20
 
 class Z2CreatureFM : public Z2CreatureEnemy {
 public:
-    /* 802C1F54 */ Z2CreatureFM();
-    /* 802C1FB0 */ void deleteObject();
-    /* 802C1FFC */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8);
-    /* 802C20E8 */ void framework(u32 mapinfo, s8 reverb);
-    /* 802C2194 */ Z2SoundHandlePool* startChainSound(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
-    /* 802C2290 */ Z2SoundHandlePool* startChainSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
+    Z2CreatureFM();
+    void deleteObject();
+    void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, u8, u8, u8, u8, u8, u8);
+    void framework(u32 mapinfo, s8 reverb);
+    Z2SoundHandlePool* startChainSound(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
+    Z2SoundHandlePool* startChainSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
 
     /* 0x0A4 */ Z2SoundObjSimple field_0xa4;
     /* 0x0C4 */ Z2SoundObjSimple field_0xc4;
@@ -105,20 +105,20 @@ public:
 
 class Z2CreatureGob : public Z2Creature {
 public:
-    /* 802C24B0 */ void init(Vec*, Vec*, Vec*, u8, u8, u8);
-    /* 802C24D0 */ Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
+    void init(Vec*, Vec*, Vec*, u8, u8, u8);
+    Z2SoundHandlePool* startCreatureVoiceLevel(JAISoundID soundID, s8 reverb);
 };
 
 class Z2CreatureOI : public Z2CreatureEnemy {
 public:
-    /* 802C2578 */ Z2CreatureOI();
-    /* 802C25EC */ void deleteObject();
-    /* 802C2670 */ void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*,
+    Z2CreatureOI();
+    void deleteObject();
+    void init(Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*, Vec*,
                              Vec*);
-    /* 802C2864 */ void framework(u32 mapinfo, s8 reverb);
-    /* 802C29D4 */ Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
-    /* 802C2C84 */ Z2SoundHandlePool* startTentacleSound(JAISoundID soundID, u8, u32 mapinfo, s8 reverb);
-    /* 802C2CD4 */ Z2SoundHandlePool* startTentacleSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
+    void framework(u32 mapinfo, s8 reverb);
+    Z2SoundHandlePool* startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    Z2SoundHandlePool* startTentacleSound(JAISoundID soundID, u8, u32 mapinfo, s8 reverb);
+    Z2SoundHandlePool* startTentacleSoundLevel(JAISoundID soundID, u8, f32, u32 mapinfo, s8 reverb);
 
     /* 0x0A4 */ Z2SoundObjSimple field_0xa4;
     /* 0x0C4 */ Z2SoundObjSimple field_0xc4;
diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h
index 77b105a9f1..464da590de 100644
--- a/include/Z2AudioLib/Z2EnvSeMgr.h
+++ b/include/Z2AudioLib/Z2EnvSeMgr.h
@@ -12,10 +12,10 @@ enum WindType {
 };
 
 struct Z2EnvSeBase {
-    /* 802C589C */ Z2EnvSeBase(Vec* posPtr = NULL);
-    /* 802C58AC */ ~Z2EnvSeBase();
-    /* 802C5908 */ bool startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
-    /* 802C5AB4 */ bool startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
+    Z2EnvSeBase(Vec* posPtr = NULL);
+    ~Z2EnvSeBase();
+    bool startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
+    bool startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps);
 
     JAISoundHandle* getHandle() { return &mHandle; }
     void setPos(Vec* pos) { mPos = pos; }
@@ -25,11 +25,11 @@ struct Z2EnvSeBase {
 };  // Size: 0x8
 
 struct Z2EnvSeAutoPan : public Z2EnvSeBase {
-    /* 802C5ECC */ Z2EnvSeAutoPan();
-    /* 802C5F28 */ ~Z2EnvSeAutoPan();
-    /* 802C5F7C */ void setPanParam(f32 pan, f32 dolby, bool, bool, f32, f32);
-    /* 802C5F98 */ void calcPan();
-    /* 802C60E0 */ bool startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pitch);
+    Z2EnvSeAutoPan();
+    ~Z2EnvSeAutoPan();
+    void setPanParam(f32 pan, f32 dolby, bool, bool, f32, f32);
+    void calcPan();
+    bool startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pitch);
 
     /* 0x08 */ f32 mPan;
     /* 0x0C */ f32 mDolby;
@@ -40,11 +40,11 @@ struct Z2EnvSeAutoPan : public Z2EnvSeBase {
 };  // Size: 0x1C
 
 struct Z2EnvSeDir : public Z2EnvSeBase {
-    /* 802C5C9C */ Z2EnvSeDir(Vec* dir = NULL);
-    /* 802C5D1C */ ~Z2EnvSeDir();
-    /* 802C5D70 */ void setPanDir(Vec* dir);
-    /* 802C5D9C */ void calcPan(f32);
-    /* 802C5E90 */ bool startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume);
+    Z2EnvSeDir(Vec* dir = NULL);
+    ~Z2EnvSeDir();
+    void setPanDir(Vec* dir);
+    void calcPan(f32);
+    bool startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume);
 
     /* 0x08 */ f32 mPan;
     /* 0x0C */ f32 mDolby;
@@ -52,41 +52,41 @@ struct Z2EnvSeDir : public Z2EnvSeBase {
 };  // Size: 0x1C
 
 struct Z2EnvSeMgr : public JASGlobalInstance<Z2EnvSeMgr> {
-    /* 802C611C */ Z2EnvSeMgr();
-    /* 802C6540 */ ~Z2EnvSeMgr();
-    /* 802C66B0 */ void framework();
-    /* 802C6998 */ void resetScene();
-    /* 802C699C */ void resetSceneInner();
-    /* 802C6AC0 */ void initSceneEnvSe(s32 sceneID, s8 room, f32);
-    /* 802C6C1C */ void playSceneEnvSe();
-    /* 802C6C84 */ void initStaticEnvSe(u8, u8, u8, u8, Vec*);
-    /* 802C70C8 */ bool startStaticEnvSe(s8 reverb);
-    /* 802C780C */ void registWindowPos(Vec* posPtr);
-    /* 802C7830 */ bool startRainSe(s32, s8);
-    /* 802C7CF4 */ void startNearThunderSe(s8 reverb);
-    /* 802C7E68 */ void startFarThunderSe(Vec* posPtr, s8 reverb);
-    /* 802C7FB4 */ void setSnowPower(s8 reverb);
-    /* 802C7FBC */ void initStrongWindSe();
-    /* 802C7FC8 */ void setWindDirection(Vec* dir);
-    /* 802C800C */ bool startStrongWindSe(s8 reverb);
-    /* 802C80F8 */ void initRiverSe(u8, u8, u8, u8);
-    /* 802C8234 */ void registRiverSePos(Vec* posPtr);
-    /* 802C8258 */ void setHyrulSewerOpen(bool isSewerOpen);
-    /* 802C8300 */ bool startRiverSe(s8 reverb);
-    /* 802C8730 */ void initFallSe(u8, u8, u8, u8);
-    /* 802C886C */ void registFallSePos(Vec* posPtr);
-    /* 802C8890 */ bool startFallSe(s8 reverb);
-    /* 802C8A90 */ void initEtcSe(u8, u8, u8, u8);
-    /* 802C8C24 */ void registEtcSePos(Vec* posPtr);
-    /* 802C8C48 */ bool startEtcSe(s8 reverb);
-    /* 802C92C8 */ void registWolfSmellSePos(Vec* posPtr);
-    /* 802C92EC */ void startFogWipeTrigger(Vec* pos);
-    /* 802C93A0 */ void setFogWipeWidth(f32 width);
-    /* 802C93E4 */ f32 getFogDensity();
-    /* 802C9400 */ bool startFogSe();
-    /* 802C950C */ void initLv3WaterSe(u8, u8, u8, u8);
-    /* 802C9F58 */ void registLv3WaterSePos(u8, Vec* posPtr);
-    /* 802CA794 */ void startLv3WaterSe(s8 reverb);
+    Z2EnvSeMgr();
+    ~Z2EnvSeMgr();
+    void framework();
+    void resetScene();
+    void resetSceneInner();
+    void initSceneEnvSe(s32 sceneID, s8 room, f32);
+    void playSceneEnvSe();
+    void initStaticEnvSe(u8, u8, u8, u8, Vec*);
+    bool startStaticEnvSe(s8 reverb);
+    void registWindowPos(Vec* posPtr);
+    bool startRainSe(s32, s8);
+    void startNearThunderSe(s8 reverb);
+    void startFarThunderSe(Vec* posPtr, s8 reverb);
+    void setSnowPower(s8 reverb);
+    void initStrongWindSe();
+    void setWindDirection(Vec* dir);
+    bool startStrongWindSe(s8 reverb);
+    void initRiverSe(u8, u8, u8, u8);
+    void registRiverSePos(Vec* posPtr);
+    void setHyrulSewerOpen(bool isSewerOpen);
+    bool startRiverSe(s8 reverb);
+    void initFallSe(u8, u8, u8, u8);
+    void registFallSePos(Vec* posPtr);
+    bool startFallSe(s8 reverb);
+    void initEtcSe(u8, u8, u8, u8);
+    void registEtcSePos(Vec* posPtr);
+    bool startEtcSe(s8 reverb);
+    void registWolfSmellSePos(Vec* posPtr);
+    void startFogWipeTrigger(Vec* pos);
+    void setFogWipeWidth(f32 width);
+    f32 getFogDensity();
+    bool startFogSe();
+    void initLv3WaterSe(u8, u8, u8, u8);
+    void registLv3WaterSePos(u8, Vec* posPtr);
+    void startLv3WaterSe(s8 reverb);
 
     void setWindType(u8 type) { mWindType = type; }
     void registSmellSePos(Vec* posPtr) { registEtcSePos(posPtr); }
diff --git a/include/Z2AudioLib/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr.h
index c88d030b99..162b7244a6 100644
--- a/include/Z2AudioLib/Z2FxLineMgr.h
+++ b/include/Z2AudioLib/Z2FxLineMgr.h
@@ -26,13 +26,13 @@ struct Z2FxLineConfig {
 };  // Size: 0x30
 
 struct Z2FxLineMgr : public JASGlobalInstance<Z2FxLineMgr> {
-    /* 802BA7DC */ Z2FxLineMgr();
-    /* 802BA7FC */ void initDataArc(JKRArchive* arc, JKRHeap* heap);
-    /* 802BAC28 */ void setLineID(s8 fxID, bool, bool);
-    /* 802BAC74 */ void setLine(Z2FxLineConfig* config, bool, bool);
-    /* 802BAE1C */ void setFxForceOff(bool);
-    /* 802BAE48 */ void setUnderWaterFx(bool isUnderWaterFx);
-    /* 802BAEB8 */ void setSceneFx(s32 sceneNo);
+    Z2FxLineMgr();
+    void initDataArc(JKRArchive* arc, JKRHeap* heap);
+    void setLineID(s8 fxID, bool, bool);
+    void setLine(Z2FxLineConfig* config, bool, bool);
+    void setFxForceOff(bool);
+    void setUnderWaterFx(bool isUnderWaterFx);
+    void setSceneFx(s32 sceneNo);
 
     /* 0x00 */ Z2FxLineConfig* mConfig;
     /* 0x04 */ void* mFxLineBuffer[4];
diff --git a/include/Z2AudioLib/Z2LinkMgr.h b/include/Z2AudioLib/Z2LinkMgr.h
index 886226afd9..0510738e61 100644
--- a/include/Z2AudioLib/Z2LinkMgr.h
+++ b/include/Z2AudioLib/Z2LinkMgr.h
@@ -101,9 +101,9 @@ inline Z2CreatureLink* Z2GetLink() {
 
 class Z2CreatureRide;
 struct Z2RideSoundStarter : public Z2SoundStarter {
-    /* 802C5234 */ Z2RideSoundStarter(Z2CreatureRide* ride);
+    Z2RideSoundStarter(Z2CreatureRide* ride);
 
-    /* 802C5284 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle,
+    virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle,
                                            const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
                                            f32 fxMix, f32 pitch, f32 volume, f32 pan,
                                            f32 dolby, u32 moveSteps);
@@ -129,11 +129,11 @@ private:
 
 class Z2SoundObjCoach : public Z2SoundObjBase {
 public:
-    /* 802C54B8 */ Z2SoundObjCoach();
-    /* 802C54FC */ void init(Vec* posPtr, u8 handleNum);
-    /* 802C551C */ Z2SoundHandlePool* startWheelSound(f32);
-    /* 802C56C0 */ Z2SoundHandlePool* startFireSound(u16);
-    /* 802C57C0 */ Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
+    Z2SoundObjCoach();
+    void init(Vec* posPtr, u8 handleNum);
+    Z2SoundHandlePool* startWheelSound(f32);
+    Z2SoundHandlePool* startFireSound(u16);
+    Z2SoundHandlePool* startSound(JAISoundID soundID, u32 mapinfo, s8 reverb);
 
 private:
     /* 0x20 */ f32 field_0x20;
diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h
index 8e07972977..527d63cb38 100644
--- a/include/Z2AudioLib/Z2SeMgr.h
+++ b/include/Z2AudioLib/Z2SeMgr.h
@@ -55,29 +55,29 @@ struct Z2MultiSeObj : Z2MultiSeMgr {
 
 class Z2SeMgr : public JASGlobalInstance<Z2SeMgr> {
 public:
-    /* 802AB64C */ Z2SeMgr();
-    /* 802AB750 */ void initSe();
-    /* 802AB80C */ void resetModY();
-    /* 802AB830 */ void modHeightAtCamera(const Vec**);
-    /* 802AB93C */ void incrCrowdSize();
-    /* 802AB960 */ void decrCrowdSize();
-    /* 802AB984 */ bool seStart(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
+    Z2SeMgr();
+    void initSe();
+    void resetModY();
+    void modHeightAtCamera(const Vec**);
+    void incrCrowdSize();
+    void decrCrowdSize();
+    bool seStart(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
                                 f32 pitch, f32 volume, f32 pan, f32 dolby, u8);
-    /* 802AC50C */ bool seStartLevel(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
+    bool seStartLevel(JAISoundID soundID, const Vec* posPtr, u32, s8 reverb,
                                      f32 pitch, f32 volume, f32 pan, f32 dolby, u8);
-    /* 802AD8B0 */ void seStop(JAISoundID soundID, u32 fadeTime);
-    /* 802AD94C */ void seStopAll(u32 fadeTime);
-    /* 802AD9F4 */ void seMoveVolumeAll(f32 volume, u32 moveTime);
-    /* 802ADB14 */ void messageSePlay(u16, Vec*, s8);
-    /* 802ADB50 */ void talkInSe();
-    /* 802ADC54 */ void talkOutSe();
-    /* 802ADD58 */ void menuInSe();
-    /* 802ADE5C */ void setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb);
-    /* 802ADFF4 */ void setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb);
-    /* 802AE184 */ void processSeFramework();
-    /* 802AE524 */ bool isLevelSe(JAISoundID soundID);
-    /* 802AE5B0 */ bool isSoundCulling(JAISoundID soundID);
-    /* 802B9AC4 */ void resetCrowdSize() { mCrowdSize = 0; }
+    void seStop(JAISoundID soundID, u32 fadeTime);
+    void seStopAll(u32 fadeTime);
+    void seMoveVolumeAll(f32 volume, u32 moveTime);
+    void messageSePlay(u16, Vec*, s8);
+    void talkInSe();
+    void talkOutSe();
+    void menuInSe();
+    void setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb);
+    void setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb);
+    void processSeFramework();
+    bool isLevelSe(JAISoundID soundID);
+    bool isSoundCulling(JAISoundID soundID);
+    void resetCrowdSize() { mCrowdSize = 0; }
 
 #if PLATFORM_WII || PLATFORM_SHIELD
     void homeMenuSeCallback(s32);    
diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h
index ede72e55d4..c200fdd73b 100644
--- a/include/Z2AudioLib/Z2SeqMgr.h
+++ b/include/Z2AudioLib/Z2SeqMgr.h
@@ -127,18 +127,18 @@ public:
 
     void setFieldBgmPlay(bool value) { mFlags.mFieldBgmPlay = value; }
 
-    /* 802B99AC */ void unMuteSceneBgm(u32 fadeTime) {
+    void unMuteSceneBgm(u32 fadeTime) {
         mBgmPause.move(1.0f, 0);
         mSceneBgm.move(1.0f, fadeTime);
     }
 
-    /* 802B9A24 */ void muteSceneBgm(u32 fadeTime, f32 vol) { mSceneBgm.move(vol, fadeTime); }
+    void muteSceneBgm(u32 fadeTime, f32 vol) { mSceneBgm.move(vol, fadeTime); }
 
-    /* 802B9AD0 */ void setTwilightGateVol(f32 vol) {
+    void setTwilightGateVol(f32 vol) {
         mTwilightGateVol = vol < 0.0f ? 0.0f : vol > 1.0f ? 1.0f : vol;
     }
 
-    /* 802B9AFC */ void setWindStoneVol(f32 vol, u32 fadeTime) { mWindStone.move(vol, fadeTime); };
+    void setWindStoneVol(f32 vol, u32 fadeTime) { mWindStone.move(vol, fadeTime); };
 
     void onEnemyDamage() { setBattleSeqState(2); }
 
diff --git a/include/Z2AudioLib/Z2SoundInfo.h b/include/Z2AudioLib/Z2SoundInfo.h
index 1d65714d8b..e2fae177a3 100644
--- a/include/Z2AudioLib/Z2SoundInfo.h
+++ b/include/Z2AudioLib/Z2SoundInfo.h
@@ -9,21 +9,21 @@
 class Z2SoundInfo : public JAISoundInfo, public JAUSoundInfo, public JAIStreamDataMgr, public JASGlobalInstance<Z2SoundInfo> {
 public:
     Z2SoundInfo() : JAISoundInfo(true), JAUSoundInfo(true), JASGlobalInstance<Z2SoundInfo>(true) {}
-    /* 802BB448 */ virtual u16 getAudibleSw(JAISoundID soundID) const;
-    /* 802BB00C */ virtual u16 getBgmSeqResourceID(JAISoundID soundID) const;
-    /* 802BBA88 */ virtual s32 getStreamFileEntry(JAISoundID soundID);
-    /* 802BB090 */ virtual int getSoundType(JAISoundID soundID) const;
-    /* 802BB0D8 */ virtual int getCategory(JAISoundID soundID) const;
-    /* 802BB0E0 */ virtual u32 getPriority(JAISoundID soundID) const;
-    /* 802BB6DC */ virtual void getSeInfo(JAISoundID soundID, JAISe* sePtr) const;
-    /* 802BB8B4 */ virtual void getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const;
-    /* 802BB8E0 */ virtual void getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const;
-    /* 802BBBE0 */ virtual ~Z2SoundInfo() {}
+    virtual u16 getAudibleSw(JAISoundID soundID) const;
+    virtual u16 getBgmSeqResourceID(JAISoundID soundID) const;
+    virtual s32 getStreamFileEntry(JAISoundID soundID);
+    virtual int getSoundType(JAISoundID soundID) const;
+    virtual int getCategory(JAISoundID soundID) const;
+    virtual u32 getPriority(JAISoundID soundID) const;
+    virtual void getSeInfo(JAISoundID soundID, JAISe* sePtr) const;
+    virtual void getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const;
+    virtual void getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const;
+    virtual ~Z2SoundInfo() {}
 
-    /* 802BB158 */ JAUAudibleParam getAudibleSwFull(JAISoundID soundID);
-    /* 802BBA10 */ const char* getStreamFilePath(JAISoundID soundID);
-    /* 802BBAC8 */ int getSwBit(JAISoundID soundID) const;
-    /* 802BBB48 */ void getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const;
+    JAUAudibleParam getAudibleSwFull(JAISoundID soundID);
+    const char* getStreamFilePath(JAISoundID soundID);
+    int getSwBit(JAISoundID soundID) const;
+    void getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const;
 
     BOOL isValid() const {
         return JASGlobalInstance<JAUSoundTable>::getInstance() != NULL && JASGlobalInstance<JAUSoundTable>::getInstance()->isValid();
diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h
index 137d2bc8e7..e8fd244eca 100644
--- a/include/Z2AudioLib/Z2SoundMgr.h
+++ b/include/Z2AudioLib/Z2SoundMgr.h
@@ -9,22 +9,22 @@ u16 seqCallback(JASTrack* track, u16 command);
 
 class Z2SoundMgr : public JASGlobalInstance<Z2SoundMgr> {
 public:
-    /* 802A9E80 */ Z2SoundMgr();
-    /* 802AA1B0 */ void calc();
-    /* 802AA270 */ void setIIR(JAISound* sound, const s16* iir);
-    /* 802AA33C */ void setFilterOff(JAISound* sound);
-    /* 802AA430 */ void resetFilterAll();
-    /* 802AA528 */ void mixOut();
-    /* 802AA67C */ void framework();
-    /* 802AA6B0 */ void pauseAllGameSound(bool paused);
-    /* 802AA7DC */ void stopSoundID(JAISoundID soundID);
-    /* 802AA84C */ void stopSync();
-    /* 802AA8C8 */ void stop();
-    /* 802AA908 */ void initParams();
-    /* 802AA9E8 */ void multiVolumeSoundID(JAISoundID soundID, f32 volume);
-    /* 802AAAC4 */ bool isPlayingSoundID(JAISoundID soundID);
+    Z2SoundMgr();
+    void calc();
+    void setIIR(JAISound* sound, const s16* iir);
+    void setFilterOff(JAISound* sound);
+    void resetFilterAll();
+    void mixOut();
+    void framework();
+    void pauseAllGameSound(bool paused);
+    void stopSoundID(JAISoundID soundID);
+    void stopSync();
+    void stop();
+    void initParams();
+    void multiVolumeSoundID(JAISoundID soundID, f32 volume);
+    bool isPlayingSoundID(JAISoundID soundID);
 
-    /* 802A9EE8 */ virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
+    virtual bool startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr);
 
     JAISeMgr* getSeMgr() { return &seMgr_; }
     const JAISeMgr* getSeMgr() const { return &seMgr_; }
diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h
index 9db08cf480..d7fb5d399a 100644
--- a/include/Z2AudioLib/Z2SoundObject.h
+++ b/include/Z2AudioLib/Z2SoundObject.h
@@ -47,17 +47,17 @@ public:
 
 class Z2SoundObjAnime : public Z2SoundObjBase {
 public:
-    /* 802BEB94 */ Z2SoundObjAnime();
-    /* 802BEBFC */ void initAnime(void* animation, bool, f32 startFrame, f32);
-    /* 802BED68 */ void ageSounds_();
-    /* 802BEED4 */ void updateAnime(f32, f32);
-    /* 802BF304 */ void updateSoundLifeTime_(f32, f32);
-    /* 802BF660 */ void startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
+    Z2SoundObjAnime();
+    void initAnime(void* animation, bool, f32 startFrame, f32);
+    void ageSounds_();
+    void updateAnime(f32, f32);
+    void updateSoundLifeTime_(f32, f32);
+    void startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
                                         Z2SoundStarter* soundStarter, u32 mapinfo, s8 reverb);
-    /* 802BF890 */ u32 getSoundID(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
-    /* 802BF898 */ bool playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
+    u32 getSoundID(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
+    bool playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3<f32>&, f32);
 
-    /* 802BEBDC */ virtual void init(Vec* posPtr, u8 handleNum);
+    virtual void init(Vec* posPtr, u8 handleNum);
 
     void stopAnime() { animation_ = NULL; }
 
@@ -106,8 +106,8 @@ public:
 
 class Z2SoundObjArrow : public Z2DopplerSoundObjBase {
 public:
-    /* 802BEB38 */ Z2SoundObjArrow();
-    /* 802BEB74 */ virtual void init(Vec* posPtr, u8 handleNum);
+    Z2SoundObjArrow();
+    virtual void init(Vec* posPtr, u8 handleNum);
 };
 
 #endif /* Z2SOUNDOBJECT_H */
diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h
index bac45adc6f..f0ab336165 100644
--- a/include/Z2AudioLib/Z2SpeechMgr2.h
+++ b/include/Z2AudioLib/Z2SpeechMgr2.h
@@ -6,9 +6,9 @@
 #include "Z2AudioLib/Z2SoundStarter.h"
 
 struct Z2SpeechStarter : public Z2SoundStarter {
-    /* 802CCFB8 */ Z2SpeechStarter();
+    Z2SpeechStarter();
 
-    /* 802CCFF8 */ virtual bool startSound(JAISoundID, JAISoundHandle*,
+    virtual bool startSound(JAISoundID, JAISoundHandle*,
                                            JGeometry::TVec3<f32> const*, u32, f32, f32, f32, f32,
                                            f32, u32);
 };
@@ -18,17 +18,17 @@ struct Z2SpeechMgr : public JASGlobalInstance<Z2SpeechMgr> {
 };
 
 struct Z2SpeechMgr2 : public JASGlobalInstance<Z2SpeechMgr2> {
-    /* 802CBC60 */ Z2SpeechMgr2();
+    Z2SpeechMgr2();
     ~Z2SpeechMgr2() {}
-    /* 802CBD88 */ void setString(u16 const*, s16, u8, u16);
-    /* 802CBF60 */ void setTextCount(s16);
-    /* 802CC190 */ void speakOneWord(bool);
-    /* 802CC2FC */ bool isNonVerbal();
-    /* 802CC4C0 */ void selectUnit(bool);
-    /* 802CC738 */ void selectTail();
-    /* 802CC9D0 */ void framework();
-    /* 802CCA18 */ void playOneShotVoice(u8, u16, Vec*, s8);
-    /* 802CCF88 */ bool isMidnaSpeak();
+    void setString(u16 const*, s16, u8, u16);
+    void setTextCount(s16);
+    void speakOneWord(bool);
+    bool isNonVerbal();
+    void selectUnit(bool);
+    void selectTail();
+    void framework();
+    void playOneShotVoice(u8, u16, Vec*, s8);
+    bool isMidnaSpeak();
 
     /* 0x000 */ JAISoundHandle field_0x0;
     /* 0x004 */ JAISoundHandle field_0x4;
diff --git a/include/c/c_damagereaction.h b/include/c/c_damagereaction.h
index 0bdc7f2540..3f927e4e32 100644
--- a/include/c/c_damagereaction.h
+++ b/include/c/c_damagereaction.h
@@ -5,9 +5,9 @@
 
 class JPTraceParticleCallBack4 : public JPAParticleCallBack {
 public:
-    /* 8001817C */ void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 800182A4 */ void draw(JPABaseEmitter*, JPABaseParticle*);
-    /* 80018328 */ ~JPTraceParticleCallBack4() {}
+    void execute(JPABaseEmitter*, JPABaseParticle*);
+    void draw(JPABaseEmitter*, JPABaseParticle*);
+    ~JPTraceParticleCallBack4() {}
 };
 
 BOOL cDmrNowMidnaTalk();
diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h
index 8d213efd4a..36dab1ab4a 100644
--- a/include/c/c_dylink.h
+++ b/include/c/c_dylink.h
@@ -4,11 +4,11 @@
 #include "f_op/f_op_scene_mng.h"
 
 struct cDylPhs {
-    /* 80018804 */ static int phase_01(void*);
-    /* 8001880C */ static int phase_02(s16*);
-    /* 80018844 */ static int phase_03(void*);
-    /* 8001884C */ static int Link(request_of_phase_process_class*, s16);
-    /* 80018890 */ static int Unlink(request_of_phase_process_class*, s16);
+    static int phase_01(void*);
+    static int phase_02(s16*);
+    static int phase_03(void*);
+    static int Link(request_of_phase_process_class*, s16);
+    static int Unlink(request_of_phase_process_class*, s16);
 };
 
 struct DynamicNameTableEntry {
diff --git a/include/d/actor/d_a_L7demo_dr.h b/include/d/actor/d_a_L7demo_dr.h
index 67f02b6e13..72d3d4e1dc 100644
--- a/include/d/actor/d_a_L7demo_dr.h
+++ b/include/d/actor/d_a_L7demo_dr.h
@@ -15,20 +15,20 @@ class daDr_c : public fopAc_ac_c {
 public:
     typedef void (daDr_c::*actionFn)();
 
-    /* 805A9238 */ void setAction(actionFn);
-    /* 805A92DC */ void action();
-    /* 805A9304 */ void mtx_set();
-    /* 805A93D4 */ int draw();
-    /* 805A9478 */ void wait();
-    /* 805A963C */ void pl_walk();
-    /* 805A9914 */ void pl_turn();
-    /* 805A9A34 */ void bridge_destroy();
-    /* 805A9D10 */ void bridge_destroy2();
-    /* 805A9EE4 */ int execute();
-    /* 805A9FFC */ int _delete();
-    /* 805AA084 */ int CreateHeap();
-    /* 805AA19C */ BOOL check_start();
-    /* 805AA224 */ int create();
+    void setAction(actionFn);
+    void action();
+    void mtx_set();
+    int draw();
+    void wait();
+    void pl_walk();
+    void pl_turn();
+    void bridge_destroy();
+    void bridge_destroy2();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    BOOL check_start();
+    int create();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_L7low_dr.h b/include/d/actor/d_a_L7low_dr.h
index f3e636ca11..95fbf98ed1 100644
--- a/include/d/actor/d_a_L7low_dr.h
+++ b/include/d/actor/d_a_L7low_dr.h
@@ -15,15 +15,15 @@ class daL7lowDr_c : public fopAc_ac_c {
 public:
     typedef void (daL7lowDr_c::*actionFn)();
 
-    /* 805AA5F8 */ void setAction(actionFn);
-    /* 805AA69C */ void action();
-    /* 805AA748 */ int _delete();
-    /* 805AA7B8 */ void mtx_set();
-    /* 805AA828 */ void fly();
-    /* 805AABF8 */ int execute();
-    /* 805AAC5C */ int CreateHeap();
-    /* 805AAD58 */ int create();
-    /* 805AAEA8 */ int draw();
+    void setAction(actionFn);
+    void action();
+    int _delete();
+    void mtx_set();
+    void fly();
+    int execute();
+    int CreateHeap();
+    int create();
+    int draw();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_L7op_demo_dr.h b/include/d/actor/d_a_L7op_demo_dr.h
index db004fcc51..20970e6b70 100644
--- a/include/d/actor/d_a_L7op_demo_dr.h
+++ b/include/d/actor/d_a_L7op_demo_dr.h
@@ -16,22 +16,22 @@ class daL7ODR_c : public fopAc_ac_c {
 public:
     typedef void (daL7ODR_c::*actionFn)();
 
-    /* 805AB098 */ void setAction(actionFn);
-    /* 805AB13C */ void action();
-    /* 805AB164 */ void setDrAction(actionFn);
-    /* 805AB208 */ void dr_action();
-    /* 805AB230 */ void mtx_set();
-    /* 805AB2E8 */ int draw();
-    /* 805AB3F0 */ void wait();
-    /* 805AB520 */ void pl_walk();
-    /* 805ABC2C */ void setZoomOutCamPos(cXyz&, cXyz&, f32);
-    /* 805ABCF8 */ void dr_wait();
-    /* 805ABE0C */ void dr_fly();
-    /* 805AD7B4 */ int execute();
-    /* 805AD87C */ int _delete();
-    /* 805AD90C */ int CreateHeap();
-    /* 805ADA2C */ BOOL check_start();
-    /* 805ADAC0 */ int create();
+    void setAction(actionFn);
+    void action();
+    void setDrAction(actionFn);
+    void dr_action();
+    void mtx_set();
+    int draw();
+    void wait();
+    void pl_walk();
+    void setZoomOutCamPos(cXyz&, cXyz&, f32);
+    void dr_wait();
+    void dr_fly();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    BOOL check_start();
+    int create();
 
     /* 0x568 */ dBgS_AcchCir mAcchCir;
     /* 0x5A8 */ dBgS_ObjAcch mAcch;
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index 27b98dfbe5..888e8a899c 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -28,10 +28,10 @@ class fopEn_enemy_c;
 class daAlink_lockCursor_c : public dDlst_base_c {
 public:
     daAlink_lockCursor_c() {}
-    /* 80125F14 */ BOOL create();
-    /* 80126358 */ void update();
-    /* 80126424 */ virtual void draw();
-    /* 800CFE68 */ virtual ~daAlink_lockCursor_c() {}
+    BOOL create();
+    void update();
+    virtual void draw();
+    virtual ~daAlink_lockCursor_c() {}
 
     void initFrame() {
         field_0x4 = 0;
@@ -65,11 +65,11 @@ private:
 class daAlink_sight_c : public daPy_sightPacket_c {
 public:
     daAlink_sight_c() {}
-    /* 80126650 */ BOOL create();
-    /* 80126710 */ void onLockFlg();
+    BOOL create();
+    void onLockFlg();
 
-    /* 801266C0 */ virtual void draw();
-    /* 800CFDF4 */ virtual ~daAlink_sight_c() {}
+    virtual void draw();
+    virtual ~daAlink_sight_c() {}
 
     bool getLockFlg() { return mLockFlag; }
     void offLockFlg() { mLockFlag = false; }
@@ -82,12 +82,12 @@ public:
 class daAlink_blur_c : public J3DPacket {
 public:
     daAlink_blur_c() {}
-    /* 801256EC */ void initBlur(f32, int, cXyz const*, cXyz const*, cXyz const*);
-    /* 8012589C */ void copyBlur(cXyz const*, cXyz const*, cXyz const*);
-    /* 80125B0C */ void traceBlur(cXyz const*, cXyz const*, s16);
+    void initBlur(f32, int, cXyz const*, cXyz const*, cXyz const*);
+    void copyBlur(cXyz const*, cXyz const*, cXyz const*);
+    void traceBlur(cXyz const*, cXyz const*, s16);
 
-    /* 80125BF4 */ virtual void draw();
-    /* 800CFD58 */ virtual ~daAlink_blur_c() {}
+    virtual void draw();
+    virtual ~daAlink_blur_c() {}
 
     // private:
     /* 0x010 */ ResTIMG* m_blurTex;
@@ -105,8 +105,8 @@ public:
 class dAlink_bottleWaterPcallBack_c : public JPAParticleCallBack {
 public:
     dAlink_bottleWaterPcallBack_c() { initialize(0.0f); }
-    /* 80124A2C */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 800CFCF8 */ virtual ~dAlink_bottleWaterPcallBack_c() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dAlink_bottleWaterPcallBack_c() {}
 
     void initialize(f32 minY) {
         mHitFlg = 0;
@@ -145,11 +145,11 @@ class daAlink_matAnm_c : public J3DMaterialAnm {
 public:
     daAlink_matAnm_c() { init(); }
 
-    /* 8009D8E4 */ void init();
-    /* 800D0180 */ void offSetFlg() { mSetFlag = FALSE; }
+    void init();
+    void offSetFlg() { mSetFlag = FALSE; }
 
-    /* 800D0B8C */ virtual ~daAlink_matAnm_c() {}
-    /* 8009D90C */ virtual void calc(J3DMaterial*) const;
+    virtual ~daAlink_matAnm_c() {}
+    virtual void calc(J3DMaterial*) const;
 
     static void decMorfFrame() { cLib_calcTimer<u8>(&m_morf_frame); }
     static void setMorfFrame(u8 i_frame) { m_morf_frame = i_frame; }
@@ -3536,8 +3536,8 @@ class daAlinkHIO_c
 #endif
 {
 public:
-    /* 80140B88 */ daAlinkHIO_c();
-    /* 80140C10 */ virtual ~daAlinkHIO_c();
+    daAlinkHIO_c();
+    virtual ~daAlinkHIO_c();
 
     void jumpStateUpdate(const cXyz*, const cXyz*, f32);
     void genMessage(JORMContext*);
@@ -4656,1725 +4656,1725 @@ public:
     class hsChainShape_c : public J3DPacket {
     public:
         hsChainShape_c() {}
-        /* 80107900 */ virtual void draw();
-        /* 800D0CDC */ virtual ~hsChainShape_c() {}
+        virtual void draw();
+        virtual ~hsChainShape_c() {}
     };  // Size: 0x10
 
-    /* 8009D87C */ static BOOL getE3Zhint();
-    /* 8009D884 */ static const char* getAlinkArcName();
-    /* 8009DA60 */ static bool checkStageName(char const*);
-    /* 8009DA98 */ void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
-    /* 8009DB64 */ void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*);
-    /* 8009DC6C */ void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*);
-    /* 8009DD90 */ int jointControll(int);
-    /* 8009E7B8 */ void setUpperFront();
-    /* 8009E91C */ void changeBlendRate(int);
-    /* 8009EB18 */ void resetRootMtx();
-    /* 8009EB58 */ bool modelCallBack(int);
-    /* 8009ECA0 */ int headModelCallBack(int);
-    /* 8009EF7C */ int wolfModelCallBack(int);
-    /* 8009F034 */ void setHatAngle();
-    /* 8009FFF8 */ void calcHairAngle(s16*);
-    /* 800A002C */ void setHairAngle(cXyz*, f32, f32);
-    /* 800A0744 */ void setLookPosFromOut(cXyz*);
-    /* 800A07D8 */ bool checkAttentionPosAngle(cXyz*);
-    /* 800A0868 */ bool checkActorPosAngle(fopAc_ac_c*, cXyz**);
-    /* 800A093C */ cXyz* getNeckAimPos(cXyz*, int*, int);
-    /* 800A142C */ s16 getNeckAimAngle(cXyz*, s16*, s16*, s16*, s16*);
-    /* 800A1AEC */ void setEyeMove(cXyz*, s16, s16);
-    /* 800A1F90 */ void setNeckAngle();
-    /* 800A2198 */ bool commonLineCheck(cXyz*, cXyz*);
-    /* 800A21E0 */ static s16 getMoveBGActorName(cBgS_PolyInfo&, int);
-    /* 800A2280 */ fopAc_ac_c* checkGoronRide();
-    /* 800A22E8 */ void setMoveSlantAngle();
-    /* 800A2710 */ int setArmMatrix();
-    /* 800A29DC */ int setFootMatrix();
-    /* 800A2C24 */ void setMatrixOffset(f32*, f32);
-    /* 800A2CE0 */ int setLegAngle(f32, daAlink_footData_c*, s16*, s16*, int);
-    /* 800A3430 */ void footBgCheck();
-    /* 800A39B8 */ void handBgCheck();
-    /* 800A3C8C */ JKRHeap* setItemHeap();
-    /* 800A3CE4 */ void setIdxMask(u16*, u16*);
-    /* 800A3D0C */ J3DAnmTransform* getAnimeResource(daPy_anmHeap_c*, u16, u32);
-    /* 800A3D7C */ J3DModel* initModel(J3DModelData*, u32, u32);
-    /* 800A3E30 */ J3DModel* initModel(u16, u32);
-    /* 800A3E98 */ J3DModel* initModelEnv(u16, u32);
-    /* 800A3F00 */ int initDemoModel(J3DModel**, char const*, u32);
-    /* 800A3F98 */ static int initDemoBck(mDoExt_bckAnm**, char const*);
-    /* 800A4068 */ int createHeap();
-    /* 800A4910 */ void setSelectEquipItem(int);
-    /* 800A4BC8 */ BOOL checkBoarStart();
-    /* 800A4C40 */ BOOL checkCanoeStart();
-    /* 800A4CB4 */ void playerInit();
-    /* 800A54F4 */ BOOL checkHorseStart(u32, int);
-    /* 800A551C */ int setStartProcInit();
-    /* 800A5CC8 */ int create();
-    /* 800A662C */ s32 setRoomInfo();
-    /* 800A67E0 */ void setShapeAngleOnGround();
-    /* 800A6B0C */ void setStepsOffset();
-    /* 800A6DCC */ void iceSlipBgCheck();
-    /* 800A7050 */ void setIceSlipSpeed();
-    /* 800A7358 */ void setPolygonSpeed();
-    /* 800A7950 */ bool checkWindSpeedOnAngle() const;
-    /* 800A79EC */ bool checkWindSpeedOnAngleAnime(int) const;
-    /* 800A7A5C */ bool checkDashAnime() const;
-    /* 800A7ABC */ f32 checkWindWallRate(cXyz const&);
-    /* 800A7CB0 */ void setWindSpeed();
-    /* 800A8310 */ void setBodyPartPos();
-    /* 800A87F8 */ void setAttentionPos();
-    /* 800A8CE4 */ void setMatrix();
-    /* 800A9248 */ static int simpleAnmPlay(J3DAnmBase*);
-    /* 800A92F0 */ void setSwordPos();
-    /* 800A9450 */ void setItemMatrix(int);
-    /* 800A9F4C */ void setWolfItemMatrix();
-    /* 800AA2BC */ void setHandIndex(daAlink_c::daAlink_ANM);
-    /* 800AA2E0 */ void setSwordAtCollision(int);
-    /* 800AA5E8 */ BOOL checkNoCollisionCorret();
-    /* 800AA6B4 */ void decSwordBlur();
-    /* 800AA714 */ void resetWolfAtCollision();
-    /* 800AA7EC */ void setWolfAtCollision();
-    /* 800AA9DC */ void resetAtCollision(int);
-    /* 800AAABC */ void setAtCollision();
-    /* 800AB878 */ void setWolfCollisionPos();
-    /* 800ABAE0 */ void initLockAt();
-    /* 800ABB28 */ void cancelLockAt();
-    /* 800ABB84 */ void setCollisionPos();
-    /* 800ABDB8 */ void setCollision();
-    /* 800AC394 */ void setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end,
+    static BOOL getE3Zhint();
+    static const char* getAlinkArcName();
+    static bool checkStageName(char const*);
+    void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
+    void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*);
+    void setMatrixWorldAxisRot(f32 (*)[4], s16, s16, s16, int, cXyz const*);
+    int jointControll(int);
+    void setUpperFront();
+    void changeBlendRate(int);
+    void resetRootMtx();
+    bool modelCallBack(int);
+    int headModelCallBack(int);
+    int wolfModelCallBack(int);
+    void setHatAngle();
+    void calcHairAngle(s16*);
+    void setHairAngle(cXyz*, f32, f32);
+    void setLookPosFromOut(cXyz*);
+    bool checkAttentionPosAngle(cXyz*);
+    bool checkActorPosAngle(fopAc_ac_c*, cXyz**);
+    cXyz* getNeckAimPos(cXyz*, int*, int);
+    s16 getNeckAimAngle(cXyz*, s16*, s16*, s16*, s16*);
+    void setEyeMove(cXyz*, s16, s16);
+    void setNeckAngle();
+    bool commonLineCheck(cXyz*, cXyz*);
+    static s16 getMoveBGActorName(cBgS_PolyInfo&, int);
+    fopAc_ac_c* checkGoronRide();
+    void setMoveSlantAngle();
+    int setArmMatrix();
+    int setFootMatrix();
+    void setMatrixOffset(f32*, f32);
+    int setLegAngle(f32, daAlink_footData_c*, s16*, s16*, int);
+    void footBgCheck();
+    void handBgCheck();
+    JKRHeap* setItemHeap();
+    void setIdxMask(u16*, u16*);
+    J3DAnmTransform* getAnimeResource(daPy_anmHeap_c*, u16, u32);
+    J3DModel* initModel(J3DModelData*, u32, u32);
+    J3DModel* initModel(u16, u32);
+    J3DModel* initModelEnv(u16, u32);
+    int initDemoModel(J3DModel**, char const*, u32);
+    static int initDemoBck(mDoExt_bckAnm**, char const*);
+    int createHeap();
+    void setSelectEquipItem(int);
+    BOOL checkBoarStart();
+    BOOL checkCanoeStart();
+    void playerInit();
+    BOOL checkHorseStart(u32, int);
+    int setStartProcInit();
+    int create();
+    s32 setRoomInfo();
+    void setShapeAngleOnGround();
+    void setStepsOffset();
+    void iceSlipBgCheck();
+    void setIceSlipSpeed();
+    void setPolygonSpeed();
+    bool checkWindSpeedOnAngle() const;
+    bool checkWindSpeedOnAngleAnime(int) const;
+    bool checkDashAnime() const;
+    f32 checkWindWallRate(cXyz const&);
+    void setWindSpeed();
+    void setBodyPartPos();
+    void setAttentionPos();
+    void setMatrix();
+    static int simpleAnmPlay(J3DAnmBase*);
+    void setSwordPos();
+    void setItemMatrix(int);
+    void setWolfItemMatrix();
+    void setHandIndex(daAlink_c::daAlink_ANM);
+    void setSwordAtCollision(int);
+    BOOL checkNoCollisionCorret();
+    void decSwordBlur();
+    void resetWolfAtCollision();
+    void setWolfAtCollision();
+    void resetAtCollision(int);
+    void setAtCollision();
+    void setWolfCollisionPos();
+    void initLockAt();
+    void cancelLockAt();
+    void setCollisionPos();
+    void setCollision();
+    void setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end,
                                      f32 i_rate, f32 i_frame);
-    /* 800AC450 */ const daAlink_BckData* getMainBckData(daAlink_c::daAlink_ANM) const;
-    /* 800AC558 */ BOOL checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const;
-    /* 800AC5B4 */ BOOL checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM) const;
-    /* 800AC610 */ int getUnderUpperAnime(daAlink_c::daAlink_ANM, J3DAnmTransform**,
+    const daAlink_BckData* getMainBckData(daAlink_c::daAlink_ANM) const;
+    BOOL checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM) const;
+    BOOL checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM) const;
+    int getUnderUpperAnime(daAlink_c::daAlink_ANM, J3DAnmTransform**,
                                           J3DAnmTransform**, int, u32);
-    /* 800AC738 */ void setDoubleAnimeBlendRatio(f32);
-    /* 800AC754 */ void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*,
+    void setDoubleAnimeBlendRatio(f32);
+    void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*,
                                           J3DAnmTransform*, f32, f32, f32, int);
-    /* 800ACA14 */ int setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM, daAlink_c::daAlink_ANM,
+    int setDoubleAnime(f32, f32, f32, daAlink_c::daAlink_ANM, daAlink_c::daAlink_ANM,
                                       int, f32);
-    /* 800ACD40 */ void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16);
-    /* 800ACF80 */ void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID);
-    /* 800ACFB0 */ void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anmID, f32);
-    /* 800ACFE0 */ void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anmID, f32 speed, f32 morf);
-    /* 800AD00C */ int setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF,
+    void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, f32, f32, s16);
+    void setSingleAnimeBase(daAlink_c::daAlink_ANM anmID);
+    void setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM anmID, f32);
+    void setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM anmID, f32 speed, f32 morf);
+    int setSingleAnime(daAlink_c::daAlink_ANM anmID, f32 rate, f32 start, s16 endF,
                                       f32 morf);
-    /* 800AD0F4 */ int setSingleAnimeParam(daAlink_c::daAlink_ANM anmID, daAlinkHIO_anm_c const*);
-    /* 800AD128 */ void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*);
-    /* 800AD170 */ void allAnimePlay();
-    /* 800AD2D8 */ void setUpperAnimeMorf(f32);
-    /* 800AD340 */ void setUpperAnimeBase(u16);
-    /* 800AD374 */ void setUpperAnimeBaseMorf(u16, f32);
-    /* 800AD3A8 */ void setUpperAnimeBaseSpeed(u16, f32, f32);
-    /* 800AD3D8 */ int setUpperAnime(u16, daAlink_c::daAlink_UPPER, f32, f32, s16, f32);
-    /* 800AD6F0 */ void setUpperAnimeParam(u16, daAlink_c::daAlink_UPPER, daAlinkHIO_anm_c const*);
-    /* 800AD724 */ int resetUpperAnime(daAlink_c::daAlink_UPPER, f32);
-    /* 800AD8F4 */ void setUnderAnimeMorf(f32);
-    /* 800AD964 */ int setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32);
-    /* 800ADAB8 */ int setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*);
-    /* 800ADAEC */ int resetUnderAnime(daAlink_c::daAlink_UNDER, f32);
-    /* 800ADB78 */ void setOldRootQuaternion(s16, s16, s16);
-    /* 800ADC50 */ BOOL checkAtnLeftAnime();
-    /* 800ADCEC */ BOOL checkAtnRightAnime();
-    /* 800ADD88 */ f32 getMoveGroundAngleSpeedRate();
-    /* 800ADE14 */ void setBlendMoveAnime(f32);
-    /* 800AEA70 */ void setBlendAtnMoveAnime(f32);
-    /* 800AF11C */ void setBlendAtnBackMoveAnime(f32);
-    /* 800AF4B0 */ void setFaceBck(u16, int, u16);
-    /* 800AF61C */ void setFaceBtp(u16, int, u16);
-    /* 800AF7D0 */ void setFaceBtk(u16, int, u16);
-    /* 800AF8A0 */ daAlink_FTANM setFaceBasicTexture(daAlink_c::daAlink_FTANM);
-    /* 800AF9A8 */ void setFaceBasicAnime(daAlink_c::daAlink_ANM);
-    /* 800AFAA8 */ void setFacePriTexture(daAlink_c::daAlink_FTANM);
-    /* 800AFB14 */ void setFacePriAnime(daAlink_c::daAlink_ANM);
-    /* 800AFB74 */ void resetFacePriBck();
-    /* 800AFBD0 */ void resetFacePriBtp();
-    /* 800AFC2C */ void resetFacePriBtk();
-    /* 800AFC88 */ void resetFacePriTexture();
-    /* 800AFCBC */ void resetFacePriAnime();
-    /* 800AFCF0 */ void playFaceTextureAnime();
-    /* 800B0098 */ s16 getGroundAngle(cBgS_PolyInfo*, s16);
-    /* 800B0150 */ s16 getRoofAngle(cBgS_PolyInfo*, s16);
-    /* 800B01FC */ BOOL getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int);
-    /* 800B02BC */ void setFrontWallType();
-    /* 800B1488 */ BOOL checkWaterPolygonUnder();
-    /* 800B14B4 */ void setWaterY();
-    /* 800B154C */ void setHangWaterY();
-    /* 800B172C */ void setSandDownBgCheckWallH();
-    /* 800B1770 */ void setBgCheckParam();
-    /* 800B1B28 */ BOOL checkNotJumpSinkLimit();
-    /* 800B1B68 */ BOOL checkNotItemSinkLimit();
-    /* 800B1BAC */ void setSandShapeOffset();
-    /* 800B1FB8 */ bool checkLv2MiddleBossBgRide(s16);
-    /* 800B1FD8 */ bool getSlidePolygon(cM3dGPla*);
-    /* 800B21EC */ BOOL checkSlope() const;
-    /* 800B25CC */ BOOL itemTriggerCheck(u8);
-    /* 800B25E8 */ BOOL itemButtonCheck(u8);
-    /* 800B2604 */ BOOL itemButton();
-    /* 800B2634 */ BOOL itemTrigger();
-    /* 800B2664 */ BOOL spActionButton();
-    /* 800B2688 */ BOOL spActionTrigger();
-    /* 800B26AC */ BOOL midnaTalkTrigger() const;
-    /* 800B26B8 */ BOOL swordSwingTrigger();
-    /* 800B26DC */ void setItemActionButtonStatus(u8);
-    /* 800B26FC */ BOOL itemActionTrigger();
-    /* 800B271C */ void setStickData();
-    /* 800B2EA4 */ void setAtnList();
-    /* 800B3220 */ void setRStatus(u8);
-    /* 800B3238 */ void setRStatusEmphasys(u8);
-    /* 800B3250 */ void setDoStatus(u8);
-    /* 800B3268 */ void setDoStatusEmphasys(u8);
-    /* 800B3280 */ void setDoStatusContinuation(u8);
-    /* 800B3298 */ void setBStatus(u8);
-    /* 800B32B0 */ BOOL checkAtnWaitAnime();
-    /* 800B3358 */ void setTiredVoice(daPy_frameCtrl_c*);
-    /* 800B33E4 */ BOOL checkRestHPAnime();
-    /* 800B3494 */ static int getDirectionFromAngle(s16 angle);
-    /* 800B3500 */ bool checkAttentionState();
-    /* 800B3630 */ s16 getShapeAngleYAtnActor();
-    /* 800B3734 */ bool setShapeAngleToAtnActor(int);
-    /* 800B3844 */ void initServiceWaitTime();
-    /* 800B3904 */ bool checkZeroSpeedF() const;
-    /* 800B3924 */ void setNormalSpeedF(f32, f32);
-    /* 800B3F2C */ f32 getStickAngleDistanceRate();
-    /* 800B3FD4 */ void setSpeedAndAngleNormal();
-    /* 800B444C */ void setSpeedAndAngleAtn();
-    /* 800B477C */ int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*);
-    /* 800B47B4 */ bool checkServiceWaitMode();
-    /* 800B48D0 */ void setJumpMode();
-    /* 800B4908 */ f32 getMetamorphoseNearDis() const;
-    /* 800B4918 */ f32 getMetamorphoseFarDis() const;
-    /* 800B4928 */ s16 getMetamorphoseFarAngle() const;
-    /* 800B4938 */ void setMidnaMsg();
-    /* 800B4950 */ BOOL notTalk();
-    /* 800B4A08 */ BOOL setTalkStatus();
-    /* 800B4B2C */ f32 getFrontRollRate();
-    /* 800B4B7C */ void decideCommonDoStatus();
-    /* 800B5284 */ void decideDoStatus();
-    /* 800B58EC */ BOOL checkWaitAction();
-    /* 800B5BC0 */ void setFallVoice();
-    /* 800B5C34 */ void setLandPassiveData();
-    /* 800B5C64 */ void setStepLandVibration();
-    /* 800B5CCC */ BOOL checkLandAction(int);
-    /* 800B5F6C */ BOOL checkSlideAction();
-    /* 800B607C */ BOOL checkAutoJumpAction();
-    /* 800B69CC */ BOOL checkCutJumpInFly();
-    /* 800B6A30 */ BOOL checkFrontWallTypeAction();
-    /* 800B6F28 */ int checkItemActionInitStart();
-    /* 800B7090 */ int checkItemChangeAutoAction();
-    /* 800B7168 */ void setFastShotTimer();
-    /* 800B7190 */ void cancelItemUseQuake(int);
-    /* 800B71EC */ int cancelUpperItemReadyAnime(int);
-    /* 800B72E4 */ BOOL checkItemActorPointer();
-    /* 800B7390 */ bool checkSwordTwirlAction();
-    /* 800B74B4 */ BOOL checkUpperItemActionFly();
-    /* 800B7528 */ void checkItemButtonChange();
-    /* 800B75EC */ BOOL checkUpperItemAction();
-    /* 800B7B7C */ void orderPeep();
-    /* 800B7BF8 */ int orderTalk(int);
-    /* 800B80C4 */ int orderZTalk();
-    /* 800B8374 */ int checkNormalAction();
-    /* 800B8930 */ bool checkReadyItem();
-    /* 800B8988 */ BOOL checkItemAction();
-    /* 800B9010 */ BOOL checkRAction();
-    /* 800B9018 */ BOOL checkMoveDoAction();
-    /* 800B9148 */ BOOL checkSideRollAction(int);
-    /* 800B9254 */ BOOL checkNoUpperAnime() const;
-    /* 800B92D0 */ BOOL checkOneHandItemEquipAnime() const;
-    /* 800B92F8 */ BOOL checkItemEquipAnime() const;
-    /* 800B9340 */ BOOL checkEquipAnime() const;
-    /* 800B9398 */ BOOL checkWindDashAnime() const;
-    /* 800B93CC */ BOOL checkSwordTwirlAnime() const;
-    /* 800B93F4 */ void swordEquip(int);
-    /* 800B9580 */ void swordUnequip();
-    /* 800B9640 */ void itemEquip(u16 i_itemID);
-    /* 800B96A4 */ void itemUnequip(u16 i_itemID, f32 i_playSpeed);
-    /* 800B97EC */ bool checkFastUnequip();
-    /* 800B983C */ void allUnequip(int);
-    /* 800B994C */ BOOL checkItemChangeFromButton();
-    /* 800B9D2C */ BOOL checkNextActionFromButton();
-    /* 800B9F50 */ BOOL checkGroundSpecialMode();
-    /* 800BA09C */ int commonCheckNextAction(int);
-    /* 800BA0D0 */ int checkNextAction(int);
-    /* 800BA6A0 */ void commonChangeItem();
-    /* 800BA914 */ void setItemAction();
-    /* 800BAF08 */ BOOL checkNextActionFromCrouch(int);
-    /* 800BAF80 */ int checkUpperReadyThrowAnime() const;
-    /* 800BB020 */ void getBodyAngleXBasePos(cXyz*);
-    /* 800BB084 */ s16 getBodyAngleXAtnActor(int);
-    /* 800BB2B0 */ void setBodyAngleXReadyAnime(int);
-    /* 800BB324 */ void setMagicArmorBrk(int);
-    /* 800BB408 */ BOOL checkMagicArmorHeavy() const;
-    /* 800BB4B8 */ BOOL checkHeavyStateOn(int, int);
-    /* 800BB644 */ void initGravity();
-    /* 800BB770 */ void setSpecialGravity(f32, f32, int);
-    /* 800BB7A0 */ void transAnimeProc(cXyz*, f32, f32);
-    /* 800BBD40 */ void setFootSpeed();
-    /* 800BBF68 */ void posMove();
-    /* 800BD6FC */ void autoGroundHit();
-    /* 800BDD70 */ bool startPeepChange();
-    /* 800BDE20 */ void setLastSceneDamage(int, u32*);
-    /* 800BDE48 */ void setLastSceneMode(u32*);
-    /* 800BDF60 */ int startRestartRoom(u32, int, int, int);
-    /* 800BE26C */ BOOL checkCoachGuardGame();
-    /* 800BE2C0 */ void checkRoofRestart();
-    /* 800BE3E4 */ BOOL checkRestartRoom();
-    /* 800BE9D4 */ s16 getSceneExitMoveAngle();
-    /* 800BEAF8 */ int checkSceneChange(int i_exitID);
-    /* 800BF0B8 */ void voiceStartLevel(u32);
-    /* 800BF0EC */ void seStartSwordCut(u32);
-    /* 800BF194 */ void seStartMapInfo(u32);
-    /* 800BF1CC */ void seStartMapInfoLevel(u32);
-    /* 800BF204 */ void setBasAnime(daAlink_c::daAlink_UNDER);
-    /* 800BF37C */ void initBasAnime();
-    /* 800BF4E0 */ void resetBasAnime();
-    /* 800BF500 */ BOOL checkSightLine(f32, cXyz*);
-    /* 800BF79C */ void setMetamorphoseModel(int);
-    /* 800BF854 */ void keepItemData();
-    /* 800BF884 */ void returnKeepItemData();
-    /* 800BF8D0 */ BOOL setItemModel();
-    /* 800BF9F0 */ BOOL setItemActor();
-    /* 800BFD74 */ void makeItemType();
-    /* 800BFDB0 */ BOOL checkZoraWearAbility() const;
-    /* 800BFDFC */ BOOL checkMagicArmorWearAbility() const;
-    /* 800BFE48 */ J3DModelData* loadAramBmd(u16, u32);
-    /* 800BFF04 */ void* loadAram(u16, u32);
-    /* 800BFF70 */ J3DAnmTevRegKey* loadAramItemBrk(u16, J3DModel*);
-    /* 800BFFCC */ J3DAnmTextureSRTKey* loadAramItemBtk(u16, J3DModel*);
-    /* 800C0028 */ J3DAnmTexPattern* loadAramItemBtp(u16, J3DModel*);
-    /* 800C0084 */ void changeItemBck(u16, f32);
-    /* 800C0114 */ int checkGroupItem(int, int) const;
-    /* 800C0164 */ int checkSetItemTrigger(int);
-    /* 800C0208 */ int checkItemSetButton(int);
-    /* 800C0284 */ static bool checkField();
-    /* 800C02C8 */ static bool checkBossRoom();
-    /* 800C0310 */ static bool checkDungeon();
-    /* 800C0358 */ static bool checkCastleTown();
-    /* 800C03A0 */ static bool checkCloudSea();
-    /* 800C03E8 */ static bool checkRoomOnly();
-    /* 800C044C */ static bool checkLv2DungeonRoomSpecial();
-    /* 800C04B4 */ static bool checkRoomSpecial();
-    /* 800C0520 */ static bool checkRoom();
-    /* 800C0594 */ static bool checkNotBattleStage();
-    /* 800C05DC */ static bool checkNotHeavyBootsStage();
-    /* 800C0630 */ static bool checkNotAutoJumpStage();
-    /* 800C0678 */ static bool checkCastleTownUseItem(u16);
-    /* 800C077C */ int changeItemTriggerKeepProc(u8, int);
-    /* 800C0A9C */ int checkNewItemChange(u8);
-    /* 800C12DC */ void deleteEquipItem(int playSound, int deleteKantera);
-    /* 800C1704 */ void setLight();
-    /* 800C1CEC */ void setFrontRollCrashShock(u8);
-    /* 800C1E0C */ void changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE);
-    /* 800C1F6C */ void commonProcInit(daAlink_c::daAlink_PROC procID);
-    /* 800C2DA4 */ BOOL commonProcInitNotSameProc(daAlink_PROC procID);
-    /* 800C2DDC */ int procPreActionUnequipInit(int, fopAc_ac_c*);
-    /* 800C2EAC */ int procPreActionUnequip();
-    /* 800C3098 */ int procServiceWaitInit();
-    /* 800C30F0 */ int procServiceWait();
-    /* 800C3224 */ int procTiredWaitInit();
-    /* 800C3338 */ int procTiredWait();
-    /* 800C33B8 */ int procWaitInit();
-    /* 800C3504 */ int procWait();
-    /* 800C36CC */ int procMoveInit();
-    /* 800C3730 */ int procMove();
-    /* 800C3810 */ int procAtnMoveInit();
-    /* 800C3868 */ int procAtnMove();
-    /* 800C38CC */ int procAtnActorWaitInit();
-    /* 800C397C */ int procAtnActorWait();
-    /* 800C39EC */ int procAtnActorMoveInit();
-    /* 800C3A44 */ int procAtnActorMove();
-    /* 800C3A94 */ int procWaitTurnInit();
-    /* 800C3B1C */ int procWaitTurn();
-    /* 800C3C3C */ int procMoveTurnInit(int);
-    /* 800C3D38 */ int procMoveTurn();
-    /* 800C3DA0 */ int procSideStepInit(int);
-    /* 800C3F60 */ int procSideStep();
-    /* 800C40F0 */ int procSideStepLandInit();
-    /* 800C4278 */ int procSideStepLand();
-    /* 800C4378 */ int procSlideInit(s16);
-    /* 800C4514 */ int procSlide();
-    /* 800C47AC */ int procSlideLandInit(int);
-    /* 800C4894 */ int procSlideLand();
-    /* 800C494C */ int procFrontRollInit();
-    /* 800C4B40 */ int procFrontRoll();
-    /* 800C4F14 */ int procFrontRollCrashInit();
-    /* 800C4FFC */ int procFrontRollCrash();
-    /* 800C5160 */ int procFrontRollSuccessInit();
-    /* 800C5240 */ int procFrontRollSuccess();
-    /* 800C5328 */ int procSideRollInit(int);
-    /* 800C5484 */ int procSideRoll();
-    /* 800C5700 */ void backJumpSpeedDec();
-    /* 800C57A4 */ int procBackJumpInit(int);
-    /* 800C5964 */ int procBackJump();
-    /* 800C5A54 */ int procBackJumpLandInit(int);
-    /* 800C5AF0 */ int procBackJumpLand();
-    /* 800C5C28 */ int procSlipInit();
-    /* 800C5CA4 */ int procSlip();
-    /* 800C5E68 */ int procAutoJumpInit(int);
-    /* 800C61EC */ int procAutoJump();
-    /* 800C66DC */ int procDiveJumpInit();
-    /* 800C6798 */ int procDiveJump();
-    /* 800C6850 */ int procRollJumpInit();
-    /* 800C692C */ int procRollJump();
-    /* 800C6A48 */ int procFallInit(int, f32);
-    /* 800C6D20 */ int procFall();
-    /* 800C6F18 */ int procLandInit(f32);
-    /* 800C6FE4 */ int procLand();
-    /* 800C70F8 */ int procSmallJumpInit(int);
-    /* 800C72D4 */ int procSmallJump();
-    /* 800C74D4 */ int procStepMoveInit();
-    /* 800C755C */ int procStepMove();
-    /* 800C7690 */ int procCrouchInit();
-    /* 800C76F8 */ int procCrouch();
-    /* 800C77F4 */ int procCoMetamorphoseInit();
-    /* 800C7C64 */ int procCoMetamorphose();
-    /* 800C82E8 */ int procCoMetamorphoseOnlyInit();
-    /* 800C83A0 */ int procCoMetamorphoseOnly();
-    /* 800C8460 */ int procFloorDownReboundInit();
-    /* 800C84D0 */ int procFloorDownRebound();
-    /* 800C854C */ int procGoronRideWaitInit(fopAc_ac_c*);
-    /* 800C85D8 */ int procGoronRideWait();
-    /* 800C8700 */ int execute();
-    /* 800CAFC8 */ void setDrawHand();
-    /* 800CB480 */ bool checkSwordDraw();
-    /* 800CB53C */ bool checkShieldDraw();
-    /* 800CB5F8 */ bool checkItemDraw();
-    /* 800CB694 */ int initShadowScaleLight();
-    /* 800CBA38 */ int moveShadowScaleLight();
-    /* 800CBC18 */ void shadowDraw();
-    /* 800CC25C */ void modelCalc(J3DModel*);
-    /* 800CC298 */ void basicModelDraw(J3DModel*);
-    /* 800CC2E0 */ void modelDraw(J3DModel*, int);
-    /* 800CC364 */ void setWaterDropColor(J3DGXColorS10 const*);
-    /* 800CC7DC */ void initTevCustomColor();
-    /* 800CC7FC */ int draw();
-    /* 800CD7AC */ ~daAlink_c();
-    /* 800CE294 */ bool checkNoSubjectModeCamera();
-    /* 800CE468 */ bool acceptSubjectModeChange();
-    /* 800CE628 */ int checkSubjectAction();
-    /* 800CE728 */ s16 checkBodyAngleX(s16);
-    /* 800CE8A0 */ BOOL setBodyAngleToCamera();
-    /* 800CEAF4 */ void setSubjectMode();
-    /* 800CEB58 */ BOOL subjectCancelTrigger();
-    /* 800CEBD8 */ int checkSubjectEnd(int);
-    /* 800CECE4 */ void searchPeepObj(fopAc_ac_c*, void*);
-    /* 800CED84 */ int procCoSubjectivityInit();
-    /* 800CEE08 */ int procCoSubjectivity();
-    /* 800CEF70 */ int procCoSwimSubjectivityInit();
-    /* 800CF018 */ int procCoSwimSubjectivity();
-    /* 800CF100 */ int procCoPeepSubjectivityInit();
-    /* 800CF1B8 */ int procCoPeepSubjectivity();
-    /* 800CF380 */ daAlink_c();
-    /* 800D0110 */ BOOL checkWolfEnemyThrowAnime() const {
+    int setSingleAnimeParam(daAlink_c::daAlink_ANM anmID, daAlinkHIO_anm_c const*);
+    void animePlay(J3DAnmTransform*, daPy_frameCtrl_c*);
+    void allAnimePlay();
+    void setUpperAnimeMorf(f32);
+    void setUpperAnimeBase(u16);
+    void setUpperAnimeBaseMorf(u16, f32);
+    void setUpperAnimeBaseSpeed(u16, f32, f32);
+    int setUpperAnime(u16, daAlink_c::daAlink_UPPER, f32, f32, s16, f32);
+    void setUpperAnimeParam(u16, daAlink_c::daAlink_UPPER, daAlinkHIO_anm_c const*);
+    int resetUpperAnime(daAlink_c::daAlink_UPPER, f32);
+    void setUnderAnimeMorf(f32);
+    int setUnderAnime(u16, daAlink_c::daAlink_UNDER, f32, f32, s16, f32);
+    int setUnderAnimeParam(u16, daAlink_c::daAlink_UNDER, daAlinkHIO_anm_c const*);
+    int resetUnderAnime(daAlink_c::daAlink_UNDER, f32);
+    void setOldRootQuaternion(s16, s16, s16);
+    BOOL checkAtnLeftAnime();
+    BOOL checkAtnRightAnime();
+    f32 getMoveGroundAngleSpeedRate();
+    void setBlendMoveAnime(f32);
+    void setBlendAtnMoveAnime(f32);
+    void setBlendAtnBackMoveAnime(f32);
+    void setFaceBck(u16, int, u16);
+    void setFaceBtp(u16, int, u16);
+    void setFaceBtk(u16, int, u16);
+    daAlink_FTANM setFaceBasicTexture(daAlink_c::daAlink_FTANM);
+    void setFaceBasicAnime(daAlink_c::daAlink_ANM);
+    void setFacePriTexture(daAlink_c::daAlink_FTANM);
+    void setFacePriAnime(daAlink_c::daAlink_ANM);
+    void resetFacePriBck();
+    void resetFacePriBtp();
+    void resetFacePriBtk();
+    void resetFacePriTexture();
+    void resetFacePriAnime();
+    void playFaceTextureAnime();
+    s16 getGroundAngle(cBgS_PolyInfo*, s16);
+    s16 getRoofAngle(cBgS_PolyInfo*, s16);
+    BOOL getWallEdgePos(cXyz const&, cM3dGPla*, cM3dGPla*, cXyz*, int);
+    void setFrontWallType();
+    BOOL checkWaterPolygonUnder();
+    void setWaterY();
+    void setHangWaterY();
+    void setSandDownBgCheckWallH();
+    void setBgCheckParam();
+    BOOL checkNotJumpSinkLimit();
+    BOOL checkNotItemSinkLimit();
+    void setSandShapeOffset();
+    bool checkLv2MiddleBossBgRide(s16);
+    bool getSlidePolygon(cM3dGPla*);
+    BOOL checkSlope() const;
+    BOOL itemTriggerCheck(u8);
+    BOOL itemButtonCheck(u8);
+    BOOL itemButton();
+    BOOL itemTrigger();
+    BOOL spActionButton();
+    BOOL spActionTrigger();
+    BOOL midnaTalkTrigger() const;
+    BOOL swordSwingTrigger();
+    void setItemActionButtonStatus(u8);
+    BOOL itemActionTrigger();
+    void setStickData();
+    void setAtnList();
+    void setRStatus(u8);
+    void setRStatusEmphasys(u8);
+    void setDoStatus(u8);
+    void setDoStatusEmphasys(u8);
+    void setDoStatusContinuation(u8);
+    void setBStatus(u8);
+    BOOL checkAtnWaitAnime();
+    void setTiredVoice(daPy_frameCtrl_c*);
+    BOOL checkRestHPAnime();
+    static int getDirectionFromAngle(s16 angle);
+    bool checkAttentionState();
+    s16 getShapeAngleYAtnActor();
+    bool setShapeAngleToAtnActor(int);
+    void initServiceWaitTime();
+    bool checkZeroSpeedF() const;
+    void setNormalSpeedF(f32, f32);
+    f32 getStickAngleDistanceRate();
+    void setSpeedAndAngleNormal();
+    void setSpeedAndAngleAtn();
+    int checkRequestTalkActor(dAttList_c*, fopAc_ac_c*);
+    bool checkServiceWaitMode();
+    void setJumpMode();
+    f32 getMetamorphoseNearDis() const;
+    f32 getMetamorphoseFarDis() const;
+    s16 getMetamorphoseFarAngle() const;
+    void setMidnaMsg();
+    BOOL notTalk();
+    BOOL setTalkStatus();
+    f32 getFrontRollRate();
+    void decideCommonDoStatus();
+    void decideDoStatus();
+    BOOL checkWaitAction();
+    void setFallVoice();
+    void setLandPassiveData();
+    void setStepLandVibration();
+    BOOL checkLandAction(int);
+    BOOL checkSlideAction();
+    BOOL checkAutoJumpAction();
+    BOOL checkCutJumpInFly();
+    BOOL checkFrontWallTypeAction();
+    int checkItemActionInitStart();
+    int checkItemChangeAutoAction();
+    void setFastShotTimer();
+    void cancelItemUseQuake(int);
+    int cancelUpperItemReadyAnime(int);
+    BOOL checkItemActorPointer();
+    bool checkSwordTwirlAction();
+    BOOL checkUpperItemActionFly();
+    void checkItemButtonChange();
+    BOOL checkUpperItemAction();
+    void orderPeep();
+    int orderTalk(int);
+    int orderZTalk();
+    int checkNormalAction();
+    bool checkReadyItem();
+    BOOL checkItemAction();
+    BOOL checkRAction();
+    BOOL checkMoveDoAction();
+    BOOL checkSideRollAction(int);
+    BOOL checkNoUpperAnime() const;
+    BOOL checkOneHandItemEquipAnime() const;
+    BOOL checkItemEquipAnime() const;
+    BOOL checkEquipAnime() const;
+    BOOL checkWindDashAnime() const;
+    BOOL checkSwordTwirlAnime() const;
+    void swordEquip(int);
+    void swordUnequip();
+    void itemEquip(u16 i_itemID);
+    void itemUnequip(u16 i_itemID, f32 i_playSpeed);
+    bool checkFastUnequip();
+    void allUnequip(int);
+    BOOL checkItemChangeFromButton();
+    BOOL checkNextActionFromButton();
+    BOOL checkGroundSpecialMode();
+    int commonCheckNextAction(int);
+    int checkNextAction(int);
+    void commonChangeItem();
+    void setItemAction();
+    BOOL checkNextActionFromCrouch(int);
+    int checkUpperReadyThrowAnime() const;
+    void getBodyAngleXBasePos(cXyz*);
+    s16 getBodyAngleXAtnActor(int);
+    void setBodyAngleXReadyAnime(int);
+    void setMagicArmorBrk(int);
+    BOOL checkMagicArmorHeavy() const;
+    BOOL checkHeavyStateOn(int, int);
+    void initGravity();
+    void setSpecialGravity(f32, f32, int);
+    void transAnimeProc(cXyz*, f32, f32);
+    void setFootSpeed();
+    void posMove();
+    void autoGroundHit();
+    bool startPeepChange();
+    void setLastSceneDamage(int, u32*);
+    void setLastSceneMode(u32*);
+    int startRestartRoom(u32, int, int, int);
+    BOOL checkCoachGuardGame();
+    void checkRoofRestart();
+    BOOL checkRestartRoom();
+    s16 getSceneExitMoveAngle();
+    int checkSceneChange(int i_exitID);
+    void voiceStartLevel(u32);
+    void seStartSwordCut(u32);
+    void seStartMapInfo(u32);
+    void seStartMapInfoLevel(u32);
+    void setBasAnime(daAlink_c::daAlink_UNDER);
+    void initBasAnime();
+    void resetBasAnime();
+    BOOL checkSightLine(f32, cXyz*);
+    void setMetamorphoseModel(int);
+    void keepItemData();
+    void returnKeepItemData();
+    BOOL setItemModel();
+    BOOL setItemActor();
+    void makeItemType();
+    BOOL checkZoraWearAbility() const;
+    BOOL checkMagicArmorWearAbility() const;
+    J3DModelData* loadAramBmd(u16, u32);
+    void* loadAram(u16, u32);
+    J3DAnmTevRegKey* loadAramItemBrk(u16, J3DModel*);
+    J3DAnmTextureSRTKey* loadAramItemBtk(u16, J3DModel*);
+    J3DAnmTexPattern* loadAramItemBtp(u16, J3DModel*);
+    void changeItemBck(u16, f32);
+    int checkGroupItem(int, int) const;
+    int checkSetItemTrigger(int);
+    int checkItemSetButton(int);
+    static bool checkField();
+    static bool checkBossRoom();
+    static bool checkDungeon();
+    static bool checkCastleTown();
+    static bool checkCloudSea();
+    static bool checkRoomOnly();
+    static bool checkLv2DungeonRoomSpecial();
+    static bool checkRoomSpecial();
+    static bool checkRoom();
+    static bool checkNotBattleStage();
+    static bool checkNotHeavyBootsStage();
+    static bool checkNotAutoJumpStage();
+    static bool checkCastleTownUseItem(u16);
+    int changeItemTriggerKeepProc(u8, int);
+    int checkNewItemChange(u8);
+    void deleteEquipItem(int playSound, int deleteKantera);
+    void setLight();
+    void setFrontRollCrashShock(u8);
+    void changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE);
+    void commonProcInit(daAlink_c::daAlink_PROC procID);
+    BOOL commonProcInitNotSameProc(daAlink_PROC procID);
+    int procPreActionUnequipInit(int, fopAc_ac_c*);
+    int procPreActionUnequip();
+    int procServiceWaitInit();
+    int procServiceWait();
+    int procTiredWaitInit();
+    int procTiredWait();
+    int procWaitInit();
+    int procWait();
+    int procMoveInit();
+    int procMove();
+    int procAtnMoveInit();
+    int procAtnMove();
+    int procAtnActorWaitInit();
+    int procAtnActorWait();
+    int procAtnActorMoveInit();
+    int procAtnActorMove();
+    int procWaitTurnInit();
+    int procWaitTurn();
+    int procMoveTurnInit(int);
+    int procMoveTurn();
+    int procSideStepInit(int);
+    int procSideStep();
+    int procSideStepLandInit();
+    int procSideStepLand();
+    int procSlideInit(s16);
+    int procSlide();
+    int procSlideLandInit(int);
+    int procSlideLand();
+    int procFrontRollInit();
+    int procFrontRoll();
+    int procFrontRollCrashInit();
+    int procFrontRollCrash();
+    int procFrontRollSuccessInit();
+    int procFrontRollSuccess();
+    int procSideRollInit(int);
+    int procSideRoll();
+    void backJumpSpeedDec();
+    int procBackJumpInit(int);
+    int procBackJump();
+    int procBackJumpLandInit(int);
+    int procBackJumpLand();
+    int procSlipInit();
+    int procSlip();
+    int procAutoJumpInit(int);
+    int procAutoJump();
+    int procDiveJumpInit();
+    int procDiveJump();
+    int procRollJumpInit();
+    int procRollJump();
+    int procFallInit(int, f32);
+    int procFall();
+    int procLandInit(f32);
+    int procLand();
+    int procSmallJumpInit(int);
+    int procSmallJump();
+    int procStepMoveInit();
+    int procStepMove();
+    int procCrouchInit();
+    int procCrouch();
+    int procCoMetamorphoseInit();
+    int procCoMetamorphose();
+    int procCoMetamorphoseOnlyInit();
+    int procCoMetamorphoseOnly();
+    int procFloorDownReboundInit();
+    int procFloorDownRebound();
+    int procGoronRideWaitInit(fopAc_ac_c*);
+    int procGoronRideWait();
+    int execute();
+    void setDrawHand();
+    bool checkSwordDraw();
+    bool checkShieldDraw();
+    bool checkItemDraw();
+    int initShadowScaleLight();
+    int moveShadowScaleLight();
+    void shadowDraw();
+    void modelCalc(J3DModel*);
+    void basicModelDraw(J3DModel*);
+    void modelDraw(J3DModel*, int);
+    void setWaterDropColor(J3DGXColorS10 const*);
+    void initTevCustomColor();
+    int draw();
+    ~daAlink_c();
+    bool checkNoSubjectModeCamera();
+    bool acceptSubjectModeChange();
+    int checkSubjectAction();
+    s16 checkBodyAngleX(s16);
+    BOOL setBodyAngleToCamera();
+    void setSubjectMode();
+    BOOL subjectCancelTrigger();
+    int checkSubjectEnd(int);
+    void searchPeepObj(fopAc_ac_c*, void*);
+    int procCoSubjectivityInit();
+    int procCoSubjectivity();
+    int procCoSwimSubjectivityInit();
+    int procCoSwimSubjectivity();
+    int procCoPeepSubjectivityInit();
+    int procCoPeepSubjectivity();
+    daAlink_c();
+    BOOL checkWolfEnemyThrowAnime() const {
         return checkUpperAnime(0x2BD) || checkUpperAnime(0x2BE);
     }
-    /* 800D014C */ void setMidnaTalkStatus(u8 status) { dComIfGp_setZStatus(status, 0); }
-    /* 800D0164 */ void set3DStatus(u8 status, u8 direction) {
+    void setMidnaTalkStatus(u8 status) { dComIfGp_setZStatus(status, 0); }
+    void set3DStatus(u8 status, u8 direction) {
         dComIfGp_set3DStatus(status, direction, 0);
     }
-    /* 800D2684 */ void checkCutTurnCharge();
-    /* 800D0E08 */ void checkLightSwordMtrl();
-    /* 800D0E98 */ BOOL checkSwordEquipAnime() const;
-    /* 800D0ECC */ BOOL checkCutDashAnime() const;
-    /* 800D0EFC */ BOOL checkCutDashEnemyHit(dCcD_GObjInf&);
-    /* 800D0F5C */ static u32 getSwordAtType();
-    /* 800D0F90 */ void initCutTurnAt(f32, int);
-    /* 800D102C */ bool checkCutFinishJumpUp();
-    /* 800D1088 */ void changeCutFast();
-    /* 800D10E0 */ bool checkCutFastReady();
-    /* 800D1268 */ void setSwordModel();
-    /* 800D1310 */ void offSwordModel();
-    /* 800D13AC */ BOOL checkCutTypeNoBlur() const;
-    /* 800D13E4 */ bool checkCutTurnInput() const;
-    /* 800D1424 */ int getCutTurnDirection() const;
-    /* 800D1430 */ void resetCombo(int);
-    /* 800D1454 */ void checkComboCnt();
-    /* 800D152C */ void setCutType(u8);
-    /* 800D1540 */ void setCylAtParam(u32, dCcG_At_Spl, u8, u8, int, f32, f32);
-    /* 800D1688 */ void setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp,
+    void checkCutTurnCharge();
+    void checkLightSwordMtrl();
+    BOOL checkSwordEquipAnime() const;
+    BOOL checkCutDashAnime() const;
+    BOOL checkCutDashEnemyHit(dCcD_GObjInf&);
+    static u32 getSwordAtType();
+    void initCutTurnAt(f32, int);
+    bool checkCutFinishJumpUp();
+    void changeCutFast();
+    bool checkCutFastReady();
+    void setSwordModel();
+    void offSwordModel();
+    BOOL checkCutTypeNoBlur() const;
+    bool checkCutTurnInput() const;
+    int getCutTurnDirection() const;
+    void resetCombo(int);
+    void checkComboCnt();
+    void setCutType(u8);
+    void setCylAtParam(u32, dCcG_At_Spl, u8, u8, int, f32, f32);
+    void setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp,
                                         f32 param_4, f32 i_radius);
-    /* 800D1788 */ static BOOL notSwordHitVibActor(fopAc_ac_c*);
-    /* 800D17EC */ BOOL setSwordHitVibration(dCcD_GObjInf*);
-    /* 800D1920 */ BOOL checkAtShieldHit(dCcD_GObjInf&);
-    /* 800D1978 */ BOOL checkCutReverseAt(dCcD_GObjInf*);
-    /* 800D19C8 */ BOOL changeCutReverseProc(daAlink_c::daAlink_ANM);
-    /* 800D1E1C */ void setCutDash(int, int);
-    /* 800D20B4 */ BOOL checkForceSwordSwing();
-    /* 800D20FC */ void setComboReserb();
-    /* 800D2188 */ BOOL checkComboReserb();
-    /* 800D21D0 */ int commonCutAction();
-    /* 800D2284 */ void setSwordVoiceSe(u32);
-    /* 800D22BC */ void setSwordChargeVoiceSe();
-    /* 800D2304 */ void setSwordComboVoice();
-    /* 800D2368 */ bool checkCutTurnInputTrigger();
-    /* 800D23C0 */ int checkCutAction();
-    /* 800D26EC */ int getCutDirection();
-    /* 800D2760 */ BOOL checkCutCancelNextMode(int);
-    /* 800D27E4 */ BOOL checkDoCutAction();
-    /* 800D2890 */ BOOL checkCutBackState();
-    /* 800D28F4 */ BOOL checkCutHeadState();
-    /* 800D29D4 */ BOOL checkDownAttackState();
-    /* 800D2ABC */ BOOL checkCutLargeTurnState() const;
-    /* 800D2B88 */ void cancelCutCharge();
-    /* 800D2BFC */ void initCutAtnActorSearch();
-    /* 800D2C54 */ void checkCutAtnActorChange();
-    /* 800D2C78 */ void setCutJumpSpeed(int);
-    /* 800D2F58 */ int procCutNormalInit(int);
-    /* 800D31B8 */ int procCutNormal();
-    /* 800D34D8 */ int procCutFinishInit(int);
-    /* 800D382C */ int procCutFinish();
-    /* 800D3ADC */ int procCutFinishJumpUpInit();
-    /* 800D3CCC */ int procCutFinishJumpUp();
-    /* 800D3DD8 */ int procCutFinishJumpUpLandInit();
-    /* 800D3ECC */ int procCutFinishJumpUpLand();
-    /* 800D4068 */ int procCutReverseInit(daAlink_c::daAlink_ANM);
-    /* 800D41FC */ int procCutReverse();
-    /* 800D42FC */ int procCutJumpInit(int);
-    /* 800D43F8 */ int procCutJump();
-    /* 800D452C */ int procCutJumpLandInit(int);
-    /* 800D4684 */ int procCutJumpLand();
-    /* 800D47DC */ int procCutTurnInit(int, int);
-    /* 800D4A74 */ int procCutTurn();
-    /* 800D4C68 */ int procCutTurnChargeInit();
-    /* 800D4D04 */ int procCutTurnCharge();
-    /* 800D4DDC */ int procCutTurnMoveInit(int);
-    /* 800D4EFC */ int procCutTurnMove();
-    /* 800D53C8 */ int procCutDownInit();
-    /* 800D57F8 */ int procCutDown();
-    /* 800D58A0 */ int procCutDownLandInit(fopEn_enemy_c*);
-    /* 800D5ADC */ int procCutDownLand();
-    /* 800D5C88 */ int procCutHeadInit();
-    /* 800D5FC8 */ int procCutHead();
-    /* 800D6130 */ int procCutHeadLandInit();
-    /* 800D618C */ int procCutHeadLand();
-    /* 800D6238 */ int procCutLargeJumpChargeInit();
-    /* 800D62A0 */ int procCutLargeJumpCharge();
-    /* 800D6374 */ int procCutLargeJumpInit();
-    /* 800D6484 */ int procCutLargeJump();
-    /* 800D66C0 */ int procCutLargeJumpLandInit(int);
-    /* 800D67FC */ int procCutLargeJumpLand();
-    /* 800D698C */ int procSwordUnequipSpInit();
-    /* 800D6A38 */ int procSwordUnequipSp();
-    /* 800D6D94 */ s16 getFreezeR() const;
-    /* 800D6DA4 */ s16 getFreezeG() const;
-    /* 800D6DB4 */ s16 getFreezeB() const;
-    /* 800D6DC4 */ bool checkMiddleBossGoronRoom();
-    /* 800D6E24 */ void freezeTimerDamage();
-    /* 800D6F2C */ BOOL checkNoLandDamageSlidePolygon();
-    /* 800D6FE0 */ void checkCutLandDamage();
-    /* 800D70A0 */ BOOL checkCaughtEscapeCutTurn();
-    /* 800D7208 */ f32 damageMagnification(int i_checkZoraMag, int);
-    /* 800D72BC */ int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int);
-    /* 800D7478 */ void setDamagePointNormal(int);
-    /* 800D74A4 */ void setLandDamagePoint(int);
-    /* 800D74F4 */ cXyz* getDamageVec(dCcD_GObjInf*);
-    /* 800D76C4 */ void setDashDamage();
-    /* 800D7768 */ static BOOL checkIcePolygonDamage(cBgS_PolyInfo*);
-    /* 800D77C8 */ BOOL checkMagicArmorNoDamage();
-    /* 800D7820 */ int checkPolyDamage();
-    /* 800D7A98 */ BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
-    /* 800D7B18 */ void damageTimerCount();
-    /* 800D7BE8 */ bool checkHugeAttack(int) const;
-    /* 800D7C14 */ bool checkLargeAttack(int) const;
-    /* 800D7C40 */ BOOL checkDamageAction();
-    /* 800D8F3C */ int procDamageInit(dCcD_GObjInf*, int);
-    /* 800D9514 */ int procDamage();
-    /* 800D96DC */ int procCoLargeDamageInit(int, int, s16, s16, dCcD_GObjInf*, int);
-    /* 800D9E88 */ int procCoLargeDamage();
-    /* 800DA180 */ int procLargeDamageUpInit(int, int, s16, s16);
-    /* 800DA554 */ int procLargeDamageUp();
-    /* 800DA82C */ int procCoLargeDamageWallInit(int, int, s16, s16);
-    /* 800DAC28 */ int procCoLargeDamageWall();
-    /* 800DAC84 */ int procCoPolyDamageInit();
-    /* 800DAD90 */ int procCoPolyDamage();
-    /* 800DAE10 */ int procLandDamageInit(int);
-    /* 800DB060 */ int procLandDamage();
-    /* 800DB140 */ int procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int);
-    /* 800DB418 */ int procCoElecDamage();
-    /* 800DB5B0 */ int procStEscapeInit();
-    /* 800DB610 */ int procStEscape();
-    /* 800DB6A4 */ int procDkCaughtInit(fpc_ProcID);
-    /* 800DB860 */ int procDkCaught();
-    /* 800DBC98 */ void setScreamWaitAnime();
-    /* 800DBD1C */ int procScreamWaitInit();
-    /* 800DBDA4 */ int procScreamWait();
-    /* 800DBE00 */ int procCoSandWallHitInit();
-    /* 800DBE74 */ int procCoSandWallHit();
-    /* 800DBED8 */ int procCoLavaReturnInit(int);
-    /* 800DC214 */ int procCoLavaReturn();
-    /* 800DC278 */ int procCoSwimFreezeReturnInit();
-    /* 800DC474 */ int procCoSwimFreezeReturn();
-    /* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*);
-    /* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*);
-    /* 800DC5DC */ BOOL checkShieldAttackEmphasys();
-    /* 800DC678 */ BOOL checkGuardActionChange();
-    /* 800DC79C */ void stickArrowIncrement(int);
-    /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int);
-    /* 800DCA2C */ BOOL checkWoodShieldEquipNotIronBall() const;
-    /* 800DCA80 */ void getArrowShieldOffset(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
-    /* 800DCD74 */ void setArrowShieldPos(cXyz*, csXyz*, cXyz const*, cXyz const*) const;
-    /* 800DCDF0 */ BOOL checkUpperGuardAnime() const;
-    /* 800DCF04 */ BOOL checkPlayerGuardAndAttack() const;
-    /* 800DCF64 */ BOOL checkGuardAccept();
-    /* 800DD008 */ void setUpperGuardAnime(f32);
-    /* 800DD018 */ void setShieldGuard();
-    /* 800DD114 */ void setGuardSe(dCcD_GObjInf*);
-    /* 800DD1D4 */ void setSmallGuard(dCcD_GObjInf*);
-    /* 800DD3E4 */ int procGuardSlipInit(int, dCcD_GObjInf*);
-    /* 800DD894 */ int procGuardSlip();
-    /* 800DDA10 */ int procGuardAttackInit();
-    /* 800DDBA8 */ int procGuardAttack();
-    /* 800DDE58 */ int procGuardBreakInit();
-    /* 800DDF2C */ int procGuardBreak();
-    /* 800DE008 */ int procTurnMoveInit(int);
-    /* 800DE380 */ int procTurnMove();
-    /* 800DE64C */ void getArrowFlyData(f32*, f32*, int) const;
-    /* 800DE740 */ f32 getArrowIncAtR() const;
-    /* 800DE750 */ s16 getBombArrowFlyExplodeTime() const;
-    /* 800DE760 */ f32 getArrowIncAtMaxStart() const;
-    /* 800DE770 */ f32 getArrowIncAtMax() const;
-    /* 800DE780 */ BOOL checkBowAndSlingItem(int);
-    /* 800DE7D4 */ void setSlingModel();
-    /* 800DE884 */ cXyz* checkBowCameraArrowPosP(s16*, s16*);
-    /* 800DE9B8 */ BOOL checkBowReadyAnime() const;
-    /* 800DE9E8 */ BOOL checkBowAnime() const;
-    /* 800DEA3C */ void makeArrow();
-    /* 800DEAE4 */ void deleteArrow();
-    /* 800DEB8C */ void setBowOrSlingStatus();
-    /* 800DEBC8 */ void changeArrowType();
-    /* 800DED88 */ BOOL cancelBowMoveRideNotAtn();
-    /* 800DEE1C */ BOOL cancelBowMove();
-    /* 800DEEDC */ void setBowReadyAnime();
-    /* 800DEFB8 */ void setBowReloadAnime();
-    /* 800DF0BC */ BOOL checkUpperItemActionBow();
-    /* 800DF798 */ void checkUpperItemActionBowFly();
-    /* 800DF814 */ int checkNextActionBow();
-    /* 800DFAE8 */ void setBowModel();
-    /* 800DFBC8 */ bool checkBowGrabLeftHand() const;
-    /* 800DFC28 */ void setBowHangAnime();
-    /* 800DFC70 */ void setBowNormalAnime();
-    /* 800DFCD8 */ void setBowSight();
-    /* 800DFD6C */ int procBowSubjectInit();
-    /* 800DFDDC */ int procBowSubject();
-    /* 800DFE3C */ int procBowMoveInit();
-    /* 800DFEC0 */ int procBowMove();
-    /* 800DFFE0 */ BOOL checkBoomerangLockAccept();
-    /* 800E0010 */ f32 getBoomSpeed();
-    /* 800E00B0 */ f32 getBoomCatchSpeed() const;
-    /* 800E00C0 */ f32 getBoomFlyMax() const;
-    /* 800E011C */ f32 getBoomLockMax();
-    /* 800E0190 */ s16 getBoomBgThroughTime() const;
-    /* 800E01A0 */ bool checkBossBabaRoom();
-    /* 800E01CC */ void cancelBoomerangLock(fopAc_ac_c*);
-    /* 800E0210 */ fopAc_ac_c* getBoomerangActor();
-    /* 800E0244 */ bool checkBoomerangChargeEnd();
-    /* 800E02B8 */ BOOL checkBoomerangCarry(fopAc_ac_c*);
-    /* 800E03D0 */ void initBoomerangUpperAnimeSpeed(int);
-    /* 800E0440 */ BOOL checkBoomerangAnime() const;
-    /* 800E04AC */ BOOL checkBoomerangThrowAnime() const;
-    /* 800E04E8 */ void setBoomerangReadyQuake();
-    /* 800E055C */ void setBoomerangReadyAnime();
-    /* 800E05E8 */ void setThrowBoomerangAnime();
-    /* 800E0630 */ void setBoomerangCatchAnime();
-    /* 800E06B8 */ void throwBoomerang();
-    /* 800E08C4 */ int returnBoomerang(int);
-    /* 800E0A9C */ int checkUpperItemActionBoomerang();
-    /* 800E0B58 */ void checkUpperItemActionBoomerangFly();
-    /* 800E0BE4 */ int checkNextActionBoomerang();
-    /* 800E0D8C */ int checkBoomerangCatchAction();
-    /* 800E0E64 */ void setBoomerangSight();
-    /* 800E0F10 */ int procBoomerangSubjectInit();
-    /* 800E0FA0 */ int procBoomerangSubject();
-    /* 800E1060 */ int procBoomerangMoveInit();
-    /* 800E10F4 */ int procBoomerangMove();
-    /* 800E11D8 */ int procBoomerangCatchInit();
-    /* 800E1248 */ int procBoomerangCatch();
-    /* 800E12E0 */ static BOOL checkLv6BossRoom();
-    /* 800E1310 */ f32 getCopyRodBallSpeed() const;
-    /* 800E1320 */ f32 getCopyRodBallReturnSpeed() const;
-    /* 800E1330 */ f32 getCopyRodBallDisMax() const;
-    /* 800E1374 */ fopAc_ac_c* getCopyRodControllActor();
-    /* 800E1390 */ fopAc_ac_c* getCopyRodCameraActor();
-    /* 800E13AC */ void initCopyRodUpperAnimeSpeed(int);
-    /* 800E1408 */ static BOOL checkForestOldCentury();
-    /* 800E1530 */ int checkCopyRodAnime() const;
-    /* 800E158C */ void setCopyRodControllAnime();
-    /* 800E15FC */ void setCopyRodControllUpperSpeedRate();
-    /* 800E1748 */ void setCopyRodModel();
-    /* 800E1840 */ void setCopyRodReadyAnime();
-    /* 800E191C */ void throwCopyRod();
-    /* 800E1A30 */ int returnCopyRod();
-    /* 800E1ADC */ int checkUpperItemActionCopyRod();
-    /* 800E1BB4 */ void checkUpperItemActionCopyRodFly();
-    /* 800E1C44 */ int checkNextActionCopyRod();
-    /* 800E1D6C */ void setCopyRodSight();
-    /* 800E1E20 */ int procCopyRodSubjectInit();
-    /* 800E1EB0 */ int procCopyRodSubject();
-    /* 800E1F68 */ int procCopyRodMoveInit();
-    /* 800E1FFC */ int procCopyRodMove();
-    /* 800E20C8 */ int procCopyRodSwingInit();
-    /* 800E21FC */ int procCopyRodSwing();
-    /* 800E2308 */ int procCopyRodReviveInit();
-    /* 800E23A4 */ int procCopyRodRevive();
-    /* 800E23FC */ void concatMagneBootMtx();
-    /* 800E243C */ void concatMagneBootInvMtx();
-    /* 800E247C */ void multVecMagneBootInvMtx(cXyz*);
-    /* 800E24B0 */ bool commonMagneLineCheck(cXyz*, cXyz*);
-    /* 800E251C */ BOOL checkBootsMoveAnime(int);
-    /* 800E2580 */ int setHeavyBoots(int);
-    /* 800E2738 */ s16 getMagneBootsLocalAngleY(s16, int);
-    /* 800E2808 */ void setMagneBootsMtx(cBgS_PolyInfo*, int);
-    /* 800E2DC4 */ int cancelMagneBootsOn();
-    /* 800E2F88 */ int checkMagneBootsFly();
-    /* 800E3048 */ int procBootsEquipInit();
-    /* 800E30DC */ int procBootsEquip();
-    /* 800E3218 */ int procMagneBootsFlyInit();
-    /* 800E3454 */ int procMagneBootsFly();
-    /* 800E3760 */ s16 getBombExplodeTime() const;
-    /* 800E3770 */ f32 getBombGravity() const;
-    /* 800E3780 */ f32 getBombMaxFallSpeed() const;
-    /* 800E3790 */ f32 getBombBoundRate() const;
-    /* 800E37A0 */ f32 getBombStopSpeedY() const;
-    /* 800E37B0 */ f32 getBombMaxSpeedY() const;
-    /* 800E37C0 */ f32 getBombEffScale() const;
-    /* 800E37D0 */ f32 getBombAtR() const;
-    /* 800E37E0 */ s16 getEnemyBombColorR() const;
-    /* 800E37F0 */ f32 getBombWaterGravity() const;
-    /* 800E3800 */ f32 getBombWaterMaxFallSpeed() const;
-    /* 800E3810 */ f32 getBombExplodeWaterEffectLimit() const;
-    /* 800E3820 */ s16 getBombInsectLimitAngle() const;
-    /* 800E38EC */ BOOL checkGrabLineCheck();
-    /* 800E3BCC */ f32 getGrabThrowRate();
-    /* 800E3C1C */ BOOL checkGrabThrowAnime() const;
-    /* 800E3C6C */ BOOL checkGrabAnime() const;
-    /* 800E3C9C */ BOOL checkGrabAnimeAndThrow() const;
-    /* 800E3CF4 */ BOOL checkGrabCarryActor();
-    /* 800E3D1C */ BOOL checkGrabSlowMoveActor();
-    /* 800E3D6C */ BOOL checkGrabHeavyActor();
-    /* 800E3D94 */ BOOL checkGrabSideActor();
-    /* 800E3DBC */ void setGrabUpperAnime(f32);
-    /* 800E3F20 */ BOOL checkGrabRooster();
-    /* 800E3F50 */ void setGrabItemPos();
-    /* 800E4BD4 */ void freeGrabItem();
-    /* 800E4DEC */ void setGrabUpperSpeedRate();
-    /* 800E4FA8 */ void setCarryArmAngle(f32, f32);
-    /* 800E5150 */ BOOL checkGrabNotThrow();
-    /* 800E5170 */ BOOL checkNextActionGrab();
-    /* 800E53AC */ void initGrabNextMode();
-    /* 800E53F8 */ void setGrabItemThrow();
-    /* 800E57AC */ BOOL checkUpperGrabItemThrow(f32);
-    /* 800E5830 */ void putObjLineCheck(dBgS_LinChk&, cXyz*, fopAc_ac_c*);
-    /* 800E5B6C */ bool grabLineCheck(cXyz*, cXyz*);
-    /* 800E5BB4 */ void setGrabItemActor(fopAc_ac_c*);
-    /* 800E5CBC */ int procGrabReadyInit();
-    /* 800E5EC8 */ int procGrabReady();
-    /* 800E5FD0 */ int procGrabUpInit();
-    /* 800E6230 */ int procGrabUp();
-    /* 800E637C */ int procGrabMiss();
-    /* 800E63F0 */ int procGrabThrowInit(int);
-    /* 800E65F8 */ int procGrabThrow();
-    /* 800E672C */ int procGrabPutInit();
-    /* 800E6914 */ int procGrabPut();
-    /* 800E6A9C */ int procGrabWaitInit();
-    /* 800E6C34 */ int procGrabWait();
-    /* 800E6D6C */ int procGrabReboundInit(int);
-    /* 800E6E0C */ int procGrabRebound();
-    /* 800E6EEC */ int procGrabStandInit();
-    /* 800E6FE0 */ int procGrabStand();
-    /* 800E70C0 */ BOOL checkInsectActorName(fopAc_ac_c*);
-    /* 800E70FC */ int procInsectCatchInit();
-    /* 800E71D4 */ int procInsectCatch();
-    /* 800E7254 */ int procPickUpInit();
-    /* 800E7460 */ int procPickUp();
-    /* 800E75EC */ int procPickPutInit(int);
-    /* 800E76E0 */ int procPickPut();
-    /* 800E7894 */ BOOL checkSetChainPullAnime(s16);
-    /* 800E794C */ s16 getChainStickAngleY(s16) const;
-    /* 800E7994 */ u8 checkChainEmphasys();
-    /* 800E79F8 */ BOOL searchFmChainPos();
-    /* 800E7AEC */ BOOL setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int);
-    /* 800E7C30 */ int procFmChainUpInit();
-    /* 800E7CC0 */ int procFmChainUp();
-    /* 800E7DD8 */ int procFmChainStrongPullInit();
-    /* 800E7E50 */ int procFmChainStrongPull();
-    /* 800E7ED0 */ void setWallGrabStatus(u8, u8);
-    /* 800E7EE4 */ int getWallGrabStatus();
-    /* 800E7EF4 */ BOOL wallGrabTrigger();
-    /* 800E7F18 */ BOOL wallGrabButton();
-    /* 800E7F3C */ int setPushPullKeepData(dBgW_Base::PushPullLabel, int);
-    /* 800E80A4 */ BOOL checkPushPullTurnBlock();
-    /* 800E8148 */ BOOL checkPullBehindWall();
-    /* 800E8298 */ void offGoatStopGame();
-    /* 800E82B0 */ BOOL checkGoatCatchActor(fopAc_ac_c*);
-    /* 800E8314 */ f32 getGoatCatchDistance2();
-    /* 800E8334 */ int endPushPull();
-    /* 800E8354 */ f32 getPushPullAnimeSpeed();
-    /* 800E8428 */ int procCoPushPullWaitInit(int);
-    /* 800E857C */ int procCoPushPullWait();
-    /* 800E875C */ int procCoPushMoveInit(int, int);
-    /* 800E89F0 */ int procCoPushMove();
-    /* 800E8D1C */ int procPullMoveInit(int);
-    /* 800E8F44 */ int procPullMove();
-    /* 800E9210 */ void setGoatStopGameFail(fopAc_ac_c*);
-    /* 800E9344 */ int procGoatMoveInit();
-    /* 800E9434 */ int procGoatMove();
-    /* 800E9894 */ int procGoatCatchInit(fopAc_ac_c*, f32);
-    /* 800E9BD0 */ int procGoatCatch();
-    /* 800EA2A8 */ int procGoatStrokeInit();
-    /* 800EA3AC */ int procGoatStroke();
-    /* 800EA3F4 */ int procGoronMoveInit();
-    /* 800EA4CC */ int procGoronMove();
-    /* 800EA844 */ BOOL checkSumouVsActor();
-    /* 800EA8D0 */ void cancelSumouMode();
-    /* 800EA908 */ BOOL sumouPunchTrigger();
-    /* 800EA92C */ void setSumouPunchStatus();
-    /* 800EA950 */ int procSumouReadyInit();
-    /* 800EAA28 */ int procSumouReady();
-    /* 800EAC4C */ int procSumouMoveInit();
-    /* 800EAD84 */ int procSumouMove();
-    /* 800EB208 */ int procSumouSideMoveInit();
-    /* 800EB2BC */ int procSumouSideMove();
-    /* 800EB624 */ int procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int unused);
-    /* 800EBCE0 */ int procSumouAction();
-    /* 800EC0F8 */ int procSumouStaggerInit();
-    /* 800EC170 */ int procSumouStagger();
-    /* 800EC20C */ int procSumouWinLoseInit();
-    /* 800EC3D8 */ int procSumouWinLose();
-    /* 800EC538 */ int procSumouShikoInit();
-    /* 800EC5F4 */ int procSumouShiko();
-    /* 800EC76C */ static BOOL checkHorseZeldaBowMode();
-    /* 800EC7B0 */ static void setHorseZeldaDamage();
-    /* 800EC7DC */ static BOOL checkHorseDashAccept();
-    /* 800EC814 */ static BOOL checkCowGame();
-    /* 800EC87C */ int getReinRideDirection();
-    /* 800EC8F8 */ int checkReinRideBgCheck();
-    /* 800ECA3C */ void commonInitForceRideRein();
-    /* 800ECAAC */ int initForceRideBoar();
-    /* 800ECB58 */ void initForceRideHorse();
-    /* 800ECBD0 */ void rideGetOff();
-    /* 800ECD90 */ BOOL checkHorseNotDamageReaction() const;
-    /* 800ECDC4 */ BOOL checkHorseWaitLashAnime() const;
-    /* 800ECDEC */ BOOL checkHorseReinLeftOnly() const;
-    /* 800ECE10 */ int getReinHandType() const;
-    /* 800ECF04 */ BOOL checkHorseLieAnime() const;
-    /* 800ECF5C */ BOOL checkHorseSubjectivity() const;
-    /* 800ECF9C */ void setHorseSwordUpAnime();
-    /* 800ECFF4 */ void setHorseTurnUpperAnime(int);
-    /* 800ED074 */ BOOL checkHorseNoUpperAnime() const;
-    /* 800ED0D4 */ void getHorseReinHandPos(cXyz*, cXyz*);
-    /* 800ED1F0 */ BOOL checkHorseNotGrab() const;
-    /* 800ED310 */ void setHorseStirrup();
-    /* 800ED4B8 */ void changeBoarRunRide();
-    /* 800ED4DC */ int setSyncHorsePos();
-    /* 800ED78C */ int setSyncBoarPos();
-    /* 800ED90C */ int setSyncBoarRunPos();
-    /* 800EDA24 */ BOOL setSyncRidePos();
-    /* 800EDA78 */ void setHorseTurnAnime();
-    /* 800EDB48 */ void getBaseHorseAnime(daAlink_c::daAlink_ANM*);
-    /* 800EDD6C */ int checkHorseSpecialProc();
-    /* 800EDE8C */ BOOL checkHorseServiceWaitAnime();
-    /* 800EDEEC */ int setSyncHorse(int);
-    /* 800EE64C */ int setSyncBoar(int);
-    /* 800EE918 */ int setSyncRide(int);
-    /* 800EEAE8 */ void setBaseHorseAnimeFrame();
-    /* 800EEC98 */ void setBaseBoarAnime();
-    /* 800EED98 */ void setBaseRideAnime();
-    /* 800EEE30 */ bool checkHorseSwordUpSpped();
-    /* 800EEE5C */ void setHorseSwordUp(int);
-    /* 800EEF30 */ int setRideSubjectAngle(s16);
-    /* 800EF050 */ void setBodyAngleRideReadyAnime();
-    /* 800EF0E8 */ BOOL checkHorseGetOffWallCheck(cXyz*, cXyz*, s16);
-    /* 800EF198 */ int checkHorseGetOffDirection();
-    /* 800EF35C */ void boarForceGetOff();
-    /* 800EF394 */ void horseGetOffEnd();
-    /* 800EF450 */ int checkNextActionHorse();
-    /* 800EF598 */ BOOL checkHorseGetOff();
-    /* 800EF6B0 */ int checkHorseGetOffAndSetDoStatus();
-    /* 800EF884 */ int setHorseGetOff(int);
-    /* 800EF95C */ int procHorseRideInit();
-    /* 800EFDC4 */ int procHorseRide();
-    /* 800F038C */ int procHorseGetOffInit(int);
-    /* 800F0620 */ int procHorseGetOff();
-    /* 800F0980 */ int procHorseWaitInit();
-    /* 800F0AA4 */ int procHorseWait();
-    /* 800F0C6C */ int procHorseTurnInit();
-    /* 800F0CE4 */ int procHorseTurn();
-    /* 800F1060 */ int procHorseJumpInit();
-    /* 800F10F8 */ int procHorseJump();
-    /* 800F1188 */ int procHorseLandInit();
-    /* 800F1204 */ int procHorseLand();
-    /* 800F1294 */ int procHorseSubjectivityInit();
-    /* 800F12F8 */ int procHorseSubjectivity();
-    /* 800F13D8 */ int procHorseCutInit();
-    /* 800F1688 */ int procHorseCut();
-    /* 800F1894 */ int procHorseCutChargeReadyInit();
-    /* 800F194C */ int procHorseCutChargeReady();
-    /* 800F1AAC */ int procHorseCutTurnInit();
-    /* 800F1BA4 */ int procHorseCutTurn();
-    /* 800F1D18 */ int procHorseDamageInit(dCcD_GObjInf*);
-    /* 800F2028 */ int procHorseDamage();
-    /* 800F2150 */ int procHorseBowSubjectInit();
-    /* 800F21B4 */ int procHorseBowSubject();
-    /* 800F224C */ int procHorseBowMoveInit();
-    /* 800F22A8 */ int procHorseBowMove();
-    /* 800F2334 */ int procHorseGrabMoveInit();
-    /* 800F2390 */ int procHorseGrabMove();
-    /* 800F2454 */ int procHorseBoomerangSubjectInit();
-    /* 800F24C8 */ int procHorseBoomerangSubject();
-    /* 800F25B4 */ int procHorseBoomerangMoveInit();
-    /* 800F2628 */ int procHorseBoomerangMove();
-    /* 800F26F4 */ int procHorseHookshotSubjectInit();
-    /* 800F2770 */ int procHorseHookshotSubject();
-    /* 800F2824 */ int procHorseHookshotMoveInit();
-    /* 800F2898 */ int procHorseHookshotMove();
-    /* 800F2934 */ int procHorseBottleDrinkInit(u16);
-    /* 800F2AD8 */ int procHorseBottleDrink();
-    /* 800F2B4C */ int procHorseKandelaarPourInit();
-    /* 800F2C78 */ int procHorseKandelaarPour();
-    /* 800F2D84 */ int procHorseComebackInit();
-    /* 800F2DE4 */ int procHorseComeback();
-    /* 800F2EE0 */ int procHorseRunInit();
-    /* 800F2F98 */ int procHorseRun();
-    /* 800F3430 */ int procHorseHangInit(dCcD_GObjInf*, int);
-    /* 800F3580 */ int procHorseHang();
-    /* 800F36E4 */ int procHorseGetKeyInit();
-    /* 800F3754 */ int procHorseGetKey();
-    /* 800F3818 */ int procHorseLookDownInit();
-    /* 800F3894 */ int procHorseLookDown();
-    /* 800F38E8 */ int procBoarRunInit();
-    /* 800F3998 */ int procBoarRun();
-    /* 800F3BB0 */ f32 getCanoeMaxSpeed() const;
-    /* 800F3BDC */ f32 getCanoeBackMaxSpeed() const;
-    /* 800F3BEC */ f32 getCanoeCres() const;
-    /* 800F3C18 */ f32 getCanoeSpeedRate() const;
-    /* 800F3C44 */ s16 getCanoeMaxRotSpeed() const;
-    /* 800F3CCC */ static cXyz* getCanoeLocalPaddleTop();
-    /* 800F3CF8 */ BOOL checkCanoeRideTandem();
-    /* 800F3D58 */ BOOL checkFishingRodAndLureItem() const;
-    /* 800F3DA0 */ void initFishingRodHand();
-    /* 800F3DFC */ MtxP getCanoePaddleMatrix();
-    /* 800F3E4C */ BOOL checkFishingRodGrab(fopAc_ac_c*) const;
-    /* 800F3EB8 */ BOOL checkCanoePaddleGrab(fopAc_ac_c*) const;
-    /* 800F3F38 */ BOOL checkCanoeFishingRodGrabOrPut() const;
-    /* 800F3FC4 */ void initCanoeRide();
-    /* 800F4008 */ BOOL checkCanoeJumpRide();
-    /* 800F40E4 */ void setArmReelAnime();
-    /* 800F4140 */ void setFishingWaitAction();
-    /* 800F4490 */ void setFishGetFace();
-    /* 800F4564 */ void setRideCanoeBasePos(fopAc_ac_c*);
-    /* 800F459C */ void setSyncCanoePos();
-    /* 800F47D8 */ int canoeCommon();
-    /* 800F4924 */ int checkNextActionCanoe();
-    /* 800F4A50 */ int procCanoeRideInit();
-    /* 800F4B90 */ int procCanoeRide();
-    /* 800F4C78 */ int procCanoeJumpRideInit(fopAc_ac_c*);
-    /* 800F4D84 */ int procCanoeJumpRide();
-    /* 800F4DF8 */ int procCanoeGetOffInit();
-    /* 800F5048 */ int procCanoeGetOff();
-    /* 800F51E4 */ int procCanoeWaitInit(int);
-    /* 800F542C */ int procCanoeWait();
-    /* 800F571C */ int procCanoeRowInit(int);
-    /* 800F5A1C */ int procCanoeRow();
-    /* 800F5D04 */ int procCanoePaddleShiftInit(int);
-    /* 800F5DB8 */ int procCanoePaddleShift();
-    /* 800F5EA8 */ int procCanoePaddlePutInit(int);
-    /* 800F5FEC */ int procCanoePaddlePut();
-    /* 800F6140 */ int procCanoePaddleGrabInit();
-    /* 800F6188 */ int procCanoePaddleGrab();
-    /* 800F6320 */ int procCanoeRodGrabInit();
-    /* 800F6394 */ int procCanoeRodGrab();
-    /* 800F6464 */ int procCanoeFishingWaitInit();
-    /* 800F659C */ int procCanoeFishingWait();
-    /* 800F67C0 */ int procCanoeFishingReelInit();
-    /* 800F6874 */ int procCanoeFishingReel();
-    /* 800F69D4 */ int procCanoeFishingGetInit();
-    /* 800F6A70 */ int procCanoeFishingGet();
-    /* 800F6BEC */ int procCanoeSubjectivityInit();
-    /* 800F6C30 */ int procCanoeSubjectivity();
-    /* 800F6D10 */ int procCanoeBowSubjectInit();
-    /* 800F6D64 */ int procCanoeBowSubject();
-    /* 800F6DF0 */ int procCanoeBowMoveInit();
-    /* 800F6E44 */ int procCanoeBowMove();
-    /* 800F6EB0 */ int procCanoeGrabMoveInit();
-    /* 800F6EFC */ int procCanoeGrabMove();
-    /* 800F6FA4 */ int procCanoeBoomerangSubjectInit();
-    /* 800F7010 */ int procCanoeBoomerangSubject();
-    /* 800F70F0 */ int procCanoeBoomerangMoveInit();
-    /* 800F715C */ int procCanoeBoomerangMove();
-    /* 800F7208 */ int procCanoeHookshotSubjectInit();
-    /* 800F7274 */ int procCanoeHookshotSubject();
-    /* 800F731C */ int procCanoeHookshotMoveInit();
-    /* 800F7388 */ int procCanoeHookshotMove();
-    /* 800F7404 */ int procCanoeBottleDrinkInit(u16);
-    /* 800F7550 */ int procCanoeBottleDrink();
-    /* 800F75BC */ int procCanoeKandelaarPourInit();
-    /* 800F7684 */ int procCanoeKandelaarPour();
-    /* 800F7708 */ void setGroundFishingRodActor();
-    /* 800F7760 */ int procFishingCastInit();
-    /* 800F7814 */ int procFishingCast();
-    /* 800F7988 */ int procFishingFoodInit();
-    /* 800F7AA8 */ int procFishingFood();
-    /* 800F7C50 */ f32 getCrawlMoveAnmSpeed();
-    /* 800F7C74 */ f32 getCrawlMoveSpeed();
-    /* 800F7CE8 */ void setCrawlMoveDirectionArrow();
-    /* 800F7E48 */ BOOL changeCrawlAutoMoveProc(cXyz*);
-    /* 800F81C0 */ int getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*);
-    /* 800F85C0 */ void crawlBgCheck(cXyz*, cXyz*, int);
-    /* 800F8700 */ BOOL checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*);
-    /* 800F88F8 */ void decideCrawlDoStatus();
-    /* 800F89E0 */ BOOL checkNotCrawlStand(cXyz*);
-    /* 800F8A50 */ BOOL checkNotCrawlStand(cXyz*, cXyz*);
-    /* 800F8B00 */ BOOL checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int);
-    /* 800F8D04 */ void setCrawlMoveHoll();
-    /* 800F8DBC */ void setCrawlMoveAngle();
-    /* 800F8F08 */ void stopHalfMoveAnime(f32);
-    /* 800F8F84 */ void setCrawlAutoMoveAimPos();
-    /* 800F9210 */ int procCrawlStartInit();
-    /* 800F9384 */ int procCrawlStart();
-    /* 800F9474 */ int procCrawlMoveInit(s16, s16);
-    /* 800F95B8 */ int procCrawlMove();
-    /* 800F99FC */ int procCrawlAutoMoveInit(int, cXyz*);
-    /* 800F9ABC */ int procCrawlAutoMove();
-    /* 800F9D7C */ int procCrawlEndInit(int, s16, s16);
-    /* 800F9F30 */ int procCrawlEnd();
-    /* 800F9FDC */ f32 getHangMoveAnmSpeed();
-    /* 800F9FFC */ int getHangDirectionFromAngle();
-    /* 800FA070 */ BOOL hangMoveBgCheck(s16, cXyz*);
-    /* 800FA338 */ BOOL changeHangMoveProc(int);
-    /* 800FA5C8 */ bool checkHangFootWall();
-    /* 800FA6E4 */ void setHangGroundY();
-    /* 800FA78C */ int changeHangEndProc();
-    /* 800FA85C */ void checkHangStartSideWall(s16);
-    /* 800FAA7C */ int procHangStartInit();
-    /* 800FAE14 */ int procHangStart();
-    /* 800FAECC */ int procHangFallStartInit(cM3dGPla*);
-    /* 800FB1A4 */ int procHangFallStart();
-    /* 800FB2A0 */ int procHangUpInit(int);
-    /* 800FB328 */ int procHangUp();
-    /* 800FB43C */ int procHangWaitInit();
-    /* 800FB544 */ int procHangWait();
-    /* 800FB650 */ int procHangMoveInit(int);
-    /* 800FB790 */ int procHangMove();
-    /* 800FBBC8 */ int procHangClimbInit(f32);
-    /* 800FBCD4 */ int procHangClimb();
-    /* 800FBE04 */ int procHangWallCatchInit();
-    /* 800FC0D8 */ int procHangWallCatch();
-    /* 800FC178 */ int procHangReadyInit();
-    /* 800FC240 */ int procHangReady();
-    /* 800FC2F4 */ int procHangLeverDownInit();
-    /* 800FC390 */ int procHangLeverDown();
-    /* 800FC5A4 */ int setDragonHangPos();
-    /* 800FC6B4 */ int setOctaIealHangPos();
-    /* 800FC748 */ int setBossBodyHangPos();
-    /* 800FC77C */ int procBossBodyHangInit(fopAc_ac_c*);
-    /* 800FC870 */ int procBossBodyHang();
-    /* 800FCF58 */ int getLadderUnitCount() const;
-    /* 800FCF84 */ int setLadderInit();
-    /* 800FD048 */ void setLadderPosInit();
-    /* 800FD1F0 */ void setLadderPos(int);
-    /* 800FD288 */ f32 getLadderMoveAnmSpeed();
-    /* 800FD2AC */ int changeLadderMoveProc(int);
-    /* 800FD4A8 */ int setMoveBGLadderCorrect();
-    /* 800FD5E4 */ int checkLadderFall();
-    /* 800FD648 */ int procLadderUpStartInit();
-    /* 800FD7B0 */ int procLadderUpStart();
-    /* 800FD824 */ int procLadderUpEndInit(int);
-    /* 800FD8E8 */ int procLadderUpEnd();
-    /* 800FD9CC */ int procLadderDownStartInit();
-    /* 800FDB74 */ int procLadderDownStart();
-    /* 800FDC18 */ int procLadderDownEndInit(int);
-    /* 800FDCCC */ int procLadderDownEnd();
-    /* 800FDD90 */ int procLadderMoveInit(int, int, cXyz*);
-    /* 800FDF50 */ int procLadderMove();
-    /* 800FE010 */ f32 getClimbMoveUpDownAnmSpeed();
-    /* 800FE034 */ f32 getClimbMoveSideAnmSpeed();
-    /* 800FE058 */ BOOL checkClimbCode(cBgS_PolyInfo&);
-    /* 800FE114 */ BOOL setClimbInit();
-    /* 800FE174 */ void setClimbShapeOffset();
-    /* 800FE3C4 */ int getClimbDirectionFromAngle();
-    /* 800FE438 */ void changeClimbMoveProc(int);
-    /* 800FE5A0 */ BOOL checkClimbMoveUpDownProc(int);
-    /* 800FE6E8 */ BOOL checkClimbMoveSideProc(int);
-    /* 800FE868 */ int setMoveBGClimbCorrect();
-    /* 800FEB90 */ int checkBgCorrectClimbMove(cXyz*, cXyz*);
-    /* 800FEC70 */ BOOL checkClimbRoof(f32);
-    /* 800FED50 */ int checkClimbGround(cXyz*, f32);
-    /* 800FEEC0 */ BOOL checkBgClimbMove(int);
-    /* 800FF28C */ int setClimbStartNotGround();
-    /* 800FF450 */ int procClimbUpStartInit(int);
-    /* 800FF704 */ int procClimbUpStart();
-    /* 800FF818 */ int procClimbDownStartInit(s16);
-    /* 800FF9A8 */ int procClimbDownStart();
-    /* 800FFAB0 */ int procClimbMoveUpDownInit(int);
-    /* 800FFC58 */ int procClimbMoveUpDown();
-    /* 800FFDB0 */ int procClimbMoveSideInit();
-    /* 800FFF4C */ int procClimbMoveSide();
-    /* 801000F8 */ int procClimbWaitInit(int, int);
-    /* 80100258 */ int procClimbWait();
-    /* 801003E4 */ int procClimbToRoofInit();
-    /* 80100464 */ int procClimbToRoof();
-    /* 801005CC */ f32 getRoofHangFMoveAnmSpeed() const;
-    /* 801005F0 */ f32 getRoofHangSMoveAnmSpeed() const;
-    /* 80100614 */ void setRoofHangHandOnSE(cBgS_PolyInfo*);
-    /* 80100668 */ int checkRoofHangMovePos();
-    /* 80100770 */ int commonRoofHangProc();
-    /* 801008EC */ int checkNextActionRoofHang();
-    /* 80100A10 */ int procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int);
-    /* 80100AE4 */ int procRoofHangStart();
-    /* 80100BB4 */ int procRoofHangWaitInit(int);
-    /* 80100D38 */ int procRoofHangWait();
-    /* 80100DA4 */ int procRoofHangFrontMoveInit();
-    /* 80100EEC */ int procRoofHangFrontMove();
-    /* 8010121C */ int procRoofHangSideMoveInit();
-    /* 80101308 */ int procRoofHangSideMove();
-    /* 801013B8 */ int procRoofHangTurnInit();
-    /* 80101534 */ int procRoofHangTurn();
-    /* 8010163C */ void setRoofHangSwitch();
-    /* 801016AC */ int procRoofSwitchHangInit(fopAc_ac_c*);
-    /* 801017AC */ int procRoofSwitchHang();
-    /* 80101890 */ BOOL checkZoraWearMaskDraw();
-    /* 801018E4 */ BOOL checkAcceptUseItemInWater(u16) const;
-    /* 80101934 */ void swimDeleteItem();
-    /* 801019B8 */ bool getZoraSwim() const;
-    /* 80101A18 */ f32 getSwimFrontMaxSpeed() const;
-    /* 80101AA8 */ f32 getSwimMaxFallSpeed() const;
-    /* 80101B44 */ void checkOxygenTimer();
-    /* 80101C94 */ void offOxygenTimer();
-    /* 80101CB8 */ BOOL checkPossibleWaterInMode() const;
-    /* 80101CF4 */ void setWaterInAnmRate(daPy_frameCtrl_c*, f32);
-    /* 80101D70 */ void swimBgCheck(f32);
-    /* 801023E4 */ void setSpeedAndAngleSwim();
-    /* 801029C8 */ int checkNextActionSwim();
-    /* 80102B1C */ int checkSwimAction(int);
-    /* 80103058 */ int checkSwimUpAction();
-    /* 801032C8 */ void swimOutAfter(int);
-    /* 80103398 */ BOOL checkSwimFall();
-    /* 801033CC */ int checkSwimOutAction();
-    /* 80103698 */ void setSwimMoveAnime();
-    /* 80103EE0 */ bool checkSwimButtonAccept();
-    /* 80103F08 */ bool checkUpSwimButtonAccept();
-    /* 80103F24 */ BOOL checkSwimButtonMove();
-    /* 80103F94 */ BOOL checkZoraSwimMove();
-    /* 80103FE8 */ BOOL checkSwimNeckUpDown() const;
-    /* 80104034 */ void setSwimUpDownOffset();
-    /* 801040F8 */ int procSwimUpInit();
-    /* 801041E8 */ int procSwimUp();
-    /* 801042F8 */ int procSwimWaitInit(int);
-    /* 801044B4 */ int procSwimWait();
-    /* 80104670 */ int procSwimMoveInit();
-    /* 801047B8 */ int procSwimMove();
-    /* 80104958 */ int procSwimDiveInit();
-    /* 80104AA0 */ int procSwimDive();
-    /* 80104C50 */ int procSwimHookshotSubjectInit();
-    /* 80104D7C */ int procSwimHookshotSubject();
-    /* 80104EB8 */ int procSwimHookshotMoveInit();
-    /* 80104FC4 */ int procSwimHookshotMove();
-    /* 8010519C */ int procSwimDamageInit(dCcD_GObjInf*);
-    /* 80105728 */ int procSwimDamage();
-    /* 801058A0 */ int procOctaIealSpitInit();
-    /* 80105A00 */ int procOctaIealSpit();
-    /* 80105A98 */ bool checkSnowCode() const;
-    /* 80105ABC */ static bool checkSnowCodePolygon(cBgS_PolyInfo&);
-    /* 80105B10 */ bool checkBoardRestart();
-    /* 80105B58 */ int boardCommon(int);
-    /* 80106534 */ void setCommonBoardAnime(int);
-    /* 8010658C */ int checkNextActionBoard();
-    /* 80106618 */ int checkBoardSwordTriggerAction();
-    /* 80106650 */ int commonProcBoardInit(daAlink_c::daAlink_PROC);
-    /* 801066B8 */ f32 getBoardRowAnmSpeed();
-    /* 801066EC */ void setBoardLandAnime();
-    /* 80106774 */ int procBoardRideInit();
-    /* 801069D0 */ int procBoardRide();
-    /* 80106A38 */ int procBoardWaitInit(fopAc_ac_c*);
-    /* 80106BCC */ int procBoardWait();
-    /* 80106E88 */ int procBoardRowInit();
-    /* 80106F00 */ int procBoardRow();
-    /* 80107060 */ int procBoardTurnInit();
-    /* 801070DC */ int procBoardTurn();
-    /* 80107218 */ int procBoardJumpInit(f32, int);
-    /* 80107300 */ int procBoardJump();
-    /* 801073D0 */ int procBoardSubjectivityInit();
-    /* 80107418 */ int procBoardSubjectivity();
-    /* 801074AC */ int procBoardCutInit();
-    /* 8010755C */ int procBoardCut();
-    /* 801075D4 */ int procBoardCutTurnInit();
-    /* 80107744 */ int procBoardCutTurn();
-    /* 801083C8 */ void hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 801086DC */ void resetHookshotMode();
-    /* 8010871C */ BOOL setEnemyBombHookshot(fopAc_ac_c*);
-    /* 80108784 */ bool checkLv7BossRoom();
-    /* 801087B0 */ BOOL checkHookshotStickBG(cBgS_PolyInfo&);
-    /* 80108828 */ void cancelHookshotCarry();
-    /* 80108864 */ void changeHookshotDrawModel();
-    /* 801088A0 */ BOOL checkHookshotRoofLv7Boss();
-    /* 801088C8 */ BOOL checkChaseHookshot();
-    /* 80108980 */ BOOL checkOctaIealSpecialCollect();
-    /* 801089E8 */ BOOL checkBossOctaIealRoom();
-    /* 80108A18 */ BOOL checkHookshotWait() const;
-    /* 80108A3C */ void setHookshotCatchNow();
-    /* 80108B34 */ void setHookshotModel();
-    /* 80108DB4 */ void setHookshotSight();
-    /* 80108EEC */ void cancelHookshotShot();
-    /* 80108F64 */ bool cancelHookshotMove();
-    /* 8010903C */ BOOL checkHookshotReadyMaterialOffMode() const;
-    /* 80109070 */ void setHookshotReadyMaterial();
-    /* 801090EC */ int initHookshotUpperAnimeSpeed(int);
-    /* 80109170 */ void initHookshotReady();
-    /* 801091E4 */ void setHookshotReadyAnime();
-    /* 80109284 */ int checkUpperItemActionHookshot();
-    /* 801095C8 */ int checkNextActionHookshot();
-    /* 801097A0 */ void setHookshotReturnEnd();
-    /* 80109890 */ int setHookshotHangMoveBGCollect();
-    /* 80109AAC */ void setHookshotTopPosFly();
-    /* 80109BDC */ void setHookshotPos();
-    /* 8010B2DC */ void setHookshotRoofWaitAnime();
-    /* 8010B35C */ void setHookshotWallWaitAnime();
-    /* 8010B3AC */ void hookshotRoofTurn();
-    /* 8010B644 */ void initHookshotRoofWaitActor(fopAc_ac_c*);
-    /* 8010B720 */ int checkNextHookPoint();
-    /* 8010B84C */ int checkLandHookshotHang();
-    /* 8010B96C */ int commonHookshotRoofWait();
-    /* 8010BA6C */ int commonHookshotWallWait();
-    /* 8010BAA8 */ int procHookshotSubjectInit();
-    /* 8010BB48 */ int procHookshotSubject();
-    /* 8010BC08 */ int procHookshotMoveInit();
-    /* 8010BCA4 */ int procHookshotMove();
-    /* 8010BD90 */ int procHookshotFlyInit();
-    /* 8010BEF0 */ int procHookshotFly();
-    /* 8010C830 */ int procHookshotRoofWaitInit(int, fopAc_ac_c*, int);
-    /* 8010C9F4 */ int procHookshotRoofWait();
-    /* 8010CC80 */ int procHookshotRoofShootInit(fopAc_ac_c*);
-    /* 8010CD60 */ int procHookshotRoofShoot();
-    /* 8010CF6C */ int procHookshotRoofBootsInit(fopAc_ac_c*);
-    /* 8010D034 */ int procHookshotRoofBoots();
-    /* 8010D174 */ int procHookshotWallWaitInit(int, s16, int);
-    /* 8010D38C */ int procHookshotWallWait();
-    /* 8010D5F4 */ int procHookshotWallShootInit();
-    /* 8010D6CC */ int procHookshotWallShoot();
-    /* 8010D93C */ f32 getSpinnerGravity() const;
-    /* 8010D94C */ f32 getSpinnerMaxFallSpeed() const;
-    /* 8010D95C */ f32 getSpinnerJumpRate() const;
-    /* 8010D96C */ s16 getSpinnerRideMoveTime();
-    /* 8010D9B0 */ f32 getSpinnerRideSpeedF();
-    /* 8010D9F4 */ f32 getSpinnerRideDecSpeedMax() const;
-    /* 8010DA04 */ f32 getSpinnerRideDecSpeedMin() const;
-    /* 8010DA14 */ f32 getSpinnerRideDecSpeedRate() const;
-    /* 8010DA24 */ s16 getSpinnerRideRotAngleMax() const;
-    /* 8010DA34 */ s16 getSpinnerRideRotAngleMin() const;
-    /* 8010DAFC */ bool checkLv4BossRoom();
-    /* 8010DBC8 */ void setSpinnerSyncPos();
-    /* 8010DC64 */ int procSpinnerReadyInit();
-    /* 8010DDCC */ int procSpinnerReady();
-    /* 8010DE64 */ void setSpinnerStatus(u8, u8);
-    /* 8010DE78 */ int procSpinnerWaitInit();
-    /* 8010DF4C */ int procSpinnerWait();
-    /* 8010E48C */ int bottleModelCallBack();
-    /* 8010E584 */ BOOL checkOilBottleItemNotGet(u16);
-    /* 8010E5D8 */ void setBottleModel(u16);
-    /* 8010EAC4 */ int commonBottleDrink(int);
-    /* 8010F45C */ fopAc_ac_c* makeFairy(cXyz*, u32);
-    /* 8010F54C */ int procBottleDrinkInit(u16);
-    /* 8010F698 */ int procBottleDrink();
-    /* 8010F6F4 */ int procBottleOpenInit(u16);
-    /* 8010F8E4 */ int procBottleOpen();
-    /* 8010FC38 */ int procBottleSwingInit(fopAc_ac_c*, int);
-    /* 8010FF58 */ int procBottleSwing();
-    /* 801102D0 */ int procBottleGetInit(int);
-    /* 80110518 */ int procBottleGet();
-    /* 8011078C */ BOOL checkWaterInKandelaarOffset(f32);
-    /* 801107BC */ void checkWaterInKandelaar(f32);
-    /* 80110840 */ void offKandelaarModel();
-    /* 801108EC */ int kandelaarModelCallBack();
-    /* 80110C6C */ BOOL checkKandelaarEquipAnime() const;
-    /* 80110C94 */ void preKandelaarDraw();
-    /* 80110E84 */ void setKandelaarModel();
-    /* 80110F88 */ void resetOilBottleModel();
-    /* 80110FE0 */ void commonKandelaarPourInit();
-    /* 801110B8 */ int commonKandelaarPour(int);
-    /* 8011130C */ void initKandelaarSwing();
-    /* 80111440 */ int procKandelaarSwingInit();
-    /* 801115CC */ int procKandelaarSwing();
-    /* 8011167C */ int procKandelaarPourInit();
-    /* 80111724 */ int procKandelaarPour();
-    /* 80111784 */ void setGrassWhistleModel(int);
-    /* 8011181C */ void setHorseWhistleModel();
-    /* 80111894 */ int procGrassWhistleGetInit();
-    /* 801119D8 */ int procGrassWhistleGet();
-    /* 80111A9C */ int procGrassWhistleWaitInit(int, int, int, s16, cXyz*);
-    /* 80111CA4 */ int procGrassWhistleWait();
-    /* 80111FF0 */ int procCoHorseCallWaitInit(int);
-    /* 801120C8 */ int procCoHorseCallWait();
-    /* 801121B4 */ int procHawkCatchInit();
-    /* 80112220 */ int procHawkCatch();
-    /* 80112278 */ int procHawkSubjectInit();
-    /* 80112304 */ int procHawkSubject();
-    /* 80112474 */ bool checkIronBallThrowMode() const;
-    /* 801124B4 */ bool checkIronBallThrowReturnMode() const;
-    /* 80112568 */ void setIronBallWaitUpperAnime(int);
-    /* 80112628 */ void checkIronBallDelete();
-    /* 801126F8 */ void setIronBallReturn(int);
-    /* 80112768 */ void setIronBallBgCheckPos();
-    /* 801127F0 */ void setIronBallModel();
-    /* 80112C84 */ int setIronBallGroundVec(cXyz const*, cXyz*);
-    /* 80112E7C */ void setIronBallChainPos();
-    /* 80113CA0 */ BOOL checkIronBallReturnChange();
-    /* 80113D58 */ void setIronBallPos();
-    /* 801150E4 */ BOOL checkIronBallAnime() const;
-    /* 8011510C */ void setIronBallReadyAnime();
-    /* 801151E0 */ void setIronBallBaseAnime();
-    /* 80115254 */ BOOL checkUpperItemActionIronBall();
-    /* 801153F8 */ int checkNextActionIronBall();
-    /* 801154E4 */ int procIronBallSubjectInit();
-    /* 80115564 */ int procIronBallSubject();
-    /* 801155EC */ int procIronBallMoveInit();
-    /* 80115674 */ int procIronBallMove();
-    /* 8011577C */ int procIronBallThrowInit();
-    /* 80115860 */ int procIronBallThrow();
-    /* 801159F0 */ int procIronBallReturnInit();
-    /* 80115AA0 */ int procIronBallReturn();
-    /* 80115C20 */ BOOL checkEventRun() const;
-    /* 80115C50 */ void createNpcTks(cXyz*, int, u32);
-    /* 80115EC0 */ int checkDemoAction();
-    /* 80116E60 */ bool checkDemoMoveMode(u32) const;
-    /* 80116E9C */ void setDemoMoveData(u32*, cXyz const*);
-    /* 80117064 */ void setNoDrawSwordShield(int, u16);
-    /* 801171F4 */ void setDemoData();
-    /* 80117B90 */ void resetDemoBck();
-    /* 80117C34 */ void endHighModel();
-    /* 80117C90 */ void resetSpecialEvent();
-    /* 80117CF8 */ void endDemoMode();
-    /* 801180EC */ fopAc_ac_c* getDemoLookActor();
-    /* 80118170 */ BOOL checkFlyAtnWait();
-    /* 801181A0 */ void setGetItemFace(u16);
-    /* 801182D4 */ BOOL checkGrabTalkActor(fopAc_ac_c*);
-    /* 80118308 */ int setTalkStartBack(cXyz*);
-    /* 8011856C */ void setShapeAngleToTalkActor();
-    /* 80118654 */ void setTalkAnime();
-    /* 801186D4 */ u8 setTradeItemAnime();
-    /* 80118778 */ void setTradeItemOutHand();
-    /* 801187B4 */ BOOL checkEndMessage(u32);
-    /* 80118840 */ u8 setDemoRightHandIndex(u16);
-    /* 801188B0 */ u8 setDemoLeftHandIndex(u16);
-    /* 8011894C */ void setDemoRide(u16);
-    /* 801189F8 */ void setDemoBodyBck(dDemo_actor_c*, u16);
-    /* 80118AD0 */ static BOOL checkFinalBattle();
-    /* 80118B34 */ BOOL checkRestartDead(int, int);
-    /* 80118BF4 */ void setDeadRideSyncPos();
-    /* 80118C98 */ BOOL checkDeadHP();
-    /* 80118D7C */ BOOL checkDeadAction(int);
-    /* 80118FF8 */ void setHighModelBck(mDoExt_bckAnm*, u16);
-    /* 801190A4 */ void setHighModelFaceBtk(u16);
-    /* 80119134 */ void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16);
-    /* 801191C4 */ f32 setStickAnmData(J3DAnmBase*, int, int, u16, int);
-    /* 801195C0 */ int procDemoCommon();
-    /* 801195F8 */ int procCoToolDemoInit();
-    /* 801196D8 */ int procCoToolDemo();
-    /* 80119D98 */ int procCoTalkInit();
-    /* 80119F64 */ int procCoTalk();
-    /* 8011A214 */ int procCoOpenTreasureInit();
-    /* 8011A42C */ int procCoOpenTreasure();
-    /* 8011A4C0 */ int procCoUnequipInit();
-    /* 8011A5CC */ int procCoUnequip();
-    /* 8011A688 */ void setGetSubBgm(int);
-    /* 8011A798 */ int procCoGetItemInit();
-    /* 8011AC28 */ int procCoGetItem();
-    /* 8011B3F0 */ int procCoTurnBackInit();
-    /* 8011B46C */ int procCoTurnBack();
-    /* 8011B57C */ int procDoorOpenInit();
-    /* 8011B71C */ int procDoorOpen();
-    /* 8011B914 */ int procCoLookWaitInit();
-    /* 8011BA20 */ int procCoLookWait();
-    /* 8011BABC */ int procCoDemoPushPullWaitInit();
-    /* 8011BB40 */ int procCoDemoPushMoveInit();
-    /* 8011BC14 */ void setMonkeyMoveAnime();
-    /* 8011BC74 */ int procMonkeyMoveInit();
-    /* 8011BD18 */ int procMonkeyMove();
-    /* 8011BD6C */ int procDemoBoomerangCatchInit();
-    /* 8011BDF0 */ int procDemoBoomerangCatch();
-    /* 8011BE54 */ int procCoDeadInit(int);
-    /* 8011C1B4 */ int procCoDead();
-    /* 8011C62C */ int procCoLookAroundInit();
-    /* 8011C760 */ int procCoLookAround();
-    /* 8011C81C */ int procBossAtnWaitInit();
-    /* 8011C890 */ int procCoQuakeWaitInit();
-    /* 8011C904 */ int procCoCaughtInit();
-    /* 8011C9D0 */ int procLookUpInit();
-    /* 8011CA4C */ int procLookUp();
-    /* 8011CA98 */ int procLookUpToGetItemInit();
-    /* 8011CB20 */ int procLookUpToGetItem();
-    /* 8011CBD4 */ int procHandPatInit();
-    /* 8011CCA8 */ int procHandPat();
-    /* 8011CDE0 */ int procCoFogDeadInit();
-    /* 8011CF60 */ int procCoFogDead();
-    /* 8011D0A0 */ int procWolfSmellWaitInit();
-    /* 8011D110 */ int procCoNodInit();
-    /* 8011D1F4 */ int procCoNod();
-    /* 8011D268 */ int procCoEyeAwayInit();
-    /* 8011D304 */ int procCoGlareInit();
-    /* 8011D3CC */ int procCoGlare();
-    /* 8011D474 */ int procGoatStopReadyInit();
-    /* 8011D4D4 */ int procGoatStopReady();
-    /* 8011D544 */ int procCoGetReadySitInit();
-    /* 8011D64C */ int procCoGetReadySit();
-    /* 8011D6D0 */ int procCoTwGateInit();
-    /* 8011D7D4 */ int procCoTwGate();
-    /* 8011D82C */ int procWolfSnowEscapeInit();
-    /* 8011D8F8 */ int procWolfSnowEscape();
-    /* 8011DB04 */ int procZoraMoveInit();
-    /* 8011DB9C */ int procZoraMove();
-    /* 8011DDD4 */ int procLookAroundTurnInit();
-    /* 8011DED8 */ int procLookAroundTurn();
-    /* 8011DF68 */ int procTradeItemOutInit();
-    /* 8011E060 */ int procTradeItemOut();
-    /* 8011E3D8 */ static BOOL checkLetterItem(int);
-    /* 8011E448 */ int procNotUseItemInit(int);
-    /* 8011E57C */ int procNotUseItem();
-    /* 8011E6E0 */ int procSwordReadyInit();
-    /* 8011E748 */ int procSwordReady();
-    /* 8011E83C */ void setSwordPushAnime();
-    /* 8011E8E0 */ int procSwordPushInit();
-    /* 8011E960 */ int procSwordPush();
-    /* 8011E9F8 */ int procGanonFinishInit();
-    /* 8011EA78 */ int procGanonFinish();
-    /* 8011EAE8 */ int procCutFastReadyInit();
-    /* 8011EB8C */ int procCutFastReady();
-    /* 8011EBDC */ int procMasterSwordStickInit();
-    /* 8011EC60 */ int procMasterSwordStick();
-    /* 8011ED18 */ int procMasterSwordPullInit();
-    /* 8011ED8C */ int procMasterSwordPull();
-    /* 8011EE40 */ static BOOL checkLv7DungeonShop();
-    /* 8011EE94 */ int procDungeonWarpReadyInit();
-    /* 8011EFB8 */ int procDungeonWarpReady();
-    /* 8011F084 */ int procDungeonWarpInit();
-    /* 8011F0F4 */ int procDungeonWarp();
-    /* 8011F360 */ int procDungeonWarpSceneStartInit();
-    /* 8011F460 */ int procDungeonWarpSceneStart();
-    /* 8011F658 */ bool checkAcceptWarp();
-    /* 8011F7D8 */ void dungeonReturnWarp();
-    /* 8011F9EC */ void checkWarpStart();
-    /* 8011FBC0 */ int warpModelTexScroll();
-    /* 8011FD4C */ int procCoWarpInit(int, int);
-    /* 80120124 */ int procCoWarp();
-    /* 80120440 */ int commonWaitTurnInit();
-    /* 80120474 */ int commonGrabPutInit();
-    /* 80120500 */ int commonLargeDamageUpInit(int, int, s16, s16);
-    /* 80120534 */ int commonFallInit(int);
-    /* 80120580 */ JPABaseEmitter* setEmitter(u32*, u16, cXyz const*, csXyz const*);
-    /* 80120634 */ JPABaseEmitter* setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*,
+    static BOOL notSwordHitVibActor(fopAc_ac_c*);
+    BOOL setSwordHitVibration(dCcD_GObjInf*);
+    BOOL checkAtShieldHit(dCcD_GObjInf&);
+    BOOL checkCutReverseAt(dCcD_GObjInf*);
+    BOOL changeCutReverseProc(daAlink_c::daAlink_ANM);
+    void setCutDash(int, int);
+    BOOL checkForceSwordSwing();
+    void setComboReserb();
+    BOOL checkComboReserb();
+    int commonCutAction();
+    void setSwordVoiceSe(u32);
+    void setSwordChargeVoiceSe();
+    void setSwordComboVoice();
+    bool checkCutTurnInputTrigger();
+    int checkCutAction();
+    int getCutDirection();
+    BOOL checkCutCancelNextMode(int);
+    BOOL checkDoCutAction();
+    BOOL checkCutBackState();
+    BOOL checkCutHeadState();
+    BOOL checkDownAttackState();
+    BOOL checkCutLargeTurnState() const;
+    void cancelCutCharge();
+    void initCutAtnActorSearch();
+    void checkCutAtnActorChange();
+    void setCutJumpSpeed(int);
+    int procCutNormalInit(int);
+    int procCutNormal();
+    int procCutFinishInit(int);
+    int procCutFinish();
+    int procCutFinishJumpUpInit();
+    int procCutFinishJumpUp();
+    int procCutFinishJumpUpLandInit();
+    int procCutFinishJumpUpLand();
+    int procCutReverseInit(daAlink_c::daAlink_ANM);
+    int procCutReverse();
+    int procCutJumpInit(int);
+    int procCutJump();
+    int procCutJumpLandInit(int);
+    int procCutJumpLand();
+    int procCutTurnInit(int, int);
+    int procCutTurn();
+    int procCutTurnChargeInit();
+    int procCutTurnCharge();
+    int procCutTurnMoveInit(int);
+    int procCutTurnMove();
+    int procCutDownInit();
+    int procCutDown();
+    int procCutDownLandInit(fopEn_enemy_c*);
+    int procCutDownLand();
+    int procCutHeadInit();
+    int procCutHead();
+    int procCutHeadLandInit();
+    int procCutHeadLand();
+    int procCutLargeJumpChargeInit();
+    int procCutLargeJumpCharge();
+    int procCutLargeJumpInit();
+    int procCutLargeJump();
+    int procCutLargeJumpLandInit(int);
+    int procCutLargeJumpLand();
+    int procSwordUnequipSpInit();
+    int procSwordUnequipSp();
+    s16 getFreezeR() const;
+    s16 getFreezeG() const;
+    s16 getFreezeB() const;
+    bool checkMiddleBossGoronRoom();
+    void freezeTimerDamage();
+    BOOL checkNoLandDamageSlidePolygon();
+    void checkCutLandDamage();
+    BOOL checkCaughtEscapeCutTurn();
+    f32 damageMagnification(int i_checkZoraMag, int);
+    int setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int);
+    void setDamagePointNormal(int);
+    void setLandDamagePoint(int);
+    cXyz* getDamageVec(dCcD_GObjInf*);
+    void setDashDamage();
+    static BOOL checkIcePolygonDamage(cBgS_PolyInfo*);
+    BOOL checkMagicArmorNoDamage();
+    int checkPolyDamage();
+    BOOL checkElecReturnDamage(dCcD_GObjInf&, fopAc_ac_c**);
+    void damageTimerCount();
+    bool checkHugeAttack(int) const;
+    bool checkLargeAttack(int) const;
+    BOOL checkDamageAction();
+    int procDamageInit(dCcD_GObjInf*, int);
+    int procDamage();
+    int procCoLargeDamageInit(int, int, s16, s16, dCcD_GObjInf*, int);
+    int procCoLargeDamage();
+    int procLargeDamageUpInit(int, int, s16, s16);
+    int procLargeDamageUp();
+    int procCoLargeDamageWallInit(int, int, s16, s16);
+    int procCoLargeDamageWall();
+    int procCoPolyDamageInit();
+    int procCoPolyDamage();
+    int procLandDamageInit(int);
+    int procLandDamage();
+    int procCoElecDamageInit(fopAc_ac_c*, dCcD_GObjInf*, int);
+    int procCoElecDamage();
+    int procStEscapeInit();
+    int procStEscape();
+    int procDkCaughtInit(fpc_ProcID);
+    int procDkCaught();
+    void setScreamWaitAnime();
+    int procScreamWaitInit();
+    int procScreamWait();
+    int procCoSandWallHitInit();
+    int procCoSandWallHit();
+    int procCoLavaReturnInit(int);
+    int procCoLavaReturn();
+    int procCoSwimFreezeReturnInit();
+    int procCoSwimFreezeReturn();
+    static BOOL checkEnemyGroup(fopAc_ac_c*);
+    static BOOL checkSpecialNpc(fopAc_ac_c*);
+    BOOL checkShieldAttackEmphasys();
+    BOOL checkGuardActionChange();
+    void stickArrowIncrement(int);
+    void setArrowShieldActor(fopAc_ac_c*, int);
+    BOOL checkWoodShieldEquipNotIronBall() const;
+    void getArrowShieldOffset(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
+    void setArrowShieldPos(cXyz*, csXyz*, cXyz const*, cXyz const*) const;
+    BOOL checkUpperGuardAnime() const;
+    BOOL checkPlayerGuardAndAttack() const;
+    BOOL checkGuardAccept();
+    void setUpperGuardAnime(f32);
+    void setShieldGuard();
+    void setGuardSe(dCcD_GObjInf*);
+    void setSmallGuard(dCcD_GObjInf*);
+    int procGuardSlipInit(int, dCcD_GObjInf*);
+    int procGuardSlip();
+    int procGuardAttackInit();
+    int procGuardAttack();
+    int procGuardBreakInit();
+    int procGuardBreak();
+    int procTurnMoveInit(int);
+    int procTurnMove();
+    void getArrowFlyData(f32*, f32*, int) const;
+    f32 getArrowIncAtR() const;
+    s16 getBombArrowFlyExplodeTime() const;
+    f32 getArrowIncAtMaxStart() const;
+    f32 getArrowIncAtMax() const;
+    BOOL checkBowAndSlingItem(int);
+    void setSlingModel();
+    cXyz* checkBowCameraArrowPosP(s16*, s16*);
+    BOOL checkBowReadyAnime() const;
+    BOOL checkBowAnime() const;
+    void makeArrow();
+    void deleteArrow();
+    void setBowOrSlingStatus();
+    void changeArrowType();
+    BOOL cancelBowMoveRideNotAtn();
+    BOOL cancelBowMove();
+    void setBowReadyAnime();
+    void setBowReloadAnime();
+    BOOL checkUpperItemActionBow();
+    void checkUpperItemActionBowFly();
+    int checkNextActionBow();
+    void setBowModel();
+    bool checkBowGrabLeftHand() const;
+    void setBowHangAnime();
+    void setBowNormalAnime();
+    void setBowSight();
+    int procBowSubjectInit();
+    int procBowSubject();
+    int procBowMoveInit();
+    int procBowMove();
+    BOOL checkBoomerangLockAccept();
+    f32 getBoomSpeed();
+    f32 getBoomCatchSpeed() const;
+    f32 getBoomFlyMax() const;
+    f32 getBoomLockMax();
+    s16 getBoomBgThroughTime() const;
+    bool checkBossBabaRoom();
+    void cancelBoomerangLock(fopAc_ac_c*);
+    fopAc_ac_c* getBoomerangActor();
+    bool checkBoomerangChargeEnd();
+    BOOL checkBoomerangCarry(fopAc_ac_c*);
+    void initBoomerangUpperAnimeSpeed(int);
+    BOOL checkBoomerangAnime() const;
+    BOOL checkBoomerangThrowAnime() const;
+    void setBoomerangReadyQuake();
+    void setBoomerangReadyAnime();
+    void setThrowBoomerangAnime();
+    void setBoomerangCatchAnime();
+    void throwBoomerang();
+    int returnBoomerang(int);
+    int checkUpperItemActionBoomerang();
+    void checkUpperItemActionBoomerangFly();
+    int checkNextActionBoomerang();
+    int checkBoomerangCatchAction();
+    void setBoomerangSight();
+    int procBoomerangSubjectInit();
+    int procBoomerangSubject();
+    int procBoomerangMoveInit();
+    int procBoomerangMove();
+    int procBoomerangCatchInit();
+    int procBoomerangCatch();
+    static BOOL checkLv6BossRoom();
+    f32 getCopyRodBallSpeed() const;
+    f32 getCopyRodBallReturnSpeed() const;
+    f32 getCopyRodBallDisMax() const;
+    fopAc_ac_c* getCopyRodControllActor();
+    fopAc_ac_c* getCopyRodCameraActor();
+    void initCopyRodUpperAnimeSpeed(int);
+    static BOOL checkForestOldCentury();
+    int checkCopyRodAnime() const;
+    void setCopyRodControllAnime();
+    void setCopyRodControllUpperSpeedRate();
+    void setCopyRodModel();
+    void setCopyRodReadyAnime();
+    void throwCopyRod();
+    int returnCopyRod();
+    int checkUpperItemActionCopyRod();
+    void checkUpperItemActionCopyRodFly();
+    int checkNextActionCopyRod();
+    void setCopyRodSight();
+    int procCopyRodSubjectInit();
+    int procCopyRodSubject();
+    int procCopyRodMoveInit();
+    int procCopyRodMove();
+    int procCopyRodSwingInit();
+    int procCopyRodSwing();
+    int procCopyRodReviveInit();
+    int procCopyRodRevive();
+    void concatMagneBootMtx();
+    void concatMagneBootInvMtx();
+    void multVecMagneBootInvMtx(cXyz*);
+    bool commonMagneLineCheck(cXyz*, cXyz*);
+    BOOL checkBootsMoveAnime(int);
+    int setHeavyBoots(int);
+    s16 getMagneBootsLocalAngleY(s16, int);
+    void setMagneBootsMtx(cBgS_PolyInfo*, int);
+    int cancelMagneBootsOn();
+    int checkMagneBootsFly();
+    int procBootsEquipInit();
+    int procBootsEquip();
+    int procMagneBootsFlyInit();
+    int procMagneBootsFly();
+    s16 getBombExplodeTime() const;
+    f32 getBombGravity() const;
+    f32 getBombMaxFallSpeed() const;
+    f32 getBombBoundRate() const;
+    f32 getBombStopSpeedY() const;
+    f32 getBombMaxSpeedY() const;
+    f32 getBombEffScale() const;
+    f32 getBombAtR() const;
+    s16 getEnemyBombColorR() const;
+    f32 getBombWaterGravity() const;
+    f32 getBombWaterMaxFallSpeed() const;
+    f32 getBombExplodeWaterEffectLimit() const;
+    s16 getBombInsectLimitAngle() const;
+    BOOL checkGrabLineCheck();
+    f32 getGrabThrowRate();
+    BOOL checkGrabThrowAnime() const;
+    BOOL checkGrabAnime() const;
+    BOOL checkGrabAnimeAndThrow() const;
+    BOOL checkGrabCarryActor();
+    BOOL checkGrabSlowMoveActor();
+    BOOL checkGrabHeavyActor();
+    BOOL checkGrabSideActor();
+    void setGrabUpperAnime(f32);
+    BOOL checkGrabRooster();
+    void setGrabItemPos();
+    void freeGrabItem();
+    void setGrabUpperSpeedRate();
+    void setCarryArmAngle(f32, f32);
+    BOOL checkGrabNotThrow();
+    BOOL checkNextActionGrab();
+    void initGrabNextMode();
+    void setGrabItemThrow();
+    BOOL checkUpperGrabItemThrow(f32);
+    void putObjLineCheck(dBgS_LinChk&, cXyz*, fopAc_ac_c*);
+    bool grabLineCheck(cXyz*, cXyz*);
+    void setGrabItemActor(fopAc_ac_c*);
+    int procGrabReadyInit();
+    int procGrabReady();
+    int procGrabUpInit();
+    int procGrabUp();
+    int procGrabMiss();
+    int procGrabThrowInit(int);
+    int procGrabThrow();
+    int procGrabPutInit();
+    int procGrabPut();
+    int procGrabWaitInit();
+    int procGrabWait();
+    int procGrabReboundInit(int);
+    int procGrabRebound();
+    int procGrabStandInit();
+    int procGrabStand();
+    BOOL checkInsectActorName(fopAc_ac_c*);
+    int procInsectCatchInit();
+    int procInsectCatch();
+    int procPickUpInit();
+    int procPickUp();
+    int procPickPutInit(int);
+    int procPickPut();
+    BOOL checkSetChainPullAnime(s16);
+    s16 getChainStickAngleY(s16) const;
+    u8 checkChainEmphasys();
+    BOOL searchFmChainPos();
+    BOOL setFmChainPosFromOut(fopAc_ac_c*, cXyz*, int);
+    int procFmChainUpInit();
+    int procFmChainUp();
+    int procFmChainStrongPullInit();
+    int procFmChainStrongPull();
+    void setWallGrabStatus(u8, u8);
+    int getWallGrabStatus();
+    BOOL wallGrabTrigger();
+    BOOL wallGrabButton();
+    int setPushPullKeepData(dBgW_Base::PushPullLabel, int);
+    BOOL checkPushPullTurnBlock();
+    BOOL checkPullBehindWall();
+    void offGoatStopGame();
+    BOOL checkGoatCatchActor(fopAc_ac_c*);
+    f32 getGoatCatchDistance2();
+    int endPushPull();
+    f32 getPushPullAnimeSpeed();
+    int procCoPushPullWaitInit(int);
+    int procCoPushPullWait();
+    int procCoPushMoveInit(int, int);
+    int procCoPushMove();
+    int procPullMoveInit(int);
+    int procPullMove();
+    void setGoatStopGameFail(fopAc_ac_c*);
+    int procGoatMoveInit();
+    int procGoatMove();
+    int procGoatCatchInit(fopAc_ac_c*, f32);
+    int procGoatCatch();
+    int procGoatStrokeInit();
+    int procGoatStroke();
+    int procGoronMoveInit();
+    int procGoronMove();
+    BOOL checkSumouVsActor();
+    void cancelSumouMode();
+    BOOL sumouPunchTrigger();
+    void setSumouPunchStatus();
+    int procSumouReadyInit();
+    int procSumouReady();
+    int procSumouMoveInit();
+    int procSumouMove();
+    int procSumouSideMoveInit();
+    int procSumouSideMove();
+    int procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int unused);
+    int procSumouAction();
+    int procSumouStaggerInit();
+    int procSumouStagger();
+    int procSumouWinLoseInit();
+    int procSumouWinLose();
+    int procSumouShikoInit();
+    int procSumouShiko();
+    static BOOL checkHorseZeldaBowMode();
+    static void setHorseZeldaDamage();
+    static BOOL checkHorseDashAccept();
+    static BOOL checkCowGame();
+    int getReinRideDirection();
+    int checkReinRideBgCheck();
+    void commonInitForceRideRein();
+    int initForceRideBoar();
+    void initForceRideHorse();
+    void rideGetOff();
+    BOOL checkHorseNotDamageReaction() const;
+    BOOL checkHorseWaitLashAnime() const;
+    BOOL checkHorseReinLeftOnly() const;
+    int getReinHandType() const;
+    BOOL checkHorseLieAnime() const;
+    BOOL checkHorseSubjectivity() const;
+    void setHorseSwordUpAnime();
+    void setHorseTurnUpperAnime(int);
+    BOOL checkHorseNoUpperAnime() const;
+    void getHorseReinHandPos(cXyz*, cXyz*);
+    BOOL checkHorseNotGrab() const;
+    void setHorseStirrup();
+    void changeBoarRunRide();
+    int setSyncHorsePos();
+    int setSyncBoarPos();
+    int setSyncBoarRunPos();
+    BOOL setSyncRidePos();
+    void setHorseTurnAnime();
+    void getBaseHorseAnime(daAlink_c::daAlink_ANM*);
+    int checkHorseSpecialProc();
+    BOOL checkHorseServiceWaitAnime();
+    int setSyncHorse(int);
+    int setSyncBoar(int);
+    int setSyncRide(int);
+    void setBaseHorseAnimeFrame();
+    void setBaseBoarAnime();
+    void setBaseRideAnime();
+    bool checkHorseSwordUpSpped();
+    void setHorseSwordUp(int);
+    int setRideSubjectAngle(s16);
+    void setBodyAngleRideReadyAnime();
+    BOOL checkHorseGetOffWallCheck(cXyz*, cXyz*, s16);
+    int checkHorseGetOffDirection();
+    void boarForceGetOff();
+    void horseGetOffEnd();
+    int checkNextActionHorse();
+    BOOL checkHorseGetOff();
+    int checkHorseGetOffAndSetDoStatus();
+    int setHorseGetOff(int);
+    int procHorseRideInit();
+    int procHorseRide();
+    int procHorseGetOffInit(int);
+    int procHorseGetOff();
+    int procHorseWaitInit();
+    int procHorseWait();
+    int procHorseTurnInit();
+    int procHorseTurn();
+    int procHorseJumpInit();
+    int procHorseJump();
+    int procHorseLandInit();
+    int procHorseLand();
+    int procHorseSubjectivityInit();
+    int procHorseSubjectivity();
+    int procHorseCutInit();
+    int procHorseCut();
+    int procHorseCutChargeReadyInit();
+    int procHorseCutChargeReady();
+    int procHorseCutTurnInit();
+    int procHorseCutTurn();
+    int procHorseDamageInit(dCcD_GObjInf*);
+    int procHorseDamage();
+    int procHorseBowSubjectInit();
+    int procHorseBowSubject();
+    int procHorseBowMoveInit();
+    int procHorseBowMove();
+    int procHorseGrabMoveInit();
+    int procHorseGrabMove();
+    int procHorseBoomerangSubjectInit();
+    int procHorseBoomerangSubject();
+    int procHorseBoomerangMoveInit();
+    int procHorseBoomerangMove();
+    int procHorseHookshotSubjectInit();
+    int procHorseHookshotSubject();
+    int procHorseHookshotMoveInit();
+    int procHorseHookshotMove();
+    int procHorseBottleDrinkInit(u16);
+    int procHorseBottleDrink();
+    int procHorseKandelaarPourInit();
+    int procHorseKandelaarPour();
+    int procHorseComebackInit();
+    int procHorseComeback();
+    int procHorseRunInit();
+    int procHorseRun();
+    int procHorseHangInit(dCcD_GObjInf*, int);
+    int procHorseHang();
+    int procHorseGetKeyInit();
+    int procHorseGetKey();
+    int procHorseLookDownInit();
+    int procHorseLookDown();
+    int procBoarRunInit();
+    int procBoarRun();
+    f32 getCanoeMaxSpeed() const;
+    f32 getCanoeBackMaxSpeed() const;
+    f32 getCanoeCres() const;
+    f32 getCanoeSpeedRate() const;
+    s16 getCanoeMaxRotSpeed() const;
+    static cXyz* getCanoeLocalPaddleTop();
+    BOOL checkCanoeRideTandem();
+    BOOL checkFishingRodAndLureItem() const;
+    void initFishingRodHand();
+    MtxP getCanoePaddleMatrix();
+    BOOL checkFishingRodGrab(fopAc_ac_c*) const;
+    BOOL checkCanoePaddleGrab(fopAc_ac_c*) const;
+    BOOL checkCanoeFishingRodGrabOrPut() const;
+    void initCanoeRide();
+    BOOL checkCanoeJumpRide();
+    void setArmReelAnime();
+    void setFishingWaitAction();
+    void setFishGetFace();
+    void setRideCanoeBasePos(fopAc_ac_c*);
+    void setSyncCanoePos();
+    int canoeCommon();
+    int checkNextActionCanoe();
+    int procCanoeRideInit();
+    int procCanoeRide();
+    int procCanoeJumpRideInit(fopAc_ac_c*);
+    int procCanoeJumpRide();
+    int procCanoeGetOffInit();
+    int procCanoeGetOff();
+    int procCanoeWaitInit(int);
+    int procCanoeWait();
+    int procCanoeRowInit(int);
+    int procCanoeRow();
+    int procCanoePaddleShiftInit(int);
+    int procCanoePaddleShift();
+    int procCanoePaddlePutInit(int);
+    int procCanoePaddlePut();
+    int procCanoePaddleGrabInit();
+    int procCanoePaddleGrab();
+    int procCanoeRodGrabInit();
+    int procCanoeRodGrab();
+    int procCanoeFishingWaitInit();
+    int procCanoeFishingWait();
+    int procCanoeFishingReelInit();
+    int procCanoeFishingReel();
+    int procCanoeFishingGetInit();
+    int procCanoeFishingGet();
+    int procCanoeSubjectivityInit();
+    int procCanoeSubjectivity();
+    int procCanoeBowSubjectInit();
+    int procCanoeBowSubject();
+    int procCanoeBowMoveInit();
+    int procCanoeBowMove();
+    int procCanoeGrabMoveInit();
+    int procCanoeGrabMove();
+    int procCanoeBoomerangSubjectInit();
+    int procCanoeBoomerangSubject();
+    int procCanoeBoomerangMoveInit();
+    int procCanoeBoomerangMove();
+    int procCanoeHookshotSubjectInit();
+    int procCanoeHookshotSubject();
+    int procCanoeHookshotMoveInit();
+    int procCanoeHookshotMove();
+    int procCanoeBottleDrinkInit(u16);
+    int procCanoeBottleDrink();
+    int procCanoeKandelaarPourInit();
+    int procCanoeKandelaarPour();
+    void setGroundFishingRodActor();
+    int procFishingCastInit();
+    int procFishingCast();
+    int procFishingFoodInit();
+    int procFishingFood();
+    f32 getCrawlMoveAnmSpeed();
+    f32 getCrawlMoveSpeed();
+    void setCrawlMoveDirectionArrow();
+    BOOL changeCrawlAutoMoveProc(cXyz*);
+    int getCrawlMoveVec(cXyz*, cXyz*, cXyz*, int, int, u8*);
+    void crawlBgCheck(cXyz*, cXyz*, int);
+    BOOL checkCrawlSideWall(cXyz*, cXyz*, cXyz*, cXyz*, s16*, s16*);
+    void decideCrawlDoStatus();
+    BOOL checkNotCrawlStand(cXyz*);
+    BOOL checkNotCrawlStand(cXyz*, cXyz*);
+    BOOL checkCrawlInHoll(cXyz*, cXyz*, cXyz*, int);
+    void setCrawlMoveHoll();
+    void setCrawlMoveAngle();
+    void stopHalfMoveAnime(f32);
+    void setCrawlAutoMoveAimPos();
+    int procCrawlStartInit();
+    int procCrawlStart();
+    int procCrawlMoveInit(s16, s16);
+    int procCrawlMove();
+    int procCrawlAutoMoveInit(int, cXyz*);
+    int procCrawlAutoMove();
+    int procCrawlEndInit(int, s16, s16);
+    int procCrawlEnd();
+    f32 getHangMoveAnmSpeed();
+    int getHangDirectionFromAngle();
+    BOOL hangMoveBgCheck(s16, cXyz*);
+    BOOL changeHangMoveProc(int);
+    bool checkHangFootWall();
+    void setHangGroundY();
+    int changeHangEndProc();
+    void checkHangStartSideWall(s16);
+    int procHangStartInit();
+    int procHangStart();
+    int procHangFallStartInit(cM3dGPla*);
+    int procHangFallStart();
+    int procHangUpInit(int);
+    int procHangUp();
+    int procHangWaitInit();
+    int procHangWait();
+    int procHangMoveInit(int);
+    int procHangMove();
+    int procHangClimbInit(f32);
+    int procHangClimb();
+    int procHangWallCatchInit();
+    int procHangWallCatch();
+    int procHangReadyInit();
+    int procHangReady();
+    int procHangLeverDownInit();
+    int procHangLeverDown();
+    int setDragonHangPos();
+    int setOctaIealHangPos();
+    int setBossBodyHangPos();
+    int procBossBodyHangInit(fopAc_ac_c*);
+    int procBossBodyHang();
+    int getLadderUnitCount() const;
+    int setLadderInit();
+    void setLadderPosInit();
+    void setLadderPos(int);
+    f32 getLadderMoveAnmSpeed();
+    int changeLadderMoveProc(int);
+    int setMoveBGLadderCorrect();
+    int checkLadderFall();
+    int procLadderUpStartInit();
+    int procLadderUpStart();
+    int procLadderUpEndInit(int);
+    int procLadderUpEnd();
+    int procLadderDownStartInit();
+    int procLadderDownStart();
+    int procLadderDownEndInit(int);
+    int procLadderDownEnd();
+    int procLadderMoveInit(int, int, cXyz*);
+    int procLadderMove();
+    f32 getClimbMoveUpDownAnmSpeed();
+    f32 getClimbMoveSideAnmSpeed();
+    BOOL checkClimbCode(cBgS_PolyInfo&);
+    BOOL setClimbInit();
+    void setClimbShapeOffset();
+    int getClimbDirectionFromAngle();
+    void changeClimbMoveProc(int);
+    BOOL checkClimbMoveUpDownProc(int);
+    BOOL checkClimbMoveSideProc(int);
+    int setMoveBGClimbCorrect();
+    int checkBgCorrectClimbMove(cXyz*, cXyz*);
+    BOOL checkClimbRoof(f32);
+    int checkClimbGround(cXyz*, f32);
+    BOOL checkBgClimbMove(int);
+    int setClimbStartNotGround();
+    int procClimbUpStartInit(int);
+    int procClimbUpStart();
+    int procClimbDownStartInit(s16);
+    int procClimbDownStart();
+    int procClimbMoveUpDownInit(int);
+    int procClimbMoveUpDown();
+    int procClimbMoveSideInit();
+    int procClimbMoveSide();
+    int procClimbWaitInit(int, int);
+    int procClimbWait();
+    int procClimbToRoofInit();
+    int procClimbToRoof();
+    f32 getRoofHangFMoveAnmSpeed() const;
+    f32 getRoofHangSMoveAnmSpeed() const;
+    void setRoofHangHandOnSE(cBgS_PolyInfo*);
+    int checkRoofHangMovePos();
+    int commonRoofHangProc();
+    int checkNextActionRoofHang();
+    int procRoofHangStartInit(cBgS_PolyInfo const&, cXyz const&, int);
+    int procRoofHangStart();
+    int procRoofHangWaitInit(int);
+    int procRoofHangWait();
+    int procRoofHangFrontMoveInit();
+    int procRoofHangFrontMove();
+    int procRoofHangSideMoveInit();
+    int procRoofHangSideMove();
+    int procRoofHangTurnInit();
+    int procRoofHangTurn();
+    void setRoofHangSwitch();
+    int procRoofSwitchHangInit(fopAc_ac_c*);
+    int procRoofSwitchHang();
+    BOOL checkZoraWearMaskDraw();
+    BOOL checkAcceptUseItemInWater(u16) const;
+    void swimDeleteItem();
+    bool getZoraSwim() const;
+    f32 getSwimFrontMaxSpeed() const;
+    f32 getSwimMaxFallSpeed() const;
+    void checkOxygenTimer();
+    void offOxygenTimer();
+    BOOL checkPossibleWaterInMode() const;
+    void setWaterInAnmRate(daPy_frameCtrl_c*, f32);
+    void swimBgCheck(f32);
+    void setSpeedAndAngleSwim();
+    int checkNextActionSwim();
+    int checkSwimAction(int);
+    int checkSwimUpAction();
+    void swimOutAfter(int);
+    BOOL checkSwimFall();
+    int checkSwimOutAction();
+    void setSwimMoveAnime();
+    bool checkSwimButtonAccept();
+    bool checkUpSwimButtonAccept();
+    BOOL checkSwimButtonMove();
+    BOOL checkZoraSwimMove();
+    BOOL checkSwimNeckUpDown() const;
+    void setSwimUpDownOffset();
+    int procSwimUpInit();
+    int procSwimUp();
+    int procSwimWaitInit(int);
+    int procSwimWait();
+    int procSwimMoveInit();
+    int procSwimMove();
+    int procSwimDiveInit();
+    int procSwimDive();
+    int procSwimHookshotSubjectInit();
+    int procSwimHookshotSubject();
+    int procSwimHookshotMoveInit();
+    int procSwimHookshotMove();
+    int procSwimDamageInit(dCcD_GObjInf*);
+    int procSwimDamage();
+    int procOctaIealSpitInit();
+    int procOctaIealSpit();
+    bool checkSnowCode() const;
+    static bool checkSnowCodePolygon(cBgS_PolyInfo&);
+    bool checkBoardRestart();
+    int boardCommon(int);
+    void setCommonBoardAnime(int);
+    int checkNextActionBoard();
+    int checkBoardSwordTriggerAction();
+    int commonProcBoardInit(daAlink_c::daAlink_PROC);
+    f32 getBoardRowAnmSpeed();
+    void setBoardLandAnime();
+    int procBoardRideInit();
+    int procBoardRide();
+    int procBoardWaitInit(fopAc_ac_c*);
+    int procBoardWait();
+    int procBoardRowInit();
+    int procBoardRow();
+    int procBoardTurnInit();
+    int procBoardTurn();
+    int procBoardJumpInit(f32, int);
+    int procBoardJump();
+    int procBoardSubjectivityInit();
+    int procBoardSubjectivity();
+    int procBoardCutInit();
+    int procBoardCut();
+    int procBoardCutTurnInit();
+    int procBoardCutTurn();
+    void hookshotAtHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    void resetHookshotMode();
+    BOOL setEnemyBombHookshot(fopAc_ac_c*);
+    bool checkLv7BossRoom();
+    BOOL checkHookshotStickBG(cBgS_PolyInfo&);
+    void cancelHookshotCarry();
+    void changeHookshotDrawModel();
+    BOOL checkHookshotRoofLv7Boss();
+    BOOL checkChaseHookshot();
+    BOOL checkOctaIealSpecialCollect();
+    BOOL checkBossOctaIealRoom();
+    BOOL checkHookshotWait() const;
+    void setHookshotCatchNow();
+    void setHookshotModel();
+    void setHookshotSight();
+    void cancelHookshotShot();
+    bool cancelHookshotMove();
+    BOOL checkHookshotReadyMaterialOffMode() const;
+    void setHookshotReadyMaterial();
+    int initHookshotUpperAnimeSpeed(int);
+    void initHookshotReady();
+    void setHookshotReadyAnime();
+    int checkUpperItemActionHookshot();
+    int checkNextActionHookshot();
+    void setHookshotReturnEnd();
+    int setHookshotHangMoveBGCollect();
+    void setHookshotTopPosFly();
+    void setHookshotPos();
+    void setHookshotRoofWaitAnime();
+    void setHookshotWallWaitAnime();
+    void hookshotRoofTurn();
+    void initHookshotRoofWaitActor(fopAc_ac_c*);
+    int checkNextHookPoint();
+    int checkLandHookshotHang();
+    int commonHookshotRoofWait();
+    int commonHookshotWallWait();
+    int procHookshotSubjectInit();
+    int procHookshotSubject();
+    int procHookshotMoveInit();
+    int procHookshotMove();
+    int procHookshotFlyInit();
+    int procHookshotFly();
+    int procHookshotRoofWaitInit(int, fopAc_ac_c*, int);
+    int procHookshotRoofWait();
+    int procHookshotRoofShootInit(fopAc_ac_c*);
+    int procHookshotRoofShoot();
+    int procHookshotRoofBootsInit(fopAc_ac_c*);
+    int procHookshotRoofBoots();
+    int procHookshotWallWaitInit(int, s16, int);
+    int procHookshotWallWait();
+    int procHookshotWallShootInit();
+    int procHookshotWallShoot();
+    f32 getSpinnerGravity() const;
+    f32 getSpinnerMaxFallSpeed() const;
+    f32 getSpinnerJumpRate() const;
+    s16 getSpinnerRideMoveTime();
+    f32 getSpinnerRideSpeedF();
+    f32 getSpinnerRideDecSpeedMax() const;
+    f32 getSpinnerRideDecSpeedMin() const;
+    f32 getSpinnerRideDecSpeedRate() const;
+    s16 getSpinnerRideRotAngleMax() const;
+    s16 getSpinnerRideRotAngleMin() const;
+    bool checkLv4BossRoom();
+    void setSpinnerSyncPos();
+    int procSpinnerReadyInit();
+    int procSpinnerReady();
+    void setSpinnerStatus(u8, u8);
+    int procSpinnerWaitInit();
+    int procSpinnerWait();
+    int bottleModelCallBack();
+    BOOL checkOilBottleItemNotGet(u16);
+    void setBottleModel(u16);
+    int commonBottleDrink(int);
+    fopAc_ac_c* makeFairy(cXyz*, u32);
+    int procBottleDrinkInit(u16);
+    int procBottleDrink();
+    int procBottleOpenInit(u16);
+    int procBottleOpen();
+    int procBottleSwingInit(fopAc_ac_c*, int);
+    int procBottleSwing();
+    int procBottleGetInit(int);
+    int procBottleGet();
+    BOOL checkWaterInKandelaarOffset(f32);
+    void checkWaterInKandelaar(f32);
+    void offKandelaarModel();
+    int kandelaarModelCallBack();
+    BOOL checkKandelaarEquipAnime() const;
+    void preKandelaarDraw();
+    void setKandelaarModel();
+    void resetOilBottleModel();
+    void commonKandelaarPourInit();
+    int commonKandelaarPour(int);
+    void initKandelaarSwing();
+    int procKandelaarSwingInit();
+    int procKandelaarSwing();
+    int procKandelaarPourInit();
+    int procKandelaarPour();
+    void setGrassWhistleModel(int);
+    void setHorseWhistleModel();
+    int procGrassWhistleGetInit();
+    int procGrassWhistleGet();
+    int procGrassWhistleWaitInit(int, int, int, s16, cXyz*);
+    int procGrassWhistleWait();
+    int procCoHorseCallWaitInit(int);
+    int procCoHorseCallWait();
+    int procHawkCatchInit();
+    int procHawkCatch();
+    int procHawkSubjectInit();
+    int procHawkSubject();
+    bool checkIronBallThrowMode() const;
+    bool checkIronBallThrowReturnMode() const;
+    void setIronBallWaitUpperAnime(int);
+    void checkIronBallDelete();
+    void setIronBallReturn(int);
+    void setIronBallBgCheckPos();
+    void setIronBallModel();
+    int setIronBallGroundVec(cXyz const*, cXyz*);
+    void setIronBallChainPos();
+    BOOL checkIronBallReturnChange();
+    void setIronBallPos();
+    BOOL checkIronBallAnime() const;
+    void setIronBallReadyAnime();
+    void setIronBallBaseAnime();
+    BOOL checkUpperItemActionIronBall();
+    int checkNextActionIronBall();
+    int procIronBallSubjectInit();
+    int procIronBallSubject();
+    int procIronBallMoveInit();
+    int procIronBallMove();
+    int procIronBallThrowInit();
+    int procIronBallThrow();
+    int procIronBallReturnInit();
+    int procIronBallReturn();
+    BOOL checkEventRun() const;
+    void createNpcTks(cXyz*, int, u32);
+    int checkDemoAction();
+    bool checkDemoMoveMode(u32) const;
+    void setDemoMoveData(u32*, cXyz const*);
+    void setNoDrawSwordShield(int, u16);
+    void setDemoData();
+    void resetDemoBck();
+    void endHighModel();
+    void resetSpecialEvent();
+    void endDemoMode();
+    fopAc_ac_c* getDemoLookActor();
+    BOOL checkFlyAtnWait();
+    void setGetItemFace(u16);
+    BOOL checkGrabTalkActor(fopAc_ac_c*);
+    int setTalkStartBack(cXyz*);
+    void setShapeAngleToTalkActor();
+    void setTalkAnime();
+    u8 setTradeItemAnime();
+    void setTradeItemOutHand();
+    BOOL checkEndMessage(u32);
+    u8 setDemoRightHandIndex(u16);
+    u8 setDemoLeftHandIndex(u16);
+    void setDemoRide(u16);
+    void setDemoBodyBck(dDemo_actor_c*, u16);
+    static BOOL checkFinalBattle();
+    BOOL checkRestartDead(int, int);
+    void setDeadRideSyncPos();
+    BOOL checkDeadHP();
+    BOOL checkDeadAction(int);
+    void setHighModelBck(mDoExt_bckAnm*, u16);
+    void setHighModelFaceBtk(u16);
+    void setDemoBrk(J3DAnmTevRegKey**, J3DModel*, u16);
+    f32 setStickAnmData(J3DAnmBase*, int, int, u16, int);
+    int procDemoCommon();
+    int procCoToolDemoInit();
+    int procCoToolDemo();
+    int procCoTalkInit();
+    int procCoTalk();
+    int procCoOpenTreasureInit();
+    int procCoOpenTreasure();
+    int procCoUnequipInit();
+    int procCoUnequip();
+    void setGetSubBgm(int);
+    int procCoGetItemInit();
+    int procCoGetItem();
+    int procCoTurnBackInit();
+    int procCoTurnBack();
+    int procDoorOpenInit();
+    int procDoorOpen();
+    int procCoLookWaitInit();
+    int procCoLookWait();
+    int procCoDemoPushPullWaitInit();
+    int procCoDemoPushMoveInit();
+    void setMonkeyMoveAnime();
+    int procMonkeyMoveInit();
+    int procMonkeyMove();
+    int procDemoBoomerangCatchInit();
+    int procDemoBoomerangCatch();
+    int procCoDeadInit(int);
+    int procCoDead();
+    int procCoLookAroundInit();
+    int procCoLookAround();
+    int procBossAtnWaitInit();
+    int procCoQuakeWaitInit();
+    int procCoCaughtInit();
+    int procLookUpInit();
+    int procLookUp();
+    int procLookUpToGetItemInit();
+    int procLookUpToGetItem();
+    int procHandPatInit();
+    int procHandPat();
+    int procCoFogDeadInit();
+    int procCoFogDead();
+    int procWolfSmellWaitInit();
+    int procCoNodInit();
+    int procCoNod();
+    int procCoEyeAwayInit();
+    int procCoGlareInit();
+    int procCoGlare();
+    int procGoatStopReadyInit();
+    int procGoatStopReady();
+    int procCoGetReadySitInit();
+    int procCoGetReadySit();
+    int procCoTwGateInit();
+    int procCoTwGate();
+    int procWolfSnowEscapeInit();
+    int procWolfSnowEscape();
+    int procZoraMoveInit();
+    int procZoraMove();
+    int procLookAroundTurnInit();
+    int procLookAroundTurn();
+    int procTradeItemOutInit();
+    int procTradeItemOut();
+    static BOOL checkLetterItem(int);
+    int procNotUseItemInit(int);
+    int procNotUseItem();
+    int procSwordReadyInit();
+    int procSwordReady();
+    void setSwordPushAnime();
+    int procSwordPushInit();
+    int procSwordPush();
+    int procGanonFinishInit();
+    int procGanonFinish();
+    int procCutFastReadyInit();
+    int procCutFastReady();
+    int procMasterSwordStickInit();
+    int procMasterSwordStick();
+    int procMasterSwordPullInit();
+    int procMasterSwordPull();
+    static BOOL checkLv7DungeonShop();
+    int procDungeonWarpReadyInit();
+    int procDungeonWarpReady();
+    int procDungeonWarpInit();
+    int procDungeonWarp();
+    int procDungeonWarpSceneStartInit();
+    int procDungeonWarpSceneStart();
+    bool checkAcceptWarp();
+    void dungeonReturnWarp();
+    void checkWarpStart();
+    int warpModelTexScroll();
+    int procCoWarpInit(int, int);
+    int procCoWarp();
+    int commonWaitTurnInit();
+    int commonGrabPutInit();
+    int commonLargeDamageUpInit(int, int, s16, s16);
+    int commonFallInit(int);
+    JPABaseEmitter* setEmitter(u32*, u16, cXyz const*, csXyz const*);
+    JPABaseEmitter* setEmitterPolyColor(u32*, u16, cBgS_PolyInfo&, cXyz const*,
                                                        csXyz const*);
-    /* 801206C4 */ JPABaseEmitter* setEmitterColor(u32*, u16, cXyz const*, csXyz const*);
-    /* 80120778 */ void stopDrawParticle(u32);
-    /* 801207BC */ void setEffectFrontRollParam();
-    /* 80120880 */ void setEffectSlipParam();
-    /* 80120B00 */ void setEffectRunParam();
-    /* 80120DB0 */ void setEffectSmallLandParam();
-    /* 80121000 */ void setEffectLandParam();
-    /* 80121004 */ void setEffectSumouParam();
-    /* 801211C0 */ void setFootEffectProcType(int);
-    /* 80121214 */ void setWolfFootOn(int);
-    /* 80121304 */ void setFootMark(cXyz*, u16, int);
-    /* 80121388 */ void setEffect();
-    /* 801221F0 */ void setSumouEffect();
-    /* 801225E8 */ void setWaterfallEffect(cXyz const*, u32*);
-    /* 80122654 */ void setWaterfallEffect();
-    /* 8012277C */ void setMagneBootsEffect();
-    /* 801228F4 */ void setSwordChargeEffect();
-    /* 80122BBC */ void setElecDamageEffect();
-    /* 80122F18 */ void clearCutTurnEffectID();
-    /* 80122F78 */ void setCutTurnEffect();
-    /* 801233A4 */ void setHorseCutTurnEffect();
-    /* 80123434 */ void setCutLargeJumpLandEffect();
-    /* 801236BC */ void setBootsLightEffect();
-    /* 801237A8 */ void setLightningSwordEffect();
-    /* 801238FC */ void setWolfRollAttackEffect();
-    /* 801239B0 */ void setWolfDigEffect();
-    /* 80123BF0 */ void setWolfSwimEndEffect(JPABaseEmitter**, JPABaseEmitter**);
-    /* 80123C8C */ void setWolfLockAttackEffect();
-    /* 80123D88 */ void setWolfJumpAttackEffect();
-    /* 80123ED0 */ void setWolfBarrierHitEffect(dBgS_LinChk&);
-    /* 80124144 */ void setCutWaterDropEffect();
-    /* 801241E0 */ void setWaterDropEffect();
-    /* 801244E4 */ void setSwordUpColorEffect();
-    /* 801245EC */ void setSwordCutSplash();
-    /* 80124738 */ void setMetamorphoseEffectStartLink();
-    /* 801247A8 */ void setMetamorphoseEffect();
-    /* 801248A8 */ void setRunSplash();
-    /* 80124B68 */ void resetFairyEffect();
-    /* 80124BA4 */ void setBottleEffect();
-    /* 80124E28 */ void clearFirePointDamageEffect(int);
-    /* 80124EA8 */ void initFirePointDamageEffectAll();
-    /* 80124FA4 */ void initFirePointDamageEffect(cXyz const*, dCcD_GObjInf*);
-    /* 80125128 */ void setFirePointDamageEffect();
-    /* 80125338 */ void setFreezeEffect();
-    /* 80125524 */ void setWoodShieldBurnEffect();
-    /* 801255BC */ void clearWoodShieldBurnEffect();
-    /* 80125628 */ void setWoodShieldBurnOutEffect();
-    /* 80126740 */ void changeCommon();
-    /* 80126928 */ void changeWolf();
-    /* 80126F3C */ void changeLink(int);
-    /* 80127C54 */ void onWolfEyeUp();
-    /* 80127CAC */ void offWolfEyeUp();
-    /* 80127CF0 */ BOOL wolfSenseTrigger();
-    /* 80127D14 */ void setWolfSenceStatus(u8);
-    /* 80127D2C */ BOOL wolfClawTrigger();
-    /* 80127D50 */ void setWolfDigStatus(u8);
-    /* 80127D68 */ BOOL checkWolfShapeReverse() const;
-    /* 80127DC4 */ BOOL checkWolfSideStep() const;
-    /* 80127E08 */ void setWolfTailAngle();
-    /* 80127F20 */ BOOL checkWolfSlowDash();
-    /* 80127F50 */ void setSpeedAndAngleWolf();
-    /* 80128478 */ void setSpeedAndAngleWolfAtn();
-    /* 80128798 */ BOOL checkWolfAtnWait();
-    /* 8012880C */ BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const;
-    /* 80128844 */ void setBlendWolfMoveAnime(f32);
-    /* 80128F0C */ BOOL checkWolfAtnMoveBack(s16);
-    /* 80128F5C */ void setWolfAtnMoveDirection();
-    /* 80129114 */ void setBlendWolfAtnMoveAnime(f32);
-    /* 8012933C */ void setBlendWolfAtnBackMoveAnime(f32);
-    /* 8012948C */ int setDoubleAnimeWolf(f32, f32, f32, daAlink_c::daAlink_WANM,
+    JPABaseEmitter* setEmitterColor(u32*, u16, cXyz const*, csXyz const*);
+    void stopDrawParticle(u32);
+    void setEffectFrontRollParam();
+    void setEffectSlipParam();
+    void setEffectRunParam();
+    void setEffectSmallLandParam();
+    void setEffectLandParam();
+    void setEffectSumouParam();
+    void setFootEffectProcType(int);
+    void setWolfFootOn(int);
+    void setFootMark(cXyz*, u16, int);
+    void setEffect();
+    void setSumouEffect();
+    void setWaterfallEffect(cXyz const*, u32*);
+    void setWaterfallEffect();
+    void setMagneBootsEffect();
+    void setSwordChargeEffect();
+    void setElecDamageEffect();
+    void clearCutTurnEffectID();
+    void setCutTurnEffect();
+    void setHorseCutTurnEffect();
+    void setCutLargeJumpLandEffect();
+    void setBootsLightEffect();
+    void setLightningSwordEffect();
+    void setWolfRollAttackEffect();
+    void setWolfDigEffect();
+    void setWolfSwimEndEffect(JPABaseEmitter**, JPABaseEmitter**);
+    void setWolfLockAttackEffect();
+    void setWolfJumpAttackEffect();
+    void setWolfBarrierHitEffect(dBgS_LinChk&);
+    void setCutWaterDropEffect();
+    void setWaterDropEffect();
+    void setSwordUpColorEffect();
+    void setSwordCutSplash();
+    void setMetamorphoseEffectStartLink();
+    void setMetamorphoseEffect();
+    void setRunSplash();
+    void resetFairyEffect();
+    void setBottleEffect();
+    void clearFirePointDamageEffect(int);
+    void initFirePointDamageEffectAll();
+    void initFirePointDamageEffect(cXyz const*, dCcD_GObjInf*);
+    void setFirePointDamageEffect();
+    void setFreezeEffect();
+    void setWoodShieldBurnEffect();
+    void clearWoodShieldBurnEffect();
+    void setWoodShieldBurnOutEffect();
+    void changeCommon();
+    void changeWolf();
+    void changeLink(int);
+    void onWolfEyeUp();
+    void offWolfEyeUp();
+    BOOL wolfSenseTrigger();
+    void setWolfSenceStatus(u8);
+    BOOL wolfClawTrigger();
+    void setWolfDigStatus(u8);
+    BOOL checkWolfShapeReverse() const;
+    BOOL checkWolfSideStep() const;
+    void setWolfTailAngle();
+    BOOL checkWolfSlowDash();
+    void setSpeedAndAngleWolf();
+    void setSpeedAndAngleWolfAtn();
+    BOOL checkWolfAtnWait();
+    BOOL checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM) const;
+    void setBlendWolfMoveAnime(f32);
+    BOOL checkWolfAtnMoveBack(s16);
+    void setWolfAtnMoveDirection();
+    void setBlendWolfAtnMoveAnime(f32);
+    void setBlendWolfAtnBackMoveAnime(f32);
+    int setDoubleAnimeWolf(f32, f32, f32, daAlink_c::daAlink_WANM,
                                           daAlink_c::daAlink_WANM, int, f32);
-    /* 80129678 */ void setSingleAnimeWolfBase(daAlink_c::daAlink_WANM);
-    /* 801296A8 */ void setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM, f32);
-    /* 801296D8 */ void setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM, f32, f32);
-    /* 80129704 */ int setSingleAnimeWolf(daAlink_c::daAlink_WANM, f32, f32, s16, f32);
-    /* 80129848 */ void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM, daAlinkHIO_anm_c const*);
-    /* 8012987C */ int checkWolfLandAction(int);
-    /* 80129958 */ BOOL checkMidnaUseAbility() const;
-    /* 801299A8 */ void checkWolfUseAbility();
-    /* 80129A80 */ int checkWolfGroundSpecialMode();
-    /* 80129B44 */ int checkNextActionWolf(int);
-    /* 8012A02C */ BOOL wolfSideBgCheck(s16);
-    /* 8012A228 */ BOOL checkWolfAttackReverse(int);
-    /* 8012A330 */ int checkWolfBarrierHitReverse();
-    /* 8012A41C */ BOOL checkWolfBarrierWallHit(cBgS_PolyInfo&);
-    /* 8012A498 */ void wolfBgCheck();
-    /* 8012ACCC */ void changeWolfBlendRate(int);
-    /* 8012AD1C */ void setWolfFootMatrix();
-    /* 8012B724 */ void wolfFootBgCheck();
-    /* 8012BFA8 */ BOOL checkWolfWaitSlipPolygon();
-    /* 8012C1F4 */ f32 setWolfWaitSlip();
-    /* 8012C308 */ void checkWolfAtnDoCharge();
-    /* 8012C30C */ void setWolfChainPos();
-    /* 8012CB0C */ void setWolfAnmVoice();
-    /* 8012CBE4 */ int procWolfServiceWaitInit(int);
-    /* 8012CD28 */ int procWolfServiceWait();
-    /* 8012CF68 */ int procWolfTiredWaitInit();
-    /* 8012CFEC */ int procWolfTiredWait();
-    /* 8012D050 */ int procWolfMidnaRideShockInit();
-    /* 8012D104 */ int procWolfMidnaRideShock();
-    /* 8012D1A8 */ int procWolfWaitInit();
-    /* 8012D2A8 */ int procWolfWait();
-    /* 8012D380 */ int procWolfMoveInit();
-    /* 8012D3E4 */ int procWolfMove();
-    /* 8012D474 */ int procWolfDashInit();
-    /* 8012D590 */ int procWolfDash();
-    /* 8012D8C0 */ int procWolfDashReverseInit(int);
-    /* 8012DA5C */ int procWolfDashReverse();
-    /* 8012DBA8 */ int procWolfAtnActorMoveInit();
-    /* 8012DC44 */ int procWolfAtnActorMove();
-    /* 8012DD08 */ int procWolfWaitTurnInit();
-    /* 8012DDB4 */ int procWolfWaitTurn();
-    /* 8012DEC8 */ int procWolfSideStepInit(int);
-    /* 8012E0AC */ int procWolfSideStep();
-    /* 8012E1E8 */ int procWolfSideStepLandInit(s16);
-    /* 8012E2DC */ int procWolfSideStepLand();
-    /* 8012E398 */ int procWolfBackJumpInit(int);
-    /* 8012E508 */ int procWolfBackJump();
-    /* 8012E5F4 */ int procWolfBackJumpLandInit(s16, s16);
-    /* 8012E684 */ int procWolfBackJumpLand();
-    /* 8012E754 */ int procWolfHowlInit(int);
-    /* 8012E83C */ int procWolfHowl();
-    /* 8012E9C8 */ int procWolfAutoJumpInit(int);
-    /* 8012EB94 */ int procWolfAutoJump();
-    /* 8012EDD0 */ int procWolfFallInit(int, f32);
-    /* 8012EFB8 */ int procWolfFall();
-    /* 8012F138 */ int procWolfLandInit();
-    /* 8012F1F0 */ int procWolfLand();
-    /* 8012F278 */ int procWolfSitInit(int);
-    /* 8012F358 */ int procWolfSit();
-    /* 8012F41C */ int procWolfStepMoveInit();
-    /* 8012F500 */ int procWolfStepMove();
-    /* 8012F634 */ int procWolfSlipInit();
-    /* 8012F6EC */ int procWolfSlip();
-    /* 8012F840 */ int procWolfSlipTurnInit(int);
-    /* 8012F9C0 */ int procWolfSlipTurn();
-    /* 8012FB18 */ int procWolfSlipTurnLandInit();
-    /* 8012FBB4 */ int procWolfSlipTurnLand();
-    /* 8012FC38 */ int procWolfSlideReadyInit(s16, int);
-    /* 8012FD2C */ int procWolfSlideReady();
-    /* 8012FE80 */ int procWolfSlideInit(s16, int);
-    /* 8012FFA4 */ int procWolfSlide();
-    /* 801300D4 */ int procWolfSlideLandInit();
-    /* 80130138 */ int procWolfSlideLand();
-    /* 801301E4 */ int procWolfWaitSlipInit();
-    /* 80130268 */ int procWolfWaitSlip();
-    /* 80130440 */ int procWolfSlopeStartInit(int);
-    /* 801304D4 */ int procWolfSlopeStart();
-    /* 80130654 */ void setWolfHowlNotHappen(int);
-    /* 80130700 */ int procWolfHowlDemoInit();
-    /* 80130BC4 */ int procWolfHowlDemo();
-    /* 80131450 */ fopAc_ac_c* checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const;
-    /* 80131628 */ int checkWolfRopeJumpHang();
-    /* 801316A4 */ f32 getWolfRopeMoveSpeed();
-    /* 80131718 */ int setWolfRopePosY();
-    /* 801319F0 */ s16 initWolfRopeShapeAngle();
-    /* 80131A6C */ void wolfRopeSwingInc(f32);
-    /* 80131AFC */ void setWolfRopeOffsetY(int);
-    /* 80131C00 */ int getDirectionRopeMove() const;
-    /* 80131C74 */ int procWolfRopeMoveInit(int, int);
-    /* 80131DA0 */ int procWolfRopeMove();
-    /* 80132738 */ int procWolfRopeHangInit(int);
-    /* 80132914 */ int procWolfRopeHang();
-    /* 80132D68 */ int procWolfRopeTurnInit();
-    /* 80132E88 */ int procWolfRopeTurn();
-    /* 80133054 */ int procWolfRopeStaggerInit(int);
-    /* 80133164 */ int procWolfRopeStagger();
-    /* 8013384C */ int procWolfRopeSubjectivityInit();
-    /* 80133930 */ int procWolfRopeSubjectivity();
-    /* 80133D6C */ int getWolfTagJumpTime() const;
-    /* 80133EF0 */ const cXyz* checkMidnaLockJumpPoint() const;
-    /* 80134000 */ int procWolfTagJumpInit(fopAc_ac_c*);
-    /* 80134838 */ int procWolfTagJump();
-    /* 80134DB8 */ int procWolfTagJumpLandInit(fopAc_ac_c*);
-    /* 80134EBC */ int procWolfTagJumpLand();
-    /* 80135160 */ int procWolfGiantPuzzleInit();
-    /* 801351F8 */ int procWolfGiantPuzzle();
-    /* 80135458 */ void setWolfHangGroundY();
-    /* 801354C8 */ int changeWolfHangEndProc();
-    /* 801355EC */ int procWolfHangReadyInit();
-    /* 80135668 */ int procWolfHangReady();
-    /* 801356F0 */ int procWolfHangWallCatchInit(int);
-    /* 80135AF4 */ int procWolfHangWallCatch();
-    /* 80135CD8 */ int procWolfHangFallStartInit(cM3dGPla*);
-    /* 80135F00 */ int procWolfHangFallStart();
-    /* 80136064 */ void setWolfHeadDamage();
-    /* 801360EC */ int procWolfDamageInit(dCcD_GObjInf*);
-    /* 80136508 */ int procWolfDamage();
-    /* 80136624 */ int procWolfLargeDamageUpInit(int, int, s16, s16);
-    /* 801369E4 */ int procWolfLargeDamageUp();
-    /* 80136C18 */ int procWolfLandDamageInit(int);
-    /* 80136DE4 */ int procWolfLandDamage();
-    /* 80136EC4 */ void setWolfScreamWaitAnime();
-    /* 80136F54 */ int procWolfScreamWaitInit();
-    /* 80136FF8 */ int procWolfScreamWait();
-    /* 801370E4 */ f32 getWolfLieMoveAnmSpeed();
-    /* 8013712C */ f32 getWolfLieMoveSpeed();
-    /* 801371A0 */ BOOL checkMidnaDisappearMode() const;
-    /* 801371FC */ BOOL checkWolfLieContinue(int);
-    /* 801372B4 */ int checkNextActionWolfFromLie();
-    /* 80137330 */ void setWolfLieMoveVoice(int);
-    /* 801373F8 */ bool checkWolfLieCode();
-    /* 80137420 */ int procWolfLieStartInit(int);
-    /* 8013753C */ int procWolfLieStart();
-    /* 80137634 */ int procWolfLieMoveInit(int);
-    /* 801377F0 */ int procWolfLieMove();
-    /* 80137C90 */ int procWolfLieAutoMoveInit(int, cXyz*);
-    /* 80137D4C */ int procWolfLieAutoMove();
-    /* 80138000 */ void setSpeedAndAngleSwimWolf();
-    /* 80138188 */ f32 getWolfSwimMoveAnmSpeed();
-    /* 801381F8 */ int decideDoStatusSwimWolf();
-    /* 801383D8 */ int procWolfSwimUpInit();
-    /* 80138484 */ int procWolfSwimUp();
-    /* 8013852C */ int procWolfSwimWaitInit(int);
-    /* 80138644 */ int procWolfSwimWait();
-    /* 8013871C */ int procWolfSwimMoveInit();
-    /* 801387A0 */ int procWolfSwimMove();
-    /* 8013890C */ int procWolfSwimEndWaitInit(int);
-    /* 80138A18 */ int procWolfSwimEndWait();
-    /* 80138C04 */ void resetWolfEnemyBiteAll();
-    /* 80138C44 */ void checkWolfEnemyThrowAction();
-    /* 80138CB8 */ void setWolfLockDomeModel();
-    /* 80138DC0 */ void setWolfBallModel();
-    /* 80138F18 */ void resetWolfBallGrab();
-    /* 80139048 */ void checkWolfLockData();
-    /* 801391DC */ fopAc_ac_c* getWolfLockActorEnd();
-    /* 801391E4 */ void searchWolfLockEnemy(fopAc_ac_c*, void*);
-    /* 801392E4 */ void checkWolfComboCnt();
-    /* 801393A4 */ BOOL checkWolfAttackAction();
-    /* 801395B4 */ void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM, f32);
-    /* 80139600 */ BOOL setWolfEnemyHangBitePos(fopEn_enemy_c*);
-    /* 801396F8 */ void setWolfBiteDamage(fopEn_enemy_c*);
-    /* 801397A4 */ BOOL checkWolfLockAttackChargeState();
-    /* 801398A8 */ int procWolfRollAttackChargeInit();
-    /* 80139908 */ int procWolfRollAttackCharge();
-    /* 801399C4 */ int procWolfRollAttackMoveInit();
-    /* 80139A70 */ int procWolfRollAttackMove();
-    /* 80139DE0 */ int procWolfJumpAttackInit(int);
-    /* 8013A4F8 */ int procWolfJumpAttack();
-    /* 8013A7EC */ int procWolfJumpAttackKickInit();
-    /* 8013A8A0 */ int procWolfJumpAttackKick();
-    /* 8013A8FC */ int procWolfJumpAttackSlideLandInit(int, int, int);
-    /* 8013AAC4 */ int procWolfJumpAttackSlideLand();
-    /* 8013AC44 */ int procWolfJumpAttackNormalLandInit(int);
-    /* 8013ACF4 */ int procWolfJumpAttackNormalLand();
-    /* 8013ADF0 */ int procWolfWaitAttackInit(int);
-    /* 8013AFC0 */ int procWolfWaitAttack();
-    /* 8013B2A0 */ int procWolfRollAttackInit(int, int);
-    /* 8013B424 */ int procWolfRollAttack();
-    /* 8013B528 */ int procWolfDownAttackInit();
-    /* 8013B808 */ int procWolfDownAttack();
-    /* 8013B964 */ int procWolfDownAtLandInit(fopEn_enemy_c*);
-    /* 8013BA44 */ int procWolfDownAtLand();
-    /* 8013BC94 */ int procWolfDownAtMissLandInit();
-    /* 8013BD54 */ int procWolfDownAtMissLand();
-    /* 8013BE24 */ int procWolfLockAttackInit(int);
-    /* 8013C3E4 */ int procWolfLockAttack();
-    /* 8013C630 */ int procWolfLockAttackTurnInit(int);
-    /* 8013C7A4 */ int procWolfLockAttackTurn();
-    /* 8013C8C8 */ int procWolfAttackReverseInit();
-    /* 8013C9EC */ int procWolfAttackReverse();
-    /* 8013CB48 */ int procWolfEnemyThrowInit(int);
-    /* 8013CC5C */ int procWolfEnemyThrow();
-    /* 8013CCF4 */ int procWolfEnemyHangBiteInit();
-    /* 8013CDEC */ int procWolfEnemyHangBite();
-    /* 8013D0D4 */ int procWolfGrabUpInit();
-    /* 8013D3FC */ int procWolfGrabUp();
-    /* 8013D588 */ int procWolfGrabPutInit();
-    /* 8013D65C */ int procWolfGrabPut();
-    /* 8013D818 */ int procWolfGrabThrowInit();
-    /* 8013D86C */ int procWolfGrabThrow();
-    /* 8013D930 */ int procWolfPushInit();
-    /* 8013DA8C */ int procWolfPush();
-    /* 8013DB6C */ int procWolfCargoCarryInit();
-    /* 8013DC5C */ int procWolfCargoCarry();
-    /* 8013DDF8 */ int procWolfChainUpInit();
-    /* 8013DE70 */ int procWolfChainUp();
-    /* 8013DF30 */ int procWolfGanonCatchInit();
-    /* 8013E034 */ int procWolfGanonCatch();
-    /* 8013E240 */ int procWolfChainReadyInit();
-    /* 8013E2A8 */ int procWolfChainReady();
-    /* 8013E6C0 */ int procWolfChainWaitInit();
-    /* 8013E80C */ int procWolfChainWait();
-    /* 8013ED44 */ int procWolfDigInit();
-    /* 8013F1F0 */ int procWolfDig();
-    /* 8013F4A8 */ int procWolfDigThroughInit(int);
-    /* 8013F7C4 */ int procWolfDigThrough();
-    /* 8013F90C */ void setSmellSave();
-    /* 8013FA14 */ int procWolfGetSmellInit();
-    /* 8013FC24 */ int procWolfGetSmell();
-    /* 8013FF28 */ void setArcName(int);
-    /* 8013FF90 */ void setShieldArcName();
-    /* 8013FFD8 */ void setOriginalHeap(JKRExpHeap**, u32);
-    /* 80140064 */ void setShieldChange();
-    /* 80140070 */ int loadModelDVD();
-    /* 801401F8 */ void setShieldModel();
-    /* 80140274 */ int loadShieldModelDVD();
-    /* 80140338 */ void changeModelDataDirect(int);
-    /* 80140550 */ void changeModelDataDirectWolf(int);
-    /* 801406A8 */ void initStatusWindow();
-    /* 80140888 */ void statusWindowExecute(cXyz const*, s16);
-    /* 80140984 */ void statusWindowDraw();
-    /* 80140AC8 */ void resetStatusWindow();
-    /* 8018280C */ fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); }
-    /* 80182814 */ bool checkCokkoGlide() const {
+    void setSingleAnimeWolfBase(daAlink_c::daAlink_WANM);
+    void setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM, f32);
+    void setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM, f32, f32);
+    int setSingleAnimeWolf(daAlink_c::daAlink_WANM, f32, f32, s16, f32);
+    void setSingleAnimeWolfParam(daAlink_c::daAlink_WANM, daAlinkHIO_anm_c const*);
+    int checkWolfLandAction(int);
+    BOOL checkMidnaUseAbility() const;
+    void checkWolfUseAbility();
+    int checkWolfGroundSpecialMode();
+    int checkNextActionWolf(int);
+    BOOL wolfSideBgCheck(s16);
+    BOOL checkWolfAttackReverse(int);
+    int checkWolfBarrierHitReverse();
+    BOOL checkWolfBarrierWallHit(cBgS_PolyInfo&);
+    void wolfBgCheck();
+    void changeWolfBlendRate(int);
+    void setWolfFootMatrix();
+    void wolfFootBgCheck();
+    BOOL checkWolfWaitSlipPolygon();
+    f32 setWolfWaitSlip();
+    void checkWolfAtnDoCharge();
+    void setWolfChainPos();
+    void setWolfAnmVoice();
+    int procWolfServiceWaitInit(int);
+    int procWolfServiceWait();
+    int procWolfTiredWaitInit();
+    int procWolfTiredWait();
+    int procWolfMidnaRideShockInit();
+    int procWolfMidnaRideShock();
+    int procWolfWaitInit();
+    int procWolfWait();
+    int procWolfMoveInit();
+    int procWolfMove();
+    int procWolfDashInit();
+    int procWolfDash();
+    int procWolfDashReverseInit(int);
+    int procWolfDashReverse();
+    int procWolfAtnActorMoveInit();
+    int procWolfAtnActorMove();
+    int procWolfWaitTurnInit();
+    int procWolfWaitTurn();
+    int procWolfSideStepInit(int);
+    int procWolfSideStep();
+    int procWolfSideStepLandInit(s16);
+    int procWolfSideStepLand();
+    int procWolfBackJumpInit(int);
+    int procWolfBackJump();
+    int procWolfBackJumpLandInit(s16, s16);
+    int procWolfBackJumpLand();
+    int procWolfHowlInit(int);
+    int procWolfHowl();
+    int procWolfAutoJumpInit(int);
+    int procWolfAutoJump();
+    int procWolfFallInit(int, f32);
+    int procWolfFall();
+    int procWolfLandInit();
+    int procWolfLand();
+    int procWolfSitInit(int);
+    int procWolfSit();
+    int procWolfStepMoveInit();
+    int procWolfStepMove();
+    int procWolfSlipInit();
+    int procWolfSlip();
+    int procWolfSlipTurnInit(int);
+    int procWolfSlipTurn();
+    int procWolfSlipTurnLandInit();
+    int procWolfSlipTurnLand();
+    int procWolfSlideReadyInit(s16, int);
+    int procWolfSlideReady();
+    int procWolfSlideInit(s16, int);
+    int procWolfSlide();
+    int procWolfSlideLandInit();
+    int procWolfSlideLand();
+    int procWolfWaitSlipInit();
+    int procWolfWaitSlip();
+    int procWolfSlopeStartInit(int);
+    int procWolfSlopeStart();
+    void setWolfHowlNotHappen(int);
+    int procWolfHowlDemoInit();
+    int procWolfHowlDemo();
+    fopAc_ac_c* checkWolfRopeHit(dCcD_GObjInf*, cXyz const*, int) const;
+    int checkWolfRopeJumpHang();
+    f32 getWolfRopeMoveSpeed();
+    int setWolfRopePosY();
+    s16 initWolfRopeShapeAngle();
+    void wolfRopeSwingInc(f32);
+    void setWolfRopeOffsetY(int);
+    int getDirectionRopeMove() const;
+    int procWolfRopeMoveInit(int, int);
+    int procWolfRopeMove();
+    int procWolfRopeHangInit(int);
+    int procWolfRopeHang();
+    int procWolfRopeTurnInit();
+    int procWolfRopeTurn();
+    int procWolfRopeStaggerInit(int);
+    int procWolfRopeStagger();
+    int procWolfRopeSubjectivityInit();
+    int procWolfRopeSubjectivity();
+    int getWolfTagJumpTime() const;
+    const cXyz* checkMidnaLockJumpPoint() const;
+    int procWolfTagJumpInit(fopAc_ac_c*);
+    int procWolfTagJump();
+    int procWolfTagJumpLandInit(fopAc_ac_c*);
+    int procWolfTagJumpLand();
+    int procWolfGiantPuzzleInit();
+    int procWolfGiantPuzzle();
+    void setWolfHangGroundY();
+    int changeWolfHangEndProc();
+    int procWolfHangReadyInit();
+    int procWolfHangReady();
+    int procWolfHangWallCatchInit(int);
+    int procWolfHangWallCatch();
+    int procWolfHangFallStartInit(cM3dGPla*);
+    int procWolfHangFallStart();
+    void setWolfHeadDamage();
+    int procWolfDamageInit(dCcD_GObjInf*);
+    int procWolfDamage();
+    int procWolfLargeDamageUpInit(int, int, s16, s16);
+    int procWolfLargeDamageUp();
+    int procWolfLandDamageInit(int);
+    int procWolfLandDamage();
+    void setWolfScreamWaitAnime();
+    int procWolfScreamWaitInit();
+    int procWolfScreamWait();
+    f32 getWolfLieMoveAnmSpeed();
+    f32 getWolfLieMoveSpeed();
+    BOOL checkMidnaDisappearMode() const;
+    BOOL checkWolfLieContinue(int);
+    int checkNextActionWolfFromLie();
+    void setWolfLieMoveVoice(int);
+    bool checkWolfLieCode();
+    int procWolfLieStartInit(int);
+    int procWolfLieStart();
+    int procWolfLieMoveInit(int);
+    int procWolfLieMove();
+    int procWolfLieAutoMoveInit(int, cXyz*);
+    int procWolfLieAutoMove();
+    void setSpeedAndAngleSwimWolf();
+    f32 getWolfSwimMoveAnmSpeed();
+    int decideDoStatusSwimWolf();
+    int procWolfSwimUpInit();
+    int procWolfSwimUp();
+    int procWolfSwimWaitInit(int);
+    int procWolfSwimWait();
+    int procWolfSwimMoveInit();
+    int procWolfSwimMove();
+    int procWolfSwimEndWaitInit(int);
+    int procWolfSwimEndWait();
+    void resetWolfEnemyBiteAll();
+    void checkWolfEnemyThrowAction();
+    void setWolfLockDomeModel();
+    void setWolfBallModel();
+    void resetWolfBallGrab();
+    void checkWolfLockData();
+    fopAc_ac_c* getWolfLockActorEnd();
+    void searchWolfLockEnemy(fopAc_ac_c*, void*);
+    void checkWolfComboCnt();
+    BOOL checkWolfAttackAction();
+    void setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM, f32);
+    BOOL setWolfEnemyHangBitePos(fopEn_enemy_c*);
+    void setWolfBiteDamage(fopEn_enemy_c*);
+    BOOL checkWolfLockAttackChargeState();
+    int procWolfRollAttackChargeInit();
+    int procWolfRollAttackCharge();
+    int procWolfRollAttackMoveInit();
+    int procWolfRollAttackMove();
+    int procWolfJumpAttackInit(int);
+    int procWolfJumpAttack();
+    int procWolfJumpAttackKickInit();
+    int procWolfJumpAttackKick();
+    int procWolfJumpAttackSlideLandInit(int, int, int);
+    int procWolfJumpAttackSlideLand();
+    int procWolfJumpAttackNormalLandInit(int);
+    int procWolfJumpAttackNormalLand();
+    int procWolfWaitAttackInit(int);
+    int procWolfWaitAttack();
+    int procWolfRollAttackInit(int, int);
+    int procWolfRollAttack();
+    int procWolfDownAttackInit();
+    int procWolfDownAttack();
+    int procWolfDownAtLandInit(fopEn_enemy_c*);
+    int procWolfDownAtLand();
+    int procWolfDownAtMissLandInit();
+    int procWolfDownAtMissLand();
+    int procWolfLockAttackInit(int);
+    int procWolfLockAttack();
+    int procWolfLockAttackTurnInit(int);
+    int procWolfLockAttackTurn();
+    int procWolfAttackReverseInit();
+    int procWolfAttackReverse();
+    int procWolfEnemyThrowInit(int);
+    int procWolfEnemyThrow();
+    int procWolfEnemyHangBiteInit();
+    int procWolfEnemyHangBite();
+    int procWolfGrabUpInit();
+    int procWolfGrabUp();
+    int procWolfGrabPutInit();
+    int procWolfGrabPut();
+    int procWolfGrabThrowInit();
+    int procWolfGrabThrow();
+    int procWolfPushInit();
+    int procWolfPush();
+    int procWolfCargoCarryInit();
+    int procWolfCargoCarry();
+    int procWolfChainUpInit();
+    int procWolfChainUp();
+    int procWolfGanonCatchInit();
+    int procWolfGanonCatch();
+    int procWolfChainReadyInit();
+    int procWolfChainReady();
+    int procWolfChainWaitInit();
+    int procWolfChainWait();
+    int procWolfDigInit();
+    int procWolfDig();
+    int procWolfDigThroughInit(int);
+    int procWolfDigThrough();
+    void setSmellSave();
+    int procWolfGetSmellInit();
+    int procWolfGetSmell();
+    void setArcName(int);
+    void setShieldArcName();
+    void setOriginalHeap(JKRExpHeap**, u32);
+    void setShieldChange();
+    int loadModelDVD();
+    void setShieldModel();
+    int loadShieldModelDVD();
+    void changeModelDataDirect(int);
+    void changeModelDataDirectWolf(int);
+    void initStatusWindow();
+    void statusWindowExecute(cXyz const*, s16);
+    void statusWindowDraw();
+    void resetStatusWindow();
+    fopAc_ac_c* getChainGrabActor() { return field_0x2844.getActor(); }
+    bool checkCokkoGlide() const {
         return mProcID == PROC_AUTO_JUMP && mProcVar2.field_0x300c != 0;
     }
-    /* 8018283C */ BOOL checkCameraLargeDamage() const {
+    BOOL checkCameraLargeDamage() const {
         return mProcID == PROC_LARGE_DAMAGE || mProcID == PROC_LARGE_DAMAGE_WALL ||
                mProcID == PROC_LARGE_DAMAGE_UP || mProcID == PROC_WOLF_LARGE_DAMAGE_UP;
     }
-    /* 80182870 */ const cXyz& getHsSubChainTopPos() const { return mIronBallBgChkPos; }
-    /* 80182888 */ BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
-    /* 8018289C */ fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); }
+    const cXyz& getHsSubChainTopPos() const { return mIronBallBgChkPos; }
+    BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
+    fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); }
 
     virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
     virtual void setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) {
diff --git a/include/d/actor/d_a_alldie.h b/include/d/actor/d_a_alldie.h
index d41d8d07dc..ce31e486eb 100644
--- a/include/d/actor/d_a_alldie.h
+++ b/include/d/actor/d_a_alldie.h
@@ -22,15 +22,15 @@ public:
         /* 0x5 */ ACT_EVENT,
     };
 
-    /* 804D5818 */ u8 getEventNo();
-    /* 804D5824 */ u8 getSwbit();
-    /* 804D5830 */ int actionWait();
-    /* 804D5838 */ int actionCheck();
-    /* 804D5888 */ int actionTimer();
-    /* 804D5938 */ int actionOrder();
-    /* 804D59A0 */ int actionEvent();
-    /* 804D5A44 */ int actionNext();
-    /* 804D5B10 */ int execute();
+    u8 getEventNo();
+    u8 getSwbit();
+    int actionWait();
+    int actionCheck();
+    int actionTimer();
+    int actionOrder();
+    int actionEvent();
+    int actionNext();
+    int execute();
 
     inline int create();
 
diff --git a/include/d/actor/d_a_andsw.h b/include/d/actor/d_a_andsw.h
index 1053330a09..a5493c855e 100644
--- a/include/d/actor/d_a_andsw.h
+++ b/include/d/actor/d_a_andsw.h
@@ -29,10 +29,10 @@ public:
         return fopAcM_GetParamBit(this,24,8);
     }
 
-    /* 80457978 */ int Create();
-    /* 804579B8 */ int create();
-    /* 80457A20 */ int execute();
-    /* 80457ABC */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
     /* 0x568 */ u8 mSwNo;
     /* 0x568 */ u8 mSwNo2;
diff --git a/include/d/actor/d_a_andsw2.h b/include/d/actor/d_a_andsw2.h
index 64b80ad472..d5c9ed5cff 100644
--- a/include/d/actor/d_a_andsw2.h
+++ b/include/d/actor/d_a_andsw2.h
@@ -22,19 +22,19 @@ public:
         ACT_WAIT_e,
     };
 
-    /* 804D5DF8 */ u8 getEventNo();
-    /* 804D5E04 */ u8 getSwbit();
-    /* 804D5E10 */ u8 getSwbit2();
-    /* 804D5E1C */ u8 getType();
-    /* 804D5E28 */ u8 getTimer();
-    /* 804D5E34 */ u8 getNum();
-    /* 804D5E40 */ u8 getTopSw();
-    /* 804D5EB0 */ u8 getSwAns();
-    /* 804D5EBC */ BOOL chkAllSw2();
-    /* 804D5F64 */ bool chkSwStatus();
-    /* 804D6024 */ bool chkSwStatus2();
-    /* 804D60CC */ ~daAndsw2_c();
-    /* 804D6120 */ int create();
+    u8 getEventNo();
+    u8 getSwbit();
+    u8 getSwbit2();
+    u8 getType();
+    u8 getTimer();
+    u8 getNum();
+    u8 getTopSw();
+    u8 getSwAns();
+    BOOL chkAllSw2();
+    bool chkSwStatus();
+    bool chkSwStatus2();
+    ~daAndsw2_c();
+    int create();
 
     inline int execute();
 
diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h
index 8508fdb227..23e476aaef 100644
--- a/include/d/actor/d_a_arrow.h
+++ b/include/d/actor/d_a_arrow.h
@@ -23,38 +23,38 @@ public:
         ARROW_TYPE_SLING = 4,
     };
 
-    /* 80499C6C */ int createHeap();
-    /* 80499D8C */ void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80499FBC */ void decAlphaBlur();
-    /* 8049A04C */ void setBlur();
-    /* 8049A110 */ void setLightArrowHitMark(cXyz const*);
-    /* 8049A1EC */ void setLightChargeEffect(int);
-    /* 8049A370 */ int setArrowWaterNextPos(cXyz*, cXyz*);
-    /* 8049A76C */ void setArrowAt(f32);
-    /* 8049A9CC */ void arrowShooting();
-    /* 8049AC84 */ void setBombArrowExplode(cXyz*);
-    /* 8049ACE0 */ void setRoomInfo();
-    /* 8049AD74 */ void clearNearActorData();
-    /* 8049AD94 */ s16 getVibAngle();
-    /* 8049AE64 */ void setNormalMatrix();
-    /* 8049AF18 */ void setSmokePos();
-    /* 8049AFEC */ void setKeepMatrix();
-    /* 8049B120 */ fopAc_ac_c* setStopActorMatrix();
-    /* 8049B214 */ void setBombMoveEffect();
-    /* 8049B370 */ bool checkReget();
-    /* 8049B45C */ int procWait();
-    /* 8049B764 */ int procMove();
-    /* 8049C700 */ int procReturnInit(int);
-    /* 8049C874 */ int procReturn();
-    /* 8049CB70 */ int procBGStop();
-    /* 8049CC60 */ int procActorStop();
-    /* 8049CCCC */ int procActorControllStop();
-    /* 8049CCF0 */ int procSlingHitInit(cXyz*, dCcD_GObjInf*);
-    /* 8049CE50 */ int procSlingHit();
-    /* 8049CEA0 */ int execute();
-    /* 8049D0CC */ int draw();
-    /* 8049D440 */ cPhs__Step create();
-    /* 8049D98C */ ~daArrow_c();
+    int createHeap();
+    void atHitCallBack(dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    void decAlphaBlur();
+    void setBlur();
+    void setLightArrowHitMark(cXyz const*);
+    void setLightChargeEffect(int);
+    int setArrowWaterNextPos(cXyz*, cXyz*);
+    void setArrowAt(f32);
+    void arrowShooting();
+    void setBombArrowExplode(cXyz*);
+    void setRoomInfo();
+    void clearNearActorData();
+    s16 getVibAngle();
+    void setNormalMatrix();
+    void setSmokePos();
+    void setKeepMatrix();
+    fopAc_ac_c* setStopActorMatrix();
+    void setBombMoveEffect();
+    bool checkReget();
+    int procWait();
+    int procMove();
+    int procReturnInit(int);
+    int procReturn();
+    int procBGStop();
+    int procActorStop();
+    int procActorControllStop();
+    int procSlingHitInit(cXyz*, dCcD_GObjInf*);
+    int procSlingHit();
+    int execute();
+    int draw();
+    cPhs__Step create();
+    ~daArrow_c();
 
     void setBombArrowExplode() { field_0x950 = 0; }
     bool checkBombArrow() const { return mArrowType == true; }
diff --git a/include/d/actor/d_a_b_bh.h b/include/d/actor/d_a_b_bh.h
index 78b278578f..6c95b856d3 100644
--- a/include/d/actor/d_a_b_bh.h
+++ b/include/d/actor/d_a_b_bh.h
@@ -91,8 +91,8 @@ STATIC_ASSERT(sizeof(b_bh_class) == 0xf4c);
 
 class daB_BH_HIO_c : public JORReflexible {
 public:
-    /* 805AE26C */ daB_BH_HIO_c();
-    /* 805B3098 */ virtual ~daB_BH_HIO_c() {}
+    daB_BH_HIO_c();
+    virtual ~daB_BH_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_b_bq.h b/include/d/actor/d_a_b_bq.h
index 40aa09fe7b..2dd81d25bf 100644
--- a/include/d/actor/d_a_b_bq.h
+++ b/include/d/actor/d_a_b_bq.h
@@ -17,7 +17,7 @@
 
 class b_bq_class : public fopEn_enemy_c {
 public:
-    /* 805B9B3C */ b_bq_class();
+    b_bq_class();
 
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpMorf;
diff --git a/include/d/actor/d_a_b_dr.h b/include/d/actor/d_a_b_dr.h
index 0da39d304d..506af4f576 100644
--- a/include/d/actor/d_a_b_dr.h
+++ b/include/d/actor/d_a_b_dr.h
@@ -18,64 +18,64 @@
  */
 class daB_DR_c : public fopEn_enemy_c {
 public:
-    /* 805BAF80 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 805BB120 */ static int JointCallBack(J3DJoint*, int);
-    /* 805BB16C */ int draw();
-    /* 805BB408 */ void setBck(int, u8, f32, f32);
-    /* 805BB4B4 */ void setActionMode(int, int);
-    /* 805BB4CC */ void mGlider_WindPosSet();
-    /* 805BB540 */ void mBoot_c_tranceSet(bool);
-    /* 805BB64C */ void mStatusONOFF(int);
-    /* 805BB6E8 */ void setSe();
-    /* 805BBFC0 */ void setDeathLightEffect();
-    /* 805BC0B8 */ void chkPartCreate(bool);
-    /* 805BC248 */ void mHabatakiAnmSet(int);
-    /* 805BC57C */ void mGlider_AniSet(bool);
-    /* 805BC8B4 */ void mGliderAtAniSet();
-    /* 805BCA10 */ void tail_hit_check();
-    /* 805BCAD4 */ void week_hit_check();
-    /* 805BCBD0 */ void mTimerClr();
-    /* 805BCBF4 */ void mCountClr();
-    /* 805BCC18 */ void mAllClr();
-    /* 805BCC4C */ void mHeadAngleSet();
-    /* 805BCD7C */ bool flapMove(bool);
-    /* 805BCEA4 */ bool revolutionMove();
-    /* 805BD05C */ bool mPlayerHighCheck();
-    /* 805BD15C */ bool mBgFallGroundCheck();
-    /* 805BD3E4 */ void normalHoverMove();
-    /* 805BD5FC */ void executeWait();
-    /* 805BD98C */ void executeFlyWait();
-    /* 805BDBC4 */ void executeTailHit();
-    /* 805BE9B4 */ void executeWeekHit();
-    /* 805BF4C8 */ void mBreathSet();
-    /* 805BF768 */ bool mBreathHighSet(bool);
-    /* 805BFA6C */ bool mFeintBreath();
-    /* 805BFD88 */ void executeBreathAttack();
-    /* 805C062C */ void executeWindAttack();
-    /* 805C0CAC */ bool mGliderMoveSub(f32);
-    /* 805C0EF8 */ void executeGliderAttack();
-    /* 805C1E0C */ void executePillarSearch();
-    /* 805C24BC */ void executePillarWait();
-    /* 805C2BE8 */ bool startDemoCheck();
-    /* 805C2CD0 */ void executeDamageDemo();
-    /* 805C3558 */ void executeMiddleDemo();
-    /* 805C36A4 */ void executeDead();
-    /* 805C382C */ void executeBullet();
-    /* 805C39D8 */ void executeParts();
-    /* 805C3CB0 */ void action();
-    /* 805C40E0 */ void action_fire();
-    /* 805C4130 */ void action_parts();
-    /* 805C41A4 */ void mtx_set();
-    /* 805C4684 */ void parts_mtx_set();
-    /* 805C46E0 */ void cc_set();
-    /* 805C4E14 */ void down_cc_set();
-    /* 805C4FB4 */ void demo_skip(int);
-    /* 805C50BC */ static int DemoSkipCallBack(void*, int);
-    /* 805C50F0 */ int execute();
-    /* 805C55B0 */ int _delete();
-    /* 805C56A4 */ int CreateHeap();
-    /* 805C5974 */ int create();
-    /* 805C62B0 */ daB_DR_c();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void mGlider_WindPosSet();
+    void mBoot_c_tranceSet(bool);
+    void mStatusONOFF(int);
+    void setSe();
+    void setDeathLightEffect();
+    void chkPartCreate(bool);
+    void mHabatakiAnmSet(int);
+    void mGlider_AniSet(bool);
+    void mGliderAtAniSet();
+    void tail_hit_check();
+    void week_hit_check();
+    void mTimerClr();
+    void mCountClr();
+    void mAllClr();
+    void mHeadAngleSet();
+    bool flapMove(bool);
+    bool revolutionMove();
+    bool mPlayerHighCheck();
+    bool mBgFallGroundCheck();
+    void normalHoverMove();
+    void executeWait();
+    void executeFlyWait();
+    void executeTailHit();
+    void executeWeekHit();
+    void mBreathSet();
+    bool mBreathHighSet(bool);
+    bool mFeintBreath();
+    void executeBreathAttack();
+    void executeWindAttack();
+    bool mGliderMoveSub(f32);
+    void executeGliderAttack();
+    void executePillarSearch();
+    void executePillarWait();
+    bool startDemoCheck();
+    void executeDamageDemo();
+    void executeMiddleDemo();
+    void executeDead();
+    void executeBullet();
+    void executeParts();
+    void action();
+    void action_fire();
+    void action_parts();
+    void mtx_set();
+    void parts_mtx_set();
+    void cc_set();
+    void down_cc_set();
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
+    daB_DR_c();
 
     MtxP getMtx() { return mpModelMorf->getModel()->getAnmMtx(15); }
 
diff --git a/include/d/actor/d_a_b_dre.h b/include/d/actor/d_a_b_dre.h
index 76d6d043f5..8b4178a730 100644
--- a/include/d/actor/d_a_b_dre.h
+++ b/include/d/actor/d_a_b_dre.h
@@ -16,28 +16,28 @@
  */
 class daB_DRE_c : public fopEn_enemy_c {
 public:
-    /* 805C7DD4 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
-    /* 805C7EAC */ bool CameraSet();
-    /* 805C8008 */ void SetStopingCam();
-    /* 805C808C */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 805C8208 */ void SetCMoveCam(cXyz, f32, f32);
-    /* 805C81B8 */ bool SetCMoveCam(cXyz, f32);
-    /* 805C8348 */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
-    /* 805C824C */ void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
-    /* 805C8458 */ void SetMoveCam(f32, f32);
-    /* 805C8544 */ void SetReleaseCam();
-    /* 805C85E8 */ void CamAction2();
-    /* 805C8BF8 */ void DrAction2();
-    /* 805C8EDC */ void CamAction();
-    /* 805C9318 */ void Action();
-    /* 805C9378 */ void DrAction();
-    /* 805C9B40 */ void SoundChk();
-    /* 805CA158 */ int Execute();
-    /* 805CA49C */ void SpeedSet();
-    /* 805CA4FC */ void BreathSet();
-    /* 805CA670 */ int Delete();
-    /* 805CA6C0 */ void setBaseMtx();
-    /* 805CA944 */ int create();
+    void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
+    bool CameraSet();
+    void SetStopingCam();
+    void SetStopCam(cXyz, f32, f32, s16);
+    void SetCMoveCam(cXyz, f32, f32);
+    bool SetCMoveCam(cXyz, f32);
+    void SetEyeMoveCam(cXyz, f32, f32, s16, f32, f32);
+    void SetEyeMoveCam(cXyz, f32, f32, s16, f32);
+    void SetMoveCam(f32, f32);
+    void SetReleaseCam();
+    void CamAction2();
+    void DrAction2();
+    void CamAction();
+    void Action();
+    void DrAction();
+    void SoundChk();
+    int Execute();
+    void SpeedSet();
+    void BreathSet();
+    int Delete();
+    void setBaseMtx();
+    int create();
 
     inline int CreateHeap();
     inline int Draw();
diff --git a/include/d/actor/d_a_b_ds.h b/include/d/actor/d_a_b_ds.h
index 48bdd38ee5..10b09546a2 100644
--- a/include/d/actor/d_a_b_ds.h
+++ b/include/d/actor/d_a_b_ds.h
@@ -108,75 +108,75 @@ public:
         /* 0x3E */ ANM_WAIT01_C,
     };
 
-    /* 805CB314 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 805CB4A4 */ static int JointCallBack(J3DJoint*, int);
-    /* 805CB4F0 */ int draw();
-    /* 805CBAC8 */ void setBck(int, u8, f32, f32);
-    /* 805CBB74 */ void setActionMode(int, int);
-    /* 805CBB80 */ void mSmokeSet();
-    /* 805CBD00 */ void mHeadAngle_Clear();
-    /* 805CBD64 */ void HandHitSoundSet(bool);
-    /* 805CBED0 */ void handSPosSet(int);
-    /* 805CC158 */ void hand_smokeSet(u8);
-    /* 805CC1C4 */ void mZsMoveChk();
-    /* 805CC454 */ void mZsMoveChk_Guard();
-    /* 805CC6F4 */ void mTrapScale();
-    /* 805CC80C */ void mClearTrap(bool);
-    /* 805CC8A4 */ void mCreateTrap(bool);
-    /* 805CCEB4 */ void mChangeVer2();
-    /* 805CD074 */ void damage_check();
-    /* 805CD628 */ void neck_set();
-    /* 805CD844 */ bool mCutTypeCheck();
-    /* 805CD8D8 */ bool startDemoCheck();
-    /* 805CDA08 */ void setYoMessage(int);
-    /* 805CDA44 */ bool doYoMessage();
-    /* 805CDAC0 */ void executeOpeningDemo();
-    /* 805CFC8C */ bool mHandBreathChk();
-    /* 805D002C */ void executeWait();
-    /* 805D0194 */ void executeCircle();
-    /* 805D02F8 */ void mBreakBoneSUB();
-    /* 805D0374 */ void damageSet();
-    /* 805D03EC */ void damageHitCamera();
-    /* 805D0584 */ void damageDownCheck();
-    /* 805D074C */ void executeDamage();
-    /* 805D1E30 */ void executeEtcDamage();
-    /* 805D203C */ void breath_smokeSet();
-    /* 805D226C */ void executeBreathAttack();
-    /* 805D2520 */ void executeHandAttack();
-    /* 805D272C */ void executeBreathSearch();
-    /* 805D28D0 */ void executeBattle2OpeningDemo();
-    /* 805D3900 */ void mFlyBMove(f32);
-    /* 805D39A4 */ void mFuwafuwaSet(bool);
-    /* 805D3D14 */ void mBattle2BreathFireSet(u32);
-    /* 805D3D80 */ bool mNeckAngleSet();
-    /* 805D3EA0 */ void mSetFirstPos();
-    /* 805D3F90 */ bool mChkScreenIn();
-    /* 805D4054 */ bool mRailInOutCheck();
-    /* 805D41CC */ void executeBattle2Wait();
-    /* 805D429C */ bool mBattle2MoveFSet();
-    /* 805D497C */ void executeBattle2FMove();
-    /* 805D5040 */ void executeBattle2Tired();
-    /* 805D52D4 */ void executeBattle2Damage();
-    /* 805D60BC */ bool mDeadMove();
-    /* 805D6534 */ void executeBattle2Dead();
-    /* 805D7C10 */ void executeBullet();
-    /* 805D8078 */ void mBulletAction();
-    /* 805D80F0 */ void mSoundSE_Set();
-    /* 805D8D04 */ void action();
-    /* 805D91A4 */ void mtx_set();
-    /* 805D951C */ void cc_set();
-    /* 805D9A40 */ void cc_etc_set();
-    /* 805D9B74 */ void mBattle2Action();
-    /* 805D9CFC */ void mBattle2_spinner_damage_check();
-    /* 805D9FF4 */ bool mBattle2_damage_check();
-    /* 805DA584 */ void mBattle2_mtx_set();
-    /* 805DA9A4 */ void mBattle2_cc_etc_set();
-    /* 805DAA98 */ void mBattle2_cc_set();
-    /* 805DADC4 */ int execute();
-    /* 805DB1AC */ int _delete();
-    /* 805DB264 */ int CreateHeap();
-    /* 805DB974 */ cPhs__Step create();
-    /* 805DC1E8 */ daB_DS_c();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void mSmokeSet();
+    void mHeadAngle_Clear();
+    void HandHitSoundSet(bool);
+    void handSPosSet(int);
+    void hand_smokeSet(u8);
+    void mZsMoveChk();
+    void mZsMoveChk_Guard();
+    void mTrapScale();
+    void mClearTrap(bool);
+    void mCreateTrap(bool);
+    void mChangeVer2();
+    void damage_check();
+    void neck_set();
+    bool mCutTypeCheck();
+    bool startDemoCheck();
+    void setYoMessage(int);
+    bool doYoMessage();
+    void executeOpeningDemo();
+    bool mHandBreathChk();
+    void executeWait();
+    void executeCircle();
+    void mBreakBoneSUB();
+    void damageSet();
+    void damageHitCamera();
+    void damageDownCheck();
+    void executeDamage();
+    void executeEtcDamage();
+    void breath_smokeSet();
+    void executeBreathAttack();
+    void executeHandAttack();
+    void executeBreathSearch();
+    void executeBattle2OpeningDemo();
+    void mFlyBMove(f32);
+    void mFuwafuwaSet(bool);
+    void mBattle2BreathFireSet(u32);
+    bool mNeckAngleSet();
+    void mSetFirstPos();
+    bool mChkScreenIn();
+    bool mRailInOutCheck();
+    void executeBattle2Wait();
+    bool mBattle2MoveFSet();
+    void executeBattle2FMove();
+    void executeBattle2Tired();
+    void executeBattle2Damage();
+    bool mDeadMove();
+    void executeBattle2Dead();
+    void executeBullet();
+    void mBulletAction();
+    void mSoundSE_Set();
+    void action();
+    void mtx_set();
+    void cc_set();
+    void cc_etc_set();
+    void mBattle2Action();
+    void mBattle2_spinner_damage_check();
+    bool mBattle2_damage_check();
+    void mBattle2_mtx_set();
+    void mBattle2_cc_etc_set();
+    void mBattle2_cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
+    daB_DS_c();
 
     cXyz getHandPosR();
     cXyz getHandPosL();
@@ -339,8 +339,8 @@ STATIC_ASSERT(sizeof(daB_DS_c) == 0x2F28);
 
 class daB_DS_HIO_c {
 public:
-    /* 805CB22C */ daB_DS_HIO_c();
-    /* 805DC89C */ virtual ~daB_DS_HIO_c() {}
+    daB_DS_HIO_c();
+    virtual ~daB_DS_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mModelSize;
diff --git a/include/d/actor/d_a_b_gg.h b/include/d/actor/d_a_b_gg.h
index 6c35f5dd09..9b7accc342 100644
--- a/include/d/actor/d_a_b_gg.h
+++ b/include/d/actor/d_a_b_gg.h
@@ -16,79 +16,79 @@
  */
 class daB_GG_c : public fopEn_enemy_c {
 public:
-    /* 805DE464 */ int CreateHeap();
-    /* 805DE650 */ void initCc();
-    /* 805DE7A4 */ void setCcCylinder();
-    /* 805DE9B8 */ void G_setCcCylinder();
-    /* 805DEAD0 */ void MoveCo();
-    /* 805DEB44 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 805DED58 */ int HeadctrlJoint(J3DJoint*, J3DModel*);
-    /* 805DEF64 */ void SetAnm(int, int, f32, f32);
-    /* 805DF9F4 */ void Yazirushi();
-    /* 805DFA48 */ void SpeedClear();
-    /* 805DFA64 */ void SetAction(u8, u8, u8);
-    /* 805DFA8C */ u8 GetAction(u8, u8, u8);
-    /* 805DFACC */ void DemoSkip(int);
-    /* 805DFC24 */ static int DemoSkipCallBack(void*, int);
-    /* 805DFC58 */ bool CameraSet();
-    /* 805DFD78 */ void SetStopingCam();
-    /* 805DFDFC */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 805DFF4C */ void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
-    /* 805E00D4 */ void SetMoveCam1(f32, f32);
-    /* 805E01F8 */ void SetReleaseCam();
-    /* 805E029C */ void St_CamAction();
-    /* 805E0F2C */ void St_DemoAction();
-    /* 805E18E8 */ void Md_CamAction();
-    /* 805E1C28 */ void Md_DemoAction();
-    /* 805E23E8 */ void Gn_CamAction();
-    /* 805E2974 */ void Gn_DemoAction();
-    /* 805E2F44 */ void DemoAction();
-    /* 805E3024 */ void F_WaitAction();
-    /* 805E31E4 */ void F_FookChk();
-    /* 805E3448 */ void F_MoveAction();
-    /* 805E3CAC */ void F_LV7_W_MoveAction();
-    /* 805E3F0C */ void F_AttackAction();
-    /* 805E4914 */ void F_DamageAction();
-    /* 805E5190 */ void AttentionChk();
-    /* 805E5220 */ void FlyAction();
-    /* 805E561C */ bool F_A_TargetMove(cXyz);
-    /* 805E53DC */ bool F_A_TargetMove(cXyz, u8);
-    /* 805E5808 */ void F_A_MoveAction();
-    /* 805E5D0C */ void F_A_WaitAction();
-    /* 805E5D2C */ void F_A_Action();
-    /* 805E5E78 */ void FookChk();
-    /* 805E608C */ void CutChk();
-    /* 805E6174 */ void G_MoveAction();
-    /* 805E6AB0 */ void FallChk();
-    /* 805E6E30 */ void G_AttackAction();
-    /* 805E73A8 */ void G_DamageAction();
-    /* 805E7D50 */ void G_DeathAction();
-    /* 805E7F50 */ void G_DeathAction1();
-    /* 805E82F0 */ void DeathCam();
-    /* 805E8D48 */ void GroundAction();
-    /* 805E8EE8 */ void StopAction();
-    /* 805E92A0 */ void HitChk();
-    /* 805E9310 */ void Action();
-    /* 805E9418 */ void HeadAction();
-    /* 805E9A28 */ void SetHeadAngle();
-    /* 805E9B48 */ void SoundChk();
-    /* 805EA344 */ int Execute();
-    /* 805EA72C */ void ObjHit();
-    /* 805EA74C */ void At_Check();
-    /* 805EA938 */ void MoveAt();
-    /* 805EA9AC */ void F_AtHit();
-    /* 805EAAFC */ void ChanceTime();
-    /* 805EB028 */ void ArmAngleSet();
-    /* 805EB090 */ void Guard();
-    /* 805EB5E0 */ int Draw();
-    /* 805EB8A8 */ int Delete();
-    /* 805EB910 */ void setBaseMtx();
-    /* 805EB980 */ void setShieldMtx();
-    /* 805EB9DC */ void setSwordMtx();
-    /* 805EBA4C */ void setSwordMtx1();
-    /* 805EBAB8 */ void setHeadMtx();
-    /* 805EBB30 */ void setHeadMtx1();
-    /* 805EBBE4 */ int Create();
+    int CreateHeap();
+    void initCc();
+    void setCcCylinder();
+    void G_setCcCylinder();
+    void MoveCo();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    int HeadctrlJoint(J3DJoint*, J3DModel*);
+    void SetAnm(int, int, f32, f32);
+    void Yazirushi();
+    void SpeedClear();
+    void SetAction(u8, u8, u8);
+    u8 GetAction(u8, u8, u8);
+    void DemoSkip(int);
+    static int DemoSkipCallBack(void*, int);
+    bool CameraSet();
+    void SetStopingCam();
+    void SetStopCam(cXyz, f32, f32, s16);
+    void SetMoveCam(cXyz, f32, f32, s16, f32, f32);
+    void SetMoveCam1(f32, f32);
+    void SetReleaseCam();
+    void St_CamAction();
+    void St_DemoAction();
+    void Md_CamAction();
+    void Md_DemoAction();
+    void Gn_CamAction();
+    void Gn_DemoAction();
+    void DemoAction();
+    void F_WaitAction();
+    void F_FookChk();
+    void F_MoveAction();
+    void F_LV7_W_MoveAction();
+    void F_AttackAction();
+    void F_DamageAction();
+    void AttentionChk();
+    void FlyAction();
+    bool F_A_TargetMove(cXyz);
+    bool F_A_TargetMove(cXyz, u8);
+    void F_A_MoveAction();
+    void F_A_WaitAction();
+    void F_A_Action();
+    void FookChk();
+    void CutChk();
+    void G_MoveAction();
+    void FallChk();
+    void G_AttackAction();
+    void G_DamageAction();
+    void G_DeathAction();
+    void G_DeathAction1();
+    void DeathCam();
+    void GroundAction();
+    void StopAction();
+    void HitChk();
+    void Action();
+    void HeadAction();
+    void SetHeadAngle();
+    void SoundChk();
+    int Execute();
+    void ObjHit();
+    void At_Check();
+    void MoveAt();
+    void F_AtHit();
+    void ChanceTime();
+    void ArmAngleSet();
+    void Guard();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    void setShieldMtx();
+    void setSwordMtx();
+    void setSwordMtx1();
+    void setHeadMtx();
+    void setHeadMtx1();
+    int Create();
 
     /* 0x05AC */ f32 field_0x5ac;
     /* 0x05B0 */ u8 field_0x5b0;
diff --git a/include/d/actor/d_a_b_gnd.h b/include/d/actor/d_a_b_gnd.h
index c8abbd2e0e..b9c8781ec6 100644
--- a/include/d/actor/d_a_b_gnd.h
+++ b/include/d/actor/d_a_b_gnd.h
@@ -23,7 +23,7 @@ struct g_himo_s {
 
 class b_gnd_class : public fopEn_enemy_c {
 public:
-    /* 80601960 */ b_gnd_class();
+    b_gnd_class();
 
     bool checkAttackChance() { return field_0x2740 != 0; }
     bool checkPiyo() { return field_0x1e08 != 0; }
diff --git a/include/d/actor/d_a_b_go.h b/include/d/actor/d_a_b_go.h
index 00263eb7cc..81eb4ab8fd 100644
--- a/include/d/actor/d_a_b_go.h
+++ b/include/d/actor/d_a_b_go.h
@@ -43,7 +43,7 @@ enum daB_GO_Action {
  */
 class b_go_class : public fopEn_enemy_c {
 public:
-    /* 80603CA0 */ b_go_class();
+    b_go_class();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
@@ -76,8 +76,8 @@ STATIC_ASSERT(sizeof(b_go_class) == 0xD38);
 
 class daB_GO_HIO_c {
 public:
-    /* 806031AC */ daB_GO_HIO_c();
-    /* 80603F9C */ virtual ~daB_GO_HIO_c() {}
+    daB_GO_HIO_c();
+    virtual ~daB_GO_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mSmallSize;
diff --git a/include/d/actor/d_a_b_gos.h b/include/d/actor/d_a_b_gos.h
index 49af2b62e8..3140ff6c79 100644
--- a/include/d/actor/d_a_b_gos.h
+++ b/include/d/actor/d_a_b_gos.h
@@ -19,7 +19,7 @@
  */
 class b_gos_class : public fopEn_enemy_c {
 public:
-    /* 80605024 */ b_gos_class();
+    b_gos_class();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpMorf;
@@ -56,8 +56,8 @@ STATIC_ASSERT(sizeof(b_gos_class) == 0xCCC);
 class daB_GOS_HIO_c {
 public:
 public:
-    /* 8060426C */ daB_GOS_HIO_c();
-    /* 80605320 */ virtual ~daB_GOS_HIO_c() {}
+    daB_GOS_HIO_c();
+    virtual ~daB_GOS_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mSize;
diff --git a/include/d/actor/d_a_b_mgn.h b/include/d/actor/d_a_b_mgn.h
index 30956f6b06..272d02b1ef 100644
--- a/include/d/actor/d_a_b_mgn.h
+++ b/include/d/actor/d_a_b_mgn.h
@@ -32,62 +32,62 @@ public:
         ACTION_JUMP_e,
     };
 
-    /* 8060577C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8060584C */ static int JointCallBack(J3DJoint*, int);
-    /* 80605898 */ int draw();
-    /* 80605D78 */ void setDashSmokeEffect();
-    /* 8060601C */ void setBackJumpEffect();
-    /* 806062C0 */ void setSlideSmokeEffect();
-    /* 80606424 */ void setBodySlideEffect();
-    /* 806065D4 */ void setOpeningEffect();
-    /* 80606754 */ void setStepEffect();
-    /* 8060688C */ void setFallAttackEffect();
-    /* 80606A10 */ void setHeadLightEffect();
-    /* 80606AEC */ void setHeadHitEffect();
-    /* 80606C6C */ int setHideSmokeEffect(cXyz*, u8);
-    /* 80606D60 */ void calcHideSmokeEffect();
-    /* 806071C4 */ void drawHideSmokeEffect();
-    /* 8060729C */ void setBloodEffect();
-    /* 80607498 */ void calcBloodMove();
-    /* 8060778C */ void checkDownBeforeBG();
-    /* 80607924 */ void setBck(int, u8, f32, f32);
-    /* 806079CC */ bool checkBck(int);
-    /* 80607A2C */ void setActionMode(int, int);
-    /* 80607A80 */ void setExitMode(int);
-    /* 80607B50 */ void onBodyShield();
-    /* 80607B80 */ void offBodyShield();
-    /* 80607BB0 */ void onBodySlideAt();    
-    /* 80607BFC */ void offBodySlideAt();
-    /* 80607C20 */ bool checkHitSlideAt();
-    /* 80607CB0 */ void onBodyFallAt();
-    /* 80607CE4 */ void offBodyFallAt();
-    /* 80607D08 */ void onBodyCo();
-    /* 80607D44 */ void offBodyCo();
-    /* 80607D7C */ cXyz getNearHitPos(cXyz*);
-    /* 8060819C */ void damage_check();
-    /* 80608738 */ void calcJointAngle(s16);
-    /* 806087A8 */ void executeCircle();
-    /* 80608EF8 */ void executeDash();
-    /* 80609D70 */ void executeThrown();
-    /* 8060A670 */ void setDownEnd();
-    /* 8060A72C */ void executeDown();
-    /* 8060ACB8 */ void executeDownDamage();
-    /* 8060B028 */ void executeDownBiteDamage();
-    /* 8060B430 */ void executeWarp();
-    /* 8060B544 */ void executeFall();
-    /* 8060BE6C */ void demo_skip(int);
-    /* 8060C034 */ static int DemoSkipCallBack(void*, int);
-    /* 8060C068 */ void executeOpening();
-    /* 8060D078 */ void executeDeath();
-    /* 8060D880 */ void executeJump();
-    /* 8060DAC0 */ void checkStartJump();
-    /* 8060DDA0 */ void action();
-    /* 8060E158 */ void mtx_set();
-    /* 8060E1D0 */ void cc_set();
-    /* 8060E820 */ int execute();
-    /* 8060EA38 */ int _delete();
-    /* 8060EAE0 */ int CreateHeap();
-    /* 8060F0D0 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setDashSmokeEffect();
+    void setBackJumpEffect();
+    void setSlideSmokeEffect();
+    void setBodySlideEffect();
+    void setOpeningEffect();
+    void setStepEffect();
+    void setFallAttackEffect();
+    void setHeadLightEffect();
+    void setHeadHitEffect();
+    int setHideSmokeEffect(cXyz*, u8);
+    void calcHideSmokeEffect();
+    void drawHideSmokeEffect();
+    void setBloodEffect();
+    void calcBloodMove();
+    void checkDownBeforeBG();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    void setExitMode(int);
+    void onBodyShield();
+    void offBodyShield();
+    void onBodySlideAt();    
+    void offBodySlideAt();
+    bool checkHitSlideAt();
+    void onBodyFallAt();
+    void offBodyFallAt();
+    void onBodyCo();
+    void offBodyCo();
+    cXyz getNearHitPos(cXyz*);
+    void damage_check();
+    void calcJointAngle(s16);
+    void executeCircle();
+    void executeDash();
+    void executeThrown();
+    void setDownEnd();
+    void executeDown();
+    void executeDownDamage();
+    void executeDownBiteDamage();
+    void executeWarp();
+    void executeFall();
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void executeOpening();
+    void executeDeath();
+    void executeJump();
+    void checkStartJump();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     bool isDown() { return mDownFlag != 0; }
     bool isAppear() { return mAppearFlag != 0; }
diff --git a/include/d/actor/d_a_b_tn.h b/include/d/actor/d_a_b_tn.h
index edb095eff9..0a782d7f89 100644
--- a/include/d/actor/d_a_b_tn.h
+++ b/include/d/actor/d_a_b_tn.h
@@ -69,67 +69,67 @@ public:
         /* 0x6B */ ACTION2_107_e,
     };
 
-    /* 8061EC58 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8061ED10 */ static int JointCallBack(J3DJoint*, int);
-    /* 8061ED5C */ void calcNeckAngle();
-    /* 8061EE14 */ void calcWaistAngle();
-    /* 8061EEC8 */ int draw();
-    /* 8061F200 */ void setBreakPart(int);
-    /* 8061F31C */ void setBreakHeadPart(int);
-    /* 8061F3D0 */ void setPartLandEffect(int, int);
-    /* 8061F520 */ void calcShieldMove();
-    /* 8061F9F4 */ void calcSwordMoveA();
-    /* 8061FD7C */ void calcSwordMoveB();
-    /* 8061FFE0 */ void calcOtherPartMove(int);
-    /* 8062070C */ void calcPartMove();
-    /* 806208C8 */ void setBck(int, u8, f32, f32);
-    /* 8062096C */ int checkBck(int);
-    /* 806209C8 */ void setActionMode(int, int);
-    /* 806209E0 */ void setSwordAtBit(int);
-    /* 80620AE4 */ void setSwordAtBreak(int);
-    /* 80620B4C */ void setBodyShield();
-    /* 80620E90 */ bool checkNormalAttackAble();
-    /* 80620FA0 */ u32 getCutType();
-    /* 80621070 */ void setDamage(dCcD_Sph*, int);
-    /* 8062138C */ void setShieldEffect(dCcD_Sph*);
-    /* 806213FC */ void damage_check();
-    /* 806227D0 */ int checkMoveArea();
-    /* 80622B60 */ bool checkMoveAngle();
-    /* 80622BE0 */ void setAttackBlurEffect(int);
-    /* 80622CE4 */ void setArmorBreakEffect(int);
-    /* 80622F64 */ void demo_skip(int);
-    /* 8062318C */ static int DemoSkipCallBack(void*, int);
-    /* 806231C0 */ void executeRoomDemo();
-    /* 80623920 */ void executeOpening();
-    /* 806246E8 */ void executeWaitH();
-    /* 806247D8 */ void setAwaitSound();
-    /* 80624890 */ void executeChaseH();
-    /* 80625394 */ void checkStartAttackH();
-    /* 806255F0 */ void executeAttackH();
-    /* 80625C74 */ void executeAttackShieldH();
-    /* 80625E40 */ void executeGuardH();
-    /* 80626034 */ void executeDamageH();
-    /* 80626320 */ void executeChangeDemo();
-    /* 80627100 */ void executeZakoChangeDemo();
-    /* 80627790 */ void setWalkDir();
-    /* 8062799C */ void initChaseL(int);
-    /* 80627CBC */ bool checkAttackAble();
-    /* 80627D3C */ bool checkNextMove();
-    /* 8062868C */ void executeChaseL();
-    /* 806292F8 */ void executeAttackL();
-    /* 80629D20 */ void executeAttackShieldL();
-    /* 80629FB0 */ void executeGuardL();
-    /* 8062A3D0 */ void executeDamageL();
-    /* 8062A71C */ void executeYoroke();
-    /* 8062A950 */ void executeEnding();
-    /* 8062B344 */ void executeZakoEnding();
-    /* 8062B6A8 */ void action();
-    /* 8062BA5C */ void mtx_set();
-    /* 8062BDCC */ void cc_set();
-    /* 8062C5B4 */ int execute();
-    /* 8062C7C8 */ int _delete();
-    /* 8062C868 */ int CreateHeap();
-    /* 8062CD78 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    void calcNeckAngle();
+    void calcWaistAngle();
+    int draw();
+    void setBreakPart(int);
+    void setBreakHeadPart(int);
+    void setPartLandEffect(int, int);
+    void calcShieldMove();
+    void calcSwordMoveA();
+    void calcSwordMoveB();
+    void calcOtherPartMove(int);
+    void calcPartMove();
+    void setBck(int, u8, f32, f32);
+    int checkBck(int);
+    void setActionMode(int, int);
+    void setSwordAtBit(int);
+    void setSwordAtBreak(int);
+    void setBodyShield();
+    bool checkNormalAttackAble();
+    u32 getCutType();
+    void setDamage(dCcD_Sph*, int);
+    void setShieldEffect(dCcD_Sph*);
+    void damage_check();
+    int checkMoveArea();
+    bool checkMoveAngle();
+    void setAttackBlurEffect(int);
+    void setArmorBreakEffect(int);
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void executeRoomDemo();
+    void executeOpening();
+    void executeWaitH();
+    void setAwaitSound();
+    void executeChaseH();
+    void checkStartAttackH();
+    void executeAttackH();
+    void executeAttackShieldH();
+    void executeGuardH();
+    void executeDamageH();
+    void executeChangeDemo();
+    void executeZakoChangeDemo();
+    void setWalkDir();
+    void initChaseL(int);
+    bool checkAttackAble();
+    bool checkNextMove();
+    void executeChaseL();
+    void executeAttackL();
+    void executeAttackShieldL();
+    void executeGuardL();
+    void executeDamageL();
+    void executeYoroke();
+    void executeEnding();
+    void executeZakoEnding();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
 private:
     /* 0x05AC */ request_of_phase_process_class mPhaseReq1;
diff --git a/include/d/actor/d_a_b_yo.h b/include/d/actor/d_a_b_yo.h
index c95244b033..d215bdacc9 100644
--- a/include/d/actor/d_a_b_yo.h
+++ b/include/d/actor/d_a_b_yo.h
@@ -20,52 +20,52 @@ class msg_class;
  */
 class daB_YO_c : public fopEn_enemy_c {
 public:
-    /* 8062F51C */ int draw();
-    /* 8062FBEC */ void onIceBreak(u16);
-    /* 8062FC08 */ void setBck(int, u8, f32, f32);
-    /* 8062FE0C */ void setActionMode(int, int);
-    /* 8062FE18 */ void damage_check();
-    /* 806300F4 */ void setBreakFrizad();
-    /* 8063022C */ void setIcicleOperate(int);
-    /* 806302B4 */ void setIcicleSubNumber();
-    /* 80630330 */ void setWindowBreakEffect(int);
-    /* 8063040C */ void setHensinEffect();
-    /* 806305B8 */ void setLandingEffect(f32);
-    /* 806306F0 */ void setBreakIceEffect();
-    /* 8063089C */ void setWallHitEffect();
-    /* 80630A9C */ void setChillEffect();
-    /* 80630BF0 */ void setApperEffect();
-    /* 80630CA0 */ void setApperEffect2();
-    /* 80630DD8 */ void demo_skip(int);
-    /* 80630E3C */ static int DemoSkipCallBack(void*, int);
-    /* 80630E70 */ void setYoMessage(int);
-    /* 80630EAC */ int doYoMessage();
-    /* 80630F28 */ void executeOpening();
-    /* 80632598 */ void reflectFreeMove();
-    /* 80632660 */ void calcFreeMove(f32);
-    /* 8063290C */ void setReflectAngle();
-    /* 806329CC */ void executeChase();
-    /* 806331CC */ void executeSeriousDemo();
-    /* 80633EDC */ u8 checkIcecleRevival();
-    /* 80633F50 */ void createIcecleRevival(u8);
-    /* 80634040 */ void executeJump();
-    /* 80634548 */ void executeAttackIce();
-    /* 8063476C */ void executeAttackYose();
-    /* 80634CEC */ void checkDamageWithIceBreak();
-    /* 80634E04 */ void executeAttackBody();
-    /* 806352C8 */ void executeDemoRevival();
-    /* 80635798 */ void executeDamage();
-    /* 80635ABC */ void executeDeath();
-    /* 80636E9C */ void reviseIceCenterPos(cXyz*);
-    /* 80637048 */ void calcPlayerBufPos();
-    /* 806374BC */ void action();
-    /* 80637990 */ void mtx_set();
-    /* 80637B30 */ void cc_set();
-    /* 80637E10 */ int execute();
-    /* 80637FC8 */ int _delete();
-    /* 806380F8 */ int CreateHeap();
-    /* 806388A0 */ int CreateHeap2();
-    /* 806389C0 */ cPhs__Step create();
+    int draw();
+    void onIceBreak(u16);
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    void setBreakFrizad();
+    void setIcicleOperate(int);
+    void setIcicleSubNumber();
+    void setWindowBreakEffect(int);
+    void setHensinEffect();
+    void setLandingEffect(f32);
+    void setBreakIceEffect();
+    void setWallHitEffect();
+    void setChillEffect();
+    void setApperEffect();
+    void setApperEffect2();
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void setYoMessage(int);
+    int doYoMessage();
+    void executeOpening();
+    void reflectFreeMove();
+    void calcFreeMove(f32);
+    void setReflectAngle();
+    void executeChase();
+    void executeSeriousDemo();
+    u8 checkIcecleRevival();
+    void createIcecleRevival(u8);
+    void executeJump();
+    void executeAttackIce();
+    void executeAttackYose();
+    void checkDamageWithIceBreak();
+    void executeAttackBody();
+    void executeDemoRevival();
+    void executeDamage();
+    void executeDeath();
+    void reviseIceCenterPos(cXyz*);
+    void calcPlayerBufPos();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int CreateHeap2();
+    cPhs__Step create();
 
     u8 getModelNo() { return mModelNo; }
     s16 getFrizadRollAngle() { return mIceAngle; }
diff --git a/include/d/actor/d_a_b_yo_ice.h b/include/d/actor/d_a_b_yo_ice.h
index ed0279d33a..32286929c7 100644
--- a/include/d/actor/d_a_b_yo_ice.h
+++ b/include/d/actor/d_a_b_yo_ice.h
@@ -20,34 +20,34 @@ class daB_YO_c;
  */
 class daB_YOI_c : public fopEn_enemy_c {
 public:
-    /* 8063A17C */ int draw();
-    /* 8063A2D8 */ void setActionMode(int, int);
-    /* 8063A2E4 */ void damage_check();
-    /* 8063A480 */ void setOperate(int);
-    /* 8063A628 */ void setWeight(u8);
-    /* 8063A638 */ void setBreakIceEffect();
-    /* 8063A6F8 */ void setWallBreakIceEffect();
-    /* 8063A79C */ void setApperEffect();
-    /* 8063A824 */ void setApperEffect2();
-    /* 8063A8C8 */ void setLandingEffect();
-    /* 8063A96C */ void executeFirst();
-    /* 8063ABC0 */ cXyz getSingleFallPos();
-    /* 8063ACCC */ void executeRiseUp();
-    /* 8063B238 */ void executeSingleFall();
-    /* 8063BB40 */ void executeYose();
-    /* 8063C3F0 */ void executeYoseFall();
-    /* 8063C76C */ void executeDemoRevival();
-    /* 8063C900 */ void executeDamage();
-    /* 8063CC90 */ void executeDeath();
-    /* 8063CD14 */ void crack_execute();
-    /* 8063CD90 */ void action();
-    /* 8063D0C8 */ void mtx_set();
-    /* 8063D1B0 */ void cc_set();
-    /* 8063D350 */ int execute();
-    /* 8063D45C */ int _delete();
-    /* 8063D4F8 */ int CreateHeap();
-    /* 8063D5D0 */ cPhs__Step create();
-    /* 8063D8FC */ daB_YOI_c();
+    int draw();
+    void setActionMode(int, int);
+    void damage_check();
+    void setOperate(int);
+    void setWeight(u8);
+    void setBreakIceEffect();
+    void setWallBreakIceEffect();
+    void setApperEffect();
+    void setApperEffect2();
+    void setLandingEffect();
+    void executeFirst();
+    cXyz getSingleFallPos();
+    void executeRiseUp();
+    void executeSingleFall();
+    void executeYose();
+    void executeYoseFall();
+    void executeDemoRevival();
+    void executeDamage();
+    void executeDeath();
+    void crack_execute();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
+    daB_YOI_c();
 
     void setSubNumber(int i_subNumber) { mSubNumber = i_subNumber; }
 
diff --git a/include/d/actor/d_a_b_zant.h b/include/d/actor/d_a_b_zant.h
index 4144a57d04..491bd25437 100644
--- a/include/d/actor/d_a_b_zant.h
+++ b/include/d/actor/d_a_b_zant.h
@@ -65,76 +65,76 @@ public:
         DMGTYPE_HOOK_OI,
     };
 
-    /* 8063E19C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8063E264 */ static int JointCallBack(J3DJoint*, int);
-    /* 8063E2B0 */ int draw();
-    /* 8063E5C4 */ void setBck(int, u8, f32, f32);
-    /* 8063E668 */ bool checkBck(int);
-    /* 8063E6C4 */ void setActionMode(int, int);
-    /* 8063E6F8 */ bool checkBigDamage();
-    /* 8063E79C */ int checkDamageType();
-    /* 8063E810 */ void setDamageSe(dCcD_Sph*, int);
-    /* 8063E938 */ void damage_check();
-    /* 8063F524 */ void ice_damage_check();
-    /* 8063F84C */ bool setNextDamageMode(int);
-    /* 8063FAB4 */ bool checkAvoidWeapon(int);
-    /* 8063FF6C */ void setTgHitBit(int);
-    /* 8063FFAC */ void setCoHitBit(int);
-    /* 8063FFEC */ void setTgShield(int);
-    /* 806400BC */ void setTgType(u32);
-    /* 806400C8 */ void setZantMessage(int);
-    /* 80640104 */ int doZantMessage();
-    /* 80640180 */ void setIceLandingEffect(int);
-    /* 80640310 */ void setWaterBubble();
-    /* 806403D4 */ void setMonkeyFallEffect();
-    /* 80640478 */ void setLastRollEffect();
-    /* 80640654 */ f32 getMagicSpeed();
-    /* 80640664 */ f32 getMagicWaterSpeed();
-    /* 80640674 */ void executeSmallAttack();
-    /* 80640C20 */ bool calcScale(int);
-    /* 80640D14 */ void executeWarp();
-    /* 806412A8 */ void executeDamage();
-    /* 806414E4 */ void executeConfuse();
-    /* 80641640 */ void executeOpening();
-    /* 806427EC */ void executeFly();
-    /* 80642EC8 */ void executeFlyGround();
-    /* 806430E0 */ bool checkSwimLinkNearMouth();
-    /* 806432F8 */ bool checkSwimLinkNear();
-    /* 8064350C */ void executeHook();
-    /* 80643690 */ void executeWater();
-    /* 80644074 */ void executeSwim();
-    /* 80644A3C */ void executeSimaJump();
-    /* 80645014 */ void executeIceDemo();
-    /* 8064524C */ void executeIceJump();
-    /* 80645DA4 */ void executeIceStep();
-    /* 8064687C */ void executeIceDamage();
-    /* 806471CC */ void setFarPillarPos();
-    /* 806473E4 */ void setNearPillarPos();
-    /* 80647468 */ void setNextPillarInfo(int);
-    /* 806474F4 */ void setNextPillarPos();
-    /* 80647A34 */ void checkPillarSwing();
-    /* 80647AC8 */ void executeMonkey();
-    /* 806481F4 */ void executeMonkeyFall();
-    /* 80648544 */ void executeMonkeyDamage();
-    /* 80648778 */ void setLastWarp(int, int);
-    /* 80648F64 */ void executeLastStartDemo();
-    /* 806494A8 */ void executeLastAttack();
-    /* 8064A58C */ void executeLastTired();
-    /* 8064A688 */ void executeLastDamage();
-    /* 8064AC8C */ void executeLastEndDemo();
-    /* 8064B270 */ void calcMahojinAnime();
-    /* 8064B49C */ void calcRoomChangeCamera(int);
-    /* 8064B69C */ void initNextRoom();
-    /* 8064B868 */ void executeRoomChange();
-    /* 8064C1C0 */ void setBaseActionMode(int);
-    /* 8064C5A8 */ void action();
-    /* 8064CB1C */ void mtx_set();
-    /* 8064CD0C */ void cc_set();
-    /* 8064CFA8 */ void cc_ice_set();
-    /* 8064DA48 */ int execute();
-    /* 8064DB70 */ int _delete();
-    /* 8064DC04 */ int CreateHeap();
-    /* 8064E190 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    bool checkBigDamage();
+    int checkDamageType();
+    void setDamageSe(dCcD_Sph*, int);
+    void damage_check();
+    void ice_damage_check();
+    bool setNextDamageMode(int);
+    bool checkAvoidWeapon(int);
+    void setTgHitBit(int);
+    void setCoHitBit(int);
+    void setTgShield(int);
+    void setTgType(u32);
+    void setZantMessage(int);
+    int doZantMessage();
+    void setIceLandingEffect(int);
+    void setWaterBubble();
+    void setMonkeyFallEffect();
+    void setLastRollEffect();
+    f32 getMagicSpeed();
+    f32 getMagicWaterSpeed();
+    void executeSmallAttack();
+    bool calcScale(int);
+    void executeWarp();
+    void executeDamage();
+    void executeConfuse();
+    void executeOpening();
+    void executeFly();
+    void executeFlyGround();
+    bool checkSwimLinkNearMouth();
+    bool checkSwimLinkNear();
+    void executeHook();
+    void executeWater();
+    void executeSwim();
+    void executeSimaJump();
+    void executeIceDemo();
+    void executeIceJump();
+    void executeIceStep();
+    void executeIceDamage();
+    void setFarPillarPos();
+    void setNearPillarPos();
+    void setNextPillarInfo(int);
+    void setNextPillarPos();
+    void checkPillarSwing();
+    void executeMonkey();
+    void executeMonkeyFall();
+    void executeMonkeyDamage();
+    void setLastWarp(int, int);
+    void executeLastStartDemo();
+    void executeLastAttack();
+    void executeLastTired();
+    void executeLastDamage();
+    void executeLastEndDemo();
+    void calcMahojinAnime();
+    void calcRoomChangeCamera(int);
+    void initNextRoom();
+    void executeRoomChange();
+    void setBaseActionMode(int);
+    void action();
+    void mtx_set();
+    void cc_set();
+    void cc_ice_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
@@ -331,8 +331,8 @@ STATIC_ASSERT(sizeof(daB_ZANT_c) == 0x38BC);
 
 class daB_ZANT_HIO_c {
 public:
-    /* 8063E10C */ daB_ZANT_HIO_c();
-    /* 8064E994 */ virtual ~daB_ZANT_HIO_c() {}
+    daB_ZANT_HIO_c();
+    virtual ~daB_ZANT_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mModelSize;
diff --git a/include/d/actor/d_a_b_zant_magic.h b/include/d/actor/d_a_b_zant_magic.h
index c24dd7c4e0..0d05f9bd41 100644
--- a/include/d/actor/d_a_b_zant_magic.h
+++ b/include/d/actor/d_a_b_zant_magic.h
@@ -15,14 +15,14 @@
  */
 class daB_ZANTM_c : public fopEn_enemy_c {
 public:
-    /* 8064F778 */ int draw();
-    /* 8064F7D4 */ void setMagicEffect();
-    /* 8064F938 */ void setMagicHitEffect();
-    /* 8064FA50 */ void executeSmall();
-    /* 8064FD6C */ void cc_set();
-    /* 8064FE6C */ int execute();
-    /* 8064FF2C */ int _delete();
-    /* 8064FF54 */ int create();
+    int draw();
+    void setMagicEffect();
+    void setMagicHitEffect();
+    void executeSmall();
+    void cc_set();
+    int execute();
+    int _delete();
+    int create();
 
 private:
     /* 0x5AC */ Mtx field_0x5ac;
diff --git a/include/d/actor/d_a_b_zant_mobile.h b/include/d/actor/d_a_b_zant_mobile.h
index 853310041e..3af85c56b1 100644
--- a/include/d/actor/d_a_b_zant_mobile.h
+++ b/include/d/actor/d_a_b_zant_mobile.h
@@ -15,18 +15,18 @@
  */
 class daB_ZANTZ_c : public fopEn_enemy_c {
 public:
-    /* 806507B0 */ int draw();
-    /* 80650854 */ void setSnortEffect(int);
-    /* 806508E0 */ void calcSnortEffect();
-    /* 80650B7C */ void setMouthMode(u8);
-    /* 80650D0C */ void setAppearMode(u8);
-    /* 806510C0 */ f32 getGroundPos();
-    /* 8065127C */ void action();
-    /* 80651B1C */ void cc_set();
-    /* 80651C20 */ int execute();
-    /* 80651D1C */ int _delete();
-    /* 80651DC4 */ int CreateHeap();
-    /* 80652038 */ int create();
+    int draw();
+    void setSnortEffect(int);
+    void calcSnortEffect();
+    void setMouthMode(u8);
+    void setAppearMode(u8);
+    f32 getGroundPos();
+    void action();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     int getMouthMode() { return mMouthMode; }
     int getAppearMode() { return mAppearMode; }
@@ -62,8 +62,8 @@ STATIC_ASSERT(sizeof(daB_ZANTZ_c) == 0xd14);
 
 class daB_ZANTZ_HIO_c {
 public:
-    /* 8065078C */ daB_ZANTZ_HIO_c();
-    /* 8065268C */ virtual ~daB_ZANTZ_HIO_c() {}
+    daB_ZANTZ_HIO_c();
+    virtual ~daB_ZANTZ_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mModelSize;
diff --git a/include/d/actor/d_a_b_zant_sima.h b/include/d/actor/d_a_b_zant_sima.h
index 014f33d0a2..eac63a2d3e 100644
--- a/include/d/actor/d_a_b_zant_sima.h
+++ b/include/d/actor/d_a_b_zant_sima.h
@@ -14,12 +14,12 @@
  */
 class daB_ZANTS_c : public fopAc_ac_c {
 public:
-    /* 806529D8 */ int draw();
-    /* 80652B28 */ void action();
-    /* 80652DA8 */ int execute();
-    /* 80652EC0 */ int _delete();
-    /* 80652F38 */ int CreateHeap();
-    /* 806531E8 */ int create();
+    int draw();
+    void action();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ J3DModel* mpModel;
diff --git a/include/d/actor/d_a_balloon_2D.h b/include/d/actor/d_a_balloon_2D.h
index ec052c25e1..d22e69d973 100644
--- a/include/d/actor/d_a_balloon_2D.h
+++ b/include/d/actor/d_a_balloon_2D.h
@@ -28,8 +28,8 @@ public:
         c_list() { mBalloon = NULL; }
         void set(daBalloon2D_c* i_this) { mBalloon = i_this; }
 
-        /* 806534CC */ virtual void draw();
-        /* 8065544C */ virtual ~c_list() {}
+        virtual void draw();
+        virtual ~c_list() {}
 
         daBalloon2D_c* mBalloon;
     };
@@ -38,25 +38,25 @@ public:
         initiate();
     }
 
-    /* 80653538 */ int createHeap();
-    /* 80653D24 */ int create();
-    /* 80653DB4 */ int destroy();
-    /* 80653E10 */ int draw();
-    /* 80653EC0 */ int execute();
-    /* 80653F04 */ void drawMeter();
-    /* 80653F58 */ void setComboCount(u8, u8);
-    /* 80653FC0 */ void setScoreCount(u32);
-    /* 80653FEC */ void addScoreCount(cXyz*, u32, u8);
-    /* 806540B4 */ void initiate();
-    /* 806540B8 */ void update();
-    /* 806540BC */ void setComboNum(u8);
-    /* 806541B4 */ void setBalloonSize(u8);
-    /* 80654258 */ void setScoreNum(int);
-    /* 80654440 */ void setAllAlpha();
-    /* 8065464C */ void setComboAlpha();
-    /* 80654730 */ void drawAddScore();
-    /* 80654E8C */ void setHIO(bool);
-    /* 80655494 */ 
+    int createHeap();
+    int create();
+    int destroy();
+    int draw();
+    int execute();
+    void drawMeter();
+    void setComboCount(u8, u8);
+    void setScoreCount(u32);
+    void addScoreCount(cXyz*, u32, u8);
+    void initiate();
+    void update();
+    void setComboNum(u8);
+    void setBalloonSize(u8);
+    void setScoreNum(int);
+    void setAllAlpha();
+    void setComboAlpha();
+    void drawAddScore();
+    void setHIO(bool);
+    
     virtual
     ~daBalloon2D_c() {}
 
@@ -75,8 +75,8 @@ public:
 
     class CHeadScore : public ScoreCount {
     public:
-        /* 80655304 */ ~CHeadScore();
-        /* 80655340 */ CHeadScore();
+        ~CHeadScore();
+        CHeadScore();
     };
 
     /* 0x574 */ J2DScreen* mScreen;
diff --git a/include/d/actor/d_a_bd.h b/include/d/actor/d_a_bd.h
index a5e41c7a83..cce29c4687 100644
--- a/include/d/actor/d_a_bd.h
+++ b/include/d/actor/d_a_bd.h
@@ -89,8 +89,8 @@ STATIC_ASSERT(sizeof(bd_class) == 0x9ec);
 
 class daBd_HIO_c : public JORReflexible {
 public:
-    /* 804D6C4C */ daBd_HIO_c();
-    /* 804D9CB8 */ virtual ~daBd_HIO_c() {}
+    daBd_HIO_c();
+    virtual ~daBd_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_bg.h b/include/d/actor/d_a_bg.h
index ec59849c76..0a9859198b 100644
--- a/include/d/actor/d_a_bg.h
+++ b/include/d/actor/d_a_bg.h
@@ -6,9 +6,9 @@
 
 class daBg_btkAnm_c {
 public:
-    /* 80457F34 */ int create(J3DModelData*, J3DAnmTextureSRTKey*, int);
-    /* 80458088 */ void entry(J3DModelData*);
-    /* 804580CC */ void play();
+    int create(J3DModelData*, J3DAnmTextureSRTKey*, int);
+    void entry(J3DModelData*);
+    void play();
 
     void entryFrame() { mpBtk->entryFrame(); }
     void playspeed(f32 speed) { mpBtk->setPlaySpeed(speed); }
@@ -19,9 +19,9 @@ public:
 
 class daBg_brkAnm_c {
 public:
-    /* 804580F0 */ int create(J3DModelData*, J3DAnmTevRegKey*, int);
-    /* 80458230 */ void entry(J3DModelData*);
-    /* 80458274 */ void play();
+    int create(J3DModelData*, J3DAnmTevRegKey*, int);
+    void entry(J3DModelData*);
+    void play();
 
     void entryFrame() { mpBrk->entryFrame(); }
     void entryFrame(f32 frame) { mpBrk->entryFrame(frame); }
@@ -49,11 +49,11 @@ struct daBg_Part {
  */
 class daBg_c : public fopAc_ac_c {
 public:
-    /* 80457BF8 */ const char* setArcName();
-    /* 804582B8 */ inline int createHeap();
-    /* 80458788 */ ~daBg_c();
-    /* 804588C4 */ inline int draw();
-    /* 8045906C */ inline int create();
+    const char* setArcName();
+    inline int createHeap();
+    ~daBg_c();
+    inline int draw();
+    inline int create();
     inline int execute();
     inline int isDelete();
 
diff --git a/include/d/actor/d_a_bg_obj.h b/include/d/actor/d_a_bg_obj.h
index 375b244f36..fc4df6ab4e 100644
--- a/include/d/actor/d_a_bg_obj.h
+++ b/include/d/actor/d_a_bg_obj.h
@@ -25,11 +25,11 @@ class daBgObj_c : public dBgS_MoveBgActor {
 public:
     class spec_data_c {
     public:
-        /* 804597E8 */ u8* initParticleBlock(u8*);
-        /* 80459814 */ u8* initSoundBlock(u8*);
-        /* 80459840 */ u8* initTexShareBlock(u8*);
-        /* 804598F4 */ u8* initFarInfoBlock(u8*);
-        /* 80459904 */ bool Set(void*);
+        u8* initParticleBlock(u8*);
+        u8* initSoundBlock(u8*);
+        u8* initTexShareBlock(u8*);
+        u8* initFarInfoBlock(u8*);
+        bool Set(void*);
 
         /* 0x00 */ u16 mSpecType;
         /* 0x02 */ u8 field_0x02;
@@ -46,46 +46,46 @@ public:
         /* 0x20 */ f32 mpFarInfoBlock;
     };
 
-    /* 80459B64 */ void release(dBgW*);
-    /* 80459BB4 */ void regist(dBgW*);
-    /* 80459BEC */ void initAtt();
-    /* 80459D0C */ void setAttentionInfo(fopAc_ac_c*);
-    /* 80459D3C */ void initBaseMtx();
-    /* 80459D94 */ void setBaseMtx();
-    /* 80459E04 */ void settingCullSizeBoxForCo(int);
-    /* 80459F14 */ void settingCullSizeBoxForCull(int);
-    /* 8045A0EC */ int CreateInitType0();
-    /* 8045A160 */ int CreateInitType1();
-    /* 8045A2F0 */ int CreateHeapType0();
-    /* 8045A574 */ int CreateHeapType1();
-    /* 8045A83C */ void doShareTexture();
-    /* 8045A9E8 */ int create1st();
-    /* 8045AAF0 */ void setColCommon();
-    /* 8045AB80 */ void set_tri_0();
-    /* 8045ACC0 */ void set_tri_1();
-    /* 8045AE00 */ void set_cyl_0();
-    /* 8045AE98 */ void set_tri_2();
-    /* 8045AFD4 */ void set_tri_3();
-    /* 8045B17C */ void setParticle();
-    /* 8045B3A0 */ void setSe();
-    /* 8045B44C */ BOOL checkDestroy();
-    /* 8045B534 */ BOOL checkHitAt(cCcD_Obj*);
-    /* 8045B5E0 */ void orderWait_tri();
-    /* 8045B7FC */ void orderWait_cyl();
-    /* 8045B9C4 */ void orderWait_spec();
-    /* 8045BB38 */ int actionOrderWait();
-    /* 8045BBE0 */ int actionOrder();
-    /* 8045BD50 */ int actionEvent();
-    /* 8045BDB0 */ int actionWait();
-    /* 8045BDB8 */ int ExecuteType0();
-    /* 8045BED0 */ int ExecuteType1();
-    /* 8045C25C */ void indirectProc(J3DModel*);
+    void release(dBgW*);
+    void regist(dBgW*);
+    void initAtt();
+    void setAttentionInfo(fopAc_ac_c*);
+    void initBaseMtx();
+    void setBaseMtx();
+    void settingCullSizeBoxForCo(int);
+    void settingCullSizeBoxForCull(int);
+    int CreateInitType0();
+    int CreateInitType1();
+    int CreateHeapType0();
+    int CreateHeapType1();
+    void doShareTexture();
+    int create1st();
+    void setColCommon();
+    void set_tri_0();
+    void set_tri_1();
+    void set_cyl_0();
+    void set_tri_2();
+    void set_tri_3();
+    void setParticle();
+    void setSe();
+    BOOL checkDestroy();
+    BOOL checkHitAt(cCcD_Obj*);
+    void orderWait_tri();
+    void orderWait_cyl();
+    void orderWait_spec();
+    int actionOrderWait();
+    int actionOrder();
+    int actionEvent();
+    int actionWait();
+    int ExecuteType0();
+    int ExecuteType1();
+    void indirectProc(J3DModel*);
 
-    /* 8045A940 */ virtual int CreateHeap();
-    /* 8045A2B8 */ virtual int Create();
-    /* 8045BFBC */ virtual int Execute(Mtx**);
-    /* 8045C078 */ virtual int Draw();
-    /* 8045C2E8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h
index 07af0236f4..331adf7973 100644
--- a/include/d/actor/d_a_boomerang.h
+++ b/include/d/actor/d_a_boomerang.h
@@ -9,15 +9,15 @@
 
 class daBoomerang_sight_c : public dDlst_base_c {
 public:
-    /* 8049E0B8 */ int createHeap();
-    /* 8049E36C */ void initialize();
-    /* 8049EB64 */ int playAnime(int, int);
-    /* 8049EDA8 */ void initFrame(int);
-    /* 8049EDE8 */ void copyNumData(int);
-    /* 8049EEC8 */ void setSight(cXyz const*, int);
+    int createHeap();
+    void initialize();
+    int playAnime(int, int);
+    void initFrame(int);
+    void copyNumData(int);
+    void setSight(cXyz const*, int);
 
-    /* 8049EF60 */ virtual void draw();
-    /* 804A278C */ virtual ~daBoomerang_sight_c() {}
+    virtual void draw();
+    virtual ~daBoomerang_sight_c() {}
 
     u8 getReserve() const { return mReserve; }
     u8 getAlpha(int i_index) { return m_alpha[i_index]; }
@@ -86,30 +86,30 @@ public:
         /* 0x080 */ WIND_CATCH = 0x80,
     };
 
-    /* 8049F280 */ void windModelCallBack();
-    /* 8049F39C */ int draw();
-    /* 8049F5F4 */ void lockLineCallback(fopAc_ac_c*);
-    /* 8049F660 */ void moveLineCallback(fopAc_ac_c*);
-    /* 8049F710 */ void pushLockList(int);
-    /* 8049F818 */ void cancelLockActorBase(fopAc_ac_c*);
-    /* 8049F874 */ void setAimActorBase(fopAc_ac_c*);
-    /* 8049F8B0 */ int setLockActor(fopAc_ac_c*, int);
-    /* 8049F9A4 */ void resetLockActor();
-    /* 8049F9F0 */ void setRoomInfo();
-    /* 8049FAA4 */ void setKeepMatrix();
-    /* 8049FBAC */ void setMoveMatrix();
-    /* 8049FCD0 */ void setRotAngle();
-    /* 8049FD6C */ void setAimPos();
-    /* 8049FE6C */ void checkBgHit(cXyz*, cXyz*);
-    /* 804A006C */ JPABaseEmitter* setEffectTraceMatrix(u32*, u16);
-    /* 804A012C */ void setEffect();
-    /* 804A0874 */ int procWait();
-    /* 804A0F0C */ int procMove();
-    /* 804A1814 */ int execute();
-    /* 804A1BF4 */ ~daBoomerang_c();
-    /* 804A1EE4 */ int createHeap();
-    /* 804A2084 */ int create();
-    /* 804A230C */ daBoomerang_c();
+    void windModelCallBack();
+    int draw();
+    void lockLineCallback(fopAc_ac_c*);
+    void moveLineCallback(fopAc_ac_c*);
+    void pushLockList(int);
+    void cancelLockActorBase(fopAc_ac_c*);
+    void setAimActorBase(fopAc_ac_c*);
+    int setLockActor(fopAc_ac_c*, int);
+    void resetLockActor();
+    void setRoomInfo();
+    void setKeepMatrix();
+    void setMoveMatrix();
+    void setRotAngle();
+    void setAimPos();
+    void checkBgHit(cXyz*, cXyz*);
+    JPABaseEmitter* setEffectTraceMatrix(u32*, u16);
+    void setEffect();
+    int procWait();
+    int procMove();
+    int execute();
+    ~daBoomerang_c();
+    int createHeap();
+    int create();
+    daBoomerang_c();
 
     u32 checkStateFlg0(daBoomerang_FLG0 i_flag) const { return m_stateFlg0 & i_flag; }
     void onStateFlg0(daBoomerang_FLG0 flag) { m_stateFlg0 |= flag; }
diff --git a/include/d/actor/d_a_bullet.h b/include/d/actor/d_a_bullet.h
index 6dde5f7148..63d7b802aa 100644
--- a/include/d/actor/d_a_bullet.h
+++ b/include/d/actor/d_a_bullet.h
@@ -32,20 +32,20 @@ public:
     /* 0x956 */ u8 mType;
     /* 0x957 */ u8 field_0x957;
 
-    /* 8065594C */ virtual ~daBullet_c();
-    /* 80655B08 */ int create();
-    /* 80655E5C */ BOOL CreateHeap();
-    /* 80655EDC */ int Delete();
-    /* 80655F10 */ int Execute();
-    /* 806560FC */ int Draw();
-    /* 80656160 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80656180 */ const char* getResName();
-    /* 80656198 */ const char* getBmdName();
-    /* 806561B0 */ int getTypeFromParam();
-    /* 806561D0 */ void initialize();
-    /* 80656378 */ int setProcess(processFn);
-    /* 80656420 */ int wait(void*);
-    /* 806564B8 */ int move(void*);
+    virtual ~daBullet_c();
+    int create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    const char* getResName();
+    const char* getBmdName();
+    int getTypeFromParam();
+    void initialize();
+    int setProcess(processFn);
+    int wait(void*);
+    int move(void*);
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcSph mCcDSph;
@@ -64,7 +64,7 @@ struct daBullet_HIOParam {
 
 class daBullet_Param_c {
 public:
-    /* 806566A8 */ virtual ~daBullet_Param_c() {}
+    virtual ~daBullet_Param_c() {}
 
     static daBullet_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_canoe.h b/include/d/actor/d_a_canoe.h
index 991ca24afb..4051a039ab 100644
--- a/include/d/actor/d_a_canoe.h
+++ b/include/d/actor/d_a_canoe.h
@@ -16,20 +16,20 @@
  */
 class daCanoe_c : public fopAc_ac_c {
 public:
-    /* 804DA5F4 */ int createHeap();
-    /* 804DA740 */ int create();
-    /* 804DAEA8 */ ~daCanoe_c();
-    /* 804DB008 */ void setRoomInfo();
-    /* 804DB0B0 */ void setMatrix();
-    /* 804DB3F4 */ void setCollision();
-    /* 804DB578 */ void posMove();
-    /* 804DB754 */ void checkGomikabe(cBgS_PolyInfo&);
-    /* 804DB7AC */ void setFrontBackPos();
-    /* 804DB828 */ void frontBackBgCheck();
-    /* 804DC330 */ void setPaddleEffect();
-    /* 804DC554 */ void setCanoeSliderEffect();
-    /* 804DC7B4 */ int execute();
-    /* 804DD35C */ int draw();
+    int createHeap();
+    int create();
+    ~daCanoe_c();
+    void setRoomInfo();
+    void setMatrix();
+    void setCollision();
+    void posMove();
+    void checkGomikabe(cBgS_PolyInfo&);
+    void setFrontBackPos();
+    void frontBackBgCheck();
+    void setPaddleEffect();
+    void setCanoeSliderEffect();
+    int execute();
+    int draw();
 
     J3DModel* getModel() { return mpModel; }
     MtxP getModelMtx() { return mpModel->getBaseTRMtx(); }
diff --git a/include/d/actor/d_a_coach_2D.h b/include/d/actor/d_a_coach_2D.h
index 1a085d781b..46c88ace3f 100644
--- a/include/d/actor/d_a_coach_2D.h
+++ b/include/d/actor/d_a_coach_2D.h
@@ -20,8 +20,8 @@ public:
     public:
         c_list() { mpCoach2D = NULL; }
 
-        /* 806569CC */ virtual void draw();
-        /* 806577DC */ virtual ~c_list() {}
+        virtual void draw();
+        virtual ~c_list() {}
 
         void set(daCoach2D_c* i_coach2D) {
             mpCoach2D = i_coach2D;
@@ -30,18 +30,18 @@ public:
         /* 0x4 */ daCoach2D_c* mpCoach2D;
     };
 
-    /* 80656A38 */ int createHeap();
-    /* 80656D18 */ int create();
-    /* 80656D94 */ int destroy();
-    /* 80656DE4 */ int draw();
-    /* 80656E94 */ int execute();
-    /* 80656ED0 */ void drawMeter();
-    /* 8065722C */ void initiate();
-    /* 80657260 */ void update();
-    /* 80657490 */ void setBrkAnime(bool);
+    int createHeap();
+    int create();
+    int destroy();
+    int draw();
+    int execute();
+    void drawMeter();
+    void initiate();
+    void update();
+    void setBrkAnime(bool);
 
     daCoach2D_c() { initiate(); }
-    /* 80657824 */ virtual ~daCoach2D_c() {}
+    virtual ~daCoach2D_c() {}
 
     void show() { mIsVisible = true; }
     void hide() { mIsVisible = false; }
diff --git a/include/d/actor/d_a_coach_fire.h b/include/d/actor/d_a_coach_fire.h
index 399463752b..c5f890dc3d 100644
--- a/include/d/actor/d_a_coach_fire.h
+++ b/include/d/actor/d_a_coach_fire.h
@@ -26,10 +26,10 @@ struct CoachFireAttr {
  */
 class daCoachFire_c : public fopAc_ac_c {
 public:
-    /* 80657B78 */ void create_init();
-    /* 80657C48 */ void initBaseMtx();
-    /* 80657CA8 */ void setBaseMtx();
-    /* 80657D2C */ void initCcSphere();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void initCcSphere();
 
     const CoachFireAttr& attr() { return M_attr; }
 
diff --git a/include/d/actor/d_a_cow.h b/include/d/actor/d_a_cow.h
index 3085774f18..dbf2107ab9 100644
--- a/include/d/actor/d_a_cow.h
+++ b/include/d/actor/d_a_cow.h
@@ -104,90 +104,90 @@ public:
         Flag_CrazyReadyDrawOn = 1 << 9,
     };
 
-    /* 806585CC */ int calcRunAnime(int);
-    /* 80658730 */ void setBck(int, u8, f32, f32);
-    /* 806587D4 */ u8 checkBck(int);
-    /* 80658830 */ void setEffect();
-    /* 80658AA4 */ bool isChaseCowGame();
-    /* 80658B10 */ void setCarryStatus();
-    /* 80658C18 */ void setActetcStatus();
-    /* 80658C78 */ bool checkNadeNadeFinish();
-    /* 80658CA4 */ bool checkNadeNade();
-    /* 80658CD0 */ void setSeSnort();
-    /* 80658D3C */ void setRushVibration(int);
-    /* 80658DB8 */ bool checkThrow();
-    /* 80658E98 */ void setBodyAngle(s16);
-    /* 80658F94 */ void setBodyAngle2(s16);
-    /* 806590E8 */ BOOL checkProcess(void (daCow_c::*)());
-    /* 80659114 */ bool setProcess(void (daCow_c::*)(), int);
-    /* 806591BC */ void damage_check();
-    /* 8065945C */ void setEnterCow20();
-    /* 80659540 */ void setEnterCow10();
-    /* 80659630 */ void setGroundAngle();
-    /* 80659970 */ bool checkRun();
-    /* 806599C0 */ bool checkNearCowRun();
-    /* 80659ADC */ void action_wait();
-    /* 8065A0E8 */ void action_eat();
-    /* 8065A594 */ void action_moo();
-    /* 8065A8A4 */ void action_shake();
-    /* 8065ACC8 */ bool checkNearWolf();
-    /* 8065AD2C */ bool checkPlayerWait();
-    /* 8065ADB0 */ bool checkPlayerSurprise();
-    /* 8065AE88 */ bool checkPlayerPos();
-    /* 8065B034 */ void checkBeforeBg();
-    /* 8065B760 */ int checkOutOfGate(cXyz);
-    /* 8065B8A8 */ s16 getCowshedAngle();
-    /* 8065B8D8 */ double getCowshedDist();
-    /* 8065BA30 */ int checkCowIn(f32, f32);
-    /* 8065BB34 */ bool checkCowInOwn(int);
-    /* 8065BC68 */ void action_run();
-    /* 8065C32C */ bool checkCurringPen();
-    /* 8065C508 */ void setCowInCage();
-    /* 8065C680 */ void setEnterCount();
-    /* 8065C70C */ void action_enter();
-    /* 8065CFBC */ bool isAngry();
-    /* 8065D03C */ bool isGuardFad();
-    /* 8065D0B8 */ void setAngryHit();
-    /* 8065D17C */ bool checkBeforeBgAngry(s16);
-    /* 8065D230 */ void setRedTev();
-    /* 8065D29C */ void setAngryTurn();
-    /* 8065D2F0 */ void action_angry();
-    /* 8065DC08 */ void calcCatchPos(f32, int);
-    /* 8065DE70 */ void executeCrazyWait();
-    /* 8065DF40 */ void executeCrazyDash();
-    /* 8065E6BC */ void initCrazyBeforeCatch(int);
-    /* 8065E6E8 */ void executeCrazyBeforeCatch();
-    /* 8065E7D0 */ void initCrazyCatch(int);
-    /* 8065E888 */ void executeCrazyCatch();
-    /* 8065EAF4 */ void initCrazyThrow(int);
-    /* 8065EBF0 */ void executeCrazyThrow();
-    /* 8065F088 */ void initCrazyAttack(int);
-    /* 8065F144 */ void executeCrazyAttack();
-    /* 8065F308 */ void initCrazyAway(int);
-    /* 8065F37C */ void executeCrazyAway();
-    /* 8065F6E0 */ void executeCrazyEnd();
-    /* 8065F744 */ void initCrazyBack(int);
-    /* 8065F7DC */ void executeCrazyBack();
-    /* 8065FE50 */ void action_crazy();
-    /* 8066010C */ void executeCrazyBack2();
-    /* 80660544 */ void action_thrown();
-    /* 806607B8 */ bool checkWolfBusters();
-    /* 806608F0 */ void action_wolf();
-    /* 806612DC */ void action_damage();
-    /* 806613EC */ void action();
-    /* 80661580 */ void setMtx();
-    /* 806615EC */ void setAttnPos();
-    /* 80661720 */ void setCollisions();
-    /* 80661940 */ int Execute();
-    /* 80661AF0 */ int CreateHeap();
-    /* 80661D24 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80661D44 */ u8 initialize();
-    /* 80662228 */ int create();
-    /* 80662710 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80662920 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8066296C */ int Draw();
-    /* 80662BE4 */ int Delete();
-    // /* 80662D70 */ csXyz getShapeAngle();
+    int calcRunAnime(int);
+    void setBck(int, u8, f32, f32);
+    u8 checkBck(int);
+    void setEffect();
+    bool isChaseCowGame();
+    void setCarryStatus();
+    void setActetcStatus();
+    bool checkNadeNadeFinish();
+    bool checkNadeNade();
+    void setSeSnort();
+    void setRushVibration(int);
+    bool checkThrow();
+    void setBodyAngle(s16);
+    void setBodyAngle2(s16);
+    BOOL checkProcess(void (daCow_c::*)());
+    bool setProcess(void (daCow_c::*)(), int);
+    void damage_check();
+    void setEnterCow20();
+    void setEnterCow10();
+    void setGroundAngle();
+    bool checkRun();
+    bool checkNearCowRun();
+    void action_wait();
+    void action_eat();
+    void action_moo();
+    void action_shake();
+    bool checkNearWolf();
+    bool checkPlayerWait();
+    bool checkPlayerSurprise();
+    bool checkPlayerPos();
+    void checkBeforeBg();
+    int checkOutOfGate(cXyz);
+    s16 getCowshedAngle();
+    double getCowshedDist();
+    int checkCowIn(f32, f32);
+    bool checkCowInOwn(int);
+    void action_run();
+    bool checkCurringPen();
+    void setCowInCage();
+    void setEnterCount();
+    void action_enter();
+    bool isAngry();
+    bool isGuardFad();
+    void setAngryHit();
+    bool checkBeforeBgAngry(s16);
+    void setRedTev();
+    void setAngryTurn();
+    void action_angry();
+    void calcCatchPos(f32, int);
+    void executeCrazyWait();
+    void executeCrazyDash();
+    void initCrazyBeforeCatch(int);
+    void executeCrazyBeforeCatch();
+    void initCrazyCatch(int);
+    void executeCrazyCatch();
+    void initCrazyThrow(int);
+    void executeCrazyThrow();
+    void initCrazyAttack(int);
+    void executeCrazyAttack();
+    void initCrazyAway(int);
+    void executeCrazyAway();
+    void executeCrazyEnd();
+    void initCrazyBack(int);
+    void executeCrazyBack();
+    void action_crazy();
+    void executeCrazyBack2();
+    void action_thrown();
+    bool checkWolfBusters();
+    void action_wolf();
+    void action_damage();
+    void action();
+    void setMtx();
+    void setAttnPos();
+    void setCollisions();
+    int Execute();
+    int CreateHeap();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 initialize();
+    int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int Draw();
+    int Delete();
+    // csXyz getShapeAngle();
     csXyz getShapeAngle() { return mSavedAngle; }
 
     void setCowP(daCow_c* cow) { mCowP = cow; }
diff --git a/include/d/actor/d_a_crod.h b/include/d/actor/d_a_crod.h
index 9224ba9822..84938d454a 100644
--- a/include/d/actor/d_a_crod.h
+++ b/include/d/actor/d_a_crod.h
@@ -15,22 +15,22 @@
  */
 class daCrod_c : public fopAc_ac_c {
 public:
-    /* 80141A94 */ void setControllActorData() {
+    void setControllActorData() {
         mControllActorKeep.setActor();
         mCameraActorKeep.setActor();
     }
 
-    /* 804A2E38 */ int createHeap();
-    /* 804A2F18 */ int create();
-    /* 804A3304 */ ~daCrod_c();
-    /* 804A34B0 */ void setRoomInfo();
-    /* 804A34B4 */ void setMatrix();
-    /* 804A3500 */ void posMove();
-    /* 804A3580 */ void setBckAnm(u16);
-    /* 804A35FC */ void setReturn();
-    /* 804A365C */ void setLightPower();
-    /* 804A36D8 */ int execute();
-    /* 804A3FD4 */ int draw();
+    int createHeap();
+    int create();
+    ~daCrod_c();
+    void setRoomInfo();
+    void setMatrix();
+    void posMove();
+    void setBckAnm(u16);
+    void setReturn();
+    void setLightPower();
+    int execute();
+    int draw();
 
     static fopAc_ac_c* makeIronBallDummy(fopAc_ac_c* p_actor) {
         return (fopAc_ac_c*)fopAcM_fastCreate(0x2F4, 6, &p_actor->current.pos,
diff --git a/include/d/actor/d_a_cstaF.h b/include/d/actor/d_a_cstaF.h
index 1aa8020d0d..0e8b5c1ca7 100644
--- a/include/d/actor/d_a_cstaF.h
+++ b/include/d/actor/d_a_cstaF.h
@@ -15,21 +15,21 @@
  */
 class daCstaF_c : public dBgS_MoveBgActor {
 public:
-    /* 804DDB48 */ BOOL checkCoverModel();
-    /* 804DDBB4 */ int create();
-    /* 804DE2F8 */ ~daCstaF_c();
-    /* 804DE558 */ void setRoomInfo();
-    /* 804DE5F0 */ void setMatrix();
-    /* 804DE698 */ void posMove();
-    /* 804DEB60 */ void setCollision();
-    /* 804DEC14 */ void setAnime();
-    /* 804DF0D8 */ BOOL initBrk(u16);
-    /* 804DF150 */ void initStopBrkBtk();
-    /* 804DF1A4 */ void initStartBrkBtk();
+    BOOL checkCoverModel();
+    int create();
+    ~daCstaF_c();
+    void setRoomInfo();
+    void setMatrix();
+    void posMove();
+    void setCollision();
+    void setAnime();
+    BOOL initBrk(u16);
+    void initStopBrkBtk();
+    void initStartBrkBtk();
 
-    /* 804DD978 */ virtual int CreateHeap();
-    /* 804DF37C */ virtual int Execute(Mtx**);
-    /* 804DF6E4 */ virtual int Draw();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
 
     cXyz& getBallPos() { return m_ballPos; }
     void onPlayerRide() { m_isPlayerRide = true; }
diff --git a/include/d/actor/d_a_cstatue.h b/include/d/actor/d_a_cstatue.h
index 15f9c12334..ca888e7dc4 100644
--- a/include/d/actor/d_a_cstatue.h
+++ b/include/d/actor/d_a_cstatue.h
@@ -59,22 +59,22 @@ enum daCstatueType {
  */
 class daCstatue_c : public fopAc_ac_c {
 public:
-    /* 806636AC */ void atHitCallback(fopAc_ac_c*);
-    /* 806636EC */ int createHeap();
-    /* 80663D28 */ int create();
-    /* 80664840 */ ~daCstatue_c();
-    /* 80664AA0 */ void setRoomInfo();
-    /* 80664B38 */ void setMatrix();
-    /* 80664C9C */ void posMove();
-    /* 8066555C */ void setCollision();
-    /* 80665E14 */ BOOL checkHammerReverse();
-    /* 80665F80 */ void setDemo();
-    /* 80666390 */ void setAnime();
-    /* 80666B80 */ int initBrk(u16);
-    /* 80666BF8 */ void initStopBrkBtk();
-    /* 80666C38 */ void initStartBrkBtk();
-    /* 80666DE8 */ int execute();
-    /* 80667438 */ int draw();
+    void atHitCallback(fopAc_ac_c*);
+    int createHeap();
+    int create();
+    ~daCstatue_c();
+    void setRoomInfo();
+    void setMatrix();
+    void posMove();
+    void setCollision();
+    BOOL checkHammerReverse();
+    void setDemo();
+    void setAnime();
+    int initBrk(u16);
+    void initStopBrkBtk();
+    void initStartBrkBtk();
+    int execute();
+    int draw();
 
     bool checkBossAtGroundHit() const { return mBossAtGndHit == 1; }
     bool checkNormalType() const { return mType == daCstatueType_Normal; }
diff --git a/include/d/actor/d_a_demo00.h b/include/d/actor/d_a_demo00.h
index e4c4064073..4bb1cf8a4a 100644
--- a/include/d/actor/d_a_demo00.h
+++ b/include/d/actor/d_a_demo00.h
@@ -14,7 +14,7 @@ public:
 
 class daDemo00_resID_c {
 public:
-    /* 804A430C */ void reset();
+    void reset();
 
     /* 0x00 */ u32 mShapeID;
     /* 0x04 */ u32 field_0x4;
@@ -42,7 +42,7 @@ struct daDemo00_shadow_c {
 
 class daDemo00_model_c {
 public:
-    /* 804A4338 */ void reset();
+    void reset();
 
     /* 0x00 */ daDemo00_resID_c mID;
     /* 0x24 */ mDoExt_McaMorfSO* mpModelMorf;
@@ -70,15 +70,15 @@ class daDemo00_c : public fopAc_ac_c {
 public:
     typedef int (daDemo00_c::*actionFunc)(dDemo_actor_c*);
 
-    /* 804A4388 */ ~daDemo00_c();
-    /* 804A45A0 */ void setBaseMtx();
-    /* 804A4948 */ void setShadowSize();
-    /* 804A4F74 */ int createHeap();
-    /* 804A5798 */ int actStandby(dDemo_actor_c*);
-    /* 804A594C */ int actPerformance(dDemo_actor_c*);
-    /* 804A604C */ int actLeaving(dDemo_actor_c*);
-    /* 804A6F94 */ int draw();
-    /* 804A7BA8 */ int execute();
+    ~daDemo00_c();
+    void setBaseMtx();
+    void setShadowSize();
+    int createHeap();
+    int actStandby(dDemo_actor_c*);
+    int actPerformance(dDemo_actor_c*);
+    int actLeaving(dDemo_actor_c*);
+    int draw();
+    int execute();
 
     int create();
 
diff --git a/include/d/actor/d_a_demo_item.h b/include/d/actor/d_a_demo_item.h
index f5d6616c78..ed6d195f5e 100644
--- a/include/d/actor/d_a_demo_item.h
+++ b/include/d/actor/d_a_demo_item.h
@@ -22,26 +22,26 @@ public:
         ACTION_END_e,
     };
 
-    /* 804DFBD4 */ int CreateInit();
-    /* 804DFC98 */ void action();
-    /* 804DFD10 */ void actionStart();
-    /* 804E00DC */ void actionEvent();
-    /* 804E0A50 */ void actionWaitLightEnd();
-    /* 804E0B40 */ void actionEnd();
-    /* 804E0B60 */ void setInsectEffect();
-    /* 804E0C44 */ void followInsectEffect();
-    /* 804E0CB0 */ void endInsectEffect();
-    /* 804E0D44 */ void onEventReg(int, int);
-    /* 804E0DB4 */ void set_pos();
-    /* 804E105C */ void anim_control();
-    /* 804E1098 */ void initEffectLight();
-    /* 804E10D0 */ void settingEffectLight();
-    /* 804E111C */ void set_mtx();
-    /* 804E1230 */ void draw_WOOD_STICK();
+    int CreateInit();
+    void action();
+    void actionStart();
+    void actionEvent();
+    void actionWaitLightEnd();
+    void actionEnd();
+    void setInsectEffect();
+    void followInsectEffect();
+    void endInsectEffect();
+    void onEventReg(int, int);
+    void set_pos();
+    void anim_control();
+    void initEffectLight();
+    void settingEffectLight();
+    void set_mtx();
+    void draw_WOOD_STICK();
 
-    /* 804E122C */ virtual void setListStart();
-    /* 804E11D4 */ virtual void setTevStr();
-    /* 804DFBCC */ virtual int __CreateHeap();
+    virtual void setListStart();
+    virtual void setTevStr();
+    virtual int __CreateHeap();
 
     inline int Delete();
     inline int create();
diff --git a/include/d/actor/d_a_dmidna.h b/include/d/actor/d_a_dmidna.h
index 9f015c0803..9b1569e541 100644
--- a/include/d/actor/d_a_dmidna.h
+++ b/include/d/actor/d_a_dmidna.h
@@ -13,12 +13,12 @@
  */
 class daDmidna_c : public fopAc_ac_c {
 public:
-    /* 8045CED8 */ int createHeap();
-    /* 8045CFE4 */ int create();
-    /* 8045D0B4 */ ~daDmidna_c();
-    /* 8045D144 */ void setMatrix();
-    /* 8045D1A0 */ int execute();
-    /* 8045D204 */ int draw();
+    int createHeap();
+    int create();
+    ~daDmidna_c();
+    void setMatrix();
+    int execute();
+    int draw();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ u8 unk_0x570[4];
diff --git a/include/d/actor/d_a_do.h b/include/d/actor/d_a_do.h
index 53a5eab79d..3bd16d1740 100644
--- a/include/d/actor/d_a_do.h
+++ b/include/d/actor/d_a_do.h
@@ -62,8 +62,8 @@ struct daDo_HIO_tmp {
 
 class daDo_HIO_c {
 public:
-    /* 80667D4C */ daDo_HIO_c();
-    /* 8066ED40 */ virtual ~daDo_HIO_c() {}
+    daDo_HIO_c();
+    virtual ~daDo_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mBaseSize;
diff --git a/include/d/actor/d_a_door_boss.h b/include/d/actor/d_a_door_boss.h
index 8e871adaf0..9ec069ce3d 100644
--- a/include/d/actor/d_a_door_boss.h
+++ b/include/d/actor/d_a_door_boss.h
@@ -23,30 +23,30 @@ public:
         /* 3 */ ACT_END,
     };
 
-    /* 8066F418 */ char* getArcName();
-    /* 8066F424 */ char* getBmd();
-    /* 8066F434 */ char* getDzb();
-    /* 8066F444 */ char* getBmd2();
-    /* 8066F454 */ J3DModelData* getDoorModelData();
-    /* 8066F4E4 */ int CreateHeap();
-    /* 8066F738 */ void calcMtx();
-    /* 8066F7EC */ int CreateInit();
-    /* 8066F8E4 */ cPhs__Step create();
-    /* 8066FAB8 */ int getDemoAction();
-    /* 8066FB00 */ void demoProc();
-    /* 8066FF04 */ void calcGoal(cXyz*, int);
-    /* 8067002C */ void smokeInit();
-    /* 806700C4 */ BOOL checkArea();
-    /* 806701F4 */ BOOL checkFront();
-    /* 80670294 */ BOOL checkOpen();
-    /* 80670320 */ BOOL actionWait();
-    /* 80670328 */ BOOL actionCloseWait();
-    /* 806703C0 */ BOOL actionOpen();
-    /* 806703E4 */ BOOL actionEnd();
-    /* 80670544 */ int execute();
-    /* 80670664 */ BOOL checkDraw();
-    /* 806706A4 */ int draw();
-    /* 80670804 */ int Delete();
+    char* getArcName();
+    char* getBmd();
+    char* getDzb();
+    char* getBmd2();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int CreateInit();
+    cPhs__Step create();
+    int getDemoAction();
+    void demoProc();
+    void calcGoal(cXyz*, int);
+    void smokeInit();
+    BOOL checkArea();
+    BOOL checkFront();
+    BOOL checkOpen();
+    BOOL actionWait();
+    BOOL actionCloseWait();
+    BOOL actionOpen();
+    BOOL actionEnd();
+    int execute();
+    BOOL checkDraw();
+    int draw();
+    int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_door_bossL1.h b/include/d/actor/d_a_door_bossL1.h
index 4e70a18b65..855cda204f 100644
--- a/include/d/actor/d_a_door_bossL1.h
+++ b/include/d/actor/d_a_door_bossL1.h
@@ -33,46 +33,46 @@ public:
 
     typedef int (daBdoorL1_c::*actionFunc)();
 
-    /* 804E1E2C */ char* getDoorEventName();
-    /* 804E1EE8 */ char* getDoorEventName2();
-    /* 804E1FA4 */ const char* getArcName();
-    /* 804E2060 */ const char* getAnmArcName();
-    /* 804E20C4 */ int getDoorType();
-    /* 804E2104 */ int getOpenAnm();
-    /* 804E2158 */ int getCloseAnm();
-    /* 804E21AC */ const char* getAlwaysArcName();
-    /* 804E21BC */ const char* getBmd();
-    /* 804E21CC */ const char* getDzb();
-    /* 804E21DC */ J3DModelData* getDoorModelData();
-    /* 804E2258 */ int CreateHeap();
-    /* 804E2578 */ void calcMtx();
-    /* 804E2754 */ int CreateInit();
-    /* 804E28E4 */ int create();
-    /* 804E2B78 */ int getDemoAction();
-    /* 804E2BC0 */ void demoProc();
-    /* 804E3180 */ int openInit();
-    /* 804E357C */ int openProc();
-    /* 804E3794 */ int openEnd();
-    /* 804E3850 */ int closeInit();
-    /* 804E3A2C */ int closeProc();
-    /* 804E3C0C */ int closeEnd();
-    /* 804E3C14 */ int unlockInit();
-    /* 804E3CCC */ void setPos();
-    /* 804E3DE8 */ void calcGoal(cXyz*, int);
-    /* 804E3F10 */ int setAngle();
-    /* 804E3FF8 */ int createKey();
-    /* 804E4100 */ void smokeInit();
-    /* 804E4104 */ void deleteEmitter();
-    /* 804E4158 */ int checkArea();
-    /* 804E432C */ int checkFront();
-    /* 804E43A0 */ int checkOpen();
-    /* 804E4414 */ int actionWait();
-    /* 804E441C */ int actionCloseWait();
-    /* 804E44B4 */ int actionOpen();
-    /* 804E44EC */ int actionEnd();
-    /* 804E464C */ int execute();
-    /* 804E476C */ int draw();
-    /* 804E48BC */ int Delete();
+    char* getDoorEventName();
+    char* getDoorEventName2();
+    const char* getArcName();
+    const char* getAnmArcName();
+    int getDoorType();
+    int getOpenAnm();
+    int getCloseAnm();
+    const char* getAlwaysArcName();
+    const char* getBmd();
+    const char* getDzb();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int CreateInit();
+    int create();
+    int getDemoAction();
+    void demoProc();
+    int openInit();
+    int openProc();
+    int openEnd();
+    int closeInit();
+    int closeProc();
+    int closeEnd();
+    int unlockInit();
+    void setPos();
+    void calcGoal(cXyz*, int);
+    int setAngle();
+    int createKey();
+    void smokeInit();
+    void deleteEmitter();
+    int checkArea();
+    int checkFront();
+    int checkOpen();
+    int actionWait();
+    int actionCloseWait();
+    int actionOpen();
+    int actionEnd();
+    int execute();
+    int draw();
+    int Delete();
 
     void setAction(u8 action) { mAction = action; }
 
diff --git a/include/d/actor/d_a_door_bossL5.h b/include/d/actor/d_a_door_bossL5.h
index be761117d0..e980dcb7d3 100644
--- a/include/d/actor/d_a_door_bossL5.h
+++ b/include/d/actor/d_a_door_bossL5.h
@@ -28,40 +28,40 @@ public:
 
     typedef int (daBdoorL5_c::*actionFunc)();
 
-    /* 80670C38 */ const char* getArcName();
-    /* 80670C44 */ const char* getAlwaysArcName();
-    /* 80670C54 */ const char* getBmd();
-    /* 80670C64 */ const char* getDzb();
-    /* 80670C74 */ const char* getAnmArcName();
-    /* 80670C84 */ s32 getOpenAnm();
-    /* 80670C8C */ s32 getCloseAnm();
-    /* 80670C94 */ J3DModelData* getDoorModelData();
-    /* 80670D10 */ int CreateHeap();
-    /* 80670F08 */ void calcMtx();
-    /* 80670F5C */ int CreateInit();
-    /* 8067106C */ int create();
-    /* 806712DC */ int getDemoAction();
-    /* 80671324 */ void demoProc();
-    /* 806715D0 */ int openInit();
-    /* 80671670 */ int openProc();
-    /* 80671718 */ int openEnd();
-    /* 80671720 */ int closeInit();
-    /* 806717FC */ int closeProc();
-    /* 80671820 */ int closeEnd();
-    /* 80671878 */ int unlockInit();
-    /* 80671954 */ void calcGoal(cXyz*, int);
-    /* 80671A7C */ void smokeInit();
-    /* 80671B14 */ int createKey();
-    /* 80671C14 */ int checkArea();
-    /* 80671D44 */ int checkFront();
-    /* 80671DE4 */ int checkOpen();
-    /* 80671E70 */ int actionWait();
-    /* 80671E78 */ int actionCloseWait();
-    /* 80671F58 */ int actionOpen();
-    /* 80672004 */ int actionEnd();
-    /* 80672164 */ int execute();
-    /* 8067228C */ int draw();
-    /* 80672374 */ int Delete();
+    const char* getArcName();
+    const char* getAlwaysArcName();
+    const char* getBmd();
+    const char* getDzb();
+    const char* getAnmArcName();
+    s32 getOpenAnm();
+    s32 getCloseAnm();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int CreateInit();
+    int create();
+    int getDemoAction();
+    void demoProc();
+    int openInit();
+    int openProc();
+    int openEnd();
+    int closeInit();
+    int closeProc();
+    int closeEnd();
+    int unlockInit();
+    void calcGoal(cXyz*, int);
+    void smokeInit();
+    int createKey();
+    int checkArea();
+    int checkFront();
+    int checkOpen();
+    int actionWait();
+    int actionCloseWait();
+    int actionOpen();
+    int actionEnd();
+    int execute();
+    int draw();
+    int Delete();
 
     void setAction(u8 action) { mAction = action; }
     int deleteKey() {
diff --git a/include/d/actor/d_a_door_dbdoor00.h b/include/d/actor/d_a_door_dbdoor00.h
index bbbe980fb9..e635eb4f00 100644
--- a/include/d/actor/d_a_door_dbdoor00.h
+++ b/include/d/actor/d_a_door_dbdoor00.h
@@ -14,30 +14,30 @@
  */
 class daDbDoor00_c : public fopAc_ac_c {
 public:
-    /* 8045D470 */ char* getAlwaysArcName();
-    /* 8045D480 */ char* getDzb();
-    /* 8045D490 */ char* getDummyBmdName();
-    /* 8045D4A0 */ char* getBmdArcName();
-    /* 8045D4B0 */ char* getBmdName();
-    /* 8045D504 */ J3DModelData* getDoorModelData();
-    /* 8045D594 */ int CreateHeap();
-    /* 8045D744 */ void calcMtx();
-    /* 8045D8F4 */ int CreateInit();
-    /* 8045D9A8 */ int create();
-    /* 8045DA68 */ int getDemoAction();
-    /* 8045DAB0 */ void demoProc();
-    /* 8045DE44 */ int checkArea();
-    /* 8045DF70 */ int checkUnlock();
-    /* 8045DF78 */ int actionWait();
-    /* 8045DF9C */ int actionLockWait();
-    /* 8045E000 */ int actionLockOff();
-    /* 8045E094 */ int actionLockDemo();
-    /* 8045E108 */ int actionCloseWait();
-    /* 8045E1C8 */ int actionOpen();
-    /* 8045E1EC */ int execute();
-    /* 8045E2DC */ int checkDraw();
-    /* 8045E31C */ int draw();
-    /* 8045E428 */ int Delete();
+    char* getAlwaysArcName();
+    char* getDzb();
+    char* getDummyBmdName();
+    char* getBmdArcName();
+    char* getBmdName();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int CreateInit();
+    int create();
+    int getDemoAction();
+    void demoProc();
+    int checkArea();
+    int checkUnlock();
+    int actionWait();
+    int actionLockWait();
+    int actionLockOff();
+    int actionLockDemo();
+    int actionCloseWait();
+    int actionOpen();
+    int execute();
+    int checkDraw();
+    int draw();
+    int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_door_knob00.h b/include/d/actor/d_a_door_knob00.h
index b9e9bbae92..d6e0fd5db2 100644
--- a/include/d/actor/d_a_door_knob00.h
+++ b/include/d/actor/d_a_door_knob00.h
@@ -29,44 +29,44 @@ public:
 
     typedef int (daKnob20_c::*actionFunc)();
 
-    /* 8045E888 */ char* getAlwaysArcName();
-    /* 8045E898 */ char* getEvArcName();
-    /* 8045E8A8 */ char* getDzb();
-    /* 8045E8B8 */ char* getDummyBmd();
-    /* 8045E8C8 */ char* getBmd();
-    /* 8045E91C */ J3DModelData* getDoorModelData();
-    /* 8045E960 */ int CreateHeap();
-    /* 8045EBA0 */ void calcMtx();
-    /* 8045EC44 */ int CreateInit();
-    /* 8045ED1C */ int create();
-    /* 8045EE5C */ int checkOpenDoor(int*);
-    /* 8045EEE4 */ void setActionFromFlow();
-    /* 8045EFCC */ void setEventId();
-    /* 8045F058 */ int checkArea(f32, f32, f32);
-    /* 8045F29C */ void setEventPrm();
-    /* 8045F428 */ int releaseBG();
-    /* 8045F478 */ int frontCheck();
-    /* 8045F520 */ int getDemoAction();
-    /* 8045F568 */ int demoProc();
-    /* 8045F8A4 */ void setStart(f32, f32);
-    /* 8045F94C */ void setAngle();
-    /* 8045F968 */ int adjustmentProc();
-    /* 8045FA98 */ int openInit(int);
-    /* 8045FBF8 */ int openProc(int);
-    /* 8045FCA4 */ int openEnd(int);
-    /* 8045FDF8 */ void initOpenDemo();
-    /* 8045FE68 */ void startDemoProc();
-    /* 8045FF08 */ int actionWait();
-    /* 8045FFB0 */ int actionSpecialDemo();
-    /* 8046002C */ int actionDemo();
-    /* 804600C0 */ int actionTalk();
-    /* 8046012C */ int actionTalkWait();
-    /* 804601D4 */ int actionTalkOpen();
-    /* 8046027C */ int actionInit();
-    /* 804602D8 */ int actionDead();
-    /* 804602E0 */ int execute();
-    /* 8046045C */ int draw();
-    /* 80460550 */ int Delete();
+    char* getAlwaysArcName();
+    char* getEvArcName();
+    char* getDzb();
+    char* getDummyBmd();
+    char* getBmd();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int CreateInit();
+    int create();
+    int checkOpenDoor(int*);
+    void setActionFromFlow();
+    void setEventId();
+    int checkArea(f32, f32, f32);
+    void setEventPrm();
+    int releaseBG();
+    int frontCheck();
+    int getDemoAction();
+    int demoProc();
+    void setStart(f32, f32);
+    void setAngle();
+    int adjustmentProc();
+    int openInit(int);
+    int openProc(int);
+    int openEnd(int);
+    void initOpenDemo();
+    void startDemoProc();
+    int actionWait();
+    int actionSpecialDemo();
+    int actionDemo();
+    int actionTalk();
+    int actionTalkWait();
+    int actionTalkOpen();
+    int actionInit();
+    int actionDead();
+    int execute();
+    int draw();
+    int Delete();
 
     void setAction(u8 action) { mAction = action; }
     void offFlag(u16 flag) { field_0x60c &= ~flag; }
@@ -99,10 +99,10 @@ STATIC_ASSERT(sizeof(daKnob20_c) == 0x618);
 
 class knob_param_c {
 public:
-    /* 8045E858 */ static u32 getDoorModel(fopAc_ac_c*);
-    /* 8045E864 */ static u32 getDoorLightInf(fopAc_ac_c*);
-    /* 8045E870 */ static u16 getMsgNo(fopAc_ac_c*);
-    /* 8045E87C */ static u8 getExitNo(fopAc_ac_c*);
+    static u32 getDoorModel(fopAc_ac_c*);
+    static u32 getDoorLightInf(fopAc_ac_c*);
+    static u16 getMsgNo(fopAc_ac_c*);
+    static u8 getExitNo(fopAc_ac_c*);
 };
 
 #endif /* D_A_DOOR_KNOB00_H */
diff --git a/include/d/actor/d_a_door_mbossL1.h b/include/d/actor/d_a_door_mbossL1.h
index 51356299b6..71b8a18514 100644
--- a/include/d/actor/d_a_door_mbossL1.h
+++ b/include/d/actor/d_a_door_mbossL1.h
@@ -9,14 +9,14 @@
 
 class dDoor_stop2_c {
 public:
-    /* 806728B4 */ void calcMtx(fopAc_ac_c*);
-    /* 80672970 */ void closeInit(fopAc_ac_c*, u8);
-    /* 80672AE4 */ int closeProc(fopAc_ac_c*);
-    /* 80672B70 */ void openInit(fopAc_ac_c*, u8);
-    /* 80672CD8 */ int openProc(fopAc_ac_c*);
-    /* 80672D80 */ int create(J3DModelData*);
-    /* 80672DCC */ void draw(fopAc_ac_c*);
-    /* 80672E44 */ f32 getHeight();
+    void calcMtx(fopAc_ac_c*);
+    void closeInit(fopAc_ac_c*, u8);
+    int closeProc(fopAc_ac_c*);
+    void openInit(fopAc_ac_c*, u8);
+    int openProc(fopAc_ac_c*);
+    int create(J3DModelData*);
+    void draw(fopAc_ac_c*);
+    f32 getHeight();
 
     /* 0x0 */ J3DModel* mModel;
     /* 0x4 */ f32 field_0x4;
@@ -54,68 +54,68 @@ public:
 
     typedef int (daMBdoorL1_c::*actionFunc)();
 
-    /* 80672E70 */ char* getAnmArcName();
-    /* 80672EE8 */ char* getArcName();
-    /* 80672F74 */ char* getAlwaysArcName();
-    /* 80672F84 */ int getDoorType();
-    /* 80672FE4 */ char* getOpenAnm();
-    /* 80673048 */ char* getCloseAnm();
-    /* 806730AC */ char* getBmd();
-    /* 80673100 */ char* getBtk();
-    /* 80673110 */ char* getDzb();
-    /* 80673140 */ J3DModelData* getDoorModelData();
-    /* 80673164 */ int CreateHeap();
-    /* 806735F8 */ void calcMtx();
-    /* 80673790 */ int createKey();
-    /* 806738CC */ int CreateInit();
-    /* 80673B9C */ int create();
-    /* 80673E78 */ int getDemoAction();
-    /* 80673EC0 */ void demoProc();
-    /* 80674AF4 */ int openInit();
-    /* 80674DA4 */ int openProc();
-    /* 80674FDC */ int openEnd();
-    /* 80675068 */ int closeInit();
-    /* 806752BC */ int closeProc();
-    /* 80675304 */ int closeEnd();
-    /* 806753CC */ int unlockInit();
-    /* 80675414 */ int unlock();
-    /* 80675470 */ int openInitKnob(int);
-    /* 80675678 */ int openProcKnob(int);
-    /* 80675734 */ int openEndKnob(int);
-    /* 80675894 */ void calcGoal(cXyz*, int);
-    /* 806759E4 */ int setAngle();
-    /* 80675ADC */ void setAngleQuickly();
-    /* 80675B30 */ int adjustmentProc();
-    /* 80675DB0 */ void setPos();
-    /* 80675EE4 */ void setStart(f32, f32);
-    /* 80676004 */ void smokeInit2();
-    /* 806760B4 */ int checkArea();
-    /* 806762A4 */ int checkFront();
-    /* 80676308 */ int checkOpen();
-    /* 806764D0 */ int checkFrontKey();
-    /* 80676568 */ int checkBackKey();
-    /* 80676570 */ int checkFrontStop();
-    /* 80676610 */ int checkBackStop();
-    /* 806766B0 */ int checkFrontSw();
-    /* 80676744 */ int checkBackSw();
-    /* 806767D8 */ int checkStopOpen();
-    /* 8067684C */ int startDemoEnd();
-    /* 806769A4 */ int checkMBossRoom();
-    /* 806769D0 */ int checkStopClose();
-    /* 80676AB4 */ int checkMakeStop();
-    /* 80676B64 */ int checkMakeKey();
-    /* 80676BE0 */ int actionWait();
-    /* 80676BE8 */ int actionCloseWait();
-    /* 80676DEC */ int actionStopClose();
-    /* 80676E40 */ int actionDemo();
-    /* 80676EB4 */ int actionOpen();
-    /* 80676ED8 */ int actionInit();
-    /* 80676FE4 */ int actionStartDemo();
-    /* 80677050 */ int execute();
-    /* 80677158 */ int draw();
-    /* 806771B4 */ void draw_sub0();
-    /* 806772C4 */ void draw_sub1();
-    /* 806773DC */ int Delete();
+    char* getAnmArcName();
+    char* getArcName();
+    char* getAlwaysArcName();
+    int getDoorType();
+    char* getOpenAnm();
+    char* getCloseAnm();
+    char* getBmd();
+    char* getBtk();
+    char* getDzb();
+    J3DModelData* getDoorModelData();
+    int CreateHeap();
+    void calcMtx();
+    int createKey();
+    int CreateInit();
+    int create();
+    int getDemoAction();
+    void demoProc();
+    int openInit();
+    int openProc();
+    int openEnd();
+    int closeInit();
+    int closeProc();
+    int closeEnd();
+    int unlockInit();
+    int unlock();
+    int openInitKnob(int);
+    int openProcKnob(int);
+    int openEndKnob(int);
+    void calcGoal(cXyz*, int);
+    int setAngle();
+    void setAngleQuickly();
+    int adjustmentProc();
+    void setPos();
+    void setStart(f32, f32);
+    void smokeInit2();
+    int checkArea();
+    int checkFront();
+    int checkOpen();
+    int checkFrontKey();
+    int checkBackKey();
+    int checkFrontStop();
+    int checkBackStop();
+    int checkFrontSw();
+    int checkBackSw();
+    int checkStopOpen();
+    int startDemoEnd();
+    int checkMBossRoom();
+    int checkStopClose();
+    int checkMakeStop();
+    int checkMakeKey();
+    int actionWait();
+    int actionCloseWait();
+    int actionStopClose();
+    int actionDemo();
+    int actionOpen();
+    int actionInit();
+    int actionStartDemo();
+    int execute();
+    int draw();
+    void draw_sub0();
+    void draw_sub1();
+    int Delete();
 
     void setAction(u8 action) {
         mAction = action;
diff --git a/include/d/actor/d_a_door_push.h b/include/d/actor/d_a_door_push.h
index b495dd914e..5beb3aa564 100644
--- a/include/d/actor/d_a_door_push.h
+++ b/include/d/actor/d_a_door_push.h
@@ -26,25 +26,25 @@ public:
         ACTION_ORDER_EVENT_e,
     };
 
-    /* 80677E08 */ void initBaseMtx();
-    /* 80677F38 */ void setBaseMtx();
-    /* 8067809C */ int Create();
-    /* 806781FC */ int CreateHeap();
-    /* 80678318 */ int create1st();
-    /* 8067839C */ int Execute(Mtx**);
-    /* 8067840C */ void action();
-    /* 80678488 */ void init_modeWait();
-    /* 806784B4 */ void modeWait();
-    /* 80678664 */ void event_proc_call();
-    /* 80678708 */ void actionOpenWait();
-    /* 8067877C */ void actionOrderEvent();
-    /* 806787F8 */ void actionEvent();
-    /* 80678818 */ int demoProc();
-    /* 80678AEC */ void rotateInit();
-    /* 80678B10 */ int rotate();
-    /* 80678BC0 */ void setGoal();
-    /* 80678C70 */ int Draw();
-    /* 80678D2C */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void action();
+    void init_modeWait();
+    void modeWait();
+    void event_proc_call();
+    void actionOpenWait();
+    void actionOrderEvent();
+    void actionEvent();
+    int demoProc();
+    void rotateInit();
+    int rotate();
+    void setGoal();
+    int Draw();
+    int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
     u32 getSceneNo() { return fopAcM_GetParamBit(this, 4, 6); }
diff --git a/include/d/actor/d_a_door_shutter.h b/include/d/actor/d_a_door_shutter.h
index 028e710c2f..c414a8e585 100644
--- a/include/d/actor/d_a_door_shutter.h
+++ b/include/d/actor/d_a_door_shutter.h
@@ -12,13 +12,13 @@ struct daDoor20_c;
 
 class dDoor_stop_c {
 public:
-    /* 804660F4 */ void calcMtx(daDoor20_c*);
-    /* 804661B0 */ void closeInit(daDoor20_c*);
-    /* 804662C0 */ int closeProc(daDoor20_c*);
-    /* 8046634C */ void openInit(daDoor20_c*);
-    /* 80466458 */ int openProc(daDoor20_c*);
-    /* 804664E8 */ int create(daDoor20_c*);
-    /* 80466538 */ void draw(daDoor20_c*);
+    void calcMtx(daDoor20_c*);
+    void closeInit(daDoor20_c*);
+    int closeProc(daDoor20_c*);
+    void openInit(daDoor20_c*);
+    int openProc(daDoor20_c*);
+    int create(daDoor20_c*);
+    void draw(daDoor20_c*);
 
     J3DModel* field_0x0;
     f32 field_0x4;
@@ -45,78 +45,78 @@ public:
         ACTION_DEMO,
     };
 
-    /* 80460B38 */ char* getStopBmdName();
-    /* 80460B70 */ J3DModelData* getStopModelData();
-    /* 80460B94 */ char* getAlwaysArcName();
-    /* 80460BA4 */ char* getArcName();
-    /* 80460C40 */ char* getBmdName();
-    /* 80460CF0 */ char* getBtk();
-    /* 80460D5C */ J3DModelData* getModelData();
-    /* 80460D80 */ f32 getSize2X();
-    /* 80460DAC */ int CreateHeap();
-    /* 8046129C */ void setEventPrm();
-    /* 804616EC */ int checkOpenMsgDoor(int*);
-    /* 8046178C */ int adjustmentAngle();
-    /* 80461874 */ int adjustmentProc();
-    /* 80461A44 */ void setAngle();
-    /* 80461A60 */ void openInit_0();
-    /* 80461D24 */ void openInit_1();
-    /* 80461EC4 */ int openInit(int);
-    /* 80461F60 */ int openProc(int);
-    /* 804622A8 */ void openEnd_0();
-    /* 804622AC */ void openEnd_1();
-    /* 80462328 */ int openEnd(int);
-    /* 80462398 */ void closeInit_0();
-    /* 8046266C */ void closeInit_1();
-    /* 80462738 */ int closeInit(int);
-    /* 804627C4 */ int closeProc(int);
-    /* 804627E8 */ void closeEnd_0();
-    /* 804627EC */ void closeEnd_1();
-    /* 80462868 */ int closeEnd(int);
-    /* 80462928 */ void openInit2();
-    /* 80462A1C */ void closeEnd2();
-    /* 80462A5C */ void calcMtx_2();
-    /* 80462B58 */ void calcMtx();
-    /* 80462C2C */ int CreateInit();
-    /* 80462EB4 */ void setKey();
-    /* 80462F2C */ int create();
-    /* 80462FE0 */ int demoProc();
-    /* 80463E30 */ int orderStopEvent();
-    /* 80463FBC */ int actionWait();
-    /* 80464118 */ int actionStopClose();
-    /* 8046416C */ int actionDemo();
-    /* 804641EC */ int actionInit();
-    /* 80464240 */ int execute();
-    /* 804643B0 */ int draw();
-    /* 80464638 */ void setDoorAngleSpec();
-    /* 804647BC */ int _delete();
-    /* 80464858 */ int createKey();
-    /* 80464AE4 */ int deleteKey();
-    /* 80464B3C */ int adjoinPlayer();
-    /* 80464BD8 */ int frontCheckOld();
-    /* 80464C68 */ int frontCheck();
-    /* 80464CEC */ int drawCheck(int);
-    /* 80464E18 */ int checkExecute();
-    /* 80464EC4 */ void startDemoProc();
-    /* 80464F64 */ void makeEventId();
-    /* 804653B0 */ void initProc();
-    /* 80465400 */ void initOpenDemo(int);
-    /* 80465490 */ int checkArea(f32, f32, f32);
-    /* 80465620 */ void openInitCom(int);
-    /* 804656F0 */ void closeEndCom();
-    /* 8046581C */ void getRestartPos(cXyz*);
-    /* 80465960 */ void setGoal();
-    /* 80465AC0 */ int chkMakeStop();
-    /* 80465B34 */ int chkStopF();
-    /* 80465C04 */ int chkStopB();
-    /* 80465CC0 */ void setStopDemo();
-    /* 80465DA8 */ int chkStopClose();
-    /* 80465E8C */ void setStop();
-    /* 80465F20 */ int chkStopOpen();
-    /* 8046609C */ int chkMakeKey();
+    char* getStopBmdName();
+    J3DModelData* getStopModelData();
+    char* getAlwaysArcName();
+    char* getArcName();
+    char* getBmdName();
+    char* getBtk();
+    J3DModelData* getModelData();
+    f32 getSize2X();
+    int CreateHeap();
+    void setEventPrm();
+    int checkOpenMsgDoor(int*);
+    int adjustmentAngle();
+    int adjustmentProc();
+    void setAngle();
+    void openInit_0();
+    void openInit_1();
+    int openInit(int);
+    int openProc(int);
+    void openEnd_0();
+    void openEnd_1();
+    int openEnd(int);
+    void closeInit_0();
+    void closeInit_1();
+    int closeInit(int);
+    int closeProc(int);
+    void closeEnd_0();
+    void closeEnd_1();
+    int closeEnd(int);
+    void openInit2();
+    void closeEnd2();
+    void calcMtx_2();
+    void calcMtx();
+    int CreateInit();
+    void setKey();
+    int create();
+    int demoProc();
+    int orderStopEvent();
+    int actionWait();
+    int actionStopClose();
+    int actionDemo();
+    int actionInit();
+    int execute();
+    int draw();
+    void setDoorAngleSpec();
+    int _delete();
+    int createKey();
+    int deleteKey();
+    int adjoinPlayer();
+    int frontCheckOld();
+    int frontCheck();
+    int drawCheck(int);
+    int checkExecute();
+    void startDemoProc();
+    void makeEventId();
+    void initProc();
+    void initOpenDemo(int);
+    int checkArea(f32, f32, f32);
+    void openInitCom(int);
+    void closeEndCom();
+    void getRestartPos(cXyz*);
+    void setGoal();
+    int chkMakeStop();
+    int chkStopF();
+    int chkStopB();
+    void setStopDemo();
+    int chkStopClose();
+    void setStop();
+    int chkStopOpen();
+    int chkMakeKey();
 
-    /* 80460D00 */ virtual char* getDzbName();
-    /* 80465918 */ virtual int getDemoAction();
+    virtual char* getDzbName();
+    virtual int getDemoAction();
 
     void onFlag(u16 flag) { field_0x68e |= flag; }
     void offFlag(u16 flag) { field_0x68e &= ~flag; }
diff --git a/include/d/actor/d_a_dshutter.h b/include/d/actor/d_a_dshutter.h
index 63746b4369..479349c072 100644
--- a/include/d/actor/d_a_dshutter.h
+++ b/include/d/actor/d_a_dshutter.h
@@ -30,23 +30,23 @@ public:
         /* 0xC */ actionFunc mExecuteFunc;
     };
 
-    /* 80467498 */ ~daDsh_c();
-    /* 80467694 */ void setMtx();
-    /* 80467708 */ void setAction(daDsh_c::action_c*);
-    /* 8046772C */ int callInit();
-    /* 8046777C */ int callExecute();
-    /* 804677D4 */ int initOpenWait();
-    /* 804677E4 */ int executeOpenWait();
-    /* 80467840 */ int initOpen();
-    /* 80467988 */ int executeOpen();
-    /* 80467A64 */ int initCloseWait();
-    /* 80467A80 */ int executeCloseWait();
-    /* 80467ADC */ int initClose();
-    /* 80467B04 */ int executeClose();
+    ~daDsh_c();
+    void setMtx();
+    void setAction(daDsh_c::action_c*);
+    int callInit();
+    int callExecute();
+    int initOpenWait();
+    int executeOpenWait();
+    int initOpen();
+    int executeOpen();
+    int initCloseWait();
+    int executeCloseWait();
+    int initClose();
+    int executeClose();
 
-    /* 8046751C */ virtual int CreateHeap();
-    /* 80467640 */ virtual int Execute(Mtx**);
-    /* 8046759C */ virtual int Draw();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
 
     inline int create();
 
diff --git a/include/d/actor/d_a_e_ai.h b/include/d/actor/d_a_e_ai.h
index dc6d8a5165..d2f1b6ec06 100644
--- a/include/d/actor/d_a_e_ai.h
+++ b/include/d/actor/d_a_e_ai.h
@@ -26,27 +26,27 @@ public:
         ACTION_RETURN,
     };
 
-    /* 806791BC */ void initCcCylinder();
-    /* 80679284 */ void setCcCylinder();
-    /* 80679350 */ void anm_init(int, f32, u8, f32);
-    /* 806793FC */ int Draw();
-    /* 806794F4 */ BOOL player_way_check();
-    /* 80679538 */ BOOL other_bg_check(fopAc_ac_c*);
-    /* 80679610 */ BOOL pl_check(f32, s16);
-    /* 8067968C */ void damage_check();
-    /* 80679DC8 */ void e_ai_damage();
-    /* 8067A2CC */ void e_ai_attack();
-    /* 8067A54C */ void e_ai_move();
-    /* 8067AA48 */ void e_ai_wait();
-    /* 8067ACA0 */ void e_ai_return();
-    /* 8067B024 */ void action();
-    /* 8067B2B0 */ void PlayerWaySet();
-    /* 8067B31C */ void AttentionSet();
-    /* 8067B378 */ int Execute();
-    /* 8067B598 */ void setBaseMtx();
-    /* 8067B620 */ int Delete();
-    /* 8067B6F0 */ int CreateHeap();
-    /* 8067B8E4 */ int Create();
+    void initCcCylinder();
+    void setCcCylinder();
+    void anm_init(int, f32, u8, f32);
+    int Draw();
+    BOOL player_way_check();
+    BOOL other_bg_check(fopAc_ac_c*);
+    BOOL pl_check(f32, s16);
+    void damage_check();
+    void e_ai_damage();
+    void e_ai_attack();
+    void e_ai_move();
+    void e_ai_wait();
+    void e_ai_return();
+    void action();
+    void PlayerWaySet();
+    void AttentionSet();
+    int Execute();
+    void setBaseMtx();
+    int Delete();
+    int CreateHeap();
+    int Create();
 
 private:
     /* 0x5AC */ JPABaseEmitter* mpEmitter;
diff --git a/include/d/actor/d_a_e_bee.h b/include/d/actor/d_a_e_bee.h
index cb659d06be..72ccf6adf5 100644
--- a/include/d/actor/d_a_e_bee.h
+++ b/include/d/actor/d_a_e_bee.h
@@ -17,8 +17,8 @@ struct bee_s {
         /* 0xA */ ACT_HOME = 10,
     };
 
-    /* 80685368 */ bee_s() {}
-    /* 806852FC */ ~bee_s() {}
+    bee_s() {}
+    ~bee_s() {}
 
     /* 0x00 */ J3DModel* mpModel1;
     /* 0x04 */ J3DModel* mpModel2;
@@ -78,8 +78,8 @@ STATIC_ASSERT(sizeof(e_bee_class) == 0x2588);
 
 class daE_Bee_HIO_c {
 public:
-    /* 8068286C */ daE_Bee_HIO_c();
-    /* 8068539C */ virtual ~daE_Bee_HIO_c() {}
+    daE_Bee_HIO_c();
+    virtual ~daE_Bee_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScale;
diff --git a/include/d/actor/d_a_e_bg.h b/include/d/actor/d_a_e_bg.h
index 5aeb2d1ffe..4e2422d7d1 100644
--- a/include/d/actor/d_a_e_bg.h
+++ b/include/d/actor/d_a_e_bg.h
@@ -17,30 +17,30 @@
  */
 class daE_BG_c : public fopEn_enemy_c {
 public:
-    /* 8068585C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80685948 */ static int JointCallBack(J3DJoint*, int);
-    /* 80685994 */ int draw();
-    /* 80685B70 */ void setBck(int, u8, f32, f32);
-    /* 80685C14 */ void setActionMode(int, int);
-    /* 80685C2C */ void damage_check();
-    /* 80685DBC */ void setSparkEffect();
-    /* 80685F04 */ fopAc_ac_c* search_esa();
-    /* 80685F88 */ void executeBorn();
-    /* 80686210 */ void executeSwim();
-    /* 80686C90 */ void executeAttack();
-    /* 80687B38 */ void executeDamage();
-    /* 80687CD8 */ bool setBombCarry(int);
-    /* 80687DEC */ void executeBomb();
-    /* 80687FC4 */ void executeBirth();
-    /* 8068838C */ void executeHook();
-    /* 806883D0 */ void executeEat();
-    /* 80689168 */ void action();
-    /* 80689544 */ void mtx_set();
-    /* 8068966C */ void cc_set();
-    /* 806897EC */ int execute();
-    /* 80689978 */ int _delete();
-    /* 80689A0C */ int CreateHeap();
-    /* 80689C38 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    void setSparkEffect();
+    fopAc_ac_c* search_esa();
+    void executeBorn();
+    void executeSwim();
+    void executeAttack();
+    void executeDamage();
+    bool setBombCarry(int);
+    void executeBomb();
+    void executeBirth();
+    void executeHook();
+    void executeEat();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     void setBgId(u32 i_bgId) { mBgId = i_bgId; }
     bool isBomb() { return mIsBomb; }
@@ -94,8 +94,8 @@ STATIC_ASSERT(sizeof(daE_BG_c) == 0xbbc);
 
 class daE_BG_HIO_c : public JORReflexible {
 public:
-    /* 8068580C */ daE_BG_HIO_c();
-    /* 8068A19C */ virtual ~daE_BG_HIO_c() {}
+    daE_BG_HIO_c();
+    virtual ~daE_BG_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_bug.h b/include/d/actor/d_a_e_bug.h
index 46fc7c8982..2d29336526 100644
--- a/include/d/actor/d_a_e_bug.h
+++ b/include/d/actor/d_a_e_bug.h
@@ -60,8 +60,8 @@ STATIC_ASSERT(sizeof(e_bug_class) == 0x7db0);
 
 class daE_Bug_HIO_c: public JORReflexible {
 public:
-    /* 80694B8C */ daE_Bug_HIO_c();
-    /* 80697BEC */ virtual ~daE_Bug_HIO_c() {}
+    daE_Bug_HIO_c();
+    virtual ~daE_Bug_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_df.h b/include/d/actor/d_a_e_df.h
index ea7ae152c9..be69e48798 100644
--- a/include/d/actor/d_a_e_df.h
+++ b/include/d/actor/d_a_e_df.h
@@ -36,34 +36,34 @@ public:
         /* 0xA */ ANIM_WAIT,
     };
 
-    /* 806A7710 */ int CreateHeap();
-    /* 806A7828 */ void initCcCylinder();
-    /* 806A78A0 */ void setCcCylinder();
-    /* 806A78D4 */ void SetAnm(int, int, f32, f32);
-    /* 806A7980 */ void CameraSet(f32);
-    /* 806A7B40 */ bool DemoStart();
-    /* 806A7C3C */ void SetReleaseCam();
-    /* 806A7CE0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806A8030 */ void Link_Eat_Pos();
-    /* 806A8098 */ void Set_Angle(cXyz*);
-    /* 806A816C */ void Obj_Damage();
-    /* 806A8244 */ void DamageAction();
-    /* 806A8368 */ void BombEatAction();
-    /* 806A8790 */ void Spid_Out();
-    /* 806A8938 */ void LinkEatAction();
-    /* 806A8C80 */ bool Mogu_Mogu();
-    /* 806A8D98 */ void ObjEatAction();
-    /* 806A8ED4 */ void EatAction();
-    /* 806A8F2C */ void SearchAction();
-    /* 806A91B4 */ void WaitAction();
-    /* 806A9254 */ void MissAction();
-    /* 806A9304 */ void Action();
-    /* 806A9384 */ int Execute();
-    /* 806A949C */ void Yazirushi();
-    /* 806A94E0 */ int Draw();
-    /* 806A9550 */ int Delete();
-    /* 806A95B8 */ void setBaseMtx();
-    /* 806A9678 */ int Create();
+    int CreateHeap();
+    void initCcCylinder();
+    void setCcCylinder();
+    void SetAnm(int, int, f32, f32);
+    void CameraSet(f32);
+    bool DemoStart();
+    void SetReleaseCam();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void Link_Eat_Pos();
+    void Set_Angle(cXyz*);
+    void Obj_Damage();
+    void DamageAction();
+    void BombEatAction();
+    void Spid_Out();
+    void LinkEatAction();
+    bool Mogu_Mogu();
+    void ObjEatAction();
+    void EatAction();
+    void SearchAction();
+    void WaitAction();
+    void MissAction();
+    void Action();
+    int Execute();
+    void Yazirushi();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    int Create();
 
     /* 0x5AC */ u8 mAction;
     /* 0x5AD */ u8 mEatObjType;
diff --git a/include/d/actor/d_a_e_dk.h b/include/d/actor/d_a_e_dk.h
index d54799a554..381f8e1a62 100644
--- a/include/d/actor/d_a_e_dk.h
+++ b/include/d/actor/d_a_e_dk.h
@@ -18,32 +18,32 @@
  */
 class daE_DK_c : public fopEn_enemy_c {
 public:
-    /* 806AA228 */ int draw();
-    /* 806AA5C8 */ void setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
-    /* 806AA68C */ void setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
-    /* 806AA730 */ void setActionMode(int i_actionMode, int i_moveMode);
-    /* 806AA73C */ void damage_check();
-    /* 806AA8B0 */ bool checkPlayerSearch();
-    /* 806AAB18 */ int checkPlayerAttack(f32);
-    /* 806AAC24 */ void checkWaterHeight();
-    /* 806AAD68 */ static void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
-    /* 806AAE10 */ void setElectricEffect();
-    /* 806AB054 */ void setCoreDeadEffect();
-    /* 806AB158 */ void setBodyDeadEffect();
-    /* 806AB29C */ void executeWait();
-    /* 806AB684 */ void executeChase();
-    /* 806ABA78 */ void executeAttack();
-    /* 806ABCC8 */ void executeDamage();
-    /* 806ABE3C */ void BodyDeathMove();
-    /* 806ABF6C */ void executeDeath();
-    /* 806AC390 */ void action();
-    /* 806AC5BC */ void mtx_set();
-    /* 806AC754 */ void cc_set();
-    /* 806AC968 */ int execute();
-    /* 806ACA10 */ int _delete();
-    /* 806ACAA4 */ int CreateHeap();
-    /* 806ACE14 */ int create();
-    /* 806AD0AC */ daE_DK_c();
+    int draw();
+    void setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
+    void setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate);
+    void setActionMode(int i_actionMode, int i_moveMode);
+    void damage_check();
+    bool checkPlayerSearch();
+    int checkPlayerAttack(f32);
+    void checkWaterHeight();
+    static void SphBgcCallBack(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGPla*, void*);
+    void setElectricEffect();
+    void setCoreDeadEffect();
+    void setBodyDeadEffect();
+    void executeWait();
+    void executeChase();
+    void executeAttack();
+    void executeDamage();
+    void BodyDeathMove();
+    void executeDeath();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
+    daE_DK_c();
 
 private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
@@ -92,8 +92,8 @@ STATIC_ASSERT(sizeof(daE_DK_c) == 0xd54);
 
 class daE_DK_HIO_c : public JORReflexible {
 public:
-    /* 806AA1EC */ daE_DK_HIO_c();
-    /* 806AD490 */ virtual ~daE_DK_HIO_c() {}
+    daE_DK_HIO_c();
+    virtual ~daE_DK_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_dn.h b/include/d/actor/d_a_e_dn.h
index 7afbcd183e..88c1341e96 100644
--- a/include/d/actor/d_a_e_dn.h
+++ b/include/d/actor/d_a_e_dn.h
@@ -16,7 +16,7 @@
  */
 class e_dn_class {
 public:
-    /* 804EDE58 */ e_dn_class();
+    e_dn_class();
     
     /* 0x0000 */ fopEn_enemy_c actor;
     /* 0x05AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_dt.h b/include/d/actor/d_a_e_dt.h
index 803dfce39a..9eb4e2c8e3 100644
--- a/include/d/actor/d_a_e_dt.h
+++ b/include/d/actor/d_a_e_dt.h
@@ -19,62 +19,62 @@ class daE_OT_c;
  */
 class daE_DT_c : public fopEn_enemy_c {
 public:
-    /* 806AD97C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806ADBA0 */ static int JointCallBack(J3DJoint*, int);
-    /* 806ADBEC */ int ctrlJointTuba(J3DJoint*, J3DModel*);
-    /* 806ADD30 */ static int JointCallBackTuba(J3DJoint*, int);
-    /* 806ADD7C */ int draw();
-    /* 806AE5C8 */ void demo_skip(int);
-    /* 806AE618 */ static int DemoSkipCallBack(void*, int);
-    /* 806AE64C */ void setBck(int, u8, f32, f32);
-    /* 806AE6F0 */ bool checkBck(int);
-    /* 806AE74C */ void setActionMode(int, int);
-    /* 806AE758 */ void damage_check();
-    /* 806AEB48 */ void setStabPos();
-    /* 806AEBD4 */ bool checkBeforeBg(f32);
-    /* 806AED94 */ void checkTongueBg();
-    /* 806AEEFC */ void checkWaterSurface();
-    /* 806AEFE8 */ void setSmallWaterEffect();
-    /* 806AF09C */ void setLargeWaterEffect();
-    /* 806AF150 */ void setHamonEffect(int);
-    /* 806AF240 */ void setJumpEffect();
-    /* 806AF2F4 */ void setJumpSizukuEffect();
-    /* 806AF3D0 */ void setDamageShibukiEffect(int);
-    /* 806AF460 */ void setDamageYodareEffect(int);
-    /* 806AF548 */ void setSwingEffect();
-    /* 806AF5CC */ void setStepEffect();
-    /* 806AF740 */ void setBombEffect();
-    /* 806AF848 */ void setBombSmokeEffect();
-    /* 806AF924 */ void setDeadShibukiEffect();
-    /* 806AF9D8 */ void setDeadYodareEffect();
-    /* 806AFAE0 */ void setBoxTubaEffect();
-    /* 806AFBBC */ void setBoxTubaLandEffect();
-    /* 806AFD30 */ int getNumberOfOtama();
-    /* 806AFE24 */ void setStayOtamaFall();
-    /* 806AFEAC */ void setStayOtamaDelete();
-    /* 806B0114 */ bool checkBombEat();
-    /* 806B01B4 */ bool isShutterOpen();
-    /* 806B0200 */ void executeWait();
-    /* 806B0368 */ void executeCry();
-    /* 806B063C */ void executeShake();
-    /* 806B07C4 */ void executeWalk();
-    /* 806B0E9C */ void executeJump();
-    /* 806B177C */ void executeDown();
-    /* 806B1B60 */ void executeSearch();
-    /* 806B1BEC */ void executeDamage();
-    /* 806B1D48 */ void executeBombDamage();
-    /* 806B1F78 */ void executeDeath();
-    /* 806B28E4 */ bool pointInSight(cXyz*);
-    /* 806B29D4 */ void executeOpening();
-    /* 806B3B08 */ void calcCamera();
-    /* 806B40D8 */ void calcBoxAndTuba();
-    /* 806B4724 */ void action();
-    /* 806B49F0 */ void mtx_set();
-    /* 806B4B24 */ void cc_set();
-    /* 806B4FD8 */ int execute();
-    /* 806B5158 */ int _delete();
-    /* 806B5214 */ int CreateHeap();
-    /* 806B5460 */ cPhs__Step create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int ctrlJointTuba(J3DJoint*, J3DModel*);
+    static int JointCallBackTuba(J3DJoint*, int);
+    int draw();
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    void damage_check();
+    void setStabPos();
+    bool checkBeforeBg(f32);
+    void checkTongueBg();
+    void checkWaterSurface();
+    void setSmallWaterEffect();
+    void setLargeWaterEffect();
+    void setHamonEffect(int);
+    void setJumpEffect();
+    void setJumpSizukuEffect();
+    void setDamageShibukiEffect(int);
+    void setDamageYodareEffect(int);
+    void setSwingEffect();
+    void setStepEffect();
+    void setBombEffect();
+    void setBombSmokeEffect();
+    void setDeadShibukiEffect();
+    void setDeadYodareEffect();
+    void setBoxTubaEffect();
+    void setBoxTubaLandEffect();
+    int getNumberOfOtama();
+    void setStayOtamaFall();
+    void setStayOtamaDelete();
+    bool checkBombEat();
+    bool isShutterOpen();
+    void executeWait();
+    void executeCry();
+    void executeShake();
+    void executeWalk();
+    void executeJump();
+    void executeDown();
+    void executeSearch();
+    void executeDamage();
+    void executeBombDamage();
+    void executeDeath();
+    bool pointInSight(cXyz*);
+    void executeOpening();
+    void calcCamera();
+    void calcBoxAndTuba();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     bool isFlyingAttack() { return mFlyingAttack; }
     bool isFlyingAttackLand() { return mFlyingAttackLand; }
diff --git a/include/d/actor/d_a_e_fb.h b/include/d/actor/d_a_e_fb.h
index dcbcff7259..6289c62a29 100644
--- a/include/d/actor/d_a_e_fb.h
+++ b/include/d/actor/d_a_e_fb.h
@@ -17,28 +17,28 @@
  */
 class daE_FB_c : public fopEn_enemy_c {
 public:
-    /* 806B6520 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806B65C0 */ static int JointCallBack(J3DJoint*, int);
-    /* 806B660C */ int draw();
-    /* 806B67E0 */ void setBck(int, u8, f32, f32);
-    /* 806B688C */ void setActionMode(int, int);
-    /* 806B6898 */ void damage_check();
-    /* 806B6D20 */ bool mBgLineCheck();
-    /* 806B6DF4 */ bool search_check();
-    /* 806B6F40 */ void executeWait();
-    /* 806B70FC */ void executeAttack();
-    /* 806B78A0 */ void executeDamage();
-    /* 806B7B88 */ void executeBullet();
-    /* 806B7DDC */ void action();
-    /* 806B80A4 */ void mtx_set();
-    /* 806B811C */ void cc_set();
-    /* 806B82B4 */ void normal_eff_set();
-    /* 806B83F0 */ void dead_eff_set();
-    /* 806B8518 */ int execute();
-    /* 806B85C8 */ int _delete();
-    /* 806B8678 */ int CreateHeap();
-    /* 806B88E0 */ cPhs__Step create();
-    /* 806B8C1C */ daE_FB_c();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    bool mBgLineCheck();
+    bool search_check();
+    void executeWait();
+    void executeAttack();
+    void executeDamage();
+    void executeBullet();
+    void action();
+    void mtx_set();
+    void cc_set();
+    void normal_eff_set();
+    void dead_eff_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
+    daE_FB_c();
 
 private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
@@ -81,8 +81,8 @@ STATIC_ASSERT(sizeof(daE_FB_c) == 0xce8);
 
 class daE_FB_HIO_c : public JORReflexible {
 public:
-    /* 806B64AC */ daE_FB_HIO_c();
-    /* 806B8EE4 */ virtual ~daE_FB_HIO_c() {}
+    daE_FB_HIO_c();
+    virtual ~daE_FB_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
diff --git a/include/d/actor/d_a_e_fk.h b/include/d/actor/d_a_e_fk.h
index 402848c5cd..390e4e3420 100644
--- a/include/d/actor/d_a_e_fk.h
+++ b/include/d/actor/d_a_e_fk.h
@@ -17,40 +17,40 @@
  */
 class daE_FK_c : public fopEn_enemy_c {
 public:
-    /* 806B93CC */ int CreateHeap();
-    /* 806B9534 */ void initBodySph();
-    /* 806B95BC */ void initSwordSph();
-    /* 806B9670 */ void SetBodySph();
-    /* 806B97A4 */ void SetSwordSph();
-    /* 806B98C4 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806B9A28 */ void SetAnm(int, int, f32, f32);
-    /* 806B9AD8 */ void Yazirushi();
-    /* 806B9B2C */ void SpeedSet();
-    /* 806B9BB4 */ void TnNeckSet(s16);
-    /* 806B9C14 */ void HsAngleSet();
-    /* 806B9C18 */ void SpeedChk();
-    /* 806B9C1C */ void SetAnmSpeed();
-    /* 806B9C20 */ void TgChk();
-    /* 806B9D00 */ void AtChk();
-    /* 806B9D7C */ void OnAt();
-    /* 806B9DA4 */ void R_MoveAction();
-    /* 806B9E6C */ void StartAction();
-    /* 806B9F20 */ void RunAction();
-    /* 806BA004 */ void Action();
-    /* 806BA024 */ void DeathAction();
-    /* 806BA188 */ void DamageChk();
-    /* 806BA24C */ void DamageAction();
-    /* 806BA330 */ bool checkViewArea();
-    /* 806BA3B4 */ void AttackAction();
-    /* 806BA61C */ void UpDown();
-    /* 806BA6EC */ int Execute();
-    /* 806BABB8 */ void At_Check(int);
-    /* 806BACEC */ int Draw();
-    /* 806BADB4 */ int Delete();
-    /* 806BAE1C */ void setBaseMtx();
-    /* 806BAEB0 */ void setEfMtx();
-    /* 806BAF74 */ void CreateChk();
-    /* 806BB004 */ int Create();
+    int CreateHeap();
+    void initBodySph();
+    void initSwordSph();
+    void SetBodySph();
+    void SetSwordSph();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void SetAnm(int, int, f32, f32);
+    void Yazirushi();
+    void SpeedSet();
+    void TnNeckSet(s16);
+    void HsAngleSet();
+    void SpeedChk();
+    void SetAnmSpeed();
+    void TgChk();
+    void AtChk();
+    void OnAt();
+    void R_MoveAction();
+    void StartAction();
+    void RunAction();
+    void Action();
+    void DeathAction();
+    void DamageChk();
+    void DamageAction();
+    bool checkViewArea();
+    void AttackAction();
+    void UpDown();
+    int Execute();
+    void At_Check(int);
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    void setEfMtx();
+    void CreateChk();
+    int Create();
 
 private:
     /* 0x5AC */ u8 field_0x5AC[0x5B1 - 0x5AC];
diff --git a/include/d/actor/d_a_e_fm.h b/include/d/actor/d_a_e_fm.h
index e4d949ff1c..4fb88e4c63 100644
--- a/include/d/actor/d_a_e_fm.h
+++ b/include/d/actor/d_a_e_fm.h
@@ -45,7 +45,7 @@ struct chain_s {
  */
 class e_fm_class : public fopEn_enemy_c {
 public:
-    /* 804F9B64 */ e_fm_class();
+    e_fm_class();
 
     BOOL checkCameraFree() { return field_0x1b07c; }
 
diff --git a/include/d/actor/d_a_e_fz.h b/include/d/actor/d_a_e_fz.h
index 3dc46b69c2..e0b838aa51 100644
--- a/include/d/actor/d_a_e_fz.h
+++ b/include/d/actor/d_a_e_fz.h
@@ -42,26 +42,26 @@ enum daE_FZ_Action {
  */
 class daE_FZ_c : public fopEn_enemy_c {
 public:
-    /* 806BE9D4 */ s32 draw();
-    /* 806BEAF8 */ void setActionMode(int, int);
-    /* 806BEB04 */ void setReflectAngle();
-    /* 806BEBA0 */ void mBoundSoundset();
-    /* 806BEC08 */ void deadnextSet(bool);
-    /* 806BED34 */ void damage_check();
-    /* 806BF444 */ bool way_gake_check();
-    /* 806BF58C */ void executeWait();
-    /* 806BF8E8 */ void executeMove();
-    /* 806BFA64 */ void executeAttack();
-    /* 806BFB60 */ void executeDamage();
-    /* 806BFF94 */ void executeRollMove();
-    /* 806C0224 */ void action();
-    /* 806C06DC */ void mtx_set();
-    /* 806C0760 */ void cc_set();
-    /* 806C08C4 */ s32 execute();
-    /* 806C0B20 */ void demoDelete();
-    /* 806C0B94 */ s32 _delete();
-    /* 806C0C28 */ s32 CreateHeap();
-    /* 806C0CD0 */ s32 create();
+    s32 draw();
+    void setActionMode(int, int);
+    void setReflectAngle();
+    void mBoundSoundset();
+    void deadnextSet(bool);
+    void damage_check();
+    bool way_gake_check();
+    void executeWait();
+    void executeMove();
+    void executeAttack();
+    void executeDamage();
+    void executeRollMove();
+    void action();
+    void mtx_set();
+    void cc_set();
+    s32 execute();
+    void demoDelete();
+    s32 _delete();
+    s32 CreateHeap();
+    s32 create();
 
 private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;   /**< Phase request used when creating the actor. */
diff --git a/include/d/actor/d_a_e_ga.h b/include/d/actor/d_a_e_ga.h
index aaf31d62b6..1b357771c6 100644
--- a/include/d/actor/d_a_e_ga.h
+++ b/include/d/actor/d_a_e_ga.h
@@ -44,8 +44,8 @@ STATIC_ASSERT(sizeof(e_ga_class) == 0x4d7c);
 
 class daE_Ga_HIO_c {
 public:
-    /* 804FB0EC */ daE_Ga_HIO_c();
-    /* 804FBAF8 */ virtual ~daE_Ga_HIO_c() {}
+    daE_Ga_HIO_c();
+    virtual ~daE_Ga_HIO_c() {}
 
     /* 0x4 */ s8 id;
     /* 0x8 */ f32 base_size;
diff --git a/include/d/actor/d_a_e_gb.h b/include/d/actor/d_a_e_gb.h
index ca3b09a1ee..6cc1158f42 100644
--- a/include/d/actor/d_a_e_gb.h
+++ b/include/d/actor/d_a_e_gb.h
@@ -15,7 +15,7 @@
  */
 class e_gb_class {
 public:
-    /* 806C6B94 */ e_gb_class();
+    e_gb_class();
 
     /* 0x000 */ fopEn_enemy_c actor;
     /* 0x5AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_ge.h b/include/d/actor/d_a_e_ge.h
index c32dca6e11..c202e75231 100644
--- a/include/d/actor/d_a_e_ge.h
+++ b/include/d/actor/d_a_e_ge.h
@@ -18,38 +18,38 @@ class daE_GE_c : public fopEn_enemy_c {
 public:
     typedef void (daE_GE_c::*actionFunc)();
 
-    /* 806C7AB8 */ void bckSet(int, f32, u8, f32);
-    /* 806C7B5C */ bool bckCheck(int);
-    /* 806C7BB8 */ int draw();
-    /* 806C7CAC */ bool checkBeforeBg(int, f32);
-    /* 806C80F8 */ void setActionMode(int);
-    /* 806C8130 */ void damage_check();
-    /* 806C8374 */ bool checkOtherAttacker();
-    /* 806C83F8 */ bool searchNextAttacker();
-    /* 806C84A0 */ bool checkCircleSpeedAdd(cXyz*, cXyz*);
-    /* 806C8518 */ void setAddCalcSpeed(cXyz&, cXyz const&, f32, f32, f32, f32);
-    /* 806C88C8 */ cXyz calcCircleFly(cXyz*, cXyz*, s16, f32, s16, f32);
-    /* 806C89C0 */ void executeWait();
-    /* 806C8C20 */ void executeFly();
-    /* 806C9150 */ bool checkAttackPossible(s16, bool);
-    /* 806C921C */ void executeAttack();
-    /* 806C9F04 */ void setBackAnime(int);
-    /* 806CA024 */ void executeBack();
-    /* 806CAA34 */ void executeDown();
-    /* 806CADCC */ void setSurpriseTime(s16);
-    /* 806CADF4 */ void setSurprise();
-    /* 806CAE58 */ void executeSurprise();
-    /* 806CB280 */ void setCaw();
-    /* 806CB2F0 */ void executeCaw();
-    /* 806CB6FC */ void executeWind();
-    /* 806CBAB8 */ void executeShield();
-    /* 806CBC38 */ void action();
-    /* 806CBE98 */ void mtx_set();
-    /* 806CBEF0 */ void cc_set();
-    /* 806CC068 */ int execute();
-    /* 806CC1E4 */ int _delete();
-    /* 806CC278 */ int CreateHeap();
-    /* 806CC390 */ int create();
+    void bckSet(int, f32, u8, f32);
+    bool bckCheck(int);
+    int draw();
+    bool checkBeforeBg(int, f32);
+    void setActionMode(int);
+    void damage_check();
+    bool checkOtherAttacker();
+    bool searchNextAttacker();
+    bool checkCircleSpeedAdd(cXyz*, cXyz*);
+    void setAddCalcSpeed(cXyz&, cXyz const&, f32, f32, f32, f32);
+    cXyz calcCircleFly(cXyz*, cXyz*, s16, f32, s16, f32);
+    void executeWait();
+    void executeFly();
+    bool checkAttackPossible(s16, bool);
+    void executeAttack();
+    void setBackAnime(int);
+    void executeBack();
+    void executeDown();
+    void setSurpriseTime(s16);
+    void setSurprise();
+    void executeSurprise();
+    void setCaw();
+    void executeCaw();
+    void executeWind();
+    void executeShield();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     s16 getSurpriseTime() { return mSurpriseTime; }
 
diff --git a/include/d/actor/d_a_e_gi.h b/include/d/actor/d_a_e_gi.h
index ad86ca787b..adadfd03b8 100644
--- a/include/d/actor/d_a_e_gi.h
+++ b/include/d/actor/d_a_e_gi.h
@@ -17,32 +17,32 @@
  */
 class daE_GI_c : public fopEn_enemy_c {
 public:
-    /* 806CD4F4 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806CD594 */ static int JointCallBack(J3DJoint*, int);
-    /* 806CD5E0 */ int draw();
-    /* 806CD868 */ void setBck(int, u8, f32, f32);
-    /* 806CD90C */ void setActionMode(int, int);
-    /* 806CD938 */ void damage_check();
-    /* 806CDD1C */ void setWeaponAtBit(u8);
-    /* 806CDD8C */ bool setCryStop();
-    /* 806CDED8 */ void setAttackEffect();
-    /* 806CDFB0 */ void setDragSwordEffect();
-    /* 806CE0D4 */ void setDeathSmokeEffect();
-    /* 806CE184 */ void setDamageEffect();
-    /* 806CE3C4 */ void executeSleep();
-    /* 806CE6AC */ void executeWait();
-    /* 806CE858 */ void executeChase();
-    /* 806CEC94 */ void executeAttack();
-    /* 806CF0B8 */ void executeDamage();
-    /* 806CF410 */ void executeBiteDamage();
-    /* 806CF720 */ void PushButtonCount();
-    /* 806CF878 */ void action();
-    /* 806CFB60 */ void mtx_set();
-    /* 806CFBF0 */ void cc_set();
-    /* 806CFDF4 */ int execute();
-    /* 806D0054 */ int _delete();
-    /* 806D00E8 */ int CreateHeap();
-    /* 806D027C */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    void setWeaponAtBit(u8);
+    bool setCryStop();
+    void setAttackEffect();
+    void setDragSwordEffect();
+    void setDeathSmokeEffect();
+    void setDamageEffect();
+    void executeSleep();
+    void executeWait();
+    void executeChase();
+    void executeAttack();
+    void executeDamage();
+    void executeBiteDamage();
+    void PushButtonCount();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     bool isBattleOn() { return mIsBattleOn; }
     bool isAttackStart() { return mIsAttackStart; }
diff --git a/include/d/actor/d_a_e_gm.h b/include/d/actor/d_a_e_gm.h
index eeb65acaf6..d5e03ac68c 100644
--- a/include/d/actor/d_a_e_gm.h
+++ b/include/d/actor/d_a_e_gm.h
@@ -19,39 +19,39 @@ class daE_GM_c : public fopEn_enemy_c {
 public:
     typedef void (daE_GM_c::*actionFunc)();
     
-    /* 806D12C8 */ void setAction(actionFunc);
-    /* 806D136C */ void action();
-    /* 806D1580 */ void egg_wait();
-    /* 806D1A9C */ void appear();
-    /* 806D1CC0 */ void walk();
-    /* 806D21A4 */ void create_item();
-    /* 806D2294 */ void pechanko_damage();
-    /* 806D24C0 */ void wait();
-    /* 806D25E8 */ void egg_damage();
-    /* 806D289C */ void setDeathLightEffect();
-    /* 806D2940 */ void setEggBreakEffect();
-    /* 806D29E4 */ void damage();
-    /* 806D2DD4 */ void core_damage();
-    /* 806D3308 */ void core_delwait();
-    /* 806D344C */ void core_piku();
-    /* 806D35E4 */ void core_pechanko_damage();
-    /* 806D378C */ void hook();
-    /* 806D398C */ void rebound();
-    /* 806D3EC4 */ void walk2();
-    /* 806D4288 */ void dead_wait();
-    /* 806D4468 */ void core_wait();
-    /* 806D462C */ void core_escape();
-    /* 806D4D1C */ BOOL chaseCheck();
-    /* 806D4EF4 */ void normal_wait();
-    /* 806D545C */ void normal_chase();
-    /* 806D578C */ void mtx_set();
-    /* 806D59D0 */ void cc_set();
-    /* 806D5D54 */ int draw();
-    /* 806D631C */ void damage_check();
-    /* 806D6708 */ int execute();
-    /* 806D6980 */ int _delete();
-    /* 806D6AC8 */ int CreateHeap();
-    /* 806D6CF0 */ cPhs__Step create();
+    void setAction(actionFunc);
+    void action();
+    void egg_wait();
+    void appear();
+    void walk();
+    void create_item();
+    void pechanko_damage();
+    void wait();
+    void egg_damage();
+    void setDeathLightEffect();
+    void setEggBreakEffect();
+    void damage();
+    void core_damage();
+    void core_delwait();
+    void core_piku();
+    void core_pechanko_damage();
+    void hook();
+    void rebound();
+    void walk2();
+    void dead_wait();
+    void core_wait();
+    void core_escape();
+    BOOL chaseCheck();
+    void normal_wait();
+    void normal_chase();
+    void mtx_set();
+    void cc_set();
+    int draw();
+    void damage_check();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     void InstantKill() { field_0xa76 = 1; }
     u8 CheckDeath() { return field_0xa68; }
diff --git a/include/d/actor/d_a_e_gob.h b/include/d/actor/d_a_e_gob.h
index 04b8137cd4..728435e7b1 100644
--- a/include/d/actor/d_a_e_gob.h
+++ b/include/d/actor/d_a_e_gob.h
@@ -17,7 +17,7 @@
  */
 class e_gob_class : public fopEn_enemy_c {
 public:
-    /* 806DEA10 */ e_gob_class();
+    e_gob_class();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_e_gs.h b/include/d/actor/d_a_e_gs.h
index a1310adac7..c64cb8e6f9 100644
--- a/include/d/actor/d_a_e_gs.h
+++ b/include/d/actor/d_a_e_gs.h
@@ -39,8 +39,8 @@ STATIC_ASSERT(sizeof(e_gs_class) == 0x6bc);
 
 class daE_GS_HIO_c : public JORReflexible {
 public:
-    /* 806DF46C */ daE_GS_HIO_c();
-    /* 806DFD5C */ virtual ~daE_GS_HIO_c() {}
+    daE_GS_HIO_c();
+    virtual ~daE_GS_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_hm.h b/include/d/actor/d_a_e_hm.h
index cc6ba56685..85f6e5422c 100644
--- a/include/d/actor/d_a_e_hm.h
+++ b/include/d/actor/d_a_e_hm.h
@@ -15,56 +15,56 @@
  */
 class daE_HM_c : public fopEn_enemy_c {
 public:
-    /* 806E043C */ int CreateHeap();
-    /* 806E06C0 */ void initCcCylinder();
-    /* 806E074C */ void setCcCylinder();
-    /* 806E0958 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806E0DB0 */ void Particle_Set(u32&, u16);
-    /* 806E0E8C */ void SetAnm(int, int, f32, f32);
-    /* 806E0F38 */ s16 W_TargetAngle(cXyz, cXyz);
-    /* 806E0FF4 */ void W_DeathSpSet();
-    /* 806E1118 */ void W_DeathAction();
-    /* 806E1370 */ void W_DeathMotion();
-    /* 806E155C */ int W_MoveCheckWall();
-    /* 806E18A0 */ int W_WallCheck();
-    /* 806E1A00 */ void WallExecute();
-    /* 806E1AA0 */ void WallCreateExecute();
-    /* 806E1B5C */ void CreateExecute();
-    /* 806E1C28 */ void Tyakuchi_Set();
-    /* 806E1E78 */ void UpDeathAction();
-    /* 806E20FC */ void UpMoveAction();
-    /* 806E2410 */ void UpWaitAction();
-    /* 806E2568 */ void UpExecute();
-    /* 806E25E8 */ int WallCheck();
-    /* 806E2694 */ int MoveCheck();
-    /* 806E29B8 */ void ShippuAction();
-    /* 806E2B80 */ void ShieldMotion();
-    /* 806E2C50 */ void ShieldAction();
-    /* 806E2D08 */ void DeathSpSet();
-    /* 806E2D40 */ void DeathMotion();
-    /* 806E2EA0 */ void DeathCutDown();
-    /* 806E2F5C */ void DeathAction();
-    /* 806E31B0 */ void AttackAfter();
-    /* 806E3208 */ void AttackMotion();
-    /* 806E3420 */ void AttackAction();
-    /* 806E34C8 */ void FreeMove();
-    /* 806E3690 */ void LinkSearch();
-    /* 806E3724 */ void WaitAction();
-    /* 806E37F4 */ void MemberClear();
-    /* 806E3800 */ void DownExecute();
-    /* 806E3884 */ void At_Check();
-    /* 806E39E8 */ void Obj_Damage();
-    /* 806E3BE4 */ void ActionMode();
-    /* 806E4008 */ void Yazirushi();
-    /* 806E40B8 */ void setStabPos();
-    /* 806E40D4 */ int Execute();
-    /* 806E434C */ int Draw();
-    /* 806E44F0 */ int Delete();
-    /* 806E4558 */ void setBaseMtx();
-    /* 806E4620 */ void CheckRoof();
-    /* 806E486C */ void CheckWall();
-    /* 806E4CCC */ void CreateStyle();
-    /* 806E4E64 */ int Create();
+    int CreateHeap();
+    void initCcCylinder();
+    void setCcCylinder();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void Particle_Set(u32&, u16);
+    void SetAnm(int, int, f32, f32);
+    s16 W_TargetAngle(cXyz, cXyz);
+    void W_DeathSpSet();
+    void W_DeathAction();
+    void W_DeathMotion();
+    int W_MoveCheckWall();
+    int W_WallCheck();
+    void WallExecute();
+    void WallCreateExecute();
+    void CreateExecute();
+    void Tyakuchi_Set();
+    void UpDeathAction();
+    void UpMoveAction();
+    void UpWaitAction();
+    void UpExecute();
+    int WallCheck();
+    int MoveCheck();
+    void ShippuAction();
+    void ShieldMotion();
+    void ShieldAction();
+    void DeathSpSet();
+    void DeathMotion();
+    void DeathCutDown();
+    void DeathAction();
+    void AttackAfter();
+    void AttackMotion();
+    void AttackAction();
+    void FreeMove();
+    void LinkSearch();
+    void WaitAction();
+    void MemberClear();
+    void DownExecute();
+    void At_Check();
+    void Obj_Damage();
+    void ActionMode();
+    void Yazirushi();
+    void setStabPos();
+    int Execute();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    void CheckRoof();
+    void CheckWall();
+    void CreateStyle();
+    int Create();
 private:
     /* 0x5AC */ u8 field_0x5ac;
     /* 0x5AD */ u8 field_0x5ad;
diff --git a/include/d/actor/d_a_e_hp.h b/include/d/actor/d_a_e_hp.h
index 74d601a1c0..8941f1e2a6 100644
--- a/include/d/actor/d_a_e_hp.h
+++ b/include/d/actor/d_a_e_hp.h
@@ -16,30 +16,30 @@
  */
 class daE_HP_c : public fopEn_enemy_c {
 public:
-    /* 806E5E30 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806E5ED0 */ static int JointCallBack(J3DJoint*, int);
-    /* 806E5F1C */ int LampCtrlJoint(J3DJoint*, J3DModel*);
-    /* 806E5FCC */ static int LampJointCallBack(J3DJoint*, int);
-    /* 806E6018 */ int draw();
-    /* 806E6514 */ void setBck(int, u8, f32, f32);
-    /* 806E65C0 */ void setActionMode(int, int);
-    /* 806E65CC */ bool mChkDistance(f32);
-    /* 806E673C */ void damage_check();
-    /* 806E6948 */ void executeWait();
-    /* 806E6C74 */ void executeMove();
-    /* 806E6ED8 */ void executeRetMove();
-    /* 806E7228 */ void executeAttack();
-    /* 806E7574 */ void executeDamage();
-    /* 806E77C0 */ void executeDown();
-    /* 806E7E94 */ void executeDead();
-    /* 806E814C */ void action();
-    /* 806E89C0 */ void mtx_set();
-    /* 806E8DE0 */ void cc_set();
-    /* 806E8FEC */ int execute();
-    /* 806E9198 */ int _delete();
-    /* 806E9240 */ int CreateHeap();
-    /* 806E951C */ int create();
-    /* 806E9900 */ daE_HP_c();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int LampCtrlJoint(J3DJoint*, J3DModel*);
+    static int LampJointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    bool mChkDistance(f32);
+    void damage_check();
+    void executeWait();
+    void executeMove();
+    void executeRetMove();
+    void executeAttack();
+    void executeDamage();
+    void executeDown();
+    void executeDead();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
+    daE_HP_c();
 
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
diff --git a/include/d/actor/d_a_e_hz.h b/include/d/actor/d_a_e_hz.h
index 9cea59c1f6..9d6a6ce763 100644
--- a/include/d/actor/d_a_e_hz.h
+++ b/include/d/actor/d_a_e_hz.h
@@ -20,48 +20,48 @@
  */
 class daE_HZ_c : public fopEn_enemy_c {
 public:
-    /* 806EA690 */ void setBck(int, u8, f32, f32);
-    /* 806EA734 */ bool checkBck(int);
-    /* 806EA790 */ int draw();
-    /* 806EAADC */ void setActionMode(int);
-    /* 806EAB68 */ bool checkHideStart();
-    /* 806EAEDC */ bool checkAttackStart();
-    /* 806EB05C */ bool checkArrowCharge();
-    /* 806EB0A4 */ void setTgSetBit(int);
-    /* 806EB0FC */ bool isWait();
-    /* 806EB13C */ void checkFall();
-    /* 806EB2E8 */ void setCloseSmokeEffect();
-    /* 806EB3EC */ void executeWait();
-    /* 806EB7B0 */ f32 getHideSpeed();
-    /* 806EB818 */ void executeHide();
-    /* 806EBD44 */ void executeAttack();
-    /* 806EC068 */ void initBackWalk();
-    /* 806EC348 */ void executeAway();
-    /* 806ECAEC */ void setWindEnd();
-    /* 806ECB64 */ void executeWind();
-    /* 806ED5B0 */ void executeChance();
-    /* 806ED6C8 */ void initRollDamage();
-    /* 806ED7A8 */ bool doRollDamage();
-    /* 806ED8A4 */ void executeDamage();
-    /* 806EDAA8 */ void executeDeath();
-    /* 806EDDCC */ void setWindChanceEnd();
-    /* 806EDDE8 */ void executeWindChance();
-    /* 806EE120 */ void executeWindWalk();
-    /* 806EE2A4 */ void setWaterEffect();
-    /* 806EE3BC */ void executeWaterDeath();
-    /* 806EE820 */ void executeDeathWait();
-    /* 806EE978 */ void damage_check();
-    /* 806EEE10 */ bool checkWaterSurface();
-    /* 806EEEE4 */ void action();
-    /* 806EF144 */ void mtx_set();
-    /* 806EF2C8 */ void cc_set();
-    /* 806EF46C */ int execute();
-    /* 806EF6B4 */ int _delete();
-    /* 806EF770 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806EF880 */ static int JointCallBack(J3DJoint*, int);
-    /* 806EF8CC */ int CreateHeap();
-    /* 806EFB54 */ void setInitPos();
-    /* 806EFC18 */ int create();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    int draw();
+    void setActionMode(int);
+    bool checkHideStart();
+    bool checkAttackStart();
+    bool checkArrowCharge();
+    void setTgSetBit(int);
+    bool isWait();
+    void checkFall();
+    void setCloseSmokeEffect();
+    void executeWait();
+    f32 getHideSpeed();
+    void executeHide();
+    void executeAttack();
+    void initBackWalk();
+    void executeAway();
+    void setWindEnd();
+    void executeWind();
+    void executeChance();
+    void initRollDamage();
+    bool doRollDamage();
+    void executeDamage();
+    void executeDeath();
+    void setWindChanceEnd();
+    void executeWindChance();
+    void executeWindWalk();
+    void setWaterEffect();
+    void executeWaterDeath();
+    void executeDeathWait();
+    void damage_check();
+    bool checkWaterSurface();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int CreateHeap();
+    void setInitPos();
+    int create();
 
 private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_e_hzelda.h b/include/d/actor/d_a_e_hzelda.h
index 77e7b5ec6b..f1232de283 100644
--- a/include/d/actor/d_a_e_hzelda.h
+++ b/include/d/actor/d_a_e_hzelda.h
@@ -102,8 +102,8 @@ STATIC_ASSERT(sizeof(e_hzelda_class) == 0x1460);
 
 class daE_HZELDA_HIO_c {
 public:
-    /* 806F0D4C */ daE_HZELDA_HIO_c();
-    /* 806F546C */ virtual ~daE_HZELDA_HIO_c() {}
+    daE_HZELDA_HIO_c();
+    virtual ~daE_HZELDA_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mModelSize;
diff --git a/include/d/actor/d_a_e_is.h b/include/d/actor/d_a_e_is.h
index e82e6ef2fe..42a25d4eb4 100644
--- a/include/d/actor/d_a_e_is.h
+++ b/include/d/actor/d_a_e_is.h
@@ -63,8 +63,8 @@ STATIC_ASSERT(sizeof(e_is_class) == 0xcf8);
 
 class daE_IS_HIO_c : public JORReflexible {
 public:
-    /* 806F5A4C */ daE_IS_HIO_c();
-    /* 806F7AC4 */ virtual ~daE_IS_HIO_c() {}
+    daE_IS_HIO_c();
+    virtual ~daE_IS_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_kk.h b/include/d/actor/d_a_e_kk.h
index 3b52ffac90..890da0eba2 100644
--- a/include/d/actor/d_a_e_kk.h
+++ b/include/d/actor/d_a_e_kk.h
@@ -18,36 +18,36 @@
  */
 class daE_KK_c : public fopEn_enemy_c {
 public:
-    /* 806FA75C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806FA7FC */ static int JointCallBack(J3DJoint*, int);
-    /* 806FA848 */ int draw();
-    /* 806FAA68 */ void setBck(int, u8, f32, f32);
-    /* 806FAB14 */ void setWeaponBck(int, u8, f32, f32);
-    /* 806FABC0 */ bool mCutTypeCheck(int);
-    /* 806FAC80 */ void setActionMode(int, int);
-    /* 806FAC8C */ void damage_check();
-    /* 806FB2EC */ void nextActionCheck();
-    /* 806FB4F4 */ bool way_gake_check();
-    /* 806FB6C0 */ void mDeadEffSet(cXyz&);
-    /* 806FB7D8 */ void executeWait();
-    /* 806FB908 */ void executeIcicleWait();
-    /* 806FBB1C */ void executeWalk();
-    /* 806FBE98 */ void executeSpearThrow();
-    /* 806FC370 */ void executeBackWalk();
-    /* 806FC75C */ void executeYoroke();
-    /* 806FC8F4 */ void executeGuard();
-    /* 806FCA28 */ void executeDamage();
-    /* 806FCC34 */ void executeAttack();
-    /* 806FD068 */ void executeDead();
-    /* 806FD294 */ void executeWeaponMove();
-    /* 806FD930 */ void action();
-    /* 806FDD0C */ void mtx_set();
-    /* 806FDF0C */ void weapon_mtx_set();
-    /* 806FE0B8 */ void cc_set();
-    /* 806FE2A8 */ int execute();
-    /* 806FE3E0 */ int _delete();
-    /* 806FE480 */ int CreateHeap();
-    /* 806FE6B8 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setWeaponBck(int, u8, f32, f32);
+    bool mCutTypeCheck(int);
+    void setActionMode(int, int);
+    void damage_check();
+    void nextActionCheck();
+    bool way_gake_check();
+    void mDeadEffSet(cXyz&);
+    void executeWait();
+    void executeIcicleWait();
+    void executeWalk();
+    void executeSpearThrow();
+    void executeBackWalk();
+    void executeYoroke();
+    void executeGuard();
+    void executeDamage();
+    void executeAttack();
+    void executeDead();
+    void executeWeaponMove();
+    void action();
+    void mtx_set();
+    void weapon_mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
 private:
     /* 0x05AC */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_e_kr.h b/include/d/actor/d_a_e_kr.h
index b59b54d572..9aa2020539 100644
--- a/include/d/actor/d_a_e_kr.h
+++ b/include/d/actor/d_a_e_kr.h
@@ -16,7 +16,7 @@
  */
 class e_kr_class {
 public:
-    /* 80705004 */ e_kr_class();
+    e_kr_class();
 
     s32 getId() { return field_0xf00; }
     s32 checkBombDrop() { return field_0xf04; }
diff --git a/include/d/actor/d_a_e_mb.h b/include/d/actor/d_a_e_mb.h
index a26282caab..f36c744879 100644
--- a/include/d/actor/d_a_e_mb.h
+++ b/include/d/actor/d_a_e_mb.h
@@ -50,8 +50,8 @@ STATIC_ASSERT(sizeof(e_mb_class) == 0x8cc);
 
 class daE_MB_HIO_c : public JORReflexible {
 public:
-    /* 8070616C */ daE_MB_HIO_c();
-    /* 8070882C */ virtual ~daE_MB_HIO_c() {}
+    daE_MB_HIO_c();
+    virtual ~daE_MB_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_e_md.h b/include/d/actor/d_a_e_md.h
index d43a9199ea..440b22b477 100644
--- a/include/d/actor/d_a_e_md.h
+++ b/include/d/actor/d_a_e_md.h
@@ -16,21 +16,21 @@
  */
 class daE_MD_c : public fopEn_enemy_c {
 public:
-    /* 80708DF8 */ void initCcCylinder();
-    /* 80708E70 */ void setCcCylinder(f32);
-    /* 807091F0 */ void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
-    /* 807092C8 */ void At_Check();
-    /* 80709378 */ void CheckHit();
-    /* 8070992C */ void WaitAction();
-    /* 8070994C */ void HalfBreakAction();
-    /* 80709A04 */ bool VibAction();
-    /* 80709ABC */ void DummyAction();
-    /* 80709BB4 */ void RealAction();
-    /* 80709C3C */ void Action();
-    /* 80709CFC */ int Execute();
-    /* 80709D58 */ int Delete();
-    /* 80709DA8 */ void setBaseMtx();
-    /* 8070A044 */ int create();
+    void initCcCylinder();
+    void setCcCylinder(f32);
+    void SetAnm(mDoExt_McaMorfSO*, int, int, f32, f32);
+    void At_Check();
+    void CheckHit();
+    void WaitAction();
+    void HalfBreakAction();
+    bool VibAction();
+    void DummyAction();
+    void RealAction();
+    void Action();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
+    int create();
 
     inline int CreateHeap();
     inline int Draw();
diff --git a/include/d/actor/d_a_e_mf.h b/include/d/actor/d_a_e_mf.h
index 0260ba2370..62df4a3bf7 100644
--- a/include/d/actor/d_a_e_mf.h
+++ b/include/d/actor/d_a_e_mf.h
@@ -16,7 +16,7 @@
  */
 class e_mf_class {
 public:
-    /* 80712F20 */ e_mf_class();
+    e_mf_class();
 
     /* 0x0000 */ fopEn_enemy_c actor;
     /* 0x05AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_nest.h b/include/d/actor/d_a_e_nest.h
index 5692e5cb45..dfd5b4f77d 100644
--- a/include/d/actor/d_a_e_nest.h
+++ b/include/d/actor/d_a_e_nest.h
@@ -9,8 +9,8 @@
 #include "Z2AudioLib/Z2Creature.h"
 
 struct nest_hahen_s {
-    /* 805044E8 */ nest_hahen_s() {}
-    /* 805044AC */ ~nest_hahen_s() {}
+    nest_hahen_s() {}
+    ~nest_hahen_s() {}
 
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz mPos;
@@ -112,8 +112,8 @@ STATIC_ASSERT(sizeof(e_nest_class) == 0xCF8);
 
 class daE_Nest_HIO_c {
 public:
-    /* 80500F8C */ daE_Nest_HIO_c();
-    /* 80504634 */ virtual ~daE_Nest_HIO_c() {}
+    daE_Nest_HIO_c();
+    virtual ~daE_Nest_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScale;
diff --git a/include/d/actor/d_a_e_oc.h b/include/d/actor/d_a_e_oc.h
index 6466f0b16d..c3306376fd 100644
--- a/include/d/actor/d_a_e_oc.h
+++ b/include/d/actor/d_a_e_oc.h
@@ -19,65 +19,65 @@ class daRotBridge_c;
 
 class daE_OC_c : public fopEn_enemy_c {
 public:
-    /* 8072C630 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8072C6E8 */ static int JointCallBack(J3DJoint*, int);
-    /* 8072C734 */ int draw();
-    /* 8072CBD4 */ s16 getVisionAngle(fopAc_ac_c*);
-    /* 8072CC10 */ void searchOtherOc();
-    /* 8072CDA8 */ bool setWatchMode();
-    /* 8072CE00 */ bool searchPlayer();
-    /* 8072CF90 */ bool searchPlayer2();
-    /* 8072D100 */ bool searchPlayerShakeHead();
-    /* 8072D1DC */ bool searchSound();
-    /* 8072D364 */ int checkBeforeBg();
-    /* 8072D640 */ bool checkBeforeBgFind();
-    /* 8072D87C */ bool checkBeforeFloorBg(f32);
-    /* 8072D994 */ void checkDamageBg();
-    /* 8072DB10 */ void setGroundAngle();
-    /* 8072DCBC */ void setActionMode(int, int);
-    /* 8072DD18 */ int getCutType();
-    /* 8072DD8C */ void offTgSph();
-    /* 8072DDF4 */ void damage_check();
-    /* 8072E274 */ void setBck(int, u8, f32, f32);
-    /* 8072E31C */ bool checkBck(int);
-    /* 8072E37C */ void setSpitEffect();
-    /* 8072E42C */ s16 getHeadAngle();
-    /* 8072E498 */ void setStabPos();
-    /* 8072E528 */ void setWaitSound();
-    /* 8072E5A4 */ void setWalkSound();
-    /* 8072E670 */ void setWalkStSound();
-    /* 8072E788 */ void setDashSound();
-    /* 8072E910 */ void setWaitStSound();
-    /* 8072EA58 */ void setFootNoteSound();
-    /* 8072EAA4 */ void executeWait();
-    /* 8072F1A8 */ void executeWalk();
-    /* 8072F5E0 */ void executeTalk();
-    /* 8072F914 */ void executeFind();
-    /* 807302E8 */ void setWeaponGroundAngle();
-    /* 807305C0 */ void executeAttack();
-    /* 80730DC0 */ void executeDamage();
-    /* 80731124 */ void executeBigDamage();
-    /* 807316F8 */ void executeWatch();
-    /* 807319E4 */ void executeSoundWatch();
-    /* 80731D18 */ bool checkBeforeDeath();
-    /* 80731D4C */ void executeDeath();
-    /* 80731F5C */ void setWaterEffect();
-    /* 80732074 */ void executeWaterDeath();
-    /* 807323A4 */ void executeDemoMaster();
-    /* 80732B04 */ void executeDemoChild();
-    /* 80732E64 */ void checkFall();
-    /* 8073301C */ void executeFallDead();
-    /* 807331CC */ void executeFall();
-    /* 8073332C */ void executeFindStay();
-    /* 807335B4 */ void executeMoveOut();
-    /* 80733E48 */ bool checkWaterSurface();
-    /* 80733F20 */ void action();
-    /* 807345D8 */ void mtx_set();
-    /* 80734698 */ void cc_set();
-    /* 807348DC */ int execute();
-    /* 80734B6C */ int _delete();
-    /* 80734C10 */ int CreateHeap();
-    /* 80734DA8 */ cPhs__Step create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    s16 getVisionAngle(fopAc_ac_c*);
+    void searchOtherOc();
+    bool setWatchMode();
+    bool searchPlayer();
+    bool searchPlayer2();
+    bool searchPlayerShakeHead();
+    bool searchSound();
+    int checkBeforeBg();
+    bool checkBeforeBgFind();
+    bool checkBeforeFloorBg(f32);
+    void checkDamageBg();
+    void setGroundAngle();
+    void setActionMode(int, int);
+    int getCutType();
+    void offTgSph();
+    void damage_check();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setSpitEffect();
+    s16 getHeadAngle();
+    void setStabPos();
+    void setWaitSound();
+    void setWalkSound();
+    void setWalkStSound();
+    void setDashSound();
+    void setWaitStSound();
+    void setFootNoteSound();
+    void executeWait();
+    void executeWalk();
+    void executeTalk();
+    void executeFind();
+    void setWeaponGroundAngle();
+    void executeAttack();
+    void executeDamage();
+    void executeBigDamage();
+    void executeWatch();
+    void executeSoundWatch();
+    bool checkBeforeDeath();
+    void executeDeath();
+    void setWaterEffect();
+    void executeWaterDeath();
+    void executeDemoMaster();
+    void executeDemoChild();
+    void checkFall();
+    void executeFallDead();
+    void executeFall();
+    void executeFindStay();
+    void executeMoveOut();
+    bool checkWaterSurface();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     bool isHomeWait() { return mIsHomeWait; }
     bool isBattleOn() { return mBattleOn; }
diff --git a/include/d/actor/d_a_e_oct_bg.h b/include/d/actor/d_a_e_oct_bg.h
index 18485f5134..1bb57b1bed 100644
--- a/include/d/actor/d_a_e_oct_bg.h
+++ b/include/d/actor/d_a_e_oct_bg.h
@@ -21,34 +21,34 @@ class daE_OctBg_c : public fopEn_enemy_c {
 public:
     typedef void (daE_OctBg_c::*actionFunc)();
 
-    /* 8073626C */ void setAction(actionFunc);
-    /* 80736310 */ void setSparkEffect();
-    /* 80736418 */ bool checkExplode();
-    /* 8073651C */ void action();
-    /* 80736840 */ int _delete();
-    /* 807368C8 */ void cc_set();
-    /* 80736A78 */ void mtx_set();
-    /* 80736BB4 */ bool checkNormalAttack();
-    /* 80736DAC */ bool checkChase();
-    /* 80736E30 */ void born_swim();
-    /* 80737028 */ void swim();
-    /* 80737574 */ void setChasePos(cXyz&, f32);
-    /* 8073762C */ bool checkCoreFishAttack();
-    /* 80737678 */ void chase_core();
-    /* 80737C48 */ void normal_attack();
-    /* 8073814C */ void core_fish_attack();
-    /* 80738714 */ void back_swim();
-    /* 80738914 */ bool setBombCarry(int);
-    /* 807389E8 */ void hook();
-    /* 80738A4C */ void damage();
-    /* 80738C2C */ void bomb_wait();
-    /* 80738E30 */ void damage_check();
-    /* 8073905C */ int execute();
-    /* 807390E4 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 807391D0 */ static int JointCallBack(J3DJoint*, int);
-    /* 8073921C */ int CreateHeap();
-    /* 80739424 */ int create();
-    /* 807399A4 */ int draw();
+    void setAction(actionFunc);
+    void setSparkEffect();
+    bool checkExplode();
+    void action();
+    int _delete();
+    void cc_set();
+    void mtx_set();
+    bool checkNormalAttack();
+    bool checkChase();
+    void born_swim();
+    void swim();
+    void setChasePos(cXyz&, f32);
+    bool checkCoreFishAttack();
+    void chase_core();
+    void normal_attack();
+    void core_fish_attack();
+    void back_swim();
+    bool setBombCarry(int);
+    void hook();
+    void damage();
+    void bomb_wait();
+    void damage_check();
+    int execute();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int CreateHeap();
+    int create();
+    int draw();
 
     u8 getChaseFlag() { return field_0xbac; }
     u32 checkAction(actionFunc func) { return field_0xb58 == func; }
@@ -99,8 +99,8 @@ STATIC_ASSERT(sizeof(daE_OctBg_c) == 0xBB4);
 
 class daE_OctBg_HIO_c {
 public:
-    /* 8073620C */ daE_OctBg_HIO_c();
-    /* 80739CB8 */ virtual ~daE_OctBg_HIO_c() {}
+    daE_OctBg_HIO_c();
+    virtual ~daE_OctBg_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 field_0x08;
diff --git a/include/d/actor/d_a_e_ot.h b/include/d/actor/d_a_e_ot.h
index e07eb89227..7fd5ecef59 100644
--- a/include/d/actor/d_a_e_ot.h
+++ b/include/d/actor/d_a_e_ot.h
@@ -18,27 +18,27 @@
  */
 class daE_OT_c : public fopEn_enemy_c {
 public:
-    /* 8073A314 */ int draw();
-    /* 8073A454 */ void setBck(int, u8, f32, f32);
-    /* 8073A4F8 */ void setActionMode(int, int);
-    /* 8073A510 */ void damage_check();
-    /* 8073A7B0 */ void checkWaterSurface();
-    /* 8073A838 */ void setWaterEffect();
-    /* 8073A99C */ void setEggBreakEffect();
-    /* 8073AA40 */ void setDeathLightEffect();
-    /* 8073AB38 */ void setEggStay();
-    /* 8073AC14 */ void executeEgg();
-    /* 8073AF70 */ void executeBorn();
-    /* 8073B0D0 */ void executeAttack();
-    /* 8073B428 */ void executePanic();
-    /* 8073B854 */ void executeDamage();
-    /* 8073BB9C */ void action();
-    /* 8073BD78 */ void mtx_set();
-    /* 8073BE10 */ void cc_set();
-    /* 8073BF84 */ int execute();
-    /* 8073C058 */ int _delete();
-    /* 8073C0EC */ int CreateHeap();
-    /* 8073C31C */ cPhs__Step create();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    void checkWaterSurface();
+    void setWaterEffect();
+    void setEggBreakEffect();
+    void setDeathLightEffect();
+    void setEggStay();
+    void executeEgg();
+    void executeBorn();
+    void executeAttack();
+    void executePanic();
+    void executeDamage();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     int getChildNo() { return mChildNo; }
     int getActionMode() { return mAction; }
diff --git a/include/d/actor/d_a_e_ph.h b/include/d/actor/d_a_e_ph.h
index 37f37a8f22..6d39fa47e0 100644
--- a/include/d/actor/d_a_e_ph.h
+++ b/include/d/actor/d_a_e_ph.h
@@ -19,46 +19,46 @@
  */
 class daE_PH_c : public fopEn_enemy_c {
 public:
-    /* 8073D48C */ void initCcSph();
-    /* 8073D5C4 */ void SetStopingCam();
-    /* 8073D648 */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 8073D768 */ void SetCMoveCam(cXyz, f32, f32);
-    /* 8073D7AC */ void SetReleaseCam();
-    /* 8073D850 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8073D950 */ void setCcSph();
-    /* 8073DB28 */ void SetAnm(int, int, f32, f32);
-    /* 8073DBD4 */ void SearchNearP();
-    /* 8073DDF8 */ void FlyAnm();
-    /* 8073E068 */ void SetShapeAngle();
-    /* 8073E22C */ void GoTarget();
-    /* 8073E4A4 */ void SetCheckAngle();
-    /* 8073E8B0 */ bool C_CheckPoint();
-    /* 8073E924 */ void DownBoots();
-    /* 8073EA50 */ void UpBoots();
-    /* 8073EB64 */ void C_Action();
-    /* 8073ED0C */ void SearchNextPos();
-    /* 8073ED58 */ void SearchBackPos();
-    /* 8073EDA0 */ void S_SetPlaySpeed();
-    /* 8073EE68 */ void S_GoTarget();
-    /* 8073F250 */ bool S_CheckPoint();
-    /* 8073F3D4 */ void S_SetAngle();
-    /* 8073F8C8 */ void FlyAnm2();
-    /* 8073FB70 */ void S_Action();
-    /* 8073FBDC */ void StopAction();
-    /* 8073FD70 */ void Action();
-    /* 80740024 */ void SetHeadAngle(s16);
-    /* 80740098 */ void CamAction();
-    /* 80740318 */ void DemoAction();
-    /* 807408C0 */ void ToumeiAction();
-    /* 80740B3C */ int Execute();
-    /* 80740C3C */ void AttentionSet();
-    /* 80740E70 */ void ObjHit();
-    /* 807410B0 */ void BaseSet();
-    /* 8074117C */ void De_Timer();
-    /* 807411C0 */ void EyeSet();
-    /* 80741200 */ int Delete();
-    /* 80741268 */ void setBaseMtx();
-    /* 80741428 */ int create();
+    void initCcSph();
+    void SetStopingCam();
+    void SetStopCam(cXyz, f32, f32, s16);
+    void SetCMoveCam(cXyz, f32, f32);
+    void SetReleaseCam();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void setCcSph();
+    void SetAnm(int, int, f32, f32);
+    void SearchNearP();
+    void FlyAnm();
+    void SetShapeAngle();
+    void GoTarget();
+    void SetCheckAngle();
+    bool C_CheckPoint();
+    void DownBoots();
+    void UpBoots();
+    void C_Action();
+    void SearchNextPos();
+    void SearchBackPos();
+    void S_SetPlaySpeed();
+    void S_GoTarget();
+    bool S_CheckPoint();
+    void S_SetAngle();
+    void FlyAnm2();
+    void S_Action();
+    void StopAction();
+    void Action();
+    void SetHeadAngle(s16);
+    void CamAction();
+    void DemoAction();
+    void ToumeiAction();
+    int Execute();
+    void AttentionSet();
+    void ObjHit();
+    void BaseSet();
+    void De_Timer();
+    void EyeSet();
+    int Delete();
+    void setBaseMtx();
+    int create();
 
     inline int CreateHeap();
     inline int Draw();
@@ -123,8 +123,8 @@ public:
 
 class daE_PH_HIO_c {
 public:
-    /* 8073D44C */ daE_PH_HIO_c();
-    /* 80741B4C */ virtual ~daE_PH_HIO_c() {}
+    daE_PH_HIO_c();
+    virtual ~daE_PH_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mHangPos;
diff --git a/include/d/actor/d_a_e_pm.h b/include/d/actor/d_a_e_pm.h
index f612a8c684..bafc71cc88 100644
--- a/include/d/actor/d_a_e_pm.h
+++ b/include/d/actor/d_a_e_pm.h
@@ -21,63 +21,63 @@ class dPath;
  */
 class daE_PM_c : public fopEn_enemy_c {
 public:
-    /* 80741FB4 */ void DemoSkip(int);
-    /* 80742004 */ static int DemoSkipCallBack(void*, int);
-    /* 80742038 */ int CreateHeap();
-    /* 80742448 */ void initCcCylinder();
-    /* 807424C0 */ void setCcCylinder();
-    /* 80742508 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80742600 */ void Particle_Set(u16, cXyz);
-    /* 80742674 */ void SetAnm(int, int, f32, f32);
-    /* 80742810 */ void Yazirushi();
-    /* 807428A8 */ void SearchRndP();
-    /* 80742958 */ void SearchFarP();
-    /* 80742C94 */ void SearchNearP();
-    /* 80742E1C */ BOOL SearchNextPos();
-    /* 80742FB4 */ void SetGakkiEffect();
-    /* 807430C4 */ bool CameraSet();
-    /* 80743210 */ void SetStopingCam();
-    /* 80743294 */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 807433E8 */ void SetMoveCam2(f32, f32);
-    /* 80743524 */ void SetMoveCam(f32, f32);
-    /* 80743600 */ void SetReleaseCam();
-    /* 807436A4 */ void Ap_StartAction();
-    /* 80743D8C */ void Ap_CreateAction();
-    /* 807444F0 */ void Ap_EscapeAction();
-    /* 80744790 */ void AppearAction();
-    /* 80744878 */ void DemoBeforeEscape();
-    /* 80744DA0 */ void DemoAfterEscape();
-    /* 807453F4 */ void DemoMoveAction();
-    /* 80745438 */ void WaitAction();
-    /* 807455F4 */ void GroundCheck();
-    /* 80745970 */ void EscapeAction();
-    /* 80745C44 */ void DeathAction();
-    /* 80745DBC */ void Action();
-    /* 80745ED0 */ void DemoBossStart2();
-    /* 80746624 */ void DemoBossStart();
-    /* 80747194 */ void BossEscapeAction();
-    /* 807476A0 */ void BossDamageAction();
-    /* 80747F38 */ void BossWaitAction();
-    /* 807480A4 */ void BossDeathAction();
-    /* 80748964 */ void BossAction();
-    /* 80748B18 */ int Execute();
-    /* 80748D74 */ void StartAction();
-    /* 8074954C */ void GakkiLoopAction(cXyz, f32);
-    /* 807499C0 */ void DemoCreateAction();
-    /* 80749C0C */ void CreateAction();
-    /* 80749D9C */ void CreateChk();
-    /* 80749ED0 */ void LampAction();
-    /* 8074A14C */ void DamageAction();
-    /* 8074A210 */ void At_Check();
-    /* 8074A3DC */ void ObjHit();
-    /* 8074A644 */ void EyeMove();
-    /* 8074A6CC */ int Draw();
-    /* 8074AAC0 */ int Delete();
-    /* 8074AB28 */ void setBaseMtx();
-    /* 8074ABA8 */ void setGakkiBaseMtx();
-    /* 8074AC10 */ void setLampBaseMtx();
-    /* 8074AEF8 */ void SkipChk();
-    /* 8074B4DC */ cPhs__Step Create();
+    void DemoSkip(int);
+    static int DemoSkipCallBack(void*, int);
+    int CreateHeap();
+    void initCcCylinder();
+    void setCcCylinder();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void Particle_Set(u16, cXyz);
+    void SetAnm(int, int, f32, f32);
+    void Yazirushi();
+    void SearchRndP();
+    void SearchFarP();
+    void SearchNearP();
+    BOOL SearchNextPos();
+    void SetGakkiEffect();
+    bool CameraSet();
+    void SetStopingCam();
+    void SetStopCam(cXyz, f32, f32, s16);
+    void SetMoveCam2(f32, f32);
+    void SetMoveCam(f32, f32);
+    void SetReleaseCam();
+    void Ap_StartAction();
+    void Ap_CreateAction();
+    void Ap_EscapeAction();
+    void AppearAction();
+    void DemoBeforeEscape();
+    void DemoAfterEscape();
+    void DemoMoveAction();
+    void WaitAction();
+    void GroundCheck();
+    void EscapeAction();
+    void DeathAction();
+    void Action();
+    void DemoBossStart2();
+    void DemoBossStart();
+    void BossEscapeAction();
+    void BossDamageAction();
+    void BossWaitAction();
+    void BossDeathAction();
+    void BossAction();
+    int Execute();
+    void StartAction();
+    void GakkiLoopAction(cXyz, f32);
+    void DemoCreateAction();
+    void CreateAction();
+    void CreateChk();
+    void LampAction();
+    void DamageAction();
+    void At_Check();
+    void ObjHit();
+    void EyeMove();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    void setGakkiBaseMtx();
+    void setLampBaseMtx();
+    void SkipChk();
+    cPhs__Step Create();
 
     void AppearSet() { mAppear = true; }
     u8 ActionChk() { return mPuppetDelete; }
diff --git a/include/d/actor/d_a_e_po.h b/include/d/actor/d_a_e_po.h
index 3d8056608a..3bcbd6723a 100644
--- a/include/d/actor/d_a_e_po.h
+++ b/include/d/actor/d_a_e_po.h
@@ -52,7 +52,7 @@ enum Action_e {
 
 class e_po_class {
 public:
-    /* 80756900 */ e_po_class();
+    e_po_class();
 
     /* 0x000 */ fopEn_enemy_c enemy;
     /* 0x5AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_pz.h b/include/d/actor/d_a_e_pz.h
index 105d2c98e7..2218a886b7 100644
--- a/include/d/actor/d_a_e_pz.h
+++ b/include/d/actor/d_a_e_pz.h
@@ -27,34 +27,34 @@ public:
 
     void onBombArrowHit() { mBombArrowHit = true; }
 
-    /* 807585BC */ int draw();
-    /* 80758800 */ void setBck(int, u8, f32, f32);
-    /* 807588AC */ void setActionMode(int, int);
-    /* 807588B8 */ void mEntrySUB(bool);
-    /* 80758A94 */ bool mPzScaleSet(bool);
-    /* 80758BA0 */ void mEnemyScaleSet();
-    /* 80758D44 */ u8 getCutType();
-    /* 80758DA4 */ void mSetFirePos();
-    /* 80758E04 */ void damage_check();
-    /* 807592F4 */ void executeSearchPoint();
-    /* 807593CC */ void executeOpeningDemo();
-    /* 8075B7E0 */ void mPointerSet();
-    /* 8075B970 */ void executeWait();
-    /* 8075C6AC */ void executeAttack();
-    /* 8075CB80 */ void executeDamage();
-    /* 8075CE68 */ void executeDead();
-    /* 8075D94C */ void executeSummonsBullet();
-    /* 8075F0BC */ void executeBullet();
-    /* 8075F3A8 */ void action();
-    /* 8075F510 */ void action_fire();
-    /* 8075F578 */ void fire_mtx_set();
-    /* 8075F734 */ void mtx_set();
-    /* 8075F7E8 */ void cc_set();
-    /* 8075F964 */ int execute();
-    /* 8075FA88 */ int _delete();
-    /* 8075FB4C */ int CreateHeap();
-    /* 8076010C */ int create();
-    /* 807607EC */ daE_PZ_c();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void mEntrySUB(bool);
+    bool mPzScaleSet(bool);
+    void mEnemyScaleSet();
+    u8 getCutType();
+    void mSetFirePos();
+    void damage_check();
+    void executeSearchPoint();
+    void executeOpeningDemo();
+    void mPointerSet();
+    void executeWait();
+    void executeAttack();
+    void executeDamage();
+    void executeDead();
+    void executeSummonsBullet();
+    void executeBullet();
+    void action();
+    void action_fire();
+    void fire_mtx_set();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
+    daE_PZ_c();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h
index d289c5f225..90b48ca3f5 100644
--- a/include/d/actor/d_a_e_rd.h
+++ b/include/d/actor/d_a_e_rd.h
@@ -18,7 +18,7 @@
  */
 class e_rd_class {
 public:
-    /* 80517AE0 */ e_rd_class();
+    e_rd_class();
 
     /* 0x0000 */ fopEn_enemy_c actor;
     /* 0x05AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_rdy.h b/include/d/actor/d_a_e_rdy.h
index 9cf8a10524..0a318f2b38 100644
--- a/include/d/actor/d_a_e_rdy.h
+++ b/include/d/actor/d_a_e_rdy.h
@@ -21,7 +21,7 @@
  */
 class e_rdy_class {
 public:
-    /* 80779340 */ e_rdy_class();
+    e_rdy_class();
 
     /* 0x0000 */ fopEn_enemy_c actor;
     /* 0x05AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_sb.h b/include/d/actor/d_a_e_sb.h
index f7a76a92a1..e72f74ea27 100644
--- a/include/d/actor/d_a_e_sb.h
+++ b/include/d/actor/d_a_e_sb.h
@@ -15,48 +15,48 @@
  */
 class daE_SB_c : public fopEn_enemy_c {
 public:
-    /* 807816D8 */ int CreateHeap();
-    /* 807817F0 */ void initCcCylinder();
-    /* 80781850 */ void setCcCylinder();
-    /* 80781898 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 807819DC */ void Particle_Set(u16);
-    /* 80781A4C */ void SetAnm(int, int, f32, f32);
-    /* 80781AF8 */ void MemberClear();
-    /* 80781DD4 */ void Shield_Motion();
-    /* 80781F30 */ void AttackStop();
-    /* 80781F80 */ void AttackSetSP();
-    /* 80782180 */ void AttackAngle();
-    /* 80782264 */ void AttackSpeedMotion();
-    /* 807822B8 */ void Attack_Motion();
-    /* 80782650 */ void Bomb_Death_Motion();
-    /* 80782714 */ void BombJumpSet();
-    /* 8078273C */ void GetHomeSet();
-    /* 8078294C */ void HomeJumpMotion();
-    /* 807829E8 */ void Jump_Normal_Set();
-    /* 80782B7C */ void Jump_Set();
-    /* 80782BD4 */ void JumpMiddleMotion();
-    /* 80782CC8 */ void Jump_Motion();
-    /* 80782E90 */ void Death_Motion();
-    /* 80782ED4 */ void Hanekaeri();
-    /* 80782EF4 */ void Hit();
-    /* 80782F10 */ void ActionCheck();
-    /* 80783010 */ void Search();
-    /* 80783404 */ void Wait_Motion();
-    /* 807834FC */ void Attack();
-    /* 807835A0 */ void Shield();
-    /* 80783678 */ void Anm_Motion();
-    /* 80783854 */ void Search_Bomb();
-    /* 80783914 */ void ChanceMotion();
-    /* 80783A9C */ void NoChanceMotion();
-    /* 80783B4C */ void Obj_Damage();
-    /* 80783FBC */ void HashiraVib();
-    /* 80784144 */ void Yazirushi();
-    /* 807841CC */ void setGroundAngle();
-    /* 80784390 */ int Execute();
-    /* 807844BC */ int Draw();
-    /* 807845D8 */ int Delete();
-    /* 80784640 */ void setBaseMtx();
-    /* 80784720 */ cPhs__Step Create();
+    int CreateHeap();
+    void initCcCylinder();
+    void setCcCylinder();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void Particle_Set(u16);
+    void SetAnm(int, int, f32, f32);
+    void MemberClear();
+    void Shield_Motion();
+    void AttackStop();
+    void AttackSetSP();
+    void AttackAngle();
+    void AttackSpeedMotion();
+    void Attack_Motion();
+    void Bomb_Death_Motion();
+    void BombJumpSet();
+    void GetHomeSet();
+    void HomeJumpMotion();
+    void Jump_Normal_Set();
+    void Jump_Set();
+    void JumpMiddleMotion();
+    void Jump_Motion();
+    void Death_Motion();
+    void Hanekaeri();
+    void Hit();
+    void ActionCheck();
+    void Search();
+    void Wait_Motion();
+    void Attack();
+    void Shield();
+    void Anm_Motion();
+    void Search_Bomb();
+    void ChanceMotion();
+    void NoChanceMotion();
+    void Obj_Damage();
+    void HashiraVib();
+    void Yazirushi();
+    void setGroundAngle();
+    int Execute();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    cPhs__Step Create();
 private:
     /* 0x5AC */ int field_0x5ac;
     /* 0x5B0 */ int field_0x5b0;
@@ -107,8 +107,8 @@ STATIC_ASSERT(sizeof(daE_SB_c) == 0xBC0);
 
 class daE_SB_HIO_c : public JORReflexible {
 public:
-    /* 8078164C */ daE_SB_HIO_c();
-    /* 80784CC0 */ virtual ~daE_SB_HIO_c() {}
+    daE_SB_HIO_c();
+    virtual ~daE_SB_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
diff --git a/include/d/actor/d_a_e_sg.h b/include/d/actor/d_a_e_sg.h
index cd408f0459..a879d59519 100644
--- a/include/d/actor/d_a_e_sg.h
+++ b/include/d/actor/d_a_e_sg.h
@@ -75,8 +75,8 @@ STATIC_ASSERT(sizeof(e_sg_class) == 0xAB0);
 
 class daE_SG_HIO_c {
 public:
-    /* 8078A22C */ daE_SG_HIO_c();
-    /* 8078DC84 */ virtual ~daE_SG_HIO_c() {};
+    daE_SG_HIO_c();
+    virtual ~daE_SG_HIO_c() {};
 
     s8 mUnk0;
     f32 mScaleFactor;
diff --git a/include/d/actor/d_a_e_sm.h b/include/d/actor/d_a_e_sm.h
index 2ad0512199..b20115910a 100644
--- a/include/d/actor/d_a_e_sm.h
+++ b/include/d/actor/d_a_e_sm.h
@@ -16,47 +16,47 @@
 
 class daE_SM_c : public fopEn_enemy_c {
 public:
-    /* 80792260 */ void SetAnm(int, int, f32, f32);
-    /* 8079230C */ int Draw();
-    /* 807928A4 */ void Particle_Set(u16, cXyz, cXyz, csXyz);
-    /* 80792914 */ void ArrowCheck();
-    /* 80792C20 */ void E_SM_Damage();
-    /* 80792E70 */ void SmDamageCheck();
-    /* 807936B4 */ void E_SM_Normal();
-    /* 80793B64 */ void E_SM_Move();
-    /* 80793E18 */ void E_SM_Attack();
-    /* 80794100 */ void Action();
-    /* 80794338 */ void E_SM_C_Normal();
-    /* 807943C4 */ void E_SM_C_Fight();
-    /* 80794458 */ void E_SM_C_Near_Escape();
-    /* 8079473C */ void E_SM_C_Far_Escape();
-    /* 807949CC */ void E_SM_C_Home_Escape();
-    /* 807951EC */ void E_SM_C_Escape();
-    /* 80795244 */ void E_SM_C_Free();
-    /* 80795530 */ void E_SM_C_Death();
-    /* 807958A0 */ void C_DamageCheck();
-    /* 80795E64 */ void E_SM_C_Hook();
-    /* 80796060 */ bool CheckViewArea();
-    /* 807960E4 */ bool CameraSet();
-    /* 80796204 */ void SetStopCam(cXyz, f32, f32, s16);
-    /* 80796324 */ void SetCMoveCam(cXyz, f32, f32);
-    /* 80796368 */ void SetStopingCam();
-    /* 807963EC */ void SetReleaseCam();
-    /* 80796490 */ void DemoStart();
-    /* 80796628 */ void DemoMid();
-    /* 807968A0 */ void E_SM_C_Demo();
-    /* 807968E4 */ void CoreAction();
-    /* 80796AEC */ void ArrowOn();
-    /* 80796D80 */ int Execute();
-    /* 80796FC4 */ void setSmBaseMtx();
-    /* 80797274 */ void setBaseMtx();
-    /* 8079730C */ void CoCoreSet();
-    /* 80797444 */ void CoSmSet();
-    /* 80797570 */ int Delete();
-    /* 8079764C */ int CreateHeap();
-    /* 80797784 */ void initCoSph();
-    /* 80797858 */ cPhs__Step Create();
-    /* 80797CE0 */ daE_SM_c();
+    void SetAnm(int, int, f32, f32);
+    int Draw();
+    void Particle_Set(u16, cXyz, cXyz, csXyz);
+    void ArrowCheck();
+    void E_SM_Damage();
+    void SmDamageCheck();
+    void E_SM_Normal();
+    void E_SM_Move();
+    void E_SM_Attack();
+    void Action();
+    void E_SM_C_Normal();
+    void E_SM_C_Fight();
+    void E_SM_C_Near_Escape();
+    void E_SM_C_Far_Escape();
+    void E_SM_C_Home_Escape();
+    void E_SM_C_Escape();
+    void E_SM_C_Free();
+    void E_SM_C_Death();
+    void C_DamageCheck();
+    void E_SM_C_Hook();
+    bool CheckViewArea();
+    bool CameraSet();
+    void SetStopCam(cXyz, f32, f32, s16);
+    void SetCMoveCam(cXyz, f32, f32);
+    void SetStopingCam();
+    void SetReleaseCam();
+    void DemoStart();
+    void DemoMid();
+    void E_SM_C_Demo();
+    void CoreAction();
+    void ArrowOn();
+    int Execute();
+    void setSmBaseMtx();
+    void setBaseMtx();
+    void CoCoreSet();
+    void CoSmSet();
+    int Delete();
+    int CreateHeap();
+    void initCoSph();
+    cPhs__Step Create();
+    daE_SM_c();
 
     /* 0x05AC */ request_of_phase_process_class mPhase;
     /* 0x05B4 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_e_sw.h b/include/d/actor/d_a_e_sw.h
index ee966cf1cd..46cebe726a 100644
--- a/include/d/actor/d_a_e_sw.h
+++ b/include/d/actor/d_a_e_sw.h
@@ -18,62 +18,62 @@ class daE_SW_c : public fopEn_enemy_c {
 public:
     typedef void (daE_SW_c::*actionFunc)();
 
-    /* 807A7460 */ void bckSet(int, f32, u8, f32);
-    /* 807A7504 */ int draw();
-    /* 807A76E4 */ void setBeforeJumpEffect();
-    /* 807A77CC */ void setJumpEffect();
-    /* 807A78B4 */ void setSmokeEffect();
-    /* 807A7A08 */ void setDiveEffect();
-    /* 807A7AC0 */ void setHideEffect();
-    /* 807A7B64 */ void setActionMode(s16, s16);
-    /* 807A7C50 */ fopAc_ac_c* search_bomb();
-    /* 807A7CD0 */ BOOL bomb_check();
-    /* 807A7D48 */ bool setModeBack();
-    /* 807A7DAC */ void checkFall();
-    /* 807A7EFC */ bool checkBeforeWall();
-    /* 807A7F88 */ void executeWait();
-    /* 807A8290 */ int checkRunChase();
-    /* 807A831C */ void executeChaseSlow();
-    /* 807A8B98 */ void executeChaseFast();
-    /* 807A9580 */ void executeBomb();
-    /* 807A9768 */ void executeAttack();
-    /* 807A9E58 */ void executeHook();
-    /* 807AA050 */ void executeMoveOut();
-    /* 807AA44C */ void executeChance();
-    /* 807AA784 */ void executeDive();
-    /* 807AA91C */ void executeDamage();
-    /* 807AAB7C */ void executeDie();
-    /* 807AADCC */ void executeMaster();
-    /* 807AAF70 */ bool checkSuddenAttack(int);
-    /* 807AB310 */ void executeSuddenAttack();
-    /* 807AB5C4 */ void executeFall();
-    /* 807AB6C4 */ void action();
-    /* 807AB884 */ void mtx_set();
-    /* 807AB930 */ void cc_set();
-    /* 807ABAB0 */ void damage_check();
-    /* 807ABD28 */ void checkGroundSand();
-    /* 807ABE50 */ int execute();
-    /* 807AC170 */ int _delete();
-    /* 807AC204 */ int CreateHeap();
-    /* 807AC31C */ cPhs__Step create();
-    /* 807ACA40 */ void d_setAction(void (daE_SW_c::*)());
-    /* 807ACAE4 */ void d_checkFall();
-    /* 807ACCB0 */ void d_damage_check();
-    /* 807ACFF8 */ void d_action();
-    /* 807AD10C */ bool d_bomb_check();
-    /* 807AD17C */ void d_bm_chase();
-    /* 807AD4A8 */ void d_wait();
-    /* 807AD7C0 */ bool d_chaseCheck();
-    /* 807ADA08 */ void d_chase();
-    /* 807ADE50 */ void d_attk();
-    /* 807AE4B4 */ void d_chance();
-    /* 807AE7F4 */ void d_chance2();
-    /* 807AE968 */ void d_dive();
-    /* 807AEB08 */ void d_damage();
-    /* 807AEE44 */ void d_die();
-    /* 807AF01C */ void d_hook();
-    /* 807AF4B4 */ void d_fall();
-    /* 807AF57C */ int d_execute();
+    void bckSet(int, f32, u8, f32);
+    int draw();
+    void setBeforeJumpEffect();
+    void setJumpEffect();
+    void setSmokeEffect();
+    void setDiveEffect();
+    void setHideEffect();
+    void setActionMode(s16, s16);
+    fopAc_ac_c* search_bomb();
+    BOOL bomb_check();
+    bool setModeBack();
+    void checkFall();
+    bool checkBeforeWall();
+    void executeWait();
+    int checkRunChase();
+    void executeChaseSlow();
+    void executeChaseFast();
+    void executeBomb();
+    void executeAttack();
+    void executeHook();
+    void executeMoveOut();
+    void executeChance();
+    void executeDive();
+    void executeDamage();
+    void executeDie();
+    void executeMaster();
+    bool checkSuddenAttack(int);
+    void executeSuddenAttack();
+    void executeFall();
+    void action();
+    void mtx_set();
+    void cc_set();
+    void damage_check();
+    void checkGroundSand();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
+    void d_setAction(void (daE_SW_c::*)());
+    void d_checkFall();
+    void d_damage_check();
+    void d_action();
+    bool d_bomb_check();
+    void d_bm_chase();
+    void d_wait();
+    bool d_chaseCheck();
+    void d_chase();
+    void d_attk();
+    void d_chance();
+    void d_chance2();
+    void d_dive();
+    void d_damage();
+    void d_die();
+    void d_hook();
+    void d_fall();
+    int d_execute();
 
     bool d_checkAction(void (daE_SW_c::*action)()) {
         return field_0xafc == action;
diff --git a/include/d/actor/d_a_e_tk.h b/include/d/actor/d_a_e_tk.h
index e07508c7df..ef9befab0d 100644
--- a/include/d/actor/d_a_e_tk.h
+++ b/include/d/actor/d_a_e_tk.h
@@ -62,8 +62,8 @@ STATIC_ASSERT(sizeof(e_tk_class) == 0xA64);
 
 class daE_TK_HIO_c {
 public:
-    /* 807B81EC */ daE_TK_HIO_c();
-    /* 807BA1C4 */ virtual ~daE_TK_HIO_c() {}
+    daE_TK_HIO_c();
+    virtual ~daE_TK_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mRadiusScale;
diff --git a/include/d/actor/d_a_e_tk2.h b/include/d/actor/d_a_e_tk2.h
index c9dfa63d90..4af171d709 100644
--- a/include/d/actor/d_a_e_tk2.h
+++ b/include/d/actor/d_a_e_tk2.h
@@ -56,8 +56,8 @@ STATIC_ASSERT(sizeof(e_tk2_class) == 0xA50);
 
 class daE_TK2_HIO_c {
 public:
-    /* 807BA56C */ daE_TK2_HIO_c();
-    /* 807BBD00 */ virtual ~daE_TK2_HIO_c() {};
+    daE_TK2_HIO_c();
+    virtual ~daE_TK2_HIO_c() {};
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mRadiusScale;
diff --git a/include/d/actor/d_a_e_tt.h b/include/d/actor/d_a_e_tt.h
index c53836482b..8798393740 100644
--- a/include/d/actor/d_a_e_tt.h
+++ b/include/d/actor/d_a_e_tt.h
@@ -16,36 +16,36 @@
  */
 class daE_TT_c : public fopEn_enemy_c {
 public:
-    /* 807BD7EC */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 807BD8E0 */ static int JointCallBack(J3DJoint*, int);
-    /* 807BD92C */ int draw();
-    /* 807BDAE0 */ void setBck(int, u8, f32, f32);
-    /* 807BDB84 */ void calcHitGroundSpeed();
-    /* 807BDBE4 */ void setActionMode(int, int);
-    /* 807BDC10 */ int getCutType();
-    /* 807BDC50 */ void damage_check();
-    /* 807BDE5C */ void checkWaterSurface();
-    /* 807BDF60 */ void checkFootGround();
-    /* 807BE2A8 */ void setBodyLandEffect();
-    /* 807BE438 */ void setWaterEffect();
-    /* 807BE708 */ void setDeathEyeEffect();
-    /* 807BE99C */ void setDeathFootEffect();
-    /* 807BEBAC */ bool checkPlayerSearch();
-    /* 807BED70 */ void executeWait();
-    /* 807BF358 */ void executeChase();
-    /* 807BF914 */ void executeAttack();
-    /* 807BFD38 */ void setDamageInit();
-    /* 807BFD60 */ void executeDamage();
-    /* 807BFFF4 */ void executeDeath();
-    /* 807C033C */ void executeOutRange();
-    /* 807C0530 */ void executeFirstAttack();
-    /* 807C0C28 */ void action();
-    /* 807C0E10 */ void mtx_set(int);
-    /* 807C0EE8 */ void cc_set();
-    /* 807C1024 */ int execute();
-    /* 807C1164 */ int _delete();
-    /* 807C121C */ int CreateHeap();
-    /* 807C13B4 */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void calcHitGroundSpeed();
+    void setActionMode(int, int);
+    int getCutType();
+    void damage_check();
+    void checkWaterSurface();
+    void checkFootGround();
+    void setBodyLandEffect();
+    void setWaterEffect();
+    void setDeathEyeEffect();
+    void setDeathFootEffect();
+    bool checkPlayerSearch();
+    void executeWait();
+    void executeChase();
+    void executeAttack();
+    void setDamageInit();
+    void executeDamage();
+    void executeDeath();
+    void executeOutRange();
+    void executeFirstAttack();
+    void action();
+    void mtx_set(int);
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
 private:
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_e_vt.h b/include/d/actor/d_a_e_vt.h
index fe2f29a10a..5d6bf3dfd2 100644
--- a/include/d/actor/d_a_e_vt.h
+++ b/include/d/actor/d_a_e_vt.h
@@ -83,68 +83,68 @@ public:
         ANM_TRANS_WALK_e,
     };
 
-    /* 807C267C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 807C284C */ static int JointCallBack(J3DJoint*, int);
-    /* 807C2898 */ void calcJointNeck();
-    /* 807C2A4C */ void calcJointSleeve();
-    /* 807C3264 */ int draw();
-    /* 807C3818 */ void setBck(int, u8, f32, f32);
-    /* 807C38BC */ bool checkBck(int);
-    /* 807C3918 */ void setActionMode(int, int);
-    /* 807C39C4 */ int getWolfCutType();
-    /* 807C3A1C */ void onSwordAtBit();
-    /* 807C3A50 */ void offSwordShield();
-    /* 807C3AB0 */ void setTransDamage(cXyz*);
-    /* 807C3B58 */ void damage_check();
-    /* 807C4844 */ void setFireEffect(int);
-    /* 807C49B4 */ void setFootEffect();
-    /* 807C4B54 */ void setWeponEffect();
-    /* 807C4DFC */ void setBugsEffect();
-    /* 807C4F10 */ void setWeponLandEffect();
-    /* 807C4FCC */ void setWeponGlow();
-    /* 807C50A4 */ void setWeponFlashScreen();
-    /* 807C5188 */ void setMagicEffect(int);
-    /* 807C5258 */ void setMagicHitEffect(int);
-    /* 807C5338 */ void demo_skip(int);
-    /* 807C53A8 */ static int DemoSkipCallBack(void*, int);
-    /* 807C53DC */ f32 getRopeLength(int);
-    /* 807C53FC */ void calcOpRopePos();
-    /* 807C5CF0 */ void onRopeCutStatus(int, int, int);
-    /* 807C5DF4 */ void setVibRope(f32, f32);
-    /* 807C5EAC */ void setVibTag(int, int);
-    /* 807C6164 */ void calcTagAngle();
-    /* 807C638C */ void calcRopeFirePos();
-    /* 807C6564 */ void executeDemoOpWait();
-    /* 807C67A4 */ void executeDemoOp();
-    /* 807C7534 */ void executeClearWait();
-    /* 807C7640 */ void executeClearChase();
-    /* 807C783C */ void executeClearAttack();
-    /* 807C7A8C */ void executeTransWait();
-    /* 807C7C74 */ void executeTransChase();
-    /* 807C7ED4 */ void executeTransAttack();
-    /* 807C839C */ void executeTransBiteDamage();
-    /* 807C8860 */ void executeTransDamage();
-    /* 807C8A84 */ void executeTransThrough();
-    /* 807C8B78 */ void executeOpaciWait();
-    /* 807C915C */ void executeOpaciFly();
-    /* 807C9A40 */ void executeOpaciDamage();
-    /* 807C9C8C */ void executeOpaciChase();
-    /* 807CA364 */ void executeOpaciAttack();
-    /* 807CA73C */ void executeOpaciDown();
-    /* 807CAA80 */ void executeOpaciDownDamage();
-    /* 807CACE0 */ void executeOpaciFlip();
-    /* 807CADB8 */ void executeOpaciFadeAway();
-    /* 807CB1C4 */ void executeOpaciDeath();
-    /* 807CB8CC */ void calcMagicMove();
-    /* 807CBC00 */ void setAlphaType();
-    /* 807CC004 */ void action();
-    /* 807CC4D0 */ void mtx_set();
-    /* 807CC864 */ void cc_set();
-    /* 807CCD24 */ int execute();
-    /* 807CCF64 */ int _delete();
-    /* 807CD048 */ int CreateHeap();
-    /* 807CD668 */ int create();
-    /* 807CDAD8 */ daE_VA_c();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    void calcJointNeck();
+    void calcJointSleeve();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    int getWolfCutType();
+    void onSwordAtBit();
+    void offSwordShield();
+    void setTransDamage(cXyz*);
+    void damage_check();
+    void setFireEffect(int);
+    void setFootEffect();
+    void setWeponEffect();
+    void setBugsEffect();
+    void setWeponLandEffect();
+    void setWeponGlow();
+    void setWeponFlashScreen();
+    void setMagicEffect(int);
+    void setMagicHitEffect(int);
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    f32 getRopeLength(int);
+    void calcOpRopePos();
+    void onRopeCutStatus(int, int, int);
+    void setVibRope(f32, f32);
+    void setVibTag(int, int);
+    void calcTagAngle();
+    void calcRopeFirePos();
+    void executeDemoOpWait();
+    void executeDemoOp();
+    void executeClearWait();
+    void executeClearChase();
+    void executeClearAttack();
+    void executeTransWait();
+    void executeTransChase();
+    void executeTransAttack();
+    void executeTransBiteDamage();
+    void executeTransDamage();
+    void executeTransThrough();
+    void executeOpaciWait();
+    void executeOpaciFly();
+    void executeOpaciDamage();
+    void executeOpaciChase();
+    void executeOpaciAttack();
+    void executeOpaciDown();
+    void executeOpaciDownDamage();
+    void executeOpaciFlip();
+    void executeOpaciFadeAway();
+    void executeOpaciDeath();
+    void calcMagicMove();
+    void setAlphaType();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
+    daE_VA_c();
 
 private:
     /* 0x005AC */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_e_ws.h b/include/d/actor/d_a_e_ws.h
index 0c2c176808..88df8f29a4 100644
--- a/include/d/actor/d_a_e_ws.h
+++ b/include/d/actor/d_a_e_ws.h
@@ -23,30 +23,30 @@ public:
         ACTION_WIND_DOWN_e,
     };
 
-    /* 807E3A6C */ int draw();
-    /* 807E3C20 */ void setBck(int, u8, f32, f32);
-    /* 807E3CC4 */ void setFootSound();
-    /* 807E3F90 */ void setActionMode(int);
-    /* 807E3FAC */ f32 calcTargetDist(cXyz, cXyz);
-    /* 807E40C8 */ s16 calcTargetAngle(cXyz, cXyz);
-    /* 807E416C */ bool checkInSearchRange(cXyz, cXyz);
-    /* 807E4224 */ int checkPlayerPos();
-    /* 807E4568 */ bool checkAttackEnd();
-    /* 807E470C */ void executeWait();
-    /* 807E4AB8 */ void executeAttack();
-    /* 807E4E68 */ void executeDown();
-    /* 807E5294 */ void executeWindDown();
-    /* 807E56D0 */ void damage_check();
-    /* 807E58AC */ void action();
-    /* 807E5A3C */ void mtx_set();
-    /* 807E5AAC */ void cc_set();
-    /* 807E5C0C */ int execute();
-    /* 807E5CD8 */ void checkInitialWall();
-    /* 807E5FB8 */ bool checkBeforeBg(s16);
-    /* 807E63F8 */ bool checkWall();
-    /* 807E66B4 */ int _delete();
-    /* 807E6748 */ int CreateHeap();
-    /* 807E6860 */ int create();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setFootSound();
+    void setActionMode(int);
+    f32 calcTargetDist(cXyz, cXyz);
+    s16 calcTargetAngle(cXyz, cXyz);
+    bool checkInSearchRange(cXyz, cXyz);
+    int checkPlayerPos();
+    bool checkAttackEnd();
+    void executeWait();
+    void executeAttack();
+    void executeDown();
+    void executeWindDown();
+    void damage_check();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    void checkInitialWall();
+    bool checkBeforeBg(s16);
+    bool checkWall();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_e_ww.h b/include/d/actor/d_a_e_ww.h
index 594ad4f8f8..fc1083c34e 100644
--- a/include/d/actor/d_a_e_ww.h
+++ b/include/d/actor/d_a_e_ww.h
@@ -17,43 +17,43 @@
 
 class daE_WW_c : public fopEn_enemy_c {
 public:
-    /* 807E7748 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 807E7800 */ static int JointCallBack(J3DJoint*, int);
-    /* 807E784C */ void setHeadAngle();
-    /* 807E79D4 */ int draw();
-    /* 807E7ADC */ void setBck(int, u8, f32, f32);
-    /* 807E7B80 */ bool checkBck(int);
-    /* 807E7BDC */ void setActionMode(int, int);
-    /* 807E7C20 */ void damage_check();
-    /* 807E7E74 */ void setRandamNumber();
-    /* 807E7FCC */ s16 getNearPlayerAngle();
-    /* 807E804C */ void setGroundAngle();
-    /* 807E830C */ f32 checkCreateBg(cXyz);
-    /* 807E8560 */ bool checkAttackWall();
-    /* 807E8624 */ void setBlurEffect();
-    /* 807E8700 */ void setAppearEffect();
-    /* 807E8C54 */ bool checkSideStep();
-    /* 807E8EEC */ void createWolf(cXyz, u8);
-    /* 807E905C */ void executeMaster();
-    /* 807E972C */ void executeWait();
-    /* 807E99B8 */ int calcJumpSpeed();
-    /* 807E9C1C */ void executeAttack();
-    /* 807EA474 */ bool checkAttackStart();
-    /* 807EA870 */ void executeChase();
-    /* 807EB650 */ void executeDamage();
-    /* 807EB964 */ bool checkMoveOut();
-    /* 807EBAE0 */ void executeMoveOut();
-    /* 807EC940 */ bool checkWalkStart();
-    /* 807ECE58 */ void executeWalk();
-    /* 807ED674 */ void eWW_posMoveF();
-    /* 807ED78C */ void action();
-    /* 807EDA78 */ void mtx_set();
-    /* 807EDB00 */ void cc_set();
-    /* 807EDCC4 */ int execute();
-    /* 807EDE8C */ bool calcMoveDir(s16*, s16);
-    /* 807EE440 */ int _delete();
-    /* 807EE4D4 */ int CreateHeap();
-    /* 807EE63C */ int create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    void setHeadAngle();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    void damage_check();
+    void setRandamNumber();
+    s16 getNearPlayerAngle();
+    void setGroundAngle();
+    f32 checkCreateBg(cXyz);
+    bool checkAttackWall();
+    void setBlurEffect();
+    void setAppearEffect();
+    bool checkSideStep();
+    void createWolf(cXyz, u8);
+    void executeMaster();
+    void executeWait();
+    int calcJumpSpeed();
+    void executeAttack();
+    bool checkAttackStart();
+    void executeChase();
+    void executeDamage();
+    bool checkMoveOut();
+    void executeMoveOut();
+    bool checkWalkStart();
+    void executeWalk();
+    void eWW_posMoveF();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    bool calcMoveDir(s16*, s16);
+    int _delete();
+    int CreateHeap();
+    int create();
 
     u8 isAttack() { return field_0x756; }
     void setAttack() { mActionMode = 10; }
diff --git a/include/d/actor/d_a_e_yc.h b/include/d/actor/d_a_e_yc.h
index 6bd2886f3f..03d3d0606d 100644
--- a/include/d/actor/d_a_e_yc.h
+++ b/include/d/actor/d_a_e_yc.h
@@ -89,8 +89,8 @@ public:
 STATIC_ASSERT(sizeof(e_yc_class) == 0xBA8);
 
 struct daE_YC_HIO_c {
-    /* 807EFECC */ daE_YC_HIO_c();
-    /* 807F27BC */ virtual ~daE_YC_HIO_c() {}
+    daE_YC_HIO_c();
+    virtual ~daE_YC_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScale;
diff --git a/include/d/actor/d_a_e_ym.h b/include/d/actor/d_a_e_ym.h
index 10256c787e..270734c286 100644
--- a/include/d/actor/d_a_e_ym.h
+++ b/include/d/actor/d_a_e_ym.h
@@ -49,71 +49,71 @@ public:
 
     void setTagPosP() { mTagPosP = &mTagPos; }
 
-    /* 80808184 */ u8 checkBck(char const*, int);
-    /* 808081E0 */ void bckSet(int, u8, f32, f32);
-    /* 80808328 */ void bckSetFly(int, u8, f32, f32);
-    /* 808083CC */ int draw();
-    /* 80808768 */ void setDigEffect();
-    /* 80808884 */ void setElecEffect1();
-    /* 808089DC */ void setElecEffect2();
-    /* 80808B3C */ void setFireEffect();
-    /* 80808E34 */ bool checkWallCrash();
-    /* 80809000 */ u8 checkWolfBark();
-    /* 80809228 */ u8 checkSurpriseLock();
-    /* 8080963C */ u8 checkRailSurprise();
-    /* 808096EC */ u8 checkSurpriseNear();
-    /* 80809D6C */ void setNormalCc();
-    /* 80809D84 */ void setAppear();
-    /* 80809DA8 */ void setMoveSound(int);
-    /* 80809EF0 */ void setTurnSound();
-    /* 80809F9C */ void setActionMode(int);
-    /* 80809FC4 */ void executeWait();
-    /* 8080A57C */ void executeMove();
-    /* 8080ACB4 */ void executeEscape();
-    /* 8080B444 */ void executeDown();
-    /* 8080BB7C */ void damage_check();
-    /* 8080BCFC */ void executeWind();
-    /* 8080C05C */ int getSurpriseType();
-    /* 8080C1FC */ void setSurpriseAway();
-    /* 8080C24C */ void setGoHomeType();
-    /* 8080C374 */ void executeSurprise();
-    /* 8080CEE0 */ void executeBack();
-    /* 8080CFC8 */ void executeFall();
-    /* 8080D2C8 */ void executeAttack();
-    /* 8080D990 */ u8 checkAttackEnd();
-    /* 8080DB58 */ u8 setAttackMotion();
-    /* 8080DC5C */ void executeAttackWall();
-    /* 8080E26C */ void executeDefense();
-    /* 8080E49C */ u8 checkFlyTerritory();
-    /* 8080E630 */ void initFly();
-    /* 8080E6A0 */ void executeFly();
-    /* 8080F8C8 */ void setInclination();
-    /* 8080F92C */ void executeFlyAttack();
-    /* 80810084 */ void setNextPathPoint();
-    /* 8081013C */ u8 checkRailDig();
-    /* 8081030C */ void executeRail();
-    /* 80810690 */ void executeBackRail();
-    /* 80810DF8 */ void checkElectricStart();
-    /* 80810E64 */ void executeElectric();
-    /* 8081105C */ void executeSwitch();
-    /* 80811740 */ void initFireFly(int);
-    /* 80811838 */ void executeFire();
-    /* 808120B0 */ void setRiverAttention();
-    /* 808123C4 */ void setLockByCargo();
-    /* 808123D0 */ void executeRiver();
-    /* 80812FCC */ void checkFrinedSamePos();
-    /* 8081300C */ void action();
-    /* 80813528 */ void mtx_set();
-    /* 808135B0 */ void cc_set();
-    /* 808138AC */ int execute();
-    /* 80813A38 */ int _delete();
-    /* 80813AF0 */ int CreateHeap();
-    /* 80813EA4 */ u8 checkBeforeBg(s16);
-    /* 808143A0 */ u8 checkBeforeGround();
-    /* 808144D8 */ void checkInitialWall();
-    /* 80814758 */ u8 checkWall();
-    /* 80814AF0 */ void setHideType();
-    /* 80814BA4 */ int create();
+    u8 checkBck(char const*, int);
+    void bckSet(int, u8, f32, f32);
+    void bckSetFly(int, u8, f32, f32);
+    int draw();
+    void setDigEffect();
+    void setElecEffect1();
+    void setElecEffect2();
+    void setFireEffect();
+    bool checkWallCrash();
+    u8 checkWolfBark();
+    u8 checkSurpriseLock();
+    u8 checkRailSurprise();
+    u8 checkSurpriseNear();
+    void setNormalCc();
+    void setAppear();
+    void setMoveSound(int);
+    void setTurnSound();
+    void setActionMode(int);
+    void executeWait();
+    void executeMove();
+    void executeEscape();
+    void executeDown();
+    void damage_check();
+    void executeWind();
+    int getSurpriseType();
+    void setSurpriseAway();
+    void setGoHomeType();
+    void executeSurprise();
+    void executeBack();
+    void executeFall();
+    void executeAttack();
+    u8 checkAttackEnd();
+    u8 setAttackMotion();
+    void executeAttackWall();
+    void executeDefense();
+    u8 checkFlyTerritory();
+    void initFly();
+    void executeFly();
+    void setInclination();
+    void executeFlyAttack();
+    void setNextPathPoint();
+    u8 checkRailDig();
+    void executeRail();
+    void executeBackRail();
+    void checkElectricStart();
+    void executeElectric();
+    void executeSwitch();
+    void initFireFly(int);
+    void executeFire();
+    void setRiverAttention();
+    void setLockByCargo();
+    void executeRiver();
+    void checkFrinedSamePos();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    u8 checkBeforeBg(s16);
+    u8 checkBeforeGround();
+    void checkInitialWall();
+    u8 checkWall();
+    void setHideType();
+    int create();
 
     void setFriendFlag(u8 i_flag) { mFriendFlag |= i_flag; }
     u8 getFriendFlag() { return mFriendFlag; }
diff --git a/include/d/actor/d_a_e_ym_tag.h b/include/d/actor/d_a_e_ym_tag.h
index e3e5eab33c..c19a25505b 100644
--- a/include/d/actor/d_a_e_ym_tag.h
+++ b/include/d/actor/d_a_e_ym_tag.h
@@ -13,8 +13,8 @@
  */
 class daE_YM_TAG_c : public fopAc_ac_c {
 public:
-    /* 80815E8C */ int execute();
-    /* 80815F28 */ int create();
+    int execute();
+    int create();
 };
 
 #endif /* D_A_E_YM_TAG_H */
diff --git a/include/d/actor/d_a_e_ymb.h b/include/d/actor/d_a_e_ymb.h
index 2c2416348b..c6f8ae695d 100644
--- a/include/d/actor/d_a_e_ymb.h
+++ b/include/d/actor/d_a_e_ymb.h
@@ -17,68 +17,68 @@
 
 class daE_YMB_c : public fopEn_enemy_c {
 public:
-    /* 8081615C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 808164F0 */ static int JointCallBack(J3DJoint*, int);
-    /* 80816554 */ int draw();
-    /* 8081697C */ void setBck(int, u8, f32, f32);
-    /* 80816A20 */ bool checkBck(int);
-    /* 80816A7C */ void setActionMode(int, int);
-    /* 80816A88 */ void setLastDamage();
-    /* 80816B7C */ void damage_check();
-    /* 80816E78 */ void setCameraSwitch();
-    /* 80817064 */ void checkWaterPos();
-    /* 80817164 */ void checkGroundPos();
-    /* 80817200 */ void setFlyWaitVoice();
-    /* 8081727C */ void setDownWaitVoice();
-    /* 808172F8 */ void setHitBoardSe();
-    /* 808173B0 */ void setElecEffect1();
-    /* 8081756C */ void setElecEffect2();
-    /* 80817744 */ void setWaterEffect1();
-    /* 8081785C */ void setWaterEffect2();
-    /* 80817974 */ void setBoilEffect(int);
-    /* 80817AEC */ void setDamageEffect(int);
-    /* 80817BD8 */ void setDownHamonEffect();
-    /* 80817CF0 */ void setFlyBlurEffect();
-    /* 80817E7C */ void setRockDamageEffect();
-    /* 80817FDC */ void setDeathEffect();
-    /* 808181F4 */ void executeWait();
-    /* 80818328 */ void setBitePos(int);
-    /* 80818370 */ void setInclination();
-    /* 80818518 */ void setBodyAngle();
-    /* 80818930 */ bool checkWolfLockIn();
-    /* 80818AE8 */ void executeFly();
-    /* 80819610 */ void executeFlyAttack();
-    /* 80819FD0 */ void executeRunAway();
-    /* 8081A718 */ void executeGuard();
-    /* 8081A88C */ void executeSwim();
-    /* 8081B78C */ void executeWaterJump();
-    /* 8081BC10 */ void getNearDownPos();
-    /* 8081BEE8 */ void executeDamage();
-    /* 8081C4EC */ void setMidnaBindInit(cXyz*);
-    /* 8081C7D0 */ void setMidnaBindLevel(int);
-    /* 8081C908 */ void setWolfLockEffect();
-    /* 8081CC14 */ void initDownToWater();
-    /* 8081CD00 */ void calcDownToWater();
-    /* 8081CE6C */ void executeDown();
-    /* 8081D4D8 */ void setCreateDrop();
-    /* 8081D594 */ void executeDeath();
-    /* 8081DBD0 */ void demo_skip(int);
-    /* 8081DDE0 */ static int DemoSkipCallBack(void*, int);
-    /* 8081DE14 */ void calcLakeDemoPlayerPos();
-    /* 8081DE84 */ void executeLakeDemo();
-    /* 8081E5B4 */ void executeStartDemo();
-    /* 8081F140 */ bool checkStartBattleDemo();
-    /* 8081F2E0 */ void executeBattleDemo();
-    /* 8081FAC8 */ void action();
-    /* 8081FF88 */ void mtx_set();
-    /* 808200A0 */ void getBellyBitePos(cXyz*);
-    /* 80820128 */ int getDownLockPoint();
-    /* 808203D8 */ void setAttentionPos();
-    /* 80820668 */ void cc_set();
-    /* 808207AC */ int execute();
-    /* 80820A40 */ int _delete();
-    /* 80820AF0 */ int CreateHeap();
-    /* 80820DD0 */ cPhs__Step create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int draw();
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    void setActionMode(int, int);
+    void setLastDamage();
+    void damage_check();
+    void setCameraSwitch();
+    void checkWaterPos();
+    void checkGroundPos();
+    void setFlyWaitVoice();
+    void setDownWaitVoice();
+    void setHitBoardSe();
+    void setElecEffect1();
+    void setElecEffect2();
+    void setWaterEffect1();
+    void setWaterEffect2();
+    void setBoilEffect(int);
+    void setDamageEffect(int);
+    void setDownHamonEffect();
+    void setFlyBlurEffect();
+    void setRockDamageEffect();
+    void setDeathEffect();
+    void executeWait();
+    void setBitePos(int);
+    void setInclination();
+    void setBodyAngle();
+    bool checkWolfLockIn();
+    void executeFly();
+    void executeFlyAttack();
+    void executeRunAway();
+    void executeGuard();
+    void executeSwim();
+    void executeWaterJump();
+    void getNearDownPos();
+    void executeDamage();
+    void setMidnaBindInit(cXyz*);
+    void setMidnaBindLevel(int);
+    void setWolfLockEffect();
+    void initDownToWater();
+    void calcDownToWater();
+    void executeDown();
+    void setCreateDrop();
+    void executeDeath();
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void calcLakeDemoPlayerPos();
+    void executeLakeDemo();
+    void executeStartDemo();
+    bool checkStartBattleDemo();
+    void executeBattleDemo();
+    void action();
+    void mtx_set();
+    void getBellyBitePos(cXyz*);
+    int getDownLockPoint();
+    void setAttentionPos();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     int getMaxLockAttack() { return 6; }
     u8 getSwitchBit() { return mSwitchBit; }
diff --git a/include/d/actor/d_a_e_yr.h b/include/d/actor/d_a_e_yr.h
index b07eb88150..36a9e29c60 100644
--- a/include/d/actor/d_a_e_yr.h
+++ b/include/d/actor/d_a_e_yr.h
@@ -16,7 +16,7 @@
  */
 class e_yr_class {
 public:
-    /* 80827D64 */ e_yr_class();
+    e_yr_class();
 
     /* 0x0   */ fopEn_enemy_c mEnemy;
     /* 0x5AC */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_e_zh.h b/include/d/actor/d_a_e_zh.h
index 6fd346033a..8fd29035e8 100644
--- a/include/d/actor/d_a_e_zh.h
+++ b/include/d/actor/d_a_e_zh.h
@@ -19,41 +19,41 @@ class daObjCarry_c;
 
 class daE_ZH_c : public fopEn_enemy_c {
 public:
-    /* 8082907C */ int draw();
-    /* 808293A8 */ void setBck(int, u8, f32, f32);
-    /* 80829454 */ void setActionMode(int, int);
-    /* 80829570 */ bool startDemoCheck();
-    /* 80829658 */ void mBallBGCheck();
-    /* 808298BC */ void mGateOpen();
-    /* 808299F8 */ bool mColorSet(bool, f32, f32);
-    /* 80829AD8 */ bool mReturnLineMove();
-    /* 80829E44 */ bool mBallBgLineCheck();
-    /* 8082A01C */ bool mSearchMove(u8);
-    /* 8082A390 */ void mStartParticleSet();
-    /* 8082A4C8 */ bool mCutTypeCheck();
-    /* 8082A534 */ void damage_check();
-    /* 8082A88C */ void executeStartDemo();
-    /* 8082ABDC */ void executeWait();
-    /* 8082ACA8 */ void executeBallWait();
-    /* 8082B284 */ void executeOpenStart();
-    /* 8082B820 */ void executeSearchMove();
-    /* 8082BA18 */ void executeBgHitSHMove();
-    /* 8082BE20 */ void executeCatchMove();
-    /* 8082C670 */ void executeCatchFlyMove();
-    /* 8082CD34 */ void executeReturnDemo();
-    /* 8082D154 */ void executeFlyDelete();
-    /* 8082D2F0 */ void executeDamage();
-    /* 8082D97C */ void executeDeadStop();
-    /* 8082D9B0 */ void executeEntryCheck();
-    /* 8082DB64 */ void tagAction();
-    /* 8082DB84 */ void action();
-    /* 8082DE18 */ void mtx_set();
-    /* 8082DF44 */ void cc_set();
-    /* 8082E2FC */ int execute();
-    /* 8082E3E8 */ int _delete();
-    /* 8082E4E4 */ int CreateHeap();
-    /* 8082E730 */ cPhs__Step create();
-    /* 8082ECEC */ daE_ZH_c();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    bool startDemoCheck();
+    void mBallBGCheck();
+    void mGateOpen();
+    bool mColorSet(bool, f32, f32);
+    bool mReturnLineMove();
+    bool mBallBgLineCheck();
+    bool mSearchMove(u8);
+    void mStartParticleSet();
+    bool mCutTypeCheck();
+    void damage_check();
+    void executeStartDemo();
+    void executeWait();
+    void executeBallWait();
+    void executeOpenStart();
+    void executeSearchMove();
+    void executeBgHitSHMove();
+    void executeCatchMove();
+    void executeCatchFlyMove();
+    void executeReturnDemo();
+    void executeFlyDelete();
+    void executeDamage();
+    void executeDeadStop();
+    void executeEntryCheck();
+    void tagAction();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
+    daE_ZH_c();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
@@ -115,8 +115,8 @@ STATIC_ASSERT(sizeof(daE_ZH_c) == 0xe08);
 
 class daE_ZH_HIO_c: public JORReflexible {
 public:
-    /* 8082902C */ daE_ZH_HIO_c();
-    /* 8082F160 */ virtual ~daE_ZH_HIO_c() {}
+    daE_ZH_HIO_c();
+    virtual ~daE_ZH_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
diff --git a/include/d/actor/d_a_e_zm.h b/include/d/actor/d_a_e_zm.h
index dc5760a0f0..8c5ce67fcd 100644
--- a/include/d/actor/d_a_e_zm.h
+++ b/include/d/actor/d_a_e_zm.h
@@ -17,25 +17,25 @@
 
 class daE_ZM_c : public fopEn_enemy_c {
 public:
-    /* 8082F9A0 */ int draw();
-    /* 8082FBD4 */ void setBck(int, u8, f32, f32);
-    /* 8082FC80 */ void setActionMode(int, int);
-    /* 8082FC8C */ void damage_check();
-    /* 808301E0 */ bool mCutTypeCheck();
-    /* 8083033C */ void executeSearchPoint();
-    /* 80830398 */ void executeWait();
-    /* 808309DC */ void executeMove();
-    /* 80830AB8 */ void executeAttack();
-    /* 80830E28 */ void executeDamage();
-    /* 808310C4 */ void executeDead();
-    /* 80831474 */ void executeBullet();
-    /* 80831930 */ void action();
-    /* 80831B08 */ void mtx_set();
-    /* 80831B9C */ void cc_set();
-    /* 80831D64 */ int execute();
-    /* 80831E9C */ int _delete();
-    /* 80831F4C */ int CreateHeap();
-    /* 80832064 */ cPhs__Step create();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    bool mCutTypeCheck();
+    void executeSearchPoint();
+    void executeWait();
+    void executeMove();
+    void executeAttack();
+    void executeDamage();
+    void executeDead();
+    void executeBullet();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    cPhs__Step create();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;
diff --git a/include/d/actor/d_a_e_zs.h b/include/d/actor/d_a_e_zs.h
index 6901e01e27..d15b384650 100644
--- a/include/d/actor/d_a_e_zs.h
+++ b/include/d/actor/d_a_e_zs.h
@@ -22,22 +22,22 @@ public:
         /* 3 */ ACT_DRIVE
     };
 
-    /* 808330DC */ int draw();
-    /* 808331E4 */ void setBck(int, u8, f32, f32);
-    /* 80833290 */ void setActionMode(int, int);
-    /* 8083329C */ void damage_check();
-    /* 80833698 */ u8 mBossHandCheck();
-    /* 80833964 */ void executeAppear();
-    /* 80833D30 */ void executeWait();
-    /* 80833F1C */ void executeDamage();
-    /* 80834108 */ void executeDrive();
-    /* 808342C8 */ void action();
-    /* 80834478 */ void mtx_set();
-    /* 80834518 */ void cc_set();
-    /* 80834650 */ int execute();
-    /* 808346E4 */ int _delete();
-    /* 80834778 */ int CreateHeap();
-    /* 80834884 */ int create();
+    int draw();
+    void setBck(int, u8, f32, f32);
+    void setActionMode(int, int);
+    void damage_check();
+    u8 mBossHandCheck();
+    void executeAppear();
+    void executeWait();
+    void executeDamage();
+    void executeDrive();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
 private:
     /* 0x5ac */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_formation_mng.h b/include/d/actor/d_a_formation_mng.h
index ca30048a90..6555baeaac 100644
--- a/include/d/actor/d_a_formation_mng.h
+++ b/include/d/actor/d_a_formation_mng.h
@@ -8,8 +8,8 @@
 #include "SSystem/SComponent/c_math.h"
 
 struct daFmtMng_Path_c {
-    /* 808365B0 */ bool checkPathEnd(cXyz, f32);
-    /* 8083665C */ bool checkPoint(cXyz, f32);
+    bool checkPathEnd(cXyz, f32);
+    bool checkPoint(cXyz, f32);
 
     bool isPathClose() { return dPath_ChkClose(mPath); }
     s8 getArg0() { return mPath->m_points[field_0x4].mArg0; }
@@ -126,20 +126,20 @@ struct FmtMngAttributes {
 };
 
 struct daFmtMng_c : public fopAc_ac_c {
-    /* 80835558 */ void initWait();
-    /* 80835624 */ void initMemberPos();
-    /* 80835B24 */ void executeWait();
-    /* 80835D28 */ void initWalk();
-    /* 80835DEC */ void executeWalk();
-    /* 8083622C */ void setMovePath(FmtPos_c*, int);
-    /* 80836810 */ void initReverse();
-    /* 808368A4 */ void executeReverse();
-    /* 80836C64 */ void initMotion();
-    /* 80836E20 */ void executeMotion();
-    /* 80836F78 */ void initFight();
-    /* 80837078 */ void executeFight();
-    /* 808374B4 */ int create();
-    /* 8083750C */ void create_init();
+    void initWait();
+    void initMemberPos();
+    void executeWait();
+    void initWalk();
+    void executeWalk();
+    void setMovePath(FmtPos_c*, int);
+    void initReverse();
+    void executeReverse();
+    void initMotion();
+    void executeMotion();
+    void initFight();
+    void executeFight();
+    int create();
+    void create_init();
 
     ~daFmtMng_c() {
         FmtMember_c* member = mMember;
diff --git a/include/d/actor/d_a_grass.h b/include/d/actor/d_a_grass.h
index 8929d6029c..9b09aa95c5 100644
--- a/include/d/actor/d_a_grass.h
+++ b/include/d/actor/d_a_grass.h
@@ -8,13 +8,13 @@ class cCcD_Obj;
 
 class dGrass_data_c {
 public:
-    /* 8051D88C */ void WorkCo(fopAc_ac_c*, u32, int);
-    /* 8051DA20 */ void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*);
-    /* 8051DF54 */ void Direction_Set(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*, csXyz*);
-    /* 8051E1C8 */ void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, u16);
-    /* 8051EB88 */ void hitCheck(int, u16);
-    /* 80520940 */ ~dGrass_data_c() {}
-    /* 8052097C */ dGrass_data_c() {
+    void WorkCo(fopAc_ac_c*, u32, int);
+    void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*);
+    void Direction_Set(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*, csXyz*);
+    void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, u16);
+    void hitCheck(int, u16);
+    ~dGrass_data_c() {}
+    dGrass_data_c() {
         m_state = 0;
     }
 
@@ -33,9 +33,9 @@ public:
 
 class dGrass_room_c {
 public:
-    /* 8051EDE0 */ void newData(dGrass_data_c*);
-    /* 8051EDF0 */ void deleteData();
-    /* 80520928 */ dGrass_room_c() {
+    void newData(dGrass_data_c*);
+    void deleteData();
+    dGrass_room_c() {
         mp_data = NULL;
     }
 
@@ -46,7 +46,7 @@ public:
 
 class dGrass_anm_c {
 public:
-    /* 80520934 */ dGrass_anm_c() {
+    dGrass_anm_c() {
         m_state = 0;
     }
 
@@ -58,17 +58,17 @@ public:
 
 class dGrass_packet_c : public J3DPacket {
 public:
-    /* 8051EE8C */ dGrass_packet_c();
-    /* 8051FABC */ void calc();
-    /* 80520030 */ void update();
-    /* 8052067C */ void setData(dGrass_data_c*, int, cXyz&, int, u8, u8, s16, u8);
-    /* 80520770 */ dGrass_data_c* newData(cXyz&, int, u8, u8, s16, u8);
-    /* 80520864 */ void deleteRoom(int);
-    /* 80520898 */ int newAnm();
-    /* 805208E4 */ void setAnm(int, s16);
+    dGrass_packet_c();
+    void calc();
+    void update();
+    void setData(dGrass_data_c*, int, cXyz&, int, u8, u8, s16, u8);
+    dGrass_data_c* newData(cXyz&, int, u8, u8, s16, u8);
+    void deleteRoom(int);
+    int newAnm();
+    void setAnm(int, s16);
 
-    /* 8051F03C */ virtual void draw();
-    /* 8051BFBC */ virtual ~dGrass_packet_c();
+    virtual void draw();
+    virtual ~dGrass_packet_c();
 
     typedef void (dGrass_packet_c::*deleteFunc)(int);
     static deleteFunc m_deleteRoom;
@@ -103,13 +103,13 @@ STATIC_ASSERT(sizeof(dGrass_packet_c) == 0x1D718);
 
 class dFlower_data_c {
 public:
-    /* 80520988 */ void WorkCo(fopAc_ac_c*, u32, int);
-    /* 80520AD8 */ void deleteAnm();
-    /* 80520B34 */ void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*);
-    /* 80520CFC */ void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*);
-    /* 80521A3C */ void hitCheck(fopAc_ac_c*, int);
-    /* 80522FCC */ ~dFlower_data_c();
-    /* 80523008 */ dFlower_data_c();
+    void WorkCo(fopAc_ac_c*, u32, int);
+    void deleteAnm();
+    void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*);
+    void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*);
+    void hitCheck(fopAc_ac_c*, int);
+    ~dFlower_data_c();
+    dFlower_data_c();
 
     /* 0x00 */ u8 m_state;
     /* 0x01 */ s8 field_0x01;
@@ -123,9 +123,9 @@ public:
 
 class dFlower_room_c {
 public:
-    /* 80521BF8 */ void newData(dFlower_data_c*);
-    /* 80521C08 */ void deleteData();
-    /* 80522FB4 */ dFlower_room_c();
+    void newData(dFlower_data_c*);
+    void deleteData();
+    dFlower_room_c();
 
     dFlower_data_c* getData() { return mp_data; }
 
@@ -134,7 +134,7 @@ public:
 
 class dFlower_anm_c {
 public:
-    /* 80522FC0 */ dFlower_anm_c();
+    dFlower_anm_c();
 
     /* 0x00 */ u8 m_state;
     /* 0x02 */ s16 m_angY;
@@ -144,17 +144,17 @@ public:
 
 class dFlower_packet_c : public J3DPacket {
 public:
-    /* 80521C64 */ dFlower_packet_c();
-    /* 80522774 */ void calc();
-    /* 80522A64 */ void update();
-    /* 80522CBC */ void setData(dFlower_data_c*, int, s8, cXyz&, int, s8, s16);
-    /* 80522E28 */ dFlower_data_c* newData(s8, cXyz&, int, s8, s16);
-    /* 80522F0C */ void deleteRoom(int);
-    /* 80522F40 */ int newAnm();
-    /* 80522F8C */ void setAnm(int, s16);
+    dFlower_packet_c();
+    void calc();
+    void update();
+    void setData(dFlower_data_c*, int, s8, cXyz&, int, s8, s16);
+    dFlower_data_c* newData(s8, cXyz&, int, s8, s16);
+    void deleteRoom(int);
+    int newAnm();
+    void setAnm(int, s16);
 
-    /* 80521DAC */ virtual void draw();
-    /* 8051C194 */ virtual ~dFlower_packet_c();
+    virtual void draw();
+    virtual ~dFlower_packet_c();
 
     typedef void (dFlower_packet_c::*deleteFunc)(int);
     static deleteFunc m_deleteRoom;
@@ -202,18 +202,18 @@ public:
  */
 class daGrass_c : public fopAc_ac_c {
 public:
-    /* 8051BEFC */ bool createGrass();
-    /* 8051BF68 */ void deleteGrass();
-    /* 8051C040 */ void executeGrass();
-    /* 8051C074 */ void drawGrass();
-    /* 8051C0A8 */ void newGrassData(cXyz&, int, u8, u8, s16, u8);
-    /* 8051C0D4 */ bool createFlower();
-    /* 8051C140 */ void deleteFlower();
-    /* 8051C218 */ void executeFlower();
-    /* 8051C24C */ void drawFlower();
-    /* 8051C280 */ void newFlowerData(s8, cXyz&, int, s8, s16);
+    bool createGrass();
+    void deleteGrass();
+    void executeGrass();
+    void drawGrass();
+    void newGrassData(cXyz&, int, u8, u8, s16, u8);
+    bool createFlower();
+    void deleteFlower();
+    void executeFlower();
+    void drawFlower();
+    void newFlowerData(s8, cXyz&, int, s8, s16);
 
-    /* 8051C304 */ inline int create();
+    inline int create();
 
     inline int Delete();
     inline int execute();
@@ -222,8 +222,8 @@ public:
     static dGrass_packet_c* getGrass() { return m_grass; }
     static dFlower_packet_c* getFlower() { return m_flower; }
 
-    /* 800319C8 */ static void deleteRoomGrass(int);
-    /* 80031A20 */ static void deleteRoomFlower(int);
+    static void deleteRoomGrass(int);
+    static void deleteRoomFlower(int);
 
     static daGrass_c* m_myObj;
     static dGrass_packet_c* m_grass;
diff --git a/include/d/actor/d_a_guard_mng.h b/include/d/actor/d_a_guard_mng.h
index 8b2262d394..d5d5be96c3 100644
--- a/include/d/actor/d_a_guard_mng.h
+++ b/include/d/actor/d_a_guard_mng.h
@@ -61,8 +61,8 @@ public:
         return cPhs_COMPLEATE_e;
     }
 
-    /* 80837B9C */ u8 checkMerchantNum();
-    /* 80837BEC */ void checkAppearTag(daTagGuard_c*);
+    u8 checkMerchantNum();
+    void checkAppearTag(daTagGuard_c*);
 
     /* 0x568 */ daTagGuard_c* mpTagGuard;
     /* 0x56C */ f32 field_0x56c;
diff --git a/include/d/actor/d_a_horse.h b/include/d/actor/d_a_horse.h
index 111be87850..ed57253b6d 100644
--- a/include/d/actor/d_a_horse.h
+++ b/include/d/actor/d_a_horse.h
@@ -14,8 +14,8 @@
 
 class daHorseRein_c {
 public:
-    /* 80837F2C */ void setReinPos(int);
-    /* 808383A8 */ void setReinPosPart(int);
+    void setReinPos(int);
+    void setReinPosPart(int);
 
     /* 0x00 */ cXyz* field_0x0[2];
     /* 0x08 */ int field_0x8[2];
@@ -135,102 +135,102 @@ public:
         m_demoMode = 1;
     }
 
-    /* 807E27F8 */ void onDemoJumpDistance(f32 param_1, f32 param_2) {
+    void onDemoJumpDistance(f32 param_1, f32 param_2) {
         field_0x1768 = param_1;
         field_0x176c = param_2;
         field_0x1770 = param_1;
 
     }
 
-    /* 807E28B8 */ void changeDemoPos0(cXyz const* pos) {
+    void changeDemoPos0(cXyz const* pos) {
         m_demoPos0 = *pos;
     }
 
-    /* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*);
-    /* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*);
-    /* 80838B78 */ int modelCallBack(int);
-    /* 80838F98 */ int createHeap();
-    /* 8083940C */ static BOOL checkEnding();
-    /* 80839498 */ int create();
-    /* 80839D1C */ void setBasAnime(int);
-    /* 80839EBC */ void resetBasAnime();
-    /* 80839ED4 */ int setDoubleAnime(f32, f32, f32, u16, u16, f32);
-    /* 8083A20C */ int setSingleAnime(u16, f32, f32, s16, f32, int);
-    /* 8083A3C4 */ void animePlay();
-    /* 8083A5AC */ int checkDemoAction();
-    /* 8083A890 */ void setStickRodeoMove();
-    /* 8083AC7C */ void setStickCallMove();
-    /* 8083ACEC */ void setDemoMoveData(u32*, cXyz const*);
-    /* 8083AEC0 */ void setDemoData();
-    /* 8083B578 */ void acceptPlayerRide();
-    /* 8083B600 */ void setStickData();
-    /* 8083B828 */ void setTurnStartVibration();
-    /* 8083B82C */ void setTurnVibration();
-    /* 8083B830 */ void setMoveAnime(f32);
-    /* 8083BF48 */ int checkHorseNoMove(int);
-    /* 8083CA80 */ BOOL checkTurnPlayerState();
-    /* 8083CB38 */ int setSpeedAndAngle();
-    /* 8083D748 */ BOOL checkWaitTurn() const;
-    /* 8083D774 */ void setRoomInfo(int);
-    /* 8083D918 */ void setBodyPart();
-    /* 8083D9D8 */ void setMatrix();
-    /* 8083DC58 */ void setDashEffect(u32*);
-    /* 8083DEEC */ void setEffect();
-    /* 8083E4D8 */ void setCollision();
-    /* 8083E6E8 */ void autoGroundHit();
-    /* 8083E760 */ void setTailAngle();
-    /* 8083E8A4 */ void setNeckAngle();
-    /* 8083EA78 */ void copyFootMatrix();
-    /* 8083EB10 */ int setFootMatrix();
-    /* 8083ED88 */ int setLegAngle(f32, int, int, s16*);
-    /* 8083F3B0 */ void footBgCheck();
-    /* 8083F9AC */ void setReinPosMoveInit(int);
-    /* 8083FDAC */ void copyReinPos();
-    /* 8083FEB4 */ void setReinPosHandSubstance(int);
-    /* 8084010C */ void setReinPosNormalSubstance();
-    /* 808402F8 */ void bgCheck();
-    /* 80840714 */ bool checkSpecialWallHitSubstance(cXyz const&) const;
-    /* 808407B0 */ void setServiceWaitTimer();
-    /* 80840800 */ BOOL checkServiceWaitAnime();
-    /* 80840844 */ BOOL checkTurnInput();
-    /* 808408F0 */ BOOL checkTgHitTurn();
-    /* 808409C0 */ BOOL checkTurnAfterFastMove(f32);
-    /* 80840B28 */ void setNeckAnimeMorf();
-    /* 80840B88 */ void setNeckAnime(u16, f32, f32, s16);
-    /* 80840CA4 */ void resetNeckAnime();
-    /* 80840CE4 */ void setLashCnt();
-    /* 80840FE0 */ void setTalkModeWolf();
-    /* 80841084 */ void setBoarHit(fopAc_ac_c*, int);
-    /* 8084116C */ void savePos();
-    /* 808411D0 */ int callHorseSubstance(cXyz const*);
-    /* 80841468 */ void setHorsePosAndAngleSubstance(cXyz const*, s16);
-    /* 808415B4 */ BOOL checkPlayerHeavy();
-    /* 80841628 */ void setTgCoGrp(u32, u32);
-    /* 80841698 */ void onRideFlgSubstance();
-    /* 808416D4 */ void offRideFlgSubstance();
-    /* 80841708 */ int procWaitInit();
-    /* 808417B8 */ int procWait();
-    /* 80841F04 */ int procMoveInit();
-    /* 80841F80 */ int procMove();
-    /* 808423DC */ int procStopInit();
-    /* 808425BC */ int procStop();
-    /* 80842878 */ int procTurnInit(int);
-    /* 80842AB0 */ int procTurn();
-    /* 80843008 */ int procJumpInit(int);
-    /* 808432E0 */ int procJump();
-    /* 80843604 */ int procLandInit(f32, int);
-    /* 80843770 */ int procLand();
-    /* 808438AC */ int procLargeDamageInit();
-    /* 8084396C */ int procLargeDamage();
-    /* 808439C8 */ int procToolDemoInit();
-    /* 80843A44 */ int procToolDemo();
-    /* 80843BFC */ void searchSceneChangeArea(fopAc_ac_c*);
-    /* 80843C74 */ int execute();
-    /* 80844590 */ int draw();
-    /* 8084478C */ ~daHorse_c();
+    void coHitCallbackBoarJump(fopAc_ac_c*);
+    void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
+    void coHitCallbackCowHit(fopAc_ac_c*);
+    int modelCallBack(int);
+    int createHeap();
+    static BOOL checkEnding();
+    int create();
+    void setBasAnime(int);
+    void resetBasAnime();
+    int setDoubleAnime(f32, f32, f32, u16, u16, f32);
+    int setSingleAnime(u16, f32, f32, s16, f32, int);
+    void animePlay();
+    int checkDemoAction();
+    void setStickRodeoMove();
+    void setStickCallMove();
+    void setDemoMoveData(u32*, cXyz const*);
+    void setDemoData();
+    void acceptPlayerRide();
+    void setStickData();
+    void setTurnStartVibration();
+    void setTurnVibration();
+    void setMoveAnime(f32);
+    int checkHorseNoMove(int);
+    BOOL checkTurnPlayerState();
+    int setSpeedAndAngle();
+    BOOL checkWaitTurn() const;
+    void setRoomInfo(int);
+    void setBodyPart();
+    void setMatrix();
+    void setDashEffect(u32*);
+    void setEffect();
+    void setCollision();
+    void autoGroundHit();
+    void setTailAngle();
+    void setNeckAngle();
+    void copyFootMatrix();
+    int setFootMatrix();
+    int setLegAngle(f32, int, int, s16*);
+    void footBgCheck();
+    void setReinPosMoveInit(int);
+    void copyReinPos();
+    void setReinPosHandSubstance(int);
+    void setReinPosNormalSubstance();
+    void bgCheck();
+    bool checkSpecialWallHitSubstance(cXyz const&) const;
+    void setServiceWaitTimer();
+    BOOL checkServiceWaitAnime();
+    BOOL checkTurnInput();
+    BOOL checkTgHitTurn();
+    BOOL checkTurnAfterFastMove(f32);
+    void setNeckAnimeMorf();
+    void setNeckAnime(u16, f32, f32, s16);
+    void resetNeckAnime();
+    void setLashCnt();
+    void setTalkModeWolf();
+    void setBoarHit(fopAc_ac_c*, int);
+    void savePos();
+    int callHorseSubstance(cXyz const*);
+    void setHorsePosAndAngleSubstance(cXyz const*, s16);
+    BOOL checkPlayerHeavy();
+    void setTgCoGrp(u32, u32);
+    void onRideFlgSubstance();
+    void offRideFlgSubstance();
+    int procWaitInit();
+    int procWait();
+    int procMoveInit();
+    int procMove();
+    int procStopInit();
+    int procStop();
+    int procTurnInit(int);
+    int procTurn();
+    int procJumpInit(int);
+    int procJump();
+    int procLandInit(f32, int);
+    int procLand();
+    int procLargeDamageInit();
+    int procLargeDamage();
+    int procToolDemoInit();
+    int procToolDemo();
+    void searchSceneChangeArea(fopAc_ac_c*);
+    int execute();
+    int draw();
+    ~daHorse_c();
     
-    /* 80182D04 */ u32 getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
+    u32 getLashDashStart() const { return checkResetStateFlg0(RFLG0_LASH_DASH_START); }
     
 
     bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
diff --git a/include/d/actor/d_a_hozelda.h b/include/d/actor/d_a_hozelda.h
index 520d7eb521..7ed33de864 100644
--- a/include/d/actor/d_a_hozelda.h
+++ b/include/d/actor/d_a_hozelda.h
@@ -11,15 +11,15 @@ public:
         init();
     }
 
-    /* 80845EAC */ void init();
+    void init();
 
     void setNowOffsetX(f32 i_offsetX) { mNowOffsetX = i_offsetX; }
     void setNowOffsetY(f32 i_offsetY) { mNowOffsetY = i_offsetY; }
     f32* getNowOffsetXP() { return &mNowOffsetX; }
     f32* getNowOffsetYP() { return &mNowOffsetY; }
 
-    /* 80848D54 */ virtual ~daHoZelda_matAnm_c() {}
-    /* 80845EDC */ virtual void calc(J3DMaterial*) const;
+    virtual ~daHoZelda_matAnm_c() {}
+    virtual void calc(J3DMaterial*) const;
 
     static u8 getEyeMoveFlg() { return mEyeMoveFlg; }
     static void offEyeMoveFlg() { mEyeMoveFlg = false; }
@@ -78,31 +78,31 @@ public:
  */
 class daHoZelda_c : public fopAc_ac_c {
 public:
-    /* 80846000 */ int createHeap();
-    /* 80846718 */ void modelCallBack(u16);
-    /* 808469B0 */ int create();
-    /* 80846DB0 */ ~daHoZelda_c();
-    /* 80846F4C */ int setDoubleAnime(f32, f32, f32, u16, u16, f32);
-    /* 8084718C */ int setUpperAnime(u16);
-    /* 80847234 */ void resetUpperAnime();
-    /* 808472C0 */ int setSingleAnime(u16, f32, f32, s16, f32);
-    /* 80847430 */ void animePlay();
-    /* 80847574 */ void setEyeBtp(u16);
-    /* 808475F0 */ void setEyeBtk(u16, u8);
-    /* 80847670 */ void setNormalFace();
-    /* 808476B0 */ void setAnm();
-    /* 80847E44 */ void setBowModel();
-    /* 80847F54 */ void setMatrix();
-    /* 80848058 */ void shootArrow();
-    /* 80848090 */ void deleteArrow();
-    /* 80848118 */ void setBowBck(u16);
-    /* 8084819C */ void setRideOffset();
-    /* 80848204 */ void clearEyeMove();
-    /* 80848254 */ void setEyeMove(cXyz const*, s16, s16);
-    /* 808484B8 */ void setNeckAngle();
-    /* 80848774 */ void searchBodyAngle();
-    /* 808489CC */ int execute();
-    /* 80848B64 */ int draw();
+    int createHeap();
+    void modelCallBack(u16);
+    int create();
+    ~daHoZelda_c();
+    int setDoubleAnime(f32, f32, f32, u16, u16, f32);
+    int setUpperAnime(u16);
+    void resetUpperAnime();
+    int setSingleAnime(u16, f32, f32, s16, f32);
+    void animePlay();
+    void setEyeBtp(u16);
+    void setEyeBtk(u16, u8);
+    void setNormalFace();
+    void setAnm();
+    void setBowModel();
+    void setMatrix();
+    void shootArrow();
+    void deleteArrow();
+    void setBowBck(u16);
+    void setRideOffset();
+    void clearEyeMove();
+    void setEyeMove(cXyz const*, s16, s16);
+    void setNeckAngle();
+    void searchBodyAngle();
+    int execute();
+    int draw();
 
     MtxP getRightHandMtx() { return mpZeldaModel->getAnmMtx(22); }
     MtxP getRightFingerMtx() { return mpZeldaModel->getAnmMtx(23); }
diff --git a/include/d/actor/d_a_izumi_gate.h b/include/d/actor/d_a_izumi_gate.h
index 46f31158f1..425b148088 100644
--- a/include/d/actor/d_a_izumi_gate.h
+++ b/include/d/actor/d_a_izumi_gate.h
@@ -14,13 +14,13 @@
  */
 class daIzumiGate_c : public dBgS_MoveBgActor {
 public:
-    /* 80849098 */ void initBaseMtx();
-    /* 808490B8 */ void setBaseMtx();
-    /* 80849260 */ int CreateHeap();
-    /* 808492D8 */ int Create();
-    /* 808492FC */ int Execute(Mtx**);
-    /* 80849328 */ int Draw();
-    /* 808493CC */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     inline int create();
 
diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h
index eae761af12..3bac7b7997 100644
--- a/include/d/actor/d_a_kago.h
+++ b/include/d/actor/d_a_kago.h
@@ -18,78 +18,78 @@
  */
 class daKago_c : public fopAc_ac_c {
 public:
-    /* 80849660 */ int getBckName(int);
-    /* 808496F0 */ void setBck(int, u8, f32, f32);
-    /* 80849798 */ bool checkBck(int);
-    /* 808497F8 */ int draw();
-    /* 80849980 */ int executeBalloonMenu();
-    /* 80849BA8 */ f32 checkGroundHeight(cXyz, f32*);
-    /* 8084A070 */ f32 checkRoofHeight(cXyz);
-    /* 8084A210 */ void checkMoveHeight();
-    /* 8084A2A8 */ void checkSizeBg();
-    /* 8084A6DC */ s16 getBeforeGroundHeight(u8);
-    /* 8084A6E4 */ void demo_skip(int);
-    /* 8084AA64 */ static int DemoSkipCallBack(void*, int);
-    /* 8084AA98 */ void setActionMode(int, int);
-    /* 8084AAAC */ void setMidnaTagPos();
-    /* 8084AB40 */ void setMidnaRideOn();
-    /* 8084AB8C */ void setPlayerRideOn();
-    /* 8084ABC8 */ void setRideOff();
-    /* 8084AC2C */ s8 searchNearPassPoint();
-    /* 8084AE78 */ int setSceneChange(int);
-    /* 8084AF40 */ void createBalloonScore();
-    /* 8084AFB0 */ void startBalloonScore();
-    /* 8084B024 */ void endBalloonScore();
-    /* 8084B088 */ f32 checkNextPath(cXyz);
-    /* 8084B108 */ void checkHeight();
-    /* 8084B134 */ bool checkYaguraPos(cXyz);
-    /* 8084B1E0 */ bool checkWallHitFall(int);
-    /* 8084B56C */ bool checkAttackStart();
-    /* 8084B5DC */ s16 getValueY(f32);
-    /* 8084B6F4 */ s16 getValueX(f32);
-    /* 8084B718 */ s16 getValueAbsX(f32);
-    /* 8084B744 */ void flySpeedCalcLockOn();
-    /* 8084B96C */ void flySpeedCalc(s16, int);
-    /* 8084C078 */ bool checkFlySceneChange();
-    /* 8084C178 */ void setFlyAway();
-    /* 8084C204 */ void setFlyAnime();
-    /* 8084C2CC */ void executeFly();
-    /* 8084C8FC */ void executeStagger();
-    /* 8084D108 */ void executeWait();
-    /* 8084D354 */ bool calcAttackMove(int);
-    /* 8084D50C */ void executeAttack();
-    /* 8084DA18 */ void calcCircleCamera(int);
-    /* 8084DBFC */ void executeEvent();
-    /* 8084DD18 */ void initPerchDemo();
-    /* 8084E2D4 */ bool executePerchDemo();
-    /* 8084F09C */ bool PerchDemoAwayForward();
-    /* 8084FA58 */ void executePerch();
-    /* 8084FAA8 */ void executeEvent2();
-    /* 8084FB50 */ void initFirstDemo();
-    /* 80850384 */ bool executeFirstDemo();
-    /* 808513E4 */ void executePerch2();
-    /* 80851434 */ void executeLandingLakeHairia();
-    /* 80851DEC */ void executeLandingBoartHouse();
-    /* 808525B0 */ void executeLanding();
-    /* 80852610 */ void moveDemoFly();
-    /* 80852D90 */ void setFlyEffect();
-    /* 80852F14 */ void setDashEffect();
-    /* 808530A4 */ void setDamageEffect();
-    /* 80853228 */ void setDashBlurEffect(int);
-    /* 80853460 */ void setWallHitEffect(cXyz, int);
-    /* 8085350C */ void setSibukiEffect();
-    /* 8085366C */ void setDashSibukiEffect();
-    /* 80853730 */ void setWaterFallEffect();
-    /* 8085392C */ void setFlySound();
-    /* 80853BCC */ void action();
-    /* 80853EF0 */ void mtx_set();
-    /* 80853FB0 */ void cc_set();
-    /* 80854058 */ int execute();
-    /* 80854190 */ int _delete();
-    /* 80854220 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 808542DC */ static int JointCallBack(J3DJoint*, int);
-    /* 80854328 */ int CreateHeap();
-    /* 808544D8 */ int create();
+    int getBckName(int);
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    int draw();
+    int executeBalloonMenu();
+    f32 checkGroundHeight(cXyz, f32*);
+    f32 checkRoofHeight(cXyz);
+    void checkMoveHeight();
+    void checkSizeBg();
+    s16 getBeforeGroundHeight(u8);
+    void demo_skip(int);
+    static int DemoSkipCallBack(void*, int);
+    void setActionMode(int, int);
+    void setMidnaTagPos();
+    void setMidnaRideOn();
+    void setPlayerRideOn();
+    void setRideOff();
+    s8 searchNearPassPoint();
+    int setSceneChange(int);
+    void createBalloonScore();
+    void startBalloonScore();
+    void endBalloonScore();
+    f32 checkNextPath(cXyz);
+    void checkHeight();
+    bool checkYaguraPos(cXyz);
+    bool checkWallHitFall(int);
+    bool checkAttackStart();
+    s16 getValueY(f32);
+    s16 getValueX(f32);
+    s16 getValueAbsX(f32);
+    void flySpeedCalcLockOn();
+    void flySpeedCalc(s16, int);
+    bool checkFlySceneChange();
+    void setFlyAway();
+    void setFlyAnime();
+    void executeFly();
+    void executeStagger();
+    void executeWait();
+    bool calcAttackMove(int);
+    void executeAttack();
+    void calcCircleCamera(int);
+    void executeEvent();
+    void initPerchDemo();
+    bool executePerchDemo();
+    bool PerchDemoAwayForward();
+    void executePerch();
+    void executeEvent2();
+    void initFirstDemo();
+    bool executeFirstDemo();
+    void executePerch2();
+    void executeLandingLakeHairia();
+    void executeLandingBoartHouse();
+    void executeLanding();
+    void moveDemoFly();
+    void setFlyEffect();
+    void setDashEffect();
+    void setDamageEffect();
+    void setDashBlurEffect(int);
+    void setWallHitEffect(cXyz, int);
+    void setSibukiEffect();
+    void setDashSibukiEffect();
+    void setWaterFallEffect();
+    void setFlySound();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int JointCallBack(J3DJoint*, int);
+    int CreateHeap();
+    int create();
 
     void setEvent() {
         mIsFlying = false;
diff --git a/include/d/actor/d_a_mant.h b/include/d/actor/d_a_mant.h
index 53ae222994..7514bc6fca 100644
--- a/include/d/actor/d_a_mant.h
+++ b/include/d/actor/d_a_mant.h
@@ -12,8 +12,8 @@
 
 class daMant_packet_c : public J3DPacket {
 public:
-    /* 80861298 */ void draw();
-    /* 80862BA4 */ ~daMant_packet_c();
+    void draw();
+    ~daMant_packet_c();
 
     /* 0x0010 */ Mtx mMtx;
     /* 0x0040 */ Mtx mMtx2;
@@ -50,8 +50,8 @@ public:
 };
 struct mant_j_s {
     public:
-        /* 80862AC0 */ ~mant_j_s();
-        /* 80862B3C */ mant_j_s();
+        ~mant_j_s();
+        mant_j_s();
     
         /* 0x0000 */ cXyz field_0x0[13];
         /* 0x009C */ cXyz field_0x9c[13];
diff --git a/include/d/actor/d_a_mg_fish.h b/include/d/actor/d_a_mg_fish.h
index 2267cb8738..b1102ee550 100644
--- a/include/d/actor/d_a_mg_fish.h
+++ b/include/d/actor/d_a_mg_fish.h
@@ -113,8 +113,8 @@ STATIC_ASSERT(sizeof(mg_fish_class) == 0xC50);
 
 class daMg_Fish_HIO_c {
 public:
-    /* 80529D2C */ daMg_Fish_HIO_c();
-    /* 805360A8 */ virtual ~daMg_Fish_HIO_c() {}
+    daMg_Fish_HIO_c();
+    virtual ~daMg_Fish_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_midna.h b/include/d/actor/d_a_midna.h
index ea95e24a4a..a4f6bba546 100644
--- a/include/d/actor/d_a_midna.h
+++ b/include/d/actor/d_a_midna.h
@@ -54,8 +54,8 @@ public:
 
 class daMidna_McaMorfCB1_c : public mDoExt_McaMorfCallBack1_c {
 public:
-    /* 804BC36C */ int execute(u16, J3DTransformInfo*);
-    /* 804C6398 */ virtual ~daMidna_McaMorfCB1_c() {}
+    int execute(u16, J3DTransformInfo*);
+    virtual ~daMidna_McaMorfCB1_c() {}
 
     void setScale(cXyz* i_scale) { mpScale = i_scale; }
 
@@ -64,9 +64,9 @@ public:
 
 class daMidna_matAnm_c : public J3DMaterialAnm {
 public:
-    /* 804BC218 */ void init();
-    /* 804BC248 */ void calc(J3DMaterial*) const;
-    /* 804C63E0 */ inline ~daMidna_matAnm_c() {}
+    void init();
+    void calc(J3DMaterial*) const;
+    inline ~daMidna_matAnm_c() {}
 
     daMidna_matAnm_c() { init(); }
 
@@ -246,50 +246,50 @@ public:
     u32 checkForceTiredColor() const { return checkStateFlg1(FLG1_FORCE_TIRED_COL); }
     void onNoServiceWait() { onEndResetStateFlg0(ERFLG0_NO_SERVICE_WAIT); }
 
-    /* 804BC3E0 */ int modelCallBack(int);
-    /* 804BC5C4 */ int changeUpperBck();
-    /* 804BC614 */ int changeFaceBck();
-    /* 804BC670 */ int baseModelCallBack(int);
-    /* 804BC740 */ int initInvModel(u16, J3DModel**, mDoExt_invisibleModel*, u32);
-    /* 804BC7D4 */ int initDemoModel(J3DModel**, char const*, u32);
-    /* 804BC868 */ int createHeap();
-    /* 804BD274 */ cPhs__Step create();
-    /* 804BD93C */ void allAnimePlay();
-    /* 804BDE04 */ void setMatrix();
-    /* 804BE470 */ void setBodyPartMatrix();
-    /* 804BED1C */ void setRoomInfo();
-    /* 804BEDB8 */ void setBodyPartPos();
-    /* 804BEFA0 */ BOOL checkAppear();
-    /* 804BF070 */ void checkMidnaPosState();
-    /* 804BFF80 */ BOOL setUpperAnime(u16, u16);
-    /* 804C0020 */ BOOL setUpperAnimeAndSe(daMidna_ANM);
-    /* 804C0094 */ BOOL setFaceAnime(u16, u16);
-    /* 804C0134 */ void endHighModel();
-    /* 804C0238 */ BOOL setDemoAnm();
-    /* 804C0BAC */ void setFaceBtp(u16, int);
-    /* 804C0C6C */ void setFaceBtk(u16, int);
-    /* 804C0D2C */ void setLeftHandShape(u16);
-    /* 804C0E18 */ void setRightHandShape(u16);
-    /* 804C0F04 */ BOOL checkHairOnlyAnime(int) const;
-    /* 804C0F24 */ void setBckAnime(J3DAnmTransform*, int, f32);
-    /* 804C103C */ void setAnm();
-    /* 804C287C */ s16 getNeckAimAngle(cXyz const*, s16*, s16*, s16*, s16*);
-    /* 804C2A68 */ void clearEyeMove();
-    /* 804C2AB8 */ void setEyeMove(cXyz const*, s16, s16);
-    /* 804C2EBC */ void setNeckAngle();
-    /* 804C3168 */ void initHairAngle();
-    /* 804C3298 */ void setHairAngle();
-    /* 804C3F04 */ void setDemoData();
-    /* 804C4394 */ J3DAnmTevRegKey* setSimpleBrk(J3DModelData*, u16);
-    /* 804C4444 */ J3DAnmTextureSRTKey* setSimpleBtk(J3DModelData*, u16);
-    /* 804C44CC */ void initMidnaModel();
-    /* 804C49B8 */ void setMidnaNoDrawFlg();
-    /* 804C4AE8 */ int checkMetamorphoseEnableBase();
-    /* 804C4B68 */ BOOL checkNoDrawState();
-    /* 804C4BC0 */ void setSound();
-    /* 804C4FDC */ int execute();
-    /* 804C5A08 */ int draw();
-    /* 804C61A4 */ ~daMidna_c();
+    int modelCallBack(int);
+    int changeUpperBck();
+    int changeFaceBck();
+    int baseModelCallBack(int);
+    int initInvModel(u16, J3DModel**, mDoExt_invisibleModel*, u32);
+    int initDemoModel(J3DModel**, char const*, u32);
+    int createHeap();
+    cPhs__Step create();
+    void allAnimePlay();
+    void setMatrix();
+    void setBodyPartMatrix();
+    void setRoomInfo();
+    void setBodyPartPos();
+    BOOL checkAppear();
+    void checkMidnaPosState();
+    BOOL setUpperAnime(u16, u16);
+    BOOL setUpperAnimeAndSe(daMidna_ANM);
+    BOOL setFaceAnime(u16, u16);
+    void endHighModel();
+    BOOL setDemoAnm();
+    void setFaceBtp(u16, int);
+    void setFaceBtk(u16, int);
+    void setLeftHandShape(u16);
+    void setRightHandShape(u16);
+    BOOL checkHairOnlyAnime(int) const;
+    void setBckAnime(J3DAnmTransform*, int, f32);
+    void setAnm();
+    s16 getNeckAimAngle(cXyz const*, s16*, s16*, s16*, s16*);
+    void clearEyeMove();
+    void setEyeMove(cXyz const*, s16, s16);
+    void setNeckAngle();
+    void initHairAngle();
+    void setHairAngle();
+    void setDemoData();
+    J3DAnmTevRegKey* setSimpleBrk(J3DModelData*, u16);
+    J3DAnmTextureSRTKey* setSimpleBtk(J3DModelData*, u16);
+    void initMidnaModel();
+    void setMidnaNoDrawFlg();
+    int checkMetamorphoseEnableBase();
+    BOOL checkNoDrawState();
+    void setSound();
+    int execute();
+    int draw();
+    ~daMidna_c();
 
     daMidna_c() : mBtpHeap(0x400), mBtkHeap(0x400) {}
 
diff --git a/include/d/actor/d_a_mirror.h b/include/d/actor/d_a_mirror.h
index 1d6fbd21bd..39ef469fd1 100644
--- a/include/d/actor/d_a_mirror.h
+++ b/include/d/actor/d_a_mirror.h
@@ -5,15 +5,15 @@
 
 class dMirror_packet_c : public J3DPacket {
 public:
-    /* 80870BD8 */ dMirror_packet_c();
-    /* 80870C94 */ void reset();
-    /* 80870CA0 */ void calcMinMax();
-    /* 80870D58 */ int entryModel(J3DModel*);
-    /* 80870D88 */ void mirrorZdraw(f32*, f32*, f32, f32, f32, f32, f32, f32);
-    /* 80871268 */ void modelDraw(J3DModel*, f32 (*)[4]);
-    /* 8087146C */ void mainDraw();
-    /* 80871D84 */ virtual void draw();
-    /* 80871E84 */ virtual ~dMirror_packet_c();
+    dMirror_packet_c();
+    void reset();
+    void calcMinMax();
+    int entryModel(J3DModel*);
+    void mirrorZdraw(f32*, f32*, f32, f32, f32, f32, f32, f32);
+    void modelDraw(J3DModel*, f32 (*)[4]);
+    void mainDraw();
+    virtual void draw();
+    virtual ~dMirror_packet_c();
     cXyz& getViewScale() { return mViewScale; }
     GXTexObj& getTexObj() { return mTexObj; }
     cXyz* getQuad() { return mQuad; }
@@ -37,14 +37,14 @@ public:
  */
 class daMirror_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80871E24 */ daMirror_c();
-    /* 80871F08 */ BOOL createHeap();
-    /* 80871F78 */ void setModelMtx();
-    /* 8087206C */ inline int create();
-    /* 808723E4 */ int execute();
-    /* 80872560 */ int entryModel(J3DModel*);
-    /* 8003194C */ static int entry(J3DModel*);
-    /* 80031990 */ static bool remove();
+    daMirror_c();
+    BOOL createHeap();
+    void setModelMtx();
+    inline int create();
+    int execute();
+    int entryModel(J3DModel*);
+    static int entry(J3DModel*);
+    static bool remove();
 
     inline int Delete();
     inline int draw();
diff --git a/include/d/actor/d_a_movie_player.h b/include/d/actor/d_a_movie_player.h
index 7de7967ff2..4e28f15540 100644
--- a/include/d/actor/d_a_movie_player.h
+++ b/include/d/actor/d_a_movie_player.h
@@ -59,22 +59,22 @@ struct daMP_THPPlayer {
  */
 class daMP_c : public fopAc_ac_c {
 public:
-    /* 80031AD0 */ static int daMP_c_THPPlayerPlay();
-    /* 80031B24 */ static void daMP_c_THPPlayerPause();
-    /* 80031A78 */ static u32 daMP_c_Get_MovieRestFrame();
-    /* 80031AA4 */ static void daMP_c_Set_PercentMovieVolume(f32);
-    /* 80878BB8 */ int daMP_c_Get_arg_demoNo();
-    /* 80878C04 */ int daMP_c_Get_arg_movieNo();
-    /* 80878C28 */ int daMP_c_Init();
-    /* 80878D64 */ int daMP_c_Finish();
-    /* 80878D94 */ int daMP_c_Main();
-    /* 80878DD8 */ int daMP_c_Draw();
-    /* 80878ED4 */ daMP_c() {}
+    static int daMP_c_THPPlayerPlay();
+    static void daMP_c_THPPlayerPause();
+    static u32 daMP_c_Get_MovieRestFrame();
+    static void daMP_c_Set_PercentMovieVolume(f32);
+    int daMP_c_Get_arg_demoNo();
+    int daMP_c_Get_arg_movieNo();
+    int daMP_c_Init();
+    int daMP_c_Finish();
+    int daMP_c_Main();
+    int daMP_c_Draw();
+    daMP_c() {}
 
-    /* 80878E60 */ static int daMP_c_Callback_Init(fopAc_ac_c*);
-    /* 80878F18 */ static int daMP_c_Callback_Finish(daMP_c*);
-    /* 80878F38 */ static int daMP_c_Callback_Main(daMP_c*);
-    /* 80878F70 */ static int daMP_c_Callback_Draw(daMP_c*);
+    static int daMP_c_Callback_Init(fopAc_ac_c*);
+    static int daMP_c_Callback_Finish(daMP_c*);
+    static int daMP_c_Callback_Main(daMP_c*);
+    static int daMP_c_Callback_Draw(daMP_c*);
 
     static daMP_c* m_myObj;
 
@@ -91,9 +91,9 @@ STATIC_ASSERT(sizeof(daMP_c) == 0x580);
 
 class daMP_Dlst_base_c : public dDlst_base_c {
 public:
-    /* 80878FD8 */ daMP_Dlst_base_c() {}
+    daMP_Dlst_base_c() {}
 
-    /* 80878DB8 */ virtual void draw();
+    virtual void draw();
 };
 
 inline s32 daMP_NEXT_READ_SIZE(daMP_THPReadBuffer* readBuf) {
diff --git a/include/d/actor/d_a_myna.h b/include/d/actor/d_a_myna.h
index 7159118cc9..e93e28b2cd 100644
--- a/include/d/actor/d_a_myna.h
+++ b/include/d/actor/d_a_myna.h
@@ -29,94 +29,94 @@ STATIC_ASSERT(sizeof(ShopItem) == 0x10);
  */
 class daMyna_c : public fopAc_ac_c {
 public:
-    /* 80945E80 */ int baseMotion00(int);
-    /* 80945EC0 */ int baseMotion01(int);
-    /* 80945F00 */ int baseMotion02(int);
-    /* 80945F40 */ int baseMotion03(int);
-    /* 80945FA0 */ int baseMotion04(int);
-    /* 80946000 */ int baseMotion05(int);
-    /* 80946060 */ int baseMotion06(int);
-    /* 809460A0 */ int create();
-    /* 809463B8 */ int destroy();
-    /* 8094640C */ int draw();
-    /* 809464CC */ int execute();
-    /* 809466D8 */ int createHeap();
-    /* 8094686C */ int jntNodeCB(J3DJoint*, J3DModel*);
-    /* 809468EC */ void attack_wait_init();
-    /* 8094692C */ void attack_wait_move();
-    /* 80946AEC */ void attack_before_talk_init();
-    /* 80946B40 */ void attack_before_talk_move();
-    /* 80946BB4 */ void attack_fly_init();
-    /* 80946BF4 */ void attack_fly_move();
-    /* 80946D20 */ void attack_init();
-    /* 80946D64 */ void attack_move();
-    /* 80946DD4 */ void attack_after_talk_init();
-    /* 80946E08 */ void attack_after_talk_move();
-    /* 80946E84 */ void greet_wait_init();
-    /* 80946EB0 */ void greet_wait_move();
-    /* 80947030 */ void greet_talk_init();
-    /* 8094711C */ void greet_talk_move();
-    /* 809471BC */ void shopping_wait_init();
-    /* 809471E8 */ void shopping_wait_move();
-    /* 809475B4 */ void shopping_talk_init();
-    /* 80947630 */ void shopping_talk_move();
-    /* 809476A0 */ void thanks_talk_init();
-    /* 8094772C */ void thanks_talk_move();
-    /* 80947794 */ void byebye_talk_init();
-    /* 809478D0 */ void byebye_talk_move();
-    /* 80947A00 */ void turn_on_start_init();
-    /* 80947AA4 */ void turn_on_start_move();
-    /* 80947CD0 */ void turn_on_init();
-    /* 80947CFC */ void turn_on_move();
-    /* 80947D48 */ void turn_on_end1_init();
-    /* 80947D74 */ void turn_on_end1_move();
-    /* 80947E18 */ void turn_on_end2_init();
-    /* 80947E50 */ void turn_on_end2_move();
-    /* 80948070 */ void turn_on_end3_init();
-    /* 80948074 */ void turn_on_end3_move();
-    /* 809480E4 */ void wolf_talk_init();
-    /* 80948118 */ void wolf_talk_move();
-    /* 80948174 */ void attack_wait2_init();
-    /* 809481B4 */ void attack_wait2_move();
-    /* 80948388 */ void attack_before_talk2_init();
-    /* 809483DC */ void attack_before_talk2_move();
-    /* 80948444 */ void attack_fly2_init();
-    /* 80948484 */ void attack_fly2_move();
-    /* 80948600 */ void attack2_init();
-    /* 80948644 */ void attack2_move();
-    /* 809486F8 */ void attack2_talk_init();
-    /* 80948734 */ void attack2_talk_move();
-    /* 809487EC */ void soldoutItem(fpc_ProcID);
-    /* 80948828 */ bool fly_attack_move();
-    /* 80948ADC */ bool fly_return_move();
-    /* 80948DFC */ void fly_body_wave();
-    /* 80948E84 */ void talkAnime(msg_class*);
-    /* 80948FAC */ int chkEvent();
-    /* 809490B8 */ int orderEvent();
-    /* 80949128 */ void deleteItem(int);
-    /* 80949144 */ void deleteItem(fpc_ProcID);
-    /* 80949190 */ void initiate();
-    /* 80949408 */ void setItemInfo();
-    /* 80949544 */ void setRoomNo();
-    /* 80949588 */ void setCollision();
-    /* 809495E0 */ void set_mtx();
-    /* 80949744 */ void animePlay();
-    /* 8094983C */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 809498B8 */ void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    /* 809498F8 */ J3DAnmTransformKey* getTrnsfrmKeyAnm(char*);
-    /* 80949948 */ J3DAnmTexPattern* getTexPtrnAnm(char*);
-    /* 80949A70 */ int checkEndAnm(J3DFrameCtrl*);
-    /* 80949998 */ int checkEndAnm(f32);
-    /* 80949AD4 */ u8 getItemNumMax();
-    /* 80949AE0 */ u8 getItemType(void*);
-    /* 80949C0C */ u16 getFlowNodeNum();
-    /* 80949C44 */ void checkDead();
-    /* 80949D54 */ int chkPlayerInEvtArea(fopAc_ac_c*, cXyz);
-    /* 80949EE8 */ void animeControl();
-    /* 8094A054 */ void setAnimeType(u8, f32);
-    /* 8094A098 */ void playDefaultWaitAnime();
-    /* 8094A608 */ void setDefaultWaitAnime(u8);
-    /* 8094AA20 */ virtual ~daMyna_c() {}
+    int baseMotion00(int);
+    int baseMotion01(int);
+    int baseMotion02(int);
+    int baseMotion03(int);
+    int baseMotion04(int);
+    int baseMotion05(int);
+    int baseMotion06(int);
+    int create();
+    int destroy();
+    int draw();
+    int execute();
+    int createHeap();
+    int jntNodeCB(J3DJoint*, J3DModel*);
+    void attack_wait_init();
+    void attack_wait_move();
+    void attack_before_talk_init();
+    void attack_before_talk_move();
+    void attack_fly_init();
+    void attack_fly_move();
+    void attack_init();
+    void attack_move();
+    void attack_after_talk_init();
+    void attack_after_talk_move();
+    void greet_wait_init();
+    void greet_wait_move();
+    void greet_talk_init();
+    void greet_talk_move();
+    void shopping_wait_init();
+    void shopping_wait_move();
+    void shopping_talk_init();
+    void shopping_talk_move();
+    void thanks_talk_init();
+    void thanks_talk_move();
+    void byebye_talk_init();
+    void byebye_talk_move();
+    void turn_on_start_init();
+    void turn_on_start_move();
+    void turn_on_init();
+    void turn_on_move();
+    void turn_on_end1_init();
+    void turn_on_end1_move();
+    void turn_on_end2_init();
+    void turn_on_end2_move();
+    void turn_on_end3_init();
+    void turn_on_end3_move();
+    void wolf_talk_init();
+    void wolf_talk_move();
+    void attack_wait2_init();
+    void attack_wait2_move();
+    void attack_before_talk2_init();
+    void attack_before_talk2_move();
+    void attack_fly2_init();
+    void attack_fly2_move();
+    void attack2_init();
+    void attack2_move();
+    void attack2_talk_init();
+    void attack2_talk_move();
+    void soldoutItem(fpc_ProcID);
+    bool fly_attack_move();
+    bool fly_return_move();
+    void fly_body_wave();
+    void talkAnime(msg_class*);
+    int chkEvent();
+    int orderEvent();
+    void deleteItem(int);
+    void deleteItem(fpc_ProcID);
+    void initiate();
+    void setItemInfo();
+    void setRoomNo();
+    void setCollision();
+    void set_mtx();
+    void animePlay();
+    int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    void setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
+    J3DAnmTransformKey* getTrnsfrmKeyAnm(char*);
+    J3DAnmTexPattern* getTexPtrnAnm(char*);
+    int checkEndAnm(J3DFrameCtrl*);
+    int checkEndAnm(f32);
+    u8 getItemNumMax();
+    u8 getItemType(void*);
+    u16 getFlowNodeNum();
+    void checkDead();
+    int chkPlayerInEvtArea(fopAc_ac_c*, cXyz);
+    void animeControl();
+    void setAnimeType(u8, f32);
+    void playDefaultWaitAnime();
+    void setDefaultWaitAnime(u8);
+    virtual ~daMyna_c() {}
 
     daMyna_c() {}
 
diff --git a/include/d/actor/d_a_nbomb.h b/include/d/actor/d_a_nbomb.h
index 35a6a6ae24..4c5eb820ff 100644
--- a/include/d/actor/d_a_nbomb.h
+++ b/include/d/actor/d_a_nbomb.h
@@ -44,36 +44,36 @@ public:
         TYPE_WATER_ENEMY,
     };
 
-    /* 804C6DCC */ void coHitCallback(fopAc_ac_c*);
-    /* 804C6E34 */ void tgHitCallback(dCcD_GObjInf*);
-    /* 804C6FD8 */ int searchEnemy(fopAc_ac_c*);
-    /* 804C7114 */ int createHeap();
-    /* 804C7324 */ int create();
-    /* 804C7EB4 */ ~daNbomb_c();
-    /* 804C8294 */ bool checkTimerStop();
-    /* 804C82D8 */ BOOL checkExplode();
-    /* 804C8430 */ void setRoomInfo();
-    /* 804C84D8 */ void setSmokePos();
-    /* 804C8588 */ void setEffect();
-    /* 804C87F0 */ void setHookshotOffset();
-    /* 804C88CC */ void setFreeze();
-    /* 804C88F0 */ BOOL checkWaterIn();
-    /* 804C8928 */ BOOL insectLineCheck();
-    /* 804C8A88 */ void setHitPolygon(int);
-    /* 804C8CF8 */ BOOL procExplodeInit();
-    /* 804C9118 */ BOOL procExplode();
-    /* 804C93E0 */ BOOL procCarryInit();
-    /* 804C955C */ BOOL procCarry();
-    /* 804C9930 */ BOOL procWaitInit();
-    /* 804C9984 */ BOOL procWait();
-    /* 804CA268 */ BOOL procFlowerWaitInit();
-    /* 804CA2EC */ BOOL procFlowerWait();
-    /* 804CA3B8 */ BOOL procBoomerangMoveInit(dCcD_GObjInf*);
-    /* 804CA4E0 */ BOOL procBoomerangMove();
-    /* 804CA688 */ BOOL procInsectMoveInit();
-    /* 804CA780 */ BOOL procInsectMove();
-    /* 804CAEE8 */ int execute();
-    /* 804CBC60 */ int draw();
+    void coHitCallback(fopAc_ac_c*);
+    void tgHitCallback(dCcD_GObjInf*);
+    int searchEnemy(fopAc_ac_c*);
+    int createHeap();
+    int create();
+    ~daNbomb_c();
+    bool checkTimerStop();
+    BOOL checkExplode();
+    void setRoomInfo();
+    void setSmokePos();
+    void setEffect();
+    void setHookshotOffset();
+    void setFreeze();
+    BOOL checkWaterIn();
+    BOOL insectLineCheck();
+    void setHitPolygon(int);
+    BOOL procExplodeInit();
+    BOOL procExplode();
+    BOOL procCarryInit();
+    BOOL procCarry();
+    BOOL procWaitInit();
+    BOOL procWait();
+    BOOL procFlowerWaitInit();
+    BOOL procFlowerWait();
+    BOOL procBoomerangMoveInit(dCcD_GObjInf*);
+    BOOL procBoomerangMove();
+    BOOL procInsectMoveInit();
+    BOOL procInsectMove();
+    int execute();
+    int draw();
 
     virtual u8 checkExplodeNow() { return field_0xb51 != 0; }
     virtual void deleteBombAndEffect() {
diff --git a/include/d/actor/d_a_ni.h b/include/d/actor/d_a_ni.h
index 78bc66ab0b..a4acbd2a4a 100644
--- a/include/d/actor/d_a_ni.h
+++ b/include/d/actor/d_a_ni.h
@@ -156,8 +156,8 @@ STATIC_ASSERT(sizeof(ni_class) == 0xb0c);
 
 class daNi_HIO_c {
 public:
-    /* 8094BC2C */ daNi_HIO_c();
-    /* 80951118 */ virtual ~daNi_HIO_c() {}
+    daNi_HIO_c();
+    virtual ~daNi_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mBaseSize;
diff --git a/include/d/actor/d_a_no_chg_room.h b/include/d/actor/d_a_no_chg_room.h
index b1287acfe5..703880a4b6 100644
--- a/include/d/actor/d_a_no_chg_room.h
+++ b/include/d/actor/d_a_no_chg_room.h
@@ -5,8 +5,8 @@
 
 class daNocrm_c : public fopAc_ac_c {
 public:
-    /* 801452DC */ int execute();
-    /* 80145508 */ int getRoomNo(int);
+    int execute();
+    int getRoomNo(int);
     inline int create();
 
     s8 getReadRoomId() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h
index 875d7b87f3..6ba8bda3a3 100644
--- a/include/d/actor/d_a_npc.h
+++ b/include/d/actor/d_a_npc.h
@@ -32,14 +32,14 @@ private:
     /* 0x0 */ fpc_ProcID mActorID;
 
 public:
-    /* 801456D4 */ void initialize();
-    /* 801456E0 */ void entry(fopAc_ac_c*);
-    /* 801456FC */ void remove();
-    /* 80145708 */ fopAc_ac_c* getActorP();
+    void initialize();
+    void entry(fopAc_ac_c*);
+    void remove();
+    fopAc_ac_c* getActorP();
 
     daNpcT_ActorMngr_c() { initialize(); };
 
-    /* 8014D108 */ virtual ~daNpcT_ActorMngr_c() {}
+    virtual ~daNpcT_ActorMngr_c() {}
 };
 
 class daNpcT_MatAnm_c : public J3DMaterialAnm {
@@ -54,9 +54,9 @@ private:
 public:
     daNpcT_MatAnm_c() { initialize(); }
 
-    /* 80145764 */ void initialize();
-    /* 8014D24C */ virtual ~daNpcT_MatAnm_c() {}
-    /* 80145788 */ virtual void calc(J3DMaterial*) const;
+    void initialize();
+    virtual ~daNpcT_MatAnm_c() {}
+    virtual void calc(J3DMaterial*) const;
 
     void setNowOffsetX(f32 i_value) { mNowOffsetX = i_value; }
     void setNowOffsetY(f32 i_value) { mNowOffsetY = i_value; }
@@ -74,9 +74,9 @@ public:
         /* 0x3 */ s8 mLoopCount;
     };  // Size: 0x4?
 
-    /* 80145898 */ void initialize();
-    /* 801458C0 */ int play(u16, int*, f32*);
-    /* 80145A24 */ s32 checkEndSequence();
+    void initialize();
+    int play(u16, int*, f32*);
+    s32 checkEndSequence();
 
     daNpcT_MotionSeqMngr_c(sequenceStepData_c const* param_1,int param_2) :
     mpSeqData(param_1), mStepNum(param_2) {
@@ -112,7 +112,7 @@ private:
     /* 0x1C */ bool mEndSequence;
 
 public:
-    /* 8014D0C0 */ virtual ~daNpcT_MotionSeqMngr_c() {}
+    virtual ~daNpcT_MotionSeqMngr_c() {}
 };
 
 class daNpcT_Hermite_c {
@@ -123,7 +123,7 @@ public:
     /* 0x0C */ f32 H10;
     /* 0x10 */ f32 H11;
 
-    /* 8014CBAC */ virtual ~daNpcT_Hermite_c() {}
+    virtual ~daNpcT_Hermite_c() {}
 
     f32 GetH00() { return H00; }
     f32 GetH01() { return H01; }
@@ -154,20 +154,20 @@ public:
     /* 0x20 */ u8 mDirection;
     /* 0x21 */ u8 mIsClosed;
 
-    /* 80145B7C */ void hermite(cXyz&, cXyz&, cXyz&, cXyz&, daNpcT_Hermite_c&, cXyz&);
-    /* 80145C40 */ void initialize();
-    /* 80145C74 */ int setPathInfo(u8, s8, u8);
-    /* 80145D2C */ int setNextPathInfo(s8, u8);
-    /* 80145DA0 */ void reverse();
+    void hermite(cXyz&, cXyz&, cXyz&, cXyz&, daNpcT_Hermite_c&, cXyz&);
+    void initialize();
+    int setPathInfo(u8, s8, u8);
+    int setNextPathInfo(s8, u8);
+    void reverse();
     void setNextIdx() { setNextIdx(getNumPnts()); }
-    /* 80145DD0 */ int setNextIdx(int);
+    int setNextIdx(int);
     int getDstPos(cXyz i_pnt, cXyz* o_pos_p) {
         return getDstPos(i_pnt, o_pos_p, getNumPnts());
     }
-    /* 80145E38 */ int getDstPos(cXyz, cXyz*, int);
-    /* 80145FB4 */ int getDstPosH(cXyz, cXyz*, int, int);
-    /* 80146188 */ int chkPassed1(cXyz, int);
-    /* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int);
+    int getDstPos(cXyz, cXyz*, int);
+    int getDstPosH(cXyz, cXyz*, int, int);
+    int chkPassed1(cXyz, int);
+    int chkPassed2(cXyz, cXyz*, int, int);
 #if DEBUG
     int drawDbgInfo(f32, int);
 #endif
@@ -245,11 +245,11 @@ private:
     /* 0x158 */ u8 field_0x158;
 
 public:
-    /* 80146C98 */ void initialize();
-    /* 80146CD8 */ void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32,
+    void initialize();
+    void setParam(fopAc_ac_c*, J3DModel*, cXyz*, int, int, int, f32, f32, f32, f32,
                                  f32, f32, f32, f32, f32, f32, cXyz*);
-    /* 80147858 */ void calc(f32);
-    /* 80147C38 */ void calcJntRad(f32, f32, f32);
+    void calc(f32);
+    void calcJntRad(f32, f32, f32);
 #if DEBUG
     void drawDbgInfo();
 #endif
@@ -338,7 +338,7 @@ public:
     daNpcT_JntAnm_c() {
         initialize();
     }
-    /* 8014D150 */ virtual ~daNpcT_JntAnm_c() {}
+    virtual ~daNpcT_JntAnm_c() {}
 
     void clrDirectFlag() { mDirectFlag = 0; }
     int getMode() { return mMode; }
@@ -446,8 +446,8 @@ public:
 
 class daNpcT_DmgStagger_c {
 public:
-    /* 80147DCC */ void setParam(fopAc_ac_c*, fopAc_ac_c*, s16);
-    /* 80147E3C */ void calc(BOOL);
+    void setParam(fopAc_ac_c*, fopAc_ac_c*, s16);
+    void calc(BOOL);
 
     void initialize() {
         //TODO: Separate decl is fakematch, but using 0 directly in the setall call causes
@@ -641,113 +641,113 @@ public:
         initialize();
     }
 
-    /* 80147FA4 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80147FD4 */ static void* srchActor(void*, void*);
-    /* 80148058 */ J3DAnmTransform* getTrnsfrmAnmP(char const*, int);
-    /* 80148094 */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int);
-    /* 801480D0 */ J3DAnmTexPattern* getTexPtrnAnmP(char const*, int);
-    /* 8014810C */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char const*, int);
-    /* 80148148 */ J3DAnmTevRegKey* getTevRegKeyAnmP(char const*, int);
-    /* 80148184 */ J3DAnmColor* getColorAnmP(char const*, int);
-    /* 801481C0 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
-    /* 80148204 */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 801482F8 */ int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    /* 80148338 */ int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
-    /* 80148378 */ int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
-    /* 801483B8 */ int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int);
-    /* 801483F8 */ int loadRes(s8 const*, char const**);
-    /* 801484AC */ void deleteRes(s8 const*, char const**);
-    /* 8014852C */ int execute();
-    /* 8014886C */ int draw(BOOL, BOOL, f32, _GXColorS10*, f32, BOOL, BOOL, BOOL);
-    /* 80148C70 */ void setEnvTevColor();
-    /* 80148CCC */ void setRoomNo();
-    /* 80148D10 */ int checkEndAnm(f32);
-    /* 80148DD0 */ int checkEndAnm(J3DFrameCtrl*, f32);
-    /* 80148E4C */ void playAllAnm();
-    /* 80149190 */ void setMtx();
-    /* 8014924C */ void ctrlFaceMotion();
-    /* 80149300 */ void ctrlMotion();
-    /* 801493B8 */ int ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
-    /* 8014A224 */ void evtChange();
-    /* 8014A388 */ bool setFaceMotionAnm(int, bool);
-    /* 8014A908 */ void setPos(cXyz);
-    /* 8014AA18 */ void setAngle(s16);
-    /* 8014A99C */ void setAngle(csXyz);
-    /* 8014AA40 */ fopAc_ac_c* hitChk(dCcD_GObjInf*, u32);
-    /* 8014AAD0 */ void setDamage(int, int, int);
-    /* 8014ABD0 */ BOOL chkActorInSight(fopAc_ac_c*, f32, s16);
-    /* 8014ACF0 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
-    /* 8014ADA0 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
-    /* 8014AE1C */ BOOL chkFindActor(fopAc_ac_c*, BOOL, s16);
-    /* 8014B024 */ BOOL chkWolfAction();
-    /* 8014B0C8 */ BOOL chkFindWolf(s16, int, int, f32, f32, f32, f32, BOOL);
-    /* 8014B338 */ BOOL srchPlayerActor();
-    /* 8014B3EC */ cXyz getAttnPos(fopAc_ac_c*);
-    /* 8014B4A4 */ BOOL turn(s16, int, int);
-    /* 8014B648 */ BOOL step(s16, int, int, int, int);
-    /* 8014B808 */ void calcSpeedAndAngle(cXyz, BOOL, s16, s16);
-    /* 8014BB00 */ int getActorDistance(fopAc_ac_c*, int, int);
-    /* 8014BBF0 */ BOOL initTalk(int, fopAc_ac_c**);
-    /* 8014BC78 */ BOOL talkProc(int*, BOOL, fopAc_ac_c**, BOOL);
-    /* 8014BE2C */ fopAc_ac_c* getNearestActorP(s16);
-    /* 8014BEE4 */ fopAc_ac_c* getEvtAreaTagP(int, int);
-    /* 8014BFB0 */ fopAc_ac_c* getShopItemTagP();
-    /* 8014C030 */ void setHitodamaPrtcl();
+    static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    static void* srchActor(void*, void*);
+    J3DAnmTransform* getTrnsfrmAnmP(char const*, int);
+    J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int);
+    J3DAnmTexPattern* getTexPtrnAnmP(char const*, int);
+    J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char const*, int);
+    J3DAnmTevRegKey* getTevRegKeyAnmP(char const*, int);
+    J3DAnmColor* getColorAnmP(char const*, int);
+    int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
+    int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
+    int setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
+    int setBrkAnm(J3DAnmTevRegKey*, J3DModelData*, f32, int);
+    int setBpkAnm(J3DAnmColor*, J3DModelData*, f32, int);
+    int loadRes(s8 const*, char const**);
+    void deleteRes(s8 const*, char const**);
+    int execute();
+    int draw(BOOL, BOOL, f32, _GXColorS10*, f32, BOOL, BOOL, BOOL);
+    void setEnvTevColor();
+    void setRoomNo();
+    int checkEndAnm(f32);
+    int checkEndAnm(J3DFrameCtrl*, f32);
+    void playAllAnm();
+    void setMtx();
+    void ctrlFaceMotion();
+    void ctrlMotion();
+    int ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
+    void evtChange();
+    bool setFaceMotionAnm(int, bool);
+    void setPos(cXyz);
+    void setAngle(s16);
+    void setAngle(csXyz);
+    fopAc_ac_c* hitChk(dCcD_GObjInf*, u32);
+    void setDamage(int, int, int);
+    BOOL chkActorInSight(fopAc_ac_c*, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
+    BOOL chkFindActor(fopAc_ac_c*, BOOL, s16);
+    BOOL chkWolfAction();
+    BOOL chkFindWolf(s16, int, int, f32, f32, f32, f32, BOOL);
+    BOOL srchPlayerActor();
+    cXyz getAttnPos(fopAc_ac_c*);
+    BOOL turn(s16, int, int);
+    BOOL step(s16, int, int, int, int);
+    void calcSpeedAndAngle(cXyz, BOOL, s16, s16);
+    int getActorDistance(fopAc_ac_c*, int, int);
+    BOOL initTalk(int, fopAc_ac_c**);
+    BOOL talkProc(int*, BOOL, fopAc_ac_c**, BOOL);
+    fopAc_ac_c* getNearestActorP(s16);
+    fopAc_ac_c* getEvtAreaTagP(int, int);
+    fopAc_ac_c* getShopItemTagP();
+    void setHitodamaPrtcl();
 
-    /* 8014CD20 */ virtual ~daNpcT_c() {
+    virtual ~daNpcT_c() {
         // "daNpcT_c -> destructed"
         OS_REPORT("|%06d:%x|daNpcT_c -> デストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 801490D4 */ virtual BOOL ctrlBtk();
-    /* 8014CC14 */ virtual void ctrlSubFaceMotion(int) {}
-    /* 8014CC40 */ virtual BOOL checkChangeJoint(int) { return FALSE; }
-    /* 8014CC38 */ virtual BOOL checkRemoveJoint(int) { return FALSE; }
-    /* 8014CC5C */ virtual s32 getBackboneJointNo() { return -1; }
-    /* 8014CC54 */ virtual s32 getNeckJointNo() { return -1; }
-    /* 8014CC4C */ virtual s32 getHeadJointNo() { return -1; }
-    /* 8014CC90 */ virtual s32 getFootLJointNo() { return -1; }
-    /* 8014CC88 */ virtual s32 getFootRJointNo() { return -1; }
-    /* 8014D0A8 */ virtual u16 getEyeballLMaterialNo() { return 0; }
-    /* 8014D0B0 */ virtual u16 getEyeballRMaterialNo() { return 0; }
-    /* 8014D0B8 */ virtual u16 getEyeballMaterialNo() { return 0; }
-    /* 8014951C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8014CC48 */ virtual void afterJntAnm(int) {}
-    /* 8014CC24 */ virtual void setParam() {}
-    /* 8014CC80 */ virtual BOOL checkChangeEvt() { return FALSE; }
-    /* 8014CC78 */ virtual BOOL evtTalk() { return TRUE; }
-    /* 8014CC70 */ virtual BOOL evtEndProc() { return TRUE; }
-    /* 8014CC68 */ virtual BOOL evtCutProc() { return FALSE; }
-    /* 8014CC64 */ virtual void setAfterTalkMotion() {}
-    /* 8014997C */ virtual BOOL evtProc();
-    /* 8014CC20 */ virtual void action() {}
-    /* 8014CC1C */ virtual void beforeMove() {}
-    /* 8014CC18 */ virtual void afterMoved() {}
-    /* 8014CC10 */ virtual void setAttnPos() {}
-    /* 80149BB4 */ virtual void setFootPos();
-    /* 8014CC0C */ virtual void setCollision() {}
-    /* 80149D7C */ virtual void setFootPrtcl(cXyz*, f32, f32);
-    /* 8014A05C */ virtual bool checkCullDraw();
-    /* 8014A064 */ virtual void twilight();
-    /* 8014CC98 */ virtual BOOL chkXYItems() { return FALSE; }
-    /* 8014A0B0 */ virtual void evtOrder();
-    /* 8014CBF4 */ virtual void decTmr() {
+    virtual BOOL ctrlBtk();
+    virtual void ctrlSubFaceMotion(int) {}
+    virtual BOOL checkChangeJoint(int) { return FALSE; }
+    virtual BOOL checkRemoveJoint(int) { return FALSE; }
+    virtual s32 getBackboneJointNo() { return -1; }
+    virtual s32 getNeckJointNo() { return -1; }
+    virtual s32 getHeadJointNo() { return -1; }
+    virtual s32 getFootLJointNo() { return -1; }
+    virtual s32 getFootRJointNo() { return -1; }
+    virtual u16 getEyeballLMaterialNo() { return 0; }
+    virtual u16 getEyeballRMaterialNo() { return 0; }
+    virtual u16 getEyeballMaterialNo() { return 0; }
+    virtual int ctrlJoint(J3DJoint*, J3DModel*);
+    virtual void afterJntAnm(int) {}
+    virtual void setParam() {}
+    virtual BOOL checkChangeEvt() { return FALSE; }
+    virtual BOOL evtTalk() { return TRUE; }
+    virtual BOOL evtEndProc() { return TRUE; }
+    virtual BOOL evtCutProc() { return FALSE; }
+    virtual void setAfterTalkMotion() {}
+    virtual BOOL evtProc();
+    virtual void action() {}
+    virtual void beforeMove() {}
+    virtual void afterMoved() {}
+    virtual void setAttnPos() {}
+    virtual void setFootPos();
+    virtual void setCollision() {}
+    virtual void setFootPrtcl(cXyz*, f32, f32);
+    virtual bool checkCullDraw();
+    virtual void twilight();
+    virtual BOOL chkXYItems() { return FALSE; }
+    virtual void evtOrder();
+    virtual void decTmr() {
         if (mDamageTimer != 0) {
             mDamageTimer--;
         }
     }
-    /* 8014A324 */ virtual void clrParam();
-    /* 8014CC30 */ virtual int drawDbgInfo() { return 0; }
-    /* 8014CC28 */ virtual void drawOtherMdl() {}
-    /* 8014CC2C */ virtual void drawGhost() {}
-    /* 8014CCA0 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
-    /* 8014CCE0 */ virtual bool afterSetMotionAnm(int, int, f32, int) { return true; }
-    /* 8014CCB0 */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_1) { return param_1; }
-    /* 8014CCF0 */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c param_1) { return param_1; }
-    /* 8014CCEC */ virtual void changeAnm(int*, int*) {}
-    /* 8014CCAC */ virtual void changeBck(int*, int*) {}
-    /* 8014CCA8 */ virtual void changeBtp(int*, int*) {}
-    /* 8014CCE8 */ virtual void changeBtk(int*, int*) {}
-    /* 8014A628 */ virtual bool setMotionAnm(int, f32, BOOL);
+    virtual void clrParam();
+    virtual int drawDbgInfo() { return 0; }
+    virtual void drawOtherMdl() {}
+    virtual void drawGhost() {}
+    virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
+    virtual bool afterSetMotionAnm(int, int, f32, int) { return true; }
+    virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_1) { return param_1; }
+    virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c param_1) { return param_1; }
+    virtual void changeAnm(int*, int*) {}
+    virtual void changeBck(int*, int*) {}
+    virtual void changeBtp(int*, int*) {}
+    virtual void changeBtk(int*, int*) {}
+    virtual bool setMotionAnm(int, f32, BOOL);
 
     bool checkHide() { return mHide || (!dComIfGs_wolfeye_effect_check() && mTwilight); }
     BOOL checkStep() { return mStepMode == 1; }
diff --git a/include/d/actor/d_a_npc2.h b/include/d/actor/d_a_npc2.h
index 69aee91aa5..ba6a59299a 100644
--- a/include/d/actor/d_a_npc2.h
+++ b/include/d/actor/d_a_npc2.h
@@ -10,10 +10,10 @@
 
 class daBaseNpc_acMngr_c {
 public:
-    /* 8014D804 */ daBaseNpc_acMngr_c();
-    /* 8014D81C */ void entry(fopAc_ac_c*);
-    /* 8014D838 */ fopAc_ac_c* getActor();
-    /* 80150524 */ virtual ~daBaseNpc_acMngr_c() {}
+    daBaseNpc_acMngr_c();
+    void entry(fopAc_ac_c*);
+    fopAc_ac_c* getActor();
+    virtual ~daBaseNpc_acMngr_c() {}
 
 private:
     /* 0x04 */ fpc_ProcID mActorId;
@@ -21,8 +21,8 @@ private:
 
 class daBaseNpc_matAnm_c : public J3DMaterialAnm {
 public:
-    /* 80150444 */ virtual ~daBaseNpc_matAnm_c() {}
-    /* 8014D884 */ virtual void calc(J3DMaterial*) const;
+    virtual ~daBaseNpc_matAnm_c() {}
+    virtual void calc(J3DMaterial*) const;
 
     /* 0x0F4 */ mutable f32 field_0xF4;
     /* 0x0F8 */ mutable f32 field_0xF8;
@@ -34,17 +34,17 @@ public:
 
 class daBaseNpc_path_c {
 public:
-    /* 8014D998 */ daBaseNpc_path_c();
-    /* 8014D9A8 */ BOOL isPath();
-    /* 8014D9BC */ int setPathInfo(u8, s8, s8);
-    /* 8014DA48 */ void reverseDir();
-    /* 8014DA64 */ s32 chkPnt(cXyz);
-    /* 8014DAC4 */ BOOL setNextPnt();
-    /* 8014DB04 */ u16 getIdx();
-    /* 8014DB0C */ void setIdx(u16);
-    /* 8014DB14 */ Vec getPntPos(u16);
+    daBaseNpc_path_c();
+    BOOL isPath();
+    int setPathInfo(u8, s8, s8);
+    void reverseDir();
+    s32 chkPnt(cXyz);
+    BOOL setNextPnt();
+    u16 getIdx();
+    void setIdx(u16);
+    Vec getPntPos(u16);
     void dbgDraw(f32);
-    /* 801503FC */ virtual ~daBaseNpc_path_c() {}
+    virtual ~daBaseNpc_path_c() {}
 
     static const int MAXNUMCONTROLPNT_e = 64;
 
@@ -65,14 +65,14 @@ public:
 
 class daBaseNpc_lookat_c {
 public:
-    /* 8014DB40 */ void limitter(s16, s16*, s16, s16);
-    /* 8014DBB4 */ void calc(fopAc_ac_c*, f32 (*)[4], s16);
-    /* 8014E634 */ void setMaxJntLmt(csXyz, int);
-    /* 8014E658 */ void setMinJntLmt(csXyz, int);
-    /* 8014E67C */ void setJntPos(cXyz, int);
-    /* 8014E6A0 */ int setAttnPos(cXyz*);
-    /* 8014E6AC */ csXyz getRot(int);
-    /* 801502EC */ virtual ~daBaseNpc_lookat_c() {}
+    void limitter(s16, s16*, s16, s16);
+    void calc(fopAc_ac_c*, f32 (*)[4], s16);
+    void setMaxJntLmt(csXyz, int);
+    void setMinJntLmt(csXyz, int);
+    void setJntPos(cXyz, int);
+    int setAttnPos(cXyz*);
+    csXyz getRot(int);
+    virtual ~daBaseNpc_lookat_c() {}
 
     /* 0x04 */ csXyz mMaxJntLmt[4];
     /* 0x1C */ csXyz mMinJntLmt[4];
@@ -85,33 +85,33 @@ public:
 
 class daBaseNpc_c : public fopAc_ac_c {
 public:
-    /* 8014E6C8 */ daBaseNpc_c();
-    /* 8014EE44 */ J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
-    /* 8014EE80 */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 8014EEE4 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
-    /* 8014EF28 */ J3DAnmTransform* getTexPtrnAnmP(char*, int);
-    /* 8014EF64 */ int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    /* 8014EFF4 */ void orderEvent(int, char*);
-    /* 8014F0A0 */ void setEnvTevColor();
-    /* 8014F0FC */ void setRoomNo();
-    /* 8014F148 */ int checkEndAnm(f32);
-    /* 8014F1C8 */ int checkEndAnm(J3DFrameCtrl*);
+    daBaseNpc_c();
+    J3DAnmTransform* getTrnsfrmKeyAnmP(char*, int);
+    int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
+    J3DAnmTransform* getTexPtrnAnmP(char*, int);
+    int setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
+    void orderEvent(int, char*);
+    void setEnvTevColor();
+    void setRoomNo();
+    int checkEndAnm(f32);
+    int checkEndAnm(J3DFrameCtrl*);
 
-    /* 8014E89C */ virtual ~daBaseNpc_c();
-    /* 8014EAD0 */ virtual int execute();
-    /* 8014EC50 */ virtual int draw(f32);
-    /* 8014EE3C */ virtual const char* getResName();
-    /* 8014EFA4 */ virtual void attnSttsOn(int, int);
-    /* 8014EFF0 */ virtual void setParam();
-    /* 8014F09C */ virtual void mainProc();
-    /* 8014F140 */ virtual BOOL btkCtrl();
-    /* 8014F228 */ virtual void allAnmPlay();
-    /* 8014F38C */ virtual void adjustShapeAngle();
-    /* 8014F390 */ virtual void setMtx(int);
-    /* 8014F4A0 */ virtual void setCollisions();
-    /* 8014F4A4 */ virtual void setAttnPos();
-    /* 8014F4A8 */ virtual void drawOtherMdls();
-    /* 8014F4AC */ virtual bool dbgDraw();
+    virtual ~daBaseNpc_c();
+    virtual int execute();
+    virtual int draw(f32);
+    virtual const char* getResName();
+    virtual void attnSttsOn(int, int);
+    virtual void setParam();
+    virtual void mainProc();
+    virtual BOOL btkCtrl();
+    virtual void allAnmPlay();
+    virtual void adjustShapeAngle();
+    virtual void setMtx(int);
+    virtual void setCollisions();
+    virtual void setAttnPos();
+    virtual void drawOtherMdls();
+    virtual bool dbgDraw();
 
     static dCcD_SrcGObjInf const mCcDObj;
     static dCcD_SrcCyl mCcDCyl;
@@ -155,25 +155,25 @@ STATIC_ASSERT(sizeof(daBaseNpc_c) == 0xA14);
 
 class daBaseNpc_moveBgActor_c : public daBaseNpc_c {
 public:
-    /* 8014F4B4 */ daBaseNpc_moveBgActor_c();
-    /* 8014F518 */ int MoveBGCreateHeap();
-    /* 8014F60C */ int MoveBGCreate(char const*, int, MoveBGActor_SetFunc, u32);
-    /* 8014F6FC */ int MoveBGDelete();
-    /* 8014F770 */ int MoveBGExecute();
+    daBaseNpc_moveBgActor_c();
+    int MoveBGCreateHeap();
+    int MoveBGCreate(char const*, int, MoveBGActor_SetFunc, u32);
+    int MoveBGDelete();
+    int MoveBGExecute();
     int MoveBGDraw() {
         int ret = Draw();
         return ret;
     }
 
-    /* 80155FB0 */ virtual ~daBaseNpc_moveBgActor_c() {}
-    /* 801503BC */ virtual int CreateHeap() { return 1; }
-    /* 801503C4 */ virtual int Create() { return 1; }
-    /* 801503D4 */ virtual int Execute(Mtx**) { return 1; }
-    /* 801503DC */ virtual int Draw() { return 1; }
-    /* 801503CC */ virtual int Delete() { return 1; }
-    /* 801503E4 */ virtual int IsDelete() { return 1; }
-    /* 801503EC */ virtual int ToFore() { return 1; }
-    /* 801503F4 */ virtual int ToBack() { return 1; }
+    virtual ~daBaseNpc_moveBgActor_c() {}
+    virtual int CreateHeap() { return 1; }
+    virtual int Create() { return 1; }
+    virtual int Execute(Mtx**) { return 1; }
+    virtual int Draw() { return 1; }
+    virtual int Delete() { return 1; }
+    virtual int IsDelete() { return 1; }
+    virtual int ToFore() { return 1; }
+    virtual int ToBack() { return 1; }
 
     static const char* m_name;
     static int m_dzb_id;
diff --git a/include/d/actor/d_a_npc4.h b/include/d/actor/d_a_npc4.h
index 2ff7c6386a..f4086b1d96 100644
--- a/include/d/actor/d_a_npc4.h
+++ b/include/d/actor/d_a_npc4.h
@@ -18,15 +18,15 @@ private:
 public:
     daNpcF_ActorMngr_c() { initialize(); }
 
-    /* 801506B0 */ void initialize();
-    /* 801506D8 */ void entry(unsigned int);
-    /* 801506BC */ void entry(fopAc_ac_c*);
-    /* 801506E0 */ void remove();
-    /* 801506EC */ fopAc_ac_c* getActorP();
+    void initialize();
+    void entry(unsigned int);
+    void entry(fopAc_ac_c*);
+    void remove();
+    fopAc_ac_c* getActorP();
 
     fpc_ProcID getPId() { return mActorID; }
 
-    /* 80155E40 */ virtual ~daNpcF_ActorMngr_c() {}
+    virtual ~daNpcF_ActorMngr_c() {}
 };
 
 BOOL daNpcF_chkEvtBit(u32 i_idx);
@@ -188,76 +188,76 @@ public:
         FORCE_DONT_INLINE;
         initialize();
     }
-    /* 80152014 */ BOOL execute();
-    /* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
-    /* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
+    BOOL execute();
+    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
                                              dCcD_GObjInf*);
-    /* 80152654 */ static void* srchAttnActor1(void*, void*);
-    /* 801526E8 */ static void* srchActor(void*, void*);
+    static void* srchAttnActor1(void*, void*);
+    static void* srchActor(void*, void*);
 
-    /* 801528C8 */ void initialize();
-    /* 80152B2C */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int);
-    /* 80152B68 */ J3DAnmTexPattern* getTexPtrnAnmP(char*, int);
-    /* 80152BA4 */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int);
-    /* 80152BE0 */ J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int);
-    /* 80152C1C */ BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr,
+    void initialize();
+    J3DAnmTransformKey* getTrnsfrmKeyAnmP(char*, int);
+    J3DAnmTexPattern* getTexPtrnAnmP(char*, int);
+    J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char*, int);
+    J3DAnmTevRegKey* getTevRegKeyAnmP(char*, int);
+    BOOL setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr,
                                       int i_start, int i_end);
-    /* 80152C80 */ BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start,
+    BOOL setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start,
                                   int i_end, bool i_modify);
-    /* 80152CC4 */ BOOL setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_rate,
+    BOOL setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_rate,
                                   int i_attr);
-    /* 80152D04 */ BOOL setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_rate,
+    BOOL setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_rate,
                                   int i_attr);
-    /* 80152D44 */ BOOL setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_rate,
+    BOOL setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_rate,
                                   int i_attr);
-    /* 80152D84 */ void setEnvTevColor();
-    /* 80152DE0 */ void setRoomNo();
-    /* 80152E24 */ BOOL chkEndAnm(f32);
-    /* 80152EC4 */ BOOL chkEndAnm(J3DFrameCtrl*, f32);
-    /* 80152F40 */ BOOL playAllAnm();
-    /* 80153150 */ void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80153264 */ void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***);
-    /* 8015337C */ void setLookatMtx(int, int*, f32);
-    /* 80153578 */ BOOL hitChk2(dCcD_Cyl*, BOOL, BOOL);
-    /* 80153658 */ void setDamage(int, int, int);
-    /* 80153718 */ int ctrlMsgAnm(int&, int&, fopAc_ac_c*, BOOL);
-    /* 8015387C */ void orderEvent(int, char*, u16, u16, u8, u16);
-    /* 80153954 */ void changeEvent(char*, char*, u16, u16);
-    /* 801539F0 */ BOOL chkActorInSight(fopAc_ac_c*, f32);
-    /* 80153A78 */ BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
-    /* 80153BDC */ BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
-    /* 80153D1C */ BOOL initTalk(int, fopAc_ac_c**);
-    /* 80153D84 */ BOOL talkProc(int*, BOOL, fopAc_ac_c**);
-    /* 80153EF4 */ BOOL turn(s16, f32, int);
-    /* 801540A4 */ BOOL step(s16, int, int, int);
-    /* 80154250 */ void setAngle(s16);
-    /* 80154278 */ u8 getDistTableIdx(int, int);
-    /* 801542A0 */ fopAc_ac_c* getEvtAreaTagP(int, int);
-    /* 8015436C */ fopAc_ac_c* getAttnActorP(BOOL, fpcLyIt_JudgeFunc, f32, f32, f32, f32, s16,
+    void setEnvTevColor();
+    void setRoomNo();
+    BOOL chkEndAnm(f32);
+    BOOL chkEndAnm(J3DFrameCtrl*, f32);
+    BOOL playAllAnm();
+    void playExpressionAnm(daNpcF_c::daNpcF_anmPlayData***);
+    void playMotionAnm(daNpcF_c::daNpcF_anmPlayData***);
+    void setLookatMtx(int, int*, f32);
+    BOOL hitChk2(dCcD_Cyl*, BOOL, BOOL);
+    void setDamage(int, int, int);
+    int ctrlMsgAnm(int&, int&, fopAc_ac_c*, BOOL);
+    void orderEvent(int, char*, u16, u16, u8, u16);
+    void changeEvent(char*, char*, u16, u16);
+    BOOL chkActorInSight(fopAc_ac_c*, f32);
+    BOOL chkActorInArea(fopAc_ac_c*, cXyz, cXyz, s16);
+    BOOL chkActorInAttnArea(fopAc_ac_c*, fopAc_ac_c*, int);
+    BOOL initTalk(int, fopAc_ac_c**);
+    BOOL talkProc(int*, BOOL, fopAc_ac_c**);
+    BOOL turn(s16, f32, int);
+    BOOL step(s16, int, int, int);
+    void setAngle(s16);
+    u8 getDistTableIdx(int, int);
+    fopAc_ac_c* getEvtAreaTagP(int, int);
+    fopAc_ac_c* getAttnActorP(BOOL, fpcLyIt_JudgeFunc, f32, f32, f32, f32, s16,
                                              int, BOOL);
-    /* 80154730 */ BOOL chkActorInSight2(fopAc_ac_c*, f32, s16);
-    /* 80154834 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
-    /* 801548F4 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
-    /* 8015496C */ cXyz getAttentionPos(fopAc_ac_c*);
-    /* 801549E0 */ BOOL chkFindPlayer2(BOOL, s16);
-    /* 80154BD8 */ void setHitodamaPrtcl();
+    BOOL chkActorInSight2(fopAc_ac_c*, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
+    cXyz getAttentionPos(fopAc_ac_c*);
+    BOOL chkFindPlayer2(BOOL, s16);
+    void setHitodamaPrtcl();
 
-    /* 80155BF4 */ virtual ~daNpcF_c() {}
-    /* 80155BC8 */ virtual void setParam() {}
-    /* 80155BC0 */ virtual BOOL main() { return TRUE; }
-    /* 80155BD8 */ virtual BOOL ctrlBtk() { return FALSE; }
-    /* 80155BBC */ virtual void adjustShapeAngle() {}
-    /* 8015276C */ virtual void setMtx();
-    /* 801527FC */ virtual void setMtx2();
-    /* 80155BB8 */ virtual void setAttnPos() {}
-    /* 80155BB4 */ virtual void setCollisions() {}
-    /* 80155BE0 */ virtual bool setExpressionAnm(int i_idx, bool i_modify) { return true; }
-    /* 80155EC8 */ virtual bool setExpressionBtp(int i_idx) { return true; }
-    /* 80155BF0 */ virtual void setExpression(int i_expression, f32 i_morf) {}
-    /* 80155BE8 */ virtual void setMotionAnm(int i_idx, f32 i_morf) {}
-    /* 80155BEC */ virtual void setMotion(int i_motion, f32 i_morf, int i_restart) {}
-    /* 80155BD0 */ virtual BOOL drawDbgInfo() { return TRUE; }
-    /* 80155BCC */ virtual void drawOtherMdls() {}
+    virtual ~daNpcF_c() {}
+    virtual void setParam() {}
+    virtual BOOL main() { return TRUE; }
+    virtual BOOL ctrlBtk() { return FALSE; }
+    virtual void adjustShapeAngle() {}
+    virtual void setMtx();
+    virtual void setMtx2();
+    virtual void setAttnPos() {}
+    virtual void setCollisions() {}
+    virtual bool setExpressionAnm(int i_idx, bool i_modify) { return true; }
+    virtual bool setExpressionBtp(int i_idx) { return true; }
+    virtual void setExpression(int i_expression, f32 i_morf) {}
+    virtual void setMotionAnm(int i_idx, f32 i_morf) {}
+    virtual void setMotion(int i_motion, f32 i_morf, int i_restart) {}
+    virtual BOOL drawDbgInfo() { return TRUE; }
+    virtual void drawOtherMdls() {}
 
     BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
         return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.distances[fopAc_attn_SPEAK_e]);
@@ -301,9 +301,9 @@ private:
 
 public:
     daNpcF_MatAnm_c() { initialize(); }
-    /* 80150738 */ void initialize();
-    /* 8015075C */ void calc(J3DMaterial*) const;
-    /* 80155ED0 */ ~daNpcF_MatAnm_c() {}
+    void initialize();
+    void calc(J3DMaterial*) const;
+    ~daNpcF_MatAnm_c() {}
     void setNowOffsetX(float i_nowOffsetX) { mNowOffsetX = i_nowOffsetX; }
     void setNowOffsetY(float i_nowOffsetY) { mNowOffsetY = i_nowOffsetY; }
     void onEyeMoveFlag() { mEyeMoveFlag = 1; }
@@ -319,7 +319,7 @@ private:
     /* 0x08 */ dPnt mPoints[96];
 
 public:
-    /* 80150870 */ void initialize(dPath*, int);
+    void initialize(dPath*, int);
 
     daNpcF_SPCurve_c() {
         initialize(NULL, 0);
@@ -341,18 +341,18 @@ protected:
     /* 0x20 */ daNpcF_SPCurve_c mSPCurve;
 
 public:
-    /* 80150900 */ void initialize();
-    /* 8015095C */ int setPathInfo(u8, s8, u8);
-    /* 80150A24 */ BOOL chkPassed(cXyz);
-    /* 80150A7C */ BOOL chkPassedDst(cXyz);
-    /* 80150BBC */ void reverse();
-    /* 80150BE0 */ BOOL setNextIdx();
-    /* 80150C18 */ int getNextIdx();
-    /* 80150C60 */ int getBeforeIdx();
-    /* 80150CA8 */ BOOL getBeforePos(cXyz&);
-    /* 80150D44 */ BOOL getNextPos(cXyz&);
-    /* 80150DE0 */ BOOL getDstPos(cXyz, cXyz&);
-    /* 80150EB4 */ void setNextIdxDst(cXyz);
+    void initialize();
+    int setPathInfo(u8, s8, u8);
+    BOOL chkPassed(cXyz);
+    BOOL chkPassedDst(cXyz);
+    void reverse();
+    BOOL setNextIdx();
+    int getNextIdx();
+    int getBeforeIdx();
+    BOOL getBeforePos(cXyz&);
+    BOOL getNextPos(cXyz&);
+    BOOL getDstPos(cXyz, cXyz&);
+    void setNextIdxDst(cXyz);
 
     daNpcF_Path_c() {
         initialize();
@@ -389,16 +389,16 @@ private:
     /* 0x98 vtable */
 
 public:
-    /* 80151038 */ void initialize();
-    /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16,
+    void initialize();
+    void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16,
                                  cXyz*);
-    /* 80151350 */ void calc(fopAc_ac_c*, Mtx, csXyz**, BOOL, int, BOOL);
-    /* 801515D4 */ void adjustMoveDisAngle(s16&, s16, s16, s16);
-    /* 80151648 */ void initCalc(fopAc_ac_c*, Mtx, cXyz*, csXyz*, f32*, cXyz&, BOOL);
-    /* 80151A54 */ void update(cXyz*, csXyz*, f32*);
-    /* 80151B68 */ void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, BOOL);
-    /* 80151F54 */ void setRotAngle();
-    /* 80151FE0 */ void clrRotAngle();
+    void calc(fopAc_ac_c*, Mtx, csXyz**, BOOL, int, BOOL);
+    void adjustMoveDisAngle(s16&, s16, s16, s16);
+    void initCalc(fopAc_ac_c*, Mtx, cXyz*, csXyz*, f32*, cXyz&, BOOL);
+    void update(cXyz*, csXyz*, f32*);
+    void calcMoveDisAngle(int, cXyz*, csXyz*, cXyz, int, BOOL);
+    void setRotAngle();
+    void clrRotAngle();
 
     daNpcF_Lookat_c() { initialize(); }
     virtual ~daNpcF_Lookat_c() {}
@@ -410,15 +410,15 @@ public:
 class daNpcF_MoveBgActor_c : public daNpcF_c {
 private:
 public:
-    /* 80155B54 */ ~daNpcF_MoveBgActor_c() {}
-    /* 80155E88 */ virtual bool CreateHeap() { return true; }
-    /* 80155E90 */ virtual bool Create() { return true; }
-    /* 80155EA0 */ virtual bool Execute(Mtx**) { return true; }
-    /* 80155EA8 */ virtual bool Draw() { return true; }
-    /* 80155E98 */ virtual bool Delete() { return true; }
-    /* 80155EB0 */ virtual bool IsDelete() { return true; }
-    /* 80155EB8 */ virtual bool ToFore() { return true; }
-    /* 80155EC0 */ virtual bool ToBack() { return true; }
+    ~daNpcF_MoveBgActor_c() {}
+    virtual bool CreateHeap() { return true; }
+    virtual bool Create() { return true; }
+    virtual bool Execute(Mtx**) { return true; }
+    virtual bool Draw() { return true; }
+    virtual bool Delete() { return true; }
+    virtual bool IsDelete() { return true; }
+    virtual bool ToFore() { return true; }
+    virtual bool ToBack() { return true; }
 };
 
 struct daNpcF_HIOParam {
diff --git a/include/d/actor/d_a_npc_aru.h b/include/d/actor/d_a_npc_aru.h
index 6266240a3c..b48a714e9e 100644
--- a/include/d/actor/d_a_npc_aru.h
+++ b/include/d/actor/d_a_npc_aru.h
@@ -29,7 +29,7 @@ public:
 
 class daNpc_Aru_Param_c {
 public:
-    /* 80957604 */ virtual ~daNpc_Aru_Param_c() {}
+    virtual ~daNpc_Aru_Param_c() {}
 
     static daNpc_Aru_HIOParam const m;
 };
@@ -83,58 +83,58 @@ public:
     typedef int (daNpc_Aru_c::*actionFunc)(void*);
     typedef int (daNpc_Aru_c::*cutFunc)(int);
 
-    /* 8095178C */ ~daNpc_Aru_c();
-    /* 809518C4 */ cPhs__Step create();
-    /* 80951BB0 */ int CreateHeap();
-    /* 80951FDC */ int Delete();
-    /* 80952010 */ int Execute();
-    /* 80952030 */ int Draw();
-    /* 809520C4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809520E4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8095213C */ static void* srchCow(void*, void*);
-    /* 809521E4 */ static void* srchUDoor(void*, void*);
-    /* 80952280 */ BOOL chkThrust(fopAc_ac_c*);
-    /* 80952400 */ fopAc_ac_c* getCowP(int);
-    /* 8095253C */ fopAc_ac_c* getUDoor_l_P();
-    /* 8095260C */ fopAc_ac_c* getUDoor_r_P();
-    /* 809526DC */ u8 getType();
-    /* 80952740 */ BOOL isDelete();
-    /* 809527CC */ void reset();
-    /* 80952B00 */ void afterJntAnm(int);
-    /* 80952B84 */ void setParam();
-    /* 80952CE8 */ BOOL checkChangeEvt();
-    /* 80952D9C */ void setAfterTalkMotion();
-    /* 80952E64 */ void srchActors();
-    /* 809530DC */ BOOL evtTalk();
-    /* 8095317C */ BOOL evtCutProc();
-    /* 80953244 */ void action();
-    /* 809533D8 */ void beforeMove();
-    /* 8095349C */ void setAttnPos();
-    /* 80953798 */ void setCollision();
-    /* 809538F0 */ int drawDbgInfo();
-    /* 809538F8 */ BOOL selectAction();
-    /* 80953AB8 */ BOOL chkAction(actionFunc);
-    /* 80953AE4 */ BOOL setAction(actionFunc);
-    /* 80953B8C */ BOOL chkBullRunningStage();
-    /* 80953C08 */ BOOL chkSkipFenceStage();
-    /* 80953C84 */ s16 srchActorDirection(fopAc_ac_c*);
-    /* 80953D58 */ void adjustMoveDir();
-    /* 809543F8 */ int duck(int);
-    /* 80954744 */ int lookround(s16);
-    /* 80954894 */ int cutRideOnHorse(int);
-    /* 80954A5C */ int cutGotoBullRunningStage(int);
-    /* 80954C0C */ int cutEndBullRunning(int);
-    /* 80954F4C */ int cutGotoSkipFenceStage(int);
-    /* 80955080 */ int cutSpeakTo(int);
-    /* 8095533C */ int cutNoEntrance(int);
-    /* 80955608 */ int wait(void*);
-    /* 80955B48 */ int bullRunning(void*);
-    /* 80955DE8 */ int skipFence(void*);
-    /* 80955F98 */ int talk(void*);
+    ~daNpc_Aru_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchCow(void*, void*);
+    static void* srchUDoor(void*, void*);
+    BOOL chkThrust(fopAc_ac_c*);
+    fopAc_ac_c* getCowP(int);
+    fopAc_ac_c* getUDoor_l_P();
+    fopAc_ac_c* getUDoor_r_P();
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL chkBullRunningStage();
+    BOOL chkSkipFenceStage();
+    s16 srchActorDirection(fopAc_ac_c*);
+    void adjustMoveDir();
+    int duck(int);
+    int lookround(s16);
+    int cutRideOnHorse(int);
+    int cutGotoBullRunningStage(int);
+    int cutEndBullRunning(int);
+    int cutGotoSkipFenceStage(int);
+    int cutSpeakTo(int);
+    int cutNoEntrance(int);
+    int wait(void*);
+    int bullRunning(void*);
+    int skipFence(void*);
+    int talk(void*);
     #ifdef DEBUG
     int test(void*);
     #endif
-    /* 809574E8 */ daNpc_Aru_c(
+    daNpc_Aru_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -146,14 +146,14 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 809575B4 */ u16 getEyeballMaterialNo() { return ARU_EYEBALL_M; }
-    /* 809575BC */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 809575C4 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 809575CC */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 809575D4 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 809575E4 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
-    /* 809575F4 */ s32 getFootLJointNo() { return JNT_FOOTL; }
-    /* 809575FC */ s32 getFootRJointNo() { return JNT_FOOTR; }
+    u16 getEyeballMaterialNo() { return ARU_EYEBALL_M; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    s32 getFootLJointNo() { return JNT_FOOTL; }
+    s32 getFootRJointNo() { return JNT_FOOTR; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_ash.h b/include/d/actor/d_a_npc_ash.h
index 48313e79bf..81b5efc80f 100644
--- a/include/d/actor/d_a_npc_ash.h
+++ b/include/d/actor/d_a_npc_ash.h
@@ -9,7 +9,7 @@ struct daNpcAsh_HIOParam {
 
 class daNpcAsh_Param_c {
 public:
-    /* 8095D5D4 */ virtual ~daNpcAsh_Param_c() {}
+    virtual ~daNpcAsh_Param_c() {}
 
     static const daNpcAsh_HIOParam m;
 };
@@ -93,40 +93,40 @@ public:
     };
 
 public:
-    /* 809582EC */ daNpcAsh_c();
-    /* 80958610 */ ~daNpcAsh_c();
-    /* 809587A0 */ cPhs__Step Create();
-    /* 80958B68 */ BOOL CreateHeap();
-    /* 809590C4 */ int Delete();
-    /* 809590F8 */ int Execute();
-    /* 8095911C */ int Draw();
-    /* 80959238 */ bool ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80959458 */ static BOOL createHeapCallBack(fopAc_ac_c*);
-    /* 80959478 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 809594C4 */ bool setExpressionAnm(int, bool);
-    /* 809596E0 */ bool setExpressionBtp(int);
-    /* 809597C0 */ void setMotionAnm(int i_idx, f32 i_morf);
-    /* 80959910 */ void reset();
-    /* 80959B28 */ inline bool setAction(ActionFn);
-    /* 80959BD0 */ inline bool isSneaking();
-    /* 80959C40 */ bool wait_type0(void*);
-    /* 8095A67C */ void setMotion(int, f32, int);
-    /* 8095A6C0 */ void setExpression(int, f32);
-    /* 8095A6EC */ bool wait_type1(void*);
-    /* 8095A8EC */ bool talk(void*);
-    /* 8095AD28 */ bool demo(void*);
-    /* 8095B164 */ bool leave(void*);
-    /* 8095B48C */ BOOL EvCut_Introduction(int);
-    /* 8095B58C */ BOOL EvCut_Meeting(int);
-    /* 8095B83C */ BOOL EvCut_WiretapSponsor(int);
-    /* 8095BA80 */ BOOL EvCut_WiretapEntrant(int);
-    /* 8095BCF0 */ inline void setParam();
-    /* 8095BF6C */ inline BOOL main();
-    /* 8095C200 */ inline void playMotion();
-    /* 8095C520 */ inline BOOL ctrlBtk();
-    /* 8095C5C4 */ inline void setAttnPos();
-    /* 8095C9BC */ inline void lookat();
-    /* 8095CC8C */ inline BOOL drawDbgInfo();
+    daNpcAsh_c();
+    ~daNpcAsh_c();
+    cPhs__Step Create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool ctrlJoint(J3DJoint*, J3DModel*);
+    static BOOL createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int i_idx, f32 i_morf);
+    void reset();
+    inline bool setAction(ActionFn);
+    inline bool isSneaking();
+    bool wait_type0(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    bool wait_type1(void*);
+    bool talk(void*);
+    bool demo(void*);
+    bool leave(void*);
+    BOOL EvCut_Introduction(int);
+    BOOL EvCut_Meeting(int);
+    BOOL EvCut_WiretapSponsor(int);
+    BOOL EvCut_WiretapEntrant(int);
+    inline void setParam();
+    inline BOOL main();
+    inline void playMotion();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline BOOL drawDbgInfo();
 
     s16 getMessageNo() { return shape_angle.x; }
     /* dSv_event_flag_c::F_0268 - City in the Sky - City in the Sky clear */
diff --git a/include/d/actor/d_a_npc_ashB.h b/include/d/actor/d_a_npc_ashB.h
index 0b442c0500..300d21b224 100644
--- a/include/d/actor/d_a_npc_ashB.h
+++ b/include/d/actor/d_a_npc_ashB.h
@@ -10,7 +10,7 @@ struct daNpcAshB_HIOParam {
 
 class daNpcAshB_Param_c {
 public:
-    /* 80962078 */ virtual ~daNpcAshB_Param_c() {}
+    virtual ~daNpcAshB_Param_c() {}
 
     static const daNpcAshB_HIOParam m;
 };
@@ -98,35 +98,35 @@ public:
     };
 
 public:
-    /* 8095DE4C */ daNpcAshB_c();
-    /* 8095E060 */ ~daNpcAshB_c();
-    /* 8095E224 */ cPhs__Step Create();
-    /* 8095E4A0 */ BOOL CreateHeap();
-    /* 8095E914 */ int Delete();
-    /* 8095E948 */ int Execute();
-    /* 8095E96C */ int Draw();
-    /* 8095E9C8 */ bool ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8095EB94 */ static BOOL createHeapCallBack(fopAc_ac_c*);
-    /* 8095EBB4 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 8095EC00 */ inline bool setExpressionAnm(int, bool);
-    /* 8095EE00 */ inline bool setExpressionBtp(int);
-    /* 8095EEE0 */ void setMotionAnm(int, f32);
-    /* 8095F0A4 */ void reset();
-    /* 8095F21C */ inline bool setAction(ActionFn i_actionFn);
-    /* 8095F2C4 */ bool wait(void*);
-    /* 8095FC70 */ void setMotion(int, f32, int);
-    /* 8095FD34 */ void setExpression(int, f32);
-    /* 8095FD9C */ bool talk(void*);
-    /* 809602E0 */ bool demo(void*);
-    /* 809604C8 */ BOOL EvCut_Appear(int);
-    /* 80960A60 */ inline void setParam();
-    /* 80960AE8 */ inline BOOL main();
-    /* 80960D64 */ inline void playMotion();
-    /* 80961188 */ inline BOOL ctrlBtk();
-    /* 80961264 */ inline void setAttnPos();
-    /* 80961574 */ inline void lookat();
-    /* 80961770 */ inline void drawOtherMdls();
-    /* 809617F8 */ inline BOOL drawDbgInfo();
+    daNpcAshB_c();
+    ~daNpcAshB_c();
+    cPhs__Step Create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool ctrlJoint(J3DJoint*, J3DModel*);
+    static BOOL createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    inline bool setExpressionAnm(int, bool);
+    inline bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void reset();
+    inline bool setAction(ActionFn i_actionFn);
+    bool wait(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    bool talk(void*);
+    bool demo(void*);
+    BOOL EvCut_Appear(int);
+    inline void setParam();
+    inline BOOL main();
+    inline void playMotion();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline void drawOtherMdls();
+    inline BOOL drawDbgInfo();
 
     s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
     inline void setExpressionTalkAfter() { setExpression(6, -1.0f); }
diff --git a/include/d/actor/d_a_npc_bans.h b/include/d/actor/d_a_npc_bans.h
index df65de46b2..4826be2789 100644
--- a/include/d/actor/d_a_npc_bans.h
+++ b/include/d/actor/d_a_npc_bans.h
@@ -20,7 +20,7 @@ struct daNpc_Bans_HIOParam {
 
 class daNpc_Bans_Param_c {
 public:
-    /* 80967C24 */ virtual ~daNpc_Bans_Param_c() {}
+    virtual ~daNpc_Bans_Param_c() {}
 
     static daNpc_Bans_HIOParam const m;
 };
@@ -44,47 +44,47 @@ public:
     typedef int (daNpc_Bans_c::*actionFunc)(void*);
     typedef int (daNpc_Bans_c::*cutFunc)(int);
 
-    /* 809628CC */ ~daNpc_Bans_c();
-    /* 80962AA0 */ cPhs__Step create();
-    /* 80962D6C */ int CreateHeap();
-    /* 80963338 */ int Delete();
-    /* 8096336C */ int Execute();
-    /* 80963444 */ int Draw();
-    /* 809634E0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80963500 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80963558 */ u8 getType();
-    /* 809635BC */ BOOL isDelete();
-    /* 809636C0 */ void reset();
-    /* 80963840 */ void afterJntAnm(int);
-    /* 809638CC */ void setParam();
-    /* 80963A7C */ BOOL checkChangeEvt();
-    /* 80963B30 */ void setAfterTalkMotion();
-    /* 80963BA8 */ void srchActors();
-    /* 80963DB0 */ BOOL evtTalk();
-    /* 80963EDC */ BOOL evtCutProc();
-    /* 80963FA4 */ void action();
-    /* 80964148 */ void beforeMove();
-    /* 80964228 */ void setAttnPos();
-    /* 809646E0 */ void setCollision();
-    /* 80964994 */ int drawDbgInfo();
-    /* 8096499C */ void drawOtherMdl();
-    /* 80964AD8 */ bool setScoopAnm(int, int, f32);
-    /* 80964B9C */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80964BD0 */ BOOL selectAction();
-    /* 80964C4C */ BOOL chkAction(actionFunc);
-    /* 80964C78 */ BOOL setAction(actionFunc);
-    /* 80964D20 */ BOOL checkPlayerIn2ndFloorOfBombShop();
-    /* 80964DD0 */ void orderAngerEvt();
-    /* 80964EB0 */ fopAc_ac_c* getKMsgTagP();
-    /* 80964F48 */ void setPrtcls();
-    /* 80964FEC */ int cutAnger(int);
-    /* 809658F8 */ int cutPurchase(int);
-    /* 80965CCC */ int wait(void*);
-    /* 809661F0 */ int tend(void*);
-    /* 80966888 */ int talk(void*);
-    /* 80966B24 */ int shop(void*);
-    /* 80DA60D0 */ int test(void*);
-    /* 80967AC4 */ daNpc_Bans_c(
+    ~daNpc_Bans_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool setScoopAnm(int, int, f32);
+    bool afterSetMotionAnm(int, int, f32, int);
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL checkPlayerIn2ndFloorOfBombShop();
+    void orderAngerEvt();
+    fopAc_ac_c* getKMsgTagP();
+    void setPrtcls();
+    int cutAnger(int);
+    int cutPurchase(int);
+    int wait(void*);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
+    int test(void*);
+    daNpc_Bans_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -96,12 +96,12 @@ public:
                 i_arcNames) {
             OS_REPORT("|%06d:%x|daNpc_Bans_c -> コンストラクト\n", g_Counter.mCounter0, this);
         }
-    /* 80967BE4 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80967BEC */ s32 getHeadJointNo() { return 6; }
-    /* 80967BF4 */ s32 getNeckJointNo() { return 5; }
-    /* 80967BFC */ s32 getBackboneJointNo() { return 1; }
-    /* 80967C04 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 6; }
-    /* 80967C14 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 0xB; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 6; }
+    s32 getNeckJointNo() { return 5; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 6; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 0xB; }
 
     u8 getGroupId() { return (fopAcM_GetParam(this) & ~0xFFFFFFF) >> 28; }
     u8 getMaxNumItem() { return (fopAcM_GetParam(this) & 0xF000000) >> 24; }
diff --git a/include/d/actor/d_a_npc_besu.h b/include/d/actor/d_a_npc_besu.h
index ceee412bb8..3376ef94c9 100644
--- a/include/d/actor/d_a_npc_besu.h
+++ b/include/d/actor/d_a_npc_besu.h
@@ -19,63 +19,63 @@ public:
     typedef int (daNpc_Besu_c::*cutFunc)(int);
     typedef int (daNpc_Besu_c::*actionFunc)(void*);
 
-    /* 80536E4C */ ~daNpc_Besu_c();
-    /* 8053701C */ int create();
-    /* 805372FC */ int CreateHeap();
-    /* 80537914 */ int Delete();
-    /* 80537948 */ int Execute();
-    /* 80537968 */ int Draw();
-    /* 805379FC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80537A1C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80537A74 */ u8 getType();
-    /* 80537B34 */ BOOL isDelete();
-    /* 80537DE4 */ void reset();
-    /* 80537FD0 */ BOOL chkNurse();
-    /* 80537FFC */ BOOL chkBesu3();
-    /* 80538028 */ void afterJntAnm(int);
-    /* 805380A4 */ void setParam();
-    /* 805382D0 */ BOOL checkChangeEvt();
-    /* 80538490 */ void setAfterTalkMotion();
-    /* 8053853C */ void srchActors();
-    /* 805387D0 */ BOOL evtTalk();
-    /* 80538870 */ BOOL evtCutProc();
-    /* 80538938 */ void action();
-    /* 80538B54 */ void beforeMove();
-    /* 80538C18 */ void setAttnPos();
-    /* 805391B8 */ void setCollision();
-    /* 80539494 */ int drawDbgInfo();
-    /* 8053949C */ void drawOtherMdl();
-    /* 805395F4 */ int setCupAnm(int, int, f32);
-    /* 805396C4 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 805396F8 */ daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
-    /* 805397B0 */ void changeAnm(int*, int*);
-    /* 80539840 */ void changeBck(int*, int*);
-    /* 805398DC */ void changeBtp(int*, int*);
-    /* 80539968 */ void changeBtk(int*, int*);
-    /* 80539994 */ int selectAction();
-    /* 80539ACC */ int chkAction(actionFunc);
-    /* 80539AF8 */ int setAction(actionFunc);
-    /* 80539BA0 */ void mop(int, int);
-    /* 80539CF4 */ int cutConversationAboutSaru(int);
-    /* 80539E48 */ int cutConversationAboutPachinko(int);
-    /* 8053A45C */ int cutConversationAboutWoodSwd(int);
-    /* 8053A7A0 */ int cutSwdTutorial(int);
-    /* 8053AA6C */ int cutFindMonkey(int);
-    /* 8053AF5C */ int cutGetWoodSwd(int);
-    /* 8053B058 */ int cutCacaricoConversation(int);
-    /* 8053B250 */ int cutSurprise(int);
-    /* 8053B530 */ int cutConversationInHotel(int);
-    /* 8053B820 */ int cutConversationAboutDeathMt(int);
-    /* 8053BA60 */ int cutConversationAboutGoron(int);
-    /* 8053BD18 */ int cutNurse(int);
-    /* 8053BE84 */ int cutClothTry(int);
-    /* 8053BF60 */ int cutThankYou(int);
-    /* 8053C08C */ int wait(void*);
-    /* 8053CAA0 */ int swdTutorial(void*);
-    /* 8053CBB8 */ int nurse(void*);
-    /* 8053CF78 */ int giveHotWater(void*);
-    /* 8053D078 */ int talk(void*);
-    /* 8053E588 */ daNpc_Besu_c(
+    ~daNpc_Besu_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    BOOL chkNurse();
+    BOOL chkBesu3();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int setCupAnm(int, int, f32);
+    bool afterSetMotionAnm(int, int, f32, int);
+    daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
+    void changeAnm(int*, int*);
+    void changeBck(int*, int*);
+    void changeBtp(int*, int*);
+    void changeBtk(int*, int*);
+    int selectAction();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    void mop(int, int);
+    int cutConversationAboutSaru(int);
+    int cutConversationAboutPachinko(int);
+    int cutConversationAboutWoodSwd(int);
+    int cutSwdTutorial(int);
+    int cutFindMonkey(int);
+    int cutGetWoodSwd(int);
+    int cutCacaricoConversation(int);
+    int cutSurprise(int);
+    int cutConversationInHotel(int);
+    int cutConversationAboutDeathMt(int);
+    int cutConversationAboutGoron(int);
+    int cutNurse(int);
+    int cutClothTry(int);
+    int cutThankYou(int);
+    int wait(void*);
+    int swdTutorial(void*);
+    int nurse(void*);
+    int giveHotWater(void*);
+    int talk(void*);
+    daNpc_Besu_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -90,12 +90,12 @@ public:
         // "construct"
         OS_REPORT("|%06d:%x|daNpc_Besu_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 8053E6A8 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 8053E6B0 */ s32 getHeadJointNo() { return 4; }
-    /* 8053E6B8 */ s32 getNeckJointNo() { return 3; }
-    /* 8053E6C0 */ s32 getBackboneJointNo() { return true; }
-    /* 8053E6C8 */ BOOL checkChangeJoint(int arg0) { return arg0 == 4; }
-    /* 8053E6D8 */ BOOL checkRemoveJoint(int arg0) { return arg0 == 6; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return true; }
+    BOOL checkChangeJoint(int arg0) { return arg0 == 4; }
+    BOOL checkRemoveJoint(int arg0) { return arg0 == 6; }
 
     u32 getFlowNodeNo() { 
         u16 nodeNo = home.angle.x;
@@ -147,7 +147,7 @@ struct daNpc_Besu_HIOParam {
 
 class daNpc_Besu_Param_c {
 public:
-    /* 8053E6E8 */ virtual ~daNpc_Besu_Param_c() {}
+    virtual ~daNpc_Besu_Param_c() {}
 
     static const daNpc_Besu_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_blue_ns.h b/include/d/actor/d_a_npc_blue_ns.h
index ed2cfb12cc..86e52de71b 100644
--- a/include/d/actor/d_a_npc_blue_ns.h
+++ b/include/d/actor/d_a_npc_blue_ns.h
@@ -17,64 +17,64 @@ class daNpcBlueNS_c : public daNpcF_c {
 public:
     typedef BOOL (daNpcBlueNS_c::*EventFn)(int);
 
-    /* 8096896C */ daNpcBlueNS_c();
+    daNpcBlueNS_c();
     
-    /* 80968D44 */ int Create();
-    /* 80968FE4 */ int CreateHeap();
-    /* 80969138 */ int isDelete();
-    /* 809691A8 */ int Delete();
-    /* 809691DC */ int Execute();
-    /* 80969200 */ int _Execute();
-    /* 80969468 */ void callEvt_changeYami();
-    /* 80969504 */ fpc_ProcID create_Yamijin(int);
-    /* 809695F0 */ BOOL col_check();
-    /* 80969698 */ BOOL holyball_check_main(fopAc_ac_c*);
-    /* 80969870 */ int Draw();
-    /* 809699D0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80969B68 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80969B88 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80969C48 */ void srchActor();
-    /* 80969C90 */ void srchHollyBall();
-    /* 80969CF8 */ void srchTagYami();
-    /* 80969D60 */ static void* _search_Tag(void*, void*);
-    /* 80969DE4 */ static void* _search_HollyBall_Y(void*, void*);
-    /* 80969E9C */ static void* _search_HollyBall_G(void*, void*);
-    /* 8096A358 */ void reset();
-    /* 8096A518 */ void playMotion();
-    /* 8096A750 */ int setAction(int (daNpcBlueNS_c::*)(int));
-    /* 8096A7F8 */ void setLookMode(int);
-    /* 8096A81C */ void lookat();
-    /* 8096A9FC */ BOOL step(s16, int);
-    /* 8096AAF0 */ BOOL chkFindPlayer();
-    /* 8096ABD4 */ int wait(int);
-    /* 8096AD70 */ int down(int);
-    /* 8096AE5C */ int talk(int);
-    /* 8096AFC8 */ int demo(int);
-    /* 8096B204 */ void ChgPtclDisp();
-    /* 8096B320 */ void downSE();
-    /* 8096B3D8 */ void lightsowrdSE();
-    /* 8096B490 */ void appearSE();
-    /* 8096B548 */ BOOL _Evt_ChgYami_Chibi(int);
-    /* 8096B5F0 */ BOOL _Evt_ChgYami_Chibi_CutInit(const int&);
-    /* 8096B688 */ BOOL _Evt_ChgYami_Chibi_CutMain(const int&);
-    /* 8096B7B8 */ BOOL _Evt_ChgYami_Debu(int);
-    /* 8096B860 */ BOOL _Evt_ChgYami_Debu_CutInit(const int&);
-    /* 8096B8F8 */ BOOL _Evt_ChgYami_Debu_CutMain(const int&);
-    /* 8096BA28 */ BOOL _Evt_ChgYami_Noppo(int);
-    /* 8096BAD0 */ BOOL _Evt_ChgYami_Noppo_CutInit(const int&);
-    /* 8096BB68 */ BOOL _Evt_ChgYami_Noppo_CutMain(const int&);
-    /* 8096BC98 */ BOOL _Evt_ChgYami_STNoppo(int);
-    /* 8096BD40 */ BOOL _Evt_ChgYami_STNoppo_CutInit(const int&);
-    /* 8096BDD8 */ BOOL _Evt_ChgYami_STNoppo_CutMain(const int&);
+    int Create();
+    int CreateHeap();
+    int isDelete();
+    int Delete();
+    int Execute();
+    int _Execute();
+    void callEvt_changeYami();
+    fpc_ProcID create_Yamijin(int);
+    BOOL col_check();
+    BOOL holyball_check_main(fopAc_ac_c*);
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void srchActor();
+    void srchHollyBall();
+    void srchTagYami();
+    static void* _search_Tag(void*, void*);
+    static void* _search_HollyBall_Y(void*, void*);
+    static void* _search_HollyBall_G(void*, void*);
+    void reset();
+    void playMotion();
+    int setAction(int (daNpcBlueNS_c::*)(int));
+    void setLookMode(int);
+    void lookat();
+    BOOL step(s16, int);
+    BOOL chkFindPlayer();
+    int wait(int);
+    int down(int);
+    int talk(int);
+    int demo(int);
+    void ChgPtclDisp();
+    void downSE();
+    void lightsowrdSE();
+    void appearSE();
+    BOOL _Evt_ChgYami_Chibi(int);
+    BOOL _Evt_ChgYami_Chibi_CutInit(const int&);
+    BOOL _Evt_ChgYami_Chibi_CutMain(const int&);
+    BOOL _Evt_ChgYami_Debu(int);
+    BOOL _Evt_ChgYami_Debu_CutInit(const int&);
+    BOOL _Evt_ChgYami_Debu_CutMain(const int&);
+    BOOL _Evt_ChgYami_Noppo(int);
+    BOOL _Evt_ChgYami_Noppo_CutInit(const int&);
+    BOOL _Evt_ChgYami_Noppo_CutMain(const int&);
+    BOOL _Evt_ChgYami_STNoppo(int);
+    BOOL _Evt_ChgYami_STNoppo_CutInit(const int&);
+    BOOL _Evt_ChgYami_STNoppo_CutMain(const int&);
     
-    /* 80968B80 */ virtual ~daNpcBlueNS_c();
-    /* 80969BD4 */ virtual void setParam();
-    /* 80969F54 */ virtual BOOL main();
-    /* 8096C8B0 */ virtual void adjustShapeAngle() {}
-    /* 8096A090 */ virtual void setAttnPos();
-    /* 8096A238 */ virtual void setMotionAnm(int, f32);
-    /* 8096A308 */ virtual void setMotion(int, f32, int);
-    /* 8096A350 */ virtual BOOL drawDbgInfo();
+    virtual ~daNpcBlueNS_c();
+    virtual void setParam();
+    virtual BOOL main();
+    virtual void adjustShapeAngle() {}
+    virtual void setAttnPos();
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual BOOL drawDbgInfo();
 
     int getType() { return fopAcM_GetParam(this) & 0xFF; }
     u8 getSwitchBitNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
@@ -137,7 +137,7 @@ struct daNpcBlueNS_HIOParam {
 
 class daNpcBlueNS_Param_c {
 public:
-    /* 8096C8B4 */ virtual ~daNpcBlueNS_Param_c() {}
+    virtual ~daNpcBlueNS_Param_c() {}
 
     static const daNpcBlueNS_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_bou.h b/include/d/actor/d_a_npc_bou.h
index 15a2804c91..2629a9f221 100644
--- a/include/d/actor/d_a_npc_bou.h
+++ b/include/d/actor/d_a_npc_bou.h
@@ -13,7 +13,7 @@
  */
  class daNpc_Bou_Param_c {
     public:
-        /* 809727F4 */ virtual ~daNpc_Bou_Param_c() {}
+        virtual ~daNpc_Bou_Param_c() {}
 
         struct Data {
             /* 0x00 */ f32 field_0x00; // 255.0f
@@ -77,60 +77,60 @@ public:
     TYPE_5,
     };
 
-    /* 8096CF8C */ ~daNpc_Bou_c();
-    /* 8096D0D8 */ int create();
-    /* 8096D38C */ int CreateHeap();
-    /* 8096D7B8 */ int Delete();
-    /* 8096D7EC */ int Execute();
-    /* 8096D80C */ int Draw();
-    /* 8096D8A0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8096D8C0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8096D918 */ static void* srchCow(void*, void*);
-    /* 8096D9B4 */ fopAc_ac_c* getCowP();
-    /* 8096DA78 */ u8 getType();
-    /* 8096DADC */ int isDelete();
-    /* 8096DBBC */ void reset();
-    /* 8096E18C */ void srchActors();
-    /* 8096ECC0 */ int selectAction();
-    /* 8096ED3C */ int chkAction(int (daNpc_Bou_c::*)(void*));
-    /* 8096ED68 */ int setAction(int (daNpc_Bou_c::*)(void*));
-    /* 8096EE10 */ int cutWildGoat(int);
-    /* 8096F2E4 */ int cutWildGoatSuccess(int);
-    /* 8096F510 */ int cutWildGoatFailure(int);
-    /* 8096F758 */ int cutSpeakTo(int);
-    /* 8096F9A4 */ int cutConversationWithBou(int);
-    /* 8096FB78 */ int cutConfidentialConversation(int);
-    /* 8096FE40 */ int cutFindWolf(int);
-    /* 80970278 */ int cutMeetingAgain(int);
-    /* 809709EC */ int wait(void*);
-    /* 80970DFC */ int talkwithJagar(void*);
-    /* 80970F9C */ int talk(void*);
-    /* 809726D4 */ daNpc_Bou_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_Bou_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchCow(void*, void*);
+    fopAc_ac_c* getCowP();
+    u8 getType();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    int chkAction(int (daNpc_Bou_c::*)(void*));
+    int setAction(int (daNpc_Bou_c::*)(void*));
+    int cutWildGoat(int);
+    int cutWildGoatSuccess(int);
+    int cutWildGoatFailure(int);
+    int cutSpeakTo(int);
+    int cutConversationWithBou(int);
+    int cutConfidentialConversation(int);
+    int cutFindWolf(int);
+    int cutMeetingAgain(int);
+    int wait(void*);
+    int talkwithJagar(void*);
+    int talk(void*);
+    daNpc_Bou_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                daNpcT_evtData_c const* param_7, char** param_8) :
                                daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                 {}
 
-    /* 809727D4 */ virtual int checkChangeJoint(int param_0) { return param_0 == 4; }
-    /* 809727E4 */ virtual int checkRemoveJoint(int param_0) { return param_0 == 8; }
-    /* 809727CC */ virtual s32 getBackboneJointNo() { return 1; }
-    /* 809727C4 */ virtual s32 getNeckJointNo() { return 3; }
-    /* 809727BC */ virtual s32 getHeadJointNo() { return 4; }
-    /* 809727B4 */ virtual u16 getEyeballMaterialNo() { return 1; }
-    /* 8096DD44 */ virtual void afterJntAnm(int);
-    /* 8096DDC8 */ virtual void setParam();
-    /* 8096DF9C */ virtual BOOL checkChangeEvt();
-    /* 8096E27C */ virtual BOOL evtTalk();
-    /* 8096E31C */ virtual BOOL evtEndProc();
-    /* 8096E324 */ virtual BOOL evtCutProc();
-    /* 8096E0EC */ virtual void setAfterTalkMotion();
-    /* 8096E3EC */ virtual void action();
-    /* 8096E7E0 */ virtual void beforeMove();
-    /* 8096E8A4 */ virtual void setAttnPos();
-    /* 8096EB14 */ virtual void setCollision();
-    /* 8096EC6C */ virtual int drawDbgInfo();
-    /* 8096EC74 */ virtual void changeAnm(int*, int*);
+    virtual int checkChangeJoint(int param_0) { return param_0 == 4; }
+    virtual int checkRemoveJoint(int param_0) { return param_0 == 8; }
+    virtual s32 getBackboneJointNo() { return 1; }
+    virtual s32 getNeckJointNo() { return 3; }
+    virtual s32 getHeadJointNo() { return 4; }
+    virtual u16 getEyeballMaterialNo() { return 1; }
+    virtual void afterJntAnm(int);
+    virtual void setParam();
+    virtual BOOL checkChangeEvt();
+    virtual BOOL evtTalk();
+    virtual BOOL evtEndProc();
+    virtual BOOL evtCutProc();
+    virtual void setAfterTalkMotion();
+    virtual void action();
+    virtual void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual int drawDbgInfo();
+    virtual void changeAnm(int*, int*);
 
     static char* mCutNameList[9];
     static cutFunc mCutList[9];
diff --git a/include/d/actor/d_a_npc_bouS.h b/include/d/actor/d_a_npc_bouS.h
index c530c6fac1..f79dc9301d 100644
--- a/include/d/actor/d_a_npc_bouS.h
+++ b/include/d/actor/d_a_npc_bouS.h
@@ -27,7 +27,7 @@ struct daNpcBouS_HIOParam {
 
 class daNpcBouS_Param_c {
 public:
-    /* 809783A4 */ virtual ~daNpcBouS_Param_c() {}
+    virtual ~daNpcBouS_Param_c() {}
 
     static daNpcBouS_HIOParam const m;
 };
@@ -51,44 +51,44 @@ public:
     typedef bool (daNpcBouS_c::*actionFunc)(void*);
     typedef int (daNpcBouS_c::*eventFunc)(int);
 
-    /* 8097354C */ daNpcBouS_c();
-    /* 80973760 */ ~daNpcBouS_c();
-    /* 80973948 */ cPhs__Step Create();
-    /* 80973B9C */ int CreateHeap();
-    /* 80973FC8 */ int Delete();
-    /* 80973FFC */ int Execute();
-    /* 80974020 */ int Draw();
-    /* 80974090 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809742BC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809742DC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80974328 */ bool setExpressionAnm(int, bool);
-    /* 80974514 */ bool setExpressionBtp(int);
-    /* 809745F4 */ void setMotionAnm(int, f32);
-    /* 80974730 */ void reset();
-    /* 809748F0 */ inline BOOL setAction(actionFunc);
-    /* 80974A04 */ bool checkInstructionTag(fopAc_ac_c*);
-    /* 80974A28 */ bool wait(void*);
-    /* 809750BC */ void setMotion(int, f32, int);
-    /* 80975104 */ void setExpression(int, f32);
-    /* 80975130 */ bool talk(void*);
-    /* 80975748 */ bool demo(void*);
+    daNpcBouS_c();
+    ~daNpcBouS_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void reset();
+    inline BOOL setAction(actionFunc);
+    bool checkInstructionTag(fopAc_ac_c*);
+    bool wait(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    bool talk(void*);
+    bool demo(void*);
                    inline fopAc_ac_c* searchInstructionTag();
-    /* 80975930 */ bool instruction(void*);
-    /* 80975ED8 */ bool checkIntroDemoStart();
-    /* 80975FDC */ int EvCut_BousIntroSumo1(int);
-    /* 80976284 */ int EvCut_BousIntroSumo2(int);
-    /* 80976654 */ int EvCut_BousIntroSumo3(int);
-    /* 80976C00 */ inline void setParam();
-    /* 80976C9C */ inline BOOL main();
+    bool instruction(void*);
+    bool checkIntroDemoStart();
+    int EvCut_BousIntroSumo1(int);
+    int EvCut_BousIntroSumo2(int);
+    int EvCut_BousIntroSumo3(int);
+    inline void setParam();
+    inline BOOL main();
                    inline void playExpression();
-    /* 80976EEC */ inline void playMotion();
-    /* 80977368 */ inline BOOL ctrlBtk();
-    /* 80977444 */ inline void setAttnPos();
-    /* 809778D8 */ inline void lookat();
+    inline void playMotion();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
                    inline BOOL step(s16, int);
-    /* 80977AB8 */ inline int drawDbgInfo();
-    /* 80977AC0 */ inline void drawOtherMdls();
-    /* 809783A0 */ void adjustShapeAngle() {}
+    inline int drawDbgInfo();
+    inline void drawOtherMdls();
+    void adjustShapeAngle() {}
 
     s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
     s8 getArenaNo() { return fopAcM_GetParam(this) & 0xFF; }
diff --git a/include/d/actor/d_a_npc_cd.h b/include/d/actor/d_a_npc_cd.h
index 80fac4e564..fc1e19ef1c 100644
--- a/include/d/actor/d_a_npc_cd.h
+++ b/include/d/actor/d_a_npc_cd.h
@@ -6,24 +6,24 @@
 
 class daNpcCd_c : public fopAc_ac_c {
 public:
-    /* 8015605C */ int NpcCreate(int);
-    /* 801561E8 */ J3DModel* ObjCreate(int);
-    /* 80156228 */ BOOL isM_();
-    /* 80156248 */ J3DAnmTransform* getAnmP(int, int);
-    /* 801563C8 */ int setAttention(int);
-    /* 80156B4C */ int loadResrc(int, int);
-    /* 80156C50 */ int removeResrc(int, int);
-    /* 80156D1C */ void setEnvTevCol();
-    /* 80156D78 */ void setRoomNo();
-    /* 80156DBC */ void animation();
-    /* 80156E20 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 80156E8C */ int drawObj(int, J3DModel*, f32);
-    /* 80156F74 */ int drawNpc();
-    /* 80157084 */ int jntNodeCB(J3DJoint*, J3DModel*);
-    /* 8015736C */ void setHitodamaParticle();
-    /* 80157524 */ J3DModelData* getNpcMdlDataP(int);
-    /* 80157588 */ J3DModelData* getObjMdlDataP(int);
-    /* 80AA8694 */ virtual ~daNpcCd_c() {}
+    int NpcCreate(int);
+    J3DModel* ObjCreate(int);
+    BOOL isM_();
+    J3DAnmTransform* getAnmP(int, int);
+    int setAttention(int);
+    int loadResrc(int, int);
+    int removeResrc(int, int);
+    void setEnvTevCol();
+    void setRoomNo();
+    void animation();
+    void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    int drawObj(int, J3DModel*, f32);
+    int drawNpc();
+    int jntNodeCB(J3DJoint*, J3DModel*);
+    void setHitodamaParticle();
+    J3DModelData* getNpcMdlDataP(int);
+    J3DModelData* getObjMdlDataP(int);
+    virtual ~daNpcCd_c() {}
 
     static dCcD_SrcCyl const m_cylDat;
 
@@ -51,8 +51,8 @@ STATIC_ASSERT(sizeof(daNpcCd_c) == 0x9EC);
 
 
 struct daNpcCd_HIO_Jnt_c : public JORReflexible {
-    /* 80157810 */ virtual ~daNpcCd_HIO_Jnt_c() {}
-    /* 801578B0 */ daNpcCd_HIO_Jnt_c() {}
+    virtual ~daNpcCd_HIO_Jnt_c() {}
+    daNpcCd_HIO_Jnt_c() {}
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
@@ -63,8 +63,8 @@ struct daNpcCd_HIO_Jnt_c : public JORReflexible {
 };
 
 struct daNpcCd_HIO_Child_c : public JORReflexible {
-    /* 801577A0 */ virtual ~daNpcCd_HIO_Child_c() {}
-    /* 80157858 */ daNpcCd_HIO_Child_c() {}
+    virtual ~daNpcCd_HIO_Child_c() {}
+    daNpcCd_HIO_Child_c() {}
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
@@ -88,8 +88,8 @@ STATIC_ASSERT(sizeof(daNpcCd_HIO_Child_c) == 0x164);
 
 class daNpcCd_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80157600 */ daNpcCd_HIO_c();
-    /* 801577A0 */ virtual ~daNpcCd_HIO_c() {}
+    daNpcCd_HIO_c();
+    virtual ~daNpcCd_HIO_c() {}
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h
index 1b7079bedb..90df576f0a 100644
--- a/include/d/actor/d_a_npc_cd2.h
+++ b/include/d/actor/d_a_npc_cd2.h
@@ -21,8 +21,8 @@ enum AnmNum {
 };
 
 struct daNpcCd2_HIO_Jnt_c : public JORReflexible {
-    /* 8015A6E8 */ virtual ~daNpcCd2_HIO_Jnt_c() {}
-    /* 8015A788 */ daNpcCd2_HIO_Jnt_c() {}
+    virtual ~daNpcCd2_HIO_Jnt_c() {}
+    daNpcCd2_HIO_Jnt_c() {}
 
     void genMessage(JORMContext*);
 
@@ -31,8 +31,8 @@ struct daNpcCd2_HIO_Jnt_c : public JORReflexible {
 };
 
 struct daNpcCd2_HIO_MChild_c {
-    /* 8015A798 */ virtual ~daNpcCd2_HIO_MChild_c() {}
-    /* 8015A808 */ daNpcCd2_HIO_MChild_c() {}
+    virtual ~daNpcCd2_HIO_MChild_c() {}
+    daNpcCd2_HIO_MChild_c() {}
 
     /* 0x004 */ daNpcCd2_HIO_Jnt_c field_0x004[19];
     /* 0x1CE */ s16 mMaxLmtX_BACKBONE;
@@ -60,8 +60,8 @@ struct daNpcCd2_HIO_MChild_c {
 };
 
 struct daNpcCd2_HIO_WChild_c {
-    /* 8015A678 */ virtual ~daNpcCd2_HIO_WChild_c() {}
-    /* 8015A730 */ daNpcCd2_HIO_WChild_c() {}
+    virtual ~daNpcCd2_HIO_WChild_c() {}
+    daNpcCd2_HIO_WChild_c() {}
 
     /* 0x004 */ daNpcCd2_HIO_Jnt_c field_0x004[21];
     /* 0x1FE */ s16 mMaxLmtX_BACKBONE;
@@ -89,8 +89,8 @@ struct daNpcCd2_HIO_WChild_c {
 };
 
 struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c {
-    /* 8015A4D8 */ daNpcCd2_HIO_c();
-    /* 8015A860 */ virtual ~daNpcCd2_HIO_c() {}
+    daNpcCd2_HIO_c();
+    virtual ~daNpcCd2_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -221,17 +221,17 @@ inline s16 Cd2_HIO_minLmtY_HEAD(int param_1) {
 
 class PathTrace_c {
 public:
-    /* 80159A38 */ bool setPath(int, int, int, cXyz*, bool);
-    /* 80159C14 */ bool checkPoint(cXyz, f32);
-    /* 80159DC0 */ bool checkPathEnd(cXyz, f32);
-    /* 80159E54 */ void getTargetPoint(Vec*);
-    /* 80159ECC */ void setAvoidPoint();
-    /* 8015A0D0 */ void setNextPoint();
-    /* 80159F98 */ void setNextPoint(cXyz&);
-    /* 8015A264 */ int incIndex(int);
-    /* 8015A294 */ int decIndex(int);
-    /* 8015A370 */ fopAc_ac_c* checkObstacle(fopAc_ac_c*);
-    /* 8015A3E4 */ void checkObstacleSub(fopAc_ac_c*);
+    bool setPath(int, int, int, cXyz*, bool);
+    bool checkPoint(cXyz, f32);
+    bool checkPathEnd(cXyz, f32);
+    void getTargetPoint(Vec*);
+    void setAvoidPoint();
+    void setNextPoint();
+    void setNextPoint(cXyz&);
+    int incIndex(int);
+    int decIndex(int);
+    fopAc_ac_c* checkObstacle(fopAc_ac_c*);
+    void checkObstacleSub(fopAc_ac_c*);
 
     void getAvoidPoint(Vec* avoidPoint) { *avoidPoint = mAvoidPoint; }
     BOOL isClose() { return dPath_ChkClose(mPath); }
@@ -256,29 +256,29 @@ public:
 
 class daNpcCd2_c : public fopAc_ac_c {
 public:
-    /* 80157D00 */ int NpcCreate(int);
-    /* 80157F28 */ J3DModel* ObjCreate(int);
-    /* 80157F68 */ J3DModel* ChairCreate(f32);
-    /* 801580A8 */ bool isM_();
-    /* 801580F0 */ J3DAnmTransform* getAnmP(int, int);
-    /* 80158420 */ int setAttention(int);
-    /* 80158BB8 */ int loadResrc(int, int);
-    /* 80158CBC */ int removeResrc(int, int);
-    /* 80158D88 */ void setEnvTevCol();
-    /* 80158DE4 */ void setRoomNo();
-    /* 80158E28 */ void animation(int);
-    /* 80158F00 */ void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 80158F6C */ int drawShadow(f32);
-    /* 80158FF0 */ int drawObj(int, J3DModel*, f32);
-    /* 801590FC */ int drawNpc();
-    /* 80159258 */ int jntNodeCB(J3DJoint*, J3DModel*);
-    /* 80159550 */ void setHitodamaParticle();
-    /* 801597C0 */ daTagEscape_c* getEscapeTag();
-    /* 80159818 */ bool checkFearSituation();
-    /* 801598E8 */ J3DModelData* getNpcMdlDataP(int);
-    /* 8015994C */ J3DModelData* getObjMdlDataP(int);
-    /* 801599C4 */ J3DAnmTexPattern* getTexAnmP(int);
-    /* 8097F030 */ virtual ~daNpcCd2_c() {}
+    int NpcCreate(int);
+    J3DModel* ObjCreate(int);
+    J3DModel* ChairCreate(f32);
+    bool isM_();
+    J3DAnmTransform* getAnmP(int, int);
+    int setAttention(int);
+    int loadResrc(int, int);
+    int removeResrc(int, int);
+    void setEnvTevCol();
+    void setRoomNo();
+    void animation(int);
+    void setAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    int drawShadow(f32);
+    int drawObj(int, J3DModel*, f32);
+    int drawNpc();
+    int jntNodeCB(J3DJoint*, J3DModel*);
+    void setHitodamaParticle();
+    daTagEscape_c* getEscapeTag();
+    bool checkFearSituation();
+    J3DModelData* getNpcMdlDataP(int);
+    J3DModelData* getObjMdlDataP(int);
+    J3DAnmTexPattern* getTexAnmP(int);
+    virtual ~daNpcCd2_c() {}
 
     static dCcD_SrcCyl const m_cylDat;
 
diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h
index 994b4fb0f8..88e859acd5 100644
--- a/include/d/actor/d_a_npc_cdn3.h
+++ b/include/d/actor/d_a_npc_cdn3.h
@@ -30,75 +30,75 @@ public:
         MODE_MAX_e,
     };
 
-    /* 80978DD4 */ void setAction(daNpcCdn3_c::Mode_e);
-    /* 80978E18 */ void callInit();
-    /* 80978E40 */ void callExecute();
-    /* 80978E6C */ void initWait();
-    /* 80978ED0 */ void executeWait();
-    /* 80979080 */ void initPath();
-    /* 80979144 */ void executePath();
-    /* 80979A34 */ void initTalk();
-    /* 80979B2C */ void executeTalk();
-    /* 80979F08 */ void initEscape();
-    /* 8097A028 */ void executeEscape();
-    /* 8097A398 */ void initFear();
-    /* 8097A518 */ void executeFear();
-    /* 8097A60C */ void initFear2();
-    /* 8097A6AC */ void executeFear2();
-    /* 8097A724 */ void initFight();
-    /* 8097A7E0 */ void executeFight();
-    /* 8097A960 */ void initRelief();
-    /* 8097A9E4 */ void executeRelief();
-    /* 8097ABDC */ void setAngle();
-    /* 8097ABE8 */ void pathMoveF();
-    /* 8097AF14 */ int ctrlMsgAnm();
-    /* 8097B04C */ bool searchNextScheduleTagSub(fopAc_ac_c*);
-    /* 8097B194 */ bool searchFirstScheduleTagSub(fopAc_ac_c*);
-    /* 8097B288 */ void checkSchedule();
-    /* 8097B38C */ void setSchedule(daTagSchedule_c*);
-    /* 8097B5A8 */ inline bool isInShop();
-    /* 8097B60C */ bool isChairStyle();
-    /* 8097B684 */ bool isNoTurnTalk();
-    /* 8097B6D0 */ int waita(void*);
-    /* 8097B754 */ int talka(void*);
-    /* 8097B7D8 */ int waitwall(void*);
-    /* 8097B85C */ int talkwall(void*);
-    /* 8097B8E0 */ int talkbwall(void*);
-    /* 8097B964 */ int talkb(void*);
-    /* 8097B9E8 */ int talkc(void*);
-    /* 8097BA6C */ int waitb(void*);
-    /* 8097BAF0 */ int sitwaita(void*);
-    /* 8097BB74 */ int sittalka(void*);
-    /* 8097BBF8 */ int sittalkab(void*);
-    /* 8097BC7C */ int sitwaitb(void*);
-    /* 8097BD00 */ int sittalkb(void*);
-    /* 8097BD84 */ int sittalkbb(void*);
-    /* 8097BE08 */ int looka(void*);
-    /* 8097BE8C */ int lookb(void*);
-    /* 8097BF10 */ int playm(void*);
-    /* 8097C070 */ int turnr(void*);
-    /* 8097C12C */ int turnl(void*);
-    /* 8097C1E8 */ int walka(void*);
-    /* 8097C250 */ int walkb(void*);
-    /* 8097C2B8 */ int runa(void*);
-    /* 8097C320 */ int runb(void*);
-    /* 8097C388 */ int browsea(void*);
-    /* 8097C40C */ int browseb(void*);
-    /* 8097C490 */ int dance(void*);
-    /* 8097C5B0 */ int ladytalka(void*);
-    /* 8097C634 */ int ladytalkb(void*);
-    /* 8097C6B8 */ int normtalka(void*);
-    /* 8097C73C */ int normtalkb(void*);
-    /* 8097C7C0 */ int sellme(void*);
-    /* 8097C844 */ int sing(void*);
-    /* 8097C910 */ int create();
-    /* 8097CC58 */ void create_init();
+    void setAction(daNpcCdn3_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initWait();
+    void executeWait();
+    void initPath();
+    void executePath();
+    void initTalk();
+    void executeTalk();
+    void initEscape();
+    void executeEscape();
+    void initFear();
+    void executeFear();
+    void initFear2();
+    void executeFear2();
+    void initFight();
+    void executeFight();
+    void initRelief();
+    void executeRelief();
+    void setAngle();
+    void pathMoveF();
+    int ctrlMsgAnm();
+    bool searchNextScheduleTagSub(fopAc_ac_c*);
+    bool searchFirstScheduleTagSub(fopAc_ac_c*);
+    void checkSchedule();
+    void setSchedule(daTagSchedule_c*);
+    inline bool isInShop();
+    bool isChairStyle();
+    bool isNoTurnTalk();
+    int waita(void*);
+    int talka(void*);
+    int waitwall(void*);
+    int talkwall(void*);
+    int talkbwall(void*);
+    int talkb(void*);
+    int talkc(void*);
+    int waitb(void*);
+    int sitwaita(void*);
+    int sittalka(void*);
+    int sittalkab(void*);
+    int sitwaitb(void*);
+    int sittalkb(void*);
+    int sittalkbb(void*);
+    int looka(void*);
+    int lookb(void*);
+    int playm(void*);
+    int turnr(void*);
+    int turnl(void*);
+    int walka(void*);
+    int walkb(void*);
+    int runa(void*);
+    int runb(void*);
+    int browsea(void*);
+    int browseb(void*);
+    int dance(void*);
+    int ladytalka(void*);
+    int ladytalkb(void*);
+    int normtalka(void*);
+    int normtalkb(void*);
+    int sellme(void*);
+    int sing(void*);
+    int create();
+    void create_init();
     inline int createHeap();
-    /* 8097D078 */ void setMtx();
-    /* 8097D120 */ void lookat();
-    /* 8097D684 */ virtual ~daNpcCdn3_c();
-    /* 8097D748 */ int execute();
-    /* 8097DABC */ void checkTimeSchedule();
+    void setMtx();
+    void lookat();
+    virtual ~daNpcCdn3_c();
+    int execute();
+    void checkTimeSchedule();
 
     inline int draw();
 
diff --git a/include/d/actor/d_a_npc_chat.h b/include/d/actor/d_a_npc_chat.h
index 81e8b7b381..cb550b120e 100644
--- a/include/d/actor/d_a_npc_chat.h
+++ b/include/d/actor/d_a_npc_chat.h
@@ -24,7 +24,7 @@ class daNpcChat_HIO_c : public mDoHIO_entry_c {
 
 class daNpcChat_Param_c {
 public:
-    /* 80986930 */ virtual ~daNpcChat_Param_c() {}
+    virtual ~daNpcChat_Param_c() {}
 
     static daNpcChat_HIOParam const m;
 };
@@ -34,52 +34,52 @@ public:
     typedef bool (daNpcChat_c::*actionFunc)(void*);
     typedef BOOL (daNpcChat_c::*eventFunc)(int);
 
-    /* 8098084C */ daNpcChat_c();
-    /* 80980A60 */ ~daNpcChat_c();
-    /* 80980C1C */ BOOL NpcCreate(int);
-    /* 80980E20 */ int getObjNum();
-    /* 80980F88 */ J3DModel* ObjCreate(int);
-    /* 80980FC8 */ J3DModel* ChairCreate(f32);
-    /* 80981108 */ bool isM_();
-    /* 80981140 */ cPhs__Step loadResrc(int, int);
-    /* 80981280 */ J3DModelData* getNpcMdlDataP(int);
-    /* 809812FC */ J3DModelData* getObjMdlDataP(int);
-    /* 80981374 */ J3DAnmTexPattern* getTexAnmP(int);
-    /* 809813E8 */ BOOL removeResrc(int, int);
-    /* 809814DC */ BOOL setAttention(int);
-    /* 80981E90 */ cPhs__Step Create();
-    /* 809822A0 */ BOOL CreateHeap();
-    /* 809823B4 */ int Delete();
-    /* 809823E8 */ int Execute();
-    /* 809824CC */ int Draw();
-    /* 8098250C */ int draw(int, int, f32, _GXColorS10*, int);
-    /* 80982780 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80982A98 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80982AB8 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80982B60 */ BOOL searchGroup();
-    /* 80982C10 */ BOOL appearTimeCheck();
-    /* 80982D20 */ BOOL appearCheck();
-    /* 80982EB4 */ void setParam();
-    /* 80982F4C */ BOOL main();
-    /* 80982FA4 */ void setAttnPos();
-    /* 809830EC */ bool setExpressionBtp(int);
-    /* 80983168 */ void setMotionAnm(int, f32);
-    /* 80983584 */ void setMotion(int, f32, int);
-    /* 809835C8 */ int drawDbgInfo();
-    /* 809835D0 */ void drawOtherMdls();
-    /* 809837A4 */ u8 getTalkMotionNo();
-    /* 809837C0 */ bool getLookPlayerCheck();
-    /* 809837EC */ void reset();
-    /* 809839E0 */ void playMotion();
-    /* 80984DD0 */ void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80984F34 */ BOOL setAction(actionFunc);
-    /* 80984FDC */ bool step(s16, int);
-    /* 809850D0 */ void setTalkMember(daNpcChat_c*);
-    /* 80985104 */ bool wait(void*);
-    /* 8098552C */ bool fear(void*);
-    /* 809856C8 */ bool talk(void*);
-    /* 80985A84 */ bool demo(void*);
-    /* 8098692C */ void adjustShapeAngle() {}
+    daNpcChat_c();
+    ~daNpcChat_c();
+    BOOL NpcCreate(int);
+    int getObjNum();
+    J3DModel* ObjCreate(int);
+    J3DModel* ChairCreate(f32);
+    bool isM_();
+    cPhs__Step loadResrc(int, int);
+    J3DModelData* getNpcMdlDataP(int);
+    J3DModelData* getObjMdlDataP(int);
+    J3DAnmTexPattern* getTexAnmP(int);
+    BOOL removeResrc(int, int);
+    BOOL setAttention(int);
+    cPhs__Step Create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int draw(int, int, f32, _GXColorS10*, int);
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    BOOL searchGroup();
+    BOOL appearTimeCheck();
+    BOOL appearCheck();
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTalkMotionNo();
+    bool getLookPlayerCheck();
+    void reset();
+    void playMotion();
+    void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
+    BOOL setAction(actionFunc);
+    bool step(s16, int);
+    void setTalkMember(daNpcChat_c*);
+    bool wait(void*);
+    bool fear(void*);
+    bool talk(void*);
+    bool demo(void*);
+    void adjustShapeAngle() {}
 
     u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
     u8 getTalkGroupNoParam() { return (fopAcM_GetParam(this) >> 12) & 0xF; }
diff --git a/include/d/actor/d_a_npc_chin.h b/include/d/actor/d_a_npc_chin.h
index b3679d080b..24e8173c9d 100644
--- a/include/d/actor/d_a_npc_chin.h
+++ b/include/d/actor/d_a_npc_chin.h
@@ -10,7 +10,7 @@ struct daNpcChin_HIOParam {
 
 class daNpcChin_Param_c {
 public:
-    /* 8099188C */ virtual ~daNpcChin_Param_c() {}
+    virtual ~daNpcChin_Param_c() {}
 
     static daNpcChin_HIOParam const m;
 };
@@ -50,7 +50,7 @@ public:
         /* 0x30 */ cXyz mScale;
         /* 0x3C */ s8 mSwitch;
 
-        /* 8098BF0C */ int loadModel();
+        int loadModel();
 
         inline void switch_off() {
             setSwitch(false);
@@ -70,13 +70,13 @@ public:
             mSwitch = i_active;
         }
 
-        /* 8098C000 */ void setMtx();
+        void setMtx();
 
         inline bool is_switch_on() {
             return mSwitch == TRUE;
         }
 
-        /* 8098C060 */ void draw(dKy_tevstr_c*);
+        void draw(dKy_tevstr_c*);
 
         inline void setPos(cXyz& i_pos) {
             mPos = i_pos;
@@ -98,71 +98,71 @@ public:
     typedef bool (daNpcChin_c::*actionFunc)(void*);
     typedef int (daNpcChin_c::*eventFunc)(int);
 
-    /* 8098C104 */ daNpcChin_c();
-    /* 8098C2D8 */ virtual ~daNpcChin_c();
-    /* 8098C510 */ int Create();
-    /* 8098C858 */ int CreateHeap();
-    /* 8098CCE4 */ int Delete();
-    /* 8098CD18 */ int Execute();
-    /* 8098CD74 */ int Draw();
-    /* 8098CDE8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8098CFB8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8098CFD8 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8098D024 */ virtual void setParam();
-    /* 8098D0F8 */ virtual int main();
-    /* 8098D198 */ virtual int ctrlBtk();
-    /* 8098D26C */ virtual void setAttnPos();
-    /* 8098D58C */ virtual bool setExpressionAnm(int, bool);
-    /* 8098D848 */ virtual bool setExpressionBtp(int);
-    /* 8098D938 */ virtual void setMotionAnm(int, f32);
-    /* 8098DB44 */ virtual void setExpression(int, f32);
-    /* 8098DB70 */ virtual void setMotion(int, f32, int);
-    /* 8098DBB4 */ virtual int drawDbgInfo();
-    /* 8098DBBC */ void reset();
-    /* 8098DCD0 */ void playExpression();
-    /* 8098E04C */ void playMotion();
-    /* 8098E5C4 */ int setAction(actionFunc i_func);
-    /* 8098E66C */ void setLookMode(int);
-    /* 8098E690 */ void lookat();
-    /* 8098E870 */ bool step(s16, int, int);
-    /* 8098EA00 */ BOOL chkFindPlayer();
-    /* 8098EACC */ void setExpressionTalkAfter();
-    /* 8098EBE8 */ bool wait(void*);
-    /* 8098EFE4 */ bool talk(void*);
-    /* 8098F208 */ void _talk_motion();
-    /* 8098F2BC */ bool demo(void*);
-    /* 8098F414 */ bool watch_game(void*);
-    /* 8098F758 */ void Event_DT();
+    daNpcChin_c();
+    virtual ~daNpcChin_c();
+    int Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    virtual void setParam();
+    virtual int main();
+    virtual int ctrlBtk();
+    virtual void setAttnPos();
+    virtual bool setExpressionAnm(int, bool);
+    virtual bool setExpressionBtp(int);
+    virtual void setMotionAnm(int, f32);
+    virtual void setExpression(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual int drawDbgInfo();
+    void reset();
+    void playExpression();
+    void playMotion();
+    int setAction(actionFunc i_func);
+    void setLookMode(int);
+    void lookat();
+    bool step(s16, int, int);
+    BOOL chkFindPlayer();
+    void setExpressionTalkAfter();
+    bool wait(void*);
+    bool talk(void*);
+    void _talk_motion();
+    bool demo(void*);
+    bool watch_game(void*);
+    void Event_DT();
     void Event_DT_Base() {
         dComIfGp_event_reset();
         mOrderEvtNo = 0;
         mEventIdx = -1;
     }
-    /* 8098FB3C */ BOOL isGameEnd(int&);
-    /* 8098FD38 */ BOOL _chkGameClear();
-    /* 8098FD5C */ void SphereReset();
-    /* 8098FD80 */ int _Evt_GameStart(int);
-    /* 8098FE28 */ int _Evt_GameStart_CutInit(int const&);
-    /* 8098FF30 */ int _Evt_GameStart_CutMain(int const&);
-    /* 8098FFD0 */ int _Evt_GameFailed(int);
-    /* 80990078 */ int _Evt_GameFailed_CutInit(int const&);
-    /* 80990174 */ int _Evt_GameFailed_CutMain(int const&);
-    /* 80990218 */ int _Evt_GameSucceed(int);
-    /* 809902C0 */ int _Evt_GameSucceed_CutInit(int const&);
-    /* 8099041C */ int _Evt_GameSucceed_CutMain(int const&);
-    /* 809905C4 */ int _Evt_SelectGiveUp(int);
-    /* 8099066C */ int _Evt_SelectGiveUp_CutInit(int const&);
-    /* 8099071C */ int _Evt_SelectGiveUp_CutMain(int const&);
-    /* 809907AC */ int _Evt_GameGiveUp(int);
-    /* 80990854 */ int _Evt_GameGiveUp_CutInit(int const&);
-    /* 80990950 */ int _Evt_GameGiveUp_CutMain(int const&);
-    /* 809909F4 */ int _Evt_Appear(int);
-    /* 80990A9C */ int _Evt_Appear_CutInit(int const&);
-    /* 80990BD8 */ int _Evt_Appear_CutMain(int const&);
-    /* 80990C9C */ int _Evt_SpotLight_Off(int);
-    /* 80990D44 */ int _Evt_SpotLight_Off_CutInit(int const&);
-    /* 80990DDC */ int _Evt_SpotLight_Off_CutMain(int const&);
-    /* 80991858 */ void setMtx() {
+    BOOL isGameEnd(int&);
+    BOOL _chkGameClear();
+    void SphereReset();
+    int _Evt_GameStart(int);
+    int _Evt_GameStart_CutInit(int const&);
+    int _Evt_GameStart_CutMain(int const&);
+    int _Evt_GameFailed(int);
+    int _Evt_GameFailed_CutInit(int const&);
+    int _Evt_GameFailed_CutMain(int const&);
+    int _Evt_GameSucceed(int);
+    int _Evt_GameSucceed_CutInit(int const&);
+    int _Evt_GameSucceed_CutMain(int const&);
+    int _Evt_SelectGiveUp(int);
+    int _Evt_SelectGiveUp_CutInit(int const&);
+    int _Evt_SelectGiveUp_CutMain(int const&);
+    int _Evt_GameGiveUp(int);
+    int _Evt_GameGiveUp_CutInit(int const&);
+    int _Evt_GameGiveUp_CutMain(int const&);
+    int _Evt_Appear(int);
+    int _Evt_Appear_CutInit(int const&);
+    int _Evt_Appear_CutMain(int const&);
+    int _Evt_SpotLight_Off(int);
+    int _Evt_SpotLight_Off_CutInit(int const&);
+    int _Evt_SpotLight_Off_CutMain(int const&);
+    void setMtx() {
         daNpcF_c::setMtx();
         mSpotLight.setMtx();
     }
diff --git a/include/d/actor/d_a_npc_clerka.h b/include/d/actor/d_a_npc_clerka.h
index 85cbb60103..f1c683d74d 100644
--- a/include/d/actor/d_a_npc_clerka.h
+++ b/include/d/actor/d_a_npc_clerka.h
@@ -12,7 +12,7 @@ struct daNpc_clerkA_HIOParam {
 
 class daNpc_clerkA_Param_c {
 public:
-    /* 80B2CD94 */ virtual ~daNpc_clerkA_Param_c() {}
+    virtual ~daNpc_clerkA_Param_c() {}
 
     static const daNpc_clerkA_HIOParam m;
 };
@@ -65,37 +65,37 @@ public:
         /* 0x6 */ MOT_UNK_6 = 6,
     };
 
-    /* 8099252C */ ~daNpc_clerkA_c();
-    /* 8099266C */ int create();
-    /* 80992914 */ int CreateHeap();
-    /* 80992D50 */ int Delete();
-    /* 80992D84 */ int Execute();
-    /* 80992E5C */ int Draw();
-    /* 80992EF0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80992F10 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80992F68 */ u8 getType();
-    /* 80992F88 */ int isDelete();
-    /* 80992FB8 */ void reset();
-    /* 809930EC */ void afterJntAnm(int);
-    /* 80993170 */ void setParam();
-    /* 809932A4 */ void setAfterTalkMotion();
-    /* 80993330 */ void srchActors();
-    /* 8099338C */ BOOL evtTalk();
-    /* 80993568 */ BOOL evtCutProc();
-    /* 80993630 */ void action();
-    /* 8099371C */ void beforeMove();
-    /* 80993794 */ void setAttnPos();
-    /* 80993A40 */ void setCollision();
-    /* 80993B74 */ int drawDbgInfo();
-    /* 80993B7C */ void drawOtherMdl();
-    /* 80993BDC */ int selectAction();
-    /* 80993C58 */ int chkAction(int (daNpc_clerkA_c::*)(void*));
-    /* 80993C84 */ int setAction(int (daNpc_clerkA_c::*)(void*));
-    /* 80993D2C */ int wait(void*);
-    /* 80993F84 */ int tend(void*);
-    /* 809941B8 */ int talk(void*);
-    /* 809943B0 */ int shop(void*);
-    /* 809955C8 */ daNpc_clerkA_c(
+    ~daNpc_clerkA_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    int chkAction(int (daNpc_clerkA_c::*)(void*));
+    int setAction(int (daNpc_clerkA_c::*)(void*));
+    int wait(void*);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_clerkA_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -105,12 +105,12 @@ public:
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
-    /* 80995694 */ u16 getEyeballMaterialNo() { return 3; }
-    /* 8099569C */ s32 getHeadJointNo() { return 4; }
-    /* 809956A4 */ s32 getNeckJointNo() { return 3; }
-    /* 809956AC */ s32 getBackboneJointNo() { return 1; }
-    /* 809956B4 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 809956C4 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
+    u16 getEyeballMaterialNo() { return 3; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_clerkb.h b/include/d/actor/d_a_npc_clerkb.h
index ecfbd011ca..dfe3ee6eb3 100644
--- a/include/d/actor/d_a_npc_clerkb.h
+++ b/include/d/actor/d_a_npc_clerkb.h
@@ -13,7 +13,7 @@ struct daNpc_clerkB_HIOParam {
 
 class daNpc_clerkB_Param_c {
 public:
-    /* 80B2CD94 */ virtual ~daNpc_clerkB_Param_c() {}
+    virtual ~daNpc_clerkB_Param_c() {}
 
     static const daNpc_clerkB_HIOParam m;
 };
@@ -74,41 +74,41 @@ public:
         /* 0x8 */ MOT_UNK_8 = 8,
     };
 
-    /* 80995F2C */ ~daNpc_clerkB_c();
-    /* 80996090 */ int create();
-    /* 80996338 */ int CreateHeap();
-    /* 809967C4 */ int Delete();
-    /* 809967F8 */ int Execute();
-    /* 809968D0 */ int Draw();
-    /* 80996964 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80996984 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809969DC */ u8 getType();
-    /* 809969FC */ int beforeStartSeqAction(dMsgFlow_c*, int);
-    /* 80996CCC */ int beforeSelectSeqAction(dMsgFlow_c*, int);
-    /* 80996F7C */ int isDelete();
-    /* 80996FAC */ void reset();
-    /* 809970E0 */ void afterJntAnm(int);
-    /* 80997188 */ void setParam();
-    /* 809972BC */ void setAfterTalkMotion();
-    /* 80997360 */ void srchActors();
-    /* 809973BC */ BOOL evtTalk();
-    /* 80997598 */ BOOL evtCutProc();
-    /* 80997660 */ void action();
-    /* 8099774C */ void beforeMove();
-    /* 809977C4 */ void setAttnPos();
-    /* 80997A1C */ void setCollision();
-    /* 80997B50 */ int drawDbgInfo();
-    /* 80997B58 */ void drawOtherMdl();
-    /* 80997BB8 */ void drawGhost();
-    /* 80997C44 */ int selectAction();
-    /* 80997CC0 */ int chkAction(int (daNpc_clerkB_c::*)(void*));
-    /* 80997CEC */ int setAction(int (daNpc_clerkB_c::*)(void*));
-    /* 80997D94 */ void setSe();
-    /* 80997E54 */ int wait(void*);
-    /* 809980AC */ int tend(void*);
-    /* 80998328 */ int talk(void*);
-    /* 80998520 */ int shop(void*);
-    /* 80999680 */ daNpc_clerkB_c(
+    ~daNpc_clerkB_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int beforeStartSeqAction(dMsgFlow_c*, int);
+    int beforeSelectSeqAction(dMsgFlow_c*, int);
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    void drawGhost();
+    int selectAction();
+    int chkAction(int (daNpc_clerkB_c::*)(void*));
+    int setAction(int (daNpc_clerkB_c::*)(void*));
+    void setSe();
+    int wait(void*);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_clerkB_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -118,12 +118,12 @@ public:
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
-    /* 809997AC */ u16 getEyeballMaterialNo() { return 3; }
-    /* 809997B4 */ s32 getHeadJointNo() { return 4; }
-    /* 809997BC */ s32 getNeckJointNo() { return 3; }
-    /* 809997C4 */ s32 getBackboneJointNo() { return 1; }
-    /* 809997CC */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 809997DC */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 9; }
+    u16 getEyeballMaterialNo() { return 3; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 9; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_clerkt.h b/include/d/actor/d_a_npc_clerkt.h
index 8f7031deb9..5480338e1e 100644
--- a/include/d/actor/d_a_npc_clerkt.h
+++ b/include/d/actor/d_a_npc_clerkt.h
@@ -10,7 +10,7 @@ struct daNpcClerkt_HIOParam {
 
 class daNpcClerkt_Param_c {
 public:
-    /* 80B2CD94 */ virtual ~daNpcClerkt_Param_c() {}
+    virtual ~daNpcClerkt_Param_c() {}
 
     static const daNpcClerkt_HIOParam m;
 };
@@ -57,35 +57,35 @@ public:
         /* 0x0 */ MOT_UNK_0,
     };
 
-    /* 8099A14C */ ~daNpcClerkT_c();
-    /* 8099A28C */ int create();
-    /* 8099A530 */ int CreateHeap();
-    /* 8099A96C */ int Delete();
-    /* 8099A9A0 */ int Execute();
-    /* 8099AA80 */ int Draw();
-    /* 8099AB14 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8099AB34 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8099AB8C */ int isDelete();
-    /* 8099ABBC */ void reset();
-    /* 8099ACF0 */ void afterJntAnm(int);
-    /* 8099AD74 */ BOOL evtTalk();
-    /* 8099AF18 */ BOOL evtCutProc();
-    /* 8099AFE0 */ void action();
-    /* 8099B0CC */ int drawDbgInfo();
-    /* 8099B0D4 */ void drawOtherMdl();
-    /* 8099B134 */ int selectAction();
-    /* 8099B1B0 */ int chkAction(int (daNpcClerkT_c::*)(void*));
-    /* 8099B1DC */ int setAction(int (daNpcClerkT_c::*)(void*));
-    /* 8099B284 */ int wait(void*);
-    /* 8099B4DC */ int tend(void*);
-    /* 8099B60C */ int talk(void*);
-    /* 8099B804 */ int shop(void*);
-    /* 8099BCE8 */ inline void setParam();
-    /* 8099BE48 */ inline void setAfterTalkMotion();
-    /* 8099BEA8 */ inline void beforeMove();
-    /* 8099BF20 */ inline void setAttnPos();
-    /* 8099C1A0 */ inline void setCollision();
-    /* 8099CF9C */ daNpcClerkT_c(
+    ~daNpcClerkT_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    int chkAction(int (daNpcClerkT_c::*)(void*));
+    int setAction(int (daNpcClerkT_c::*)(void*));
+    int wait(void*);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
+    inline void setParam();
+    inline void setAfterTalkMotion();
+    inline void beforeMove();
+    inline void setAttnPos();
+    inline void setCollision();
+    daNpcClerkT_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -95,12 +95,12 @@ public:
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
-    /* 8099D068 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 8099D070 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 17; }
-    /* 8099D080 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 19; }
-    /* 8099D090 */ s32 getBackboneJointNo() { return 15; }
-    /* 8099D098 */ s32 getNeckJointNo() { return 16; }
-    /* 8099D0A0 */ s32 getHeadJointNo() { return 17; }
+    u16 getEyeballMaterialNo() { return 2; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 17; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 19; }
+    s32 getBackboneJointNo() { return 15; }
+    s32 getNeckJointNo() { return 16; }
+    s32 getHeadJointNo() { return 17; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_coach.h b/include/d/actor/d_a_npc_coach.h
index 8518b09ecb..8d6a2446a7 100644
--- a/include/d/actor/d_a_npc_coach.h
+++ b/include/d/actor/d_a_npc_coach.h
@@ -223,35 +223,35 @@ public:
 
 class daNpcCoach_c : public fopAc_ac_c {
 public:
-    /* 8099DA60 */ void hitFireArrow(cXyz);
-    /* 8099DBA4 */ void deleteFireArrow(unsigned int);
-    /* 8099DCE8 */ bool deleteFireArrowFromList(unsigned int);
-    /* 8099DD28 */ void setPosAngle(cXyz&, csXyz&);
-    /* 8099DD7C */ int ctrlJointHorse(J3DJoint*, J3DModel*);
-    /* 8099DE18 */ void initCoachPosition(Vec&, SVec&);
-    /* 8099E138 */ void changeAtherPath(s8, cXyz&, csXyz&);
-    /* 8099E4C0 */ int createHeap();
-    /* 8099EB40 */ int execute();
-    /* 8099EEA0 */ void checkCoachDamage();
-    /* 8099F1B8 */ inline void setCoachBlazing(u8);
-    /* 8099F4BC */ void reinsExecute();
-    /* 8099F988 */ void reinsInit();
-    /* 8099FCF4 */ void calcCoachMotion();
-    /* 809A0728 */ inline void calcRearWheelRotate();
-    /* 809A0E00 */ void calcHarnessMotion();
-    /* 809A1180 */ void calcFrontWheelRotate();
-    /* 809A1810 */ void calcHorseMotion();
-    /* 809A1BE0 */ inline void calcHorseAnm();
-    /* 809A2740 */ void calcHorsePath();
-    /* 809A2EB8 */ int draw();
-    /* 809A3330 */ ~daNpcCoach_c();
-    /* 809A3884 */ cPhs__Step create();
-    /* 809A3928 */ void create_init();
-    /* 809A4078 */ inline void initCollision();
-    /* 809A43A0 */ void initBaseMtx();
-    /* 809A43DC */ void setBaseMtx();
-    /* 809A46C4 */ void initCoachBlazing();
-    /* 809A48A8 */ daNpcCoach_c();
+    void hitFireArrow(cXyz);
+    void deleteFireArrow(unsigned int);
+    bool deleteFireArrowFromList(unsigned int);
+    void setPosAngle(cXyz&, csXyz&);
+    int ctrlJointHorse(J3DJoint*, J3DModel*);
+    void initCoachPosition(Vec&, SVec&);
+    void changeAtherPath(s8, cXyz&, csXyz&);
+    int createHeap();
+    int execute();
+    void checkCoachDamage();
+    inline void setCoachBlazing(u8);
+    void reinsExecute();
+    void reinsInit();
+    void calcCoachMotion();
+    inline void calcRearWheelRotate();
+    void calcHarnessMotion();
+    void calcFrontWheelRotate();
+    void calcHorseMotion();
+    inline void calcHorseAnm();
+    void calcHorsePath();
+    int draw();
+    ~daNpcCoach_c();
+    cPhs__Step create();
+    void create_init();
+    inline void initCollision();
+    void initBaseMtx();
+    void setBaseMtx();
+    void initCoachBlazing();
+    daNpcCoach_c();
 
     bool checkCoachBlazing() { return mCoachBlazing; }
     Mtx* getCoachMtx() { return &mCoachMtx; }
diff --git a/include/d/actor/d_a_npc_doc.h b/include/d/actor/d_a_npc_doc.h
index c8ed81acae..114bd9f749 100644
--- a/include/d/actor/d_a_npc_doc.h
+++ b/include/d/actor/d_a_npc_doc.h
@@ -10,7 +10,7 @@ struct daNpc_Doc_HIOParam {
 
 class daNpc_Doc_Param_c {
 public:
-    /* 809AA2B0 */ virtual ~daNpc_Doc_Param_c() {}
+    virtual ~daNpc_Doc_Param_c() {}
 
     static const daNpc_Doc_HIOParam m;
 };
@@ -43,25 +43,25 @@ public:
     typedef int (daNpc_Doc_c::*actionFunc)(int);
     typedef int (daNpc_Doc_c::*cutFunc)(int);
 
-    /* 809A6C8C */ virtual ~daNpc_Doc_c();
-    /* 809A6DC0 */ int create();
-    /* 809A7088 */ int CreateHeap();
-    /* 809A74C8 */ int Delete();
-    /* 809A74FC */ int Execute();
-    /* 809A751C */ int Draw();
-    /* 809A75B0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809A75D0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809A7628 */ int getType();
-    /* 809A7660 */ int isDelete();
-    /* 809A7694 */ void reset();
-    /* 809A7C3C */ void srchActors();
-    /* 809A8538 */ BOOL selectAction();
-    /* 809A8620 */ int chkAction(int (daNpc_Doc_c::*)(void*));
-    /* 809A864C */ int setAction(int (daNpc_Doc_c::*)(void*));
-    /* 809A86F4 */ int wait(void*);
-    /* 809A8A9C */ int walk(void*);
-    /* 809A8C78 */ int talk(void*);
-    /* 809AA18C */ daNpc_Doc_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    virtual ~daNpc_Doc_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int getType();
+    int isDelete();
+    void reset();
+    void srchActors();
+    BOOL selectAction();
+    int chkAction(int (daNpc_Doc_c::*)(void*));
+    int setAction(int (daNpc_Doc_c::*)(void*));
+    int wait(void*);
+    int walk(void*);
+    int talk(void*);
+    daNpc_Doc_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
@@ -78,26 +78,26 @@ public:
     int test(void*);
     #endif
     
-    /* 809AA26C */ BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
-    /* 809AA27C */ BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 8; }
-    /* 809AA264 */ s32 getBackboneJointNo() { return 1; }
-    /* 809AA25C */ s32 getNeckJointNo() { return 3; }
-    /* 809AA254 */ s32 getHeadJointNo() { return 4; }
-    /* 809AA28C */ s32 getFootLJointNo() { return 24; }
-    /* 809AA294 */ s32 getFootRJointNo() { return 27; }
-    /* 809AA24C */ u16 getEyeballMaterialNo() { return 4; }
-    /* 809A7918 */ void afterJntAnm(int);
-    /* 809A79A4 */ void setParam();
-    /* 809A7ABC */ BOOL checkChangeEvt();
-    /* 809A7C40 */ BOOL evtTalk();
-    /* 809A7CE0 */ BOOL evtCutProc();
-    /* 809A7BC4 */ void setAfterTalkMotion();
-    /* 809A7DA8 */ void action();
-    /* 809A7F3C */ void beforeMove();
-    /* 809A80B8 */ void setAttnPos();
-    /* 809A83A8 */ void setCollision();
-    /* 809AA29C */ BOOL chkXYItems() { return mType == 1; }
-    /* 809A8530 */ BOOL drawDbgInfo();
+    BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
+    BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 8; }
+    s32 getBackboneJointNo() { return 1; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getFootLJointNo() { return 24; }
+    s32 getFootRJointNo() { return 27; }
+    u16 getEyeballMaterialNo() { return 4; }
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void setAfterTalkMotion();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    BOOL chkXYItems() { return mType == 1; }
+    BOOL drawDbgInfo();
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_doorboy.h b/include/d/actor/d_a_npc_doorboy.h
index 834c521f69..fd25ec9fd2 100644
--- a/include/d/actor/d_a_npc_doorboy.h
+++ b/include/d/actor/d_a_npc_doorboy.h
@@ -22,31 +22,31 @@ public:
     typedef bool (daNpcDoorBoy_c::*actionFunc)(void*);
     typedef BOOL (daNpcDoorBoy_c::*EventFn)(int);
 
-    /* 809AAC8C */ daNpcDoorBoy_c();
-    /* 809AAEA0 */ ~daNpcDoorBoy_c();
-    /* 809AB088 */ cPhs__Step Create();
-    /* 809AB320 */ int CreateHeap();
-    /* 809AB4A4 */ int Delete();
-    /* 809AB4D8 */ int Execute();
-    /* 809AB4FC */ int Draw();
-    /* 809AB578 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809AB704 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809AB724 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809AB770 */ void setMotion(int, f32, int);
-    /* 809AB7B8 */ void reset();
-    /* 809AB984 */ inline BOOL setAction(bool (daNpcDoorBoy_c::*)(void*));
-    /* 809ABA2C */ bool wait(void*);
-    /* 809AC064 */ bool fear(void*);
-    /* 809AC114 */ bool talk(void*);
-    /* 809AC528 */ bool demo(void*);
-    /* 809AC6F4 */ bool dummyTalk(void*);
-    /* 809AC994 */ void setParam();
-    /* 809ACA58 */ BOOL main();
-    /* 809ACC5C */ void setAttnPos();
-    /* 809ACE18 */ inline void lookat();
-    /* 809ACFF8 */ void setMotionAnm(int, f32);
-    /* 809AD0C8 */ BOOL drawDbgInfo();
-    /* 809AD938 */ void adjustShapeAngle() {}
+    daNpcDoorBoy_c();
+    ~daNpcDoorBoy_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setMotion(int, f32, int);
+    void reset();
+    inline BOOL setAction(bool (daNpcDoorBoy_c::*)(void*));
+    bool wait(void*);
+    bool fear(void*);
+    bool talk(void*);
+    bool demo(void*);
+    bool dummyTalk(void*);
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    inline void lookat();
+    void setMotionAnm(int, f32);
+    BOOL drawDbgInfo();
+    void adjustShapeAngle() {}
 
     inline u16 getMessageNo() { return fopAcM_GetParam(this) >> 8; }
     inline void playMotion();
@@ -82,7 +82,7 @@ STATIC_ASSERT(sizeof(daNpcDoorBoy_c) == 0xe08);
 
 class daNpcDoorBoy_Param_c {
 public:
-    /* 809AD93C */ virtual ~daNpcDoorBoy_Param_c() {}
+    virtual ~daNpcDoorBoy_Param_c() {}
 
     static daNpcDoorBoy_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_drainSol.h b/include/d/actor/d_a_npc_drainSol.h
index 6aa677f4f4..fef98ee92e 100644
--- a/include/d/actor/d_a_npc_drainSol.h
+++ b/include/d/actor/d_a_npc_drainSol.h
@@ -13,28 +13,28 @@
  */
 class daNpcDrSol_c : public daNpcF_c {
 public:
-    /* 809ADE6C */ daNpcDrSol_c();
-    /* 809ADFE4 */ virtual ~daNpcDrSol_c();
-    /* 809AE10C */ int Create();
-    /* 809AE354 */ int CreateHeap();
-    /* 809AE51C */ int Delete();
-    /* 809AE550 */ int Execute();
-    /* 809AE5CC */ int Draw();
-    /* 809AE69C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809AE6BC */ void reset();
-    /* 809AE844 */ inline int setAction(bool (daNpcDrSol_c::*)(void*));
-    /* 809AE8EC */ bool chkFindPlayer();
-    /* 809AE994 */ bool wait(void*);
-    /* 809AEB94 */ bool talk(void*);
+    daNpcDrSol_c();
+    virtual ~daNpcDrSol_c();
+    int Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void reset();
+    inline int setAction(bool (daNpcDrSol_c::*)(void*));
+    bool chkFindPlayer();
+    bool wait(void*);
+    bool talk(void*);
 
-    /* 809AEDA8 */ virtual void setParam();
-    /* 809AEE24 */ virtual BOOL main();
-    /* 809AF934 */ virtual void adjustShapeAngle() {}
-    /* 809AEFDC */ virtual void setAttnPos();
-    /* 809AF12C */ virtual void setMotionAnm(int, f32);
-    /* 809AEB18 */ virtual void setMotion(int, f32, int);
-    /* 809AF1FC */ virtual BOOL drawDbgInfo();
-    /* 809AE60C */ virtual void drawOtherMdls();
+    virtual void setParam();
+    virtual BOOL main();
+    virtual void adjustShapeAngle() {}
+    virtual void setAttnPos();
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual BOOL drawDbgInfo();
+    virtual void drawOtherMdls();
 
     inline void playMotion();
 
@@ -63,7 +63,7 @@ struct daNpcDrSol_HIOParam {
 
 class daNpcDrSol_Param_c {
 public:
-    /* 809AF938 */ virtual ~daNpcDrSol_Param_c() {}
+    virtual ~daNpcDrSol_Param_c() {}
 
     static const daNpcDrSol_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h
index f7abf915c5..51b1434113 100644
--- a/include/d/actor/d_a_npc_fairy.h
+++ b/include/d/actor/d_a_npc_fairy.h
@@ -55,14 +55,14 @@ public:
             mpMorf = NULL;
         }
     }
-    /* 809B1B0C */ BOOL create();
-    /* 809B1BC0 */ BOOL loadModel();
-    /* 809B1CE4 */ BOOL setAnm(int);
-    /* 809B1DEC */ BOOL setBrk(int);
-    /* 809B1EA8 */ BOOL setBtk(int);
-    /* 809B1F64 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809B1F6C */ void connect(daNpc_Fairy_c*);
-    /* 809B1FD4 */ void draw(daNpc_Fairy_c*);
+    BOOL create();
+    BOOL loadModel();
+    BOOL setAnm(int);
+    BOOL setBrk(int);
+    BOOL setBtk(int);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void connect(daNpc_Fairy_c*);
+    void draw(daNpc_Fairy_c*);
 
     void output_anmframe() {}
 
@@ -92,7 +92,7 @@ struct daNpc_Fairy_HIOParam {
 
 class daNpc_Fairy_Param_c {
 public:
-    /* 809B9278 */ virtual ~daNpc_Fairy_Param_c() {}
+    virtual ~daNpc_Fairy_Param_c() {}
 
     static daNpc_Fairy_HIOParam const m;
 };
@@ -160,100 +160,100 @@ public:
     typedef int (daNpc_Fairy_c::*actionFunc)(int);
     typedef int (daNpc_Fairy_c::*cutFunc)(int);
 
-    /* 809B228C */ ~daNpc_Fairy_c();
-    /* 809B2430 */ cPhs__Step Create();
-    /* 809B26E8 */ int CreateHeap();
-    /* 809B2B44 */ void setAnmData();
-    /* 809B2C20 */ bool setMotionAnm(int, f32, int);
-    /* 809B2E78 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 809B2EFC */ int Delete();
-    /* 809B2F30 */ int Execute();
-    /* 809B2F8C */ int Draw();
-    /* 809B3034 */ void drawOtherMdl();
-    /* 809B3074 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809B3094 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809B30EC */ BOOL isDelete();
-    /* 809B30F4 */ void reset();
-    /* 809B32C4 */ void initStatus();
-    /* 809B32D0 */ void afterJntAnm(int);
-    /* 809B335C */ void setParam();
-    /* 809B349C */ BOOL checkChangeEvt();
-    /* 809B34A4 */ void setAfterTalkMotion();
-    /* 809B3520 */ void srchActors();
-    /* 809B3524 */ BOOL evtTalk();
-    /* 809B3630 */ BOOL evtCutProc();
-    /* 809B36F8 */ BOOL evtEndProc();
-    /* 809B379C */ void action();
-    /* 809B384C */ void ptcl_water();
-    /* 809B38E8 */ void ptcl_sprit();
-    /* 809B39FC */ void _to_FairyField();
-    /* 809B3AB0 */ int chk_tempbit();
-    /* 809B3B20 */ void beforeMove();
-    /* 809B3B98 */ void afterMoved();
-    /* 809B3C64 */ void setAttnPos();
-    /* 809B3EA0 */ void setCollision();
-    /* 809B3FD8 */ int drawDbgInfo();
-    /* 809B3FE0 */ BOOL setAction(actionFunc, int);
-    /* 809B4090 */ int wait(int);
-    /* 809B4360 */ int talk(int);
+    ~daNpc_Fairy_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    void setAnmData();
+    bool setMotionAnm(int, f32, int);
+    bool afterSetMotionAnm(int, int, f32, int);
+    int Delete();
+    int Execute();
+    int Draw();
+    void drawOtherMdl();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    BOOL isDelete();
+    void reset();
+    void initStatus();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    BOOL evtEndProc();
+    void action();
+    void ptcl_water();
+    void ptcl_sprit();
+    void _to_FairyField();
+    int chk_tempbit();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL setAction(actionFunc, int);
+    int wait(int);
+    int talk(int);
     #if DEBUG
     int test(int);
     #endif
-    /* 809B4450 */ void AppearDemoCall();
-    /* 809B4588 */ void ReturnDemoCall();
-    /* 809B45BC */ void PresentDemoCall();
-    /* 809B464C */ int cutAppear_10F_01(int);
-    /* 809B46E0 */ int _cutAppear_10F_01_Init(int const&);
-    /* 809B48C4 */ int _cutAppear_10F_01_Main(int const&);
-    /* 809B4A44 */ int cutAppear_10F_02(int);
-    /* 809B4AD8 */ int _cutAppear_10F_02_Init(int const&);
-    /* 809B4BF8 */ int _cutAppear_10F_02_Main(int const&);
-    /* 809B4CC0 */ int cutAppear_20F_01(int);
-    /* 809B4D54 */ int _cutAppear_20F_01_Init(int const&);
-    /* 809B4EB4 */ int _cutAppear_20F_01_Main(int const&);
-    /* 809B5000 */ int cutAppear_20F_02(int);
-    /* 809B5094 */ int _cutAppear_20F_02_Init(int const&);
-    /* 809B51F4 */ int _cutAppear_20F_02_Main(int const&);
-    /* 809B5340 */ int cutAppear_30F_01(int);
-    /* 809B53D4 */ int _cutAppear_30F_01_Init(int const&);
-    /* 809B54F4 */ int _cutAppear_30F_01_Main(int const&);
-    /* 809B55BC */ int cutAppear_30F_02(int);
-    /* 809B5650 */ int _cutAppear_30F_02_Init(int const&);
-    /* 809B5770 */ int _cutAppear_30F_02_Main(int const&);
-    /* 809B5838 */ int cutAppear_40F_01(int);
-    /* 809B58CC */ int _cutAppear_40F_01_Init(int const&);
-    /* 809B59EC */ int _cutAppear_40F_01_Main(int const&);
-    /* 809B5AB4 */ int cutAppear_40F_02(int);
-    /* 809B5B48 */ int _cutAppear_40F_02_Init(int const&);
-    /* 809B5C68 */ int _cutAppear_40F_02_Main(int const&);
-    /* 809B5D30 */ int cutAppear_50F_01(int);
-    /* 809B5E00 */ int _cutAppear_50F_01_Init(int const&, int const&);
-    /* 809B6084 */ int _cutAppear_50F_01_Main(int const&, int const&);
-    /* 809B631C */ int cutAppear_50F_02(int);
-    /* 809B63EC */ int _cutAppear_50F_02_Init(int const&, int const&);
-    /* 809B662C */ int _cutAppear_50F_02_Main(int const&, int const&);
-    /* 809B6830 */ int cutAppear_50F_03(int);
-    /* 809B6900 */ int _cutAppear_50F_03_Init(int const&, int const&);
-    /* 809B6ADC */ int _cutAppear_50F_03_Main(int const&, int const&);
-    /* 809B6C30 */ int cutAppear_50F_04(int);
-    /* 809B6D00 */ int _cutAppear_50F_04_Init(int const&, int const&);
-    /* 809B6F40 */ int _cutAppear_50F_04_Main(int const&, int const&);
-    /* 809B7168 */ int cutAppear_50F_05(int);
-    /* 809B7238 */ int _cutAppear_50F_05_Init(int const&, int const&);
-    /* 809B74AC */ int _cutAppear_50F_05_Main(int const&, int const&);
-    /* 809B7718 */ int cutSelect_Return1(int);
-    /* 809B77AC */ int _cutSelect_Return1_Init(int const&);
-    /* 809B78F0 */ int _cutSelect_Return1_Main(int const&);
-    /* 809B79A4 */ int cutSelect_Return2(int);
-    /* 809B7A38 */ int _cutSelect_Return2_Init(int const&);
-    /* 809B7A9C */ int _cutSelect_Return2_Main(int const&);
-    /* 809B7BA4 */ int cutSelect_Return3(int);
-    /* 809B7C38 */ int _cutSelect_Return3_Init(int const&);
-    /* 809B7D7C */ int _cutSelect_Return3_Main(int const&);
-    /* 809B7E30 */ int cutReturnCancel(int);
-    /* 809B7EC4 */ int _cutReturnCancel_Init(int const&);
-    /* 809B7ECC */ int _cutReturnCancel_Main(int const&);
-    /* 809B9054 */ daNpc_Fairy_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    void AppearDemoCall();
+    void ReturnDemoCall();
+    void PresentDemoCall();
+    int cutAppear_10F_01(int);
+    int _cutAppear_10F_01_Init(int const&);
+    int _cutAppear_10F_01_Main(int const&);
+    int cutAppear_10F_02(int);
+    int _cutAppear_10F_02_Init(int const&);
+    int _cutAppear_10F_02_Main(int const&);
+    int cutAppear_20F_01(int);
+    int _cutAppear_20F_01_Init(int const&);
+    int _cutAppear_20F_01_Main(int const&);
+    int cutAppear_20F_02(int);
+    int _cutAppear_20F_02_Init(int const&);
+    int _cutAppear_20F_02_Main(int const&);
+    int cutAppear_30F_01(int);
+    int _cutAppear_30F_01_Init(int const&);
+    int _cutAppear_30F_01_Main(int const&);
+    int cutAppear_30F_02(int);
+    int _cutAppear_30F_02_Init(int const&);
+    int _cutAppear_30F_02_Main(int const&);
+    int cutAppear_40F_01(int);
+    int _cutAppear_40F_01_Init(int const&);
+    int _cutAppear_40F_01_Main(int const&);
+    int cutAppear_40F_02(int);
+    int _cutAppear_40F_02_Init(int const&);
+    int _cutAppear_40F_02_Main(int const&);
+    int cutAppear_50F_01(int);
+    int _cutAppear_50F_01_Init(int const&, int const&);
+    int _cutAppear_50F_01_Main(int const&, int const&);
+    int cutAppear_50F_02(int);
+    int _cutAppear_50F_02_Init(int const&, int const&);
+    int _cutAppear_50F_02_Main(int const&, int const&);
+    int cutAppear_50F_03(int);
+    int _cutAppear_50F_03_Init(int const&, int const&);
+    int _cutAppear_50F_03_Main(int const&, int const&);
+    int cutAppear_50F_04(int);
+    int _cutAppear_50F_04_Init(int const&, int const&);
+    int _cutAppear_50F_04_Main(int const&, int const&);
+    int cutAppear_50F_05(int);
+    int _cutAppear_50F_05_Init(int const&, int const&);
+    int _cutAppear_50F_05_Main(int const&, int const&);
+    int cutSelect_Return1(int);
+    int _cutSelect_Return1_Init(int const&);
+    int _cutSelect_Return1_Main(int const&);
+    int cutSelect_Return2(int);
+    int _cutSelect_Return2_Init(int const&);
+    int _cutSelect_Return2_Main(int const&);
+    int cutSelect_Return3(int);
+    int _cutSelect_Return3_Init(int const&);
+    int _cutSelect_Return3_Main(int const&);
+    int cutReturnCancel(int);
+    int _cutReturnCancel_Init(int const&);
+    int _cutReturnCancel_Main(int const&);
+    daNpc_Fairy_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
         int i_faceMotionStepNum,
@@ -264,12 +264,12 @@ public:
                    i_arcNames) {
                     OS_REPORT("|%06d:%x|daNpc_Fairy_c -> コンストラクト\n", g_Counter.mCounter0, this);
                    }
-    /* 809B9238 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 809B9240 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 809B9248 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 809B9250 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 809B9258 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 809B9268 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_fairy_seirei.h b/include/d/actor/d_a_npc_fairy_seirei.h
index 8bc6c664a0..3093ca51f1 100644
--- a/include/d/actor/d_a_npc_fairy_seirei.h
+++ b/include/d/actor/d_a_npc_fairy_seirei.h
@@ -16,29 +16,29 @@ public:
     typedef int (daNpc_FairySeirei_c::*cutFunc)(int);
     typedef int (daNpc_FairySeirei_c::*actionFunc)(int);
 
-    /* 8053FF6C */ ~daNpc_FairySeirei_c();
-    /* 8054006C */ int create();
-    /* 80540298 */ int Delete();
-    /* 805402CC */ int Execute();
-    /* 805402EC */ int Draw();
-    /* 805402F4 */ int isDelete();
-    /* 80540334 */ void reset();
-    /* 8054048C */ void setParam();
-    /* 805405B0 */ void srchActors();
-    /* 805405B4 */ BOOL evtTalk();
-    /* 805406BC */ BOOL evtCutProc();
-    /* 80540784 */ void action();
-    /* 8054080C */ void beforeMove();
-    /* 80540884 */ void setCollision();
-    /* 80540988 */ void setAttnPos();
-    /* 80540A30 */ BOOL drawDbgInfo();
-    /* 80540A38 */ bool selectAction();
-    /* 80540A80 */ bool setAction(actionFunc);
-    /* 80540B28 */ void setPrtcls();
-    /* 80540C54 */ int wait(int);
-    /* 80540CC0 */ int talk(int);
-    /* 80540E10 */ void _to_FairyCave();
-    /* 80541BE4 */ daNpc_FairySeirei_c(daNpcT_faceMotionAnmData_c const* param_1,
+    ~daNpc_FairySeirei_c();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    int isDelete();
+    void reset();
+    void setParam();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setCollision();
+    void setAttnPos();
+    BOOL drawDbgInfo();
+    bool selectAction();
+    bool setAction(actionFunc);
+    void setPrtcls();
+    int wait(int);
+    int talk(int);
+    void _to_FairyCave();
+    daNpc_FairySeirei_c(daNpcT_faceMotionAnmData_c const* param_1,
                                        daNpcT_motionAnmData_c const* param_2,
                                        daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                        int param_4,
@@ -81,7 +81,7 @@ STATIC_ASSERT(sizeof(daNpc_FairySeirei_c) == 0xfb0);
 
 class daNpc_FairySeirei_Param_c {
 public:
-    /* 80541D20 */ virtual ~daNpc_FairySeirei_Param_c() {}
+    virtual ~daNpc_FairySeirei_Param_c() {}
 
     static f32 const m[37];
 };
diff --git a/include/d/actor/d_a_npc_fguard.h b/include/d/actor/d_a_npc_fguard.h
index 62070df13b..9a062bdf14 100644
--- a/include/d/actor/d_a_npc_fguard.h
+++ b/include/d/actor/d_a_npc_fguard.h
@@ -15,10 +15,10 @@
 
 class daNpcFgd_c : public daNpcCd2_c {
 public:
-    /* 809BA53C */ void initPosAngle(Vec&, s16);
-    /* 809BA584 */ cPhs__Step create();
-    /* 809BA730 */ void create_init();
-    /* 809BAA80 */ inline virtual ~daNpcFgd_c();
+    void initPosAngle(Vec&, s16);
+    cPhs__Step create();
+    void create_init();
+    inline virtual ~daNpcFgd_c();
 
     int getType() { return fopAcM_GetParam(this) & 0xFF; }
     int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/actor/d_a_npc_gnd.h b/include/d/actor/d_a_npc_gnd.h
index b29b16d57c..983928570a 100644
--- a/include/d/actor/d_a_npc_gnd.h
+++ b/include/d/actor/d_a_npc_gnd.h
@@ -9,7 +9,7 @@ struct daNpc_Gnd_HIOParam {
 
 class daNpc_Gnd_Param_c {
 public:
-    /* 809BE434 */ virtual ~daNpc_Gnd_Param_c() {}
+    virtual ~daNpc_Gnd_Param_c() {}
 
     static const daNpc_Gnd_HIOParam m;
 };
@@ -47,37 +47,37 @@ public:
         TYPE_1,
     };
 
-    /* 809BB60C */ ~daNpc_Gnd_c();
-    /* 809BB730 */ int create();
-    /* 809BB9D4 */ int CreateHeap();
-    /* 809BBE2C */ int Delete();
-    /* 809BBE60 */ int Execute();
-    /* 809BBE80 */ int Draw();
-    /* 809BBF44 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809BBF64 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809BBFBC */ u8 getType();
-    /* 809BBFDC */ int getFlowNodeNo();
-    /* 809BBFF8 */ int isDelete();
-    /* 809BC028 */ void reset();
-    /* 809BC168 */ void afterJntAnm(int);
-    /* 809BC1F4 */ BOOL ctrlBtk();
-    /* 809BC328 */ void setParam();
-    /* 809BC448 */ void setAfterTalkMotion();
-    /* 809BC4A8 */ void srchActors();
-    /* 809BC4AC */ BOOL evtTalk();
-    /* 809BC5AC */ BOOL evtCutProc();
-    /* 809BC674 */ void action();
-    /* 809BC760 */ void beforeMove();
-    /* 809BC7D8 */ void setAttnPos();
-    /* 809BCA14 */ void setCollision();
-    /* 809BCB48 */ int drawDbgInfo();
-    /* 809BCB50 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 809BCCE8 */ int selectAction();
-    /* 809BCD30 */ int chkAction(int (daNpc_Gnd_c::*)(void*));
-    /* 809BCD5C */ int setAction(int (daNpc_Gnd_c::*)(void*));
-    /* 809BCE04 */ int wait(void*);
-    /* 809BD050 */ int talk(void*);
-    /* 809BE2D0 */ daNpc_Gnd_c(
+    ~daNpc_Gnd_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL ctrlBtk();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(int (daNpc_Gnd_c::*)(void*));
+    int setAction(int (daNpc_Gnd_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    daNpc_Gnd_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -90,11 +90,11 @@ public:
         // "|%06d:%x|daNpc_Gnd_c -> Construct\n"
         OS_REPORT("|%06d:%x|daNpc_Gnd_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 809BE40C */ u16 getEyeballRMaterialNo() { return 3; }
-    /* 809BE414 */ u16 getEyeballLMaterialNo() { return 2; }
-    /* 809BE41C */ s32 getHeadJointNo() { return 4; }
-    /* 809BE424 */ s32 getNeckJointNo() { return 3; }
-    /* 809BE42C */ s32 getBackboneJointNo() { return 1; }
+    u16 getEyeballRMaterialNo() { return 3; }
+    u16 getEyeballLMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
 
     static char* mCutNameList[1];
     static cutFunc mCutList[1];
diff --git a/include/d/actor/d_a_npc_gra.h b/include/d/actor/d_a_npc_gra.h
index a2acb2a692..fe22a787f8 100644
--- a/include/d/actor/d_a_npc_gra.h
+++ b/include/d/actor/d_a_npc_gra.h
@@ -19,7 +19,7 @@ public:
 
 class daNpc_grA_Param_c {
 public:
-    /* 809C9D2C */ virtual ~daNpc_grA_Param_c(){};
+    virtual ~daNpc_grA_Param_c(){};
 
     static daNpc_grA_HIOParam const m;
 };
@@ -62,81 +62,81 @@ public:
         /* 0x24 */ dPaPo_c mManager;
     };
 
-    /* 809BE94C */ daNpc_grA_c();
-    /* 809BEB64 */ ~daNpc_grA_c();
-    /* 809BEDA4 */ BOOL create();
-    /* 809BF0A8 */ BOOL CreateHeap();
-    /* 809BF418 */ BOOL Delete();
-    /* 809BF44C */ BOOL Execute();
-    /* 809BF490 */ BOOL Draw();
-    /* 809BF504 */ BOOL ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809BF738 */ static BOOL createHeapCallBack(fopAc_ac_c*);
-    /* 809BF758 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 809BF7A4 */ BOOL setTagJump();
-    /* 809BF8A0 */ BOOL setTagJump2();
-    /* 809BF99C */ BOOL setHomeJump();
-    /* 809BFAF4 */ bool checkTagGraSub(fopAc_ac_c*);
-    /* 809BFBC0 */ bool checkTagGraSub2(fopAc_ac_c*);
-    /* 809BFDCC */ bool checkTagGraSubCrashed(fopAc_ac_c*);
-    /* 809BFDFC */ void setParam();
-    /* 809C0038 */ BOOL main();
-    /* 809C0298 */ BOOL ctrlBtk();
-    /* 809C02A0 */ void setAttnPos();
-    /* 809C0948 */ bool setExpressionAnm(int, bool);
-    /* 809C0CE4 */ bool setExpressionBtp(int);
-    /* 809C0E18 */ void setExpression(int, f32);
-    /* 809C0E44 */ void setMotionAnm(int, f32);
-    /* 809C1018 */ void setMotion(int, f32, int);
-    /* 809C105C */ BOOL drawDbgInfo();
-    /* 809C1064 */ void drawOtherMdls();
-    /* 809C1154 */ u8 getMode();
-    /* 809C1160 */ u8 getMode1();
-    /* 809C116C */ u8 getTypeFromParam();
-    /* 809C1238 */ u8 getSwBit();
-    /* 809C1244 */ BOOL isDelete();
-    /* 809C13D8 */ void reset();
-    /* 809C1990 */ void playExpression();
-    /* 809C2080 */ void playMotion();
-    /* 809C28BC */ BOOL chkAction(int (daNpc_grA_c::*)(void*));
-    /* 809C28E8 */ BOOL setAction(int (daNpc_grA_c::*)(void*));
-    /* 809C2990 */ BOOL selectAction();
-    /* 809C2C3C */ BOOL doEvent();
-    /* 809C3070 */ void setLookMode(int);
-    /* 809C3094 */ void lookat();
-    /* 809C3424 */ BOOL chkFindPlayer();
-    /* 809C35D0 */ void setExpressionTalkAfter();
-    /* 809C36AC */ BOOL setPrtcl();
-    /* 809C389C */ void setRollPrtcl(cXyz const&, f32);
-    /* 809C3A54 */ void setOtherObjMtx();
-    /* 809C3B28 */ BOOL ECut_talkSpa(int);
-    /* 809C3D78 */ BOOL ECut_grDSRoll(int);
-    /* 809C45B0 */ BOOL ECut_grDSGate(int);
-    /* 809C47EC */ BOOL ECut_teachElevator(int);
-    /* 809C4BE4 */ BOOL ECut_kickOut(int);
-    /* 809C4EB4 */ BOOL ECut_noneLook(int);
-    /* 809C5088 */ BOOL ECut_rescueRock(int);
-    /* 809C5430 */ BOOL ECut_carrySpaWater(int);
-    /* 809C5D44 */ BOOL ECut_carrySpaWaterFailure(int);
-    /* 809C5F90 */ BOOL ECut_rollRockCrash(int);
-    /* 809C6608 */ BOOL ECut_talkSpaWater(int);
-    /* 809C681C */ BOOL wait(void*);
-    /* 809C69B8 */ BOOL waitTW(void*);
-    /* 809C6AAC */ BOOL waitCheer(void*);
-    /* 809C6D48 */ BOOL waitGate(void*);
-    /* 809C73FC */ BOOL waitKickOut(void*);
-    /* 809C770C */ BOOL moveRock(void*);
-    /* 809C77E0 */ BOOL spaWarm(void*);
-    /* 809C7ACC */ BOOL waitSpaWater(void*);
-    /* 809C7F24 */ BOOL waitSpaBuyer(void*);
-    /* 809C8138 */ BOOL waitSpaBuyerTW(void*);
-    /* 809C82A8 */ BOOL beforeCrashWait(void*);
-    /* 809C8514 */ BOOL crashRoll(void*);
-    /* 809C8694 */ BOOL crashRollWait(void*);
-    /* 809C884C */ BOOL crashedWait(void*);
-    /* 809C8A2C */ BOOL waitBuyer(void*);
-    /* 809C8BD4 */ BOOL talk(void*);
-    /* 809C9044 */ BOOL test(void*);
-    /* 809C9D28 */ virtual void adjustShapeAngle() {}
+    daNpc_grA_c();
+    ~daNpc_grA_c();
+    BOOL create();
+    BOOL CreateHeap();
+    BOOL Delete();
+    BOOL Execute();
+    BOOL Draw();
+    BOOL ctrlJoint(J3DJoint*, J3DModel*);
+    static BOOL createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    BOOL setTagJump();
+    BOOL setTagJump2();
+    BOOL setHomeJump();
+    bool checkTagGraSub(fopAc_ac_c*);
+    bool checkTagGraSub2(fopAc_ac_c*);
+    bool checkTagGraSubCrashed(fopAc_ac_c*);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    u8 getMode();
+    u8 getMode1();
+    u8 getTypeFromParam();
+    u8 getSwBit();
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(int (daNpc_grA_c::*)(void*));
+    BOOL setAction(int (daNpc_grA_c::*)(void*));
+    BOOL selectAction();
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    BOOL chkFindPlayer();
+    void setExpressionTalkAfter();
+    BOOL setPrtcl();
+    void setRollPrtcl(cXyz const&, f32);
+    void setOtherObjMtx();
+    BOOL ECut_talkSpa(int);
+    BOOL ECut_grDSRoll(int);
+    BOOL ECut_grDSGate(int);
+    BOOL ECut_teachElevator(int);
+    BOOL ECut_kickOut(int);
+    BOOL ECut_noneLook(int);
+    BOOL ECut_rescueRock(int);
+    BOOL ECut_carrySpaWater(int);
+    BOOL ECut_carrySpaWaterFailure(int);
+    BOOL ECut_rollRockCrash(int);
+    BOOL ECut_talkSpaWater(int);
+    BOOL wait(void*);
+    BOOL waitTW(void*);
+    BOOL waitCheer(void*);
+    BOOL waitGate(void*);
+    BOOL waitKickOut(void*);
+    BOOL moveRock(void*);
+    BOOL spaWarm(void*);
+    BOOL waitSpaWater(void*);
+    BOOL waitSpaBuyer(void*);
+    BOOL waitSpaBuyerTW(void*);
+    BOOL beforeCrashWait(void*);
+    BOOL crashRoll(void*);
+    BOOL crashRollWait(void*);
+    BOOL crashedWait(void*);
+    BOOL waitBuyer(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    virtual void adjustShapeAngle() {}
 
     int getType() { return mType; }
     s16 getGraNo() { return 0; }
diff --git a/include/d/actor/d_a_npc_grc.h b/include/d/actor/d_a_npc_grc.h
index 08ff6fedac..a2dd3838d7 100644
--- a/include/d/actor/d_a_npc_grc.h
+++ b/include/d/actor/d_a_npc_grc.h
@@ -19,49 +19,49 @@ public:
     typedef BOOL (daNpc_grC_c::*ActionFn)(void*);
     typedef BOOL (daNpc_grC_c::*EventFn)(int);
 
-    /* 809CB4CC */ daNpc_grC_c();
-    /* 809CB6E0 */ ~daNpc_grC_c();
-    /* 809CB8E0 */ cPhs__Step create();
-    /* 809CBBD4 */ int CreateHeap();
-    /* 809CBDC4 */ int Delete();
-    /* 809CBDF8 */ int Execute();
-    /* 809CBE18 */ int Draw();
-    /* 809CBE8C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809CC0C0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809CC0E0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809CC12C */ void setParam();
-    /* 809CC26C */ BOOL main();
-    /* 809CC3EC */ BOOL ctrlBtk();
-    /* 809CC3F4 */ void setAttnPos();
-    /* 809CC930 */ bool setExpressionAnm(int, bool);
-    /* 809CCB78 */ bool setExpressionBtp(int);
-    /* 809CCCA4 */ void setExpression(int, f32);
-    /* 809CCCD0 */ void setMotionAnm(int, f32);
-    /* 809CCE70 */ void setMotion(int, f32, int);
-    /* 809CCEB4 */ int drawDbgInfo();
-    /* 809CCEBC */ void drawOtherMdls();
-    /* 809CCEC0 */ u8 getTypeFromParam();
-    /* 809CCF38 */ BOOL isDelete();
-    /* 809CCFBC */ void reset();
-    /* 809CD1B4 */ void playExpression();
-    /* 809CD4AC */ void playMotion();
-    /* 809CD794 */ BOOL chkAction(ActionFn);
-    /* 809CD7C0 */ BOOL setAction(ActionFn);
-    /* 809CD868 */ BOOL selectAction();
-    /* 809CD960 */ void doNormalAction(int);
-    /* 809CDA74 */ BOOL doEvent();
-    /* 809CDD50 */ void setLookMode(int);
-    /* 809CDD74 */ void lookat();
-    /* 809CDFFC */ BOOL chkFindPlayer();
-    /* 809CE12C */ void setExpressionTalkAfter();
-    /* 809CE1F8 */ BOOL wait(void*);
-    /* 809CE3A8 */ BOOL waitTW(void*);
-    /* 809CE490 */ BOOL waitSpa(void*);
-    /* 809CE688 */ BOOL waitBuyer(void*);
-    /* 809CE7C4 */ BOOL talk(void*);
-    /* 809CEA6C */ BOOL test(void*);
-    /* 809CEB50 */ void setPrtcl();
-    /* 809CF4AC */ void adjustShapeAngle() {}
+    daNpc_grC_c();
+    ~daNpc_grC_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(ActionFn);
+    BOOL setAction(ActionFn);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    BOOL chkFindPlayer();
+    void setExpressionTalkAfter();
+    BOOL wait(void*);
+    BOOL waitTW(void*);
+    BOOL waitSpa(void*);
+    BOOL waitBuyer(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    void setPrtcl();
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList;
     static EventFn mEvtCutList[1];
@@ -102,7 +102,7 @@ class daNpc_grC_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_grC_Param_c {
 public:
-    /* 809CF4B0 */ virtual ~daNpc_grC_Param_c() {}
+    virtual ~daNpc_grC_Param_c() {}
 
     static daNpc_grC_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_grd.h b/include/d/actor/d_a_npc_grd.h
index 055978b267..95b23152ae 100644
--- a/include/d/actor/d_a_npc_grd.h
+++ b/include/d/actor/d_a_npc_grd.h
@@ -9,7 +9,7 @@ struct daNpc_Grd_HIOParam {
 
 class daNpc_Grd_Param_c {
 public:
-    /* 80AF267C */ virtual ~daNpc_Grd_Param_c() {}
+    virtual ~daNpc_Grd_Param_c() {}
 
     static daNpc_Grd_HIOParam const m;
 };
@@ -41,45 +41,45 @@ public:
     typedef int (daNpc_Grd_c::*actionFunc)(void*);
     typedef int (daNpc_Grd_c::*cutFunc)(int);
 
-    /* 809CFD2C */ daNpc_Grd_c();
-    /* 809CFF40 */ ~daNpc_Grd_c();
-    /* 809D0140 */ int create();
-    /* 809D0414 */ int CreateHeap();
-    /* 809D0858 */ int Delete();
-    /* 809D088C */ int Execute();
-    /* 809D08AC */ int Draw();
-    /* 809D093C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809D0B70 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809D0B90 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809D0BDC */ void setParam();
-    /* 809D0D1C */ BOOL main();
-    /* 809D0E9C */ BOOL ctrlBtk();
-    /* 809D0F7C */ void setAttnPos();
-    /* 809D14BC */ bool setExpressionAnm(int, bool);
-    /* 809D1670 */ bool setExpressionBtp(int);
-    /* 809D1794 */ void setExpression(int, f32);
-    /* 809D17C0 */ void setMotionAnm(int, f32);
-    /* 809D1940 */ void setMotion(int, f32, int);
-    /* 809D1984 */ BOOL drawDbgInfo();
-    /* 809D198C */ void drawOtherMdls();
-    /* 809D1990 */ u8 getTypeFromParam();
-    /* 809D19B0 */ int isDelete();
-    /* 809D1A1C */ void reset();
-    /* 809D1B9C */ void playExpression();
-    /* 809D1D00 */ void playMotion();
-    /* 809D1F50 */ int chkAction(actionFunc);
-    /* 809D1F7C */ int setAction(actionFunc);
-    /* 809D2024 */ int selectAction();
-    /* 809D20A4 */ void doNormalAction(int);
-    /* 809D21B8 */ BOOL doEvent();
-    /* 809D2470 */ void setLookMode(int);
-    /* 809D2494 */ void lookat();
-    /* 809D2730 */ void setExpressionTalkAfter();
-    /* 809D2768 */ int wait(void*);
-    /* 809D2970 */ int talk(void*);
-    /* 809D2B20 */ int test(void*);
-    /* 809D2C9C */ BOOL ECut_nodToGrz(int);
-    /* 809D3994 */ void adjustShapeAngle() {}
+    daNpc_Grd_c();
+    ~daNpc_Grd_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    int isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    int selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    int wait(void*);
+    int talk(void*);
+    int test(void*);
+    BOOL ECut_nodToGrz(int);
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList[2];
     static cutFunc mEvtCutList[2];
diff --git a/include/d/actor/d_a_npc_grm.h b/include/d/actor/d_a_npc_grm.h
index 5044326b83..b6eb35f357 100644
--- a/include/d/actor/d_a_npc_grm.h
+++ b/include/d/actor/d_a_npc_grm.h
@@ -54,40 +54,40 @@ public:
         /* 0x3 */ MAT_GRA_M,
     };
 
-    /* 809D406C */ ~daNpc_grM_c();
-    /* 809D4194 */ cPhs__Step create();
-    /* 809D441C */ int CreateHeap();
-    /* 809D45C4 */ int Delete();
-    /* 809D45F8 */ int Execute();
-    /* 809D46D4 */ int Draw();
-    /* 809D4768 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809D4788 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809D47E0 */ bool getType();
-    /* 809D47E8 */ int getFlowNodeNo();
-    /* 809D4804 */ u8 getMaxNumItem();
-    /* 809D4810 */ BOOL isDelete();
-    /* 809D4820 */ void reset();
-    /* 809D4944 */ void afterJntAnm(int);
-    /* 809D49D0 */ void setParam();
-    /* 809D4B24 */ void setAfterTalkMotion();
-    /* 809D4BB8 */ void srchActors();
-    /* 809D4BBC */ BOOL evtProc();
-    /* 809D4E2C */ BOOL evtTalk();
-    /* 809D4FD0 */ BOOL evtCutProc();
-    /* 809D5098 */ void action();
-    /* 809D51F4 */ void beforeMove();
-    /* 809D526C */ void setAttnPos();
-    /* 809D54C8 */ void setCollision();
-    /* 809D55F8 */ int drawDbgInfo();
-    /* 809D5600 */ void drawOtherMdl();
-    /* 809D5660 */ BOOL selectAction();
-    /* 809D56A8 */ BOOL chkAction(actionFunc);
-    /* 809D56D4 */ BOOL setAction(actionFunc);
-    /* 809D577C */ int cutTalkSpa(int);
-    /* 809D58F4 */ int tend(void*);
-    /* 809D5AAC */ int talk(void*);
-    /* 809D5C30 */ int shop(void*);
-    /* 809D5E20 */ daNpc_grM_c(
+    ~daNpc_grM_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    bool getType();
+    int getFlowNodeNo();
+    u8 getMaxNumItem();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtProc();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int cutTalkSpa(int);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_grM_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -97,12 +97,12 @@ public:
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
-    /* 809D5F98 */ u16 getEyeballMaterialNo() { return MAT_GRA_A_EYEBALL; }
-    /* 809D5FA0 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 809D5FA8 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 809D5FB0 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 809D5FB8 */ BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
-    /* 809D5FC8 */ BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
+    u16 getEyeballMaterialNo() { return MAT_GRA_A_EYEBALL; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int param_0) { return param_0 == JNT_HEAD; }
+    BOOL checkRemoveJoint(int param_0) { return param_0 == JNT_MOUTH; }
 
     static char* mCutNameList[2];
     static cutFunc mCutList[2];
@@ -133,7 +133,7 @@ public:
 
 class daNpc_grM_Param_c {
 public:
-    /* 809D5FD8 */ virtual ~daNpc_grM_Param_c() {}
+    virtual ~daNpc_grM_Param_c() {}
 
     static daNpc_grM_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_grmc.h b/include/d/actor/d_a_npc_grmc.h
index 3dd1acbff9..0bfcd52016 100644
--- a/include/d/actor/d_a_npc_grmc.h
+++ b/include/d/actor/d_a_npc_grmc.h
@@ -24,7 +24,7 @@ public:
 
 class daNpc_grMC_Param_c {
 public:
-    /* 809D9014 */ virtual ~daNpc_grMC_Param_c() {}
+    virtual ~daNpc_grMC_Param_c() {}
 
     static daNpc_grMC_HIOParam const m;
 };
@@ -61,41 +61,41 @@ public:
     typedef int (daNpc_grMC_c::*cutFunc)(int);
     typedef int (daNpc_grMC_c::*actionFunc)(void*);
 
-    /* 809D740C */ ~daNpc_grMC_c();
-    /* 809D7534 */ cPhs__Step create();
-    /* 809D77BC */ int CreateHeap();
-    /* 809D79BC */ int Delete();
-    /* 809D79F0 */ int Execute();
-    /* 809D7AD4 */ int Draw();
-    /* 809D7B18 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809D7B38 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809D7B90 */ u8 getType();
-    /* 809D7B98 */ int getFlowNodeNo();
-    /* 809D7BB4 */ u8 getMaxNumItem();
-    /* 809D7BC0 */ BOOL isDelete();
-    /* 809D7C34 */ void reset();
-    /* 809D7D48 */ void afterJntAnm(int);
-    /* 809D7DD4 */ void setParam();
-    /* 809D7F28 */ void setAfterTalkMotion();
-    /* 809D7FCC */ void srchActors();
-    /* 809D7FD0 */ BOOL evtTalk();
-    /* 809D8174 */ BOOL evtCutProc();
-    /* 809D823C */ void action();
-    /* 809D8398 */ void beforeMove();
-    /* 809D8410 */ void setAttnPos();
-    /* 809D8670 */ void setCollision();
-    /* 809D87A0 */ int drawDbgInfo();
-    /* 809D87A8 */ void drawOtherMdl();
-    /* 809D8808 */ BOOL selectAction();
-    /* 809D8850 */ BOOL chkAction(actionFunc);
-    /* 809D887C */ BOOL setAction(actionFunc);
-    /* 809D8924 */ int tend(void*);
-    /* 809D8AE8 */ int talk(void*);
-    /* 809D8C6C */ int shop(void*);
+    ~daNpc_grMC_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    u8 getMaxNumItem();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int tend(void*);
+    int talk(void*);
+    int shop(void*);
     #ifdef DEBUG
     int test(void*);
     #endif
-    /* 809D8E5C */ daNpc_grMC_c(
+    daNpc_grMC_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -107,12 +107,12 @@ public:
         : dShopSystem_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 809D8FD4 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 809D8FDC */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 809D8FE4 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 809D8FEC */ BOOL checkChangeJoint(int param_1) { return param_1 == JNT_HEAD; }
-    /* 809D8FFC */ BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
-    /* 809D900C */ u16 getEyeballMaterialNo() { return 1; };
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int param_1) { return param_1 == JNT_HEAD; }
+    BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
+    u16 getEyeballMaterialNo() { return 1; };
 
     static char* mCutNameList;
     static cutFunc mCutList[1];
diff --git a/include/d/actor/d_a_npc_gro.h b/include/d/actor/d_a_npc_gro.h
index bf4f21a06d..259e188df6 100644
--- a/include/d/actor/d_a_npc_gro.h
+++ b/include/d/actor/d_a_npc_gro.h
@@ -18,7 +18,7 @@ struct daNpc_grO_HIOParam {
 
 class daNpc_grO_Param_c {
 public:
-    /* 809DEF10 */ virtual ~daNpc_grO_Param_c() {}
+    virtual ~daNpc_grO_Param_c() {}
 
     static daNpc_grO_HIOParam const m;
 };
@@ -42,48 +42,48 @@ public:
     typedef int (daNpc_grO_c::*actionFunc)(void*);
     typedef int (daNpc_grO_c::*cutFunc)(int);
     
-    /* 809DA56C */ daNpc_grO_c();
-    /* 809DA780 */ ~daNpc_grO_c();
-    /* 809DA980 */ cPhs__Step create();
-    /* 809DAC58 */ int CreateHeap();
-    /* 809DB130 */ int Delete();
-    /* 809DB164 */ int Execute();
-    /* 809DB184 */ int Draw();
-    /* 809DB214 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809DB448 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809DB468 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809DB4B4 */ void setParam();
-    /* 809DB5F4 */ BOOL main();
-    /* 809DB774 */ BOOL ctrlBtk();
-    /* 809DB854 */ void setAttnPos();
-    /* 809DBD58 */ bool setExpressionAnm(int, bool);
-    /* 809DBFF4 */ bool setExpressionBtp(int);
-    /* 809DC118 */ void setExpression(int, f32);
-    /* 809DC144 */ void setMotionAnm(int, f32);
-    /* 809DC2E4 */ void setMotion(int, f32, int);
-    /* 809DC328 */ int drawDbgInfo();
-    /* 809DC330 */ void drawOtherMdls();
-    /* 809DC3DC */ u8 getTypeFromParam();
-    /* 809DC43C */ BOOL isDelete();
-    /* 809DC4F4 */ void reset();
-    /* 809DC67C */ void playExpression();
-    /* 809DCA68 */ void playMotion();
-    /* 809DCDA4 */ BOOL chkAction(actionFunc);
-    /* 809DCDD0 */ BOOL setAction(actionFunc);
-    /* 809DCE78 */ BOOL selectAction();
-    /* 809DCF44 */ void doNormalAction(int);
-    /* 809DD070 */ BOOL doEvent();
-    /* 809DD3D8 */ void setLookMode(int);
-    /* 809DD3FC */ void lookat();
-    /* 809DD684 */ void setExpressionTalkAfter();
-    /* 809DD758 */ int wait(void*);
-    /* 809DD960 */ int bokinWait(void*);
-    /* 809DDB68 */ int waitMaro(void*);
-    /* 809DDCF8 */ int talk(void*);
-    /* 809DE0D0 */ int ECut_bokinFinish(int);
-    /* 809DE30C */ int cutPushOut(int);
-    /* 809DE4EC */ int test(void*);
-    /* 809DEF0C */ void adjustShapeAngle() {}
+    daNpc_grO_c();
+    ~daNpc_grO_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    int wait(void*);
+    int bokinWait(void*);
+    int waitMaro(void*);
+    int talk(void*);
+    int ECut_bokinFinish(int);
+    int cutPushOut(int);
+    int test(void*);
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList[3];
     static cutFunc mEvtCutList[3];
diff --git a/include/d/actor/d_a_npc_grr.h b/include/d/actor/d_a_npc_grr.h
index 211f29a2b6..fd2384e358 100644
--- a/include/d/actor/d_a_npc_grr.h
+++ b/include/d/actor/d_a_npc_grr.h
@@ -26,7 +26,7 @@ class daNpc_grR_HIO_c
 
 class daNpc_grR_Param_c {
 public:
-    /* 809E386C */ virtual ~daNpc_grR_Param_c() {}
+    virtual ~daNpc_grR_Param_c() {}
 
     static daNpc_grR_HIOParam const m;
 };
@@ -35,45 +35,45 @@ class daNpc_grR_c : public daNpcF_c {
 public:
     typedef int (daNpc_grR_c::*cutFunc)(int);
     typedef int (daNpc_grR_c::*actionFunc)(void*);
-    /* 809DF8CC */ daNpc_grR_c();
-    /* 809DFAE0 */ ~daNpc_grR_c();
-    /* 809DFCE0 */ cPhs__Step create();
-    /* 809DFFB8 */ int CreateHeap();
-    /* 809E03FC */ int Delete();
-    /* 809E0430 */ int Execute();
-    /* 809E0450 */ int Draw();
-    /* 809E04E0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809E0714 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809E0734 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809E0780 */ void setParam();
-    /* 809E08FC */ BOOL main();
-    /* 809E0A7C */ BOOL ctrlBtk();
-    /* 809E0B5C */ void setAttnPos();
-    /* 809E105C */ bool setExpressionAnm(int, bool);
-    /* 809E1260 */ bool setExpressionBtp(int);
-    /* 809E138C */ void setExpression(int, f32);
-    /* 809E13B8 */ void setMotionAnm(int, f32);
-    /* 809E1548 */ void setMotion(int, f32, int);
-    /* 809E158C */ BOOL drawDbgInfo();
-    /* 809E1594 */ void drawOtherMdls();
-    /* 809E1598 */ u8 getTypeFromParam();
-    /* 809E15E4 */ BOOL isDelete();
-    /* 809E16CC */ void reset();
-    /* 809E18A4 */ void playExpression();
-    /* 809E1B28 */ void playMotion();
-    /* 809E1F10 */ BOOL chkAction(actionFunc);
-    /* 809E1F3C */ BOOL setAction(actionFunc);
-    /* 809E1FE4 */ BOOL selectAction();
-    /* 809E2088 */ void doNormalAction(int);
-    /* 809E219C */ BOOL doEvent();
-    /* 809E2480 */ void setLookMode(int);
-    /* 809E24A4 */ void lookat();
-    /* 809E272C */ void setExpressionTalkAfter();
-    /* 809E27CC */ int wait(void*);
-    /* 809E29B8 */ int waitMaro(void*);
-    /* 809E2B48 */ int talk(void*);
-    /* 809E2E84 */ int test(void*);
-    /* 809E3868 */ void adjustShapeAngle() {}
+    daNpc_grR_c();
+    ~daNpc_grR_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    int wait(void*);
+    int waitMaro(void*);
+    int talk(void*);
+    int test(void*);
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList;
     static cutFunc mEvtCutList[1];
diff --git a/include/d/actor/d_a_npc_grs.h b/include/d/actor/d_a_npc_grs.h
index d7729b036a..202dd25267 100644
--- a/include/d/actor/d_a_npc_grs.h
+++ b/include/d/actor/d_a_npc_grs.h
@@ -9,7 +9,7 @@ struct daNpc_grS_HIOParam {
 
 class daNpc_grS_Param_c {
 public:
-    /* 809E7D60 */ virtual ~daNpc_grS_Param_c() {}
+    virtual ~daNpc_grS_Param_c() {}
 
     static const daNpc_grS_HIOParam m;
 };
@@ -43,46 +43,46 @@ public:
     typedef int (daNpc_grS_c::*actionFunc)(void*);
     typedef int (daNpc_grS_c::*cutFunc)(int);
 
-    /* 809E40CC */ daNpc_grS_c();
-    /* 809E42E0 */ virtual ~daNpc_grS_c();
-    /* 809E44E0 */ int create();
-    /* 809E47B4 */ int CreateHeap();
-    /* 809E4C58 */ int Delete();
-    /* 809E4C8C */ int Execute();
-    /* 809E4CAC */ int Draw();
-    /* 809E4D3C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809E4F70 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809E4F90 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809E4FDC */ virtual void setParam();
-    /* 809E510C */ virtual int main();
-    /* 809E528C */ virtual int ctrlBtk();
-    /* 809E536C */ virtual void setAttnPos();
-    /* 809E5874 */ virtual bool setExpressionAnm(int, bool);
-    /* 809E5A08 */ virtual bool setExpressionBtp(int);
-    /* 809E5B1C */ virtual void setExpression(int, f32);
-    /* 809E5B48 */ virtual void setMotionAnm(int, f32);
-    /* 809E5CB8 */ virtual void setMotion(int, f32, int);
-    /* 809E5CFC */ virtual int drawDbgInfo();
-    /* 809E5D04 */ virtual void drawOtherMdls();
-    /* 809E5DB4 */ u8 getTypeFromParam();
-    /* 809E5DD4 */ int isDelete();
-    /* 809E5E58 */ void reset();
-    /* 809E6000 */ void playExpression();
-    /* 809E6164 */ void playMotion();
-    /* 809E62F0 */ int chkAction(actionFunc);
-    /* 809E631C */ int setAction(actionFunc);
-    /* 809E63C4 */ int selectAction();
-    /* 809E6444 */ void doNormalAction(int);
-    /* 809E6570 */ int doEvent();
-    /* 809E6854 */ void setLookMode(int);
-    /* 809E6878 */ void lookat();
-    /* 809E6B00 */ void setExpressionTalkAfter();
-    /* 809E6B74 */ int cutPushOut(int);
-    /* 809E6D54 */ int wait(void*);
-    /* 809E6F5C */ int talk(void*);
-    /* 809E721C */ int test(void*);
-    /* 809E7300 */ void setPrtcl();
-    /* 809E7D5C */ void adjustShapeAngle() {}
+    daNpc_grS_c();
+    virtual ~daNpc_grS_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    virtual void setParam();
+    virtual int main();
+    virtual int ctrlBtk();
+    virtual void setAttnPos();
+    virtual bool setExpressionAnm(int, bool);
+    virtual bool setExpressionBtp(int);
+    virtual void setExpression(int, f32);
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual int drawDbgInfo();
+    virtual void drawOtherMdls();
+    u8 getTypeFromParam();
+    int isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    int selectAction();
+    void doNormalAction(int);
+    int doEvent();
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    int cutPushOut(int);
+    int wait(void*);
+    int talk(void*);
+    int test(void*);
+    void setPrtcl();
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList[2];
     static cutFunc mEvtCutList[2];
diff --git a/include/d/actor/d_a_npc_grz.h b/include/d/actor/d_a_npc_grz.h
index 5b6b0f42d2..d875a985fa 100644
--- a/include/d/actor/d_a_npc_grz.h
+++ b/include/d/actor/d_a_npc_grz.h
@@ -42,57 +42,57 @@ public:
         /* 0x24 */ dPaPo_c mPaPo;
     };
 
-    /* 809E840C */ daNpc_Grz_c();
-    /* 809E88C0 */ ~daNpc_Grz_c();
-    /* 809E8BA0 */ cPhs__Step create();
-    /* 809E8E68 */ int CreateHeap();
-    /* 809E92AC */ int Delete();
-    /* 809E92E0 */ int Execute();
-    /* 809E9324 */ int Draw();
-    /* 809E9568 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809E979C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809E97BC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809E9808 */ void setParam();
-    /* 809E9954 */ BOOL main();
-    /* 809E9AD4 */ BOOL ctrlBtk();
-    /* 809E9BB4 */ void setAttnPos();
-    /* 809EA1DC */ void setCollisionPunch();
-    /* 809EA734 */ bool setExpressionAnm(int, bool);
-    /* 809EAA08 */ bool setExpressionBtp(int);
-    /* 809EAB34 */ void setExpression(int, f32);
-    /* 809EAB60 */ void setMotionAnm(int, f32);
-    /* 809EAD4C */ void setMotion(int, f32, int);
-    /* 809EAD90 */ int drawDbgInfo();
-    /* 809EAD98 */ void drawOtherMdls();
-    /* 809EAD9C */ int getTypeFromParam();
-    /* 809EADE8 */ BOOL isDelete();
-    /* 809EAE88 */ void reset();
-    /* 809EB154 */ void resetCol();
-    /* 809EB234 */ void playExpression();
-    /* 809EB5C0 */ void playMotion();
-    /* 809EBA3C */ BOOL chkAction(actionFunc);
-    /* 809EBA68 */ BOOL setAction(actionFunc);
-    /* 809EBB10 */ BOOL selectAction();
-    /* 809EBC04 */ void doNormalAction(int);
-    /* 809EBD18 */ BOOL doEvent();
-    /* 809EC0CC */ bool setSkipZev(int, int);
-    /* 809EC164 */ void setLookMode(int);
-    /* 809EC188 */ void lookat();
-    /* 809EC424 */ void setExpressionTalkAfter();
-    /* 809EC4C4 */ int wait(void*);
-    /* 809EC854 */ int waitSmash(void*);
-    /* 809ECBF0 */ int lieDown(void*);
-    /* 809ECCA0 */ int waitWeak(void*);
-    /* 809ECD50 */ int talk(void*);
-    /* 809ECF88 */ int test(void*);
-    /* 809ED06C */ int setPrtcl();
-    /* 809ED18C */ int doWaitCut(int);
-    /* 809ED228 */ int doRebirthCut(int);
-    /* 809ED3D4 */ int doTalkStandCut(int);
-    /* 809ED5EC */ int doGoOutCut(int);
-    /* 809EDBA4 */ int doStoneSmashCut(int);
-    /* 809EE5F0 */ int doStoneSmashSkipCut(int);
-    /* 809EF184 */ void adjustShapeAngle() {}
+    daNpc_Grz_c();
+    ~daNpc_Grz_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void setCollisionPunch();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    int getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void resetCol();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    bool setSkipZev(int, int);
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    int wait(void*);
+    int waitSmash(void*);
+    int lieDown(void*);
+    int waitWeak(void*);
+    int talk(void*);
+    int test(void*);
+    int setPrtcl();
+    int doWaitCut(int);
+    int doRebirthCut(int);
+    int doTalkStandCut(int);
+    int doGoOutCut(int);
+    int doStoneSmashCut(int);
+    int doStoneSmashSkipCut(int);
+    void adjustShapeAngle() {}
 
     u8 getPathNoFromParam() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
 
@@ -135,7 +135,7 @@ STATIC_ASSERT(sizeof(daNpc_Grz_c) == 0x1b08);
 
 class daNpc_Grz_Param_c {
 public:
-    /* 809EF188 */ virtual ~daNpc_Grz_Param_c() {}
+    virtual ~daNpc_Grz_Param_c() {}
 
     static daNpc_Grz_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_guard.h b/include/d/actor/d_a_npc_guard.h
index 9996215be2..bae98e223c 100644
--- a/include/d/actor/d_a_npc_guard.h
+++ b/include/d/actor/d_a_npc_guard.h
@@ -26,32 +26,32 @@ public:
         /* 6 */ MODE_MAX_e,  // Escape
     };
 
-    /* 809EFE20 */ void setAction(daNpcGuard_c::Mode_e);
-    /* 809EFE64 */ void callInit();
-    /* 809EFE8C */ void callExecute();
-    /* 809EFEB8 */ void initPath();
-    /* 809EFF1C */ void executePath();
-    /* 809F0184 */ void initRun();
-    /* 809F01E8 */ void executeRun();
-    /* 809F03FC */ void initFightWait();
-    /* 809F04B4 */ void executeFightWait();
-    /* 809F06F4 */ void initFightStep();
-    /* 809F0700 */ void executeFightStep();
-    /* 809F0778 */ void initFightMenace();
-    /* 809F07F8 */ void executeFightMenace();
-    /* 809F08DC */ void initFear();
-    /* 809F0960 */ void executeFear();
-    /* 809F0A50 */ void initEscape();
-    /* 809F0B20 */ void executeEscape();
-    /* 809F0DD4 */ void setAngle();
-    /* 809F0DE0 */ inline void setSpeed(f32, f32, f32*, int);
-    /* 809F0ED4 */ void pathMoveF();
-    /* 809F12F0 */ int create();
-    /* 809F14CC */ inline void create_init();
-    /* 809F17D0 */ inline void setMtx();
-    /* 809F1878 */ inline void lookat();
-    /* 809F1F74 */ inline virtual ~daNpcGuard_c();
-    /* 809F2044 */ int execute();
+    void setAction(daNpcGuard_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initPath();
+    void executePath();
+    void initRun();
+    void executeRun();
+    void initFightWait();
+    void executeFightWait();
+    void initFightStep();
+    void executeFightStep();
+    void initFightMenace();
+    void executeFightMenace();
+    void initFear();
+    void executeFear();
+    void initEscape();
+    void executeEscape();
+    void setAngle();
+    inline void setSpeed(f32, f32, f32*, int);
+    void pathMoveF();
+    int create();
+    inline void create_init();
+    inline void setMtx();
+    inline void lookat();
+    inline virtual ~daNpcGuard_c();
+    int execute();
 
     inline int createHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_npc_gwolf.h b/include/d/actor/d_a_npc_gwolf.h
index b140bbe56b..5cc64907ba 100644
--- a/include/d/actor/d_a_npc_gwolf.h
+++ b/include/d/actor/d_a_npc_gwolf.h
@@ -30,7 +30,7 @@ class daNpc_GWolf_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_GWolf_Param_c {
 public:
-    /* 809F8488 */ virtual ~daNpc_GWolf_Param_c() {}
+    virtual ~daNpc_GWolf_Param_c() {}
 
     static daNpc_GWolf_HIOParam const m;
 };
@@ -40,52 +40,52 @@ public:
     typedef BOOL (daNpc_GWolf_c::*actionFunc)(void*);
     typedef BOOL (daNpc_GWolf_c::*cutFunc)(int);
 
-    /* 809F30AC */ daNpc_GWolf_c();
-    /* 809F34C0 */ cPhs__Step create();
-    /* 809F37C0 */ int CreateHeap();
-    /* 809F3BD8 */ int Delete();
-    /* 809F3C0C */ int Execute();
-    /* 809F3C2C */ int Draw();
-    /* 809F3CBC */ int draw(int, int, f32, GXColorS10*, int);
-    /* 809F3FB8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809F41EC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809F420C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809F420C */ u8 getTypeFromParam();
-    /* 809F4E84 */ int getModeFromParam();
-    /* 809F4F00 */ BOOL isDelete();
-    /* 809F4FF4 */ void reset();
-    /* 809F520C */ void playMotion();
-    /* 809F55D0 */ BOOL chkAction(actionFunc);
-    /* 809F55FC */ BOOL setAction(actionFunc);
-    /* 809F56A4 */ BOOL selectAction();
-    /* 809F5770 */ void doNormalAction(int);
-    /* 809F5884 */ BOOL doEvent();
-    /* 809F5B60 */ void setLookMode(int);
-    /* 809F5B84 */ void lookat();
-    /* 809F5E0C */ BOOL ECut_attackWarp(int);
-    /* 809F6548 */ BOOL ECut_attackWarpHorse(int);
-    /* 809F6BFC */ BOOL ECut_howlingSessionA(int);
-    /* 809F70A8 */ void meetGWolfSkip();
-    /* 809F70EC */ BOOL ECut_meetGWolf(int);
-    /* 809F71E0 */ BOOL wait(void*);
-    /* 809F75C0 */ BOOL waitHowling(void*);
-    /* 809F775C */ BOOL waitBrave(void*);
-    /* 809F77E4 */ BOOL talk(void*);
-    /* 809F797C */ BOOL test(void*);
-    /* 809F7A30 */ s16 getGroundSlope(dBgS_ObjAcch&, s16);
+    daNpc_GWolf_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int draw(int, int, f32, GXColorS10*, int);
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getTypeFromParam();
+    int getModeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playMotion();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    BOOL ECut_attackWarp(int);
+    BOOL ECut_attackWarpHorse(int);
+    BOOL ECut_howlingSessionA(int);
+    void meetGWolfSkip();
+    BOOL ECut_meetGWolf(int);
+    BOOL wait(void*);
+    BOOL waitHowling(void*);
+    BOOL waitBrave(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    s16 getGroundSlope(dBgS_ObjAcch&, s16);
 
-    /* 809F32C0 */ virtual ~daNpc_GWolf_c();
-    /* 809F4258 */ virtual void setParam();
-    /* 809F4390 */ virtual BOOL main();
-    /* 809F4558 */ virtual BOOL ctrlBtk();
-    /* 809F4638 */ virtual void adjustShapeAngle();
-    /* 809F4698 */ virtual void setAttnPos();
-    /* 809F4BB0 */ virtual bool setExpressionAnm(int, bool);
-    /* 809F4BB8 */ virtual void setExpression(int, f32);
-    /* 809F4BBC */ virtual void setMotionAnm(int, f32);
-    /* 809F4DE8 */ virtual void setMotion(int, f32, int);
-    /* 809F4E2C */ virtual BOOL drawDbgInfo();
-    /* 809F4E34 */ virtual void drawOtherMdls();
+    virtual ~daNpc_GWolf_c();
+    virtual void setParam();
+    virtual BOOL main();
+    virtual BOOL ctrlBtk();
+    virtual void adjustShapeAngle();
+    virtual void setAttnPos();
+    virtual bool setExpressionAnm(int, bool);
+    virtual void setExpression(int, f32);
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual BOOL drawDbgInfo();
+    virtual void drawOtherMdls();
 
     int getSwBitFromParam() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
     u16 getSaveTableFromParam() { return home.angle.z & 0xFF; }
diff --git a/include/d/actor/d_a_npc_hanjo.h b/include/d/actor/d_a_npc_hanjo.h
index e78fb8244e..0a4302ecf5 100644
--- a/include/d/actor/d_a_npc_hanjo.h
+++ b/include/d/actor/d_a_npc_hanjo.h
@@ -5,13 +5,13 @@
 
 class daNpc_HanjoStone_c {
 public:
-    /* 809FFFD4 */ ~daNpc_HanjoStone_c() {}
-    /* 80A001FC */ daNpc_HanjoStone_c() {
+    ~daNpc_HanjoStone_c() {}
+    daNpc_HanjoStone_c() {
         initialize();
     }
-    /* 80A0033C */ cXyz getPos() { return mPos; }
-    /* 80A00358 */ cXyz getOld() { return mOld; }
-    /* 80A00374 */ void posMoveF(fopAc_ac_c* param_1) {
+    cXyz getPos() { return mPos; }
+    cXyz getOld() { return mOld; }
+    void posMoveF(fopAc_ac_c* param_1) {
         cXyz cStack_48;
         mOld = mPos;
         if (mTmr != 0) {
@@ -31,12 +31,12 @@ public:
         }
     }
  
-    /* 80A004A8 */ void setPos(cXyz pos) {
+    void setPos(cXyz pos) {
         mPos = pos;
         mOld = pos;
     } 
 
-    /* 80A004E8 */ void setAngle(csXyz angle) { mAngle = angle; }
+    void setAngle(csXyz angle) { mAngle = angle; }
 
     dCcD_Sph* getSphP() { return &mSphere; }
     f32 getSpeedF() { return mSpeedF; }
@@ -108,63 +108,63 @@ public:
         TYPE_4,
     };
 
-    /* 809F908C */ ~daNpc_Hanjo_c();
-    /* 809F9278 */ int create();
-    /* 809F9578 */ int CreateHeap();
-    /* 809F9B38 */ int Delete();
-    /* 809F9B6C */ int Execute();
-    /* 809F9B8C */ int Draw();
-    /* 809F9C20 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 809F9C40 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 809F9C98 */ u8 getType();
-    /* 809F9CF0 */ int isDelete();
-    /* 809F9D9C */ void reset();
-    /* 809F9FCC */ void afterJntAnm(int);
-    /* 809FA050 */ void setParam();
-    /* 809FA1C4 */ BOOL checkChangeEvt();
-    /* 809FA3B8 */ void setAfterTalkMotion();
-    /* 809FA45C */ void srchActors();
-    /* 809FA55C */ BOOL evtTalk();
-    /* 809FA5FC */ BOOL evtCutProc();
-    /* 809FA6C4 */ void action();
-    /* 809FA88C */ void beforeMove();
-    /* 809FAABC */ void afterMoved();
-    /* 809FABB8 */ void setAttnPos();
-    /* 809FAF90 */ void setCollision();
-    /* 809FB2C4 */ int drawDbgInfo();
-    /* 809FB2CC */ void drawOtherMdl();
-    /* 809FB59C */ int selectAction();
-    /* 809FB6CC */ int chkAction(int (daNpc_Hanjo_c::*)(void*));
-    /* 809FB6F8 */ int setAction(int (daNpc_Hanjo_c::*)(void*));
-    /* 809FB7A0 */ void initShoot(int);
-    /* 809FB90C */ int shoot(int);
-    /* 809FBB94 */ void initDive();
-    /* 809FBC3C */ void dive();
-    /* 809FC06C */ int lookround(s16);
-    /* 809FC1BC */ int commandToHawk();
-    /* 809FC2E4 */ int cutConversationAboutSaru(int);
-    /* 809FC438 */ int cutConversation(int);
-    /* 809FC80C */ int cutPursuitBee(int);
-    /* 809FCDC4 */ int cutAppearHawker(int);
-    /* 809FD3C0 */ int cutDive(int);
-    /* 809FD86C */ int wait(void*);
-    /* 809FDEFC */ int throwStone(void*);
-    /* 809FE2E0 */ int takayose(void*);
-    /* 809FEAEC */ int talk(void*);
-    /* 80A000A8 */ daNpc_Hanjo_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_Hanjo_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    int chkAction(int (daNpc_Hanjo_c::*)(void*));
+    int setAction(int (daNpc_Hanjo_c::*)(void*));
+    void initShoot(int);
+    int shoot(int);
+    void initDive();
+    void dive();
+    int lookround(s16);
+    int commandToHawk();
+    int cutConversationAboutSaru(int);
+    int cutConversation(int);
+    int cutPursuitBee(int);
+    int cutAppearHawker(int);
+    int cutDive(int);
+    int wait(void*);
+    int throwStone(void*);
+    int takayose(void*);
+    int talk(void*);
+    daNpc_Hanjo_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                  daNpcT_evtData_c const* param_7, char** param_8) :
                                  daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                   {}
-    /* 80A00334 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80A004D0 */ s32 getHeadJointNo() { return 4; }
-    /* 80A004D8 */ s32 getNeckJointNo() { return 3; }
-    /* 80A004E0 */ s32 getBackboneJointNo() { return 1; }
-    /* 80A00504 */ int checkChangeJoint(int param_1) { return param_1 == 4; }
-    /* 80A00514 */ int checkRemoveJoint(int param_1) { return param_1 == 8; }
-    /* 80A00524 */ s32 getFootLJointNo() { return 22; }
-    /* 80A0052C */ s32 getFootRJointNo() { return 26; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    int checkChangeJoint(int param_1) { return param_1 == 4; }
+    int checkRemoveJoint(int param_1) { return param_1 == 8; }
+    s32 getFootLJointNo() { return 22; }
+    s32 getFootRJointNo() { return 26; }
     MtxP getArmLMtx() { return mpMorf[0]->getModel()->getAnmMtx(11); }
 
     int getFlowNodeNo() {
@@ -215,7 +215,7 @@ STATIC_ASSERT(sizeof(daNpc_Hanjo_c) == 0x172c);
 
 class daNpc_Hanjo_Param_c {
 public:
-    /* 80A00534 */ virtual ~daNpc_Hanjo_Param_c() {}
+    virtual ~daNpc_Hanjo_Param_c() {}
 
     struct Data {
         /* 0x00 */ f32 field_0x00;
diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h
index 1082ffbe9d..6122606a61 100644
--- a/include/d/actor/d_a_npc_hoz.h
+++ b/include/d/actor/d_a_npc_hoz.h
@@ -27,37 +27,37 @@ public:
         /* 6 */ TYPE_6,
     };
 
-    /* 80A01658 */ int create();
-    /* 80A01904 */ int CreateHeap();
-    /* 80A01D54 */ int Delete();
-    /* 80A01D88 */ int Execute();
-    /* 80A01DA8 */ int Draw();
-    /* 80A01E44 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A01E64 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A01F54 */ u8 getType();
-    /* 80A01FC8 */ int getFlowNodeNo();
-    /* 80A01FE4 */ int isDelete();
-    /* 80A01FEC */ void reset();
-    /* 80A02370 */ void srchActors();
-    /* 80A02F80 */ int selectAction();
-    /* 80A030A8 */ int chkAction(int (daNpc_Hoz_c::*)(void*));
-    /* 80A030D4 */ int setAction(int (daNpc_Hoz_c::*)(void*));
-    /* 80A0317C */ int wait(void*);
-    /* 80A03304 */ int waitBattle(void*);
-    /* 80A03578 */ int waitTwilightBattle(void*);
-    /* 80A037E4 */ int waitBoat(void*);
-    /* 80A03BDC */ int waitBoat2(void*);
-    /* 80A03F8C */ int waitBoat1_5(void*);
-    /* 80A04400 */ int waitTw(void*);
-    /* 80A045FC */ int talk(void*);
-    /* 80A0487C */ int ECut_boatRace(int);
-    /* 80A04BE4 */ int ECut_beforeBattle(int);
-    /* 80A04CDC */ int ECut_afterBattle(int);
-    /* 80A04E24 */ int ECut_beforeBlast(int);
-    /* 80A04F6C */ int ECut_afterBlast(int);
-    /* 80A050B4 */ int ECut_yMushi(int);
-    /* 80A051C8 */ int ECut_talkBreak(int);
-    /* 80A064E4 */ daNpc_Hoz_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    int chkAction(int (daNpc_Hoz_c::*)(void*));
+    int setAction(int (daNpc_Hoz_c::*)(void*));
+    int wait(void*);
+    int waitBattle(void*);
+    int waitTwilightBattle(void*);
+    int waitBoat(void*);
+    int waitBoat2(void*);
+    int waitBoat1_5(void*);
+    int waitTw(void*);
+    int talk(void*);
+    int ECut_boatRace(int);
+    int ECut_beforeBattle(int);
+    int ECut_afterBattle(int);
+    int ECut_beforeBlast(int);
+    int ECut_afterBlast(int);
+    int ECut_yMushi(int);
+    int ECut_talkBreak(int);
+    daNpc_Hoz_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                                    daNpcT_motionAnmData_c const* i_motionAnmData,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
@@ -70,26 +70,26 @@ public:
                         OS_REPORT("|%06d:%x|daNpc_Hoz_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
 
-    /* 80A0150C */ virtual ~daNpc_Hoz_c();
-    /* 80A065C4 */ virtual int checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
-    /* 80A065D4 */ virtual int checkRemoveJoint(int i_jointNo) { return i_jointNo == 9; }
-    /* 80A065BC */ virtual s32 getBackboneJointNo() { return 1; }
-    /* 80A065B4 */ virtual s32 getNeckJointNo() { return 3; }
-    /* 80A065AC */ virtual s32 getHeadJointNo() { return 4; }
-    /* 80A065A4 */ virtual u16 getEyeballMaterialNo() { return 1; }
-    /* 80A021DC */ virtual void setParam();
-    /* 80A02374 */ virtual BOOL checkChangeEvt();
-    /* 80A023EC */ virtual BOOL evtTalk();
-    /* 80A024D0 */ virtual BOOL evtEndProc();
-    /* 80A0260C */ virtual BOOL evtCutProc();
-    /* 80A0236C */ virtual void setAfterTalkMotion();
-    /* 80A026D4 */ virtual int evtProc();
-    /* 80A02918 */ virtual void action();
-    /* 80A029A0 */ virtual void beforeMove();
-    /* 80A02A18 */ virtual void setAttnPos();
-    /* 80A02C50 */ virtual void setCollision();
-    /* 80A02DD4 */ virtual void evtOrder();
-    /* 80A02F78 */ virtual int drawDbgInfo();
+    virtual ~daNpc_Hoz_c();
+    virtual int checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
+    virtual int checkRemoveJoint(int i_jointNo) { return i_jointNo == 9; }
+    virtual s32 getBackboneJointNo() { return 1; }
+    virtual s32 getNeckJointNo() { return 3; }
+    virtual s32 getHeadJointNo() { return 4; }
+    virtual u16 getEyeballMaterialNo() { return 1; }
+    virtual void setParam();
+    virtual BOOL checkChangeEvt();
+    virtual BOOL evtTalk();
+    virtual BOOL evtEndProc();
+    virtual BOOL evtCutProc();
+    virtual void setAfterTalkMotion();
+    virtual int evtProc();
+    virtual void action();
+    virtual void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual void evtOrder();
+    virtual int drawDbgInfo();
 
     #if DEBUG
     int test(void*);
@@ -131,7 +131,7 @@ struct daNpc_Hoz_HIOParam {
 
 class daNpc_Hoz_Param_c {
 public:
-    /* 80A065E4 */ virtual ~daNpc_Hoz_Param_c() {}
+    virtual ~daNpc_Hoz_Param_c() {}
 
     static const daNpc_Hoz_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_impal.h b/include/d/actor/d_a_npc_impal.h
index 3b0b640567..7b8234717a 100644
--- a/include/d/actor/d_a_npc_impal.h
+++ b/include/d/actor/d_a_npc_impal.h
@@ -10,7 +10,7 @@ struct daNpcImpal_HIOParam {
 
 class daNpcImpal_Param_c {
 public:
-    /* 80A0C204 */ virtual ~daNpcImpal_Param_c() {}
+    virtual ~daNpcImpal_Param_c() {}
 
     static const daNpcImpal_HIOParam m;
 };
@@ -81,35 +81,35 @@ public:
         /* 0x06 */ MOT_6,
     };
 
-    /* 80A079EC */ daNpcImpal_c();
-    /* 80A07C00 */ ~daNpcImpal_c();
-    /* 80A07DC4 */ int Create();
-    /* 80A080F8 */ BOOL CreateHeap();
-    /* 80A08524 */ int Delete();
-    /* 80A08558 */ int Execute();
-    /* 80A0857C */ int Draw();
-    /* 80A085EC */ bool ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A087BC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A087DC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A08828 */ inline bool setExpressionAnm(int, bool);
-    /* 80A08A68 */ inline bool setExpressionBtp(int);
-    /* 80A08B48 */ void setMotionAnm(int, f32);
-    /* 80A08CBC */ inline void reset();
-    /* 80A08EB8 */ inline bool setAction(daNpcImpal_c::actionFunc);
-    /* 80A090E8 */ bool wait(void*);
-    /* 80A099B4 */ void setMotion(int, f32, BOOL);
-    /* 80A099F8 */ void setExpression(int, f32);
-    /* 80A09A24 */ bool talk(void*);
-    /* 80A09F4C */ bool demo(void*);
-    /* 80A0A1E0 */ BOOL EvCut_ImpalAppear1(int);
-    /* 80A0A680 */ BOOL EvCut_ImpalAppear2(int);
-    /* 80A0A950 */ BOOL EvCut_CopyRod(int);
-    /* 80A0ADF8 */ inline void setParam();
-    /* 80A0AEA8 */ inline BOOL main();
-    /* 80A0B380 */ inline BOOL ctrlBtk();
-    /* 80A0B45C */ inline void setAttnPos();
-    /* 80A0B76C */ inline void lookat();
-    /* 80A0B94C */ inline BOOL drawDbgInfo();
+    daNpcImpal_c();
+    ~daNpcImpal_c();
+    int Create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    inline bool setExpressionAnm(int, bool);
+    inline bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    inline void reset();
+    inline bool setAction(daNpcImpal_c::actionFunc);
+    bool wait(void*);
+    void setMotion(int, f32, BOOL);
+    void setExpression(int, f32);
+    bool talk(void*);
+    bool demo(void*);
+    BOOL EvCut_ImpalAppear1(int);
+    BOOL EvCut_ImpalAppear2(int);
+    BOOL EvCut_CopyRod(int);
+    inline void setParam();
+    inline BOOL main();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline BOOL drawDbgInfo();
 
     s16 getMessageNo() { return s16(shape_angle.x); }
     int getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/actor/d_a_npc_ins.h b/include/d/actor/d_a_npc_ins.h
index 85d316bfb7..fd3817bc8c 100644
--- a/include/d/actor/d_a_npc_ins.h
+++ b/include/d/actor/d_a_npc_ins.h
@@ -23,7 +23,7 @@ class daNpcIns_HIO_c : public mDoHIO_entry_c {
 
 class daNpcIns_Param_c {
 public:
-    /* 80A13D40 */ virtual ~daNpcIns_Param_c() {}
+    virtual ~daNpcIns_Param_c() {}
 
     static daNpcIns_HIOParam const m;
 };
@@ -40,45 +40,45 @@ public:
     typedef int (daNpcIns_c::*actionFunc)(void*);
     typedef BOOL (daNpcIns_c::*eventFunc)(int);
 
-    /* 80A0E24C */ daNpcIns_c();
-    /* 80A0E460 */ ~daNpcIns_c();
-    /* 80A0E660 */ cPhs__Step Create();
-    /* 80A0EA30 */ int CreateHeap();
-    /* 80A0EF3C */ int Delete();
-    /* 80A0EF70 */ int Execute();
-    /* 80A0EF94 */ int Draw();
-    /* 80A0F0BC */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A0F28C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A0F2AC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A0F2F8 */ bool setExpressionAnm(int, bool);
-    /* 80A0F538 */ bool setExpressionBtp(int);
-    /* 80A0F618 */ void setMotionAnm(int, f32);
-    /* 80A0F78C */ void reset();
-    /* 80A0F984 */ int waitShop(void*);
-    /* 80A0FF40 */ void setMotion(int, f32, int);
-    /* 80A0FFC4 */ void setExpression(int, f32);
-    /* 80A0FFF0 */ int waitPresent(void*);
-    /* 80A103A0 */ int waitOutSide1(void*);
-    /* 80A10950 */ int waitOutSide2(void*);
-    /* 80A10CD8 */ int goHome(void*);
-    /* 80A11378 */ int talk(void*);
-    /* 80A11A7C */ int demo(void*);
-    /* 80A11BE8 */ bool isInsectComplete();
-    /* 80A11C50 */ const insect_param_data& getInsectParamData(int);
-    /* 80A11D44 */ void setWaitAction();
-    /* 80A11F84 */ bool setPath(int);
-    /* 80A1211C */ bool checkPoint(cXyz&, f32);
-    /* 80A122D0 */ bool setNextPoint();
-    /* 80A12480 */ inline void getTargetPoint(int, Vec*);
-    /* 80A124D0 */ void pathMoveF();
-    /* 80A12618 */ inline void setParam();
-    /* 80A126D4 */ inline BOOL main();
-    /* 80A12A10 */ inline void playMotion();
-    /* 80A12DC8 */ inline BOOL ctrlBtk();
-    /* 80A12EA4 */ inline void setAttnPos();
-    /* 80A131AC */ inline void lookat();
-    /* 80A1339C */ inline void setMtx();
-    /* 80A13460 */ inline int drawDbgInfo();
+    daNpcIns_c();
+    ~daNpcIns_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void reset();
+    int waitShop(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    int waitPresent(void*);
+    int waitOutSide1(void*);
+    int waitOutSide2(void*);
+    int goHome(void*);
+    int talk(void*);
+    int demo(void*);
+    bool isInsectComplete();
+    const insect_param_data& getInsectParamData(int);
+    void setWaitAction();
+    bool setPath(int);
+    bool checkPoint(cXyz&, f32);
+    bool setNextPoint();
+    inline void getTargetPoint(int, Vec*);
+    void pathMoveF();
+    inline void setParam();
+    inline BOOL main();
+    inline void playMotion();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline void setMtx();
+    inline int drawDbgInfo();
 
     int getStartTime() { return fopAcM_GetParam(this) & 0xFF; }
     int getEndTime() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/actor/d_a_npc_jagar.h b/include/d/actor/d_a_npc_jagar.h
index 00b177757e..63891084fc 100644
--- a/include/d/actor/d_a_npc_jagar.h
+++ b/include/d/actor/d_a_npc_jagar.h
@@ -23,7 +23,7 @@ struct daNpc_Jagar_HIOParam {
 
 class daNpc_Jagar_Param_c {
 public:
-    /* 80A1A2C4 */ virtual ~daNpc_Jagar_Param_c() {}
+    virtual ~daNpc_Jagar_Param_c() {}
 
     static const daNpc_Jagar_HIOParam m;
 };
@@ -95,60 +95,60 @@ public:
         /* 0x3 */ MAT_JAGA_M,
     };
 
-    /* 80A1470C */ ~daNpc_Jagar_c();
-    /* 80A14858 */ int create();
-    /* 80A14B20 */ int CreateHeap();
-    /* 80A14F4C */ int Delete();
-    /* 80A14F80 */ int Execute();
-    /* 80A14FA0 */ int Draw();
-    /* 80A15034 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A15054 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A150AC */ u8 getType();
-    /* 80A150F8 */ int isDelete();
-    /* 80A15198 */ void reset();
-    /* 80A15364 */ void afterJntAnm(int);
-    /* 80A153E8 */ void setParam();
-    /* 80A155E4 */ BOOL checkChangeEvt();
-    /* 80A15714 */ void setAfterTalkMotion();
-    /* 80A157B4 */ void srchActors();
-    /* 80A158A0 */ BOOL evtTalk();
-    /* 80A15940 */ BOOL evtCutProc();
-    /* 80A15A08 */ void action();
-    /* 80A15CA4 */ void beforeMove();
-    /* 80A15D68 */ void setAttnPos();
-    /* 80A1607C */ void setCollision();
-    /* 80A161EC */ int drawDbgInfo();
-    /* 80A161F4 */ void changeBtp(int*, int*);
-    /* 80A16234 */ int selectAction();
-    /* 80A162B0 */ int chkAction(int (daNpc_Jagar_c::*)(void*));
-    /* 80A162DC */ int setAction(int (daNpc_Jagar_c::*)(void*));
-    /* 80A16384 */ int cutClimbUp(int);
-    /* 80A16544 */ int cutNeedYourHelp(int);
-    /* 80A16CD8 */ int cutAnger(int);
-    /* 80A16EFC */ int cutConversationWithBou(int);
-    /* 80A1705C */ int cutConfidentialConversation(int);
-    /* 80A173D8 */ int cutFindWolf(int);
-    /* 80A17898 */ int chkSitMotion();
-    /* 80A17924 */ int chkSitMotion2();
-    /* 80A17984 */ int chkChuMotion();
-    /* 80A179F8 */ int chkToMotion();
-    /* 80A17A2C */ int wait(void*);
-    /* 80A1856C */ int talkwithBou(void*);
-    /* 80A18B74 */ int talk(void*);
-    /* 80A1A194 */ daNpc_Jagar_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_Jagar_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void changeBtp(int*, int*);
+    int selectAction();
+    int chkAction(int (daNpc_Jagar_c::*)(void*));
+    int setAction(int (daNpc_Jagar_c::*)(void*));
+    int cutClimbUp(int);
+    int cutNeedYourHelp(int);
+    int cutAnger(int);
+    int cutConversationWithBou(int);
+    int cutConfidentialConversation(int);
+    int cutFindWolf(int);
+    int chkSitMotion();
+    int chkSitMotion2();
+    int chkChuMotion();
+    int chkToMotion();
+    int wait(void*);
+    int talkwithBou(void*);
+    int talk(void*);
+    daNpc_Jagar_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                  {}
-    /* 80A1A274 */ u16 getEyeballMaterialNo() { return MAT_JAGA_EYEBALL; }
-    /* 80A1A27C */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80A1A284 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80A1A28C */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80A1A294 */ BOOL checkChangeJoint(int param_1) { return param_1 == JNT_HEAD; }
-    /* 80A1A2A4 */ BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
-    /* 80A1A2B4 */ s32 getFootLJointNo() { return JNT_FOOTL; }
-    /* 80A1A2BC */ s32 getFootRJointNo() { return JNT_FOOTR; }
+    u16 getEyeballMaterialNo() { return MAT_JAGA_EYEBALL; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int param_1) { return param_1 == JNT_HEAD; }
+    BOOL checkRemoveJoint(int param_1) { return param_1 == JNT_MOUTH; }
+    s32 getFootLJointNo() { return JNT_FOOTL; }
+    s32 getFootRJointNo() { return JNT_FOOTR; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_kakashi.h b/include/d/actor/d_a_npc_kakashi.h
index c23e811160..97099d2849 100644
--- a/include/d/actor/d_a_npc_kakashi.h
+++ b/include/d/actor/d_a_npc_kakashi.h
@@ -15,32 +15,32 @@ class daNpc_Kakashi_c : public daNpcT_c {
 public:
     typedef int (daNpc_Kakashi_c::*ActionFunc)(void*);
     
-    /* 8054B4E8 */ int create();
-    /* 8054B7D8 */ int CreateHeap();
-    /* 8054B908 */ int Delete();
-    /* 8054B93C */ int Execute();
-    /* 8054B994 */ int Draw();
-    /* 8054BB34 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8054BB54 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8054BBAC */ int getType();
-    /* 8054BC10 */ int isDelete();
-    /* 8054BC98 */ void reset();
-    /* 8054BF88 */ void srchActors();
-    /* 8054C92C */ int selectAction();
-    /* 8054CA1C */ BOOL chkAction(ActionFunc);
-    /* 8054CA48 */ int setAction(ActionFunc);
-    /* 8054CAF0 */ fopAc_ac_c* hitChk();
-    /* 8054CEA0 */ void setStaggerParam(fopAc_ac_c*);
-    /* 8054D26C */ void setPrtcls(int);
-    /* 8054D374 */ int judgeSwdTutorial();
-    /* 8054D490 */ int cutSwdTutorial(int);
-    /* 8054D57C */ int cutGetWoodSwd(int);
-    /* 8054D604 */ int cutMarosWhisper(int);
-    /* 8054D668 */ int wait(void*);
-    /* 8054D694 */ int swdTutorial(void*);
-    /* 8054D8BC */ int talk(void*);
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int getType();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    BOOL chkAction(ActionFunc);
+    int setAction(ActionFunc);
+    fopAc_ac_c* hitChk();
+    void setStaggerParam(fopAc_ac_c*);
+    void setPrtcls(int);
+    int judgeSwdTutorial();
+    int cutSwdTutorial(int);
+    int cutGetWoodSwd(int);
+    int cutMarosWhisper(int);
+    int wait(void*);
+    int swdTutorial(void*);
+    int talk(void*);
 
-    /* 8054E804 */ daNpc_Kakashi_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    daNpc_Kakashi_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                                    daNpcT_motionAnmData_c const* i_motionAnmData,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
@@ -53,18 +53,18 @@ public:
                         OS_REPORT("|%06d:%x|daNpc_Kakashi_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
 
-    /* 8054B36C */ virtual ~daNpc_Kakashi_c();
-    /* 8054B9D8 */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 8054BEA8 */ virtual void setParam();
-    /* 8054BF8C */ virtual BOOL checkChangeEvt();
-    /* 8054C034 */ virtual BOOL evtTalk();
-    /* 8054C0D4 */ virtual BOOL evtEndProc();
-    /* 8054C0E8 */ virtual BOOL evtCutProc();
-    /* 8054C1B0 */ virtual void action();
-    /* 8054C268 */ virtual void beforeMove();
-    /* 8054C2E0 */ virtual void setAttnPos();
-    /* 8054C584 */ virtual void setCollision();
-    /* 8054C924 */ virtual int drawDbgInfo();
+    virtual ~daNpc_Kakashi_c();
+    virtual int ctrlJoint(J3DJoint*, J3DModel*);
+    virtual void setParam();
+    virtual BOOL checkChangeEvt();
+    virtual BOOL evtTalk();
+    virtual BOOL evtEndProc();
+    virtual BOOL evtCutProc();
+    virtual void action();
+    virtual void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual int drawDbgInfo();
 
     int getFlowNodeNo() {
         u16 prm = home.angle.x;
@@ -118,7 +118,7 @@ struct daNpc_Kakashi_HIOParam {
 
 class daNpc_Kakashi_Param_c {
 public:
-    /* 8054EA58 */ virtual ~daNpc_Kakashi_Param_c() {}
+    virtual ~daNpc_Kakashi_Param_c() {}
 
     static const daNpc_Kakashi_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_kasi_hana.h b/include/d/actor/d_a_npc_kasi_hana.h
index 64b55ea95a..9a64943e29 100644
--- a/include/d/actor/d_a_npc_kasi_hana.h
+++ b/include/d/actor/d_a_npc_kasi_hana.h
@@ -23,7 +23,7 @@ struct daNpcKasiHana_HIOParam {
 
 class daNpcKasiHana_Param_c {
 public:
-    /* 80A2067C */ virtual ~daNpcKasiHana_Param_c() {}
+    virtual ~daNpcKasiHana_Param_c() {}
 
     static daNpcKasiHana_HIOParam const m;
 };
@@ -50,28 +50,28 @@ public:
         mSygnal = 0;
     }
     ~daNpcKasi_Mng_c() {}
-    /* 80A1AFAC */ void calcEscapeForm();
-    /* 80A1B0D8 */ BOOL calcCenterPos();
-    /* 80A1B1C8 */ f32 getDistFromCenter();
-    /* 80A1B35C */ void getOffsetFromLeader(cXyz const&, cXyz&);
-    /* 80A1B410 */ void initPath(u8, u16);
-    /* 80A1B48C */ int getPlNearPoint();
-    /* 80A1B5F0 */ int getSygnalInfo();
-    /* 80A1B628 */ void sendInfo();
-    /* 80A1B6F8 */ void offTalk();
-    /* 80A1B774 */ BOOL chkTalk();
-    /* 80A1B810 */ BOOL chkFear();
-    /* 80A1B884 */ BOOL chkEscape();
-    /* 80A1B920 */ BOOL createHearts();
-    /* 80A1BAAC */ void allDemoMove();
-    /* 80A1BB24 */ void allDemoNotMove();
-    /* 80A1BB9C */ BOOL isMiniGamePlaying();
-    /* 80A1BBE0 */ void schMemberActor();
-    /* 80A1BC88 */ void schDanchoActor();
-    /* 80A1BCF0 */ void deleteAllMember();
-    /* 80A1BD6C */ void chgWeightHeavy();
-    /* 80A1BDD8 */ void chgWeightLight();
-    /* 80A2065C */ cXyz getCenterPos() { return mCenterPos; }
+    void calcEscapeForm();
+    BOOL calcCenterPos();
+    f32 getDistFromCenter();
+    void getOffsetFromLeader(cXyz const&, cXyz&);
+    void initPath(u8, u16);
+    int getPlNearPoint();
+    int getSygnalInfo();
+    void sendInfo();
+    void offTalk();
+    BOOL chkTalk();
+    BOOL chkFear();
+    BOOL chkEscape();
+    BOOL createHearts();
+    void allDemoMove();
+    void allDemoNotMove();
+    BOOL isMiniGamePlaying();
+    void schMemberActor();
+    void schDanchoActor();
+    void deleteAllMember();
+    void chgWeightHeavy();
+    void chgWeightLight();
+    cXyz getCenterPos() { return mCenterPos; }
 
     void setKyuPos(const cXyz& i_pos) { mKyuPos = i_pos; }
     void setMichPos(const cXyz& i_pos) { mMichPos = i_pos; }
@@ -121,63 +121,63 @@ public:
     typedef BOOL (daNpcKasiHana_c::*cutFunc)(int);
     typedef BOOL (daNpcKasiHana_c::*EventFn)(int);
 
-    /* 80A1BE44 */ daNpcKasiHana_c();
-    /* 80A1C0A4 */ ~daNpcKasiHana_c();
-    /* 80A1C334 */ cPhs__Step Create();
-    /* 80A1C5B0 */ int CreateHeap();
-    /* 80A1C734 */ int Delete();
-    /* 80A1C768 */ int Execute();
-    /* 80A1C78C */ int Draw();
-    /* 80A1C7D8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A1C964 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A1C984 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A1C9D0 */ void setParam();
-    /* 80A1CA60 */ BOOL main();
-    /* 80A1CD28 */ void setAttnPos();
-    /* 80A1CED0 */ void setMotionAnm(int, f32);
-    /* 80A1CFA0 */ void setMotion(int, f32, int);
-    /* 80A1CFE8 */ int drawDbgInfo();
-    /* 80A1CFF0 */ void reset();
-    /* 80A1D238 */ void playMotion();
-    /* 80A1D604 */ void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80A1D77C */ BOOL setAction(actionFunc);
-    /* 80A1D824 */ void setLookMode(int);
-    /* 80A1D848 */ void lookat();
-    /* 80A1DA28 */ BOOL step(s16, int);
-    /* 80A1DB1C */ BOOL chkFindPlayer();
-    /* 80A1DC00 */ int wait(int);
-    /* 80A1E184 */ int chace_st(int);
-    /* 80A1E228 */ int chace(int);
-    /* 80A1E3AC */ cXyz getChacePos();
-    /* 80A1E4AC */ int turn(int);
-    /* 80A1E578 */ int fear(int);
-    /* 80A1E78C */ daTagEscape_c* srchWolfTag();
-    /* 80A1E7F4 */ static void* _srch_escape_tag(void*, void*);
-    /* 80A1E8C4 */ int getWolfPathNearIdx();
-    /* 80A1E9F8 */ int talk(int);
-    /* 80A1EB5C */ int demo(int);
-    /* 80A1EE38 */ int escape(int);
-    /* 80A1EF90 */ int cheer(int);
-    /* 80A1F198 */ BOOL _turn_to_link(s16);
-    /* 80A1F1E4 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A1F240 */ BOOL actor_front_check(fopAc_ac_c*);
-    /* 80A1F318 */ void _getOffset(cXyz const&, cXyz&);
-    /* 80A1F384 */ BOOL _Evt_Kasi_Appear(int);
-    /* 80A1F42C */ BOOL _Evt_Kasi_Appear_CutInit(int const&);
-    /* 80A1F50C */ BOOL _Evt_Kasi_Appear_CutMain(int const&);
-    /* 80A1F638 */ BOOL _Evt_Kasi_Talk(int);
-    /* 80A1F740 */ BOOL _Evt_Kasi_Talk_CutInit(int const&);
-    /* 80A1F860 */ BOOL _Evt_Kasi_Talk_CutMain(int const&, int);
-    /* 80A1F9F4 */ BOOL _Evt_Kasi(int);
-    /* 80A1FA9C */ BOOL _Evt_Kasi_CutInit(int const&);
-    /* 80A1FBC4 */ BOOL _Evt_Kasi_CutMain(int const&);
-    /* 80A1FD64 */ BOOL _Evt_Kasi_Cheer(int);
-    /* 80A1FE6C */ BOOL _Evt_Kasi_Cheer_CutInit(int const&);
-    /* 80A1FF78 */ BOOL _Evt_Kasi_Cheer_CutMain(int const&, int);
-    /* 80A2016C */ BOOL _Evt_Kasi_Cheer2(int);
-    /* 80A20244 */ BOOL _Evt_Kasi_Cheer2_CutInit(int const&);
-    /* 80A20350 */ BOOL _Evt_Kasi_Cheer2_CutMain(int const&, int);
-    /* 80A20678 */ void adjustShapeAngle() {}
+    daNpcKasiHana_c();
+    ~daNpcKasiHana_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void reset();
+    void playMotion();
+    void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
+    BOOL setAction(actionFunc);
+    void setLookMode(int);
+    void lookat();
+    BOOL step(s16, int);
+    BOOL chkFindPlayer();
+    int wait(int);
+    int chace_st(int);
+    int chace(int);
+    cXyz getChacePos();
+    int turn(int);
+    int fear(int);
+    daTagEscape_c* srchWolfTag();
+    static void* _srch_escape_tag(void*, void*);
+    int getWolfPathNearIdx();
+    int talk(int);
+    int demo(int);
+    int escape(int);
+    int cheer(int);
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL actor_front_check(fopAc_ac_c*);
+    void _getOffset(cXyz const&, cXyz&);
+    BOOL _Evt_Kasi_Appear(int);
+    BOOL _Evt_Kasi_Appear_CutInit(int const&);
+    BOOL _Evt_Kasi_Appear_CutMain(int const&);
+    BOOL _Evt_Kasi_Talk(int);
+    BOOL _Evt_Kasi_Talk_CutInit(int const&);
+    BOOL _Evt_Kasi_Talk_CutMain(int const&, int);
+    BOOL _Evt_Kasi(int);
+    BOOL _Evt_Kasi_CutInit(int const&);
+    BOOL _Evt_Kasi_CutMain(int const&);
+    BOOL _Evt_Kasi_Cheer(int);
+    BOOL _Evt_Kasi_Cheer_CutInit(int const&);
+    BOOL _Evt_Kasi_Cheer_CutMain(int const&, int);
+    BOOL _Evt_Kasi_Cheer2(int);
+    BOOL _Evt_Kasi_Cheer2_CutInit(int const&);
+    BOOL _Evt_Kasi_Cheer2_CutMain(int const&, int);
+    void adjustShapeAngle() {}
 
     s16 getMessageNo() { return s16(home.angle.x); }
     s8 getType() {
diff --git a/include/d/actor/d_a_npc_kasi_kyu.h b/include/d/actor/d_a_npc_kasi_kyu.h
index b4ad3f5859..9f611831aa 100644
--- a/include/d/actor/d_a_npc_kasi_kyu.h
+++ b/include/d/actor/d_a_npc_kasi_kyu.h
@@ -32,56 +32,56 @@ public:
     typedef int (daNpcKasiKyu_c::*actionFunc)(int);
     typedef BOOL (daNpcKasiKyu_c::*EventFn)(int);
 
-    /* 80A219CC */ daNpcKasiKyu_c();
-    /* 80A21C14 */ ~daNpcKasiKyu_c();
-    /* 80A21E24 */ cPhs__Step Create();
-    /* 80A220A0 */ int CreateHeap();
-    /* 80A22224 */ int Delete();
-    /* 80A22258 */ int Execute();
-    /* 80A22284 */ int Draw();
-    /* 80A222D0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A2245C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A2247C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A224C8 */ void setParam();
-    /* 80A22534 */ BOOL main();
-    /* 80A227DC */ void setAttnPos();
-    /* 80A22984 */ void setMotionAnm(int, f32);
-    /* 80A22A54 */ void setMotion(int, f32, int);
-    /* 80A22A9C */ BOOL drawDbgInfo();
-    /* 80A22AA4 */ void reset();
-    /* 80A22CD8 */ void playMotion();
-    /* 80A2310C */ void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80A23284 */ BOOL setAction(int (daNpcKasiKyu_c::*)(int));
-    /* 80A2332C */ void setLookMode(int);
-    /* 80A23350 */ void lookat();
-    /* 80A23530 */ BOOL step(s16, int);
-    /* 80A23624 */ BOOL chkFindPlayer();
-    /* 80A23708 */ int wait(int);
-    /* 80A23AB4 */ int fear(int);
-    /* 80A23C90 */ daTagEscape_c* srchWolfTag();
-    /* 80A23CF8 */ static void* _srch_escape_tag(void*, void*);
-    /* 80A23DC8 */ int getWolfPathNearIdx();
-    /* 80A23EFC */ int chace_st(int);
-    /* 80A23FA0 */ int chace(int);
-    /* 80A24110 */ cXyz getChacePos();
-    /* 80A241CC */ int turn_link(int);
-    /* 80A2428C */ int turn_home(int);
-    /* 80A24370 */ int turn_center(int);
-    /* 80A24440 */ int talk_dummy(int);
-    /* 80A244B8 */ int kya(int);
-    /* 80A24590 */ int kya2(int);
-    /* 80A24628 */ int kya_stop(int);
-    /* 80A246FC */ int iyan(int);
-    /* 80A24774 */ int iyan_look(int);
-    /* 80A2484C */ int turn_hana(int);
-    /* 80A2493C */ int escape(int);
-    /* 80A24A54 */ int wait_dummy(int);
-    /* 80A24AD8 */ int cheer(int);
-    /* 80A24CC4 */ BOOL _turn_to_link(s16);
-    /* 80A24D10 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A24D6C */ BOOL actor_front_check(fopAc_ac_c*);
-    /* 80A24E44 */ void _getOffset(cXyz const&, cXyz&);
-    /* 80A25848 */ void adjustShapeAngle() {}
+    daNpcKasiKyu_c();
+    ~daNpcKasiKyu_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void reset();
+    void playMotion();
+    void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
+    BOOL setAction(int (daNpcKasiKyu_c::*)(int));
+    void setLookMode(int);
+    void lookat();
+    BOOL step(s16, int);
+    BOOL chkFindPlayer();
+    int wait(int);
+    int fear(int);
+    daTagEscape_c* srchWolfTag();
+    static void* _srch_escape_tag(void*, void*);
+    int getWolfPathNearIdx();
+    int chace_st(int);
+    int chace(int);
+    cXyz getChacePos();
+    int turn_link(int);
+    int turn_home(int);
+    int turn_center(int);
+    int talk_dummy(int);
+    int kya(int);
+    int kya2(int);
+    int kya_stop(int);
+    int iyan(int);
+    int iyan_look(int);
+    int turn_hana(int);
+    int escape(int);
+    int wait_dummy(int);
+    int cheer(int);
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL actor_front_check(fopAc_ac_c*);
+    void _getOffset(cXyz const&, cXyz&);
+    void adjustShapeAngle() {}
 
     s8 getType() {
         s8 rv = fopAcM_GetParam(this) & 0xFF;
@@ -145,7 +145,7 @@ STATIC_ASSERT(sizeof(daNpcKasiKyu_c) == 0x146c);
 
 class daNpcKasiKyu_Param_c {
 public:
-    /* 80A2584C */ virtual ~daNpcKasiKyu_Param_c() {}
+    virtual ~daNpcKasiKyu_Param_c() {}
 
     static daNpcKasiKyu_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_kasi_mich.h b/include/d/actor/d_a_npc_kasi_mich.h
index 00c84422f0..1374717fc5 100644
--- a/include/d/actor/d_a_npc_kasi_mich.h
+++ b/include/d/actor/d_a_npc_kasi_mich.h
@@ -32,56 +32,56 @@ public:
     typedef int (daNpcKasiMich_c::*actionFunc)(int);
     typedef BOOL (daNpcKasiMich_c::*EventFn)(int);
 
-    /* 80A261CC */ daNpcKasiMich_c();
-    /* 80A26414 */ ~daNpcKasiMich_c();
-    /* 80A26624 */ cPhs__Step Create();
-    /* 80A268A0 */ int CreateHeap();
-    /* 80A26A24 */ int Delete();
-    /* 80A26A58 */ int Execute();
-    /* 80A26A84 */ int Draw();
-    /* 80A26AD0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A26C5C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A26C7C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A26CC8 */ void setParam();
-    /* 80A26D34 */ BOOL main();
-    /* 80A26FDC */ void setAttnPos();
-    /* 80A27184 */ void setMotionAnm(int, f32);
-    /* 80A27254 */ void setMotion(int, f32, int);
-    /* 80A2729C */ BOOL drawDbgInfo();
-    /* 80A272A4 */ void reset();
-    /* 80A274D8 */ void playMotion();
-    /* 80A2790C */ void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80A27A84 */ BOOL setAction(actionFunc);
-    /* 80A27B2C */ void setLookMode(int);
-    /* 80A27B50 */ void lookat();
-    /* 80A27D30 */ BOOL step(s16, int);
-    /* 80A27E24 */ BOOL chkFindPlayer();
-    /* 80A27F08 */ int wait(int);
-    /* 80A282B4 */ int fear(int);
-    /* 80A28490 */ daTagEscape_c* srchWolfTag();
-    /* 80A284F8 */ static void* _srch_escape_tag(void*, void*);
-    /* 80A285C8 */ int getWolfPathNearIdx();
-    /* 80A286FC */ int chace_st(int);
-    /* 80A287A0 */ int chace(int);
-    /* 80A28910 */ cXyz getChacePos();
-    /* 80A289CC */ int turn_link(int);
-    /* 80A28A8C */ int turn_home(int);
-    /* 80A28B70 */ int turn_center(int);
-    /* 80A28C40 */ int talk_dummy(int);
-    /* 80A28CB8 */ int kya(int);
-    /* 80A28D90 */ int kya2(int);
-    /* 80A28E28 */ int kya_stop(int);
-    /* 80A28EFC */ int iyan(int);
-    /* 80A28F74 */ int escape(int);
-    /* 80A2908C */ int iyan_look(int);
-    /* 80A29164 */ int turn_hana(int);
-    /* 80A291E8 */ int wait_dummy(int);
-    /* 80A2926C */ int cheer(int);
-    /* 80A29458 */ BOOL _turn_to_link(s16);
-    /* 80A294A4 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A29500 */ BOOL actor_front_check(fopAc_ac_c*);
-    /* 80A295D8 */ void _getOffset(cXyz const&, cXyz&);
-    /* 80A29FDC */ void adjustShapeAngle() {}
+    daNpcKasiMich_c();
+    ~daNpcKasiMich_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void reset();
+    void playMotion();
+    void playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData***);
+    BOOL setAction(actionFunc);
+    void setLookMode(int);
+    void lookat();
+    BOOL step(s16, int);
+    BOOL chkFindPlayer();
+    int wait(int);
+    int fear(int);
+    daTagEscape_c* srchWolfTag();
+    static void* _srch_escape_tag(void*, void*);
+    int getWolfPathNearIdx();
+    int chace_st(int);
+    int chace(int);
+    cXyz getChacePos();
+    int turn_link(int);
+    int turn_home(int);
+    int turn_center(int);
+    int talk_dummy(int);
+    int kya(int);
+    int kya2(int);
+    int kya_stop(int);
+    int iyan(int);
+    int escape(int);
+    int iyan_look(int);
+    int turn_hana(int);
+    int wait_dummy(int);
+    int cheer(int);
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL actor_front_check(fopAc_ac_c*);
+    void _getOffset(cXyz const&, cXyz&);
+    void adjustShapeAngle() {}
 
     s8 getType() {
         s8 rv = fopAcM_GetParam(this) & 0xFF;
@@ -145,7 +145,7 @@ STATIC_ASSERT(sizeof(daNpcKasiMich_c) == 0x146c);
 
 class daNpcKasiMich_Param_c {
 public:
-    /* 80A29FE0 */ virtual ~daNpcKasiMich_Param_c() {}
+    virtual ~daNpcKasiMich_Param_c() {}
 
     static daNpcKasiMich_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_kkri.h b/include/d/actor/d_a_npc_kkri.h
index 374cacec02..d0285f5a89 100644
--- a/include/d/actor/d_a_npc_kkri.h
+++ b/include/d/actor/d_a_npc_kkri.h
@@ -15,30 +15,30 @@ class daNpc_Kkri_c : public daNpcT_c {
 public:
     typedef int (daNpc_Kkri_c::*ActionFunc)(void*);
     
-    /* 8054F4F8 */ int create();
-    /* 8054F7D0 */ int CreateHeap();
-    /* 8054FC10 */ int Delete();
-    /* 8054FC44 */ int Execute();
-    /* 8054FC64 */ int Draw();
-    /* 8054FD00 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8054FD20 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8054FD78 */ static void* srchYm(void*, void*);
-    /* 8054FE20 */ int getType();
-    /* 8054FE58 */ int isDelete();
-    /* 8054FE8C */ void reset();
-    /* 8055032C */ void srchActors();
-    /* 80550CA8 */ int selectAction();
-    /* 80550D44 */ BOOL chkAction(ActionFunc);
-    /* 80550D70 */ BOOL setAction(ActionFunc);
-    /* 80550E18 */ int cutConversationAboutSoup(int);
-    /* 80550F70 */ int cutYmLook(int);
-    /* 80551084 */ int sleep();
-    /* 805512E0 */ int wait(void*);
-    /* 80551538 */ int sitWait1(void*);
-    /* 80551A4C */ int fearWait(void*);
-    /* 80551DA4 */ int talk(void*);
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchYm(void*, void*);
+    int getType();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    BOOL chkAction(ActionFunc);
+    BOOL setAction(ActionFunc);
+    int cutConversationAboutSoup(int);
+    int cutYmLook(int);
+    int sleep();
+    int wait(void*);
+    int sitWait1(void*);
+    int fearWait(void*);
+    int talk(void*);
 
-    /* 80553304 */ daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    daNpc_Kkri_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                                    daNpcT_motionAnmData_c const* i_motionAnmData,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                                    int i_faceMotionStepNum,
@@ -51,23 +51,23 @@ public:
                         OS_REPORT("|%06d:%x|daNpc_Kkri_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
 
-    /* 8054F3AC */ virtual ~daNpc_Kkri_c();
-    /* 80553404 */ virtual BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 6; }
-    /* 80553414 */ virtual BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 10; }
-    /* 805533FC */ virtual s32 getBackboneJointNo() { return 1; }
-    /* 805533F4 */ virtual s32 getNeckJointNo() { return 3; }
-    /* 805533EC */ virtual s32 getHeadJointNo() { return 4; }
-    /* 805533E4 */ virtual u16 getEyeballMaterialNo() { return 2; }
-    /* 805500A0 */ virtual void setParam();
-    /* 8054FFEC */ virtual BOOL checkChangeEvt();
-    /* 80550398 */ virtual BOOL evtTalk();
-    /* 80550438 */ virtual BOOL evtCutProc();
-    /* 80550270 */ virtual void setAfterTalkMotion();
-    /* 80550500 */ virtual void action();
-    /* 805505F8 */ virtual void beforeMove();
-    /* 805506BC */ virtual void setAttnPos();
-    /* 80550ADC */ virtual void setCollision();
-    /* 80550CA0 */ virtual int drawDbgInfo();
+    virtual ~daNpc_Kkri_c();
+    virtual BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 6; }
+    virtual BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 10; }
+    virtual s32 getBackboneJointNo() { return 1; }
+    virtual s32 getNeckJointNo() { return 3; }
+    virtual s32 getHeadJointNo() { return 4; }
+    virtual u16 getEyeballMaterialNo() { return 2; }
+    virtual void setParam();
+    virtual BOOL checkChangeEvt();
+    virtual BOOL evtTalk();
+    virtual BOOL evtCutProc();
+    virtual void setAfterTalkMotion();
+    virtual void action();
+    virtual void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual int drawDbgInfo();
 
     int getFlowNodeNo() {
         u16 prm = home.angle.x;
@@ -118,7 +118,7 @@ struct daNpc_Kkri_HIOParam {
 
 class daNpc_Kkri_Param_c {
 public:
-    /* 80553424 */ virtual ~daNpc_Kkri_Param_c() {}
+    virtual ~daNpc_Kkri_Param_c() {}
 
     static const daNpc_Kkri_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h
index a47499d2aa..a6a06e78b2 100644
--- a/include/d/actor/d_a_npc_kn.h
+++ b/include/d/actor/d_a_npc_kn.h
@@ -22,7 +22,7 @@ struct daNpc_Kn_HIOParam {
 
 class daNpc_Kn_Param_c {
 public:
-    /* 80A3C124 */ virtual ~daNpc_Kn_Param_c() {}
+    virtual ~daNpc_Kn_Param_c() {}
 
     static const daNpc_Kn_HIOParam m;
 };
@@ -218,137 +218,137 @@ public:
 
     void setTalkFlag(u8 i_flag) { field_0x15bd = i_flag; }
     
-    /* 80A2AFD4 */ int create();
-    /* 80A2B278 */ int CreateHeap();
-    /* 80A2B620 */ int Delete();
-    /* 80A2B654 */ int Execute();
-    /* 80A2B6B0 */ int Draw();
-    /* 80A2B764 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A2B784 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A2B7DC */ u8 getType();
-    /* 80A2B844 */ u8 getDivideNo();
-    /* 80A2B850 */ u32 getFlowNodeNo();
-    /* 80A2B86C */ u8 getPath();
-    /* 80A2B878 */ BOOL isDelete();
-    /* 80A2B91C */ void resetCol();
-    /* 80A2B9E0 */ void reset();
-    /* 80A2BC5C */ void resetType();
-    /* 80A2BD30 */ void setParam();
-    /* 80A2BFB0 */ u32 setParamTeach03();
-    /* 80A2C044 */ u32 setParamTeach04();
-    /* 80A2C0FC */ u32 setParamTeach05();
-    /* 80A2C190 */ u32 setParamTeach06();
-    /* 80A2C1B0 */ u32 setParamTeach07();
-    /* 80A2C1D0 */ void setAfterTalkMotion();
-    /* 80A2C230 */ void srchActors();
-    /* 80A2C234 */ bool evtTalk();
-    /* 80A2C318 */ BOOL evtCutProc();
-    /* 80A2C3FC */ void action();
-    /* 80A2C484 */ void beforeMove();
-    /* 80A2C4FC */ void afterMoved();
-    /* 80A2C56C */ void setAttnPos();
-    /* 80A2C77C */ void setCollision();
-    /* 80A2C984 */ void setCollisionSword();
-    /* 80A2CB30 */ BOOL checkCollisionSword();
-    /* 80A2CBEC */ void setCollisionTeach03();
-    /* 80A2CC24 */ void setCollisionTeach04();
-    /* 80A2CD00 */ void setCollisionTeach05();
-    /* 80A2CD38 */ void setCollisionTeach06();
-    /* 80A2CD58 */ void setCollisionTeach07();
-    /* 80A2CD78 */ int drawDbgInfo();
-    /* 80A2CD80 */ void drawOtherMdl();
-    /* 80A2CF9C */ void drawGhost();
-    /* 80A2D198 */ int selectAction();
-    /* 80A2D3A4 */ void teach03_selectAction();
-    /* 80A2D3FC */ void teach04_selectAction();
-    /* 80A2D4A0 */ void teach05_selectAction();
-    /* 80A2D4F8 */ void teach06_selectAction();
-    /* 80A2D600 */ void teach07_selectAction();
-    /* 80A2D708 */ BOOL chkAction(actionFunc);
-    /* 80A2D734 */ BOOL setAction(actionFunc);
-    /* 80A2D7DC */ int wait(void*);
-    /* 80A2D9C4 */ int talk(void*);
-    /* 80A2DB94 */ int test(void*);
-    /* 80A2DCB4 */ void setSceneChange(int);
-    /* 80A2DD70 */ int ECut_noneEquipChangeTalk(int);
-    /* 80A2DF84 */ int ECut_noneEquipChangeTalkStand(int);
-    /* 80A2E26C */ int ECut_largeDamageTalk(int);
-    /* 80A2E528 */ int teach02_start(void*);
-    /* 80A2E664 */ int teach03_attackWait(void*);
-    /* 80A2EC04 */ int teach04_attackWait(void*);
-    /* 80A2EF8C */ int teach04_headBreakWait(void*);
-    /* 80A2F24C */ int teach04_finishWait(void*);
-    /* 80A2F600 */ int teach05_surpriseAttackWait(void*);
-    /* 80A2FC80 */ int teach06_superJumpWait(void*);
-    /* 80A30398 */ int teach06_divideMove(void*);
-    /* 80A305A8 */ int teach06_waitDivide(void*);
-    /* 80A30708 */ int teach06_superJumpWaitDivide(void*);
-    /* 80A30D44 */ int teach06_superJumpedDivide(void*);
-    /* 80A30EDC */ int teach06_warpDelete(void*);
-    /* 80A31028 */ int teach07_superTurnAttackWait(void*);
-    /* 80A315D0 */ int teach07_divideMove(void*);
-    /* 80A317F8 */ int teach07_waitDivide(void*);
-    /* 80A31958 */ int teach07_superTurnAttackWaitDivide(void*);
-    /* 80A31E24 */ int teach07_superTurnAttackedDivide(void*);
-    /* 80A31FBC */ int teach07_warpDelete(void*);
-    /* 80A3203C */ int ECut_secondEncount(int);
-    /* 80A324C4 */ int ECut_thirdSkillExplain(int);
-    /* 80A32D30 */ int ECut_thirdSkillGet(int);
-    /* 80A33358 */ int ECut_fourthSkillExplain(int);
-    /* 80A33D80 */ int ECut_fourthSkillGet(int);
-    /* 80A343A8 */ int ECut_fifthSkillExplain(int);
-    /* 80A34DB8 */ int ECut_fifthSkillGet(int);
-    /* 80A353E0 */ int ECut_sixthSkillExplain(int);
-    /* 80A35D88 */ int ECut_sixthSkillGet(int);
-    /* 80A363C0 */ int ECut_seventhSkillExplain(int);
-    /* 80A36C20 */ int ECut_seventhSkillGet(int);
-    /* 80A372D0 */ int setPrtcl();
-    /* 80A37430 */ int setSlipPrtcl();
-    /* 80A37558 */ int setLandingPrtcl();
-    /* 80A37598 */ void calcMagicBallPos();
-    /* 80A37670 */ void setSwordChargePtcl();
-    /* 80A37B08 */ void calcSlip();
-    /* 80A37D20 */ void calcSwordAttackMove(int);
-    /* 80A3805C */ void setSe();
-    /* 80A38520 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80A38550 */ J3DAnmTransform* getTrnsfrmAnmP(char const*, int);
-    /* 80A3858C */ J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int);
-    /* 80A385C8 */ J3DAnmTexPattern* getTexPtrnAnmP(char const*, int);
-    /* 80A38604 */ J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char const*, int);
-    /* 80A38640 */ BOOL setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
-    /* 80A38684 */ int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
-    /* 80A3877C */ BOOL setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
-    /* 80A387BC */ BOOL setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
-    /* 80A387FC */ int loadRes(s8 const*, char const**);
-    /* 80A388B0 */ void deleteRes(s8 const*, char const**);
-    /* 80A38930 */ int execute();
-    /* 80A38BB8 */ int draw(int, int, f32, GXColorS10*, f32, int, int, int);
-    /* 80A38FAC */ void setEnvTevColor();
-    /* 80A39008 */ void setRoomNo();
-    /* 80A3904C */ BOOL checkEndAnm(f32);
-    /* 80A390F8 */ BOOL checkEndAnm(J3DFrameCtrl*, f32);
-    /* 80A3917C */ void playAllAnm();
-    /* 80A39558 */ void setMtx();
-    /* 80A395DC */ void ctrlFaceMotion();
-    /* 80A39684 */ void ctrlMotion();
-    /* 80A39738 */ int ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
-    /* 80A3A404 */ void evtChange();
-    /* 80A3A568 */ bool setFaceMotionAnm(int, bool);
-    /* 80A3A7C0 */ bool setMotionAnm(int, f32, int);
-    /* 80A3AA58 */ void setPos(cXyz);
-    /* 80A3AAF0 */ void setAngle(s16);
-    /* 80A3AB18 */ BOOL chkActorInSight(fopAc_ac_c*, f32, s16);
-    /* 80A3AC24 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
-    /* 80A3ACD4 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
-    /* 80A3AD50 */ int chkFindPlayer(int, s16);
-    /* 80A3AF64 */ BOOL srchPlayerActor();
-    /* 80A3B000 */ cXyz getAttnPos(fopAc_ac_c*);
-    /* 80A3B074 */ BOOL turn(s16, int, int);
-    /* 80A3B220 */ int step(s16, int, int, int, int);
-    /* 80A3B3E8 */ int initTalk(int, fopAc_ac_c**);
-    /* 80A3B448 */ BOOL talkProc(int*, int, fopAc_ac_c**, int);
-    /* 80A3B5EC */ void setHitodamaPrtcl();
-    /* 80A3B82C */ daNpc_Kn_c(daNpcT_faceMotionAnmData_c const* param_0,
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u8 getDivideNo();
+    u32 getFlowNodeNo();
+    u8 getPath();
+    BOOL isDelete();
+    void resetCol();
+    void reset();
+    void resetType();
+    void setParam();
+    u32 setParamTeach03();
+    u32 setParamTeach04();
+    u32 setParamTeach05();
+    u32 setParamTeach06();
+    u32 setParamTeach07();
+    void setAfterTalkMotion();
+    void srchActors();
+    bool evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    void setCollisionSword();
+    BOOL checkCollisionSword();
+    void setCollisionTeach03();
+    void setCollisionTeach04();
+    void setCollisionTeach05();
+    void setCollisionTeach06();
+    void setCollisionTeach07();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    void drawGhost();
+    int selectAction();
+    void teach03_selectAction();
+    void teach04_selectAction();
+    void teach05_selectAction();
+    void teach06_selectAction();
+    void teach07_selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
+    int test(void*);
+    void setSceneChange(int);
+    int ECut_noneEquipChangeTalk(int);
+    int ECut_noneEquipChangeTalkStand(int);
+    int ECut_largeDamageTalk(int);
+    int teach02_start(void*);
+    int teach03_attackWait(void*);
+    int teach04_attackWait(void*);
+    int teach04_headBreakWait(void*);
+    int teach04_finishWait(void*);
+    int teach05_surpriseAttackWait(void*);
+    int teach06_superJumpWait(void*);
+    int teach06_divideMove(void*);
+    int teach06_waitDivide(void*);
+    int teach06_superJumpWaitDivide(void*);
+    int teach06_superJumpedDivide(void*);
+    int teach06_warpDelete(void*);
+    int teach07_superTurnAttackWait(void*);
+    int teach07_divideMove(void*);
+    int teach07_waitDivide(void*);
+    int teach07_superTurnAttackWaitDivide(void*);
+    int teach07_superTurnAttackedDivide(void*);
+    int teach07_warpDelete(void*);
+    int ECut_secondEncount(int);
+    int ECut_thirdSkillExplain(int);
+    int ECut_thirdSkillGet(int);
+    int ECut_fourthSkillExplain(int);
+    int ECut_fourthSkillGet(int);
+    int ECut_fifthSkillExplain(int);
+    int ECut_fifthSkillGet(int);
+    int ECut_sixthSkillExplain(int);
+    int ECut_sixthSkillGet(int);
+    int ECut_seventhSkillExplain(int);
+    int ECut_seventhSkillGet(int);
+    int setPrtcl();
+    int setSlipPrtcl();
+    int setLandingPrtcl();
+    void calcMagicBallPos();
+    void setSwordChargePtcl();
+    void calcSlip();
+    void calcSwordAttackMove(int);
+    void setSe();
+    static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    J3DAnmTransform* getTrnsfrmAnmP(char const*, int);
+    J3DAnmTransformKey* getTrnsfrmKeyAnmP(char const*, int);
+    J3DAnmTexPattern* getTexPtrnAnmP(char const*, int);
+    J3DAnmTextureSRTKey* getTexSRTKeyAnmP(char const*, int);
+    BOOL setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
+    int setMcaMorfAnm(J3DAnmTransformKey*, f32, f32, int, int, int);
+    BOOL setBtpAnm(J3DAnmTexPattern*, J3DModelData*, f32, int);
+    BOOL setBtkAnm(J3DAnmTextureSRTKey*, J3DModelData*, f32, int);
+    int loadRes(s8 const*, char const**);
+    void deleteRes(s8 const*, char const**);
+    int execute();
+    int draw(int, int, f32, GXColorS10*, f32, int, int, int);
+    void setEnvTevColor();
+    void setRoomNo();
+    BOOL checkEndAnm(f32);
+    BOOL checkEndAnm(J3DFrameCtrl*, f32);
+    void playAllAnm();
+    void setMtx();
+    void ctrlFaceMotion();
+    void ctrlMotion();
+    int ctrlMsgAnm(int*, int*, fopAc_ac_c*, int);
+    void evtChange();
+    bool setFaceMotionAnm(int, bool);
+    bool setMotionAnm(int, f32, int);
+    void setPos(cXyz);
+    void setAngle(s16);
+    BOOL chkActorInSight(fopAc_ac_c*, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
+    BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
+    int chkFindPlayer(int, s16);
+    BOOL srchPlayerActor();
+    cXyz getAttnPos(fopAc_ac_c*);
+    BOOL turn(s16, int, int);
+    int step(s16, int, int, int, int);
+    int initTalk(int, fopAc_ac_c**);
+    BOOL talkProc(int*, int, fopAc_ac_c**, int);
+    void setHitodamaPrtcl();
+    daNpc_Kn_c(daNpcT_faceMotionAnmData_c const* param_0,
                               daNpcT_motionAnmData_c const* param_1,
                               daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2, int param_3,
                               daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_4, int param_5,
@@ -359,55 +359,55 @@ public:
                         OS_REPORT("|%06d:%x|daNpc_Kn_c -> コンストラクト\n", g_Counter.mCounter0, this);
                         initialize();
                     }
-    /* 80A3C998 */ u32 setParamTeach01();
-    /* 80A3CB14 */ void setCollisionTeach01();
-    /* 80A3CBFC */ void teach01_selectAction();
-    /* 80A3CCC0 */ int teach01_start(void*);
-    /* 80A3CDFC */ int teach01_attackWait(void*);
-    /* 80A3CF78 */ int teach01_swordAttackWait(void*);
-    /* 80A3D32C */ int teach01_swordFinishWait(void*);
-    /* 80A3D6D8 */ int ctrlWarp();
-    /* 80A3DCEC */ int ECut_firstEncount(int);
-    /* 80A3DEC4 */ int ECut_attackFailed(int);
-    /* 80A3E550 */ int ECut_firstSkillGet(int);
-    /* 80A3EB84 */ u32 setParamTeach02();
-    /* 80A3EE38 */ void setCollisionTeach02();
-    /* 80A3EF1C */ void teach02_selectAction();
-    /* 80A3EFE0 */ int teach02_shieldBashWait(void*);
-    /* 80A3F358 */ int teach02_finishWait(void*);
-    /* 80A3F5A4 */ int teach02_shieldReflectWait(void*);
-    /* 80A3F99C */ int ECut_secondSkillExplain(int);
-    /* 80A3FFB4 */ int ECut_reflectExplain(int);
-    /* 80A403B8 */ int ECut_secondSkillGet(int);
+    u32 setParamTeach01();
+    void setCollisionTeach01();
+    void teach01_selectAction();
+    int teach01_start(void*);
+    int teach01_attackWait(void*);
+    int teach01_swordAttackWait(void*);
+    int teach01_swordFinishWait(void*);
+    int ctrlWarp();
+    int ECut_firstEncount(int);
+    int ECut_attackFailed(int);
+    int ECut_firstSkillGet(int);
+    u32 setParamTeach02();
+    void setCollisionTeach02();
+    void teach02_selectAction();
+    int teach02_shieldBashWait(void*);
+    int teach02_finishWait(void*);
+    int teach02_shieldReflectWait(void*);
+    int ECut_secondSkillExplain(int);
+    int ECut_reflectExplain(int);
+    int ECut_secondSkillGet(int);
 
-    /* 80A3949C */ virtual int ctrlBtk();
-    /* 80A3B7B4 */ virtual int getFootLJointNo() { return -1; }
-    /* 80A3B7AC */ virtual int getFootRJointNo() { return -1; }
-    /* 80A3BD1C */ virtual u16 getEyeballLMaterialNo() { return 0; }
-    /* 80A3BD24 */ virtual u16 getEyeballRMaterialNo() { return 0; }
-    /* 80A3BD14 */ virtual u16 getEyeballMaterialNo() { return 0; }
-    /* 80A3989C */ virtual int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A3B720 */ virtual void afterJntAnm(int) {}
-    /* 80A3B7A4 */ virtual BOOL checkChangeEvt() { return FALSE; }
-    /* 80A3B79C */ virtual BOOL evtEndProc() { return TRUE; }
-    /* 80A39BBC */ virtual int evtProc();
-    /* 80A39DBC */ virtual void setFootPos();
-    /* 80A39F84 */ virtual void setFootPrtcl(cXyz*, f32);
-    /* 80A3A254 */ virtual bool checkCullDraw();
-    /* 80A3A25C */ virtual void twilight();
-    /* 80A3B7BC */ virtual BOOL chkXYItems() { return FALSE; }
-    /* 80A3A2A8 */ virtual void evtOrder();
-    /* 80A3B708 */ virtual void decTmr();
-    /* 80A3A504 */ virtual void clrParam();
-    /* 80A3B7C4 */ virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
-    /* 80A3B7CC */ virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c arg0) {
+    virtual int ctrlBtk();
+    virtual int getFootLJointNo() { return -1; }
+    virtual int getFootRJointNo() { return -1; }
+    virtual u16 getEyeballLMaterialNo() { return 0; }
+    virtual u16 getEyeballRMaterialNo() { return 0; }
+    virtual u16 getEyeballMaterialNo() { return 0; }
+    virtual int ctrlJoint(J3DJoint*, J3DModel*);
+    virtual void afterJntAnm(int) {}
+    virtual BOOL checkChangeEvt() { return FALSE; }
+    virtual BOOL evtEndProc() { return TRUE; }
+    virtual int evtProc();
+    virtual void setFootPos();
+    virtual void setFootPrtcl(cXyz*, f32);
+    virtual bool checkCullDraw();
+    virtual void twilight();
+    virtual BOOL chkXYItems() { return FALSE; }
+    virtual void evtOrder();
+    virtual void decTmr();
+    virtual void clrParam();
+    virtual bool afterSetFaceMotionAnm(int, int, f32, int) { return true; }
+    virtual daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c arg0) {
         return arg0;
     }
-    /* 80A3B7FC */ virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c arg0) {
+    virtual daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c arg0) {
         return arg0;
     }
-    /* 80A2AA0C */ virtual ~daNpc_Kn_c();
-    /* 80A2D060 */ virtual bool afterSetMotionAnm(int, int, f32, int);
+    virtual ~daNpc_Kn_c();
+    virtual bool afterSetMotionAnm(int, int, f32, int);
     
     static const dCcD_SrcGObjInf mCcDObjData;
     static char* mCutNameList[21];
diff --git a/include/d/actor/d_a_npc_knj.h b/include/d/actor/d_a_npc_knj.h
index 14507b3f16..b9677c7507 100644
--- a/include/d/actor/d_a_npc_knj.h
+++ b/include/d/actor/d_a_npc_knj.h
@@ -9,7 +9,7 @@ struct daNpc_Knj_HIOParam {
 
 class daNpc_Knj_Param_c {
 public:
-    /* 80A6FD10 */ virtual ~daNpc_Knj_Param_c() {}
+    virtual ~daNpc_Knj_Param_c() {}
 
     static const daNpc_Knj_HIOParam m;
 };
@@ -43,33 +43,33 @@ public:
     typedef int (daNpc_Knj_c::*actionFunc)(void*);
     typedef int (daNpc_Knj_c::*cutFunc)(int);
 
-    /* 80A4356C */ ~daNpc_Knj_c();
-    /* 80A43608 */ int create();
-    /* 80A43848 */ int CreateHeap();
-    /* 80A439A0 */ int Delete();
-    /* 80A439D4 */ int Execute();
-    /* 80A439F4 */ int Draw();
-    /* 80A43A88 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A43AA8 */ u8 getType();
-    /* 80A43B1C */ int getFlowNodeNo();
-    /* 80A43B38 */ BOOL isDelete();
-    /* 80A43B40 */ void reset();
-    /* 80A43C64 */ void setParam();
-    /* 80A43D58 */ void srchActors();
-    /* 80A43D5C */ BOOL evtTalk();
-    /* 80A43E5C */ BOOL evtCutProc();
-    /* 80A43F24 */ void action();
-    /* 80A43FAC */ void beforeMove();
-    /* 80A44024 */ void setAttnPos();
-    /* 80A44080 */ BOOL drawDbgInfo();
-    /* 80A44088 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80A44264 */ void drawGhost();
-    /* 80A442D0 */ int selectAction();
-    /* 80A44318 */ BOOL chkAction(actionFunc);
-    /* 80A44344 */ int setAction(actionFunc);
-    /* 80A443EC */ int wait(void*);
-    /* 80A44598 */ int talk(void*);
-    /* 80A45460 */ daNpc_Knj_c(
+    ~daNpc_Knj_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    int getFlowNodeNo();
+    BOOL isDelete();
+    void reset();
+    void setParam();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    BOOL drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    void drawGhost();
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    int setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Knj_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
diff --git a/include/d/actor/d_a_npc_kolin.h b/include/d/actor/d_a_npc_kolin.h
index 7272eaa67f..dede4e1b6c 100644
--- a/include/d/actor/d_a_npc_kolin.h
+++ b/include/d/actor/d_a_npc_kolin.h
@@ -24,7 +24,7 @@ struct daNpc_Kolin_HIOParam {
 
 class daNpc_Kolin_Param_c {
 public:
-    /* 8055A4E8 */ virtual ~daNpc_Kolin_Param_c() {}
+    virtual ~daNpc_Kolin_Param_c() {}
 
     static daNpc_Kolin_HIOParam const m;
 };
@@ -34,43 +34,43 @@ public:
     typedef int (daNpc_Kolin_c::*cutFunc)(int);
     typedef int (daNpc_Kolin_c::*actionFunc)(void*);
 
-    /* 80553FEC */ ~daNpc_Kolin_c();
-    /* 80554138 */ cPhs__Step create();
-    /* 80554414 */ int CreateHeap();
-    /* 80554930 */ int Delete();
-    /* 80554964 */ int Execute();
-    /* 80554984 */ int Draw();
-    /* 80554A18 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80554A38 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80554A90 */ u8 getType();
-    /* 80554B30 */ BOOL isDelete();
-    /* 80554CB0 */ void reset();
-    /* 805552DC */ void srchActors();
-    /* 80555E38 */ int selectAction();
-    /* 80555F28 */ BOOL chkAction(actionFunc);
-    /* 80555F54 */ int setAction(actionFunc);
-    /* 80555FFC */ void calcFollowSpeedAndAngle(fopAc_ac_c*, int, int);
-    /* 805563BC */ void followPlayer(int);
-    /* 805567AC */ void lookup(u8);
-    /* 805568AC */ int cutNoRide(int);
-    /* 80556A04 */ int cutHail(int);
-    /* 80556DB4 */ int cutGiveMeWoodSwd(int);
-    /* 80557054 */ int cutGetWoodSwd(int);
-    /* 805576C4 */ int cutConversationAboutLoopHole(int);
-    /* 805579DC */ int cutCacaricoConversation(int);
-    /* 80557BD4 */ int cutConversationAboutDeathMt(int);
-    /* 80557C6C */ int cutConversationAboutGoron(int);
-    /* 80557D04 */ int cutClothTry(int);
-    /* 80557E38 */ int cutThankYou(int);
-    /* 80557ED8 */ int wait(void*);
-    /* 80558698 */ int timidWalk(void*);
-    /* 80558AF8 */ int follow(void*);
-    /* 80558C4C */ int clothWait(void*);
-    /* 80558E90 */ int talk(void*);
+    ~daNpc_Kolin_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    int setAction(actionFunc);
+    void calcFollowSpeedAndAngle(fopAc_ac_c*, int, int);
+    void followPlayer(int);
+    void lookup(u8);
+    int cutNoRide(int);
+    int cutHail(int);
+    int cutGiveMeWoodSwd(int);
+    int cutGetWoodSwd(int);
+    int cutConversationAboutLoopHole(int);
+    int cutCacaricoConversation(int);
+    int cutConversationAboutDeathMt(int);
+    int cutConversationAboutGoron(int);
+    int cutClothTry(int);
+    int cutThankYou(int);
+    int wait(void*);
+    int timidWalk(void*);
+    int follow(void*);
+    int clothWait(void*);
+    int talk(void*);
 #if DEBUG
     int test(void*);
 #endif
-    /* 8055A3B8 */ daNpc_Kolin_c(
+    daNpc_Kolin_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -82,28 +82,28 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 8055A4B8 */ virtual int checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 8055A4C8 */ virtual int checkRemoveJoint(int i_joint) { return i_joint == 8; }
-    /* 8055A4B0 */ virtual s32 getBackboneJointNo() { return 1; }
-    /* 8055A4A8 */ virtual s32 getNeckJointNo() { return 3; }
-    /* 8055A4A0 */ virtual s32 getHeadJointNo() { return 4; }
-    /* 8055A4D8 */ virtual s32 getFootLJointNo() { return 22; }
-    /* 8055A4E0 */ virtual s32 getFootRJointNo() { return 25; }
-    /* 8055A498 */ virtual u16 getEyeballMaterialNo() { return 2; }
-    /* 80554EBC */ virtual void afterJntAnm(int);
-    /* 80554F48 */ virtual void setParam();
-    /* 80555118 */ virtual BOOL checkChangeEvt();
-    /* 80555448 */ virtual BOOL evtTalk();
-    /* 805554E8 */ virtual BOOL evtCutProc();
-    /* 8055523C */ virtual void setAfterTalkMotion();
-    /* 805555B0 */ virtual void action();
-    /* 8055574C */ virtual void beforeMove();
-    /* 80555810 */ virtual void setAttnPos();
-    /* 80555B48 */ virtual void setCollision();
-    /* 80555CE4 */ virtual int drawDbgInfo();
-    /* 80555CEC */ virtual void drawOtherMdl();
-    /* 80555DC4 */ virtual void changeAnm(int*, int*);
-    /* 80555DEC */ virtual void changeBck(int*, int*);
+    virtual int checkChangeJoint(int i_joint) { return i_joint == 4; }
+    virtual int checkRemoveJoint(int i_joint) { return i_joint == 8; }
+    virtual s32 getBackboneJointNo() { return 1; }
+    virtual s32 getNeckJointNo() { return 3; }
+    virtual s32 getHeadJointNo() { return 4; }
+    virtual s32 getFootLJointNo() { return 22; }
+    virtual s32 getFootRJointNo() { return 25; }
+    virtual u16 getEyeballMaterialNo() { return 2; }
+    virtual void afterJntAnm(int);
+    virtual void setParam();
+    virtual BOOL checkChangeEvt();
+    virtual BOOL evtTalk();
+    virtual BOOL evtCutProc();
+    virtual void setAfterTalkMotion();
+    virtual void action();
+    virtual void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual int drawDbgInfo();
+    virtual void drawOtherMdl();
+    virtual void changeAnm(int*, int*);
+    virtual void changeBck(int*, int*);
 
     static char* mCutNameList[11];
     static cutFunc mCutList[11];
diff --git a/include/d/actor/d_a_npc_kolinb.h b/include/d/actor/d_a_npc_kolinb.h
index 2aa0d11e18..dcf4d4744c 100644
--- a/include/d/actor/d_a_npc_kolinb.h
+++ b/include/d/actor/d_a_npc_kolinb.h
@@ -19,7 +19,7 @@ struct daNpc_Kolinb_HIOParam {
 
 class daNpc_Kolinb_Param_c {
 public:
-    /* 80A486A4 */ virtual ~daNpc_Kolinb_Param_c() {}
+    virtual ~daNpc_Kolinb_Param_c() {}
 
     static daNpc_Kolinb_HIOParam const m;
 };
@@ -82,43 +82,43 @@ public:
     typedef int (daNpc_Kolinb_c::*cutFunc)(int);
     typedef int (daNpc_Kolinb_c::*actionFunc)(void*);
 
-    /* 80A4598C */ ~daNpc_Kolinb_c();
-    /* 80A45ADC */ cPhs__Step create();
-    /* 80A45DC4 */ int CreateHeap();
-    /* 80A4603C */ int Delete();
-    /* 80A46070 */ int Execute();
-    /* 80A46090 */ int Draw();
-    /* 80A46124 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A46144 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A4619C */ u8 getType();
-    /* 80A461E8 */ BOOL isDelete();
-    /* 80A462C8 */ void reset();
-    /* 80A46420 */ void setParam();
-    /* 80A4651C */ BOOL checkChangeEvt();
-    /* 80A465D0 */ void setAfterTalkMotion();
-    /* 80A46630 */ void srchActors();
-    /* 80A46634 */ BOOL evtTalk();
-    /* 80A466D4 */ BOOL evtCutProc();
-    /* 80A4679C */ void action();
-    /* 80A46824 */ void beforeMove();
-    /* 80A468E8 */ void setAttnPos();
-    /* 80A46A4C */ void setCollision();
-    /* 80A46A9C */ int drawDbgInfo();
-    /* 80A46AA4 */ int selectAction();
-    /* 80A46AEC */ BOOL chkAction(actionFunc);
-    /* 80A46B18 */ int setAction(actionFunc);
-    /* 80A46BC0 */ int cutConversationInHotel(int);
-    /* 80A46C48 */ int cutConversationAboutDeathMt(int);
-    /* 80A46EE4 */ int cutConversationAboutGoron(int);
-    /* 80A47180 */ int cutNurse(int);
-    /* 80A472EC */ int cutClothTry(int);
-    /* 80A4738C */ int cutThankYou(int);
-    /* 80A4742C */ int wait(void*);
-    /* 80A475D4 */ int talk(void*);
+    ~daNpc_Kolinb_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    int setAction(actionFunc);
+    int cutConversationInHotel(int);
+    int cutConversationAboutDeathMt(int);
+    int cutConversationAboutGoron(int);
+    int cutNurse(int);
+    int cutClothTry(int);
+    int cutThankYou(int);
+    int wait(void*);
+    int talk(void*);
 #if DEBUG
     int test(void*);
 #endif
-    /* 80A4854C */ daNpc_Kolinb_c(
+    daNpc_Kolinb_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -130,11 +130,11 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 80A4860C */ s32 getHeadJointNo() { return mType == 2 ? ZRCB_JNT_HEAD : KOLINB_JNT_HEAD; }
-    /* 80A48624 */ BOOL checkChangeJoint(int i_joint) { return i_joint == ((mType == 2 ? ZRCB_JNT_H_TAIL1 : KOLINB_JNT_CHIN) - 1); }
-    /* 80A4864C */ BOOL checkRemoveJoint(int i_joint) { return i_joint == ((mType == 2 ? ZRCB_JNT_MOUTH : KOLINB_JNT_MOUTH) - 1); }
-    /* 80A48674 */ s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; }
-    /* 80A4868C */ s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; }
+    s32 getHeadJointNo() { return mType == 2 ? ZRCB_JNT_HEAD : KOLINB_JNT_HEAD; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == ((mType == 2 ? ZRCB_JNT_H_TAIL1 : KOLINB_JNT_CHIN) - 1); }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == ((mType == 2 ? ZRCB_JNT_MOUTH : KOLINB_JNT_MOUTH) - 1); }
+    s32 getBackboneJointNo() { return mType == 2 ? ZRCB_JNT_BACKBONE1 : KOLINB_JNT_BACKBONE1; }
+    s32 getNeckJointNo() { return mType == 2 ? ZRCB_JNT_NECK : KOLINB_JNT_NECK; }
 
     static char* mCutNameList[7];
     static cutFunc mCutList[7];
diff --git a/include/d/actor/d_a_npc_kyury.h b/include/d/actor/d_a_npc_kyury.h
index 428d13a7b5..98d87398e1 100644
--- a/include/d/actor/d_a_npc_kyury.h
+++ b/include/d/actor/d_a_npc_kyury.h
@@ -9,7 +9,7 @@ struct daNpc_Kyury_HIOParam {
 
 class daNpc_Kyury_Param_c {
 public:
-    /* 80B2CD94 */ virtual ~daNpc_Kyury_Param_c() {}
+    virtual ~daNpc_Kyury_Param_c() {}
 
     static const daNpc_Kyury_HIOParam m;
 };
@@ -71,49 +71,49 @@ public:
         /* 0x0C */ MOT_UNK_12 = 12,
     };
 
-    /* 80A600CC */ ~daNpc_Kyury_c();
-    /* 80A60218 */ int create();
-    /* 80A604E4 */ int CreateHeap();
-    /* 80A609A8 */ int Delete();
-    /* 80A609DC */ int Execute();
-    /* 80A609FC */ int Draw();
-    /* 80A60A90 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A60AB0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A60B08 */ u8 getType();
-    /* 80A60B54 */ int isDelete();
-    /* 80A60B9C */ void reset();
-    /* 80A60CF8 */ void afterJntAnm(int);
-    /* 80A60D84 */ void setParam();
-    /* 80A60EB0 */ BOOL checkChangeEvt();
-    /* 80A60FB0 */ void setAfterTalkMotion();
-    /* 80A61060 */ void srchActors();
-    /* 80A610C4 */ BOOL evtTalk();
-    /* 80A61164 */ BOOL evtCutProc();
-    /* 80A6122C */ void action();
-    /* 80A61324 */ void beforeMove();
-    /* 80A613E8 */ void setAttnPos();
-    /* 80A61730 */ void setCollision();
-    /* 80A618A8 */ int drawDbgInfo();
-    /* 80A618B0 */ void drawOtherMdl();
-    /* 80A619B8 */ int selectAction();
-    /* 80A61A00 */ int chkAction(int (daNpc_Kyury_c::*)(void*));
-    /* 80A61A2C */ int setAction(int (daNpc_Kyury_c::*)(void*));
-    /* 80A61AD4 */ int cutConversation(int);
-    /* 80A61ED0 */ int wait(void*);
-    /* 80A62370 */ int talk(void*);
-    /* 80A63720 */ daNpc_Kyury_c(daNpcT_faceMotionAnmData_c const* param_1,
+    ~daNpc_Kyury_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    int chkAction(int (daNpc_Kyury_c::*)(void*));
+    int setAction(int (daNpc_Kyury_c::*)(void*));
+    int cutConversation(int);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Kyury_c(daNpcT_faceMotionAnmData_c const* param_1,
                                  daNpcT_motionAnmData_c const* param_2,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                  int param_4,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
                                  int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
-    /* 80A63800 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80A63808 */ s32 getHeadJointNo() { return 4; }
-    /* 80A63810 */ s32 getNeckJointNo() { return 3; }
-    /* 80A63818 */ s32 getBackboneJointNo() { return 1; }
-    /* 80A63820 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80A63830 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 10; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 10; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_len.h b/include/d/actor/d_a_npc_len.h
index cbd2848ea9..71e659274a 100644
--- a/include/d/actor/d_a_npc_len.h
+++ b/include/d/actor/d_a_npc_len.h
@@ -12,7 +12,7 @@ struct daNpc_Len_HIOParam {
 
 class daNpc_Len_Param_c {
 public:
-    /* 80A68E38 */ virtual ~daNpc_Len_Param_c() {}
+    virtual ~daNpc_Len_Param_c() {}
 
     static const daNpc_Len_HIOParam m;
 };
@@ -47,40 +47,40 @@ public:
     typedef int (daNpc_Len_c::*actionFunc)(void*);
     typedef int (daNpc_Len_c::*cutFunc)(int);
 
-    /* 80A6432C */ ~daNpc_Len_c();
-    /* 80A64478 */ int create();
-    /* 80A64740 */ int CreateHeap();
-    /* 80A64BE0 */ int Delete();
-    /* 80A64C14 */ int Execute();
-    /* 80A64C34 */ int Draw();
-    /* 80A64CC8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A64CE8 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A64D40 */ u8 getType();
-    /* 80A64DB8 */ BOOL isDelete();
-    /* 80A64FBC */ void reset();
-    /* 80A6516C */ void afterJntAnm(int);
-    /* 80A65278 */ void setParam();
-    /* 80A6546C */ BOOL checkChangeEvt();
-    /* 80A6556C */ void setAfterTalkMotion();
-    /* 80A65624 */ void srchActors();
-    /* 80A65710 */ BOOL evtTalk();
-    /* 80A657B0 */ BOOL evtCutProc();
-    /* 80A65878 */ void action();
-    /* 80A65A60 */ void beforeMove();
-    /* 80A65B24 */ void setAttnPos();
-    /* 80A65E28 */ void setCollision();
-    /* 80A65F80 */ int drawDbgInfo();
-    /* 80A65F88 */ int selectAction();
-    /* 80A66004 */ BOOL chkAction(actionFunc);
-    /* 80A66030 */ int setAction(actionFunc);
-    /* 80A660D8 */ BOOL checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32);
-    /* 80A661B4 */ int cutConversationInHotel(int);
-    /* 80A66664 */ int cutHurry(int);
-    /* 80A668B8 */ int cutTakeWoodStatue(int);
-    /* 80A66C74 */ int wait(void*);
-    /* 80A6736C */ int patrol(void*);
-    /* 80A67794 */ int talk(void*);
-    /* 80A68D00 */ daNpc_Len_c(
+    ~daNpc_Len_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    int setAction(actionFunc);
+    BOOL checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32);
+    int cutConversationInHotel(int);
+    int cutHurry(int);
+    int cutTakeWoodStatue(int);
+    int wait(void*);
+    int patrol(void*);
+    int talk(void*);
+    daNpc_Len_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -90,15 +90,15 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80A68DE0 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80A68DE8 */ s32 getHeadJointNo() { return 4; }
-    /* 80A68DF0 */ s32 getNeckJointNo() { return 3; }
-    /* 80A68DF8 */ s32 getBackboneJointNo() { return 1; }
-    /* 80A68E00 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80A68E10 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 9; }
-    /* 80A68E20 */ s32 getFootLJointNo() { return 29; }
-    /* 80A68E28 */ s32 getFootRJointNo() { return 32; }
-    /* 80A68E30 */ BOOL chkXYItems() { return TRUE; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 9; }
+    s32 getFootLJointNo() { return 29; }
+    s32 getFootRJointNo() { return 32; }
+    BOOL chkXYItems() { return TRUE; }
 
     static char* mCutNameList[4];
     static cutFunc mCutList[4];
diff --git a/include/d/actor/d_a_npc_lf.h b/include/d/actor/d_a_npc_lf.h
index 771a3dcdae..73f66c286f 100644
--- a/include/d/actor/d_a_npc_lf.h
+++ b/include/d/actor/d_a_npc_lf.h
@@ -4,8 +4,8 @@
 #include "d/actor/d_a_npc.h"
 
 struct lf_s {
-    /* 80A6A8A4 */ ~lf_s();
-    /* 80A6A8E0 */ lf_s();
+    ~lf_s();
+    lf_s();
 
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz mPos;
@@ -34,8 +34,8 @@ struct lf_s {
 
 class daNPC_LF_HIO_c {
 public:
-    /* 80A69B6C */ daNPC_LF_HIO_c();
-    /* 80A6A8E4 */ virtual ~daNPC_LF_HIO_c();
+    daNPC_LF_HIO_c();
+    virtual ~daNPC_LF_HIO_c();
 
 public:
     /* 0x04 */ s8 field_0x04;
diff --git a/include/d/actor/d_a_npc_lud.h b/include/d/actor/d_a_npc_lud.h
index f70d1b6352..1adad66e20 100644
--- a/include/d/actor/d_a_npc_lud.h
+++ b/include/d/actor/d_a_npc_lud.h
@@ -10,7 +10,7 @@ struct daNpc_Lud_HIOParam {
 
 class daNpc_Lud_Param_c {
 public:
-    /* 80A6FD10 */ virtual ~daNpc_Lud_Param_c() {}
+    virtual ~daNpc_Lud_Param_c() {}
 
     static const daNpc_Lud_HIOParam m;
 };
@@ -44,48 +44,48 @@ public:
     typedef int (daNpc_Lud_c::*actionFunc)(void*);
     typedef int (daNpc_Lud_c::*cutFunc)(int);
 
-    /* 80A6ABAC */ ~daNpc_Lud_c();
-    /* 80A6ACF4 */ int create();
-    /* 80A6AFA8 */ int CreateHeap();
-    /* 80A6B5FC */ int Delete();
-    /* 80A6B630 */ int Execute();
-    /* 80A6B650 */ int Draw();
-    /* 80A6B6E4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A6B704 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A6B75C */ u8 getType();
-    /* 80A6B7CC */ BOOL isDelete();
-    /* 80A6B954 */ void reset();
-    /* 80A6BB1C */ void afterJntAnm(int);
-    /* 80A6BBA8 */ void setParam();
-    /* 80A6BD44 */ BOOL checkChangeEvt();
-    /* 80A6BE6C */ void setAfterTalkMotion();
-    /* 80A6BEE4 */ void srchActors();
-    /* 80A6BFA4 */ BOOL evtTalk();
-    /* 80A6C044 */ BOOL evtCutProc();
-    /* 80A6C10C */ void action();
-    /* 80A6C2E4 */ void beforeMove();
-    /* 80A6C3A8 */ void setAttnPos();
-    /* 80A6C8EC */ void setCollision();
-    /* 80A6CA9C */ int drawDbgInfo();
-    /* 80A6CAA4 */ void drawOtherMdl();
-    /* 80A6CC2C */ bool setBowlAnm(int, int, f32);
-    /* 80A6CCFC */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80A6CD30 */ int selectAction();
-    /* 80A6CDF4 */ BOOL chkAction(actionFunc);
-    /* 80A6CE20 */ int setAction(actionFunc);
-    /* 80A6CEC8 */ void mop(int, int);
-    /* 80A6D01C */ int cutHurry(int);
-    /* 80A6D160 */ int cutConversationInHotel(int);
-    /* 80A6D450 */ int cutConversationAboutDeathMt(int);
-    /* 80A6D708 */ int cutConversationAboutGoron(int);
-    /* 80A6D998 */ int cutNurse(int);
-    /* 80A6DC48 */ int cutClothTry(int);
-    /* 80A6DCE8 */ int cutThankYou(int);
-    /* 80A6DE14 */ int wait(void*);
-    /* 80A6E32C */ int nurse(void*);
-    /* 80A6E6EC */ int giveSoup(void*);
-    /* 80A6E7EC */ int talk(void*);
-    /* 80A6FC04 */ daNpc_Lud_c(
+    ~daNpc_Lud_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool setBowlAnm(int, int, f32);
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    int setAction(actionFunc);
+    void mop(int, int);
+    int cutHurry(int);
+    int cutConversationInHotel(int);
+    int cutConversationAboutDeathMt(int);
+    int cutConversationAboutGoron(int);
+    int cutNurse(int);
+    int cutClothTry(int);
+    int cutThankYou(int);
+    int wait(void*);
+    int nurse(void*);
+    int giveSoup(void*);
+    int talk(void*);
+    daNpc_Lud_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -95,12 +95,12 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80A6FCD0 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80A6FCD8 */ s32 getHeadJointNo() { return 4; }
-    /* 80A6FCE0 */ s32 getNeckJointNo() { return 3; }
-    /* 80A6FCE8 */ s32 getBackboneJointNo() { return 1; }
-    /* 80A6FCF0 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
-    /* 80A6FD00 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 10; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
+    BOOL checkRemoveJoint(int param_0) { return param_0 == 10; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_maro.h b/include/d/actor/d_a_npc_maro.h
index e5d8fb8024..e2330b059f 100644
--- a/include/d/actor/d_a_npc_maro.h
+++ b/include/d/actor/d_a_npc_maro.h
@@ -38,65 +38,65 @@ public:
         TYPE_16,
     };
 
-    /* 8055B58C */ ~daNpc_Maro_c();
-    /* 8055B6E0 */ int create();
-    /* 8055B9A8 */ int CreateHeap();
-    /* 8055BDE8 */ int Delete();
-    /* 8055BE1C */ int Execute();
-    /* 8055BF0C */ int Draw();
-    /* 8055BFA0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8055BFC0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 8055C018 */ static void* srchArrow(void*, void*);
-    /* 8055C0B4 */ fopAc_ac_c* getArrowP();
-    /* 8055C1AC */ static void* srchItaMato(void*, void*);
-    /* 8055C248 */ fopAc_ac_c* getItaMatoP(int);
-    /* 8055C330 */ u8 getType();
-    /* 8055C3E0 */ int isDelete();
-    /* 8055C614 */ void reset();
-    /* 8055C834 */ void afterJntAnm(int);
-    /* 8055C8B0 */ void setParam();
-    /* 8055CB14 */ BOOL checkChangeEvt();
-    /* 8055CC9C */ BOOL evtEndProc();
-    /* 8055CCD8 */ void setAfterTalkMotion();
-    /* 8055CD74 */ void srchActors();
-    /* 8055D0D8 */ BOOL evtTalk();
-    /* 8055D1F4 */ BOOL evtCutProc();
-    /* 8055D368 */ void action();
-    /* 8055D5C4 */ void beforeMove();
-    /* 8055D688 */ void setAttnPos();
-    /* 8055D918 */ void setCollision();
-    /* 8055DA70 */ BOOL drawDbgInfo();
-    /* 8055DA78 */ void drawOtherMdl();
-    /* 8055DAD8 */ daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
-    /* 8055DB64 */ daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
-    /* 8055DBF0 */ int selectAction();
-    /* 8055DD08 */ int chkAction(int (daNpc_Maro_c::*)(void*));
-    /* 8055DD34 */ int setAction(int (daNpc_Maro_c::*)(void*));
-    /* 8055DDDC */ int cutConversationAboutPachinko(int);
-    /* 8055DF7C */ int cutConversationAboutWoodSwd(int);
-    /* 8055E124 */ int cutSwdTutorial(int);
-    /* 8055E414 */ int cutHail(int);
-    /* 8055E578 */ int cutFindMonkey(int);
-    /* 8055E968 */ int cutGiveMeWoodSwd(int);
-    /* 8055ECF4 */ int cutGetWoodSwd(int);
-    /* 8055F508 */ int cutConversationWithMaro(int);
-    /* 8055F634 */ int cutCacaricoConversation(int);
-    /* 8055F82C */ int cutSurprise(int);
-    /* 8055FAF0 */ int cutArrowTutorial(int);
-    /* 805611E0 */ int cutBokinTalk(int);
-    /* 80561328 */ int cutMarosWhisper(int);
-    /* 80561614 */ int cutTagPush1(int);
-    /* 8056178C */ int cutNotGonnaLet(int);
-    /* 80561E70 */ int cutTalkToKakashi(int);
-    /* 80562174 */ int wait(void*);
-    /* 805629A4 */ int swdTutorial(void*);
-    /* 80562B14 */ int talk_withTaro(void*);
-    /* 80562CA4 */ int choccai(void*);
-    /* 80562EC8 */ int tend(void*);
-    /* 8056319C */ int arrowTutorial(void*);
-    /* 8056342C */ int talk(void*);
-    /* 80563660 */ int shop(void*);
-    /* 805648A4 */ daNpc_Maro_c(
+    ~daNpc_Maro_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchArrow(void*, void*);
+    fopAc_ac_c* getArrowP();
+    static void* srchItaMato(void*, void*);
+    fopAc_ac_c* getItaMatoP(int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    BOOL evtEndProc();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    BOOL drawDbgInfo();
+    void drawOtherMdl();
+    daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
+    daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
+    int selectAction();
+    int chkAction(int (daNpc_Maro_c::*)(void*));
+    int setAction(int (daNpc_Maro_c::*)(void*));
+    int cutConversationAboutPachinko(int);
+    int cutConversationAboutWoodSwd(int);
+    int cutSwdTutorial(int);
+    int cutHail(int);
+    int cutFindMonkey(int);
+    int cutGiveMeWoodSwd(int);
+    int cutGetWoodSwd(int);
+    int cutConversationWithMaro(int);
+    int cutCacaricoConversation(int);
+    int cutSurprise(int);
+    int cutArrowTutorial(int);
+    int cutBokinTalk(int);
+    int cutMarosWhisper(int);
+    int cutTagPush1(int);
+    int cutNotGonnaLet(int);
+    int cutTalkToKakashi(int);
+    int wait(void*);
+    int swdTutorial(void*);
+    int talk_withTaro(void*);
+    int choccai(void*);
+    int tend(void*);
+    int arrowTutorial(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_Maro_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -108,12 +108,12 @@ public:
                    i_arcNames) {
         OS_REPORT("|%06d:%x|daNpc_Maro_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80564970 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80564978 */ s32 getHeadJointNo() { return 4; }
-    /* 80564980 */ s32 getNeckJointNo() { return 3; }
-    /* 80564988 */ s32 getBackboneJointNo() { return 1; }
-    /* 80564990 */ BOOL checkChangeJoint(int arg0) { return arg0 == 4; };
-    /* 805649A0 */ BOOL checkRemoveJoint(int arg0) { return arg0 == 6; };
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int arg0) { return arg0 == 4; };
+    BOOL checkRemoveJoint(int arg0) { return arg0 == 6; };
 
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
 
@@ -186,7 +186,7 @@ struct daNpc_Maro_HIOParam {
 
 class daNpc_Maro_Param_c {
 public:
-    /* 805649B0 */ virtual ~daNpc_Maro_Param_c() {}
+    virtual ~daNpc_Maro_Param_c() {}
 
     static const daNpc_Maro_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_midp.h b/include/d/actor/d_a_npc_midp.h
index 05117faf9a..9c358564b5 100644
--- a/include/d/actor/d_a_npc_midp.h
+++ b/include/d/actor/d_a_npc_midp.h
@@ -22,7 +22,7 @@ class daNpc_midP_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_midP_Param_c {
 public:
-    /* 80A73954 */ virtual ~daNpc_midP_Param_c() {}
+    virtual ~daNpc_midP_Param_c() {}
 
     static const daNpc_midP_HIOParam m;
 };
@@ -85,47 +85,47 @@ public:
         TYPE_0,
         TYPE_1,
     };
-    /* 80A70C6C */ ~daNpc_midP_c();
-    /* 80A70D90 */ int create();
-    /* 80A71074 */ int CreateHeap();
-    /* 80A714BC */ int Delete();
-    /* 80A714F0 */ int Execute();
-    /* 80A71510 */ int Draw();
-    /* 80A715D4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A715F4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A7164C */ u8 getType();
-    /* 80A7166C */ int isDelete();
-    /* 80A7168C */ void reset();
-    /* 80A717D4 */ void afterJntAnm(int);
-    /* 80A71860 */ BOOL ctrlBtk();
-    /* 80A7199C */ void setParam();
-    /* 80A71A98 */ void setAfterTalkMotion();
-    /* 80A71AF8 */ void srchActors();
-    /* 80A71AFC */ BOOL evtTalk();
-    /* 80A71BFC */ BOOL evtCutProc();
-    /* 80A71CC4 */ void action();
-    /* 80A71DB0 */ void beforeMove();
-    /* 80A71E28 */ void setAttnPos();
-    /* 80A72064 */ void setCollision();
-    /* 80A7216C */ int drawDbgInfo();
-    /* 80A72174 */ void drawGhost();
-    /* 80A721E0 */ int selectAction();
-    /* 80A72228 */ int chkAction(int (daNpc_midP_c::*)(void*));
-    /* 80A72254 */ int setAction(int (daNpc_midP_c::*)(void*));
-    /* 80A722FC */ int wait(void*);
-    /* 80A72548 */ int talk(void*);
-    /* 80A737D0 */ daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_midP_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL ctrlBtk();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawGhost();
+    int selectAction();
+    int chkAction(int (daNpc_midP_c::*)(void*));
+    int setAction(int (daNpc_midP_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    daNpc_midP_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
-    /* 80A7390C */ u16 getEyeballRMaterialNo() { return 3; }
-    /* 80A73914 */ u16 getEyeballLMaterialNo() { return 2; }
-    /* 80A7391C */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80A73924 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80A7392C */ s32 getBackboneJointNo() { return JNT_BACKBONE2; }
-    /* 80A73934 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80A73944 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    u16 getEyeballRMaterialNo() { return 3; }
+    u16 getEyeballLMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE2; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_moi.h b/include/d/actor/d_a_npc_moi.h
index 5b7e07abc9..a855bf6543 100644
--- a/include/d/actor/d_a_npc_moi.h
+++ b/include/d/actor/d_a_npc_moi.h
@@ -24,7 +24,7 @@ struct daNpc_Moi_HIOParam {
 
 class daNpc_Moi_Param_c {
 public:
-    /* 80A7AE84 */ virtual ~daNpc_Moi_Param_c() {};
+    virtual ~daNpc_Moi_Param_c() {};
 
     static const daNpc_Moi_HIOParam m;
 };
@@ -68,61 +68,61 @@ public:
         TYPE_6,
     };
 
-    /* 80A73F4C */ ~daNpc_Moi_c();
-    /* 80A74150 */ int create();
-    /* 80A74474 */ int CreateHeap();
-    /* 80A749F8 */ int Delete();
-    /* 80A74A2C */ int Execute();
-    /* 80A74A4C */ int Draw();
-    /* 80A74B80 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A74BA0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A74BF8 */ u8 getType();
-    /* 80A74C6C */ BOOL isDelete();
-    /* 80A74D8C */ void reset();
-    /* 80A7513C */ BOOL chkMoiN();
-    /* 80A75160 */ void afterJntAnm(int);
-    /* 80A751E4 */ void setParam();
-    /* 80A75460 */ BOOL checkChangeEvt();
-    /* 80A75514 */ void setAfterTalkMotion();
-    /* 80A755C8 */ void srchActors();
-    /* 80A75664 */ BOOL evtTalk();
-    /* 80A75704 */ BOOL evtCutProc();
-    /* 80A757CC */ void action();
-    /* 80A759F4 */ void beforeMove();
-    /* 80A75AB8 */ void setAttnPos();
-    /* 80A75E68 */ void setCollision();
-    /* 80A760E0 */ int drawDbgInfo();
-    /* 80A760E8 */ void drawOtherMdl();
-    /* 80A762A8 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80A762CC */ void changeAnm(int*, int*);
-    /* 80A7633C */ void changeBck(int*, int*);
-    /* 80A76384 */ void changeBtp(int*, int*);
-    /* 80A7643C */ void changeBtk(int*, int*);
-    /* 80A764B0 */ int selectAction();
-    /* 80A765CC */ BOOL chkAction(int (daNpc_Moi_c::*)(void*));
-    /* 80A765F8 */ int setAction(int (daNpc_Moi_c::*)(void*));
-    /* 80A766A0 */ BOOL chkPlayerGetWoodShield();
-    /* 80A766DC */ void setSSlash(int);
-    /* 80A76888 */ BOOL chkPullOutSw();
-    /* 80A768FC */ void pullOutSw();
-    /* 80A76954 */ BOOL chkSetInSw();
-    /* 80A769C8 */ void setInSw();
-    /* 80A76A20 */ void setSwAT();
-    /* 80A76AFC */ void torch();
-    /* 80A76C7C */ int injuryCheck();
-    /* 80A76E10 */ int injuryTurn(cXyz);
-    /* 80A76F3C */ int injuryWalk();
-    /* 80A770FC */ int poise();
-    /* 80A77740 */ int cutDeliveredSw(int);
-    /* 80A77BA0 */ int cutAppearanceMoi(int);
-    /* 80A7838C */ int cutConversationWithUri(int);
-    /* 80A785FC */ int cutFindWolf(int);
-    /* 80A789D8 */ int wait(void*);
-    /* 80A78E0C */ int walk(void*);
-    /* 80A78FF4 */ int walkOnEggshell(void*);
-    /* 80A794C0 */ int rest(void*);
-    /* 80A79608 */ int talk(void*);
-    /* 80A7AC88 */ daNpc_Moi_c(
+    ~daNpc_Moi_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    BOOL chkMoiN();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool afterSetMotionAnm(int, int, f32, int);
+    void changeAnm(int*, int*);
+    void changeBck(int*, int*);
+    void changeBtp(int*, int*);
+    void changeBtk(int*, int*);
+    int selectAction();
+    BOOL chkAction(int (daNpc_Moi_c::*)(void*));
+    int setAction(int (daNpc_Moi_c::*)(void*));
+    BOOL chkPlayerGetWoodShield();
+    void setSSlash(int);
+    BOOL chkPullOutSw();
+    void pullOutSw();
+    BOOL chkSetInSw();
+    void setInSw();
+    void setSwAT();
+    void torch();
+    int injuryCheck();
+    int injuryTurn(cXyz);
+    int injuryWalk();
+    int poise();
+    int cutDeliveredSw(int);
+    int cutAppearanceMoi(int);
+    int cutConversationWithUri(int);
+    int cutFindWolf(int);
+    int wait(void*);
+    int walk(void*);
+    int walkOnEggshell(void*);
+    int rest(void*);
+    int talk(void*);
+    daNpc_Moi_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -132,20 +132,20 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80A7AE0C */ u16 getEyeballMaterialNo() {
+    u16 getEyeballMaterialNo() {
         if (chkMoiN()) {
             return 4;
         } else {
             return 2;
         }
     }
-    /* 80A7AE3C */ s32 getHeadJointNo() { return 4; }
-    /* 80A7AE44 */ s32 getNeckJointNo() { return 3; }
-    /* 80A7AE4C */ s32 getBackboneJointNo() { return 1; }
-    /* 80A7AE54 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
-    /* 80A7AE64 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
-    /* 80A7AE74 */ s32 getFootLJointNo() { return 22; }
-    /* 80A7AE7C */ s32 getFootRJointNo() { return 25; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
+    BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
+    s32 getFootLJointNo() { return 22; }
+    s32 getFootRJointNo() { return 25; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_moir.h b/include/d/actor/d_a_npc_moir.h
index d3a10e6447..59f1d27aa7 100644
--- a/include/d/actor/d_a_npc_moir.h
+++ b/include/d/actor/d_a_npc_moir.h
@@ -21,7 +21,7 @@ struct daNpcMoiR_HIOParam {
 
 class daNpcMoiR_Param_c {
 public:
-    /* 80A83240 */ virtual ~daNpcMoiR_Param_c() {}
+    virtual ~daNpcMoiR_Param_c() {}
 
     static daNpcMoiR_HIOParam const m;
 };
@@ -143,43 +143,43 @@ public:
         /* 0x2 */ MODE_2,
     };
 
-    /* 80A7C16C */ daNpcMoiR_c();
-    /* 80A7C380 */ ~daNpcMoiR_c();
-    /* 80A7C580 */ cPhs__Step Create();
-    /* 80A7C978 */ int CreateHeap();
-    /* 80A7CE48 */ int Delete();
-    /* 80A7CE7C */ int Execute();
-    /* 80A7CEA0 */ int Draw();
-    /* 80A7CEFC */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80A7D0CC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A7D0EC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A7D138 */ inline bool setExpressionAnm(int, bool);
-    /* 80A7D394 */ inline bool setExpressionBtp(int);
-    /* 80A7D474 */ void setMotionAnm(int, f32);
-    /* 80A7D5C4 */ void reset();
-    /* 80A7D73C */ inline void setWaitAction();
-    /* 80A7D934 */ bool wait_type0(void*);
-    /* 80A7DD94 */ void setMotion(int, f32, int);
-    /* 80A7DDD8 */ void setExpression(int, f32);
-    /* 80A7DE04 */ bool wait_type1(void*);
-    /* 80A7E668 */ bool wait_type2(void*);
-    /* 80A7E8C0 */ bool talk(void*);
-    /* 80A7EFBC */ BOOL multiTalk(void*);
-    /* 80A7F40C */ bool fight(void*);
-    /* 80A7F9AC */ bool demo(void*);
-    /* 80A7FEE8 */ bool leave(void*);
-    /* 80A802C4 */ inline BOOL EvCut_Introduction(int);
-    /* 80A803A0 */ inline BOOL EvCut_Appear(int);
-    /* 80A8081C */ inline BOOL EvCut_Appear2(int);
-    /* 80A810FC */ inline void setParam();
-    /* 80A81274 */ inline BOOL main();
-    /* 80A815D4 */ inline void checkHeadGear();
-    /* 80A818B4 */ inline void playMotion();
-    /* 80A8210C */ inline BOOL ctrlBtk();
-    /* 80A821E0 */ inline void setAttnPos();
-    /* 80A825A0 */ inline void lookat();
-    /* 80A82878 */ inline void drawOtherMdls();
-    /* 80A82900 */ inline BOOL drawDbgInfo();
+    daNpcMoiR_c();
+    ~daNpcMoiR_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    inline bool setExpressionAnm(int, bool);
+    inline bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void reset();
+    inline void setWaitAction();
+    bool wait_type0(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    bool wait_type1(void*);
+    bool wait_type2(void*);
+    bool talk(void*);
+    BOOL multiTalk(void*);
+    bool fight(void*);
+    bool demo(void*);
+    bool leave(void*);
+    inline BOOL EvCut_Introduction(int);
+    inline BOOL EvCut_Appear(int);
+    inline BOOL EvCut_Appear2(int);
+    inline void setParam();
+    inline BOOL main();
+    inline void checkHeadGear();
+    inline void playMotion();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline void drawOtherMdls();
+    inline BOOL drawDbgInfo();
 
     MtxP getHandRMtx() { return mAnm_p->getModel()->getAnmMtx(17); }
 
diff --git a/include/d/actor/d_a_npc_myna2.h b/include/d/actor/d_a_npc_myna2.h
index 837689eec1..76e78dd9e2 100644
--- a/include/d/actor/d_a_npc_myna2.h
+++ b/include/d/actor/d_a_npc_myna2.h
@@ -16,44 +16,44 @@ public:
     typedef BOOL (daNpc_myna2_c::*ActionFn)(void*);
     typedef BOOL (daNpc_myna2_c::*EventFn)(int);
 
-    /* 80A83E8C */ daNpc_myna2_c();
-    /* 80A840A0 */ virtual ~daNpc_myna2_c();
-    /* 80A842C8 */ int create();
-    /* 80A845AC */ int CreateHeap();
-    /* 80A846E0 */ int Delete();
-    /* 80A84714 */ int Execute();
-    /* 80A84734 */ int Draw();
-    /* 80A847A8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A8503C */ u8 getTypeFromParam();
-    /* 80A85094 */ int isDelete();
-    /* 80A85160 */ void reset();
-    /* 80A85358 */ void playMotion();
-    /* 80A855E8 */ int chkAction(int (daNpc_myna2_c::*)(void*));
-    /* 80A85614 */ int setAction(int (daNpc_myna2_c::*)(void*));
-    /* 80A856BC */ int selectAction();
-    /* 80A857B0 */ void doNormalAction(int);
-    /* 80A85894 */ BOOL doEvent();
-    /* 80A85BA4 */ void setLookMode(int);
-    /* 80A85BC8 */ int wait(void*);
-    /* 80A85C60 */ int waitHovering(void*);
-    /* 80A86194 */ int waitFailure(void*);
-    /* 80A862BC */ int waitGoal(void*);
-    /* 80A86400 */ int talk(void*);
-    /* 80A865FC */ int test(void*);
-    /* 80A866B0 */ int ECut_firstTalk(int);
-    /* 80A8684C */ int ECut_gameFailure(int);
-    /* 80A86A0C */ int ECut_gameGoal(int);
-    /* 80A86BEC */ int ECut_gameGoalSuccess(int);
-    /* 80A86E8C */ void calcHovering(int, int);
+    daNpc_myna2_c();
+    virtual ~daNpc_myna2_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getTypeFromParam();
+    int isDelete();
+    void reset();
+    void playMotion();
+    int chkAction(int (daNpc_myna2_c::*)(void*));
+    int setAction(int (daNpc_myna2_c::*)(void*));
+    int selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    int wait(void*);
+    int waitHovering(void*);
+    int waitFailure(void*);
+    int waitGoal(void*);
+    int talk(void*);
+    int test(void*);
+    int ECut_firstTalk(int);
+    int ECut_gameFailure(int);
+    int ECut_gameGoal(int);
+    int ECut_gameGoalSuccess(int);
+    void calcHovering(int, int);
 
-    /* 80A847C8 */ virtual void setParam();
-    /* 80A848B4 */ virtual BOOL main();
-    /* 80A84B64 */ virtual void setAttnPos();
-    /* 80A84DAC */ virtual bool setExpressionBtp(int);
-    /* 80A84EAC */ virtual void setMotionAnm(int, f32);
-    /* 80A84FEC */ virtual void setMotion(int, f32, int);
-    /* 80A85030 */ virtual BOOL drawDbgInfo();
-    /* 80A85038 */ virtual void drawOtherMdls();
+    virtual void setParam();
+    virtual BOOL main();
+    virtual void setAttnPos();
+    virtual bool setExpressionBtp(int);
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual BOOL drawDbgInfo();
+    virtual void drawOtherMdls();
 
     int getType() { return mType; }
 
@@ -96,7 +96,7 @@ struct daNpc_myna2_HIOParam {
 
 class daNpc_myna2_Param_c {
 public:
-    /* 80A883C8 */ virtual ~daNpc_myna2_Param_c() {}
+    virtual ~daNpc_myna2_Param_c() {}
 
     static const daNpc_myna2_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_ne.h b/include/d/actor/d_a_npc_ne.h
index cec5b0c57d..10474cc828 100644
--- a/include/d/actor/d_a_npc_ne.h
+++ b/include/d/actor/d_a_npc_ne.h
@@ -77,7 +77,7 @@ public:
         LOOK_NONE = 3,
     };
 
-    /* 80A92118 */ npc_ne_class();
+    npc_ne_class();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ u8 mBehavior;
@@ -196,8 +196,8 @@ STATIC_ASSERT(sizeof(npc_ne_class) == 0xCC4);
 
 class daNpc_Ne_HIO_c {
 public:
-    /* 80A88CCC */ daNpc_Ne_HIO_c();
-    /* 80A92374 */ virtual ~daNpc_Ne_HIO_c() {}
+    daNpc_Ne_HIO_c();
+    virtual ~daNpc_Ne_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mScale;
diff --git a/include/d/actor/d_a_npc_pachi_besu.h b/include/d/actor/d_a_npc_pachi_besu.h
index 94bdaeb204..0c6bfad3a7 100644
--- a/include/d/actor/d_a_npc_pachi_besu.h
+++ b/include/d/actor/d_a_npc_pachi_besu.h
@@ -22,7 +22,7 @@ class daNpc_Pachi_Besu_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_Pachi_Besu_Param_c {
 public:
-    /* 80A96A00 */ virtual ~daNpc_Pachi_Besu_Param_c() {}
+    virtual ~daNpc_Pachi_Besu_Param_c() {}
 
     static daNpc_Pachi_Besu_HIOParam const m;
 };
@@ -32,72 +32,72 @@ public:
     typedef BOOL (daNpc_Pachi_Besu_c::*actionFunc)(void*);
     typedef BOOL (daNpc_Pachi_Besu_c::*cutFunc)(int);
 
-    /* 80A92D6C */ ~daNpc_Pachi_Besu_c();
-    /* 80A92EA4 */ cPhs__Step create();
-    /* 80A9317C */ int CreateHeap();
-    /* 80A93608 */ int Delete();
-    /* 80A9363C */ int Execute();
-    /* 80A9365C */ int Draw();
-    /* 80A936F0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A93710 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A93768 */ u8 getType();
-    /* 80A93788 */ BOOL isDelete();
-    /* 80A937A8 */ void reset();
-    /* 80A93910 */ void afterJntAnm(int);
-    /* 80A9398C */ void setParam();
-    /* 80A93A88 */ void afterMoved();
-    /* 80A93D70 */ BOOL checkChangeEvt();
-    /* 80A93D78 */ void setAfterTalkMotion();
-    /* 80A93E24 */ void srchActors();
-    /* 80A93EAC */ BOOL evtTalk();
-    /* 80A93FB0 */ BOOL evtCutProc();
-    /* 80A94078 */ void action();
-    /* 80A94220 */ void beforeMove();
-    /* 80A94298 */ void setAttnPos();
-    /* 80A944F0 */ void setCollision();
-    /* 80A94620 */ int drawDbgInfo();
-    /* 80A94628 */ BOOL selectAction();
-    /* 80A946A4 */ BOOL chkAction(actionFunc);
-    /* 80A946D0 */ BOOL setAction(actionFunc);
-    /* 80A94778 */ BOOL wait(void*);
-    /* 80A949EC */ BOOL talk(void*);
+    ~daNpc_Pachi_Besu_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void afterMoved();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL wait(void*);
+    BOOL talk(void*);
     #ifdef DEBUG
     BOOL test(void*);
     #endif
-    /* 80A94A7C */ BOOL _turn_to_link(s16);
-    /* 80A94B24 */ BOOL _turn_pos(cXyz const&);
-    /* 80A94AC8 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A94B64 */ BOOL cutTutrialBegin(int);
-    /* 80A94BF8 */ BOOL _cutTutrialBegin_Init(int const&);
-    /* 80A94C00 */ BOOL _cutTutrialBegin_Main(int const&);
-    /* 80A94C08 */ BOOL cutTutrialBegin_Skip(int);
-    /* 80A94C9C */ BOOL _cutTutrialBegin_Skip_Init(int const&);
-    /* 80A94CA4 */ BOOL _cutTutrialBegin_Skip_Main(int const&);
-    /* 80A94CAC */ BOOL cutTutrialClear(int);
-    /* 80A94D40 */ BOOL _cutTutrialClear_Init(int const&);
-    /* 80A94E38 */ BOOL _cutTutrialClear_Main(int const&);
-    /* 80A94ECC */ BOOL cutTalk(int);
-    /* 80A94F60 */ BOOL _cutTalk_Init(int const&);
-    /* 80A94F68 */ BOOL _cutTalk_Main(int const&);
-    /* 80A94FC4 */ BOOL cutTalk2(int);
-    /* 80A95058 */ BOOL _cutTalk2_Init(int const&);
-    /* 80A95060 */ BOOL _cutTalk2_Main(int const&);
-    /* 80A950BC */ BOOL cut1stHit_KakasiBody(int);
-    /* 80A95150 */ BOOL _cut1stHit_KakasiBody_Init(int const&);
-    /* 80A951DC */ BOOL _cut1stHit_KakasiBody_Main(int const&);
-    /* 80A95270 */ BOOL cutTutrialSelectGiveUp(int);
-    /* 80A95304 */ BOOL _cutTutrialSelectGiveUp_Init(int const&);
-    /* 80A9530C */ BOOL _cutTutrialSelectGiveUp_Main(int const&);
-    /* 80A95408 */ BOOL cutTutrialGiveUp(int);
-    /* 80A9549C */ BOOL _cutTutrialGiveUp_Init(int const&);
-    /* 80A954A4 */ BOOL _cutTutrialGiveUp_Main(int const&);
-    /* 80A954E0 */ BOOL cutTutrialContinue(int);
-    /* 80A95574 */ BOOL _cutTutrialContinue_Init(int const&);
-    /* 80A9557C */ BOOL _cutTutrialContinue_Main(int const&);
-    /* 80A955B8 */ BOOL cutTutrialCaution(int);
-    /* 80A9564C */ BOOL _cutTutrialCaution_Init(int const&);
-    /* 80A95654 */ BOOL _cutTutrialCaution_Main(int const&);
-    /* 80A968F4 */ daNpc_Pachi_Besu_c(
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL cutTutrialBegin(int);
+    BOOL _cutTutrialBegin_Init(int const&);
+    BOOL _cutTutrialBegin_Main(int const&);
+    BOOL cutTutrialBegin_Skip(int);
+    BOOL _cutTutrialBegin_Skip_Init(int const&);
+    BOOL _cutTutrialBegin_Skip_Main(int const&);
+    BOOL cutTutrialClear(int);
+    BOOL _cutTutrialClear_Init(int const&);
+    BOOL _cutTutrialClear_Main(int const&);
+    BOOL cutTalk(int);
+    BOOL _cutTalk_Init(int const&);
+    BOOL _cutTalk_Main(int const&);
+    BOOL cutTalk2(int);
+    BOOL _cutTalk2_Init(int const&);
+    BOOL _cutTalk2_Main(int const&);
+    BOOL cut1stHit_KakasiBody(int);
+    BOOL _cut1stHit_KakasiBody_Init(int const&);
+    BOOL _cut1stHit_KakasiBody_Main(int const&);
+    BOOL cutTutrialSelectGiveUp(int);
+    BOOL _cutTutrialSelectGiveUp_Init(int const&);
+    BOOL _cutTutrialSelectGiveUp_Main(int const&);
+    BOOL cutTutrialGiveUp(int);
+    BOOL _cutTutrialGiveUp_Init(int const&);
+    BOOL _cutTutrialGiveUp_Main(int const&);
+    BOOL cutTutrialContinue(int);
+    BOOL _cutTutrialContinue_Init(int const&);
+    BOOL _cutTutrialContinue_Main(int const&);
+    BOOL cutTutrialCaution(int);
+    BOOL _cutTutrialCaution_Init(int const&);
+    BOOL _cutTutrialCaution_Main(int const&);
+    daNpc_Pachi_Besu_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -109,12 +109,12 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 80A969C0 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80A969C8 */ s32 getHeadJointNo() { return 4; }
-    /* 80A969D0 */ s32 getNeckJointNo() { return 3; }
-    /* 80A969D8 */ s32 getBackboneJointNo() { return 1; }
-    /* 80A969E0 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80A969F0 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
 
     u32 getFlowNodeNo() { 
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_pachi_maro.h b/include/d/actor/d_a_npc_pachi_maro.h
index 3dd1bd73c9..781621dcf7 100644
--- a/include/d/actor/d_a_npc_pachi_maro.h
+++ b/include/d/actor/d_a_npc_pachi_maro.h
@@ -19,7 +19,7 @@ struct daNpc_Pachi_Maro_HIOParam {
 
 class daNpc_Pachi_Maro_Param_c {
 public:
-    /* 80A9B820 */ virtual ~daNpc_Pachi_Maro_Param_c() {}
+    virtual ~daNpc_Pachi_Maro_Param_c() {}
 
     static daNpc_Pachi_Maro_HIOParam const m;
 };
@@ -76,72 +76,72 @@ public:
     typedef int (daNpc_Pachi_Maro_c::*actionFunc)(void*);
     typedef int (daNpc_Pachi_Maro_c::*cutFunc)(int);
 
-    /* 80A97C8C */ ~daNpc_Pachi_Maro_c();
-    /* 80A97DC4 */ cPhs__Step create();
-    /* 80A9809C */ int CreateHeap();
-    /* 80A984DC */ int Delete();
-    /* 80A98510 */ int Execute();
-    /* 80A98530 */ int Draw();
-    /* 80A985C4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A985E4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A9863C */ u8 getType();
-    /* 80A9865C */ BOOL isDelete();
-    /* 80A9867C */ void reset();
-    /* 80A987F4 */ void afterJntAnm(int);
-    /* 80A98870 */ void setParam();
-    /* 80A9896C */ BOOL checkChangeEvt();
-    /* 80A98974 */ void setAfterTalkMotion();
-    /* 80A98A10 */ void srchActors();
-    /* 80A98A98 */ BOOL evtTalk();
-    /* 80A98B9C */ BOOL evtCutProc();
-    /* 80A98C64 */ void action();
-    /* 80A98DE8 */ void beforeMove();
-    /* 80A98E60 */ void afterMoved();
-    /* 80A98FB4 */ void setAttnPos();
-    /* 80A9928C */ void setCollision();
-    /* 80A99394 */ int drawDbgInfo();
-    /* 80A9939C */ daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
-    /* 80A99428 */ daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
-    /* 80A994B4 */ BOOL selectAction();
-    /* 80A99530 */ BOOL chkAction(actionFunc);
-    /* 80A9955C */ BOOL setAction(actionFunc);
-    /* 80A99604 */ int wait(void*);
-    /* 80A9986C */ int talk(void*);
+    ~daNpc_Pachi_Maro_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
+    daNpcT_motionAnmData_c getMotionAnm(daNpcT_motionAnmData_c);
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
     int test(void*);
-    /* 80A998FC */ BOOL _turn_to_link(s16);
-    /* 80A999A4 */ BOOL _turn_pos(cXyz const&);
-    /* 80A99948 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A999E4 */ BOOL cutTutrialBegin(int);
-    /* 80A99A78 */ BOOL _cutTutrialBegin_Init(int const&);
-    /* 80A99A80 */ BOOL _cutTutrialBegin_Main(int const&);
-    /* 80A99A88 */ BOOL cutTutrialBegin_Skip(int);
-    /* 80A99B1C */ BOOL _cutTutrialBegin_Skip_Init(int const&);
-    /* 80A99B24 */ BOOL _cutTutrialBegin_Skip_Main(int const&);
-    /* 80A99B2C */ BOOL cutTutrialClear(int);
-    /* 80A99BC0 */ BOOL _cutTutrialClear_Init(int const&);
-    /* 80A99CB8 */ BOOL _cutTutrialClear_Main(int const&);
-    /* 80A99D4C */ BOOL cutTalk(int);
-    /* 80A99DE0 */ BOOL _cutTalk_Init(int const&);
-    /* 80A99DE8 */ BOOL _cutTalk_Main(int const&);
-    /* 80A99E44 */ BOOL cutTalk2(int);
-    /* 80A99ED8 */ BOOL _cutTalk2_Init(int const&);
-    /* 80A99EE0 */ BOOL _cutTalk2_Main(int const&);
-    /* 80A99F3C */ BOOL cut1stHit_KakasiBody(int);
-    /* 80A99FD0 */ BOOL _cut1stHit_KakasiBody_Init(int const&);
-    /* 80A9A05C */ BOOL _cut1stHit_KakasiBody_Main(int const&);
-    /* 80A9A0F0 */ BOOL cutTutrialSelectGiveUp(int);
-    /* 80A9A184 */ BOOL _cutTutrialSelectGiveUp_Init(int const&);
-    /* 80A9A18C */ BOOL _cutTutrialSelectGiveUp_Main(int const&);
-    /* 80A9A288 */ BOOL cutTutrialGiveUp(int);
-    /* 80A9A31C */ BOOL _cutTutrialGiveUp_Init(int const&);
-    /* 80A9A324 */ BOOL _cutTutrialGiveUp_Main(int const&);
-    /* 80A9A360 */ BOOL cutTutrialContinue(int);
-    /* 80A9A3F4 */ BOOL _cutTutrialContinue_Init(int const&);
-    /* 80A9A3FC */ BOOL _cutTutrialContinue_Main(int const&);
-    /* 80A9A438 */ BOOL cutTutrialCaution(int);
-    /* 80A9A4CC */ BOOL _cutTutrialCaution_Init(int const&);
-    /* 80A9A4D4 */ BOOL _cutTutrialCaution_Main(int const&);
-    /* 80A9B714 */ daNpc_Pachi_Maro_c(
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL cutTutrialBegin(int);
+    BOOL _cutTutrialBegin_Init(int const&);
+    BOOL _cutTutrialBegin_Main(int const&);
+    BOOL cutTutrialBegin_Skip(int);
+    BOOL _cutTutrialBegin_Skip_Init(int const&);
+    BOOL _cutTutrialBegin_Skip_Main(int const&);
+    BOOL cutTutrialClear(int);
+    BOOL _cutTutrialClear_Init(int const&);
+    BOOL _cutTutrialClear_Main(int const&);
+    BOOL cutTalk(int);
+    BOOL _cutTalk_Init(int const&);
+    BOOL _cutTalk_Main(int const&);
+    BOOL cutTalk2(int);
+    BOOL _cutTalk2_Init(int const&);
+    BOOL _cutTalk2_Main(int const&);
+    BOOL cut1stHit_KakasiBody(int);
+    BOOL _cut1stHit_KakasiBody_Init(int const&);
+    BOOL _cut1stHit_KakasiBody_Main(int const&);
+    BOOL cutTutrialSelectGiveUp(int);
+    BOOL _cutTutrialSelectGiveUp_Init(int const&);
+    BOOL _cutTutrialSelectGiveUp_Main(int const&);
+    BOOL cutTutrialGiveUp(int);
+    BOOL _cutTutrialGiveUp_Init(int const&);
+    BOOL _cutTutrialGiveUp_Main(int const&);
+    BOOL cutTutrialContinue(int);
+    BOOL _cutTutrialContinue_Init(int const&);
+    BOOL _cutTutrialContinue_Main(int const&);
+    BOOL cutTutrialCaution(int);
+    BOOL _cutTutrialCaution_Init(int const&);
+    BOOL _cutTutrialCaution_Main(int const&);
+    daNpc_Pachi_Maro_c(
                         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                         daNpcT_motionAnmData_c const* i_motionAnmData,
                         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -155,12 +155,12 @@ public:
                     i_arcNames) {
                         OS_REPORT("|%06d:%x|daNpc_Pachi_Maro_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
-    /* 80A9B7E0 */ u16 getEyeballMaterialNo() { return MAT_MARO_EYBALL_M; }
-    /* 80A9B7E8 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80A9B7F0 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80A9B7F8 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80A9B800 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80A9B810 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    u16 getEyeballMaterialNo() { return MAT_MARO_EYBALL_M; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_pachi_taro.h b/include/d/actor/d_a_npc_pachi_taro.h
index 9bdd8f8141..daccafb1b8 100644
--- a/include/d/actor/d_a_npc_pachi_taro.h
+++ b/include/d/actor/d_a_npc_pachi_taro.h
@@ -18,7 +18,7 @@ struct daNpc_Pachi_Taro_HIOParam {
 
 class daNpc_Pachi_Taro_Param_c {
 public:
-    /* 80AA1598 */ virtual ~daNpc_Pachi_Taro_Param_c() {}
+    virtual ~daNpc_Pachi_Taro_Param_c() {}
 
     static daNpc_Pachi_Taro_HIOParam const m;
 };
@@ -77,88 +77,88 @@ public:
     typedef int (daNpc_Pachi_Taro_c::*actionFunc)(void*);
     typedef int (daNpc_Pachi_Taro_c::*cutFunc)(int);
 
-    /* 80A9C28C */ ~daNpc_Pachi_Taro_c();
-    /* 80A9C3C4 */ cPhs__Step create();
-    /* 80A9C69C */ int CreateHeap();
-    /* 80A9CBD8 */ int Delete();
-    /* 80A9CC0C */ int Execute();
-    /* 80A9CC2C */ int Draw();
-    /* 80A9CCC0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80A9CCE0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80A9CD38 */ u8 getType();
-    /* 80A9CD40 */ BOOL isDelete();
-    /* 80A9CD60 */ void reset();
-    /* 80A9CF10 */ void afterJntAnm(int);
-    /* 80A9CF9C */ void setParam();
-    /* 80A9D098 */ BOOL checkChangeEvt();
-    /* 80A9D0A0 */ void setAfterTalkMotion();
-    /* 80A9D164 */ void srchActors();
-    /* 80A9D27C */ fopAc_ac_c* srchDistTag1();
-    /* 80A9D2A8 */ static void* _srch_DistTag1_main(void*, void*);
-    /* 80A9D310 */ fopAc_ac_c* srchDistTag2();
-    /* 80A9D33C */ static void* _srch_DistTag2_main(void*, void*);
-    /* 80A9D3A4 */ fopAc_ac_c* srchEscapeTag1();
-    /* 80A9D3D0 */ static void* _srch_EscapeTag1_main(void*, void*);
-    /* 80A9D438 */ fopAc_ac_c* srchEscapeTag2();
-    /* 80A9D464 */ static void* _srch_EscapeTag2_main(void*, void*);
-    /* 80A9D4CC */ BOOL evtTalk();
-    /* 80A9D5D0 */ BOOL evtCutProc();
-    /* 80A9D698 */ void action();
-    /* 80A9D840 */ void beforeMove();
-    /* 80A9D8B8 */ void setAttnPos();
-    /* 80A9DB0C */ void setCollision();
-    /* 80A9DC14 */ int drawDbgInfo();
-    /* 80A9DC1C */ void drawOtherMdl();
-    /* 80A9DD24 */ BOOL selectAction();
-    /* 80A9DDA0 */ BOOL chkAction(actionFunc);
-    /* 80A9DDCC */ BOOL setAction(actionFunc);
-    /* 80A9DE74 */ int wait(void*);
-    /* 80A9E154 */ void setMesPat();
-    /* 80A9E224 */ BOOL _turn_to_link(s16);
-    /* 80A9E270 */ BOOL _turn_pos(cXyz const&, s16);
-    /* 80A9E2CC */ BOOL _turn_pos(cXyz const&);
-    /* 80A9E30C */ void talk_cancel();
-    /* 80A9E364 */ void watch_tutrial();
-    /* 80A9E3E4 */ u16 chkDistTag();
-    /* 80A9E458 */ u16 chkEscapeTag();
-    /* 80A9E56C */ u16 chkTarget();
-    /* 80A9E700 */ void clr_tagHit();
-    /* 80A9E778 */ void allTagPosSet(cXyz const&);
-    /* 80A9E80C */ void allLookPosSet(cXyz const&);
-    /* 80A9E8A0 */ int talk(void*);
+    ~daNpc_Pachi_Taro_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    fopAc_ac_c* srchDistTag1();
+    static void* _srch_DistTag1_main(void*, void*);
+    fopAc_ac_c* srchDistTag2();
+    static void* _srch_DistTag2_main(void*, void*);
+    fopAc_ac_c* srchEscapeTag1();
+    static void* _srch_EscapeTag1_main(void*, void*);
+    fopAc_ac_c* srchEscapeTag2();
+    static void* _srch_EscapeTag2_main(void*, void*);
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    void setMesPat();
+    BOOL _turn_to_link(s16);
+    BOOL _turn_pos(cXyz const&, s16);
+    BOOL _turn_pos(cXyz const&);
+    void talk_cancel();
+    void watch_tutrial();
+    u16 chkDistTag();
+    u16 chkEscapeTag();
+    u16 chkTarget();
+    void clr_tagHit();
+    void allTagPosSet(cXyz const&);
+    void allLookPosSet(cXyz const&);
+    int talk(void*);
     int test(void*);
-    /* 80A9E910 */ BOOL evtEndProc();
-    /* 80A9E9E8 */ int cutTutrialBegin(int);
-    /* 80A9EAA0 */ int _cutTutrialBegin_Init(int const&);
-    /* 80A9EB3C */ int _cutTutrialBegin_Main(int const&);
-    /* 80A9EC5C */ int cutTutrialBegin_Skip(int);
-    /* 80A9ECF0 */ int _cutTutrialBegin_Skip_Init(int const&);
-    /* 80A9ED28 */ int _cutTutrialBegin_Skip_Main(int const&);
-    /* 80A9ED40 */ int cutTutrialClear(int);
-    /* 80A9EDD4 */ int _cutTutrialClear_Init(int const&);
-    /* 80A9EEBC */ int _cutTutrialClear_Main(int const&);
-    /* 80A9EFC0 */ int cutTalk(int);
-    /* 80A9F0DC */ int _cutTalk_Init(int const&);
-    /* 80A9F188 */ int _cutTalk_Main(int const&, int const&);
-    /* 80A9F324 */ int cutTalk2(int);
-    /* 80A9F440 */ int _cutTalk2_Init(int const&);
-    /* 80A9F4EC */ int _cutTalk2_Main(int const&, int const&);
-    /* 80A9F688 */ int cut1stHit_KakasiBody(int);
-    /* 80A9F71C */ int _cut1stHit_KakasiBody_Init(int const&);
-    /* 80A9F83C */ int _cut1stHit_KakasiBody_Main(int const&);
-    /* 80A9F9C4 */ int cutTutrialSelectGiveUp(int);
-    /* 80A9FA58 */ int _cutTutrialSelectGiveUp_Init(int const&);
-    /* 80A9FB08 */ int _cutTutrialSelectGiveUp_Main(int const&);
-    /* 80A9FCEC */ int cutTutrialGiveUp(int);
-    /* 80A9FD80 */ int _cutTutrialGiveUp_Init(int const&);
-    /* 80A9FE34 */ int _cutTutrialGiveUp_Main(int const&);
-    /* 80A9FFAC */ int cutTutrialCaution(int);
-    /* 80AA0040 */ int _cutTutrialCaution_Init(int const&);
-    /* 80AA0088 */ int _cutTutrialCaution_Main(int const&);
-    /* 80AA0108 */ int cutTutrialContinue(int);
-    /* 80AA019C */ int _cutTutrialContinue_Init(int const&);
-    /* 80AA01A4 */ int _cutTutrialContinue_Main(int const&);
-    /* 80AA148C */ daNpc_Pachi_Taro_c(
+    BOOL evtEndProc();
+    int cutTutrialBegin(int);
+    int _cutTutrialBegin_Init(int const&);
+    int _cutTutrialBegin_Main(int const&);
+    int cutTutrialBegin_Skip(int);
+    int _cutTutrialBegin_Skip_Init(int const&);
+    int _cutTutrialBegin_Skip_Main(int const&);
+    int cutTutrialClear(int);
+    int _cutTutrialClear_Init(int const&);
+    int _cutTutrialClear_Main(int const&);
+    int cutTalk(int);
+    int _cutTalk_Init(int const&);
+    int _cutTalk_Main(int const&, int const&);
+    int cutTalk2(int);
+    int _cutTalk2_Init(int const&);
+    int _cutTalk2_Main(int const&, int const&);
+    int cut1stHit_KakasiBody(int);
+    int _cut1stHit_KakasiBody_Init(int const&);
+    int _cut1stHit_KakasiBody_Main(int const&);
+    int cutTutrialSelectGiveUp(int);
+    int _cutTutrialSelectGiveUp_Init(int const&);
+    int _cutTutrialSelectGiveUp_Main(int const&);
+    int cutTutrialGiveUp(int);
+    int _cutTutrialGiveUp_Init(int const&);
+    int _cutTutrialGiveUp_Main(int const&);
+    int cutTutrialCaution(int);
+    int _cutTutrialCaution_Init(int const&);
+    int _cutTutrialCaution_Main(int const&);
+    int cutTutrialContinue(int);
+    int _cutTutrialContinue_Init(int const&);
+    int _cutTutrialContinue_Main(int const&);
+    daNpc_Pachi_Taro_c(
                         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                         daNpcT_motionAnmData_c const* i_motionAnmData,
                         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -172,12 +172,12 @@ public:
                     i_arcNames) {
                         OS_REPORT("|%06d:%x|daNpc_Pachi_Taro_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
-    /* 80AA1558 */ u16 getEyeballMaterialNo() { return MAT_TARO_EYBALL_M; }
-    /* 80AA1560 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80AA1568 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80AA1570 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80AA1578 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80AA1588 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    u16 getEyeballMaterialNo() { return MAT_TARO_EYBALL_M; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_passer.h b/include/d/actor/d_a_npc_passer.h
index e1a87c8f96..32cf74c582 100644
--- a/include/d/actor/d_a_npc_passer.h
+++ b/include/d/actor/d_a_npc_passer.h
@@ -27,57 +27,57 @@ public:
         /* 0x5 */ MODE_MAX_e,
     };
 
-    /* 80AA2C18 */ ~daNpcPasser_c();
-    /* 80AA2C9C */ int createHeap();
-    /* 80AA2D40 */ cPhs__Step create();
-    /* 80AA2FD4 */ int execute();
-    /* 80AA315C */ int draw();
-    /* 80AA31EC */ void setAction(daNpcPasser_c::Mode_e);
-    /* 80AA3230 */ void callInit();
-    /* 80AA3258 */ void callExecute();
-    /* 80AA3284 */ void initPath();
-    /* 80AA33F0 */ void executePath();
-    /* 80AA38C4 */ void initEscape();
-    /* 80AA39DC */ void executeEscape();
-    /* 80AA3D4C */ void initFear();
-    /* 80AA3DE4 */ void executeFear();
-    /* 80AA3E5C */ void initFight();
-    /* 80AA3F10 */ void executeFight();
-    /* 80AA40A4 */ void initRelief();
-    /* 80AA4128 */ void executeRelief();
-    /* 80AA41E4 */ void create_init();
-    /* 80AA43A4 */ void setAngle();
-    /* 80AA43B0 */ void setSpeed(f32, f32, f32*, int);
-    /* 80AA44A4 */ void pathMoveF();
-    /* 80AA4780 */ void setBaseMtx();
-    /* 80AA47FC */ void initCollision();
-    /* 80AA48D8 */ void setCollision();
-    /* 80AA492C */ BOOL waita(void*);
-    /* 80AA49D4 */ BOOL talka(void*);
-    /* 80AA4A7C */ BOOL waitwall(void*);
-    /* 80AA4B24 */ BOOL talkwall(void*);
-    /* 80AA4BCC */ BOOL talkbwall(void*);
-    /* 80AA4C74 */ BOOL talkb(void*);
-    /* 80AA4D1C */ BOOL talkc(void*);
-    /* 80AA4DC4 */ BOOL waitb(void*);
-    /* 80AA4E6C */ BOOL sitwaita(void*);
-    /* 80AA4F14 */ BOOL sittalka(void*);
-    /* 80AA4FBC */ BOOL sittalkab(void*);
-    /* 80AA5064 */ BOOL sitwaitb(void*);
-    /* 80AA510C */ BOOL sittalkb(void*);
-    /* 80AA51B4 */ BOOL sittalkbb(void*);
-    /* 80AA525C */ BOOL looka(void*);
-    /* 80AA5304 */ BOOL lookb(void*);
-    /* 80AA53AC */ BOOL playm(void*);
-    /* 80AA5454 */ BOOL turnr(void*);
-    /* 80AA5510 */ BOOL turnl(void*);
-    /* 80AA55CC */ BOOL walka(void*);
-    /* 80AA5634 */ BOOL runa(void*);
-    /* 80AA569C */ BOOL runb(void*);
-    /* 80AA5704 */ BOOL walkb(void*);
-    /* 80AA576C */ BOOL browsea(void*);
-    /* 80AA5814 */ BOOL browseb(void*);
-    /* 80AA58BC */ BOOL waitTime(void*);
+    ~daNpcPasser_c();
+    int createHeap();
+    cPhs__Step create();
+    int execute();
+    int draw();
+    void setAction(daNpcPasser_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initPath();
+    void executePath();
+    void initEscape();
+    void executeEscape();
+    void initFear();
+    void executeFear();
+    void initFight();
+    void executeFight();
+    void initRelief();
+    void executeRelief();
+    void create_init();
+    void setAngle();
+    void setSpeed(f32, f32, f32*, int);
+    void pathMoveF();
+    void setBaseMtx();
+    void initCollision();
+    void setCollision();
+    BOOL waita(void*);
+    BOOL talka(void*);
+    BOOL waitwall(void*);
+    BOOL talkwall(void*);
+    BOOL talkbwall(void*);
+    BOOL talkb(void*);
+    BOOL talkc(void*);
+    BOOL waitb(void*);
+    BOOL sitwaita(void*);
+    BOOL sittalka(void*);
+    BOOL sittalkab(void*);
+    BOOL sitwaitb(void*);
+    BOOL sittalkb(void*);
+    BOOL sittalkbb(void*);
+    BOOL looka(void*);
+    BOOL lookb(void*);
+    BOOL playm(void*);
+    BOOL turnr(void*);
+    BOOL turnl(void*);
+    BOOL walka(void*);
+    BOOL runa(void*);
+    BOOL runb(void*);
+    BOOL walkb(void*);
+    BOOL browsea(void*);
+    BOOL browseb(void*);
+    BOOL waitTime(void*);
 
     int getObjNum() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
     int getTimeHour() { return dKy_darkworld_check() ? dKy_getDarktime_hour() : dKy_getdaytime_hour(); }
diff --git a/include/d/actor/d_a_npc_passer2.h b/include/d/actor/d_a_npc_passer2.h
index 63e7f998fc..c777c254fc 100644
--- a/include/d/actor/d_a_npc_passer2.h
+++ b/include/d/actor/d_a_npc_passer2.h
@@ -21,16 +21,16 @@ public:
         /* 0x0 */ MODE_MAX_e,
     };
 
-    /* 80AA755C */ void setAction(daNpcPasser2_c::Mode_e);
-    /* 80AA75A0 */ void callInit();
-    /* 80AA75C8 */ void callExecute();
-    /* 80AA75F4 */ void initPath();
-    /* 80AA774C */ void executePath();
-    /* 80AA790C */ void setAngle();
-    /* 80AA7918 */ void pathMoveF();
-    /* 80AA7CD8 */ cPhs__Step create();
-    /* 80AA7F78 */ void create_init();
-    /* 80AA8270 */ inline ~daNpcPasser2_c();
+    void setAction(daNpcPasser2_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initPath();
+    void executePath();
+    void setAngle();
+    void pathMoveF();
+    cPhs__Step create();
+    void create_init();
+    inline ~daNpcPasser2_c();
 
     inline int createHeap();
     inline void setSpeed(f32, f32, f32*, int);
diff --git a/include/d/actor/d_a_npc_post.h b/include/d/actor/d_a_npc_post.h
index e3348b8b30..71b1707699 100644
--- a/include/d/actor/d_a_npc_post.h
+++ b/include/d/actor/d_a_npc_post.h
@@ -20,7 +20,7 @@ struct daNpc_Post_HIOParam {
 
 class daNpc_Post_Param_c {
 public:
-    /* 80AAD120 */ virtual ~daNpc_Post_Param_c() {}
+    virtual ~daNpc_Post_Param_c() {}
 
     static daNpc_Post_HIOParam const m;
 };
@@ -82,44 +82,44 @@ public:
     typedef int (daNpc_Post_c::*actionFunc)(void*);
     typedef int (daNpc_Post_c::*cutFunc)(int);
 
-    /* 80AA8C8C */ ~daNpc_Post_c();
-    /* 80AA8DE8 */ cPhs__Step create();
-    /* 80AA90B0 */ int CreateHeap();
-    /* 80AA9634 */ int Delete();
-    /* 80AA9668 */ int Execute();
-    /* 80AA9688 */ int Draw();
-    /* 80AA971C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AA973C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AA9794 */ u8 getType();
-    /* 80AA97E0 */ BOOL isDelete();
-    /* 80AA9828 */ void reset();
-    /* 80AA99F0 */ void afterJntAnm(int);
-    /* 80AA9A7C */ void setParam();
-    /* 80AA9BA4 */ BOOL checkChangeEvt();
-    /* 80AA9C58 */ void setAfterTalkMotion();
-    /* 80AA9D04 */ void srchActors();
-    /* 80AA9D98 */ BOOL evtTalk();
-    /* 80AA9E98 */ BOOL evtCutProc();
-    /* 80AA9F60 */ void action();
-    /* 80AAA058 */ void beforeMove();
-    /* 80AAA124 */ void afterMoved();
-    /* 80AAA1E4 */ void setAttnPos();
-    /* 80AAA570 */ void setCollision();
-    /* 80AAA714 */ int drawDbgInfo();
-    /* 80AAA71C */ void drawOtherMdl();
-    /* 80AAA8A4 */ BOOL setFlagAnm(int, int, f32);
-    /* 80AAA968 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AAA99C */ BOOL selectAction();
-    /* 80AAA9E4 */ BOOL chkAction(actionFunc);
-    /* 80AAAA10 */ BOOL setAction(actionFunc);
-    /* 80AAAAB8 */ BOOL chkPullOutLetter1();
-    /* 80AAAB2C */ BOOL chkPullOutLetter2();
-    /* 80AAABA0 */ void pullOutLetter();
-    /* 80AAAC64 */ int cutDeliver(int);
-    /* 80AAB61C */ int wait(void*);
-    /* 80AABC24 */ int talk(void*);
+    ~daNpc_Post_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    BOOL setFlagAnm(int, int, f32);
+    bool afterSetMotionAnm(int, int, f32, int);
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL chkPullOutLetter1();
+    BOOL chkPullOutLetter2();
+    void pullOutLetter();
+    int cutDeliver(int);
+    int wait(void*);
+    int talk(void*);
     int test(void*);
-    /* 80AACFF0 */ daNpc_Post_c(
+    daNpc_Post_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -131,14 +131,14 @@ public:
                    i_arcNames) {
         OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80AAD0D0 */ u16 getEyeballMaterialNo() { return MAT_EYEBALL; }
-    /* 80AAD0D8 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80AAD0E0 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80AAD0E8 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80AAD0F0 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80AAD100 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
-    /* 80AAD110 */ s32 getFootLJointNo() { return JNT_FOOTL; }
-    /* 80AAD118 */ s32 getFootRJointNo() { return JNT_FOOTR; }
+    u16 getEyeballMaterialNo() { return MAT_EYEBALL; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    s32 getFootLJointNo() { return JNT_FOOTL; }
+    s32 getFootRJointNo() { return JNT_FOOTR; }
 
     u32 getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_pouya.h b/include/d/actor/d_a_npc_pouya.h
index 9ede16a6e0..19cf0b94b8 100644
--- a/include/d/actor/d_a_npc_pouya.h
+++ b/include/d/actor/d_a_npc_pouya.h
@@ -9,7 +9,7 @@ struct daNpc_Pouya_HIOParam {
 
 class daNpc_Pouya_Param_c {
 public:
-    /* 80B24978 */ virtual ~daNpc_Pouya_Param_c() {}
+    virtual ~daNpc_Pouya_Param_c() {}
 
     static const daNpc_Pouya_HIOParam m;
 };
@@ -82,40 +82,40 @@ public:
         /* 0x0F */ MOT_UNK_15 = 15,
     };
 
-    /* 80AADDAC */ ~daNpc_Pouya_c();
-    /* 80AADEE0 */ int create();
-    /* 80AAE1AC */ int CreateHeap();
-    /* 80AAE788 */ int Delete();
-    /* 80AAE7BC */ int Execute();
-    /* 80AAE7DC */ int Draw();
-    /* 80AAE870 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AAE890 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AAE8E8 */ u8 getType();
-    /* 80AAE94C */ BOOL isDelete();
-    /* 80AAE9D8 */ void reset();
-    /* 80AAEBCC */ void ctrlSubFaceMotion(int);
-    /* 80AAEDB8 */ void afterJntAnm(int);
-    /* 80AAEE44 */ void setParam();
-    /* 80AAEFB4 */ BOOL checkChangeEvt();
-    /* 80AAF148 */ void setAfterTalkMotion();
-    /* 80AAF1F0 */ void srchActors();
-    /* 80AAF1F4 */ BOOL evtTalk();
-    /* 80AAF294 */ BOOL evtCutProc();
-    /* 80AAF35C */ void action();
-    /* 80AAF4F8 */ void beforeMove();
-    /* 80AAF5BC */ void setAttnPos();
-    /* 80AAF8E4 */ void setCollision();
-    /* 80AAFA5C */ int drawDbgInfo();
-    /* 80AAFA64 */ void drawOtherMdl();
-    /* 80AAFB4C */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AAFBDC */ int selectAction();
-    /* 80AAFC24 */ BOOL chkAction(int (daNpc_Pouya_c::*)(void*));
-    /* 80AAFC50 */ int setAction(int (daNpc_Pouya_c::*)(void*));
-    /* 80AAFCF8 */ void setPrtcls();
-    /* 80AAFE08 */ int cutHaveFavorToAsk(int);
-    /* 80AB04A8 */ int wait(void*);
-    /* 80AB0A7C */ int talk(void*);
-    /* 80AB1E94 */ daNpc_Pouya_c(
+    ~daNpc_Pouya_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void ctrlSubFaceMotion(int);
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    BOOL chkAction(int (daNpc_Pouya_c::*)(void*));
+    int setAction(int (daNpc_Pouya_c::*)(void*));
+    void setPrtcls();
+    int cutHaveFavorToAsk(int);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Pouya_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -125,12 +125,12 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80AB1F54 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80AB1F5C */ s32 getHeadJointNo() { return 4; }
-    /* 80AB1F64 */ s32 getNeckJointNo() { return 3; }
-    /* 80AB1F6C */ s32 getBackboneJointNo() { return 1; }
-    /* 80AB1F74 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80AB1F84 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
 
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
 
diff --git a/include/d/actor/d_a_npc_prayer.h b/include/d/actor/d_a_npc_prayer.h
index d11c6d2149..85dbed1014 100644
--- a/include/d/actor/d_a_npc_prayer.h
+++ b/include/d/actor/d_a_npc_prayer.h
@@ -15,39 +15,39 @@ class daNpcPray_c : public daNpcF_c {
 public:
     typedef BOOL (daNpcPray_c::*EvtSeq)(int);
 
-    /* 80AB2DEC */ daNpcPray_c();
-    /* 80AB3204 */ int Create();
-    /* 80AB348C */ int CreateHeap();
-    /* 80AB3610 */ int Delete();
-    /* 80AB3644 */ int Execute();
-    /* 80AB3668 */ int Draw();
-    /* 80AB36A8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AB3834 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AB3854 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AB3C2C */ void reset();
-    /* 80AB3DBC */ void playMotion();
-    /* 80AB3F54 */ int setAction(bool (daNpcPray_c::*)(void*));
-    /* 80AB3FFC */ void setLookMode(int);
-    /* 80AB4020 */ void lookat();
-    /* 80AB4200 */ bool step(s16, int);
-    /* 80AB42F4 */ bool chkFindPlayer();
-    /* 80AB43D8 */ bool wait(void*);
-    /* 80AB4674 */ bool fear(void*);
-    /* 80AB4740 */ bool talk(void*);
-    /* 80AB498C */ bool demo(void*);
-    /* 80AB4B20 */ fpc_ProcID createHeart();
-    /* 80AB4BFC */ BOOL _Evt_GetHeart(int);
-    /* 80AB4CA4 */ BOOL _Evt_GetHeart_CutInit(int const&);
-    /* 80AB4D34 */ BOOL _Evt_GetHeart_CutMain(int const&);
+    daNpcPray_c();
+    int Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void reset();
+    void playMotion();
+    int setAction(bool (daNpcPray_c::*)(void*));
+    void setLookMode(int);
+    void lookat();
+    bool step(s16, int);
+    bool chkFindPlayer();
+    bool wait(void*);
+    bool fear(void*);
+    bool talk(void*);
+    bool demo(void*);
+    fpc_ProcID createHeart();
+    BOOL _Evt_GetHeart(int);
+    BOOL _Evt_GetHeart_CutInit(int const&);
+    BOOL _Evt_GetHeart_CutMain(int const&);
     
-    /* 80AB3000 */ virtual ~daNpcPray_c();
-    /* 80AB38A0 */ virtual void setParam();
-    /* 80AB390C */ virtual BOOL main();
-    /* 80AB5798 */ virtual void adjustShapeAngle() {}
-    /* 80AB3964 */ virtual void setAttnPos();
-    /* 80AB3B0C */ virtual void setMotionAnm(int, f32);
-    /* 80AB3BDC */ virtual void setMotion(int, f32, int);
-    /* 80AB3C24 */ virtual BOOL drawDbgInfo();
+    virtual ~daNpcPray_c();
+    virtual void setParam();
+    virtual BOOL main();
+    virtual void adjustShapeAngle() {}
+    virtual void setAttnPos();
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual BOOL drawDbgInfo();
 
     s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; } 
 
@@ -80,7 +80,7 @@ struct daNpcPray_HIOParam {
 
 class daNpcPray_Param_c {
 public:
-    /* 80AB579C */ virtual ~daNpcPray_Param_c() {}
+    virtual ~daNpcPray_Param_c() {}
 
     static const daNpcPray_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_raca.h b/include/d/actor/d_a_npc_raca.h
index 5518298460..34e05c323b 100644
--- a/include/d/actor/d_a_npc_raca.h
+++ b/include/d/actor/d_a_npc_raca.h
@@ -22,7 +22,7 @@ class daNpc_Raca_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_Raca_Param_c {
 public:
-    /* 80AB8DFC */ virtual ~daNpc_Raca_Param_c() {}
+    virtual ~daNpc_Raca_Param_c() {}
 
     static daNpc_Raca_HIOParam const m;
 };
@@ -70,37 +70,37 @@ public:
     typedef int (daNpc_Raca_c::*actionFunc)(void*);
     typedef int (daNpc_Raca_c::*cutFunc)(int);
 
-    /* 80AB5CAC */ ~daNpc_Raca_c();
-    /* 80AB5DFC */ cPhs__Step create();
-    /* 80AB60B8 */ int CreateHeap();
-    /* 80AB6514 */ int Delete();
-    /* 80AB6548 */ int Execute();
-    /* 80AB6568 */ int Draw();
-    /* 80AB65FC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AB661C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AB6674 */ static void* srchNi(void*, void*);
-    /* 80AB6700 */ fopAc_ac_c* getNiP();
-    /* 80AB67CC */ u8 getType();
-    /* 80AB67EC */ BOOL isDelete();
-    /* 80AB681C */ void reset();
-    /* 80AB6984 */ void afterJntAnm(int);
-    /* 80AB6A10 */ void setParam();
-    /* 80AB6B0C */ void setAfterTalkMotion();
-    /* 80AB6BB0 */ void srchActors();
-    /* 80AB6C14 */ BOOL evtTalk();
-    /* 80AB6D14 */ BOOL evtCutProc();
-    /* 80AB6DDC */ void action();
-    /* 80AB6EC8 */ void beforeMove();
-    /* 80AB6F40 */ void setAttnPos();
-    /* 80AB7180 */ void setCollision();
-    /* 80AB72B4 */ int drawDbgInfo();
-    /* 80AB72BC */ BOOL selectAction();
-    /* 80AB73B0 */ BOOL chkAction(actionFunc);
-    /* 80AB73DC */ BOOL setAction(actionFunc);
-    /* 80AB7484 */ int wait(void*);
-    /* 80AB7710 */ int walk(void*);
-    /* 80AB7918 */ int talk(void*);
-    /* 80AB8CCC */ daNpc_Raca_c(
+    ~daNpc_Raca_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchNi(void*, void*);
+    fopAc_ac_c* getNiP();
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int walk(void*);
+    int talk(void*);
+    daNpc_Raca_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -112,14 +112,14 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
         i_arcNames) {}
-    /* 80AB8DAC */ u16 getEyeballMaterialNo() { return RACA_EYEBALL_M; }
-    /* 80AB8DB4 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80AB8DBC */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80AB8DC4 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80AB8DCC */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80AB8DDC */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
-    /* 80AB8DEC */ s32 getFootLJointNo() { return JNT_FOOTL; }
-    /* 80AB8DF4 */ s32 getFootRJointNo() { return JNT_FOOTR; }
+    u16 getEyeballMaterialNo() { return RACA_EYEBALL_M; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    s32 getFootLJointNo() { return JNT_FOOTL; }
+    s32 getFootRJointNo() { return JNT_FOOTR; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_rafrel.h b/include/d/actor/d_a_npc_rafrel.h
index b60786caa1..ae804cf15a 100644
--- a/include/d/actor/d_a_npc_rafrel.h
+++ b/include/d/actor/d_a_npc_rafrel.h
@@ -20,7 +20,7 @@ struct daNpcRafrel_HIOParam {
 
 class daNpcRafrel_Param_c {
 public:
-    /* 80ABF974 */ virtual ~daNpcRafrel_Param_c() {}
+    virtual ~daNpcRafrel_Param_c() {}
 
     static const daNpcRafrel_HIOParam m;
 };
@@ -41,45 +41,45 @@ public:
 
 class daNpcRafrel_c : public daNpcF_c {
 public:
-    /* 80AB962C */ daNpcRafrel_c();
+    daNpcRafrel_c();
     
-    /* 80AB9A40 */ int Create();
-    /* 80AB9E3C */ int CreateHeap();
-    /* 80ABA380 */ int Delete();
-    /* 80ABA3B4 */ int Execute();
-    /* 80ABA3D8 */ int Draw();
-    /* 80ABA4A8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80ABA678 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80ABA698 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80ABAB88 */ void reset();
-    /* 80ABADC4 */ inline void setWaitAction();
-    /* 80ABAFBC */ inline bool isSneaking();
-    /* 80ABB014 */ bool wait_type01(void*);
-    /* 80ABBBDC */ bool wait_type2(void*);
-    /* 80ABBE84 */ bool talk(void*);
-    /* 80ABC50C */ bool demo(void*);
-    /* 80ABCA40 */ bool leave(void*);
-    /* 80ABCD74 */ inline int EvCut_Introduction(int);
-    /* 80ABCE74 */ inline int EvCut_Meeting(int);
-    /* 80ABD124 */ inline int EvCut_Appear(int);
-    /* 80ABD8A0 */ inline int EvCut_WiretapSponsor(int);
-    /* 80ABDB7C */ inline int EvCut_WiretapEntrant(int);
+    int Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void reset();
+    inline void setWaitAction();
+    inline bool isSneaking();
+    bool wait_type01(void*);
+    bool wait_type2(void*);
+    bool talk(void*);
+    bool demo(void*);
+    bool leave(void*);
+    inline int EvCut_Introduction(int);
+    inline int EvCut_Meeting(int);
+    inline int EvCut_Appear(int);
+    inline int EvCut_WiretapSponsor(int);
+    inline int EvCut_WiretapEntrant(int);
 
-    /* 80ABE470 */ inline void playMotion();
-    /* 80ABEE98 */ inline void lookat();
+    inline void playMotion();
+    inline void lookat();
     inline void playExpression();
 
-    /* 80AB9840 */ virtual ~daNpcRafrel_c();
-    /* 80ABDE9C */ virtual inline void setParam();
-    /* 80ABE1D0 */ virtual inline BOOL main();
-    /* 80ABE9FC */ virtual inline BOOL ctrlBtk();
-    /* 80ABEAD8 */ virtual inline void setAttnPos();
-    /* 80ABA6E4 */ virtual inline bool setExpressionAnm(int, bool);
-    /* 80ABA8EC */ virtual inline bool setExpressionBtp(int);
-    /* 80ABBBB0 */ virtual void setExpression(int, f32);
-    /* 80ABA9CC */ virtual void setMotionAnm(int, f32);
-    /* 80ABBB10 */ virtual void setMotion(int, f32, int);
-    /* 80ABF074 */ virtual inline BOOL drawDbgInfo();
+    virtual ~daNpcRafrel_c();
+    virtual inline void setParam();
+    virtual inline BOOL main();
+    virtual inline BOOL ctrlBtk();
+    virtual inline void setAttnPos();
+    virtual inline bool setExpressionAnm(int, bool);
+    virtual inline bool setExpressionBtp(int);
+    virtual void setExpression(int, f32);
+    virtual void setMotionAnm(int, f32);
+    virtual void setMotion(int, f32, int);
+    virtual inline BOOL drawDbgInfo();
 
     int setAction(bool (daNpcRafrel_c::*i_actionFn)(void*)) {
         field_0xe10 = 3;
diff --git a/include/d/actor/d_a_npc_saru.h b/include/d/actor/d_a_npc_saru.h
index 2053737579..21a12d85a7 100644
--- a/include/d/actor/d_a_npc_saru.h
+++ b/include/d/actor/d_a_npc_saru.h
@@ -20,7 +20,7 @@ struct daNpc_Saru_HIOParam {
 
 class daNpc_Saru_Param_c : public JORReflexible {
 public:
-    /* 80AC448C */ virtual ~daNpc_Saru_Param_c() {}
+    virtual ~daNpc_Saru_Param_c() {}
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
@@ -71,49 +71,49 @@ public:
         /* 0x15 */ JNT_FOOR_R,
     };
 
-    /* 80AC042C */ ~daNpc_Saru_c();
-    /* 80AC0578 */ int create();
-    /* 80AC082C */ int CreateHeap();
-    /* 80AC0A54 */ int Delete();
-    /* 80AC0A88 */ int Execute();
-    /* 80AC0AA8 */ int Draw();
-    /* 80AC0AEC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AC0B0C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AC0B64 */ static void* srchYm(void*, void*);
-    /* 80AC0C0C */ u8 getType();
-    /* 80AC0C58 */ int isDelete();
-    /* 80AC0CE8 */ void reset();
-    /* 80AC0EA4 */ void afterJntAnm(int);
-    /* 80AC0F28 */ BOOL checkChangeEvt();
-    /* 80AC0FDC */ void setParam();
-    /* 80AC1110 */ void setAfterTalkMotion();
-    /* 80AC1170 */ void srchActors();
-    /* 80AC11D4 */ BOOL evtTalk();
-    /* 80AC1274 */ BOOL evtCutProc();
-    /* 80AC133C */ void action();
-    /* 80AC14E4 */ void beforeMove();
-    /* 80AC15B4 */ void setAttnPos();
-    /* 80AC18A0 */ void setCollision();
-    /* 80AC1A20 */ int drawDbgInfo();
-    /* 80AC1A28 */ void drawOtherMdl();
-    /* 80AC1B30 */ int selectAction();
-    /* 80AC1B78 */ BOOL chkAction(int (daNpc_Saru_c::*)(void*));
-    /* 80AC1BA4 */ int setAction(int (daNpc_Saru_c::*)(void*));
-    /* 80AC1C4C */ void setSe();
-    /* 80AC216C */ int cutFindMonkey(int);
-    /* 80AC2368 */ int cutHelpMe(int);
-    /* 80AC2598 */ int cutYmLook(int);
-    /* 80AC28A4 */ int wait(void*);
-    /* 80AC2FD8 */ int talk(void*);
-    /* 80AC4394 */ daNpc_Saru_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_Saru_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchYm(void*, void*);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL checkChangeEvt();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    BOOL chkAction(int (daNpc_Saru_c::*)(void*));
+    int setAction(int (daNpc_Saru_c::*)(void*));
+    void setSe();
+    int cutFindMonkey(int);
+    int cutHelpMe(int);
+    int cutYmLook(int);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Saru_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                 {}
-    /* 80AC4474 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80AC447C */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80AC4484 */ s32 getBackboneJointNo() { return JNT_BACKBONE_1; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE_1; }
 
     u32 getFlowNodeNo() {
         u16 rv = home.angle.x;
diff --git a/include/d/actor/d_a_npc_seib.h b/include/d/actor/d_a_npc_seib.h
index 1be33d5f2e..8e3f65df6d 100644
--- a/include/d/actor/d_a_npc_seib.h
+++ b/include/d/actor/d_a_npc_seib.h
@@ -14,7 +14,7 @@
 
 class daNpc_seiB_Param_c {
 public:
-    /* 80AC6FB8 */ virtual ~daNpc_seiB_Param_c() {};
+    virtual ~daNpc_seiB_Param_c() {};
     struct Data {
         /* 0x00 */ f32 field_0x00;
         /* 0x04 */ f32 mGravity;
@@ -67,33 +67,33 @@ public:
         TYPE_1,
     };
 
-    /* 80AC50EC */ ~daNpc_seiB_c();
-    /* 80AC5188 */ int create();
-    /* 80AC53C8 */ int CreateHeap();
-    /* 80AC5520 */ int Delete();
-    /* 80AC5554 */ int Execute();
-    /* 80AC5574 */ int Draw();
-    /* 80AC5608 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AC5628 */ u8 getType();
-    /* 80AC5648 */ int getFlowNodeNo();
-    /* 80AC5664 */ int isDelete();
-    /* 80AC566C */ void reset();
-    /* 80AC57C4 */ void setParam();
-    /* 80AC58F0 */ void srchActors();
-    /* 80AC58F4 */ BOOL evtTalk();
-    /* 80AC59F4 */ BOOL evtCutProc();
-    /* 80AC5ABC */ void action();
-    /* 80AC5B44 */ void beforeMove();
-    /* 80AC5BC4 */ void setAttnPos();
-    /* 80AC5C20 */ int drawDbgInfo();
-    /* 80AC5C28 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AC5DC0 */ int selectAction();
-    /* 80AC5E08 */ int chkAction(int (daNpc_seiB_c::*)(void*));
-    /* 80AC5E34 */ int setAction(int (daNpc_seiB_c::*)(void*));
-    /* 80AC5EDC */ void ctrlWaitAnm();
-    /* 80AC6140 */ int wait(void*);
-    /* 80AC616C */ int talk(void*);
-    /* 80AC6F74 */ daNpc_seiB_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_seiB_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    int getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void setParam();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    int drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(int (daNpc_seiB_c::*)(void*));
+    int setAction(int (daNpc_seiB_c::*)(void*));
+    void ctrlWaitAnm();
+    int wait(void*);
+    int talk(void*);
+    daNpc_seiB_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h
index 97f15be403..e08641bf22 100644
--- a/include/d/actor/d_a_npc_seic.h
+++ b/include/d/actor/d_a_npc_seic.h
@@ -54,7 +54,7 @@
 
 class daNpc_seiC_Param_c {
     public:
-        /* 80AC91B0 */ virtual ~daNpc_seiC_Param_c() {};
+        virtual ~daNpc_seiC_Param_c() {};
 
         static const daNpc_seiC_HIOParam m;
 };
@@ -85,33 +85,33 @@ public:
         TYPE_1,
     };
 
-    /* 80AC754C */ ~daNpc_seiC_c();
-    /* 80AC75E8 */ int create();
-    /* 80AC7828 */ int CreateHeap();
-    /* 80AC7980 */ int Delete();
-    /* 80AC79B4 */ int Execute();
-    /* 80AC79D4 */ int Draw();
-    /* 80AC7A68 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AC7A88 */ u8 getType();
-    /* 80AC7AA8 */ u32 getFlowNodeNo();
-    /* 80AC7AC4 */ int isDelete();
-    /* 80AC7ACC */ void reset();
-    /* 80AC7C1C */ void setParam();
-    /* 80AC7D48 */ void srchActors();
-    /* 80AC7D4C */ BOOL evtTalk();
-    /* 80AC7E4C */ BOOL evtCutProc();
-    /* 80AC7F14 */ void action();
-    /* 80AC7F9C */ void beforeMove();
-    /* 80AC801C */ void setAttnPos();
-    /* 80AC8078 */ int drawDbgInfo();
-    /* 80AC8080 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AC8218 */ int selectAction();
-    /* 80AC8260 */ int chkAction(int (daNpc_seiC_c::*)(void*));
-    /* 80AC828C */ int setAction(int (daNpc_seiC_c::*)(void*));
-    /* 80AC8334 */ void ctrlWaitAnm();
-    /* 80AC8338 */ int wait(void*);
-    /* 80AC8364 */ int talk(void*);
-    /* 80AC916C */ daNpc_seiC_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
+    ~daNpc_seiC_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    u32 getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void setParam();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    int drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(int (daNpc_seiC_c::*)(void*));
+    int setAction(int (daNpc_seiC_c::*)(void*));
+    void ctrlWaitAnm();
+    int wait(void*);
+    int talk(void*);
+    daNpc_seiC_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
                                 daNpcT_evtData_c const* i_evtData, char** i_arcNames)         
diff --git a/include/d/actor/d_a_npc_seid.h b/include/d/actor/d_a_npc_seid.h
index 8356f7ac7e..f3fc27ff27 100644
--- a/include/d/actor/d_a_npc_seid.h
+++ b/include/d/actor/d_a_npc_seid.h
@@ -54,7 +54,7 @@
 
 class daNpc_seiD_Param_c {
     public:
-        /* 80AC91B0 */ virtual ~daNpc_seiD_Param_c() {};
+        virtual ~daNpc_seiD_Param_c() {};
 
         static const daNpc_seiD_HIOParam m;
 };
@@ -84,33 +84,33 @@ public:
         TYPE_1,
     };
 
-    /* 80AC968C */ ~daNpc_seiD_c();
-    /* 80AC9728 */ int create();
-    /* 80AC9968 */ int CreateHeap();
-    /* 80AC9AC0 */ int Delete();
-    /* 80AC9AF4 */ int Execute();
-    /* 80AC9B14 */ int Draw();
-    /* 80AC9BA8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AC9BC8 */ u8 getType();
-    /* 80AC9BE8 */ u32 getFlowNodeNo();
-    /* 80AC9C04 */ int isDelete();
-    /* 80AC9C0C */ void reset();
-    /* 80AC9D5C */ void setParam();
-    /* 80AC9E88 */ void srchActors();
-    /* 80AC9E8C */ BOOL evtTalk();
-    /* 80AC9F8C */ BOOL evtCutProc();
-    /* 80ACA054 */ void action();
-    /* 80ACA0DC */ void beforeMove();
-    /* 80ACA15C */ void setAttnPos();
-    /* 80ACA1B8 */ int drawDbgInfo();
-    /* 80ACA1C0 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80ACA358 */ int selectAction();
-    /* 80ACA3A0 */ int chkAction(int (daNpc_seiD_c::*)(void*));
-    /* 80ACA3CC */ int setAction(int (daNpc_seiD_c::*)(void*));
-    /* 80ACA474 */ void ctrlWaitAnm();
-    /* 80ACA478 */ int wait(void*);
-    /* 80ACA4A4 */ int talk(void*);
-    /* 80ACB2AC */ daNpc_seiD_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
+    ~daNpc_seiD_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    u32 getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void setParam();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    int drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(int (daNpc_seiD_c::*)(void*));
+    int setAction(int (daNpc_seiD_c::*)(void*));
+    void ctrlWaitAnm();
+    int wait(void*);
+    int talk(void*);
+    daNpc_seiD_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData, daNpcT_motionAnmData_c const* i_motionAnmData,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData, int i_faceMotionStepNum,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData, int i_motionStepNum,
                                 daNpcT_evtData_c const* i_evtData, char** i_arcNames)         
diff --git a/include/d/actor/d_a_npc_seira.h b/include/d/actor/d_a_npc_seira.h
index 846ea98d1b..f6b8baf40b 100644
--- a/include/d/actor/d_a_npc_seira.h
+++ b/include/d/actor/d_a_npc_seira.h
@@ -17,56 +17,56 @@ public:
     typedef int (daNpc_Seira_c::*cutFunc)(int);
     typedef int (daNpc_Seira_c::*actionFunc)(void*);
 
-    /* 80ACB7CC */ ~daNpc_Seira_c();
-    /* 80ACB918 */ int create();
-    /* 80ACBBD4 */ int CreateHeap();
-    /* 80ACC0FC */ int Delete();
-    /* 80ACC130 */ int Execute();
-    /* 80ACC21C */ int Draw();
-    /* 80ACC2B0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80ACC2D0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80ACC328 */ u8 getType();
-    /* 80ACC424 */ int getFlowNodeNo();
-    /* 80ACC440 */ u8 checkBottle();
-    /* 80ACC4A8 */ u8 getNpcType();
-    /* 80ACC4C8 */ int isDelete();
-    /* 80ACC4D0 */ void reset();
-    /* 80ACC618 */ void afterJntAnm(int);
-    /* 80ACC69C */ void setParam();
-    /* 80ACC818 */ BOOL checkChangeEvt();
-    /* 80ACC8C0 */ void setAfterTalkMotion();
-    /* 80ACC980 */ void srchActors();
-    /* 80ACCA48 */ BOOL evtTalk();
-    /* 80ACCBEC */ BOOL evtCutProc();
-    /* 80ACCCBC */ void action();
-    /* 80ACCE58 */ void beforeMove();
-    /* 80ACCED0 */ void setAttnPos();
-    /* 80ACD1D0 */ void setCollision();
-    /* 80ACD378 */ BOOL drawDbgInfo();
-    /* 80ACD380 */ void drawOtherMdl();
-    /* 80ACD458 */ bool setBottleAnm(int, int, f32, bool);
-    /* 80ACD538 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80ACD570 */ void changeAnm(int*, int*);
-    /* 80ACD600 */ void changeBck(int*, int*);
-    /* 80ACD6AC */ void changeBtp(int*, int*);
-    /* 80ACD744 */ void changeBtk(int*, int*);
-    /* 80ACD770 */ int selectAction();
-    /* 80ACD900 */ int chkAction(actionFunc);
-    /* 80ACD92C */ int setAction(actionFunc);
-    /* 80ACD9D4 */ int cutConversationAboutSaru(int);
-    /* 80ACDC6C */ BOOL checkStageIsSeirasShop();
-    /* 80ACDCE4 */ int getShopItemType();
-    /* 80ACDD24 */ int wait(void*);
-    /* 80ACDE74 */ int sit(void*);
-    /* 80ACE098 */ int happy(void*);
-    /* 80ACE220 */ int worry(void*);
-    /* 80ACE4FC */ int sad(void*);
-    /* 80ACE608 */ int lookaround(void*);
-    /* 80ACE714 */ int lookaround_wait(void*);
-    /* 80ACE828 */ int smile(void*);
-    /* 80ACE934 */ int talk(void*);
-    /* 80ACEAC4 */ int shop(void*);
-    /* 80ACFB48 */ daNpc_Seira_c(
+    ~daNpc_Seira_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    u8 checkBottle();
+    u8 getNpcType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    BOOL drawDbgInfo();
+    void drawOtherMdl();
+    bool setBottleAnm(int, int, f32, bool);
+    bool afterSetMotionAnm(int, int, f32, int);
+    void changeAnm(int*, int*);
+    void changeBck(int*, int*);
+    void changeBtp(int*, int*);
+    void changeBtk(int*, int*);
+    int selectAction();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    int cutConversationAboutSaru(int);
+    BOOL checkStageIsSeirasShop();
+    int getShopItemType();
+    int wait(void*);
+    int sit(void*);
+    int happy(void*);
+    int worry(void*);
+    int sad(void*);
+    int lookaround(void*);
+    int lookaround_wait(void*);
+    int smile(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_Seira_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -79,12 +79,12 @@ public:
         // "|%06d:%x|daNpc_Seira_c -> Construct\n"
         OS_REPORT("|%06d:%x|daNpc_Seira_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80ACFC14 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80ACFC1C */ s32 getHeadJointNo() { return 4; }
-    /* 80ACFC24 */ s32 getNeckJointNo() { return 3; }
-    /* 80ACFC2C */ s32 getBackboneJointNo() { return true; }
-    /* 80ACFC34 */ BOOL checkChangeJoint(int val) { return val == 4; }
-    /* 80ACFC44 */ BOOL checkRemoveJoint(int val) { return val == 8; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return true; }
+    BOOL checkChangeJoint(int val) { return val == 4; }
+    BOOL checkRemoveJoint(int val) { return val == 8; }
 
     static char* mCutNameList[2];
     static cutFunc mCutList[2];
@@ -117,7 +117,7 @@ struct daNpc_Seira_HIOParam {
 
 class daNpc_Seira_Param_c {
 public:
-    /* 80ACFC54 */ virtual ~daNpc_Seira_Param_c() {}
+    virtual ~daNpc_Seira_Param_c() {}
 
     static const daNpc_Seira_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_seira2.h b/include/d/actor/d_a_npc_seira2.h
index cb36f38b09..245e482c97 100644
--- a/include/d/actor/d_a_npc_seira2.h
+++ b/include/d/actor/d_a_npc_seira2.h
@@ -17,48 +17,48 @@ public:
     typedef int (daNpc_Seira2_c::*cutFunc)(int);
     typedef int (daNpc_Seira2_c::*actionFunc)(void*);
 
-    /* 80AD0C0C */ ~daNpc_Seira2_c();
-    /* 80AD0D58 */ int create();
-    /* 80AD0FF8 */ int CreateHeap();
-    /* 80AD1508 */ int Delete();
-    /* 80AD153C */ int Execute();
-    /* 80AD1610 */ int Draw();
-    /* 80AD16A4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AD16C4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AD171C */ u8 getType();
-    /* 80AD179C */ int getFlowNodeNo();
-    /* 80AD17B8 */ u8 getMaxNumItem();
-    /* 80AD17C4 */ u8 checkBottle();
-    /* 80AD182C */ int isDelete();
-    /* 80AD1834 */ void reset();
-    /* 80AD1968 */ void afterJntAnm(int);
-    /* 80AD19EC */ void setParam();
-    /* 80AD1B38 */ void setAfterTalkMotion();
-    /* 80AD1BF8 */ void srchActors();
-    /* 80AD1C60 */ BOOL evtTalk();
-    /* 80AD1E04 */ BOOL evtCutProc();
-    /* 80AD1ED4 */ void action();
-    /* 80AD2030 */ void beforeMove();
-    /* 80AD20A8 */ void setAttnPos();
-    /* 80AD23A8 */ void setCollision();
-    /* 80AD2550 */ BOOL drawDbgInfo();
-    /* 80AD2558 */ void drawOtherMdl();
-    /* 80AD2630 */ bool setBottleAnm(int, int, f32, bool);
-    /* 80AD2710 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AD2748 */ int selectAction();
-    /* 80AD2870 */ int chkAction(actionFunc);
-    /* 80AD289C */ int setAction(actionFunc);
-    /* 80AD2944 */ BOOL checkStageIsSeira2sShop();
-    /* 80AD29BC */ int wait(void*);
-    /* 80AD2B68 */ int sit(void*);
-    /* 80AD2D8C */ int happy(void*);
-    /* 80AD2F14 */ int worry(void*);
-    /* 80AD31F0 */ int sad(void*);
-    /* 80AD3508 */ int lookaround(void*);
-    /* 80AD3614 */ int smile(void*);
-    /* 80AD3720 */ int talk(void*);
-    /* 80AD3890 */ int shop(void*);
-    /* 80AD47B8 */ daNpc_Seira2_c(
+    ~daNpc_Seira2_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    u8 getMaxNumItem();
+    u8 checkBottle();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    BOOL drawDbgInfo();
+    void drawOtherMdl();
+    bool setBottleAnm(int, int, f32, bool);
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    BOOL checkStageIsSeira2sShop();
+    int wait(void*);
+    int sit(void*);
+    int happy(void*);
+    int worry(void*);
+    int sad(void*);
+    int lookaround(void*);
+    int smile(void*);
+    int talk(void*);
+    int shop(void*);
+    daNpc_Seira2_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -71,12 +71,12 @@ public:
         // "|%06d:%x|daNpc_Seira2_c -> Construct\n"
         OS_REPORT("|%06d:%x|daNpc_Seira2_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80AD4884 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80AD488C */ s32 getHeadJointNo() { return 4; }
-    /* 80AD4894 */ s32 getNeckJointNo() { return 3; }
-    /* 80AD489C */ s32 getBackboneJointNo() { return true; }
-    /* 80AD48A4 */ BOOL checkChangeJoint(int val) { return val == 4; }
-    /* 80AD48B4 */ BOOL checkRemoveJoint(int val) { return val == 8; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return true; }
+    BOOL checkChangeJoint(int val) { return val == 4; }
+    BOOL checkRemoveJoint(int val) { return val == 8; }
 
     static char* mCutNameList[1];
     static cutFunc mCutList[1];
@@ -107,7 +107,7 @@ struct daNpc_Seira2_HIOParam {
 
 class daNpc_Seira2_Param_c {
 public:
-    /* 80AD48C4 */ virtual ~daNpc_Seira2_Param_c() {}
+    virtual ~daNpc_Seira2_Param_c() {}
 
     static const daNpc_Seira2_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_seirei.h b/include/d/actor/d_a_npc_seirei.h
index 2e84982fb2..c537f63cc0 100644
--- a/include/d/actor/d_a_npc_seirei.h
+++ b/include/d/actor/d_a_npc_seirei.h
@@ -24,7 +24,7 @@ class daNpc_Seirei_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_Seirei_Param_c {
 public:
-    /* 80AD7C3C */ virtual ~daNpc_Seirei_Param_c() {}
+    virtual ~daNpc_Seirei_Param_c() {}
 
     static daNpc_Seirei_HIOParam const m;
 };
@@ -34,36 +34,36 @@ public:
     typedef int (daNpc_Seirei_c::*actionFunc)(void*);
     typedef BOOL (daNpc_Seirei_c::*cutFunc)(int);
 
-    /* 80AD572C */ ~daNpc_Seirei_c();
-    /* 80AD57C4 */ cPhs__Step create();
-    /* 80AD5A7C */ int CreateHeap();
-    /* 80AD5BC4 */ int Delete();
-    /* 80AD5BF8 */ int Execute();
-    /* 80AD5C18 */ int Draw();
-    /* 80AD5CC0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AD5CE0 */ u8 getType();
-    /* 80AD5D2C */ BOOL isDelete();
-    /* 80AD5D34 */ void reset();
-    /* 80AD5EEC */ void setParam();
-    /* 80AD6048 */ BOOL checkChangeEvt();
-    /* 80AD6050 */ void srchActors();
-    /* 80AD6054 */ BOOL evtTalk();
-    /* 80AD6154 */ BOOL evtCutProc();
-    /* 80AD621C */ void action();
-    /* 80AD62A4 */ void beforeMove();
-    /* 80AD6330 */ void setAttnPos();
-    /* 80AD6464 */ int drawDbgInfo();
-    /* 80AD646C */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80AD6604 */ BOOL selectAction();
-    /* 80AD664C */ BOOL chkAction(actionFunc);
-    /* 80AD6678 */ BOOL setAction(actionFunc);
-    /* 80AD6720 */ void ctrlWaitAnm();
-    /* 80AD6808 */ void setPrtcls();
-    /* 80AD6A38 */ BOOL chkFirstMeeting();
-    /* 80AD6ABC */ BOOL cutConversation(int);
-    /* 80AD6C58 */ int wait(void*);
-    /* 80AD6D30 */ int talk(void*);
-    /* 80AD7BF8 */ daNpc_Seirei_c(
+    ~daNpc_Seirei_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void setParam();
+    BOOL checkChangeEvt();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    int drawDbgInfo();
+    bool afterSetMotionAnm(int, int, f32, int);
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    void ctrlWaitAnm();
+    void setPrtcls();
+    BOOL chkFirstMeeting();
+    BOOL cutConversation(int);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Seirei_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
diff --git a/include/d/actor/d_a_npc_shad.h b/include/d/actor/d_a_npc_shad.h
index 69678e06a5..2168beca28 100644
--- a/include/d/actor/d_a_npc_shad.h
+++ b/include/d/actor/d_a_npc_shad.h
@@ -10,7 +10,7 @@ struct daNpcShad_HIOParam {
 
 class daNpcShad_Param_c : public JORReflexible {
 public:
-    /* 80AE1F70 */ virtual ~daNpcShad_Param_c() {}
+    virtual ~daNpcShad_Param_c() {}
 
     static const daNpcShad_HIOParam m;
 };
@@ -138,51 +138,51 @@ public:
         /* 0x16 */ MOT_STEPB,
     };
 
-    /* 80AD820C */ daNpcShad_c();
-    /* 80AD8420 */ virtual ~daNpcShad_c();
-    /* 80AD8620 */ cPhs__Step Create();
-    /* 80AD8B60 */ int CreateHeap();
-    /* 80AD90E0 */ int Delete();
-    /* 80AD9114 */ int Execute();
-    /* 80AD9138 */ int Draw();
-    /* 80AD9280 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AD944C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AD946C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AD94B8 */ bool setExpressionAnm(int, bool);
-    /* 80AD974C */ bool setExpressionBtp(int);
-    /* 80AD982C */ void setMotionAnm(int, f32);
-    /* 80AD99B4 */ void reset();
-    /* 80AD9C0C */ inline void setWaitAction();
-    /* 80AD9E04 */ inline bool getPathPoint(u8, int, Vec*);
-    /* 80AD9E90 */ inline bool isSneaking();
-    /* 80AD9F00 */ bool wait_type0(void*);
-    /* 80ADA630 */ void setMotion(int, f32, BOOL);
-    /* 80ADA674 */ void setExpression(int, f32);
-    /* 80ADA6A0 */ bool wait_type1(void*);
-    /* 80ADB428 */ bool wait_type2(void*);
-    /* 80ADB628 */ bool talk(void*);
-    /* 80ADBEA8 */ bool demo(void*);
-    /* 80ADC3DC */ bool leave(void*);
-    /* 80ADC700 */ BOOL EvCut_Introduction(int);
-    /* 80ADC800 */ BOOL EvCut_Meeting(int);
-    /* 80ADCAD8 */ BOOL EvCut_ToChantSpell1(int);
-    /* 80ADD720 */ BOOL EvCut_ToChantSpell2(int);
-    /* 80ADE47C */ BOOL EvCut_ToChantSpell2Skip(int);
-    /* 80ADE5F8 */ BOOL EvCut_DiscoveryCannon(int);
-    /* 80ADED68 */ BOOL EvCut_DiscoveryCannonSkip(int);
-    /* 80ADEEE4 */ BOOL EvCut_Disappear(int);
-    /* 80ADF810 */ BOOL EvCut_DisappearSkip(int);
-    /* 80ADF8DC */ BOOL EvCut_CallBack(int);
-    /* 80ADFB70 */ BOOL EvCut_WiretapSponsor(int);
-    /* 80ADFE74 */ BOOL EvCut_WiretapEntrant(int);
-    /* 80AE01BC */ void setParam();
-    /* 80AE0438 */ BOOL main();
-    /* 80AE04D8 */ void playMotion();
-    /* 80AE0B58 */ void playExpression();
-    /* 80AE0ED0 */ BOOL ctrlBtk();
-    /* 80AE0FAC */ void setAttnPos();
-    /* 80AE1320 */ void lookat();
-    /* 80AE153C */ BOOL drawDbgInfo();
+    daNpcShad_c();
+    virtual ~daNpcShad_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    void reset();
+    inline void setWaitAction();
+    inline bool getPathPoint(u8, int, Vec*);
+    inline bool isSneaking();
+    bool wait_type0(void*);
+    void setMotion(int, f32, BOOL);
+    void setExpression(int, f32);
+    bool wait_type1(void*);
+    bool wait_type2(void*);
+    bool talk(void*);
+    bool demo(void*);
+    bool leave(void*);
+    BOOL EvCut_Introduction(int);
+    BOOL EvCut_Meeting(int);
+    BOOL EvCut_ToChantSpell1(int);
+    BOOL EvCut_ToChantSpell2(int);
+    BOOL EvCut_ToChantSpell2Skip(int);
+    BOOL EvCut_DiscoveryCannon(int);
+    BOOL EvCut_DiscoveryCannonSkip(int);
+    BOOL EvCut_Disappear(int);
+    BOOL EvCut_DisappearSkip(int);
+    BOOL EvCut_CallBack(int);
+    BOOL EvCut_WiretapSponsor(int);
+    BOOL EvCut_WiretapEntrant(int);
+    void setParam();
+    BOOL main();
+    void playMotion();
+    void playExpression();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void lookat();
+    BOOL drawDbgInfo();
 
     static EventFn mEvtSeqList[14];
 
diff --git a/include/d/actor/d_a_npc_shaman.h b/include/d/actor/d_a_npc_shaman.h
index 59e60dc41e..68bddcc500 100644
--- a/include/d/actor/d_a_npc_shaman.h
+++ b/include/d/actor/d_a_npc_shaman.h
@@ -18,7 +18,7 @@ struct daNpc_Sha_HIOParam {
 
 class daNpc_Sha_Param_c {
 public:
-    /* 80AE6B5C */ virtual ~daNpc_Sha_Param_c() {}
+    virtual ~daNpc_Sha_Param_c() {}
 
     static daNpc_Sha_HIOParam const m;
 };
@@ -43,50 +43,50 @@ public:
     typedef int (daNpc_Sha_c::*cutFunc)(int);
     typedef BOOL (daNpc_Sha_c::*queryFunc)();
     
-    /* 80AE2DCC */ ~daNpc_Sha_c();
-    /* 80AE2EEC */ cPhs__Step create();
-    /* 80AE31A0 */ int CreateHeap();
-    /* 80AE35CC */ int Delete();
-    /* 80AE3600 */ int Execute();
-    /* 80AE3620 */ int Draw();
-    /* 80AE36B4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AE36D4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AE372C */ u8 getType();
-    /* 80AE3764 */ BOOL isDelete();
-    /* 80AE3798 */ void reset();
-    /* 80AE38F0 */ void afterJntAnm(int);
-    /* 80AE3974 */ void setParam();
-    /* 80AE3A8C */ BOOL checkChangeEvt();
-    /* 80AE3B78 */ void setAfterTalkMotion();
-    /* 80AE3C24 */ void srchActors();
-    /* 80AE3C28 */ BOOL evtTalk();
-    /* 80AE3D28 */ BOOL evtCutProc();
-    /* 80AE3DF0 */ void action();
-    /* 80AE3F80 */ void beforeMove();
-    /* 80AE4044 */ void setAttnPos();
-    /* 80AE4360 */ void setCollision();
-    /* 80AE44B8 */ int drawDbgInfo();
-    /* 80AE44C0 */ BOOL selectAction();
-    /* 80AE4508 */ BOOL chkAction(actionFunc);
-    /* 80AE4534 */ BOOL setAction(actionFunc);
-    /* 80AE45DC */ int getSceneChangeNoTableIx();
-    /* 80AE48D0 */ void setTempBit(int);
-    /* 80AE4974 */ int cutPerformAugury(int);
-    /* 80AE4E24 */ int wait(void*);
-    /* 80AE50EC */ int talk(void*);
+    ~daNpc_Sha_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int getSceneChangeNoTableIx();
+    void setTempBit(int);
+    int cutPerformAugury(int);
+    int wait(void*);
+    int talk(void*);
     int test(void*);
-    /* 80AE52CC */ BOOL query265();
-    /* 80AE52F0 */ BOOL query268();
-    /* 80AE5314 */ BOOL query267();
-    /* 80AE5338 */ BOOL query078();
-    /* 80AE535C */ BOOL query264();
-    /* 80AE5380 */ BOOL query266();
-    /* 80AE53A4 */ BOOL query542();
-    /* 80AE53C8 */ BOOL query461();
-    /* 80AE53EC */ BOOL query288();
-    /* 80AE5410 */ BOOL query000();
-    /* 80AE5418 */ BOOL query999();
-    /* 80AE69E0 */ daNpc_Sha_c(
+    BOOL query265();
+    BOOL query268();
+    BOOL query267();
+    BOOL query078();
+    BOOL query264();
+    BOOL query266();
+    BOOL query542();
+    BOOL query461();
+    BOOL query288();
+    BOOL query000();
+    BOOL query999();
+    daNpc_Sha_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -98,12 +98,12 @@ public:
             : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
             i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
             i_arcNames) { OS_REPORT("|%06d:%x|daNpc_Sha_c -> コンストラクト\n", g_Counter.mCounter0, this); }
-    /* 80AE6B1C */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80AE6B24 */ s32 getHeadJointNo() { return 4; }
-    /* 80AE6B2C */ s32 getNeckJointNo() { return 3; }
-    /* 80AE6B34 */ s32 getBackboneJointNo() { return 1; }
-    /* 80AE6B3C */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80AE6B4C */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 8; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_shoe.h b/include/d/actor/d_a_npc_shoe.h
index d45e81bf13..f706159d7a 100644
--- a/include/d/actor/d_a_npc_shoe.h
+++ b/include/d/actor/d_a_npc_shoe.h
@@ -9,7 +9,7 @@ struct daNpcShoe_HIOParam {
 
 class daNpcShoe_Param_c {
 public:
-    /* 80AEA344 */ virtual ~daNpcShoe_Param_c() {}
+    virtual ~daNpcShoe_Param_c() {}
 
     static const daNpcShoe_HIOParam m;
 };
@@ -60,30 +60,30 @@ public:
         /* 0x05 */ MOT_SIT_TO_WOLF_A,
     };
 
-    /* 80AE794C */ daNpcShoe_c();
-    /* 80AE7B60 */ ~daNpcShoe_c();
-    /* 80AE7D48 */ cPhs__Step Create();
-    /* 80AE7FD8 */ BOOL CreateHeap();
-    /* 80AE81E8 */ int Delete();
-    /* 80AE821C */ int Execute();
-    /* 80AE8308 */ int Draw();
-    /* 80AE840C */ bool ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AE8598 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AE85B8 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 80AE8604 */ void setMotion(int, f32, BOOL);
-    /* 80AE864C */ void reset();
-    /* 80AE895C */ inline int setAction(actionFunc);
-    /* 80AE8A04 */ bool wait(void*);
-    /* 80AE8E24 */ bool fear(void*);
-    /* 80AE8ED4 */ bool talk(void*);
-    /* 80AE9094 */ bool demo(void*);
-    /* 80AE92E8 */ void setParam();
-    /* 80AE93A0 */ BOOL main();
-    /* 80AE9624 */ void setAttnPos();
-    /* 80AE9820 */ inline void lookat();
-    /* 80AE9A00 */ void setMotionAnm(int, f32);
-    /* 80AE9AD0 */ inline BOOL drawDbgInfo();
-    /* 80AEA340 */ inline void adjustShapeAngle() {}
+    daNpcShoe_c();
+    ~daNpcShoe_c();
+    cPhs__Step Create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    void setMotion(int, f32, BOOL);
+    void reset();
+    inline int setAction(actionFunc);
+    bool wait(void*);
+    bool fear(void*);
+    bool talk(void*);
+    bool demo(void*);
+    void setParam();
+    BOOL main();
+    void setAttnPos();
+    inline void lookat();
+    void setMotionAnm(int, f32);
+    inline BOOL drawDbgInfo();
+    inline void adjustShapeAngle() {}
 
     s16 getMessageNo() { return fopAcM_GetParam(this) >> 0x10; }
 
diff --git a/include/d/actor/d_a_npc_shop0.h b/include/d/actor/d_a_npc_shop0.h
index d89695f795..a2a1ac50a6 100644
--- a/include/d/actor/d_a_npc_shop0.h
+++ b/include/d/actor/d_a_npc_shop0.h
@@ -14,7 +14,7 @@
 
 class daNpc_Shop0_Param_c {
 public:
-    /* 80AEBB14 */ virtual ~daNpc_Shop0_Param_c() {};
+    virtual ~daNpc_Shop0_Param_c() {};
     
     struct param {
         /* 0x0 */ u32 mParam1;
@@ -28,29 +28,29 @@ public:
 
 class daNpc_Shop0_c : public fopAc_ac_c {
 public:
-    /* 80AEA7F8 */ virtual ~daNpc_Shop0_c();
-    /* 80AEAA10 */ int create();
-    /* 80AEAE9C */ int createHeap();
-    /* 80AEAF8C */ int destroy();
-    /* 80AEAFC0 */ int execute();
-    /* 80AEB078 */ int draw();
-    /* 80AEB190 */ char* getResName();
-    /* 80AEB1A0 */ void getParam();
-    /* 80AEB1C8 */ int getFlowNodeNum();
-    /* 80AEB1D0 */ int isDelete();
-    /* 80AEB22C */ int init();
-    /* 80AEB32C */ J3DAnmTransform* getTrnsfrmAnmP(int, char**);
-    /* 80AEB3A8 */ int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
-    /* 80AEB45C */ int setCollision();
-    /* 80AEB4C8 */ int checkEvent();
-    /* 80AEB5E8 */ void orderEvent();
-    /* 80AEB634 */ void setMtx();
-    /* 80AEB6DC */ void setRoomInf();
-    /* 80AEB780 */ int cut_alert(int, int);
-    /* 80AEB7F0 */ int chkProcess(int (daNpc_Shop0_c::*)(void*));
-    /* 80AEB824 */ int setProcess(int (daNpc_Shop0_c::*)(void*), void*, int);
-    /* 80AEB920 */ int wait(void*);
-    /* 80AEB9BC */ int talk(void*);
+    virtual ~daNpc_Shop0_c();
+    int create();
+    int createHeap();
+    int destroy();
+    int execute();
+    int draw();
+    char* getResName();
+    void getParam();
+    int getFlowNodeNum();
+    int isDelete();
+    int init();
+    J3DAnmTransform* getTrnsfrmAnmP(int, char**);
+    int setBckAnm(J3DAnmTransform*, f32, int, int, int, bool);
+    int setCollision();
+    int checkEvent();
+    void orderEvent();
+    void setMtx();
+    void setRoomInf();
+    int cut_alert(int, int);
+    int chkProcess(int (daNpc_Shop0_c::*)(void*));
+    int setProcess(int (daNpc_Shop0_c::*)(void*), void*, int);
+    int wait(void*);
+    int talk(void*);
 
     static dCcD_SrcCyl const mCylDat;
 
diff --git a/include/d/actor/d_a_npc_shop_maro.h b/include/d/actor/d_a_npc_shop_maro.h
index d7e20749bf..6d89e1a18b 100644
--- a/include/d/actor/d_a_npc_shop_maro.h
+++ b/include/d/actor/d_a_npc_shop_maro.h
@@ -13,9 +13,9 @@
  */
 class daNpc_shopMaro_c : public dShopSystem_c {
 public:
-    /* 80AEBEB4 */ int create();
-    /* 80AEBF04 */ daNpc_shopMaro_c() : dShopSystem_c(0,0,0,0,0,0,0,0) {}
-    /* 80AEBF64 */ virtual ~daNpc_shopMaro_c() {}
+    int create();
+    daNpc_shopMaro_c() : dShopSystem_c(0,0,0,0,0,0,0,0) {}
+    virtual ~daNpc_shopMaro_c() {}
 };
 
 STATIC_ASSERT(sizeof(daNpc_shopMaro_c) == 0xf7c);
diff --git a/include/d/actor/d_a_npc_sola.h b/include/d/actor/d_a_npc_sola.h
index 9178292833..e05d92ab40 100644
--- a/include/d/actor/d_a_npc_sola.h
+++ b/include/d/actor/d_a_npc_sola.h
@@ -45,44 +45,44 @@ public:
         /* 0x18 */ JNT_SAYA,
     };
 
-    /* 80AECBAC */ ~daNpc_solA_c();
-    /* 80AECCD0 */ int create();
-    /* 80AECF58 */ int CreateHeap();
-    /* 80AED0F8 */ int Delete();
-    /* 80AED12C */ int Execute();
-    /* 80AED14C */ void Draw();
-    /* 80AED1E8 */ static BOOL createHeapCallBack(fopAc_ac_c*);
-    /* 80AED208 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 80AED260 */ bool getType();
-    /* 80AED268 */ int getFlowNodeNo();
-    /* 80AED284 */ int isDelete();
-    /* 80AED294 */ void reset();
-    /* 80AED3B8 */ void setParam();
-    /* 80AED4A4 */ void setAfterTalkMotion();
-    /* 80AED504 */ void srchActors();
-    /* 80AED508 */ BOOL evtTalk();
-    /* 80AED608 */ BOOL evtCutProc();
-    /* 80AED6D0 */ void action();
-    /* 80AED758 */ void beforeMove();
-    /* 80AED7D0 */ void setAttnPos();
-    /* 80AED9DC */ void setCollision();
-    /* 80AEDABC */ int drawDbgInfo();
-    /* 80AEDAC4 */ void drawOtherMdl();
-    /* 80AEDAC8 */ int selectAction();
-    /* 80AEDB10 */ int chkAction(int (daNpc_solA_c::*)(void*));
-    /* 80AEDB3C */ int setAction(int (daNpc_solA_c::*)(void*));
-    /* 80AEDBE4 */ int wait(void*);
-    /* 80AEDD60 */ int talk(void*);
-    /* 80AEEF40 */ daNpc_solA_c(daNpcT_faceMotionAnmData_c const* param_1,
+    ~daNpc_solA_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    void Draw();
+    static BOOL createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    bool getType();
+    int getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    int selectAction();
+    int chkAction(int (daNpc_solA_c::*)(void*));
+    int setAction(int (daNpc_solA_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    daNpc_solA_c(daNpcT_faceMotionAnmData_c const* param_1,
                                 daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                 int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
                                 int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
-    /* 80AEF084 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80AEF084 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80AEF094 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
 
     static char* mCutNameList[1];
     static cutFunc mCutList[1];
@@ -104,7 +104,7 @@ struct daNpc_solA_HIOParam {
 
 class daNpc_solA_Param_c {
 public:
-    /* 80AEF094 */ virtual ~daNpc_solA_Param_c() {}
+    virtual ~daNpc_solA_Param_c() {}
 
     static daNpc_solA_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_npc_soldierA.h b/include/d/actor/d_a_npc_soldierA.h
index 4245ea6983..d8e9ce3cbf 100644
--- a/include/d/actor/d_a_npc_soldierA.h
+++ b/include/d/actor/d_a_npc_soldierA.h
@@ -18,7 +18,7 @@ struct daNpc_SoldierA_HIOParam {
 
 class daNpc_SoldierA_Param_c {
 public:
-    /* 80AF267C */ virtual ~daNpc_SoldierA_Param_c() {}
+    virtual ~daNpc_SoldierA_Param_c() {}
 
     static daNpc_SoldierA_HIOParam const m;
 };
@@ -42,40 +42,40 @@ public:
     typedef int (daNpc_SoldierA_c::*actionFunc)(void*);
     typedef int (daNpc_SoldierA_c::*cutFunc)(int);
 
-    /* 80AEF58C */ daNpc_SoldierA_c();
-    /* 80AEF7A0 */ ~daNpc_SoldierA_c();
-    /* 80AEF9A0 */ cPhs__Step create();
-    /* 80AEFC80 */ int CreateHeap();
-    /* 80AEFE4C */ int Delete();
-    /* 80AEFE80 */ int Execute();
-    /* 80AEFEA0 */ int Draw();
-    /* 80AEFF14 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AF0110 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AF0130 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AF017C */ void setParam();
-    /* 80AF02B0 */ BOOL main();
-    /* 80AF0428 */ BOOL ctrlBtk();
-    /* 80AF0430 */ void setAttnPos();
-    /* 80AF0928 */ void setMotionAnm(int, f32);
-    /* 80AF0A38 */ void setMotion(int, f32, int);
-    /* 80AF0A7C */ int drawDbgInfo();
-    /* 80AF0A84 */ void drawOtherMdls();
-    /* 80AF0B30 */ u8 getTypeFromParam();
-    /* 80AF0B7C */ BOOL isDelete();
-    /* 80AF0BB0 */ void reset();
-    /* 80AF0D34 */ void playMotion();
-    /* 80AF0F50 */ BOOL chkAction(actionFunc);
-    /* 80AF0F7C */ BOOL setAction(actionFunc);
-    /* 80AF1024 */ BOOL selectAction();
-    /* 80AF10A4 */ void doNormalAction(int);
-    /* 80AF11B8 */ BOOL doEvent();
-    /* 80AF1488 */ void setLookMode(int);
-    /* 80AF14AC */ void lookat();
-    /* 80AF1734 */ int wait(void*);
-    /* 80AF18B0 */ int talk(void*);
-    /* 80AF1A48 */ int ECut_talkLake(int);
-    /* 80AF1B8C */ int ECut_listenLake(int);
-    /* 80AF1CA4 */ int test(void*);
+    daNpc_SoldierA_c();
+    ~daNpc_SoldierA_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playMotion();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    int wait(void*);
+    int talk(void*);
+    int ECut_talkLake(int);
+    int ECut_listenLake(int);
+    int test(void*);
 
     u8 getType() { return mType; }
 
diff --git a/include/d/actor/d_a_npc_soldierB.h b/include/d/actor/d_a_npc_soldierB.h
index dd01e6100c..5f2f222b30 100644
--- a/include/d/actor/d_a_npc_soldierB.h
+++ b/include/d/actor/d_a_npc_soldierB.h
@@ -9,7 +9,7 @@ struct daNpc_SoldierB_HIOParam {
 
 class daNpc_SoldierB_Param_c {
 public:
-    /* 80AF267C */ virtual ~daNpc_SoldierB_Param_c() {}
+    virtual ~daNpc_SoldierB_Param_c() {}
 
     static daNpc_SoldierB_HIOParam const m;
 };
@@ -41,39 +41,39 @@ public:
     typedef int (daNpc_SoldierB_c::*actionFunc)(void*);
     typedef int (daNpc_SoldierB_c::*cutFunc)(int);
 
-    /* 80AF2CAC */ daNpc_SoldierB_c();
-    /* 80AF2EC0 */ ~daNpc_SoldierB_c();
-    /* 80AF30C0 */ cPhs__Step create();
-    /* 80AF33A0 */ int CreateHeap();
-    /* 80AF356C */ int Delete();
-    /* 80AF35A0 */ int Execute();
-    /* 80AF35C0 */ int Draw();
-    /* 80AF3634 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AF3830 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AF3850 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AF389C */ void setParam();
-    /* 80AF39B8 */ BOOL main();
-    /* 80AF3B30 */ BOOL ctrlBtk();
-    /* 80AF3B38 */ void setAttnPos();
-    /* 80AF4030 */ void setMotionAnm(int, f32);
-    /* 80AF4130 */ void setMotion(int, f32, int);
-    /* 80AF4174 */ int drawDbgInfo();
-    /* 80AF417C */ void drawOtherMdls();
-    /* 80AF4228 */ u8 getTypeFromParam();
-    /* 80AF4248 */ BOOL isDelete();
-    /* 80AF426C */ void reset();
-    /* 80AF43E4 */ void playMotion();
-    /* 80AF4508 */ BOOL chkAction(int (daNpc_SoldierB_c::*)(void*));
-    /* 80AF4534 */ BOOL setAction(int (daNpc_SoldierB_c::*)(void*));
-    /* 80AF45DC */ BOOL selectAction();
-    /* 80AF465C */ void doNormalAction(int);
-    /* 80AF4770 */ BOOL doEvent();
-    /* 80AF49E4 */ void setLookMode(int);
-    /* 80AF4A08 */ void lookat();
-    /* 80AF4CFC */ int wait(void*);
-    /* 80AF4DBC */ int talk(void*);
-    /* 80AF4F54 */ int ECut_listenLake(int);
-    /* 80AF50AC */ int test(void*);
+    daNpc_SoldierB_c();
+    ~daNpc_SoldierB_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    int drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    BOOL isDelete();
+    void reset();
+    void playMotion();
+    BOOL chkAction(int (daNpc_SoldierB_c::*)(void*));
+    BOOL setAction(int (daNpc_SoldierB_c::*)(void*));
+    BOOL selectAction();
+    void doNormalAction(int);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    int wait(void*);
+    int talk(void*);
+    int ECut_listenLake(int);
+    int test(void*);
 
     static char* mEvtCutNameList[2];
     static cutFunc mEvtCutList[2];
diff --git a/include/d/actor/d_a_npc_sq.h b/include/d/actor/d_a_npc_sq.h
index 9eec585012..83a3efef17 100644
--- a/include/d/actor/d_a_npc_sq.h
+++ b/include/d/actor/d_a_npc_sq.h
@@ -61,8 +61,8 @@ public:
 STATIC_ASSERT(sizeof(npc_sq_class) == 0xA44);
 
 struct daNpc_Sq_HIO_c {
-    /* 80AF5FEC */ daNpc_Sq_HIO_c();
-    /* 80AF7360 */ virtual ~daNpc_Sq_HIO_c() {}
+    daNpc_Sq_HIO_c();
+    virtual ~daNpc_Sq_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScale;
diff --git a/include/d/actor/d_a_npc_taro.h b/include/d/actor/d_a_npc_taro.h
index a0c107907e..d2865ca686 100644
--- a/include/d/actor/d_a_npc_taro.h
+++ b/include/d/actor/d_a_npc_taro.h
@@ -49,7 +49,7 @@ struct daNpc_Taro_HIOParam {
 
 class daNpc_Taro_Param_c {
     public:
-        /* 805715FC */ virtual ~daNpc_Taro_Param_c() {}
+        virtual ~daNpc_Taro_Param_c() {}
     
         static daNpc_Taro_HIOParam const m;
     };
@@ -96,62 +96,62 @@ public:
         TYPE_16,
     };
 
-    /* 80565E8C */ ~daNpc_Taro_c();
-    /* 8056604C */ int create();
-    /* 80566340 */ int CreateHeap();
-    /* 80566910 */ int Delete();
-    /* 80566944 */ int Execute();
-    /* 80566964 */ int Draw();
-    /* 805669F8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80566A18 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80566A70 */ static void* srchArrow(void*, void*);
-    /* 80566B0C */ static void* srchNpc(void*, void*);
-    /* 80566BD4 */ fopAc_ac_c* getArrowP();
-    /* 80566CCC */ u8 getType();
-    /* 80566D7C */ BOOL isDelete();
-    /* 80566FA4 */ void reset();
-    /* 805671F4 */ void afterJntAnm(int);
-    /* 80567280 */ void setParam();
-    /* 8056747C */ BOOL checkChangeEvt();
-    /* 8056757C */ BOOL evtEndProc();
-    /* 805675B8 */ void setAfterTalkMotion();
-    /* 8056767C */ void srchActors();
-    /* 805679F0 */ BOOL evtTalk();
-    /* 80567A90 */ BOOL evtCutProc();
-    /* 80567C90 */ void action();
-    /* 80567EB4 */ void beforeMove();
-    /* 80567F78 */ void setAttnPos();
-    /* 805682E8 */ void setCollision();
-    /* 80568590 */ int drawDbgInfo();
-    /* 80568598 */ void drawOtherMdl();
-    /* 805686A0 */ daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
-    /* 80568738 */ BOOL selectAction();
-    /* 80568828 */ BOOL chkAction(int (daNpc_Taro_c::*)(void*));
-    /* 80568854 */ BOOL setAction(int (daNpc_Taro_c::*)(void*));
-    /* 805688FC */ void setSwingVoice();
-    /* 80568A2C */ int cutConversationAboutPachinko(int);
-    /* 80568C58 */ int cutConversationAboutWoodSwd(int);
-    /* 80568E00 */ int cutSwdTutorial(int);
-    /* 80569880 */ int cutHail(int);
-    /* 80569AFC */ int cutFindMonkey(int);
-    /* 8056A120 */ int cutHelpMe(int);
-    /* 8056A460 */ int cutAppearanceMoi(int);
-    /* 8056B000 */ int cutGiveMeWoodSwd(int);
-    /* 8056B68C */ int cutGetWoodSwd(int);
-    /* 8056C14C */ int cutConversationWithMaro(int);
-    /* 8056C5B4 */ int cutCacaricoConversation(int);
-    /* 8056C8CC */ int cutArrowTutorial(int);
-    /* 8056D0B8 */ int cutCaution(int);
-    /* 8056D310 */ int cutTagPush1(int);
-    /* 8056D5C0 */ int cutNotGonnaLet(int);
-    /* 8056DFAC */ int cutTagPush4(int);
-    /* 8056E270 */ int wait(void*);
-    /* 8056F2A8 */ int swdTutorial(void*);
-    /* 8056F418 */ int talk_withMaro(void*);
-    /* 8056F7E8 */ int practice(void*);
-    /* 8056FC20 */ int nurse(void*);
-    /* 8056FDCC */ int talk(void*);
-    /* 8057148C */ daNpc_Taro_c(
+    ~daNpc_Taro_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchArrow(void*, void*);
+    static void* srchNpc(void*, void*);
+    fopAc_ac_c* getArrowP();
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    BOOL evtEndProc();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    daNpcT_faceMotionAnmData_c getFaceMotionAnm(daNpcT_faceMotionAnmData_c);
+    BOOL selectAction();
+    BOOL chkAction(int (daNpc_Taro_c::*)(void*));
+    BOOL setAction(int (daNpc_Taro_c::*)(void*));
+    void setSwingVoice();
+    int cutConversationAboutPachinko(int);
+    int cutConversationAboutWoodSwd(int);
+    int cutSwdTutorial(int);
+    int cutHail(int);
+    int cutFindMonkey(int);
+    int cutHelpMe(int);
+    int cutAppearanceMoi(int);
+    int cutGiveMeWoodSwd(int);
+    int cutGetWoodSwd(int);
+    int cutConversationWithMaro(int);
+    int cutCacaricoConversation(int);
+    int cutArrowTutorial(int);
+    int cutCaution(int);
+    int cutTagPush1(int);
+    int cutNotGonnaLet(int);
+    int cutTagPush4(int);
+    int wait(void*);
+    int swdTutorial(void*);
+    int talk_withMaro(void*);
+    int practice(void*);
+    int nurse(void*);
+    int talk(void*);
+    daNpc_Taro_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -163,14 +163,14 @@ public:
                    i_arcNames) {
         OS_REPORT("|%06d:%x|daNpc_Taro_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 805715AC */ u16 getEyeballMaterialNo() { return 2; }
-    /* 805715B4 */ s32 getHeadJointNo() { return 4; }
-    /* 805715BC */ s32 getNeckJointNo() { return 3; }
-    /* 805715C4 */ s32 getBackboneJointNo() { return 1; }
-    /* 805715CC */ BOOL checkChangeJoint(int jntNo) { return jntNo == 4; }
-    /* 805715DC */ BOOL checkRemoveJoint(int jntNo) { return jntNo == 7; }
-    /* 805715EC */ s32 getFootLJointNo() { return 19; }
-    /* 805715F4 */ s32 getFootRJointNo() { return 22; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int jntNo) { return jntNo == 4; }
+    BOOL checkRemoveJoint(int jntNo) { return jntNo == 7; }
+    s32 getFootLJointNo() { return 19; }
+    s32 getFootRJointNo() { return 22; }
 
     u32 getFlowNodeNo() { 
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_the.h b/include/d/actor/d_a_npc_the.h
index dbd999922c..9bf13dbfef 100644
--- a/include/d/actor/d_a_npc_the.h
+++ b/include/d/actor/d_a_npc_the.h
@@ -9,7 +9,7 @@ struct daNpcThe_HIOParam {
 
 class daNpcThe_Param_c {
 public:
-    /* 80AFBDA0 */ virtual ~daNpcThe_Param_c() {}
+    virtual ~daNpcThe_Param_c() {}
 
     static const daNpcThe_HIOParam m;
 };
@@ -112,37 +112,37 @@ public:
         /* 0xA */ MOT_LOOK,
     };
 
-    /* 80AF76CC */ daNpcThe_c();
-    /* 80AF78E0 */ ~daNpcThe_c();
+    daNpcThe_c();
+    ~daNpcThe_c();
     /*  inline  */ inline BOOL CreateHeap();
-    /* 80AF7AE0 */ BOOL ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AF7CB0 */ static BOOL createHeapCallBack(fopAc_ac_c*);
-    /* 80AF8114 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
-    /* 80AF8160 */ bool setExpressionAnm(int, bool);
-    /* 80AF841C */ bool setExpressionBtp(int);
-    /* 80AF8564 */ void setMotionAnm(int, f32);
-    /* 80AF8744 */ BOOL wait(void*);
-    /* 80AF8B0C */ void setMotion(int, f32, int);
-    /* 80AF8B50 */ void setExpression(int, f32);
-    /* 80AF8B7C */ BOOL waitTW(void*);
-    /* 80AF8CC4 */ BOOL talk(void*);
-    /* 80AF912C */ BOOL test(void*);
-    /* 80AF923C */ BOOL EvCut_TwResistance(int);
-    /* 80AF9244 */ BOOL EvCut_Introduction(int);
-    /* 80AF9358 */ cPhs__Step create();
-    /* 80AF9748 */ void reset();
+    BOOL ctrlJoint(J3DJoint*, J3DModel*);
+    static BOOL createHeapCallBack(fopAc_ac_c*);
+    static BOOL ctrlJointCallBack(J3DJoint*, int);
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    BOOL wait(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    BOOL waitTW(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    BOOL EvCut_TwResistance(int);
+    BOOL EvCut_Introduction(int);
+    cPhs__Step create();
+    void reset();
     /*  inline  */ inline int Draw();
-    /* 80AF99F4 */ inline void setParam();
-    /* 80AF9CF0 */ inline BOOL main();
-    /* 80AF9F94 */ inline void playMotion();
-    /* 80AFA338 */ inline void playExpression();
+    inline void setParam();
+    inline BOOL main();
+    inline void playMotion();
+    inline void playExpression();
     /*  inline  */ inline void setExpressionTalkAfter();
-    /* 80AFA6CC */ inline BOOL doEvent();
-    /* 80AFADEC */ inline BOOL ctrlBtk();
-    /* 80AFAEC8 */ inline void setAttnPos();
-    /* 80AFB1C4 */ inline void lookat();
-    /* 80AFB488 */ inline BOOL drawDbgInfo();
-    /* 80AFBD9C */ void adjustShapeAngle() {}
+    inline BOOL doEvent();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline BOOL drawDbgInfo();
+    void adjustShapeAngle() {}
 
     u8 getTypeFromParam() {
         switch (fopAcM_GetParam(this) & 0xff) {
diff --git a/include/d/actor/d_a_npc_theB.h b/include/d/actor/d_a_npc_theB.h
index 8611823849..0eb8ab4db5 100644
--- a/include/d/actor/d_a_npc_theB.h
+++ b/include/d/actor/d_a_npc_theB.h
@@ -17,7 +17,7 @@ struct daNpcTheB_HIOParam {
 };
 
 struct daNpcTheB_Param_c {
-    /* 80B00D00 */ virtual ~daNpcTheB_Param_c() {}
+    virtual ~daNpcTheB_Param_c() {}
 
     static daNpcTheB_HIOParam const m;
 };
@@ -78,43 +78,43 @@ public:
         /* 0x0 */ EXPR_BTP_THEB,
     };
 
-    /* 80AFC76C */ daNpcTheB_c();
-    /* 80AFC980 */ ~daNpcTheB_c();
-    /* 80AFCB44 */ cPhs__Step create();
-    /* 80AFCD98 */ int CreateHeap();
-    /* 80AFD1FC */ int Delete();
-    /* 80AFD230 */ int Execute();
-    /* 80AFD250 */ int Draw();
-    /* 80AFD2A8 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AFD49C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80AFD4BC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80AFD508 */ cXyz getHandPos1(int);
-    /* 80AFD5F0 */ cXyz getHandPos2(int);
-    /* 80AFD6D8 */ void setHintEvent(s32, u16, int);
-    /* 80AFD6F0 */ BOOL main();
-    /* 80AFD938 */ void setParam();
-    /* 80AFDAA4 */ BOOL ctrlBtk();
-    /* 80AFDB70 */ void setAttnPos();
-    /* 80AFDEC0 */ bool setExpressionAnm(int, bool);
-    /* 80AFE0BC */ bool setExpressionBtp(int);
-    /* 80AFE1BC */ void setMotionAnm(int, f32);
-    /* 80AFE398 */ BOOL drawDbgInfo();
-    /* 80AFE3A0 */ void reset();
-    /* 80AFE574 */ void playExpression();
-    /* 80AFE704 */ void playMotion();
-    /* 80AFE920 */ void doNormalAction();
-    /* 80AFEA14 */ BOOL doEvent();
-    /* 80AFED24 */ void lookat();
-    /* 80AFEECC */ int wait(void*);
-    /* 80AFF45C */ void setMotion(int, f32, int);
-    /* 80AFF4A0 */ void setExpression(int, f32);
-    /* 80AFF4CC */ int talk(void*);
-    /* 80AFF6AC */ int EvCut_PersonalCombatIntro(int);
-    /* 80AFF888 */ int EvCut_PersonalCombatRevenge(int);
-    /* 80AFFBB4 */ void EvCut_PersonalCombatAfter();
-    /* 80AFFEF4 */ int EvCut_AnnulationFieldRace(int);
-    /* 80AFFFE0 */ int EvCut_TheBHint(int);
-    /* 80B00204 */ int EvCut_CoachGuardGameOver(int);
+    daNpcTheB_c();
+    ~daNpcTheB_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    cXyz getHandPos1(int);
+    cXyz getHandPos2(int);
+    void setHintEvent(s32, u16, int);
+    BOOL main();
+    void setParam();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotionAnm(int, f32);
+    BOOL drawDbgInfo();
+    void reset();
+    void playExpression();
+    void playMotion();
+    void doNormalAction();
+    BOOL doEvent();
+    void lookat();
+    int wait(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    int talk(void*);
+    int EvCut_PersonalCombatIntro(int);
+    int EvCut_PersonalCombatRevenge(int);
+    void EvCut_PersonalCombatAfter();
+    int EvCut_AnnulationFieldRace(int);
+    int EvCut_TheBHint(int);
+    int EvCut_CoachGuardGameOver(int);
 
     s16 getMessageNo() { return fopAcM_GetParam(this) & 0xFFFF; }
     void setTRMtx(MtxP mtx) { mAnm_p->getModel()->setBaseTRMtx(mtx); }
diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h
index c3faacb836..15489c9284 100644
--- a/include/d/actor/d_a_npc_tk.h
+++ b/include/d/actor/d_a_npc_tk.h
@@ -22,63 +22,63 @@ class J3DModel;
  */
 class daNPC_TK_c : public fopAc_ac_c {
 public:
-    /* 80B01498 */ void setBck(int, u8, f32, f32);
-    /* 80B0153C */ bool checkBck(int);
-    /* 80B01598 */ int draw();
-    /* 80B016D4 */ int checkBeforeBg();
-    /* 80B01878 */ void setActionMode(int);
-    /* 80B018F4 */ f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32);
-    /* 80B01C84 */ cXyz chaseTargetPos(cXyz, f32, f32, s16);
+    void setBck(int, u8, f32, f32);
+    bool checkBck(int);
+    int draw();
+    int checkBeforeBg();
+    void setActionMode(int);
+    f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32);
+    cXyz chaseTargetPos(cXyz, f32, f32, s16);
     /* 80B01D84 */
     fopAc_ac_c* getMasterPointer();
-    /* 80B01DA0 */ void setMasterShoulder(cXyz*);
-    /* 80B01E48 */ void setAwayAction(int);
-    /* 80B01EF4 */ void setFlySE();
-    /* 80B02254 */ void executeFly();
-    /* 80B026F8 */ void initPerchDemo(int);
+    void setMasterShoulder(cXyz*);
+    void setAwayAction(int);
+    void setFlySE();
+    void executeFly();
+    void initPerchDemo(int);
     /* 80B02B5C */
     bool executePerchDemo(int);
-    /* 80B03658 */ void executePerch();
-    /* 80B03754 */ void executeHandOn();
+    void executePerch();
+    void executeHandOn();
     /* 80B039A8 */
     bool checkWaterSurface(f32);
-    /* 80B03A70 */ void executeAttack();
-    /* 80B048BC */ void executeAway();
-    /* 80B04BF8 */ void setCarryActorMtx();
+    void executeAttack();
+    void executeAway();
+    void setCarryActorMtx();
     /* 80B04F64 */
     f32 getTakePosY();
     /* 80B04FA8 */
     f32 getTakeOffPosY();
-    /* 80B04FEC */ void executeBack();
+    void executeBack();
     /* 80B05BD0 */
     cXyz getHanjoHandPos();
-    /* 80B05C7C */ void executeStayHanjo();
-    /* 80B05EC8 */ void executeAttackLink();
-    /* 80B0686C */ void executeBackHanjo();
+    void executeStayHanjo();
+    void executeAttackLink();
+    void executeBackHanjo();
     /* 80B07114 */
     bool checkAttackDemo();
-    /* 80B072CC */ void executeAttackDemo();
-    /* 80B07610 */ void executeBackHanjoDemo();
-    /* 80B08168 */ void executeWolfEvent();
-    /* 80B08208 */ void calcWolfDemoCam();
-    /* 80B082A4 */ void calcWolfDemoCam2();
-    /* 80B0839C */ void executeWolfPerch();
-    /* 80B09A3C */ void executeResistanceDemo();
-    /* 80B0A444 */ void setHawkSideCamera(cXyz);
-    /* 80B0A500 */ void setHawkCamera(fopAc_ac_c*);
-    /* 80B0A568 */ void endHawkCamera();
-    /* 80B0A614 */ void calcDemoCamera();
-    /* 80B0B004 */ void checkActionSet();
-    /* 80B0B284 */ void action();
-    /* 80B0B5CC */ void mtx_set();
-    /* 80B0B6DC */ void cc_set();
-    /* 80B0B7CC */ int execute();
-    /* 80B0B918 */ int _delete();
+    void executeAttackDemo();
+    void executeBackHanjoDemo();
+    void executeWolfEvent();
+    void calcWolfDemoCam();
+    void calcWolfDemoCam2();
+    void executeWolfPerch();
+    void executeResistanceDemo();
+    void setHawkSideCamera(cXyz);
+    void setHawkCamera(fopAc_ac_c*);
+    void endHawkCamera();
+    void calcDemoCamera();
+    void checkActionSet();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
     /* 80B0B9AC */
     int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B0BB7C */ static int JointCallBack(J3DJoint*, int);
-    /* 80B0BBC8 */ int CreateHeap();
-    /* 80B0BD24 */ int create();
+    static int JointCallBack(J3DJoint*, int);
+    int CreateHeap();
+    int create();
 
     void setBump() { mFlags |= (u16)4; }
     void setEventWolf() { mFlags |= (u16)0x80; }
diff --git a/include/d/actor/d_a_npc_tkc.h b/include/d/actor/d_a_npc_tkc.h
index 2a5762a950..20f6852ed8 100644
--- a/include/d/actor/d_a_npc_tkc.h
+++ b/include/d/actor/d_a_npc_tkc.h
@@ -34,7 +34,7 @@ struct daNpcTkc_HIOParam {
 
 class daNpcTkc_Param_c {
 public:
-    /* 80B10848 */ virtual ~daNpcTkc_Param_c() {}
+    virtual ~daNpcTkc_Param_c() {}
 
     static daNpcTkc_HIOParam const m;
 };
@@ -57,42 +57,42 @@ public:
     typedef void (daNpcTkc_c::*actionFunc)();
     typedef int (daNpcTkc_c::*evtFunc)(int);
 
-    /* 80B0C7CC */ daNpcTkc_c();
-    /* 80B0C964 */ ~daNpcTkc_c();
-    /* 80B0CA9C */ cPhs__Step Create();
-    /* 80B0CD7C */ int CreateHeap();
-    /* 80B0D180 */ int Delete();
-    /* 80B0D1B4 */ int Execute();
-    /* 80B0D1EC */ int Draw();
-    /* 80B0D25C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B0D2CC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B0D2EC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B0D338 */ void setActionWait();
-    /* 80B0D37C */ void setActionFollow();
-    /* 80B0D3C0 */ void setMtx();
-    /* 80B0D458 */ bool setExpressionAnm(int, bool);
-    /* 80B0D5A4 */ bool setExpressionBtp(int);
-    /* 80B0D678 */ void reset();
-    /* 80B0DA94 */ void setMotionAnm(int, f32);
-    /* 80B0DBC8 */ BOOL setAction(actionFunc);
-    /* 80B0DC68 */ void wait();
-    /* 80B0DEF8 */ void calcFly();
-    /* 80B0E124 */ BOOL searchPlayer();
-    /* 80B0E304 */ void follow();
-    /* 80B0E784 */ void appear();
-    /* 80B0E8EC */ void normalTalk();
-    /* 80B0EB10 */ void setMotion(int, f32, int);
-    /* 80B0EB54 */ void setExpression(int, f32);
-    /* 80B0EB80 */ void warpTalk();
-    /* 80B0EEE8 */ void demo();
-    /* 80B0F00C */ int EvCut_TksSecretChild(int);
-    /* 80B0F1F8 */ int EvCut_TksWarpExit(int);
-    /* 80B0F5D4 */ int EvCut_TksWarpBack(int);
-    /* 80B0FA5C */ void setParam();
-    /* 80B0FAD0 */ BOOL main();
-    /* 80B0FD18 */ BOOL ctrlBtk();
-    /* 80B0FDE4 */ void setAttnPos();
-    /* 80B0FFD4 */ int drawDbgInfo();
+    daNpcTkc_c();
+    ~daNpcTkc_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setActionWait();
+    void setActionFollow();
+    void setMtx();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void reset();
+    void setMotionAnm(int, f32);
+    BOOL setAction(actionFunc);
+    void wait();
+    void calcFly();
+    BOOL searchPlayer();
+    void follow();
+    void appear();
+    void normalTalk();
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    void warpTalk();
+    void demo();
+    int EvCut_TksSecretChild(int);
+    int EvCut_TksWarpExit(int);
+    int EvCut_TksWarpBack(int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    int drawDbgInfo();
 
     u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
     u16 getMessageNo() { return fopAcM_GetParam(this) >> 16; }
diff --git a/include/d/actor/d_a_npc_tkj.h b/include/d/actor/d_a_npc_tkj.h
index 4df49ffdfa..5ab377f3f5 100644
--- a/include/d/actor/d_a_npc_tkj.h
+++ b/include/d/actor/d_a_npc_tkj.h
@@ -15,26 +15,26 @@ class daNpcTkj_c : public daNpcT_c {
 public:
     typedef int (daNpcTkj_c::*ActionFunc)(void*);
 
-    /* 80573850 */ int create();
-    /* 80573B18 */ int CreateHeap();
-    /* 80573F68 */ int Delete();
-    /* 80573F9C */ int Execute();
-    /* 80573FBC */ int Draw();
-    /* 80574058 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80574078 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 805740D0 */ int getType();
-    /* 80574108 */ int getFlowNodeNo();
-    /* 80574124 */ int isDelete();
-    /* 8057413C */ void reset();
-    /* 805742C8 */ void srchActors();
-    /* 80574858 */ int selectAction();
-    /* 805748A8 */ BOOL chkAction(ActionFunc);
-    /* 805748D4 */ int setAction(ActionFunc);
-    /* 8057497C */ int wait(void*);
-    /* 80574B30 */ int talk(void*);
-    /* 80574D28 */ int cutLv7Start(int);
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int getType();
+    int getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int selectAction();
+    BOOL chkAction(ActionFunc);
+    int setAction(ActionFunc);
+    int wait(void*);
+    int talk(void*);
+    int cutLv7Start(int);
     
-    /* 805763B0 */ daNpcTkj_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    daNpcTkj_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                               daNpcT_motionAnmData_c const* i_motionAnmData,
                               daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                               int i_faceMotionStepNum,
@@ -47,22 +47,22 @@ public:
                         OS_REPORT("|%06d:%x|daNpcTkj_c -> コンストラクト\n", g_Counter.mCounter0, this);
                     }
 
-    /* 8057372C */ virtual ~daNpcTkj_c();
-    /* 8057650C */ virtual BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 17; }
-    /* 8057651C */ virtual BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 19; }
-    /* 80576504 */ virtual s32 getBackboneJointNo() { return 15; }
-    /* 805764FC */ virtual s32 getNeckJointNo() { return 16; }
-    /* 805764F4 */ virtual s32 getHeadJointNo() { return 17; }
-    /* 805764EC */ virtual u16 getEyeballMaterialNo() { return 2; }
-    /* 80575280 */ virtual inline void setParam();
-    /* 805742D4 */ virtual BOOL evtTalk();
-    /* 805743B8 */ virtual BOOL evtCutProc();
-    /* 80574268 */ virtual void setAfterTalkMotion();
-    /* 8057449C */ virtual void action();
-    /* 8057538C */ virtual inline void beforeMove();
-    /* 80574524 */ virtual void setAttnPos();
-    /* 80574770 */ virtual void setCollision();
-    /* 80574850 */ virtual int drawDbgInfo();
+    virtual ~daNpcTkj_c();
+    virtual BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 17; }
+    virtual BOOL checkRemoveJoint(int i_jointNo) { return i_jointNo == 19; }
+    virtual s32 getBackboneJointNo() { return 15; }
+    virtual s32 getNeckJointNo() { return 16; }
+    virtual s32 getHeadJointNo() { return 17; }
+    virtual u16 getEyeballMaterialNo() { return 2; }
+    virtual inline void setParam();
+    virtual BOOL evtTalk();
+    virtual BOOL evtCutProc();
+    virtual void setAfterTalkMotion();
+    virtual void action();
+    virtual inline void beforeMove();
+    virtual void setAttnPos();
+    virtual void setCollision();
+    virtual int drawDbgInfo();
 
     int getPath() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
 
@@ -86,7 +86,7 @@ struct daNpc_Tkj_HIOParam {
 };
 class daNpc_Tkj_Param_c {
 public:
-    /* 8057652C */ virtual ~daNpc_Tkj_Param_c() {}
+    virtual ~daNpc_Tkj_Param_c() {}
 
     static const daNpc_Tkj_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_tkj2.h b/include/d/actor/d_a_npc_tkj2.h
index 2be929dea6..fa50456945 100644
--- a/include/d/actor/d_a_npc_tkj2.h
+++ b/include/d/actor/d_a_npc_tkj2.h
@@ -66,8 +66,8 @@ STATIC_ASSERT(sizeof(npc_tkj2_class) == 0xaa0);
 
 class daNpc_Tkj2_HIO_c {
 public:
-    /* 80B10DEC */ daNpc_Tkj2_HIO_c();
-    /* 80B1421C */ virtual ~daNpc_Tkj2_HIO_c() {}
+    daNpc_Tkj2_HIO_c();
+    virtual ~daNpc_Tkj2_HIO_c() {}
 
     /* 天空人（アクション用）- Sky People (For Action) */
     /* 0x04 */ s8 field_0x4;
diff --git a/include/d/actor/d_a_npc_tks.h b/include/d/actor/d_a_npc_tks.h
index c7677ed86b..75d3933b1d 100644
--- a/include/d/actor/d_a_npc_tks.h
+++ b/include/d/actor/d_a_npc_tks.h
@@ -37,7 +37,7 @@ class daNpcTks_HIO_c
 
 class daNpcTks_Param_c {
 public:
-    /* 80B1DCEC */ virtual ~daNpcTks_Param_c() {}
+    virtual ~daNpcTks_Param_c() {}
 
     static daNpcTks_HIOParam const m;
 };
@@ -62,53 +62,53 @@ class daNpcTks_c : public daNpcF_c {
 public:
     typedef void (daNpcTks_c::*actionFunc)();
 
-    /* 80B1462C */ daNpcTks_c();
-    /* 80B14844 */ ~daNpcTks_c();
-    /* 80B14AF8 */ cPhs__Step Create();
-    /* 80B14ED0 */ int CreateHeap();
-    /* 80B153D8 */ int Delete();
-    /* 80B1540C */ int Execute();
-    /* 80B15430 */ int Draw();
-    /* 80B1548C */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B15650 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B15670 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B156BC */ void setMtx();
-    /* 80B157C0 */ bool setExpressionAnm(int, bool);
-    /* 80B1590C */ bool setExpressionBtp(int);
-    /* 80B159E0 */ void setMotion(int, f32, int);
-    /* 80B15A24 */ void reset();
-    /* 80B160A8 */ inline BOOL setAction(actionFunc);
-    /* 80B16148 */ void wait();
-    /* 80B16344 */ void setMotionAnm(int, f32);
-    /* 80B16634 */ void waitNude();
-    /* 80B1682C */ void waitLv6();
-    /* 80B16B74 */ void talk();
-    /* 80B16FDC */ void setExpression(int, f32);
-    /* 80B17008 */ void hide();
-    /* 80B17420 */ void shake();
-    /* 80B175F4 */ void showUp();
-    /* 80B17734 */ void showUpWait();
-    /* 80B17B70 */ void lookAroundA();
-    /* 80B17D44 */ void lookAroundB();
-    /* 80B17F18 */ void in();
-    /* 80B18070 */ void damage();
-    /* 80B181EC */ void broken();
-    /* 80B183E8 */ void demo_appear();
-    /* 80B18D44 */ void demo_scannon();
-    /* 80B1926C */ void demo_Lv6Gate();
-    /* 80B1946C */ void demo_farewell();
-    /* 80B19DAC */ void demo_warpBack();
-    /* 80B1A30C */ void demo_walkBack();
-    /* 80B1A888 */ void demo_Lv7Start();
-    /* 80B1B6A0 */ void demo_Lv3PickUp();
-    /* 80B1BD64 */ void demo_Lv6PickUp();
-    /* 80B1C480 */ inline void setParam();
-    /* 80B1C4F8 */ inline BOOL main();
-    /* 80B1CB54 */ inline BOOL ctrlBtk();
-    /* 80B1CC28 */ inline void setAttnPos();
-    /* 80B1CFD0 */ inline void lookat();
-    /* 80B1D1FC */ inline BOOL drawDbgInfo();
-    /* 80B1D204 */ inline void drawOtherMdls();
+    daNpcTks_c();
+    ~daNpcTks_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setMtx();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setMotion(int, f32, int);
+    void reset();
+    inline BOOL setAction(actionFunc);
+    void wait();
+    void setMotionAnm(int, f32);
+    void waitNude();
+    void waitLv6();
+    void talk();
+    void setExpression(int, f32);
+    void hide();
+    void shake();
+    void showUp();
+    void showUpWait();
+    void lookAroundA();
+    void lookAroundB();
+    void in();
+    void damage();
+    void broken();
+    void demo_appear();
+    void demo_scannon();
+    void demo_Lv6Gate();
+    void demo_farewell();
+    void demo_warpBack();
+    void demo_walkBack();
+    void demo_Lv7Start();
+    void demo_Lv3PickUp();
+    void demo_Lv6PickUp();
+    inline void setParam();
+    inline BOOL main();
+    inline BOOL ctrlBtk();
+    inline void setAttnPos();
+    inline void lookat();
+    inline BOOL drawDbgInfo();
+    inline void drawOtherMdls();
 
     u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
     u8 getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/actor/d_a_npc_toby.h b/include/d/actor/d_a_npc_toby.h
index 48503f091a..607b2fb649 100644
--- a/include/d/actor/d_a_npc_toby.h
+++ b/include/d/actor/d_a_npc_toby.h
@@ -14,7 +14,7 @@ struct daNpc_Toby_HIOParam {
 
 class daNpc_Toby_Param_c {
 public:
-    /* 80B24978 */ virtual ~daNpc_Toby_Param_c() {}
+    virtual ~daNpc_Toby_Param_c() {}
 
     static const daNpc_Toby_HIOParam m;
 };
@@ -48,52 +48,52 @@ public:
     typedef int (daNpc_Toby_c::*cutFunc)(int);
     typedef int (daNpc_Toby_c::*actionFunc)(void*);
 
-    /* 80B1E64C */ ~daNpc_Toby_c();
-    /* 80B1E798 */ int create();
-    /* 80B1EA60 */ int CreateHeap();
-    /* 80B1EF28 */ int Delete();
-    /* 80B1EF5C */ int Execute();
-    /* 80B1EF7C */ int Draw();
-    /* 80B1F010 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B1F030 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B1F088 */ static void* srchToby(void*, void*);
-    /* 80B1F124 */ fopAc_ac_c* getOtherTobyP(int);
-    /* 80B1F200 */ u8 getType();
-    /* 80B1F274 */ int isDelete();
-    /* 80B1F384 */ void reset();
-    /* 80B1F5AC */ void afterJntAnm(int);
-    /* 80B1F638 */ void setParam();
-    /* 80B1F784 */ BOOL checkChangeEvt();
-    /* 80B1F950 */ void setAfterTalkMotion();
-    /* 80B1FA08 */ void srchActors();
-    /* 80B1FB34 */ BOOL evtTalk();
-    /* 80B1FBD4 */ BOOL evtCutProc();
-    /* 80B1FC9C */ void action();
-    /* 80B1FE68 */ void beforeMove();
-    /* 80B1FF2C */ void setAttnPos();
-    /* 80B20278 */ void setCollision();
-    /* 80B2042C */ int drawDbgInfo();
-    /* 80B20434 */ void drawOtherMdl();
-    /* 80B2050C */ bool afterSetFaceMotionAnm(int, int, f32, int);
-    /* 80B20568 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80B205F4 */ int selectAction();
-    /* 80B20710 */ int chkAction(actionFunc);
-    /* 80B2073C */ int setAction(actionFunc);
-    /* 80B207E4 */ int cutTobyHouseFire(int);
-    /* 80B20AB0 */ int cutTalkToOneself(int);
-    /* 80B20FC0 */ int cutRepairSCannon(int);
-    /* 80B215B4 */ int cutSCannon(int);
-    /* 80B219F4 */ int cutConversationAboutSCannon(int);
-    /* 80B22434 */ int cutConversationAboutZra(int);
-    /* 80B22614 */ int chkAttnZra();
-    /* 80B226B0 */ int wait(void*);
-    /* 80B22D98 */ int walk(void*);
-    /* 80B22FAC */ int play(void*);
-    /* 80B23344 */ int talk(void*);
+    ~daNpc_Toby_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchToby(void*, void*);
+    fopAc_ac_c* getOtherTobyP(int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool afterSetFaceMotionAnm(int, int, f32, int);
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    int chkAction(actionFunc);
+    int setAction(actionFunc);
+    int cutTobyHouseFire(int);
+    int cutTalkToOneself(int);
+    int cutRepairSCannon(int);
+    int cutSCannon(int);
+    int cutConversationAboutSCannon(int);
+    int cutConversationAboutZra(int);
+    int chkAttnZra();
+    int wait(void*);
+    int walk(void*);
+    int play(void*);
+    int talk(void*);
 #if DEBUG
     int test(void*);
 #endif
-    /* 80B24840 */ daNpc_Toby_c(
+    daNpc_Toby_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -106,15 +106,15 @@ public:
         // "|%06d:%x|daNpc_Toby_c -> Construct\n"
         OS_REPORT("|%06d:%x|daNpc_Toby_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80B24920 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80B24928 */ s32 getHeadJointNo() { return 4; }
-    /* 80B24930 */ s32 getNeckJointNo() { return 3; }
-    /* 80B24938 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B24940 */ BOOL checkChangeJoint(int arg0) { return arg0 == 4; }
-    /* 80B24950 */ BOOL checkRemoveJoint(int arg0) { return arg0 == 8; }
-    /* 80B24960 */ s32 getFootLJointNo() { return 24; }
-    /* 80B24968 */ s32 getFootRJointNo() { return 27; }
-    /* 80B24970 */ BOOL chkXYItems() { return TRUE; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int arg0) { return arg0 == 4; }
+    BOOL checkRemoveJoint(int arg0) { return arg0 == 8; }
+    s32 getFootLJointNo() { return 24; }
+    s32 getFootRJointNo() { return 27; }
+    BOOL chkXYItems() { return TRUE; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_tr.h b/include/d/actor/d_a_npc_tr.h
index 95a7b9d5f5..798f9473e1 100644
--- a/include/d/actor/d_a_npc_tr.h
+++ b/include/d/actor/d_a_npc_tr.h
@@ -38,8 +38,8 @@ public:
 
 class daNPC_TR_HIO_c {
 public:
-    /* 80B25A0C */ daNPC_TR_HIO_c();
-    /* 80B264E4 */ virtual ~daNPC_TR_HIO_c();
+    daNPC_TR_HIO_c();
+    virtual ~daNPC_TR_HIO_c();
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_npc_uri.h b/include/d/actor/d_a_npc_uri.h
index 005905d454..5efde8c51d 100644
--- a/include/d/actor/d_a_npc_uri.h
+++ b/include/d/actor/d_a_npc_uri.h
@@ -20,7 +20,7 @@ struct daNpc_Uri_HIOParam {
 
 class daNpc_Uri_Param_c {
 public:
-    /* 80B2CD94 */ virtual ~daNpc_Uri_Param_c() {}
+    virtual ~daNpc_Uri_Param_c() {}
 
     static const daNpc_Uri_HIOParam m;
 };
@@ -64,65 +64,65 @@ public:
         TYPE_6,
     };
 
-    /* 80B267AC */ ~daNpc_Uri_c();
-    /* 80B268F8 */ int create();
-    /* 80B26BE4 */ int CreateHeap();
-    /* 80B2708C */ int Delete();
-    /* 80B270C0 */ int Execute();
-    /* 80B270E0 */ int Draw();
-    /* 80B27174 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B27194 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B271EC */ u8 getType();
-    /* 80B27260 */ int isDelete();
-    /* 80B272F0 */ void reset();
-    /* 80B27750 */ void afterJntAnm(int);
-    /* 80B27820 */ void setParam();
-    /* 80B27994 */ BOOL checkChangeEvt();
-    /* 80B27B3C */ void setAfterTalkMotion();
-    /* 80B27BF0 */ void srchActors();
-    /* 80B27C8C */ BOOL evtTalk();
-    /* 80B27D2C */ BOOL evtCutProc();
-    /* 80B27DF4 */ void action();
-    /* 80B27F14 */ void beforeMove();
-    /* 80B27FD8 */ void setAttnPos();
-    /* 80B28318 */ void setCollision();
-    /* 80B284D4 */ int drawDbgInfo();
-    /* 80B284DC */ void drawOtherMdl();
-    /* 80B285B4 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80B285EC */ void changeBck(int*, int*);
-    /* 80B28618 */ void changeBtp(int*, int*);
-    /* 80B28644 */ int selectAction();
-    /* 80B28794 */ int chkAction(int (daNpc_Uri_c::*)(void*));
-    /* 80B287C0 */ int setAction(int (daNpc_Uri_c::*)(void*));
-    /* 80B28868 */ BOOL chkPlayerCarryBasket();
-    /* 80B288DC */ BOOL chkPlayerGetWoodShield();
-    /* 80B28910 */ int getTutorialCond(cXyz);
-    /* 80B28FB8 */ int cutConversation(int);
-    /* 80B29198 */ int cutStartCarryTutorial(int);
-    /* 80B293C0 */ int cutEndCarryTutorial(int);
-    /* 80B296B8 */ int cutConversationWithMoi(int);
-    /* 80B2985C */ int cutFindWolf(int);
-    /* 80B29BA4 */ int cutMeetingAgain(int);
-    /* 80B29EA0 */ int krun(void*);
-    /* 80B2A1B4 */ int wait(void*);
-    /* 80B2AB60 */ int walk(void*);
-    /* 80B2B24C */ int sitWait(void*);
-    /* 80B2B7C0 */ int talk(void*);
-    /* 80B2CC64 */ daNpc_Uri_c(daNpcT_faceMotionAnmData_c const* param_1,
+    ~daNpc_Uri_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool afterSetMotionAnm(int, int, f32, int);
+    void changeBck(int*, int*);
+    void changeBtp(int*, int*);
+    int selectAction();
+    int chkAction(int (daNpc_Uri_c::*)(void*));
+    int setAction(int (daNpc_Uri_c::*)(void*));
+    BOOL chkPlayerCarryBasket();
+    BOOL chkPlayerGetWoodShield();
+    int getTutorialCond(cXyz);
+    int cutConversation(int);
+    int cutStartCarryTutorial(int);
+    int cutEndCarryTutorial(int);
+    int cutConversationWithMoi(int);
+    int cutFindWolf(int);
+    int cutMeetingAgain(int);
+    int krun(void*);
+    int wait(void*);
+    int walk(void*);
+    int sitWait(void*);
+    int talk(void*);
+    daNpc_Uri_c(daNpcT_faceMotionAnmData_c const* param_1,
                                daNpcT_motionAnmData_c const* param_2,
                                daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                int param_4,
                                daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
                                int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
-    /* 80B2CD44 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80B2CD4C */ s32 getHeadJointNo() { return 4; }
-    /* 80B2CD54 */ s32 getNeckJointNo() { return 3; }
-    /* 80B2CD5C */ s32 getBackboneJointNo() { return 1; }
-    /* 80B2CD64 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
-    /* 80B2CD74 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
-    /* 80B2CD84 */ s32 getFootLJointNo() { return 25; }
-    /* 80B2CD8C */ s32 getFootRJointNo() { return 28; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
+    BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
+    s32 getFootLJointNo() { return 25; }
+    s32 getFootRJointNo() { return 28; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_wrestler.h b/include/d/actor/d_a_npc_wrestler.h
index c8e9d5fb99..9a34af5e76 100644
--- a/include/d/actor/d_a_npc_wrestler.h
+++ b/include/d/actor/d_a_npc_wrestler.h
@@ -75,7 +75,7 @@ struct daNpcWrestler_HIOParamSub {
 
 class daNpcWrestler_Param_c {
 public:
-    /* 80B41670 */ virtual ~daNpcWrestler_Param_c() {}
+    virtual ~daNpcWrestler_Param_c() {}
 
     static daNpcWrestler_HIOParam const m;
 };
@@ -130,78 +130,78 @@ public:
     typedef bool (daNpcWrestler_c::*actionFunc)(void*);
     typedef BOOL (daNpcWrestler_c::*EventFn)(int);
 
-    /* 80B2F28C */ daNpcWrestler_c();
-    /* 80B2F688 */ cPhs__Step Create();
-    /* 80B2F974 */ int CreateHeap();
-    /* 80B2FDB0 */ int Delete();
-    /* 80B2FDE4 */ int Execute();
-    /* 80B2FE1C */ int Draw();
-    /* 80B2FE84 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B30150 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B30170 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B301BC */ bool checkStartUp();
-    /* 80B308B0 */ void reset();
-    /* 80B30AD8 */ inline int setAction(actionFunc);
-    /* 80B30BEC */ void checkArenaInfo();
-    /* 80B30CA4 */ bool checkArenaSub(fopAc_ac_c*);
-    /* 80B30D48 */ void setOnToArena(f32);
-    /* 80B30F00 */ inline bool wait(void*);
-    /* 80B316F4 */ inline bool talk(void*);
-    /* 80B31EB0 */ inline bool demo(void*);
-    /* 80B32058 */ inline bool gotoArena(void*);
-    /* 80B32444 */ inline bool gotoLiving(void*);
-    /* 80B32850 */ inline bool sumouReady(void*);
-    /* 80B331CC */ inline bool sumouWait(void*);
-    /* 80B339EC */ inline bool checkOutOfArenaP();
-    /* 80B33B3C */ inline bool setNextAction();
-    /* 80B34654 */ inline bool sumouPunchHit(void*);
-    /* 80B34CD0 */ inline bool sumouPunchChaseHit(void*);
-    /* 80B35364 */ inline bool sumouPunchMiss(void*);
-    /* 80B35780 */ inline bool checkOutOfArenaW();
-    /* 80B358F0 */ cXyz getJointPos(int);
-    /* 80B35968 */ inline bool sumouPunchDraw(void*);
-    /* 80B3606C */ inline bool sumouTackleHit(void*);
-    /* 80B36908 */ inline bool sumouTackleMiss(void*);
-    /* 80B36C8C */ inline bool sumouTackleDraw(void*);
-    /* 80B37270 */ inline bool sumouSideStep(void*);
-    /* 80B378F4 */ inline bool sumouLostBalance(void*);
-    /* 80B37C30 */ inline bool sumouPunchShock(void*);
-    /* 80B37FB8 */ inline bool sumouPunchChaseShock(void*);
-    /* 80B38518 */ inline bool sumouPunchStagger(void*);
-    /* 80B389A4 */ inline bool sumouTackleShock(void*);
-    /* 80B38C90 */ inline bool sumouTackleStagger(void*);
-    /* 80B39334 */ inline bool sumouTackleStaggerRelease(void*);
-    /* 80B39554 */ inline bool sumouTacklePush(void*);
-    /* 80B39C18 */ inline bool sumouTackleRelease(void*);
-    /* 80B39F88 */ inline bool demoSumouReady(void*);
-    /* 80B3AE24 */ inline bool demoSumouWin(void*);
-    /* 80B3B4B4 */ inline bool demoSumouLose(void*);
-    /* 80B3BC84 */ inline bool demoSumouWin2(void*);
-    /* 80B3C278 */ inline bool demoSumouLose2(void*);
-    /* 80B3CA2C */ inline bool demoSumouUnilateralWin(void*);
-    /* 80B3D0C0 */ inline bool demoTalkAfterLose(void*);
-    /* 80B3D584 */ inline BOOL EvCut_grDSEntry(int);
-    /* 80B3DB50 */ inline BOOL EvCut_grDSEntry2(int);
-    /* 80B3DCE8 */ inline BOOL EvCut_grDSEntry3_4(int);
-    /* 80B3E0FC */ inline BOOL EvCut_grDSEntry5(int);
-    /* 80B3E584 */ inline BOOL EvCut_grDSLose(int);
-    /* 80B3EF10 */ inline void setWrestlerVoice();
-    /* 80B3FCE8 */ inline void playMotion();
-    /* 80B40B3C */ inline void lookat();
+    daNpcWrestler_c();
+    cPhs__Step Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    bool checkStartUp();
+    void reset();
+    inline int setAction(actionFunc);
+    void checkArenaInfo();
+    bool checkArenaSub(fopAc_ac_c*);
+    void setOnToArena(f32);
+    inline bool wait(void*);
+    inline bool talk(void*);
+    inline bool demo(void*);
+    inline bool gotoArena(void*);
+    inline bool gotoLiving(void*);
+    inline bool sumouReady(void*);
+    inline bool sumouWait(void*);
+    inline bool checkOutOfArenaP();
+    inline bool setNextAction();
+    inline bool sumouPunchHit(void*);
+    inline bool sumouPunchChaseHit(void*);
+    inline bool sumouPunchMiss(void*);
+    inline bool checkOutOfArenaW();
+    cXyz getJointPos(int);
+    inline bool sumouPunchDraw(void*);
+    inline bool sumouTackleHit(void*);
+    inline bool sumouTackleMiss(void*);
+    inline bool sumouTackleDraw(void*);
+    inline bool sumouSideStep(void*);
+    inline bool sumouLostBalance(void*);
+    inline bool sumouPunchShock(void*);
+    inline bool sumouPunchChaseShock(void*);
+    inline bool sumouPunchStagger(void*);
+    inline bool sumouTackleShock(void*);
+    inline bool sumouTackleStagger(void*);
+    inline bool sumouTackleStaggerRelease(void*);
+    inline bool sumouTacklePush(void*);
+    inline bool sumouTackleRelease(void*);
+    inline bool demoSumouReady(void*);
+    inline bool demoSumouWin(void*);
+    inline bool demoSumouLose(void*);
+    inline bool demoSumouWin2(void*);
+    inline bool demoSumouLose2(void*);
+    inline bool demoSumouUnilateralWin(void*);
+    inline bool demoTalkAfterLose(void*);
+    inline BOOL EvCut_grDSEntry(int);
+    inline BOOL EvCut_grDSEntry2(int);
+    inline BOOL EvCut_grDSEntry3_4(int);
+    inline BOOL EvCut_grDSEntry5(int);
+    inline BOOL EvCut_grDSLose(int);
+    inline void setWrestlerVoice();
+    inline void playMotion();
+    inline void lookat();
 
-    /* 80B2F4A0 */ virtual ~daNpcWrestler_c();
-    /* 80B3EAE4 */ inline void setParam();
-    /* 80B3EB94 */ inline BOOL main();
-    /* 80B404FC */ inline BOOL ctrlBtk();
-    /* 80B4166C */ void adjustShapeAngle() {}
-    /* 80B405E8 */ inline void setAttnPos();
-    /* 80B3023C */ inline bool setExpressionAnm(int, bool);
-    /* 80B30654 */ inline bool setExpressionBtp(int);
-    /* 80B316C8 */ inline void setExpression(int, f32);
-    /* 80B3074C */ inline void setMotionAnm(int, f32);
-    /* 80B31680 */ void setMotion(int, f32, int);
-    /* 80B40D1C */ inline BOOL drawDbgInfo();
-    /* 80B40D24 */ inline void drawOtherMdls();
+    virtual ~daNpcWrestler_c();
+    inline void setParam();
+    inline BOOL main();
+    inline BOOL ctrlBtk();
+    void adjustShapeAngle() {}
+    inline void setAttnPos();
+    inline bool setExpressionAnm(int, bool);
+    inline bool setExpressionBtp(int);
+    inline void setExpression(int, f32);
+    inline void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    inline BOOL drawDbgInfo();
+    inline void drawOtherMdls();
 
     s16 getMessageNo() { return (fopAcM_GetParam(this) >> 8) & 0xFFFF; }
     int getWrestlerAction() { return mWrestlerAction; }
diff --git a/include/d/actor/d_a_npc_yamid.h b/include/d/actor/d_a_npc_yamid.h
index 17838117f6..f4f7856ac6 100644
--- a/include/d/actor/d_a_npc_yamid.h
+++ b/include/d/actor/d_a_npc_yamid.h
@@ -18,7 +18,7 @@ struct daNpc_yamiD_HIOParam {
 
 class daNpc_yamiD_Param_c {
 public:
-    /* 80B45FE0 */ virtual ~daNpc_yamiD_Param_c() {}
+    virtual ~daNpc_yamiD_Param_c() {}
 
     static daNpc_yamiD_HIOParam const m;
 };
@@ -44,39 +44,39 @@ public:
     typedef BOOL (daNpc_yamiD_c::*cutFunc)(int);
     typedef int (daNpc_yamiD_c::*actionFunc)(void*);
 
-    /* 80B42F4C */ ~daNpc_yamiD_c();
-    /* 80B43084 */ cPhs__Step create();
-    /* 80B43338 */ int CreateHeap();
-    /* 80B43788 */ int Delete();
-    /* 80B437BC */ int Execute();
-    /* 80B437DC */ int Draw();
-    /* 80B43884 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B438A4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B438FC */ u8 getType();
-    /* 80B43934 */ u32 getFlowNodeNo();
-    /* 80B43998 */ BOOL isDelete();
-    /* 80B43A20 */ void reset();
-    /* 80B43C34 */ void afterJntAnm(int);
-    /* 80B43CC0 */ void setParam();
-    /* 80B43DBC */ void setAfterTalkMotion();
-    /* 80B43E1C */ void srchActors();
-    /* 80B43E28 */ BOOL evtTalk();
-    /* 80B43F0C */ BOOL evtCutProc();
-    /* 80B43FD4 */ void action();
-    /* 80B440C0 */ void beforeMove();
-    /* 80B44138 */ void setAttnPos();
-    /* 80B44364 */ void setCollision();
-    /* 80B44498 */ int drawDbgInfo();
-    /* 80B444A0 */ void drawGhost();
-    /* 80B4450C */ int selectAction();
-    /* 80B44554 */ BOOL chkAction(int (daNpc_yamiD_c::*)(void*));
-    /* 80B44580 */ int setAction(int (daNpc_yamiD_c::*)(void*));
-    /* 80B44628 */ int wait(void*);
-    /* 80B44900 */ int talk(void*);
-    /* 80B44AF8 */ BOOL cutStopper(int);
-    /* 80B44B8C */ BOOL _cutStopper_Init(int const&);
-    /* 80B44BD4 */ BOOL _cutStopper_Main(int const&);
-    /* 80B45E74 */ daNpc_yamiD_c(
+    ~daNpc_yamiD_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u32 getFlowNodeNo();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawGhost();
+    int selectAction();
+    BOOL chkAction(int (daNpc_yamiD_c::*)(void*));
+    int setAction(int (daNpc_yamiD_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    BOOL cutStopper(int);
+    BOOL _cutStopper_Init(int const&);
+    BOOL _cutStopper_Main(int const&);
+    daNpc_yamiD_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -90,13 +90,13 @@ public:
         i_arcNames) {
             OS_REPORT("|%06d:%x|daNpc_yamiD_c -> コンストラクト\n", g_Counter.mCounter0, this);
         }
-    /* 80B45F34 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80B45F3C */ s32 getHeadJointNo() { return 4; }
-    /* 80B45F44 */ s32 getNeckJointNo() { return 3; }
-    /* 80B45F4C */ s32 getBackboneJointNo() { return 1; }
-    /* 80B45F54 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80B45F64 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
-    /* 80B45F74 */ BOOL evtEndProc() {
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
+    BOOL evtEndProc() {
                         mJntAnm.lookNone(0);
                         eventInfo.setIdx(0);
                         mEvtNo = 0;
diff --git a/include/d/actor/d_a_npc_yamis.h b/include/d/actor/d_a_npc_yamis.h
index eee897c32d..640fb431c9 100644
--- a/include/d/actor/d_a_npc_yamis.h
+++ b/include/d/actor/d_a_npc_yamis.h
@@ -9,7 +9,7 @@ struct daNpc_yamiS_HIOParam {
 
 class daNpc_yamiS_Param_c {
 public:
-    /* 80B4CD38 */ virtual ~daNpc_yamiS_Param_c() {}
+    virtual ~daNpc_yamiS_Param_c() {}
 
     static const daNpc_yamiS_HIOParam m;
 };
@@ -43,39 +43,39 @@ public:
     typedef BOOL (daNpc_yamiS_c::*cutFunc)(int);
     typedef int (daNpc_yamiS_c::*actionFunc)(void*);
 
-    /* 80B4656C */ ~daNpc_yamiS_c();
-    /* 80B466A4 */ cPhs__Step create();
-    /* 80B46958 */ int CreateHeap();
-    /* 80B46DA8 */ int Delete();
-    /* 80B46DDC */ int Execute();
-    /* 80B46DFC */ int Draw();
-    /* 80B46EA4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B46EC4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B46F1C */ u8 getType();
-    /* 80B46F54 */ u32 getFlowNodeNo();
-    /* 80B46FB8 */ BOOL isDelete();
-    /* 80B47040 */ void reset();
-    /* 80B47254 */ void afterJntAnm(int);
-    /* 80B472E0 */ void setParam();
-    /* 80B473DC */ void setAfterTalkMotion();
-    /* 80B4743C */ void srchActors();
-    /* 80B47440 */ BOOL evtTalk();
-    /* 80B47524 */ BOOL evtCutProc();
-    /* 80B475EC */ void action();
-    /* 80B476D8 */ void beforeMove();
-    /* 80B47750 */ void setAttnPos();
-    /* 80B4797C */ void setCollision();
-    /* 80B47AE8 */ int drawDbgInfo();
-    /* 80B47AF0 */ void drawGhost();
-    /* 80B47B5C */ int selectAction();
-    /* 80B47BA4 */ BOOL chkAction(int (daNpc_yamiS_c::*)(void*));
-    /* 80B47BD0 */ int setAction(int (daNpc_yamiS_c::*)(void*));
-    /* 80B47C78 */ int wait(void*);
-    /* 80B47F50 */ int talk(void*);
-    /* 80B4815C */ BOOL cutStopper(int);
-    /* 80B481F0 */ BOOL _cutStopper_Init(int const&);
-    /* 80B48238 */ BOOL _cutStopper_Main(int const&);
-    /* 80B494D8 */ daNpc_yamiS_c(
+    ~daNpc_yamiS_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u32 getFlowNodeNo();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawGhost();
+    int selectAction();
+    BOOL chkAction(int (daNpc_yamiS_c::*)(void*));
+    int setAction(int (daNpc_yamiS_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    BOOL cutStopper(int);
+    BOOL _cutStopper_Init(int const&);
+    BOOL _cutStopper_Main(int const&);
+    daNpc_yamiS_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -85,13 +85,13 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80B49598 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80B495A0 */ s32 getHeadJointNo() { return 4; }
-    /* 80B495A8 */ s32 getNeckJointNo() { return 3; }
-    /* 80B495B0 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B495B8 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80B495C8 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
-    /* 80B495D8 */ BOOL evtEndProc() {
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
+    BOOL evtEndProc() {
         mJntAnm.lookNone(0);
         eventInfo.setIdx(0);
         mEvtNo = 0;
diff --git a/include/d/actor/d_a_npc_yamit.h b/include/d/actor/d_a_npc_yamit.h
index 0ff9e7979b..d43b49dedf 100644
--- a/include/d/actor/d_a_npc_yamit.h
+++ b/include/d/actor/d_a_npc_yamit.h
@@ -10,7 +10,7 @@ struct daNpc_yamiT_HIOParam {
 
 class daNpc_yamiT_Param_c {
 public:
-    /* 80B4CD38 */ virtual ~daNpc_yamiT_Param_c() {}
+    virtual ~daNpc_yamiT_Param_c() {}
 
     static const daNpc_yamiT_HIOParam m;
 };
@@ -44,41 +44,41 @@ public:
     typedef BOOL (daNpc_yamiT_c::*cutFunc)(int);
     typedef int (daNpc_yamiT_c::*actionFunc)(void*);
 
-    /* 80B49BEC */ ~daNpc_yamiT_c();
-    /* 80B49D24 */ cPhs__Step create();
-    /* 80B49FD8 */ int CreateHeap();
-    /* 80B4A428 */ int Delete();
-    /* 80B4A45C */ int Execute();
-    /* 80B4A47C */ static void* _search_Tag(void*, void*);
-    /* 80B4A4E0 */ int Draw();
-    /* 80B4A588 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B4A5A8 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B4A600 */ u8 getType();
-    /* 80B4A638 */ u32 getFlowNodeNo();
-    /* 80B4A69C */ BOOL isDelete();
-    /* 80B4A724 */ void reset();
-    /* 80B4A914 */ void afterJntAnm(int);
-    /* 80B4A9A0 */ void setParam();
-    /* 80B4AAD0 */ void setAfterTalkMotion();
-    /* 80B4AB30 */ void srchActors();
-    /* 80B4ABA0 */ BOOL evtTalk();
-    /* 80B4AC84 */ BOOL evtCutProc();
-    /* 80B4AD4C */ void action();
-    /* 80B4AE38 */ void beforeMove();
-    /* 80B4AEB0 */ void setAttnPos();
-    /* 80B4B0DC */ void setCollision();
-    /* 80B4B210 */ int drawDbgInfo();
-    /* 80B4B218 */ BOOL evtEndProc();
-    /* 80B4B294 */ void drawGhost();
-    /* 80B4B300 */ int selectAction();
-    /* 80B4B348 */ BOOL chkAction(int (daNpc_yamiT_c::*)(void*));
-    /* 80B4B374 */ int setAction(int (daNpc_yamiT_c::*)(void*));
-    /* 80B4B41C */ int wait(void*);
-    /* 80B4B7D4 */ int talk(void*);
-    /* 80B4B9E0 */ BOOL cutStopper(int);
-    /* 80B4BA74 */ BOOL _cutStopper_Init(int const&);
-    /* 80B4BAAC */ BOOL _cutStopper_Main(int const&);
-    /* 80B4CC38 */ daNpc_yamiT_c(
+    ~daNpc_yamiT_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    static void* _search_Tag(void*, void*);
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u32 getFlowNodeNo();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL evtEndProc();
+    void drawGhost();
+    int selectAction();
+    BOOL chkAction(int (daNpc_yamiT_c::*)(void*));
+    int setAction(int (daNpc_yamiT_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    BOOL cutStopper(int);
+    BOOL _cutStopper_Init(int const&);
+    BOOL _cutStopper_Main(int const&);
+    daNpc_yamiT_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -88,12 +88,12 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80B4CCF8 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80B4CD00 */ s32 getHeadJointNo() { return 4; }
-    /* 80B4CD08 */ s32 getNeckJointNo() { return 3; }
-    /* 80B4CD10 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B4CD18 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
-    /* 80B4CD28 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
 
     u8 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
     int getSwitchBitNo() {
diff --git a/include/d/actor/d_a_npc_yelia.h b/include/d/actor/d_a_npc_yelia.h
index a9d8ee1aff..527a383334 100644
--- a/include/d/actor/d_a_npc_yelia.h
+++ b/include/d/actor/d_a_npc_yelia.h
@@ -13,42 +13,42 @@
  */
 class daNpc_Yelia_c : public daNpcT_c {
 public:
-    /* 80B4D30C */ ~daNpc_Yelia_c();
-    /* 80B4D458 */ cPhs__Step create();
-    /* 80B4D754 */ int CreateHeap();
-    /* 80B4DC20 */ int Delete();
-    /* 80B4DC54 */ int Execute();
-    /* 80B4DC74 */ int Draw();
-    /* 80B4DD08 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B4DD28 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B4DD80 */ u8 getType();
-    /* 80B4DDF8 */ BOOL isDelete();
-    /* 80B4DF10 */ void reset();
-    /* 80B4E068 */ void afterJntAnm(int);
-    /* 80B4E0F4 */ void setParam();
-    /* 80B4E2C0 */ BOOL checkChangeEvt();
-    /* 80B4E5BC */ void setAfterTalkMotion();
-    /* 80B4E6A0 */ void srchActors();
-    /* 80B4E7C8 */ BOOL evtTalk();
-    /* 80B4E868 */ BOOL evtCutProc();
-    /* 80B4E930 */ void action();
-    /* 80B4EA28 */ void beforeMove();
-    /* 80B4EAEC */ void setAttnPos();
-    /* 80B4EE4C */ void setCollision();
-    /* 80B4EFA4 */ BOOL drawDbgInfo();
-    /* 80B4EFAC */ BOOL selectAction();
-    /* 80B4F054 */ BOOL chkAction(BOOL (daNpc_Yelia_c::*)(void*));
-    /* 80B4F080 */ BOOL setAction(BOOL (daNpc_Yelia_c::*)(void*));
-    /* 80B4F128 */ BOOL cutConversationAboutLoopHole(int);
-    /* 80B4F3E0 */ BOOL cutTWResistance(int);
-    /* 80B4F534 */ BOOL cutTakeWoodStatue(int);
-    /* 80B4FDD8 */ BOOL cutClothTry(int);
-    /* 80B4FE78 */ BOOL cutThankYou(int);
-    /* 80B50084 */ BOOL wait(void*);
-    /* 80B5080C */ BOOL horseWait(void*);
-    /* 80B50A0C */ BOOL reminiscence(void*);
-    /* 80B50B60 */ BOOL talk(void*);
-    /* 80B52104 */ daNpc_Yelia_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+    ~daNpc_Yelia_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    BOOL drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(BOOL (daNpc_Yelia_c::*)(void*));
+    BOOL setAction(BOOL (daNpc_Yelia_c::*)(void*));
+    BOOL cutConversationAboutLoopHole(int);
+    BOOL cutTWResistance(int);
+    BOOL cutTakeWoodStatue(int);
+    BOOL cutClothTry(int);
+    BOOL cutThankYou(int);
+    BOOL wait(void*);
+    BOOL horseWait(void*);
+    BOOL reminiscence(void*);
+    BOOL talk(void*);
+    daNpc_Yelia_c(daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
                         daNpcT_motionAnmData_c const* i_motionAnmData,
                         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
                         int i_faceMotionStepNum,
@@ -58,13 +58,13 @@ public:
                         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                         i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                         i_arcNames) {}
-    /* 80B521E4 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80B521EC */ s32 getHeadJointNo() { return 4; }
-    /* 80B521F4 */ s32 getNeckJointNo() { return 3; }
-    /* 80B521FC */ s32 getBackboneJointNo() { return 1; }
-    /* 80B52204 */ BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
-    /* 80B52214 */ BOOL checkRemoveJoint(int i_jointNo) {return i_jointNo == 9; }
-    /* 80B52224 */ BOOL chkXYItems() { return true; }
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_jointNo) { return i_jointNo == 4; }
+    BOOL checkRemoveJoint(int i_jointNo) {return i_jointNo == 9; }
+    BOOL chkXYItems() { return true; }
 
     u32 getFlowNodeNo() {
         u16 no = home.angle.x;
@@ -136,7 +136,7 @@ public:
         /* 0x88 */ f32 field_0x88;
     };
 
-    /* 80B5222C */ virtual ~daNpc_Yelia_Param_c() {}
+    virtual ~daNpc_Yelia_Param_c() {}
 
     static param const m;
 };
diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h
index a1018d82a4..ae91298e31 100644
--- a/include/d/actor/d_a_npc_ykm.h
+++ b/include/d/actor/d_a_npc_ykm.h
@@ -36,7 +36,7 @@ struct daNpc_ykM_HIOParam {
 
 class daNpc_ykM_Param_c {
 public:
-    /* 80B5D6C8 */ virtual ~daNpc_ykM_Param_c() {}
+    virtual ~daNpc_ykM_Param_c() {}
 
     static daNpc_ykM_HIOParam const m;
 };
@@ -194,65 +194,65 @@ public:
     typedef int (daNpc_ykM_c::*cutFunc)(int);
     typedef BOOL (daNpc_ykM_c::*ActionFn)(void*);
     
-    /* 80B534EC */ ~daNpc_ykM_c();
-    /* 80B53698 */ cPhs__Step create();
-    /* 80B53990 */ int CreateHeap();
-    /* 80B540BC */ int Delete();
-    /* 80B540F0 */ int Execute();
-    /* 80B54110 */ int Draw();
-    /* 80B541F8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B54218 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B54270 */ static void* srchGadget(void*, void*);
-    /* 80B5430C */ fopAc_ac_c* getTomatoPureeP();
-    /* 80B543DC */ fopAc_ac_c* getCheeseP();
-    /* 80B544B0 */ static void* srchYkm(void*, void*);
-    /* 80B5454C */ fopAc_ac_c* getOtherYkmP(int);
-    /* 80B54628 */ static void* srchYkw(void*, void*);
-    /* 80B546C4 */ fopAc_ac_c* getOtherYkwP(int);
-    /* 80B547A0 */ u8 getType();
-    /* 80B54808 */ BOOL isDelete();
-    /* 80B548A8 */ void reset();
-    /* 80B54B44 */ void afterJntAnm(int);
-    /* 80B54BD0 */ void setParam();
-    /* 80B54E5C */ BOOL checkChangeEvt();
-    /* 80B55004 */ void setAfterTalkMotion();
-    /* 80B550A4 */ void srchActors();
-    /* 80B55254 */ BOOL evtTalk();
-    /* 80B552F4 */ BOOL evtCutProc();
-    /* 80B553BC */ void action();
-    /* 80B55658 */ void beforeMove();
-    /* 80B5571C */ void afterMoved();
-    /* 80B55A64 */ void setAttnPos();
-    /* 80B560B4 */ void setCollision();
-    /* 80B5641C */ int drawDbgInfo();
-    /* 80B56424 */ void drawOtherMdl();
-    /* 80B56624 */ bool setFishAnm(int, int, f32);
-    /* 80B566E8 */ bool setLeafAnm(int, f32);
-    /* 80B567B4 */ bool afterSetMotionAnm(int, int, f32, int);
-    /* 80B5680C */ int selectAction();
-    /* 80B56954 */ BOOL chkAction(ActionFn);
-    /* 80B56980 */ int setAction(ActionFn);
-    /* 80B56A28 */ BOOL chkContinueAttnPlayer();
-    /* 80B56AB4 */ BOOL chkTouchPlayer();
-    /* 80B56B84 */ int cutSlideDown(int);
-    /* 80B572C8 */ int cutMeetingAgain(int);
-    /* 80B57638 */ int cutGetTomatoPuree(int);
-    /* 80B5806C */ int cutGetTaste(int);
-    /* 80B58A38 */ int cutLv5DungeonClear(int);
-    /* 80B59500 */ int cutFindWolf(int);
-    /* 80B59748 */ int cutStartSnowboardRace(int);
-    /* 80B59B90 */ int cutEndSnowboardRace(int);
-    /* 80B5A0B8 */ int cutHug(int);
-    /* 80B5A128 */ void setDialogueMotion();
-    /* 80B5A224 */ int dialogue();
-    /* 80B5A3FC */ BOOL wait(void*);
-    /* 80B5ABA8 */ BOOL cook(void*);
-    /* 80B5B260 */ BOOL race(void*);
-    /* 80B5BE08 */ BOOL talk(void*);
+    ~daNpc_ykM_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchGadget(void*, void*);
+    fopAc_ac_c* getTomatoPureeP();
+    fopAc_ac_c* getCheeseP();
+    static void* srchYkm(void*, void*);
+    fopAc_ac_c* getOtherYkmP(int);
+    static void* srchYkw(void*, void*);
+    fopAc_ac_c* getOtherYkwP(int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    bool setFishAnm(int, int, f32);
+    bool setLeafAnm(int, f32);
+    bool afterSetMotionAnm(int, int, f32, int);
+    int selectAction();
+    BOOL chkAction(ActionFn);
+    int setAction(ActionFn);
+    BOOL chkContinueAttnPlayer();
+    BOOL chkTouchPlayer();
+    int cutSlideDown(int);
+    int cutMeetingAgain(int);
+    int cutGetTomatoPuree(int);
+    int cutGetTaste(int);
+    int cutLv5DungeonClear(int);
+    int cutFindWolf(int);
+    int cutStartSnowboardRace(int);
+    int cutEndSnowboardRace(int);
+    int cutHug(int);
+    void setDialogueMotion();
+    int dialogue();
+    BOOL wait(void*);
+    BOOL cook(void*);
+    BOOL race(void*);
+    BOOL talk(void*);
     #ifdef DEBUG
     BOOL test(void*);
     #endif
-    /* 80B5D588 */ daNpc_ykM_c(
+    daNpc_ykM_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,
             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -266,12 +266,12 @@ public:
         i_arcNames) {
         OS_REPORT("|%06d:%x|daNpc_ykM_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80B5D688 */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80B5D690 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80B5D698 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80B5D6A0 */ s32 getBackboneJointNo() { return JNT_BB1; }
-    /* 80B5D6A8 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80B5D6B8 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_YKM_KURA; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BB1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_YKM_KURA; }
 
     u32 getFlowNodeNo() {
         u32 rv = (u16)home.angle.x;
diff --git a/include/d/actor/d_a_npc_ykw.h b/include/d/actor/d_a_npc_ykw.h
index 8174c9cb1f..6e6f15c8d2 100644
--- a/include/d/actor/d_a_npc_ykw.h
+++ b/include/d/actor/d_a_npc_ykw.h
@@ -18,60 +18,60 @@ public:
     typedef int (daNpc_ykW_c::*cutFunc)(int);
     typedef int (daNpc_ykW_c::*actionFunc)(void*);
 
-    /* 80B5EF0C */ ~daNpc_ykW_c();
-    /* 80B5F084 */ int create();
-    /* 80B5F34C */ int CreateHeap();
-    /* 80B5F784 */ int Delete();
-    /* 80B5F7B8 */ int Execute();
-    /* 80B5F7D8 */ int Draw();
-    /* 80B5F8AC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B5F8CC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B5F924 */ static void* srchItemHeart(void*, void*);
-    /* 80B5F9D8 */ static void* srchYkw(void*, void*);
+    ~daNpc_ykW_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    static void* srchItemHeart(void*, void*);
+    static void* srchYkw(void*, void*);
     u32 getType(daNpc_ykW_c* da_npc_yk_w_c);
-    /* 80B5FA74 */ fopAc_ac_c* getOtherYkwP(int);
-    /* 80B5FB50 */ static void* srchYkm(void*, void*);
-    /* 80B5FBEC */ fopAc_ac_c* getOtherYkmP(int);
-    /* 80B5FCC8 */ u8 getType();
-    /* 80B5FD30 */ int isDelete();
-    /* 80B5FE6C */ void reset();
-    /* 80B601C8 */ void afterJntAnm(int);
-    /* 80B60290 */ void setParam();
-    /* 80B6042C */ int checkChangeEvt();
-    /* 80B60520 */ void setAfterTalkMotion();
-    /* 80B605C0 */ void srchActors();
-    /* 80B60744 */ int evtTalk();
-    /* 80B607E4 */ int evtCutProc();
-    /* 80B608AC */ void action();
-    /* 80B60AFC */ void beforeMove();
-    /* 80B60BC0 */ void afterMoved();
-    /* 80B60F08 */ void setAttnPos();
-    /* 80B614D0 */ void setCollision();
-    /* 80B61708 */ int drawDbgInfo();
-    /* 80B61710 */ int selectAction();
-    /* 80B61828 */ BOOL chkAction(actionFunc param_0);
-    /* 80B61854 */ BOOL setAction(int (daNpc_ykW_c::*)(void*));
-    /* 80B618FC */ cXyz getGoalPos();
-    /* 80B61A0C */ int orderGoIntoBossRoomEvt();
-    /* 80B61AA4 */ fopAc_ac_c* putUtuwaHeart(cXyz*, f32, f32, s16, cXyz*);
-    /* 80B61C8C */ int cutShowDoor(int);
-    /* 80B61E74 */ int cutGoIntoBossRoom(int);
-    /* 80B62AF8 */ int cutLv5DungeonClear(int);
-    /* 80B63894 */ int cutFindWolf(int);
-    /* 80B63AA0 */ int cutStartSnowboardRace(int);
-    /* 80B63EE0 */ int cutEndSnowboardRace(int);
-    /* 80B6450C */ int cutHug(int);
-    /* 80B647E4 */ void setDialogueMotion();
-    /* 80B6491C */ int dialogue();
-    /* 80B649A8 */ int wait(void*);
-    /* 80B65278 */ int sitWait(void*);
-    /* 80B654CC */ int walk(void*);
-    /* 80B6591C */ int race(void*);
-    /* 80B6640C */ int talk(void*);
+    fopAc_ac_c* getOtherYkwP(int);
+    static void* srchYkm(void*, void*);
+    fopAc_ac_c* getOtherYkmP(int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    int checkChangeEvt();
+    void setAfterTalkMotion();
+    void srchActors();
+    int evtTalk();
+    int evtCutProc();
+    void action();
+    void beforeMove();
+    void afterMoved();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    int selectAction();
+    BOOL chkAction(actionFunc param_0);
+    BOOL setAction(int (daNpc_ykW_c::*)(void*));
+    cXyz getGoalPos();
+    int orderGoIntoBossRoomEvt();
+    fopAc_ac_c* putUtuwaHeart(cXyz*, f32, f32, s16, cXyz*);
+    int cutShowDoor(int);
+    int cutGoIntoBossRoom(int);
+    int cutLv5DungeonClear(int);
+    int cutFindWolf(int);
+    int cutStartSnowboardRace(int);
+    int cutEndSnowboardRace(int);
+    int cutHug(int);
+    void setDialogueMotion();
+    int dialogue();
+    int wait(void*);
+    int sitWait(void*);
+    int walk(void*);
+    int race(void*);
+    int talk(void*);
 #if DEBUG
     int test(void*);
 #endif
-    /* 80B67A3C */ daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0,
+    daNpc_ykW_c(const daNpcT_faceMotionAnmData_c * param_0,
                                const daNpcT_motionAnmData_c* param_1,
                                const daNpcT_MotionSeqMngr_c::sequenceStepData_c* param_2,
                                int param_3,
@@ -82,14 +82,14 @@ public:
         // "daNpc_ykW_c -> construct"
         OS_REPORT("|%06d:%x|daNpc_ykW_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80B67B1C */ u16 getEyeballMaterialNo() { return 2; }
-    /* 80B67B24 */ s32 getHeadJointNo() { return 5; }
-    /* 80B67B2C */ s32 getNeckJointNo() { return 4; }
-    /* 80B67B34 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B67B3C */ int checkChangeJoint(int i_index) { return i_index == 5; }
-    /* 80B67B4C */ int checkRemoveJoint(int i_index) { return i_index == 9; }
-    /* 80B67B5C */ s32 getFootLJointNo() { return 13; }
-    /* 80B67B64 */ s32 getFootRJointNo() { return 16; }
+    u16 getEyeballMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 5; }
+    s32 getNeckJointNo() { return 4; }
+    s32 getBackboneJointNo() { return 1; }
+    int checkChangeJoint(int i_index) { return i_index == 5; }
+    int checkRemoveJoint(int i_index) { return i_index == 9; }
+    s32 getFootLJointNo() { return 13; }
+    s32 getFootRJointNo() { return 16; }
 
     s32 getFlowNodeNo() {
         u32 angleX = (u16)home.angle.x;
@@ -209,7 +209,7 @@ struct daNpc_ykW_HIOParam {
 
 class daNpc_ykW_Param_c {
 public:
-    /* 80B67B6C */ virtual ~daNpc_ykW_Param_c() {}
+    virtual ~daNpc_ykW_Param_c() {}
 
     static const daNpc_ykW_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_zanb.h b/include/d/actor/d_a_npc_zanb.h
index e01a228956..0e63f79d43 100644
--- a/include/d/actor/d_a_npc_zanb.h
+++ b/include/d/actor/d_a_npc_zanb.h
@@ -18,7 +18,7 @@ struct daNpc_zanB_HIOParam {
 
 class daNpc_zanB_Param_c {
 public:
-    /* 80B6BC58 */ virtual ~daNpc_zanB_Param_c() {}
+    virtual ~daNpc_zanB_Param_c() {}
 
     static daNpc_zanB_HIOParam const m;
 };
@@ -42,37 +42,37 @@ public:
     typedef int (daNpc_zanB_c::*actionFunc)(void*);
     typedef int (daNpc_zanB_c::*cutFunc)(int);
     
-    /* 80B68F2C */ ~daNpc_zanB_c();
-    /* 80B6904C */ cPhs__Step create();
-    /* 80B69330 */ int CreateHeap();
-    /* 80B6975C */ int Delete();
-    /* 80B69790 */ int Execute();
-    /* 80B697B0 */ int Draw();
-    /* 80B69844 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B69864 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B698BC */ u8 getType();
-    /* 80B698DC */ BOOL isDelete();
-    /* 80B698E4 */ void reset();
-    /* 80B69A3C */ void afterJntAnm(int);
-    /* 80B69AC8 */ BOOL checkChangeEvt();
-    /* 80B69B7C */ void setParam();
-    /* 80B69CA8 */ void setAfterTalkMotion();
-    /* 80B69D08 */ void srchActors();
-    /* 80B69D0C */ BOOL evtTalk();
-    /* 80B69DAC */ BOOL evtCutProc();
-    /* 80B69E74 */ void action();
-    /* 80B69F60 */ void beforeMove();
-    /* 80B69FD8 */ void setAttnPos();
-    /* 80B6A268 */ void setCollision();
-    /* 80B6A408 */ int drawDbgInfo();
-    /* 80B6A410 */ void drawGhost();
-    /* 80B6A47C */ BOOL selectAction();
-    /* 80B6A4C4 */ BOOL chkAction(actionFunc);
-    /* 80B6A4F0 */ BOOL setAction(actionFunc);
-    /* 80B6A598 */ int wait(void*);
-    /* 80B6A874 */ int talk(void*);
+    ~daNpc_zanB_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL checkChangeEvt();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawGhost();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
     int test(void*);
-    /* 80B6BADC */ daNpc_zanB_c(
+    daNpc_zanB_c(
                 daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -84,12 +84,12 @@ public:
                 i_arcNames) {
             OS_REPORT("|%06d:%x|daNpc_zanB_c -> コンストラクト\n", g_Counter.mCounter0, this);
         }
-    /* 80B6BC18 */ u16 getEyeballMaterialNo() { return 4; }
-    /* 80B6BC20 */ s32 getHeadJointNo() { return 3; }
-    /* 80B6BC28 */ s32 getNeckJointNo() { return 2; }
-    /* 80B6BC30 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B6BC38 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 3; }
-    /* 80B6BC48 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 0x12; }
+    u16 getEyeballMaterialNo() { return 4; }
+    s32 getHeadJointNo() { return 3; }
+    s32 getNeckJointNo() { return 2; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == 3; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == 0x12; }
 
     int getFlowNodeNo() {
         u16 nodeNo = home.angle.x;
diff --git a/include/d/actor/d_a_npc_zant.h b/include/d/actor/d_a_npc_zant.h
index 80c4b16f93..52f65b4140 100644
--- a/include/d/actor/d_a_npc_zant.h
+++ b/include/d/actor/d_a_npc_zant.h
@@ -21,36 +21,36 @@ public:
         TYPE_1,
     };
 
-    /* 80B6C1AC */ ~daNpc_Zant_c();
-    /* 80B6C2D0 */ int create();
-    /* 80B6C574 */ int CreateHeap();
-    /* 80B6C700 */ int Delete();
-    /* 80B6C734 */ int Execute();
-    /* 80B6C754 */ int Draw();
-    /* 80B6C7E8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B6C808 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B6C860 */ u8 getType();
-    /* 80B6C880 */ u32 getFlowNodeNo();
-    /* 80B6C89C */ int isDelete();
-    /* 80B6C8CC */ void reset();
-    /* 80B6C9F0 */ void afterJntAnm(int);
-    /* 80B6C9F4 */ void setParam();
-    /* 80B6CAF0 */ void setAfterTalkMotion();
-    /* 80B6CB50 */ void srchActors();
-    /* 80B6CB54 */ BOOL evtTalk();
-    /* 80B6CC54 */ BOOL evtCutProc();
-    /* 80B6CD1C */ void action();
-    /* 80B6CE08 */ void beforeMove();
-    /* 80B6CE80 */ void setAttnPos();
-    /* 80B6D074 */ void setCollision();
-    /* 80B6D1A8 */ int drawDbgInfo();
-    /* 80B6D1B0 */ void drawGhost();
-    /* 80B6D21C */ int selectAction();
-    /* 80B6D264 */ int chkAction(int (daNpc_Zant_c::*)(void*));
-    /* 80B6D290 */ int setAction(int (daNpc_Zant_c::*)(void*));
-    /* 80B6D338 */ int wait(void*);
-    /* 80B6D584 */ int talk(void*);
-    /* 80B6E800 */ daNpc_Zant_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_Zant_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u32 getFlowNodeNo();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawGhost();
+    int selectAction();
+    int chkAction(int (daNpc_Zant_c::*)(void*));
+    int setAction(int (daNpc_Zant_c::*)(void*));
+    int wait(void*);
+    int talk(void*);
+    daNpc_Zant_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
@@ -73,7 +73,7 @@ STATIC_ASSERT(sizeof(daNpc_Zant_c) == 0xfa0);
 
 class daNpc_Zant_Param_c {
 public:
-    /* 80B6E93C */ virtual ~daNpc_Zant_Param_c() {}
+    virtual ~daNpc_Zant_Param_c() {}
     struct Data {
         /* 0x00 */ f32 field_0x0;
         /* 0x04 */ f32 field_0x4;
diff --git a/include/d/actor/d_a_npc_zelR.h b/include/d/actor/d_a_npc_zelR.h
index 498bf726f3..a13b40855e 100644
--- a/include/d/actor/d_a_npc_zelR.h
+++ b/include/d/actor/d_a_npc_zelR.h
@@ -22,7 +22,7 @@ class daNpc_ZelR_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_ZelR_Param_c {
 public:
-    /* 80B71A74 */ virtual ~daNpc_ZelR_Param_c() {};
+    virtual ~daNpc_ZelR_Param_c() {};
 
     static const daNpc_ZelR_HIOParam m;
 };
@@ -37,48 +37,48 @@ public:
         TYPE_1,
     };
 
-    /* 80B6EE2C */ ~daNpc_ZelR_c();
-    /* 80B6EF64 */ int create();
-    /* 80B6F1F8 */ int CreateHeap();
-    /* 80B6F664 */ int Delete();
-    /* 80B6F698 */ int Execute();
-    /* 80B6F6B8 */ int Draw();
-    /* 80B6F77C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B6F79C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B6F7F4 */ u8 getType();
-    /* 80B6F814 */ u32 getFlowNodeNo();
-    /* 80B6F830 */ u8 getPath();
-    /* 80B6F83C */ int isDelete();
-    /* 80B6F894 */ void reset();
-    /* 80B6FA10 */ void afterJntAnm(int);
-    /* 80B6FA9C */ BOOL ctrlBtk();
-    /* 80B6FBA8 */ void setParam();
-    /* 80B6FC9C */ void setAfterTalkMotion();
-    /* 80B6FCFC */ void srchActors();
-    /* 80B6FD00 */ BOOL evtTalk();
-    /* 80B6FE00 */ BOOL evtCutProc();
-    /* 80B6FEC8 */ void action();
-    /* 80B70018 */ void beforeMove();
-    /* 80B70090 */ void setAttnPos();
-    /* 80B702B0 */ void setCollision();
-    /* 80B703E0 */ int drawDbgInfo();
-    /* 80B703E8 */ int selectAction();
-    /* 80B70430 */ int chkAction(int (daNpc_ZelR_c::*)(void*));
-    /* 80B7045C */ int setAction(int (daNpc_ZelR_c::*)(void*));
-    /* 80B70504 */ int wait(void*);
-    /* 80B706B0 */ BOOL talk(void*);
-    /* 80B71974 */ daNpc_ZelR_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+    ~daNpc_ZelR_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    u32 getFlowNodeNo();
+    u8 getPath();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL ctrlBtk();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    int selectAction();
+    int chkAction(int (daNpc_ZelR_c::*)(void*));
+    int setAction(int (daNpc_ZelR_c::*)(void*));
+    int wait(void*);
+    BOOL talk(void*);
+    daNpc_ZelR_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                                 daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
                                 daNpcT_evtData_c const* param_7, char** param_8) :
                                 daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8)
                                  {}
-    /* 80B71A34 */ u16 getEyeballRMaterialNo() { return 3; }
-    /* 80B71A3C */ u16 getEyeballLMaterialNo() { return 2; }
-    /* 80B71A44 */ s32 getHeadJointNo() { return 3; }
-    /* 80B71A4C */ s32 getBackboneJointNo() { return 1; }
-    /* 80B71A54 */ BOOL checkChangeJoint(int param_1) { return param_1 == 3; };
-    /* 80B71A64 */ BOOL checkRemoveJoint(int param_1) { return param_1 == 13; };
+    u16 getEyeballRMaterialNo() { return 3; }
+    u16 getEyeballLMaterialNo() { return 2; }
+    s32 getHeadJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    BOOL checkChangeJoint(int param_1) { return param_1 == 3; };
+    BOOL checkRemoveJoint(int param_1) { return param_1 == 13; };
 
     static char* mCutNameList;
     static EventFn mCutList[1];
diff --git a/include/d/actor/d_a_npc_zelRo.h b/include/d/actor/d_a_npc_zelRo.h
index 2d7104622d..3fa60a9ad2 100644
--- a/include/d/actor/d_a_npc_zelRo.h
+++ b/include/d/actor/d_a_npc_zelRo.h
@@ -22,7 +22,7 @@ class daNpc_ZelRo_HIO_c : public mDoHIO_entry_c {
 
 class daNpc_ZelRo_Param_c {
 public:
-    /* 80B74BF0 */ virtual ~daNpc_ZelRo_Param_c() {}
+    virtual ~daNpc_ZelRo_Param_c() {}
 
     static daNpc_ZelRo_HIOParam const m;
 };
@@ -85,40 +85,40 @@ public:
     typedef int (daNpc_ZelRo_c::*actionFunc)(void*);
     typedef int (daNpc_ZelRo_c::*cutFunc)(int);
 
-    /* 80B71FAC */ ~daNpc_ZelRo_c();
-    /* 80B720E4 */ cPhs__Step create();
-    /* 80B72378 */ int CreateHeap();
-    /* 80B727E4 */ int Delete();
-    /* 80B72818 */ int Execute();
-    /* 80B72838 */ int Draw();
-    /* 80B728FC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B7291C */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B72974 */ u8 getType();
-    /* 80B72994 */ int getFlowNodeNo();
-    /* 80B729B0 */ u8 getPath();
-    /* 80B729BC */ BOOL isDelete();
-    /* 80B72A10 */ void reset();
-    /* 80B72B8C */ void afterJntAnm(int);
-    /* 80B72C18 */ BOOL ctrlBtk();
-    /* 80B72D24 */ void setParam();
-    /* 80B72E18 */ void setAfterTalkMotion();
-    /* 80B72E78 */ void srchActors();
-    /* 80B72E7C */ BOOL evtTalk();
-    /* 80B72F7C */ BOOL evtCutProc();
-    /* 80B73044 */ void action();
-    /* 80B73194 */ void beforeMove();
-    /* 80B7320C */ void setAttnPos();
-    /* 80B7342C */ void setCollision();
-    /* 80B7355C */ int drawDbgInfo();
-    /* 80B73564 */ BOOL selectAction();
-    /* 80B735AC */ BOOL chkAction(actionFunc);
-    /* 80B735D8 */ BOOL setAction(actionFunc);
-    /* 80B73680 */ int wait(void*);
-    /* 80B7382C */ int talk(void*);
+    ~daNpc_ZelRo_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int getFlowNodeNo();
+    u8 getPath();
+    BOOL isDelete();
+    void reset();
+    void afterJntAnm(int);
+    BOOL ctrlBtk();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    BOOL selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
     #ifdef DEBUG
     int test(void*);
     #endif
-    /* 80B74AE8 */ daNpc_ZelRo_c(
+    daNpc_ZelRo_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
         daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
@@ -128,13 +128,13 @@ public:
         : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
                    i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
                    i_arcNames) {}
-    /* 80B74BA8 */ u16 getEyeballRMaterialNo() { return ZELDA_EYEBALL_R_V; }
-    /* 80B74BB0 */ u16 getEyeballLMaterialNo() { return ZELDA_EYEBALL_L_V; }
-    /* 80B74BB8 */ s32 getHeadJointNo() { return JNT_HEAD; }
-    /* 80B74BC0 */ s32 getNeckJointNo() { return JNT_NECK; }
-    /* 80B74BC8 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
-    /* 80B74BD0 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
-    /* 80B74BE0 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    u16 getEyeballRMaterialNo() { return ZELDA_EYEBALL_R_V; }
+    u16 getEyeballLMaterialNo() { return ZELDA_EYEBALL_L_V; }
+    s32 getHeadJointNo() { return JNT_HEAD; }
+    s32 getNeckJointNo() { return JNT_NECK; }
+    s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
 
     static char* mCutNameList;
     static cutFunc mCutList[1];
diff --git a/include/d/actor/d_a_npc_zelda.h b/include/d/actor/d_a_npc_zelda.h
index be628c16ff..cffc4ee386 100644
--- a/include/d/actor/d_a_npc_zelda.h
+++ b/include/d/actor/d_a_npc_zelda.h
@@ -19,7 +19,7 @@ public:
     typedef int (daNpc_Zelda_c::*cutFunc)(int);
     typedef int (daNpc_Zelda_c::*actionFunc)(void*);
 
-    /* 80B7512C */ virtual ~daNpc_Zelda_c();
+    virtual ~daNpc_Zelda_c();
     u8 getPathID() {
         return (fopAcM_GetParam(this) & 0xff00) >> 8;
     }
@@ -27,35 +27,35 @@ public:
         u16 pitch = home.angle.x;
         return pitch == 0xffff ? -1 : pitch;
     }
-    /* 80B7524C */ int create();
-    /* 80B75530 */ int CreateHeap();
-    /* 80B75978 */ int Delete();
-    /* 80B759AC */ int Execute();
-    /* 80B759CC */ int Draw();
-    /* 80B75A90 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B75AB0 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B75B08 */ u8 getType();
-    /* 80B75B28 */ int isDelete();
-    /* 80B75B30 */ void reset();
-    /* 80B75C9C */ void afterJntAnm(int);
-    /* 80B75D28 */ int ctrlBtk();
-    /* 80B75E34 */ int checkChangeEvt();
-    /* 80B75EE8 */ void setParam();
-    /* 80B76014 */ void setAfterTalkMotion();
-    /* 80B76074 */ void srchActors();
-    /* 80B76078 */ int evtTalk();
-    /* 80B76118 */ int evtCutProc();
-    /* 80B761E0 */ void action();
-    /* 80B762CC */ void beforeMove();
-    /* 80B76344 */ void setAttnPos();
-    /* 80B765D4 */ void setCollision();
-    /* 80B76774 */ int drawDbgInfo();
-    /* 80B7677C */ int selectAction();
-    /* 80B767C4 */ BOOL chkAction(actionFunc);
-    /* 80B767F0 */ BOOL setAction(actionFunc);
-    /* 80B76898 */ int wait(void*);
-    /* 80B76B74 */ int talk(void*);
-    /* 80B77DD8 */ daNpc_Zelda_c(daNpcT_faceMotionAnmData_c const* param_0,
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    u8 getType();
+    int isDelete();
+    void reset();
+    void afterJntAnm(int);
+    int ctrlBtk();
+    int checkChangeEvt();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    int evtTalk();
+    int evtCutProc();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    int selectAction();
+    BOOL chkAction(actionFunc);
+    BOOL setAction(actionFunc);
+    int wait(void*);
+    int talk(void*);
+    daNpc_Zelda_c(daNpcT_faceMotionAnmData_c const* param_0,
                                  daNpcT_motionAnmData_c const* param_1,
                                  daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_2,
                                  int param_3,
@@ -64,13 +64,13 @@ public:
     daNpcT_c(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7) {
         OS_REPORT("|%06d:%x|daNpc_Zelda_c -> コンストラクト\n", g_Counter.mCounter0, this);
     }
-    /* 80B77F14 */ u16 getEyeballRMaterialNo() { return 5; }
-    /* 80B77F1C */ u16 getEyeballLMaterialNo() { return 4; }
-    /* 80B77F24 */ s32 getHeadJointNo() { return 4; }
-    /* 80B77F2C */ s32 getNeckJointNo() { return 3; }
-    /* 80B77F34 */ s32 getBackboneJointNo() { return 1; }
-    /* 80B77F3C */ int checkChangeJoint(int param_0) { return param_0 == 4; }
-    /* 80B77F4C */ int checkRemoveJoint(int param_0) { return param_0 == 17; }
+    u16 getEyeballRMaterialNo() { return 5; }
+    u16 getEyeballLMaterialNo() { return 4; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    int checkChangeJoint(int param_0) { return param_0 == 4; }
+    int checkRemoveJoint(int param_0) { return param_0 == 17; }
 
     static const char* mCutNameList;
     static cutFunc mCutList[1];
@@ -95,7 +95,7 @@ STATIC_ASSERT(sizeof(daNpc_Zelda_HIOParam) == 0x8c);
 
 class daNpc_Zelda_Param_c {
 public:
-    /* 80B77F5C */ virtual ~daNpc_Zelda_Param_c() {}
+    virtual ~daNpc_Zelda_Param_c() {}
 
     static const daNpc_Zelda_HIOParam m;
 };
diff --git a/include/d/actor/d_a_npc_zra.h b/include/d/actor/d_a_npc_zra.h
index 898754a558..6de13512dc 100644
--- a/include/d/actor/d_a_npc_zra.h
+++ b/include/d/actor/d_a_npc_zra.h
@@ -16,13 +16,13 @@ class daNpc_zrA_HIO_c;
 
 class daNpc_zrA_Path_c : public daNpcF_Path_c {
 public:
-    /* 80B7850C */ BOOL getDstPosDst2(cXyz, cXyz&);
-    /* 80B7876C */ void setNextIdxDst(cXyz);
-    /* 80B788F8 */ BOOL chkPassedDstXZ(cXyz);
-    /* 80B78A60 */ BOOL getDstPosDstXZ(cXyz, cXyz&);
-    /* 80B78CA0 */ BOOL chkPassedChase(u16, cXyz);
-    /* 80B78CFC */ int getDstPosChase(u16, cXyz, cXyz&);
-    /* 80B78E08 */ f32 chkPassDst(u16, cXyz);
+    BOOL getDstPosDst2(cXyz, cXyz&);
+    void setNextIdxDst(cXyz);
+    BOOL chkPassedDstXZ(cXyz);
+    BOOL getDstPosDstXZ(cXyz, cXyz&);
+    BOOL chkPassedChase(u16, cXyz);
+    int getDstPosChase(u16, cXyz, cXyz&);
+    f32 chkPassDst(u16, cXyz);
     int getEndIdx() { return mPathInfo->m_num - 1; }
 };
 
@@ -217,108 +217,108 @@ public:
         /* 0xC */ EVT_TALK_MULTI2,
     };
 
-    /* 80B7956C */ daNpc_zrA_c();
-    /* 80B79828 */ ~daNpc_zrA_c();
-    /* 80B79B58 */ cPhs__Step create();
-    /* 80B79F38 */ int CreateHeap();
-    /* 80B7A51C */ int Delete();
-    /* 80B7A550 */ int Execute();
-    /* 80B7A570 */ int Draw();
-    /* 80B7A864 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B7AB9C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B7ABBC */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B7AC08 */ void setParam();
-    /* 80B7ADF0 */ BOOL main();
-    /* 80B7B0A4 */ BOOL ctrlBtk();
-    /* 80B7B1DC */ void setAttnPos();
-    /* 80B7B91C */ void setMtx();
-    /* 80B7B9D4 */ bool setExpressionAnm(int, bool);
-    /* 80B7BD60 */ bool setExpressionBtp(int);
-    /* 80B7BE74 */ void setExpression(int, f32);
-    /* 80B7BEA0 */ void setMotionAnm(int, f32);
-    /* 80B7C070 */ void setMotionWaterAnm(int);
-    /* 80B7C308 */ void setMotion(int, f32, BOOL);
-    /* 80B7C34C */ BOOL drawDbgInfo();
-    /* 80B7C354 */ void drawOtherMdls();
-    /* 80B7C44C */ Type getTypeFromArgument();
-    /* 80B7C4B4 */ SoldierType getSoldierTypeFromParam();
-    /* 80B7C500 */ GameMode getGameModeFromParam();
-    /* 80B7C524 */ ActionType getActionTypeFromParam();
-    /* 80B7C5E4 */ u8 getMultiModeFromParam();
-    /* 80B7C614 */ u8 getMultiNoFromParam();
+    daNpc_zrA_c();
+    ~daNpc_zrA_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void setMtx();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotionWaterAnm(int);
+    void setMotion(int, f32, BOOL);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    Type getTypeFromArgument();
+    SoldierType getSoldierTypeFromParam();
+    GameMode getGameModeFromParam();
+    ActionType getActionTypeFromParam();
+    u8 getMultiModeFromParam();
+    u8 getMultiNoFromParam();
     /*  inline  */ u8 getNoFromParam() { return (u8)fopAcM_GetParam(this); }
     /*  inline  */ u8 getPathNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); }
-    /* 80B7C644 */ BOOL isDelete();
-    /* 80B7C71C */ void reset();
-    /* 80B7CA8C */ void playExpression();
-    /* 80B7D0FC */ void playMotion();
-    /* 80B7DAF4 */ BOOL chkAction(ActionFn);
-    /* 80B7DB20 */ bool setAction(ActionFn);
-    /* 80B7DBC8 */ bool selectAction();
-    /* 80B7DF40 */ BOOL doEvent();
-    /* 80B7E668 */ BOOL setSkipZev(int, int);
-    /* 80B7E6F4 */ void setLookMode(int);
-    /* 80B7E718 */ void lookat();
-    /* 80B7E9E0 */ BOOL chkFindPlayer();
-    /* 80B7EA90 */ void setExpressionTalkAfter();
-    /* 80B7EBA0 */ void setPrtcl();
-    /* 80B7EC54 */ BOOL test(void*);
-    /* 80B7F8C4 */ BOOL wait(void*);
-    /* 80B7FD10 */ void walkCalc();
-    /* 80B7FE18 */ void waitCalc();
-    /* 80B800A4 */ BOOL waitSpa(void*);
-    /* 80B80228 */ BOOL waitLake(void*);
-    /* 80B80418 */ BOOL talk(void*);
-    /* 80B806FC */ BOOL ECut_talkMulti(int);
-    /* 80B80860 */ BOOL swim(void*);
-    /* 80B80A94 */ BOOL railSwim();
-    /* 80B81788 */ BOOL waitSwim();
-    /* 80B81918 */ BOOL turnSwimInit();
-    /* 80B81A18 */ BOOL turnSwim();
-    /* 80B81CC8 */ BOOL turnSwimCheck();
-    /* 80B81D68 */ BOOL evasionCalc(cXyz&, csXyz&);
-    /* 80B81FB8 */ void calcBank(s16, s16, s16&, s16&);
-    /* 80B8204C */ void calcWaistAngle();
-    /* 80B82238 */ void calcWaistAngleInit();
-    /* 80B822CC */ void calcWaistAngleStop();
-    /* 80B822D8 */ BOOL calcWaistAngleCheck();
-    /* 80B82300 */ void calcModulation();
-    /* 80B8247C */ void resetModulation();
-    /* 80B824F4 */ void calcSwimAngle(csXyz&, csXyz&, s16, s16);
-    /* 80B82584 */ void calcSwimPos(cXyz&);
-    /* 80B825FC */ void calcWaitSwim(BOOL);
-    /* 80B826F0 */ BOOL ECut_talkSwim(int);
-    /* 80B82C54 */ BOOL waitWaterfall(void*);
-    /* 80B82E88 */ BOOL swimWaterfall(void*);
-    /* 80B833C8 */ BOOL diveWaterfall(void*);
-    /* 80B83548 */ BOOL talkSwim(void*);
-    /* 80B837E8 */ BOOL ECut_carryWaterfall(int);
-    /* 80B83D08 */ BOOL ECut_carryWaterfallSkip(int);
-    /* 80B83FA4 */ BOOL diveCalc(s16, s16, BOOL);
-    /* 80B84298 */ BOOL waitRiverDescend(void*);
-    /* 80B84B74 */ BOOL swimRiverDescend(void*);
-    /* 80B85B14 */ BOOL swimRiverDescend2(void*);
-    /* 80B8601C */ BOOL diveRiverDescend(void*);
-    /* 80B86440 */ BOOL swimGoalRiverDescend(void*);
-    /* 80B86A2C */ BOOL returnRiverDescend(void*);
-    /* 80B86D9C */ void moveRiverPosCalc(cXyz&);
-    /* 80B86E78 */ void createRuppi();
-    /* 80B86FAC */ BOOL ECut_beforeBlastzrR(int);
-    /* 80B872F0 */ BOOL ECut_afterBlastzrR(int);
-    /* 80B87510 */ BOOL ECut_thanksBlast(int);
-    /* 80B88B04 */ BOOL ECut_resultAnnounce(int);
-    /* 80B8A064 */ void calcCanoeMove(BOOL);
-    /* 80B8A43C */ BOOL tobiSearch(void*);
-    /* 80B8A54C */ BOOL tobiWait(void*);
-    /* 80B8A648 */ BOOL tobikomi1(void*);
-    /* 80B8A7F8 */ BOOL tobikomi2(void*);
-    /* 80B8AA1C */ BOOL tobikomi3(void*);
-    /* 80B8AB78 */ BOOL tobiJump(void*);
-    /* 80B8B1FC */ BOOL tobiEnd(void*);
-    /* 80B8B420 */ BOOL waitSearch(void*);
-    /* 80B8B530 */ BOOL ECut_searchPrince1(int);
-    /* 80B8BCE8 */ BOOL ECut_searchPrince2(int);
-    /* 80B8C3E8 */ void adjustShapeAngle() {}
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(ActionFn);
+    bool setAction(ActionFn);
+    bool selectAction();
+    BOOL doEvent();
+    BOOL setSkipZev(int, int);
+    void setLookMode(int);
+    void lookat();
+    BOOL chkFindPlayer();
+    void setExpressionTalkAfter();
+    void setPrtcl();
+    BOOL test(void*);
+    BOOL wait(void*);
+    void walkCalc();
+    void waitCalc();
+    BOOL waitSpa(void*);
+    BOOL waitLake(void*);
+    BOOL talk(void*);
+    BOOL ECut_talkMulti(int);
+    BOOL swim(void*);
+    BOOL railSwim();
+    BOOL waitSwim();
+    BOOL turnSwimInit();
+    BOOL turnSwim();
+    BOOL turnSwimCheck();
+    BOOL evasionCalc(cXyz&, csXyz&);
+    void calcBank(s16, s16, s16&, s16&);
+    void calcWaistAngle();
+    void calcWaistAngleInit();
+    void calcWaistAngleStop();
+    BOOL calcWaistAngleCheck();
+    void calcModulation();
+    void resetModulation();
+    void calcSwimAngle(csXyz&, csXyz&, s16, s16);
+    void calcSwimPos(cXyz&);
+    void calcWaitSwim(BOOL);
+    BOOL ECut_talkSwim(int);
+    BOOL waitWaterfall(void*);
+    BOOL swimWaterfall(void*);
+    BOOL diveWaterfall(void*);
+    BOOL talkSwim(void*);
+    BOOL ECut_carryWaterfall(int);
+    BOOL ECut_carryWaterfallSkip(int);
+    BOOL diveCalc(s16, s16, BOOL);
+    BOOL waitRiverDescend(void*);
+    BOOL swimRiverDescend(void*);
+    BOOL swimRiverDescend2(void*);
+    BOOL diveRiverDescend(void*);
+    BOOL swimGoalRiverDescend(void*);
+    BOOL returnRiverDescend(void*);
+    void moveRiverPosCalc(cXyz&);
+    void createRuppi();
+    BOOL ECut_beforeBlastzrR(int);
+    BOOL ECut_afterBlastzrR(int);
+    BOOL ECut_thanksBlast(int);
+    BOOL ECut_resultAnnounce(int);
+    void calcCanoeMove(BOOL);
+    BOOL tobiSearch(void*);
+    BOOL tobiWait(void*);
+    BOOL tobikomi1(void*);
+    BOOL tobikomi2(void*);
+    BOOL tobikomi3(void*);
+    BOOL tobiJump(void*);
+    BOOL tobiEnd(void*);
+    BOOL waitSearch(void*);
+    BOOL ECut_searchPrince1(int);
+    BOOL ECut_searchPrince2(int);
+    void adjustShapeAngle() {}
 
     int getType() { return mType; }
     u32 getAngleNoFromParam() { return (u8)(fopAcM_GetParam(this) >> 8); }
@@ -458,7 +458,7 @@ public:
         /* 0xAC */ f32 field_0xac;
      };
 
-    /* 80B8C3EC */ virtual ~daNpc_zrA_Param_c() {}
+    virtual ~daNpc_zrA_Param_c() {}
 
     static param const m;
 };
diff --git a/include/d/actor/d_a_npc_zrc.h b/include/d/actor/d_a_npc_zrc.h
index ae5f6a2c33..f3b2f86426 100644
--- a/include/d/actor/d_a_npc_zrc.h
+++ b/include/d/actor/d_a_npc_zrc.h
@@ -16,49 +16,49 @@ public:
     typedef BOOL (daNpc_zrC_c::*ActionFn)(void*);
     typedef BOOL (daNpc_zrC_c::*EventFn)(int);
 
-    /* 80B8DC0C */ daNpc_zrC_c();
-    /* 80B8DE20 */ ~daNpc_zrC_c();
-    /* 80B8E03C */ cPhs__Step create();
-    /* 80B8E338 */ int CreateHeap();
-    /* 80B8E830 */ int Delete();
-    /* 80B8E864 */ int Execute();
-    /* 80B8E884 */ int Draw();
-    /* 80B8E914 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B8EB48 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B8EB68 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B8EBB4 */ void setParam();
-    /* 80B8ED94 */ BOOL main();
-    /* 80B8EF2C */ BOOL ctrlBtk();
-    /* 80B8F00C */ void setAttnPos();
-    /* 80B8F56C */ bool setExpressionAnm(int, bool);
-    /* 80B8F898 */ bool setExpressionBtp(int);
-    /* 80B8F9CC */ void setExpression(int, f32);
-    /* 80B8F9F8 */ void setMotionAnm(int, f32);
-    /* 80B8FBE4 */ void setMotion(int, f32, int);
-    /* 80B8FC28 */ BOOL drawDbgInfo();
-    /* 80B8FC30 */ void drawOtherMdls();
-    /* 80B8FC34 */ u8 getTypeFromParam();
-    /* 80B8FC8C */ int isDelete();
-    /* 80B8FD10 */ void reset();
-    /* 80B8FF14 */ void playExpression();
-    /* 80B904DC */ void playMotion();
-    /* 80B90940 */ void playMotionAnm2(daNpcF_c::daNpcF_anmPlayData***);
-    /* 80B90A6C */ BOOL chkAction(ActionFn);
-    /* 80B90A98 */ BOOL setAction(ActionFn);
-    /* 80B90B40 */ BOOL selectAction();
-    /* 80B90C34 */ void doNormalAction(BOOL);
-    /* 80B90D48 */ BOOL doEvent();
-    /* 80B9113C */ void setLookMode(int);
-    /* 80B91160 */ void lookat();
-    /* 80B91418 */ void setExpressionTalkAfter();
-    /* 80B914F4 */ BOOL wait(void*);
-    /* 80B916FC */ BOOL waitSick(void*);
-    /* 80B91808 */ BOOL waitPray(void*);
-    /* 80B91F78 */ BOOL waitThrone(void*);
-    /* 80B920EC */ BOOL talk(void*);
-    /* 80B922D8 */ BOOL test(void*);
-    /* 80B923BC */ BOOL ECut_earringGet(int);
-    /* 80B9318C */ void adjustShapeAngle() {}
+    daNpc_zrC_c();
+    ~daNpc_zrC_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
+    int isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    void playMotionAnm2(daNpcF_c::daNpcF_anmPlayData***);
+    BOOL chkAction(ActionFn);
+    BOOL setAction(ActionFn);
+    BOOL selectAction();
+    void doNormalAction(BOOL);
+    BOOL doEvent();
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    BOOL wait(void*);
+    BOOL waitSick(void*);
+    BOOL waitPray(void*);
+    BOOL waitThrone(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    BOOL ECut_earringGet(int);
+    void adjustShapeAngle() {}
 
     static char* mEvtCutNameList[2];
     static EventFn mEvtCutList[2];
@@ -206,7 +206,7 @@ public:
         /* 0x70 */ f32 field_0x70;
     };
 
-    /* 80B93190 */ virtual ~daNpc_zrC_Param_c() {}
+    virtual ~daNpc_zrC_Param_c() {}
 
     static param const m;
 };
diff --git a/include/d/actor/d_a_npc_zrz.h b/include/d/actor/d_a_npc_zrz.h
index f78c86dbf0..131c349805 100644
--- a/include/d/actor/d_a_npc_zrz.h
+++ b/include/d/actor/d_a_npc_zrz.h
@@ -19,64 +19,64 @@ public:
     typedef BOOL (daNpc_zrZ_c::*ActionFn)(void*);
     typedef BOOL (daNpc_zrZ_c::*EventFn)(int);
 
-    /* 80B93DCC */ daNpc_zrZ_c();
-    /* 80B94014 */ ~daNpc_zrZ_c();
-    /* 80B9423C */ cPhs__Step create();
-    /* 80B9453C */ int CreateHeap();
-    /* 80B949F4 */ int Delete();
-    /* 80B94A28 */ int Execute();
-    /* 80B94A48 */ int Draw();
-    /* 80B94B34 */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
-    /* 80B94E18 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80B950F4 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B95114 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80B95244 */ void setParam();
-    /* 80B953CC */ BOOL main();
-    /* 80B95598 */ BOOL ctrlBtk();
-    /* 80B956B4 */ void setAttnPos();
-    /* 80B95BB8 */ void setMtx();
-    /* 80B95C6C */ bool setExpressionAnm(int, bool);
-    /* 80B95DD0 */ bool setExpressionBtp(int);
-    /* 80B95F10 */ void setExpression(int, f32);
-    /* 80B95F3C */ void setMotionAnm(int, f32);
-    /* 80B9612C */ void setMotion(int, f32, int);
-    /* 80B96170 */ BOOL drawDbgInfo();
-    /* 80B96178 */ void drawOtherMdls();
-    /* 80B9617C */ u8 getTypeFromParam();
+    daNpc_zrZ_c();
+    ~daNpc_zrZ_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void setParam();
+    BOOL main();
+    BOOL ctrlBtk();
+    void setAttnPos();
+    void setMtx();
+    bool setExpressionAnm(int, bool);
+    bool setExpressionBtp(int);
+    void setExpression(int, f32);
+    void setMotionAnm(int, f32);
+    void setMotion(int, f32, int);
+    BOOL drawDbgInfo();
+    void drawOtherMdls();
+    u8 getTypeFromParam();
     /*  inline  */ u8 getPathNoFromParam() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
     /*  inline  */ u8 getDemoMode() { return (fopAcM_GetParam(this) >> 0x10) & 0xf; }
-    /* 80B961B4 */ BOOL isDelete();
-    /* 80B96268 */ void reset();
-    /* 80B9652C */ void playExpression();
-    /* 80B96618 */ void playMotion();
-    /* 80B96740 */ BOOL chkAction(ActionFn);
-    /* 80B9676C */ BOOL setAction(ActionFn);
-    /* 80B96814 */ BOOL selectAction();
-    /* 80B968E0 */ void doNormalAction(BOOL);
-    /* 80B969F4 */ BOOL doEvent();
-    /* 80B96DF0 */ BOOL setSkipZev(int, int);
-    /* 80B96E7C */ void setLookMode(int);
-    /* 80B96EA0 */ void lookat();
-    /* 80B97128 */ void setExpressionTalkAfter();
-    /* 80B97160 */ void lightReady();
-    /* 80B971BC */ void setLightPos();
-    /* 80B9723C */ void lightPowerCalc(int);
-    /* 80B972EC */ void lightColorProc();
-    /* 80B974BC */ BOOL ECut_helpPrince(int);
-    /* 80B97B78 */ BOOL ECut_comeHere(int);
-    /* 80B97D7C */ BOOL ECut_restoreLink(int);
-    /* 80B97EB4 */ BOOL ECut_clothesGet(int);
-    /* 80B98540 */ BOOL ECut_getAfter(int);
-    /* 80B9877C */ BOOL ECut_sealRelease(int);
-    /* 80B98ACC */ BOOL ECut_srSkip(int);
-    /* 80B98C34 */ void pullbackPlayer(f32);
-    /* 80B98D04 */ BOOL wait(void*);
-    /* 80B98F84 */ BOOL comeHere(void*);
-    /* 80B998BC */ BOOL comeHere2(void*);
-    /* 80B9A0EC */ BOOL talk(void*);
-    /* 80B9A29C */ BOOL test(void*);
-    /* 80B9A380 */ void himoCalc();
-    /* 80B9AF7C */ void adjustShapeAngle() {}
+    BOOL isDelete();
+    void reset();
+    void playExpression();
+    void playMotion();
+    BOOL chkAction(ActionFn);
+    BOOL setAction(ActionFn);
+    BOOL selectAction();
+    void doNormalAction(BOOL);
+    BOOL doEvent();
+    BOOL setSkipZev(int, int);
+    void setLookMode(int);
+    void lookat();
+    void setExpressionTalkAfter();
+    void lightReady();
+    void setLightPos();
+    void lightPowerCalc(int);
+    void lightColorProc();
+    BOOL ECut_helpPrince(int);
+    BOOL ECut_comeHere(int);
+    BOOL ECut_restoreLink(int);
+    BOOL ECut_clothesGet(int);
+    BOOL ECut_getAfter(int);
+    BOOL ECut_sealRelease(int);
+    BOOL ECut_srSkip(int);
+    void pullbackPlayer(f32);
+    BOOL wait(void*);
+    BOOL comeHere(void*);
+    BOOL comeHere2(void*);
+    BOOL talk(void*);
+    BOOL test(void*);
+    void himoCalc();
+    void adjustShapeAngle() {}
 
 private:
     /* 0x0B48 */ Z2Creature mCreatureSound;
@@ -209,7 +209,7 @@ public:
         /* 0x80 */ f32 field_0x80;
     };
 
-    /* 80B9AF80 */ virtual ~daNpc_zrZ_Param_c() {}
+    virtual ~daNpc_zrZ_Param_c() {}
 
     static param const m;
 };
diff --git a/include/d/actor/d_a_obj_Lv5Key.h b/include/d/actor/d_a_obj_Lv5Key.h
index d43bc6f08b..6e0251b151 100644
--- a/include/d/actor/d_a_obj_Lv5Key.h
+++ b/include/d/actor/d_a_obj_Lv5Key.h
@@ -24,24 +24,24 @@ public:
         STATUS_OPEN,
     };
 
-    /* 80B9B9B8 */ int CreateHeap();
-    /* 80B9BA94 */ int Init();
-    /* 80B9BB5C */ void setBgc();
-    /* 80B9BBCC */ void initCcSph();
-    /* 80B9BC2C */ void setCcSph();
-    /* 80B9BD30 */ void setAction(actionFunc, int);
-    /* 80B9BDD8 */ void Action();
-    /* 80B9BE24 */ void Wait(int);
-    /* 80B9BF08 */ void Open(int);
-    /* 80B9BFDC */ void Fall(int);
-    /* 80B9C17C */ void Land(int);
-    /* 80B9C268 */ void Shake(int);
-    /* 80B9C3B0 */ void TranslateByNowDirect(f32, f32, f32);
-    /* 80B9C410 */ int Execute();
-    /* 80B9C450 */ int Draw();
-    /* 80B9C500 */ int Delete();
-    /* 80B9C534 */ void setBaseMtx();
-    /* 80B9C5EC */ int create_1st();
+    int CreateHeap();
+    int Init();
+    void setBgc();
+    void initCcSph();
+    void setCcSph();
+    void setAction(actionFunc, int);
+    void Action();
+    void Wait(int);
+    void Open(int);
+    void Fall(int);
+    void Land(int);
+    void Shake(int);
+    void TranslateByNowDirect(f32, f32, f32);
+    int Execute();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    int create_1st();
 
     void setLocalOffset(f32 x, f32 y, f32 z) { mLocalOffset.set(x, y, z); }
     void setRotateSpd(s16 x, s16 y, s16 z) { mRotateSpd.set(x, y, z); }
diff --git a/include/d/actor/d_a_obj_Turara.h b/include/d/actor/d_a_obj_Turara.h
index 6cca41dbdc..d8a45097d9 100644
--- a/include/d/actor/d_a_obj_Turara.h
+++ b/include/d/actor/d_a_obj_Turara.h
@@ -18,28 +18,28 @@
 class daTurara_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
     daTurara_c() : dEvLib_callback_c(this) {}
-    /* 80B9E710 */ ~daTurara_c() {}
+    ~daTurara_c() {}
 
-    /* 80B9CC9C */ void setBaseMtx();
-    /* 80B9CD74 */ int CreateHeap();
-    /* 80B9CED8 */ int create();
-    /* 80B9D468 */ void setFallStat();
-    /* 80B9D4CC */ int Execute(Mtx**);
-    /* 80B9D548 */ void move();
-    /* 80B9D72C */ void init_modeWait();
-    /* 80B9D738 */ void modeWait();
-    /* 80B9D998 */ bool eventStart();
-    /* 80B9D9BC */ void init_modeDropInit();
-    /* 80B9DA00 */ void modeDropInit();
-    /* 80B9DA44 */ void init_modeDrop();
-    /* 80B9DB44 */ void modeDrop();
-    /* 80B9DB90 */ void bgCheck();
-    /* 80B9DBD0 */ void init_modeDropEnd();
-    /* 80B9DE48 */ void modeDropEnd();
-    /* 80B9E078 */ void init_modeDropEnd2();
-    /* 80B9E338 */ void modeDropEnd2();
-    /* 80B9E388 */ int Draw();
-    /* 80B9E478 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    void setFallStat();
+    int Execute(Mtx**);
+    void move();
+    void init_modeWait();
+    void modeWait();
+    bool eventStart();
+    void init_modeDropInit();
+    void modeDropInit();
+    void init_modeDrop();
+    void modeDrop();
+    void bgCheck();
+    void init_modeDropEnd();
+    void modeDropEnd();
+    void init_modeDropEnd2();
+    void modeDropEnd2();
+    int Draw();
+    int Delete();
 
     int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
     int getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_TvCdlst.h b/include/d/actor/d_a_obj_TvCdlst.h
index 14d8a8ec31..7d94a35676 100644
--- a/include/d/actor/d_a_obj_TvCdlst.h
+++ b/include/d/actor/d_a_obj_TvCdlst.h
@@ -14,17 +14,17 @@
  */
 class daTvCdlst_c : public fopAc_ac_c {
 public:
-    /* 80B9ED40 */ void setBaseMtx();
-    /* 80B9EDC8 */ int CreateHeap();
-    /* 80B9EE34 */ int create();
-    /* 80B9F144 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80B9F164 */ void lightInit();
-    /* 80B9F1F0 */ void setLight();
-    /* 80B9F220 */ void cutLight();
-    /* 80B9F250 */ void pointLightProc();
-    /* 80B9F300 */ int Execute();
-    /* 80B9F634 */ int Draw();
-    /* 80B9F6D8 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    int Execute();
+    int Draw();
+    int Delete();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -56,8 +56,8 @@ STATIC_ASSERT(sizeof(daTvCdlst_c) == 0x754);
 
 class daTvCdlst_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80B9ECCC */ daTvCdlst_HIO_c();
-    /* 80B9F7B0 */ virtual ~daTvCdlst_HIO_c() {}
+    daTvCdlst_HIO_c();
+    virtual ~daTvCdlst_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_Y_taihou.h b/include/d/actor/d_a_obj_Y_taihou.h
index 1ce439d254..0e96cf62ed 100644
--- a/include/d/actor/d_a_obj_Y_taihou.h
+++ b/include/d/actor/d_a_obj_Y_taihou.h
@@ -16,22 +16,22 @@
 class daObjYtaihou_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
     daObjYtaihou_c() : dEvLib_callback_c(this) { mIronBallId = -1; }
-    /* 80B9FDE8 */ int create1st();
-    /* 80B9FEB0 */ void setIronBall(daObjCarry_c*);
-    /* 80B9FF08 */ int getEvent(u8);
-    /* 80B9FF1C */ void loadAngle();
-    /* 80B9FFAC */ void saveAngle();
-    /* 80BA0060 */ void setNextAngle();
-    /* 80BA0084 */ void setMtx();
-    /* 80BA0208 */ void rotateCheck();
-    /* 80BA045C */ void shotCheck();
-    /* 80BA0964 */ virtual bool eventStart();
-    /* 80BA0974 */ int CreateHeap();
-    /* 80BA09E4 */ int Create();
-    /* 80BA0A94 */ int Execute(Mtx** i_mtx);
-    /* 80BA0B4C */ int Draw();
-    /* 80BA0C1C */ int Delete();
-    /* 80BA0FA4 */ ~daObjYtaihou_c() {}
+    int create1st();
+    void setIronBall(daObjCarry_c*);
+    int getEvent(u8);
+    void loadAngle();
+    void saveAngle();
+    void setNextAngle();
+    void setMtx();
+    void rotateCheck();
+    void shotCheck();
+    virtual bool eventStart();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx** i_mtx);
+    int Draw();
+    int Delete();
+    ~daObjYtaihou_c() {}
 
     void setAddAngle(s8 add_angle) { mAddAngle = add_angle; }
     s32 getIronBallId() { return mIronBallId; }
diff --git a/include/d/actor/d_a_obj_amiShutter.h b/include/d/actor/d_a_obj_amiShutter.h
index 6fc4627bd6..5d6ffd61f7 100644
--- a/include/d/actor/d_a_obj_amiShutter.h
+++ b/include/d/actor/d_a_obj_amiShutter.h
@@ -29,29 +29,29 @@ public:
     };
 
     daAmiShutter_c(): dEvLib_callback_c(this) {}
-    /* 80BA22E8 */ ~daAmiShutter_c() {}
+    ~daAmiShutter_c() {}
 
-    /* 80BA155C */ void setBaseMtx();
-    /* 80BA15E4 */ int CreateHeap();
-    /* 80BA1650 */ cPhs__Step create();
-    /* 80BA182C */ int Execute(Mtx**);
-    /* 80BA1888 */ void moveShutter();
-    /* 80BA1974 */ BOOL playerAreaCheck();
-    /* 80BA1B4C */ void init_modeWait();
-    /* 80BA1B58 */ void modeWait();
-    /* 80BA1BCC */ void init_modeWaitEvent();
-    /* 80BA1BD8 */ void modeWaitEvent();
-    /* 80BA1C90 */ bool eventStart();
-    /* 80BA1CB4 */ void init_modeClose();
-    /* 80BA1D48 */ void modeClose();
-    /* 80BA1DCC */ void init_modeCloseEvent();
-    /* 80BA1E60 */ void modeCloseEvent();
-    /* 80BA1EEC */ void init_modeCloseEnd();
-    /* 80BA1F7C */ void modeCloseEnd();
-    /* 80BA1F80 */ void init_modeOpen();
-    /* 80BA2004 */ void modeOpen();
-    /* 80BA2080 */ int Draw();
-    /* 80BA2124 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void moveShutter();
+    BOOL playerAreaCheck();
+    void init_modeWait();
+    void modeWait();
+    void init_modeWaitEvent();
+    void modeWaitEvent();
+    bool eventStart();
+    void init_modeClose();
+    void modeClose();
+    void init_modeCloseEvent();
+    void modeCloseEvent();
+    void init_modeCloseEnd();
+    void modeCloseEnd();
+    void init_modeOpen();
+    void modeOpen();
+    int Draw();
+    int Delete();
 
     
     u8 getType() { return fopAcM_GetParamBit(this, 16, 4); }
diff --git a/include/d/actor/d_a_obj_ari.h b/include/d/actor/d_a_obj_ari.h
index 38eee1b657..b3abad72bb 100644
--- a/include/d/actor/d_a_obj_ari.h
+++ b/include/d/actor/d_a_obj_ari.h
@@ -18,27 +18,27 @@
  */
 class daObjARI_c : public dInsect_c {
 public:
-    /* 80BA26BC */ void InitCcSph();
-    /* 80BA2728 */ void SetCcSph();
-    /* 80BA2780 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80BA28C0 */ int CreateHeap();
-    /* 80BA2CA4 */ void WallWalk();
-    /* 80BA3270 */ void MoveAction();
-    /* 80BA337C */ void Action();
-    /* 80BA33F8 */ void Insect_Release();
-    /* 80BA3408 */ void checkGround();
-    /* 80BA3638 */ void B_MoveAction();
-    /* 80BA36CC */ void FallAction();
-    /* 80BA3700 */ void ParticleSet();
-    /* 80BA3824 */ void BoomChk();
-    /* 80BA3B38 */ void ObjHit();
-    /* 80BA3C38 */ int Execute();
-    /* 80BA44F0 */ void Z_BufferChk();
-    /* 80BA466C */ int Delete();
-    /* 80BA46D4 */ void setBaseMtx();
+    void InitCcSph();
+    void SetCcSph();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    int CreateHeap();
+    void WallWalk();
+    void MoveAction();
+    void Action();
+    void Insect_Release();
+    void checkGround();
+    void B_MoveAction();
+    void FallAction();
+    void ParticleSet();
+    void BoomChk();
+    void ObjHit();
+    int Execute();
+    void Z_BufferChk();
+    int Delete();
+    void setBaseMtx();
     /*  inline  */ inline int Draw();
-    /* 80BA483C */ bool CreateChk();
-    /* 80BA49E8 */ cPhs__Step create();
+    bool CreateChk();
+    cPhs__Step create();
 
 private:
     /* 0x590 */ dBgS_GndChk mGndChk;
@@ -82,8 +82,8 @@ STATIC_ASSERT(sizeof(daObjARI_c) == 0xA78);
 
 class daObj_AriHIO_c {
 public:
-    /* 80BA268C */ daObj_AriHIO_c();
-    /* 80BA5360 */ virtual ~daObj_AriHIO_c() {}
+    daObj_AriHIO_c();
+    virtual ~daObj_AriHIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScaleFemale;
diff --git a/include/d/actor/d_a_obj_automata.h b/include/d/actor/d_a_obj_automata.h
index 6a1939ee0f..501c4f7e6b 100644
--- a/include/d/actor/d_a_obj_automata.h
+++ b/include/d/actor/d_a_obj_automata.h
@@ -33,19 +33,19 @@ private:
     /* 0xB31 */ u8 mCoNone;
 
 public:
-    /* 80BA56EC */ virtual ~daObj_AutoMata_c();
-    /* 80BA5990 */ int create();
-    /* 80BA5F88 */ int CreateHeap();
-    /* 80BA60A0 */ int Delete();
-    /* 80BA60D4 */ int Execute();
-    /* 80BA639C */ int Draw();
-    /* 80BA6480 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80BA64A0 */ static void* srchTHouse(fopAc_ac_c*, void*);
-    /* 80BA6500 */ int setAnm(int, bool);
-    /* 80BA6634 */ void setEnvTevColor();
-    /* 80BA6690 */ void setRoomNo();
-    /* 80BA66D4 */ void setMtx();
-    /* 80BA674C */ void setSe();
+    virtual ~daObj_AutoMata_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void* srchTHouse(fopAc_ac_c*, void*);
+    int setAnm(int, bool);
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
+    void setSe();
 
     void setAnmPlaySpeed(f32 i_playspeed) {
         mAnmPlaySpeed = i_playspeed;
@@ -60,7 +60,7 @@ STATIC_ASSERT(sizeof(daObj_AutoMata_c) == 0xb38);
 
 class daObj_AutoMata_Param_c {
 public:
-    /* 80BA6BA4 */ virtual ~daObj_AutoMata_Param_c() {}
+    virtual ~daObj_AutoMata_Param_c() {}
 
     static f32 const m[3];
 };
diff --git a/include/d/actor/d_a_obj_avalanche.h b/include/d/actor/d_a_obj_avalanche.h
index c84bef37c7..425e74c93b 100644
--- a/include/d/actor/d_a_obj_avalanche.h
+++ b/include/d/actor/d_a_obj_avalanche.h
@@ -24,23 +24,23 @@ public:
         ACTION_DEAD,
     };
 
-    /* 80BA6ED8 */ void initBaseMtx();
-    /* 80BA6F14 */ void setBaseMtx();
-    /* 80BA6FC8 */ int Create();
-    /* 80BA7178 */ int CreateHeap();
-    /* 80BA7370 */ int create1st();
-    /* 80BA73F4 */ int Execute(Mtx**);
-    /* 80BA7440 */ int checkCollapse();
-    /* 80BA75A4 */ int move();
-    /* 80BA7618 */ void event_proc_call();
-    /* 80BA76D4 */ void actionWait();
-    /* 80BA773C */ void actionOrderEvent();
-    /* 80BA7804 */ void actionEvent();
-    /* 80BA7888 */ void actionDead();
-    /* 80BA788C */ int demoProc();
-    /* 80BA7A50 */ void setEffect();
-    /* 80BA7AE8 */ int Draw();
-    /* 80BA7BA0 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int checkCollapse();
+    int move();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    void setEffect();
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getEvId() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_balloon.h b/include/d/actor/d_a_obj_balloon.h
index 855a8946bc..9ec09680ee 100644
--- a/include/d/actor/d_a_obj_balloon.h
+++ b/include/d/actor/d_a_obj_balloon.h
@@ -23,15 +23,15 @@ public:
         SIZE_SMALL_e,
     };
 
-    /* 80BA7FF4 */ int draw();
-    /* 80BA80F4 */ void saveBestScore();
-    /* 80BA810C */ void cc_set();
-    /* 80BA81B8 */ void action();
-    /* 80BA865C */ void mtx_set();
-    /* 80BA86CC */ int execute();
-    /* 80BA8734 */ int _delete();
-    /* 80BA87CC */ int CreateHeap();
-    /* 80BA88C4 */ int create();
+    int draw();
+    void saveBestScore();
+    void cc_set();
+    void action();
+    void mtx_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ J3DModel* mModel;
@@ -53,8 +53,8 @@ public:
 
 class daObj_Balloon_HIO_c {
 public:
-    /* 80BA7FAC */ daObj_Balloon_HIO_c();
-    /* 80BA8D64 */ virtual ~daObj_Balloon_HIO_c() {}
+    daObj_Balloon_HIO_c();
+    virtual ~daObj_Balloon_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mScale[3];
diff --git a/include/d/actor/d_a_obj_barDesk.h b/include/d/actor/d_a_obj_barDesk.h
index 45ca0ead3e..08081226f7 100644
--- a/include/d/actor/d_a_obj_barDesk.h
+++ b/include/d/actor/d_a_obj_barDesk.h
@@ -16,18 +16,18 @@
  */
 class daBarDesk_c : public dBgS_MoveBgActor {
 public:
-    /* 80BA9200 */ void setBaseMtx();
-    /* 80BA9288 */ int CreateHeap();
-    /* 80BA92F4 */ cPhs__Step create();
-    /* 80BA95A4 */ int Execute(Mtx**);
-    /* 80BA95F4 */ void windowProc();
-    /* 80BA9680 */ void init_modeWait();
-    /* 80BA968C */ void modeWait();
-    /* 80BA973C */ void init_modeBreak();
-    /* 80BA9824 */ void modeBreak();
-    /* 80BA9844 */ void setBreakEffect();
-    /* 80BA98E8 */ int Draw();
-    /* 80BA998C */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void windowProc();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
+    void setBreakEffect();
+    int Draw();
+    int Delete();
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;
@@ -44,8 +44,8 @@ STATIC_ASSERT(sizeof(daBarDesk_c) == 0x730);
 
 class daBarDesk_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BA918C */ daBarDesk_HIO_c();
-    /* 80BA9A90 */ ~daBarDesk_HIO_c() {}
+    daBarDesk_HIO_c();
+    ~daBarDesk_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_batta.h b/include/d/actor/d_a_obj_batta.h
index 214ca977aa..fca663390b 100644
--- a/include/d/actor/d_a_obj_batta.h
+++ b/include/d/actor/d_a_obj_batta.h
@@ -18,23 +18,23 @@ class daObjBATTA_c : public dInsect_c {
 public:
     typedef void (daObjBATTA_c::*actionFunc)();
 
-    /* 80BA9E5C */ void setAction(void (daObjBATTA_c::*)());
-    /* 80BAA1C8 */ void wait();
-    /* 80BAA47C */ void turn();
-    /* 80BAAA18 */ void jump();
-    /* 80BAAD30 */ void fly_up();
-    /* 80BAB234 */ void fly_down();
-    /* 80BAB500 */ void bin_wait();
-    /* 80BAB6C8 */ void bin_action();
-    /* 80BAB820 */ void hook();
-    /* 80BAB934 */ void boomerang();
-    /* 80BABA98 */ void batta_setParticle();
-    /* 80BABCA4 */ void action();
-    /* 80BABD6C */ void hit_check();
-    /* 80BABE20 */ int execute();
-    /* 80BABFA4 */ int _delete();
-    /* 80BAC00C */ void mtx_set();
-    /* 80BAC194 */ int create();
+    void setAction(void (daObjBATTA_c::*)());
+    void wait();
+    void turn();
+    void jump();
+    void fly_up();
+    void fly_down();
+    void bin_wait();
+    void bin_action();
+    void hook();
+    void boomerang();
+    void batta_setParticle();
+    void action();
+    void hit_check();
+    int execute();
+    int _delete();
+    void mtx_set();
+    int create();
 
     inline int CreateHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_bbox.h b/include/d/actor/d_a_obj_bbox.h
index e081242b8b..7ee461b557 100644
--- a/include/d/actor/d_a_obj_bbox.h
+++ b/include/d/actor/d_a_obj_bbox.h
@@ -15,14 +15,14 @@
  */
 class daObjBBox_c : public dBgS_MoveBgActor {
 public:
-    /* 80BACD38 */ void initBaseMtx();
-    /* 80BACD74 */ void setBaseMtx();
-    /* 80BACDD8 */ int Create();
-    /* 80BACE50 */ int CreateHeap();
-    /* 80BACEC0 */ int create1st();
-    /* 80BAD0C0 */ int Execute(Mtx**);
-    /* 80BAD234 */ int Draw();
-    /* 80BAD2D8 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_bed.h b/include/d/actor/d_a_obj_bed.h
index bf9deb8cff..827f3827fc 100644
--- a/include/d/actor/d_a_obj_bed.h
+++ b/include/d/actor/d_a_obj_bed.h
@@ -33,26 +33,26 @@ public:
     /* 0x83C */ u8 mType;
     /* 0x840 */ /* vtable */
 
-    /* 80BAD66C */ virtual ~daObj_Bed_c();
-    /* 80BAD790 */ cPhs__Step create();
-    /* 80BADB70 */ int CreateHeap();
-    /* 80BADC80 */ int Delete();
-    /* 80BADCB4 */ int Execute();
-    /* 80BADDF4 */ int Draw();
-    /* 80BADEB8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80BADED8 */ u8 getType();
-    /* 80BADEE0 */ char* getResName();
-    /* 80BADEF0 */ int isDelete();
-    /* 80BADF34 */ void setEnvTevColor();
-    /* 80BADF90 */ void setRoomNo();
-    /* 80BADFD0 */ void setMtx();
+    virtual ~daObj_Bed_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    u8 getType();
+    char* getResName();
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 };
 
 STATIC_ASSERT(sizeof(daObj_Bed_c) == 0x844);
 
 class daObj_Bed_Param_c {
 public:
-    /* 80BAE0FC */ virtual ~daObj_Bed_Param_c() {}
+    virtual ~daObj_Bed_Param_c() {}
 
     struct params {
         /* 0x0 */ f32 field_0x0;
diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h
index 3faa5e1eaf..c08b50bd7a 100644
--- a/include/d/actor/d_a_obj_bemos.h
+++ b/include/d/actor/d_a_obj_bemos.h
@@ -43,9 +43,9 @@ public:
             STATE_40_e = 0x40,
         };
 
-        /* 80BB0E0C */ Bgc_c();
-        /* 80BB0ED4 */ void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32);
-        /* 80BB1154 */ bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16);
+        Bgc_c();
+        void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32);
+        bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16);
 
         static daObjBm_c::BgcSrc_c M_lin5[];
         static const daObjBm_c::BgcSrc_c M_lin20[];
@@ -76,56 +76,56 @@ public:
     u8 getBeamSearchDist() { return field_0x100a & 15; }
     u8 checkLockOnCamera() { return (field_0x100a & 0x8000) >> 15; }
 
-    /* 80BAE36C */ static fopAc_ac_c* PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16,
+    static fopAc_ac_c* PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16,
                                                  dBgW_Base::PushPullLabel);
-    /* 80BAE5FC */ void initBaseMtx();
-    /* 80BAE68C */ void setBaseMtx();
-    /* 80BAE778 */ int Create();
-    /* 80BAEADC */ int CreateHeap();
-    /* 80BAEFD8 */ int create1st();
-    /* 80BAF09C */ int Execute(Mtx**);
-    /* 80BAF29C */ void main_proc_call();
-    /* 80BAF328 */ void initActionEnBemos();
-    /* 80BAF37C */ void initActionObjBemos();
-    /* 80BAF46C */ void actionEnBemos();
-    /* 80BAF750 */ void actionObjBemos();
-    /* 80BAF80C */ void setCrawCO();
-    /* 80BAF8F8 */ void calcBeamPos();
-    /* 80BAFC08 */ void calcBeamLenAndAt();
-    /* 80BAFFA8 */ s8 checkFindPlayer();
-    /* 80BB0104 */ s8 checkSearchPlayer();
-    /* 80BB0260 */ f32 getSearchDistance();
-    /* 80BB02B8 */ f32 getBeamSearchDistance();
-    /* 80BB0310 */ void effect_proc();
-    /* 80BB0580 */ void effectWait();
-    /* 80BB0584 */ void initEffectSet0();
-    /* 80BB0718 */ void effectSet0();
-    /* 80BB071C */ void effectSet1();
-    /* 80BB0720 */ void effectEnd();
-    /* 80BB0724 */ int check_to_walk();
-    /* 80BB0824 */ void mode_wait_init();
-    /* 80BB0888 */ void mode_wait();
-    /* 80BB09C8 */ void mode_walk_init();
-    /* 80BB09E0 */ void mode_walk();
-    /* 80BB0DA8 */ void mode_afl();
-    /* 80BB0DC0 */ void mode_dead_init();
-    /* 80BB0DE4 */ void mode_dead();
-    /* 80BB0DE8 */ void clr_moment_cnt();
-    /* 80BB1194 */ void initActionSwWait();
-    /* 80BB11D4 */ void actionSwWait();
-    /* 80BB14C8 */ void initActionWarning();
-    /* 80BB154C */ void actionWarning();
-    /* 80BB1654 */ void initActionFindPlayer();
-    /* 80BB1814 */ void actionFindPlayer();
-    /* 80BB1960 */ void initActionAttack();
-    /* 80BB1BD0 */ void actionAttack();
-    /* 80BB248C */ void initActionDead();
-    /* 80BB2700 */ void actionDead();
-    /* 80BB2AB0 */ int Draw();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void main_proc_call();
+    void initActionEnBemos();
+    void initActionObjBemos();
+    void actionEnBemos();
+    void actionObjBemos();
+    void setCrawCO();
+    void calcBeamPos();
+    void calcBeamLenAndAt();
+    s8 checkFindPlayer();
+    s8 checkSearchPlayer();
+    f32 getSearchDistance();
+    f32 getBeamSearchDistance();
+    void effect_proc();
+    void effectWait();
+    void initEffectSet0();
+    void effectSet0();
+    void effectSet1();
+    void effectEnd();
+    int check_to_walk();
+    void mode_wait_init();
+    void mode_wait();
+    void mode_walk_init();
+    void mode_walk();
+    void mode_afl();
+    void mode_dead_init();
+    void mode_dead();
+    void clr_moment_cnt();
+    void initActionSwWait();
+    void actionSwWait();
+    void initActionWarning();
+    void actionWarning();
+    void initActionFindPlayer();
+    void actionFindPlayer();
+    void initActionAttack();
+    void actionAttack();
+    void initActionDead();
+    void actionDead();
+    int Draw();
 #ifdef DEBUG
     /* 0x000000 */ void debugDraw();
 #endif
-    /* 80BB2C8C */ int Delete();
+    int Delete();
 
     static s16 const M_dir_base[4];
     // private:
diff --git a/include/d/actor/d_a_obj_bhashi.h b/include/d/actor/d_a_obj_bhashi.h
index 6c05dac0b9..7600d73f67 100644
--- a/include/d/actor/d_a_obj_bhashi.h
+++ b/include/d/actor/d_a_obj_bhashi.h
@@ -8,12 +8,12 @@
 
 class Hahen_c {
 public:
-    /* 80577794 */ Hahen_c();
-    /* 805777A4 */ void Wall_Check();
-    /* 80577868 */ void HahenMotion();
-    /* 80577C1C */ bool CheckCull();
-    /* 80577DA4 */ bool checkViewArea();
-    /* 80577FE0 */ void Roll_Set(cXyz*, f32, s16);
+    Hahen_c();
+    void Wall_Check();
+    void HahenMotion();
+    bool CheckCull();
+    bool checkViewArea();
+    void Roll_Set(cXyz*, f32, s16);
 
     /* 0x00 */ cXyz pos;
     /* 0x0C */ cXyz speed;
@@ -34,21 +34,21 @@ public:
  */
 class daObjBHASHI_c : public dBgS_MoveBgActor {
 public:
-    /* 80576A58 */ void initCcCylinder();
-    /* 80576AC4 */ void setCcCylinder();
-    /* 80576B78 */ void Set_Hahen();
-    /* 80576C50 */ void Set_Speed(s16, s16, f32, f32);
-    /* 80577500 */ void Obj_Damage(cXyz);
-    /* 805771EC */ void Obj_Damage();
-    /* 80577E24 */ void Rolling(cXyz*, f32, f32);
-    /* 805781FC */ void setBaseMtx();
-    /* 8057842C */ int create();
+    void initCcCylinder();
+    void setCcCylinder();
+    void Set_Hahen();
+    void Set_Speed(s16, s16, f32, f32);
+    void Obj_Damage(cXyz);
+    void Obj_Damage();
+    void Rolling(cXyz*, f32, f32);
+    void setBaseMtx();
+    int create();
 
-    /* 80578330 */ virtual int CreateHeap();
-    /* 80578788 */ virtual int Create();
-    /* 805787CC */ virtual int Execute(Mtx**);
-    /* 805788EC */ virtual int Draw();
-    /* 805789E8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x05A0 */ u8 field_0x5A0[0x05A4 - 0x05A0];
diff --git a/include/d/actor/d_a_obj_bhbridge.h b/include/d/actor/d_a_obj_bhbridge.h
index efa8609ec7..db30149abe 100644
--- a/include/d/actor/d_a_obj_bhbridge.h
+++ b/include/d/actor/d_a_obj_bhbridge.h
@@ -15,15 +15,15 @@
  */
 class daObjBhbridge_c : public dBgS_MoveBgActor {
 public:
-    /* 80BB5318 */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80BB5380 */ int Check_RideOn();
-    /* 80BB558C */ void initBaseMtx();
-    /* 80BB55B8 */ void setBaseMtx();
-    /* 80BB5934 */ virtual int CreateHeap();
-    /* 80BB59AC */ virtual int Create();
-    /* 80BB5A14 */ virtual int Execute(Mtx**);
-    /* 80BB5E10 */ virtual int Draw();
-    /* 80BB5EB4 */ virtual int Delete();
+    void RideOn_Angle(s16&, f32, s16, f32);
+    int Check_RideOn();
+    void initBaseMtx();
+    void setBaseMtx();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     inline int create();
 
diff --git a/include/d/actor/d_a_obj_bk_leaf.h b/include/d/actor/d_a_obj_bk_leaf.h
index aaee757e9e..5785ca463d 100644
--- a/include/d/actor/d_a_obj_bk_leaf.h
+++ b/include/d/actor/d_a_obj_bk_leaf.h
@@ -13,15 +13,15 @@
  */
 class daBkLeaf_c : public fopAc_ac_c {
 public:
-    /* 80BB60F8 */ void setBokkuri();
-    /* 80BB618C */ void initBaseMtx();
-    /* 80BB61C8 */ void setBaseMtx();
-    /* 80BB621C */ int Create();
-    /* 80BB629C */ int CreateHeap();
-    /* 80BB63F4 */ int create();
-    /* 80BB64A8 */ int execute();
-    /* 80BB65C4 */ int draw();
-    /* 80BB6654 */ int _delete();
+    void setBokkuri();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getItem() { return fopAcM_GetParamBit(this, 0, 8); };
     u8 getItemBit() { return fopAcM_GetParamBit(this, 8, 8); };
diff --git a/include/d/actor/d_a_obj_bkdoor.h b/include/d/actor/d_a_obj_bkdoor.h
index 21cf1e32bb..69d3191028 100644
--- a/include/d/actor/d_a_obj_bkdoor.h
+++ b/include/d/actor/d_a_obj_bkdoor.h
@@ -16,15 +16,15 @@ class J3DModel;
  */
 class daObjBkDoor_c : public dBgS_MoveBgActor {
 public:
-    /* 80578D4C */ void initBaseMtx();
-    /* 80578D88 */ void setBaseMtx();
-    /* 80578E14 */ virtual int Create();
-    /* 80578EA0 */ virtual int CreateHeap();
-    /* 80578F20 */ int create1st();
-    /* 80578FC0 */ void openCheck();
-    /* 8057902C */ virtual int Execute(Mtx**);
-    /* 805792E4 */ virtual int Draw();
-    /* 80579388 */ virtual int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    virtual int Create();
+    virtual int CreateHeap();
+    int create1st();
+    void openCheck();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_obj_bky_rock.h b/include/d/actor/d_a_obj_bky_rock.h
index 55768efc7e..99f23557e4 100644
--- a/include/d/actor/d_a_obj_bky_rock.h
+++ b/include/d/actor/d_a_obj_bky_rock.h
@@ -36,25 +36,25 @@ public:
         MODE_2,
     };
 
-    /* 80BB6858 */ daBkyRock_c();
-    /* 80BB6B5C */ virtual ~daBkyRock_c();
-    /* 80BB6C4C */ int create();
-    /* 80BB6D60 */ int execute();
-    /* 80BB6D84 */ int draw();
-    /* 80BB6EB8 */ int Delete();
-    /* 80BB6F64 */ void setModelMtx();
-    /* 80BB6FD4 */ int createHeap();
-    /* 80BB7144 */ void init();
-    /* 80BB72FC */ void middleExe();
-    /* 80BB7364 */ void exeModeNoDamage();
-    /* 80BB7458 */ void exeModeDamage();
-    /* 80BB75D8 */ void exeModePiece();
-    /* 80BB7690 */ bool chkHitBombArrow();
-    /* 80BB776C */ void initChangeModeBefore();
-    /* 80BB77FC */ void initChangeModeAfter();
-    /* 80BB7818 */ void pieceMove();
-    /* 80BB7988 */ void pieceMoveInit();
-    /* 80BB7C18 */ void callBombEmt(int, u16 const*);
+    daBkyRock_c();
+    virtual ~daBkyRock_c();
+    int create();
+    int execute();
+    int draw();
+    int Delete();
+    void setModelMtx();
+    int createHeap();
+    void init();
+    void middleExe();
+    void exeModeNoDamage();
+    void exeModeDamage();
+    void exeModePiece();
+    bool chkHitBombArrow();
+    void initChangeModeBefore();
+    void initChangeModeAfter();
+    void pieceMove();
+    void pieceMoveInit();
+    void callBombEmt(int, u16 const*);
 
     u8 getSwBit0() { return fopAcM_GetParamBit(this, 4, 8); }
     u8 getSwBit1() { return fopAcM_GetParamBit(this, 12, 8); }
diff --git a/include/d/actor/d_a_obj_bmWindow.h b/include/d/actor/d_a_obj_bmWindow.h
index 8b12634125..fe49cf106a 100644
--- a/include/d/actor/d_a_obj_bmWindow.h
+++ b/include/d/actor/d_a_obj_bmWindow.h
@@ -23,21 +23,21 @@ public:
         BREAK_EFF,
     };
 
-    /* 80BB8350 */ void setBaseMtx();
-    /* 80BB8400 */ int CreateHeap();
-    /* 80BB846C */ int create();
-    /* 80BB88D8 */ int Execute(Mtx**);
-    /* 80BB8930 */ void windowProc();
-    /* 80BB8B3C */ void init_modeWait();
-    /* 80BB8B48 */ void modeWait();
-    /* 80BB8FDC */ int checkActorInRectangle(fopAc_ac_c*, cXyz const*, cXyz const*);
-    /* 80BB90E0 */ void init_modeBreak();
-    /* 80BB920C */ void modeBreak();
-    /* 80BB922C */ void init_modeBreakEff();
-    /* 80BB9304 */ void modeBreakEff();
-    /* 80BB9324 */ void setBreakEffect(int);
-    /* 80BB9494 */ int Draw();
-    /* 80BB9548 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void windowProc();
+    void init_modeWait();
+    void modeWait();
+    int checkActorInRectangle(fopAc_ac_c*, cXyz const*, cXyz const*);
+    void init_modeBreak();
+    void modeBreak();
+    void init_modeBreakEff();
+    void modeBreakEff();
+    void setBreakEffect(int);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -74,8 +74,8 @@ STATIC_ASSERT(sizeof(daBmWindow_c) == 0xEE0);
 
 class daBmWindow_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80BB820C */ daBmWindow_HIO_c();
-    /* 80BB964C */ virtual ~daBmWindow_HIO_c() {}
+    daBmWindow_HIO_c();
+    virtual ~daBmWindow_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_bmshutter.h b/include/d/actor/d_a_obj_bmshutter.h
index cf8098d6c0..c114421fe8 100644
--- a/include/d/actor/d_a_obj_bmshutter.h
+++ b/include/d/actor/d_a_obj_bmshutter.h
@@ -14,26 +14,26 @@
  */
 class daObjBmSh_c : public dBgS_MoveBgActor {
 public:
-    /* 80BB9A58 */ void initBaseMtx();
-    /* 80BB9AE4 */ void setBaseMtx();
-    /* 80BB9B84 */ int Create();
-    /* 80BB9C50 */ int CreateHeap();
-    /* 80BB9CC0 */ int create();
-    /* 80BB9DB4 */ int Execute(Mtx**);
-    /* 80BB9F34 */ int checkSw();
-    /* 80BB9FBC */ int checkAnySw();
-    /* 80BBA044 */ int checkMySw();
-    /* 80BBA080 */ void event_proc_call();
-    /* 80BBA13C */ void actionWait();
-    /* 80BBA1A4 */ void actionOrderEvent();
-    /* 80BBA20C */ void actionEvent();
-    /* 80BBA268 */ void actionDead();
-    /* 80BBA26C */ void mode_proc_call();
-    /* 80BBA394 */ void modeWait();
-    /* 80BBA5B4 */ void modeMove();
-    /* 80BBA640 */ void modeEnd();
-    /* 80BBA644 */ int Draw();
-    /* 80BBA6E8 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int checkSw();
+    int checkAnySw();
+    int checkMySw();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    void mode_proc_call();
+    void modeWait();
+    void modeMove();
+    void modeEnd();
+    int Draw();
+    int Delete();
 
     u32 getEvNo() { return fopAcM_GetParamBit(this, 16, 8); }
     u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_bombf.h b/include/d/actor/d_a_obj_bombf.h
index a115d8c386..1d175caa94 100644
--- a/include/d/actor/d_a_obj_bombf.h
+++ b/include/d/actor/d_a_obj_bombf.h
@@ -14,12 +14,12 @@
  */
 class daObjBombf_c : public fopAc_ac_c {
 public:
-    /* 80BBA9F8 */ bool createHeap();
-    /* 80BBAA84 */ int create();
-    /* 80BBABBC */ ~daObjBombf_c();
-    /* 80BBAC4C */ void setMatrix();
-    /* 80BBACC0 */ int execute();
-    /* 80BBADF8 */ int draw();
+    bool createHeap();
+    int create();
+    ~daObjBombf_c();
+    void setMatrix();
+    int execute();
+    int draw();
 
 private:
     /* 0x568 */ request_of_phase_process_class field_0x568;
diff --git a/include/d/actor/d_a_obj_bosswarp.h b/include/d/actor/d_a_obj_bosswarp.h
index 2045288ccb..15d92d6803 100644
--- a/include/d/actor/d_a_obj_bosswarp.h
+++ b/include/d/actor/d_a_obj_bosswarp.h
@@ -28,32 +28,32 @@ public:
         /* 0xA */ ACT_CANCEL_EVENT,
     };
 
-    /* 80579700 */ void initBaseMtx();
-    /* 80579748 */ void setBaseMtx();
-    /* 805797B8 */ int Create();
-    /* 80579934 */ int CreateHeap();
-    /* 80579B70 */ cPhs__Step create();
-    /* 80579C30 */ void appear(int);
-    /* 80579D98 */ void set_appear();
-    /* 80579E08 */ void disappear(int);
-    /* 80579E5C */ BOOL checkDistance();
-    /* 80579FF8 */ int execute();
-    /* 8057A390 */ void event_proc_call();
-    /* 8057A4F4 */ void actionWait();
-    /* 8057A54C */ void actionOrderEvent();
-    /* 8057A610 */ void actionEvent();
-    /* 8057A678 */ void actionWaitWarp();
-    /* 8057A6E0 */ void actionOrderWarpEvent();
-    /* 8057A778 */ void actionWarpEvent();
-    /* 8057A7C4 */ void actionDead();
-    /* 8057A7C8 */ void actionOrderChkEvent();
-    /* 8057A8B4 */ void actionChkEvent();
-    /* 8057A994 */ void actionOrderCancelEvent();
-    /* 8057AA2C */ void actionCancelEvent();
-    /* 8057AA94 */ int demoProc();
-    /* 8057B0D8 */ void setGoal();
-    /* 8057B190 */ int draw();
-    /* 8057B23C */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create();
+    void appear(int);
+    void set_appear();
+    void disappear(int);
+    BOOL checkDistance();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionWaitWarp();
+    void actionOrderWarpEvent();
+    void actionWarpEvent();
+    void actionDead();
+    void actionOrderChkEvent();
+    void actionChkEvent();
+    void actionOrderCancelEvent();
+    void actionCancelEvent();
+    int demoProc();
+    void setGoal();
+    int draw();
+    int _delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSceneListNo() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_boumato.h b/include/d/actor/d_a_obj_boumato.h
index c00e4e4913..27c1fd81d3 100644
--- a/include/d/actor/d_a_obj_boumato.h
+++ b/include/d/actor/d_a_obj_boumato.h
@@ -45,21 +45,21 @@ private:
     /* 0xA39 */ bool mIsCurTurnRight;
 
 public:
-    /* 80BBAFEC */ virtual ~daObj_BouMato_c();
-    /* 80BBB230 */ int create();
-    /* 80BBB770 */ int CreateHeap();
-    /* 80BBB800 */ int Delete();
-    /* 80BBB834 */ int Execute();
-    /* 80BBBD80 */ int Draw();
-    /* 80BBBE50 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80BBBE70 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80BBBEA0 */ static void* srchArrow(void*, void*);
-    /* 80BBBF4C */ void deleteStuckArrow();
-    /* 80BBBFF8 */ char* getResName();
-    /* 80BBC008 */ void setSwayParam(fopAc_ac_c*);
-    /* 80BBC19C */ void setEnvTevColor();
-    /* 80BBC1F8 */ void setRoomNo();
-    /* 80BBC23C */ void setMtx();
+    virtual ~daObj_BouMato_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    static void* srchArrow(void*, void*);
+    void deleteStuckArrow();
+    char* getResName();
+    void setSwayParam(fopAc_ac_c*);
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 
     int checkCrs(fopAc_ac_c* param_0, cXyz param_1, cXyz param_2, f32 param_3) {
         daArrow_c* arrow_p = (daArrow_c*)param_0;
@@ -95,7 +95,7 @@ STATIC_ASSERT(sizeof(daObj_BouMato_c) == 0xa40);
 
 class daObj_BouMato_Param_c {
 public:
-    /* 80BBC404 */ virtual ~daObj_BouMato_Param_c() {}
+    virtual ~daObj_BouMato_Param_c() {}
 
     static f32 const m[7];
 };
diff --git a/include/d/actor/d_a_obj_bsGate.h b/include/d/actor/d_a_obj_bsGate.h
index 18d423f48e..d5a42a8e48 100644
--- a/include/d/actor/d_a_obj_bsGate.h
+++ b/include/d/actor/d_a_obj_bsGate.h
@@ -21,19 +21,19 @@ public:
         /* 2 */ MODE_CLOSE,
     };
 
-    /* 80BC2910 */ void setBaseMtx();
-    /* 80BC29AC */ int CreateHeap();
-    /* 80BC2A18 */ cPhs__Step create();
-    /* 80BC2B6C */ int Execute(Mtx**);
-    /* 80BC2BBC */ void moveGate();
-    /* 80BC2CC4 */ void init_modeWait();
-    /* 80BC2CD0 */ void modeWait();
-    /* 80BC2CD4 */ void init_modeOpen();
-    /* 80BC2CE0 */ void modeOpen();
-    /* 80BC2E34 */ void init_modeClose();
-    /* 80BC2E40 */ void modeClose();
-    /* 80BC2F94 */ int Draw();
-    /* 80BC3038 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
@@ -50,8 +50,8 @@ STATIC_ASSERT(sizeof(daBsGate_c) == 0x5B8);
 
 class daBsGate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BC288C */ daBsGate_HIO_c();
-    /* 80BC30F4 */ ~daBsGate_HIO_c() {}
+    daBsGate_HIO_c();
+    ~daBsGate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_bubblePilar.h b/include/d/actor/d_a_obj_bubblePilar.h
index 7243f98fed..b9abdd1fdd 100644
--- a/include/d/actor/d_a_obj_bubblePilar.h
+++ b/include/d/actor/d_a_obj_bubblePilar.h
@@ -22,16 +22,16 @@ public:
         MODE_EFF_ON,
     };
 
-    /* 80BC3460 */ void setBaseMtx();
-    /* 80BC3518 */ int CreateHeap();
-    /* 80BC35D0 */ int create();
-    /* 80BC3934 */ int Execute(Mtx**);
-    /* 80BC3AB8 */ void initModeWait();
-    /* 80BC3AC4 */ void modeWait();
-    /* 80BC3C74 */ void initModeEffOn();
-    /* 80BC3C98 */ void modeEffOn();
-    /* 80BC3DB0 */ int Draw();
-    /* 80BC3E8C */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void initModeWait();
+    void modeWait();
+    void initModeEffOn();
+    void modeEffOn();
+    int Draw();
+    int Delete();
 
     u8 getArg0() { return fopAcM_GetParamBit(this, 8, 4); }
     u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -60,8 +60,8 @@ STATIC_ASSERT(sizeof(daBubbPilar_c) == 0x750);
 
 class daBubbPilar_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BC33EC */ daBubbPilar_HIO_c();
-    /* 80BC3F90 */ virtual ~daBubbPilar_HIO_c() {};
+    daBubbPilar_HIO_c();
+    virtual ~daBubbPilar_HIO_c() {};
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_burnbox.h b/include/d/actor/d_a_obj_burnbox.h
index d4ee6b28f7..fa54a370d2 100644
--- a/include/d/actor/d_a_obj_burnbox.h
+++ b/include/d/actor/d_a_obj_burnbox.h
@@ -15,14 +15,14 @@
  */
 class daObjBurnBox_c : public dBgS_MoveBgActor {
 public:
-    /* 8046E698 */ void initBaseMtx();
-    /* 8046E6D4 */ void setBaseMtx();
-    /* 8046E738 */ int Create();
-    /* 8046E8BC */ int CreateHeap();
-    /* 8046E93C */ cPhs__Step create1st();
-    /* 8046E9EC */ int Execute(Mtx**);
-    /* 8046EABC */ int Draw();
-    /* 8046EC10 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     static void make_prm_burnBox(u32* param_0, u8 param_1) { *param_0 = param_1; }
 
diff --git a/include/d/actor/d_a_obj_carry.h b/include/d/actor/d_a_obj_carry.h
index 94b316fbcd..aa1db0f645 100644
--- a/include/d/actor/d_a_obj_carry.h
+++ b/include/d/actor/d_a_obj_carry.h
@@ -100,161 +100,161 @@ public:
         MODE_RESET_LIGHTBALL,
     };
 
-    /* 80031CF8 */ static void clrSaveFlag();
-    /* 80031D04 */ static void setSaveFlag();
-    /* 80031D10 */ static bool chkSaveFlag();
-    /* 80031D24 */ static const cXyz& getPos(int);
-    /* 80031D38 */ static void savePos(int, cXyz);
-    /* 80031D64 */ static void onSttsFlag(int, u8);
-    /* 80031D78 */ static void offSttsFlag(int, u8);
-    /* 80031D8C */ static u8 chkSttsFlag(int, u8);
-    /* 80031DAC */ static void setRoomNo(int, s8);
-    /* 80031DB8 */ static s8 getRoomNo(int);
-    /* 8046F6A4 */ const daObjCarry_dt_t& data();
-    /* 8046F6BC */ char* getArcName();
-    /* 8046F6D4 */ char* getBmdName();
-    /* 8046F6EC */ BOOL checkFlag(u8);
-    /* 8046F724 */ void initBaseMtx();
-    /* 8046F7AC */ void setBaseMtx();
-    /* 8046FACC */ int preInit();
-    /* 8046FB78 */ daObjCarry_c();
-    /* 8046FFA4 */ BOOL checkBreakWolfAttack();
-    /* 8046FFF8 */ BOOL checkCarryBoomerang();
-    /* 80470054 */ BOOL checkCarryHookshot();
-    /* 80470080 */ BOOL checkCarryWolf();
-    /* 804700B4 */ BOOL checkCarryOneHand();
-    /* 804700F0 */ int Create();
-    /* 804705DC */ int CreateInit_tsubo();
-    /* 80470650 */ int CreateInit_ootubo();
-    /* 80470674 */ int CreateInit_kibako();
-    /* 804706D4 */ int CreateInit_ironball();
-    /* 804707E0 */ int CreateInit_taru();
-    /* 80470840 */ int CreateInit_dokuro();
-    /* 80470890 */ int CreateInit_bokkuri();
-    /* 804709DC */ int CreateInit_LightBall();
-    /* 80470AB4 */ int CreateInit_Lv8Ball();
-    /* 80470B5C */ int CreateHeap();
-    /* 80470BF4 */ int create();
-    /* 80470CF0 */ int checkCreate_LightBallA();
-    /* 8047114C */ int checkCreate_LightBallB();
-    /* 804715A8 */ int checkCreate_Lv8Ball();
-    /* 80471680 */ void resetIconPosForLightBallA();
-    /* 804716D4 */ void setIconPosForLightBallAAtR00();
-    /* 804717B4 */ void setIconPosForLightBallBAtR00();
-    /* 80471894 */ void resetIconPosForLightBallB();
-    /* 804718E8 */ int execute();
-    /* 8047233C */ BOOL checkCulling();
-    /* 80472460 */ int draw();
-    /* 80472730 */ void debugDraw();
-    /* 80472734 */ int _delete();
-    /* 80472B54 */ void crr_pos();
-    /* 80472D8C */ int check_sink(f32*);
-    /* 80472E5C */ f32 calc_gravity();
-    /* 80472EF0 */ BOOL checkRollAngle();
-    /* 80473050 */ void mode_proc_call();
-    /* 804733E8 */ void mode_init_wait();
-    /* 804734B0 */ int mode_proc_wait();
-    /* 80473718 */ void mode_init_walk(u8);
-    /* 804737CC */ int mode_proc_walk();
-    /* 80473ED8 */ void mode_init_carry();
-    /* 804741A8 */ int mode_proc_carry();
-    /* 80474448 */ void mode_init_drop(u8);
-    /* 80474540 */ int mode_proc_drop();
-    /* 80474618 */ void mode_init_float();
-    /* 80474734 */ int mode_proc_float();
-    /* 80474A08 */ void mode_init_sink();
-    /* 80474B8C */ int mode_proc_sink();
-    /* 80474D64 */ void mode_init_yogan();
-    /* 80474E08 */ int mode_proc_yogan();
-    /* 80474E98 */ int mode_proc_magne();
-    /* 80474EA0 */ int mode_proc_magneCarry();
-    /* 80474EA8 */ void mode_init_boomCarry();
-    /* 80474FA8 */ int mode_proc_boomCarry();
-    /* 80475014 */ void mode_init_growth();
-    /* 804750C8 */ int mode_proc_growth();
-    /* 8047515C */ int mode_proc_end();
-    /* 80475164 */ void mode_init_dbDrop(u8);
-    /* 80475210 */ int mode_proc_dbDrop();
-    /* 80475238 */ void mode_init_hookCarry();
-    /* 80475354 */ int mode_proc_hookCarry();
-    /* 80475384 */ void mode_init_fit();
-    /* 80475450 */ int mode_proc_fit();
-    /* 80475478 */ int mode_proc_controled();
-    /* 804754D0 */ void mode_init_resetLightBall();
-    /* 80475598 */ int mode_proc_resetLightBall();
-    /* 80475618 */ BOOL chkSinkAll();
-    /* 8047567C */ BOOL chkWaterLineIn();
-    /* 804756D4 */ BOOL chkSinkObj();
-    /* 8047573C */ void bg_check();
-    /* 80476618 */ bool check_bg_damage_proc_base();
-    /* 80476764 */ bool bg_damage_proc_kotubo();
-    /* 804767C4 */ bool bg_damage_proc_ootubo();
-    /* 804767E4 */ bool bg_damage_proc_kibako();
-    /* 80476804 */ bool bg_damage_proc_ironball();
-    /* 8047680C */ bool bg_damage_proc_taru();
-    /* 8047682C */ bool bg_damage_proc_dokuro();
-    /* 8047684C */ bool bg_damage_proc_bokkuri();
-    /* 80476930 */ bool bg_damage_proc_LightBall();
-    /* 80476938 */ bool bg_damage_proc_Lv8Ball();
-    /* 80476940 */ void obj_break(bool, bool, bool);
-    /* 80476A5C */ bool check_cc_damage_proc_base(bool);
-    /* 80476B04 */ bool cc_damage_proc_kotubo();
-    /* 80476B68 */ bool cc_damage_proc_ootubo();
-    /* 80476B88 */ bool cc_damage_proc_kibako();
-    /* 80476CE4 */ bool cc_damage_proc_ironball();
-    /* 80476E04 */ bool cc_damage_proc_taru();
-    /* 80476F88 */ bool cc_damage_proc_dokuro();
-    /* 80476FA8 */ bool cc_damage_proc_bokkuri();
-    /* 804771B0 */ bool cc_damage_proc_LightBall();
-    /* 804771B8 */ bool cc_damage_proc_Lv8Ball();
-    /* 804771C0 */ void eff_break_tuboBmd(u16, cXyz);
-    /* 8047731C */ void eff_break_kibakoBmd(cXyz);
-    /* 8047747C */ void eff_break_tsubo();
-    /* 804774D4 */ void eff_break_ootubo();
-    /* 8047752C */ void eff_break_kibako();
-    /* 80477574 */ void eff_break_ironball();
-    /* 80477578 */ void eff_break_taru();
-    /* 804775BC */ void eff_break_dokuro();
-    /* 80477614 */ void eff_break_bokkuri();
-    /* 80477798 */ void eff_break_kotubo2();
-    /* 804777F0 */ void eff_break_LightBall();
-    /* 804777F4 */ void eff_break_ootubo2();
-    /* 8047784C */ void eff_break_Lv8Ball();
-    /* 80477850 */ void eff_break_tsuboL8();
-    /* 804778A8 */ void eff_break_ootuboL8();
-    /* 80477900 */ void se_break(cBgS_PolyInfo*);
-    /* 80477990 */ void se_put(cBgS_PolyInfo*);
-    /* 80477A14 */ void se_put_water();
-    /* 80477A98 */ void se_fall_water();
-    /* 80477B1C */ void calc_rot_axis_base(u8);
-    /* 80477FE0 */ void calc_rot_axis_tsubo();
-    /* 80478004 */ void calc_rot_axis_ootubo();
-    /* 80478028 */ void calc_rot_axis_kibako();
-    /* 8047814C */ void calc_rot_axis_ironball();
-    /* 80478170 */ void calc_rot_axis_taru();
-    /* 80478190 */ void calc_rot_axis_dokuro();
-    /* 804781B4 */ void calc_rot_axis_bokkuri();
-    /* 804783C0 */ void calc_rot_axis_kotubo2();
-    /* 804783E4 */ void calc_rot_axis_LightBall();
-    /* 80478408 */ void calc_rot_axis_Lv8Ball();
-    /* 8047842C */ void set_wind_power();
-    /* 80478808 */ void exec_proc_tsubo();
-    /* 80478828 */ void exec_proc_ootubo();
-    /* 80478848 */ void exec_proc_kibako();
-    /* 8047884C */ void exec_proc_ironball();
-    /* 804788C4 */ void exec_proc_taru();
-    /* 804788C8 */ void exec_proc_dokuro();
-    /* 804788CC */ void exec_proc_bokkuri();
-    /* 80478C18 */ void exec_proc_LightBall();
-    /* 80478CE4 */ void exec_proc_Lv8Ball();
-    /* 80478D78 */ void bg_damage_proc_call();
-    /* 80478F50 */ void cc_damage_proc_call();
-    /* 80479128 */ void eff_break_call();
-    /* 804792D4 */ void calc_rot_call();
-    /* 80479480 */ void obj_execute_proc_call();
-    /* 8047962C */ void setTgHitCallBack();
-    /* 80479648 */ void setCoHitCallBack();
-    /* 80479664 */ int CreateInitCall();
+    static void clrSaveFlag();
+    static void setSaveFlag();
+    static bool chkSaveFlag();
+    static const cXyz& getPos(int);
+    static void savePos(int, cXyz);
+    static void onSttsFlag(int, u8);
+    static void offSttsFlag(int, u8);
+    static u8 chkSttsFlag(int, u8);
+    static void setRoomNo(int, s8);
+    static s8 getRoomNo(int);
+    const daObjCarry_dt_t& data();
+    char* getArcName();
+    char* getBmdName();
+    BOOL checkFlag(u8);
+    void initBaseMtx();
+    void setBaseMtx();
+    int preInit();
+    daObjCarry_c();
+    BOOL checkBreakWolfAttack();
+    BOOL checkCarryBoomerang();
+    BOOL checkCarryHookshot();
+    BOOL checkCarryWolf();
+    BOOL checkCarryOneHand();
+    int Create();
+    int CreateInit_tsubo();
+    int CreateInit_ootubo();
+    int CreateInit_kibako();
+    int CreateInit_ironball();
+    int CreateInit_taru();
+    int CreateInit_dokuro();
+    int CreateInit_bokkuri();
+    int CreateInit_LightBall();
+    int CreateInit_Lv8Ball();
+    int CreateHeap();
+    int create();
+    int checkCreate_LightBallA();
+    int checkCreate_LightBallB();
+    int checkCreate_Lv8Ball();
+    void resetIconPosForLightBallA();
+    void setIconPosForLightBallAAtR00();
+    void setIconPosForLightBallBAtR00();
+    void resetIconPosForLightBallB();
+    int execute();
+    BOOL checkCulling();
+    int draw();
+    void debugDraw();
+    int _delete();
+    void crr_pos();
+    int check_sink(f32*);
+    f32 calc_gravity();
+    BOOL checkRollAngle();
+    void mode_proc_call();
+    void mode_init_wait();
+    int mode_proc_wait();
+    void mode_init_walk(u8);
+    int mode_proc_walk();
+    void mode_init_carry();
+    int mode_proc_carry();
+    void mode_init_drop(u8);
+    int mode_proc_drop();
+    void mode_init_float();
+    int mode_proc_float();
+    void mode_init_sink();
+    int mode_proc_sink();
+    void mode_init_yogan();
+    int mode_proc_yogan();
+    int mode_proc_magne();
+    int mode_proc_magneCarry();
+    void mode_init_boomCarry();
+    int mode_proc_boomCarry();
+    void mode_init_growth();
+    int mode_proc_growth();
+    int mode_proc_end();
+    void mode_init_dbDrop(u8);
+    int mode_proc_dbDrop();
+    void mode_init_hookCarry();
+    int mode_proc_hookCarry();
+    void mode_init_fit();
+    int mode_proc_fit();
+    int mode_proc_controled();
+    void mode_init_resetLightBall();
+    int mode_proc_resetLightBall();
+    BOOL chkSinkAll();
+    BOOL chkWaterLineIn();
+    BOOL chkSinkObj();
+    void bg_check();
+    bool check_bg_damage_proc_base();
+    bool bg_damage_proc_kotubo();
+    bool bg_damage_proc_ootubo();
+    bool bg_damage_proc_kibako();
+    bool bg_damage_proc_ironball();
+    bool bg_damage_proc_taru();
+    bool bg_damage_proc_dokuro();
+    bool bg_damage_proc_bokkuri();
+    bool bg_damage_proc_LightBall();
+    bool bg_damage_proc_Lv8Ball();
+    void obj_break(bool, bool, bool);
+    bool check_cc_damage_proc_base(bool);
+    bool cc_damage_proc_kotubo();
+    bool cc_damage_proc_ootubo();
+    bool cc_damage_proc_kibako();
+    bool cc_damage_proc_ironball();
+    bool cc_damage_proc_taru();
+    bool cc_damage_proc_dokuro();
+    bool cc_damage_proc_bokkuri();
+    bool cc_damage_proc_LightBall();
+    bool cc_damage_proc_Lv8Ball();
+    void eff_break_tuboBmd(u16, cXyz);
+    void eff_break_kibakoBmd(cXyz);
+    void eff_break_tsubo();
+    void eff_break_ootubo();
+    void eff_break_kibako();
+    void eff_break_ironball();
+    void eff_break_taru();
+    void eff_break_dokuro();
+    void eff_break_bokkuri();
+    void eff_break_kotubo2();
+    void eff_break_LightBall();
+    void eff_break_ootubo2();
+    void eff_break_Lv8Ball();
+    void eff_break_tsuboL8();
+    void eff_break_ootuboL8();
+    void se_break(cBgS_PolyInfo*);
+    void se_put(cBgS_PolyInfo*);
+    void se_put_water();
+    void se_fall_water();
+    void calc_rot_axis_base(u8);
+    void calc_rot_axis_tsubo();
+    void calc_rot_axis_ootubo();
+    void calc_rot_axis_kibako();
+    void calc_rot_axis_ironball();
+    void calc_rot_axis_taru();
+    void calc_rot_axis_dokuro();
+    void calc_rot_axis_bokkuri();
+    void calc_rot_axis_kotubo2();
+    void calc_rot_axis_LightBall();
+    void calc_rot_axis_Lv8Ball();
+    void set_wind_power();
+    void exec_proc_tsubo();
+    void exec_proc_ootubo();
+    void exec_proc_kibako();
+    void exec_proc_ironball();
+    void exec_proc_taru();
+    void exec_proc_dokuro();
+    void exec_proc_bokkuri();
+    void exec_proc_LightBall();
+    void exec_proc_Lv8Ball();
+    void bg_damage_proc_call();
+    void cc_damage_proc_call();
+    void eff_break_call();
+    void calc_rot_call();
+    void obj_execute_proc_call();
+    void setTgHitCallBack();
+    void setCoHitCallBack();
+    int CreateInitCall();
 
     s32 getType() { return mType; }
     u8 getSwbit() { return fopAcM_GetParamBit(this, 6, 8); }
diff --git a/include/d/actor/d_a_obj_catdoor.h b/include/d/actor/d_a_obj_catdoor.h
index 3a016b688e..78f5525d8c 100644
--- a/include/d/actor/d_a_obj_catdoor.h
+++ b/include/d/actor/d_a_obj_catdoor.h
@@ -24,10 +24,10 @@ class daObjCatDoor_c : public fopAc_ac_c {
 public:
     inline ~daObjCatDoor_c();
 
-    /* 80BC42B8 */ const s16* attr() const;
-    /* 80BC43F4 */ void initBaseMtx();
-    /* 80BC4454 */ void setBaseMtx();
-    /* 80BC4560 */ void calcOpen();
+    const s16* attr() const;
+    void initBaseMtx();
+    void setBaseMtx();
+    void calcOpen();
 
     u8 getSwitchNo() { return fopAcM_GetParam(this); }
 
diff --git a/include/d/actor/d_a_obj_cb.h b/include/d/actor/d_a_obj_cb.h
index ab5e494601..fdfd1d52e4 100644
--- a/include/d/actor/d_a_obj_cb.h
+++ b/include/d/actor/d_a_obj_cb.h
@@ -41,8 +41,8 @@ STATIC_ASSERT(sizeof(obj_cb_class) == 0x97c);
 
 class daObj_Cb_HIO_c {
 public:
-    /* 80BC4B2C */ daObj_Cb_HIO_c();
-    /* 80BC573C */ virtual ~daObj_Cb_HIO_c() {}
+    daObj_Cb_HIO_c();
+    virtual ~daObj_Cb_HIO_c() {}
 
     s8 field_0x4;
 };
diff --git a/include/d/actor/d_a_obj_cblock.h b/include/d/actor/d_a_obj_cblock.h
index 8ae4eecd83..1a7119a9aa 100644
--- a/include/d/actor/d_a_obj_cblock.h
+++ b/include/d/actor/d_a_obj_cblock.h
@@ -21,29 +21,29 @@ public:
 
     struct chain_s {
     public:
-        /* 80BC5E58 */ ~chain_s();
-        /* 80BC5E94 */ chain_s();
+        ~chain_s();
+        chain_s();
 
         J3DModel* model;
         cXyz position;
     };
 
-    /* 80BC5A0C */ void initBaseMtx();
-    /* 80BC5A48 */ void setBaseMtx();
-    /* 80BC5ABC */ int Create();
-    /* 80BC5CF8 */ int CreateHeap();
-    /* 80BC5E98 */ int create();
-    /* 80BC6260 */ int Execute(Mtx**);
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
     void block_mode_proc_call();
-    /* 80BC6270 */ void initWait();
-    /* 80BC627C */ void modeWait();
-    /* 80BC6414 */ void initWalk();
-    /* 80BC6430 */ void modeWalk();
-    /* 80BC65CC */ void getChainBasePos(cXyz*);
-    /* 80BC6648 */ void setPower(f32);
-    /* 80BC66DC */ BOOL checkWall();
-    /* 80BC6868 */ int Draw();
-    /* 80BC6870 */ int Delete();
+    void initWait();
+    void modeWait();
+    void initWalk();
+    void modeWalk();
+    void getChainBasePos(cXyz*);
+    void setPower(f32);
+    BOOL checkWall();
+    int Draw();
+    int Delete();
 
     u8 getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
     u8 getSwNo() { return fopAcM_GetParamBit(this, 16, 8); }
diff --git a/include/d/actor/d_a_obj_cboard.h b/include/d/actor/d_a_obj_cboard.h
index 3768b7e5cd..52a5f753e4 100644
--- a/include/d/actor/d_a_obj_cboard.h
+++ b/include/d/actor/d_a_obj_cboard.h
@@ -14,15 +14,15 @@
  */
 class daObjBoard_c : public dBgS_MoveBgActor {
 public:
-    /* 8057B958 */ void initBaseMtx();
-    /* 8057B978 */ void setBaseMtx();
-    /* 8057BA78 */ int create1st();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
 
-    /* 8057BA70 */ virtual int CreateHeap();
-    /* 8057B9C8 */ virtual int Create();
-    /* 8057BB74 */ virtual int Execute(Mtx**);
-    /* 8057BCC0 */ virtual int Draw();
-    /* 8057BCC8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getNameArg() { return fopAcM_GetParamBit(this, 0, 4); }
     u8 getArg0() { return fopAcM_GetParamBit(this, 4, 4); }
diff --git a/include/d/actor/d_a_obj_cdoor.h b/include/d/actor/d_a_obj_cdoor.h
index b1ceba9535..6e457ee281 100644
--- a/include/d/actor/d_a_obj_cdoor.h
+++ b/include/d/actor/d_a_obj_cdoor.h
@@ -27,25 +27,25 @@ public:
         /* 3 */ ACT_DEAD,
     };
 
-    /* 80BC729C */ virtual ~daObjCdoor_c();
-    /* 80BC6DB8 */ int CreateHeap();
-    /* 80BC6F30 */ cPhs__Step create();
-    /* 80BC73C0 */ void setMatrix();
-    /* 80BC7424 */ int Execute(Mtx**);
-    /* 80BC7478 */ void execCdoor();
-    /* 80BC7630 */ void execWgate();
-    /* 80BC775C */ void init_modeWait();
-    /* 80BC7768 */ void modeWait();
-    /* 80BC776C */ void init_modeOpen();
-    /* 80BC77BC */ void modeOpen();
-    /* 80BC78B0 */ void init_modeClose();
-    /* 80BC7900 */ void modeClose();
-    /* 80BC7A14 */ void event_proc_call();
-    /* 80BC7AD0 */ void actionWait();
-    /* 80BC7B34 */ void actionOrderEvent();
-    /* 80BC7B9C */ void actionEvent();
-    /* 80BC7BF8 */ void actionDead();
-    /* 80BC7C04 */ int Draw();
+    virtual ~daObjCdoor_c();
+    int CreateHeap();
+    cPhs__Step create();
+    void setMatrix();
+    int Execute(Mtx**);
+    void execCdoor();
+    void execWgate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int Draw();
 
     void setAction(u8 i_action) { mAction = i_action; }
     int getSwitchNum() { return mSw; }
diff --git a/include/d/actor/d_a_obj_chandelier.h b/include/d/actor/d_a_obj_chandelier.h
index 460e667543..52c0ed7044 100644
--- a/include/d/actor/d_a_obj_chandelier.h
+++ b/include/d/actor/d_a_obj_chandelier.h
@@ -25,24 +25,24 @@ public:
         MODE_HOOK_SWG = 4,
     };
 
-    /* 80BC7F38 */ daObjChandelier_c();
-    /* 80BC8008 */ int CreateHeap();
-    /* 80BC8160 */ int Delete();
-    /* 80BC8194 */ int Draw();
-    /* 80BC8238 */ int Execute(Mtx**);
-    /* 80BC82C0 */ void exeModeWait();
-    /* 80BC834C */ void exeModeStartSwg();
-    /* 80BC83E4 */ void exeModeDown();
-    /* 80BC84C0 */ void exeModeEndSwg();
-    /* 80BC851C */ void exeModeHookSwg();
-    /* 80BC85E4 */ void init();
-    /* 80BC86FC */ void setModelMtx();
-    /* 80BC8780 */ void moveSwing(f32, f32, f32, f32);
-    /* 80BC89B0 */ void moveSwingFall();
-    /* 80BC8B20 */ void hookSwingInitParm();
+    daObjChandelier_c();
+    int CreateHeap();
+    int Delete();
+    int Draw();
+    int Execute(Mtx**);
+    void exeModeWait();
+    void exeModeStartSwg();
+    void exeModeDown();
+    void exeModeEndSwg();
+    void exeModeHookSwg();
+    void init();
+    void setModelMtx();
+    void moveSwing(f32, f32, f32, f32);
+    void moveSwingFall();
+    void hookSwingInitParm();
 
-    /* 80BC8078 */ virtual cPhs__Step create1st();
-    /* 80BC7F74 */ virtual ~daObjChandelier_c();
+    virtual cPhs__Step create1st();
+    virtual ~daObjChandelier_c();
 
     u8 getSW_0() { return fopAcM_GetParamBit(this, 4, 8); }
     s32 getArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
diff --git a/include/d/actor/d_a_obj_chest.h b/include/d/actor/d_a_obj_chest.h
index 110917db38..a5caedae86 100644
--- a/include/d/actor/d_a_obj_chest.h
+++ b/include/d/actor/d_a_obj_chest.h
@@ -22,18 +22,18 @@ public:
         /* 2 */ ACTION_END,
     };
 
-    /* 80BC8EF8 */ void initBaseMtx();
-    /* 80BC8F34 */ void setBaseMtx();
-    /* 80BC9088 */ int Create();
-    /* 80BC9240 */ int CreateHeap();
-    /* 80BC92B0 */ int create();
-    /* 80BC970C */ int Execute(Mtx**);
-    /* 80BC9764 */ void action();
-    /* 80BC9808 */ void actionWait();
-    /* 80BC9BF0 */ void actionMove();
-    /* 80BC9DFC */ void actionEnd();
-    /* 80BC9E00 */ int Draw();
-    /* 80BC9EA4 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void action();
+    void actionWait();
+    void actionMove();
+    void actionEnd();
+    int Draw();
+    int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_cho.h b/include/d/actor/d_a_obj_cho.h
index 0ad1695d19..e1466f50e0 100644
--- a/include/d/actor/d_a_obj_cho.h
+++ b/include/d/actor/d_a_obj_cho.h
@@ -23,27 +23,27 @@ public:
         /* 1 */ ACT_MOVE,
     };
 
-    /* 80BCA334 */ void InitCcSph();
-    /* 80BCA3A0 */ void SetCcSph();
-    /* 80BCA418 */ int CreateHeap();
-    /* 80BCA78C */ void SpeedSet();
-    /* 80BCA88C */ void WallCheck();
-    /* 80BCA924 */ void SearchLink();
-    /* 80BCAB50 */ void WaitAction();
-    /* 80BCAEDC */ void MoveAction();
-    /* 80BCB210 */ void Action();
-    /* 80BCB268 */ void ShopAction();
-    /* 80BCB2AC */ void checkGroundPos();
-    /* 80BCB310 */ void Insect_Release();
-    /* 80BCB320 */ void Z_BufferChk();
-    /* 80BCB49C */ void ParticleSet();
-    /* 80BCB5C0 */ void BoomChk();
-    /* 80BCB87C */ int Execute();
-    /* 80BCBB40 */ void ObjHit();
-    /* 80BCBCA8 */ int Delete();
-    /* 80BCBD10 */ void setBaseMtx();
-    /* 80BCBE70 */ bool CreateChk();
-    /* 80BCC01C */ cPhs__Step create();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void SpeedSet();
+    void WallCheck();
+    void SearchLink();
+    void WaitAction();
+    void MoveAction();
+    void Action();
+    void ShopAction();
+    void checkGroundPos();
+    void Insect_Release();
+    void Z_BufferChk();
+    void ParticleSet();
+    void BoomChk();
+    int Execute();
+    void ObjHit();
+    int Delete();
+    void setBaseMtx();
+    bool CreateChk();
+    cPhs__Step create();
     inline int Draw();
 
 private:
@@ -82,8 +82,8 @@ STATIC_ASSERT(sizeof(daObjCHO_c) == 0xA70);
 
 class daObj_ChoHIO_c {
 public:
-    /* 80BCA30C */ daObj_ChoHIO_c();
-    /* 80BCC4D0 */ virtual ~daObj_ChoHIO_c() {}
+    daObj_ChoHIO_c();
+    virtual ~daObj_ChoHIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScaleFemale;
diff --git a/include/d/actor/d_a_obj_cowdoor.h b/include/d/actor/d_a_obj_cowdoor.h
index c50aab65c1..1ed34370d8 100644
--- a/include/d/actor/d_a_obj_cowdoor.h
+++ b/include/d/actor/d_a_obj_cowdoor.h
@@ -14,13 +14,13 @@
  */
 class daCowdoor_c : public dBgS_MoveBgActor {
 public:
-    /* 80BCC7F8 */ void setBaseMtx();
-    /* 80BCC86C */ int Create();
-    /* 80BCC8C4 */ int CreateHeap();
-    /* 80BCC93C */ int create();
-    /* 80BCCA1C */ int Execute(Mtx**);
-    /* 80BCCA48 */ int Draw();
-    /* 80BCCAEC */ int Delete();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class field_0x5a0;
diff --git a/include/d/actor/d_a_obj_crope.h b/include/d/actor/d_a_obj_crope.h
index 968bd8a957..bde25e379c 100644
--- a/include/d/actor/d_a_obj_crope.h
+++ b/include/d/actor/d_a_obj_crope.h
@@ -14,13 +14,13 @@
  */
 class daObjCrope_c : public fopAc_ac_c {
 public:
-    /* 80BCCCD8 */ int createHeap();
-    /* 80BCCD64 */ int create();
-    /* 80BCD524 */ ~daObjCrope_c();
-    /* 80BCD6C4 */ void setNormalRopePos();
-    /* 80BCD9EC */ void setRideRopePos();
-    /* 80BCE4FC */ int execute();
-    /* 80BCE9BC */ int draw();
+    int createHeap();
+    int create();
+    ~daObjCrope_c();
+    void setNormalRopePos();
+    void setRideRopePos();
+    int execute();
+    int draw();
 
     cXyz* getRopeStartPos() { return mLineMat.getPos(0); }
     cXyz* getRopeEndPos() { return &mLineMat.getPos(0)[99]; }
diff --git a/include/d/actor/d_a_obj_crvfence.h b/include/d/actor/d_a_obj_crvfence.h
index d3003922db..3de1e090fe 100644
--- a/include/d/actor/d_a_obj_crvfence.h
+++ b/include/d/actor/d_a_obj_crvfence.h
@@ -17,22 +17,22 @@
 
 class daObjCRVFENCE_c : public dBgS_MoveBgActor {
 public:
-    /* 80BCEC98 */ BOOL CheckVec();
-    /* 80BCED60 */ BOOL Wall_Check(cXyz, cXyz);
-    /* 80BCEE60 */ void BgRelease();
-    /* 80BCEED0 */ void PosSet(cXyz*);
-    /* 80BCEF30 */ void FenceMove(u8&, cXyz*, csXyz*, cXyz*, s16&);
-    /* 80BCF0B0 */ void BrokenAction();
-    /* 80BCF404 */ void NormalAction();
-    /* 80BCF7DC */ bool checkViewArea(cXyz*);
-    /* 80BCF860 */ void Action();
-    /* 80BCF8A4 */ void setBaseMtx();
-    /* 80BCF9E4 */ int CreateHeap();
-    /* 80BCFAE4 */ cPhs__Step create();
-    /* 80BCFFC8 */ int Create();
-    /* 80BD000C */ int Execute(Mtx**);
-    /* 80BD0058 */ int Draw();
-    /* 80BD013C */ int Delete();
+    BOOL CheckVec();
+    BOOL Wall_Check(cXyz, cXyz);
+    void BgRelease();
+    void PosSet(cXyz*);
+    void FenceMove(u8&, cXyz*, csXyz*, cXyz*, s16&);
+    void BrokenAction();
+    void NormalAction();
+    bool checkViewArea(cXyz*);
+    void Action();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x05A0 */ int field_0x5a0;
diff --git a/include/d/actor/d_a_obj_crvgate.h b/include/d/actor/d_a_obj_crvgate.h
index 880fdf2c29..1fb4d1a12b 100644
--- a/include/d/actor/d_a_obj_crvgate.h
+++ b/include/d/actor/d_a_obj_crvgate.h
@@ -21,34 +21,34 @@
  */
 class daObjCRVGATE_c : public dBgS_MoveBgActor {
 public:
-    /* 80BD0398 */ void initCcCylinder();
-    /* 80BD0500 */ void setCcCylinder();
-    /* 80BD069C */ int checkOpen();
-    /* 80BD0880 */ void actionStartEvent();
-    /* 80BD0978 */ void actionWaitEvent();
-    /* 80BD0A64 */ void Demo_Set();
-    /* 80BD0B7C */ void SetOpen();
-    /* 80BD0B88 */ void actionDemoEvent();
-    /* 80BD0D28 */ void event_proc_call();
-    /* 80BD0D90 */ int CheckVec();
-    /* 80BD0E1C */ void KeyVib();
-    /* 80BD0F9C */ void DoorVib();
-    /* 80BD10C0 */ void VibStop();
-    /* 80BD10D0 */ void CloseVibration();
-    /* 80BD1110 */ void CloseAction();
-    /* 80BD18E0 */ void OpenAction();
-    /* 80BD21E4 */ void HakaiMotion();
-    /* 80BD22C8 */ void DoorAction();
-    /* 80BD2338 */ void B_CloseAction();
-    /* 80BD245C */ void SetB_Close();
-    /* 80BD2528 */ void setBaseMtx();
-    /* 80BD2670 */ int CreateHeap();
-    /* 80BD2758 */ void SetDoor();
-    /* 80BD28C0 */ int create();
-    /* 80BD2E88 */ int Create();
-    /* 80BD2ECC */ int Execute(Mtx**);
-    /* 80BD2FB8 */ int Draw();
-    /* 80BD3074 */ int Delete();
+    void initCcCylinder();
+    void setCcCylinder();
+    int checkOpen();
+    void actionStartEvent();
+    void actionWaitEvent();
+    void Demo_Set();
+    void SetOpen();
+    void actionDemoEvent();
+    void event_proc_call();
+    int CheckVec();
+    void KeyVib();
+    void DoorVib();
+    void VibStop();
+    void CloseVibration();
+    void CloseAction();
+    void OpenAction();
+    void HakaiMotion();
+    void DoorAction();
+    void B_CloseAction();
+    void SetB_Close();
+    void setBaseMtx();
+    int CreateHeap();
+    void SetDoor();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ s32 mEventID;
diff --git a/include/d/actor/d_a_obj_crvhahen.h b/include/d/actor/d_a_obj_crvhahen.h
index a2eb6df6af..3506ffcb48 100644
--- a/include/d/actor/d_a_obj_crvhahen.h
+++ b/include/d/actor/d_a_obj_crvhahen.h
@@ -17,18 +17,18 @@
  */
 class daObjCRVHAHEN_c : public fopAc_ac_c {
 public:
-    /* 80BD342C */ int HahenSet(cXyz, cXyz, cXyz, cXyz, f32);
-    /* 80BD3628 */ bool Wall_Check(cXyz, cXyz);
-    /* 80BD3720 */ void Hahen_Hakai(int, int);
-    /* 80BD38DC */ void CheckCull();
-    /* 80BD3A9C */ bool checkViewArea(cXyz*);
-    /* 80BD3B20 */ int Execute();
-    /* 80BD3B74 */ int Delete();
-    /* 80BD3C0C */ void setBaseMtx();
-    /* 80BD3DBC */ int create();
+    int HahenSet(cXyz, cXyz, cXyz, cXyz, f32);
+    bool Wall_Check(cXyz, cXyz);
+    void Hahen_Hakai(int, int);
+    void CheckCull();
+    bool checkViewArea(cXyz*);
+    int Execute();
+    int Delete();
+    void setBaseMtx();
+    int create();
 
-    /* 80BD3338 */ int CreateHeap();
-    /* 80BD3CA0 */ int Draw();
+    int CreateHeap();
+    int Draw();
 
     /* 0x568 */ cXyz mPos[10];
     /* 0x5e0 */ cXyz mVelocity[10];
diff --git a/include/d/actor/d_a_obj_crvlh_down.h b/include/d/actor/d_a_obj_crvlh_down.h
index 7400f23c05..ce1c31bfa8 100644
--- a/include/d/actor/d_a_obj_crvlh_down.h
+++ b/include/d/actor/d_a_obj_crvlh_down.h
@@ -14,19 +14,19 @@
  */
 class daObjCRVLH_DW_c : public dBgS_MoveBgActor {
 public:
-    /* 80BD4138 */ void initCcCylinder();
-    /* 80BD41A4 */ void SetCcSyl();
-    /* 80BD4268 */ void BgRelease();
-    /* 80BD42D8 */ void Break();
-    /* 80BD45A4 */ void Obj_Hit();
-    /* 80BD4644 */ void setBaseMtx();
-    /* 80BD4764 */ int create();
+    void initCcCylinder();
+    void SetCcSyl();
+    void BgRelease();
+    void Break();
+    void Obj_Hit();
+    void setBaseMtx();
+    int create();
 
-    /* 80BD46EC */ virtual int CreateHeap();
-    /* 80BD4A84 */ virtual int Create();
-    /* 80BD4AC8 */ virtual int Execute(Mtx**);
-    /* 80BD4C44 */ virtual int Draw();
-    /* 80BD4CC8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ fpc_ProcID field_0x5a0;
diff --git a/include/d/actor/d_a_obj_crvlh_up.h b/include/d/actor/d_a_obj_crvlh_up.h
index d3a72fa8a8..7f24ba03a6 100644
--- a/include/d/actor/d_a_obj_crvlh_up.h
+++ b/include/d/actor/d_a_obj_crvlh_up.h
@@ -14,17 +14,17 @@
  */
 class daObjCRVLH_UP_c : public dBgS_MoveBgActor {
 public:
-    /* 80BD4F1C */ void HakaiSet();
-    /* 80BD4FB0 */ void UpMotion();
-    /* 80BD4FD8 */ void Hakai();
-    /* 80BD5254 */ void setBaseMtx();
-    /* 80BD53F0 */ int create();
+    void HakaiSet();
+    void UpMotion();
+    void Hakai();
+    void setBaseMtx();
+    int create();
 
-    /* 80BD5378 */ virtual int CreateHeap();
-    /* 80BD56EC */ virtual int Create();
-    /* 80BD5730 */ virtual int Execute(Mtx**);
-    /* 80BD593C */ virtual int Draw();
-    /* 80BD59C0 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x568 */ u8 field_0x568[0x5a4 - 0x5a0];
diff --git a/include/d/actor/d_a_obj_crvsteel.h b/include/d/actor/d_a_obj_crvsteel.h
index a0b2afe424..a8d6305495 100644
--- a/include/d/actor/d_a_obj_crvsteel.h
+++ b/include/d/actor/d_a_obj_crvsteel.h
@@ -16,18 +16,18 @@
  */
 class daObjCRVSTEEL_c : public dBgS_MoveBgActor {
 public:
-    /* 80BD5BFC */ void OpenSet(f32, f32);
-    /* 80BD5C18 */ void CloseSet(f32);
-    /* 80BD5C28 */ void CloseExecute();
-    /* 80BD5CA0 */ void OpenExecute();
-    /* 80BD5CC8 */ void Action();
-    /* 80BD5D10 */ void setBaseMtx();
-    /* 80BD5DB8 */ int CreateHeap();
-    /* 80BD5E30 */ int create();
-    /* 80BD60A8 */ int Create();
-    /* 80BD60EC */ int Execute(Mtx**);
-    /* 80BD6138 */ int Draw();
-    /* 80BD61BC */ int Delete();
+    void OpenSet(f32, f32);
+    void CloseSet(f32);
+    void CloseExecute();
+    void OpenExecute();
+    void Action();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ u32 mSmokeParticle1;
diff --git a/include/d/actor/d_a_obj_crystal.h b/include/d/actor/d_a_obj_crystal.h
index 8eaddc3ece..0d6fcc1fc6 100644
--- a/include/d/actor/d_a_obj_crystal.h
+++ b/include/d/actor/d_a_obj_crystal.h
@@ -13,14 +13,14 @@
  */
 class daObjCrystal_c : public fopAc_ac_c {
 public:
-    /* 80BD63B8 */ void initBaseMtx();
-    /* 80BD6410 */ void setBaseMtx();
-    /* 80BD6470 */ int Create();
-    /* 80BD65B0 */ int CreateHeap();
-    /* 80BD6664 */ int create();
-    /* 80BD6718 */ int execute();
-    /* 80BD673C */ int draw();
-    /* 80BD67C8 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_cwall.h b/include/d/actor/d_a_obj_cwall.h
index 5867f80d3d..396729be80 100644
--- a/include/d/actor/d_a_obj_cwall.h
+++ b/include/d/actor/d_a_obj_cwall.h
@@ -17,8 +17,8 @@ class daObjCwall_c : public dBgS_MoveBgActor {
 public:
     struct chain_s {
     public:
-        /* 80BD6E94 */ ~chain_s();
-        /* 80BD6ED0 */ chain_s();
+        ~chain_s();
+        chain_s();
 
         J3DModel* mModel;
         cXyz mPos;
@@ -31,31 +31,31 @@ public:
 
     typedef void (daObjCwall_c::*modeFunc)();
 
-    /* 80BD6A4C */ void initBaseMtx();
-    /* 80BD6A88 */ void setBaseMtx();
-    /* 80BD6AEC */ int Create();
-    /* 80BD6D08 */ int CreateHeap();
-    /* 80BD6ED4 */ int create1st();
-    /* 80BD6F80 */ int Execute(Mtx**);
-    /* 80BD7288 */ void setTension();
-    /* 80BD7718 */ void calcSePos();
-    /* 80BD7788 */ void getChainBasePos(cXyz*);
-    /* 80BD7804 */ void setChainMtx();
-    /* 80BD7AD4 */ void chain_control();
-    /* 80BD7ED8 */ void chain_control2();
-    /* 80BD84C0 */ void block_mode_proc_call();
-    /* 80BD8594 */ void initWait();
-    /* 80BD85C0 */ void modeWait();
-    /* 80BD8748 */ void initWalk();
-    /* 80BD8778 */ void modeWalk();
-    /* 80BD8BC8 */ void initClose();
-    /* 80BD8BF0 */ void modeClose();
-    /* 80BD935C */ void setPower(f32, s16*);
-    /* 80BD9414 */ BOOL checkWall();
-    /* 80BD95A0 */ BOOL checkPullNow();
-    /* 80BD977C */ BOOL checkPull();
-    /* 80BD9848 */ int Draw();
-    /* 80BD9948 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void setTension();
+    void calcSePos();
+    void getChainBasePos(cXyz*);
+    void setChainMtx();
+    void chain_control();
+    void chain_control2();
+    void block_mode_proc_call();
+    void initWait();
+    void modeWait();
+    void initWalk();
+    void modeWalk();
+    void initClose();
+    void modeClose();
+    void setPower(f32, s16*);
+    BOOL checkWall();
+    BOOL checkPullNow();
+    BOOL checkPull();
+    int Draw();
+    int Delete();
 
     u8 getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
     u8 getType() { return fopAcM_GetParamBit(this, 4, 4); }
diff --git a/include/d/actor/d_a_obj_dan.h b/include/d/actor/d_a_obj_dan.h
index f4501cb9a3..c2915f79b2 100644
--- a/include/d/actor/d_a_obj_dan.h
+++ b/include/d/actor/d_a_obj_dan.h
@@ -18,26 +18,26 @@
  */
 class daObjDAN_c : public dInsect_c {
 public:
-    /* 80BDA5B4 */ void InitCcSph();
-    /* 80BDA620 */ void SetCcSph();
-    /* 80BDA698 */ int CreateHeap();
-    /* 80BDAA3C */ void SpeedSet();
-    /* 80BDAA9C */ void LinkChk();
-    /* 80BDAB14 */ void MoveAction();
-    /* 80BDAC10 */ void DamageAction();
-    /* 80BDAFDC */ void Action();
-    /* 80BDB074 */ void checkGroundPos();
-    /* 80BDB0D8 */ void Insect_Release();
-    /* 80BDB0E8 */ void Z_BufferChk();
-    /* 80BDB264 */ void ParticleSet();
-    /* 80BDB388 */ void ObjHit();
-    /* 80BDB4E0 */ void BoomChk();
-    /* 80BDB62C */ int Execute();
-    /* 80BDB928 */ int Delete();
-    /* 80BDB990 */ void setBaseMtx();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void SpeedSet();
+    void LinkChk();
+    void MoveAction();
+    void DamageAction();
+    void Action();
+    void checkGroundPos();
+    void Insect_Release();
+    void Z_BufferChk();
+    void ParticleSet();
+    void ObjHit();
+    void BoomChk();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
     /*  inline  */ inline int Draw();
-    /* 80BDBB0C */ bool CreateChk();
-    /* 80BDBCB8 */ cPhs__Step create();
+    bool CreateChk();
+    cPhs__Step create();
 
 private:
     /* 0x590 */ dCcD_Stts mCcStts;
@@ -81,8 +81,8 @@ STATIC_ASSERT(sizeof(daObjDAN_c) == 0xa6c);
 
 class daObj_DanHIO_c {
 public:
-    /* 80BDA58C */ daObj_DanHIO_c();
-    /* 80BDC2F0 */ virtual ~daObj_DanHIO_c() {}
+    daObj_DanHIO_c();
+    virtual ~daObj_DanHIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScaleFemale;
diff --git a/include/d/actor/d_a_obj_digholl.h b/include/d/actor/d_a_obj_digholl.h
index a11fb269bf..33f078a1ea 100644
--- a/include/d/actor/d_a_obj_digholl.h
+++ b/include/d/actor/d_a_obj_digholl.h
@@ -13,10 +13,10 @@
  */
 class daObjDigholl_c : public fopAc_ac_c {
 public:
-    /* 80BDC618 */ int create();
-    /* 80BDC75C */ ~daObjDigholl_c();
-    /* 80BDC7D8 */ int execute();
-    /* 80BDCB0C */ int draw();
+    int create();
+    ~daObjDigholl_c();
+    int execute();
+    int draw();
 
     void onDigStart() { field_0x568 = 1; }
     s16 getSceneNum() const { return field_0x56c; }
diff --git a/include/d/actor/d_a_obj_digplace.h b/include/d/actor/d_a_obj_digplace.h
index 5144ebcbc5..404b35aff4 100644
--- a/include/d/actor/d_a_obj_digplace.h
+++ b/include/d/actor/d_a_obj_digplace.h
@@ -14,8 +14,8 @@
  */
 class daObjDigpl_c : public fopAc_ac_c {
 public:
-    /* 8057BF98 */ int create();
-    /* 8057C1EC */ int execute();
+    int create();
+    int execute();
 
 private:
     /* 0x568 */ u8 mType;
@@ -28,7 +28,7 @@ private:
     /* 0x5B8 */ dPath* mpDigPoints;
 
 public:
-    /* 8057C158 */ virtual ~daObjDigpl_c();
+    virtual ~daObjDigpl_c();
 
     u8 getSceneNum() { return (fopAcM_GetParam(this) >> 0xC) & 0xFF; }
     int getItemNum() { return getSceneNum(); }
diff --git a/include/d/actor/d_a_obj_digsnow.h b/include/d/actor/d_a_obj_digsnow.h
index a2b24eca21..09af66d091 100644
--- a/include/d/actor/d_a_obj_digsnow.h
+++ b/include/d/actor/d_a_obj_digsnow.h
@@ -30,21 +30,21 @@ public:
         /* 2 */ ACTION_END_e,
     };
 
-    /* 80BDCC58 */ void initBaseMtx();
-    /* 80BDCC94 */ void setBaseMtx();
-    /* 80BDCD08 */ virtual int Create();
-    /* 80BDCD64 */ virtual int CreateHeap();
-    /* 80BDCDD4 */ int create1st();
-    /* 80BDCE84 */ virtual int Execute(Mtx**);
-    /* 80BDCF00 */ void action();
-    /* 80BDCFA4 */ void mode_init_wait();
-    /* 80BDCFB0 */ void mode_wait();
-    /* 80BDCFDC */ void mode_init_dig();
-    /* 80BDD124 */ void mode_dig();
-    /* 80BDD1BC */ void mode_init_end();
-    /* 80BDD210 */ void mode_end();
-    /* 80BDD214 */ virtual int Draw();
-    /* 80BDD2B8 */ virtual int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    virtual int Create();
+    virtual int CreateHeap();
+    int create1st();
+    virtual int Execute(Mtx**);
+    void action();
+    void mode_init_wait();
+    void mode_wait();
+    void mode_init_dig();
+    void mode_dig();
+    void mode_init_end();
+    void mode_end();
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     void startDig() { mMode = ACTION_DIG_e; }
diff --git a/include/d/actor/d_a_obj_dmelevator.h b/include/d/actor/d_a_obj_dmelevator.h
index 424b68b779..80a91ef356 100644
--- a/include/d/actor/d_a_obj_dmelevator.h
+++ b/include/d/actor/d_a_obj_dmelevator.h
@@ -15,43 +15,43 @@
  */
 class daObjDmElevator_c : public dBgS_MoveBgActor {
 public:
-    /* 80BDDD38 */ void initBaseMtx();
-    /* 80BDDD90 */ void setBaseMtx();
-    /* 80BDDEFC */ virtual int Create();
-    /* 80BDE0A4 */ int init();
-    /* 80BDE2F8 */ int CreateHeap();
-    /* 80BDE448 */ int create1st();
-    /* 80BDE500 */ int Execute(Mtx**);
-    /* 80BDE5F8 */ void setting_ride_flag();
-    /* 80BDE6FC */ void event_sw_proc_call();
-    /* 80BDE7A0 */ void actionSwPauseNoneInit();
-    /* 80BDE7AC */ void actionSwPauseNone();
-    /* 80BDE7B0 */ void actionSwPauseOrderInit();
-    /* 80BDE808 */ void actionSwPauseOrder();
-    /* 80BDE83C */ void actionSwPauseInit();
-    /* 80BDE868 */ void actionSwPause();
-    /* 80BDE8D0 */ void calc_top_pos();
-    /* 80BDE960 */ void mode_sw_proc_call();
-    /* 80BDEA1C */ void modeSwWaitLowerInit();
-    /* 80BDEA44 */ void modeSwWaitLower();
-    /* 80BDEB88 */ void modeSwLowerInit();
-    /* 80BDEC10 */ void modeSwLower();
-    /* 80BDEC94 */ void modeSwWaitUpperInit();
-    /* 80BDECB4 */ void modeSwWaitUpper();
-    /* 80BDECE0 */ void modeSwUpperInit();
-    /* 80BDED64 */ void modeSwUpper();
-    /* 80BDEDE0 */ void event_proc_call();
-    /* 80BDEECC */ void actionWait();
-    /* 80BDEF60 */ void actionOrderEvent();
-    /* 80BDF000 */ void actionEvent();
-    /* 80BDF068 */ void actionStartEvent();
-    /* 80BDF0A0 */ void actionMoveStart();
-    /* 80BDF168 */ void actionDead();
-    /* 80BDF16C */ int demoProc();
-    /* 80BDF320 */ void moveInit();
-    /* 80BDF3B8 */ int moveProc();
-    /* 80BDF618 */ int Draw();
-    /* 80BDF6DC */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    virtual int Create();
+    int init();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void setting_ride_flag();
+    void event_sw_proc_call();
+    void actionSwPauseNoneInit();
+    void actionSwPauseNone();
+    void actionSwPauseOrderInit();
+    void actionSwPauseOrder();
+    void actionSwPauseInit();
+    void actionSwPause();
+    void calc_top_pos();
+    void mode_sw_proc_call();
+    void modeSwWaitLowerInit();
+    void modeSwWaitLower();
+    void modeSwLowerInit();
+    void modeSwLower();
+    void modeSwWaitUpperInit();
+    void modeSwWaitUpper();
+    void modeSwUpperInit();
+    void modeSwUpper();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionStartEvent();
+    void actionMoveStart();
+    void actionDead();
+    int demoProc();
+    void moveInit();
+    int moveProc();
+    int Draw();
+    int Delete();
 
     u32 getPathID() { return fopAcM_GetParamBit(this, 8, 8); }
     void setAction(char action){mAction = action;}
diff --git a/include/d/actor/d_a_obj_drop.h b/include/d/actor/d_a_obj_drop.h
index 5a961c125d..dcd9daa1ca 100644
--- a/include/d/actor/d_a_obj_drop.h
+++ b/include/d/actor/d_a_obj_drop.h
@@ -31,26 +31,26 @@ public:
         DEMOMODE_COMPLETE_GET_DEMO_e,
     };
 
-    /* 80BDFD8C */ int Create();
-    /* 80BDFE58 */ int create();
-    /* 80BE0358 */ void dropGet();
-    /* 80BE0430 */ BOOL checkGetArea();
-    /* 80BE05DC */ void checkCompleteDemo();
-    /* 80BE0658 */ void createLineEffect();
-    /* 80BE071C */ void removeLineEffect();
-    /* 80BE077C */ void createBodyEffect();
-    /* 80BE0840 */ void removeBodyEffect();
-    /* 80BE08A0 */ int modeInit();
-    /* 80BE0994 */ int modeNoParent();
-    /* 80BE09F4 */ int modeParentWait();
-    /* 80BE0C08 */ int modeWait();
-    /* 80BE1928 */ int actionCompleteWait();
-    /* 80BE1930 */ int actionOrderCompleteDemo();
-    /* 80BE19D0 */ int actionCompleateDemo();
-    /* 80BE1ACC */ int actionWaitCompleteGetDemo();
-    /* 80BE1B5C */ int actionCompleteGetDemo();
-    /* 80BE1BC4 */ int execute();
-    /* 80BE1DCC */ int _delete();
+    int Create();
+    int create();
+    void dropGet();
+    BOOL checkGetArea();
+    void checkCompleteDemo();
+    void createLineEffect();
+    void removeLineEffect();
+    void createBodyEffect();
+    void removeBodyEffect();
+    int modeInit();
+    int modeNoParent();
+    int modeParentWait();
+    int modeWait();
+    int actionCompleteWait();
+    int actionOrderCompleteDemo();
+    int actionCompleateDemo();
+    int actionWaitCompleteGetDemo();
+    int actionCompleteGetDemo();
+    int execute();
+    int _delete();
 
     u8 getYmSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
     u8 getSave() { return fopAcM_GetParamBit(this, 0, 6); }
diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h
index e5c145c256..023a811d1f 100644
--- a/include/d/actor/d_a_obj_dust.h
+++ b/include/d/actor/d_a_obj_dust.h
@@ -23,19 +23,19 @@
  */
 class daObjDust_c : public dBgS_MoveBgActor {
 public:
-    /* 80BE22B8 */ void Search_Ymb();
-    /* 80BE2490 */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80BE24F8 */ int Check_RideOn();
-    /* 80BE2708 */ void initBaseMtx();
-    /* 80BE2734 */ void setBaseMtx();
+    void Search_Ymb();
+    void RideOn_Angle(s16&, f32, s16, f32);
+    int Check_RideOn();
+    void initBaseMtx();
+    void setBaseMtx();
 
     inline int create();
-    /* 80BE2A70 */ inline int CreateHeap();
+    inline int CreateHeap();
 
-    /* 80BE2AE8 */ inline int Create();
-    /* 80BE2B30 */ inline int Execute(Mtx**);
-    /* 80BE2E9C */ inline int Draw();
-    /* 80BE2F40 */ inline int Delete();
+    inline int Create();
+    inline int Execute(Mtx**);
+    inline int Draw();
+    inline int Delete();
 
     /* 0x5A0 */ f32 mRideOscillationSpeed;
     /* 0x5A4 */ f32 mRideIntensity; 
diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h
index f220fbb20f..4df3d0502b 100644
--- a/include/d/actor/d_a_obj_eff.h
+++ b/include/d/actor/d_a_obj_eff.h
@@ -27,7 +27,7 @@ public:
         PRM_8 = 8,
     };
 
-    /* 8057C9D8 */ int _create();
+    int _create();
 
     static void make_land_smoke(cXyz* i_pos, f32 i_scale) {
         cXyz scale(i_scale, i_scale, i_scale);
diff --git a/include/d/actor/d_a_obj_enemy_create.h b/include/d/actor/d_a_obj_enemy_create.h
index d2d9c8cddf..3b29caddab 100644
--- a/include/d/actor/d_a_obj_enemy_create.h
+++ b/include/d/actor/d_a_obj_enemy_create.h
@@ -13,14 +13,14 @@
  */
 class daObjE_CREATE_c : public fopAc_ac_c {
 public:
-    /* 80BE31BC */ void NormalAction();
-    /* 80BE345C */ void SearchAction();
-    /* 80BE34A0 */ void LoopAction();
-    /* 80BE3544 */ void Action();
-    /* 80BE359C */ int Execute();
-    /* 80BE35C0 */ int Delete();
-    /* 80BE3618 */ void NameChk();
-    /* 80BE3770 */ int create();
+    void NormalAction();
+    void SearchAction();
+    void LoopAction();
+    void Action();
+    int Execute();
+    int Delete();
+    void NameChk();
+    int create();
 
 private:
     /* 0x568 */ u8 field_0x568;
diff --git a/include/d/actor/d_a_obj_fallobj.h b/include/d/actor/d_a_obj_fallobj.h
index bc55cfd584..2116d2eac4 100644
--- a/include/d/actor/d_a_obj_fallobj.h
+++ b/include/d/actor/d_a_obj_fallobj.h
@@ -24,25 +24,25 @@ public:
         ACTION_FOLLOW_FALL,
     };
 
-    /* 80BE39B8 */ void initBaseMtx();
-    /* 80BE3A24 */ void setBaseMtx();
-    /* 80BE3A88 */ int Create();
-    /* 80BE3BA8 */ s16 getFallTime();
-    /* 80BE3BD4 */ f32 getFallHeight();
-    /* 80BE3C28 */ int CreateHeap();
-    /* 80BE3C98 */ int create1st();
-    /* 80BE3D24 */ int Execute(Mtx**);
-    /* 80BE4138 */ void action();
-    /* 80BE4228 */ bool action_wait(bool);
-    /* 80BE42C0 */ bool action_fallStart();
-    /* 80BE43E4 */ void action_countdown();
-    /* 80BE45F4 */ void action_fall();
-    /* 80BE466C */ void action_end();
-    /* 80BE4670 */ void action_follow_fall();
-    /* 80BE4700 */ bool checkHang();
-    /* 80BE47A0 */ bool checkHang2();
-    /* 80BE48A4 */ int Draw();
-    /* 80BE4948 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    s16 getFallTime();
+    f32 getFallHeight();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void action();
+    bool action_wait(bool);
+    bool action_fallStart();
+    void action_countdown();
+    void action_fall();
+    void action_end();
+    void action_follow_fall();
+    bool checkHang();
+    bool checkHang2();
+    int Draw();
+    int Delete();
 
     u32 getTime() { return fopAcM_GetParamBit(this, 8, 8); }
     u32 getPos() { return fopAcM_GetParamBit(this, 0x14, 8); }
diff --git a/include/d/actor/d_a_obj_fan.h b/include/d/actor/d_a_obj_fan.h
index d8cc280fc8..1ababac7a6 100644
--- a/include/d/actor/d_a_obj_fan.h
+++ b/include/d/actor/d_a_obj_fan.h
@@ -15,17 +15,17 @@
  */
 class daObjFan_c : public dBgS_MoveBgActor {
 public:
-    /* 80BE4D98 */ fopAc_ac_c* search_tornado();
-    /* 80BE4E08 */ void initBaseMtx();
-    /* 80BE4E44 */ void setBaseMtx();
-    /* 80BE4F08 */ int Create();
-    /* 80BE4FD4 */ int CreateHeap();
-    /* 80BE50EC */ int create1st();
-    /* 80BE519C */ int Execute(Mtx**);
-    /* 80BE538C */ void action();
-    /* 80BE583C */ void setCollision();
-    /* 80BE5960 */ int Draw();
-    /* 80BE5A04 */ int Delete();
+    fopAc_ac_c* search_tornado();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void action();
+    void setCollision();
+    int Draw();
+    int Delete();
 
     u8 getType() { return fopAcM_GetParamBit(this,0,4); }
 
diff --git a/include/d/actor/d_a_obj_fchain.h b/include/d/actor/d_a_obj_fchain.h
index 05567d1a59..1bd7b9a810 100644
--- a/include/d/actor/d_a_obj_fchain.h
+++ b/include/d/actor/d_a_obj_fchain.h
@@ -5,8 +5,8 @@
 
 class daObjFchain_shape_c : public J3DPacket {
 public:
-    /* 80BE7194 */ virtual void draw();
-    /* 80BE73D4 */ virtual ~daObjFchain_shape_c() {}
+    virtual void draw();
+    virtual ~daObjFchain_shape_c() {}
 };
 
 /**
@@ -19,13 +19,13 @@ public:
  */
 class daObjFchain_c : public fopAc_ac_c {
 public:
-    /* 80BE5FF8 */ int createHeap();
-    /* 80BE6074 */ int create();
-    /* 80BE63C8 */ ~daObjFchain_c();
-    /* 80BE64E0 */ void checkPlayerFoot(cXyz const*, cXyz const*, cXyz*);
-    /* 80BE66B4 */ void setGroundVec(cXyz*, f32);
-    /* 80BE6868 */ int execute();
-    /* 80BE7324 */ int draw();
+    int createHeap();
+    int create();
+    ~daObjFchain_c();
+    void checkPlayerFoot(cXyz const*, cXyz const*, cXyz*);
+    void setGroundVec(cXyz*, f32);
+    int execute();
+    int draw();
 
     cXyz* getPos() { return field_0x694; }
     csXyz* getAngle() { return field_0x8a4; }
diff --git a/include/d/actor/d_a_obj_fireWood.h b/include/d/actor/d_a_obj_fireWood.h
index 1852e6f495..116af1203c 100644
--- a/include/d/actor/d_a_obj_fireWood.h
+++ b/include/d/actor/d_a_obj_fireWood.h
@@ -16,13 +16,13 @@
  */
 class daFireWood_c : public fopAc_ac_c {
 public:
-    /* 80BE76B0 */ void setBaseMtx();
-    /* 80BE7708 */ int create();
-    /* 80BE79A0 */ void lightInit();
-    /* 80BE7A14 */ void setLight();
-    /* 80BE7A38 */ int Execute();
-    /* 80BE7E74 */ int Draw();
-    /* 80BE7E7C */ int Delete();
+    void setBaseMtx();
+    int create();
+    void lightInit();
+    void setLight();
+    int Execute();
+    int Draw();
+    int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -45,8 +45,8 @@ STATIC_ASSERT(sizeof(daFireWood_c) == 0x740);
 
 class daFireWood_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BE762C */ daFireWood_HIO_c();
-    /* 80BE7F24 */ virtual ~daFireWood_HIO_c() {}
+    daFireWood_HIO_c();
+    virtual ~daFireWood_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_fireWood2.h b/include/d/actor/d_a_obj_fireWood2.h
index aa3a445c4f..3b288edeeb 100644
--- a/include/d/actor/d_a_obj_fireWood2.h
+++ b/include/d/actor/d_a_obj_fireWood2.h
@@ -15,15 +15,15 @@
  */
 class daFireWood2_c : public fopAc_ac_c {
 public:
-    /* 80BE82D0 */ void setBaseMtx();
-    /* 80BE8328 */ int create();
-    /* 80BE8640 */ void lightInit();
-    /* 80BE86CC */ void setLight();
-    /* 80BE86FC */ void cutLight();
-    /* 80BE872C */ void pointLightProc();
-    /* 80BE87DC */ int Execute();
-    /* 80BE8D98 */ int Draw();
-    /* 80BE8DA0 */ int Delete();
+    void setBaseMtx();
+    int create();
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    int Execute();
+    int Draw();
+    int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -48,8 +48,8 @@ STATIC_ASSERT(sizeof(daFireWood2_c) == 0x740);
 
 class daFireWood2_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BE824C */ daFireWood2_HIO_c();
-    /* 80BE8E54 */ virtual ~daFireWood2_HIO_c() {}
+    daFireWood2_HIO_c();
+    virtual ~daFireWood2_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_firepillar.h b/include/d/actor/d_a_obj_firepillar.h
index 2440ab0551..620373422a 100644
--- a/include/d/actor/d_a_obj_firepillar.h
+++ b/include/d/actor/d_a_obj_firepillar.h
@@ -32,20 +32,20 @@ public:
         static u8 getSwNo(daObjFPillar_c* i_this) { return fopAcM_GetParam(i_this); }
     };
 
-    /* 80BE9118 */ void initBaseMtx();
-    /* 80BE9138 */ void setBaseMtx();
-    /* 80BE9190 */ int Create();
-    /* 80BE9230 */ int create();
-    /* 80BE94E4 */ int execute();
-    /* 80BE9610 */ void action();
-    /* 80BE96B4 */ void actionOffInit();
-    /* 80BE96E0 */ void actionOff();
-    /* 80BE9784 */ void actionOnWaitInit();
-    /* 80BE97B8 */ void actionOnWait();
-    /* 80BE986C */ void actionOnInit();
-    /* 80BE98A0 */ void actionOn();
-    /* 80BE9984 */ int draw();
-    /* 80BE99B8 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    void action();
+    void actionOffInit();
+    void actionOff();
+    void actionOnWaitInit();
+    void actionOnWait();
+    void actionOnInit();
+    void actionOn();
+    int draw();
+    int _delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_firepillar2.h b/include/d/actor/d_a_obj_firepillar2.h
index f90067a746..359cbf6bb3 100644
--- a/include/d/actor/d_a_obj_firepillar2.h
+++ b/include/d/actor/d_a_obj_firepillar2.h
@@ -30,21 +30,21 @@ public:
         ACTION_ON,
     };
 
-    /* 80BE9CD8 */ void initBaseMtx();
-    /* 80BE9D5C */ void setBaseMtx();
-    /* 80BE9DDC */ int Create();
-    /* 80BEA034 */ int CreateHeap();
-    /* 80BEA228 */ int create();
-    /* 80BEA584 */ int execute();
-    /* 80BEA734 */ void action();
-    /* 80BEA808 */ void actionOffInit();
-    /* 80BEA854 */ void actionOff();
-    /* 80BEA98C */ void actionOnWaitInit();
-    /* 80BEAAE4 */ void actionOnWait();
-    /* 80BEAC68 */ void actionOnInit();
-    /* 80BEADD0 */ void actionOn();
-    /* 80BEB1B4 */ int draw();
-    /* 80BEB278 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void action();
+    void actionOffInit();
+    void actionOff();
+    void actionOnWaitInit();
+    void actionOnWait();
+    void actionOnInit();
+    void actionOn();
+    int draw();
+    int _delete();
 
     u8 getKind() { return (field_0x97a >> 4) & 0xf; }
     u8 getSize() { return (field_0x97a) & 0xf; }
diff --git a/include/d/actor/d_a_obj_flag.h b/include/d/actor/d_a_obj_flag.h
index aace201ff2..eee36b0842 100644
--- a/include/d/actor/d_a_obj_flag.h
+++ b/include/d/actor/d_a_obj_flag.h
@@ -10,8 +10,8 @@ static int nodeCallBack(J3DJoint*, int);
 
 class FlagJoint_c {
 public:
-    /* 80BEC3BC */ ~FlagJoint_c();
-    /* 80BEC4E0 */ FlagJoint_c();
+    ~FlagJoint_c();
+    FlagJoint_c();
 
     csXyz mJoint1;
     csXyz mJoint2;
@@ -44,13 +44,13 @@ private:
     /* 0x5ea */ u8 field_0x568[0x5ec - 0x5ea];
 
 public:
-    /* 80BEB778 */ void create_init();
-    /* 80BEB8F0 */ void initBaseMtx();
-    /* 80BEB984 */ void getJointAngle(csXyz*, int);
-    /* 80BEB9AC */ void calcJointAngle();
-    /* 80BEBC58 */ void calcAngleSwingZ(FlagJoint_c*, f32);
-    /* 80BEBDAC */ void calcAngleSwingX(FlagJoint_c*, f32);
-    /* 80BEBE64 */ f32 getSwingY(f32);
+    void create_init();
+    void initBaseMtx();
+    void getJointAngle(csXyz*, int);
+    void calcJointAngle();
+    void calcAngleSwingZ(FlagJoint_c*, f32);
+    void calcAngleSwingX(FlagJoint_c*, f32);
+    f32 getSwingY(f32);
 
     ~daObjFlag_c() {
         dComIfG_resDelete(&this->mPhase, "FlagObj");
diff --git a/include/d/actor/d_a_obj_flag2.h b/include/d/actor/d_a_obj_flag2.h
index 1eff9572c5..4e700f54b2 100644
--- a/include/d/actor/d_a_obj_flag2.h
+++ b/include/d/actor/d_a_obj_flag2.h
@@ -14,17 +14,17 @@ struct daObjFlag2_Attr_c {
 
 class FlagCloth_c : public J3DPacket {
 public:
-    /* 80BEC658 */ void initFlagPos(cXyz*, fopAc_ac_c*);
-    /* 80BEC7CC */ cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
-    /* 80BEC928 */ void calcFlagFactorSub(cXyz*, cXyz*, cXyz*, f32);
-    /* 80BECAE0 */ void calcFlagNormal(cXyz*, int);
-    /* 80BECC34 */ inline void calcFlagNormalBack();
-    /* 80BECC78 */ void initCcSphere(fopAc_ac_c*);
-    /* 80BECCE4 */ void setCcSphere();
-    /* 80BECD98 */ void execute();
-    /* 80BEE0B8 */ cXyz getTargetPos() { return mPositions[4]; }
+    void initFlagPos(cXyz*, fopAc_ac_c*);
+    cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
+    void calcFlagFactorSub(cXyz*, cXyz*, cXyz*, f32);
+    void calcFlagNormal(cXyz*, int);
+    inline void calcFlagNormalBack();
+    void initCcSphere(fopAc_ac_c*);
+    void setCcSphere();
+    void execute();
+    cXyz getTargetPos() { return mPositions[4]; }
 
-    /* 80BECF30 */ void draw();
+    void draw();
 
     cXyz* getPos() { return mPositions; }
     cXyz* getNormal() { return mNormals; }
@@ -69,14 +69,14 @@ public:
  */
 class daObjFlag2_c : public fopAc_ac_c {
 public:
-    /* 80BED22C */ void create_init();
-    /* 80BED368 */ void initBaseMtx();
-    /* 80BED3B8 */ void initCollision();
-    /* 80BED44C */ void setCollision();
-    /* 80BED480 */ int createHeap();
-    /* 80BED6A0 */ int create();
-    /* 80BEDCE0 */ int draw();
-    /* 80BEDEE0 */ ~daObjFlag2_c();
+    void create_init();
+    void initBaseMtx();
+    void initCollision();
+    void setCollision();
+    int createHeap();
+    int create();
+    int draw();
+    ~daObjFlag2_c();
     inline int execute();
 
     const daObjFlag2_Attr_c& attr() const { return M_attr; }
diff --git a/include/d/actor/d_a_obj_flag3.h b/include/d/actor/d_a_obj_flag3.h
index 0cace182d5..cae8cfb385 100644
--- a/include/d/actor/d_a_obj_flag3.h
+++ b/include/d/actor/d_a_obj_flag3.h
@@ -14,14 +14,14 @@ struct daObjFlag3_Attr_c {
 
 class FlagCloth2_c : public J3DPacket {
 public:
-    /* 80BEEDE4 */ void execute();
-    /* 80BEEF74 */ inline void calcFlagNormal(cXyz*, int);
+    void execute();
+    inline void calcFlagNormal(cXyz*, int);
     inline static void initCcSphere(fopAc_ac_c*);
-    /* 80BEF278 */ inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
-    /* 80BEF790 */ virtual ~FlagCloth2_c();
-    /* 80BEFD08 */ inline void initFlagPos(cXyz*, fopAc_ac_c*);
-    /* 80BF00A0 */ virtual void draw();
-    /* 80BF0434 */ cXyz getTargetPos() { return mPositions[4]; }
+    inline cXyz calcFlagFactor(cXyz*, cXyz*, cXyz*, int);
+    virtual ~FlagCloth2_c();
+    inline void initFlagPos(cXyz*, fopAc_ac_c*);
+    virtual void draw();
+    cXyz getTargetPos() { return mPositions[4]; }
 
     void calcFlagNormalBack() {
         cXyz* pNormal = getNormal();
@@ -85,11 +85,11 @@ public:
  */
 class daObjFlag3_c : public fopAc_ac_c {
 public:
-    /* 80BEEA78 */ int createHeap();
-    /* 80BEED3C */ int execute();
-    /* 80BEF700 */ ~daObjFlag3_c();
-    /* 80BEF95C */ int create();
-    /* 80BEFBC4 */ inline void create_init();
+    int createHeap();
+    int execute();
+    ~daObjFlag3_c();
+    int create();
+    inline void create_init();
     inline int draw();
     inline void initBaseMtx();
 
diff --git a/include/d/actor/d_a_obj_food.h b/include/d/actor/d_a_obj_food.h
index 8cfbcfe027..c2cbc056ff 100644
--- a/include/d/actor/d_a_obj_food.h
+++ b/include/d/actor/d_a_obj_food.h
@@ -47,8 +47,8 @@ public:
 STATIC_ASSERT(sizeof(obj_food_class) == 0xA90);
 
 struct daObj_Food_HIO_c {
-    /* 80BF070C */ daObj_Food_HIO_c();
-    /* 80BF1CE8 */ virtual ~daObj_Food_HIO_c() {}
+    daObj_Food_HIO_c();
+    virtual ~daObj_Food_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mBoneScale;
diff --git a/include/d/actor/d_a_obj_fw.h b/include/d/actor/d_a_obj_fw.h
index 2dddcb76f1..3389b9b531 100644
--- a/include/d/actor/d_a_obj_fw.h
+++ b/include/d/actor/d_a_obj_fw.h
@@ -48,8 +48,8 @@ STATIC_ASSERT(sizeof(obj_fw_class) == 0x628);
 
 class daObj_Fw_HIO_c : public JORReflexible {
 public:
-    /* 80BF204C */ daObj_Fw_HIO_c();
-    /* 80BF2AB0 */ virtual ~daObj_Fw_HIO_c() {}
+    daObj_Fw_HIO_c();
+    virtual ~daObj_Fw_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
diff --git a/include/d/actor/d_a_obj_gadget.h b/include/d/actor/d_a_obj_gadget.h
index 5ed070f72f..db7f5a53f7 100644
--- a/include/d/actor/d_a_obj_gadget.h
+++ b/include/d/actor/d_a_obj_gadget.h
@@ -60,22 +60,22 @@ private:
     /* 0xA47 */ u8 field_0xa47;
 
 public:
-    /* 80BF2D2C */ virtual ~daObj_Gadget_c();
-    /* 80BF2F28 */ int create();
-    /* 80BF3478 */ int CreateHeap();
-    /* 80BF3504 */ int Delete();
-    /* 80BF3538 */ int Execute();
-    /* 80BF3FAC */ int Draw();
-    /* 80BF4130 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80BF4150 */ void setEnvTevColor();
-    /* 80BF41AC */ void setRoomNo();
-    /* 80BF41F0 */ void reset();
-    /* 80BF424C */ void setMtx();
-    /* 80BF4354 */ s16 calcRollAngle(s16, int);
-    /* 80BF43F4 */ BOOL getWallAngle(s16, s16*);
-    /* 80BF4584 */ void setSmokePrtcl();
-    /* 80BF4600 */ void setWaterPrtcl();
-    /* 80BF4728 */ void setHamonPrtcl();
+    virtual ~daObj_Gadget_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void setEnvTevColor();
+    void setRoomNo();
+    void reset();
+    void setMtx();
+    s16 calcRollAngle(s16, int);
+    BOOL getWallAngle(s16, s16*);
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
 
     u8 getType() { return fopAcM_GetParam(this); }
     void setCoNone() { field_0xa40 = 1; }
@@ -115,7 +115,7 @@ struct daObj_Gadget_HIOParam {
 
 class daObj_Gadget_Param_c {
 public:
-    /* 80BF48D8 */ virtual ~daObj_Gadget_Param_c() {}
+    virtual ~daObj_Gadget_Param_c() {}
 
     static daObj_Gadget_HIOParam const m;
 };
diff --git a/include/d/actor/d_a_obj_ganonwall.h b/include/d/actor/d_a_obj_ganonwall.h
index 62c336989f..02d0cd1d99 100644
--- a/include/d/actor/d_a_obj_ganonwall.h
+++ b/include/d/actor/d_a_obj_ganonwall.h
@@ -13,15 +13,15 @@
  */
 class daObjGWall_c : public fopAc_ac_c {
 public:
-    /* 80BF4D18 */ void initBaseMtx();
-    /* 80BF4D54 */ void setBaseMtx();
-    /* 80BF4DA8 */ int Create();
-    /* 80BF4E8C */ int CreateHeap();
-    /* 80BF4FF0 */ int create();
-    /* 80BF50A4 */ int execute();
-    /* 80BF50CC */ int checkDraw();
-    /* 80BF5168 */ int draw();
-    /* 80BF5530 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int checkDraw();
+    int draw();
+    int _delete();
 
     u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
     u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); }
diff --git a/include/d/actor/d_a_obj_ganonwall2.h b/include/d/actor/d_a_obj_ganonwall2.h
index c356d8fc9b..a938a32141 100644
--- a/include/d/actor/d_a_obj_ganonwall2.h
+++ b/include/d/actor/d_a_obj_ganonwall2.h
@@ -14,14 +14,14 @@
  */
 class daObjGWall2_c : public dBgS_MoveBgActor {
 public:
-    /* 80BF57D8 */ void initBaseMtx();
-    /* 80BF5814 */ void setBaseMtx();
-    /* 80BF5878 */ int Create();
-    /* 80BF5950 */ int CreateHeap();
-    /* 80BF5AB4 */ int create1st();
-    /* 80BF5B74 */ int Execute(Mtx**);
-    /* 80BF5C0C */ int Draw();
-    /* 80BF6004 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
 
diff --git a/include/d/actor/d_a_obj_geyser.h b/include/d/actor/d_a_obj_geyser.h
index d28fa68671..54a7f3bcb8 100644
--- a/include/d/actor/d_a_obj_geyser.h
+++ b/include/d/actor/d_a_obj_geyser.h
@@ -15,45 +15,45 @@
  */
 class daObjGeyser_c : public dBgS_MoveBgActor {
 public:
-    /* 80BF6F18 */ void initBaseMtx();
-    /* 80BF6F38 */ void setBaseMtx();
-    /* 80BF7174 */ int create1st();
-    /* 80BF744C */ void action();
-    /* 80BF75B8 */ void actionOff2Init();
-    /* 80BF75C4 */ void actionOff2();
-    /* 80BF7838 */ void actionOnWait2Init();
-    /* 80BF787C */ void actionOnWait2();
-    /* 80BF7C54 */ void actionOn2Init();
-    /* 80BF7CA0 */ void actionOn2();
-    /* 80BF8158 */ void actionDisappearInit(u8);
-    /* 80BF8178 */ void actionDisappear();
-    /* 80BF823C */ void actionOffInit();
-    /* 80BF8268 */ void actionOff();
-    /* 80BF82D0 */ void actionOnWaitInit();
-    /* 80BF8344 */ void actionOnWait();
-    /* 80BF83E4 */ void actionOnInit();
-    /* 80BF846C */ void actionOn();
-    /* 80BF8584 */ void setPntWind();
-    /* 80BF863C */ void cutPntWind();
-    /* 80BF8660 */ void movePntWind();
-    /* 80BF8914 */ void setEmitterPre00();
-    /* 80BF89AC */ void setEmitterSrc00Sand();
-    /* 80BF89B0 */ void setEmitterSrc01Smk();
-    /* 80BF8A54 */ void stopEmitterPre00();
-    /* 80BF8A80 */ void stopEmitterSrc00Sand();
-    /* 80BF8AAC */ void stopEmitterSrc01Smk();
-    /* 80BF8AD8 */ void setEmitterClm00();
-    /* 80BF8B70 */ void setEmitterSmk01();
-    /* 80BF8C08 */ void setEmitterSmk02();
-    /* 80BF8CA0 */ void stopEmitterClm00();
-    /* 80BF8CCC */ void stopEmitterSmk01();
-    /* 80BF8CF8 */ void stopEmitterSmk02();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void actionOff2Init();
+    void actionOff2();
+    void actionOnWait2Init();
+    void actionOnWait2();
+    void actionOn2Init();
+    void actionOn2();
+    void actionDisappearInit(u8);
+    void actionDisappear();
+    void actionOffInit();
+    void actionOff();
+    void actionOnWaitInit();
+    void actionOnWait();
+    void actionOnInit();
+    void actionOn();
+    void setPntWind();
+    void cutPntWind();
+    void movePntWind();
+    void setEmitterPre00();
+    void setEmitterSrc00Sand();
+    void setEmitterSrc01Smk();
+    void stopEmitterPre00();
+    void stopEmitterSrc00Sand();
+    void stopEmitterSrc01Smk();
+    void setEmitterClm00();
+    void setEmitterSmk01();
+    void setEmitterSmk02();
+    void stopEmitterClm00();
+    void stopEmitterSmk01();
+    void stopEmitterSmk02();
 
-    /* 80BF70E0 */ virtual int CreateHeap();
-    /* 80BF6F80 */ virtual int Create();
-    /* 80BF7288 */ virtual int Execute(Mtx**);
-    /* 80BF8870 */ virtual int Draw();
-    /* 80BF8D24 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getType() { return (field_0x766 >> 8) & 0xF; }
     u8 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_glowSphere.h b/include/d/actor/d_a_obj_glowSphere.h
index 39488ab078..f620306408 100644
--- a/include/d/actor/d_a_obj_glowSphere.h
+++ b/include/d/actor/d_a_obj_glowSphere.h
@@ -45,15 +45,15 @@ public:
         reset();
     }
 
-    /* 80BFA4B8 */ void _clrLstBuf();
-    /* 80BFA4DC */ int entry(daGlwSph_c*);
-    /* 80BFA528 */ void remove(daGlwSph_c*);
-    /* 80BFA55C */ int _setting_main();
-    /* 80BFA5C4 */ BOOL _chkAllGet_main();
-    /* 80BFA60C */ void SphSeProc();
-    /* 80BFA6D8 */ static void clrSphSe();
-    /* 80BFA6E8 */ static u16 getSphSe();
-    /* 80BFA6F8 */ static void incSphSe();
+    void _clrLstBuf();
+    int entry(daGlwSph_c*);
+    void remove(daGlwSph_c*);
+    int _setting_main();
+    BOOL _chkAllGet_main();
+    void SphSeProc();
+    static void clrSphSe();
+    static u16 getSphSe();
+    static void incSphSe();
 
     void setting() {
         _setting_main();
@@ -100,24 +100,24 @@ public:
         ACTION_MOVE_e,
     };
 
-    /* 80BF9430 */ static _GlSph_Mng_c& getSphMng();
-    /* 80BF943C */ void setBaseMtx();
-    /* 80BF94AC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80BF94CC */ int CreateHeap();
-    /* 80BF95D4 */ int create();
-    /* 80BF9B1C */ int execute();
-    /* 80BF9BC0 */ void actionMain();
-    /* 80BF9DF0 */ void effectSet();
-    /* 80BF9F30 */ void getSE();
-    /* 80BFA010 */ void getVibe();
-    /* 80BFA064 */ void actionWaitInit();
-    /* 80BFA070 */ void actionWait();
-    /* 80BFA074 */ void actionGetInit();
-    /* 80BFA130 */ void actionGet();
-    /* 80BFA1E0 */ void actionMoveInit();
-    /* 80BFA204 */ void actionMove();
-    /* 80BFA2A4 */ int draw();
-    /* 80BFA3EC */ int _delete();
+    static _GlSph_Mng_c& getSphMng();
+    void setBaseMtx();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int CreateHeap();
+    int create();
+    int execute();
+    void actionMain();
+    void effectSet();
+    void getSE();
+    void getVibe();
+    void actionWaitInit();
+    void actionWait();
+    void actionGetInit();
+    void actionGet();
+    void actionMoveInit();
+    void actionMove();
+    int draw();
+    int _delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getArg0() { return fopAcM_GetParamBit(this, 8, 8); }
@@ -166,8 +166,8 @@ STATIC_ASSERT(sizeof(daGlwSph_c) == 0x98C);
 
 class daGlwSph_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80BF934C */ daGlwSph_HIO_c();
-    /* 80BFA76C */ virtual ~daGlwSph_HIO_c() {}
+    daGlwSph_HIO_c();
+    virtual ~daGlwSph_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_goGate.h b/include/d/actor/d_a_obj_goGate.h
index 01fff37112..70fad83c80 100644
--- a/include/d/actor/d_a_obj_goGate.h
+++ b/include/d/actor/d_a_obj_goGate.h
@@ -22,20 +22,20 @@ public:
         MODE_CLOSE = 2,
     };
 
-    /* 80BFD724 */ void setBaseMtx();
-    /* 80BFD7C0 */ int CreateHeap();
-    /* 80BFD82C */ cPhs__Step create();
-    /* 80BFD984 */ int Execute(Mtx**);
-    /* 80BFD9D4 */ void moveGate();
-    /* 80BFDAD8 */ void init_modeWait();
-    /* 80BFDAE4 */ void modeWait();
-    /* 80BFDAE8 */ void init_modeMoveOpen();
-    /* 80BFDAF4 */ void modeMoveOpen();
-    /* 80BFDC04 */ void init_modeMoveClose();
-    /* 80BFDC10 */ void modeMoveClose();
-    /* 80BFDD20 */ void setSe();
-    /* 80BFDDDC */ int Draw();
-    /* 80BFDE80 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveOpen();
+    void modeMoveOpen();
+    void init_modeMoveClose();
+    void modeMoveClose();
+    void setSe();
+    int Draw();
+    int Delete();
 
     u32 getLR() { return fopAcM_GetParamBit(this, 8, 8); }
     u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -55,8 +55,8 @@ STATIC_ASSERT(sizeof(daGoGate_c) == 0x5b8);
 
 class daGoGate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80BFD6AC */ daGoGate_HIO_c();
-    /* 80BFDF3C */ virtual ~daGoGate_HIO_c() {}
+    daGoGate_HIO_c();
+    virtual ~daGoGate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_gomikabe.h b/include/d/actor/d_a_obj_gomikabe.h
index 730e1c56c1..441fff371f 100644
--- a/include/d/actor/d_a_obj_gomikabe.h
+++ b/include/d/actor/d_a_obj_gomikabe.h
@@ -21,25 +21,25 @@ public:
         ACTION_BREAK,
     };
 
-    /* 80BFE244 */ void initCcCylinder();
-    /* 80BFE2CC */ void SetCcCyl();
-    /* 80BFE47C */ void WaitAction();
-    /* 80BFE4C4 */ void BreakChk();
-    /* 80BFE52C */ void BreakSet();
-    /* 80BFEA60 */ void getWaterStream(cXyz&, cXyz&, f32);
-    /* 80BFEB90 */ void SpeedSet();
-    /* 80BFED54 */ void BreakAction();
-    /* 80BFED74 */ void CheckCull();
-    /* 80BFEE24 */ bool checkViewArea(cXyz);
-    /* 80BFEEA8 */ void Action();
-    /* 80BFEF20 */ void setBaseMtx();
-    /* 80BFEF84 */ void setBaseMtx2();
-    /* 80BFF064 */ int CreateHeap();
-    /* 80BFF164 */ int create();
-    /* 80BFF8D8 */ int Create();
-    /* 80BFF938 */ int Execute(Mtx**);
-    /* 80BFFA00 */ int Draw();
-    /* 80BFFB1C */ int Delete();
+    void initCcCylinder();
+    void SetCcCyl();
+    void WaitAction();
+    void BreakChk();
+    void BreakSet();
+    void getWaterStream(cXyz&, cXyz&, f32);
+    void SpeedSet();
+    void BreakAction();
+    void CheckCull();
+    bool checkViewArea(cXyz);
+    void Action();
+    void setBaseMtx();
+    void setBaseMtx2();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x05A0 */ u8 mSwBit;
@@ -72,8 +72,8 @@ STATIC_ASSERT(sizeof(daObjGOMIKABE_c) == 0x13c4);
 
 class daObjGOMIKABE_HIO_c : public JORReflexible {
 public:
-    /* 80BFE22C */ daObjGOMIKABE_HIO_c();
-    /* 80BFFB74 */ virtual ~daObjGOMIKABE_HIO_c() {}
+    daObjGOMIKABE_HIO_c();
+    virtual ~daObjGOMIKABE_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
diff --git a/include/d/actor/d_a_obj_gpTaru.h b/include/d/actor/d_a_obj_gpTaru.h
index 448dd389dd..79ed31b3ae 100644
--- a/include/d/actor/d_a_obj_gpTaru.h
+++ b/include/d/actor/d_a_obj_gpTaru.h
@@ -15,33 +15,33 @@
  */
 class daGpTaru_c : public fopAc_ac_c {
 public:
-    /* 8057D1F8 */ void setBaseMtx();
-    /* 8057D33C */ int create();
-    /* 8057D7CC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8057DB3C */ BOOL chkSinkAll();
-    /* 8057DB60 */ BOOL chkWaterLineIn();
-    /* 8057DB84 */ void bgCheck();
-    /* 8057E494 */ void mode_proc_call();
-    /* 8057E5DC */ void mode_init_wait();
-    /* 8057E618 */ void mode_proc_wait();
-    /* 8057E63C */ void mode_init_carry();
-    /* 8057E660 */ void mode_proc_carry();
-    /* 8057E700 */ void mode_init_drop();
-    /* 8057E72C */ void mode_proc_drop();
-    /* 8057E750 */ void mode_init_roll();
-    /* 8057E768 */ void mode_proc_roll();
-    /* 8057EBA4 */ void mode_init_exploInit();
-    /* 8057EC60 */ void mode_proc_exploInit();
-    /* 8057EE2C */ void mode_init_explosion();
-    /* 8057EFB0 */ void mode_proc_explosion();
-    /* 8057EFFC */ void mode_init_sink();
-    /* 8057F014 */ void mode_proc_sink();
-    /* 8057F104 */ void breakEffSet();
+    void setBaseMtx();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    BOOL chkSinkAll();
+    BOOL chkWaterLineIn();
+    void bgCheck();
+    void mode_proc_call();
+    void mode_init_wait();
+    void mode_proc_wait();
+    void mode_init_carry();
+    void mode_proc_carry();
+    void mode_init_drop();
+    void mode_proc_drop();
+    void mode_init_roll();
+    void mode_proc_roll();
+    void mode_init_exploInit();
+    void mode_proc_exploInit();
+    void mode_init_explosion();
+    void mode_proc_explosion();
+    void mode_init_sink();
+    void mode_proc_sink();
+    void breakEffSet();
 
-    /* 8057D2D0 */ virtual int CreateHeap();
-    /* 8057E224 */ virtual int Execute();
-    /* 8057F284 */ virtual int Draw();
-    /* 8057F328 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute();
+    virtual int Draw();
+    virtual int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -78,8 +78,8 @@ STATIC_ASSERT(sizeof(daGpTaru_c) == 0x9ac);
 
 class daGpTaru_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 8057D0CC */ daGpTaru_HIO_c();
-    /* 8057F458 */ virtual ~daGpTaru_HIO_c() {}
+    daGpTaru_HIO_c();
+    virtual ~daGpTaru_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_gra2.h b/include/d/actor/d_a_obj_gra2.h
index 57c02149b9..2cbe9e700c 100644
--- a/include/d/actor/d_a_obj_gra2.h
+++ b/include/d/actor/d_a_obj_gra2.h
@@ -99,134 +99,134 @@ public:
         /* 0x24 */ dPaPo_c field_0x24;
     };
 
-    /* 80BFFF58 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80BFFF70 */ daObj_GrA_c();
-    /* 80C0011C */ ~daObj_GrA_c();
-    /* 80C003CC */ cPhs__Step create();
-    /* 80C00614 */ int CreateHeap();
-    /* 80C00790 */ int Delete();
-    /* 80C00804 */ int Execute(Mtx**);
-    /* 80C00A44 */ int Draw();
-    /* 80C00ACC */ int jointCtrl(J3DJoint*, J3DModel*);
-    /* 80C00D5C */ const char* getResName();
-    /* 80C00D74 */ u8 getMode();
-    /* 80C00DF8 */ u8 getPathNo();
-    /* 80C00E04 */ u16 getTagNo();
-    /* 80C00E10 */ u16 getJumpType();
-    /* 80C00E1C */ BOOL isDelete();
-    /* 80C00EFC */ void restart();
-    /* 80C010D4 */ int init();
-    /* 80C013B0 */ void setBaseAnm(int, f32);
-    /* 80C014F4 */ void setFaceAnm(int, bool, f32);
-    /* 80C01698 */ void setFaceBtp(int);
-    /* 80C0178C */ void setBaseMotion(int, f32);
-    /* 80C017AC */ void setFaceMotion(int, f32);
-    /* 80C017F0 */ void calcMotion();
-    /* 80C018C0 */ BOOL checkProcess(int (daObj_GrA_c::*)(void*));
-    /* 80C018F4 */ int setProcess(int (daObj_GrA_c::*)(void*));
-    /* 80C019B8 */ void setParam();
-    /* 80C01C18 */ BOOL checkEvent();
-    /* 80C01D7C */ void mainProc();
-    /* 80C01FE4 */ void adjustShapeAngle();
-    /* 80C01FE8 */ void setMtx(int);
-    /* 80C02614 */ void setCollisions();
-    /* 80C02970 */ void setAttnPos();
-    /* 80C02A5C */ void drawOtherMdls();
-    /* 80C02A60 */ bool dbgDraw();
-    /* 80C02A68 */ int ppMoveInit();
-    /* 80C02AD4 */ int setLookMode(int);
-    /* 80C02AE8 */ int lookat();
-    /* 80C0308C */ int hitChk();
-    /* 80C031E4 */ int wait(void*);
-    /* 80C0335C */ int talk(void*);
-    /* 80C035B8 */ int ctrlMsgAnm(int&, int&, fopAc_ac_c*);
-    /* 80C03720 */ bool checkTagGraSub(fopAc_ac_c*);
-    /* 80C03764 */ bool fallAbyssCheck();
-    /* 80C03830 */ int setPrtcl();
-    /* 80C03B14 */ int base000(int);
-    /* 80C03B48 */ int base001(int);
-    /* 80C03B7C */ int base003(int);
-    /* 80C03C1C */ int base004(int);
-    /* 80C03CBC */ int base005(int);
-    /* 80C03D54 */ int base006(int);
-    /* 80C03D88 */ int base007(int);
-    /* 80C03DF0 */ int base008(int);
-    /* 80C03E74 */ int base009(int);
-    /* 80C03F14 */ int base010(int);
-    /* 80C03FC0 */ int base013(int);
-    /* 80C04118 */ int base016(int);
-    /* 80C04180 */ int base017(int);
-    /* 80C041E8 */ int base018(int);
-    /* 80C04260 */ int base019(int);
-    /* 80C042D4 */ int base020(int);
-    /* 80C04308 */ int base021(int);
-    /* 80C0433C */ int base022(int);
-    /* 80C04370 */ int base023(int);
-    /* 80C043A4 */ int base024(int);
-    /* 80C043D8 */ int base025(int);
-    /* 80C0440C */ int base026(int);
-    /* 80C04440 */ int face000(int);
-    /* 80C04478 */ int face003(int);
-    /* 80C04518 */ int face004(int);
-    /* 80C045B8 */ int face005(int);
-    /* 80C045F0 */ int face006(int);
-    /* 80C04628 */ int face007(int);
-    /* 80C04660 */ int face008(int);
-    /* 80C04700 */ int face009(int);
-    /* 80C047A0 */ int face010(int);
-    /* 80C047D8 */ int face011(int);
-    /* 80C04810 */ int face012(int);
-    /* 80C04848 */ int face016(int);
-    /* 80C04880 */ int face017(int);
-    /* 80C048B8 */ int face999(int);
-    /* 80C048F8 */ int evtcutTalk(int, int);
-    /* 80C04A0C */ void setFaceTalkAfter();
-    /* 80C0536C */ f32 getSrchCircleR();
-    /* 80C053C4 */ int standWait(void*);
-    /* 80C05920 */ int walk(void*);
-    /* 80C05F64 */ int defence(void*);
-    /* 80C061F4 */ int toStone(void*);
-    /* 80C067D8 */ int step(void*);
-    /* 80C06CDC */ int rollReturn(void*);
-    /* 80C0780C */ int soldierDemoSkip();
-    /* 80C078A8 */ int soldierDemo(void*);
-    /* 80C07C40 */ f32 getSrchLinkR();
-    /* 80C07C98 */ f32 getSrchGraR();
-    /* 80C07CF0 */ f32 getSpeed();
-    /* 80C07D38 */ int standRoll(void*);
-    /* 80C083F0 */ int rollDemo(void*);
-    /* 80C08804 */ int rollAttack(void*);
-    /* 80C09298 */ int rollAttacked(void*);
-    /* 80C09918 */ int rollEscape(void*);
-    /* 80C09F08 */ void rollLanding();
-    /* 80C0A018 */ int thrown(void*);
-    /* 80C0A120 */ void demo_camera();
-    /* 80C0AF94 */ void rollAttackedDemo();
-    /* 80C0B9AC */ void graThrowDemo();
-    /* 80C0BD90 */ void setCarryStatus();
-    /* 80C0BE5C */ bool checkThrow();
-    /* 80C0BF34 */ void calcCatchPos(f32, int);
-    /* 80C0C348 */ void initCrazyBeforeCatch(int);
-    /* 80C0C364 */ void executeCrazyBeforeCatch();
-    /* 80C0C3E0 */ void initCrazyCatch(int);
-    /* 80C0C478 */ void executeCrazyCatch();
-    /* 80C0C5F0 */ void initCrazyThrow(int);
-    /* 80C0C690 */ void executeCrazyThrow();
-    /* 80C0C84C */ void initCrazyAttack();
-    /* 80C0CA64 */ void executeCrazyJumping();
-    /* 80C0CDBC */ BOOL modeChangeCheck();
-    /* 80C0CF98 */ BOOL checkGraSub(fopAc_ac_c*);
-    /* 80C0D000 */ int waitDemo(void*);
-    /* 80C0D2FC */ int skipDemoGra();
-    /* 80C0D3E0 */ int startDemo(void*);
-    /* 80C0EFC4 */ BOOL turn(s16, f32, int);
-    /* 80C0F17C */ BOOL turn_step(s16, int, int, int);
-    /* 80C0F330 */ BOOL chkFindPlayer2(int, s16);
-    /* 80C0F668 */ BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
-    /* 80C0F5A4 */ BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
-    /* 80C0F6E0 */ BOOL chkActorInSight2(fopAc_ac_c*, f32, s16);
-    /* 80C0F7EC */ cXyz getAttentionPos(fopAc_ac_c*);
-    /* 80C0F860 */ int standWaitJump(void*);
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    daObj_GrA_c();
+    ~daObj_GrA_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute(Mtx**);
+    int Draw();
+    int jointCtrl(J3DJoint*, J3DModel*);
+    const char* getResName();
+    u8 getMode();
+    u8 getPathNo();
+    u16 getTagNo();
+    u16 getJumpType();
+    BOOL isDelete();
+    void restart();
+    int init();
+    void setBaseAnm(int, f32);
+    void setFaceAnm(int, bool, f32);
+    void setFaceBtp(int);
+    void setBaseMotion(int, f32);
+    void setFaceMotion(int, f32);
+    void calcMotion();
+    BOOL checkProcess(int (daObj_GrA_c::*)(void*));
+    int setProcess(int (daObj_GrA_c::*)(void*));
+    void setParam();
+    BOOL checkEvent();
+    void mainProc();
+    void adjustShapeAngle();
+    void setMtx(int);
+    void setCollisions();
+    void setAttnPos();
+    void drawOtherMdls();
+    bool dbgDraw();
+    int ppMoveInit();
+    int setLookMode(int);
+    int lookat();
+    int hitChk();
+    int wait(void*);
+    int talk(void*);
+    int ctrlMsgAnm(int&, int&, fopAc_ac_c*);
+    bool checkTagGraSub(fopAc_ac_c*);
+    bool fallAbyssCheck();
+    int setPrtcl();
+    int base000(int);
+    int base001(int);
+    int base003(int);
+    int base004(int);
+    int base005(int);
+    int base006(int);
+    int base007(int);
+    int base008(int);
+    int base009(int);
+    int base010(int);
+    int base013(int);
+    int base016(int);
+    int base017(int);
+    int base018(int);
+    int base019(int);
+    int base020(int);
+    int base021(int);
+    int base022(int);
+    int base023(int);
+    int base024(int);
+    int base025(int);
+    int base026(int);
+    int face000(int);
+    int face003(int);
+    int face004(int);
+    int face005(int);
+    int face006(int);
+    int face007(int);
+    int face008(int);
+    int face009(int);
+    int face010(int);
+    int face011(int);
+    int face012(int);
+    int face016(int);
+    int face017(int);
+    int face999(int);
+    int evtcutTalk(int, int);
+    void setFaceTalkAfter();
+    f32 getSrchCircleR();
+    int standWait(void*);
+    int walk(void*);
+    int defence(void*);
+    int toStone(void*);
+    int step(void*);
+    int rollReturn(void*);
+    int soldierDemoSkip();
+    int soldierDemo(void*);
+    f32 getSrchLinkR();
+    f32 getSrchGraR();
+    f32 getSpeed();
+    int standRoll(void*);
+    int rollDemo(void*);
+    int rollAttack(void*);
+    int rollAttacked(void*);
+    int rollEscape(void*);
+    void rollLanding();
+    int thrown(void*);
+    void demo_camera();
+    void rollAttackedDemo();
+    void graThrowDemo();
+    void setCarryStatus();
+    bool checkThrow();
+    void calcCatchPos(f32, int);
+    void initCrazyBeforeCatch(int);
+    void executeCrazyBeforeCatch();
+    void initCrazyCatch(int);
+    void executeCrazyCatch();
+    void initCrazyThrow(int);
+    void executeCrazyThrow();
+    void initCrazyAttack();
+    void executeCrazyJumping();
+    BOOL modeChangeCheck();
+    BOOL checkGraSub(fopAc_ac_c*);
+    int waitDemo(void*);
+    int skipDemoGra();
+    int startDemo(void*);
+    BOOL turn(s16, f32, int);
+    BOOL turn_step(s16, int, int, int);
+    BOOL chkFindPlayer2(int, s16);
+    BOOL chkPointInArea(cXyz, cXyz, cXyz, s16);
+    BOOL chkPointInArea(cXyz, cXyz, f32, f32, f32, s16);
+    BOOL chkActorInSight2(fopAc_ac_c*, f32, s16);
+    cXyz getAttentionPos(fopAc_ac_c*);
+    int standWaitJump(void*);
 
     bool checkNpcObjGra() { return mMode == 1; }
     void setCrazyDash() { field_0xa48 |= 4; }
diff --git a/include/d/actor/d_a_obj_graWall.h b/include/d/actor/d_a_obj_graWall.h
index 5e3fec0f41..ebcd1cdb58 100644
--- a/include/d/actor/d_a_obj_graWall.h
+++ b/include/d/actor/d_a_obj_graWall.h
@@ -14,11 +14,11 @@
  */
 class daObjGraWall_c : public fopAc_ac_c {
 public:
-    /* 80C10BF8 */ int Create();
-    /* 80C10DD8 */ int Execute();
-    /* 80C10E78 */ int Delete();
-    /* 80C10E80 */ void col_init();
-    /* 80C10ED4 */ void col_set();
+    int Create();
+    int Execute();
+    int Delete();
+    void col_init();
+    void col_set();
 
 private:
     /* 0x568 */ dCcD_Stts mStts;
diff --git a/include/d/actor/d_a_obj_gra_rock.h b/include/d/actor/d_a_obj_gra_rock.h
index 4283b09238..e3cf568871 100644
--- a/include/d/actor/d_a_obj_gra_rock.h
+++ b/include/d/actor/d_a_obj_gra_rock.h
@@ -16,20 +16,20 @@
  */
 class daObjGraRock_c : public dBgS_MoveBgActor {
 public:
-    /* 80C110F8 */ void setAttnPos();
-    /* 80C11444 */ void setBaseMtx();
-    /* 80C114C0 */ void setPrtcl();
-    /* 80C1157C */ void bombParticleSet();
-    /* 80C11730 */ void setEnvTevColor();
-    /* 80C1178C */ void setRoomNo();
-    /* 80C117D0 */ void col_set();
-    /* 80C11964 */ int checkHitAt(cCcD_Obj*);
-    /* 80C11970 */ int Create();
-    /* 80C11B68 */ int CreateHeap();
-    /* 80C11C64 */ int create();
-    /* 80C11FF0 */ int Execute(Mtx**);
-    /* 80C120FC */ int Draw();
-    /* 80C121C4 */ int Delete();
+    void setAttnPos();
+    void setBaseMtx();
+    void setPrtcl();
+    void bombParticleSet();
+    void setEnvTevColor();
+    void setRoomNo();
+    void col_set();
+    int checkHitAt(cCcD_Obj*);
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     static dCcD_SrcCyl const mCcDCyl;
 
diff --git a/include/d/actor/d_a_obj_grave_stone.h b/include/d/actor/d_a_obj_grave_stone.h
index 0bccd918b0..4f38629fbf 100644
--- a/include/d/actor/d_a_obj_grave_stone.h
+++ b/include/d/actor/d_a_obj_grave_stone.h
@@ -24,17 +24,17 @@ public:
         /* 0x24 */ dPaPo_c field_0x24;
     };  // Size: 0x5C
 
-    /* 80C125F8 */ void setBaseMtx();
-    /* 80C1266C */ void moveCalc();
-    /* 80C12918 */ int setPrtcl();
-    /* 80C12A38 */ void setEnvTevColor();
-    /* 80C12A94 */ void setRoomNo();
-    /* 80C12AD8 */ int Create();
-    /* 80C12CA4 */ int CreateHeap();
-    /* 80C12D1C */ cPhs__Step create();
-    /* 80C13030 */ int Execute(Mtx**);
-    /* 80C13078 */ int Draw();
-    /* 80C1311C */ int Delete();
+    void setBaseMtx();
+    void moveCalc();
+    int setPrtcl();
+    void setEnvTevColor();
+    void setRoomNo();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     friend class daNpc_zrZ_c;
diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h
index dd4ffecc00..5e9061d89c 100644
--- a/include/d/actor/d_a_obj_groundwater.h
+++ b/include/d/actor/d_a_obj_groundwater.h
@@ -26,23 +26,23 @@ public:
         LEVEL_DOWN_B,
     };
 
-    /* 80C13540 */ void setBaseMtx();
-    /* 80C13618 */ int CreateHeap();
-    /* 80C139E4 */ int create();
-    /* 80C13DB0 */ daGrdWater_c();
-    /* 80C13FEC */ int Execute(Mtx**);
-    /* 80C14194 */ void init_modeWait();
-    /* 80C141A0 */ void modeWait();
-    /* 80C141A4 */ void init_modeLevelUpA();
-    /* 80C1423C */ void modeLevelUpA();
-    /* 80C142AC */ void init_modeLevelDownA();
-    /* 80C14320 */ void modeLevelDownA();
-    /* 80C1437C */ void init_modeLevelUpB();
-    /* 80C14414 */ void modeLevelUpB();
-    /* 80C14484 */ void init_modeLevelDownB();
-    /* 80C144F8 */ void modeLevelDownB();
-    /* 80C14554 */ int Draw();
-    /* 80C147EC */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    daGrdWater_c();
+    int Execute(Mtx**);
+    void init_modeWait();
+    void modeWait();
+    void init_modeLevelUpA();
+    void modeLevelUpA();
+    void init_modeLevelDownA();
+    void modeLevelDownA();
+    void init_modeLevelUpB();
+    void modeLevelUpB();
+    void init_modeLevelDownB();
+    void modeLevelDownB();
+    int Draw();
+    int Delete();
 
     u8 getSw() { return fopAcM_GetParamBit(this, 8, 8); }
     u8 getSw2() { return fopAcM_GetParamBit(this, 16, 8); }
@@ -73,8 +73,8 @@ STATIC_ASSERT(sizeof(daGrdWater_c) == 0x6f4);
 
 class daGrdWater_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C134AC */ daGrdWater_HIO_c();
-    /* 80C148A8 */ virtual ~daGrdWater_HIO_c() {}
+    daGrdWater_HIO_c();
+    virtual ~daGrdWater_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_grz_rock.h b/include/d/actor/d_a_obj_grz_rock.h
index 515481e3d4..e2223d1e4e 100644
--- a/include/d/actor/d_a_obj_grz_rock.h
+++ b/include/d/actor/d_a_obj_grz_rock.h
@@ -15,16 +15,16 @@
 
 class daObjGrzRock_c : public dBgS_MoveBgActor {
 public:
-    /* 80C14BD8 */ void setBaseMtx();
-    /* 80C14C54 */ void setEnvTevColor();
-    /* 80C14CB0 */ void setRoomNo();
-    /* 80C14CF0 */ void setPrtcl();
-    /* 80C14DA0 */ int Create();
-    /* 80C14EE0 */ int CreateHeap();
-    /* 80C14F50 */ cPhs__Step create();
-    /* 80C1514C */ int Execute(Mtx**);
-    /* 80C151A4 */ int Draw();
-    /* 80C15248 */ int Delete();
+    void setBaseMtx();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setPrtcl();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     void setSmashFlag(u8 i_smashFlag) { mSmashFlag = i_smashFlag; }
 
diff --git a/include/d/actor/d_a_obj_h_saku.h b/include/d/actor/d_a_obj_h_saku.h
index 72a48aad2c..d999465808 100644
--- a/include/d/actor/d_a_obj_h_saku.h
+++ b/include/d/actor/d_a_obj_h_saku.h
@@ -17,16 +17,16 @@
 
 class daObjH_Saku_c : public dBgS_MoveBgActor {
 public:
-    /* 80C1552C */ void BreakSet();
-    /* 80C15810 */ u8 SpeedSet(cXyz*, cXyz*, f32);
-    /* 80C15A4C */ void Action();
-    /* 80C15E00 */ void initBaseMtx();
-    /* 80C15E44 */ void setBaseMtx();
-    /* 80C161E8 */ inline int CreateHeap();
-    /* 80C1629C */ inline int Create();
-    /* 80C162F4 */ inline int Execute(Mtx**);
-    /* 80C16340 */ inline int Draw();
-    /* 80C1641C */ inline int Delete();
+    void BreakSet();
+    u8 SpeedSet(cXyz*, cXyz*, f32);
+    void Action();
+    void initBaseMtx();
+    void setBaseMtx();
+    inline int CreateHeap();
+    inline int Create();
+    inline int Execute(Mtx**);
+    inline int Draw();
+    inline int Delete();
     inline cPhs__Step create();
 
     /* 0x5A0 */ u8 field_0x5a0;
diff --git a/include/d/actor/d_a_obj_hakai_brl.h b/include/d/actor/d_a_obj_hakai_brl.h
index 37836ceb25..394cab0366 100644
--- a/include/d/actor/d_a_obj_hakai_brl.h
+++ b/include/d/actor/d_a_obj_hakai_brl.h
@@ -14,23 +14,23 @@
  */
 class daObjHBarrel_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80C16758 */ daObjHBarrel_c();
-    /* 80C16918 */ virtual ~daObjHBarrel_c();
-    /* 80C16A98 */ int createHeap();
-    /* 80C16B08 */ int create();
-    /* 80C16BF8 */ int Delete();
-    /* 80C16C44 */ int draw();
-    /* 80C16CA8 */ int execute();
-    /* 80C16D50 */ void init();
-    /* 80C16DEC */ void setModelMtx();
-    /* 80C16E50 */ void hitAction();
+    daObjHBarrel_c();
+    virtual ~daObjHBarrel_c();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setModelMtx();
+    void hitAction();
     u8 getItemBit() {
         return fopAcM_GetParamBit(this, 8, 8);
     }
     u8 getItemNo() {
         return fopAcM_GetParamBit(this, 0, 8);
     }
-    /* 80C17090 */ void callEmt();
+    void callEmt();
 
     static dCcD_SrcCyl const s_CcDCyl;
 
diff --git a/include/d/actor/d_a_obj_hakai_ftr.h b/include/d/actor/d_a_obj_hakai_ftr.h
index 7206dfca4a..cc94ba6021 100644
--- a/include/d/actor/d_a_obj_hakai_ftr.h
+++ b/include/d/actor/d_a_obj_hakai_ftr.h
@@ -14,20 +14,20 @@
  */
 class daObjHFtr_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80C174B8 */ daObjHFtr_c();
-    /* 80C17778 */ virtual ~daObjHFtr_c();
+    daObjHFtr_c();
+    virtual ~daObjHFtr_c();
     inline u8 getNameId() {
         return fopAcM_GetParamBit(this, 0, 4);
     }
-    /* 80C17874 */ int createHeap();
-    /* 80C179B0 */ int create();
-    /* 80C17AC0 */ int Delete();
-    /* 80C17B30 */ int draw();
-    /* 80C17BD4 */ int execute();
-    /* 80C17CD0 */ void init();
-    /* 80C17E10 */ void setModelMtx();
-    /* 80C17E74 */ bool chkHit();
-    /* 80C17EDC */ void callEmt();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setModelMtx();
+    bool chkHit();
+    void callEmt();
 
     static dCcD_SrcCyl const s_CcDCyl;
 
diff --git a/include/d/actor/d_a_obj_hasu2.h b/include/d/actor/d_a_obj_hasu2.h
index f463393b20..9c36c0d180 100644
--- a/include/d/actor/d_a_obj_hasu2.h
+++ b/include/d/actor/d_a_obj_hasu2.h
@@ -15,18 +15,18 @@ namespace nObjMHasu {
  */
 class daObjMHasu_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-        /* 80C182DC */ daObjMHasu_c();
-        /* 80C18340 */ int create1st();
-        /* 80C183D0 */ void setMtx();
-        /* 80C18440 */ int CreateHeap();
-        /* 80C184B0 */ int Create();
-        /* 80C185A4 */ int Execute(Mtx**);
-        /* 80C18600 */ int Draw();
-        /* 80C186A4 */ int Delete();
-        /* 80C186E0 */ void upDownHasu();
-        /* 80C18888 */ void updateCount(u8);
-        /* 80C188A0 */ void setHasuCount(f32);
-        /* 80C189E0 */ virtual ~daObjMHasu_c() {};
+        daObjMHasu_c();
+        int create1st();
+        void setMtx();
+        int CreateHeap();
+        int Create();
+        int Execute(Mtx**);
+        int Draw();
+        int Delete();
+        void upDownHasu();
+        void updateCount(u8);
+        void setHasuCount(f32);
+        virtual ~daObjMHasu_c() {};
 
         void setRideFlag(bool i_ride) { mRideFlag = i_ride; }
 private:
diff --git a/include/d/actor/d_a_obj_hata.h b/include/d/actor/d_a_obj_hata.h
index 13920664c6..f122b84690 100644
--- a/include/d/actor/d_a_obj_hata.h
+++ b/include/d/actor/d_a_obj_hata.h
@@ -16,16 +16,16 @@
 
 class daObjHata_c : public fopAc_ac_c, request_of_phase_process_class {
 public:
-    /* 80C18D08 */ daObjHata_c();
-    /* 80C18D68 */ virtual ~daObjHata_c();
-    /* 80C18E00 */ int createHeap();
-    /* 80C18E70 */ cPhs__Step create();
-    /* 80C18F88 */ int Delete();
-    /* 80C18FBC */ int draw();
-    /* 80C19060 */ int execute();
-    /* 80C19098 */ void setModelMtx();
-    /* 80C190FC */ void init();
-    /* 80C1919C */ void moveSwing();
+    daObjHata_c();
+    virtual ~daObjHata_c();
+    int createHeap();
+    cPhs__Step create();
+    int Delete();
+    int draw();
+    int execute();
+    void setModelMtx();
+    void init();
+    void moveSwing();
 
     void getJntAngle(csXyz* angle, int idx) { *angle = jnt_angle[idx]; }
     
diff --git a/include/d/actor/d_a_obj_hbombkoya.h b/include/d/actor/d_a_obj_hbombkoya.h
index 6303b6d0a2..9f9c0a5149 100644
--- a/include/d/actor/d_a_obj_hbombkoya.h
+++ b/include/d/actor/d_a_obj_hbombkoya.h
@@ -26,15 +26,15 @@ public:
 
     daObjHBombkoya_c() : dEvLib_callback_c(this) {}
 
-    /* 80C1B878 */ int create1st();
-    /* 80C1BB7C */ bool setParticle(u16*, int, PSetTbl*, int, int);
-    /* 80C1C474 */ virtual ~daObjHBombkoya_c() {}
+    int create1st();
+    bool setParticle(u16*, int, PSetTbl*, int, int);
+    virtual ~daObjHBombkoya_c() {}
 
-    /* 80C1B938 */ virtual int CreateHeap();
-    /* 80C1B9CC */ virtual int Create();
-    /* 80C1BCA0 */ virtual int Execute(Mtx**);
-    /* 80C1C098 */ virtual int Draw();
-    /* 80C1C16C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     int getSw2No() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_heavySw.h b/include/d/actor/d_a_obj_heavySw.h
index 1d59072374..01de59b9a2 100644
--- a/include/d/actor/d_a_obj_heavySw.h
+++ b/include/d/actor/d_a_obj_heavySw.h
@@ -18,24 +18,24 @@ class daHeavySw_c : public dBgS_MoveBgActor {
 public:
     enum Mode_e { MODE_WAIT, MODE_RIDE, MODE_MOVE_INIT, MODE_MOVE, MODE_MOVE_END };
 
-    /* 80C1CBC8 */ void setBaseMtx();
-    /* 80C1CC70 */ int CreateHeap();
-    /* 80C1CCDC */ int create();
-    /* 80C1CF90 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C1CFC0 */ int Execute(Mtx**);
-    /* 80C1D02C */ void moveSwitch();
-    /* 80C1D274 */ void init_modeWait();
-    /* 80C1D280 */ void modeWait();
-    /* 80C1D2AC */ void init_modeRide();
-    /* 80C1D2D8 */ void modeRide();
-    /* 80C1D408 */ void init_modeMoveInit();
-    /* 80C1D434 */ void modeMoveInit();
-    /* 80C1D54C */ void init_modeMove();
-    /* 80C1D588 */ void modeMove();
-    /* 80C1D688 */ void init_modeMoveEnd();
-    /* 80C1D788 */ void modeMoveEnd();
-    /* 80C1D808 */ int Draw();
-    /* 80C1D91C */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    int Execute(Mtx**);
+    void moveSwitch();
+    void init_modeWait();
+    void modeWait();
+    void init_modeRide();
+    void modeRide();
+    void init_modeMoveInit();
+    void modeMoveInit();
+    void init_modeMove();
+    void modeMove();
+    void init_modeMoveEnd();
+    void modeMoveEnd();
+    int Draw();
+    int Delete();
 
     /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
     /* 0x5A8 */ J3DModel* mpModel;
@@ -60,8 +60,8 @@ public:
 
 class daHeavySw_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C1CAEC */ daHeavySw_HIO_c();
-    /* 80C1D9D8 */ virtual ~daHeavySw_HIO_c() {}
+    daHeavySw_HIO_c();
+    virtual ~daHeavySw_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_hfuta.h b/include/d/actor/d_a_obj_hfuta.h
index eb01ddf219..77015715d0 100644
--- a/include/d/actor/d_a_obj_hfuta.h
+++ b/include/d/actor/d_a_obj_hfuta.h
@@ -22,18 +22,18 @@ public:
 
     typedef void (daObjFuta_c::*modeFunc)();
 
-    /* 80C1DD8C */ void initBaseMtx();
-    /* 80C1DDC8 */ void setBaseMtx();
-    /* 80C1DE94 */ int Create();
-    /* 80C1DF2C */ int CreateHeap();
-    /* 80C1DF9C */ int create1st();
-    /* 80C1E020 */ int Execute(Mtx**);
-    /* 80C1EB38 */ void mode_proc_call();
-    /* 80C1EBDC */ void mode_wait();
-    /* 80C1EC44 */ void mode_move();
-    /* 80C1ECB4 */ void mode_end();
-    /* 80C1ECC4 */ int Draw();
-    /* 80C1ED68 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void mode_proc_call();
+    void mode_wait();
+    void mode_move();
+    void mode_end();
+    int Draw();
+    int Delete();
 
     void setMode(u8 mode) { mMode = mode; }
 
diff --git a/include/d/actor/d_a_obj_hhashi.h b/include/d/actor/d_a_obj_hhashi.h
index 08f0eb2455..4fb142e5c6 100644
--- a/include/d/actor/d_a_obj_hhashi.h
+++ b/include/d/actor/d_a_obj_hhashi.h
@@ -15,24 +15,24 @@
  */
 class daObjHHASHI_c : public dBgS_MoveBgActor {
 public:
-    /* 8057F9B8 */ void initCcCylinder();
-    /* 8057FA18 */ void setCcCylinder();
-    /* 8057FA90 */ void Set_Hahen(cXyz*);
-    /* 8057FDA8 */ void Set_Speed(s16, s16, f32, f32, f32, f32);
-    /* 805801B0 */ void Obj_Damage();
-    /* 80580358 */ void Wall_Check(s16);
-    /* 8058043C */ void Hahen_Motion(s16);
-    /* 805805F4 */ void CheckCull();
-    /* 805807C4 */ bool checkViewArea(int);
-    /* 80580854 */ void Rolling(cXyz*, f32, f32, s8);
-    /* 80580A48 */ void Roll_Set(cXyz*, f32, s16);
-    /* 80580C80 */ void setBaseMtx();
-    /* 80580DA4 */ int CreateHeap();
-    /* 80580EA0 */ int create();
-    /* 805811CC */ int Create();
-    /* 80581210 */ int Execute(Mtx**);
-    /* 805812BC */ int Draw();
-    /* 8058140C */ int Delete();
+    void initCcCylinder();
+    void setCcCylinder();
+    void Set_Hahen(cXyz*);
+    void Set_Speed(s16, s16, f32, f32, f32, f32);
+    void Obj_Damage();
+    void Wall_Check(s16);
+    void Hahen_Motion(s16);
+    void CheckCull();
+    bool checkViewArea(int);
+    void Rolling(cXyz*, f32, f32, s8);
+    void Roll_Set(cXyz*, f32, s16);
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     /* 0x05A0 */ int field_0x5a0;
     /* 0x05A4 */ int field_0x5a4;
diff --git a/include/d/actor/d_a_obj_hsTarget.h b/include/d/actor/d_a_obj_hsTarget.h
index 9547b17fb9..1e0e775e12 100644
--- a/include/d/actor/d_a_obj_hsTarget.h
+++ b/include/d/actor/d_a_obj_hsTarget.h
@@ -14,12 +14,12 @@
  */
 class daHsTarget_c : public dBgS_MoveBgActor {
 public:
-    /* 80C1F490 */ void setBaseMtx();
-    /* 80C1F518 */ int CreateHeap();
-    /* 80C1F598 */ int create();
-    /* 80C1F6B0 */ int Execute(Mtx**);
-    /* 80C1F6C4 */ int Draw();
-    /* 80C1F728 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u8 getModelType() { return fopAcM_GetParamBit(this, 0, 4); }
 
@@ -33,8 +33,8 @@ STATIC_ASSERT(sizeof(daHsTarget_c) == 0x5B0);
 
 class daHsTarget_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C1F42C */ daHsTarget_HIO_c();
-    /* 80C1F7F4 */ virtual ~daHsTarget_HIO_c() {}
+    daHsTarget_HIO_c();
+    virtual ~daHsTarget_HIO_c() {}
 
     void genMessage(JORMContext*);
 };
diff --git a/include/d/actor/d_a_obj_ice_l.h b/include/d/actor/d_a_obj_ice_l.h
index 59a4bce077..7a92f46094 100644
--- a/include/d/actor/d_a_obj_ice_l.h
+++ b/include/d/actor/d_a_obj_ice_l.h
@@ -15,17 +15,17 @@
  */
 class daObjIce_l_c : public dBgS_MoveBgActor {
 public:
-    /* 80C1F9F8 */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80C1FA60 */ int Check_RideOn(cXyz);
-    /* 80C1FCCC */ void initBaseMtx();
-    /* 80C1FCF8 */ void setBaseMtx();
-    /* 80C200CC */ int create();
+    void RideOn_Angle(s16&, f32, s16, f32);
+    int Check_RideOn(cXyz);
+    void initBaseMtx();
+    void setBaseMtx();
+    int create();
     
-    /* 80C2030C */ virtual int CreateHeap();
-    /* 80C20384 */ virtual int Create();
-    /* 80C203C4 */ virtual int Execute(Mtx**);
-    /* 80C206AC */ virtual int Draw();
-    /* 80C20750 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     /* 0x5A0 */ f32 field_0x5a0;
     /* 0x5A4 */ f32 field_0x5a4;
diff --git a/include/d/actor/d_a_obj_ice_s.h b/include/d/actor/d_a_obj_ice_s.h
index ff132829fe..f5f77d4c39 100644
--- a/include/d/actor/d_a_obj_ice_s.h
+++ b/include/d/actor/d_a_obj_ice_s.h
@@ -15,17 +15,17 @@
  */
 class daObjIce_s_c : public dBgS_MoveBgActor {
 public:
-    /* 80C209DC */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80C20A44 */ bool Check_LinkRideOn(cXyz);
-    /* 80C20C98 */ bool Check_RideOn(cXyz);
-    /* 80C20EC0 */ void initBaseMtx();
-    /* 80C20EEC */ void setBaseMtx();
-    /* 80C212CC */ int create();
-    /* 80C2157C */ int CreateHeap();
-    /* 80C215F4 */ int Create();
-    /* 80C21634 */ int Execute(Mtx**);
-    /* 80C21964 */ int Draw();
-    /* 80C21A08 */ int Delete();
+    void RideOn_Angle(s16&, f32, s16, f32);
+    bool Check_LinkRideOn(cXyz);
+    bool Check_RideOn(cXyz);
+    void initBaseMtx();
+    void setBaseMtx();
+    int create();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     /* 0x5A0 */ f32 field_0x5a0;
     /* 0x5A4 */ f32 field_0x5a4;
@@ -59,8 +59,8 @@ STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
 
 class daOBJ_ICE_S_HIO_c {
 public:
-    /* 80C209AC */ daOBJ_ICE_S_HIO_c();
-    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c() {}
+    daOBJ_ICE_S_HIO_c();
+    virtual ~daOBJ_ICE_S_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_iceblock.h b/include/d/actor/d_a_obj_iceblock.h
index 7b0a784392..42b7b41c7e 100644
--- a/include/d/actor/d_a_obj_iceblock.h
+++ b/include/d/actor/d_a_obj_iceblock.h
@@ -37,39 +37,39 @@ public:
         ACTION_DEAD_e,
     };
 
-    /* 80C21CD8 */ static void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
-    /* 80C21DC4 */ void initBaseMtx();
-    /* 80C21E24 */ void setBaseMtx();
-    /* 80C21EA4 */ u16 getPointNo();
-    /* 80C21F2C */ void loadCurrentPos();
-    /* 80C21FC8 */ int saveCurrentPos();
-    /* 80C22200 */ void enablePushPull();
-    /* 80C2224C */ void disablePushPull();
-    /* 80C227F4 */ int create1st();
-    /* 80C2294C */ int checkWalk();
-    /* 80C22B04 */ void clrCounter();
-    /* 80C22B28 */ void mode_proc_call();
-    /* 80C22EF8 */ void mode_init_wait();
-    /* 80C22F74 */ void mode_proc_wait();
-    /* 80C23058 */ void mode_init_walk();
-    /* 80C23088 */ void mode_proc_walk();
-    /* 80C23388 */ void setEffect();
-    /* 80C2350C */ int checkWallPre(s16);
-    /* 80C236C8 */ int checkBgHit();
-    /* 80C237B0 */ void bgCheck();
-    /* 80C23860 */ void init_bgCheck();
-    /* 80C238B0 */ BOOL checkFall();
-    /* 80C23A50 */ void event_proc_call();
-    /* 80C23B0C */ void actionWait();
-    /* 80C23B70 */ void actionOrderEvent();
-    /* 80C23C1C */ void actionEvent();
-    /* 80C23CA0 */ void actionDead();
+    static void PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
+    void initBaseMtx();
+    void setBaseMtx();
+    u16 getPointNo();
+    void loadCurrentPos();
+    int saveCurrentPos();
+    void enablePushPull();
+    void disablePushPull();
+    int create1st();
+    int checkWalk();
+    void clrCounter();
+    void mode_proc_call();
+    void mode_init_wait();
+    void mode_proc_wait();
+    void mode_init_walk();
+    void mode_proc_walk();
+    void setEffect();
+    int checkWallPre(s16);
+    int checkBgHit();
+    void bgCheck();
+    void init_bgCheck();
+    BOOL checkFall();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
 
-    /* 80C22618 */ virtual int CreateHeap();
-    /* 80C22298 */ virtual int Create();
-    /* 80C228B4 */ virtual int Execute(Mtx**);
-    /* 80C23CA4 */ virtual int Draw();
-    /* 80C23DA8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     int getPathId() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_iceleaf.h b/include/d/actor/d_a_obj_iceleaf.h
index 5f0a7bea18..da79be5bc5 100644
--- a/include/d/actor/d_a_obj_iceleaf.h
+++ b/include/d/actor/d_a_obj_iceleaf.h
@@ -29,26 +29,26 @@ public:
         ACT_DEAD_e,
     };
 
-    /* 80C24738 */ void initBaseMtx();
-    /* 80C24774 */ void setBaseMtx();
-    /* 80C249E4 */ int Create();
-    /* 80C24BC4 */ void setAnmPos();
-    /* 80C24C9C */ int CreateHeap();
-    /* 80C24E14 */ int create();
-    /* 80C25158 */ int execute();
-    /* 80C25360 */ void action();
-    /* 80C2541C */ void modeDropWait();
-    /* 80C25614 */ void modeDrop();
-    /* 80C258F8 */ void modePlayerWait();
-    /* 80C25904 */ void modeRide();
-    /* 80C25908 */ void event_proc_call();
-    /* 80C259C4 */ void actionWait();
-    /* 80C259C8 */ void actionOrderEvent();
-    /* 80C25A68 */ void actionEvent();
-    /* 80C25AC4 */ void actionDead();
-    /* 80C25AC8 */ void setFallSE();
-    /* 80C25BB8 */ int draw();
-    /* 80C25C50 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    void setAnmPos();
+    int CreateHeap();
+    int create();
+    int execute();
+    void action();
+    void modeDropWait();
+    void modeDrop();
+    void modePlayerWait();
+    void modeRide();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    void setFallSE();
+    int draw();
+    int _delete();
 
     void offRide() { mRide = false; }
     void onRide() { mRide = true; }
diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h
index 8d69c8e97e..cf8170e2b6 100644
--- a/include/d/actor/d_a_obj_ikada.h
+++ b/include/d/actor/d_a_obj_ikada.h
@@ -16,15 +16,15 @@
 
 class daObjIkada_c : public dBgS_MoveBgActor {
 public:
-    /* 80C269B8 */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80C26A20 */ BOOL Check_RideOn();
-    /* 80C26C50 */ void initBaseMtx();
-    /* 80C26C7C */ void setBaseMtx();
-    /* 80C27028 */ inline int CreateHeap();
-    /* 80C270A0 */ inline int Create();
-    /* 80C270E0 */ inline int Execute(Mtx**);
-    /* 80C27400 */ inline int Draw();
-    /* 80C274A4 */ inline int Delete();
+    void RideOn_Angle(s16&, f32, s16, f32);
+    BOOL Check_RideOn();
+    void initBaseMtx();
+    void setBaseMtx();
+    inline int CreateHeap();
+    inline int Create();
+    inline int Execute(Mtx**);
+    inline int Draw();
+    inline int Delete();
 
     inline cPhs__Step create();
 
diff --git a/include/d/actor/d_a_obj_inobone.h b/include/d/actor/d_a_obj_inobone.h
index 2d750cbc18..c145085ac6 100644
--- a/include/d/actor/d_a_obj_inobone.h
+++ b/include/d/actor/d_a_obj_inobone.h
@@ -14,15 +14,15 @@
  */
 class daObjIBone_c : public fopAc_ac_c {
 public:
-    /* 80C27830 */ void initBaseMtx();
-    /* 80C2786C */ void setBaseMtx();
-    /* 80C278CC */ int Create();
-    /* 80C279A8 */ int CreateHeap();
-    /* 80C27A20 */ int create();
-    /* 80C27C4C */ int execute();
-    /* 80C27E48 */ void setBreakEffect();
-    /* 80C27FEC */ int draw();
-    /* 80C28050 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void setBreakEffect();
+    int draw();
+    int _delete();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ J3DModel* mpModel;
diff --git a/include/d/actor/d_a_obj_ita.h b/include/d/actor/d_a_obj_ita.h
index 379473df1c..c597e1615f 100644
--- a/include/d/actor/d_a_obj_ita.h
+++ b/include/d/actor/d_a_obj_ita.h
@@ -16,16 +16,16 @@
 
 class daObjIta_c : public dBgS_MoveBgActor {
 public:
-    /* 80C283AC */ void Search_Ymb();
-    /* 80C28674 */ BOOL Check_RideOn();
-    /* 80C28788 */ void initBaseMtx();
-    /* 80C287B4 */ void setBaseMtx();
-    /* 80C28928 */ inline cPhs__Step create();
-    /* 80C28BB0 */ inline int CreateHeap();
-    /* 80C28C28 */ inline int Create();
-    /* 80C28C70 */ inline int Execute(Mtx**);
-    /* 80C290AC */ inline int Draw();
-    /* 80C29150 */ inline int Delete();
+    void Search_Ymb();
+    BOOL Check_RideOn();
+    void initBaseMtx();
+    void setBaseMtx();
+    inline cPhs__Step create();
+    inline int CreateHeap();
+    inline int Create();
+    inline int Execute(Mtx**);
+    inline int Draw();
+    inline int Delete();
     
     f32 dummy2();
 
diff --git a/include/d/actor/d_a_obj_itamato.h b/include/d/actor/d_a_obj_itamato.h
index 23d6204617..a2a646a806 100644
--- a/include/d/actor/d_a_obj_itamato.h
+++ b/include/d/actor/d_a_obj_itamato.h
@@ -47,20 +47,20 @@ private:
 
 public:
     daObj_ItaMato_c() {}
-    /* 80C294EC */ virtual ~daObj_ItaMato_c();
-    /* 80C2971C */ cPhs__Step create();
-    /* 80C29CD8 */ int CreateHeap();
-    /* 80C29DAC */ int Delete();
-    /* 80C29DE0 */ int Execute();
-    /* 80C2A44C */ int Draw();
-    /* 80C2A5D0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80C2A5F0 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
-    /* 80C2A620 */ const char* getResName();
-    /* 80C2A630 */ void setSwayParam(fopAc_ac_c*);
-    /* 80C2A7C4 */ void setPrtcls();
-    /* 80C2A890 */ void setEnvTevColor();
-    /* 80C2A8EC */ void setRoomNo();
-    /* 80C2A930 */ void setMtx();
+    virtual ~daObj_ItaMato_c();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
+    const char* getResName();
+    void setSwayParam(fopAc_ac_c*);
+    void setPrtcls();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 
     u8 getBitSW2() { return (fopAcM_GetParam(this) & 0xFF0000) >> 16; }
 
diff --git a/include/d/actor/d_a_obj_ito.h b/include/d/actor/d_a_obj_ito.h
index 58e05ec3aa..6abec91397 100644
--- a/include/d/actor/d_a_obj_ito.h
+++ b/include/d/actor/d_a_obj_ito.h
@@ -60,8 +60,8 @@ STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
 
 class daObj_Ito_HIO_c {
 public:
-    /* 8047B2EC */ daObj_Ito_HIO_c();
-    /* 8047D778 */ virtual ~daObj_Ito_HIO_c() {}
+    daObj_Ito_HIO_c();
+    virtual ~daObj_Ito_HIO_c() {}
 
     /* ぶら下りＯＢＪ糸 */
     /* 0x04 */ s8 field_0x4;
diff --git a/include/d/actor/d_a_obj_kabuto.h b/include/d/actor/d_a_obj_kabuto.h
index ff02cd6ad8..7e41a20467 100644
--- a/include/d/actor/d_a_obj_kabuto.h
+++ b/include/d/actor/d_a_obj_kabuto.h
@@ -24,27 +24,27 @@ public:
         /* 2 */ ACT_WALK,
     };
 
-    /* 80C2AEA4 */ void InitCcSph();
-    /* 80C2AF10 */ void SetCcSph();
-    /* 80C2AF88 */ int CreateHeap();
-    /* 80C2B36C */ void ShopWaitAction();
-    /* 80C2B4D4 */ void WaitAction();
-    /* 80C2B618 */ BOOL WallCheck();
-    /* 80C2B88C */ void SpeedSet();
-    /* 80C2B998 */ void WallWalk();
-    /* 80C2BDE8 */ void WalkAction();
-    /* 80C2BFE8 */ void MoveAction();
-    /* 80C2C7C8 */ void Z_BufferChk();
-    /* 80C2C944 */ void Action();
-    /* 80C2CA08 */ void ShopAction();
-    /* 80C2CAC4 */ void Insect_Release();
-    /* 80C2CADC */ void ParticleSet();
-    /* 80C2CC18 */ int Execute();
-    /* 80C2D21C */ void ObjHit();
-    /* 80C2D3A4 */ int Delete();
-    /* 80C2D40C */ void setBaseMtx();
-    /* 80C2D578 */ bool CreateChk();
-    /* 80C2D724 */ cPhs__Step create();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void ShopWaitAction();
+    void WaitAction();
+    BOOL WallCheck();
+    void SpeedSet();
+    void WallWalk();
+    void WalkAction();
+    void MoveAction();
+    void Z_BufferChk();
+    void Action();
+    void ShopAction();
+    void Insect_Release();
+    void ParticleSet();
+    int Execute();
+    void ObjHit();
+    int Delete();
+    void setBaseMtx();
+    bool CreateChk();
+    cPhs__Step create();
     inline int Draw();
 
 private:
@@ -86,8 +86,8 @@ STATIC_ASSERT(sizeof(daObjKABUTO_c) == 0xA14);
 
 class daObj_KabHIO_c {
 public:
-    /* 80C2AE6C */ daObj_KabHIO_c();
-    /* 80C2E068 */ virtual ~daObj_KabHIO_c() {}
+    daObj_KabHIO_c();
+    virtual ~daObj_KabHIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_kag.h b/include/d/actor/d_a_obj_kag.h
index 19d29d023b..34192a871d 100644
--- a/include/d/actor/d_a_obj_kag.h
+++ b/include/d/actor/d_a_obj_kag.h
@@ -20,23 +20,23 @@ class daObjKAG_c : public dInsect_c {
 public:
     typedef void (daObjKAG_c::*actionFunc)();
 
-    /* 80C2E434 */ void setAction(actionFunc);
-    /* 80C2E7A0 */ bool Kag_Bgcheck(cXyz*, csXyz*, cXyz*);
-    /* 80C2EA40 */ void fly();
-    /* 80C2F764 */ void wait();
-    /* 80C2F8C4 */ void walk();
-    /* 80C2FD94 */ void bin_wait();
-    /* 80C2FF10 */ void bin_action();
-    /* 80C30070 */ void hook();
-    /* 80C30274 */ void boomerang();
-    /* 80C303C4 */ void action();
-    /* 80C30424 */ void checkGroundPos();
-    /* 80C30498 */ void hit_check();
-    /* 80C3054C */ int execute();
-    /* 80C306EC */ int _delete();
-    /* 80C30754 */ void setBaseMtx();
-    /* 80C308F0 */ cPhs__Step create();
-    /* 80C30E54 */ void kag_setParticle();
+    void setAction(actionFunc);
+    bool Kag_Bgcheck(cXyz*, csXyz*, cXyz*);
+    void fly();
+    void wait();
+    void walk();
+    void bin_wait();
+    void bin_action();
+    void hook();
+    void boomerang();
+    void action();
+    void checkGroundPos();
+    void hit_check();
+    int execute();
+    int _delete();
+    void setBaseMtx();
+    cPhs__Step create();
+    void kag_setParticle();
     inline int CreateHeap();
     inline int draw();
 private:
diff --git a/include/d/actor/d_a_obj_kago.h b/include/d/actor/d_a_obj_kago.h
index 7cd15610ba..0ffa07fd61 100644
--- a/include/d/actor/d_a_obj_kago.h
+++ b/include/d/actor/d_a_obj_kago.h
@@ -16,22 +16,22 @@
  */
 class daObj_Kago_c : public fopAc_ac_c {
 public:
-    /* 80C31D5C */ cPhs__Step create();
-    /* 80C323D0 */ int CreateHeap();
-    /* 80C324B0 */ int Delete();
-    /* 80C324E4 */ int Execute();
-    /* 80C332D0 */ int Draw();
-    /* 80C333F0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80C33410 */ BOOL isDelete();
-    /* 80C334B4 */ void setEnvTevColor();
-    /* 80C33510 */ void setRoomNo();
-    /* 80C33554 */ void reset();
-    /* 80C3359C */ void setMtx();
-    /* 80C33620 */ int getWallAngle(s16, s16*);
-    /* 80C337B0 */ void setGoalPosAndAngle();
-    /* 80C338D0 */ void setSmokePrtcl();
-    /* 80C33958 */ void setWaterPrtcl();
-    /* 80C33A58 */ void setHamonPrtcl();
+    cPhs__Step create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    BOOL isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void reset();
+    void setMtx();
+    int getWallAngle(s16, s16*);
+    void setGoalPosAndAngle();
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
 
     u8 getType() {
         int iVar1 = fopAcM_GetParam(this) & 0xFF;
@@ -134,14 +134,14 @@ private:
     /* 0xBA2 */ u8 field_0xba2;
     /* 0xBA3 */ u8 field_0xba3;
     // vtable
-    /* 80C31AEC */ virtual ~daObj_Kago_c();
+    virtual ~daObj_Kago_c();
 };
 
 STATIC_ASSERT(sizeof(daObj_Kago_c) == 0xba8);
 
 class daObj_Kago_Param_c {
 public:
-    /* 80C33C14 */ virtual ~daObj_Kago_Param_c() {}
+    virtual ~daObj_Kago_Param_c() {}
 
     struct Data {
         /* 0x00 */ f32 field_0x00;
diff --git a/include/d/actor/d_a_obj_kaisou.h b/include/d/actor/d_a_obj_kaisou.h
index b0e73fe0eb..53bde7d1a6 100644
--- a/include/d/actor/d_a_obj_kaisou.h
+++ b/include/d/actor/d_a_obj_kaisou.h
@@ -17,14 +17,14 @@
 
 class daObjKaisou_c : public fopAc_ac_c {
 public:
-    /* 80C34058 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80C34390 */ void initCcCylinder();
-    /* 80C343F0 */ void setCcCylinder();
-    /* 80C34438 */ void ObjHit();
-    /* 80C34824 */ int Execute();
-    /* 80C34A98 */ int Delete();
-    /* 80C34ACC */ void setBaseMtx();
-    /* 80C34BD8 */ cPhs__Step create();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    void initCcCylinder();
+    void setCcCylinder();
+    void ObjHit();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
+    cPhs__Step create();
     inline int CreateHeap();
     inline int Draw();
 
diff --git a/include/d/actor/d_a_obj_kamakiri.h b/include/d/actor/d_a_obj_kamakiri.h
index a455de44f6..fb4bb124d4 100644
--- a/include/d/actor/d_a_obj_kamakiri.h
+++ b/include/d/actor/d_a_obj_kamakiri.h
@@ -17,26 +17,26 @@
  */
 class daObjKAM_c : public dInsect_c {
 public:
-    /* 80C351BC */ void InitCcSph();
-    /* 80C35228 */ void SetCcSph();
-    /* 80C352A0 */ int CreateHeap();
-    /* 80C35684 */ void ShopWaitAction();
-    /* 80C357EC */ void WaitAction();
-    /* 80C35970 */ int WallCheck();
-    /* 80C35BE4 */ void SpeedSet();
-    /* 80C35CF0 */ void WallWalk();
-    /* 80C36138 */ void WalkAction();
-    /* 80C36338 */ void MoveAction();
-    /* 80C36B20 */ void Action();
-    /* 80C36BE4 */ void ShopAction();
-    /* 80C36CA0 */ void Insect_Release();
-    /* 80C36CB8 */ void Z_BufferChk();
-    /* 80C36E34 */ void ParticleSet();
-    /* 80C36F58 */ void BoomChk();
-    /* 80C37324 */ void ObjHit();
-    /* 80C374AC */ int Execute();
-    /* 80C37724 */ int Delete();
-    /* 80C3778C */ void setBaseMtx();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void ShopWaitAction();
+    void WaitAction();
+    int WallCheck();
+    void SpeedSet();
+    void WallWalk();
+    void WalkAction();
+    void MoveAction();
+    void Action();
+    void ShopAction();
+    void Insect_Release();
+    void Z_BufferChk();
+    void ParticleSet();
+    void BoomChk();
+    void ObjHit();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
     int Draw() {
         if (mDraw != 0) {
             Z_BufferChk();
@@ -53,8 +53,8 @@ public:
         }
         return 1;
     }
-    /* 80C378F4 */ u8 CreateChk();
-    /* 80C37AA0 */ int create();
+    u8 CreateChk();
+    int create();
 
 private:
     /* 0x590 */ dCcD_Stts mStts;
@@ -95,8 +95,8 @@ STATIC_ASSERT(sizeof(daObjKAM_c) == 0xa68);
 
 class daObj_KamHIO_c : public JORReflexible {
 public:
-    /* 80C3518C */ daObj_KamHIO_c();
-    /* 80C38360 */ virtual ~daObj_KamHIO_c() {}
+    daObj_KamHIO_c();
+    virtual ~daObj_KamHIO_c() {}
     void genMessage(JORMContext* context) {
         // Golden insect (stag beetle)
         context->genLabel("黄金蟲(カブト)", 0x80000001, 0, NULL, -1, -1, 0x200, 0x18);
diff --git a/include/d/actor/d_a_obj_kanban2.h b/include/d/actor/d_a_obj_kanban2.h
index ee66c423fd..eafdad7e15 100644
--- a/include/d/actor/d_a_obj_kanban2.h
+++ b/include/d/actor/d_a_obj_kanban2.h
@@ -17,38 +17,38 @@
  */
 class daObj_Kanban2_c : public fopAc_ac_c {
 public:
-    /* 80581790 */ int draw();
-    /* 80581938 */ void setKanbanSE(int);
-    /* 805819BC */ void createBreakParts(u32, csXyz);
-    /* 805819FC */ void createWallHitBreak();
-    /* 80581B5C */ int getKanbanCutType();
-    /* 80581C48 */ int getKanbanWolfCutType();
-    /* 80581D04 */ void damage_check();
-    /* 8058221C */ bool float_damage_check();
-    /* 805822F0 */ bool deletePart();
-    /* 805825A4 */ s16 getWallAngle();
-    /* 8058271C */ void setGroundAngle();
-    /* 80582894 */ bool checkWaterSurface();
-    /* 80582944 */ bool checkPataGround(s16, s16);
-    /* 80582A68 */ void setCullMtx();
-    /* 80582AAC */ void setSmokeEffect(cXyz);
-    /* 80582AFC */ void setWaterEffect();
-    /* 80582C40 */ void setCenterPos();
-    /* 80582E68 */ BOOL checkCarryOn();
-    /* 80582EF0 */ void setActionMode(int, int);
-    /* 80582F40 */ void calcNormalSwing();
-    /* 80583364 */ void executeNormal();
-    /* 80583598 */ void initPart();
-    /* 80583A2C */ void executePart();
-    /* 8058437C */ void executeFloat();
-    /* 80584884 */ void executeCarry();
-    /* 805849CC */ void action();
-    /* 80584AD8 */ void mtx_set();
-    /* 80584CFC */ void cc_set();
-    /* 80584DF0 */ int execute();
-    /* 80584ED8 */ int _delete();
-    /* 80584F64 */ int CreateHeap();
-    /* 805850E8 */ int create();
+    int draw();
+    void setKanbanSE(int);
+    void createBreakParts(u32, csXyz);
+    void createWallHitBreak();
+    int getKanbanCutType();
+    int getKanbanWolfCutType();
+    void damage_check();
+    bool float_damage_check();
+    bool deletePart();
+    s16 getWallAngle();
+    void setGroundAngle();
+    bool checkWaterSurface();
+    bool checkPataGround(s16, s16);
+    void setCullMtx();
+    void setSmokeEffect(cXyz);
+    void setWaterEffect();
+    void setCenterPos();
+    BOOL checkCarryOn();
+    void setActionMode(int, int);
+    void calcNormalSwing();
+    void executeNormal();
+    void initPart();
+    void executePart();
+    void executeFloat();
+    void executeCarry();
+    void action();
+    void mtx_set();
+    void cc_set();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ J3DModel* mpModel;
@@ -98,8 +98,8 @@ STATIC_ASSERT(sizeof(daObj_Kanban2_c) == 0xa50);
 
 class daObj_Kanban2_HIO_c : public JORReflexible {
 public:
-    /* 8058176C */ daObj_Kanban2_HIO_c();
-    /* 80585578 */ virtual ~daObj_Kanban2_HIO_c() {}
+    daObj_Kanban2_HIO_c();
+    virtual ~daObj_Kanban2_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_kantera.h b/include/d/actor/d_a_obj_kantera.h
index c0b88d02c2..0228b51fd5 100644
--- a/include/d/actor/d_a_obj_kantera.h
+++ b/include/d/actor/d_a_obj_kantera.h
@@ -15,21 +15,21 @@ class daItemKantera_c : public daItemBase_c {
 public:
     typedef int (daItemKantera_c::*actionFunc)();
 
-    /* 80C389BC */ void initBaseMtx();
-    /* 80C389F8 */ void setBaseMtx();
-    /* 80C38A64 */ int Create();
-    /* 80C38BA8 */ int __CreateHeap();
-    /* 80C38BB0 */ int create();
-    /* 80C38F78 */ void bg_check();
-    /* 80C39068 */ int actionInit();
-    /* 80C390A0 */ int actionWaitInit();
-    /* 80C3911C */ int actionWait();
-    /* 80C39234 */ int initActionOrderGetDemo();
-    /* 80C392D0 */ int actionOrderGetDemo();
-    /* 80C3934C */ int actionGetDemo();
-    /* 80C393B0 */ int execute();
-    /* 80C394DC */ int draw();
-    /* 80C39530 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int __CreateHeap();
+    int create();
+    void bg_check();
+    int actionInit();
+    int actionWaitInit();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    int execute();
+    int draw();
+    int _delete();
 
     void setStatus(u8 i_status) { mStatus = i_status; }
 
diff --git a/include/d/actor/d_a_obj_katatsumuri.h b/include/d/actor/d_a_obj_katatsumuri.h
index f15b9e1834..dd1aa1e734 100644
--- a/include/d/actor/d_a_obj_katatsumuri.h
+++ b/include/d/actor/d_a_obj_katatsumuri.h
@@ -17,24 +17,24 @@
  */
 class daObjKAT_c : public dInsect_c {
 public:
-    /* 80C39994 */ void InitCcSph();
-    /* 80C39A00 */ void SetCcSph();
-    /* 80C39A58 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80C39B98 */ int CreateHeap();
-    /* 80C39F0C */ void WallWalk();
-    /* 80C3A4D8 */ void MoveAction();
-    /* 80C3A628 */ void Action();
-    /* 80C3A680 */ void Insect_Release();
-    /* 80C3A698 */ void checkGround();
-    /* 80C3A8C8 */ void F_MoveAction();
-    /* 80C3A95C */ void FallAction();
-    /* 80C3A990 */ void ParticleSet();
-    /* 80C3AAB4 */ void BoomChk();
-    /* 80C3ADC8 */ void ObjHit();
-    /* 80C3AEC8 */ int Execute();
-    /* 80C3B754 */ void Z_BufferChk();
-    /* 80C3B8D0 */ int Delete();
-    /* 80C3B938 */ void setBaseMtx();
+    void InitCcSph();
+    void SetCcSph();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    int CreateHeap();
+    void WallWalk();
+    void MoveAction();
+    void Action();
+    void Insect_Release();
+    void checkGround();
+    void F_MoveAction();
+    void FallAction();
+    void ParticleSet();
+    void BoomChk();
+    void ObjHit();
+    int Execute();
+    void Z_BufferChk();
+    int Delete();
+    void setBaseMtx();
     int Draw() {
         if (mDraw) {
             Z_BufferChk();
@@ -52,8 +52,8 @@ public:
         }
         return 1;
     }
-    /* 80C3BAAC */ bool CreateChk();
-    /* 80C3BC58 */ int create();
+    bool CreateChk();
+    int create();
 
 private:
     /* 0x590 */ dBgS_ObjAcch mAcch;
@@ -95,8 +95,8 @@ STATIC_ASSERT(sizeof(daObjKAT_c) == 0xa74);
 
 class daObj_KatHIO_c : public JORReflexible {
 public:
-    /* 80C3996C */ daObj_KatHIO_c();
-    /* 80C3C5CC */ virtual ~daObj_KatHIO_c() {}
+    daObj_KatHIO_c();
+    virtual ~daObj_KatHIO_c() {}
 
     void genMessage(JORMContext* ctx) {
         // Golden Snail
diff --git a/include/d/actor/d_a_obj_kazeneko.h b/include/d/actor/d_a_obj_kazeneko.h
index 0cc6a60d32..3ac12b40f3 100644
--- a/include/d/actor/d_a_obj_kazeneko.h
+++ b/include/d/actor/d_a_obj_kazeneko.h
@@ -30,13 +30,13 @@ struct KazoNekoAttr {
  */
 class daObjKazeNeko_c : public fopAc_ac_c {
 public:
-    /* 80C3C8D8 */ void create_init();
-    /* 80C3C968 */ void initBaseMtx();
-    /* 80C3C988 */ void setBaseMtx();
-    /* 80C3CA8C */ void initCcCylinder();
-    /* 80C3CB10 */ void setCcCylinder();
-    /* 80C3CB7C */ void swingHead();
-    /* 80C3CC40 */ void getFirstVec(cXyz*, int);
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void initCcCylinder();
+    void setCcCylinder();
+    void swingHead();
+    void getFirstVec(cXyz*, int);
     inline int createHeap();
     inline int draw();
     inline int execute();
diff --git a/include/d/actor/d_a_obj_kbacket.h b/include/d/actor/d_a_obj_kbacket.h
index f389534703..7ffce33504 100644
--- a/include/d/actor/d_a_obj_kbacket.h
+++ b/include/d/actor/d_a_obj_kbacket.h
@@ -36,7 +36,7 @@ public:
 
 class daObj_KBacket_Param_c {
 public:
-    /* 80587D18 */ virtual ~daObj_KBacket_Param_c() {}
+    virtual ~daObj_KBacket_Param_c() {}
 
     static const daObj_KBacket_HIOParam m;
 };
@@ -94,8 +94,8 @@ public:
     /* 0xA4B */ u8 field_0xa4b;
     /* 0xA4C */ u8 field_0xa4c[0xa50 - 0xa4c];
 
-    /* 80585E4C */ virtual ~daObj_KBacket_c();
-    /* 80586048 */ int create();
+    virtual ~daObj_KBacket_c();
+    int create();
     int setLaunchParam(float param_0, float param_1, short param_2) {
         float fVar2;
 
@@ -125,20 +125,20 @@ public:
             return 0;
         }
     }
-    /* 80586604 */ int CreateHeap();
-    /* 80586704 */ int Delete();
-    /* 80586738 */ int Execute();
-    /* 8058742C */ int Draw();
-    /* 805875A0 */ static void createHeapCallBack(fopAc_ac_c*);
-    /* 805875C0 */ void setEnvTevColor();
-    /* 8058761C */ void setRoomNo();
-    /* 80587660 */ void reset();
-    /* 80587694 */ void setMtx();
-    /* 805877C4 */ s16 calcRollAngle(s16, int);
-    /* 80587864 */ int getWallAngle(s16, s16*);
-    /* 805879F4 */ void setSmokePrtcl();
-    /* 80587A70 */ void setWaterPrtcl();
-    /* 80587B68 */ void setHamonPrtcl();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static void createHeapCallBack(fopAc_ac_c*);
+    void setEnvTevColor();
+    void setRoomNo();
+    void reset();
+    void setMtx();
+    s16 calcRollAngle(s16, int);
+    int getWallAngle(s16, s16*);
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
 };
 
 STATIC_ASSERT(sizeof(daObj_KBacket_c) == 0xa54);
diff --git a/include/d/actor/d_a_obj_kbox.h b/include/d/actor/d_a_obj_kbox.h
index a36ffe435c..e0b8f5c46c 100644
--- a/include/d/actor/d_a_obj_kbox.h
+++ b/include/d/actor/d_a_obj_kbox.h
@@ -59,8 +59,8 @@ STATIC_ASSERT(sizeof(obj_kbox_class) == 0x9f0);
 
 class daObj_Kbox_HIO_c : public JORReflexible {
 public:
-    /* 80C3D60C */ daObj_Kbox_HIO_c();
-    /* 80C3EF98 */ virtual ~daObj_Kbox_HIO_c() {}
+    daObj_Kbox_HIO_c();
+    virtual ~daObj_Kbox_HIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x04 */ s8 mId;
diff --git a/include/d/actor/d_a_obj_keyhole.h b/include/d/actor/d_a_obj_keyhole.h
index 96b83b29d0..423cae4453 100644
--- a/include/d/actor/d_a_obj_keyhole.h
+++ b/include/d/actor/d_a_obj_keyhole.h
@@ -72,8 +72,8 @@ STATIC_ASSERT(sizeof(obj_keyhole_class) == 0x2CB8);
 
 class daObj_Keyhole_HIO_c : public JORReflexible {
 public:
-    /* 80C4124C */ daObj_Keyhole_HIO_c();
-    /* 80C4394C */ virtual ~daObj_Keyhole_HIO_c() {}
+    daObj_Keyhole_HIO_c();
+    virtual ~daObj_Keyhole_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_kgate.h b/include/d/actor/d_a_obj_kgate.h
index 198bb1d8f5..96798028b2 100644
--- a/include/d/actor/d_a_obj_kgate.h
+++ b/include/d/actor/d_a_obj_kgate.h
@@ -15,31 +15,31 @@
  */
 class daObjKGate_c : public dBgS_MoveBgActor {
 public:
-    /* 805880C8 */ void initBaseMtx();
-    /* 8058827C */ void setBaseMtx();
-    /* 80588BF8 */ int create1st();
-    /* 80588D00 */ int checkAreaL(cXyz const*, cXyz const*);
-    /* 805890D4 */ int checkAreaR(cXyz const*, cXyz const*);
-    /* 805894A4 */ BOOL checkOpen();
-    /* 805895D0 */ BOOL checkDirL(fopAc_ac_c*);
-    /* 80589664 */ BOOL checkDirR(fopAc_ac_c*);
-    /* 805896F8 */ void setAtkSE();
-    /* 80589774 */ void setCrkSE();
-    /* 805897F0 */ void action();
-    /* 805898A0 */ void action_typeA();
-    /* 80589F40 */ void action_typeB();
-    /* 8058A1B0 */ void actionWaitEvent();
-    /* 8058A294 */ void actionEvent();
-    /* 8058A2FC */ void actionDead();
-    /* 8058A300 */ void event_proc_call();
-    /* 8058A3A4 */ void demoProc();
-    /* 8058A508 */ int getDemoAction();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    int checkAreaL(cXyz const*, cXyz const*);
+    int checkAreaR(cXyz const*, cXyz const*);
+    BOOL checkOpen();
+    BOOL checkDirL(fopAc_ac_c*);
+    BOOL checkDirR(fopAc_ac_c*);
+    void setAtkSE();
+    void setCrkSE();
+    void action();
+    void action_typeA();
+    void action_typeB();
+    void actionWaitEvent();
+    void actionEvent();
+    void actionDead();
+    void event_proc_call();
+    void demoProc();
+    int getDemoAction();
     
-    /* 805889A4 */ virtual int CreateHeap();
-    /* 805887A0 */ virtual int Create();
-    /* 8058A550 */ virtual int Execute(Mtx**);
-    /* 8058A5B8 */ virtual int Draw();
-    /* 8058A6F4 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_ki.h b/include/d/actor/d_a_obj_ki.h
index 94b17c91ec..f6cc5c146a 100644
--- a/include/d/actor/d_a_obj_ki.h
+++ b/include/d/actor/d_a_obj_ki.h
@@ -6,8 +6,8 @@
 #include "d/d_bg_w.h"
 
 struct sq_cp_s {
-    /* 80C449F8 */ ~sq_cp_s() {}
-    /* 80C44A58 */ sq_cp_s() {}
+    ~sq_cp_s() {}
+    sq_cp_s() {}
 
     /* 0x00 */ cXyz field_0x0[4];
 };
@@ -46,8 +46,8 @@ STATIC_ASSERT(sizeof(obj_ki_class) == 0x670);
 
 class daObj_Ki_HIO_c {
 public:
-    /* 80C43EEC */ daObj_Ki_HIO_c();
-    /* 80C44AA8 */ virtual ~daObj_Ki_HIO_c() {};
+    daObj_Ki_HIO_c();
+    virtual ~daObj_Ki_HIO_c() {};
 
     /* 0x4 */ s8 field_0x4;
     /* 0x5 */ u8 field_0x5;
diff --git a/include/d/actor/d_a_obj_kiPot.h b/include/d/actor/d_a_obj_kiPot.h
index 2b18f00c26..01d7cf76c0 100644
--- a/include/d/actor/d_a_obj_kiPot.h
+++ b/include/d/actor/d_a_obj_kiPot.h
@@ -13,15 +13,15 @@
  */
 class daKiPot_c : public fopAc_ac_c {
 public:
-    /* 80C44D78 */ void setBaseMtx();
-    /* 80C44DD0 */ int create();
-    /* 80C44E7C */ int Execute();
-    /* 80C44EF8 */ void procMain();
-    /* 80C44F74 */ void init_modeWait();
-    /* 80C44F80 */ void modeWait();
-    /* 80C45008 */ s32 chkEvent();
-    /* 80C45058 */ int Draw();
-    /* 80C45060 */ int Delete();
+    void setBaseMtx();
+    int create();
+    int Execute();
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    s32 chkEvent();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x568 */ u8 field_0x568[0x574 - 0x568];
@@ -34,8 +34,8 @@ STATIC_ASSERT(sizeof(daKiPot_c) == 0x578);
 
 class daKiPot_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C44D0C */ daKiPot_HIO_c();
-    /* 80C450E8 */ virtual ~daKiPot_HIO_c() {};
+    daKiPot_HIO_c();
+    virtual ~daKiPot_HIO_c() {};
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_kita.h b/include/d/actor/d_a_obj_kita.h
index d3da726cfd..1e343c78ce 100644
--- a/include/d/actor/d_a_obj_kita.h
+++ b/include/d/actor/d_a_obj_kita.h
@@ -52,8 +52,8 @@ STATIC_ASSERT(sizeof(obj_kita_class) == 0xd78);
 
 class daObj_Kita_HIO_c : public JORReflexible {
 public:
-    /* 80C4534C */ daObj_Kita_HIO_c();
-    /* 80C45E84 */ virtual ~daObj_Kita_HIO_c() {}
+    daObj_Kita_HIO_c();
+    virtual ~daObj_Kita_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_kjgjs.h b/include/d/actor/d_a_obj_kjgjs.h
index 472cc58250..495750bd89 100644
--- a/include/d/actor/d_a_obj_kjgjs.h
+++ b/include/d/actor/d_a_obj_kjgjs.h
@@ -14,14 +14,14 @@
  */
 class daObjKJgjs_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80C46098 */ int create1st();
-    /* 80C4616C */ void setMtx();
-    /* 80C461E4 */ int CreateHeap();
-    /* 80C46264 */ int Create();
-    /* 80C46310 */ int Execute(Mtx**);
-    /* 80C46320 */ int Draw();
-    /* 80C463C4 */ int Delete();
-    /* 80C464CC */ virtual ~daObjKJgjs_c();
+    int create1st();
+    void setMtx();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    virtual ~daObjKJgjs_c();
 
     u32 getType() { return fopAcM_GetParamBit(this, 0, 4); }
 
diff --git a/include/d/actor/d_a_obj_kkanban.h b/include/d/actor/d_a_obj_kkanban.h
index afb28ca199..eb995a06c8 100644
--- a/include/d/actor/d_a_obj_kkanban.h
+++ b/include/d/actor/d_a_obj_kkanban.h
@@ -14,15 +14,15 @@
  */
 class daObjKKanban_c : public dBgS_MoveBgActor {
 public:
-    /* 80C46768 */ void initBaseMtx();
-    /* 80C467A4 */ void setBaseMtx();
-    /* 80C46808 */ int Create();
-    /* 80C46928 */ void setTG();
-    /* 80C469F4 */ int CreateHeap();
-    /* 80C46A64 */ int create1st();
-    /* 80C46AE4 */ int Execute(Mtx**);
-    /* 80C46C1C */ int Draw();
-    /* 80C46CC0 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    void setTG();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     Mtx& getMoveBgMtx() { return mBgMtx; }
 
diff --git a/include/d/actor/d_a_obj_klift00.h b/include/d/actor/d_a_obj_klift00.h
index b81aabc5bb..7c2159fefb 100644
--- a/include/d/actor/d_a_obj_klift00.h
+++ b/include/d/actor/d_a_obj_klift00.h
@@ -16,14 +16,14 @@
  */
 class daObjKLift00_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 8058B02C */ cPhs__Step create1st();
-    /* 8058B0D0 */ void setMtx();
-    /* 8058B4B0 */ void rideActor(fopAc_ac_c*);
-    /* 8058B5EC */ int CreateHeap();
-    /* 8058B77C */ int Create();
-    /* 8058B97C */ int Execute(Mtx**);
-    /* 8058BEEC */ int Draw();
-    /* 8058C014 */ int Delete();
+    cPhs__Step create1st();
+    void setMtx();
+    void rideActor(fopAc_ac_c*);
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     enum Param_e {
         LOCK_e = (1 << 6), NO_BASE_DISP = (1 << 7)
diff --git a/include/d/actor/d_a_obj_knBullet.h b/include/d/actor/d_a_obj_knBullet.h
index 451f903d3e..e8056fbb25 100644
--- a/include/d/actor/d_a_obj_knBullet.h
+++ b/include/d/actor/d_a_obj_knBullet.h
@@ -14,14 +14,14 @@
  */
 class daObjKnBullet_c : public fopAc_ac_c {
 public:
-    /* 80C47118 */ int Create();
-    /* 80C47300 */ int Execute();
-    /* 80C47480 */ int Draw();
-    /* 80C47488 */ int Delete();
-    /* 80C47490 */ void setBaseMtx();
-    /* 80C474E8 */ void col_init();
-    /* 80C47558 */ BOOL col_chk();
-    /* 80C477B4 */ void hitPrtclSet();
+    int Create();
+    int Execute();
+    int Draw();
+    int Delete();
+    void setBaseMtx();
+    void col_init();
+    BOOL col_chk();
+    void hitPrtclSet();
 
     u8 getActionMode() { return mActionMode; }
     void setActionMode(u8 i_action) { mActionMode = i_action; }
diff --git a/include/d/actor/d_a_obj_kshutter.h b/include/d/actor/d_a_obj_kshutter.h
index f30c19417a..642935eb9d 100644
--- a/include/d/actor/d_a_obj_kshutter.h
+++ b/include/d/actor/d_a_obj_kshutter.h
@@ -19,46 +19,46 @@ public:
     typedef void (daObjKshtr_c::*ActionFunc)();
     typedef BOOL (daObjKshtr_c::*DemoFunc)();
 
-    /* 80C47AB8 */ void initBaseMtx();
-    /* 80C47B2C */ void setBaseMtx();
-    /* 80C47C14 */ int Create();
-    /* 80C47E54 */ void offDzb();
-    /* 80C47EA8 */ int CreateHeap();
-    /* 80C48050 */ void initKey();
-    /* 80C48148 */ cPhs__Step phase_0();
-    /* 80C4827C */ cPhs__Step phase_1();
-    /* 80C48320 */ cPhs__Step phase_2();
-    /* 80C48328 */ cPhs__Step create1st();
-    /* 80C483CC */ void event_proc_call();
-    /* 80C48470 */ void event_proc_call2();
-    /* 80C4852C */ int Execute(Mtx**);
-    /* 80C48590 */ BOOL checkArea();
-    /* 80C48708 */ BOOL checkOpen();
-    /* 80C48798 */ int getDemoAction();
-    /* 80C487E0 */ BOOL demoProc2();
-    /* 80C489E0 */ BOOL adjustmentProc();
-    /* 80C48AC8 */ BOOL keyUnlockInit();
-    /* 80C48B84 */ BOOL keyUnlock();
-    /* 80C48BD8 */ BOOL openInit();
-    /* 80C48D0C */ BOOL openProc();
-    /* 80C48D80 */ BOOL openProc_type1();
-    /* 80C48F94 */ BOOL openProc_type2();
-    /* 80C490F8 */ BOOL openProc_typeL3Boss();
-    /* 80C49158 */ void demoProc();
-    /* 80C4925C */ BOOL demoJail1();
-    /* 80C494A8 */ BOOL demoJail2();
-    /* 80C495A4 */ BOOL demoJail11();
-    /* 80C496C8 */ BOOL demoJail21();
-    /* 80C496D0 */ void anmInit();
-    /* 80C497A0 */ void actionWaitEvent();
-    /* 80C49880 */ void actionEvent();
-    /* 80C49914 */ void actionDead();
-    /* 80C49918 */ void actionWaitEvent2();
-    /* 80C499CC */ void actionOpen();
-    /* 80C49A08 */ void actionEvent2();
-    /* 80C49A70 */ void actionDead2();
-    /* 80C49A74 */ int Draw();
-    /* 80C49B4C */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    void offDzb();
+    int CreateHeap();
+    void initKey();
+    cPhs__Step phase_0();
+    cPhs__Step phase_1();
+    cPhs__Step phase_2();
+    cPhs__Step create1st();
+    void event_proc_call();
+    void event_proc_call2();
+    int Execute(Mtx**);
+    BOOL checkArea();
+    BOOL checkOpen();
+    int getDemoAction();
+    BOOL demoProc2();
+    BOOL adjustmentProc();
+    BOOL keyUnlockInit();
+    BOOL keyUnlock();
+    BOOL openInit();
+    BOOL openProc();
+    BOOL openProc_type1();
+    BOOL openProc_type2();
+    BOOL openProc_typeL3Boss();
+    void demoProc();
+    BOOL demoJail1();
+    BOOL demoJail2();
+    BOOL demoJail11();
+    BOOL demoJail21();
+    void anmInit();
+    void actionWaitEvent();
+    void actionEvent();
+    void actionDead();
+    void actionWaitEvent2();
+    void actionOpen();
+    void actionEvent2();
+    void actionDead2();
+    int Draw();
+    int Delete();
     u8 checkKey() { return fopAcM_GetParamBit(this, 31, 1); }
     u8 getEvId() { return fopAcM_GetParamBit(this, 16, 8); }
     u8 getType() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_ktOnFire.h b/include/d/actor/d_a_obj_ktOnFire.h
index 4f8065a69b..bd0e23a82d 100644
--- a/include/d/actor/d_a_obj_ktOnFire.h
+++ b/include/d/actor/d_a_obj_ktOnFire.h
@@ -14,14 +14,14 @@
  */
 class daKtOnFire_c : public fopAc_ac_c {
 public:
-    /* 8058C678 */ void setBaseMtx();
-    /* 8058C6D0 */ int create();
-    /* 8058C960 */ void lightInit();
-    /* 8058C9D4 */ void setLight();
-    /* 8058C9F8 */ void cutLight();
-    /* 8058CA1C */ int Execute();
-    /* 8058CDF8 */ int Draw();
-    /* 8058CE00 */ int Delete();
+    void setBaseMtx();
+    int create();
+    void lightInit();
+    void setLight();
+    void cutLight();
+    int Execute();
+    int Draw();
+    int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
diff --git a/include/d/actor/d_a_obj_kuwagata.h b/include/d/actor/d_a_obj_kuwagata.h
index 370e822f60..9df3f0bc35 100644
--- a/include/d/actor/d_a_obj_kuwagata.h
+++ b/include/d/actor/d_a_obj_kuwagata.h
@@ -23,28 +23,28 @@ public:
         /* 2 */ ACTION_WALK,
     };
 
-    /* 80C4A21C */ void InitCcSph();
-    /* 80C4A288 */ void SetCcSph();
-    /* 80C4A300 */ int CreateHeap();
-    /* 80C4A6E4 */ void ShopWaitAction();
-    /* 80C4A84C */ void WaitAction();
-    /* 80C4A9D0 */ BOOL WallCheck();
-    /* 80C4AC44 */ void SpeedSet();
-    /* 80C4AD50 */ void WallWalk();
-    /* 80C4B1A0 */ void WalkAction();
-    /* 80C4B3A0 */ void MoveAction();
-    /* 80C4BB88 */ void Action();
-    /* 80C4BC4C */ void ShopAction();
-    /* 80C4BD08 */ void Insect_Release();
-    /* 80C4BD20 */ void Z_BufferChk();
-    /* 80C4BE9C */ void ParticleSet();
-    /* 80C4BFC0 */ void BoomChk();
-    /* 80C4C38C */ void ObjHit();
-    /* 80C4C514 */ int Execute();
-    /* 80C4C78C */ int Delete();
-    /* 80C4C7F4 */ void setBaseMtx();
-    /* 80C4C95C */ bool CreateChk();
-    /* 80C4CB08 */ int create();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void ShopWaitAction();
+    void WaitAction();
+    BOOL WallCheck();
+    void SpeedSet();
+    void WallWalk();
+    void WalkAction();
+    void MoveAction();
+    void Action();
+    void ShopAction();
+    void Insect_Release();
+    void Z_BufferChk();
+    void ParticleSet();
+    void BoomChk();
+    void ObjHit();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
+    bool CreateChk();
+    int create();
     inline int Draw();
 
 private:
diff --git a/include/d/actor/d_a_obj_kwheel00.h b/include/d/actor/d_a_obj_kwheel00.h
index 02d749491f..ceaf132fd6 100644
--- a/include/d/actor/d_a_obj_kwheel00.h
+++ b/include/d/actor/d_a_obj_kwheel00.h
@@ -22,14 +22,14 @@ public:
     daObjKWheel00_c() : dEvLib_callback_c(this) {}
     ~daObjKWheel00_c() {}
 
-    /* 80C4D6F8 */ int create1st();
-    /* 80C4D86C */ void setMtx();
-    /* 80C4D9B8 */ int CreateHeap();
-    /* 80C4DA38 */ int Create();
-    /* 80C4DBBC */ int Execute(Mtx**);
-    /* 80C4E1B0 */ int Draw();
-    /* 80C4E254 */ int Delete();
-    /* 80C4E298 */ bool eventStart();
+    int create1st();
+    void setMtx();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    bool eventStart();
 
     int getSwNo() {
         return fopAcM_GetParamBit(this, 0, 8);
diff --git a/include/d/actor/d_a_obj_kwheel01.h b/include/d/actor/d_a_obj_kwheel01.h
index 5a890cfdbc..2fab8a4982 100644
--- a/include/d/actor/d_a_obj_kwheel01.h
+++ b/include/d/actor/d_a_obj_kwheel01.h
@@ -18,14 +18,14 @@ public:
     daObjKWheel01_c() : dEvLib_callback_c(this) {}
     ~daObjKWheel01_c() {};
 
-    /* 80C4EA78 */ cPhs__Step create1st();
-    /* 80C4EC54 */ void setMtx();
-    /* 80C4EDCC */ int CreateHeap();
-    /* 80C4EF38 */ int Create();
-    /* 80C4F048 */ int Execute(Mtx**);
-    /* 80C4F344 */ int Draw();
-    /* 80C4F3E8 */ int Delete();
-    /* 80C4F498 */ bool eventStart();
+    cPhs__Step create1st();
+    void setMtx();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    bool eventStart();
 
 private:
     /* 0x5B8 */ Mtx mNewBgMtx;
diff --git a/include/d/actor/d_a_obj_kznkarm.h b/include/d/actor/d_a_obj_kznkarm.h
index 376d02b37e..343285f8f8 100644
--- a/include/d/actor/d_a_obj_kznkarm.h
+++ b/include/d/actor/d_a_obj_kznkarm.h
@@ -37,21 +37,21 @@ public:
 
     typedef void (daObjKznkarm_c::*actionFunc)();
     
-    /* 80C4F858 */ void setAction(daObjKznkarm_c::Mode_e);
-    /* 80C4F88C */ void callInit();
-    /* 80C4F8B4 */ void callExecute();
-    /* 80C4F8E0 */ void initBroken();
-    /* 80C4F960 */ void executeBroken();
-    /* 80C4FBBC */ void initCarry();
-    /* 80C4FBEC */ void executeCarry();
-    /* 80C4FD18 */ void initThrow();
-    /* 80C4FDB4 */ void executeThrow();
-    /* 80C50488 */ void initStay();
-    /* 80C50504 */ void executeStay();
-    /* 80C505F8 */ void create_init();
-    /* 80C506DC */ void initBaseMtx();
-    /* 80C50708 */ void setBaseMtx();
-    /* 80C5076C */ s16 getGroundSlope(s16);
+    void setAction(daObjKznkarm_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initBroken();
+    void executeBroken();
+    void initCarry();
+    void executeCarry();
+    void initThrow();
+    void executeThrow();
+    void initStay();
+    void executeStay();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    s16 getGroundSlope(s16);
 
     inline int createHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_ladder.h b/include/d/actor/d_a_obj_ladder.h
index d51fdf2b77..ff3a376eaf 100644
--- a/include/d/actor/d_a_obj_ladder.h
+++ b/include/d/actor/d_a_obj_ladder.h
@@ -41,26 +41,26 @@ namespace daObjLadder {
 
         typedef void (Act_c::*modeProc)();
 
-        /* 8058D158 */ int CreateHeap();
-        /* 8058D1D8 */ int Create();
-        /* 8058D378 */ int Mthd_Create();
-        /* 8058D4F0 */ int Delete();
-        /* 8058D4F8 */ int Mthd_Delete();
-        /* 8058D544 */ void demo_end_reset();
-        /* 8058D5AC */ void mode_wait_init();
-        /* 8058D5B8 */ void mode_wait();
-        /* 8058D614 */ void mode_demoreq_init();
-        /* 8058D628 */ void mode_demoreq();
-        /* 8058D6E8 */ void mode_vib_init();
-        /* 8058D710 */ void mode_vib();
-        /* 8058D7A8 */ void mode_drop_init();
-        /* 8058D7EC */ void mode_drop();
-        /* 8058D9C0 */ void mode_fell_init();
-        /* 8058D9CC */ void mode_fell();
-        /* 8058D9D0 */ void set_mtx();
-        /* 8058DA64 */ void init_mtx();
-        /* 8058DAA0 */ int Execute(Mtx**);
-        /* 8058DBB8 */ int Draw();
+        int CreateHeap();
+        int Create();
+        int Mthd_Create();
+        int Delete();
+        int Mthd_Delete();
+        void demo_end_reset();
+        void mode_wait_init();
+        void mode_wait();
+        void mode_demoreq_init();
+        void mode_demoreq();
+        void mode_vib_init();
+        void mode_vib();
+        void mode_drop_init();
+        void mode_drop();
+        void mode_fell_init();
+        void mode_fell();
+        void set_mtx();
+        void init_mtx();
+        int Execute(Mtx**);
+        int Draw();
 
         u8 prm_get_evId() {
             return daObj::PrmAbstract(this, PRM_8, PRM_16);
diff --git a/include/d/actor/d_a_obj_laundry.h b/include/d/actor/d_a_obj_laundry.h
index 85fda6916a..7d50dfa28e 100644
--- a/include/d/actor/d_a_obj_laundry.h
+++ b/include/d/actor/d_a_obj_laundry.h
@@ -41,13 +41,13 @@ struct daObjLdy_Attr_c {
 
 class daObjLdy_c : public fopAc_ac_c {
 public:
-    /* 80C50F98 */ void create_init();
-    /* 80C51088 */ void initBaseMtx();
-    /* 80C510F8 */ void setBaseMtx();
-    /* 80C5116C */ void getJointAngle(csXyz*, int);
-    /* 80C51194 */ void setNormalClothPos();
-    /* 80C51644 */ void calcJointAngle();
-    /* 80C5183C */ bool divorceParent();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void getJointAngle(csXyz*, int);
+    void setNormalClothPos();
+    void calcJointAngle();
+    bool divorceParent();
 
     inline ~daObjLdy_c();
     inline int create();
diff --git a/include/d/actor/d_a_obj_laundry_rope.h b/include/d/actor/d_a_obj_laundry_rope.h
index 3c7c2648bc..deede25609 100644
--- a/include/d/actor/d_a_obj_laundry_rope.h
+++ b/include/d/actor/d_a_obj_laundry_rope.h
@@ -30,10 +30,10 @@ struct daObjLndRope_Hio_c {
  */
 class daObjLndRope_c : public fopAc_ac_c {
 public:
-    /* 80C521F8 */ void create_init();
-    /* 80C5285C */ void initBaseMtx();
-    /* 80C52890 */ void setBaseMtx();
-    /* 80C528E0 */ void setNormalRopePos();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setNormalRopePos();
 
     inline ~daObjLndRope_c();
     inline int create();
diff --git a/include/d/actor/d_a_obj_lbox.h b/include/d/actor/d_a_obj_lbox.h
index aec232155c..481cee1a6b 100644
--- a/include/d/actor/d_a_obj_lbox.h
+++ b/include/d/actor/d_a_obj_lbox.h
@@ -42,8 +42,8 @@ STATIC_ASSERT(sizeof(obj_lbox_class) == 0xA90);
 
 class daObj_Lbox_HIO_c {
 public:
-    /* 80C5356C */ daObj_Lbox_HIO_c();
-    /* 80C53F14 */ virtual ~daObj_Lbox_HIO_c() {};
+    daObj_Lbox_HIO_c();
+    virtual ~daObj_Lbox_HIO_c() {};
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mSize;
diff --git a/include/d/actor/d_a_obj_life_container.h b/include/d/actor/d_a_obj_life_container.h
index c3f9246b87..14187d8289 100644
--- a/include/d/actor/d_a_obj_life_container.h
+++ b/include/d/actor/d_a_obj_life_container.h
@@ -23,31 +23,31 @@ public:
         STATUS_WAIT_2_e,
     };
 
-    /* 804CCBE4 */ void initBaseMtx();
-    /* 804CCC04 */ void setBaseMtx();
-    /* 804CCC6C */ int Create();
-    /* 804CCE00 */ void setEffect();
-    /* 804CCF5C */ void endEffect00();
-    /* 804CCFAC */ void endEffect02();
-    /* 804CCFE0 */ int create();
-    /* 804CD428 */ void bg_check();
-    /* 804CD5B8 */ int actionWaitInit();
-    /* 804CD660 */ int actionWait();
-    /* 804CD8C0 */ int initActionOrderGetDemo();
-    /* 804CD98C */ int actionOrderGetDemo();
-    /* 804CDA08 */ int actionGetDemo();
-    /* 804CDBC8 */ int actionSwOnWait();
-    /* 804CDC2C */ int actionInitBoomerangCarry();
-    /* 804CDD0C */ int actionBoomerangCarry();
-    /* 804CDD7C */ int actionInitWait2();
-    /* 804CDD8C */ int actionWait2();
-    /* 804CDDAC */ void calcScale();
-    /* 804CDE70 */ int execute();
-    /* 804CE19C */ int draw();
-    /* 804CE214 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    void setEffect();
+    void endEffect00();
+    void endEffect02();
+    int create();
+    void bg_check();
+    int actionWaitInit();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    int actionSwOnWait();
+    int actionInitBoomerangCarry();
+    int actionBoomerangCarry();
+    int actionInitWait2();
+    int actionWait2();
+    void calcScale();
+    int execute();
+    int draw();
+    int _delete();
 
-    /* 804CCFD8 */ virtual int __CreateHeap();
-    /* 804CE1F0 */ virtual void setListStart();
+    virtual int __CreateHeap();
+    virtual void setListStart();
 
     bool chkStatus(u8 i_status) { return mStatus == i_status; }
     void setStatus(u8 i_status) { mStatus = i_status; }
diff --git a/include/d/actor/d_a_obj_lp.h b/include/d/actor/d_a_obj_lp.h
index 69657755ca..e41e48a2c1 100644
--- a/include/d/actor/d_a_obj_lp.h
+++ b/include/d/actor/d_a_obj_lp.h
@@ -14,8 +14,8 @@
  
 struct wd_ss {
 public:
-    /* 80C559C8 */ ~wd_ss() {}
-    /* 80C55A04 */ wd_ss() {}
+    ~wd_ss() {}
+    wd_ss() {}
     
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz field_0x4;
diff --git a/include/d/actor/d_a_obj_lv1Candle00.h b/include/d/actor/d_a_obj_lv1Candle00.h
index 681959f6e7..79032a3c5d 100644
--- a/include/d/actor/d_a_obj_lv1Candle00.h
+++ b/include/d/actor/d_a_obj_lv1Candle00.h
@@ -18,17 +18,17 @@
  */
 class daLv1Cdl00_c : public fopAc_ac_c {
 public:
-    /* 80C55D80 */ void setBaseMtx();
-    /* 80C55E08 */ int CreateHeap();
-    /* 80C55E74 */ cPhs__Step create();
-    /* 80C561A0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80C561C0 */ void lightInit();
-    /* 80C56268 */ void setLight();
-    /* 80C562A0 */ void cutLight();
-    /* 80C562D8 */ void pointLightProc();
-    /* 80C56388 */ int Execute();
-    /* 80C567EC */ int Draw();
-    /* 80C56890 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    int Execute();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
@@ -54,8 +54,8 @@ STATIC_ASSERT(sizeof(daLv1Cdl00_c) == 0x754);
 
 class daLv1Cdl00_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C55D0C */ daLv1Cdl00_HIO_c();
-    /* 80C56970 */ ~daLv1Cdl00_HIO_c() {}
+    daLv1Cdl00_HIO_c();
+    ~daLv1Cdl00_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv1Candle01.h b/include/d/actor/d_a_obj_lv1Candle01.h
index a1cb0063a5..d3663d8a17 100644
--- a/include/d/actor/d_a_obj_lv1Candle01.h
+++ b/include/d/actor/d_a_obj_lv1Candle01.h
@@ -16,16 +16,16 @@
  */
 class daLv1Cdl01_c : public dBgS_MoveBgActor {
 public:
-    /* 80C56D20 */ void setBaseMtx();
-    /* 80C56DA8 */ int CreateHeap();
-    /* 80C56E14 */ cPhs__Step create();
-    /* 80C570D8 */ void lightInit();
-    /* 80C57164 */ void setLight();
-    /* 80C57194 */ void cutLight();
-    /* 80C571C4 */ void pointLightProc();
-    /* 80C57274 */ int Execute(Mtx**);
-    /* 80C575F4 */ int Draw();
-    /* 80C57698 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -50,8 +50,8 @@ STATIC_ASSERT(sizeof(daLv1Cdl01_c) == 0x78C);
 
 class daLv1Cdl01_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C56CAC */ daLv1Cdl01_HIO_c();
-    /* 80C5777C */ ~daLv1Cdl01_HIO_c() {}
+    daLv1Cdl01_HIO_c();
+    ~daLv1Cdl01_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv2Candle.h b/include/d/actor/d_a_obj_lv2Candle.h
index f2b24881f8..b5817cdfff 100644
--- a/include/d/actor/d_a_obj_lv2Candle.h
+++ b/include/d/actor/d_a_obj_lv2Candle.h
@@ -16,19 +16,19 @@
  */
 class daLv2Candle_c : public fopAc_ac_c {
 public:
-    /* 8058E13C */ void setBaseMtx();
-    /* 8058E1C4 */ int CreateHeap();
-    /* 8058E244 */ cPhs__Step create();
-    /* 8058E5BC */ u8 isSwitch();
-    /* 8058E608 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 8058E628 */ static void* searchDemoTagAct(void*, void*);
-    /* 8058E678 */ void lightInit();
-    /* 8058E720 */ void setLight();
-    /* 8058E750 */ void cutLight();
-    /* 8058E780 */ void pointLightProc();
-    /* 8058E99C */ int Execute();
-    /* 8058EEC8 */ int Draw();
-    /* 8058EF6C */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    u8 isSwitch();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void* searchDemoTagAct(void*, void*);
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    int Execute();
+    int Draw();
+    int Delete();
 
     int getOffType() { return fopAcM_GetParamBit(this, 0x18, 4); }
     u8 getModelType() { return fopAcM_GetParamBit(this, 0x14, 4); }
@@ -68,8 +68,8 @@ STATIC_ASSERT(sizeof(daLv2Candle_c) == 0x75C);
 
 class daLv2Candle_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8058E04C */ daLv2Candle_HIO_c();
-    /* 8058F050 */ ~daLv2Candle_HIO_c() {}
+    daLv2Candle_HIO_c();
+    ~daLv2Candle_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv3Candle.h b/include/d/actor/d_a_obj_lv3Candle.h
index 8bc4dcbe38..40943fad52 100644
--- a/include/d/actor/d_a_obj_lv3Candle.h
+++ b/include/d/actor/d_a_obj_lv3Candle.h
@@ -16,15 +16,15 @@
  */
 class daLv3Candle_c : public fopAc_ac_c {
 public:
-    /* 80C57B38 */ void setBaseMtx();
-    /* 80C57BC0 */ int CreateHeap();
-    /* 80C57C40 */ cPhs__Step create();
-    /* 80C57F6C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80C57F8C */ void lightInit();
-    /* 80C58018 */ void pointLightProc();
-    /* 80C580A0 */ int Execute();
-    /* 80C582FC */ int Draw();
-    /* 80C583A0 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void lightInit();
+    void pointLightProc();
+    int Execute();
+    int Draw();
+    int Delete();
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getType() { return fopAcM_GetParamBit(this, 8, 8); }
@@ -53,8 +53,8 @@ STATIC_ASSERT(sizeof(daLv3Candle_c) == 0x754);
 
 class daLv3Candle_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C57ACC */ daLv3Candle_HIO_c();
-    /* 80C58484 */ virtual ~daLv3Candle_HIO_c() {}
+    daLv3Candle_HIO_c();
+    virtual ~daLv3Candle_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv3Water.h b/include/d/actor/d_a_obj_lv3Water.h
index 2211507659..b6084c9928 100644
--- a/include/d/actor/d_a_obj_lv3Water.h
+++ b/include/d/actor/d_a_obj_lv3Water.h
@@ -26,19 +26,19 @@ public:
 
     daLv3Water_c() : dEvLib_callback_c(this) {}
 
-    /* 80C58838 */ void setBaseMtx();
-    /* 80C5891C */ virtual int CreateHeap();
-    /* 80C58ABC */ int create();
-    /* 80C58D68 */ virtual int Execute(Mtx**);
-    /* 80C58E20 */ void effectSet();
-    /* 80C596F4 */ void mode_proc_wait();
-    /* 80C59754 */ void mode_init_levelCtrl();
-    /* 80C597FC */ void mode_proc_levelCtrl();
-    /* 80C598BC */ virtual int Draw();
-    /* 80C59AA0 */ virtual int Delete();
+    void setBaseMtx();
+    virtual int CreateHeap();
+    int create();
+    virtual int Execute(Mtx**);
+    void effectSet();
+    void mode_proc_wait();
+    void mode_init_levelCtrl();
+    void mode_proc_levelCtrl();
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C59D80 */ virtual ~daLv3Water_c() {}
-    /* 80C59AE0 */ virtual bool eventStart();
+    virtual ~daLv3Water_c() {}
+    virtual bool eventStart();
 
     int getParam() { return fpcM_GetParam(this) >> 0xC & 0x0FFF; }
     int getParamSw() { return fpcM_GetParam(this) & 0xFF; }
diff --git a/include/d/actor/d_a_obj_lv3Water2.h b/include/d/actor/d_a_obj_lv3Water2.h
index 462f84429f..37142c04c3 100644
--- a/include/d/actor/d_a_obj_lv3Water2.h
+++ b/include/d/actor/d_a_obj_lv3Water2.h
@@ -18,16 +18,16 @@ public:
     daLv3Water2_c() : dEvLib_callback_c(this) {}
     ~daLv3Water2_c() {}
 
-    /* 80C5A478 */ void setBaseMtx();
-    /* 80C5A4F8 */ int CreateHeap();
-    /* 80C5A5E4 */ cPhs__Step create();
-    /* 80C5A844 */ int Execute(Mtx**);
-    /* 80C5AC10 */ void mode_proc_wait();
-    /* 80C5ACB8 */ void mode_init_levelCtrl();
-    /* 80C5ACE4 */ void mode_proc_levelCtrl();
-    /* 80C5ADA4 */ int Draw();
-    /* 80C5AEFC */ int Delete();
-    /* 80C5AF3C */ bool eventStart();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void mode_proc_wait();
+    void mode_init_levelCtrl();
+    void mode_proc_levelCtrl();
+    int Draw();
+    int Delete();
+    bool eventStart();
 
 private:
     /* 0x5B8 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_lv3saka00.h b/include/d/actor/d_a_obj_lv3saka00.h
index 3468e20757..f08f4a5d19 100644
--- a/include/d/actor/d_a_obj_lv3saka00.h
+++ b/include/d/actor/d_a_obj_lv3saka00.h
@@ -14,16 +14,16 @@
  */
 class daObjLv3saka_c : public dBgS_MoveBgActor {
 public:
-    /* 80C5BE58 */ void initBaseMtx();
-    /* 80C5BE78 */ void setBaseMtx();
-    /* 80C5BED8 */ int Create();
-    /* 80C5BFA0 */ int CreateHeap();
-    /* 80C5C058 */ int create1st();
-    /* 80C5C0FC */ int Execute(Mtx**);
-    /* 80C5C17C */ void setNrmDzb();
-    /* 80C5C1F8 */ void setWtrDzb();
-    /* 80C5C274 */ int Draw();
-    /* 80C5C27C */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void setNrmDzb();
+    void setWtrDzb();
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; }
     u8 getType() { return fopAcM_GetParamBit(this, 28, 4) & 0xFF; }
diff --git a/include/d/actor/d_a_obj_lv3waterEff.h b/include/d/actor/d_a_obj_lv3waterEff.h
index 0469804f14..fdf7b204dc 100644
--- a/include/d/actor/d_a_obj_lv3waterEff.h
+++ b/include/d/actor/d_a_obj_lv3waterEff.h
@@ -13,10 +13,10 @@
  */
 class daObjWaterEff_c : public fopAc_ac_c {
 public:
-    /* 80C5C4F8 */ int Create();
-    /* 80C5C5DC */ int create();
-    /* 80C5C6B0 */ int execute();
-    /* 80C5C7B8 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
 private:
     /* 0x568 */ cXyz mSePositions[2];
diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
index 7e0ff03a37..58378ecd4e 100644
--- a/include/d/actor/d_a_obj_lv4CandleDemoTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
@@ -18,21 +18,21 @@ public:
     typedef void (dalv4CandleDemoTag_c::*procFunc)();
     dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {}
 
-    /* 80C5CA58 */ void setBaseMtx();
-    /* 80C5CA90 */ int create();
-    /* 80C5CBA4 */ int Execute();
-    /* 80C5CBE8 */ void procMain();
-    /* 80C5CCA4 */ void init_modeWatch();
-    /* 80C5CCC0 */ void modeWatch();
-    /* 80C5CDC0 */ void init_modeEnemyCreate();
-    /* 80C5CE70 */ void modeEnemyCreate();
-    /* 80C5CEB4 */ void init_modeNG();
-    /* 80C5CEC0 */ void modeNG();
-    /* 80C5CF34 */ void init_modeEnd();
-    /* 80C5CF40 */ void modeEnd();
-    /* 80C5CF9C */ static void* searchShutterAct(void*, void*);
-    /* 80C5CFEC */ int Draw();
-    /* 80C5CFF4 */ int Delete();
+    void setBaseMtx();
+    int create();
+    int Execute();
+    void procMain();
+    void init_modeWatch();
+    void modeWatch();
+    void init_modeEnemyCreate();
+    void modeEnemyCreate();
+    void init_modeNG();
+    void modeNG();
+    void init_modeEnd();
+    void modeEnd();
+    static void* searchShutterAct(void*, void*);
+    int Draw();
+    int Delete();
 
     u8 getPathID() { return fopAcM_GetParamBit(this, 0x10, 8); }
     int getSwNG() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -40,8 +40,8 @@ public:
     int getSwOK() { return shape_angle.x & 0xFF; }
     int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); }
 
-    /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c() {}
-    /* 80C5CF78 */ virtual bool eventStart();
+    virtual ~dalv4CandleDemoTag_c() {}
+    virtual bool eventStart();
 
 private:
     /* 0x584 */ u8 mMode;
diff --git a/include/d/actor/d_a_obj_lv4CandleTag.h b/include/d/actor/d_a_obj_lv4CandleTag.h
index b508f6ccc4..cc56acdb1c 100644
--- a/include/d/actor/d_a_obj_lv4CandleTag.h
+++ b/include/d/actor/d_a_obj_lv4CandleTag.h
@@ -25,21 +25,21 @@ public:
     dalv4CandleTag_c() : dEvLib_callback_c(this) {}
     ~dalv4CandleTag_c() {}
 
-    /* 80C5D4B8 */ void setBaseMtx();
-    /* 80C5D4F0 */ int create();
-    /* 80C5D5D4 */ int Execute();
-    /* 80C5D618 */ void procMain();
-    /* 80C5D6D4 */ void init_modeWatch();
-    /* 80C5D6E0 */ void modeWatch();
-    /* 80C5D78C */ void init_modeNG();
-    /* 80C5D814 */ void modeNG();
-    /* 80C5D8A0 */ void init_modeNGWait();
-    /* 80C5D8AC */ void modeNGWait();
-    /* 80C5D8FC */ void init_modeEnd();
-    /* 80C5D908 */ void modeEnd();
-    /* 80C5D90C */ bool eventStart();
-    /* 80C5D930 */ int Draw();
-    /* 80C5D938 */ int Delete();
+    void setBaseMtx();
+    int create();
+    int Execute();
+    void procMain();
+    void init_modeWatch();
+    void modeWatch();
+    void init_modeNG();
+    void modeNG();
+    void init_modeNGWait();
+    void modeNGWait();
+    void init_modeEnd();
+    void modeEnd();
+    bool eventStart();
+    int Draw();
+    int Delete();
 
     u8 getSwTop() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwOK() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv4EdShutter.h b/include/d/actor/d_a_obj_lv4EdShutter.h
index 715d35295d..a19de47873 100644
--- a/include/d/actor/d_a_obj_lv4EdShutter.h
+++ b/include/d/actor/d_a_obj_lv4EdShutter.h
@@ -17,25 +17,25 @@ class daLv4EdShutter_c : public dBgS_MoveBgActor, public request_of_phase_proces
 public:
     daLv4EdShutter_c() : dEvLib_callback_c(this) {}
 
-    /* 80C5DE38 */ void setBaseMtx();
-    /* 80C5DF34 */ int create();
-    /* 80C5E0F4 */ void move();
-    /* 80C5E1B0 */ void init_modeWait();
-    /* 80C5E1C8 */ void modeWait();
-    /* 80C5E2E0 */ void init_modeOpen();
-    /* 80C5E394 */ void modeOpen();
-    /* 80C5E464 */ void init_modeClose();
-    /* 80C5E518 */ void modeClose();
-    /* 80C5E584 */ void init_modeEnd();
-    /* 80C5E590 */ void modeEnd();
+    void setBaseMtx();
+    int create();
+    void move();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
+    void init_modeEnd();
+    void modeEnd();
 
-    /* 80C5DEC8 */ virtual int CreateHeap();
-    /* 80C5E0A4 */ virtual int Execute(Mtx**);
-    /* 80C5E5CC */ virtual int Draw();
-    /* 80C5E670 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C5E834 */ virtual ~daLv4EdShutter_c() {}
-    /* 80C5E594 */ virtual bool eventStart();
+    virtual ~daLv4EdShutter_c() {}
+    virtual bool eventStart();
 
     u8 getCloseSw() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getOpenSw() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv4Gate.h b/include/d/actor/d_a_obj_lv4Gate.h
index a8ebdbebc2..d2dfba401a 100644
--- a/include/d/actor/d_a_obj_lv4Gate.h
+++ b/include/d/actor/d_a_obj_lv4Gate.h
@@ -21,20 +21,20 @@ public:
         MODE_MOVE_END_e,
     };
 
-    /* 80C5EBE4 */ void setBaseMtx();
-    /* 80C5ECEC */ int create();
-    /* 80C5EEA4 */ void moveGate();
-    /* 80C5EF48 */ void init_modeWait();
-    /* 80C5EF54 */ void modeWait();
-    /* 80C5EFB0 */ void init_modeMove();
-    /* 80C5EFBC */ void modeMove();
-    /* 80C5F0C4 */ void init_modeMoveEnd();
-    /* 80C5F1E4 */ void modeMoveEnd();
+    void setBaseMtx();
+    int create();
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMove();
+    void modeMove();
+    void init_modeMoveEnd();
+    void modeMoveEnd();
 
-    /* 80C5EC80 */ virtual int CreateHeap();
-    /* 80C5EE54 */ virtual int Execute(Mtx**);
-    /* 80C5F1E8 */ virtual int Draw();
-    /* 80C5F28C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;
@@ -48,8 +48,8 @@ public:
 
 class daLv4Gate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5EB6C */ daLv4Gate_HIO_c();
-    /* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {}
+    daLv4Gate_HIO_c();
+    virtual ~daLv4Gate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv4HsTarget.h b/include/d/actor/d_a_obj_lv4HsTarget.h
index 45d6814bf4..fbb1c8862a 100644
--- a/include/d/actor/d_a_obj_lv4HsTarget.h
+++ b/include/d/actor/d_a_obj_lv4HsTarget.h
@@ -15,13 +15,13 @@
  */
 class daLv4HsTarget_c : public dBgS_MoveBgActor {
 public:
-    /* 80C5F690 */ void setBaseMtx();
-    /* 80C5F784 */ int create();
+    void setBaseMtx();
+    int create();
 
-    /* 80C5F718 */ virtual int CreateHeap();
-    /* 80C5F85C */ virtual int Execute(Mtx**);
-    /* 80C5F870 */ virtual int Draw();
-    /* 80C5F8D4 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -32,8 +32,8 @@ STATIC_ASSERT(sizeof(daLv4HsTarget_c) == 0x5AC);
 
 class daLv4HsTarget_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5F62C */ daLv4HsTarget_HIO_c();
-    /* 80C5F990 */ virtual ~daLv4HsTarget_HIO_c() {}
+    daLv4HsTarget_HIO_c();
+    virtual ~daLv4HsTarget_HIO_c() {}
 
     void genMessage(JORMContext*);
 };
diff --git a/include/d/actor/d_a_obj_lv4PoGate.h b/include/d/actor/d_a_obj_lv4PoGate.h
index 3ae0092761..480885fa0a 100644
--- a/include/d/actor/d_a_obj_lv4PoGate.h
+++ b/include/d/actor/d_a_obj_lv4PoGate.h
@@ -25,30 +25,30 @@ public:
         MODE_MOVE_CLOSE3_e,
     };
 
-    /* 80C5FCA4 */ void setBaseMtx();
-    /* 80C5FDAC */ int create();
-    /* 80C5FF2C */ void moveGate();
-    /* 80C60090 */ void init_modeWait();
-    /* 80C6009C */ void modeWait();
-    /* 80C600A0 */ void init_modeMoveOpen();
-    /* 80C60150 */ void modeMoveOpen();
-    /* 80C60200 */ void init_modeMoveClose();
-    /* 80C602B0 */ void modeMoveClose();
-    /* 80C6031C */ void init_modeMoveCloseWait();
-    /* 80C60338 */ void modeMoveCloseWait();
-    /* 80C60370 */ void init_modeMoveClose2();
-    /* 80C6037C */ void modeMoveClose2();
-    /* 80C603E0 */ void init_modeMoveClose2Wait();
-    /* 80C603FC */ void modeMoveClose2Wait();
-    /* 80C60434 */ void init_modeMoveClose3();
-    /* 80C60450 */ void modeMoveClose3();
-    /* 80C604D8 */ void setSe();
-    /* 80C60534 */ void setEffect(int);
+    void setBaseMtx();
+    int create();
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveOpen();
+    void modeMoveOpen();
+    void init_modeMoveClose();
+    void modeMoveClose();
+    void init_modeMoveCloseWait();
+    void modeMoveCloseWait();
+    void init_modeMoveClose2();
+    void modeMoveClose2();
+    void init_modeMoveClose2Wait();
+    void modeMoveClose2Wait();
+    void init_modeMoveClose3();
+    void modeMoveClose3();
+    void setSe();
+    void setEffect(int);
 
-    /* 80C5FD40 */ virtual int CreateHeap();
-    /* 80C5FEDC */ virtual int Execute(Mtx**);
-    /* 80C605F8 */ virtual int Draw();
-    /* 80C6069C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -67,8 +67,8 @@ STATIC_ASSERT(sizeof(daLv4PoGate_c) == 0x5BC);
 
 class daLv4PoGate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5FBEC */ daLv4PoGate_HIO_c();
-    /* 80C60758 */ virtual ~daLv4PoGate_HIO_c() {};
+    daLv4PoGate_HIO_c();
+    virtual ~daLv4PoGate_HIO_c() {};
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv4RailWall.h b/include/d/actor/d_a_obj_lv4RailWall.h
index ce9fe03a30..7cffceedc0 100644
--- a/include/d/actor/d_a_obj_lv4RailWall.h
+++ b/include/d/actor/d_a_obj_lv4RailWall.h
@@ -27,26 +27,26 @@ public:
 
     daObjLv4Wall_c() : dEvLib_callback_c(this) {}
 
-    /* 80C60AC4 */ void initBaseMtx();
-    /* 80C60B00 */ void setBaseMtx();
-    /* 80C60D40 */ int create1st();
-    /* 80C60E90 */ void action();
-    /* 80C60F4C */ void mode_init_wait();
-    /* 80C60F58 */ void mode_wait();
-    /* 80C61004 */ void mode_init_move();
-    /* 80C61068 */ void mode_move();
-    /* 80C613C0 */ void mode_init_dead();
-    /* 80C613CC */ void mode_dead();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_init_wait();
+    void mode_wait();
+    void mode_init_move();
+    void mode_move();
+    void mode_init_dead();
+    void mode_dead();
 
-    /* 80C61940 */ virtual ~daObjLv4Wall_c() {}
+    virtual ~daObjLv4Wall_c() {}
 
-    /* 80C60CD0 */ virtual int CreateHeap();
-    /* 80C60B7C */ virtual int Create();
-    /* 80C60DC4 */ virtual int Execute(Mtx**);
-    /* 80C6143C */ virtual int Draw();
-    /* 80C614E0 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C613D0 */ virtual bool eventStart();
+    virtual bool eventStart();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_lv4SlideWall.h b/include/d/actor/d_a_obj_lv4SlideWall.h
index fc217063b2..fcafa19dfc 100644
--- a/include/d/actor/d_a_obj_lv4SlideWall.h
+++ b/include/d/actor/d_a_obj_lv4SlideWall.h
@@ -14,21 +14,21 @@
  */
 class daSldWall_c : public dBgS_MoveBgActor {
 public:
-    /* 80C61EB0 */ void setBaseMtx();
-    /* 80C61FB8 */ int create();
-    /* 80C62134 */ void moveWall();
-    /* 80C62238 */ void init_modeWait();
-    /* 80C62244 */ void modeWait();
-    /* 80C62248 */ void init_modeMoveOpen();
-    /* 80C62254 */ void modeMoveOpen();
-    /* 80C62314 */ void init_modeMoveClose();
-    /* 80C62320 */ void modeMoveClose();
-    /* 80C623E0 */ void setSe();
+    void setBaseMtx();
+    int create();
+    void moveWall();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveOpen();
+    void modeMoveOpen();
+    void init_modeMoveClose();
+    void modeMoveClose();
+    void setSe();
 
-    /* 80C61F4C */ virtual int CreateHeap();
-    /* 80C620E4 */ virtual int Execute(Mtx**);
-    /* 80C6249C */ virtual int Draw();
-    /* 80C62540 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -45,8 +45,8 @@ STATIC_ASSERT(sizeof(daSldWall_c) == 0x5b4);
 
 class daSldWall_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C61E2C */ daSldWall_HIO_c();
-    /* 80C625FC */ virtual ~daSldWall_HIO_c() {}
+    daSldWall_HIO_c();
+    virtual ~daSldWall_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv4bridge.h b/include/d/actor/d_a_obj_lv4bridge.h
index 7c07f65853..813b098512 100644
--- a/include/d/actor/d_a_obj_lv4bridge.h
+++ b/include/d/actor/d_a_obj_lv4bridge.h
@@ -17,24 +17,24 @@ class daObjLv4Brg_c : public dBgS_MoveBgActor, public dEvLib_callback_c {
 public:
     daObjLv4Brg_c() : dEvLib_callback_c(this) {}
 
-    /* 80C62878 */ void initBaseMtx();
-    /* 80C628B4 */ void setBaseMtx();
-    /* 80C62A9C */ int create1st();
-    /* 80C62B6C */ void action();
-    /* 80C62C28 */ void mode_init_wait();
-    /* 80C62C34 */ void mode_wait();
-    /* 80C62CE4 */ void mode_init_move();
-    /* 80C62CFC */ void mode_move();
-    /* 80C62E24 */ void mode_init_dead();
-    /* 80C62E30 */ void mode_dead();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_init_wait();
+    void mode_wait();
+    void mode_init_move();
+    void mode_move();
+    void mode_init_dead();
+    void mode_dead();
 
-    /* 80C630C4 */ virtual ~daObjLv4Brg_c() {}
-    /* 80C62E34 */ virtual bool eventStart();
-    /* 80C62A2C */ virtual int CreateHeap();
-    /* 80C62994 */ virtual int Create();
-    /* 80C62B20 */ virtual int Execute(Mtx**);
-    /* 80C62EA0 */ virtual int Draw();
-    /* 80C62F44 */ virtual int Delete();
+    virtual ~daObjLv4Brg_c() {}
+    virtual bool eventStart();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getEvID() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv4chandelier.h b/include/d/actor/d_a_obj_lv4chandelier.h
index 6430a3d1b3..d0e7c53515 100644
--- a/include/d/actor/d_a_obj_lv4chandelier.h
+++ b/include/d/actor/d_a_obj_lv4chandelier.h
@@ -23,19 +23,19 @@ public:
         /* 0x24 */ f32 field_0x24;
     };
 
-    /* 80C63360 */ int create1st();
-    /* 80C634CC */ void setMtxChain(daObjLv4Chan_c::ChainPos*, dMdl_obj_c*, int);
-    /* 80C636B4 */ void setMtx();
-    /* 80C639B4 */ void rideActor(fopAc_ac_c*);
-    /* 80C63CFC */ int CreateHeap();
-    /* 80C63FA8 */ int Create();
-    /* 80C6449C */ void constraintChain(daObjLv4Chan_c::ChainPos*, int);
-    /* 80C64668 */ void constraintBase();
-    /* 80C647FC */ void calcVec(daObjLv4Chan_c::ChainPos*, int);
-    /* 80C64878 */ void chkGnd();
-    /* 80C648F4 */ int Execute(Mtx**);
-    /* 80C65F04 */ int Draw();
-    /* 80C66114 */ int Delete();
+    int create1st();
+    void setMtxChain(daObjLv4Chan_c::ChainPos*, dMdl_obj_c*, int);
+    void setMtx();
+    void rideActor(fopAc_ac_c*);
+    int CreateHeap();
+    int Create();
+    void constraintChain(daObjLv4Chan_c::ChainPos*, int);
+    void constraintBase();
+    void calcVec(daObjLv4Chan_c::ChainPos*, int);
+    void chkGnd();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     int getArg0() { return fopAcM_GetParamBit(this, 0, 4); }
     int getAddChain0() { return fopAcM_GetParamBit(this, 4, 4); }
diff --git a/include/d/actor/d_a_obj_lv4digsand.h b/include/d/actor/d_a_obj_lv4digsand.h
index 810e7ffa7a..d6b0d8196c 100644
--- a/include/d/actor/d_a_obj_lv4digsand.h
+++ b/include/d/actor/d_a_obj_lv4digsand.h
@@ -16,22 +16,22 @@
  */
 class daObjL4DigSand_c : public dBgS_MoveBgActor {
 public:
-    /* 80C66B18 */ void initBaseMtx();
-    /* 80C66B54 */ void setBaseMtx();
-    /* 80C66C94 */ int create1st();
-    /* 80C66DD0 */ void action();
-    /* 80C66E74 */ void mode_init_wait();
-    /* 80C66E80 */ void mode_wait();
-    /* 80C66EAC */ void mode_init_dig();
-    /* 80C66FFC */ void mode_dig();
-    /* 80C670AC */ void mode_init_end();
-    /* 80C67100 */ void mode_end();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_init_wait();
+    void mode_wait();
+    void mode_init_dig();
+    void mode_dig();
+    void mode_init_end();
+    void mode_end();
 
-    /* 80C66C24 */ virtual int CreateHeap();
-    /* 80C66BC8 */ virtual int Create();
-    /* 80C66D40 */ virtual int Execute(Mtx**);
-    /* 80C67104 */ virtual int Draw();
-    /* 80C671A8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     void startDig() { field_0x941 = 1; }
diff --git a/include/d/actor/d_a_obj_lv4floor.h b/include/d/actor/d_a_obj_lv4floor.h
index 69cb0e0cf5..7b6681419d 100644
--- a/include/d/actor/d_a_obj_lv4floor.h
+++ b/include/d/actor/d_a_obj_lv4floor.h
@@ -20,21 +20,21 @@ public:
         MODE_DEAD_e,
     };
 
-    /* 80C677F8 */ void initBaseMtx();
-    /* 80C67834 */ void setBaseMtx();
-    /* 80C67944 */ int create1st();
-    /* 80C67A30 */ void action();
-    /* 80C67AD4 */ void mode_wait();
-    /* 80C67B28 */ void mode_init_move();
-    /* 80C67B40 */ void mode_move();
-    /* 80C67BA8 */ void mode_init_dead();
-    /* 80C67BB4 */ void mode_dead();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_wait();
+    void mode_init_move();
+    void mode_move();
+    void mode_init_dead();
+    void mode_dead();
 
-    /* 80C678D4 */ virtual int CreateHeap();
-    /* 80C678B0 */ virtual int Create();
-    /* 80C679E4 */ virtual int Execute(Mtx**);
-    /* 80C67BD4 */ virtual int Draw();
-    /* 80C67C78 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; }
 
diff --git a/include/d/actor/d_a_obj_lv4gear.h b/include/d/actor/d_a_obj_lv4gear.h
index 2c690840c4..5e649c0722 100644
--- a/include/d/actor/d_a_obj_lv4gear.h
+++ b/include/d/actor/d_a_obj_lv4gear.h
@@ -18,14 +18,14 @@ public:
         GEAR_L_e,
     };
 
-    /* 80C67FB4 */ void initBaseMtx();
-    /* 80C67FF0 */ void setBaseMtx();
-    /* 80C68050 */ int Create();
-    /* 80C680A4 */ int CreateHeap();
-    /* 80C68124 */ int create();
-    /* 80C681F4 */ int execute();
-    /* 80C683E0 */ int draw();
-    /* 80C68444 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getType() { return fopAcM_GetParamBit(this, 8, 4); }
diff --git a/include/d/actor/d_a_obj_lv4prelvtr.h b/include/d/actor/d_a_obj_lv4prelvtr.h
index 7e3388a7e3..2fd50068ac 100644
--- a/include/d/actor/d_a_obj_lv4prelvtr.h
+++ b/include/d/actor/d_a_obj_lv4prelvtr.h
@@ -15,14 +15,14 @@
  */
 class daObjPRElvtr_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80C685F8 */ int create1st();
-    /* 80C68688 */ void setMtx();
-    /* 80C686F8 */ int CreateHeap();
-    /* 80C68768 */ int Create();
-    /* 80C68844 */ int Execute(Mtx**);
-    /* 80C68944 */ int Draw();
-    /* 80C689E8 */ int Delete();
-    /* 80C68AF0 */ virtual ~daObjPRElvtr_c() {}
+    int create1st();
+    void setMtx();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    virtual ~daObjPRElvtr_c() {}
 
     int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_lv4prwall.h b/include/d/actor/d_a_obj_lv4prwall.h
index 76f6a0686c..6a69b0fab6 100644
--- a/include/d/actor/d_a_obj_lv4prwall.h
+++ b/include/d/actor/d_a_obj_lv4prwall.h
@@ -14,15 +14,15 @@
  */
 class daObjLv4PRwall_c : public dBgS_MoveBgActor, request_of_phase_process_class {
 public:
-    /* 80C68C98 */ int create1st();
-    /* 80C68DD8 */ void setMtx();
+    int create1st();
+    void setMtx();
 
-    /* 80C68F20 */ virtual int CreateHeap();
-    /* 80C68FA0 */ virtual int Create();
-    /* 80C690D8 */ virtual int Execute(Mtx**);
-    /* 80C696BC */ virtual int Draw();
-    /* 80C69760 */ virtual int Delete();
-    /* 80C69870 */ virtual ~daObjLv4PRwall_c() {}
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual ~daObjLv4PRwall_c() {}
     
     int getType() { return fopAcM_GetParamBit(this, 0, 3); }
     int getSwNo() { return fopAcM_GetParamBit(this, 3, 8); }
diff --git a/include/d/actor/d_a_obj_lv4sand.h b/include/d/actor/d_a_obj_lv4sand.h
index 498ddd2a83..0ff6420e27 100644
--- a/include/d/actor/d_a_obj_lv4sand.h
+++ b/include/d/actor/d_a_obj_lv4sand.h
@@ -23,26 +23,26 @@ public:
 
     daObjLv4Sand_c() : dEvLib_callback_c(this) {}
 
-    /* 80C69A98 */ void initBaseMtx();
-    /* 80C69AD4 */ void setBaseMtx();
-    /* 80C69D8C */ int create1st();
-    /* 80C69F18 */ void action();
-    /* 80C69FBC */ void mode_init_wait();
-    /* 80C69FC8 */ void mode_wait();
-    /* 80C6A01C */ void mode_init_move();
-    /* 80C6A034 */ void mode_move();
-    /* 80C6A09C */ void mode_init_dead();
-    /* 80C6A0A8 */ void mode_dead();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_init_wait();
+    void mode_wait();
+    void mode_init_move();
+    void mode_move();
+    void mode_init_dead();
+    void mode_dead();
 
-    /* 80C6A30C */ virtual ~daObjLv4Sand_c() {}
+    virtual ~daObjLv4Sand_c() {}
 
-    /* 80C69C28 */ virtual int CreateHeap();
-    /* 80C69B50 */ virtual int Create();
-    /* 80C69E10 */ virtual int Execute(Mtx**);
-    /* 80C6A0D0 */ virtual int Draw();
-    /* 80C6A18C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C6A0AC */ virtual bool eventStart();
+    virtual bool eventStart();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_lv5FloorBoard.h b/include/d/actor/d_a_obj_lv5FloorBoard.h
index d35d7cb61e..f4f5c50582 100644
--- a/include/d/actor/d_a_obj_lv5FloorBoard.h
+++ b/include/d/actor/d_a_obj_lv5FloorBoard.h
@@ -20,18 +20,18 @@ public:
         MODE_BREAK,
     };
 
-    /* 80C6A6FC */ void setBaseMtx();
-    /* 80C6A7F0 */ int create();
-    /* 80C6AB04 */ void procMain();
-    /* 80C6AB90 */ void init_modeWait();
-    /* 80C6ABAC */ void modeWait();
-    /* 80C6AC9C */ void init_modeBreak();
-    /* 80C6AD40 */ void modeBreak();
+    void setBaseMtx();
+    int create();
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
 
-    /* 80C6A784 */ virtual int CreateHeap();
-    /* 80C6AAAC */ virtual int Execute(Mtx**);
-    /* 80C6AEB0 */ virtual int Draw();
-    /* 80C6AF54 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -53,8 +53,8 @@ STATIC_ASSERT(sizeof(daFlorBoad_c) == 0x734);
 
 class daFlorBoad_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80C6A60C */ daFlorBoad_HIO_c();
-    /* 80C6B058 */ virtual ~daFlorBoad_HIO_c() {}
+    daFlorBoad_HIO_c();
+    virtual ~daFlorBoad_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv5IceWall.h b/include/d/actor/d_a_obj_lv5IceWall.h
index 3efb3bc7cd..737aaf9318 100644
--- a/include/d/actor/d_a_obj_lv5IceWall.h
+++ b/include/d/actor/d_a_obj_lv5IceWall.h
@@ -20,18 +20,18 @@ public:
         MODE_BREAK,
     };
 
-    /* 80C6B51C */ void setBaseMtx();
-    /* 80C6B69C */ int create();
-    /* 80C6BBC4 */ void procMain();
-    /* 80C6BC50 */ void init_modeWait();
-    /* 80C6BC6C */ void modeWait();
-    /* 80C6C170 */ void init_modeBreak();
-    /* 80C6C1C0 */ void modeBreak();
+    void setBaseMtx();
+    int create();
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
 
-    /* 80C6B5E4 */ virtual int CreateHeap();
-    /* 80C6BB60 */ virtual int Execute(Mtx**);
-    /* 80C6C374 */ virtual int Draw();
-    /* 80C6C44C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -62,8 +62,8 @@ STATIC_ASSERT(sizeof(daIceWall_c) == 0x884);
 
 class daIceWall_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80C6B42C */ daIceWall_HIO_c();
-    /* 80C6C550 */ virtual ~daIceWall_HIO_c() {}
+    daIceWall_HIO_c();
+    virtual ~daIceWall_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv5SwIce.h b/include/d/actor/d_a_obj_lv5SwIce.h
index a3b883d31f..7c61e04d3b 100644
--- a/include/d/actor/d_a_obj_lv5SwIce.h
+++ b/include/d/actor/d_a_obj_lv5SwIce.h
@@ -20,18 +20,18 @@ public:
         MODE_BREAK,
     };
 
-    /* 80C6CA20 */ void setBaseMtx();
-    /* 80C6CB14 */ int create();
-    /* 80C6CE28 */ void procMain();
-    /* 80C6CEB4 */ void init_modeWait();
-    /* 80C6CED0 */ void modeWait();
-    /* 80C6D0F4 */ void init_modeBreak();
-    /* 80C6D144 */ void modeBreak();
+    void setBaseMtx();
+    int create();
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
 
-    /* 80C6CAA8 */ virtual int CreateHeap();
-    /* 80C6CDD0 */ virtual int Execute(Mtx**);
-    /* 80C6D260 */ virtual int Draw();
-    /* 80C6D314 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwBit1() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -54,8 +54,8 @@ STATIC_ASSERT(sizeof(daLv5SwIce_c) == 0x738);
 
 class daLv5SwIce_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80C6C94C */ daLv5SwIce_HIO_c();
-    /* 80C6D418 */ virtual ~daLv5SwIce_HIO_c() {}
+    daLv5SwIce_HIO_c();
+    virtual ~daLv5SwIce_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv5ychndlr.h b/include/d/actor/d_a_obj_lv5ychndlr.h
index 8e00c6453e..8db78c0afa 100644
--- a/include/d/actor/d_a_obj_lv5ychndlr.h
+++ b/include/d/actor/d_a_obj_lv5ychndlr.h
@@ -15,16 +15,16 @@
  */
 class daObjYchndlr_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80C6D758 */ int create1st();
-    /* 80C6D7E0 */ void setMtx();
-    /* 80C6D9A8 */ void rideActor(fopAc_ac_c*);
+    int create1st();
+    void setMtx();
+    void rideActor(fopAc_ac_c*);
 
-    /* 80C6DA5C */ virtual int CreateHeap();
-    /* 80C6DB5C */ virtual int Create();
-    /* 80C6DC64 */ virtual int Execute(Mtx**);
-    /* 80C6E300 */ virtual int Draw();
-    /* 80C6E3C8 */ virtual int Delete();
-    /* 80C6E808 */ virtual ~daObjYchndlr_c() {}
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual ~daObjYchndlr_c() {}
 
 private:
     /* 0x5A8 */ Mtx field_0x5a8;
diff --git a/include/d/actor/d_a_obj_lv5yiblltray.h b/include/d/actor/d_a_obj_lv5yiblltray.h
index f62a6ec936..48d1d82187 100644
--- a/include/d/actor/d_a_obj_lv5yiblltray.h
+++ b/include/d/actor/d_a_obj_lv5yiblltray.h
@@ -23,21 +23,21 @@ public:
         MODE_BACK_RIDE,
     };
 
-    /* 80C6EBF8 */ int create1st();
-    /* 80C6EC88 */ void setMtx();
-    /* 80C6F1E8 */ void rideActor(fopAc_ac_c*);
-    /* 80C6F23C */ void sendBall(fpc_ProcID);
-    /* 80C6F440 */ void onAttention();
-    /* 80C6F450 */ void offAttention();
-    /* 80C702E0 */ void initRotTo();
+    int create1st();
+    void setMtx();
+    void rideActor(fopAc_ac_c*);
+    void sendBall(fpc_ProcID);
+    void onAttention();
+    void offAttention();
+    void initRotTo();
 
-    /* 80C6EDA8 */ virtual int CreateHeap();
-    /* 80C6EEFC */ virtual int Create();
-    /* 80C6F460 */ virtual int Execute(Mtx**);
-    /* 80C70330 */ virtual int Draw();
-    /* 80C70408 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C7088C */ virtual ~daObjYIblltray_c() {}
+    virtual ~daObjYIblltray_c() {}
 
     int getType() { return fopAcM_GetParamBit(this, 0, 1); }
     int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
diff --git a/include/d/actor/d_a_obj_lv6ChangeGate.h b/include/d/actor/d_a_obj_lv6ChangeGate.h
index ee1d081fbc..b918037950 100644
--- a/include/d/actor/d_a_obj_lv6ChangeGate.h
+++ b/include/d/actor/d_a_obj_lv6ChangeGate.h
@@ -18,26 +18,26 @@ class daLv6ChangeGate_c : public dBgS_MoveBgActor, public request_of_phase_proce
 public:
     daLv6ChangeGate_c() : dEvLib_callback_c(this) {}
 
-    /* 80C70D38 */ void setBaseMtx();
-    /* 80C70E40 */ int create();
-    /* 80C712A8 */ u8 isSwitch();
-    /* 80C71494 */ void moveGate();
-    /* 80C715F4 */ void init_modeWait();
-    /* 80C71600 */ void modeWait();
-    /* 80C71604 */ void init_modeSlideRight();
-    /* 80C716B4 */ void modeSlideRight();
-    /* 80C7183C */ void init_modeSlideLeft();
-    /* 80C718EC */ void modeSlideLeft();
-    /* 80C71A74 */ void init_modeBreak();
-    /* 80C71AF8 */ void modeBreak();
+    void setBaseMtx();
+    int create();
+    u8 isSwitch();
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeSlideRight();
+    void modeSlideRight();
+    void init_modeSlideLeft();
+    void modeSlideLeft();
+    void init_modeBreak();
+    void modeBreak();
 
-    /* 80C70DD4 */ virtual int CreateHeap();
-    /* 80C712F4 */ virtual int Execute(Mtx**);
-    /* 80C71D40 */ virtual int Draw();
-    /* 80C71DE4 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80C72034 */ virtual ~daLv6ChangeGate_c() {}
-    /* 80C715BC */ virtual bool eventStart();
+    virtual ~daLv6ChangeGate_c() {}
+    virtual bool eventStart();
 
     int getEventID() { return fopAcM_GetParamBit(this, 24, 8); }
     int getWaitTime() { return fopAcM_GetParamBit(this, 16, 8); }
diff --git a/include/d/actor/d_a_obj_lv6FurikoTrap.h b/include/d/actor/d_a_obj_lv6FurikoTrap.h
index 37b079f8ab..b09952df78 100644
--- a/include/d/actor/d_a_obj_lv6FurikoTrap.h
+++ b/include/d/actor/d_a_obj_lv6FurikoTrap.h
@@ -15,15 +15,15 @@
  */
 class daLv6FurikoTrap_c : public dBgS_MoveBgActor {
 public:
-    /* 80C72510 */ void setBaseMtx();
-    /* 80C72598 */ int CreateHeap();
-    /* 80C72604 */ int create();
-    /* 80C729B4 */ int Execute(Mtx**);
-    /* 80C72CA8 */ void move();
-    /* 80C72D24 */ void init_modeMove();
-    /* 80C72D38 */ void modeMove();
-    /* 80C72EE0 */ int Draw();
-    /* 80C72F94 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void move();
+    void init_modeMove();
+    void modeMove();
+    int Draw();
+    int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcSph mCcDSph;
@@ -44,7 +44,7 @@ STATIC_ASSERT(sizeof(daLv6FurikoTrap_c) == 0x1d18);
 
 class daLv6FurikoTrap_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C7248C */ daLv6FurikoTrap_HIO_c();
+    daLv6FurikoTrap_HIO_c();
 #if DEBUG
     void genMessage(JORMContext*);
 #endif
diff --git a/include/d/actor/d_a_obj_lv6Lblock.h b/include/d/actor/d_a_obj_lv6Lblock.h
index 4a853a30e2..0dbe6a330a 100644
--- a/include/d/actor/d_a_obj_lv6Lblock.h
+++ b/include/d/actor/d_a_obj_lv6Lblock.h
@@ -14,21 +14,21 @@
  */
 class daLv6Lblock_c : public dBgS_MoveBgActor {
 public:
-    /* 80C73464 */ void setBaseMtx();
-    /* 80C73558 */ int create();
-    /* 80C736C0 */ u8 isSwitch();
-    /* 80C7375C */ void moveBlock();
-    /* 80C73850 */ void init_modeWait();
-    /* 80C7385C */ void modeWait();
-    /* 80C73860 */ void init_modeLiftUp();
-    /* 80C7386C */ void modeLiftUp();
-    /* 80C7398C */ void init_modeLiftDown();
-    /* 80C73998 */ void modeLiftDown();
+    void setBaseMtx();
+    int create();
+    u8 isSwitch();
+    void moveBlock();
+    void init_modeWait();
+    void modeWait();
+    void init_modeLiftUp();
+    void modeLiftUp();
+    void init_modeLiftDown();
+    void modeLiftDown();
 
-    /* 80C734EC */ virtual int CreateHeap();
-    /* 80C7370C */ virtual int Execute(Mtx**);
-    /* 80C73AB0 */ virtual int Draw();
-    /* 80C73B54 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwState() { return fopAcM_GetParamBit(this, 12, 4); }
     int getUpMax() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -49,8 +49,8 @@ STATIC_ASSERT(sizeof(daLv6Lblock_c) == 0x5b8);
 
 class daLv6Lblock_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C733EC */ daLv6Lblock_HIO_c();
-    /* 80C73C10 */ virtual ~daLv6Lblock_HIO_c() {}
+    daLv6Lblock_HIO_c();
+    virtual ~daLv6Lblock_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h
index 38f35b1ad9..9809cbcd63 100644
--- a/include/d/actor/d_a_obj_lv6SwGate.h
+++ b/include/d/actor/d_a_obj_lv6SwGate.h
@@ -15,22 +15,22 @@
  */
 class daLv6SwGate_c : public dBgS_MoveBgActor {
 public:
-    /* 80C74004 */ void setBaseMtx();
-    /* 80C74158 */ int CreateHeap();
-    /* 80C7429C */ int create();
-    /* 80C74720 */ u8 isSwitch();
-    /* 80C7476C */ int Execute(Mtx**);
-    /* 80C74A3C */ void moveGate();
-    /* 80C74B48 */ void init_modeWait();
-    /* 80C74B54 */ void modeWait();
-    /* 80C74B58 */ void init_modeOpen();
-    /* 80C74B64 */ void modeOpen();
-    /* 80C74C7C */ void init_modeClose();
-    /* 80C74C94 */ void modeClose();
-    /* 80C74DBC */ void init_modeBreak();
-    /* 80C74E40 */ void modeBreak();
-    /* 80C7524C */ int Draw();
-    /* 80C752F8 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    u8 isSwitch();
+    int Execute(Mtx**);
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
+    void init_modeBreak();
+    void modeBreak();
+    int Draw();
+    int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
     int getSwState() { return fopAcM_GetParamBit(this, 12, 4); }
diff --git a/include/d/actor/d_a_obj_lv6SzGate.h b/include/d/actor/d_a_obj_lv6SzGate.h
index 68fad4fa2a..deb25e4f12 100644
--- a/include/d/actor/d_a_obj_lv6SzGate.h
+++ b/include/d/actor/d_a_obj_lv6SzGate.h
@@ -23,24 +23,24 @@ public:
         MODE_END = 5,
     };
 
-    /* 80C75900 */ void setBaseMtx();
-    /* 80C75A54 */ int CreateHeap();
-    /* 80C75C0C */ cPhs__Step create();
-    /* 80C75E18 */ int Execute(Mtx**);
-    /* 80C75E78 */ void moveGate();
-    /* 80C75F64 */ void init_modeWait();
-    /* 80C75F70 */ void modeWait();
-    /* 80C75FC0 */ void init_modeOpenWait0();
-    /* 80C75FD8 */ void modeOpenWait0();
-    /* 80C76010 */ void init_modeOpenWait();
-    /* 80C76094 */ void modeOpenWait();
-    /* 80C760F0 */ void init_modeOpen();
-    /* 80C760FC */ void modeOpen();
-    /* 80C7624C */ void modeClose();
-    /* 80C76328 */ void init_modeEnd();
-    /* 80C76344 */ void modeEnd();
-    /* 80C7637C */ int Draw();
-    /* 80C76490 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpenWait0();
+    void modeOpenWait0();
+    void init_modeOpenWait();
+    void modeOpenWait();
+    void init_modeOpen();
+    void modeOpen();
+    void modeClose();
+    void init_modeEnd();
+    void modeEnd();
+    int Draw();
+    int Delete();
 
     u32 getWaitTime() { return fopAcM_GetParamBit(this, 8, 8); }
     u32 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -64,8 +64,8 @@ STATIC_ASSERT(sizeof(daLv6SzGate_c) == 0x61c);
 
 class daLv6SzGate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C7586C */ daLv6SzGate_HIO_c();
-    /* 80C76584 */ virtual ~daLv6SzGate_HIO_c() {};
+    daLv6SzGate_HIO_c();
+    virtual ~daLv6SzGate_HIO_c() {};
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv6Tenbin.h b/include/d/actor/d_a_obj_lv6Tenbin.h
index 2ac470aeca..6cdd8e3538 100644
--- a/include/d/actor/d_a_obj_lv6Tenbin.h
+++ b/include/d/actor/d_a_obj_lv6Tenbin.h
@@ -14,18 +14,18 @@
  */
 class daTenbin_c : public dBgS_MoveBgActor {
 public:
-    /* 80C769D0 */ void setBaseMtx();
-    /* 80C76BCC */ int CreateHeap();
-    /* 80C76D10 */ int create();
-    /* 80C76EE0 */ static void rideCallBackRight(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C77078 */ static void rideCallBackLeft(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C77200 */ int Execute(Mtx**);
-    /* 80C772BC */ void procMain();
-    /* 80C77464 */ void init_modeWait();
-    /* 80C77470 */ void modeWait();
-    /* 80C77668 */ void balanceCheck();
-    /* 80C7772C */ int Draw();
-    /* 80C77810 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    static void rideCallBackRight(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    static void rideCallBackLeft(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    int Execute(Mtx**);
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    void balanceCheck();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -66,8 +66,8 @@ STATIC_ASSERT(sizeof(daTenbin_c) == 0x654);
 
 class daTenbin_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C768EC */ daTenbin_HIO_c();
-    /* 80C77904 */ ~daTenbin_HIO_c() {}
+    daTenbin_HIO_c();
+    ~daTenbin_HIO_c() {}
 #if DEBUG
     void genMessage(JORMContext*);
 #endif
diff --git a/include/d/actor/d_a_obj_lv6TogeRoll.h b/include/d/actor/d_a_obj_lv6TogeRoll.h
index 7467157dac..6e6357d552 100644
--- a/include/d/actor/d_a_obj_lv6TogeRoll.h
+++ b/include/d/actor/d_a_obj_lv6TogeRoll.h
@@ -31,31 +31,31 @@ public:
         MODE_BOUND_WAIT,
     };
 
-    /* 80C77CC8 */ void setBaseMtx();
-    /* 80C77D50 */ int CreateHeap();
-    /* 80C77DBC */ int create();
-    /* 80C78294 */ int Execute(Mtx**);
-    /* 80C78638 */ void moveTogeRoll();
-    /* 80C78A8C */ void init_modeBound();
-    /* 80C78B7C */ void modeBound();
-    /* 80C78BD8 */ void modeBound2();
-    /* 80C78C34 */ void init_modeBoundWait();
-    /* 80C78C50 */ void modeBoundWait();
-    /* 80C78CA8 */ void init_modeAcc();
-    /* 80C78CB4 */ void modeAcc();
-    /* 80C78DA0 */ void init_modeMove();
-    /* 80C78DAC */ void modeMove();
-    /* 80C790C4 */ void init_modeBrk();
-    /* 80C790D0 */ void modeBrk();
-    /* 80C792CC */ void init_modeWaitInit();
-    /* 80C792E4 */ void modeWaitInit();
-    /* 80C79318 */ void init_modeWait();
-    /* 80C79324 */ void modeWait();
-    /* 80C79344 */ void init_modeBreak();
-    /* 80C793C8 */ void modeBreak();
-    /* 80C795E8 */ void setNextPoint();
-    /* 80C79714 */ int Draw();
-    /* 80C797B8 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void moveTogeRoll();
+    void init_modeBound();
+    void modeBound();
+    void modeBound2();
+    void init_modeBoundWait();
+    void modeBoundWait();
+    void init_modeAcc();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void init_modeBrk();
+    void modeBrk();
+    void init_modeWaitInit();
+    void modeWaitInit();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
+    void setNextPoint();
+    int Draw();
+    int Delete();
 
     u32 getPathID() { return fopAcM_GetParamBit(this, 0, 8); }
     u32 getSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -96,8 +96,8 @@ STATIC_ASSERT(sizeof(daTogeRoll_c) == 0x117c);
 
 class daTogeRoll_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C77C2C */ daTogeRoll_HIO_c();
-    /* 80C798D0 */ ~daTogeRoll_HIO_c() {}
+    daTogeRoll_HIO_c();
+    ~daTogeRoll_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv6TogeTrap.h b/include/d/actor/d_a_obj_lv6TogeTrap.h
index ca2eb440f1..29e68aad24 100644
--- a/include/d/actor/d_a_obj_lv6TogeTrap.h
+++ b/include/d/actor/d_a_obj_lv6TogeTrap.h
@@ -15,46 +15,46 @@
  */
 class daLv6TogeTrap_c : public dBgS_MoveBgActor {
 public:
-    /* 80C79F10 */ void setBaseMtx();
-    /* 80C7A068 */ int create();
-    /* 80C7A6B0 */ static void* searchSekizoAct(void*, void*);
-    /* 80C7A97C */ void moveLift();
-    /* 80C7ABC8 */ void executeType1();
-    /* 80C7ACA0 */ void init_modeBound();
-    /* 80C7AD40 */ void modeBound();
-    /* 80C7ADA4 */ void init_modeBoundWait();
-    /* 80C7ADC0 */ void modeBoundWait();
-    /* 80C7AE18 */ void init_modeAcc();
-    /* 80C7AE24 */ void modeAcc();
-    /* 80C7AF10 */ void init_modeMove();
-    /* 80C7AF1C */ void modeMove();
-    /* 80C7B234 */ void init_modeBrk();
-    /* 80C7B240 */ void modeBrk();
-    /* 80C7B43C */ void init_modeMove2();
-    /* 80C7B448 */ void modeMove2();
-    /* 80C7B518 */ void init_modeWaitInit();
-    /* 80C7B530 */ void modeWaitInit();
-    /* 80C7B600 */ void init_modeWait();
-    /* 80C7B60C */ void modeWait();
-    /* 80C7B6D4 */ void executeType2();
-    /* 80C7B988 */ void init_modeWaitType2();
-    /* 80C7B9A8 */ void modeWaitType2();
-    /* 80C7BA38 */ void init_modeMoveInitType2();
-    /* 80C7BA50 */ void modeMoveInitType2();
-    /* 80C7BAE8 */ void init_modeAccType2();
-    /* 80C7BAF4 */ void modeAccType2();
-    /* 80C7BC54 */ void init_modeWaitAttackType2();
-    /* 80C7BC7C */ void modeWaitAttackType2();
-    /* 80C7BD64 */ void init_modeRotate();
-    /* 80C7BD70 */ void modeRotate();
-    /* 80C7BED8 */ void init_modeBreak();
-    /* 80C7BFE4 */ void modeBreak();
-    /* 80C7C1D8 */ void setNextPoint();
+    void setBaseMtx();
+    int create();
+    static void* searchSekizoAct(void*, void*);
+    void moveLift();
+    void executeType1();
+    void init_modeBound();
+    void modeBound();
+    void init_modeBoundWait();
+    void modeBoundWait();
+    void init_modeAcc();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void init_modeBrk();
+    void modeBrk();
+    void init_modeMove2();
+    void modeMove2();
+    void init_modeWaitInit();
+    void modeWaitInit();
+    void init_modeWait();
+    void modeWait();
+    void executeType2();
+    void init_modeWaitType2();
+    void modeWaitType2();
+    void init_modeMoveInitType2();
+    void modeMoveInitType2();
+    void init_modeAccType2();
+    void modeAccType2();
+    void init_modeWaitAttackType2();
+    void modeWaitAttackType2();
+    void init_modeRotate();
+    void modeRotate();
+    void init_modeBreak();
+    void modeBreak();
+    void setNextPoint();
 
-    /* 80C79FE8 */ virtual int CreateHeap();
-    /* 80C7A700 */ virtual int Execute(Mtx**);
-    /* 80C7C33C */ virtual int Draw();
-    /* 80C7C3E0 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
     int getType() { return fopAcM_GetParamBit(this, 12, 4); }
diff --git a/include/d/actor/d_a_obj_lv6bemos.h b/include/d/actor/d_a_obj_lv6bemos.h
index 7654ef1dba..84fbf66c31 100644
--- a/include/d/actor/d_a_obj_lv6bemos.h
+++ b/include/d/actor/d_a_obj_lv6bemos.h
@@ -17,18 +17,18 @@ class daObjL6Bm_c : public dBgS_MoveBgActor {
 public:
     typedef void (daObjL6Bm_c::*actionFunc)();
 
-    /* 80C7CE24 */ void initBaseMtx();
-    /* 80C7CE60 */ void setBaseMtx();
-    /* 80C7CED4 */ int Create();
-    /* 80C7CFD0 */ int CreateHeap();
-    /* 80C7D2F8 */ cPhs__Step create1st();
-    /* 80C7D3A4 */ int Execute(Mtx**);
-    /* 80C7D4F4 */ void action();
-    /* 80C7D598 */ void actionWait();
-    /* 80C7D6CC */ void actionFindPlayer();
-    /* 80C7D894 */ void actionAttack();
-    /* 80C7D898 */ int Draw();
-    /* 80C7DABC */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create1st();
+    int Execute(Mtx**);
+    void action();
+    void actionWait();
+    void actionFindPlayer();
+    void actionAttack();
+    int Draw();
+    int Delete();
 
     void setAction(u8 action) { mAction = action; }
 
diff --git a/include/d/actor/d_a_obj_lv6bemos2.h b/include/d/actor/d_a_obj_lv6bemos2.h
index a2c00efe83..90f2b0f26a 100644
--- a/include/d/actor/d_a_obj_lv6bemos2.h
+++ b/include/d/actor/d_a_obj_lv6bemos2.h
@@ -18,36 +18,36 @@ public:
     typedef void (daObjLv6Bm_c::*actionFunc)();
     typedef void (daObjLv6Bm_c::*effectFunc)();
 
-    /* 80C7E30C */ void initBaseMtx();
-    /* 80C7E374 */ void setBaseMtx();
-    /* 80C7E448 */ int Create();
-    /* 80C7E764 */ int CreateHeap();
-    /* 80C7EB7C */ cPhs__Step create1st();
-    /* 80C7EC6C */ int Execute(Mtx**);
-    /* 80C7EE50 */ void action();
-    /* 80C7F2A4 */ void calcBeam();
-    /* 80C7F904 */ int checkFindPlayer();
-    /* 80C7FA54 */ s8 checkSearchPlayer();
-    /* 80C7FBA4 */ f32 getSearchDistance();
-    /* 80C7FBFC */ f32 getBeamSearchDistance();
-    /* 80C7FC54 */ void effect_proc();
-    /* 80C7FD8C */ void effectWait();
-    /* 80C7FD90 */ void initEffectSet0();
-    /* 80C7FEC4 */ void effectSet0();
-    /* 80C7FF78 */ void initActionSwWait();
-    /* 80C7FFB8 */ void actionSwWait();
-    /* 80C802AC */ void initActionWarning();
-    /* 80C802C0 */ void actionWarning();
-    /* 80C803D8 */ void initActionFindPlayer();
-    /* 80C80538 */ void actionFindPlayer();
-    /* 80C80684 */ void initActionAttack();
-    /* 80C8082C */ void actionAttack();
-    /* 80C80F48 */ void initActionDead();
-    /* 80C81154 */ void actionDead();
-    /* 80C81428 */ void initActionEnd();
-    /* 80C814FC */ void actionEnd();
-    /* 80C81500 */ int Draw();
-    /* 80C816A8 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create1st();
+    int Execute(Mtx**);
+    void action();
+    void calcBeam();
+    int checkFindPlayer();
+    s8 checkSearchPlayer();
+    f32 getSearchDistance();
+    f32 getBeamSearchDistance();
+    void effect_proc();
+    void effectWait();
+    void initEffectSet0();
+    void effectSet0();
+    void initActionSwWait();
+    void actionSwWait();
+    void initActionWarning();
+    void actionWarning();
+    void initActionFindPlayer();
+    void actionFindPlayer();
+    void initActionAttack();
+    void actionAttack();
+    void initActionDead();
+    void actionDead();
+    void initActionEnd();
+    void actionEnd();
+    int Draw();
+    int Delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwNo2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv6egate.h b/include/d/actor/d_a_obj_lv6egate.h
index 6fbdc4d185..c8b7f0098b 100644
--- a/include/d/actor/d_a_obj_lv6egate.h
+++ b/include/d/actor/d_a_obj_lv6egate.h
@@ -15,17 +15,17 @@
  */
 class daObjLv6EGate_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80C82078 */ int create1st();
-    /* 80C82108 */ void setMtx();
-    /* 80C822DC */ void offDisp();
-    /* 80C82330 */ void onDisp();
+    int create1st();
+    void setMtx();
+    void offDisp();
+    void onDisp();
 
-    /* 80C82178 */ virtual int CreateHeap();
-    /* 80C82180 */ virtual int Create();
-    /* 80C82388 */ virtual int Execute(Mtx**);
-    /* 80C82690 */ virtual int Draw();
-    /* 80C826A0 */ virtual int Delete();
-    /* 80C82A80 */ virtual ~daObjLv6EGate_c() {}
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual ~daObjLv6EGate_c() {}
 
     int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     int getType() { return fopAcM_GetParamBit(this, 8, 1); }
diff --git a/include/d/actor/d_a_obj_lv6elevta.h b/include/d/actor/d_a_obj_lv6elevta.h
index 3687bb28d3..b98ff06f58 100644
--- a/include/d/actor/d_a_obj_lv6elevta.h
+++ b/include/d/actor/d_a_obj_lv6elevta.h
@@ -19,15 +19,15 @@ class daObjLv6ElevtA_c : public dBgS_MoveBgActor,
 public:
     daObjLv6ElevtA_c() : dEvLib_callback_c(this) {}
     virtual ~daObjLv6ElevtA_c() {};
-    /* 80C82D38 */ int create1st();
-    /* 80C82DC8 */ void setMtx();
-    /* 80C82E38 */ int CreateHeap();
-    /* 80C82EA8 */ int Create();
-    /* 80C83028 */ bool eventStart();
-    /* 80C830BC */ void moveAngle(void*);
-    /* 80C8321C */ int Execute(Mtx**);
-    /* 80C83538 */ int Draw();
-    /* 80C835DC */ int Delete();
+    int create1st();
+    void setMtx();
+    int CreateHeap();
+    int Create();
+    bool eventStart();
+    void moveAngle(void*);
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); };
     int getSw2No() { return fopAcM_GetParamBit(this, 8, 8); };
diff --git a/include/d/actor/d_a_obj_lv6swturn.h b/include/d/actor/d_a_obj_lv6swturn.h
index 7bc36ef55e..3b6e6abac7 100644
--- a/include/d/actor/d_a_obj_lv6swturn.h
+++ b/include/d/actor/d_a_obj_lv6swturn.h
@@ -14,19 +14,19 @@
  */
 class daObjLv6SwTurn_c : public dBgS_MoveBgActor {
 public:
-    /* 80C83A98 */ void initBaseMtx();
-    /* 80C83AD4 */ void setBaseMtx();
-    /* 80C83B38 */ int Create();
-    /* 80C83C10 */ int CreateHeap();
-    /* 80C83C80 */ int create1st();
-    /* 80C83D04 */ int Execute(Mtx**);
-    /* 80C83D94 */ void mode_proc_call();
-    /* 80C83E20 */ void init_modeWait();
-    /* 80C83E58 */ void modeWait();
-    /* 80C84238 */ void init_modeRotate();
-    /* 80C8425C */ void modeRotate();
-    /* 80C844F8 */ int Draw();
-    /* 80C8459C */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void mode_proc_call();
+    void init_modeWait();
+    void modeWait();
+    void init_modeRotate();
+    void modeRotate();
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit((void*)this, 0, 8); };
     u8 getSwbit2() { return fopAcM_GetParamBit((void*)this, 8, 8); };
diff --git a/include/d/actor/d_a_obj_lv7BsGate.h b/include/d/actor/d_a_obj_lv7BsGate.h
index 464552ff2a..8d89674f5c 100644
--- a/include/d/actor/d_a_obj_lv7BsGate.h
+++ b/include/d/actor/d_a_obj_lv7BsGate.h
@@ -14,20 +14,20 @@
  */
 class daLv7BsGate_c : public dBgS_MoveBgActor {
 public:
-    /* 80C84930 */ void setBaseMtx();
-    /* 80C84A4C */ int create();
-    /* 80C84C1C */ void moveGate();
-    /* 80C84D24 */ void init_modeWait();
-    /* 80C84D30 */ void modeWait();
-    /* 80C84D34 */ void init_modeOpen();
-    /* 80C84D40 */ void modeOpen();
-    /* 80C84E94 */ void init_modeClose();
-    /* 80C84EA0 */ void modeClose();
+    void setBaseMtx();
+    int create();
+    void moveGate();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
 
-    /* 80C849CC */ virtual int CreateHeap();
-    /* 80C84BCC */ virtual int Execute(Mtx**);
-    /* 80C84FF4 */ virtual int Draw();
-    /* 80C85098 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getType() { return fopAcM_GetParamBit(this, 0, 4); }
     int getSw() { return fopAcM_GetParamBit(this, 4, 8); }
diff --git a/include/d/actor/d_a_obj_lv7PropellerY.h b/include/d/actor/d_a_obj_lv7PropellerY.h
index 90c4535ed2..414336519b 100644
--- a/include/d/actor/d_a_obj_lv7PropellerY.h
+++ b/include/d/actor/d_a_obj_lv7PropellerY.h
@@ -14,24 +14,24 @@
  */
 class daPropY_c : public dBgS_MoveBgActor {
 public:
-    /* 80C8550C */ void setBaseMtx();
-    /* 80C85624 */ int create();
-    /* 80C85860 */ void procMain();
-    /* 80C859B4 */ void init_modeMoveWait();
-    /* 80C859C0 */ void modeMoveWait();
-    /* 80C859C4 */ void init_modeMove();
-    /* 80C859E0 */ void modeMove();
-    /* 80C85B08 */ void init_modeWait();
-    /* 80C85B24 */ void modeWait();
-    /* 80C85B5C */ void init_modeMove2();
-    /* 80C85B84 */ void modeMove2();
-    /* 80C85CAC */ void init_modeStop();
-    /* 80C85DD0 */ void modeStop();
+    void setBaseMtx();
+    int create();
+    void procMain();
+    void init_modeMoveWait();
+    void modeMoveWait();
+    void init_modeMove();
+    void modeMove();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMove2();
+    void modeMove2();
+    void init_modeStop();
+    void modeStop();
 
-    /* 80C855A4 */ virtual int CreateHeap();
-    /* 80C85810 */ virtual int Execute(Mtx**);
-    /* 80C85F14 */ virtual int Draw();
-    /* 80C85FB8 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getType() { return fopAcM_GetParamBit(this, 0, 4); }
     int getSw() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv7bridge.h b/include/d/actor/d_a_obj_lv7bridge.h
index de35cc8181..938b87e08f 100644
--- a/include/d/actor/d_a_obj_lv7bridge.h
+++ b/include/d/actor/d_a_obj_lv7bridge.h
@@ -18,20 +18,20 @@ class daObjSwSpinner_c;
  */
 class daObjLv7Brg_c : public dBgS_MoveBgActor {
 public:
-    /* 80C863EC */ daObjSwSpinner_c* search_swspinner();
-    /* 80C86454 */ void initBaseMtx();
-    /* 80C864B4 */ void setBaseMtx();
-    /* 80C86A44 */ int create1st();
-    /* 80C86E68 */ void action();
-    /* 80C86F44 */ void mode_action();
-    /* 80C87210 */ void mode_end();
-    /* 80C87214 */ void calcCoPos();
+    daObjSwSpinner_c* search_swspinner();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void mode_action();
+    void mode_end();
+    void calcCoPos();
 
-    /* 80C867CC */ virtual int CreateHeap();
-    /* 80C865B8 */ virtual int Create();
-    /* 80C86B40 */ virtual int Execute(Mtx**);
-    /* 80C87304 */ virtual int Draw();
-    /* 80C87458 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_lv8KekkaiTrap.h b/include/d/actor/d_a_obj_lv8KekkaiTrap.h
index 53b6587eaa..aa68df0114 100644
--- a/include/d/actor/d_a_obj_lv8KekkaiTrap.h
+++ b/include/d/actor/d_a_obj_lv8KekkaiTrap.h
@@ -14,20 +14,20 @@
  */
 class daKekaiTrap_c : public dBgS_MoveBgActor {
 public:
-    /* 80C87D40 */ void setBaseMtx();
-    /* 80C87E48 */ int create();
-    /* 80C88000 */ void moveMain();
-    /* 80C88104 */ void init_modeWait();
-    /* 80C88110 */ void modeWait();
-    /* 80C88114 */ void init_modeMoveUp();
-    /* 80C88138 */ void modeMoveUp();
-    /* 80C881F0 */ void init_modeMoveDown();
-    /* 80C88214 */ void modeMoveDown();
+    void setBaseMtx();
+    int create();
+    void moveMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveUp();
+    void modeMoveUp();
+    void init_modeMoveDown();
+    void modeMoveDown();
 
-    /* 80C87DC8 */ virtual int CreateHeap();
-    /* 80C87FB0 */ virtual int Execute(Mtx**);
-    /* 80C882C8 */ virtual int Draw();
-    /* 80C8836C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getType() { return fopAcM_GetParamBit(this, 0, 4); }
     int getSwBit() { return fopAcM_GetParamBit(this, 4, 8); }
diff --git a/include/d/actor/d_a_obj_lv8Lift.h b/include/d/actor/d_a_obj_lv8Lift.h
index 8235c72ee5..c5a8ae9f27 100644
--- a/include/d/actor/d_a_obj_lv8Lift.h
+++ b/include/d/actor/d_a_obj_lv8Lift.h
@@ -28,36 +28,36 @@ public:
         MODE_INIT_SET2_e
     };
 
-    /* 80C887D8 */ void setBaseMtx();
-    /* 80C88860 */ int CreateHeap();
-    /* 80C88928 */ int create();
-    /* 80C88D6C */ void lightSet();
-    /* 80C88DBC */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C88DD4 */ int Execute(Mtx**);
-    /* 80C88E34 */ void moveLift();
-    /* 80C890B8 */ void modeAcc();
-    /* 80C89198 */ void init_modeMove();
-    /* 80C891A4 */ void modeMove();
-    /* 80C894BC */ void init_modeBrk();
-    /* 80C894C8 */ void modeBrk();
-    /* 80C896C8 */ void init_modeWaitInit();
-    /* 80C896D4 */ void modeWaitInit();
-    /* 80C89708 */ void init_modeWait();
-    /* 80C89714 */ void modeWait();
-    /* 80C89720 */ void init_modeMoveWait();
-    /* 80C8972C */ void modeMoveWait();
-    /* 80C89770 */ void init_modeOnAnm();
-    /* 80C89820 */ void modeOnAnm();
-    /* 80C89874 */ void init_modeStop();
-    /* 80C898DC */ void modeStop();
-    /* 80C899D0 */ void init_modeInitSet();
-    /* 80C89A04 */ void modeInitSet();
-    /* 80C89A24 */ void init_modeInitSet2();
-    /* 80C89A58 */ void modeInitSet2();
-    /* 80C89A78 */ void liftReset();
-    /* 80C89ADC */ void setNextPoint();
-    /* 80C89C10 */ int Draw();
-    /* 80C89DC8 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    void lightSet();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    int Execute(Mtx**);
+    void moveLift();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void init_modeBrk();
+    void modeBrk();
+    void init_modeWaitInit();
+    void modeWaitInit();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveWait();
+    void modeMoveWait();
+    void init_modeOnAnm();
+    void modeOnAnm();
+    void init_modeStop();
+    void modeStop();
+    void init_modeInitSet();
+    void modeInitSet();
+    void init_modeInitSet2();
+    void modeInitSet2();
+    void liftReset();
+    void setNextPoint();
+    int Draw();
+    int Delete();
 
     u8 getPthID() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getMoveSpeed() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -104,8 +104,8 @@ STATIC_ASSERT(sizeof(daL8Lift_c) == 0x830);
 
 class daL8Lift_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8872C */ daL8Lift_HIO_c();
-    /* 80C89EA4 */ virtual ~daL8Lift_HIO_c() {}
+    daL8Lift_HIO_c();
+    virtual ~daL8Lift_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv8OptiLift.h b/include/d/actor/d_a_obj_lv8OptiLift.h
index c593ed99f7..5a437079c7 100644
--- a/include/d/actor/d_a_obj_lv8OptiLift.h
+++ b/include/d/actor/d_a_obj_lv8OptiLift.h
@@ -26,36 +26,36 @@ public:
         MODE_INIT_SET2_e,
     };
 
-    /* 80C8A3B0 */ void setBaseMtx();
-    /* 80C8A500 */ int create();
-    /* 80C8A780 */ void lightSet();
-    /* 80C8A7D0 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80C8A848 */ void moveLift();
-    /* 80C8AAC4 */ void init_modeAcc();
-    /* 80C8AAD0 */ void modeAcc();
-    /* 80C8ABB0 */ void init_modeMove();
-    /* 80C8ABBC */ void modeMove();
-    /* 80C8AED4 */ void init_modeBrk();
-    /* 80C8AEE0 */ void modeBrk();
-    /* 80C8B100 */ void init_modeMoveInit();
-    /* 80C8B1B0 */ void modeMoveInit();
-    /* 80C8B1F0 */ void init_modeMoveWait();
-    /* 80C8B230 */ void modeMoveWait();
-    /* 80C8B288 */ void init_modeWait();
-    /* 80C8B294 */ void modeWait();
-    /* 80C8B298 */ void init_modeStop();
-    /* 80C8B318 */ void modeStop();
-    /* 80C8B428 */ void init_modeInitSet();
-    /* 80C8B464 */ void modeInitSet();
-    /* 80C8B484 */ void init_modeInitSet2();
-    /* 80C8B4B8 */ void modeInitSet2();
-    /* 80C8B4D8 */ void liftReset();
-    /* 80C8B53C */ void setNextPoint();
+    void setBaseMtx();
+    int create();
+    void lightSet();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    void moveLift();
+    void init_modeAcc();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void init_modeBrk();
+    void modeBrk();
+    void init_modeMoveInit();
+    void modeMoveInit();
+    void init_modeMoveWait();
+    void modeMoveWait();
+    void init_modeWait();
+    void modeWait();
+    void init_modeStop();
+    void modeStop();
+    void init_modeInitSet();
+    void modeInitSet();
+    void init_modeInitSet2();
+    void modeInitSet2();
+    void liftReset();
+    void setNextPoint();
 
-    /* 80C8A438 */ virtual int CreateHeap();
-    /* 80C8A7E8 */ virtual int Execute(Mtx**);
-    /* 80C8B66C */ virtual int Draw();
-    /* 80C8B824 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getPthID() { return fopAcM_GetParamBit(this, 8, 8); }
     int getMoveSpped() { return fopAcM_GetParamBit(this, 0x10, 4); }
@@ -91,8 +91,8 @@ STATIC_ASSERT(sizeof(daOptiLift_c) == 0x618);
 
 class daOptiLift_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8A30C */ daOptiLift_HIO_c();
-    /* 80C8B900 */ virtual ~daOptiLift_HIO_c() {}
+    daOptiLift_HIO_c();
+    virtual ~daOptiLift_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_lv8UdFloor.h b/include/d/actor/d_a_obj_lv8UdFloor.h
index 66b576ae9a..9e66bf9a5b 100644
--- a/include/d/actor/d_a_obj_lv8UdFloor.h
+++ b/include/d/actor/d_a_obj_lv8UdFloor.h
@@ -14,25 +14,25 @@
  */
 class daUdFloor_c : public dBgS_MoveBgActor {
 public:
-    /* 80C8BDC8 */ void setBaseMtx();
-    /* 80C8BEE4 */ int create();
-    /* 80C8C12C */ void moveLift();
-    /* 80C8C264 */ void init_modeWait();
-    /* 80C8C270 */ void modeWait();
-    /* 80C8C274 */ void init_modeUpMoveInit();
-    /* 80C8C310 */ void modeUpMoveInit();
-    /* 80C8C354 */ u8 colorAnm(int);
-    /* 80C8C5E4 */ void init_modeUpMove();
-    /* 80C8C68C */ void modeUpMove();
-    /* 80C8C7F8 */ void init_modeDownMoveInit();
-    /* 80C8C81C */ void modeDownMoveInit();
-    /* 80C8C860 */ void init_modeDownMove();
-    /* 80C8C8E4 */ void modeDownMove();
+    void setBaseMtx();
+    int create();
+    void moveLift();
+    void init_modeWait();
+    void modeWait();
+    void init_modeUpMoveInit();
+    void modeUpMoveInit();
+    u8 colorAnm(int);
+    void init_modeUpMove();
+    void modeUpMove();
+    void init_modeDownMoveInit();
+    void modeDownMoveInit();
+    void init_modeDownMove();
+    void modeDownMove();
 
-    /* 80C8BE64 */ virtual int CreateHeap();
-    /* 80C8C0DC */ virtual int Execute(Mtx**);
-    /* 80C8C994 */ virtual int Draw();
-    /* 80C8CA78 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getModelType() { return current.angle.x & 0xFF; }
     u8 getTimer() { return (current.angle.x & 0xFF00) >> 8; }
diff --git a/include/d/actor/d_a_obj_lv9SwShutter.h b/include/d/actor/d_a_obj_lv9SwShutter.h
index 7797d16db2..06607f5c1c 100644
--- a/include/d/actor/d_a_obj_lv9SwShutter.h
+++ b/include/d/actor/d_a_obj_lv9SwShutter.h
@@ -14,20 +14,20 @@
  */
 class daLv9SwShutter_c : public dBgS_MoveBgActor {
 public:
-    /* 80C8CF38 */ void setBaseMtx();
-    /* 80C8D040 */ int create();
-    /* 80C8D1B8 */ void moveShutter();
-    /* 80C8D2BC */ void init_modeWait();
-    /* 80C8D2C8 */ void modeWait();
-    /* 80C8D2CC */ void init_modeOpen();
-    /* 80C8D2D8 */ void modeOpen();
-    /* 80C8D440 */ void init_modeClose();
-    /* 80C8D458 */ void modeClose();
+    void setBaseMtx();
+    int create();
+    void moveShutter();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
 
-    /* 80C8CFD4 */ virtual int CreateHeap();
-    /* 80C8D168 */ virtual int Execute(Mtx**);
-    /* 80C8D5D0 */ virtual int Draw();
-    /* 80C8D674 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_magLift.h b/include/d/actor/d_a_obj_magLift.h
index 4ab4ae9d9c..e9b4e8bcf3 100644
--- a/include/d/actor/d_a_obj_magLift.h
+++ b/include/d/actor/d_a_obj_magLift.h
@@ -24,26 +24,26 @@ public:
         MODE_MOVE_WAIT_e
     };
 
-    /* 80C8DAA0 */ void setBaseMtx();
-    /* 80C8DB28 */ int CreateHeap();
-    /* 80C8DB94 */ int create();
-    /* 80C8DD38 */ int Execute(Mtx**);
-    /* 80C8DD88 */ void moveLift();
-    /* 80C8DE98 */ void modeAcc();
-    /* 80C8DF20 */ void init_modeMove();
-    /* 80C8DF2C */ void modeMove();
-    /* 80C8E1EC */ void init_modeBrk();
-    /* 80C8E1F8 */ void modeBrk();
-    /* 80C8E260 */ void init_modeWaitInit();
-    /* 80C8E26C */ void modeWaitInit();
-    /* 80C8E2A0 */ void init_modeWait();
-    /* 80C8E2AC */ void modeWait();
-    /* 80C8E2B8 */ void init_modeMoveWait();
-    /* 80C8E2C4 */ void modeMoveWait();
-    /* 80C8E318 */ void modeDead();
-    /* 80C8E31C */ void setNextPoint();
-    /* 80C8E450 */ int Draw();
-    /* 80C8E4F4 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void moveLift();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void init_modeBrk();
+    void modeBrk();
+    void init_modeWaitInit();
+    void modeWaitInit();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveWait();
+    void modeMoveWait();
+    void modeDead();
+    void setNextPoint();
+    int Draw();
+    int Delete();
 
     int getMoveSpeed() { return fopAcM_GetParamBit(this, 0x8, 4); }
 
@@ -67,8 +67,8 @@ STATIC_ASSERT(sizeof(daMagLift_c) == 0x5d4);
 
 class daMagLift_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8DA2C */ daMagLift_HIO_c();
-    /* 80C8E5B0 */ virtual ~daMagLift_HIO_c() {}
+    daMagLift_HIO_c();
+    virtual ~daMagLift_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_magLiftRot.h b/include/d/actor/d_a_obj_magLiftRot.h
index 9f3c13ffa9..647fcee80a 100644
--- a/include/d/actor/d_a_obj_magLiftRot.h
+++ b/include/d/actor/d_a_obj_magLiftRot.h
@@ -14,20 +14,20 @@
  */
 class daMagLiftRot_c : public dBgS_MoveBgActor {
 public:
-    /* 80C8EA28 */ void setBaseMtx();
-    /* 80C8EC64 */ int create();
-    /* 80C8F02C */ void moveLift();
-    /* 80C8F264 */ void init_modeMove();
-    /* 80C8F4A0 */ void modeMove();
-    /* 80C8F538 */ void init_modeWait();
-    /* 80C8F7CC */ void modeWait();
-    /* 80C8F804 */ void init_modeMoveWait();
-    /* 80C8F810 */ void modeMoveWait();
+    void setBaseMtx();
+    int create();
+    void moveLift();
+    void init_modeMove();
+    void modeMove();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveWait();
+    void modeMoveWait();
 
-    /* 80C8EB1C */ virtual int CreateHeap();
-    /* 80C8EF94 */ virtual int Execute(Mtx**);
-    /* 80C8F86C */ virtual int Draw();
-    /* 80C8F970 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -63,8 +63,8 @@ STATIC_ASSERT(sizeof(daMagLiftRot_c) == 0x634);
 
 class daMagLiftRot_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8E94C */ daMagLiftRot_HIO_c();
-    /* 80C8FA3C */ virtual ~daMagLiftRot_HIO_c() {}
+    daMagLiftRot_HIO_c();
+    virtual ~daMagLiftRot_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_magne_arm.h b/include/d/actor/d_a_obj_magne_arm.h
index 8abc6e529c..3b610935f0 100644
--- a/include/d/actor/d_a_obj_magne_arm.h
+++ b/include/d/actor/d_a_obj_magne_arm.h
@@ -40,74 +40,74 @@ public:
         MODE_END_e
     };
 
-    /* 8058F358 */ void getBpartsOffset(cXyz*);
-    /* 8058F3D4 */ void getDpartsOffset(cXyz*);
-    /* 8058F46C */ void getEpartsOffset(cXyz*);
-    /* 8058F504 */ void getFpartsOffset(cXyz*);
-    /* 8058F610 */ void getRopeStartPos(cXyz*);
-    /* 8058F6B4 */ void initBaseMtx();
-    /* 8058F77C */ void setBaseMtx();
-    /* 8058FA50 */ int Create();
-    /* 8058FCF8 */ int CreateHeap();
-    /* 80590244 */ cPhs__Step phase_0();
-    /* 805902D8 */ cPhs__Step phase_1();
-    /* 80590364 */ cPhs__Step phase_2();
-    /* 80590460 */ int create1st();
-    /* 80590504 */ int Execute(Mtx**);
-    /* 80590818 */ void action();
-    /* 80590B7C */ void init_typeA_modeWait();
-    /* 80590B8C */ void typeA_modeWait();
-    /* 80590BE0 */ void init_typeA_modeMholeOn();
-    /* 80590C48 */ void typeA_modeMholeOn();
-    /* 80590C68 */ void typeA_modeLiftUp();
-    /* 80590C6C */ void typeA_modeLiftDown();
-    /* 80590C70 */ void init_typeA_modeRotate();
-    /* 80590CE4 */ void typeA_modeRotate();
-    /* 80590E24 */ void typeA_modeEnd();
-    /* 80590E28 */ void init_typeB_modeWait();
-    /* 80590E38 */ void typeB_modeWait();
-    /* 80590E8C */ void init_typeB_modeMholeOn();
-    /* 80590EF4 */ void typeB_modeMholeOn();
-    /* 80590F14 */ void init_typeB_modeLiftUp();
-    /* 80590F30 */ void typeB_modeLiftUp();
-    /* 80591004 */ void typeB_modeLiftDown();
-    /* 805910E8 */ void init_typeB_modeRotate();
-    /* 80591160 */ void typeB_modeRotate();
-    /* 805912AC */ void typeB_modeEnd();
-    /* 805912B0 */ void init_typeC_modeWait();
-    /* 805912C0 */ void typeC_modeWait();
-    /* 80591314 */ void init_typeC_modeMholeOn();
-    /* 8059137C */ void typeC_modeMholeOn();
-    /* 8059139C */ void init_typeC_modeLiftUp();
-    /* 805913B8 */ void typeC_modeLiftUp();
-    /* 8059148C */ void init_typeC_modeLiftDown();
-    /* 805914A8 */ void typeC_modeLiftDown();
-    /* 8059158C */ void init_typeC_modeRotate();
-    /* 80591604 */ void typeC_modeRotate();
-    /* 80591750 */ void typeC_modeEnd();
-    /* 80591754 */ void init_typeD_modeWait();
-    /* 80591764 */ void typeD_modeWait();
-    /* 805917B8 */ void init_typeD_modeMholeOn();
-    /* 80591820 */ void typeD_modeMholeOn();
-    /* 80591840 */ void init_typeD_modeLiftUp();
-    /* 8059185C */ void typeD_modeLiftUp();
-    /* 80591930 */ void init_typeD_modeLiftDown();
-    /* 8059194C */ void typeD_modeLiftDown();
-    /* 80591A30 */ void init_typeD_modeRotate();
-    /* 80591AA8 */ void typeD_modeRotate();
-    /* 80591BF4 */ void typeD_modeEnd();
-    /* 80591BF8 */ void setMagneHoleEffect();
-    /* 80591BFC */ void endMagneHoleEffect();
-    /* 80591C38 */ void calcHimo();
-    /* 80591E18 */ void seStart_MOVESTART();
-    /* 80591E80 */ void seStartLevel_MOVE();
-    /* 80591EE8 */ void seStart_STOP();
-    /* 80591F50 */ void seStartLevel_UP();
-    /* 80591FB8 */ void seStartLevel_DOWN();
-    /* 80592020 */ void seStart_SWING();
-    /* 80592088 */ int Draw();
-    /* 805923C4 */ void debugDraw();
-    /* 805923C8 */ int Delete();
+    void getBpartsOffset(cXyz*);
+    void getDpartsOffset(cXyz*);
+    void getEpartsOffset(cXyz*);
+    void getFpartsOffset(cXyz*);
+    void getRopeStartPos(cXyz*);
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step phase_0();
+    cPhs__Step phase_1();
+    cPhs__Step phase_2();
+    int create1st();
+    int Execute(Mtx**);
+    void action();
+    void init_typeA_modeWait();
+    void typeA_modeWait();
+    void init_typeA_modeMholeOn();
+    void typeA_modeMholeOn();
+    void typeA_modeLiftUp();
+    void typeA_modeLiftDown();
+    void init_typeA_modeRotate();
+    void typeA_modeRotate();
+    void typeA_modeEnd();
+    void init_typeB_modeWait();
+    void typeB_modeWait();
+    void init_typeB_modeMholeOn();
+    void typeB_modeMholeOn();
+    void init_typeB_modeLiftUp();
+    void typeB_modeLiftUp();
+    void typeB_modeLiftDown();
+    void init_typeB_modeRotate();
+    void typeB_modeRotate();
+    void typeB_modeEnd();
+    void init_typeC_modeWait();
+    void typeC_modeWait();
+    void init_typeC_modeMholeOn();
+    void typeC_modeMholeOn();
+    void init_typeC_modeLiftUp();
+    void typeC_modeLiftUp();
+    void init_typeC_modeLiftDown();
+    void typeC_modeLiftDown();
+    void init_typeC_modeRotate();
+    void typeC_modeRotate();
+    void typeC_modeEnd();
+    void init_typeD_modeWait();
+    void typeD_modeWait();
+    void init_typeD_modeMholeOn();
+    void typeD_modeMholeOn();
+    void init_typeD_modeLiftUp();
+    void typeD_modeLiftUp();
+    void init_typeD_modeLiftDown();
+    void typeD_modeLiftDown();
+    void init_typeD_modeRotate();
+    void typeD_modeRotate();
+    void typeD_modeEnd();
+    void setMagneHoleEffect();
+    void endMagneHoleEffect();
+    void calcHimo();
+    void seStart_MOVESTART();
+    void seStartLevel_MOVE();
+    void seStart_STOP();
+    void seStartLevel_UP();
+    void seStartLevel_DOWN();
+    void seStart_SWING();
+    int Draw();
+    void debugDraw();
+    int Delete();
 
     u32 getMoveType() { return fopAcM_GetParamBit(this, 8, 4); }
     u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_maki.h b/include/d/actor/d_a_obj_maki.h
index b0d1056b6c..c15b0b9ac1 100644
--- a/include/d/actor/d_a_obj_maki.h
+++ b/include/d/actor/d_a_obj_maki.h
@@ -38,8 +38,8 @@ public:
 STATIC_ASSERT(sizeof(obj_maki_class) == 0x730);
 class daObj_Maki_HIO_c {
 public:
-    /* 80C8FE0C */ daObj_Maki_HIO_c();
-    /* 80C9089C */ virtual ~daObj_Maki_HIO_c() {};
+    daObj_Maki_HIO_c();
+    virtual ~daObj_Maki_HIO_c() {};
 
     /* 0x04 */ s8 field_0x4;
 };
diff --git a/include/d/actor/d_a_obj_master_sword.h b/include/d/actor/d_a_obj_master_sword.h
index a8c54f4939..e99b8832d7 100644
--- a/include/d/actor/d_a_obj_master_sword.h
+++ b/include/d/actor/d_a_obj_master_sword.h
@@ -26,14 +26,14 @@ public:
         MODE_0_e,
     };
 
-    /* 80C90AF8 */ void initWait();
-    /* 80C90B50 */ void executeWait();
-    /* 80C90C50 */ static int createHeapCallBack(fopAc_ac_c* i_this);
-    /* 80C90C70 */ int CreateHeap();
-    /* 80C90DB8 */ int create();
-    /* 80C90F6C */ inline void create_init();
-    /* 80C91448 */ ~daObjMasterSword_c();
-    /* 80C91714 */ int draw();
+    void initWait();
+    void executeWait();
+    static int createHeapCallBack(fopAc_ac_c* i_this);
+    int CreateHeap();
+    int create();
+    inline void create_init();
+    ~daObjMasterSword_c();
+    int draw();
 
     inline void initCollision();
     inline void setCollision();
diff --git a/include/d/actor/d_a_obj_mato.h b/include/d/actor/d_a_obj_mato.h
index be3c583780..0800bff849 100644
--- a/include/d/actor/d_a_obj_mato.h
+++ b/include/d/actor/d_a_obj_mato.h
@@ -33,18 +33,18 @@ struct MatoData_s {
  */
 class daObjMATO_c : public fopAc_ac_c {
 public:
-    /* 80C91B58 */ void setAction(void (daObjMATO_c::*)(int), int);
-    /* 80C91D48 */ void action();
-    /* 80C91DE4 */ void hit_check();
-    /* 80C91ECC */ void start_wait(int);
-    /* 80C91F74 */ void wait(int);
-    /* 80C92044 */ void disappear(int);
-    /* 80C921A8 */ void getRupee(int);
-    /* 80C922AC */ int execute();
-    /* 80C92380 */ int _delete();
-    /* 80C9243C */ void setBaseMtx();
-    /* 80C92650 */ int mato_init();
-    /* 80C927AC */ int create();
+    void setAction(void (daObjMATO_c::*)(int), int);
+    void action();
+    void hit_check();
+    void start_wait(int);
+    void wait(int);
+    void disappear(int);
+    void getRupee(int);
+    int execute();
+    int _delete();
+    void setBaseMtx();
+    int mato_init();
+    int create();
 
     inline int CreateHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_metalbox.h b/include/d/actor/d_a_obj_metalbox.h
index 6ecdcc5eb7..b7f2fb10cd 100644
--- a/include/d/actor/d_a_obj_metalbox.h
+++ b/include/d/actor/d_a_obj_metalbox.h
@@ -24,14 +24,14 @@ private:
     /* 0x7e4 */ dCcD_Cyl mCyl;
     /* 0x904 */ u8 field_0x804[0x944 - 0x93c];
 public:
-    /* 80592E98 */ void initBaseMtx();
-    /* 80592ED4 */ void setBaseMtx();
-    /* 80592F48 */ int Create();
-    /* 80592FD4 */ int CreateHeap();
-    /* 80593044 */ int create();
-    /* 805932C4 */ int Execute(Mtx**);
-    /* 805932F0 */ int Draw();
-    /* 80593394 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 };
 
 STATIC_ASSERT(sizeof(daObjMBox_c) == 0x944);
diff --git a/include/d/actor/d_a_obj_mgate.h b/include/d/actor/d_a_obj_mgate.h
index 3e3beaf53a..5b86c8aa17 100644
--- a/include/d/actor/d_a_obj_mgate.h
+++ b/include/d/actor/d_a_obj_mgate.h
@@ -24,15 +24,15 @@ public:
         /* 1 */ TYPE_RIGHT,
     };
 
-    /* 805935B8 */ void initBaseMtx();
-    /* 80593630 */ void setBaseMtx();
-    /* 8059388C */ int create1st();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
 
-    /* 805937AC */ virtual int CreateHeap();
-    /* 80593760 */ virtual int Create();
-    /* 80593988 */ virtual int Execute(Mtx**);
-    /* 80593C4C */ virtual int Draw();
-    /* 80593D18 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
     u8 getKind() { return fopAcM_GetParamBit(this, 1, 4); }
diff --git a/include/d/actor/d_a_obj_mhole.h b/include/d/actor/d_a_obj_mhole.h
index 44e1aea6f0..aa692338d2 100644
--- a/include/d/actor/d_a_obj_mhole.h
+++ b/include/d/actor/d_a_obj_mhole.h
@@ -19,17 +19,17 @@ public:
         EFF_SMALL_e
     };
 
-    /* 80C92FD8 */ void initBaseMtx();
-    /* 80C93014 */ void setBaseMtx();
-    /* 80C9307C */ int Create();
-    /* 80C93198 */ int checkParent();
-    /* 80C93204 */ int CreateHeap();
-    /* 80C934E0 */ int create();
-    /* 80C936A8 */ int execute();
-    /* 80C93928 */ void effectSet();
-    /* 80C93A88 */ void effectEnd();
-    /* 80C93ADC */ int draw();
-    /* 80C93CAC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int checkParent();
+    int CreateHeap();
+    int create();
+    int execute();
+    void effectSet();
+    void effectEnd();
+    int draw();
+    int _delete();
 
     void setOn() { mIsOn = TRUE; }
     u8 getType() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -55,8 +55,8 @@ STATIC_ASSERT(sizeof(daObjMHole_c) == 0x734);
 
 class daObjMHole_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C55D0C */ daObjMHole_HIO_c();
-    /* 80C56970 */ ~daObjMHole_HIO_c() {}
+    daObjMHole_HIO_c();
+    ~daObjMHole_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_mie.h b/include/d/actor/d_a_obj_mie.h
index 5df82ca376..080c68f76d 100644
--- a/include/d/actor/d_a_obj_mie.h
+++ b/include/d/actor/d_a_obj_mie.h
@@ -36,7 +36,7 @@ public:
     }
 
     void genMessage(JORMContext*);
-    /* 80C95A40 */ virtual ~daObj_Mie_HIO_c() {}
+    virtual ~daObj_Mie_HIO_c() {}
 
     daObj_Mie_HIOParam mParams;
 };
@@ -97,22 +97,22 @@ public:
         TYPE_0,
     };
 
-    /* 80C93FCC */ virtual ~daObj_Mie_c();
-    /* 80C941C8 */ int create();
-    /* 80C945E8 */ int CreateHeap();
-    /* 80C94674 */ int Delete();
-    /* 80C946A8 */ int Execute();
-    /* 80C95140 */ int Draw();
-    /* 80C952D8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80C952F8 */ static void* srchPouyaa(void*, void*);
-    /* 80C9536C */ void setEnvTevColor();
-    /* 80C953C8 */ void setRoomNo();
-    /* 80C9540C */ void setMtx();
-    /* 80C954BC */ s16 calcRollAngle(s16, int);
-    /* 80C9555C */ int getWallAngle(s16, s16*);
-    /* 80C956EC */ void setSmokePrtcl();
-    /* 80C95768 */ void setWaterPrtcl();
-    /* 80C95890 */ void setHamonPrtcl();
+    virtual ~daObj_Mie_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void* srchPouyaa(void*, void*);
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
+    s16 calcRollAngle(s16, int);
+    int getWallAngle(s16, s16*);
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
 
     u8 getType() { return TYPE_0; }
     void popup(f32 param_1, f32 param_2, cXyz* param_3) {
diff --git a/include/d/actor/d_a_obj_mirror_6pole.h b/include/d/actor/d_a_obj_mirror_6pole.h
index 59d106e582..99ccd3f82f 100644
--- a/include/d/actor/d_a_obj_mirror_6pole.h
+++ b/include/d/actor/d_a_obj_mirror_6pole.h
@@ -22,15 +22,15 @@ public:
         MODE_MAX_e,
     };
 
-    /* 80C95E18 */ void initWait();
-    /* 80C95E2C */ void executeWait();
-    /* 80C95E88 */ void initDemo();
-    /* 80C95E8C */ void executeDemo();
-    /* 80C95EFC */ inline void setBaseMtx();
+    void initWait();
+    void executeWait();
+    void initDemo();
+    void executeDemo();
+    inline void setBaseMtx();
     inline void initBaseMtx();
     inline void create_init();
-    /* 80C95F50 */ static int createHeapCallBack(fopAc_ac_c* i_this);
-    /* 80C95F70 */ int CreateHeap();
+    static int createHeapCallBack(fopAc_ac_c* i_this);
+    int CreateHeap();
 
     inline ~daObjMirror6Pole_c();
 
diff --git a/include/d/actor/d_a_obj_mirror_chain.h b/include/d/actor/d_a_obj_mirror_chain.h
index 69cdadb038..723466ae06 100644
--- a/include/d/actor/d_a_obj_mirror_chain.h
+++ b/include/d/actor/d_a_obj_mirror_chain.h
@@ -8,8 +8,8 @@
 
 class dScissorBegin_packet_c : public J3DPacket {
 public:
-    /* 80C96698 */ void draw();
-    /* 80C97F98 */ ~dScissorBegin_packet_c() {}
+    void draw();
+    ~dScissorBegin_packet_c() {}
 
     cXyz* getQuad() { return mQuad; }
     void entryPacket() { j3dSys.getDrawBuffer(1)->entryImm(this, 0); }
@@ -19,8 +19,8 @@ public:
 
 class dScissorEnd_packet_c : public J3DPacket {
 public:
-    /* 80C96DE8 */ void draw();
-    /* 80C97F3C */ ~dScissorEnd_packet_c() {}
+    void draw();
+    ~dScissorEnd_packet_c() {}
 
     void entryPacket() { j3dSys.getDrawBuffer(1)->entryImm(this, 0); }
 };
@@ -35,11 +35,11 @@ public:
  */
 class daObjMirrorChain_c : public fopAc_ac_c {
 public:
-    /* 80C96E40 */ int createHeap();
-    /* 80C975EC */ void initBaseMtx();
-    /* 80C97618 */ void setBaseMtx();
-    /* 80C976B8 */ inline int draw();
-    /* 80C97988 */ int execute();
+    int createHeap();
+    void initBaseMtx();
+    void setBaseMtx();
+    inline int draw();
+    int execute();
     inline ~daObjMirrorChain_c();
     inline void create_init();
     inline cPhs__Step create();
diff --git a/include/d/actor/d_a_obj_mirror_sand.h b/include/d/actor/d_a_obj_mirror_sand.h
index 07e065c046..db27ccfaeb 100644
--- a/include/d/actor/d_a_obj_mirror_sand.h
+++ b/include/d/actor/d_a_obj_mirror_sand.h
@@ -14,8 +14,8 @@
  */
 class daObjMirrorSand_c : public fopAc_ac_c {
 public:
-    /* 80C98508 */ void initBaseMtx();
-    /* 80C98534 */ void setBaseMtx();
+    void initBaseMtx();
+    void setBaseMtx();
 
     inline ~daObjMirrorSand_c();
 
diff --git a/include/d/actor/d_a_obj_mirror_screw.h b/include/d/actor/d_a_obj_mirror_screw.h
index 6a5d40e9bc..41f44c6a77 100644
--- a/include/d/actor/d_a_obj_mirror_screw.h
+++ b/include/d/actor/d_a_obj_mirror_screw.h
@@ -35,18 +35,18 @@ public:
         /* 1 */ ACT_DOWN,
     };
 
-    /* 80C98AD8 */ void initWait();
-    /* 80C98AE4 */ void executeWait();
-    /* 80C98C00 */ void initDown();
-    /* 80C98F04 */ void executeDown();
+    void initWait();
+    void executeWait();
+    void initDown();
+    void executeDown();
     inline cPhs__Step create();
-    /* 80C992F4 */ int CreateHeap();
+    int CreateHeap();
     inline void setBaseMtx();
     inline void initBaseMtx();
-    /* 80C99364 */ int Create();
-    /* 80C99490 */ int Execute(Mtx**);
-    /* 80C99608 */ int Draw();
-    /* 80C996AC */ int Delete();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u8 getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
     u8 getEventID() { return (fopAcM_GetParam(this) >> 0x10) & 0xff; }
diff --git a/include/d/actor/d_a_obj_mirror_table.h b/include/d/actor/d_a_obj_mirror_table.h
index 031d588631..f573c7828f 100644
--- a/include/d/actor/d_a_obj_mirror_table.h
+++ b/include/d/actor/d_a_obj_mirror_table.h
@@ -14,16 +14,16 @@
  */
 class daObjMirrorTable_c : public fopAc_ac_c {
 public:
-    /* 80C99938 */ inline int createHeap();
-    /* 80C99F7C */ inline bool isSwitch();
+    inline int createHeap();
+    inline bool isSwitch();
     inline void checkOnPanel();
-    /* 80C9A298 */ int draw();
+    int draw();
     inline void setBaseMtx();
-    /* 80C9A4D0 */ int execute();
+    int execute();
     inline ~daObjMirrorTable_c();
-    /* 80C9AB30 */ cPhs__Step create();
-    /* 80C9ABFC */ void create_init();
-    /* 80C9AFD0 */ void initBaseMtx();
+    cPhs__Step create();
+    void create_init();
+    void initBaseMtx();
 
     u8 getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
     void setAnmSpeed(f32 speed) { mpTableUpBckAnm->setPlaySpeed(speed); }
diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h
index 8a59e11a84..5e3158e8af 100644
--- a/include/d/actor/d_a_obj_movebox.h
+++ b/include/d/actor/d_a_obj_movebox.h
@@ -97,18 +97,18 @@ namespace daObjMovebox {
             STATE_40_e = 0x40,
         };
 
-        /* 8047DAEC */ Bgc_c();
-        /* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
+        Bgc_c();
+        void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
                                     f32);
-        /* 8047DD88 */ void wrt_pos(cXyz const&);
-        /* 8047DE58 */ void wall_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
+        void wrt_pos(cXyz const&);
+        void wall_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int,
                                      s16, f32);
-        /* 8047E134 */ void proc_vertical(daObjMovebox::Act_c*);
-        /* 8047E2D4 */ bool chk_wall_pre(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*,
+        void proc_vertical(daObjMovebox::Act_c*);
+        bool chk_wall_pre(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*,
                                          int, s16);
-        /* 8047E350 */ bool chk_wall_touch(daObjMovebox::Act_c const*,
+        bool chk_wall_touch(daObjMovebox::Act_c const*,
                                            daObjMovebox::BgcSrc_c const*, s16);
-        /* 8047E5A0 */ bool chk_wall_touch2(daObjMovebox::Act_c const*,
+        bool chk_wall_touch2(daObjMovebox::Act_c const*,
                                             daObjMovebox::BgcSrc_c const*, int, s16);
 
         static const daObjMovebox::BgcSrc_c M_lin5[];
@@ -136,38 +136,38 @@ namespace daObjMovebox {
             PRM_1C_e = 0x1C,
         };
 
-        /* 8047E628 */ int prm_get_swSave1() const;
-        /* 8047E650 */ void prmZ_init();
-        /* 8047E680 */ void prmX_init();
-        /* 8047E6B0 */ const daObjMovebox::Hio_c::Attr_c& attr() const;
-        /* 8047E6C8 */ void set_mtx();
-        /* 8047E7B0 */ void init_mtx();
-        /* 8047E7F4 */ void path_init();
-        /* 8047E92C */ void path_save();
-        /* 8047EBEC */ static void RideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-        /* 8047ED10 */ static fopAc_ac_c* PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
-        /* 8047F11C */ void afl_sway();
-        /* 8047F38C */ int check_to_walk();
-        /* 8047F50C */ void clr_moment_cnt();
-        /* 8047F530 */ bool chk_appear() const;
-        /* 8047F5CC */ void eff_smoke_slip_start();
-        /* 8047F634 */ void mode_wait_init();
-        /* 8047F6A8 */ void mode_wait();
-        /* 8047F8D4 */ void mode_walk_init();
-        /* 8047F8F4 */ void mode_walk();
-        /* 8047FCBC */ void mode_afl_init();
-        /* 8047FCE4 */ void mode_afl();
-        /* 8047FF5C */ void sound_slip();
-        /* 80480020 */ void sound_limit();
-        /* 804800E4 */ void sound_land();
-        /* 804801A8 */ void vib_land();
-        /* 804801FC */ void eff_land_smoke();
+        int prm_get_swSave1() const;
+        void prmZ_init();
+        void prmX_init();
+        const daObjMovebox::Hio_c::Attr_c& attr() const;
+        void set_mtx();
+        void init_mtx();
+        void path_init();
+        void path_save();
+        static void RideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+        static fopAc_ac_c* PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
+        void afl_sway();
+        int check_to_walk();
+        void clr_moment_cnt();
+        bool chk_appear() const;
+        void eff_smoke_slip_start();
+        void mode_wait_init();
+        void mode_wait();
+        void mode_walk_init();
+        void mode_walk();
+        void mode_afl_init();
+        void mode_afl();
+        void sound_slip();
+        void sound_limit();
+        void sound_land();
+        void vib_land();
+        void eff_land_smoke();
 
-        /* 8047EB48 */ virtual int CreateHeap();
-        /* 8047EE0C */ virtual int Create();
-        /* 8048027C */ virtual int Execute(Mtx**);
-        /* 80480728 */ virtual int Draw();
-        /* 804808FC */ virtual int Delete();
+        virtual int CreateHeap();
+        virtual int Create();
+        virtual int Execute(Mtx**);
+        virtual int Draw();
+        virtual int Delete();
 
         inline void mode_proc_call();
         inline int Mthd_Create();
diff --git a/include/d/actor/d_a_obj_msima.h b/include/d/actor/d_a_obj_msima.h
index b528a5356f..bed0025cff 100644
--- a/include/d/actor/d_a_obj_msima.h
+++ b/include/d/actor/d_a_obj_msima.h
@@ -80,8 +80,8 @@ STATIC_ASSERT(sizeof(obj_msima_class) == 0x8a4);
 
 class daObj_Msima_HIO_c : public JORReflexible {
 public:
-    /* 80C9B40C */ daObj_Msima_HIO_c();
-    /* 80C9CAA0 */ virtual ~daObj_Msima_HIO_c() {}
+    daObj_Msima_HIO_c();
+    virtual ~daObj_Msima_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_mvstair.h b/include/d/actor/d_a_obj_mvstair.h
index 45eeb51dde..be8129ece8 100644
--- a/include/d/actor/d_a_obj_mvstair.h
+++ b/include/d/actor/d_a_obj_mvstair.h
@@ -29,31 +29,31 @@ public:
         MODE_LOWER_e,
     };
 
-    /* 80C9D098 */ void initBaseMtx();
-    /* 80C9D0D4 */ void setBaseMtx();
-    /* 80C9D338 */ int create1st();
-    /* 80C9D41C */ void event_proc_call();
-    /* 80C9D4D8 */ void mode_proc_call();
-    /* 80C9D82C */ int actionWait();
-    /* 80C9D8EC */ int actionOrderEvent();
-    /* 80C9D95C */ int actionEvent();
-    /* 80C9D9BC */ int actionEnd();
-    /* 80C9D9C4 */ int modeWaitUpperInit();
-    /* 80C9D9F4 */ int modeWaitUpper();
-    /* 80C9DA98 */ int modeUpperInit();
-    /* 80C9DADC */ int modeUpper();
-    /* 80C9DF18 */ int modeWaitLowerInit();
-    /* 80C9DF60 */ int modeWaitLower();
-    /* 80C9E004 */ int modeLowerInit();
-    /* 80C9E034 */ int modeLower();
-    /* 80C9E3D8 */ void setParticle();
-    /* 80C9E5A0 */ void removeParticle();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void event_proc_call();
+    void mode_proc_call();
+    int actionWait();
+    int actionOrderEvent();
+    int actionEvent();
+    int actionEnd();
+    int modeWaitUpperInit();
+    int modeWaitUpper();
+    int modeUpperInit();
+    int modeUpper();
+    int modeWaitLowerInit();
+    int modeWaitLower();
+    int modeLowerInit();
+    int modeLower();
+    void setParticle();
+    void removeParticle();
 
-    /* 80C9D2B8 */ virtual int CreateHeap();
-    /* 80C9D148 */ virtual int Create();
-    /* 80C9D594 */ virtual int Execute(Mtx**);
-    /* 80C9D710 */ virtual int Draw();
-    /* 80C9D7B4 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_myogan.h b/include/d/actor/d_a_obj_myogan.h
index f4a0240a3e..a0f464c2ee 100644
--- a/include/d/actor/d_a_obj_myogan.h
+++ b/include/d/actor/d_a_obj_myogan.h
@@ -31,8 +31,8 @@ public:
 
 class daObj_Myogan_HIO_c {
 public:
-    /* 80C9EBAC */ daObj_Myogan_HIO_c();
-    /* 80C9F1F0 */ virtual ~daObj_Myogan_HIO_c() {}
+    daObj_Myogan_HIO_c();
+    virtual ~daObj_Myogan_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mSize;
diff --git a/include/d/actor/d_a_obj_nagaisu.h b/include/d/actor/d_a_obj_nagaisu.h
index 836b9d8b89..c01be2cc60 100644
--- a/include/d/actor/d_a_obj_nagaisu.h
+++ b/include/d/actor/d_a_obj_nagaisu.h
@@ -10,15 +10,15 @@ class daObjNagaisu_c;
 // child seat / couch?
 class daObjIsuChild_c {
 public:
-    /* 80C9FA90 */ daObjIsuChild_c();
-    /* 80C9FCDC */ virtual ~daObjIsuChild_c();
-    /* 80C9FD4C */ int createHeap();
-    /* 80C9FE28 */ void create(daObjNagaisu_c*, dCcD_Stts*);
-    /* 80C9FF54 */ int execute();
-    /* 80CA0034 */ int draw(dMdl_c*);
-    /* 80CA00B8 */ void Delete();
-    /* 80CA0118 */ bool chkHit();
-    /* 80CA0180 */ void callEmt();
+    daObjIsuChild_c();
+    virtual ~daObjIsuChild_c();
+    int createHeap();
+    void create(daObjNagaisu_c*, dCcD_Stts*);
+    int execute();
+    int draw(dMdl_c*);
+    void Delete();
+    bool chkHit();
+    void callEmt();
     
     void setDeadFlg(bool i_flg) { mIsDead = i_flg; }
     bool getDeadFlg() { return mIsDead; }
@@ -49,15 +49,15 @@ public:
  */
 class daObjNagaisu_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80C9F3D8 */ daObjNagaisu_c();
-    /* 80C9F4B8 */ virtual ~daObjNagaisu_c();
-    /* 80C9F5A8 */ int createHeap();
-    /* 80C9F668 */ int create();
-    /* 80C9F7A8 */ int Delete();
-    /* 80C9F81C */ int draw();
-    /* 80C9F8C4 */ int execute();
-    /* 80C9F914 */ void init();
-    /* 80C9F944 */ void setIsu();
+    daObjNagaisu_c();
+    virtual ~daObjNagaisu_c();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setIsu();
 
     static const int REMOVE_ISU_IDX[];
 
diff --git a/include/d/actor/d_a_obj_nameplate.h b/include/d/actor/d_a_obj_nameplate.h
index fc184a3eb6..7c1c77cc3c 100644
--- a/include/d/actor/d_a_obj_nameplate.h
+++ b/include/d/actor/d_a_obj_nameplate.h
@@ -15,15 +15,15 @@
  */
 class daObjNameplate_c : public fopAc_ac_c {
 public:
-    /* 80594098 */ void create_init();
-    /* 8059415C */ void initBaseMtx();
-    /* 8059417C */ void setBaseMtx();
-    /* 80594248 */ void initCcSphere();
-    /* 805942B8 */ void setCcSphere();
-    /* 8059434C */ void calcAngle();
-    /* 805945CC */ void calcSpring();
-    /* 80594754 */ int checkHitAngle();
-    /* 805947F8 */ void messageProc();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void initCcSphere();
+    void setCcSphere();
+    void calcAngle();
+    void calcSpring();
+    int checkHitAngle();
+    void messageProc();
 
     struct M_attrs {
         /* 0x00 */ f32 radius1;
diff --git a/include/d/actor/d_a_obj_nan.h b/include/d/actor/d_a_obj_nan.h
index 1dc55637a5..708d75199e 100644
--- a/include/d/actor/d_a_obj_nan.h
+++ b/include/d/actor/d_a_obj_nan.h
@@ -20,24 +20,24 @@ class daObjNAN_c : public dInsect_c {
 public:
     typedef void (daObjNAN_c::*actionFunc)();
 
-    /* 80CA05D4 */ void setAction(actionFunc);
-    /* 80CA0978 */ void nan_posMove();
-    /* 80CA0A2C */ void turn();
-    /* 80CA0D9C */ u8 nan_WalkAnm();
-    /* 80CA0E7C */ void wait();
-    /* 80CA1184 */ void walk();
-    /* 80CA1904 */ void bin_wait();
-    /* 80CA1A20 */ void bin_action();
-    /* 80CA1B50 */ void nan_setParticle();
-    /* 80CA1D5C */ void hook();
-    /* 80CA1F60 */ void boomerang();
-    /* 80CA2368 */ void drop();
-    /* 80CA2658 */ void hit_check();
-    /* 80CA270C */ void action();
-    /* 80CA276C */ int execute();
-    /* 80CA2904 */ int _delete();
-    /* 80CA296C */ void setBaseMtx();
-    /* 80CA2B68 */ int create();
+    void setAction(actionFunc);
+    void nan_posMove();
+    void turn();
+    u8 nan_WalkAnm();
+    void wait();
+    void walk();
+    void bin_wait();
+    void bin_action();
+    void nan_setParticle();
+    void hook();
+    void boomerang();
+    void drop();
+    void hit_check();
+    void action();
+    int execute();
+    int _delete();
+    void setBaseMtx();
+    int create();
 
     inline int CreateHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_nougu.h b/include/d/actor/d_a_obj_nougu.h
index c1a2592a76..414c269f61 100644
--- a/include/d/actor/d_a_obj_nougu.h
+++ b/include/d/actor/d_a_obj_nougu.h
@@ -27,18 +27,18 @@ public:
     /* 0xE24 */ u32 mShadowId;
     /* 0xE28 */ u8 mType;
 
-    /* 80CA3C0C */ virtual ~daObj_Nougu_c();
-    /* 80CA3E24 */ int create();
-    /* 80CA4328 */ int CreateHeap();
-    /* 80CA43A0 */ int Delete();
-    /* 80CA43D4 */ int Execute();
-    /* 80CA45F4 */ int Draw();
-    /* 80CA46B8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CA46D8 */ const char* getResName();
-    /* 80CA46E8 */ int isDelete();
-    /* 80CA4708 */ void setEnvTevColor();
-    /* 80CA4764 */ void setRoomNo();
-    /* 80CA47A4 */ void setMtx();
+    virtual ~daObj_Nougu_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    const char* getResName();
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 
     int getType() { return 0; }
 
@@ -56,7 +56,7 @@ struct daObj_Nougu_HIOParam {
 
 class daObj_Nougu_Param_c {
 public:
-    /* 80CA494C */ virtual ~daObj_Nougu_Param_c() {}
+    virtual ~daObj_Nougu_Param_c() {}
 
     static const daObj_Nougu_HIOParam m;
 };
diff --git a/include/d/actor/d_a_obj_octhashi.h b/include/d/actor/d_a_obj_octhashi.h
index b6e1018a82..4b5ef5459a 100644
--- a/include/d/actor/d_a_obj_octhashi.h
+++ b/include/d/actor/d_a_obj_octhashi.h
@@ -16,22 +16,22 @@
  */
 class daObjOCTHASHI_c : public dBgS_MoveBgActor {
 public:
-    /* 80CA4BB8 */ void initCcCylinder();
-    /* 80CA4DFC */ void SetCoSph();
-    /* 80CA4EA4 */ void SetCoCyl();
-    /* 80CA4F24 */ void HakaiSet2(int);
-    /* 80CA52F0 */ void HakaiMotion2();
-    /* 80CA54E4 */ void CylAction();
-    /* 80CA55C4 */ void SphAction();
-    /* 80CA5844 */ void SphAction2();
-    /* 80CA58F4 */ void Action();
-    /* 80CA59BC */ void setBaseMtx();
-    /* 80CA5AE0 */ int CreateHeap();
-    /* 80CA5B98 */ int create();
-    /* 80CA62A4 */ int Create();
-    /* 80CA62F8 */ int Execute(Mtx**);
-    /* 80CA636C */ int Draw();
-    /* 80CA6444 */ int Delete();
+    void initCcCylinder();
+    void SetCoSph();
+    void SetCoCyl();
+    void HakaiSet2(int);
+    void HakaiMotion2();
+    void CylAction();
+    void SphAction();
+    void SphAction2();
+    void Action();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5a0 */ cXyz field_0x5a0[8];
diff --git a/include/d/actor/d_a_obj_oiltubo.h b/include/d/actor/d_a_obj_oiltubo.h
index aed90aec3b..35b102211e 100644
--- a/include/d/actor/d_a_obj_oiltubo.h
+++ b/include/d/actor/d_a_obj_oiltubo.h
@@ -15,23 +15,23 @@ class daObj_Oiltubo_c : public fopAc_ac_c {
 public:
     typedef int (daObj_Oiltubo_c::*processFn)(void*);
 
-    /* 80CA6718 */ int create();
-    /* 80CA6B28 */ int CreateHeap();
-    /* 80CA6C5C */ int Delete();
-    /* 80CA6CA0 */ int Execute();
-    /* 80CA6EDC */ int Draw();
-    /* 80CA6FC8 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CA6FE8 */ const char* getResName();
-    /* 80CA6FF8 */ void restart();
-    /* 80CA7068 */ void initialize();
-    /* 80CA720C */ int setProcess(processFn);
-    /* 80CA72BC */ void setParam();
-    /* 80CA7318 */ void setEnvTevColor();
-    /* 80CA7374 */ void setRoomNo();
-    /* 80CA73B8 */ void setMtx();
-    /* 80CA7430 */ void setAttnPos();
-    /* 80CA7478 */ BOOL chkEvent();
-    /* 80CA74C8 */ int wait(void*);
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    const char* getResName();
+    void restart();
+    void initialize();
+    int setProcess(processFn);
+    void setParam();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
+    void setAttnPos();
+    BOOL chkEvent();
+    int wait(void*);
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -54,7 +54,7 @@ private:
     /* 0xACC */ u16 mMode;
 
 public:
-    /* 80CA7628 */ virtual ~daObj_Oiltubo_c() {}
+    virtual ~daObj_Oiltubo_c() {}
 };
 
 STATIC_ASSERT(sizeof(daObj_Oiltubo_c) == 0xAD4);
diff --git a/include/d/actor/d_a_obj_onsen.h b/include/d/actor/d_a_obj_onsen.h
index b9744f8862..64af56f1d5 100644
--- a/include/d/actor/d_a_obj_onsen.h
+++ b/include/d/actor/d_a_obj_onsen.h
@@ -14,14 +14,14 @@
  */
 class daObjOnsen_c : public dBgS_MoveBgActor {
 public:
-    /* 80CA7B58 */ void initBaseMtx();
-    /* 80CA7BB0 */ void setBaseMtx();
-    /* 80CA7C28 */ int Create();
-    /* 80CA7C74 */ int CreateHeap();
-    /* 80CA7E44 */ int create1st();
-    /* 80CA7EEC */ int Execute(Mtx**);
-    /* 80CA7F1C */ int Draw();
-    /* 80CA8008 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u32 getType() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_onsenFire.h b/include/d/actor/d_a_obj_onsenFire.h
index 2ffdf7210a..1f533aa5a4 100644
--- a/include/d/actor/d_a_obj_onsenFire.h
+++ b/include/d/actor/d_a_obj_onsenFire.h
@@ -13,8 +13,8 @@
  */
 class daObjOnsenFire_c : public fopAc_ac_c {
 public:    
-    /* 80CA8278 */ int create();
-    /* 80CA82F4 */ int execute();
+    int create();
+    int execute();
 };
 
 #endif /* D_A_OBJ_ONSENFIRE_H */
diff --git a/include/d/actor/d_a_obj_onsenTaru.h b/include/d/actor/d_a_obj_onsenTaru.h
index 916d38ce21..c7e992bb11 100644
--- a/include/d/actor/d_a_obj_onsenTaru.h
+++ b/include/d/actor/d_a_obj_onsenTaru.h
@@ -23,29 +23,29 @@ public:
         MODE_SINK_e,
     };
 
-    /* 80CA86C0 */ void setBaseMtx();
-    /* 80CA87B4 */ int create();
-    /* 80CA8C20 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CA8C4C */ BOOL chkSinkAll();
-    /* 80CA8C70 */ BOOL chkWaterLineIn();
-    /* 80CA8C94 */ void bgCheck();
-    /* 80CA9184 */ void mode_proc_call();
-    /* 80CA929C */ void mode_init_wait();
-    /* 80CA92CC */ void mode_proc_wait();
-    /* 80CA92F0 */ void mode_init_carry();
-    /* 80CA9320 */ void mode_proc_carry();
-    /* 80CA93C0 */ void mode_init_drop();
-    /* 80CA9400 */ void mode_proc_drop();
-    /* 80CA9424 */ void mode_init_break();
-    /* 80CA9514 */ void mode_proc_break();
-    /* 80CA9518 */ void mode_init_sink();
-    /* 80CA9530 */ void mode_proc_sink();
-    /* 80CA9620 */ void breakEffSet();
+    void setBaseMtx();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    BOOL chkSinkAll();
+    BOOL chkWaterLineIn();
+    void bgCheck();
+    void mode_proc_call();
+    void mode_init_wait();
+    void mode_proc_wait();
+    void mode_init_carry();
+    void mode_proc_carry();
+    void mode_init_drop();
+    void mode_proc_drop();
+    void mode_init_break();
+    void mode_proc_break();
+    void mode_init_sink();
+    void mode_proc_sink();
+    void breakEffSet();
 
-    /* 80CA8748 */ virtual int CreateHeap();
-    /* 80CA8F38 */ virtual int Execute();
-    /* 80CA98B8 */ virtual int Draw();
-    /* 80CA995C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute();
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
     int getSw2() { return fopAcM_GetParamBit(this, 8, 8); }
@@ -81,8 +81,8 @@ STATIC_ASSERT(sizeof(daOnsTaru_c) == 0x948);
 
 class daOnsTaru_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80CA85CC */ daOnsTaru_HIO_c();
-    /* 80CA9A78 */ virtual ~daOnsTaru_HIO_c() {}
+    daOnsTaru_HIO_c();
+    virtual ~daOnsTaru_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_ornament_cloth.h b/include/d/actor/d_a_obj_ornament_cloth.h
index 03fb626d9d..2a7e3e79ed 100644
--- a/include/d/actor/d_a_obj_ornament_cloth.h
+++ b/include/d/actor/d_a_obj_ornament_cloth.h
@@ -30,8 +30,8 @@ public:
 
 class ClothJoint_c {
 public:
-    /* 80595B9C */ ~ClothJoint_c();
-    /* 80595CA8 */ ClothJoint_c();
+    ~ClothJoint_c();
+    ClothJoint_c();
 
     /* 0x00 */ cXyz field_0x0;
     /* 0x0C */ cXyz field_0xc;
@@ -44,12 +44,12 @@ public:
 
 class daObjOnCloth_c : public fopAc_ac_c {
 public:
-    /* 80595038 */ void create_init();
-    /* 80595158 */ void initBaseMtx();
-    /* 80595178 */ void setBaseMtx();
-    /* 805951DC */ void setNormalClothPos();
-    /* 805954B0 */ void calcJointAngle();
-    /* 80595638 */ void checkPlayerMove();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setNormalClothPos();
+    void calcJointAngle();
+    void checkPlayerMove();
 
     f32 getColorType() { return fopAcM_GetParam(this) & 0xFF; }
     inline void getJointAngle(csXyz& jointAngle, int param_2) { jointAngle = mClothJoints[param_2].field_0x30; }
diff --git a/include/d/actor/d_a_obj_pdoor.h b/include/d/actor/d_a_obj_pdoor.h
index d7fa7813c5..c7d5fbdde8 100644
--- a/include/d/actor/d_a_obj_pdoor.h
+++ b/include/d/actor/d_a_obj_pdoor.h
@@ -21,19 +21,19 @@ public:
         MODE_ROTATE,
     };
 
-    /* 80CA9F9C */ void initBaseMtx();
-    /* 80CA9FD8 */ void setBaseMtx();
-    /* 80CAA03C */ int Create();
-    /* 80CAA14C */ int CreateHeap();
-    /* 80CAA1BC */ int create1st();
-    /* 80CAA23C */ int Execute(Mtx**);
-    /* 80CAA290 */ void mode_proc_call();
-    /* 80CAA31C */ void init_modeWait();
-    /* 80CAA354 */ void modeWait();
-    /* 80CAA698 */ void init_modeRotate();
-    /* 80CAA6B4 */ void modeRotate();
-    /* 80CAA968 */ int Draw();
-    /* 80CAAA0C */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void mode_proc_call();
+    void init_modeWait();
+    void modeWait();
+    void init_modeRotate();
+    void modeRotate();
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_pdtile.h b/include/d/actor/d_a_obj_pdtile.h
index da4d43bd24..7c30fb1e00 100644
--- a/include/d/actor/d_a_obj_pdtile.h
+++ b/include/d/actor/d_a_obj_pdtile.h
@@ -23,15 +23,15 @@ public:
         TYPE_4,
     };
 
-    /* 80CAACE0 */ int create1st();
-    /* 80CAAE80 */ void setMtx();
-    /* 80CAAF90 */ void rideActor(fopAc_ac_c*);
-    /* 80CAB1F0 */ int CreateHeap();
-    /* 80CAB258 */ int Create();
-    /* 80CAB374 */ int Execute(Mtx**);
-    /* 80CABF50 */ int Draw();
-    /* 80CAC094 */ int Delete();
-    /* 80CAC374 */ virtual ~daObjPDtile_c() {}
+    int create1st();
+    void setMtx();
+    void rideActor(fopAc_ac_c*);
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    virtual ~daObjPDtile_c() {}
 
     u8 getType() { return fopAcM_GetParamBit(this, 0, 4); }
 
diff --git a/include/d/actor/d_a_obj_pdwall.h b/include/d/actor/d_a_obj_pdwall.h
index 8c0d3025f8..45e8213f39 100644
--- a/include/d/actor/d_a_obj_pdwall.h
+++ b/include/d/actor/d_a_obj_pdwall.h
@@ -14,15 +14,15 @@
  */
 class daObjPDwall_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
-    /* 80CAC7F8 */ int create1st();
-    /* 80CAC8DC */ void setMtx();
+    int create1st();
+    void setMtx();
 
-    /* 80CACA44 */ virtual int CreateHeap();
-    /* 80CACBA8 */ virtual int Create();
-    /* 80CACCE0 */ virtual int Execute(Mtx**);
-    /* 80CACF14 */ virtual int Draw();
-    /* 80CACFD4 */ virtual int Delete();
-    /* 80CAD140 */ virtual ~daObjPDwall_c() {}
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual ~daObjPDwall_c() {}
 
     int getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_picture.h b/include/d/actor/d_a_obj_picture.h
index 02ae88e9c8..3460b60077 100644
--- a/include/d/actor/d_a_obj_picture.h
+++ b/include/d/actor/d_a_obj_picture.h
@@ -14,24 +14,24 @@
  */
 class daObjPicture_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80CAD318 */ daObjPicture_c();
-    /* 80CAD6C8 */ virtual ~daObjPicture_c();
-    /* 80CAD908 */ int createHeap();
-    /* 80CADC18 */ int create();
-    /* 80CADFB0 */ int Delete();
-    /* 80CAE05C */ int draw();
-    /* 80CAE1B8 */ int execute();
-    /* 80CAE510 */ void init();
-    /* 80CAE5B0 */ void setPicModelMtx();
-    /* 80CAE638 */ void setTmgModelMtx();
-    /* 80CAE6C4 */ void getLinePosPic(int, cXyz*);
-    /* 80CAE744 */ void getPosTmg(cXyz*);
-    /* 80CAE76C */ void setLinePos();
-    /* 80CAE8E8 */ void moveLineFall1();
-    /* 80CAEA60 */ void moveLineFall2();
-    /* 80CAED28 */ bool chkHitRope();
-    /* 80CAEDDC */ bool chkHitBombTg();
-    /* 80CAEE90 */ void setPicAtCol();
+    daObjPicture_c();
+    virtual ~daObjPicture_c();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setPicModelMtx();
+    void setTmgModelMtx();
+    void getLinePosPic(int, cXyz*);
+    void getPosTmg(cXyz*);
+    void setLinePos();
+    void moveLineFall1();
+    void moveLineFall2();
+    bool chkHitRope();
+    bool chkHitBombTg();
+    void setPicAtCol();
 
     int getArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
     int getSW_0() { return fopAcM_GetParamBit(this, 4, 8); }
diff --git a/include/d/actor/d_a_obj_pillar.h b/include/d/actor/d_a_obj_pillar.h
index 359d8c16b1..a0dfda5216 100644
--- a/include/d/actor/d_a_obj_pillar.h
+++ b/include/d/actor/d_a_obj_pillar.h
@@ -34,24 +34,24 @@ public:
         /* 0xA */ s16 mMinChangeX;
     };
 
-    /* 80CAF4B4 */ void setBaseMtx();
-    /* 80CAF8A4 */ int create1st();
-    /* 80CAFB44 */ bool checkAttacked();
-    /* 80CAFC08 */ void on_switch();
-    /* 80CAFD64 */ int checkShake();
-    /* 80CAFF60 */ void setShake_rcrash();
-    /* 80CB01E0 */ void setShake_strong();
-    /* 80CB022C */ void setShake_weak();
-    /* 80CB0278 */ void switch_proc_call();
-    /* 80CB031C */ void actionSwOnWait();
-    /* 80CB0378 */ void actionSwOn();
-    /* 80CB03CC */ void actionEnd();
+    void setBaseMtx();
+    int create1st();
+    bool checkAttacked();
+    void on_switch();
+    int checkShake();
+    void setShake_rcrash();
+    void setShake_strong();
+    void setShake_weak();
+    void switch_proc_call();
+    void actionSwOnWait();
+    void actionSwOn();
+    void actionEnd();
     
-    /* 80CAF7A8 */ virtual int CreateHeap();
-    /* 80CAF5EC */ virtual int Create();
-    /* 80CB03D0 */ virtual int Execute(Mtx**);
-    /* 80CB0658 */ virtual int Draw();
-    /* 80CB0740 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u16 getTimer() { return fopAcM_GetParamBit(this, 0x18, 8); }
     u8 checkShadow() { return fopAcM_GetParamBit(this, 8, 8); }
@@ -90,8 +90,8 @@ STATIC_ASSERT(sizeof(daPillar_c) == 0x750);
 
 class daPillar_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CAF32C */ daPillar_HIO_c();
-    /* 80CB0928 */ virtual ~daPillar_HIO_c() {}
+    daPillar_HIO_c();
+    virtual ~daPillar_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_pleaf.h b/include/d/actor/d_a_obj_pleaf.h
index 8de463b1dc..d447a97fa7 100644
--- a/include/d/actor/d_a_obj_pleaf.h
+++ b/include/d/actor/d_a_obj_pleaf.h
@@ -27,18 +27,18 @@ private:
     /* 0x948 */ u8 mType;
 
 public:
-    /* 80CB0D4C */ virtual ~daObj_Pleaf_c();
-    /* 80CB0F08 */ int create();
-    /* 80CB134C */ int CreateHeap();
-    /* 80CB13C4 */ int Delete();
-    /* 80CB13F8 */ int Execute();
-    /* 80CB14D4 */ int Draw();
-    /* 80CB1598 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CB15B8 */ char* getResName();
-    /* 80CB15C8 */ int isDelete();
-    /* 80CB15E8 */ void setEnvTevColor();
-    /* 80CB1644 */ void setRoomNo();
-    /* 80CB1684 */ void setMtx();
+    virtual ~daObj_Pleaf_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    char* getResName();
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 
     u32 getType() { return 0; }
 };
@@ -47,7 +47,7 @@ STATIC_ASSERT(sizeof(daObj_Pleaf_c) == 0x950);
 
 class daObj_Pleaf_Param_c {
 public:
-    /* 80CB17F8 */ virtual ~daObj_Pleaf_Param_c() {}
+    virtual ~daObj_Pleaf_Param_c() {}
 
     struct params {
         f32 field_0x0;
diff --git a/include/d/actor/d_a_obj_poCandle.h b/include/d/actor/d_a_obj_poCandle.h
index 21a88a040f..defcdb7858 100644
--- a/include/d/actor/d_a_obj_poCandle.h
+++ b/include/d/actor/d_a_obj_poCandle.h
@@ -17,29 +17,29 @@ class daPoCandle_c : public dBgS_MoveBgActor, public request_of_phase_process_cl
 public:
     daPoCandle_c() : dEvLib_callback_c(this) {}
 
-    /* 80CB1AE4 */ void setBaseMtx();
-    /* 80CB1BD8 */ int create();
-    /* 80CB1D74 */ void lightInit();
-    /* 80CB1E00 */ void setLight();
-    /* 80CB1E30 */ void cutLight();
-    /* 80CB1E60 */ void pointLightProc();
-    /* 80CB2140 */ void init_modeWait();
-    /* 80CB214C */ void modeWait();
-    /* 80CB21D8 */ void init_modeOnFire();
-    /* 80CB22D4 */ void modeOnFire();
-    /* 80CB22F4 */ void modeOnSwWait();
-    /* 80CB2354 */ void init_modeEnd();
-    /* 80CB2360 */ void modeEnd();
+    void setBaseMtx();
+    int create();
+    void lightInit();
+    void setLight();
+    void cutLight();
+    void pointLightProc();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOnFire();
+    void modeOnFire();
+    void modeOnSwWait();
+    void init_modeEnd();
+    void modeEnd();
     
-    /* 80CB1B6C */ virtual int CreateHeap();
-    /* 80CB1F10 */ virtual int Execute(Mtx**);
-    /* 80CB2388 */ virtual int Draw();
-    /* 80CB242C */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80CB2610 */ virtual ~daPoCandle_c() {}
-    /* 80CB2364 */ virtual bool eventStart();
+    virtual ~daPoCandle_c() {}
+    virtual bool eventStart();
 
-    /* 80CB3E3C */ cXyz getFirePos() { return mFirePos; }
+    cXyz getFirePos() { return mFirePos; }
 
     int getLightType() { return fopAcM_GetParamBit(this, 0x10, 8); }
     int getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_poFire.h b/include/d/actor/d_a_obj_poFire.h
index 0be09abb88..b8c9198b7c 100644
--- a/include/d/actor/d_a_obj_poFire.h
+++ b/include/d/actor/d_a_obj_poFire.h
@@ -34,36 +34,36 @@ public:
         MODE_FIRE_END = 8,
     };
 
-    /* 80CB2A0C */ void setBaseMtx();
-    /* 80CB2A74 */ int create();
-    /* 80CB2BB8 */ int Execute();
-    /* 80CB2BFC */ void procMain();
-    /* 80CB2D84 */ void setFire();
-    /* 80CB2F68 */ static void* searchCandle(void*, void*);
-    /* 80CB2FD4 */ static void* searchFireTag(void*, void*);
-    /* 80CB3024 */ void init_modeInitMove();
-    /* 80CB30FC */ void modeInitMove();
-    /* 80CB31FC */ void modeWait();
-    /* 80CB32EC */ void init_modeWaitSetEffect();
-    /* 80CB3380 */ void modeWaitSetEffect();
-    /* 80CB3540 */ void init_modeMoveOut();
-    /* 80CB355C */ void modeMoveOut();
-    /* 80CB3714 */ void init_modeMove();
-    /* 80CB3730 */ void modeMove();
-    /* 80CB38EC */ void init_modeMoveWait();
-    /* 80CB3918 */ void modeMoveWait();
-    /* 80CB3958 */ void modeNoMove();
-    /* 80CB39CC */ void init_modeOnFire();
-    /* 80CB39E0 */ void modeOnFire();
-    /* 80CB3ADC */ void init_modeFireEnd();
-    /* 80CB3AE8 */ void modeFireEnd();
-    /* 80CB3C6C */ int Draw();
-    /* 80CB3C74 */ int Delete();
+    void setBaseMtx();
+    int create();
+    int Execute();
+    void procMain();
+    void setFire();
+    static void* searchCandle(void*, void*);
+    static void* searchFireTag(void*, void*);
+    void init_modeInitMove();
+    void modeInitMove();
+    void modeWait();
+    void init_modeWaitSetEffect();
+    void modeWaitSetEffect();
+    void init_modeMoveOut();
+    void modeMoveOut();
+    void init_modeMove();
+    void modeMove();
+    void init_modeMoveWait();
+    void modeMoveWait();
+    void modeNoMove();
+    void init_modeOnFire();
+    void modeOnFire();
+    void init_modeFireEnd();
+    void modeFireEnd();
+    int Draw();
+    int Delete();
 
-    /* 80CB3E58 */ virtual ~daPoFire_c() {}
-    /* 80CB3B70 */ virtual bool eventStart();
-    /* 80CB3BE0 */ virtual bool eventRun();
-    /* 80CB3C64 */ virtual bool eventEnd();
+    virtual ~daPoFire_c() {}
+    virtual bool eventStart();
+    virtual bool eventRun();
+    virtual bool eventEnd();
 
     u8 getMoveEnd() { return mMoveEnd; }
     u32 getID() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_poTbox.h b/include/d/actor/d_a_obj_poTbox.h
index 44e1b8f0b3..714f7338d3 100644
--- a/include/d/actor/d_a_obj_poTbox.h
+++ b/include/d/actor/d_a_obj_poTbox.h
@@ -14,21 +14,21 @@
  */
 class daPoTbox_c : public dBgS_MoveBgActor {
 public:
-    /* 80CB42C8 */ void setBaseMtx();
-    /* 80CB46C4 */ int create();
-    /* 80CB4AA8 */ void init_modeWait();
-    /* 80CB4AB4 */ void modeWait();
-    /* 80CB4B10 */ void init_modeOpen();
-    /* 80CB4BF8 */ void modeOpen();
-    /* 80CB4C54 */ void init_modeOpenEnd();
-    /* 80CB4C60 */ void modeOpenEnd();
-    /* 80CB4C84 */ void init_modeEnd();
-    /* 80CB4C90 */ void modeEnd();
+    void setBaseMtx();
+    int create();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeOpenEnd();
+    void modeOpenEnd();
+    void init_modeEnd();
+    void modeEnd();
 
-    /* 80CB43D0 */ virtual int CreateHeap();
-    /* 80CB499C */ virtual int Execute(Mtx**);
-    /* 80CB4C94 */ virtual int Draw();
-    /* 80CB4E14 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
     int getStat() { return fopAcM_GetParamBit(this, 8, 4); }
diff --git a/include/d/actor/d_a_obj_prop.h b/include/d/actor/d_a_obj_prop.h
index 845babd3e7..d61025630b 100644
--- a/include/d/actor/d_a_obj_prop.h
+++ b/include/d/actor/d_a_obj_prop.h
@@ -13,15 +13,15 @@
  */
 class daObjProp_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80CB51F8 */ daObjProp_c();
-    /* 80CB5234 */ virtual ~daObjProp_c();
-    /* 80CB52B4 */ bool createHeap();
-    /* 80CB5334 */ int create();
-    /* 80CB5408 */ int Delete();
-    /* 80CB543C */ int draw();
-    /* 80CB54A0 */ int execute();
-    /* 80CB54E4 */ void init();
-    /* 80CB54F4 */ void setModelMtx();
+    daObjProp_c();
+    virtual ~daObjProp_c();
+    bool createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setModelMtx();
 
     u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
     u32 getArg_0() { return fopAcM_GetParamBit(this, 4, 4); }
diff --git a/include/d/actor/d_a_obj_pumpkin.h b/include/d/actor/d_a_obj_pumpkin.h
index b95481f9ee..b1b36bfa1f 100644
--- a/include/d/actor/d_a_obj_pumpkin.h
+++ b/include/d/actor/d_a_obj_pumpkin.h
@@ -26,7 +26,7 @@ struct daObj_Pumpkin_HIOParam {
 
 class daObj_Pumpkin_Param_c {
 public:
-    /* 80CB8304 */ virtual ~daObj_Pumpkin_Param_c() {}
+    virtual ~daObj_Pumpkin_Param_c() {}
 
     static const daObj_Pumpkin_HIOParam m;
 };
@@ -114,24 +114,24 @@ private:
     /* 0xBB4 */ u8 field_0xbb4;
 
 public:
-    /* 80CB578C */ virtual ~daObj_Pumpkin_c();
-    /* 80CB5A04 */ int create();
-    /* 80CB5F88 */ int CreateHeap();
-    /* 80CB6018 */ int Delete();
-    /* 80CB604C */ int Execute();
-    /* 80CB7638 */ int Draw();
-    /* 80CB7824 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CB7844 */ int isDelete();
-    /* 80CB78C8 */ void setEnvTevColor();
-    /* 80CB7924 */ void setRoomNo();
-    /* 80CB7968 */ void reset();
-    /* 80CB79DC */ void setMtx();
-    /* 80CB7AE4 */ s16 calcRollAngle(s16, int);
-    /* 80CB7B84 */ int getWallAngle(s16, s16*);
-    /* 80CB7D14 */ void setSmokePrtcl();
-    /* 80CB7D98 */ void setWaterPrtcl();
-    /* 80CB7E98 */ void setHamonPrtcl();
-    /* 80CB7EF4 */ void crash();
+    virtual ~daObj_Pumpkin_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void reset();
+    void setMtx();
+    s16 calcRollAngle(s16, int);
+    int getWallAngle(s16, s16*);
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
+    void crash();
 
     void setMtx(MtxP mtx) {
         cXyz newPos;
diff --git a/include/d/actor/d_a_obj_rcircle.h b/include/d/actor/d_a_obj_rcircle.h
index aea005bb3b..43811a0702 100644
--- a/include/d/actor/d_a_obj_rcircle.h
+++ b/include/d/actor/d_a_obj_rcircle.h
@@ -13,15 +13,15 @@
  */
 class daObjRCircle_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80CB8678 */ daObjRCircle_c();
-    /* 80CB874C */ virtual ~daObjRCircle_c();
-    /* 80CB8814 */ int createHeap();
-    /* 80CB8928 */ int create();
-    /* 80CB8A28 */ int Delete();
-    /* 80CB8A5C */ int draw();
-    /* 80CB8B28 */ int execute();
-    /* 80CB8BE4 */ void init();
-    /* 80CB8BF0 */ void setModelMtx();
+    daObjRCircle_c();
+    virtual ~daObjRCircle_c();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setModelMtx();
 
     int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; }
 
diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h
index e195931d9d..d053d6800c 100644
--- a/include/d/actor/d_a_obj_rfHole.h
+++ b/include/d/actor/d_a_obj_rfHole.h
@@ -23,24 +23,24 @@ public:
 
     typedef void (daRfHole_c::*ModeFunc)();
 
-    /* 80CB8F04 */ void setBaseMtx();
-    /* 80CB8F8C */ int CreateHeap();
-    /* 80CB8FF8 */ int create();
-    /* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80CB9194 */ int playerAreaCheck();
-    /* 80CB940C */ int Execute(Mtx**);
-    /* 80CB9464 */ void holeProc();
-    /* 80CB9520 */ void init_modeWait();
-    /* 80CB952C */ void modeWait();
-    /* 80CB9558 */ void init_modeBreak();
-    /* 80CB96AC */ void modeBreak();
-    /* 80CB96CC */ void init_modeBreakEff();
-    /* 80CB971C */ void modeBreakEff();
-    /* 80CB973C */ void init_modeEnd();
-    /* 80CB9748 */ void modeEnd();
-    /* 80CB9768 */ void setBreakEffect();
-    /* 80CB9878 */ int Draw();
-    /* 80CB991C */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    int playerAreaCheck();
+    int Execute(Mtx**);
+    void holeProc();
+    void init_modeWait();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
+    void init_modeBreakEff();
+    void modeBreakEff();
+    void init_modeEnd();
+    void modeEnd();
+    void setBreakEffect();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -56,8 +56,8 @@ STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);
 
 class daRfHole_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CB8E6C */ daRfHole_HIO_c();
-    /* 80CB99D8 */ virtual ~daRfHole_HIO_c() {}
+    daRfHole_HIO_c();
+    virtual ~daRfHole_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_rgate.h b/include/d/actor/d_a_obj_rgate.h
index 22222c732e..5f62a2d36b 100644
--- a/include/d/actor/d_a_obj_rgate.h
+++ b/include/d/actor/d_a_obj_rgate.h
@@ -15,30 +15,30 @@
  */
 class daObjRgate_c : public dBgS_MoveBgActor {
 public:
-    /* 80CB9DF8 */ void initBaseMtx();
-    /* 80CB9F4C */ void setBaseMtx();
-    /* 80CBA828 */ int create1st();
-    /* 80CBA8A8 */ int checkAreaL(cXyz const*, cXyz const*);
-    /* 80CBAC38 */ int checkAreaR(cXyz const*, cXyz const*);
-    /* 80CBAFC4 */ BOOL checkOpen();
-    /* 80CBB0F0 */ BOOL checkDirL(fopAc_ac_c*);
-    /* 80CBB180 */ BOOL checkDirR(fopAc_ac_c*);
-    /* 80CBB210 */ void setAtkSE();
-    /* 80CBB28C */ void setCrkSE();
-    /* 80CBB308 */ void action();
-    /* 80CBB370 */ void action_typeA();
-    /* 80CBBA10 */ void actionWaitEvent();
-    /* 80CBBAF4 */ void actionEvent();
-    /* 80CBBB5C */ void actionDead();
-    /* 80CBBB60 */ void event_proc_call();
-    /* 80CBBC04 */ void demoProc();
-    /* 80CBBD68 */ int getDemoAction();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    int checkAreaL(cXyz const*, cXyz const*);
+    int checkAreaR(cXyz const*, cXyz const*);
+    BOOL checkOpen();
+    BOOL checkDirL(fopAc_ac_c*);
+    BOOL checkDirR(fopAc_ac_c*);
+    void setAtkSE();
+    void setCrkSE();
+    void action();
+    void action_typeA();
+    void actionWaitEvent();
+    void actionEvent();
+    void actionDead();
+    void event_proc_call();
+    void demoProc();
+    int getDemoAction();
 
-    /* 80CBA654 */ virtual int CreateHeap();
-    /* 80CBA468 */ virtual int Create();
-    /* 80CBBDB0 */ virtual int Execute(Mtx**);
-    /* 80CBBE18 */ virtual int Draw();
-    /* 80CBBF34 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_obj_riverrock.h b/include/d/actor/d_a_obj_riverrock.h
index 62cd48d7b8..ddac168e17 100644
--- a/include/d/actor/d_a_obj_riverrock.h
+++ b/include/d/actor/d_a_obj_riverrock.h
@@ -27,23 +27,23 @@ public:
         BREAK_3,
     } BreakSubAction;
 
-    /* 80CBC6F4 */ void initCcCylinder();
-    /* 80CBC754 */ void SetCcCyl();
-    /* 80CBC7F8 */ void BreakWaitAction();
-    /* 80CBC8BC */ void CheckBG();
-    /* 80CBCC3C */ void BreakMoveAction();
-    /* 80CBCCC0 */ void BrokenAction();
-    /* 80CBCD94 */ void BreakAction();
-    /* 80CBCDE8 */ void Action();
-    /* 80CBCE2C */ void BreakSet();
-    /* 80CBD1C4 */ void WaitAction();
-    /* 80CBD204 */ void setBaseMtx();
-    /* 80CBD348 */ int CreateHeap();
-    /* 80CBD3C0 */ int create();
-    /* 80CBD7B4 */ int Create();
-    /* 80CBD814 */ int Execute(Mtx**);
-    /* 80CBD8E0 */ int Draw();
-    /* 80CBD964 */ int Delete();
+    void initCcCylinder();
+    void SetCcCyl();
+    void BreakWaitAction();
+    void CheckBG();
+    void BreakMoveAction();
+    void BrokenAction();
+    void BreakAction();
+    void Action();
+    void BreakSet();
+    void WaitAction();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     /* 0x5A0 */ ActionEnum mAction;
     /* 0x5A4 */ BreakSubAction mBreakSubAction;
@@ -75,8 +75,8 @@ STATIC_ASSERT(sizeof(daObjRIVERROCK_c) == 0x79c);
 
 class daObjRIVERROCK_HIO_c {
 public:
-    /* 80CBC6CC */ daObjRIVERROCK_HIO_c();
-    /* 80CBD9C4 */ virtual ~daObjRIVERROCK_HIO_c() {}
+    daObjRIVERROCK_HIO_c();
+    virtual ~daObjRIVERROCK_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_rock.h b/include/d/actor/d_a_obj_rock.h
index 90bd742a94..0030932e7f 100644
--- a/include/d/actor/d_a_obj_rock.h
+++ b/include/d/actor/d_a_obj_rock.h
@@ -6,8 +6,8 @@
 #include "f_op/f_op_actor.h"
 
 struct rock_ss {
-    /* 80CBE5A4 */ ~rock_ss();
-    /* 80CBE678 */ rock_ss();
+    ~rock_ss();
+    rock_ss();
 
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz mPos;
diff --git a/include/d/actor/d_a_obj_rope_bridge.h b/include/d/actor/d_a_obj_rope_bridge.h
index 6b57a3a811..90532c9ba7 100644
--- a/include/d/actor/d_a_obj_rope_bridge.h
+++ b/include/d/actor/d_a_obj_rope_bridge.h
@@ -15,30 +15,30 @@
  */
 class daObjRBridge_c : public dBgS_MoveBgActor {
 public:
-    /* 80595E38 */ void initBaseMtx();
-    /* 80595ED8 */ void setBaseMtx();
-    /* 80595F84 */ BOOL checkE3Special();
-    /* 80595FE0 */ void setStPos();
-    /* 8059616C */ void initLinePos();
-    /* 805963C4 */ void setLinePos();
-    /* 80596768 */ void getLinePosSt(cXyz*);
-    /* 805967E4 */ void getLinePosBrg(int, cXyz*);
-    /* 8059689C */ BOOL checkTight();
-    /* 80596DEC */ int create1st();
-    /* 80596FA8 */ void action();
-    /* 8059715C */ void init_wait();
-    /* 80597170 */ void mode_wait();
-    /* 805973BC */ void init_cut();
-    /* 805973E4 */ void mode_cut();
-    /* 805975E8 */ void init_end();
-    /* 805975F4 */ void mode_end();
-    /* 805977D0 */ BOOL checkHimoCulling();
+    void initBaseMtx();
+    void setBaseMtx();
+    BOOL checkE3Special();
+    void setStPos();
+    void initLinePos();
+    void setLinePos();
+    void getLinePosSt(cXyz*);
+    void getLinePosBrg(int, cXyz*);
+    BOOL checkTight();
+    int create1st();
+    void action();
+    void init_wait();
+    void mode_wait();
+    void init_cut();
+    void mode_cut();
+    void init_end();
+    void mode_end();
+    BOOL checkHimoCulling();
 
-    /* 80596B88 */ virtual int CreateHeap();
-    /* 805969FC */ virtual int Create();
-    /* 80596EBC */ virtual int Execute(Mtx**);
-    /* 805975F8 */ virtual int Draw();
-    /* 805978BC */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 24, 8); }
diff --git a/include/d/actor/d_a_obj_rotBridge.h b/include/d/actor/d_a_obj_rotBridge.h
index a0b674d3e6..25ea3a6ee6 100644
--- a/include/d/actor/d_a_obj_rotBridge.h
+++ b/include/d/actor/d_a_obj_rotBridge.h
@@ -15,16 +15,16 @@
  */
 class daRotBridge_c : public dBgS_MoveBgActor {
 public:
-    /* 80CBEA24 */ void setBaseMtx();
-    /* 80CBECBC */ int create();
-    /* 80CBEF1C */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80CBF050 */ void playerAreaCheck();
-    /* 80CBF1EC */ void moveBridge();
+    void setBaseMtx();
+    int create();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    void playerAreaCheck();
+    void moveBridge();
 
-    /* 80CBEB38 */ virtual int CreateHeap();
-    /* 80CBEF34 */ virtual int Execute(Mtx**);
-    /* 80CBF404 */ virtual int Draw();
-    /* 80CBF4BC */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getPlayerRide() { return mIsPlayerRide; }
     u8 getBridgeAngle() { return mBridgeAngle; }
@@ -48,8 +48,8 @@ STATIC_ASSERT(sizeof(daRotBridge_c) == 0x610);
 
 class daRotBridge_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CBE98C */ daRotBridge_HIO_c();
-    /* 80CBF5BC */ virtual ~daRotBridge_HIO_c() {}
+    daRotBridge_HIO_c();
+    virtual ~daRotBridge_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_rotTrap.h b/include/d/actor/d_a_obj_rotTrap.h
index 2b4be5697a..4b7b669afc 100644
--- a/include/d/actor/d_a_obj_rotTrap.h
+++ b/include/d/actor/d_a_obj_rotTrap.h
@@ -16,21 +16,21 @@
  */
 class daRotTrap_c : public dBgS_MoveBgActor {
 public:
-    /* 80CBF940 */ void setBaseMtx();
-    /* 80CBFAC8 */ int create();
-    /* 80CBFF1C */ void procMain();
-    /* 80CC00AC */ void init_modeWait();
-    /* 80CC0120 */ void modeWait();
-    /* 80CC0180 */ void init_modeAcc();
-    /* 80CC027C */ void modeAcc();
-    /* 80CC034C */ void init_modeMove();
-    /* 80CC0360 */ void modeMove();
-    /* 80CC0440 */ void seSet();
+    void setBaseMtx();
+    int create();
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeAcc();
+    void modeAcc();
+    void init_modeMove();
+    void modeMove();
+    void seSet();
 
-    /* 80CBF9D8 */ virtual int CreateHeap();
-    /* 80CBFEC4 */ virtual int Execute(Mtx**);
-    /* 80CC0548 */ virtual int Draw();
-    /* 80CC05EC */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -54,8 +54,8 @@ STATIC_ASSERT(sizeof(daRotTrap_c) == 0x173c);
 
 class daRotTrap_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CBF8AC */ daRotTrap_HIO_c();
-    /* 80CC0728 */ virtual ~daRotTrap_HIO_c() {}
+    daRotTrap_HIO_c();
+    virtual ~daRotTrap_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h
index a61d0e01ad..91e786c1b8 100644
--- a/include/d/actor/d_a_obj_roten.h
+++ b/include/d/actor/d_a_obj_roten.h
@@ -14,16 +14,16 @@
  */
 class daObj_Roten_c : public dBgS_MoveBgActor {
 public:
-    /* 80CC0B58 */ void initBaseMtx();
-    /* 80CC0B94 */ void setBaseMtx();
-    /* 80CC0C20 */ int Create();
-    /* 80CC0EC4 */ int CreateHeap();
-    /* 80CC0F40 */ int create();
-    /* 80CC1038 */ int Execute(Mtx**);
-    /* 80CC1138 */ int Draw();
-    /* 80CC1254 */ int Delete();
-    /* 80CC12E4 */ char* getResName();
-    /* 80CC1388 */ virtual ~daObj_Roten_c();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    char* getResName();
+    virtual ~daObj_Roten_c();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_rstair.h b/include/d/actor/d_a_obj_rstair.h
index 899f46ede7..053692ba9e 100644
--- a/include/d/actor/d_a_obj_rstair.h
+++ b/include/d/actor/d_a_obj_rstair.h
@@ -29,28 +29,28 @@ public:
         ACTION_DEAD,
     };
 
-    /* 80CC1558 */ void initBaseMtx();
-    /* 80CC1614 */ void setBaseMtx();
-    /* 80CC16B0 */ int Create();
-    /* 80CC17F0 */ int CreateHeap();
-    /* 80CC1A28 */ int create1st();
-    /* 80CC1AF0 */ int Execute(Mtx**);
-    /* 80CC1BA4 */ void move_proc_call();
-    /* 80CC1C30 */ void init_modeWait();
-    /* 80CC1CF0 */ void modeWait();
-    /* 80CC1DF8 */ void init_modeRotate();
-    /* 80CC1EC8 */ void modeRotate();
-    /* 80CC2024 */ void event_proc_call();
-    /* 80CC20E0 */ void actionWait();
-    /* 80CC2158 */ void actionOrderEvent();
-    /* 80CC21C0 */ void actionEvent();
-    /* 80CC221C */ void actionDead();
-    /* 80CC2220 */ int checkChangeSw();
-    /* 80CC22A0 */ void offSwitch(int);
-    /* 80CC2310 */ void onWaterModel();
-    /* 80CC2364 */ void offWaterModel();
-    /* 80CC23C4 */ int Draw();
-    /* 80CC25C0 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void move_proc_call();
+    void init_modeWait();
+    void modeWait();
+    void init_modeRotate();
+    void modeRotate();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int checkChangeSw();
+    void offSwitch(int);
+    void onWaterModel();
+    void offWaterModel();
+    int Draw();
+    int Delete();
 
     u8 getSwNo() { return mSwNo; }
     u8 getSwNo2() { return (mSwNo >> 8) & 0xff; }
diff --git a/include/d/actor/d_a_obj_sWallShutter.h b/include/d/actor/d_a_obj_sWallShutter.h
index 488099f3f1..fca1b1b968 100644
--- a/include/d/actor/d_a_obj_sWallShutter.h
+++ b/include/d/actor/d_a_obj_sWallShutter.h
@@ -27,22 +27,22 @@ public:
         MODE_MOVE_DOWN_END,
     };
 
-    /* 805982A4 */ void setBaseMtx();
-    /* 805983C4 */ int create();
-    /* 805985B4 */ void moveMain();
-    /* 8059873C */ void init_modeWait();
-    /* 80598748 */ void modeWait();
-    /* 8059879C */ void init_modeMoveDownInit();
-    /* 805989D0 */ void modeMoveDownInit();
-    /* 80598A04 */ void init_modeMoveDown();
-    /* 80598AFC */ void modeMoveDown();
-    /* 80598D4C */ void init_modeMoveDownEnd();
-    /* 80598D58 */ void modeMoveDownEnd();
+    void setBaseMtx();
+    int create();
+    void moveMain();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveDownInit();
+    void modeMoveDownInit();
+    void init_modeMoveDown();
+    void modeMoveDown();
+    void init_modeMoveDownEnd();
+    void modeMoveDownEnd();
     
-    /* 80598344 */ virtual int CreateHeap();
-    /* 80598564 */ virtual int Execute(Mtx**);
-    /* 80598D5C */ virtual int Draw();
-    /* 80598E00 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     int getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     int getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
@@ -70,8 +70,8 @@ STATIC_ASSERT(sizeof(daSwShutter_c) == 0x5e8);
 
 class daSwShutter_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 805981EC */ daSwShutter_HIO_c();
-    /* 80598ECC */ virtual ~daSwShutter_HIO_c() {}
+    daSwShutter_HIO_c();
+    virtual ~daSwShutter_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_saidan.h b/include/d/actor/d_a_obj_saidan.h
index 80402e783f..4a0a75acc3 100644
--- a/include/d/actor/d_a_obj_saidan.h
+++ b/include/d/actor/d_a_obj_saidan.h
@@ -21,19 +21,19 @@ public:
         /* 2 */ MODE_MOVE_END_e,
     };
 
-    /* 80CC3E28 */ void setBaseMtx();
-    /* 80CC3EB0 */ virtual int CreateHeap();
-    /* 80CC3F1C */ cPhs__Step create();
-    /* 80CC4054 */ virtual int Execute(Mtx**);
-    /* 80CC40A4 */ void moveProc();
-    /* 80CC4148 */ void init_modeWait();
-    /* 80CC4154 */ void modeWait();
-    /* 80CC41B0 */ void init_modeMove();
-    /* 80CC41BC */ void modeMove();
-    /* 80CC4290 */ void init_modeMoveEnd();
-    /* 80CC4314 */ void modeMoveEnd();
-    /* 80CC4318 */ virtual int Draw();
-    /* 80CC43BC */ virtual int Delete();
+    void setBaseMtx();
+    virtual int CreateHeap();
+    cPhs__Step create();
+    virtual int Execute(Mtx**);
+    void moveProc();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMove();
+    void modeMove();
+    void init_modeMoveEnd();
+    void modeMoveEnd();
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
@@ -46,8 +46,8 @@ private:
 STATIC_ASSERT(sizeof(daSaidan_c) == 0x5B4);
 
 struct daSaidan_HIO_c : public mDoHIO_entry_c {
-    /* 80CC3DAC */ daSaidan_HIO_c();
-    /* 80CC4478 */ virtual ~daSaidan_HIO_c() {}
+    daSaidan_HIO_c();
+    virtual ~daSaidan_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_sakuita.h b/include/d/actor/d_a_obj_sakuita.h
index 6ae3b7de9c..29b101586d 100644
--- a/include/d/actor/d_a_obj_sakuita.h
+++ b/include/d/actor/d_a_obj_sakuita.h
@@ -29,12 +29,12 @@ struct daObjSakuita_Attr_c {
  */
 class daObjSakuita_c : public fopAc_ac_c {
 public:
-    /* 80CC46F8 */ void create_init();
-    /* 80CC47F8 */ void initBaseMtx();
-    /* 80CC4818 */ void setBaseMtx();
-    /* 80CC489C */ void setPlatePos();
-    /* 80CC4A98 */ void calcAngle();
-    /* 80CC4C9C */ ~daObjSakuita_c();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setPlatePos();
+    void calcAngle();
+    ~daObjSakuita_c();
 
     inline int createHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_sakuita_rope.h b/include/d/actor/d_a_obj_sakuita_rope.h
index 2aac0945b1..9567b7f25f 100644
--- a/include/d/actor/d_a_obj_sakuita_rope.h
+++ b/include/d/actor/d_a_obj_sakuita_rope.h
@@ -14,16 +14,16 @@ struct daObjItaRope_Attr_c {
 
 class Sakuita_c {
 public:
-    /* 80CC5238 */ int setModelData(J3DModelData*);
-    /* 80CC527C */ void create(cXyz*, s16, s8);
-    /* 80CC5314 */ void execute(cXyz*, s16);
-    /* 80CC5354 */ void draw();
-    /* 80CC5390 */ void initBaseMtx();
-    /* 80CC53B0 */ void setBaseMtx();
-    /* 80CC5444 */ void setPlatePos(cXyz*);
-    /* 80CC5720 */ void calcAngle();
-    /* 80CC63E4 */ ~Sakuita_c();
-    /* 80CC6420 */ Sakuita_c();
+    int setModelData(J3DModelData*);
+    void create(cXyz*, s16, s8);
+    void execute(cXyz*, s16);
+    void draw();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setPlatePos(cXyz*);
+    void calcAngle();
+    ~Sakuita_c();
+    Sakuita_c();
 
     /* 0x00 */ J3DModel* mModel;
     /* 0x04 */ cXyz* field_0x04;
@@ -39,8 +39,8 @@ public:
 
 class RopeWork_c {
 public:
-    /* 80CC6424 */ ~RopeWork_c();
-    /* 80CC6460 */ RopeWork_c();
+    ~RopeWork_c();
+    RopeWork_c();
 
     /* 0x00 */ cXyz field_0x00;
     /* 0x0C */ cXyz field_0x0c;
@@ -57,10 +57,10 @@ public:
  */
 class daObjItaRope_c : public fopAc_ac_c {
 public:
-    /* 80CC57E4 */ void create_init();
-    /* 80CC5E48 */ void initBaseMtx();
-    /* 80CC5E7C */ void setBaseMtx();
-    /* 80CC5ECC */ void setNormalRopePos();
+    void create_init();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setNormalRopePos();
 
     inline ~daObjItaRope_c();
     inline int createHeap();
diff --git a/include/d/actor/d_a_obj_scannon.h b/include/d/actor/d_a_obj_scannon.h
index c74d0cde31..4e054ed765 100644
--- a/include/d/actor/d_a_obj_scannon.h
+++ b/include/d/actor/d_a_obj_scannon.h
@@ -33,45 +33,45 @@ public:
         DEMOTYPE_FIRE_SECOND,  
     };
 
-    /* 80CC6B0C */ daSCannon_c();
-    /* 80CC6C10 */ virtual ~daSCannon_c();
-    /* 80CC6D10 */ int create();
-    /* 80CC7204 */ int execute();
-    /* 80CC7228 */ int draw();
-    /* 80CC747C */ int Delete();
-    /* 80CC7508 */ void setModelMtx();
-    /* 80CC7578 */ void setPtlModelMtx();
-    /* 80CC7608 */ int createHeap();
-    /* 80CC7970 */ void middleExe();
-    /* 80CC7A10 */ void orderEvtInit();
-    /* 80CC7AB8 */ void exeModeWait();
-    /* 80CC7C48 */ void exeModeOrderEvt();
-    /* 80CC7D14 */ void exeModeActionEvt();
-    /* 80CC7EBC */ void exeModeEnd();
-    /* 80CC7EC0 */ void demoExe();
-    /* 80CC7FAC */ void demoModeInit(int);
-    /* 80CC8044 */ void demoInitLinkIn();
-    /* 80CC8048 */ void demoExeLinkIn();
-    /* 80CC8108 */ void demoInitSet();
-    /* 80CC81DC */ void demoExeSet();
-    /* 80CC8274 */ void demoInitMove();
-    /* 80CC8278 */ void demoExeMove();
-    /* 80CC8378 */ void demoInitFire();
-    /* 80CC83CC */ void demoExeFire();
-    /* 80CC8430 */ void demoInitFinish();
-    /* 80CC8538 */ void demoExeFinish();
-    /* 80CC8648 */ void demoInitWarpEndWait();
-    /* 80CC8714 */ void demoExeWarpEndWait();
-    /* 80CC8804 */ void demoInitWarpEndMove();
-    /* 80CC8818 */ void demoExeWarpEndMove();
-    /* 80CC88A8 */ void changeScene();
-    /* 80CC8998 */ void init();
-    /* 80CC8A30 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**);
-    /* 80CC8B60 */ void exeEmtRt(u16, int, JPABaseEmitter**);
-    /* 80CC8BF4 */ void initEmtLine();
-    /* 80CC8CDC */ void exeEmtLine();
-    /* 80CC8DA0 */ void delEmtAll();
-    /* 80CC8DDC */ void setCannonRepair();
+    daSCannon_c();
+    virtual ~daSCannon_c();
+    int create();
+    int execute();
+    int draw();
+    int Delete();
+    void setModelMtx();
+    void setPtlModelMtx();
+    int createHeap();
+    void middleExe();
+    void orderEvtInit();
+    void exeModeWait();
+    void exeModeOrderEvt();
+    void exeModeActionEvt();
+    void exeModeEnd();
+    void demoExe();
+    void demoModeInit(int);
+    void demoInitLinkIn();
+    void demoExeLinkIn();
+    void demoInitSet();
+    void demoExeSet();
+    void demoInitMove();
+    void demoExeMove();
+    void demoInitFire();
+    void demoExeFire();
+    void demoInitFinish();
+    void demoExeFinish();
+    void demoInitWarpEndWait();
+    void demoExeWarpEndWait();
+    void demoInitWarpEndMove();
+    void demoExeWarpEndMove();
+    void changeScene();
+    void init();
+    void initEmtRt(u16, int, u16 const*, JPABaseEmitter**);
+    void exeEmtRt(u16, int, JPABaseEmitter**);
+    void initEmtLine();
+    void exeEmtLine();
+    void delEmtAll();
+    void setCannonRepair();
 
     int getSw1() { return fopAcM_GetParamBit(this, 0, 8); }
     int getSw2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_scannon_crs.h b/include/d/actor/d_a_obj_scannon_crs.h
index 644dceb4ae..e390c60128 100644
--- a/include/d/actor/d_a_obj_scannon_crs.h
+++ b/include/d/actor/d_a_obj_scannon_crs.h
@@ -23,27 +23,27 @@ public:
         MODE_END,
     };
 
-    /* 80CC973C */ daSCannonCrs_c();
-    /* 80CC983C */ virtual ~daSCannonCrs_c();
-    /* 80CC9910 */ int create();
-    /* 80CC9B10 */ int Delete();
-    /* 80CC9B80 */ int draw();
-    /* 80CC9C64 */ int execute();
-    /* 80CC9CA4 */ void middleExe(daMidna_c*);
-    /* 80CC9D60 */ void exeModeWait(daMidna_c*);
-    /* 80CC9F34 */ void exeModePreWait(daMidna_c*);
-    /* 80CC9F80 */ void exeModeOrderEvt(daMidna_c*);
-    /* 80CCA240 */ void exeModeTalkEvt(daMidna_c*);
-    /* 80CCA2CC */ void exeModeWarpEvt(daMidna_c*);
-    /* 80CCA344 */ void exeModeEnd(daMidna_c*);
-    /* 80CCA348 */ void demoExe();
-    /* 80CCA74C */ void init();
-    /* 80CCA848 */ void setModelMtx();
-    /* 80CCA8CC */ int createHeap();
-    /* 80CCAAC4 */ bool chkInTalkRange();
-    /* 80CCAB24 */ void initEmtRt(u16, int, u16 const*, JPABaseEmitter**);
-    /* 80CCAC48 */ void exeEmtRt(u16, int, JPABaseEmitter**);
-    /* 80CCACD0 */ void callMidnaBeamEmt();
+    daSCannonCrs_c();
+    virtual ~daSCannonCrs_c();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void middleExe(daMidna_c*);
+    void exeModeWait(daMidna_c*);
+    void exeModePreWait(daMidna_c*);
+    void exeModeOrderEvt(daMidna_c*);
+    void exeModeTalkEvt(daMidna_c*);
+    void exeModeWarpEvt(daMidna_c*);
+    void exeModeEnd(daMidna_c*);
+    void demoExe();
+    void init();
+    void setModelMtx();
+    int createHeap();
+    bool chkInTalkRange();
+    void initEmtRt(u16, int, u16 const*, JPABaseEmitter**);
+    void exeEmtRt(u16, int, JPABaseEmitter**);
+    void callMidnaBeamEmt();
 
     int getTalkRange() { return fopAcM_GetParamBit(this, 0, 8); }
     int getWarpId() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_scannon_ten.h b/include/d/actor/d_a_obj_scannon_ten.h
index fbbceeb782..6847257840 100644
--- a/include/d/actor/d_a_obj_scannon_ten.h
+++ b/include/d/actor/d_a_obj_scannon_ten.h
@@ -20,40 +20,40 @@ public:
         MODE_END,
     };
 
-    /* 80CCB364 */ daObjSCannonTen_c();
-    /* 80CCB43C */ virtual ~daObjSCannonTen_c();
-    /* 80CCB4EC */ int createHeap();
-    /* 80CCB66C */ int create();
-    /* 80CCB9E0 */ int Delete();
-    /* 80CCBA58 */ int draw();
-    /* 80CCBB6C */ int execute();
-    /* 80CCBB90 */ void middleExe();
-    /* 80CCBC08 */ void exeModeWait();
-    /* 80CCBCB0 */ void exeModeOrderEvt();
-    /* 80CCBD4C */ void exeModeActionEvt();
-    /* 80CCBDCC */ void exeModeEnd();
-    /* 80CCBDD0 */ void demoExe();
-    /* 80CCBE8C */ void demoModeInit(int);
-    /* 80CCBF00 */ void demoInitLinkIn();
-    /* 80CCBF04 */ void demoExeLinkIn();
-    /* 80CCBFC4 */ void demoInitSet();
-    /* 80CCC088 */ void demoExeSet();
-    /* 80CCC114 */ void demoInitMove();
-    /* 80CCC118 */ void demoExeMove();
-    /* 80CCC20C */ void demoInitFire();
-    /* 80CCC260 */ void demoExeFire();
-    /* 80CCC2B8 */ void demoInitFireEnd();
-    /* 80CCC37C */ void demoExeFireEnd();
-    /* 80CCC3D4 */ void demoInitFinish();
-    /* 80CCC498 */ void demoExeFinish();
-    /* 80CCC528 */ void init();
-    /* 80CCC53C */ void setModelMtx();
-    /* 80CCC5A0 */ void changeScene();
-    /* 80CCC628 */ void initEmtSmoke();
-    /* 80CCC74C */ void exeEmtSmoke();
-    /* 80CCC7D0 */ void initEmtLine();
-    /* 80CCC8B8 */ void exeEmtLine();
-    /* 80CCC97C */ void delEmtAll();
+    daObjSCannonTen_c();
+    virtual ~daObjSCannonTen_c();
+    int createHeap();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void middleExe();
+    void exeModeWait();
+    void exeModeOrderEvt();
+    void exeModeActionEvt();
+    void exeModeEnd();
+    void demoExe();
+    void demoModeInit(int);
+    void demoInitLinkIn();
+    void demoExeLinkIn();
+    void demoInitSet();
+    void demoExeSet();
+    void demoInitMove();
+    void demoExeMove();
+    void demoInitFire();
+    void demoExeFire();
+    void demoInitFireEnd();
+    void demoExeFireEnd();
+    void demoInitFinish();
+    void demoExeFinish();
+    void init();
+    void setModelMtx();
+    void changeScene();
+    void initEmtSmoke();
+    void exeEmtSmoke();
+    void initEmtLine();
+    void exeEmtLine();
+    void delEmtAll();
 
     static void (daObjSCannonTen_c::*s_exeProc[])();
     static void (daObjSCannonTen_c::*s_demoExeProc[][2])();
diff --git a/include/d/actor/d_a_obj_sekidoor.h b/include/d/actor/d_a_obj_sekidoor.h
index ff2796b3b1..515c009662 100644
--- a/include/d/actor/d_a_obj_sekidoor.h
+++ b/include/d/actor/d_a_obj_sekidoor.h
@@ -16,16 +16,16 @@
  */
 class daObj_SekiDoor_c : public dBgS_MoveBgActor {
 public:
-    /* 80CCD02C */ int create();
-    /* 80CCD154 */ virtual int CreateHeap();
-    /* 80CCD1F0 */ virtual int Create();
-    /* 80CCD23C */ virtual int Delete();
-    /* 80CCD290 */ virtual int Execute(Mtx**);
-    /* 80CCD538 */ virtual int Draw();
-    /* 80CCD5DC */ void evtSkip();
-    /* 80CCD64C */ void setPrtcls();
-    /* 80CCD810 */ void initBaseMtx();
-    /* 80CCD84C */ void setBaseMtx();
+    int create();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Delete();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    void evtSkip();
+    void setPrtcls();
+    void initBaseMtx();
+    void setBaseMtx();
 
     u16 getBitSW() { return (fopAcM_GetParam(this) & 0xff); }
     void open() { mOpening = true; }
@@ -49,7 +49,7 @@ STATIC_ASSERT(sizeof(daObj_SekiDoor_c) == 0x5d8);
 
 class daObj_SekiDoor_Param_c {
 public:
-    /* 80CCD9AC */ virtual ~daObj_SekiDoor_Param_c() {};
+    virtual ~daObj_SekiDoor_Param_c() {};
 
     static u8 const m;
 };
diff --git a/include/d/actor/d_a_obj_sekizo.h b/include/d/actor/d_a_obj_sekizo.h
index 37aefc74a4..db0cab0a00 100644
--- a/include/d/actor/d_a_obj_sekizo.h
+++ b/include/d/actor/d_a_obj_sekizo.h
@@ -14,15 +14,15 @@
  */
 class daObj_Sekizo_c : public dBgS_MoveBgActor {
 public:
-    /* 80CCDC0C */ cPhs__Step create();
+    cPhs__Step create();
 
-    /* 80CCDD00 */ int CreateHeap();
-    /* 80CCDD8C */ int Create();
-    /* 80CCDDE8 */ int Delete();
-    /* 80CCDE3C */ int Execute(Mtx**);
-    /* 80CCDEF4 */ int Draw();
-    /* 80CCDFA4 */ void initBaseMtx();
-    /* 80CCDFE0 */ void setBaseMtx();
+    int CreateHeap();
+    int Create();
+    int Delete();
+    int Execute(Mtx**);
+    int Draw();
+    void initBaseMtx();
+    void setBaseMtx();
 
 private:
     /* 0x5A0 */ u32 field_0x5a0;
@@ -37,7 +37,7 @@ STATIC_ASSERT(sizeof(daObj_Sekizo_c) == 0x5B4);
 
 class daObj_Sekizo_Param_c {
 public:
-    /* 80CCE118 */ virtual ~daObj_Sekizo_Param_c() {}
+    virtual ~daObj_Sekizo_Param_c() {}
 };
 
 #endif /* D_A_OBJ_SEKIZO_H */
diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h
index b9a7a4fff2..ad7459e9aa 100644
--- a/include/d/actor/d_a_obj_sekizoa.h
+++ b/include/d/actor/d_a_obj_sekizoa.h
@@ -56,49 +56,49 @@ public:
         ANM_YARIB_STILL_R = 32,
     };
 
-    /* 80CCE34C */ ~daObj_Sekizoa_c();
-    /* 80CCE570 */ int create();
-    /* 80CCE8B0 */ int CreateHeap();
-    /* 80CCEC54 */ int Delete();
-    /* 80CCEC88 */ int Execute();
-    /* 80CCECA8 */ int Draw();
-    /* 80CCED74 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CCED94 */ static void* srchSekizoa(void*, void*);
-    /* 80CCEE30 */ fopAc_ac_c* getSekizoaP(int);
-    /* 80CCEFA4 */ fopAc_ac_c* getKMsgTagP();
-    /* 80CCF03C */ int isDelete();
-    /* 80CCF138 */ void reset();
-    /* 80CCF708 */ void srchActors();
-    /* 80CD04FC */ int setYariAnm(int, int, f32);
-    /* 80CD0A84 */ int selectAction();
-    /* 80CD0B08 */ int chkAction(actionFunc i_action);
-    /* 80CD0B34 */ int setAction(actionFunc i_action);
-    /* 80CD0BDC */ int checkMoveDirection();
-    /* 80CD0DE8 */ int getWaitMotionNo();
-    /* 80CD0E30 */ int getGameMotionNo();
-    /* 80CD0E78 */ int getNoJumpMotionNo();
-    /* 80CD0EAC */ int getHitMotionNo();
-    /* 80CD0EE0 */ int getStepMotionNo();
-    /* 80CD0F14 */ void jump();
-    /* 80CD14D8 */ void landing();
-    /* 80CD1688 */ int cutStart(int);
-    /* 80CD2708 */ int cutTurn(int);
-    /* 80CD2908 */ int cutJump(int);
-    /* 80CD2B64 */ int cutGoal(int);
-    /* 80CD376C */ int cutExit(int);
-    /* 80CD38F0 */ int cutFree(int);
-    /* 80CD3BD8 */ int cutExtinction(int);
-    /* 80CD3F08 */ int wait(void*);
-    /* 80CD425C */ int puzzle(void*);
-    /* 80CD45B0 */ int talk(void*);
-    /* 80CD5A40 */ daObj_Sekizoa_c(daNpcT_faceMotionAnmData_c const* param_1,
+    ~daObj_Sekizoa_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static void* srchSekizoa(void*, void*);
+    fopAc_ac_c* getSekizoaP(int);
+    fopAc_ac_c* getKMsgTagP();
+    int isDelete();
+    void reset();
+    void srchActors();
+    int setYariAnm(int, int, f32);
+    int selectAction();
+    int chkAction(actionFunc i_action);
+    int setAction(actionFunc i_action);
+    int checkMoveDirection();
+    int getWaitMotionNo();
+    int getGameMotionNo();
+    int getNoJumpMotionNo();
+    int getHitMotionNo();
+    int getStepMotionNo();
+    void jump();
+    void landing();
+    int cutStart(int);
+    int cutTurn(int);
+    int cutJump(int);
+    int cutGoal(int);
+    int cutExit(int);
+    int cutFree(int);
+    int cutExtinction(int);
+    int wait(void*);
+    int puzzle(void*);
+    int talk(void*);
+    daObj_Sekizoa_c(daNpcT_faceMotionAnmData_c const* param_1,
                                    daNpcT_motionAnmData_c const* param_2,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3,
                                    int param_4,
                                    daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5,
                                    int param_6, daNpcT_evtData_c const* param_7, char** param_8)
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
-    /* 80CD5B84 */ BOOL chkGoal() {
+    BOOL chkGoal() {
         daTag_EvtArea_c* evt_area_A = (daTag_EvtArea_c*)mActorMngrs[5].getActorP();
         if (evt_area_A->chkPointInArea(current.pos)) {
             return true;
@@ -112,22 +112,22 @@ public:
         return false;
     }
 
-    /* 80CD5B7C */ s32 getBackboneJointNo() { return 1; }
-    /* 80CD5B74 */ s32 getHeadJointNo() { return 3; }
-    /* 80CCF358 */ void afterJntAnm(int);
-    /* 80CCF3E4 */ void setParam();
-    /* 80CCF6BC */ BOOL checkChangeEvt();
-    /* 80CCF9A8 */ BOOL evtTalk();
-    /* 80CCFAA8 */ BOOL evtCutProc();
-    /* 80CCF704 */ void setAfterTalkMotion();
-    /* 80CCFBA0 */ void action();
-    /* 80CCFD08 */ void beforeMove();
-    /* 80CCFD80 */ void setAttnPos();
-    /* 80CD009C */ void setCollision();
-    /* 80CD03C0 */ int drawDbgInfo();
-    /* 80CD03C8 */ void drawOtherMdl();
-    /* 80CD05D0 */ void drawGhost();
-    /* 80CD06BC */ bool afterSetMotionAnm(int, int, f32, int);
+    s32 getBackboneJointNo() { return 1; }
+    s32 getHeadJointNo() { return 3; }
+    void afterJntAnm(int);
+    void setParam();
+    BOOL checkChangeEvt();
+    BOOL evtTalk();
+    BOOL evtCutProc();
+    void setAfterTalkMotion();
+    void action();
+    void beforeMove();
+    void setAttnPos();
+    void setCollision();
+    int drawDbgInfo();
+    void drawOtherMdl();
+    void drawGhost();
+    bool afterSetMotionAnm(int, int, f32, int);
 
     void setWolfHowling() {
         if (mType != 0) {
@@ -251,7 +251,7 @@ public:
 };
 
 struct daObj_Sekizoa_Param_c {
-    /* 80CD5C30 */ virtual ~daObj_Sekizoa_Param_c() {}
+    virtual ~daObj_Sekizoa_Param_c() {}
 
     struct Data {
         /* 0x00 */ f32 field_0x00;
diff --git a/include/d/actor/d_a_obj_shield.h b/include/d/actor/d_a_obj_shield.h
index c9034a9d77..11b4a2668d 100644
--- a/include/d/actor/d_a_obj_shield.h
+++ b/include/d/actor/d_a_obj_shield.h
@@ -31,27 +31,27 @@ public:
     typedef int (daItemShield_c::*actionFunc)();
     typedef void (daItemShield_c::*camActionFunc)();
 
-    /* 80CD6D9C */ void initBaseMtx();
-    /* 80CD6DD8 */ void setBaseMtx();
-    /* 80CD7094 */ int Create();
-    /* 80CD724C */ virtual int __CreateHeap();
-    /* 80CD7254 */ int create();
-    /* 80CD75EC */ void bg_check();
-    /* 80CD7734 */ int action_proc_call();
-    /* 80CD77F0 */ int actionInit();
-    /* 80CD7828 */ int actionWaitInit();
-    /* 80CD7890 */ int actionWait();
-    /* 80CD7C68 */ int initActionOrderGetDemo();
-    /* 80CD7D04 */ int actionOrderGetDemo();
-    /* 80CD7D80 */ int actionGetDemo();
-    /* 80CD7E00 */ void event_proc_call();
-    /* 80CD7EBC */ void actionWaitCamDemo();
-    /* 80CD7F20 */ void actionOrderCamDemo();
-    /* 80CD7F88 */ void actionCamDemo();
-    /* 80CD7FE4 */ void actionCamDemoEnd();
-    /* 80CD7FE8 */ int execute();
-    /* 80CD80EC */ int draw();
-    /* 80CD8140 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    virtual int __CreateHeap();
+    int create();
+    void bg_check();
+    int action_proc_call();
+    int actionInit();
+    int actionWaitInit();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    void event_proc_call();
+    void actionWaitCamDemo();
+    void actionOrderCamDemo();
+    void actionCamDemo();
+    void actionCamDemoEnd();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getSwBit2() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
     u8 getSwBit() { return (fopAcM_GetParam(this) >> 16) & 0xff; }
diff --git a/include/d/actor/d_a_obj_sm_door.h b/include/d/actor/d_a_obj_sm_door.h
index 9e2501ef33..70746d1e6b 100644
--- a/include/d/actor/d_a_obj_sm_door.h
+++ b/include/d/actor/d_a_obj_sm_door.h
@@ -17,19 +17,19 @@
  */
 class daObjSM_DOOR_c : public dBgS_MoveBgActor {
 public:
-    /* 80CD8784 */ void ChangeModel();
-    /* 80CD8790 */ void Action();
-    /* 80CD8A40 */ int SetDzb();
-    /* 80CD8A90 */ int ReleaceDzb();
-    /* 80CD8AF8 */ void DrawChk1();
-    /* 80CD8BBC */ void DrawChk2();
-    /* 80CD8C80 */ void setBaseMtx();
-    /* 80CD8D4C */ cPhs__Step create();
-    /* 80CD90A4 */ int CreateHeap();
-    /* 80CD9258 */ int Create();
-    /* 80CD929C */ int Execute(Mtx**);
-    /* 80CD930C */ int Draw();
-    /* 80CD9544 */ int Delete();
+    void ChangeModel();
+    void Action();
+    int SetDzb();
+    int ReleaceDzb();
+    void DrawChk1();
+    void DrawChk2();
+    void setBaseMtx();
+    cPhs__Step create();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ bool mUseAlphaModel;
diff --git a/include/d/actor/d_a_obj_smallkey.h b/include/d/actor/d_a_obj_smallkey.h
index d6bb966664..2becc9bae2 100644
--- a/include/d/actor/d_a_obj_smallkey.h
+++ b/include/d/actor/d_a_obj_smallkey.h
@@ -15,7 +15,7 @@
  */
 class daKey_c : public daItemBase_c {
 private:
-    /* 80CDB2E0 */ void seStartTwinkle_private(u32);
+    void seStartTwinkle_private(u32);
 
 public:
     enum daKey_Status_e {
@@ -29,33 +29,33 @@ public:
         STATUS_E_GB_e,
     };
 
-    /* 80CD9F2C */ void initBaseMtx();
-    /* 80CD9F68 */ void setBaseMtx();
-    /* 80CD9FDC */ int Create();
-    /* 80CDA15C */ int __CreateHeap();
-    /* 80CDA164 */ int create();
-    /* 80CDA680 */ void bg_check();
-    /* 80CDA7E8 */ int actionInitInit();
-    /* 80CDA81C */ int actionInit();
-    /* 80CDA8C8 */ int actionParentWaitInit();
-    /* 80CDA8FC */ int actionParentWait();
-    /* 80CDA9AC */ int actionWaitInit();
-    /* 80CDAA28 */ int actionWait();
-    /* 80CDAB74 */ int initActionOrderGetDemo();
-    /* 80CDAC18 */ int actionOrderGetDemo();
-    /* 80CDAC94 */ int actionGetDemo();
-    /* 80CDAD28 */ int actionInitSwOnWait();
-    /* 80CDADD4 */ int actionSwOnWait();
-    /* 80CDAE54 */ int actionInitBoomerangCarry();
-    /* 80CDAF40 */ int actionBoomerangCarry();
-    /* 80CDAFB4 */ void effectSet();
-    /* 80CDB0D8 */ void effectStop();
-    /* 80CDB128 */ void effectCtrl();
-    /* 80CDB36C */ int actionInitE_GB();
-    /* 80CDB3D8 */ int actionE_GB();
-    /* 80CDB404 */ int execute();
-    /* 80CDB5D4 */ int draw();
-    /* 80CDB628 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int __CreateHeap();
+    int create();
+    void bg_check();
+    int actionInitInit();
+    int actionInit();
+    int actionParentWaitInit();
+    int actionParentWait();
+    int actionWaitInit();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    int actionInitSwOnWait();
+    int actionSwOnWait();
+    int actionInitBoomerangCarry();
+    int actionBoomerangCarry();
+    void effectSet();
+    void effectStop();
+    void effectCtrl();
+    int actionInitE_GB();
+    int actionE_GB();
+    int execute();
+    int draw();
+    int _delete();
 
     int getSwNo() { return fopAcM_GetParamBit(this, 16, 8); }
     int getSaveBitNo() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_smgdoor.h b/include/d/actor/d_a_obj_smgdoor.h
index 191c604a63..aad2800ece 100644
--- a/include/d/actor/d_a_obj_smgdoor.h
+++ b/include/d/actor/d_a_obj_smgdoor.h
@@ -24,22 +24,22 @@ enum daObjSmgDoor_Action {
 class daObjSmgDoor_c : public dBgS_MoveBgActor {
 public:
     typedef void (daObjSmgDoor_c::*actionFunc)();
-    /* 80CDBB5C */ void initBaseMtx();
-    /* 80CDBBEC */ void setBaseMtx();
-    /* 80CDBED4 */ int create1st();
-    /* 80CDBFF0 */ int getDemoAction();
-    /* 80CDC038 */ int demoProc();
-    /* 80CDC248 */ int openInit();
-    /* 80CDC378 */ int openProc();
-    /* 80CDC4AC */ void setGoal();
-    /* 80CDC548 */ void setPos();
-    /* 80CDC610 */ void sceneChange();
-    /* 80CDC65C */ void event_proc_call();
-    /* 80CDC700 */ void actionWaitEvent();
-    /* 80CDC790 */ void actionEvent();
-    /* 80CDC7F4 */ void actionDead();
-    /* 80CDC7F8 */ int checkArea();
-    /* 80CDC974 */ int checkOpen();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    int getDemoAction();
+    int demoProc();
+    int openInit();
+    int openProc();
+    void setGoal();
+    void setPos();
+    void sceneChange();
+    void event_proc_call();
+    void actionWaitEvent();
+    void actionEvent();
+    void actionDead();
+    int checkArea();
+    int checkOpen();
 
     void setAction(u8 i_action) { mAction = i_action; }
     u8 getEvId() { return fopAcM_GetParamBit(this, 0, 8); }
@@ -47,11 +47,11 @@ public:
     u8 getType() { return fopAcM_GetParamBit(this, 8, 4); }
     u8 getNextSceneID() { return fopAcM_GetParamBit(this, 12, 8); }
 
-    /* 80CDBD38 */ virtual int Create();
-    /* 80CDBE1C */ virtual int CreateHeap();
-    /* 80CDBFA4 */ virtual int Execute(Mtx**);
-    /* 80CDCA00 */ virtual int Draw();
-    /* 80CDCAC4 */ virtual int Delete();
+    virtual int Create();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_smoke.h b/include/d/actor/d_a_obj_smoke.h
index c9a022c7a7..61a3b56a51 100644
--- a/include/d/actor/d_a_obj_smoke.h
+++ b/include/d/actor/d_a_obj_smoke.h
@@ -17,12 +17,12 @@ public:
         return fopAcM_GetParamBit(this,0,8);
     }
 
-    /* 80CDCE78 */ void initBaseMtx();
-    /* 80CDCE98 */ void setBaseMtx();
-    /* 80CDCEF0 */ int Create();
-    /* 80CDCF9C */ int create();
-    /* 80CDD004 */ int execute();
-    /* 80CDD0B8 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
 private:
     /* 0x568 */ JPABaseEmitter* mParticle;
diff --git a/include/d/actor/d_a_obj_smtile.h b/include/d/actor/d_a_obj_smtile.h
index 16f0427e77..e20936053c 100644
--- a/include/d/actor/d_a_obj_smtile.h
+++ b/include/d/actor/d_a_obj_smtile.h
@@ -31,17 +31,17 @@ private:
     /* 0xB2A */ u8 field_0xb2a;
     /* 0xB2B */ u8 field_0xb2b;
 public:
-    /* 80CDD2AC */ virtual ~daObj_SMTile_c();
-    /* 80CDD3E8 */ int create();
-    /* 80CDD5CC */ int CreateHeap();
-    /* 80CDD6E8 */ int Delete();
-    /* 80CDD71C */ int Execute();
-    /* 80CDDA98 */ int Draw();
-    /* 80CDDB28 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CDDB48 */ void setDstPos();
-    /* 80CDDD28 */ void setPrtcls(int, int);
-    /* 80CDDEFC */ void touchPrtcls(f32);
-    /* 80CDE1A8 */ void setMtx();
+    virtual ~daObj_SMTile_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void setDstPos();
+    void setPrtcls(int, int);
+    void touchPrtcls(f32);
+    void setMtx();
 
     u8 getType() { return 0; }
     u8 getBitSW() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
@@ -54,7 +54,7 @@ STATIC_ASSERT(sizeof(daObj_SMTile_c) == 0xb30);
 
 class daObj_SMTile_Param_c {
 public:
-    /* 80CDE300 */ virtual ~daObj_SMTile_Param_c() {}
+    virtual ~daObj_SMTile_Param_c() {}
 
     static f32 const m[2];
 };
diff --git a/include/d/actor/d_a_obj_smw_stone.h b/include/d/actor/d_a_obj_smw_stone.h
index 3d523dc46a..6d7b499cfe 100644
--- a/include/d/actor/d_a_obj_smw_stone.h
+++ b/include/d/actor/d_a_obj_smw_stone.h
@@ -13,17 +13,17 @@
  */
 class daSmWStone_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80CDE538 */ daSmWStone_c();
-    /* 80CDE588 */ virtual ~daSmWStone_c();
-    /* 80CDE614 */ cPhs__Step create();
-    /* 80CDE8D8 */ int execute();
-    /* 80CDE92C */ int draw();
-    /* 80CDEA2C */ int Delete();
-    /* 80CDEAA4 */ void exeModeHowl();
-    /* 80CDEBA0 */ void setModelMtx();
-    /* 80CDEC04 */ int createHeap();
-    /* 80CDED30 */ void init();
-    /* 80CDED9C */ bool chkWlfInRange();
+    daSmWStone_c();
+    virtual ~daSmWStone_c();
+    cPhs__Step create();
+    int execute();
+    int draw();
+    int Delete();
+    void exeModeHowl();
+    void setModelMtx();
+    int createHeap();
+    void init();
+    bool chkWlfInRange();
 
     int getTuneId() { return 2; }
     u8 getSwBit0() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_snowEffTag.h b/include/d/actor/d_a_obj_snowEffTag.h
index 406434f9b6..748106cc81 100644
--- a/include/d/actor/d_a_obj_snowEffTag.h
+++ b/include/d/actor/d_a_obj_snowEffTag.h
@@ -14,12 +14,12 @@
  */
 class daSnowEffTag_c : public fopAc_ac_c {
 public:
-    /* 80CDF12C */ void setBaseMtx();
-    /* 80CDF184 */ int create();
-    /* 80CDF2B8 */ bool playerAreaCheck();
-    /* 80CDF498 */ int Execute();
-    /* 80CDF5E4 */ int Draw();
-    /* 80CDF5EC */ int Delete();
+    void setBaseMtx();
+    int create();
+    bool playerAreaCheck();
+    int Execute();
+    int Draw();
+    int Delete();
 
     int getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -36,8 +36,8 @@ STATIC_ASSERT(sizeof(daSnowEffTag_c) == 0x57C);
 
 class daSnowEffTag_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CDF0AC */ daSnowEffTag_HIO_c();
-    /* 80CDF674 */ virtual ~daSnowEffTag_HIO_c();
+    daSnowEffTag_HIO_c();
+    virtual ~daSnowEffTag_HIO_c();
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_snow_soup.h b/include/d/actor/d_a_obj_snow_soup.h
index 3def55736b..490b2489c0 100644
--- a/include/d/actor/d_a_obj_snow_soup.h
+++ b/include/d/actor/d_a_obj_snow_soup.h
@@ -14,19 +14,19 @@
  */
 class daObjSnowSoup_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80CDF878 */ daObjSnowSoup_c();
-    /* 80CDF910 */ virtual ~daObjSnowSoup_c();
-    /* 80CDF990 */ int createHeap();
-    /* 80CDFA3C */ cPhs__Step create();
-    /* 80CDFB70 */ int Delete();
-    /* 80CDFBC4 */ int draw();
-    /* 80CDFC40 */ int execute();
-    /* 80CDFE14 */ void init();
-    /* 80CDFEA4 */ void setModelMtx();
-    /* 80CDFF14 */ void createSmkEmtCommon();
-    /* 80CDFFF8 */ void deleteSmkEmtCommon();
-    /* 80CE003C */ void createSmkEmtChange(int);
-    /* 80CE0134 */ void deleteSmkEmtChange(int);
+    daObjSnowSoup_c();
+    virtual ~daObjSnowSoup_c();
+    int createHeap();
+    cPhs__Step create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    void setModelMtx();
+    void createSmkEmtCommon();
+    void deleteSmkEmtCommon();
+    void createSmkEmtChange(int);
+    void deleteSmkEmtChange(int);
 
 private:
     /* 0x574 */ cXyz mFirewoodPos;
diff --git a/include/d/actor/d_a_obj_so.h b/include/d/actor/d_a_obj_so.h
index 872c95d22a..3b4a1638cb 100644
--- a/include/d/actor/d_a_obj_so.h
+++ b/include/d/actor/d_a_obj_so.h
@@ -101,8 +101,8 @@ STATIC_ASSERT(sizeof(obj_so_class) == 0x1bd0);
 
 class daObj_So_HIO_c : public JORReflexible {
 public:
-    /* 80CE03CC */ daObj_So_HIO_c();
-    /* 80CE3928 */ virtual ~daObj_So_HIO_c() {}
+    daObj_So_HIO_c();
+    virtual ~daObj_So_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_spinLift.h b/include/d/actor/d_a_obj_spinLift.h
index c395d05dbd..548df3f910 100644
--- a/include/d/actor/d_a_obj_spinLift.h
+++ b/include/d/actor/d_a_obj_spinLift.h
@@ -16,22 +16,22 @@ class daSpinLift_c : public dBgS_MoveBgActor {
 public:
     typedef void (daSpinLift_c::*modeFunc)();
 
-    /* 80CE3E2C */ void setBaseMtx();
-    /* 80CE3F1C */ int create();
-    /* 80CE414C */ void moveLift();
-    /* 80CE4290 */ void init_modeWait();
-    /* 80CE429C */ void modeWait();
-    /* 80CE42A0 */ void init_modeUpMove();
-    /* 80CE42C4 */ void modeUpMove();
-    /* 80CE468C */ void init_modeDownMove();
-    /* 80CE4698 */ void modeDownMove();
-    /* 80CE4790 */ void init_modeMoveEnd();
-    /* 80CE4A9C */ void modeMoveEnd();
+    void setBaseMtx();
+    int create();
+    void moveLift();
+    void init_modeWait();
+    void modeWait();
+    void init_modeUpMove();
+    void modeUpMove();
+    void init_modeDownMove();
+    void modeDownMove();
+    void init_modeMoveEnd();
+    void modeMoveEnd();
 
-    /* 80CE3E9C */ virtual int CreateHeap();
-    /* 80CE40FC */ virtual int Execute(Mtx**);
-    /* 80CE4AA0 */ virtual int Draw();
-    /* 80CE4B44 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getModelType() { return current.angle.x; }
     int getMoveHeight() { return fopAcM_GetParamBit(this, 16, 8); }
diff --git a/include/d/actor/d_a_obj_ss_base.h b/include/d/actor/d_a_obj_ss_base.h
index 19ef62423e..4d275a43cd 100644
--- a/include/d/actor/d_a_obj_ss_base.h
+++ b/include/d/actor/d_a_obj_ss_base.h
@@ -5,11 +5,11 @@
 
 class daObj_SSBase_c : public fopAc_ac_c {
 public:
-    /* 8015E3F8 */ daObj_SSBase_c();
+    daObj_SSBase_c();
 
-    /* 8015E450 */ virtual ~daObj_SSBase_c();
-    /* 8015E4C8 */ virtual void setSoldOut();
-    /* 8015E4B0 */ virtual u32 getProcessID();
+    virtual ~daObj_SSBase_c();
+    virtual void setSoldOut();
+    virtual u32 getProcessID();
 
     void* getParentPtr() { return mpParentPtr; }
     void setParentPtr(void* parentPtr) { mpParentPtr = parentPtr; }
diff --git a/include/d/actor/d_a_obj_ss_drink.h b/include/d/actor/d_a_obj_ss_drink.h
index 10663a754e..f4865350a4 100644
--- a/include/d/actor/d_a_obj_ss_drink.h
+++ b/include/d/actor/d_a_obj_ss_drink.h
@@ -15,37 +15,37 @@ class daObj_SSDrink_c : public daObj_SSBase_c {
 public:
     typedef int (daObj_SSDrink_c::*ProcessFunc)(void*);
 
-    /* 80CE51C8 */ int create();
-    /* 80CE53EC */ int CreateHeap();
-    /* 80CE55F0 */ int Delete();
-    /* 80CE5624 */ int Execute();
-    /* 80CE5858 */ int Draw();
-    /* 80CE59DC */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CE5A50 */ char* getResName();
-    /* 80CE5A60 */ u8 getTypeFromParam();
-    /* 80CE5B0C */ u8 getSwitchFromParam();
-    /* 80CE5B18 */ u8 getCapacityFromParam();
-    /* 80CE5B3C */ u16 getFlowNodeNum();
-    /* 80CE5B74 */ u16 getValue();
-    /* 80CE5B80 */ void restart();
-    /* 80CE5BF0 */ void initialize();
-    /* 80CE5DB0 */ int checkProcess(ProcessFunc);
-    /* 80CE5DDC */ int setProcess(ProcessFunc);
-    /* 80CE5EC8 */ void setParam();
-    /* 80CE5FE4 */ void setEnvTevColor();
-    /* 80CE6040 */ void setRoomNo();
-    /* 80CE6084 */ void setMtx();
-    /* 80CE60E8 */ void setAttnPos();
-    /* 80CE6170 */ void animeEntry();
-    /* 80CE61E4 */ void animePlay();
-    /* 80CE622C */ int chkEvent();
-    /* 80CE63AC */ int orderEvent();
-    /* 80CE644C */ int wait(void*);
-    /* 80CE6454 */ int talk(void*);
-    /* 80CE6514 */ int drink(void*);
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    char* getResName();
+    u8 getTypeFromParam();
+    u8 getSwitchFromParam();
+    u8 getCapacityFromParam();
+    u16 getFlowNodeNum();
+    u16 getValue();
+    void restart();
+    void initialize();
+    int checkProcess(ProcessFunc);
+    int setProcess(ProcessFunc);
+    void setParam();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
+    void setAttnPos();
+    void animeEntry();
+    void animePlay();
+    int chkEvent();
+    int orderEvent();
+    int wait(void*);
+    int talk(void*);
+    int drink(void*);
 
-    /* 80CE4F78 */ virtual ~daObj_SSDrink_c();
-    /* 80CE59FC */ virtual void setSoldOut();
+    virtual ~daObj_SSDrink_c();
+    virtual void setSoldOut();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
diff --git a/include/d/actor/d_a_obj_ss_item.h b/include/d/actor/d_a_obj_ss_item.h
index 55dfad2a59..bdf61d1ec8 100644
--- a/include/d/actor/d_a_obj_ss_item.h
+++ b/include/d/actor/d_a_obj_ss_item.h
@@ -20,29 +20,29 @@ typedef int (daObj_SSItem_c::*ProcessFunc)(void*);
  */
 class daObj_SSItem_c : public daObj_SSBase_c {
 public:
-    /* 80CE6C18 */ ~daObj_SSItem_c();
-    /* 80CE6E68 */ int create();
-    /* 80CE7298 */ BOOL CreateHeap();
-    /* 80CE7358 */ int Delete();
-    /* 80CE738C */ int Execute();
-    /* 80CE7610 */ int Draw();
-    /* 80CE7758 */ static int createHeapCallBack(fopAc_ac_c* i_this);
-    /* 80CE7778 */ void setSoldOut();
-    /* 80CE77CC */ u32 getProcessID();
-    /* 80CE77F8 */ daObj_SSItem_c* getExchangeItemPtr();
-    /* 80CE7838 */ char* getResName();
-    /* 80CE7850 */ u8 getTypeFromParam();
-    /* 80CE789C */ u16 getFlowNodeNum();
-    /* 80CE78D4 */ u16 getValue();
-    /* 80CE78E0 */ void restart();
-    /* 80CE7950 */ void initialize();
-    /* 80CE7B04 */ int setProcess(ProcessFunc i_process);
-    /* 80CE7BB4 */ void setParam();
-    /* 80CE7C24 */ void setEnvTevColor();
-    /* 80CE7C80 */ void setRoomNo();
-    /* 80CE7CC4 */ void setMtx();
-    /* 80CE7D28 */ void setAttnPos();
-    /* 80CE7D5C */ int wait(void* param_0);
+    ~daObj_SSItem_c();
+    int create();
+    BOOL CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c* i_this);
+    void setSoldOut();
+    u32 getProcessID();
+    daObj_SSItem_c* getExchangeItemPtr();
+    char* getResName();
+    u8 getTypeFromParam();
+    u16 getFlowNodeNum();
+    u16 getValue();
+    void restart();
+    void initialize();
+    int setProcess(ProcessFunc i_process);
+    void setParam();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
+    void setAttnPos();
+    int wait(void* param_0);
     int buy(void* param_0);
     int cancel(void* param_0);
 
diff --git a/include/d/actor/d_a_obj_stairBlock.h b/include/d/actor/d_a_obj_stairBlock.h
index d7e58d0883..63a0c5b178 100644
--- a/include/d/actor/d_a_obj_stairBlock.h
+++ b/include/d/actor/d_a_obj_stairBlock.h
@@ -15,13 +15,13 @@
  */
 class daStairBlock_c : public fopAc_ac_c {
 public:
-    /* 80CE81F4 */ void setBaseMtx();
-    /* 80CE82A0 */ virtual int CreateHeap();
-    /* 80CE83F0 */ int create();
-    /* 80CE8874 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80CE88A0 */ virtual int Execute();
-    /* 80CE8B24 */ virtual int Draw();
-    /* 80CE8C08 */ virtual int Delete();
+    void setBaseMtx();
+    virtual int CreateHeap();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    virtual int Execute();
+    virtual int Draw();
+    virtual int Delete();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcSph mCcDSph;
@@ -39,8 +39,8 @@ STATIC_ASSERT(sizeof(daStairBlock_c) == 0x132c);
 
 class daStairBlock_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CE816C */ daStairBlock_HIO_c();
-    /* 80CE8CDC */ virtual ~daStairBlock_HIO_c() {}
+    daStairBlock_HIO_c();
+    virtual ~daStairBlock_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_stick.h b/include/d/actor/d_a_obj_stick.h
index 6633efd1d3..9d256331bf 100644
--- a/include/d/actor/d_a_obj_stick.h
+++ b/include/d/actor/d_a_obj_stick.h
@@ -27,18 +27,18 @@ private:
     /* 0x944 */ u32 mShadowKey;
     /* 0x948 */ u8 mType;
 public:
-    /* 8059922C */ virtual ~daObj_Stick_c();
-    /* 805993E8 */ int create();
-    /* 80599888 */ int CreateHeap();
-    /* 80599900 */ int Delete();
-    /* 80599934 */ int Execute();
-    /* 80599A78 */ int Draw();
-    /* 80599B3C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80599B5C */ const char* getResName();
-    /* 80599B6C */ int isDelete();
-    /* 80599B8C */ void setEnvTevColor();
-    /* 80599BE8 */ void setRoomNo();
-    /* 80599C28 */ void setMtx();
+    virtual ~daObj_Stick_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    const char* getResName();
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void setMtx();
 
     u32 getType() { return 0; }
 
@@ -49,7 +49,7 @@ STATIC_ASSERT(sizeof(daObj_Stick_c) == 0x950);
 
 class daObj_Stick_Param_c {
 public:
-    /* 80599DD0 */ virtual ~daObj_Stick_Param_c() {};
+    virtual ~daObj_Stick_Param_c() {};
 
     struct daObj_Stick_HIOParam {
         f32 attention_offset;
diff --git a/include/d/actor/d_a_obj_stone.h b/include/d/actor/d_a_obj_stone.h
index 7e650a3689..bad3bb5d61 100644
--- a/include/d/actor/d_a_obj_stone.h
+++ b/include/d/actor/d_a_obj_stone.h
@@ -25,36 +25,36 @@ public:
     u8 getItemNo() { return fopAcM_GetParamBit(this,8,8); }
     u8 getItemBit() { return fopAcM_GetParamBit(this,16,8); }
 
-    /* 80CE93C4 */ void initBaseMtx();
-    /* 80CE9468 */ void setBaseMtx();
-    /* 80CE9540 */ int Create();
-    /* 80CE97C0 */ bool CreateHeap();
-    /* 80CE9840 */ int create();
-    /* 80CE9BA0 */ int execute();
-    /* 80CE9CF8 */ void mode_proc_call();
-    /* 80CEAF88 */ void init_modePutWait();
-    /* 80CEAFD8 */ void modePutWait();
-    /* 80CEAFE8 */ void init_modeWait();
-    /* 80CEB01C */ void modeWait();
-    /* 80CEB0B8 */ void init_modeDrop();
-    /* 80CEB0F8 */ void modeDrop();
-    /* 80CEB35C */ void init_modeCarry();
-    /* 80CEB480 */ void modeCarry();
-    /* 80CEB6E8 */ void init_modeWalk();
-    /* 80CEB720 */ void modeWalk();
-    /* 80CEBCDC */ void init_modePushWolfNonBreak();
-    /* 80CEBE24 */ void init_modeYogan();
-    /* 80CEBE84 */ void modeYogan();
-    /* 80CEBF1C */ void init_modeBreak();
-    /* 80CEC180 */ void modeBreak();
-    /* 80CEC1AC */ void CrrPos();
-    /* 80CEC264 */ void createItem();
-    /* 80CEC33C */ void calcRotBaseMtx(s16*);
-    /* 80CEC5BC */ int checkRollAngle();
-    /* 80CEC6D8 */ void set_carry_eff();
-    /* 80CEC7DC */ void effect_delete(bool);
-    /* 80CEC888 */ int draw();
-    /* 80CEC948 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    bool CreateHeap();
+    int create();
+    int execute();
+    void mode_proc_call();
+    void init_modePutWait();
+    void modePutWait();
+    void init_modeWait();
+    void modeWait();
+    void init_modeDrop();
+    void modeDrop();
+    void init_modeCarry();
+    void modeCarry();
+    void init_modeWalk();
+    void modeWalk();
+    void init_modePushWolfNonBreak();
+    void init_modeYogan();
+    void modeYogan();
+    void init_modeBreak();
+    void modeBreak();
+    void CrrPos();
+    void createItem();
+    void calcRotBaseMtx(s16*);
+    int checkRollAngle();
+    void set_carry_eff();
+    void effect_delete(bool);
+    int draw();
+    int _delete();
 
 private:
     /* 0x0568 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_stoneMark.h b/include/d/actor/d_a_obj_stoneMark.h
index ced83ac94f..87c44804de 100644
--- a/include/d/actor/d_a_obj_stoneMark.h
+++ b/include/d/actor/d_a_obj_stoneMark.h
@@ -16,12 +16,12 @@
  */
 class daObjSMark_c : public fopAc_ac_c {
 public:
-    /* 8059A018 */ void initBaseMtx();
-    /* 8059A038 */ void setBaseMtx();
-    /* 8059A080 */ int Create();
-    /* 8059A168 */ int create();
-    /* 8059A2CC */ int draw();
-    /* 8059A33C */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int draw();
+    int _delete();
 
 private:
     /* 0x0568 */ request_of_phase_process_class mpPhase;
diff --git a/include/d/actor/d_a_obj_stopper.h b/include/d/actor/d_a_obj_stopper.h
index 76a369aaa5..2a9d006609 100644
--- a/include/d/actor/d_a_obj_stopper.h
+++ b/include/d/actor/d_a_obj_stopper.h
@@ -29,26 +29,26 @@ public:
         ACTION_CLOSE_INIT,
     };
 
-    /* 80CECF34 */ void initBaseMtx();
-    /* 80CED024 */ void setBaseMtx();
-    /* 80CED0B8 */ int Create();
-    /* 80CED20C */ int CreateHeap();
-    /* 80CED258 */ int create();
-    /* 80CED6BC */ int Execute(Mtx**);
-    /* 80CED708 */ void action();
-    /* 80CED824 */ void actionWait();
-    /* 80CEDA24 */ void actionWaitOrderEvent();
-    /* 80CEDAAC */ void actionOrderEvent();
-    /* 80CEDB2C */ void actionEvent();
-    /* 80CEE048 */ void actionDead();
-    /* 80CEE04C */ void actionWaitClose();
-    /* 80CEE05C */ void actionCloseInit();
-    /* 80CEE0E0 */ void actionClose();
-    /* 80CEE148 */ void hint_action1();
-    /* 80CEE5D0 */ void hint_action2();
-    /* 80CEEA28 */ void hint_action3();
-    /* 80CEECFC */ int Draw();
-    /* 80CEED60 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void action();
+    void actionWait();
+    void actionWaitOrderEvent();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    void actionWaitClose();
+    void actionCloseInit();
+    void actionClose();
+    void hint_action1();
+    void hint_action2();
+    void hint_action3();
+    int Draw();
+    int Delete();
 
     void setOpen() { mAction = ACTION_WAIT_CLOSE; }
     void setAction(u8 action) { mAction = action; }
diff --git a/include/d/actor/d_a_obj_stopper2.h b/include/d/actor/d_a_obj_stopper2.h
index 59dbdefa33..7ec86cb818 100644
--- a/include/d/actor/d_a_obj_stopper2.h
+++ b/include/d/actor/d_a_obj_stopper2.h
@@ -14,22 +14,22 @@
  */
 class daObjStopper2_c : public fopAc_ac_c {
 public:
-    /* 80CEF368 */ J3DModelData* getStopModelData();
-    /* 80CEF38C */ void initBaseMtx();
-    /* 80CEF3C8 */ void setBaseMtx();
-    /* 80CEF434 */ f32 getMaxOffsetY();
-    /* 80CEF44C */ int Create();
-    /* 80CEF57C */ int CreateHeap();
-    /* 80CEF5C8 */ int create();
-    /* 80CEF66C */ int execute();
-    /* 80CEF6A4 */ void event_proc_call();
-    /* 80CEF760 */ void actionWait();
-    /* 80CEF98C */ void actionOrderEvent();
-    /* 80CEFA60 */ void actionEvent();
-    /* 80CEFAD4 */ void actionDead();
-    /* 80CEFAD8 */ int demoProc();
-    /* 80CEFD40 */ int draw();
-    /* 80CEFDB8 */ int _delete();
+    J3DModelData* getStopModelData();
+    void initBaseMtx();
+    void setBaseMtx();
+    f32 getMaxOffsetY();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    int draw();
+    int _delete();
 
     u32 getEvId() { return fopAcM_GetParamBit(this, 8, 8); }
     u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_suisya.h b/include/d/actor/d_a_obj_suisya.h
index b79cb9b569..c92146f5af 100644
--- a/include/d/actor/d_a_obj_suisya.h
+++ b/include/d/actor/d_a_obj_suisya.h
@@ -14,11 +14,11 @@
  */
 class daObj_Suisya_c : public fopAc_ac_c {
 public:
-    /* 80CF0078 */ int draw();
-    /* 80CF0168 */ int execute();
-    /* 80CF0234 */ int _delete();
-    /* 80CF0284 */ int CreateHeap();
-    /* 80CF0310 */ int create();
+    int draw();
+    int execute();
+    int _delete();
+    int CreateHeap();
+    int create();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
diff --git a/include/d/actor/d_a_obj_swBallA.h b/include/d/actor/d_a_obj_swBallA.h
index 8af2060d5c..1785565a4e 100644
--- a/include/d/actor/d_a_obj_swBallA.h
+++ b/include/d/actor/d_a_obj_swBallA.h
@@ -17,20 +17,20 @@ class daObjSwBallA_c : public fopAc_ac_c , public dEvLib_callback_c {
 public:
     daObjSwBallA_c() : dEvLib_callback_c(this) {}
 
-    /* 80CF3394 */ int checkArea_sub(fopAc_ac_c*);
-    /* 80CF34E4 */ void search_ball();
-    /* 80CF3610 */ void initBaseMtx();
-    /* 80CF3630 */ void setBaseMtx();
-    /* 80CF3694 */ int Create();
-    /* 80CF37FC */ int CreateHeap();
-    /* 80CF3970 */ int create();
-    /* 80CF3A90 */ int execute();
-    /* 80CF3B40 */ void actionRun();
-    /* 80CF3D80 */ void actionStop();
-    /* 80CF3D84 */ void PutCrrPos();
-    /* 80CF406C */ int draw();
-    /* 80CF41F4 */ int _delete();
-    /* 80CF4354 */ virtual ~daObjSwBallA_c() {}
+    int checkArea_sub(fopAc_ac_c*);
+    void search_ball();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void actionRun();
+    void actionStop();
+    void PutCrrPos();
+    int draw();
+    int _delete();
+    virtual ~daObjSwBallA_c() {}
 
     u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
     u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_swBallB.h b/include/d/actor/d_a_obj_swBallB.h
index ae0d1e0942..31a7971232 100644
--- a/include/d/actor/d_a_obj_swBallB.h
+++ b/include/d/actor/d_a_obj_swBallB.h
@@ -17,20 +17,20 @@ class daObjSwBallB_c : public fopAc_ac_c, public dEvLib_callback_c {
 public:
     daObjSwBallB_c() : dEvLib_callback_c(this) {}
 
-    /* 80CF466C */ int checkArea_sub(fopAc_ac_c*);
-    /* 80CF47BC */ void search_ball();
-    /* 80CF496C */ void initBaseMtx();
-    /* 80CF498C */ void setBaseMtx();
-    /* 80CF49F0 */ int Create();
-    /* 80CF4B74 */ int CreateHeap();
-    /* 80CF4CE8 */ int create();
-    /* 80CF4E08 */ int execute();
-    /* 80CF4EB8 */ void actionRun();
-    /* 80CF5384 */ void actionStop();
-    /* 80CF5388 */ void PutCrrPos();
-    /* 80CF56A4 */ int draw();
-    /* 80CF582C */ int _delete();
-    /* 80CF5940 */ virtual ~daObjSwBallB_c() {}
+    int checkArea_sub(fopAc_ac_c*);
+    void search_ball();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void actionRun();
+    void actionStop();
+    void PutCrrPos();
+    int draw();
+    int _delete();
+    virtual ~daObjSwBallB_c() {}
 
     s32 getID() { return fopAcM_GetParamBit(this, 0, 8); }
     u32 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_swBallC.h b/include/d/actor/d_a_obj_swBallC.h
index 50488be664..7f1fba6a27 100644
--- a/include/d/actor/d_a_obj_swBallC.h
+++ b/include/d/actor/d_a_obj_swBallC.h
@@ -13,26 +13,26 @@
  */
 class daObjSwBallC_c : public fopAc_ac_c {
 public:
-    /* 80CF5CD4 */ void initBaseMtx();
-    /* 80CF5CF4 */ void setBaseMtx();
-    /* 80CF5D58 */ int Create();
-    /* 80CF5EF8 */ int CreateHeap();
-    /* 80CF606C */ int create();
-    /* 80CF6120 */ int execute();
-    /* 80CF6144 */ void event_proc_call();
-    /* 80CF6200 */ void actionWait();
-    /* 80CF629C */ void actionOrderEvent();
-    /* 80CF6344 */ void actionEvent();
-    /* 80CF63F0 */ void actionDead();
-    /* 80CF63F4 */ int demoProc();
-    /* 80CF6818 */ void setLightOnSwB();
-    /* 80CF6888 */ void setLightOffSwB();
-    /* 80CF68F8 */ void deleteLightBall();
-    /* 80CF692C */ void deleteLightBallA();
-    /* 80CF6964 */ void deleteLightBallB();
-    /* 80CF699C */ int calcLightBallScale();
-    /* 80CF6A74 */ int draw();
-    /* 80CF6BFC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    void setLightOnSwB();
+    void setLightOffSwB();
+    void deleteLightBall();
+    void deleteLightBallA();
+    void deleteLightBallB();
+    int calcLightBallScale();
+    int draw();
+    int _delete();
 
     void setAction(u8 action) { field_0x57f = action; }
 
diff --git a/include/d/actor/d_a_obj_swLight.h b/include/d/actor/d_a_obj_swLight.h
index ccfd68cf28..1a9fc50cca 100644
--- a/include/d/actor/d_a_obj_swLight.h
+++ b/include/d/actor/d_a_obj_swLight.h
@@ -19,26 +19,26 @@ class daObjSwLight_c : public dBgS_MoveBgActor, public dEvLib_callback_c {
 public:
     typedef void (daObjSwLight_c::*modeFunc)();
 
-    /* 80CF6F98 */ void initBaseMtx();
-    /* 80CF6FD4 */ void setBaseMtx();
-    /* 80CF7260 */ int create1st();
-    /* 80CF73E0 */ void action();
-    /* 80CF761C */ void init_modeSwOnWait();
-    /* 80CF766C */ void modeSwOnWait();
-    /* 80CF777C */ void init_modeOnLight();
-    /* 80CF7788 */ void modeOnLight();
-    /* 80CF77D8 */ void init_modeSwOffWait();
-    /* 80CF7838 */ void modeSwOffWait();
-    /* 80CF7974 */ void modeDead();
-    /* 80CF7978 */ int checkHit();
-    /* 80CF7A6C */ void setOnTimer();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void action();
+    void init_modeSwOnWait();
+    void modeSwOnWait();
+    void init_modeOnLight();
+    void modeOnLight();
+    void init_modeSwOffWait();
+    void modeSwOffWait();
+    void modeDead();
+    int checkHit();
+    void setOnTimer();
 
-    /* 80CF7038 */ virtual int Create();
-    /* 80CF71F0 */ virtual int CreateHeap();
-    /* 80CF7320 */ virtual int Execute(Mtx**);
-    /* 80CF7A98 */ virtual int Draw();
-    /* 80CF7BA8 */ virtual int Delete();
-    /* 80CF8124 */ virtual ~daObjSwLight_c() {};
+    virtual int Create();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual ~daObjSwLight_c() {};
 
     daObjSwLight_c() : dEvLib_callback_c(this) {};
 
diff --git a/include/d/actor/d_a_obj_swchain.h b/include/d/actor/d_a_obj_swchain.h
index ec2e569e10..028b827129 100644
--- a/include/d/actor/d_a_obj_swchain.h
+++ b/include/d/actor/d_a_obj_swchain.h
@@ -25,21 +25,21 @@ public:
         /* 0x4C */ u8 field_0x4c;
     };
 
-    /* 80CF8768 */ int Create();
-    /* 80CF89C0 */ int CreateHeap();
-    /* 80CF8B48 */ int create1st();
-    /* 80CF8ED0 */ int execute();
-    /* 80CF94E4 */ void getChainBasePos(cXyz*);
-    /* 80CF9500 */ void chain_control();
-    /* 80CF99C0 */ void chain_control2();
-    /* 80CFA05C */ void initChainMtx();
-    /* 80CFA124 */ void setChainMtx();
-    /* 80CFA4A8 */ void chain_count_control();
-    /* 80CFAD50 */ void setTension();
-    /* 80CFB450 */ int getTopChainNo();
-    /* 80CFB464 */ BOOL checkPlayerPull();
-    /* 80CFB53C */ int draw();
-    /* 80CFB5E8 */ int _delete();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int execute();
+    void getChainBasePos(cXyz*);
+    void chain_control();
+    void chain_control2();
+    void initChainMtx();
+    void setChainMtx();
+    void chain_count_control();
+    void setTension();
+    int getTopChainNo();
+    BOOL checkPlayerPull();
+    int draw();
+    int _delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return (mHookshotLength & 0xff00) >> 8; }
@@ -57,7 +57,7 @@ public:
     bool checkCarry() { return mCarry == 1; }
     void setRatioForChandelier(f32 ratio) { mRatio = ratio; }
 
-    /* 80C665A4 */ BOOL checkTight() {
+    BOOL checkTight() {
         if (mCarry != 0 && (home.roomNo == 4 || home.roomNo == 6) && mOutNum >= field_0xa69 &&
             field_0xa9c == 0)
         {
diff --git a/include/d/actor/d_a_obj_swhang.h b/include/d/actor/d_a_obj_swhang.h
index 1f66b68e9c..f7efea85cd 100644
--- a/include/d/actor/d_a_obj_swhang.h
+++ b/include/d/actor/d_a_obj_swhang.h
@@ -37,30 +37,30 @@ public:
         MODE_ON_WAIT,
     };
 
-    /* 80CFB9D8 */ void initBaseMtx();
-    /* 80CFBA60 */ void setBaseMtx();
-    /* 80CFBDD0 */ int create1st();
-    /* 80CFC04C */ void calcHangPos();
-    /* 80CFC114 */ BOOL checkDown();
-    /* 80CFC194 */ void changeOnStatus();
-    /* 80CFC1F4 */ void changeOffStatus();
-    /* 80CFC4C4 */ void action();
-    /* 80CFC550 */ void checkDownSw();
-    /* 80CFC698 */ void init_modeOffWait();
-    /* 80CFC6AC */ void modeOffWait();
-    /* 80CFCA34 */ void init_modeOnWait();
-    /* 80CFCA40 */ void modeOnWait();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void calcHangPos();
+    BOOL checkDown();
+    void changeOnStatus();
+    void changeOffStatus();
+    void action();
+    void checkDownSw();
+    void init_modeOffWait();
+    void modeOffWait();
+    void init_modeOnWait();
+    void modeOnWait();
 
     daObjSwHang_c() : dEvLib_callback_c(this) {}
 
-    /* 80CFBCB8 */ virtual int CreateHeap();
-    /* 80CFBAC8 */ virtual int Create();
-    /* 80CFC254 */ virtual int Execute(Mtx**);
-    /* 80CFCD04 */ virtual int Draw();
-    /* 80CFCD98 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
-    /* 80CFCCE0 */ virtual bool eventStart();
-    /* 80CFD034 */ virtual ~daObjSwHang_c() {}
+    virtual bool eventStart();
+    virtual ~daObjSwHang_c() {}
 
     cXyz getHangPos() { return mHangPos; }
 
diff --git a/include/d/actor/d_a_obj_sword.h b/include/d/actor/d_a_obj_sword.h
index 6dcb6bb587..851c6fe3f7 100644
--- a/include/d/actor/d_a_obj_sword.h
+++ b/include/d/actor/d_a_obj_sword.h
@@ -13,17 +13,17 @@
  */
 class daObjSword_c : public daItemBase_c {
 public:
-    /* 80CFD558 */ void initBaseMtx();
-    /* 80CFD594 */ void setBaseMtx();
-    /* 80CFD600 */ int Create();
-    /* 80CFD67C */ cPhs__Step create();
-    /* 80CFDA14 */ int actionWait();
-    /* 80CFDA8C */ int initActionOrderGetDemo();
-    /* 80CFDB04 */ int actionOrderGetDemo();
-    /* 80CFDB80 */ int actionGetDemo();
-    /* 80CFDC1C */ int execute();
-    /* 80CFDD18 */ int draw();
-    /* 80CFDD6C */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    cPhs__Step create();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getItemBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_swpropeller.h b/include/d/actor/d_a_obj_swpropeller.h
index 80cbcfaa4e..11a19b3e31 100644
--- a/include/d/actor/d_a_obj_swpropeller.h
+++ b/include/d/actor/d_a_obj_swpropeller.h
@@ -14,18 +14,18 @@
  */
 class daObjSwPr_c : public fopAc_ac_c {
 public:
-    /* 8059A5E8 */ void initBaseMtx();
-    /* 8059A624 */ void setBaseMtx();
-    /* 8059A670 */ int Create();
-    /* 8059A808 */ int CreateHeap();
-    /* 8059A888 */ int create();
-    /* 8059AB04 */ int setRotateTime();
-    /* 8059AB14 */ void switchCtrl();
-    /* 8059AB9C */ void execute_type_boomerang();
-    /* 8059ADCC */ void execute_type_wind();
-    /* 8059B014 */ int execute();
-    /* 8059B148 */ int draw();
-    /* 8059B1AC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int setRotateTime();
+    void switchCtrl();
+    void execute_type_boomerang();
+    void execute_type_wind();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getNameArg() { return fopAcM_GetParamBit(this, 8, 8); }
     u8 getMdlType() { return fopAcM_GetParamBit(this, 0x10, 4); }
diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h
index 249302e867..b856f69170 100644
--- a/include/d/actor/d_a_obj_swpush.h
+++ b/include/d/actor/d_a_obj_swpush.h
@@ -103,44 +103,44 @@ namespace daObjSwpush {
         void off_switch() { fopAcM_offSwitch(this, prm_get_swSave()); }
         void on_switch() { fopAcM_onSwitch(this, prm_get_swSave()); }
 
-        /* 80482D4C */ void prmZ_init();
-        /* 80482D7C */ bool is_switch2() const;
-        /* 80482DC4 */ static BOOL solidHeapCB(fopAc_ac_c*);
-        /* 80482DE8 */ bool create_heap();
-        /* 80482FE8 */ cPhs__Step create_res_load();
-        /* 80483038 */ cPhs__Step Mthd_Create();
-        /* 8048348C */ int Mthd_Delete();
-        /* 804834E8 */ void set_mtx();
-        /* 80483534 */ void init_mtx();
-        /* 80483570 */ void set_btp_frame();
-        /* 80483574 */ static void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-        /* 804839B4 */ static int jnodeCB(J3DJoint*, int);
-        /* 80483A5C */ void calc_top_pos();
-        /* 80483B70 */ void top_bg_aim_req(f32, s16);
-        /* 80483B7C */ void set_push_flag();
-        /* 80483D0C */ void mode_upper_init();
-        /* 80483D2C */ void mode_upper();
-        /* 80483FA8 */ void mode_u_l_init();
-        /* 80484008 */ void mode_u_l();
-        /* 804841D4 */ void mode_lower_init();
-        /* 804841F4 */ void mode_lower();
-        /* 80484388 */ void mode_l_u_init();
-        /* 804843C0 */ void mode_l_u();
-        /* 80484570 */ void demo_non_init();
-        /* 8048457C */ void demo_non();
-        /* 80484580 */ void demo_reqPause_init();
-        /* 804845D8 */ void demo_reqPause();
-        /* 8048460C */ void demo_runPause_init();
-        /* 8048464C */ void demo_runPause();
-        /* 804846B4 */ void demo_stop_puase();
-        /* 80484708 */ void demo_reqSw_init();
-        /* 804847B4 */ void demo_reqSw();
-        /* 80484828 */ void demo_runSw_init();
-        /* 80484834 */ void demo_runSw();
-        /* 80484890 */ bool check_ride_couple(s16);
-        /* 804848D8 */ int nr_ride_people(char);
-        /* 80484908 */ int Mthd_Execute();
-        /* 80484BB8 */ int Mthd_Draw();
+        void prmZ_init();
+        bool is_switch2() const;
+        static BOOL solidHeapCB(fopAc_ac_c*);
+        bool create_heap();
+        cPhs__Step create_res_load();
+        cPhs__Step Mthd_Create();
+        int Mthd_Delete();
+        void set_mtx();
+        void init_mtx();
+        void set_btp_frame();
+        static void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+        static int jnodeCB(J3DJoint*, int);
+        void calc_top_pos();
+        void top_bg_aim_req(f32, s16);
+        void set_push_flag();
+        void mode_upper_init();
+        void mode_upper();
+        void mode_u_l_init();
+        void mode_u_l();
+        void mode_lower_init();
+        void mode_lower();
+        void mode_l_u_init();
+        void mode_l_u();
+        void demo_non_init();
+        void demo_non();
+        void demo_reqPause_init();
+        void demo_reqPause();
+        void demo_runPause_init();
+        void demo_runPause();
+        void demo_stop_puase();
+        void demo_reqSw_init();
+        void demo_reqSw();
+        void demo_runSw_init();
+        void demo_runSw();
+        bool check_ride_couple(s16);
+        int nr_ride_people(char);
+        int Mthd_Execute();
+        int Mthd_Draw();
 
         static s16 const M_bmd[3];
         static s16 const M_dzb[3];
diff --git a/include/d/actor/d_a_obj_swpush2.h b/include/d/actor/d_a_obj_swpush2.h
index 55bb6c3271..a99800e4c4 100644
--- a/include/d/actor/d_a_obj_swpush2.h
+++ b/include/d/actor/d_a_obj_swpush2.h
@@ -67,48 +67,48 @@ namespace daObjSwpush2 {
             PRM_TYPE_NBITS_e = 0x3,
         };
 
-        /* 80CFE098 */ const char* getArcName();
-        /* 80CFE0A4 */ const char* getBmdName();
-        /* 80CFE0B4 */ const char* getDzbName();
-        /* 80CFE0C4 */ const char* getNmlBtkName();
-        /* 80CFE0D4 */ const char* getNmlBrkName();
-        /* 80CFE0E4 */ const char* getOnBtkName();
-        /* 80CFE0F4 */ const char* getRunBpkName();
-        /* 80CFE104 */ const char* getRunBrkName();
-        /* 80CFE114 */ const char* getRunBtkName();
-        /* 80CFE124 */ void prmZ_init();
-        /* 80CFE154 */ bool is_switch2() const;
-        /* 80CFE1AC */ static int solidHeapCB(fopAc_ac_c*);
-        /* 80CFE1D0 */ bool create_heap();
-        /* 80CFE6D8 */ bool create_init();
-        /* 80CFE8CC */ int create_res_load();
-        /* 80CFE928 */ int Mthd_Create();
-        /* 80CFEA3C */ int Mthd_Delete();
-        /* 80CFEAB4 */ void set_mtx();
-        /* 80CFEB3C */ void init_mtx();
-        /* 80CFEB78 */ static void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-        /* 80CFEBE4 */ void calc_top_pos();
-        /* 80CFEC4C */ void set_push_flag();
-        /* 80CFEDDC */ void mode_upper_init();
-        /* 80CFEDFC */ void mode_upper();
-        /* 80CFEF84 */ void mode_u_l_init();
-        /* 80CFEF98 */ void mode_u_l();
-        /* 80CFF168 */ void mode_lower_init();
-        /* 80CFF188 */ void mode_lower();
-        /* 80CFF18C */ void mode_l_u();
-        /* 80CFF24C */ void demo_non_init();
-        /* 80CFF258 */ void demo_non();
-        /* 80CFF25C */ void demo_reqPause_init();
-        /* 80CFF2B4 */ void demo_reqPause();
-        /* 80CFF2EC */ void demo_runPause_init(int);
-        /* 80CFF31C */ void demo_runPause();
-        /* 80CFF374 */ void demo_stop_puase();
-        /* 80CFF3C8 */ void demo_reqSw_init();
-        /* 80CFF48C */ void demo_reqSw();
-        /* 80CFF500 */ void demo_runSw_init();
-        /* 80CFF50C */ void demo_runSw();
-        /* 80CFF568 */ int Mthd_Execute();
-        /* 80CFF8FC */ int Mthd_Draw();
+        const char* getArcName();
+        const char* getBmdName();
+        const char* getDzbName();
+        const char* getNmlBtkName();
+        const char* getNmlBrkName();
+        const char* getOnBtkName();
+        const char* getRunBpkName();
+        const char* getRunBrkName();
+        const char* getRunBtkName();
+        void prmZ_init();
+        bool is_switch2() const;
+        static int solidHeapCB(fopAc_ac_c*);
+        bool create_heap();
+        bool create_init();
+        int create_res_load();
+        int Mthd_Create();
+        int Mthd_Delete();
+        void set_mtx();
+        void init_mtx();
+        static void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+        void calc_top_pos();
+        void set_push_flag();
+        void mode_upper_init();
+        void mode_upper();
+        void mode_u_l_init();
+        void mode_u_l();
+        void mode_lower_init();
+        void mode_lower();
+        void mode_l_u();
+        void demo_non_init();
+        void demo_non();
+        void demo_reqPause_init();
+        void demo_reqPause();
+        void demo_runPause_init(int);
+        void demo_runPause();
+        void demo_stop_puase();
+        void demo_reqSw_init();
+        void demo_reqSw();
+        void demo_runSw_init();
+        void demo_runSw();
+        int Mthd_Execute();
+        int Mthd_Draw();
 
         const Attr_c& attr() const {
             #if DEBUG
diff --git a/include/d/actor/d_a_obj_swpush5.h b/include/d/actor/d_a_obj_swpush5.h
index 391c78f4c6..3369aa7f8e 100644
--- a/include/d/actor/d_a_obj_swpush5.h
+++ b/include/d/actor/d_a_obj_swpush5.h
@@ -14,37 +14,37 @@
  */
 class daObjSw5_c : public dBgS_MoveBgActor {
 public:
-    /* 8059B804 */ void initBaseMtx();
-    /* 8059B88C */ void setBaseMtx();
-    /* 8059BB1C */ int create();
-    /* 8059BC70 */ void setting_ride_flag();
-    /* 8059BD24 */ BOOL checkPushable();
-    /* 8059BD2C */ void event_proc_call();
-    /* 8059BE18 */ void actionPauseNoneInit();
-    /* 8059BE24 */ void actionPauseNone();
-    /* 8059BE28 */ void actionPauseOrderInit();
-    /* 8059BE80 */ void actionPauseOrder();
-    /* 8059BEB4 */ void actionPauseInit();
-    /* 8059BEE0 */ void actionPause();
-    /* 8059BF48 */ void actionWait();
-    /* 8059BF4C */ void actionOrder();
-    /* 8059BF50 */ void actionEvent();
-    /* 8059BF54 */ void calc_top_pos();
-    /* 8059BFE4 */ void mode_proc_call();
-    /* 8059C0A0 */ void modeWaitLowerInit();
-    /* 8059C0C8 */ void modeWaitLower();
-    /* 8059C23C */ void modeLowerInit();
-    /* 8059C2D0 */ void modeLower();
-    /* 8059C364 */ void modeWaitUpperInit();
-    /* 8059C370 */ void modeWaitUpper();
-    /* 8059C3C4 */ void modeUpperInit();
-    /* 8059C454 */ void modeUpper();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create();
+    void setting_ride_flag();
+    BOOL checkPushable();
+    void event_proc_call();
+    void actionPauseNoneInit();
+    void actionPauseNone();
+    void actionPauseOrderInit();
+    void actionPauseOrder();
+    void actionPauseInit();
+    void actionPause();
+    void actionWait();
+    void actionOrder();
+    void actionEvent();
+    void calc_top_pos();
+    void mode_proc_call();
+    void modeWaitLowerInit();
+    void modeWaitLower();
+    void modeLowerInit();
+    void modeLower();
+    void modeWaitUpperInit();
+    void modeWaitUpper();
+    void modeUpperInit();
+    void modeUpper();
 
-    /* 8059BA1C */ virtual int CreateHeap();
-    /* 8059B920 */ virtual int Create();
-    /* 8059BBD4 */ virtual int Execute(Mtx**);
-    /* 8059C4BC */ virtual int Draw();
-    /* 8059C560 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwNo2() { return 0xFF; }
diff --git a/include/d/actor/d_a_obj_swspinner.h b/include/d/actor/d_a_obj_swspinner.h
index b5d69121cf..b750f60001 100644
--- a/include/d/actor/d_a_obj_swspinner.h
+++ b/include/d/actor/d_a_obj_swspinner.h
@@ -15,14 +15,14 @@
  */
 class daObjSwSpinner_c : public dBgS_MoveBgActor {
 public:
-    /* 80D00174 */ void initBaseMtx();
-    /* 80D001CC */ void setBaseMtx();
-    /* 80D00284 */ int Create();
-    /* 80D0035C */ int CreateHeap();
-    /* 80D00498 */ int create1st();
-    /* 80D00518 */ int Execute(Mtx**);
-    /* 80D00890 */ int Draw();
-    /* 80D00954 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_swturn.h b/include/d/actor/d_a_obj_swturn.h
index bee4671d7d..fd18526805 100644
--- a/include/d/actor/d_a_obj_swturn.h
+++ b/include/d/actor/d_a_obj_swturn.h
@@ -26,21 +26,21 @@ public:
         KIND_1,
     };
 
-    /* 80D00CD8 */ void initBaseMtx();
-    /* 80D00D14 */ void setBaseMtx();
-    /* 80D00D78 */ int Create();
-    /* 80D00EE4 */ int CreateHeap();
-    /* 80D00F64 */ int create1st();
-    /* 80D01074 */ int Execute(Mtx**);
-    /* 80D010D4 */ void mode_proc_call();
-    /* 80D01160 */ void init_modeWait();
-    /* 80D01198 */ void modeWait();
-    /* 80D01770 */ void init_modeRotate();
-    /* 80D018B4 */ void modeRotate();
-    /* 80D01958 */ void rotate_sub_0();
-    /* 80D01B60 */ void rotate_sub_1();
-    /* 80D01EB0 */ int Draw();
-    /* 80D01F58 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void mode_proc_call();
+    void init_modeWait();
+    void modeWait();
+    void init_modeRotate();
+    void modeRotate();
+    void rotate_sub_0();
+    void rotate_sub_1();
+    int Draw();
+    int Delete();
 
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
diff --git a/include/d/actor/d_a_obj_syRock.h b/include/d/actor/d_a_obj_syRock.h
index af4a96898d..6b00a4f46b 100644
--- a/include/d/actor/d_a_obj_syRock.h
+++ b/include/d/actor/d_a_obj_syRock.h
@@ -16,32 +16,32 @@
 class daSyRock_c : public dBgS_MoveBgActor, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
     daSyRock_c() : dEvLib_callback_c(this) {}
-    /* 80D03DAC */ ~daSyRock_c() {}
+    ~daSyRock_c() {}
 
-    /* 80D0237C */ void setBaseMtx();
-    /* 80D02454 */ int CreateHeap();
-    /* 80D02584 */ cPhs__Step create();
-    /* 80D02AFC */ void setFallStat();
-    /* 80D02BE0 */ int Execute(Mtx**);
-    /* 80D02C54 */ void move();
-    /* 80D02E70 */ void init_modeWait();
-    /* 80D02E7C */ void modeWait();
-    /* 80D02F88 */ bool eventStart();
-    /* 80D02FB8 */ void init_modeDropInit();
-    /* 80D03070 */ void modeDropInit();
-    /* 80D030A8 */ static void* searchWaterPillar(void*, void*);
-    /* 80D03250 */ void init_modeDrop();
-    /* 80D03384 */ void modeDrop();
-    /* 80D033D0 */ void init_modeSink();
-    /* 80D03440 */ void modeSink();
-    /* 80D034E8 */ void init_modeMove();
-    /* 80D035F8 */ void modeMove();
-    /* 80D036B8 */ BOOL chkWaterLineIn();
-    /* 80D036DC */ void bgCheck();
-    /* 80D03984 */ void init_modeDropEnd();
-    /* 80D03A48 */ void modeDropEnd();
-    /* 80D03A4C */ int Draw();
-    /* 80D03B08 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    void setFallStat();
+    int Execute(Mtx**);
+    void move();
+    void init_modeWait();
+    void modeWait();
+    bool eventStart();
+    void init_modeDropInit();
+    void modeDropInit();
+    static void* searchWaterPillar(void*, void*);
+    void init_modeDrop();
+    void modeDrop();
+    void init_modeSink();
+    void modeSink();
+    void init_modeMove();
+    void modeMove();
+    BOOL chkWaterLineIn();
+    void bgCheck();
+    void init_modeDropEnd();
+    void modeDropEnd();
+    int Draw();
+    int Delete();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
diff --git a/include/d/actor/d_a_obj_szbridge.h b/include/d/actor/d_a_obj_szbridge.h
index e9b58d1c43..eff6a17a9c 100644
--- a/include/d/actor/d_a_obj_szbridge.h
+++ b/include/d/actor/d_a_obj_szbridge.h
@@ -14,16 +14,16 @@
  */
 class daObjSZbridge_c : public dBgS_MoveBgActor, request_of_phase_process_class {
 public:
-    /* 80D04360 */ void rideActor(fopAc_ac_c*);
-    /* 80D04424 */ int create1st();
-    /* 80D044B8 */ void setMtx();
-    /* 80D04528 */ int CreateHeap();
-    /* 80D04598 */ void chkBg();
-    /* 80D048C4 */ int Create();
-    /* 80D04974 */ int Execute(Mtx**);
-    /* 80D049E4 */ int Draw();
-    /* 80D04A88 */ int Delete();
-    /* 80D04B90 */ virtual ~daObjSZbridge_c() {}
+    void rideActor(fopAc_ac_c*);
+    int create1st();
+    void setMtx();
+    int CreateHeap();
+    void chkBg();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    virtual ~daObjSZbridge_c() {}
 
 private:
     /* 0x5A8 */ Mtx mBgMtx;
diff --git a/include/d/actor/d_a_obj_taFence.h b/include/d/actor/d_a_obj_taFence.h
index eac74aee85..5d18cf5cc0 100644
--- a/include/d/actor/d_a_obj_taFence.h
+++ b/include/d/actor/d_a_obj_taFence.h
@@ -15,22 +15,22 @@
  */
 class daTaFence_c : public dBgS_MoveBgActor {
 public:
-    /* 80D04F8C */ void setBaseMtx();
-    /* 80D050A8 */ int create();
-    /* 80D055A0 */ void fenceProc();
-    /* 80D057C4 */ void init_modeWait();
-    /* 80D057D0 */ void modeWait();
-    /* 80D05A54 */ void init_modeMoveInit();
-    /* 80D05B5C */ void modeMoveInit();
-    /* 80D05B94 */ void init_modeMove();
-    /* 80D05CAC */ void modeMove();
-    /* 80D05D2C */ void init_modeMoveEnd();
-    /* 80D05E54 */ void modeMoveEnd();
+    void setBaseMtx();
+    int create();
+    void fenceProc();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveInit();
+    void modeMoveInit();
+    void init_modeMove();
+    void modeMove();
+    void init_modeMoveEnd();
+    void modeMoveEnd();
 
-    /* 80D0503C */ virtual int CreateHeap();
-    /* 80D05550 */ virtual int Execute(Mtx**);
-    /* 80D05E58 */ virtual int Draw();
-    /* 80D05EFC */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     static const dCcD_SrcGObjInf mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h
index b6529f433a..a52b90081d 100644
--- a/include/d/actor/d_a_obj_table.h
+++ b/include/d/actor/d_a_obj_table.h
@@ -15,11 +15,11 @@
  */
 class daObjTable_c : public dBgS_MoveBgActor {
 public:
-    /* 80D06560 */ int CreateHeap();
-    /* 80D065D0 */ int Create();
-    /* 80D0695C */ int Execute(Mtx**);
-    /* 80D06AD8 */ int Draw();
-    /* 80D06BC8 */ int Delete();
+    int CreateHeap();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     inline void initBaseMtx();
     inline void setBaseMtx();
diff --git a/include/d/actor/d_a_obj_takaraDai.h b/include/d/actor/d_a_obj_takaraDai.h
index b3d851a057..b745683dd6 100644
--- a/include/d/actor/d_a_obj_takaraDai.h
+++ b/include/d/actor/d_a_obj_takaraDai.h
@@ -14,15 +14,15 @@
  */
 class daTkraDai_c : public dBgS_MoveBgActor {
 public:
-    /* 80D06E64 */ void setBaseMtx();
-    /* 80D06FFC */ int CreateHeap();
-    /* 80D07140 */ int create();
-    /* 80D07344 */ int Execute(Mtx**);
-    /* 80D073A4 */ void procMain();
-    /* 80D074D0 */ void init_modeWait();
-    /* 80D07528 */ void modeWait();
-    /* 80D075A4 */ int Draw();
-    /* 80D07668 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void procMain();
+    void init_modeWait();
+    void modeWait();
+    int Draw();
+    int Delete();
 
     u32 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -62,8 +62,8 @@ STATIC_ASSERT(sizeof(daTkraDai_c) == 0x65c);
 
 class daTkraDai_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D06D8C */ daTkraDai_HIO_c();
-    /* 80D0775C */ virtual ~daTkraDai_HIO_c() {}
+    daTkraDai_HIO_c();
+    virtual ~daTkraDai_HIO_c() {}
     void genMessage(JORMContext *);
 
     /* 0x04 */ f32 field_0x04;
diff --git a/include/d/actor/d_a_obj_ten.h b/include/d/actor/d_a_obj_ten.h
index 616a0a9fc5..db9c8903a3 100644
--- a/include/d/actor/d_a_obj_ten.h
+++ b/include/d/actor/d_a_obj_ten.h
@@ -23,27 +23,27 @@ public:
         ACTION_WALK,
     };
 
-    /* 80D087F4 */ void InitCcSph();
-    /* 80D08860 */ void SetCcSph();
-    /* 80D08C10 */ void WaitAction();
-    /* 80D08D94 */ BOOL WallCheck();
-    /* 80D09008 */ void SpeedSet();
-    /* 80D09114 */ void WallWalk();
-    /* 80D09548 */ void WalkAction();
-    /* 80D09748 */ void MoveAction();
-    /* 80D09F58 */ void Action();
-    /* 80D0A01C */ void ShopAction();
-    /* 80D0A0D8 */ void checkGroundPos();
-    /* 80D0A13C */ virtual void Insect_Release();
-    /* 80D0A154 */ void ParticleSet();
-    /* 80D0A278 */ void BoomChk();
-    /* 80D0A644 */ int Execute();
-    /* 80D0A8C8 */ void ObjHit();
-    /* 80D0AA50 */ void Z_BufferChk();
-    /* 80D0ABCC */ int Delete();
-    /* 80D0AC34 */ void setBaseMtx();
-    /* 80D0AD9C */ bool CreateChk();
-    /* 80D0AF48 */ int create();
+    void InitCcSph();
+    void SetCcSph();
+    void WaitAction();
+    BOOL WallCheck();
+    void SpeedSet();
+    void WallWalk();
+    void WalkAction();
+    void MoveAction();
+    void Action();
+    void ShopAction();
+    void checkGroundPos();
+    virtual void Insect_Release();
+    void ParticleSet();
+    void BoomChk();
+    int Execute();
+    void ObjHit();
+    void Z_BufferChk();
+    int Delete();
+    void setBaseMtx();
+    bool CreateChk();
+    int create();
 
     /* 0x590 */ dBgS_GndChk mGndChk;
     /* 0x5E4 */ f32 field_0x5e4;
@@ -82,8 +82,8 @@ STATIC_ASSERT(sizeof(daObjTEN_c) == 0xa68);
 
 class daObj_TenHIO_c {
 public:
-    /* 80D087CC */ daObj_TenHIO_c();
-    /* 80D0B848 */ virtual ~daObj_TenHIO_c() {}
+    daObj_TenHIO_c();
+    virtual ~daObj_TenHIO_c() {}
 
     s8 field_0x4;
     f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_tgake.h b/include/d/actor/d_a_obj_tgake.h
index 2dc6f14f73..1871794df9 100644
--- a/include/d/actor/d_a_obj_tgake.h
+++ b/include/d/actor/d_a_obj_tgake.h
@@ -14,15 +14,15 @@
  */
 class daObjGake_c : public dBgS_MoveBgActor {
 public:
-    /* 80D0BC18 */ void initBaseMtx();
-    /* 80D0BC54 */ void setBaseMtx();
-    /* 80D0BDA0 */ int create1st();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
 
-    /* 80D0BD30 */ virtual int CreateHeap();
-    /* 80D0BCB8 */ virtual int Create();
-    /* 80D0BE24 */ virtual int Execute(Mtx**);
-    /* 80D0BF7C */ virtual int Draw();
-    /* 80D0C034 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u16 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
     u16 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); }
diff --git a/include/d/actor/d_a_obj_thashi.h b/include/d/actor/d_a_obj_thashi.h
index df915c5f7c..3796ee0629 100644
--- a/include/d/actor/d_a_obj_thashi.h
+++ b/include/d/actor/d_a_obj_thashi.h
@@ -16,14 +16,14 @@
  */
 class daObjTHASHI_c : public dBgS_MoveBgActor {
 public:
-    /* 80D0C238 */ void initCcCylinder();
-    /* 80D0C354 */ void setBaseMtx();
-    /* 80D0C654 */ int CreateHeap();
-    /* 80D0C8B4 */ int create();
-    /* 80D0CE70 */ int Create();
-    /* 80D0CEB4 */ int Execute(Mtx**);
-    /* 80D0CEE0 */ int Draw();
-    /* 80D0D140 */ int Delete();
+    void initCcCylinder();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
 // private:
 
diff --git a/include/d/actor/d_a_obj_thdoor.h b/include/d/actor/d_a_obj_thdoor.h
index 0585ea4acd..b20f4a3a71 100644
--- a/include/d/actor/d_a_obj_thdoor.h
+++ b/include/d/actor/d_a_obj_thdoor.h
@@ -25,23 +25,23 @@ public:
         ACTION_DEAD,
     };
 
-    /* 80D0D618 */ void initBaseMtx();
-    /* 80D0D654 */ void setBaseMtx();
-    /* 80D0D6B8 */ int Create();
-    /* 80D0D7F8 */ int CreateHeap();
-    /* 80D0D868 */ int create1st();
-    /* 80D0D8E8 */ int Execute(Mtx**);
-    /* 80D0D9B4 */ void set_cyl();
-    /* 80D0DAC8 */ void action();
-    /* 80D0DB90 */ void event_proc_call();
-    /* 80D0DC4C */ void actionWait();
-    /* 80D0DCC8 */ void actionOrderEvent();
-    /* 80D0DD90 */ void actionEvent();
-    /* 80D0DE30 */ void actionDead();
-    /* 80D0DE34 */ int demoProc();
-    /* 80D0E06C */ BOOL checkArea();
-    /* 80D0E150 */ int Draw();
-    /* 80D0E1F4 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void set_cyl();
+    void action();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    BOOL checkArea();
+    int Draw();
+    int Delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     int getMsg() { return fopAcM_GetParamBit(this, 8, 16); }
diff --git a/include/d/actor/d_a_obj_timeFire.h b/include/d/actor/d_a_obj_timeFire.h
index ae8422ba31..62fb3460d9 100644
--- a/include/d/actor/d_a_obj_timeFire.h
+++ b/include/d/actor/d_a_obj_timeFire.h
@@ -13,15 +13,15 @@
  */
 class daTimeFire_c : public fopAc_ac_c {
 public:
-    /* 80D0E958 */ void setBaseMtx();
-    /* 80D0E9B0 */ int create();
-    /* 80D0EACC */ void lightInit();
-    /* 80D0EB40 */ void setLight();
-    /* 80D0EB64 */ void cutLight();
-    /* 80D0EB88 */ int Execute();
-    /* 80D0ED68 */ bool fireCheck(u8);
-    /* 80D0EF88 */ int Draw();
-    /* 80D0EF90 */ int Delete();
+    void setBaseMtx();
+    int create();
+    void lightInit();
+    void setLight();
+    void cutLight();
+    int Execute();
+    bool fireCheck(u8);
+    int Draw();
+    int Delete();
 
     int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getStartTime() { return fopAcM_GetParamBit(this, 8, 8); }
@@ -48,8 +48,8 @@ STATIC_ASSERT(sizeof(daTimeFire_c) == 0x5c0);
 
 class daTimeFire_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D0E8EC */ daTimeFire_HIO_c();
-    /* 80D0F038 */ virtual ~daTimeFire_HIO_c() {}
+    daTimeFire_HIO_c();
+    virtual ~daTimeFire_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_timer.h b/include/d/actor/d_a_obj_timer.h
index 7072e2d078..120a23b3a9 100644
--- a/include/d/actor/d_a_obj_timer.h
+++ b/include/d/actor/d_a_obj_timer.h
@@ -26,13 +26,13 @@ class Act_c : public fopAc_ac_c {
             PRM_26 = 26,
         };
 
-        /* 80485198 */ int _create();
-        /* 8048526C */ bool _delete();
-        /* 80485274 */ void mode_wait_init();
-        /* 80485284 */ void mode_wait();
-        /* 804852E0 */ void mode_count_init();
-        /* 80485324 */ void mode_count();
-        /* 804854BC */ bool _execute();
+        int _create();
+        bool _delete();
+        void mode_wait_init();
+        void mode_wait();
+        void mode_count_init();
+        void mode_count();
+        bool _execute();
 
         int prm_get_swSave() {
             return daObj::PrmAbstract(this,PRM_8, PRM_16);
diff --git a/include/d/actor/d_a_obj_tks.h b/include/d/actor/d_a_obj_tks.h
index b4e6ebfaf4..93ec22da8a 100644
--- a/include/d/actor/d_a_obj_tks.h
+++ b/include/d/actor/d_a_obj_tks.h
@@ -15,7 +15,7 @@ struct daObjTks_HIOParam {
 
 class daObjTks_Param_c {
 public:
-    /* 80D126D0 */ virtual ~daObjTks_Param_c() {}
+    virtual ~daObjTks_Param_c() {}
 
     static const daObjTks_HIOParam m;
 };
@@ -31,37 +31,37 @@ public:
 
 class daObjTks_c : public daNpcF_c {
 public:
-    /* 80D0F28C */ daObjTks_c();
-    /* 80D0F480 */ virtual ~daObjTks_c();
+    daObjTks_c();
+    virtual ~daObjTks_c();
 
-    /* 80D0F640 */ int Create();
-    /* 80D0F904 */ int CreateHeap();
-    /* 80D0FD34 */ int Delete();
-    /* 80D0FD68 */ int Execute();
-    /* 80D0FE60 */ int Draw();
-    /* 80D0FED0 */ int ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80D10094 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D100B4 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80D103E8 */ void reset();
-    /* 80D10578 */ inline int setAction(void (daObjTks_c::*)());
-    /* 80D10618 */ void wait();
-    /* 80D106F4 */ void talk();
-    /* 80D10A80 */ void demo();
-    /* 80D11228 */ void warp();
-    /* 80D11CB4 */ inline void lookat();
+    int Create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    int ctrlJoint(J3DJoint*, J3DModel*);
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    void reset();
+    inline int setAction(void (daObjTks_c::*)());
+    void wait();
+    void talk();
+    void demo();
+    void warp();
+    inline void lookat();
 
-    /* 80D11670 */ virtual inline void setParam();
-    /* 80D116C8 */ virtual inline BOOL main();
-    /* 80D118E8 */ virtual inline BOOL ctrlBtk();
-    /* 80D10100 */ virtual inline void setMtx();
-    /* 80D119BC */ virtual inline void setAttnPos();
-    /* 80D10184 */ virtual inline bool setExpressionAnm(int, bool);
-    /* 80D102D0 */ virtual inline bool setExpressionBtp(int);
-    /* 80D106C8 */ virtual inline void setExpression(int, f32);
-    /* 80D11104 */ virtual inline void setMotionAnm(int, f32);
-    /* 80D103A4 */ virtual inline void setMotion(int, f32, int);
-    /* 80D11E94 */ virtual inline BOOL drawDbgInfo();
-    /* 80D11E9C */ virtual inline void drawOtherMdls();
+    virtual inline void setParam();
+    virtual inline BOOL main();
+    virtual inline BOOL ctrlBtk();
+    virtual inline void setMtx();
+    virtual inline void setAttnPos();
+    virtual inline bool setExpressionAnm(int, bool);
+    virtual inline bool setExpressionBtp(int);
+    virtual inline void setExpression(int, f32);
+    virtual inline void setMotionAnm(int, f32);
+    virtual inline void setMotion(int, f32, int);
+    virtual inline BOOL drawDbgInfo();
+    virtual inline void drawOtherMdls();
 
     void calcSpringF(f32* param_0, f32 param_1, f32* param_2) {
         *param_2 = daObjTks_Param_c::m.spring_atten * (*param_2 + (daObjTks_Param_c::m.spring_factor * (*param_0 - param_1)));
diff --git a/include/d/actor/d_a_obj_tmoon.h b/include/d/actor/d_a_obj_tmoon.h
index b4ed5e0a5f..4bf3c3620c 100644
--- a/include/d/actor/d_a_obj_tmoon.h
+++ b/include/d/actor/d_a_obj_tmoon.h
@@ -13,14 +13,14 @@
  */
 class daObjTMoon_c : public fopAc_ac_c {
 public:
-    /* 80D12BB8 */ void initBaseMtx();
-    /* 80D12BF4 */ void setBaseMtx();
-    /* 80D12C48 */ int Create();
-    /* 80D12C9C */ int CreateHeap();
-    /* 80D12D0C */ int create();
-    /* 80D12DC0 */ int execute();
-    /* 80D12EB4 */ int draw();
-    /* 80D12EDC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u32 getEventBit1() { return fopAcM_GetParamBit(this, 0, 10); }
     u32 getEventBit2() { return fopAcM_GetParamBit(this, 10, 10); }
diff --git a/include/d/actor/d_a_obj_toaru_maki.h b/include/d/actor/d_a_obj_toaru_maki.h
index 32b1183065..4f7e8d2645 100644
--- a/include/d/actor/d_a_obj_toaru_maki.h
+++ b/include/d/actor/d_a_obj_toaru_maki.h
@@ -14,14 +14,14 @@
  */
 class daObjToaruMaki_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80D13098 */ daObjToaruMaki_c();
-    /* 80D130E0 */ virtual ~daObjToaruMaki_c();
-    /* 80D1316C */ int createHeap();
-    /* 80D132B4 */ int create();
-    /* 80D133C0 */ int Delete();
-    /* 80D1343C */ void setModelMtx();
-    /* 80D134A0 */ int draw();
-    /* 80D13524 */ int execute();
+    daObjToaruMaki_c();
+    virtual ~daObjToaruMaki_c();
+    int createHeap();
+    int create();
+    int Delete();
+    void setModelMtx();
+    int draw();
+    int execute();
 
     u32 getNameArg_0() { return fopAcM_GetParamBit(this, 0, 4); }
 
diff --git a/include/d/actor/d_a_obj_tobyhouse.h b/include/d/actor/d_a_obj_tobyhouse.h
index ba339267ad..7df268b925 100644
--- a/include/d/actor/d_a_obj_tobyhouse.h
+++ b/include/d/actor/d_a_obj_tobyhouse.h
@@ -28,22 +28,22 @@ public:
         TYPE_1,
     };
 
-    /* 80D15F0C */ void initBaseMtx();
-    /* 80D15F48 */ void setBaseMtx();
-    /* 80D15FE0 */ int Create();
-    /* 80D161A4 */ int CreateHeap();
-    /* 80D163F0 */ int create1st();
-    /* 80D164C0 */ int Execute(Mtx**);
-    /* 80D16560 */ void action();
-    /* 80D1661C */ void actionWait();
-    /* 80D166E0 */ void actionOrderEvent();
-    /* 80D167BC */ void actionEvent();
-    /* 80D16860 */ void actionDead();
-    /* 80D16864 */ void demoProc();
-    /* 80D171C0 */ void sceneChange();
-    /* 80D17230 */ int Draw();
-    /* 80D17374 */ BOOL checkLODModel();
-    /* 80D174F8 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void action();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    void demoProc();
+    void sceneChange();
+    int Draw();
+    BOOL checkLODModel();
+    int Delete();
 
     bool checkWater() { return fopAcM_GetParamBit(this, 31, 1); }
     void setAction(u8 action) { mAction = action; }
diff --git a/include/d/actor/d_a_obj_togeTrap.h b/include/d/actor/d_a_obj_togeTrap.h
index b0b7f28523..159afb645e 100644
--- a/include/d/actor/d_a_obj_togeTrap.h
+++ b/include/d/actor/d_a_obj_togeTrap.h
@@ -24,23 +24,23 @@ public:
         MODE_BREAK,
     };
 
-    /* 80D17C74 */ void setBaseMtx();
-    /* 80D17D5C */ int CreateHeap();
-    /* 80D17E14 */ int create();
-    /* 80D18244 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80D1825C */ int Execute(Mtx**);
-    /* 80D182C8 */ void moveMain();
-    /* 80D185DC */ BOOL playerAreaCheck();
-    /* 80D186B0 */ void init_modeWait();
-    /* 80D186BC */ void modeWait();
-    /* 80D186C0 */ void init_modeMoveUp();
-    /* 80D18784 */ void modeMoveUp();
-    /* 80D188C0 */ void init_modeMoveDown();
-    /* 80D188DC */ void modeMoveDown();
-    /* 80D18994 */ void init_modeBreak();
-    /* 80D18A5C */ void modeBreak();
-    /* 80D18BEC */ int Draw();
-    /* 80D18CA4 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
+    int Execute(Mtx**);
+    void moveMain();
+    BOOL playerAreaCheck();
+    void init_modeWait();
+    void modeWait();
+    void init_modeMoveUp();
+    void modeMoveUp();
+    void init_modeMoveDown();
+    void modeMoveDown();
+    void init_modeBreak();
+    void modeBreak();
+    int Draw();
+    int Delete();
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -65,8 +65,8 @@ STATIC_ASSERT(sizeof(daTogeTrap_c) == 0xae4);
 
 class daTogeTrap_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80D17B6C */ daTogeTrap_HIO_c();
-    /* 80D18DA8 */ ~daTogeTrap_HIO_c() {}
+    daTogeTrap_HIO_c();
+    ~daTogeTrap_HIO_c() {}
 
     #ifdef DEBUG
     void genMessage(JORMContext* ctx) {
diff --git a/include/d/actor/d_a_obj_tombo.h b/include/d/actor/d_a_obj_tombo.h
index b3b7604bc9..3dacbe0dad 100644
--- a/include/d/actor/d_a_obj_tombo.h
+++ b/include/d/actor/d_a_obj_tombo.h
@@ -22,29 +22,29 @@ public:
         ACTION_LINK,
     };
 
-    /* 80D19200 */ void InitCcSph();
-    /* 80D1926C */ void SetCcSph();
-    /* 80D192E4 */ int CreateHeap();
-    /* 80D19658 */ void WaitAction();
-    /* 80D19744 */ void SpeedSet();
-    /* 80D19834 */ bool CheckWater();
-    /* 80D199F4 */ void CheckGround();
-    /* 80D19B48 */ void CheckWall();
-    /* 80D19C34 */ void SearchLink();
-    /* 80D19E48 */ void LinkAction();
-    /* 80D1A138 */ void MoveAction();
-    /* 80D1A280 */ void Action();
-    /* 80D1A3EC */ void ShopAction();
-    /* 80D1A514 */ void Insect_Release();
-    /* 80D1A524 */ void ParticleSet();
-    /* 80D1A648 */ void BoomChk();
-    /* 80D1A904 */ int Execute();
-    /* 80D1AB20 */ void ObjHit();
-    /* 80D1AC84 */ void Z_BufferChk();
-    /* 80D1AE00 */ int Delete();
-    /* 80D1AE68 */ void setBaseMtx();
-    /* 80D1AFC8 */ bool CreateChk();
-    /* 80D1B174 */ int create();
+    void InitCcSph();
+    void SetCcSph();
+    int CreateHeap();
+    void WaitAction();
+    void SpeedSet();
+    bool CheckWater();
+    void CheckGround();
+    void CheckWall();
+    void SearchLink();
+    void LinkAction();
+    void MoveAction();
+    void Action();
+    void ShopAction();
+    void Insect_Release();
+    void ParticleSet();
+    void BoomChk();
+    int Execute();
+    void ObjHit();
+    void Z_BufferChk();
+    int Delete();
+    void setBaseMtx();
+    bool CreateChk();
+    int create();
 
     inline int Draw();
 
diff --git a/include/d/actor/d_a_obj_tornado.h b/include/d/actor/d_a_obj_tornado.h
index 5ec2f521cf..30e8e2c1e3 100644
--- a/include/d/actor/d_a_obj_tornado.h
+++ b/include/d/actor/d_a_obj_tornado.h
@@ -14,17 +14,17 @@
  */
 class daObjTrnd_c : public fopAc_ac_c {
 public:
-    /* 80D1B998 */ void setPntWind();
-    /* 80D1BA0C */ void cutPntWind();
-    /* 80D1BA30 */ void movePntWind();
-    /* 80D1BC40 */ void setCpsInfo();
-    /* 80D1BE04 */ void initBaseMtx();
-    /* 80D1BE24 */ void setBaseMtx();
-    /* 80D1BE6C */ int Create();
-    /* 80D1BFB0 */ int create();
-    /* 80D1C0F0 */ int execute();
-    /* 80D1C290 */ int draw();
-    /* 80D1C298 */ int _delete();
+    void setPntWind();
+    void cutPntWind();
+    void movePntWind();
+    void setCpsInfo();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u32 checkSE() { return fopAcM_GetParamBit(this, 8, 1); }
     u8 getTimer() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_tornado2.h b/include/d/actor/d_a_obj_tornado2.h
index aeebddae71..6d208576fb 100644
--- a/include/d/actor/d_a_obj_tornado2.h
+++ b/include/d/actor/d_a_obj_tornado2.h
@@ -14,21 +14,21 @@
  */
 class daObjTrnd2_c : public fopAc_ac_c {
 public:
-    /* 80D1C4D8 */ void setPntWind();
-    /* 80D1C54C */ void cutPntWind();
-    /* 80D1C570 */ void movePntWind();
-    /* 80D1C780 */ void setCpsInfo();
-    /* 80D1C924 */ void initBaseMtx();
-    /* 80D1C944 */ void setBaseMtx();
-    /* 80D1C98C */ int Create();
-    /* 80D1CC80 */ int create();
-    /* 80D1CDC0 */ int execute();
-    /* 80D1D0AC */ void setParticle();
-    /* 80D1D214 */ void endParticle();
-    /* 80D1D278 */ void startParticle();
-    /* 80D1D2AC */ void stopParticle();
-    /* 80D1D2E0 */ int draw();
-    /* 80D1D2E8 */ int _delete();
+    void setPntWind();
+    void cutPntWind();
+    void movePntWind();
+    void setCpsInfo();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    void setParticle();
+    void endParticle();
+    void startParticle();
+    void stopParticle();
+    int draw();
+    int _delete();
 
     f32 getTargetLength() { return mTargetLength; }
     f32 getNowLength() { return mNowLength; }
diff --git a/include/d/actor/d_a_obj_treesh.h b/include/d/actor/d_a_obj_treesh.h
index 916bb9195f..57366a70a8 100644
--- a/include/d/actor/d_a_obj_treesh.h
+++ b/include/d/actor/d_a_obj_treesh.h
@@ -15,15 +15,15 @@
  */
 class daTreeSh_c : public dBgS_MoveBgActor {
 public:
-    /* 80D1F258 */ void initBaseMtx();
-    /* 80D1F294 */ void setBaseMtx();
-    /* 80D1F414 */ int create1st();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
 
-    /* 80D1F2E8 */ virtual int CreateHeap();
-    /* 80D1F358 */ virtual int Create();
-    /* 80D1F49C */ virtual int Execute(Mtx**);
-    /* 80D1F648 */ virtual int Draw();
-    /* 80D1F6EC */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;
@@ -38,8 +38,8 @@ STATIC_ASSERT(sizeof(daTreeSh_c) == 0x5cc);
 
 class daTreeSh_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D1F0CC */ daTreeSh_HIO_c();
-    /* 80D1F81C */ virtual ~daTreeSh_HIO_c() {}
+    daTreeSh_HIO_c();
+    virtual ~daTreeSh_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_twGate.h b/include/d/actor/d_a_obj_twGate.h
index 56ad450466..5ba018a2e0 100644
--- a/include/d/actor/d_a_obj_twGate.h
+++ b/include/d/actor/d_a_obj_twGate.h
@@ -14,12 +14,12 @@
  */
 class daTwGate_c : public dBgS_MoveBgActor {
 public:
-    /* 80D1FB84 */ void setBaseMtx();
-    /* 80D1FC0C */ int CreateHeap();
-    /* 80D1FD44 */ int create();
-    /* 80D1FFA4 */ int Execute(Mtx**);
-    /* 80D200B4 */ int Draw();
-    /* 80D20180 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     int getGateType() { return fopAcM_GetParamBit(this, 4, 8); }
 
@@ -36,8 +36,8 @@ STATIC_ASSERT(sizeof(daTwGate_c) == 0x5fc);
 
 class daTwGate_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80D1FAAC */ daTwGate_HIO_c();
-    /* 80D2024C */ ~daTwGate_HIO_c() {}
+    daTwGate_HIO_c();
+    ~daTwGate_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
diff --git a/include/d/actor/d_a_obj_vground.h b/include/d/actor/d_a_obj_vground.h
index d5fb2c5204..49526eb6c9 100644
--- a/include/d/actor/d_a_obj_vground.h
+++ b/include/d/actor/d_a_obj_vground.h
@@ -13,14 +13,14 @@
  */
 class daObjVGnd_c : public fopAc_ac_c {
 public:
-    /* 80D213F8 */ void initBaseMtx();
-    /* 80D21448 */ void setBaseMtx();
-    /* 80D214AC */ int Create();
-    /* 80D21500 */ int CreateHeap();
-    /* 80D216F4 */ int create();
-    /* 80D217A8 */ int execute();
-    /* 80D21878 */ int draw();
-    /* 80D2194C */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_obj_volcball.h b/include/d/actor/d_a_obj_volcball.h
index 2e7c936dbb..ddd299a26e 100644
--- a/include/d/actor/d_a_obj_volcball.h
+++ b/include/d/actor/d_a_obj_volcball.h
@@ -76,35 +76,35 @@ public:
 
     daObjVolcBall_c() : dEvLib_callback_c(this) {}
 
-    /* 80D21B18 */ volc_param_c* getData();
-    /* 80D21BA0 */ void initBaseMtx();
-    /* 80D21BC0 */ void setBaseMtx();
-    /* 80D21C40 */ int Create();
-    /* 80D21D80 */ int CreateHeap();
-    /* 80D21E28 */ int create();
-    /* 80D22424 */ int execute();
-    /* 80D22484 */ void action();
-    /* 80D22570 */ void initActionPlayerWait();
-    /* 80D2257C */ void initActionWarning();
-    /* 80D225A4 */ void initActionSwWait();
-    /* 80D225B0 */ void actionPlayerWait();
-    /* 80D2267C */ void actionSwWait();
-    /* 80D22724 */ void actionStop();
-    /* 80D227E4 */ void actionWarning();
-    /* 80D22944 */ void actionEruption();
-    /* 80D22C6C */ void initActionEnd();
-    /* 80D22CD4 */ void actionEnd();
-    /* 80D22E24 */ void setEruptEffect(int);
-    /* 80D22ED4 */ void setFallEffect(int);
-    /* 80D22FCC */ void endFallEffect(int);
-    /* 80D23034 */ bool createSearchBall();
-    /* 80D23188 */ bool createNormalBall();
-    /* 80D23438 */ int executeBall();
-    /* 80D23868 */ void startQuake();
-    /* 80D23904 */ int draw();
-    /* 80D23A0C */ int _delete();
+    volc_param_c* getData();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    void action();
+    void initActionPlayerWait();
+    void initActionWarning();
+    void initActionSwWait();
+    void actionPlayerWait();
+    void actionSwWait();
+    void actionStop();
+    void actionWarning();
+    void actionEruption();
+    void initActionEnd();
+    void actionEnd();
+    void setEruptEffect(int);
+    void setFallEffect(int);
+    void endFallEffect(int);
+    bool createSearchBall();
+    bool createNormalBall();
+    int executeBall();
+    void startQuake();
+    int draw();
+    int _delete();
 
-    /* 80D22DDC */ virtual bool eventStart();
+    virtual bool eventStart();
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_volcbom.h b/include/d/actor/d_a_obj_volcbom.h
index 3b8f512440..1aae1c0269 100644
--- a/include/d/actor/d_a_obj_volcbom.h
+++ b/include/d/actor/d_a_obj_volcbom.h
@@ -36,46 +36,46 @@ public:
         ACTION_DEAD,
     };
 
-    /* 80D241E0 */ void initBaseMtx();
-    /* 80D24238 */ void setBaseMtx();
-    /* 80D242A8 */ int Create();
-    /* 80D244E0 */ int CreateHeap();
-    /* 80D248F4 */ int create1st();
-    /* 80D249D0 */ int Execute(Mtx**);
-    /* 80D24A2C */ void mode_proc_call();
-    /* 80D24B18 */ void init_modeWaitAppear();
-    /* 80D24B6C */ void modeWaitAppear();
-    /* 80D24D80 */ void init_modeFall();
-    /* 80D24E50 */ void modeFall();
-    /* 80D25024 */ void init_modeWaitEndFallDemo();
-    /* 80D25038 */ void modeWaitEndFallDemo();
-    /* 80D25094 */ void init_modeWait();
-    /* 80D25100 */ void modeWait();
-    /* 80D25178 */ void clrDzb();
-    /* 80D251CC */ void setDzb();
-    /* 80D25224 */ void appear();
-    /* 80D25230 */ void disappear();
-    /* 80D2523C */ void setSmoke();
-    /* 80D252C8 */ bool checkTalkDistance();
-    /* 80D25364 */ void calcMidnaWaitPos();
-    /* 80D253FC */ void setSrcEffect();
-    /* 80D25528 */ void setBindEffect();
-    /* 80D255F4 */ void followBindEffect();
-    /* 80D25664 */ void endBindEffect();
-    /* 80D256B8 */ void followSrcEffect();
-    /* 80D25758 */ void endSrcEffect();
-    /* 80D257E4 */ void event_proc_call();
-    /* 80D25914 */ void orderZHintEvent();
-    /* 80D25A08 */ void actionWait();
-    /* 80D25B04 */ void actionOrderEvent();
-    /* 80D25CA0 */ void actionOrderATalkEvent();
-    /* 80D25DEC */ void actionTalkEvent();
-    /* 80D25E78 */ void actionWarpEvent();
-    /* 80D25EE4 */ void actionDead();
-    /* 80D25EE8 */ void demoProc();
-    /* 80D26468 */ void calcObjPos();
-    /* 80D264E8 */ int Draw();
-    /* 80D266FC */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    void mode_proc_call();
+    void init_modeWaitAppear();
+    void modeWaitAppear();
+    void init_modeFall();
+    void modeFall();
+    void init_modeWaitEndFallDemo();
+    void modeWaitEndFallDemo();
+    void init_modeWait();
+    void modeWait();
+    void clrDzb();
+    void setDzb();
+    void appear();
+    void disappear();
+    void setSmoke();
+    bool checkTalkDistance();
+    void calcMidnaWaitPos();
+    void setSrcEffect();
+    void setBindEffect();
+    void followBindEffect();
+    void endBindEffect();
+    void followSrcEffect();
+    void endSrcEffect();
+    void event_proc_call();
+    void orderZHintEvent();
+    void actionWait();
+    void actionOrderEvent();
+    void actionOrderATalkEvent();
+    void actionTalkEvent();
+    void actionWarpEvent();
+    void actionDead();
+    void demoProc();
+    void calcObjPos();
+    int Draw();
+    int Delete();
 
     void startFall() { field_0x95f = 1; }
     void startSearch() { field_0x960 = 1; }
diff --git a/include/d/actor/d_a_obj_warp_kbrg.h b/include/d/actor/d_a_obj_warp_kbrg.h
index 6b8dc9d8cd..8963407827 100644
--- a/include/d/actor/d_a_obj_warp_kbrg.h
+++ b/include/d/actor/d_a_obj_warp_kbrg.h
@@ -29,40 +29,40 @@ public:
         ACTION_DEAD2_e,
     };
 
-    /* 80D26FA8 */ void initBaseMtx();
-    /* 80D27008 */ void setBaseMtx();
-    /* 80D276B4 */ int create1st();
-    /* 80D27890 */ void event_proc_call();
-    /* 80D27A38 */ void orderZHintEvent();
-    /* 80D27B2C */ void actionWait();
-    /* 80D27C6C */ void actionOrderEvent();
-    /* 80D27E08 */ void actionWaitWarpEvent();
-    /* 80D27ED0 */ void actionOrderATalkEvent();
-    /* 80D28040 */ void actionTalkEvent();
-    /* 80D280CC */ void actionWarpEvent();
-    /* 80D28144 */ void actionDead();
-    /* 80D28148 */ void actionWait2();
-    /* 80D2814C */ void actionOrderEvent2();
-    /* 80D281E4 */ void actionWarpEvent2();
-    /* 80D28248 */ void actionDead2();
-    /* 80D2824C */ void demoProc();
-    /* 80D28A50 */ void calcObjPos();
-    /* 80D28AE0 */ bool checkTalkDistance();
-    /* 80D28B7C */ void calcMidnaWaitPos();
-    /* 80D28C10 */ void setBindEffect();
-    /* 80D28CDC */ void followBindEffect();
-    /* 80D28D4C */ void setSrcEffect();
-    /* 80D28E9C */ void setDstEffect();
-    /* 80D28FEC */ void followSrcEffect();
-    /* 80D290A8 */ void followDstEffect();
-    /* 80D29158 */ void endSrcEffect();
-    /* 80D291FC */ void endDstEffect();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void event_proc_call();
+    void orderZHintEvent();
+    void actionWait();
+    void actionOrderEvent();
+    void actionWaitWarpEvent();
+    void actionOrderATalkEvent();
+    void actionTalkEvent();
+    void actionWarpEvent();
+    void actionDead();
+    void actionWait2();
+    void actionOrderEvent2();
+    void actionWarpEvent2();
+    void actionDead2();
+    void demoProc();
+    void calcObjPos();
+    bool checkTalkDistance();
+    void calcMidnaWaitPos();
+    void setBindEffect();
+    void followBindEffect();
+    void setSrcEffect();
+    void setDstEffect();
+    void followSrcEffect();
+    void followDstEffect();
+    void endSrcEffect();
+    void endDstEffect();
 
-    /* 80D27300 */ virtual int CreateHeap();
-    /* 80D270C4 */ virtual int Create();
-    /* 80D2781C */ virtual int Execute(Mtx**);
-    /* 80D292A0 */ virtual int Draw();
-    /* 80D29448 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getNameArg() { return fopAcM_GetParamBit(this, 31, 2); }
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_warp_obrg.h b/include/d/actor/d_a_obj_warp_obrg.h
index d5518607c0..52d7510954 100644
--- a/include/d/actor/d_a_obj_warp_obrg.h
+++ b/include/d/actor/d_a_obj_warp_obrg.h
@@ -25,26 +25,26 @@ public:
         ACTION_WARP_EVENT_DST_e,
     };
 
-    /* 80D299B8 */ void initBaseMtx();
-    /* 80D29A00 */ void setBaseMtx();
-    /* 80D29E7C */ int create1st();
-    /* 80D2A04C */ void event_proc_call();
-    /* 80D2A194 */ void actionWait();
-    /* 80D2A4CC */ void actionOrderEvent();
-    /* 80D2A740 */ void actionTalkEvent();
-    /* 80D2A7C4 */ void actionWarpEvent();
-    /* 80D2A93C */ void actionOrderEventDst();
-    /* 80D2A9E4 */ void actionWarpEventDst();
-    /* 80D2AA30 */ void actionDead();
-    /* 80D2AA34 */ void demoProc();
-    /* 80D2B3BC */ bool checkTalkDistance();
-    /* 80D2B534 */ void calcMidnaWaitPos();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionTalkEvent();
+    void actionWarpEvent();
+    void actionOrderEventDst();
+    void actionWarpEventDst();
+    void actionDead();
+    void demoProc();
+    bool checkTalkDistance();
+    void calcMidnaWaitPos();
 
-    /* 80D29BB4 */ virtual int CreateHeap();
-    /* 80D29ACC */ virtual int Create();
-    /* 80D2A008 */ virtual int Execute(Mtx**);
-    /* 80D2B5C8 */ virtual int Draw();
-    /* 80D2B6C0 */ virtual int Delete();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
 
     u8 getNameArg() { return argument; }
     u8 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_obj_waterGate.h b/include/d/actor/d_a_obj_waterGate.h
index 074b5af7af..db36c07b5e 100644
--- a/include/d/actor/d_a_obj_waterGate.h
+++ b/include/d/actor/d_a_obj_waterGate.h
@@ -17,21 +17,21 @@
 
 class daWtGate_c : public dBgS_MoveBgActor {
 public:
-    /* 80D2BC0C */ void setBaseMtx();
-    /* 80D2BC94 */ int CreateHeap();
-    /* 80D2BD00 */ cPhs__Step create();
-    /* 80D2BE7C */ int Execute(Mtx**);
-    /* 80D2BECC */ void move();
-    /* 80D2BF88 */ void init_modeWait();
-    /* 80D2BF94 */ void modeWait();
-    /* 80D2C010 */ void init_modeOpen();
-    /* 80D2C02C */ void modeOpen();
-    /* 80D2C134 */ void init_modeClose();
-    /* 80D2C150 */ void modeClose();
-    /* 80D2C250 */ void init_modeEnd();
-    /* 80D2C25C */ void modeEnd();
-    /* 80D2C260 */ int Draw();
-    /* 80D2C304 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void move();
+    void init_modeWait();
+    void modeWait();
+    void init_modeOpen();
+    void modeOpen();
+    void init_modeClose();
+    void modeClose();
+    void init_modeEnd();
+    void modeEnd();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ request_of_phase_process_class mPhase;
@@ -55,8 +55,8 @@ private:
 STATIC_ASSERT(sizeof(daWtGate_c) == 0x5bc);
 
 struct daWtGate_HIO_c : public mDoHIO_entry_c {
-    /* 80D2BB8C */ daWtGate_HIO_c();
-    /* 80D2C3C0 */ ~daWtGate_HIO_c() {}
+    daWtGate_HIO_c();
+    ~daWtGate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_waterPillar.h b/include/d/actor/d_a_obj_waterPillar.h
index 52849dbc57..bee3c33300 100644
--- a/include/d/actor/d_a_obj_waterPillar.h
+++ b/include/d/actor/d_a_obj_waterPillar.h
@@ -20,38 +20,38 @@ public:
     daWtPillar_c() : dEvLib_callback_c(this) {}
     ~daWtPillar_c() {}
 
-    /* 80D2C7B0 */ void setBaseMtx();
-    /* 80D2C838 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D2C858 */ int CreateHeap();
-    /* 80D2C960 */ cPhs__Step create();
-    /* 80D2CC0C */ int execute();
-    /* 80D2CE4C */ void actionMain();
-    /* 80D2CF98 */ void effectSet();
-    /* 80D2D278 */ void effectSet2();
-    /* 80D2D3FC */ void actionSwWaitInit();
-    /* 80D2D408 */ void actionSwWait();
-    /* 80D2D488 */ virtual bool eventStart();
-    /* 80D2D4AC */ void actionWaitInit();
-    /* 80D2D588 */ void actionWait();
-    /* 80D2D5C0 */ void actionUpFirstInit();
-    /* 80D2D6C4 */ void actionUpFirst();
-    /* 80D2D73C */ void actionUpFirstWaitInit();
-    /* 80D2D780 */ void actionUpFirstWait();
-    /* 80D2D7B8 */ void actionUpInit();
-    /* 80D2D850 */ void actionUp();
-    /* 80D2D95C */ void actionUpWaitInit();
-    /* 80D2D9A0 */ void actionUpWait();
-    /* 80D2DA58 */ void actionDownInit();
-    /* 80D2DA78 */ void actionDown();
-    /* 80D2DB68 */ void actionRockWaitInit();
-    /* 80D2DB74 */ void actionRockWait();
-    /* 80D2DC20 */ void actionRockOnInit();
-    /* 80D2DC2C */ void actionRockOn();
-    /* 80D2DD0C */ void actionEndInit();
-    /* 80D2DD18 */ void actionEnd();
-    /* 80D2DDB0 */ f32 getPillarHeight();
-    /* 80D2DDB8 */ int draw();
-    /* 80D2DE84 */ int _delete();
+    void setBaseMtx();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int CreateHeap();
+    cPhs__Step create();
+    int execute();
+    void actionMain();
+    void effectSet();
+    void effectSet2();
+    void actionSwWaitInit();
+    void actionSwWait();
+    virtual bool eventStart();
+    void actionWaitInit();
+    void actionWait();
+    void actionUpFirstInit();
+    void actionUpFirst();
+    void actionUpFirstWaitInit();
+    void actionUpFirstWait();
+    void actionUpInit();
+    void actionUp();
+    void actionUpWaitInit();
+    void actionUpWait();
+    void actionDownInit();
+    void actionDown();
+    void actionRockWaitInit();
+    void actionRockWait();
+    void actionRockOnInit();
+    void actionRockOn();
+    void actionEndInit();
+    void actionEnd();
+    f32 getPillarHeight();
+    int draw();
+    int _delete();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcGObjInf const mCcDObjCoInfo;
diff --git a/include/d/actor/d_a_obj_waterfall.h b/include/d/actor/d_a_obj_waterfall.h
index c71651b350..4c20554ced 100644
--- a/include/d/actor/d_a_obj_waterfall.h
+++ b/include/d/actor/d_a_obj_waterfall.h
@@ -14,16 +14,16 @@
  */
 class daObjWaterFall_c : public fopAc_ac_c {
 public:
-    /* 80D2ED14 */ void search_bomb();
-    /* 80D2F034 */ void search_arrow();
-    /* 80D2F324 */ void initBaseMtx();
-    /* 80D2F344 */ void setBaseMtx();
-    /* 80D2F39C */ cPhs__Step Create();
-    /* 80D2F5A0 */ cPhs__Step create();
-    /* 80D2F984 */ int execute();
-    /* 80D2FA6C */ void push_player();
-    /* 80D2FC94 */ int draw();
-    /* 80D2FC9C */ int _delete();
+    void search_bomb();
+    void search_arrow();
+    void initBaseMtx();
+    void setBaseMtx();
+    cPhs__Step Create();
+    cPhs__Step create();
+    int execute();
+    void push_player();
+    int draw();
+    int _delete();
 private:
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ u8 pad[4];
diff --git a/include/d/actor/d_a_obj_wchain.h b/include/d/actor/d_a_obj_wchain.h
index dab60efea5..94df105e88 100644
--- a/include/d/actor/d_a_obj_wchain.h
+++ b/include/d/actor/d_a_obj_wchain.h
@@ -6,8 +6,8 @@
 
 class daObjWchain_shape_c : public J3DPacket {
 public:
-    /* 80D31418 */ void draw();
-    /* 80D318C0 */ ~daObjWchain_shape_c() {}
+    void draw();
+    ~daObjWchain_shape_c() {}
 };
 
 /**
@@ -20,14 +20,14 @@ public:
  */
 class daObjWchain_c : public fopAc_ac_c {
 public:
-    /* 80D2FEF8 */ int createHeap();
-    /* 80D2FFBC */ cPhs__Step create();
-    /* 80D30434 */ ~daObjWchain_c();
-    /* 80D30534 */ void setMatrix();
-    /* 80D305E4 */ s16 getChainAngleZ(cXyz*, int);
-    /* 80D3080C */ void setChainPos();
-    /* 80D310AC */ int execute();
-    /* 80D31810 */ int draw();
+    int createHeap();
+    cPhs__Step create();
+    ~daObjWchain_c();
+    void setMatrix();
+    s16 getChainAngleZ(cXyz*, int);
+    void setChainPos();
+    int execute();
+    int draw();
 
     GXLightObj* getLightObj() { return &tevStr.mLightObj.mLightObj; }
     J3DModelData* getChainModelData() { return mpChainModelData; }
diff --git a/include/d/actor/d_a_obj_wdStick.h b/include/d/actor/d_a_obj_wdStick.h
index 6bc492bb9f..c82b115b84 100644
--- a/include/d/actor/d_a_obj_wdStick.h
+++ b/include/d/actor/d_a_obj_wdStick.h
@@ -25,30 +25,30 @@ public:
         MODE_SINK,
     };
 
-    /* 80D31BD0 */ void setBaseMtx();
-    /* 80D31C58 */ virtual int CreateHeap();
-    /* 80D31CC4 */ int create();
-    /* 80D32168 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D32194 */ void lightInit();
-    /* 80D32198 */ void setLight();
-    /* 80D3219C */ void setFire();
-    /* 80D3269C */ virtual int Execute();
-    /* 80D32DB4 */ void bgCheck();
-    /* 80D33348 */ void setBoundSe();
-    /* 80D333F4 */ void mode_proc_call();
-    /* 80D3350C */ void mode_init_wait();
-    /* 80D3353C */ void mode_proc_wait();
-    /* 80D33588 */ void mode_init_carry();
-    /* 80D335AC */ void mode_proc_carry();
-    /* 80D3386C */ void mode_init_drop();
-    /* 80D33890 */ void mode_proc_drop();
-    /* 80D338DC */ void mode_init_roll();
-    /* 80D338F4 */ void mode_proc_roll();
-    /* 80D33D44 */ BOOL chkWaterLineIn();
-    /* 80D33D68 */ void mode_init_sink();
-    /* 80D33D8C */ void mode_proc_sink();
-    /* 80D33EB0 */ virtual int Draw();
-    /* 80D33F14 */ virtual int Delete();
+    void setBaseMtx();
+    virtual int CreateHeap();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    void lightInit();
+    void setLight();
+    void setFire();
+    virtual int Execute();
+    void bgCheck();
+    void setBoundSe();
+    void mode_proc_call();
+    void mode_init_wait();
+    void mode_proc_wait();
+    void mode_init_carry();
+    void mode_proc_carry();
+    void mode_init_drop();
+    void mode_proc_drop();
+    void mode_init_roll();
+    void mode_proc_roll();
+    BOOL chkWaterLineIn();
+    void mode_init_sink();
+    void mode_proc_sink();
+    virtual int Draw();
+    virtual int Delete();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcSph mCcDSph;
@@ -89,8 +89,8 @@ STATIC_ASSERT(sizeof(daWdStick_c) == 0xaf8);
 
 class daWdStick_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D31B4C */ daWdStick_HIO_c();
-    /* 80D34030 */ virtual ~daWdStick_HIO_c() {}
+    daWdStick_HIO_c();
+    virtual ~daWdStick_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_web0.h b/include/d/actor/d_a_obj_web0.h
index eaff3dccea..03ec237d6f 100644
--- a/include/d/actor/d_a_obj_web0.h
+++ b/include/d/actor/d_a_obj_web0.h
@@ -36,8 +36,8 @@ STATIC_ASSERT(sizeof(obj_web0_class) == 0x73C);
 
 class daObj_Web0_HIO_c {
 public:
-    /* 80D3452C */ daObj_Web0_HIO_c();
-    /* 80D350E4 */ virtual ~daObj_Web0_HIO_c() {}
+    daObj_Web0_HIO_c();
+    virtual ~daObj_Web0_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
 };
diff --git a/include/d/actor/d_a_obj_web1.h b/include/d/actor/d_a_obj_web1.h
index ab2d56ebc0..ad6db4563e 100644
--- a/include/d/actor/d_a_obj_web1.h
+++ b/include/d/actor/d_a_obj_web1.h
@@ -41,8 +41,8 @@ STATIC_ASSERT(sizeof(obj_web1_class) == 0x770);
 
 class daObj_Web1_HIO_c {
 public:
-    /* 80D353AC */ daObj_Web1_HIO_c();
-    /* 80D36028 */ virtual ~daObj_Web1_HIO_c() {}
+    daObj_Web1_HIO_c();
+    virtual ~daObj_Web1_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
 };
diff --git a/include/d/actor/d_a_obj_well_cover.h b/include/d/actor/d_a_obj_well_cover.h
index 1971cc5197..b25ad59abe 100644
--- a/include/d/actor/d_a_obj_well_cover.h
+++ b/include/d/actor/d_a_obj_well_cover.h
@@ -14,18 +14,18 @@
  */
 class daObjWCover_c : public dBgS_MoveBgActor {
 public:
-    /* 80D36298 */ void initBaseMtx();
-    /* 80D362D4 */ void setBaseMtx();
-    /* 80D36348 */ int Create();
-    /* 80D36394 */ int CreateHeap();
-    /* 80D36404 */ int create();
-    /* 80D364E0 */ int Execute(Mtx**);
-    /* 80D3652C */ void action();
-    /* 80D365B8 */ void modeWait();
-    /* 80D36790 */ void init_modeBreak();
-    /* 80D3689C */ void modeBreak();
-    /* 80D368A0 */ int Draw();
-    /* 80D36944 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int Execute(Mtx**);
+    void action();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
+    int Draw();
+    int Delete();
 
     u8 getSwNo() { return fopAcM_GetParam(this); }
 
diff --git a/include/d/actor/d_a_obj_wflag.h b/include/d/actor/d_a_obj_wflag.h
index 491044a3ff..f36e52d1ca 100644
--- a/include/d/actor/d_a_obj_wflag.h
+++ b/include/d/actor/d_a_obj_wflag.h
@@ -4,8 +4,8 @@
 #include "f_op/f_op_actor_mng.h"
 
 struct wf_tail_s {
-    /* 80D37720 */ ~wf_tail_s() {}
-    /* 80D377F0 */ wf_tail_s() {}
+    ~wf_tail_s() {}
+    wf_tail_s() {}
 
     /* 0x000 */ s16 field_0x000;
     /* 0x000 */ u16 field_0x002;
diff --git a/include/d/actor/d_a_obj_wind_stone.h b/include/d/actor/d_a_obj_wind_stone.h
index af24db48bf..e1f3dac603 100644
--- a/include/d/actor/d_a_obj_wind_stone.h
+++ b/include/d/actor/d_a_obj_wind_stone.h
@@ -14,21 +14,21 @@
  */
 class daWindStone_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80D37A18 */ daWindStone_c();
-    /* 80D37A68 */ virtual ~daWindStone_c();
-    /* 80D37AF4 */ int createHeap();
-    /* 80D37C20 */ int create();
-    /* 80D37F0C */ int execute();
-    /* 80D37F6C */ int draw();
-    /* 80D3806C */ int Delete();
-    /* 80D3811C */ void setModelMtx();
-    /* 80D38180 */ void init();
-    /* 80D381EC */ bool chkWlfInRange();
-    /* 80D38278 */ bool chkEveOccur();
-    /* 80D382C4 */ void exeModeHowl();
-    /* 80D3835C */ void exeModeMapDisp();
-    /* 80D383FC */ bool chkMapDispMode();
-    /* 80D384C4 */ u8 getGoldWolfIdx();
+    daWindStone_c();
+    virtual ~daWindStone_c();
+    int createHeap();
+    int create();
+    int execute();
+    int draw();
+    int Delete();
+    void setModelMtx();
+    void init();
+    bool chkWlfInRange();
+    bool chkEveOccur();
+    void exeModeHowl();
+    void exeModeMapDisp();
+    bool chkMapDispMode();
+    u8 getGoldWolfIdx();
 
     s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
     int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
diff --git a/include/d/actor/d_a_obj_window.h b/include/d/actor/d_a_obj_window.h
index 0b80668c03..3738a0f18c 100644
--- a/include/d/actor/d_a_obj_window.h
+++ b/include/d/actor/d_a_obj_window.h
@@ -15,14 +15,14 @@
  */
 class daObjWindow_c : public dBgS_MoveBgActor {
 public:
-    /* 80D38758 */ void initBaseMtx();
-    /* 80D387B8 */ void setBaseMtx();
-    /* 80D38840 */ int Create();
-    /* 80D388F0 */ int CreateHeap();
-    /* 80D38A68 */ cPhs__Step create1st();
-    /* 80D38B04 */ int Execute(Mtx**);
-    /* 80D38F28 */ int Draw();
-    /* 80D39000 */ int Delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u8 getType() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getLightInf() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_wood_pendulum.h b/include/d/actor/d_a_obj_wood_pendulum.h
index 07c357cdd1..1a1ee024b3 100644
--- a/include/d/actor/d_a_obj_wood_pendulum.h
+++ b/include/d/actor/d_a_obj_wood_pendulum.h
@@ -14,14 +14,14 @@
  */
 class daObjWPndlm_c : public fopAc_ac_c {
 public:
-    /* 80D39418 */ void initBaseMtx();
-    /* 80D39454 */ void setBaseMtx();
-    /* 80D394CC */ int Create();
-    /* 80D395C8 */ int CreateHeap();
-    /* 80D39638 */ int create();
-    /* 80D39978 */ int execute();
-    /* 80D39B68 */ int draw();
-    /* 80D39BCC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u32 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
     u32 getArg1() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_obj_wood_statue.h b/include/d/actor/d_a_obj_wood_statue.h
index 331da72a1d..c0214679db 100644
--- a/include/d/actor/d_a_obj_wood_statue.h
+++ b/include/d/actor/d_a_obj_wood_statue.h
@@ -25,28 +25,28 @@ public:
         STATUS_BOOMERANG_CARRY,
     };
 
-    /* 80D3A268 */ void initBaseMtx();
-    /* 80D3A2A4 */ void setBaseMtx();
-    /* 80D3A2F0 */ int Create();
-    /* 80D3A474 */ int __CreateHeap();
-    /* 80D3A47C */ int create();
-    /* 80D3A8E8 */ void bg_check();
-    /* 80D3AA3C */ int actionWaitInit();
-    /* 80D3AA80 */ int actionWait();
-    /* 80D3AB9C */ int initActionOrderGetDemo();
-    /* 80D3AC64 */ int actionOrderGetDemo();
-    /* 80D3ACAC */ int actionGetDemo();
-    /* 80D3AD30 */ int actionInitSwOnWait();
-    /* 80D3AD88 */ int actionSwOnWait();
-    /* 80D3AE7C */ int actionInitBoomerangCarry();
-    /* 80D3AF5C */ int actionBoomerangCarry();
-    /* 80D3AFC0 */ void demoProc();
-    /* 80D3B164 */ void effectSet();
-    /* 80D3B250 */ void effectStop();
-    /* 80D3B2A0 */ int execute();
-    /* 80D3B428 */ int draw();
-    /* 80D3B47C */ void setListStart();
-    /* 80D3B480 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int __CreateHeap();
+    int create();
+    void bg_check();
+    int actionWaitInit();
+    int actionWait();
+    int initActionOrderGetDemo();
+    int actionOrderGetDemo();
+    int actionGetDemo();
+    int actionInitSwOnWait();
+    int actionSwOnWait();
+    int actionInitBoomerangCarry();
+    int actionBoomerangCarry();
+    void demoProc();
+    void effectSet();
+    void effectStop();
+    int execute();
+    int draw();
+    void setListStart();
+    int _delete();
 
     bool chkStatus(u8 status) { return mStatus == status; }
     void setStatus(u8 status) { mStatus = status; }
diff --git a/include/d/actor/d_a_obj_wsword.h b/include/d/actor/d_a_obj_wsword.h
index 1c6eb1f10e..aa611af336 100644
--- a/include/d/actor/d_a_obj_wsword.h
+++ b/include/d/actor/d_a_obj_wsword.h
@@ -16,14 +16,14 @@
  */
 class daObjWSword_c : public fopAc_ac_c {
 public:
-    /* 80D3B998 */ void initBaseMtx();
-    /* 80D3B9D4 */ void setBaseMtx();
-    /* 80D3BA40 */ int Create();
-    /* 80D3BAB8 */ int CreateHeap();
-    /* 80D3BB28 */ int create();
-    /* 80D3BDA0 */ int execute();
-    /* 80D3BDF0 */ int draw();
-    /* 80D3BE54 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_obj_yel_bag.h b/include/d/actor/d_a_obj_yel_bag.h
index 795280debb..f74ed46da8 100644
--- a/include/d/actor/d_a_obj_yel_bag.h
+++ b/include/d/actor/d_a_obj_yel_bag.h
@@ -51,25 +51,25 @@ private:
     /* 0xA33 */ u8 field_0xa33;
     /* 0xA34 */ u8 field_0xa34;
 public:
-    /* 80D3C0EC */ daObj_YBag_c();
-    /* 80D3C408 */ virtual ~daObj_YBag_c();
-    /* 80D3C610 */ int create();
-    /* 80D3C898 */ int CreateHeap();
-    /* 80D3C93C */ int Delete();
-    /* 80D3C970 */ int Execute();
-    /* 80D3D32C */ int Draw();
-    /* 80D3D438 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D3D458 */ int getTypeFromParam();
-    /* 80D3D460 */ int isDelete();
-    /* 80D3D468 */ void setEnvTevColor();
-    /* 80D3D4C4 */ void setRoomNo();
-    /* 80D3D508 */ void reset();
-    /* 80D3D5C8 */ void setMtx();
-    /* 80D3D69C */ s16 calcRollAngle(s16, int);
-    /* 80D3D73C */ int getWallAngle(s16, s16*);
-    /* 80D3D8CC */ void setSmokePrtcl();
-    /* 80D3D948 */ void setWaterPrtcl();
-    /* 80D3DA70 */ void setHamonPrtcl();
+    daObj_YBag_c();
+    virtual ~daObj_YBag_c();
+    int create();
+    int CreateHeap();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int getTypeFromParam();
+    int isDelete();
+    void setEnvTevColor();
+    void setRoomNo();
+    void reset();
+    void setMtx();
+    s16 calcRollAngle(s16, int);
+    int getWallAngle(s16, s16*);
+    void setSmokePrtcl();
+    void setWaterPrtcl();
+    void setHamonPrtcl();
 
     static dCcD_SrcGObjInf const mCcDObjInfo;
     static dCcD_SrcCyl mCcDCyl;
@@ -79,7 +79,7 @@ STATIC_ASSERT(sizeof(daObj_YBag_c) == 0xa3c);
 
 class daObj_YBag_Param_c {
 public:
-    /* 80D3DC20 */ virtual ~daObj_YBag_Param_c() {}
+    virtual ~daObj_YBag_Param_c() {}
 
     static f32 const m[11];
 };
diff --git a/include/d/actor/d_a_obj_yobikusa.h b/include/d/actor/d_a_obj_yobikusa.h
index fa17a5c7bc..5cea7a9029 100644
--- a/include/d/actor/d_a_obj_yobikusa.h
+++ b/include/d/actor/d_a_obj_yobikusa.h
@@ -52,24 +52,24 @@ public:
         /* 0x3E */ s16 mPickLeafTickSpeed;
     } attributes;
 
-    /* 8059C9F8 */ void setAction(daObjYobikusa_c::Mode_e);
-    /* 8059CA2C */ void callInit();
-    /* 8059CA54 */ void callExecute();
-    /* 8059CA80 */ void initSwingWind();
-    /* 8059CA8C */ void executeSwingWind();
-    /* 8059CC54 */ void initPushDown();
-    /* 8059CC60 */ void executePushDown();
-    /* 8059CD44 */ void initPickLeaf();
-    /* 8059CD80 */ void executePickLeaf();
-    /* 8059CE7C */ void create_init();
-    /* 8059D120 */ void initBaseMtx();
-    /* 8059D198 */ void getJointAngle(csXyz*, int);
-    /* 8059D1BC */ f32 getJointScale(int);
-    /* 8059D320 */ void initCcCylinder();
-    /* 8059D380 */ void setCcCylinder();
-    /* 8059D3B4 */ bool toPickLeaf();
-    /* 8059D454 */ bool setNewLeaf();
-    /* 8059D738 */ int execute();
+    void setAction(daObjYobikusa_c::Mode_e);
+    void callInit();
+    void callExecute();
+    void initSwingWind();
+    void executeSwingWind();
+    void initPushDown();
+    void executePushDown();
+    void initPickLeaf();
+    void executePickLeaf();
+    void create_init();
+    void initBaseMtx();
+    void getJointAngle(csXyz*, int);
+    f32 getJointScale(int);
+    void initCcCylinder();
+    void setCcCylinder();
+    bool toPickLeaf();
+    bool setNewLeaf();
+    int execute();
 
     inline int createHeap();
     inline int draw();
diff --git a/include/d/actor/d_a_obj_yousei.h b/include/d/actor/d_a_obj_yousei.h
index edec4b6a87..faaadd420a 100644
--- a/include/d/actor/d_a_obj_yousei.h
+++ b/include/d/actor/d_a_obj_yousei.h
@@ -14,25 +14,25 @@
  */
 class daObjYOUSEI_c : public fopEn_enemy_c {
 public:
-    /* 804CE738 */ void InitCcSph();
-    /* 804CE7A4 */ void SetCcSph();
-    /* 804CE920 */ void SpeedSet();
-    /* 804CE9D0 */ void MoveAction();
-    /* 804CEE50 */ void BinAction();
-    /* 804CF098 */ void LinkChk();
-    /* 804CF6C4 */ void WaitAction();
-    /* 804CFCE8 */ void LinkAction();
-    /* 804D057C */ bool LinkSearch();
-    /* 804D065C */ bool WayBgCheck(f32, f32, s16);
-    /* 804D0780 */ void CareAction();
-    /* 804D080C */ void CheckGround();
-    /* 804D0988 */ bool CheckWater();
-    /* 804D0AD0 */ void Action();
-    /* 804D0CCC */ void ObjHit();
-    /* 804D0DF0 */ int Execute();
-    /* 804D0F98 */ int Delete();
-    /* 804D0FCC */ void setBaseMtx();
-    /* 804D111C */ int create();
+    void InitCcSph();
+    void SetCcSph();
+    void SpeedSet();
+    void MoveAction();
+    void BinAction();
+    void LinkChk();
+    void WaitAction();
+    void LinkAction();
+    bool LinkSearch();
+    bool WayBgCheck(f32, f32, s16);
+    void CareAction();
+    void CheckGround();
+    bool CheckWater();
+    void Action();
+    void ObjHit();
+    int Execute();
+    int Delete();
+    void setBaseMtx();
+    int create();
 
     inline int CreateHeap();
     inline int Draw();
diff --git a/include/d/actor/d_a_obj_zcloth.h b/include/d/actor/d_a_obj_zcloth.h
index 600eaf6793..a37c34d8ac 100644
--- a/include/d/actor/d_a_obj_zcloth.h
+++ b/include/d/actor/d_a_obj_zcloth.h
@@ -13,13 +13,13 @@
  */
 class daObjZCloth_c : public daItemBase_c {
 public:
-    /* 80D3EE18 */ void initBaseMtx();
-    /* 80D3EE54 */ void setBaseMtx();
-    /* 80D3EEC0 */ int Create();
-    /* 80D3EF0C */ int create();
-    /* 80D3F1AC */ int execute();
-    /* 80D3F1D0 */ int draw();
-    /* 80D3F200 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 };
 
 STATIC_ASSERT(sizeof(daObjZCloth_c) == 0x92C);
diff --git a/include/d/actor/d_a_obj_zdoor.h b/include/d/actor/d_a_obj_zdoor.h
index 1b7c634771..b9a09a83e2 100644
--- a/include/d/actor/d_a_obj_zdoor.h
+++ b/include/d/actor/d_a_obj_zdoor.h
@@ -16,15 +16,15 @@
  */
 class daZdoor_c : public dBgS_MoveBgActor {
 public:
-    /* 80D3F65C */ void init_cyl();
-    /* 80D3F740 */ void set_cyl();
-    /* 80D3F884 */ void setBaseMtx();
-    /* 80D3F8F8 */ int Create();
-    /* 80D3F970 */ int CreateHeap();
-    /* 80D3F9F0 */ int create1st();
-    /* 80D3FACC */ int Execute(Mtx**);
-    /* 80D3FCE8 */ int Draw();
-    /* 80D3FD8C */ int Delete();
+    void init_cyl();
+    void set_cyl();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     u32 getType() { return fopAcM_GetParamBit(this, 0, 4); }
 
diff --git a/include/d/actor/d_a_obj_zrTurara.h b/include/d/actor/d_a_obj_zrTurara.h
index 765fe22331..60861d8b01 100644
--- a/include/d/actor/d_a_obj_zrTurara.h
+++ b/include/d/actor/d_a_obj_zrTurara.h
@@ -16,18 +16,18 @@
  */
 class daZrTurara_c : public dBgS_MoveBgActor {
 public:
-    /* 80D405E4 */ void setBaseMtx();
-    /* 80D40714 */ int CreateHeap();
-    /* 80D40844 */ cPhs__Step create();
-    /* 80D40C08 */ int Execute(Mtx**);
-    /* 80D40C68 */ void move();
-    /* 80D40D88 */ void modeWait();
-    /* 80D40E0C */ void init_modeBreak();
-    /* 80D410E0 */ void modeBreak();
-    /* 80D412A0 */ void init_modeEnd();
-    /* 80D412AC */ void modeEnd();
-    /* 80D412B0 */ int Draw();
-    /* 80D41380 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    void move();
+    void modeWait();
+    void init_modeBreak();
+    void modeBreak();
+    void init_modeEnd();
+    void modeEnd();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x5A0 */ dCcD_Stts mCcStatus;
@@ -58,8 +58,8 @@ STATIC_ASSERT(sizeof(daZrTurara_c) == 0x76C);
 
 class daZrTurara_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D4056C */ daZrTurara_HIO_c();
-    /* 80D414BC */ ~daZrTurara_HIO_c() {}
+    daZrTurara_HIO_c();
+    ~daZrTurara_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_zrTuraraRock.h b/include/d/actor/d_a_obj_zrTuraraRock.h
index 211ba3581e..b116019677 100644
--- a/include/d/actor/d_a_obj_zrTuraraRock.h
+++ b/include/d/actor/d_a_obj_zrTuraraRock.h
@@ -16,19 +16,19 @@
  */
 class daZrTuraRc_c : public fopAc_ac_c {
 public:
-    /* 80D41934 */ void setBaseMtx();
-    /* 80D419D4 */ int CreateHeap();
-    /* 80D41A40 */ cPhs__Step create();
-    /* 80D41EF0 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D41F10 */ int Execute();
-    /* 80D41F78 */ void move();
-    /* 80D4204C */ void init_modeDrop();
-    /* 80D42084 */ void modeDrop();
-    /* 80D420FC */ void bgCheck();
-    /* 80D42128 */ void init_modeDropEnd();
-    /* 80D4215C */ void modeDropEnd();
-    /* 80D42160 */ int Draw();
-    /* 80D421C4 */ int Delete();
+    void setBaseMtx();
+    int CreateHeap();
+    cPhs__Step create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int Execute();
+    void move();
+    void init_modeDrop();
+    void modeDrop();
+    void bgCheck();
+    void init_modeDropEnd();
+    void modeDropEnd();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x568 */ dCcD_Stts mCcStatus;
@@ -53,8 +53,8 @@ STATIC_ASSERT(sizeof(daZrTuraRc_c) == 0x938);
 
 class daZrTuraRc_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D4188C */ daZrTuraRc_HIO_c();
-    /* 80D422D0 */ ~daZrTuraRc_HIO_c() {}
+    daZrTuraRc_HIO_c();
+    ~daZrTuraRc_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_zraMark.h b/include/d/actor/d_a_obj_zraMark.h
index 23262b0949..7499078cfa 100644
--- a/include/d/actor/d_a_obj_zraMark.h
+++ b/include/d/actor/d_a_obj_zraMark.h
@@ -18,12 +18,12 @@ public:
         setColor(0);
     }
 
-    /* 80D4347C */ int create(cXyz const&, s8, s8, s8, s8);
-    /* 80D434F8 */ BOOL loadModel();
-    /* 80D4357C */ void init(cXyz const&, s8, s8, s8);
-    /* 80D43808 */ void calcSpeed();
-    /* 80D43864 */ void setMtx();
-    /* 80D438C8 */ void draw();
+    int create(cXyz const&, s8, s8, s8, s8);
+    BOOL loadModel();
+    void init(cXyz const&, s8, s8, s8);
+    void calcSpeed();
+    void setMtx();
+    void draw();
 
     inline void setColor(const s8& i_color) { mColor = i_color; }
     s8 getColor() { return mColor; }
@@ -62,9 +62,9 @@ class _ZraMark_Hahen_Mng_c {
 public:
     _ZraMark_Hahen_Mng_c() : field_0x2(0) {}
 
-    /* 80D43968 */ int create(cXyz const&, s8, s8, s8, s8);
-    /* 80D439F8 */ void calc();
-    /* 80D43A74 */ void draw();
+    int create(cXyz const&, s8, s8, s8, s8);
+    void calc();
+    void draw();
 
     s16 getTimer() { return mTimer; }
     void setTimer(s16 i_timer) { mTimer = i_timer; }
@@ -97,18 +97,18 @@ public:
         TYPE_RED,
     };
 
-    /* 80D42678 */ int Create();
-    /* 80D4287C */ int CreateHeap();
-    /* 80D42A7C */ int Execute();
-    /* 80D42B0C */ int Draw();
-    /* 80D42C98 */ int Delete();
-    /* 80D42CE0 */ int getType();
-    /* 80D42D2C */ void setBaseMtx();
-    /* 80D42EE0 */ void col_init();
-    /* 80D42F5C */ void col_set();
-    /* 80D432C8 */ daNpc_Hoz_c* schHoz();
-    /* 80D43314 */ bool entryPointer(fopAc_ac_c*);
-    /* 80D43370 */ void informBlast();
+    int Create();
+    int CreateHeap();
+    int Execute();
+    int Draw();
+    int Delete();
+    int getType();
+    void setBaseMtx();
+    void col_init();
+    void col_set();
+    daNpc_Hoz_c* schHoz();
+    bool entryPointer(fopAc_ac_c*);
+    void informBlast();
 
     u8 getMarkNo() { return fopAcM_GetParam(this) & 0xff; }
     void initBlastFlag() { mBlastFlag = false; }
diff --git a/include/d/actor/d_a_obj_zra_freeze.h b/include/d/actor/d_a_obj_zra_freeze.h
index 42430e2c1e..d31af415cd 100644
--- a/include/d/actor/d_a_obj_zra_freeze.h
+++ b/include/d/actor/d_a_obj_zra_freeze.h
@@ -14,14 +14,14 @@
  */
 class daZraFreeze_c : public fopAc_ac_c {
 public:
-    /* 80D440B8 */ void setBaseMtx();
-    /* 80D44124 */ BOOL chkActorInScreen();
-    /* 80D442BC */ cPhs__Step Create();
-    /* 80D4443C */ int CreateHeap();
-    /* 80D444C0 */ void setHitodamaPrtcl();
-    /* 80D44698 */ int Execute();
-    /* 80D449E0 */ int Draw();
-    /* 80D44A84 */ int Delete();
+    void setBaseMtx();
+    BOOL chkActorInScreen();
+    cPhs__Step Create();
+    int CreateHeap();
+    void setHitodamaPrtcl();
+    int Execute();
+    int Draw();
+    int Delete();
 
     /* 0x568 */ request_of_phase_process_class mPhaseReq;
     /* 0x570 */ J3DModel* mpModel;
diff --git a/include/d/actor/d_a_obj_zra_rock.h b/include/d/actor/d_a_obj_zra_rock.h
index 4a8d8c56a4..ab566a9f3a 100644
--- a/include/d/actor/d_a_obj_zra_rock.h
+++ b/include/d/actor/d_a_obj_zra_rock.h
@@ -15,16 +15,16 @@
  */
 class daObjZraRock_c : public dBgS_MoveBgActor {
 public:
-    /* 80D44CB8 */ void setAttnPos();
-    /* 80D44D3C */ void setBaseMtx();
-    /* 80D44DCC */ void setEnvTevColor();
-    /* 80D44E28 */ void setRoomNo();
-    /* 80D44E68 */ int Create();
-    /* 80D44FB0 */ int CreateHeap();
-    /* 80D450E0 */ cPhs__Step create();
-    /* 80D4531C */ int Execute(Mtx**);
-    /* 80D45374 */ int Draw();
-    /* 80D454AC */ int Delete();
+    void setAttnPos();
+    void setBaseMtx();
+    void setEnvTevColor();
+    void setRoomNo();
+    int Create();
+    int CreateHeap();
+    cPhs__Step create();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
 
     void setDemoStart() { mDemoStart = 1; }
 
diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h
index 778530d336..f0ee36903f 100644
--- a/include/d/actor/d_a_passer_mng.h
+++ b/include/d/actor/d_a_passer_mng.h
@@ -17,11 +17,11 @@ class dPath;
  */
 class daPasserMng_c : public fopAc_ac_c {
 public:
-    /* 80D45738 */ int execute();
-    /* 80D4597C */ int getPasserParam();
-    /* 80D45E14 */ int getLuggageParamHigh(u32);
-    /* 80D46768 */ int create();
-    /* 80D467C0 */ void create_init();
+    int execute();
+    int getPasserParam();
+    int getLuggageParamHigh(u32);
+    int create();
+    void create_init();
     ~daPasserMng_c() { delete [] childProcIds; }
 
     u8 getDetailLevel() { return argument; }
diff --git a/include/d/actor/d_a_peru.h b/include/d/actor/d_a_peru.h
index 14bdb0b2d3..f485dc68a7 100644
--- a/include/d/actor/d_a_peru.h
+++ b/include/d/actor/d_a_peru.h
@@ -19,48 +19,48 @@ public:
     typedef int (daPeru_c::*cutAppearFunc)(int);
     typedef int (daPeru_c::*actionFunc)(int);
 
-    /* 80D46EEC */ virtual ~daPeru_c();
-    /* 80D46FCC */ int create();
-    /* 80D4720C */ int CreateHeap();
-    /* 80D4765C */ int typeInitialize();
-    /* 80D47750 */ int Delete();
-    /* 80D47784 */ int Execute();
-    /* 80D477A4 */ int Draw();
-    /* 80D47840 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D47860 */ static int ctrlJointCallBack(J3DJoint*, int);
-    /* 80D478B8 */ int isDelete();
-    /* 80D478EC */ void reset();
-    /* 80D47B20 */ void setParam();
-    /* 80D47C4C */ void setAfterTalkMotion();
-    /* 80D47CAC */ void srchActors();
-    /* 80D47D5C */ int evtTalk();
-    /* 80D47E48 */ int evtCutProc();
-    /* 80D47F10 */ void action();
-    /* 80D47F5C */ void setAttnPos();
-    /* 80D481A4 */ void setCollision();
-    /* 80D4835C */ BOOL drawDbgInfo();
-    /* 80D48364 */ int setAction(actionFunc, int);
-    /* 80D48414 */ int wait(int);
-    /* 80D486A0 */ BOOL is_AppearDemo_start();
-    /* 80D48720 */ void _AppearDemoTag_delete();
-    /* 80D48750 */ int talk(int);
-    /* 80D48A7C */ int jump_st(int);
-    /* 80D48C58 */ int jump_ed(int);
-    /* 80D48E34 */ int sniff(int);
-    /* 80D48FA8 */ int demo_appear(int);
-    /* 80D4910C */ int demo_walk_to_link(int);
-    /* 80D492A8 */ int demo_walk_circle(int);
-    /* 80D49418 */ int demo_walk_to_window(int);
-    /* 80D4971C */ int demo_walk_to_pathway(int);
-    /* 80D499AC */ int cutAppear(int);
-    /* 80D49A40 */ int _cutAppear_Init(int const&);
-    /* 80D4A334 */ int _cutAppear_Main(int const&);
-    /* 80D4A840 */ void _catdoor_open();
-    /* 80D4A920 */ void _catdoor_open_demoskip();
-    /* 80D4A984 */ int cutAppear_skip(int);
-    /* 80D4AA18 */ int _cutAppear_skip_Init(int const&);
-    /* 80D4AAF0 */ int _cutAppear_skip_Main(int const&);
-    /* 80D4BE2C */ daPeru_c(daNpcT_faceMotionAnmData_c const* param_1,
+    virtual ~daPeru_c();
+    int create();
+    int CreateHeap();
+    int typeInitialize();
+    int Delete();
+    int Execute();
+    int Draw();
+    static int createHeapCallBack(fopAc_ac_c*);
+    static int ctrlJointCallBack(J3DJoint*, int);
+    int isDelete();
+    void reset();
+    void setParam();
+    void setAfterTalkMotion();
+    void srchActors();
+    int evtTalk();
+    int evtCutProc();
+    void action();
+    void setAttnPos();
+    void setCollision();
+    BOOL drawDbgInfo();
+    int setAction(actionFunc, int);
+    int wait(int);
+    BOOL is_AppearDemo_start();
+    void _AppearDemoTag_delete();
+    int talk(int);
+    int jump_st(int);
+    int jump_ed(int);
+    int sniff(int);
+    int demo_appear(int);
+    int demo_walk_to_link(int);
+    int demo_walk_circle(int);
+    int demo_walk_to_window(int);
+    int demo_walk_to_pathway(int);
+    int cutAppear(int);
+    int _cutAppear_Init(int const&);
+    int _cutAppear_Main(int const&);
+    void _catdoor_open();
+    void _catdoor_open_demoskip();
+    int cutAppear_skip(int);
+    int _cutAppear_skip_Init(int const&);
+    int _cutAppear_skip_Main(int const&);
+    daPeru_c(daNpcT_faceMotionAnmData_c const* param_1,
                             daNpcT_motionAnmData_c const* param_2,
                             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
                             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
@@ -68,13 +68,13 @@ public:
         : daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {
             OS_REPORT("|%06d:%x|daPeru_c -> コンストラクト\n", g_Counter.mCounter0, this);
         }
-    /* 80D4BEC4 */ u16 getEyeballMaterialNo() { return 1; }
-    /* 80D4BECC */ s32 getHeadJointNo() { return 4; }
-    /* 80D4BED4 */ s32 getNeckJointNo() { return 3; }
-    /* 80D4BEDC */ s32 getBackboneJointNo() { return 1; }
-    /* 80D4BEE4 */ int checkChangeJoint(int param_1) { return param_1 == 4; }
-    /* 80D4BEE4 */ int checkRemoveJoint(int param_1) { return param_1 == 5; }
-    /* 80D4BF04 */ void beforeMove() {
+    u16 getEyeballMaterialNo() { return 1; }
+    s32 getHeadJointNo() { return 4; }
+    s32 getNeckJointNo() { return 3; }
+    s32 getBackboneJointNo() { return 1; }
+    int checkChangeJoint(int param_1) { return param_1 == 4; }
+    int checkRemoveJoint(int param_1) { return param_1 == 5; }
+    void beforeMove() {
         if (checkHide() || mNoDraw) {
             attention_info.flags = 0;
         }
@@ -146,7 +146,7 @@ struct PeruParams {
 
 class daPeru_Param_c {
 public:
-    /* 80D4BF7C */ virtual ~daPeru_Param_c() {}
+    virtual ~daPeru_Param_c() {}
 
     static PeruParams const m;
 };
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index fdbc282261..40149cc052 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -10,11 +10,11 @@ struct ResTIMG;
 class daPy_sightPacket_c : public dDlst_base_c {
 public:
     daPy_sightPacket_c() {}
-    /* 8015F1A0 */ virtual void draw();
-    /* 80140CDC */ virtual ~daPy_sightPacket_c() {}
+    virtual void draw();
+    virtual ~daPy_sightPacket_c() {}
 
-    /* 8015F2FC */ void setSight();
-    /* 8015F384 */ void setSightImage(ResTIMG*);
+    void setSight();
+    void setSightImage(ResTIMG*);
 
     bool getDrawFlg() { return mDrawFlag; }
     void onDrawFlg() { mDrawFlag = true; }
@@ -32,10 +32,10 @@ public:
 
 class daPy_boomerangMove_c {
 public:
-    /* 8015E5B0 */ void initOffset(cXyz const*);
+    void initOffset(cXyz const*);
     void initOffset(cXyz const* xyz, dCcD_GObjInf const*) { initOffset(xyz); }
-    /* 8015E654 */ int posMove(cXyz*, s16*, fopAc_ac_c*, s16);
-    /* 8015E87C */ void bgCheckAfterOffset(cXyz const*);
+    int posMove(cXyz*, s16*, fopAc_ac_c*, s16);
+    void bgCheckAfterOffset(cXyz const*);
 
     static void initDropAngleY() { m_dropAngleY = 0x4000; }
     static void offEventKeepFlg() { m_eventKeepFlg = 0; }
@@ -116,8 +116,8 @@ private:
 
 class daPy_frameCtrl_c : public J3DFrameCtrl {
 public:
-    /* 80140D24 */ virtual ~daPy_frameCtrl_c() {}
-    /* 80140D80 */ daPy_frameCtrl_c() {}
+    virtual ~daPy_frameCtrl_c() {}
+    daPy_frameCtrl_c() {}
     bool checkAnmEnd();
     void updateFrame();
     void setFrameCtrl(u8, short, short, f32, f32);
diff --git a/include/d/actor/d_a_ppolamp.h b/include/d/actor/d_a_ppolamp.h
index 7897532df1..410f03ce26 100644
--- a/include/d/actor/d_a_ppolamp.h
+++ b/include/d/actor/d_a_ppolamp.h
@@ -14,16 +14,16 @@
  */
 class daPPolamp_c : public fopAc_ac_c, public request_of_phase_process_class {
 public:
-    /* 80D4C958 */ virtual ~daPPolamp_c();
-    /* 80D4C9FC */ int create();
-    /* 80D4CB24 */ int execute();
-    /* 80D4CB84 */ int draw();
-    /* 80D4CCF0 */ int Delete();
-    /* 80D4CD24 */ void setModelMtx();
-    /* 80D4CDA8 */ void setPclModelMtx();
-    /* 80D4CE9C */ int createHeap();
-    /* 80D4CFB0 */ void moveSwing();
-    /* 80D4D10C */ void initParam();
+    virtual ~daPPolamp_c();
+    int create();
+    int execute();
+    int draw();
+    int Delete();
+    void setModelMtx();
+    void setPclModelMtx();
+    int createHeap();
+    void moveSwing();
+    void initParam();
 
 private:
     /* 0x574 */ J3DModel* mModel1;
diff --git a/include/d/actor/d_a_scene_exit.h b/include/d/actor/d_a_scene_exit.h
index b9698cf136..23b7de6fab 100644
--- a/include/d/actor/d_a_scene_exit.h
+++ b/include/d/actor/d_a_scene_exit.h
@@ -14,8 +14,8 @@
 class daScex_c : public fopAc_ac_c {
 public:
     daScex_c() {}
-    /* 80485838 */ int checkWork();
-    /* 80485A50 */ int execute();
+    int checkWork();
+    int execute();
     inline int create();
 
     u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
diff --git a/include/d/actor/d_a_scene_exit2.h b/include/d/actor/d_a_scene_exit2.h
index 463648034a..f372eaccf0 100644
--- a/include/d/actor/d_a_scene_exit2.h
+++ b/include/d/actor/d_a_scene_exit2.h
@@ -26,20 +26,20 @@ public:
         ACTION_DEAD_e,
     };
 
-    /* 8059E158 */ void initBaseMtx();
-    /* 8059E178 */ void setBaseMtx();
-    /* 8059E1B0 */ int Create();
-    /* 8059E230 */ int create();
-    /* 8059E2C0 */ int execute();
-    /* 8059E2E4 */ void event_proc_call();
-    /* 8059E3A0 */ void actionWait();
-    /* 8059E408 */ void actionOrderEvent();
-    /* 8059E488 */ void actionEvent();
-    /* 8059E504 */ void actionDead();
-    /* 8059E508 */ int demoProc();
-    /* 8059E6CC */ BOOL checkArea();
-    /* 8059E714 */ int draw();
-    /* 8059E71C */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    BOOL checkArea();
+    int draw();
+    int _delete();
 
     int getSceneID() { return fopAcM_GetParamBit(this, 0, 8); }
     void setAction(u8 i_action) { mAction = i_action; }
diff --git a/include/d/actor/d_a_set_bgobj.h b/include/d/actor/d_a_set_bgobj.h
index f45caebe7e..194befd44e 100644
--- a/include/d/actor/d_a_set_bgobj.h
+++ b/include/d/actor/d_a_set_bgobj.h
@@ -13,10 +13,10 @@
  */
 class daSetBgObj_c : public fopAc_ac_c {
 public:
-    /* 80031870 */ static const char* getArcName(fopAc_ac_c*);
-    /* 80485D78 */ int CreateInit();
-    /* 80485DFC */ int create();
-    /* 80485E88 */ int Delete();
+    static const char* getArcName(fopAc_ac_c*);
+    int CreateInit();
+    int create();
+    int Delete();
 
     /* 0x568 */ request_of_phase_process_class mPhase;
     /* 0x570 */ char mArcName[16];
diff --git a/include/d/actor/d_a_skip_2D.h b/include/d/actor/d_a_skip_2D.h
index ea5dd1bccb..8dd87eca48 100644
--- a/include/d/actor/d_a_skip_2D.h
+++ b/include/d/actor/d_a_skip_2D.h
@@ -19,14 +19,14 @@ public:
         initiate();
     }
 
-    /* 80D4D498 */ int createHeap();
-    /* 80D4D4F4 */ int create();
-    /* 80D4D588 */ int destroy();
-    /* 80D4D590 */ int draw();
-    /* 80D4D5D0 */ int execute();
-    /* 80D4D5D8 */ void initiate();
+    int createHeap();
+    int create();
+    int destroy();
+    int draw();
+    int execute();
+    void initiate();
 
-    /* 80D4D674 */ virtual ~daSkip2D_c() {}
+    virtual ~daSkip2D_c() {}
 
     /* 0x56C */ u32 field_0x56c;
     /* 0x570 */ dMeterButton_c* mpButton;
diff --git a/include/d/actor/d_a_spinner.h b/include/d/actor/d_a_spinner.h
index 9cc8ba531e..0d4d82fedc 100644
--- a/include/d/actor/d_a_spinner.h
+++ b/include/d/actor/d_a_spinner.h
@@ -24,24 +24,24 @@ public:
         TAG_END,
     };
 
-    /* 804D198C */ int createHeap();
-    /* 804D1A70 */ int create();
-    /* 804D1FD0 */ ~daSpinner_c();
-    /* 804D21E0 */ void setRoomInfo();
-    /* 804D2278 */ void setMatrix();
-    /* 804D2320 */ void setEffect();
-    /* 804D25F4 */ int posMove();
-    /* 804D3090 */ void setReflectAngle();
-    /* 804D3174 */ void setWallHit(s16, u32);
-    /* 804D34B0 */ void setAnm();
-    /* 804D3618 */ int setNextPathNum();
-    /* 804D3694 */ Vec* getPathNextPos();
-    /* 804D36F4 */ int checkLineWallHit(cXyz*, cXyz*);
-    /* 804D3774 */ int checkPathMove();
-    /* 804D3D60 */ void setSpreadEffect();
-    /* 804D3F14 */ void clearSpreadEffect();
-    /* 804D3F8C */ int execute();
-    /* 804D4BB4 */ int draw();
+    int createHeap();
+    int create();
+    ~daSpinner_c();
+    void setRoomInfo();
+    void setMatrix();
+    void setEffect();
+    int posMove();
+    void setReflectAngle();
+    void setWallHit(s16, u32);
+    void setAnm();
+    int setNextPathNum();
+    Vec* getPathNextPos();
+    int checkLineWallHit(cXyz*, cXyz*);
+    int checkPathMove();
+    void setSpreadEffect();
+    void clearSpreadEffect();
+    int execute();
+    int draw();
 
     void onPathForceRemove() { mPathForceRemove = true; }
 
diff --git a/include/d/actor/d_a_sq.h b/include/d/actor/d_a_sq.h
index e5edb20fb9..0f8234d545 100644
--- a/include/d/actor/d_a_sq.h
+++ b/include/d/actor/d_a_sq.h
@@ -71,8 +71,8 @@ STATIC_ASSERT(sizeof(sq_class) == 0xB5C);
 
 class daSq_HIO_c {
 public:
-    /* 8059F66C */ daSq_HIO_c();
-    /* 805A10B0 */ virtual ~daSq_HIO_c() {}
+    daSq_HIO_c();
+    virtual ~daSq_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mScale;
diff --git a/include/d/actor/d_a_startAndGoal.h b/include/d/actor/d_a_startAndGoal.h
index 8c0b895acb..939e942db2 100644
--- a/include/d/actor/d_a_startAndGoal.h
+++ b/include/d/actor/d_a_startAndGoal.h
@@ -5,23 +5,23 @@
 
 class daStartAndGoal_Path_c : public daNpcF_Path_c {
 public:
-    /* 80D4D7B8 */ BOOL chkPassed2(cXyz);
+    BOOL chkPassed2(cXyz);
 
-    /* 80D4D928 */ virtual ~daStartAndGoal_Path_c();
+    virtual ~daStartAndGoal_Path_c();
 };
 
 class daStartAndGoal_c : public fopAc_ac_c {
 public:
-    /* 80D4D84C */ int getType();
-    /* 80D4D884 */ int Create();
-    /* 80D4D998 */ void init();
-    /* 80D4DA68 */ void actorPosCheck();
-    /* 80D4DB30 */ int readyStartTimer();
-    /* 80D4DBAC */ BOOL isStartCheck();
-    /* 80D4DBD0 */ BOOL isReadyCheck();
-    /* 80D4DC50 */ int Execute();
-    /* 80D4DCF4 */ int Draw();
-    /* 80D4DCFC */ int Delete();
+    int getType();
+    int Create();
+    void init();
+    void actorPosCheck();
+    int readyStartTimer();
+    BOOL isStartCheck();
+    BOOL isReadyCheck();
+    int Execute();
+    int Draw();
+    int Delete();
 
     /* 0x568 */ daStartAndGoal_Path_c mPath;
     /* 0xB98 */ u8 field_0xb98;
diff --git a/include/d/actor/d_a_suspend.h b/include/d/actor/d_a_suspend.h
index a19b8d8eab..062389d0f5 100644
--- a/include/d/actor/d_a_suspend.h
+++ b/include/d/actor/d_a_suspend.h
@@ -15,14 +15,14 @@ class daSus_c : public fopAc_ac_c {
 public:
     class data_c {
     public:
-        /* 80030F14 */ void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
-        /* 80030FBC */ data_c* reset();
-        /* 80030FCC */ u8 isSwitch();
-        /* 800310C8 */ u8 check(fopAc_ac_c*);
-        /* 80031038 */ bool check(cXyz const&);
-        /* 80031150 */ void execute();
-        /* 80031F28 */ ~data_c() {}
-        /* 80031F64 */ data_c() { reset(); }
+        void set(s8, cXyz const&, cXyz const&, u8, u8, u8);
+        data_c* reset();
+        u8 isSwitch();
+        u8 check(fopAc_ac_c*);
+        bool check(cXyz const&);
+        void execute();
+        ~data_c() {}
+        data_c() { reset(); }
 
         void setNext(data_c* i_next) { mpNext = i_next; }
         data_c* getNext() { return mpNext; }
@@ -42,20 +42,20 @@ public:
 
     class room_c {
     public:
-        /* 80031190 */ void add(daSus_c::data_c*);
-        /* 800311FC */ void reset();
-        /* 80031EE4 */ room_c() { init(); }
+        void add(daSus_c::data_c*);
+        void reset();
+        room_c() { init(); }
         void init() { mpData = NULL; }
 
         /* 0x0 */ data_c* mpData;
     };  // Size: 0x4
 
-    /* 80031248 */ static int newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
-    /* 800313BC */ static void reset();
-    /* 800314D4 */ static void check(fopAc_ac_c*);
-    /* 80031434 */ static bool check(s8 i_roomNo, cXyz const& i_pos);
-    /* 800315A4 */ static void execute();
-    /* 804D5118 */ int create();
+    static int newData(s8, cXyz const&, cXyz const&, u8, u8, u8);
+    static void reset();
+    static void check(fopAc_ac_c*);
+    static bool check(s8 i_roomNo, cXyz const& i_pos);
+    static void execute();
+    int create();
 
     static void reset(int roomNo) {
         mRoom[roomNo].reset();
diff --git a/include/d/actor/d_a_swBall.h b/include/d/actor/d_a_swBall.h
index 484f44333d..74bfa90593 100644
--- a/include/d/actor/d_a_swBall.h
+++ b/include/d/actor/d_a_swBall.h
@@ -13,16 +13,16 @@
  */
 class daSwBall_c : public fopAc_ac_c {
 public:
-    /* 80D4E054 */ BOOL checkArea_sub(fopAc_ac_c*);
-    /* 80D4E194 */ BOOL checkArea();
-    /* 80D4E248 */ void search_ball();
-    /* 80D4E374 */ int Create();
-    /* 80D4E42C */ int create();
-    /* 80D4E494 */ int execute();
-    /* 80D4E524 */ void actionRun();
-    /* 80D4E6C4 */ void actionStop();
-    /* 80D4E6C8 */ void PutCrrPos();
-    /* 80D4E90C */ int _delete();
+    BOOL checkArea_sub(fopAc_ac_c*);
+    BOOL checkArea();
+    void search_ball();
+    int Create();
+    int create();
+    int execute();
+    void actionRun();
+    void actionStop();
+    void PutCrrPos();
+    int _delete();
 
     u8 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getArg1() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_swLBall.h b/include/d/actor/d_a_swLBall.h
index 5bc537968d..0a633fcb5b 100644
--- a/include/d/actor/d_a_swLBall.h
+++ b/include/d/actor/d_a_swLBall.h
@@ -21,17 +21,17 @@ public:
 
     typedef void (daSwLBall_c::*actionFunc)();
 
-    /* 80D4EB8C */ int checkArea_sub(fopAc_ac_c*);
-    /* 80D4ECCC */ int checkArea();
-    /* 80D4ED80 */ void search_lb();
-    /* 80D4EEAC */ int Create();
-    /* 80D4EEF8 */ int create();
-    /* 80D4EF60 */ int execute();
-    /* 80D4F008 */ void actionInit();
-    /* 80D4F080 */ void actionRun();
-    /* 80D4F220 */ void actionStop();
-    /* 80D4F224 */ void PutCrrPos();
-    /* 80D4F444 */ int _delete();
+    int checkArea_sub(fopAc_ac_c*);
+    int checkArea();
+    void search_lb();
+    int Create();
+    int create();
+    int execute();
+    void actionInit();
+    void actionRun();
+    void actionStop();
+    void PutCrrPos();
+    int _delete();
 
     u8 getType() { return fopAcM_GetParamBit(this, 24, 4); }
     u8 getArg0() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_swTime.h b/include/d/actor/d_a_swTime.h
index 971515ea7b..b3b96fa104 100644
--- a/include/d/actor/d_a_swTime.h
+++ b/include/d/actor/d_a_swTime.h
@@ -25,10 +25,10 @@ public:
         return fopAcM_GetParamBit(this,16,8);
     }
 
-    /* 80D4F638 */ int Create();
-    /* 80D4F660 */ int create();
-    /* 80D4F6C8 */ int execute();
-    /* 80D4F758 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
 private:
     /* 0x568 */ u8 mTime;
diff --git a/include/d/actor/d_a_swc00.h b/include/d/actor/d_a_swc00.h
index 407324d551..df99051baa 100644
--- a/include/d/actor/d_a_swc00.h
+++ b/include/d/actor/d_a_swc00.h
@@ -22,12 +22,12 @@ public:
         ACTION_DEAD,
     };
 
-    /* 805A15FC */ int execute();
-    /* 805A18E8 */ void event_proc_call();
-    /* 805A19A4 */ void actionWait();
-    /* 805A1A28 */ void actionOrderEvent();
-    /* 805A1A94 */ void actionEvent();
-    /* 805A1AF0 */ void actionDead();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
 
     void setAction(u8 action) { mAction = action; }
 
diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h
index df7f4bcc7c..ebdd699774 100644
--- a/include/d/actor/d_a_swhit0.h
+++ b/include/d/actor/d_a_swhit0.h
@@ -28,30 +28,30 @@ public:
         ACTION_TOOL_TO_ON_DEMO2_e,
     };
 
-    /* 80485FF8 */ int getSwNo();
-    /* 80486004 */ int getSwNo2();
-    /* 80486010 */ u8 getEvNo();
-    /* 8048602C */ u8 getTimer();
-    /* 80486048 */ u8 getType();
-    /* 80486064 */ void makeEventId();
-    /* 804860EC */ int CreateHeap();
-    /* 80486214 */ int CreateInit();
-    /* 804863B0 */ int create();
-    /* 8048668C */ bool checkHit();
-    /* 80486704 */ void setCombackTimer();
-    /* 80486788 */ int endCombackTimer();
-    /* 80486800 */ void onSwitch();
-    /* 80486858 */ void offSwitch();
-    /* 804868A8 */ int DemoProc();
-    /* 804869C4 */ void orderEvent();
-    /* 80486ABC */ int actionOffWait();
-    /* 80486BC4 */ int actionToOnReady();
-    /* 80486C28 */ int actionToOnOrder();
-    /* 80486CE4 */ int actionToOnDemo();
-    /* 80486D88 */ int actionToOnDemo2();
-    /* 80486EC4 */ int actionSwWait();
-    /* 80486FC0 */ int actionOnWait();
-    /* 804870E0 */ void setDrawMtx();
+    int getSwNo();
+    int getSwNo2();
+    u8 getEvNo();
+    u8 getTimer();
+    u8 getType();
+    void makeEventId();
+    int CreateHeap();
+    int CreateInit();
+    int create();
+    bool checkHit();
+    void setCombackTimer();
+    int endCombackTimer();
+    void onSwitch();
+    void offSwitch();
+    int DemoProc();
+    void orderEvent();
+    int actionOffWait();
+    int actionToOnReady();
+    int actionToOnOrder();
+    int actionToOnDemo();
+    int actionToOnDemo2();
+    int actionSwWait();
+    int actionOnWait();
+    void setDrawMtx();
 
     inline int draw();
     inline int execute();
diff --git a/include/d/actor/d_a_tag_CstaSw.h b/include/d/actor/d_a_tag_CstaSw.h
index 98e30c4c70..691342c14a 100644
--- a/include/d/actor/d_a_tag_CstaSw.h
+++ b/include/d/actor/d_a_tag_CstaSw.h
@@ -6,13 +6,13 @@
 
 class daTagCstaSw_c : public fopAc_ac_c {
 public:
-    /* 805A2098 */ void setBaseMtx();
-    /* 805A20F0 */ int create();
-    /* 805A2150 */ static fopAc_ac_c* searchSekizoAct(void*, void*);
-    /* 805A21A0 */ bool areaCheck();
-    /* 805A2340 */ int Execute();
-    /* 805A23F0 */ int Draw();
-    /* 805A23F8 */ int Delete();
+    void setBaseMtx();
+    int create();
+    static fopAc_ac_c* searchSekizoAct(void*, void*);
+    bool areaCheck();
+    int Execute();
+    int Draw();
+    int Delete();
 
     u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -24,8 +24,8 @@ private:
 
 class daTagCstaSw_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 805A202C */ daTagCstaSw_HIO_c();
-    /* 805A2480 */ virtual ~daTagCstaSw_HIO_c();
+    daTagCstaSw_HIO_c();
+    virtual ~daTagCstaSw_HIO_c();
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_tag_Lv6Gate.h b/include/d/actor/d_a_tag_Lv6Gate.h
index b72f83de5c..504f6c2fed 100644
--- a/include/d/actor/d_a_tag_Lv6Gate.h
+++ b/include/d/actor/d_a_tag_Lv6Gate.h
@@ -6,10 +6,10 @@
 
 class daTagLv6Gate_c : public fopAc_ac_c {
 public:
-    /* 80D4F8B8 */ int createHeap();
-    /* 80D4FBD8 */ int create();
-    /* 80D4FEDC */ inline int execute();
-    /* 80D506AC */ int draw();
+    int createHeap();
+    int create();
+    inline int execute();
+    int draw();
 
     inline ~daTagLv6Gate_c();
 
diff --git a/include/d/actor/d_a_tag_Lv7Gate.h b/include/d/actor/d_a_tag_Lv7Gate.h
index f29880c749..db7b15d22e 100644
--- a/include/d/actor/d_a_tag_Lv7Gate.h
+++ b/include/d/actor/d_a_tag_Lv7Gate.h
@@ -5,10 +5,10 @@
 
 class daTagLv7Gate_c : public fopAc_ac_c {
 public:
-    /* 80D50C64 */ int create();
-    /* 80D50D30 */ void create_init();
-    /* 80D511C8 */ int execute();
-    /* 80D51628 */ void calcFly();
+    int create();
+    void create_init();
+    int execute();
+    void calcFly();
 
     inline ~daTagLv7Gate_c();
 
diff --git a/include/d/actor/d_a_tag_Lv8Gate.h b/include/d/actor/d_a_tag_Lv8Gate.h
index 2ed8b202cd..9cf455a739 100644
--- a/include/d/actor/d_a_tag_Lv8Gate.h
+++ b/include/d/actor/d_a_tag_Lv8Gate.h
@@ -10,8 +10,8 @@ class daTagLv8Gate_c : public fopAc_ac_c {
 public:
     inline ~daTagLv8Gate_c();
 
-    /* 80D51C58 */ int createHeap();
-    /* 80D51F48 */ int execute();
+    int createHeap();
+    int execute();
 
     void initBaseMtx();
     void create_init();
diff --git a/include/d/actor/d_a_tag_TWgate.h b/include/d/actor/d_a_tag_TWgate.h
index 7057c4d699..adb69f098d 100644
--- a/include/d/actor/d_a_tag_TWgate.h
+++ b/include/d/actor/d_a_tag_TWgate.h
@@ -35,38 +35,38 @@ public:
 
     inline ~daTagTWGate_c();
 
-    /* 80D525F8 */ void initWait();
-    /* 80D52604 */ void executeWait();
-    /* 80D528F0 */ void initDemoFilone1();
-    /* 80D5297C */ void executeDemoFilone1();
-    /* 80D52AF4 */ void initDemoFilone2();
-    /* 80D52BF0 */ void executeDemoFilone2();
-    /* 80D52DB4 */ void initDemoFilone3();
-    /* 80D52E7C */ void executeDemoFilone3();
-    /* 80D53250 */ void initDemoOrdin1();
-    /* 80D532DC */ void executeDemoOrdin1();
-    /* 80D53454 */ void initDemoOrdin2();
-    /* 80D53550 */ void executeDemoOrdin2();
-    /* 80D53714 */ void initDemoOrdin3();
-    /* 80D537DC */ void executeDemoOrdin3();
-    /* 80D53BD0 */ void initDemoRanail1();
-    /* 80D53C5C */ void executeDemoRanail1();
-    /* 80D53DD4 */ void initDemoRanail2();
-    /* 80D53ED0 */ void executeDemoRanail2();
-    /* 80D54094 */ void initDemoRanail3();
-    /* 80D54178 */ void executeDemoRanail3();
-    /* 80D5456C */ void initDemoHyral1();
-    /* 80D545F8 */ void executeDemoHyral1();
-    /* 80D54770 */ void initDemoHyral2();
-    /* 80D5486C */ void executeDemoHyral2();
-    /* 80D54A30 */ void initDemoHyral3();
-    /* 80D54AF8 */ void executeDemoHyral3();
-    /* 80D54ECC */ void initBaseMtx();
-    /* 80D54F88 */ int downloadModels();
-    /* 80D5502C */ void initTalk(int, fopAc_ac_c**);
-    /* 80D55068 */ bool talkProc(int*, int, fopAc_ac_c**);
-    /* 80D55160 */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D55180 */ int CreateHeap();
+    void initWait();
+    void executeWait();
+    void initDemoFilone1();
+    void executeDemoFilone1();
+    void initDemoFilone2();
+    void executeDemoFilone2();
+    void initDemoFilone3();
+    void executeDemoFilone3();
+    void initDemoOrdin1();
+    void executeDemoOrdin1();
+    void initDemoOrdin2();
+    void executeDemoOrdin2();
+    void initDemoOrdin3();
+    void executeDemoOrdin3();
+    void initDemoRanail1();
+    void executeDemoRanail1();
+    void initDemoRanail2();
+    void executeDemoRanail2();
+    void initDemoRanail3();
+    void executeDemoRanail3();
+    void initDemoHyral1();
+    void executeDemoHyral1();
+    void initDemoHyral2();
+    void executeDemoHyral2();
+    void initDemoHyral3();
+    void executeDemoHyral3();
+    void initBaseMtx();
+    int downloadModels();
+    void initTalk(int, fopAc_ac_c**);
+    bool talkProc(int*, int, fopAc_ac_c**);
+    static int createHeapCallBack(fopAc_ac_c*);
+    int CreateHeap();
 
     u8 getSwitch() { return fopAcM_GetParam(this) >> 8; }
     u8 getType() { return fopAcM_GetParam(this); }
diff --git a/include/d/actor/d_a_tag_ajnot.h b/include/d/actor/d_a_tag_ajnot.h
index 4bebcced85..67610611b9 100644
--- a/include/d/actor/d_a_tag_ajnot.h
+++ b/include/d/actor/d_a_tag_ajnot.h
@@ -5,9 +5,9 @@
 
 class daTagAJnot_c : public fopAc_ac_c {
 public:
-    /* 805A2658 */ int create();
-    /* 805A26C8 */ ~daTagAJnot_c();
-    /* 805A2744 */ int execute();
+    int create();
+    ~daTagAJnot_c();
+    int execute();
 };
 
 #endif /* D_A_TAG_AJNOT_H */
diff --git a/include/d/actor/d_a_tag_allmato.h b/include/d/actor/d_a_tag_allmato.h
index 7ac95f1027..ecb71836b7 100644
--- a/include/d/actor/d_a_tag_allmato.h
+++ b/include/d/actor/d_a_tag_allmato.h
@@ -18,25 +18,25 @@ public:
     /* 0x1D0F */ u8 field_0x1d0f;
     /* 0x1D10 */ u8 field_0x1d10;
 
-    /* 80487538 */ int create();
-    /* 804876B0 */ int Delete();
-    /* 804876B8 */ int Execute();
-    /* 80487C5C */ int Draw();
-    /* 80487C64 */ static void* srchBouMato(void*, void*);
-    /* 80487D00 */ static void* srchItaMato(void*, void*);
-    /* 80487D9C */ static void* srchTaro(void*, void*);
-    /* 80487E38 */ static void* srchArrow(void*, void*);
-    /* 80487ED4 */ int isDelete();
-    /* 80487F80 */ void entryBouMatoActors();
-    /* 80488034 */ void entryItaMatoActors();
-    /* 80488104 */ fopAc_ac_c* getTaroActorP();
-    /* 804881C0 */ fopAc_ac_c* getArrowActorP();
-    /* 80488238 */ int checkCrsMato();
-    /* 80488994 */ int checkCrsMato2();
-    /* 80488F40 */ int checkBrkMato();
-    /* 80488FD8 */ void evtChange(u16);
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    static void* srchBouMato(void*, void*);
+    static void* srchItaMato(void*, void*);
+    static void* srchTaro(void*, void*);
+    static void* srchArrow(void*, void*);
+    int isDelete();
+    void entryBouMatoActors();
+    void entryItaMatoActors();
+    fopAc_ac_c* getTaroActorP();
+    fopAc_ac_c* getArrowActorP();
+    int checkCrsMato();
+    int checkCrsMato2();
+    int checkBrkMato();
+    void evtChange(u16);
 
-    /* 80489608 */ virtual ~daTag_AllMato_c() {}
+    virtual ~daTag_AllMato_c() {}
 
     int getType() { return 0; }
 
diff --git a/include/d/actor/d_a_tag_attack_item.h b/include/d/actor/d_a_tag_attack_item.h
index 5c98b73bc6..1f33cb9f83 100644
--- a/include/d/actor/d_a_tag_attack_item.h
+++ b/include/d/actor/d_a_tag_attack_item.h
@@ -9,18 +9,18 @@ class daTagAtkItem_c : public fopAc_ac_c , public dEvLib_callback_c {
 public:
     daTagAtkItem_c() : dEvLib_callback_c(this) {}
 
-    /* 805A2958 */ void setBaseMtx();
-    /* 805A2990 */ int Create();
-    /* 805A2A34 */ int create();
-    /* 805A2C48 */ int execute();
-    /* 805A2CA8 */ void action();
-    /* 805A2D58 */ BOOL checkHit();
-    /* 805A2F54 */ void createItem();
-    /* 805A3038 */ int _delete();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    void action();
+    BOOL checkHit();
+    void createItem();
+    int _delete();
 
-    /* 805A3118 */ virtual ~daTagAtkItem_c() {}
-    /* 805A2D10 */ virtual bool eventStart();
-    /* 805A2D34 */ virtual bool eventEnd();
+    virtual ~daTagAtkItem_c() {}
+    virtual bool eventStart();
+    virtual bool eventEnd();
 
     u8 getEvId() { return fopAcM_GetParamBit(this, 0x18, 8); }
     u8 getNum() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h
index b2033ba867..45d2292bec 100644
--- a/include/d/actor/d_a_tag_attention.h
+++ b/include/d/actor/d_a_tag_attention.h
@@ -6,11 +6,11 @@
 
 class daAttp_c : public fopAc_ac_c {
 public:
-    /* 804D5318 */ int Create();
-    /* 804D5354 */ int create();
-    /* 804D53AC */ int execute();
-    /* 804D568C */ int draw();
-    /* 804D5694 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 };  // Size: 0x568
 
 namespace daAttp_prm {
diff --git a/include/d/actor/d_a_tag_bottle_item.h b/include/d/actor/d_a_tag_bottle_item.h
index a1c8badafa..ecdba3d544 100644
--- a/include/d/actor/d_a_tag_bottle_item.h
+++ b/include/d/actor/d_a_tag_bottle_item.h
@@ -14,21 +14,21 @@ private:
     /* 0x0576 */ u8 mBottleItemType;
 
 public:
-    /* 80D55FD8 */ s32 create();
-    /* 80D5605C */ s32 Delete();
-    /* 80D56064 */ s32 Execute();
-    /* 80D560D0 */ s32 Draw();
-    /* 80D560D8 */ void setTypeFromParam();
-    /* 80D56100 */ void restart();
-    /* 80D56170 */ void initialize();
-    /* 80D561E8 */ int checkProcess(ProcessFunc);
-    /* 80D56214 */ int setProcess(ProcessFunc);
-    /* 80D56300 */ void setAttnPos();
-    /* 80D56334 */ s32 chkEvent();
-    /* 80D56384 */ s32 orderEvent();
-    /* 80D56418 */ void makeSoup();
-    /* 80D564A0 */ int wait(void*);
-    /* 80D565F0 */ virtual ~daTag_BottleItem_c();
+    s32 create();
+    s32 Delete();
+    s32 Execute();
+    s32 Draw();
+    void setTypeFromParam();
+    void restart();
+    void initialize();
+    int checkProcess(ProcessFunc);
+    int setProcess(ProcessFunc);
+    void setAttnPos();
+    s32 chkEvent();
+    s32 orderEvent();
+    void makeSoup();
+    int wait(void*);
+    virtual ~daTag_BottleItem_c();
 };
 
 STATIC_ASSERT(sizeof(daTag_BottleItem_c) == 0x57C);
diff --git a/include/d/actor/d_a_tag_camera.h b/include/d/actor/d_a_tag_camera.h
index 7d9da89f08..e9b4516637 100644
--- a/include/d/actor/d_a_tag_camera.h
+++ b/include/d/actor/d_a_tag_camera.h
@@ -5,15 +5,15 @@
 
 class daTag_Cam_c : public fopAc_ac_c {
 public:
-    /* 80489F14 */ u8 getSwType();
-    /* 80489F20 */ u8 getPrio();
-    /* 80489F2C */ u8 getSwBit();
-    /* 80489F38 */ u8 getCondition();
-    /* 80489F44 */ u8 getCameraId();
-    /* 80489F50 */ u8 getRailID();
-    /* 80489F5C */ u16 getAreaType();
-    /* 80489F68 */ u16 getAreaNoChk();
-    /* 80489F74 */ int execute();
+    u8 getSwType();
+    u8 getPrio();
+    u8 getSwBit();
+    u8 getCondition();
+    u8 getCameraId();
+    u8 getRailID();
+    u16 getAreaType();
+    u16 getAreaNoChk();
+    int execute();
 
     inline int create();
 
diff --git a/include/d/actor/d_a_tag_chgrestart.h b/include/d/actor/d_a_tag_chgrestart.h
index 87d10418a7..496b4a0477 100644
--- a/include/d/actor/d_a_tag_chgrestart.h
+++ b/include/d/actor/d_a_tag_chgrestart.h
@@ -6,10 +6,10 @@
 class daTagChgRestart_c : public fopAc_ac_c {
 public:
     daTagChgRestart_c() {}
-    /* 80D56758 */ s32 Create();
-    /* 80D567E4 */ s32 create();
-    /* 80D568B8 */ s32 execute();
-    /* 80D56A84 */ s32 _delete();
+    s32 Create();
+    s32 create();
+    s32 execute();
+    s32 _delete();
 
     /* 0x0568 */ cXyz mVertices[4];
 };
diff --git a/include/d/actor/d_a_tag_chkpoint.h b/include/d/actor/d_a_tag_chkpoint.h
index c13c63c75e..842408d20c 100644
--- a/include/d/actor/d_a_tag_chkpoint.h
+++ b/include/d/actor/d_a_tag_chkpoint.h
@@ -6,7 +6,7 @@
 
 class daTag_Chk_c : public fopAc_ac_c {
 public:
-    /* 8048A6F8 */ int execute();
+    int execute();
 
     u16 getAreaType() { return home.angle.z & 0x100; }
     u16 getHeight() { return fopAcM_GetParam(this) & 0xff; }
diff --git a/include/d/actor/d_a_tag_csw.h b/include/d/actor/d_a_tag_csw.h
index ea07c6efbd..97d08ffda2 100644
--- a/include/d/actor/d_a_tag_csw.h
+++ b/include/d/actor/d_a_tag_csw.h
@@ -8,16 +8,16 @@
 class dBgW;
 
 struct daTagCsw_c : public fopAc_ac_c, public request_of_phase_process_class {
-    /* 80D56BD8 */ ~daTagCsw_c();
-    /* 80D56D98 */ void setMtx();
-    /* 80D56EF8 */ int createHeap();
-    /* 80D57320 */ int chkInsideStatueStart();
-    /* 80D573C0 */ int create();
-    /* 80D5789C */ int Delete();
-    /* 80D57968 */ void onLight();
-    /* 80D579A8 */ void offLight();
-    /* 80D579E8 */ int execute();
-    /* 80D583B8 */ int draw();
+    ~daTagCsw_c();
+    void setMtx();
+    int createHeap();
+    int chkInsideStatueStart();
+    int create();
+    int Delete();
+    void onLight();
+    void offLight();
+    int execute();
+    int draw();
 
     int getSw() { return fopAcM_GetParamBit(this, 1, 8); }
     int getSw2() { return fopAcM_GetParamBit(this, 9, 8); }
diff --git a/include/d/actor/d_a_tag_event.h b/include/d/actor/d_a_tag_event.h
index 4101684a62..f56d88fbd0 100644
--- a/include/d/actor/d_a_tag_event.h
+++ b/include/d/actor/d_a_tag_event.h
@@ -15,29 +15,29 @@ public:
         ACTION_EVENT,
     };
 
-    /* 8048AD68 */ u8 getEventNo();
-    /* 8048AD74 */ u8 getSwbit();
-    /* 8048AD80 */ u8 getSwbit2();
-    /* 8048AD8C */ u8 getType();
-    /* 8048AD98 */ u16 getInvalidEventFlag();
-    /* 8048ADA4 */ u16 getAreaType();
-    /* 8048ADB0 */ u16 getValidEventFlag();
-    /* 8048ADBC */ BOOL horseRodeo();
-    /* 8048ADEC */ BOOL arrivalTerms();
-    /* 8048AEEC */ void demoInitProc();
-    /* 8048AEF8 */ void demoEndProc();
-    /* 8048AEFC */ void demoProc();
-    /* 8048AF00 */ int create();
-    /* 8048B0E4 */ int actionNext();
-    /* 8048B1B0 */ int actionEvent();
-    /* 8048B268 */ int actionReady();
-    /* 8048B378 */ BOOL checkArea();
-    /* 8048B514 */ int actionHunt();
-    /* 8048B5C8 */ int actionArrival();
-    /* 8048B5F4 */ int actionWait();
-    /* 8048B5FC */ int actionHunt2();
-    /* 8048B6D4 */ int execute();
-    /* 8048B784 */ int draw();
+    u8 getEventNo();
+    u8 getSwbit();
+    u8 getSwbit2();
+    u8 getType();
+    u16 getInvalidEventFlag();
+    u16 getAreaType();
+    u16 getValidEventFlag();
+    BOOL horseRodeo();
+    BOOL arrivalTerms();
+    void demoInitProc();
+    void demoEndProc();
+    void demoProc();
+    int create();
+    int actionNext();
+    int actionEvent();
+    int actionReady();
+    BOOL checkArea();
+    int actionHunt();
+    int actionArrival();
+    int actionWait();
+    int actionHunt2();
+    int execute();
+    int draw();
 
     void setActio(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_tag_evt.h b/include/d/actor/d_a_tag_evt.h
index b7ff048f99..b9be601276 100644
--- a/include/d/actor/d_a_tag_evt.h
+++ b/include/d/actor/d_a_tag_evt.h
@@ -7,15 +7,15 @@
 
 class daTag_Evt_c : public fopAc_ac_c {
 public:
-    /* 8048B918 */ int create();
-    /* 8048B9D8 */ int destroy();
-    /* 8048BA0C */ int execute();
-    /* 8048BE44 */ int draw();
-    /* 8048BE4C */ int getParam();
-    /* 8048BF64 */ int isDelete();
-    /* 8048C090 */ int doEvtCutWait(int);
-    /* 8048C124 */ int doEvtCutTalk(int);
-    /* 8048C1C8 */ int doEvtCutNext(int);
+    int create();
+    int destroy();
+    int execute();
+    int draw();
+    int getParam();
+    int isDelete();
+    int doEvtCutWait(int);
+    int doEvtCutTalk(int);
+    int doEvtCutNext(int);
 
     static char* mEvtCutList[3];
 
@@ -36,7 +36,7 @@ public:
     /* 0x5E2 */ u16 field_0x5E2;
     /* 0x5E4 */ s8 field_0x5E4;
 
-    /* 8048C304 */ virtual ~daTag_Evt_c();
+    virtual ~daTag_Evt_c();
 };
 
 STATIC_ASSERT(sizeof(daTag_Evt_c) == 0x5EC);
diff --git a/include/d/actor/d_a_tag_evtarea.h b/include/d/actor/d_a_tag_evtarea.h
index d4f0db0f68..5bfeaf4c3e 100644
--- a/include/d/actor/d_a_tag_evtarea.h
+++ b/include/d/actor/d_a_tag_evtarea.h
@@ -5,19 +5,19 @@
 
 class daTag_EvtArea_c : public fopAc_ac_c {
 public:
-    /* 8048C4F8 */ cPhs__Step create();
-    /* 8048C728 */ BOOL Delete();
-    /* 8048C730 */ BOOL Execute();
-    /* 8048C894 */ BOOL Draw();
-    /* 8048C89C */ BOOL isDelete();
-    /* 8048C94C */ BOOL chkPointInArea(cXyz, cXyz);
+    cPhs__Step create();
+    BOOL Delete();
+    BOOL Execute();
+    BOOL Draw();
+    BOOL isDelete();
+    BOOL chkPointInArea(cXyz, cXyz);
 
-    /* 8048CD08 */ BOOL chkPointInArea(cXyz param_0) {
+    BOOL chkPointInArea(cXyz param_0) {
         cXyz local_28(0.0f, 0.0f, 0.0f);
         return chkPointInArea(param_0, local_28);
     }
 
-    /* 8048CD68 */ virtual ~daTag_EvtArea_c() {}
+    virtual ~daTag_EvtArea_c() {}
 
     int getType() {
         u16 type = shape_angle.z & 0xFF;
diff --git a/include/d/actor/d_a_tag_evtmsg.h b/include/d/actor/d_a_tag_evtmsg.h
index 7a21bdf223..3ca4e03545 100644
--- a/include/d/actor/d_a_tag_evtmsg.h
+++ b/include/d/actor/d_a_tag_evtmsg.h
@@ -16,21 +16,21 @@ public:
     /* 0x574 */ dMsgFlow_c mMsgFlow;
 
 public:
-    /* 8048CF38 */ int create();
-    /* 8048D014 */ int Delete();
-    /* 8048D01C */ int Execute();
-    /* 8048D31C */ int Draw();
-    /* 8048D324 */ u32 getOnEvtBit();
-    /* 8048D340 */ u32 getOffEvtBit();
-    /* 8048D35C */ u8 getOnSwBit();
-    /* 8048D368 */ u8 getOffSwBit();
-    /* 8048D374 */ u8 getProcType();
-    /* 8048D384 */ BOOL isDelete();
-    /* 8048D428 */ BOOL chkPointInArea(cXyz);
-    /* 8048D54C */ BOOL ECut_talk(int);
-    /* 8048D5CC */ BOOL ECut_wait(int);
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    u32 getOnEvtBit();
+    u32 getOffEvtBit();
+    u8 getOnSwBit();
+    u8 getOffSwBit();
+    u8 getProcType();
+    BOOL isDelete();
+    BOOL chkPointInArea(cXyz);
+    BOOL ECut_talk(int);
+    BOOL ECut_wait(int);
 
-    /* 8048D6F0 */ virtual ~daTag_EvtMsg_c();
+    virtual ~daTag_EvtMsg_c();
 
     static char* mEvtCutNameList[];
     static EvtCutFunc mEvtCutList[];
diff --git a/include/d/actor/d_a_tag_firewall.h b/include/d/actor/d_a_tag_firewall.h
index 7729c2bee1..e5883707e1 100644
--- a/include/d/actor/d_a_tag_firewall.h
+++ b/include/d/actor/d_a_tag_firewall.h
@@ -6,9 +6,9 @@
 
 class daTag_FWall_c : public fopAc_ac_c {
 public:
-    /* 80D58940 */ int execute();
-    /* 80D59078 */ int _delete();
-    /* 80D590A8 */ int create();
+    int execute();
+    int _delete();
+    int create();
 
     u8 getTagNo(u8 idx) { return field_0x65c[idx]; }
     cXyz getPos(u8 idx) { return mWallPos[idx]; }
diff --git a/include/d/actor/d_a_tag_gstart.h b/include/d/actor/d_a_tag_gstart.h
index 6600a090b5..8ede0d6e93 100644
--- a/include/d/actor/d_a_tag_gstart.h
+++ b/include/d/actor/d_a_tag_gstart.h
@@ -5,9 +5,9 @@
 
 class daTagGstart_c : public fopAc_ac_c {
 public:
-    /* 805A3478 */ int create();
-    /* 805A3514 */ ~daTagGstart_c();
-    /* 805A3590 */ int execute();
+    int create();
+    ~daTagGstart_c();
+    int execute();
 
     /* 0x568 */ u8 mSwNo;
     /* 0x569 */ u8 mSwNo2;
diff --git a/include/d/actor/d_a_tag_guard.h b/include/d/actor/d_a_tag_guard.h
index f71874c820..0d2c784303 100644
--- a/include/d/actor/d_a_tag_guard.h
+++ b/include/d/actor/d_a_tag_guard.h
@@ -6,8 +6,8 @@
 
 class daTagGuard_c : public fopAc_ac_c {
 public:
-    /* 80D597F8 */ int getAppearPoint(Vec*);
-    /* 80D5985C */ void createGuard(u32);
+    int getAppearPoint(Vec*);
+    void createGuard(u32);
 
     u8 getPathID() { return fopAcM_GetParam(this) >> 8; }
     inline int create();
diff --git a/include/d/actor/d_a_tag_hinit.h b/include/d/actor/d_a_tag_hinit.h
index 8c1bb78bbe..6f3125db4a 100644
--- a/include/d/actor/d_a_tag_hinit.h
+++ b/include/d/actor/d_a_tag_hinit.h
@@ -6,9 +6,9 @@
 
 class daTagHinit_c : public fopAc_ac_c {
 public:
-    /* 805A3758 */ int create();
-    /* 805A3820 */ ~daTagHinit_c();
-    /* 805A389C */ int execute();
+    int create();
+    ~daTagHinit_c();
+    int execute();
 
     /* 0x568 */ u8 field_0x568;
     /* 0x569 */ u8 field_0x569;
diff --git a/include/d/actor/d_a_tag_hjump.h b/include/d/actor/d_a_tag_hjump.h
index acbf0f0a9e..5cdef9f76e 100644
--- a/include/d/actor/d_a_tag_hjump.h
+++ b/include/d/actor/d_a_tag_hjump.h
@@ -11,12 +11,12 @@ public:
         TYPE_OBJECT_e = 3,
     };
 
-    /* 805A3B24 */ int create();
-    /* 805A3DA0 */ ~daTagHjump_c();
-    /* 805A3E70 */ int execute();
+    int create();
+    ~daTagHjump_c();
+    int execute();
 
-    /* 805A3AB8 */ virtual int CreateHeap();
-    /* 805A4154 */ virtual int Draw();
+    virtual int CreateHeap();
+    virtual int Draw();
 
     /* 0x5A0 */ request_of_phase_process_class mPhase;
     /* 0x5A8 */ J3DModel* mpModel;
diff --git a/include/d/actor/d_a_tag_howl.h b/include/d/actor/d_a_tag_howl.h
index 7052509230..9d1f9ed023 100644
--- a/include/d/actor/d_a_tag_howl.h
+++ b/include/d/actor/d_a_tag_howl.h
@@ -10,14 +10,14 @@ public:
 
     s8 getCurveID() { return mCurveID; }
 
-    /* 8048D958 */ int create();
-    /* 8048D9BC */ int destroy();
-    /* 8048D9C4 */ int execute();
-    /* 8048DA24 */ int draw();
-    /* 8048DA2C */ u8 isAreaCheck();
-    /* 8048DC1C */ int getParam();
-    /* 8048DC68 */ u8 getSwitchBit();
-    /* 8048DCFC */ virtual ~daTag_Howl_c() {}
+    int create();
+    int destroy();
+    int execute();
+    int draw();
+    u8 isAreaCheck();
+    int getParam();
+    u8 getSwitchBit();
+    virtual ~daTag_Howl_c() {}
 };  // Size: 0x570
 
 #endif /* D_A_TAG_HOWL_H */
diff --git a/include/d/actor/d_a_tag_hstop.h b/include/d/actor/d_a_tag_hstop.h
index ba1fc9cea9..6a5ae38beb 100644
--- a/include/d/actor/d_a_tag_hstop.h
+++ b/include/d/actor/d_a_tag_hstop.h
@@ -6,10 +6,10 @@
 
 class daTagHstop_c : public fopAc_ac_c {
 public:
-    /* 805A43EC */ int create();
-    /* 805A45F8 */ ~daTagHstop_c();
-    /* 805A46B8 */ void setActive();
-    /* 805A475C */ int execute();
+    int create();
+    ~daTagHstop_c();
+    void setActive();
+    int execute();
 
     static daTagHstop_c* getTop() { return m_top; }
 
diff --git a/include/d/actor/d_a_tag_kago_fall.h b/include/d/actor/d_a_tag_kago_fall.h
index 01026ee738..95fc3a8624 100644
--- a/include/d/actor/d_a_tag_kago_fall.h
+++ b/include/d/actor/d_a_tag_kago_fall.h
@@ -11,12 +11,12 @@ public:
         /* 1 */ ACTION_MODE_FALL
     };
 
-    /* 80D59C58 */ int create();
-    /* 80D59DE0 */ int execute();
-    /* 80D59E18 */ void setActionMode(ActionMode mode, u8 state);
-    /* 80D59E24 */ void actionWaitRiver();
-    /* 80D5A218 */ void actionWaitFall();
-    /* 80D5A67C */ int _delete();
+    int create();
+    int execute();
+    void setActionMode(ActionMode mode, u8 state);
+    void actionWaitRiver();
+    void actionWaitFall();
+    int _delete();
 
     /* 0x568 */ dMsgFlow_c mMsgFlow;
     /* 0x5b4 */ Mtx mMtx;
diff --git a/include/d/actor/d_a_tag_kmsg.h b/include/d/actor/d_a_tag_kmsg.h
index a235bbd09d..7b75e3d43c 100644
--- a/include/d/actor/d_a_tag_kmsg.h
+++ b/include/d/actor/d_a_tag_kmsg.h
@@ -26,12 +26,12 @@ public:
     /* 0x5C3 */ u8 field_0x5c3;
     /* 0x5C4 */ bool field_0x5c4;
 
-    /* 8048DE78 */ int create();
-    /* 8048DFDC */ int Delete();
-    /* 8048E010 */ int Execute();
-    /* 8048E8B8 */ int Draw();
-    /* 8048E8C0 */ int isDelete();
-    /* 8048EA30 */ virtual ~daTag_KMsg_c() {
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    int isDelete();
+    virtual ~daTag_KMsg_c() {
         if (getType() == KMSG_TYPE_3) {
             dComIfG_resDelete(&mPhase, "Lv6Gate");
         }
diff --git a/include/d/actor/d_a_tag_lantern.h b/include/d/actor/d_a_tag_lantern.h
index 87127fb43c..ba743e34c4 100644
--- a/include/d/actor/d_a_tag_lantern.h
+++ b/include/d/actor/d_a_tag_lantern.h
@@ -6,11 +6,11 @@
 
 class daTag_Lantern_c : public fopAc_ac_c {
 public:
-    /* 8048ED28 */ int create();
-    /* 8048EDA8 */ int Delete();
-    /* 8048EDDC */ int Execute();
-    /* 8048EF6C */ int Draw();
-    /* 8048EF74 */ void initialize();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    void initialize();
 
     BOOL chkClimbDownLadderStatus() {
         f32 var_f31 = fopAcM_searchPlayerDistanceY(this);
@@ -35,12 +35,12 @@ public:
     /* 0x600 */ int mFlowIndex;
     /* 0x604 */ u8 field_0x604;
     
-    /* 8048ECAC */ virtual ~daTag_Lantern_c();
+    virtual ~daTag_Lantern_c();
 }; // Size: 0x60C
 
 class daTag_Lantern_Param_c {
 public:
-    /* 8048F0EC */ inline virtual ~daTag_Lantern_Param_c() {}
+    inline virtual ~daTag_Lantern_Param_c() {}
 };
 
 #endif /* D_A_TAG_LANTERN_H */
diff --git a/include/d/actor/d_a_tag_lightball.h b/include/d/actor/d_a_tag_lightball.h
index 0c21af2b10..a9e3453e39 100644
--- a/include/d/actor/d_a_tag_lightball.h
+++ b/include/d/actor/d_a_tag_lightball.h
@@ -5,13 +5,13 @@
 
 class daTagLightBall_c : public fopAc_ac_c {
 public:
-    /* 80D5A7F8 */ void initBaseMtx();
-    /* 80D5A818 */ void setBaseMtx();
-    /* 80D5A870 */ int Create();
-    /* 80D5A9B8 */ int create();
-    /* 80D5AA20 */ int execute();
-    /* 80D5ABA0 */ int draw();
-    /* 80D5ABA8 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 
     u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
     u32 getType() { return fopAcM_GetParamBit(this, 8, 4); }
diff --git a/include/d/actor/d_a_tag_lv2prchk.h b/include/d/actor/d_a_tag_lv2prchk.h
index be4b8b4f15..0967cbb49e 100644
--- a/include/d/actor/d_a_tag_lv2prchk.h
+++ b/include/d/actor/d_a_tag_lv2prchk.h
@@ -20,14 +20,14 @@ public:
         MODE_CHECK_WRONG_ORDER = 100,
     };
 
-    /* 805A4C58 */ int Create();
-    /* 805A4CDC */ int create();
-    /* 805A4D44 */ int execute();
-    /* 805A4D68 */ void action();
-    /* 805A4DF4 */ void actionCheck();
-    /* 805A5290 */ void actionEnd();
-    /* 805A5294 */ void seStartWrong();
-    /* 805A52F4 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    void action();
+    void actionCheck();
+    void actionEnd();
+    void seStartWrong();
+    int _delete();
 
     u8 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwbit2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_tag_lv5soup.h b/include/d/actor/d_a_tag_lv5soup.h
index 3a9b49fed7..f2705249eb 100644
--- a/include/d/actor/d_a_tag_lv5soup.h
+++ b/include/d/actor/d_a_tag_lv5soup.h
@@ -7,13 +7,13 @@ class daTag_Lv5Soup_c : public fopAc_ac_c {
 public:
     daTag_Lv5Soup_c() {}
 
-    /* 80D5AD58 */ int create();
-    /* 80D5ADEC */ int Delete();
-    /* 80D5ADF4 */ int Execute();
-    /* 80D5AE9C */ int Draw();
-    /* 80D5AEA4 */ bool isAreaCheck();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool isAreaCheck();
 
-    /* 80D5B0F4 */ virtual ~daTag_Lv5Soup_c();
+    virtual ~daTag_Lv5Soup_c();
 };
 
 #endif /* D_A_TAG_LV5SOUP_H */
diff --git a/include/d/actor/d_a_tag_lv6CstaSw.h b/include/d/actor/d_a_tag_lv6CstaSw.h
index 1fb95f9fff..9f8bf99dd6 100644
--- a/include/d/actor/d_a_tag_lv6CstaSw.h
+++ b/include/d/actor/d_a_tag_lv6CstaSw.h
@@ -6,13 +6,13 @@
 
 class daLv6CstaSw_c : public fopAc_ac_c {
 public:
-    /* 80D5B358 */ void setBaseMtx();
-    /* 80D5B3B0 */ int create();
-    /* 80D5B410 */ static fopAc_ac_c* searchSekizoAct(void*, void*);
-    /* 80D5B460 */ bool areaCheck();
-    /* 80D5B600 */ int Execute();
-    /* 80D5B6B0 */ int Draw();
-    /* 80D5B6B8 */ int Delete();
+    void setBaseMtx();
+    int create();
+    static fopAc_ac_c* searchSekizoAct(void*, void*);
+    bool areaCheck();
+    int Execute();
+    int Draw();
+    int Delete();
 
     u8 getSw() { return fopAcM_GetParamBit(this, 0, 8); }
 
@@ -23,8 +23,8 @@ private:
 
 class daLv6CstaSw_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D5B2EC */ daLv6CstaSw_HIO_c();
-    /* 80D5B740 */ virtual ~daLv6CstaSw_HIO_c();
+    daLv6CstaSw_HIO_c();
+    virtual ~daLv6CstaSw_HIO_c();
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_tag_magne.h b/include/d/actor/d_a_tag_magne.h
index c45919e33e..2b2db66517 100644
--- a/include/d/actor/d_a_tag_magne.h
+++ b/include/d/actor/d_a_tag_magne.h
@@ -7,13 +7,13 @@ class cBgS_PolyInfo;
 
 class daTagMagne_c : public fopAc_ac_c {
 public:
-    /* 80031B50 */ static BOOL checkMagnetCode(cBgS_PolyInfo&);
-    /* 80031BF4 */ int checkMagneA();
-    /* 80031C48 */ int checkMagneB();
-    /* 80031C9C */ int checkMagneC();
-    /* 805A5498 */ int Create();
-    /* 805A54DC */ int create();
-    /* 805A5578 */ int _delete();
+    static BOOL checkMagnetCode(cBgS_PolyInfo&);
+    int checkMagneA();
+    int checkMagneB();
+    int checkMagneC();
+    int Create();
+    int create();
+    int _delete();
 
     u8 getSwNo1() { return fopAcM_GetParamBit(this, 0, 8); }
     u8 getSwNo2() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_tag_mhint.h b/include/d/actor/d_a_tag_mhint.h
index 8da78d31fc..29086d4ddf 100644
--- a/include/d/actor/d_a_tag_mhint.h
+++ b/include/d/actor/d_a_tag_mhint.h
@@ -8,10 +8,10 @@
 
 class daTagMhint_c : public fopAc_ac_c {
 public:
-    /* 805A56B8 */ int create();
-    /* 805A58E8 */ ~daTagMhint_c();
-    /* 805A5974 */ void eventOrder();
-    /* 805A5AE4 */ int execute();
+    int create();
+    ~daTagMhint_c();
+    void eventOrder();
+    int execute();
 
     bool checkNoAttention() const { return field_0x56d == 0xFF; }
     bool checkEventID() const { return mToolEventID != 0xFF; }
diff --git a/include/d/actor/d_a_tag_mist.h b/include/d/actor/d_a_tag_mist.h
index b924b54996..798be173d9 100644
--- a/include/d/actor/d_a_tag_mist.h
+++ b/include/d/actor/d_a_tag_mist.h
@@ -5,15 +5,15 @@
 
 class daTagMist_c : public fopAc_ac_c {
 public:
-    /* 8048F258 */ void offSw();
-    /* 8048F2C4 */ void onMySw();
-    /* 8048F310 */ BOOL isMySw();
-    /* 8048F370 */ int Create();
-    /* 8048F444 */ int create();
-    /* 8048F558 */ int execute();
-    /* 8048F690 */ int _delete();
+    void offSw();
+    void onMySw();
+    BOOL isMySw();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
-    /* 80031CF0 */ static u8 getPlayerNo();
+    static u8 getPlayerNo();
     static void setPlayerNo(u8 i_playerNo) { mPlayerNo = i_playerNo; }
 
     static u8 mPlayerNo;
diff --git a/include/d/actor/d_a_tag_mmsg.h b/include/d/actor/d_a_tag_mmsg.h
index 8364a4e9b9..b916e2f212 100644
--- a/include/d/actor/d_a_tag_mmsg.h
+++ b/include/d/actor/d_a_tag_mmsg.h
@@ -7,9 +7,9 @@ class daTagMmsg_c : public fopAc_ac_c {
 public:
     daTagMmsg_c() {}
 
-    /* 80D5B918 */ int create();
-    /* 80D5BAB4 */ ~daTagMmsg_c();
-    /* 80D5BB30 */ int execute();
+    int create();
+    ~daTagMmsg_c();
+    int execute();
 
     void onUseFlg() { mUseFlg = true; }
     bool checkNoAttention() { return mAttention == 0xFF; }
diff --git a/include/d/actor/d_a_tag_msg.h b/include/d/actor/d_a_tag_msg.h
index 3b6c40a1c1..52f60bf13b 100644
--- a/include/d/actor/d_a_tag_msg.h
+++ b/include/d/actor/d_a_tag_msg.h
@@ -11,24 +11,24 @@ public:
 
 class daTag_Msg_Param_c {
 public:
-    /* 80490128 */ virtual ~daTag_Msg_Param_c() {}
+    virtual ~daTag_Msg_Param_c() {}
 
     static const daTag_Msg_HIO_Param_c m;
 };
 
 class daTag_Msg_c : public fopAc_ac_c {
 public:
-    /* 8048F7F8 */ virtual ~daTag_Msg_c();
-    /* 8048F878 */ int create();
-    /* 8048F954 */ int createHeap();
-    /* 8048F9B4 */ int destroy();
-    /* 8048F9E8 */ int execute();
-    /* 8048FC68 */ int draw();
-    /* 8048FC70 */ BOOL rangeCheck();
-    /* 8048FE18 */ BOOL otherCheck();
-    /* 8048FF8C */ char* getResName();
-    /* 8048FF9C */ void getParam();
-    /* 8049004C */ BOOL cut_speak(int, BOOL);
+    virtual ~daTag_Msg_c();
+    int create();
+    int createHeap();
+    int destroy();
+    int execute();
+    int draw();
+    BOOL rangeCheck();
+    BOOL otherCheck();
+    char* getResName();
+    void getParam();
+    BOOL cut_speak(int, BOOL);
 
     static char* mEvtCutTBL[2];
 
diff --git a/include/d/actor/d_a_tag_mstop.h b/include/d/actor/d_a_tag_mstop.h
index 1e7384579e..dd27dbb005 100644
--- a/include/d/actor/d_a_tag_mstop.h
+++ b/include/d/actor/d_a_tag_mstop.h
@@ -11,10 +11,10 @@
  */
 class daTagMstop_c : public fopAc_ac_c {
 public:
-    /* 805A6138 */ int create();
-    /* 805A6338 */ ~daTagMstop_c();
-    /* 805A63C4 */ void eventOrder();
-    /* 805A63F8 */ int execute();
+    int create();
+    ~daTagMstop_c();
+    void eventOrder();
+    int execute();
     bool checkNoAttention() const { return field_0x56b == 0xFF; }
 
 private:
diff --git a/include/d/actor/d_a_tag_mwait.h b/include/d/actor/d_a_tag_mwait.h
index 709dcbf47a..c843c91001 100644
--- a/include/d/actor/d_a_tag_mwait.h
+++ b/include/d/actor/d_a_tag_mwait.h
@@ -6,9 +6,9 @@
 
 class daTagMwait_c : public fopAc_ac_c {
 public:
-    /* 80D5BE18 */ int create();
-    /* 80D5C01C */ ~daTagMwait_c();
-    /* 80D5C0A8 */ int execute();
+    int create();
+    ~daTagMwait_c();
+    int execute();
 
     BOOL checkEndMessage() {return fopAcM_isSwitch(this, mEnterSw); }
 
diff --git a/include/d/actor/d_a_tag_myna2.h b/include/d/actor/d_a_tag_myna2.h
index f053039f39..5117e36c22 100644
--- a/include/d/actor/d_a_tag_myna2.h
+++ b/include/d/actor/d_a_tag_myna2.h
@@ -5,8 +5,8 @@
 
 class daTagMyna2_c : public fopAc_ac_c {
 public:
-    /* 80D5C698 */ s32 create();
-    /* 80D5C708 */ s32 execute();
+    s32 create();
+    s32 execute();
 
     u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
     u8 getMode() { return fopAcM_GetParam(this); }
diff --git a/include/d/actor/d_a_tag_myna_light.h b/include/d/actor/d_a_tag_myna_light.h
index 3e0882fba1..0a8b27c15d 100644
--- a/include/d/actor/d_a_tag_myna_light.h
+++ b/include/d/actor/d_a_tag_myna_light.h
@@ -5,16 +5,16 @@
 
 class daTag_MynaLight_c : public fopAc_ac_c {
 public:
-    /* 80D5CB38 */ int create();
-    /* 80D5CB9C */ int Delete();
-    /* 80D5CBF4 */ int Execute();
-    /* 80D5CD94 */ int Draw();
-    /* 80D5CE40 */ bool setTurnOnOffChange();
-    /* 80D5D148 */ u32 getTurnOnTime();
-    /* 80D5D154 */ u32 getTurnOffTime();
-    /* 80D5D160 */ void initialize();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    bool setTurnOnOffChange();
+    u32 getTurnOnTime();
+    u32 getTurnOffTime();
+    void initialize();
 
-    /* 80D5D298 */ virtual ~daTag_MynaLight_c();
+    virtual ~daTag_MynaLight_c();
 
     bool checkTurnOnOffChange() {
         return (field_0x578 != mTurnOnFlag) ? true : false;
diff --git a/include/d/actor/d_a_tag_pachi.h b/include/d/actor/d_a_tag_pachi.h
index 2cbc49ac81..932056e9a8 100644
--- a/include/d/actor/d_a_tag_pachi.h
+++ b/include/d/actor/d_a_tag_pachi.h
@@ -6,11 +6,11 @@
 
 class daTagPati_c : public fopAc_ac_c {
 public:
-    /* 80D5D438 */ ~daTagPati_c();
-    /* 80D5D570 */ int create();
-    /* 80D5D78C */ int Execute();
-    /* 80D5D7C8 */ void col_set();
-    /* 80D5D830 */ u32 chk_CoHit();
+    ~daTagPati_c();
+    int create();
+    int Execute();
+    void col_set();
+    u32 chk_CoHit();
 
     u32 get_prm() {
         u32 retVal = fopAcM_GetParam(this) & 0xFF;
diff --git a/include/d/actor/d_a_tag_poFire.h b/include/d/actor/d_a_tag_poFire.h
index ae3c6ed3a1..9bc3fb8f52 100644
--- a/include/d/actor/d_a_tag_poFire.h
+++ b/include/d/actor/d_a_tag_poFire.h
@@ -6,11 +6,11 @@
 
 class daTagPoFire_c : public fopAc_ac_c {
 public:
-    /* 80D5DB38 */ void setBaseMtx();
-    /* 80D5DB90 */ int create();
-    /* 80D5DBF0 */ int Execute();
-    /* 80D5DC20 */ int Draw();
-    /* 80D5DC28 */ int Delete();
+    void setBaseMtx();
+    int create();
+    int Execute();
+    int Draw();
+    int Delete();
 
     void setFireFlag(u8 flag) { field_0x569 = flag; }
 
@@ -21,8 +21,8 @@ public:
 
 class daTagPoFire_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D5DACC */ daTagPoFire_HIO_c();
-    /* 80D5DCB0 */ virtual ~daTagPoFire_HIO_c();
+    daTagPoFire_HIO_c();
+    virtual ~daTagPoFire_HIO_c();
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_tag_push.h b/include/d/actor/d_a_tag_push.h
index 7769a9f93f..007c755f22 100644
--- a/include/d/actor/d_a_tag_push.h
+++ b/include/d/actor/d_a_tag_push.h
@@ -6,13 +6,13 @@
 
 class daTag_Push_c : public fopAc_ac_c {
 public:
-    /* 804902B8 */ static void* srchActor(void*, void*);
-    /* 80490418 */ int create();
-    /* 804904D4 */ int Delete();
-    /* 804904DC */ int Execute();
-    /* 804906BC */ int Draw();
-    /* 804906C4 */ int isDelete();
-    /* 80490724 */ int chkPointInArea(cXyz);
+    static void* srchActor(void*, void*);
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    int isDelete();
+    int chkPointInArea(cXyz);
 
     u32 getId() {
         u32 id = fopAcM_GetParam(this) >> 0x18;
@@ -56,7 +56,7 @@ public:
 
     /* 0x568 */ daNpcT_ActorMngr_c mActorMngr;
 
-    /* 804908CC */ virtual ~daTag_Push_c() {}
+    virtual ~daTag_Push_c() {}
 };
 
 STATIC_ASSERT(sizeof(daTag_Push_c) == 0x574);
diff --git a/include/d/actor/d_a_tag_qs.h b/include/d/actor/d_a_tag_qs.h
index a47e02f3da..832881d338 100644
--- a/include/d/actor/d_a_tag_qs.h
+++ b/include/d/actor/d_a_tag_qs.h
@@ -7,15 +7,15 @@
 
 class daTagQs_c : public fopAc_ac_c {
 public:
-    /* 80D5DE78 */ ~daTagQs_c();
-    /* 80D5DFB0 */ int create();
-    /* 80D5E1FC */ f32 getPower();
-    /* 80D5E220 */ f32 getSafeArea();
-    /* 80D5E244 */ f32 getPower80();
-    /* 80D5E268 */ f32 getCenterPower();
-    /* 80D5E28C */ f32 calcPower(f32, f32);
-    /* 80D5E9F8 */ int execute();
-    /* 80D5EBF8 */ int draw();
+    ~daTagQs_c();
+    int create();
+    f32 getPower();
+    f32 getSafeArea();
+    f32 getPower80();
+    f32 getCenterPower();
+    f32 calcPower(f32, f32);
+    int execute();
+    int draw();
 
     u8 getType() { return fopAcM_GetParamBit(this, 0, 1); }
     int getSwNo() { return fopAcM_GetParamBit(this, 1, 8); }
diff --git a/include/d/actor/d_a_tag_ret_room.h b/include/d/actor/d_a_tag_ret_room.h
index 099a235fe3..063f644d8f 100644
--- a/include/d/actor/d_a_tag_ret_room.h
+++ b/include/d/actor/d_a_tag_ret_room.h
@@ -6,14 +6,14 @@
 
 class daTagRetRm_c : public fopAc_ac_c {
 public:
-    /* 80D5EE98 */ daTagRetRm_c();
-    /* 80D5EED4 */ virtual ~daTagRetRm_c();
-    /* 80D5EF34 */ int create();
-    /* 80D5EF8C */ int Delete();
-    /* 80D5EF94 */ int draw();
-    /* 80D5EF9C */ int execute();
-    /* 80D5F010 */ void init();
-    /* 80D5F050 */ u8 chkPlyrInTag();
+    daTagRetRm_c();
+    virtual ~daTagRetRm_c();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    u8 chkPlyrInTag();
 
     /* 0x56C */ f32 field_0x56c;
     /* 0x570 */ f32 field_0x570;
diff --git a/include/d/actor/d_a_tag_river_back.h b/include/d/actor/d_a_tag_river_back.h
index 5009ff803b..9cbd1e603e 100644
--- a/include/d/actor/d_a_tag_river_back.h
+++ b/include/d/actor/d_a_tag_river_back.h
@@ -18,16 +18,16 @@ public:
         ACTION_DEAD_e,
     };
 
-    /* 80D5F2F8 */ int Create();
-    /* 80D5F360 */ int create();
-    /* 80D5F3F0 */ int execute();
-    /* 80D5F48C */ void event_proc_call();
-    /* 80D5F548 */ void actionWait();
-    /* 80D5F5BC */ void actionOrderEvent();
-    /* 80D5F66C */ void actionEvent();
-    /* 80D5F70C */ void actionDead();
-    /* 80D5F710 */ int demoProc();
-    /* 80D5F88C */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    int _delete();
 
     void setAction(u8 i_action) { mAction = i_action; }
 
diff --git a/include/d/actor/d_a_tag_rmbit_sw.h b/include/d/actor/d_a_tag_rmbit_sw.h
index 60025984d8..8b214533b9 100644
--- a/include/d/actor/d_a_tag_rmbit_sw.h
+++ b/include/d/actor/d_a_tag_rmbit_sw.h
@@ -5,14 +5,14 @@
 
 class daTagRmbitSw_c : public fopAc_ac_c {
 public:
-    /* 80D5FAF8 */ daTagRmbitSw_c();
-    /* 80D5FB34 */ virtual ~daTagRmbitSw_c();
-    /* 80D5FB94 */ int create();
-    /* 80D5FBEC */ int Delete();
-    /* 80D5FBF4 */ int draw();
-    /* 80D5FBFC */ int execute();
-    /* 80D5FDB8 */ void init();
-    /* 80D5FDF0 */ u8 chkPlyrInTag();
+    daTagRmbitSw_c();
+    virtual ~daTagRmbitSw_c();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    u8 chkPlyrInTag();
 
     s8 getArg0_RoomSaveTableNo() { return fopAcM_GetParamBit(this, 0, 8); }
     s8 getArg1_RoomNo() { return fopAcM_GetParamBit(this, 8, 8); }
diff --git a/include/d/actor/d_a_tag_setBall.h b/include/d/actor/d_a_tag_setBall.h
index e654a7c27c..6e75928c6b 100644
--- a/include/d/actor/d_a_tag_setBall.h
+++ b/include/d/actor/d_a_tag_setBall.h
@@ -7,12 +7,12 @@ class daTagSetBall_c : public fopAc_ac_c {
 public:
     daTagSetBall_c() {}
 
-    /* 80D601F8 */ void initBaseMtx();
-    /* 80D60218 */ void setBaseMtx();
-    /* 80D6021C */ int Create();
-    /* 80D6024C */ int create();
-    /* 80D602B4 */ int execute();
-    /* 80D602BC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
     s32 getType() { return mType; }
 
diff --git a/include/d/actor/d_a_tag_setrestart.h b/include/d/actor/d_a_tag_setrestart.h
index 616380f04b..73eb563ace 100644
--- a/include/d/actor/d_a_tag_setrestart.h
+++ b/include/d/actor/d_a_tag_setrestart.h
@@ -5,10 +5,10 @@
 
 class daTagRestart_c : public fopAc_ac_c {
 public:
-    /* 80D603F8 */ int Create();
-    /* 80D6048C */ int create();
-    /* 80D60560 */ int execute();
-    /* 80D60744 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int _delete();
 
     /* 0x568 */ s8 mPlayerRoomNo;
     /* 0x56C */ cXyz field_0x56c[4];
diff --git a/include/d/actor/d_a_tag_shop_camera.h b/include/d/actor/d_a_tag_shop_camera.h
index b4f9235dde..2c3f84ac02 100644
--- a/include/d/actor/d_a_tag_shop_camera.h
+++ b/include/d/actor/d_a_tag_shop_camera.h
@@ -5,14 +5,12 @@
 
 class daTag_ShopCamera_c : public fopAc_ac_c {
 public:
-    /* 80D60898 */ int create();
-    /* 80D608FC */ int Delete();
-    /* 80D60904 */ int Execute();
-    /* 80D6090C */ int Draw();
-    /* 80D60914 */ void initialize();
-    /* 80D60A18 */ virtual ~daTag_ShopCamera_c() {};
-
-    /* 0x568 */ u8 field_0x568[4];
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    void initialize();
+    virtual ~daTag_ShopCamera_c() {}
 };
 
 #endif /* D_A_TAG_SHOP_CAMERA_H */
diff --git a/include/d/actor/d_a_tag_shop_item.h b/include/d/actor/d_a_tag_shop_item.h
index 8d85c55ba5..826f867ad8 100644
--- a/include/d/actor/d_a_tag_shop_item.h
+++ b/include/d/actor/d_a_tag_shop_item.h
@@ -5,17 +5,17 @@
 
 class daTag_ShopItem_c : public fopAc_ac_c {
 public:
-    /* 80D60B78 */ int create();
-    /* 80D60D78 */ int Delete();
-    /* 80D60E04 */ int Execute();
-    /* 80D61024 */ int Draw();
-    /* 80D6102C */ u8 getType();
-    /* 80D61038 */ u8 getGroupID();
-    /* 80D61044 */ u8 getSwitchBit1();
-    /* 80D61050 */ u8 getSwitchBit2();
-    /* 80D6105C */ void initialize();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    u8 getType();
+    u8 getGroupID();
+    u8 getSwitchBit1();
+    u8 getSwitchBit2();
+    void initialize();
 
-    /* 80D61168 */ virtual ~daTag_ShopItem_c();
+    virtual ~daTag_ShopItem_c();
 
     u32 getProcessID() { return mProcessID; }
 
diff --git a/include/d/actor/d_a_tag_smk_emt.h b/include/d/actor/d_a_tag_smk_emt.h
index b46c7ff892..7ed60f332f 100644
--- a/include/d/actor/d_a_tag_smk_emt.h
+++ b/include/d/actor/d_a_tag_smk_emt.h
@@ -5,14 +5,14 @@
 
 class daTagSmkEmt_c : public fopAc_ac_c {
 public:
-    /* 80D612D8 */ daTagSmkEmt_c();
-    /* 80D61324 */ virtual ~daTagSmkEmt_c();
-    /* 80D61384 */ int create();
-    /* 80D613DC */ int Delete();
-    /* 80D61400 */ int draw();
-    /* 80D61408 */ int execute();
-    /* 80D61410 */ void createSmkEmt();
-    /* 80D61500 */ void deleteSmkEmt();
+    daTagSmkEmt_c();
+    virtual ~daTagSmkEmt_c();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void createSmkEmt();
+    void deleteSmkEmt();
 
     /* 0x56C */ JPABaseEmitter* mParticles[3];
 };
diff --git a/include/d/actor/d_a_tag_spinner.h b/include/d/actor/d_a_tag_spinner.h
index 99cf5644cb..b0d97dfb56 100644
--- a/include/d/actor/d_a_tag_spinner.h
+++ b/include/d/actor/d_a_tag_spinner.h
@@ -8,13 +8,13 @@ public:
     /* 0x568 */ f32 mRadius;
     /* 0x56c */ f32 field_0x56c;
 
-    /* 80D618A4 */ void initBaseMtx();
-    /* 80D618C4 */ void setBaseMtx();
-    /* 80D6191C */ int Create();
-    /* 80D6196C */ int CreateHeap();
-    /* 80D61974 */ int create();
-    /* 80D61A00 */ int execute();
-    /* 80D61AB4 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int CreateHeap();
+    int create();
+    int execute();
+    int _delete();
     f32 GetR() { return mRadius; }
 };
 
@@ -24,4 +24,4 @@ inline u8 getSwNo(daTagSpinner_c* pActor) {
 }
 }  // namespace daTagSpinner_prm
 
-#endif /* D_A_TAG_SPINNER_H */
\ No newline at end of file
+#endif /* D_A_TAG_SPINNER_H */
diff --git a/include/d/actor/d_a_tag_sppath.h b/include/d/actor/d_a_tag_sppath.h
index d32a0280fe..d2f8b62b65 100644
--- a/include/d/actor/d_a_tag_sppath.h
+++ b/include/d/actor/d_a_tag_sppath.h
@@ -7,10 +7,10 @@
 
 class daTagSppath_c : public fopAc_ac_c {
 public:
-    /* 80D61C18 */ int create();
-    /* 80D61EC4 */ ~daTagSppath_c();
-    /* 80D62024 */ int getNearPathPos(cXyz*, dPath*);
-    /* 80D629C0 */ int execute();
+    int create();
+    ~daTagSppath_c();
+    int getNearPathPos(cXyz*, dPath*);
+    int execute();
 
     dPath* getKeepPath() { return mpBestPath; }
     u16 getKeepPointNum() const { return mBestNo; }
diff --git a/include/d/actor/d_a_tag_spring.h b/include/d/actor/d_a_tag_spring.h
index 6fd1843ef0..4d6a50a9b0 100644
--- a/include/d/actor/d_a_tag_spring.h
+++ b/include/d/actor/d_a_tag_spring.h
@@ -5,13 +5,13 @@
 
 class daTagSpring_c : public fopAc_ac_c {
 public:
-    /* 805A6A58 */ void initBaseMtx();
-    /* 805A6A78 */ void setBaseMtx();
-    /* 805A6AD0 */ int Create();
-    /* 805A6AF4 */ int create();
-    /* 805A6B5C */ int execute();
-    /* 805A6C84 */ u8 checkArea();
-    /* 805A6DFC */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    int Create();
+    int create();
+    int execute();
+    u8 checkArea();
+    int _delete();
 
     u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
 
diff --git a/include/d/actor/d_a_tag_ss_drink.h b/include/d/actor/d_a_tag_ss_drink.h
index 50b3ddae03..4055bd3fc0 100644
--- a/include/d/actor/d_a_tag_ss_drink.h
+++ b/include/d/actor/d_a_tag_ss_drink.h
@@ -10,24 +10,24 @@ typedef int (daTag_SSDrink_c::*ProcessFunc)(void*);
 
 class daTag_SSDrink_c : public daObj_SSBase_c {
 public:
-    /* 80D62DB8 */ int create();
-    /* 80D62E5C */ int Delete();
-    /* 80D62E64 */ int Execute();
-    /* 80D62ED0 */ int Draw();
-    /* 80D62ED8 */ int getTypeFromParam();
-    /* 80D62F80 */ u8 getSwitchFromParam();
-    /* 80D62F8C */ u16 getFlowNodeNum();
-    /* 80D62FC8 */ u16 getValue();
-    /* 80D62FD4 */ void restart();
-    /* 80D63044 */ void initialize();
-    /* 80D630BC */ int checkProcess(ProcessFunc);
-    /* 80D630E8 */ int setProcess(ProcessFunc);
-    /* 80D631D4 */ void setAttnPos();
-    /* 80D63208 */ int chkEvent();
-    /* 80D63384 */ int orderEvent();
-    /* 80D63490 */ int wait(void*);
-    /* 80D635C8 */ int talk(void*);
-    /* 80D63724 */ ~daTag_SSDrink_c();
+    int create();
+    int Delete();
+    int Execute();
+    int Draw();
+    int getTypeFromParam();
+    u8 getSwitchFromParam();
+    u16 getFlowNodeNum();
+    u16 getValue();
+    void restart();
+    void initialize();
+    int checkProcess(ProcessFunc);
+    int setProcess(ProcessFunc);
+    void setAttnPos();
+    int chkEvent();
+    int orderEvent();
+    int wait(void*);
+    int talk(void*);
+    ~daTag_SSDrink_c();
 
     s32 fopAcM_seenPlayerAngleY() { return fopAcM_seenActorAngleY(this, dComIfGp_getPlayer(0)); }
     bool checkShopOil() const { return field_0x5D2 == 4; }
diff --git a/include/d/actor/d_a_tag_statue_evt.h b/include/d/actor/d_a_tag_statue_evt.h
index 732375d5a5..596d820e65 100644
--- a/include/d/actor/d_a_tag_statue_evt.h
+++ b/include/d/actor/d_a_tag_statue_evt.h
@@ -5,25 +5,25 @@
 
 class daTagStatue_c : public fopAc_ac_c {
 public:
-    /* 805A6FC4 */ void initBaseMtx();
-    /* 805A7000 */ void setBaseMtx();
-    /* 805A7068 */ cPhs__Step Create();
-    /* 805A7230 */ int CreateHeap();
-    /* 805A7424 */ cPhs__Step create();
-    /* 805A7514 */ int execute();
-    /* 805A759C */ void event_proc_call();
-    /* 805A76AC */ void actionWait();
-    /* 805A7714 */ void actionOrderEvent();
-    /* 805A77A0 */ void actionEvent();
-    /* 805A7848 */ void actionDead();
-    /* 805A784C */ int demoProc();
-    /* 805A7A68 */ void setParticle();
-    /* 805A7B24 */ void endParticle();
-    /* 805A7B78 */ BOOL checkStartDemo();
-    /* 805A7CD0 */ BOOL checkOnEffect();
-    /* 805A7E94 */ s32 getLetterCount();
-    /* 805A7F0C */ int draw();
-    /* 805A7FF8 */ int _delete();
+    void initBaseMtx();
+    void setBaseMtx();
+    cPhs__Step Create();
+    int CreateHeap();
+    cPhs__Step create();
+    int execute();
+    void event_proc_call();
+    void actionWait();
+    void actionOrderEvent();
+    void actionEvent();
+    void actionDead();
+    int demoProc();
+    void setParticle();
+    void endParticle();
+    BOOL checkStartDemo();
+    BOOL checkOnEffect();
+    s32 getLetterCount();
+    int draw();
+    int _delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mArcPhase;
@@ -78,4 +78,4 @@ private:
     }
 };
 
-#endif /* D_A_TAG_STATUE_EVT_H */
\ No newline at end of file
+#endif /* D_A_TAG_STATUE_EVT_H */
diff --git a/include/d/actor/d_a_tag_stream.h b/include/d/actor/d_a_tag_stream.h
index 679523513b..6405de3412 100644
--- a/include/d/actor/d_a_tag_stream.h
+++ b/include/d/actor/d_a_tag_stream.h
@@ -29,9 +29,9 @@ public:
         return mPower;
     }
 
-    /* 80D638F8 */ int create();
-    /* 80D63A98 */ ~daTagStream_c();
-    /* 80D63B58 */ int execute();
+    int create();
+    ~daTagStream_c();
+    int execute();
     int checkArea(cXyz const*);
 
     /* 0x568 */ u8 mPriority;
diff --git a/include/d/actor/d_a_tag_theB_hint.h b/include/d/actor/d_a_tag_theB_hint.h
index 25d708f1a0..cd80a3e5e7 100644
--- a/include/d/actor/d_a_tag_theB_hint.h
+++ b/include/d/actor/d_a_tag_theB_hint.h
@@ -7,43 +7,43 @@
 
 // needs to be pulled from d_a_npc_theB.h eventually
 struct daNpcTheB_c {
-    /* 80AFC76C */ daNpcTheB_c();
-    /* 80AFC980 */ ~daNpcTheB_c();
-    /* 80AFCB44 */ void create();
-    /* 80AFCD98 */ void CreateHeap();
-    /* 80AFD1FC */ void Delete();
-    /* 80AFD230 */ void Execute();
-    /* 80AFD250 */ void Draw();
-    /* 80AFD2A8 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 80AFD49C */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80AFD4BC */ void ctrlJointCallBack(J3DJoint*, int);
-    /* 80AFD508 */ void getHandPos1(int);
-    /* 80AFD5F0 */ void getHandPos2(int);
-    /* 80AFD6D8 */ void setHintEvent(s32, u16, int);
-    /* 80AFD6F0 */ void main();
-    /* 80AFD938 */ void setParam();
-    /* 80AFDAA4 */ void ctrlBtk();
-    /* 80AFDB70 */ void setAttnPos();
-    /* 80AFDEC0 */ void setExpressionAnm(int, bool);
-    /* 80AFE0BC */ void setExpressionBtp(int);
-    /* 80AFE1BC */ bool setMotionAnm(int, f32);
-    /* 80AFE398 */ bool drawDbgInfo();
-    /* 80AFE3A0 */ void reset();
-    /* 80AFE574 */ void playExpression();
-    /* 80AFE704 */ void playMotion();
-    /* 80AFE920 */ void doNormalAction();
-    /* 80AFEA14 */ void doEvent();
-    /* 80AFED24 */ void lookat();
-    /* 80AFEECC */ void wait(void*);
-    /* 80AFF45C */ void setMotion(int, f32, int);
-    /* 80AFF4A0 */ void setExpression(int, f32);
-    /* 80AFF4CC */ void talk(void*);
-    /* 80AFF6AC */ void EvCut_PersonalCombatIntro(int);
-    /* 80AFF888 */ void EvCut_PersonalCombatRevenge(int);
-    /* 80AFFBB4 */ void EvCut_PersonalCombatAfter();
-    /* 80AFFEF4 */ void EvCut_AnnulationFieldRace(int);
-    /* 80AFFFE0 */ void EvCut_TheBHint(int);
-    /* 80B00204 */ void EvCut_CoachGuardGameOver(int);
+    daNpcTheB_c();
+    ~daNpcTheB_c();
+    void create();
+    void CreateHeap();
+    void Delete();
+    void Execute();
+    void Draw();
+    void ctrlJoint(J3DJoint*, J3DModel*);
+    void createHeapCallBack(fopAc_ac_c*);
+    void ctrlJointCallBack(J3DJoint*, int);
+    void getHandPos1(int);
+    void getHandPos2(int);
+    void setHintEvent(s32, u16, int);
+    void main();
+    void setParam();
+    void ctrlBtk();
+    void setAttnPos();
+    void setExpressionAnm(int, bool);
+    void setExpressionBtp(int);
+    bool setMotionAnm(int, f32);
+    bool drawDbgInfo();
+    void reset();
+    void playExpression();
+    void playMotion();
+    void doNormalAction();
+    void doEvent();
+    void lookat();
+    void wait(void*);
+    void setMotion(int, f32, int);
+    void setExpression(int, f32);
+    void talk(void*);
+    void EvCut_PersonalCombatIntro(int);
+    void EvCut_PersonalCombatRevenge(int);
+    void EvCut_PersonalCombatAfter();
+    void EvCut_AnnulationFieldRace(int);
+    void EvCut_TheBHint(int);
+    void EvCut_CoachGuardGameOver(int);
 
     static u8 mEvtSeqList[72];
 };
diff --git a/include/d/actor/d_a_tag_wara_howl.h b/include/d/actor/d_a_tag_wara_howl.h
index 29e46103ca..4331a3312e 100644
--- a/include/d/actor/d_a_tag_wara_howl.h
+++ b/include/d/actor/d_a_tag_wara_howl.h
@@ -5,15 +5,15 @@
 
 class daTagWrHowl_c : public fopAc_ac_c {
 public:
-    /* 80D63F38 */ daTagWrHowl_c();
-    /* 80D63FD4 */ int create();
-    /* 80D6402C */ int Delete();
-    /* 80D64034 */ int draw();
-    /* 80D6403C */ int execute();
-    /* 80D64090 */ void init();
-    /* 80D640B4 */ bool chkWlfInTag();
+    daTagWrHowl_c();
+    int create();
+    int Delete();
+    int draw();
+    int execute();
+    void init();
+    bool chkWlfInTag();
 
-    /* 80D63F74 */ virtual ~daTagWrHowl_c();
+    virtual ~daTagWrHowl_c();
 
     s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
 
diff --git a/include/d/actor/d_a_tag_watchge.h b/include/d/actor/d_a_tag_watchge.h
index f91bd1ea47..98e4abcc90 100644
--- a/include/d/actor/d_a_tag_watchge.h
+++ b/include/d/actor/d_a_tag_watchge.h
@@ -10,13 +10,13 @@ public:
         return mGroupNo;
     }
 
-    /* 80D642D8 */ int draw();
-    /* 80D64338 */ int execute();
-    /* 80D643F8 */ int create();
+    int draw();
+    int execute();
+    int create();
 
     /* 0x568 */ u8 field_0x568;
     /* 0x569 */ u8 mGroupNo;
     /* 0x56A */ u8 field_0x56a;
 };
 
-#endif /* D_A_TAG_WATCHGE_H */
\ No newline at end of file
+#endif /* D_A_TAG_WATCHGE_H */
diff --git a/include/d/actor/d_a_tag_waterfall.h b/include/d/actor/d_a_tag_waterfall.h
index b3ef34651d..26c1bc040c 100644
--- a/include/d/actor/d_a_tag_waterfall.h
+++ b/include/d/actor/d_a_tag_waterfall.h
@@ -14,13 +14,13 @@ class daTagWaterFall_c : public fopAc_ac_c {
 public:
     daTagWaterFall_c() {}
 
-    /* 80D64680 */ int draw();
-    /* 80D64724 */ f32 getEllipseY(f32);
-    /* 80D64768 */ bool checkHitWaterFall(cXyz);
-    /* 80D6486C */ bool checkHitWaterFallCamera();
-    /* 80D648B4 */ int execute();
-    /* 80D64AE0 */ int _delete();
-    /* 80D64B20 */ cPhs__Step create();
+    int draw();
+    f32 getEllipseY(f32);
+    bool checkHitWaterFall(cXyz);
+    bool checkHitWaterFallCamera();
+    int execute();
+    int _delete();
+    cPhs__Step create();
 
 private:
     /* 0x568 */ f32 mCylinderRadiusA;
@@ -37,8 +37,8 @@ private:
 
 struct daTagWaterFall_HIO_c {
 public:
-    /* 80D6462C */ daTagWaterFall_HIO_c();
-    /* 80D64CDC */ virtual ~daTagWaterFall_HIO_c();
+    daTagWaterFall_HIO_c();
+    virtual ~daTagWaterFall_HIO_c();
 
     /* 0x00 */ /* vtable */
 
diff --git a/include/d/actor/d_a_tag_wljump.h b/include/d/actor/d_a_tag_wljump.h
index d0160bea61..e6c493298a 100644
--- a/include/d/actor/d_a_tag_wljump.h
+++ b/include/d/actor/d_a_tag_wljump.h
@@ -8,10 +8,10 @@ struct dPath;
 
 class daTagWljump_c : public fopAc_ac_c {
 public:
-    /* 80D64EB8 */ int create();
-    /* 80D65004 */ ~daTagWljump_c();
-    /* 80D65090 */ int execute();
-    /* 80D6589C */ int draw();
+    int create();
+    ~daTagWljump_c();
+    int execute();
+    int draw();
 
     const cXyz* getLockPos() const {
         if (field_0x568 < 0) {
diff --git a/include/d/actor/d_a_tag_yami.h b/include/d/actor/d_a_tag_yami.h
index 094a993285..0af2271e6b 100644
--- a/include/d/actor/d_a_tag_yami.h
+++ b/include/d/actor/d_a_tag_yami.h
@@ -6,15 +6,15 @@
 
 class daTagYami_c : public fopAc_ac_c {
 public:
-    /* 80D659F8 */ int create();
-    /* 80D65C24 */ int Execute();
-    /* 80D65C60 */ void calcCoC(cXyz&);
-    /* 80D65D08 */ void col_set();
-    /* 80D65D0C */ u32 chk_CoHit();
-    /* 80D65D60 */ f32 getPlDist();
-    /* 80D65EEC */ void onMidnaTagSw();
-    /* 80D65F24 */ void offMidnaTagSw2();
-    /* 80D66100 */ void setCoC(cXyz i_coC) { mCoC = i_coC; }
+    int create();
+    int Execute();
+    void calcCoC(cXyz&);
+    void col_set();
+    u32 chk_CoHit();
+    f32 getPlDist();
+    void onMidnaTagSw();
+    void offMidnaTagSw2();
+    void setCoC(cXyz i_coC) { mCoC = i_coC; }
 
     u8 get_MTagSw() { return fopAcM_GetParamBit(this, 8, 8); }
     u8 get_MTagSw2() { return fopAcM_GetParamBit(this, 16, 8); }
diff --git a/include/d/actor/d_a_talk.h b/include/d/actor/d_a_talk.h
index 233217a31d..9c86f88610 100644
--- a/include/d/actor/d_a_talk.h
+++ b/include/d/actor/d_a_talk.h
@@ -14,13 +14,13 @@
  */
 class daTalk_c : public fopAc_ac_c {
 public:
-    /* 80D66378 */ ~daTalk_c();
-    /* 80D663E4 */ int create();
-    /* 80D664AC */ int execute();
-    /* 80D6665C */ int draw();
-    /* 80D66664 */ void setStatus(u16);
-    /* 80D66688 */ u16 getStatus();
-    /* 80D666A8 */ u32 messageSet();
+    ~daTalk_c();
+    int create();
+    int execute();
+    int draw();
+    void setStatus(u16);
+    u16 getStatus();
+    u32 messageSet();
 
 private:
     /* 0x568 */ dMsgFlow_c mMsgFlow;
diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h
index 2341edd33c..d6577a8493 100644
--- a/include/d/actor/d_a_tbox.h
+++ b/include/d/actor/d_a_tbox.h
@@ -57,76 +57,76 @@ public:
         MODE_EXEC = 1,
     };
 
-    /* 80490E50 */ daTbox_ModelInfo* getModelInfo();
-    /* 80490E6C */ cPhs__Step commonShapeSet();
-    /* 804911B8 */ cPhs__Step effectShapeSet();
-    /* 804911C0 */ cPhs__Step envShapeSet();
-    /* 804911C8 */ cPhs__Step bgCheckSet();
-    /* 8049129C */ void lightReady();
-    /* 804912EC */ void setLightPos();
-    /* 8049135C */ int checkEnv();
-    /* 80491364 */ int checkAppear();
-    /* 8049139C */ int checkOpen();
-    /* 804913D0 */ void clrDzb();
-    /* 8049141C */ void setDzb();
-    /* 80491484 */ void surfaceProc();
-    /* 80491544 */ int checkNormal();
-    /* 804915BC */ int checkEnvEffectTbox();
-    /* 80491624 */ u32 calcHeapSize();
-    /* 804916A4 */ int CreateHeap();
-    /* 80491744 */ void CreateInit();
-    /* 804919B0 */ void initPos();
-    /* 80491BB0 */ void initAnm();
-    /* 80491F68 */ int boxCheck();
-    /* 804920A8 */ void demoProcOpen();
-    /* 8049216C */ void lightColorProc();
-    /* 8049233C */ void environmentProc();
-    /* 80492398 */ void lightUpProc();
-    /* 804923D4 */ void lightDownProc();
-    /* 80492408 */ void dropProcInitCall();
-    /* 80492450 */ void dropProcInit();
-    /* 804928DC */ int calcJumpGoalAndAngle(cXyz*, s16*);
-    /* 80492B10 */ bool getDropSAngle(s16*);
-    /* 80492BC8 */ int getDir();
-    /* 80492C84 */ void setRotAxis(cXyz const*, cXyz const*);
-    /* 80492D08 */ void dropProcInit2();
-    /* 80492F50 */ void dropProc();
-    /* 80493338 */ void demoInitAppear();
-    /* 80493484 */ void demoProcAppear();
-    /* 80493518 */ int demoProc();
-    /* 80493838 */ void OpenInit_com();
-    /* 804939A4 */ void OpenInit();
-    /* 804939F4 */ int actionWait();
-    /* 804939FC */ int actionDemo();
-    /* 80493CC8 */ int actionDemo2();
-    /* 80493D90 */ int actionDropDemo();
-    /* 80493ED8 */ u8 getBombItemNo(u8, u8);
-    /* 80493FE8 */ u8 getBombItemNo2(u8, u8, u8);
-    /* 80494144 */ u8 getBombItemNo3(u8, u8, u8, u8);
-    /* 804942CC */ u8 getBombItemNoMain(u8);
-    /* 804945C8 */ int setGetDemoItem();
-    /* 804946A4 */ int actionOpenWait();
-    /* 804948CC */ int actionNotOpenDemo();
-    /* 80494950 */ int checkDrop();
-    /* 80494A0C */ void settingDropDemoCamera();
-    /* 80494D88 */ int actionSwOnWait();
-    /* 80494E98 */ int actionSwOnWait2();
-    /* 80494F44 */ int actionDropWait();
-    /* 80495058 */ int actionGenocide();
-    /* 8049518C */ int actionDropWaitForWeb();
-    /* 80495250 */ int actionDropForWeb();
-    /* 804953D4 */ void initBaseMtx();
-    /* 80495490 */ void setBaseMtx();
-    /* 80495660 */ void mode_proc_call();
-    /* 804956EC */ void mode_exec_wait();
-    /* 80495818 */ void mode_exec();
-    /* 80495910 */ cPhs__Step create1st();
-    /* 804959EC */ int Execute(Mtx**);
-    /* 80495AF0 */ int Draw();
-    /* 80495C9C */ int Delete();
-    /* 804961B0 */ int Create() { return true; }
+    daTbox_ModelInfo* getModelInfo();
+    cPhs__Step commonShapeSet();
+    cPhs__Step effectShapeSet();
+    cPhs__Step envShapeSet();
+    cPhs__Step bgCheckSet();
+    void lightReady();
+    void setLightPos();
+    int checkEnv();
+    int checkAppear();
+    int checkOpen();
+    void clrDzb();
+    void setDzb();
+    void surfaceProc();
+    int checkNormal();
+    int checkEnvEffectTbox();
+    u32 calcHeapSize();
+    int CreateHeap();
+    void CreateInit();
+    void initPos();
+    void initAnm();
+    int boxCheck();
+    void demoProcOpen();
+    void lightColorProc();
+    void environmentProc();
+    void lightUpProc();
+    void lightDownProc();
+    void dropProcInitCall();
+    void dropProcInit();
+    int calcJumpGoalAndAngle(cXyz*, s16*);
+    bool getDropSAngle(s16*);
+    int getDir();
+    void setRotAxis(cXyz const*, cXyz const*);
+    void dropProcInit2();
+    void dropProc();
+    void demoInitAppear();
+    void demoProcAppear();
+    int demoProc();
+    void OpenInit_com();
+    void OpenInit();
+    int actionWait();
+    int actionDemo();
+    int actionDemo2();
+    int actionDropDemo();
+    u8 getBombItemNo(u8, u8);
+    u8 getBombItemNo2(u8, u8, u8);
+    u8 getBombItemNo3(u8, u8, u8, u8);
+    u8 getBombItemNoMain(u8);
+    int setGetDemoItem();
+    int actionOpenWait();
+    int actionNotOpenDemo();
+    int checkDrop();
+    void settingDropDemoCamera();
+    int actionSwOnWait();
+    int actionSwOnWait2();
+    int actionDropWait();
+    int actionGenocide();
+    int actionDropWaitForWeb();
+    int actionDropForWeb();
+    void initBaseMtx();
+    void setBaseMtx();
+    void mode_proc_call();
+    void mode_exec_wait();
+    void mode_exec();
+    cPhs__Step create1st();
+    int Execute(Mtx**);
+    int Draw();
+    int Delete();
+    int Create() { return true; }
 
-    /* 804961B8 */ virtual BOOL checkSmallTbox() { return TRUE; }
+    virtual BOOL checkSmallTbox() { return TRUE; }
 
     u32 getEvent() { return fopAcM_GetParam(this) >> 24; }
     int getShapeType() { return (fopAcM_GetParam(this) >> 20) & 0xf; }
@@ -199,8 +199,8 @@ STATIC_ASSERT(sizeof(daTbox_c) == 0xA30);
 
 class daTbox_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80490D2C */ daTbox_HIO_c();
-    /* 804960B8 */ virtual ~daTbox_HIO_c() {}
+    daTbox_HIO_c();
+    virtual ~daTbox_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_tbox2.h b/include/d/actor/d_a_tbox2.h
index f184bf6929..3f176ade5e 100644
--- a/include/d/actor/d_a_tbox2.h
+++ b/include/d/actor/d_a_tbox2.h
@@ -37,32 +37,32 @@ public:
         EVACT_OPEN_SHORT_e,
     };
 
-    /* 80496A18 */ void initBaseMtx();
-    /* 80496A54 */ void setBaseMtx();
-    /* 80496E3C */ int create1st();
-    /* 8049724C */ int demoProc();
-    /* 80497478 */ void openInit();
-    /* 804975EC */ void mode_proc_call();
-    /* 80497678 */ void mode_exec_wait();
-    /* 80497790 */ void mode_exec();
-    /* 8049780C */ void action();
-    /* 804978C8 */ void init_actionWait();
-    /* 804978D4 */ void actionWait();
-    /* 804978D8 */ void init_actionNotOpenDemo();
-    /* 804978E4 */ void actionNotOpenDemo();
-    /* 8049794C */ void init_actionOpenDemo();
-    /* 80497958 */ void actionOpenDemo();
-    /* 80497A0C */ void init_actionOpenWait();
-    /* 80497A18 */ void actionOpenWait();
-    /* 80497BD0 */ int setGetDemoItem();
-    /* 80497C60 */ BOOL boxCheck();
+    void initBaseMtx();
+    void setBaseMtx();
+    int create1st();
+    int demoProc();
+    void openInit();
+    void mode_proc_call();
+    void mode_exec_wait();
+    void mode_exec();
+    void action();
+    void init_actionWait();
+    void actionWait();
+    void init_actionNotOpenDemo();
+    void actionNotOpenDemo();
+    void init_actionOpenDemo();
+    void actionOpenDemo();
+    void init_actionOpenWait();
+    void actionOpenWait();
+    int setGetDemoItem();
+    BOOL boxCheck();
 
-    /* 80496C20 */ virtual int CreateHeap();
-    /* 80496AB8 */ virtual int Create();
-    /* 80497500 */ virtual int Execute(Mtx**);
-    /* 80497DA0 */ virtual int Draw();
-    /* 80497E6C */ virtual int Delete();
-    /* 80498140 */ virtual BOOL checkSmallTbox() { return true; }
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual BOOL checkSmallTbox() { return true; }
 
     u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
     u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); }
diff --git a/include/d/actor/d_a_tboxSw.h b/include/d/actor/d_a_tboxSw.h
index 50222e63a8..3128320abd 100644
--- a/include/d/actor/d_a_tboxSw.h
+++ b/include/d/actor/d_a_tboxSw.h
@@ -13,11 +13,11 @@
  */
 class daTboxSw_c : public fopAc_ac_c {
 public:
-    /* 80D66858 */ int Create();
-    /* 80D66860 */ int create();
-    /* 80D668C8 */ int execute();
-    /* 80D66938 */ int draw();
-    /* 80D66940 */ int _delete();
+    int Create();
+    int create();
+    int execute();
+    int draw();
+    int _delete();
 };
 
 STATIC_ASSERT(sizeof(daTboxSw_c) == 0x568);
diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h
index fdaf89a6bb..2e498c8d2e 100644
--- a/include/d/actor/d_a_title.h
+++ b/include/d/actor/d_a_title.h
@@ -6,8 +6,8 @@
 
 class dDlst_daTitle_c : public dDlst_base_c {
 public:
-    /* 80D679C8 */ virtual void draw();
-    /* 80D67B30 */ virtual ~dDlst_daTitle_c() {}
+    virtual void draw();
+    virtual ~dDlst_daTitle_c() {}
 
     /* 0x4 */ J2DScreen* Scr;
 };
@@ -26,26 +26,26 @@ class CPaneMgrAlpha;
 class daTitle_c : public fopAc_ac_c {
 public:
     //daTitle_c() {}
-    /* 80D66B54 */ int CreateHeap();
-    /* 80D66CDC */ int create();
-    /* 80D66E7C */ static int createHeapCallBack(fopAc_ac_c*);
-    /* 80D66E9C */ int Execute();
-    /* 80D66F34 */ void KeyWaitAnm();
-    /* 80D67010 */ void loadWait_init();
-    /* 80D6701C */ void loadWait_proc();
-    /* 80D672E0 */ void logoDispWaitInit();
-    /* 80D672EC */ void logoDispWait();
-    /* 80D67350 */ void logoDispAnmInit();
-    /* 80D6737C */ void logoDispAnm();
-    /* 80D674A8 */ void keyWaitInit();
-    /* 80D674B4 */ void keyWait();
-    /* 80D67544 */ void nextScene_init();
-    /* 80D67550 */ void nextScene_proc();
-    /* 80D675EC */ void fastLogoDispInit();
-    /* 80D676AC */ void fastLogoDisp();
-    /* 80D676F4 */ int getDemoPrm();
-    /* 80D67768 */ int Draw();
-    /* 80D6786C */ int Delete();
+    int CreateHeap();
+    int create();
+    static int createHeapCallBack(fopAc_ac_c*);
+    int Execute();
+    void KeyWaitAnm();
+    void loadWait_init();
+    void loadWait_proc();
+    void logoDispWaitInit();
+    void logoDispWait();
+    void logoDispAnmInit();
+    void logoDispAnm();
+    void keyWaitInit();
+    void keyWait();
+    void nextScene_init();
+    void nextScene_proc();
+    void fastLogoDispInit();
+    void fastLogoDisp();
+    int getDemoPrm();
+    int Draw();
+    int Delete();
 
 private:
     /* 0x568 */ request_of_phase_process_class mPhaseReq;
diff --git a/include/d/actor/d_a_warp_bug.h b/include/d/actor/d_a_warp_bug.h
index a2f4d26b59..85069101e8 100644
--- a/include/d/actor/d_a_warp_bug.h
+++ b/include/d/actor/d_a_warp_bug.h
@@ -15,8 +15,8 @@ class daWarpBug_c : public fopAc_ac_c {
 public:
     inline ~daWarpBug_c();
 
-    /* 80D67E38 */ void create_init();
-    /* 80D68068 */ int draw();
+    void create_init();
+    int draw();
 
     inline int createHeap();
     inline int execute();
diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h
index 43ff22d1da..d9f2ff5d04 100644
--- a/include/d/actor/d_a_ykgr.h
+++ b/include/d/actor/d_a_ykgr.h
@@ -10,9 +10,9 @@
 
 struct dPa_YkgrPcallBack : public JPAParticleCallBack {
     dPa_YkgrPcallBack();
-    /* 805A8E3C */ ~dPa_YkgrPcallBack() {}
-    /* 805A848C */ void draw(JPABaseEmitter*, JPABaseParticle*);
-    /* 805A84D4 */ void setParam(f32);
+    ~dPa_YkgrPcallBack() {}
+    void draw(JPABaseEmitter*, JPABaseParticle*);
+    void setParam(f32);
 
     /* 0x04 */ f32 field_0x4[2][3];
     /* 0x1C */ s8 field_0x1c;
diff --git a/include/d/d_a_item_static.h b/include/d/d_a_item_static.h
index 8eee05b376..5e206e8d8a 100644
--- a/include/d/d_a_item_static.h
+++ b/include/d/d_a_item_static.h
@@ -50,60 +50,60 @@ public:
     };
 
     daItem_c() : mSparkleEmtr(0, 0) {}
-    /* 8015B0C4 */ void initBaseMtx();
-    /* 8015B108 */ void setBaseMtx();
-    /* 8015B190 */ void setBaseMtx_0();
-    /* 8015B1C8 */ void setBaseMtx_1();
-    /* 8015B3D8 */ void CreateInit();
-    /* 8015B7BC */ void setCullInfo();
-    /* 8015B7D4 */ int _daItem_create();
-    /* 8015BA9C */ int _daItem_execute();
-    /* 8015BD84 */ int _daItem_draw();
-    /* 8015BDE8 */ int _daItem_delete();
-    /* 8015BE60 */ void procInitNormal();
-    /* 8015BEA4 */ void procMainNormal();
-    /* 8015BFE8 */ void procMainEnemyCarry();
-    /* 8015BFEC */ void procInitForceGet();
-    /* 8015C038 */ void procMainForceGet();
-    /* 8015C058 */ void procInitSimpleGetDemo();
-    /* 8015C134 */ void procMainSimpleGetDemo();
-    /* 8015C200 */ void procInitGetDemoEvent();
-    /* 8015C2A4 */ void procWaitGetDemoEvent();
-    /* 8015C3BC */ void procMainGetDemoEvent();
-    /* 8015C41C */ void procInitBoomerangCarry();
-    /* 8015C514 */ void procMainBoomerangCarry();
-    /* 8015C5F4 */ void procInitSwOnWait();
-    /* 8015C648 */ void procMainSwOnWait();
-    /* 8015C708 */ void procInitBoomHitWait();
-    /* 8015C738 */ void procMainBoomHitWait();
-    /* 8015CAB8 */ void move_proc_call();
-    /* 8015CC4C */ void mode_wait_init();
-    /* 8015CC88 */ void mode_water_init();
-    /* 8015CCD0 */ void mode_wait();
-    /* 8015CDCC */ void mode_water();
-    /* 8015CEEC */ void itemGetNextExecute();
-    /* 8015D0A8 */ void itemGet();
-    /* 8015D370 */ BOOL checkCountTimer();
-    /* 8015D3CC */ BOOL checkPlayerGet();
-    /* 8015D410 */ void checkYogan();
-    /* 8015D480 */ void deleteItem();
-    /* 8015D4AC */ int itemActionForRupee();
-    /* 8015D56C */ int itemActionForHeart();
-    /* 8015D688 */ int itemActionForArrow();
-    /* 8015D700 */ int itemActionForBoomerang();
-    /* 8015D734 */ void bg_check();
-    /* 8015D834 */ void set_bound_se();
-    /* 8015D95C */ int CountTimer();
-    /* 8015D9F0 */ int initAction();
-    /* 8015DAAC */ void initFlag();
-    /* 8015DBF0 */ void initScale();
-    /* 8015DC40 */ void initSpeed(int);
-    /* 8015DE38 */ void initAngle();
+    void initBaseMtx();
+    void setBaseMtx();
+    void setBaseMtx_0();
+    void setBaseMtx_1();
+    void CreateInit();
+    void setCullInfo();
+    int _daItem_create();
+    int _daItem_execute();
+    int _daItem_draw();
+    int _daItem_delete();
+    void procInitNormal();
+    void procMainNormal();
+    void procMainEnemyCarry();
+    void procInitForceGet();
+    void procMainForceGet();
+    void procInitSimpleGetDemo();
+    void procMainSimpleGetDemo();
+    void procInitGetDemoEvent();
+    void procWaitGetDemoEvent();
+    void procMainGetDemoEvent();
+    void procInitBoomerangCarry();
+    void procMainBoomerangCarry();
+    void procInitSwOnWait();
+    void procMainSwOnWait();
+    void procInitBoomHitWait();
+    void procMainBoomHitWait();
+    void move_proc_call();
+    void mode_wait_init();
+    void mode_water_init();
+    void mode_wait();
+    void mode_water();
+    void itemGetNextExecute();
+    void itemGet();
+    BOOL checkCountTimer();
+    BOOL checkPlayerGet();
+    void checkYogan();
+    void deleteItem();
+    int itemActionForRupee();
+    int itemActionForHeart();
+    int itemActionForArrow();
+    int itemActionForBoomerang();
+    void bg_check();
+    void set_bound_se();
+    int CountTimer();
+    int initAction();
+    void initFlag();
+    void initScale();
+    void initSpeed(int);
+    void initAngle();
     u32 startCtrl();
     u32 startControl();
     u32 endControl();
 
-    /* 8015CE94 */ virtual void setTevStr();
+    virtual void setTevStr();
 
     void setStatus(u8 status) { mStatus = status; }
     int getStatus() { return mStatus; }
diff --git a/include/d/d_a_shop_item_static.h b/include/d/d_a_shop_item_static.h
index 51d7592197..c7462ef752 100644
--- a/include/d/d_a_shop_item_static.h
+++ b/include/d/d_a_shop_item_static.h
@@ -47,26 +47,26 @@ struct ResourceData {
 
 class daShopItem_c : public daItemBase_c {
 public:
-    /* 80037C14 */ csXyz* getRotateP();
-    /* 80037C1C */ cXyz* getPosP();
-    /* 8059E9B8 */ const char* getShopArcname();
-    /* 8059EC04 */ u16 getHeapSize();
-    /* 8059EC1C */ void CreateInit();
-    /* 8059ED58 */ void set_mtx();
-    /* 8059EEF4 */ bool _execute();
-    /* 8059EF48 */ bool _draw();
+    csXyz* getRotateP();
+    cXyz* getPosP();
+    const char* getShopArcname();
+    u16 getHeapSize();
+    void CreateInit();
+    void set_mtx();
+    bool _execute();
+    bool _draw();
 
     inline int _create();
     inline int _delete();
     
-    /* 8059EF9C */ virtual void setListStart();
-    /* 8059EFA0 */ virtual void setShadow();
-    /* 8059F024 */ virtual BOOL chkFlag(int);
-    /* 8059F044 */ virtual s8 getTevFrm();
-    /* 8059F064 */ virtual s8 getBtpFrm();
-    /* 8059F084 */ virtual u8 getShadowSize();
-    /* 8059F0A0 */ virtual u8 getCollisionH();
-    /* 8059F0BC */ virtual u8 getCollisionR();
+    virtual void setListStart();
+    virtual void setShadow();
+    virtual BOOL chkFlag(int);
+    virtual s8 getTevFrm();
+    virtual s8 getBtpFrm();
+    virtual u8 getShadowSize();
+    virtual u8 getCollisionH();
+    virtual u8 getCollisionR();
 
     u8 getShopItemID() const { return mShopItemID; }
     s16 getAngleX() const { return mAngleX; }
diff --git a/include/d/d_attention.h b/include/d/d_attention.h
index 865bd1baf1..7c32803f68 100644
--- a/include/d/d_attention.h
+++ b/include/d/d_attention.h
@@ -10,11 +10,11 @@ class fopAc_ac_c;
 
 class dAttHint_c {
 public:
-    /* 800738B4 */ fpc_ProcID getPId(void*);
-    /* 800738CC */ fopAc_ac_c* convPId(fpc_ProcID);
-    /* 800738FC */ int request(fopAc_ac_c*, int);
-    /* 80073958 */ void init();
-    /* 80073970 */ void proc();
+    fpc_ProcID getPId(void*);
+    fopAc_ac_c* convPId(fpc_ProcID);
+    int request(fopAc_ac_c*, int);
+    void init();
+    void proc();
 
     fopAc_ac_c* getZHintTarget() { return convPId(field_0x8); }
 
@@ -73,7 +73,7 @@ public:
 
 public:
     dAttParam_c() {}
-    /* 80070038 */ dAttParam_c(s32);
+    dAttParam_c(s32);
 
 #ifdef DEBUG
     void connectHIO(char* i_name) {
@@ -86,7 +86,7 @@ public:
 
     virtual void genMessage(JORMContext*);
 #endif
-    /* 80070110 */ virtual ~dAttParam_c();
+    virtual ~dAttParam_c();
 
     enum EFlag {
         EFlag_HOLD_MODE    = (1 << 0),
@@ -113,10 +113,10 @@ public:
 
 class dAttLook_c {
 public:
-    /* 80073CA4 */ fopAc_ac_c* convPId(fpc_ProcID);
-    /* 80073CD4 */ void init();
-    /* 80073CEC */ void proc();
-    /* 80073D08 */ int request(fopAc_ac_c*, f32, f32, f32, s16, int);
+    fopAc_ac_c* convPId(fpc_ProcID);
+    void init();
+    void proc();
+    int request(fopAc_ac_c*, f32, f32, f32, s16, int);
 
     fopAc_ac_c* getLookTarget() { return convPId(mLookTargetID); }
 
@@ -129,10 +129,10 @@ private:
 
 class dAttList_c {
 public:
-    /* 800304D0 */ ~dAttList_c() {}
-    /* 8003050C */ dAttList_c() {}
-    /* 80073864 */ fopAc_ac_c* getActor();
-    /* 80073898 */ void setActor(fopAc_ac_c*);
+    ~dAttList_c() {}
+    dAttList_c() {}
+    fopAc_ac_c* getActor();
+    void setActor(fopAc_ac_c*);
 
     fpc_ProcID getPid() { return mActorID; }
 
@@ -145,12 +145,12 @@ public:
 
 class dAttDraw_c {
 public:
-    /* 8003054C */ ~dAttDraw_c() {}
-    /* 800307F0 */ dAttDraw_c() {}
-    /* 80072DD8 */ void setAnm(u8, f32);
-    /* 80072FE8 */ void setAlphaAnm(u8, u8);
-    /* 80073004 */ void alphaAnm();
-    /* 800732B0 */ void draw(cXyz&, f32 (*)[4]);
+    ~dAttDraw_c() {}
+    dAttDraw_c() {}
+    void setAnm(u8, f32);
+    void setAlphaAnm(u8, u8);
+    void alphaAnm();
+    void draw(cXyz&, f32 (*)[4]);
 
     /* 0x000 */ J3DModel* mModel[2];
     /* 0x008 */ mDoExt_bckAnm mNoticeCursorBck[2];
@@ -177,7 +177,7 @@ STATIC_ASSERT(sizeof(dAttDraw_c) == 0x178);
 
 class dAttDraw_CallBack_c : public mDoExt_McaMorfCallBack1_c {
 public:
-    /* 80070178 */ virtual int execute(u16, J3DTransformInfo*);
+    virtual int execute(u16, J3DTransformInfo*);
 };
 
 struct dist_entry {
@@ -204,46 +204,46 @@ public:
     };
 
     dAttention_c() {}
-    /* 80070198 */ dAttention_c(fopAc_ac_c*, u32);
-    /* 80070774 */ ~dAttention_c();
-    /* 80070844 */ dAttList_c* GetLockonList(s32);
-    /* 80070880 */ dAttList_c* getActionBtnB();
-    /* 80070974 */ dAttList_c* getActionBtnXY();
-    /* 80070A70 */ int chkAttMask(u32, u32);
-    /* 80070E90 */ f32 calcWeight(int, fopAc_ac_c*, f32, s16, s16, u32*);
-    /* 800710C0 */ void setList(int, fopAc_ac_c*, f32, f32, cSAngle, u32);
-    /* 80071240 */ void initList(u32);
-    /* 800713CC */ int makeList();
-    /* 80071424 */ void setOwnerAttentionPos();
-    /* 80071488 */ int SelectAttention(fopAc_ac_c*);
-    /* 800716B8 */ void sortList();
-    /* 800718A4 */ void stockAttention();
-    /* 80071960 */ fopAc_ac_c* nextAttention();
-    /* 80071A68 */ int freeAttention();
-    /* 80071A98 */ bool chaseAttention();
-    /* 80071CC0 */ f32 EnemyDistance(fopAc_ac_c*);
-    /* 80071DEC */ void runSoundProc();
-    /* 80071E84 */ void runDrawProc();
-    /* 800720F4 */ void runDebugDisp();
-    /* 800720F8 */ void checkButton();
-    /* 800722A0 */ bool triggerProc();
-    /* 800722EC */ int lostCheck();
-    /* 80072344 */ void judgementStatus4Hold();
-    /* 800725F0 */ void judgementStatus4Switch();
-    /* 80072924 */ int Run();
-    /* 80072BD4 */ void Draw();
-    /* 80072D80 */ void lockSoundStart(u32);
-    /* 8007353C */ fopAc_ac_c* LockonTarget(s32);
-    /* 800735DC */ f32 LockonReleaseDistanse();
-    /* 800736CC */ fpc_ProcID LockonTargetPId(s32);
-    /* 80073734 */ fopAc_ac_c* ActionTarget(s32);
-    /* 8007378C */ fopAc_ac_c* CheckObjectTarget(s32);
-    /* 800737E4 */ bool LockonTruth();
-    /* 80073838 */ int checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
-    /* 8016E424 */ bool LockEdge() { return chkFlag(8) || chkFlag(0x20); }
-    /* 80182994 */ int GetCheckObjectCount() { return mCheckObjectCount; }
-    /* 80182AD0 */ void keepLock(int timer) { mAttnBlockTimer = timer; }
-    /* 8014B010 */ static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }
+    dAttention_c(fopAc_ac_c*, u32);
+    ~dAttention_c();
+    dAttList_c* GetLockonList(s32);
+    dAttList_c* getActionBtnB();
+    dAttList_c* getActionBtnXY();
+    int chkAttMask(u32, u32);
+    f32 calcWeight(int, fopAc_ac_c*, f32, s16, s16, u32*);
+    void setList(int, fopAc_ac_c*, f32, f32, cSAngle, u32);
+    void initList(u32);
+    int makeList();
+    void setOwnerAttentionPos();
+    int SelectAttention(fopAc_ac_c*);
+    void sortList();
+    void stockAttention();
+    fopAc_ac_c* nextAttention();
+    int freeAttention();
+    bool chaseAttention();
+    f32 EnemyDistance(fopAc_ac_c*);
+    void runSoundProc();
+    void runDrawProc();
+    void runDebugDisp();
+    void checkButton();
+    bool triggerProc();
+    int lostCheck();
+    void judgementStatus4Hold();
+    void judgementStatus4Switch();
+    int Run();
+    void Draw();
+    void lockSoundStart(u32);
+    fopAc_ac_c* LockonTarget(s32);
+    f32 LockonReleaseDistanse();
+    fpc_ProcID LockonTargetPId(s32);
+    fopAc_ac_c* ActionTarget(s32);
+    fopAc_ac_c* CheckObjectTarget(s32);
+    bool LockonTruth();
+    int checkDistance(cXyz*, s16, cXyz*, f32, f32, f32, f32);
+    bool LockEdge() { return chkFlag(8) || chkFlag(0x20); }
+    int GetCheckObjectCount() { return mCheckObjectCount; }
+    void keepLock(int timer) { mAttnBlockTimer = timer; }
+    static dist_entry& getDistTable(int i_no) { return dist_table[i_no]; }
 
 #if DEBUG
     void runDebugDisp0();
diff --git a/include/d/d_bg_plc.h b/include/d/d_bg_plc.h
index 997f71da7e..d2fa3271ae 100644
--- a/include/d/d_bg_plc.h
+++ b/include/d/d_bg_plc.h
@@ -12,11 +12,11 @@ struct sBgPlc {
 
 class dBgPlc {
 public:
-    /* 80074074 */ dBgPlc();
-    /* 80074080 */ ~dBgPlc();
-    /* 800740BC */ void setBase(void*);
-    /* 800740C4 */ sBgPc* getCode(int, sBgPc**) const;
-    /* 800740DC */ u32 getGrpCode(int) const;
+    dBgPlc();
+    ~dBgPlc();
+    void setBase(void*);
+    sBgPc* getCode(int, sBgPc**) const;
+    u32 getGrpCode(int) const;
 
     static const int ZELDA_CODE_SIZE = sizeof(sBgPc);
 
diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h
index 6d3c4e7f7d..208d838668 100644
--- a/include/d/d_bg_s_acch.h
+++ b/include/d/d_bg_s_acch.h
@@ -29,17 +29,17 @@ public:
         /* 0x4 */ WALL_H_DIRECT = 4,
     };
 
-    /* 80075EAC */ dBgS_AcchCir();
-    /* 80075F14 */ void ClrWallHit();
-    /* 80075F40 */ void SetWallR(f32);
-    /* 80075F48 */ void CalcWallRR();
-    /* 80075F58 */ void SetWall(f32, f32);
-    /* 80075F80 */ void SetWallHDirect(f32);
+    dBgS_AcchCir();
+    void ClrWallHit();
+    void SetWallR(f32);
+    void CalcWallRR();
+    void SetWall(f32, f32);
+    void SetWallHDirect(f32);
 
     #ifdef __dt__12dBgS_AcchCirFv_DEFINED
-    /* 80077414 */ virtual ~dBgS_AcchCir();
+    virtual ~dBgS_AcchCir();
     #else
-    /* 80077414 */ virtual ~dBgS_AcchCir() {}
+    virtual ~dBgS_AcchCir() {}
     #endif
 
     f32 GetWallH() { return m_wall_h; }
@@ -84,37 +84,37 @@ public:
         /* 0x800000 */ LINE_DOWN = (1 << 23),
     };
 
-    /* 800760A0 */ dBgS_Acch();
-    /* 800761CC */ void Init();
-    /* 80076288 */ void Set(fopAc_ac_c*, int, dBgS_AcchCir*);
-    /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
-    /* 800762D8 */ void GroundCheckInit(dBgS&);
-    /* 80076350 */ void GroundCheck(dBgS&);
-    /* 8007654C */ void GroundRoofProc(dBgS&);
-    /* 80076624 */ void LineCheck(dBgS&);
-    /* 80076AAC */ void CrrPos(dBgS&);
-    /* 80076F84 */ f32 GetWallAllR();
-    /* 80076FC0 */ void SetWallCir();
-    /* 8007703C */ void CalcWallBmdCyl();
-    /* 80077114 */ void SetGroundUpY(f32);
-    /* 80077128 */ f32 GetWallAllLowH();
-    /* 80077178 */ f32 GetWallAllLowH_R();
-    /* 800771E4 */ f32 GetSpeedY();
-    /* 80077200 */ f32 GetWallAddY(Vec&);
-    /* 80077278 */ void SetNowActorInfo(int, void*, fpc_ProcID);
-    /* 80077288 */ void SetWallPolyIndex(int, int);
-    /* 800772E8 */ void CalcMovePosWork();
-    /* 8007732C */ void CalcWallRR();
-    /* 80077388 */ void SetMoveBGOnly();
-    /* 800773A4 */ void ClrMoveBGOnly();
-    /* 800773C0 */ void SetGndThinCellingOff();
-    /* 800773D0 */ void ClrGndThinCellingOff();
-    /* 800773E0 */ bool ChkGndThinCellingOff();
-    /* 800773EC */ void OnWallSort();
-    /* 800773FC */ bool ChkWallSort();
-    /* 80077408 */ bool ChkLineDown();
+    dBgS_Acch();
+    void Init();
+    void Set(fopAc_ac_c*, int, dBgS_AcchCir*);
+    void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*);
+    void GroundCheckInit(dBgS&);
+    void GroundCheck(dBgS&);
+    void GroundRoofProc(dBgS&);
+    void LineCheck(dBgS&);
+    void CrrPos(dBgS&);
+    f32 GetWallAllR();
+    void SetWallCir();
+    void CalcWallBmdCyl();
+    void SetGroundUpY(f32);
+    f32 GetWallAllLowH();
+    f32 GetWallAllLowH_R();
+    f32 GetSpeedY();
+    f32 GetWallAddY(Vec&);
+    void SetNowActorInfo(int, void*, fpc_ProcID);
+    void SetWallPolyIndex(int, int);
+    void CalcMovePosWork();
+    void CalcWallRR();
+    void SetMoveBGOnly();
+    void ClrMoveBGOnly();
+    void SetGndThinCellingOff();
+    void ClrGndThinCellingOff();
+    bool ChkGndThinCellingOff();
+    void OnWallSort();
+    bool ChkWallSort();
+    bool ChkLineDown();
 
-    /* 80075F94 */ virtual ~dBgS_Acch();
+    virtual ~dBgS_Acch();
 
     void DrawWall(dBgS&);
 
@@ -241,7 +241,7 @@ class dBgS_LinkAcch : public dBgS_Acch {
 public:
     dBgS_LinkAcch() { SetLink(); }
 
-    /* 80140F30 */ virtual ~dBgS_LinkAcch() {}
+    virtual ~dBgS_LinkAcch() {}
 };
 
 class dBgS_ObjAcch : public dBgS_Acch {
@@ -250,7 +250,7 @@ public:
         SetObj();
     }
 
-    /* 80BB336C */ virtual ~dBgS_ObjAcch() {}
+    virtual ~dBgS_ObjAcch() {}
 }; // Size: 0x1D8
 
 STATIC_ASSERT(sizeof(dBgS_ObjAcch) == 0x1D8);
@@ -261,7 +261,7 @@ public:
         SetStatue();
     }
 
-    /* 806646F8 */ virtual ~dBgS_StatueAcch() {}
+    virtual ~dBgS_StatueAcch() {}
 };
 
 class dBgS_BombAcch : public dBgS_Acch {
@@ -279,7 +279,7 @@ public:
         SetHorse();
     }
 
-    /* 80845274 */ virtual ~dBgS_HorseAcch() {}
+    virtual ~dBgS_HorseAcch() {}
 };
 
 #endif /* D_BG_D_BG_S_ACCH_H */
diff --git a/include/d/d_bg_s_chk.h b/include/d/d_bg_s_chk.h
index d8cfed45dd..38a3889939 100644
--- a/include/d/d_bg_s_chk.h
+++ b/include/d/d_bg_s_chk.h
@@ -6,11 +6,11 @@
 
 class dBgS_Chk : public dBgS_PolyPassChk, public dBgS_GrpPassChk {
 public:
-    /* 8007749C */ dBgS_Chk();
-    /* 80077560 */ cBgS_PolyPassChk* GetPolyPassChkInfo();
-    /* 80077564 */ cBgS_GrpPassChk* GetGrpPassChkInfo();
+    dBgS_Chk();
+    cBgS_PolyPassChk* GetPolyPassChkInfo();
+    cBgS_GrpPassChk* GetGrpPassChkInfo();
 
-    /* 800774E8 */ virtual ~dBgS_Chk();
+    virtual ~dBgS_Chk();
 };  // Size: 0x18
 
 #endif /* D_BG_D_BG_S_CHK_H */
diff --git a/include/d/d_bg_s_gnd_chk.h b/include/d/d_bg_s_gnd_chk.h
index 130f7d6ea3..1d40fb3eb8 100644
--- a/include/d/d_bg_s_gnd_chk.h
+++ b/include/d/d_bg_s_gnd_chk.h
@@ -6,40 +6,40 @@
 
 class dBgS_GndChk : public cBgS_GndChk, public dBgS_Chk {
 public:
-    /* 8007757C */ dBgS_GndChk();
-    /* 800775F0 */ virtual ~dBgS_GndChk();
+    dBgS_GndChk();
+    virtual ~dBgS_GndChk();
 };  // Size: 0x54
 
 class dBgS_LinkGndChk : public dBgS_GndChk {
 public:
     dBgS_LinkGndChk() { SetLink(); }
-    /* 80140EB8 */ virtual ~dBgS_LinkGndChk() {}
+    virtual ~dBgS_LinkGndChk() {}
 };
 
 class dBgS_ObjGndChk : public dBgS_GndChk {
 public:
     dBgS_ObjGndChk() { SetObj(); }
 
-    /* 8001E020 */ virtual ~dBgS_ObjGndChk() {}
+    virtual ~dBgS_ObjGndChk() {}
 };
 
 class dBgS_ObjGndChk_Wtr : public dBgS_ObjGndChk {
 public:
-    /* 80077678 */ dBgS_ObjGndChk_Wtr();
+    dBgS_ObjGndChk_Wtr();
 
-    /* 80077710 */ virtual ~dBgS_ObjGndChk_Wtr();
+    virtual ~dBgS_ObjGndChk_Wtr();
 };
 
 class dBgS_ObjGndChk_Spl : public dBgS_ObjGndChk {
 public:
-    /* 800777B0 */ dBgS_ObjGndChk_Spl();
+    dBgS_ObjGndChk_Spl();
 
-    /* 80077848 */ virtual ~dBgS_ObjGndChk_Spl();
+    virtual ~dBgS_ObjGndChk_Spl();
 };
 
 class dBgS_ObjGndChk_All : public dBgS_ObjGndChk {
 public:
-    /* 800778E8 */ virtual ~dBgS_ObjGndChk_All();
+    virtual ~dBgS_ObjGndChk_All();
 
     dBgS_ObjGndChk_All() { OnAll(); }
 };
@@ -48,14 +48,14 @@ class dBgS_CamGndChk : public dBgS_GndChk {
 public:
     dBgS_CamGndChk() { SetCam(); }
 
-    /* 80077988 */ virtual ~dBgS_CamGndChk();
+    virtual ~dBgS_CamGndChk();
 };
 
 class dBgS_CamGndChk_Wtr : public dBgS_CamGndChk {
 public:
-    /* 80077A00 */ dBgS_CamGndChk_Wtr();
+    dBgS_CamGndChk_Wtr();
 
-    /* 80077A98 */ virtual ~dBgS_CamGndChk_Wtr();
+    virtual ~dBgS_CamGndChk_Wtr();
 };
 
 #endif /* D_BG_D_BG_S_GND_CHK_H */
diff --git a/include/d/d_bg_s_grp_pass_chk.h b/include/d/d_bg_s_grp_pass_chk.h
index 865f7a3490..c58300e68b 100644
--- a/include/d/d_bg_s_grp_pass_chk.h
+++ b/include/d/d_bg_s_grp_pass_chk.h
@@ -11,9 +11,9 @@ public:
         /* 0x3 */ FULL_GRP
     };
 
-    /* 80077BA0 */ dBgS_GrpPassChk();
+    dBgS_GrpPassChk();
 
-    /* 80077BC4 */ virtual ~dBgS_GrpPassChk();
+    virtual ~dBgS_GrpPassChk();
 
     void OnWaterGrp() { mGrp |= WATER_GRP; }
     void OnSpl() { mGrp |= WATER_GRP; }
diff --git a/include/d/d_bg_s_lin_chk.h b/include/d/d_bg_s_lin_chk.h
index 0664228286..75f43ff736 100644
--- a/include/d/d_bg_s_lin_chk.h
+++ b/include/d/d_bg_s_lin_chk.h
@@ -8,10 +8,10 @@ class fopAc_ac_c;
 
 class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk {
 public:
-    /* 80077C68 */ dBgS_LinChk();
-    /* 80077D64 */ void Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const*);
+    dBgS_LinChk();
+    void Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const*);
 
-    /* 80077CDC */ virtual ~dBgS_LinChk();
+    virtual ~dBgS_LinChk();
 
     /* 0x00 cBgS_LinChk */;
     /* 0x58 dBgS_Chk */;
@@ -19,65 +19,65 @@ public:
 
 class dBgS_LinkLinChk : public dBgS_LinChk {
 public:
-    /* 80078030 */ dBgS_LinkLinChk();
+    dBgS_LinkLinChk();
 
-    /* 8007808C */ virtual ~dBgS_LinkLinChk();
+    virtual ~dBgS_LinkLinChk();
 };
 
 class dBgS_RopeLinChk : public dBgS_LinChk {
 public:
-    /* 8007838C */ dBgS_RopeLinChk();
+    dBgS_RopeLinChk();
 
-    /* 800783E8 */ virtual ~dBgS_RopeLinChk();
+    virtual ~dBgS_RopeLinChk();
 };
 
 class dBgS_BoomerangLinChk : public dBgS_LinChk {
 public:
-    /* 800782B8 */ dBgS_BoomerangLinChk();
+    dBgS_BoomerangLinChk();
 
-    /* 80078314 */ virtual ~dBgS_BoomerangLinChk();
+    virtual ~dBgS_BoomerangLinChk();
 };
 
 class dBgS_ArrowLinChk : public dBgS_LinChk {
 public:
-    /* 800781D8 */ dBgS_ArrowLinChk();
+    dBgS_ArrowLinChk();
 
-    /* 80078240 */ virtual ~dBgS_ArrowLinChk();
+    virtual ~dBgS_ArrowLinChk();
 };
 
 class dBgS_ObjLinChk : public dBgS_LinChk {
 public:
-    /* 80077F5C */ dBgS_ObjLinChk();
+    dBgS_ObjLinChk();
 
-    /* 80077FB8 */ virtual ~dBgS_ObjLinChk();
+    virtual ~dBgS_ObjLinChk();
 };
 
 class dBgS_BombLinChk : public dBgS_LinChk {
 public:
-    /* 80078104 */ dBgS_BombLinChk();
+    dBgS_BombLinChk();
 
-    /* 80078160 */ virtual ~dBgS_BombLinChk();
+    virtual ~dBgS_BombLinChk();
 };
 
 class dBgS_HorseLinChk : public dBgS_LinChk {
 public:
-    /* 80078460 */ dBgS_HorseLinChk();
+    dBgS_HorseLinChk();
 
-    /* 800784BC */ virtual ~dBgS_HorseLinChk();
+    virtual ~dBgS_HorseLinChk();
 };
 
 class dBgS_CamLinChk : public dBgS_LinChk {
 public:
-    /* 80077DA4 */ dBgS_CamLinChk();
+    dBgS_CamLinChk();
 
-    /* 80077E00 */ virtual ~dBgS_CamLinChk();
+    virtual ~dBgS_CamLinChk();
 };
 
 class dBgS_CamLinChk_NorWtr : public dBgS_CamLinChk {
 public:
-    /* 80077E78 */ dBgS_CamLinChk_NorWtr();
+    dBgS_CamLinChk_NorWtr();
 
-    /* 80077EE4 */ virtual ~dBgS_CamLinChk_NorWtr();
+    virtual ~dBgS_CamLinChk_NorWtr();
 };
 
 #endif /* D_BG_D_BG_S_LIN_CHK_H */
diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h
index 27c3f90200..af2757a13b 100644
--- a/include/d/d_bg_s_movebg_actor.h
+++ b/include/d/d_bg_s_movebg_actor.h
@@ -12,24 +12,24 @@ public:
     /* 0x568 */ dBgW* mpBgW;
     /* 0x56C */ Mtx mBgMtx;
 
-    /* 80078624 */ dBgS_MoveBgActor();
-    /* 800786C8 */ int MoveBGCreateHeap();
-    /* 800787BC */ int MoveBGCreate(char const* i_arcName, int i_dzb_id,
+    dBgS_MoveBgActor();
+    int MoveBGCreateHeap();
+    int MoveBGCreate(char const* i_arcName, int i_dzb_id,
                                     MoveBGActor_SetFunc i_setFunc, u32 i_heapSize, Mtx* i_bgMtx);
-    /* 800788DC */ int MoveBGDelete();
-    /* 80078950 */ int MoveBGExecute();
+    int MoveBGDelete();
+    int MoveBGExecute();
 
     int MoveBGDraw() { return Draw(); }
     int MoveBGIsDelete() { return IsDelete(); }
 
-    /* 80078688 */ virtual int CreateHeap();
-    /* 80078690 */ virtual int Create();
-    /* 80078698 */ virtual int Execute(Mtx**);
-    /* 800786A0 */ virtual int Draw();
-    /* 800786A8 */ virtual int Delete();
-    /* 800786B0 */ virtual int IsDelete();
-    /* 800786B8 */ virtual int ToFore();
-    /* 800786C0 */ virtual int ToBack();
+    virtual int CreateHeap();
+    virtual int Create();
+    virtual int Execute(Mtx**);
+    virtual int Draw();
+    virtual int Delete();
+    virtual int IsDelete();
+    virtual int ToFore();
+    virtual int ToBack();
 
     static const char* m_name;
     static int m_dzb_id;
diff --git a/include/d/d_bg_s_roof_chk.h b/include/d/d_bg_s_roof_chk.h
index 960fccd10b..387c05fff2 100644
--- a/include/d/d_bg_s_roof_chk.h
+++ b/include/d/d_bg_s_roof_chk.h
@@ -7,10 +7,10 @@
 
 class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
 public:
-    /* 80078FF4 */ dBgS_RoofChk();
-    /* 80079124 */ void Init();
+    dBgS_RoofChk();
+    void Init();
 
-    /* 80079090 */ virtual ~dBgS_RoofChk();
+    virtual ~dBgS_RoofChk();
 
     void SetNowY(f32 y) { mNowY = y; }
     void SetPos(cXyz const& pos) { m_pos = pos; }
@@ -26,7 +26,7 @@ private:
 class dBgS_LinkRoofChk : public dBgS_RoofChk {
 public:
     dBgS_LinkRoofChk() { SetLink(); }
-    /* 80140E40 */ virtual ~dBgS_LinkRoofChk() {}
+    virtual ~dBgS_LinkRoofChk() {}
 };
 
 class dBgS_ObjRoofChk : public dBgS_RoofChk {
diff --git a/include/d/d_bg_s_sph_chk.h b/include/d/d_bg_s_sph_chk.h
index 15cb92883f..66bb569806 100644
--- a/include/d/d_bg_s_sph_chk.h
+++ b/include/d/d_bg_s_sph_chk.h
@@ -12,8 +12,8 @@ typedef void (*SphChk_Callback)(dBgS_SphChk*, cBgD_Vtx_t*, int, int, int, cM3dGP
 
 class dBgS_SphChk : public cM3dGSph, public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
 public:
-    /* 80078A14 */ dBgS_SphChk();
-    /* 80078AC0 */ virtual ~dBgS_SphChk();
+    dBgS_SphChk();
+    virtual ~dBgS_SphChk();
 
     void SetCallback(SphChk_Callback i_callback) { mCallback = i_callback; }
 
@@ -23,7 +23,7 @@ public:
 class dBgS_CamSphChk : public dBgS_SphChk {
 public:
     dBgS_CamSphChk() { SetCam(); }
-    /* 80165E74 */ virtual ~dBgS_CamSphChk() {}
+    virtual ~dBgS_CamSphChk() {}
 };
 
 #endif /* D_BG_D_BG_S_SPH_CHK_H */
diff --git a/include/d/d_bg_s_spl_grp_chk.h b/include/d/d_bg_s_spl_grp_chk.h
index 81549e9f23..bc8567eec5 100644
--- a/include/d/d_bg_s_spl_grp_chk.h
+++ b/include/d/d_bg_s_spl_grp_chk.h
@@ -13,11 +13,11 @@ public:
         /* 0x4 */ MOVE_BG_ONLY = 4
     };
 
-    /* 80078B90 */ void Set(cXyz&, f32);
-    /* 80078BB0 */ dBgS_SplGrpChk();
-    /* 80078D0C */ void Init();
+    void Set(cXyz&, f32);
+    dBgS_SplGrpChk();
+    void Init();
 
-    /* 80078C78 */ virtual ~dBgS_SplGrpChk();
+    virtual ~dBgS_SplGrpChk();
 
     void OffFind() { m_flags &= ~FIND; }
     void OffIn() { m_flags &= ~IN; }
diff --git a/include/d/d_bg_s_wtr_chk.h b/include/d/d_bg_s_wtr_chk.h
index cc52d091ac..a6d624998b 100644
--- a/include/d/d_bg_s_wtr_chk.h
+++ b/include/d/d_bg_s_wtr_chk.h
@@ -5,9 +5,9 @@
 
 class dBgS_WtrChk : public dBgS_SplGrpChk {
 public:
-    /* 80079164 */ dBgS_WtrChk();
+    dBgS_WtrChk();
 
-    /* 8001DF30 */ virtual ~dBgS_WtrChk() {}
+    virtual ~dBgS_WtrChk() {}
 };  // Size: 0x54
 
 #endif /* D_BG_D_BG_S_WTR_CHK_H */
diff --git a/include/d/d_bg_w.h b/include/d/d_bg_w.h
index 0c2dc40170..846a177bd9 100644
--- a/include/d/d_bg_w.h
+++ b/include/d/d_bg_w.h
@@ -17,8 +17,8 @@ class cBgW_TriElm {
 public:
     /* 0x00 */ cM3dGPla m_plane;
 
-    /* 80079754 */ cBgW_TriElm();
-    /* 800796F8 */ virtual ~cBgW_TriElm();
+    cBgW_TriElm();
+    virtual ~cBgW_TriElm();
 
     /* 0x14  vtable */
 };  // Size: 0x18
@@ -27,22 +27,22 @@ class cBgW_RwgElm {
 public:
     /* 0x0 */ u16 m_next;
 
-    /* 800791C4 */ cBgW_RwgElm();
-    /* 800791D4 */ virtual ~cBgW_RwgElm();
+    cBgW_RwgElm();
+    virtual ~cBgW_RwgElm();
 };  // Size: 0x8
 
 class cBgW_NodeTree : public cM3dGAab {
 public:
-    /* 8007921C */ cBgW_NodeTree();
+    cBgW_NodeTree();
 
-    /* 80079238 */ virtual ~cBgW_NodeTree();
+    virtual ~cBgW_NodeTree();
 };
 
 class cBgW_GrpElm {
 public:
-    /* 8007A1E4 */ cBgW_GrpElm();
+    cBgW_GrpElm();
 
-    /* 8007A184 */ virtual ~cBgW_GrpElm();
+    virtual ~cBgW_GrpElm();
 
     /* 0x4 */ cM3dGAab m_aab;
 };
@@ -119,63 +119,63 @@ public:
         LOCK_e = 0x80,
     };
 
-    /* 80079294 */ cBgW();
-    /* 800793A4 */ void FreeArea();
-    /* 800793C4 */ void GlobalVtx();
-    /* 80079484 */ bool SetVtx();
-    /* 80079668 */ bool SetTri();
-    /* 80079770 */ void BlckConnect(u16*, int*, int);
-    /* 8007998C */ void MakeBlckTransMinMax(cXyz*, cXyz*);
-    /* 800799E0 */ void MakeBlckMinMax(int, cXyz*, cXyz*);
-    /* 80079A68 */ void MakeBlckBnd(int, cXyz*, cXyz*);
-    /* 80079BDC */ void MakeNodeTreeRp(int);
-    /* 80079CC4 */ void MakeNodeTreeGrpRp(int);
-    /* 80079DF0 */ void MakeNodeTree();
-    /* 80079F38 */ bool Set(cBgD_t* pdzb, u32 flags, Mtx* pbase_mtx);
-    /* 8007A200 */ bool RwgLineCheck(u16, cBgS_LinChk*);
-    /* 8007A3A0 */ bool LineCheckRp(cBgS_LinChk*, int);
-    /* 8007A52C */ bool LineCheckGrpRp(cBgS_LinChk*, int, int);
-    /* 8007A680 */ bool RwgGroundCheckCommon(f32, u16, cBgS_GndChk*);
-    /* 8007A774 */ bool RwgGroundCheckGnd(u16, cBgS_GndChk*);
-    /* 8007A824 */ bool RwgGroundCheckWall(u16, cBgS_GndChk*);
-    /* 8007A8F4 */ bool GroundCrossRp(cBgS_GndChk*, int);
-    /* 8007AA50 */ bool GroundCrossGrpRp(cBgS_GndChk*, int, int);
-    /* 8007ABC4 */ void CopyOldMtx();
-    /* 8007AC10 */ void Move();
-    /* 8007ADF0 */ void RwgShdwDraw(int, cBgS_ShdwDraw*);
-    /* 8007AEA4 */ void ShdwDrawRp(cBgS_ShdwDraw*, int);
-    /* 8007AFC0 */ void ShdwDrawGrpRp(cBgS_ShdwDraw*, int);
-    /* 8007B17C */ void GetTrans(cXyz*) const;
-    /* 8007B2F4 */ int GetPolyInfId(int) const;
-    /* 8007B30C */ u32 GetPolyInf0(int, u32, u32) const;
-    /* 8007B360 */ u32 GetMaskPolyInf0_NoShift(int, u32) const;
-    /* 8007B654 */ u32 GetPolyInf1(int, u32, u32) const;
-    /* 8007B78C */ u32 GetMaskPolyInf1_NoShift(int, u32) const;
-    /* 8007B824 */ u32 GetPolyInf2(int, u32, u32) const;
-    /* 8007B930 */ int GetTriGrp(int) const;
+    cBgW();
+    void FreeArea();
+    void GlobalVtx();
+    bool SetVtx();
+    bool SetTri();
+    void BlckConnect(u16*, int*, int);
+    void MakeBlckTransMinMax(cXyz*, cXyz*);
+    void MakeBlckMinMax(int, cXyz*, cXyz*);
+    void MakeBlckBnd(int, cXyz*, cXyz*);
+    void MakeNodeTreeRp(int);
+    void MakeNodeTreeGrpRp(int);
+    void MakeNodeTree();
+    bool Set(cBgD_t* pdzb, u32 flags, Mtx* pbase_mtx);
+    bool RwgLineCheck(u16, cBgS_LinChk*);
+    bool LineCheckRp(cBgS_LinChk*, int);
+    bool LineCheckGrpRp(cBgS_LinChk*, int, int);
+    bool RwgGroundCheckCommon(f32, u16, cBgS_GndChk*);
+    bool RwgGroundCheckGnd(u16, cBgS_GndChk*);
+    bool RwgGroundCheckWall(u16, cBgS_GndChk*);
+    bool GroundCrossRp(cBgS_GndChk*, int);
+    bool GroundCrossGrpRp(cBgS_GndChk*, int, int);
+    void CopyOldMtx();
+    void Move();
+    void RwgShdwDraw(int, cBgS_ShdwDraw*);
+    void ShdwDrawRp(cBgS_ShdwDraw*, int);
+    void ShdwDrawGrpRp(cBgS_ShdwDraw*, int);
+    void GetTrans(cXyz*) const;
+    int GetPolyInfId(int) const;
+    u32 GetPolyInf0(int, u32, u32) const;
+    u32 GetMaskPolyInf0_NoShift(int, u32) const;
+    u32 GetPolyInf1(int, u32, u32) const;
+    u32 GetMaskPolyInf1_NoShift(int, u32) const;
+    u32 GetPolyInf2(int, u32, u32) const;
+    int GetTriGrp(int) const;
 
-    /* 8007933C */ virtual ~cBgW();
-    /* 80079EEC */ virtual bool ChkMemoryError();
-    /* 8007B948 */ virtual bool ChkNotReady() const;
-    /* 8007B958 */ virtual bool ChkLock() const;
-    /* 8007B964 */ virtual bool ChkMoveBg() const;
+    virtual ~cBgW();
+    virtual bool ChkMemoryError();
+    virtual bool ChkNotReady() const;
+    virtual bool ChkLock() const;
+    virtual bool ChkMoveBg() const;
     virtual u32 ChkMoveFlag() const = 0;
-    /* 8007B270 */ virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const;
-    /* 8007B1B4 */ virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
-    /* 8007B164 */ virtual cM3dGAab* GetBnd() const;
-    /* 8007B2B0 */ virtual u32 GetGrpInf(cBgS_PolyInfo const&) const;
+    virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const;
+    virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
+    virtual cM3dGAab* GetBnd() const;
+    virtual u32 GetGrpInf(cBgS_PolyInfo const&) const;
     virtual void OffMoveFlag() = 0;
-    /* 8007B240 */ virtual void GetTopUnder(f32*, f32*) const;
-    /* 8007A658 */ virtual bool LineCheck(cBgS_LinChk*);
-    /* 8007AB9C */ virtual bool GroundCross(cBgS_GndChk*);
-    /* 8007B084 */ virtual void ShdwDraw(cBgS_ShdwDraw*);
+    virtual void GetTopUnder(f32*, f32*) const;
+    virtual bool LineCheck(cBgS_LinChk*);
+    virtual bool GroundCross(cBgS_GndChk*);
+    virtual void ShdwDraw(cBgS_ShdwDraw*);
     virtual void CaptPoly(dBgS_CaptPoly&) = 0;
     virtual bool WallCorrect(dBgS_Acch*) = 0;
     virtual bool WallCorrectSort(dBgS_Acch*) = 0;
     virtual bool RoofChk(dBgS_RoofChk*) = 0;
     virtual bool SplGrpChk(dBgS_SplGrpChk*) = 0;
     virtual bool SphChk(dBgS_SphChk*, void*) = 0;
-    /* 8007B0E4 */ virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
+    virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
     virtual int GetExitId(cBgS_PolyInfo const&) = 0;
     virtual int GetPolyColor(cBgS_PolyInfo const&) = 0;
     virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&) = 0;
@@ -209,11 +209,11 @@ public:
     virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
     virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
     virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
-    /* 80079564 */ virtual void CalcPlane();
-    /* 800797BC */ virtual void ClassifyPlane();
-    /* 8007B0A8 */ virtual bool ChkPolyThrough(int, cBgS_PolyPassChk*);
-    /* 8007B0B0 */ virtual bool ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
-    /* 8007B0DC */ virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int);
+    virtual void CalcPlane();
+    virtual void ClassifyPlane();
+    virtual bool ChkPolyThrough(int, cBgS_PolyPassChk*);
+    virtual bool ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
+    virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int);
 
     u32 GetOldInvMtx(Mtx m) { return MTXInverse(m_inv_mtx, m); }
     MtxP GetBaseMtxP() { return pm_base; }
@@ -256,78 +256,78 @@ typedef void (*dBgW_CrrFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs
 
 class dBgW : public cBgW {
 public:
-    /* 8007B970 */ dBgW();
-    /* 8007B9C0 */ void Move();
-    /* 8007B9EC */ void positionWallCorrect(dBgS_Acch*, f32, cM3dGPla&, cXyz* pupper_pos, f32);
-    /* 8007BA40 */ bool RwgWallCorrect(dBgS_Acch*, u16);
-    /* 8007C234 */ bool WallCorrectRp(dBgS_Acch*, int);
-    /* 8007C360 */ bool WallCorrectGrpRp(dBgS_Acch*, int, int);
-    /* 8007C4AC */ void RwgWallCorrectSort(dBgS_Acch*, u16);
-    /* 8007C714 */ void WallCorrectRpSort(dBgS_Acch*, int);
-    /* 8007C808 */ bool WallCorrectGrpRpSort(dBgS_Acch*, int, int);
-    /* 8007D0DC */ bool RwgRoofChk(u16, dBgS_RoofChk*);
-    /* 8007D208 */ bool RoofChkRp(dBgS_RoofChk*, int);
-    /* 8007D330 */ bool RoofChkGrpRp(dBgS_RoofChk*, int, int);
-    /* 8007D498 */ bool RwgSplGrpChk(u16, dBgS_SplGrpChk*);
-    /* 8007D5C4 */ bool SplGrpChkRp(dBgS_SplGrpChk*, int);
-    /* 8007D6F0 */ bool SplGrpChkGrpRp(dBgS_SplGrpChk*, int, int);
-    /* 8007D858 */ void RwgCaptPoly(int, dBgS_CaptPoly&);
-    /* 8007D8E8 */ void CaptPolyRp(dBgS_CaptPoly&, int);
-    /* 8007DA04 */ void CaptPolyGrpRp(dBgS_CaptPoly&, int, int);
-    /* 8007DB20 */ bool RwgSphChk(u16, dBgS_SphChk*, void*);
-    /* 8007DC70 */ bool SphChkRp(dBgS_SphChk*, void*, int);
-    /* 8007DDE0 */ bool SphChkGrpRp(dBgS_SphChk*, void*, int, int);
+    dBgW();
+    void Move();
+    void positionWallCorrect(dBgS_Acch*, f32, cM3dGPla&, cXyz* pupper_pos, f32);
+    bool RwgWallCorrect(dBgS_Acch*, u16);
+    bool WallCorrectRp(dBgS_Acch*, int);
+    bool WallCorrectGrpRp(dBgS_Acch*, int, int);
+    void RwgWallCorrectSort(dBgS_Acch*, u16);
+    void WallCorrectRpSort(dBgS_Acch*, int);
+    bool WallCorrectGrpRpSort(dBgS_Acch*, int, int);
+    bool RwgRoofChk(u16, dBgS_RoofChk*);
+    bool RoofChkRp(dBgS_RoofChk*, int);
+    bool RoofChkGrpRp(dBgS_RoofChk*, int, int);
+    bool RwgSplGrpChk(u16, dBgS_SplGrpChk*);
+    bool SplGrpChkRp(dBgS_SplGrpChk*, int);
+    bool SplGrpChkGrpRp(dBgS_SplGrpChk*, int, int);
+    void RwgCaptPoly(int, dBgS_CaptPoly&);
+    void CaptPolyRp(dBgS_CaptPoly&, int);
+    void CaptPolyGrpRp(dBgS_CaptPoly&, int, int);
+    bool RwgSphChk(u16, dBgS_SphChk*, void*);
+    bool SphChkRp(dBgS_SphChk*, void*, int);
+    bool SphChkGrpRp(dBgS_SphChk*, void*, int, int);
 
-    /* 8007E548 */ virtual ~dBgW() {}
-    /* 8007E4B4 */ virtual u32 ChkMoveFlag() const;
-    /* 8007E4A4 */ virtual void OffMoveFlag();
-    /* 8007DAF8 */ virtual void CaptPoly(dBgS_CaptPoly&);
-    /* 8007C484 */ virtual bool WallCorrect(dBgS_Acch*);
-    /* 8007C910 */ virtual bool WallCorrectSort(dBgS_Acch*);
-    /* 8007D470 */ virtual bool RoofChk(dBgS_RoofChk*);
-    /* 8007D830 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 8007DF00 */ virtual bool SphChk(dBgS_SphChk*, void*);
-    /* 8007B3AC */ virtual int GetExitId(cBgS_PolyInfo const&);
-    /* 8007B3D8 */ virtual int GetPolyColor(cBgS_PolyInfo const&);
-    /* 8007B404 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
-    /* 8007B430 */ virtual int GetSpecialCode(cBgS_PolyInfo const&);
-    /* 8007B460 */ virtual int GetSpecialCode(int);
-    /* 8007B488 */ virtual int GetMagnetCode(cBgS_PolyInfo const&);
-    /* 8007B4E0 */ virtual u32 GetPolyObjThrough(int);
-    /* 8007B504 */ virtual u32 GetPolyCamThrough(int);
-    /* 8007B52C */ virtual u32 GetPolyLinkThrough(int);
-    /* 8007B550 */ virtual u32 GetPolyArrowThrough(int);
-    /* 8007B574 */ virtual u32 GetPolyHSStick(int);
-    /* 8007B598 */ virtual u32 GetPolyBoomerangThrough(int);
-    /* 8007B5BC */ virtual u32 GetPolyRopeThrough(int);
-    /* 8007B5E0 */ virtual u32 GetPolyBombThrough(int);
-    /* 8007B604 */ virtual bool GetShdwThrough(int);
-    /* 8007B630 */ virtual u32 GetUnderwaterRoofCode(int);
-    /* 8007B4B4 */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
-    /* 8007B6AC */ virtual int GetLinkNo(cBgS_PolyInfo const&);
-    /* 8007B6D8 */ virtual int GetWallCode(cBgS_PolyInfo const&);
-    /* 8007B704 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
-    /* 8007B734 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
-    /* 8007B760 */ virtual int GetGroundCode(cBgS_PolyInfo const&);
-    /* 8007B7DC */ virtual u32 GetIronBallThrough(int);
-    /* 8007B800 */ virtual u32 GetAttackThrough(int);
-    /* 8007B87C */ virtual int GetCamMoveBG(cBgS_PolyInfo const&);
-    /* 8007B8A8 */ virtual int GetRoomCamId(cBgS_PolyInfo const&);
-    /* 8007B8D8 */ virtual int GetRoomPathId(cBgS_PolyInfo const&);
-    /* 8007B904 */ virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
-    /* 8007DF28 */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
-    /* 8007DF58 */ virtual int GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 8007DF88 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
+    virtual ~dBgW() {}
+    virtual u32 ChkMoveFlag() const;
+    virtual void OffMoveFlag();
+    virtual void CaptPoly(dBgS_CaptPoly&);
+    virtual bool WallCorrect(dBgS_Acch*);
+    virtual bool WallCorrectSort(dBgS_Acch*);
+    virtual bool RoofChk(dBgS_RoofChk*);
+    virtual bool SplGrpChk(dBgS_SplGrpChk*);
+    virtual bool SphChk(dBgS_SphChk*, void*);
+    virtual int GetExitId(cBgS_PolyInfo const&);
+    virtual int GetPolyColor(cBgS_PolyInfo const&);
+    virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
+    virtual int GetSpecialCode(cBgS_PolyInfo const&);
+    virtual int GetSpecialCode(int);
+    virtual int GetMagnetCode(cBgS_PolyInfo const&);
+    virtual u32 GetPolyObjThrough(int);
+    virtual u32 GetPolyCamThrough(int);
+    virtual u32 GetPolyLinkThrough(int);
+    virtual u32 GetPolyArrowThrough(int);
+    virtual u32 GetPolyHSStick(int);
+    virtual u32 GetPolyBoomerangThrough(int);
+    virtual u32 GetPolyRopeThrough(int);
+    virtual u32 GetPolyBombThrough(int);
+    virtual bool GetShdwThrough(int);
+    virtual u32 GetUnderwaterRoofCode(int);
+    virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
+    virtual int GetLinkNo(cBgS_PolyInfo const&);
+    virtual int GetWallCode(cBgS_PolyInfo const&);
+    virtual int GetPolyAtt0(cBgS_PolyInfo const&);
+    virtual int GetPolyAtt1(cBgS_PolyInfo const&);
+    virtual int GetGroundCode(cBgS_PolyInfo const&);
+    virtual u32 GetIronBallThrough(int);
+    virtual u32 GetAttackThrough(int);
+    virtual int GetCamMoveBG(cBgS_PolyInfo const&);
+    virtual int GetRoomCamId(cBgS_PolyInfo const&);
+    virtual int GetRoomPathId(cBgS_PolyInfo const&);
+    virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
+    virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
+    virtual int GetGrpSoundId(cBgS_PolyInfo const&);
+    virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 8007DFC4 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
+    virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 8007E000 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
+    virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
-    /* 8007E444 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
-    /* 8007E474 */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
-    /* 8007E02C */ virtual bool ChkPolyThrough(int, cBgS_PolyPassChk*);
-    /* 8007E360 */ virtual bool ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
-    /* 8007E3D8 */ virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int);
+    virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
+    virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
+    virtual bool ChkPolyThrough(int, cBgS_PolyPassChk*);
+    virtual bool ChkShdwDrawThrough(int, cBgS_PolyPassChk*);
+    virtual bool ChkGrpThrough(int, cBgS_GrpPassChk*, int);
 
     void SetCrrFunc(dBgW_CrrFunc func) { m_crr_func = func; }
     void SetRideCallback(dBgW_RideCallback func) { m_ride_callback = func; }
diff --git a/include/d/d_bg_w_base.h b/include/d/d_bg_w_base.h
index d13f9df49f..e593093960 100644
--- a/include/d/d_bg_w_base.h
+++ b/include/d/d_bg_w_base.h
@@ -41,12 +41,12 @@ public:
     typedef fopAc_ac_c* (*PushPull_CallBack)(fopAc_ac_c*, fopAc_ac_c*, s16,
                                      dBgW_Base::PushPullLabel);
 
-    /* 8007E5A8 */ dBgW_Base();
-    /* 8007E69C */ void ClrDBgWBase();
-    /* 8007E6E0 */ void CalcDiffShapeAngleY(s16);
+    dBgW_Base();
+    void ClrDBgWBase();
+    void CalcDiffShapeAngleY(s16);
 
-    /* 8007E640 */ virtual ~dBgW_Base();
-    /* 8007E6D0 */ virtual bool ChkMemoryError();
+    virtual ~dBgW_Base();
+    virtual bool ChkMemoryError();
     virtual bool ChkNotReady() const = 0;
     virtual bool ChkLock() const = 0;
     virtual bool ChkMoveBg() const = 0;
@@ -57,7 +57,7 @@ public:
     virtual u32 GetGrpInf(cBgS_PolyInfo const&) const = 0;
     virtual void OffMoveFlag() = 0;
     virtual void GetTopUnder(f32*, f32*) const = 0;
-    /* 80074AB4 */ virtual void SetOldShapeAngleY(s16);
+    virtual void SetOldShapeAngleY(s16);
     virtual bool LineCheck(cBgS_LinChk*) = 0;
     virtual bool GroundCross(cBgS_GndChk*) = 0;
     virtual void ShdwDraw(cBgS_ShdwDraw*) = 0;
@@ -101,8 +101,8 @@ public:
     virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
     virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
     virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*) = 0;
-    /* 8007E6D8 */ virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
-    /* 8007E6DC */ virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
+    virtual void CallRideCallBack(fopAc_ac_c*, fopAc_ac_c*);
+    virtual void CallArrowStickCallBack(fopAc_ac_c*, fopAc_ac_c*, cXyz&);
 
     PushPull_CallBack GetPushPullCallback() const { return m_pushPull_Callback; }
     s16 GetDiffShapeAngleY() { return m_diff_ShapeAngleY; }
diff --git a/include/d/d_bg_w_kcol.h b/include/d/d_bg_w_kcol.h
index d443cf7d99..36e2f9d970 100644
--- a/include/d/d_bg_w_kcol.h
+++ b/include/d/d_bg_w_kcol.h
@@ -39,73 +39,73 @@ struct KC_Header {
 
 class dBgWKCol : public dBgW_Base {
 public:
-    /* 8007E6F4 */ dBgWKCol();
-    /* 8007E7D0 */ static void* initKCollision(void*);
-    /* 8007E804 */ void create(void* pprism, void* plc);
-    /* 8007E850 */ void getTriNrm(KC_PrismData*, Vec**) const;
-    /* 8007E8C0 */ cM3dGPla GetTriPla(int) const;
-    /* 8007E9A4 */ bool GetTriPnt(int, Vec*, Vec*, Vec*) const;
-    /* 8007E9D4 */ bool GetTriPnt(KC_PrismData const*, Vec*, Vec*, Vec*) const;
-    /* 8007EB70 */ void getPolyCode(int, dBgPc*) const;
-    /* 8007EBC4 */ bool chkPolyThrough(dBgPc*, cBgS_PolyPassChk*, cBgS_GrpPassChk*, cXyz&) const;
-    /* 8007FF00 */ bool ChkShdwDrawThrough(dBgPc*);
+    dBgWKCol();
+    static void* initKCollision(void*);
+    void create(void* pprism, void* plc);
+    void getTriNrm(KC_PrismData*, Vec**) const;
+    cM3dGPla GetTriPla(int) const;
+    bool GetTriPnt(int, Vec*, Vec*, Vec*) const;
+    bool GetTriPnt(KC_PrismData const*, Vec*, Vec*, Vec*) const;
+    void getPolyCode(int, dBgPc*) const;
+    bool chkPolyThrough(dBgPc*, cBgS_PolyPassChk*, cBgS_GrpPassChk*, cXyz&) const;
+    bool ChkShdwDrawThrough(dBgPc*);
 
-    /* 8007E74C */ virtual ~dBgWKCol();
-    /* 8007E86C */ virtual bool ChkNotReady() const;
-    /* 8007E87C */ virtual bool ChkLock() const;
-    /* 8007E884 */ virtual bool ChkMoveBg() const;
-    /* 8007E88C */ virtual u32 ChkMoveFlag() const;
-    /* 8007E894 */ virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const;
-    /* 8007E980 */ virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
-    /* 8007EB28 */ virtual cM3dGAab* GetBnd() const;
-    /* 8007EB30 */ virtual u32 GetGrpInf(cBgS_PolyInfo const&) const;
-    /* 8007EB6C */ virtual void OffMoveFlag();
-    /* 800829AC */ virtual void GetTopUnder(f32*, f32*) const;
-    /* 8007EE34 */ virtual bool LineCheck(cBgS_LinChk*);
-    /* 8007F628 */ virtual bool GroundCross(cBgS_GndChk*);
-    /* 8007F9A4 */ virtual void ShdwDraw(cBgS_ShdwDraw*);
-    /* 8007FF1C */ virtual void CaptPoly(dBgS_CaptPoly&);
-    /* 800811A0 */ virtual bool WallCorrect(dBgS_Acch*);
-    /* 80080330 */ virtual bool WallCorrectSort(dBgS_Acch*);
-    /* 80081E18 */ virtual bool RoofChk(dBgS_RoofChk*);
-    /* 80082184 */ virtual bool SplGrpChk(dBgS_SplGrpChk*);
-    /* 800824EC */ virtual bool SphChk(dBgS_SphChk*, void*);
-    /* 800829F0 */ virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
-    /* 80082A20 */ virtual int GetExitId(cBgS_PolyInfo const&);
-    /* 80082A50 */ virtual int GetPolyColor(cBgS_PolyInfo const&);
-    /* 80082A80 */ virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
-    /* 80082AB0 */ virtual int GetSpecialCode(cBgS_PolyInfo const&);
-    /* 80082AE0 */ virtual int GetSpecialCode(int);
-    /* 80082B0C */ virtual int GetMagnetCode(cBgS_PolyInfo const&);
-    /* 80082B6C */ virtual u32 GetPolyObjThrough(int);
-    /* 80082B98 */ virtual u32 GetPolyCamThrough(int);
-    /* 80082BC4 */ virtual u32 GetPolyLinkThrough(int);
-    /* 80082BF0 */ virtual u32 GetPolyArrowThrough(int);
-    /* 80082C1C */ virtual u32 GetPolyHSStick(int);
-    /* 80082C48 */ virtual u32 GetPolyBoomerangThrough(int);
-    /* 80082C74 */ virtual u32 GetPolyRopeThrough(int);
-    /* 80082CA0 */ virtual u32 GetPolyBombThrough(int);
-    /* 80082CF8 */ virtual bool GetShdwThrough(int);
-    /* 80082CCC */ virtual u32 GetUnderwaterRoofCode(int);
-    /* 80082B3C */ virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
-    /* 80082D24 */ virtual int GetLinkNo(cBgS_PolyInfo const&);
-    /* 80082D54 */ virtual int GetWallCode(cBgS_PolyInfo const&);
-    /* 80082D84 */ virtual int GetPolyAtt0(cBgS_PolyInfo const&);
-    /* 80082DB4 */ virtual int GetPolyAtt1(cBgS_PolyInfo const&);
-    /* 80082DE4 */ virtual int GetGroundCode(cBgS_PolyInfo const&);
-    /* 80082E14 */ virtual u32 GetIronBallThrough(int);
-    /* 80082E40 */ virtual u32 GetAttackThrough(int);
-    /* 80082E6C */ virtual int GetCamMoveBG(cBgS_PolyInfo const&);
-    /* 80082E9C */ virtual int GetRoomCamId(cBgS_PolyInfo const&);
-    /* 80082ECC */ virtual int GetRoomPathId(cBgS_PolyInfo const&);
-    /* 80082EFC */ virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
-    /* 80082F2C */ virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
-    /* 80082F5C */ virtual int GetGrpSoundId(cBgS_PolyInfo const&);
-    /* 80082F8C */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
+    virtual ~dBgWKCol();
+    virtual bool ChkNotReady() const;
+    virtual bool ChkLock() const;
+    virtual bool ChkMoveBg() const;
+    virtual u32 ChkMoveFlag() const;
+    virtual cM3dGPla GetTriPla(cBgS_PolyInfo const&) const;
+    virtual bool GetTriPnt(cBgS_PolyInfo const&, cXyz*, cXyz*, cXyz*) const;
+    virtual cM3dGAab* GetBnd() const;
+    virtual u32 GetGrpInf(cBgS_PolyInfo const&) const;
+    virtual void OffMoveFlag();
+    virtual void GetTopUnder(f32*, f32*) const;
+    virtual bool LineCheck(cBgS_LinChk*);
+    virtual bool GroundCross(cBgS_GndChk*);
+    virtual void ShdwDraw(cBgS_ShdwDraw*);
+    virtual void CaptPoly(dBgS_CaptPoly&);
+    virtual bool WallCorrect(dBgS_Acch*);
+    virtual bool WallCorrectSort(dBgS_Acch*);
+    virtual bool RoofChk(dBgS_RoofChk*);
+    virtual bool SplGrpChk(dBgS_SplGrpChk*);
+    virtual bool SphChk(dBgS_SphChk*, void*);
+    virtual int GetGrpRoomIndex(cBgS_PolyInfo const&) const;
+    virtual int GetExitId(cBgS_PolyInfo const&);
+    virtual int GetPolyColor(cBgS_PolyInfo const&);
+    virtual BOOL GetHorseNoEntry(cBgS_PolyInfo const&);
+    virtual int GetSpecialCode(cBgS_PolyInfo const&);
+    virtual int GetSpecialCode(int);
+    virtual int GetMagnetCode(cBgS_PolyInfo const&);
+    virtual u32 GetPolyObjThrough(int);
+    virtual u32 GetPolyCamThrough(int);
+    virtual u32 GetPolyLinkThrough(int);
+    virtual u32 GetPolyArrowThrough(int);
+    virtual u32 GetPolyHSStick(int);
+    virtual u32 GetPolyBoomerangThrough(int);
+    virtual u32 GetPolyRopeThrough(int);
+    virtual u32 GetPolyBombThrough(int);
+    virtual bool GetShdwThrough(int);
+    virtual u32 GetUnderwaterRoofCode(int);
+    virtual int GetMonkeyBarsCode(cBgS_PolyInfo const&);
+    virtual int GetLinkNo(cBgS_PolyInfo const&);
+    virtual int GetWallCode(cBgS_PolyInfo const&);
+    virtual int GetPolyAtt0(cBgS_PolyInfo const&);
+    virtual int GetPolyAtt1(cBgS_PolyInfo const&);
+    virtual int GetGroundCode(cBgS_PolyInfo const&);
+    virtual u32 GetIronBallThrough(int);
+    virtual u32 GetAttackThrough(int);
+    virtual int GetCamMoveBG(cBgS_PolyInfo const&);
+    virtual int GetRoomCamId(cBgS_PolyInfo const&);
+    virtual int GetRoomPathId(cBgS_PolyInfo const&);
+    virtual int GetRoomPathPntNo(cBgS_PolyInfo const&);
+    virtual u8 GetPolyGrpRoomInfId(cBgS_PolyInfo const&);
+    virtual int GetGrpSoundId(cBgS_PolyInfo const&);
+    virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                        csXyz*);
-    /* 80082F90 */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
+    virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*,
                                          csXyz*);
-    /* 80082F94 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
+    virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*,
                                              csXyz*, csXyz*);
 
     KC_PrismData* getPrismData(int poly_index) const {
diff --git a/include/d/d_bg_w_sv.h b/include/d/d_bg_w_sv.h
index 074359ad57..8d05dea419 100644
--- a/include/d/d_bg_w_sv.h
+++ b/include/d/d_bg_w_sv.h
@@ -9,15 +9,15 @@ public:
         field_0xc0 = NULL;
     }
 
-    /* 80082F98 */ u8 Set(cBgD_t*, u32);
-    /* 80083020 */ void CopyBackVtx();
-    /* 8008308C */ bool CrrPosWork(cXyz*, int, int, int);
-    /* 80083300 */ bool TransPosWork(cXyz*, int, int, int);
+    u8 Set(cBgD_t*, u32);
+    void CopyBackVtx();
+    bool CrrPosWork(cXyz*, int, int, int);
+    bool TransPosWork(cXyz*, int, int, int);
 
-    /* 800835DC */ virtual ~dBgWSv() {}
-    /* 80083244 */ virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
-    /* 8008351C */ virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
-    /* 800835D8 */ virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
+    virtual ~dBgWSv() {}
+    virtual void CrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
+    virtual void TransPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
+    virtual void MatrixCrrPos(cBgS_PolyInfo const&, void*, bool, cXyz*, csXyz*, csXyz*);
 
     /* 0xC0 */ Vec* field_0xc0;
     /* 0xC4 */ u8 field_0xc4;
diff --git a/include/d/d_bright_check.h b/include/d/d_bright_check.h
index 53c0962919..d3f48ce9a7 100644
--- a/include/d/d_bright_check.h
+++ b/include/d/d_bright_check.h
@@ -7,8 +7,8 @@ class dMsgString_c;
 
 class dDlst_BrightCheck_c : public dDlst_base_c {
 public:
-    /* 801935D0 */ virtual void draw();
-    /* 80193648 */ virtual ~dDlst_BrightCheck_c() {}
+    virtual void draw();
+    virtual ~dDlst_BrightCheck_c() {}
 
     /* 0x04 */ J2DScreen* Scr;
     /* 0x08 */ u8 field_0x8[0xC - 0x8];
@@ -22,14 +22,14 @@ public:
         MODE_MOVE_e,
     };
 
-    /* 80192F10 */ dBrightCheck_c(JKRArchive*);
-    /* 80192F98 */ virtual ~dBrightCheck_c();
+    dBrightCheck_c(JKRArchive*);
+    virtual ~dBrightCheck_c();
 
-    /* 80193030 */ void screenSet();
-    /* 801934D0 */ void _move();
-    /* 80193508 */ void modeWait();
-    /* 8019350C */ void modeMove();
-    /* 80193594 */ void _draw();
+    void screenSet();
+    void _move();
+    void modeWait();
+    void modeMove();
+    void _draw();
 
     /* 0x04 */ JKRArchive* mArchive;
     /* 0x08 */ dDlst_BrightCheck_c mBrightCheck;
diff --git a/include/d/d_cam_param.h b/include/d/d_cam_param.h
index 00153468cc..5684ae3fa7 100644
--- a/include/d/d_cam_param.h
+++ b/include/d/d_cam_param.h
@@ -4,31 +4,31 @@
 #include "SSystem/SComponent/c_angle.h"
 
 struct dCamMath {
-    /* 8008813C */ static f32 rationalBezierRatio(f32, f32);
-    /* 80088284 */ static f32 zoomFovy(f32, f32);
-    /* 8008831C */ static cXyz xyzRotateX(cXyz&, cSAngle);
-    /* 80088384 */ static cXyz xyzRotateY(cXyz&, cSAngle);
-    /* 800883EC */ static f32 xyzHorizontalDistance(cXyz&, cXyz&);
+    static f32 rationalBezierRatio(f32, f32);
+    static f32 zoomFovy(f32, f32);
+    static cXyz xyzRotateX(cXyz&, cSAngle);
+    static cXyz xyzRotateY(cXyz&, cSAngle);
+    static f32 xyzHorizontalDistance(cXyz&, cXyz&);
 };
 
 class dCstick_c {
 public:
-    /* 80088434 */ dCstick_c();
-    /* 8008845C */ bool Shift(u32);
+    dCstick_c();
+    bool Shift(u32);
 
     /* 0x0 */ f32 mThresholdLow;
     /* 0x4 */ f32 mThresholdHigh;
     /* 0x8 */ int mInputSpeed;
     /* 0xC */ u8 field_0xc[4];
 
-    /* 800889B0 */ virtual ~dCstick_c() {}
+    virtual ~dCstick_c() {}
 
     f32 SwTHH() { return mThresholdHigh; }
 };
 
 class dCamBGChk_c {
 public:
-    /* 80088464 */ dCamBGChk_c();
+    dCamBGChk_c();
 
     f32 WallUpDistance() { return mWallUpDistance; }
     f32 FwdDistance(s32 param_0) { return mChkInfo[param_0].mDistance; }
@@ -80,20 +80,20 @@ struct dCamStyleData {
 
 class dCamParam_c {
 public:
-    /* 800884F0 */ dCamParam_c(s32);
-    /* 800885D4 */ int Change(s32);
-    /* 80088620 */ int SearchStyle(u32);
+    dCamParam_c(s32);
+    int Change(s32);
+    int SearchStyle(u32);
 
-    /* 80182C60 */ void Arg2(s16 val) { mMapToolArg2 = val; }
-    /* 80182C3C */ s16 Arg2() { return mMapToolArg2; }
-    /* 80182C48 */ u8 Arg1() { return mMapToolArg1; }
-    /* 80182C6C */ void Arg1(u8 val) { mMapToolArg1 = val; }
-    /* 80182C50 */ u8 Arg0() { return mMapToolArg0; }
-    /* 80182C74 */ void Arg0(u8 val) { mMapToolArg0 = val; }
-    /* 80182C7C */ void Fovy(u8 val) { mMapToolFovy = val; }
-    /* 80182C58 */ u8 Fovy() { return mMapToolFovy; }
-    /* 80182CB4 */ bool CheckFlag(u16 flag) { return (flag & mCurrentStyle->field_0x6) != 0; }
-    /* 80182CD0 */ f32 Val(s32 param_0, int param_1) {
+    void Arg2(s16 val) { mMapToolArg2 = val; }
+    s16 Arg2() { return mMapToolArg2; }
+    u8 Arg1() { return mMapToolArg1; }
+    void Arg1(u8 val) { mMapToolArg1 = val; }
+    u8 Arg0() { return mMapToolArg0; }
+    void Arg0(u8 val) { mMapToolArg0 = val; }
+    void Fovy(u8 val) { mMapToolFovy = val; }
+    u8 Fovy() { return mMapToolFovy; }
+    bool CheckFlag(u16 flag) { return (flag & mCurrentStyle->field_0x6) != 0; }
+    f32 Val(s32 param_0, int param_1) {
         return mCamStyleData[param_0].field_0x8[param_1];
     }
     void SetVal(s32 param_0, int param_1, f32 i_value) {
@@ -116,25 +116,25 @@ public:
     u16 Flag(s32 param_0, u16 param_1) { return mCamStyleData[param_0].field_0x6 & param_1; }
     void SetFlag(u16 i_flag) { mCurrentStyle->field_0x6 |= i_flag; }
 
-    /* 8008858C */ virtual ~dCamParam_c();
+    virtual ~dCamParam_c();
 };
 
 class dCamSetup_c {
 public:
-    /* 80088668 */ dCamSetup_c();
-    /* 80088918 */ bool CheckLatitudeRange(s16*);
-    /* 80088988 */ f32 PlayerHideDist();
+    dCamSetup_c();
+    bool CheckLatitudeRange(s16*);
+    f32 PlayerHideDist();
 
-    /* 80182BB8 */ bool CheckFlag2(u16 i_flag) { return (i_flag & mFlags2) != 0; }
-    /* 80182BE8 */ f32 WaitRollSpeed() { return mWaitRollSpeed; }
-    /* 80182BF0 */ int WaitRollTimer() { return mWaitRollTimer; }
-    /* 80182C1C */ int ThrowTimer() { return mThrowTimer; }
-    /* 80182C24 */ f32 ThrowCushion() { return mThrowCushion; }
-    /* 80182C2C */ f32 ThrowVAngle() { return mThrowVAngle; }
-    /* 80182C34 */ f32 ThrowCtrAdjust() { return mThrowCtrOffset; }
-    /* 80182CEC */ f32 ChargeBRatio() { return mChargeBRatio; }
-    /* 80182CF4 */ int ChargeTimer() { return mChargeTimer; }
-    /* 80182CFC */ f32 ChargeLatitude() { return mChargeLatitude; }
+    bool CheckFlag2(u16 i_flag) { return (i_flag & mFlags2) != 0; }
+    f32 WaitRollSpeed() { return mWaitRollSpeed; }
+    int WaitRollTimer() { return mWaitRollTimer; }
+    int ThrowTimer() { return mThrowTimer; }
+    f32 ThrowCushion() { return mThrowCushion; }
+    f32 ThrowVAngle() { return mThrowVAngle; }
+    f32 ThrowCtrAdjust() { return mThrowCtrOffset; }
+    f32 ChargeBRatio() { return mChargeBRatio; }
+    int ChargeTimer() { return mChargeTimer; }
+    f32 ChargeLatitude() { return mChargeLatitude; }
 
     bool CheckFlag(u16 i_flag) { return (i_flag & mDebugFlags) != 0; }
     f32 ManualEndVal() { return mManualEndVal; }
@@ -223,7 +223,7 @@ public:
     /* 0x0F8 */ f32 field_0xf8;
     /* 0x0FC vtable */
 
-    /* 800888B8 */ virtual ~dCamSetup_c();
+    virtual ~dCamSetup_c();
 
     /* 0x100 */ dCstick_c mCStick;
     /* 0x114 */ dCamBGChk_c mBGChk;
diff --git a/include/d/d_camera.h b/include/d/d_camera.h
index 69f945eb79..e45c562b50 100644
--- a/include/d/d_camera.h
+++ b/include/d/d_camera.h
@@ -17,7 +17,7 @@ dAttention_c* dComIfGp_getAttention();
 struct dCamMapToolData {
     dCamMapToolData() { Clr(); }
 
-    /* 8015FEB8 */ int Set(s32, s32, fopAc_ac_c*, u16, u8);
+    int Set(s32, s32, fopAc_ac_c*, u16, u8);
 
     dCamMapToolData& operator=(dCamMapToolData const& other) {
         __memcpy(&mCamData, &other.mCamData, sizeof(stage_camera2_data_class));
@@ -51,9 +51,9 @@ struct dCamMapToolData {
 };
 
 struct dCamForcusLine {
-    /* 801824C8 */ void Init();
-    /* 80182560 */ void Draw();
-    /* 801825E4 */ bool Off();
+    void Init();
+    void Draw();
+    bool Off();
 
     /* 0x00 */ dDlst_effectLine_c mEffectLine;
     /* 0x38 */ cXyz field_0x38;
@@ -875,176 +875,176 @@ public:
         /* 0xA0 */ fopAc_ac_c* field_0xa0;
     };
 
-    /* 80088A7C */ int StartEventCamera(int, int, ...);
-    /* 80088BBC */ int EndEventCamera(int);
-    /* 80088C24 */ int searchEventArgData(char*);
-    /* 8008908C */ bool getEvIntData(int*, char*, int);
-    /* 80088CB0 */ bool getEvIntData(int*, char*);
-    /* 80088D90 */ bool getEvFloatData(f32*, char*);
-    /* 80089154 */ bool getEvFloatData(f32*, char*, f32);
-    /* 80088E58 */ int getEvFloatListData(f32**, char*);
-    /* 80088F1C */ int getEvXyzListData(cXyz**, char*);
-    /* 8008941C */ char* getEvStringPntData(char*, char*);
-    /* 80088FE0 */ char* getEvStringPntData(char*);
-    /* 8008922C */ bool getEvXyzData(cXyz*, char*, cXyz);
-    /* 8008933C */ bool getEvStringData(char*, char*, char*);
-    /* 800894C4 */ fopAc_ac_c* getEvActor(char*);
-    /* 800895F4 */ fopAc_ac_c* getEvActor(char*, char*);
-    /* 80089730 */ bool pauseEvCamera();
-    /* 800897E8 */ bool fixedFrameEvCamera();
-    /* 8008A510 */ bool stokerEvCamera();
-    /* 8008A974 */ bool rollingEvCamera();
-    /* 8008B9B0 */ bool fixedPositionEvCamera();
-    /* 8008BE2C */ bool uniformTransEvCamera();
-    /* 8008BE50 */ bool uniformBrakeEvCamera();
-    /* 8008BE74 */ bool uniformAcceleEvCamera();
-    /* 8008BE98 */ bool transEvCamera(int);
-    /* 8008E938 */ bool watchActorEvCamera();
-    /* 8008FAE8 */ bool restorePosEvCamera();
-    /* 80090174 */ bool talktoEvCamera();
-    /* 80090230 */ bool maptoolIdEvCamera();
-    /* 80090478 */ bool styleEvCamera();
-    /* 80090514 */ bool gameOverEvCamera();
-    /* 80091468 */ bool tactEvCamera();
-    /* 800923B8 */ bool turnToActorEvCamera();
-    /* 800923C0 */ bool stbWaitEvCamera();
-    /* 800924D0 */ bool saveEvCamera();
-    /* 8009258C */ bool loadEvCamera();
-    /* 800929AC */ bool useItem0EvCamera();
-    /* 800937AC */ bool useItem1EvCamera();
-    /* 80094240 */ bool getItemEvCamera();
-    /* 80094A70 */ bool possessedEvCamera();
-    /* 80095010 */ bool fixedFramesEvCamera();
-    /* 8009544C */ bool bSplineEvCamera();
-    /* 800956E4 */ bool twoActor0EvCamera();
-    /* 80095E7C */ bool peepHoleEvCamera();
-    /* 80095FD0 */ bool digHoleEvCamera();
-    /* 800965AC */ bool hintTalkEvCamera();
-    /* 80096EDC */ bool bspTransEvCamera();
-    /* 80097694 */ bool portalWarpEvCamera();
-    /* 8009771C */ cXyz attentionPos(fopAc_ac_c* i_this) { return i_this->attention_info.position; }
-    /* 80097738 */ cSAngle directionOf(fopAc_ac_c* i_this) { return i_this->shape_angle.y; }
-    /* 8009775C */ cXyz positionOf(fopAc_ac_c* i_this) { return i_this->current.pos; }
-    /* 8009778C */ cXyz eyePos(fopAc_ac_c* i_this) { return i_this->eyePos; }
-    /* 8016008C */ dCamera_c(camera_class*);
-    /* 80160304 */ ~dCamera_c();
-    /* 80160470 */ void initialize(camera_class*, fopAc_ac_c*, u32, u32);
-    /* 801614AC */ void Start();
-    /* 801614C4 */ void QuickStart();
-    /* 801614D0 */ void Stop();
-    /* 801614E8 */ void Stay();
-    /* 801614F4 */ bool ChangeModeOK(s32);
-    /* 80161550 */ void initPad();
-    /* 801617B0 */ void updatePad();
-    /* 80161D84 */ void initMonitor();
-    /* 80161E34 */ void updateMonitor();
-    /* 80162088 */ bool checkForceLockTarget();
-    /* 801622B0 */ void infoReport();
-    /* 801622B4 */ bool Run();
-    /* 80162D38 */ bool NotRun();
-    /* 80162FB8 */ s16 V();
-    /* 80162FD4 */ s16 U();
-    /* 8016300C */ bool SetTrimSize(s32);
-    /* 80163028 */ bool SetTrimTypeForce(s32);
-    /* 80163034 */ void CalcTrimSize();
-    /* 80163154 */ int Draw();
-    /* 8016317C */ void setStageMapToolData();
-    /* 80163340 */ void setMapToolData();
-    /* 80163558 */ void SetTagData(fopAc_ac_c*, s32, u16, u8);
-    /* 801635AC */ inline void setRoomMapToolData(dCamMapToolData*, s32, s32);
-    /* 801635E4 */ s32 nextMode(s32);
-    /* 80163C38 */ bool onModeChange(s32, s32);
-    /* 80163D50 */ int ModeFix(s32);
-    /* 80163D5C */ s32 nextType(s32);
-    /* 8016444C */ bool onTypeChange(s32, s32);
-    /* 8016469C */ bool onStyleChange(s32, s32);
-    /* 801647B0 */ int onRoomChange(s32);
-    /* 80164878 */ fopAc_ac_c* getParamTargetActor(s32);
-    /* 80164944 */ int GetCameraTypeFromMapToolID(s32, s32);
-    /* 80164B64 */ int GetCameraTypeFromCameraName(char const*);
-    /* 80164C10 */ int GetCameraTypeFromToolData(stage_camera2_data_class*);
-    /* 80164C64 */ void pushInfo(dCamera_c::dCamInfo_c*, s16);
-    /* 80164CAC */ void popInfo(dCamera_c::dCamInfo_c*);
-    /* 80164D2C */ f32 heightOf(fopAc_ac_c*);
-    /* 80164E20 */ cXyz relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32);
-    /* 80164D6C */ cXyz relationalPos(fopAc_ac_c*, cXyz*);
-    /* 80165104 */ void setUSOAngle();
-    /* 80165158 */ cSAngle getUSOAngle(cSAngle);
-    /* 8016517C */ bool pointInSight(cXyz*);
-    /* 80167C24 */ f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80165238 */ f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16, f32);
-    /* 801657EC */ f32 groundHeight(cXyz*);
-    /* 801658C0 */ bool lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32);
-    /* 80165AF0 */ bool lineBGCheck(cXyz*, cXyz*, u32);
-    /* 801659F4 */ bool lineBGCheck(cXyz*, cXyz*, cXyz*, u32);
-    /* 80165B60 */ u32 lineCollisionCheckBush(cXyz*, cXyz*);
-    /* 80165CE0 */ cXyz compWallMargin(cXyz*, cXyz*, f32);
-    /* 80165EF4 */ int defaultTriming();
-    /* 80165FB4 */ void setView(f32, f32, f32, f32);
-    /* 8016608C */ cSAngle forwardCheckAngle();
-    /* 80166764 */ bool bumpCheck(u32);
-    /* 80167BF8 */ bool lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32);
-    /* 80167CD8 */ BOOL jutOutCheck(cXyz*, f32);
-    /* 80167E3C */ void tooNearEscape(cXyz*);
-    /* 80167EF4 */ f32 getWaterSurfaceHeight(cXyz*);
-    /* 80167FEC */ void checkGroundInfo();
-    /* 80168744 */ bool chaseCamera(s32);
-    /* 8016C384 */ bool lockonCamera(s32);
-    /* 8016E448 */ fopAc_ac_c* getMsgCmdSpeaker();
-    /* 8016E4A4 */ s32 getMsgCmdCut(s32);
-    /* 8016E4F4 */ bool talktoCamera(s32);
-    /* 80174EA4 */ bool CalcSubjectAngle(s16*, s16*);
-    /* 80174EAC */ bool SaveZoomRatio();
-    /* 80174ED4 */ bool subjectCamera(s32);
-    /* 80176074 */ bool magneCamera(s32);
-    /* 801767F8 */ bool colosseumCamera(s32);
-    /* 80176DF0 */ bool test1Camera(s32);
-    /* 80176DF8 */ bool test2Camera(s32);
-    /* 80176E00 */ bool towerCamera(s32);
-    /* 80178E50 */ bool hookshotCamera(s32);
-    /* 80179590 */ bool railCamera(s32);
-    /* 8017A2A0 */ bool paraRailCamera(s32);
-    /* 8017ADC0 */ bool rideCamera(s32);
-    /* 8017D974 */ bool manualCamera(s32);
-    /* 8017D97C */ bool observeCamera(s32);
-    /* 8017DFAC */ bool fixedFrameCamera(s32);
-    /* 8017E730 */ bool fixedPositionCamera(s32);
-    /* 8017F25C */ bool oneSideCamera(s32);
-    /* 8017F828 */ bool eventCamera(s32);
-    /* 8018050C */ bool currentEvCamera();
-    /* 801806D4 */ bool letCamera(s32);
-    /* 801806DC */ void setEventRecoveryTrans(s16);
-    /* 80180738 */ s16 runEventRecoveryTrans();
-    /* 80180A40 */ void EventRecoverNotime();
-    /* 80180AA8 */ int Set(cXyz, cXyz);
-    /* 80180AE0 */ int Set(cXyz, cXyz, f32, s16);
-    /* 80180B40 */ int Set(cXyz, cXyz, s16, f32);
-    /* 80180C18 */ void Reset(cXyz, cXyz);
-    /* 80180C68 */ int Reset();
-    /* 80180BA0 */ void Reset(cXyz, cXyz, f32, s16);
-    /* 80180D24 */ f32 shakeCamera();
-    /* 80181000 */ int StartShake(s32, u8*, s32, cXyz);
-    /* 80181158 */ int StopShake();
-    /* 80181170 */ void StartBlure(int, fopAc_ac_c*, f32, f32);
-    /* 801811B8 */ void ResetBlure();
-    /* 80181208 */ void SetBlureAlpha(f32);
-    /* 80181210 */ void SetBlureScale(f32, f32, f32);
-    /* 80181220 */ void SetBlurePosition(f32, f32, f32);
-    /* 80181278 */ void SetBlureActor(fopAc_ac_c*);
-    /* 80181280 */ int blureCamera();
-    /* 80181490 */ void onHorseDush();
-    /* 80181500 */ fopAc_ac_c* GetForceLockOnActor();
-    /* 80181534 */ int ForceLockOn(fopAc_ac_c*);
-    /* 80181560 */ int ForceLockOff(fpc_ProcID);
-    /* 8018159C */ int ForceLockOff(fopAc_ac_c*);
-    /* 80181E20 */ cXyz Up();
-    /* 80181E64 */ cXyz Eye();
-    /* 80181E98 */ cXyz Center();
+    int StartEventCamera(int, int, ...);
+    int EndEventCamera(int);
+    int searchEventArgData(char*);
+    bool getEvIntData(int*, char*, int);
+    bool getEvIntData(int*, char*);
+    bool getEvFloatData(f32*, char*);
+    bool getEvFloatData(f32*, char*, f32);
+    int getEvFloatListData(f32**, char*);
+    int getEvXyzListData(cXyz**, char*);
+    char* getEvStringPntData(char*, char*);
+    char* getEvStringPntData(char*);
+    bool getEvXyzData(cXyz*, char*, cXyz);
+    bool getEvStringData(char*, char*, char*);
+    fopAc_ac_c* getEvActor(char*);
+    fopAc_ac_c* getEvActor(char*, char*);
+    bool pauseEvCamera();
+    bool fixedFrameEvCamera();
+    bool stokerEvCamera();
+    bool rollingEvCamera();
+    bool fixedPositionEvCamera();
+    bool uniformTransEvCamera();
+    bool uniformBrakeEvCamera();
+    bool uniformAcceleEvCamera();
+    bool transEvCamera(int);
+    bool watchActorEvCamera();
+    bool restorePosEvCamera();
+    bool talktoEvCamera();
+    bool maptoolIdEvCamera();
+    bool styleEvCamera();
+    bool gameOverEvCamera();
+    bool tactEvCamera();
+    bool turnToActorEvCamera();
+    bool stbWaitEvCamera();
+    bool saveEvCamera();
+    bool loadEvCamera();
+    bool useItem0EvCamera();
+    bool useItem1EvCamera();
+    bool getItemEvCamera();
+    bool possessedEvCamera();
+    bool fixedFramesEvCamera();
+    bool bSplineEvCamera();
+    bool twoActor0EvCamera();
+    bool peepHoleEvCamera();
+    bool digHoleEvCamera();
+    bool hintTalkEvCamera();
+    bool bspTransEvCamera();
+    bool portalWarpEvCamera();
+    cXyz attentionPos(fopAc_ac_c* i_this) { return i_this->attention_info.position; }
+    cSAngle directionOf(fopAc_ac_c* i_this) { return i_this->shape_angle.y; }
+    cXyz positionOf(fopAc_ac_c* i_this) { return i_this->current.pos; }
+    cXyz eyePos(fopAc_ac_c* i_this) { return i_this->eyePos; }
+    dCamera_c(camera_class*);
+    ~dCamera_c();
+    void initialize(camera_class*, fopAc_ac_c*, u32, u32);
+    void Start();
+    void QuickStart();
+    void Stop();
+    void Stay();
+    bool ChangeModeOK(s32);
+    void initPad();
+    void updatePad();
+    void initMonitor();
+    void updateMonitor();
+    bool checkForceLockTarget();
+    void infoReport();
+    bool Run();
+    bool NotRun();
+    s16 V();
+    s16 U();
+    bool SetTrimSize(s32);
+    bool SetTrimTypeForce(s32);
+    void CalcTrimSize();
+    int Draw();
+    void setStageMapToolData();
+    void setMapToolData();
+    void SetTagData(fopAc_ac_c*, s32, u16, u8);
+    inline void setRoomMapToolData(dCamMapToolData*, s32, s32);
+    s32 nextMode(s32);
+    bool onModeChange(s32, s32);
+    int ModeFix(s32);
+    s32 nextType(s32);
+    bool onTypeChange(s32, s32);
+    bool onStyleChange(s32, s32);
+    int onRoomChange(s32);
+    fopAc_ac_c* getParamTargetActor(s32);
+    int GetCameraTypeFromMapToolID(s32, s32);
+    int GetCameraTypeFromCameraName(char const*);
+    int GetCameraTypeFromToolData(stage_camera2_data_class*);
+    void pushInfo(dCamera_c::dCamInfo_c*, s16);
+    void popInfo(dCamera_c::dCamInfo_c*);
+    f32 heightOf(fopAc_ac_c*);
+    cXyz relationalPos(fopAc_ac_c*, fopAc_ac_c*, cXyz*, f32);
+    cXyz relationalPos(fopAc_ac_c*, cXyz*);
+    void setUSOAngle();
+    cSAngle getUSOAngle(cSAngle);
+    bool pointInSight(cXyz*);
+    f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
+    f32 radiusActorInSight(fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*, f32, s16, f32);
+    f32 groundHeight(cXyz*);
+    bool lineBGCheck(cXyz*, cXyz*, dBgS_LinChk*, u32);
+    bool lineBGCheck(cXyz*, cXyz*, u32);
+    bool lineBGCheck(cXyz*, cXyz*, cXyz*, u32);
+    u32 lineCollisionCheckBush(cXyz*, cXyz*);
+    cXyz compWallMargin(cXyz*, cXyz*, f32);
+    int defaultTriming();
+    void setView(f32, f32, f32, f32);
+    cSAngle forwardCheckAngle();
+    bool bumpCheck(u32);
+    bool lineBGCheckBoth(cXyz*, cXyz*, dBgS_LinChk*, u32);
+    BOOL jutOutCheck(cXyz*, f32);
+    void tooNearEscape(cXyz*);
+    f32 getWaterSurfaceHeight(cXyz*);
+    void checkGroundInfo();
+    bool chaseCamera(s32);
+    bool lockonCamera(s32);
+    fopAc_ac_c* getMsgCmdSpeaker();
+    s32 getMsgCmdCut(s32);
+    bool talktoCamera(s32);
+    bool CalcSubjectAngle(s16*, s16*);
+    bool SaveZoomRatio();
+    bool subjectCamera(s32);
+    bool magneCamera(s32);
+    bool colosseumCamera(s32);
+    bool test1Camera(s32);
+    bool test2Camera(s32);
+    bool towerCamera(s32);
+    bool hookshotCamera(s32);
+    bool railCamera(s32);
+    bool paraRailCamera(s32);
+    bool rideCamera(s32);
+    bool manualCamera(s32);
+    bool observeCamera(s32);
+    bool fixedFrameCamera(s32);
+    bool fixedPositionCamera(s32);
+    bool oneSideCamera(s32);
+    bool eventCamera(s32);
+    bool currentEvCamera();
+    bool letCamera(s32);
+    void setEventRecoveryTrans(s16);
+    s16 runEventRecoveryTrans();
+    void EventRecoverNotime();
+    int Set(cXyz, cXyz);
+    int Set(cXyz, cXyz, f32, s16);
+    int Set(cXyz, cXyz, s16, f32);
+    void Reset(cXyz, cXyz);
+    int Reset();
+    void Reset(cXyz, cXyz, f32, s16);
+    f32 shakeCamera();
+    int StartShake(s32, u8*, s32, cXyz);
+    int StopShake();
+    void StartBlure(int, fopAc_ac_c*, f32, f32);
+    void ResetBlure();
+    void SetBlureAlpha(f32);
+    void SetBlureScale(f32, f32, f32);
+    void SetBlurePosition(f32, f32, f32);
+    void SetBlureActor(fopAc_ac_c*);
+    int blureCamera();
+    void onHorseDush();
+    fopAc_ac_c* GetForceLockOnActor();
+    int ForceLockOn(fopAc_ac_c*);
+    int ForceLockOff(fpc_ProcID);
+    int ForceLockOff(fopAc_ac_c*);
+    cXyz Up();
+    cXyz Eye();
+    cXyz Center();
 
-    /* 8018295C */ f32 footHeightOf(fopAc_ac_c* i_actor) { return i_actor->current.pos.y; }
-    /* 801829AC */ cSAngle Bank() { return mBank + mShake.field_0x40; }
-    /* 80174E18 */ cXyz talkBasePos(fopAc_ac_c* i_actor) { return i_actor->current.pos; }
-    /* 80174E34 */ cXyz talkEyePos(fopAc_ac_c* i_actor) { return i_actor->eyePos; }
+    f32 footHeightOf(fopAc_ac_c* i_actor) { return i_actor->current.pos.y; }
+    cSAngle Bank() { return mBank + mShake.field_0x40; }
+    cXyz talkBasePos(fopAc_ac_c* i_actor) { return i_actor->current.pos; }
+    cXyz talkEyePos(fopAc_ac_c* i_actor) { return i_actor->eyePos; }
 
     void debugDraw();
 
diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h
index 748ec3124d..d6bc45c1c0 100644
--- a/include/d/d_cc_d.h
+++ b/include/d/d_cc_d.h
@@ -131,15 +131,15 @@ public:
 
 public:
     dCcD_GAtTgCoCommonBase() { ct(); }
-    /* 8008364C */ void ClrActorInfo();
-    /* 80083660 */ void ct();
-    /* 80083678 */ void SetHitApid(fpc_ProcID);
-    /* 80083688 */ fopAc_ac_c* GetAc();
-    /* 80083704 */ void Set(dCcD_SrcGAtTgCoCommonBase const&);
-    /* 80083718 */ void SetEffCounterTimer();
-    /* 80083724 */ void SubtractEffCounter();
-    /* 80083748 */ bool ChkEffCounter();
-    /* 80083CA0 */ virtual ~dCcD_GAtTgCoCommonBase() {}
+    void ClrActorInfo();
+    void ct();
+    void SetHitApid(fpc_ProcID);
+    fopAc_ac_c* GetAc();
+    void Set(dCcD_SrcGAtTgCoCommonBase const&);
+    void SetEffCounterTimer();
+    void SubtractEffCounter();
+    bool ChkEffCounter();
+    virtual ~dCcD_GAtTgCoCommonBase() {}
 
     void ClrEffCounter() { mEffCounter = 0; }
     u32 GetGFlag() const { return mGFlag; }
@@ -161,8 +161,8 @@ public:
 // Attack (At) Collider
 class dCcD_GObjAt : public dCcD_GAtTgCoCommonBase {
 public:
-    /* 80083944 */ void Set(dCcD_SrcGObjAt const&);
-    /* 80083C44 */ virtual ~dCcD_GObjAt() {}
+    void Set(dCcD_SrcGObjAt const&);
+    virtual ~dCcD_GObjAt() {}
     void SetVec(cXyz& vec) { mVec = vec; }
     cXyz& GetVec() { return mVec; }
     cXyz* GetVecP() { return &mVec; }
@@ -191,8 +191,8 @@ public:
 // Defense (Tg) Collider
 class dCcD_GObjTg : public dCcD_GAtTgCoCommonBase {
 public:
-    /* 800839A0 */ void Set(dCcD_SrcGObjTg const&);
-    /* 80083BE8 */ virtual ~dCcD_GObjTg() {}
+    void Set(dCcD_SrcGObjTg const&);
+    virtual ~dCcD_GObjTg() {}
     void SetSe(u8 se) { mSe = se; }
     void SetVec(cXyz& vec) { mVec = vec; }
     cXyz& GetVec() { return mVec; }
@@ -228,16 +228,16 @@ private:
 // Correction (Co) Collider
 class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase {
 public:
-    /* 80083B8C */ virtual ~dCcD_GObjCo() {}
+    virtual ~dCcD_GObjCo() {}
     void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); }
 };  // Size = 0x1C ?
 
 class dCcD_GStts : public cCcD_GStts {
 public:
-    /* 80083760 */ dCcD_GStts();
-    /* 800837F8 */ void Ct();
-    /* 80083830 */ void Move();
-    /* 8008523C */ virtual ~dCcD_GStts() {}
+    dCcD_GStts();
+    void Ct();
+    void Move();
+    virtual ~dCcD_GStts() {}
     void ClrAt() { mAt = 0; }
     void ClrTg() { mTg = 0; }
     void SetAtApid(fpc_ProcID id) { mAtApid = id; }
@@ -269,39 +269,39 @@ public:
 class dCcD_Stts : public cCcD_Stts, public dCcD_GStts {
 public:
     dCcD_Stts() {}
-    /* 80083850 */ virtual cCcD_GStts* GetGStts();
-    /* 80083860 */ void Init(int weight, int, fopAc_ac_c* pactor);
-    /* 800838F4 */ virtual void Ct();
-    /* 80083928 */ virtual void ClrAt();
-    /* 80083934 */ virtual void ClrTg();
-    /* 800851AC */ virtual ~dCcD_Stts() {}
+    virtual cCcD_GStts* GetGStts();
+    void Init(int weight, int, fopAc_ac_c* pactor);
+    virtual void Ct();
+    virtual void ClrAt();
+    virtual void ClrTg();
+    virtual ~dCcD_Stts() {}
 
 };  // Size = 0x3C
 
 // Object Info
 class dCcD_GObjInf : public cCcD_GObjInf {
 public:
-    /* 80083A28 */ dCcD_GObjInf();
-    /* 800840E4 */ virtual ~dCcD_GObjInf();
-    /* 80084268 */ virtual cCcD_GObjInf* GetGObjInf();
-    /* 8008426C */ virtual void ClrAtHit();
-    /* 800842C0 */ u32 ChkAtHit();
-    /* 80084318 */ void ResetAtHit();
-    /* 80084358 */ cCcD_Obj* GetAtHitObj();
-    /* 800843A8 */ cCcD_GObjInf* GetAtHitGObj();
-    /* 800843DC */ u8 ChkAtNoGuard();
-    /* 800843FC */ virtual void ClrTgHit();
-    /* 80084460 */ u32 ChkTgHit();
-    /* 800844B8 */ void ResetTgHit();
-    /* 800844F8 */ cCcD_Obj* GetTgHitObj();
-    /* 80084548 */ dCcD_GObjInf* GetTgHitGObj();
-    /* 8008457C */ u8 GetTgHitObjSe();
-    /* 800845B0 */ static Z2SoundID getHitSeID(u8, int);
-    /* 8008460C */ virtual void ClrCoHit();
-    /* 80084658 */ u32 ChkCoHit();
-    /* 800846B0 */ void ResetCoHit();
-    /* 800846F0 */ cCcD_Obj* GetCoHitObj();
-    /* 80084740 */ void Set(dCcD_SrcGObjInf const&);
+    dCcD_GObjInf();
+    virtual ~dCcD_GObjInf();
+    virtual cCcD_GObjInf* GetGObjInf();
+    virtual void ClrAtHit();
+    u32 ChkAtHit();
+    void ResetAtHit();
+    cCcD_Obj* GetAtHitObj();
+    cCcD_GObjInf* GetAtHitGObj();
+    u8 ChkAtNoGuard();
+    virtual void ClrTgHit();
+    u32 ChkTgHit();
+    void ResetTgHit();
+    cCcD_Obj* GetTgHitObj();
+    dCcD_GObjInf* GetTgHitGObj();
+    u8 GetTgHitObjSe();
+    static Z2SoundID getHitSeID(u8, int);
+    virtual void ClrCoHit();
+    u32 ChkCoHit();
+    void ResetCoHit();
+    cCcD_Obj* GetCoHitObj();
+    void Set(dCcD_SrcGObjInf const&);
 
     fopAc_ac_c* GetCoHitAc() { return mGObjCo.GetAc(); }
 
@@ -433,40 +433,40 @@ protected:
 // from cCcD_PntAttr to be emitted in debug, matching what's seen in ShieldD.
 class dCcD_Pnt : public dCcD_GObjInf, public cCcD_PntAttr {
 public:
-    /* 80084814 */ cCcD_ShapeAttr* GetShapeAttr();
-    /* 8008506C */ virtual ~dCcD_Pnt() {}
+    cCcD_ShapeAttr* GetShapeAttr();
+    virtual ~dCcD_Pnt() {}
     dCcD_Pnt() {}
 };  // Size = 0x144
 
 // Capsule
 class dCcD_Cps : public dCcD_GObjInf, public cCcD_CpsAttr {
 public:
-    /* 800847D0 */ void Set(dCcD_SrcCps const&);
-    /* 80084814 */ cCcD_ShapeAttr* GetShapeAttr();
-    /* 80084824 */ void CalcAtVec();
-    /* 80084854 */ void CalcTgVec();
-    /* 8008506C */ virtual ~dCcD_Cps() {}
+    void Set(dCcD_SrcCps const&);
+    cCcD_ShapeAttr* GetShapeAttr();
+    void CalcAtVec();
+    void CalcTgVec();
+    virtual ~dCcD_Cps() {}
     dCcD_Cps() {}
 };  // Size = 0x144
 
 // Triangle
 class dCcD_Tri : public dCcD_GObjInf, public cCcD_TriAttr {
 public:
-    /* 80084884 */ void Set(dCcD_SrcTri const&);
-    /* 800848A4 */ cCcD_ShapeAttr* GetShapeAttr();
-    /* 80084EF4 */ virtual ~dCcD_Tri() {}
+    void Set(dCcD_SrcTri const&);
+    cCcD_ShapeAttr* GetShapeAttr();
+    virtual ~dCcD_Tri() {}
     dCcD_Tri() {}
 };
 
 // Cylinder
 class dCcD_Cyl : public dCcD_GObjInf, public cCcD_CylAttr {
 public:
-    /* 800848B4 */ void Set(dCcD_SrcCyl const&);
-    /* 800848F8 */ cCcD_ShapeAttr* GetShapeAttr();
-    /* 80084908 */ void StartCAt(cXyz&);
-    /* 80084954 */ void MoveCAt(cXyz&);
-    /* 800849C4 */ void MoveCTg(cXyz&);
-    /* 80084D60 */ virtual ~dCcD_Cyl() {}
+    void Set(dCcD_SrcCyl const&);
+    cCcD_ShapeAttr* GetShapeAttr();
+    void StartCAt(cXyz&);
+    void MoveCAt(cXyz&);
+    void MoveCTg(cXyz&);
+    virtual ~dCcD_Cyl() {}
     dCcD_Cyl() {}
 };  // Size = 0x13C
 
@@ -474,11 +474,11 @@ public:
 class dCcD_Sph : public dCcD_GObjInf, public cCcD_SphAttr {
 public:
     dCcD_Sph() {}
-    /* 80084A34 */ void Set(dCcD_SrcSph const&);
-    /* 80084A78 */ void StartCAt(cXyz&);
-    /* 80084AC4 */ void MoveCAt(cXyz&);
-    /* 80084B34 */ virtual cCcD_ShapeAttr* GetShapeAttr();
-    /* 80084BF4 */ virtual ~dCcD_Sph() {}
+    void Set(dCcD_SrcSph const&);
+    void StartCAt(cXyz&);
+    void MoveCAt(cXyz&);
+    virtual cCcD_ShapeAttr* GetShapeAttr();
+    virtual ~dCcD_Sph() {}
 };  // Size = 0x138
 
 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0);
diff --git a/include/d/d_cc_mass_s.h b/include/d/d_cc_mass_s.h
index da4478eb48..c5d6186014 100644
--- a/include/d/d_cc_mass_s.h
+++ b/include/d/d_cc_mass_s.h
@@ -68,15 +68,15 @@ public:
 public:
     dCcMassS_Mng();
     virtual ~dCcMassS_Mng() {}
-    /* 800855E4 */ void Ct();
-    /* 80085630 */ void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3);
-    /* 80085690 */ void Prepare();
-    /* 800858AC */ u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf);
-    /* 80085CF0 */ void Clear();
-    /* 80085D98 */ void Set(cCcD_Obj* p_obj, u8 priority);
-    /* 80085E6C */ void SetCam(cM3dGCps const& cps);
-    /* 80085EB0 */ u32 GetResultCam() const;
-    /* 80085EB8 */ void GetCamTopPos(Vec* p_out);
+    void Ct();
+    void SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3);
+    void Prepare();
+    u32 Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf);
+    void Clear();
+    void Set(cCcD_Obj* p_obj, u8 priority);
+    void SetCam(cM3dGCps const& cps);
+    u32 GetResultCam() const;
+    void GetCamTopPos(Vec* p_out);
 };
 
 STATIC_ASSERT(sizeof(dCcMassS_Mng) == 0x278);
diff --git a/include/d/d_cc_s.h b/include/d/d_cc_s.h
index 8ca908dd5e..977a8ebc8e 100644
--- a/include/d/d_cc_s.h
+++ b/include/d/d_cc_s.h
@@ -10,39 +10,39 @@ class dCcD_GStts;
 class dCcS : public cCcS {
 public:
     dCcS() {}
-    /* 80085ED4 */ void Ct();
-    /* 80085F08 */ void Dt();
-    /* 80085F28 */ bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*);
-    /* 800860F8 */ bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*);
-    /* 800861B0 */ void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
-    /* 80086360 */ int GetRank(u8);
-    /* 8008685C */ void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*,
+    void Ct();
+    void Dt();
+    bool ChkShieldFrontRange(cCcD_Obj*, cCcD_Obj*, int, cXyz const*);
+    bool ChkShield(cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*, dCcD_GObjInf*, cXyz const*);
+    void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
+    int GetRank(u8);
+    void ProcAtTgHitmark(bool, bool, cCcD_Obj*, cCcD_Obj*, dCcD_GObjInf*,
                                         dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, dCcD_GStts*,
                                         dCcD_GStts*, cXyz*, bool);
-    /* 80086D8C */ bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
-    /* 80086FBC */ bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*,
+    bool ChkCamera(cXyz&, cXyz&, f32, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*);
+    bool chkCameraPoint(cXyz const&, cCcD_ShapeAttr::Shape*, fopAc_ac_c*,
                                        fopAc_ac_c*);
-    /* 800872AC */ void DrawAfter();
-    /* 800872B0 */ void Move();
-    /* 800872D0 */ void Draw();
-    /* 8008730C */ void MassClear();
-    /* 80087330 */ BOOL ChkAtTgMtrlHit(u8, u8);
+    void DrawAfter();
+    void Move();
+    void Draw();
+    void MassClear();
+    BOOL ChkAtTgMtrlHit(u8, u8);
 
-    /* 8008640C */ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
-    /* 80086240 */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
+    virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
+    virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
                                              cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
-    /* 80086AC0 */ virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
+    virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*, cCcD_GObjInf*,
                                                cCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
                                                cCcD_GStts*, cXyz*);
-    /* 8008734C */ virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
+    virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*, cCcD_GStts*,
                                               cCcD_GStts*);
-    /* 800861B4 */ virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
+    virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
                                                      cCcD_GObjInf const*, cCcD_Stts*, cCcD_Stts*,
                                                      cCcD_GStts*, cCcD_GStts*);
-    /* 80086404 */ virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
-    /* 8002FF40 */ virtual ~dCcS() {}
-    /* 800872A8 */ virtual void MoveAfterCheck();
-    /* 80086754 */ virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
+    virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
+    virtual ~dCcS() {}
+    virtual void MoveAfterCheck();
+    virtual void CalcParticleAngle(dCcD_GObjInf*, cCcD_Stts*, cCcD_Stts*, csXyz*);
 
     void SetMass(cCcD_Obj* i_obj, u8 i_priority) { mMass_Mng.Set(i_obj, i_priority); }
     void SetMassCam(cM3dGCps& i_cps) { mMass_Mng.SetCam(i_cps); }
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 538f53d117..3461e2ba0d 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -74,9 +74,9 @@ STATIC_ASSERT(sizeof(dComIfG_camera_info_class) == 0x38);
 
 class dComIfG_resLoader_c {
 public:
-    /* 8002F314 */ dComIfG_resLoader_c();
-    /* 8002F328 */ ~dComIfG_resLoader_c();
-    /* 8002F3B4 */ int load(char const**, JKRHeap*);
+    dComIfG_resLoader_c();
+    ~dComIfG_resLoader_c();
+    int load(char const**, JKRHeap*);
 
 private:
     /* 0x0 */ const char** mResNameTable;
diff --git a/include/d/d_demo.h b/include/d/d_demo.h
index d01c6a4592..f8ff43b6e7 100644
--- a/include/d/d_demo.h
+++ b/include/d/d_demo.h
@@ -20,16 +20,16 @@ struct jmessage_tControl;
 
 class dDemo_object_c {
 public:
-    /* 80038F54 */ dDemo_object_c();
-    /* 80038F70 */ ~dDemo_object_c();
-    /* 80038FC0 */ JStage::TObject* appendActor(fopAc_ac_c*);
-    /* 80039088 */ dDemo_actor_c* getActor(u8);
-    /* 800390AC */ JStage::TObject* createCamera();
-    /* 80039128 */ dDemo_camera_c* getActiveCamera();
-    /* 8003913C */ JStage::TObject* createAmbient();
-    /* 800391B8 */ JStage::TObject* appendLight();
-    /* 80039258 */ JStage::TObject* createFog();
-    /* 800392D4 */ void remove();
+    dDemo_object_c();
+    ~dDemo_object_c();
+    JStage::TObject* appendActor(fopAc_ac_c*);
+    dDemo_actor_c* getActor(u8);
+    JStage::TObject* createCamera();
+    dDemo_camera_c* getActiveCamera();
+    JStage::TObject* createAmbient();
+    JStage::TObject* appendLight();
+    JStage::TObject* createFog();
+    void remove();
 
     /* 0x00 */ u8 mActorNum;
     /* 0x01 */ u8 mLightNum;
@@ -77,45 +77,45 @@ public:
         ENABLE_TEX_ANM_FRAME_e = (1 << 9),
     };
 
-    /* 80038020 */ dDemo_actor_c();
-    /* 80038128 */ fopAc_ac_c* getActor();
-    /* 8003815C */ void setActor(fopAc_ac_c*);
-    /* 8003819C */ f32 getPrm_Morf();
-    /* 80038338 */ int getDemoIDData(int*, int*, int*, u16*, u8*);
+    dDemo_actor_c();
+    fopAc_ac_c* getActor();
+    void setActor(fopAc_ac_c*);
+    f32 getPrm_Morf();
+    int getDemoIDData(int*, int*, int*, u16*, u8*);
     
-    /* 80038098 */ virtual ~dDemo_actor_c();
-    /* 800387EC */ virtual void JSGSetData(u32, void const*, u32);
-    /* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const {
+    virtual ~dDemo_actor_c();
+    virtual void JSGSetData(u32, void const*, u32);
+    virtual s32 JSGFindNodeID(char const* param_0) const {
         JUT_ASSERT(0, mModel != NULL);
         return mModel->getModelData()->getJointName()->getIndex(param_0);
     }
-    /* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const {
+    virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const {
         JUT_ASSERT(0, mModel != NULL);
         cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1);
         return true;
     }
-    /* 80038920 */ virtual void JSGSetTranslation(Vec const&);
-    /* 80038980 */ virtual void JSGSetScaling(Vec const&);
-    /* 800389A8 */ virtual void JSGSetRotation(Vec const&);
-    /* 80038A0C */ virtual void JSGSetShape(u32);
-    /* 80038A20 */ virtual void JSGSetAnimation(u32);
-    /* 80038A40 */ virtual void JSGSetAnimationFrame(f32);
-    /* 8003A0C8 */ virtual f32 JSGGetAnimationFrameMax() const {
+    virtual void JSGSetTranslation(Vec const&);
+    virtual void JSGSetScaling(Vec const&);
+    virtual void JSGSetRotation(Vec const&);
+    virtual void JSGSetShape(u32);
+    virtual void JSGSetAnimation(u32);
+    virtual void JSGSetAnimationFrame(f32);
+    virtual f32 JSGGetAnimationFrameMax() const {
         return mAnmFrameMax;
     }
-    /* 80038A54 */ virtual void JSGSetAnimationTransition(f32);
-    /* 80038A68 */ virtual void JSGSetTextureAnimation(u32);
-    /* 80038A7C */ virtual void JSGSetTextureAnimationFrame(f32);
-    /* 8003A0D0 */ virtual f32 JSGGetTextureAnimationFrameMax() const {
+    virtual void JSGSetAnimationTransition(f32);
+    virtual void JSGSetTextureAnimation(u32);
+    virtual void JSGSetTextureAnimationFrame(f32);
+    virtual f32 JSGGetTextureAnimationFrameMax() const {
         return mTexAnmFrameMax;
     }
-    /* 8003A0D8 */ virtual void JSGGetTranslation(Vec* o_trans) const {
+    virtual void JSGGetTranslation(Vec* o_trans) const {
         *o_trans = mTrans;
     }
-    /* 8003A0F4 */ virtual void JSGGetScaling(Vec* o_scale) const {
+    virtual void JSGGetScaling(Vec* o_scale) const {
         *o_scale = mScale;
     }
-    /* 8003A110 */ virtual void JSGGetRotation(Vec* param_0) const {
+    virtual void JSGGetRotation(Vec* param_0) const {
         param_0->x = mRotate.x * 0.005493164f;
         param_0->y = mRotate.y * 0.005493164f;
         param_0->z = mRotate.z * 0.005493164f;
@@ -164,9 +164,9 @@ class dDemo_system_c : public JStage::TSystem {
 public:
     dDemo_system_c() { mpObject = NULL; }
 
-    /* 80039528 */ virtual int JSGFindObject(JStage::TObject**, char const*,
+    virtual int JSGFindObject(JStage::TObject**, char const*,
                                               JStage::TEObject) const;
-    /* 80039AAC */ virtual ~dDemo_system_c();
+    virtual ~dDemo_system_c();
 
     void setObject(dDemo_object_c* i_object) { mpObject = i_object; }
 
@@ -179,8 +179,8 @@ public:
     dDemo_particle_c(JPAEmitterManager* p_emitMgr, const JStage::TSystem* p_system)
         : JStudio_JParticle::TCreateObject(p_emitMgr, p_system) {}
 
-    /* 80039F9C */ virtual ~dDemo_particle_c();
-    /* 80039F1C */ virtual JPABaseEmitter* emitter_create(u32);
+    virtual ~dDemo_particle_c();
+    virtual JPABaseEmitter* emitter_create(u32);
 };
 
 class dDemo_light_c : public JStage::TLight {
@@ -198,13 +198,13 @@ public:
         mFlags = 0;
     }
 
-    /* 80038E20 */ virtual void JSGSetLightType(JStage::TELight);
-    /* 80038E34 */ virtual void JSGSetPosition(Vec const&);
-    /* 80038E5C */ virtual void JSGSetColor(GXColor);
-    /* 80038E8C */ virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn);
-    /* 80038EA8 */ virtual void JSGSetAngleAttenuation(f32, GXSpotFn);
-    /* 80038EC0 */ virtual void JSGSetDirection(Vec const&);
-    /* 80039468 */ virtual ~dDemo_light_c();
+    virtual void JSGSetLightType(JStage::TELight);
+    virtual void JSGSetPosition(Vec const&);
+    virtual void JSGSetColor(GXColor);
+    virtual void JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn);
+    virtual void JSGSetAngleAttenuation(f32, GXSpotFn);
+    virtual void JSGSetDirection(Vec const&);
+    virtual ~dDemo_light_c();
 
     void onEnable(u8 flag) { mFlags |= flag; }
 
@@ -234,11 +234,11 @@ public:
         mFlags = 0;
     }
 
-    /* 80038EE8 */ virtual void JSGSetFogFunction(GXFogType);
-    /* 80038EFC */ virtual void JSGSetStartZ(f32);
-    /* 80038F10 */ virtual void JSGSetEndZ(f32);
-    /* 80038F24 */ virtual void JSGSetColor(GXColor);
-    /* 80039408 */ virtual ~dDemo_fog_c();
+    virtual void JSGSetFogFunction(GXFogType);
+    virtual void JSGSetStartZ(f32);
+    virtual void JSGSetEndZ(f32);
+    virtual void JSGSetColor(GXColor);
+    virtual ~dDemo_fog_c();
 
     void onEnable(u8 flag) { mFlags |= flag; }
 
@@ -267,23 +267,23 @@ public:
         mFlags = 0;
     }
 
-    /* 80038AC4 */ virtual f32 JSGGetProjectionNear() const;
-    /* 80038AF8 */ virtual void JSGSetProjectionNear(f32);
-    /* 80038B0C */ virtual f32 JSGGetProjectionFar() const;
-    /* 80038B40 */ virtual void JSGSetProjectionFar(f32);
-    /* 80038B54 */ virtual f32 JSGGetProjectionFovy() const;
-    /* 80038B88 */ virtual void JSGSetProjectionFovy(f32);
-    /* 80038B9C */ virtual f32 JSGGetProjectionAspect() const;
-    /* 80038BD0 */ virtual void JSGSetProjectionAspect(f32);
-    /* 80038BE4 */ virtual void JSGGetViewPosition(Vec*) const;
-    /* 80038C44 */ virtual void JSGSetViewPosition(Vec const&);
-    /* 80038C6C */ virtual void JSGGetViewUpVector(Vec*) const;
-    /* 80038CD0 */ virtual void JSGSetViewUpVector(Vec const&);
-    /* 80038CF8 */ virtual void JSGGetViewTargetPosition(Vec*) const;
-    /* 80038D5C */ virtual void JSGSetViewTargetPosition(Vec const&);
-    /* 80038D84 */ virtual f32 JSGGetViewRoll() const;
-    /* 80038DDC */ virtual void JSGSetViewRoll(f32);
-    /* 80039FFC */ virtual ~dDemo_camera_c();
+    virtual f32 JSGGetProjectionNear() const;
+    virtual void JSGSetProjectionNear(f32);
+    virtual f32 JSGGetProjectionFar() const;
+    virtual void JSGSetProjectionFar(f32);
+    virtual f32 JSGGetProjectionFovy() const;
+    virtual void JSGSetProjectionFovy(f32);
+    virtual f32 JSGGetProjectionAspect() const;
+    virtual void JSGSetProjectionAspect(f32);
+    virtual void JSGGetViewPosition(Vec*) const;
+    virtual void JSGSetViewPosition(Vec const&);
+    virtual void JSGGetViewUpVector(Vec*) const;
+    virtual void JSGSetViewUpVector(Vec const&);
+    virtual void JSGGetViewTargetPosition(Vec*) const;
+    virtual void JSGSetViewTargetPosition(Vec const&);
+    virtual f32 JSGGetViewRoll() const;
+    virtual void JSGSetViewRoll(f32);
+    virtual ~dDemo_camera_c();
 
     void onEnable(u8 flag) { mFlags |= flag; }
     bool checkEnable(u8 flag) { return mFlags & flag; }
@@ -316,8 +316,8 @@ public:
         mFlags = 0;
     }
 
-    /* 80038DF0 */ virtual void JSGSetColor(GXColor);
-    /* 800394C8 */ virtual ~dDemo_ambient_c();
+    virtual void JSGSetColor(GXColor);
+    virtual ~dDemo_ambient_c();
 
     void onEnable(u8 flag) { mFlags |= flag; }
 
@@ -351,15 +351,15 @@ int dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, char const*, int, u16*,
 
 class dDemo_c {
 public:
-    /* 80039678 */ static void create();
-    /* 80039910 */ static void remove();
-    /* 80039B6C */ static int start(u8 const*, cXyz*, f32);
-    /* 80039CF8 */ static void end();
-    /* 80039D4C */ static void branch();
-    /* 80039DA4 */ static int update();
-    /* 80039EDC */ static void setBranchType(u16);
-    /* 80039EEC */ static void setBranchId(u16, s16);
-    /* 80039F04 */ static void reset();
+    static void create();
+    static void remove();
+    static int start(u8 const*, cXyz*, f32);
+    static void end();
+    static void branch();
+    static int update();
+    static void setBranchType(u16);
+    static void setBranchId(u16, s16);
+    static void reset();
 
     static dDemo_actor_c* getActor(u8 param_0) {
         JUT_ASSERT(546, m_object != NULL);
diff --git a/include/d/d_door_param2.h b/include/d/d_door_param2.h
index fd4dff5521..bc09bc8a41 100644
--- a/include/d/d_door_param2.h
+++ b/include/d/d_door_param2.h
@@ -7,24 +7,24 @@ class fopAc_ac_c;
 
 class door_param2_c {
 public:
-    /* 8003A188 */ static int getKind(fopAc_ac_c* i_actor);
-    /* 8003A194 */ static u32 getDoorModel(fopAc_ac_c* i_actor);
-    /* 8003A1A0 */ static u8 getFrontOption(fopAc_ac_c* i_actor);
-    /* 8003A1AC */ static u8 getBackOption(fopAc_ac_c* i_actor);
-    /* 8003A1B8 */ static u8 getFRoomNo(fopAc_ac_c* i_actor);
-    /* 8003A1C4 */ static u8 getBRoomNo(fopAc_ac_c* i_actor);
-    /* 8003A1D0 */ static u8 getSwbit(fopAc_ac_c* i_actor);
-    /* 8003A1DC */ static u8 getSwbit2(fopAc_ac_c* i_actor);
-    /* 8003A1E8 */ static u8 getSwbit3(fopAc_ac_c* i_actor);
-    /* 8003A1F4 */ static int isMsgDoor(fopAc_ac_c* i_actor);
-    /* 8003A200 */ static u8 getEventNo(fopAc_ac_c* i_actor);
-    /* 8003A20C */ static u8 getEventNo2(fopAc_ac_c* i_actor);
-    /* 8003A218 */ static u16 getMsgNo(fopAc_ac_c* i_actor);
-    /* 8003A224 */ static u8 getExitNo(fopAc_ac_c* i_actor);
-    /* 8003A230 */ static u32 getFLightInf(fopAc_ac_c* i_actor);
-    /* 8003A23C */ static u32 getBLightInf(fopAc_ac_c* i_actor);
-    /* 8003A248 */ static u32 getMFLightInf(fopAc_ac_c* i_actor);
-    /* 8003A254 */ static u32 getMBLightInf(fopAc_ac_c* i_actor);
+    static int getKind(fopAc_ac_c* i_actor);
+    static u32 getDoorModel(fopAc_ac_c* i_actor);
+    static u8 getFrontOption(fopAc_ac_c* i_actor);
+    static u8 getBackOption(fopAc_ac_c* i_actor);
+    static u8 getFRoomNo(fopAc_ac_c* i_actor);
+    static u8 getBRoomNo(fopAc_ac_c* i_actor);
+    static u8 getSwbit(fopAc_ac_c* i_actor);
+    static u8 getSwbit2(fopAc_ac_c* i_actor);
+    static u8 getSwbit3(fopAc_ac_c* i_actor);
+    static int isMsgDoor(fopAc_ac_c* i_actor);
+    static u8 getEventNo(fopAc_ac_c* i_actor);
+    static u8 getEventNo2(fopAc_ac_c* i_actor);
+    static u16 getMsgNo(fopAc_ac_c* i_actor);
+    static u8 getExitNo(fopAc_ac_c* i_actor);
+    static u32 getFLightInf(fopAc_ac_c* i_actor);
+    static u32 getBLightInf(fopAc_ac_c* i_actor);
+    static u32 getMFLightInf(fopAc_ac_c* i_actor);
+    static u32 getMBLightInf(fopAc_ac_c* i_actor);
 };
 
 #endif /* D_D_DOOR_PARAM2_H */
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index f6f4d9e20a..02c4e41d5b 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -17,11 +17,11 @@ class cM_rnd_c {
 public:
     cM_rnd_c() { init(100, 100, 100); }
 
-    /* 80053CDC */ void init(int, int, int);
-    /* 80053CEC */ f32 get();
-    /* 80053DE0 */ f32 getF(f32);
-    /* 80053E18 */ f32 getFX(f32);
-    /* 80053E60 */ f32 getValue(f32, f32);
+    void init(int, int, int);
+    f32 get();
+    f32 getF(f32);
+    f32 getFX(f32);
+    f32 getValue(f32, f32);
 
     /* 0x0 */ int seed0;
     /* 0x4 */ int seed1;
@@ -37,13 +37,13 @@ public:
 
 class dDlst_snapShot_c : public dDlst_base_c {
 public:
-    /* 80252ED4 */ virtual void draw();
+    virtual void draw();
 };
 
 class dDlst_effectLine_c : public dDlst_base_c {
 public:
-    /* 80053E9C */ virtual void draw();
-    /* 800541F4 */ void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
+    virtual void draw();
+    void update(cXyz&, _GXColor&, u16, u16, u16, u16, f32, f32, f32, f32);
 
     f32 getRndValue(f32 param_0, f32 param_1) { return mRnd.getValue(param_0, param_1); }
     f32 getRndFX(f32 param_0) { return mRnd.getFX(param_0); }
@@ -68,8 +68,8 @@ private:
 
 class dDlst_2D_c : public dDlst_base_c {
 public:
-    /* 80053A00 */ dDlst_2D_c(ResTIMG* image, s16 posX, s16 posY, s16 width, s16 height, u8 alpha);
-    /* 80053A9C */ virtual void draw();
+    dDlst_2D_c(ResTIMG* image, s16 posX, s16 posY, s16 width, s16 height, u8 alpha);
+    virtual void draw();
 
     void setAlpha(u8 alpha) { mAlpha = alpha; }
     J2DPicture* getPicture() { return &mpPicture; }
@@ -87,7 +87,7 @@ private:
 class dDlst_2DQuad_c : public dDlst_base_c {
 public:
     dDlst_2DQuad_c() {}
-    /* 80051CF0 */ virtual void draw();
+    virtual void draw();
 
     void init(s16 posX, s16 posY, s16 width, s16 height, GXColor& color) {
         mPosX = posX;
@@ -106,9 +106,9 @@ public:
 
 class dDlst_2DT2_c : public dDlst_base_c {
 public:
-    /* 80052354 */ virtual void draw();
-    /* 80052B00 */ dDlst_2DT2_c();
-    /* 80052B4C */ void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32);
+    virtual void draw();
+    dDlst_2DT2_c();
+    void init(ResTIMG*, f32, f32, f32, f32, u8, u8, u8, f32, f32);
 
     f32 getScaleX() { return mScaleX; }
     void setScaleX(f32 scale) { mScaleX = scale; }
@@ -137,8 +137,8 @@ public:
     };
 
     dDlst_peekZ_c() { mCount = 0; }
-    /* 80056018 */ int newData(s16, s16, u32*);
-    /* 80056080 */ void peekData();
+    int newData(s16, s16, u32*);
+    void peekData();
 
     /* 0x0 */ u8 mCount;
     /* 0x4 */ dDlst_peekZ_entry mEntries[0x40];
@@ -146,9 +146,9 @@ public:
 
 class dDlst_shadowSimple_c {
 public:
-    /* 8005520C */ void draw();
-    /* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
-    /* 8005638C */ dDlst_shadowSimple_c();
+    void draw();
+    void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    dDlst_shadowSimple_c();
 
     /* 0x00 */ u8 mAlpha;
     /* 0x04 */ _GXTexObj* mpTexObj;
@@ -160,8 +160,8 @@ struct cBgD_Vtx_t;
 
 class dDlst_shadowTri_c {
 public:
-    /* 80056270 */ ~dDlst_shadowTri_c() {}
-    /* 80056344 */ dDlst_shadowTri_c() {}
+    ~dDlst_shadowTri_c() {}
+    dDlst_shadowTri_c() {}
 
     /* 0x0 */ cXyz mPos[3];
 };
@@ -174,8 +174,8 @@ public:
 
     void reset() { mCount = 0; }
 
-    /* 80054288 */ int set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
-    /* 800543B4 */ void draw();
+    int set(cBgD_Vtx_t*, u16, u16, u16, cM3dGPla*);
+    void draw();
 
     virtual dDlst_shadowTri_c* getTri() = 0;
     virtual s32 getTriMax() = 0;
@@ -186,22 +186,22 @@ public:
 
 class dDlst_shadowRealPoly_c : public dDlst_shadowPoly_c {
 public:
-    /* 800569A0 */ virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
-    /* 800569A8 */ virtual s32 getTriMax() { return ARRAY_SIZEU(mShadowTri); }
+    virtual dDlst_shadowTri_c* getTri() { return mShadowTri; }
+    virtual s32 getTriMax() { return ARRAY_SIZEU(mShadowTri); }
 
     /* 0x8 */ dDlst_shadowTri_c mShadowTri[256];
 };
 
 class dDlst_shadowReal_c {
 public:
-    /* 800544F0 */ void reset();
-    /* 80054500 */ void imageDraw(f32 (*)[4]);
-    /* 800545D4 */ void draw();
-    /* 80054BD0 */ u8 setShadowRealMtx(cXyz*, cXyz*, f32, f32, f32, dKy_tevstr_c*);
-    /* 80055028 */ u32 set(u32, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*, f32, f32);
-    /* 800551D4 */ bool add(J3DModel*);
-    /* 800561F8 */ ~dDlst_shadowReal_c() {}
-    /* 800562D0 */ dDlst_shadowReal_c() { mState = 0; }
+    void reset();
+    void imageDraw(f32 (*)[4]);
+    void draw();
+    u8 setShadowRealMtx(cXyz*, cXyz*, f32, f32, f32, dKy_tevstr_c*);
+    u32 set(u32, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*, f32, f32);
+    bool add(J3DModel*);
+    ~dDlst_shadowReal_c() {}
+    dDlst_shadowReal_c() { mState = 0; }
 
     dDlst_shadowReal_c* getZsortNext() { return mZsortNext; }
     dDlst_shadowReal_c* getZsortPre() { return mZsortPre; }
@@ -231,14 +231,14 @@ private:
 class dDlst_shadowControl_c {
 public:
     dDlst_shadowControl_c() { field_0x0 = 0; }
-    /* 80055684 */ void init();
-    /* 80055768 */ void reset();
-    /* 800557C8 */ void imageDraw(f32 (*)[4]);
-    /* 80055A14 */ void draw(f32 (*)[4]);
-    /* 80055C74 */ int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
-    /* 80055F1C */ bool addReal(u32, J3DModel*);
-    /* 80055F84 */ int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
-    /* 80055FE8 */ static void setSimpleTex(ResTIMG const*);
+    void init();
+    void reset();
+    void imageDraw(f32 (*)[4]);
+    void draw(f32 (*)[4]);
+    int setReal(u32, s8, J3DModel*, cXyz*, f32, f32, dKy_tevstr_c*);
+    bool addReal(u32, J3DModel*);
+    int setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*);
+    static void setSimpleTex(ResTIMG const*);
 
     static GXTexObj* getSimpleTex() { return &mSimpleTexObj; }
 
@@ -261,8 +261,8 @@ class dDlst_window_c {
 public:
     dDlst_window_c() {}
     ~dDlst_window_c() {}
-    /* 80051AC0 */ void setViewPort(f32, f32, f32, f32, f32, f32);
-    /* 80051ADC */ void setScissor(f32, f32, f32, f32);
+    void setViewPort(f32, f32, f32, f32, f32, f32);
+    void setScissor(f32, f32, f32, f32);
 
     void setCameraID(int id) { mCameraID = id; }
     int getCameraID() { return mCameraID; }
@@ -283,20 +283,20 @@ struct view_class;
 
 class dDlst_list_c {
 public:
-    /* 800560F0 */ dDlst_list_c();
-    /* 80056390 */ void init();
-    /* 8005648C */ ~dDlst_list_c();
-    /* 80056538 */ void reset();
-    /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
-    /* 800566D4 */ void drawOpaDrawList(J3DDrawBuffer*);
-    /* 80056710 */ void drawXluDrawList(J3DDrawBuffer*);
-    /* 8005674C */ void drawOpaListItem3d();
-    /* 80056770 */ void drawXluListItem3d();
-    /* 80056794 */ int set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
-    /* 800567C4 */ void draw(dDlst_base_c**, dDlst_base_c**);
-    /* 8005681C */ static void wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor);
-    /* 800568D8 */ static void wipeIn(f32 i_wipeSpeed);
-    /* 80056900 */ static void calcWipe();
+    dDlst_list_c();
+    void init();
+    ~dDlst_list_c();
+    void reset();
+    void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&);
+    void drawOpaDrawList(J3DDrawBuffer*);
+    void drawXluDrawList(J3DDrawBuffer*);
+    void drawOpaListItem3d();
+    void drawXluListItem3d();
+    int set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
+    void draw(dDlst_base_c**, dDlst_base_c**);
+    static void wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor);
+    static void wipeIn(f32 i_wipeSpeed);
+    static void calcWipe();
 
     enum DrawBuffer {
         /* 0x00 */ DB_OPA_LIST_SKY,
diff --git a/include/d/d_envse.h b/include/d/d_envse.h
index aadf2d4899..58ea62c81d 100644
--- a/include/d/d_envse.h
+++ b/include/d/d_envse.h
@@ -7,8 +7,8 @@ class dStage_SoundInfo_c;
 
 class dEnvSe_c : public kankyo_class {
 public:
-    /* 80182FD8 */ int execute_common(dStage_SoundInfo_c*, s8*, u8);
-    /* 80183480 */ int execute();
+    int execute_common(dStage_SoundInfo_c*, s8*, u8);
+    int execute();
 
     /* 0x0F8 */ u8 field_0xf8[0x0FC - 0x0F8];
     /* 0x0FC */ s8 field_0xfc;
diff --git a/include/d/d_error_msg.h b/include/d/d_error_msg.h
index b38c67403f..8016378b22 100644
--- a/include/d/d_error_msg.h
+++ b/include/d/d_error_msg.h
@@ -4,12 +4,12 @@
 #include "d/d_com_inf_game.h"
 
 struct dShutdownErrorMsg_c {
-    /* 8009D790 */ static bool execute();
+    static bool execute();
 };
 
 struct dDvdErrorMsg_c {
-    /* 8009D194 */ static void draw(s32);
-    /* 8009D354 */ static u8 execute();
+    static void draw(s32);
+    static u8 execute();
 };
 
 #endif /* D_D_ERROR_MSG_H */
diff --git a/include/d/d_event_lib.h b/include/d/d_event_lib.h
index 51f2b0501b..ac497e28a7 100644
--- a/include/d/d_event_lib.h
+++ b/include/d/d_event_lib.h
@@ -28,16 +28,16 @@ public:
         mAction = NULL;
     }
 
-    /* 8004886C */ bool eventUpdate();
-    /* 800488A4 */ bool setEvent(int, int, int);
-    /* 80048940 */ void orderEvent(int, int, int);
-    /* 80048970 */ bool setAction(action_class<dEvLib_callback_c>*);
-    /* 800489A8 */ bool initAction();
-    /* 800489F8 */ bool executeAction();
-    /* 80048A50 */ bool initStart();
-    /* 80048A70 */ bool executeStart();
-    /* 80048B1C */ bool initRun();
-    /* 80048B48 */ bool executeRun();
+    bool eventUpdate();
+    bool setEvent(int, int, int);
+    void orderEvent(int, int, int);
+    bool setAction(action_class<dEvLib_callback_c>*);
+    bool initAction();
+    bool executeAction();
+    bool initStart();
+    bool executeStart();
+    bool initRun();
+    bool executeRun();
 
     virtual ~dEvLib_callback_c() {}
     virtual bool eventStart() { return true; }
diff --git a/include/d/d_eye_hl.h b/include/d/d_eye_hl.h
index 4df1e63f36..ef3263cda4 100644
--- a/include/d/d_eye_hl.h
+++ b/include/d/d_eye_hl.h
@@ -9,9 +9,9 @@ class dEyeHL_c;
 
 class dEyeHL_mng_c {
 public:
-    /* 8009CA48 */ static void update();
-    /* 8009CB14 */ static void entry(dEyeHL_c*);
-    /* 8009CB34 */ static void remove(dEyeHL_c*);
+    static void update();
+    static void entry(dEyeHL_c*);
+    static void remove(dEyeHL_c*);
 
     static dEyeHL_c* m_obj;
 };
@@ -24,9 +24,9 @@ public:
         m_next = NULL;
     }
 
-    /* 8009C964 */ void entry(J3DModelData*, char const*);
-    /* 8009CA28 */ void remove();
-    /* 80140C80 */ virtual ~dEyeHL_c() { remove(); }
+    void entry(J3DModelData*, char const*);
+    void remove();
+    virtual ~dEyeHL_c() { remove(); }
 
     /* 0x04 */ ResTIMG* m_timg;
     /* 0x08 */ s16 m_lodBias;
diff --git a/include/d/d_file_sel_info.h b/include/d/d_file_sel_info.h
index 0d75e7f9d6..73641bc770 100644
--- a/include/d/d_file_sel_info.h
+++ b/include/d/d_file_sel_info.h
@@ -20,17 +20,17 @@ class dSv_save_c;
 
 class dFile_info_c {
 public:
-    /* 80192434 */ dFile_info_c(JKRArchive*, u8);
-    /* 80192570 */ void screenSet();
-    /* 80192954 */ int setSaveData(dSv_save_c*, int, u8);
-    /* 80192AA0 */ void setHeartCnt(dSv_save_c*);
-    /* 80192C08 */ void setSaveDate(dSv_save_c*);
-    /* 80192C70 */ void setPlayTime(dSv_save_c*);
-    /* 80192D58 */ void modeWait();
-    /* 80192D5C */ void modeMove();
-    /* 80192D60 */ void _draw();
+    dFile_info_c(JKRArchive*, u8);
+    void screenSet();
+    int setSaveData(dSv_save_c*, int, u8);
+    void setHeartCnt(dSv_save_c*);
+    void setSaveDate(dSv_save_c*);
+    void setPlayTime(dSv_save_c*);
+    void modeWait();
+    void modeMove();
+    void _draw();
 
-    /* 801924A0 */ virtual ~dFile_info_c();
+    virtual ~dFile_info_c();
 
     void setBasePane(J2DPane* pane) { mFileInfo.mBasePane = pane; }
     CPaneMgrAlpha* getDatBase() { return mDatBase; }
diff --git a/include/d/d_file_sel_warning.h b/include/d/d_file_sel_warning.h
index 640f26e99c..ac13693b78 100644
--- a/include/d/d_file_sel_warning.h
+++ b/include/d/d_file_sel_warning.h
@@ -12,8 +12,8 @@ class dMsgString_c;
 
 class dDlst_FileWarn_c : public dDlst_base_c {
 public:
-    /* 80192354 */ virtual void draw();
-    /* 801923CC */ virtual ~dDlst_FileWarn_c() {}
+    virtual void draw();
+    virtual ~dDlst_FileWarn_c() {}
 
     /* 0x04 */ J2DScreen* Scr;
     /* 0x08 */ JUTFont* mFont;
@@ -22,21 +22,21 @@ public:
 
 class dFile_warning_c {
 public:
-    /* 80191BAC */ dFile_warning_c(JKRArchive*, u8);
-    /* 80191CF4 */ void screenSet();
-    /* 80191F18 */ void _move();
-    /* 80191F90 */ void modeWait();
-    /* 80191F94 */ void modeMove();
-    /* 80191FD4 */ bool baseMoveAnm();
-    /* 801920B8 */ void openInit();
-    /* 8019210C */ void closeInit();
-    /* 80192160 */ void init();
-    /* 80192190 */ void _draw();
-    /* 801921CC */ void drawSelf();
-    /* 801921F8 */ void setText(u32);
-    /* 80192240 */ void setFontColor(JUtility::TColor, JUtility::TColor);
+    dFile_warning_c(JKRArchive*, u8);
+    void screenSet();
+    void _move();
+    void modeWait();
+    void modeMove();
+    bool baseMoveAnm();
+    void openInit();
+    void closeInit();
+    void init();
+    void _draw();
+    void drawSelf();
+    void setText(u32);
+    void setFontColor(JUtility::TColor, JUtility::TColor);
 
-    /* 80191C18 */ virtual ~dFile_warning_c();
+    virtual ~dFile_warning_c();
 
     u8 getStatus() { return mStatus; }
     void draw() { _draw(); }
diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h
index ce5b3f1d20..06fd831d23 100644
--- a/include/d/d_file_select.h
+++ b/include/d/d_file_select.h
@@ -12,8 +12,8 @@ class dFile_info_c;
 
 class dDlst_FileSel_c : public dDlst_base_c {
 public:
-    /* 8018DEBC */ void draw();
-    /* 8019135C */ virtual ~dDlst_FileSel_c() {
+    void draw();
+    virtual ~dDlst_FileSel_c() {
         delete Scr;
         delete mpMessageString;
     }
@@ -31,21 +31,21 @@ public:
 
 class dFile_select3D_c {
 public:
-    /* 801902F0 */ dFile_select3D_c();
-    /* 80190380 */ virtual ~dFile_select3D_c();
-    /* 801903DC */ void _create(u8, u8);
-    /* 8019049C */ void _delete();
-    /* 801904A0 */ void freeHeap();
-    /* 801904E4 */ void _move();
-    /* 801905A8 */ void draw();
-    /* 8019065C */ void setJ3D(char const*, char const*, char const*);
-    /* 8019095C */ void set_mtx();
-    /* 80190A14 */ void animePlay();
-    /* 80190B44 */ void animeEntry();
-    /* 80190BA8 */ void createMaskModel();
-    /* 80190D68 */ void createMirrorModel();
-    /* 80190FE8 */ void toItem3Dpos(f32, f32, f32, cXyz*);
-    /* 801910D4 */ void calcViewMtx(Mtx);
+    dFile_select3D_c();
+    virtual ~dFile_select3D_c();
+    void _create(u8, u8);
+    void _delete();
+    void freeHeap();
+    void _move();
+    void draw();
+    void setJ3D(char const*, char const*, char const*);
+    void set_mtx();
+    void animePlay();
+    void animeEntry();
+    void createMaskModel();
+    void createMirrorModel();
+    void toItem3Dpos(f32, f32, f32, cXyz*);
+    void calcViewMtx(Mtx);
 
     void drawOff() { mpModel = 0; }
     void setBasePane(CPaneMgr* paneMgr) { mPaneMgr = paneMgr; }
@@ -71,8 +71,8 @@ public:
 
 class dDlst_FileSelYn_c : public dDlst_base_c {
 public:
-    /* 8018E0C0 */ void draw();
-    /* 801911F4 */ virtual ~dDlst_FileSelYn_c() { delete ScrYn; }
+    void draw();
+    virtual ~dDlst_FileSelYn_c() { delete ScrYn; }
 
     /* 0x04 */ J2DScreen* ScrYn;
     /* 0x08 */ u8 field_0x08[4];
@@ -80,8 +80,8 @@ public:
 
 class dDlst_FileSelDt_c : public dDlst_base_c {
 public:
-    /* 8018DEF4 */ void draw();
-    /* 801912E4 */ virtual ~dDlst_FileSelDt_c() { delete ScrDt; }
+    void draw();
+    virtual ~dDlst_FileSelDt_c() { delete ScrDt; }
 
     /* 0x04 */ J2DScreen* ScrDt;
     /* 0x08 */ J2DPane* mpPane;
@@ -90,8 +90,8 @@ public:
 
 class dDlst_FileSelCp_c : public dDlst_base_c {
 public:
-    /* 8018DFFC */ void draw();
-    /* 8019126C */ virtual ~dDlst_FileSelCp_c() { delete Scr; }
+    void draw();
+    virtual ~dDlst_FileSelCp_c() { delete Scr; }
 
     /* 0x04 */ J2DScreen* Scr;
     /* 0x08 */ bool field_0x08;
@@ -101,16 +101,16 @@ public:
 
 class dDlst_FileSel3m_c : public dDlst_base_c {
 public:
-    /* 8018E0F8 */ void draw();
-    /* 8019117C */ virtual ~dDlst_FileSel3m_c() { delete Scr3m; }
+    void draw();
+    virtual ~dDlst_FileSel3m_c() { delete Scr3m; }
 
     /* 0x04 */ J2DScreen* Scr3m;
 };
 
 class dFs_HIO_c {
 public:
-    /* 801835F8 */ dFs_HIO_c();
-    /* 801913E0 */ virtual ~dFs_HIO_c() {}
+    dFs_HIO_c();
+    virtual ~dFs_HIO_c() {}
 
     /* 0x0000 */ // void* vtable;
     /* 0x0004 */ s8 field_0x0004;
@@ -145,163 +145,163 @@ class dFile_select_c {
 public:
     typedef void (dFile_select_c::*DispFunc)();
 
-    /* 8018366C */ dFile_select_c(JKRArchive*);
-    /* 8018375C */ virtual ~dFile_select_c();
-    /* 801843CC */ void _create();
-    /* 801844FC */ void _move();
-    /* 80184664 */ void selFileWakuAnm();
-    /* 801848A0 */ void bookIconAnm();
-    /* 8018499C */ void selCopyFileWakuAnm();
-    /* 80184A48 */ void copyBookIconAnm();
-    /* 80184B44 */ void dataDelEffAnm();
-    /* 80184BFC */ void dataCopyEffAnm();
-    /* 80184CB4 */ void selectDataBaseMoveAnmInitSet(int, int);
-    /* 80184D4C */ bool selectDataBaseMoveAnm();
-    /* 80184E38 */ void dataSelectInAnmSet();
-    /* 80185040 */ void dataSelectIn();
-    /* 80185230 */ void dataSelectInit();
-    /* 801853C4 */ void dataSelect();
-    /* 80185508 */ void dataSelectStart();
-    /* 80185994 */ void selectDataMoveAnmInitSet(int, int);
-    /* 80185AAC */ bool selectDataMoveAnm();
-    /* 80185C2C */ void dataSelectAnmSet();
-    /* 80185DE0 */ void dataSelectMoveAnime();
-    /* 80186088 */ void makeRecInfo(u8);
-    /* 801864DC */ void selectDataOpenMove();
-    /* 80186638 */ void selectDataNameMove();
-    /* 801866C8 */ void selectDataOpenEraseMove();
-    /* 80186774 */ void menuSelect();
-    /* 801868EC */ void menuSelectStart();
-    /* 80186A80 */ void menuSelectCansel();
-    /* 80186B48 */ void menuMoveAnmInitSet(int, int);
-    /* 80186CAC */ bool menuMoveAnm();
-    /* 80186E14 */ void menuSelectAnmSet();
-    /* 80186F98 */ void menuSelectMoveAnm();
-    /* 8018721C */ void ToNameMove();
-    /* 801872C4 */ void ToNameMove2();
-    /* 80187384 */ void nameInputWait();
-    /* 801873BC */ void nameInput();
-    /* 801874F8 */ void nameToDataSelectMove();
-    /* 8018759C */ void nameInputFade();
-    /* 801876A0 */ void nameInput2Move();
-    /* 8018774C */ void nameInput2();
-    /* 80187824 */ void backNameInputMove0();
-    /* 80187908 */ void backNameInputMove();
-    /* 801879B8 */ void ToCopyPaneMove();
-    /* 80187ADC */ void ToErasePaneMove();
-    /* 80187B44 */ void backSelectMove();
-    /* 80187BE8 */ void copySelMoveAnmInitSet(int, int);
-    /* 80187DB8 */ void setSaveDataForCopySel();
-    /* 80187ED4 */ void copyDataToSelect();
-    /* 8018801C */ void copyDataToSelectStart();
-    /* 80188234 */ void copyDataToSelectCansel();
-    /* 8018832C */ void copyDataToSelectMoveAnmSet();
-    /* 801884D0 */ void copyDataToSelectMoveAnm();
-    /* 80188834 */ void copySelectWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 80188878 */ bool copySelectWakuAlpahAnm(u8);
-    /* 80188950 */ u8 getCptoNum(u8);
-    /* 80188994 */ void copyToSelBack();
-    /* 80188B54 */ void copyToSelPaneMove();
-    /* 80188BBC */ bool yesnoMenuMoveAnmInitSet(int, int);
-    /* 80188D38 */ bool yesnoMenuMoveAnm();
-    /* 80188ED0 */ bool yesnoSelectMoveAnm();
-    /* 8018912C */ void yesnoCursorShow();
-    /* 8018929C */ void YesNoSelect();
-    /* 801893E4 */ void yesNoSelectStart();
-    /* 8018978C */ void yesnoSelectAnmSet();
-    /* 80189904 */ void yesnoCancelAnmSet();
-    /* 80189A24 */ void YesNoCancelMove();
-    /* 80189BA8 */ void yesNoCursorMoveAnm();
-    /* 80189C14 */ void CmdExecPaneMove0();
-    /* 80189E28 */ void CommandExec();
-    /* 80189F68 */ void DataEraseWait();
-    /* 80189FFC */ void DataEraseWait2();
-    /* 8018A194 */ void ErasePaneMoveOk();
-    /* 8018A2DC */ void ErasePaneMoveOk2();
-    /* 8018A3B0 */ void eraseEndBackSelectWait();
-    /* 8018A444 */ void eraseEndBackSelect();
-    /* 8018A4D0 */ void DataCopyWait();
-    /* 8018A564 */ void DataCopyWait2();
-    /* 8018A6F8 */ void copyPaneMoveOk();
-    /* 8018A868 */ void copyPaneMoveOk2();
-    /* 8018A960 */ void ErrorMsgPaneMove();
-    /* 8018AAC4 */ void backDatSelPaneMove();
-    /* 8018AC3C */ void backDatSelWait();
-    /* 8018AD38 */ void backDatSelWait2();
-    /* 8018AD9C */ void nextModeWait();
-    /* 8018ADA0 */ void screenSet();
-    /* 8018BF2C */ void screenSetCopySel();
-    /* 8018C524 */ void screenSetYesNo();
-    /* 8018C8F4 */ void screenSet3Menu();
-    /* 8018CCD0 */ void screenSetDetail();
-    /* 8018CE38 */ void setWakuAnm();
-    /* 8018CF50 */ void displayInit();
-    /* 8018D044 */ void setSaveData();
-    /* 8018D0E4 */ void headerTxtSet(u16, u8, u8);
-    /* 8018D25C */ bool headerTxtChangeAnm();
-    /* 8018D344 */ void modoruTxtChange(u8);
-    /* 8018D3A0 */ void modoruTxtDispAnmInit(u8);
-    /* 8018D41C */ bool modoruTxtDispAnm();
-    /* 8018D4F8 */ void ketteiTxtDispAnmInit(u8);
-    /* 8018D574 */ bool ketteiTxtDispAnm();
-    /* 8018D650 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 8018D68C */ bool selectWakuAlpahAnm(u8);
-    /* 8018D764 */ void selFileCursorShow();
-    /* 8018D884 */ void menuWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 8018D8C8 */ bool menuWakuAlpahAnm(u8);
-    /* 8018DA10 */ void menuCursorShow();
-    /* 8018DB80 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 8018DBCC */ bool yesnoWakuAlpahAnm(u8);
-    /* 8018DD38 */ void _draw();
-    /* 8018E130 */ void errorMoveAnmInitSet(int, int);
-    /* 8018E1C0 */ bool errorMoveAnm();
-    /* 8018E2B4 */ void errDispInitSet(int, int);
-    /* 8018E4CC */ void MemCardCheckMain();
-    /* 8018E504 */ void MemCardStatCheck();
-    /* 8018E7C4 */ void MemCardLoadWait();
-    /* 8018E93C */ void MemCardErrMsgWaitKey();
-    /* 8018E9B0 */ void noFileSpaceDispInit();
-    /* 8018E9D4 */ void MemCardNoFileSpaceDisp();
-    /* 8018EA3C */ void iplSelDispInit();
-    /* 8018EA90 */ void MemCardGotoIPLSelectDisp();
-    /* 8018EB10 */ void MemCardGotoIPLSelect();
-    /* 8018EBCC */ void MemCardGotoIPL();
-    /* 8018EC4C */ void noSaveSelDispInit();
-    /* 8018ECBC */ void MemCardNoSaveSelDisp();
-    /* 8018ED80 */ void MemCardErrMsgWaitNoSaveSel();
-    /* 8018EF5C */ void formatYesSelDispInitSet();
-    /* 8018EFAC */ void formatNoSelDispInitSet();
-    /* 8018EFFC */ void MemCardFormatYesSelDisp();
-    /* 8018F080 */ void MemCardFormatNoSelDisp();
-    /* 8018F128 */ void MemCardErrMsgWaitFormatSel();
-    /* 8018F17C */ void formatYesSel2DispInitSet();
-    /* 8018F1CC */ void MemCardErrMsgWaitFormatSel2();
-    /* 8018F228 */ void MemCardFormatYesSel2Disp();
-    /* 8018F2A4 */ void MemCardFormat();
-    /* 8018F304 */ void MemCardFormatWait();
-    /* 8018F374 */ void MemCardFormatCheck();
-    /* 8018F400 */ void MemCardMakeGameFileSel();
-    /* 8018F488 */ void MemCardMakeGameFileSelDisp();
-    /* 8018F580 */ void MemCardMakeGameFile();
-    /* 8018F5E0 */ void MemCardMakeGameFileWait();
-    /* 8018F650 */ void MemCardMakeGameFileCheck();
-    /* 8018F6DC */ void MemCardMsgWindowInitOpen();
-    /* 8018F8D8 */ void MemCardMsgWindowOpen();
-    /* 8018F974 */ void MemCardMsgWindowClose();
-    /* 8018FA2C */ bool errYesNoSelect();
-    /* 8018FB80 */ void errCurMove(u8);
-    /* 8018FBF8 */ void MemCardErrYesNoCursorMoveAnm();
-    /* 8018FC64 */ void errorTxtSet(u16);
-    /* 8018FD30 */ bool errorTxtChangeAnm();
-    /* 8018FE18 */ bool fileRecScaleAnm();
-    /* 8018FE64 */ void fileRecScaleAnmInitSet2(f32, f32);
-    /* 8018FEF4 */ bool fileRecScaleAnm2();
-    /* 8018FF9C */ bool fileInfoScaleAnm();
-    /* 80190074 */ void nameMoveAnmInitSet(int, int);
-    /* 80190124 */ bool nameMoveAnm();
-    /* 80190208 */ void MemCardSaveDataClear();
-    /* 80190254 */ void setInitSaveData();
-    /* 801902B8 */ void dataSave();
+    dFile_select_c(JKRArchive*);
+    virtual ~dFile_select_c();
+    void _create();
+    void _move();
+    void selFileWakuAnm();
+    void bookIconAnm();
+    void selCopyFileWakuAnm();
+    void copyBookIconAnm();
+    void dataDelEffAnm();
+    void dataCopyEffAnm();
+    void selectDataBaseMoveAnmInitSet(int, int);
+    bool selectDataBaseMoveAnm();
+    void dataSelectInAnmSet();
+    void dataSelectIn();
+    void dataSelectInit();
+    void dataSelect();
+    void dataSelectStart();
+    void selectDataMoveAnmInitSet(int, int);
+    bool selectDataMoveAnm();
+    void dataSelectAnmSet();
+    void dataSelectMoveAnime();
+    void makeRecInfo(u8);
+    void selectDataOpenMove();
+    void selectDataNameMove();
+    void selectDataOpenEraseMove();
+    void menuSelect();
+    void menuSelectStart();
+    void menuSelectCansel();
+    void menuMoveAnmInitSet(int, int);
+    bool menuMoveAnm();
+    void menuSelectAnmSet();
+    void menuSelectMoveAnm();
+    void ToNameMove();
+    void ToNameMove2();
+    void nameInputWait();
+    void nameInput();
+    void nameToDataSelectMove();
+    void nameInputFade();
+    void nameInput2Move();
+    void nameInput2();
+    void backNameInputMove0();
+    void backNameInputMove();
+    void ToCopyPaneMove();
+    void ToErasePaneMove();
+    void backSelectMove();
+    void copySelMoveAnmInitSet(int, int);
+    void setSaveDataForCopySel();
+    void copyDataToSelect();
+    void copyDataToSelectStart();
+    void copyDataToSelectCansel();
+    void copyDataToSelectMoveAnmSet();
+    void copyDataToSelectMoveAnm();
+    void copySelectWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool copySelectWakuAlpahAnm(u8);
+    u8 getCptoNum(u8);
+    void copyToSelBack();
+    void copyToSelPaneMove();
+    bool yesnoMenuMoveAnmInitSet(int, int);
+    bool yesnoMenuMoveAnm();
+    bool yesnoSelectMoveAnm();
+    void yesnoCursorShow();
+    void YesNoSelect();
+    void yesNoSelectStart();
+    void yesnoSelectAnmSet();
+    void yesnoCancelAnmSet();
+    void YesNoCancelMove();
+    void yesNoCursorMoveAnm();
+    void CmdExecPaneMove0();
+    void CommandExec();
+    void DataEraseWait();
+    void DataEraseWait2();
+    void ErasePaneMoveOk();
+    void ErasePaneMoveOk2();
+    void eraseEndBackSelectWait();
+    void eraseEndBackSelect();
+    void DataCopyWait();
+    void DataCopyWait2();
+    void copyPaneMoveOk();
+    void copyPaneMoveOk2();
+    void ErrorMsgPaneMove();
+    void backDatSelPaneMove();
+    void backDatSelWait();
+    void backDatSelWait2();
+    void nextModeWait();
+    void screenSet();
+    void screenSetCopySel();
+    void screenSetYesNo();
+    void screenSet3Menu();
+    void screenSetDetail();
+    void setWakuAnm();
+    void displayInit();
+    void setSaveData();
+    void headerTxtSet(u16, u8, u8);
+    bool headerTxtChangeAnm();
+    void modoruTxtChange(u8);
+    void modoruTxtDispAnmInit(u8);
+    bool modoruTxtDispAnm();
+    void ketteiTxtDispAnmInit(u8);
+    bool ketteiTxtDispAnm();
+    void selectWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool selectWakuAlpahAnm(u8);
+    void selFileCursorShow();
+    void menuWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool menuWakuAlpahAnm(u8);
+    void menuCursorShow();
+    void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool yesnoWakuAlpahAnm(u8);
+    void _draw();
+    void errorMoveAnmInitSet(int, int);
+    bool errorMoveAnm();
+    void errDispInitSet(int, int);
+    void MemCardCheckMain();
+    void MemCardStatCheck();
+    void MemCardLoadWait();
+    void MemCardErrMsgWaitKey();
+    void noFileSpaceDispInit();
+    void MemCardNoFileSpaceDisp();
+    void iplSelDispInit();
+    void MemCardGotoIPLSelectDisp();
+    void MemCardGotoIPLSelect();
+    void MemCardGotoIPL();
+    void noSaveSelDispInit();
+    void MemCardNoSaveSelDisp();
+    void MemCardErrMsgWaitNoSaveSel();
+    void formatYesSelDispInitSet();
+    void formatNoSelDispInitSet();
+    void MemCardFormatYesSelDisp();
+    void MemCardFormatNoSelDisp();
+    void MemCardErrMsgWaitFormatSel();
+    void formatYesSel2DispInitSet();
+    void MemCardErrMsgWaitFormatSel2();
+    void MemCardFormatYesSel2Disp();
+    void MemCardFormat();
+    void MemCardFormatWait();
+    void MemCardFormatCheck();
+    void MemCardMakeGameFileSel();
+    void MemCardMakeGameFileSelDisp();
+    void MemCardMakeGameFile();
+    void MemCardMakeGameFileWait();
+    void MemCardMakeGameFileCheck();
+    void MemCardMsgWindowInitOpen();
+    void MemCardMsgWindowOpen();
+    void MemCardMsgWindowClose();
+    bool errYesNoSelect();
+    void errCurMove(u8);
+    void MemCardErrYesNoCursorMoveAnm();
+    void errorTxtSet(u16);
+    bool errorTxtChangeAnm();
+    bool fileRecScaleAnm();
+    void fileRecScaleAnmInitSet2(f32, f32);
+    bool fileRecScaleAnm2();
+    bool fileInfoScaleAnm();
+    void nameMoveAnmInitSet(int, int);
+    bool nameMoveAnm();
+    void MemCardSaveDataClear();
+    void setInitSaveData();
+    void dataSave();
 
     bool getFadeFlag() { return mFadeFlag; }
     int isDataNew(u8 i) { return mDataNew[i]; }
diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h
index 91f071b812..1b77bf5b43 100644
--- a/include/d/d_gameover.h
+++ b/include/d/d_gameover.h
@@ -10,18 +10,18 @@
 
 class dDlst_Gameover_CAPTURE_c : public dDlst_base_c {
 public:
-    /* 8019ACF8 */ virtual void draw();
-    /* 8019C2CC */ virtual ~dDlst_Gameover_CAPTURE_c() {}
+    virtual void draw();
+    virtual ~dDlst_Gameover_CAPTURE_c() {}
 };
 
 class dMsgScrnLight_c;
 class dDlst_GameOverScrnDraw_c : public dDlst_base_c {
 public:
-    /* 8019B940 */ dDlst_GameOverScrnDraw_c(JKRArchive*);
-    /* 8019BCB0 */ void setBackAlpha(f32);
+    dDlst_GameOverScrnDraw_c(JKRArchive*);
+    void setBackAlpha(f32);
 
-    /* 8019BCF4 */ virtual void draw();
-    /* 8019BBFC */ virtual ~dDlst_GameOverScrnDraw_c();
+    virtual void draw();
+    virtual ~dDlst_GameOverScrnDraw_c();
 
     /* 0x04 */ J2DScreen* mpScreen;
     /* 0x08 */ J2DPicture* mpBackImg;
@@ -44,28 +44,28 @@ enum dGameover_Proc {
 
 class dGameover_c : public msg_class {
 public:
-    /* 8019B044 */ int _create();
-    /* 8019B2F4 */ int _execute();
-    /* 8019B384 */ void playerAnmWait_init();
-    /* 8019B388 */ void playerAnmWait_proc();
-    /* 8019B3A0 */ void dispFadeOut_init();
-    /* 8019B3E8 */ void dispFadeOut_proc();
-    /* 8019B40C */ void dispWait_init();
-    /* 8019B454 */ void dispWait_proc();
-    /* 8019B478 */ void demoFadeIn_init();
-    /* 8019B484 */ void demoFadeIn_proc();
-    /* 8019B4D8 */ void demoFadeOut_init();
-    /* 8019B4E4 */ void demoFadeOut_proc();
-    /* 8019B560 */ void saveOpen_init();
-    /* 8019B564 */ void saveOpen_proc();
-    /* 8019B5A4 */ void saveMove_init();
-    /* 8019B5A8 */ void saveMove_proc();
-    /* 8019B5F0 */ void saveClose_init();
-    /* 8019B5F4 */ void saveClose_proc();
-    /* 8019B7BC */ void deleteWait_init();
-    /* 8019B7C0 */ void deleteWait_proc();
-    /* 8019B7C4 */ int _draw();
-    /* 8019B864 */ int _delete();
+    int _create();
+    int _execute();
+    void playerAnmWait_init();
+    void playerAnmWait_proc();
+    void dispFadeOut_init();
+    void dispFadeOut_proc();
+    void dispWait_init();
+    void dispWait_proc();
+    void demoFadeIn_init();
+    void demoFadeIn_proc();
+    void demoFadeOut_init();
+    void demoFadeOut_proc();
+    void saveOpen_init();
+    void saveOpen_proc();
+    void saveMove_init();
+    void saveMove_proc();
+    void saveClose_init();
+    void saveClose_proc();
+    void deleteWait_init();
+    void deleteWait_proc();
+    int _draw();
+    int _delete();
 
     s32 deleteCheck() { return mProc == 8; }
     void animeStart() { mIsDemoSave = true; }
diff --git a/include/d/d_insect.h b/include/d/d_insect.h
index a007046a68..63d522617f 100644
--- a/include/d/d_insect.h
+++ b/include/d/d_insect.h
@@ -17,11 +17,11 @@ public:
         /* 3 */ LOC_UNK_3,
     };
 
-    /* 8015E010 */ dInsect_c();
-    /* 8015E078 */ void Insect_GetDemoMain();
-    /* 8015E26C */ void CalcZBuffer(f32);
+    dInsect_c();
+    void Insect_GetDemoMain();
+    void CalcZBuffer(f32);
 
-    /* 80110648 */ virtual void Insect_Release() { field_0x56c = 1; }
+    virtual void Insect_Release() { field_0x56c = 1; }
     bool ChkGetDemo() { return m_mode > 0; }
     void setItemNo(u8 i_itemNo) { m_itemNo = i_itemNo; }
     void setSaveBitNo(s16 i_saveBitNo) { m_saveBitNo = i_saveBitNo; }
diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h
index bdc3a71fac..46a78f2030 100644
--- a/include/d/d_jnt_col.h
+++ b/include/d/d_jnt_col.h
@@ -18,13 +18,13 @@ public:
 
 class dJntCol_c {
 public:
-    /* 80035C8C */ dJntCol_c();
-    /* 80035CA0 */ int init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
-    /* 80035CC8 */ static void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
-    /* 80035DC8 */ int searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const;
-    /* 80036AEC */ int getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
-    /* 80036C44 */ int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
-    /* 80036FA8 */ void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
+    dJntCol_c();
+    int init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int);
+    static void setNowLine(cM3dGLin*, cXyz const*, csXyz const*, cXyz*);
+    int searchNearPos(cM3dGLin const*, cXyz const*, cXyz*, int) const;
+    int getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
+    int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
+    void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
 
     bool checkPassNum(int bit) { return field_0xc & (1 << bit); }
     void onPassNum(int num) { field_0xc |= (1 << num); }
diff --git a/include/d/d_k_wmark.h b/include/d/d_k_wmark.h
index d8f6f32a3e..10be281182 100644
--- a/include/d/d_k_wmark.h
+++ b/include/d/d_k_wmark.h
@@ -6,8 +6,8 @@
 
 class dkWmark_c : public kankyo_class {
 public:
-    /* 80261640 */ ~dkWmark_c();
-    /* 802616C4 */ BOOL setMatrix();
+    ~dkWmark_c();
+    BOOL setMatrix();
 
     inline int create();
     inline int execute();
diff --git a/include/d/d_k_wpillar.h b/include/d/d_k_wpillar.h
index 0a752a9297..c5da5d76b3 100644
--- a/include/d/d_k_wpillar.h
+++ b/include/d/d_k_wpillar.h
@@ -6,10 +6,10 @@
 
 class dkWpillar_c : public kankyo_class {
 public:
-    /* 80261B54 */ int create();
-    /* 80261F24 */ ~dkWpillar_c();
-    /* 80262014 */ int execute();
-    /* 802620C8 */ int draw();
+    int create();
+    ~dkWpillar_c();
+    int execute();
+    int draw();
 
     /* 0x0F8 */ J3DModel* mpModel;
     /* 0x0FC */ mDoExt_bckAnm mBck;
diff --git a/include/d/d_kankyo.h b/include/d/d_kankyo.h
index 376fb1e8d3..db066bd583 100644
--- a/include/d/d_kankyo.h
+++ b/include/d/d_kankyo.h
@@ -199,32 +199,32 @@ struct dKy_flush_info {
 
 class dScnKy_env_light_c {
 public:
-    /* 8019F2E8 */ dScnKy_env_light_c();
-    /* 8019F4FC */ void setDaytime();
-    /* 8019F788 */ void setSunpos();
-    /* 8019FA08 */ f32 getDaytime();
-    /* 8019FBCC */ f32 getDarkDaytime();
-    /* 8019FBD4 */ void setLight_palno_get(u8*, u8*, u8*, u8*, u8*, u8*, u8*, u8*, f32*, int*, int*,
+    dScnKy_env_light_c();
+    void setDaytime();
+    void setSunpos();
+    f32 getDaytime();
+    f32 getDarkDaytime();
+    void setLight_palno_get(u8*, u8*, u8*, u8*, u8*, u8*, u8*, u8*, f32*, int*, int*,
                                            f32*, u8*);
-    /* 801A040C */ void setLight();
-    /* 801A133C */ void setLight_bg(dKy_tevstr_c*, GXColorS10*, GXColorS10*, f32*, f32*);
-    /* 801A16C0 */ void setLight_actor(dKy_tevstr_c*, GXColorS10*, f32*, f32*);
-    /* 801A1D64 */ void settingTevStruct_colget_actor(cXyz*, dKy_tevstr_c*, GXColorS10*,
+    void setLight();
+    void setLight_bg(dKy_tevstr_c*, GXColorS10*, GXColorS10*, f32*, f32*);
+    void setLight_actor(dKy_tevstr_c*, GXColorS10*, f32*, f32*);
+    void settingTevStruct_colget_actor(cXyz*, dKy_tevstr_c*, GXColorS10*,
                                                       GXColorS10*, f32*, f32*);
-    /* 801A1F58 */ void settingTevStruct_colget_player(dKy_tevstr_c*);
-    /* 801A2128 */ void settingTevStruct_plightcol_plus(cXyz*, dKy_tevstr_c*, GXColorS10,
+    void settingTevStruct_colget_player(dKy_tevstr_c*);
+    void settingTevStruct_plightcol_plus(cXyz*, dKy_tevstr_c*, GXColorS10,
                                                         GXColorS10, u8);
-    /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
-    /* 801A441C */ void setLightTevColorType(J3DModelData*, dKy_tevstr_c*);
-    /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
-    /* 801A4E90 */ void CalcTevColor();
-    /* 801A4F24 */ void Sndpos();
-    /* 801A4F64 */ void Eflight_flush_proc();
-    /* 801A516C */ void SetBaseLight();
-    /* 801A5288 */ void exeKankyo();
-    /* 801A56DC */ void drawKankyo();
+    void settingTevStruct(int, cXyz*, dKy_tevstr_c*);
+    void setLightTevColorType(J3DModelData*, dKy_tevstr_c*);
+    void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*);
+    void CalcTevColor();
+    void Sndpos();
+    void Eflight_flush_proc();
+    void SetBaseLight();
+    void exeKankyo();
+    void drawKankyo();
 
-    /* 801ADBBC */ virtual ~dScnKy_env_light_c() {}
+    virtual ~dScnKy_env_light_c() {}
 
     void setLightTevColorType(J3DModel* model_p, dKy_tevstr_c* tevstr_p) {
         setLightTevColorType(model_p->getModelData(), tevstr_p);
diff --git a/include/d/d_kankyo_wether.h b/include/d/d_kankyo_wether.h
index cf8763682e..14a8d00657 100644
--- a/include/d/d_kankyo_wether.h
+++ b/include/d/d_kankyo_wether.h
@@ -84,8 +84,8 @@ public:
 };  // Size: 0xA0
 
 struct RAIN_EFF {
-    /* 80056CD0 */ ~RAIN_EFF();
-    /* 80056D0C */ RAIN_EFF();
+    ~RAIN_EFF();
+    RAIN_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -124,8 +124,8 @@ public:
 };  // Size: 0x3718
 
 struct SNOW_EFF {
-    /* 80056D58 */ ~SNOW_EFF();
-    /* 80056D94 */ SNOW_EFF();
+    ~SNOW_EFF();
+    SNOW_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -159,8 +159,8 @@ public:
 };
 
 struct STAR_EFF {
-    /* 80056DC8 */ ~STAR_EFF();
-    /* 80056E04 */ STAR_EFF();
+    ~STAR_EFF();
+    STAR_EFF();
 
     /* 0x00 */ u8 field_0x0[4];
     /* 0x04 */ cXyz field_0x04;
@@ -181,8 +181,8 @@ public:
 };
 
 struct HOUSI_EFF {
-    /* 80056EA8 */ ~HOUSI_EFF();
-    /* 80056EE4 */ HOUSI_EFF();
+    ~HOUSI_EFF();
+    HOUSI_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -212,8 +212,8 @@ public:
 };  // Size: 0x5DF0
 
 struct CLOUD_EFF {
-    /* 80056E38 */ ~CLOUD_EFF();
-    /* 80056E74 */ CLOUD_EFF();
+    ~CLOUD_EFF();
+    CLOUD_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -236,8 +236,8 @@ public:
 };  // Size: 0xB08
 
 struct VRKUMO_EFF {
-    /* 80056F18 */ ~VRKUMO_EFF();
-    /* 80056F54 */ VRKUMO_EFF();
+    ~VRKUMO_EFF();
+    VRKUMO_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -266,8 +266,8 @@ public:
 class dKankyo_shstar_Packet : public J3DPacket {};
 
 struct EF_ODOUR_EFF {
-    /* 80056F8C */ ~EF_ODOUR_EFF();
-    /* 80056FC8 */ EF_ODOUR_EFF();
+    ~EF_ODOUR_EFF();
+    EF_ODOUR_EFF();
 
     /* 0x00 */ u8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -294,8 +294,8 @@ public:
 };  // Size: 0x17728
 
 struct EF_MUD_EFF {
-    /* 80056FFC */ ~EF_MUD_EFF();
-    /* 80057038 */ EF_MUD_EFF();
+    ~EF_MUD_EFF();
+    EF_MUD_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
@@ -325,8 +325,8 @@ public:
 };
 
 struct EF_EVIL_EFF {
-    /* 8005706C */ ~EF_EVIL_EFF();
-    /* 800570A8 */ EF_EVIL_EFF();
+    ~EF_EVIL_EFF();
+    EF_EVIL_EFF();
 
     /* 0x00 */ s8 mStatus;
     /* 0x04 */ cXyz mPosition;
diff --git a/include/d/d_kantera_icon_meter.h b/include/d/d_kantera_icon_meter.h
index b4b3f792ba..04466df8be 100644
--- a/include/d/d_kantera_icon_meter.h
+++ b/include/d/d_kantera_icon_meter.h
@@ -7,8 +7,8 @@ class CPaneMgr;
 
 class dDlst_KanteraIcon_c : public dDlst_base_c {
 public:
-    /* 801AECB8 */ virtual void draw();
-    /* 801AED1C */ virtual ~dDlst_KanteraIcon_c();
+    virtual void draw();
+    virtual ~dDlst_KanteraIcon_c();
 
     void setScreen(J2DScreen* screen) { mp_scrn = screen; }
     J2DScreen* getScreen() { return mp_scrn; }
@@ -19,14 +19,14 @@ private:
 
 class dKantera_icon_c {
 public:
-    /* 801AE938 */ dKantera_icon_c();
-    /* 801AEA68 */ void initiate();
-    /* 801AEB7C */ void setAlphaRate(f32);
-    /* 801AEBA0 */ void setPos(f32, f32);
-    /* 801AEBF4 */ void setScale(f32, f32);
-    /* 801AEC44 */ void setNowGauge(u16, u16);
+    dKantera_icon_c();
+    void initiate();
+    void setAlphaRate(f32);
+    void setPos(f32, f32);
+    void setScale(f32, f32);
+    void setNowGauge(u16, u16);
 
-    /* 801AE974 */ virtual ~dKantera_icon_c();
+    virtual ~dKantera_icon_c();
 
     void drawSelf() { mpKanteraIcon->draw(); }
 
diff --git a/include/d/d_ky_thunder.h b/include/d/d_ky_thunder.h
index a66794cd09..1e174ad6f8 100644
--- a/include/d/d_ky_thunder.h
+++ b/include/d/d_ky_thunder.h
@@ -16,9 +16,9 @@ public:
 
 class dThunder_c : public kankyo_class {
 public:
-    /* 801ADF58 */ int createHeap();
-    /* 801ADFB4 */ void adjustHeap();
-    /* 801AE458 */ int create();
+    int createHeap();
+    void adjustHeap();
+    int create();
     inline int draw();
     inline int execute(dThunder_c* i_thunder);
     inline int thunder_delete(dThunder_c* i_thunder);
diff --git a/include/d/d_lib.h b/include/d/d_lib.h
index 21d6ea4e4d..212bf517f5 100644
--- a/include/d/d_lib.h
+++ b/include/d/d_lib.h
@@ -31,19 +31,19 @@ public:
         TRIG_DOWN_RIGHT,
     };
 
-    /* 80032044 */ STControl(s16 delayY, s16 delayX, s16 param_2, s16 param_3, f32 threshold,
+    STControl(s16 delayY, s16 delayX, s16 param_2, s16 param_3, f32 threshold,
                              f32 param_5, s16 param_6, s16 param_7);
-    /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
-    /* 800320AC */ void init();
-    /* 800320FC */ void Xinit();
-    /* 8003212C */ void Yinit();
-    /* 8003215C */ virtual f32 getValueStick();
-    /* 8003216C */ virtual s16 getAngleStick();
-    /* 8003219C */ u8 checkTrigger();
-    /* 8003242C */ bool checkLeftTrigger();
-    /* 800324A8 */ bool checkRightTrigger();
-    /* 80032524 */ bool checkUpTrigger();
-    /* 800325A0 */ bool checkDownTrigger();
+    void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
+    void init();
+    void Xinit();
+    void Yinit();
+    virtual f32 getValueStick();
+    virtual s16 getAngleStick();
+    u8 checkTrigger();
+    bool checkLeftTrigger();
+    bool checkRightTrigger();
+    bool checkUpTrigger();
+    bool checkDownTrigger();
 
     void setFirstWaitTime(s16 time) { mFirstWaitTime = time; }
     s16 getYwaitTimer() { return mYwaitTimer; }
@@ -81,9 +81,9 @@ struct CSTControl : public STControl {
 };
 
 struct dLib_time_c {
-    /* 80032804 */ static OSTime getTime();
-    /* 80032880 */ static void stopTime();
-    /* 800328BC */ static void startTime();
+    static OSTime getTime();
+    static void stopTime();
+    static void startTime();
 
     static OSTime m_diffTime;
     static OSTime m_stopTime;
diff --git a/include/d/d_map.h b/include/d/d_map.h
index 4a2285938f..adb647a694 100644
--- a/include/d/d_map.h
+++ b/include/d/d_map.h
@@ -39,38 +39,38 @@ struct dMap_HIO_prm_res_dst_s {
 
 class renderingAmap_c : public renderingPlusDoorAndCursor_c {
 public:
-    /* 800288C4 */ int getDispType() const;
-    /* 80028BB4 */ bool isDrawOutSideTrim();
-    /* 80028C4C */ int getOutSideBlackLineNumber();
-    /* 80028C60 */ bool isOutSideBlackLine();
-    /* 80028C90 */ int getLineWidthSub(int);
-    /* 80029160 */ int getStayType() const;
-    /* 8002AE6C */ renderingAmap_c() {}
+    int getDispType() const;
+    bool isDrawOutSideTrim();
+    int getOutSideBlackLineNumber();
+    bool isOutSideBlackLine();
+    int getLineWidthSub(int);
+    int getStayType() const;
+    renderingAmap_c() {}
 
-    /* 800284D0 */ virtual void draw();
-    /* 8002ADB0 */ virtual ~renderingAmap_c() {}
-    /* 80028EE4 */ virtual GXColor* getLineColor(int, int);
-    /* 80028DD4 */ virtual int getLineWidth(int);
-    /* 80028A10 */ virtual void drawPath();
-    /* 80028A30 */ virtual void rendering(dDrawPath_c::line_class const*);
-    /* 80028B3C */ virtual void rendering(dDrawPath_c::poly_class const*);
-    /* 800289F0 */ virtual void rendering(dDrawPath_c::room_class const*);
-    /* 80028960 */ virtual void beforeDrawPath();
-    /* 800289D0 */ virtual void afterDrawPath();
-    /* 80028FB4 */ virtual const GXColor* getDecoLineColor(int, int);
-    /* 80028CF4 */ virtual s32 getDecorationLineWidth(int);
-    /* 80029058 */ virtual int getIconGroupNumber(u8) const;
-    /* 80029078 */ virtual bool hasMap() const;
-    /* 8002911C */ virtual bool isRendAllRoom() const;
-    /* 800290C0 */ virtual bool isRendDoor() const;
-    /* 80029104 */ virtual bool isCheckFloor() const;
-    /* 80029190 */ virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const;
-    /* 8002910C */ virtual bool isRendRestart() const;
-    /* 80029114 */ virtual bool isRendCursor() const;
-    /* 8002B000 */ virtual bool isRendIcon() const { return true; }
-    /* 800284BC */ virtual f32 getIconSize(u8) const;
-    /* 80028B04 */ virtual f32 getPlayerCursorSize();
-    /* 80028B10 */ virtual f32 getRestartCursorSize();
+    virtual void draw();
+    virtual ~renderingAmap_c() {}
+    virtual GXColor* getLineColor(int, int);
+    virtual int getLineWidth(int);
+    virtual void drawPath();
+    virtual void rendering(dDrawPath_c::line_class const*);
+    virtual void rendering(dDrawPath_c::poly_class const*);
+    virtual void rendering(dDrawPath_c::room_class const*);
+    virtual void beforeDrawPath();
+    virtual void afterDrawPath();
+    virtual const GXColor* getDecoLineColor(int, int);
+    virtual s32 getDecorationLineWidth(int);
+    virtual int getIconGroupNumber(u8) const;
+    virtual bool hasMap() const;
+    virtual bool isRendAllRoom() const;
+    virtual bool isRendDoor() const;
+    virtual bool isCheckFloor() const;
+    virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const;
+    virtual bool isRendRestart() const;
+    virtual bool isRendCursor() const;
+    virtual bool isRendIcon() const { return true; }
+    virtual f32 getIconSize(u8) const;
+    virtual f32 getPlayerCursorSize();
+    virtual f32 getRestartCursorSize();
     virtual void setAmapPaletteColor(int, u8, u8, u8, u8) = 0;
     virtual bool isSpecialOutline() = 0;
 
@@ -84,33 +84,33 @@ private:
 
 class dMap_c : public renderingAmap_c {
 public:
-    /* 8002974C */ void copyPalette();
-    /* 8002A064 */ void copyPalette(int, int, f32);
-    /* 80029F84 */ void setMapPaletteColorAlphaPer(int, f32);
-    /* 800297A8 */ void setMapPaletteColorAlphaPer(int, int, f32);
-    /* 80029818 */ void resCopy();
-    /* 80029874 */ dMap_c(int, int, int, int);
-    /* 80029A1C */ void _remove();
-    /* 80029A8C */ void getMapMinMaxXZ(int, f32*, f32*, f32*, f32*);
-    /* 80029C10 */ void getPack(int, f32*, f32*);
-    /* 80029D78 */ void calcMapCenterXZ(int, f32*, f32*);
-    /* 80029E1C */ void calcMapCmPerTexel(int, f32*);
-    /* 8002A1BC */ int getDispType() const;
-    /* 8002A32C */ void _move(f32, f32, int, f32);
-    /* 8002AB54 */ void _draw();
+    void copyPalette();
+    void copyPalette(int, int, f32);
+    void setMapPaletteColorAlphaPer(int, f32);
+    void setMapPaletteColorAlphaPer(int, int, f32);
+    void resCopy();
+    dMap_c(int, int, int, int);
+    void _remove();
+    void getMapMinMaxXZ(int, f32*, f32*, f32*, f32*);
+    void getPack(int, f32*, f32*);
+    void calcMapCenterXZ(int, f32*, f32*);
+    void calcMapCmPerTexel(int, f32*);
+    int getDispType() const;
+    void _move(f32, f32, int, f32);
+    void _draw();
 
-    /* 8002AF20 */ virtual ~dMap_c() { _remove(); }
-    /* 800296EC */ virtual bool isDrawType(int);
-    /* 80028DF4 */ virtual const GXColor* getColor(int);
-    /* 800296F8 */ virtual bool isRendAllRoom() const;
-    /* 8002A254 */ virtual int getRoomNoSingle();
-    /* 8002A1DC */ virtual bool isDrawRoom(int, int) const;
-    /* 8002A294 */ virtual bool isDrawRoomIcon(int, int) const;
-    /* 80029038 */ virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
-    /* 8002ABAC */ virtual dTres_c::typeGroupData_c* getFirstData(u8);
-    /* 8002ABCC */ virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
-    /* 8002A148 */ virtual void setAmapPaletteColor(int, u8, u8, u8, u8);
-    /* 80029744 */ virtual bool isSpecialOutline();
+    virtual ~dMap_c() { _remove(); }
+    virtual bool isDrawType(int);
+    virtual const GXColor* getColor(int);
+    virtual bool isRendAllRoom() const;
+    virtual int getRoomNoSingle();
+    virtual bool isDrawRoom(int, int) const;
+    virtual bool isDrawRoomIcon(int, int) const;
+    virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
+    virtual dTres_c::typeGroupData_c* getFirstData(u8);
+    virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
+    virtual void setAmapPaletteColor(int, u8, u8, u8, u8);
+    virtual bool isSpecialOutline();
 
     bool isDraw() const { return renderingDAmap_c::isDraw(); }
 
diff --git a/include/d/d_map_path.h b/include/d/d_map_path.h
index 1290e21770..259b8f652f 100644
--- a/include/d/d_map_path.h
+++ b/include/d/d_map_path.h
@@ -46,35 +46,35 @@ public:
         /* 0x0 */ room_class* mRooms[0x2][0x40];
     };
 
-    /* 8003CB00 */ void rendering(dDrawPath_c::group_class const*);
-    /* 8003CBBC */ void rendering(dDrawPath_c::floor_class const*);
+    void rendering(dDrawPath_c::group_class const*);
+    void rendering(dDrawPath_c::floor_class const*);
 
-    /* 8002AD3C */ virtual ~dDrawPath_c() {}
-    /* 8002ABF0 */ virtual bool isDrawType(int) { return true; }
+    virtual ~dDrawPath_c() {}
+    virtual bool isDrawType(int) { return true; }
     virtual const GXColor* getColor(int) = 0;
-    /* 8002AD84 */ virtual const GXColor* getLineColor(int param_0, int) { return (GXColor*)getColor(param_0); }
+    virtual const GXColor* getLineColor(int param_0, int) { return (GXColor*)getColor(param_0); }
     virtual int getLineWidth(int) = 0;
     virtual bool isSwitch(dDrawPath_c::group_class const*) = 0;
     virtual bool isRenderingFloor(int) = 0;
     virtual room_class* getFirstRoomPointer() = 0;
     virtual room_class* getNextRoomPointer() = 0;
-    /* 8003CCC4 */ virtual void drawPath();
-    /* 8003C94C */ virtual void rendering(dDrawPath_c::line_class const*);
-    /* 8003CA40 */ virtual void rendering(dDrawPath_c::poly_class const*);
-    /* 8003CC24 */ virtual void rendering(dDrawPath_c::room_class const*);
+    virtual void drawPath();
+    virtual void rendering(dDrawPath_c::line_class const*);
+    virtual void rendering(dDrawPath_c::poly_class const*);
+    virtual void rendering(dDrawPath_c::room_class const*);
 };
 
 class dDrawPathWithNormalPattern_c : public dDrawPath_c {
 public:
-    /* 8002ACE0 */ virtual ~dDrawPathWithNormalPattern_c() {}
+    virtual ~dDrawPathWithNormalPattern_c() {}
 };
 
 class dRenderingMap_c : public dDrawPathWithNormalPattern_c {
 public:
-    /* 8003CD38 */ void makeResTIMG(ResTIMG*, u16, u16, u8*, u8*, u16) const;
-    /* 8003CDAC */ void renderingMap();
+    void makeResTIMG(ResTIMG*, u16, u16, u8*, u8*, u16) const;
+    void renderingMap();
 
-    /* 8002AC74 */ virtual ~dRenderingMap_c() {}
+    virtual ~dRenderingMap_c() {}
     virtual void beforeDrawPath() = 0;
     virtual void afterDrawPath() = 0;
 
@@ -100,17 +100,17 @@ public:
         field_0x22 = 0;
     }
 
-    /* 8003CE78 */ void setTevSettingNonTextureDirectColor() const;
-    /* 8003CF40 */ void setTevSettingIntensityTextureToCI() const;
-    /* 8003D0AC */ void drawBack() const;
-    /* 8003D3C0 */ void renderingDecoration(dDrawPath_c::line_class const*);
+    void setTevSettingNonTextureDirectColor() const;
+    void setTevSettingIntensityTextureToCI() const;
+    void drawBack() const;
+    void renderingDecoration(dDrawPath_c::line_class const*);
 
-    /* 8002ABF8 */ virtual ~dRenderingFDAmap_c() {}
-    /* 8003D188 */ virtual void preRenderingMap();
-    /* 8003D320 */ virtual void postRenderingMap();
+    virtual ~dRenderingFDAmap_c() {}
+    virtual void preRenderingMap();
+    virtual void postRenderingMap();
     virtual const GXColor* getBackColor() const = 0;
-    /* 8003D68C */ virtual const GXColor* getDecoLineColor(int, int);
-    /* 8003D6B8 */ virtual s32 getDecorationLineWidth(int);
+    virtual const GXColor* getDecoLineColor(int, int);
+    virtual s32 getDecorationLineWidth(int);
 
     bool isDrawAreaCheck(const Vec& param_0) {
         return (param_0.x >= mPosX - field_0x8 * 2.0f &&
@@ -134,9 +134,9 @@ public:
 struct dMpath_n {
     class dTexObjAggregate_c {
     public:
-        /* 8003C85C */ void create();
-        /* 8003C8F4 */ void remove();
-        /* 8003D740 */ ~dTexObjAggregate_c() { remove(); };
+        void create();
+        void remove();
+        ~dTexObjAggregate_c() { remove(); };
 
         GXTexObj* getTexObjPointer(int i_no) { return mp_texObj[i_no]; }
 
diff --git a/include/d/d_map_path_dmap.h b/include/d/d_map_path_dmap.h
index fbe6c92daa..9176860b49 100644
--- a/include/d/d_map_path_dmap.h
+++ b/include/d/d_map_path_dmap.h
@@ -9,14 +9,14 @@ struct stage_tgsc_data_class;
 
 class dMpath_c {
 public:
-    /* 8003F758 */ static bool isExistMapPathData();
-    /* 8003F760 */ static int getTopBottomFloorNo(s8*, s8*);
-    /* 8003F7E8 */ static void createWork();
-    /* 8003FA40 */ static void setPointer(s8, void*, int);
-    /* 8003F810 */ static int setPointer(dDrawPath_c::room_class*, s8*, s8*);
-    /* 8003FB70 */ static void create();
-    /* 8003FBD0 */ static void reset();
-    /* 8003FC70 */ static void remove();
+    static bool isExistMapPathData();
+    static int getTopBottomFloorNo(s8*, s8*);
+    static void createWork();
+    static void setPointer(s8, void*, int);
+    static int setPointer(dDrawPath_c::room_class*, s8*, s8*);
+    static void create();
+    static void reset();
+    static void remove();
 
     static dDrawPath_c::room_class* getRoomPointer(int layerNo, int roomNo) {
         return mLayerList->mRooms[layerNo][roomNo];
@@ -47,31 +47,31 @@ public:
 };
 
 struct dMapInfo_n {
-    /* 8003ECA0 */ static bool chkGetCompass();
-    /* 8003ECD8 */ static bool chkGetMap();
-    /* 8003ED10 */ static bool isVisitedRoom(int);
-    /* 8003ED60 */ static void correctionOriginPos(s8, Vec*);
-    /* 8003EDC0 */ static void offsetPlus(dStage_FileList2_dt_c const*, Vec*);
-    /* 8003EDEC */ static void rotAngle(dStage_FileList2_dt_c const*, Vec*);
-    /* 8003EE5C */ static Vec getMapPlayerPos();
-    /* 8003EF20 */ static s16 getMapPlayerAngleY();
-    /* 8003EF70 */ static const dTres_c::typeGroupData_c* getConstRestartIconPointer();
-    /* 8003F02C */ static Vec getMapRestartPos();
-    /* 8003F0F8 */ static s16 getMapRestartAngleY();
-    /* 8003F19C */ static void getRoomCenter(int, f32*, f32*);
-    /* 8003F1F4 */ static void getRoomMinMaxXZ(int, f32*, f32*, f32*, f32*);
-    /* 8003F24C */ static void getFloorParameter(f32, s8*, f32*, f32*, f32*, f32*);
+    static bool chkGetCompass();
+    static bool chkGetMap();
+    static bool isVisitedRoom(int);
+    static void correctionOriginPos(s8, Vec*);
+    static void offsetPlus(dStage_FileList2_dt_c const*, Vec*);
+    static void rotAngle(dStage_FileList2_dt_c const*, Vec*);
+    static Vec getMapPlayerPos();
+    static s16 getMapPlayerAngleY();
+    static const dTres_c::typeGroupData_c* getConstRestartIconPointer();
+    static Vec getMapRestartPos();
+    static s16 getMapRestartAngleY();
+    static void getRoomCenter(int, f32*, f32*);
+    static void getRoomMinMaxXZ(int, f32*, f32*, f32*, f32*);
+    static void getFloorParameter(f32, s8*, f32*, f32*, f32*, f32*);
 };
 
 class dMapInfo_c {
 public:
-    /* 8003F40C */ static s8 calcFloorNo(f32, bool, int);
-    /* 8003F570 */ static s8 calcNowStayFloorNo(f32, bool);
-    /* 8003F6C8 */ static void move(int, f32);
-    /* 8003F6FC */ static void init();
-    /* 8003F714 */ static void reset();
-    /* 8003F734 */ static void create();
-    /* 8003F754 */ static void remove();
+    static s8 calcFloorNo(f32, bool, int);
+    static s8 calcNowStayFloorNo(f32, bool);
+    static void move(int, f32);
+    static void init();
+    static void reset();
+    static void create();
+    static void remove();
 
     static s8 getNowStayFloorNo() {
         JUT_ASSERT(0, mNowStayFloorNoDecisionFlg);
@@ -106,37 +106,37 @@ public:
         mIsDraw = false;
     }
 
-    /* 8003FCA4 */ s8 calcFloorNoForObjectByMapPathRend(f32, int) const;
-    /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
-    /* 8003FD08 */ void entry(f32, f32, f32, int, s8);
-    /* 8003FE6C */ void setSingleRoomSetting();
-    /* 8003FFF4 */ int getFirstDrawRoomNo();
-    /* 80040094 */ int getNextDrawRoomNo(int);
+    s8 calcFloorNoForObjectByMapPathRend(f32, int) const;
+    void init(u8*, u16, u16, u16, u16);
+    void entry(f32, f32, f32, int, s8);
+    void setSingleRoomSetting();
+    int getFirstDrawRoomNo();
+    int getNextDrawRoomNo(int);
 
-    /* 8003FE18 */ virtual void draw();
-    /* 8002B150 */ virtual ~renderingDAmap_c() {}
-    /* 8003FD9C */ virtual bool isSwitch(dDrawPath_c::group_class const*);
-    /* 8003FE54 */ virtual bool isRenderingFloor(int);
-    /* 80040134 */ virtual dDrawPath_c::room_class* getFirstRoomPointer();
-    /* 800401E8 */ virtual dDrawPath_c::room_class* getNextRoomPointer();
-    /* 8003FF14 */ virtual void preDrawPath();
-    /* 8003FFC4 */ virtual void postDrawPath();
-    /* 800402C0 */ virtual bool isDrawPath();
-    /* 8003FE4C */ virtual const GXColor* getBackColor() const;
-    /* 800402E0 */ virtual int getFirstDrawLayerNo();
-    /* 800402E8 */ virtual int getNextDrawLayerNo(int);
+    virtual void draw();
+    virtual ~renderingDAmap_c() {}
+    virtual bool isSwitch(dDrawPath_c::group_class const*);
+    virtual bool isRenderingFloor(int);
+    virtual dDrawPath_c::room_class* getFirstRoomPointer();
+    virtual dDrawPath_c::room_class* getNextRoomPointer();
+    virtual void preDrawPath();
+    virtual void postDrawPath();
+    virtual bool isDrawPath();
+    virtual const GXColor* getBackColor() const;
+    virtual int getFirstDrawLayerNo();
+    virtual int getNextDrawLayerNo(int);
 
-    /* 800409E0 */ virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool,
+    virtual bool isDrawIconSingle(dTres_c::data_s const*, int, int, bool, bool,
                                                  Vec const*) const;
-    /* 80040AE4 */ virtual int getIconGroupNumber(u8) const;
+    virtual int getIconGroupNumber(u8) const;
     virtual bool hasMap() const = 0;
     virtual bool isRendAllRoom() const = 0;
     virtual bool isRendDoor() const = 0;
     virtual bool isCheckFloor() const = 0;
     virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const = 0;
-    /* 8003FFEC */ virtual int getRoomNoSingle();
-    /* 8003FE70 */ virtual bool isDrawRoom(int, int) const;
-    /* 800409B4 */ virtual bool isDrawRoomIcon(int, int) const;
+    virtual int getRoomNoSingle();
+    virtual bool isDrawRoom(int, int) const;
+    virtual bool isDrawRoomIcon(int, int) const;
 
     bool isDraw() const { return mIsDraw; }
 
@@ -152,15 +152,15 @@ class stage_tgsc_data_class;
 class renderingPlusDoor_c : public renderingDAmap_c {
 public:
     renderingPlusDoor_c() {}
-    /* 80040574 */ void drawDoor1();
-    /* 800405B8 */ void drawDoor2();
-    /* 800405FC */ void drawDoorCommon(stage_tgsc_data_class const*, int, bool);
-    /* 80040710 */ bool checkDispDoorS(int, int, f32);
-    /* 80040838 */ void drawNormalDoorS(stage_tgsc_data_class const*, int, int, bool);
+    void drawDoor1();
+    void drawDoor2();
+    void drawDoorCommon(stage_tgsc_data_class const*, int, bool);
+    bool checkDispDoorS(int, int, f32);
+    void drawNormalDoorS(stage_tgsc_data_class const*, int, int, bool);
 
-    /* 8002B0B4 */ virtual ~renderingPlusDoor_c() {}
-    /* 8004145C */ virtual void beforeDrawPath();
-    /* 80040518 */ virtual void afterDrawPath();
+    virtual ~renderingPlusDoor_c() {}
+    virtual void beforeDrawPath();
+    virtual void afterDrawPath();
     virtual bool isRendRestart() const = 0;
     virtual bool isRendCursor() const = 0;
     virtual bool isRendIcon() const = 0;
@@ -168,18 +168,18 @@ public:
 
 class renderingPlusDoorAndCursor_c : public renderingPlusDoor_c {
 public:
-    /* 80040B00 */ void drawTreasure();
-    /* 80040E84 */ void drawTreasureAfterPlayer();
-    /* 80041208 */ void drawIconSingle(Vec const&, f32, f32);
-    /* 800412C0 */ void drawCursor(Vec const&, s16, int, f32);
+    void drawTreasure();
+    void drawTreasureAfterPlayer();
+    void drawIconSingle(Vec const&, f32, f32);
+    void drawCursor(Vec const&, s16, int, f32);
     renderingPlusDoorAndCursor_c() {}
 
-    /* 8002B008 */ virtual ~renderingPlusDoorAndCursor_c() {}
-    /* 800402FC */ virtual void afterDrawPath();
+    virtual ~renderingPlusDoorAndCursor_c() {}
+    virtual void afterDrawPath();
     virtual f32 getIconSize(u8) const = 0;
-    /* 80040ADC */ virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
-    /* 80040A94 */ virtual dTres_c::typeGroupData_c* getFirstData(u8);
-    /* 80040AB8 */ virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
+    virtual const Vec* getIconPosition(dTres_c::typeGroupData_c*) const;
+    virtual dTres_c::typeGroupData_c* getFirstData(u8);
+    virtual dTres_c::typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
     virtual f32 getPlayerCursorSize() = 0;
     virtual f32 getRestartCursorSize() = 0;
 };
diff --git a/include/d/d_map_path_fmap.h b/include/d/d_map_path_fmap.h
index 2472319564..8aab7b32d6 100644
--- a/include/d/d_map_path_fmap.h
+++ b/include/d/d_map_path_fmap.h
@@ -12,7 +12,7 @@ public:
         mpNext = NULL;
     }
 
-    /* 8003EB70 */ ~fmpTresTypeGroupData_c() {
+    ~fmpTresTypeGroupData_c() {
         if (mpNext != NULL) {
             delete mpNext;
         }
@@ -31,13 +31,13 @@ public:
 
 class fmpTresTypeGroupDataList_c {
 public:
-    /* 8003D790 */ void addTypeGroupData(u8, dTres_c::data_s const*);
-    /* 8003EB10 */ ~fmpTresTypeGroupDataList_c() {
+    void addTypeGroupData(u8, dTres_c::data_s const*);
+    ~fmpTresTypeGroupDataList_c() {
         if (mpTypeGroupDataHead != NULL) {
             delete mpTypeGroupDataHead;
         }
     }
-    /* 8003EC90 */ fmpTresTypeGroupDataList_c() {
+    fmpTresTypeGroupDataList_c() {
         mpTypeGroupDataHead = NULL;
         mpNextData = NULL;
     }
@@ -91,9 +91,9 @@ public:
 class dMenu_Fmap_stage_data_c;
 class dMenu_Fmap_room_data_c {
 public:
-    /* 8003D818 */ bool isArrival();
-    /* 8003D868 */ void buildTresTypeGroup(int, int, int);
-    /* 8003D92C */ void buildFmapRoomData(int, int, f32, f32, f32, f32);
+    bool isArrival();
+    void buildTresTypeGroup(int, int, int);
+    void buildFmapRoomData(int, int, f32, f32, f32, f32);
 
     dMenu_Fmap_room_data_c(u8 i_roomNo, dMenu_Fmap_stage_data_c* i_stageData,
                            dMenu_Fmap_data_c* i_data) {
@@ -141,8 +141,8 @@ public:
 
 class dMenu_Fmap_stage_data_c {
 public:
-    /* 8003D95C */ bool isArrival();
-    /* 8003D9D8 */ int buildFmapStageData(int, f32, f32);
+    bool isArrival();
+    int buildFmapStageData(int, f32, f32);
 
     dMenu_Fmap_stage_data_c() {
         mpStageArc = NULL;
@@ -201,9 +201,9 @@ public:
 
 class dMenu_Fmap_region_data_c {
 public:
-    /* 8003DB48 */ dMenu_Fmap_stage_data_c* getMenuFmapStageData(int);
-    /* 8003DB70 */ int getPointStagePathInnerNo(f32, f32, int, int*, int*);
-    /* 8003DEE0 */ int buildFmapRegionData(int);
+    dMenu_Fmap_stage_data_c* getMenuFmapStageData(int);
+    int getPointStagePathInnerNo(f32, f32, int, int*, int*);
+    int buildFmapRegionData(int);
 
     dMenu_Fmap_region_data_c(int i_no, dMenu_Fmap_stage_data_c* i_stageData,
                              f32 i_offsetX, f32 i_offsetZ) {
@@ -251,8 +251,8 @@ public:
 
 class dMenu_Fmap_world_data_c {
 public:
-    /* 8003E028 */ void create(dMenu_Fmap_region_data_c*);
-    /* 8003E04C */ int buildFmapWorldData();
+    void create(dMenu_Fmap_region_data_c*);
+    int buildFmapWorldData();
 
     dMenu_Fmap_world_data_c(dMenu_Fmap_region_data_c* i_regionData) { create(i_regionData); }
     dMenu_Fmap_region_data_c* getMenuFmapRegionTop() { return mp_fmapRegionData; }
@@ -270,15 +270,15 @@ public:
 
 class dMenuFmapIconPointer_c {
 public:
-    /* 8003E114 */ bool init(dMenu_Fmap_region_data_c*, dMenu_Fmap_stage_data_c*, u8, int, int);
-    /* 8003E1C0 */ bool getFirstData();
-    /* 8003E2BC */ bool getData();
-    /* 8003E350 */ void getFirstRoomData();
-    /* 8003E37C */ bool getNextRoomData();
-    /* 8003E3A4 */ bool getNextStageData();
-    /* 8003E3D8 */ bool getNextData();
-    /* 8003E490 */ bool nextData();
-    /* 8003E510 */ bool getValidData();
+    bool init(dMenu_Fmap_region_data_c*, dMenu_Fmap_stage_data_c*, u8, int, int);
+    bool getFirstData();
+    bool getData();
+    void getFirstRoomData();
+    bool getNextRoomData();
+    bool getNextStageData();
+    bool getNextData();
+    bool nextData();
+    bool getValidData();
 
     /* 0x00 */ int mStageNo;
     /* 0x04 */ int mStayStageNo;
@@ -298,8 +298,8 @@ public:
 
 class dMenuFmapIconDisp_c : public dMenuFmapIconPointer_c {
 public:
-    /* 8003E578 */ bool getPosition(int*, int*, f32*, f32*, dTres_c::data_s const**);
-    /* 8003E6E8 */ virtual bool isDrawDisp();
+    bool getPosition(int*, int*, f32*, f32*, dTres_c::data_s const**);
+    virtual bool isDrawDisp();
 };
 
 #endif /* D_MAP_D_MAP_PATH_FMAP_H */
diff --git a/include/d/d_menu_calibration.h b/include/d/d_menu_calibration.h
index f8abc508b3..ba7a48767a 100644
--- a/include/d/d_menu_calibration.h
+++ b/include/d/d_menu_calibration.h
@@ -19,29 +19,29 @@ public:
         /* 5 */ PROC_STEP3_MOVE,
     };
 
-    /* 801AEDAC */ void _move();
-    /* 801AEE2C */ void _draw();
-    /* 801AEE30 */ void step1_wait_init();
-    /* 801AEF60 */ void step1_wait_move();
-    /* 801AF084 */ void step1_move_init();
-    /* 801AF0C0 */ void step1_move_move();
-    /* 801AF188 */ void step2_wait_init();
-    /* 801AF1F4 */ void step2_wait_move();
-    /* 801AF380 */ void step2_move_init();
-    /* 801AF3BC */ void step2_move_move();
-    /* 801AF488 */ void step3_wait_init();
-    /* 801AF4F8 */ void step3_wait_move();
-    /* 801AF5F4 */ void step3_move_init();
-    /* 801AF630 */ void step3_move_move();
-    /* 801AF710 */ void setCalibrationValue();
-    /* 801AF738 */ void setAButtonString(u16);
-    /* 801AF7E8 */ void setBButtonString(u16);
-    /* 801AF898 */ void setStepString(u16);
-    /* 801AF948 */ void setExplainString(u16);
-    /* 801AFA00 */ void setHIO(bool);
+    void _move();
+    void _draw();
+    void step1_wait_init();
+    void step1_wait_move();
+    void step1_move_init();
+    void step1_move_move();
+    void step2_wait_init();
+    void step2_wait_move();
+    void step2_move_init();
+    void step2_move_move();
+    void step3_wait_init();
+    void step3_wait_move();
+    void step3_move_init();
+    void step3_move_move();
+    void setCalibrationValue();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    void setStepString(u16);
+    void setExplainString(u16);
+    void setHIO(bool);
 
-    /* 801AFBF4 */ virtual void draw();
-    /* 801AED64 */ virtual ~dMenu_Calibration_c();
+    virtual void draw();
+    virtual ~dMenu_Calibration_c();
 
     /* 0x004 */ JKRExpHeap* mpHeap;
     /* 0x008 */ JKRArchive* mpArchive;
diff --git a/include/d/d_menu_collect.h b/include/d/d_menu_collect.h
index 3149f5ddf0..127ae7ee2b 100644
--- a/include/d/d_menu_collect.h
+++ b/include/d/d_menu_collect.h
@@ -20,90 +20,90 @@ class dMenu_Collect2D_c;
 class dMenu_Collect2DTop_c : public dDlst_base_c {
 public:
     dMenu_Collect2DTop_c(dMenu_Collect2D_c* param_0) { mpCollect2D = param_0; }
-    /* 801B77A4 */ virtual void draw();
-    /* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c() {}
+    virtual void draw();
+    virtual ~dMenu_Collect2DTop_c() {}
 
     /* 0x4 */ dMenu_Collect2D_c* mpCollect2D;
 };
 
 class dMenu_Collect2D_c : public dDlst_base_c {
 public:
-    /* 801AFD48 */ dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*);
-    /* 801AFEA4 */ void _create();
-    /* 801B0100 */ void _delete();
-    /* 801B0570 */ void initialize();
-    /* 801B05A8 */ bool isFishIconVisible();
-    /* 801B061C */ bool isSkillIconVisible();
-    /* 801B071C */ bool isInsectIconVisible();
-    /* 801B074C */ void screenSet();
-    /* 801B1C3C */ void animationSet();
-    /* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*);
-    /* 801B1EDC */ void setBackAlpha();
-    /* 801B1FAC */ void cursorMove();
-    /* 801B27EC */ void cursorPosSet();
-    /* 801B2A74 */ void changeSword();
-    /* 801B2D00 */ void changeShield();
-    /* 801B2EE4 */ void changeClothe();
-    /* 801B30C8 */ void setArrowMaxNum(u8);
-    /* 801B3340 */ void setWalletMaxNum(u16);
-    /* 801B3524 */ void setSmellType();
-    /* 801B3640 */ void setHeartPiece();
-    /* 801B370C */ void setPohMaxNum(u8);
-    /* 801B39D0 */ void setEquipItemFrameColorSword(int);
-    /* 801B3CF4 */ void setEquipItemFrameColorShield(int);
-    /* 801B3FDC */ void setEquipItemFrameColorClothes(int);
-    /* 801B42D8 */ void setHIO(bool);
-    /* 801B46FC */ u64 getItemTag(int, int, bool);
-    /* 801B473C */ void wait_init();
-    /* 801B48D0 */ void wait_proc();
-    /* 801B4E14 */ void save_open_init();
-    /* 801B4EC0 */ void save_open_proc();
-    /* 801B4F30 */ void save_move_init();
-    /* 801B4F6C */ void save_move_proc();
-    /* 801B4FDC */ void save_close_init();
-    /* 801B5018 */ void save_close_proc();
-    /* 801B5094 */ void option_open_init();
-    /* 801B513C */ void option_open_proc();
-    /* 801B51AC */ void option_move_init();
-    /* 801B51E8 */ void option_move_proc();
-    /* 801B5258 */ void option_close_init();
-    /* 801B5294 */ void option_close_proc();
-    /* 801B5310 */ void letter_open_init();
-    /* 801B53AC */ void letter_open_proc();
-    /* 801B541C */ void letter_move_init();
-    /* 801B5458 */ void letter_move_proc();
-    /* 801B54C8 */ void letter_close_init();
-    /* 801B5504 */ void letter_close_proc();
-    /* 801B5580 */ void fishing_open_init();
-    /* 801B561C */ void fishing_open_proc();
-    /* 801B568C */ void fishing_move_init();
-    /* 801B56C8 */ void fishing_move_proc();
-    /* 801B5738 */ void fishing_close_init();
-    /* 801B5774 */ void fishing_close_proc();
-    /* 801B57F0 */ void skill_open_init();
-    /* 801B588C */ void skill_open_proc();
-    /* 801B58FC */ void skill_move_init();
-    /* 801B5938 */ void skill_move_proc();
-    /* 801B59A8 */ void skill_close_init();
-    /* 801B59E4 */ void skill_close_proc();
-    /* 801B5A60 */ void insect_open_init();
-    /* 801B5B00 */ void insect_open_proc();
-    /* 801B5B70 */ void insect_move_init();
-    /* 801B5BAC */ void insect_move_proc();
-    /* 801B5C1C */ void insect_close_init();
-    /* 801B5C58 */ void insect_close_proc();
-    /* 801B5CD4 */ void _move();
-    /* 801B5D70 */ void _draw();
-    /* 801B5F48 */ void drawTop();
-    /* 801B5F84 */ bool isKeyCheck();
-    /* 801B5FAC */ bool isOutCheck();
-    /* 801B5FB4 */ void setAButtonString(u16);
-    /* 801B60B8 */ void setBButtonString(u16);
-    /* 801B61BC */ void setItemNameString(u8, u8);
-    /* 801B6344 */ void setItemNameStringNull();
+    dMenu_Collect2D_c(JKRExpHeap*, STControl*, CSTControl*);
+    void _create();
+    void _delete();
+    void initialize();
+    bool isFishIconVisible();
+    bool isSkillIconVisible();
+    bool isInsectIconVisible();
+    void screenSet();
+    void animationSet();
+    void btkAnimeLoop0(J2DAnmTextureSRTKey*);
+    void setBackAlpha();
+    void cursorMove();
+    void cursorPosSet();
+    void changeSword();
+    void changeShield();
+    void changeClothe();
+    void setArrowMaxNum(u8);
+    void setWalletMaxNum(u16);
+    void setSmellType();
+    void setHeartPiece();
+    void setPohMaxNum(u8);
+    void setEquipItemFrameColorSword(int);
+    void setEquipItemFrameColorShield(int);
+    void setEquipItemFrameColorClothes(int);
+    void setHIO(bool);
+    u64 getItemTag(int, int, bool);
+    void wait_init();
+    void wait_proc();
+    void save_open_init();
+    void save_open_proc();
+    void save_move_init();
+    void save_move_proc();
+    void save_close_init();
+    void save_close_proc();
+    void option_open_init();
+    void option_open_proc();
+    void option_move_init();
+    void option_move_proc();
+    void option_close_init();
+    void option_close_proc();
+    void letter_open_init();
+    void letter_open_proc();
+    void letter_move_init();
+    void letter_move_proc();
+    void letter_close_init();
+    void letter_close_proc();
+    void fishing_open_init();
+    void fishing_open_proc();
+    void fishing_move_init();
+    void fishing_move_proc();
+    void fishing_close_init();
+    void fishing_close_proc();
+    void skill_open_init();
+    void skill_open_proc();
+    void skill_move_init();
+    void skill_move_proc();
+    void skill_close_init();
+    void skill_close_proc();
+    void insect_open_init();
+    void insect_open_proc();
+    void insect_move_init();
+    void insect_move_proc();
+    void insect_close_init();
+    void insect_close_proc();
+    void _move();
+    void _draw();
+    void drawTop();
+    bool isKeyCheck();
+    bool isOutCheck();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    void setItemNameString(u8, u8);
+    void setItemNameStringNull();
 
-    /* 801B7F00 */ virtual void draw() { _draw(); }
-    /* 801AFE34 */ virtual ~dMenu_Collect2D_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Collect2D_c();
 
     u8 getCursorX() { return mCursorX; }
     u8 getCursorY() { return mCursorY; }
@@ -189,25 +189,25 @@ private:
 
 class dMenu_Collect3D_c {
 public:
-    /* 801B6454 */ dMenu_Collect3D_c(JKRExpHeap*, dMenu_Collect2D_c*, CSTControl*);
-    /* 801B65A8 */ void _create();
-    /* 801B6694 */ void _delete();
-    /* 801B66C8 */ void _move(u8, u8);
-    /* 801B696C */ void draw();
-    /* 801B6A30 */ void setJ3D(const char*, const char*, const char*);
-    /* 801B6D30 */ void set_mtx();
-    /* 801B6E70 */ void animePlay();
-    /* 801B6FB0 */ void animeEntry();
-    /* 801B7014 */ void createMaskModel();
-    /* 801B71C4 */ void createMirrorModel();
-    /* 801B7434 */ static u8 getCrystalNum();
-    /* 801B749C */ static u8 getMirrorNum();
-    /* 801B7504 */ static u8 getMaskMdlVisible();
-    /* 801B75E8 */ static void setupItem3D(Mtx);
-    /* 801B7660 */ static void toItem3Dpos(f32, f32, f32, cXyz*);
-    /* 801B774C */ static void calcViewMtx(Mtx);
+    dMenu_Collect3D_c(JKRExpHeap*, dMenu_Collect2D_c*, CSTControl*);
+    void _create();
+    void _delete();
+    void _move(u8, u8);
+    void draw();
+    void setJ3D(const char*, const char*, const char*);
+    void set_mtx();
+    void animePlay();
+    void animeEntry();
+    void createMaskModel();
+    void createMirrorModel();
+    static u8 getCrystalNum();
+    static u8 getMirrorNum();
+    static u8 getMaskMdlVisible();
+    static void setupItem3D(Mtx);
+    static void toItem3Dpos(f32, f32, f32, cXyz*);
+    static void calcViewMtx(Mtx);
 
-    /* 801B6538 */ virtual ~dMenu_Collect3D_c();
+    virtual ~dMenu_Collect3D_c();
 
     static f32 mViewOffsetY;
 
@@ -234,13 +234,13 @@ private:
 
 class dMenu_Collect_c {
 public:
-    /* 801B78C0 */ dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*);
-    /* 801B7A0C */ void _create();
-    /* 801B7A44 */ void _delete();
-    /* 801B7A7C */ void _move();
-    /* 801B7AC0 */ void draw();
+    dMenu_Collect_c(JKRExpHeap*, STControl*, CSTControl*);
+    void _create();
+    void _delete();
+    void _move();
+    void draw();
 
-    /* 801B795C */ virtual ~dMenu_Collect_c();
+    virtual ~dMenu_Collect_c();
 
     u8 getSubWindowOpenCheck() { return mpCollect2D->getSubWindowOpenCheck(); }
     bool isKeyCheck() { return mpCollect2D->isKeyCheck(); }
diff --git a/include/d/d_menu_dmap.h b/include/d/d_menu_dmap.h
index 7735d9c41c..b9a1d5c41b 100644
--- a/include/d/d_menu_dmap.h
+++ b/include/d/d_menu_dmap.h
@@ -24,25 +24,25 @@ struct dMenu_DmapMapCtrl_c;
 
 class renderingDmap_c : public renderingPlusDoor_c {
 public:
-    /* 801C0380 */ virtual ~renderingDmap_c() {}
+    virtual ~renderingDmap_c() {}
 
-    /* 801C0C48 */ virtual const GXColor* getColor(int);
-    /* 801C0C10 */ virtual int getLineWidth(int);
-    /* 801C25E4 */ virtual void beforeDrawPath();
-    /* 801C0CB8 */ virtual void afterDrawPath();
-    /* 801C084C */ virtual bool hasMap() const;
-    /* 801C2614 */ virtual bool isRendAllRoom() const;
-    /* 801C261C */ virtual bool isRendDoor() const;
-    /* 801C2624 */ virtual bool isCheckFloor() const;
-    /* 801C086C */ virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const;
-    /* 801C262C */ virtual bool isRendRestart() const;
-    /* 801C2634 */ virtual bool isRendCursor() const;
-    /* 801C263C */ virtual bool isRendIcon() const;
-    /* 801C0B40 */ virtual f32 getPlayerCursorSize();
-    /* 801C25E8 */ virtual f32 getRestartCursorSize();
+    virtual const GXColor* getColor(int);
+    virtual int getLineWidth(int);
+    virtual void beforeDrawPath();
+    virtual void afterDrawPath();
+    virtual bool hasMap() const;
+    virtual bool isRendAllRoom() const;
+    virtual bool isRendDoor() const;
+    virtual bool isCheckFloor() const;
+    virtual bool isDrawIconSingle2(dTres_c::data_s const*, bool, bool, int) const;
+    virtual bool isRendRestart() const;
+    virtual bool isRendCursor() const;
+    virtual bool isRendIcon() const;
+    virtual f32 getPlayerCursorSize();
+    virtual f32 getRestartCursorSize();
 
-    /* 801C0B48 */ int getLineWidthZoomBig(int);
-    /* 801C0BAC */ int getLineWidthZoomSmall(int);
+    int getLineWidthZoomBig(int);
+    int getLineWidthZoomSmall(int);
 
     void entry(f32 param_0, f32 param_1, f32 param_2, s8 param_3, s8 param_4, f32 param_5) {
         field_0x34 = param_5;
@@ -54,32 +54,32 @@ public:
 
 class dMenu_DmapBg_c : public dDlst_base_c, public dMenuMapCommon_c {
 public:
-    /* 801B7F20 */ dMenu_DmapBg_c(JKRExpHeap*, STControl*);
-    /* 801B8110 */ void mapScreenInit();
-    /* 801B884C */ void mapScreenAnime();
-    /* 801B88F4 */ void mapIconScaleSet(u8);
-    /* 801B893C */ void iconScaleAnmInit(f32, f32, u8);
-    /* 801B8954 */ bool iconScaleAnm();
-    /* 801B8A0C */ void buttonIconScreenInit();
-    /* 801B8DE4 */ void setAButtonString(u32);
-    /* 801B8EBC */ void setBButtonString(u32);
-    /* 801B8F94 */ void setCButtonString(u32);
-    /* 801B90BC */ void setJButtonString(u32);
-    /* 801B90E0 */ void createExplain();
-    /* 801B9164 */ void deleteExplain();
-    /* 801B91DC */ void baseScreenInit();
-    /* 801B944C */ void setFloorMessage();
-    /* 801BA0B4 */ bool dpdMove(s8, s8, s8, u8*, u8);
-    /* 801BA0BC */ ~dMenu_DmapBg_c();
-    /* 801BA60C */ void setAllAlphaRate(f32, bool);
-    /* 801BA700 */ void setGoldAnimation(bool);
-    /* 801BA7F0 */ void setGoldFrameAlphaRate(f32);
-    /* 801BA974 */ void addGoldFrameAlphaRate();
-    /* 801BAA4C */ void decGoldFrameAlphaRate();
-    /* 801BAB10 */ void draw();
-    /* 801BB334 */ void update();
-    /* 801BB464 */ void calcCursor();
-    /* 801BB468 */ void drawCursor();
+    dMenu_DmapBg_c(JKRExpHeap*, STControl*);
+    void mapScreenInit();
+    void mapScreenAnime();
+    void mapIconScaleSet(u8);
+    void iconScaleAnmInit(f32, f32, u8);
+    bool iconScaleAnm();
+    void buttonIconScreenInit();
+    void setAButtonString(u32);
+    void setBButtonString(u32);
+    void setCButtonString(u32);
+    void setJButtonString(u32);
+    void createExplain();
+    void deleteExplain();
+    void baseScreenInit();
+    void setFloorMessage();
+    bool dpdMove(s8, s8, s8, u8*, u8);
+    ~dMenu_DmapBg_c();
+    void setAllAlphaRate(f32, bool);
+    void setGoldAnimation(bool);
+    void setGoldFrameAlphaRate(f32);
+    void addGoldFrameAlphaRate();
+    void decGoldFrameAlphaRate();
+    void draw();
+    void update();
+    void calcCursor();
+    void drawCursor();
 
     void setDPDFloorSelCurPos(s8 i_pos) { field_0xdd6 = i_pos; }
 
@@ -169,58 +169,58 @@ public:
 
 class dMenu_Dmap_c {
 public:
-    /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
-    /* 801BB634 */ void screenInit();
-    /* 801BC788 */ void getPlayerIconPos(s8, f32);
-    /* 801BC848 */ void getIconPos(s8, f32);
-    /* 801BD1D4 */ s8 getCurFloorPos();
-    /* 801BD1E8 */ s8 getDefaultCurFloorPos();
-    /* 801BD208 */ void iconMoveCalc();
-    /* 801BD3B8 */ void drawFloorScreenBack(J2DScreen*, f32, f32, J2DOrthoGraph*);
-    /* 801BD524 */ void drawFloorScreenTop(J2DScreen*, f32, f32, J2DOrthoGraph*);
-    /* 801BD690 */ bool isMapMoveState();
-    /* 801BD6C4 */ void floorChangeMode();
-    /* 801BD7C0 */ void _create();
-    /* 801BDDA4 */ void _move();
-    /* 801BDEF8 */ void setMapTexture();
-    /* 801BDF48 */ void mapBgAnime();
-    /* 801BDF6C */ void mapControl();
-    /* 801BE328 */ bool isOpen();
-    /* 801BE670 */ bool isClose();
-    /* 801BE7E0 */ void _draw();
-    /* 801BEAFC */ void itemInfo_init_proc();
-    /* 801BEB0C */ void itemInfo_proc();
-    /* 801BEB44 */ void itemSelect();
-    /* 801BEF28 */ int getNextItem(int);
-    /* 801BEFCC */ void itemSelectAnmInit();
-    /* 801BF030 */ void itemSelectAnm();
-    /* 801BF180 */ void itemInfoOpenAnm();
-    /* 801BF18C */ void itemInfoWait();
-    /* 801BF278 */ void itemInfoCloseAnm();
-    /* 801BF334 */ u8 getNextStatus();
-    /* 801BF410 */ bool isSync();
-    /* 801BF464 */ bool isKeyCheck();
-    /* 801BF4A4 */ void infoModeChange_init_proc();
-    /* 801BF528 */ void infoModeChange_proc();
-    /* 801BF688 */ void mapModeChange_init_proc();
-    /* 801BF70C */ void mapModeChange_proc();
-    /* 801BF8A0 */ void lv5_talk_init_proc();
-    /* 801BF8F8 */ void lv5_talk_proc();
-    /* 801BF9D4 */ void mapMode_init_proc();
-    /* 801BF9E0 */ void mapMode_proc();
-    /* 801BFA84 */ void floorSelect_init_proc();
-    /* 801BFA88 */ void floorSelect_proc();
-    /* 801BFC78 */ int itemCarryCheck();
-    /* 801BFCAC */ void floorChange_init_proc();
-    /* 801BFD5C */ void floorChange_proc();
-    /* 801BFF84 */ void zoomWait_init_proc();
-    /* 801BFF88 */ void zoomWait_proc();
-    /* 801C008C */ void zoomIn_init_proc();
-    /* 801C01A0 */ void zoomIn_proc();
-    /* 801C023C */ void zoomOut_init_proc();
-    /* 801C02F0 */ void zoomOut_proc();
+    dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
+    void screenInit();
+    void getPlayerIconPos(s8, f32);
+    void getIconPos(s8, f32);
+    s8 getCurFloorPos();
+    s8 getDefaultCurFloorPos();
+    void iconMoveCalc();
+    void drawFloorScreenBack(J2DScreen*, f32, f32, J2DOrthoGraph*);
+    void drawFloorScreenTop(J2DScreen*, f32, f32, J2DOrthoGraph*);
+    bool isMapMoveState();
+    void floorChangeMode();
+    void _create();
+    void _move();
+    void setMapTexture();
+    void mapBgAnime();
+    void mapControl();
+    bool isOpen();
+    bool isClose();
+    void _draw();
+    void itemInfo_init_proc();
+    void itemInfo_proc();
+    void itemSelect();
+    int getNextItem(int);
+    void itemSelectAnmInit();
+    void itemSelectAnm();
+    void itemInfoOpenAnm();
+    void itemInfoWait();
+    void itemInfoCloseAnm();
+    u8 getNextStatus();
+    bool isSync();
+    bool isKeyCheck();
+    void infoModeChange_init_proc();
+    void infoModeChange_proc();
+    void mapModeChange_init_proc();
+    void mapModeChange_proc();
+    void lv5_talk_init_proc();
+    void lv5_talk_proc();
+    void mapMode_init_proc();
+    void mapMode_proc();
+    void floorSelect_init_proc();
+    void floorSelect_proc();
+    int itemCarryCheck();
+    void floorChange_init_proc();
+    void floorChange_proc();
+    void zoomWait_init_proc();
+    void zoomWait_proc();
+    void zoomIn_init_proc();
+    void zoomIn_proc();
+    void zoomOut_init_proc();
+    void zoomOut_proc();
 
-    /* 801BCDF4 */ virtual ~dMenu_Dmap_c();
+    virtual ~dMenu_Dmap_c();
 
     void setInOutDir(u8 dir) { mInOutDir = dir; }
     u8 getZoomState() { return mZoomState; }
diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h
index 6f24eae4f4..8c23a3b0eb 100644
--- a/include/d/d_menu_dmap_map.h
+++ b/include/d/d_menu_dmap_map.h
@@ -6,11 +6,11 @@
 
 class dMenu_DmapMap_c {
 public:
-    /* 801C04AC */ virtual ~dMenu_DmapMap_c() {}
-    /* 801C0CD8 */ void _create(u16, u16, u16, u16, void*);
-    /* 801C0D04 */ void _delete();
-    /* 801C0D70 */ void setTexture(u16, u16, u16, u16);
-    /* 801C0E4C */ void setPos(int, int, f32, f32, f32, bool, f32);
+    virtual ~dMenu_DmapMap_c() {}
+    void _create(u16, u16, u16, u16, void*);
+    void _delete();
+    void setTexture(u16, u16, u16, u16);
+    void setPos(int, int, f32, f32, f32, bool, f32);
 
     const renderingDmap_c* getRendPointer(int i_no) const { return &mRend[i_no]; }
     ResTIMG* getResTIMGPointer(int i_no) const { return mResTIMG[i_no]; }
@@ -76,41 +76,41 @@ public:
     virtual f32 getZoomCmPerPixel() = 0;
     void draw() {}
 
-    /* 801C0EE0 */ f32 getMapBlendPer() const;
-    /* 801C0F24 */ f32 getPixelStageSizeX() const;
-    /* 801C0F3C */ f32 getPixelStageSizeZ() const;
-    /* 801C0F54 */ f32 getPixelCenterX() const;
-    /* 801C0F74 */ f32 getPixelCenterZ() const;
-    /* 801C0F94 */ void initGetTreasureList(u8, s8);
-    /* 801C0FF8 */ bool getTreasureList(f32*, f32*, s8*, u8*, s8*);
-    /* 801C1128 */ void cnvPosTo2Dpos(f32, f32, f32*, f32*) const;
-    /* 801C1194 */ void getPlayerDrawInfo(f32*, f32*, s16*) const;
-    /* 801C1218 */ s8 getRestartDrawInfo(f32*, f32*, s16*) const;
-    /* 801C12A8 */ void setPlusNowStayFloorNo(s8, u8);
-    /* 801C12B4 */ void moveFloor();
-    /* 801C1878 */ void wait_init_proc();
-    /* 801C188C */ void wait_proc();
-    /* 801C18AC */ void zoomIn_init_proc();
-    /* 801C1C40 */ void initZoomIn(u8);
-    /* 801C1CEC */ void initZoomIn(u8, f32, f32);
-    /* 801C1E00 */ void initZoomInCenterHold(u8);
-    /* 801C1E74 */ void zoomCalcSet(f32);
-    /* 801C1EC0 */ void zoomIn_proc();
-    /* 801C1F2C */ void initZoomOut(u8);
-    /* 801C1F70 */ void initZoomWait(f32, f32);
-    /* 801C2004 */ void zoomWait_init_proc();
-    /* 801C205C */ void zoomWait_proc();
-    /* 801C2198 */ void zoomOut_init_proc();
-    /* 801C21AC */ void zoomOut_proc();
-    /* 801C2234 */ void move();
-    /* 801C22F8 */ s8 getPlayerStayFloorNo() const;
-    /* 801C231C */ void _create(u16, u16, u16, u16, void*);
-    /* 801C235C */ void _create(u16, u16, u16, u16, s8, void*);
-    /* 801C2518 */ void _delete();
-    /* 801C2538 */ bool isEnableZoomIn();
-    /* 801C2578 */ bool isEnableZoomOut();
-    /* 801C2588 */ void setPlusZoomCenterX(f32);
-    /* 801C2590 */ void setPlusZoomCenterZ(f32);
+    f32 getMapBlendPer() const;
+    f32 getPixelStageSizeX() const;
+    f32 getPixelStageSizeZ() const;
+    f32 getPixelCenterX() const;
+    f32 getPixelCenterZ() const;
+    void initGetTreasureList(u8, s8);
+    bool getTreasureList(f32*, f32*, s8*, u8*, s8*);
+    void cnvPosTo2Dpos(f32, f32, f32*, f32*) const;
+    void getPlayerDrawInfo(f32*, f32*, s16*) const;
+    s8 getRestartDrawInfo(f32*, f32*, s16*) const;
+    void setPlusNowStayFloorNo(s8, u8);
+    void moveFloor();
+    void wait_init_proc();
+    void wait_proc();
+    void zoomIn_init_proc();
+    void initZoomIn(u8);
+    void initZoomIn(u8, f32, f32);
+    void initZoomInCenterHold(u8);
+    void zoomCalcSet(f32);
+    void zoomIn_proc();
+    void initZoomOut(u8);
+    void initZoomWait(f32, f32);
+    void zoomWait_init_proc();
+    void zoomWait_proc();
+    void zoomOut_init_proc();
+    void zoomOut_proc();
+    void move();
+    s8 getPlayerStayFloorNo() const;
+    void _create(u16, u16, u16, u16, void*);
+    void _create(u16, u16, u16, u16, s8, void*);
+    void _delete();
+    bool isEnableZoomIn();
+    bool isEnableZoomOut();
+    void setPlusZoomCenterX(f32);
+    void setPlusZoomCenterZ(f32);
 
     u8 getDisableZoomMoveFlgX() const { return field_0xf8; }
     u8 getDisableZoomMoveFlgZ() const { return field_0xf9; }
@@ -204,13 +204,13 @@ public:
 
 class dMenu_DmapMapCtrl_c : public dMenu_StageMapCtrl_c {
 public:
-    /* 801C2028 */ virtual bool isEnableZoomMove() const;
-    /* 801C1B14 */ virtual void calcZoomCenter(f32*, f32*);
-    /* 801C2598 */ virtual void getInitWholeMapScale(f32*, f32, f32, f32, f32);
-    /* 801C25C0 */ virtual void getInitDispCenter(f32*, f32*);
-    /* 801C18C0 */ virtual void getZoomMinMaxCheck(f32*, f32*, f32*, f32*, bool*, bool*);
-    /* 801C1BA4 */ virtual f32 getZoomCmPerPixel();
-    /* 801C22A8 */ virtual void draw();
+    virtual bool isEnableZoomMove() const;
+    virtual void calcZoomCenter(f32*, f32*);
+    virtual void getInitWholeMapScale(f32*, f32, f32, f32, f32);
+    virtual void getInitDispCenter(f32*, f32*);
+    virtual void getZoomMinMaxCheck(f32*, f32*, f32*, f32*, bool*, bool*);
+    virtual f32 getZoomCmPerPixel();
+    virtual void draw();
 };
 
 #endif /* D_MENU_D_MENU_DMAP_MAP_H */
diff --git a/include/d/d_menu_fishing.h b/include/d/d_menu_fishing.h
index 318a45c27a..972aa8f7c4 100644
--- a/include/d/d_menu_fishing.h
+++ b/include/d/d_menu_fishing.h
@@ -20,26 +20,26 @@ public:
         READY_CLOSE = 3,
     };
 
-    /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
-    /* 801C504C */ void _create();
-    /* 801C50B4 */ void _move();
-    /* 801C514C */ void _draw();
-    /* 801C5204 */ bool isSync();
-    /* 801C522C */ void init();
-    /* 801C52E4 */ int _open();
-    /* 801C5470 */ int _close();
-    /* 801C556C */ void wait_init();
-    /* 801C55A8 */ void wait_move();
-    /* 801C55D8 */ void screenSetBase();
-    /* 801C5D3C */ void screenSetDoIcon();
-    /* 801C5EB8 */ void setAButtonString(u16);
-    /* 801C5F68 */ void setBButtonString(u16);
-    /* 801C6018 */ u8 getFigure(int);
-    /* 801C605C */ void setFishParam(int, u16, u8);
-    /* 801C6210 */ void setHIO(bool);
+    dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
+    void _create();
+    void _move();
+    void _draw();
+    bool isSync();
+    void init();
+    int _open();
+    int _close();
+    void wait_init();
+    void wait_move();
+    void screenSetBase();
+    void screenSetDoIcon();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    u8 getFigure(int);
+    void setFishParam(int, u16, u8);
+    void setHIO(bool);
 
-    /* 801C659C */ virtual void draw() { _draw(); }
-    /* 801C4D98 */ virtual ~dMenu_Fishing_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Fishing_c();
 
     u8 getStatus() { return mStatus; }
 
diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h
index 8501687f47..08dbde6daa 100644
--- a/include/d/d_menu_fmap.h
+++ b/include/d/d_menu_fmap.h
@@ -105,127 +105,127 @@ class dMenu_Fmap_c {
 public:
     typedef void (dMenu_Fmap_c::*process)();
  
-    /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
-    /* 801C6D64 */ void _create();
-    /* 801C74A4 */ void _delete();
-    /* 801C74A8 */ void _move();
-    /* 801C7650 */ void _draw();
-    /* 801C77F0 */ u8 getNextStatus(u8*);
-    /* 801C7AFC */ bool isSync();
-    /* 801C7B24 */ void all_map_init();
-    /* 801C7C2C */ void all_map_proc();
-    /* 801C8230 */ void zoom_all_to_region_init();
-    /* 801C8308 */ void zoom_all_to_region_proc();
-    /* 801C83E0 */ void zoom_region_to_all_init();
-    /* 801C8438 */ void zoom_region_to_all_proc();
-    /* 801C8518 */ void region_map_init();
-    /* 801C8600 */ void region_map_proc();
-    /* 801C8B00 */ void to_portal_warp_map_init();
-    /* 801C8B0C */ void to_portal_warp_map_proc();
-    /* 801C8B48 */ void portal_warp_map_init();
-    /* 801C8C0C */ void portal_warp_map_proc();
-    /* 801C90A4 */ void portal_warp_select_init();
-    /* 801C90A8 */ void portal_warp_select_proc();
-    /* 801C91D8 */ void portal_warp_forbid_init();
-    /* 801C9238 */ void portal_warp_forbid_proc();
-    /* 801C92A4 */ void zoom_region_to_spot_init();
-    /* 801C9304 */ void zoom_region_to_spot_proc();
-    /* 801C93CC */ void zoom_spot_to_region_init();
-    /* 801C9428 */ void zoom_spot_to_region_proc();
-    /* 801C950C */ void spot_map_init();
-    /* 801C9618 */ void spot_map_proc();
-    /* 801C9A4C */ void portal_demo1_init();
-    /* 801C9B64 */ void portal_demo1_move();
-    /* 801C9C7C */ void portal_demo2_init();
-    /* 801C9CC8 */ void portal_demo2_move();
-    /* 801C9D60 */ void portal_demo3_init();
-    /* 801C9DB4 */ void portal_demo3_move();
-    /* 801C9EB8 */ void portal_demo4_init();
-    /* 801C9F14 */ void portal_demo4_move();
-    /* 801C9F7C */ void portal_demo5_init();
-    /* 801C9FBC */ void portal_demo5_move();
-    /* 801CA158 */ void portal_demo6_init();
-    /* 801CA15C */ void portal_demo6_move();
-    /* 801CA1E8 */ void yamiboss_demo1_init();
-    /* 801CA2F4 */ void yamiboss_demo1_move();
-    /* 801CA34C */ void yamiboss_demo2_init();
-    /* 801CA35C */ void yamiboss_demo2_move();
-    /* 801CA40C */ void yamiboss_demo3_init();
-    /* 801CA410 */ void yamiboss_demo3_move();
-    /* 801CA468 */ void yamiboss_demo4_init();
-    /* 801CA4C0 */ void yamiboss_demo4_move();
-    /* 801CA544 */ void yamiboss_demo5_init();
-    /* 801CA548 */ void yamiboss_demo5_move();
-    /* 801CA5CC */ void light_demo1_init();
-    /* 801CA7A4 */ void light_demo1_move();
-    /* 801CA7E0 */ void light_demo2_init();
-    /* 801CA814 */ void light_demo2_move();
-    /* 801CA874 */ void table_demo1_init();
-    /* 801CA9B4 */ void table_demo1_move();
-    /* 801CAA78 */ void table_demo2_init();
-    /* 801CAABC */ void table_demo2_move();
-    /* 801CAB88 */ void table_demo3_init();
-    /* 801CABD0 */ void table_demo3_move();
-    /* 801CAC30 */ void howl_demo1_init();
-    /* 801CAC7C */ void howl_demo1_move();
-    /* 801CAD48 */ void howl_demo2_init();
-    /* 801CAD54 */ void howl_demo2_move();
-    /* 801CAD9C */ void howl_demo3_init();
-    /* 801CADA0 */ void howl_demo3_move();
-    /* 801CADC4 */ bool isOpen();
-    /* 801CB038 */ bool isClose();
-    /* 801CB1DC */ u8 getProcess();
-    /* 801CB200 */ u8 getRegionCursor();
-    /* 801CB230 */ u8 getStageCursor();
-    /* 801CB260 */ f32 getStageTransX();
-    /* 801CB290 */ f32 getStageTransZ();
-    /* 801CB2C0 */ bool isRoomCheck(int, int);
-    /* 801CB570 */ u16 checkStRoomData();
-    /* 801CB664 */ void talkButton();
-    /* 801CB6D0 */ void setProcess(u8);
-    /* 801CB6E0 */ void setFlash(u8, bool);
-    /* 801CB770 */ bool readWorldData(u8);
-    /* 801CB938 */ bool readAreaData(u8, bool);
-    /* 801CBF04 */ bool readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8);
-    /* 801CC094 */ bool readFieldMapData(void**, char const*, bool, bool);
-    /* 801CC2B0 */ void decodeFieldMapData();
-    /* 801CC4EC */ void decodePortalData();
-    /* 801CC51C */ bool readRoomDzsData(void**, u32, char const*);
-    /* 801CC61C */ bool removeAreaData();
-    /* 801CC7A8 */ bool removeRoomData(dMenu_Fmap_stage_data_c*);
-    /* 801CC85C */ void setTitleName(u32);
-    /* 801CC880 */ void setAreaName(u32);
-    /* 801CC8AC */ void setAreaNameZero();
-    /* 801CC8DC */ void portalWarpMapMove(STControl*);
-    /* 801CCA70 */ void onRoomDataBit(int);
-    /* 801CCA98 */ BOOL isRoomDataBit(int);
-    /* 801CCAC4 */ void resetRoomDataBit();
-    /* 801CCB08 */ void drawIcon(f32, bool);
-    /* 801CD10C */ void drawIcon(u8, int);
-    /* 801CCD98 */ void drawLightDropIcon();
-    /* 801CCDDC */ void drawBatsumarkIcon();
-    /* 801CCE04 */ void drawSnowmanIcon();
-    /* 801CCE48 */ void drawGoldWolfIcon();
-    /* 801CCE70 */ void drawCoachIcon();
-    /* 801CCE98 */ void drawPlayEnterIcon();
-    /* 801CCFB0 */ bool checkDrawPortalIcon(int, int);
-    /* 801CD000 */ bool searchIcon(u8, int, f32*, f32*);
-    /* 801CD210 */ void drawEnterIcon();
-    /* 801CD254 */ void drawPortalIcon();
-    /* 801CD2FC */ u8 getRegionStageNum(int);
-    /* 801CD350 */ dMenu_Fmap_region_data_c* getNowFmapRegionData();
-    /* 801CD368 */ dMenu_Fmap_stage_data_c* getNowFmapStageData();
-    /* 801CD380 */ u8 searchPortalStageID(char*);
-    /* 801CD3F0 */ void drawDebugStage();
-    /* 801CD460 */ void arrowPosInit();
-    /* 801CD5CC */ void tableArrowPosInit(bool);
-    /* 801CD770 */ void yamibossArrowPosInit();
-    /* 801CD814 */ void howlArrowPosInit();
-    /* 801CD8B4 */ u8 getHowlRegionID();
-    /* 801CD92C */ bool isLightVesselGet();
-    /* 801CD95C */ cXyz* getPlayerPos2D();
+    dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    u8 getNextStatus(u8*);
+    bool isSync();
+    void all_map_init();
+    void all_map_proc();
+    void zoom_all_to_region_init();
+    void zoom_all_to_region_proc();
+    void zoom_region_to_all_init();
+    void zoom_region_to_all_proc();
+    void region_map_init();
+    void region_map_proc();
+    void to_portal_warp_map_init();
+    void to_portal_warp_map_proc();
+    void portal_warp_map_init();
+    void portal_warp_map_proc();
+    void portal_warp_select_init();
+    void portal_warp_select_proc();
+    void portal_warp_forbid_init();
+    void portal_warp_forbid_proc();
+    void zoom_region_to_spot_init();
+    void zoom_region_to_spot_proc();
+    void zoom_spot_to_region_init();
+    void zoom_spot_to_region_proc();
+    void spot_map_init();
+    void spot_map_proc();
+    void portal_demo1_init();
+    void portal_demo1_move();
+    void portal_demo2_init();
+    void portal_demo2_move();
+    void portal_demo3_init();
+    void portal_demo3_move();
+    void portal_demo4_init();
+    void portal_demo4_move();
+    void portal_demo5_init();
+    void portal_demo5_move();
+    void portal_demo6_init();
+    void portal_demo6_move();
+    void yamiboss_demo1_init();
+    void yamiboss_demo1_move();
+    void yamiboss_demo2_init();
+    void yamiboss_demo2_move();
+    void yamiboss_demo3_init();
+    void yamiboss_demo3_move();
+    void yamiboss_demo4_init();
+    void yamiboss_demo4_move();
+    void yamiboss_demo5_init();
+    void yamiboss_demo5_move();
+    void light_demo1_init();
+    void light_demo1_move();
+    void light_demo2_init();
+    void light_demo2_move();
+    void table_demo1_init();
+    void table_demo1_move();
+    void table_demo2_init();
+    void table_demo2_move();
+    void table_demo3_init();
+    void table_demo3_move();
+    void howl_demo1_init();
+    void howl_demo1_move();
+    void howl_demo2_init();
+    void howl_demo2_move();
+    void howl_demo3_init();
+    void howl_demo3_move();
+    bool isOpen();
+    bool isClose();
+    u8 getProcess();
+    u8 getRegionCursor();
+    u8 getStageCursor();
+    f32 getStageTransX();
+    f32 getStageTransZ();
+    bool isRoomCheck(int, int);
+    u16 checkStRoomData();
+    void talkButton();
+    void setProcess(u8);
+    void setFlash(u8, bool);
+    bool readWorldData(u8);
+    bool readAreaData(u8, bool);
+    bool readRoomData(char const*, dMenu_Fmap_stage_data_c*, void*, int, u8);
+    bool readFieldMapData(void**, char const*, bool, bool);
+    void decodeFieldMapData();
+    void decodePortalData();
+    bool readRoomDzsData(void**, u32, char const*);
+    bool removeAreaData();
+    bool removeRoomData(dMenu_Fmap_stage_data_c*);
+    void setTitleName(u32);
+    void setAreaName(u32);
+    void setAreaNameZero();
+    void portalWarpMapMove(STControl*);
+    void onRoomDataBit(int);
+    BOOL isRoomDataBit(int);
+    void resetRoomDataBit();
+    void drawIcon(f32, bool);
+    void drawIcon(u8, int);
+    void drawLightDropIcon();
+    void drawBatsumarkIcon();
+    void drawSnowmanIcon();
+    void drawGoldWolfIcon();
+    void drawCoachIcon();
+    void drawPlayEnterIcon();
+    bool checkDrawPortalIcon(int, int);
+    bool searchIcon(u8, int, f32*, f32*);
+    void drawEnterIcon();
+    void drawPortalIcon();
+    u8 getRegionStageNum(int);
+    dMenu_Fmap_region_data_c* getNowFmapRegionData();
+    dMenu_Fmap_stage_data_c* getNowFmapStageData();
+    u8 searchPortalStageID(char*);
+    void drawDebugStage();
+    void arrowPosInit();
+    void tableArrowPosInit(bool);
+    void yamibossArrowPosInit();
+    void howlArrowPosInit();
+    u8 getHowlRegionID();
+    bool isLightVesselGet();
+    cXyz* getPlayerPos2D();
 
-    /* 801C6AC8 */ virtual ~dMenu_Fmap_c();
+    virtual ~dMenu_Fmap_c();
 
     enum process_e {
         /* 0x00 */ PROC_ALL_MAP,
@@ -336,8 +336,8 @@ private:
 
 class dMf_HIO_c {
 public:
-    /* 801C65F8 */ dMf_HIO_c();
-    /* 801CDA2C */ virtual ~dMf_HIO_c() {}
+    dMf_HIO_c();
+    virtual ~dMf_HIO_c() {}
 
     /* 0x04 */ u8 field_0x4[4];
     /* 0x08 */ f32 mBackAnimeStep;
diff --git a/include/d/d_menu_fmap2D.h b/include/d/d_menu_fmap2D.h
index 01c27cf337..75752c8ccc 100644
--- a/include/d/d_menu_fmap2D.h
+++ b/include/d/d_menu_fmap2D.h
@@ -13,74 +13,74 @@ class dMsgScrnExplain_c;
 
 class dMenu_Fmap2DBack_c : public dDlst_base_c, public dMenuMapCommon_c {
 public:
-    /* 801CF56C */ dMenu_Fmap2DBack_c();
-    /* 801D0804 */ void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32);
-    /* 801D0AC8 */ void calcAllMapPos();
-    /* 801D0BF8 */ f32 calcAllMapScaleRate();
-    /* 801D0C6C */ void calcAllMapPos2DFirst(f32, f32, f32*, f32*);
-    /* 801D0E00 */ void calcAllMapPos2D(f32, f32, f32*, f32*, f32, f32, f32);
-    /* 801D0D18 */ void calcAllMapPos2D(f32, f32, f32*, f32*);
-    /* 801D0D50 */ void calcAllMapPos2D(char const*, f32, f32, f32*, f32*);
-    /* 801D0F7C */ void calcAllMapPosWorld(f32, f32, f32*, f32*);
-    /* 801D1094 */ void setSpotPane(ResTIMG*);
-    /* 801D10F4 */ void deleteSpotPane();
-    /* 801D1148 */ void zoomMapCalc(f32);
-    /* 801D1478 */ void zoomMapCalc2(f32);
-    /* 801D1858 */ void zoomMapCalcHIO();
-    /* 801D1AA4 */ void scrollCalc(f32);
-    /* 801D1D50 */ void mapBlink(s16*);
-    /* 801D1D74 */ void setSpotCursor(u8);
-    /* 801D1DC4 */ void allmap_move2(STControl*);
-    /* 801D2100 */ void setIcon2DPos(u8, f32, f32, f32, u8, bool);
-    /* 801D241C */ void setIcon2DPos(u8, char const*, f32, f32, f32, u8, bool);
-    /* 801D2454 */ void setIcon2DPos(u8, u8, char const*, f32, f32, f32, u8, bool);
-    /* 801D2508 */ int isShowRegion(int);
-    /* 801D2658 */ f32 getMapAreaGlobalPosX();
-    /* 801D2668 */ f32 getMapAreaGlobalPosY();
-    /* 801D2678 */ f32 getMapAreaGlobalCenterPosX();
-    /* 801D26C8 */ f32 getMapAreaGlobalCenterPosY();
-    /* 801D2718 */ f32 getMapAreaSizeX();
-    /* 801D2728 */ f32 getMapAreaSizeY();
-    /* 801D2738 */ f32 getMapScissorAreaLX();
-    /* 801D2790 */ f32 getMapScissorAreaLY();
-    /* 801D27E8 */ f32 getMapScissorAreaSizeX();
-    /* 801D2860 */ f32 getMapScissorAreaSizeRealX();
-    /* 801D2880 */ f32 getMapScissorAreaCenterPosX();
-    /* 801D28D0 */ f32 getMapScissorAreaCenterPosY();
-    /* 801D2920 */ f32 getMapScissorAreaSizeY();
-    /* 801D2998 */ f32 getMapScissorAreaSizeRealY();
-    /* 801D29B8 */ void calcRenderingPos();
-    /* 801D2A34 */ void calcRenderingScale();
-    /* 801D2AC8 */ f32 getPathScale(f32);
-    /* 801D2B5C */ f32 getAllMapZoomRate();
-    /* 801D2B64 */ f32 getRegionMapZoomRate(int);
-    /* 801D2C4C */ f32 getSpotMapZoomRate();
-    /* 801D2C88 */ void getStageOriginPath(u8, f32*, f32*);
-    /* 801D2CC8 */ void calcOffset(u8, char const*, f32*, f32*);
-    /* 801D2DA8 */ void regionTextureDraw();
-    /* 801D3094 */ void stageTextureDraw();
-    /* 801D31D0 */ void worldGridDraw();
-    /* 801D34DC */ void regionGridDraw();
-    /* 801D382C */ void worldOriginDraw();
-    /* 801D38FC */ void scrollAreaDraw();
-    /* 801D3AF8 */ void regionOriginDraw();
-    /* 801D3BBC */ void stageOriginDraw();
-    /* 801D3CB8 */ void calcBlink();
-    /* 801D4928 */ void calcBackAlpha(bool);
-    /* 801D49E0 */ void btkAnimeLoop(f32);
-    /* 801D4AFC */ void setBaseBackAlpha(u8);
-    /* 801D4B2C */ void regionMapMove(STControl*);
-    /* 801D4E80 */ void stageMapMove(STControl*, u8, bool);
-    /* 801D5334 */ void setAllAlphaRate(f32, bool);
-    /* 801D5388 */ void drawDebugStageArea();
-    /* 801D564C */ void drawDebugRegionArea();
-    /* 801D58F8 */ void setArrowPos3D(u8, char const*, f32, f32);
-    /* 801D59C0 */ void setArrowPos3DOffset(u8, char const*, f32, f32, f32);
-    /* 801D5AC4 */ void calcDrawPriority();
-    /* 801D5BB8 */ void setArrowPosAxis(f32, f32);
+    dMenu_Fmap2DBack_c();
+    void setRegionTexData(u8, ResTIMG*, f32, f32, f32, f32, f32, f32, f32, f32, f32);
+    void calcAllMapPos();
+    f32 calcAllMapScaleRate();
+    void calcAllMapPos2DFirst(f32, f32, f32*, f32*);
+    void calcAllMapPos2D(f32, f32, f32*, f32*, f32, f32, f32);
+    void calcAllMapPos2D(f32, f32, f32*, f32*);
+    void calcAllMapPos2D(char const*, f32, f32, f32*, f32*);
+    void calcAllMapPosWorld(f32, f32, f32*, f32*);
+    void setSpotPane(ResTIMG*);
+    void deleteSpotPane();
+    void zoomMapCalc(f32);
+    void zoomMapCalc2(f32);
+    void zoomMapCalcHIO();
+    void scrollCalc(f32);
+    void mapBlink(s16*);
+    void setSpotCursor(u8);
+    void allmap_move2(STControl*);
+    void setIcon2DPos(u8, f32, f32, f32, u8, bool);
+    void setIcon2DPos(u8, char const*, f32, f32, f32, u8, bool);
+    void setIcon2DPos(u8, u8, char const*, f32, f32, f32, u8, bool);
+    int isShowRegion(int);
+    f32 getMapAreaGlobalPosX();
+    f32 getMapAreaGlobalPosY();
+    f32 getMapAreaGlobalCenterPosX();
+    f32 getMapAreaGlobalCenterPosY();
+    f32 getMapAreaSizeX();
+    f32 getMapAreaSizeY();
+    f32 getMapScissorAreaLX();
+    f32 getMapScissorAreaLY();
+    f32 getMapScissorAreaSizeX();
+    f32 getMapScissorAreaSizeRealX();
+    f32 getMapScissorAreaCenterPosX();
+    f32 getMapScissorAreaCenterPosY();
+    f32 getMapScissorAreaSizeY();
+    f32 getMapScissorAreaSizeRealY();
+    void calcRenderingPos();
+    void calcRenderingScale();
+    f32 getPathScale(f32);
+    f32 getAllMapZoomRate();
+    f32 getRegionMapZoomRate(int);
+    f32 getSpotMapZoomRate();
+    void getStageOriginPath(u8, f32*, f32*);
+    void calcOffset(u8, char const*, f32*, f32*);
+    void regionTextureDraw();
+    void stageTextureDraw();
+    void worldGridDraw();
+    void regionGridDraw();
+    void worldOriginDraw();
+    void scrollAreaDraw();
+    void regionOriginDraw();
+    void stageOriginDraw();
+    void calcBlink();
+    void calcBackAlpha(bool);
+    void btkAnimeLoop(f32);
+    void setBaseBackAlpha(u8);
+    void regionMapMove(STControl*);
+    void stageMapMove(STControl*, u8, bool);
+    void setAllAlphaRate(f32, bool);
+    void drawDebugStageArea();
+    void drawDebugRegionArea();
+    void setArrowPos3D(u8, char const*, f32, f32);
+    void setArrowPos3DOffset(u8, char const*, f32, f32, f32);
+    void calcDrawPriority();
+    void setArrowPosAxis(f32, f32);
 
-    /* 801CFF34 */ virtual void draw();
-    /* 801CFCDC */ virtual ~dMenu_Fmap2DBack_c();
+    virtual void draw();
+    virtual ~dMenu_Fmap2DBack_c();
 
     void setDebugData(dMenu_FmapMap_c* fmap_map, dMenu_Fmap_region_data_c* region_data,
                       int param_2) {
@@ -300,33 +300,33 @@ public:
 
 class dMenu_Fmap2DTop_c : public dDlst_base_c {
 public:
-    /* 801D5BD0 */ dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*);
-    /* 801D6A44 */ void _execute();
-    /* 801D6C44 */ void setAllAlphaRate(f32, bool);
-    /* 801D6DF8 */ void btkAnimeLoop(J2DAnmTextureSRTKey*, f32);
-    /* 801D6EDC */ void setMoyaAlpha(u8);
-    /* 801D6F38 */ void setTitleNameString(u32);
-    /* 801D7010 */ void setAreaNameString(u32);
-    /* 801D70E8 */ void setZButtonString(u32, u8);
-    /* 801D7210 */ void setBButtonString(u32, u8);
-    /* 801D72D4 */ void setAButtonString(u32, u8);
-    /* 801D7398 */ void setCrossLRString(u32);
-    /* 801D74EC */ void set3DStickString(u32);
-    /* 801D7640 */ void createExplain(JKRExpHeap*, STControl*);
-    /* 801D76C0 */ void deleteExplain();
-    /* 801D7714 */ void setArrowAlphaRatio(u8, f32);
-    /* 801D77C4 */ void setAlphaAnimeMin(CPaneMgrAlpha*);
-    /* 801D7858 */ void setAlphaAnimeMid(CPaneMgrAlpha*);
-    /* 801D78FC */ void setAlphaAnimeMax(CPaneMgrAlpha*);
-    /* 801D7994 */ bool checkPlayerWarpAccept();
-    /* 801D7A08 */ bool checkWarpAcceptRegion(int);
-    /* 801D7AB4 */ bool checkWarpAcceptRegion4();
-    /* 801D7B58 */ bool checkWarpAcceptCannon();
-    /* 801D7BCC */ void setHIO(bool);
-    /* 801D8088 */ bool isWarpAccept();
+    dMenu_Fmap2DTop_c(JKRExpHeap*, STControl*);
+    void _execute();
+    void setAllAlphaRate(f32, bool);
+    void btkAnimeLoop(J2DAnmTextureSRTKey*, f32);
+    void setMoyaAlpha(u8);
+    void setTitleNameString(u32);
+    void setAreaNameString(u32);
+    void setZButtonString(u32, u8);
+    void setBButtonString(u32, u8);
+    void setAButtonString(u32, u8);
+    void setCrossLRString(u32);
+    void set3DStickString(u32);
+    void createExplain(JKRExpHeap*, STControl*);
+    void deleteExplain();
+    void setArrowAlphaRatio(u8, f32);
+    void setAlphaAnimeMin(CPaneMgrAlpha*);
+    void setAlphaAnimeMid(CPaneMgrAlpha*);
+    void setAlphaAnimeMax(CPaneMgrAlpha*);
+    bool checkPlayerWarpAccept();
+    bool checkWarpAcceptRegion(int);
+    bool checkWarpAcceptRegion4();
+    bool checkWarpAcceptCannon();
+    void setHIO(bool);
+    bool isWarpAccept();
 
-    /* 801D6C98 */ virtual void draw();
-    /* 801D6700 */ virtual ~dMenu_Fmap2DTop_c();
+    virtual void draw();
+    virtual ~dMenu_Fmap2DTop_c();
 
     void setAllTrans(f32 i_transX, f32 i_transY) {
         mTransX = i_transX;
diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h
index b9f67e00fc..4cff7c7570 100644
--- a/include/d/d_menu_fmap_map.h
+++ b/include/d/d_menu_fmap_map.h
@@ -68,31 +68,31 @@ public:
         mDrawEnable = false;
     }
 
-    /* 801CE15C */ void init(u8*, u16, u16, u16, u16);
-    /* 801CE188 */ void entry(dMenu_Fmap_world_data_c*, int, f32, f32, f32);
-    /* 801CE224 */ bool isSwitchSpecialOff(int);
-    /* 801CE288 */ bool isSwitch(group_class const*);
-    /* 801CE3C0 */ int getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*,
+    void init(u8*, u16, u16, u16, u16);
+    void entry(dMenu_Fmap_world_data_c*, int, f32, f32, f32);
+    bool isSwitchSpecialOff(int);
+    bool isSwitch(group_class const*);
+    int getPointStagePathInnerNo(dMenu_Fmap_region_data_c*, f32, f32, int, int*,
                                                 int*);
-    /* 801CE410 */ void preDrawPath();
-    /* 801CE4D4 */ bool isDrawPath();
-    /* 801CE4DC */ bool isDrawRoom();
-    /* 801CE560 */ void postDrawPath();
-    /* 801CE5B8 */ void postRenderingMap();
-    /* 801CE5EC */ void roomSetteing();
-    /* 801CE6A8 */ room_class* getFirstRoomPointer();
-    /* 801CE75C */ void getFirstRegion();
-    /* 801CE7A8 */ void getFirstStage();
-    /* 801CE80C */ void getFirstRoom();
-    /* 801CE84C */ bool getNextRoom();
-    /* 801CE8B8 */ bool getNextStage();
-    /* 801CE93C */ bool getNextRegion();
-    /* 801CE9A4 */ room_class* getNextRoomPointer();
+    void preDrawPath();
+    bool isDrawPath();
+    bool isDrawRoom();
+    void postDrawPath();
+    void postRenderingMap();
+    void roomSetteing();
+    room_class* getFirstRoomPointer();
+    void getFirstRegion();
+    void getFirstStage();
+    void getFirstRoom();
+    bool getNextRoom();
+    bool getNextStage();
+    bool getNextRegion();
+    room_class* getNextRoomPointer();
 
-    /* 801CF4D0 */ ~renderingFmap_c() {}
-    /* 801CF55C */ bool isRenderingFloor(int) { return true; }
-    /* 801CF564 */ void beforeDrawPath() {}
-    /* 801CF568 */ void afterDrawPath() {}
+    ~renderingFmap_c() {}
+    bool isRenderingFloor(int) { return true; }
+    void beforeDrawPath() {}
+    void afterDrawPath() {}
     int getNowDrawRegionNo() { return mRegionNo; }
     bool isDrawEnable() { return mDrawEnable; }
 
@@ -124,24 +124,24 @@ public:
 
 class dMenu_FmapMap_c : public renderingFmap_c {
 public:
-    /* 801CEAAC */ void setFmapPaletteColor(palette_e, GXColor const&);
-    /* 801CEA38 */ void setFmapPaletteColor(palette_e, u8, u8, u8, u8);
-    /* 801CEAE0 */ bool isFlashRoomNoCheck(int) const;
-    /* 801CEB1C */ void setPointColor(f32);
-    /* 801CEC24 */ dMenu_FmapMap_c();
-    /* 801CED38 */ ~dMenu_FmapMap_c();
-    /* 801CEDE8 */ void _create(u16, u16, u16, u16, void*);
-    /* 801CEE3C */ void _delete();
-    /* 801CEE94 */ void draw();
-    /* 801CF0B4 */ void rendering(line_class const*);
-    /* 801CF12C */ int getLineWidth(int);
-    /* 801CF1D4 */ bool isDrawType(int);
-    /* 801CF1E0 */ void setFlashOn(int, int, u8*, int);
-    /* 801CF208 */ const GXColor* getLineColor(int, int);
-    /* 801CF298 */ const GXColor* getBackColor() const;
-    /* 801CF2A0 */ const GXColor* getColor(int);
-    /* 801CF394 */ void setTexture(u16, u16, u16, u16);
-    /* 801CF450 */ void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32);
+    void setFmapPaletteColor(palette_e, GXColor const&);
+    void setFmapPaletteColor(palette_e, u8, u8, u8, u8);
+    bool isFlashRoomNoCheck(int) const;
+    void setPointColor(f32);
+    dMenu_FmapMap_c();
+    ~dMenu_FmapMap_c();
+    void _create(u16, u16, u16, u16, void*);
+    void _delete();
+    void draw();
+    void rendering(line_class const*);
+    int getLineWidth(int);
+    bool isDrawType(int);
+    void setFlashOn(int, int, u8*, int);
+    const GXColor* getLineColor(int, int);
+    const GXColor* getBackColor() const;
+    const GXColor* getColor(int);
+    void setTexture(u16, u16, u16, u16);
+    void setRendering(dMenu_Fmap_world_data_c*, int, f32, f32, f32, f32);
 
     f32 getRateWithFrameCount(int param_0) {
         return (f32)(g_Counter.mCounter0 % param_0) / (f32)param_0;
diff --git a/include/d/d_menu_insect.h b/include/d/d_menu_insect.h
index 8a856d9eb3..6b23a3845d 100644
--- a/include/d/d_menu_insect.h
+++ b/include/d/d_menu_insect.h
@@ -16,43 +16,43 @@ class JKRArchive;
 
 class dMenu_Insect_c : public dDlst_base_c {
 public:
-    /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
-    /* 801D8658 */ void _create();
-    /* 801D86C8 */ void _move();
-    /* 801D8760 */ void _draw();
-    /* 801D88EC */ bool isSync();
-    /* 801D8914 */ void init();
-    /* 801D894C */ int _open();
-    /* 801D8B2C */ int _close();
-    /* 801D8C68 */ void wait_init();
-    /* 801D8CCC */ void wait_move();
-    /* 801D8E00 */ void explain_open_init();
-    /* 801D91E4 */ void explain_open_move();
-    /* 801D9264 */ void explain_move_init();
-    /* 801D9268 */ void explain_move_move();
-    /* 801D9290 */ void select_move_init();
-    /* 801D92DC */ void select_move_move();
-    /* 801D9504 */ void explain_close_init();
-    /* 801D95AC */ void explain_close_move();
-    /* 801D9644 */ void screenSetBase();
-    /* 801D98F0 */ void screenSetExplain();
-    /* 801D9BD0 */ void screenSetDoIcon();
-    /* 801D9D4C */ static u8 getGetInsectNum();
-    /* 801D9DCC */ u8 getInsectItemID(int, int);
-    /* 801D9DE4 */ bool isGetInsect(int, int);
-    /* 801D9E20 */ bool isGiveInsect(int, int);
-    /* 801D9ED4 */ static bool isGiveInsect(u8);
-    /* 801D9E7C */ static bool isCatchInsect(u8);
-    /* 801D9F3C */ static bool isCatchNotGiveInsect(u8);
-    /* 801D9F8C */ void cursorMove();
-    /* 801DA1EC */ void setCursorPos();
-    /* 801DA2FC */ u8 dpdMove();
-    /* 801DA304 */ void setAButtonString(u16);
-    /* 801DA3B4 */ void setBButtonString(u16);
-    /* 801DA464 */ void setHIO(bool);
+    dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
+    void _create();
+    void _move();
+    void _draw();
+    bool isSync();
+    void init();
+    int _open();
+    int _close();
+    void wait_init();
+    void wait_move();
+    void explain_open_init();
+    void explain_open_move();
+    void explain_move_init();
+    void explain_move_move();
+    void select_move_init();
+    void select_move_move();
+    void explain_close_init();
+    void explain_close_move();
+    void screenSetBase();
+    void screenSetExplain();
+    void screenSetDoIcon();
+    static u8 getGetInsectNum();
+    u8 getInsectItemID(int, int);
+    bool isGetInsect(int, int);
+    bool isGiveInsect(int, int);
+    static bool isGiveInsect(u8);
+    static bool isCatchInsect(u8);
+    static bool isCatchNotGiveInsect(u8);
+    void cursorMove();
+    void setCursorPos();
+    u8 dpdMove();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    void setHIO(bool);
 
-    /* 801DA630 */ virtual void draw() { _draw(); }
-    /* 801D82F4 */ virtual ~dMenu_Insect_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Insect_c();
 
     u8 getStatus() { return mStatus; }
 
diff --git a/include/d/d_menu_item_explain.h b/include/d/d_menu_item_explain.h
index b03a0ce749..cf2d098ff8 100644
--- a/include/d/d_menu_item_explain.h
+++ b/include/d/d_menu_item_explain.h
@@ -16,30 +16,30 @@ class J2DOrthoGraph;
 
 class dMenu_ItemExplain_c {
 public:
-    /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
-    /* 801DAFF0 */ virtual ~dMenu_ItemExplain_c();
-    /* 801DB470 */ void move();
-    /* 801DB514 */ void draw(J2DOrthoGraph*);
-    /* 801DB744 */ void drawKantera();
-    /* 801DB818 */ void wait_init();
-    /* 801DB81C */ void wait_proc();
-    /* 801DB820 */ void open_init();
-    /* 801DBAB4 */ void open_proc();
-    /* 801DBB50 */ void move_init();
-    /* 801DBB7C */ void move_proc();
-    /* 801DBCB4 */ void move_select_init();
-    /* 801DBF44 */ void move_select_proc();
-    /* 801DC1E0 */ void move_next_init();
-    /* 801DC214 */ void move_next_proc();
-    /* 801DC2E4 */ void close_init();
-    /* 801DC2F0 */ void close_proc();
-    /* 801DC340 */ u8 openExplain(u8, u8, u8, bool);
-    /* 801DC3C8 */ u8 openExplainDmap(u8, u8, u8, bool, u8);
-    /* 801DC738 */ u8 openExplainTx(u32, u32);
-    /* 801DC7AC */ f32 getAlphaRatio();
-    /* 801DC7FC */ void setNumber();
-    /* 801DCB54 */ bool getWarpMarkFlag();
-    /* 801DCBBC */ void setScale();
+    dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
+    virtual ~dMenu_ItemExplain_c();
+    void move();
+    void draw(J2DOrthoGraph*);
+    void drawKantera();
+    void wait_init();
+    void wait_proc();
+    void open_init();
+    void open_proc();
+    void move_init();
+    void move_proc();
+    void move_select_init();
+    void move_select_proc();
+    void move_next_init();
+    void move_next_proc();
+    void close_init();
+    void close_proc();
+    u8 openExplain(u8, u8, u8, bool);
+    u8 openExplainDmap(u8, u8, u8, bool, u8);
+    u8 openExplainTx(u32, u32);
+    f32 getAlphaRatio();
+    void setNumber();
+    bool getWarpMarkFlag();
+    void setScale();
 
     u8 getStatus() { return mStatus; }
     void offForceButton() { mForceButton = 0; }
diff --git a/include/d/d_menu_letter.h b/include/d/d_menu_letter.h
index 1de117ce45..163c381699 100644
--- a/include/d/d_menu_letter.h
+++ b/include/d/d_menu_letter.h
@@ -14,49 +14,49 @@ class dSelect_cursor_c;
 
 class dMenu_Letter_c : public dDlst_base_c {
 public:
-    /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
-    /* 801DD36C */ void _create();
-    /* 801DD474 */ void _move();
-    /* 801DD50C */ void _draw();
-    /* 801DD934 */ bool isSync();
-    /* 801DD95C */ void letter_init_calc();
-    /* 801DDA20 */ void init();
-    /* 801DDA74 */ int _open();
-    /* 801DDC98 */ int _close();
-    /* 801DDE18 */ void wait_init();
-    /* 801DDE54 */ void wait_move();
-    /* 801DE164 */ void slide_right_init();
-    /* 801DE1E8 */ void slide_right_move();
-    /* 801DE24C */ void slide_left_init();
-    /* 801DE2D0 */ void slide_left_move();
-    /* 801DE334 */ void read_open_init();
-    /* 801DE564 */ void read_open_move();
-    /* 801DE70C */ void read_move_init();
-    /* 801DE824 */ void read_move_move();
-    /* 801DEA48 */ void read_next_fadeout_init();
-    /* 801DEA94 */ void read_next_fadeout_move();
-    /* 801DEBD8 */ void read_next_fadein_init();
-    /* 801DED04 */ void read_next_fadein_move();
-    /* 801DEE20 */ void read_close_init();
-    /* 801DEE6C */ void read_close_move();
-    /* 801DF010 */ void screenSetMenu();
-    /* 801DFA58 */ void screenSetBase();
-    /* 801E0330 */ void screenSetShadow();
-    /* 801E03D8 */ void screenSetLetter();
-    /* 801E09A8 */ void screenSetDoIcon();
-    /* 801E0B24 */ void setCursorPos();
-    /* 801E0BB0 */ void changeActiveColor();
-    /* 801E0E34 */ void changePageLight();
-    /* 801E0E84 */ void setPageText();
-    /* 801E1038 */ void setDMYPageText();
-    /* 801E11EC */ void copyDMYMenu();
-    /* 801E1518 */ void setAButtonString(u16);
-    /* 801E15C8 */ void setBButtonString(u16);
-    /* 801E1678 */ u8 getLetterNum();
-    /* 801E1748 */ void setHIO(bool);
+    dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
+    void _create();
+    void _move();
+    void _draw();
+    bool isSync();
+    void letter_init_calc();
+    void init();
+    int _open();
+    int _close();
+    void wait_init();
+    void wait_move();
+    void slide_right_init();
+    void slide_right_move();
+    void slide_left_init();
+    void slide_left_move();
+    void read_open_init();
+    void read_open_move();
+    void read_move_init();
+    void read_move_move();
+    void read_next_fadeout_init();
+    void read_next_fadeout_move();
+    void read_next_fadein_init();
+    void read_next_fadein_move();
+    void read_close_init();
+    void read_close_move();
+    void screenSetMenu();
+    void screenSetBase();
+    void screenSetShadow();
+    void screenSetLetter();
+    void screenSetDoIcon();
+    void setCursorPos();
+    void changeActiveColor();
+    void changePageLight();
+    void setPageText();
+    void setDMYPageText();
+    void copyDMYMenu();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    u8 getLetterNum();
+    void setHIO(bool);
 
-    /* 801E1D5C */ virtual void draw() { _draw(); }
-    /* 801DCF34 */ virtual ~dMenu_Letter_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Letter_c();
 
     u8 getStatus() { return mStatus; }
 
diff --git a/include/d/d_menu_map_common.h b/include/d/d_menu_map_common.h
index 7ebd8ce995..29575fd7bb 100644
--- a/include/d/d_menu_map_common.h
+++ b/include/d/d_menu_map_common.h
@@ -47,19 +47,19 @@ public:
         /* 0x15 */ u8 _15;
     };
 
-    /* 801C2718 */ dMenuMapCommon_c();
-    /* 801C27B4 */ virtual ~dMenuMapCommon_c();
-    /* 801C28D8 */ void initiate(JKRArchive*);
-    /* 801C38E4 */ void drawIcon(f32, f32, f32, f32);
-    /* 801C3EC4 */ void iconScale(int, f32, f32, f32);
-    /* 801C43A8 */ bool setIconInfo(u8, f32, f32, f32, f32, f32, u8);
-    /* 801C443C */ void clearIconInfo();
-    /* 801C4494 */ void setBlendRatio(u8, f32, f32);
-    /* 801C452C */ void blinkMove(s16);
-    /* 801C4600 */ void moveLightDropAnime();
-    /* 801C4738 */ f32 getIconSizeX(u8 index);
-    /* 801C4778 */ f32 getIconSizeY(u8 index);
-    /* 801C47C4 */ void debugIcon();
+    dMenuMapCommon_c();
+    virtual ~dMenuMapCommon_c();
+    void initiate(JKRArchive*);
+    void drawIcon(f32, f32, f32, f32);
+    void iconScale(int, f32, f32, f32);
+    bool setIconInfo(u8, f32, f32, f32, f32, f32, u8);
+    void clearIconInfo();
+    void setBlendRatio(u8, f32, f32);
+    void blinkMove(s16);
+    void moveLightDropAnime();
+    f32 getIconSizeX(u8 index);
+    f32 getIconSizeY(u8 index);
+    void debugIcon();
 
     void setCenterPosX(f32 center_pos, u8 param_2) {
         mCenterPosX = center_pos;
diff --git a/include/d/d_menu_option.h b/include/d/d_menu_option.h
index 4599aa65e5..f24652ba87 100644
--- a/include/d/d_menu_option.h
+++ b/include/d/d_menu_option.h
@@ -17,83 +17,83 @@ class dSelect_cursor_c;
 
 class dMenu_Option_c : public dDlst_base_c {
 public:
-    /* 801E1F10 */ dMenu_Option_c(JKRArchive*, STControl*);
-    /* 801E205C */ void _create();
-    /* 801E2C1C */ void _delete();
-    /* 801E3408 */ void _move();
-    /* 801E36CC */ void _draw();
-    /* 801E38CC */ void drawHaihai();
-    /* 801E3A7C */ bool isSync();
-    /* 801E3AA4 */ bool checkLeftTrigger();
-    /* 801E3AC8 */ bool checkRightTrigger();
-    /* 801E3AEC */ void setAnimation();
-    /* 801E3B98 */ bool _open();
-    /* 801E3DE0 */ bool _close();
-    /* 801E3F6C */ void atten_init();
-    /* 801E3FC4 */ void atten_move();
+    dMenu_Option_c(JKRArchive*, STControl*);
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void drawHaihai();
+    bool isSync();
+    bool checkLeftTrigger();
+    bool checkRightTrigger();
+    void setAnimation();
+    bool _open();
+    bool _close();
+    void atten_init();
+    void atten_move();
 #if VERSION == VERSION_GCN_JPN
     void ruby_init();
     void ruby_move();
 #endif
-    /* 801E41A0 */ void vib_init();
-    /* 801E41F8 */ void vib_move();
-    /* 801E4488 */ void sound_init();
-    /* 801E44E0 */ void sound_move();
-    /* 801E48AC */ void change_init();
-    /* 801E48E8 */ void change_move();
-    /* 801E4B34 */ void confirm_open_init();
-    /* 801E4C10 */ void confirm_open_move();
-    /* 801E4CE4 */ void confirm_move_init();
-    /* 801E4D20 */ void confirm_move_move();
-    /* 801E4E98 */ void confirm_select_init();
-    /* 801E4E9C */ void confirm_select_move();
-    /* 801E4F18 */ void confirm_close_init();
-    /* 801E4FB0 */ void confirm_close_move();
-    /* 801E51CC */ void tv_open1_move();
-    /* 801E5244 */ void tv_open2_move();
-    /* 801E5260 */ void tv_move_move();
-    /* 801E5300 */ void tv_close1_move();
-    /* 801E5364 */ void tv_close2_move();
-    /* 801E5380 */ void calibration_open1_move();
-    /* 801E53C4 */ void calibration_open2_move();
-    /* 801E53E0 */ void calibration_move_move();
-    /* 801E5434 */ void calibration_close1_move();
-    /* 801E5478 */ void calibration_close2_move();
-    /* 801E5494 */ void menuVisible();
-    /* 801E54F8 */ void menuShow(int);
-    /* 801E55B8 */ void menuHide(int);
-    /* 801E5678 */ void screenSet();
-    /* 801E6FBC */ void setSoundMode(u32);
-    /* 801E7004 */ void setAttenString();
-    /* 801E70E8 */ void setRubyString();
-    /* 801E70E8 */ void setVibString();
-    /* 801E71CC */ void setSoundString();
-    /* 801E7314 */ void setCursorPos(u8);
-    /* 801E73D8 */ void setSelectColor(u8, bool);
-    /* 801E76EC */ u8 getSelectType();
-    /* 801E7718 */ void changeBarColor(bool);
-    /* 801E78B8 */ void setHIO(bool);
-    /* 801E7D18 */ void cursorAnime(f32);
-    /* 801E7D60 */ void setZButtonString(u16);
-    /* 801E7DF4 */ void changeTVCheck();
-    /* 801E7E98 */ void setAButtonString(u16);
-    /* 801E7F9C */ void setBButtonString(u16);
-    /* 801E80A0 */ bool isRumbleSupported();
-    /* 801E80AC */ bool dpdMenuMove();
-    /* 801E80B4 */ void paneResize(u64);
-    /* 801E8210 */ void initialize();
-    /* 801E82C4 */ void yesnoMenuMoveAnmInitSet(int, int);
-    /* 801E8438 */ bool yesnoMenuMoveAnm();
-    /* 801E85D4 */ u8 yesnoSelectMoveAnm();
-    /* 801E8888 */ void yesnoCursorShow();
-    /* 801E89F8 */ void yesNoSelectStart();
-    /* 801E8AC8 */ void yesnoSelectAnmSet();
-    /* 801E8C38 */ void yesnoCancelAnmSet();
-    /* 801E8CB0 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 801E8CFC */ u8 yesnoWakuAlpahAnm(u8);
+    void vib_init();
+    void vib_move();
+    void sound_init();
+    void sound_move();
+    void change_init();
+    void change_move();
+    void confirm_open_init();
+    void confirm_open_move();
+    void confirm_move_init();
+    void confirm_move_move();
+    void confirm_select_init();
+    void confirm_select_move();
+    void confirm_close_init();
+    void confirm_close_move();
+    void tv_open1_move();
+    void tv_open2_move();
+    void tv_move_move();
+    void tv_close1_move();
+    void tv_close2_move();
+    void calibration_open1_move();
+    void calibration_open2_move();
+    void calibration_move_move();
+    void calibration_close1_move();
+    void calibration_close2_move();
+    void menuVisible();
+    void menuShow(int);
+    void menuHide(int);
+    void screenSet();
+    void setSoundMode(u32);
+    void setAttenString();
+    void setRubyString();
+    void setVibString();
+    void setSoundString();
+    void setCursorPos(u8);
+    void setSelectColor(u8, bool);
+    u8 getSelectType();
+    void changeBarColor(bool);
+    void setHIO(bool);
+    void cursorAnime(f32);
+    void setZButtonString(u16);
+    void changeTVCheck();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    bool isRumbleSupported();
+    bool dpdMenuMove();
+    void paneResize(u64);
+    void initialize();
+    void yesnoMenuMoveAnmInitSet(int, int);
+    bool yesnoMenuMoveAnm();
+    u8 yesnoSelectMoveAnm();
+    void yesnoCursorShow();
+    void yesNoSelectStart();
+    void yesnoSelectAnmSet();
+    void yesnoCancelAnmSet();
+    void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
+    u8 yesnoWakuAlpahAnm(u8);
 
-    /* 801E8E6C */ virtual void draw() { _draw(); }
-    /* 801E2014 */ virtual ~dMenu_Option_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Option_c();
 
     u8 getQuitStatus() { return mQuitStatus; }
     u8 isUseFlag(u8 i_flag) { return (mUseFlag & i_flag) != 0; }
diff --git a/include/d/d_menu_ring.h b/include/d/d_menu_ring.h
index 027d16902b..f28c20aac2 100644
--- a/include/d/d_menu_ring.h
+++ b/include/d/d_menu_ring.h
@@ -22,61 +22,61 @@ public:
         /* 3 */ STATUS_EXPLAIN_FORCE,
     };
 
-    /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
-    /* 801EAB7C */ void _create();
-    /* 801EABE8 */ void _delete();
-    /* 801EABEC */ void _move();
-    /* 801EACC8 */ void _draw();
-    /* 801EB080 */ void setKanteraPos(f32, f32);
-    /* 801EB0A4 */ bool isOpen();
-    /* 801EB2B4 */ bool isMoveEnd();
-    /* 801EB3CC */ bool isClose();
-    /* 801EB624 */ u8 getStickInfo(STControl*);
-    /* 801EB8C0 */ s16 calcStickAngle(STControl*, u8);
-    /* 801EB960 */ void setRotate();
-    /* 801EBA38 */ void setItemScale(int, f32);
-    /* 801EBAB8 */ void setButtonScale(int, f32);
-    /* 801EBB10 */ void setItem();
-    /* 801EBE58 */ void setJumpItem(bool);
-    /* 801EC20C */ void setScale();
-    /* 801EC3B0 */ void setNameString(u32);
-    /* 801EC504 */ void setActiveCursor();
-    /* 801EC754 */ void setMixItem();
-    /* 801ECB14 */ void drawItem();
-    /* 801ECF9C */ void drawItem2();
-    /* 801ED2BC */ void stick_wait_init();
-    /* 801ED31C */ void stick_wait_proc();
-    /* 801ED490 */ void stick_move_init();
-    /* 801ED53C */ void stick_move_proc();
-    /* 801ED934 */ void stick_explain_init();
-    /* 801ED938 */ void stick_explain_force_init();
-    /* 801ED93C */ void stick_explain_proc();
-    /* 801EDA0C */ void stick_explain_force_proc();
-    /* 801EDB14 */ void setSelectItem(int, u8);
-    /* 801EDC98 */ void drawSelectItem();
-    /* 801EDF2C */ void setSelectItemForce(int);
-    /* 801EDFDC */ u8 getCursorPos(u8);
-    /* 801EE058 */ u8 getItemNum(u8);
-    /* 801EE15C */ u8 getItemMaxNum(u8);
-    /* 801EE228 */ bool checkExplainForce();
-    /* 801EE63C */ bool checkCombineBomb(int);
-    /* 801EE644 */ void setCombineBomb(int);
-    /* 801EE648 */ void drawNumber(int, int, f32, f32);
-    /* 801EEA84 */ u8 getItem(int, u8);
-    /* 801EEAE4 */ void setDoStatus(u8);
-    /* 801EEB58 */ bool isMixItemOn();
-    /* 801EEC98 */ bool isMixItemOff();
-    /* 801EED84 */ void setMixMessage();
-    /* 801EEF14 */ void textScaleHIO();
-    /* 801EF11C */ void textCentering();
-    /* 801EF13C */ f32 clacEllipseFunction(f32, f32, f32);
-    /* 801EF174 */ f32 calcDistance(f32, f32, f32, f32);
-    /* 801EF1A0 */ void clacEllipsePlotAverage(int, f32, f32);
-    /* 801EF484 */ bool dpdMove();
-    /* 801EF48C */ u8 openExplain(u8);
+    dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
+    void _create();
+    void _delete();
+    void _move();
+    void _draw();
+    void setKanteraPos(f32, f32);
+    bool isOpen();
+    bool isMoveEnd();
+    bool isClose();
+    u8 getStickInfo(STControl*);
+    s16 calcStickAngle(STControl*, u8);
+    void setRotate();
+    void setItemScale(int, f32);
+    void setButtonScale(int, f32);
+    void setItem();
+    void setJumpItem(bool);
+    void setScale();
+    void setNameString(u32);
+    void setActiveCursor();
+    void setMixItem();
+    void drawItem();
+    void drawItem2();
+    void stick_wait_init();
+    void stick_wait_proc();
+    void stick_move_init();
+    void stick_move_proc();
+    void stick_explain_init();
+    void stick_explain_force_init();
+    void stick_explain_proc();
+    void stick_explain_force_proc();
+    void setSelectItem(int, u8);
+    void drawSelectItem();
+    void setSelectItemForce(int);
+    u8 getCursorPos(u8);
+    u8 getItemNum(u8);
+    u8 getItemMaxNum(u8);
+    bool checkExplainForce();
+    bool checkCombineBomb(int);
+    void setCombineBomb(int);
+    void drawNumber(int, int, f32, f32);
+    u8 getItem(int, u8);
+    void setDoStatus(u8);
+    bool isMixItemOn();
+    bool isMixItemOff();
+    void setMixMessage();
+    void textScaleHIO();
+    void textCentering();
+    f32 clacEllipseFunction(f32, f32, f32);
+    f32 calcDistance(f32, f32, f32, f32);
+    void clacEllipsePlotAverage(int, f32, f32);
+    bool dpdMove();
+    u8 openExplain(u8);
 
     virtual void draw() { _draw(); }
-    /* 801EA708 */ virtual ~dMenu_Ring_c();
+    virtual ~dMenu_Ring_c();
 
     void drawFlag0() { mDrawFlag = 0; }
     void setStatus(u8 i_status) { mStatus = i_status; }
diff --git a/include/d/d_menu_save.h b/include/d/d_menu_save.h
index ec9156f827..a6b174bbf4 100644
--- a/include/d/d_menu_save.h
+++ b/include/d/d_menu_save.h
@@ -22,8 +22,8 @@ class dDlst_MenuSaveExplain_c : public dDlst_base_c {
 public:
     dDlst_MenuSaveExplain_c() { mpScrn = NULL; }
 
-    /* 801F6ADC */ virtual void draw();
-    /* 801F6B8C */ virtual ~dDlst_MenuSaveExplain_c() {}
+    virtual void draw();
+    virtual ~dDlst_MenuSaveExplain_c() {}
 
     void setScrnExplain(dMsgScrnExplain_c* p_scrn) { mpScrn = p_scrn; }
 
@@ -38,8 +38,8 @@ public:
         mMsgString = NULL;
     }
 
-    /* 801F6B0C */ virtual void draw();
-    /* 801F6B44 */ virtual ~dDlst_MenuSave_c() {}
+    virtual void draw();
+    virtual ~dDlst_MenuSave_c() {}
 
     /* 0x04 */ J2DScreen* Scr;
     /* 0x08 */ JUTFont* font[2];
@@ -48,8 +48,8 @@ public:
 
 class dMs_HIO_c {
 public:
-    /* 801EF654 */ dMs_HIO_c();
-    /* 801F6BD4 */ virtual ~dMs_HIO_c() {}
+    dMs_HIO_c();
+    virtual ~dMs_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x5 */ u8 mDisplayWaitFrames;
@@ -142,130 +142,130 @@ public:
         /* 0x3C */ PROC_ERR_YES_NO_CURSOR_MOVE_ANM,
     };
 
-    /* 801EF6A0 */ dMenu_save_c();
-    /* 801EF7AC */ void _create();
-    /* 801EF904 */ void screenSet();
-    /* 801F0938 */ void initialize();
-    /* 801F0958 */ void displayInit();
-    /* 801F09AC */ bool _open();
-    /* 801F0B10 */ int _close();
-    /* 801F0B28 */ void _delete();
-    /* 801F1048 */ void _move();
-    /* 801F1100 */ void saveSelAnm();
-    /* 801F1148 */ void selFileWakuAnm();
-    /* 801F11F4 */ void bookIconAnm();
-    /* 801F12F0 */ void memCardWatch();
-    /* 801F1378 */ void saveQuestion();
-    /* 801F1558 */ void saveQuestion2();
-    /* 801F1620 */ void saveQuestion21();
-    /* 801F1644 */ void saveQuestion3();
-    /* 801F16B8 */ void saveQuestion4();
-    /* 801F16F4 */ void saveGuide();
-    /* 801F1720 */ void memCardCheck();
-    /* 801F191C */ void memCardErrMsgWaitKey();
-    /* 801F19A8 */ void backSaveQuestionInitSet();
-    /* 801F19DC */ void backSaveQuestion();
-    /* 801F1A48 */ void backSaveQuestion2();
-    /* 801F1B38 */ void closeSelect();
-    /* 801F1BF8 */ void closeSelect2();
-    /* 801F1C70 */ void iplSelMsgInitSet();
-    /* 801F1C94 */ void iplSelInitSet();
-    /* 801F1CEC */ void IPLSelectDisp1();
-    /* 801F1D54 */ void IPLSelectDisp2();
-    /* 801F1DD4 */ void memCardErrGoIPLSel();
-    /* 801F1E58 */ void IPLSelect2Disp();
-    /* 801F1EE0 */ void memCardErrGoIPLSel2();
-    /* 801F1F80 */ void memCardErrGotoIPL();
-    /* 801F2000 */ void memCardErrMsgWaitFormatSel();
-    /* 801F20AC */ void cardFormatYesSelDisp();
-    /* 801F2134 */ void cardFormatNoSelDisp();
-    /* 801F219C */ void memCardErrMsgWaitFormatSel2();
-    /* 801F2250 */ void cardFormatYesSel2Disp();
-    /* 801F22CC */ void memCardFormat();
-    /* 801F232C */ void memCardFormatWait();
-    /* 801F23A4 */ void gameFileMakeSelInitSet();
-    /* 801F23FC */ void makeGameFileSelDisp();
-    /* 801F247C */ void memCardMakeGameFileSel();
-    /* 801F2514 */ void makeGameFileDisp();
-    /* 801F25AC */ void memCardMakeGameFile();
-    /* 801F260C */ void memCardMakeGameFileWait();
-    /* 801F2698 */ void memCardCommandEnd();
-    /* 801F2708 */ void memCardCommandEnd2();
-    /* 801F27CC */ void memCardDataLoadWait();
-    /* 801F2840 */ void dataWrite();
-    /* 801F28E4 */ void memCardDataSaveWait();
-    /* 801F298C */ void memCardDataSaveWait2();
-    /* 801F2B5C */ void gameContinueDisp();
-    /* 801F2BF8 */ void gameContinue();
-    /* 801F2D78 */ void gameContinue2();
-    /* 801F2DA0 */ void gameContinue3();
-    /* 801F2DD4 */ void saveEnd();
-    /* 801F2E88 */ void endingNoSave();
-    /* 801F2F08 */ void endingNoSave2();
-    /* 801F2F38 */ void endingDataCheck();
-    /* 801F2F4C */ void retryQuestion0();
-    /* 801F2FB4 */ void retryQuestion1();
-    /* 801F3040 */ void retryQuestion2();
-    /* 801F30B8 */ void restartInit();
-    /* 801F31B0 */ void saveWait();
-    /* 801F31B4 */ void messageChange();
-    /* 801F328C */ int YesNoSelect();
-    /* 801F34BC */ void msgTxtSet(u16, bool);
-    /* 801F3588 */ void openSaveSelect();
-    /* 801F36B4 */ void openSaveSelect2();
-    /* 801F37A0 */ void openSaveSelect3();
-    /* 801F3934 */ void saveSelect();
-    /* 801F3A94 */ void saveSelectStart();
-    /* 801F3BE0 */ void selectDataOpenMove();
-    /* 801F3C7C */ void dataSelectAnmSet();
-    /* 801F3E30 */ void saveSelectMoveAnime();
-    /* 801F40D8 */ void saveYesNoSelect();
-    /* 801F4238 */ void yesnoSelectStart();
-    /* 801F42FC */ void saveMoveDisp();
-    /* 801F43F8 */ void saveMoveDisp2();
-    /* 801F4510 */ void yesnoSelectAnmSet(u8);
-    /* 801F46B4 */ void yesNoCursorMoveAnm();
-    /* 801F4724 */ void yesnoCancelAnmSet();
-    /* 801F47DC */ void saveYesNoCancelMove();
-    /* 801F485C */ void headerTxtSet(u16);
-    /* 801F4928 */ bool headerTxtChangeAnm();
-    /* 801F4A10 */ void errDispInitSet(int);
-    /* 801F4B84 */ void msgWindowInitOpen();
-    /* 801F4D10 */ void msgWindowOpen();
-    /* 801F4DAC */ void msgWindowClose();
-    /* 801F4E48 */ bool errYesNoSelect(u8, u8);
-    /* 801F4FB4 */ void errCurMove(u8, u8);
-    /* 801F5054 */ void errYesNoCursorMoveAnm();
-    /* 801F50C4 */ void errorTxtSet(u16);
-    /* 801F5190 */ bool errorTxtChangeAnm();
-    /* 801F5278 */ void saveSelectOpenInit();
-    /* 801F533C */ void selectDataBaseMoveAnmInitSet(int, int);
-    /* 801F53D4 */ bool selectDataBaseMoveAnm();
-    /* 801F54C0 */ void saveSelectOpenAnmSet();
-    /* 801F5508 */ void selectDataMoveAnmInitSet(int, int);
-    /* 801F5600 */ bool selectDataMoveAnm();
-    /* 801F5744 */ void yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2);
-    /* 801F58C8 */ bool yesnoMenuMoveAnm();
-    /* 801F5AE4 */ bool yesnoSelectMoveAnm(u8);
-    /* 801F5D84 */ void yesnoCursorShow();
-    /* 801F5EF4 */ void errorMoveAnmInitSet(int, int);
-    /* 801F5F84 */ bool errorMoveAnm();
-    /* 801F60A4 */ void modoruTxtDispAnmInit(u8);
-    /* 801F6120 */ bool modoruTxtDispAnm();
-    /* 801F61FC */ void ketteiTxtDispAnmInit(u8);
-    /* 801F6278 */ bool ketteiTxtDispAnm();
-    /* 801F6354 */ void selectWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 801F6390 */ bool selectWakuAlpahAnm(u8);
-    /* 801F6458 */ void selFileCursorShow();
-    /* 801F6608 */ void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
-    /* 801F6654 */ bool yesnoWakuAlpahAnm(u8);
-    /* 801F67B8 */ void dataSave();
-    /* 801F67F0 */ void setSaveData();
-    /* 801F6954 */ void setInitSaveData();
-    /* 801F69B8 */ void _draw();
-    /* 801F69FC */ void _draw2();
+    dMenu_save_c();
+    void _create();
+    void screenSet();
+    void initialize();
+    void displayInit();
+    bool _open();
+    int _close();
+    void _delete();
+    void _move();
+    void saveSelAnm();
+    void selFileWakuAnm();
+    void bookIconAnm();
+    void memCardWatch();
+    void saveQuestion();
+    void saveQuestion2();
+    void saveQuestion21();
+    void saveQuestion3();
+    void saveQuestion4();
+    void saveGuide();
+    void memCardCheck();
+    void memCardErrMsgWaitKey();
+    void backSaveQuestionInitSet();
+    void backSaveQuestion();
+    void backSaveQuestion2();
+    void closeSelect();
+    void closeSelect2();
+    void iplSelMsgInitSet();
+    void iplSelInitSet();
+    void IPLSelectDisp1();
+    void IPLSelectDisp2();
+    void memCardErrGoIPLSel();
+    void IPLSelect2Disp();
+    void memCardErrGoIPLSel2();
+    void memCardErrGotoIPL();
+    void memCardErrMsgWaitFormatSel();
+    void cardFormatYesSelDisp();
+    void cardFormatNoSelDisp();
+    void memCardErrMsgWaitFormatSel2();
+    void cardFormatYesSel2Disp();
+    void memCardFormat();
+    void memCardFormatWait();
+    void gameFileMakeSelInitSet();
+    void makeGameFileSelDisp();
+    void memCardMakeGameFileSel();
+    void makeGameFileDisp();
+    void memCardMakeGameFile();
+    void memCardMakeGameFileWait();
+    void memCardCommandEnd();
+    void memCardCommandEnd2();
+    void memCardDataLoadWait();
+    void dataWrite();
+    void memCardDataSaveWait();
+    void memCardDataSaveWait2();
+    void gameContinueDisp();
+    void gameContinue();
+    void gameContinue2();
+    void gameContinue3();
+    void saveEnd();
+    void endingNoSave();
+    void endingNoSave2();
+    void endingDataCheck();
+    void retryQuestion0();
+    void retryQuestion1();
+    void retryQuestion2();
+    void restartInit();
+    void saveWait();
+    void messageChange();
+    int YesNoSelect();
+    void msgTxtSet(u16, bool);
+    void openSaveSelect();
+    void openSaveSelect2();
+    void openSaveSelect3();
+    void saveSelect();
+    void saveSelectStart();
+    void selectDataOpenMove();
+    void dataSelectAnmSet();
+    void saveSelectMoveAnime();
+    void saveYesNoSelect();
+    void yesnoSelectStart();
+    void saveMoveDisp();
+    void saveMoveDisp2();
+    void yesnoSelectAnmSet(u8);
+    void yesNoCursorMoveAnm();
+    void yesnoCancelAnmSet();
+    void saveYesNoCancelMove();
+    void headerTxtSet(u16);
+    bool headerTxtChangeAnm();
+    void errDispInitSet(int);
+    void msgWindowInitOpen();
+    void msgWindowOpen();
+    void msgWindowClose();
+    bool errYesNoSelect(u8, u8);
+    void errCurMove(u8, u8);
+    void errYesNoCursorMoveAnm();
+    void errorTxtSet(u16);
+    bool errorTxtChangeAnm();
+    void saveSelectOpenInit();
+    void selectDataBaseMoveAnmInitSet(int, int);
+    bool selectDataBaseMoveAnm();
+    void saveSelectOpenAnmSet();
+    void selectDataMoveAnmInitSet(int, int);
+    bool selectDataMoveAnm();
+    void yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2);
+    bool yesnoMenuMoveAnm();
+    bool yesnoSelectMoveAnm(u8);
+    void yesnoCursorShow();
+    void errorMoveAnmInitSet(int, int);
+    bool errorMoveAnm();
+    void modoruTxtDispAnmInit(u8);
+    bool modoruTxtDispAnm();
+    void ketteiTxtDispAnmInit(u8);
+    bool ketteiTxtDispAnm();
+    void selectWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool selectWakuAlpahAnm(u8);
+    void selFileCursorShow();
+    void yesnoWakuAlpahAnmInit(u8, u8, u8, u8);
+    bool yesnoWakuAlpahAnm(u8);
+    void dataSave();
+    void setSaveData();
+    void setInitSaveData();
+    void _draw();
+    void _draw2();
 
-    /* 802844D0 */ virtual ~dMenu_save_c() {}
+    virtual ~dMenu_save_c() {}
 
     u8 getSaveStatus() { return mSaveStatus; }
     u8 getEndStatus() { return mEndStatus; }
diff --git a/include/d/d_menu_skill.h b/include/d/d_menu_skill.h
index 4b3d7760bb..9ea305163e 100644
--- a/include/d/d_menu_skill.h
+++ b/include/d/d_menu_skill.h
@@ -20,37 +20,37 @@ public:
         /* 3 */ PROC_MOVE_MOVE,
     };
 
-    /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
-    /* 801F763C */ void _create();
-    /* 801F7718 */ void _move();
-    /* 801F77B0 */ void _draw();
-    /* 801F7950 */ bool isSync();
-    /* 801F7978 */ void skill_init_calc();
-    /* 801F79EC */ void init();
-    /* 801F7A40 */ int _open();
-    /* 801F7C1C */ int _close();
-    /* 801F7D58 */ void wait_init();
-    /* 801F7D94 */ void wait_move();
-    /* 801F7F24 */ void read_open_init();
-    /* 801F7FF8 */ void read_open_move();
-    /* 801F8114 */ void read_move_init();
-    /* 801F8150 */ void read_move_move();
-    /* 801F8218 */ void read_close_init();
-    /* 801F826C */ void read_close_move();
-    /* 801F8388 */ void screenSetMenu();
-    /* 801F8A18 */ void screenSetLetter();
-    /* 801F8D20 */ void screenSetDoIcon();
-    /* 801F8E9C */ void setCursorPos();
-    /* 801F8F28 */ void changeActiveColor();
-    /* 801F9144 */ void setPageText();
-    /* 801F9260 */ void setAButtonString(u16);
-    /* 801F9310 */ void setBButtonString(u16);
-    /* 801F93C0 */ void setNameString(u16);
-    /* 801F9470 */ u8 getSkillNum();
-    /* 801F9500 */ void setHIO(bool);
+    dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
+    void _create();
+    void _move();
+    void _draw();
+    bool isSync();
+    void skill_init_calc();
+    void init();
+    int _open();
+    int _close();
+    void wait_init();
+    void wait_move();
+    void read_open_init();
+    void read_open_move();
+    void read_move_init();
+    void read_move_move();
+    void read_close_init();
+    void read_close_move();
+    void screenSetMenu();
+    void screenSetLetter();
+    void screenSetDoIcon();
+    void setCursorPos();
+    void changeActiveColor();
+    void setPageText();
+    void setAButtonString(u16);
+    void setBButtonString(u16);
+    void setNameString(u16);
+    u8 getSkillNum();
+    void setHIO(bool);
 
-    /* 801F9A08 */ virtual void draw() { _draw(); }
-    /* 801F7348 */ virtual ~dMenu_Skill_c();
+    virtual void draw() { _draw(); }
+    virtual ~dMenu_Skill_c();
 
     u8 getStatus() { return mStatus; }
 
diff --git a/include/d/d_menu_window.h b/include/d/d_menu_window.h
index bf18a47eda..35c6789127 100644
--- a/include/d/d_menu_window.h
+++ b/include/d/d_menu_window.h
@@ -77,113 +77,113 @@ public:
         /* 0x22 */ INSECT_AGITHA_CLOSE,
     };
 
-    /* 801FA13C */ void key_wait_init(u8);
-    /* 801FA220 */ void ring_open_init(u8);
-    /* 801FA23C */ void ring_move_init(u8);
-    /* 801FA240 */ void ring_close_init(u8);
-    /* 801FA244 */ void collect_open_init(u8);
-    /* 801FA2D0 */ void collect_move_init(u8);
-    /* 801FA46C */ void collect_close_init(u8);
-    /* 801FA538 */ void fmap_open_init(u8);
-    /* 801FA55C */ void fmap_move_init(u8);
-    /* 801FA560 */ void fmap_close_init(u8);
-    /* 801FA564 */ void dmap_open_init(u8);
-    /* 801FA588 */ void dmap_move_init(u8);
-    /* 801FA58C */ void dmap_close_init(u8);
-    /* 801FA590 */ void collect_save_open_init(u8);
-    /* 801FA5E4 */ void collect_save_move_init(u8);
-    /* 801FA5E8 */ void collect_save_close_init(u8);
-    /* 801FA608 */ void collect_option_open_init(u8);
-    /* 801FA65C */ void collect_option_move_init(u8);
-    /* 801FA660 */ void collect_option_close_init(u8);
-    /* 801FA680 */ void collect_letter_open_init(u8);
-    /* 801FA6DC */ void collect_letter_move_init(u8);
-    /* 801FA6E0 */ void collect_letter_close_init(u8);
-    /* 801FA738 */ void collect_fishing_open_init(u8);
-    /* 801FA794 */ void collect_fishing_move_init(u8);
-    /* 801FA798 */ void collect_fishing_close_init(u8);
-    /* 801FA7F0 */ void collect_skill_open_init(u8);
-    /* 801FA84C */ void collect_skill_move_init(u8);
-    /* 801FA850 */ void collect_skill_close_init(u8);
-    /* 801FA8A8 */ void collect_insect_open_init(u8);
-    /* 801FA908 */ void collect_insect_move_init(u8);
-    /* 801FA90C */ void collect_insect_close_init(u8);
-    /* 801FA964 */ void insect_open_init(u8);
-    /* 801FA9E8 */ void insect_open2_init(u8);
-    /* 801FA9EC */ void insect_move_init(u8);
-    /* 801FA9F0 */ void insect_close_init(u8);
-    /* 801FAA48 */ void key_wait_proc();
-    /* 801FAFDC */ void ring_open_proc();
-    /* 801FB01C */ void ring_move_proc();
-    /* 801FB064 */ void ring_close_proc();
-    /* 801FB0B8 */ void collect_open_proc();
-    /* 801FB110 */ void collect_move_proc();
-    /* 801FB1A0 */ void collect_close_proc();
-    /* 801FB240 */ void fmap_open_proc();
-    /* 801FB298 */ void fmap_move_proc();
-    /* 801FB36C */ void fmap_close_proc();
-    /* 801FB3AC */ void dmap_open_proc();
-    /* 801FB404 */ void dmap_move_proc();
-    /* 801FB5DC */ void dmap_close_proc();
-    /* 801FB61C */ void collect_save_open_proc();
-    /* 801FB67C */ void collect_save_move_proc();
-    /* 801FB6D8 */ void collect_save_close_proc();
-    /* 801FB73C */ void collect_option_open_proc();
-    /* 801FB7AC */ void collect_option_move_proc();
-    /* 801FB800 */ void collect_option_close_proc();
-    /* 801FB81C */ void collect_letter_open_proc();
-    /* 801FB8AC */ void collect_letter_move_proc();
-    /* 801FB900 */ void collect_letter_close_proc();
-    /* 801FB91C */ void collect_fishing_open_proc();
-    /* 801FB9AC */ void collect_fishing_move_proc();
-    /* 801FBA00 */ void collect_fishing_close_proc();
-    /* 801FBA1C */ void collect_skill_open_proc();
-    /* 801FBAAC */ void collect_skill_move_proc();
-    /* 801FBB00 */ void collect_skill_close_proc();
-    /* 801FBB1C */ void collect_insect_open_proc();
-    /* 801FBBAC */ void collect_insect_move_proc();
-    /* 801FBC00 */ void collect_insect_close_proc();
-    /* 801FBC1C */ void insect_open_proc();
-    /* 801FBC78 */ void insect_open2_proc();
-    /* 801FBD08 */ void insect_move_proc();
-    /* 801FBD64 */ void insect_close_proc();
-    /* 801FBD80 */ void dMw_capture_create();
-    /* 801FBE14 */ void dMw_capture_delete();
-    /* 801FBE94 */ void dMw_ring_create(u8);
-    /* 801FBF60 */ bool dMw_ring_delete();
-    /* 801FBFF8 */ void dMw_collect_create();
-    /* 801FC090 */ bool dMw_collect_delete(bool);
-    /* 801FC0FC */ void dMw_fmap_create();
-    /* 801FC264 */ bool dMw_fmap_delete(bool);
-    /* 801FC350 */ void dMw_dmap_create();
-    /* 801FC46C */ bool dMw_dmap_delete(bool);
-    /* 801FC520 */ void dMw_save_create();
-    /* 801FC5D0 */ bool dMw_save_delete();
-    /* 801FC668 */ void dMw_option_create();
-    /* 801FC70C */ bool dMw_option_delete();
-    /* 801FC7BC */ void dMw_letter_create();
-    /* 801FC85C */ bool dMw_letter_delete();
-    /* 801FC904 */ void dMw_fishing_create();
-    /* 801FC9A4 */ bool dMw_fishing_delete();
-    /* 801FCA4C */ void dMw_skill_create();
-    /* 801FCAEC */ bool dMw_skill_delete();
-    /* 801FCB94 */ void dMw_insect_create(u8);
-    /* 801FCC44 */ bool dMw_insect_delete();
-    /* 801FCCEC */ void dMw_onButtonBit(u8);
-    /* 801FCCFC */ void dMw_offButtonBit(u8);
-    /* 801FCD0C */ BOOL dMw_isButtonBit(u8);
-    /* 801FCD24 */ BOOL dMw_isPush_S_Button();
-    /* 801FCDD8 */ bool isPauseReady();
-    /* 801FCE08 */ static void dMw_fade_out();
-    /* 801FCE78 */ static void dMw_fade_in();
-    /* 801FCEE8 */ int checkCStickTrigger();
-    /* 801FCF84 */ bool isEventCheck();
-    /* 801FD094 */ void markMemSize();
-    /* 801FD0D4 */ void checkMemSize();
-    /* 801FD140 */ int _create();
-    /* 801FD2D8 */ int _execute();
-    /* 801FD450 */ int _draw();
-    /* 801FD67C */ int _delete();
+    void key_wait_init(u8);
+    void ring_open_init(u8);
+    void ring_move_init(u8);
+    void ring_close_init(u8);
+    void collect_open_init(u8);
+    void collect_move_init(u8);
+    void collect_close_init(u8);
+    void fmap_open_init(u8);
+    void fmap_move_init(u8);
+    void fmap_close_init(u8);
+    void dmap_open_init(u8);
+    void dmap_move_init(u8);
+    void dmap_close_init(u8);
+    void collect_save_open_init(u8);
+    void collect_save_move_init(u8);
+    void collect_save_close_init(u8);
+    void collect_option_open_init(u8);
+    void collect_option_move_init(u8);
+    void collect_option_close_init(u8);
+    void collect_letter_open_init(u8);
+    void collect_letter_move_init(u8);
+    void collect_letter_close_init(u8);
+    void collect_fishing_open_init(u8);
+    void collect_fishing_move_init(u8);
+    void collect_fishing_close_init(u8);
+    void collect_skill_open_init(u8);
+    void collect_skill_move_init(u8);
+    void collect_skill_close_init(u8);
+    void collect_insect_open_init(u8);
+    void collect_insect_move_init(u8);
+    void collect_insect_close_init(u8);
+    void insect_open_init(u8);
+    void insect_open2_init(u8);
+    void insect_move_init(u8);
+    void insect_close_init(u8);
+    void key_wait_proc();
+    void ring_open_proc();
+    void ring_move_proc();
+    void ring_close_proc();
+    void collect_open_proc();
+    void collect_move_proc();
+    void collect_close_proc();
+    void fmap_open_proc();
+    void fmap_move_proc();
+    void fmap_close_proc();
+    void dmap_open_proc();
+    void dmap_move_proc();
+    void dmap_close_proc();
+    void collect_save_open_proc();
+    void collect_save_move_proc();
+    void collect_save_close_proc();
+    void collect_option_open_proc();
+    void collect_option_move_proc();
+    void collect_option_close_proc();
+    void collect_letter_open_proc();
+    void collect_letter_move_proc();
+    void collect_letter_close_proc();
+    void collect_fishing_open_proc();
+    void collect_fishing_move_proc();
+    void collect_fishing_close_proc();
+    void collect_skill_open_proc();
+    void collect_skill_move_proc();
+    void collect_skill_close_proc();
+    void collect_insect_open_proc();
+    void collect_insect_move_proc();
+    void collect_insect_close_proc();
+    void insect_open_proc();
+    void insect_open2_proc();
+    void insect_move_proc();
+    void insect_close_proc();
+    void dMw_capture_create();
+    void dMw_capture_delete();
+    void dMw_ring_create(u8);
+    bool dMw_ring_delete();
+    void dMw_collect_create();
+    bool dMw_collect_delete(bool);
+    void dMw_fmap_create();
+    bool dMw_fmap_delete(bool);
+    void dMw_dmap_create();
+    bool dMw_dmap_delete(bool);
+    void dMw_save_create();
+    bool dMw_save_delete();
+    void dMw_option_create();
+    bool dMw_option_delete();
+    void dMw_letter_create();
+    bool dMw_letter_delete();
+    void dMw_fishing_create();
+    bool dMw_fishing_delete();
+    void dMw_skill_create();
+    bool dMw_skill_delete();
+    void dMw_insect_create(u8);
+    bool dMw_insect_delete();
+    void dMw_onButtonBit(u8);
+    void dMw_offButtonBit(u8);
+    BOOL dMw_isButtonBit(u8);
+    BOOL dMw_isPush_S_Button();
+    bool isPauseReady();
+    static void dMw_fade_out();
+    static void dMw_fade_in();
+    int checkCStickTrigger();
+    bool isEventCheck();
+    void markMemSize();
+    void checkMemSize();
+    int _create();
+    int _execute();
+    int _draw();
+    int _delete();
 
     void onPauseWindow() { mPauseWindow = true; }
     void offPauseWindow() { mPauseWindow = false; }
diff --git a/include/d/d_menu_window_HIO.h b/include/d/d_menu_window_HIO.h
index b26cd8ce7c..2a6a04f730 100644
--- a/include/d/d_menu_window_HIO.h
+++ b/include/d/d_menu_window_HIO.h
@@ -5,9 +5,9 @@
 
 class dMw_DHIO_c {
 public:
-    /* 801F9E2C */ dMw_DHIO_c();
+    dMw_DHIO_c();
 
-    /* 801F9E98 */ virtual ~dMw_DHIO_c() {}
+    virtual ~dMw_DHIO_c() {}
 
     /* 0x004 */ s8 field_0x4;
     /* 0x005 */ bool mMap[32];
@@ -32,18 +32,18 @@ extern dMw_DHIO_c g_mwDHIO;
 
 class dMw_HIO_c {
 public:
-    /* 801F9AFC */ dMw_HIO_c();
-    /* 801F9B38 */ void init();
-    /* 801F9E14 */ bool getBombFlag();
-    /* 801F9E1C */ bool getArrowFlag();
-    /* 801F9E24 */ bool getPachinkoFlag();
+    dMw_HIO_c();
+    void init();
+    bool getBombFlag();
+    bool getArrowFlag();
+    bool getPachinkoFlag();
     void update();
 
     void setArrowFlag(u8 i_flag) { mArrowFlag = i_flag; }
     void setPachinkoFlag(u8 i_flag) { mPachinkoFlag = i_flag; }
     void setBombFlag(u8 i_flag) { mBombFlag = i_flag; }
 
-    /* 801F9EE0 */ virtual ~dMw_HIO_c() {}
+    virtual ~dMw_HIO_c() {}
 
     /* 0x004 */ s8 field_0x4;
     /* 0x006 */ u16 mLife;
diff --git a/include/d/d_meter2.h b/include/d/d_meter2.h
index 9c2942abe3..c8dc17bca8 100644
--- a/include/d/d_meter2.h
+++ b/include/d/d_meter2.h
@@ -19,12 +19,12 @@ class dMeterHaihai_c;
 
 class dMeterSub_c : public dDlst_base_c {
 public:
-    /* 8019412C */ virtual void draw() {}
-    /* 801940D4 */ virtual ~dMeterSub_c() {}
-    /* 8019411C */ virtual int _create() { return 0; }
-    /* 80194130 */ virtual int _execute(u32) { return 0; }
-    /* 80194124 */ virtual int _delete() { return 0; }
-    /* 80194138 */ virtual bool isDead() { return false; }
+    virtual void draw() {}
+    virtual ~dMeterSub_c() {}
+    virtual int _create() { return 0; }
+    virtual int _execute(u32) { return 0; }
+    virtual int _delete() { return 0; }
+    virtual bool isDead() { return false; }
 };
 
 class dMeter2_c : public msg_class {
@@ -41,50 +41,50 @@ public:
         /* 0x3 */ Y_STATUS,
     };
 
-    /* 8021EA14 */ int _create();
-    /* 8021F128 */ int _execute();
-    /* 8021F370 */ int _draw();
-    /* 8021F49C */ int _delete();
-    /* 8021F6EC */ int emphasisButtonDelete();
-    /* 8021F780 */ void setLifeZero();
-    /* 8021F7B0 */ void checkStatus();
-    /* 8021FD60 */ void moveLife();
-    /* 80220180 */ void moveKantera();
-    /* 8022051C */ void moveOxygen();
-    /* 80220888 */ void moveLightDrop();
-    /* 80220C30 */ void moveRupee();
-    /* 802210AC */ void moveKey();
-    /* 80221244 */ void moveButtonA();
-    /* 802217F4 */ void moveButtonB();
-    /* 80221EC8 */ void moveButtonR();
-    /* 80222000 */ void moveButtonZ();
-    /* 802222A0 */ void moveButton3D();
-    /* 80222364 */ void moveButtonC();
-    /* 80222494 */ void moveButtonS();
-    /* 80222518 */ void moveButtonXY();
-    /* 80222E88 */ void moveButtonCross();
-    /* 802230F8 */ void moveTouchSubMenu();
-    /* 802230FC */ void moveSubContents();
-    /* 802231C8 */ void move2DContents();
-    /* 802237D4 */ void checkSubContents();
-    /* 80223BC4 */ void check2DContents();
-    /* 80223E00 */ void moveBombNum();
-    /* 80224258 */ void moveBottleNum();
-    /* 80224354 */ void moveArrowNum();
-    /* 80224680 */ void movePachinkoNum();
-    /* 802248E4 */ void alphaAnimeLife();
-    /* 80224A04 */ void alphaAnimeKantera();
-    /* 80224BAC */ void alphaAnimeOxygen();
-    /* 80224D6C */ void alphaAnimeLightDrop();
-    /* 80224DC0 */ void alphaAnimeRupee();
-    /* 80224F70 */ void alphaAnimeKey();
-    /* 802250F4 */ void alphaAnimeButton();
-    /* 802254C0 */ void alphaAnimeButtonCross();
-    /* 802256DC */ bool isShowLightDrop();
-    /* 802258A0 */ void killSubContents(u8);
-    /* 80225960 */ u8 isKeyVisible();
-    /* 802259F8 */ int isArrowEquip();
-    /* 80225A64 */ int isPachinkoEquip();
+    int _create();
+    int _execute();
+    int _draw();
+    int _delete();
+    int emphasisButtonDelete();
+    void setLifeZero();
+    void checkStatus();
+    void moveLife();
+    void moveKantera();
+    void moveOxygen();
+    void moveLightDrop();
+    void moveRupee();
+    void moveKey();
+    void moveButtonA();
+    void moveButtonB();
+    void moveButtonR();
+    void moveButtonZ();
+    void moveButton3D();
+    void moveButtonC();
+    void moveButtonS();
+    void moveButtonXY();
+    void moveButtonCross();
+    void moveTouchSubMenu();
+    void moveSubContents();
+    void move2DContents();
+    void checkSubContents();
+    void check2DContents();
+    void moveBombNum();
+    void moveBottleNum();
+    void moveArrowNum();
+    void movePachinkoNum();
+    void alphaAnimeLife();
+    void alphaAnimeKantera();
+    void alphaAnimeOxygen();
+    void alphaAnimeLightDrop();
+    void alphaAnimeRupee();
+    void alphaAnimeKey();
+    void alphaAnimeButton();
+    void alphaAnimeButtonCross();
+    bool isShowLightDrop();
+    void killSubContents(u8);
+    u8 isKeyVisible();
+    int isArrowEquip();
+    int isPachinkoEquip();
 
     void setNowLifeGauge(s16 life) { mNowLifeGauge = life; }
     void onArrowSoundBit(int bit) { mArrowSound |= (1 << bit); }
diff --git a/include/d/d_meter2_draw.h b/include/d/d_meter2_draw.h
index cd66fe9e5f..d91e37df43 100644
--- a/include/d/d_meter2_draw.h
+++ b/include/d/d_meter2_draw.h
@@ -169,106 +169,106 @@ public:
         /* 0x18 */ f32 num_scale;
     };
 
-    /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
-    /* 80210FB0 */ void init();
-    /* 8021135C */ void exec(u32);
-    /* 8021151C */ void draw();
-    /* 80211BEC */ void initLife();
-    /* 80211E64 */ void initMagic();
-    /* 80212190 */ void initLightDrop();
-    /* 80212404 */ void initRupeeKey();
-    /* 802126E4 */ void initButton();
-    /* 8021350C */ void initButtonCross();
-    /* 80213CEC */ void playPikariBckAnimation(f32);
-    /* 80213D6C */ void setPikariBpkAnimation(J2DAnmColor*);
-    /* 80213E3C */ void playPikariBpkAnimation(f32);
-    /* 80213E94 */ void playOxygenBpkAnimation(J2DAnmColor*);
-    /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
+    dMeter2Draw_c(JKRExpHeap*);
+    void init();
+    void exec(u32);
+    void draw();
+    void initLife();
+    void initMagic();
+    void initLightDrop();
+    void initRupeeKey();
+    void initButton();
+    void initButtonCross();
+    void playPikariBckAnimation(f32);
+    void setPikariBpkAnimation(J2DAnmColor*);
+    void playPikariBpkAnimation(f32);
+    void playOxygenBpkAnimation(J2DAnmColor*);
+    void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor,
                                    JUtility::TColor, JUtility::TColor, f32, u8);
-    /* 80213FF0 */ void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor,
+    void drawPikari(CPaneMgr*, f32*, f32, JUtility::TColor, JUtility::TColor,
                                    JUtility::TColor, JUtility::TColor, f32, u8);
-    /* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
+    void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor,
                                           JUtility::TColor, JUtility::TColor);
-    /* 802147CC */ void changeTextureLife(int, bool, u8);
-    /* 802149F4 */ void drawLife(s16, s16, f32, f32);
-    /* 80214C20 */ void setAlphaLifeChange(bool);
-    /* 80214DF4 */ void setAlphaLifeAnimeMin();
-    /* 80214E54 */ void setAlphaLifeAnimeMax();
-    /* 80214EB4 */ void drawKanteraScreen(u8);
-    /* 80215290 */ void drawMagic(s16, s16, f32, f32);
-    /* 80215380 */ void setAlphaMagicChange(bool);
-    /* 802154A8 */ void drawKantera(s32, s32, f32, f32);
-    /* 802155B8 */ void setAlphaKanteraChange(bool);
-    /* 802156E0 */ void setAlphaKanteraAnimeMin();
-    /* 8021575C */ void setAlphaKanteraAnimeMax();
-    /* 802157E0 */ void drawOxygen(s32, s32, f32, f32);
-    /* 802158F0 */ void setAlphaOxygenChange(bool);
-    /* 80215A18 */ void setAlphaOxygenAnimeMin();
-    /* 80215A94 */ void setAlphaOxygenAnimeMax();
-    /* 80215B18 */ void drawLightDrop(u8, u8, f32, f32, f32, f32, u8);
-    /* 80215DA4 */ void setAlphaLightDropChange(bool);
-    /* 80215DA8 */ f32 getNowLightDropRateCalc();
-    /* 80215E40 */ void setAlphaLightDropAnimeMin();
-    /* 80215F88 */ void setAlphaLightDropAnimeMax();
-    /* 8021632C */ void drawRupee(s16);
-    /* 80216684 */ void setAlphaRupeeChange(bool);
-    /* 802168D0 */ void setAlphaRupeeAnimeMin();
-    /* 80216990 */ void setAlphaRupeeAnimeMax();
-    /* 80216A40 */ void drawKey(s16);
-    /* 80216B28 */ void setAlphaKeyChange(bool);
-    /* 80216CA8 */ void setAlphaKeyAnimeMin();
-    /* 80216D2C */ void setAlphaKeyAnimeMax();
-    /* 80216DAC */ void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool);
-    /* 802170E4 */ void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool);
-    /* 8021764C */ void drawButtonR(u8, u8, bool, bool);
-    /* 802176EC */ void drawButtonZ(u8);
-    /* 80217904 */ void drawButton3D(u8);
-    /* 80217954 */ void drawButtonC(u8, bool);
-    /* 802179C0 */ void drawButtonS(u8);
-    /* 80217A10 */ void drawButtonBin(u8);
-    /* 80217AB4 */ void drawButtonXY(int, u8, u8, bool, bool);
-    /* 80218238 */ f32 getButtonCrossParentInitTransY();
-    /* 80218254 */ void drawButtonCross(f32, f32);
-    /* 80218338 */ void setAlphaButtonCrossAnimeMin();
-    /* 802183A8 */ void setAlphaButtonCrossAnimeMax();
-    /* 80218448 */ void setAlphaButtonCrossItemAnimeMin();
-    /* 80218524 */ void setAlphaButtonCrossItemAnimeMax();
-    /* 802185E8 */ void setAlphaButtonCrossMapAnimeMin();
-    /* 802186C4 */ void setAlphaButtonCrossMapAnimeMax();
-    /* 80218788 */ void setAlphaButtonChange(bool);
-    /* 8021901C */ void setAlphaButtonAnimeMin();
-    /* 802190A8 */ void setAlphaButtonAnimeMax();
-    /* 80219174 */ void setAlphaButtonAAnimeMin();
-    /* 80219258 */ void setAlphaButtonAAnimeMax();
-    /* 80219324 */ void setAlphaButtonBAnimeMin();
-    /* 80219474 */ void setAlphaButtonBAnimeMax();
-    /* 802195A4 */ void setButtonIconAAlpha(u8, u32, bool);
-    /* 80219788 */ void setButtonIconBAlpha(u8, u32, bool);
-    /* 80219A84 */ void setButtonIconMidonaAlpha(u32);
-    /* 80219E98 */ void setButtonIconAlpha(int, u8, u32, bool);
-    /* 8021A29C */ ResTIMG* getNumberTexture(int);
-    /* 8021A2F4 */ char* getActionString(u8, u8, u8*);
-    /* 8021A468 */ void changeTextureItemB(u8);
-    /* 8021A71C */ void changeTextureItemXY(int, u8);
-    /* 8021A9C8 */ void setAlphaAnimeMin(CPaneMgrAlpha*, s16);
-    /* 8021AAA4 */ void setAlphaAnimeMax(CPaneMgrAlpha*, s16);
-    /* 8021AB84 */ void setItemNum(u8, u8, u8);
-    /* 8021AEC8 */ void drawItemNum(u8, f32);
-    /* 8021AF78 */ void drawKanteraMeter(u8, f32);
-    /* 8021B0C8 */ u8 isButtonVisible();
-    /* 8021B104 */ void setItemParamX(u8);
-    /* 8021B364 */ void setItemParamY(u8);
-    /* 8021B5B0 */ void setItemParamZ(u8);
-    /* 8021B810 */ void setItemParamB(u8);
-    /* 8021BB6C */ bool getFishingType();
-    /* 8021BBB4 */ bool getCanoeFishing();
-    /* 8021BC24 */ bool getCameraSubject();
-    /* 8021BC54 */ bool getItemSubject();
-    /* 8021BCAC */ bool getPlayerSubject();
-    /* 8021BCC0 */ bool isBButtonShow(bool);
-    /* 8021BDD0 */ s16 getButtonTimer();
+    void changeTextureLife(int, bool, u8);
+    void drawLife(s16, s16, f32, f32);
+    void setAlphaLifeChange(bool);
+    void setAlphaLifeAnimeMin();
+    void setAlphaLifeAnimeMax();
+    void drawKanteraScreen(u8);
+    void drawMagic(s16, s16, f32, f32);
+    void setAlphaMagicChange(bool);
+    void drawKantera(s32, s32, f32, f32);
+    void setAlphaKanteraChange(bool);
+    void setAlphaKanteraAnimeMin();
+    void setAlphaKanteraAnimeMax();
+    void drawOxygen(s32, s32, f32, f32);
+    void setAlphaOxygenChange(bool);
+    void setAlphaOxygenAnimeMin();
+    void setAlphaOxygenAnimeMax();
+    void drawLightDrop(u8, u8, f32, f32, f32, f32, u8);
+    void setAlphaLightDropChange(bool);
+    f32 getNowLightDropRateCalc();
+    void setAlphaLightDropAnimeMin();
+    void setAlphaLightDropAnimeMax();
+    void drawRupee(s16);
+    void setAlphaRupeeChange(bool);
+    void setAlphaRupeeAnimeMin();
+    void setAlphaRupeeAnimeMax();
+    void drawKey(s16);
+    void setAlphaKeyChange(bool);
+    void setAlphaKeyAnimeMin();
+    void setAlphaKeyAnimeMax();
+    void drawButtonA(u8, f32, f32, f32, f32, f32, bool, bool);
+    void drawButtonB(u8, bool, f32, f32, f32, f32, f32, bool);
+    void drawButtonR(u8, u8, bool, bool);
+    void drawButtonZ(u8);
+    void drawButton3D(u8);
+    void drawButtonC(u8, bool);
+    void drawButtonS(u8);
+    void drawButtonBin(u8);
+    void drawButtonXY(int, u8, u8, bool, bool);
+    f32 getButtonCrossParentInitTransY();
+    void drawButtonCross(f32, f32);
+    void setAlphaButtonCrossAnimeMin();
+    void setAlphaButtonCrossAnimeMax();
+    void setAlphaButtonCrossItemAnimeMin();
+    void setAlphaButtonCrossItemAnimeMax();
+    void setAlphaButtonCrossMapAnimeMin();
+    void setAlphaButtonCrossMapAnimeMax();
+    void setAlphaButtonChange(bool);
+    void setAlphaButtonAnimeMin();
+    void setAlphaButtonAnimeMax();
+    void setAlphaButtonAAnimeMin();
+    void setAlphaButtonAAnimeMax();
+    void setAlphaButtonBAnimeMin();
+    void setAlphaButtonBAnimeMax();
+    void setButtonIconAAlpha(u8, u32, bool);
+    void setButtonIconBAlpha(u8, u32, bool);
+    void setButtonIconMidonaAlpha(u32);
+    void setButtonIconAlpha(int, u8, u32, bool);
+    ResTIMG* getNumberTexture(int);
+    char* getActionString(u8, u8, u8*);
+    void changeTextureItemB(u8);
+    void changeTextureItemXY(int, u8);
+    void setAlphaAnimeMin(CPaneMgrAlpha*, s16);
+    void setAlphaAnimeMax(CPaneMgrAlpha*, s16);
+    void setItemNum(u8, u8, u8);
+    void drawItemNum(u8, f32);
+    void drawKanteraMeter(u8, f32);
+    u8 isButtonVisible();
+    void setItemParamX(u8);
+    void setItemParamY(u8);
+    void setItemParamZ(u8);
+    void setItemParamB(u8);
+    bool getFishingType();
+    bool getCanoeFishing();
+    bool getCameraSubject();
+    bool getItemSubject();
+    bool getPlayerSubject();
+    bool isBButtonShow(bool);
+    s16 getButtonTimer();
 
-    /* 802102F8 */ virtual ~dMeter2Draw_c();
+    virtual ~dMeter2Draw_c();
 
     J2DScreen* getMainScreenPtr() { return mpScreen; }
     bool isEmphasisC() { return field_0x766 == 7 ? true : false; }
diff --git a/include/d/d_meter_HIO.h b/include/d/d_meter_HIO.h
index d8f2a8af9e..a03302b0b6 100644
--- a/include/d/d_meter_HIO.h
+++ b/include/d/d_meter_HIO.h
@@ -19,8 +19,8 @@ class JKRAramArchive;
 
 class dMeter_menuHIO_c : public JORReflexible {
 public:
-    /* 801FE330 */ dMeter_menuHIO_c();
-    /* 8020123C */ virtual ~dMeter_menuHIO_c() {}
+    dMeter_menuHIO_c();
+    virtual ~dMeter_menuHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -84,8 +84,8 @@ public:
 
 class dMeter_drawOptionHIO_c : public JORReflexible {
 public:
-    /* 801FE4EC */ dMeter_drawOptionHIO_c();
-    /* 80200F98 */ virtual ~dMeter_drawOptionHIO_c() {}
+    dMeter_drawOptionHIO_c();
+    virtual ~dMeter_drawOptionHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -122,8 +122,8 @@ public:
 
 class dMeter_drawLetterHIO_c : public JORReflexible {
 public:
-    /* 801FE5CC */ dMeter_drawLetterHIO_c();
-    /* 80200F50 */ virtual ~dMeter_drawLetterHIO_c() {}
+    dMeter_drawLetterHIO_c();
+    virtual ~dMeter_drawLetterHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -164,8 +164,8 @@ public:
 
 class dMeter_drawFishingHIO_c : public JORReflexible {
 public:
-    /* 801FE730 */ dMeter_drawFishingHIO_c();
-    /* 80200F08 */ virtual ~dMeter_drawFishingHIO_c() {}
+    dMeter_drawFishingHIO_c();
+    virtual ~dMeter_drawFishingHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -216,8 +216,8 @@ public:
 
 class dMeter_drawInsectHIO_c : public JORReflexible {
 public:
-    /* 801FE8DC */ dMeter_drawInsectHIO_c();
-    /* 80200EC0 */ virtual ~dMeter_drawInsectHIO_c() {}
+    dMeter_drawInsectHIO_c();
+    virtual ~dMeter_drawInsectHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -249,8 +249,8 @@ public:
 
 class dMeter_drawCalibrationHIO_c : public JORReflexible {
 public:
-    /* 801FE954 */ dMeter_drawCalibrationHIO_c();
-    /* 80200E78 */ virtual ~dMeter_drawCalibrationHIO_c() {}
+    dMeter_drawCalibrationHIO_c();
+    virtual ~dMeter_drawCalibrationHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -266,8 +266,8 @@ public:
 
 class dMeter_drawSkillHIO_c : public JORReflexible {
 public:
-    /* 801FE990 */ dMeter_drawSkillHIO_c();
-    /* 80200E30 */ virtual ~dMeter_drawSkillHIO_c() {}
+    dMeter_drawSkillHIO_c();
+    virtual ~dMeter_drawSkillHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -306,8 +306,8 @@ public:
 
 class dMeter_drawEmpButtonHIO_c : public JORReflexible {
 public:
-    /* 801FEAF0 */ dMeter_drawEmpButtonHIO_c();
-    /* 80200DA0 */ virtual ~dMeter_drawEmpButtonHIO_c() {}
+    dMeter_drawEmpButtonHIO_c();
+    virtual ~dMeter_drawEmpButtonHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -456,8 +456,8 @@ public:
 
 class dMeter_drawMiniGameHIO_c : public JORReflexible {
 public:
-    /* 801FEFF0 */ dMeter_drawMiniGameHIO_c();
-    /* 80200DE8 */ virtual ~dMeter_drawMiniGameHIO_c() {}
+    dMeter_drawMiniGameHIO_c();
+    virtual ~dMeter_drawMiniGameHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -532,8 +532,8 @@ public:
 
 class dMeter_drawLightDropHIO_c : public JORReflexible {
 public:
-    /* 801FF31C */ dMeter_drawLightDropHIO_c();
-    /* 80200D58 */ virtual ~dMeter_drawLightDropHIO_c() {}
+    dMeter_drawLightDropHIO_c();
+    virtual ~dMeter_drawLightDropHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -580,8 +580,8 @@ public:
 
 class dMeter_drawHIO_c : public JORReflexible {
 public:
-    /* 801FF5B8 */ dMeter_drawHIO_c();
-    /* 80201128 */ virtual ~dMeter_drawHIO_c() {
+    dMeter_drawHIO_c();
+    virtual ~dMeter_drawHIO_c() {
         #if DEBUG
         field_0x8_debug = 0;
         #endif
@@ -955,8 +955,8 @@ STATIC_ASSERT(sizeof(dMeter_drawHIO_c) == 3880);
 
 class dMeter_ringHIO_c : public JORReflexible {
 public:
-    /* 802001AC */ dMeter_ringHIO_c();
-    /* 802010E0 */ virtual ~dMeter_ringHIO_c() {}
+    dMeter_ringHIO_c();
+    virtual ~dMeter_ringHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -1053,8 +1053,8 @@ STATIC_ASSERT(sizeof(dMeter_ringHIO_c) == 344);
 
 class dMeter_mapIconHIO_c : public JORReflexible {
 public:
-    /* 802004B4 */ dMeter_mapIconHIO_c();
-    /* 80201028 */ virtual ~dMeter_mapIconHIO_c() {}
+    dMeter_mapIconHIO_c();
+    virtual ~dMeter_mapIconHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -1184,7 +1184,7 @@ public:
         /* 0x24 */ JUtility::TColor field_0x24;
     };  // Size: 0x28
 
-    /* 802006C8 */ dMeter_fmapHIO_c();
+    dMeter_fmapHIO_c();
 #ifdef DEBUG
     void update();
     void createEvtCallBackObject();
@@ -1193,7 +1193,7 @@ public:
     virtual void listenPropertyEvent(const JORPropertyEvent*);
     virtual void genMessage(JORMContext*);
 #endif
-    /* 80200BCC */ virtual ~dMeter_fmapHIO_c();
+    virtual ~dMeter_fmapHIO_c();
 
     /* 0x004 */ s8 field_0x4;
     #if DEBUG
@@ -1311,8 +1311,8 @@ STATIC_ASSERT(sizeof(dMeter_fmapHIO_c) == 1188);
 
 class dMeter_cursorHIO_c : public JORReflexible {
 public:
-    /* 80200CD4 */ dMeter_cursorHIO_c();
-    /* 80201098 */ virtual ~dMeter_cursorHIO_c() {}
+    dMeter_cursorHIO_c();
+    virtual ~dMeter_cursorHIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/d_meter_button.h b/include/d/d_meter_button.h
index 2b0676adad..ba59e589d6 100644
--- a/include/d/d_meter_button.h
+++ b/include/d/d_meter_button.h
@@ -44,100 +44,100 @@ public:
         DIR_UP_e = (1 << 3),
     };
 
-    /* 80201328 */ dMeterButton_c();
-    /* 802013CC */ int _create();
-    /* 80201404 */ int _execute(u32, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool,
+    dMeterButton_c();
+    int _create();
+    int _execute(u32, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool,
                                  bool, bool, bool, bool, bool, bool, bool, bool, bool, bool, bool,
                                  bool);
-    /* 80202A9C */ int _delete();
-    /* 802032C4 */ bool alphaAnimeButtonA(u32, bool);
-    /* 8020339C */ bool alphaAnimeButtonB(u32, bool);
-    /* 802034A8 */ bool alphaAnimeButtonR(u32, bool);
-    /* 802035AC */ bool alphaAnimeButtonZ(u32, bool);
-    /* 802036C0 */ bool alphaAnimeButton3D(u32, bool);
-    /* 802037B8 */ bool alphaAnimeButtonC(u32, bool);
-    /* 80203878 */ bool alphaAnimeButtonS(u32, bool);
-    /* 802038F4 */ bool alphaAnimeButtonX(u32, bool);
-    /* 80203A08 */ bool alphaAnimeButtonY(u32, bool);
-    /* 80203B1C */ bool alphaAnimeButtonNun(u32, bool);
-    /* 80203C30 */ bool alphaAnimeButtonRemo(u32, bool);
-    /* 80203D44 */ bool alphaAnimeButtonRemo2(u32, bool);
-    /* 80203E58 */ bool alphaAnimeButtonAR(u32, bool);
-    /* 80203F60 */ bool alphaAnimeButton3DB(u32, bool);
-    /* 80204068 */ bool alphaAnimeButtonNURE(u32, bool);
-    /* 80204170 */ bool alphaAnimeButtonReel(u32, bool);
-    /* 80204278 */ bool alphaAnimeButtonReel2(u32, bool);
-    /* 80204368 */ bool alphaAnimeButtonAB(u32, bool);
-    /* 80204458 */ bool alphaAnimeButtonTate(u32, bool);
-    /* 80204548 */ bool alphaAnimeButtonNunZ(u32, bool);
-    /* 80204620 */ bool alphaAnimeButtonNunC(u32, bool);
-    /* 802046F8 */ bool alphaAnimeButtonBin(u32, bool);
-    /* 802047E8 */ void screenInitButton();
-    /* 80205834 */ void screenInitText();
-    /* 80205CA0 */ void updateButton();
-    /* 80206978 */ void updateText(u32);
-    /* 80206CE0 */ void setAlphaButtonAAnimeMin();
-    /* 80206D70 */ bool isFastSet(int);
-    /* 80207060 */ void setAlphaButtonAAnimeMax();
-    /* 8020714C */ void setAlphaButtonBAnimeMin();
-    /* 802071DC */ void setAlphaButtonBAnimeMax();
-    /* 802072C8 */ void setAlphaButtonRAnimeMin();
-    /* 80207358 */ void setAlphaButtonRAnimeMax();
-    /* 80207444 */ void setAlphaButtonZAnimeMin();
-    /* 802074D4 */ void setAlphaButtonZAnimeMax();
-    /* 802075C0 */ void setAlphaButton3DAnimeMin();
-    /* 80207654 */ void setAlphaButton3DAnimeMax();
-    /* 80207740 */ void setAlphaButton3DVAnimeMin();
-    /* 80207744 */ void setAlphaButton3DVAnimeMax();
-    /* 80207748 */ void setAlphaButtonCAnimeMin();
-    /* 802077EC */ void setAlphaButtonCAnimeMax();
-    /* 80207A28 */ void setAlphaButtonSAnimeMin();
-    /* 80207AB8 */ void setAlphaButtonSAnimeMax();
-    /* 80207BA4 */ void setAlphaButtonXAnimeMin();
-    /* 80207C34 */ void setAlphaButtonXAnimeMax();
-    /* 80207D20 */ void setAlphaButtonYAnimeMin();
-    /* 80207DB0 */ void setAlphaButtonYAnimeMax();
-    /* 80207E9C */ void setAlphaButtonNunAnimeMin();
-    /* 80207F34 */ void setAlphaButtonNunAnimeMax();
-    /* 80208028 */ void setAlphaButtonRemoAnimeMin();
-    /* 802080C0 */ void setAlphaButtonRemoAnimeMax();
-    /* 802081B4 */ void setAlphaButtonRemo2AnimeMin();
-    /* 8020824C */ void setAlphaButtonRemo2AnimeMax();
-    /* 80208340 */ void setAlphaButtonARAnimeMin();
-    /* 802083D8 */ void setAlphaButtonARAnimeMax();
-    /* 802084D8 */ void setAlphaButton3DBAnimeMin();
-    /* 80208570 */ void setAlphaButton3DBAnimeMax();
-    /* 80208670 */ void setAlphaButtonNUREAnimeMin();
-    /* 80208708 */ void setAlphaButtonNUREAnimeMax();
-    /* 80208808 */ void setAlphaButtonReelAnimeMin();
-    /* 802088A0 */ void setAlphaButtonReelAnimeMax();
-    /* 802089A0 */ void setAlphaButtonReel2AnimeMin();
-    /* 80208A38 */ void setAlphaButtonReel2AnimeMax();
-    /* 80208AEC */ void setAlphaButtonABAnimeMin();
-    /* 80208B84 */ void setAlphaButtonABAnimeMax();
-    /* 80208C38 */ void setAlphaButtonTateAnimeMin();
-    /* 80208CD0 */ void setAlphaButtonTateAnimeMax();
-    /* 80208D84 */ void setAlphaButtonNunZAnimeMin();
-    /* 80208E1C */ void setAlphaButtonNunZAnimeMax();
-    /* 80208F1C */ void setAlphaButtonNunCAnimeMin();
-    /* 80208FB4 */ void setAlphaButtonNunCAnimeMax();
-    /* 802090B4 */ void setAlphaButtonBinAnimeMin();
-    /* 8020914C */ void setAlphaButtonBinAnimeMax();
-    /* 8020924C */ void setAlphaButtonOAnimeMin(int);
-    /* 802092C0 */ void setAlphaButtonOAnimeMax(int);
-    /* 80209368 */ void setAlphaIconAnimeMin();
-    /* 802093D8 */ void setAlphaIconAnimeMax();
-    /* 80209474 */ bool isClose();
-    /* 802095C0 */ void setString(char*, u8, u8, u8);
-    /* 80209CEC */ void hideAll();
-    /* 80209D7C */ f32 getCenterPosCalc(u8, char*, int);
-    /* 8020A540 */ void trans_button(int, f32);
-    /* 8020A94C */ void hide_button(u8);
-    /* 8020AA84 */ void pikariCheck();
-    /* 8020AE68 */ void paneTrans(CPaneMgr*, f32, f32, u8);
+    int _delete();
+    bool alphaAnimeButtonA(u32, bool);
+    bool alphaAnimeButtonB(u32, bool);
+    bool alphaAnimeButtonR(u32, bool);
+    bool alphaAnimeButtonZ(u32, bool);
+    bool alphaAnimeButton3D(u32, bool);
+    bool alphaAnimeButtonC(u32, bool);
+    bool alphaAnimeButtonS(u32, bool);
+    bool alphaAnimeButtonX(u32, bool);
+    bool alphaAnimeButtonY(u32, bool);
+    bool alphaAnimeButtonNun(u32, bool);
+    bool alphaAnimeButtonRemo(u32, bool);
+    bool alphaAnimeButtonRemo2(u32, bool);
+    bool alphaAnimeButtonAR(u32, bool);
+    bool alphaAnimeButton3DB(u32, bool);
+    bool alphaAnimeButtonNURE(u32, bool);
+    bool alphaAnimeButtonReel(u32, bool);
+    bool alphaAnimeButtonReel2(u32, bool);
+    bool alphaAnimeButtonAB(u32, bool);
+    bool alphaAnimeButtonTate(u32, bool);
+    bool alphaAnimeButtonNunZ(u32, bool);
+    bool alphaAnimeButtonNunC(u32, bool);
+    bool alphaAnimeButtonBin(u32, bool);
+    void screenInitButton();
+    void screenInitText();
+    void updateButton();
+    void updateText(u32);
+    void setAlphaButtonAAnimeMin();
+    bool isFastSet(int);
+    void setAlphaButtonAAnimeMax();
+    void setAlphaButtonBAnimeMin();
+    void setAlphaButtonBAnimeMax();
+    void setAlphaButtonRAnimeMin();
+    void setAlphaButtonRAnimeMax();
+    void setAlphaButtonZAnimeMin();
+    void setAlphaButtonZAnimeMax();
+    void setAlphaButton3DAnimeMin();
+    void setAlphaButton3DAnimeMax();
+    void setAlphaButton3DVAnimeMin();
+    void setAlphaButton3DVAnimeMax();
+    void setAlphaButtonCAnimeMin();
+    void setAlphaButtonCAnimeMax();
+    void setAlphaButtonSAnimeMin();
+    void setAlphaButtonSAnimeMax();
+    void setAlphaButtonXAnimeMin();
+    void setAlphaButtonXAnimeMax();
+    void setAlphaButtonYAnimeMin();
+    void setAlphaButtonYAnimeMax();
+    void setAlphaButtonNunAnimeMin();
+    void setAlphaButtonNunAnimeMax();
+    void setAlphaButtonRemoAnimeMin();
+    void setAlphaButtonRemoAnimeMax();
+    void setAlphaButtonRemo2AnimeMin();
+    void setAlphaButtonRemo2AnimeMax();
+    void setAlphaButtonARAnimeMin();
+    void setAlphaButtonARAnimeMax();
+    void setAlphaButton3DBAnimeMin();
+    void setAlphaButton3DBAnimeMax();
+    void setAlphaButtonNUREAnimeMin();
+    void setAlphaButtonNUREAnimeMax();
+    void setAlphaButtonReelAnimeMin();
+    void setAlphaButtonReelAnimeMax();
+    void setAlphaButtonReel2AnimeMin();
+    void setAlphaButtonReel2AnimeMax();
+    void setAlphaButtonABAnimeMin();
+    void setAlphaButtonABAnimeMax();
+    void setAlphaButtonTateAnimeMin();
+    void setAlphaButtonTateAnimeMax();
+    void setAlphaButtonNunZAnimeMin();
+    void setAlphaButtonNunZAnimeMax();
+    void setAlphaButtonNunCAnimeMin();
+    void setAlphaButtonNunCAnimeMax();
+    void setAlphaButtonBinAnimeMin();
+    void setAlphaButtonBinAnimeMax();
+    void setAlphaButtonOAnimeMin(int);
+    void setAlphaButtonOAnimeMax(int);
+    void setAlphaIconAnimeMin();
+    void setAlphaIconAnimeMax();
+    bool isClose();
+    void setString(char*, u8, u8, u8);
+    void hideAll();
+    f32 getCenterPosCalc(u8, char*, int);
+    void trans_button(int, f32);
+    void hide_button(u8);
+    void pikariCheck();
+    void paneTrans(CPaneMgr*, f32, f32, u8);
 
-    /* 80202240 */ virtual void draw();
-    /* 80201370 */ virtual ~dMeterButton_c();
+    virtual void draw();
+    virtual ~dMeterButton_c();
 
     bool isSetButton(u8 i_no) { return mButtonTimers[i_no] <= 0; }
     void onButtonShowBit(int i_bit) { field_0x4b0 |= (u16)(1 << i_bit); }
diff --git a/include/d/d_meter_haihai.h b/include/d/d_meter_haihai.h
index 019e66dddb..a60735c005 100644
--- a/include/d/d_meter_haihai.h
+++ b/include/d/d_meter_haihai.h
@@ -18,25 +18,25 @@ public:
         DIR_UP_e = (1 << 3),
     };
 
-    /* 8020AE8C */ dMeterHaihai_c(u8);
-    /* 8020B814 */ void drawHaihai(u8, f32, f32, f32, f32);
-    /* 8020B518 */ void drawHaihai(u8);
-    /* 8020B9B0 */ void drawHaihaiLeft(f32, f32);
-    /* 8020BA4C */ void drawHaihaiRight(f32, f32);
-    /* 8020BAE8 */ void drawHaihaiTop(f32, f32);
-    /* 8020BB84 */ void drawHaihaiBottom(f32, f32);
-    /* 8020BC20 */ void setScale(f32);
-    /* 8020BEA0 */ void alphaAnimeHaihai(u32);
-    /* 8020BEA4 */ void updateHaihai();
-    /* 8020BF00 */ void playBckAnime(J2DAnmTransformKey*);
-    /* 8020C078 */ void playBtkAnime(J2DAnmTextureSRTKey*);
-    /* 8020C1CC */ void playBpkAnime(J2DAnmColor*);
+    dMeterHaihai_c(u8);
+    void drawHaihai(u8, f32, f32, f32, f32);
+    void drawHaihai(u8);
+    void drawHaihaiLeft(f32, f32);
+    void drawHaihaiRight(f32, f32);
+    void drawHaihaiTop(f32, f32);
+    void drawHaihaiBottom(f32, f32);
+    void setScale(f32);
+    void alphaAnimeHaihai(u32);
+    void updateHaihai();
+    void playBckAnime(J2DAnmTransformKey*);
+    void playBtkAnime(J2DAnmTextureSRTKey*);
+    void playBpkAnime(J2DAnmColor*);
 
-    /* 8020B140 */ virtual void draw();
-    /* 8020AEF0 */ virtual ~dMeterHaihai_c();
-    /* 8020AF6C */ virtual int _create();
-    /* 8020B0F4 */ virtual int _execute(u32);
-    /* 8020BDAC */ virtual int _delete();
+    virtual void draw();
+    virtual ~dMeterHaihai_c();
+    virtual int _create();
+    virtual int _execute(u32);
+    virtual int _delete();
 
     void onPlayAllAnime() { mPlayAnimFlags = 0xFF; }
     bool checkPlayAnime(int i_flag) { return mPlayAnimFlags & (1 << i_flag); }
diff --git a/include/d/d_meter_hakusha.h b/include/d/d_meter_hakusha.h
index be92ceddca..909331eeb3 100644
--- a/include/d/d_meter_hakusha.h
+++ b/include/d/d_meter_hakusha.h
@@ -11,20 +11,20 @@ public:
         u8 flags;
     };
 
-    /* 8020C320 */ dMeterHakusha_c(void*);
-    /* 8020CC58 */ void alphaAnimeHakusha(u32);
-    /* 8020CD6C */ void updateHakusha();
-    /* 8020D258 */ void setAlphaHakushaAnimeMin();
-    /* 8020D308 */ void setAlphaHakushaAnimeMax();
-    /* 8020D3B8 */ void setAlphaButtonAnimeMin();
-    /* 8020D41C */ void setAlphaButtonAnimeMax();
-    /* 8020D480 */ int getHakushaNum();
+    dMeterHakusha_c(void*);
+    void alphaAnimeHakusha(u32);
+    void updateHakusha();
+    void setAlphaHakushaAnimeMin();
+    void setAlphaHakushaAnimeMax();
+    void setAlphaButtonAnimeMin();
+    void setAlphaButtonAnimeMax();
+    int getHakushaNum();
 
-    /* 8020C850 */ virtual void draw();
-    /* 8020C384 */ virtual ~dMeterHakusha_c();
-    /* 8020C400 */ virtual int _create();
-    /* 8020C808 */ virtual int _execute(u32);
-    /* 8020CABC */ virtual int _delete();
+    virtual void draw();
+    virtual ~dMeterHakusha_c();
+    virtual int _create();
+    virtual int _execute(u32);
+    virtual int _delete();
 
     /* 0x004 */ J2DScreen* field_0x004;
     /* 0x008 */ J2DScreen* mpHakushaScreen;
diff --git a/include/d/d_meter_map.h b/include/d/d_meter_map.h
index 3b83fd8b1e..de61bb3f6a 100644
--- a/include/d/d_meter_map.h
+++ b/include/d/d_meter_map.h
@@ -7,34 +7,34 @@ class J2DPicture;
 class dMap_c;
 class dMeterMap_c : public dDlst_base_c {
 public:
-    /* 8020D49C */ static bool isEnableDispMap();
-    /* 8020D528 */ static int getMapDispSizeTypeNo();
-    /* 8020D650 */ static bool isEnableDispMapAndMapDispSizeTypeNo();
-    /* 8020D690 */ f32 getMapDispEdgeBottomY_Layout();
-    /* 8020D698 */ bool isEventRunCheck();
-    /* 8020D72C */ f32 getMapDispEdgeLeftX_Layout();
-    /* 8020D75C */ f32 getMapDispEdgeTop();
-    /* 8020D7E4 */ s16 getDispPosInside_OffsetX();
-    /* 8020D7EC */ s16 getDispPosOutSide_OffsetX();
-    /* 8020D874 */ void setDispPosInsideFlg_SE_On();
-    /* 8020D8BC */ void setDispPosOutsideFlg_SE_On();
-    /* 8020D8F8 */ void setMapAlpha(u8);
-    /* 8020D900 */ static bool isMapOpenCheck();
-    /* 8020D948 */ dMeterMap_c(J2DScreen*);
-    /* 8020D9EC */ void _create(J2DScreen*);
-    /* 8020DC50 */ void _delete();
-    /* 8020DCE4 */ void _move(u32);
-    /* 8020DF1C */ void _draw();
-    /* 8020E070 */ void ctrlShowMap();
-    /* 8020E45C */ u8 checkMoveStatus();
-    /* 8020E4C8 */ static bool isShow(u32);
-    /* 8020E620 */ static bool isFmapScreen();
-    /* 8020E70C */ static bool isDmapScreen();
-    /* 8020E754 */ static void meter_map_move(u32);
-    /* 8020E9CC */ void keyCheck();
+    static bool isEnableDispMap();
+    static int getMapDispSizeTypeNo();
+    static bool isEnableDispMapAndMapDispSizeTypeNo();
+    f32 getMapDispEdgeBottomY_Layout();
+    bool isEventRunCheck();
+    f32 getMapDispEdgeLeftX_Layout();
+    f32 getMapDispEdgeTop();
+    s16 getDispPosInside_OffsetX();
+    s16 getDispPosOutSide_OffsetX();
+    void setDispPosInsideFlg_SE_On();
+    void setDispPosOutsideFlg_SE_On();
+    void setMapAlpha(u8);
+    static bool isMapOpenCheck();
+    dMeterMap_c(J2DScreen*);
+    void _create(J2DScreen*);
+    void _delete();
+    void _move(u32);
+    void _draw();
+    void ctrlShowMap();
+    u8 checkMoveStatus();
+    static bool isShow(u32);
+    static bool isFmapScreen();
+    static bool isDmapScreen();
+    static void meter_map_move(u32);
+    void keyCheck();
 
-    /* 8020DF68 */ virtual void draw();
-    /* 8020D990 */ virtual ~dMeterMap_c();
+    virtual void draw();
+    virtual ~dMeterMap_c();
 
     bool isDispPosInsideFlg() { return field_0x2d != 0; }
 
diff --git a/include/d/d_meter_string.h b/include/d/d_meter_string.h
index 01d799450b..382fcbf99b 100644
--- a/include/d/d_meter_string.h
+++ b/include/d/d_meter_string.h
@@ -5,17 +5,17 @@
 
 class dMeterString_c : public dMeterSub_c {
 public:
-    /* 8020ED60 */ dMeterString_c(int);
-    /* 8020F5A4 */ int createString(int);
-    /* 8020F66C */ void playBckAnimation(f32);
-    /* 8020F6EC */ void drawPikari();
-    /* 8020FA88 */ bool isLeadByte(int);
+    dMeterString_c(int);
+    int createString(int);
+    void playBckAnimation(f32);
+    void drawPikari();
+    bool isLeadByte(int);
 
-    /* 8020F1B0 */ virtual void draw();
-    /* 8020EDF4 */ virtual ~dMeterString_c();
-    /* 8020EE70 */ virtual int _create();
-    /* 8020F150 */ virtual int _execute(u32);
-    /* 8020F49C */ virtual int _delete();
+    virtual void draw();
+    virtual ~dMeterString_c();
+    virtual int _create();
+    virtual int _execute(u32);
+    virtual int _delete();
 
     f32 acc(s16 param_0, s16 param_1, s16 param_2) {
         return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
diff --git a/include/d/d_model.h b/include/d/d_model.h
index c261226945..2dd1abaabf 100644
--- a/include/d/d_model.h
+++ b/include/d/d_model.h
@@ -19,15 +19,15 @@ public:
 
 class dMdl_c : public J3DPacket {
 public:
-    /* 8009C650 */ void create(J3DModelData*, u16, dKy_tevstr_c*);
-    /* 8009C668 */ void entryObj(dMdl_obj_c*);
-    /* 8009C930 */ dMdl_c() {
+    void create(J3DModelData*, u16, dKy_tevstr_c*);
+    void entryObj(dMdl_obj_c*);
+    dMdl_c() {
                         mpModelData = NULL;
                         mMaterialId = 0;
                     }
 
-    /* 8009C4FC */ virtual void draw();
-    /* 8009C808 */ virtual ~dMdl_c();
+    virtual void draw();
+    virtual ~dMdl_c();
 
     J3DModelData* getModelData() { return mpModelData; }
     u16 getMaterialId() { return mMaterialId; }
@@ -46,12 +46,12 @@ public:
     dMdl_mng_c() { field_0x80 = 0; }
     ~dMdl_mng_c() {}
 
-    /* 8009C6DC */ dMdl_c* search(J3DModelData*, u16, dKy_tevstr_c*);
-    /* 8009C724 */ dMdl_c* entry(J3DModelData*, u16, dKy_tevstr_c*);
-    /* 8009C8D8 */ static dMdl_c* entry(J3DModelData*, u16, int);
-    /* 8009C7AC */ static void create();
-    /* 8009C864 */ static void remove();
-    /* 8009C8C0 */ static void reset();
+    dMdl_c* search(J3DModelData*, u16, dKy_tevstr_c*);
+    dMdl_c* entry(J3DModelData*, u16, dKy_tevstr_c*);
+    static dMdl_c* entry(J3DModelData*, u16, int);
+    static void create();
+    static void remove();
+    static void reset();
 
     static dMdl_mng_c* m_myObj;
 
diff --git a/include/d/d_msg_class.h b/include/d/d_msg_class.h
index 9a45580402..4d4b6700b6 100644
--- a/include/d/d_msg_class.h
+++ b/include/d/d_msg_class.h
@@ -51,36 +51,36 @@ class JUTFont;
 class STControl;
 class dMsgObject_c;
 struct jmessage_tReference : public JMessage::TReference {
-    /* 80228B04 */ jmessage_tReference();
-    /* 80228D28 */ void calcDistance();
-    /* 80228DE0 */ u8 getLineMax();
-    /* 80228E6C */ bool isKanban();
-    /* 80228EA0 */ bool isPlaceName();
-    /* 80228ED4 */ bool isBossName();
-    /* 80228F08 */ bool isSaveSeq();
-    /* 80228F3C */ bool isBook();
-    /* 80228F70 */ bool isStaffRoll();
-    /* 80228FA4 */ bool isHowl();
-    /* 80228FD8 */ bool isMidona();
-    /* 8022900C */ void resetReference();
-    /* 80229034 */ void pageSend();
-    /* 80229168 */ void selectMessage();
-    /* 802294A8 */ void inputNumber();
-    /* 80229730 */ char* getWord(int);
-    /* 80229744 */ void resetWord();
-    /* 80229768 */ void setCharactor(u16);
-    /* 80229788 */ void addCharactor(u16);
-    /* 802297B0 */ void resetCharactor();
-    /* 802297E4 */ void shiftCharCountBuffer();
-    /* 80229810 */ void resetCharCountBuffer();
-    /* 80229848 */ void allsetCharCountBuffer();
-    /* 8022986C */ bool isCharSend();
-    /* 802298DC */ bool isLightSend();
-    /* 8022994C */ bool isLightEnd();
-    /* 802299AC */ void decideOutFontRupeeColor(int);
-    /* 80232A20 */ cXyz getActorPos() { return mActorPos; }
+    jmessage_tReference();
+    void calcDistance();
+    u8 getLineMax();
+    bool isKanban();
+    bool isPlaceName();
+    bool isBossName();
+    bool isSaveSeq();
+    bool isBook();
+    bool isStaffRoll();
+    bool isHowl();
+    bool isMidona();
+    void resetReference();
+    void pageSend();
+    void selectMessage();
+    void inputNumber();
+    char* getWord(int);
+    void resetWord();
+    void setCharactor(u16);
+    void addCharactor(u16);
+    void resetCharactor();
+    void shiftCharCountBuffer();
+    void resetCharCountBuffer();
+    void allsetCharCountBuffer();
+    bool isCharSend();
+    bool isLightSend();
+    bool isLightEnd();
+    void decideOutFontRupeeColor(int);
+    cXyz getActorPos() { return mActorPos; }
 
-    /* 80238C78 */ void setActorPos(cXyz pos) { mActorPos = pos; }
+    void setActorPos(cXyz pos) { mActorPos = pos; }
 
     bool isSelectSetCancelFlag() {
         return mSelectSetCancelFlag ? true : false;
@@ -278,7 +278,7 @@ struct jmessage_tReference : public JMessage::TReference {
     u32 getRevoMessageID() { return mRevoMessageID; }
     f32 getCharAllAlphaRate() { return mCharAllAlphaRate; }
 
-    /* 80228CB4 */ virtual ~jmessage_tReference();
+    virtual ~jmessage_tReference();
 
     /* 0x0008 */ STControl* mpStick;
     /* 0x000C */ CharSoundInfo mCharactor;
@@ -360,18 +360,18 @@ struct jmessage_tReference : public JMessage::TReference {
 };  // Size: 0x1278
 
 struct jmessage_tMeasureProcessor : public JMessage::TRenderingProcessor {
-    /* 80229A28 */ jmessage_tMeasureProcessor(jmessage_tReference const* pReference);
-    /* 8022B0B0 */ void do_scale(f32);
-    /* 8022B18C */ void do_space(u32);
-    /* 8022B3EC */ void do_pageType(int);
-    /* 8022B454 */ void do_name1();
-    /* 8022B458 */ void do_rubyset(void const*, u32);
-    /* 8022B4E0 */ void push_word(char*);
+    jmessage_tMeasureProcessor(jmessage_tReference const* pReference);
+    void do_scale(f32);
+    void do_space(u32);
+    void do_pageType(int);
+    void do_name1();
+    void do_rubyset(void const*, u32);
+    void push_word(char*);
 
-    /* 80229AC4 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 80229CB4 */ virtual void do_end();
-    /* 80229E3C */ virtual void do_character(int iCharacter);
-    /* 8022A268 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
 
     /* 0x38 */ f32 field_0x38;
     /* 0x3C */ s16 mTotalLineCnt;
@@ -391,28 +391,28 @@ struct jmessage_tMeasureProcessor : public JMessage::TRenderingProcessor {
 };  // Size: 0x50
 
 struct jmessage_tControl : public JMessage::TControl {
-    /* 802299EC */ jmessage_tControl();
+    jmessage_tControl();
 
-    /* 80039B0C */ virtual ~jmessage_tControl();
+    virtual ~jmessage_tControl();
 };
 
 struct jmessage_tSequenceProcessor : public JMessage::TSequenceProcessor {
-    /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const* pReference, jmessage_tControl* pControl);
-    /* 8022C904 */ void do_name1();
-    /* 8022C908 */ void do_space(u32);
-    /* 8022CA24 */ void do_rubyset(void const*, u32);
-    /* 8022CAAC */ void push_word();
-    /* 8022CB10 */ void messageSePlay(u8, u8, cXyz*);
-    /* 8022CBE8 */ void calcStringLength();
+    jmessage_tSequenceProcessor(jmessage_tReference const* pReference, jmessage_tControl* pControl);
+    void do_name1();
+    void do_space(u32);
+    void do_rubyset(void const*, u32);
+    void push_word();
+    void messageSePlay(u8, u8, cXyz*);
+    void calcStringLength();
 
-    /* 8022B654 */ virtual void do_reset();
-    /* 8022B658 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 8022BA3C */ virtual void do_end();
-    /* 8022BFE0 */ virtual void do_character(int iCharacter);
-    /* 8022C1A0 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
-    /* 8022BB7C */ virtual bool do_isReady();
-    /* 8022C8FC */ virtual bool do_jump_isReady();
-    /* 8022CBE4 */ virtual void do_jump(void const* pEntry, char const* pszText);
+    virtual void do_reset();
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual bool do_isReady();
+    virtual bool do_jump_isReady();
+    virtual void do_jump(void const* pEntry, char const* pszText);
 
     u8 getMouthCheck() { return mMouthCheck; }
     void setForceForm(u8 forceForm) { mForceForm = forceForm; }
@@ -448,31 +448,31 @@ struct CharInfo_c {
 };
 
 struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
-    /* 8022CCB0 */ jmessage_tRenderingProcessor(jmessage_tReference const* pReference);
-    /* 8022E12C */ void resetRendering();
-    /* 8022E17C */ void do_widthcenter();
-    /* 8022E260 */ void do_selwidthcenter(int);
-    /* 8022E318 */ void do_heightcenter();
-    /* 8022E7CC */ void do_color(u8);
-    /* 8022E860 */ void do_scale(f32);
-    /* 8022E960 */ void do_linedown(s16);
-    /* 8022E9C0 */ void do_transY(s16, bool);
-    /* 8022EAE4 */ void do_outfont(u8, u32);
-    /* 8022ED10 */ void do_arrow2();
-    /* 8022EECC */ f32 getLineLength(int);
-    /* 8022EF00 */ void do_strcat(char*, bool, bool, bool);
-    /* 8022F148 */ void do_rubyset(void const*, u32);
-    /* 8022F384 */ void do_rubystrcat(char*, char*, f32, f32);
-    /* 8022F53C */ void do_name1();
-    /* 8022F540 */ void do_numset(s16);
-    /* 8022F734 */ void push_word();
-    /* 8022F784 */ void getCharInfo(f32, f32, f32, f32, f32);
+    jmessage_tRenderingProcessor(jmessage_tReference const* pReference);
+    void resetRendering();
+    void do_widthcenter();
+    void do_selwidthcenter(int);
+    void do_heightcenter();
+    void do_color(u8);
+    void do_scale(f32);
+    void do_linedown(s16);
+    void do_transY(s16, bool);
+    void do_outfont(u8, u32);
+    void do_arrow2();
+    f32 getLineLength(int);
+    void do_strcat(char*, bool, bool, bool);
+    void do_rubyset(void const*, u32);
+    void do_rubystrcat(char*, char*, f32, f32);
+    void do_name1();
+    void do_numset(s16);
+    void push_word();
+    void getCharInfo(f32, f32, f32, f32, f32);
 
-    /* 8022CDC8 */ virtual void do_reset();
-    /* 8022CDCC */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 8022CFD8 */ virtual void do_end();
-    /* 8022D0A0 */ virtual void do_character(int iCharacter);
-    /* 8022D74C */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual void do_reset();
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
 
     void setTextInitPos(float x, float y) {
         mTextInitPosX = x;
@@ -535,21 +535,21 @@ struct jmessage_tRenderingProcessor : public JMessage::TRenderingProcessor {
 };
 
 struct jmessage_string_tControl : public JMessage::TControl {
-    /* 8022FB5C */ jmessage_string_tControl();
+    jmessage_string_tControl();
 };
 
 struct jmessage_string_tReference : public JMessage::TReference {
-    /* 8022F8C0 */ jmessage_string_tReference();
-    /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
-    /* 8022FA2C */ void setCharactor(u16);
-    /* 8022FA30 */ void addCharactor(u16);
-    /* 8022FA34 */ void resetCharactor();
-    /* 8022FA38 */ f32 getLineLength(int);
-    /* 8022FA6C */ void addLineLength(int, f32);
-    /* 8022FA98 */ f32 getOutfontLength(int);
-    /* 8022FACC */ void setOutfontLength(int, f32);
-    /* 8022FAF0 */ void clearOutfontLength(int);
-    /* 8022FB24 */ s16 getLineCountNowPage();
+    jmessage_string_tReference();
+    void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
+    void setCharactor(u16);
+    void addCharactor(u16);
+    void resetCharactor();
+    f32 getLineLength(int);
+    void addLineLength(int, f32);
+    f32 getOutfontLength(int);
+    void setOutfontLength(int, f32);
+    void clearOutfontLength(int);
+    s16 getLineCountNowPage();
     J2DTextBox* getPanePtr() { return mPanePtr; }
     J2DTextBox* getRubyPanePtr() { return mRubyPanePtr; }
     u32 getCCColor() { return mCCColor; }
@@ -577,7 +577,7 @@ struct jmessage_string_tReference : public JMessage::TReference {
     void setLineMax(u8 lineMax) { mLineMax = lineMax; }
     COutFont_c* getOutFontPtr() { return mOutFontPtr; }
 
-    /* 8022F94C */ virtual ~jmessage_string_tReference();
+    virtual ~jmessage_string_tReference();
 
     /* 0x08 */ J2DTextBox* mPanePtr;
     /* 0x0C */ J2DTextBox* mRubyPanePtr;
@@ -594,54 +594,54 @@ struct jmessage_string_tReference : public JMessage::TReference {
 };
 
 struct jmessage_string_tMeasureProcessor : public JMessage::TRenderingProcessor {
-    /* 8022FB98 */ jmessage_string_tMeasureProcessor(jmessage_string_tReference const* pReference);
-    /* 8023098C */ void do_rubyset(void const*, u32);
+    jmessage_string_tMeasureProcessor(jmessage_string_tReference const* pReference);
+    void do_rubyset(void const*, u32);
 
-    /* 8022FBE4 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 8022FC14 */ virtual void do_end();
-    /* 8022FC28 */ virtual void do_character(int iCharacter);
-    /* 8022FDF0 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
 
     /* 0x38 */ jmessage_string_tReference* mpReference;
 };
 
 struct jmessage_string_tSequenceProcessor : public JMessage::TSequenceProcessor {
-    /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const* pReference,
+    jmessage_string_tSequenceProcessor(jmessage_string_tReference const* pReference,
                                                       jmessage_string_tControl* pControl);
 
-    /* 80230ABC */ virtual void do_reset();
-    /* 80230AC0 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 80230B7C */ virtual void do_end();
-    /* 80230B88 */ virtual void do_character(int iCharacter);
-    /* 80230B8C */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
-    /* 80230B80 */ virtual bool do_isReady();
-    /* 80230BBC */ virtual bool do_jump_isReady();
-    /* 80230BC4 */ virtual void do_jump(void const* pEntry, char const* pszText);
+    virtual void do_reset();
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual bool do_isReady();
+    virtual bool do_jump_isReady();
+    virtual void do_jump(void const* pEntry, char const* pszText);
     
     /* 0x4C */ jmessage_string_tMeasureProcessor mMeasureProcessor;
     /* 0x88 */ jmessage_string_tReference* mpSeqReference;
 };
 
 struct jmessage_string_tRenderingProcessor : public JMessage::TRenderingProcessor {
-    /* 80230BC8 */ jmessage_string_tRenderingProcessor(jmessage_string_tReference const* pReference);
-    /* 80230C20 */ s16 getLineCountNowPage();
-    /* 80231D70 */ void do_widthcenter();
-    /* 80231EF0 */ void do_heightcenter();
-    /* 80232044 */ void do_strcat(char*);
-    /* 802320B0 */ void do_rubyset(void const*, u32);
-    /* 80232260 */ void do_rubystrcat(char*);
-    /* 802322CC */ void do_outfont(u8);
-    /* 8023256C */ void do_color(u8);
-    /* 80232600 */ void do_scale(f32);
-    /* 80232690 */ void do_linedown(s16);
-    /* 802326E4 */ void do_numset(s16);
-    /* 802327BC */ void push_word(char const*);
+    jmessage_string_tRenderingProcessor(jmessage_string_tReference const* pReference);
+    s16 getLineCountNowPage();
+    void do_widthcenter();
+    void do_heightcenter();
+    void do_strcat(char*);
+    void do_rubyset(void const*, u32);
+    void do_rubystrcat(char*);
+    void do_outfont(u8);
+    void do_color(u8);
+    void do_scale(f32);
+    void do_linedown(s16);
+    void do_numset(s16);
+    void push_word(char const*);
 
-    /* 80230C5C */ virtual void do_reset();
-    /* 80230CA0 */ virtual void do_begin(void const* pEntry, char const* pszText);
-    /* 80230CE8 */ virtual void do_end();
-    /* 80230D48 */ virtual void do_character(int iCharacter);
-    /* 80231110 */ virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
+    virtual void do_reset();
+    virtual void do_begin(void const* pEntry, char const* pszText);
+    virtual void do_end();
+    virtual void do_character(int iCharacter);
+    virtual bool do_tag(u32 uTag, void const* pData, u32 uSize);
 
     char* getString() { return field_0x54; }
 
diff --git a/include/d/d_msg_flow.h b/include/d/d_msg_flow.h
index b071f198dc..2807f4b877 100644
--- a/include/d/d_msg_flow.h
+++ b/include/d/d_msg_flow.h
@@ -48,128 +48,128 @@ typedef int (dMsgFlow_c::*eventFunc)(mesg_flow_node_event*, fopAc_ac_c*);
 
 class dMsgFlow_c {
 public:
-    /* 80249F00 */ dMsgFlow_c();
-    /* 80249F48 */ virtual ~dMsgFlow_c();
+    dMsgFlow_c();
+    virtual ~dMsgFlow_c();
 
-    /* 80249F90 */ void init(fopAc_ac_c* i_partner, int i_flowID, int, fopAc_ac_c**);
-    /* 8024A13C */ int checkOpenDoor(fopAc_ac_c*, int*);
-    /* 8024A2D8 */ int doFlow(fopAc_ac_c*, fopAc_ac_c**, int i_flow);
-    /* 8024A424 */ int checkEventRender(int*, int*, int*, int*);
-    /* 8024A4C4 */ void remove();
-    /* 8024A528 */ u16 getEventId(int*);
-    /* 8024A538 */ u32 getMsgNo();
-    /* 8024A540 */ u32 getNowMsgNo();
-    /* 8024A548 */ msg_class* getMsg();
-    /* 8024A580 */ void setInitValue(int);
-    /* 8024A618 */ void setInitValueGroupChange(int, fopAc_ac_c**);
-    /* 8024A6EC */ u8* getMsgDataBlock(char const*);
-    /* 8024A784 */ u16 getInitNodeIndex(u16);
-    /* 8024A7CC */ void setNodeIndex(u16, fopAc_ac_c**);
-    /* 8024A95C */ int setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*);
-    /* 8024AA50 */ int setNormalMsg(mesg_flow_node*, fopAc_ac_c*);
-    /* 8024AB30 */ int messageNodeProc(fopAc_ac_c*, fopAc_ac_c**);
-    /* 8024AD54 */ int branchNodeProc(fopAc_ac_c*, fopAc_ac_c**);
-    /* 8024ADEC */ int eventNodeProc(fopAc_ac_c*, fopAc_ac_c**);
-    /* 8024AFF8 */ int nodeProc(fopAc_ac_c*, fopAc_ac_c**);
-    /* 8024B0F0 */ int getParam(u16*, u16*, u8*);
-    /* 8024B108 */ int getParam(u8*, u8*);
-    /* 8024B130 */ int getParam(u8*);
-    /* 8024B138 */ u16 query001(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B180 */ u16 query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B208 */ u16 query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B250 */ u16 query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B2C0 */ u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B2F8 */ u16 query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B32C */ u16 query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B45C */ u16 query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B4A4 */ u16 query009(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B4D0 */ u16 query010(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B504 */ u16 query011(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B54C */ u16 query012(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B584 */ u16 query013(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B5BC */ u16 query014(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B5F4 */ u16 query015(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B62C */ u16 query016(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B664 */ u16 query017(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B6A8 */ u16 query018(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B6EC */ u16 query019(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B730 */ u16 query020(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B774 */ u16 query021(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B8E4 */ u16 query022(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B918 */ u16 query023(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B954 */ u16 query024(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B974 */ u16 query025(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B9BC */ u16 query026(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024B9E8 */ u16 query027(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BA4C */ u16 query028(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BAA0 */ u16 query029(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BAE0 */ u16 query030(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BB18 */ u16 query031(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BB74 */ u16 query032(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BB9C */ u16 query033(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BBE4 */ u16 query034(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BC14 */ u16 query035(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BC3C */ u16 query036(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BC80 */ u16 query037(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BCC4 */ u16 query038(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BDB0 */ u16 query039(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BE4C */ u16 query040(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BF50 */ u16 query041(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024BFEC */ u16 query042(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C0A8 */ u16 query043(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C144 */ u16 query044(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C18C */ u16 query045(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C218 */ u16 query046(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C248 */ u16 query047(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C250 */ u16 query048(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C2A0 */ u16 query049(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C2FC */ u16 query050(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C340 */ u16 query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C3A0 */ u16 query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C3D4 */ u16 query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
-    /* 8024C3FC */ int event000(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C488 */ int event001(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C514 */ int event002(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C550 */ int event003(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C590 */ int event004(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C5F0 */ int event005(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C654 */ int event006(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C694 */ int event007(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C6D8 */ int event008(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C744 */ int event009(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C76C */ int event010(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C7F8 */ int event011(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C884 */ int event012(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C88C */ int event013(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C8CC */ int event014(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024C994 */ int event015(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CA5C */ int event016(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CA94 */ int event017(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CBB0 */ int event018(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CCA4 */ int event019(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CCAC */ int event020(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CD84 */ int event021(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CDAC */ int event022(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CE40 */ int event023(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CF2C */ int event024(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CF54 */ int event025(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024CF9C */ int event026(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D004 */ int event027(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D3C4 */ int event028(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D500 */ int event029(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D544 */ int event030(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D5BC */ int event031(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D5EC */ int event032(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D6BC */ int event033(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D788 */ int event034(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D7C8 */ int event035(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D870 */ int event036(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D8C4 */ int event037(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D918 */ int event038(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D93C */ int event039(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024D970 */ int event040(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024DA78 */ int event041(mesg_flow_node_event*, fopAc_ac_c*);
-    /* 8024DAA8 */ int event042(mesg_flow_node_event*, fopAc_ac_c*);
+    void init(fopAc_ac_c* i_partner, int i_flowID, int, fopAc_ac_c**);
+    int checkOpenDoor(fopAc_ac_c*, int*);
+    int doFlow(fopAc_ac_c*, fopAc_ac_c**, int i_flow);
+    int checkEventRender(int*, int*, int*, int*);
+    void remove();
+    u16 getEventId(int*);
+    u32 getMsgNo();
+    u32 getNowMsgNo();
+    msg_class* getMsg();
+    void setInitValue(int);
+    void setInitValueGroupChange(int, fopAc_ac_c**);
+    u8* getMsgDataBlock(char const*);
+    u16 getInitNodeIndex(u16);
+    void setNodeIndex(u16, fopAc_ac_c**);
+    int setSelectMsg(mesg_flow_node*, mesg_flow_node*, fopAc_ac_c*);
+    int setNormalMsg(mesg_flow_node*, fopAc_ac_c*);
+    int messageNodeProc(fopAc_ac_c*, fopAc_ac_c**);
+    int branchNodeProc(fopAc_ac_c*, fopAc_ac_c**);
+    int eventNodeProc(fopAc_ac_c*, fopAc_ac_c**);
+    int nodeProc(fopAc_ac_c*, fopAc_ac_c**);
+    int getParam(u16*, u16*, u8*);
+    int getParam(u8*, u8*);
+    int getParam(u8*);
+    u16 query001(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query002(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query003(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query004(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query005(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query006(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query007(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query008(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query009(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query010(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query011(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query012(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query013(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query014(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query015(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query016(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query017(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query018(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query019(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query020(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query021(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query022(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query023(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query024(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query025(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query026(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query027(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query028(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query029(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query030(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query031(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query032(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query033(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query034(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query035(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query036(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query037(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query038(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query039(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query040(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query041(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query042(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query043(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query044(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query045(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query046(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query047(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query048(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query049(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query050(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query051(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query052(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    u16 query053(mesg_flow_node_branch*, fopAc_ac_c*, int);
+    int event000(mesg_flow_node_event*, fopAc_ac_c*);
+    int event001(mesg_flow_node_event*, fopAc_ac_c*);
+    int event002(mesg_flow_node_event*, fopAc_ac_c*);
+    int event003(mesg_flow_node_event*, fopAc_ac_c*);
+    int event004(mesg_flow_node_event*, fopAc_ac_c*);
+    int event005(mesg_flow_node_event*, fopAc_ac_c*);
+    int event006(mesg_flow_node_event*, fopAc_ac_c*);
+    int event007(mesg_flow_node_event*, fopAc_ac_c*);
+    int event008(mesg_flow_node_event*, fopAc_ac_c*);
+    int event009(mesg_flow_node_event*, fopAc_ac_c*);
+    int event010(mesg_flow_node_event*, fopAc_ac_c*);
+    int event011(mesg_flow_node_event*, fopAc_ac_c*);
+    int event012(mesg_flow_node_event*, fopAc_ac_c*);
+    int event013(mesg_flow_node_event*, fopAc_ac_c*);
+    int event014(mesg_flow_node_event*, fopAc_ac_c*);
+    int event015(mesg_flow_node_event*, fopAc_ac_c*);
+    int event016(mesg_flow_node_event*, fopAc_ac_c*);
+    int event017(mesg_flow_node_event*, fopAc_ac_c*);
+    int event018(mesg_flow_node_event*, fopAc_ac_c*);
+    int event019(mesg_flow_node_event*, fopAc_ac_c*);
+    int event020(mesg_flow_node_event*, fopAc_ac_c*);
+    int event021(mesg_flow_node_event*, fopAc_ac_c*);
+    int event022(mesg_flow_node_event*, fopAc_ac_c*);
+    int event023(mesg_flow_node_event*, fopAc_ac_c*);
+    int event024(mesg_flow_node_event*, fopAc_ac_c*);
+    int event025(mesg_flow_node_event*, fopAc_ac_c*);
+    int event026(mesg_flow_node_event*, fopAc_ac_c*);
+    int event027(mesg_flow_node_event*, fopAc_ac_c*);
+    int event028(mesg_flow_node_event*, fopAc_ac_c*);
+    int event029(mesg_flow_node_event*, fopAc_ac_c*);
+    int event030(mesg_flow_node_event*, fopAc_ac_c*);
+    int event031(mesg_flow_node_event*, fopAc_ac_c*);
+    int event032(mesg_flow_node_event*, fopAc_ac_c*);
+    int event033(mesg_flow_node_event*, fopAc_ac_c*);
+    int event034(mesg_flow_node_event*, fopAc_ac_c*);
+    int event035(mesg_flow_node_event*, fopAc_ac_c*);
+    int event036(mesg_flow_node_event*, fopAc_ac_c*);
+    int event037(mesg_flow_node_event*, fopAc_ac_c*);
+    int event038(mesg_flow_node_event*, fopAc_ac_c*);
+    int event039(mesg_flow_node_event*, fopAc_ac_c*);
+    int event040(mesg_flow_node_event*, fopAc_ac_c*);
+    int event041(mesg_flow_node_event*, fopAc_ac_c*);
+    int event042(mesg_flow_node_event*, fopAc_ac_c*);
 
     void initWord(fopAc_ac_c*, const char*, u8, int, fopAc_ac_c**);
 
diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h
index ba1f3c792b..7154d5d284 100644
--- a/include/d/d_msg_object.h
+++ b/include/d/d_msg_object.h
@@ -17,145 +17,145 @@ struct jmessage_tControl;
 
 class dMsgObject_c : public msg_class {
 public:
-    /* 80233284 */ int _create(msg_class*);
-    /* 80233590 */ int _execute();
-    /* 802339BC */ int _draw();
-    /* 80233AE8 */ int _delete();
-    /* 80233D04 */ void setMessageIndex(u32, u32, bool);
-    /* 80233E70 */ void setMessageIndexDemo(u32, bool);
-    /* 80233F84 */ u32 getMessageIndex(u32);
-    /* 80233FD8 */ u32 getRevoMessageIndex(u32);
-    /* 802340D4 */ u32 getMessageIndexAlways(u32);
-    /* 80234128 */ u32 getMessageIDAlways(u32);
-    /* 8023413C */ s16 getMessageGroup(u32);
-    /* 80234150 */ void waitProc();
-    /* 80234318 */ void openProc();
-    /* 802349D8 */ void outnowProc();
-    /* 80234CCC */ void outwaitProc();
-    /* 80234FF0 */ void stopProc();
-    /* 80234FF4 */ void continueProc();
-    /* 8023531C */ void selectProc();
-    /* 8023587C */ void selectEndProc();
-    /* 802358D4 */ void inputProc();
-    /* 80235AD4 */ void finishProc();
-    /* 80235CC0 */ void endProc();
-    /* 80235EBC */ void deleteProc();
-    /* 8023609C */ void textmodeProc();
-    /* 802360A0 */ void talkStartInit();
-    /* 8023670C */ void fukiPosCalc(bool);
-    /* 802368E4 */ void setStatusLocal(u16);
-    /* 802368F8 */ u16 getStatusLocal();
-    /* 8023690C */ void delete_screen(bool);
-    /* 802369D8 */ u8 isSend();
-    /* 80236BF8 */ void readMessageGroupLocal(mDoDvdThd_mountXArchive_c**);
-    /* 80236C90 */ void changeFlowGroupLocal(s32);
-    /* 80236CD4 */ void demoMessageGroupLocal();
-    /* 80236D00 */ void endFlowGroupLocal();
-    /* 80236D0C */ void changeGroupLocal(s16);
-    /* 80236DE4 */ bool getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
+    int _create(msg_class*);
+    int _execute();
+    int _draw();
+    int _delete();
+    void setMessageIndex(u32, u32, bool);
+    void setMessageIndexDemo(u32, bool);
+    u32 getMessageIndex(u32);
+    u32 getRevoMessageIndex(u32);
+    u32 getMessageIndexAlways(u32);
+    u32 getMessageIDAlways(u32);
+    s16 getMessageGroup(u32);
+    void waitProc();
+    void openProc();
+    void outnowProc();
+    void outwaitProc();
+    void stopProc();
+    void continueProc();
+    void selectProc();
+    void selectEndProc();
+    void inputProc();
+    void finishProc();
+    void endProc();
+    void deleteProc();
+    void textmodeProc();
+    void talkStartInit();
+    void fukiPosCalc(bool);
+    void setStatusLocal(u16);
+    u16 getStatusLocal();
+    void delete_screen(bool);
+    u8 isSend();
+    void readMessageGroupLocal(mDoDvdThd_mountXArchive_c**);
+    void changeFlowGroupLocal(s32);
+    void demoMessageGroupLocal();
+    void endFlowGroupLocal();
+    void changeGroupLocal(s16);
+    bool getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
                                        char*, char*, s16*);
-    /* 802370A8 */ u8 isGetItemMessage();
-    /* 802370BC */ bool isKanbanMessage();
-    /* 802370E8 */ bool isHowlMessage();
-    /* 802370FC */ bool isMidonaMessage();
-    /* 80237138 */ bool isMidonaNormalTalkWait();
-    /* 802371B0 */ bool isMidonaTalkWait();
-    /* 802371E4 */ bool isPlaceMessage();
-    /* 802371F8 */ bool isBossMessage();
-    /* 8023720C */ bool isBookMessage();
-    /* 80237214 */ bool isStaffMessage();
-    /* 80237228 */ bool isSaveMessage();
-    /* 8023723C */ bool isTalkMessage();
-    /* 802372CC */ const char* getSmellName();
-    /* 80237334 */ const char* getPortalName();
-    /* 8023738C */ const char* getBombName();
-    /* 8023741C */ const char* getInsectName();
-    /* 80237478 */ const char* getLetterName();
-    /* 802374D0 */ u8 getSelectBombNum();
-    /* 80237520 */ void onMsgSendControlLocal();
-    /* 80237530 */ void offMsgSendControlLocal();
-    /* 80237550 */ int isMsgSendControlLocal();
-    /* 8023755C */ void onMsgSendLocal();
-    /* 8023756C */ void offMsgSendLocal();
-    /* 8023757C */ int isMsgSendLocal();
-    /* 80237588 */ bool isMouthCheckLocal();
-    /* 8023759C */ int getBombBuyPriceLocal(u8);
-    /* 802375E4 */ void addSelectBomBag(u8);
-    /* 80237610 */ void resetSelectBomBag();
-    /* 8023763C */ u8 getSelectBombBagIDLocal();
-    /* 8023768C */ s16 getSelectBombPriceLocal();
-    /* 8023773C */ void setEquipBombInfoLocal();
-    /* 80237748 */ void updateEquipBombInfoLocal();
-    /* 802378B8 */ static void setShopWaitTimer(u8);
-    /* 802378CC */ void setSelectWordFlagLocal(u8);
-    /* 802378D4 */ bool isHowlHearingModeLocal();
-    /* 80237934 */ static bool isCameraCancelFlag();
-    /* 80237950 */ static void onCameraCancelFlag();
-    /* 80237968 */ static void offCameraCancelFlag();
-    /* 80237980 */ static bool isKillMessageFlag();
-    /* 80237994 */ static void onKillMessageFlag();
-    /* 802379AC */ static void setKillMessageFlag();
-    /* 802379D8 */ void setKillMessageFlagLocal();
-    /* 80237A74 */ static void setTalkPartner(fopAc_ac_c*);
-    /* 80237A88 */ static void setNowTalkFlowNo(s16);
-    /* 80237A9C */ static s16 getNowTalkFlowNo();
-    /* 80237AB0 */ static void setDemoMessage(u32);
-    /* 80237AE0 */ static void setTalkHeap(void*);
-    /* 80237B10 */ void setTalkHeapLocal(void*);
-    /* 80237B54 */ static void* getTalkHeap();
-    /* 80237B68 */ bool isDraw();
-    /* 80237BFC */ void setButtonStatusLocal();
-    /* 80237D88 */ void setDemoMessageLocal(u32);
-    /* 80237DD8 */ u16 getSmellTypeMessageIDLocal();
-    /* 80237E04 */ void setSmellTypeLocal(u8);
-    /* 80237E58 */ u8 getSelectCursorPosLocal();
-    /* 80237E68 */ void setSelectCursorPosLocal(u8);
-    /* 80237F10 */ void setTalkActorLocal(fopAc_ac_c*);
-    /* 8023800C */ static void readMessageGroup(mDoDvdThd_mountXArchive_c**);
-    /* 8023803C */ static void changeFlowGroup(s32);
-    /* 8023806C */ static void demoMessageGroup();
-    /* 80238098 */ static void endFlowGroup();
-    /* 802380C4 */ static void changeGroup(s16);
-    /* 802380F4 */ static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
+    u8 isGetItemMessage();
+    bool isKanbanMessage();
+    bool isHowlMessage();
+    bool isMidonaMessage();
+    bool isMidonaNormalTalkWait();
+    bool isMidonaTalkWait();
+    bool isPlaceMessage();
+    bool isBossMessage();
+    bool isBookMessage();
+    bool isStaffMessage();
+    bool isSaveMessage();
+    bool isTalkMessage();
+    const char* getSmellName();
+    const char* getPortalName();
+    const char* getBombName();
+    const char* getInsectName();
+    const char* getLetterName();
+    u8 getSelectBombNum();
+    void onMsgSendControlLocal();
+    void offMsgSendControlLocal();
+    int isMsgSendControlLocal();
+    void onMsgSendLocal();
+    void offMsgSendLocal();
+    int isMsgSendLocal();
+    bool isMouthCheckLocal();
+    int getBombBuyPriceLocal(u8);
+    void addSelectBomBag(u8);
+    void resetSelectBomBag();
+    u8 getSelectBombBagIDLocal();
+    s16 getSelectBombPriceLocal();
+    void setEquipBombInfoLocal();
+    void updateEquipBombInfoLocal();
+    static void setShopWaitTimer(u8);
+    void setSelectWordFlagLocal(u8);
+    bool isHowlHearingModeLocal();
+    static bool isCameraCancelFlag();
+    static void onCameraCancelFlag();
+    static void offCameraCancelFlag();
+    static bool isKillMessageFlag();
+    static void onKillMessageFlag();
+    static void setKillMessageFlag();
+    void setKillMessageFlagLocal();
+    static void setTalkPartner(fopAc_ac_c*);
+    static void setNowTalkFlowNo(s16);
+    static s16 getNowTalkFlowNo();
+    static void setDemoMessage(u32);
+    static void setTalkHeap(void*);
+    void setTalkHeapLocal(void*);
+    static void* getTalkHeap();
+    bool isDraw();
+    void setButtonStatusLocal();
+    void setDemoMessageLocal(u32);
+    u16 getSmellTypeMessageIDLocal();
+    void setSmellTypeLocal(u8);
+    u8 getSelectCursorPosLocal();
+    void setSelectCursorPosLocal(u8);
+    void setTalkActorLocal(fopAc_ac_c*);
+    static void readMessageGroup(mDoDvdThd_mountXArchive_c**);
+    static void changeFlowGroup(s32);
+    static void demoMessageGroup();
+    static void endFlowGroup();
+    static void changeGroup(s16);
+    static bool getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
                                          char*, char*, char*, s16*);
-    /* 80238174 */ static void* getMsgDtPtr();
-    /* 80238188 */ static void setProcessID(fpc_ProcID);
-    /* 8023819C */ static msg_class* getActor();
-    /* 802381C0 */ static fopAc_ac_c* getpTalkActor();
-    /* 802381D4 */ static int getIdx();
-    /* 802381E8 */ static u16 getNodeIdx();
-    /* 802381FC */ static void setStatus(u16);
-    /* 8023822C */ static u16 getStatus();
-    /* 80238258 */ static dMsgScrnBase_c* getScrnDrawPtr();
-    /* 8023826C */ static void setTalkActor(fopAc_ac_c*);
-    /* 8023829C */ static void onMsgSendControl();
-    /* 802382C8 */ static void offMsgSendControl();
-    /* 802382F4 */ static int isMsgSendControl();
-    /* 80238320 */ static void onMsgSend();
-    /* 8023834C */ static void offMsgSend();
-    /* 80238378 */ static int isMsgSend();
-    /* 802383A4 */ static bool isMouthCheck();
-    /* 802383D0 */ static u32 getMessageID();
-    /* 802383E4 */ static u16 getSmellTypeMessageID();
-    /* 80238410 */ static void setSmellType(u8);
-    /* 80238440 */ static u8 getSelectCursorPos();
-    /* 8023846C */ static void setSelectCursorPos(u8);
-    /* 8023849C */ static void setPortalMessageID(u16);
-    /* 802384B0 */ static void setInsectItemNo(u8);
-    /* 802384C4 */ static void setLetterNameID(u16);
-    /* 802384D8 */ static void setArrowNum(u8);
-    /* 802384EC */ static void setMsgOutputType(u8);
-    /* 80238500 */ static u8 getMsgOutputType();
-    /* 80238514 */ static const char* getWord();
-    /* 80238528 */ static const char* getSelectWord(int);
-    /* 80238544 */ static void setSelectWordFlag(u8);
-    /* 80238574 */ static u8 getSelectWordFlag();
-    /* 80238588 */ static bool isHowlHearingMode();
-    /* 802385B4 */ static u8 getSelectBombBagID();
-    /* 802385E0 */ static s16 getSelectBombPrice();
-    /* 8023860C */ static void setEquipBombInfo();
-    /* 80238638 */ static u8 getItemEquipButton();
-    /* 8023864C */ static void setSelectCancelPos(u8);
+    static void* getMsgDtPtr();
+    static void setProcessID(fpc_ProcID);
+    static msg_class* getActor();
+    static fopAc_ac_c* getpTalkActor();
+    static int getIdx();
+    static u16 getNodeIdx();
+    static void setStatus(u16);
+    static u16 getStatus();
+    static dMsgScrnBase_c* getScrnDrawPtr();
+    static void setTalkActor(fopAc_ac_c*);
+    static void onMsgSendControl();
+    static void offMsgSendControl();
+    static int isMsgSendControl();
+    static void onMsgSend();
+    static void offMsgSend();
+    static int isMsgSend();
+    static bool isMouthCheck();
+    static u32 getMessageID();
+    static u16 getSmellTypeMessageID();
+    static void setSmellType(u8);
+    static u8 getSelectCursorPos();
+    static void setSelectCursorPos(u8);
+    static void setPortalMessageID(u16);
+    static void setInsectItemNo(u8);
+    static void setLetterNameID(u16);
+    static void setArrowNum(u8);
+    static void setMsgOutputType(u8);
+    static u8 getMsgOutputType();
+    static const char* getWord();
+    static const char* getSelectWord(int);
+    static void setSelectWordFlag(u8);
+    static u8 getSelectWordFlag();
+    static bool isHowlHearingMode();
+    static u8 getSelectBombBagID();
+    static s16 getSelectBombPrice();
+    static void setEquipBombInfo();
+    static u8 getItemEquipButton();
+    static void setSelectCancelPos(u8);
 
     void setShopWaitTimerLocal(u8 timer) { mShopWaitTimer = timer; }
     void setSelectCancelPosLocal(u8 pos) { mSelectCancelPos = pos; }
@@ -554,8 +554,8 @@ inline void dMsgObject_setInsectItemNo(u8 i_insectItemNo) {
 
 class dMsgObject_HowlHIO_c {
 public:
-    /* 80232AEC */ dMsgObject_HowlHIO_c();
-    /* 80238B94 */ virtual ~dMsgObject_HowlHIO_c() {}
+    dMsgObject_HowlHIO_c();
+    virtual ~dMsgObject_HowlHIO_c() {}
 
     /* 0x04 */ s32 field_0x4;
     /* 0x08 */ JUtility::TColor mHowlLineStartCol;
@@ -606,8 +606,8 @@ public:
 
 class dMsgObject_HIO_c {
 public:
-    /* 80232D6C */ dMsgObject_HIO_c();
-    /* 80238BDC */ virtual ~dMsgObject_HIO_c() {}
+    dMsgObject_HIO_c();
+    virtual ~dMsgObject_HIO_c() {}
 
     /* 0x004 */ s8 field_0x4;
     /* 0x008 */ f32 mBoxMidna_fontSizeX;
diff --git a/include/d/d_msg_out_font.h b/include/d/d_msg_out_font.h
index 9a532f478d..34a1ae5645 100644
--- a/include/d/d_msg_out_font.h
+++ b/include/d/d_msg_out_font.h
@@ -8,11 +8,11 @@ class J2DTextBox;
 
 class COutFontSet_c {
 public:
-    /* 80225BB8 */ COutFontSet_c();
-    /* 80225C3C */ void initialize();
-    /* 80225C70 */ void drawFont(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
+    COutFontSet_c();
+    void initialize();
+    void drawFont(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
 
-    /* 80225BF4 */ virtual ~COutFontSet_c();
+    virtual ~COutFontSet_c();
 
     u8 getType() { return mType; }
     u32 getColor() { return mColor; }
@@ -38,18 +38,18 @@ private:
 
 class COutFont_c {
 public:
-    /* 80225C94 */ COutFont_c(u8);
-    /* 80226CF8 */ void initialize();
-    /* 80228490 */ void setBlendAnime(J2DPicture*, s16);
-    /* 80228530 */ const char* getBtiName(int);
+    COutFont_c(u8);
+    void initialize();
+    void setBlendAnime(J2DPicture*, s16);
+    const char* getBtiName(int);
 
-    /* 80225D60 */ virtual ~COutFont_c();
-    /* 80225E7C */ virtual void setPane(J2DPicture*);
-    /* 80225EA8 */ virtual void createPane();
-    /* 80226DB0 */ virtual void draw(J2DTextBox*, f32, f32, f32);
-    /* 80228448 */ virtual void reset(J2DTextBox*);
-    /* 80226D4C */ virtual void drawFont(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
-    /* 80226DA8 */ virtual void setAlphaRatio(f32);
+    virtual ~COutFont_c();
+    virtual void setPane(J2DPicture*);
+    virtual void createPane();
+    virtual void draw(J2DTextBox*, f32, f32, f32);
+    virtual void reset(J2DTextBox*);
+    virtual void drawFont(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
+    virtual void setAlphaRatio(f32);
 
     void setRupeeColor(u8 color) { mRupeeColor = color; }
 
diff --git a/include/d/d_msg_scrn_3select.h b/include/d/d_msg_scrn_3select.h
index 5ca4ac98dc..aed6fbd03f 100644
--- a/include/d/d_msg_scrn_3select.h
+++ b/include/d/d_msg_scrn_3select.h
@@ -23,32 +23,32 @@ public:
         PROC_MAX_e,
     };
 
-    /* 802390B4 */ dMsgScrn3Select_c();
-    /* 802398CC */ virtual ~dMsgScrn3Select_c();
-    /* 80239C64 */ bool isSelect();
-    /* 80239C78 */ void setString(char*, char*, char*);
-    /* 80239D08 */ void setRubyString(char*, char*, char*);
-    /* 80239D98 */ void translate(f32, f32);
-    /* 80239DD4 */ void draw(f32, f32);
-    /* 8023A094 */ void selAnimeInit(u8, u8, u8, f32, u8);
-    /* 8023A398 */ bool selAnimeMove(u8, u8, bool);
-    /* 8023A680 */ bool selAnimeEnd();
-    /* 8023A934 */ f32 getTextBoxWidth();
-    /* 8023A94C */ f32 getFontSize();
-    /* 8023A95C */ f32 getRubyFontSize();
-    /* 8023A97C */ f32 getCharSpace();
-    /* 8023A98C */ f32 getRubyCharSpace();
-    /* 8023A9AC */ f32 getTextBoxGlobalPosX(int);
-    /* 8023A9D8 */ f32 getTextBoxGlobalPosY(int);
-    /* 8023AA04 */ void open1Proc();
-    /* 8023AAF4 */ void open2Proc();
-    /* 8023AC14 */ void waitProc();
-    /* 8023AC44 */ void selectProc();
-    /* 8023AE68 */ void changeProc();
-    /* 8023B148 */ void closeProc();
-    /* 8023B228 */ void selectScale();
-    /* 8023B4AC */ void selectTrans();
-    /* 8023B870 */ void selectAnimeTransform(int);
+    dMsgScrn3Select_c();
+    virtual ~dMsgScrn3Select_c();
+    bool isSelect();
+    void setString(char*, char*, char*);
+    void setRubyString(char*, char*, char*);
+    void translate(f32, f32);
+    void draw(f32, f32);
+    void selAnimeInit(u8, u8, u8, f32, u8);
+    bool selAnimeMove(u8, u8, bool);
+    bool selAnimeEnd();
+    f32 getTextBoxWidth();
+    f32 getFontSize();
+    f32 getRubyFontSize();
+    f32 getCharSpace();
+    f32 getRubyCharSpace();
+    f32 getTextBoxGlobalPosX(int);
+    f32 getTextBoxGlobalPosY(int);
+    void open1Proc();
+    void open2Proc();
+    void waitProc();
+    void selectProc();
+    void changeProc();
+    void closeProc();
+    void selectScale();
+    void selectTrans();
+    void selectAnimeTransform(int);
 
     void setOffsetX(f32 i_offsetX) { mOffsetX = i_offsetX; }
     bool isAnimeUpdate(int param_0) { return (field_0x114 & (u8)(1 << param_0)) ? TRUE : FALSE; }
diff --git a/include/d/d_msg_scrn_arrow.h b/include/d/d_msg_scrn_arrow.h
index 8121b983c4..9a185d1122 100644
--- a/include/d/d_msg_scrn_arrow.h
+++ b/include/d/d_msg_scrn_arrow.h
@@ -11,14 +11,14 @@ class CPaneMgr;
 
 class dMsgScrnArrow_c {
 public:
-    /* 8023B9B4 */ dMsgScrnArrow_c();
-    /* 8023BC78 */ virtual ~dMsgScrnArrow_c();
-    /* 8023BDC0 */ void draw();
-    /* 8023BDF8 */ void setPos(f32, f32);
-    /* 8023BE34 */ void arwAnimeInit();
-    /* 8023BE90 */ void arwAnimeMove();
-    /* 8023BFC4 */ void dotAnimeInit();
-    /* 8023C010 */ void dotAnimeMove();
+    dMsgScrnArrow_c();
+    virtual ~dMsgScrnArrow_c();
+    void draw();
+    void setPos(f32, f32);
+    void arwAnimeInit();
+    void arwAnimeMove();
+    void dotAnimeInit();
+    void dotAnimeMove();
 
     /* 0x04 */ J2DScreen* mpScreen;
     /* 0x08 */ J2DAnmTransform* mpBck;
diff --git a/include/d/d_msg_scrn_base.h b/include/d/d_msg_scrn_base.h
index f9cc580b8c..c1b9f16166 100644
--- a/include/d/d_msg_scrn_base.h
+++ b/include/d/d_msg_scrn_base.h
@@ -10,33 +10,33 @@ struct CharInfo_c;
 
 class dMsgScrnBase_c : public dDlst_base_c {
 public:
-    /* 8023C0DC */ dMsgScrnBase_c();
-    /* 8023C16C */ void init();
-    /* 8023C32C */ void drawOutFont(f32, f32, f32);
-    /* 8023C360 */ void setString(char*, char*);
-    /* 8023C3EC */ void setRubyString(char*);
-    /* 8023C574 */ bool isTalkNow();
+    dMsgScrnBase_c();
+    void init();
+    void drawOutFont(f32, f32, f32);
+    void setString(char*, char*);
+    void setRubyString(char*);
+    bool isTalkNow();
 
-    /* 8023C274 */ virtual void draw();
-    /* 8023C124 */ virtual ~dMsgScrnBase_c();
-    /* 80238C3C */ virtual void exec() {}
-    /* 8023C234 */ virtual void multiDraw();
-    /* 8023C300 */ virtual void drawSelf();
-    /* 80238C44 */ virtual void setSelectString(char*, char*, char*) {}
-    /* 80238C40 */ virtual void setSelectRubyString(char*, char*, char*) {}
-    /* 80238C58 */ virtual void arwAnimeInit() {}
-    /* 80238C54 */ virtual void arwAnimeMove() {}
-    /* 80238C74 */ virtual void dotAnimeInit() {}
-    /* 80238C70 */ virtual void dotAnimeMove() {}
-    /* 80238C60 */ virtual bool isSelect() { return true; }
-    /* 80238C50 */ virtual void selectAnimeInit(u8, u8, f32, u8) {}
-    /* 80238C48 */ virtual bool selectAnimeMove(u8, u8, bool) { return true; }
-    /* 80238C68 */ virtual bool selectAnimeEnd() { return true; }
-    /* 8023C458 */ virtual void fukiScale(f32);
-    /* 8023C480 */ virtual void fukiTrans(f32, f32);
-    /* 8023C4A4 */ virtual void fukiAlpha(f32);
-    /* 8023C4F4 */ virtual void fontAlpha(f32);
-    /* 80238C5C */ virtual void fukiPosCalc(u8) {}
+    virtual void draw();
+    virtual ~dMsgScrnBase_c();
+    virtual void exec() {}
+    virtual void multiDraw();
+    virtual void drawSelf();
+    virtual void setSelectString(char*, char*, char*) {}
+    virtual void setSelectRubyString(char*, char*, char*) {}
+    virtual void arwAnimeInit() {}
+    virtual void arwAnimeMove() {}
+    virtual void dotAnimeInit() {}
+    virtual void dotAnimeMove() {}
+    virtual bool isSelect() { return true; }
+    virtual void selectAnimeInit(u8, u8, f32, u8) {}
+    virtual bool selectAnimeMove(u8, u8, bool) { return true; }
+    virtual bool selectAnimeEnd() { return true; }
+    virtual void fukiScale(f32);
+    virtual void fukiTrans(f32, f32);
+    virtual void fukiAlpha(f32);
+    virtual void fontAlpha(f32);
+    virtual void fukiPosCalc(u8) {}
 
     f32 getSelTextBoxPosX(int idx) { return mSelTextBoxPosX[idx]; }
     f32 getSelTextBoxPosY(int idx) { return mSelTextBoxPosY[idx]; }
diff --git a/include/d/d_msg_scrn_boss.h b/include/d/d_msg_scrn_boss.h
index 33465f713c..d72c992b39 100644
--- a/include/d/d_msg_scrn_boss.h
+++ b/include/d/d_msg_scrn_boss.h
@@ -5,15 +5,15 @@
 
 class dMsgScrnBoss_c : public dMsgScrnBase_c {
 public:
-    /* 8023C5C8 */ dMsgScrnBoss_c();
+    dMsgScrnBoss_c();
 
-    /* 8023C928 */ virtual ~dMsgScrnBoss_c();
-    /* 8023CA88 */ virtual void exec();
-    /* 8023CB98 */ virtual void drawSelf();
-    /* 8023CC7C */ virtual void fukiScale(f32);
-    /* 8023CC80 */ virtual void fukiTrans(f32, f32);
-    /* 8023CC84 */ virtual void fontAlpha(f32);
-    /* 8023CBF0 */ virtual void fukiAlpha(f32);
+    virtual ~dMsgScrnBoss_c();
+    virtual void exec();
+    virtual void drawSelf();
+    virtual void fukiScale(f32);
+    virtual void fukiTrans(f32, f32);
+    virtual void fontAlpha(f32);
+    virtual void fukiAlpha(f32);
 
 private:
     /* 0xC4 */ CPaneMgr* mpBaseParent;
diff --git a/include/d/d_msg_scrn_explain.h b/include/d/d_msg_scrn_explain.h
index daf1c9391a..5702cd87d6 100644
--- a/include/d/d_msg_scrn_explain.h
+++ b/include/d/d_msg_scrn_explain.h
@@ -11,29 +11,29 @@ class dMsgString_c;
 
 class dMsgScrnExplain_c {
 public:
-    /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
-    /* 8023D7D8 */ void move();
-    /* 8023D918 */ void draw(J2DOrthoGraph*);
-    /* 8023DAD0 */ void wait_init();
-    /* 8023DAD4 */ void wait_proc();
-    /* 8023DAD8 */ void open_request_init();
-    /* 8023DADC */ void open_request_proc();
-    /* 8023DBE4 */ void open_init();
-    /* 8023DC7C */ void open_proc();
-    /* 8023DD90 */ void move_init();
-    /* 8023DDB4 */ void move_proc();
-    /* 8023DE8C */ void move_select_init();
-    /* 8023E0F4 */ void move_select_proc();
-    /* 8023E43C */ void close_init();
-    /* 8023E448 */ void close_proc();
-    /* 8023E558 */ bool openExplain(u32, u8, u8, u8, bool);
-    /* 8023E5CC */ f32 getAlphaRatio();
-    /* 8023E640 */ bool checkTriggerA();
-    /* 8023E654 */ bool checkTriggerB();
+    dMsgScrnExplain_c(STControl*, u8, bool, u8);
+    void move();
+    void draw(J2DOrthoGraph*);
+    void wait_init();
+    void wait_proc();
+    void open_request_init();
+    void open_request_proc();
+    void open_init();
+    void open_proc();
+    void move_init();
+    void move_proc();
+    void move_select_init();
+    void move_select_proc();
+    void close_init();
+    void close_proc();
+    bool openExplain(u32, u8, u8, u8, bool);
+    f32 getAlphaRatio();
+    bool checkTriggerA();
+    bool checkTriggerB();
 
     typedef void (dMsgScrnExplain_c::*ProcFunc)(); 
 
-    /* 8023D538 */ virtual ~dMsgScrnExplain_c();
+    virtual ~dMsgScrnExplain_c();
 
     u8 getStatus() { return mStatus; }
     u8 getSelectCursor() { return mSelCursor; }
diff --git a/include/d/d_msg_scrn_howl.h b/include/d/d_msg_scrn_howl.h
index aafc1dedd7..aa51249e17 100644
--- a/include/d/d_msg_scrn_howl.h
+++ b/include/d/d_msg_scrn_howl.h
@@ -4,43 +4,43 @@
 #include "d/d_msg_scrn_base.h"
 
 struct dMsgScrnHowl_c : public dMsgScrnBase_c {
-    /* 8024096C */ dMsgScrnHowl_c();
-    /* 80241784 */ ~dMsgScrnHowl_c();
-    /* 80241A70 */ void exec();
-    /* 80241C30 */ void drawSelf();
-    /* 80241D58 */ void guide_on_init();
-    /* 80241D5C */ void guide_on_proc();
-    /* 80241DFC */ void guide_off_init();
-    /* 80241E00 */ void guide_off_proc();
-    /* 80241E7C */ void guide_stop_init();
-    /* 80241E80 */ void guide_stop_proc();
-    /* 80241F28 */ void guide_demo_play_init();
-    /* 80241F34 */ void guide_demo_play_proc();
-    /* 8024202C */ void guide_off_test_init();
-    /* 80242030 */ void guide_off_test_proc();
-    /* 80242034 */ void fukiScale(f32);
-    /* 80242038 */ void fukiTrans(f32, f32);
-    /* 8024205C */ void fukiAlpha(f32);
-    /* 80242080 */ bool isKeyCheck();
-    /* 802420D4 */ void resetLine();
-    /* 80242198 */ void drawWave();
-    /* 802427A8 */ void drawGuide();
-    /* 80242FE4 */ void drawGuide2();
-    /* 802435BC */ void drawEffect();
-    /* 80243838 */ void calcMain();
-    /* 8024389C */ void calcWave();
-    /* 80243A50 */ void calcGuide();
-    /* 80243BE0 */ void moveLineV(bool);
-    /* 80243DCC */ void moveBaseLength(bool);
-    /* 80243EEC */ s8 getOnLineNum(int);
-    /* 80243F58 */ s16 addCount(s16);
-    /* 80243F7C */ s16 addCountGuide(s16);
-    /* 80243F94 */ f32 getNowPlotPitch(f32);
-    /* 80244108 */ f32 getPlotPitch(f32);
-    /* 8024414C */ void calcPitchLevel();
-    /* 802441FC */ void initGuideData();
-    /* 80244304 */ u16 getGuideDataSize();
-    /* 8024438C */ u8 getGuideDataType(int);
+    dMsgScrnHowl_c();
+    ~dMsgScrnHowl_c();
+    void exec();
+    void drawSelf();
+    void guide_on_init();
+    void guide_on_proc();
+    void guide_off_init();
+    void guide_off_proc();
+    void guide_stop_init();
+    void guide_stop_proc();
+    void guide_demo_play_init();
+    void guide_demo_play_proc();
+    void guide_off_test_init();
+    void guide_off_test_proc();
+    void fukiScale(f32);
+    void fukiTrans(f32, f32);
+    void fukiAlpha(f32);
+    bool isKeyCheck();
+    void resetLine();
+    void drawWave();
+    void drawGuide();
+    void drawGuide2();
+    void drawEffect();
+    void calcMain();
+    void calcWave();
+    void calcGuide();
+    void moveLineV(bool);
+    void moveBaseLength(bool);
+    s8 getOnLineNum(int);
+    s16 addCount(s16);
+    s16 addCountGuide(s16);
+    f32 getNowPlotPitch(f32);
+    f32 getPlotPitch(f32);
+    void calcPitchLevel();
+    void initGuideData();
+    u16 getGuideDataSize();
+    u8 getGuideDataType(int);
 
     bool isHearingMode() { return field_0x2798 == 3;}
 
diff --git a/include/d/d_msg_scrn_item.h b/include/d/d_msg_scrn_item.h
index 7678672470..70c6ba765c 100644
--- a/include/d/d_msg_scrn_item.h
+++ b/include/d/d_msg_scrn_item.h
@@ -9,28 +9,28 @@ class dMsgScrn3Select_c;
 class dMsgScrnLight_c;
 
 struct dMsgScrnItem_c : public dMsgScrnBase_c {
-    /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*);
-    /* 8023F51C */ ~dMsgScrnItem_c();
-    /* 8023F888 */ void exec();
-    /* 8023FB24 */ void drawSelf();
-    /* 8023FF30 */ void arwAnimeInit();
-    /* 8023FF54 */ void arwAnimeMove();
-    /* 8023FF78 */ void dotAnimeInit();
-    /* 8023FF9C */ void dotAnimeMove();
-    /* 8023FFC0 */ void setSelectString(char*, char*, char*);
-    /* 8023FFE4 */ void setSelectRubyString(char*, char*, char*);
-    /* 80240008 */ bool isSelect();
-    /* 8024002C */ void selectAnimeInit(u8, u8, f32, u8);
-    /* 8024005C */ bool selectAnimeMove(u8, u8, bool);
-    /* 80240080 */ bool selectAnimeEnd();
-    /* 802400A4 */ void fukiScale(f32);
-    /* 802400A8 */ void fukiTrans(f32, f32);
-    /* 802400CC */ void fukiAlpha(f32);
-    /* 80240174 */ void fukiPosCalc(u8);
-    /* 8024074C */ void setBtk0Animation(J2DAnmTextureSRTKey*);
-    /* 802407E8 */ void setBpk0Animation(J2DAnmColor*);
-    /* 80240844 */ void setBpk1Animation(J2DAnmColor*);
-    /* 802408A4 */ bool isOugiID();
+    dMsgScrnItem_c(u8, u8, JKRExpHeap*);
+    ~dMsgScrnItem_c();
+    void exec();
+    void drawSelf();
+    void arwAnimeInit();
+    void arwAnimeMove();
+    void dotAnimeInit();
+    void dotAnimeMove();
+    void setSelectString(char*, char*, char*);
+    void setSelectRubyString(char*, char*, char*);
+    bool isSelect();
+    void selectAnimeInit(u8, u8, f32, u8);
+    bool selectAnimeMove(u8, u8, bool);
+    bool selectAnimeEnd();
+    void fukiScale(f32);
+    void fukiTrans(f32, f32);
+    void fukiAlpha(f32);
+    void fukiPosCalc(u8);
+    void setBtk0Animation(J2DAnmTextureSRTKey*);
+    void setBpk0Animation(J2DAnmColor*);
+    void setBpk1Animation(J2DAnmColor*);
+    bool isOugiID();
 
     /* 0x0C4 */ J2DScreen* mpTxScreen;
     /* 0x0C8 */ J2DPicture* mpItemPane[3];
diff --git a/include/d/d_msg_scrn_jimaku.h b/include/d/d_msg_scrn_jimaku.h
index c262432f30..34bed19794 100644
--- a/include/d/d_msg_scrn_jimaku.h
+++ b/include/d/d_msg_scrn_jimaku.h
@@ -8,14 +8,14 @@ class dMsgScrnLight_c;
 
 class dMsgScrnJimaku_c : public dMsgScrnBase_c {
 public:
-    /* 80244558 */ dMsgScrnJimaku_c(u8, JKRExpHeap*);
-    /* 80244A74 */ virtual ~dMsgScrnJimaku_c();
-    /* 80244C2C */ virtual void exec();
-    /* 80244D34 */ virtual void drawSelf();
-    /* 80244E2C */ virtual void fukiScale(f32);
-    /* 80244D8C */ virtual void fukiAlpha(f32);
-    /* 80244E30 */ virtual void fukiTrans(f32, f32);
-    /* 80244E34 */ virtual void fontAlpha(f32);
+    dMsgScrnJimaku_c(u8, JKRExpHeap*);
+    virtual ~dMsgScrnJimaku_c();
+    virtual void exec();
+    virtual void drawSelf();
+    virtual void fukiScale(f32);
+    virtual void fukiAlpha(f32);
+    virtual void fukiTrans(f32, f32);
+    virtual void fontAlpha(f32);
 
     /* 0xC4 */ dMsgScrnLight_c* mpLight_c;
     /* 0xC8 */ JKRExpHeap* heap;
diff --git a/include/d/d_msg_scrn_kanban.h b/include/d/d_msg_scrn_kanban.h
index c3a892bf8f..bba4ebd734 100644
--- a/include/d/d_msg_scrn_kanban.h
+++ b/include/d/d_msg_scrn_kanban.h
@@ -9,13 +9,13 @@ class J2DAnmTextureSRTKey;
 class CPaneMgr;
 
 struct dMsgScrnKanban_c : public dMsgScrnBase_c {
-    /* 80244E38 */ dMsgScrnKanban_c(JKRExpHeap*);
-    /* 8024534C */ ~dMsgScrnKanban_c();
-    /* 80245528 */ void exec();
-    /* 80245618 */ void draw();
-    /* 802456A0 */ void fukiAlpha(f32);
-    /* 80245754 */ void fukiScale(f32);
-    /* 80245758 */ void fukiTrans(f32, f32);
+    dMsgScrnKanban_c(JKRExpHeap*);
+    ~dMsgScrnKanban_c();
+    void exec();
+    void draw();
+    void fukiAlpha(f32);
+    void fukiScale(f32);
+    void fukiTrans(f32, f32);
 
     /* 0xC4 */ CPaneMgr* mpBack_c;
     /* 0xC8 */ CPaneMgr* mpSpot_c;
diff --git a/include/d/d_msg_scrn_light.h b/include/d/d_msg_scrn_light.h
index 54e988e116..e462c283e8 100644
--- a/include/d/d_msg_scrn_light.h
+++ b/include/d/d_msg_scrn_light.h
@@ -10,13 +10,13 @@ class CPaneMgr;
 
 class dMsgScrnLight_c {
 public:
-    /* 80245934 */ dMsgScrnLight_c(u8, u8);
-    /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8);
-    /* 80245F90 */ void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
+    dMsgScrnLight_c(u8, u8);
+    void draw(f32*, f32, f32, f32, f32, f32, u8);
+    void draw(f32*, f32, f32, f32, f32, f32, f32, JUtility::TColor,
                              JUtility::TColor);
-    /* 802460DC */ void drawCommon(f32, f32, f32, f32, f32);
+    void drawCommon(f32, f32, f32, f32, f32);
 
-    /* 80245B00 */ virtual ~dMsgScrnLight_c();
+    virtual ~dMsgScrnLight_c();
 
     /* 0x04 */ J2DScreen* mpScreen;
     /* 0x08 */ J2DAnmTransform* mpBck;
diff --git a/include/d/d_msg_scrn_place.h b/include/d/d_msg_scrn_place.h
index b9d79f7571..dc8c10bd3f 100644
--- a/include/d/d_msg_scrn_place.h
+++ b/include/d/d_msg_scrn_place.h
@@ -5,15 +5,15 @@
 
 class dMsgScrnPlace_c : public dMsgScrnBase_c {
 public:
-    /* 802463CC */ dMsgScrnPlace_c();
+    dMsgScrnPlace_c();
 
-    /* 802467C4 */ virtual ~dMsgScrnPlace_c();
-    /* 80246924 */ virtual void exec();
-    /* 80246A44 */ virtual void drawSelf();
-    /* 80246A9C */ virtual void fukiAlpha(f32);
-    /* 80246B28 */ virtual void fukiScale(f32);
-    /* 80246B2C */ virtual void fukiTrans(f32, f32);
-    /* 80246B30 */ virtual void fontAlpha(f32);
+    virtual ~dMsgScrnPlace_c();
+    virtual void exec();
+    virtual void drawSelf();
+    virtual void fukiAlpha(f32);
+    virtual void fukiScale(f32);
+    virtual void fukiTrans(f32, f32);
+    virtual void fontAlpha(f32);
 
     /* 0xC4 */ CPaneMgr* mpBaseParent;
     /* 0xC8 */ CPaneMgr* mpFontParent;
diff --git a/include/d/d_msg_scrn_staff.h b/include/d/d_msg_scrn_staff.h
index 5b9ce0b92d..8cdaaad302 100644
--- a/include/d/d_msg_scrn_staff.h
+++ b/include/d/d_msg_scrn_staff.h
@@ -5,15 +5,15 @@
 
 class dMsgScrnStaff_c : public dMsgScrnBase_c {
 public:
-    /* 80246B34 */ dMsgScrnStaff_c(u8);
+    dMsgScrnStaff_c(u8);
 
-    /* 80246DD8 */ virtual ~dMsgScrnStaff_c();
-    /* 80246EE8 */ virtual void exec();
-    /* 80246F68 */ virtual void drawSelf();
-    /* 80246FC0 */ virtual void fukiAlpha(f32);
-    /* 80246FE4 */ virtual void fukiScale(f32);
-    /* 80246FE8 */ virtual void fukiTrans(f32, f32);
-    /* 80246FEC */ virtual void fontAlpha(f32);
+    virtual ~dMsgScrnStaff_c();
+    virtual void exec();
+    virtual void drawSelf();
+    virtual void fukiAlpha(f32);
+    virtual void fukiScale(f32);
+    virtual void fukiTrans(f32, f32);
+    virtual void fontAlpha(f32);
 
     /* 0XC4 */ u8 field_0xc4[0xD0 - 0xC8];
     /* 0xCC */ f32 field_0xcc;
diff --git a/include/d/d_msg_scrn_talk.h b/include/d/d_msg_scrn_talk.h
index 4968a332cc..dc9b1a754b 100644
--- a/include/d/d_msg_scrn_talk.h
+++ b/include/d/d_msg_scrn_talk.h
@@ -9,24 +9,24 @@ class dMsgScrn3Select_c;
 class dMsgScrnLight_c;
 
 struct dMsgScrnTalk_c : public dMsgScrnBase_c {
-    /* 80246FF0 */ dMsgScrnTalk_c(u8, u8, JKRExpHeap*);
-    /* 80247A90 */ ~dMsgScrnTalk_c();
-    /* 80247D34 */ void exec();
-    /* 80247E4C */ void drawSelf();
-    /* 802480F0 */ void arwAnimeInit();
-    /* 80248114 */ void arwAnimeMove();
-    /* 80248138 */ void dotAnimeInit();
-    /* 8024815C */ void dotAnimeMove();
-    /* 80248180 */ void setSelectString(char*, char*, char*);
-    /* 802481AC */ void setSelectRubyString(char*, char*, char*);
-    /* 802481D8 */ bool isSelect();
-    /* 8024820C */ void selectAnimeInit(u8, u8, f32, u8);
-    /* 80248244 */ bool selectAnimeMove(u8, u8, bool);
-    /* 80248278 */ bool selectAnimeEnd();
-    /* 802482AC */ void fukiScale(f32);
-    /* 802482B0 */ void fukiTrans(f32, f32);
-    /* 802482B4 */ void fukiAlpha(f32);
-    /* 8024835C */ void fukiPosCalc(u8);
+    dMsgScrnTalk_c(u8, u8, JKRExpHeap*);
+    ~dMsgScrnTalk_c();
+    void exec();
+    void drawSelf();
+    void arwAnimeInit();
+    void arwAnimeMove();
+    void dotAnimeInit();
+    void dotAnimeMove();
+    void setSelectString(char*, char*, char*);
+    void setSelectRubyString(char*, char*, char*);
+    bool isSelect();
+    void selectAnimeInit(u8, u8, f32, u8);
+    bool selectAnimeMove(u8, u8, bool);
+    bool selectAnimeEnd();
+    void fukiScale(f32);
+    void fukiTrans(f32, f32);
+    void fukiAlpha(f32);
+    void fukiPosCalc(u8);
 
     /* 0x0C4 */ J2DScreen* mpTxScreen;
     /* 0x0C8 */ dMsgScrnArrow_c* mpArrow_c;
diff --git a/include/d/d_msg_scrn_tree.h b/include/d/d_msg_scrn_tree.h
index 3048b76d33..f30f8a6193 100644
--- a/include/d/d_msg_scrn_tree.h
+++ b/include/d/d_msg_scrn_tree.h
@@ -7,13 +7,13 @@ class JUTFont;
 class JKRExpHeap;
 
 struct dMsgScrnTree_c : public dMsgScrnBase_c {
-    /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*);
-    /* 80248F14 */ virtual ~dMsgScrnTree_c();
-    /* 80249118 */ void exec();
-    /* 80249270 */ void draw();
-    /* 802492F8 */ void fukiAlpha(f32);
-    /* 802493AC */ void fukiScale(f32);
-    /* 802493B0 */ void fukiTrans(f32, f32);
+    dMsgScrnTree_c(JUTFont*, JKRExpHeap*);
+    virtual ~dMsgScrnTree_c();
+    void exec();
+    void draw();
+    void fukiAlpha(f32);
+    void fukiScale(f32);
+    void fukiTrans(f32, f32);
 
     /* 0xC4 */ CPaneMgr* field_0xc4;
     /* 0xC8 */ CPaneMgr* field_0xc8;
diff --git a/include/d/d_msg_string.h b/include/d/d_msg_string.h
index 3fb5d4da33..45a148b401 100644
--- a/include/d/d_msg_string.h
+++ b/include/d/d_msg_string.h
@@ -8,11 +8,11 @@ class JUTFont;
 
 class dMsgString_c : public dMsgStringBase_c {
 public:
-    /* 80249C20 */ dMsgString_c();
-    /* 80249CA0 */ dMsgString_c(u8);
-    /* 80249D28 */ ~dMsgString_c();
+    dMsgString_c();
+    dMsgString_c(u8);
+    ~dMsgString_c();
 
-    /* 80191B6C */ virtual f32 getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
+    virtual f32 getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
                                          JUTFont* param_3, COutFont_c* param_4, u8 param_5) {
         if (param_4 == NULL && mpOutFont != NULL) {
             return getStringLocal(param_0, param_1, param_2, param_3, mpOutFont, param_5);
@@ -20,7 +20,7 @@ public:
             return getStringLocal(param_0, param_1, param_2, param_3, param_4, param_5);
         }
     }
-    /* 801E1D10 */ virtual f32 getStringPage(u32 param_1, u8 param_2, u8 param_3,
+    virtual f32 getStringPage(u32 param_1, u8 param_2, u8 param_3,
                                              J2DTextBox* param_4, J2DTextBox* param_5,
                                              JUTFont* param_6, COutFont_c* param_7, u8 param_8) {
         if (param_7 == NULL && mpOutFont != NULL) {
@@ -31,9 +31,9 @@ public:
                                       param_8);
         }
     }
-    /* 80249DB4 */ virtual void resetStringLocal(J2DTextBox*);
-    /* 80249DE4 */ virtual void drawOutFontLocal(J2DTextBox*, f32);
-    /* 80249ED0 */ virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
+    virtual void resetStringLocal(J2DTextBox*);
+    virtual void drawOutFontLocal(J2DTextBox*, f32);
+    virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
 
     void drawOutFont(J2DTextBox* param_0, f32 param_1) {
         drawOutFontLocal(param_0, param_1);
diff --git a/include/d/d_msg_string_base.h b/include/d/d_msg_string_base.h
index da2787f493..6f3a751b22 100644
--- a/include/d/d_msg_string_base.h
+++ b/include/d/d_msg_string_base.h
@@ -13,22 +13,22 @@ struct jmessage_string_tRenderingProcessor;
 
 class dMsgStringBase_c {
 public:
-    /* 802493B4 */ dMsgStringBase_c();
-    /* 80249528 */ ~dMsgStringBase_c();
-    /* 80249700 */ void getResource();
-    /* 80249768 */ f32 getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
-    /* 802498D8 */ f32 getStringPageLocal(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*,
+    dMsgStringBase_c();
+    ~dMsgStringBase_c();
+    void getResource();
+    f32 getStringLocal(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
+    f32 getStringPageLocal(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*,
                                            COutFont_c*, u8);
-    /* 80249A48 */ u8 getPageMax(int);
-    /* 80249A70 */ f32 getMessageLocal(u32, char*);
+    u8 getPageMax(int);
+    f32 getMessageLocal(u32, char*);
 
-    /* 80249BB0 */ virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
-    /* 80249BD0 */ virtual f32 getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
+    virtual f32 getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8);
+    virtual f32 getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*,
                                       u8);
-    /* 80249BF8 */ virtual f32 getMessage(u32, char*);
-    /* 80249C18 */ virtual void resetStringLocal(J2DTextBox*);
-    /* 80249C1C */ virtual void drawOutFontLocal(J2DTextBox*, f32);
-    /* 80249BAC */ virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
+    virtual f32 getMessage(u32, char*);
+    virtual void resetStringLocal(J2DTextBox*);
+    virtual void drawOutFontLocal(J2DTextBox*, f32);
+    virtual void drawFontLocal(J2DTextBox*, u8, f32, f32, f32, f32, u32, u8);
 
 private:
     /* 0x04 */ JMessage::TResourceContainer* mpResCont;
diff --git a/include/d/d_msg_unit.h b/include/d/d_msg_unit.h
index 67e50b3439..400df98f25 100644
--- a/include/d/d_msg_unit.h
+++ b/include/d/d_msg_unit.h
@@ -5,10 +5,10 @@
 
 class dMsgUnit_c {
 public:
-    /* 80238C94 */ dMsgUnit_c();
-    /* 80238CEC */ void setTag(int, int, char*, bool);
+    dMsgUnit_c();
+    void setTag(int, int, char*, bool);
 
-    /* 80238CA4 */ virtual ~dMsgUnit_c();
+    virtual ~dMsgUnit_c();
 };
 
 extern dMsgUnit_c g_msg_unit;
diff --git a/include/d/d_name.h b/include/d/d_name.h
index a062965f55..16ff3414f6 100644
--- a/include/d/d_name.h
+++ b/include/d/d_name.h
@@ -13,8 +13,8 @@ class STControl;
 
 class dNm_HIO_c {
 public:
-    /* 8024E3E0 */ dNm_HIO_c();
-    /* 802511A4 */ virtual ~dNm_HIO_c() {}
+    dNm_HIO_c();
+    virtual ~dNm_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mMenuScale;
@@ -26,8 +26,8 @@ class dDlst_NameIN_c : public dDlst_base_c {
 public:
     dDlst_NameIN_c() {}
 
-    /* 80251094 */ virtual void draw();
-    /* 8025115C */ virtual ~dDlst_NameIN_c() {}
+    virtual void draw();
+    virtual ~dDlst_NameIN_c() {}
 
     /* 0x04 */ J2DScreen* NameInScr;
     /* 0x08 */ JUTFont* font;
@@ -71,51 +71,51 @@ public:
         MENU_END,
     };
 
-    /* 8024E408 */ dName_c(J2DPane*);
-    /* 8024E62C */ void _create();
-    /* 8024E6D4 */ void init();
-    /* 8024E7A4 */ void initial();
-    /* 8024E7EC */ void showIcon();
-    /* 8024E9A0 */ void _move();
-    /* 8024EC10 */ int nameCheck();
-    /* 8024EC4C */ void playNameSet(int);
-    /* 8024EC84 */ void cursorAnm();
-    /* 8024ED48 */ void Wait();
-    /* 8024ED4C */ void MojiSelect();
-    /* 8024F034 */ void MojiSelectAnmInit();
-    /* 8024F0E0 */ void MojiSelectAnm();
-    /* 8024F164 */ void MojiSelectAnm2();
-    /* 8024F1E8 */ void MojiSelectAnm3();
-    /* 8024F1EC */ int mojiChange(u8);
-    /* 8024F55C */ void selectMojiSet();
+    dName_c(J2DPane*);
+    void _create();
+    void init();
+    void initial();
+    void showIcon();
+    void _move();
+    int nameCheck();
+    void playNameSet(int);
+    void cursorAnm();
+    void Wait();
+    void MojiSelect();
+    void MojiSelectAnmInit();
+    void MojiSelectAnm();
+    void MojiSelectAnm2();
+    void MojiSelectAnm3();
+    int mojiChange(u8);
+    void selectMojiSet();
     #if REGION_JPN
     int checkDakuon(int, u8);
     int setDakuon(int, u8);
     #endif
-    /* 8024F59C */ int getMoji();
-    /* 8024F634 */ void setMoji(int);
-    /* 8024F88C */ void setNameText();
-    /* 8024F914 */ void nameCursorMove();
-    /* 8024F994 */ void selectCursorMove();
-    /* 8024FAF4 */ void menuCursorPosSet();
-    /* 8024FB08 */ void MenuSelect();
-    /* 8024FDA0 */ void MenuSelectAnmInit();
-    /* 8024FDF4 */ void MenuSelectAnm();
-    /* 8024FEB4 */ void MenuSelectAnm2();
-    /* 8024FFA0 */ void MenuSelectAnm3();
-    /* 8024FFA4 */ void menuAbtnSelect();
-    /* 80250074 */ void backSpace();
-    /* 802501B0 */ void mojiListChange();
-    /* 80250284 */ void menuCursorMove();
-    /* 80250380 */ void menuCursorMove2();
-    /* 802504A0 */ void selectCursorPosSet(int);
-    /* 80250560 */ void _draw();
-    /* 802505CC */ void screenSet();
-    /* 80250CEC */ void displayInit();
-    /* 80250E54 */ void NameStrSet();
-    /* 80251048 */ s32 getMenuPosIdx(u8);
+    int getMoji();
+    void setMoji(int);
+    void setNameText();
+    void nameCursorMove();
+    void selectCursorMove();
+    void menuCursorPosSet();
+    void MenuSelect();
+    void MenuSelectAnmInit();
+    void MenuSelectAnm();
+    void MenuSelectAnm2();
+    void MenuSelectAnm3();
+    void menuAbtnSelect();
+    void backSpace();
+    void mojiListChange();
+    void menuCursorMove();
+    void menuCursorMove2();
+    void selectCursorPosSet(int);
+    void _draw();
+    void screenSet();
+    void displayInit();
+    void NameStrSet();
+    s32 getMenuPosIdx(u8);
 
-    /* 8024E468 */ virtual ~dName_c();
+    virtual ~dName_c();
 
     u8 getCurPos() { return mCurPos; }
     u8 isInputEnd() { return mIsInputEnd; }
diff --git a/include/d/d_npc_lib.h b/include/d/d_npc_lib.h
index bb79f3b182..39f60557c4 100644
--- a/include/d/d_npc_lib.h
+++ b/include/d/d_npc_lib.h
@@ -5,14 +5,14 @@
 
 class dNpcLib_lookat_c {
 public:
-    /* 80251314 */ dNpcLib_lookat_c();
-    /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*);
-    /* 80251534 */ void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int);
-    /* 80251B60 */ void dbView();
-    /* 80251B64 */ void setPrm();
-    /* 80251EF8 */ void update();
-    /* 80252018 */ int limitter(s16*, s16, s16, s16);
-    /* 80252094 */ virtual ~dNpcLib_lookat_c() {}
+    dNpcLib_lookat_c();
+    void init(J3DModel*, int*, csXyz*, csXyz*);
+    void action(cXyz, cXyz, fopAc_ac_c*, f32 (*)[4], int);
+    void dbView();
+    void setPrm();
+    void update();
+    int limitter(s16*, s16, s16, s16);
+    virtual ~dNpcLib_lookat_c() {}
 
     /* 0x04 */ cXyz field_0x04[4];
     /* 0x34 */ csXyz field_0x34[4];
diff --git a/include/d/d_ovlp_fade2.h b/include/d/d_ovlp_fade2.h
index 116c636839..d79f111a77 100644
--- a/include/d/d_ovlp_fade2.h
+++ b/include/d/d_ovlp_fade2.h
@@ -6,8 +6,8 @@
 
 class dOvlpFd2_dlst_c : public dDlst_base_c {
 public:
-    /* 8025247C */ virtual void draw();
-    /* 80252E8C */ virtual ~dOvlpFd2_dlst_c() {}
+    virtual void draw();
+    virtual ~dOvlpFd2_dlst_c() {}
 
     MtxP getMtx() { return mMtx; }
     void entry() { dComIfGd_set2DXlu(this); }
@@ -17,11 +17,11 @@ public:
 
 class dOvlpFd2_c : public overlap_task_class {
 public:
-    /* 80252990 */ dOvlpFd2_c();
-    /* 802529F4 */ void execFirstSnap();
-    /* 80252A78 */ void execFadeOut();
-    /* 80252BC0 */ void execNextSnap();
-    /* 80252C68 */ void execFadeIn();
+    dOvlpFd2_c();
+    void execFirstSnap();
+    void execFadeOut();
+    void execNextSnap();
+    void execFadeIn();
 
     inline void draw();
     inline void execute();
diff --git a/include/d/d_ovlp_fade3.h b/include/d/d_ovlp_fade3.h
index b17be0fe3a..856c72d327 100644
--- a/include/d/d_ovlp_fade3.h
+++ b/include/d/d_ovlp_fade3.h
@@ -6,8 +6,8 @@
 
 class dOvlpFd3_dlst_c : public dDlst_base_c {
 public:
-    /* 80252F28 */ virtual void draw();
-    /* 802538E8 */ virtual ~dOvlpFd3_dlst_c() {}
+    virtual void draw();
+    virtual ~dOvlpFd3_dlst_c() {}
 
     MtxP getMtx() { return mMtx; }
     void entry() { dComIfGd_set2DXlu(this); }
@@ -17,11 +17,11 @@ public:
 
 class dOvlpFd3_c : public overlap_task_class {
 public:
-    /* 8025343C */ dOvlpFd3_c();
-    /* 80253518 */ void execFirstSnap();
-    /* 802535AC */ void execFadeOut();
-    /* 8025368C */ void execNextSnap();
-    /* 80253730 */ void execFadeIn();
+    dOvlpFd3_c();
+    void execFirstSnap();
+    void execFadeOut();
+    void execNextSnap();
+    void execFadeIn();
 
     inline void draw();
     inline void execute();
diff --git a/include/d/d_pane_class.h b/include/d/d_pane_class.h
index c359ed72f3..7b71458443 100644
--- a/include/d/d_pane_class.h
+++ b/include/d/d_pane_class.h
@@ -12,26 +12,26 @@ bool dPaneClass_setPriority(void**, JKRHeap*, J2DScreen*, char const*, u32, JKRA
 
 class CPaneMgr : public CPaneMgrAlpha {
 public:
-    /* 80253A18 */ virtual ~CPaneMgr();
-    /* 80253AB4 */ virtual void setAlpha(u8);
+    virtual ~CPaneMgr();
+    virtual void setAlpha(u8);
 
-    /* 80253984 */ CPaneMgr(J2DScreen* i_scrn, u64 i_tag, u8 i_flags, JKRExpHeap* i_heap);
-    /* 80253930 */ CPaneMgr();
-    /* 80253B2C */ void reinit();
-    /* 80253C08 */ void initiate(J2DPane*, JKRExpHeap*);
-    /* 80254018 */ void childPaneGetSize(J2DPane*);
-    /* 80254134 */ void childPaneSetSize(J2DPane*, f32, f32);
-    /* 802542E8 */ f32 getGlobalPosX();
-    /* 80254364 */ f32 getGlobalPosY();
-    /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
-    /* 802545B0 */ void paneTrans(f32, f32);
-    /* 80254638 */ void paneScale(f32, f32);
-    /* 802547CC */ bool scaleAnime(s16, f32, f32, u8);
-    /* 802548BC */ bool colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
+    CPaneMgr(J2DScreen* i_scrn, u64 i_tag, u8 i_flags, JKRExpHeap* i_heap);
+    CPaneMgr();
+    void reinit();
+    void initiate(J2DPane*, JKRExpHeap*);
+    void childPaneGetSize(J2DPane*);
+    void childPaneSetSize(J2DPane*, f32, f32);
+    f32 getGlobalPosX();
+    f32 getGlobalPosY();
+    void setBlackWhite(JUtility::TColor, JUtility::TColor);
+    void paneTrans(f32, f32);
+    void paneScale(f32, f32);
+    bool scaleAnime(s16, f32, f32, u8);
+    bool colorAnime(s16, JUtility::TColor, JUtility::TColor, JUtility::TColor,
                                    JUtility::TColor, u8);
-    /* 80254C90 */ Vec getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
-    /* 80254EBC */ Vec getGlobalVtxCenter(J2DPane*, bool, s16);
-    /* 80254FB8 */ JGeometry::TBox2<f32>* getBounds(J2DPane*);
+    Vec getGlobalVtx(J2DPane*, f32 (*)[3][4], u8, bool, s16);
+    Vec getGlobalVtxCenter(J2DPane*, bool, s16);
+    JGeometry::TBox2<f32>* getBounds(J2DPane*);
 
     Vec getGlobalVtx(Mtx* param_0, u8 param_1, bool param_2, s16 param_3) {
         return getGlobalVtx(getPanePtr(), param_0, param_1, param_2, param_3);
diff --git a/include/d/d_pane_class_alpha.h b/include/d/d_pane_class_alpha.h
index e2f8a8d042..82590e5f02 100644
--- a/include/d/d_pane_class_alpha.h
+++ b/include/d/d_pane_class_alpha.h
@@ -9,23 +9,23 @@ class JKRExpHeap;
 
 class CPaneMgrAlpha {
 public:
-    /* 8025546C */ virtual ~CPaneMgrAlpha();
-    /* 80255758 */ virtual void setAlpha(u8);
+    virtual ~CPaneMgrAlpha();
+    virtual void setAlpha(u8);
 
-    /* 802553EC */ CPaneMgrAlpha();
-    /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
-    /* 802554E0 */ void initiateAlpha(J2DPane*, JKRExpHeap*);
-    /* 802555C8 */ void show();
-    /* 80255608 */ void hide();
-    /* 8025564C */ bool isVisible();
-    /* 80255658 */ f32 rateCalc(s16, s16, u8);
-    /* 802557D0 */ void setAlphaRate(f32);
-    /* 80255828 */ f32 getAlphaRate();
-    /* 80255878 */ bool alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType);
-    /* 80255964 */ bool alphaAnimeLoop(s16, u8, u8, u8);
-    /* 80255A60 */ void childPaneCount(J2DPane*);
-    /* 80255ACC */ void childPaneGetAlpha(J2DPane*);
-    /* 80255B5C */ void childPaneSetAlpha(J2DPane*, u8);
+    CPaneMgrAlpha();
+    CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
+    void initiateAlpha(J2DPane*, JKRExpHeap*);
+    void show();
+    void hide();
+    bool isVisible();
+    f32 rateCalc(s16, s16, u8);
+    void setAlphaRate(f32);
+    f32 getAlphaRate();
+    bool alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType);
+    bool alphaAnimeLoop(s16, u8, u8, u8);
+    void childPaneCount(J2DPane*);
+    void childPaneGetAlpha(J2DPane*);
+    void childPaneSetAlpha(J2DPane*, u8);
 
     J2DPane* getPanePtr() { return mPane; }
     u8 getAlpha() { return getPanePtr()->getAlpha(); }
@@ -45,14 +45,14 @@ public:
 
 class CPaneMgrAlphaMorf : public CPaneMgrAlpha {
 public:
-    /* 80255C68 */ CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*);
-    /* 80255D48 */ void initiateAlphaMorf();
-    /* 80255DD0 */ void setBackupAlpha();
-    /* 80255E28 */ void setAlphaMorfRate(f32);
-    /* 80255E98 */ void childPaneBackupAlpha(J2DPane*);
-    /* 80255F28 */ void childPaneSetAlphaMorf(J2DPane*, f32);
+    CPaneMgrAlphaMorf(J2DScreen*, u64, u8, JKRExpHeap*);
+    void initiateAlphaMorf();
+    void setBackupAlpha();
+    void setAlphaMorfRate(f32);
+    void childPaneBackupAlpha(J2DPane*);
+    void childPaneSetAlphaMorf(J2DPane*, f32);
 
-    /* 80255CAC */ virtual ~CPaneMgrAlphaMorf();
+    virtual ~CPaneMgrAlphaMorf();
 
 private:
     /* 0x1C */ void* mpFirstSaveAlpha;
diff --git a/include/d/d_particle.h b/include/d/d_particle.h
index b371e48a5a..a9b4af7e6c 100644
--- a/include/d/d_particle.h
+++ b/include/d/d_particle.h
@@ -19,9 +19,9 @@ class fopAc_ac_c;
 
 class dPa_levelEcallBack : public JPAEmitterCallBack {
 public:
-    /* 8004FB18 */ virtual ~dPa_levelEcallBack() { cleanup(); }
+    virtual ~dPa_levelEcallBack() { cleanup(); }
     virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) = 0;
-    /* 8004FB8C */ virtual void cleanup() {}
+    virtual void cleanup() {}
 };
 
 class mDoDvdThd_toMainRam_c;
@@ -33,15 +33,15 @@ class dPa_simpleData_c;
 
 class dPa_simpleEcallBack : public JPAEmitterCallBack {
 public:
-    /* 8004ADF4 */ dPa_simpleEcallBack();
-    /* 8004AF98 */ JPABaseEmitter* create(JPAEmitterManager*, u16, u8);
-    /* 8004B064 */ JPABaseEmitter* createEmitter(JPAEmitterManager*);
-    /* 8004B168 */ u32 set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&,
+    dPa_simpleEcallBack();
+    JPABaseEmitter* create(JPAEmitterManager*, u16, u8);
+    JPABaseEmitter* createEmitter(JPAEmitterManager*);
+    u32 set(cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&,
                             int, f32);
 
-    /* 8004FC08 */ virtual ~dPa_simpleEcallBack() {}
-    /* 8004AE1C */ virtual void executeAfter(JPABaseEmitter*);
-    /* 8004AF94 */ virtual void draw(JPABaseEmitter*);
+    virtual ~dPa_simpleEcallBack() {}
+    virtual void executeAfter(JPABaseEmitter*);
+    virtual void draw(JPABaseEmitter*);
 
     void removeEmitter() { mEmitter = NULL; }
     u16 getID() const { return mID; }
@@ -56,24 +56,24 @@ public:
 
 class dPa_windPcallBack : public JPAParticleCallBack {
 public:
-    /* 8004FF2C */ virtual ~dPa_windPcallBack() {}
-    /* 8004B4E0 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_windPcallBack() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_modelPcallBack : public JPAParticleCallBack {
 public:
-    /* 80050038 */ virtual ~dPa_modelPcallBack() {}
-    /* 8004A460 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_modelPcallBack() {}
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_modelEcallBack : public dPa_levelEcallBack {
 public:
     struct model_c {
-        /* 8004A608 */ bool set(J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, u8);
-        /* 8004A7AC */ void setup();
-        /* 8004A88C */ void cleanup();
-        /* 8004A8DC */ void draw(f32 (*)[4]);
-        /* 8004FB90 */ model_c() { field_0x0 = NULL; }
+        bool set(J3DModelData*, dKy_tevstr_c const&, u8, void*, u8, u8);
+        void setup();
+        void cleanup();
+        void draw(f32 (*)[4]);
+        model_c() { field_0x0 = NULL; }
 
         void reset() {
             field_0x0 = NULL;
@@ -93,20 +93,20 @@ public:
 
     dPa_modelEcallBack() { mModel = NULL; }
 
-    /* 8004AB1C */ static void create(u8);
-    /* 8004ABC4 */ static void remove();
-    /* 8004AC00 */ static int setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8,
+    static void create(u8);
+    static void remove();
+    static int setModel(JPABaseEmitter*, J3DModelData*, dKy_tevstr_c const&, u8,
                                         void*, u8, u8);
-    /* 8004AC90 */ static void resetModel(JPABaseEmitter*);
-    /* 8004ACC0 */ static void setupModel(JPABaseEmitter*);
-    /* 8004ACEC */ static void drawModel(JPABaseEmitter*, f32 (*)[4]);
-    /* 8004AD28 */ static void cleanupModel(JPABaseEmitter*);
-    /* 8004AD58 */ static model_c* getModel(JPABaseEmitter*);
-    /* 8004AD90 */ static u8 getRotAxis(JPABaseEmitter*);
+    static void resetModel(JPABaseEmitter*);
+    static void setupModel(JPABaseEmitter*);
+    static void drawModel(JPABaseEmitter*, f32 (*)[4]);
+    static void cleanupModel(JPABaseEmitter*);
+    static model_c* getModel(JPABaseEmitter*);
+    static u8 getRotAxis(JPABaseEmitter*);
 
-    /* 8004AA34 */ virtual void draw(JPABaseEmitter*);
-    /* 80050014 */ virtual void drawAfter(JPABaseEmitter* param_0) { cleanupModel(param_0); }
-    /* 8004AAA8 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual void draw(JPABaseEmitter*);
+    virtual void drawAfter(JPABaseEmitter* param_0) { cleanupModel(param_0); }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 
     static void setModel(JPABaseEmitter* param_0, J3DModelData* param_1,
                          const dKy_tevstr_c& param_2, u8 param_3, J3DAnmTexPattern* param_4,
@@ -125,23 +125,23 @@ class dPa_selectTexEcallBack : public dPa_levelEcallBack {
 public:
     dPa_selectTexEcallBack(u8 param_0) { field_0x4 = param_0; }
 
-    /* 8004FF8C */ virtual ~dPa_selectTexEcallBack() {}
-    /* 8004ADC4 */ virtual void draw(JPABaseEmitter*);
-    /* 80050010 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
+    virtual ~dPa_selectTexEcallBack() {}
+    virtual void draw(JPABaseEmitter*);
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
 
     /* 0x4 */ u8 field_0x4;
 };
 
 class dPa_followEcallBack : public dPa_levelEcallBack {
 public:
-    /* 80049580 */ dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0);
+    dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0);
 
-    /* 80050200 */ virtual ~dPa_followEcallBack() {}
-    /* 800495BC */ virtual void execute(JPABaseEmitter*);
-    /* 800496B0 */ virtual void draw(JPABaseEmitter*);
-    /* 800496B4 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
-    /* 80050284 */ virtual void cleanup() { end(); }
-    /* 8004974C */ virtual void end();
+    virtual ~dPa_followEcallBack() {}
+    virtual void execute(JPABaseEmitter*);
+    virtual void draw(JPABaseEmitter*);
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual void cleanup() { end(); }
+    virtual void end();
 
     void remove() { end(); }
     JPABaseEmitter* getEmitter() { return mpEmitter; }
@@ -160,76 +160,76 @@ public:
 
 class dPa_fsenthPcallBack : public JPAParticleCallBack {
 public:
-    /* 8004FE6C */ virtual ~dPa_fsenthPcallBack() {}
-    /* 8004DCA0 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 8004DD0C */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_fsenthPcallBack() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_light8EcallBack : public dPa_levelEcallBack {
 public:
-    /* 8005015C */ virtual ~dPa_light8EcallBack() {}
-    /* 8004A340 */ virtual void draw(JPABaseEmitter*);
-    /* 800501E0 */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
-    /* 8004979C */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual ~dPa_light8EcallBack() {}
+    virtual void draw(JPABaseEmitter*);
+    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
 class dPa_gen_b_light8EcallBack : public dPa_levelEcallBack {
 public:
-    /* 800500B8 */ virtual ~dPa_gen_b_light8EcallBack() {}
-    /* 8004A364 */ virtual void draw(JPABaseEmitter*);
-    /* 8005013C */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
-    /* 800497B0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual ~dPa_gen_b_light8EcallBack() {}
+    virtual void draw(JPABaseEmitter*);
+    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
 class dPa_gen_d_light8EcallBack : public dPa_levelEcallBack {
 public:
-    /* 8004A388 */ virtual void draw(JPABaseEmitter*);
-    /* 80050098 */ virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
-    /* 800497CC */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual void draw(JPABaseEmitter*);
+    virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 };
 
 class dPa_light8PcallBack : public JPAParticleCallBack {
 public:
-    /* 8004FE0C */ virtual ~dPa_light8PcallBack() {}
-    /* 8004DD10 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 8004DD1C */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_light8PcallBack() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_gen_b_light8PcallBack : public JPAParticleCallBack {
 public:
-    /* 8004FDAC */ virtual ~dPa_gen_b_light8PcallBack() {}
-    /* 8004DD14 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 8004E6A8 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_gen_b_light8PcallBack() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_gen_d_light8PcallBack : public JPAParticleCallBack {
 public:
-    /* 8004FD4C */ virtual ~dPa_gen_d_light8PcallBack() {}
-    /* 8004DD18 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
-    /* 8004ED44 */ virtual void draw(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_gen_d_light8PcallBack() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual void draw(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_wbPcallBack_c : public JPAParticleCallBack {
 public:
-    /* 8004FECC */ virtual ~dPa_wbPcallBack_c() {}
-    /* 8004DC28 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_wbPcallBack_c() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_particleTracePcallBack_c : public JPAParticleCallBack {
 public:
-    /* 8004FC68 */ virtual ~dPa_particleTracePcallBack_c() {}
-    /* 8004FAD4 */ virtual void execute(JPABaseEmitter*, JPABaseParticle*);
+    virtual ~dPa_particleTracePcallBack_c() {}
+    virtual void execute(JPABaseEmitter*, JPABaseParticle*);
 };
 
 class dPa_hermiteEcallBack_c : public dPa_levelEcallBack {
 public:
     dPa_hermiteEcallBack_c() {}
 
-    /* 8004F6B8 */ void setOldPosP(cXyz const*, cXyz const*);
+    void setOldPosP(cXyz const*, cXyz const*);
 
-    /* 8004FCC8 */ virtual ~dPa_hermiteEcallBack_c() {}
-    /* 8004F6C4 */ virtual void executeAfter(JPABaseEmitter*);
-    /* 8004FABC */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
+    virtual ~dPa_hermiteEcallBack_c() {}
+    virtual void executeAfter(JPABaseEmitter*);
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8);
 
     void setRate(f32 rate) { mRate = rate; }
 
@@ -245,17 +245,17 @@ class dPa_setColorEcallBack : public dPa_levelEcallBack {
 public:
     dPa_setColorEcallBack(const GXColor& color) { mColor = color; }
 
-    /* 800502E4 */ virtual ~dPa_setColorEcallBack() {}
-    /* 800502B0 */ virtual void draw(JPABaseEmitter*) { GXSetTevColor(GX_TEVREG1, mColor); }
-    /* 800502E0 */ virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
+    virtual ~dPa_setColorEcallBack() {}
+    virtual void draw(JPABaseEmitter*) { GXSetTevColor(GX_TEVREG1, mColor); }
+    virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {}
 
     /* 0x4 */ GXColor mColor;
 };
 
 class dPa_simpleData_c {
 public:
-    /* 8004B024 */ ~dPa_simpleData_c();
-    /* 8004B060 */ dPa_simpleData_c();
+    ~dPa_simpleData_c();
+    dPa_simpleData_c();
 
     cXyz field_0x00;
     GXColor field_0x0c;
@@ -268,10 +268,10 @@ public:
     public:
         class emitter_c {
         public:
-            /* 8004B504 */ void onActive();
-            /* 8004B544 */ void entry(u32, u16, JPABaseEmitter*, dPa_levelEcallBack*);
-            /* 8004B5AC */ void cleanup();
-            /* 8004FBFC */ emitter_c() { mId = 0; }
+            void onActive();
+            void entry(u32, u16, JPABaseEmitter*, dPa_levelEcallBack*);
+            void cleanup();
+            emitter_c() { mId = 0; }
 
             JPABaseEmitter* getEmitter() { return mEmitter; }
             emitter_c* getPre() { return mPre; }
@@ -301,17 +301,17 @@ public:
             /* 0x14 */ emitter_c* mNext;
         };  // Size: 0x18
 
-        /* 8004B688 */ level_c();
-        /* 8004B7A8 */ void execute();
-        /* 8004B6F8 */ void execute(dPa_control_c::level_c::emitter_c*);
-        /* 8004B808 */ void cleanup();
-        /* 8004B874 */ emitter_c* get(u32);
-        /* 8004B8B4 */ void forceOnEventMove(u32);
-        /* 8004B8E8 */ void allForceOnEventMove();
-        /* 8004B918 */ JPABaseEmitter* getEmitter(u32);
-        /* 8004B94C */ u32 entry(u16, JPABaseEmitter*, dPa_levelEcallBack*);
-        /* 8004BA40 */ void addTable(dPa_control_c::level_c::emitter_c*);
-        /* 8004BA74 */ void cutTable(dPa_control_c::level_c::emitter_c*);
+        level_c();
+        void execute();
+        void execute(dPa_control_c::level_c::emitter_c*);
+        void cleanup();
+        emitter_c* get(u32);
+        void forceOnEventMove(u32);
+        void allForceOnEventMove();
+        JPABaseEmitter* getEmitter(u32);
+        u32 entry(u16, JPABaseEmitter*, dPa_levelEcallBack*);
+        void addTable(dPa_control_c::level_c::emitter_c*);
+        void cutTable(dPa_control_c::level_c::emitter_c*);
 
         static const int EMITTER_MAX = 0x80;
 
@@ -323,43 +323,43 @@ public:
         /* 0xC08 */ emitter_c* mTable[0x100];
     };  // Size: 0x1008
 
-    /* 8004BACC */ dPa_control_c();
-    /* 8004BB70 */ static u8 getRM_ID(u16);
-    /* 8004BB78 */ void createCommon(void const*);
-    /* 8004BCDC */ void createRoomScene();
-    /* 8004BDFC */ bool readScene(u8, mDoDvdThd_toMainRam_c**);
-    /* 8004BEB0 */ void createScene(void const*);
-    /* 8004BF3C */ bool removeRoomScene(bool);
-    /* 8004BFD4 */ void removeScene(bool);
-    /* 8004C054 */ void cleanup();
-    /* 8004C078 */ void calc3D();
-    /* 8004C0EC */ void calc2D();
-    /* 8004C134 */ void calcMenu();
-    /* 8004C188 */ void draw(JPADrawInfo*, u8);
-    /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
-    /* 8004C838 */ void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
+    dPa_control_c();
+    static u8 getRM_ID(u16);
+    void createCommon(void const*);
+    void createRoomScene();
+    bool readScene(u8, mDoDvdThd_toMainRam_c**);
+    void createScene(void const*);
+    bool removeRoomScene(bool);
+    void removeScene(bool);
+    void cleanup();
+    void calc3D();
+    void calc2D();
+    void calcMenu();
+    void draw(JPADrawInfo*, u8);
+    void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32);
+    void setWaterRipple(u32*, cBgS_PolyInfo&, cXyz const*, f32, dKy_tevstr_c const*,
                                        cXyz const*, s8);
-    /* 8004CA90 */ JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
+    JPABaseEmitter* set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8,
                            dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*,
                            f32);
-    /* 8004D4CC */ u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
+    u32 set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                            cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*,
                            _GXColor const*, cXyz const*, f32);
-    /* 8004CF90 */ static s32 getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*);
-    /* 8004D6A4 */ u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
+    static s32 getPolyColor(cBgS_PolyInfo&, int, _GXColor*, _GXColor*, u8*, f32*);
+    u32 setPoly(u32, u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
                                csXyz const*, cXyz const*, int, dPa_levelEcallBack*, s8,
                                cXyz const*);
-    /* 8004D068 */ JPABaseEmitter* setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
+    JPABaseEmitter* setPoly(u16, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*, csXyz const*,
                                 cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*);
-    /* 8004D128 */ bool newSimple(u16, u8, u32*);
-    /* 8004D1B8 */ u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
+    bool newSimple(u16, u8, u32*);
+    u32 setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
                                   _GXColor const&, int, f32);
-    /* 8004D23C */ dPa_simpleEcallBack* getSimple(u16);
-    /* 8004D770 */ u32 setStopContinue(u32);
-    /* 8004D7C4 */ u32 setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
+    dPa_simpleEcallBack* getSimple(u16);
+    u32 setStopContinue(u32);
+    u32 setSimpleFoot(u32, u32*, cBgS_PolyInfo&, cXyz const*, dKy_tevstr_c const*,
                                       int, csXyz const*, cXyz const*, dPa_levelEcallBack*, s8,
                                       cXyz const*);
-    /* 8004D988 */ u16 setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*,
+    u16 setCommonPoly(u32*, cBgS_PolyInfo*, cXyz const*, cXyz const*,
                                       dKy_tevstr_c const*, u32, u32, csXyz const*, cXyz const*, s8);
 
     void forceOnEventMove(u32 param_0) { field_0x210.forceOnEventMove(param_0); }
diff --git a/include/d/d_particle_copoly.h b/include/d/d_particle_copoly.h
index 2f7cde2587..86e0c3286f 100644
--- a/include/d/d_particle_copoly.h
+++ b/include/d/d_particle_copoly.h
@@ -24,13 +24,13 @@ class JPABaseEmitter;
  */
 class dPaPo_c {
 public:
-    /* 80050C9C */ void init(dBgS_Acch*, f32, f32);
-    /* 80050CC4 */ int checkWaterIn(cXyz*, cXyz const*, dKy_tevstr_c const*, u32, s8, f32, f32);
-    /* 80050E7C */ void setEffect(u32*, int, dKy_tevstr_c const*, cXyz const*, u32, u32,
+    void init(dBgS_Acch*, f32, f32);
+    int checkWaterIn(cXyz*, cXyz const*, dKy_tevstr_c const*, u32, s8, f32, f32);
+    void setEffect(u32*, int, dKy_tevstr_c const*, cXyz const*, u32, u32,
                                   cXyz const*, csXyz const*, s8, u8*, u8*);
-    /* 80051008 */ int setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
+    int setEffectCenter(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
                                        csXyz const*, cXyz const*, s8, f32, f32);
-    /* 8005113C */ void clearID(u32*, u8*);
+    void clearID(u32*, u8*);
 
     void clearCenterID() { clearID(field_0x8[0], &field_0x36); }
     void changeWaterOffset(f32 i_offset) { mWaterOffset = i_offset; }
@@ -52,10 +52,10 @@ public:
 
 class dPaPoT_c : public dPaPo_c {
 public:
-    /* 8005115C */ int setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
+    int setEffectTwo(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
                                     cXyz const*, cXyz const*, csXyz const*, cXyz const*, s8, f32,
                                     f32);
-    /* 80051294 */ void clearTwoAllID();
+    void clearTwoAllID();
 
     void clearLeftID() { clearID(mLeftEmitter[0], &field_0x7c); }
     void clearRightID() { clearID(mRightEmitter[0], &field_0x7d); }
@@ -91,10 +91,10 @@ public:
 
 class dPaPoF_c : public dPaPoT_c {
 public:
-    /* 800512E8 */ int setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
+    int setEffectFour(dKy_tevstr_c const*, cXyz const*, u32, u32, cXyz const*,
                                      cXyz const*, cXyz const*, cXyz const*, cXyz const*,
                                      csXyz const*, cXyz const*, s8, f32, f32);
-    /* 80051424 */ void clearFourAllID();
+    void clearFourAllID();
 
     void clearBLeftID() { clearID(mBackLeftEmitter[0], &field_0xc4); }
     void clearBRightID() { clearID(mBackRightEmitter[0], &field_0xc5); }
diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h
index 20f1d8b1ba..6512a45b2d 100644
--- a/include/d/d_s_logo.h
+++ b/include/d/d_s_logo.h
@@ -13,8 +13,8 @@ class mDoDvdThd_toMainRam_c;
 
 class dLog_HIO_c {
 public:
-    /* 802560A4 */ dLog_HIO_c();
-    /* 8025855C */ virtual ~dLog_HIO_c();
+    dLog_HIO_c();
+    virtual ~dLog_HIO_c();
 };  // Size: 0x8
 
 class dScnLogo_c : public scene_class {
@@ -39,35 +39,35 @@ public:
     };
 
     dScnLogo_c() {}
-    /* 802560B4 */ void preLoad_dyl_create();
-    /* 802560F8 */ void preLoad_dyl_remove();
-    /* 8025611C */ bool preLoad_dyl();
-    /* 80256198 */ void checkProgSelect();
-    /* 80256210 */ int draw();
-    /* 80256264 */ void progInDraw();
-    /* 8025631C */ void progSelDraw();
-    /* 802568E0 */ void progOutDraw();
-    /* 80256A3C */ void progSetDraw();
-    /* 80256AC0 */ void progSet2Draw();
-    /* 80256B3C */ void progChangeDraw();
-    /* 80256BF4 */ void warningInDraw();
-    /* 80256C68 */ void warningDispDraw();
-    /* 80256DC4 */ void warningOutDraw();
-    /* 80256E48 */ void nintendoInDraw();
-    /* 80256ECC */ void nintendoOutDraw();
-    /* 80256F50 */ void dolbyInDraw();
-    /* 80256FD4 */ void dolbyOutDraw();
-    /* 80257058 */ void dolbyOutDraw2();
-    /* 80257070 */ void dvdWaitDraw();
-    /* 80257284 */ void nextSceneChange();
-    /* 802572B8 */ ~dScnLogo_c();
-    /* 80257AE0 */ int create();
-    /* 80257C64 */ void logoInitGC();
-    /* 80257FEC */ void dvdDataLoad();
-    /* 802584D8 */ void setProgressiveMode(u8);
-    /* 802584FC */ u8 getProgressiveMode();
-    /* 80258520 */ bool isProgressiveMode();
-    /* 8025854C */ void setRenderMode();
+    void preLoad_dyl_create();
+    void preLoad_dyl_remove();
+    bool preLoad_dyl();
+    void checkProgSelect();
+    int draw();
+    void progInDraw();
+    void progSelDraw();
+    void progOutDraw();
+    void progSetDraw();
+    void progSet2Draw();
+    void progChangeDraw();
+    void warningInDraw();
+    void warningDispDraw();
+    void warningOutDraw();
+    void nintendoInDraw();
+    void nintendoOutDraw();
+    void dolbyInDraw();
+    void dolbyOutDraw();
+    void dolbyOutDraw2();
+    void dvdWaitDraw();
+    void nextSceneChange();
+    ~dScnLogo_c();
+    int create();
+    void logoInitGC();
+    void dvdDataLoad();
+    void setProgressiveMode(u8);
+    u8 getProgressiveMode();
+    bool isProgressiveMode();
+    void setRenderMode();
 
     #if VERSION == VERSION_GCN_PAL
     u8 getPalLanguage();
diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h
index 6f2469ec17..0c55f40930 100644
--- a/include/d/d_s_name.h
+++ b/include/d/d_s_name.h
@@ -6,8 +6,8 @@
 
 class dSn_HIO_c {
 public:
-    /* 8025878C */ dSn_HIO_c();
-    /* 802592DC */ virtual ~dSn_HIO_c() {}
+    dSn_HIO_c();
+    virtual ~dSn_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x5 */ u8 mFileSelWaitTime;
@@ -16,17 +16,17 @@ public:
 class dScnName_camera_c : public camera_process_class {
 public:
     dScnName_camera_c() { field_0x22f = 84; }
-    /* 80259294 */ virtual ~dScnName_camera_c() {}
+    virtual ~dScnName_camera_c() {}
 };
 
 // remove later and use header instead
 class dFile_select_c {
 public:
-    /* 8018366C */ dFile_select_c(JKRArchive*);
-    /* 8018375C */ virtual ~dFile_select_c();
-    /* 801843CC */ void _create();
-    /* 801844FC */ void _move();
-    /* 8018DD38 */ void _draw();
+    dFile_select_c(JKRArchive*);
+    virtual ~dFile_select_c();
+    void _create();
+    void _move();
+    void _draw();
 
     bool getFadeFlag() { return mFadeFlag; }
     int isDataNew(u8 i) { return mDataNew[i]; }
@@ -51,10 +51,10 @@ private:
 // remove later and use header instead
 class dBrightCheck_c {
 public:
-    /* 80192F10 */ dBrightCheck_c(JKRArchive*);
-    /* 80192F98 */ virtual ~dBrightCheck_c();
-    /* 801934D0 */ void _move();
-    /* 80193594 */ void _draw();
+    dBrightCheck_c(JKRArchive*);
+    virtual ~dBrightCheck_c();
+    void _move();
+    void _draw();
 
     bool isEnd() { return mEnd; }
 
@@ -66,18 +66,18 @@ class dScnName_c : public scene_class {
 public:
     dScnName_c() {}
 
-    /* 802588A0 */ s32 create();
-    /* 80258B2C */ void setView();
-    /* 80258BC8 */ s32 execute();
-    /* 80258C5C */ s32 draw();
-    /* 80258CC8 */ ~dScnName_c();
-    /* 80258DD0 */ void FileSelectOpen();
-    /* 80258E34 */ void FileSelectMain();
-    /* 80258E78 */ void FileSelectMainNormal();
-    /* 80258F20 */ void FileSelectClose();
-    /* 80258FD4 */ void brightCheckOpen();
-    /* 80259008 */ void brightCheck();
-    /* 802590F8 */ void changeGameScene();
+    s32 create();
+    void setView();
+    s32 execute();
+    s32 draw();
+    ~dScnName_c();
+    void FileSelectOpen();
+    void FileSelectMain();
+    void FileSelectMainNormal();
+    void FileSelectClose();
+    void brightCheckOpen();
+    void brightCheck();
+    void changeGameScene();
 
     #if VERSION == VERSION_GCN_PAL
     void bmg_data_set();
diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h
index e6a9644298..d78fa1b5b3 100644
--- a/include/d/d_s_play.h
+++ b/include/d/d_s_play.h
@@ -17,7 +17,7 @@ public:
 
 class dScnPly_reg_HIO_c : public JORReflexible {
 public:
-    /* 8025AD78 */ virtual ~dScnPly_reg_HIO_c() {}
+    virtual ~dScnPly_reg_HIO_c() {}
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
@@ -31,14 +31,14 @@ public:
 
 class dScnPly_preLoad_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8025ADC0 */ virtual ~dScnPly_preLoad_HIO_c() {}
+    virtual ~dScnPly_preLoad_HIO_c() {}
 
     void genMessage(JORMContext*);
 };
 
 class dScnPly_env_HIO_c {
 public:
-    /* 8025AD04 */ virtual ~dScnPly_env_HIO_c() {}
+    virtual ~dScnPly_env_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ dScnPly_env_otherHIO_c mOther;
@@ -64,9 +64,9 @@ public:
 
 class dScnPly_c : public scene_class {
 public:
-    /* 80259400 */ s8 calcPauseTimer();
-    /* 80259AC4 */ bool resetGame();
-    /* 80259BFC */ void offReset();
+    s8 calcPauseTimer();
+    bool resetGame();
+    void offReset();
 
     static bool isPause() { return pauseTimer == 0; }
     static void setPauseTimer(s8 time) { nextPauseTimer = time; }
diff --git a/include/d/d_s_play_env.h b/include/d/d_s_play_env.h
index f67306fd08..2f0a28642e 100644
--- a/include/d/d_s_play_env.h
+++ b/include/d/d_s_play_env.h
@@ -3,9 +3,9 @@
 
 class dScnPly_env_otherHIO_c : public JORReflexible {
 public:
-    /* 80259440 */ dScnPly_env_otherHIO_c();
+    dScnPly_env_otherHIO_c();
 
-    /* 8025AC0C */ virtual ~dScnPly_env_otherHIO_c() {}
+    virtual ~dScnPly_env_otherHIO_c() {}
     void genMessage(JORMContext*);
 
     #ifdef DEBUG
@@ -44,9 +44,9 @@ public:
 
 class dScnPly_env_debugHIO_c : public JORReflexible {
 public:
-    /* 80259468 */ dScnPly_env_debugHIO_c();
+    dScnPly_env_debugHIO_c();
 
-    /* 8025ABC4 */ virtual ~dScnPly_env_debugHIO_c() {}
+    virtual ~dScnPly_env_debugHIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x04 */ u8 field_0x4;
diff --git a/include/d/d_save_HIO.h b/include/d/d_save_HIO.h
index 3239bb29d8..cc2f8af706 100644
--- a/include/d/d_save_HIO.h
+++ b/include/d/d_save_HIO.h
@@ -5,10 +5,10 @@
 
 class dSvBit_childTransformHIO_c {
 public:
-    /* 8025C0A0 */ dSvBit_childTransformHIO_c();
-    /* 8025C0D4 */ void init();
+    dSvBit_childTransformHIO_c();
+    void init();
 
-    /* 8025C2E4 */ virtual ~dSvBit_childTransformHIO_c() {}
+    virtual ~dSvBit_childTransformHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -18,10 +18,10 @@ private:
 
 class dSvBit_childDarknessHIO_c {
 public:
-    /* 8025C004 */ dSvBit_childDarknessHIO_c();
-    /* 8025C038 */ void init();
+    dSvBit_childDarknessHIO_c();
+    void init();
 
-    /* 8025C32C */ virtual ~dSvBit_childDarknessHIO_c() {}
+    virtual ~dSvBit_childDarknessHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -31,10 +31,10 @@ private:
 
 class dSvBit_childOtherHIO_c {
 public:
-    /* 8025C13C */ dSvBit_childOtherHIO_c();
-    /* 8025C178 */ void init();
+    dSvBit_childOtherHIO_c();
+    void init();
 
-    /* 8025C29C */ virtual ~dSvBit_childOtherHIO_c() {}
+    virtual ~dSvBit_childOtherHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -46,10 +46,10 @@ private:
 
 class dSvBit_childTbPerfectionHIO_c {
 public:
-    /* 8025BF68 */ dSvBit_childTbPerfectionHIO_c();
-    /* 8025BF9C */ void init();
+    dSvBit_childTbPerfectionHIO_c();
+    void init();
 
-    /* 8025C374 */ virtual ~dSvBit_childTbPerfectionHIO_c() {}
+    virtual ~dSvBit_childTbPerfectionHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -59,7 +59,7 @@ private:
 
 class dSvBit_childTreasureHIO_c {
 public:
-    /* 8025C874 */ virtual ~dSvBit_childTreasureHIO_c() {}
+    virtual ~dSvBit_childTreasureHIO_c() {}
     void init() {
         mPerfectSave.init();
     }
@@ -71,10 +71,10 @@ private:
 
 class dSvBit_childSwZoneHIO_c {
 public:
-    /* 8025BCB0 */ dSvBit_childSwZoneHIO_c();
-    /* 8025BCE4 */ void init();
+    dSvBit_childSwZoneHIO_c();
+    void init();
 
-    /* 8025C524 */ virtual ~dSvBit_childSwZoneHIO_c() {}
+    virtual ~dSvBit_childSwZoneHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -84,10 +84,10 @@ private:
 
 class dSvBit_childSwPerfectionHIO_c {
 public:
-    /* 8025BB78 */ dSvBit_childSwPerfectionHIO_c();
-    /* 8025BBAC */ void init();
+    dSvBit_childSwPerfectionHIO_c();
+    void init();
 
-    /* 8025C5B4 */ virtual ~dSvBit_childSwPerfectionHIO_c() {}
+    virtual ~dSvBit_childSwPerfectionHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -97,10 +97,10 @@ private:
 
 class dSvBit_childSwOneZoneHIO_c {
 public:
-    /* 8025BD10 */ dSvBit_childSwOneZoneHIO_c();
-    /* 8025BD44 */ void init();
+    dSvBit_childSwOneZoneHIO_c();
+    void init();
 
-    /* 8025C4DC */ virtual ~dSvBit_childSwOneZoneHIO_c() {}
+    virtual ~dSvBit_childSwOneZoneHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -110,10 +110,10 @@ private:
 
 class dSvBit_childSwDungeonHIO_c {
 public:
-    /* 8025BC14 */ dSvBit_childSwDungeonHIO_c();
-    /* 8025BC48 */ void init();
+    dSvBit_childSwDungeonHIO_c();
+    void init();
 
-    /* 8025C56C */ virtual ~dSvBit_childSwDungeonHIO_c() {}
+    virtual ~dSvBit_childSwDungeonHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -123,7 +123,7 @@ private:
 
 class dSvBit_childSwitchHIO_c {
 public:
-    /* 8025C970 */ virtual ~dSvBit_childSwitchHIO_c() {}
+    virtual ~dSvBit_childSwitchHIO_c() {}
     void init() {
         field_0x8.init();
         field_0x110.init();
@@ -141,10 +141,10 @@ private:
 
 class dSvBit_childItZoneHIO_c {
 public:
-    /* 8025BEA8 */ dSvBit_childItZoneHIO_c();
-    /* 8025BEDC */ void init();
+    dSvBit_childItZoneHIO_c();
+    void init();
 
-    /* 8025C404 */ virtual ~dSvBit_childItZoneHIO_c() {}
+    virtual ~dSvBit_childItZoneHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -154,10 +154,10 @@ private:
 
 class dSvBit_childItPerfectionHIO_c {
 public:
-    /* 8025BD70 */ dSvBit_childItPerfectionHIO_c();
-    /* 8025BDA4 */ void init();
+    dSvBit_childItPerfectionHIO_c();
+    void init();
 
-    /* 8025C494 */ virtual ~dSvBit_childItPerfectionHIO_c() {}
+    virtual ~dSvBit_childItPerfectionHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -167,10 +167,10 @@ private:
 
 class dSvBit_childItOneZoneHIO_c {
 public:
-    /* 8025BF08 */ dSvBit_childItOneZoneHIO_c();
-    /* 8025BF3C */ void init();
+    dSvBit_childItOneZoneHIO_c();
+    void init();
 
-    /* 8025C3BC */ virtual ~dSvBit_childItOneZoneHIO_c() {}
+    virtual ~dSvBit_childItOneZoneHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -180,10 +180,10 @@ private:
 
 class dSvBit_childItDungeonHIO_c {
 public:
-    /* 8025BE0C */ dSvBit_childItDungeonHIO_c();
-    /* 8025BE40 */ void init();
+    dSvBit_childItDungeonHIO_c();
+    void init();
 
-    /* 8025C44C */ virtual ~dSvBit_childItDungeonHIO_c() {}
+    virtual ~dSvBit_childItDungeonHIO_c() {}
 
 private:
     /* 0x04 */ u8 field_0x4;
@@ -193,7 +193,7 @@ private:
 
 class dSvBit_childItemHIO_c {
 public:
-    /* 8025C8D4 */ virtual ~dSvBit_childItemHIO_c() {}
+    virtual ~dSvBit_childItemHIO_c() {}
     void init() {
         mFullSave.init();
         mDungeonSave.init();
@@ -211,9 +211,9 @@ private:
 
 class dSvBit_HIO_c {
 public:
-    /* 8025C1F8 */ void init();
+    void init();
 
-    /* 8025C6FC */ virtual ~dSvBit_HIO_c() {}
+    virtual ~dSvBit_HIO_c() {}
 
     /* 0x004 */ s8 field_0x4;
     /* 0x008 */ dSvBit_childSwitchHIO_c mSwitch;
diff --git a/include/d/d_scope.h b/include/d/d_scope.h
index 29bafb1d35..8ce7c80472 100644
--- a/include/d/d_scope.h
+++ b/include/d/d_scope.h
@@ -12,18 +12,18 @@ public:
         /* 2 */ PROC_CLOSE,
     };
 
-    /* 80193690 */ dScope_c(u8);
-    /* 80193FB4 */ void open_init();
-    /* 80193FD0 */ void open_proc();
-    /* 80194048 */ void move_init();
-    /* 8019404C */ void move_proc();
-    /* 80194050 */ void close_init();
-    /* 80194054 */ void close_proc();
+    dScope_c(u8);
+    void open_init();
+    void open_proc();
+    void move_init();
+    void move_proc();
+    void close_init();
+    void close_proc();
 
-    /* 80193C68 */ virtual void draw();
-    /* 8019396C */ virtual ~dScope_c();
-    /* 80193B90 */ virtual int _execute(u32);
-    /* 80193FA0 */ virtual bool isDead();
+    virtual void draw();
+    virtual ~dScope_c();
+    virtual int _execute(u32);
+    virtual bool isDead();
 
     /* 0x04 */ J2DScreen* mHawkEyeScrn;
     /* 0x08 */ J2DScreen* mZoomInOutScrn;
diff --git a/include/d/d_select_cursor.h b/include/d/d_select_cursor.h
index 8a392d3e6b..c77da550f8 100644
--- a/include/d/d_select_cursor.h
+++ b/include/d/d_select_cursor.h
@@ -8,9 +8,9 @@ class J2DAnmTransformKey;
 
 class dSelect_cursorHIO_c {
 public:
-    /* 801941E4 */ dSelect_cursorHIO_c();
+    dSelect_cursorHIO_c();
 
-    /* 80195978 */ virtual ~dSelect_cursorHIO_c() {}
+    virtual ~dSelect_cursorHIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 field_0x8;
@@ -25,22 +25,22 @@ public:
 
 class dSelect_cursor_c : public dDlst_base_c {
 public:
-    /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
-    /* 80194CC0 */ void update();
-    /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
-    /* 801951B0 */ void setParam(f32, f32, f32, f32, f32);
-    /* 801951C8 */ void setScale(f32);
-    /* 801952A0 */ void setAlphaRate(f32);
-    /* 80195330 */ int addAlpha();
-    /* 801953CC */ int decAlpha();
-    /* 80195460 */ void setBpkAnimation(J2DAnmColor*);
-    /* 801955F0 */ void setBtk0Animation(J2DAnmTextureSRTKey*);
-    /* 80195724 */ void setCursorAnimation();
-    /* 801958E0 */ void setBckAnimation(J2DAnmTransformKey*);
-    /* 80195940 */ void moveCenter(J2DPane*, f32, f32);
+    dSelect_cursor_c(u8, f32, JKRArchive*);
+    void update();
+    void setPos(f32, f32, J2DPane*, bool);
+    void setParam(f32, f32, f32, f32, f32);
+    void setScale(f32);
+    void setAlphaRate(f32);
+    int addAlpha();
+    int decAlpha();
+    void setBpkAnimation(J2DAnmColor*);
+    void setBtk0Animation(J2DAnmTextureSRTKey*);
+    void setCursorAnimation();
+    void setBckAnimation(J2DAnmTransformKey*);
+    void moveCenter(J2DPane*, f32, f32);
 
-    /* 801949EC */ virtual ~dSelect_cursor_c();
-    /* 80194C30 */ virtual void draw();
+    virtual ~dSelect_cursor_c();
+    virtual void draw();
 
     void setPos(f32 x, f32 y) {
         mPositionX = x;
diff --git a/include/d/d_select_icon.h b/include/d/d_select_icon.h
index 577da88c2b..d519499398 100644
--- a/include/d/d_select_icon.h
+++ b/include/d/d_select_icon.h
@@ -15,9 +15,9 @@ public:
 
 class dSelect_icon_c {
 public:
-    /* 80195A3C */ void animation();
-    /* 80195B40 */ void setAlpha(u8);
-    /* 80195B70 */ void setPos(J2DPane*, f32, f32);
+    void animation();
+    void setAlpha(u8);
+    void setPos(J2DPane*, f32, f32);
     virtual ~dSelect_icon_c(); // must be declared but not defined to match?
 
     void drawSelf() {
diff --git a/include/d/d_shop_camera.h b/include/d/d_shop_camera.h
index 3a6a4c6190..6c4f7f9521 100644
--- a/include/d/d_shop_camera.h
+++ b/include/d/d_shop_camera.h
@@ -27,18 +27,18 @@ public:
         setCamAction(NULL);
     }
 
-    /* 80195C9C */ int shop_cam_action_init();
-    /* 80195E18 */ int shop_cam_action();
-    /* 8019630C */ void Save();
-    /* 8019635C */ void EventRecoverNotime();
-    /* 801963B4 */ void Reset();
-    /* 801964C8 */ void move();
-    /* 80196544 */ void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*,
+    int shop_cam_action_init();
+    int shop_cam_action();
+    void Save();
+    void EventRecoverNotime();
+    void Reset();
+    void move();
+    void setCamDataIdx(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*,
                                       cXyz*);
-    /* 80196608 */ void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*,
+    void setCamDataIdx2(fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*,
                                        fopAc_ac_c*, fopAc_ac_c*, fopAc_ac_c*, cXyz*, cXyz*);
-    /* 801966D4 */ void _debugSetCamera();
-    /* 801968B8 */ void setMasterCamCtrPos(cXyz*);
+    void _debugSetCamera();
+    void setMasterCamCtrPos(cXyz*);
 
     void setCamAction(ShopCamFunc func) {
         mCamAction = func;
diff --git a/include/d/d_shop_item_ctrl.h b/include/d/d_shop_item_ctrl.h
index 1937990d71..9016be18ea 100644
--- a/include/d/d_shop_item_ctrl.h
+++ b/include/d/d_shop_item_ctrl.h
@@ -5,13 +5,13 @@
 
 class dShopItemCtrl_c {
 public:
-    /* 80196914 */ dShopItemCtrl_c();
-    /* 801969A0 */ cXyz getCurrentPos(int);
-    /* 80196A3C */ bool isHomePos(int);
-    /* 80196AF0 */ void setRotateAnime(int);
-    /* 80196BA4 */ void setZoomAnime(int, cXyz*, s16, bool);
+    dShopItemCtrl_c();
+    cXyz getCurrentPos(int);
+    bool isHomePos(int);
+    void setRotateAnime(int);
+    void setZoomAnime(int, cXyz*, s16, bool);
 
-    /* 80196958 */ virtual ~dShopItemCtrl_c();
+    virtual ~dShopItemCtrl_c();
 
     void setItemIndex(int i, u32 index) { mItemIndex[i] = index; }
     u32 getItemIndex(int i) { return mItemIndex[i]; }
diff --git a/include/d/d_shop_system.h b/include/d/d_shop_system.h
index d17ccd78b2..0f4c6ae17b 100644
--- a/include/d/d_shop_system.h
+++ b/include/d/d_shop_system.h
@@ -36,55 +36,55 @@ public:
             initShopSystem();
     }
 
-    /* 80197338 */ void initShopSystem();
-    /* 801975C0 */ void onFlag(int);
-    /* 801975DC */ void offFlag(int);
-    /* 801975F8 */ BOOL isFlag(int);
-    /* 80197618 */ void onSoldOutItemFlag(int);
-    /* 80197634 */ void offSoldOutItemFlag(int);
-    /* 80197650 */ BOOL isSoldOutItemFlag(int);
-    /* 80197670 */ int checkController(u8, dMsgFlow_c*);
-    /* 80197808 */ int chooseItem3(u8);
-    /* 80197DD0 */ int chooseItem5(u8);
-    /* 80198250 */ int chooseItem4(u8);
-    /* 80198444 */ int moveCursor(int, u8);
-    /* 80198488 */ int moveCursor0(int, u8);
-    /* 80198708 */ int moveCursor1(int, u8);
-    /* 80198878 */ int drawCursor();
-    /* 80198950 */ int itemRotate();
-    /* 80198A2C */ int itemZoom(cXyz*);
-    /* 801990B0 */ int seq_wait(fopAc_ac_c*, dMsgFlow_c*);
-    /* 801990B8 */ int seq_start(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019936C */ int seq_select_wait(fopAc_ac_c*, dMsgFlow_c*);
-    /* 801993C4 */ int seq_select_start(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019959C */ int seq_select(fopAc_ac_c*, dMsgFlow_c*);
-    /* 80199A18 */ int seq_moving(fopAc_ac_c*, dMsgFlow_c*);
-    /* 80199BF8 */ int seq_decide(fopAc_ac_c*, dMsgFlow_c*);
-    /* 80199D14 */ int seq_choose(fopAc_ac_c*, dMsgFlow_c*);
-    /* 80199E28 */ int seq_decide_yes(fopAc_ac_c*, dMsgFlow_c*);
-    /* 80199FA4 */ int seq_decide_no(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019A020 */ int seq_finish(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019A0C0 */ bool seq_event(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019A0D0 */ int shop_init(bool);
-    /* 8019A158 */ int shop_process(fopAc_ac_c*, dMsgFlow_c*);
-    /* 8019A238 */ void createShopItem(int);
-    /* 8019A344 */ void setSeq(u8);
-    /* 8019A354 */ void setSoldOutFlag();
-    /* 8019A364 */ void setSoldOut();
-    /* 8019A4F4 */ void setSoldOutItemHide();
-    /* 8019A564 */ void deleteObject();
-    /* 8019A5D0 */ bool searchItemActor();
-    /* 8019AB00 */ int getFlowNodeNum();
-    /* 8019AB1C */ void setSellItemMax(u8);
-    /* 8019AB24 */ BOOL checkShopOpen();
-    /* 8019AB60 */ bool checkLeftTrigger(STControl*);
-    /* 8019AB84 */ bool checkRightTrigger(STControl*);
-    /* 8019ABA8 */ bool dpdMove();
+    void initShopSystem();
+    void onFlag(int);
+    void offFlag(int);
+    BOOL isFlag(int);
+    void onSoldOutItemFlag(int);
+    void offSoldOutItemFlag(int);
+    BOOL isSoldOutItemFlag(int);
+    int checkController(u8, dMsgFlow_c*);
+    int chooseItem3(u8);
+    int chooseItem5(u8);
+    int chooseItem4(u8);
+    int moveCursor(int, u8);
+    int moveCursor0(int, u8);
+    int moveCursor1(int, u8);
+    int drawCursor();
+    int itemRotate();
+    int itemZoom(cXyz*);
+    int seq_wait(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_start(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_select_wait(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_select_start(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_select(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_moving(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_decide(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_choose(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_decide_yes(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_decide_no(fopAc_ac_c*, dMsgFlow_c*);
+    int seq_finish(fopAc_ac_c*, dMsgFlow_c*);
+    bool seq_event(fopAc_ac_c*, dMsgFlow_c*);
+    int shop_init(bool);
+    int shop_process(fopAc_ac_c*, dMsgFlow_c*);
+    void createShopItem(int);
+    void setSeq(u8);
+    void setSoldOutFlag();
+    void setSoldOut();
+    void setSoldOutItemHide();
+    void deleteObject();
+    bool searchItemActor();
+    int getFlowNodeNum();
+    void setSellItemMax(u8);
+    BOOL checkShopOpen();
+    bool checkLeftTrigger(STControl*);
+    bool checkRightTrigger(STControl*);
+    bool dpdMove();
 
-    /* 801974E4 */ virtual ~dShopSystem_c();
-    /* 8019ACF0 */ virtual bool getResName2(int) { return false; }
-    /* 8019ACE0 */ virtual int beforeStartSeqAction(dMsgFlow_c*, int) { return 1; }
-    /* 8019ACE8 */ virtual int beforeSelectSeqAction(dMsgFlow_c*, int) { return 1; }
+    virtual ~dShopSystem_c();
+    virtual bool getResName2(int) { return false; }
+    virtual int beforeStartSeqAction(dMsgFlow_c*, int) { return 1; }
+    virtual int beforeSelectSeqAction(dMsgFlow_c*, int) { return 1; }
 
     bool chkSpMode() { return mSpMode == 1; }
     void onSpMode() { mSpMode = 1; }
diff --git a/include/d/d_simple_model.h b/include/d/d_simple_model.h
index ff7ad5e969..4952553208 100644
--- a/include/d/d_simple_model.h
+++ b/include/d/d_simple_model.h
@@ -20,15 +20,15 @@ public:
 
 class diff_model_c {
 public:
-    /* 80048D60 */ diff_model_c();
-    /* 800490EC */ BOOL create(J3DModelData*, int, u8);
-    /* 800491F4 */ J3DModelData* getModelData();
-    /* 80049210 */ void remove(int);
-    /* 80049270 */ void draw();
-    /* 80049368 */ void init();
-    /* 80049388 */ BOOL isSame(J3DModelData*, int);
-    /* 800493FC */ s32 getRoomNo();
-    /* 80049408 */ void insert(modelList_c*);
+    diff_model_c();
+    BOOL create(J3DModelData*, int, u8);
+    J3DModelData* getModelData();
+    void remove(int);
+    void draw();
+    void init();
+    BOOL isSame(J3DModelData*, int);
+    s32 getRoomNo();
+    void insert(modelList_c*);
 
     J3DModel* getModel() { return mpModel; }
 
@@ -44,13 +44,13 @@ private:
 
 class dSmplMdl_draw_c {
 public:
-    /* 80048CB4 */ dSmplMdl_draw_c();
-    /* 80048E0C */ void draw();
-    /* 80048EBC */ void entry(J3DModel*, int);
-    /* 80048F70 */ BOOL addModel(J3DModelData*, int, u8);
-    /* 80049058 */ int removeModel(J3DModelData*, int);
+    dSmplMdl_draw_c();
+    void draw();
+    void entry(J3DModel*, int);
+    BOOL addModel(J3DModelData*, int, u8);
+    int removeModel(J3DModelData*, int);
 
-    /* 80048D80 */ virtual ~dSmplMdl_draw_c();
+    virtual ~dSmplMdl_draw_c();
 
 private:
     /* 0x04 */ diff_model_c mModel[8];
diff --git a/include/d/d_spline_path.h b/include/d/d_spline_path.h
index a1dfb60bc8..5dae6afdab 100644
--- a/include/d/d_spline_path.h
+++ b/include/d/d_spline_path.h
@@ -6,8 +6,8 @@
 struct dPath;
 
 struct dPathCurve {
-    /* 80097C5C */ void Init(dPath*);
-    /* 80097C74 */ cXyz bSpline2(f32);
+    void Init(dPath*);
+    cXyz bSpline2(f32);
 
     /* 0x00 */ int field_0x00;
     /* 0x00 */ int field_0x04;
@@ -26,12 +26,12 @@ public:
     /* 0x2C */ int field_0x2c;
 
     d2DBSplinePath() { Init(0, 0); }
-    /* 80097878 */ void Init(s32, s32);
-    /* 80097904 */ bool Step();
-    /* 80097B20 */ f32 Calc(f32*);
-    /* 80097A6C */ cXyz Calc(cXyz*);
-    /* 80097B68 */ f32 Spot(f32*, f32);
-    /* 801828D4 */ virtual ~d2DBSplinePath() {}
+    void Init(s32, s32);
+    bool Step();
+    f32 Calc(f32*);
+    cXyz Calc(cXyz*);
+    f32 Spot(f32*, f32);
+    virtual ~d2DBSplinePath() {}
 
     bool Last() { return field_0x08 == 3; }
 };
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index 94b9d0dc3c..a6bd3e9d9f 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -1076,21 +1076,21 @@ public:
     dStage_roomControl_c() {}
     void init(void);
     static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); }
-    /* 80024338 */ void initZone();
-    /* 80024384 */ dStage_roomDt_c* getStatusRoomDt(int);
-    /* 800243B0 */ static JKRExpHeap* getMemoryBlock(int);
-    /* 800243E8 */ static void setStayNo(int);
-    /* 80024424 */ static void setNextStayNo(int);
-    /* 800244E8 */ BOOL checkRoomDisp(int) const;
-    /* 8002451C */ int loadRoom(int, u8*, bool);
-    /* 8002471C */ void zoneCountCheck(int) const;
-    /* 80024844 */ static JKRExpHeap* createMemoryBlock(int, u32);
-    /* 800248A8 */ static void destroyMemoryBlock();
-    /* 8002490C */ static void setArcBank(int, char const*);
-    /* 80024940 */ static char* getArcBank(int);
-    /* 80024954 */ static bool resetArchiveBank(int);
-    /* 80024DB0 */ static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; }
-    /* 8025BAAC */ static void setZoneNo(int, int);
+    void initZone();
+    dStage_roomDt_c* getStatusRoomDt(int);
+    static JKRExpHeap* getMemoryBlock(int);
+    static void setStayNo(int);
+    static void setNextStayNo(int);
+    BOOL checkRoomDisp(int) const;
+    int loadRoom(int, u8*, bool);
+    void zoneCountCheck(int) const;
+    static JKRExpHeap* createMemoryBlock(int, u32);
+    static void destroyMemoryBlock();
+    static void setArcBank(int, char const*);
+    static char* getArcBank(int);
+    static bool resetArchiveBank(int);
+    static void SetTimePass(int i_TimePass) { m_time_pass = i_TimePass; }
+    static void setZoneNo(int, int);
     static dBgp_c* getBgp(int i_roomNo) {
 #ifdef DEBUG
         // NONMATCHING
diff --git a/include/d/d_timer.h b/include/d/d_timer.h
index 70bd7ea71c..9d3bd7ce1f 100644
--- a/include/d/d_timer.h
+++ b/include/d/d_timer.h
@@ -29,36 +29,36 @@ public:
         /* 0xD */ u8 field_0xd;
     };  // Size: 0x10
 
-    /* 8025DB38 */ dDlst_TimerScrnDraw_c();
-    /* 8025DBE0 */ void setHIO();
-    /* 8025DFBC */ void setScreen(s32, JKRArchive*);
-    /* 8025E240 */ void setScreenBase();
-    /* 8025E66C */ void setScreenBoatRace();
-    /* 8025E8B8 */ void setScreenRider();
-    /* 8025EB20 */ void hideDenominator();
-    /* 8025EC5C */ void deleteScreen();
-    /* 8025EE24 */ void changeNumberTexture(J2DPane*, int);
-    /* 8025EECC */ const char* getNumber(int);
-    /* 8025EEF0 */ void setTimer(int);
-    /* 8025F180 */ void setCounter(u8, u8);
-    /* 8025FA00 */ void setParentPos(f32, f32);
-    /* 8025FA2C */ void setTimerPos(f32, f32);
-    /* 8025FA6C */ void setCounterPos(f32, f32);
-    /* 8025FA98 */ void setImagePos(f32, f32);
-    /* 8025FAC4 */ void setShowType(u8);
-    /* 8025FB74 */ void anime();
-    /* 8025FF98 */ BOOL closeAnime();
-    /* 802601E4 */ int createGetIn(cXyz);
-    /* 80260574 */ s32 createStart(u16);
-    /* 80260AA8 */ bool checkStartAnimeEnd();
-    /* 80260AD4 */ void playBckAnimation(f32);
+    dDlst_TimerScrnDraw_c();
+    void setHIO();
+    void setScreen(s32, JKRArchive*);
+    void setScreenBase();
+    void setScreenBoatRace();
+    void setScreenRider();
+    void hideDenominator();
+    void deleteScreen();
+    void changeNumberTexture(J2DPane*, int);
+    const char* getNumber(int);
+    void setTimer(int);
+    void setCounter(u8, u8);
+    void setParentPos(f32, f32);
+    void setTimerPos(f32, f32);
+    void setCounterPos(f32, f32);
+    void setImagePos(f32, f32);
+    void setShowType(u8);
+    void anime();
+    BOOL closeAnime();
+    int createGetIn(cXyz);
+    s32 createStart(u16);
+    bool checkStartAnimeEnd();
+    void playBckAnimation(f32);
 #if VERSION == VERSION_GCN_JPN
     bool isLeadByte(int);
 #endif
-    /* 80260B54 */ void drawPikari(int);
+    void drawPikari(int);
 
-    /* 80260690 */ virtual void draw();
-    /* 80261394 */ virtual ~dDlst_TimerScrnDraw_c();
+    virtual void draw();
+    virtual ~dDlst_TimerScrnDraw_c();
 
     void show() { mTimerVisible = 1; }
     void hide() { mTimerVisible = 0; }
@@ -116,24 +116,24 @@ private:
 
 class dTimer_c : public msg_class {
 public:
-    /* 8025CA0C */ int _create();
-    /* 8025CF04 */ int _execute();
-    /* 8025D33C */ int _draw();
-    /* 8025D3BC */ int _delete();
-    /* 8025D524 */ int deleteCheck();
-    /* 8025D618 */ int start(int, s16);
-    /* 8025D538 */ int start(int);
-    /* 8025D7C0 */ int stock_start(s16);
-    /* 8025D708 */ bool stock_start();
-    /* 8025D7E8 */ int stop(u8);
-    /* 8025D86C */ int restart(u8);
-    /* 8025D920 */ int end(int);
-    /* 8025D9E0 */ int deleteRequest();
-    /* 8025D9F0 */ int getTimeMs();
-    /* 8025DA54 */ int getLimitTimeMs();
-    /* 8025DA9C */ int getRestTimeMs();
-    /* 8025DB10 */ bool isStart();
-    /* 802613DC */ int createGetIn(cXyz);
+    int _create();
+    int _execute();
+    int _draw();
+    int _delete();
+    int deleteCheck();
+    int start(int, s16);
+    int start(int);
+    int stock_start(s16);
+    bool stock_start();
+    int stop(u8);
+    int restart(u8);
+    int end(int);
+    int deleteRequest();
+    int getTimeMs();
+    int getLimitTimeMs();
+    int getRestTimeMs();
+    bool isStart();
+    int createGetIn(cXyz);
 
     s32 createStart(u16 param_0) { return mp_tm_scrn->createStart(param_0); }
     void show() { mp_tm_scrn->show(); }
diff --git a/include/d/d_tresure.h b/include/d/d_tresure.h
index 54c776227c..6784c38094 100644
--- a/include/d/d_tresure.h
+++ b/include/d/d_tresure.h
@@ -50,21 +50,21 @@ public:
         /* 0x8 */ u8 mNumber;
     };
 
-    /* 8009BBD8 */ static int createWork();
-    /* 8009BC18 */ static void create();
-    /* 8009BC60 */ static void remove();
-    /* 8009BC6C */ static void reset();
-    /* 8009BCB4 */ static void addData(dTres_c::list_class*, s8);
-    /* 8009BE28 */ static void checkTreasureBox(dTres_c::data_s*);
-    /* 8009C168 */ static void onStatus(u8, int, int);
-    /* 8009C1F0 */ static void offStatus(u8, int, int);
-    /* 8009C27C */ static bool getBossIconFloorNo(int*);
-    /* 8009C360 */ static typeGroupData_c* getFirstData(u8);
-    /* 8009C39C */ static typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
-    /* 8009C3B4 */ static typeGroupData_c* getNextData(dTres_c::typeGroupData_c const*);
-    /* 8009C3CC */ static void setPosition(int, u8, Vec const*, int);
-    /* 8009C49C */ static int getTypeGroupNoToType(u8);
-    /* 8009C4B0 */ static u8 getTypeToTypeGroupNo(u8);
+    static int createWork();
+    static void create();
+    static void remove();
+    static void reset();
+    static void addData(dTres_c::list_class*, s8);
+    static void checkTreasureBox(dTres_c::data_s*);
+    static void onStatus(u8, int, int);
+    static void offStatus(u8, int, int);
+    static bool getBossIconFloorNo(int*);
+    static typeGroupData_c* getFirstData(u8);
+    static typeGroupData_c* getNextData(dTres_c::typeGroupData_c*);
+    static typeGroupData_c* getNextData(dTres_c::typeGroupData_c const*);
+    static void setPosition(int, u8, Vec const*, int);
+    static int getTypeGroupNoToType(u8);
+    static u8 getTypeToTypeGroupNo(u8);
 
     static int getTypeGroupNumber(int index) {
         return mTypeGroupListAll[index].mNumber;
diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h
index e2ed5272e6..8443abf1d7 100644
--- a/include/d/d_vibration.h
+++ b/include/d/d_vibration.h
@@ -70,17 +70,17 @@ public:
         MODE_RUN,
     };
 
-    /* 8006F268 */ int Run();
-    /* 8006FA24 */ bool StartShock(int i_vibmode, int i_flags, cXyz i_pos);
-    /* 8006FC0C */ bool StartQuake(const u8* i_pattern, int i_rounds, int i_flags, cXyz i_pos);
-    /* 8006FB10 */ bool StartQuake(int i_vibmode, int i_flags, cXyz i_pos);
-    /* 8006FD94 */ int StopQuake(int i_flags);
-    /* 8006FE00 */ void Kill();
-    /* 8006FE5C */ bool CheckQuake();
-    /* 8006FE84 */ void setDefault();
-    /* 8006FF04 */ void Init();
-    /* 8006FF38 */ void Pause();
-    /* 8006FFF8 */ void Remove();
+    int Run();
+    bool StartShock(int i_vibmode, int i_flags, cXyz i_pos);
+    bool StartQuake(const u8* i_pattern, int i_rounds, int i_flags, cXyz i_pos);
+    bool StartQuake(int i_vibmode, int i_flags, cXyz i_pos);
+    int StopQuake(int i_flags);
+    void Kill();
+    bool CheckQuake();
+    void setDefault();
+    void Init();
+    void Pause();
+    void Remove();
 
     static const vib_pattern MS_patt[VIBMODE_S_MAX];
     static const vib_pattern CS_patt[VIBMODE_S_MAX];
diff --git a/include/dol2asm.h b/include/dol2asm.h
deleted file mode 100644
index 3e0563cd6a..0000000000
--- a/include/dol2asm.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef DOL2ASM
-#define DOL2ASM
-
-// this helps remove useless error from the linter when using vscode.
-#ifdef __MWERKS__
-
-#ifdef __cplusplus
-#define SECTION_INIT extern "C" __declspec(section ".init")
-#define SECTION_RODATA __declspec(section ".rodata")
-#define SECTION_DATA __declspec(section ".data")
-#define SECTION_SDATA __declspec(section ".sdata")
-#define SECTION_SDATA2 __declspec(section ".sdata2")
-#define SECTION_BSS __declspec(section ".data")
-#define SECTION_SBSS __declspec(section ".sdata")
-#define SECTION_SBSS2 __declspec(section ".sdata2")
-#define SECTION_CTORS extern "C" __declspec(section ".ctors")
-#define SECTION_DTORS extern "C" __declspec(section ".dtors")
-#define SECTION_EXTAB extern "C" __declspec(section "extab_")
-#define SECTION_EXTABINDEX extern "C" __declspec(section "extabindex_")
-#define SECTION_DEAD extern "C" __declspec(section ".dead")
-#define SECTION_CTORS10 __declspec(section ".ctors$10")
-#define SECTION_CTORS15 __declspec(section ".ctors$15")
-#define SECTION_DTORS10 __declspec(section ".dtors$10")
-#define SECTION_DTORS15 __declspec(section ".dtors$15")
-#define COMPILER_STRIP_GATE(NAME, VALUE) SECTION_DEAD void* const cg_##NAME = (void*)(VALUE)
-#define REGISTER_CTORS(ADDR, FUNCTION) SECTION_CTORS void* const _ctors_##ADDR = (void*)(FUNCTION);
-#else
-#define SECTION_INIT __declspec(section ".init")
-#define SECTION_RODATA __declspec(section ".rodata")
-#define SECTION_DATA __declspec(section ".data")
-#define SECTION_SDATA __declspec(section ".sdata")
-#define SECTION_SDATA2 __declspec(section ".sdata2")
-#define SECTION_BSS __declspec(section ".data")
-#define SECTION_SBSS __declspec(section ".sdata")
-#define SECTION_SBSS2 __declspec(section ".sdata2")
-#define SECTION_CTORS __declspec(section ".ctors")
-#define SECTION_DTORS __declspec(section ".dtors")
-#define SECTION_EXTAB __declspec(section "extab_")
-#define SECTION_EXTABINDEX __declspec(section "extabindex_")
-#define SECTION_DEAD __declspec(section ".dead")
-#define SECTION_CTORS10 __declspec(section ".ctors$10")
-#define SECTION_CTORS15 __declspec(section ".ctors$15")
-#define SECTION_DTORS10 __declspec(section ".dtors$10")
-#define SECTION_DTORS15 __declspec(section ".dtors$15")
-#define COMPILER_STRIP_GATE(NAME, VALUE) SECTION_DEAD void* const cg_##NAME = (void*)(VALUE)
-#define REGISTER_CTORS(ADDR, FUNCTION) SECTION_CTORS void* const _ctors_##ADDR = (void*)(FUNCTION);
-#endif
-
-#else
-#define SECTION_INIT
-#define SECTION_RODATA
-#define SECTION_DATA
-#define SECTION_SDATA
-#define SECTION_SDATA2
-#define SECTION_BSS
-#define SECTION_SBSS
-#define SECTION_SBSS2
-#define SECTION_CTORS
-#define SECTION_DTORS
-#define SECTION_EXTAB
-#define SECTION_EXTABINDEX
-#define SECTION_DEAD
-#define SECTION_CTORS10
-#define SECTION_CTORS15
-#define SECTION_DTORS10
-#define SECTION_DTORS15
-#define COMPILER_STRIP_GATE(...)
-#define REGISTER_CTORS(...)
-
-// vscode doesn't like asm and nofralloc very much
-#define asm
-#define nofralloc
-#endif
-
-#pragma section ".dead"
-#pragma section ".ctors$10"
-#pragma section ".ctors$15"
-#pragma section ".dtors$10"
-#pragma section ".dtors$15"
-
-#endif /* DOL2ASM */
diff --git a/include/dolphin/dsp.h b/include/dolphin/dsp.h
index a9790c37d9..42c5e5f97f 100644
--- a/include/dolphin/dsp.h
+++ b/include/dolphin/dsp.h
@@ -47,7 +47,7 @@ void DSPReset(void);
 void DSPHalt(void);
 void DSPUnhalt(void);
 u32 DSPGetDMAStatus(void);
-__declspec(weak) DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
+DECL_WEAK DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
 DSPTaskInfo* DSPCancelTask(DSPTaskInfo* task);
 DSPTaskInfo* DSPAssertTask(DSPTaskInfo* task);
 
diff --git a/include/dolphin/os.h b/include/dolphin/os.h
index e3034658d3..ac0df7b59e 100644
--- a/include/dolphin/os.h
+++ b/include/dolphin/os.h
@@ -191,22 +191,22 @@ BOOL OSRestoreInterrupts(BOOL level);
 u32 OSGetSoundMode(void);
 void OSSetSoundMode(u32 mode);
 
-__declspec(weak) void OSReport(const char* msg, ...);
-__declspec(weak) void OSVReport(const char* msg, va_list list);
-__declspec(weak) void OSPanic(const char* file, int line, const char* msg, ...);
+DECL_WEAK void OSReport(const char* msg, ...);
+DECL_WEAK void OSVReport(const char* msg, va_list list);
+DECL_WEAK void OSPanic(const char* file, int line, const char* msg, ...);
 void OSFatal(GXColor fg, GXColor bg, const char* msg);
 
 // do these belong here?
-__declspec(weak) void OSAttention(const char* msg, ...);
-__declspec(weak) void OSReport_Error(const char* fmt, ...);
-__declspec(weak) void OSReport_FatalError(const char* fmt, ...);
-__declspec(weak) void OSReport_System(const char* fmt, ...);
-__declspec(weak) void OSReport_Warning(const char* fmt, ...);
-__declspec(weak) void OSReportDisable(void);
-__declspec(weak) void OSReportEnable(void);
-__declspec(weak) void OSReportForceEnableOff(void);
-__declspec(weak) void OSReportForceEnableOn(void);
-__declspec(weak) void OSVReport(const char* format, va_list list);
+DECL_WEAK void OSAttention(const char* msg, ...);
+DECL_WEAK void OSReport_Error(const char* fmt, ...);
+DECL_WEAK void OSReport_FatalError(const char* fmt, ...);
+DECL_WEAK void OSReport_System(const char* fmt, ...);
+DECL_WEAK void OSReport_Warning(const char* fmt, ...);
+DECL_WEAK void OSReportDisable(void);
+DECL_WEAK void OSReportEnable(void);
+DECL_WEAK void OSReportForceEnableOff(void);
+DECL_WEAK void OSReportForceEnableOn(void);
+DECL_WEAK void OSVReport(const char* format, va_list list);
 
 #ifdef DEBUG
 #define OS_REPORT(...) OSReport(__VA_ARGS__)
@@ -247,7 +247,7 @@ void* OSUncachedToCached(void* ucaddr);
 
 // unsorted externs
 extern OSTime __OSGetSystemTime(void);
-__declspec(weak) extern int __OSIsGcam;
+DECL_WEAK extern int __OSIsGcam;
 extern OSExecParams __OSRebootParams;
 extern OSTime __OSStartTime;
 extern int __OSInIPL;
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index a44be3988c..ad119905a9 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -43,10 +43,30 @@ typedef unsigned int uint;
 //#define AT_ADDRESS(addr) __attribute__((address((addr))))
 #define AT_ADDRESS(addr)  // was removed in GCC. define in linker script instead.
 #else
-#error unknown compiler
+#define AT_ADDRESS(addr)
 #endif
 
+#ifndef ATTRIBUTE_ALIGN
+#if defined(__MWERKS__) || defined(__GNUC__)
 #define ATTRIBUTE_ALIGN(num) __attribute__((aligned(num)))
+#elif defined(_MSC_VER)
+#define ATTRIBUTE_ALIGN(num)
+#else
+#error unknown compiler
+#endif
+#endif
+
+#ifndef DECL_WEAK
+#if defined(__MWERKS__)
+#define DECL_WEAK __declspec(weak)
+#elif defined(__GNUC__)
+#define DECL_WEAK __attribute__((weak))
+#elif defined(_MSC_VER)
+#define DECL_WEAK
+#else
+#error unknown compiler
+#endif
+#endif
 
 #ifndef NULL
 #ifdef  __cplusplus
@@ -56,7 +76,7 @@ typedef unsigned int uint;
 #endif
 #endif
 
-#include "stddef.h"
+#include <stddef.h>
 
 #endif
 #endif
diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h
index a5cb57a90d..0d3c80ed88 100644
--- a/include/f_ap/f_ap_game.h
+++ b/include/f_ap/f_ap_game.h
@@ -14,13 +14,13 @@ void fapGm_Execute();
 
 class fapGm_HIO_c : public JORReflexible {
 public:
-    /* 80018944 */ fapGm_HIO_c();
+    fapGm_HIO_c();
 
     #if DEBUG
     virtual void listenPropertyEvent(const JORPropertyEvent*);
     virtual void genMessage(JORMContext*);
     #endif
-    /* 80018AE0 */ virtual ~fapGm_HIO_c();
+    virtual ~fapGm_HIO_c();
 
     #if DEBUG
     static void startCpuTimer();
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index 6a9e2a9bab..fe05200d8c 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -304,10 +304,10 @@ public:
         fopEn_throwMode_ThrowRight = 0x10,
     };
 
-    /* 80019404 */ BOOL initBallModel();
-    /* 800194FC */ bool checkBallModelDraw();
-    /* 80019520 */ void setBallModelEffect(dKy_tevstr_c*);
-    /* 800196A0 */ void drawBallModel(dKy_tevstr_c*);
+    BOOL initBallModel();
+    bool checkBallModelDraw();
+    void setBallModelEffect(dKy_tevstr_c*);
+    void drawBallModel(dKy_tevstr_c*);
 
     bool checkWolfNoLock() const { return mFlags & fopEn_flag_WolfNoLock; }
     BOOL checkHeadLockFlg() const { return mFlags & fopEn_flag_HeadLock; }
diff --git a/include/global.h b/include/global.h
index 695513b924..dbd2d613bf 100644
--- a/include/global.h
+++ b/include/global.h
@@ -27,8 +27,6 @@
 #define REGION_KOR (VERSION == VERSION_WII_KOR)
 #define REGION_CHN (VERSION == VERSION_SHIELD || VERSION == VERSION_SHIELD_PROD || VERSION == VERSION_SHIELD_DEBUG)
 
-#define ALIGN_DECL(ALIGNMENT) __attribute__((aligned(ALIGNMENT)))
-
 #define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0]))
 #define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0]))
 
@@ -60,12 +58,14 @@
 #define STATIC_ASSERT(...)
 #endif
 
+#ifdef __MWERKS__
 // Intrinsics
 extern int __cntlzw(unsigned int);
 extern int __rlwimi(int, int, int, int, int);
 extern void __dcbz(void*, int);
 extern void __sync();
 extern int __abs(int);
+#endif
 
 #ifndef __MWERKS__
 void* __memcpy(void*, const void*, int);
diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h
index 505778cbe4..cbacaa9437 100644
--- a/include/m_Do/m_Do_dvd_thread.h
+++ b/include/m_Do/m_Do_dvd_thread.h
@@ -19,8 +19,8 @@ public:
     /* 0x0C */ bool mIsDone;
     /* 0x10  vtable*/
 public:
-    /* 800158FC */ virtual ~mDoDvdThd_command_c();
-    /* 80015B74 */ mDoDvdThd_command_c();
+    virtual ~mDoDvdThd_command_c();
+    mDoDvdThd_command_c();
     inline s32 sync() { return mIsDone; }
     inline void destroy() { delete this; }
     virtual s32 execute() = 0;
@@ -28,10 +28,10 @@ public:
 
 class mDoDvdThd_toMainRam_c : public mDoDvdThd_command_c {
 public:
-    /* 80016338 */ mDoDvdThd_toMainRam_c(u8);
-    /* 80016394 */ static mDoDvdThd_toMainRam_c* create(char const*, u8, JKRHeap*);
-    /* 8001645C */ virtual ~mDoDvdThd_toMainRam_c();
-    /* 800164BC */ virtual s32 execute();
+    mDoDvdThd_toMainRam_c(u8);
+    static mDoDvdThd_toMainRam_c* create(char const*, u8, JKRHeap*);
+    virtual ~mDoDvdThd_toMainRam_c();
+    virtual s32 execute();
 
     void* getMemAddress() const { return mData; }
 
@@ -45,13 +45,13 @@ private:
 
 class mDoDvdThd_param_c {
 public:
-    /* 80015944 */ mDoDvdThd_param_c();
-    /* 8001598C */ void kick();
-    /* 800159B4 */ s32 waitForKick();
-    /* 800159DC */ mDoDvdThd_command_c* getFirstCommand();
-    /* 800159E4 */ void addition(mDoDvdThd_command_c*);
-    /* 80015A3C */ void cut(mDoDvdThd_command_c*);
-    /* 80015AD8 */ void mainLoop();
+    mDoDvdThd_param_c();
+    void kick();
+    s32 waitForKick();
+    mDoDvdThd_command_c* getFirstCommand();
+    void addition(mDoDvdThd_command_c*);
+    void cut(mDoDvdThd_command_c*);
+    void mainLoop();
 
 private:
     /* 0x00 */ OSMessageQueue mMessageQueue;
@@ -62,11 +62,11 @@ private:
 
 class mDoDvdThd_mountXArchive_c : public mDoDvdThd_command_c {
 public:
-    /* 80016108 */ virtual ~mDoDvdThd_mountXArchive_c();
-    /* 80016168 */ mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode);
-    /* 800161E0 */ static mDoDvdThd_mountXArchive_c* create(char const*, u8, JKRArchive::EMountMode,
+    virtual ~mDoDvdThd_mountXArchive_c();
+    mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode);
+    static mDoDvdThd_mountXArchive_c* create(char const*, u8, JKRArchive::EMountMode,
                                                             JKRHeap*);
-    /* 800162B0 */ virtual s32 execute();
+    virtual s32 execute();
 
     JKRArchive* getArchive() const { return mArchive; }
 
@@ -80,10 +80,10 @@ private:
 
 class mDoDvdThd_mountArchive_c : public mDoDvdThd_command_c {
 public:
-    /* 80015D44 */ virtual ~mDoDvdThd_mountArchive_c();
-    /* 80015DA4 */ mDoDvdThd_mountArchive_c(u8);
-    /* 80015E14 */ static mDoDvdThd_mountArchive_c* create(char const*, u8, JKRHeap*);
-    /* 80015EDC */ virtual s32 execute();
+    virtual ~mDoDvdThd_mountArchive_c();
+    mDoDvdThd_mountArchive_c(u8);
+    static mDoDvdThd_mountArchive_c* create(char const*, u8, JKRHeap*);
+    virtual s32 execute();
 
     JKRMemArchive* getArchive() const { return mArchive; }
     JKRHeap* getHeap() const { return mHeap; }
@@ -97,10 +97,10 @@ private:
 
 class mDoDvdThd_callback_c : public mDoDvdThd_command_c {
 public:
-    /* 80015BB8 */ virtual ~mDoDvdThd_callback_c();
-    /* 80015C18 */ mDoDvdThd_callback_c(mDoDvdThd_callback_func, void*);
-    /* 80015C74 */ static mDoDvdThd_callback_c* create(mDoDvdThd_callback_func, void*);
-    /* 80015CF0 */ virtual s32 execute();
+    virtual ~mDoDvdThd_callback_c();
+    mDoDvdThd_callback_c(mDoDvdThd_callback_func, void*);
+    static mDoDvdThd_callback_c* create(mDoDvdThd_callback_func, void*);
+    virtual s32 execute();
 
 private:
     /* 0x14 */ mDoDvdThd_callback_func mFunction;
@@ -110,12 +110,12 @@ private:
 
 struct mDoDvdThdStack {
     u8 stack[4096];
-} __attribute__((aligned(16)));
+} ATTRIBUTE_ALIGN(16);
 
 struct mDoDvdThd {
-    /* 800157FC */ static s32 main(void*);
-    /* 80015858 */ static void create(s32);
-    /* 800158B4 */ static void suspend();
+    static s32 main(void*);
+    static void create(s32);
+    static void suspend();
 
     static OSThread l_thread;
     static mDoDvdThdStack l_threadStack;
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index bc3aa12e7c..751ece4b00 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -28,9 +28,9 @@ void DummyCheckHeap_destroy();
 class mDoExt_baseAnm {
 public:
     mDoExt_baseAnm() {}
-    /* 8000D320 */ int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
+    int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
                                 s16 i_endF);
-    /* 8000D428 */ int play();
+    int play();
 
     J3DFrameCtrl* getFrameCtrl() { return &mFrameCtrl; }
     f32 getPlaySpeed() { return mFrameCtrl.getRate(); }
@@ -65,9 +65,9 @@ private:
 class mDoExt_btkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_btkAnm() { mpAnm = 0; }
-    /* 8000D63C */ int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D6D8 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -94,9 +94,9 @@ STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18);
 class mDoExt_brkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_brkAnm() { mpAnm = 0; }
-    /* 8000D70C */ int init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D7A8 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -124,9 +124,9 @@ STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18);
 class mDoExt_bpkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_bpkAnm() { mpAnm = 0; }
-    /* 8000D47C */ int init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D518 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -151,11 +151,11 @@ STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18);
 class mDoExt_bckAnm : public mDoExt_baseAnm {
 public:
     mDoExt_bckAnm() { mpMtxCalc = NULL; }
-    /* 8000D7DC */ int init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate,
+    int init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate,
                             s16 i_startF, s16 i_endF, bool i_modify);
-    /* 8000D990 */ void changeBckOnly(J3DAnmTransform* i_bck);
-    /* 8000D9CC */ void entry(J3DModelData* i_modelData, f32 i_frame);
-    /* 8000D9E8 */ void entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame);
+    void changeBckOnly(J3DAnmTransform* i_bck);
+    void entry(J3DModelData* i_modelData, f32 i_frame);
+    void entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame);
     inline void entryJoint(J3DModelData* i_modelData, u16 i_jntNo) {
         entryJoint(i_modelData, i_jntNo, getFrame());
     }
@@ -182,9 +182,9 @@ STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C);
 class mDoExt_btpAnm : public mDoExt_baseAnm {
 public:
     mDoExt_btpAnm() { mpAnm = NULL; }
-    /* 8000D54C */ int init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D5E8 */ void entry(J3DMaterialTable* i_matTable, s16 i_frame);
+    void entry(J3DMaterialTable* i_matTable, s16 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, s16 i_frame) {
@@ -211,7 +211,7 @@ public:
         mpAnm = NULL;
     }
 
-    /* 8000DA08 */ int init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay,
+    int init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
 
     J3DAnmCluster* getBlkAnm() { return mpAnm; }
@@ -245,10 +245,10 @@ private:
 
 class mDoExt_invJntPacket : public J3DPacket {
 public:
-    /* 8000E654 */ mDoExt_invJntPacket() {}
+    mDoExt_invJntPacket() {}
 
-    /* 80012220 */ virtual void draw();
-    /* 8000E5F8 */ virtual ~mDoExt_invJntPacket() {}
+    virtual void draw();
+    virtual ~mDoExt_invJntPacket() {}
 
     void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) {
         field_0x10 = i_model;
@@ -265,9 +265,9 @@ private:
 class mDoExt_invisibleModel {
 public:
     mDoExt_invisibleModel() {}
-    /* 8000E53C */ int create(J3DModel* i_model, u8 param_1);
-    /* 8000E6C8 */ void entryJoint(cXyz*);
-    /* 8000E7C0 */ void entryDL(cXyz*);
+    int create(J3DModel* i_model, u8 param_1);
+    void entryJoint(cXyz*);
+    void entryDL(cXyz*);
 
     /* 0x0 */ J3DModel* mModel;
     /* 0x4 */ mDoExt_invJntPacket* mpPackets;
@@ -291,11 +291,11 @@ public:
 class mDoExt_morf_c
     : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya> {
 public:
-    /* 8000F950 */ mDoExt_morf_c();
-    /* 8000FB7C */ void setMorf(f32 i_morf);
-    /* 8000FBC0 */ void frameUpdate();
+    mDoExt_morf_c();
+    void setMorf(f32 i_morf);
+    void frameUpdate();
 
-    /* 8000FAE8 */ virtual ~mDoExt_morf_c();
+    virtual ~mDoExt_morf_c();
 
     J3DAnmTransform* getAnm() { return mpAnm; }
     void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; }
@@ -330,22 +330,22 @@ public:
 
 class mDoExt_McaMorfSO : public mDoExt_morf_c {
 public:
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
                                     int, Z2Creature*, u32, u32);
-    /* 800108F0 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
                               J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
+    void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
                                f32 i_start, f32 i_end);
-    /* 800110B0 */ int play(u32, s8);
-    /* 80011154 */ void updateDL();
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011250 */ void getTransform(u16, J3DTransformInfo*);
-    /* 80011310 */ void stopZelAnime();
+    int play(u32, s8);
+    void updateDL();
+    void entryDL();
+    void modelCalc();
+    void getTransform(u16, J3DTransformInfo*);
+    void stopZelAnime();
 
-    /* 80010888 */ virtual ~mDoExt_McaMorfSO();
-    /* 80010B68 */ virtual void calc();
+    virtual ~mDoExt_McaMorfSO();
+    virtual void calc();
 
     J3DModel* getModel() { return mpModel; }
     void offMorfNone() { mMorfNone = false; }
@@ -368,19 +368,19 @@ private:
 
 class mDoExt_McaMorf : public mDoExt_morf_c {
 public:
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                   mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
                                   int, void*, u32, u32);
-    /* 8000FD94 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
                               J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32);
-    /* 8001037C */ void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas);
-    /* 800105C8 */ u32 play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-    /* 80010710 */ void getTransform(u16, J3DTransformInfo*);
+    void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas);
+    u32 play(Vec*, u32, s8);
+    void entryDL();
+    void modelCalc();
+    void getTransform(u16, J3DTransformInfo*);
 
-    /* 8000FD10 */ virtual ~mDoExt_McaMorf();
-    /* 80010074 */ virtual void calc();
+    virtual ~mDoExt_McaMorf();
+    virtual void calc();
 
     J3DModel* getModel() { return mpModel; }
 
@@ -396,22 +396,22 @@ private:
 
 class mDoExt_McaMorf2 : public mDoExt_morf_c {
 public:
-    /* 80011348 */ mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*,
                                    int, f32, int, int, Z2Creature*, u32, u32);
-    /* 80011464 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int,
                                f32, int, int, Z2Creature*, u32, u32);
-    /* 800116B4 */ void ERROR_EXIT();
-    /* 80011D70 */ void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32);
-    /* 80011FCC */ void setAnmRate(f32);
-    /* 800120A0 */ int play(u32, s8);
-    /* 80012144 */ void entryDL();
-    /* 80012170 */ void modelCalc();
-    /* 800121E8 */ void stopZelAnime();
+    void ERROR_EXIT();
+    void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32);
+    void setAnmRate(f32);
+    int play(u32, s8);
+    void entryDL();
+    void modelCalc();
+    void stopZelAnime();
 
-    /* 800113FC */ virtual ~mDoExt_McaMorf2();
-    /* 800116F4 */ virtual void calc();
+    virtual ~mDoExt_McaMorf2();
+    virtual void calc();
 
     inline f32 getAnmRate() { return mAnmRate; }
     inline void changeAnm(J3DAnmTransform* anm, J3DAnmTransform* anm2) {
@@ -430,8 +430,8 @@ private:
 
 class mDoExt_MtxCalcOldFrame {
 public:
-    /* 8000F848 */ void initOldFrameMorf(f32, u16, u16);
-    /* 8000F8CC */ void decOldFrameMorfCounter();
+    void initOldFrameMorf(f32, u16, u16);
+    void decOldFrameMorfCounter();
 
     mDoExt_MtxCalcOldFrame(J3DTransformInfo* i_transinf, Quaternion* i_quat) {
         mOldFrameTransInfo = i_transinf;
@@ -484,8 +484,8 @@ struct mDoExt_MtxCalcAnmBlendTbl
     J3DAnmTransform* getAnm(int i) { return mAnmRatio[i].getAnmTransform(); }
     f32 getRatio(int i) { return mAnmRatio[i].getRatio(); }
 
-    /* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
-    /* 8000F26C */ virtual void calc();
+    virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
+    virtual void calc();
 
     /* 0x4 */ int mNum;
     /* 0x8 */ mDoExt_AnmRatioPack* mAnmRatio;
@@ -499,8 +499,8 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl {
         : mDoExt_MtxCalcAnmBlendTbl(num, anmRatio) {
         mOldFrame = oldFrame;
     }
-    /* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
-    /* 8000F4B0 */ virtual void calc();
+    virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
+    virtual void calc();
 
     /* 0xC */ mDoExt_MtxCalcOldFrame* mOldFrame;
 };  // Size: 0x10
@@ -520,8 +520,8 @@ struct mDoExt_3Dline_field_0x18_c {
 
 class mDoExt_3Dline_c {
 public:
-    /* 800123D0 */ int init(u16, int, BOOL);
-    /* 800126BC */ mDoExt_3Dline_c() {}
+    int init(u16, int, BOOL);
+    mDoExt_3Dline_c() {}
 
     /* 0x00 */ cXyz* field_0x0;
     /* 0x04 */ f32* field_0x4;
@@ -549,7 +549,7 @@ public:
     void reset() { mp3DlineMat = NULL; }
     void setMatDark(mDoExt_3DlineMat_c* i_mat) { setMat(i_mat); }
 
-    /* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
+    void setMat(mDoExt_3DlineMat_c*);
     virtual void draw();
     virtual ~mDoExt_3DlineMatSortPacket() {}
 
@@ -560,12 +560,12 @@ private:
 class dKy_tevstr_c;
 class mDoExt_3DlineMat1_c : public mDoExt_3DlineMat_c {
 public:
-    /* 80013360 */ int init(u16, u16, ResTIMG*, int);
-    /* 80013FB0 */ void update(int, GXColor&, dKy_tevstr_c*);
-    /* 8001373C */ void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
-    /* 80014E7C */ int getMaterialID() { return 1; }
-    /* 800134F8 */ void setMaterial();
-    /* 800135D0 */ void draw();
+    int init(u16, u16, ResTIMG*, int);
+    void update(int, GXColor&, dKy_tevstr_c*);
+    void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
+    int getMaterialID() { return 1; }
+    void setMaterial();
+    void draw();
 
     cXyz* getPos(int i_idx) { return mpLines[i_idx].field_0x0; }
     f32* getSize(int i_idx) { return mpLines[i_idx].field_0x4; }
@@ -583,13 +583,13 @@ private:
 
 class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c {
 public:
-    /* 800125E0 */ int init(u16, u16, int);
-    /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
-    /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
+    int init(u16, u16, int);
+    void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
+    void update(int, _GXColor&, dKy_tevstr_c*);
 
-    /* 80014E84 */ virtual int getMaterialID() { return 0; }
-    /* 800126C0 */ virtual void setMaterial();
-    /* 80012774 */ virtual void draw();
+    virtual int getMaterialID() { return 0; }
+    virtual void setMaterial();
+    virtual void draw();
 
     cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; }
     f32* getSize(int param_0) { return field_0x18[param_0].field_0x4; }
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 324f2e9db0..fd50e4a082 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -23,9 +23,9 @@ public:
     class bloom_c {
     public:
         bloom_c() { m_buffer = NULL; }
-        /* 80009544 */ void create();
-        /* 800095F8 */ void remove();
-        /* 80009650 */ void draw();
+        void create();
+        void remove();
+        void draw();
 
         u8 getEnable() { return mEnable; }
         void setEnable(u8 i_enable) { mEnable = i_enable; }
@@ -66,17 +66,17 @@ public:
     static void entryBaseCsr(csr_c*);
     #endif
 
-    /* 80007E44 */ static void create();
-    /* 80007F90 */ static void beginRender();
-    /* 800080D0 */ static void fadeOut(f32);
-    /* 80007FD8 */ static void fadeOut(f32, _GXColor&);
-    /* 807DFAB4 */ static void fadeIn(f32 fadeSpeed, _GXColor& fadeColor) {
+    static void create();
+    static void beginRender();
+    static void fadeOut(f32);
+    static void fadeOut(f32, _GXColor&);
+    static void fadeIn(f32 fadeSpeed, _GXColor& fadeColor) {
         fadeOut(-fadeSpeed, fadeColor);
     }
-    /* 80008028 */ static void fadeOut_f(f32, _GXColor&);
-    /* 800080A0 */ static void onBlure(const Mtx);
-    /* 80008078 */ static void onBlure();
-    /* 80008330 */ static void calcFade();
+    static void fadeOut_f(f32, _GXColor&);
+    static void onBlure(const Mtx);
+    static void onBlure();
+    static void calcFade();
 
     static void fadeIn(f32 fadeSpeed) {
         fadeOut(-fadeSpeed);
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index 5465e909d7..31b5b5f700 100644
--- a/include/m_Do/m_Do_lib.h
+++ b/include/m_Do/m_Do_lib.h
@@ -9,7 +9,7 @@ typedef struct Vec Vec;
 struct ResTIMG;
 
 struct mDoLib_clipper {
-    /* 8001528C */ static void setup(f32, f32, f32, f32);
+    static void setup(f32, f32, f32, f32);
 
     static void changeFar(f32 far) {
         mClipper.setFar(far);
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index 4726c89168..5f749ed073 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -157,20 +157,20 @@ public:
         end = buffer + 16;
     }
 
-    /* 8000CCC8 */ static bool push();
-    /* 8000CD14 */ static bool pop();
+    static bool push();
+    static bool pop();
 
     /**
      * Translates the `now` Matrix by the given cXyz
      * @param xyz The xyz translation vector
      */
-    /* 8000CD64 */ static void transS(cXyz const& xyz);
+    static void transS(cXyz const& xyz);
 
     /**
      * Translates a new Matrix by the given cXyz and then concatenates it with the `now` matrix
      * @param xyz The xyz translation vector
      */
-    /* 8000CDD4 */ static void transM(cXyz const& xyz);
+    static void transM(cXyz const& xyz);
 
     /**
      * Translates a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -178,19 +178,19 @@ public:
      * @param y The y-axis translation value
      * @param z The z-axis translation value
      */
-    /* 8000CD9C */ static void transM(f32 x, f32 y, f32 z);
+    static void transM(f32 x, f32 y, f32 z);
 
     /**
      * Scales the `now` Matrix by the given cXyz
      * @param xyz The xyz scale vector
      */
-    /* 8000CE00 */ static void scaleS(cXyz const& xyz);
+    static void scaleS(cXyz const& xyz);
 
     /**
      * Scales a new Matrix by the given cXyz and then concatenates it with the `now` matrix
      * @param xyz The xyz scale vector
      */
-    /* 8000CE70 */ static void scaleM(cXyz const& xyz);
+    static void scaleM(cXyz const& xyz);
 
     /**
      * Scales a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -198,30 +198,30 @@ public:
      * @param y The y-axis scale value
      * @param z The z-axis scale value
      */
-    /* 8000CE38 */ static void scaleM(f32 x, f32 y, f32 z);
+    static void scaleM(f32 x, f32 y, f32 z);
 
-    /* 8000CE9C */ static void XYZrotS(csXyz const& xyz);
+    static void XYZrotS(csXyz const& xyz);
 
     /**
      * Rotates the `now` matrix by the given csXyz in the order Z, Y, X
      * @param xyz The xyz rotation vector
      */
-    /* 8000CED4 */ static void XYZrotM(csXyz const& xyz);
+    static void XYZrotM(csXyz const& xyz);
 
-    /* 8000CF0C */ static void ZXYrotS(csXyz const& xyz);
+    static void ZXYrotS(csXyz const& xyz);
 
     /**
      * Rotates the `now` matrix by the given csXyz in the order X, Y, Z
      * @param xyz The xyz rotation vector
      */
-    /* 8000CF44 */ static void ZXYrotM(csXyz const& xyz);
+    static void ZXYrotM(csXyz const& xyz);
 
     static void quatS(const Quaternion* quat) {
         MTXQuat(now, quat);
     }
 
-    /* 8000CF7C */ static void quatM(Quaternion const*);
-    /* 8000D070 */ ~mDoMtx_stack_c() {}  // inline
+    static void quatM(Quaternion const*);
+    ~mDoMtx_stack_c() {}  // inline
 
     /**
      * Returns the `now` Matrix
diff --git a/include/revolution/dsp.h b/include/revolution/dsp.h
index e8fc5762ae..b78b870474 100644
--- a/include/revolution/dsp.h
+++ b/include/revolution/dsp.h
@@ -44,7 +44,7 @@ void DSPReset(void);
 void DSPHalt(void);
 void DSPUnhalt(void);
 u32 DSPGetDMAStatus(void);
-__declspec(weak) DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
+DECL_WEAK DSPTaskInfo* DSPAddTask(DSPTaskInfo* task);
 DSPTaskInfo* DSPCancelTask(DSPTaskInfo* task);
 DSPTaskInfo* DSPAssertTask(DSPTaskInfo* task);
 
diff --git a/include/revolution/os.h b/include/revolution/os.h
index 93def45f21..626c85d2f9 100644
--- a/include/revolution/os.h
+++ b/include/revolution/os.h
@@ -212,24 +212,24 @@ void OSSetSoundMode(u32 mode);
 
 u8 OSGetAppType(void);
 
-__declspec(weak) void OSReport(const char* msg, ...);
-__declspec(weak) void OSVReport(const char* msg, va_list list);
-__declspec(weak) void OSPanic(const char* file, int line, const char* msg, ...);
+DECL_WEAK void OSReport(const char* msg, ...);
+DECL_WEAK void OSVReport(const char* msg, va_list list);
+DECL_WEAK void OSPanic(const char* file, int line, const char* msg, ...);
 void OSFatal(GXColor fg, GXColor bg, const char* msg);
 
 // do these belong here?
-__declspec(weak) void OSAttention(const char* msg, ...);
-__declspec(weak) void OSReport_Error(const char* fmt, ...);
-__declspec(weak) void OSReport_FatalError(const char* fmt, ...);
-__declspec(weak) void OSReport_System(const char* fmt, ...);
-__declspec(weak) void OSReport_Warning(const char* fmt, ...);
-__declspec(weak) void OSReportDisable(void);
-__declspec(weak) void OSReportEnable(void);
-__declspec(weak) void OSReportForceEnableOff(void);
-__declspec(weak) void OSReportForceEnableOn(void);
-__declspec(weak) void OSVReport(const char* format, va_list list);
+DECL_WEAK void OSAttention(const char* msg, ...);
+DECL_WEAK void OSReport_Error(const char* fmt, ...);
+DECL_WEAK void OSReport_FatalError(const char* fmt, ...);
+DECL_WEAK void OSReport_System(const char* fmt, ...);
+DECL_WEAK void OSReport_Warning(const char* fmt, ...);
+DECL_WEAK void OSReportDisable(void);
+DECL_WEAK void OSReportEnable(void);
+DECL_WEAK void OSReportForceEnableOff(void);
+DECL_WEAK void OSReportForceEnableOn(void);
+DECL_WEAK void OSVReport(const char* format, va_list list);
 
-__declspec(weak) void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
+DECL_WEAK void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
 
 #ifdef DEBUG
 #define OS_REPORT(...) OSReport(__VA_ARGS__)
@@ -273,7 +273,7 @@ void* OSUncachedToCached(void* ucaddr);
 
 // unsorted externs
 extern OSTime __OSGetSystemTime(void);
-__declspec(weak) extern int __OSIsGcam;
+DECL_WEAK extern int __OSIsGcam;
 extern OSExecParams __OSRebootParams;
 extern OSTime __OSStartTime;
 extern int __OSInIPL;
@@ -307,19 +307,20 @@ extern BOOL __OSInReboot;
 #define ASSERT(cond) ASSERTLINE(__LINE__, cond)
 
 inline s16 __OSf32tos16(register f32 inF) {
+#ifdef __MWERKS__
     register s16 out;
     u32 tmp;
     register u32* tmpPtr = &tmp;
     // clang-format off
-#ifdef __MWERKS__
+
     asm {
         psq_st inF, 0(tmpPtr), 0x1, 5
         lha out, 0(tmpPtr)
     }
-#endif
-    // clang-format on
 
+    // clang-format on
     return out;
+#endif
 }
 
 inline void OSf32tos16(f32* f, s16* out) {
@@ -327,19 +328,20 @@ inline void OSf32tos16(f32* f, s16* out) {
 }
 
 inline u8 __OSf32tou8(register f32 inF) {
+#ifdef __MWERKS__
     register u8 out;
     u32 tmp;
     register u32* tmpPtr = &tmp;
     // clang-format off
-#ifdef __MWERKS__
+
     asm {
         psq_st inF, 0(tmpPtr), 0x1, 2
         lbz out, 0(tmpPtr)
     }
-#endif
-    // clang-format on
 
+    // clang-format on
     return out;
+#endif
 }
 
 inline void OSf32tou8(f32* f, u8* out) {
diff --git a/include/revolution/types.h b/include/revolution/types.h
index fdb5fb8ef6..c077f05412 100644
--- a/include/revolution/types.h
+++ b/include/revolution/types.h
@@ -40,10 +40,30 @@ typedef unsigned int uint;
 //#define AT_ADDRESS(addr) __attribute__((address((addr))))
 #define AT_ADDRESS(addr)  // was removed in GCC. define in linker script instead.
 #else
-#error unknown compiler
+#define AT_ADDRESS(addr)
 #endif
 
+#ifndef ATTRIBUTE_ALIGN
+#if defined(__MWERKS__) || defined(__GNUC__)
 #define ATTRIBUTE_ALIGN(num) __attribute__((aligned(num)))
+#elif defined(_MSC_VER)
+#define ATTRIBUTE_ALIGN(num)
+#else
+#error unknown compiler
+#endif
+#endif
+
+#ifndef DECL_WEAK
+#if defined(__MWERKS__)
+#define DECL_WEAK __declspec(weak)
+#elif defined(__GNUC__)
+#define DECL_WEAK __attribute__((weak))
+#elif defined(_MSC_VER)
+#define DECL_WEAK
+#else
+#error unknown compiler
+#endif
+#endif
 
 #ifndef NULL
 #ifdef  __cplusplus
@@ -53,6 +73,6 @@ typedef unsigned int uint;
 #endif
 #endif
 
-#include "stddef.h"
+#include <stddef.h>
 
 #endif
diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 8b9124909f..1697151b55 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -12,16 +12,10 @@
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 80451138-8045113C 000638 0004+00 3/3 0/0 0/0 .sbss            mFirst__24DynamicModuleControlBase
- */
 DynamicModuleControlBase* DynamicModuleControlBase::mFirst;
 
-/* 8045113C-80451140 00063C 0004+00 2/2 0/0 0/0 .sbss            mLast__24DynamicModuleControlBase
- */
 DynamicModuleControlBase* DynamicModuleControlBase::mLast;
 
-/* 802621CC-80262284 25CB0C 00B8+00 1/0 2/2 0/0 .text            __dt__24DynamicModuleControlBaseFv
- */
 DynamicModuleControlBase::~DynamicModuleControlBase() {
     force_unlink();
     if (mPrev != NULL) {
@@ -40,8 +34,6 @@ DynamicModuleControlBase::~DynamicModuleControlBase() {
     mPrev = NULL;
 }
 
-/* 80262284-802622D0 25CBC4 004C+00 1/1 0/0 0/0 .text            __ct__24DynamicModuleControlBaseFv
- */
 DynamicModuleControlBase::DynamicModuleControlBase() {
     mLinkCount = 0;
     mDoLinkCount = 0;
@@ -56,8 +48,6 @@ DynamicModuleControlBase::DynamicModuleControlBase() {
     mLast = this;
 }
 
-/* 802622D0-80262364 25CC10 0094+00 0/0 2/2 0/0 .text            link__24DynamicModuleControlBaseFv
- */
 BOOL DynamicModuleControlBase::link() {
     if (mLinkCount == 0) {
         do_load();
@@ -74,7 +64,6 @@ BOOL DynamicModuleControlBase::link() {
     return true;
 }
 
-/* 80262364-802623EC 25CCA4 0088+00 0/0 1/1 0/0 .text unlink__24DynamicModuleControlBaseFv */
 BOOL DynamicModuleControlBase::unlink() {
     if (mLinkCount != 0) {
         mLinkCount--;
@@ -89,7 +78,6 @@ BOOL DynamicModuleControlBase::unlink() {
     return true;
 }
 
-/* 802623EC-8026242C 25CD2C 0040+00 0/0 1/1 0/0 .text load_async__24DynamicModuleControlBaseFv */
 BOOL DynamicModuleControlBase::load_async() {
     if (mLinkCount == 0) {
         return do_load_async();
@@ -97,8 +85,6 @@ BOOL DynamicModuleControlBase::load_async() {
     return true;
 }
 
-/* 8026242C-80262470 25CD6C 0044+00 1/1 0/0 0/0 .text force_unlink__24DynamicModuleControlBaseFv
- */
 bool DynamicModuleControlBase::force_unlink() {
     if (mLinkCount != 0) {
         mLinkCount = 0;
@@ -107,8 +93,6 @@ bool DynamicModuleControlBase::force_unlink() {
     return true;
 }
 
-/* 80262470-80262660 25CDB0 01F0+00 2/0 2/2 0/0 .text            dump__24DynamicModuleControlBaseFv
- */
 void DynamicModuleControlBase::dump() {
     u16 doLinkCount;
     u16 linkCount;
@@ -142,7 +126,6 @@ void DynamicModuleControlBase::dump() {
     JUTReportConsole_f("TotalSize %6.2f %06x\n\n", totalSize / 1024.0f, totalSize);
 }
 
-/* 80262660-802626D0 25CFA0 0070+00 0/0 2/2 0/0 .text            __ct__20DynamicModuleControlFPCc */
 DynamicModuleControl::DynamicModuleControl(char const* name) {
     mModule = NULL;
     mBss = NULL;
@@ -155,21 +138,14 @@ DynamicModuleControl::DynamicModuleControl(char const* name) {
     mAsyncLoadCallback = NULL;
 }
 
-/* ############################################################################################## */
-/* 80451140-80451144 000640 0004+00 3/3 0/0 0/0 .sbss            sAllocBytes__20DynamicModuleControl
- */
 u32 DynamicModuleControl::sAllocBytes;
 
-/* 80451144-80451148 000644 0004+00 3/3 0/0 0/0 .sbss            sArchive__20DynamicModuleControl */
 JKRArchive* DynamicModuleControl::sArchive;
 
-/* 80451148-80451150 000648 0004+04 3/3 0/0 0/0 .sbss            sFileCache__20DynamicModuleControl
- */
 JKRFileCache* DynamicModuleControl::sFileCache;
 
 static const char* baseString = "Base";
 
-/* 802626D0-8026275C 25D010 008C+00 1/1 0/0 0/0 .text mountCallback__20DynamicModuleControlFPv */
 JKRArchive* DynamicModuleControl::mountCallback(void* param_0) {
     JKRExpHeap* heap = mDoExt_getArchiveHeap();
     sFileCache = JKRFileCache::mount("/rel/Final/Release", heap, NULL);
@@ -183,7 +159,6 @@ JKRArchive* DynamicModuleControl::mountCallback(void* param_0) {
     return sArchive;
 }
 
-/* 8026275C-80262794 25D09C 0038+00 0/0 1/1 0/0 .text initialize__20DynamicModuleControlFv */
 bool DynamicModuleControl::initialize() {
     sFileCache = NULL;
     sAllocBytes = 0;
@@ -192,14 +167,11 @@ bool DynamicModuleControl::initialize() {
     return true;
 }
 
-/* 80262794-802627C0 25D0D4 002C+00 1/1 0/0 0/0 .text            callback__20DynamicModuleControlFPv
- */
 bool DynamicModuleControl::callback(void* moduleControlPtr) {
     DynamicModuleControl* moduleControl = (DynamicModuleControl*)moduleControlPtr;
     return moduleControl->do_load();
 }
 
-/* 802627C0-802627E8 25D100 0028+00 1/1 0/0 0/0 .text            calcSum2__FPCUsUl */
 static u32 calcSum2(u16 const* data, u32 size) {
     u32 sum = 0;
     while (size > 0) {
@@ -210,8 +182,6 @@ static u32 calcSum2(u16 const* data, u32 size) {
     return sum;
 }
 
-/* 802627E8-80262AFC 25D128 0314+00 1/0 0/0 0/0 .text            do_load__20DynamicModuleControlFv
- */
 bool DynamicModuleControl::do_load() {
     if (mModule != NULL) {
         return true;
@@ -311,7 +281,6 @@ bool DynamicModuleControl::do_load() {
     return true;
 }
 
-/* 80262AFC-80262BC4 25D43C 00C8+00 1/0 0/0 0/0 .text do_load_async__20DynamicModuleControlFv */
 BOOL DynamicModuleControl::do_load_async() {
     if (mAsyncLoadCallback == NULL) {
         if (mModule != NULL) {
@@ -334,8 +303,6 @@ BOOL DynamicModuleControl::do_load_async() {
     }
 }
 
-/* 80262BC4-80262C0C 25D504 0048+00 1/0 0/0 0/0 .text            do_unload__20DynamicModuleControlFv
- */
 bool DynamicModuleControl::do_unload() {
     if (mModule != NULL) {
         JKRFree(mModule);
@@ -344,7 +311,6 @@ bool DynamicModuleControl::do_unload() {
     return true;
 }
 
-/* 80262C0C-80262C5C 25D54C 0050+00 1/0 0/0 0/0 .text            dump2__20DynamicModuleControlFv */
 void DynamicModuleControl::dump2() {
     if (mModule != NULL) {
         OSSectionInfo* section = (OSSectionInfo*)mModule->info.sectionInfoOffset;
@@ -354,8 +320,6 @@ void DynamicModuleControl::dump2() {
     }
 }
 
-/* 80262C5C-80262F28 25D59C 02CC+00 1/0 0/0 0/0 .text            do_link__20DynamicModuleControlFv
- */
 BOOL DynamicModuleControl::do_link() {
     OSGetTime();
     if (mModule == NULL) {
@@ -452,8 +416,6 @@ error:
     return FALSE;
 }
 
-/* 80262F28-80263000 25D868 00D8+00 1/0 0/0 0/0 .text            do_unlink__20DynamicModuleControlFv
- */
 bool DynamicModuleControl::do_unlink() {
     OSTime time1 = OSGetTime();
     ((void (*)())mModule->epilog)();
@@ -474,7 +436,6 @@ bool DynamicModuleControl::do_unlink() {
     return true;
 }
 
-/* 80263000-80263070 25D940 0070+00 1/0 0/0 0/0 .text getModuleSize__20DynamicModuleControlCFv */
 int DynamicModuleControl::getModuleSize() const {
     if (mModule != NULL) {
         u32 size = JKRGetMemBlockSize(NULL, mModule);
@@ -487,24 +448,19 @@ int DynamicModuleControl::getModuleSize() const {
     }
 }
 
-/* 80263070-80263088 25D9B0 0018+00 1/0 0/0 0/0 .text
- * getModuleTypeString__20DynamicModuleControlCFv               */
 const char* DynamicModuleControl::getModuleTypeString() const {
     static const char* strings[4] = {"????", "MEM", "ARAM", "DVD"};
     return strings[mResourceType & 3];
 }
 
-/* 80263088-8026308C 25D9C8 0004+00 0/0 0/0 756/756 .text            ModuleProlog */
 extern "C" void ModuleProlog() {
     /* empty function */
 }
 
-/* 8026308C-80263090 25D9CC 0004+00 0/0 0/0 756/756 .text            ModuleEpilog */
 extern "C" void ModuleEpilog() {
     /* empty function */
 }
 
-/* 80263090-8026314C 25D9D0 00BC+00 0/0 0/0 757/757 .text            ModuleUnresolved */
 extern "C" void ModuleUnresolved() {
     // "\nError: Unlinked function was called.\n"
     OSReport_Error("\nError: リンクされていない関数が呼び出されました.\n");
@@ -518,7 +474,6 @@ extern "C" void ModuleUnresolved() {
     OSReport_Error("\n");
 }
 
-/* 8026314C-80263190 25DA8C 0044+00 0/0 0/0 757/757 .text            ModuleConstructorsX */
 extern "C" void ModuleConstructorsX(void (**ctors)()) {
     while (*ctors != 0) {
         (**ctors)();
@@ -526,32 +481,9 @@ extern "C" void ModuleConstructorsX(void (**ctors)()) {
     }
 }
 
-/* 80263190-802631D4 25DAD0 0044+00 0/0 0/0 757/757 .text            ModuleDestructorsX */
 extern "C" void ModuleDestructorsX(void (**dtors)()) {
     while (*dtors != 0) {
         (**dtors)();
         dtors++;
     }
 }
-
-/* 802631D4-802631DC 25DB14 0008+00 1/0 0/0 0/0 .text do_link__24DynamicModuleControlBaseFv */
-
-/* 802631DC-802631E4 25DB1C 0008+00 1/0 0/0 0/0 .text do_load__24DynamicModuleControlBaseFv */
-
-/* 802631E4-802631EC 25DB24 0008+00 1/0 0/0 0/0 .text do_unload__24DynamicModuleControlBaseFv */
-
-/* 802631EC-802631F4 25DB2C 0008+00 1/0 0/0 0/0 .text do_unlink__24DynamicModuleControlBaseFv */
-
-/* 802631F4-802631FC 25DB34 0008+00 1/0 0/0 0/0 .text do_load_async__24DynamicModuleControlBaseFv
- */
-
-/* 802631FC-80263200 25DB3C 0004+00 1/0 0/0 0/0 .text            dump2__24DynamicModuleControlBaseFv
- */
-
-/* 80263200-80263210 25DB40 0010+00 1/0 0/0 0/0 .text
- * getModuleTypeString__24DynamicModuleControlBaseCFv           */
-
-/* 80263210-80263218 25DB50 0008+00 1/0 0/0 0/0 .text getModuleSize__24DynamicModuleControlBaseCFv
- */
-
-/* 80263218-80263220 25DB58 0008+00 1/0 0/0 0/0 .text getModuleName__20DynamicModuleControlCFv */
diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/src/JSystem/J2DGraph/J2DAnimation.cpp
index 400de555ae..bd10f3f369 100644
--- a/src/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/src/JSystem/J2DGraph/J2DAnimation.cpp
@@ -10,8 +10,6 @@
 f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2);
 f32 J2DGetKeyFrameInterpolations(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2);
 
-/* 8030A590-8030AAFC 304ED0 056C+00 1/0 0/0 0/0 .text
- * getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo   */
 void J2DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* transformInfo) const {
     u16 idx = (param_0 * 3);
     J3DAnmTransformFullTable* xPart = &mTableInfo[idx];
@@ -91,8 +89,6 @@ void J2DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* transformI
     }
 }
 
-/* 8030AAFC-8030AF24 30543C 0428+00 1/0 0/0 0/0 .text
- * calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo  */
 void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
                                        J3DTransformInfo* transformInfo) const {
     u16 idx = param_1 * 3;
@@ -206,8 +202,6 @@ void J2DAnmTransformKey::calcTransform(f32 param_0, u16 param_1,
     }
 }
 
-/* 8030AF24-8030AFC8 305864 00A4+00 3/0 0/0 0/0 .text
- * searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen            */
 void J2DAnmColor::searchUpdateMaterialID(J2DScreen* pScreen) {
     if (pScreen != NULL && pScreen->mNameTable != NULL) {
         for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) {
@@ -221,7 +215,6 @@ void J2DAnmColor::searchUpdateMaterialID(J2DScreen* pScreen) {
     }
 }
 
-/* 8030AFC8-8030B200 305908 0238+00 1/0 0/0 0/0 .text getColor__15J2DAnmColorFullCFUsP8_GXColor */
 void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
     J3DAnmColorFullTable* info = &mInfoTable[param_0];
     u16 maxFrame = info->mRMaxFrame;
@@ -258,7 +251,6 @@ void J2DAnmColorFull::getColor(u16 param_0, _GXColor* pColor) const {
     }
 }
 
-/* 8030B200-8030B4C4 305B40 02C4+00 1/0 0/0 0/0 .text getColor__14J2DAnmColorKeyCFUsP8_GXColor */
 void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
     J3DAnmColorKeyTable* info = &mInfoTable[param_0];
     f32 val;
@@ -336,8 +328,6 @@ void J2DAnmColorKey::getColor(u16 param_0, _GXColor* pColor) const {
     }
 }
 
-/* 8030B4C4-8030B704 305E04 0240+00 1/0 0/0 0/0 .text
- * getColor__18J2DAnmVtxColorFullCFUcUsP8_GXColor               */
 void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
     J3DAnmColorFullTable* info = &mInfoTable[param_0][param_1];
     u16 maxFrame = info->mRMaxFrame;
@@ -374,8 +364,6 @@ void J2DAnmVtxColorFull::getColor(u8 param_0, u16 param_1, _GXColor* pColor) con
     }
 }
 
-/* 8030B704-8030B9F0 306044 02EC+00 1/0 0/0 0/0 .text
- * getColor__17J2DAnmVtxColorKeyCFUcUsP8_GXColor                */
 void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* pColor) const {
     J3DAnmColorKeyTable* info = &mInfoTable[param_0][param_1];
     f32 val;
@@ -453,8 +441,6 @@ void J2DAnmVtxColorKey::getColor(u8 param_0, u16 param_1, _GXColor* pColor) cons
     }
 }
 
-/* 8030B9F0-8030BC60 306330 0270+00 0/0 1/1 0/0 .text
- * calcTransform__19J2DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */
 void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTInfo* pInfo) const {
     u16 idx = param_1 * 3;
     J3DAnmTransformKeyTable* xInf = &mInfoTable[idx];
@@ -519,8 +505,6 @@ void J2DAnmTextureSRTKey::calcTransform(f32 param_0, u16 param_1, J3DTextureSRTI
     }
 }
 
-/* 8030BC60-8030BD10 3065A0 00B0+00 1/0 0/0 0/0 .text
- * searchUpdateMaterialID__19J2DAnmTextureSRTKeyFP9J2DScreen    */
 void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* pScreen) {
     if (pScreen != NULL && pScreen->mNameTable != NULL) {
         for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) {
@@ -534,8 +518,6 @@ void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* pScreen) {
     }
 }
 
-/* 8030BD10-8030BEE8 306650 01D8+00 1/0 0/0 0/0 .text
- * searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen       */
 void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
     if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->mTexRes != NULL) {
         for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) {
@@ -573,8 +555,6 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
     }
 }
 
-/* 8030BEE8-8030BF9C 306828 00B4+00 2/2 1/1 0/0 .text            getTexNo__16J2DAnmTexPatternCFUsPUs
- */
 void J2DAnmTexPattern::getTexNo(u16 param_0, u16* pTexNo) const {
     u16 maxFrame = mAnmTable[param_0].mMaxFrame;
     f32 frame = getFrame();
@@ -587,8 +567,6 @@ void J2DAnmTexPattern::getTexNo(u16 param_0, u16* pTexNo) const {
     }
 }
 
-/* 8030BF9C-8030BFF0 3068DC 0054+00 0/0 1/1 0/0 .text            getResTIMG__16J2DAnmTexPatternCFUs
- */
 ResTIMG* J2DAnmTexPattern::getResTIMG(u16 param_0) const {
     if (mTIMGPtrArray == NULL) {
         return NULL;
@@ -599,8 +577,6 @@ ResTIMG* J2DAnmTexPattern::getResTIMG(u16 param_0) const {
     }
 }
 
-/* 8030BFF0-8030C048 306930 0058+00 0/0 1/1 0/0 .text            getPalette__16J2DAnmTexPatternCFUs
- */
 JUTPalette* J2DAnmTexPattern::getPalette(u16 param_0) const {
     if (mTIMGPtrArray == NULL) {
         return NULL;
@@ -611,8 +587,6 @@ JUTPalette* J2DAnmTexPattern::getPalette(u16 param_0) const {
     }
 }
 
-/* 8030C048-8030C0F0 306988 00A8+00 0/0 3/3 0/0 .text getVisibility__20J2DAnmVisibilityFullCFUsPUc
- */
 void J2DAnmVisibilityFull::getVisibility(u16 param_0, u8* pOut) const {
     u16 maxFrame = mTable[param_0]._0;
     if (getFrame() < 0) {
@@ -625,8 +599,6 @@ void J2DAnmVisibilityFull::getVisibility(u16 param_0, u8* pOut) const {
     }
 }
 
-/* 8030C0F0-8030C3B4 306A30 02C4+00 0/0 1/1 0/0 .text
- * getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10          */
 void J2DAnmTevRegKey::getTevColorReg(u16 param_0, _GXColorS10* pColor) const {
     J3DAnmCRegKeyTable* info = &mAnmCRegKeyTable[param_0];
     f32 val;
@@ -704,8 +676,6 @@ void J2DAnmTevRegKey::getTevColorReg(u16 param_0, _GXColorS10* pColor) const {
     }
 }
 
-/* 8030C3B4-8030C678 306CF4 02C4+00 0/0 1/1 0/0 .text
- * getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor              */
 void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, _GXColor* pColor) const {
     J3DAnmKRegKeyTable* info = &mAnmKRegKeyTable[param_0];
     f32 val;
@@ -783,8 +753,6 @@ void J2DAnmTevRegKey::getTevKonstReg(u16 param_0, _GXColor* pColor) const {
     }
 }
 
-/* 8030C678-8030C77C 306FB8 0104+00 1/0 0/0 0/0 .text
- * searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen        */
 void J2DAnmTevRegKey::searchUpdateMaterialID(J2DScreen* pScreen) {
     if (pScreen != NULL && pScreen->mNameTable != NULL) {
         for (u16 i = 0; i < mCRegUpdateMaterialNum; i++) {
@@ -806,8 +774,6 @@ void J2DAnmTevRegKey::searchUpdateMaterialID(J2DScreen* pScreen) {
     }
 }
 
-/* 8030C77C-8030C9B0 3070BC 0234+00 6/6 0/0 0/0 .text
- * J2DGetKeyFrameInterpolation<s>__FfP18J3DAnmKeyTableBasePs    */
 // should be J2DGetKeyFrameInterpolation<s16>
 f32 J2DGetKeyFrameInterpolations(f32 param_0, J3DAnmKeyTableBase* param_1, s16* param_2) {
     if (param_0 < param_2[0]) {
@@ -853,8 +819,6 @@ f32 J2DGetKeyFrameInterpolations(f32 param_0, J3DAnmKeyTableBase* param_1, s16*
     }
 }
 
-/* 8030C9B0-8030CB2C 3072F0 017C+00 2/2 0/0 0/0 .text
- * J2DGetKeyFrameInterpolation<f>__FfP18J3DAnmKeyTableBasePf    */
 // should be J2DGetKeyFrameInterpolation<s16>
 f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2) {
     if (param_0 < param_2[0]) {
diff --git a/src/JSystem/J2DGraph/J2DAnmLoader.cpp b/src/JSystem/J2DGraph/J2DAnmLoader.cpp
index 3633ee9760..4e6f6b065e 100644
--- a/src/JSystem/J2DGraph/J2DAnmLoader.cpp
+++ b/src/JSystem/J2DGraph/J2DAnmLoader.cpp
@@ -7,8 +7,6 @@
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80308A6C-80309290 3033AC 0824+00 0/0 26/26 2/2 .text            load__20J2DAnmLoaderDataBaseFPCv
- */
 J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;
 
@@ -85,13 +83,10 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) {
     }
 }
 
-/* 80309290-803092AC 303BD0 001C+00 1/1 0/0 0/0 .text            __ct__19J2DAnmKeyLoader_v15Fv */
 J2DAnmKeyLoader_v15::J2DAnmKeyLoader_v15() {}
 
-/* 803092AC-80309308 303BEC 005C+00 2/1 0/0 0/0 .text            __dt__19J2DAnmKeyLoader_v15Fv */
 J2DAnmKeyLoader_v15::~J2DAnmKeyLoader_v15() {}
 
-/* 80309308-80309414 303C48 010C+00 2/1 0/0 0/0 .text            load__19J2DAnmKeyLoader_v15FPCv */
 void* J2DAnmKeyLoader_v15::load(void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;
     const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst;
@@ -120,8 +115,6 @@ void* J2DAnmKeyLoader_v15::load(void const* p_data) {
     return mpResource;
 }
 
-/* 80309414-80309570 303D54 015C+00 1/0 0/0 0/0 .text
- * setResource__19J2DAnmKeyLoader_v15FP10J2DAnmBasePCv          */
 void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;
     const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst;
@@ -159,14 +152,10 @@ void J2DAnmKeyLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) {
     }
 }
 
-/* 80309570-80309598 303EB0 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__19J2DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData */
 void J2DAnmKeyLoader_v15::readAnmTransform(J3DAnmTransformKeyData const* p_data) {
     setAnmTransform((J2DAnmTransformKey*)mpResource, p_data);
 }
 
-/* 80309598-80309634 303ED8 009C+00 2/2 0/0 0/0 .text
- * setAnmTransform__19J2DAnmKeyLoader_v15FP18J2DAnmTransformKeyPC22J3DAnmTransformKeyData */
 void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* p_anm,
                                           J3DAnmTransformKeyData const* p_data) {
     p_anm->field_0x22 = p_data->field_0xc;
@@ -182,14 +171,10 @@ void J2DAnmKeyLoader_v15::setAnmTransform(J2DAnmTransformKey* p_anm,
         JSUConvertOffsetToPtr<f32>(p_data, (void*)p_data->field_0x20);
 }
 
-/* 80309634-8030965C 303F74 0028+00 1/1 0/0 0/0 .text
- * readAnmTextureSRT__19J2DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData */
 void J2DAnmKeyLoader_v15::readAnmTextureSRT(J3DAnmTextureSRTKeyData const* p_data) {
     setAnmTextureSRT((J2DAnmTextureSRTKey*)mpResource, p_data);
 }
 
-/* 8030965C-80309848 303F9C 01EC+00 2/2 0/0 0/0 .text
- * setAnmTextureSRT__19J2DAnmKeyLoader_v15FP19J2DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData */
 void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* p_anm,
                                            J3DAnmTextureSRTKeyData const* p_data) {
     p_anm->mUpdateMaterialNum = p_data->field_0xc;
@@ -240,14 +225,10 @@ void J2DAnmKeyLoader_v15::setAnmTextureSRT(J2DAnmTextureSRTKey* p_anm,
     }
 }
 
-/* 80309848-80309870 304188 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__19J2DAnmKeyLoader_v15FPC18J3DAnmColorKeyData   */
 void J2DAnmKeyLoader_v15::readAnmColor(J3DAnmColorKeyData const* p_data) {
     setAnmColor((J2DAnmColorKey*)mpResource, p_data);
 }
 
-/* 80309870-8030995C 3041B0 00EC+00 2/2 0/0 0/0 .text
- * setAnmColor__19J2DAnmKeyLoader_v15FP14J2DAnmColorKeyPC18J3DAnmColorKeyData */
 void J2DAnmKeyLoader_v15::setAnmColor(J2DAnmColorKey* p_anm, J3DAnmColorKeyData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
     p_anm->field_0x4 = p_data->field_0x8;
@@ -269,14 +250,10 @@ void J2DAnmKeyLoader_v15::setAnmColor(J2DAnmColorKey* p_anm, J3DAnmColorKeyData
         JSUConvertOffsetToPtr<ResNTAB>(p_data, (void*)p_data->mNameTabOffset));
 }
 
-/* 8030995C-80309984 30429C 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__19J2DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */
 void J2DAnmKeyLoader_v15::readAnmVtxColor(J3DAnmVtxColorKeyData const* p_data) {
     setAnmVtxColor((J2DAnmVtxColorKey*)mpResource, p_data);
 }
 
-/* 80309984-80309A80 3042C4 00FC+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__19J2DAnmKeyLoader_v15FP17J2DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData */
 void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* p_anm,
                                          J3DAnmVtxColorKeyData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
@@ -302,7 +279,6 @@ void J2DAnmKeyLoader_v15::setAnmVtxColor(J2DAnmVtxColorKey* p_anm,
     p_anm->mAValues = JSUConvertOffsetToPtr<s16>(p_data, (void*)p_data->mAValOffset);
 }
 
-/* 80309A80-80309B8C 3043C0 010C+00 2/1 0/0 0/0 .text            load__20J2DAnmFullLoader_v15FPCv */
 void* J2DAnmFullLoader_v15::load(void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;
     const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst;
@@ -330,8 +306,6 @@ void* J2DAnmFullLoader_v15::load(void const* p_data) {
     return mpResource;
 }
 
-/* 80309B8C-80309CE8 3044CC 015C+00 1/0 0/0 0/0 .text
- * setResource__20J2DAnmFullLoader_v15FP10J2DAnmBasePCv         */
 void J2DAnmFullLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) {
     const J3DAnmDataHeader* hdr = (const J3DAnmDataHeader*)p_data;
     const J3DAnmDataBlockHeader* dataPtr = &hdr->mFirst;
@@ -365,20 +339,14 @@ void J2DAnmFullLoader_v15::setResource(J2DAnmBase* p_anm, void const* p_data) {
     }
 }
 
-/* 80309CE8-80309D04 304628 001C+00 1/1 0/0 0/0 .text            __ct__20J2DAnmFullLoader_v15Fv */
 J2DAnmFullLoader_v15::J2DAnmFullLoader_v15() {}
 
-/* 80309D04-80309D60 304644 005C+00 2/1 0/0 0/0 .text            __dt__20J2DAnmFullLoader_v15Fv */
 J2DAnmFullLoader_v15::~J2DAnmFullLoader_v15() {}
 
-/* 80309D60-80309D88 3046A0 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__20J2DAnmFullLoader_v15FPC23J3DAnmTransformFullData */
 void J2DAnmFullLoader_v15::readAnmTransform(J3DAnmTransformFullData const* p_data) {
     setAnmTransform((J2DAnmTransformFull*)mpResource, p_data);
 }
 
-/* 80309D88-80309E1C 3046C8 0094+00 2/2 0/0 0/0 .text
- * setAnmTransform__20J2DAnmFullLoader_v15FP19J2DAnmTransformFullPC23J3DAnmTransformFullData */
 void J2DAnmFullLoader_v15::setAnmTransform(J2DAnmTransformFull* p_anm,
                                            J3DAnmTransformFullData const* p_data) {
     p_anm->field_0x22 = p_data->field_0xc;
@@ -392,14 +360,10 @@ void J2DAnmFullLoader_v15::setAnmTransform(J2DAnmTransformFull* p_anm,
     p_anm->mTranslateValues = JSUConvertOffsetToPtr<f32>(p_data, (void*)p_data->mTransValOffset);
 }
 
-/* 80309E1C-80309E44 30475C 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__20J2DAnmFullLoader_v15FPC19J3DAnmColorFullData */
 void J2DAnmFullLoader_v15::readAnmColor(J3DAnmColorFullData const* p_data) {
     setAnmColor((J2DAnmColorFull*)mpResource, p_data);
 }
 
-/* 80309E44-80309F10 304784 00CC+00 2/2 0/0 0/0 .text
- * setAnmColor__20J2DAnmFullLoader_v15FP15J2DAnmColorFullPC19J3DAnmColorFullData */
 void J2DAnmFullLoader_v15::setAnmColor(J2DAnmColorFull* p_anm, J3DAnmColorFullData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
     p_anm->field_0x4 = p_data->field_0x8;
@@ -417,14 +381,10 @@ void J2DAnmFullLoader_v15::setAnmColor(J2DAnmColorFull* p_anm, J3DAnmColorFullDa
         JSUConvertOffsetToPtr<ResNTAB>(p_data, (void*)p_data->mNameTabOffset));
 }
 
-/* 80309F10-80309F38 304850 0028+00 1/1 0/0 0/0 .text
- * readAnmTexPattern__20J2DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData */
 void J2DAnmFullLoader_v15::readAnmTexPattern(J3DAnmTexPatternFullData const* p_data) {
     setAnmTexPattern((J2DAnmTexPattern*)mpResource, p_data);
 }
 
-/* 80309F38-80309FDC 304878 00A4+00 2/2 0/0 0/0 .text
- * setAnmTexPattern__20J2DAnmFullLoader_v15FP16J2DAnmTexPatternPC24J3DAnmTexPatternFullData */
 void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* p_anm,
                                             J3DAnmTexPatternFullData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
@@ -441,14 +401,10 @@ void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* p_anm,
         JSUConvertOffsetToPtr<ResNTAB>(p_data, (void*)p_data->mNameTabOffset));
 }
 
-/* 80309FDC-8030A004 30491C 0028+00 1/1 0/0 0/0 .text
- * readAnmTevReg__19J2DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData */
 void J2DAnmKeyLoader_v15::readAnmTevReg(J3DAnmTevRegKeyData const* p_data) {
     setAnmTevReg((J2DAnmTevRegKey*)mpResource, p_data);
 }
 
-/* 8030A004-8030A190 304944 018C+00 2/2 0/0 0/0 .text
- * setAnmTevReg__19J2DAnmKeyLoader_v15FP15J2DAnmTevRegKeyPC19J3DAnmTevRegKeyData */
 void J2DAnmKeyLoader_v15::setAnmTevReg(J2DAnmTevRegKey* p_anm, J3DAnmTevRegKeyData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
     p_anm->field_0x4 = p_data->field_0x8;
@@ -485,14 +441,10 @@ void J2DAnmKeyLoader_v15::setAnmTevReg(J2DAnmTevRegKey* p_anm, J3DAnmTevRegKeyDa
     p_anm->mKAValues = JSUConvertOffsetToPtr<s16>(p_data, (void*)p_data->mKAValuesOffset);
 }
 
-/* 8030A190-8030A1B8 304AD0 0028+00 1/1 0/0 0/0 .text
- * readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData */
 void J2DAnmFullLoader_v15::readAnmVisibility(J3DAnmVisibilityFullData const* p_data) {
     setAnmVisibility((J2DAnmVisibilityFull*)mpResource, p_data);
 }
 
-/* 8030A1B8-8030A234 304AF8 007C+00 2/2 0/0 0/0 .text
- * setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData */
 void J2DAnmFullLoader_v15::setAnmVisibility(J2DAnmVisibilityFull* p_anm,
                                             J3DAnmVisibilityFullData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
@@ -505,14 +457,10 @@ void J2DAnmFullLoader_v15::setAnmVisibility(J2DAnmVisibilityFull* p_anm,
     p_anm->mValues = JSUConvertOffsetToPtr<u8>(p_data, p_data->mValuesOffset);
 }
 
-/* 8030A234-8030A25C 304B74 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData */
 void J2DAnmFullLoader_v15::readAnmVtxColor(J3DAnmVtxColorFullData const* p_data) {
     setAnmVtxColor((J2DAnmVtxColorFull*)mpResource, p_data);
 }
 
-/* 8030A25C-8030A358 304B9C 00FC+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData */
 void J2DAnmFullLoader_v15::setAnmVtxColor(J2DAnmVtxColorFull* p_anm,
                                           J3DAnmVtxColorFullData const* p_data) {
     p_anm->mFrameMax = p_data->mFrameMax;
diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp
index 0d66083c01..4af69d8d09 100644
--- a/src/JSystem/J2DGraph/J2DGrafContext.cpp
+++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "dolphin/gx.h"
 
-/* 802E8B08-802E8BB4 2E3448 00AC+00 0/0 2/2 0/0 .text            __ct__14J2DGrafContextFffff */
 J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
     : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) {
     JUtility::TColor color(-1);
@@ -11,7 +10,6 @@ J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height)
     setLineWidth(6);
 }
 
-/* 802E8BB4-802E8C44 2E34F4 0090+00 1/0 1/1 0/0 .text            setPort__14J2DGrafContextFv */
 void J2DGrafContext::setPort() {
     setScissor();
     setup2D();
@@ -27,7 +25,6 @@ void J2DGrafContext::setPort() {
     GXSetViewport(bounds.i.x, bounds.i.y, bounds.getWidth(), bounds.getHeight(), 0.0f, 1.0f);
 }
 
-/* 802E8C44-802E8E20 2E3584 01DC+00 1/0 1/0 0/0 .text            setup2D__14J2DGrafContextFv */
 void J2DGrafContext::setup2D() {
     GXSetNumIndStages(0);
     for (int i = 0; i < GX_MAX_TEVSTAGE; i++) {
@@ -63,7 +60,6 @@ void J2DGrafContext::setup2D() {
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 802E8E20-802E90C0 2E3760 02A0+00 1/0 2/1 0/0 .text            setScissor__14J2DGrafContextFv */
 void J2DGrafContext::setScissor() {
     JGeometry::TBox2<f32> bounds(0, 0, 1024, 1024);
     JGeometry::TBox2<f32> curBounds(mScissorBounds);
@@ -80,14 +76,10 @@ void J2DGrafContext::setScissor() {
     }
 }
 
-/* 802E90C0-802E90E4 2E3A00 0024+00 0/0 10/10 0/0 .text
- * scissor__14J2DGrafContextFRCQ29JGeometry8TBox2<f>            */
 void J2DGrafContext::scissor(JGeometry::TBox2<f32> const& bounds) {
     mScissorBounds = bounds;
 }
 
-/* 802E90E4-802E9118 2E3A24 0034+00 1/0 1/0 0/0 .text
- * place__14J2DGrafContextFRCQ29JGeometry8TBox2<f>              */
 void J2DGrafContext::place(JGeometry::TBox2<f32> const& bounds) {
     mBounds = bounds;
     mScissorBounds = bounds;
@@ -134,15 +126,11 @@ void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR
     mBoxPart.mDstFactor = GX_BL_ZERO;
 }
 
-/* 802E9234-802E9260 2E3B74 002C+00 1/1 2/2 0/0 .text            setLineWidth__14J2DGrafContextFUc
- */
 void J2DGrafContext::setLineWidth(u8 lineWidth) {
     mLineWidth = lineWidth;
     GXSetLineWidth(mLineWidth, GX_TO_ZERO);
 }
 
-/* 802E9260-802E9368 2E3BA0 0108+00 0/0 2/2 0/0 .text
- * fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2<f>            */
 void J2DGrafContext::fillBox(JGeometry::TBox2<f32> const& box) {
     GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor,
                    (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET);
@@ -161,8 +149,6 @@ void J2DGrafContext::fillBox(JGeometry::TBox2<f32> const& box) {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
 }
 
-/* 802E9368-802E9488 2E3CA8 0120+00 0/0 1/1 0/0 .text
- * drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2<f>          */
 void J2DGrafContext::drawFrame(JGeometry::TBox2<f32> const& box) {
     GXSetBlendMode((GXBlendMode)mBoxPart.mType, (GXBlendFactor)mBoxPart.mSrcFactor,
                    (GXBlendFactor)mBoxPart.mDstFactor, GX_LO_SET);
@@ -183,8 +169,6 @@ void J2DGrafContext::drawFrame(JGeometry::TBox2<f32> const& box) {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
 }
 
-/* 802E9488-802E9564 2E3DC8 00DC+00 1/1 0/0 0/0 .text
- * line__14J2DGrafContextFQ29JGeometry8TVec2<f>Q29JGeometry8TVec2<f> */
 void J2DGrafContext::line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end) {
     GXSetBlendMode((GXBlendMode)mLinePart.mType, (GXBlendFactor)mLinePart.mSrcFactor,
                    (GXBlendFactor)mLinePart.mDstFactor, GX_LO_SET);
@@ -199,8 +183,6 @@ void J2DGrafContext::line(JGeometry::TVec2<f32> start, JGeometry::TVec2<f32> end
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_RGBA4, 0);
 }
 
-/* 802E9564-802E95D4 2E3EA4 0070+00 0/0 1/1 0/0 .text
- * lineTo__14J2DGrafContextFQ29JGeometry8TVec2<f>               */
 void J2DGrafContext::lineTo(JGeometry::TVec2<f32> pos) {
     this->line(mPrevPos, pos);
     mPrevPos = pos;
diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp
index c6ed6e3497..92fa1ab61a 100644
--- a/src/JSystem/J2DGraph/J2DManage.cpp
+++ b/src/JSystem/J2DGraph/J2DManage.cpp
@@ -4,7 +4,6 @@
 #include "JSystem/JSupport/JSUInputStream.h"
 #include "string.h"
 
-/* 8030CE18-8030CE7C 307758 0064+00 1/1 3/3 0/0 .text            get__13J2DDataManageFPCc */
 void* J2DDataManage::get(char const* name) {
     for (J2DataManageLink* link = mList; link != NULL; link = link->mNext) {
         if (strcmp(link->mName, name) == 0) {
@@ -14,7 +13,6 @@ void* J2DDataManage::get(char const* name) {
     return NULL;
 }
 
-/* 8030CE7C-8030CF10 3077BC 0094+00 0/0 1/1 0/0 .text get__13J2DDataManageFP14JSUInputStream */
 void* J2DDataManage::get(JSUInputStream* inputStream) {
     inputStream->skip(1);
     u8 nameLen = inputStream->readU8();
@@ -29,7 +27,6 @@ void* J2DDataManage::get(JSUInputStream* inputStream) {
     }
 }
 
-/* 8030CF10-8030CF44 307850 0034+00 1/1 2/2 0/0 .text getResReference__15J2DResReferenceCFUs */
 s8* J2DResReference::getResReference(u16 idx) const {
     if (mCount <= idx || idx == 0xFFFF) {
         return NULL;
@@ -38,7 +35,6 @@ s8* J2DResReference::getResReference(u16 idx) const {
     }
 }
 
-/* 8030CF44-8030D098 307884 0154+00 0/0 2/2 0/0 .text            getName__15J2DResReferenceCFUs */
 char* J2DResReference::getName(u16 idx) const {
     static char p_name[257];
 
diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/src/JSystem/J2DGraph/J2DMatBlock.cpp
index 723e5b9dd7..847f58b3ae 100644
--- a/src/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/src/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DMatBlock
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DMatBlock.h"
@@ -12,7 +7,6 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "dolphin/gx.h"
 
-/* 802EB394-802EB424 2E5CD4 0090+00 0/0 1/1 0/0 .text            initialize__13J2DColorBlockFv */
 // NONMATCHING - instruction order
 void J2DColorBlock::initialize() {
     for (int i = 0; i < 2; i++) {
@@ -25,7 +19,6 @@ void J2DColorBlock::initialize() {
     mCullMode = GX_CULL_NONE;
 }
 
-/* 802EB424-802EB510 2E5D64 00EC+00 0/0 1/1 0/0 .text            setGX__13J2DColorBlockFv */
 void J2DColorBlock::setGX() {
     for (int i = 0; i < 2; i++) {
         GXSetChanMatColor(GXChannelID(GX_COLOR0A0 + i), mMatColor[i]);
@@ -39,7 +32,6 @@ void J2DColorBlock::setGX() {
     GXSetCullMode((GXCullMode)mCullMode);
 }
 
-/* 802EB510-802EB570 2E5E50 0060+00 0/0 1/1 0/0 .text            initialize__14J2DTexGenBlockFv */
 void J2DTexGenBlock::initialize() {
     mTexGenNum = 0;
     for (int i = 0; i < 8; i++) {
@@ -50,7 +42,6 @@ void J2DTexGenBlock::initialize() {
     }
 }
 
-/* 802EB570-802EB620 2E5EB0 00B0+00 0/0 1/1 0/0 .text            setGX__14J2DTexGenBlockFv */
 void J2DTexGenBlock::setGX() {
     GXSetNumTexGens(mTexGenNum);
     for (int i = 0; i < mTexGenNum; i++) {
@@ -64,14 +55,12 @@ void J2DTexGenBlock::setGX() {
     }
 }
 
-/* 802EB620-802EB6A4 2E5F60 0084+00 1/0 1/1 0/0 .text            __dt__14J2DTexGenBlockFv */
 J2DTexGenBlock::~J2DTexGenBlock() {
     for (int i = 0; i < 8; i++) {
         delete mTexMtx[i];
     }
 }
 
-/* 802EB6A4-802EB7E0 2E5FE4 013C+00 0/0 3/3 0/0 .text setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx */
 void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) {
     J3D_PANIC(103, param_0 < 8, "Error : range over.");
     
@@ -86,7 +75,6 @@ void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) {
     mTexMtx[param_0]->calc();
 }
 
-/* 802EB7E0-802EB87C 2E6120 009C+00 0/0 1/1 0/0 .text getTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx */
 void J2DTexGenBlock::getTexMtx(u32 param_0, J2DTexMtx& param_1) {
     J3D_PANIC(123, param_0 < 8, "Error : range over.");
     
@@ -96,24 +84,20 @@ void J2DTexGenBlock::getTexMtx(u32 param_0, J2DTexMtx& param_1) {
     }
 }
 
-/* 802EB87C-802EB884 2E61BC 0008+00 1/0 0/0 0/0 .text            getTexture__11J2DTevBlockFUl */
 JUTTexture* J2DTevBlock::getTexture(u32) {
     return NULL;
 }
 
-/* 802EB884-802EB88C 2E61C4 0008+00 1/0 0/0 0/0 .text            getPalette__11J2DTevBlockFUl */
 JUTPalette* J2DTevBlock::getPalette(u32) {
     return NULL;
 }
 
-/* 802EB88C-802EB998 2E61CC 010C+00 0/0 1/1 0/0 .text            __ct__12J2DTevBlock1Fv */
 J2DTevBlock1::J2DTevBlock1() {
     mTexture[0] = NULL;
     mUndeleteFlag = 0;
     initialize();
 }
 
-/* 802EB998-802EBA50 2E62D8 00B8+00 1/0 0/0 0/0 .text            __dt__12J2DTevBlock1Fv */
 J2DTevBlock1::~J2DTevBlock1() {
     if (mUndeleteFlag & 1) {
         delete mTexture[0];
@@ -126,7 +110,6 @@ J2DTevBlock1::~J2DTevBlock1() {
     }
 }
 
-/* 802EBA50-802EBC0C 2E6390 01BC+00 1/0 0/0 0/0 .text            initialize__12J2DTevBlock1Fv */
 void J2DTevBlock1::initialize() {
     mTexNo[0] = -1;
     mFontNo = -1;
@@ -148,7 +131,6 @@ void J2DTevBlock1::initialize() {
     mFont = NULL;
 }
 
-/* 802EBC0C-802EBCC0 2E654C 00B4+00 1/0 0/0 0/0 .text            prepareTexture__12J2DTevBlock1FUc */
 bool J2DTevBlock1::prepareTexture(u8 param_0) {
     bool rv;
     if (param_0 == 0) {
@@ -173,7 +155,6 @@ bool J2DTevBlock1::prepareTexture(u8 param_0) {
     return rv;
 }
 
-/* 802EBCC0-802EBDE4 2E6600 0124+00 1/0 0/0 0/0 .text            insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette */
 bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
     if (param_0 != 0 || p_timg == NULL) {
         return false;
@@ -205,7 +186,6 @@ bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
     return true;
 }
 
-/* 802EBDE4-802EBE8C 2E6724 00A8+00 1/0 0/0 0/0 .text            insertTexture__12J2DTevBlock1FUlP10JUTTexture */
 bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) {
     if (mTexture[0] != NULL && mTexture[0]->getTexInfo() != NULL) {
         return false;
@@ -226,7 +206,6 @@ bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EBE8C-802EC01C 2E67CC 0190+00 1/0 0/0 0/0 .text            setTexture__12J2DTevBlock1FUlPC7ResTIMG */
 bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
     if (param_0 != 0) {
         return false;
@@ -272,7 +251,6 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
     return true;
 }
 
-/* 802EC01C-802EC0A8 2E695C 008C+00 1/0 0/0 0/0 .text            setTexture__12J2DTevBlock1FUlP10JUTTexture */
 bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 != 0) {
         return false;
@@ -290,7 +268,6 @@ bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EC0A8-802EC124 2E69E8 007C+00 1/0 0/0 0/0 .text            removeTexture__12J2DTevBlock1FUl */
 bool J2DTevBlock1::removeTexture(u32 param_0) {
     if (param_0 >= 1) {
         return false;
@@ -307,7 +284,6 @@ bool J2DTevBlock1::removeTexture(u32 param_0) {
     return true;
 }
 
-/* 802EC124-802EC1D8 2E6A64 00B4+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock1FP7ResFONT */
 bool J2DTevBlock1::setFont(ResFONT* p_font) {
     if (p_font == NULL) {
         return false;
@@ -327,7 +303,6 @@ bool J2DTevBlock1::setFont(ResFONT* p_font) {
     return true;
 }
 
-/* 802EC1D8-802EC258 2E6B18 0080+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock1FP7JUTFont */
 bool J2DTevBlock1::setFont(JUTFont* p_font) {
     if (p_font == NULL) {
         return false;
@@ -342,7 +317,6 @@ bool J2DTevBlock1::setFont(JUTFont* p_font) {
     return true;
 }
 
-/* 802EC258-802EC318 2E6B98 00C0+00 1/0 0/0 0/0 .text            setPalette__12J2DTevBlock1FUlPC7ResTLUT */
 bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     if (param_0 != 0) {
         return false;
@@ -370,12 +344,10 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     return true;
 }
 
-/* 802EC318-802EC328 2E6C58 0010+00 1/0 0/0 0/0 .text            shiftDeleteFlag__12J2DTevBlock1FUcb */
 void J2DTevBlock1::shiftDeleteFlag(u8, bool) {
     mUndeleteFlag &= 0x80;
 }
 
-/* 802EC328-802EC570 2E6C68 0248+00 1/0 0/0 0/0 .text            setGX__12J2DTevBlock1Fv */
 void J2DTevBlock1::setGX() {
     loadTexture(GX_TEXMAP0, 0);
     GXSetTevOrder(GX_TEVSTAGE0, (GXTexCoordID)mTevOrder[0].getTexCoord(), (GXTexMapID)mTevOrder[0].getTexMap(), (GXChannelID)mTevOrder[0].getColor());
@@ -414,14 +386,12 @@ void J2DTevBlock1::setGX() {
     mIndTevStage->load(0);
 }
 
-/* 802EC570-802EC5B8 2E6EB0 0048+00 1/0 0/0 0/0 .text            loadTexture__12J2DTevBlock1F11_GXTexMapIDUl */
 void J2DTevBlock1::loadTexture(GXTexMapID texmapID, u32 texIndex) {
     if (texIndex == 0 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
         mTexture[texIndex]->load(texmapID);
     }
 }
 
-/* 802EC5B8-802EC6C8 2E6EF8 0110+00 0/0 1/1 0/0 .text            __ct__12J2DTevBlock2Fv */
 J2DTevBlock2::J2DTevBlock2() {
     mTexture[0] = NULL;
     mTexture[1] = NULL;
@@ -429,7 +399,6 @@ J2DTevBlock2::J2DTevBlock2() {
     initialize();
 }
 
-/* 802EC6C8-802EC7A0 2E7008 00D8+00 1/0 0/0 0/0 .text            __dt__12J2DTevBlock2Fv */
 J2DTevBlock2::~J2DTevBlock2() {
     if (mUndeleteFlag & 1) {
         delete mTexture[0];
@@ -447,7 +416,6 @@ J2DTevBlock2::~J2DTevBlock2() {
     }
 }
 
-/* 802EC7A0-802ECA18 2E70E0 0278+00 1/0 0/0 0/0 .text            initialize__12J2DTevBlock2Fv */
 void J2DTevBlock2::initialize() {
     mTexNo[0] = 0xffff;
     mTexNo[1] = 0xffff;
@@ -477,8 +445,6 @@ void J2DTevBlock2::initialize() {
     mFont = NULL;
 }
 
-/* 802ECA18-802ECAE8 2E7358 00D0+00 1/0 0/0 0/0 .text            prepareTexture__12J2DTevBlock2FUc
- */
 bool J2DTevBlock2::prepareTexture(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i >= 2) {
@@ -498,7 +464,6 @@ bool J2DTevBlock2::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 802ECAE8-802ECDE8 2E7428 0300+00 1/0 0/0 0/0 .text            insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette */
 bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
     if (param_0 >= 2 || p_timg == NULL) {
         return false;
@@ -586,7 +551,6 @@ bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
     return true;
 }
 
-/* 802ECDE8-802ECF48 2E7728 0160+00 1/0 0/0 0/0 .text            insertTexture__12J2DTevBlock2FUlP10JUTTexture */
 bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 2 || p_tex == NULL) {
         return false;
@@ -629,7 +593,6 @@ bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802ECF48-802ED16C 2E7888 0224+00 1/0 0/0 0/0 .text            setTexture__12J2DTevBlock2FUlPC7ResTIMG */
 bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
     if (param_0 >= 2) {
         return false;
@@ -691,7 +654,6 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
     return true;
 }
 
-/* 802ED16C-802ED21C 2E7AAC 00B0+00 1/0 0/0 0/0 .text            setTexture__12J2DTevBlock2FUlP10JUTTexture */
 bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 2) {
         return false;
@@ -709,7 +671,6 @@ bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802ED21C-802ED2F0 2E7B5C 00D4+00 1/0 0/0 0/0 .text            removeTexture__12J2DTevBlock2FUl */
 bool J2DTevBlock2::removeTexture(u32 param_0) {
     if (param_0 >= 2) {
         return false;
@@ -733,7 +694,6 @@ bool J2DTevBlock2::removeTexture(u32 param_0) {
     return true;
 }
 
-/* 802ED2F0-802ED3A4 2E7C30 00B4+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock2FP7ResFONT */
 bool J2DTevBlock2::setFont(ResFONT* p_font) {
     if (p_font == NULL) {
         return false;
@@ -753,7 +713,6 @@ bool J2DTevBlock2::setFont(ResFONT* p_font) {
     return true;
 }
 
-/* 802ED3A4-802ED424 2E7CE4 0080+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock2FP7JUTFont */
 bool J2DTevBlock2::setFont(JUTFont* p_font) {
     if (p_font == NULL) {
         return false;
@@ -768,7 +727,6 @@ bool J2DTevBlock2::setFont(JUTFont* p_font) {
     return true;
 }
 
-/* 802ED424-802ED4FC 2E7D64 00D8+00 1/0 0/0 0/0 .text            setPalette__12J2DTevBlock2FUlPC7ResTLUT */
 bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     if (param_0 >= 2) {
         return false;
@@ -796,7 +754,6 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     return true;
 }
 
-/* 802ED4FC-802ED584 2E7E3C 0088+00 1/0 0/0 0/0 .text            shiftDeleteFlag__12J2DTevBlock2FUcb */
 void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) {
     u8 tmpFlags = mUndeleteFlag & 0x80;
     mUndeleteFlag = mUndeleteFlag & 0x7F;
@@ -810,7 +767,6 @@ void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) {
     mUndeleteFlag = (mUndeleteFlag | tmpFlags) & 0xFF;
 }
 
-/* 802ED584-802ED874 2E7EC4 02F0+00 1/0 0/0 0/0 .text            setGX__12J2DTevBlock2Fv */
 void J2DTevBlock2::setGX() {
     for (int i = 0; i < 2; i++) {
         loadTexture(GXTexMapID(i), i);
@@ -864,14 +820,12 @@ void J2DTevBlock2::setGX() {
     }
 }
 
-/* 802ED874-802ED8BC 2E81B4 0048+00 1/0 0/0 0/0 .text            loadTexture__12J2DTevBlock2F11_GXTexMapIDUl */
 void J2DTevBlock2::loadTexture(GXTexMapID texmapID, u32 texIndex) {
     if (texIndex < 2 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
         mTexture[texIndex]->load(texmapID);
     }
 }
 
-/* 802ED8BC-802ED9E4 2E81FC 0128+00 0/0 1/1 0/0 .text            __ct__12J2DTevBlock4Fv */
 J2DTevBlock4::J2DTevBlock4() {
     for (int i = 0; i < 4; i++) {
         mTexture[i] = NULL;
@@ -881,7 +835,6 @@ J2DTevBlock4::J2DTevBlock4() {
     initialize();
 }
 
-/* 802ED9E4-802EDAC4 2E8324 00E0+00 1/0 0/0 0/0 .text            __dt__12J2DTevBlock4Fv */
 J2DTevBlock4::~J2DTevBlock4() {
     for (int i = 0; i < 4; i++) {
         if (mUndeleteFlag & (1 << i)) {
@@ -895,7 +848,6 @@ J2DTevBlock4::~J2DTevBlock4() {
     }
 }
 
-/* 802EDAC4-802EDD34 2E8404 0270+00 1/0 0/0 0/0 .text            initialize__12J2DTevBlock4Fv */
 // NONMATCHING - inlines
 void J2DTevBlock4::initialize() {
     for (int i = 0; i < 4; i++) {
@@ -931,8 +883,6 @@ void J2DTevBlock4::initialize() {
     mFont = NULL;
 }
 
-/* 802EDD34-802EDE04 2E8674 00D0+00 1/0 0/0 0/0 .text            prepareTexture__12J2DTevBlock4FUc
- */
 bool J2DTevBlock4::prepareTexture(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i >= 4) {
@@ -952,8 +902,6 @@ bool J2DTevBlock4::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 802EDE04-802EE1D4 2E8744 03D0+00 1/0 0/0 0/0 .text
- * insertTexture__12J2DTevBlock4FUlPC7ResTIMGP10JUTPalette      */
 bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
     if (param_0 >= 4 || !p_timg) {
         return false;
@@ -1044,8 +992,6 @@ bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
     return true;
 }
 
-/* 802EE1D4-802EE364 2E8B14 0190+00 1/0 0/0 0/0 .text
- * insertTexture__12J2DTevBlock4FUlP10JUTTexture                */
 bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 4 || p_tex == NULL) {
         return false;
@@ -1088,7 +1034,6 @@ bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EE364-802EE5F0 2E8CA4 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlPC7ResTIMG */
 bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
     if (param_0 >= 4) {
         return false;
@@ -1160,8 +1105,6 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
     return true;
 }
 
-/* 802EE5F0-802EE6A0 2E8F30 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlP10JUTTexture
- */
 bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 4) {
         return false;
@@ -1179,7 +1122,6 @@ bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EE6A0-802EE798 2E8FE0 00F8+00 1/0 0/0 0/0 .text            removeTexture__12J2DTevBlock4FUl */
 bool J2DTevBlock4::removeTexture(u32 param_0) {
     if (param_0 >= 4) {
         return false;
@@ -1203,8 +1145,6 @@ bool J2DTevBlock4::removeTexture(u32 param_0) {
     return true;
 }
 
-/* 802EE798-802EE84C 2E90D8 00B4+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock4FP7ResFONT
- */
 bool J2DTevBlock4::setFont(ResFONT* p_font) {
     if (p_font == NULL) {
         return false;
@@ -1224,8 +1164,6 @@ bool J2DTevBlock4::setFont(ResFONT* p_font) {
     return true;
 }
 
-/* 802EE84C-802EE8CC 2E918C 0080+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock4FP7JUTFont
- */
 bool J2DTevBlock4::setFont(JUTFont* p_font) {
     if (p_font == NULL) {
         return false;
@@ -1240,7 +1178,6 @@ bool J2DTevBlock4::setFont(JUTFont* p_font) {
     return true;
 }
 
-/* 802EE8CC-802EE9A4 2E920C 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock4FUlPC7ResTLUT */
 bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     if (param_0 >= 4) {
         return false;
@@ -1268,8 +1205,6 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     return true;
 }
 
-/* 802EE9A4-802EEA2C 2E92E4 0088+00 1/0 0/0 0/0 .text            shiftDeleteFlag__12J2DTevBlock4FUcb
- */
 void J2DTevBlock4::shiftDeleteFlag(u8 param_0, bool param_1) {
     u8 tmpFlags = mUndeleteFlag & 0x80;
     mUndeleteFlag = mUndeleteFlag & 0x7F;
@@ -1283,7 +1218,6 @@ void J2DTevBlock4::shiftDeleteFlag(u8 param_0, bool param_1) {
     mUndeleteFlag |= tmpFlags;
 }
 
-/* 802EEA2C-802EED1C 2E936C 02F0+00 1/0 0/0 0/0 .text            setGX__12J2DTevBlock4Fv */
 void J2DTevBlock4::setGX() {
     for (int i = 0; i < 4; i++) {
         loadTexture(GXTexMapID(i), i);
@@ -1330,15 +1264,12 @@ void J2DTevBlock4::setGX() {
     }
 }
 
-/* 802EED1C-802EED64 2E965C 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock4F11_GXTexMapIDUl
- */
 void J2DTevBlock4::loadTexture(GXTexMapID texmapID, u32 texIndex) {
     if (texIndex < 4 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
         mTexture[texIndex]->load(texmapID);
     }
 }
 
-/* 802EED64-802EEE8C 2E96A4 0128+00 0/0 1/1 0/0 .text            __ct__12J2DTevBlock8Fv */
 J2DTevBlock8::J2DTevBlock8() {
     for (int i = 0; i < 8; i++) {
         mTexture[i] = NULL;
@@ -1348,7 +1279,6 @@ J2DTevBlock8::J2DTevBlock8() {
     initialize();
 }
 
-/* 802EEE8C-802EEF6C 2E97CC 00E0+00 1/0 0/0 0/0 .text            __dt__12J2DTevBlock8Fv */
 J2DTevBlock8::~J2DTevBlock8() {
     for (int i = 0; i < 8; i++) {
         if (mUndeleteFlag & (1 << i)) {
@@ -1362,7 +1292,6 @@ J2DTevBlock8::~J2DTevBlock8() {
     }
 }
 
-/* 802EEF6C-802EF1E0 2E98AC 0274+00 1/0 0/0 0/0 .text            initialize__12J2DTevBlock8Fv */
 // NONMATCHING - inlines
 void J2DTevBlock8::initialize() {
     for (int i = 0; i < 8; i++) {
@@ -1399,8 +1328,6 @@ void J2DTevBlock8::initialize() {
     mFontUndeleteFlag = 0;
 }
 
-/* 802EF1E0-802EF2B0 2E9B20 00D0+00 1/0 0/0 0/0 .text            prepareTexture__12J2DTevBlock8FUc
- */
 bool J2DTevBlock8::prepareTexture(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i >= 8) {
@@ -1420,8 +1347,6 @@ bool J2DTevBlock8::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 802EF2B0-802EF67C 2E9BF0 03CC+00 1/0 0/0 0/0 .text
- * insertTexture__12J2DTevBlock8FUlPC7ResTIMGP10JUTPalette      */
 bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
     if (param_0 >= 8 || !p_timg) {
         return false;
@@ -1512,8 +1437,6 @@ bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
     return true;
 }
 
-/* 802EF67C-802EF80C 2E9FBC 0190+00 1/0 0/0 0/0 .text
- * insertTexture__12J2DTevBlock8FUlP10JUTTexture                */
 bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 8 || p_tex == NULL) {
         return false;
@@ -1556,7 +1479,6 @@ bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EF80C-802EFA98 2EA14C 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlPC7ResTIMG */
 bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
     if (param_0 >= 8) {
         return false;
@@ -1628,8 +1550,6 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
     return true;
 }
 
-/* 802EFA98-802EFB48 2EA3D8 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlP10JUTTexture
- */
 bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 8) {
         return false;
@@ -1647,7 +1567,6 @@ bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802EFB48-802EFC40 2EA488 00F8+00 1/0 0/0 0/0 .text            removeTexture__12J2DTevBlock8FUl */
 bool J2DTevBlock8::removeTexture(u32 param_0) {
     if (param_0 >= 8) {
         return false;
@@ -1671,8 +1590,6 @@ bool J2DTevBlock8::removeTexture(u32 param_0) {
     return true;
 }
 
-/* 802EFC40-802EFCEC 2EA580 00AC+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock8FP7ResFONT
- */
 bool J2DTevBlock8::setFont(ResFONT* p_font) {
     if (p_font == NULL) {
         return false;
@@ -1692,8 +1609,6 @@ bool J2DTevBlock8::setFont(ResFONT* p_font) {
     return true;
 }
 
-/* 802EFCEC-802EFD68 2EA62C 007C+00 1/0 0/0 0/0 .text            setFont__12J2DTevBlock8FP7JUTFont
- */
 bool J2DTevBlock8::setFont(JUTFont* p_font) {
     if (p_font == NULL) {
         return false;
@@ -1708,7 +1623,6 @@ bool J2DTevBlock8::setFont(JUTFont* p_font) {
     return true;
 }
 
-/* 802EFD68-802EFE40 2EA6A8 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock8FUlPC7ResTLUT */
 bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     if (param_0 >= 8) {
         return false;
@@ -1736,8 +1650,6 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     return true;
 }
 
-/* 802EFE40-802EFEAC 2EA780 006C+00 1/0 0/0 0/0 .text            shiftDeleteFlag__12J2DTevBlock8FUcb
- */
 void J2DTevBlock8::shiftDeleteFlag(u8 param_0, bool param_1) {
     if (param_1) {
         mUndeleteFlag = (mUndeleteFlag & ((1 << param_0) - 1)) | ((mUndeleteFlag & ~((1 << param_0) - 1)) * 2);
@@ -1746,7 +1658,6 @@ void J2DTevBlock8::shiftDeleteFlag(u8 param_0, bool param_1) {
     }
 }
 
-/* 802EFEAC-802F019C 2EA7EC 02F0+00 1/0 0/0 0/0 .text            setGX__12J2DTevBlock8Fv */
 void J2DTevBlock8::setGX() {
     for (int i = 0; i < 8; i++) {
         loadTexture(GXTexMapID(i), i);
@@ -1793,15 +1704,12 @@ void J2DTevBlock8::setGX() {
     }
 }
 
-/* 802F019C-802F01E4 2EAADC 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock8F11_GXTexMapIDUl
- */
 void J2DTevBlock8::loadTexture(GXTexMapID texmapID, u32 texIndex) {
     if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
         mTexture[texIndex]->load(texmapID);
     }
 }
 
-/* 802F01E4-802F030C 2EAB24 0128+00 0/0 1/1 0/0 .text            __ct__13J2DTevBlock16Fv */
 J2DTevBlock16::J2DTevBlock16() {
     for (int i = 0; i < 8; i++) {
         mTexture[i] = NULL;
@@ -1811,7 +1719,6 @@ J2DTevBlock16::J2DTevBlock16() {
     initialize();
 }
 
-/* 802F030C-802F03EC 2EAC4C 00E0+00 1/0 0/0 0/0 .text            __dt__13J2DTevBlock16Fv */
 J2DTevBlock16::~J2DTevBlock16() {
     for (int i = 0; i < 8; i++) {
         if (mUndeleteFlag & (1 << i)) {
@@ -1825,7 +1732,6 @@ J2DTevBlock16::~J2DTevBlock16() {
     }
 }
 
-/* 802F03EC-802F0660 2EAD2C 0274+00 1/0 0/0 0/0 .text            initialize__13J2DTevBlock16Fv */
 // NONMATCHING - inlines
 void J2DTevBlock16::initialize() {
     for (int i = 0; i < 8; i++) {
@@ -1862,8 +1768,6 @@ void J2DTevBlock16::initialize() {
     mFontUndeleteFlag = 0;
 }
 
-/* 802F0660-802F0730 2EAFA0 00D0+00 1/0 0/0 0/0 .text            prepareTexture__13J2DTevBlock16FUc
- */
 bool J2DTevBlock16::prepareTexture(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i >= 8) {
@@ -1883,8 +1787,6 @@ bool J2DTevBlock16::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 802F0730-802F0AFC 2EB070 03CC+00 1/0 0/0 0/0 .text
- * insertTexture__13J2DTevBlock16FUlPC7ResTIMGP10JUTPalette     */
 bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
     if (param_0 >= 8 || !p_timg) {
         return false;
@@ -1975,8 +1877,6 @@ bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette
     return true;
 }
 
-/* 802F0AFC-802F0C8C 2EB43C 0190+00 1/0 0/0 0/0 .text
- * insertTexture__13J2DTevBlock16FUlP10JUTTexture               */
 bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 8 || p_tex == NULL) {
         return false;
@@ -2019,7 +1919,6 @@ bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802F0C8C-802F0F18 2EB5CC 028C+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlPC7ResTIMG */
 bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
     if (param_0 >= 8) {
         return false;
@@ -2091,8 +1990,6 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
     return true;
 }
 
-/* 802F0F18-802F0FC8 2EB858 00B0+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlP10JUTTexture
- */
 bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) {
     if (param_0 >= 8) {
         return false;
@@ -2110,8 +2007,6 @@ bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) {
     return true;
 }
 
-/* 802F0FC8-802F10C0 2EB908 00F8+00 1/0 0/0 0/0 .text            removeTexture__13J2DTevBlock16FUl
- */
 bool J2DTevBlock16::removeTexture(u32 param_0) {
     if (param_0 >= 8) {
         return false;
@@ -2135,8 +2030,6 @@ bool J2DTevBlock16::removeTexture(u32 param_0) {
     return true;
 }
 
-/* 802F10C0-802F116C 2EBA00 00AC+00 1/0 0/0 0/0 .text            setFont__13J2DTevBlock16FP7ResFONT
- */
 bool J2DTevBlock16::setFont(ResFONT* p_font) {
     if (p_font == NULL) {
         return false;
@@ -2156,8 +2049,6 @@ bool J2DTevBlock16::setFont(ResFONT* p_font) {
     return true;
 }
 
-/* 802F116C-802F11E8 2EBAAC 007C+00 1/0 0/0 0/0 .text            setFont__13J2DTevBlock16FP7JUTFont
- */
 bool J2DTevBlock16::setFont(JUTFont* p_font) {
     if (p_font == NULL) {
         return false;
@@ -2172,7 +2063,6 @@ bool J2DTevBlock16::setFont(JUTFont* p_font) {
     return true;
 }
 
-/* 802F11E8-802F12C0 2EBB28 00D8+00 1/0 0/0 0/0 .text setPalette__13J2DTevBlock16FUlPC7ResTLUT */
 bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     if (param_0 >= 8) {
         return false;
@@ -2200,7 +2090,6 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
     return true;
 }
 
-/* 802F12C0-802F132C 2EBC00 006C+00 1/0 0/0 0/0 .text shiftDeleteFlag__13J2DTevBlock16FUcb */
 void J2DTevBlock16::shiftDeleteFlag(u8 param_0, bool param_1) {
     if (param_1) {
         mUndeleteFlag = (mUndeleteFlag & ((1 << param_0) - 1)) | ((mUndeleteFlag & ~((1 << param_0) - 1)) * 2);
@@ -2209,7 +2098,6 @@ void J2DTevBlock16::shiftDeleteFlag(u8 param_0, bool param_1) {
     }
 }
 
-/* 802F132C-802F161C 2EBC6C 02F0+00 1/0 0/0 0/0 .text            setGX__13J2DTevBlock16Fv */
 void J2DTevBlock16::setGX() {
     for (int i = 0; i < 8; i++) {
         loadTexture(GXTexMapID(i), i);
@@ -2256,15 +2144,12 @@ void J2DTevBlock16::setGX() {
     }
 }
 
-/* 802F161C-802F1664 2EBF5C 0048+00 1/0 0/0 0/0 .text loadTexture__13J2DTevBlock16F11_GXTexMapIDUl
- */
 void J2DTevBlock16::loadTexture(GXTexMapID texmapID, u32 texIndex) {
     if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
         mTexture[texIndex]->load(texmapID);
     }
 }
 
-/* 802F1664-802F1730 2EBFA4 00CC+00 1/0 0/0 0/0 .text            initialize__15J2DIndBlockFullFv */
 void J2DIndBlockFull::initialize() {
     mIndTexStageNum = 0;
     for (int i = 0; i < 4; i++) {
@@ -2278,7 +2163,6 @@ void J2DIndBlockFull::initialize() {
     }
 }
 
-/* 802F1730-802F17FC 2EC070 00CC+00 1/0 0/0 0/0 .text            setGX__15J2DIndBlockFullFv */
 void J2DIndBlockFull::setGX() {
     GXSetNumIndStages(mIndTexStageNum);
     for (u8 i = 0; i < mIndTexStageNum; i++) {
@@ -2292,28 +2176,23 @@ void J2DIndBlockFull::setGX() {
     }
 }
 
-/* 802F17FC-802F1840 2EC13C 0044+00 0/0 1/1 0/0 .text            initialize__10J2DPEBlockFv */
 void J2DPEBlock::initialize() {
     mAlphaComp = J2DAlphaComp();
     mBlend.setBlendInfo(j2dDefaultBlendInfo);
     mDither = j2dDefaultPEBlockDither;
 }
 
-/* 802F1840-802F18A0 2EC180 0060+00 0/0 1/1 0/0 .text            setGX__10J2DPEBlockFv */
 void J2DPEBlock::setGX() {
     GXSetAlphaCompare(GXCompare(mAlphaComp.getComp0()), mAlphaComp.getRef0(), GXAlphaOp(mAlphaComp.getOp()), GXCompare(mAlphaComp.getComp1()), mAlphaComp.getRef1());
     GXSetBlendMode(GXBlendMode(mBlend.getType()), GXBlendFactor(mBlend.getSrcFactor()), GXBlendFactor(mBlend.getDstFactor()), GXLogicOp(mBlend.getOp()));
     GXSetDither(mDither);
 }
 
-/* 802F1940-802F19A8 2EC280 0068+00 5/5 1/1 0/0 .text            __ct__11J2DTevStageFv */
 J2DTevStage::J2DTevStage() {
     setTevStageInfo(j2dDefaultTevStageInfo);
     setTevSwapModeInfo(j2dDefaultTevSwapMode);
 }
 
-/* 802F19A8-802F1B70 2EC2E8 01C8+00 1/1 1/1 0/0 .text
- * setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo           */
 void J2DTevStage::setTevStageInfo(J2DTevStageInfo const& info) {
     setColorABCD(info.mColorA, info.mColorB, info.mColorC, info.mColorD);
     setTevColorOp(info.mCOp, info.mCBias, info.mCScale, info.mCClamp, info.mCReg);
diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/src/JSystem/J2DGraph/J2DMaterial.cpp
index af85981c01..059d12e7bb 100644
--- a/src/JSystem/J2DGraph/J2DMaterial.cpp
+++ b/src/JSystem/J2DGraph/J2DMaterial.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DMaterial
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
@@ -11,7 +6,6 @@
 #include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTTexture.h"
 
-/* 802EA1AC-802EA2CC 2E4AEC 0120+00 0/0 1/1 0/0 .text            __ct__11J2DMaterialFv */
 J2DMaterial::J2DMaterial() {
     field_0x4 = 0;
     mIndex = -1;
@@ -28,7 +22,6 @@ J2DMaterial::~J2DMaterial() {
     delete mAnmPointer;
 }
 
-/* 802EA38C-802EA410 2E4CCC 0084+00 0/0 8/8 0/0 .text            setGX__11J2DMaterialFv */
 void J2DMaterial::setGX() {
     if (mVisible) {
         getColorBlock()->setGX();
@@ -46,7 +39,6 @@ void J2DMaterial::setGX() {
     }
 }
 
-/* 802EA410-802EA5C4 2E4D50 01B4+00 0/0 1/1 0/0 .text            createTevBlock__11J2DMaterialFib */
 J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
     J2DTevBlock* block;
 
@@ -79,7 +71,6 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
     return block;
 }
 
-/* 802EA5C4-802EA79C 2E4F04 01D8+00 0/0 1/1 0/0 .text            createIndBlock__11J2DMaterialFib */
 J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
     J2DIndBlock* block;
 
@@ -100,8 +91,6 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
     return block;
 }
 
-/* 802EA79C-802EA84C 2E50DC 00B0+00 1/1 0/0 0/0 .text
- * __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv               */
 J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() {
     mColorAnm = NULL;
     mColorIds = -1;
@@ -126,15 +115,12 @@ J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() {
     }
 }
 
-/* 802EA84C-802EA89C 2E518C 0050+00 4/4 0/0 0/0 .text            makeAnmPointer__11J2DMaterialFv */
 void J2DMaterial::makeAnmPointer() {
     if (mAnmPointer == NULL) {
         mAnmPointer = new J2DMaterialAnmPointer();
     }
 }
 
-/* 802EA89C-802EA94C 2E51DC 00B0+00 0/0 4/4 0/0 .text setAnimation__11J2DMaterialFP11J2DAnmColor
- */
 void J2DMaterial::setAnimation(J2DAnmColor* anm) {
     if (anm != NULL || mAnmPointer != NULL) {
         makeAnmPointer();
@@ -157,8 +143,6 @@ void J2DMaterial::setAnimation(J2DAnmColor* anm) {
     }
 }
 
-/* 802EA94C-802EAA2C 2E528C 00E0+00 0/0 4/4 0/0 .text
- * setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey           */
 void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* anm) {
     if (anm != NULL || mAnmPointer != NULL) {
         makeAnmPointer();
@@ -184,8 +168,6 @@ void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* anm) {
     }
 }
 
-/* 802EAA2C-802EAB0C 2E536C 00E0+00 0/0 4/4 0/0 .text
- * setAnimation__11J2DMaterialFP16J2DAnmTexPattern              */
 void J2DMaterial::setAnimation(J2DAnmTexPattern* anm) {
     if (anm != NULL || mAnmPointer != NULL) {
         makeAnmPointer();
@@ -211,8 +193,6 @@ void J2DMaterial::setAnimation(J2DAnmTexPattern* anm) {
     }
 }
 
-/* 802EAB0C-802EAC78 2E544C 016C+00 0/0 4/4 0/0 .text
- * setAnimation__11J2DMaterialFP15J2DAnmTevRegKey               */
 void J2DMaterial::setAnimation(J2DAnmTevRegKey* anm) {
     if (anm != NULL || mAnmPointer != NULL) {
         makeAnmPointer();
@@ -256,7 +236,6 @@ void J2DMaterial::setAnimation(J2DAnmTevRegKey* anm) {
     }
 }
 
-/* 802EAC78-802EB0F4 2E55B8 047C+00 0/0 1/1 0/0 .text            animation__11J2DMaterialFv */
 void J2DMaterial::animation() {
     if (!mAnmPointer) {
 		return;
diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 2e2e836041..28fc413e69 100644
--- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DMaterialFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DMaterialFactory.h"
@@ -13,8 +8,6 @@
 #include "string.h"
 #include "dolphin/types.h"
 
-/* 802F2AD0-802F2C94 2ED410 01C4+00 0/0 1/1 0/0 .text
- * __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock              */
 J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
     field_0x0 = param_0.field_0x8;
     field_0x4 = JSUConvertOffsetToPtr<J2DMaterialInitData>(&param_0, (void*)param_0.field_0xc);
@@ -46,7 +39,6 @@ J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) {
     field_0x58 = JSUConvertOffsetToPtr<u8>(&param_0, (void*)param_0.field_0x64);
 }
 
-/* 802F2C94-802F2D1C 2ED5D4 0088+00 1/1 0/0 0/0 .text countStages__18J2DMaterialFactoryCFi */
 u32 J2DMaterialFactory::countStages(int param_0) const {
     J2DMaterialInitData* iVar5 = &field_0x4[field_0x8[param_0]];
     u32 uVar4 = 0;
@@ -193,7 +185,6 @@ J2DMaterial* J2DMaterialFactory::create(J2DMaterial* param_0, int index, u32 par
     return param_0;
 }
 
-/* 802F362C-802F36CC 2EDF6C 00A0+00 1/1 0/0 0/0 .text newMatColor__18J2DMaterialFactoryCFii */
 JUtility::TColor J2DMaterialFactory::newMatColor(int param_0, int param_1) const {
     GXColor color = {0xff,0xff,0xff,0xff};
     JUtility::TColor local_20 = GXColor(color);
@@ -204,7 +195,6 @@ JUtility::TColor J2DMaterialFactory::newMatColor(int param_0, int param_1) const
     return local_20;
 }
 
-/* 802F36CC-802F3704 2EE00C 0038+00 1/1 0/0 0/0 .text newColorChanNum__18J2DMaterialFactoryCFi */
 u8 J2DMaterialFactory::newColorChanNum(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x2 != 0xff) {
@@ -213,7 +203,6 @@ u8 J2DMaterialFactory::newColorChanNum(int param_0) const {
     return 0;
 }
 
-/* 802F3704-802F3758 2EE044 0054+00 1/1 0/0 0/0 .text newColorChan__18J2DMaterialFactoryCFii */
 J2DColorChan J2DMaterialFactory::newColorChan(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0xc[param_1] != 0xffff) {
@@ -222,7 +211,6 @@ J2DColorChan J2DMaterialFactory::newColorChan(int param_0, int param_1) const {
     return J2DColorChan();
 }
 
-/* 802F3758-802F3790 2EE098 0038+00 1/1 0/0 0/0 .text newTexGenNum__18J2DMaterialFactoryCFi */
 u32 J2DMaterialFactory::newTexGenNum(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x3 != 0xff) {
@@ -231,7 +219,6 @@ u32 J2DMaterialFactory::newTexGenNum(int param_0) const {
     return 0;
 }
 
-/* 802F3790-802F3804 2EE0D0 0074+00 1/1 0/0 0/0 .text newTexCoord__18J2DMaterialFactoryCFii */
 J2DTexCoord J2DMaterialFactory::newTexCoord(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x14[param_1] != 0xffff) {
@@ -240,8 +227,6 @@ J2DTexCoord J2DMaterialFactory::newTexCoord(int param_0, int param_1) const {
     return J2DTexCoord();
 }
 
-/* 802F3804-802F38E0 2EE144 00DC+00 1/1 0/0 0/0 .text            newTexMtx__18J2DMaterialFactoryCFii
- */
 J2DTexMtx* J2DMaterialFactory::newTexMtx(int param_0, int param_1) const {
     J2DTexMtx* rv = NULL;
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
@@ -252,7 +237,6 @@ J2DTexMtx* J2DMaterialFactory::newTexMtx(int param_0, int param_1) const {
     return rv;
 }
 
-/* 802F38E0-802F3920 2EE220 0040+00 1/1 0/0 0/0 .text newCullMode__18J2DMaterialFactoryCFi */
 u8 J2DMaterialFactory::newCullMode(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x1 != 0xff) {
@@ -261,8 +245,6 @@ u8 J2DMaterialFactory::newCullMode(int param_0) const {
     return 0xff;
 }
 
-/* 802F3920-802F3968 2EE260 0048+00 1/1 0/0 0/0 .text            newTexNo__18J2DMaterialFactoryCFii
- */
 u16 J2DMaterialFactory::newTexNo(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x38[param_1] != 0xffff) {
@@ -271,8 +253,6 @@ u16 J2DMaterialFactory::newTexNo(int param_0, int param_1) const {
     return 0x1FFFF;
 }
 
-/* 802F3968-802F39A8 2EE2A8 0040+00 1/1 0/0 0/0 .text            newFontNo__18J2DMaterialFactoryCFi
- */
 u16 J2DMaterialFactory::newFontNo(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x48 != 0xffff) {
@@ -281,7 +261,6 @@ u16 J2DMaterialFactory::newFontNo(int param_0) const {
     return 0x1FFFF;
 }
 
-/* 802F39A8-802F3A1C 2EE2E8 0074+00 1/1 0/0 0/0 .text newTevOrder__18J2DMaterialFactoryCFii */
 J2DTevOrder J2DMaterialFactory::newTevOrder(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x72[param_1] != 0xffff) {
@@ -290,7 +269,6 @@ J2DTevOrder J2DMaterialFactory::newTevOrder(int param_0, int param_1) const {
     return J2DTevOrder();
 }
 
-/* 802F3A1C-802F3AB4 2EE35C 0098+00 1/1 0/0 0/0 .text            newTevColor__18J2DMaterialFactoryCFii */
 J2DGXColorS10 J2DMaterialFactory::newTevColor(int param_0, int param_1) const {
     // FAKEMATCH
     #if DEBUG || VERSION == VERSION_WII_USA_R0 || VERSION == VERSION_WII_USA_R2
@@ -313,7 +291,6 @@ J2DGXColorS10 J2DMaterialFactory::newTevColor(int param_0, int param_1) const {
     return rv;
 }
 
-/* 802F3AB4-802F3B54 2EE3F4 00A0+00 1/1 0/0 0/0 .text            newTevKColor__18J2DMaterialFactoryCFii */
 JUtility::TColor J2DMaterialFactory::newTevKColor(int param_0, int param_1) const {
     JUtility::TColor local_20 = (GXColor){0xFF, 0xFF, 0xFF, 0xFF};
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
@@ -323,7 +300,6 @@ JUtility::TColor J2DMaterialFactory::newTevKColor(int param_0, int param_1) cons
     return local_20;
 }
 
-/* 802F3B54-802F3B8C 2EE494 0038+00 1/1 0/0 0/0 .text newTevStageNum__18J2DMaterialFactoryCFi */
 u8 J2DMaterialFactory::newTevStageNum(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x4 != 0xff) {
@@ -332,7 +308,6 @@ u8 J2DMaterialFactory::newTevStageNum(int param_0) const {
     return 0xFF;
 }
 
-/* 802F3B8C-802F3BEC 2EE4CC 0060+00 1/1 0/0 0/0 .text newTevStage__18J2DMaterialFactoryCFii */
 J2DTevStage J2DMaterialFactory::newTevStage(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x9a[param_1] != 0xffff) {
@@ -341,8 +316,6 @@ J2DTevStage J2DMaterialFactory::newTevStage(int param_0, int param_1) const {
     return J2DTevStage();
 }
 
-/* 802F3BEC-802F3C88 2EE52C 009C+00 1/1 0/0 0/0 .text
- * newTevSwapModeTable__18J2DMaterialFactoryCFii                */
 J2DTevSwapModeTable J2DMaterialFactory::newTevSwapModeTable(int param_0, int param_1) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0xda[param_1] != 0xffff) {
@@ -351,8 +324,6 @@ J2DTevSwapModeTable J2DMaterialFactory::newTevSwapModeTable(int param_0, int par
     return J2DTevSwapModeTable(j2dDefaultTevSwapModeTable);
 }
 
-/* 802F3C88-802F3CB8 2EE5C8 0030+00 1/1 0/0 0/0 .text newIndTexStageNum__18J2DMaterialFactoryCFi
- */
 u8 J2DMaterialFactory::newIndTexStageNum(int param_0) const {
     if (field_0xc != NULL) {
         if (field_0xc[param_0].field_0x0 == 1) {
@@ -362,7 +333,6 @@ u8 J2DMaterialFactory::newIndTexStageNum(int param_0) const {
     return 0;
 }
 
-/* 802F3CB8-802F3D20 2EE5F8 0068+00 1/1 0/0 0/0 .text newIndTexOrder__18J2DMaterialFactoryCFii */
 J2DIndTexOrder J2DMaterialFactory::newIndTexOrder(int param_0, int param_1) const {
     J2DIndTexOrder rv;
     if (field_0xc != NULL) {
@@ -373,7 +343,6 @@ J2DIndTexOrder J2DMaterialFactory::newIndTexOrder(int param_0, int param_1) cons
     return rv;
 }
 
-/* 802F3D20-802F3E24 2EE660 0104+00 1/1 0/0 0/0 .text newIndTexMtx__18J2DMaterialFactoryCFii */
 J2DIndTexMtx J2DMaterialFactory::newIndTexMtx(int param_0, int param_1) const {
     J2DIndTexMtx rv;
     if (field_0xc != NULL) {
@@ -384,7 +353,6 @@ J2DIndTexMtx J2DMaterialFactory::newIndTexMtx(int param_0, int param_1) const {
     return rv;
 }
 
-/* 802F3E24-802F3F78 2EE764 0154+00 1/1 0/0 0/0 .text newIndTevStage__18J2DMaterialFactoryCFii */
 J2DIndTevStage J2DMaterialFactory::newIndTevStage(int param_0, int param_1) const {
     J2DIndTevStage rv;
     if (field_0xc != NULL) {
@@ -395,8 +363,6 @@ J2DIndTevStage J2DMaterialFactory::newIndTevStage(int param_0, int param_1) cons
     return rv;
 }
 
-/* 802F3F78-802F3FE0 2EE8B8 0068+00 1/1 0/0 0/0 .text
- * newIndTexCoordScale__18J2DMaterialFactoryCFii                */
 J2DIndTexCoordScale J2DMaterialFactory::newIndTexCoordScale(int param_0, int param_1) const {
     J2DIndTexCoordScale rv;
     if (field_0xc != NULL) {
@@ -407,7 +373,6 @@ J2DIndTexCoordScale J2DMaterialFactory::newIndTexCoordScale(int param_0, int par
     return rv;
 }
 
-/* 802F3FE0-802F405C 2EE920 007C+00 1/1 0/0 0/0 .text newAlphaComp__18J2DMaterialFactoryCFi */
 J2DAlphaComp J2DMaterialFactory::newAlphaComp(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0xe2 != 0xffff) {
@@ -416,8 +381,6 @@ J2DAlphaComp J2DMaterialFactory::newAlphaComp(int param_0) const {
     return J2DAlphaComp();
 }
 
-/* 802F405C-802F40D8 2EE99C 007C+00 1/1 0/0 0/0 .text            newBlend__18J2DMaterialFactoryCFi
- */
 J2DBlend J2DMaterialFactory::newBlend(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0xe4 != 0xffff) {
@@ -426,8 +389,6 @@ J2DBlend J2DMaterialFactory::newBlend(int param_0) const {
     return J2DBlend();
 }
 
-/* 802F40D8-802F4110 2EEA18 0038+00 1/1 0/0 0/0 .text            newDither__18J2DMaterialFactoryCFi
- */
 u8 J2DMaterialFactory::newDither(int param_0) const {
     J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]];
     if (iVar2->field_0x5 != 0xff) {
@@ -436,7 +397,6 @@ u8 J2DMaterialFactory::newDither(int param_0) const {
     return 0;
 }
 
-/* 802F4110-802F4170 2EEA50 0060+00 1/1 0/0 0/0 .text __ct__11J2DTevStageFRC15J2DTevStageInfo */
 J2DTevStage::J2DTevStage(J2DTevStageInfo const& param_0) {
     setTevStageInfo(param_0);
     setTevSwapModeInfo(j2dDefaultTevSwapMode);
diff --git a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp b/src/JSystem/J2DGraph/J2DOrthoGraph.cpp
index ddafdce09e..6025c957c9 100644
--- a/src/JSystem/J2DGraph/J2DOrthoGraph.cpp
+++ b/src/JSystem/J2DGraph/J2DOrthoGraph.cpp
@@ -3,12 +3,10 @@
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "dolphin/gx.h"
 
-/* 802E9670-802E96D0 2E3FB0 0060+00 3/3 1/1 0/0 .text            __ct__13J2DOrthoGraphFv */
 J2DOrthoGraph::J2DOrthoGraph() : J2DGrafContext(0, 0, 0, 0) {
     this->setLookat();
 }
 
-/* 802E96D0-802E97B4 2E4010 00E4+00 0/0 7/7 0/0 .text            __ct__13J2DOrthoGraphFffffff */
 J2DOrthoGraph::J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near)
     : J2DGrafContext(x, y, width, height) {
     mOrtho = JGeometry::TBox2<f32>(0, 0, width, height);
@@ -17,29 +15,23 @@ J2DOrthoGraph::J2DOrthoGraph(f32 x, f32 y, f32 width, f32 height, f32 far, f32 n
     this->setLookat();
 }
 
-/* 802E97B4-802E980C 2E40F4 0058+00 1/0 6/6 0/0 .text            setPort__13J2DOrthoGraphFv */
 void J2DOrthoGraph::setPort() {
     this->J2DGrafContext::setPort();
     C_MTXOrtho(mMtx44, mOrtho.i.y, mOrtho.f.y, mOrtho.i.x, mOrtho.f.x, mNear, mFar);
     GXSetProjection(mMtx44, GX_ORTHOGRAPHIC);
 }
 
-/* 802E980C-802E9840 2E414C 0034+00 0/0 5/5 0/0 .text
- * setOrtho__13J2DOrthoGraphFRCQ29JGeometry8TBox2<f>ff          */
 void J2DOrthoGraph::setOrtho(JGeometry::TBox2<f32> const& bounds, f32 far, f32 near) {
     mOrtho = bounds;
     mNear = -near;
     mFar = -far;
 }
 
-/* 802E9840-802E987C 2E4180 003C+00 1/0 0/0 0/0 .text            setLookat__13J2DOrthoGraphFv */
 void J2DOrthoGraph::setLookat() {
     MTXIdentity(mPosMtx);
     GXLoadPosMtxImm(mPosMtx, 0);
 }
 
-/* 802E987C-802E9998 2E41BC 011C+00 0/0 1/1 0/0 .text
- * scissorBounds__13J2DOrthoGraphFPQ29JGeometry8TBox2<f>PCQ29JGeometry8TBox2<f> */
 void J2DOrthoGraph::scissorBounds(JGeometry::TBox2<f32>* param_0,
                                   JGeometry::TBox2<f32> const* param_1) {
     f32 widthPower = this->getWidthPower();
@@ -54,7 +46,6 @@ void J2DOrthoGraph::scissorBounds(JGeometry::TBox2<f32>* param_0,
     param_0->intersect(mScissorBounds);
 }
 
-/* 802E9998-802E9AC4 2E42D8 012C+00 0/0 6/6 0/0 .text J2DDrawLine__FffffQ28JUtility6TColori */
 void J2DDrawLine(f32 x1, f32 y1, f32 x2, f32 y2, JUtility::TColor color,
                  int line_width) {
     J2DOrthoGraph oGrph;
@@ -64,29 +55,23 @@ void J2DDrawLine(f32 x1, f32 y1, f32 x2, f32 y2, JUtility::TColor color,
     oGrph.lineTo(x2, y2);
 }
 
-/* 802E9AC4-802E9B0C 2E4404 0048+00 0/0 10/10 0/0 .text J2DFillBox__FffffQ28JUtility6TColor */
 void J2DFillBox(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color) {
     J2DFillBox(JGeometry::TBox2<f32>(x, y, x + width, y + height),
                color);
 }
 
-/* 802E9B0C-802E9B9C 2E444C 0090+00 1/1 0/0 0/0 .text
- * J2DFillBox__FRCQ29JGeometry8TBox2<f>Q28JUtility6TColor       */
 void J2DFillBox(JGeometry::TBox2<f32> const& box, JUtility::TColor color) {
     J2DOrthoGraph oGrph;
     oGrph.setColor(color);
     oGrph.fillBox(box);
 }
 
-/* 802E9B9C-802E9BE8 2E44DC 004C+00 0/0 5/5 0/0 .text J2DDrawFrame__FffffQ28JUtility6TColorUc */
 void J2DDrawFrame(f32 x, f32 y, f32 width, f32 height, JUtility::TColor color,
                   u8 line_width) {
     J2DDrawFrame(JGeometry::TBox2<f32>(x, y, x + width, y + height),
                  color, line_width);
 }
 
-/* 802E9BE8-802E9C88 2E4528 00A0+00 1/1 0/0 0/0 .text
- * J2DDrawFrame__FRCQ29JGeometry8TBox2<f>Q28JUtility6TColorUc   */
 void J2DDrawFrame(JGeometry::TBox2<f32> const& box, JUtility::TColor color, u8 line_width) {
     J2DOrthoGraph oGrph;
     oGrph.setColor(color);
diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp
index 2e7d49afc6..6de4c1772f 100644
--- a/src/JSystem/J2DGraph/J2DPane.cpp
+++ b/src/JSystem/J2DGraph/J2DPane.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResource.h"
 
-/* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text            __ct__7J2DPaneFv */
 J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {
     mTransform = NULL;
     mKind = 'PAN1';
@@ -20,7 +19,6 @@ J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {
     calcMtx();
 }
 
-/* 802F5CB8-802F5D40 2F05F8 0088+00 3/3 0/0 0/0 .text            initiate__7J2DPaneFv */
 void J2DPane::initiate() {
     field_0x4 = -1;
     mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = 0;
@@ -36,16 +34,12 @@ void J2DPane::initiate() {
     calcMtx();
 }
 
-/* 802F5D40-802F5DD0 2F0680 0090+00 0/0 1/1 0/0 .text
- * __ct__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2<f>           */
 J2DPane::J2DPane(J2DPane* p_pane, bool visible, u64 tag, JGeometry::TBox2<f32> const& bounds)
     : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {
     mTransform = NULL;
     initialize(p_pane, visible, tag, bounds);
 }
 
-/* 802F5DD0-802F5E88 2F0710 00B8+00 1/1 0/0 0/0 .text
- * initialize__7J2DPaneFP7J2DPanebUxRCQ29JGeometry8TBox2<f>     */
 void J2DPane::initialize(J2DPane* p_pane, bool visible, u64 infoTag,
                          JGeometry::TBox2<f32> const& bounds) {
     mKind = 'PAN1';
@@ -62,15 +56,12 @@ void J2DPane::initialize(J2DPane* p_pane, bool visible, u64 infoTag,
     calcMtx();
 }
 
-/* 802F5E88-802F5F08 2F07C8 0080+00 0/0 3/3 0/0 .text __ct__7J2DPaneFUxRCQ29JGeometry8TBox2<f> */
 J2DPane::J2DPane(u64 infoTag, JGeometry::TBox2<f32> const& bounds)
     : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) {
     mTransform = NULL;
     initialize(infoTag, bounds);
 }
 
-/* 802F5F08-802F5F9C 2F0848 0094+00 1/1 0/0 0/0 .text
- * initialize__7J2DPaneFUxRCQ29JGeometry8TBox2<f>               */
 void J2DPane::initialize(u64 tag, const JGeometry::TBox2<f32>& bounds) {
     mKind = 'PAN1';
     mVisible = true;
@@ -82,8 +73,6 @@ void J2DPane::initialize(u64 tag, const JGeometry::TBox2<f32>& bounds) {
     calcMtx();
 }
 
-/* 802F5F9C-802F60C4 2F08DC 0128+00 0/0 1/1 0/0 .text
- * __ct__7J2DPaneFP7J2DPaneP20JSURandomInputStreamUc            */
 J2DPane::J2DPane(J2DPane* p_pane, JSURandomInputStream* p_stream, u8 isEx) : mPaneTree(this) {
     mTransform = NULL;
     if (!isEx) {
@@ -107,8 +96,6 @@ J2DPane::J2DPane(J2DPane* p_pane, JSURandomInputStream* p_stream, u8 isEx) : mPa
     }
 }
 
-/* 802F60C4-802F63F8 2F0A04 0334+00 1/1 3/3 0/0 .text
- * makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream    */
 void J2DPane::makePaneStream(J2DPane* p_pane, JSURandomInputStream* p_stream) {
     u8 unk;
     p_stream->read(&unk, 1);
@@ -168,8 +155,6 @@ void J2DPane::makePaneStream(J2DPane* p_pane, JSURandomInputStream* p_stream) {
     calcMtx();
 }
 
-/* 802F63F8-802F658C 2F0D38 0194+00 4/4 0/0 0/0 .text            changeUseTrans__7J2DPaneFP7J2DPane
- */
 void J2DPane::changeUseTrans(J2DPane* p_pane) {
     f32 xOffset = 0;
     f32 yOffset = 0;
@@ -214,7 +199,6 @@ void J2DPane::changeUseTrans(J2DPane* p_pane) {
     }
 }
 
-/* 802F658C-802F666C 2F0ECC 00E0+00 1/0 4/4 0/0 .text            __dt__7J2DPaneFv */
 J2DPane::~J2DPane() {
     JSUTreeIterator<J2DPane> iterator;
     for (iterator = mPaneTree.getFirstChild(); iterator != mPaneTree.getEndChild();) {
@@ -223,7 +207,6 @@ J2DPane::~J2DPane() {
     }
 }
 
-/* 802F666C-802F6714 2F0FAC 00A8+00 0/0 2/2 0/0 .text            appendChild__7J2DPaneFP7J2DPane */
 bool J2DPane::appendChild(J2DPane* p_child) {
     if (p_child == NULL)
         return false;
@@ -239,7 +222,6 @@ bool J2DPane::appendChild(J2DPane* p_child) {
     return result;
 }
 
-/* 802F6714-802F67E0 2F1054 00CC+00 0/0 1/1 0/0 .text insertChild__7J2DPaneFP7J2DPaneP7J2DPane */
 bool J2DPane::insertChild(J2DPane* p_prev, J2DPane* p_child) {
     if (p_child == NULL)
         return false;
@@ -257,7 +239,6 @@ bool J2DPane::insertChild(J2DPane* p_prev, J2DPane* p_child) {
     return result;
 }
 
-/* 802F67E0-802F6D18 2F1120 0538+00 0/0 1/1 0/0 .text draw__7J2DPaneFffPC14J2DGrafContextbb */
 void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGraf, bool param_4) {
     bool unkBool = param_4 && mVisible;
     if (p_grafCtx->getGrafType() != 1) {
@@ -329,7 +310,6 @@ void J2DPane::draw(f32 x, f32 y, J2DGrafContext const* p_grafCtx, bool isOrthoGr
     }
 }
 
-/* 802F6D18-802F6F60 2F1658 0248+00 2/2 4/4 0/0 .text place__7J2DPaneFRCQ29JGeometry8TBox2<f> */
 void J2DPane::place(JGeometry::TBox2<f32> const& box) {
     JGeometry::TBox2<f32> tmpBox;
 
@@ -380,21 +360,18 @@ void J2DPane::place(JGeometry::TBox2<f32> const& box) {
     calcMtx();
 }
 
-/* 802F6F60-802F6FB4 2F18A0 0054+00 1/0 7/0 0/0 .text            move__7J2DPaneFff */
 void J2DPane::move(f32 x, f32 y) {
     f32 width = getWidth();
     f32 height = getHeight();
     place(JGeometry::TBox2<f32>(x, y, x + width, y + height));
 }
 
-/* 802F6FB4-802F6FF8 2F18F4 0044+00 1/0 7/0 0/0 .text            add__7J2DPaneFff */
 void J2DPane::add(f32 x, f32 y) {
     mTranslateX += x;
     mTranslateY += y;
     calcMtx();
 }
 
-/* 802F6FF8-802F7100 2F1938 0108+00 1/0 5/2 0/0 .text            resize__7J2DPaneFff */
 void J2DPane::resize(f32 x, f32 y) {
     JGeometry::TBox2<f32> box = mBounds;
 
@@ -415,11 +392,8 @@ void J2DPane::resize(f32 x, f32 y) {
     place(box);
 }
 
-/* ############################################################################################## */
-/* 804349B0-804349C0 0616D0 0010+00 2/2 0/0 0/0 .bss             static_mBounds__7J2DPane */
 JGeometry::TBox2<f32> J2DPane::static_mBounds(0, 0, 0, 0);
 
-/* 802F7100-802F71DC 2F1A40 00DC+00 0/0 25/25 1/1 .text            getBounds__7J2DPaneFv */
 JGeometry::TBox2<f32>& J2DPane::getBounds() {
     static_mBounds = mBounds;
 
@@ -438,7 +412,6 @@ JGeometry::TBox2<f32>& J2DPane::getBounds() {
     return static_mBounds;
 }
 
-/* 802F71DC-802F720C 2F1B1C 0030+00 0/0 12/12 0/0 .text rotate__7J2DPaneFff13J2DRotateAxisf */
 void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) {
     mRotateOffsetX = offsetX;
     mRotateOffsetY = offsetY;
@@ -446,7 +419,6 @@ void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) {
     rotate(angle);
 }
 
-/* 802F720C-802F7264 2F1B4C 0058+00 1/1 0/0 0/0 .text            rotate__7J2DPaneFf */
 void J2DPane::rotate(f32 angle) {
     if (mRotAxis == ROTATE_X) {
         mRotateX = angle;
@@ -459,7 +431,6 @@ void J2DPane::rotate(f32 angle) {
     calcMtx();
 }
 
-/* 802F7264-802F72E0 2F1BA4 007C+00 0/0 2/2 0/0 .text clip__7J2DPaneFRCQ29JGeometry8TBox2<f> */
 void J2DPane::clip(JGeometry::TBox2<f32> const& bounds) {
     JGeometry::TBox2<f32> boxA(bounds);
     JGeometry::TBox2<f32> boxB(mGlobalBounds);
@@ -467,7 +438,6 @@ void J2DPane::clip(JGeometry::TBox2<f32> const& bounds) {
     mClipRect.intersect(boxA);
 }
 
-/* 802F72E0-802F7388 2F1C20 00A8+00 1/0 7/1 0/0 .text            search__7J2DPaneFUx */
 J2DPane* J2DPane::search(u64 tag) {
     if (tag == mInfoTag) {
         return this;
@@ -482,7 +452,6 @@ J2DPane* J2DPane::search(u64 tag) {
     return NULL;
 }
 
-/* 802F7388-802F7430 2F1CC8 00A8+00 1/0 7/1 0/0 .text            searchUserInfo__7J2DPaneFUx */
 J2DPane* J2DPane::searchUserInfo(u64 tag) {
     if (tag == mUserInfoTag) {
         return this;
@@ -497,7 +466,6 @@ J2DPane* J2DPane::searchUserInfo(u64 tag) {
     return NULL;
 }
 
-/* 802F7430-802F74B8 2F1D70 0088+00 1/0 7/7 0/0 .text            isUsed__7J2DPaneFPC7ResTIMG */
 bool J2DPane::isUsed(const ResTIMG* p_timg) {
     JSUTreeIterator<J2DPane> iter;
     for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) {
@@ -507,7 +475,6 @@ bool J2DPane::isUsed(const ResTIMG* p_timg) {
     return false;
 }
 
-/* 802F74B8-802F7540 2F1DF8 0088+00 1/0 7/7 0/0 .text            isUsed__7J2DPaneFPC7ResFONT */
 bool J2DPane::isUsed(const ResFONT* p_font) {
     JSUTreeIterator<J2DPane> iter;
     for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) {
@@ -517,7 +484,6 @@ bool J2DPane::isUsed(const ResFONT* p_font) {
     return false;
 }
 
-/* 802F7540-802F7680 2F1E80 0140+00 1/0 7/0 0/0 .text            makeMatrix__7J2DPaneFffff */
 void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     f32 tmpX = mRotateOffsetX - param_2;
     f32 tmpY = mRotateOffsetY - param_3;
@@ -533,8 +499,6 @@ void J2DPane::makeMatrix(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     MTXTransApply(tmp, mPositionMtx, param_0 + tmpX, param_1 + tmpY, 0);
 }
 
-/* 802F7680-802F76F8 2F1FC0 0078+00 1/0 7/3 0/0 .text            setCullBack__7J2DPaneF11_GXCullMode
- */
 void J2DPane::setCullBack(GXCullMode mode) {
     mCullMode = mode;
 
@@ -544,8 +508,6 @@ void J2DPane::setCullBack(GXCullMode mode) {
     }
 }
 
-/* 802F76F8-802F77D0 2F2038 00D8+00 0/0 8/8 0/0 .text setBasePosition__7J2DPaneF15J2DBasePosition
- */
 void J2DPane::setBasePosition(J2DBasePosition position) {
     mBasePosition = position;
     mRotAxis = ROTATE_Z;
@@ -572,7 +534,6 @@ void J2DPane::setBasePosition(J2DBasePosition position) {
     calcMtx();
 }
 
-/* 802F77D0-802F79A8 2F2110 01D8+00 0/0 1/1 0/0 .text            setInfluencedAlpha__7J2DPaneFbb */
 void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) {
     if (param_1 && mIsInfluencedAlpha != influencedAlpha) {
         J2DPane* parent = getParentPane();
@@ -611,7 +572,6 @@ void J2DPane::setInfluencedAlpha(bool influencedAlpha, bool param_1) {
     mIsInfluencedAlpha = influencedAlpha;
 }
 
-/* 802F79A8-802F7A8C 2F22E8 00E4+00 0/0 3/3 0/0 .text            getGlbVtx__7J2DPaneCFUc */
 Vec J2DPane::getGlbVtx(u8 param_0) const {
     Vec out;
     if (param_0 >= 4) {
@@ -640,7 +600,6 @@ Vec J2DPane::getGlbVtx(u8 param_0) const {
     }
 }
 
-/* 802F7A8C-802F7AC4 2F23CC 0038+00 1/1 15/15 0/0 .text            getFirstChildPane__7J2DPaneFv */
 J2DPane* J2DPane::getFirstChildPane() {
     if (!getFirstChild())
         return NULL;
@@ -648,7 +607,6 @@ J2DPane* J2DPane::getFirstChildPane() {
     return getFirstChild()->getObject();
 }
 
-/* 802F7AC4-802F7AFC 2F2404 0038+00 1/1 8/8 0/0 .text            getNextChildPane__7J2DPaneFv */
 J2DPane* J2DPane::getNextChildPane() {
     if (getPaneTree()->getNextChild() == NULL)
         return NULL;
@@ -656,7 +614,6 @@ J2DPane* J2DPane::getNextChildPane() {
     return getPaneTree()->getNextChild()->getObject();
 }
 
-/* 802F7AFC-802F7B18 2F243C 001C+00 6/6 11/11 0/0 .text            getParentPane__7J2DPaneFv */
 J2DPane* J2DPane::getParentPane() {
     if (getPaneTree()->getParent() == NULL)
         return NULL;
@@ -685,8 +642,6 @@ struct J2DPaneInfo {
     /* 0x40 */ f32 mTranslateY;
 };  // Size: 0x48
 
-/* 802F7B18-802F7D00 2F2458 01E8+00 1/1 6/6 0/0 .text
- * makePaneExStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream  */
 void J2DPane::makePaneExStream(J2DPane* p_parent, JSURandomInputStream* p_stream) {
     p_stream->getPosition();
 
@@ -738,7 +693,6 @@ void J2DPane::makePaneExStream(J2DPane* p_parent, JSURandomInputStream* p_stream
     calcMtx();
 }
 
-/* 802F7D00-802F7DB8 2F2640 00B8+00 0/0 1/1 0/0 .text            J2DCast_F32_to_S16__7J2DPaneFfUc */
 s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) {
     if (arg2 >= 0xF) {
         return 0;
@@ -763,8 +717,6 @@ s16 J2DPane::J2DCast_F32_to_S16(f32 value, u8 arg2) {
     }
 }
 
-/* 802F7DB8-802F7EF4 2F26F8 013C+00 0/0 3/3 0/0 .text
- * getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive  */
 void* J2DPane::getPointer(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) {
     JUTResReference resRef;
 
@@ -798,7 +750,6 @@ void* J2DPane::getPointer(JSURandomInputStream* p_stream, u32 param_1, JKRArchiv
     return pointer;
 }
 
-/* 802F7EF4-802F7FC4 2F2834 00D0+00 2/0 7/4 0/0 .text setAnimation__7J2DPaneFP10J2DAnmBase */
 void J2DPane::setAnimation(J2DAnmBase* p_anm) {
     if (p_anm != NULL) {
         switch (p_anm->getKind()) {
@@ -829,18 +780,15 @@ void J2DPane::setAnimation(J2DAnmBase* p_anm) {
     }
 }
 
-/* 802F7FC4-802F7FCC -00001 0008+00 0/0 0/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTransform */
 void J2DPane::setAnimation(J2DAnmTransform* p_anm) {
     mTransform = p_anm;
 }
 
-/* 802F7FCC-802F8004 2F290C 0038+00 0/0 57/57 0/0 .text            animationTransform__7J2DPaneFv */
 void J2DPane::animationTransform() {
     if (mTransform != NULL)
         animationTransform(mTransform);
 }
 
-/* 802F8004-802F8080 2F2944 007C+00 1/0 7/1 0/0 .text            clearAnmTransform__7J2DPaneFv */
 void J2DPane::clearAnmTransform() {
     J2DAnmTransform* none = NULL;
     setAnimation(none);
@@ -851,8 +799,6 @@ void J2DPane::clearAnmTransform() {
     }
 }
 
-/* 802F8080-802F8118 2F29C0 0098+00 1/0 7/0 0/0 .text
- * animationTransform__7J2DPaneFPC15J2DAnmTransform             */
 const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* p_transform) {
     const J2DAnmTransform* p = p_transform;
     if (mTransform != NULL)
@@ -867,8 +813,6 @@ const J2DAnmTransform* J2DPane::animationTransform(const J2DAnmTransform* p_tran
     return p;
 }
 
-/* 802F8118-802F81A0 2F2A58 0088+00 1/0 8/1 0/0 .text
- * setVisibileAnimation__7J2DPaneFP20J2DAnmVisibilityFull       */
 void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* p_visibility) {
     setAnimationVF(p_visibility);
 
@@ -878,8 +822,6 @@ void J2DPane::setVisibileAnimation(J2DAnmVisibilityFull* p_visibility) {
     }
 }
 
-/* 802F81A0-802F8228 2F2AE0 0088+00 1/0 8/1 0/0 .text
- * setVtxColorAnimation__7J2DPaneFP14J2DAnmVtxColor             */
 void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* p_vtxColor) {
     setAnimationVC(p_vtxColor);
 
@@ -889,8 +831,6 @@ void J2DPane::setVtxColorAnimation(J2DAnmVtxColor* p_vtxColor) {
     }
 }
 
-/* 802F8228-802F82C0 2F2B68 0098+00 1/0 7/3 0/0 .text animationPane__7J2DPaneFPC15J2DAnmTransform
- */
 const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* p_transform) {
     const J2DAnmTransform* p = p_transform;
     if (mTransform != NULL)
@@ -905,8 +845,6 @@ const J2DAnmTransform* J2DPane::animationPane(const J2DAnmTransform* p_transform
     return p;
 }
 
-/* 802F82C0-802F83C8 2F2C00 0108+00 2/2 0/0 0/0 .text
- * updateTransform__7J2DPaneFPC15J2DAnmTransform                */
 void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) {
     if (field_0x4 != 0xFFFF && p_anmTransform != NULL) {
         J3DTransformInfo info;
@@ -922,29 +860,22 @@ void J2DPane::updateTransform(J2DAnmTransform const* p_anmTransform) {
     }
 }
 
-/* 802F83C8-802F83CC 2F2D08 0004+00 1/0 0/0 0/0 .text            drawSelf__7J2DPaneFffPA3_A4_f */
 void J2DPane::drawSelf(f32, f32, f32 (*)[3][4]) {
     /* empty function */
 }
 
-/* 802F83CC-802F83D0 2F2D0C 0004+00 1/0 1/0 0/0 .text            rewriteAlpha__7J2DPaneFv */
 void J2DPane::rewriteAlpha() {
     /* empty function */
 }
 
-/* 802F83D0-802F83FC 2F2D10 002C+00 1/0 6/0 0/0 .text
- * setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull             */
 void J2DPane::setAnimationVF(J2DAnmVisibilityFull* p_visibility) {
     setAnimation(p_visibility);
 }
 
-/* 802F83FC-802F8428 2F2D3C 002C+00 1/0 6/0 0/0 .text setAnimationVC__7J2DPaneFP14J2DAnmVtxColor
- */
 void J2DPane::setAnimationVC(J2DAnmVtxColor* p_vtxColor) {
     setAnimation(p_vtxColor);
 }
 
-/* 802F8428-802F8464 2F2D68 003C+00 1/0 4/0 0/0 .text            setCullBack__7J2DPaneFb */
 void J2DPane::setCullBack(bool cull) {
     GXCullMode mode;
 
@@ -956,18 +887,15 @@ void J2DPane::setCullBack(bool cull) {
     setCullBack(mode);
 }
 
-/* 802F8464-802F8474 2F2DA4 0010+00 1/0 5/0 0/0 .text            setConnectParent__7J2DPaneFb */
 bool J2DPane::setConnectParent(bool connected) {
     mConnected = false;
     return false;
 }
 
-/* 802F8474-802F8478 2F2DB4 0004+00 1/0 7/0 0/0 .text            update__7J2DPaneFv */
 void J2DPane::update() {
     /* empty function */
 }
 
-/* 802F8478-802F847C 2F2DB8 0004+00 1/0 1/0 0/0 .text            drawSelf__7J2DPaneFff */
 void J2DPane::drawSelf(f32, f32) {
     /* empty function */
 }
diff --git a/src/JSystem/J2DGraph/J2DPicture.cpp b/src/JSystem/J2DGraph/J2DPicture.cpp
index af4670ab64..6968df2572 100644
--- a/src/JSystem/J2DGraph/J2DPicture.cpp
+++ b/src/JSystem/J2DGraph/J2DPicture.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DPicture
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DPicture.h"
@@ -14,7 +9,6 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "dolphin/gx.h"
 
-/* 802FC050-802FC118 2F6990 00C8+00 0/0 2/2 0/0 .text            __ct__10J2DPictureFv */
 J2DPicture::J2DPicture() : mPalette(NULL) {
     for (int i = 0; i < 2; i++) {
         mTexture[i] = NULL;
@@ -26,15 +20,11 @@ J2DPicture::J2DPicture() : mPalette(NULL) {
 }
 
 
-/* 802FC118-802FC1D4 2F6A58 00BC+00 0/0 1/1 0/0 .text
- * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive)
     : mPalette(NULL) {
     private_readStream(p_pane, p_stream, p_archive);
 }
 
-/* 802FC1D4-802FC708 2F6B14 0534+00 0/0 1/1 0/0 .text
- * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */
 J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, J2DMaterial* p_material)
     : mPalette(NULL) {
     int position = p_stream->getPosition();
@@ -136,7 +126,6 @@ J2DPicture::J2DPicture(J2DPane* p_pane, JSURandomInputStream* p_stream, J2DMater
     setBlendAlphaRatio(alpha.a, alpha.b);
 }
 
-/* 802FC708-802FC800 2F7048 00F8+00 0/0 20/20 1/1 .text            __ct__10J2DPictureFPC7ResTIMG */
 J2DPicture::J2DPicture(ResTIMG const* p_timg) {
     for (int i = 0; i < 2; i++) {
         mTexture[i] = NULL;
@@ -153,8 +142,6 @@ J2DPicture::J2DPicture(ResTIMG const* p_timg) {
 }
 
 
-/* 802FC800-802FC8E8 2F7140 00E8+00 0/0 5/5 0/0 .text
- * __ct__10J2DPictureFUxRCQ29JGeometry8TBox2<f>PC7ResTIMGPC7ResTLUT */
 J2DPicture::J2DPicture(u64 tag, JGeometry::TBox2<f32> const& bounds, ResTIMG const* p_timg,
                        ResTLUT const* p_tlut)
     : J2DPane(tag, bounds), mPalette(NULL) {
@@ -169,8 +156,6 @@ J2DPicture::J2DPicture(u64 tag, JGeometry::TBox2<f32> const& bounds, ResTIMG con
     initinfo();
 }
 
-/* 802FC8E8-802FCCDC 2F7228 03F4+00 1/1 0/0 0/0 .text
- * private_readStream__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 void J2DPicture::private_readStream(J2DPane* parent, JSURandomInputStream* stream,
                                     JKRArchive* archive) {
     J2DScrnBlockHeader header;
@@ -245,8 +230,6 @@ void J2DPicture::private_readStream(J2DPane* parent, JSURandomInputStream* strea
     setBlendRatio(1.0f, 1.0f);
 }
 
-/* 802FCCDC-802FCD70 2F761C 0094+00 1/0 0/0 0/0 .text initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT
- */
 void J2DPicture::initiate(const ResTIMG* img, const ResTLUT* lut) {
     private_initiate(img, lut);
     if (mTexture[0] == NULL) {
@@ -256,8 +239,6 @@ void J2DPicture::initiate(const ResTIMG* img, const ResTLUT* lut) {
     place(JGeometry::TBox2<f32>(0.0f, 0.0f, mTexture[0]->getWidth(), mTexture[0]->getHeight()));
 }
 
-/* 802FCD70-802FCE9C 2F76B0 012C+00 2/2 0/0 0/0 .text
- * private_initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT          */
 void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) {
     if (mTextureNum != 0) {
         return;
@@ -286,7 +267,6 @@ void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) {
     }
 }
 
-/* 802FCE9C-802FCFF0 2F77DC 0154+00 3/3 0/0 0/0 .text            initinfo__10J2DPictureFv */
 void J2DPicture::initinfo() {
     mKind = 'PIC1';
     setTexCoord(NULL, BIND15, MIRROR0, false);
@@ -298,7 +278,6 @@ void J2DPicture::initinfo() {
 }
 
 
-/* 802FCFF0-802FD098 2F7930 00A8+00 1/0 3/3 0/0 .text            __dt__10J2DPictureFv */
 J2DPicture::~J2DPicture() {
     for (int i = 0; i < 2; i++) {
         if ((int)(field_0x109 & 1 << i) != 0) {
@@ -309,7 +288,6 @@ J2DPicture::~J2DPicture() {
     delete mPalette;
 }
 
-/* 802FD098-802FD168 2F79D8 00D0+00 1/0 0/0 0/0 .text            prepareTexture__10J2DPictureFUc */
 bool J2DPicture::prepareTexture(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i >= 2) {
@@ -329,8 +307,6 @@ bool J2DPicture::prepareTexture(u8 param_0) {
     return 1;
 }
 
-/* 802FD168-802FD4B4 2F7AA8 034C+00 1/0 0/0 0/0 .text
- * insert__10J2DPictureFPC7ResTIMGP10JUTPaletteUcf              */
 bool J2DPicture::insert(ResTIMG const* img, JUTPalette* palette, u8 param_2, f32 param_3) {
     if (img == NULL || mTextureNum >= 2 || param_2 >= 2 || param_2 > mTextureNum) {
         return false;
@@ -405,13 +381,11 @@ bool J2DPicture::insert(ResTIMG const* img, JUTPalette* palette, u8 param_2, f32
 }
 
 
-/* 802FD4B4-802FD524 2F7DF4 0070+00 1/0 0/0 0/0 .text insert__10J2DPictureFPCcP10JUTPaletteUcf */
 bool J2DPicture::insert(char const* resName, JUTPalette* palette, u8 param_2, f32 param_3) {
     void* resource = J2DScreen::getNameResource(resName);
     return insert((ResTIMG*)resource, palette, param_2, param_3);
 }
 
-/* 802FD524-802FD6F4 2F7E64 01D0+00 1/0 0/0 0/0 .text insert__10J2DPictureFP10JUTTextureUcf */
 bool J2DPicture::insert(JUTTexture* texture, u8 param_1, f32 param_2) {
     if (texture == NULL || mTextureNum >= 2 || param_1 >= 2 || param_1 > mTextureNum) {
         return false;
@@ -448,7 +422,6 @@ bool J2DPicture::insert(JUTTexture* texture, u8 param_1, f32 param_2) {
 }
 
 
-/* 802FD6F4-802FD814 2F8034 0120+00 1/0 0/0 0/0 .text            remove__10J2DPictureFUc */
 bool J2DPicture::remove(u8 param_0) {
     if (mTextureNum <= param_0 || mTextureNum == 1) {
         return false;
@@ -474,8 +447,6 @@ bool J2DPicture::remove(u8 param_0) {
     return true;
 }
 
-/* 802FD814-802FD874 2F8154 0060+00 1/0 0/0 0/0 .text            remove__10J2DPictureFP10JUTTexture
- */
 bool J2DPicture::remove(JUTTexture* param_0) {
     u8 i = 0;
     for (; i < mTextureNum; i++) {
@@ -486,7 +457,6 @@ bool J2DPicture::remove(JUTTexture* param_0) {
     return remove(i);
 }
 
-/* 802FD874-802FD964 2F81B4 00F0+00 1/0 0/0 0/0 .text changeTexture__10J2DPictureFPC7ResTIMGUc */
 const ResTIMG* J2DPicture::changeTexture(ResTIMG const* img, u8 texIndex) {
     if (texIndex > mTextureNum || 2 <= texIndex || img == NULL) {
         return NULL;
@@ -510,8 +480,6 @@ const ResTIMG* J2DPicture::changeTexture(ResTIMG const* img, u8 texIndex) {
 }
 
 
-/* 802FD964-802FD9BC 2F82A4 0058+00 1/0 0/0 0/0 .text            changeTexture__10J2DPictureFPCcUc
- */
 const ResTIMG* J2DPicture::changeTexture(char const* resName, u8 param_1) {
     void* resource = J2DScreen::getNameResource(resName);
     return changeTexture((ResTIMG*)resource, param_1);
@@ -522,8 +490,6 @@ static bool dummy_weak_order(JUTTexture* tex) {
     return picture->append(tex, 1.0f);
 }
 
-/* 802FD9BC-802FDAC8 2F82FC 010C+00 1/0 0/0 0/0 .text
- * changeTexture__10J2DPictureFPC7ResTIMGUcP10JUTPalette        */
 const ResTIMG* J2DPicture::changeTexture(ResTIMG const* img, u8 texIndex, JUTPalette* palette) {
     if (texIndex > mTextureNum || 2 <= texIndex || img == NULL) {
         return NULL;
@@ -547,14 +513,11 @@ const ResTIMG* J2DPicture::changeTexture(ResTIMG const* img, u8 texIndex, JUTPal
 }
 
 
-/* 802FDAC8-802FDB28 2F8408 0060+00 1/0 0/0 0/0 .text
- * changeTexture__10J2DPictureFPCcUcP10JUTPalette               */
 const ResTIMG* J2DPicture::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
     void* resource = J2DScreen::getNameResource(param_0);
     return changeTexture((ResTIMG*)resource, param_1, param_2);
 }
 
-/* 802FDB28-802FDB90 2F8468 0068+00 1/0 1/0 0/0 .text            drawSelf__10J2DPictureFff */
 void J2DPicture::drawSelf(f32 param_0, f32 param_1) {
     Mtx tmp;
     MTXIdentity(tmp);
@@ -562,8 +525,6 @@ void J2DPicture::drawSelf(f32 param_0, f32 param_1) {
     drawSelf(param_0, param_1, &tmp);
 }
 
-/* 802FDB90-802FDBFC 2F84D0 006C+00 1/0 0/0 0/0 .text            drawSelf__10J2DPictureFffPA3_A4_f
- */
 void J2DPicture::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     if (mTexture[0] != NULL && mTextureNum != 0) {
         drawFullSet(mGlobalBounds.i.x + param_0, mGlobalBounds.i.y + param_1,
@@ -571,7 +532,6 @@ void J2DPicture::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     }
 }
 
-/* 802FDBFC-802FDC70 2F853C 0074+00 1/0 0/0 0/0 .text drawFullSet__10J2DPictureFffffPA3_A4_f */
 void J2DPicture::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3, Mtx* param_4) {
     if (mTexture[0] != NULL && mTextureNum != 0) {
         drawTexCoord(mBounds.i.x, mBounds.i.y, param_2, param_3, field_0x10a[0].x, field_0x10a[0].y,
@@ -580,7 +540,6 @@ void J2DPicture::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
     }
 }
 
-/* 802FDC70-802FDF88 2F85B0 0318+00 1/0 1/1 0/0 .text            draw__10J2DPictureFffffbbb */
 void J2DPicture::draw(f32 x, f32 y, f32 width, f32 height, bool mirrorX, bool mirrorY,
                       bool rotate90) {
     if (isVisible() && mTextureNum != 0 && mTexture[0] != NULL) {
@@ -641,8 +600,6 @@ void J2DPicture::draw(f32 x, f32 y, f32 width, f32 height, bool mirrorX, bool mi
 }
 
 
-/* 802FDF88-802FE380 2F88C8 03F8+00 1/0 0/0 0/0 .text
- * drawOut__10J2DPictureFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DPicture::drawOut(JGeometry::TBox2<f32> const& posBox,
                          JGeometry::TBox2<f32> const& texRect) {
     if (isVisible() && mTextureNum != 0 && mTexture[0] != NULL) {
@@ -701,8 +658,6 @@ void J2DPicture::drawOut(JGeometry::TBox2<f32> const& posBox,
 }
 
 
-/* 802FE380-802FE5D0 2F8CC0 0250+00 1/0 0/0 0/0 .text
- * drawTexCoord__10J2DPictureFffffssssssssPA3_A4_f              */
 void J2DPicture::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param_3, s16 param_4,
                               s16 param_5, s16 param_6, s16 param_7, s16 param_8, s16 param_9,
                               s16 param_10, s16 param_11, Mtx* param_12) {
@@ -757,7 +712,6 @@ void J2DPicture::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param_3
 }
 
 
-/* 802FE5D0-802FEA60 2F8F10 0490+00 3/3 0/0 0/0 .text            setTevMode__10J2DPictureFv */
 void J2DPicture::setTevMode() {
     u8 i;
     for (i = 0; i < mTextureNum; i++) {
@@ -842,31 +796,24 @@ void J2DPicture::setTevMode() {
     }
 }
 
-/* 802FEA60-802FEA74 2F93A0 0014+00 1/1 0/0 0/0 .text            swap__10J2DPictureFRfRf */
 void J2DPicture::swap(f32& lhs, f32& rhs) {
     f32 tmp = lhs;
     lhs = rhs;
     rhs = tmp;
 }
 
-/* 802FEA74-802FEA9C 2F93B4 0028+00 1/0 0/0 0/0 .text            setBlendColorRatio__10J2DPictureFff
- */
 void J2DPicture::setBlendColorRatio(f32 param_0, f32 param_1) {
     field_0x11c[0] = param_0;
     field_0x11c[1] = param_1;
     setBlendKonstColor();
 }
 
-/* 802FEA9C-802FEAC4 2F93DC 0028+00 1/0 0/0 0/0 .text            setBlendAlphaRatio__10J2DPictureFff
- */
 void J2DPicture::setBlendAlphaRatio(f32 param_0, f32 param_1) {
     field_0x124[0] = param_0;
     field_0x124[1] = param_1;
     setBlendKonstAlpha();
 }
 
-/* 802FEAC4-802FEB94 2F9404 00D0+00 4/4 0/0 0/0 .text            setBlendKonstColor__10J2DPictureFv
- */
 void J2DPicture::setBlendKonstColor() {
     int uvar3 = 0;
     for (u8 i = 1; i < mTextureNum; i++) {
@@ -884,8 +831,6 @@ void J2DPicture::setBlendKonstColor() {
     mBlendKonstColor = uvar3;
 }
 
-/* 802FEB94-802FEC64 2F94D4 00D0+00 4/4 0/0 0/0 .text            setBlendKonstAlpha__10J2DPictureFv
- */
 void J2DPicture::setBlendKonstAlpha() {
     int uvar3 = 0;
     for (u8 i = 1; i < mTextureNum; i++) {
@@ -903,8 +848,6 @@ void J2DPicture::setBlendKonstAlpha() {
     mBlendKonstAlpha = uvar3;
 }
 
-/* 802FEC64-802FED44 2F95A4 00E0+00 3/3 0/0 0/0 .text
- * getNewColor__10J2DPictureFPQ28JUtility6TColor                */
 void J2DPicture::getNewColor(JUtility::TColor* param_0) {
     param_0[0] = mCornerColor[0];
     param_0[1] = mCornerColor[1];
@@ -919,15 +862,11 @@ void J2DPicture::getNewColor(JUtility::TColor* param_0) {
     }
 }
 
-/* 802FED44-802FED84 2F9684 0040+00 4/4 0/0 0/0 .text
- * setTexCoord__10J2DPictureFPC10JUTTexture10J2DBinding9J2DMirrorb */
 void J2DPicture::setTexCoord(JUTTexture const* param_0, J2DBinding param_1, J2DMirror param_2,
                              bool param_3) {
     setTexCoord(&field_0x10a[0], param_0, param_1, param_2, param_3);
 }
 
-/* 802FED84-802FF09C 2F96C4 0318+00 2/2 0/0 0/0 .text
- * setTexCoord__10J2DPictureFPQ29JGeometry8TVec2<s>PC10JUTTexture10J2DBinding9J2DMirrorb */
 void J2DPicture::setTexCoord(JGeometry::TVec2<s16>* param_0, JUTTexture const* param_1,
                              J2DBinding binding, J2DMirror mirror, bool rotate90) {
     bool bindLeft;
@@ -1042,7 +981,6 @@ void J2DPicture::setTexCoord(JGeometry::TVec2<s16>* param_0, JUTTexture const* p
 }
 
 
-/* 802FF09C-802FF100 2F99DC 0064+00 1/0 0/0 0/0 .text            isUsed__10J2DPictureFPC7ResTIMG */
 bool J2DPicture::isUsed(ResTIMG const* param_0) {
     for (u8 i = 0; i < mTextureNum; i++) {
         if (mTexture[i] != NULL && mTexture[i]->getTexInfo() == param_0) {
@@ -1053,7 +991,6 @@ bool J2DPicture::isUsed(ResTIMG const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 802FF100-802FF1D0 2F9A40 00D0+00 1/0 0/0 0/0 .text            getUsableTlut__10J2DPictureFUc */
 u8 J2DPicture::getUsableTlut(u8 param_0) {
     u8 var_r8 = 0;
 
@@ -1084,7 +1021,6 @@ u8 J2DPicture::getUsableTlut(u8 param_0) {
     return var_r26;
 }
 
-/* 802FF1D0-802FF204 2F9B10 0034+00 1/1 1/1 0/0 .text getTlutID__10J2DPictureFPC7ResTIMGUc */
 GXTlut J2DPicture::getTlutID(ResTIMG const* img, u8 param_1) {
     if (img->numColors > 256) {
         return (GXTlut)((param_1 % 4) + 0x10);
diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp
index 9d2d52a9fb..7520e4a3b2 100644
--- a/src/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DPictureEx
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DPictureEx.h"
@@ -12,8 +7,6 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "dolphin/types.h"
 
-/* 80303640-803036EC 2FDF80 00AC+00 1/0 0/0 0/0 .text
- * initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT                */
 void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
     J2DTexGenBlock* this_00 = mMaterial->getTexGenBlock();
     if (this_00->getTexGenNum() == 0 && append(param_0, 1.0f) && param_1 != NULL) {
@@ -23,8 +16,6 @@ void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
     }
 }
 
-/* 803036EC-8030393C 2FE02C 0250+00 0/0 1/1 0/0 .text
- * __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
                                J2DMaterial* param_3) {
     field_0x194 = 0;
@@ -68,15 +59,12 @@ J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32
     }
 }
 
-/* 8030393C-803039CC 2FE27C 0090+00 1/0 0/0 0/0 .text            __dt__12J2DPictureExFv */
 J2DPictureEx::~J2DPictureEx() {
     if (field_0x190) {
         delete mMaterial;
     }
 }
 
-/* 803039CC-80303AB4 2FE30C 00E8+00 1/0 0/0 0/0 .text            prepareTexture__12J2DPictureExFUc
- */
 bool J2DPictureEx::prepareTexture(u8 param_0) {
     if (!mMaterial->getTevBlock()->prepareTexture(param_0)) {
         return false;
@@ -89,8 +77,6 @@ bool J2DPictureEx::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 80303AB4-80303B80 2FE3F4 00CC+00 1/0 0/0 0/0 .text            drawSelf__12J2DPictureExFffPA3_A4_f
- */
 void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     if (mMaterial != NULL) {
         mMaterial->setGX();
@@ -102,7 +88,6 @@ void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     }
 }
 
-/* 80303B80-80303BDC 2FE4C0 005C+00 1/0 0/0 0/0 .text drawFullSet__12J2DPictureExFffffPA3_A4_f */
 void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
                                    f32 (*param_4)[3][4]) {
     drawTexCoord(mBounds.i.x, mBounds.i.y, param_2, param_3, field_0x10a[0].x, field_0x10a[0].y,
@@ -110,8 +95,6 @@ void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_
                  field_0x10a[3].x, field_0x10a[3].y, param_4);
 }
 
-/* 80303BDC-80303E5C 2FE51C 0280+00 1/0 0/0 0/0 .text
- * drawTexCoord__12J2DPictureExFffffssssssssPA3_A4_f            */
 void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param_3, s16 param_4,
                                     s16 param_5, s16 param_6, s16 param_7, s16 param_8, s16 param_9,
                                     s16 param_10, s16 param_11, f32 (*param_12)[3][4]) {
@@ -159,8 +142,6 @@ void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param
 }
 
 
-/* 80303E5C-80303EA4 2FE79C 0048+00 1/0 0/0 0/0 .text
- * append__12J2DPictureExFPC7ResTIMGP10JUTPalettef              */
 bool J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
     if (mMaterial == NULL) {
         return false;
@@ -169,7 +150,6 @@ bool J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param
     return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
 }
 
-/* 80303EA4-80303EEC 2FE7E4 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFPCcP10JUTPalettef */
 bool J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
     if (mMaterial == NULL) {
         return false;
@@ -178,7 +158,6 @@ bool J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2)
     return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
 }
 
-/* 80303EEC-80303F34 2FE82C 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFP10JUTTexturef */
 bool J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return false;
@@ -187,8 +166,6 @@ bool J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
     return insert(param_0,  mMaterial->getTexGenBlock()->getTexGenNum(), param_1);
 }
 
-/* 80303F34-80303FD8 2FE874 00A4+00 1/0 0/0 0/0 .text
- * insert__12J2DPictureExFPC7ResTIMGP10JUTPaletteUcf            */
 bool J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2,
                               f32 param_3) {
     if (param_0 == NULL) {
@@ -204,14 +181,11 @@ bool J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_
     return true;
 }
 
-/* 80303FD8-80304048 2FE918 0070+00 1/0 0/0 0/0 .text insert__12J2DPictureExFPCcP10JUTPaletteUcf
- */
 bool J2DPictureEx::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return insert(resource, param_1, param_2, param_3);
 }
 
-/* 80304048-803040E4 2FE988 009C+00 1/0 0/0 0/0 .text insert__12J2DPictureExFP10JUTTextureUcf */
 bool J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
     if (param_0 == NULL) {
         return false;
@@ -226,7 +200,6 @@ bool J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
     return true;
 }
 
-/* 803040E4-8030437C 2FEA24 0298+00 2/2 0/0 0/0 .text            insertCommon__12J2DPictureExFUcf */
 void J2DPictureEx::insertCommon(u8 pos, f32 param_1) {
     u8 new_tev_stage_num;
     u8 tex_gen_num = mMaterial->getTexGenBlock()->getTexGenNum();
@@ -275,7 +248,6 @@ void J2DPictureEx::insertCommon(u8 pos, f32 param_1) {
     setTevKAlphaSel(tex_gen_num);
 }
 
-/* 8030437C-8030446C 2FECBC 00F0+00 2/2 0/0 0/0 .text            isInsert__12J2DPictureExCFUc */
 bool J2DPictureEx::isInsert(u8 pos) const {
     if (mMaterial == NULL) {
         return false;
@@ -300,7 +272,6 @@ bool J2DPictureEx::isInsert(u8 pos) const {
     return true;
 }
 
-/* 8030446C-80304608 2FEDAC 019C+00 1/0 0/0 0/0 .text            remove__12J2DPictureExFUc */
 bool J2DPictureEx::remove(u8 pos) {
     if (!isRemove(pos)) {
         return false;
@@ -332,7 +303,6 @@ bool J2DPictureEx::remove(u8 pos) {
     return true;
 }
 
-/* 80304608-8030466C 2FEF48 0064+00 1/0 0/0 0/0 .text            remove__12J2DPictureExFv */
 bool J2DPictureEx::remove() {
     if (mMaterial == NULL) {
         return false;
@@ -346,7 +316,6 @@ bool J2DPictureEx::remove() {
     return remove(texGenNum - 1);
 }
 
-/* 8030466C-80304728 2FEFAC 00BC+00 1/0 0/0 0/0 .text remove__12J2DPictureExFP10JUTTexture */
 bool J2DPictureEx::remove(JUTTexture* param_0) {
     if (mMaterial == NULL) {
         return false;
@@ -365,7 +334,6 @@ bool J2DPictureEx::remove(JUTTexture* param_0) {
     return remove(i);
 }
 
-/* 80304728-8030477C 2FF068 0054+00 1/1 0/0 0/0 .text            isRemove__12J2DPictureExCFUc */
 bool J2DPictureEx::isRemove(u8 param_0) const {
     if (mMaterial == NULL) {
         return false;
@@ -382,7 +350,6 @@ bool J2DPictureEx::isRemove(u8 param_0) const {
     return true;
 }
 
-/* 8030477C-80304890 2FF0BC 0114+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffUcbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, u8 texNo, bool param_3, bool param_4,
                         bool param_5) {
     if (mMaterial == NULL) {
@@ -408,7 +375,6 @@ void J2DPictureEx::draw(f32 param_0, f32 param_1, u8 texNo, bool param_3, bool p
     }
 }
 
-/* 80304890-80304D88 2FF1D0 04F8+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffffbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, f32 width, f32 height, bool param_4,
                         bool param_5, bool param_6) {
     if (!isVisible()) {
@@ -510,7 +476,6 @@ void J2DPictureEx::draw(f32 param_0, f32 param_1, f32 width, f32 height, bool pa
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 80304D88-80304EF0 2FF6C8 0168+00 1/0 0/0 0/0 .text            drawOut__12J2DPictureExFffffff */
 void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                            f32 param_5) {
     if (mMaterial == NULL) {
@@ -533,8 +498,6 @@ void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f
     }
 }
 
-/* 80304EF0-80305264 2FF830 0374+00 1/0 0/0 0/0 .text
- * drawOut__12J2DPictureExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
                            JGeometry::TBox2<f32> const& param_1) {
     if (mMaterial == NULL) {
@@ -610,7 +573,6 @@ void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 80305264-803052AC 2FFBA4 0048+00 1/0 0/0 0/0 .text load__12J2DPictureExF11_GXTexMapIDUc */
 void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -623,8 +585,6 @@ void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
     mMaterial->getTevBlock()->loadTexture(param_0, param_1);
 }
 
-/* 803052AC-803053E0 2FFBEC 0134+00 3/3 0/0 0/0 .text            setTevOrder__12J2DPictureExFUcUcb
- */
 void J2DPictureEx::setTevOrder(u8 param_0, u8 param_1, bool param_2) {
     u16 local_30[16];
     if (param_0 == 1) {
@@ -655,8 +615,6 @@ void J2DPictureEx::setTevOrder(u8 param_0, u8 param_1, bool param_2) {
     }
 }
 
-/* 803053E0-80305688 2FFD20 02A8+00 3/3 0/0 0/0 .text            setTevStage__12J2DPictureExFUcUcb
- */
 void J2DPictureEx::setTevStage(u8 param_0, u8 param_1, bool param_2) {
     if (param_0 == 1) {
         J2DTevStage* stage = mMaterial->getTevBlock()->getTevStage(0);
@@ -698,8 +656,6 @@ void J2DPictureEx::setTevStage(u8 param_0, u8 param_1, bool param_2) {
     }
 }
 
-/* 80305688-80305928 2FFFC8 02A0+00 1/1 0/0 0/0 .text
- * setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum */
 void J2DPictureEx::setStage(J2DTevStage* stage, J2DPictureEx::stage_enum idx) {
     s8 colorData[8][4] = {
         {0x0F, 0x08, 0x0A, 0x0F},
@@ -739,7 +695,6 @@ void J2DPictureEx::setStage(J2DTevStage* stage, J2DPictureEx::stage_enum idx) {
     stage->setTevAlphaOp(opData[idx][0], opData[idx][1], opData[idx][2], opData[idx][3], opData[idx][4]);
 }
 
-/* 80305928-80305C70 300268 0348+00 5/5 0/0 0/0 .text            setTevKColor__12J2DPictureExFUc */
 void J2DPictureEx::setTevKColor(u8 param_0) {
     if (param_0 == 1) {
         return;
@@ -793,8 +748,6 @@ void J2DPictureEx::setTevKColor(u8 param_0) {
     }
 }
 
-/* 80305C70-80305D18 3005B0 00A8+00 3/3 0/0 0/0 .text            setTevKColorSel__12J2DPictureExFUc
- */
 void J2DPictureEx::setTevKColorSel(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i < 4) {
@@ -805,8 +758,6 @@ void J2DPictureEx::setTevKColorSel(u8 param_0) {
     }
 }
 
-/* 80305D18-80305DC0 300658 00A8+00 3/3 0/0 0/0 .text            setTevKAlphaSel__12J2DPictureExFUc
- */
 void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i < 4) {
@@ -817,7 +768,6 @@ void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
     }
 }
 
-/* 80305DC0-80305ED4 300700 0114+00 2/2 0/0 0/0 .text shiftSetBlendRatio__12J2DPictureExFUcfbb */
 void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, bool param_3) {
     f32* pJVar4 = param_2 != 0 ? field_0x11c : field_0x124;
     f32* local_44 = param_2 != 0 ? field_0x160 : field_0x178;
@@ -850,7 +800,6 @@ void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, boo
     }
 }
 
-/* 80305ED4-80305F34 300814 0060+00 1/0 0/0 0/0 .text setBlendColorRatio__12J2DPictureExFff */
 void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -867,7 +816,6 @@ void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
 }
 
 
-/* 80305F34-80305F94 300874 0060+00 1/0 0/0 0/0 .text setBlendAlphaRatio__12J2DPictureExFff */
 void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -884,8 +832,6 @@ void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
 }
 
 
-/* 80305F94-803060DC 3008D4 0148+00 1/0 0/0 0/0 .text changeTexture__12J2DPictureExFPC7ResTIMGUc
- */
 const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* img, u8 param_1) {
     if (mMaterial == NULL || img == NULL) {
         return NULL;
@@ -915,15 +861,11 @@ const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* img, u8 param_1) {
     return NULL;
 }
 
-/* 803060DC-80306134 300A1C 0058+00 1/0 0/0 0/0 .text            changeTexture__12J2DPictureExFPCcUc
- */
 const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return changeTexture(resource, param_1);
 }
 
-/* 80306134-80306298 300A74 0164+00 1/0 0/0 0/0 .text
- * changeTexture__12J2DPictureExFPC7ResTIMGUcP10JUTPalette      */
 const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
     if (mMaterial == NULL || param_0 == NULL) {
         return NULL;
@@ -951,14 +893,11 @@ const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, J
     return NULL;
 }
 
-/* 80306298-803062F8 300BD8 0060+00 1/0 0/0 0/0 .text
- * changeTexture__12J2DPictureExFPCcUcP10JUTPalette             */
 const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return changeTexture(resource, param_1, param_2);
 }
 
-/* 803062F8-80306350 300C38 0058+00 1/0 0/0 0/0 .text            getTexture__12J2DPictureExCFUc */
 JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
     if (mMaterial == NULL) {
         return NULL;
@@ -971,8 +910,6 @@ JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
     return mMaterial->getTevBlock()->getTexture(param_0);
 }
 
-/* 80306350-80306370 300C90 0020+00 1/0 0/0 0/0 .text            getTextureCount__12J2DPictureExCFv
- */
 u8 J2DPictureEx::getTextureCount() const {
     if (mMaterial == NULL) {
         return NULL;
@@ -981,8 +918,6 @@ u8 J2DPictureEx::getTextureCount() const {
     return mMaterial->getTexGenBlock()->getTexGenNum();
 }
 
-/* 80306370-803063F8 300CB0 0088+00 1/0 0/0 0/0 .text setBlack__12J2DPictureExFQ28JUtility6TColor
- */
 bool J2DPictureEx::setBlack(JUtility::TColor param_0) {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -992,8 +927,6 @@ bool J2DPictureEx::setBlack(JUtility::TColor param_0) {
     return setBlackWhite(param_0, white);
 }
 
-/* 803063F8-80306480 300D38 0088+00 1/0 0/0 0/0 .text setWhite__12J2DPictureExFQ28JUtility6TColor
- */
 bool J2DPictureEx::setWhite(JUtility::TColor param_0) {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1003,8 +936,6 @@ bool J2DPictureEx::setWhite(JUtility::TColor param_0) {
     return setBlackWhite(black, param_0);
 }
 
-/* 80306480-80306664 300DC0 01E4+00 1/0 0/0 0/0 .text
- * setBlackWhite__12J2DPictureExFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
     if (mMaterial == NULL) {
         return false;
@@ -1052,8 +983,6 @@ bool J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor para
     return true;
 }
 
-/* 80306664-80306824 300FA4 01C0+00 4/4 0/0 0/0 .text
- * getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor */
 bool J2DPictureEx::getBlackWhite(JUtility::TColor* black, JUtility::TColor* white) const {
     // FAKEMATCH
     if (mMaterial == NULL) {
@@ -1092,8 +1021,6 @@ bool J2DPictureEx::getBlackWhite(JUtility::TColor* black, JUtility::TColor* whit
     return true;
 }
 
-/* 80306824-803068F8 301164 00D4+00 1/1 0/0 0/0 .text
- * isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DPictureEx::isSetBlackWhite(JUtility::TColor black, JUtility::TColor white) const {
     if (black == 0x00000000 && white == 0xffffffff) {
         return true;
@@ -1115,7 +1042,6 @@ bool J2DPictureEx::isSetBlackWhite(JUtility::TColor black, JUtility::TColor whit
     return tmp <= max_tev_stage;
 }
 
-/* 803068F8-80306958 301238 0060+00 1/0 0/0 0/0 .text            getBlack__12J2DPictureExCFv */
 JUtility::TColor J2DPictureEx::getBlack() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1125,7 +1051,6 @@ JUtility::TColor J2DPictureEx::getBlack() const {
     }
 }
 
-/* 80306958-803069B8 301298 0060+00 1/0 0/0 0/0 .text            getWhite__12J2DPictureExCFv */
 JUtility::TColor J2DPictureEx::getWhite() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1135,7 +1060,6 @@ JUtility::TColor J2DPictureEx::getWhite() const {
     }
 }
 
-/* 803069B8-803069D8 3012F8 0020+00 1/0 0/0 0/0 .text            setAlpha__12J2DPictureExFUc */
 void J2DPictureEx::setAlpha(u8 alpha) {
     mAlpha = alpha;
     if (mMaterial != NULL && mMaterial->getColorBlock()->getMatColor(0) != NULL) {
@@ -1143,7 +1067,6 @@ void J2DPictureEx::setAlpha(u8 alpha) {
     }
 }
 
-/* 803069D8-80306A0C 301318 0034+00 1/0 0/0 0/0 .text setCullBack__12J2DPictureExF11_GXCullMode */
 void J2DPictureEx::setCullBack(GXCullMode cullMode) {
     mCullMode = cullMode;
     if (mMaterial != NULL) {
@@ -1152,15 +1075,12 @@ void J2DPictureEx::setCullBack(GXCullMode cullMode) {
     J2DPane::setCullBack(cullMode);
 }
 
-/* 80306A0C-80306A24 30134C 0018+00 1/0 0/0 0/0 .text            rewriteAlpha__12J2DPictureExFv */
 void J2DPictureEx::rewriteAlpha() {
     if (mMaterial != NULL) {
         mAlpha = mMaterial->getColorBlock()->getMatColor(0)->a;
     }
 }
 
-/* 80306A24-80306AC4 301364 00A0+00 1/0 0/0 0/0 .text            isUsed__12J2DPictureExFPC7ResTIMG
- */
 bool J2DPictureEx::isUsed(ResTIMG const* texInfo) {
     if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) {
         for (u32 i = 0; i < 8; i++) {
@@ -1173,46 +1093,34 @@ bool J2DPictureEx::isUsed(ResTIMG const* texInfo) {
     return J2DPane::isUsed(texInfo);
 }
 
-/* 80306AC4-80306AF0 301404 002C+00 1/0 0/0 0/0 .text setAnimation__12J2DPictureExFP11J2DAnmColor
- */
 void J2DPictureEx::setAnimation(J2DAnmColor* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306AF0-80306B1C 301430 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP19J2DAnmTextureSRTKey          */
 void J2DPictureEx::setAnimation(J2DAnmTextureSRTKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B1C-80306B48 30145C 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP16J2DAnmTexPattern             */
 void J2DPictureEx::setAnimation(J2DAnmTexPattern* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B48-80306B74 301488 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP15J2DAnmTevRegKey              */
 void J2DPictureEx::setAnimation(J2DAnmTevRegKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B74-80306B7C -00001 0008+00 0/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull         */
 void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* anm) {
     field_0x194 = anm;
 }
 
-/* 80306B7C-80306C70 3014BC 00F4+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP14J2DAnmVtxColor               */
 void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
     field_0x198 = anm;
     field_0x19c = 0;
@@ -1248,8 +1156,6 @@ void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
     }
 }
 
-/* 80306C70-80306DC8 3015B0 0158+00 1/0 0/0 0/0 .text
- * animationPane__12J2DPictureExFPC15J2DAnmTransform            */
 const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
     if (field_0x194 != NULL && field_0x154 != 0xffff) {
         u8 tmp;
@@ -1283,7 +1189,6 @@ const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
     return J2DPane::animationPane(anm);
 }
 
-/* 80306DC8-80306ED4 301708 010C+00 1/0 0/0 0/0 .text            getUsableTlut__12J2DPictureExFUc */
 u8 J2DPictureEx::getUsableTlut(u8 param_0) {
     u32 tex_gen_num = mMaterial->getTexGenBlock()->getTexGenNum();
     u8 usedTluts = 0;
@@ -1311,84 +1216,64 @@ u8 J2DPictureEx::getUsableTlut(u8 param_0) {
     return 0;
 }
 
-/* 80306ED4-80306F04 301814 0030+00 1/0 0/0 0/0 .text            append__12J2DPictureExFPC7ResTIMGf
- */
 bool J2DPictureEx::append(ResTIMG const* param_0, f32 param_1) {
     return append(param_0, NULL, param_1);
 }
 
-/* 80306F04-80306F34 301844 0030+00 1/0 0/0 0/0 .text            append__12J2DPictureExFPCcf */
 bool J2DPictureEx::append(char const* param_0, f32 param_1) {
     return append(param_0, NULL, param_1);
 }
 
-/* 80306F34-80306F64 301874 0030+00 1/0 0/0 0/0 .text prepend__12J2DPictureExFP10JUTTexturef */
 void J2DPictureEx::prepend(JUTTexture* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80306F64-80306F94 3018A4 0030+00 1/0 0/0 0/0 .text prepend__12J2DPictureExFPCcP10JUTPalettef */
 void J2DPictureEx::prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
     insert(param_0, param_1, 0, param_2);
 }
 
-/* 80306F94-80306FC4 3018D4 0030+00 1/0 0/0 0/0 .text            prepend__12J2DPictureExFPCcf */
 void J2DPictureEx::prepend(char const* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80306FC4-80306FF4 301904 0030+00 1/0 0/0 0/0 .text
- * prepend__12J2DPictureExFPC7ResTIMGP10JUTPalettef             */
 void J2DPictureEx::prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
     insert(param_0, param_1, 0, param_2);
 }
 
-/* 80306FF4-80307024 301934 0030+00 1/0 0/0 0/0 .text            prepend__12J2DPictureExFPC7ResTIMGf
- */
 void J2DPictureEx::prepend(ResTIMG const* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80307024-80307058 301964 0034+00 1/0 0/0 0/0 .text            insert__12J2DPictureExFPCcUcf */
 bool J2DPictureEx::insert(char const* param_0, u8 param_1, f32 param_2) {
     return insert(param_0, NULL, param_1, param_2);
 }
 
-/* 80307058-8030708C 301998 0034+00 1/0 0/0 0/0 .text insert__12J2DPictureExFPC7ResTIMGUcf */
 bool J2DPictureEx::insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
     return insert(param_0, NULL, param_1, param_2);
 }
 
-/* 8030708C-803070D0 3019CC 0044+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, bool param_2, bool param_3, bool param_4) {
     return draw(param_0, param_1, 0, param_2, param_3, param_4);
 }
 
-/* 803070D0-80307134 301A10 0064+00 1/0 0/0 0/0 .text            drawOut__12J2DPictureExFffffffff */
 void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                                f32 param_5, f32 param_6, f32 param_7) {
     drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
             JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
 }
 
-/* 80307134-80307168 301A74 0034+00 1/0 0/0 0/0 .text            load__12J2DPictureExFUc */
 void J2DPictureEx::load(u8 param_0) {
     load((GXTexMapID)param_0, param_0);
 }
 
-/* 80307168-803071A4 301AA8 003C+00 1/0 0/0 0/0 .text            setCullBack__12J2DPictureExFb */
 void J2DPictureEx::setCullBack(bool param_0) {
     setCullBack(param_0 ? GX_CULL_BACK : GX_CULL_NONE);
 }
 
-/* 803071A4-803071C4 301AE4 0020+00 1/0 0/0 0/0 .text            isUsed__12J2DPictureExFPC7ResFONT
- */
 bool J2DPictureEx::isUsed(ResFONT const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 803071C4-803071E4 301B04 0020+00 1/0 0/0 0/0 .text setAnimation__12J2DPictureExFP10J2DAnmBase
- */
 void J2DPictureEx::setAnimation(J2DAnmBase* param_0) {
     J2DPane::setAnimation(param_0);
 }
diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index f1b19b6eb3..93d2db9c11 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -6,19 +6,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-/* 80451580-80451584 000A80 0004+00 3/3 0/0 0/0 .sbss            mStrBuff__8J2DPrint */
 char* J2DPrint::mStrBuff;
 
-/* 80451584-80451588 000A84 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool sStrBufInitialized;
 
-/* 80451588-8045158C 000A88 0004+00 3/3 0/0 0/0 .sbss            mStrBuffSize__8J2DPrint */
 size_t J2DPrint::mStrBuffSize;
 
-/* 8045158C-80451590 000A8C 0004+00 2/2 0/0 0/0 .sbss            None */
 static u8 data_8045158C[4];
 
-/* 802F42F0-802F4394 2EEC30 00A4+00 1/1 0/0 0/0 .text            J2DPrint_print_alpha_va */
 f32 J2DPrint_print_alpha_va(J2DPrint* pPrint, u8 alpha, const char* fmt, va_list args) {
     pPrint->initchar();
     s32 length = vsnprintf(J2DPrint::mStrBuff, J2DPrint::mStrBuffSize, fmt, args);
@@ -47,7 +42,6 @@ J2DPrint::J2DPrint(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::T
     private_initiate(pFont, charSpacing, lineSpacing, charColor, gradColor, blackColor, whiteColor, false);
 }
 
-/* 802F4420-802F4468 2EED60 0048+00 1/0 6/6 0/0 .text            __dt__8J2DPrintFv */
 J2DPrint::~J2DPrint() {}
 
 void J2DPrint::initiate() {
@@ -96,7 +90,6 @@ void J2DPrint::private_initiate(JUTFont* pFont, f32 charSpacing, f32 lineSpacing
     initchar();
 }
 
-/* 802F4658-802F46C4 2EEF98 006C+00 1/1 1/1 0/0 .text            setBuffer__8J2DPrintFUl */
 u8* J2DPrint::setBuffer(size_t size) {
     JUT_ASSERT(335, size > 0);
 
@@ -111,7 +104,6 @@ u8* J2DPrint::setBuffer(size_t size) {
     return u8Buff;
 }
 
-/* 802F46C4-802F475C 2EF004 0098+00 1/1 0/0 0/0 .text            setFontSize__8J2DPrintFv */
 void J2DPrint::setFontSize() {
     if (mFont != NULL) {
         mFontSizeX = mFont->getCellWidth();
@@ -119,7 +111,6 @@ void J2DPrint::setFontSize() {
     }
 }
 
-/* 802F475C-802F4778 2EF09C 001C+00 2/2 2/2 0/0 .text            locate__8J2DPrintFff */
 void J2DPrint::locate(f32 cursorH, f32 cursorV) {
     field_0x24 = cursorH;
     field_0x28 = cursorV;
@@ -128,7 +119,6 @@ void J2DPrint::locate(f32 cursorH, f32 cursorV) {
     field_0x34 = 0.0f;
 }
 
-/* 802F4778-802F4828 2EF0B8 00B0+00 0/0 2/2 0/0 .text            print__8J2DPrintFffUcPCce */
 f32 J2DPrint::print(f32 cursorH, f32 cursorV, u8 alpha, char const* fmt, ...) {
     locate(cursorH, cursorV);
 
@@ -140,8 +130,6 @@ f32 J2DPrint::print(f32 cursorH, f32 cursorV, u8 alpha, char const* fmt, ...) {
     return var_f31;
 }
 
-/* 802F4828-802F4B4C 2EF168 0324+00 0/0 4/4 0/0 .text
- * printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc */
 void J2DPrint::printReturn(char const* pString, f32 param_1, f32 param_2,
                            J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind, f32 param_5,
                            f32 param_6, u8 alpha) {
@@ -200,8 +188,6 @@ void J2DPrint::printReturn(char const* pString, f32 param_1, f32 param_2,
     }
 }
 
-/* 802F4B4C-802F52E8 2EF48C 079C+00 2/2 0/0 0/0 .text
- * parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb              */
 f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
                     TSize& size, u8 alpha, bool param_6) {
     if (mFont == NULL) {
@@ -387,7 +373,6 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
     return local_a8 - prevCursorV;
 }
 
-/* 802F52E8-802F5410 2EFC28 0128+00 2/1 0/0 0/0 .text            doCtrlCode__8J2DPrintFi */
 void J2DPrint::doCtrlCode(int iCharacter) {
     switch (iCharacter) {
     case '\b':
@@ -424,7 +409,6 @@ void J2DPrint::doCtrlCode(int iCharacter) {
     }
 }
 
-/* 802F5410-802F594C 2EFD50 053C+00 1/1 0/0 0/0 .text            doEscapeCode__8J2DPrintFPPCUcUc */
 u16 J2DPrint::doEscapeCode(const u8** ppu8String, u8 alpha) {
     const u8* pStringStart = *ppu8String;
     u16 code = 0;
@@ -534,7 +518,6 @@ u16 J2DPrint::doEscapeCode(const u8** ppu8String, u8 alpha) {
     return code;
 }
 
-/* 802F594C-802F59C0 2F028C 0074+00 3/3 0/0 0/0 .text            initchar__8J2DPrintFv */
 void J2DPrint::initchar() {
     field_0x8 = mCharColor;
     field_0xc = mGradColor;
@@ -546,7 +529,6 @@ void J2DPrint::initchar() {
     mScaleY = mFontSizeY;
 }
 
-/* 802F59C0-802F5AC4 2F0300 0104+00 1/1 0/0 0/0 .text            getNumberS32__8J2DPrintFPPCUclli */
 s32 J2DPrint::getNumberS32(const u8** ppu8String, s32 defaultValue, s32 errorValue, int base) {
     const u8* pStringStart = *ppu8String;
     if (**ppu8String != '[') {
@@ -586,7 +568,6 @@ s32 J2DPrint::getNumberS32(const u8** ppu8String, s32 defaultValue, s32 errorVal
     return number;
 }
 
-/* 802F5AC4-802F5BF8 2F0404 0134+00 1/1 0/0 0/0 .text            getNumberF32__8J2DPrintFPPCUcffi */
 f32 J2DPrint::getNumberF32(const u8** ppu8String, f32 defaultValue, f32 errorValue, int base) {
     const u8* pStringStart = *ppu8String;
     if (**ppu8String != '[') {
diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/src/JSystem/J2DGraph/J2DScreen.cpp
index 85db8fa815..93989d1938 100644
--- a/src/JSystem/J2DGraph/J2DScreen.cpp
+++ b/src/JSystem/J2DGraph/J2DScreen.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DScreen
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DScreen.h"
@@ -16,7 +11,6 @@
 #include "JSystem/JSupport/JSUMemoryStream.h"
 #include "dolphin/types.h"
 
-/* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text            __ct__9J2DScreenFv */
 J2DScreen::J2DScreen()
     : J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(0, 0), JGeometry::TVec2<f32>(640, 480))), mColor() {
     field_0x4 = -1;
@@ -28,12 +22,10 @@ J2DScreen::J2DScreen()
     mNameTable = NULL;
 }
 
-/* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text            __dt__9J2DScreenFv */
 J2DScreen::~J2DScreen() {
     clean();
 }
 
-/* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text            clean__9J2DScreenFv */
 void J2DScreen::clean() {
     delete[] mMaterials;
     mMaterialNum = 0;
@@ -52,8 +44,6 @@ void J2DScreen::clean() {
     }
 }
 
-/* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive
- */
 bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* p_archive) {
     if (p_archive == NULL) {
         return false;
@@ -68,8 +58,6 @@ bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* p_arch
     return false;
 }
 
-/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text
- * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
 bool J2DScreen::setPriority(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) {
     if (p_archive == NULL) {
         return false;
@@ -78,8 +66,6 @@ bool J2DScreen::setPriority(JSURandomInputStream* p_stream, u32 param_1, JKRArch
     }
 }
 
-/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text
- * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
 bool J2DScreen::private_set(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) {
     if (!checkSignature(p_stream)) {
         return false;
@@ -98,8 +84,6 @@ bool J2DScreen::private_set(JSURandomInputStream* p_stream, u32 param_1, JKRArch
     return make_end ? p_stream->isGood() : false;
 }
 
-/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text
- * checkSignature__9J2DScreenFP20JSURandomInputStream           */
 bool J2DScreen::checkSignature(JSURandomInputStream* p_stream) {
     J2DScrnHeader header;
     p_stream->read(&header, sizeof(J2DScrnHeader));
@@ -112,8 +96,6 @@ bool J2DScreen::checkSignature(JSURandomInputStream* p_stream) {
     }
 }
 
-/* 802F8894-802F8990 2F31D4 00FC+00 1/1 0/0 0/0 .text
- * getScreenInformation__9J2DScreenFP20JSURandomInputStream     */
 bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) {
     J2DScrnInfoHeader info;
     p_stream->read(&info, sizeof(J2DScrnInfoHeader));
@@ -134,8 +116,6 @@ bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) {
     return true;
 }
 
-/* 802F8990-802F8B98 2F32D0 0208+00 1/1 0/0 0/0 .text
- * makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive */
 s32 J2DScreen::makeHierarchyPanes(J2DPane* p_basePane, JSURandomInputStream* p_stream, u32 param_2,
                                   JKRArchive* p_archive) {
     J2DPane* next_pane = p_basePane;
@@ -190,8 +170,6 @@ s32 J2DScreen::makeHierarchyPanes(J2DPane* p_basePane, JSURandomInputStream* p_s
     }
 }
 
-/* 802F8B98-802F8ED4 2F34D8 033C+00 1/0 0/0 0/0 .text
- * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive */
 J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream,
                                J2DPane* p_basePane, u32 param_3, JKRArchive* p_archive) {
     J2DPane* newPane;
@@ -246,7 +224,6 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS
     return newPane;
 }
 
-/* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */
 void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) {
     u32 l_x, l_y, width, height;
 
@@ -283,7 +260,6 @@ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) {
     }
 }
 
-/* 802F90A0-802F90E0 2F39E0 0040+00 1/0 0/0 0/0 .text            search__9J2DScreenFUx */
 J2DPane* J2DScreen::search(u64 tag) {
     if (tag == 0) {
         return NULL;
@@ -292,7 +268,6 @@ J2DPane* J2DScreen::search(u64 tag) {
     return J2DPane::search(tag);
 }
 
-/* 802F90E0-802F9120 2F3A20 0040+00 1/0 0/0 0/0 .text            searchUserInfo__9J2DScreenFUx */
 J2DPane* J2DScreen::searchUserInfo(u64 tag) {
     if (tag == 0) {
         return NULL;
@@ -301,7 +276,6 @@ J2DPane* J2DScreen::searchUserInfo(u64 tag) {
     return J2DPane::searchUserInfo(tag);
 }
 
-/* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text            drawSelf__9J2DScreenFffPA3_A4_f */
 void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     JUtility::TColor color(mColor);
     u8 alpha = (color.a * mAlpha) / 255;
@@ -331,8 +305,6 @@ void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     }
 }
 
-/* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text
- * getResReference__9J2DScreenFP20JSURandomInputStreamUl        */
 J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 param_1) {
     s32 position = p_stream->getPosition();
     p_stream->skip(4);
@@ -359,8 +331,6 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32
     return (J2DResReference*)buffer;
 }
 
-/* 802F937C-802F9600 2F3CBC 0284+00 1/1 0/0 0/0 .text
- * createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
 bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) {
     s32 position = p_stream->getPosition();
 
@@ -426,21 +396,16 @@ failure:
     return false;
 }
 
-/* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text            isUsed__9J2DScreenFPC7ResTIMG */
 bool J2DScreen::isUsed(ResTIMG const* p_timg) {
     return J2DPane::isUsed(p_timg);
 }
 
-/* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text            isUsed__9J2DScreenFPC7ResFONT */
 bool J2DScreen::isUsed(ResFONT const* p_font) {
     return J2DPane::isUsed(p_font);
 }
 
-/* ############################################################################################## */
-/* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss            mDataManage__9J2DScreen */
 J2DDataManage* J2DScreen::mDataManage;
 
-/* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text            getNameResource__9J2DScreenFPCc */
 void* J2DScreen::getNameResource(char const* resName) {
     void* res = JKRFileLoader::getGlbResource(resName, NULL);
 
@@ -451,7 +416,6 @@ void* J2DScreen::getNameResource(char const* resName) {
     return res;
 }
 
-/* 802F9690-802F9704 2F3FD0 0074+00 0/0 30/30 3/3 .text            animation__9J2DScreenFv */
 void J2DScreen::animation() {
     animationPane(mTransform);
 
@@ -460,7 +424,6 @@ void J2DScreen::animation() {
     }
 }
 
-/* 802F9704-802F9798 2F4044 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP11J2DAnmColor */
 void J2DScreen::setAnimation(J2DAnmColor* p_anmColor) {
     p_anmColor->searchUpdateMaterialID(this);
     u16 matNum = p_anmColor->getUpdateMaterialNum();
@@ -473,8 +436,6 @@ void J2DScreen::setAnimation(J2DAnmColor* p_anmColor) {
     }
 }
 
-/* 802F9798-802F9838 2F40D8 00A0+00 1/0 0/0 0/0 .text
- * setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey              */
 void J2DScreen::setAnimation(J2DAnmTextureSRTKey* p_anmSRTKey) {
     p_anmSRTKey->searchUpdateMaterialID(this);
     u16 matNum = p_anmSRTKey->getUpdateMaterialNum();
@@ -487,8 +448,6 @@ void J2DScreen::setAnimation(J2DAnmTextureSRTKey* p_anmSRTKey) {
     }
 }
 
-/* 802F9838-802F98CC 2F4178 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP16J2DAnmTexPattern
- */
 void J2DScreen::setAnimation(J2DAnmTexPattern* p_anmPattern) {
     p_anmPattern->searchUpdateMaterialID(this);
     u16 matNum = p_anmPattern->getUpdateMaterialNum();
@@ -501,8 +460,6 @@ void J2DScreen::setAnimation(J2DAnmTexPattern* p_anmPattern) {
     }
 }
 
-/* 802F98CC-802F99A8 2F420C 00DC+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP15J2DAnmTevRegKey
- */
 void J2DScreen::setAnimation(J2DAnmTevRegKey* p_anmRegKey) {
     p_anmRegKey->searchUpdateMaterialID(this);
 
@@ -523,48 +480,35 @@ void J2DScreen::setAnimation(J2DAnmTevRegKey* p_anmRegKey) {
     }
 }
 
-/* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor
- */
 void J2DScreen::setAnimation(J2DAnmVtxColor* p_anmVtxColor) {
     J2DPane::setVtxColorAnimation(p_anmVtxColor);
 }
 
-/* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text
- * setAnimation__9J2DScreenFP20J2DAnmVisibilityFull             */
 void J2DScreen::setAnimation(J2DAnmVisibilityFull* p_anmVisibility) {
     J2DPane::setVisibileAnimation(p_anmVisibility);
 }
 
-/* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text
- * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */
 J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream,
                                J2DPane* p_basePane, u32 param_3) {
     return createPane(header, p_stream, p_basePane, param_3, NULL);
 }
 
-/* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text            getTypeID__9J2DScreenCFv */
 u16 J2DScreen::getTypeID() const {
     return 8;
 }
 
-/* 802F9A20-802F9A54 2F4360 0034+00 1/0 0/0 0/0 .text            calcMtx__9J2DScreenFv */
 void J2DScreen::calcMtx() {
     makeMatrix(mTranslateX, mTranslateY);
 }
 
-/* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */
 void J2DScreen::setAnimation(J2DAnmBase* p_anm) {
     J2DPane::setAnimation(p_anm);
 }
 
-/* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text
- * setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull           */
 void J2DScreen::setAnimationVF(J2DAnmVisibilityFull*) {
     /* empty function */
 }
 
-/* 802F9A78-802F9A7C 2F43B8 0004+00 1/0 0/0 0/0 .text setAnimationVC__9J2DScreenFP14J2DAnmVtxColor
- */
 void J2DScreen::setAnimationVC(J2DAnmVtxColor*) {
     /* empty function */
 }
diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp
index 617b50b0bc..51c8027ff9 100644
--- a/src/JSystem/J2DGraph/J2DTevs.cpp
+++ b/src/JSystem/J2DGraph/J2DTevs.cpp
@@ -9,12 +9,10 @@
 #include "math.h"
 #include "dolphin/gx.h"
 
-/* 802E9C90-802E9CC4 2E45D0 0034+00 0/0 1/1 0/0 .text            load__9J2DTexMtxFUl */
 void J2DTexMtx::load(u32 mtxIdx) {
     GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, mInfo.getTexMtxType());
 }
 
-/* 802E9CC4-802E9D2C 2E4604 0068+00 0/0 2/2 0/0 .text            calc__9J2DTexMtxFv */
 void J2DTexMtx::calc() {
     if (mInfo.mTexMtxDCC == J2DTexMtxInfo::DCC_NONE) {
         getTextureMtx(mInfo.mTexSRTInfo, mInfo.mCenter, mTexMtx);
@@ -23,8 +21,6 @@ void J2DTexMtx::calc() {
     }
 }
 
-/* 802E9D2C-802E9EBC 2E466C 0190+00 1/1 0/0 0/0 .text
- * getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f     */
 void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx param_2) {
     float f31 = (param_0.mRotationDeg * M_PI) / 180.0f;
     param_2[0][0] = param_0.mScaleX * i_cosf(f31);
@@ -43,8 +39,6 @@ void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx
     param_2[2][3] = 0.0f;
 }
 
-/* 802E9EBC-802EA044 2E47FC 0188+00 1/1 0/0 0/0 .text
- * getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f     */
 void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) {
     float f31 = (param_0.mRotationDeg * M_PI) / 180.0f;
     param_1[0][0] = param_0.mScaleX * i_cosf(f31);
@@ -63,24 +57,20 @@ void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1)
     param_1[2][3] = 0.0f;
 }
 
-/* 802EA044-802EA098 2E4984 0054+00 0/0 5/5 0/0 .text            load__14J2DIndTevStageFUc */
 void J2DIndTevStage::load(u8 tevStage) {
     GXSetTevIndirect((GXTevStageID)tevStage, getIndStage(), getIndFormat(), getBiasSel(),
                      getMtxSel(), getWrapS(), getWrapT(), getPrev(), getLod(), getAlphaSel());
 }
 
-/* 802EA098-802EA0CC 2E49D8 0034+00 0/0 1/1 0/0 .text            load__12J2DIndTexMtxFUc */
 void J2DIndTexMtx::load(u8 indTexMtx) {
     GXSetIndTexMtx((GXIndTexMtxID)(GX_ITM_0 + indTexMtx), mIndTexMtxInfo.mMtx,
                    mIndTexMtxInfo.mScaleExp);
 }
 
-/* 802EA0CC-802EA0FC 2E4A0C 0030+00 0/0 1/1 0/0 .text            load__19J2DIndTexCoordScaleFUc */
 void J2DIndTexCoordScale::load(u8 indTexStage) {
     GXSetIndTexCoordScale((GXIndTexStageID)indTexStage, mInfo.getScaleS(), mInfo.getScaleT());
 }
 
-/* 802EA0FC-802EA12C 2E4A3C 0030+00 0/0 1/1 0/0 .text            load__14J2DIndTexOrderFUc */
 void J2DIndTexOrder::load(u8 indTexStage) {
     GXSetIndTexOrder((GXIndTexStageID)indTexStage, mInfo.getTexCoordID(), mInfo.getTexMapID());
 }
@@ -105,8 +95,6 @@ static void dummyVirtual(J2DTevBlock* block, J2DIndBlock* indBlock) {
     block->getTevSwapModeTable(0);
 }
 
-/* ############################################################################################## */
-/* 803A1B80-803A1BA0 02E1E0 0020+00 0/0 3/3 0/0 .rodata          j2dDefaultTexCoordInfo */
 J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
     {GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
     {GX_TG_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
@@ -114,70 +102,53 @@ J2DTexCoordInfo const j2dDefaultTexCoordInfo[8] = {
     {GX_TG_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_TG_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0},
 };
 
-/* 803A1BA0-803A1BC4 02E200 0024+00 0/0 3/3 0/0 .rodata          j2dDefaultTexMtxInfo */
 J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1,    1,    255,  255,  0.5f, 0.5f,
                                             0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f};
 
-/* 803A1BC4-803A1BE0 02E224 001C+00 0/0 3/3 0/0 .rodata          j2dDefaultIndTexMtxInfo */
 J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
 
-/* 803A1BE0-803A1BF4 02E240 0014+00 0/0 1/1 0/0 .rodata          j2dDefaultTevStageInfo */
 extern J2DTevStageInfo const j2dDefaultTevStageInfo = {
     4,          GX_CC_RASC,    GX_CC_ZERO, GX_CC_ZERO, GX_CC_CPREV,   GX_TEV_ADD,
     GX_TB_ZERO, GX_CS_SCALE_1, 1,          GX_TEVPREV, GX_CA_RASA,    GX_CA_ZERO,
     GX_CA_ZERO, GX_CA_APREV,   GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1,
     GX_TEVPREV};
 
-/* 803A1BF4-803A1C00 02E254 000C+00 0/0 7/7 0/0 .rodata          j2dDefaultIndTevStageInfo */
 extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
     GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF,  GX_ITW_OFF,
     GX_ITW_OFF,      0,           0,           GX_ITBA_OFF,
 };
 
-/* 8045617C-80456180 00477C 0004+00 0/0 1/1 0/0 .sdata2          j2dDefaultColInfo */
 extern const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
 
-/* 80456180-80456184 004780 0004+00 0/0 7/7 0/0 .sdata2          j2dDefaultTevOrderInfoNull */
 extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
     GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0};
 
-/* 80456184-80456188 004784 0002+02 0/0 3/3 0/0 .sdata2          j2dDefaultIndTexOrderNull */
 extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
     GX_TEXCOORD_NULL,
     GX_TEXMAP_NULL,
 };
 
-/* 80456188-80456190 004788 0008+00 0/0 5/5 0/0 .sdata2          j2dDefaultTevColor */
 extern const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
 
-/* 80456190-80456194 004790 0002+02 0/0 3/3 0/0 .sdata2          j2dDefaultIndTexCoordScaleInfo */
 extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
     GX_ITS_1,
     GX_ITS_1,
 };
 
-/* 80456194-80456198 004794 0004+00 0/0 5/5 0/0 .sdata2          j2dDefaultTevKColor */
 extern const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
 
-/* 80456198-8045619C 004798 0004+00 0/0 2/2 0/0 .sdata2          j2dDefaultTevSwapMode */
 extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
 
-/* 8045619C-804561A0 00479C 0004+00 0/0 6/6 0/0 .sdata2          j2dDefaultTevSwapModeTable */
 extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
     GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA};
 
-/* 804561A0-804561A4 0047A0 0004+00 0/0 3/3 0/0 .sdata2          j2dDefaultBlendInfo */
 extern const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
                                                  GX_LO_NOOP};
 
-/* 804561A4-804561A8 0047A4 0004+00 0/0 1/1 0/0 .sdata2          None */
 extern const u8 j2dDefaultPEBlockDither = 0;
 
-/* 804561A8-804561AC 0047A8 0004+00 0/0 3/3 0/0 .sdata2          j2dDefaultColorChanInfo */
 extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
 
-/* 804561AC-804561AE 0047AC 0002+00 0/0 1/1 0/0 .sdata2          None */
 extern const u8 data_804561AC = 0x1B;
 
-/* 804561AE-804561B0 0047AE 0002+00 0/0 3/3 0/0 .sdata2          j2dDefaultAlphaCmp */
 extern const u16 j2dDefaultAlphaCmp = 0x00E7;
diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp
index 91a9c404a0..9a96d1e4e0 100644
--- a/src/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/src/JSystem/J2DGraph/J2DTextBox.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DTextBox
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
@@ -10,21 +5,16 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResFont.h"
 
-/* 802FF660-802FF6D8 2F9FA0 0078+00 0/0 1/1 0/0 .text            __ct__10J2DTextBoxFv */
 J2DTextBox::J2DTextBox()
     : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
     initiate(NULL, NULL, 0, HBIND_LEFT, VBIND_TOP);
 }
 
-/* 802FF6D8-802FF75C 2FA018 0084+00 0/0 1/1 0/0 .text
- * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, JKRArchive* p_archive)
     : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
     private_readStream(p_pane, p_stream, p_archive);
 }
 
-/* 802FF75C-802FFBC4 2FA09C 0468+00 0/0 1/1 0/0 .text
- * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 param_2,
                        J2DMaterial* p_material)
     : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() {
@@ -142,8 +132,6 @@ J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2<f32> const& bounds, ResFONT con
     initiate(p_font, string, strLength, hBind, vBind);
 }
 
-/* 802FFC58-802FFE88 2FA598 0230+00 2/2 1/0 0/0 .text
- * initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding */
 void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length,
                           J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) {
     if (p_font != NULL) {
@@ -197,8 +185,6 @@ void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length,
     mTextFontOwned = true;
 }
 
-/* 802FFE88-803001E0 2FA7C8 0358+00 1/1 0/0 0/0 .text
- * private_readStream__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_stream,
                                     JKRArchive* p_archive) {
     int position = p_stream->getPosition();
@@ -263,7 +249,6 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str
     mTextFontOwned = true;
 }
 
-/* 803001E0-80300278 2FAB20 0098+00 1/0 2/2 0/0 .text            __dt__10J2DTextBoxFv */
 J2DTextBox::~J2DTextBox() {
     if (mTextFontOwned) {
         delete mFont;
@@ -272,7 +257,6 @@ J2DTextBox::~J2DTextBox() {
     delete[] mStringPtr;
 }
 
-/* 80300278-803002E8 2FABB8 0070+00 1/0 0/0 0/0 .text            setFont__10J2DTextBoxFP7JUTFont */
 void J2DTextBox::setFont(JUTFont* p_font) {
     if (p_font) {
         if (mTextFontOwned) {
@@ -283,7 +267,6 @@ void J2DTextBox::setFont(JUTFont* p_font) {
     }
 }
 
-/* 803002E8-80300490 2FAC28 01A8+00 1/0 0/0 0/0 .text            draw__10J2DTextBoxFff */
 void J2DTextBox::draw(f32 posX, f32 posY) {
     Mtx m;
 
@@ -310,8 +293,6 @@ void J2DTextBox::draw(f32 posX, f32 posY) {
     }
 }
 
-/* 80300490-80300658 2FADD0 01C8+00 1/0 1/1 0/0 .text draw__10J2DTextBoxFfff18J2DTextBoxHBinding
- */
 void J2DTextBox::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind) {
     Mtx m;
 
@@ -339,12 +320,10 @@ void J2DTextBox::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind)
     }
 }
 
-/* 80300658-80300660 2FAF98 0008+00 0/0 62/62 2/2 .text            getStringPtr__10J2DTextBoxCFv */
 char* J2DTextBox::getStringPtr() const {
     return mStringPtr;
 }
 
-/* 80300660-8030074C 2FAFA0 00EC+00 0/0 6/6 0/0 .text            setString__10J2DTextBoxFPCce */
 s32 J2DTextBox::setString(char const* string, ...) {
     va_list args;
     va_start(args, string);
@@ -370,7 +349,6 @@ s32 J2DTextBox::setString(char const* string, ...) {
     return len;
 }
 
-/* 8030074C-80300870 2FB08C 0124+00 0/0 41/41 2/2 .text            setString__10J2DTextBoxFsPCce */
 s32 J2DTextBox::setString(s16 length, char const* string, ...) {
     va_list args;
     va_start(args, string);
@@ -404,7 +382,6 @@ s32 J2DTextBox::setString(s16 length, char const* string, ...) {
     return len;
 }
 
-/* 80300870-803008E8 2FB1B0 0078+00 1/0 1/0 0/0 .text            setConnectParent__10J2DTextBoxFb */
 bool J2DTextBox::setConnectParent(bool connected) {
     if (getPaneTree()->getParent() == NULL) {
         return false;
@@ -418,7 +395,6 @@ bool J2DTextBox::setConnectParent(bool connected) {
     return connected;
 }
 
-/* 803008E8-80300950 2FB228 0068+00 1/0 1/0 0/0 .text            drawSelf__10J2DTextBoxFff */
 void J2DTextBox::drawSelf(f32 param_0, f32 param_1) {
     Mtx identity;
     MTXIdentity(identity);
@@ -426,8 +402,6 @@ void J2DTextBox::drawSelf(f32 param_0, f32 param_1) {
     drawSelf(param_0, param_1, &identity);
 }
 
-/* 80300950-80300AF8 2FB290 01A8+00 1/0 0/0 0/0 .text            drawSelf__10J2DTextBoxFffPA3_A4_f
- */
 void J2DTextBox::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) {
     Mtx m;
 
@@ -451,7 +425,6 @@ void J2DTextBox::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) {
     }
 }
 
-/* 80300AF8-80300BFC 2FB438 0104+00 1/0 1/0 0/0 .text            resize__10J2DTextBoxFff */
 void J2DTextBox::resize(f32 x, f32 y) {
     if (mConnected && getPaneTree() != NULL && getPaneTree()->getParent() != NULL) {
         J2DPane* obj = getPaneTree()->getParent()->getObject();
@@ -467,7 +440,6 @@ void J2DTextBox::resize(f32 x, f32 y) {
     J2DPane::resize(x, y);
 }
 
-/* 80300BFC-80300C68 2FB53C 006C+00 1/0 0/0 0/0 .text            isUsed__10J2DTextBoxFPC7ResFONT */
 bool J2DTextBox::isUsed(ResFONT const* p_font) {
     if (mFont != NULL && mFont->getResFont() == p_font) {
         return true;
@@ -476,17 +448,14 @@ bool J2DTextBox::isUsed(ResFONT const* p_font) {
     return J2DPane::isUsed(p_font);
 }
 
-/* 80300C68-80300C70 2FB5A8 0008+00 1/0 1/0 0/0 .text            getTypeID__10J2DTextBoxCFv */
 u16 J2DTextBox::getTypeID() const {
     return 19;
 }
 
-/* 80300C70-80300C90 2FB5B0 0020+00 1/0 0/0 0/0 .text            isUsed__10J2DTextBoxFPC7ResTIMG */
 bool J2DTextBox::isUsed(ResTIMG const* p_timg) {
     return J2DPane::isUsed(p_timg);
 }
 
-/* 80300C90-80300C94 2FB5D0 0004+00 1/0 0/0 0/0 .text            rewriteAlpha__10J2DTextBoxFv */
 void J2DTextBox::rewriteAlpha() {
     /* empty function */
 }
diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp
index a3919cc1e7..c5bf9fcd3d 100644
--- a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp
+++ b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp
@@ -9,8 +9,6 @@
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResFont.h"
 
-/* 803071E4-8030751C 301B24 0338+00 0/0 1/1 0/0 .text
- * __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 param_2,
                                J2DMaterial* p_material) {
     J2DTextBoxInfo info;
@@ -92,15 +90,12 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32
     field_0x140 = 0;
 }
 
-/* 8030751C-803075AC 301E5C 0090+00 1/0 0/0 0/0 .text            __dt__12J2DTextBoxExFv */
 J2DTextBoxEx::~J2DTextBoxEx() {
     if (field_0x140 != 0) {
         delete mMaterial;
     }
 }
 
-/* 803075AC-803078AC 301EEC 0300+00 1/0 0/0 0/0 .text            drawSelf__12J2DTextBoxExFffPA3_A4_f
- */
 void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) {
     Mtx m;
 
@@ -142,7 +137,6 @@ void J2DTextBoxEx::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) {
     }
 }
 
-/* 803078AC-80307AF0 3021EC 0244+00 1/0 0/0 0/0 .text            draw__12J2DTextBoxExFff */
 void J2DTextBoxEx::draw(f32 posX, f32 posY) {
     Mtx m;
 
@@ -198,8 +192,6 @@ void J2DTextBoxEx::draw(f32 posX, f32 posY) {
     }
 }
 
-/* 80307AF0-80307D5C 302430 026C+00 1/0 0/0 0/0 .text draw__12J2DTextBoxExFfff18J2DTextBoxHBinding
- */
 void J2DTextBoxEx::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind) {
     Mtx m;
 
@@ -256,8 +248,6 @@ void J2DTextBoxEx::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBin
     }
 }
 
-/* 80307D5C-80307DC0 30269C 0064+00 1/0 0/0 0/0 .text            setFont__12J2DTextBoxExFP7JUTFont
- */
 void J2DTextBoxEx::setFont(JUTFont* p_font) {
     if (p_font != NULL && mMaterial != NULL && mMaterial->getTevBlock() != NULL) {
         mMaterial->getTevBlock()->setFont(p_font);
@@ -265,7 +255,6 @@ void J2DTextBoxEx::setFont(JUTFont* p_font) {
     }
 }
 
-/* 80307DC0-80307E0C 302700 004C+00 1/0 0/0 0/0 .text            getFont__12J2DTextBoxExCFv */
 JUTFont* J2DTextBoxEx::getFont() const {
     if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) {
         return mMaterial->getTevBlock()->getFont();
@@ -274,7 +263,6 @@ JUTFont* J2DTextBoxEx::getFont() const {
     return NULL;
 }
 
-/* 80307E0C-80307EF0 30274C 00E4+00 1/1 0/0 0/0 .text            setTevOrder__12J2DTextBoxExFb */
 void J2DTextBoxEx::setTevOrder(bool param_0) {
     u16 local_18[2];
     if (!param_0) {
@@ -296,7 +284,6 @@ void J2DTextBoxEx::setTevOrder(bool param_0) {
     }
 }
 
-/* 80307EF0-80307F94 302830 00A4+00 1/1 0/0 0/0 .text            setTevStage__12J2DTextBoxExFb */
 void J2DTextBoxEx::setTevStage(bool param_0) {
     J2DTevStage* stage = mMaterial->getTevBlock()->getTevStage(0);
 
@@ -308,8 +295,6 @@ void J2DTextBoxEx::setTevStage(bool param_0) {
     }
 }
 
-/* 80307F94-8030823C 3028D4 02A8+00 1/1 0/0 0/0 .text
- * setStage__12J2DTextBoxExFP11J2DTevStageQ212J2DTextBoxEx10stage_enum */
 void J2DTextBoxEx::setStage(J2DTevStage* param_0, J2DTextBoxEx::stage_enum param_1) {
     const u8 tevColors[3][4] = {
         {0x0F, 0x08, 0x0A, 0x0F}, {0x02, 0x04, 0x08, 0x0F}, {0x0F, 0x0A, 0x00, 0x0F},
@@ -340,8 +325,6 @@ void J2DTextBoxEx::setStage(J2DTevStage* param_0, J2DTextBoxEx::stage_enum param
         tevAlphaOps[param_1][0], tevAlphaOps[param_1][1], tevAlphaOps[param_1][2], tevAlphaOps[param_1][3], tevAlphaOps[param_1][4]);
 }
 
-/* 8030823C-803082C4 302B7C 0088+00 1/0 0/0 0/0 .text setBlack__12J2DTextBoxExFQ28JUtility6TColor
- */
 bool J2DTextBoxEx::setBlack(JUtility::TColor black) {
     JUtility::TColor tevBlack;
     JUtility::TColor tevWhite;
@@ -353,8 +336,6 @@ bool J2DTextBoxEx::setBlack(JUtility::TColor black) {
     }
 }
 
-/* 803082C4-8030834C 302C04 0088+00 1/0 0/0 0/0 .text setWhite__12J2DTextBoxExFQ28JUtility6TColor
- */
 bool J2DTextBoxEx::setWhite(JUtility::TColor white) {
     JUtility::TColor tevBlack;
     JUtility::TColor tevWhite;
@@ -366,8 +347,6 @@ bool J2DTextBoxEx::setWhite(JUtility::TColor white) {
     }
 }
 
-/* 8030834C-803084CC 302C8C 0180+00 1/0 0/0 0/0 .text
- * setBlackWhite__12J2DTextBoxExFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
     if (mMaterial == NULL) {
         return false;
@@ -408,8 +387,6 @@ bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor para
     return true;
 }
 
-/* 803084CC-80308668 302E0C 019C+00 4/4 0/0 0/0 .text
- * getBlackWhite__12J2DTextBoxExCFPQ28JUtility6TColorPQ28JUtility6TColor */
 bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const {
     if (mMaterial == NULL) {
         return false;
@@ -443,8 +420,6 @@ bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* pa
     return true;
 }
 
-/* 80308668-803086FC 302FA8 0094+00 1/1 0/0 0/0 .text
- * isSetBlackWhite__12J2DTextBoxExCFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const {
     if ((u32)param_0 == 0 && (u32)param_1 == 0xffffffff) {
         return 1;
@@ -456,7 +431,6 @@ bool J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor pa
     return 1;
 }
 
-/* 803086FC-8030875C 30303C 0060+00 1/0 0/0 0/0 .text            getBlack__12J2DTextBoxExCFv */
 JUtility::TColor J2DTextBoxEx::getBlack() const {
     JUtility::TColor black;
     JUtility::TColor white;
@@ -466,7 +440,6 @@ JUtility::TColor J2DTextBoxEx::getBlack() const {
     return black;
 }
 
-/* 8030875C-803087BC 30309C 0060+00 1/0 0/0 0/0 .text            getWhite__12J2DTextBoxExCFv */
 JUtility::TColor J2DTextBoxEx::getWhite() const {
     JUtility::TColor black;
     JUtility::TColor white;
@@ -476,7 +449,6 @@ JUtility::TColor J2DTextBoxEx::getWhite() const {
     return white;
 }
 
-/* 803087BC-803087DC 3030FC 0020+00 1/0 0/0 0/0 .text            setAlpha__12J2DTextBoxExFUc */
 void J2DTextBoxEx::setAlpha(u8 alpha) {
     mAlpha = alpha;
 
@@ -491,7 +463,6 @@ void J2DTextBoxEx::setAlpha(u8 alpha) {
     mMaterial->getColorBlock()->getMatColor(0)->a = alpha;
 }
 
-/* 803087DC-80308810 30311C 0034+00 1/0 0/0 0/0 .text setCullBack__12J2DTextBoxExF11_GXCullMode */
 void J2DTextBoxEx::setCullBack(GXCullMode mode) {
     mCullMode = mode;
 
@@ -502,7 +473,6 @@ void J2DTextBoxEx::setCullBack(GXCullMode mode) {
     J2DPane::setCullBack(mode);
 }
 
-/* 80308810-80308828 303150 0018+00 1/0 0/0 0/0 .text            rewriteAlpha__12J2DTextBoxExFv */
 void J2DTextBoxEx::rewriteAlpha() {
     if (mMaterial == NULL) {
         return;
@@ -511,8 +481,6 @@ void J2DTextBoxEx::rewriteAlpha() {
     mAlpha = mMaterial->getColorBlock()->getMatColor(0)->a;
 }
 
-/* 80308828-803088B4 303168 008C+00 1/0 0/0 0/0 .text            isUsed__12J2DTextBoxExFPC7ResFONT
- */
 bool J2DTextBoxEx::isUsed(ResFONT const* p_font) {
     if (getFont() != NULL && getFont()->getResFont() == p_font) {
         return true;
@@ -521,46 +489,34 @@ bool J2DTextBoxEx::isUsed(ResFONT const* p_font) {
     return J2DPane::isUsed(p_font);
 }
 
-/* 803088B4-803088E0 3031F4 002C+00 1/0 0/0 0/0 .text setAnimation__12J2DTextBoxExFP11J2DAnmColor
- */
 void J2DTextBoxEx::setAnimation(J2DAnmColor* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 803088E0-8030890C 303220 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DTextBoxExFP19J2DAnmTextureSRTKey          */
 void J2DTextBoxEx::setAnimation(J2DAnmTextureSRTKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 8030890C-80308938 30324C 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DTextBoxExFP16J2DAnmTexPattern             */
 void J2DTextBoxEx::setAnimation(J2DAnmTexPattern* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80308938-80308964 303278 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DTextBoxExFP15J2DAnmTevRegKey              */
 void J2DTextBoxEx::setAnimation(J2DAnmTevRegKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80308964-8030896C -00001 0008+00 0/0 0/0 0/0 .text
- * setAnimation__12J2DTextBoxExFP20J2DAnmVisibilityFull         */
 void J2DTextBoxEx::setAnimation(J2DAnmVisibilityFull* anm) {
     mVisibilityAnm = anm;
 }
 
-/* 8030896C-803089EC 3032AC 0080+00 1/0 0/0 0/0 .text
- * animationPane__12J2DTextBoxExFPC15J2DAnmTransform            */
 const J2DAnmTransform* J2DTextBoxEx::animationPane(J2DAnmTransform const* param_0) {
     if (mVisibilityAnm != NULL && field_0x13c != 0xffff) {
         u8 visibility;
@@ -574,25 +530,18 @@ const J2DAnmTransform* J2DTextBoxEx::animationPane(J2DAnmTransform const* param_
     return J2DPane::animationPane(param_0);
 }
 
-/* 803089EC-80308A28 30332C 003C+00 1/0 0/0 0/0 .text            setCullBack__12J2DTextBoxExFb */
 void J2DTextBoxEx::setCullBack(bool param_0) {
     setCullBack(param_0 ? GX_CULL_BACK : GX_CULL_NONE);
 }
 
-/* 80308A28-80308A48 303368 0020+00 1/0 0/0 0/0 .text            isUsed__12J2DTextBoxExFPC7ResTIMG
- */
 bool J2DTextBoxEx::isUsed(ResTIMG const* p_timg) {
     return J2DPane::isUsed(p_timg);
 }
 
-/* 80308A48-80308A4C 303388 0004+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DTextBoxExFP14J2DAnmVtxColor               */
 void J2DTextBoxEx::setAnimation(J2DAnmVtxColor* param_0) {
     /* empty function */
 }
 
-/* 80308A4C-80308A6C 30338C 0020+00 1/0 0/0 0/0 .text setAnimation__12J2DTextBoxExFP10J2DAnmBase
- */
 void J2DTextBoxEx::setAnimation(J2DAnmBase* anm) {
     J2DPane::setAnimation(anm);
 }
diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp
index 92d56429a0..3196f9b4f1 100644
--- a/src/JSystem/J2DGraph/J2DWindow.cpp
+++ b/src/JSystem/J2DGraph/J2DWindow.cpp
@@ -6,7 +6,6 @@
 #include "JSystem/JUtility/JUTResource.h"
 #include "JSystem/JUtility/JUTTexture.h"
 
-/* 802F9A7C-802F9B74 2F43BC 00F8+00 0/0 1/1 0/0 .text            __ct__9J2DWindowFv */
 J2DWindow::J2DWindow()
     : field_0x100(NULL), field_0x104(NULL), field_0x108(NULL), field_0x10c(NULL), field_0x110(NULL),
       mPalette(NULL) {
@@ -16,8 +15,6 @@ J2DWindow::J2DWindow()
     mWhite = JUtility::TColor(0xffffffff);
 }
 
-/* 802F9B74-802F9C10 2F44B4 009C+00 0/0 1/1 0/0 .text
- * __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2)
     : field_0x100(NULL), field_0x104(NULL), field_0x108(NULL), field_0x10c(NULL), field_0x110(NULL),
       mPalette(NULL) {
@@ -39,8 +36,6 @@ struct J2DWindowData {
     u32 field_0x30[4];
 };
 
-/* 802F9C10-802FA118 2F4550 0508+00 0/0 1/1 0/0 .text
- * __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */
 J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, J2DMaterial* param_2) : 
     field_0x100(NULL),
     field_0x104(NULL),
@@ -149,8 +144,6 @@ J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, J2DMateria
     initinfo2();
 }
 
-/* 802FA118-802FA604 2F4A58 04EC+00 1/1 0/0 0/0 .text
- * private_readStream__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP10JKRArchive */
 void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param_1,
                                    JKRArchive* param_2) {
     s32 local_188 = param_1->getPosition();
@@ -212,7 +205,6 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param
     initinfo2();
 }
 
-/* 802FA604-802FA880 2F4F44 027C+00 2/2 0/0 0/0 .text            initinfo2__9J2DWindowFv */
 void J2DWindow::initinfo2() {
     if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) {
         field_0x140 = field_0x100->getWidth() + field_0x104->getWidth();
@@ -237,7 +229,6 @@ void J2DWindow::initinfo2() {
     }
 }
 
-/* 802FA880-802FA928 2F51C0 00A8+00 1/0 1/1 0/0 .text            __dt__9J2DWindowFv */
 J2DWindow::~J2DWindow() {
     delete field_0x100;
     delete field_0x104;
@@ -247,7 +238,6 @@ J2DWindow::~J2DWindow() {
     delete field_0x110;
 }
 
-/* 802FA928-802FAA5C 2F5268 0134+00 1/0 0/0 0/0 .text draw__9J2DWindowFRCQ29JGeometry8TBox2<f> */
 void J2DWindow::draw(JGeometry::TBox2<f32> const& param_0) {
     JGeometry::TBox2<f32> stack_58;
     if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) {
@@ -260,8 +250,6 @@ void J2DWindow::draw(JGeometry::TBox2<f32> const& param_0) {
     draw(param_0, stack_58);
 }
 
-/* 802FAA5C-802FAED0 2F539C 0474+00 2/2 0/0 0/0 .text
- * draw_private__9J2DWindowFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindow::draw_private(JGeometry::TBox2<f32> const& param_0,
                              JGeometry::TBox2<f32> const& param_1) {
     JGeometry::TBox2<f32> stack_a0(param_1);
@@ -355,8 +343,6 @@ void J2DWindow::draw_private(JGeometry::TBox2<f32> const& param_0,
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 802FAED0-802FB000 2F5810 0130+00 1/0 0/0 0/0 .text
- * draw__9J2DWindowFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindow::draw(JGeometry::TBox2<f32> const& param_0, JGeometry::TBox2<f32> const& param_1) {
     if (param_0.getWidth() >= field_0x140 && param_0.getHeight() >= field_0x142 && isVisible()) {
         makeMatrix(param_0.i.x, param_0.i.y, 0, 0);
@@ -371,7 +357,6 @@ void J2DWindow::draw(JGeometry::TBox2<f32> const& param_0, JGeometry::TBox2<f32>
     }
 }
 
-/* 802FB000-802FB12C 2F5940 012C+00 1/0 1/0 0/0 .text            resize__9J2DWindowFff */
 void J2DWindow::resize(f32 param_0, f32 param_1) {
     f32 f31 = getWidth();
     f32 f30 = getHeight();
@@ -398,14 +383,12 @@ void J2DWindow::setContentsColor(JUtility::TColor param_0, JUtility::TColor para
     field_0x134.set(param_3);
 }
 
-/* 802FB1D8-802FB240 2F5B18 0068+00 1/0 1/0 0/0 .text            drawSelf__9J2DWindowFff */
 void J2DWindow::drawSelf(f32 param_0, f32 param_1) {
     Mtx stack_38;
     MTXIdentity(stack_38);
     drawSelf(param_0, param_1, &stack_38);
 }
 
-/* 802FB240-802FB338 2F5B80 00F8+00 1/0 0/0 0/0 .text            drawSelf__9J2DWindowFffPA3_A4_f */
 void J2DWindow::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     JGeometry::TBox2<f32> stack_50(mBounds);
     stack_50.addPos(JGeometry::TVec2<f32>(param_0, param_1));
@@ -418,8 +401,6 @@ void J2DWindow::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
     clip(field_0x114);
 }
 
-/* 802FB338-802FB634 2F5C78 02FC+00 1/0 0/0 0/0 .text
- * drawContents__9J2DWindowFRCQ29JGeometry8TBox2<f>             */
 void J2DWindow::drawContents(JGeometry::TBox2<f32> const& param_0) {
     if (param_0.isValid()) {
         GXSetNumChans(1);
@@ -477,8 +458,6 @@ void J2DWindow::drawContents(JGeometry::TBox2<f32> const& param_0) {
     }
 }
 
-/* 802FB634-802FB7C8 2F5F74 0194+00 2/2 0/0 0/0 .text
- * drawFrameTexture__9J2DWindowFP10JUTTextureffffUsUsUsUsb      */
 void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, f32 param_3,
                                  f32 param_4, u16 param_5, u16 param_6, u16 param_7, u16 param_8,
                                  bool param_9) {
@@ -507,8 +486,6 @@ void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2,
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
 }
 
-/* 802FB7C8-802FB868 2F6108 00A0+00 1/1 0/0 0/0 .text
- * drawFrameTexture__9J2DWindowFP10JUTTextureffbbb              */
 void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, bool param_3,
                                  bool param_4, bool param_5) {
     u16 r31 = param_4 ? u16(0x8000) : u16(0);
@@ -519,7 +496,6 @@ void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2,
                      r30, r31, param_5);
 }
 
-/* 802FB868-802FBB90 2F61A8 0328+00 1/1 0/0 0/0 .text drawContentsTexture__9J2DWindowFffff */
 void J2DWindow::drawContentsTexture(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     f32 f29 = param_0 + param_2;
     f32 f28 = param_1 + param_3;
@@ -559,8 +535,6 @@ void J2DWindow::drawContentsTexture(f32 param_0, f32 param_1, f32 param_2, f32 p
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
 }
 
-/* 802FBB90-802FBE60 2F64D0 02D0+00 2/2 0/0 0/0 .text
- * setTevMode__9J2DWindowFP10JUTTextureQ28JUtility6TColorQ28JUtility6TColor */
 void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1,
                            JUtility::TColor param_2) {
     if (param_1 == 0 && param_2 == 0xffffffff) {
@@ -600,8 +574,6 @@ void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1,
     GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET);
 }
 
-/* 802FBE60-802FBEDC 2F67A0 007C+00 1/0 0/0 0/0 .text            getFrameTexture__9J2DWindowCFUcUc
- */
 JUTTexture* J2DWindow::getFrameTexture(u8 param_0, u8 param_1) const {
     JUTTexture* tmp[4] = {NULL, NULL, NULL, NULL};
     tmp[0] = field_0x100;
@@ -614,7 +586,6 @@ JUTTexture* J2DWindow::getFrameTexture(u8 param_0, u8 param_1) const {
     return tmp[param_0];
 }
 
-/* 802FBEDC-802FBF98 2F681C 00BC+00 1/0 0/0 0/0 .text            isUsed__9J2DWindowFPC7ResTIMG */
 bool J2DWindow::isUsed(ResTIMG const* param_0) {
     JUTTexture* tmp[5] = {NULL, NULL, NULL, NULL, NULL};
     tmp[0] = field_0x100;
@@ -630,18 +601,14 @@ bool J2DWindow::isUsed(ResTIMG const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 802FBF98-802FBFA0 2F68D8 0008+00 1/0 1/0 0/0 .text            getTypeID__9J2DWindowCFv */
 u16 J2DWindow::getTypeID() const {
     return 17;
 }
 
-/* 802FBFA0-802FBFE8 2F68E0 0048+00 1/0 0/0 0/0 .text            draw__9J2DWindowFffff */
 void J2DWindow::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     draw(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3));
 }
 
-/* 802FBFE8-802FC000 2F6928 0018+00 1/0 0/0 0/0 .text            getContentsTexture__9J2DWindowCFUc
- */
 JUTTexture* J2DWindow::getContentsTexture(u8 param_0) const {
     if (param_0 != 0) {
         return NULL;
@@ -649,8 +616,6 @@ JUTTexture* J2DWindow::getContentsTexture(u8 param_0) const {
     return field_0x110;
 }
 
-/* 802FC000-802FC01C 2F6940 001C+00 1/0 0/0 0/0 .text
- * getMaterial__9J2DWindowCFRQ29J2DWindow9TMaterial             */
 void J2DWindow::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x0 = NULL;
     param_0.field_0x4 = NULL;
@@ -659,23 +624,18 @@ void J2DWindow::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x10 = NULL;
 }
 
-/* 802FC01C-802FC024 2F695C 0008+00 1/0 0/0 0/0 .text            getFrameMaterial__9J2DWindowCFUc */
 J2DMaterial* J2DWindow::getFrameMaterial(u8 param_0) const {
     return NULL;
 }
 
-/* 802FC024-802FC02C 2F6964 0008+00 1/0 0/0 0/0 .text            getContentsMaterial__9J2DWindowCFv
- */
 J2DMaterial* J2DWindow::getContentsMaterial() const {
     return NULL;
 }
 
-/* 802FC02C-802FC04C 2F696C 0020+00 1/0 0/0 0/0 .text            isUsed__9J2DWindowFPC7ResFONT */
 bool J2DWindow::isUsed(ResFONT const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 802FC04C-802FC050 2F698C 0004+00 1/0 0/0 0/0 .text            rewriteAlpha__9J2DWindowFv */
 void J2DWindow::rewriteAlpha() {
     /* empty function */
 }
diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/src/JSystem/J2DGraph/J2DWindowEx.cpp
index 42b103047e..9ca9863acc 100644
--- a/src/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/src/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DWindowEx
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DWindowEx.h"
@@ -27,8 +22,6 @@ struct J2DWindowExDef {
 
 STATIC_ASSERT(sizeof(J2DWindowExDef) == 0x40);
 
-/* 80300C94-80300F80 2FB5D4 02EC+00 0/0 1/1 0/0 .text
- * __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
                              J2DMaterial* param_3) : J2DWindow() {
     mAnmVisibilityFull = NULL;
@@ -87,7 +80,6 @@ J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 pa
     setMinSize();
 }
 
-/* 80300F80-80301144 2FB8C0 01C4+00 1/1 0/0 0/0 .text            setMinSize__11J2DWindowExFv */
 void J2DWindowEx::setMinSize() {
     field_0x140 = 1;
     field_0x142 = 1;
@@ -111,7 +103,6 @@ void J2DWindowEx::setMinSize() {
                 + mFrameMaterial[2]->getTevBlock()->getTexture(0)->getHeight();
 }
 
-/* 80301144-8030122C 2FBA84 00E8+00 1/0 0/0 0/0 .text            __dt__11J2DWindowExFv */
 J2DWindowEx::~J2DWindowEx() {
     for (u8 i = 0; i < 4; i++) {
         if (field_0x170 & (1 << i)) {
@@ -124,8 +115,6 @@ J2DWindowEx::~J2DWindowEx() {
     }
 }
 
-/* 8030122C-803012CC 2FBB6C 00A0+00 1/0 0/0 0/0 .text            drawSelf__11J2DWindowExFffPA3_A4_f
- */
 void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     JGeometry::TBox2<f32> aTStack_50(mBounds);
     Mtx auStack_40;
@@ -136,8 +125,6 @@ void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     clip(field_0x114);
 }
 
-/* 803012CC-80301994 2FBC0C 06C8+00 2/2 0/0 0/0 .text
- * draw_private__11J2DWindowExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindowEx::draw_private(JGeometry::TBox2<f32> const& param_0,
                                JGeometry::TBox2<f32> const& param_1) {
     if (param_0.getWidth() >= field_0x140 && param_0.getHeight() >= field_0x142) {
@@ -318,8 +305,6 @@ static f32 dummy_literal() {
     return 0.0f;
 }
 
-/* 80301994-80301D74 2FC2D4 03E0+00 1/0 0/0 0/0 .text
- * drawContents__11J2DWindowExFRCQ29JGeometry8TBox2<f>          */
 void J2DWindowEx::drawContents(JGeometry::TBox2<f32> const& param_1) {
     if (!param_1.isValid() || mContentsMaterial == NULL)  {
         return;
@@ -398,8 +383,6 @@ void J2DWindowEx::drawContents(JGeometry::TBox2<f32> const& param_1) {
 }
 
 
-/* 80301D74-80301FC8 2FC6B4 0254+00 1/1 0/0 0/0 .text
- * drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb  */
 void J2DWindowEx::drawFrameTexture(f32 param_1, f32 param_2, f32 param_3, f32 param_4, u16 param_5,
                                    u16 param_6, u16 param_7, u16 param_8, J2DMaterial* param_9,
                                    bool param_10) {
@@ -446,8 +429,6 @@ void J2DWindowEx::drawFrameTexture(f32 param_1, f32 param_2, f32 param_3, f32 pa
     }
 }
 
-/* 80301FC8-80302164 2FC908 019C+00 1/0 0/0 0/0 .text draw__11J2DWindowExFRCQ29JGeometry8TBox2<f>
- */
 void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1) {
     bool isMissingTexture = false;
     JUTTexture* local_68[4];
@@ -474,8 +455,6 @@ void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1) {
     draw(param_1, aTStack_78);
 }
 
-/* 80302164-80302284 2FCAA4 0120+00 1/0 0/0 0/0 .text
- * draw__11J2DWindowExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1, JGeometry::TBox2<f32> const& param_2) {
     rewriteAlpha();
     mColorAlpha = mAlpha;
@@ -496,7 +475,6 @@ void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1, JGeometry::TBox2<f3
     GXLoadPosMtxImm(auStack_60, 0);
 }
 
-/* 80302284-80302388 2FCBC4 0104+00 1/1 0/0 0/0 .text            setTevOrder__11J2DWindowExFb */
 void J2DWindowEx::setTevOrder(bool param_0) {
     u16 local_28[2];
     if (!param_0) {
@@ -521,7 +499,6 @@ void J2DWindowEx::setTevOrder(bool param_0) {
     }
 }
 
-/* 80302388-803024B4 2FCCC8 012C+00 1/1 0/0 0/0 .text            setTevStage__11J2DWindowExFb */
 void J2DWindowEx::setTevStage(bool param_1) {
     for (int i = 0; i < 4; i++) {
         J2DTevStage* pJVar3 = mFrameMaterial[i]->getTevBlock()->getTevStage(0);
@@ -547,50 +524,40 @@ void J2DWindowEx::setTevStage(bool param_1) {
     }
 }
 
-/* 803A1C70-803A1C80 02E2D0 0010+00 0/0 0/0 0/0 .rodata          @1557 */
 static u8 const lit_1557[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata          @1566 */
 static u8 const lit_1566[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata          @1575 */
 static u8 const lit_1575[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 
-/* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata          @1581 */
 static u8 const lit_1581[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 
-/* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata          @1587 */
 static u8 const lit_1587[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata          @1596 */
 static u8 const lit_1596[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata          @1605 */
 static u8 const lit_1605[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata          @1612 */
 static u8 const lit_1612[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803024B4-80302764 2FCDF4 02B0+00 1/1 0/0 0/0 .text
- * setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum */
 void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1) {
     s8 local_30[6][4] = {
         {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x0a, 0x00, 0x0f},
@@ -616,8 +583,6 @@ void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1
 }
 
 
-/* 80302764-803027EC 2FD0A4 0088+00 1/0 0/0 0/0 .text setBlack__11J2DWindowExFQ28JUtility6TColor
- */
 bool J2DWindowEx::setBlack(JUtility::TColor black) {
     JUtility::TColor dummy,white;
 
@@ -628,8 +593,6 @@ bool J2DWindowEx::setBlack(JUtility::TColor black) {
     return setBlackWhite(black, white);
 }
 
-/* 803027EC-80302874 2FD12C 0088+00 1/0 0/0 0/0 .text setWhite__11J2DWindowExFQ28JUtility6TColor
- */
 bool J2DWindowEx::setWhite(JUtility::TColor white) {
     JUtility::TColor black,dummy;
 
@@ -640,8 +603,6 @@ bool J2DWindowEx::setWhite(JUtility::TColor white) {
     return setBlackWhite(black, white);
 }
 
-/* 80302874-80302A4C 2FD1B4 01D8+00 1/0 0/0 0/0 .text
- * setBlackWhite__11J2DWindowExFQ28JUtility6TColorQ28JUtility6TColor */
 // NONMATCHING - J2DGXColorS10 issue
 bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
     for (int i = 0; i < 4; i++) {
@@ -684,7 +645,6 @@ bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white)
     return true;
 }
 
-/* 80302A4C-80302BE8 2FD38C 019C+00 4/4 0/0 0/0 .text            getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor */
 bool J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const {
     if (mFrameMaterial[0] == NULL) {
         return false;
@@ -718,8 +678,6 @@ bool J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* par
     return true;
 }
 
-/* 80302BE8-80302C88 2FD528 00A0+00 1/1 0/0 0/0 .text
- * isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const {
     if ((u32)param_0 == 0 && (u32)param_1 == 0xffffffff) {
         return true;
@@ -732,7 +690,6 @@ bool J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor par
     return true;
 }
 
-/* 80302C88-80302CE8 2FD5C8 0060+00 1/0 0/0 0/0 .text            getBlack__11J2DWindowExCFv */
 JUtility::TColor J2DWindowEx::getBlack() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -742,7 +699,6 @@ JUtility::TColor J2DWindowEx::getBlack() const {
     return black;
 }
 
-/* 80302CE8-80302D48 2FD628 0060+00 1/0 0/0 0/0 .text            getWhite__11J2DWindowExCFv */
 JUtility::TColor J2DWindowEx::getWhite() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -752,7 +708,6 @@ JUtility::TColor J2DWindowEx::getWhite() const {
     return white;
 }
 
-/* 80302D48-80302D98 2FD688 0050+00 1/0 0/0 0/0 .text            setAlpha__11J2DWindowExFUc */
 void J2DWindowEx::setAlpha(u8 param_0) {
     mAlpha = param_0;
 
@@ -771,7 +726,6 @@ void J2DWindowEx::setAlpha(u8 param_0) {
     }
 }
 
-/* 80302D98-80302DF4 2FD6D8 005C+00 1/0 0/0 0/0 .text setCullBack__11J2DWindowExF11_GXCullMode */
 void J2DWindowEx::setCullBack(_GXCullMode param_0) {
     mCullMode = param_0;
 
@@ -787,14 +741,12 @@ void J2DWindowEx::setCullBack(_GXCullMode param_0) {
     J2DPane::setCullBack(param_0);
 }
 
-/* 80302DF4-80302E0C 2FD734 0018+00 1/0 0/0 0/0 .text            rewriteAlpha__11J2DWindowExFv */
 void J2DWindowEx::rewriteAlpha() {
     if (mContentsMaterial != NULL) {
         mAlpha = mContentsMaterial->getColorBlock()->getMatColor(0)->a;
     }
 }
 
-/* 80302E0C-80302E74 2FD74C 0068+00 1/0 0/0 0/0 .text getFrameTexture__11J2DWindowExCFUcUc */
 JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
     J2DMaterial* frameMaterial = getFrameMaterial(param_0);
     if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) {
@@ -803,7 +755,6 @@ JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
     return NULL;
 }
 
-/* 80302E74-80302EDC 2FD7B4 0068+00 1/0 0/0 0/0 .text getContentsTexture__11J2DWindowExCFUc */
 JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const {
     J2DMaterial* frameMaterial = getContentsMaterial();
     if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) {
@@ -812,7 +763,6 @@ JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const {
     return NULL;
 }
 
-/* 80302EDC-80302FFC 2FD81C 0120+00 1/0 0/0 0/0 .text            isUsed__11J2DWindowExFPC7ResTIMG */
 bool J2DWindowEx::isUsed(ResTIMG const* timg) {
     for (u8 i = 0; i < 4; i++) {
         if (mFrameMaterial[i] != NULL && mFrameMaterial[i]->getTevBlock() != NULL) {
@@ -837,8 +787,6 @@ bool J2DWindowEx::isUsed(ResTIMG const* timg) {
     return J2DPane::isUsed(timg);
 }
 
-/* 80302FFC-80303084 2FD93C 0088+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP11J2DAnmColor
- */
 void J2DWindowEx::setAnimation(J2DAnmColor* anmColor) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -850,8 +798,6 @@ void J2DWindowEx::setAnimation(J2DAnmColor* anmColor) {
     }
 }
 
-/* 80303084-8030310C 2FD9C4 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey           */
 void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -863,8 +809,6 @@ void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) {
     }
 }
 
-/* 8030310C-80303194 2FDA4C 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP16J2DAnmTexPattern              */
 void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -876,8 +820,6 @@ void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) {
     }
 }
 
-/* 80303194-8030321C 2FDAD4 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP15J2DAnmTevRegKey               */
 void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -889,7 +831,6 @@ void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) {
     }
 }
 
-/* 8030321C-80303274 2FDB5C 0058+00 4/4 0/0 0/0 .text            isNeedSetAnm__11J2DWindowExFUc */
 bool J2DWindowEx::isNeedSetAnm(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (mFrameMaterial[i] == mFrameMaterial[param_0]) {
@@ -899,14 +840,10 @@ bool J2DWindowEx::isNeedSetAnm(u8 param_0) {
     return mFrameMaterial[param_0] != NULL;
 }
 
-/* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull          */
 void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
     mAnmVisibilityFull = param_0;
 }
 
-/* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP14J2DAnmVtxColor                */
 void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
     mAnmVtxColor = param_0;
     field_0x17c = 0;
@@ -936,8 +873,6 @@ void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
     }
 }
 
-/* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text
- * animationPane__11J2DWindowExFPC15J2DAnmTransform             */
 const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0) {
     if (mAnmVisibilityFull != 0 && field_0x166 != 0xffff) {
         u8 visibility;
@@ -976,8 +911,6 @@ const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0
     return J2DPane::animationPane(param_0);
 }
 
-/* 80303510-80303534 2FDE50 0024+00 1/0 0/0 0/0 .text            getFrameMaterial__11J2DWindowExCFUc
- */
 J2DMaterial* J2DWindowEx::getFrameMaterial(u8 index) const {
     if (index >= 4) {
         return NULL;
@@ -986,13 +919,10 @@ J2DMaterial* J2DWindowEx::getFrameMaterial(u8 index) const {
     return mFrameMaterial[index];
 }
 
-/* 80303534-8030353C 2FDE74 0008+00 1/0 0/0 0/0 .text getContentsMaterial__11J2DWindowExCFv */
 J2DMaterial* J2DWindowEx::getContentsMaterial() const {
     return mContentsMaterial;
 }
 
-/* 8030353C-80303568 2FDE7C 002C+00 1/0 0/0 0/0 .text
- * getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial          */
 void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x0 = mFrameMaterial[0];
     param_0.field_0x4 = mFrameMaterial[1];
@@ -1001,13 +931,11 @@ void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x10 = mContentsMaterial;
 }
 
-/* 80303568-803035C0 2FDEA8 0058+00 1/0 0/0 0/0 .text            draw__11J2DWindowExFffff */
 void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     draw(JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(param_0, param_1),
                                JGeometry::TVec2<f32>(param_0 + param_2, param_1 + param_3)));
 }
 
-/* 803035C0-803035FC 2FDF00 003C+00 1/0 0/0 0/0 .text            setCullBack__11J2DWindowExFb */
 void J2DWindowEx::setCullBack(bool param_0) {
     _GXCullMode mode;
     if (param_0) {
@@ -1018,12 +946,10 @@ void J2DWindowEx::setCullBack(bool param_0) {
     setCullBack(mode);
 }
 
-/* 803035FC-8030361C 2FDF3C 0020+00 1/0 0/0 0/0 .text            isUsed__11J2DWindowExFPC7ResFONT */
 bool J2DWindowEx::isUsed(ResFONT const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 8030361C-8030363C 2FDF5C 0020+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP10J2DAnmBase */
 void J2DWindowEx::setAnimation(J2DAnmBase* param_0) {
     J2DPane::setAnimation(param_0);
 }
diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
index 28c2da8fd3..870871a88a 100644
--- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp
@@ -4,7 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/JMath/JMath.h"
 
-/* 803283FC-8032842C 322D3C 0030+00 0/0 25/25 285/285 .text            init__12J3DFrameCtrlFs */
 void J3DFrameCtrl::init(s16 endFrame) {
     mAttribute = EMode_LOOP;
     mState = 0;
@@ -15,8 +14,6 @@ void J3DFrameCtrl::init(s16 endFrame) {
     mFrame = 0.0f;
 }
 
-/* 8032842C-803289CC 322D6C 05A0+00 0/0 92/92 382/382 .text            checkPass__12J3DFrameCtrlFf
- */
 int J3DFrameCtrl::checkPass(f32 passFrame) {
     f32 next_frame = mFrame + mRate;
 
@@ -135,7 +132,6 @@ int J3DFrameCtrl::checkPass(f32 passFrame) {
 }
 
 
-/* 803289CC-80328E40 32330C 0474+00 0/0 3/3 0/0 .text            update__12J3DFrameCtrlFv */
 void J3DFrameCtrl::update() {
     mState = 0;
     mFrame += mRate;
@@ -206,7 +202,6 @@ void J3DFrameCtrl::update() {
     }
 }
 
-/* 80328E40-80328E90 323780 0050+00 0/0 3/3 0/0 .text            __ct__15J3DAnmTransformFsPfPsPf */
 J3DAnmTransform::J3DAnmTransform(s16 frameMax, f32* pScaleData, s16* pRotData, f32* pTransData)
  : J3DAnmBase(frameMax) {
     mScaleData = pScaleData;
@@ -218,8 +213,6 @@ J3DAnmTransform::J3DAnmTransform(s16 frameMax, f32* pScaleData, s16* pRotData, f
     field_0x1e = 0;
 }
 
-/* 80328E90-803291F0 3237D0 0360+00 1/0 0/0 0/0 .text
- * getTransform__19J3DAnmTransformFullCFUsP16J3DTransformInfo   */
 void J3DAnmTransformFull::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
     J3D_ASSERT_RANGE(317, jointNo >= 0 && jointNo < field_0x1e);
     J3D_ASSERT_NULLPTR(318, pTransform != NULL);
@@ -310,8 +303,6 @@ void J3DAnmTransformFull::getTransform(u16 jointNo, J3DTransformInfo* pTransform
     }
 }
 
-/* 803291F0-80329A34 323B30 0844+00 1/0 0/0 0/0 .text
- * getTransform__27J3DAnmTransformFullWithLerpCFUsP16J3DTransformInfo */
 void J3DAnmTransformFullWithLerp::getTransform(u16 jointNo, J3DTransformInfo* pTransform) const {
     J3D_ASSERT_RANGE(421, jointNo >= 0 && jointNo < field_0x1e);
     J3D_ASSERT_NULLPTR(422, pTransform != NULL);
@@ -520,6 +511,7 @@ inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
                                    register s16 const* pp3, register s16 const* pp4,
                                    register s16 const* pp5, register s16 const* pp6,
                                    register s16 const* pp7) {
+#ifdef __MWERKS__
     register f32 p1 = pp1;
     register f32 ff8;
     register f32 ff7;
@@ -561,6 +553,7 @@ inline f32 J3DHermiteInterpolation(register f32 pp1, register s16 const* pp2,
     }
     // clang-format on
     return fout;
+#endif
 }
 
 template<typename T>
@@ -614,8 +607,6 @@ f32 J3DGetKeyFrameInterpolation(f32 frame, J3DAnmKeyTableBase* pKeyTable, T* pDa
     }
 }
 
-/* 80329A34-80329E5C 324374 0428+00 0/0 1/1 0/0 .text
- * calcTransform__18J3DAnmTransformKeyCFfUsP16J3DTransformInfo  */
 void J3DAnmTransformKey::calcTransform(f32 frame, u16 jointNo, J3DTransformInfo* pTransform) const {
     J3D_ASSERT_RANGE(829, jointNo >= 0 && jointNo < field_0x1e);
     J3D_ASSERT_NULLPTR(830, pTransform != NULL);
@@ -734,7 +725,6 @@ void J3DAnmTransformKey::calcTransform(f32 frame, u16 jointNo, J3DTransformInfo*
     }
 }
 
-/* 80329E5C-80329F14 32479C 00B8+00 0/0 2/2 0/0 .text            __ct__19J3DAnmTextureSRTKeyFv */
 J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
     mDecShift = 0;
     mTrackNum = mScaleNum = mRotNum = mTransNum = 0;
@@ -748,8 +738,6 @@ J3DAnmTextureSRTKey::J3DAnmTextureSRTKey() {
     mTexMtxCalcType = 0;
 }
 
-/* 80329F14-8032A184 324854 0270+00 0/0 1/1 0/0 .text
- * calcTransform__19J3DAnmTextureSRTKeyCFfUsP17J3DTextureSRTInfo */
 void J3DAnmTextureSRTKey::calcTransform(f32 frame, u16 jointNo, J3DTextureSRTInfo* pTexSRTInfo) const {
     J3D_ASSERT_RANGE(992, jointNo >= 0 && jointNo < mTrackNum);
     J3D_ASSERT_NULLPTR(993, pTexSRTInfo != NULL);
@@ -820,8 +808,6 @@ void J3DAnmTextureSRTKey::calcTransform(f32 frame, u16 jointNo, J3DTextureSRTInf
     }
 }
 
-/* 8032A184-8032A218 324AC4 0094+00 1/0 0/0 0/0 .text            getWeight__17J3DAnmClusterFullCFUs
- */
 f32 J3DAnmClusterFull::getWeight(u16 index) const {
     int maxFrame = mAnmTable[index].mMaxFrame;
     int frame = (int)(mFrame + 0.5f);
@@ -835,8 +821,6 @@ f32 J3DAnmClusterFull::getWeight(u16 index) const {
     }
 }
 
-/* 8032A218-8032A29C 324B58 0084+00 1/0 0/0 0/0 .text            getWeight__16J3DAnmClusterKeyCFUs
- */
 f32 J3DAnmClusterKey::getWeight(u16 index) const {
     int maxFrame = (u16)mAnmTable[index].mWeightTable.mMaxFrame;
     switch (maxFrame) {
@@ -850,7 +834,6 @@ f32 J3DAnmClusterKey::getWeight(u16 index) const {
     }
 }
 
-/* 8032A29C-8032A30C 324BDC 0070+00 2/2 0/0 0/0 .text            __ct__14J3DAnmVtxColorFv */
 J3DAnmVtxColor::J3DAnmVtxColor() {
     for (int i = 0; i < 2; i++) {
         mAnmTableNum[i] = 0;
@@ -860,15 +843,12 @@ J3DAnmVtxColor::J3DAnmVtxColor() {
     }
 }
 
-/* 8032A30C-8032A368 324C4C 005C+00 0/0 1/1 0/0 .text            __ct__18J3DAnmVtxColorFullFv */
 J3DAnmVtxColorFull::J3DAnmVtxColorFull() {
     for (int i = 0; i < 2; i++) {
         mpTable[i] = NULL;
     }
 }
 
-/* 8032A368-8032A4E0 324CA8 0178+00 1/0 0/0 0/0 .text
- * getColor__18J3DAnmVtxColorFullCFUcUsP8_GXColor               */
 void J3DAnmVtxColorFull::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
     J3D_ASSERT_NULLPTR(1254, pColor != NULL);
     J3DAnmColorFullTable* entry = &mpTable[tableNo][index];
@@ -912,15 +892,12 @@ void J3DAnmVtxColorFull::getColor(u8 tableNo, u16 index, GXColor* pColor) const
     }
 }
 
-/* 8032A4E0-8032A53C 324E20 005C+00 0/0 1/1 0/0 .text            __ct__17J3DAnmVtxColorKeyFv */
 J3DAnmVtxColorKey::J3DAnmVtxColorKey() {
     for (int i = 0; i < 2; i++) {
         mpTable[i] = 0;
     }
 }
 
-/* 8032A53C-8032A828 324E7C 02EC+00 1/0 0/0 0/0 .text
- * getColor__17J3DAnmVtxColorKeyCFUcUsP8_GXColor                */
 void J3DAnmVtxColorKey::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
     J3D_ASSERT_NULLPTR(1338, pColor != NULL);
     J3DAnmColorKeyTable* entry = &mpTable[tableNo][index];
@@ -1003,13 +980,10 @@ void J3DAnmVtxColorKey::getColor(u8 tableNo, u16 index, GXColor* pColor) const {
     }
 }
 
-/* 8032A828-8032A8A4 325168 007C+00 2/2 0/0 0/0 .text            __ct__11J3DAnmColorFv */
 J3DAnmColor::J3DAnmColor() : field_0xc(0), field_0xe(0), field_0x10(0),
     field_0x12(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}
 
 
-/* 8032A8A4-8032A93C 3251E4 0098+00 0/0 1/1 0/0 .text
- * searchUpdateMaterialID__11J3DAnmColorFP16J3DMaterialTable    */
 void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     for (u16 i = 0; i < mUpdateMaterialNum; i++) {
         int index = pMatTable->getMaterialName()->getIndex(mUpdateMaterialName.getName(i));
@@ -1021,7 +995,6 @@ void J3DAnmColor::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     }
 }
 
-/* 8032A93C-8032A990 32527C 0054+00 0/0 1/1 0/0 .text            __ct__15J3DAnmColorFullFv */
 J3DAnmColorFull::J3DAnmColorFull() {
     mColorR = NULL;
     mColorG = NULL;
@@ -1030,7 +1003,6 @@ J3DAnmColorFull::J3DAnmColorFull() {
     mAnmTable = NULL;
 }
 
-/* 8032A990-8032AB00 3252D0 0170+00 1/0 0/0 0/0 .text getColor__15J3DAnmColorFullCFUsP8_GXColor */
 void J3DAnmColorFull::getColor(u16 index, GXColor* pColor) const {
     J3D_ASSERT_RANGE(1537, index >= 0 && index < mUpdateMaterialNum);
     J3D_ASSERT_NULLPTR(1538, pColor != NULL);
@@ -1075,7 +1047,6 @@ void J3DAnmColorFull::getColor(u16 index, GXColor* pColor) const {
     }
 }
 
-/* 8032AB00-8032AB54 325440 0054+00 0/0 1/1 0/0 .text            __ct__14J3DAnmColorKeyFv */
 J3DAnmColorKey::J3DAnmColorKey() {
     mColorR = NULL;
     mColorG = NULL;
@@ -1084,7 +1055,6 @@ J3DAnmColorKey::J3DAnmColorKey() {
     mAnmTable = NULL;
 }
 
-/* 8032AB54-8032AE18 325494 02C4+00 1/0 0/0 0/0 .text getColor__14J3DAnmColorKeyCFUsP8_GXColor */
 void J3DAnmColorKey::getColor(u16 index, GXColor* pColor) const {
     J3D_ASSERT_RANGE(1614, index >= 0 && index < mUpdateMaterialNum);
     J3D_ASSERT_NULLPTR(1615, pColor != NULL);
@@ -1168,7 +1138,6 @@ void J3DAnmColorKey::getColor(u16 index, GXColor* pColor) const {
     }
 }
 
-/* 8032AE18-8032AED8 325758 00C0+00 0/0 1/1 0/0 .text            __ct__15J3DAnmTevRegKeyFv */
 J3DAnmTevRegKey::J3DAnmTevRegKey() {
     mCRegUpdateMaterialNum = mKRegUpdateMaterialNum = 0;
 
@@ -1196,11 +1165,9 @@ J3DAnmTevRegKey::J3DAnmTevRegKey() {
 }
 
 
-/* 8032AED8-8032AF50 325818 0078+00 0/0 2/2 0/0 .text            __ct__16J3DAnmTexPatternFv */
 J3DAnmTexPattern::J3DAnmTexPattern() : mTextureIndex(NULL), mAnmTable(NULL),
     field_0x14(0), mUpdateMaterialNum(0), mUpdateMaterialID(NULL) {}
 
-/* 8032AF50-8032B004 325890 00B4+00 0/0 1/1 72/72 .text getTexNo__16J3DAnmTexPatternCFUsPUs */
 void J3DAnmTexPattern::getTexNo(u16 index, u16* pTexNo) const {
     u32 maxFrame = mAnmTable[index].mMaxFrame;
     J3D_ASSERT_RANGE(1743, index >= 0 && index < mUpdateMaterialNum);
@@ -1215,8 +1182,6 @@ void J3DAnmTexPattern::getTexNo(u16 index, u16* pTexNo) const {
     }
 }
 
-/* 8032B004-8032B09C 325944 0098+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__16J3DAnmTexPatternFP16J3DMaterialTable */
 void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     J3D_ASSERT_NULLPTR(1790, pMatTable != NULL);
 
@@ -1230,15 +1195,11 @@ void J3DAnmTexPattern::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     }
 }
 
-/* 8032B09C-8032B0C0 3259DC 0024+00 0/0 4/4 1/1 .text
- * searchUpdateMaterialID__16J3DAnmTexPatternFP12J3DModelData   */
 void J3DAnmTexPattern::searchUpdateMaterialID(J3DModelData* pModelData) {
     J3D_ASSERT_NULLPTR(1813, pModelData != NULL);
     searchUpdateMaterialID(&pModelData->getMaterialTable());
 }
 
-/* 8032B0C0-8032B1D4 325A00 0114+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP16J3DMaterialTable */
 void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     J3D_ASSERT_NULLPTR(1832, pMatTable != NULL);
 
@@ -1261,15 +1222,11 @@ void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     }
 }
 
-/* 8032B1D4-8032B1F8 325B14 0024+00 0/0 8/8 6/6 .text
- * searchUpdateMaterialID__19J3DAnmTextureSRTKeyFP12J3DModelData */
 void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* pModelData) {
     J3D_ASSERT_NULLPTR(1871, pModelData != NULL);
     searchUpdateMaterialID(&pModelData->getMaterialTable());
 }
 
-/* 8032B1F8-8032B4BC 325B38 02C4+00 0/0 2/2 1/1 .text
- * getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10          */
 void J3DAnmTevRegKey::getTevColorReg(u16 index, GXColorS10* pColor) const {
     J3D_ASSERT_RANGE(1887, index >= 0 && index < mCRegUpdateMaterialNum);
     J3D_ASSERT_NULLPTR(1888, pColor != NULL);
@@ -1353,8 +1310,6 @@ void J3DAnmTevRegKey::getTevColorReg(u16 index, GXColorS10* pColor) const {
     }
 }
 
-/* 8032B4BC-8032B780 325DFC 02C4+00 0/0 1/1 1/1 .text
- * getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor              */
 void J3DAnmTevRegKey::getTevKonstReg(u16 index, GXColor* pColor) const {
     J3D_ASSERT_RANGE(1989, index >= 0 && index < mKRegUpdateMaterialNum);
     J3D_ASSERT_NULLPTR(1990, pColor != NULL);
@@ -1438,8 +1393,6 @@ void J3DAnmTevRegKey::getTevKonstReg(u16 index, GXColor* pColor) const {
     }
 }
 
-/* 8032B780-8032B87C 3260C0 00FC+00 1/1 1/1 0/0 .text
- * searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable */
 void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     J3D_ASSERT_NULLPTR(2083, pMatTable != NULL);
 
@@ -1462,8 +1415,6 @@ void J3DAnmTevRegKey::searchUpdateMaterialID(J3DMaterialTable* pMatTable) {
     }
 }
 
-/* 8032B87C-8032B8A0 3261BC 0024+00 0/0 9/9 4/4 .text
- * searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData    */
 void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData* pModelData) {
     J3D_ASSERT_NULLPTR(2119, pModelData != NULL);
     searchUpdateMaterialID(&pModelData->getMaterialTable());
diff --git a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
index 7da3e013f5..da4370dc16 100644
--- a/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DCluster.cpp
@@ -6,7 +6,6 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "dolphin/base/PPCArch.h"
 
-/* 8032E1F8-8032E230 328B38 0038+00 0/0 1/1 0/0 .text            __ct__13J3DDeformDataFv */
 J3DDeformData::J3DDeformData() {
     mClusterNum = 0;
     mClusterKeyNum = 0;
@@ -22,23 +21,18 @@ J3DDeformData::J3DDeformData() {
     mClusterKeyName = NULL;
 }
 
-/* 8032E230-8032E274 328B70 0044+00 0/0 1/1 0/0 .text            offAllFlag__13J3DDeformDataFUl */
 void J3DDeformData::offAllFlag(u32 i_flag) {
     for (u16 i = 0; i < mClusterNum; i++) {
         mClusterPointer[i].getDeformer()->offFlag(i_flag);
     }
 }
 
-/* 8032E274-8032E298 328BB4 0024+00 0/0 1/1 0/0 .text            deform__13J3DDeformDataFP8J3DModel
- */
 void J3DDeformData::deform(J3DModel* model) {
     J3D_ASSERT_NULLPTR(110, model);
 
     deform(model->getVertexBuffer());
 }
 
-/* 8032E298-8032E364 328BD8 00CC+00 1/1 0/0 0/0 .text deform__13J3DDeformDataFP15J3DVertexBuffer
- */
 void J3DDeformData::deform(J3DVertexBuffer* buffer) {
     J3D_ASSERT_NULLPTR(141, buffer);
 
@@ -59,14 +53,12 @@ void J3DDeformData::deform(J3DVertexBuffer* buffer) {
     buffer->setCurrentVtxNrm(buffer->getVtxNrmArrayPointer(0));
 }
 
-/* 8032E364-8032E39C 328CA4 0038+00 0/0 1/1 0/0 .text setAnm__13J3DDeformDataFP13J3DAnmCluster */
 void J3DDeformData::setAnm(J3DAnmCluster* anm) {
     for (u16 i = 0; i < mClusterNum; i++) {
         mClusterPointer[i].getDeformer()->setAnmCluster(anm);
     }
 }
 
-/* 8032E39C-8032E3BC 328CDC 0020+00 0/0 1/1 0/0 .text __ct__11J3DDeformerFP13J3DDeformData */
 J3DDeformer::J3DDeformer(J3DDeformData* data) {
     mDeformData = data;
     mAnmCluster = NULL;
@@ -75,8 +67,6 @@ J3DDeformer::J3DDeformer(J3DDeformData* data) {
     mFlags = 3;
 }
 
-/* 8032E3BC-8032E4A4 328CFC 00E8+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUs
- */
 void J3DDeformer::deform(J3DVertexBuffer* buffer, u16 param_1) {
     J3D_ASSERT_NULLPTR(222, buffer);
 
@@ -95,8 +85,6 @@ void J3DDeformer::deform(J3DVertexBuffer* buffer, u16 param_1) {
     }
 }
 
-/* 8032E4A4-8032E60C 328DE4 0168+00 1/1 0/0 0/0 .text
- * deform_VtxPosF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf */
 void J3DDeformer::deform_VtxPosF32(J3DVertexBuffer* i_buffer, J3DCluster* i_cluster,
                                    J3DClusterKey* i_key, f32* i_weights) {
     J3DClusterKey* key;
@@ -137,8 +125,6 @@ void J3DDeformer::deform_VtxPosF32(J3DVertexBuffer* i_buffer, J3DCluster* i_clus
     }
 }
 
-/* 8032E60C-8032EAB4 328F4C 04A8+00 1/1 0/0 0/0 .text
- * deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf */
 // NONMATCHING one missing mr
 void J3DDeformer::deform_VtxNrmF32(J3DVertexBuffer* i_buffer, J3DCluster* i_cluster,
                                    J3DClusterKey* i_key, f32* i_weights) {
@@ -238,8 +224,6 @@ void J3DDeformer::deform_VtxNrmF32(J3DVertexBuffer* i_buffer, J3DCluster* i_clus
     }
 }
 
-/* 8032EAB4-8032EBCC 3293F4 0118+00 1/1 0/0 0/0 .text deform__11J3DDeformerFP15J3DVertexBufferUsPf
- */
 void J3DDeformer::deform(J3DVertexBuffer* i_buffer, u16 param_1, f32* i_weights) {
     J3D_ASSERT_NULLPTR(505, i_buffer != NULL);
 
@@ -268,8 +252,6 @@ void J3DDeformer::deform(J3DVertexBuffer* i_buffer, u16 param_1, f32* i_weights)
     }
 }
 
-/* 8032EBCC-8032EC28 32950C 005C+00 1/1 0/0 0/0 .text            normalizeWeight__11J3DDeformerFiPf
- */
 void J3DDeformer::normalizeWeight(int i_keyNum, f32* i_weights) {
     f32 totalWeight = 0.0f;
     for (u16 i = 0; i < i_keyNum; i++) {
diff --git a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
index f8dc69cf49..25d449c032 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJoint.cpp
@@ -8,8 +8,6 @@
 #include "JSystem/JMath/JMath.h"
 #include "m_Do/m_Do_mtx.h"
 
-/* 8032EC28-8032ECAC 329568 0084+00 0/0 1/1 0/0 .text
- * init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf            */
 void J3DMtxCalcJ3DSysInitBasic::init(Vec const& scale, Mtx const& mtx) {
     J3DSys::mCurrentS = scale;
     J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f};
@@ -17,8 +15,6 @@ void J3DMtxCalcJ3DSysInitBasic::init(Vec const& scale, Mtx const& mtx) {
                      J3DSys::mCurrentS.z);
 }
 
-/* 8032ECAC-8032ED30 3295EC 0084+00 0/0 2/2 2/2 .text
- * init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf             */
 void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
     J3DSys::mParentS = (Vec){1.0f, 1.0f, 1.0f};
     J3DSys::mCurrentS = scale;
@@ -26,10 +22,8 @@ void J3DMtxCalcJ3DSysInitMaya::init(Vec const& scale, Mtx const& mtx) {
                      J3DSys::mCurrentS.z);
 }
 
-/* 804515F0-804515F4 000AF0 0004+00 3/3 1/1 0/0 .sbss            mMtxBuffer__10J3DMtxCalc */
 J3DMtxBuffer* J3DMtxCalc::mMtxBuffer;
 
-/* 804515F4-804515F8 000AF4 0004+00 4/4 9/9 2/2 .sbss            mJoint__10J3DMtxCalc */
 J3DJoint* J3DMtxCalc::mJoint;
 
 inline s32 checkScaleOne(const Vec& param_0) {
@@ -40,8 +34,6 @@ inline s32 checkScaleOne(const Vec& param_0) {
     }
 }
 
-/* 8032ED30-8032EE50 329670 0120+00 0/0 1/1 0/0 .text
- * calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transInfo) {
     J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
     u16 jntNo = J3DMtxCalc::getJoint()->getJntNo();
@@ -65,8 +57,6 @@ void J3DMtxCalcCalcTransformBasic::calcTransform(J3DTransformInfo const& transIn
     MTXCopy(J3DSys::mCurrentMtx, anmMtx);
 }
 
-/* 8032EE50-8032EFBC 329790 016C+00 0/0 1/1 0/0 .text
- * calcTransform__32J3DMtxCalcCalcTransformSoftimageFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformSoftimage::calcTransform(J3DTransformInfo const& transInfo) {
     J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
     u16 jntNo = J3DMtxCalc::getJoint()->getJntNo();
@@ -96,8 +86,6 @@ void J3DMtxCalcCalcTransformSoftimage::calcTransform(J3DTransformInfo const& tra
     }
 }
 
-/* 8032EFBC-8032F13C 3298FC 0180+00 0/0 6/6 2/2 .text
- * calcTransform__27J3DMtxCalcCalcTransformMayaFRC16J3DTransformInfo */
 void J3DMtxCalcCalcTransformMaya::calcTransform(J3DTransformInfo const& transInfo) {
     J3DJoint* joint = J3DMtxCalc::getJoint();
     J3DMtxBuffer* mtxBuf = J3DMtxCalc::getMtxBuffer();
@@ -140,8 +128,6 @@ void J3DMtxCalcCalcTransformMaya::calcTransform(J3DTransformInfo const& transInf
     J3DSys::mParentS.z = transInfo.mScale.z;
 }
 
-/* 8032F13C-8032F170 329A7C 0034+00 0/0 1/1 0/0 .text            appendChild__8J3DJointFP8J3DJoint
- */
 void J3DJoint::appendChild(J3DJoint* pChild) {
     if (mChild == NULL) {
         mChild = pChild;
@@ -154,7 +140,6 @@ void J3DJoint::appendChild(J3DJoint* pChild) {
     }
 }
 
-/* 8032F170-8032F254 329AB0 00E4+00 0/0 1/1 0/0 .text            __ct__8J3DJointFv */
 J3DJoint::J3DJoint() {
     mCallBackUserData = NULL;
     mCallBack = NULL;
@@ -175,7 +160,6 @@ J3DJoint::J3DJoint() {
     mMax = init2;
 }
 
-/* 8032F254-8032F3F8 329B94 01A4+00 0/0 1/1 0/0 .text            entryIn__8J3DJointFv */
 void J3DJoint::entryIn() {
     MtxP anmMtx = j3dSys.getModel()->getAnmMtx(mJntNo);
     j3dSys.getDrawBuffer(0)->setZMtx(anmMtx);
@@ -208,10 +192,8 @@ void J3DJoint::entryIn() {
     }
 }
 
-/* 804515F8-80451600 000AF8 0004+04 1/1 1/1 0/0 .sbss            mCurrentMtxCalc__8J3DJoint */
 J3DMtxCalc* J3DJoint::mCurrentMtxCalc;
 
-/* 8032F3F8-8032F5A8 329D38 01B0+00 0/0 1/1 0/0 .text            recursiveCalc__8J3DJointFv */
 void J3DJoint::recursiveCalc() {
     J3DMtxCalc* prevMtxCalc = NULL;
     Mtx prevCurrentMtx;
diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
index 39e5456f3a..5d657c773a 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
@@ -14,7 +14,6 @@ enum {
     kTypeShape      = 0x12,
 };
 
-/* 80325A18-80325A9C 320358 0084+00 0/0 1/1 0/0 .text            __ct__12J3DJointTreeFv */
 J3DJointTree::J3DJointTree()
     : mHierarchy(NULL), mFlags(0), mModelDataType(0), mRootNode(NULL), mBasicMtxCalc(NULL),
       mJointNodePointer(NULL), mJointNum(0), mWEvlpMtxNum(0), mWEvlpMixMtxNum(0),
@@ -72,7 +71,6 @@ void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHi
     }
 }
 
-/* 80325C00-80325CAC 320540 00AC+00 0/0 2/2 0/0 .text findImportantMtxIndex__12J3DJointTreeFv */
 void J3DJointTree::findImportantMtxIndex() {
     s32 wEvlpMtxNum = getWEvlpMtxNum();
     u32 tableIdx = 0;
@@ -102,8 +100,6 @@ void J3DJointTree::findImportantMtxIndex() {
     }
 }
 
-/* 80325CAC-80325D1C 3205EC 0070+00 1/0 0/0 0/0 .text
- * calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf          */
 void J3DJointTree::calc(J3DMtxBuffer* pMtxBuffer, Vec const& scale, f32 const (&mtx)[3][4]) {
     J3D_ASSERT_NULLPTR(217, pMtxBuffer != NULL);
     getBasicMtxCalc()->init(scale, mtx);
@@ -117,8 +113,6 @@ void J3DJointTree::calc(J3DMtxBuffer* pMtxBuffer, Vec const& scale, f32 const (&
     root->recursiveCalc();
 }
 
-/* 80325D1C-80325D24 32065C 0008+00 1/1 0/0 0/0 .text setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer
- */
 void J3DMtxCalc::setMtxBuffer(J3DMtxBuffer* mtxBuffer) {
     J3DMtxCalc::mMtxBuffer = mtxBuffer;
 }
diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
index 13a183697e..ee148288a1 100644
--- a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 8032F5A8-8032F5D0 329EE8 0028+00 0/0 1/1 0/0 .text            clear__16J3DMaterialTableFv */
 void J3DMaterialTable::clear() {
     mMaterialNum = 0;
     mUniqueMatNum = 0;
@@ -17,7 +16,6 @@ void J3DMaterialTable::clear() {
     field_0x1c = 0;
 }
 
-/* 8032F5D0-8032F604 329F10 0034+00 0/0 2/2 0/0 .text            __ct__16J3DMaterialTableFv */
 J3DMaterialTable::J3DMaterialTable() {
     mMaterialNum = 0;
     mUniqueMatNum = 0;
@@ -29,11 +27,8 @@ J3DMaterialTable::J3DMaterialTable() {
     field_0x1c = 0;
 }
 
-/* 8032F604-8032F64C 329F44 0048+00 1/0 1/1 0/0 .text            __dt__16J3DMaterialTableFv */
 J3DMaterialTable::~J3DMaterialTable() {}
 
-/* 8032F64C-8032F6F8 329F8C 00AC+00 0/0 1/1 5/5 .text
- * removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor    */
 int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
     J3D_ASSERT_NULLPTR(208, pAnmColor != NULL);
     int ret = false;
@@ -54,8 +49,6 @@ int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor* pAnmColor) {
     return ret;
 }
 
-/* 8032F6F8-8032F7B4 32A038 00BC+00 0/0 5/5 10/10 .text
- * removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern  */
 int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
     J3D_ASSERT_NULLPTR(242, pAnmTexPattern != NULL);
     int ret = 0;
@@ -78,8 +71,6 @@ int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
     return ret;
 }
 
-/* 8032F7B4-8032F880 32A0F4 00CC+00 0/0 4/4 26/26 .text
- * removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
     J3D_ASSERT_NULLPTR(278, pAnmTexSRTKey != NULL);
     s32 ret = 0;
@@ -105,8 +96,6 @@ int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
     return ret;
 }
 
-/* 8032F880-8032F9C0 32A1C0 0140+00 0/0 7/7 24/24 .text
- * removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey  */
 int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
     J3D_ASSERT_NULLPTR(320, pAnmTevRegKey != NULL);
     s32 ret = 0;
@@ -144,8 +133,6 @@ int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
     return ret;
 }
 
-/* 8032F9C0-8032FAF4 32A300 0134+00 1/1 0/0 0/0 .text
- * createTexMtxForAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
     J3D_ASSERT_NULLPTR(382, pTexSRTKey != NULL);
     int rv = 0;
@@ -178,8 +165,6 @@ int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) {
     return rv;
 }
 
-/* 8032FAF4-8032FBC8 32A434 00D4+00 0/0 1/1 0/0 .text
- * entryMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor     */
 int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
     J3D_ASSERT_NULLPTR(450, pAnmColor != NULL);
     int rv = 0;
@@ -205,8 +190,6 @@ int J3DMaterialTable::entryMatColorAnimator(J3DAnmColor* pAnmColor) {
     return rv;
 }
 
-/* 8032FBC8-8032FCC4 32A508 00FC+00 0/0 7/7 1/1 .text
- * entryTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern   */
 int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
     J3D_ASSERT_NULLPTR(489, pAnmTexPattern != NULL);
     int rv = 0;
@@ -234,8 +217,6 @@ int J3DMaterialTable::entryTexNoAnimator(J3DAnmTexPattern* pAnmTexPattern) {
     return rv;
 }
 
-/* 8032FCC4-8032FE70 32A604 01AC+00 0/0 14/14 6/6 .text
- * entryTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */
 int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
     J3D_ASSERT_NULLPTR(532, pAnmTexSRTKey != NULL);
     int rv = 0;
@@ -278,8 +259,6 @@ int J3DMaterialTable::entryTexMtxAnimator(J3DAnmTextureSRTKey* pAnmTexSRTKey) {
     return rv;
 }
 
-/* 8032FE70-8032FFEC 32A7B0 017C+00 0/0 10/10 4/4 .text
- * entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey   */
 int J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey* pAnmTevRegKey) {
     J3D_ASSERT_NULLPTR(599, pAnmTevRegKey != NULL);
     int rv = 0;
diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
index 2bb68f80c3..8e61611c86 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -8,7 +8,6 @@
 #define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG)
 #define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1)
 
-/* 80327100-80327184 321A40 0084+00 0/0 3/3 0/0 .text            initialize__8J3DModelFv */
 void J3DModel::initialize() {
     mModelData = NULL;
     mFlags = 0;
@@ -33,8 +32,6 @@ void J3DModel::initialize() {
     mUnkCalc2 = NULL;
 }
 
-/* 80327184-80327300 321AC4 017C+00 0/0 3/3 0/0 .text
- * entryModelData__8J3DModelFP12J3DModelDataUlUl                */
 s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum) {
     J3D_ASSERTMSG(83, pModelData != NULL, "Error : null pointer.");
     J3D_ASSERTMSG(84, mtxNum != 0, "Error : non-zero argument is specified 0.");
@@ -95,8 +92,6 @@ s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum)
     return kJ3DError_Success;
 }
 
-/* 80327300-803273CC 321C40 00CC+00 1/1 0/0 0/0 .text createShapePacket__8J3DModelFP12J3DModelData
- */
 s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
     J3D_ASSERTMSG(173, pModelData != NULL, "Error : null pointer.");
 
@@ -116,8 +111,6 @@ s32 J3DModel::createShapePacket(J3DModelData* pModelData) {
     return kJ3DError_Success;
 }
 
-/* 803273CC-803275FC 321D0C 0230+00 1/1 0/0 0/0 .text createMatPacket__8J3DModelFP12J3DModelDataUl
- */
 s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) {
     J3D_ASSERTMSG(207, pModelData != NULL, "Error : null pointer.");
     s32 ret = 0;
@@ -200,7 +193,6 @@ s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) {
     return kJ3DError_Success;
 }
 
-/* 803275FC-8032767C 321F3C 0080+00 0/0 1/1 0/0 .text newDifferedDisplayList__8J3DModelFUl */
 s32 J3DModel::newDifferedDisplayList(u32 diffFlags) {
     mDiffFlag = diffFlags;
 
@@ -232,7 +224,6 @@ void J3DModel::ptrToIndex() {
     }
 }
 
-/* 8032767C-803276B4 321FBC 0038+00 0/0 4/4 0/0 .text            lock__8J3DModelFv */
 void J3DModel::lock() {
     int matNum = mModelData->getMaterialNum();
     for (int i = 0; i < matNum; i++) {
@@ -240,7 +231,6 @@ void J3DModel::lock() {
     }
 }
 
-/* 803276B4-803276EC 321FF4 0038+00 0/0 2/2 0/0 .text            unlock__8J3DModelFv */
 void J3DModel::unlock() {
     int matNum = mModelData->getMaterialNum();
     for (int i = 0; i < matNum; i++) {
@@ -259,7 +249,6 @@ void J3DModel::makeDL() {
     }
 }
 
-/* 803276EC-80327858 32202C 016C+00 1/0 0/0 0/0 .text            calcMaterial__8J3DModelFv */
 void J3DModel::calcMaterial() {
     j3dSys.setModel(this);
 
@@ -291,7 +280,6 @@ void J3DModel::calcMaterial() {
     }
 }
 
-/* 80327858-803279A0 322198 0148+00 1/0 0/0 0/0 .text            calcDiffTexMtx__8J3DModelFv */
 void J3DModel::calcDiffTexMtx() {
     j3dSys.setModel(this);
 
@@ -317,7 +305,6 @@ void J3DModel::calcDiffTexMtx() {
     }
 }
 
-/* 803279A0-80327A2C 3222E0 008C+00 0/0 2/2 0/0 .text            diff__8J3DModelFv */
 void J3DModel::diff() {
     u16 matNum = mModelData->getMaterialNum();
     for (u16 i = 0; i < matNum; i++) {
@@ -326,8 +313,6 @@ void J3DModel::diff() {
     }
 }
 
-/* 80327A2C-80327AA0 32236C 0074+00 0/0 1/1 2/2 .text setDeformData__8J3DModelFP13J3DDeformDataUl
- */
 s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
     mDeformData = p_deformData;
 
@@ -347,8 +332,6 @@ s32 J3DModel::setDeformData(J3DDeformData* p_deformData, u32 param_1) {
     return kJ3DError_Success;
 }
 
-/* 80327AA0-80327BD4 3223E0 0134+00 0/0 0/0 2/2 .text setSkinDeform__8J3DModelFP13J3DSkinDeformUl
- */
 s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
     mSkinDeform = p_skinDeform;
 
@@ -394,7 +377,6 @@ s32 J3DModel::setSkinDeform(J3DSkinDeform* p_skinDeform, u32 flags) {
     return ret;
 }
 
-/* 80327BD4-80327C58 322514 0084+00 1/1 0/0 2/2 .text            calcAnmMtx__8J3DModelFv */
 void J3DModel::calcAnmMtx() {
     j3dSys.setModel(this);
 
@@ -405,8 +387,6 @@ void J3DModel::calcAnmMtx() {
     }
 }
 
-/* 80327C58-80327CA4 322598 004C+00 1/1 1/1 1/1 .text            calcWeightEnvelopeMtx__8J3DModelFv
- */
 void J3DModel::calcWeightEnvelopeMtx() {
     if (getModelData()->getWEvlpMtxNum() != 0 && !checkFlag(J3DMdlFlag_EnableLOD)) {
         if (!getModelData()->checkFlag(0x100)) {
@@ -415,13 +395,11 @@ void J3DModel::calcWeightEnvelopeMtx() {
     }
 }
 
-/* 80327CA4-80327CF0 3225E4 004C+00 1/0 0/0 0/0 .text            update__8J3DModelFv */
 void J3DModel::update() {
     calc();
     entry();
 }
 
-/* 80327CF0-80327E4C 322630 015C+00 1/0 0/0 0/0 .text            calc__8J3DModelFv */
 void J3DModel::calc() {
     j3dSys.setModel(this);
 
@@ -468,7 +446,6 @@ void J3DModel::calc() {
     }
 }
 
-/* 80327E4C-80327F40 32278C 00F4+00 1/0 0/0 0/0 .text            entry__8J3DModelFv */
 void J3DModel::entry() {
     j3dSys.setModel(this);
 
@@ -495,7 +472,6 @@ void J3DModel::entry() {
     }
 }
 
-/* 80327F40-80328190 322880 0250+00 1/0 0/0 0/0 .text            viewCalc__8J3DModelFv */
 void J3DModel::viewCalc() {
     mMtxBuffer->swapDrawMtx();
     mMtxBuffer->swapNrmMtx();
@@ -532,12 +508,10 @@ void J3DModel::viewCalc() {
     prepareShapePackets();
 }
 
-/* 80328190-803281B4 322AD0 0024+00 1/1 0/0 0/0 .text            calcNrmMtx__8J3DModelFv */
 void J3DModel::calcNrmMtx() {
     mMtxBuffer->calcNrmMtx();
 }
 
-/* 803281B4-803282B8 322AF4 0104+00 1/1 0/0 0/0 .text            calcBumpMtx__8J3DModelFv */
 void J3DModel::calcBumpMtx() {
     if (getModelData()->checkBumpFlag()) {
         u32 bumpMtxIdx = 0;
@@ -555,14 +529,12 @@ void J3DModel::calcBumpMtx() {
     }
 }
 
-/* 803282B8-803282EC 322BF8 0034+00 1/1 0/0 0/0 .text            calcBBoardMtx__8J3DModelFv */
 void J3DModel::calcBBoardMtx() {
     if (getModelData()->checkBBoardFlag()) {
         mMtxBuffer->calcBBoardMtx();
     }
 }
 
-/* 803282EC-80328350 322C2C 0064+00 2/2 0/0 0/0 .text            prepareShapePackets__8J3DModelFv */
 void J3DModel::prepareShapePackets() {
     u16 shapeNum = mModelData->getShapeNum();
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
index 5137202534..2cec1f6a4d 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 
-/* 80325D88-80325DA0 3206C8 0018+00 1/1 2/2 0/0 .text            clear__12J3DModelDataFv */
 void J3DModelData::clear() {
     mpRawData = 0;
     mFlags = 0;
@@ -17,12 +16,10 @@ void J3DModelData::clear() {
     mbHasBillboard = 0;
 }
 
-/* 80325DA0-80325E14 3206E0 0074+00 0/0 2/2 0/0 .text            __ct__12J3DModelDataFv */
 J3DModelData::J3DModelData() {
     clear();
 }
 
-/* 80325E14-80325EC8 320754 00B4+00 0/0 2/2 0/0 .text newSharedDisplayList__12J3DModelDataFUl */
 s32 J3DModelData::newSharedDisplayList(u32 mdlFlags) {
     u16 matNum = getMaterialNum();
 
@@ -42,7 +39,6 @@ s32 J3DModelData::newSharedDisplayList(u32 mdlFlags) {
     return kJ3DError_Success;
 }
 
-/* 80325EC8-80325F94 320808 00CC+00 0/0 1/1 0/0 .text            indexToPtr__12J3DModelDataFv */
 void J3DModelData::indexToPtr() {
     j3dSys.setTexture(getTexture());
 
@@ -65,7 +61,6 @@ void J3DModelData::indexToPtr() {
     OSRestoreInterrupts(sInterruptFlag);
 }
 
-/* 80325F94-8032600C 3208D4 0078+00 0/0 2/2 0/0 .text            makeSharedDL__12J3DModelDataFv */
 void J3DModelData::makeSharedDL() {
     j3dSys.setTexture(getTexture());
 
@@ -75,8 +70,6 @@ void J3DModelData::makeSharedDL() {
     }
 }
 
-/* 8032600C-803260CC 32094C 00C0+00 0/0 3/3 7/7 .text simpleCalcMaterial__12J3DModelDataFUsPA4_f
- */
 void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
     syncJ3DSysFlags();
 
@@ -90,7 +83,6 @@ void J3DModelData::simpleCalcMaterial(u16 idx, Mtx param_1) {
     }
 }
 
-/* 803260CC-803260F8 320A0C 002C+00 0/0 1/1 0/0 .text syncJ3DSysPointers__12J3DModelDataCFv */
 void J3DModelData::syncJ3DSysPointers() const {
     j3dSys.setTexture(getTexture());
     j3dSys.setVtxPos(getVtxPosArray());
@@ -98,8 +90,6 @@ void J3DModelData::syncJ3DSysPointers() const {
     j3dSys.setVtxCol(getVtxColorArray(0));
 }
 
-/* 803260F8-80326134 320A38 003C+00 1/1 5/5 0/0 .text            syncJ3DSysFlags__12J3DModelDataCFv
- */
 void J3DModelData::syncJ3DSysFlags() const {
     if (checkFlag(0x20)) {
         j3dSys.onFlag(J3DSysFlag_PostTexMtx);
diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
index cfbc054c37..8aeab2520f 100644
--- a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
@@ -5,16 +5,12 @@
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 804371C0-804371F0 063EE0 0030+00 1/0 0/0 0/0 .bss             sNoUseDrawMtx__12J3DMtxBuffer */
 Mtx J3DMtxBuffer::sNoUseDrawMtx;
 
-/* 804371F0-80437218 063F10 0024+04 1/0 0/0 0/0 .bss             sNoUseNrmMtx__12J3DMtxBuffer */
 Mtx33 J3DMtxBuffer::sNoUseNrmMtx;
 
-/* 80450970-80450974 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseDrawMtxPtr__12J3DMtxBuffer */
 Mtx* J3DMtxBuffer::sNoUseDrawMtxPtr = &J3DMtxBuffer::sNoUseDrawMtx;
 
-/* 80450974-80450978 -00001 0004+00 1/1 0/0 0/0 .sdata           sNoUseNrmMtxPtr__12J3DMtxBuffer */
 Mtx33* J3DMtxBuffer::sNoUseNrmMtxPtr = &J3DMtxBuffer::sNoUseNrmMtx;
 
 // force .sdata2 order
@@ -26,7 +22,6 @@ f32 dummy0() {
     return 0.0f;
 }
 
-/* 80326214-80326258 320B54 0044+00 0/0 1/1 0/0 .text            initialize__12J3DMtxBufferFv */
 void J3DMtxBuffer::initialize() {
     mJointTree = NULL;
     mpScaleFlagArr = NULL;
@@ -44,7 +39,6 @@ void J3DMtxBuffer::initialize() {
     mpUserAnmMtx = NULL;
 }
 
-/* 80326258-80326364 320B98 010C+00 0/0 1/1 0/0 .text create__12J3DMtxBufferFP12J3DModelDataUl */
 enum {
     J3DMdlDataFlag_ConcatView = 0x10,
     J3DMdlDataFlag_NoAnimation = 0x100,
@@ -96,8 +90,6 @@ s32 J3DMtxBuffer::create(J3DModelData* pModelData, u32 mtxNum) {
     return ret;
 }
 
-/* 80326364-803263F0 320CA4 008C+00 1/1 0/0 0/0 .text createAnmMtx__12J3DMtxBufferFP12J3DModelData
- */
 J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
     if (pModelData->getJointNum() != 0) {
         mpScaleFlagArr = new u8[pModelData->getJointNum()];
@@ -115,8 +107,6 @@ J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) {
     return kJ3DError_Success;
 }
 
-/* 803263F0-8032648C 320D30 009C+00 1/1 0/0 0/0 .text
- * createWeightEnvelopeMtx__12J3DMtxBufferFP12J3DModelData      */
 s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
     if (pModelData->getWEvlpMtxNum() != 0) {
         mpEvlpScaleFlagArr = new u8[pModelData->getWEvlpMtxNum()];
@@ -131,8 +121,6 @@ s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) {
     return kJ3DError_Success;
 }
 
-/* 8032648C-803264B8 320DCC 002C+00 1/1 0/0 0/0 .text            setNoUseDrawMtx__12J3DMtxBufferFv
- */
 s32 J3DMtxBuffer::setNoUseDrawMtx() {
     mpDrawMtxArr[0] = mpDrawMtxArr[1] = &sNoUseDrawMtxPtr;
     mpNrmMtxArr[0] = mpNrmMtxArr[1] = &sNoUseNrmMtxPtr;
@@ -140,8 +128,6 @@ s32 J3DMtxBuffer::setNoUseDrawMtx() {
     return kJ3DError_Success;
 }
 
-/* 803264B8-80326664 320DF8 01AC+00 1/1 0/0 0/0 .text
- * createDoubleDrawMtx__12J3DMtxBufferFP12J3DModelDataUl        */
 s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
     if (mtxNum != 0) {
         for (s32 i = 0; i < 2; i++) {
@@ -183,8 +169,6 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) {
     return kJ3DError_Success;
 }
 
-/* 80326664-803268D4 320FA4 0270+00 1/1 0/0 0/0 .text
- * createBumpMtxArray__12J3DMtxBufferFP12J3DModelDataUl         */
 s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
     J3D_ASSERT_NULLPTR(295, i_modelData != NULL);
 
@@ -250,10 +234,8 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) {
     return kJ3DError_Success;
 }
 
-/* 80450978-80450980 0003F8 0008+00 1/1 0/0 0/0 .sdata           J3DUnit01 */
 static f32 J3DUnit01[] = { 0.0f, 1.0f };
 
-/* 803268D4-80326ACC 321214 01F8+00 0/0 1/1 0/0 .text calcWeightEnvelopeMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcWeightEnvelopeMtx() {
     register MtxP weightAnmMtx;
     register Mtx* worldMtx;
@@ -418,8 +400,6 @@ void J3DMtxBuffer::calcWeightEnvelopeMtx() {
     }
 }
 
-/* 80326ACC-80326D3C 32140C 0270+00 0/0 1/1 0/0 .text
- * calcDrawMtx__12J3DMtxBufferFUlRC3VecRA3_A4_Cf                */
 void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param_2) {
     Mtx* sp24, *sp20;
     int sp1C = 0;
@@ -469,7 +449,6 @@ void J3DMtxBuffer::calcDrawMtx(u32 mdlFlag, Vec const& param_1, Mtx const& param
     }
 }
 
-/* 80326D3C-80326EF0 32167C 01B4+00 0/0 1/1 0/0 .text            calcNrmMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcNrmMtx() {
     u16 drawMtxNum = mJointTree->getDrawMtxNum();
     for (u16 i = 0; i < drawMtxNum; i++) {
@@ -489,7 +468,6 @@ void J3DMtxBuffer::calcNrmMtx() {
     }
 }
 
-/* 80326EF0-80327048 321830 0158+00 0/0 1/1 0/0 .text            calcBBoardMtx__12J3DMtxBufferFv */
 void J3DMtxBuffer::calcBBoardMtx() {
     u16 drawMtxNum = mJointTree->getDrawMtxNum();
     for (u16 i = 0; i < drawMtxNum; i++) {
@@ -519,8 +497,6 @@ void J3DMtxBuffer::calcBBoardMtx() {
     }
 }
 
-/* 80327048-80327100 321988 00B8+00 1/1 1/1 0/0 .text
- * J3DCalcViewBaseMtx__FPA4_fRC3VecRA3_A4_CfPA4_f               */
 void J3DCalcViewBaseMtx(Mtx view, Vec const& scale, const Mtx& base, Mtx dst) {
     Mtx m;
 
diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
index 8c3efdd0fa..79234158a9 100644
--- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include <string.h>
 
-/* 8032C6E4-8032C704 327024 0020+00 1/1 0/0 0/0 .text            __ct__12J3DSkinNListFv */
 J3DSkinNList::J3DSkinNList() {
     field_0x0 = NULL;
     field_0x4 = NULL;
@@ -15,7 +14,6 @@ J3DSkinNList::J3DSkinNList() {
     field_0x12 = 0;
 }
 
-/* 8032C704-8032C7BC 327044 00B8+00 1/1 0/0 0/0 .text J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec */
 static void J3DPSWeightMTXMultVec(f32 (*param_0)[4], f32 param_1, Vec* param_2, Vec* param_3) {
     f32 f4 = param_0[0][3] + param_0[0][0] * param_2->x;
     f32 f5 = param_0[1][3] + param_0[1][0] * param_2->x;
@@ -31,8 +29,6 @@ static void J3DPSWeightMTXMultVec(f32 (*param_0)[4], f32 param_1, Vec* param_2,
     param_3->z += f3 * param_1;
 }
 
-/* 8032C7BC-8032C85C 3270FC 00A0+00 1/1 0/0 0/0 .text J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec
- */
 static void J3DPSWeightMTXMultVecSR(f32 (*param_0)[4], f32 param_1, Vec* param_2,
                                     Vec* param_3) {
     f32 f4 = param_0[0][0] * param_2->x;
@@ -49,8 +45,6 @@ static void J3DPSWeightMTXMultVecSR(f32 (*param_0)[4], f32 param_1, Vec* param_2
     param_3->z += f3 * param_1;
 }
 
-/* 8032C85C-8032C8E4 32719C 0088+00 1/1 0/0 0/0 .text calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv
- */
 void J3DSkinNList::calcSkin_VtxPosF32(f32 (*param_0)[4], void* param_1, void* param_2) {
     int r29 = field_0x10;
     for (int i = 0; i < r29; i++) {
@@ -61,8 +55,6 @@ void J3DSkinNList::calcSkin_VtxPosF32(f32 (*param_0)[4], void* param_1, void* pa
     }
 }
 
-/* 8032C8E4-8032C96C 327224 0088+00 1/1 0/0 0/0 .text calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv
- */
 void J3DSkinNList::calcSkin_VtxNrmF32(f32 (*param_0)[4], void* param_1, void* param_2) {
     int r29 = field_0x12;
     for (int i = 0; i < r29; i++) {
@@ -73,7 +65,6 @@ void J3DSkinNList::calcSkin_VtxNrmF32(f32 (*param_0)[4], void* param_1, void* pa
     }
 }
 
-/* 8032C96C-8032C9B0 3272AC 0044+00 0/0 0/0 2/2 .text            __ct__13J3DSkinDeformFv */
 J3DSkinDeform::J3DSkinDeform() {
     mPosData = NULL;
     mNrmData = NULL;
@@ -87,14 +78,10 @@ J3DSkinDeform::J3DSkinDeform() {
     mSkinNList = NULL;
 }
 
-/* 80437218-80438218 063F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixMtx__13J3DSkinDeform */
 u16* J3DSkinDeform::sWorkArea_WEvlpMixMtx[1024];
 
-/* 80438218-80439218 064F38 1000+00 1/1 0/0 0/0 .bss sWorkArea_WEvlpMixWeight__13J3DSkinDeform */
 f32* J3DSkinDeform::sWorkArea_WEvlpMixWeight[1024];
 
-/* 8032C9B0-8032CF44 3272F0 0594+00 0/0 1/1 0/0 .text
- * initSkinInfo__13J3DSkinDeformFP12J3DModelData                */
 void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
     J3D_ASSERT_NULLPTR(322, pModelData != NULL);
 
@@ -206,12 +193,8 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) {
     }
 }
 
-/* 80439218-80439A20 065F38 0800+08 1/1 0/0 0/0 .bss             sWorkArea_MtxReg__13J3DSkinDeform
- */
 u16 J3DSkinDeform::sWorkArea_MtxReg[1024];
 
-/* 8032CF44-8032D378 327884 0434+00 0/0 1/1 0/0 .text
- * initMtxIndexArray__13J3DSkinDeformFP12J3DModelData           */
 int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
     J3D_ASSERT_NULLPTR(507, pModelData != NULL);
     if (mPosData != NULL && mNrmData != NULL) {
@@ -364,8 +347,6 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) {
     return kJ3DError_Success;
 }
 
-/* 8032D378-8032D5C4 327CB8 024C+00 0/0 1/1 0/0 .text
- * changeFastSkinDL__13J3DSkinDeformFP12J3DModelData            */
 // NONMATCHING - instruction ordering/optimization issue, matches debug
 // the compiler needs to delay adding +3 to dl until the end of the while loop for the function to match
 // but instead it puts the +3 at the start of the for loop and reworks the other instructions
@@ -439,8 +420,6 @@ void J3DSkinDeform::changeFastSkinDL(J3DModelData* pModelData) {
     }
 }
 
-/* 8032D5C4-8032D738 327F04 0174+00 1/1 0/0 0/0 .text calcNrmMtx__13J3DSkinDeformFP12J3DMtxBuffer
- */
 void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* pMtxBuffer) {
     J3DJointTree* jointTree = pMtxBuffer->getJointTree();
     u16 drawMtxNum = jointTree->getDrawMtxNum();
@@ -461,8 +440,6 @@ void J3DSkinDeform::calcNrmMtx(J3DMtxBuffer* pMtxBuffer) {
     }
 }
 
-/* 8032D738-8032D87C 328078 0144+00 0/0 1/1 0/0 .text
- * transformVtxPosNrm__13J3DSkinDeformFP12J3DModelData          */
 void J3DSkinDeform::transformVtxPosNrm(J3DModelData* pModelData) {
     if (pModelData->getWEvlpMtxNum() != 0 && field_0x19 == 0) {
         int vtmNum = pModelData->getVtxNum();
@@ -494,8 +471,6 @@ void J3DSkinDeform::transformVtxPosNrm(J3DModelData* pModelData) {
     }
 }
 
-/* 8032D87C-8032D8F4 3281BC 0078+00 1/1 0/0 0/0 .text
- * calcAnmInvJointMtx__13J3DSkinDeformFP12J3DMtxBuffer          */
 void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* pMtxBuffer) {
     J3D_ASSERT_NULLPTR(978, pMtxBuffer != NULL);
 
@@ -510,8 +485,6 @@ void J3DSkinDeform::calcAnmInvJointMtx(J3DMtxBuffer* pMtxBuffer) {
     }
 }
 
-/* 8032D8F4-8032DA1C 328234 0128+00 1/1 0/0 0/0 .text
- * deformFastVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
     pVtxBuffer->swapTransformedVtxPos();
     J3DJointTree* jointTree = pMtxBuffer->getJointTree();
@@ -540,8 +513,6 @@ void J3DSkinDeform::deformFastVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuff
     pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }
 
-/* 8032DA1C-8032DB50 32835C 0134+00 1/1 0/0 0/0 .text
- * deformFastVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
     pVtxBuffer->swapTransformedVtxNrm();
     J3DJointTree* jointTree = pMtxBuffer->getJointTree();
@@ -574,8 +545,6 @@ void J3DSkinDeform::deformFastVtxNrm_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuff
     pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
-/* 8032DB50-8032DC74 328490 0124+00 1/1 0/0 0/0 .text
- * deformVtxPos_F32__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
     Mtx* anmMtx = NULL;
     Mtx* anmMtxs[2];
@@ -598,8 +567,6 @@ void J3DSkinDeform::deformVtxPos_F32(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer*
     pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }
 
-/* 8032DC74-8032DDB8 3285B4 0144+00 1/1 0/0 0/0 .text
- * deformVtxPos_S16__13J3DSkinDeformCFP15J3DVertexBufferP12J3DMtxBuffer */
 void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) const {
     Mtx* anmMtx = NULL;
     Mtx* anmMtxs[2];
@@ -624,8 +591,6 @@ void J3DSkinDeform::deformVtxPos_S16(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer*
     pVtxBuffer->setCurrentVtxPos(transformedVtxPos);
 }
 
-/* 8032DDB8-8032DEBC 3286F8 0104+00 1/1 0/0 0/0 .text
- * deformVtxNrm_F32__13J3DSkinDeformCFP15J3DVertexBuffer        */
 void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* pVtxBuffer) const {
     pVtxBuffer->swapTransformedVtxNrm();
     int nrmNum = pVtxBuffer->getVertexData()->getNrmNum();
@@ -640,8 +605,6 @@ void J3DSkinDeform::deformVtxNrm_F32(J3DVertexBuffer* pVtxBuffer) const {
     pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
-/* 8032DEBC-8032DFDC 3287FC 0120+00 1/1 0/0 0/0 .text
- * deformVtxNrm_S16__13J3DSkinDeformCFP15J3DVertexBuffer        */
 void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* pVtxBuffer) const {
     int vtxNrmFrac = pVtxBuffer->getVertexData()->getVtxNrmFrac();
     J3DGQRSetup7(vtxNrmFrac, 7, vtxNrmFrac, 7);
@@ -659,8 +622,6 @@ void J3DSkinDeform::deformVtxNrm_S16(J3DVertexBuffer* pVtxBuffer) const {
     pVtxBuffer->setCurrentVtxNrm(transformedVtxNrm);
 }
 
-/* 8032DFDC-8032E064 32891C 0088+00 0/0 1/1 0/0 .text            deform__13J3DSkinDeformFP8J3DModel
- */
 void J3DSkinDeform::deform(J3DModel* pModel) {
     J3D_ASSERT_NULLPTR(1270, pModel != NULL);
 
@@ -679,8 +640,6 @@ void J3DSkinDeform::deform(J3DModel* pModel) {
     deform(pModel->getVertexBuffer(), pModel->getMtxBuffer());
 }
 
-/* 8032E064-8032E180 3289A4 011C+00 1/0 0/0 0/0 .text
- * deform__13J3DSkinDeformFP15J3DVertexBufferP12J3DMtxBuffer    */
 void J3DSkinDeform::deform(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer) {
     J3D_ASSERT_NULLPTR(1299, pVtxBuffer != NULL);
     J3D_ASSERT_NULLPTR(1300, pMtxBuffer != NULL);
@@ -715,12 +674,9 @@ void J3DSkinDeform::deform(J3DVertexBuffer* pVtxBuffer, J3DMtxBuffer* pMtxBuffer
     }
 }
 
-/* 8032E180-8032E1B0 328AC0 0030+00 0/0 1/1 0/0 .text            calc__15J3DVtxColorCalcFP8J3DModel
- */
 void J3DVtxColorCalc::calc(J3DModel* pModel) {
     J3D_ASSERT_NULLPTR(1351, pModel != NULL);
     calc(pModel->getVertexBuffer());
 }
 
-/* 8032E1B0-8032E1F8 328AF0 0048+00 1/0 0/0 0/0 .text            __dt__13J3DSkinDeformFv */
 J3DSkinDeform::~J3DSkinDeform() {}
diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
index a83eae3e33..03aa07bdd2 100644
--- a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+++ b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
@@ -43,7 +43,6 @@ J3DDrawBuffer::~J3DDrawBuffer() {
     mpBuffer = NULL;
 }
 
-/* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text            frameInit__13J3DDrawBufferFv */
 void J3DDrawBuffer::frameInit() {
     u32 bufSize = mEntryTableSize;
     for (u32 i = 0; i < bufSize; i++)
@@ -52,8 +51,6 @@ void J3DDrawBuffer::frameInit() {
     mpCallBackPacket = NULL;
 }
 
-/* 8032509C-803251E4 31F9DC 0148+00 2/1 0/0 0/0 .text
- * entryMatSort__13J3DDrawBufferFP12J3DMatPacket                */
 int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
     J3D_ASSERT_NULLPTR(122, pMatPacket != NULL);
 
@@ -97,8 +94,6 @@ int J3DDrawBuffer::entryMatSort(J3DMatPacket* pMatPacket) {
     return 1;
 }
 
-/* 803251E4-8032529C 31FB24 00B8+00 1/0 0/0 0/0 .text
- * entryMatAnmSort__13J3DDrawBufferFP12J3DMatPacket             */
 int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
     J3D_ASSERT_NULLPTR(199, pMatPacket != NULL);
 
@@ -131,8 +126,6 @@ int J3DDrawBuffer::entryMatAnmSort(J3DMatPacket* pMatPacket) {
     return 1;
 }
 
-/* 8032529C-803253B4 31FBDC 0118+00 1/0 0/0 0/0 .text entryZSort__13J3DDrawBufferFP12J3DMatPacket
- */
 int J3DDrawBuffer::entryZSort(J3DMatPacket* pMatPacket) {
     J3D_ASSERT_NULLPTR(257, pMatPacket != NULL);
 
@@ -163,8 +156,6 @@ int J3DDrawBuffer::entryZSort(J3DMatPacket* pMatPacket) {
     return 1;
 }
 
-/* 803253B4-80325404 31FCF4 0050+00 1/0 0/0 0/0 .text
- * entryModelSort__13J3DDrawBufferFP12J3DMatPacket              */
 int J3DDrawBuffer::entryModelSort(J3DMatPacket* pMatPacket) {
     J3D_ASSERT_NULLPTR(316, pMatPacket != NULL);
 
@@ -179,8 +170,6 @@ int J3DDrawBuffer::entryModelSort(J3DMatPacket* pMatPacket) {
     return 0;
 }
 
-/* 80325404-80325458 31FD44 0054+00 1/0 0/0 0/0 .text
- * entryInvalidSort__13J3DDrawBufferFP12J3DMatPacket            */
 int J3DDrawBuffer::entryInvalidSort(J3DMatPacket* pMatPacket) {
     J3D_ASSERT_NULLPTR(343, pMatPacket != NULL);
 
@@ -215,22 +204,18 @@ int J3DDrawBuffer::entryImm(J3DPacket* pPacket, u16 index) {
     return 1;
 }
 
-/* 803CEC30-803CEC78 02BD50 0048+00 0/1 1/1 0/0 .data            sortFuncTable__13J3DDrawBuffer */
 J3DDrawBuffer::sortFunc J3DDrawBuffer::sortFuncTable[6] = {
     &J3DDrawBuffer::entryMatSort,   &J3DDrawBuffer::entryMatAnmSort,  &J3DDrawBuffer::entryZSort,
     &J3DDrawBuffer::entryModelSort, &J3DDrawBuffer::entryInvalidSort, &J3DDrawBuffer::entryNonSort,
 };
 
-/* 803CEC90-803CECA8 02BDB0 0018+00 1/2 0/0 0/0 .data            drawFuncTable__13J3DDrawBuffer */
 J3DDrawBuffer::drawFunc J3DDrawBuffer::drawFuncTable[2] = {
     &J3DDrawBuffer::drawHead,
     &J3DDrawBuffer::drawTail,
 };
 
-/* 804515E0-804515E8 000AE0 0004+04 0/0 1/1 0/0 .sbss            entryNum__13J3DDrawBuffer */
 int J3DDrawBuffer::entryNum;
 
-/* 803254AC-80325500 31FDEC 0054+00 0/0 2/2 0/0 .text            draw__13J3DDrawBufferCFv */
 void J3DDrawBuffer::draw() const {
     J3D_ASSERT_RANGE(411, mDrawMode < J3DDrawBufDrawMode_MAX);
 
@@ -238,7 +223,6 @@ void J3DDrawBuffer::draw() const {
     (this->*func)();
 }
 
-/* 80325500-80325578 31FE40 0078+00 1/0 0/0 0/0 .text            drawHead__13J3DDrawBufferCFv */
 void J3DDrawBuffer::drawHead() const {
     u32 size = mEntryTableSize;
     J3DPacket** buf = mpBuffer;
@@ -250,7 +234,6 @@ void J3DDrawBuffer::drawHead() const {
     }
 }
 
-/* 80325578-803255F0 31FEB8 0078+00 1/0 0/0 0/0 .text            drawTail__13J3DDrawBufferCFv */
 void J3DDrawBuffer::drawTail() const {
     for (int i = mEntryTableSize - 1; i >= 0; i--) {
         for (J3DPacket* packet = mpBuffer[i]; packet != NULL; packet = packet->getNextPacket()) {
diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp
index 36953a7e3c..4a4c08105a 100644
--- a/src/JSystem/J3DGraphBase/J3DGD.cpp
+++ b/src/JSystem/J3DGraphBase/J3DGD.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DGD.h"
 #include "JSystem/J3DGraphBase/J3DFifo.h"
 
-/* 8030D098-8030D210 3079D8 0178+00 0/0 1/1 0/0 .text J3DGDSetGenMode__FUcUcUcUc11_GXCullMode */
 void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds,
                      GXCullMode cm) {
     static u8 cm2hw[4] = {0, 2, 1, 3};
@@ -17,14 +16,12 @@ void J3DGDSetGenMode(u8 nTexGens, u8 nChans, u8 nTevs, u8 nInds,
     J3DGDWriteBPCmd(BP_GEN_MODE(nTexGens, nChans, nTevs - 1, cm2hw[cm], nInds));
 }
 
-/* 8030D210-8030D364 307B50 0154+00 0/0 1/1 0/0 .text            J3DGDSetGenMode_3Param__FUcUcUc */
 void J3DGDSetGenMode_3Param(u8 nTexGens, u8 nTevs, u8 nInds) {
     GDOverflowCheck(10);
     J3DGDWriteBPCmd(0xFE073C0F);
     J3DGDWriteBPCmd(BP_GEN_MODE(nTexGens, 0, nTevs - 1, 0, nInds));
 }
 
-/* 8030D364-8030D65C 307CA4 02F8+00 0/0 1/1 0/0 .text J3DGDSetLightAttn__F10_GXLightIDffffff */
 void J3DGDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) {
     J3DGDWriteXFCmdHdr(XF_LIGHT_ATTN_ID + __GDLightID2Offset(light), 6);
     J3DGDWrite_f32(a0);
@@ -35,15 +32,11 @@ void J3DGDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1,
     J3DGDWrite_f32(k2);
 }
 
-/* 8030D65C-8030D76C 307F9C 0110+00 0/0 1/1 0/0 .text J3DGDSetLightColor__F10_GXLightID8_GXColor
- */
 void J3DGDSetLightColor(GXLightID light, GXColor color) {
     J3DGDWriteXFCmd(XF_LIGHT_COLOR_ID + __GDLightID2Offset(light),
                     (color.r << 24) | (color.g << 16) | (color.b << 8) | (color.a << 0));
 }
 
-/* 8030D76C-8030D938 3080AC 01CC+00 0/0 1/1 0/0 .text            J3DGDSetLightPos__F10_GXLightIDfff
- */
 void J3DGDSetLightPos(GXLightID light, f32 x, f32 y, f32 z) {
     J3DGDWriteXFCmdHdr(XF_LIGHT_POS_ID + __GDLightID2Offset(light), 3);
     J3DGDWrite_f32(x);
@@ -51,8 +44,6 @@ void J3DGDSetLightPos(GXLightID light, f32 x, f32 y, f32 z) {
     J3DGDWrite_f32(z);
 }
 
-/* 8030D938-8030DB04 308278 01CC+00 0/0 1/1 0/0 .text            J3DGDSetLightDir__F10_GXLightIDfff
- */
 void J3DGDSetLightDir(GXLightID light, f32 nx, f32 ny, f32 nz) {
     J3DGDWriteXFCmdHdr(XF_LIGHT_DIR_ID + __GDLightID2Offset(light), 3);
     J3DGDWrite_f32(nx);
@@ -60,8 +51,6 @@ void J3DGDSetLightDir(GXLightID light, f32 nx, f32 ny, f32 nz) {
     J3DGDWrite_f32(nz);
 }
 
-/* 8030DB04-8030E064 308444 0560+00 1/0 1/1 0/0 .text
- * J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb       */
 void J3DGDSetVtxAttrFmtv(GXVtxFmt vtxfmt, const GXVtxAttrFmtList* list, bool param_2) {
     u32 posCnt = GX_POS_XYZ;
     u32 posType = GX_F32;
@@ -192,8 +181,6 @@ void J3DGDSetVtxAttrFmtv(GXVtxFmt vtxfmt, const GXVtxAttrFmtList* list, bool par
     J3DGDWriteCPCmd(vtxfmt + CP_REG_VAT_GRP2_ID, CP_REG_VAT_GRP2(tx4Frac, tx5Cnt, tx5Type, tx5Frac, tx6Cnt, tx6Type, tx6Frac, tx7Cnt, tx7Type, tx7Frac));
 }
 
-/* 8030E064-8030E234 3089A4 01D0+00 1/0 1/1 0/0 .text
- * J3DGDSetTexCoordGen__F13_GXTexGenType12_GXTexGenSrc          */
 void J3DGDSetTexCoordGen(GXTexGenType func, GXTexGenSrc src_param) {
     u32 tgType;
     u32 form;
@@ -316,8 +303,6 @@ void J3DGDSetTexCoordGen(GXTexGenType func, GXTexGenSrc src_param) {
     J3DGDWrite_u32(XF_REG_TEX(proj, form, tgType, row, embossRow, embossLit));
 }
 
-/* 8030E234-8030E438 308B74 0204+00 0/0 16/16 0/0 .text
- * J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc         */
 void J3DGDSetTexCoordScale2(GXTexCoordID coord, u16 s_scale, u8 s_bias,
                             u8 s_wrap, u16 t_scale, u8 t_bias, u8 t_wrap) {
     GDOverflowCheck(15);
@@ -326,32 +311,26 @@ void J3DGDSetTexCoordScale2(GXTexCoordID coord, u16 s_scale, u8 s_bias,
     J3DGDWriteBPCmd(BP_TEXCOORD_T_SCALE(t_scale - 1, t_bias, t_wrap, coord * 2 + 0x31));
 }
 
-/* 8045090C-80450914 00038C 0008+00 1/1 0/0 0/0 .sdata           J3DGDTexMode0Ids */
 static u8 J3DGDTexMode0Ids[8] = {
     0x80, 0x81, 0x82, 0x83, 0xA0, 0xA1, 0xA2, 0xA3,
 };
 
-/* 80450914-8045091C 000394 0008+00 1/1 0/0 0/0 .sdata           J3DGDTexMode1Ids */
 static u8 J3DGDTexMode1Ids[8] = {
     0x84, 0x85, 0x86, 0x87, 0xA4, 0xA5, 0xA6, 0xA7,
 };
 
-/* 8045091C-80450924 00039C 0008+00 1/1 0/0 0/0 .sdata           J3DGDTexImage0Ids */
 static u8 J3DGDTexImage0Ids[8] = {
     0x88, 0x89, 0x8A, 0x8B, 0xA8, 0xA9, 0xAA, 0xAB,
 };
 
-/* 80450924-8045092C 0003A4 0008+00 2/2 0/0 0/0 .sdata           J3DGDTexImage3Ids */
 static u8 J3DGDTexImage3Ids[8] = {
     0x94, 0x95, 0x96, 0x97, 0xB4, 0xB5, 0xB6, 0xB7,
 };
 
-/* 8045092C-80450934 0003AC 0008+00 1/1 0/0 0/0 .sdata           J3DGDTexTlutIds */
 static u8 J3DGDTexTlutIds[8] = {
     0x98, 0x99, 0x9A, 0x9B, 0xB8, 0xB9, 0xBA, 0xBB,
 };
 
-/* 80450934-8045093C 0003B4 0006+02 1/1 0/0 0/0 .sdata           GX2HWFiltConv */
 static u8 GX2HWFiltConv[6] = {
     0x00, 0x04, 0x01, 0x05, 0x02, 0x06,
 };
@@ -368,32 +347,23 @@ void J3DGDSetTexLookupMode(GXTexMapID id, GXTexWrapMode wrap_s,
     J3DGDWriteBPCmd(BP_TEX_MODE1((u8)(16.0f * min_lod), (u8)(16.0f * max_lod), J3DGDTexMode1Ids[id]));
 }
 
-/* 8030E5D4-8030E67C 308F14 00A8+00 0/0 1/1 0/0 .text
- * J3DGDSetTexImgAttr__F11_GXTexMapIDUsUs9_GXTexFmt             */
 void J3DGDSetTexImgAttr(GXTexMapID id, u16 width, u16 height, GXTexFmt format) {
     J3DGDWriteBPCmd(BP_IMAGE_ATTR(width - 1, height - 1, format, J3DGDTexImage0Ids[id]));
 }
 
-/* 8030E67C-8030E70C 308FBC 0090+00 0/0 1/1 0/0 .text            J3DGDSetTexImgPtr__F11_GXTexMapIDPv
- */
 void J3DGDSetTexImgPtr(GXTexMapID id, void* image_ptr) {
     J3DGDWriteBPCmd(BP_IMAGE_PTR(OSCachedToPhysical(image_ptr) >> 5, J3DGDTexImage3Ids[id]));
 }
 
-/* 8030E70C-8030E7E0 30904C 00D4+00 0/0 1/1 0/0 .text J3DGDSetTexImgPtrRaw__F11_GXTexMapIDUl */
 void J3DGDSetTexImgPtrRaw(GXTexMapID id, u32 image_ptr_raw) {
     GDOverflowCheck(5);
     J3DGDWriteBPCmd(BP_IMAGE_PTR(image_ptr_raw, J3DGDTexImage3Ids[id]));
 }
 
-/* 8030E7E0-8030E878 309120 0098+00 0/0 1/1 0/0 .text
- * J3DGDSetTexTlut__F11_GXTexMapIDUl10_GXTlutFmt                */
 void J3DGDSetTexTlut(GXTexMapID id, u32 tmem_addr, GXTlutFmt format) {
     J3DGDWriteBPCmd(BP_TEX_TLUT((tmem_addr - 0x80000) >> 9, format, J3DGDTexTlutIds[id]));
 }
 
-/* 8030E878-8030EB30 3091B8 02B8+00 0/0 1/1 0/0 .text            J3DGDLoadTlut__FPvUl11_GXTlutSize
- */
 void J3DGDLoadTlut(void* tlut_ptr, u32 tmem_addr, GXTlutSize size) {
     ASSERTMSGLINE(735, !(tmem_addr & 0x1ff), "GDLoadTlut: invalid TMEM pointer");
     ASSERTMSGLINE(736, size <= 0x400, "GDLoadTlut: invalid TLUT size");
@@ -406,8 +376,6 @@ void J3DGDLoadTlut(void* tlut_ptr, u32 tmem_addr, GXTlutSize size) {
     J3DGDWriteBPCmd(0xF000000);
 }
 
-/* 8030EB30-8030EE10 309470 02E0+00 0/0 2/2 0/0 .text J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc
- */
 void J3DGDSetIndTexMtx(GXIndTexMtxID mtx_id, f32 offset[2][3], s8 scale_exp) {
     s32 offsetS32[6];
     u32 id_offset;
@@ -548,8 +516,6 @@ void J3DGDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID ma
     ));
 }
 
-/* 8030F294-8030F3FC 309BD4 0168+00 0/0 11/11 0/0 .text
- * J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor                */
 void J3DGDSetTevKColor(GXTevKColorID reg, GXColor color) {
     u32 regRA;
     u32 regBG;
@@ -562,8 +528,6 @@ void J3DGDSetTevKColor(GXTevKColorID reg, GXColor color) {
     J3DGDWriteBPCmd(regBG);
 }
 
-/* 8030F3FC-8030F630 309D3C 0234+00 0/0 11/11 0/0 .text
- * J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10             */
 void J3DGDSetTevColorS10(GXTevRegID reg, GXColorS10 color) {
     u32 regRA;
     u32 regBG;
@@ -578,7 +542,6 @@ void J3DGDSetTevColorS10(GXTevRegID reg, GXColorS10 color) {
     J3DGDWriteBPCmd(regBG);
 }
 
-/* 8030F630-8030F994 309F70 0364+00 0/0 3/3 0/0 .text J3DGDSetFog__F10_GXFogTypeffff8_GXColor */
 void J3DGDSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXColor color) {
     f32 A;
     f32 B;
@@ -644,8 +607,6 @@ void J3DGDSetFog(GXFogType type, f32 startz, f32 endz, f32 nearz, f32 farz, GXCo
         (u32)(arg1) << 10 \
     )
 
-/* 8030F994-8030FAE0 30A2D4 014C+00 0/0 3/3 0/0 .text J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable
- */
 void J3DGDSetFogRangeAdj(GXBool enable, u16 center, GXFogAdjTable* table) {
     if (enable) {
         for (int i = 0; i < 10; i += 2) {
@@ -658,7 +619,6 @@ void J3DGDSetFogRangeAdj(GXBool enable, u16 center, GXFogAdjTable* table) {
     J3DGDWriteBPCmd(range_c);
 }
 
-/* 8030FAE0-8030FB60 30A420 0080+00 0/0 10/10 0/0 .text            J3DFifoLoadPosMtxImm__FPA4_fUl */
 void J3DFifoLoadPosMtxImm(MtxP mtx, u32 id) {
     J3DFifoWriteXFCmdHdr(4 * id, 12);
     J3DGXCmd1f32ptr(&mtx[0][0]);
@@ -675,7 +635,6 @@ void J3DFifoLoadPosMtxImm(MtxP mtx, u32 id) {
     J3DGXCmd1f32ptr(&mtx[2][3]);
 }
 
-/* 8030FB60-8030FBCC 30A4A0 006C+00 0/0 9/9 0/0 .text            J3DFifoLoadNrmMtxImm__FPA4_fUl */
 void J3DFifoLoadNrmMtxImm(MtxP mtx, u32 id) {
     J3DFifoWriteXFCmdHdr(id * 3 + 0x400, 9);
     J3DGXCmd1f32ptr(&mtx[0][0]);
@@ -689,8 +648,6 @@ void J3DFifoLoadNrmMtxImm(MtxP mtx, u32 id) {
     J3DGXCmd1f32ptr(&mtx[2][2]);
 }
 
-/* 8030FBCC-8030FC38 30A50C 006C+00 0/0 3/3 0/0 .text            J3DFifoLoadNrmMtxImm3x3__FPA3_fUl
- */
 void J3DFifoLoadNrmMtxImm3x3(Mtx3P mtx, u32 id) {
     J3DFifoWriteXFCmdHdr(id * 3 + 0x400, 9);
     J3DGXCmd1f32ptr(&mtx[0][0]);
@@ -704,8 +661,6 @@ void J3DFifoLoadNrmMtxImm3x3(Mtx3P mtx, u32 id) {
     J3DGXCmd1f32ptr(&mtx[2][2]);
 }
 
-/* 8030FC38-8030FCD0 30A578 0098+00 0/0 4/4 0/0 .text            J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl
- */
 void J3DFifoLoadNrmMtxToTexMtx(MtxP mtx, u32 id) {
     J3DFifoWriteXFCmdHdr(4 * id, 12);
     J3DGXCmd1f32ptr(&mtx[0][0]);
@@ -722,7 +677,6 @@ void J3DFifoLoadNrmMtxToTexMtx(MtxP mtx, u32 id) {
     J3DGXCmd1f32(0.0f);
 }
 
-/* 8030FCD0-8030FD68 30A610 0098+00 0/0 2/2 0/0 .text J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl */
 void J3DFifoLoadNrmMtxToTexMtx3x3(Mtx3P mtx, u32 id) {
     J3DFifoWriteXFCmdHdr(4 * id, 0xc);
     J3DGXCmd1f32ptr(&mtx[0][0]);
@@ -739,18 +693,14 @@ void J3DFifoLoadNrmMtxToTexMtx3x3(Mtx3P mtx, u32 id) {
     J3DGXCmd1f32(0.0f);
 }
 
-/* 8045093C-80450944 0003BC 0008+00 1/1 0/0 0/0 .sdata           J3DTexImage1Ids */
 static u8 J3DTexImage1Ids[8] = {
     0x8C, 0x8D, 0x8E, 0x8F, 0xAC, 0xAD, 0xAE, 0xAF,
 };
 
-/* 80450944-8045094C 0003C4 0008+00 1/1 0/0 0/0 .sdata           J3DTexImage2Ids */
 static u8 J3DTexImage2Ids[8] = {
     0x90, 0x91, 0x92, 0x93, 0xB0, 0xB1, 0xB2, 0xB3,
 };
 
-/* 8030FD68-8030FDE8 30A6A8 0080+00 0/0 1/1 0/0 .text
- * J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize */
 void J3DFifoLoadTexCached(GXTexMapID id, u32 tmem_even, GXTexCacheSize size_even,
                           u32 tmem_odd, GXTexCacheSize size_odd) {
     J3DFifoLoadBPCmd(BP_TEX_CACHE_EVEN(tmem_even >> 5, size_even + 3, size_even + 3, 0, J3DTexImage1Ids[id]));
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index 6ce44d9384..0e3b64eef5 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -31,7 +31,6 @@ inline void loadTevKColor(u32 reg, const J3DGXColor& color) {
     J3DGDSetTevKColor(GXTevKColorID(reg), color);
 }
 
-/* 8031747C-803174DC 311DBC 0060+00 0/0 1/1 0/0 .text initialize__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::initialize() {
     mColorChanNum = 0;
     for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
@@ -41,7 +40,6 @@ void J3DColorBlockLightOff::initialize() {
     mColorChanOffset = 0;
 }
 
-/* 803174DC-80317580 311E1C 00A4+00 0/0 1/1 0/0 .text initialize__22J3DColorBlockAmbientOnFv */
 void J3DColorBlockAmbientOn::initialize() {
     mColorChanNum = 0;
     for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
@@ -54,7 +52,6 @@ void J3DColorBlockAmbientOn::initialize() {
     mColorChanOffset = 0;
 }
 
-/* 80317580-80317644 311EC0 00C4+00 0/0 1/1 0/0 .text initialize__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::initialize() {
     mColorChanNum = 0;
     for (int i = 0; i < ARRAY_SIZE(mMatColor); i++) {
@@ -70,7 +67,6 @@ void J3DColorBlockLightOn::initialize() {
     mColorChanOffset = 0;
 }
 
-/* 80317644-80317674 311F84 0030+00 0/0 2/2 0/0 .text initialize__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::initialize() {
     mTexGenNum = 0;
     for (int i = 0; i < 8; i++)
@@ -78,7 +74,6 @@ void J3DTexGenBlockPatched::initialize() {
     mTexMtxOffset = 0;
 }
 
-/* 80317674-803176A4 311FB4 0030+00 0/0 1/1 0/0 .text            initialize__15J3DTexGenBlock4Fv */
 void J3DTexGenBlock4::initialize() {
     mTexGenNum = 0;
     for (int i = 0; i < 4; i++)
@@ -86,8 +81,6 @@ void J3DTexGenBlock4::initialize() {
     mTexMtxOffset = 0;
 }
 
-/* 803176A4-803176D4 311FE4 0030+00 0/0 1/1 0/0 .text            initialize__19J3DTexGenBlockBasicFv
- */
 void J3DTexGenBlockBasic::initialize() {
     mTexGenNum = 0;
     for (int i = 0; i < 8; i++)
@@ -95,13 +88,10 @@ void J3DTexGenBlockBasic::initialize() {
     mTexMtxOffset = 0;
 }
 
-/* 803176D4-803176E0 312014 000C+00 0/0 1/1 0/0 .text            initialize__15J3DTevBlockNullFv */
 void J3DTevBlockNull::initialize() {
     mTexNoOffset = 0;
 }
 
-/* 803176E0-803177E8 312020 0108+00 0/0 1/1 0/0 .text            initialize__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::initialize() {
     for (int i = 0; i < ARRAY_SIZE(mTexNo); i++) {
         mTexNo[i] = 0xFFFF;
@@ -124,14 +114,12 @@ void J3DTevBlockPatched::initialize() {
     mTevRegOffset = 0;
 }
 
-/* 803177E8-80317810 312128 0028+00 0/0 1/1 0/0 .text            initialize__12J3DTevBlock1Fv */
 void J3DTevBlock1::initialize() {
     mTexNo[0] = 0xFFFF;
     mTevStage[0].setStageNo(0);
     mTexNoOffset = 0;
 }
 
-/* 80317810-803178EC 312150 00DC+00 0/0 1/1 0/0 .text            initialize__12J3DTevBlock2Fv */
 void J3DTevBlock2::initialize() {
     mTexNo[0] = 0xFFFF;
     mTexNo[1] = 0xFFFF;
@@ -155,7 +143,6 @@ void J3DTevBlock2::initialize() {
     mTevRegOffset = 0;
 }
 
-/* 803178EC-80317A00 31222C 0114+00 0/0 1/1 0/0 .text            initialize__12J3DTevBlock4Fv */
 void J3DTevBlock4::initialize() {
     mTexNo[0] = 0xFFFF;
     mTexNo[1] = 0xFFFF;
@@ -188,7 +175,6 @@ void J3DTevBlock4::initialize() {
     mTevRegOffset = 0;
 }
 
-/* 80317A00-80317B28 312340 0128+00 0/0 1/1 0/0 .text            initialize__13J3DTevBlock16Fv */
 void J3DTevBlock16::initialize() {
     for (int i = 0; i < ARRAY_SIZE(mTexNo); i++) {
         mTexNo[i] = 0xFFFF;
@@ -216,12 +202,10 @@ void J3DTevBlock16::initialize() {
     mTevRegOffset = 0;
 }
 
-/* 80317B28-80317B34 312468 000C+00 0/0 1/1 0/0 .text            initialize__15J3DIndBlockFullFv */
 void J3DIndBlockFull::initialize() {
     mIndTexStageNum = 0;
 }
 
-/* 80317B34-80317B58 312474 0024+00 0/0 1/1 0/0 .text            initialize__16J3DPEBlockFogOffFv */
 void J3DPEBlockFogOff::initialize() {
     mAlphaComp = 0xFFFF;
     mZMode = 0xFFFF;
@@ -229,7 +213,6 @@ void J3DPEBlockFogOff::initialize() {
     mDither = 1;
 }
 
-/* 80317B58-80317B84 312498 002C+00 0/0 1/1 0/0 .text            initialize__14J3DPEBlockFullFv */
 void J3DPEBlockFull::initialize() {
     mAlphaComp = 0xFFFF;
     mZMode = 0xFFFF;
@@ -238,109 +221,84 @@ void J3DPEBlockFull::initialize() {
     mFogOffset = 0;
 }
 
-/* 80317B84-80317B8C 3124C4 0008+00 1/0 0/0 0/0 .text countDLSize__21J3DColorBlockLightOffFv */
 s32 J3DColorBlockLightOff::countDLSize() {
     return 34;
 }
 
-/* 80317B8C-80317B94 3124CC 0008+00 1/0 0/0 0/0 .text countDLSize__22J3DColorBlockAmbientOnFv */
 s32 J3DColorBlockAmbientOn::countDLSize() {
     return 47;
 }
 
-/* 80317B94-80317B9C 3124D4 0008+00 1/0 0/0 0/0 .text countDLSize__20J3DColorBlockLightOnFv */
 s32 J3DColorBlockLightOn::countDLSize() {
     return 623;
 }
 
-/* 80317B9C-80317BA4 3124DC 0008+00 1/0 0/0 0/0 .text countDLSize__21J3DTexGenBlockPatchedFv */
 s32 J3DTexGenBlockPatched::countDLSize() {
     return 424;
 }
 
-/* 80317BA4-80317BAC 3124E4 0008+00 1/0 0/0 0/0 .text            countDLSize__15J3DTexGenBlock4Fv */
 s32 J3DTexGenBlock4::countDLSize() {
     return 254;
 }
 
-/* 80317BAC-80317BB4 3124EC 0008+00 1/0 0/0 0/0 .text countDLSize__19J3DTexGenBlockBasicFv */
 s32 J3DTexGenBlockBasic::countDLSize() {
     return 498;
 }
 
-/* 80317BB4-80317BBC 3124F4 0008+00 1/0 0/0 0/0 .text            countDLSize__18J3DTevBlockPatchedFv
- */
 s32 J3DTevBlockPatched::countDLSize() {
     return 560;
 }
 
-/* 80317BBC-80317BC4 3124FC 0008+00 1/0 0/0 0/0 .text            countDLSize__12J3DTevBlock1Fv */
 s32 J3DTevBlock1::countDLSize() {
     return 105;
 }
 
-/* 80317BC4-80317BCC 312504 0008+00 1/0 0/0 0/0 .text            countDLSize__12J3DTevBlock2Fv */
 s32 J3DTevBlock2::countDLSize() {
     return 335;
 }
 
-/* 80317BCC-80317BD4 31250C 0008+00 1/0 0/0 0/0 .text            countDLSize__12J3DTevBlock4Fv */
 s32 J3DTevBlock4::countDLSize() {
     return 580;
 }
 
-/* 80317BD4-80317BDC 312514 0008+00 1/0 0/0 0/0 .text            countDLSize__13J3DTevBlock16Fv */
 s32 J3DTevBlock16::countDLSize() {
     return 1000;
 }
 
-/* 80317BDC-80317BE4 31251C 0008+00 1/0 0/0 0/0 .text            countDLSize__15J3DIndBlockFullFv */
 s32 J3DIndBlockFull::countDLSize() {
     return 140;
 }
 
-/* 80317BE4-80317BEC 312524 0008+00 1/0 0/0 0/0 .text            countDLSize__13J3DPEBlockOpaFv */
 s32 J3DPEBlockOpa::countDLSize() {
     return 30;
 }
 
-/* 80317BEC-80317BF4 31252C 0008+00 1/0 0/0 0/0 .text            countDLSize__17J3DPEBlockTexEdgeFv
- */
 s32 J3DPEBlockTexEdge::countDLSize() {
     return 30;
 }
 
-/* 80317BF4-80317BFC 312534 0008+00 1/0 0/0 0/0 .text            countDLSize__13J3DPEBlockXluFv */
 s32 J3DPEBlockXlu::countDLSize() {
     return 30;
 }
 
-/* 80317BFC-80317C04 31253C 0008+00 1/0 0/0 0/0 .text            countDLSize__16J3DPEBlockFogOffFv
- */
 s32 J3DPEBlockFogOff::countDLSize() {
     return 30;
 }
 
-/* 80317C04-80317C0C 312544 0008+00 1/0 0/0 0/0 .text            countDLSize__14J3DPEBlockFullFv */
 s32 J3DPEBlockFull::countDLSize() {
     return 85;
 }
 
-/* 80450960-80450964 0003E0 0004+00 5/5 0/0 0/0 .sdata           SizeOfLoadMatColors */
 static u32 SizeOfLoadMatColors = 13;
 
-/* 80450964-80450968 0003E4 0004+00 2/2 0/0 0/0 .sdata           SizeOfLoadAmbColors */
 static u32 SizeOfLoadAmbColors = 13;
 
-/* 80450968-80450970 0003E8 0004+04 5/5 0/0 0/0 .sdata           SizeOfLoadColorChans */
 static u32 SizeOfLoadColorChans = 21;
 
 static u8 sdata_padding[4] = {};
 
-/* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss            SizeOfJ3DColorBlockLightOffLoad */
 static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans;
 
-/* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text            load__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::load() {
     GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad);
     mMatColorOffset = GDGetCurrOffset();
@@ -354,10 +312,8 @@ void J3DColorBlockLightOff::load() {
     mColorChan[3].load();
 }
 
-/* 804515DC-804515E0 000ADC 0004+00 3/3 0/0 0/0 .sbss            SizeOfJ3DColorBlockAmbientOnLoad */
 static u32 SizeOfJ3DColorBlockAmbientOnLoad = SizeOfLoadMatColors + SizeOfLoadAmbColors + SizeOfLoadColorChans;
 
-/* 8031816C-803187F4 312AAC 0688+00 1/0 0/0 0/0 .text            load__22J3DColorBlockAmbientOnFv */
 void J3DColorBlockAmbientOn::load() {
     GDOverflowCheck(SizeOfJ3DColorBlockAmbientOnLoad);
     mMatColorOffset = GDGetCurrOffset();
@@ -372,7 +328,6 @@ void J3DColorBlockAmbientOn::load() {
     mColorChan[3].load();
 }
 
-/* 803187F4-80318EB4 313134 06C0+00 1/0 0/0 0/0 .text            load__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::load() {
     GDOverflowCheck(SizeOfJ3DColorBlockAmbientOnLoad);
     mMatColorOffset = GDGetCurrOffset();
@@ -393,13 +348,11 @@ void J3DColorBlockLightOn::load() {
     }
 }
 
-/* 80318EB4-80318F00 3137F4 004C+00 2/0 0/0 0/0 .text            patch__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::patch() {
     patchMatColor();
     patchLight();
 }
 
-/* 80318F00-803190AC 313840 01AC+00 2/0 0/0 0/0 .text patchMatColor__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::patchMatColor() {
     GDSetCurrOffset(mMatColorOffset);
     void* start = GDGetCurrPointer();
@@ -409,7 +362,6 @@ void J3DColorBlockLightOff::patchMatColor() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 803190AC-803194E8 3139EC 043C+00 2/0 0/0 0/0 .text patchLight__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::patchLight() {
     GDSetCurrOffset(mColorChanOffset);
     void* start = GDGetCurrPointer();
@@ -425,13 +377,11 @@ void J3DColorBlockLightOff::patchLight() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 803194E8-80319534 313E28 004C+00 1/0 0/0 0/0 .text            patch__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::patch() {
     patchMatColor();
     patchLight();
 }
 
-/* 80319534-803196E0 313E74 01AC+00 1/0 0/0 0/0 .text patchMatColor__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::patchMatColor() {
     GDSetCurrOffset(mMatColorOffset);
     void* start = GDGetCurrPointer();
@@ -441,7 +391,6 @@ void J3DColorBlockLightOn::patchMatColor() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 803196E0-80319B4C 314020 046C+00 1/0 0/0 0/0 .text patchLight__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::patchLight() {
     GDSetCurrOffset(mColorChanOffset);
     void* start = GDGetCurrPointer();
@@ -463,7 +412,6 @@ void J3DColorBlockLightOn::patchLight() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 80319B4C-80319BB4 31448C 0068+00 2/0 0/0 0/0 .text            diff__21J3DColorBlockLightOffFUl */
 void J3DColorBlockLightOff::diff(u32 diffFlags) {
     if (diffFlags & J3DDiffFlag_MatColor)
         diffMatColor();
@@ -472,13 +420,11 @@ void J3DColorBlockLightOff::diff(u32 diffFlags) {
         diffColorChan();
 }
 
-/* 80319BB4-80319D30 3144F4 017C+00 2/0 0/0 0/0 .text diffMatColor__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::diffMatColor() {
     GDOverflowCheck(SizeOfLoadMatColors);
     loadMatColors(mMatColor);
 }
 
-/* 80319D30-8031A13C 314670 040C+00 2/0 0/0 0/0 .text diffColorChan__21J3DColorBlockLightOffFv */
 void J3DColorBlockLightOff::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
@@ -488,7 +434,6 @@ void J3DColorBlockLightOff::diffColorChan() {
     mColorChan[3].load();
 }
 
-/* 8031A13C-8031A1DC 314A7C 00A0+00 1/0 0/0 0/0 .text            diff__20J3DColorBlockLightOnFUl */
 void J3DColorBlockLightOn::diff(u32 diffFlags) {
     if (diffFlags & J3DDiffFlag_AmbColor)
         diffAmbColor();
@@ -504,19 +449,16 @@ void J3DColorBlockLightOn::diff(u32 diffFlags) {
         diffLightObj(lightObjNum);
 }
 
-/* 8031A1DC-8031A358 314B1C 017C+00 1/0 0/0 0/0 .text diffAmbColor__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::diffAmbColor() {
     GDOverflowCheck(SizeOfLoadAmbColors);
     loadAmbColors(mAmbColor);
 }
 
-/* 8031A358-8031A4D4 314C98 017C+00 1/0 0/0 0/0 .text diffMatColor__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::diffMatColor() {
     GDOverflowCheck(SizeOfLoadMatColors);
     loadMatColors(mMatColor);
 }
 
-/* 8031A4D4-8031A8E0 314E14 040C+00 1/0 0/0 0/0 .text diffColorChan__20J3DColorBlockLightOnFv */
 void J3DColorBlockLightOn::diffColorChan() {
     GDOverflowCheck(SizeOfLoadColorChans);
     J3DGDWriteXFCmdHdr(XF_REG_COLOR0CNTRL_ID, 4);
@@ -526,7 +468,6 @@ void J3DColorBlockLightOn::diffColorChan() {
     mColorChan[3].load();
 }
 
-/* 8031A8E0-8031A948 315220 0068+00 1/0 0/0 0/0 .text diffLightObj__20J3DColorBlockLightOnFUl */
 void J3DColorBlockLightOn::diffLightObj(u32 lightObjNum) {
     for (u32 i = 0; i < lightObjNum; i ++) {
         if (mLight[i] != NULL) {
@@ -535,7 +476,6 @@ void J3DColorBlockLightOn::diffLightObj(u32 lightObjNum) {
     }
 }
 
-/* 8031A948-8031A9E8 315288 00A0+00 1/0 0/0 0/0 .text            load__15J3DTexGenBlock4Fv */
 void J3DTexGenBlock4::load() {
     mTexMtxOffset = GDGetCurrOffset();
     for (u32 i = 0; i < 4; i++) {
@@ -549,7 +489,6 @@ void J3DTexGenBlock4::load() {
     }
 }
 
-/* 8031A9E8-8031AA88 315328 00A0+00 1/0 0/0 0/0 .text            load__19J3DTexGenBlockBasicFv */
 void J3DTexGenBlockBasic::load() {
     mTexMtxOffset = GDGetCurrOffset();
     for (u32 i = 0; i < 8; i++) {
@@ -563,7 +502,6 @@ void J3DTexGenBlockBasic::load() {
     }
 }
 
-/* 8031AA88-8031AB18 3153C8 0090+00 1/0 0/0 0/0 .text            patch__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
@@ -578,7 +516,6 @@ void J3DTexGenBlockPatched::patch() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031AB18-8031ABC0 315458 00A8+00 1/0 0/0 0/0 .text            patch__15J3DTexGenBlock4Fv */
 void J3DTexGenBlock4::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
@@ -593,7 +530,6 @@ void J3DTexGenBlock4::patch() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031ABC0-8031AC68 315500 00A8+00 1/0 0/0 0/0 .text            patch__19J3DTexGenBlockBasicFv */
 void J3DTexGenBlockBasic::patch() {
     GDSetCurrOffset(mTexMtxOffset);
     void* start = GDGetCurrPointer();
@@ -608,7 +544,6 @@ void J3DTexGenBlockBasic::patch() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031AC68-8031ACD0 3155A8 0068+00 3/0 0/0 0/0 .text            diff__21J3DTexGenBlockPatchedFUl */
 void J3DTexGenBlockPatched::diff(u32 diffFlags) {
     if (getDiffFlag_TexGenNum(diffFlags)) {
         diffTexMtx();
@@ -619,7 +554,6 @@ void J3DTexGenBlockPatched::diff(u32 diffFlags) {
     }
 }
 
-/* 8031ACD0-8031AD30 315610 0060+00 3/0 0/0 0/0 .text diffTexMtx__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::diffTexMtx() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTexMtx); ++i) {
         if (mTexMtx[i] != NULL) {
@@ -628,14 +562,12 @@ void J3DTexGenBlockPatched::diffTexMtx() {
     }
 }
 
-/* 8031AD30-8031AD64 315670 0034+00 3/0 0/0 0/0 .text diffTexGen__21J3DTexGenBlockPatchedFv */
 void J3DTexGenBlockPatched::diffTexGen() {
     if (mTexGenNum > 0) {
         loadTexCoordGens(mTexGenNum, mTexCoord);
     }
 }
 
-/* 8031AD64-8031AFA4 3156A4 0240+00 1/0 0/0 0/0 .text            load__12J3DTevBlock1Fv */
 void J3DTevBlock1::load() {
     mTexNoOffset = GDGetCurrOffset();
     GDOverflowCheck(0x69);
@@ -663,7 +595,6 @@ void J3DTevBlock1::load() {
     mIndTevStage[0].load(0);
 }
 
-/* 8031AFA4-8031B4C0 3158E4 051C+00 1/0 0/0 0/0 .text            load__12J3DTevBlock2Fv */
 void J3DTevBlock2::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
@@ -730,7 +661,6 @@ void J3DTevBlock2::load() {
     }
 }
 
-/* 8031B4C0-8031BA04 315E00 0544+00 1/0 0/0 0/0 .text            load__12J3DTevBlock4Fv */
 void J3DTevBlock4::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
@@ -799,7 +729,6 @@ void J3DTevBlock4::load() {
     }
 }
 
-/* 8031BA04-8031BF4C 316344 0548+00 1/0 0/0 0/0 .text            load__13J3DTevBlock16Fv */
 void J3DTevBlock16::load() {
     u32 tevStageNum = mTevStageNum;
     mTexNoOffset = GDGetCurrOffset();
@@ -869,8 +798,6 @@ void J3DTevBlock16::load() {
 }
 
 
-/* 8031BF4C-8031BFE0 31688C 0094+00 1/0 0/0 0/0 .text            patchTexNo__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::patchTexNo() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -885,8 +812,6 @@ void J3DTevBlockPatched::patchTexNo() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031BFE0-8031C0AC 316920 00CC+00 1/0 0/0 0/0 .text            patchTevReg__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
@@ -902,8 +827,6 @@ void J3DTevBlockPatched::patchTevReg() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C0AC-8031C228 3169EC 017C+00 1/0 0/0 0/0 .text
- * patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv           */
 void J3DTevBlockPatched::patchTexNoAndTexCoordScale() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -941,13 +864,11 @@ void J3DTevBlockPatched::patchTexNoAndTexCoordScale() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C228-8031C274 316B68 004C+00 1/0 0/0 0/0 .text            patch__18J3DTevBlockPatchedFv */
 void J3DTevBlockPatched::patch() {
     patchTexNo();
     patchTevReg();
 }
 
-/* 8031C274-8031C2E4 316BB4 0070+00 1/0 0/0 0/0 .text            patchTexNo__12J3DTevBlock1Fv */
 void J3DTevBlock1::patchTexNo() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -960,11 +881,8 @@ void J3DTevBlock1::patchTexNo() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C2E4-8031C2E8 316C24 0004+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock1Fv */
 void J3DTevBlock1::patchTevReg() {}
 
-/* 8031C2E8-8031C3CC 316C28 00E4+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock1Fv
- */
 void J3DTevBlock1::patchTexNoAndTexCoordScale() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -992,12 +910,10 @@ void J3DTevBlock1::patchTexNoAndTexCoordScale() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C3CC-8031C3F8 316D0C 002C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock1Fv */
 void J3DTevBlock1::patch() {
     patchTexNo();
 }
 
-/* 8031C3F8-8031C48C 316D38 0094+00 1/0 0/0 0/0 .text            patchTexNo__12J3DTevBlock2Fv */
 void J3DTevBlock2::patchTexNo() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1012,7 +928,6 @@ void J3DTevBlock2::patchTexNo() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C48C-8031C558 316DCC 00CC+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock2Fv */
 void J3DTevBlock2::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
@@ -1028,8 +943,6 @@ void J3DTevBlock2::patchTevReg() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C558-8031C6A8 316E98 0150+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock2Fv
- */
 void J3DTevBlock2::patchTexNoAndTexCoordScale() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1064,13 +977,11 @@ void J3DTevBlock2::patchTexNoAndTexCoordScale() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C6A8-8031C6F4 316FE8 004C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock2Fv */
 void J3DTevBlock2::patch() {
     patchTexNo();
     patchTevReg();
 }
 
-/* 8031C6F4-8031C788 317034 0094+00 1/0 0/0 0/0 .text            patchTexNo__12J3DTevBlock4Fv */
 void J3DTevBlock4::patchTexNo() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1085,7 +996,6 @@ void J3DTevBlock4::patchTexNo() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C788-8031C854 3170C8 00CC+00 1/0 0/0 0/0 .text            patchTevReg__12J3DTevBlock4Fv */
 void J3DTevBlock4::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
@@ -1101,8 +1011,6 @@ void J3DTevBlock4::patchTevReg() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031C854-8031C9D0 317194 017C+00 1/0 0/0 0/0 .text patchTexNoAndTexCoordScale__12J3DTevBlock4Fv
- */
 void J3DTevBlock4::patchTexNoAndTexCoordScale() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1139,13 +1047,11 @@ void J3DTevBlock4::patchTexNoAndTexCoordScale() {
     void* end = GDGetCurrPointer();
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
-/* 8031C9D0-8031CA1C 317310 004C+00 1/0 0/0 0/0 .text            patch__12J3DTevBlock4Fv */
 void J3DTevBlock4::patch() {
     patchTexNo();
     patchTevReg();
 }
 
-/* 8031CA1C-8031CAB0 31735C 0094+00 1/0 0/0 0/0 .text            patchTexNo__13J3DTevBlock16Fv */
 void J3DTevBlock16::patchTexNo() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1160,7 +1066,6 @@ void J3DTevBlock16::patchTexNo() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031CAB0-8031CB7C 3173F0 00CC+00 1/0 0/0 0/0 .text            patchTevReg__13J3DTevBlock16Fv */
 void J3DTevBlock16::patchTevReg() {
     GDSetCurrOffset(mTevRegOffset);
     void* start = GDGetCurrPointer();
@@ -1176,8 +1081,6 @@ void J3DTevBlock16::patchTevReg() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031CB7C-8031CCF8 3174BC 017C+00 1/0 0/0 0/0 .text
- * patchTexNoAndTexCoordScale__13J3DTevBlock16Fv                */
 void J3DTevBlock16::patchTexNoAndTexCoordScale() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1215,13 +1118,11 @@ void J3DTevBlock16::patchTexNoAndTexCoordScale() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031CCF8-8031CD44 317638 004C+00 1/0 0/0 0/0 .text            patch__13J3DTevBlock16Fv */
 void J3DTevBlock16::patch() {
     patchTexNo();
     patchTevReg();
 }
 
-/* 8031CD44-8031CE00 317684 00BC+00 6/0 1/0 0/0 .text            diff__11J3DTevBlockFUl */
 void J3DTevBlock::diff(u32 diffFlags) {
     if (getDiffFlag_TexNoNum(diffFlags)) {
         diffTexNo();
@@ -1244,8 +1145,6 @@ void J3DTevBlock::diff(u32 diffFlags) {
     }
 }
 
-/* 8031CE00-8031CE64 317740 0064+00 1/0 0/0 0/0 .text            diffTexNo__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::diffTexNo() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
@@ -1254,7 +1153,6 @@ void J3DTevBlockPatched::diffTexNo() {
     }
 }
 
-/* 8031CE64-8031CF78 3177A4 0114+00 1/0 0/0 0/0 .text diffTevStage__18J3DTevBlockPatchedFv */
 void J3DTevBlockPatched::diffTevStage() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1262,8 +1160,6 @@ void J3DTevBlockPatched::diffTevStage() {
     }
 }
 
-/* 8031CF78-8031D028 3178B8 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::diffTevStageIndirect() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1271,8 +1167,6 @@ void J3DTevBlockPatched::diffTevStageIndirect() {
     }
 }
 
-/* 8031D028-8031D0C4 317968 009C+00 1/0 0/0 0/0 .text            diffTevReg__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::diffTevReg() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
@@ -1282,7 +1176,6 @@ void J3DTevBlockPatched::diffTevReg() {
     }
 }
 
-/* 8031D0C4-8031D1BC 317A04 00F8+00 1/0 0/0 0/0 .text diffTexCoordScale__18J3DTevBlockPatchedFv */
 void J3DTevBlockPatched::diffTexCoordScale() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i += 2) {
@@ -1297,28 +1190,22 @@ void J3DTevBlockPatched::diffTexCoordScale() {
     }
 }
 
-/* 8031D1BC-8031D1F4 317AFC 0038+00 1/0 0/0 0/0 .text            diffTexNo__12J3DTevBlock1Fv */
 void J3DTevBlock1::diffTexNo() {
     if (mTexNo[0] != 0xFFFF) {
         loadTexNo(0, mTexNo[0]);
     }
 }
 
-/* 8031D1F4-8031D1F8 317B34 0004+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock1Fv */
 void J3DTevBlock1::diffTevReg() {}
 
-/* 8031D1F8-8031D2E8 317B38 00F0+00 1/0 0/0 0/0 .text            diffTevStage__12J3DTevBlock1Fv */
 void J3DTevBlock1::diffTevStage() {
     mTevStage[0].load(0);
 }
 
-/* 8031D2E8-8031D368 317C28 0080+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock1Fv */
 void J3DTevBlock1::diffTevStageIndirect() {
     mIndTevStage[0].load(0);
 }
 
-/* 8031D368-8031D3D0 317CA8 0068+00 1/0 0/0 0/0 .text            diffTexCoordScale__12J3DTevBlock1Fv
- */
 void J3DTevBlock1::diffTexCoordScale() {
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
@@ -1326,7 +1213,6 @@ void J3DTevBlock1::diffTexCoordScale() {
     );
 }
 
-/* 8031D3D0-8031D434 317D10 0064+00 1/0 0/0 0/0 .text            diffTexNo__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTexNo() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
@@ -1335,7 +1221,6 @@ void J3DTevBlock2::diffTexNo() {
     }
 }
 
-/* 8031D434-8031D4D0 317D74 009C+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTevReg() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
@@ -1345,7 +1230,6 @@ void J3DTevBlock2::diffTevReg() {
     }
 }
 
-/* 8031D4D0-8031D5E4 317E10 0114+00 1/0 0/0 0/0 .text            diffTevStage__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTevStage() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1353,7 +1237,6 @@ void J3DTevBlock2::diffTevStage() {
     }
 }
 
-/* 8031D5E4-8031D694 317F24 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock2Fv */
 void J3DTevBlock2::diffTevStageIndirect() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1361,8 +1244,6 @@ void J3DTevBlock2::diffTevStageIndirect() {
     }
 }
 
-/* 8031D694-8031D758 317FD4 00C4+00 1/0 0/0 0/0 .text            diffTexCoordScale__12J3DTevBlock2Fv
- */
 void J3DTevBlock2::diffTexCoordScale() {
     loadTexCoordScale(
         GXTexCoordID(mTevOrder[0].getTevOrderInfo().mTexCoord),
@@ -1374,7 +1255,6 @@ void J3DTevBlock2::diffTexCoordScale() {
     );
 }
 
-/* 8031D758-8031D7BC 318098 0064+00 1/0 0/0 0/0 .text            diffTexNo__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTexNo() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
@@ -1383,7 +1263,6 @@ void J3DTevBlock4::diffTexNo() {
     }
 }
 
-/* 8031D7BC-8031D858 3180FC 009C+00 1/0 0/0 0/0 .text            diffTevReg__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTevReg() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
@@ -1393,7 +1272,6 @@ void J3DTevBlock4::diffTevReg() {
     }
 }
 
-/* 8031D858-8031D96C 318198 0114+00 1/0 0/0 0/0 .text            diffTevStage__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTevStage() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1401,7 +1279,6 @@ void J3DTevBlock4::diffTevStage() {
     }
 }
 
-/* 8031D96C-8031DA1C 3182AC 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__12J3DTevBlock4Fv */
 void J3DTevBlock4::diffTevStageIndirect() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1409,8 +1286,6 @@ void J3DTevBlock4::diffTevStageIndirect() {
     }
 }
 
-/* 8031DA1C-8031DB14 31835C 00F8+00 1/0 0/0 0/0 .text            diffTexCoordScale__12J3DTevBlock4Fv
- */
 void J3DTevBlock4::diffTexCoordScale() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i += 2) {
@@ -1424,7 +1299,6 @@ void J3DTevBlock4::diffTexCoordScale() {
         );
     }
 }
-/* 8031DB14-8031DB78 318454 0064+00 1/0 0/0 0/0 .text            diffTexNo__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTexNo() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTexNo); i++) {
         if (mTexNo[i] != 0xFFFF) {
@@ -1433,7 +1307,6 @@ void J3DTevBlock16::diffTexNo() {
     }
 }
 
-/* 8031DB78-8031DC14 3184B8 009C+00 1/0 0/0 0/0 .text            diffTevReg__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTevReg() {
     for (u32 i = 0; i < ARRAY_SIZEU(mTevColor) - 1; i++) {
         loadTevColor(i, mTevColor[i]);
@@ -1443,7 +1316,6 @@ void J3DTevBlock16::diffTevReg() {
     }
 }
 
-/* 8031DC14-8031DD28 318554 0114+00 1/0 0/0 0/0 .text            diffTevStage__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTevStage() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1451,7 +1323,6 @@ void J3DTevBlock16::diffTevStage() {
     }
 }
 
-/* 8031DD28-8031DDD8 318668 00B0+00 1/0 0/0 0/0 .text diffTevStageIndirect__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTevStageIndirect() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i++) {
@@ -1459,7 +1330,6 @@ void J3DTevBlock16::diffTevStageIndirect() {
     }
 }
 
-/* 8031DDD8-8031DED0 318718 00F8+00 1/0 0/0 0/0 .text diffTexCoordScale__13J3DTevBlock16Fv */
 void J3DTevBlock16::diffTexCoordScale() {
     u32 tevStageNum = mTevStageNum;
     for (u32 i = 0; i < tevStageNum; i += 2) {
@@ -1474,7 +1344,6 @@ void J3DTevBlock16::diffTexCoordScale() {
     }
 }
 
-/* 8031DED0-8031DFB4 318810 00E4+00 1/0 0/0 0/0 .text            ptrToIndex__13J3DTevBlock16Fv */
 void J3DTevBlock16::ptrToIndex() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1499,8 +1368,6 @@ void J3DTevBlock16::ptrToIndex() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031DFB4-8031E098 3188F4 00E4+00 1/0 0/0 0/0 .text            ptrToIndex__18J3DTevBlockPatchedFv
- */
 void J3DTevBlockPatched::ptrToIndex() {
     GDSetCurrOffset(mTexNoOffset);
     void* start = GDGetCurrPointer();
@@ -1525,7 +1392,6 @@ void J3DTevBlockPatched::ptrToIndex() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031E098-8031E12C 3189D8 0094+00 5/5 1/1 0/0 .text indexToPtr_private__11J3DTevBlockFUl */
 void J3DTevBlock::indexToPtr_private(u32 offs) {
     GDSetCurrOffset(offs);
     void* start = GDGetCurrPointer();
@@ -1544,7 +1410,6 @@ void J3DTevBlock::indexToPtr_private(u32 offs) {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031E12C-8031E328 318A6C 01FC+00 1/0 0/0 0/0 .text            load__15J3DIndBlockFullFv */
 void J3DIndBlockFull::load() {
     int indTexStageNum = mIndTexStageNum;
     for (u32 i = 0; i < indTexStageNum; i++) {
@@ -1579,7 +1444,6 @@ void J3DIndBlockFull::load() {
     );
 }
 
-/* 8031E328-8031E408 318C68 00E0+00 1/0 0/0 0/0 .text            diff__15J3DIndBlockFullFUl */
 void J3DIndBlockFull::diff(u32 diffFlags) {
     if (diffFlags & J3DDiffFlag_TevStageIndirect) {
         u32 indTexStageNum = mIndTexStageNum;
@@ -1609,7 +1473,6 @@ void J3DIndBlockFull::diff(u32 diffFlags) {
     }
 }
 
-/* 8031E408-8031E6C8 318D48 02C0+00 1/0 0/0 0/0 .text            load__13J3DPEBlockOpaFv */
 void J3DPEBlockOpa::load() {
     GDOverflowCheck(0x1e);
     J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0);
@@ -1618,7 +1481,6 @@ void J3DPEBlockOpa::load() {
     J3DGDSetZCompLoc(1);
 }
 
-/* 8031E6C8-8031E98C 319008 02C4+00 1/0 0/0 0/0 .text            load__17J3DPEBlockTexEdgeFv */
 void J3DPEBlockTexEdge::load() {
     GDOverflowCheck(0x1e);
     J3DGDSetAlphaCompare(GX_GEQUAL, 0x80, GX_AOP_AND, GX_LEQUAL, 0xff);
@@ -1627,7 +1489,6 @@ void J3DPEBlockTexEdge::load() {
     J3DGDSetZCompLoc(0);
 }
 
-/* 8031E98C-8031EC50 3192CC 02C4+00 1/0 0/0 0/0 .text            load__13J3DPEBlockXluFv */
 void J3DPEBlockXlu::load() {
     GDOverflowCheck(0x1e);
     J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND,GX_ALWAYS, 0);
@@ -1640,7 +1501,6 @@ inline void loadZCompLoc(u8 compLoc) {
     J3DGDSetZCompLoc(compLoc);
 }
 
-/* 8031EC50-8031F0D8 319590 0488+00 1/0 0/0 0/0 .text            load__16J3DPEBlockFogOffFv */
 void J3DPEBlockFogOff::load() {
     GDOverflowCheck(0x1e);
     mAlphaComp.load();
@@ -1649,14 +1509,12 @@ void J3DPEBlockFogOff::load() {
     loadZCompLoc(mZCompLoc);
 }
 
-/* 8031F0D8-8031F3C0 319A18 02E8+00 1/0 0/0 0/0 .text            diffBlend__16J3DPEBlockFogOffFv */
 void J3DPEBlockFogOff::diffBlend() {
     GDOverflowCheck(0xf);
     mBlend.load(mDither);
     mZMode.load();
 }
 
-/* 8031F3C0-8031F890 319D00 04D0+00 1/0 0/0 0/0 .text            load__14J3DPEBlockFullFv */
 void J3DPEBlockFull::load() {
     mFogOffset = GDGetCurrOffset();
     GDOverflowCheck(0x55);
@@ -1667,7 +1525,6 @@ void J3DPEBlockFull::load() {
     loadZCompLoc(mZCompLoc);
 }
 
-/* 8031F890-8031F940 31A1D0 00B0+00 1/0 0/0 0/0 .text            patch__14J3DPEBlockFullFv */
 void J3DPEBlockFull::patch() {
     GDSetCurrOffset(mFogOffset);
     GDOverflowCheck(0x37);
@@ -1677,20 +1534,17 @@ void J3DPEBlockFull::patch() {
     DCStoreRange(start, (uintptr_t)end - (uintptr_t)start);
 }
 
-/* 8031F940-8031F9B8 31A280 0078+00 1/0 0/0 0/0 .text            diffFog__14J3DPEBlockFullFv */
 void J3DPEBlockFull::diffFog() {
     GDOverflowCheck(0x37);
     mFog.load();
 }
 
-/* 8031F9B8-8031FCA0 31A2F8 02E8+00 1/0 0/0 0/0 .text            diffBlend__14J3DPEBlockFullFv */
 void J3DPEBlockFull::diffBlend() {
     GDOverflowCheck(0xf);
     mBlend.load(mDither);
     mZMode.load();
 }
 
-/* 8031FCA0-8031FD08 31A5E0 0068+00 1/0 0/0 0/0 .text            diff__14J3DPEBlockFullFUl */
 void J3DPEBlockFull::diff(u32 diffFlags) {
     if ((diffFlags & J3DDiffFlag_Fog)) {
         diffFog();
@@ -1701,8 +1555,6 @@ void J3DPEBlockFull::diff(u32 diffFlags) {
     }
 }
 
-/* 8031FD08-8031FDE4 31A648 00DC+00 1/0 0/0 0/0 .text
- * reset__21J3DColorBlockLightOffFP13J3DColorBlock              */
 void J3DColorBlockLightOff::reset(J3DColorBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2434, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
@@ -1715,8 +1567,6 @@ void J3DColorBlockLightOff::reset(J3DColorBlock* pBlock) {
     }
 }
 
-/* 8031FDE4-8031FF34 31A724 0150+00 1/0 0/0 0/0 .text
- * reset__22J3DColorBlockAmbientOnFP13J3DColorBlock             */
 void J3DColorBlockAmbientOn::reset(J3DColorBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2451, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
@@ -1734,8 +1584,6 @@ void J3DColorBlockAmbientOn::reset(J3DColorBlock* pBlock) {
     }
 }
 
-/* 8031FF34-80320084 31A874 0150+00 1/0 0/0 0/0 .text
- * reset__20J3DColorBlockLightOnFP13J3DColorBlock               */
 void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2476, pBlock != NULL);
     mColorChanNum = pBlock->getColorChanNum();
@@ -1753,8 +1601,6 @@ void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) {
     }
 }
 
-/* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text
- * reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock             */
 void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2504, pBlock != NULL);
 
@@ -1775,8 +1621,6 @@ void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) {
     }
 }
 
-/* 803201A0-803202DC 31AAE0 013C+00 1/0 0/0 0/0 .text reset__15J3DTexGenBlock4FP14J3DTexGenBlock
- */
 void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2537, pBlock != NULL);
 
@@ -1799,8 +1643,6 @@ void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) {
     mNBTScale = *pBlock->getNBTScale();
 }
 
-/* 803202DC-80320418 31AC1C 013C+00 1/0 0/0 0/0 .text
- * reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock               */
 void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2572, pBlock != NULL);
 
@@ -1823,8 +1665,6 @@ void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) {
     mNBTScale = *pBlock->getNBTScale();
 }
 
-/* 80320418-803205D4 31AD58 01BC+00 1/0 0/0 0/0 .text reset__18J3DTevBlockPatchedFP11J3DTevBlock
- */
 void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2608, pBlock != NULL);
 
@@ -1844,7 +1684,6 @@ void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) {
     }
 }
 
-/* 803205D4-803206AC 31AF14 00D8+00 1/0 0/0 0/0 .text reset__12J3DTevBlock1FP11J3DTevBlock */
 void J3DTevBlock1::reset(J3DTevBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2633, pBlock != NULL);
 
@@ -1854,7 +1693,6 @@ void J3DTevBlock1::reset(J3DTevBlock* pBlock) {
     mIndTevStage[0] = *pBlock->getIndTevStage(0);
 }
 
-/* 803206AC-8032098C 31AFEC 02E0+00 1/0 0/0 0/0 .text reset__12J3DTevBlock2FP11J3DTevBlock */
 void J3DTevBlock2::reset(J3DTevBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2649, pBlock != NULL);
 
@@ -1883,7 +1721,6 @@ void J3DTevBlock2::reset(J3DTevBlock* pBlock) {
     }
 }
 
-/* 8032098C-80320E24 31B2CC 0498+00 1/0 0/0 0/0 .text reset__12J3DTevBlock4FP11J3DTevBlock */
 void J3DTevBlock4::reset(J3DTevBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2682, pBlock != NULL);
 
@@ -1921,7 +1758,6 @@ void J3DTevBlock4::reset(J3DTevBlock* pBlock) {
         mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i);
 }
 
-/* 80320E24-803210B0 31B764 028C+00 1/0 0/0 0/0 .text reset__13J3DTevBlock16FP11J3DTevBlock */
 void J3DTevBlock16::reset(J3DTevBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2728, pBlock != NULL);
 
@@ -1953,7 +1789,6 @@ void J3DTevBlock16::reset(J3DTevBlock* pBlock) {
     }
 }
 
-/* 803210B0-803211B4 31B9F0 0104+00 1/0 0/0 0/0 .text reset__15J3DIndBlockFullFP11J3DIndBlock */
 void J3DIndBlockFull::reset(J3DIndBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2762, pBlock != NULL);
 
@@ -1969,7 +1804,6 @@ void J3DIndBlockFull::reset(J3DIndBlock* pBlock) {
     }
 }
 
-/* 803211B4-8032129C 31BAF4 00E8+00 1/0 0/0 0/0 .text reset__16J3DPEBlockFogOffFP10J3DPEBlock */
 void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2783, pBlock != NULL);
 
@@ -1984,7 +1818,6 @@ void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) {
     }
 }
 
-/* 8032129C-803213C0 31BBDC 0124+00 1/0 0/0 0/0 .text reset__14J3DPEBlockFullFP10J3DPEBlock */
 void J3DPEBlockFull::reset(J3DPEBlock* pBlock) {
     J3D_ASSERT_NULLPTR(2807, pBlock != NULL);
 
@@ -2003,7 +1836,6 @@ void J3DPEBlockFull::reset(J3DPEBlock* pBlock) {
     }
 }
 
-/* 803213C0-80321584 31BD00 01C4+00 4/0 0/0 0/0 .text calc__21J3DTexGenBlockPatchedFPA4_Cf */
 void J3DTexGenBlockPatched::calc(const Mtx modelMtx) {
     Mtx viewMtx;
     for (int i = 0; i < 8; i++) {
@@ -2063,8 +1895,6 @@ void J3DTexGenBlockPatched::calc(const Mtx modelMtx) {
     }
 }
 
-/* 80321584-803216D8 31BEC4 0154+00 4/0 0/0 0/0 .text
- * calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf           */
 void J3DTexGenBlockPatched::calcWithoutViewMtx(const Mtx modelMtx) {
     Mtx mtx;
     for (int i = 0; i < 8; i++) {
@@ -2110,8 +1940,6 @@ void J3DTexGenBlockPatched::calcWithoutViewMtx(const Mtx modelMtx) {
     }
 }
 
-/* 803216D8-8032181C 31C018 0144+00 4/0 0/0 0/0 .text
- * calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf               */
 void J3DTexGenBlockPatched::calcPostTexMtx(const Mtx modelMtx) {
     Mtx mtx1, mtx2;
     for (int i = 0; i < 8; i++) {
@@ -2155,8 +1983,6 @@ void J3DTexGenBlockPatched::calcPostTexMtx(const Mtx modelMtx) {
     }
 }
 
-/* 8032181C-80321938 31C15C 011C+00 4/0 0/0 0/0 .text
- * calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf */
 void J3DTexGenBlockPatched::calcPostTexMtxWithoutViewMtx(f32 const (*param_0)[4]) {
     for (int i = 0; i < 8; i++) {
         if (mTexMtx[i] != NULL) {
diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
index 9dfd2a2fce..4f577f9045 100644
--- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
@@ -3,8 +3,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DGD.h"
 
-/* 803157A0-803159A0 3100E0 0200+00 0/0 3/3 0/0 .text            createColorBlock__11J3DMaterialFUl
- */
 J3DColorBlock* J3DMaterial::createColorBlock(u32 flags) {
     J3DColorBlock* rv = NULL;
     switch (flags) {
@@ -23,8 +21,6 @@ J3DColorBlock* J3DMaterial::createColorBlock(u32 flags) {
     return rv;
 }
 
-/* 803159A0-80315B04 3102E0 0164+00 0/0 2/2 0/0 .text            createTexGenBlock__11J3DMaterialFUl
- */
 J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 flags) {
     J3DTexGenBlock* rv = NULL;
     switch (flags) {
@@ -40,7 +36,6 @@ J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 flags) {
     return rv;
 }
 
-/* 80315B04-80315E78 310444 0374+00 0/0 2/2 0/0 .text            createTevBlock__11J3DMaterialFi */
 J3DTevBlock* J3DMaterial::createTevBlock(int tevStageNum) {
     J3DTevBlock* rv = NULL;
     if (tevStageNum <= 1) {
@@ -57,7 +52,6 @@ J3DTevBlock* J3DMaterial::createTevBlock(int tevStageNum) {
     return rv;
 }
 
-/* 80315E78-80315F60 3107B8 00E8+00 0/0 3/3 0/0 .text            createIndBlock__11J3DMaterialFi */
 J3DIndBlock* J3DMaterial::createIndBlock(int flags) {
     J3DIndBlock* rv = NULL;
     if (flags != 0) {
@@ -70,8 +64,6 @@ J3DIndBlock* J3DMaterial::createIndBlock(int flags) {
     return rv;
 }
 
-/* 80315F60-80316100 3108A0 01A0+00 0/0 3/3 0/0 .text            createPEBlock__11J3DMaterialFUlUl
- */
 J3DPEBlock* J3DMaterial::createPEBlock(u32 flags, u32 materialMode) {
     J3DPEBlock* rv = NULL;
     if (flags == 0) {
@@ -100,7 +92,6 @@ J3DPEBlock* J3DMaterial::createPEBlock(u32 flags, u32 materialMode) {
     return rv;
 }
 
-/* 80316100-80316150 310A40 0050+00 0/0 2/2 0/0 .text calcSizeColorBlock__11J3DMaterialFUl */
 u32 J3DMaterial::calcSizeColorBlock(u32 flags) {
     u32 rv = 0;
     switch (flags) {
@@ -118,7 +109,6 @@ u32 J3DMaterial::calcSizeColorBlock(u32 flags) {
     return rv;
 }
 
-/* 80316150-8031617C 310A90 002C+00 0/0 1/1 0/0 .text calcSizeTexGenBlock__11J3DMaterialFUl */
 u32 J3DMaterial::calcSizeTexGenBlock(u32 flags) {
     u32 rv = 0;
     switch (flags) {
@@ -133,8 +123,6 @@ u32 J3DMaterial::calcSizeTexGenBlock(u32 flags) {
     return rv;
 }
 
-/* 8031617C-803161C4 310ABC 0048+00 0/0 1/1 0/0 .text            calcSizeTevBlock__11J3DMaterialFi
- */
 u32 J3DMaterial::calcSizeTevBlock(int tevStageNum) {
     u32 rv = 0;
     if (tevStageNum <= 1) {
@@ -150,8 +138,6 @@ u32 J3DMaterial::calcSizeTevBlock(int tevStageNum) {
     return rv;
 }
 
-/* 803161C4-803161D8 310B04 0014+00 0/0 2/2 0/0 .text            calcSizeIndBlock__11J3DMaterialFi
- */
 u32 J3DMaterial::calcSizeIndBlock(int flags) {
     u32 rv = 0;
     if (flags != 0) {
@@ -163,8 +149,6 @@ u32 J3DMaterial::calcSizeIndBlock(int flags) {
     return rv;
 }
 
-/* 803161D8-80316240 310B18 0068+00 0/0 2/2 0/0 .text            calcSizePEBlock__11J3DMaterialFUlUl
- */
 u32 J3DMaterial::calcSizePEBlock(u32 flags, u32 materialMode) {
     u32 rv = 0;
     if (flags == 0) {
@@ -184,7 +168,6 @@ u32 J3DMaterial::calcSizePEBlock(u32 flags, u32 materialMode) {
     return rv;
 }
 
-/* 80316240-80316290 310B80 0050+00 2/2 5/5 0/0 .text            initialize__11J3DMaterialFv */
 void J3DMaterial::initialize() {
     mShape = NULL;
     mNext = NULL;
@@ -203,14 +186,11 @@ void J3DMaterial::initialize() {
     mSharedDLObj = NULL;
 }
 
-/* 80316290-80316344 310BD0 00B4+00 0/0 2/2 0/0 .text            countDLSize__11J3DMaterialFv */
 u32 J3DMaterial::countDLSize() {
     return (mColorBlock->countDLSize() + mTexGenBlock->countDLSize() + mTevBlock->countDLSize() +
         mIndBlock->countDLSize() + mPEBlock->countDLSize() + 31) & ~0x1f;
 }
 
-/* 80316344-80316620 310C84 02DC+00 2/2 0/0 0/0 .text
- * makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj  */
 void J3DMaterial::makeDisplayList_private(J3DDisplayListObj* pDLObj) {
     pDLObj->beginDL();
     mTevBlock->load();
@@ -224,7 +204,6 @@ void J3DMaterial::makeDisplayList_private(J3DDisplayListObj* pDLObj) {
     pDLObj->endDL();
 }
 
-/* 80316620-80316668 310F60 0048+00 1/0 0/0 0/0 .text            makeDisplayList__11J3DMaterialFv */
 void J3DMaterial::makeDisplayList() {
     if (!j3dSys.getMatPacket()->isLocked()) {
         j3dSys.getMatPacket()->mDiffFlag = mDiffFlag;
@@ -232,12 +211,10 @@ void J3DMaterial::makeDisplayList() {
     }
 }
 
-/* 80316668-8031668C 310FA8 0024+00 1/0 0/0 0/0 .text makeSharedDisplayList__11J3DMaterialFv */
 void J3DMaterial::makeSharedDisplayList() {
     makeDisplayList_private(mSharedDLObj);
 }
 
-/* 8031668C-803166DC 310FCC 0050+00 1/0 0/0 0/0 .text            load__11J3DMaterialFv */
 void J3DMaterial::load() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (!j3dSys.checkFlag(2)) {
@@ -245,7 +222,6 @@ void J3DMaterial::load() {
     }
 }
 
-/* 803166DC-80316740 31101C 0064+00 1/0 0/0 0/0 .text            loadSharedDL__11J3DMaterialFv */
 void J3DMaterial::loadSharedDL() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (!j3dSys.checkFlag(2)) {
@@ -254,7 +230,6 @@ void J3DMaterial::loadSharedDL() {
     }
 }
 
-/* 80316740-803167D8 311080 0098+00 2/0 0/0 0/0 .text            patch__11J3DMaterialFv */
 void J3DMaterial::patch() {
     j3dSys.getMatPacket()->mDiffFlag = mDiffFlag;
     j3dSys.getMatPacket()->beginPatch();
@@ -264,7 +239,6 @@ void J3DMaterial::patch() {
     j3dSys.getMatPacket()->endPatch();
 }
 
-/* 803167D8-803169DC 311118 0204+00 2/0 0/0 0/0 .text            diff__11J3DMaterialFUl */
 void J3DMaterial::diff(u32 diffFlags) {
     if (j3dSys.getMatPacket()->isEnabled_Diff()) {
         j3dSys.getMatPacket()->beginDiff();
@@ -283,7 +257,6 @@ void J3DMaterial::diff(u32 diffFlags) {
     }
 }
 
-/* 803169DC-80316A54 31131C 0078+00 2/0 0/0 0/0 .text            calc__11J3DMaterialFPA4_Cf */
 void J3DMaterial::calc(f32 const (*param_0)[4]) {
     if (j3dSys.checkFlag(0x40000000)) {
         mTexGenBlock->calcPostTexMtx(param_0);
@@ -295,7 +268,6 @@ void J3DMaterial::calc(f32 const (*param_0)[4]) {
     setCurrentMtx();
 }
 
-/* 80316A54-80316AB0 311394 005C+00 3/0 0/0 0/0 .text calcDiffTexMtx__11J3DMaterialFPA4_Cf */
 void J3DMaterial::calcDiffTexMtx(f32 const (*param_0)[4]) {
     if (j3dSys.checkFlag(0x40000000)) {
         mTexGenBlock->calcPostTexMtxWithoutViewMtx(param_0);
@@ -304,12 +276,10 @@ void J3DMaterial::calcDiffTexMtx(f32 const (*param_0)[4]) {
     }
 }
 
-/* 80316AB0-80316AC8 3113F0 0018+00 1/1 1/1 0/0 .text            setCurrentMtx__11J3DMaterialFv */
 void J3DMaterial::setCurrentMtx() {
     mShape->setCurrentMtx(mCurrentMtx);
 }
 
-/* 80316AC8-80316D68 311408 02A0+00 1/1 0/0 0/0 .text            calcCurrentMtx__11J3DMaterialFv */
 void J3DMaterial::calcCurrentMtx() {
     if (!j3dSys.checkFlag(0x40000000)) {
         mCurrentMtx.setCurrentTexMtx(
@@ -336,8 +306,6 @@ void J3DMaterial::calcCurrentMtx() {
     }
 }
 
-/* 80316D68-80316E14 3116A8 00AC+00 1/1 0/0 0/0 .text            copy__11J3DMaterialFP11J3DMaterial
- */
 void J3DMaterial::copy(J3DMaterial* pOther) {
     J3D_ASSERT_NULLPTR(620, pOther != NULL);
     mColorBlock->reset(pOther->mColorBlock);
@@ -347,7 +315,6 @@ void J3DMaterial::copy(J3DMaterial* pOther) {
     mPEBlock->reset(pOther->mPEBlock);
 }
 
-/* 80316E14-80316E70 311754 005C+00 1/0 0/0 0/0 .text            reset__11J3DMaterialFv */
 void J3DMaterial::reset() {
     if ((~mDiffFlag & J3DDiffFlag_Changed) == 0) {
         mDiffFlag &= ~J3DDiffFlag_Changed;
@@ -358,7 +325,6 @@ void J3DMaterial::reset() {
     }
 }
 
-/* 80316E70-80316E90 3117B0 0020+00 1/0 0/0 0/0 .text            change__11J3DMaterialFv */
 void J3DMaterial::change() {
     if ((mDiffFlag & (J3DDiffFlag_Changed | J3DDiffFlag_Unk40000000)) == 0) {
         mDiffFlag |= J3DDiffFlag_Changed;
@@ -366,7 +332,6 @@ void J3DMaterial::change() {
     }
 }
 
-/* 80316E90-80316F24 3117D0 0094+00 0/0 2/2 0/0 .text newSharedDisplayList__11J3DMaterialFUl */
 s32 J3DMaterial::newSharedDisplayList(u32 dlSize) {
     if (mSharedDLObj == NULL) {
         mSharedDLObj = new J3DDisplayListObj();
@@ -383,8 +348,6 @@ s32 J3DMaterial::newSharedDisplayList(u32 dlSize) {
     return kJ3DError_Success;
 }
 
-/* 80316F24-80316FB8 311864 0094+00 0/0 2/2 0/0 .text newSingleSharedDisplayList__11J3DMaterialFUl
- */
 s32 J3DMaterial::newSingleSharedDisplayList(u32 dlSize) {
     if (mSharedDLObj == NULL) {
         mSharedDLObj = new J3DDisplayListObj();
@@ -401,20 +364,14 @@ s32 J3DMaterial::newSingleSharedDisplayList(u32 dlSize) {
     return kJ3DError_Success;
 }
 
-/* 80316FB8-80316FD8 3118F8 0020+00 0/0 1/1 0/0 .text            initialize__18J3DPatchedMaterialFv
- */
 void J3DPatchedMaterial::initialize() {
     J3DMaterial::initialize();
 }
 
-/* 80316FD8-80316FDC 311918 0004+00 1/0 0/0 0/0 .text makeDisplayList__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::makeDisplayList() {}
 
-/* 80316FDC-80316FE0 31191C 0004+00 1/0 0/0 0/0 .text
- * makeSharedDisplayList__18J3DPatchedMaterialFv                */
 void J3DPatchedMaterial::makeSharedDisplayList() {}
 
-/* 80316FE0-80316FFC 311920 001C+00 1/0 0/0 0/0 .text            load__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::load() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (j3dSys.checkFlag(2)) {
@@ -422,33 +379,24 @@ void J3DPatchedMaterial::load() {
     }
 }
 
-/* 80316FFC-8031703C 31193C 0040+00 1/0 0/0 0/0 .text loadSharedDL__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::loadSharedDL() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (!j3dSys.checkFlag(0x02))
         mSharedDLObj->callDL();
 }
 
-/* 8031703C-80317040 31197C 0004+00 1/0 0/0 0/0 .text            reset__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::reset() {}
 
-/* 80317040-80317044 311980 0004+00 1/0 0/0 0/0 .text            change__18J3DPatchedMaterialFv */
 void J3DPatchedMaterial::change() {}
 
-/* 80317044-80317064 311984 0020+00 0/0 1/1 0/0 .text            initialize__17J3DLockedMaterialFv
- */
 void J3DLockedMaterial::initialize() {
     J3DMaterial::initialize();
 }
 
-/* 80317064-80317068 3119A4 0004+00 1/0 0/0 0/0 .text makeDisplayList__17J3DLockedMaterialFv */
 void J3DLockedMaterial::makeDisplayList() {}
 
-/* 80317068-8031706C 3119A8 0004+00 1/0 0/0 0/0 .text makeSharedDisplayList__17J3DLockedMaterialFv
- */
 void J3DLockedMaterial::makeSharedDisplayList() {}
 
-/* 8031706C-80317088 3119AC 001C+00 1/0 0/0 0/0 .text            load__17J3DLockedMaterialFv */
 void J3DLockedMaterial::load() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (j3dSys.checkFlag(2)) {
@@ -456,25 +404,18 @@ void J3DLockedMaterial::load() {
     }
 }
 
-/* 80317088-803170C8 3119C8 0040+00 1/0 0/0 0/0 .text            loadSharedDL__17J3DLockedMaterialFv
- */
 void J3DLockedMaterial::loadSharedDL() {
     j3dSys.setMaterialMode(mMaterialMode);
     if (!j3dSys.checkFlag(0x02))
         mSharedDLObj->callDL();
 }
 
-/* 803170C8-803170CC 311A08 0004+00 1/0 0/0 0/0 .text            patch__17J3DLockedMaterialFv */
 void J3DLockedMaterial::patch() {}
 
-/* 803170CC-803170D0 311A0C 0004+00 1/0 0/0 0/0 .text            diff__17J3DLockedMaterialFUl */
 void J3DLockedMaterial::diff(u32 diffFlags) {}
 
-/* 803170D0-803170D4 311A10 0004+00 1/0 0/0 0/0 .text            calc__17J3DLockedMaterialFPA4_Cf */
 void J3DLockedMaterial::calc(const Mtx param_0) {}
 
-/* 803170D4-803170D8 311A14 0004+00 1/0 0/0 0/0 .text            reset__17J3DLockedMaterialFv */
 void J3DLockedMaterial::reset() {}
 
-/* 803170D8-803170DC 311A18 0004+00 1/0 0/0 0/0 .text            change__17J3DLockedMaterialFv */
 void J3DLockedMaterial::change() {}
diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp
index 8a8f1dd043..b99c5a8f1d 100644
--- a/src/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -34,7 +34,6 @@ J3DError J3DDisplayListObj::newSingleDisplayList(u32 maxSize) {
     return kJ3DError_Success;
 }
 
-/* 8031256C-803125E4 30CEAC 0078+00 0/0 1/1 0/0 .text single_To_Double__17J3DDisplayListObjFv */
 int J3DDisplayListObj::single_To_Double() {
     if (mpDisplayList[0] == mpDisplayList[1]) {
         mpDisplayList[1] = new (0x20) char[mMaxSize];
@@ -68,14 +67,10 @@ void J3DDisplayListObj::callDL() const {
     GXCallDisplayList(mpDisplayList[0], mSize);
 }
 
-/* 80434C70-80434C80 061990 0010+00 2/2 3/3 0/0 .bss             sGDLObj__17J3DDisplayListObj */
 GDLObj J3DDisplayListObj::sGDLObj;
 
-/* 804515A0-804515A8 000AA0 0004+04 3/3 0/0 0/0 .sbss            sInterruptFlag__17J3DDisplayListObj
- */
 s32 J3DDisplayListObj::sInterruptFlag;
 
-/* 80312644-80312698 30CF84 0054+00 2/2 1/1 0/0 .text            beginDL__17J3DDisplayListObjFv */
 void J3DDisplayListObj::beginDL() {
     swapBuffer();
     sInterruptFlag = OSDisableInterrupts();
@@ -83,7 +78,6 @@ void J3DDisplayListObj::beginDL() {
     GDSetCurrent(&sGDLObj);
 }
 
-/* 80312698-803126F4 30CFD8 005C+00 1/1 1/1 0/0 .text            endDL__17J3DDisplayListObjFv */
 u32 J3DDisplayListObj::endDL() {
     GDPadCurr32();
     OSRestoreInterrupts(sInterruptFlag);
@@ -93,20 +87,16 @@ u32 J3DDisplayListObj::endDL() {
     return mSize;
 }
 
-/* 803126F4-80312714 30D034 0020+00 0/0 1/1 0/0 .text            beginPatch__17J3DDisplayListObjFv
- */
 void J3DDisplayListObj::beginPatch() {
     beginDL();
 }
 
-/* 80312714-80312750 30D054 003C+00 0/0 1/1 0/0 .text            endPatch__17J3DDisplayListObjFv */
 u32 J3DDisplayListObj::endPatch() {
     OSRestoreInterrupts(sInterruptFlag);
     GDSetCurrent(NULL);
     return mSize;
 }
 
-/* 80312750-80312758 30D090 0008+00 3/0 16/0 10/0 .text entry__9J3DPacketFP13J3DDrawBuffer */
 int J3DPacket::entry(J3DDrawBuffer* pBuffer) {
     J3D_ASSERT_NULLPTR(290, pBuffer != NULL);
     return 1;
@@ -123,7 +113,6 @@ void J3DPacket::addChildPacket(J3DPacket* pPacket) {
     }
 }
 
-/* 803CD900-803CD920 02AA20 0020+00 1/1 0/0 0/0 .data            sDifferedRegister */
 static u32 sDifferedRegister[8] = {
     J3DDiffFlag_AmbColor,
     J3DDiffFlag_MatColor,
@@ -135,7 +124,6 @@ static u32 sDifferedRegister[8] = {
     J3DDiffFlag_TevStageIndirect,
 };
 
-/* 803CD920-803CD940 02AA40 0020+00 1/1 0/0 0/0 .data            sSizeOfDiffered */
 static s32 sSizeOfDiffered[8] = {
     13,
     13,
@@ -147,18 +135,14 @@ static s32 sSizeOfDiffered[8] = {
     45,
 };
 
-/* 80312778-803127B0 30D0B8 0038+00 2/2 0/0 0/0 .text            __ct__13J3DDrawPacketFv */
 J3DDrawPacket::J3DDrawPacket() {
     mFlags = 0;
     mpDisplayListObj = NULL;
     mpTexMtxObj = NULL;
 }
 
-/* 803127B0-8031280C 30D0F0 005C+00 3/2 0/0 0/0 .text            __dt__13J3DDrawPacketFv */
 J3DDrawPacket::~J3DDrawPacket() {}
 
-/* 8031280C-80312898 30D14C 008C+00 1/1 1/1 0/0 .text            newDisplayList__13J3DDrawPacketFUl
- */
 J3DError J3DDrawPacket::newDisplayList(u32 size) {
     mpDisplayListObj = new J3DDisplayListObj();
 
@@ -172,7 +156,6 @@ J3DError J3DDrawPacket::newDisplayList(u32 size) {
     return kJ3DError_Success;
 }
 
-/* 80312898-80312924 30D1D8 008C+00 0/0 1/1 0/0 .text newSingleDisplayList__13J3DDrawPacketFUl */
 J3DError J3DDrawPacket::newSingleDisplayList(u32 size) {
     mpDisplayListObj = new J3DDisplayListObj();
 
@@ -190,7 +173,6 @@ void J3DDrawPacket::draw() {
     callDL();
 }
 
-/* 80312948-803129A4 30D288 005C+00 0/0 1/1 0/0 .text            __ct__12J3DMatPacketFv */
 J3DMatPacket::J3DMatPacket() {
     mpInitShapePacket = NULL;
     mpShapePacket = NULL;
@@ -200,7 +182,6 @@ J3DMatPacket::J3DMatPacket() {
     mpMaterialAnm = NULL;
 }
 
-/* 803129A4-80312A04 30D2E4 0060+00 1/0 1/1 0/0 .text            __dt__12J3DMatPacketFv */
 J3DMatPacket::~J3DMatPacket() {}
 
 void J3DMatPacket::addShapePacket(J3DShapePacket* pShape) {
@@ -220,13 +201,11 @@ void J3DMatPacket::endDiff() {
     mpInitShapePacket->endDL();
 }
 
-/* 80312A74-80312A9C 30D3B4 0028+00 0/0 1/1 0/0 .text isSame__12J3DMatPacketCFP12J3DMatPacket */
 bool J3DMatPacket::isSame(J3DMatPacket* pOther) const {
     J3D_ASSERT_NULLPTR(521, pOther != NULL);
     return mDiffFlag == pOther->mDiffFlag && (mDiffFlag >> 31) == 0;
 }
 
-/* 80312A9C-80312B20 30D3DC 0084+00 1/0 0/0 0/0 .text            draw__12J3DMatPacketFv */
 void J3DMatPacket::draw() {
     mpMaterial->load();
     callDL();
@@ -246,7 +225,6 @@ void J3DMatPacket::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 80312B20-80312B74 30D460 0054+00 0/0 1/1 0/0 .text            __ct__14J3DShapePacketFv */
 J3DShapePacket::J3DShapePacket() {
     mpShape = NULL;
     mpMtxBuffer = NULL;
@@ -255,11 +233,8 @@ J3DShapePacket::J3DShapePacket() {
     mpModel = NULL;
 }
 
-/* 80312B74-80312BD4 30D4B4 0060+00 1/0 1/1 0/0 .text            __dt__14J3DShapePacketFv */
 J3DShapePacket::~J3DShapePacket() {}
 
-/* 80312BD4-80312DBC 30D514 01E8+00 1/1 0/0 0/0 .text calcDifferedBufferSize__14J3DShapePacketFUl
- */
 u32 J3DShapePacket::calcDifferedBufferSize(u32 diffFlags) {
     u32 bufferSize = 0;
 
@@ -324,8 +299,6 @@ u32 J3DShapePacket::calcDifferedBufferSize(u32 diffFlags) {
     return OSRoundUp32B(bufferSize);
 }
 
-/* 80312DBC-80312E08 30D6FC 004C+00 0/0 1/1 0/0 .text newDifferedDisplayList__14J3DShapePacketFUl
- */
 int J3DShapePacket::newDifferedDisplayList(u32 diffFlags) {
     mDiffFlag = diffFlags;
 
@@ -340,7 +313,6 @@ int J3DShapePacket::newDifferedDisplayList(u32 diffFlags) {
     return kJ3DError_Success;
 }
 
-/* 80312E08-80312F24 30D748 011C+00 2/2 0/0 0/0 .text            prepareDraw__14J3DShapePacketCFv */
 void J3DShapePacket::prepareDraw() const {
     mpModel->getVertexBuffer()->setArray();
     j3dSys.setModel(mpModel);
@@ -375,7 +347,6 @@ void J3DShapePacket::prepareDraw() const {
     mpModel->getModelData()->syncJ3DSysFlags();
 }
 
-/* 80312F24-80312FBC 30D864 0098+00 1/0 0/0 0/0 .text            draw__14J3DShapePacketFv */
 void J3DShapePacket::draw() {
     if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
         prepareDraw();
@@ -395,7 +366,6 @@ void J3DShapePacket::draw() {
     }
 }
 
-/* 80312FBC-80313044 30D8FC 0088+00 1/1 2/2 1/1 .text            drawFast__14J3DShapePacketFv */
 void J3DShapePacket::drawFast() {
     if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) {
         prepareDraw();
@@ -411,10 +381,8 @@ void J3DShapePacket::drawFast() {
     }
 }
 
-/* 80313044-80313048 30D984 0004+00 1/0 0/0 0/0 .text            draw__9J3DPacketFv */
 void J3DPacket::draw() {}
 
-/* 80313048-803130A8 30D988 0060+00 1/0 0/0 0/0 .text entry__12J3DMatPacketFP13J3DDrawBuffer */
 int J3DMatPacket::entry(J3DDrawBuffer* pBuffer) {
     J3DDrawBuffer::sortFunc func = J3DDrawBuffer::sortFuncTable[pBuffer->getSortMode()];
     return (pBuffer->*func)(this);
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index bdce275948..1c7500fac4 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -35,7 +35,6 @@ void J3DShape::initialize() {
     mHasPNMTXIdx = false;
 }
 
-/* 80314BB8-80314CBC 30F4F8 0104+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl */
 void J3DShape::addTexMtxIndexInDL(GXAttr attr, u32 valueBase) {
     u32 kSize[] = {0, 1, 1, 2};
 
@@ -63,7 +62,6 @@ void J3DShape::addTexMtxIndexInDL(GXAttr attr, u32 valueBase) {
         getShapeDraw(i)->addTexMtxIndexInDL(stride, attrOffs, (s32)valueBase);
 }
 
-/* 80314CBC-80314DA8 30F5FC 00EC+00 0/0 1/1 0/0 .text addTexMtxIndexInVcd__8J3DShapeF7_GXAttr */
 void J3DShape::addTexMtxIndexInVcd(GXAttr attr) {
     u32 kSize[] = {0, 1, 1, 2};  // stripped data
 
@@ -108,14 +106,11 @@ void J3DShape::addTexMtxIndexInVcd(GXAttr attr) {
     makeVcdVatCmd();
 }
 
-/* 80314DA8-80314E28 30F6E8 0080+00 0/0 1/1 0/0 .text
- * calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f               */
 void J3DShape::calcNBTScale(const Vec& param_0, f32 (*param_1)[3][3], f32 (*param_2)[3][3]) {
     for (u16 i = 0; i < mMtxGroupNum; i++)
         mShapeMtx[i]->calcNBTScale(param_0, param_1, param_2);
 }
 
-/* 80314E28-80314E98 30F768 0070+00 0/0 1/1 0/0 .text            countBumpMtxNum__8J3DShapeCFv */
 u16 J3DShape::countBumpMtxNum() const {
     u16 num = 0;
     for (u16 i = 0; i < mMtxGroupNum; i++)
@@ -124,20 +119,17 @@ u16 J3DShape::countBumpMtxNum() const {
     return num;
 }
 
-/* 80314E98-80314EB0 30F7D8 0018+00 1/1 0/0 0/0 .text            J3DLoadCPCmd__FUcUl */
 void J3DLoadCPCmd(u8 addr, u32 val) {
     GXCmd1u8(GX_LOAD_CP_REG);
     GXCmd1u8(addr);
     GXCmd1u32(val);
 }
 
-/* 80314EB0-80314EEC 30F7F0 003C+00 1/1 0/0 0/0 .text            J3DLoadArrayBasePtr__F7_GXAttrPv */
 static void J3DLoadArrayBasePtr(GXAttr attr, void* data) {
     u32 idx = (attr == GX_VA_NBT) ? 1 : (attr - GX_VA_POS);
     J3DLoadCPCmd(0xA0 + idx, ((uintptr_t)data & 0x7FFFFFFF));
 }
 
-/* 80314EEC-80314F5C 30F82C 0070+00 3/3 0/0 0/0 .text            loadVtxArray__8J3DShapeCFv */
 void J3DShape::loadVtxArray() const {
     J3DLoadArrayBasePtr(GX_VA_POS, j3dSys.getVtxPos());
 
@@ -148,7 +140,6 @@ void J3DShape::loadVtxArray() const {
     J3DLoadArrayBasePtr(GX_VA_CLR0, j3dSys.getVtxCol());
 }
 
-/* 80314F5C-80314F98 30F89C 003C+00 0/0 1/1 0/0 .text isSameVcdVatCmd__8J3DShapeFP8J3DShape */
 bool J3DShape::isSameVcdVatCmd(J3DShape* other) {
     u8* a = (u8*)other->getVcdVatCmd();
     u8* b = mVcdVatCmd;
@@ -159,7 +150,6 @@ bool J3DShape::isSameVcdVatCmd(J3DShape* other) {
     return true;
 }
 
-/* 80314F98-80315260 30F8D8 02C8+00 1/1 0/0 0/0 .text            makeVtxArrayCmd__8J3DShapeFv */
 void J3DShape::makeVtxArrayCmd() {
     GXVtxAttrFmtList* vtxAttr = mVertexData->getVtxAttrFmtList();
 
@@ -237,7 +227,6 @@ void J3DShape::makeVtxArrayCmd() {
     }
 }
 
-/* 80315260-80315300 30FBA0 00A0+00 1/1 2/2 0/0 .text            makeVcdVatCmd__8J3DShapeFv */
 void J3DShape::makeVcdVatCmd() {
     static BOOL sInterruptFlag = OSDisableInterrupts();
     OSDisableScheduler();
@@ -255,14 +244,12 @@ void J3DShape::makeVcdVatCmd() {
     OSRestoreInterrupts(sInterruptFlag);
 }
 
-/* 804515D0-804515D4 000AD0 0004+00 5/5 25/25 9/9 .sbss            sOldVcdVatCmd__8J3DShape */
 void* J3DShape::sOldVcdVatCmd;
 
 void J3DShape::loadCurrentMtx() const {
     mCurrentMtx.load();
 }
 
-/* 80315300-80315398 30FC40 0098+00 2/2 6/6 3/3 .text            loadPreDrawSetting__8J3DShapeCFv */
 void J3DShape::loadPreDrawSetting() const {
     if (sOldVcdVatCmd != mVcdVatCmd) {
         GXCallDisplayList(mVcdVatCmd, kVcdVatDLSize);
@@ -272,10 +259,8 @@ void J3DShape::loadPreDrawSetting() const {
     mCurrentMtx.load();
 }
 
-/* 804515D4-804515D8 000AD4 0004+00 3/3 0/0 0/0 .sbss            None */
 bool J3DShape::sEnvelopeFlag;
 
-/* 80315398-8031544C 30FCD8 00B4+00 1/1 0/0 0/0 .text setArrayAndBindPipeline__8J3DShapeCFv */
 void J3DShape::setArrayAndBindPipeline() const {
     J3DShapeMtx::setCurrentPipeline((mFlags & 0x1C) >> 2);
     loadVtxArray();
@@ -287,7 +272,6 @@ void J3DShape::setArrayAndBindPipeline() const {
     J3DShapeMtx::sTexMtxLoadType = getTexMtxLoadType();
 }
 
-/* 8031544C-803155E0 30FD8C 0194+00 1/0 0/0 0/0 .text            drawFast__8J3DShapeCFv */
 void J3DShape::drawFast() const {
     if (sOldVcdVatCmd != mVcdVatCmd) {
         GXCallDisplayList(mVcdVatCmd, kVcdVatDLSize);
@@ -317,14 +301,12 @@ void J3DShape::drawFast() const {
     }
 }
 
-/* 803155E0-80315628 30FF20 0048+00 1/0 0/0 0/0 .text            draw__8J3DShapeCFv */
 void J3DShape::draw() const {
     resetVcdVatCache();
     loadPreDrawSetting();
     drawFast();
 }
 
-/* 80315628-803156AC 30FF68 0084+00 1/0 0/0 0/0 .text            simpleDraw__8J3DShapeCFv */
 void J3DShape::simpleDraw() const {
     resetVcdVatCache();
     loadPreDrawSetting();
@@ -337,7 +319,6 @@ void J3DShape::simpleDraw() const {
     }
 }
 
-/* 803156AC-803157A0 30FFEC 00F4+00 1/0 0/0 0/0 .text            simpleDrawCache__8J3DShapeCFv */
 void J3DShape::simpleDrawCache() const {
     if (sOldVcdVatCmd != mVcdVatCmd) {
         GXCallDisplayList(mVcdVatCmd, kVcdVatDLSize);
diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index c4e76db60b..fcfec6e2a4 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -6,7 +6,6 @@
 #include <stdint.h>
 #include <dolphin/gx.h>
 
-/* 80314924-80314974 30F264 0050+00 1/1 0/0 0/0 .text            countVertex__12J3DShapeDrawFUl */
 u32 J3DShapeDraw::countVertex(u32 stride) {
     u32 count = 0;
     uintptr_t dlStart = (uintptr_t)getDisplayList();
@@ -23,7 +22,6 @@ u32 J3DShapeDraw::countVertex(u32 stride) {
     return count;
 }
 
-/* 80314974-80314ABC 30F2B4 0148+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl */
 // NONMATCHING regalloc
 void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
     u32 byteNum = countVertex(stride);
@@ -70,16 +68,13 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) {
     DCStoreRange(newDLStart, mDisplayListSize);
 }
 
-/* 80314ABC-80314AD4 30F3FC 0018+00 0/0 1/1 0/0 .text            __ct__12J3DShapeDrawFPCUcUl */
 J3DShapeDraw::J3DShapeDraw(const u8* displayList, u32 displayListSize) {
     mDisplayList = (void*)displayList;
     mDisplayListSize = displayListSize;
 }
 
-/* 80314AD4-80314B00 30F414 002C+00 0/0 3/3 0/0 .text            draw__12J3DShapeDrawCFv */
 void J3DShapeDraw::draw() const {
     GXCallDisplayList(mDisplayList, mDisplayListSize);
 }
 
-/* 80314B00-80314B48 30F440 0048+00 1/0 0/0 0/0 .text            __dt__12J3DShapeDrawFv */
 J3DShapeDraw::~J3DShapeDraw() {}
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index f4b85045cd..1f678df4be 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -6,11 +6,8 @@
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 
-/* 80434C80-80434C98 0619A0 0014+04 2/2 0/0 0/0 .bss             sMtxLoadCache__11J3DShapeMtx */
 u16 J3DShapeMtx::sMtxLoadCache[10];
 
-/* 803130A8-803130E4 30D9E8 003C+00 0/0 1/1 0/0 .text            resetMtxLoadCache__11J3DShapeMtxFv
- */
 void J3DShapeMtx::resetMtxLoadCache() {
     sMtxLoadCache[0] =
     sMtxLoadCache[1] =
@@ -24,32 +21,27 @@ void J3DShapeMtx::resetMtxLoadCache() {
     sMtxLoadCache[9] = 0xFFFF;
 }
 
-/* 803130E4-80313128 30DA24 0044+00 1/0 0/0 0/0 .text loadMtxIndx_PNGP__11J3DShapeMtxCFiUs */
 void J3DShapeMtx::loadMtxIndx_PNGP(int slot, u16 indx) const {
     // J3DFifoLoadPosMtxIndx(indx, slot * 3);  // matches debug, but not retail 
     J3DFifoLoadIndx(GX_LOAD_INDX_A, indx, 0xB000 | ((u16)(slot * 0x0C)));
     J3DFifoLoadNrmMtxIndx3x3(indx, slot * 3);
 }
 
-/* 80313128-80313188 30DA68 0060+00 1/0 0/0 0/0 .text loadMtxIndx_PCPU__11J3DShapeMtxCFiUs */
 void J3DShapeMtx::loadMtxIndx_PCPU(int slot, u16 indx) const {
     J3DFifoLoadPosMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
     j3dSys.loadNrmMtxIndx(slot, indx);
 }
 
-/* 80313188-803131D4 30DAC8 004C+00 1/0 0/0 0/0 .text loadMtxIndx_NCPU__11J3DShapeMtxCFiUs */
 void J3DShapeMtx::loadMtxIndx_NCPU(int slot, u16 indx) const {
     j3dSys.loadPosMtxIndx(slot, indx);
     J3DFifoLoadNrmMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
 }
 
-/* 803131D4-8031322C 30DB14 0058+00 1/0 0/0 0/0 .text loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs */
 void J3DShapeMtx::loadMtxIndx_PNCPU(int slot, u16 indx) const {
     J3DFifoLoadPosMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
     J3DFifoLoadNrmMtxImm(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3);
 }
 
-/* 803CD9C0-803CD9F0 02AAE0 0030+00 2/3 0/0 0/0 .data            sMtxLoadPipeline__11J3DShapeMtx */
 J3DShapeMtx_LoadFunc J3DShapeMtx::sMtxLoadPipeline[4] = {
     &J3DShapeMtx::loadMtxIndx_PNGP,
     &J3DShapeMtx::loadMtxIndx_PCPU,
@@ -57,7 +49,6 @@ J3DShapeMtx_LoadFunc J3DShapeMtx::sMtxLoadPipeline[4] = {
     &J3DShapeMtx::loadMtxIndx_PNCPU,
 };
 
-/* 803CDA20-803CDA50 02AB40 0030+00 2/3 0/0 0/0 .data sMtxLoadPipeline__21J3DShapeMtxConcatView */
 J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadPipeline[4] = {
     &J3DShapeMtxConcatView::loadMtxConcatView_PNGP,
     &J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
@@ -65,8 +56,6 @@ J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadPipeline[4] = {
     &J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
 };
 
-/* 803CDA80-803CDAB0 02ABA0 0030+00 1/2 0/0 0/0 .data sMtxLoadLODPipeline__21J3DShapeMtxConcatView
- */
 J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = {
     &J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD,
     &J3DShapeMtxConcatView::loadMtxConcatView_PCPU,
@@ -74,10 +63,8 @@ J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = {
     &J3DShapeMtxConcatView::loadMtxConcatView_PNCPU,
 };
 
-/* 804515A8-804515AC 000AA8 0004+00 4/4 2/2 0/0 .sbss            sCurrentPipeline__11J3DShapeMtx */
 u32 J3DShapeMtx::sCurrentPipeline;
 
-/* 804515AC-804515B0 000AAC 0004+00 3/3 1/1 0/0 .sbss            sCurrentScaleFlag__11J3DShapeMtx */
 u8* J3DShapeMtx::sCurrentScaleFlag;
 
 // This below is technically part of J3DScaleFlag.
@@ -87,21 +74,14 @@ bool J3DShapeMtx::sNBTFlag;
 /* 804515B1 0003+00 data_804515B1 None */
 bool J3DShapeMtx::sLODFlag;
 
-/* 804515B4-804515B8 000AB4 0004+00 4/4 1/1 0/0 .sbss            sTexMtxLoadType__11J3DShapeMtx */
 u32 J3DShapeMtx::sTexMtxLoadType;
 
-/* 804515B8-804515C0 000AB8 0008+00 2/2 0/0 0/0 .sbss            sMtxPtrTbl__21J3DShapeMtxConcatView
- */
 MtxP J3DShapeMtxConcatView::sMtxPtrTbl[2];
 
-/* 804515C0-804515C4 000AC0 0004+00 6/6 2/2 0/0 .sbss            sTexGenBlock__17J3DDifferedTexMtx
- */
 J3DTexGenBlock* J3DDifferedTexMtx::sTexGenBlock;
 
-/* 804515C4-804515C8 000AC4 0004+00 1/1 2/2 0/0 .sbss            sTexMtxObj__17J3DDifferedTexMtx */
 J3DTexMtxObj* J3DDifferedTexMtx::sTexMtxObj;
 
-/* 8031322C-80313828 30DB6C 05FC+00 7/5 0/0 0/0 .text loadExecute__17J3DDifferedTexMtxFPA4_Cf */
 void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
     static Mtx qMtx = {
         {0.5f, 0.0f, 0.5f, 0.0f},
@@ -312,8 +292,6 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) {
     }
 }
 
-/* 80313828-803138C8 30E168 00A0+00 1/0 0/0 0/0 .text
- * loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs         */
 void J3DShapeMtxConcatView::loadMtxConcatView_PNGP(int slot, u16 drw) const {
     Mtx m;
     MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
@@ -322,8 +300,6 @@ void J3DShapeMtxConcatView::loadMtxConcatView_PNGP(int slot, u16 drw) const {
     loadNrmMtx(slot, drw, m);
 }
 
-/* 803138C8-8031396C 30E208 00A4+00 2/0 0/0 0/0 .text
- * loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs         */
 void J3DShapeMtxConcatView::loadMtxConcatView_PCPU(int slot, u16 drw) const {
     Mtx m;
     MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
@@ -332,8 +308,6 @@ void J3DShapeMtxConcatView::loadMtxConcatView_PCPU(int slot, u16 drw) const {
     loadNrmMtx(slot, drw, m);
 }
 
-/* 8031396C-80313A14 30E2AC 00A8+00 2/0 0/0 0/0 .text
- * loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs         */
 void J3DShapeMtxConcatView::loadMtxConcatView_NCPU(int slot, u16 drw) const {
     Mtx m;
     MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
@@ -345,8 +319,6 @@ void J3DShapeMtxConcatView::loadMtxConcatView_NCPU(int slot, u16 drw) const {
         J3DFifoLoadNrmMtxToTexMtx(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3 + GX_TEXMTX0);
 }
 
-/* 80313A14-80313AC8 30E354 00B4+00 2/0 0/0 0/0 .text
- * loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs        */
 void J3DShapeMtxConcatView::loadMtxConcatView_PNCPU(int slot, u16 drw) const {
     if (J3DDifferedTexMtx::sTexGenBlock != NULL) {
         Mtx m;
@@ -361,8 +333,6 @@ void J3DShapeMtxConcatView::loadMtxConcatView_PNCPU(int slot, u16 drw) const {
         J3DFifoLoadNrmMtxToTexMtx(*j3dSys.getShapePacket()->getBaseMtxPtr(), slot * 3 + GX_TEXMTX0);
 }
 
-/* 80313AC8-80313B94 30E408 00CC+00 1/0 0/0 0/0 .text
- * loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs     */
 void J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD(int slot, u16 drw) const {
     Mtx m;
     MTXConcat(*j3dSys.getShapePacket()->getBaseMtxPtr(), j3dSys.getModelDrawMtx(drw), m);
@@ -372,20 +342,16 @@ void J3DShapeMtxConcatView::loadMtxConcatView_PNGP_LOD(int slot, u16 drw) const
     loadNrmMtx(slot, drw, m);
 }
 
-/* 80313B94-80313BF0 30E4D4 005C+00 1/0 0/0 0/0 .text            load__11J3DShapeMtxCFv */
 void J3DShapeMtx::load() const {
     J3DShapeMtx_LoadFunc func = sMtxLoadPipeline[sCurrentPipeline];
     (this->*func)(0, mUseMtxIndex);
 }
 
-/* 80313BF0-80313C54 30E530 0064+00 5/0 0/0 0/0 .text
- * calcNBTScale__11J3DShapeMtxFRC3VecPA3_A3_fPA3_A3_f           */
 void J3DShapeMtx::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* param_2) {
     J3DPSMtx33Copy(param_1[mUseMtxIndex], param_2[mUseMtxIndex]);
     J3DScaleNrmMtx33(param_2[mUseMtxIndex], param_0);
 }
 
-/* 80313C54-80313D28 30E594 00D4+00 1/0 0/0 0/0 .text            load__21J3DShapeMtxConcatViewCFv */
 void J3DShapeMtxConcatView::load() const {
     sMtxPtrTbl[0] = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(0);
     sMtxPtrTbl[1] = j3dSys.getModel()->getWeightAnmMtx(0);
@@ -397,8 +363,6 @@ void J3DShapeMtxConcatView::load() const {
     (this->*func)(0, draw_mtx_index);
 }
 
-/* 80313D28-80313E4C 30E668 0124+00 3/0 0/0 0/0 .text
- * loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f                */
 void J3DShapeMtxConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) const {
     if (sCurrentScaleFlag[param_1] == 1) {
         if (sTexMtxLoadType == 0x2000) {
@@ -431,7 +395,6 @@ void J3DShapeMtxConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) c
     }
 }
 
-/* 80313E4C-80313EEC 30E78C 00A0+00 1/0 0/0 0/0 .text            load__16J3DShapeMtxMultiCFv */
 void J3DShapeMtxMulti::load() const {
     J3DShapeMtx_LoadFunc func = sMtxLoadPipeline[sCurrentPipeline];
 
@@ -443,8 +406,6 @@ void J3DShapeMtxMulti::load() const {
     }
 }
 
-/* 80313EEC-80313FA4 30E82C 00B8+00 1/0 0/0 0/0 .text
- * calcNBTScale__16J3DShapeMtxMultiFRC3VecPA3_A3_fPA3_A3_f      */
 void J3DShapeMtxMulti::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* param_2) {
     int use_mtx_num = mUseMtxNum;
     for (int i = 0; i < use_mtx_num; i++) {
@@ -455,7 +416,6 @@ void J3DShapeMtxMulti::calcNBTScale(Vec const& param_0, Mtx33* param_1, Mtx33* p
     }
 }
 
-/* 80313FA4-8031419C 30E8E4 01F8+00 1/0 0/0 0/0 .text load__26J3DShapeMtxMultiConcatViewCFv */
 void J3DShapeMtxMultiConcatView::load() const {
     sMtxPtrTbl[0] = j3dSys.getModel()->getMtxBuffer()->getUserAnmMtx(0);
     sMtxPtrTbl[1] = j3dSys.getModel()->getWeightAnmMtx(0);
@@ -494,8 +454,6 @@ void J3DShapeMtxMultiConcatView::load() const {
     }
 }
 
-/* 8031419C-803142D4 30EADC 0138+00 1/0 0/0 0/0 .text
- * loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f           */
 void J3DShapeMtxMultiConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param_2) const {
     Mtx33 mtx1, mtx2;
     if (sCurrentScaleFlag[param_1] == 1) {
@@ -525,7 +483,6 @@ void J3DShapeMtxMultiConcatView::loadNrmMtx(int param_0, u16 param_1, MtxP param
     }
 }
 
-/* 803142D4-803143E4 30EC14 0110+00 1/0 0/0 0/0 .text load__27J3DShapeMtxBBoardConcatViewCFv */
 void J3DShapeMtxBBoardConcatView::load() const {
     Mtx mtx;
     u16 draw_mtx_index = j3dSys.getModel()->getModelData()->getDrawMtxIndex(mUseMtxIndex);
@@ -556,7 +513,6 @@ void J3DShapeMtxBBoardConcatView::load() const {
     }
 }
 
-/* 803143E4-80314520 30ED24 013C+00 1/0 0/0 0/0 .text load__28J3DShapeMtxYBBoardConcatViewCFv */
 void J3DShapeMtxYBBoardConcatView::load() const {
     Mtx mtx1;
     Mtx33 mtx2;
diff --git a/src/JSystem/J3DGraphBase/J3DStruct.cpp b/src/JSystem/J3DGraphBase/J3DStruct.cpp
index 4d2045a779..bc455e62c1 100644
--- a/src/JSystem/J3DGraphBase/J3DStruct.cpp
+++ b/src/JSystem/J3DGraphBase/J3DStruct.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/JMath/JMath.h"
 
-/* 803256C4-80325718 320004 0054+00 0/0 11/11 24/24 .text __as__12J3DLightInfoFRC12J3DLightInfo */
 J3DLightInfo& J3DLightInfo::operator=(J3DLightInfo const& param_0) {
     JMath::gekko_ps_copy6(&mLightPosition, &param_0.mLightPosition);
     mColor = param_0.mColor;
@@ -15,7 +14,6 @@ J3DLightInfo& J3DLightInfo::operator=(J3DLightInfo const& param_0) {
     return *this;
 }
 
-/* 80325718-80325794 320058 007C+00 0/0 4/4 0/0 .text __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo */
 J3DTexMtxInfo& J3DTexMtxInfo::operator=(J3DTexMtxInfo const& param_0) {
     mProjection = param_0.mProjection;
     mInfo = param_0.mInfo;
@@ -30,9 +28,8 @@ static f32 dummyLiteralOrder() {
     return 1.0f;
 }
 
-/* 80325794-803257DC 3200D4 0048+00 0/0 2/2 7/7 .text            setEffectMtx__13J3DTexMtxInfoFPA4_f
- */
 void J3DTexMtxInfo::setEffectMtx(Mtx param_0) {
+#ifdef __MWERKS__
     JMath::gekko_ps_copy12(&mEffectMtx, param_0);
     register f32 zero = 0.0f;
     register f32* mtx = (f32*)mEffectMtx;
@@ -41,18 +38,15 @@ void J3DTexMtxInfo::setEffectMtx(Mtx param_0) {
     };
     mEffectMtx[3][2] = 0.0f;
     mEffectMtx[3][3] = 1.0f;
+#endif
 }
 
-/* 803257DC-80325800 32011C 0024+00 0/0 5/5 0/0 .text
- * __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo                */
 J3DIndTexMtxInfo& J3DIndTexMtxInfo::operator=(J3DIndTexMtxInfo const& param_0) {
     JMath::gekko_ps_copy6(field_0x0, param_0.field_0x0);
     field_0x18 = param_0.field_0x18;
     return *this;
 }
 
-/* 80325800-8032587C 320140 007C+00 0/0 6/6 0/0 .text            __as__10J3DFogInfoFRC10J3DFogInfo
- */
 J3DFogInfo& J3DFogInfo::operator=(J3DFogInfo const& param_0) {
     mType = param_0.mType;
     mAdjEnable = param_0.mAdjEnable;
@@ -68,8 +62,6 @@ J3DFogInfo& J3DFogInfo::operator=(J3DFogInfo const& param_0) {
     return *this;
 }
 
-/* 8032587C-803258A0 3201BC 0024+00 0/0 6/6 0/0 .text __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo
- */
 J3DNBTScaleInfo& J3DNBTScaleInfo::operator=(J3DNBTScaleInfo const& param_0) {
     mbHasScale = param_0.mbHasScale;
     mScale = param_0.mScale;
diff --git a/src/JSystem/J3DGraphBase/J3DSys.cpp b/src/JSystem/J3DGraphBase/J3DSys.cpp
index 8783ad78a8..fc59161b07 100644
--- a/src/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/src/JSystem/J3DGraphBase/J3DSys.cpp
@@ -6,47 +6,35 @@
 #include "JSystem/J3DGraphBase/J3DFifo.h"
 #include "global.h"
 
-/* 80434AC8-80434BE4 0617E8 011C+00 1/1 151/151 486/486 .bss             j3dSys */
 J3DSys j3dSys;
 
-/* 80434BE4-80434C14 061904 0030+00 0/0 17/17 154/154 .bss             mCurrentMtx__6J3DSys */
 Mtx J3DSys::mCurrentMtx;
 
-/* 80434C14-80434C20 061934 000C+00 0/0 6/6 0/0 .bss             mCurrentS__6J3DSys */
 Vec J3DSys::mCurrentS;
 
-/* 80434C20-80434C2C 061940 000C+00 0/0 5/5 0/0 .bss             mParentS__6J3DSys */
 Vec J3DSys::mParentS;
 
-/* 80434C2C-80434C70 06194C 0040+04 1/1 17/17 0/0 .bss             sTexCoordScaleTable__6J3DSys */
 J3DTexCoordScaleInfo J3DSys::sTexCoordScaleTable[8];
 
-/* 803CD8A0-803CD8B0 02A9C0 0010+00 1/1 0/0 0/0 .data            NullTexData */
-static u8 NullTexData[0x10] ALIGN_DECL(32) = {0};
+static u8 NullTexData[0x10] ATTRIBUTE_ALIGN(32) = {0};
 
-/* 803CD8B0-803CD8E0 02A9D0 0030+00 1/1 0/0 0/0 .data            j3dIdentityMtx */
 static Mtx j3dIdentityMtx = {
     1.0f, 0.0f, 0.0f, 0.0f,
     0.0f, 1.0f, 0.0f, 0.0f,
     0.0f, 0.0f, 1.0f, 0.0f,
 };
 
-/* 803CD8E0-803CD8F8 02AA00 0018+00 1/1 0/0 0/0 .data            IndMtx */
 static Mtx23 IndMtx = {
     0.5f, 0.0f, 0.0f,
     0.0f, 0.5f, 0.0f,
 };
 
-/* 80451598-804515A0 000A98 0004+04 0/0 1/1 0/0 .sbss            j3dDefaultViewNo */
 u32 j3dDefaultViewNo;
 
-/* 80450950-80450954 0003D0 0004+00 2/2 0/0 0/0 .sdata           ColorBlack */
 static GXColor ColorBlack = {0x00, 0x00, 0x00, 0x00};
 
-/* 80450954-80450958 0003D4 0004+00 2/2 0/0 0/0 .sdata           ColorWhite */
 static GXColor ColorWhite = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 8030FDE8-8030FEC0 30A728 00D8+00 1/1 0/0 0/0 .text            __ct__6J3DSysFv */
 J3DSys::J3DSys() {
     makeTexCoordTable();
     makeTevSwapTable();
@@ -80,19 +68,15 @@ J3DSys::J3DSys() {
     }
 }
 
-/* 8030FEC0-8030FEE4 30A800 0024+00 0/0 1/1 0/0 .text            loadPosMtxIndx__6J3DSysCFiUs */
 void J3DSys::loadPosMtxIndx(int addr, u16 indx) const {
     // J3DFifoLoadPosMtxIndx(indx, addr * 3);  // matches debug, not retail
     J3DFifoLoadIndx(GX_LOAD_INDX_A, indx, 0xB000 | ((u16)(addr * 0x0C)));
 }
 
-/* 8030FEE4-8030FF0C 30A824 0028+00 0/0 1/1 0/0 .text            loadNrmMtxIndx__6J3DSysCFiUs */
 void J3DSys::loadNrmMtxIndx(int addr, u16 indx) const {
     J3DFifoLoadNrmMtxIndx3x3(indx, addr * 3);
 }
 
-/* 8030FF0C-803100BC 30A84C 01B0+00 1/1 0/0 0/0 .text setTexCacheRegion__6J3DSysF15_GXTexCacheSize
- */
 void J3DSys::setTexCacheRegion(GXTexCacheSize size) {
     J3D_ASSERT_RANGE(173, size >= 0 && size < 3);
 
@@ -131,7 +115,6 @@ void J3DSys::setTexCacheRegion(GXTexCacheSize size) {
     }
 }
 
-/* 803100BC-8031073C 30A9FC 0680+00 0/0 3/3 0/0 .text            drawInit__6J3DSysFv */
 void J3DSys::drawInit() {
     GXInvalidateVtxCache();
     GXSetCurrentMtx(GX_PNMTX0);
@@ -237,7 +220,6 @@ void J3DSys::drawInit() {
     setTexCacheRegion(GX_TEXCACHE_32K);
 }
 
-/* 8031073C-8031079C 30B07C 0060+00 0/0 16/16 6/6 .text            reinitGX__6J3DSysFv */
 void J3DSys::reinitGX() {
     reinitGenMode();
     reinitLighting();
@@ -249,7 +231,6 @@ void J3DSys::reinitGX() {
     GXFlush();
 }
 
-/* 8031079C-803107E8 30B0DC 004C+00 1/1 0/0 0/0 .text            reinitGenMode__6J3DSysFv */
 void J3DSys::reinitGenMode() {
     GXSetNumChans(0);
     GXSetNumTexGens(1);
@@ -259,7 +240,6 @@ void J3DSys::reinitGenMode() {
     GXSetCoPlanar(GX_FALSE);
 }
 
-/* 803107E8-80310894 30B128 00AC+00 1/1 0/0 0/0 .text            reinitLighting__6J3DSysFv */
 void J3DSys::reinitLighting() {
     GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE,
                   GX_AF_NONE);
@@ -271,7 +251,6 @@ void J3DSys::reinitLighting() {
     GXSetChanMatColor(GX_COLOR1A1, ColorWhite);
 }
 
-/* 80310894-80310998 30B1D4 0104+00 1/1 0/0 0/0 .text            reinitTransform__6J3DSysFv */
 void J3DSys::reinitTransform() {
     GXSetCurrentMtx(GX_PNMTX0);
     GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);
@@ -284,7 +263,6 @@ void J3DSys::reinitTransform() {
     GXSetTexCoordGen(GX_TEXCOORD7, GX_TG_MTX2x4, GX_TG_TEX7, GX_IDENTITY);
 }
 
-/* 80310998-80310A3C 30B2D8 00A4+00 2/2 0/0 0/0 .text            reinitTexture__6J3DSysFv */
 void J3DSys::reinitTexture() {
     GXTexObj texObj;
     GXInitTexObj(&texObj, NullTexData, 4, 4, GX_TF_IA8, GX_CLAMP, GX_CLAMP, GX_FALSE);
@@ -298,7 +276,6 @@ void J3DSys::reinitTexture() {
     GXLoadTexObj(&texObj, GX_TEXMAP7);
 }
 
-/* 80310A3C-80310D44 30B37C 0308+00 1/1 0/0 0/0 .text            reinitTevStages__6J3DSysFv */
 void J3DSys::reinitTevStages() {
     GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL);
     GXSetTevOrder(GX_TEVSTAGE1, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL);
@@ -346,7 +323,6 @@ void J3DSys::reinitTevStages() {
     GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0);
 }
 
-/* 80310D44-80310E3C 30B684 00F8+00 1/1 0/0 0/0 .text            reinitIndStages__6J3DSysFv */
 void J3DSys::reinitIndStages() {
     u32 i;
     for (i = 0; i < GX_MAX_TEVSTAGE; i++) {
@@ -366,7 +342,6 @@ void J3DSys::reinitIndStages() {
     GXSetIndTexMtx(GX_ITM_2, IndMtx, 1);
 }
 
-/* 80310E3C-80310ED0 30B77C 0094+00 1/1 0/0 0/0 .text            reinitPixelProc__6J3DSysFv */
 void J3DSys::reinitPixelProc() {
     GXSetBlendMode(GX_BM_NONE, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR);
     GXSetColorUpdate(GX_TRUE);
diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp
index ed2f09c36b..86183ea6f0 100644
--- a/src/JSystem/J3DGraphBase/J3DTevs.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp
@@ -14,7 +14,6 @@
 static void J3DGDLoadTexMtxImm(f32 (*)[4], u32, GXTexMtxType);
 static void J3DGDLoadPostTexMtxImm(f32 (*)[4], u32);
 
-/* 80323590-80323644 31DED0 00B4+00 0/0 3/3 0/0 .text            load__11J3DLightObjCFUl */
 void J3DLightObj::load(u32 lightIdx) const {
     GDOverflowCheck(0x48);
     J3DGDSetLightPos(GXLightID(1 << lightIdx), mInfo.mLightPosition.x, mInfo.mLightPosition.y, mInfo.mLightPosition.z);
@@ -23,8 +22,6 @@ void J3DLightObj::load(u32 lightIdx) const {
     J3DGDSetLightDir(GXLightID(1 << lightIdx), mInfo.mLightDirection.x, mInfo.mLightDirection.y, mInfo.mLightDirection.z);
 }
 
-/* 80323644-803238C4 31DF84 0280+00 0/0 3/3 0/0 .text            loadTexCoordGens__FUlP11J3DTexCoord
- */
 void loadTexCoordGens(u32 texGenNum, J3DTexCoord* texCoords) {
     u32 var_r28;
     GDOverflowCheck(texGenNum * 4 * 2 + 10);
@@ -56,7 +53,6 @@ void loadTexCoordGens(u32 texGenNum, J3DTexCoord* texCoords) {
     }
 }
 
-/* 803238C4-80323900 31E204 003C+00 0/0 6/6 0/0 .text            load__9J3DTexMtxCFUl */
 void J3DTexMtx::load(u32 mtxIdx) const {
     if (j3dSys.checkFlag(J3DSysFlag_PostTexMtx)) {
         loadPostTexMtx(mtxIdx);
@@ -65,12 +61,10 @@ void J3DTexMtx::load(u32 mtxIdx) const {
     }
 }
 
-/* 80323900-80323920 31E240 0020+00 0/0 2/2 0/0 .text            calc__9J3DTexMtxFPA4_Cf */
 void J3DTexMtx::calc(f32 const (*param_0)[4]) {
     calcTexMtx(param_0);
 }
 
-/* 80323920-80323C0C 31E260 02EC+00 2/1 0/0 0/0 .text            calcTexMtx__9J3DTexMtxFPA4_Cf */
 void J3DTexMtx::calcTexMtx(const Mtx param_0) {
     Mtx44 mtx1;
     Mtx44 mtx2;
@@ -166,8 +160,6 @@ void J3DTexMtx::calcTexMtx(const Mtx param_0) {
     }
 }
 
-/* 80323C0C-80323F64 31E54C 0358+00 1/0 2/2 0/0 .text            calcPostTexMtx__9J3DTexMtxFPA4_Cf
- */
 void J3DTexMtx::calcPostTexMtx(const Mtx param_0) {
     Mtx44 mtx1;
     Mtx44 mtx2;
@@ -275,7 +267,6 @@ void J3DTexMtx::calcPostTexMtx(const Mtx param_0) {
     }
 }
 
-/* 80323F64-80323F88 31E8A4 0024+00 0/0 1/1 0/0 .text            isTexNoReg__FPv */
 bool isTexNoReg(void* pDL) {
     u8 r31 = ((u8*)pDL)[1];
     if (r31 >= 0x80 && r31 <= 0xbb) {
@@ -284,13 +275,11 @@ bool isTexNoReg(void* pDL) {
     return false;
 }
 
-/* 80323F88-80323F94 31E8C8 000C+00 0/0 1/1 0/0 .text            getTexNoReg__FPv */
 u16 getTexNoReg(void* pDL) {
     u32 var_r31 = *(u32*)((u8*)pDL + 1);
     return var_r31 & 0xFFFFFF;
 }
 
-/* 80323F94-8032413C 31E8D4 01A8+00 0/0 20/20 0/0 .text            loadTexNo__FUlRCUs */
 void loadTexNo(u32 param_0, const u16& texNo) {
     ResTIMG* resTIMG = j3dSys.getTexture()->getResTIMG(texNo);
     J3D_ASSERT_NULLPTR(462, resTIMG != NULL);
@@ -311,7 +300,6 @@ void loadTexNo(u32 param_0, const u16& texNo) {
     }
 }
 
-/* 8032413C-80324160 31EA7C 0024+00 0/0 2/2 0/0 .text            patchTexNo_PtrToIdx__FUlRCUs */
 void patchTexNo_PtrToIdx(u32 texID, const u16& idx) {
     ResTIMG* timg = j3dSys.getTexture()->getResTIMG(idx);
     J3D_ASSERT_NULLPTR(523, timg != NULL);
@@ -319,7 +307,6 @@ void patchTexNo_PtrToIdx(u32 texID, const u16& idx) {
     J3DGDSetTexImgPtrRaw(GXTexMapID(texID), idx);
 }
 
-/* 80324160-80324194 31EAA0 0034+00 0/0 2/2 0/0 .text            loadNBTScale__FR11J3DNBTScale */
 void loadNBTScale(J3DNBTScale& NBTScale) {
     if (NBTScale.mbHasScale == true) {
         j3dSys.setNBTScale(&NBTScale.mScale);
@@ -328,7 +315,6 @@ void loadNBTScale(J3DNBTScale& NBTScale) {
     }
 }
 
-/* 803A1EC8-803A1EFC 02E528 0034+00 0/0 9/9 24/24 .rodata          j3dDefaultLightInfo */
 extern const J3DLightInfo j3dDefaultLightInfo = {
     0.0f, 0.0f, 0.0f,
     0.0f, -1.0f, 0.0f,
@@ -337,7 +323,6 @@ extern const J3DLightInfo j3dDefaultLightInfo = {
     1.0f, 0.0f, 0.0f,
 };
 
-/* 803A1EFC-803A1F1C 02E55C 0020+00 0/0 5/5 0/0 .rodata          j3dDefaultTexCoordInfo */
 extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
     {GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
     {GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
@@ -345,7 +330,6 @@ extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
     {GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0},
 };
 
-/* 803A1F1C-803A1F80 02E57C 0064+00 0/0 1/1 0/0 .rodata          j3dDefaultTexMtxInfo */
 extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
     0x01,
     0x00,
@@ -357,39 +341,32 @@ extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
      1.0f},
 };
 
-/* 803A1F80-803A1F9C 02E5E0 001C+00 0/0 2/2 0/0 .rodata          j3dDefaultIndTexMtxInfo */
 extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = {
     0.5f, 0.0f, 0.0f,
     0.0f, 0.5f, 0.0f,
     1
 };
 
-/* 803A1F9C-803A1FB0 02E5FC 0014+00 0/0 1/1 0/0 .rodata          j3dDefaultTevStageInfo */
 extern J3DTevStageInfo const j3dDefaultTevStageInfo = {
     0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
     0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
 };
 
-/* 803A1FB0-803A1FBC 02E610 000C+00 0/0 2/2 0/0 .rodata          j3dDefaultIndTevStageInfo */
 extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1FBC-803A1FE8 02E61C 002C+00 0/0 3/3 0/0 .rodata          j3dDefaultFogInfo */
 extern J3DFogInfo const j3dDefaultFogInfo = {
     0x00, 0x00, 0x0140, 0.0f, 0.0f, 0.1f, 10000.0f, 0xFF, 0xFF, 0xFF, 0x00,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-/* 803A1FE8-803A1FF8 02E648 0010+00 0/0 3/3 0/0 .rodata          j3dDefaultNBTScaleInfo */
 extern J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = {
     0x00, 1.0f, 1.0f, 1.0f,
 };
 
-/* 80434C98-80436A60 0619B8 1DC7+01 1/1 0/0 0/0 .bss             j3dTexCoordTable */
 static u8 j3dTexCoordTable[7623];
 
-/* 80324194-8032423C 31EAD4 00A8+00 0/0 1/1 0/0 .text            makeTexCoordTable__Fv */
 void makeTexCoordTable() {
     u8 texMtx[] = {
         GX_TEXMTX0,
@@ -418,13 +395,10 @@ void makeTexCoordTable() {
     }
 }
 
-/* 80436A60-80436E60 063780 0400+00 1/1 3/3 0/0 .bss             j3dTevSwapTableTable */
 u8 j3dTevSwapTableTable[1024];
 
-/* 80436E60-80437160 063B80 0300+00 1/1 2/2 0/0 .bss             j3dAlphaCmpTable */
 u8 j3dAlphaCmpTable[768];
 
-/* 8032423C-803242A8 31EB7C 006C+00 0/0 1/1 0/0 .text            makeAlphaCmpTable__Fv */
 void makeAlphaCmpTable() {
     u8* table = j3dAlphaCmpTable;
     for (u32 i = 0; i < 8; i++) {
@@ -439,11 +413,9 @@ void makeAlphaCmpTable() {
     }
 }
 
-/* 80437160-804371C0 063E80 0060+00 1/1 4/4 5/5 .bss             j3dZModeTable */
 extern u8 j3dZModeTable[96];
 u8 j3dZModeTable[96];
 
-/* 803242A8-80324314 31EBE8 006C+00 0/0 1/1 0/0 .text            makeZModeTable__Fv */
 void makeZModeTable() {
     u8* table = j3dZModeTable;
     for (int i = 0; i < 2; i++) {
@@ -458,7 +430,6 @@ void makeZModeTable() {
     }
 }
 
-/* 80324314-80324358 31EC54 0044+00 0/0 1/1 0/0 .text            makeTevSwapTable__Fv */
 void makeTevSwapTable() {
     u8* table = j3dTevSwapTableTable;
     int i = 0;
@@ -472,20 +443,16 @@ void makeTevSwapTable() {
     } while (i < 256);
 }
 
-/* 80324358-803243BC 31EC98 0064+00 1/1 0/0 0/0 .text            loadTexMtx__9J3DTexMtxCFUl */
 void J3DTexMtx::loadTexMtx(u32 param_0) const {
     GDOverflowCheck(0x35);
 	J3DGDLoadTexMtxImm((MtxP)mMtx, param_0 * 3 + 30, (_GXTexMtxType)mTexMtxInfo.mProjection);
 }
 
-/* 803243BC-8032441C 31ECFC 0060+00 1/1 0/0 0/0 .text            loadPostTexMtx__9J3DTexMtxCFUl */
 void J3DTexMtx::loadPostTexMtx(u32 param_0) const {
     GDOverflowCheck(0x35);
     J3DGDLoadPostTexMtxImm((MtxP)mMtx, param_0 * 3 + 0x40);
 }
 
-/* 8032441C-8032499C 31ED5C 0580+00 1/1 0/0 0/0 .text J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType
- */
 static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType param_3) {
     u16 addr = param_2 << 2;
     u8 len = param_3 == GX_MTX2x4 ? 8 : 12;
@@ -506,7 +473,6 @@ static void J3DGDLoadTexMtxImm(f32 (*param_1)[4], u32 param_2, _GXTexMtxType par
     }
 }
 
-/* 8032499C-80324F08 31F2DC 056C+00 1/1 0/0 0/0 .text            J3DGDLoadPostTexMtxImm__FPA4_fUl */
 static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
     u16 addr = (param_2 - 0x40) * 4 + 0x500;
     int stride = 12;
@@ -526,25 +492,18 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
     J3DGDWrite_f32(param_1[2][3]);
 }
 
-/* 804563C0-804563C4 0049C0 0004+00 0/0 4/4 0/0 .sdata2          j3dDefaultColInfo */
 extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 804563C4-804563C8 0049C4 0004+00 0/0 2/2 0/0 .sdata2          j3dDefaultAmbInfo */
 extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
 
-/* 804563C8-804563CC 0049C8 0004+00 0/0 1/1 0/0 .sdata2          None */
 extern const u8 j3dDefaultNumChans = 1;
 
-/* 804563CC-804563D0 0049CC 0004+00 0/0 3/3 0/0 .sdata2          j3dDefaultTevOrderInfoNull */
 extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
 
-/* 804563D0-804563D4 0049D0 0004+00 0/0 2/2 0/0 .sdata2          j3dDefaultIndTexOrderNull */
 extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00};
 
-/* 804563D4-804563D8 0049D4 0004+00 0/0 5/5 0/0 .sdata2          j3dDefaultTevColor */
 extern const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 804563DC-804563E0 0049DC 0004+00 0/0 2/2 0/0 .sdata2          j3dDefaultIndTexCoordScaleInfo */
 extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
     0x00,
     0x00,
@@ -552,10 +511,8 @@ extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
     0x00,
 };
 
-/* 804563E0-804563E4 0049E0 0004+00 0/0 5/5 0/0 .sdata2          j3dDefaultTevKColor */
 extern const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 804563E4-804563E8 0049E4 0004+00 0/0 2/2 0/0 .sdata2          j3dDefaultTevSwapMode */
 extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
     0x00,
     0x00,
@@ -563,22 +520,16 @@ extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
     0x00,
 };
 
-/* 804563E8-804563EC 0049E8 0004+00 0/0 2/2 0/0 .sdata2          j3dDefaultTevSwapModeTable */
 extern const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03};
 
-/* 804563EC-804563F0 0049EC 0004+00 0/0 3/3 0/0 .sdata2          j3dDefaultBlendInfo */
 extern const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP};
 
-/* 804563F0-804563F8 0049F0 0008+00 0/0 3/3 0/0 .sdata2          j3dDefaultColorChanInfo */
 extern const J3DColorChanInfo j3dDefaultColorChanInfo = {
     0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF,
 };
 
-/* 804563F8-804563FA 0049F8 0002+00 0/0 1/1 0/0 .sdata2          None */
 extern const u8 j3dDefaultTevSwapTableID = 0x1B;
 
-/* 804563FA-804563FC 0049FA 0002+00 0/0 1/1 0/0 .sdata2          j3dDefaultAlphaCmpID */
 const u16 j3dDefaultAlphaCmpID = 0x00E7;
 
-/* 804563FC-80456400 0049FC 0002+02 0/0 3/3 0/0 .sdata2          j3dDefaultZModeID */
 const u16 j3dDefaultZModeID = 0x0017;
diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/src/JSystem/J3DGraphBase/J3DTexture.cpp
index af9584becb..60c0590222 100644
--- a/src/JSystem/J3DGraphBase/J3DTexture.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTexture.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "JSystem/J3DAssert.h"
 
-/* 8031204C-803121A4 30C98C 0158+00 0/0 1/1 0/0 .text loadGX__10J3DTextureCFUs11_GXTexMapID */
 void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
     J3D_ASSERT_RANGE(29, idx < mNum);
 
@@ -33,7 +32,6 @@ void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const {
     GXLoadTexObj(&texObj, texMapID);
 }
 
-/* 803121A4-8031221C 30CAE4 0078+00 1/1 0/0 0/0 .text            entryNum__10J3DTextureFUs */
 void J3DTexture::entryNum(u16 num) {
     J3D_ASSERT_NONZEROARG(79, num != 0);
 
@@ -47,7 +45,6 @@ void J3DTexture::entryNum(u16 num) {
     }
 }
 
-/* 8031221C-80312488 30CB5C 026C+00 0/0 1/1 0/0 .text addResTIMG__10J3DTextureFUsPC7ResTIMG */
 void J3DTexture::addResTIMG(u16 newNum, const ResTIMG* newRes) {
     if (newNum == 0)
         return;
diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp
index 0e31625ada..2e5473ebb8 100644
--- a/src/JSystem/J3DGraphBase/J3DTransform.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp
@@ -5,23 +5,22 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JMath/JMath.h"
 
-/* 80311630-80311638 -00001 0008+00 0/0 0/0 0/0 .text            __MTGQR7__FUl */
 void __MTGQR7(register u32 v) {
+#ifdef __MWERKS__
     // clang-format off
 	asm {
 	    mtspr GQR7, v
     }
     // clang-format on
+#endif
 }
 
-/* 80311638-80311670 30BF78 0038+00 0/0 2/2 0/0 .text            J3DGQRSetup7__FUlUlUlUl */
 void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
     u32 v = ((r0 << 8) + r1) << 16;
 	v |= (r2 << 8) + r3;
     __MTGQR7(v);
 }
 
-/* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text            J3DCalcBBoardMtx__FPA4_f */
 // this uses a non-standard sqrtf, not sure why or how its supposed to be setup
 #if !PLATFORM_SHIELD
 inline f32 J3D_sqrtf(register f32 x) {
@@ -71,18 +70,14 @@ void J3DCalcBBoardMtx(register Mtx mtx) {
 	mtx[2][2] = z;
 }
 
-/* 803A1E30-803A1E50 02E490 0020+00 0/0 1/1 0/0 .rodata          j3dDefaultTransformInfo */
 extern J3DTransformInfo const j3dDefaultTransformInfo = {
     {1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}};
 
-/* 803A1E50-803A1E5C 02E4B0 000C+00 0/0 1/1 0/0 .rodata          j3dDefaultScale */
 extern Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
 
-/* 803A1E5C-803A1E8C 02E4BC 0030+00 0/0 8/8 7/7 .rodata          j3dDefaultMtx */
 extern Mtx const j3dDefaultMtx = {
     {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
 
-/* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text            J3DCalcYBBoardMtx__FPA4_f */
 void J3DCalcYBBoardMtx(Mtx mtx) {
     f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
     f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
@@ -106,7 +101,6 @@ void J3DCalcYBBoardMtx(Mtx mtx) {
 	mtx[2][2] = vec.z * z;
 }
 
-/* 8031189C-80311964 30C1DC 00C8+00 0/0 6/6 0/0 .text J3DPSCalcInverseTranspose__FPA4_fPA3_f */
 asm void J3DPSCalcInverseTranspose(register Mtx src, register Mtx33 dst) {
 #ifdef __MWERKS__ // clang-format off
 	psq_l    f0, 0(src), 1, 0
@@ -164,8 +158,6 @@ lbl_8005F118:
 #endif // clang-format on
 }
 
-/* 80311964-80311A24 30C2A4 00C0+00 0/0 2/2 2/2 .text
- * J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f         */
 void J3DGetTranslateRotateMtx(const J3DTransformInfo& tx, Mtx dst) {
 	f32 cxsz;
 	f32 sxcz;
@@ -195,7 +187,6 @@ void J3DGetTranslateRotateMtx(const J3DTransformInfo& tx, Mtx dst) {
     dst[2][3] = tx.mTranslate.z;
 }
 
-/* 80311A24-80311ACC 30C364 00A8+00 0/0 1/1 0/0 .text J3DGetTranslateRotateMtx__FsssfffPA4_f */
 void J3DGetTranslateRotateMtx(s16 rx, s16 ry, s16 rz, f32 tx, f32 ty, f32 tz, Mtx dst) {
 	f32 cxsz;
 	f32 sxcz;
@@ -225,8 +216,6 @@ void J3DGetTranslateRotateMtx(s16 rx, s16 ry, s16 rz, f32 tx, f32 ty, f32 tz, Mt
     dst[2][3] = tz;
 }
 
-/* 80311ACC-80311B80 30C40C 00B4+00 0/0 3/3 0/0 .text
- * J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f          */
 void J3DGetTextureMtx(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst) {
     f32 sr = JMASSin(srt.mRotation), cr = JMASCos(srt.mRotation);
 
@@ -247,8 +236,6 @@ void J3DGetTextureMtx(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst)
 	dst[2][2] = 1.0f;
 }
 
-/* 80311B80-80311C34 30C4C0 00B4+00 0/0 3/3 0/0 .text
- * J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f       */
 void J3DGetTextureMtxOld(const J3DTextureSRTInfo& srt, const Vec& center, Mtx dst) {
     f32 sr = JMASSin(srt.mRotation), cr = JMASCos(srt.mRotation);
 
@@ -269,8 +256,6 @@ void J3DGetTextureMtxOld(const J3DTextureSRTInfo& srt, const Vec& center, Mtx ds
 	dst[2][2] = 1.0f;
 }
 
-/* 80311C34-80311CE4 30C574 00B0+00 0/0 3/3 0/0 .text
- * J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f            */
 void J3DGetTextureMtxMaya(const J3DTextureSRTInfo& srt, Mtx dst) {
     f32 sr = JMASSin(srt.mRotation), cr = JMASCos(srt.mRotation);
     f32 tx = srt.mTranslationX - 0.5f;
@@ -288,8 +273,6 @@ void J3DGetTextureMtxMaya(const J3DTextureSRTInfo& srt, Mtx dst) {
 	dst[2][2] = 1.0f;
 }
 
-/* 80311CE4-80311D94 30C624 00B0+00 0/0 3/3 0/0 .text
- * J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f         */
 void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
     f32 sr = JMASSin(srt.mRotation), cr = JMASCos(srt.mRotation);
     f32 tx = srt.mTranslationX - 0.5f;
@@ -307,7 +290,6 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
 	dst[2][2] = 1.0f;
 }
 
-/* 80311D94-80311DF8 30C6D4 0064+00 0/0 2/2 0/0 .text            J3DScaleNrmMtx__FPA4_fRC3Vec */
 asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc;
@@ -344,7 +326,6 @@ asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
 #endif // clang-format on
 }
 
-/* 80311DF8-80311E4C 30C738 0054+00 0/0 5/5 0/0 .text            J3DScaleNrmMtx33__FPA3_fRC3Vec */
 asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
 #ifdef __MWERKS__ // clang-format off
 	psq_l    f0, 0(mtx), 0, 0
@@ -371,8 +352,6 @@ asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
 #endif // clang-format on
 }
 
-/* 80311E4C-80311F70 30C78C 0124+00 0/0 3/3 0/0 .text            J3DMtxProjConcat__FPA4_fPA4_fPA4_f
- */
 asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst) {
 #ifdef __MWERKS__ // clang-format off
 	psq_l    f2, 0(mtx1), 0, 0
@@ -451,12 +430,10 @@ asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst
 #endif // clang-format on
 }
 
-/* 80450958-80450960 0003D8 0008+00 1/1 0/0 0/0 .sdata           Unit01 */
 static f32 Unit01[2] = {
     0.0f, 1.0f
 };
 
-/* 80311F70-8031204C 30C8B0 00DC+00 0/0 1/1 0/0 .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */
 #ifdef __MWERKS__ // clang-format off
 asm void J3DPSMtxArrayConcat(register Mtx mA, register Mtx mB, register Mtx mAB, register u32 count) {
 #define FP0 fp0
@@ -564,7 +541,6 @@ loop:
 }
 #endif // clang-format on
 
-/* 803CD8F8-803CD900 02AA18 0008+00 0/0 2/2 0/0 .data            PSMulUnit01 */
 extern f32 PSMulUnit01[] = {
     0.0f,
     -1.0f,
diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp
index c000493138..29a826b74f 100644
--- a/src/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -6,7 +6,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include <string.h>
 
-/* 80310EF8-80310F78 30B838 0080+00 0/0 1/1 0/0 .text            __ct__13J3DVertexDataFv */
 J3DVertexData::J3DVertexData() {
     mVtxNum = 0;
     mNrmNum = 0;
@@ -31,8 +30,6 @@ J3DVertexData::J3DVertexData() {
     mVtxNrmType = GX_F32;
 }
 
-/* 80310F78-80310FD8 30B8B8 0060+00 0/0 1/1 0/0 .text
- * setVertexData__15J3DVertexBufferFP13J3DVertexData            */
 void J3DVertexBuffer::setVertexData(J3DVertexData* pVtxData) {
     J3D_ASSERT_NULLPTR(175, pVtxData != NULL);
 
@@ -52,7 +49,6 @@ void J3DVertexBuffer::setVertexData(J3DVertexData* pVtxData) {
     frameInit();
 }
 
-/* 80310FD8-80311030 30B918 0058+00 0/0 3/3 0/0 .text            init__15J3DVertexBufferFv */
 void J3DVertexBuffer::init() {
     mVtxData = NULL;
 
@@ -69,18 +65,14 @@ void J3DVertexBuffer::init() {
     frameInit();
 }
 
-/* 80311030-8031106C 30B970 003C+00 0/0 1/1 0/0 .text            __dt__15J3DVertexBufferFv */
 J3DVertexBuffer::~J3DVertexBuffer() {}
 
-/* 8031106C-80311090 30B9AC 0024+00 0/0 1/1 0/0 .text            setArray__15J3DVertexBufferCFv */
 void J3DVertexBuffer::setArray() const {
     j3dSys.setVtxPos(mCurrentVtxPos);
     j3dSys.setVtxNrm(mCurrentVtxNrm);
     j3dSys.setVtxCol(mCurrentVtxCol);
 }
 
-/* 80311090-803111B0 30B9D0 0120+00 1/1 0/0 0/0 .text copyLocalVtxPosArray__15J3DVertexBufferFUl
- */
 s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) {
     if (flag & 1) {
         for (int i = 0; i < 2; i++) {
@@ -109,8 +101,6 @@ s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) {
     return kJ3DError_Success;
 }
 
-/* 803111B0-803112D0 30BAF0 0120+00 1/1 0/0 0/0 .text copyLocalVtxNrmArray__15J3DVertexBufferFUl
- */
 s32 J3DVertexBuffer::copyLocalVtxNrmArray(u32 flag) {
     if (flag & 1) {
         for (int i = 0; i < 2; i++) {
@@ -139,7 +129,6 @@ s32 J3DVertexBuffer::copyLocalVtxNrmArray(u32 flag) {
     return kJ3DError_Success;
 }
 
-/* 803112D0-80311478 30BC10 01A8+00 0/0 1/1 0/0 .text copyLocalVtxArray__15J3DVertexBufferFUl */
 s32 J3DVertexBuffer::copyLocalVtxArray(u32 flag) {
     void* oldPosArray[2];
     void* oldNrmArray[2];
@@ -191,8 +180,6 @@ s32 J3DVertexBuffer::copyLocalVtxArray(u32 flag) {
     return kJ3DError_Success;
 }
 
-/* 80311478-8031152C 30BDB8 00B4+00 0/0 1/1 0/0 .text
- * allocTransformedVtxPosArray__15J3DVertexBufferFv             */
 s32 J3DVertexBuffer::allocTransformedVtxPosArray() {
     if (mTransformedVtxPosArray[0] != NULL && mTransformedVtxPosArray[1] != NULL)
         return kJ3DError_Success;
@@ -208,8 +195,6 @@ s32 J3DVertexBuffer::allocTransformedVtxPosArray() {
     return kJ3DError_Success;
 }
 
-/* 8031152C-803115E0 30BE6C 00B4+00 0/0 1/1 0/0 .text
- * allocTransformedVtxNrmArray__15J3DVertexBufferFv             */
 s32 J3DVertexBuffer::allocTransformedVtxNrmArray() {
     if (mTransformedVtxNrmArray[0] != NULL && mTransformedVtxNrmArray[1] != NULL)
         return kJ3DError_Success;
@@ -225,12 +210,10 @@ s32 J3DVertexBuffer::allocTransformedVtxNrmArray() {
     return kJ3DError_Success;
 }
 
-/* 803115E0-803115F4 30BF20 0014+00 0/0 1/1 0/0 .text            __ct__14J3DDrawMtxDataFv */
 J3DDrawMtxData::J3DDrawMtxData() {
     mEntryNum = 0;
     mDrawMtxFlag = NULL;
     mDrawMtxIndex = NULL;
 }
 
-/* 803115F4-80311630 30BF34 003C+00 0/0 2/2 0/0 .text            __dt__14J3DDrawMtxDataFv */
 J3DDrawMtxData::~J3DDrawMtxData() {}
diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index 82056cc44a..54aa056235 100644
--- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -8,8 +8,6 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 
-/* 80337B40-80338134 332480 05F4+00 0/0 7/7 1/1 .text
- * load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag   */
 J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
     if (!i_data) {
         return NULL;
@@ -91,8 +89,6 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseF
     return NULL;
 }
 
-/* 80338134-80338468 332A74 0334+00 0/0 1/1 0/0 .text
- * setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv         */
 void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     if (!header) {
@@ -171,19 +167,14 @@ void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338468-80338484 332DA8 001C+00 2/2 0/0 0/0 .text            __ct__20J3DAnmFullLoader_v15Fv */
 J3DAnmFullLoader_v15::J3DAnmFullLoader_v15() {}
 
-/* 80338484-803384E0 332DC4 005C+00 3/2 0/0 0/0 .text            __dt__20J3DAnmFullLoader_v15Fv */
 J3DAnmFullLoader_v15::~J3DAnmFullLoader_v15() {}
 
-/* 803384E0-803384FC 332E20 001C+00 2/2 0/0 0/0 .text            __ct__19J3DAnmKeyLoader_v15Fv */
 J3DAnmKeyLoader_v15::J3DAnmKeyLoader_v15() {}
 
-/* 803384FC-80338558 332E3C 005C+00 3/2 0/0 0/0 .text            __dt__19J3DAnmKeyLoader_v15Fv */
 J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {}
 
-/* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text            load__20J3DAnmFullLoader_v15FPCv */
 J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -216,8 +207,6 @@ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
     return mAnm;
 }
 
-/* 803386A0-80338800 332FE0 0160+00 2/1 0/0 0/0 .text
- * setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv         */
 void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -250,14 +239,10 @@ void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338800-80338828 333140 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData */
 void J3DAnmFullLoader_v15::readAnmTransform(const J3DAnmTransformFullData* param_1) {
     setAnmTransform((J3DAnmTransformFull*)mAnm, param_1);
 }
 
-/* 80338828-803388BC 333168 0094+00 2/2 0/0 0/0 .text
- * setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData */
 void J3DAnmFullLoader_v15::setAnmTransform(J3DAnmTransformFull* param_1,
                                            const J3DAnmTransformFullData* param_2) {
     param_1->field_0x1e = param_2->field_0xc;
@@ -272,14 +257,10 @@ void J3DAnmFullLoader_v15::setAnmTransform(J3DAnmTransformFull* param_1,
 }
 
 
-/* 803388BC-803388E4 3331FC 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData */
 void J3DAnmFullLoader_v15::readAnmColor(const J3DAnmColorFullData* param_1) {
     setAnmColor((J3DAnmColorFull*)mAnm, param_1);
 }
 
-/* 803388E4-803389B0 333224 00CC+00 2/2 0/0 0/0 .text
- * setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData */
 void J3DAnmFullLoader_v15::setAnmColor(J3DAnmColorFull* param_1,
                                        const J3DAnmColorFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -298,14 +279,10 @@ void J3DAnmFullLoader_v15::setAnmColor(J3DAnmColorFull* param_1,
         JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
 }
 
-/* 803389B0-803389D8 3332F0 0028+00 1/1 0/0 0/0 .text
- * readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData */
 void J3DAnmFullLoader_v15::readAnmTexPattern(const J3DAnmTexPatternFullData* param_1) {
     setAnmTexPattern((J3DAnmTexPattern*)mAnm, param_1);
 }
 
-/* 803389D8-80338A7C 333318 00A4+00 2/2 0/0 0/0 .text
- * setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData */
 void J3DAnmFullLoader_v15::setAnmTexPattern(J3DAnmTexPattern* param_1,
                                             const J3DAnmTexPatternFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -322,14 +299,10 @@ void J3DAnmFullLoader_v15::setAnmTexPattern(J3DAnmTexPattern* param_1,
         JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
 }
 
-/* 80338A7C-80338AA4 3333BC 0028+00 1/1 0/0 0/0 .text
- * readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData */
 void J3DAnmFullLoader_v15::readAnmVisibility(const J3DAnmVisibilityFullData* param_1) {
     setAnmVisibility((J3DAnmVisibilityFull*)mAnm, param_1);
 }
 
-/* 80338AA4-80338B20 3333E4 007C+00 2/2 0/0 0/0 .text
- * setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData */
 void J3DAnmFullLoader_v15::setAnmVisibility(J3DAnmVisibilityFull* param_1,
                                             const J3DAnmVisibilityFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -342,14 +315,10 @@ void J3DAnmFullLoader_v15::setAnmVisibility(J3DAnmVisibilityFull* param_1,
     param_1->mVisibility = JSUConvertOffsetToPtr<u8>(param_2, param_2->mValuesOffset);
 }
 
-/* 80338B20-80338B48 333460 0028+00 1/1 0/0 0/0 .text
- * readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData */
 void J3DAnmFullLoader_v15::readAnmCluster(const J3DAnmClusterFullData* param_1) {
     setAnmCluster((J3DAnmClusterFull*)mAnm, param_1);
 }
 
-/* 80338B48-80338BB4 333488 006C+00 2/2 0/0 0/0 .text
- * setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData */
 void J3DAnmFullLoader_v15::setAnmCluster(J3DAnmClusterFull* param_1,
                                          const J3DAnmClusterFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -360,14 +329,10 @@ void J3DAnmFullLoader_v15::setAnmCluster(J3DAnmClusterFull* param_1,
     param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, param_2->mWeightOffset);
 }
 
-/* 80338BB4-80338BDC 3334F4 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData */
 void J3DAnmFullLoader_v15::readAnmVtxColor(const J3DAnmVtxColorFullData* param_1) {
     setAnmVtxColor((J3DAnmVtxColorFull*)mAnm, param_1);
 }
 
-/* 80338BDC-80338D44 33351C 0168+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData */
 void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
                                           const J3DAnmVtxColorFullData* data) {
     dst->mFrameMax = data->mFrameMax;
@@ -401,7 +366,6 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
     dst->mColorA = JSUConvertOffsetToPtr<u8>(data, data->mAValuesOffset);
 }
 
-/* 80338D44-80338E8C 333684 0148+00 2/1 0/0 0/0 .text            load__19J3DAnmKeyLoader_v15FPCv */
 J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -434,8 +398,6 @@ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
     return mAnm;
 }
 
-/* 80338E8C-80338FEC 3337CC 0160+00 2/1 0/0 0/0 .text
- * setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv          */
 void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -467,14 +429,10 @@ void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338FEC-80339014 33392C 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData */
 void J3DAnmKeyLoader_v15::readAnmTransform(const J3DAnmTransformKeyData* param_1) {
     setAnmTransform((J3DAnmTransformKey*)mAnm, param_1);
 }
 
-/* 80339014-803390B0 333954 009C+00 2/2 0/0 0/0 .text
- * setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData */
 void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
                                           const J3DAnmTransformKeyData* param_2) {
     param_1->field_0x1e = param_2->field_0xc;
@@ -490,14 +448,10 @@ void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
 }
 
 
-/* 803390B0-803390D8 3339F0 0028+00 1/1 0/0 0/0 .text
- * readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData */
 void J3DAnmKeyLoader_v15::readAnmTextureSRT(const J3DAnmTextureSRTKeyData* param_1) {
     setAnmTextureSRT((J3DAnmTextureSRTKey*)mAnm, param_1);
 }
 
-/* 803390D8-803392B0 333A18 01D8+00 2/2 0/0 0/0 .text
- * setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData */
 void J3DAnmKeyLoader_v15::setAnmTextureSRT(J3DAnmTextureSRTKey* param_1,
                                            const J3DAnmTextureSRTKeyData* param_2) {
     param_1->mTrackNum = param_2->field_0xc;
@@ -549,14 +503,10 @@ void J3DAnmKeyLoader_v15::setAnmTextureSRT(J3DAnmTextureSRTKey* param_1,
 }
 
 
-/* 803392B0-803392D8 333BF0 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData   */
 void J3DAnmKeyLoader_v15::readAnmColor(const J3DAnmColorKeyData* param_1) {
     setAnmColor((J3DAnmColorKey*)mAnm, param_1);
 }
 
-/* 803392D8-803393C4 333C18 00EC+00 2/2 0/0 0/0 .text
- * setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData */
 void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColorKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
     param_1->mAttribute = param_2->field_0x8;
@@ -579,14 +529,10 @@ void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColor
 }
 
 
-/* 803393C4-803393EC 333D04 0028+00 1/1 0/0 0/0 .text
- * readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData */
 void J3DAnmKeyLoader_v15::readAnmCluster(const J3DAnmClusterKeyData* param_1) {
     setAnmCluster((J3DAnmClusterKey*)mAnm, param_1);
 }
 
-/* 803393EC-80339458 333D2C 006C+00 2/2 0/0 0/0 .text
- * setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData */
 void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1,
                                         const J3DAnmClusterKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -598,14 +544,10 @@ void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1,
 }
 
 
-/* 80339458-80339480 333D98 0028+00 1/1 0/0 0/0 .text
- * readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData */
 void J3DAnmKeyLoader_v15::readAnmTevReg(const J3DAnmTevRegKeyData* param_1) {
     setAnmTevReg((J3DAnmTevRegKey*)mAnm, param_1);
 }
 
-/* 80339480-8033960C 333DC0 018C+00 2/2 0/0 0/0 .text
- * setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData */
 void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1,
                                        const J3DAnmTevRegKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -644,14 +586,10 @@ void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1,
 }
 
 
-/* 8033960C-80339634 333F4C 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */
 void J3DAnmKeyLoader_v15::readAnmVtxColor(const J3DAnmVtxColorKeyData* param_1) {
     setAnmVtxColor((J3DAnmVtxColorKey*)mAnm, param_1);
 }
 
-/* 80339634-8033979C 333F74 0168+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData */
 void J3DAnmKeyLoader_v15::setAnmVtxColor(J3DAnmVtxColorKey* dst,
                                          const J3DAnmVtxColorKeyData* data) {
     dst->mFrameMax = data->mFrameMax;
diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index d149bfc898..3abd6ea603 100644
--- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -11,7 +11,6 @@
 #include "dolphin/os.h"
 #include "string.h"
 
-/* 80334130-803341CC 32EA70 009C+00 0/0 1/1 0/0 .text load__24J3DClusterLoaderDataBaseFPCv */
 void* J3DClusterLoaderDataBase::load(const void* i_data) {
     const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data;
     if (fileHeader->mMagic == 'J3D1' && fileHeader->mType == 'bls1') {
@@ -23,13 +22,10 @@ void* J3DClusterLoaderDataBase::load(const void* i_data) {
     return NULL;
 }
 
-/* 803341CC-803341E8 32EB0C 001C+00 1/1 0/0 0/0 .text            __ct__20J3DClusterLoader_v15Fv */
 J3DClusterLoader_v15::J3DClusterLoader_v15() {}
 
-/* 803341E8-80334244 32EB28 005C+00 2/1 0/0 0/0 .text            __dt__20J3DClusterLoader_v15Fv */
 J3DClusterLoader_v15::~J3DClusterLoader_v15() {}
 
-/* 80334244-803342F8 32EB84 00B4+00 2/1 0/0 0/0 .text            load__20J3DClusterLoader_v15FPCv */
 void* J3DClusterLoader_v15::load(const void* i_data) {
     mpDeformData = new J3DDeformData();
 
@@ -50,8 +46,6 @@ void* J3DClusterLoader_v15::load(const void* i_data) {
     return mpDeformData;
 }
 
-/* 803342F8-803345FC 32EC38 0304+00 1/1 0/0 0/0 .text
- * readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock      */
 void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) {
     mpDeformData->mClusterNum = block->mClusterNum;
     mpDeformData->mClusterKeyNum = block->mClusterKeyNum;
diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index fc05c1fdf1..0a93c6626d 100644
--- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DJointFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DJointFactory.h"
@@ -10,13 +5,11 @@
 #include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
 J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
     mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (uintptr_t)block.mpJointInitData);
     mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
 }
 
-/* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text            create__15J3DJointFactoryFi */
 J3DJoint* J3DJointFactory::create(int no) {
     J3DJoint* joint = new J3DJoint();
     joint->mJntNo = no;
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index c6601ec64e..15a0a65feb 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterialFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h"
@@ -10,10 +5,7 @@
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dol2asm.h"
 
-/* 8032FFEC-80330234 32A92C 0248+00 0/0 7/7 0/0 .text
- * __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock              */
 J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData>(&i_block, i_block.mpMaterialInitData);
@@ -55,8 +47,6 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     mpMaterialMode = NULL;
 }
 
-/* 80330234-803302BC 32AB74 0088+00 0/0 2/2 0/0 .text
- * __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock            */
 J3DMaterialFactory::J3DMaterialFactory(J3DMaterialDLBlock const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = NULL;
@@ -66,8 +56,6 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialDLBlock const& i_block) {
     mpMaterialMode = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpMaterialMode);
 }
 
-/* 803302BC-80330304 32ABFC 0048+00 0/0 3/3 0/0 .text countUniqueMaterials__18J3DMaterialFactoryFv
- */
 u16 J3DMaterialFactory::countUniqueMaterials() {
     u16 count = 0;
     s32 id = -1;
@@ -80,7 +68,6 @@ u16 J3DMaterialFactory::countUniqueMaterials() {
     return count;
 }
 
-/* 80330304-8033033C 32AC44 0038+00 4/4 0/0 0/0 .text countTexGens__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::countTexGens(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -89,7 +76,6 @@ u32 J3DMaterialFactory::countTexGens(int i_idx) const {
     return 0;
 }
 
-/* 8033033C-803303C4 32AC7C 0088+00 2/2 0/0 0/0 .text countStages__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::countStages(int i_idx) const {
     J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     u32 count1 = 0;
@@ -113,8 +99,6 @@ u32 J3DMaterialFactory::countStages(int i_idx) const {
     return count2;
 }
 
-/* 803303C4-80330440 32AD04 007C+00 0/0 4/4 0/0 .text
- * create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl */
 J3DMaterial* J3DMaterialFactory::create(J3DMaterial* i_material, MaterialType i_type,
                                         int i_idx, u32 i_flags) const {
     switch (i_type) {
@@ -131,8 +115,6 @@ J3DMaterial* J3DMaterialFactory::create(J3DMaterial* i_material, MaterialType i_
     return i_material;
 }
 
-/* 80330440-80330D84 32AD80 0944+00 1/1 0/0 0/0 .text
- * createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, int i_idx,
                                                       u32 i_flags) const {
     if (mpDisplayListInit != NULL) {
@@ -246,8 +228,6 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
     return i_material;
 }
 
-/* 80330D84-8033168C 32B6C4 0908+00 1/1 0/0 0/0 .text
- * createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material, int i_idx,
                                                        u32 i_flags) const {
     if (i_material == NULL) {
@@ -339,8 +319,6 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material,
     return i_material;
 }
 
-/* 8033168C-803317D4 32BFCC 0148+00 0/0 1/1 0/0 .text
- * modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali */
 void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_idx) const {
     J3DTexCoord coord[8];
     u32 tex_gens = countTexGens(i_idx);
@@ -361,8 +339,6 @@ void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_
     i_material->mCurrentMtx = currentMtx;
 }
 
-/* 803317D4-80331A7C 32C114 02A8+00 2/2 0/0 0/0 .text
- * createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, int i_idx,
                                                       u32 i_flags) const {
     if (i_material == NULL) {
@@ -393,8 +369,6 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, i
     return i_material;
 }
 
-/* 80331A7C-80331AFC 32C3BC 0080+00 0/0 4/4 0/0 .text
- * calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl */
 u32 J3DMaterialFactory::calcSize(J3DMaterial* i_material, J3DMaterialFactory::MaterialType i_type,
                                   int i_idx, u32 i_flags) const {
     u32 size = 0;
@@ -412,8 +386,6 @@ u32 J3DMaterialFactory::calcSize(J3DMaterial* i_material, J3DMaterialFactory::Ma
     return size;
 }
 
-/* 80331AFC-80331C30 32C43C 0134+00 1/1 0/0 0/0 .text
- * calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_idx,
                                                u32 i_flags) const {
     u32 size = 0;
@@ -447,8 +419,6 @@ u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_id
     return size;
 }
 
-/* 80331C30-80331D00 32C570 00D0+00 1/1 0/0 0/0 .text
- * calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_idx,
                                                 u32 i_flags) const {
     u32 size = 0;
@@ -469,8 +439,6 @@ u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_i
     return size;
 }
 
-/* 80331D00-80331D18 32C640 0018+00 2/2 0/0 0/0 .text
- * calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizeLockedMaterial(J3DMaterial* i_material, int i_idx,
                                                u32 i_flags) const {
     u32 size = 0;
@@ -481,10 +449,8 @@ u32 J3DMaterialFactory::calcSizeLockedMaterial(J3DMaterial* i_material, int i_id
     return size + sizeof(J3DDisplayListObj);
 }
 
-/* 804564A8-804564AC 004AA8 0004+00 1/1 0/0 0/0 .sdata2          @1691 */
 static GXColor const defaultMatColor = {0xff, 0xff, 0xff, 0xff};
 
-/* 80331D18-80331D74 32C658 005C+00 2/2 0/0 0/0 .text newMatColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultMatColor;
     u16 mat_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mMatColorIdx[i_no];
@@ -495,7 +461,6 @@ J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80331D74-80331DAC 32C6B4 0038+00 2/2 0/0 0/0 .text newColorChanNum__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {
     u8 color_chan_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mColorChanNumIdx;
     if (color_chan_num_index != 0xff) {
@@ -505,7 +470,6 @@ u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {
     }
 }
 
-/* 80331DAC-80331F50 32C6EC 01A4+00 2/2 0/0 0/0 .text newColorChan__18J3DMaterialFactoryCFii */
 J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const {
     u32 r29 = 0;
     J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -516,10 +480,8 @@ J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const {
     }
 }
 
-/* 804564AC-804564B0 004AAC 0004+00 1/1 0/0 0/0 .sdata2          @1798 */
 static GXColor const defaultAmbColor = {0x32, 0x32, 0x32, 0x32};
 
-/* 80331F50-80331FAC 32C890 005C+00 1/1 0/0 0/0 .text newAmbColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultAmbColor;
     u16 amb_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mAmbColorIdx[i_no];
@@ -530,7 +492,6 @@ J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80331FAC-80331FE4 32C8EC 0038+00 2/2 0/0 0/0 .text newTexGenNum__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -540,7 +501,6 @@ u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
     }
 }
 
-/* 80331FE4-80332044 32C924 0060+00 3/3 0/0 0/0 .text newTexCoord__18J3DMaterialFactoryCFii */
 J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {
     u16 tex_coord_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexCoordIdx[i_no];
     if (tex_coord_index != 0xffff) {
@@ -550,8 +510,6 @@ J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {
     }
 }
 
-/* 80332044-803320CC 32C984 0088+00 2/2 0/0 0/0 .text            newTexMtx__18J3DMaterialFactoryCFii
- */
 J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {
     J3DTexMtx* tex_mtx = NULL;
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -561,7 +519,6 @@ J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {
     return tex_mtx;
 }
 
-/* 803320CC-8033210C 32CA0C 0040+00 2/2 0/0 0/0 .text newCullMode__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newCullMode(int i_idx) const {
     u8 cull_mode_index = mpMaterialInitData[mpMaterialID[i_idx]].mCullModeIdx;
     if (cull_mode_index != 0xff) {
@@ -571,8 +528,6 @@ u8 J3DMaterialFactory::newCullMode(int i_idx) const {
     }
 }
 
-/* 8033210C-80332154 32CA4C 0048+00 2/2 0/0 0/0 .text            newTexNo__18J3DMaterialFactoryCFii
- */
 u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
     u16 tex_no_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexNoIdx[i_no];
     if (tex_no_index != 0xffff) {
@@ -582,7 +537,6 @@ u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
     }
 }
 
-/* 80332154-803321A0 32CA94 004C+00 2/2 0/0 0/0 .text newTevOrder__18J3DMaterialFactoryCFii */
 J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevOrderIdx[i_no] != 0xffff) {
@@ -592,7 +546,6 @@ J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 803321A0-80332210 32CAE0 0070+00 2/2 0/0 0/0 .text newTevColor__18J3DMaterialFactoryCFii */
 J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const {
     J3DGXColorS10 dflt = (GXColorS10){0, 0, 0, 0};
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -603,10 +556,8 @@ J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const {
     }
 }
 
-/* 804564B0-804564B8 004AB0 0004+04 1/1 0/0 0/0 .sdata2          @1915 */
 static GXColor const defaultTevKColor = {0xff, 0xff, 0xff, 0xff};
 
-/* 80332210-8033226C 32CB50 005C+00 2/2 0/0 0/0 .text newTevKColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultTevKColor;
     u16 tev_kcolor_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevKColorIdx[i_no];
@@ -617,7 +568,6 @@ J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
     }
 }
 
-/* 8033226C-803322A4 32CBAC 0038+00 2/2 0/0 0/0 .text newTevStageNum__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
     u8 tev_stage_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageNumIdx;
     if (tev_stage_num_index != 0xff) {
@@ -627,7 +577,6 @@ u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
     }
 }
 
-/* 803322A4-80332304 32CBE4 0060+00 2/2 0/0 0/0 .text newTevStage__18J3DMaterialFactoryCFii */
 J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
     u16 tev_stage_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageIdx[i_no];
     if (tev_stage_index != 0xffff) {
@@ -637,8 +586,6 @@ J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80332304-803323A0 32CC44 009C+00 1/1 0/0 0/0 .text
- * newTevSwapModeTable__18J3DMaterialFactoryCFii                */
 J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no) const {
     u16 tev_swap_mode_table_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevSwapModeTableIdx[i_no];
     if (tev_swap_mode_table_index != 0xffff) {
@@ -648,8 +595,6 @@ J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no)
     }
 }
 
-/* 803323A0-803323C8 32CCE0 0028+00 2/2 0/0 0/0 .text newIndTexStageNum__18J3DMaterialFactoryCFi
- */
 u8 J3DMaterialFactory::newIndTexStageNum(int i_idx) const {
     if (mpIndInitData[i_idx].mEnabled == true) {
         return mpIndInitData[i_idx].mIndTexStageNum;
@@ -658,7 +603,6 @@ u8 J3DMaterialFactory::newIndTexStageNum(int i_idx) const {
     }
 }
 
-/* 803323C8-8033240C 32CD08 0044+00 2/2 0/0 0/0 .text newIndTexOrder__18J3DMaterialFactoryCFii */
 J3DIndTexOrder J3DMaterialFactory::newIndTexOrder(int i_idx, int i_no) const {
     J3DIndTexOrder dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -668,7 +612,6 @@ J3DIndTexOrder J3DMaterialFactory::newIndTexOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 8033240C-803324B4 32CD4C 00A8+00 2/2 0/0 0/0 .text newIndTexMtx__18J3DMaterialFactoryCFii */
 J3DIndTexMtx J3DMaterialFactory::newIndTexMtx(int i_idx, int i_no) const {
     J3DIndTexMtx dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -678,7 +621,6 @@ J3DIndTexMtx J3DMaterialFactory::newIndTexMtx(int i_idx, int i_no) const {
     }
 }
 
-/* 803324B4-80332648 32CDF4 0194+00 2/2 0/0 0/0 .text newIndTevStage__18J3DMaterialFactoryCFii */
 J3DIndTevStage J3DMaterialFactory::newIndTevStage(int i_idx, int i_no) const {
     J3DIndTevStage dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -688,8 +630,6 @@ J3DIndTevStage J3DMaterialFactory::newIndTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80332648-8033268C 32CF88 0044+00 2/2 0/0 0/0 .text
- * newIndTexCoordScale__18J3DMaterialFactoryCFii                */
 J3DIndTexCoordScale J3DMaterialFactory::newIndTexCoordScale(int i_idx, int i_no) const {
     J3DIndTexCoordScale dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -699,7 +639,6 @@ J3DIndTexCoordScale J3DMaterialFactory::newIndTexCoordScale(int i_idx, int i_no)
     }
 }
 
-/* 8033268C-80332768 32CFCC 00DC+00 2/2 0/0 0/0 .text            newFog__18J3DMaterialFactoryCFi */
 J3DFog J3DMaterialFactory::newFog(int i_idx) const {
     J3DFog fog;
     u16 fog_index = mpMaterialInitData[mpMaterialID[i_idx]].mFogIdx;
@@ -709,7 +648,6 @@ J3DFog J3DMaterialFactory::newFog(int i_idx) const {
     return fog;
 }
 
-/* 80332768-803327E8 32D0A8 0080+00 2/2 0/0 0/0 .text newAlphaComp__18J3DMaterialFactoryCFi */
 J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mAlphaCompIdx != 0xffff) {
@@ -719,8 +657,6 @@ J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
     }
 }
 
-/* 803327E8-8033282C 32D128 0044+00 2/2 0/0 0/0 .text            newBlend__18J3DMaterialFactoryCFi
- */
 J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mBlendIdx != 0xffff) {
@@ -730,8 +666,6 @@ J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {
     }
 }
 
-/* 8033282C-8033288C 32D16C 0060+00 2/2 0/0 0/0 .text            newZMode__18J3DMaterialFactoryCFi
- */
 J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZModeIdx != 0xff) {
@@ -741,7 +675,6 @@ J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
     }
 }
 
-/* 8033288C-803328C4 32D1CC 0038+00 2/2 0/0 0/0 .text newZCompLoc__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZCompLocIdx != 0xff){
@@ -751,8 +684,6 @@ u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
     }
 }
 
-/* 803328C4-803328FC 32D204 0038+00 2/2 0/0 0/0 .text            newDither__18J3DMaterialFactoryCFi
- */
 u8 J3DMaterialFactory::newDither(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mDitherIdx != 0xff){
@@ -762,7 +693,6 @@ u8 J3DMaterialFactory::newDither(int i_idx) const {
     }
 }
 
-/* 803328FC-803329A0 32D23C 00A4+00 1/1 0/0 0/0 .text newNBTScale__18J3DMaterialFactoryCFi */
 J3DNBTScale J3DMaterialFactory::newNBTScale(int i_idx) const {
     J3DNBTScale dflt(j3dDefaultNBTScaleInfo);
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
index 4198965ef3..52a8f9e89b 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterialFactory_v21
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h"
@@ -11,8 +6,6 @@
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80332DA4-80332F84 32D6E4 01E0+00 0/0 2/2 0/0 .text
- * __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21      */
 J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData_v21>(&i_block, i_block.mpMaterialInitData);
@@ -43,8 +36,6 @@ J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_blo
     mpNBTScaleInfo = JSUConvertOffsetToPtr<J3DNBTScaleInfo>(&i_block, i_block.mpNBTScaleInfo);
 }
 
-/* 80332F84-80332FA8 32D8C4 0024+00 0/0 1/1 0/0 .text
- * countUniqueMaterials__22J3DMaterialFactory_v21Fv             */
 u16 J3DMaterialFactory_v21::countUniqueMaterials() {
     u16 i;
     for (i = 0; i < mMaterialNum; i++) {
@@ -52,7 +43,6 @@ u16 J3DMaterialFactory_v21::countUniqueMaterials() {
     return i;
 }
 
-/* 80332FA8-80332FE0 32D8E8 0038+00 1/1 0/0 0/0 .text countTexGens__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::countTexGens(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -61,7 +51,6 @@ u32 J3DMaterialFactory_v21::countTexGens(int i_idx) const {
     return 0;
 }
 
-/* 80332FE0-80333068 32D920 0088+00 1/1 0/0 0/0 .text countStages__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::countStages(int i_idx) const {
     J3DMaterialInitData_v21* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     u32 count1 = 0;
@@ -85,8 +74,6 @@ u32 J3DMaterialFactory_v21::countStages(int i_idx) const {
     return count2;
 }
 
-/* 80333068-803337D8 32D9A8 0770+00 0/0 2/2 0/0 .text
- * create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl          */
 J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx, u32 i_flags) const {
     const u32 stages = countStages(i_idx);
     u32 tev_stage_num = getMdlDataFlag_TevStageNum(i_flags);
@@ -175,7 +162,6 @@ J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx,
     return i_material;
 }
 
-/* 803337D8-80333834 32E118 005C+00 1/1 0/0 0/0 .text newMatColor__22J3DMaterialFactory_v21CFii */
 J3DGXColor J3DMaterialFactory_v21::newMatColor(int i_idx, int i_no) const {
     GXColor defaultColor = {0xff,0xff,0xff,0xff};
     J3DGXColor defaultJ3DGXColor = J3DGXColor(defaultColor);
@@ -186,8 +172,6 @@ J3DGXColor J3DMaterialFactory_v21::newMatColor(int i_idx, int i_no) const {
     return J3DGXColor(defaultJ3DGXColor);
 }
 
-/* 80333834-8033386C 32E174 0038+00 1/1 0/0 0/0 .text newColorChanNum__22J3DMaterialFactory_v21CFi
- */
 u8 J3DMaterialFactory_v21::newColorChanNum(int i_idx) const {
     u8 color_chan_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mColorChanNumIdx;
     if (color_chan_num_index != 0xff) {
@@ -197,8 +181,6 @@ u8 J3DMaterialFactory_v21::newColorChanNum(int i_idx) const {
     }
 }
 
-/* 8033386C-80333A10 32E1AC 01A4+00 1/1 0/0 0/0 .text newColorChan__22J3DMaterialFactory_v21CFii
- */
 J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mColorChanIdx[i_no] != 0xffff) {
@@ -208,7 +190,6 @@ J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const {
     }
 }
 
-/* 80333A10-80333A48 32E350 0038+00 1/1 0/0 0/0 .text newTexGenNum__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::newTexGenNum(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -218,7 +199,6 @@ u32 J3DMaterialFactory_v21::newTexGenNum(int i_idx) const {
     }
 }
 
-/* 80333A48-80333AA8 32E388 0060+00 1/1 0/0 0/0 .text newTexCoord__22J3DMaterialFactory_v21CFii */
 J3DTexCoord J3DMaterialFactory_v21::newTexCoord(int i_idx, int i_no) const {
     u16 tex_coord_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexCoordIdx[i_no];
     if (tex_coord_index != 0xffff) {
@@ -228,7 +208,6 @@ J3DTexCoord J3DMaterialFactory_v21::newTexCoord(int i_idx, int i_no) const {
     }
 }
 
-/* 80333AA8-80333B30 32E3E8 0088+00 1/1 0/0 0/0 .text newTexMtx__22J3DMaterialFactory_v21CFii */
 J3DTexMtx* J3DMaterialFactory_v21::newTexMtx(int i_idx, int i_no) const {
     J3DTexMtx* tex_mtx = NULL;
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -238,7 +217,6 @@ J3DTexMtx* J3DMaterialFactory_v21::newTexMtx(int i_idx, int i_no) const {
     return tex_mtx;
 }
 
-/* 80333B30-80333B70 32E470 0040+00 1/1 0/0 0/0 .text newCullMode__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newCullMode(int i_idx) const {
     u8 cull_mode_index = mpMaterialInitData[mpMaterialID[i_idx]].mCullModeIdx;
     if (cull_mode_index != 0xff) {
@@ -248,7 +226,6 @@ u8 J3DMaterialFactory_v21::newCullMode(int i_idx) const {
     }
 }
 
-/* 80333B70-80333BB8 32E4B0 0048+00 1/1 0/0 0/0 .text newTexNo__22J3DMaterialFactory_v21CFii */
 u16 J3DMaterialFactory_v21::newTexNo(int i_idx, int i_no) const {
     u16 tex_no_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexNoIdx[i_no];
     if (tex_no_index != 0xffff) {
@@ -258,7 +235,6 @@ u16 J3DMaterialFactory_v21::newTexNo(int i_idx, int i_no) const {
     }
 }
 
-/* 80333BB8-80333C04 32E4F8 004C+00 1/1 0/0 0/0 .text newTevOrder__22J3DMaterialFactory_v21CFii */
 J3DTevOrder J3DMaterialFactory_v21::newTevOrder(int i_idx, int i_no) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevOrderIdx[i_no] != 0xffff) {
@@ -268,7 +244,6 @@ J3DTevOrder J3DMaterialFactory_v21::newTevOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 80333C04-80333C74 32E544 0070+00 1/1 0/0 0/0 .text newTevColor__22J3DMaterialFactory_v21CFii */
 J3DGXColorS10 J3DMaterialFactory_v21::newTevColor(int i_idx, int i_no) const {
     GXColorS10 defaultTevColor = {0,0,0,0};
     J3DGXColorS10 dflt = defaultTevColor;
@@ -280,8 +255,6 @@ J3DGXColorS10 J3DMaterialFactory_v21::newTevColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80333C74-80333CD0 32E5B4 005C+00 1/1 0/0 0/0 .text newTevKColor__22J3DMaterialFactory_v21CFii
- */
 J3DGXColor J3DMaterialFactory_v21::newTevKColor(int i_idx, int param_1) const {
     GXColor defaultColor = {0xff,0xff,0xff,0xff};
     J3DGXColor defaultJ3DGXColor = J3DGXColor(defaultColor);
@@ -292,8 +265,6 @@ J3DGXColor J3DMaterialFactory_v21::newTevKColor(int i_idx, int param_1) const {
     return J3DGXColor(defaultJ3DGXColor);
 }
 
-/* 80333CD0-80333D08 32E610 0038+00 1/1 0/0 0/0 .text newTevStageNum__22J3DMaterialFactory_v21CFi
- */
 u8 J3DMaterialFactory_v21::newTevStageNum(int i_idx) const {
     u8 tev_stage_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageNumIdx;
     if (tev_stage_num_index != 0xff) {
@@ -303,7 +274,6 @@ u8 J3DMaterialFactory_v21::newTevStageNum(int i_idx) const {
     }
 }
 
-/* 80333D08-80333D68 32E648 0060+00 1/1 0/0 0/0 .text newTevStage__22J3DMaterialFactory_v21CFii */
 J3DTevStage J3DMaterialFactory_v21::newTevStage(int i_idx, int i_no) const {
     u16 tev_stage_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageIdx[i_no];
     if (tev_stage_index != 0xffff) {
@@ -313,8 +283,6 @@ J3DTevStage J3DMaterialFactory_v21::newTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80333D68-80333E04 32E6A8 009C+00 1/1 0/0 0/0 .text
- * newTevSwapModeTable__22J3DMaterialFactory_v21CFii            */
 J3DTevSwapModeTable J3DMaterialFactory_v21::newTevSwapModeTable(int i_idx, int param_1) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevSwapModeTableIdx[param_1] != 0xffff) {
@@ -323,8 +291,6 @@ J3DTevSwapModeTable J3DMaterialFactory_v21::newTevSwapModeTable(int i_idx, int p
     return J3DTevSwapModeTable(j3dDefaultTevSwapModeTable);
 }
 
-/* 80333E04-80333EE0 32E744 00DC+00 1/1 0/0 0/0 .text            newFog__22J3DMaterialFactory_v21CFi
- */
 J3DFog J3DMaterialFactory_v21::newFog(int i_idx) const {
     J3DFog fog;
     u16 fog_index = mpMaterialInitData[mpMaterialID[i_idx]].mFogIdx;
@@ -334,7 +300,6 @@ J3DFog J3DMaterialFactory_v21::newFog(int i_idx) const {
     return fog;
 }
 
-/* 80333EE0-80333F60 32E820 0080+00 1/1 0/0 0/0 .text newAlphaComp__22J3DMaterialFactory_v21CFi */
 J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mAlphaCompIdx != 0xffff) {
@@ -343,7 +308,6 @@ J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const {
     return J3DAlphaComp(0xffff);
 }
 
-/* 80333F60-80333FA4 32E8A0 0044+00 1/1 0/0 0/0 .text newBlend__22J3DMaterialFactory_v21CFi */
 J3DBlend J3DMaterialFactory_v21::newBlend(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mBlendIdx != 0xffff) {
@@ -353,7 +317,6 @@ J3DBlend J3DMaterialFactory_v21::newBlend(int i_idx) const {
     }
 }
 
-/* 80333FA4-80334004 32E8E4 0060+00 1/1 0/0 0/0 .text newZMode__22J3DMaterialFactory_v21CFi */
 J3DZMode J3DMaterialFactory_v21::newZMode(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZModeIdx != 0xff) {
@@ -363,7 +326,6 @@ J3DZMode J3DMaterialFactory_v21::newZMode(int i_idx) const {
     }
 }
 
-/* 80334004-8033403C 32E944 0038+00 1/1 0/0 0/0 .text newZCompLoc__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newZCompLoc(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZCompLocIdx != 0xff){
@@ -373,7 +335,6 @@ u8 J3DMaterialFactory_v21::newZCompLoc(int i_idx) const {
     }
 }
 
-/* 8033403C-80334074 32E97C 0038+00 1/1 0/0 0/0 .text newDither__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newDither(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mDitherIdx != 0xff){
@@ -383,7 +344,6 @@ u8 J3DMaterialFactory_v21::newDither(int i_idx) const {
     }
 }
 
-/* 80334074-80334118 32E9B4 00A4+00 1/1 0/0 0/0 .text newNBTScale__22J3DMaterialFactory_v21CFi */
 J3DNBTScale J3DMaterialFactory_v21::newNBTScale(int i_idx) const {
     J3DNBTScale dflt(j3dDefaultNBTScaleInfo);
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 403bee5c42..49b0bd5887 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DModelLoader
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
@@ -17,7 +12,6 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 
-/* 8033468C-803346BC 32EFCC 0030+00 1/1 0/0 0/0 .text            __ct__14J3DModelLoaderFv */
 J3DModelLoader::J3DModelLoader() :
                 mpModelData(NULL),
                 mpMaterialTable(NULL),
@@ -29,7 +23,6 @@ J3DModelLoader::J3DModelLoader() :
     /* empty function */
 }
 
-/* 803346BC-803347E0 32EFFC 0124+00 0/0 4/4 0/0 .text load__22J3DModelLoaderDataBaseFPCvUl */
 J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) {
     if (i_data == NULL) {
         return NULL;
@@ -48,7 +41,6 @@ J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) {
     return NULL;
 }
 
-/* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text            load__14J3DModelLoaderFPCvUl */
 J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
     JKRGetCurrentHeap()->getTotalFreeSize();
     mpModelData = new J3DModelData();
@@ -107,7 +99,6 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
 }
 
 
-/* 80334ABC-80334C20 32F3FC 0164+00 3/0 0/0 0/0 .text loadMaterialTable__14J3DModelLoaderFPCv */
 J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
     mpMaterialTable = new J3DMaterialTable();
     mpMaterialTable->clear();
@@ -136,8 +127,6 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
     return mpMaterialTable;
 }
 
-/* 80334C20-80334EE0 32F560 02C0+00 3/0 0/0 0/0 .text
- * loadBinaryDisplayList__14J3DModelLoaderFPCvUl                */
 J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_flags) {
     mpModelData = new J3DModelData();
     mpModelData->clear();
@@ -200,8 +189,6 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_fl
     return mpModelData;
 }
 
-/* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text            setupBBoardInfo__14J3DModelLoaderFv
- */
 void J3DModelLoader::setupBBoardInfo() {
     for (u16 i = 0; i < mpModelData->getJointNum(); i++) {
         J3DMaterial* mesh = mpModelData->getJointNodePointer(i)->getMesh();
@@ -240,8 +227,6 @@ void J3DModelLoader::setupBBoardInfo() {
     }
 }
 
-/* 80335048-803351A4 32F988 015C+00 2/2 0/0 0/0 .text
- * readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl    */
 void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_flags) {
     mpModelData->mFlags = i_flags | i_block->mFlags;
     mpModelData->getJointTree().setFlag(mpModelData->mFlags);
@@ -263,7 +248,6 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla
     mpModelData->setHierarchy(JSUConvertOffsetToPtr<J3DModelHierarchy>(i_block, i_block->mpHierarchy));
 }
 
-/* 803351A4-803351D0 32FAE4 002C+00 1/1 0/0 0/0 .text getFmtType__FP17_GXVtxAttrFmtList7_GXAttr */
 static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
     for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) {
         if (i_fmtList->attr == i_attr) {
@@ -273,8 +257,6 @@ static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
     return GX_F32;
 }
 
-/* 803351D0-803353F0 32FB10 0220+00 2/2 0/0 0/0 .text
- * readVertex__14J3DModelLoaderFPC14J3DVertexBlock              */
 void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     J3DVertexData& vertex_data = mpModelData->getVertexData();
     vertex_data.mVtxAttrFmtList =
@@ -333,8 +315,6 @@ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     }
 }
 
-/* 803353F0-80335480 32FD30 0090+00 2/2 0/0 0/0 .text
- * readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock           */
 void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) {
     mpModelData->getJointTree().mWEvlpMtxNum = i_block->mWEvlpMtxNum;
     mpModelData->getJointTree().mWEvlpMixMtxNum =
@@ -347,8 +327,6 @@ void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) {
         JSUConvertOffsetToPtr<Mtx>(i_block, i_block->mpInvJointMtx);
 }
 
-/* 80335480-80335530 32FDC0 00B0+00 2/2 0/0 0/0 .text readDraw__14J3DModelLoaderFPC12J3DDrawBlock
- */
 void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) {
     J3DJointTree& joint_tree = mpModelData->getJointTree();
     joint_tree.mDrawMtxData.mEntryNum = i_block->mMtxNum - mpModelData->getJointTree().mWEvlpMtxNum;
@@ -365,8 +343,6 @@ void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) {
 
 }
 
-/* 80335530-80335614 32FE70 00E4+00 2/2 0/0 0/0 .text
- * readJoint__14J3DModelLoaderFPC13J3DJointBlock                */
 void J3DModelLoader::readJoint(J3DJointBlock const* i_block) {
     J3DJointFactory factory(*i_block);
     mpModelData->getJointTree().mJointNum = i_block->mJointNum;
@@ -383,8 +359,6 @@ void J3DModelLoader::readJoint(J3DJointBlock const* i_block) {
     }
 }
 
-/* 80335614-80335890 32FF54 027C+00 1/0 0/0 0/0 .text
- * readMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl    */
 void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -427,8 +401,6 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla
     }
 }
 
-/* 80335890-80335AF4 3301D0 0264+00 1/0 0/0 0/0 .text
- * readMaterial_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */
 void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) {
     J3DMaterialFactory_v21 factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -468,8 +440,6 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u
     }
 }
 
-/* 80335AF4-80335C18 330434 0124+00 2/2 0/0 0/0 .text
- * readShape__14J3DModelLoaderFPC13J3DShapeBlockUl              */
 void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) {
     mpShapeBlock = i_block;
     J3DShapeTable* shape_table = mpModelData->getShapeTable();
@@ -494,8 +464,6 @@ void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) {
     }
 }
 
-/* 80335C18-80335CE4 330558 00CC+00 2/2 0/0 0/0 .text
- * readTexture__14J3DModelLoaderFPC15J3DTextureBlock            */
 void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) {
     u16 texture_num = i_block->mTextureNum;
     ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes);
@@ -508,8 +476,6 @@ void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) {
     mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res);
 }
 
-/* 80335CE4-80335E20 330624 013C+00 1/0 0/0 0/0 .text
- * readMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -530,8 +496,6 @@ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32
     }
 }
 
-/* 80335E20-80335F5C 330760 013C+00 1/0 0/0 0/0 .text
- * readMaterialTable_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */
 void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) {
     J3DMaterialFactory_v21 factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -552,8 +516,6 @@ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_blo
     }
 }
 
-/* 80335F5C-80336028 33089C 00CC+00 1/1 0/0 0/0 .text
- * readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock       */
 void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) {
     u16 texture_num = i_block->mTextureNum;
     ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes);
@@ -566,8 +528,6 @@ void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) {
     mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res);
 }
 
-/* 80336028-80336168 330968 0140+00 1/1 0/0 0/0 .text
- * readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */
 void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -588,8 +548,6 @@ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_
     }
 }
 
-/* 80336168-8033631C 330AA8 01B4+00 1/1 0/0 0/0 .text
- * readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl    */
 void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     s32 flags;
@@ -623,8 +581,6 @@ void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_fla
     }
 }
 
-/* 8033631C-80336398 330C5C 007C+00 1/1 0/0 0/0 .text            modifyMaterial__14J3DModelLoaderFUl
- */
 void J3DModelLoader::modifyMaterial(u32 i_flags) {
     if (i_flags & 0x2000) {
         J3DMaterialFactory factory(*mpMaterialBlock);
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
index 83183c6323..a1e72e8be1 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DModelLoaderCalcSize
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h"
@@ -16,7 +11,6 @@
 #include "global.h"
 
 
-/* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */
 u16 J3DModelLoader::countMaterialNum(const void* stream) {
     const J3DModelFileData* header = (const J3DModelFileData*)stream;
     const J3DModelBlock* block = header->mBlocks;
@@ -29,7 +23,6 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) {
     return 0;
 }
 
-/* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */
 u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
     int flags = flags_;
     const J3DModelFileData* header = static_cast<const J3DModelFileData*>(stream);
@@ -74,8 +67,6 @@ u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
     return size;
 }
 
-/* 803369A0-80336A98 3312E0 00F8+00 0/0 3/0 0/0 .text
- * calcLoadMaterialTableSize__14J3DModelLoaderFPCv              */
 u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) {
     size_t size;
     const J3DModelBlock* nextBlock;
@@ -118,8 +109,6 @@ inline u32 getBdlFlag_MaterialType(u32 flags) {
     return flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc);
 }
 
-/* 80336A98-80336CD8 3313D8 0240+00 0/0 3/0 0/0 .text
- * calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl        */
 // NONMATCHING flags issue
 u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) {
     u32 size = 0;
@@ -176,8 +165,6 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags)
     return size;
 }
 
-/* 80336CD8-80336D64 331618 008C+00 2/2 0/0 0/0 .text
- * calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */
 u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flags) {
 	int size = 0;
 	switch ((flags | block->mFlags) & J3DMLF_MtxTypeMask) {
@@ -197,8 +184,6 @@ u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flag
 	return size;
 }
 
-/* 80336D64-80336D90 3316A4 002C+00 2/2 0/0 0/0 .text
- * calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock            */
 u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) {
 	int size = 0;
 	if (block->mpNameTable) {
@@ -209,21 +194,15 @@ u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) {
 	return size;
 }
 
-/* 80336D90-80336DA0 3316D0 0010+00 2/2 0/0 0/0 .text
- * calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock      */
 u32 J3DModelLoader::calcSizeEnvelope(const J3DEnvelopeBlock* block) {
 	mEnvelopeSize = block->mWEvlpMtxNum;
 	return 0;
 }
 
-/* 80336DA0-80336DB4 3316E0 0014+00 2/2 0/0 0/0 .text
- * calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock              */
 u32 J3DModelLoader::calcSizeDraw(const J3DDrawBlock* block) {
     return (block->mMtxNum - mEnvelopeSize) * 2; 
 }
 
-/* 80336DB4-80336EA0 3316F4 00EC+00 0/0 1/0 0/0 .text
- * calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 u32 J3DModelLoader_v26::calcSizeMaterial(const J3DMaterialBlock* block, u32 flags) {
 	int padding = 0;
 	J3DMaterialFactory factory(*block);
@@ -249,8 +228,6 @@ u32 J3DModelLoader_v26::calcSizeMaterial(const J3DMaterialBlock* block, u32 flag
 	return size;
 }
 
-/* 80336EA0-80336F44 3317E0 00A4+00 2/2 0/0 0/0 .text
- * calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl          */
 u32 J3DModelLoader::calcSizeShape(const J3DShapeBlock* block, u32 flags) {
 	int size = 0;
 	J3DShapeFactory factory(*block);
@@ -268,8 +245,6 @@ u32 J3DModelLoader::calcSizeShape(const J3DShapeBlock* block, u32 flags) {
 	return size;
 }
 
-/* 80336F44-80336F60 331884 001C+00 3/3 0/0 0/0 .text
- * calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock        */
 u32 J3DModelLoader::calcSizeTexture(const J3DTextureBlock* block) {
 	// TODO: use sizeofs here.
 	int padding = 0;
@@ -279,8 +254,6 @@ u32 J3DModelLoader::calcSizeTexture(const J3DTextureBlock* block) {
 	return padding + 0xC;
 }
 
-/* 80336F60-80336FF0 3318A0 0090+00 0/0 1/0 0/0 .text
- * calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 u32 J3DModelLoader_v26::calcSizeMaterialTable(const J3DMaterialBlock* block, u32 flags) {
     int size = 0;
     u32 count = block->mMaterialNum;
@@ -295,14 +268,10 @@ u32 J3DModelLoader_v26::calcSizeMaterialTable(const J3DMaterialBlock* block, u32
     return size;
 }
 
-/* 80336FF0-80337010 331930 0020+00 1/1 0/0 0/0 .text
- * calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock   */
 u32 J3DModelLoader::calcSizeTextureTable(const J3DTextureBlock* block) {
 	return calcSizeTexture(block);
 }
 
-/* 80337010-803370A0 331950 0090+00 1/1 0/0 0/0 .text
- * calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */
 u32 J3DModelLoader::calcSizePatchedMaterial(const J3DMaterialBlock* block, u32 flags) {
     int padding = 0;
     u32 count = block->mMaterialNum;
@@ -317,8 +286,6 @@ u32 J3DModelLoader::calcSizePatchedMaterial(const J3DMaterialBlock* block, u32 f
     return size;
 }
 
-/* 803370A0-80337178 3319E0 00D8+00 1/1 0/0 0/0 .text
- * calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl */
 u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flags_) {
     int flags = flags_;
 	size_t size = 0;
diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index bf62cf02ea..8048b12bf8 100644
--- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DShapeFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DShapeFactory.h"
@@ -13,7 +8,6 @@
 #include "dolphin/os.h"
 #include "global.h"
 
-/* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
 J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
     mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (uintptr_t)block.mpShapeInitData);
     mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
@@ -25,8 +19,6 @@ J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
     mVcdVatCmdBuffer = NULL;
 }
 
-/* 80337400-803375BC 331D40 01BC+00 0/0 1/1 0/0 .text
- * create__15J3DShapeFactoryFiUlP14_GXVtxDescList               */
 J3DShape* J3DShapeFactory::create(int no, u32 flag, GXVtxDescList* vtxDesc) {
     J3DShape* shape = new J3DShape;
     shape->mMtxGroupNum = getMtxGroupNum(no);
@@ -58,7 +50,6 @@ enum {
     J3DShapeMtxType_Multi = 0x03,
 };
 
-/* 803375BC-8033784C 331EFC 0290+00 1/1 0/0 0/0 .text newShapeMtx__15J3DShapeFactoryCFUlii */
 J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) const {
     J3DShapeMtx* ret = NULL;
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
@@ -109,8 +100,6 @@ J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo)
     return ret;
 }
 
-/* 8033784C-803378D8 33218C 008C+00 1/1 0/0 0/0 .text            newShapeDraw__15J3DShapeFactoryCFii
- */
 J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const {
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
     const J3DShapeDrawInitData& drawInitData =
@@ -119,15 +108,12 @@ J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const {
                             drawInitData.mDisplayListSize);
 }
 
-/* 803378D8-80337944 332218 006C+00 0/0 1/1 0/0 .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl
- */
 void J3DShapeFactory::allocVcdVatCmdBuffer(u32 count) {
     mVcdVatCmdBuffer = new (0x20) u8[J3DShape::kVcdVatDLSize * count];
     for (u32 i = 0; i < (J3DShape::kVcdVatDLSize * count) / 4; i++)
         ((u32*)mVcdVatCmdBuffer)[i] = 0;
 }
 
-/* 80337944-803379D8 332284 0094+00 0/0 1/1 0/0 .text            calcSize__15J3DShapeFactoryFiUl */
 s32 J3DShapeFactory::calcSize(int shapeNo, u32 flag) {
     s32 size = 0x68;
 
@@ -144,13 +130,10 @@ s32 J3DShapeFactory::calcSize(int shapeNo, u32 flag) {
     return size;
 }
 
-/* 803379D8-803379E8 332318 0010+00 0/0 1/1 0/0 .text
- * calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl                */
 s32 J3DShapeFactory::calcSizeVcdVatCmdBuffer(u32 count) {
     return ALIGN_NEXT(count * J3DShape::kVcdVatDLSize, 0x20);
 }
 
-/* 803379E8-80337AE0 332328 00F8+00 1/1 0/0 0/0 .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii */
 s32 J3DShapeFactory::calcSizeShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) const {
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
     u32 ret = 0;
diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp
index 9475b26113..b25841914d 100644
--- a/src/JSystem/J3DU/J3DUClipper.cpp
+++ b/src/JSystem/J3DU/J3DUClipper.cpp
@@ -1,21 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DUClipper
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DU/J3DUClipper.h"
 #include "math.h"
 
-/* 80273778-8027378C 26E0B8 0014+00 0/0 1/1 0/0 .text            init__11J3DUClipperFv */
 void J3DUClipper::init() {
     mNear = 1.0f;
     mFar = 100000.0f;
 }
 
-/* ############################################################################################## */
-/* 8027378C-802738FC 26E0CC 0170+00 0/0 3/3 4/4 .text            calcViewFrustum__11J3DUClipperFv */
 void J3DUClipper::calcViewFrustum() {
     static const f32 unused[3] = {0.0f};
     f32 f0 = tan(0.5f * mFovY * 0.01745329238474369f);
@@ -35,7 +27,6 @@ void J3DUClipper::calcViewFrustum() {
     VECNormalize(&_28, &_28);
 }
 
-/* 802738FC-80273A44 26E23C 0148+00 0/0 3/3 2/2 .text            clip__11J3DUClipperCFPA4_Cf3Vecf */
 int J3DUClipper::clip(f32 const (*param_0)[4], Vec param_1, f32 param_2) const {
     Vec vec1;
     MTXMultVec(param_0, &param_1, &vec1);
@@ -66,9 +57,7 @@ int J3DUClipper::clip(f32 const (*param_0)[4], Vec param_1, f32 param_2) const {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 80273A44-80273E08 26E384 03C4+00 0/0 3/3 2/2 .text clip__11J3DUClipperCFPA4_CfP3VecP3Vec */
 int J3DUClipper::clip(f32 const (*param_1)[4], Vec* param_2, Vec* param_3) const {
     s32 local_98[6];
     for (int i = 0; i < 6; i++) {
@@ -160,15 +149,10 @@ int J3DUClipper::clip(f32 const (*param_1)[4], Vec* param_2, Vec* param_3) const
     return 0;
 }
 
-/* ############################################################################################## */
-/* 8039A984-8039A99D 026FE4 0019+00 0/0 0/0 0/0 .rodata          None */
 static char const* const stringBase_8039A984 = " J3DUClipper::mFovy = %f";
 
-/* 8039A99D-8039A9B8 026FFD 001B+00 0/0 0/0 0/0 .rodata          None */
 static char const* const stringBase_8039A99D = " J3DUClipper::mAspect = %f";
 
-/* 8039A9B8-8039A9D1 027018 0019+00 0/0 0/0 0/0 .rodata          None */
 static char const* const stringBase_8039A9B8 = " J3DUClipper::mNear = %f";
 
-/* 8039A9D1-8039A9F0 027031 0018+07 0/0 0/0 0/0 .rodata          None */
 static char const* const stringBase_8039A9D1 = " J3DUClipper::mFar = %f";
diff --git a/src/JSystem/J3DU/J3DUDL.cpp b/src/JSystem/J3DU/J3DUDL.cpp
index bdc5efe75b..90012908ac 100644
--- a/src/JSystem/J3DU/J3DUDL.cpp
+++ b/src/JSystem/J3DU/J3DUDL.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DUDL
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DU/J3DUDL.h"
diff --git a/src/JSystem/JAudio2/JAISe.cpp b/src/JSystem/JAudio2/JAISe.cpp
index 08fc743591..b3c1df38fd 100644
--- a/src/JSystem/JAudio2/JAISe.cpp
+++ b/src/JSystem/JAudio2/JAISe.cpp
@@ -4,16 +4,12 @@
 #include "JSystem/JAudio2/JAIAudience.h"
 #include "JSystem/JAudio2/JAISeMgr.h"
 
-/* 8029F03C-8029F0F8 29997C 00BC+00 0/0 1/1 0/0 .text
- * __ct__5JAISeFP8JAISeMgrP27JAISoundStrategyMgr<5JAISe>Ul      */
 JAISe::JAISe(JAISeMgr* seMgr, JAISoundStrategyMgr<JAISe>* soundStrategyMgr, u32 priority) : JSULink<JAISe>(this) {
     inner_.mSoundStrategyMgr = soundStrategyMgr;
     inner_.seMgr = seMgr;
     inner_.mProperPriority = priority;
 }
 
-/* 8029F0F8-8029F214 299A38 011C+00 1/1 0/0 0/0 .text            mixOut___5JAISeFRC14JASSoundParams
-*/
 void JAISe::mixOut_(const JASSoundParams& params) {
     inner_.track.setTempoRate(inner_.mTempoMgr.getTempo());
     JASSoundParams mixParams;
@@ -33,7 +29,6 @@ void JAISe::mixOut_(const JASSoundParams& params) {
     }
 }
 
-/* 8029F214-8029F250 299B54 003C+00 1/1 0/0 0/0 .text            stopTrack___5JAISeFv */
 void JAISe::stopTrack_() {
     switch (inner_.track.getStatus()) {
     case JASTrack::STATUS_FREE:
@@ -46,7 +41,6 @@ void JAISe::stopTrack_() {
     }
 }
 
-/* 8029F250-8029F304 299B90 00B4+00 1/1 0/0 0/0 .text startTrack___5JAISeFRC14JASSoundParams */
 void JAISe::startTrack_(const JASSoundParams& params) {
     JUT_ASSERT(72, inner_.track.getStatus() != JASTrack::STATUS_RUN);
 
@@ -67,8 +61,6 @@ void JAISe::startTrack_(const JASSoundParams& params) {
     inner_.track.startSeq();
 }
 
-/* 8029F304-8029F4CC 299C44 01C8+00 0/0 1/1 0/0 .text
- * JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity */
 void JAISe::JAISeCategoryMgr_mixOut_(bool param_0, const JASSoundParams& params, JAISoundActivity activity) {
     mixOut_(params);
     if (isStopping()) {
@@ -104,7 +96,6 @@ void JAISe::JAISeCategoryMgr_mixOut_(bool param_0, const JASSoundParams& params,
     }
 }
 
-/* 8029F4CC-8029F5C8 299E0C 00FC+00 0/0 1/1 0/0 .text            JAISeCategoryMgr_calc___5JAISeFv */
 void JAISe::JAISeCategoryMgr_calc_() {
     prepare_();
 
@@ -122,7 +113,6 @@ void JAISe::JAISeCategoryMgr_calc_() {
     }
 }
 
-/* 8029F5C8-8029F650 299F08 0088+00 2/1 0/0 0/0 .text            JAISound_tryDie___5JAISeFv */
 bool JAISe::JAISound_tryDie_() {
     switch (inner_.track.getStatus()) {
     case JASTrack::STATUS_FREE:
@@ -139,8 +129,6 @@ bool JAISe::JAISound_tryDie_() {
     return false;
 }
 
-/* 8029F650-8029F6D8 299F90 0088+00 0/0 1/1 0/0 .text
- * JAISeMgr_startID___5JAISeF10JAISoundIDPCQ29JGeometry8TVec3<f>P11JAIAudience */
 void JAISe::JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience) {
     JUT_ASSERT(221, inner_.track.getStatus() == JASTrack::STATUS_FREE);
 
@@ -153,20 +141,16 @@ void JAISe::JAISeMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr
     }
 }
 
-/* 8029F6D8-8029F6E0 29A018 0008+00 2/1 0/0 0/0 .text            getNumChild__5JAISeCFv */
 s32 JAISe::getNumChild() const {
     return 0;
 }
 
-/* 8029F6E0-8029F6E8 29A020 0008+00 2/1 0/0 0/0 .text            getChild__5JAISeFi */
 JAISoundChild* JAISe::getChild(int param_0) {
     return NULL;
 }
 
-/* 8029F6E8-8029F6EC 29A028 0004+00 2/1 0/0 0/0 .text            releaseChild__5JAISeFi */
 void JAISe::releaseChild(int param_0) {}
 
-/* 8029F6EC-8029F78C 29A02C 00A0+00 1/1 0/0 0/0 .text            prepare_getSeqData___5JAISeFv */
 bool JAISe::prepare_getSeqData_() {
     JUT_ASSERT(271, inner_.track.getStatus() != JASTrack::STATUS_RUN);
     JUT_ASSERT(272, inner_.seMgr);
@@ -189,7 +173,6 @@ bool JAISe::prepare_getSeqData_() {
     return false;
 }
 
-/* 8029F78C-8029F84C 29A0CC 00C0+00 1/1 0/0 0/0 .text            prepare___5JAISeFv */
 void JAISe::prepare_() {
     switch (status_.state.unk) {
     case 6:
@@ -217,22 +200,18 @@ void JAISe::prepare_() {
     }
 }
 
-/* 8029F84C-8029F854 29A18C 0008+00 2/1 0/0 0/0 .text            getTrack__5JAISeFv */
 JASTrack* JAISe::getTrack() {
     return &inner_.track;
 }
 
-/* 8029F854-8029F864 29A194 0010+00 2/1 0/0 0/0 .text            getChildTrack__5JAISeFi */
 JASTrack* JAISe::getChildTrack(int param_0) {
     return inner_.track.getChild(param_0);
 }
 
-/* 8029F864-8029F868 29A1A4 0004+00 2/1 0/0 0/0 .text            asSe__5JAISeFv */
 JAISe* JAISe::asSe() {
     return this;
 }
 
-/* 8029F868-8029F870 29A1A8 0008+00 2/1 0/0 0/0 .text            getTempoMgr__5JAISeFv */
 JAITempoMgr* JAISe::getTempoMgr() {
     return &inner_.mTempoMgr;
 }
diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/src/JSystem/JAudio2/JAISeMgr.cpp
index 0501961910..e2ea99c86b 100644
--- a/src/JSystem/JAudio2/JAISeMgr.cpp
+++ b/src/JSystem/JAudio2/JAISeMgr.cpp
@@ -5,8 +5,6 @@
 #include "JSystem/JAudio2/JAISoundInfo.h"
 #include "JSystem/JAudio2/JASReport.h"
 
-/* 8029F8B0-8029F91C 29A1F0 006C+00 2/1 0/0 0/0 .text
- * isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion      */
 bool JAISeCategoryMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     JSULink<JAISe>* i = mSeList.getFirst();
     while (i != NULL) {
@@ -20,8 +18,6 @@ bool JAISeCategoryMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     return false;
 }
 
-/* 8029F91C-8029F9C4 29A25C 00A8+00 2/1 0/0 0/0 .text
- * releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion      */
 int JAISeCategoryMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     bool bVar1 = false;
     for (JSULink<JAISe>* i = mSeList.getFirst(); i != NULL; i = i->getNext()) {
@@ -35,7 +31,6 @@ int JAISeCategoryMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     return bVar1 ? _1 : _2;
 }
 
-/* 8029F9C4-8029FB30 29A304 016C+00 1/1 0/0 0/0 .text JAISeMgr_calc___16JAISeCategoryMgrFv */
 void JAISeCategoryMgr::JAISeMgr_calc_() {
     mParams.calc();
 
@@ -46,8 +41,6 @@ void JAISeCategoryMgr::JAISeMgr_calc_() {
     sortByPriority_();
 }
 
-/* 8029FB30-8029FC34 29A470 0104+00 1/1 0/0 0/0 .text JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv
- */
 void JAISeCategoryMgr::JAISeMgr_freeDeadSe_() {
     JSULink<JAISe>* i = mSeList.getFirst();
     while (i != NULL) {
@@ -61,8 +54,6 @@ void JAISeCategoryMgr::JAISeMgr_freeDeadSe_() {
     }
 }
 
-/* 8029FC88-8029FD40 29A5C8 00B8+00 1/1 0/0 0/0 .text
- * JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl               */
 bool JAISeCategoryMgr::JAISeMgr_acceptsNewSe_(u32 priority) const {
     s32 maxSe = getMaxSe();
     if (maxSe <= 0) {
@@ -86,7 +77,6 @@ bool JAISeCategoryMgr::JAISeMgr_acceptsNewSe_(u32 priority) const {
     }
 }
 
-/* 8029FD40-8029FDE0 29A680 00A0+00 1/1 0/0 0/0 .text sortByPriority___16JAISeCategoryMgrFv */
 void JAISeCategoryMgr::sortByPriority_() {
     for (u32 i = mSeList.getNumLinks(); i != 0; i--) {
         JSULink<JAISe>* link = mSeList.getFirst();
@@ -110,22 +100,18 @@ void JAISeCategoryMgr::sortByPriority_() {
     }
 }
 
-/* 8029FDE0-8029FE34 29A720 0054+00 0/0 1/1 0/0 .text            stop__16JAISeCategoryMgrFUl */
 void JAISeCategoryMgr::stop(u32 fadeTime) {
     for (JSULink<JAISe>* i = mSeList.getFirst(); i != NULL; i = i->getNext()) {
         i->getObject()->stop(fadeTime);
     }
 }
 
-/* 8029FE34-8029FE78 29A774 0044+00 1/1 0/0 0/0 .text            stop__16JAISeCategoryMgrFv */
 void JAISeCategoryMgr::stop() {
     for (JSULink<JAISe>* i = mSeList.getFirst(); i != NULL; i = i->getNext()) {
         i->getObject()->stop();
     }
 }
 
-/* 8029FE78-8029FEEC 29A7B8 0074+00 1/1 0/0 0/0 .text stopSoundID__16JAISeCategoryMgrF10JAISoundID
- */
 void JAISeCategoryMgr::stopSoundID(JAISoundID id) {
     if (!id.isAnonymous()) {
         for (JSULink<JAISe>* i = mSeList.getFirst(); i != NULL; i = i->getNext()) {
@@ -136,15 +122,12 @@ void JAISeCategoryMgr::stopSoundID(JAISoundID id) {
     }
 }
 
-/* 8029FEEC-8029FF18 29A82C 002C+00 0/0 2/2 0/0 .text            pause__16JAISeCategoryMgrFb */
 void JAISeCategoryMgr::pause(bool param_0) {
     for (JSULink<JAISe>* i = mSeList.getFirst(); i != NULL; i = i->getNext()) {
         i->getObject()->pause(param_0);
     }
 }
 
-/* 8029FF18-802A0074 29A858 015C+00 1/1 0/0 0/0 .text
- * JAISeMgr_mixOut___16JAISeCategoryMgrFRC18JAISoundParamsMove16JAISoundActivity */
 void JAISeCategoryMgr::JAISeMgr_mixOut_(const JAISoundParamsMove& params,
                                         JAISoundActivity activity) {
     JASSoundParams mixParams;
@@ -174,7 +157,6 @@ void JAISeCategoryMgr::JAISeMgr_mixOut_(const JAISoundParamsMove& params,
     }
 }
 
-/* 802A0074-802A0168 29A9B4 00F4+00 0/0 1/1 0/0 .text            __ct__8JAISeMgrFb */
 JAISeMgr::JAISeMgr(bool setInstance) : JASGlobalInstance<JAISeMgr>(setInstance) {
     mAudience = NULL;
     mSeqDataMgr = NULL;
@@ -183,8 +165,6 @@ JAISeMgr::JAISeMgr(bool setInstance) : JASGlobalInstance<JAISeMgr>(setInstance)
     JAISoundActivity::init();
 }
 
-/* 802A0168-802A01D8 29AAA8 0070+00 1/0 0/0 0/0 .text
- * isUsingSeqData__8JAISeMgrFRC16JAISeqDataRegion               */
 bool JAISeMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     for (int i = 0; i < 16; i++) {
         if (mCategoryMgrs[i].JAISeCategoryMgr::isUsingSeqData(seqDataRegion)) {
@@ -194,8 +174,6 @@ bool JAISeMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     return false;
 }
 
-/* 802A01D8-802A0268 29AB18 0090+00 1/0 0/0 0/0 .text
- * releaseSeqData__8JAISeMgrFRC16JAISeqDataRegion               */
 int JAISeMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     bool r30 = 0;
     for (int i = 0; i < 16; i++) {
@@ -211,8 +189,6 @@ int JAISeMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     return (r30 != 0) ? 1 : 0;
 }
 
-/* 802A0268-802A02A0 29ABA8 0038+00 0/0 1/1 0/0 .text
- * setCategoryArrangement__8JAISeMgrFRC24JAISeCategoryArrangement */
 void JAISeMgr::setCategoryArrangement(const JAISeCategoryArrangement& arrangement) {
     for (int i = 0; i < 16; i++) {
         mCategoryMgrs[i].setMaxActiveSe(arrangement.mItems[i].mMaxActiveSe);
@@ -220,22 +196,18 @@ void JAISeMgr::setCategoryArrangement(const JAISeCategoryArrangement& arrangemen
     }
 }
 
-/* 802A02A0-802A02F4 29ABE0 0054+00 0/0 1/1 0/0 .text            stop__8JAISeMgrFv */
 void JAISeMgr::stop() {
     for (int i = 0; i < 16; i++) {
         mCategoryMgrs[i].stop();
     }
 }
 
-/* 802A02F4-802A0358 29AC34 0064+00 0/0 1/1 0/0 .text            stopSoundID__8JAISeMgrF10JAISoundID
- */
 void JAISeMgr::stopSoundID(JAISoundID id) {
     for (int i = 0; i < 16; i++) {
         mCategoryMgrs[i].stopSoundID(id);
     }
 }
 
-/* 802A0358-802A03D8 29AC98 0080+00 0/0 1/1 0/0 .text            initParams__8JAISeMgrFv */
 void JAISeMgr::initParams() {
     for (int i = 0; i < 16; i++) {
         mCategoryMgrs[i].getParams()->init();
@@ -243,13 +215,11 @@ void JAISeMgr::initParams() {
 }
 
 
-/* 802A03D8-802A03E0 -00001 0008+00 0/0 0/0 0/0 .text setAudience__8JAISeMgrFP11JAIAudience */
 void JAISeMgr::setAudience(JAIAudience* audience) {
     JUT_ASSERT(363, ! isActive());
     mAudience = audience;
 }
 
-/* 802A03E0-802A0434 29AD20 0054+00 0/0 1/1 0/0 .text setSeqDataMgr__8JAISeMgrFP13JAISeqDataMgr */
 void JAISeMgr::setSeqDataMgr(JAISeqDataMgr* seqDataMgr) {
     JUT_ASSERT(377, ! isActive());
     resetSeqDataMgr();
@@ -257,7 +227,6 @@ void JAISeMgr::setSeqDataMgr(JAISeqDataMgr* seqDataMgr) {
     mSeqDataMgr->setSeqDataUser(this);
 }
 
-/* 802A0434-802A0484 29AD74 0050+00 1/1 0/0 0/0 .text            resetSeqDataMgr__8JAISeMgrFv */
 void JAISeMgr::resetSeqDataMgr() {
     if (mSeqDataMgr) {
         mSeqDataMgr->setSeqDataUser(NULL);
@@ -265,7 +234,6 @@ void JAISeMgr::resetSeqDataMgr() {
     }
 }
 
-/* 802A0484-802A0574 29ADC4 00F0+00 1/1 0/0 0/0 .text            newSe___8JAISeMgrFiUl */
 JAISe* JAISeMgr::newSe_(int category, u32 priority) {
     JUT_ASSERT(396, category < NUM_CATEGORIES);
 
@@ -288,7 +256,6 @@ JAISe* JAISeMgr::newSe_(int category, u32 priority) {
     return se;
 }
 
-/* 802A0574-802A0704 29AEB4 0190+00 0/0 1/1 0/0 .text            calc__8JAISeMgrFv */
 void JAISeMgr::calc() {
     mParams.calc();
     for (int i = 0; i < 16; i++) {
@@ -299,15 +266,12 @@ void JAISeMgr::calc() {
     }
 }
 
-/* 802A0704-802A0768 29B044 0064+00 0/0 1/1 0/0 .text            mixOut__8JAISeMgrFv */
 void JAISeMgr::mixOut() {
     for (int i = 0; i < 16; i++) {
         mCategoryMgrs[i].JAISeMgr_mixOut_(mParams, *this);
     }
 }
 
-/* 802A0768-802A08D0 29B0A8 0168+00 0/0 1/1 0/0 .text
- * startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool JAISeMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
     if (handle && *handle) {
         (*handle)->stop();
@@ -346,7 +310,6 @@ bool JAISeMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry
     return true;
 }
 
-/* 802A08D0-802A08FC 29B210 002C+00 0/0 2/2 0/0 .text            getNumActiveSe__8JAISeMgrCFv */
 int JAISeMgr::getNumActiveSe() const {
     int num = 0;
     for (int i = 0; i < 16; i++) {
diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp
index 5e9ec3a5ad..bcde6d8734 100644
--- a/src/JSystem/JAudio2/JAISeq.cpp
+++ b/src/JSystem/JAudio2/JAISeq.cpp
@@ -8,8 +8,6 @@
 
 namespace {
 
-/* 802A0A6C-802A0A8C 29B3AC 0020+00 1/1 0/0 0/0 .text
- * JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack  */
 static bool JASTrack_isFreeOrStopped(JASTrack* track) {
     u32 status = track->getStatus();
     return status == JASTrack::STATUS_FREE || status == JASTrack::STATUS_STOP;
@@ -17,8 +15,6 @@ static bool JASTrack_isFreeOrStopped(JASTrack* track) {
 
 }  // namespace
 
-/* 802A0A8C-802A0B64 29B3CC 00D8+00 0/0 2/1 0/0 .text
- * __ct__6JAISeqFP9JAISeqMgrP28JAISoundStrategyMgr<6JAISeq>     */
 JAISeq::JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr) : JSULink<JAISeq>(this) {
     inner_.seqMgr = seqMgr;
     inner_.strategyMgr = soundStrategyMgr;
@@ -28,8 +24,6 @@ JAISeq::JAISeq(JAISeqMgr* seqMgr, JAISoundStrategyMgr<JAISeq>* soundStrategyMgr)
     }
 }
 
-/* 802A0B64-802A0C04 29B4A4 00A0+00 0/0 1/1 0/0 .text
- * JAISeqMgr_startID___6JAISeqF10JAISoundIDPCQ29JGeometry8TVec3<f>P11JAIAudienceii */
 void JAISeq::JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr,
                                 JAIAudience* audience, int category, int param_4) {
     inner_.field_0x39c = category;
@@ -43,8 +37,6 @@ void JAISeq::JAISeqMgr_startID_(JAISoundID id, const JGeometry::TVec3<f32>* posP
     }
 }
 
-/* 802A0C04-802A0CA4 29B544 00A0+00 1/1 0/0 0/0 .text
- * playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity   */
 void JAISeq::playSeqData_(const JASSoundParams& params, JAISoundActivity activity) {
     JUT_ASSERT(72, JASTrack_isFreeOrStopped( & inner_.outputTrack ));
 
@@ -60,7 +52,6 @@ void JAISeq::playSeqData_(const JASSoundParams& params, JAISoundActivity activit
     inner_.outputTrack.startSeq();
 }
 
-/* 802A0CA4-802A0E48 29B5E4 01A4+00 1/1 0/0 0/0 .text            reserveChildTracks___6JAISeqFi */
 void JAISeq::reserveChildTracks_(int param_0) {
     JUT_ASSERT(92, inner_.outputTrack.getStatus() == JASTrack::STATUS_FREE);
 
@@ -90,7 +81,6 @@ void JAISeq::reserveChildTracks_(int param_0) {
     }
 }
 
-/* 802A0E48-802A0EDC 29B788 0094+00 1/1 0/0 0/0 .text            releaseChildTracks___6JAISeqFv */
 void JAISeq::releaseChildTracks_() {
     for (u32 i = 0; i < 2; i++) {
         JASTrack* track = inner_.outputTrack.getChild(i);
@@ -106,7 +96,6 @@ void JAISeq::releaseChildTracks_() {
     }
 }
 
-/* 802A0EDC-802A0F90 29B81C 00B4+00 1/1 0/0 0/0 .text            prepare_getSeqData___6JAISeqFv */
 bool JAISeq::prepare_getSeqData_() {
     JAISoundID id(soundID_);  // fakematch, should be using getID but it messes up stack
     if (id.isAnonymous()) {
@@ -131,8 +120,6 @@ bool JAISeq::prepare_getSeqData_() {
     return false;
 }
 
-/* 802A0F90-802A108C 29B8D0 00FC+00 2/1 0/0 0/0 .text
- * prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity       */
 bool JAISeq::prepare_(const JASSoundParams& params, JAISoundActivity activity) {
     switch (status_.state.unk) {
     case 6:
@@ -164,7 +151,6 @@ bool JAISeq::prepare_(const JASSoundParams& params, JAISoundActivity activity) {
     return false;
 }
 
-/* 802A108C-802A1180 29B9CC 00F4+00 0/0 1/1 0/0 .text            JAISeqMgr_calc___6JAISeqFv */
 void JAISeq::JAISeqMgr_calc_() {
     if (inner_.outputTrack.getStatus() == JASTrack::STATUS_STOP || (inner_.outputTrack.getStatus() == JASTrack::STATUS_FREE && status_.state.unk == 2)) {
         die_();
@@ -184,7 +170,6 @@ void JAISeq::JAISeqMgr_calc_() {
     }
 }
 
-/* 802A1180-802A1268 29BAC0 00E8+00 2/2 0/0 0/0 .text            die___6JAISeqFv */
 void JAISeq::die_() {
     JUT_ASSERT(269, JASTrack_isFreeOrStopped( & inner_.outputTrack ));
 
@@ -205,7 +190,6 @@ void JAISeq::die_() {
     die_JAISound_();
 }
 
-/* 802A12BC-802A1348 29BBFC 008C+00 1/0 0/0 0/0 .text            JAISound_tryDie___6JAISeqFv */
 bool JAISeq::JAISound_tryDie_() {
     if (JASTrack_isFreeOrStopped(&inner_.outputTrack)) {
         die_();
@@ -223,8 +207,6 @@ bool JAISeq::JAISound_tryDie_() {
     return false;
 }
 
-/* 802A1348-802A14FC 29BC88 01B4+00 2/2 0/0 0/0 .text
- * mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity        */
 void JAISeq::mixOut_(const JASSoundParams& params, JAISoundActivity activity) {
     inner_.outputTrack.setTempoRate(inner_.mTempoMgr.getTempo());
     inner_.outputTrack.mute(activity.field_0x0.flags.flag1 || status_.isMute());
@@ -255,20 +237,16 @@ void JAISeq::mixOut_(const JASSoundParams& params, JAISoundActivity activity) {
     }
 }
 
-/* 802A14FC-802A1570 29BE3C 0074+00 0/0 1/1 0/0 .text
- * JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity */
 void JAISeq::JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity) {
     if (prepare_(params, activity) && inner_.outputTrack.getStatus() == JASTrack::STATUS_RUN) {
         mixOut_(params, activity);
     }
 }
 
-/* 802A1570-802A1578 29BEB0 0008+00 1/0 0/0 0/0 .text            getNumChild__6JAISeqCFv */
 s32 JAISeq::getNumChild() const {
     return NUM_CHILDREN;
 }
 
-/* 802A1578-802A165C 29BEB8 00E4+00 1/0 0/0 0/0 .text            getChild__6JAISeqFi */
 JAISoundChild* JAISeq::getChild(int index) {
     JUT_ASSERT(371, status_.isAlive());
     JUT_ASSERT(372, index >= 0);
@@ -288,7 +266,6 @@ JAISoundChild* JAISeq::getChild(int index) {
 }
 
 
-/* 802A165C-802A1728 29BF9C 00CC+00 1/0 0/0 0/0 .text            releaseChild__6JAISeqFi */
 void JAISeq::releaseChild(int index) {
     if (inner_.outputTrack.getStatus() == JASTrack::STATUS_RUN && inner_.mSoundChild[index]) {
         JASTrack* track = getChildTrack(index);
@@ -300,12 +277,10 @@ void JAISeq::releaseChild(int index) {
     }
 }
 
-/* 802A1728-802A1730 29C068 0008+00 1/0 0/0 0/0 .text            getTrack__6JAISeqFv */
 JASTrack* JAISeq::getTrack() {
     return &inner_.outputTrack;
 }
 
-/* 802A1730-802A1768 29C070 0038+00 2/1 0/0 0/0 .text            getChildTrack__6JAISeqFi */
 JASTrack* JAISeq::getChildTrack(int param_0) {
     u32 index = u32(param_0) >> 4;
     JASTrack* track = inner_.outputTrack.getChild(index);
@@ -319,12 +294,10 @@ JASTrack* JAISeq::getChildTrack(int param_0) {
     return NULL;
 }
 
-/* 802A1768-802A176C 29C0A8 0004+00 1/0 0/0 0/0 .text            asSeq__6JAISeqFv */
 JAISeq* JAISeq::asSeq() {
     return this;
 }
 
-/* 802A176C-802A1774 29C0AC 0008+00 1/0 0/0 0/0 .text            getTempoMgr__6JAISeqFv */
 JAITempoMgr* JAISeq::getTempoMgr() {
     return &inner_.mTempoMgr;
 }
diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/src/JSystem/JAudio2/JAISeqMgr.cpp
index a740b3e2d4..3c2c1600a3 100644
--- a/src/JSystem/JAudio2/JAISeqMgr.cpp
+++ b/src/JSystem/JAudio2/JAISeqMgr.cpp
@@ -5,8 +5,6 @@
 #include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-/* 802A1804-802A1870 29C144 006C+00 1/0 0/0 0/0 .text
- * isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion              */
 bool JAISeqMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     for (JSULink<JAISeq>* i = mSeqList.getFirst(); i != NULL; i = i->getNext()) {
         if (seqDataRegion.intersects(i->getObject()->getSeqData())) {
@@ -16,8 +14,6 @@ bool JAISeqMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) {
     return false;
 }
 
-/* 802A1870-802A1914 29C1B0 00A4+00 1/0 0/0 0/0 .text
- * releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion              */
 int JAISeqMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     bool bVar1 = false;
     for (JSULink<JAISeq>* i = mSeqList.getFirst(); i != NULL; i = i->getNext()) {
@@ -30,7 +26,6 @@ int JAISeqMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) {
     return bVar1 ? RELEASE_SEQ_1 : RELEASE_SEQ_2;
 }
 
-/* 802A1914-802A1A08 29C254 00F4+00 0/0 1/1 0/0 .text            __ct__9JAISeqMgrFb */
 JAISeqMgr::JAISeqMgr(bool setInstance) : JASGlobalInstance<JAISeqMgr>(setInstance), mAudience(NULL)  {
     seqDataMgr_ = NULL;
     field_0x10 = NULL;
@@ -39,7 +34,6 @@ JAISeqMgr::JAISeqMgr(bool setInstance) : JASGlobalInstance<JAISeqMgr>(setInstanc
     mActivity.init();
 }
 
-/* 802A1A08-802A1AF4 29C348 00EC+00 1/1 0/0 0/0 .text            freeDeadSeq___9JAISeqMgrFv */
 void JAISeqMgr::freeDeadSeq_() {
     JSULink<JAISeq>* i = mSeqList.getFirst();
     while (i != NULL) {
@@ -53,8 +47,6 @@ void JAISeqMgr::freeDeadSeq_() {
     }
 }
 
-/* 802A1B48-802A1C90 29C488 0148+00 0/0 1/1 0/0 .text
- * startSound__9JAISeqMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool JAISeqMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
     if (handle != NULL && *handle) {
         (*handle)->stop();
@@ -83,7 +75,6 @@ bool JAISeqMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometr
     return false;
 }
 
-/* 802A1C90-802A1DFC 29C5D0 016C+00 0/0 4/4 0/0 .text            calc__9JAISeqMgrFv */
 void JAISeqMgr::calc() {
     mMove.calc();
 
@@ -94,7 +85,6 @@ void JAISeqMgr::calc() {
     freeDeadSeq_();
 }
 
-/* 802A1DFC-802A1E3C 29C73C 0040+00 0/0 1/1 0/0 .text            stop__9JAISeqMgrFv */
 void JAISeqMgr::stop() {
     JSULink<JAISeq>* i;
     for (i = mSeqList.getFirst(); i != NULL; i = i->getNext()) {
@@ -102,7 +92,6 @@ void JAISeqMgr::stop() {
     }
 }
 
-/* 802A1E3C-802A1E8C 29C77C 0050+00 0/0 1/1 0/0 .text            stop__9JAISeqMgrFUl */
 void JAISeqMgr::stop(u32 fadeTime) {
     JSULink<JAISeq>* i;
     for (i = mSeqList.getFirst(); i != NULL; i = i->getNext()) {
@@ -110,7 +99,6 @@ void JAISeqMgr::stop(u32 fadeTime) {
     }
 }
 
-/* 802A1E8C-802A1EFC 29C7CC 0070+00 0/0 1/1 0/0 .text stopSoundID__9JAISeqMgrF10JAISoundID */
 void JAISeqMgr::stopSoundID(JAISoundID id) {
     JSULink<JAISeq>* i;
     if (!id.isAnonymous()) {
@@ -122,7 +110,6 @@ void JAISeqMgr::stopSoundID(JAISoundID id) {
     }
 }
 
-/* 802A1EFC-802A1F58 29C83C 005C+00 0/0 4/4 0/0 .text            mixOut__9JAISeqMgrFv */
 void JAISeqMgr::mixOut() {
     JSULink<JAISeq>* i;
     for (i = mSeqList.getFirst(); i != NULL; i = i->getNext()) {
@@ -130,7 +117,6 @@ void JAISeqMgr::mixOut() {
     }
 }
 
-/* 802A1F58-802A1FE8 29C898 0090+00 1/1 0/0 0/0 .text            beginStartSeq___9JAISeqMgrFv */
 JAISeq* JAISeqMgr::beginStartSeq_() {
     JAISeq* seq = new JAISeq(this, field_0x10);
     if (seq == NULL) {
@@ -139,8 +125,6 @@ JAISeq* JAISeqMgr::beginStartSeq_() {
     return seq;
 }
 
-/* 802A1FE8-802A20F0 29C928 0108+00 1/1 0/0 0/0 .text
- * endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle           */
 bool JAISeqMgr::endStartSeq_(JAISeq* seq, JAISoundHandle* handle) {
     JAISeq* sound = seq->getObject();
     if (sound != NULL) {
diff --git a/src/JSystem/JAudio2/JAISound.cpp b/src/JSystem/JAudio2/JAISound.cpp
index 404d254509..fe6b45bb8b 100644
--- a/src/JSystem/JAudio2/JAISound.cpp
+++ b/src/JSystem/JAudio2/JAISound.cpp
@@ -6,8 +6,6 @@
 #include "JSystem/JAudio2/JASReport.h"
 #include "JSystem/JAudio2/JASTrack.h"
 
-/* 802A2184-802A21A0 29CAC4 001C+00 0/0 14/14 0/0 .text            releaseSound__14JAISoundHandleFv
- */
 void JAISoundHandle::releaseSound() {
     if (sound_ != NULL) {
         sound_->handle_ = NULL;
@@ -15,7 +13,6 @@ void JAISoundHandle::releaseSound() {
     }
 }
 
-/* 802A21A0-802A21BC 29CAE0 001C+00 3/3 3/3 0/0 .text            releaseHandle__8JAISoundFv */
 void JAISound::releaseHandle() {
     if (handle_ != NULL) {
         handle_->sound_ = NULL;
@@ -23,7 +20,6 @@ void JAISound::releaseHandle() {
     }
 }
 
-/* 802A21BC-802A2220 29CAFC 0064+00 0/0 3/3 0/0 .text attachHandle__8JAISoundFP14JAISoundHandle */
 void JAISound::attachHandle(JAISoundHandle* handle) {
     JUT_ASSERT(55, handle);
 
@@ -37,7 +33,6 @@ void JAISound::attachHandle(JAISoundHandle* handle) {
     handle_->sound_ = this;
 }
 
-/* 802A2220-802A2244 29CB60 0024+00 0/0 2/2 0/0 .text lockWhenPrepared__15JAISoundStatus_Fv */
 s32 JAISoundStatus_::lockWhenPrepared() {
     if (state.unk == 0) {
         state.unk = 1;
@@ -46,8 +41,6 @@ s32 JAISoundStatus_::lockWhenPrepared() {
     return 0;
 }
 
-/* 802A2244-802A2280 29CB84 003C+00 0/0 2/2 0/0 .text            unlockIfLocked__15JAISoundStatus_Fv
- */
 s32 JAISoundStatus_::unlockIfLocked() {
     if (state.unk == 3) {
         state.unk = 4;
@@ -60,8 +53,6 @@ s32 JAISoundStatus_::unlockIfLocked() {
     return 0;
 }
 
-/* 802A2280-802A22F8 29CBC0 0078+00 0/0 4/4 0/0 .text
- * mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf */
 void JAISoundParams::mixOutAll(const JASSoundParams& inParams, JASSoundParams* outParams, f32 param_2) {
     outParams->mVolume = move_.params_.mVolume * (inParams.mVolume * property_.field_0x0) * param_2;
     outParams->mFxMix = move_.params_.mFxMix + (inParams.mFxMix + property_.field_0x4);
@@ -70,11 +61,8 @@ void JAISoundParams::mixOutAll(const JASSoundParams& inParams, JASSoundParams* o
     outParams->mDolby = inParams.mDolby + move_.params_.mDolby;
 }
 
-/* 802A22F8-802A2328 29CC38 0030+00 0/0 3/3 0/0 .text            __ct__8JAISoundFv */
 JAISound::JAISound() : params_() {}
 
-/* 802A2328-802A244C 29CC68 0124+00 0/0 3/3 0/0 .text
- * start_JAISound___8JAISoundF10JAISoundIDPCQ29JGeometry8TVec3<f>P11JAIAudience */
 void JAISound::start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience) {
     handle_ = NULL;
     soundID_ = id;
@@ -94,7 +82,6 @@ void JAISound::start_JAISound_(JAISoundID id, const JGeometry::TVec3<f32>* posPt
     priority_ = 0;
 }
 
-/* 802A244C-802A2474 29CD8C 0028+00 0/0 2/2 0/0 .text            acceptsNewAudible__8JAISoundCFv */
 bool JAISound::acceptsNewAudible() const {
     bool accepts = false;
     if (audible_ == NULL && status_.state.flags.calcedOnce == 0) {
@@ -103,8 +90,6 @@ bool JAISound::acceptsNewAudible() const {
     return accepts;
 }
 
-/* 802A2474-802A24DC 29CDB4 0068+00 0/0 2/2 0/0 .text
-/*  * newAudible__8JAISoundFRCQ29JGeometry8TVec3<f>PCQ29JGeometry8TVec3<f>UlP11JAIAudience */
 void JAISound::newAudible(const JGeometry::TVec3<f32>& pos,
                           const JGeometry::TVec3<f32>* param_1, u32 param_2, JAIAudience* audience) {
     JUT_ASSERT(151, acceptsNewAudible());
@@ -116,7 +101,6 @@ void JAISound::newAudible(const JGeometry::TVec3<f32>& pos,
     audible_ = audience_->newAudible(pos, soundID_, param_1, param_2);
 }
 
-/* 802A24DC-802A2598 29CE1C 00BC+00 0/0 24/24 0/0 .text            stop__8JAISoundFUl */
 void JAISound::stop(u32 fadeTime) {
     JUT_ASSERT(164, status_.isAlive());
     if (fadeTime == 0) {
@@ -129,28 +113,23 @@ void JAISound::stop(u32 fadeTime) {
     }
 }
 
-/* 802A2598-802A25D8 29CED8 0040+00 2/2 21/21 0/0 .text            stop__8JAISoundFv */
 void JAISound::stop() {
     stop_JAISound_();
     releaseHandle();
 }
 
-/* 802A25D8-802A25E0 29CF18 0008+00 1/0 2/0 0/0 .text            asSe__8JAISoundFv */
 JAISe* JAISound::asSe() {
     return NULL;
 }
 
-/* 802A25E0-802A25E8 29CF20 0008+00 1/0 2/0 0/0 .text            asSeq__8JAISoundFv */
 JAISeq* JAISound::asSeq() {
     return NULL;
 }
 
-/* 802A25E8-802A25F0 29CF28 0008+00 1/0 2/0 0/0 .text            asStream__8JAISoundFv */
 JAIStream* JAISound::asStream() {
     return NULL;
 }
 
-/* 802A25F0-802A266C 29CF30 007C+00 0/0 3/3 0/0 .text            die_JAISound___8JAISoundFv */
 void JAISound::die_JAISound_() {
     if (audible_ != NULL) {
         audience_->deleteAudible(audible_);
@@ -162,8 +141,6 @@ void JAISound::die_JAISound_() {
     status_.state.unk = 6;
 }
 
-/* 802A266C-802A26B8 29CFAC 004C+00 0/0 3/3 0/0 .text increasePrepareCount_JAISound___8JAISoundFv
- */
 void JAISound::increasePrepareCount_JAISound_() {
     if ((++prepareCount_ & 0xFF) == 0) {
         JASReport("It cost %d steps to prepare Sound(ID:%08x, Address%08x).\n", prepareCount_,
@@ -171,7 +148,6 @@ void JAISound::increasePrepareCount_JAISound_() {
     }
 }
 
-/* 802A26B8-802A29DC 29CFF8 0324+00 0/0 3/3 0/0 .text            calc_JAISound___8JAISoundFv */
 bool JAISound::calc_JAISound_() {
     status_.state.flags.calcedOnce = 1;
     if (isStopping() && JAISound_tryDie_()) {
@@ -215,7 +191,6 @@ bool JAISound::calc_JAISound_() {
     return playing;
 }
 
-/* 802A29DC-802A2AB0 29D31C 00D4+00 0/0 2/2 0/0 .text initTrack_JAISound___8JAISoundFP8JASTrack */
 void JAISound::initTrack_JAISound_(JASTrack* track) {
     JASSoundParams* soundParams[JASTrack::TChannelMgr::CHANNEL_MAX];
     JUT_ASSERT(286, audience_);
diff --git a/src/JSystem/JAudio2/JAISoundHandles.cpp b/src/JSystem/JAudio2/JAISoundHandles.cpp
index 19e15c8061..a0e2a76158 100644
--- a/src/JSystem/JAudio2/JAISoundHandles.cpp
+++ b/src/JSystem/JAudio2/JAISoundHandles.cpp
@@ -2,8 +2,6 @@
 
 #include "JSystem/JAudio2/JAISoundHandles.h"
 
-/* 802A2C98-802A2CF4 29D5D8 005C+00 0/0 1/1 0/0 .text
- * getHandleSoundID__15JAISoundHandlesF10JAISoundID             */
 JAISoundHandle* JAISoundHandles::getHandleSoundID(JAISoundID id) {
     for (int i = 0; i < numHandles_; i++) {
         if (handle_[i].isSoundAttached()) {
@@ -16,8 +14,6 @@ JAISoundHandle* JAISoundHandles::getHandleSoundID(JAISoundID id) {
     return NULL;
 }
 
-/* 802A2CF4-802A2D34 29D634 0040+00 0/0 2/2 0/0 .text            getFreeHandle__15JAISoundHandlesFv
- */
 JAISoundHandle* JAISoundHandles::getFreeHandle() {
     for (int i = 0; i < numHandles_; i++) {
         if (!handle_[i].isSoundAttached()) {
diff --git a/src/JSystem/JAudio2/JAISoundInfo.cpp b/src/JSystem/JAudio2/JAISoundInfo.cpp
index a822c41e3a..fa6a84a1da 100644
--- a/src/JSystem/JAudio2/JAISoundInfo.cpp
+++ b/src/JSystem/JAudio2/JAISoundInfo.cpp
@@ -2,10 +2,8 @@
 
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-/* 802A2D34-802A2D50 29D674 001C+00 0/0 1/1 0/0 .text            __ct__12JAISoundInfoFb */
 JAISoundInfo::JAISoundInfo(bool setInstance) : JASGlobalInstance<JAISoundInfo>(setInstance) {}
 
-/* 802A2D50-802A2DB4 29D690 0064+00 1/0 2/2 0/0 .text            __dt__12JAISoundInfoFv */
 JAISoundInfo::~JAISoundInfo() {
     JUT_ASSERT(14, false);
 }
diff --git a/src/JSystem/JAudio2/JAISoundStarter.cpp b/src/JSystem/JAudio2/JAISoundStarter.cpp
index 1c0fe4f6b1..5dc20b6737 100644
--- a/src/JSystem/JAudio2/JAISoundStarter.cpp
+++ b/src/JSystem/JAudio2/JAISoundStarter.cpp
@@ -3,15 +3,11 @@
 #include "JSystem/JAudio2/JAISoundStarter.h"
 #include "JSystem/JAudio2/JAISoundHandles.h"
 
-/* 802A2F6C-802A2F88 29D8AC 001C+00 0/0 1/1 0/0 .text            __ct__15JAISoundStarterFb */
 JAISoundStarter::JAISoundStarter(bool setInstance) :
     JASGlobalInstance<JAISoundStarter>(setInstance) {}
 
-/* 802A2F88-802A2FEC 29D8C8 0064+00 1/0 7/7 0/0 .text            __dt__15JAISoundStarterFv */
 JAISoundStarter::~JAISoundStarter() {}
 
-/* 802A2FEC-802A30D4 29D92C 00E8+00 0/0 4/4 0/0 .text
- * startLevelSound__15JAISoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool JAISoundStarter::startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr) {
     JUT_ASSERT(20, handlePtr);
     if (*handlePtr) {
diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/src/JSystem/JAudio2/JAIStream.cpp
index 878c7e3e7f..d859c85de7 100644
--- a/src/JSystem/JAudio2/JAIStream.cpp
+++ b/src/JSystem/JAudio2/JAIStream.cpp
@@ -6,8 +6,6 @@
 #include "JSystem/JAudio2/JAIStreamDataMgr.h"
 #include "JSystem/JAudio2/JAIAudience.h"
 
-/* 802A30D4-802A3104 29DA14 0030+00 1/1 0/0 0/0 .text
- * JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv      */
 static void JAIStream_JASAramStreamCallback_(u32 type, JASAramStream* aramStream, void* userData) {
     JAIStream* stream = (JAIStream*)userData;
 
@@ -21,8 +19,6 @@ static void JAIStream_JASAramStreamCallback_(u32 type, JASAramStream* aramStream
     }
 }
 
-/* 802A3104-802A319C 29DA44 0098+00 0/0 1/1 0/0 .text
- * __ct__9JAIStreamFP12JAIStreamMgrP31JAISoundStrategyMgr<9JAIStream> */
 JAIStream::JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* soundStrategyMgr) : JSULink<JAIStream>(this) {
     field_0x290 = 0;
     field_0x2c0 = soundStrategyMgr;
@@ -36,8 +32,6 @@ JAIStream::JAIStream(JAIStreamMgr* streamMgr, JAISoundStrategyMgr<JAIStream>* so
     }
 }
 
-/* 802A319C-802A3230 29DADC 0094+00 0/0 1/1 0/0 .text
- * JAIStreamMgr_startID___9JAIStreamF10JAISoundIDlPCQ29JGeometry8TVec3<f>P11JAIAudiencei */
 void JAIStream::JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
                                       const JGeometry::TVec3<f32>* posPtr, JAIAudience* audience,
                                       int category) {
@@ -53,7 +47,6 @@ void JAIStream::JAIStreamMgr_startID_(JAISoundID id, s32 streamFileEntry,
     }
 }
 
-/* 802A3230-802A33F4 29DB70 01C4+00 1/1 0/0 0/0 .text prepare_prepareStream___9JAIStreamFv */
 bool JAIStream::prepare_prepareStream_() {
     u32 local_28;
     JAIStreamAramMgr* streamAramMgr;
@@ -106,7 +99,6 @@ bool JAIStream::prepare_prepareStream_() {
     return false;
 }
 
-/* 802A33F4-802A3498 29DD34 00A4+00 1/1 0/0 0/0 .text            prepare___9JAIStreamFv */
 void JAIStream::prepare_() {
     if (field_0x2c6 != 0) {
         return;
@@ -136,8 +128,6 @@ void JAIStream::prepare_() {
     }
 }
 
-/* 802A3498-802A34E4 29DDD8 004C+00 1/1 0/0 0/0 .text            prepare_startStream___9JAIStreamFv
- */
 void JAIStream::prepare_startStream_() {
     if (inner_.aramStream_.start()) {
         field_0x2c6 = 0;
@@ -146,8 +136,6 @@ void JAIStream::prepare_startStream_() {
     }
 }
 
-/* 802A34E4-802A3720 29DE24 023C+00 0/0 1/1 0/0 .text
- * JAIStreamMgr_mixOut___9JAIStreamFRC14JASSoundParams16JAISoundActivity */
 void JAIStream::JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundActivity activity) {
     bool local_54;
     JASSoundParams outParams;
@@ -195,7 +183,6 @@ void JAIStream::JAIStreamMgr_mixOut_(const JASSoundParams& inParams, JAISoundAct
     }
 }
 
-/* 802A3720-802A37FC 29E060 00DC+00 1/1 0/0 0/0 .text            die_JAIStream___9JAIStreamFv */
 void JAIStream::die_JAIStream_() {
     die_JAISound_();
 
@@ -212,7 +199,6 @@ void JAIStream::die_JAIStream_() {
     }
 }
 
-/* 802A37FC-802A388C 29E13C 0090+00 1/0 0/0 0/0 .text            JAISound_tryDie___9JAIStreamFv */
 bool JAIStream::JAISound_tryDie_() {
     if (field_0x2c6) {
         die_JAIStream_();
@@ -238,7 +224,6 @@ bool JAIStream::JAISound_tryDie_() {
     return false;
 }
 
-/* 802A388C-802A3948 29E1CC 00BC+00 0/0 1/1 0/0 .text            JAIStreamMgr_calc___9JAIStreamFv */
 void JAIStream::JAIStreamMgr_calc_() {
     if (field_0x2c6 != 0) {
         field_0x290 = 0;
@@ -258,12 +243,10 @@ void JAIStream::JAIStreamMgr_calc_() {
     }
 }
 
-/* 802A3948-802A3950 29E288 0008+00 1/0 0/0 0/0 .text            getNumChild__9JAIStreamCFv */
 s32 JAIStream::getNumChild() const {
     return NUM_CHILDREN;
 }
 
-/* 802A3950-802A3A24 29E290 00D4+00 1/0 0/0 0/0 .text            getChild__9JAIStreamFi */
 JAISoundChild* JAIStream::getChild(int index) {
     if (children_[index] == NULL) {
          children_[index] = new JAISoundChild();
@@ -274,7 +257,6 @@ JAISoundChild* JAIStream::getChild(int index) {
     return children_[index];
 }
 
-/* 802A3A24-802A3ABC 29E364 0098+00 1/0 0/0 0/0 .text            releaseChild__9JAIStreamFi */
 void JAIStream::releaseChild(int index) {
     if (children_[index] != NULL) {
         delete children_[index];
@@ -282,22 +264,18 @@ void JAIStream::releaseChild(int index) {
     }
 }
 
-/* 802A3ABC-802A3AC4 29E3FC 0008+00 1/0 0/0 0/0 .text            getTrack__9JAIStreamFv */
 JASTrack* JAIStream::getTrack() {
     return NULL;
 }
 
-/* 802A3AC4-802A3ACC 29E404 0008+00 1/0 0/0 0/0 .text            getChildTrack__9JAIStreamFi */
 JASTrack* JAIStream::getChildTrack(int param_0) {
     return NULL;
 }
 
-/* 802A3ACC-802A3AD0 29E40C 0004+00 1/0 0/0 0/0 .text            asStream__9JAIStreamFv */
 JAIStream* JAIStream::asStream() {
     return this;
 }
 
-/* 802A3AD0-802A3AD8 29E410 0008+00 1/0 0/0 0/0 .text            getTempoMgr__9JAIStreamFv */
 JAITempoMgr* JAIStream::getTempoMgr() {
     return NULL;
 }
diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/src/JSystem/JAudio2/JAIStreamMgr.cpp
index 76c8ae4734..b775e09c86 100644
--- a/src/JSystem/JAudio2/JAIStreamMgr.cpp
+++ b/src/JSystem/JAudio2/JAIStreamMgr.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/JAudio2/JAIStreamDataMgr.h"
 #include "JSystem/JAudio2/JAISoundInfo.h"
 
-/* 802A3B68-802A3C3C 29E4A8 00D4+00 0/0 1/1 0/0 .text            __ct__12JAIStreamMgrFb */
 JAIStreamMgr::JAIStreamMgr(bool setInstance) : JASGlobalInstance<JAIStreamMgr>(setInstance) {
     streamDataMgr_ = NULL;
     mStreamAramMgr = NULL;
@@ -15,8 +14,6 @@ JAIStreamMgr::JAIStreamMgr(bool setInstance) : JASGlobalInstance<JAIStreamMgr>(s
     mActivity.init();
 }
 
-/* 802A3C3C-802A3D70 29E57C 0134+00 0/0 1/1 0/0 .text
- * startSound__12JAIStreamMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool JAIStreamMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
     JUT_ASSERT(37, streamDataMgr_);
     if (handle != NULL && *handle) {
@@ -53,8 +50,6 @@ bool JAIStreamMgr::startSound(JAISoundID id, JAISoundHandle* handle, const JGeom
     return false;
 }
 
-/* 802A3D70-802A3E68 29E6B0 00F8+00 1/1 0/0 0/0 .text            freeDeadStream___12JAIStreamMgrFv
- */
 void JAIStreamMgr::freeDeadStream_() {
     JSULink<JAIStream>* i = mStreamList.getFirst();
     while (i != NULL) {
@@ -74,7 +69,6 @@ void JAIStreamMgr::freeDeadStream_() {
     }
 }
 
-/* 802A3EBC-802A4028 29E7FC 016C+00 0/0 1/1 0/0 .text            calc__12JAIStreamMgrFv */
 void JAIStreamMgr::calc() {
     JSULink<JAIStream>* i;
     mParams.calc();
@@ -84,7 +78,6 @@ void JAIStreamMgr::calc() {
     freeDeadStream_();
 }
 
-/* 802A4028-802A4068 29E968 0040+00 0/0 1/1 0/0 .text            stop__12JAIStreamMgrFv */
 void JAIStreamMgr::stop() {
     JSULink<JAIStream>* i;
     for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
@@ -92,7 +85,6 @@ void JAIStreamMgr::stop() {
     }
 }
 
-/* 802A4068-802A40B8 29E9A8 0050+00 0/0 2/2 0/0 .text            stop__12JAIStreamMgrFUl */
 void JAIStreamMgr::stop(u32 fadeTime) {
     JSULink<JAIStream>* i;
     for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
@@ -100,7 +92,6 @@ void JAIStreamMgr::stop(u32 fadeTime) {
     }
 }
 
-/* 802A40B8-802A4118 29E9F8 0060+00 0/0 1/1 0/0 .text stopSoundID__12JAIStreamMgrF10JAISoundID */
 void JAIStreamMgr::stopSoundID(JAISoundID id) {
     JSULink<JAIStream>* i;
     for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
@@ -110,7 +101,6 @@ void JAIStreamMgr::stopSoundID(JAISoundID id) {
     }
 }
 
-/* 802A4118-802A4174 29EA58 005C+00 0/0 1/1 0/0 .text            mixOut__12JAIStreamMgrFv */
 void JAIStreamMgr::mixOut() {
     JSULink<JAIStream>* i;
      for (i = mStreamList.getFirst(); i != NULL; i = i->getNext()) {
@@ -118,7 +108,6 @@ void JAIStreamMgr::mixOut() {
     }
 }
 
-/* 802A4174-802A4244 29EAB4 00D0+00 1/1 0/0 0/0 .text            newStream___12JAIStreamMgrFv */
 JAIStream* JAIStreamMgr::newStream_() {
     if (mStreamAramMgr == NULL) {
         JUT_WARN(229, "%s", "JAIStreamAramMgr must be set.\n");
diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp
index c8ba897c57..dee52c17d5 100644
--- a/src/JSystem/JAudio2/JASAiCtrl.cpp
+++ b/src/JSystem/JAudio2/JASAiCtrl.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASAiCtrl
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASAiCtrl.h"
@@ -23,49 +18,34 @@
 #include <dolphin/os.h>
 #include <stdint.h>
 
-/* 80431C58-80431C68 05E978 000C+04 2/2 0/0 0/0 .bss             sDmaDacBuffer__9JASDriver */
 s16* JASDriver::sDmaDacBuffer[3];
 
-/* 804507A8-804507AC 000228 0004+00 3/3 0/0 0/0 .sdata           None */
 static u8 data_804507A8 = 3;
 
-/* 804512A0-804512A4 0007A0 0004+00 3/3 0/0 0/0 .sbss            sDspDacBuffer__9JASDriver */
 s16** JASDriver::sDspDacBuffer;
 
-/* 804512A4-804512A8 0007A4 0004+00 3/3 0/0 0/0 .sbss            sDspDacWriteBuffer__9JASDriver */
 s32 JASDriver::sDspDacWriteBuffer;
 
-/* 804512A8-804512AC 0007A8 0004+00 3/3 0/0 0/0 .sbss            sDspDacReadBuffer__9JASDriver */
 s32 JASDriver::sDspDacReadBuffer;
 
-/* 804512AC-804512B0 0007AC 0004+00 3/3 0/0 0/0 .sbss            sDspStatus__9JASDriver */
 s32 JASDriver::sDspStatus;
 
-/* 804512B0-804512B4 0007B0 0004+00 1/1 0/0 0/0 .sbss            sDspDacCallback__9JASDriver */
 void (*JASDriver::sDspDacCallback)(s16*, u32);
 
-/* 804512B4-804512B8 0007B4 0004+00 1/1 0/0 0/0 .sbss            lastRspMadep__9JASDriver */
 s16* JASDriver::lastRspMadep;
 
-/* 804512B8-804512BC 0007B8 0004+00 1/1 0/0 0/0 .sbss            dacCallbackFunc__9JASDriver */
 void (*JASDriver::dacCallbackFunc)(s16*, u32);
 
-/* 804512BC-804512C0 0007BC 0004+00 2/2 0/0 0/0 .sbss            extMixCallback__9JASDriver */
 JASDriver::MixCallback JASDriver::extMixCallback;
 
-/* 804512C0-804512C4 0007C0 0004+00 2/2 0/0 0/0 .sbss            sOutputRate__9JASDriver */
 u32 JASDriver::sOutputRate;
 
-/* 804507AC-804507B0 00022C 0004+00 2/2 0/0 0/0 .sdata           sMixMode__9JASDriver */
 JASMixMode JASDriver::sMixMode = MIX_MODE_EXTRA;
 
-/* 804507B0-804507B4 000230 0004+00 2/2 0/0 0/0 .sdata           sDacRate__9JASDriver */
 f32 JASDriver::sDacRate = 32028.5f;
 
-/* 804507B4-804507B8 000234 0004+00 4/3 0/0 0/0 .sdata           sSubFrames__9JASDriver */
 u32 JASDriver::sSubFrames = 0x00000007;
 
-/* 8029C388-8029C4E4 296CC8 015C+00 0/0 1/1 0/0 .text            initAI__9JASDriverFPFv_v */
 // NONMATCHING missing instructions
 void JASDriver::initAI(void (*param_0)(void)) {
     setOutputRate(OUTPUT_RATE_0);
@@ -101,18 +81,15 @@ void JASDriver::initAI(void (*param_0)(void)) {
     AIRegisterDMACallback(param_0);
 }
 
-/* 8029C4E4-8029C504 296E24 0020+00 0/0 1/1 0/0 .text            startDMA__9JASDriverFv */
 void JASDriver::startDMA() {
     AIStartDMA();
 }
 
-/* 8029C504-8029C524 296E44 0020+00 0/0 1/1 0/0 .text            stopDMA__9JASDriverFv */
 
 void JASDriver::stopDMA() {
     AIStopDMA();
 }
 
-/* 8029C524-8029C568 296E64 0044+00 1/1 0/0 0/0 .text setOutputRate__9JASDriverF13JASOutputRate */
 void JASDriver::setOutputRate(JASOutputRate param_0) {
     sOutputRate = param_0;
     if (param_0 == 0) {
@@ -125,7 +102,6 @@ void JASDriver::setOutputRate(JASOutputRate param_0) {
     sDacRate *= 1.0008897f;
 }
 
-/* 8039B2E0-8039B2F0 -00001 0010+00 1/1 0/0 0/0 .rodata          sMixFuncs__9JASDriver */
 const JASDriver::MixFunc JASDriver::sMixFuncs[4] = {
     mixMonoTrack,
     mixMonoTrackWide,
@@ -133,10 +109,8 @@ const JASDriver::MixFunc JASDriver::sMixFuncs[4] = {
     mixInterleaveTrack,
 };
 
-/* 804512C4-804512C8 0007C4 0004+00 2/1 0/0 0/0 .sbss            sSubFrameCounter__9JASDriver */
 u32 JASDriver::sSubFrameCounter;
 
-/* 8029C568-8029C6C4 296EA8 015C+00 0/0 1/1 0/0 .text            updateDac__9JASDriverFv */
 void JASDriver::updateDac() {
     static u32 dacp = 0;
     s16* r30 = lastRspMadep;
@@ -166,7 +140,6 @@ void JASDriver::updateDac() {
     }
 }
 
-/* 8029C6C4-8029C7E0 297004 011C+00 1/1 1/1 0/0 .text            updateDSP__9JASDriverFv */
 void JASDriver::updateDSP() {
     static u32 history[10] = {0x000F4240};
     JASProbe::start(3, "SFR-UPDATE");
@@ -211,7 +184,6 @@ void JASDriver::updateDSP() {
     sSubFrameCounter++;
 }
 
-/* 8029C7E0-8029C900 297120 0120+00 1/1 0/0 0/0 .text            readDspBuffer__9JASDriverFPsUl */
 void JASDriver::readDspBuffer(s16* param_0, u32 param_1) {
     s32 nbuf = sDspDacReadBuffer + 1;
     if (nbuf == data_804507A8) {
@@ -239,7 +211,6 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) {
     JASCalc::imixcopy(endDacBuffer, dacBuffer, param_0, param_1);
 }
 
-/* 8029C900-8029C9DC 297240 00DC+00 1/1 1/1 0/0 .text            finishDSPFrame__9JASDriverFv */
 void JASDriver::finishDSPFrame() {
     int r30 = sDspDacWriteBuffer + 1;
     if (r30 == data_804507A8) {
@@ -261,35 +232,27 @@ void JASDriver::finishDSPFrame() {
     }
 }
 
-/* 8029C9DC-8029C9E8 29731C 000C+00 0/0 0/0 2/2 .text
- * registerMixCallback__9JASDriverFPFl_Ps10JASMixMode           */
 void JASDriver::registerMixCallback(MixCallback param_0, JASMixMode param_1) {
     extMixCallback = param_0;
     sMixMode = param_1;
 }
 
-/* 8029C9E8-8029C9F0 297328 0008+00 1/1 5/5 0/0 .text            getDacRate__9JASDriverFv */
 f32 JASDriver::getDacRate() {
     return sDacRate;
 }
 
-/* 8029C9F0-8029C9F8 -00001 0008+00 0/0 0/0 0/0 .text            getSubFrames__9JASDriverFv */
 u32 JASDriver::getSubFrames() {
     return sSubFrames;
 }
 
-/* 8029C9F8-8029CA04 297338 000C+00 2/2 0/0 0/0 .text            getDacSize__9JASDriverFv */
 u32 JASDriver::getDacSize() {
     return sSubFrames * 0x50 * 2;
 }
 
-/* 8029CA04-8029CA10 297344 000C+00 3/3 0/0 0/0 .text            getFrameSamples__9JASDriverFv */
 u32 JASDriver::getFrameSamples() {
     return sSubFrames * 0x50;
 }
 
-/* 8029CA10-8029CAC0 297350 00B0+00 1/0 0/0 0/0 .text            mixMonoTrack__9JASDriverFPsUlPFl_Ps
- */
 void JASDriver::mixMonoTrack(s16* buffer, u32 param_1, MixCallback param_2) {
     JASProbe::start(5, "MONO-MIX");
     s16* r31 = param_2(param_1);
@@ -306,7 +269,6 @@ void JASDriver::mixMonoTrack(s16* buffer, u32 param_1, MixCallback param_2) {
     }
 }
 
-/* 8029CAC0-8029CB70 297400 00B0+00 1/0 0/0 0/0 .text mixMonoTrackWide__9JASDriverFPsUlPFl_Ps */
 void JASDriver::mixMonoTrackWide(s16* buffer, u32 param_1, MixCallback param_2) {
     JASProbe::start(5, "MONO(W)-MIX");
     s16* r31 = param_2(param_1);
@@ -325,7 +287,6 @@ void JASDriver::mixMonoTrackWide(s16* buffer, u32 param_1, MixCallback param_2)
     }
 }
 
-/* 8029CB70-8029CC50 2974B0 00E0+00 1/0 0/0 0/0 .text mixExtraTrack__9JASDriverFPsUlPFl_Ps */
 void JASDriver::mixExtraTrack(s16* buffer, u32 param_1, MixCallback param_2) {
     JASProbe::start(5, "DSPMIX");
     s16* r31 = param_2(param_1);
@@ -346,7 +307,6 @@ void JASDriver::mixExtraTrack(s16* buffer, u32 param_1, MixCallback param_2) {
     JASProbe::stop(6);
 }
 
-/* 8029CC50-8029CCD4 297590 0084+00 1/0 0/0 0/0 .text mixInterleaveTrack__9JASDriverFPsUlPFl_Ps */
 void JASDriver::mixInterleaveTrack(s16* buffer, u32 param_1, MixCallback param_2) {
     s16* r31 = param_2(param_1);
     if (r31) {
@@ -360,7 +320,6 @@ void JASDriver::mixInterleaveTrack(s16* buffer, u32 param_1, MixCallback param_2
     }
 }
 
-/* 8029CCD4-8029CCDC -00001 0008+00 0/0 0/0 0/0 .text            getSubFrameCounter__9JASDriverFv */
 u32 JASDriver::getSubFrameCounter() {
     return sSubFrameCounter;
 }
diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp
index 2b4aa2a818..984e6ea446 100644
--- a/src/JSystem/JAudio2/JASAramStream.cpp
+++ b/src/JSystem/JAudio2/JASAramStream.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASAramStream
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASAramStream.h"
@@ -15,26 +10,20 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-/* 80451250-80451254 000750 0004+00 6/6 0/0 0/0 .sbss            sLoadThread__13JASAramStream */
 JASTaskThread* JASAramStream::sLoadThread;
 
-/* 80451254-80451258 000754 0004+00 3/3 0/0 0/0 .sbss            sReadBuffer__13JASAramStream */
 u8* JASAramStream::sReadBuffer;
 
-/* 80451258-8045125C 000758 0004+00 6/6 1/1 0/0 .sbss            sBlockSize__13JASAramStream */
 u32 JASAramStream::sBlockSize;
 
-/* 8045125C-80451260 00075C 0004+00 1/1 0/0 0/0 .sbss            sChannelMax__13JASAramStream */
 u32 JASAramStream::sChannelMax;
 
-/* 80451260-80451268 -00001 0008+00 8/8 4/4 0/0 .sbss            None */
 /* 80451260 0001+00 data_80451260 None */
 /* 80451261 0001+00 data_80451261 None */
 /* 80451262 0006+00 data_80451262 None */
 bool struct_80451260;
 bool struct_80451261;
 
-/* 8029631C-802963A8 290C5C 008C+00 0/0 1/1 0/0 .text            initSystem__13JASAramStreamFUlUl */
 void JASAramStream::initSystem(u32 i_blockSize, u32 i_channelMax) {
     if (JASDriver::registerSubFrameCallback(dvdErrorCheck, NULL)) {
         if (sLoadThread == NULL) {
@@ -48,7 +37,6 @@ void JASAramStream::initSystem(u32 i_blockSize, u32 i_channelMax) {
     }
 }
 
-/* 802963A8-8029649C 290CE8 00F4+00 0/0 1/1 0/0 .text            __ct__13JASAramStreamFv */
 // NONMATCHING missing load
 JASAramStream::JASAramStream() {
     field_0x0a8 = NULL;
@@ -96,8 +84,6 @@ JASAramStream::JASAramStream() {
     }
 }
 
-/* 8029649C-8029655C 290DDC 00C0+00 0/0 1/1 0/0 .text
- * init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv         */
 // NONMATCHING missing load
 void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, void* i_callbackData) {
     field_0x148 = param_0;
@@ -123,7 +109,6 @@ void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, vo
     OSInitMessageQueue(&field_0x020, field_0x080, 4);
 }
 
-/* 8029655C-80296618 290E9C 00BC+00 0/0 1/1 0/0 .text            prepare__13JASAramStreamFli */
 bool JASAramStream::prepare(s32 param_0, int param_1) {
     if (!DVDFastOpen(param_0, &mDvdFileInfo)) {
         return false;
@@ -142,17 +127,14 @@ bool JASAramStream::prepare(s32 param_0, int param_1) {
     return true;
 }
 
-/* 80296618-8029664C 290F58 0034+00 0/0 1/1 0/0 .text            start__13JASAramStreamFv */
 bool JASAramStream::start() {
     return OSSendMessage(&field_0x000, (OSMessage)0, OS_MESSAGE_NOBLOCK);
 }
 
-/* 8029664C-80296684 290F8C 0038+00 0/0 1/1 0/0 .text            stop__13JASAramStreamFUs */
 bool JASAramStream::stop(u16 param_0) {
     return OSSendMessage(&field_0x000, (OSMessage)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK);
 }
 
-/* 80296684-802966CC 290FC4 0048+00 0/0 1/1 0/0 .text            pause__13JASAramStreamFb */
 bool JASAramStream::pause(bool param_0) {
     OSMessage msg;
     if (param_0) {
@@ -166,14 +148,11 @@ bool JASAramStream::pause(bool param_0) {
     return true;
 }
 
-/* 802966CC-80296710 29100C 0044+00 0/0 1/1 0/0 .text            cancel__13JASAramStreamFv */
 bool JASAramStream::cancel() {
     field_0x114 = 1;
     return sLoadThread->sendCmdMsg(finishTask, this);
 }
 
-/* 80296710-8029673C 291050 002C+00 4/4 0/0 0/0 .text            getBlockSamples__13JASAramStreamCFv
- */
 u32 JASAramStream::getBlockSamples() const {
     if (field_0x158 == 0) {
         return (sBlockSize << 4) / 9;
@@ -181,15 +160,11 @@ u32 JASAramStream::getBlockSamples() const {
     return sBlockSize >> 1;
 }
 
-/* 8029673C-8029676C 29107C 0030+00 1/1 0/0 0/0 .text            headerLoadTask__13JASAramStreamFPv
- */
 void JASAramStream::headerLoadTask(void* i_data) {
     TaskData* data = (TaskData*)i_data;
     data->stream->headerLoad(data->field_0x4, data->field_0x8);
 }
 
-/* 8029676C-80296848 2910AC 00DC+00 1/1 0/0 0/0 .text            firstLoadTask__13JASAramStreamFPv
- */
 void JASAramStream::firstLoadTask(void* i_data) {
     TaskData* data = (TaskData*)i_data;
     JASAramStream* _this = data->stream;
@@ -214,13 +189,10 @@ void JASAramStream::firstLoadTask(void* i_data) {
     }
 }
 
-/* 80296848-80296868 291188 0020+00 1/1 0/0 0/0 .text            loadToAramTask__13JASAramStreamFPv
- */
 void JASAramStream::loadToAramTask(void* i_this) {
     ((JASAramStream*)i_this)->load();
 }
 
-/* 80296868-802968C8 2911A8 0060+00 2/2 0/0 0/0 .text            finishTask__13JASAramStreamFPv */
 void JASAramStream::finishTask(void* i_this) {
     JASAramStream* _this = (JASAramStream*)i_this;
     JASDriver::rejectCallback(channelProcCallback, _this);
@@ -230,7 +202,6 @@ void JASAramStream::finishTask(void* i_this) {
     }
 }
 
-/* 802968C8-80296920 291208 0058+00 1/1 0/0 0/0 .text prepareFinishTask__13JASAramStreamFPv */
 void JASAramStream::prepareFinishTask(void* i_this) {
     JASAramStream* _this = (JASAramStream*)i_this;
     OSSendMessage(&_this->field_0x020, (OSMessage)4, OS_MESSAGE_BLOCK);
@@ -239,7 +210,6 @@ void JASAramStream::prepareFinishTask(void* i_this) {
     }
 }
 
-/* 80296920-80296AE8 291260 01C8+00 1/1 0/0 0/0 .text            headerLoad__13JASAramStreamFUli */
 bool JASAramStream::headerLoad(u32 param_0, int param_1) {
     if (struct_80451261) {
         return false;
@@ -287,7 +257,6 @@ bool JASAramStream::headerLoad(u32 param_0, int param_1) {
 }
 
 
-/* 80296AE8-80296D74 291428 028C+00 2/2 0/0 0/0 .text            load__13JASAramStreamFv */
 // NONMATCHING regalloc and one instruction swap
 bool JASAramStream::load() {
     {
@@ -357,13 +326,10 @@ bool JASAramStream::load() {
     return true;
 }
 
-/* 80296D74-80296D94 2916B4 0020+00 2/2 0/0 0/0 .text channelProcCallback__13JASAramStreamFPv */
 s32 JASAramStream::channelProcCallback(void* i_this) {
     return ((JASAramStream*)i_this)->channelProc();
 }
 
-/* 80296D94-80296DF0 2916D4 005C+00 2/1 0/0 0/0 .text            dvdErrorCheck__13JASAramStreamFPv
- */
 s32 JASAramStream::dvdErrorCheck(void* param_0) {
     switch (DVDGetDriveStatus()) {
     case DVD_STATE_END:
@@ -387,15 +353,11 @@ s32 JASAramStream::dvdErrorCheck(void* param_0) {
     return 0;
 }
 
-/* 80296DF0-80296E2C 291730 003C+00 1/1 0/0 0/0 .text
- * channelCallback__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannelPv */
 void JASAramStream::channelCallback(u32 i_callbackType, JASChannel* i_channel,
                                     JASDsp::TChannel* i_dspChannel, void* i_this) {
     ((JASAramStream*)i_this)->updateChannel(i_callbackType, i_channel, i_dspChannel);
 }
 
-/* 80296E2C-802974AC 29176C 0680+00 1/1 0/0 0/0 .text
- * updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel */
 // NONMATCHING missing extra loads of field_0x0c4
 void JASAramStream::updateChannel(u32 i_callbackType, JASChannel* i_channel,
                                   JASDsp::TChannel* i_dspChannel) {
@@ -576,7 +538,6 @@ void JASAramStream::updateChannel(u32 i_callbackType, JASChannel* i_channel,
     i_channel->mPauseFlag = field_0x0ae != 0;
 }
 
-/* 802974AC-80297658 291DEC 01AC+00 1/1 0/0 0/0 .text            channelProc__13JASAramStreamFv */
 // NONMATCHING instruction ordering / regalloc
 s32 JASAramStream::channelProc() {
     OSMessage msg;
@@ -636,16 +597,13 @@ s32 JASAramStream::channelProc() {
     return 0;
 }
 
-/* 8039B168-8039B174 0277C8 000C+00 1/0 0/0 0/0 .rodata          OSC_RELEASE_TABLE */
 static JASOscillator::Point const OSC_RELEASE_TABLE[2] = {
     {0x0000, 0x0002, 0x0000},
     {0x000F, 0x0000, 0x0000},
 };
 
-/* 8039B174-8039B190 -00001 0018+04 1/1 0/0 0/0 .rodata          OSC_ENV */
 static JASOscillator::Data const OSC_ENV = {0, 1.0f, NULL, OSC_RELEASE_TABLE, 1.0f, 0.0f};
 
-/* 80297658-80297870 291F98 0218+00 1/1 0/0 0/0 .text            channelStart__13JASAramStreamFv */
 void JASAramStream::channelStart() {
     u8 r31;
     switch (field_0x158) {
@@ -685,7 +643,6 @@ void JASAramStream::channelStart() {
 }
 
 
-/* 80297870-802978DC 2921B0 006C+00 1/1 0/0 0/0 .text            channelStop__13JASAramStreamFUs */
 void JASAramStream::channelStop(u16 i_directRelease) {
     for (int i = 0; i < mChannelNum; i++) {
         if (mChannels[i] != NULL) {
diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/src/JSystem/JAudio2/JASAudioReseter.cpp
index 4c3082ab8e..834320869a 100644
--- a/src/JSystem/JAudio2/JASAudioReseter.cpp
+++ b/src/JSystem/JAudio2/JASAudioReseter.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASAudioReseter
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASAudioReseter.h"
@@ -12,14 +7,13 @@
 #include "dolphin/types.h"
 
 struct JASDSPChannel {
-    /* 8029D340 */ void drop();
-    /* 8029D948 */ static JASDSPChannel* getHandle(u32);
+    void drop();
+    static JASDSPChannel* getHandle(u32);
 
     inline u32 getStatus() {return mStatus;}
     u32 mStatus;
 };
 
-/* 8029D0B4-8029D0FC 2979F4 0048+00 0/0 1/1 0/0 .text            __ct__15JASAudioReseterFv */
 JASAudioReseter::JASAudioReseter() {
     field_0x0 = 0;
     mIsDone = true;
@@ -27,10 +21,8 @@ JASAudioReseter::JASAudioReseter() {
     mDSPLevel = JASDriver::getDSPLevel();
 }
 
-/* 8029D0FC-8029D138 297A3C 003C+00 0/0 1/1 0/0 .text            __dt__15JASAudioReseterFv */
 JASAudioReseter::~JASAudioReseter() {}
 
-/* 8029D138-8029D1D4 297A78 009C+00 0/0 1/1 0/0 .text            start__15JASAudioReseterFUlb */
 bool JASAudioReseter::start(u32 param_0, bool param_1) {
     if (mIsDone == false) {
         return false;
@@ -47,18 +39,15 @@ bool JASAudioReseter::start(u32 param_0, bool param_1) {
     }
 }
 
-/* 8029D1D4-8029D1F8 297B14 0024+00 0/0 1/1 0/0 .text            resume__15JASAudioReseterFv */
 void JASAudioReseter::resume() {
     JASDriver::setDSPLevel(mDSPLevel);
 }
 
-/* 8029D1F8-8029D200 297B38 0008+00 0/0 2/2 0/0 .text            checkDone__15JASAudioReseterCFv */
 s32 JASAudioReseter::checkDone() const {
     return mIsDone;
 }
 
 
-/* 8029D200-8029D2D4 297B40 00D4+00 1/1 0/0 0/0 .text            calc__15JASAudioReseterFv */
 s32 JASAudioReseter::calc() {
     if(field_0x0==0) {
         for(size_t i = 0; i<64; i++) {
@@ -80,7 +69,6 @@ s32 JASAudioReseter::calc() {
     return 0;
 }
 
-/* 8029D2D4-8029D2F4 297C14 0020+00 1/1 0/0 0/0 .text            callback__15JASAudioReseterFPv */
 s32 JASAudioReseter::callback(void* param_0) {
     return ((JASAudioReseter*)param_0)->calc();
 }
diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp
index c819e895db..2aa71a329f 100644
--- a/src/JSystem/JAudio2/JASAudioThread.cpp
+++ b/src/JSystem/JAudio2/JASAudioThread.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASAudioThread
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASAudioThread.h"
@@ -15,7 +10,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "dolphin/dsp.h"
 
-/* 8029CCDC-8029CD4C 29761C 0070+00 1/1 0/0 0/0 .text            __ct__14JASAudioThreadFiiUl */
 JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
     : 
     JKRThread(JASDram, threadPriority, msgCount, stackSize),
@@ -25,19 +19,16 @@ JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority)
     OSInitThreadQueue(&sThreadQueue);
 }
 
-/* 8029CD4C-8029CDC0 29768C 0074+00 0/0 1/1 0/0 .text            create__14JASAudioThreadFl */
 void JASAudioThread::create(long threadPriority) {
 	JASAudioThread* sAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, 0x1400);
     sAudioThread->setCurrentHeap(JKRGetSystemHeap());
 	sAudioThread->resume();
 }
 
-/* 8029CDC0-8029CDEC 297700 002C+00 0/0 1/1 0/0 .text            stop__14JASAudioThreadFv */
 void JASAudioThread::stop() {
     jamMessageBlock((void*)2);
 }
 
-/* 804512D8-804512E0 0007D8 0004+04 1/1 2/2 0/0 .sbss            snIntCount__14JASAudioThread */
 volatile int JASAudioThread::snIntCount;
 
 class Lock {
@@ -56,7 +47,6 @@ class JASChannel {
     u8 filler[0x108];
 };
 
-/* 8029CDEC-8029CF68 29772C 017C+00 1/0 0/0 0/0 .text            run__14JASAudioThreadFv */
 // NONMATCHING location of JASPoolAllocObject_MultiThreaded<JASChannel>
 void* JASAudioThread::run() {
     OSInitFastCast();
@@ -100,7 +90,6 @@ void* JASAudioThread::run() {
     }
 }
 
-/* 8029CF68-8029CFBC 2978A8 0054+00 1/1 0/0 0/0 .text            DMACallback__14JASAudioThreadFv */
 void JASAudioThread::DMACallback() {
     JASAudioThread* thread = getInstance();
 	JASProbe::stop(4);
@@ -108,7 +97,6 @@ void JASAudioThread::DMACallback() {
 	thread->sendMessage((void*)AUDIOMSG_DMA);
 }
 
-/* 8029CFBC-8029D028 2978FC 006C+00 1/1 0/0 0/0 .text            DSPCallback__14JASAudioThreadFPv */
 void JASAudioThread::DSPCallback(void*) {
     JASAudioThread* thread = getInstance();
 	while (DSPCheckMailFromDSP() == 0) { }
diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp
index 7e4102c5ec..f789774cde 100644
--- a/src/JSystem/JAudio2/JASBNKParser.cpp
+++ b/src/JSystem/JAudio2/JASBNKParser.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASBNKParser
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASBNKParser.h"
@@ -14,16 +9,12 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80299538-80299558 293E78 0020+00 0/0 1/1 0/0 .text createBank__12JASBNKParserFPCvP7JKRHeap */
 JASBank* JASBNKParser::createBank(void const* stream, JKRHeap* heap) {
     return createBasicBank(stream, heap);
 }
 
-/* 80451288-8045128C 000788 0004+00 1/1 0/0 0/0 .sbss            sUsedHeapSize__12JASBNKParser */
 u32 JASBNKParser::sUsedHeapSize;
 
-/* 80299558-80299600 293E98 00A8+00 1/1 0/0 0/0 .text createBasicBank__12JASBNKParserFPCvP7JKRHeap
- */
 JASBasicBank* JASBNKParser::createBasicBank(void const* stream, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JASDram;
@@ -47,7 +38,6 @@ JASBasicBank* JASBNKParser::createBasicBank(void const* stream, JKRHeap* heap) {
     return bank;
 }
 
-/* 80299600-8029963C 293F40 003C+00 1/1 0/0 0/0 .text findChunk__Q212JASBNKParser4Ver1FPCvUl */
 JASBNKParser::Ver1::TChunk* JASBNKParser::Ver1::findChunk(void const* stream, u32 id) {
     TFileHeader* header = (TFileHeader*)stream;
     void* end = (void*)((int)stream + header->mSize);
@@ -61,8 +51,6 @@ JASBNKParser::Ver1::TChunk* JASBNKParser::Ver1::findChunk(void const* stream, u3
     return NULL;
 }
 
-/* 8029963C-80299A3C 293F7C 0400+00 1/1 0/0 0/0 .text
- * createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap          */
 JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JASDram;
@@ -167,8 +155,6 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h
     return bank;
 }
 
-/* 80299A3C-80299E68 29437C 042C+00 1/1 0/0 0/0 .text
- * createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap          */
 JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JASDram;
@@ -311,8 +297,6 @@ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader
     return NULL;
 }
 
-/* 80299F8C-80299FA0 2948CC 0014+00 1/1 0/0 0/0 .text
- * getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point */
 JASOscillator::Point const* JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator::Point const* points) {
     s16 tmp;
     do {
diff --git a/src/JSystem/JAudio2/JASBank.cpp b/src/JSystem/JAudio2/JASBank.cpp
index 2427014ea8..b307619694 100644
--- a/src/JSystem/JAudio2/JASBank.cpp
+++ b/src/JSystem/JAudio2/JASBank.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASBank
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASBank.h"
@@ -11,8 +6,6 @@
 #include "JSystem/JAudio2/JASBasicWaveBank.h"
 #include "JSystem/JAudio2/JASChannel.h"
 
-/* 80297930-80297C40 292270 0310+00 0/0 1/1 0/0 .text
- * noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 JASChannel* JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 param_3, u16 param_4,
                          void (*param_5)(u32, JASChannel*, JASDsp::TChannel*, void*),
@@ -72,8 +65,6 @@ JASChannel* JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8
     return channel;
 }
 
-/* 80297C40-80297D78 292580 0138+00 1/1 0/0 0/0 .text
- * noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 JASChannel* JASBank::noteOnOsc(int param_0, u8 param_1, u8 param_2, u16 param_3,
                             void (*param_4)(u32, JASChannel*, JASDsp::TChannel*, void*),
diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/src/JSystem/JAudio2/JASBasicBank.cpp
index a8a40986c9..e9d77adb09 100644
--- a/src/JSystem/JAudio2/JASBasicBank.cpp
+++ b/src/JSystem/JAudio2/JASBasicBank.cpp
@@ -1,20 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASBasicBank
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASBasicBank.h"
 #include "JSystem/JAudio2/JASCalc.h"
 
-/* 80297D78-80297DA4 2926B8 002C+00 0/0 2/2 0/0 .text            __ct__12JASBasicBankFv */
 JASBasicBank::JASBasicBank() {
     mInstTable = NULL;
     mInstNumMax = 0;
 }
 
-/* 80297DA4-80297E00 2926E4 005C+00 0/0 2/2 0/0 .text newInstTable__12JASBasicBankFUcP7JKRHeap */
 void JASBasicBank::newInstTable(u8 num, JKRHeap* heap) {
     if (num != 0) {
         mInstNumMax = num;
@@ -23,8 +16,6 @@ void JASBasicBank::newInstTable(u8 num, JKRHeap* heap) {
     }
 }
 
-/* 80297E00-80297E68 292740 0068+00 1/0 0/0 0/0 .text
- * getInstParam__12JASBasicBankCFiiiP12JASInstParam             */
 bool JASBasicBank::getInstParam(int prg_no, int param_1, int param_2,
                                 JASInstParam* o_param) const {
     JASInst* inst = getInst(prg_no);
@@ -34,15 +25,12 @@ bool JASBasicBank::getInstParam(int prg_no, int param_1, int param_2,
     return inst->getParam(param_1, param_2, o_param);
 }
 
-/* 80297E68-80297E80 2927A8 0018+00 0/0 2/2 0/0 .text            setInst__12JASBasicBankFiP7JASInst
- */
 void JASBasicBank::setInst(int prg_no, JASInst* inst) {
     if (mInstTable != NULL) {
         mInstTable[prg_no] = inst;
     }
 }
 
-/* 80297E80-80297EC4 2927C0 0044+00 1/1 1/1 0/0 .text            getInst__12JASBasicBankCFi */
 JASInst* JASBasicBank::getInst(int prg_no) const {
     if (prg_no < 0) {
         return NULL;
diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp
index c37826ba4a..4071060f4b 100644
--- a/src/JSystem/JAudio2/JASBasicInst.cpp
+++ b/src/JSystem/JAudio2/JASBasicInst.cpp
@@ -8,7 +8,6 @@
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 80298014-8029807C 292954 0068+00 0/0 2/2 0/0 .text            __ct__12JASBasicInstFv */
 JASBasicInst::JASBasicInst() {
     mVolume = 1.0;
     mPitch = 1.0;
@@ -17,13 +16,10 @@ JASBasicInst::JASBasicInst() {
     JASCalc::bzero(field_0xc, sizeof(field_0xc));
 }
 
-/* 8029807C-802980F8 2929BC 007C+00 1/0 0/0 0/0 .text            __dt__12JASBasicInstFv */
 JASBasicInst::~JASBasicInst() {
     delete[] mKeymap;
 }
 
-/* 802980F8-8029819C 292A38 00A4+00 1/0 0/0 0/0 .text getParam__12JASBasicInstCFiiP12JASInstParam
- */
 bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) const {
     param_2->field_0x1c = 0;
     param_2->field_0x1e = 0;
@@ -50,21 +46,16 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con
     return true;
 }
 
-/* 8029819C-8029821C 292ADC 0080+00 0/0 2/2 0/0 .text
- * setKeyRegionCount__12JASBasicInstFUlP7JKRHeap                */
 void JASBasicInst::setKeyRegionCount(u32 count, JKRHeap* param_1) {
     delete [] mKeymap;
     mKeymap      = new (param_1, 0) TKeymap[count];
 	mKeymapCount = count;
 }
 
-/* 8029821C-8029822C 292B5C 0010+00 0/0 2/2 0/0 .text
- * setOsc__12JASBasicInstFiPCQ213JASOscillator4Data             */
 void JASBasicInst::setOsc(int param_0, JASOscillator::Data const* param_1) {
     field_0xc[param_0] = param_1;
 }
 
-/* 8029822C-80298250 292B6C 0024+00 0/0 2/2 0/0 .text            getKeyRegion__12JASBasicInstFi */
 JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int param_0) {
     if (param_0 >= mKeymapCount) {
         return NULL;
@@ -73,6 +64,5 @@ JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int param_0) {
     return mKeymap + param_0;
 }
 
-/* 80298250-8029828C 292B90 003C+00 2/2 0/0 0/0 .text            __dt__Q212JASBasicInst7TKeymapFv */
 JASBasicInst::TKeymap::~TKeymap() {
 }
diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp
index 749a5e4bd1..922d00a85f 100644
--- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASBasicWaveBank
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASBasicWaveBank.h"
@@ -10,7 +5,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 802984F8-80298558 292E38 0060+00 0/0 1/1 0/0 .text            __ct__16JASBasicWaveBankFv */
 JASBasicWaveBank::JASBasicWaveBank() {
     mWaveTable = NULL;
     mWaveGroupArray = NULL;
@@ -19,14 +13,11 @@ JASBasicWaveBank::JASBasicWaveBank() {
     OSInitMutex(&field_0x4);
 }
 
-/* 80298558-802985E4 292E98 008C+00 1/0 0/0 0/0 .text            __dt__16JASBasicWaveBankFv */
 JASBasicWaveBank::~JASBasicWaveBank() {
     delete[] mWaveTable;
     delete[] mWaveGroupArray;
 }
 
-/* 80298640-80298664 292F80 0024+00 1/1 1/1 0/0 .text            getWaveGroup__16JASBasicWaveBankFUl
- */
 JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) {
     if (param_0 >= mGroupCount) {
         return NULL;
@@ -34,8 +25,6 @@ JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) {
     return mWaveGroupArray + param_0;
 }
 
-/* 80298664-80298710 292FA4 00AC+00 0/0 1/1 0/0 .text
- * setGroupCount__16JASBasicWaveBankFUlP7JKRHeap                */
 void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
     delete[] mWaveGroupArray;
     mGroupCount = param_0;
@@ -46,8 +35,6 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
     }
 }
 
-/* 80298710-80298790 293050 0080+00 0/0 1/1 0/0 .text
- * setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap             */
 void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
     delete[] mWaveTable;
     mWaveTable = new(param_1, 0) TWaveHandle[param_0];
@@ -55,8 +42,6 @@ void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
     mHandleCount = param_0;
 }
 
-/* 80298790-8029883C 2930D0 00AC+00 1/1 0/0 0/0 .text
- * incWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup */
 void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* param_0) {
     JASMutexLock lock(&field_0x4);
     for (u32 i = 0; i < param_0->getWaveCount(); i++) {
@@ -69,11 +54,8 @@ void JASBasicWaveBank::incWaveTable(JASBasicWaveBank::TWaveGroup const* param_0)
     }
 }
 
-/* 80451278-80451280 000778 0004+04 2/2 0/0 0/0 .sbss            mNoLoad__16JASBasicWaveBank */
 u32 JASBasicWaveBank::mNoLoad;
 
-/* 8029883C-802988DC 29317C 00A0+00 1/1 0/0 0/0 .text
- * decWaveTable__16JASBasicWaveBankFPCQ216JASBasicWaveBank10TWaveGroup */
 void JASBasicWaveBank::decWaveTable(JASBasicWaveBank::TWaveGroup const* param_0) {
     JASMutexLock lock(&field_0x4);
     for (u32 i = 0; i < param_0->getWaveCount(); i++) {
@@ -86,7 +68,6 @@ void JASBasicWaveBank::decWaveTable(JASBasicWaveBank::TWaveGroup const* param_0)
     }
 }
 
-/* 802988DC-80298910 29321C 0034+00 1/0 0/0 0/0 .text getWaveHandle__16JASBasicWaveBankCFUl */
 JASWaveHandle* JASBasicWaveBank::getWaveHandle(u32 param_0) const {
     if (param_0 >= mHandleCount) {
         return NULL;
@@ -97,8 +78,6 @@ JASWaveHandle* JASBasicWaveBank::getWaveHandle(u32 param_0) const {
     return mWaveTable + param_0;
 }
 
-/* 80298910-802989C0 293250 00B0+00 0/0 1/1 0/0 .text
- * setWaveInfo__16JASBasicWaveBankFPQ216JASBasicWaveBank10TWaveGroupiUsRC11JASWaveInfo */
 void JASBasicWaveBank::setWaveInfo(JASBasicWaveBank::TWaveGroup* wgrp, int index,
                                    u16 param_2, JASWaveInfo const& param_3) {
     JUT_ASSERT(204, wgrp);
@@ -111,20 +90,16 @@ void JASBasicWaveBank::setWaveInfo(JASBasicWaveBank::TWaveGroup* wgrp, int index
     wgrp->mCtrlWaveArray[index].field_0x4 = param_3.field_0x08;
 }
 
-/* 802989C0-80298A0C 293300 004C+00 1/1 0/0 0/0 .text __ct__Q216JASBasicWaveBank10TWaveGroupFv */
 JASBasicWaveBank::TWaveGroup::TWaveGroup() {
     mBank = NULL;
     mCtrlWaveArray = NULL;
     mWaveCount = 0;
 }
 
-/* 80298A0C-80298A84 29334C 0078+00 3/2 0/0 0/0 .text __dt__Q216JASBasicWaveBank10TWaveGroupFv */
 JASBasicWaveBank::TWaveGroup::~TWaveGroup() {
     delete[] mCtrlWaveArray;
 }
 
-/* 80298A84-80298B04 2933C4 0080+00 0/0 1/1 0/0 .text
- * setWaveCount__Q216JASBasicWaveBank10TWaveGroupFUlP7JKRHeap   */
 void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
     delete[] mCtrlWaveArray;
     mWaveCount = param_0;
@@ -132,31 +107,23 @@ void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
     JUT_ASSERT(255, mCtrlWaveArray != NULL);
 }
 
-/* 80298B04-80298B2C 293444 0028+00 1/0 0/0 0/0 .text
- * onLoadDone__Q216JASBasicWaveBank10TWaveGroupFv               */
 void JASBasicWaveBank::TWaveGroup::onLoadDone() {
     JUT_ASSERT(286, mBank);
     mBank->incWaveTable(this);
 }
 
-/* 80298B2C-80298B54 29346C 0028+00 1/0 0/0 0/0 .text
- * onEraseDone__Q216JASBasicWaveBank10TWaveGroupFv              */
 void JASBasicWaveBank::TWaveGroup::onEraseDone() {
     JUT_ASSERT(292, mBank);
     mBank->decWaveTable(this);
 }
 
 
-/* 80298B54-80298B64 293494 0010+00 2/2 0/0 0/0 .text
- * getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi               */
 u32 JASBasicWaveBank::TWaveGroup::getWaveID(int index) const {
     JUT_ASSERT(298, index < mWaveCount);
     JUT_ASSERT(299, index >= 0);
     return mCtrlWaveArray[index].field_0x0;
 }
 
-/* 80298B64-80298B88 2934A4 0024+00 1/0 0/0 0/0 .text
- * getWavePtr__Q216JASBasicWaveBank11TWaveHandleCFv             */
 int JASBasicWaveBank::TWaveHandle::getWavePtr() const {
     JUT_ASSERT(313, mHeap);
     void* base = mHeap->getBase();
diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp
index 66e25e046b..a076cef9d1 100644
--- a/src/JSystem/JAudio2/JASCalc.cpp
+++ b/src/JSystem/JAudio2/JASCalc.cpp
@@ -4,7 +4,6 @@
 #include <math.h>
 #include <limits.h>
 
-/* 8028F2E8-8028F318 289C28 0030+00 0/0 1/1 0/0 .text            imixcopy__7JASCalcFPCsPCsPsUl */
 void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) {
     for (n; n != 0; n--) {
         *dst++ = *((s16*)s1)++;
@@ -12,7 +11,6 @@ void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) {
     }
 }
 
-/* 8028F318-8028F354 289C58 003C+00 1/1 0/0 0/0 .text            bcopyfast__7JASCalcFPCvPvUl */
 void JASCalc::bcopyfast(const void* src, void* dest, u32 size) {
     JUT_ASSERT(226, (reinterpret_cast<u32>(src) & 0x03) == 0);
     JUT_ASSERT(227, (reinterpret_cast<u32>(dest) & 0x03) == 0);
@@ -35,7 +33,6 @@ void JASCalc::bcopyfast(const void* src, void* dest, u32 size) {
     }
 }
 
-/* 8028F354-8028F454 289C94 0100+00 0/0 3/3 0/0 .text            bcopy__7JASCalcFPCvPvUl */
 void JASCalc::bcopy(const void* src, void* dest, u32 size) {
     u32* usrc;
     u32* udest;
@@ -79,7 +76,6 @@ void JASCalc::bcopy(const void* src, void* dest, u32 size) {
     }
 }
 
-/* 8028F454-8028F480 289D94 002C+00 1/1 0/0 0/0 .text            bzerofast__7JASCalcFPvUl */
 void JASCalc::bzerofast(void* dest, u32 size) {
     JUT_ASSERT(336, (reinterpret_cast<u32>(dest) & 0x03) == 0);
     JUT_ASSERT(337, (size & 0x0f) == 0);
@@ -94,7 +90,6 @@ void JASCalc::bzerofast(void* dest, u32 size) {
     }
 }
 
-/* 8028F480-8028F578 289DC0 00F8+00 0/0 6/6 0/0 .text            bzero__7JASCalcFPvUl */
 void JASCalc::bzero(void* dest, u32 size) {
     u32* udest;
     u8* bdest = (u8*)dest;
@@ -137,7 +132,6 @@ void JASCalc::bzero(void* dest, u32 size) {
     }
 }
 
-/* 8039ABB8-8039AFB8 027218 0400+00 0/0 4/4 0/0 .rodata          CUTOFF_TO_IIR_TABLE__7JASCalc */
 s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = {
     0x0F5C, 0x0A3D, 0x4665, 0x1E73,
     0x0F5E, 0x0A3D, 0x4664, 0x1E73,
@@ -277,7 +271,6 @@ f32 JASCalc::fake1() { return 0.5f; }
 f32 JASCalc::fake2(long x) { return JASCalc::clamp<s16, long>(x); }
 f32 JASCalc::fake3() { return 0.0f; }
 
-/* 8028F578-8028F69C 289EB8 0124+00 0/0 2/2 0/0 .text            pow2__7JASCalcFf */
 f32 JASCalc::pow2(f32 x) {
     s32 frac_index = 0;
     union {
diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp
index b67f3848d1..0a01a453a9 100644
--- a/src/JSystem/JAudio2/JASCallback.cpp
+++ b/src/JSystem/JAudio2/JASCallback.cpp
@@ -3,8 +3,6 @@
 #include "JSystem/JAudio2/JASCallback.h"
 #include "JSystem/JAudio2/JASCriticalSection.h"
 
-/* 8028FFA8-80290030 28A8E8 0088+00 0/0 2/2 0/0 .text            regist__14JASCallbackMgrFPFPv_lPv
- */
 bool JASCallbackMgr::regist(JASCallback* callback, void* argument) {
 	JASCriticalSection criticalSection;
 	for (int i = 0; i < NUM_CALLBACKS; i++) {
@@ -18,8 +16,6 @@ bool JASCallbackMgr::regist(JASCallback* callback, void* argument) {
 	return false;
 }
 
-/* 80290030-802900C4 28A970 0094+00 0/0 1/1 0/0 .text            reject__14JASCallbackMgrFPFPv_lPv
- */
 int JASCallbackMgr::reject(JASCallback* callback, void* argument) {
 	int rejectNum = 0;
 	JASCriticalSection criticalSection;
@@ -33,7 +29,6 @@ int JASCallbackMgr::reject(JASCallback* callback, void* argument) {
 	return rejectNum;
 }
 
-/* 802900C4-80290140 28AA04 007C+00 0/0 3/3 0/0 .text            callback__14JASCallbackMgrFv */
 void JASCallbackMgr::callback() {
 	for (int i = 0; i < NUM_CALLBACKS; i++) {
 		if (callbacks_[i].callback_ && callbacks_[i].callback_(callbacks_[i].arg_) < 0) {
diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/src/JSystem/JAudio2/JASChannel.cpp
index ff6e133adc..7d216ed6c5 100644
--- a/src/JSystem/JAudio2/JASChannel.cpp
+++ b/src/JSystem/JAudio2/JASChannel.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASChannel
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASChannel.h"
@@ -14,21 +9,14 @@
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JGeometry.h"
 
-/* 80431B90-80431BB0 05E8B0 0020+00 2/2 0/0 0/0 .bss             sBankDisposeMsgQ__10JASChannel */
 OSMessageQueue JASChannel::sBankDisposeMsgQ;
 
-/* 80431BB0-80431BF0 05E8D0 0040+00 1/1 0/0 0/0 .bss             sBankDisposeMsg__10JASChannel */
 OSMessage JASChannel::sBankDisposeMsg[16];
 
-/* 80431BF0-80431C30 05E910 0040+00 2/2 0/3 0/0 .bss             sBankDisposeList__10JASChannel */
 OSMessage JASChannel::sBankDisposeList[16];
 
-/* 80451298-804512A0 000798 0004+04 3/3 0/0 0/0 .sbss            sBankDisposeListSize__10JASChannel
- */
 int JASChannel::sBankDisposeListSize;
 
-/* 8029A800-8029A918 295140 0118+00 0/0 3/3 0/0 .text
- * __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv */
 JASChannel::JASChannel(Callback i_callback, void* i_callbackData) :
     mStatus(STATUS_INACTIVE),
     mDspCh(NULL),
@@ -55,7 +43,6 @@ JASChannel::JASChannel(Callback i_callback, void* i_callbackData) :
     mPauseFlag = false;
 }
 
-/* 8029A918-8029A9F0 295258 00D8+00 5/5 0/0 0/0 .text            __dt__10JASChannelFv */
 JASChannel::~JASChannel() {
     if (mDspCh != NULL) {
         mDspCh->drop();
@@ -66,7 +53,6 @@ JASChannel::~JASChannel() {
 }
 
 
-/* 8029A9F0-8029AA60 295330 0070+00 0/0 2/2 0/0 .text            play__10JASChannelFv */
 int JASChannel::play() {
     JASDSPChannel* channel = JASDSPChannel::alloc(JSULoByte(mPriority), dspUpdateCallback, this);
     if (channel == NULL) {
@@ -79,7 +65,6 @@ int JASChannel::play() {
     return 1;
 }
 
-/* 8029AA60-8029AAD0 2953A0 0070+00 0/0 1/1 0/0 .text            playForce__10JASChannelFv */
 int JASChannel::playForce() {
     JASDSPChannel* channel = JASDSPChannel::allocForce(JSULoByte(mPriority),
                                                        dspUpdateCallback, this);
@@ -93,7 +78,6 @@ int JASChannel::playForce() {
     return 1;
 }
 
-/* 8029AAD0-8029AB64 295410 0094+00 0/0 4/4 0/0 .text            release__10JASChannelFUs */
 void JASChannel::release(u16 i_directRelease) {
     if (mStatus == STATUS_ACTIVE) {
         if (i_directRelease != 0) {
@@ -109,32 +93,23 @@ void JASChannel::release(u16 i_directRelease) {
     }
 }
 
-/* 8029AB64-8029AB98 2954A4 0034+00 0/0 4/4 0/0 .text
- * setOscInit__10JASChannelFUlPCQ213JASOscillator4Data          */
 void JASChannel::setOscInit(u32 i_index, JASOscillator::Data const* i_data) {
     mOscillators[i_index].initStart(i_data);
 }
 
-/* 8029AB98-8029ABA8 2954D8 0010+00 0/0 2/2 0/0 .text            setMixConfig__10JASChannelFUlUs */
 void JASChannel::setMixConfig(u32 i_index, u16 i_config) {
     mMixConfig[i_index].whole = i_config;
 }
 
-/* 8029ABA8-8029ABC0 2954E8 0018+00 1/1 0/0 0/0 .text
- * calcEffect__10JASChannelFPCQ210JASChannel9PanVector          */
 f32 JASChannel::calcEffect(JASChannel::PanVector const* i_vector) {
     return i_vector->mSound + i_vector->mEffect + i_vector->mChannel;
 }
 
-/* 8029ABC0-8029ABEC 295500 002C+00 1/1 0/0 0/0 .text
- * calcPan__10JASChannelFPCQ210JASChannel9PanVector             */
 f32 JASChannel::calcPan(JASChannel::PanVector const* i_vector) {
     return 0.5f + (i_vector->mSound - 0.5f) + (i_vector->mEffect - 0.5f)
         + (i_vector->mChannel - 0.5f);
 }
 
-/* 8029ABEC-8029ACD4 29552C 00E8+00 3/2 0/0 0/0 .text
- * effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams   */
 void JASChannel::effectOsc(u32 i_index, JASOscillator::EffectParams* i_params) {
     f32 value = mOscillators[i_index].getValue();
     switch (mOscillators[i_index].getTarget()) {
@@ -163,8 +138,6 @@ void JASChannel::effectOsc(u32 i_index, JASOscillator::EffectParams* i_params) {
     }
 }
 
-/* 8029ACD4-8029AD38 295614 0064+00 0/0 1/1 0/0 .text            setKeySweepTarget__10JASChannelFlUl
- */
 void JASChannel::setKeySweepTarget(s32 i_target, u32 i_count) {
     if (i_count == 0) {
         mKeySweep = i_target;
@@ -175,8 +148,6 @@ void JASChannel::setKeySweepTarget(s32 i_target, u32 i_count) {
     mKeySweepCount = i_count;
 }
 
-/* 8029AD38-8029AF78 295678 0240+00 2/2 0/0 0/0 .text
- * updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams */
 void JASChannel::updateEffectorParam(JASDsp::TChannel* i_channel, u16* i_mixerVolume,
                                      JASOscillator::EffectParams const& i_params) {
     PanVector pan_vector, fxmix_vector, dolby_vector;
@@ -223,8 +194,6 @@ void JASChannel::updateEffectorParam(JASDsp::TChannel* i_channel, u16* i_mixerVo
     }
 }
 
-/* 8029AF78-8029B004 2958B8 008C+00 2/2 0/0 0/0 .text
- * dspUpdateCallback__10JASChannelFUlPQ26JASDsp8TChannelPv      */
 s32 JASChannel::dspUpdateCallback(u32 i_type, JASDsp::TChannel* i_channel, void* i_this) {
     JASChannel* _this = static_cast<JASChannel*>(i_this);
     switch (i_type) {
@@ -242,8 +211,6 @@ s32 JASChannel::dspUpdateCallback(u32 i_type, JASDsp::TChannel* i_channel, void*
     return 0;
 }
 
-/* 8029B004-8029B324 295944 0320+00 1/1 0/0 0/0 .text
- * initialUpdateDSPChannel__10JASChannelFPQ26JASDsp8TChannel    */
 s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) {
     if (isDolbyMode()) {
         i_channel->initAutoMixer();
@@ -322,8 +289,6 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) {
     return 0;
 }
 
-/* 8029B324-8029B6A0 295C64 037C+00 1/1 0/0 0/0 .text
- * updateDSPChannel__10JASChannelFPQ26JASDsp8TChannel           */
 s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) {
     if (mCallback != NULL) {
         mCallback(CB_PLAY, this, i_channel, mCallbackData);
@@ -398,8 +363,6 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) {
     return 0;
 }
 
-/* 8029B6A0-8029B7D8 295FE0 0138+00 1/1 0/0 0/0 .text
- * updateAutoMixer__10JASChannelFPQ26JASDsp8TChannelffff        */
 void JASChannel::updateAutoMixer(JASDsp::TChannel* i_channel, f32 param_1, f32 param_2,
                                  f32 param_3, f32 param_4) {
     if (JASDriver::getOutputMode() == 0) {
@@ -410,8 +373,6 @@ void JASChannel::updateAutoMixer(JASDsp::TChannel* i_channel, f32 param_1, f32 p
                             param_4 * 127.5f, param_3 * 127.5f, 0);
 }
 
-/* 8029B7D8-8029BBFC 296118 0424+00 3/1 0/0 0/0 .text            updateMixer__10JASChannelFffffPUs
- */
 void JASChannel::updateMixer(f32 i_volume, f32 i_pan, f32 i_fxmix, f32 i_dolby, u16* i_volumeOut) {
     for (u32 i = 0; i < 6; i++) {
         f32 volume = i_volume;
@@ -505,19 +466,16 @@ void JASChannel::updateMixer(f32 i_volume, f32 i_pan, f32 i_fxmix, f32 i_dolby,
     }
 }
 
-/* 8029BBFC-8029BC0C 29653C 0010+00 0/0 3/3 0/0 .text            free__10JASChannelFv */
 void JASChannel::free() {
     mCallback = NULL;
     mCallbackData = NULL;
 }
 
-/* 8029BC0C-8029BC48 29654C 003C+00 0/0 1/1 0/0 .text initBankDisposeMsgQueue__10JASChannelFv */
 void JASChannel::initBankDisposeMsgQueue() {
     OSInitMessageQueue(&sBankDisposeMsgQ, sBankDisposeMsg, 0x10);
     sBankDisposeListSize = 0;
 }
 
-/* 8029BC48-8029BCC0 296588 0078+00 0/0 1/1 0/0 .text receiveBankDisposeMsg__10JASChannelFv */
 void JASChannel::receiveBankDisposeMsg() {
     OSMessage msg;
     for (sBankDisposeListSize = 0;
@@ -528,8 +486,6 @@ void JASChannel::receiveBankDisposeMsg() {
     }
 }
 
-/* 8029BCC0-8029BD14 296600 0054+00 2/2 0/0 0/0 .text            checkBankDispose__10JASChannelCFv
- */
 bool JASChannel::checkBankDispose() const {
     if (mBankDisposeID == NULL) {
         return false;
diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/src/JSystem/JAudio2/JASCmdStack.cpp
index 43689e431b..9a4fb55916 100644
--- a/src/JSystem/JAudio2/JASCmdStack.cpp
+++ b/src/JSystem/JAudio2/JASCmdStack.cpp
@@ -7,20 +7,15 @@
 #include "JSystem/JAudio2/JASCmdStack.h"
 #include "dolphin/os.h"
 
-/* 80431684-80431690 05E3A4 000C+00 1/2 0/0 0/0 .bss             sCommandListOnce__10JASPortCmd */
 JASPortCmd::TPortHead JASPortCmd::sCommandListOnce;
 
-/* 8043169C-804316A8 05E3BC 000C+00 1/2 0/0 0/0 .bss             sCommandListStay__10JASPortCmd */
 JASPortCmd::TPortHead JASPortCmd::sCommandListStay;
 
-/* 80291060-80291094 28B9A0 0034+00 0/0 1/1 0/0 .text            execAllCommand__10JASPortCmdFv */
 void JASPortCmd::execAllCommand() {
 	sCommandListOnce.execCommandOnce();
 	sCommandListStay.execCommandStay();
 }
 
-/* 80291094-8029110C 28B9D4 0078+00 1/1 0/0 0/0 .text execCommandOnce__Q210JASPortCmd9TPortHeadFv
- */
 void JASPortCmd::TPortHead::execCommandOnce() {
 	volatile BOOL interrupts = OSDisableInterrupts();
 	JSULink<JASPortCmd>* next;
@@ -32,8 +27,6 @@ void JASPortCmd::TPortHead::execCommandOnce() {
 	OSRestoreInterrupts(interrupts);
 }
 
-/* 8029110C-8029116C 28BA4C 0060+00 1/1 0/0 0/0 .text execCommandStay__Q210JASPortCmd9TPortHeadFv
- */
 void JASPortCmd::TPortHead::execCommandStay() {
 	volatile int interrupts = OSDisableInterrupts();
 	for (JSULink<JASPortCmd>* link = getFirst(); link != NULL; link = link->getNext()) {
diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/src/JSystem/JAudio2/JASDSPChannel.cpp
index eca5e47dfd..b1e4dc1296 100644
--- a/src/JSystem/JAudio2/JASDSPChannel.cpp
+++ b/src/JSystem/JAudio2/JASDSPChannel.cpp
@@ -1,18 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASDSPChannel
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASDSPChannel.h"
 #include "JSystem/JAudio2/JASHeapCtrl.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-/* 804512E0-804512E8 0007E0 0004+04 5/5 0/0 0/0 .sbss            sDspChannels__13JASDSPChannel */
 JASDSPChannel* JASDSPChannel::sDspChannels;
 
-/* 8029D2F4-8029D320 297C34 002C+00 1/1 0/0 0/0 .text            __ct__13JASDSPChannelFv */
 JASDSPChannel::JASDSPChannel() :
     mStatus(STATUS_INACTIVE),
     mPriority(-1),
@@ -25,18 +18,15 @@ JASDSPChannel::JASDSPChannel() :
     /* empty function */
 }
 
-/* 8029D320-8029D330 297C60 0010+00 0/0 3/3 0/0 .text            free__13JASDSPChannelFv */
 void JASDSPChannel::free() {
     mCallback = NULL;
     mCallbackData = NULL;
 }
 
-/* 8029D330-8029D340 297C70 0010+00 0/0 2/2 0/0 .text            start__13JASDSPChannelFv */
 void JASDSPChannel::start() {
     mFlags |= 1;
 }
 
-/* 8029D340-8029D3C8 297C80 0088+00 3/3 2/2 0/0 .text            drop__13JASDSPChannelFv */
 void JASDSPChannel::drop() {
     if (mCallback != NULL) {
         mCallback(CB_DROP, NULL, mCallbackData);
@@ -51,7 +41,6 @@ void JASDSPChannel::drop() {
     }
 }
 
-/* 8029D3C8-8029D44C 297D08 0084+00 0/0 1/1 0/0 .text            initAll__13JASDSPChannelFv */
 void JASDSPChannel::initAll() {
     sDspChannels = new (JASDram, 0x20) JASDSPChannel[0x40];
     for (int i = 0; i < 0x40; i++) {
@@ -59,8 +48,6 @@ void JASDSPChannel::initAll() {
     }
 }
 
-/* 8029D44C-8029D4BC 297D8C 0070+00 0/0 1/1 0/0 .text
- * alloc__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv       */
 JASDSPChannel* JASDSPChannel::alloc(u8 i_priority, Callback i_callback, void* i_callbackData) {
     JASDSPChannel* channel = getLowestChannel(i_priority);
     if (channel == NULL) {
@@ -74,8 +61,6 @@ JASDSPChannel* JASDSPChannel::alloc(u8 i_priority, Callback i_callback, void* i_
     return channel;
 }
 
-/* 8029D4BC-8029D534 297DFC 0078+00 0/0 1/1 0/0 .text
- * allocForce__13JASDSPChannelFUcPFUlPQ26JASDsp8TChannelPv_lPv  */
 JASDSPChannel* JASDSPChannel::allocForce(u8 i_priority, Callback i_callback, void* i_callbackData) {
     JASDSPChannel* channel = getLowestChannel(i_priority);
     if (channel == NULL) {
@@ -90,13 +75,10 @@ JASDSPChannel* JASDSPChannel::allocForce(u8 i_priority, Callback i_callback, voi
     return channel;
 }
 
-/* 8029D534-8029D540 297E74 000C+00 0/0 1/1 0/0 .text            setPriority__13JASDSPChannelFUc */
 void JASDSPChannel::setPriority(u8 i_priority) {
     mPriority = i_priority;
 }
 
-/* 8029D540-8029D5D0 297E80 0090+00 2/2 0/0 0/0 .text            getLowestChannel__13JASDSPChannelFi
- */
 JASDSPChannel* JASDSPChannel::getLowestChannel(int i_priority) {
     s16 best_priority = 0xff;
     int best_index = -1;
@@ -121,7 +103,6 @@ JASDSPChannel* JASDSPChannel::getLowestChannel(int i_priority) {
     return &sDspChannels[best_index];
 }
 
-/* 8029D5D0-8029D65C 297F10 008C+00 1/1 0/0 0/0 .text getLowestActiveChannel__13JASDSPChannelFv */
 JASDSPChannel* JASDSPChannel::getLowestActiveChannel() {
     s16 best_priority = 0xff;
     int best_index = -1;
@@ -145,7 +126,6 @@ JASDSPChannel* JASDSPChannel::getLowestActiveChannel() {
     return &sDspChannels[best_index];
 }
 
-/* 8029D65C-8029D89C 297F9C 0240+00 1/1 0/0 0/0 .text            updateProc__13JASDSPChannelFv */
 void JASDSPChannel::updateProc() {
     int ret;
     if (mChannel->isFinish()) {
@@ -222,7 +202,6 @@ void JASDSPChannel::updateProc() {
     }
 }
 
-/* 8029D89C-8029D910 2981DC 0074+00 0/0 1/1 0/0 .text            updateAll__13JASDSPChannelFv */
 void JASDSPChannel::updateAll() {
     for (u32 i = 0; i < 0x40; i++) {
         if ((i & 0xf) == 0 && i != 0) {
@@ -233,7 +212,6 @@ void JASDSPChannel::updateAll() {
     JASDsp::releaseHalt(3);
 }
 
-/* 8029D910-8029D948 298250 0038+00 0/0 1/1 0/0 .text killActiveChannel__13JASDSPChannelFv */
 int JASDSPChannel::killActiveChannel() {
     JASDSPChannel* channel = getLowestActiveChannel();
     if (channel == NULL) {
@@ -244,7 +222,6 @@ int JASDSPChannel::killActiveChannel() {
     }
 }
 
-/* 8029D948-8029D958 298288 0010+00 0/0 1/1 0/0 .text            getHandle__13JASDSPChannelFUl */
 JASDSPChannel* JASDSPChannel::getHandle(u32 i_index) {
     return &sDspChannels[i_index];
 }
diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp
index 6f454458a7..0f1efea56a 100644
--- a/src/JSystem/JAudio2/JASDSPInterface.cpp
+++ b/src/JSystem/JAudio2/JASDSPInterface.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASDSPInterface
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASDSPInterface.h"
@@ -16,16 +11,12 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include <dolphin/os.h>
 
-/* 804512E8-804512EC 0007E8 0004+00 5/5 0/0 0/0 .sbss            CH_BUF__6JASDsp */
 JASDsp::TChannel* JASDsp::CH_BUF;
 
-/* 804512EC-804512F0 0007EC 0004+00 3/3 0/0 0/0 .sbss            FX_BUF__6JASDsp */
 JASDsp::FxBuf* JASDsp::FX_BUF;
 
-/* 804512F0-804512F4 0007F0 0004+00 2/2 0/0 0/0 .sbss            sDSPVolume__6JASDsp */
 f32 JASDsp::sDSPVolume;
 
-/* 8029D958-8029D9A4 298298 004C+00 0/0 1/1 0/0 .text            boot__6JASDspFPFPv_v */
 void JASDsp::boot(void (*param_0)(void*)) {
     static bool data_804512F4 = true;
     if (data_804512F4) {
@@ -34,66 +25,55 @@ void JASDsp::boot(void (*param_0)(void*)) {
     }
 }
 
-/* 8029D9A4-8029D9C4 2982E4 0020+00 0/0 1/1 0/0 .text            releaseHalt__6JASDspFUl */
 void JASDsp::releaseHalt(u32 param_0) {
     DSPReleaseHalt2(param_0);
 }
 
-/* 8029D9C4-8029D9E4 298304 0020+00 0/0 1/1 0/0 .text            finishWork__6JASDspFUs */
 void JASDsp::finishWork(u16 param_0) {
     DspFinishWork(param_0);
 }
 
-/* 8029D9E4-8029DA04 298324 0020+00 0/0 1/1 0/0 .text            syncFrame__6JASDspFUlUlUl */
 void JASDsp::syncFrame(u32 param_0, u32 param_1, u32 param_2) {
     DsyncFrame2(param_0, param_1, param_2);
 }
 
-/* 8029DA04-8029DA30 298344 002C+00 0/0 1/1 0/0 .text            setDSPMixerLevel__6JASDspFf */
 void JASDsp::setDSPMixerLevel(f32 dsp_level) {
     sDSPVolume = dsp_level;
     dsp_level *= 4.0f;
     DsetMixerLevel(dsp_level);
 }
 
-/* 8029DA30-8029DA38 298370 0008+00 0/0 1/1 0/0 .text            getDSPMixerLevel__6JASDspFv */
 f32 JASDsp::getDSPMixerLevel() {
     return sDSPVolume;
 }
 
-/* 8029DA38-8029DA48 298378 0010+00 0/0 1/1 0/0 .text            getDSPHandle__6JASDspFi */
 JASDsp::TChannel* JASDsp::getDSPHandle(int param_0) {
     return CH_BUF + param_0;
 }
 
-/* 8029DA48-8029DA6C 298388 0024+00 3/3 0/0 0/0 .text            setFilterTable__6JASDspFPsPsUl */
 void JASDsp::setFilterTable(s16* param_0, s16* param_1, u32 param_2) {
     for (int i = 0; i < param_2; i++) {
         *param_0++ = *param_1++;
     }
 }
 
-/* 8029DA6C-8029DAA0 2983AC 0034+00 1/1 0/0 0/0 .text            flushBuffer__6JASDspFv */
 void JASDsp::flushBuffer() {
     DCFlushRange(CH_BUF, sizeof(TChannel) * 64);
     DCFlushRange(FX_BUF, sizeof(FxBuf) * 4);
 }
 
-/* 8029DAA0-8029DAC8 2983E0 0028+00 0/0 1/1 0/0 .text            invalChannelAll__6JASDspFv */
 void JASDsp::invalChannelAll() {
     DCInvalidateRange(CH_BUF, sizeof(TChannel) * 64);
 }
 
-/* 8039B360-8039B3A0 0279C0 0040+00 1/1 0/0 0/0 .rodata          DSPADPCM_FILTER__6JASDsp */
-u8 const ALIGN_DECL(32) JASDsp::DSPADPCM_FILTER[64] = {
+u8 const ATTRIBUTE_ALIGN(32) JASDsp::DSPADPCM_FILTER[64] = {
     0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00,
     0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00,
     0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
     0x04, 0x00, 0xFC, 0x00, 0xFC, 0x00, 0x04, 0x00, 0xFC, 0x00, 0x00, 0x00, 0xF8, 0x00, 0x00, 0x00,
 };
 
-/* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata          DSPRES_FILTER__6JASDsp */
-u32 const ALIGN_DECL(32) JASDsp::DSPRES_FILTER[320] = {
+u32 const ATTRIBUTE_ALIGN(32) JASDsp::DSPRES_FILTER[320] = {
     0x0C3966AD,
     0x0D46FFDF,
     0x0B396696,
@@ -416,7 +396,6 @@ u32 const ALIGN_DECL(32) JASDsp::DSPRES_FILTER[320] = {
     0x7FF57FFD,
 };
 
-/* 8029DAC8-8029DB78 298408 00B0+00 0/0 1/1 0/0 .text            initBuffer__6JASDspFv */
 void JASDsp::initBuffer() {
     CH_BUF = new(JASDram, 0x20) TChannel[64];
     FX_BUF = new(JASDram, 0x20) FxBuf[4];
@@ -429,7 +408,6 @@ void JASDsp::initBuffer() {
     flushBuffer();
 }
 
-/* 803C78F0-803C7920 024A10 0018+18 1/1 0/0 0/0 .data            SEND_TABLE__6JASDsp */
 u16 JASDsp::SEND_TABLE[] = {
     0x0D00,
     0x0D60,
@@ -445,8 +423,6 @@ u16 JASDsp::SEND_TABLE[] = {
     0x0000,
 };
 
-/* 8029DB78-8029DCA4 2984B8 012C+00 1/1 1/1 0/0 .text
- * setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_             */
 int JASDsp::setFXLine(u8 param_0, s16* param_1, JASDsp::FxlineConfig_* param_2) {
     FxBuf* puVar3 = FX_BUF + param_0;
     JASCriticalSection aJStack_20;
@@ -477,7 +453,6 @@ int JASDsp::setFXLine(u8 param_0, s16* param_1, JASDsp::FxlineConfig_* param_2)
     return 1;
 }
 
-/* 8029DCA4-8029DCE0 2985E4 003C+00 0/0 1/1 0/0 .text            init__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::init() {
     mPauseFlag = 0;
     mIsFinished = 0;
@@ -488,7 +463,6 @@ void JASDsp::TChannel::init() {
     initFilter();
 }
 
-/* 8029DCE0-8029DD44 298620 0064+00 0/0 1/1 0/0 .text            playStart__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::playStart() {
     field_0x10c = 0;
     field_0x060 = 0;
@@ -505,34 +479,27 @@ void JASDsp::TChannel::playStart() {
     mIsActive = 1;
 }
 
-/* 8029DD44-8029DD50 298684 000C+00 0/0 1/1 0/0 .text            playStop__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::playStop() {
     mIsActive = 0;
 }
 
-/* 8029DD50-8029DD60 298690 0010+00 0/0 1/1 0/0 .text replyFinishRequest__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::replyFinishRequest() {
     mIsFinished = 0;
     mIsActive = 0;
 }
 
-/* 8029DD60-8029DD6C 2986A0 000C+00 0/0 1/1 0/0 .text            forceStop__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::forceStop() {
     mForcedStop = 1;
 }
 
-/* 8029DD6C-8029DD7C 2986AC 0010+00 1/1 0/0 0/0 .text            isActive__Q26JASDsp8TChannelCFv */
 bool JASDsp::TChannel::isActive() const {
     return mIsActive != 0;
 }
 
-/* 8029DD7C-8029DD8C 2986BC 0010+00 0/0 1/1 0/0 .text            isFinish__Q26JASDsp8TChannelCFv */
 bool JASDsp::TChannel::isFinish() const {
     return mIsFinished != 0;
 }
 
-/* 8029DD8C-8029DEAC 2986CC 0120+00 0/0 1/1 0/0 .text
- * setWaveInfo__Q26JASDsp8TChannelFRC11JASWaveInfoUlUl          */
 void JASDsp::TChannel::setWaveInfo(JASWaveInfo const& param_0, u32 param_1, u32 param_2) {
     field_0x118 = param_1;
     static const u8 COMP_BLOCKSAMPLES[8] = {0x10, 0x10, 0x01, 0x01, 0x01, 0x10, 0x10, 0x01};
@@ -575,16 +542,12 @@ void JASDsp::TChannel::setWaveInfo(JASWaveInfo const& param_0, u32 param_1, u32
     }
 }
 
-/* 8029DEAC-8029DEC4 2987EC 0018+00 0/0 1/1 0/0 .text            setOscInfo__Q26JASDsp8TChannelFUl
- */
 void JASDsp::TChannel::setOscInfo(u32 param_0) {
     field_0x118 = 0;
     field_0x064 = 16;
     field_0x100 = param_0;
 }
 
-/* 8029DEC4-8029DEF0 298804 002C+00 0/0 1/1 0/0 .text            initAutoMixer__Q26JASDsp8TChannelFv
- */
 void JASDsp::TChannel::initAutoMixer() {
     if (field_0x058) {
         field_0x054 = field_0x056;
@@ -594,8 +557,6 @@ void JASDsp::TChannel::initAutoMixer() {
     }
 }
 
-/* 8029DEF0-8029DF1C 298830 002C+00 0/0 1/1 0/0 .text setAutoMixer__Q26JASDsp8TChannelFUsUcUcUcUc
- */
 void JASDsp::TChannel::setAutoMixer(u16 param_0, u8 param_1, u8 param_2, u8 param_3,
                                         u8 param_4) {
     field_0x050 = (param_1 << 8) | param_2;
@@ -604,7 +565,6 @@ void JASDsp::TChannel::setAutoMixer(u16 param_0, u8 param_1, u8 param_2, u8 para
     field_0x058 = 1;
 }
 
-/* 8029DF1C-8029DF34 29885C 0018+00 0/0 2/2 0/0 .text            setPitch__Q26JASDsp8TChannelFUs */
 void JASDsp::TChannel::setPitch(u16 param_0) {
     if (param_0 >= 0x7fff) {
         param_0 = 0x7fff;
@@ -612,8 +572,6 @@ void JASDsp::TChannel::setPitch(u16 param_0) {
     mPitch = param_0;
 }
 
-/* 8029DF34-8029DF54 298874 0020+00 0/0 1/1 0/0 .text setMixerInitVolume__Q26JASDsp8TChannelFUcs
- */
 void JASDsp::TChannel::setMixerInitVolume(u8 param_0, s16 param_1) {
     u16* tmp = field_0x010[param_0];
     tmp[2] = param_1;
@@ -621,7 +579,6 @@ void JASDsp::TChannel::setMixerInitVolume(u8 param_0, s16 param_1) {
     tmp[3] = 0;
 }
 
-/* 8029DF54-8029DF80 298894 002C+00 0/0 1/1 0/0 .text setMixerVolume__Q26JASDsp8TChannelFUcs */
 void JASDsp::TChannel::setMixerVolume(u8 param_0, s16 param_1) {
     if (mForcedStop == 0) {
         u16* tmp = field_0x010[param_0];
@@ -630,18 +587,14 @@ void JASDsp::TChannel::setMixerVolume(u8 param_0, s16 param_1) {
     }
 }
 
-/* 8029DF80-8029DF8C 2988C0 000C+00 0/0 2/2 0/0 .text            setPauseFlag__Q26JASDsp8TChannelFUc
- */
 void JASDsp::TChannel::setPauseFlag(u8 param_0) {
     mPauseFlag = param_0;
 }
 
-/* 8029DF8C-8029DFB0 2988CC 0024+00 0/0 1/1 0/0 .text            flush__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::flush() {
     DCFlushRange(this, sizeof(*this));
 }
 
-/* 8029DFB0-8029E00C 2988F0 005C+00 1/1 0/0 0/0 .text            initFilter__Q26JASDsp8TChannelFv */
 void JASDsp::TChannel::initFilter() {
     int i;
     for (i = 0; i < 8; i++) {
@@ -655,7 +608,6 @@ void JASDsp::TChannel::initFilter() {
     iir_filter_params[4] = 0;
 }
 
-/* 8029E00C-8029E044 29894C 0038+00 0/0 1/1 0/0 .text setFilterMode__Q26JASDsp8TChannelFUs */
 void JASDsp::TChannel::setFilterMode(u16 param_0) {
     u8 r30 = param_0 & 0x20;
     u8 r31 = param_0 & 0x1f;
@@ -671,23 +623,18 @@ void JASDsp::TChannel::setFilterMode(u16 param_0) {
     mFilterMode = r30 + r31;
 }
 
-/* 8029E044-8029E06C 298984 0028+00 0/0 1/1 0/0 .text setIIRFilterParam__Q26JASDsp8TChannelFPs */
 void JASDsp::TChannel::setIIRFilterParam(s16* param_0) {
     setFilterTable(iir_filter_params, param_0, 8);
 }
 
-/* 8029E06C-8029E094 2989AC 0028+00 0/0 1/1 0/0 .text setFIR8FilterParam__Q26JASDsp8TChannelFPs */
 void JASDsp::TChannel::setFIR8FilterParam(s16* param_0) {
     setFilterTable(fir_filter_params, param_0, 8);
 }
 
-/* 8029E094-8029E09C -00001 0008+00 0/0 0/0 0/0 .text            setDistFilter__Q26JASDsp8TChannelFs
- */
 void JASDsp::TChannel::setDistFilter(s16 param_0) {
     iir_filter_params[4] = param_0;
 }
 
-/* 8029E09C-8029E0BC 2989DC 0020+00 0/0 1/1 0/0 .text setBusConnect__Q26JASDsp8TChannelFUcUc */
 void JASDsp::TChannel::setBusConnect(u8 param_0, u8 param_1) {
     u16* tmp = field_0x010[param_0];
     static u16 const connect_table[12] = {
@@ -697,7 +644,6 @@ void JASDsp::TChannel::setBusConnect(u8 param_0, u8 param_1) {
     tmp[0] = connect_table[param_1];
 }
 
-/* 8029E0BC-8029E130 2989FC 0074+00 0/0 1/1 0/0 .text            DSP_CreateMap2__FUl */
 u16 DSP_CreateMap2(u32 param_0) {
     u16 r30 = 0;
     JASDsp::TChannel* channel = &JASDsp::CH_BUF[param_0 << 4];
@@ -711,7 +657,6 @@ u16 DSP_CreateMap2(u32 param_0) {
     return r30;
 }
 
-/* 804507B8-804507C0 000238 0004+04 0/0 5/5 0/0 .sdata           one__11JASWaveInfo */
 u32 JASWaveInfo::one = 1;
 
 #ifdef DEBUG
diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/src/JSystem/JAudio2/JASDriverIF.cpp
index 744ab2caf3..b579103ab6 100644
--- a/src/JSystem/JAudio2/JASDriverIF.cpp
+++ b/src/JSystem/JAudio2/JASDriverIF.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASDriverIF
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASDriverIF.h"
@@ -10,42 +5,30 @@
 #include "JSystem/JAudio2/JASDSPInterface.h"
 #include <dolphin/os.h>
 
-/* 8029E130-8029E150 298A70 0020+00 0/0 3/3 0/0 .text            setDSPLevel__9JASDriverFf */
 void JASDriver::setDSPLevel(f32 param_0) {
     JASDsp::setDSPMixerLevel(param_0);
 }
 
-/* ############################################################################################## */
-/* 804507C0-804507C4 000240 0002+02 1/0 0/0 0/0 .sdata           MAX_MIXERLEVEL__9JASDriver */
 u16 JASDriver::MAX_MIXERLEVEL = 0x2EE0;
 
-/* 8029E150-8029E158 -00001 0008+00 0/0 0/0 0/0 .text            getChannelLevel_dsp__9JASDriverFv
- */
 u16 JASDriver::getChannelLevel_dsp() {
     return JASDriver::MAX_MIXERLEVEL;
 }
 
-/* 8029E158-8029E178 298A98 0020+00 0/0 3/3 0/0 .text            getDSPLevel__9JASDriverFv */
 f32 JASDriver::getDSPLevel() {
     return JASDsp::getDSPMixerLevel();
 }
 
-/* ############################################################################################## */
-/* 804507C4-804507C8 000244 0004+00 2/1 0/0 0/0 .sdata           JAS_SYSTEM_OUTPUT_MODE__9JASDriver
- */
 u32 JASDriver::JAS_SYSTEM_OUTPUT_MODE = 0x00000001;
 
-/* 8029E178-8029E180 298AB8 0008+00 0/0 2/2 0/0 .text            setOutputMode__9JASDriverFUl */
 void JASDriver::setOutputMode(u32 param_0) {
     JAS_SYSTEM_OUTPUT_MODE = param_0;
 }
 
-/* 8029E180-8029E188 -00001 0008+00 0/0 0/0 0/0 .text            getOutputMode__9JASDriverFv */
 u32 JASDriver::getOutputMode() {
     return JASDriver::JAS_SYSTEM_OUTPUT_MODE;
 }
 
-/* 8029E188-8029E1C4 298AC8 003C+00 0/0 1/1 0/0 .text            waitSubFrame__9JASDriverFv */
 void JASDriver::waitSubFrame() {
     u32 r31 = getSubFrameCounter();
     do {
@@ -53,18 +36,12 @@ void JASDriver::waitSubFrame() {
     } while (r31 == getSubFrameCounter());
 }
 
-/* ############################################################################################## */
-/* 80431C78-80431D78 05E998 0100+00 4/4 0/0 0/0 .bss             sDspSyncCallback__9JASDriver */
 JASCallbackMgr JASDriver::sDspSyncCallback;
 
-/* 80431D78-80431E78 05EA98 0100+00 2/4 0/0 0/0 .bss             sSubFrameCallback__9JASDriver */
 JASCallbackMgr JASDriver::sSubFrameCallback;
 
-/* 80431E78-80431F80 05EB98 0100+08 1/3 0/0 0/0 .bss             sUpdateDacCallback__9JASDriver */
 JASCallbackMgr JASDriver::sUpdateDacCallback;
 
-/* 8029E1C4-8029E240 298B04 007C+00 0/0 2/2 0/0 .text            rejectCallback__9JASDriverFPFPv_lPv
- */
 int JASDriver::rejectCallback(DriverCallback callback, void* param_1) {
     int r31 = sDspSyncCallback.reject(callback, param_1);
     r31 += sSubFrameCallback.reject(callback, param_1);
@@ -72,29 +49,22 @@ int JASDriver::rejectCallback(DriverCallback callback, void* param_1) {
     return r31;
 }
 
-/* 8029E240-8029E274 298B80 0034+00 0/0 1/1 0/0 .text registerDspSyncCallback__9JASDriverFPFPv_lPv
- */
 bool JASDriver::registerDspSyncCallback(DriverCallback callback, void* param_1) {
     return sDspSyncCallback.regist(callback, param_1);
 }
 
-/* 8029E274-8029E2A8 298BB4 0034+00 0/0 3/3 0/0 .text
- * registerSubFrameCallback__9JASDriverFPFPv_lPv                */
 bool JASDriver::registerSubFrameCallback(DriverCallback callback, void* param_1) {
     return sSubFrameCallback.regist(callback, param_1);
 }
 
-/* 8029E2A8-8029E2D0 298BE8 0028+00 0/0 1/1 0/0 .text            subframeCallback__9JASDriverFv */
 void JASDriver::subframeCallback() {
     sSubFrameCallback.callback();
 }
 
-/* 8029E2D0-8029E2F8 298C10 0028+00 0/0 1/1 0/0 .text            DSPSyncCallback__9JASDriverFv */
 void JASDriver::DSPSyncCallback() {
     sDspSyncCallback.callback();
 }
 
-/* 8029E2F8-8029E320 298C38 0028+00 0/0 1/1 0/0 .text            updateDacCallback__9JASDriverFv */
 void JASDriver::updateDacCallback() {
     sUpdateDacCallback.callback();
 }
diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp
index 2f8b5bff2b..9f9ec63059 100644
--- a/src/JSystem/JAudio2/JASDrumSet.cpp
+++ b/src/JSystem/JAudio2/JASDrumSet.cpp
@@ -1,27 +1,18 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASDrumSet
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASDrumSet.h"
 #include "JSystem/JAudio2/JASCalc.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* ############################################################################################## */
 
-/* 802982EC-80298314 292C2C 0028+00 0/0 2/2 0/0 .text            __ct__10JASDrumSetFv */
 JASDrumSet::JASDrumSet() {
     field_0x4 = NULL;
     field_0x8 = 0;
 }
 
-/* 80298314-80298370 292C54 005C+00 1/0 0/0 0/0 .text            __dt__10JASDrumSetFv */
 JASDrumSet::~JASDrumSet() {
 }
 
-/* 80298370-802983CC 292CB0 005C+00 0/0 2/2 0/0 .text newPercArray__10JASDrumSetFUcP7JKRHeap */
 void JASDrumSet::newPercArray(u8 param_0, JKRHeap* param_1) {
     if (param_0) {
         field_0x8 = param_0;
@@ -30,17 +21,12 @@ void JASDrumSet::newPercArray(u8 param_0, JKRHeap* param_1) {
     }
 }
 
-/* ############################################################################################## */
-/* 80431B58-80431B70 05E878 0018+00 1/1 0/0 0/0 .bss             osc$213 */
 static JASOscillator::Data osc;
 
-/* 80451270-80451274 000770 0004+00 1/1 0/0 0/0 .sbss            oscp$214 */
 static JASOscillator::Data* oscp;
 
-/* 80451274-80451278 000774 0004+00 1/1 0/0 0/0 .sbss            None */
 static s8 data_80451274[4];
 
-/* 802983CC-802984B4 292D0C 00E8+00 1/0 0/0 0/0 .text getParam__10JASDrumSetCFiiP12JASInstParam */
 bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const {
     if (field_0x4 == NULL) {
         return false;
@@ -81,15 +67,11 @@ bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const
     return true;
 }
 
-/* 802984B4-802984C4 292DF4 0010+00 0/0 2/2 0/0 .text setPerc__10JASDrumSetFiPQ210JASDrumSet5TPerc
- */
 void JASDrumSet::setPerc(int param_0, JASDrumSet::TPerc* param_1) {
     field_0x4[param_0] = param_1;
 }
 
-/* ############################################################################################## */
 
-/* 802984C4-802984E4 292E04 0020+00 0/0 2/2 0/0 .text            __ct__Q210JASDrumSet5TPercFv */
 JASDrumSet::TPerc::TPerc() {
     mVolume = 1.0f;
     mPitch = 1.0f;
@@ -97,11 +79,8 @@ JASDrumSet::TPerc::TPerc() {
     field_0xc = 1000;
 }
 
-/* 802984E4-802984EC -00001 0008+00 0/0 0/0 0/0 .text            setRelease__Q210JASDrumSet5TPercFUl
- */
 void JASDrumSet::TPerc::setRelease(u32 param_0) {
     field_0xc = param_0;
 }
 
-/* 802984EC-802984F8 292E2C 000C+00 1/0 0/0 0/0 .text            getType__10JASDrumSetCFv */
 u32 JASDrumSet::getType() const { return 'PERC'; }
diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/src/JSystem/JAudio2/JASDvdThread.cpp
index 2de97b7978..df118c07a0 100644
--- a/src/JSystem/JAudio2/JASDvdThread.cpp
+++ b/src/JSystem/JAudio2/JASDvdThread.cpp
@@ -4,15 +4,12 @@
 #include "JSystem/JAudio2/JASTaskThread.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-/* 80451208-80451210 000708 0004+04 2/1 0/0 0/0 .sbss            sThread__6JASDvd */
 JASTaskThread* JASDvd::sThread;
 
-/* 8028FEFC-8028FF04 -00001 0008+00 0/0 0/0 0/0 .text            getThreadPointer__6JASDvdFv */
 JASTaskThread* JASDvd::getThreadPointer() {
     return JASDvd::sThread;
 }
 
-/* 8028FF04-8028FFA8 28A844 00A4+00 0/0 1/1 0/0 .text            createThread__6JASDvdFliUl */
 bool JASDvd::createThread(s32 priority, int msgCount, u32 stackSize) {
     if (sThread != NULL) {
         JUT_WARN_DEVICE(32, 2, "%s", "JASDvd::createThread が２回呼び出されました");
diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp
index 0a3063dcf7..f0121ccefe 100644
--- a/src/JSystem/JAudio2/JASHeapCtrl.cpp
+++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80290140-802901AC 28AA80 006C+00 1/1 2/2 0/0 .text            __ct__7JASHeapFP11JASDisposer */
 JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
     mDisposer = disposer;
     mBase = NULL;
@@ -16,7 +15,6 @@ JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) {
     OSInitMutex(&mMutex);
 }
 
-/* 802901AC-8029021C 28AAEC 0070+00 1/1 0/0 0/0 .text            initRootHeap__7JASHeapFPvUl */
 void JASHeap::initRootHeap(void* param_0, u32 param_1) {
     JUT_ASSERT(97, ! isAllocated());
     JASMutexLock lock(&mMutex);
@@ -25,7 +23,6 @@ void JASHeap::initRootHeap(void* param_0, u32 param_1) {
     mSize = param_1 - (u32(mBase) - u32(param_0));
 }
 
-/* 8029021C-802903F4 28AB5C 01D8+00 0/0 2/2 0/0 .text            alloc__7JASHeapFP7JASHeapUl */
 bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
     JUT_ASSERT(120, mother != NULL);
     JASMutexLock lock(&mMutex);
@@ -83,7 +80,6 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
     return 1;
 }
 
-/* 802903F4-802904E4 28AD34 00F0+00 0/0 1/1 0/0 .text            allocTail__7JASHeapFP7JASHeapUl */
 bool JASHeap::allocTail(JASHeap* mother, u32 size) {
     JASMutexLock lock(&mMutex);
     if (isAllocated()) {
@@ -103,7 +99,6 @@ bool JASHeap::allocTail(JASHeap* mother, u32 size) {
     return true;
 }
 
-/* 802904E4-80290608 28AE24 0124+00 0/0 4/4 0/0 .text            free__7JASHeapFv */
 bool JASHeap::free() {
     JASMutexLock lock(&mMutex);
     if (!isAllocated()) {
@@ -137,8 +132,6 @@ bool JASHeap::free() {
     return true;
 }
 
-/* 80290608-802906F0 28AF48 00E8+00 2/2 0/0 0/0 .text
- * insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb                */
 void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param_3, bool param_4) {
     JUT_ASSERT(513, heap != NULL);
     JUT_ASSERT(514, next == NULL || &mTree == next->mTree.getParent());
@@ -161,7 +154,6 @@ void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param
     mTree.insertChild(&next->mTree, &heap->mTree);
 }
 
-/* 802906F0-8029077C 28B030 008C+00 3/3 0/0 0/0 .text            getTailHeap__7JASHeapFv */
 JASHeap* JASHeap::getTailHeap() {
     JSUTreeIterator<JASHeap> it;
     JASMutexLock lock(&mMutex);
@@ -176,7 +168,6 @@ JASHeap* JASHeap::getTailHeap() {
     return it.getObject();
 }
 
-/* 8029077C-802907E0 28B0BC 0064+00 2/2 0/0 0/0 .text            getTailOffset__7JASHeapFv */
 u32 JASHeap::getTailOffset() {
     JASMutexLock lock(&mMutex);
     JASHeap* heap = getTailHeap();
@@ -184,14 +175,12 @@ u32 JASHeap::getTailOffset() {
     return offset;
 }
 
-/* 802907E0-80290848 28B120 0068+00 2/2 0/0 0/0 .text            getCurOffset__7JASHeapFv */
 u32 JASHeap::getCurOffset() {
     JASMutexLock lock(&mMutex);
     u32 offset = !field_0x40 ? 0 : field_0x40->mBase + field_0x40->mSize - mBase;
     return offset;
 }
 
-/* 80290848-80290860 28B188 0018+00 0/0 32/32 0/0 .text            __ct__17JASGenericMemPoolFv */
 JASGenericMemPool::JASGenericMemPool() {
     field_0x0 = NULL;
     freeMemCount = 0;
@@ -199,7 +188,6 @@ JASGenericMemPool::JASGenericMemPool() {
     usedMemCount = 0;
 }
 
-/* 80290860-802908C8 28B1A0 0068+00 0/0 9/9 0/0 .text            __dt__17JASGenericMemPoolFv */
 JASGenericMemPool::~JASGenericMemPool() {
     void* chunk = field_0x0;
     while (chunk != NULL) {
@@ -209,11 +197,8 @@ JASGenericMemPool::~JASGenericMemPool() {
     }
 }
 
-/* 80451210-80451214 000710 0004+00 2/2 15/15 0/0 .sbss            JASDram */
 JKRSolidHeap* JASDram;
 
-/* 802908C8-80290948 28B208 0080+00 0/0 4/4 0/0 .text            newMemPool__17JASGenericMemPoolFUli
- */
 void JASGenericMemPool::newMemPool(u32 size, int param_1) {
     for (int i = 0; i < param_1; i++) {
         void* chunk = new (JASDram, 0) u8[size];
@@ -224,7 +209,6 @@ void JASGenericMemPool::newMemPool(u32 size, int param_1) {
     totalMemCount += param_1;
 }
 
-/* 80290948-80290994 28B288 004C+00 0/0 13/13 0/0 .text            alloc__17JASGenericMemPoolFUl */
 void* JASGenericMemPool::alloc(u32 param_0) {
     void* chunk = field_0x0;
     if (chunk == NULL) {
@@ -238,7 +222,6 @@ void* JASGenericMemPool::alloc(u32 param_0) {
     return chunk;
 }
 
-/* 80290994-802909B8 28B2D4 0024+00 0/0 15/15 0/0 .text            free__17JASGenericMemPoolFPvUl */
 void JASGenericMemPool::free(void* ptr, u32 param_1) {
     if (ptr != NULL) {
         *(void**)ptr = field_0x0;
@@ -247,17 +230,12 @@ void JASGenericMemPool::free(void* ptr, u32 param_1) {
     }
 }
 
-/* 80451214-80451218 000714 0004+00 1/1 0/0 0/0 .sbss            sAramBase__9JASKernel */
 u32 JASKernel::sAramBase;
 
-/* 80451218-8045121C 000718 0004+00 2/1 0/0 0/0 .sbss            sSystemHeap__9JASKernel */
 JKRHeap* JASKernel::sSystemHeap;
 
-/* 8045121C-80451220 00071C 0004+00 2/1 0/0 0/0 .sbss            sCommandHeap__9JASKernel */
 JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::sCommandHeap;
 
-/* 802909B8-80290AC0 28B2F8 0108+00 0/0 1/1 0/0 .text setupRootHeap__9JASKernelFP12JKRSolidHeapUl
- */
 void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) {
     JUT_ASSERT(784, heap);
     sSystemHeap = JKRExpHeap::create(size, heap, false);
@@ -267,26 +245,21 @@ void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) {
     JASDram = heap;
 }
 
-/* 80290AC0-80290AC8 -00001 0008+00 0/0 0/0 0/0 .text            getSystemHeap__9JASKernelFv */
 JKRHeap* JASKernel::getSystemHeap() {
     return JASKernel::sSystemHeap;
 }
 
-/* 80290AC8-80290AD0 -00001 0008+00 0/0 0/0 0/0 .text            getCommandHeap__9JASKernelFv */
 JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::getCommandHeap() {
     return JASKernel::sCommandHeap;
 }
 
-/* 804315DC-80431620 05E2FC 0044+00 3/3 0/0 0/0 .bss             audioAramHeap__9JASKernel */
 JASHeap JASKernel::audioAramHeap;
 
-/* 80290AD0-80290B08 28B410 0038+00 0/0 1/1 0/0 .text            setupAramHeap__9JASKernelFUlUl */
 void JASKernel::setupAramHeap(u32 param_0, u32 param_1) {
     sAramBase = param_0;
     audioAramHeap.initRootHeap((void*)sAramBase, param_1);
 }
 
-/* 80290B08-80290B14 28B448 000C+00 0/0 3/2 0/0 .text            getAramHeap__9JASKernelFv */
 JASHeap* JASKernel::getAramHeap() {
     return &audioAramHeap;
 }
diff --git a/src/JSystem/JAudio2/JASLfo.cpp b/src/JSystem/JAudio2/JASLfo.cpp
index d30edd5e55..d369072a15 100644
--- a/src/JSystem/JAudio2/JASLfo.cpp
+++ b/src/JSystem/JAudio2/JASLfo.cpp
@@ -1,16 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASLfo
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASLfo.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* ############################################################################################## */
 
-/* 8029BD14-8029BD44 296654 0030+00 1/1 1/1 0/0 .text            __ct__6JASLfoFv */
 JASLfo::JASLfo() {
     field_0x0 = 0;
     field_0x4 = 1;
@@ -21,9 +14,7 @@ JASLfo::JASLfo() {
     field_0x16 = 0;
 }
 
-/* ############################################################################################## */
 
-/* 8029BD44-8029BDD8 296684 0094+00 0/0 3/3 0/0 .text            getValue__6JASLfoCFv */
 f32 JASLfo::getValue() const {
     if (field_0x16) {
         return 0.0f;
@@ -36,9 +27,7 @@ f32 JASLfo::getValue() const {
     return mDepth * JMASinLap(field_0x8);
 }
 
-/* ############################################################################################## */
 
-/* 8029BDD8-8029BE2C 296718 0054+00 0/0 2/2 0/0 .text            incCounter__6JASLfoFf */
 void JASLfo::incCounter(f32 param_0) {
     if (field_0x16) {
         field_0x16--;
@@ -51,11 +40,8 @@ void JASLfo::incCounter(f32 param_0) {
     }
 }
 
-/* ############################################################################################## */
-/* 80431C40-80431C58 05E960 0018+00 2/2 1/1 0/0 .bss             sFreeRunLfo__6JASLfo */
 JASLfo JASLfo::sFreeRunLfo;
 
-/* 8029BE2C-8029BE6C 29676C 0040+00 0/0 1/1 0/0 .text            resetCounter__6JASLfoFv */
 void JASLfo::resetCounter() {
     field_0x16 = mDelay;
     switch (field_0x4) {
@@ -67,5 +53,3 @@ void JASLfo::resetCounter() {
         break;
     }
 }
-
-/* 8029BE6C-8029BE94 2967AC 0028+00 0/0 1/0 0/0 .text            __sinit_JASLfo_cpp */
diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/src/JSystem/JAudio2/JASOscillator.cpp
index 210510fcf7..537ef7e598 100644
--- a/src/JSystem/JAudio2/JASOscillator.cpp
+++ b/src/JSystem/JAudio2/JASOscillator.cpp
@@ -1,13 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASOscillator
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASOscillator.h"
 
-/* 8029BE94-8029BEC4 2967D4 0030+00 0/0 1/1 0/0 .text            __ct__13JASOscillatorFv */
 JASOscillator::JASOscillator() {
     mData = NULL;
     _14 = 0;
@@ -20,10 +14,7 @@ JASOscillator::JASOscillator() {
     _04 = 0.0f;
 }
 
-/* ############################################################################################## */
 
-/* 8029BEC4-8029BF68 296804 00A4+00 0/0 1/1 0/0 .text
- * initStart__13JASOscillatorFPCQ213JASOscillator4Data          */
 void JASOscillator::initStart(JASOscillator::Data const* data) {
     mData = data;
     _04 = 0.0f;
@@ -47,7 +38,6 @@ void JASOscillator::initStart(JASOscillator::Data const* data) {
     _1C = 1;
 }
 
-/* 8029BF68-8029BFC8 2968A8 0060+00 0/0 1/1 0/0 .text            incCounter__13JASOscillatorFf */
 void JASOscillator::incCounter(f32 param_0) {
     const short* v1;
 	switch (_1C) {
@@ -61,12 +51,10 @@ void JASOscillator::incCounter(f32 param_0) {
     update();
 }
 
-/* 8029BFC8-8029BFE4 296908 001C+00 0/0 1/1 0/0 .text            getValue__13JASOscillatorCFv */
 f32 JASOscillator::getValue() const {
 	return _08 * mData->mScale + mData->_14;
 }
 
-/* 8029BFE4-8029C0E0 296924 00FC+00 0/0 1/1 0/0 .text            release__13JASOscillatorFv */
 void JASOscillator::release() {
 	if (mData->_0C == NULL && mDirectRelease == 0) {
         stop();
@@ -96,7 +84,6 @@ void JASOscillator::release() {
     update();
 }
 
-/* 8029C0E0-8029C2C0 296A20 01E0+00 2/2 1/1 0/0 .text            update__13JASOscillatorFv */
 void JASOscillator::update() {
     if (_1C == 4) {
         s16 x = mDirectRelease & 0x3FFF;
@@ -149,15 +136,11 @@ void JASOscillator::update() {
     updateCurrentValue(psVar1[_14]._2);
 }
 
-/* ############################################################################################## */
-/* 8039B1D0-8039B214 027830 0044+00 1/0 0/0 0/0 .rodata          sCurveTableLinear__13JASOscillator
- */
 f32 const JASOscillator::sCurveTableLinear[17] = {
     1.0, 0.9375, 0.875, 0.8125, 0.75, 0.6875, 0.625, 0.5625, 0.5,
     0.4375, 0.375, 0.3125, 0.25, 0.1875, 0.125, 0.0625, 0.0,
 };
 
-/* 8039B214-8039B258 027874 0044+00 1/0 0/0 0/0 .rodata sCurveTableSampleCell__13JASOscillator */
 f32 const JASOscillator::sCurveTableSampleCell[17] = {
     1.0, 0.9704890251159668, 0.7812740206718445, 0.5462809801101685, 0.39979198575019836, 
     0.28931498527526855, 0.21210399270057678, 0.15747599303722382, 0.1126129999756813, 0.08178959786891937, 
@@ -165,23 +148,18 @@ f32 const JASOscillator::sCurveTableSampleCell[17] = {
     0.00915555004030466, 0.0
 };
 
-/* 8039B258-8039B29C 0278B8 0044+00 1/0 0/0 0/0 .rodata          sCurveTableSqRoot__13JASOscillator
- */
 f32 const JASOscillator::sCurveTableSqRoot[17] = {
     1.0, 0.8789060115814209, 0.765625, 0.6601560115814209, 0.5625, 0.4726560115814209,
     0.390625, 0.3164060115814209, 0.25, 0.1914059966802597, 0.140625, 0.09765619784593582,
     0.0625, 0.03515620157122612, 0.015625, 0.00390625, 0.0
 };
 
-/* 8039B29C-8039B2E0 0278FC 0044+00 1/0 0/0 0/0 .rodata          sCurveTableSquare__13JASOscillator
- */
 f32 const JASOscillator::sCurveTableSquare[17] = {
     1.0, 0.9682459831237793, 0.9354140162467957, 0.9013879895210266, 0.8660249710083008,
     0.8291559815406799, 0.790569007396698, 0.75, 0.7071070075035095, 0.66143798828125,
     0.6123719811439514, 0.55901700258255, 0.5, 0.433012992143631, 0.35355299711227417, 0.25, 0.0,
 };
 
-/* 803C78A8-803C78B8 -00001 0010+00 1/1 0/0 0/0 .data            table_list$151 */
 static f32* table_list[4] = {
     (f32*)JASOscillator::sCurveTableLinear,
     (f32*)JASOscillator::sCurveTableSquare,
@@ -189,7 +167,6 @@ static f32* table_list[4] = {
     (f32*)JASOscillator::sCurveTableSampleCell,
 };
 
-/* 8029C2C0-8029C388 296C00 00C8+00 1/1 0/0 0/0 .text updateCurrentValue__13JASOscillatorFf */
 void JASOscillator::updateCurrentValue(f32 param_0) {
     f32* table = table_list[_18];
     f32 fVar1 = 16.0f * (_04 / param_0);
diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/src/JSystem/JAudio2/JASProbe.cpp
index 9b16b7b4ec..3fcbcc6112 100644
--- a/src/JSystem/JAudio2/JASProbe.cpp
+++ b/src/JSystem/JAudio2/JASProbe.cpp
@@ -1,14 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASProbe
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASProbe.h"
 #include "dolphin/os.h"
 
-/* 80290D74-80290DC4 28B6B4 0050+00 1/1 0/0 0/0 .text            start__8JASProbeFPCc */
 void JASProbe::start(char const* name) {
 	volatile BOOL interrupts = OSDisableInterrupts();
 	mName          = name;
@@ -16,9 +10,7 @@ void JASProbe::start(char const* name) {
 	OSRestoreInterrupts(interrupts);
 }
 
-/* ############################################################################################## */
 
-/* 80290DC4-80290EE4 28B704 0120+00 1/1 0/0 0/0 .text            stop__8JASProbeFv */
 void JASProbe::stop() {
 	volatile int interrupts = OSDisableInterrupts();
 	_08            = (u32)OSGetTime() - mStartTime;
@@ -35,11 +27,8 @@ void JASProbe::stop() {
 	OSRestoreInterrupts(interrupts);
 }
 
-/* ############################################################################################## */
-/* 80431620-80431660 05E340 0040+00 2/2 0/0 0/0 .bss             sProbeTable__8JASProbe */
 JASProbe* JASProbe::sProbeTable[16];
 
-/* 80290EE4-80290F24 28B824 0040+00 0/0 7/7 0/0 .text            start__8JASProbeFlPCc */
 void JASProbe::start(s32 index, char const* name) {
     if (index < 16) {
         if (sProbeTable[index] != NULL) {
@@ -48,7 +37,6 @@ void JASProbe::start(s32 index, char const* name) {
     }
 }
 
-/* 80290F24-80290F64 28B864 0040+00 0/0 6/6 0/0 .text            stop__8JASProbeFl */
 void JASProbe::stop(s32 index) {
     if (index < 16) {
         if (sProbeTable[index] != NULL) {
diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/src/JSystem/JAudio2/JASRegisterParam.cpp
index 8a374df909..c619042106 100644
--- a/src/JSystem/JAudio2/JASRegisterParam.cpp
+++ b/src/JSystem/JAudio2/JASRegisterParam.cpp
@@ -1,30 +1,20 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASRegisterParam
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASRegisterParam.h"
 
-/* 80293644-80293664 28DF84 0020+00 0/0 1/1 0/0 .text            __ct__16JASRegisterParamFv */
 JASRegisterParam::JASRegisterParam() {
     for (int i = 0; i < 14; i++) {
         field_0x0[i] = 0;
     }
 }
 
-/* 80293664-80293684 28DFA4 0020+00 0/0 1/1 0/0 .text            init__16JASRegisterParamFv */
 void JASRegisterParam::init() {
     for (int i = 0; i < 14; i++) {
         field_0x0[i] = 0;
     }
 }
 
-/* ############################################################################################## */
 
-/* 80293684-802937B8 28DFC4 0134+00 1/0 4/4 0/0 .text
- * write__16JASRegisterParamFQ216JASRegisterParam5RegIDUl       */
 void JASRegisterParam::write(JASRegisterParam::RegID param_0, u32 param_1) {
     if (param_0 < 14) {
         if (param_0 <= 2) {
@@ -80,10 +70,7 @@ void JASRegisterParam::write(JASRegisterParam::RegID param_0, u32 param_1) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 802937B8-802938BC 28E0F8 0104+00 1/0 1/1 0/0 .text
- * read__16JASRegisterParamFQ216JASRegisterParam5RegID          */
 u32 JASRegisterParam::read(JASRegisterParam::RegID param_0) {
     if (param_0 < 14) {
         return field_0x0[param_0];
diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp
index e38f887d25..cc4a65c75c 100644
--- a/src/JSystem/JAudio2/JASReport.cpp
+++ b/src/JSystem/JAudio2/JASReport.cpp
@@ -8,22 +8,16 @@
 #include "JSystem/JAudio2/JASMutex.h"
 #include "stdio.h"
 
-/* 80431660-80431678 05E380 0018+00 1/1 0/0 0/0 .bss             sMutex */
 static OSMutex sMutex;
 
-/* 80451220-80451224 000720 0004+00 1/1 0/0 0/0 .sbss            sBuffer */
 static char* sBuffer;
 
-/* 80451224-80451228 000724 0004+00 1/1 0/0 0/0 .sbss            sLineMax */
 static int sLineMax;
 
-/* 80451228-8045122C 000728 0004+00 1/1 0/0 0/0 .sbss            sLineCount */
 static int sLineCount;
 
-/* 8045122C-80451230 00072C 0004+00 1/1 0/0 0/0 .sbss            sTop */
 static int sTop;
 
-/* 80290F64-80291060 28B8A4 00FC+00 0/0 5/5 0/0 .text            JASReport__FPCce */
 void JASReport(const char * str, ...) {
     if(sBuffer) {
         va_list vl;
diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/src/JSystem/JAudio2/JASResArcLoader.cpp
index 7c98e2aacb..a931ad9239 100644
--- a/src/JSystem/JAudio2/JASResArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASResArcLoader.cpp
@@ -10,8 +10,6 @@
 #include "JSystem/JAudio2/JASTaskThread.h"
 
 
-/* 80290BD0-80290C04 28B510 0034+00 0/0 2/2 0/0 .text
- * getResSize__15JASResArcLoaderFPC10JKRArchiveUs               */
 size_t JASResArcLoader::getResSize(JKRArchive const* i_archiveP, u16 i_resourceID) {    
     JKRArchive::SDIFileEntry* file = i_archiveP->findIdResource(i_resourceID);
 
@@ -22,8 +20,6 @@ size_t JASResArcLoader::getResSize(JKRArchive const* i_archiveP, u16 i_resourceI
     return file->data_size;
 }
 
-/* 80290C04-80290C7C 28B544 0078+00 0/0 1/1 0/0 .text
- * getResMaxSize__15JASResArcLoaderFPC10JKRArchive              */
 size_t JASResArcLoader::getResMaxSize(JKRArchive const* i_archiveP) {
     u32 maxSize, index;
     u32 fileEntries = i_archiveP->countFile();
@@ -40,8 +36,6 @@ size_t JASResArcLoader::getResMaxSize(JKRArchive const* i_archiveP) {
     return maxSize;
 }
 
-/* 80290C7C-80290D18 28B5BC 009C+00 1/1 0/0 0/0 .text loadResourceCallback__15JASResArcLoaderFPv
- */
 static void JASResArcLoader::loadResourceCallback(void* args) {
     CallbackArgs* castedArgs = static_cast<CallbackArgs*>(args);
 	u32 readResult           = castedArgs->mArchive->readResource(castedArgs->mBuffer, castedArgs->mBufferSize, castedArgs->mID);
@@ -60,8 +54,6 @@ static void JASResArcLoader::loadResourceCallback(void* args) {
 	}
 }
 
-/* 80290D18-80290D74 28B658 005C+00 0/0 1/1 0/0 .text
- * loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl */
 
 int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, u32 cbArg)
 {
diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/src/JSystem/JAudio2/JASSeqCtrl.cpp
index 77047a384e..ad4f341869 100644
--- a/src/JSystem/JAudio2/JASSeqCtrl.cpp
+++ b/src/JSystem/JAudio2/JASSeqCtrl.cpp
@@ -1,19 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASSeqCtrl
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASSeqCtrl.h"
 #include "JSystem/JAudio2/JASSeqParser.h"
 #include "JSystem/JAudio2/JASTrack.h"
 
-/* ############################################################################################## */
-/* 80451238-80451240 000738 0004+04 3/3 0/0 0/0 .sbss            sDefaultParser__10JASSeqCtrl */
 JASSeqParser JASSeqCtrl::sDefaultParser;
 
-/* 802938BC-80293924 28E1FC 0068+00 0/0 1/1 0/0 .text            __ct__10JASSeqCtrlFv */
 JASSeqCtrl::JASSeqCtrl() {
     mReader.init();
     field_0x3c = &sDefaultParser;
@@ -29,7 +21,6 @@ JASSeqCtrl::JASSeqCtrl() {
     mReader.init();
 }
 
-/* 80293924-80293980 28E264 005C+00 0/0 1/1 0/0 .text            init__10JASSeqCtrlFv */
 void JASSeqCtrl::init() {
     mReader.init();
     field_0x3c = &sDefaultParser;
@@ -44,14 +35,11 @@ void JASSeqCtrl::init() {
     field_0x51 = 0;
 }
 
-/* 80293980-802939C4 28E2C0 0044+00 0/0 1/1 0/0 .text            start__10JASSeqCtrlFPvUl */
 void JASSeqCtrl::start(void* param_0, u32 param_1) {
     mReader.init(param_0);
     mReader.jump(param_1);
 }
 
-/* 802939C4-80293ABC 28E304 00F8+00 0/0 1/1 0/0 .text            tickProc__10JASSeqCtrlFP8JASTrack
- */
 int JASSeqCtrl::tickProc(JASTrack* param_0) {
     if (!mReader.getBase()) {
         return 0;
@@ -83,25 +71,20 @@ int JASSeqCtrl::tickProc(JASTrack* param_0) {
     return 0;
 }
 
-/* 80293ABC-80293AE0 28E3FC 0024+00 2/2 2/2 0/0 .text
- * interrupt__10JASSeqCtrlFQ210JASSeqCtrl8IntrType              */
 void JASSeqCtrl::interrupt(JASSeqCtrl::IntrType param_0) {
     if (field_0x4e & (1 << param_0)) {
         field_0x4c |= (1 << param_0);
     }
 }
 
-/* 80293AE0-80293AF0 28E420 0010+00 0/0 1/1 0/0 .text            setIntrMask__10JASSeqCtrlFUl */
 void JASSeqCtrl::setIntrMask(u32 param_0) {
     field_0x4e |= param_0;
 }
 
-/* 80293AF0-80293B00 28E430 0010+00 0/0 1/1 0/0 .text            clrIntrMask__10JASSeqCtrlFUl */
 void JASSeqCtrl::clrIntrMask(u32 param_0) {
     field_0x4e &= ~param_0;
 }
 
-/* 80293B00-80293B28 28E440 0028+00 0/0 1/1 0/0 .text            retIntr__10JASSeqCtrlFv */
 int JASSeqCtrl::retIntr() {
     if (field_0x44 == NULL) {
         return 0;
@@ -112,7 +95,6 @@ int JASSeqCtrl::retIntr() {
     return 1;
 }
 
-/* 80293B28-80293B78 28E468 0050+00 1/1 0/0 0/0 .text            findIntr__10JASSeqCtrlFv */
 int JASSeqCtrl::findIntr() {
     u32 uVar1 = field_0x4e & field_0x4c;
     for (int i = 0; uVar1 != 0; uVar1 >>= 1, i++) {
@@ -124,7 +106,6 @@ int JASSeqCtrl::findIntr() {
     return -1;
 }
 
-/* 80293B78-80293BE8 28E4B8 0070+00 1/1 2/2 0/0 .text            checkIntr__10JASSeqCtrlFv */
 void JASSeqCtrl::checkIntr() {
     if (field_0x44) return;
     int intr = findIntr();
@@ -138,7 +119,6 @@ void JASSeqCtrl::checkIntr() {
     mReader.jump(uVar1);
 }
 
-/* 80293BE8-80293C6C 28E528 0084+00 1/1 0/0 0/0 .text            timerProcess__10JASSeqCtrlFv */
 void JASSeqCtrl::timerProcess() {
     if (field_0x54 == 0) return;
     
@@ -156,5 +136,3 @@ void JASSeqCtrl::timerProcess() {
         field_0x54 = field_0x58;
     }
 }
-
-/* ############################################################################################## */
diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/src/JSystem/JAudio2/JASSeqParser.cpp
index bf04529a02..251debee5d 100644
--- a/src/JSystem/JAudio2/JASSeqParser.cpp
+++ b/src/JSystem/JAudio2/JASSeqParser.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASSeqParser
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASSeqParser.h"
@@ -14,7 +9,6 @@
 #include "JSystem/JUtility/JUTAssert.h"
 
 
-/* 803C5E80-803C6480 022FA0 0600+00 1/2 0/0 0/0 .data            sCmdInfo__12JASSeqParser */
 JASSeqParser::CmdInfo JASSeqParser::sCmdInfo[96] = {
     NULL, 0x0000, 0x0000,
     NULL, 0x0000, 0x0000,
@@ -114,7 +108,6 @@ JASSeqParser::CmdInfo JASSeqParser::sCmdInfo[96] = {
     &JASSeqParser::cmdFinish, 0x0000, 0x0000,
 };
 
-/* 803C648C-803C747C 0235AC 0FF0+00 1/2 0/0 0/0 .data            sExtCmdInfo__12JASSeqParser */
 JASSeqParser::CmdInfo JASSeqParser::sExtCmdInfo[255] = {
     NULL, 0x0000, 0x0000,
     &JASSeqParser::cmdDump, 0x0000, 0x0000,
@@ -125,8 +118,6 @@ JASSeqParser::CmdInfo JASSeqParser::sExtCmdInfo[255] = {
     NULL, 0x0000, 0x0000,
 };
 
-/* 80293CF4-80293DC4 28E634 00D0+00 3/3 0/0 0/0 .text
- * conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition */
 bool JASSeqParser::conditionCheck(JASTrack* param_0, JASSeqParser::BranchCondition param_1) {
     u16 reg = readReg(param_0, 3);
     switch (param_1) {
@@ -148,7 +139,6 @@ bool JASSeqParser::conditionCheck(JASTrack* param_0, JASSeqParser::BranchConditi
     }
 }
 
-/* 80293DC4-80293FC8 28E704 0204+00 8/7 0/0 0/0 .text writeReg__12JASSeqParserFP8JASTrackUlUl */
 void JASSeqParser::writeReg(JASTrack* param_0, u32 param_1, u32 param_2) {
     param_0->writeReg(JASRegisterParam::REG3, param_2);
     if (param_1 < 0x40) {
@@ -241,7 +231,6 @@ void JASSeqParser::writeReg(JASTrack* param_0, u32 param_1, u32 param_2) {
     }
 }
 
-/* 80293FC8-80294188 28E908 01C0+00 7/6 0/0 0/0 .text readReg__12JASSeqParserCFP8JASTrackUl */
 u32 JASSeqParser::readReg(JASTrack* param_0, u32 param_1) const {
     if (param_1 < 0x40) {
         return param_0->readReg(JASRegisterParam::RegID(param_1));
@@ -345,8 +334,6 @@ u32 JASSeqParser::readReg(JASTrack* param_0, u32 param_1) const {
     return result;
 }
 
-/* 80294188-802941F0 28EAC8 0068+00 1/0 0/0 0/0 .text cmdOpenTrack__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdOpenTrack(JASTrack* param_0, u32* param_1) {
     u32 r29 = param_1[0];
     u32 r28 = param_1[1];
@@ -360,20 +347,16 @@ s32 JASSeqParser::cmdOpenTrack(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802941F0-8029421C 28EB30 002C+00 1/0 0/0 0/0 .text cmdCloseTrack__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdCloseTrack(JASTrack* param_0, u32* param_1) {
     param_0->closeChild(*param_1);
     return 0;
 }
 
-/* 8029421C-80294248 28EB5C 002C+00 1/0 0/0 0/0 .text cmdCall__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdCall(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->call(*param_1);
     return 0;
 }
 
-/* 80294248-8029429C 28EB88 0054+00 1/0 0/0 0/0 .text cmdCallF__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdCallF(JASTrack* param_0, u32* param_1) {
     if (conditionCheck(param_0, BranchCondition(param_1[0]))) {
         param_0->getSeqCtrl()->call(param_1[1]);
@@ -381,7 +364,6 @@ s32 JASSeqParser::cmdCallF(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 8029429C-802942D4 28EBDC 0038+00 1/0 0/0 0/0 .text cmdRet__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdRet(JASTrack* param_0, u32* param_1) {
     if (!param_0->getSeqCtrl()->ret()) {
         JUT_WARN(718, "%s", "cannot ret for call-stack is NULL");
@@ -390,7 +372,6 @@ s32 JASSeqParser::cmdRet(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802942D4-80294328 28EC14 0054+00 1/0 0/0 0/0 .text cmdRetF__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdRetF(JASTrack* param_0, u32* param_1) {
     if (conditionCheck(param_0, BranchCondition(param_1[0]))) {
         if (!param_0->getSeqCtrl()->ret()) {
@@ -401,13 +382,11 @@ s32 JASSeqParser::cmdRetF(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294328-80294340 28EC68 0018+00 1/0 0/0 0/0 .text cmdJmp__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdJmp(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->jump(param_1[0]);
     return 0;
 }
 
-/* 80294340-80294398 28EC80 0058+00 1/0 0/0 0/0 .text cmdJmpF__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdJmpF(JASTrack* param_0, u32* param_1) {
     if (conditionCheck(param_0, BranchCondition(param_1[0]))) {
         param_0->getSeqCtrl()->jump(param_1[1]);
@@ -415,7 +394,6 @@ s32 JASSeqParser::cmdJmpF(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294398-802943CC 28ECD8 0034+00 1/0 0/0 0/0 .text cmdJmpTable__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdJmpTable(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u32 uVar1 = param_1[0];
@@ -424,8 +402,6 @@ s32 JASSeqParser::cmdJmpTable(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802943CC-8029441C 28ED0C 0050+00 1/0 0/0 0/0 .text cmdCallTable__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdCallTable(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u32 uVar1 = param_1[0];
@@ -434,52 +410,42 @@ s32 JASSeqParser::cmdCallTable(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 8029441C-80294448 28ED5C 002C+00 1/0 0/0 0/0 .text cmdLoopS__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdLoopS(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->loopStart(param_1[0]);
     return 0;
 }
 
-/* 80294448-80294470 28ED88 0028+00 1/0 0/0 0/0 .text cmdLoopE__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdLoopE(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->loopEnd();
     return 0;
 }
 
-/* 80294470-802944B4 28EDB0 0044+00 1/0 0/0 0/0 .text cmdNote__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdNote(JASTrack* param_0, u32* param_1) {
     execNoteOnGate(param_0, param_1[1], param_1[2], param_1[3], param_1[0]);
     return 0;
 }
 
-/* 802944B4-802944F4 28EDF4 0040+00 1/0 0/0 0/0 .text cmdNoteOn__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdNoteOn(JASTrack* param_0, u32* param_1) {
     execNoteOnMidi(param_0, param_1[1], param_1[0], param_1[2]);
     return 0;
 }
 
-/* 802944F4-80294528 28EE34 0034+00 1/0 0/0 0/0 .text cmdNoteOff__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdNoteOff(JASTrack* param_0, u32* param_1) {
     execNoteOff(param_0, param_1[0]);
     return 0;
 }
 
-/* 80294528-80294588 28EE68 0060+00 1/0 0/0 0/0 .text cmdReadPort__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdReadPort(JASTrack* param_0, u32* param_1) {
     u16 tmp = param_0->readPortSelf(param_1[0]);
     writeReg(param_0, param_1[1], tmp);
     return 0;
 }
 
-/* 80294588-802945BC 28EEC8 0034+00 1/0 0/0 0/0 .text cmdWritePort__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdWritePort(JASTrack* param_0, u32* param_1) {
     param_0->writePortSelf(param_1[0], param_1[1]);
     return 0;
 }
 
-/* 802945BC-802945F8 28EEFC 003C+00 1/0 0/0 0/0 .text
- * cmdParentWritePort__12JASSeqParserFP8JASTrackPUl             */
 s32 JASSeqParser::cmdParentWritePort(JASTrack* param_0, u32* param_1) {
     {
         u32* p1 = param_1;
@@ -494,8 +460,6 @@ s32 JASSeqParser::cmdParentWritePort(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802945F8-80294644 28EF38 004C+00 1/0 0/0 0/0 .text
- * cmdChildWritePort__12JASSeqParserFP8JASTrackPUl              */
 s32 JASSeqParser::cmdChildWritePort(JASTrack* param_0, u32* param_1) {
     {
         u8 val = param_1[0];
@@ -509,8 +473,6 @@ s32 JASSeqParser::cmdChildWritePort(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294644-802946AC 28EF84 0068+00 1/0 0/0 0/0 .text
- * cmdParentReadPort__12JASSeqParserFP8JASTrackPUl              */
 s32 JASSeqParser::cmdParentReadPort(JASTrack* param_0, u32* param_1) {
     u32* p1 = param_1;
     u32* p2 = param_1 + 1;
@@ -524,8 +486,6 @@ s32 JASSeqParser::cmdParentReadPort(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802946AC-80294724 28EFEC 0078+00 1/0 0/0 0/0 .text
- * cmdChildReadPort__12JASSeqParserFP8JASTrackPUl               */
 s32 JASSeqParser::cmdChildReadPort(JASTrack* param_0, u32* param_1) {
     u8 val = param_1[0];
     u32* p2 = param_1 + 1;
@@ -539,23 +499,18 @@ s32 JASSeqParser::cmdChildReadPort(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294724-80294770 28F064 004C+00 1/0 0/0 0/0 .text
- * cmdCheckPortImport__12JASSeqParserFP8JASTrackPUl             */
 s32 JASSeqParser::cmdCheckPortImport(JASTrack* param_0, u32* param_1) {
     u8 tmp = param_0->checkPortIn(param_1[0]);
     param_0->writeReg(JASRegisterParam::REG3, tmp);
     return 0;
 }
 
-/* 80294770-802947BC 28F0B0 004C+00 1/0 0/0 0/0 .text
- * cmdCheckPortExport__12JASSeqParserFP8JASTrackPUl             */
 s32 JASSeqParser::cmdCheckPortExport(JASTrack* param_0, u32* param_1) {
     u8 tmp = param_0->checkPort(param_1[0]);
     param_0->writeReg(JASRegisterParam::REG3, tmp);
     return 0;
 }
 
-/* 802947BC-802947F4 28F0FC 0038+00 1/0 0/0 0/0 .text cmdWait__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdWait(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     int midiValue = seqCtrl->readMidiValue();
@@ -563,15 +518,12 @@ s32 JASSeqParser::cmdWait(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802947F4-80294804 28F134 0010+00 1/0 0/0 0/0 .text cmdWaitByte__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdWaitByte(JASTrack* param_0, u32* param_1) {
     u32 val = param_1[0];
     param_0->getSeqCtrl()->wait(val);
     return 0;
 }
 
-/* 80294804-8029483C 28F144 0038+00 1/0 0/0 0/0 .text cmdSetLastNote__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdSetLastNote(JASTrack* param_0, u32* param_1) {
     u32 r31 = param_1[0];
     if (r31 < 256) {
@@ -582,56 +534,42 @@ s32 JASSeqParser::cmdSetLastNote(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 8029483C-8029488C 28F17C 0050+00 1/0 0/0 0/0 .text cmdEnvScaleSet__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdEnvScaleSet(JASTrack* param_0, u32* param_1) {
     param_0->setOscScale(param_1[0], param_1[1] / 16383.0f);
     return 0;
 }
 
 
-/* 8029488C-802948C8 28F1CC 003C+00 1/0 0/0 0/0 .text cmdEnvSet__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdEnvSet(JASTrack* param_0, u32* param_1) {
     param_0->setOscTable(param_1[0], (JASOscillator::Point*)param_0->getSeqCtrl()->getAddr(param_1[1]));
     return 0;
 }
 
-/* 802948C8-8029491C 28F208 0054+00 1/0 0/0 0/0 .text cmdSimpleADSR__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdSimpleADSR(JASTrack* param_0, u32* param_1) {
     param_0->setOscAdsr(param_1[0], param_1[1], param_1[2], param_1[3], param_1[4]);
     return 0;
 }
 
-/* 8029491C-8029494C 28F25C 0030+00 1/0 0/0 0/0 .text cmdBusConnect__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdBusConnect(JASTrack* param_0, u32* param_1) {
     param_0->connectBus(param_1[0], param_1[1]);
     return 0;
 }
 
-/* 8029494C-8029495C 28F28C 0010+00 1/0 0/0 0/0 .text cmdSetIntTable__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdSetIntTable(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->setIntrTable(param_1[0]);
     return 0;
 }
 
-/* 8029495C-80294988 28F29C 002C+00 1/0 0/0 0/0 .text
- * cmdSetInterrupt__12JASSeqParserFP8JASTrackPUl                */
 s32 JASSeqParser::cmdSetInterrupt(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->setIntrMask(param_1[0]);
     return 0;
 }
 
-/* 80294988-802949B4 28F2C8 002C+00 1/0 0/0 0/0 .text
- * cmdDisInterrupt__12JASSeqParserFP8JASTrackPUl                */
 s32 JASSeqParser::cmdDisInterrupt(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->clrIntrMask(param_1[0]);
     return 0;
 }
 
-/* 802949B4-802949E4 28F2F4 0030+00 1/0 0/0 0/0 .text cmdClrI__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdClrI(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     seqCtrl->clrIntr();
@@ -639,7 +577,6 @@ s32 JASSeqParser::cmdClrI(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 802949E4-80294A20 28F324 003C+00 1/0 0/0 0/0 .text cmdRetI__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdRetI(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     seqCtrl->retIntr();
@@ -647,16 +584,13 @@ s32 JASSeqParser::cmdRetI(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294A20-80294A3C 28F360 001C+00 1/0 0/0 0/0 .text cmdIntTimer__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdIntTimer(JASTrack* param_0, u32* param_1) {
     param_0->getSeqCtrl()->setIntrTimer(param_1[0], param_1[1]);
     return 0;
 }
 
-/* 80451240-80451244 000740 0004+00 1/1 1/1 0/0 .sbss            sCallBackFunc__12JASSeqParser */
 u16 (*JASSeqParser::sCallBackFunc)(JASTrack*, u16);
 
-/* 80294A3C-80294AA4 28F37C 0068+00 1/0 0/0 0/0 .text cmdSyncCPU__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdSyncCPU(JASTrack* param_0, u32* param_1) {
     u16 r31 = 0xffff;
     if (sCallBackFunc) {
@@ -666,30 +600,25 @@ s32 JASSeqParser::cmdSyncCPU(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294AA4-80294AD4 28F3E4 0030+00 1/0 0/0 0/0 .text cmdTempo__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdTempo(JASTrack* param_0, u32* param_1) {
     param_0->setTempo(param_1[0]);
     return 0;
 }
 
-/* 80294AD4-80294ADC 28F414 0008+00 1/0 0/0 0/0 .text cmdFinish__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdFinish(JASTrack* param_0, u32* param_1) {
     return -1;
 }
 
-/* 80294ADC-80294AE4 28F41C 0008+00 1/0 0/0 0/0 .text cmdNop__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdNop(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294AE4-80294B1C 28F424 0038+00 1/0 0/0 0/0 .text cmdFIRSet__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdFIRSet(JASTrack* param_0, u32* param_1) {
     s16* addr = (s16*)param_0->getSeqCtrl()->getAddr(param_1[0]);
     param_0->setFIR(addr);
     return 0;
 }
 
-/* 80294B1C-80294B70 28F45C 0054+00 1/0 0/0 0/0 .text cmdIIRSet__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdIIRSet(JASTrack* param_0, u32* param_1) {
     s16 stack_10[4];
     for (int i = 0; i < 4; i++) {
@@ -699,8 +628,6 @@ s32 JASSeqParser::cmdIIRSet(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294B70-80294BB4 28F4B0 0044+00 1/0 0/0 0/0 .text cmdIIRCutOff__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdIIRCutOff(JASTrack* param_0, u32* param_1) {
     u32 r31 = param_1[0];
     if (r31 < 128) {
@@ -711,7 +638,6 @@ s32 JASSeqParser::cmdIIRCutOff(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294BB4-80294BD0 28F4F4 001C+00 1/0 0/0 0/0 .text cmdBankPrg__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdBankPrg(JASTrack* param_0, u32* param_1) {
     u16 r31 = JSULoHalf(param_1[0]);
     param_0->setBankNumber(JSUHiByte(r31));
@@ -719,19 +645,16 @@ s32 JASSeqParser::cmdBankPrg(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294BD0-80294BE4 28F510 0014+00 1/0 0/0 0/0 .text cmdBank__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdBank(JASTrack* param_0, u32* param_1) {
     param_0->setBankNumber(param_1[0] & 0xff);
     return 0;
 }
 
-/* 80294BE4-80294BF8 28F524 0014+00 1/0 0/0 0/0 .text cmdPrg__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdPrg(JASTrack* param_0, u32* param_1) {
     param_0->setProgNumber(param_1[0] & 0xff);
     return 0;
 }
 
-/* 80294BF8-80294C54 28F538 005C+00 1/0 0/0 0/0 .text cmdParamI__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdParamI(JASTrack* param_0, u32* param_1) {
     s16 val = param_1[1];
     param_0->setParam(param_1[0], val / 32767.0f, 0);
@@ -739,7 +662,6 @@ s32 JASSeqParser::cmdParamI(JASTrack* param_0, u32* param_1) {
 }
 
 
-/* 80294C54-80294CB0 28F594 005C+00 1/0 0/0 0/0 .text cmdParamII__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdParamII(JASTrack* param_0, u32* param_1) {
     s16 val = param_1[1];
     param_0->setParam(param_1[0], val / 32767.0f, param_1[2]);
@@ -747,7 +669,6 @@ s32 JASSeqParser::cmdParamII(JASTrack* param_0, u32* param_1) {
 }
 
 
-/* 80294CB0-80294D2C 28F5F0 007C+00 1/0 0/0 0/0 .text cmdParamE__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdParamE(JASTrack* param_0, u32* param_1) {
     s32* r31 = (s32*)param_1 + 1;
     s16 r30 = *r31 << 8;
@@ -759,7 +680,6 @@ s32 JASSeqParser::cmdParamE(JASTrack* param_0, u32* param_1) {
 }
 
 
-/* 80294D2C-80294DA8 28F66C 007C+00 1/0 0/0 0/0 .text cmdParamEI__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdParamEI(JASTrack* param_0, u32* param_1) {
     s32* r31 = (s32*)param_1 + 1;
     s16 r30 = *r31 << 8;
@@ -770,7 +690,6 @@ s32 JASSeqParser::cmdParamEI(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294DA8-80294F10 28F6E8 0168+00 3/0 0/0 0/0 .text cmdReg__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdReg(JASTrack* param_0, u32* param_1) {
     u32 val = param_1[0];
     u32 r29 = param_1[1];
@@ -820,7 +739,6 @@ s32 JASSeqParser::cmdReg(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294F10-80294F40 28F850 0030+00 1/0 0/0 0/0 .text cmdRegLoad__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdRegLoad(JASTrack* param_0, u32* param_1) {
     u32 val1 = param_1[0];
     u32 val2 = param_1[1];
@@ -828,7 +746,6 @@ s32 JASSeqParser::cmdRegLoad(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294F40-80294FB4 28F880 0074+00 1/0 0/0 0/0 .text cmdRegUni__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdRegUni(JASTrack* param_0, u32* param_1) {
     u32 val1 = param_1[0];
     u32 r31 = param_1[1];
@@ -845,8 +762,6 @@ s32 JASSeqParser::cmdRegUni(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80294FB4-80295088 28F8F4 00D4+00 1/0 0/0 0/0 .text cmdRegTblLoad__12JASSeqParserFP8JASTrackPUl
- */
 s32 JASSeqParser::cmdRegTblLoad(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u32 p0 = param_1[0];
@@ -881,7 +796,6 @@ s32 JASSeqParser::cmdRegTblLoad(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80295088-8029526C 28F9C8 01E4+00 1/0 0/0 0/0 .text cmdDump__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdDump(JASTrack* param_0, u32* param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     JASReport("--------------- JASTrack (%8x) dump ----------------", param_0);
@@ -898,7 +812,6 @@ s32 JASSeqParser::cmdDump(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 8029526C-80295498 28FBAC 022C+00 1/0 0/0 0/0 .text cmdPrintf__12JASSeqParserFP8JASTrackPUl */
 s32 JASSeqParser::cmdPrintf(JASTrack* param_0, u32* param_1) {
     u8 stack_c[4];
     u32 stack_10[4];
@@ -968,8 +881,6 @@ s32 JASSeqParser::cmdPrintf(JASTrack* param_0, u32* param_1) {
     return 0;
 }
 
-/* 80295498-80295540 28FDD8 00A8+00 1/0 0/0 0/0 .text
- * execNoteOnGate__12JASSeqParserFP8JASTrackUlUlUlUl            */
 s32 JASSeqParser::execNoteOnGate(JASTrack* param_0, u32 param_1, u32 param_2, u32 param_3,
                                  u32 param_4) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
@@ -1001,25 +912,19 @@ s32 JASSeqParser::execNoteOnGate(JASTrack* param_0, u32 param_1, u32 param_2, u3
     return result;
 }
 
-/* 80295540-80295570 28FE80 0030+00 1/0 0/0 0/0 .text
- * execNoteOnMidi__12JASSeqParserFP8JASTrackUlUlUl              */
 s32 JASSeqParser::execNoteOnMidi(JASTrack* param_0, u32 param_1, u32 param_2, u32 param_3) {
      return param_0->noteOn(param_1, param_2, param_3);
 }
 
-/* 80295570-8029559C 28FEB0 002C+00 1/0 0/0 0/0 .text execNoteOff__12JASSeqParserFP8JASTrackUl */
 s32 JASSeqParser::execNoteOff(JASTrack* param_0, u32 param_1) {
     return param_0->noteOff(param_1, 0);
 }
 
-/* 8029559C-802955C8 28FEDC 002C+00 1/0 0/0 0/0 .text
- * execCommand__12JASSeqParserFP8JASTrackM12JASSeqParserFPCvPvP8JASTrackPUl_lUlPUl */
 s32 JASSeqParser::execCommand(JASTrack* param_0, s32 (JASSeqParser::*param_1)(JASTrack*, u32*),
                                    u32 param_2, u32* param_3) {
     return (this->*param_1)(param_0, param_3);
 }
 
-/* 802955C8-80295600 28FF08 0038+00 1/1 0/0 0/0 .text parseNoteOff__12JASSeqParserFP8JASTrackUc */
 s32 JASSeqParser::parseNoteOff(JASTrack* param_0, u8 param_1) {
     u8 note_id = param_1 & 7;
     if (note_id) {
@@ -1030,7 +935,6 @@ s32 JASSeqParser::parseNoteOff(JASTrack* param_0, u8 param_1) {
     return 0;
 }
 
-/* 80295600-802956B0 28FF40 00B0+00 1/1 0/0 0/0 .text parseNoteOn__12JASSeqParserFP8JASTrackUc */
 s32 JASSeqParser::parseNoteOn(JASTrack* param_0, u8 param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u32 r28 = seqCtrl->readByte();
@@ -1046,8 +950,6 @@ s32 JASSeqParser::parseNoteOn(JASTrack* param_0, u8 param_1) {
     return 0;
 }
 
-/* 802956B0-80295864 28FFF0 01B4+00 2/2 0/0 0/0 .text parseCommand__12JASSeqParserFP8JASTrackUcUs
- */
 s32 JASSeqParser::parseCommand(JASTrack* param_0, u8 cmd, u16 param_2) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     CmdInfo* cmdInfo = NULL;
@@ -1085,8 +987,6 @@ s32 JASSeqParser::parseCommand(JASTrack* param_0, u8 cmd, u16 param_2) {
     return execCommand(param_0, ptr, cmdInfo->field_0xc, stack_28);
 }
 
-/* 80295864-802958D4 2901A4 0070+00 1/1 0/0 0/0 .text parseRegCommand__12JASSeqParserFP8JASTracki
- */
 s32 JASSeqParser::parseRegCommand(JASTrack* param_0, int param_1) {
     JASSeqCtrl* seqCtrl = param_0->getSeqCtrl();
     u8 r30 = seqCtrl->readByte();
@@ -1102,7 +1002,6 @@ s32 JASSeqParser::parseRegCommand(JASTrack* param_0, int param_1) {
     return parseCommand(param_0, seqCtrl->readByte(), r29);
 }
 
-/* 802958D4-80295950 290214 007C+00 1/0 0/0 0/0 .text            parse__12JASSeqParserFP8JASTrack */
 s32 JASSeqParser::parse(JASTrack* param_0) {
     u32 r31 = param_0->getSeqCtrl()->readByte();
     s32 r30 = 0;
diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/src/JSystem/JAudio2/JASSeqReader.cpp
index 829c30684d..be76620b31 100644
--- a/src/JSystem/JAudio2/JASSeqReader.cpp
+++ b/src/JSystem/JAudio2/JASSeqReader.cpp
@@ -7,7 +7,6 @@
 
 #include "JSystem/JAudio2/JASSeqReader.h"
 
-/* 80296108-80296148 290A48 0040+00 0/0 2/2 0/0 .text            init__12JASSeqReaderFv */
 void JASSeqReader::init() {
     field_0x00 = 0;
     field_0x04 = 0;
@@ -19,7 +18,6 @@ void JASSeqReader::init() {
     }
 }
 
-/* 80296148-8029618C 290A88 0044+00 0/0 1/1 0/0 .text            init__12JASSeqReaderFPv */
 void JASSeqReader::init(void* param_0) {
     field_0x00 = (u8*)param_0;
     field_0x04 = field_0x00;
@@ -32,7 +30,6 @@ void JASSeqReader::init(void* param_0) {
     
 }
 
-/* 8029618C-802961CC 290ACC 0040+00 0/0 3/3 0/0 .text            call__12JASSeqReaderFUl */
 bool JASSeqReader::call(u32 param_0) {
     if (field_0x08 >= 8) {
         return false;
@@ -44,7 +41,6 @@ bool JASSeqReader::call(u32 param_0) {
     return true;
 }
 
-/* 802961CC-80296210 290B0C 0044+00 0/0 1/1 0/0 .text            loopStart__12JASSeqReaderFUl */
 bool JASSeqReader::loopStart(u32 param_0) {
     if (8 <= field_0x08) {
         return false;
@@ -57,7 +53,6 @@ bool JASSeqReader::loopStart(u32 param_0) {
 }
 
 
-/* 80296210-8029627C 290B50 006C+00 0/0 1/1 0/0 .text            loopEnd__12JASSeqReaderFv */
 bool JASSeqReader::loopEnd() {
     if (field_0x08 == 0) {
         return false;
@@ -79,7 +74,6 @@ bool JASSeqReader::loopEnd() {
     return true;
 }
 
-/* 8029627C-802962B0 290BBC 0034+00 0/0 2/2 0/0 .text            ret__12JASSeqReaderFv */
 bool JASSeqReader::ret() {
     if (field_0x08 == 0) {
         return false;
@@ -90,7 +84,6 @@ bool JASSeqReader::ret() {
     return true;
 }
 
-/* 802962B0-8029631C 290BF0 006C+00 0/0 2/2 0/0 .text            readMidiValue__12JASSeqReaderFv */
 int JASSeqReader::readMidiValue() {
     int byte = readByte();
 
diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
index bcac2b6792..98e6136b3d 100644
--- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
+++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp
@@ -1,32 +1,22 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASSimpleWaveBank
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASSimpleWaveBank.h"
 
-/* 80298C94-80298CF4 2935D4 0060+00 0/0 1/1 0/0 .text            __ct__17JASSimpleWaveBankFv */
 JASSimpleWaveBank::JASSimpleWaveBank() {
     mWaveTable = NULL;
     mWaveTableSize = 0;
 }
 
-/* 80298CF4-80298D84 293634 0090+00 2/1 0/0 0/0 .text            __dt__17JASSimpleWaveBankFv */
 JASSimpleWaveBank::~JASSimpleWaveBank() {
     delete[] mWaveTable;
 }
 
-/* 80298DE0-80298E60 293720 0080+00 0/0 1/1 0/0 .text
- * setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap            */
 void JASSimpleWaveBank::setWaveTableSize(u32 size, JKRHeap* heap) {
     delete[] mWaveTable;
     mWaveTable = new (heap, 0) TWaveHandle[size];
     mWaveTableSize = size;
 }
 
-/* 80298E60-80298E84 2937A0 0024+00 1/0 0/0 0/0 .text getWaveHandle__17JASSimpleWaveBankCFUl */
 JASWaveHandle* JASSimpleWaveBank::getWaveHandle(u32 no) const {
     if (no >= mWaveTableSize) {
         return NULL;
@@ -34,16 +24,12 @@ JASWaveHandle* JASSimpleWaveBank::getWaveHandle(u32 no) const {
     return &mWaveTable[no];
 }
 
-/* 80298E84-80298F18 2937C4 0094+00 0/0 1/1 0/0 .text
- * setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo           */
 void JASSimpleWaveBank::setWaveInfo(u32 no, JASWaveInfo const& waveInfo) {
     mWaveTable[no].mWaveInfo = waveInfo;
     mWaveTable[no].mWaveInfo.field_0x20 = &_48;
     mWaveTable[no].mHeap = &mHeap;
 }
 
-/* 80298F18-80298F38 293858 0020+00 1/0 0/0 0/0 .text            getWaveArc__17JASSimpleWaveBankFUl
- */
 JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) {
     if (no != 0) {
         return NULL;
@@ -51,8 +37,6 @@ JASWaveArc* JASSimpleWaveBank::getWaveArc(u32 no) {
     return this;
 }
 
-/* 80298F38-80298F5C 293878 0024+00 1/0 0/0 0/0 .text
- * getWavePtr__Q217JASSimpleWaveBank11TWaveHandleCFv            */
 int JASSimpleWaveBank::TWaveHandle::getWavePtr() const {
     void* base = mHeap->getBase();
     if (base == NULL) {
@@ -61,20 +45,14 @@ int JASSimpleWaveBank::TWaveHandle::getWavePtr() const {
     return (int)base + mWaveInfo.field_0x08;
 }
 
-/* 80298F5C-80298F90 29389C 0034+00 1/1 0/0 0/0 .text __ct__Q217JASSimpleWaveBank11TWaveHandleFv
- */
 JASSimpleWaveBank::TWaveHandle::TWaveHandle() {
     mHeap = NULL;
 }
 
-/* 80298F90-80298F98 2938D0 0008+00 1/0 0/0 0/0 .text
- * getWaveInfo__Q217JASSimpleWaveBank11TWaveHandleCFv           */
 const JASWaveInfo* JASSimpleWaveBank::TWaveHandle::getWaveInfo() const {
     return &mWaveInfo;
 }
 
-/* 80298F98-80298FA0 2938D8 0008+00 1/0 0/0 0/0 .text            getArcCount__17JASSimpleWaveBankCFv
- */
 u32 JASSimpleWaveBank::getArcCount() const {
     return 1;
 }
diff --git a/src/JSystem/JAudio2/JASSoundParams.cpp b/src/JSystem/JAudio2/JASSoundParams.cpp
index 225cb92da0..34d6563c1c 100644
--- a/src/JSystem/JAudio2/JASSoundParams.cpp
+++ b/src/JSystem/JAudio2/JASSoundParams.cpp
@@ -1,13 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASSoundParams
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASSoundParams.h"
 
-/* 8029E3B0-8029E47C 298CF0 00CC+00 0/0 2/2 0/0 .text            clamp__14JASSoundParamsFv */
 void JASSoundParams::clamp() {
     clampVolume();
     clampPitch();
@@ -16,8 +10,6 @@ void JASSoundParams::clamp() {
     clampDolby();
 }
 
-/* 8029E47C-8029E4D8 298DBC 005C+00 0/0 2/2 0/0 .text
- * combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams */
 void JASSoundParams::combine(const JASSoundParams &other1, const JASSoundParams &other2) {
     mVolume = other1.mVolume * other2.mVolume;
     mPitch = other1.mPitch * other2.mPitch;
diff --git a/src/JSystem/JAudio2/JASTaskThread.cpp b/src/JSystem/JAudio2/JASTaskThread.cpp
index b6e11789d2..0a5f2859f5 100644
--- a/src/JSystem/JAudio2/JASTaskThread.cpp
+++ b/src/JSystem/JAudio2/JASTaskThread.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/JAudio2/JASCriticalSection.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-/* 8028F6C4-8028F724 28A004 0060+00 0/0 1/1 0/0 .text            __ct__13JASTaskThreadFiiUl */
 JASTaskThread::JASTaskThread(int priority, int msgCount, u32 stackSize) :
     JKRThread(JASDram, stackSize, msgCount, priority)
 {
@@ -13,7 +12,6 @@ JASTaskThread::JASTaskThread(int priority, int msgCount, u32 stackSize) :
     OSInitThreadQueue(&threadQueue_);
 }
 
-/* 8028F724-8028F850 28A064 012C+00 1/0 0/0 0/0 .text            __dt__13JASTaskThreadFv */
 JASTaskThread::~JASTaskThread() {
     OSMessage msg;
     BOOL received;
@@ -26,8 +24,6 @@ JASTaskThread::~JASTaskThread() {
     }
 }
 
-/* 8028F850-8028F9EC 28A190 019C+00 1/1 0/0 0/0 .text allocCallStack__13JASTaskThreadFPFPv_vPCvUl
- */
 void* JASTaskThread::allocCallStack(JASThreadCallback callback, const void* msg, u32 msgSize) {
     ThreadMemPool* heap;
     u32 size = msgSize + 8;
@@ -42,7 +38,6 @@ void* JASTaskThread::allocCallStack(JASThreadCallback callback, const void* msg,
     return callStack;
 }
 
-/* 8028F9EC-8028FB5C 28A32C 0170+00 1/1 0/0 0/0 .text allocCallStack__13JASTaskThreadFPFPv_vPv */
 void* JASTaskThread::allocCallStack(JASThreadCallback callback, void* msg) {
     JASThreadCallStack *callStack;
     callStack = (JASThreadCallStack*)JASKernel::getCommandHeap()->alloc(12);
@@ -56,7 +51,6 @@ void* JASTaskThread::allocCallStack(JASThreadCallback callback, void* msg) {
     return callStack;
 }
 
-/* 8028FB5C-8028FC54 28A49C 00F8+00 0/0 6/6 0/0 .text sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl */
 int JASTaskThread::sendCmdMsg(JASThreadCallback callback, const void* msg, u32 msgSize) {
     void* callstack;
 
@@ -72,7 +66,6 @@ int JASTaskThread::sendCmdMsg(JASThreadCallback callback, const void* msg, u32 m
     return iVar2;
 }
 
-/* 8028FC54-8028FD4C 28A594 00F8+00 0/0 3/3 0/0 .text sendCmdMsg__13JASTaskThreadFPFPv_vPv */
 int JASTaskThread::sendCmdMsg(JASThreadCallback callback, void* msg) {
     void* callstack;
 
@@ -88,7 +81,6 @@ int JASTaskThread::sendCmdMsg(JASThreadCallback callback, void* msg) {
     return iVar2;
 }
 
-/* 8028FD4C-8028FE88 28A68C 013C+00 1/0 0/0 0/0 .text            run__13JASTaskThreadFv */
 // NONMATCHING Regalloc
 void* JASTaskThread::run() {
     JASThreadCallStack* callstack;
@@ -109,7 +101,6 @@ void* JASTaskThread::run() {
     } while (true);
 }
 
-/* 8028FE88-8028FEFC 28A7C8 0074+00 0/0 1/1 0/0 .text            pause__13JASTaskThreadFb */
 void JASTaskThread::pause(bool param_0) {
     JASCriticalSection aJStack_14;
     if (param_0) {
diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp
index 7cb87f68d7..2d2e422c82 100644
--- a/src/JSystem/JAudio2/JASTrack.cpp
+++ b/src/JSystem/JAudio2/JASTrack.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JAudio2/JASAiCtrl.h"
 #include "JSystem/JAudio2/JASDSPInterface.h"
 
-/* 80291228-8029131C 28BB68 00F4+00 1/1 3/3 0/0 .text            __ct__8JASTrackFv */
 JASTrack::JASTrack() : mDefaultChannelMgr(this), mChannelMgrCount(1), mStatus(0) {
     mChannelMgrs[0] = &mDefaultChannelMgr;
     for (int i = 1; i < 4; i++) {
@@ -16,13 +15,10 @@ JASTrack::JASTrack() : mDefaultChannelMgr(this), mChannelMgrCount(1), mStatus(0)
     init();
 }
 
-/* 804316B4-80431AC0 05E3D4 040C+00 1/2 0/0 0/0 .bss             sDefaultBankTable__8JASTrack */
 JASDefaultBankTable JASTrack::sDefaultBankTable;
 
-/* 80431ACC-80431ADC 05E7EC 0010+00 1/2 0/0 0/0 .bss             sTrackList__8JASTrack */
 JASTrack::TList JASTrack::sTrackList;
 
-/* 8029131C-80291444 28BC5C 0128+00 4/4 4/4 0/0 .text            __dt__8JASTrackFv */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 JASTrack::~JASTrack() {
     for (int i = 1; i < 4; i++) {
@@ -30,7 +26,6 @@ JASTrack::~JASTrack() {
     }
 }
 
-/* 80291444-802915D4 28BD84 0190+00 1/1 3/3 0/0 .text            setChannelMgrCount__8JASTrackFUl */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 void JASTrack::setChannelMgrCount(u32 i_count) {
     mChannelMgrCount = 1;
@@ -51,7 +46,6 @@ void JASTrack::setChannelMgrCount(u32 i_count) {
     }
 }
 
-/* 8039AFD0-8039AFE8 027630 0018+00 1/1 0/0 0/0 .rodata          sAdsTable__8JASTrack */
 JASOscillator::Point const JASTrack::sAdsTable[4] = {
     {0, 0, 0x7fff},
     {0, 0, 0x7fff},
@@ -59,13 +53,10 @@ JASOscillator::Point const JASTrack::sAdsTable[4] = {
     {0xe, 0, 0},
 };
 
-/* 8039AFE8-8039B000 027648 0018+00 1/2 0/0 0/0 .rodata          sEnvOsc__8JASTrack */
 JASOscillator::Data const JASTrack::sEnvOsc = {0, 1.0f, NULL, NULL, 1.0f, 0.0f};
 
-/* 8039B000-8039B018 027660 0018+00 0/1 0/0 0/0 .rodata          sPitchEnvOsc__8JASTrack */
 JASOscillator::Data const JASTrack::sPitchEnvOsc = {1, 1.0f, NULL, NULL, 1.0f, 0.0f};
 
-/* 802915D4-802918FC 28BF14 0328+00 2/2 1/1 0/0 .text            init__8JASTrackFv */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 void JASTrack::init() {
     mSeqCtrl.init();
@@ -138,7 +129,6 @@ void JASTrack::init() {
     mStatus = 0;
 }
 
-/* 802918FC-8029194C 28C23C 0050+00 1/1 0/0 0/0 .text            initTimed__8JASTrackFv */
 void JASTrack::initTimed() {
     mMoveParam.params.volume.mValue = 1.0f;
     mMoveParam.params.pitch.mValue = 0.0f;
@@ -152,7 +142,6 @@ void JASTrack::initTimed() {
     }
 }
 
-/* 8029194C-802919F4 28C28C 00A8+00 1/1 0/0 0/0 .text            inherit__8JASTrackFRC8JASTrack */
 void JASTrack::inherit(JASTrack const& i_parent) {
     mFlags.flag2 = i_parent.mFlags.flag2;
     mBankNumber = i_parent.mBankNumber;
@@ -172,36 +161,29 @@ void JASTrack::inherit(JASTrack const& i_parent) {
     }
 }
 
-/* 802919F4-80291A08 28C334 0014+00 0/0 5/5 0/0 .text
- * assignExtBuffer__8JASTrackFUlP14JASSoundParams               */
 void JASTrack::assignExtBuffer(u32 i_index, JASSoundParams* i_soundParams) {
     mChannelMgrs[i_index]->mSoundParams = i_soundParams;
 }
 
-/* 80291A08-80291A28 28C348 0020+00 0/0 3/3 0/0 .text            setSeqData__8JASTrackFPvUl */
 void JASTrack::setSeqData(void* param_0, u32 param_1) {
     mSeqCtrl.start(param_0, param_1);
 }
 
-/* 80291A28-80291A78 28C368 0050+00 0/0 2/2 0/0 .text            startSeq__8JASTrackFv */
 void JASTrack::startSeq() {
     JASCriticalSection critical_section;
     sTrackList.append(this);
     mStatus = 1;
 }
 
-/* 80291A78-80291ABC 28C3B8 0044+00 0/0 2/2 0/0 .text            stopSeq__8JASTrackFv */
 void JASTrack::stopSeq() {
     JASCriticalSection critical_section;
     mFlags.flag6 = 1;
 }
 
-/* 80291ABC-80291AC8 28C3FC 000C+00 0/0 1/1 0/0 .text            start__8JASTrackFv */
 void JASTrack::start() {
     mStatus = 1;
 }
 
-/* 80291AC8-80291B8C 28C408 00C4+00 4/4 0/0 0/0 .text            close__8JASTrackFv */
 void JASTrack::close() {
     for (int i = 0; i < 16; i++) {
         JASTrack* child = mChildren[i];
@@ -222,7 +204,6 @@ void JASTrack::close() {
     mStatus = 2;
 }
 
-/* 80291B8C-80291BB8 28C4CC 002C+00 1/1 1/1 0/0 .text connectChild__8JASTrackFUlP8JASTrack */
 bool JASTrack::connectChild(u32 i_index, JASTrack* i_child) {
     if (mChildren[i_index] != NULL) {
         return false;
@@ -232,7 +213,6 @@ bool JASTrack::connectChild(u32 i_index, JASTrack* i_child) {
     return true;
 }
 
-/* 80291BB8-80291C30 28C4F8 0078+00 0/0 1/1 0/0 .text            closeChild__8JASTrackFUl */
 void JASTrack::closeChild(u32 i_index) {
     JASTrack* child = mChildren[i_index];
     if (child != NULL) {
@@ -245,7 +225,6 @@ void JASTrack::closeChild(u32 i_index) {
     }
 }
 
-/* 80291C30-80291DAC 28C570 017C+00 0/0 2/2 0/0 .text            openChild__8JASTrackFUl */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 JASTrack* JASTrack::openChild(u32 i_index) {
     JASTrack* child = mChildren[i_index];
@@ -278,19 +257,15 @@ JASTrack* JASTrack::openChild(u32 i_index) {
     return child;
 }
 
-/* 80291DAC-80291DBC 28C6EC 0010+00 0/0 1/1 0/0 .text            connectBus__8JASTrackFii */
 void JASTrack::connectBus(int param_0, int param_1) {
     mMixConfig[param_0] = param_1;
 }
 
-/* 80291DBC-80291DF8 28C6FC 003C+00 0/0 1/1 0/0 .text            setLatestKey__8JASTrackFUc */
 void JASTrack::setLatestKey(u8 param_0) {
     field_0x22b = param_0;
     field_0x22b += getTransposeTotal();
 }
 
-/* 80291DF8-80291F38 28C738 0140+00 2/2 0/0 0/0 .text
- * channelStart__8JASTrackFPQ28JASTrack11TChannelMgrUlUlUl      */
 JASChannel* JASTrack::channelStart(JASTrack::TChannelMgr* i_channelMgr, u32 param_1, u32 param_2,
                                    u32 i_updateTimer) {
     JASBank* bank = NULL;
@@ -318,7 +293,6 @@ JASChannel* JASTrack::channelStart(JASTrack::TChannelMgr* i_channelMgr, u32 para
     return channel;
 }
 
-/* 80291F38-80292008 28C878 00D0+00 0/0 1/1 0/0 .text            noteOn__8JASTrackFUlUlUl */
 int JASTrack::noteOn(u32 i_noteID, u32 param_1, u32 param_2) {
     if (isMute()) {
         return 0;
@@ -338,7 +312,6 @@ int JASTrack::noteOn(u32 i_noteID, u32 param_1, u32 param_2) {
     return ret;
 }
 
-/* 80292008-80292198 28C948 0190+00 0/0 1/1 0/0 .text            gateOn__8JASTrackFUlUlfUl */
 int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) {
     param_0 += getTransposeTotal();
     if (mGateRate != 100) {
@@ -379,7 +352,6 @@ int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) {
     return 1;
 }
 
-/* 80292198-80292220 28CAD8 0088+00 1/1 1/1 0/0 .text            noteOff__8JASTrackFUlUs */
 int JASTrack::noteOff(u32 i_noteID, u16 param_1) {
     int ret = 1;
     for (u32 i = 0; i < mChannelMgrCount; i++) {
@@ -392,7 +364,6 @@ int JASTrack::noteOff(u32 i_noteID, u16 param_1) {
     return ret;
 }
 
-/* 80292220-8029226C 28CB60 004C+00 0/0 1/1 0/0 .text            checkNoteStop__8JASTrackCFUl */
 bool JASTrack::checkNoteStop(u32 i_noteID) const {
     for (u32 i = 0; i < mChannelMgrCount; i++) {
         if (mChannelMgrs[i] != NULL && mChannelMgrs[i]->mChannels[i_noteID] != NULL) {
@@ -402,7 +373,6 @@ bool JASTrack::checkNoteStop(u32 i_noteID) const {
     return true;
 }
 
-/* 8029226C-802922D8 28CBAC 006C+00 1/1 0/0 0/0 .text overwriteOsc__8JASTrackFP10JASChannel */
 void JASTrack::overwriteOsc(JASChannel* i_channel) {
     for (u32 i = 0; i < 2; i++) {
         if (mOscParam[i].mTable != NULL) {
@@ -411,7 +381,6 @@ void JASTrack::overwriteOsc(JASChannel* i_channel) {
     }
 }
 
-/* 802922D8-80292348 28CC18 0070+00 1/1 0/0 0/0 .text            updateTimedParam__8JASTrackFv */
 void JASTrack::updateTimedParam() {
     for (u32 i = 0; i < 6; i++) {
         MoveParam_* param = &mMoveParam.array[i];
@@ -422,7 +391,6 @@ void JASTrack::updateTimedParam() {
     }
 }
 
-/* 80292348-802924E4 28CC88 019C+00 1/1 0/0 0/0 .text            updateTrack__8JASTrackFf */
 void JASTrack::updateTrack(f32 param_0) {
     updateTempo();
     for (u32 i = 0; i < mChannelMgrCount; i++) {
@@ -468,7 +436,6 @@ void JASTrack::updateTrack(f32 param_0) {
     }
 }
 
-/* 802924E4-80292580 28CE24 009C+00 5/5 0/0 0/0 .text            updateTempo__8JASTrackFv */
 void JASTrack::updateTempo() {
     if (mParent == NULL) {
         field_0x1dc = mTempoRate * (mTimebase * mTempo * (4.0f / 3.0f) / JASDriver::getDacRate());
@@ -479,7 +446,6 @@ void JASTrack::updateTempo() {
     }
 }
 
-/* 80292580-80292644 28CEC0 00C4+00 4/4 0/0 0/0 .text            updateSeq__8JASTrackFbf */
 void JASTrack::updateSeq(bool param_0, f32 param_1) {
     if (!param_0) {
         param_0 = mFlags.flag5;
@@ -496,7 +462,6 @@ void JASTrack::updateSeq(bool param_0, f32 param_1) {
     }
 }
 
-/* 80292644-802926E0 28CF84 009C+00 1/1 0/0 0/0 .text            seqTimeToDspTime__8JASTrackFf */
 u32 JASTrack::seqTimeToDspTime(f32 i_seqTime) {
     f32 dsp_time;
     if (mFlags.flag2) {
@@ -508,7 +473,6 @@ u32 JASTrack::seqTimeToDspTime(f32 i_seqTime) {
     return dsp_time;
 }
 
-/* 802926E0-80292708 28D020 0028+00 0/0 4/4 0/0 .text            setParam__8JASTrackFUlfUl */
 void JASTrack::setParam(u32 i_index, f32 i_target, u32 i_count) {
     MoveParam_* param = &mMoveParam.array[i_index];
     param->mTarget = i_target;
@@ -518,7 +482,6 @@ void JASTrack::setParam(u32 i_index, f32 i_target, u32 i_count) {
     param->mCount = i_count;
 }
 
-/* 80292708-802927A0 28D048 0098+00 1/1 0/0 0/0 .text            noteOffAll__8JASTrackFUs */
 void JASTrack::noteOffAll(u16 param_0) {
     for (u8 i = 0; i < 8; i++) {
         noteOff(i, param_0);
@@ -530,7 +493,6 @@ void JASTrack::noteOffAll(u16 param_0) {
     }
 }
 
-/* 802927A0-802927D8 28D0E0 0038+00 0/0 2/2 0/0 .text            mute__8JASTrackFb */
 void JASTrack::mute(bool i_mute) {
     mFlags.mute = i_mute;
     if (i_mute) {
@@ -538,13 +500,10 @@ void JASTrack::mute(bool i_mute) {
     }
 }
 
-/* 802927D8-802927E8 28D118 0010+00 0/0 1/1 0/0 .text            setOscScale__8JASTrackFUlf */
 void JASTrack::setOscScale(u32 i_oscNo, f32 i_scale) {
     mOscParam[i_oscNo].mScale = i_scale;
 }
 
-/* 802927E8-80292808 28D128 0020+00 0/0 1/1 0/0 .text
- * setOscTable__8JASTrackFUlPCQ213JASOscillator5Point           */
 void JASTrack::setOscTable(u32 i_oscNo, JASOscillator::Point const* i_table) {
     mOscParam[i_oscNo].mTable = i_table;
     if (i_oscNo != 0) {
@@ -552,7 +511,6 @@ void JASTrack::setOscTable(u32 i_oscNo, JASOscillator::Point const* i_table) {
     }
 }
 
-/* 80292808-8029285C 28D148 0054+00 0/0 1/1 0/0 .text            setOscAdsr__8JASTrackFssssUs */
 void JASTrack::setOscAdsr(s16 param_0, s16 param_1, s16 param_2, s16 param_3, u16 i_directRelease) {
     mOscParam[0] = sEnvOsc;
     mOscParam[0].mTable = mOscPoint;
@@ -563,10 +521,8 @@ void JASTrack::setOscAdsr(s16 param_0, s16 param_1, s16 param_2, s16 param_3, u1
     mDirectRelease = i_directRelease;
 }
 
-/* 804555D0-804555D4 003BD0 0004+00 2/2 0/0 0/0 .sdata2          FILTER_MODE_IIR__6JASDsp */
 const u32 JASDsp::FILTER_MODE_IIR = 0x00000020;
 
-/* 8029285C-8029289C 28D19C 0040+00 0/0 2/2 0/0 .text            setFIR__8JASTrackFPCs */
 void JASTrack::setFIR(s16 const* i_FIR) {
     for (int i = 0; i < 8; i++) {
         mFIR[i] = i_FIR[i];
@@ -575,7 +531,6 @@ void JASTrack::setFIR(s16 const* i_FIR) {
     mFilterMode |= 8;
 }
 
-/* 8029289C-802928D0 28D1DC 0034+00 0/0 4/4 0/0 .text            setIIR__8JASTrackFPCs */
 void JASTrack::setIIR(s16 const* i_IIR) {
     for (int i = 0; i < 8; i++) {
         mIIR[i] = i_IIR[i];
@@ -583,17 +538,14 @@ void JASTrack::setIIR(s16 const* i_IIR) {
     mFilterMode |= JASDsp::FILTER_MODE_IIR;
 }
 
-/* 802928D0-802928F4 28D210 0024+00 0/0 1/1 0/0 .text            readPortSelf__8JASTrackFUl */
 u16 JASTrack::readPortSelf(u32 param_0) {
     return mTrackPort.readImport(param_0);
 }
 
-/* 802928F4-80292918 28D234 0024+00 0/0 1/1 0/0 .text            writePortSelf__8JASTrackFUlUs */
 void JASTrack::writePortSelf(u32 param_0, u16 param_1) {
     mTrackPort.writeExport(param_0, param_1);
 }
 
-/* 80292918-8029297C 28D258 0064+00 0/0 4/4 0/0 .text            writePort__8JASTrackFUlUs */
 void JASTrack::writePort(u32 param_0, u16 param_1) {
     mTrackPort.writeImport(param_0, param_1);
     if (param_0 == 0 || param_0 == 1) {
@@ -607,12 +559,10 @@ void JASTrack::writePort(u32 param_0, u16 param_1) {
     }
 }
 
-/* 8029297C-802929A0 28D2BC 0024+00 0/0 3/3 0/0 .text            readPort__8JASTrackFUl */
 u16 JASTrack::readPort(u32 param_0) {
     return mTrackPort.readExport(param_0);
 }
 
-/* 802929A0-80292A3C 28D2E0 009C+00 1/1 0/0 0/0 .text            setChannelPauseFlag__8JASTrackFb */
 void JASTrack::setChannelPauseFlag(bool i_pause) {
     for (u32 i = 0; i < mChannelMgrCount; i++) {
         if (mChannelMgrs[i] != NULL) {
@@ -626,7 +576,6 @@ void JASTrack::setChannelPauseFlag(bool i_pause) {
     }
 }
 
-/* 80292A3C-80292AA4 28D37C 0068+00 0/0 2/2 0/0 .text            pause__8JASTrackFb */
 void JASTrack::pause(bool i_pause) {
     if (mFlags.pause != i_pause) {
         mFlags.pause = i_pause;
@@ -635,7 +584,6 @@ void JASTrack::pause(bool i_pause) {
     }
 }
 
-/* 80292AA4-80292AF4 28D3E4 0050+00 3/3 0/0 0/0 .text            getTransposeTotal__8JASTrackCFv */
 int JASTrack::getTransposeTotal() const {
     if (mParent != NULL) {
         return mTranspose + mParent->getTransposeTotal();
@@ -644,7 +592,6 @@ int JASTrack::getTransposeTotal() const {
     }
 }
 
-/* 80292AF4-80292B58 28D434 0064+00 2/2 0/0 0/0 .text            isMute__8JASTrackCFv */
 bool JASTrack::isMute() const {
     if (mParent != NULL) {
         return mFlags.mute || mParent->isMute();
@@ -653,29 +600,24 @@ bool JASTrack::isMute() const {
     }
 }
 
-/* 80292B58-80292B8C 28D498 0034+00 0/0 1/1 0/0 .text            setTempo__8JASTrackFUs */
 void JASTrack::setTempo(u16 i_tempo) {
     mTempo = i_tempo;
     mFlags.flag5 = true;
     updateTempo();
 }
 
-/* 80292B8C-80292BC0 28D4CC 0034+00 0/0 2/2 0/0 .text            setTempoRate__8JASTrackFf */
 void JASTrack::setTempoRate(f32 i_tempoRate) {
     mTempoRate = i_tempoRate;
     mFlags.flag5 = true;
     updateTempo();
 }
 
-/* 80292BC0-80292BF4 28D500 0034+00 0/0 1/1 0/0 .text            setTimebase__8JASTrackFUs */
 void JASTrack::setTimebase(u16 i_timebase) {
     mTimebase = i_timebase;
     mFlags.flag5 = true;
     updateTempo();
 }
 
-/* 80292BF4-80292CA4 28D534 00B0+00 1/1 0/0 0/0 .text
- * updateChannel__8JASTrackFP10JASChannelPQ26JASDsp8TChannel    */
 void JASTrack::updateChannel(JASChannel* param_0, JASDsp::TChannel* param_1) {
     param_0->setVibrate(mVibDepth, mVibPitch);
     param_0->setTremolo(mTremDepth, mTremPitch);
@@ -690,8 +632,6 @@ void JASTrack::updateChannel(JASChannel* param_0, JASDsp::TChannel* param_1) {
 }
 
 
-/* 80292CA4-80292D88 28D5E4 00E4+00 1/1 0/0 0/0 .text
- * channelUpdateCallback__8JASTrackFUlP10JASChannelPQ26JASDsp8TChannelPv */
 void JASTrack::channelUpdateCallback(u32 param_0, JASChannel* param_1,
                                      JASDsp::TChannel* param_2, void* param_3) {
     TChannelMgr* channel_mgr = static_cast<TChannelMgr*>(param_3);
@@ -718,7 +658,6 @@ void JASTrack::channelUpdateCallback(u32 param_0, JASChannel* param_1,
     }
 }
 
-/* 80292D88-80292DA0 28D6C8 0018+00 3/3 0/0 0/0 .text            getRootTrack__8JASTrackFv */
 JASTrack* JASTrack::getRootTrack() {
     JASTrack* track = this;
     while (track->mParent != NULL) {
@@ -727,7 +666,6 @@ JASTrack* JASTrack::getRootTrack() {
     return track;
 }
 
-/* 80292DA0-80292E9C 28D6E0 00FC+00 1/1 0/0 0/0 .text            tickProc__8JASTrackFv */
 int JASTrack::tickProc() {
     if (mFlags.pause) {
         return 0;
@@ -755,7 +693,6 @@ int JASTrack::tickProc() {
     return 0;
 }
 
-/* 80292E9C-80292F6C 28D7DC 00D0+00 1/1 0/0 0/0 .text            seqMain__8JASTrackFv */
 int JASTrack::seqMain() {
     if (mFlags.flag6) {
         updateSeq(true, 1.0f);
@@ -776,13 +713,11 @@ int JASTrack::seqMain() {
     }
 }
 
-/* 80292F6C-80292F90 28D8AC 0024+00 1/1 0/0 0/0 .text            cbSeqMain__Q28JASTrack5TListFPv */
 s32 JASTrack::TList::cbSeqMain(void* i_this) {
     static_cast<JASTrack::TList*>(i_this)->seqMain();
     return 0;
 }
 
-/* 80292F90-8029301C 28D8D0 008C+00 1/1 0/0 0/0 .text append__Q28JASTrack5TListFP8JASTrack */
 void JASTrack::TList::append(JASTrack* i_track) {
     if (!mCallbackRegistered) {
         if (!JASDriver::registerSubFrameCallback(cbSeqMain, this)) {
@@ -793,7 +728,6 @@ void JASTrack::TList::append(JASTrack* i_track) {
     Push_back(i_track);
 }
 
-/* 8029301C-802930DC 28D95C 00C0+00 1/1 0/0 0/0 .text            seqMain__Q28JASTrack5TListFv */
 // NONMATCHING - missing load instruction (matches debug, equivalent)
 void JASTrack::TList::seqMain() {
     iterator it, it2;
@@ -810,7 +744,6 @@ void JASTrack::TList::seqMain() {
     }
 }
 
-/* 802930DC-80293148 28DA1C 006C+00 2/2 0/0 0/0 .text __ct__Q28JASTrack11TChannelMgrFP8JASTrack */
 JASTrack::TChannelMgr::TChannelMgr(JASTrack* i_track) : mSoundParams(NULL), mTrack(i_track) {
     for (int i = 0; i < 8; i++) {
         mChannels[i] = NULL;
@@ -821,7 +754,6 @@ JASTrack::TChannelMgr::TChannelMgr(JASTrack* i_track) : mSoundParams(NULL), mTra
 }
 
 
-/* 80293148-802931B0 28DA88 0068+00 1/1 0/0 0/0 .text            init__Q28JASTrack11TChannelMgrFv */
 void JASTrack::TChannelMgr::init() {
     mSoundParams = NULL;
     mParams.init();
@@ -834,7 +766,6 @@ void JASTrack::TChannelMgr::init() {
 }
 
 
-/* 802931B0-80293220 28DAF0 0070+00 1/1 0/0 0/0 .text releaseAll__Q28JASTrack11TChannelMgrFv */
 void JASTrack::TChannelMgr::releaseAll() {
     for (int i = 0; i < 8; i++) {
         JASChannel* channel = mChannels[i];
@@ -846,7 +777,6 @@ void JASTrack::TChannelMgr::releaseAll() {
     }
 }
 
-/* 80293220-802932A0 28DB60 0080+00 3/3 0/0 0/0 .text noteOff__Q28JASTrack11TChannelMgrFUlUs */
 bool JASTrack::TChannelMgr::noteOff(u32 i_channel, u16 param_1) {
     JASChannel* channel = mChannels[i_channel];
     if (channel == NULL) {
@@ -862,7 +792,6 @@ bool JASTrack::TChannelMgr::noteOff(u32 i_channel, u16 param_1) {
     return true;
 }
 
-/* 802932A0-802932C8 28DBE0 0028+00 1/1 0/0 0/0 .text setPauseFlag__Q28JASTrack11TChannelMgrFb */
 void JASTrack::TChannelMgr::setPauseFlag(bool i_pause) {
     for (int i = 0; i < 8; i++) {
         if (mChannels[i] != NULL) {
diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/src/JSystem/JAudio2/JASTrackPort.cpp
index c082e7e058..ad13734e28 100644
--- a/src/JSystem/JAudio2/JASTrackPort.cpp
+++ b/src/JSystem/JAudio2/JASTrackPort.cpp
@@ -1,13 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASTrackPort
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASTrackPort.h"
 
-/* 8029354C-8029357C 28DE8C 0030+00 0/0 1/1 0/0 .text            init__12JASTrackPortFv */
 void JASTrackPort::init() {
     for (int i = 0; i < 16; i++) {
         field_0x4[i] = 0;
@@ -16,36 +10,30 @@ void JASTrackPort::init() {
     field_0x2 = 0;
 }
 
-/* 8029357C-802935A0 28DEBC 0024+00 0/0 1/1 0/0 .text            readImport__12JASTrackPortFUl */
 u16 JASTrackPort::readImport(u32 port_num) {
     field_0x0 = field_0x0 & ~(1 << port_num);
     return field_0x4[port_num];
 }
 
-/* 802935A0-802935C4 28DEE0 0024+00 0/0 1/1 0/0 .text            readExport__12JASTrackPortFUl */
 u16 JASTrackPort::readExport(u32 port_num) {
     field_0x2 = field_0x2 & ~(1 << port_num);
     return field_0x4[port_num];
 }
 
-/* 802935C4-802935E8 28DF04 0024+00 0/0 1/1 0/0 .text            writeImport__12JASTrackPortFUlUs */
 void JASTrackPort::writeImport(u32 port_num, u16 param_1) {
     field_0x0 = field_0x0 | (1 << port_num);
     field_0x4[port_num] = param_1;
 }
 
-/* 802935E8-8029360C 28DF28 0024+00 0/0 1/1 0/0 .text            writeExport__12JASTrackPortFUlUs */
 void JASTrackPort::writeExport(u32 port_num, u16 param_1) {
     field_0x2 = field_0x2 | (1 << port_num);
     field_0x4[port_num] = param_1;
 }
 
-/* 8029360C-80293628 28DF4C 001C+00 0/0 1/1 0/0 .text            checkImport__12JASTrackPortCFUl */
 u32 JASTrackPort::checkImport(u32 param_0) const {
     return field_0x0 & 1 << param_0 ? 1 : 0;
 }
 
-/* 80293628-80293644 28DF68 001C+00 0/0 1/1 0/0 .text            checkExport__12JASTrackPortCFUl */
 u32 JASTrackPort::checkExport(u32 param_0) const {
     return field_0x2 & 1 << param_0 ? 1 : 0;
 }
diff --git a/src/JSystem/JAudio2/JASVoiceBank.cpp b/src/JSystem/JAudio2/JASVoiceBank.cpp
index 818532d908..f69616a3af 100644
--- a/src/JSystem/JAudio2/JASVoiceBank.cpp
+++ b/src/JSystem/JAudio2/JASVoiceBank.cpp
@@ -1,24 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASVoiceBank
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASVoiceBank.h"
 #include "JSystem/JAudio2/JASBasicInst.h"
 
-/* ############################################################################################## */
-/* 8039B1B8-8039B1D0 027818 0018+00 1/1 0/0 0/0 .rodata          sOscData__12JASVoiceBank */
 const JASOscillator::Data JASVoiceBank::sOscData = {
     0, 1.0f, NULL, NULL, 1.0f, 0.0f,
 };
 
-/* 80451268-80451270 000768 0004+04 1/1 0/0 0/0 .sbss            sOscTable__12JASVoiceBank */
 JASOscillator::Data* JASVoiceBank::sOscTable;
 
-/* 80297F74-80297FAC 2928B4 0038+00 1/0 0/0 0/0 .text
- * getInstParam__12JASVoiceBankCFiiiP12JASInstParam             */
 bool JASVoiceBank::getInstParam(int param_0, int param_1, int param_2,
                                     JASInstParam* param_3) const {
     if (param_0 < 0) {
@@ -31,10 +21,8 @@ bool JASVoiceBank::getInstParam(int param_0, int param_1, int param_2,
     return true;
 }
 
-/* 80297FAC-80298008 2928EC 005C+00 1/0 0/0 0/0 .text            __dt__12JASVoiceBankFv */
 JASVoiceBank::~JASVoiceBank() {}
 
-/* 80298008-80298014 292948 000C+00 1/0 0/0 0/0 .text            getType__12JASVoiceBankCFv */
 u32 JASVoiceBank::getType() const {
     return 'VOIC';
 }
diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/src/JSystem/JAudio2/JASWSParser.cpp
index 8b7c535b83..2194561303 100644
--- a/src/JSystem/JAudio2/JASWSParser.cpp
+++ b/src/JSystem/JAudio2/JASWSParser.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASWSParser
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASWSParser.h"
@@ -11,15 +6,12 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 
-/* 80298FB0-80298FD8 2938F0 0028+00 1/1 0/0 0/0 .text            getGroupCount__11JASWSParserFPCv */
 u32 JASWSParser::getGroupCount(void const* stream) {
 	THeader* header = (THeader*)stream;
 	return header->mCtrlGroupOffset.ptr(header)->mGroupCount;
 }
 
 
-/* 80298FD8-80299034 293918 005C+00 0/0 1/1 0/0 .text createWaveBank__11JASWSParserFPCvP7JKRHeap
- */
 JASWaveBank* JASWSParser::createWaveBank(void const* stream, JKRHeap* heap) {
     if (getGroupCount(stream) == 1) {
         return createSimpleWaveBank(stream, heap);
@@ -28,11 +20,8 @@ JASWaveBank* JASWSParser::createWaveBank(void const* stream, JKRHeap* heap) {
     }
 }
 
-/* 80451280-80451288 000780 0004+04 2/2 0/0 0/0 .sbss            sUsedHeapSize__11JASWSParser */
 u32 JASWSParser::sUsedHeapSize;
 
-/* 80299034-80299264 293974 0230+00 1/1 0/0 0/0 .text
- * createBasicWaveBank__11JASWSParserFPCvP7JKRHeap              */
 JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JASDram;
@@ -77,8 +66,6 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap*
     return wave_bank;
 }
 
-/* 80299264-80299490 293BA4 022C+00 1/1 0/0 0/0 .text
- * createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap             */
 JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JASDram;
diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
index 2c21c7ff71..9c35789833 100644
--- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JASWaveArcLoader
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JASWaveArcLoader.h"
@@ -14,11 +9,8 @@
 #include "dolphin/os.h"
 #include <stdint.h>
 
-/* 80451290-80451298 000790 0004+04 1/1 0/0 0/0 .sbss            sAramHeap__16JASWaveArcLoader */
 JASHeap* JASWaveArcLoader::sAramHeap;
 
-/* 8029A0A0-8029A0D0 2949E0 0030+00 2/2 0/0 0/0 .text            getRootHeap__16JASWaveArcLoaderFv
- */
 JASHeap* JASWaveArcLoader::getRootHeap() {
     if (JASWaveArcLoader::sAramHeap) {
         return JASWaveArcLoader::sAramHeap;
@@ -26,10 +18,8 @@ JASHeap* JASWaveArcLoader::getRootHeap() {
     return JASKernel::getAramHeap();
 }
 
-/* 803C77E0-803C7820 024900 0040+00 2/2 0/0 0/0 .data            sCurrentDir__16JASWaveArcLoader */
 char JASWaveArcLoader::sCurrentDir[DIR_MAX] = "/AudioRes/Waves/";
 
-/* 8029A0D0-8029A130 294A10 0060+00 0/0 1/1 0/0 .text setCurrentDir__16JASWaveArcLoaderFPCc */
 void JASWaveArcLoader::setCurrentDir(char const* dir) {
     ASSERT(std::strlen(dir) < DIR_MAX - 1);
     strcpy(sCurrentDir, dir);
@@ -41,13 +31,10 @@ void JASWaveArcLoader::setCurrentDir(char const* dir) {
     }
 }
 
-/* 8029A130-8029A13C 294A70 000C+00 1/1 0/0 0/0 .text            getCurrentDir__16JASWaveArcLoaderFv
- */
 char* JASWaveArcLoader::getCurrentDir() {
     return sCurrentDir;
 }
 
-/* 8029A13C-8029A1B4 294A7C 0078+00 0/0 2/2 0/0 .text            __ct__10JASWaveArcFv */
 JASWaveArc::JASWaveArc() : mHeap(this) {
     _48 = 0;
     mStatus = 0;
@@ -58,10 +45,8 @@ JASWaveArc::JASWaveArc() : mHeap(this) {
     OSInitMutex(&mMutex);
 }
 
-/* 8029A1B4-8029A258 294AF4 00A4+00 1/0 2/2 0/0 .text            __dt__10JASWaveArcFv */
 JASWaveArc::~JASWaveArc() {}
 
-/* 8029A258-8029A2EC 294B98 0094+00 1/1 0/0 0/0 .text            loadSetup__10JASWaveArcFUl */
 bool JASWaveArc::loadSetup(u32 param_0) {
     JASMutexLock mutexLock(&mMutex);
     if (_58 != param_0) {
@@ -75,7 +60,6 @@ bool JASWaveArc::loadSetup(u32 param_0) {
     return true;
 }
 
-/* 8029A2EC-8029A378 294C2C 008C+00 1/1 0/0 0/0 .text            eraseSetup__10JASWaveArcFv */
 bool JASWaveArc::eraseSetup() {
     JASMutexLock mutexLock(&mMutex);
     if (mStatus == 0) {
@@ -90,8 +74,6 @@ bool JASWaveArc::eraseSetup() {
     return true;
 }
 
-/* 8029A378-8029A404 294CB8 008C+00 1/1 0/0 0/0 .text            loadToAramCallback__10JASWaveArcFPv
- */
 void JASWaveArc::loadToAramCallback(void* this_) {
     loadToAramCallbackParams* tmp = (loadToAramCallbackParams*)this_;
     JASWaveArc* wavArc = tmp->mWavArc;
@@ -107,7 +89,6 @@ void JASWaveArc::loadToAramCallback(void* this_) {
     }
 }
 
-/* 8029A404-8029A4C0 294D44 00BC+00 2/2 0/0 0/0 .text            sendLoadCmd__10JASWaveArcFv */
 bool JASWaveArc::sendLoadCmd() {
     JASMutexLock mutexLock(&mMutex);
     _48 = 0;
@@ -131,7 +112,6 @@ bool JASWaveArc::sendLoadCmd() {
     return true;
 }
 
-/* 8029A4C0-8029A580 294E00 00C0+00 0/0 2/2 0/0 .text            load__10JASWaveArcFP7JASHeap */
 bool JASWaveArc::load(JASHeap* heap) {
     if (mEntryNum < 0) {
         return false;
@@ -150,7 +130,6 @@ bool JASWaveArc::load(JASHeap* heap) {
     return sendLoadCmd();
 }
 
-/* 8029A580-8029A640 294EC0 00C0+00 0/0 1/1 0/0 .text            loadTail__10JASWaveArcFP7JASHeap */
 bool JASWaveArc::loadTail(JASHeap* heap) {
     if (mEntryNum < 0) {
         return false;
@@ -169,19 +148,16 @@ bool JASWaveArc::loadTail(JASHeap* heap) {
     return sendLoadCmd();
 }
 
-/* 8029A640-8029A664 294F80 0024+00 0/0 2/2 0/0 .text            erase__10JASWaveArcFv */
 bool JASWaveArc::erase() {
     return mHeap.free();
 }
 
-/* 8029A664-8029A6AC 294FA4 0048+00 1/0 2/0 0/0 .text            onDispose__10JASWaveArcFv */
 void JASWaveArc::onDispose() {
     if (eraseSetup()) {
         onEraseDone();
     }
 }
 
-/* 8029A6AC-8029A70C 294FEC 0060+00 1/1 0/0 0/0 .text            setEntryNum__10JASWaveArcFl */
 void JASWaveArc::setEntryNum(s32 entryNum) {
     DVDFileInfo fileInfo;
     if (entryNum < 0) {
@@ -196,7 +172,6 @@ void JASWaveArc::setEntryNum(s32 entryNum) {
     mEntryNum = entryNum;
 }
 
-/* 8029A70C-8029A7B8 29504C 00AC+00 0/0 2/2 0/0 .text            setFileName__10JASWaveArcFPCc */
 void JASWaveArc::setFileName(char const* fileName) {
     char* currentDir = JASWaveArcLoader::getCurrentDir();
     size_t length = strlen(currentDir);
diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
index 8fe110382f..2f226b1e1f 100644
--- a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
+++ b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp
@@ -1,24 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAUAudioArcInterpreter
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAUAudioArcInterpreter.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 802A4244-802A4260 29EB84 001C+00 0/0 1/1 0/0 .text            __ct__22JAUAudioArcInterpreterFv */
 JAUAudioArcInterpreter::JAUAudioArcInterpreter() {
     mBase = NULL;
     mReadPtr = NULL;
 }
 
-/* 802A4260-802A42A8 29EBA0 0048+00 1/0 3/3 0/0 .text            __dt__22JAUAudioArcInterpreterFv */
 JAUAudioArcInterpreter::~JAUAudioArcInterpreter() {}
 
-/* 802A42A8-802A4314 29EBE8 006C+00 0/0 1/1 0/0 .text            parse__22JAUAudioArcInterpreterFPCv
- */
 bool JAUAudioArcInterpreter::parse(void const* param_0) {
     mBase = (const u8*)param_0;
     mReadPtr = mBase;
@@ -29,13 +20,10 @@ bool JAUAudioArcInterpreter::parse(void const* param_0) {
     return true;
 }
 
-/* 802A4314-802A431C 29EC54 0008+00 1/0 1/0 0/0 .text readCommandMore__22JAUAudioArcInterpreterFUl
- */
 bool JAUAudioArcInterpreter::readCommandMore(u32 param_0) {
     return false;
 }
 
-/* 802A431C-802A4740 29EC5C 0424+00 1/1 0/0 0/0 .text readCommand___22JAUAudioArcInterpreterFv */
 bool JAUAudioArcInterpreter::readCommand_() {
     u32 cmd = readU32_();
     switch (cmd) {
diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
index 116b4a6ce9..74b00eda9a 100644
--- a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
+++ b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp
@@ -1,28 +1,19 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAUAudioArcLoader
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAUAudioArcLoader.h"
 #include "JSystem/JAudio2/JAISeMgr.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
 
-/* 802A4740-802A478C 29F080 004C+00 0/0 1/1 0/0 .text __ct__17JAUAudioArcLoaderFP10JAUSection */
 JAUAudioArcLoader::JAUAudioArcLoader(JAUSection* section) {
     //JUT_ASSERT(13, section->isOpen());
     //JUT_ASSERT(14, section->isBuilding());
     mSection = section;
 }
 
-/* 802A478C-802A47AC 29F0CC 0020+00 0/0 1/1 0/0 .text            load__17JAUAudioArcLoaderFPCv */
 bool JAUAudioArcLoader::load(void const* param_0) {
     return parse(param_0);
 }
 
-/* 802A47AC-802A4804 29F0EC 0058+00 1/0 1/0 0/0 .text            readWS__17JAUAudioArcLoaderFUlPCvUl
- */
 void JAUAudioArcLoader::readWS(u32 param_0, void const* param_1, u32 param_2) {
     mSection->newWaveBank(param_0, param_1);
     if (param_2) {
@@ -30,73 +21,52 @@ void JAUAudioArcLoader::readWS(u32 param_0, void const* param_1, u32 param_2) {
     }
 }
 
-/* 802A4804-802A4834 29F144 0030+00 1/0 1/0 0/0 .text            readBNK__17JAUAudioArcLoaderFUlPCv
- */
 void JAUAudioArcLoader::readBNK(u32 param_0, void const* param_1) {
     mSection->newBank(param_1, param_0);
 }
 
-/* 802A4834-802A4858 29F174 0024+00 1/0 1/0 0/0 .text            readBSC__17JAUAudioArcLoaderFPCvUl
- */
 void JAUAudioArcLoader::readBSC(void const* param_0, u32 param_1) {
     mSection->newSeSeqCollection(param_0, param_1);
 }
 
-/* 802A4858-802A4880 29F198 0028+00 1/0 1/0 0/0 .text            readBST__17JAUAudioArcLoaderFPCvUl
- */
 void JAUAudioArcLoader::readBST(void const* param_0, u32 param_1) {
     mSection->newSoundTable(param_0, param_1, true);
 }
 
-/* 802A4880-802A48A8 29F1C0 0028+00 1/0 0/0 0/0 .text            readBSTN__17JAUAudioArcLoaderFPCvUl
- */
 void JAUAudioArcLoader::readBSTN(void const* param_0, u32 param_1) {
     mSection->newSoundNameTable(param_0, param_1, true);
 }
 
-/* 802A48A8-802A48D4 29F1E8 002C+00 1/0 1/0 0/0 .text readBMS__17JAUAudioArcLoaderFUlPCvUl */
 void JAUAudioArcLoader::readBMS(u32 param_0, void const* param_1, u32 param_2) {
     mSection->newStaticSeqData(param_0, param_1, param_2);
 }
 
-/* 802A48D4-802A4900 29F214 002C+00 1/0 1/0 0/0 .text readBMS_fromArchive__17JAUAudioArcLoaderFUl
- */
 void JAUAudioArcLoader::readBMS_fromArchive(u32 param_0) {
     mSection->newStaticSeqData(param_0);
 }
 
-/* 802A4900-802A4930 29F240 0030+00 1/0 1/0 0/0 .text newVoiceBank__17JAUAudioArcLoaderFUlUl */
 void JAUAudioArcLoader::newVoiceBank(u32 param_0, u32 param_1) {
     mSection->newVoiceBank(param_1, param_0);
 }
 
-/* 802A4930-802A4968 29F270 0038+00 1/0 1/0 0/0 .text newDynamicSeqBlock__17JAUAudioArcLoaderFUl
- */
 void JAUAudioArcLoader::newDynamicSeqBlock(u32 param_0) {
     JAUSectionHeap* sectionHeap = mSection->asSectionHeap();
     JUT_ASSERT(72, sectionHeap);
     sectionHeap->newDynamicSeqBlock(param_0);
 }
 
-/* 802A4968-802A4990 29F2A8 0028+00 1/0 1/0 0/0 .text            readBSFT__17JAUAudioArcLoaderFPCv
- */
 void JAUAudioArcLoader::readBSFT(void const* param_0) {
     mSection->newStreamFileTable(param_0, true);
 }
 
-/* 802A4990-802A49B4 29F2D0 0024+00 1/0 1/0 0/0 .text beginBNKList__17JAUAudioArcLoaderFUlUl */
 void JAUAudioArcLoader::beginBNKList(u32 param_0, u32 param_1) {
     mSection->beginNewBankTable(param_0, param_1);
 }
 
-/* 802A49B4-802A49D8 29F2F4 0024+00 1/0 1/0 0/0 .text            endBNKList__17JAUAudioArcLoaderFv
- */
 void JAUAudioArcLoader::endBNKList() {
     mSection->endNewBankTable();
 }
 
-/* 802A49D8-802A49FC 29F318 0024+00 1/0 1/0 0/0 .text readMaxSeCategory__17JAUAudioArcLoaderFiii
- */
 void JAUAudioArcLoader::readMaxSeCategory(int param_0, int param_1, int param_2) {
     JAISeMgr* seMgr = JASGlobalInstance<JAISeMgr>::getInstance();
     if (seMgr) {
diff --git a/src/JSystem/JAudio2/JAUBankTable.cpp b/src/JSystem/JAudio2/JAUBankTable.cpp
index d9979015fd..bea2c69e41 100644
--- a/src/JSystem/JAudio2/JAUBankTable.cpp
+++ b/src/JSystem/JAudio2/JAUBankTable.cpp
@@ -1,14 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAUBankTable
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAUBankTable.h"
 
-/* 802A4A80-802A4AA0 29F3C0 0020+00 0/0 1/1 0/0 .text
- * appendBankTable__22JAUBankTableDictionaryFP23JSULink<12JAUBankTable> */
 void JAUBankTableDictionary::appendBankTable(JSULink<JAUBankTable>* bankTableList) {
     append(bankTableList);
 }
diff --git a/src/JSystem/JAudio2/JAUInitializer.cpp b/src/JSystem/JAudio2/JAUInitializer.cpp
index 83fb025938..cbcd7ba62b 100644
--- a/src/JSystem/JAudio2/JAUInitializer.cpp
+++ b/src/JSystem/JAudio2/JAUInitializer.cpp
@@ -15,7 +15,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JKernel/JKRThread.h"
 
-/* 802A4AD0-802A4B28 29F410 0058+00 0/0 1/1 0/0 .text            __ct__18JAU_JASInitializerFv */
 JAU_JASInitializer::JAU_JASInitializer() {
     audioMemory_ = 0;
     audioMemSize_ = 0;
@@ -32,8 +31,6 @@ JAU_JASInitializer::JAU_JASInitializer() {
     waveArcDir_ = NULL;
 }
 
-/* 802A4B28-802A4D3C 29F468 0214+00 0/0 1/1 0/0 .text
- * initJASystem__18JAU_JASInitializerFP12JKRSolidHeap           */
 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations
 void JAU_JASInitializer::initJASystem(JKRSolidHeap* heap) {
     if (JASAudioThread::getThreadPointer()) {
@@ -92,7 +89,6 @@ void JAU_JASInitializer::initJASystem(JKRSolidHeap* heap) {
     #endif
 }
 
-/* 802A4D3C-802A4D60 29F67C 0024+00 0/0 1/1 0/0 .text            __ct__18JAU_JAIInitializerFv */
 JAU_JAIInitializer::JAU_JAIInitializer() {
     field_0x0 = 100;
     field_0x4 = 4;
@@ -100,7 +96,6 @@ JAU_JAIInitializer::JAU_JAIInitializer() {
     field_0xc = 16;
 }
 
-/* 802A4D60-802A4EE8 29F6A0 0188+00 0/0 1/1 0/0 .text initJAInterface__18JAU_JAIInitializerFv */
 // NONMATCHING JASPoolAllocObject<_> locations
 void JAU_JAIInitializer::initJAInterface() {
     s32 r30 = JASDram->getFreeSize();
diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp
index 70e361f772..153ea20c12 100644
--- a/src/JSystem/JAudio2/JAUSectionHeap.cpp
+++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAUSectionHeap
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAUSectionHeap.h"
@@ -75,7 +70,6 @@ namespace {
     }
 }
 
-/* 802A4EE8-802A4F68 29F828 0080+00 1/1 0/0 0/0 .text __ct__Q210JAUSection12TSectionDataFv */
 JAUSection::TSectionData::TSectionData() {
     resetRegisteredWaveBankTables();
     resetRegisteredBankTables();
@@ -86,23 +80,18 @@ JAUSection::TSectionData::TSectionData() {
     field_0x9c = 0;
 }
 
-/* 802A4F68-802A4FE4 29F8A8 007C+00 1/1 0/0 0/0 .text
- * resetRegisteredBankTables__Q210JAUSection12TSectionDataFv    */
 void JAUSection::TSectionData::resetRegisteredBankTables() {
     for (u32 i = 0; i < 255; i++) {
         registeredBankTables.reset(i);
     }
 }
 
-/* 802A4FE4-802A5060 29F924 007C+00 1/1 0/0 0/0 .text
- * resetRegisteredWaveBankTables__Q210JAUSection12TSectionDataFv */
 void JAUSection::TSectionData::resetRegisteredWaveBankTables() {
     for (u32 i = 0; i < 255; i++) {
         registeredWaveBankTables.reset(i);
     }
 }
 
-/* 802A5060-802A50F8 29F9A0 0098+00 1/1 0/0 0/0 .text __ct__10JAUSectionFP14JAUSectionHeapUll */
 JAUSection::JAUSection(JAUSectionHeap* param_0, u32 param_1, s32 param_2)
             : JSULink<JAUSection>(this), field_0x28(param_1), sectionHeap_(param_0) {
     buildingBankTable_ = NULL;
@@ -113,7 +102,6 @@ JAUSection::JAUSection(JAUSectionHeap* param_0, u32 param_1, s32 param_2)
     }
 }
 
-/* 802A50F8-802A5160 29FA38 0068+00 0/0 1/1 0/0 .text            finishBuild__10JAUSectionFv */
 void JAUSection::finishBuild() {
     JUT_ASSERT(143, isOpen());
     JUT_ASSERT(144, isBuilding());
@@ -125,7 +113,6 @@ void JAUSection::finishBuild() {
     field_0x2c = 0;
 }
 
-/* 802A5160-802A51E4 29FAA0 0084+00 2/0 0/0 0/0 .text            dispose__10JAUSectionFv */
 void JAUSection::dispose() {
     JUT_ASSERT(267, ! data_.registeredBankTables.any());
     JUT_ASSERT(268, ! data_.registeredWaveBankTables.any());
@@ -139,8 +126,6 @@ void JAUSection::dispose() {
     }
 }
 
-/* 802A51E4-802A52A0 29FB24 00BC+00 0/0 1/1 0/0 .text            newSoundTable__10JAUSectionFPCvUlb
- */
 JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool param_2) {
     JUT_ASSERT(285, isOpen());
     JUT_ASSERT(286, isBuilding());
@@ -163,7 +148,6 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para
     return sectionHeap_->sectionHeapData_.soundTable;
 }
 
-/* 802A52A0-802A535C 29FBE0 00BC+00 0/0 1/1 0/0 .text newSoundNameTable__10JAUSectionFPCvUlb */
 JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1, bool param_2) {
     JUT_ASSERT(315, isOpen());
     JUT_ASSERT(316, isBuilding());
@@ -186,7 +170,6 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1,
     return sectionHeap_->sectionHeapData_.soundNameTable;
 }
 
-/* 802A535C-802A5500 29FC9C 01A4+00 0/0 1/1 0/0 .text newStreamFileTable__10JAUSectionFPCvb */
 JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param_1) {
     JUT_ASSERT(345, asSectionHeap() == this);
     JUT_ASSERT(346, isOpen());
@@ -212,7 +195,6 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
     return sectionHeap_->sectionHeapData_.streamDataMgr_;
 }
 
-/* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */
 JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
     // JUT_ASSERT(398, asSectionHeap() == this);
     JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL);
@@ -231,8 +213,6 @@ JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
     return sectionHeap_->sectionHeapData_.seSeqDataMgr_;
 }
 
-/* 802A5598-802A56C8 29FED8 0130+00 2/2 0/0 0/0 .text
- * newStaticSeqDataBlock___10JAUSectionF10JAISoundIDUl          */
 u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) {
     JUT_ASSERT(419, isOpen());
     JUT_ASSERT(420, isBuilding());
@@ -263,8 +243,6 @@ u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) {
     return NULL;
 }
 
-/* 802A56C8-802A5730 2A0008 0068+00 0/0 1/1 0/0 .text
- * newStaticSeqData__10JAUSectionF10JAISoundIDPCvUl             */
 bool JAUSection::newStaticSeqData(JAISoundID param_0, void const* param_1, u32 param_2) {
     u8* r30 = newStaticSeqDataBlock_(param_0, param_2);
     if (r30) {
@@ -274,8 +252,6 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0, void const* param_1, u32 p
     return false;
 }
 
-/* 802A5730-802A57F0 2A0070 00C0+00 0/0 1/1 0/0 .text newStaticSeqData__10JAUSectionF10JAISoundID
- */
 bool JAUSection::newStaticSeqData(JAISoundID param_0) {
     JKRArchive* seqArchive = data_.field_0x00.getSeqDataArchive();
     JUT_ASSERT(481, seqArchive);
@@ -293,7 +269,6 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0) {
     return false;
 }
 
-/* 802A57F0-802A5854 2A0130 0064+00 3/3 0/0 0/0 .text            newCopy__10JAUSectionFPCvUll */
 void* JAUSection::newCopy(void const* param_0, u32 param_1, s32 param_2) {
     JUT_ASSERT(516, isOpen());
     JUT_ASSERT(517, isBuilding());
@@ -309,7 +284,6 @@ static bool dummy_string(int i) {
     return x.test(i);
 }
 
-/* 802A5854-802A5948 2A0194 00F4+00 0/0 1/1 0/0 .text            newWaveBank__10JAUSectionFUlPCv */
 JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
     JUT_ASSERT(528, isOpen());
     JUT_ASSERT(529, isBuilding());
@@ -327,7 +301,6 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
 
 }
 
-/* 802A5948-802A5A50 2A0288 0108+00 0/0 1/1 0/0 .text            loadWaveArc__10JAUSectionFUlUl */
 bool JAUSection::loadWaveArc(u32 param_0, u32 param_1) {
     if (data_.registeredWaveBankTables.test(param_0)) {
         JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_0);
@@ -343,7 +316,6 @@ bool JAUSection::loadWaveArc(u32 param_0, u32 param_1) {
     return false;
 }
 
-/* 802A5A50-802A5B84 2A0390 0134+00 0/0 1/1 0/0 .text            newBank__10JAUSectionFPCvUl */
 JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
     JUT_ASSERT(647, isOpen());
     JUT_ASSERT(648, isBuilding());
@@ -369,7 +341,6 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
     return 0;
 }
 
-/* 802A5B84-802A5CAC 2A04C4 0128+00 0/0 1/1 0/0 .text            newVoiceBank__10JAUSectionFUlUl */
 JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
     {
         JUT_ASSERT(685, isOpen());
@@ -394,7 +365,6 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
     return NULL;
 }
 
-/* 802A5CAC-802A5D9C 2A05EC 00F0+00 0/0 1/1 0/0 .text beginNewBankTable__10JAUSectionFUlUl */
 bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
     JUT_ASSERT(714, isOpen());
     JUT_ASSERT(715, isBuilding());
@@ -417,7 +387,6 @@ bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
     return bankTableLink;
 }
 
-/* 802A5D9C-802A5DF4 2A06DC 0058+00 0/0 1/1 0/0 .text            endNewBankTable__10JAUSectionFv */
 JAUBankTable* JAUSection::endNewBankTable() {
     JAUBankTable* r29 = NULL;
     if (buildingBankTable_) {
@@ -428,8 +397,6 @@ JAUBankTable* JAUSection::endNewBankTable() {
     return r29;
 }
 
-/* 802A5DF4-802A5E60 2A0734 006C+00 1/1 0/0 0/0 .text __ct__Q214JAUSectionHeap16TSectionHeapDataFv
- */
 JAUSectionHeap::TSectionHeapData::TSectionHeapData() {
     seSeqDataMgr_ = NULL;
     streamDataMgr_ = NULL;
@@ -438,8 +405,6 @@ JAUSectionHeap::TSectionHeapData::TSectionHeapData() {
     seqDataUser = NULL;
 }
 
-/* 802A5E60-802A5EC0 2A07A0 0060+00 0/0 1/1 0/0 .text
- * setSeqDataArchive__14JAUSectionHeapFP10JKRArchive            */
 void JAUSectionHeap::setSeqDataArchive(JKRArchive* param_0) {
     sectionHeapData_.seqDataBlocks.setSeqDataArchive(param_0);
     for (JSULink<JAUSection>* link = mSectionList.getFirst(); link; link = link->getNext()) {
@@ -447,19 +412,14 @@ void JAUSectionHeap::setSeqDataArchive(JKRArchive* param_0) {
     }
 }
 
-/* 802A5EC0-802A5EF8 2A0800 0038+00 0/0 1/1 0/0 .text
- * loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb               */
 bool JAUSectionHeap::loadDynamicSeq(JAISoundID param_0, bool param_1) {
     return sectionHeapData_.seqDataBlocks.loadDynamicSeq(param_0, param_1, sectionHeapData_.seqDataUser);
 }
 
-/* 802A5EF8-802A5F24 2A0838 002C+00 0/0 1/1 0/0 .text
- * releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv           */
 u32 JAUSectionHeap::releaseIdleDynamicSeqDataBlock() {
     return sectionHeapData_.seqDataBlocks.releaseIdleDynamicSeqDataBlock(sectionHeapData_.seqDataUser);
 }
 
-/* 802A5F24-802A5F9C 2A0864 0078+00 1/1 0/0 0/0 .text JAUNewSectionHeap__FP12JKRSolidHeapb */
 static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) {
     JUT_ASSERT(809, JKRSolidHeap_isEmpty( heap ));
     TPushCurrentHeap push(heap);
@@ -467,7 +427,6 @@ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) {
     return new JAUSectionHeap(heap, param_1, r29);
 }
 
-/* 802A5F9C-802A5FE0 2A08DC 0044+00 0/0 1/1 0/0 .text            JAUNewSectionHeap__Fb */
 JAUSectionHeap* JAUNewSectionHeap(bool param_0) {
     s32 freeSize = JASDram->getFreeSize();
     JKRSolidHeap* sectionHeap = JKRCreateSolidHeap(freeSize, JASDram, true);
@@ -475,27 +434,21 @@ JAUSectionHeap* JAUNewSectionHeap(bool param_0) {
     return JAUNewSectionHeap(sectionHeap, param_0);
 }
 
-/* 802A5FE0-802A6094 2A0920 00B4+00 1/1 0/0 0/0 .text __ct__14JAUSectionHeapFP12JKRSolidHeapbl */
 JAUSectionHeap::JAUSectionHeap(JKRSolidHeap* param_0, bool param_1, s32 param_2)
         : JAUSection(this, 0, param_2), JASGlobalInstance<JAUSectionHeap>(param_1), mHeap(param_0) {
     field_0xe4 = 0;
     mSectionList.append(this);
 }
 
-/* 802A6094-802A60A0 2A09D4 000C+00 0/0 1/1 0/0 .text            getOpenSection__14JAUSectionHeapFv
- */
 JAUSection* JAUSectionHeap::getOpenSection() {
     return mSectionList.getLast()->getObject();
 }
 
-/* 802A60A0-802A60AC 2A09E0 000C+00 2/1 0/0 0/0 .text
- * setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser           */
 bool JAUSectionHeap::setSeqDataUser(JAISeqDataUser* param_0) {
     sectionHeapData_.seqDataUser = param_0;
     return true;
 }
 
-/* 802A60AC-802A61D0 2A09EC 0124+00 0/0 2/2 0/0 .text newDynamicSeqBlock__14JAUSectionHeapFUl */
 bool JAUSectionHeap::newDynamicSeqBlock(u32 size) {
     /* JUT_ASSERT(937, isOpen());
     JUT_ASSERT(938, isBuilding());
@@ -523,8 +476,6 @@ bool JAUSectionHeap::newDynamicSeqBlock(u32 size) {
     return false;
 }
 
-/* 802A61D0-802A6270 2A0B10 00A0+00 2/1 0/0 0/0 .text
- * getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData       */
 JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0, JAISeqData* param_1) {
     for (JSULink<JAUSection> * link = mSectionList.getFirst(); link; link = link->getNext()) {
         s32 result = link->getObject()->data_.field_0x00.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, false);
@@ -536,8 +487,6 @@ JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0,
     return (SeqDataReturnValue)sectionHeapData_.seqDataBlocks.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, true);
 }
 
-/* 802A6270-802A6278 2A0BB0 0008+00 2/1 0/0 0/0 .text            releaseSeqData__14JAUSectionHeapFv
- */
 int JAUSectionHeap::releaseSeqData() {
     return 0;
 }
diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp
index 7387d21dd5..a9787321f3 100644
--- a/src/JSystem/JAudio2/JAUSeqCollection.cpp
+++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp
@@ -1,19 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JAUSeqCollection
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/JAUSeqCollection.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 802A66A0-802A66AC 2A0FE0 000C+00 1/1 0/0 0/0 .text            __ct__16JAUSeqCollectionFv */
 JAUSeqCollection::JAUSeqCollection() {
     field_0x8 = NULL;
 }
 
-/* 802A66AC-802A66FC 2A0FEC 0050+00 0/0 1/1 0/0 .text            init__16JAUSeqCollectionFPCv */
 void JAUSeqCollection::init(void const* param_0) {
     field_0x8 = (const JAUSeqCollectionData*)param_0;
     if (field_0x8->field_0x0 != 0x53 || field_0x8->field_0x1 != 0x43) {
@@ -27,8 +20,6 @@ void JAUSeqCollection::init(void const* param_0) {
 
 }
 
-/* 802A66FC-802A6754 2A103C 0058+00 1/1 0/0 0/0 .text
- * getSeqData__16JAUSeqCollectionFiiP10JAISeqData               */
 bool JAUSeqCollection::getSeqData(int param_0, int param_1, JAISeqData* param_2) {
     if (param_0 >= field_0x0) {
         return false;
@@ -41,8 +32,6 @@ bool JAUSeqCollection::getSeqData(int param_0, int param_1, JAISeqData* param_2)
     return true;
 }
 
-/* 802A6754-802A677C 2A1094 0028+00 1/1 0/0 0/0 .text
- * getSeqDataRegion__16JAUSeqCollectionFP16JAISeqDataRegion     */
 bool JAUSeqCollection::getSeqDataRegion(JAISeqDataRegion* param_0) {
     if (isValid()) {
         param_0->addr = (u8*)field_0x8;
@@ -52,21 +41,16 @@ bool JAUSeqCollection::getSeqDataRegion(JAISeqDataRegion* param_0) {
     return false;
 }
 
-/* 802A677C-802A67D0 2A10BC 0054+00 0/0 1/1 0/0 .text __ct__27JAUSeqDataMgr_SeqCollectionFv */
 JAUSeqDataMgr_SeqCollection::JAUSeqDataMgr_SeqCollection() {
     user_ = NULL;
 }
 
-/* 802A67D0-802A67DC 2A1110 000C+00 1/0 0/0 0/0 .text
- * setSeqDataUser__27JAUSeqDataMgr_SeqCollectionFP14JAISeqDataUser */
 bool JAUSeqDataMgr_SeqCollection::setSeqDataUser(JAISeqDataUser* param_0) {
     JUT_ASSERT(60, user_ == NULL);
     user_ = param_0;
     return true;
 }
 
-/* 802A67DC-802A683C 2A111C 0060+00 1/0 0/0 0/0 .text
- * releaseSeqData__27JAUSeqDataMgr_SeqCollectionFv              */
 int JAUSeqDataMgr_SeqCollection::releaseSeqData() {
     if (user_) {
         JAISeqDataRegion region;
@@ -76,8 +60,6 @@ int JAUSeqDataMgr_SeqCollection::releaseSeqData() {
     return 2;
 }
 
-/* 802A683C-802A6894 2A117C 0058+00 1/0 0/0 0/0 .text
- * getSeqData__27JAUSeqDataMgr_SeqCollectionF10JAISoundIDP10JAISeqData */
 JAUSeqDataMgr_SeqCollection::SeqDataReturnValue JAUSeqDataMgr_SeqCollection::getSeqData(JAISoundID param_0, JAISeqData* param_1) {
     if (!isValid()) {
         return SeqDataReturnValue_0;
@@ -88,5 +70,4 @@ JAUSeqDataMgr_SeqCollection::SeqDataReturnValue JAUSeqDataMgr_SeqCollection::get
     return SeqDataReturnValue_0;
 }
 
-/* 802A6894-802A68F4 2A11D4 0060+00 1/0 0/0 0/0 .text __dt__27JAUSeqDataMgr_SeqCollectionFv */
 JAUSeqDataMgr_SeqCollection::~JAUSeqDataMgr_SeqCollection() {}
diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
index 7775956722..a5bb6ae620 100644
--- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
+++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp
@@ -9,11 +9,8 @@
 #include "JSystem/JAudio2/JASResArcLoader.h"
 #include "dolphin/types.h"
 
-/* 802A68F4-802A6928 2A1234 0034+00 0/0 2/2 0/0 .text            __ct__15JAUSeqDataBlockFv */
 JAUSeqDataBlock::JAUSeqDataBlock() : field_0x0(this) {}
 
-/* 802A6928-802A6974 2A1268 004C+00 1/1 0/0 0/0 .text getSeqData__16JAUSeqDataBlocksF10JAISoundID
- */
 u8* JAUSeqDataBlocks::getSeqData(JAISoundID param_0) {
     if (param_0.isAnonymous()) {
         return NULL;
@@ -29,7 +26,6 @@ u8* JAUSeqDataBlocks::getSeqData(JAISoundID param_0) {
     return NULL;
 }
 
-/* 802A6974-802A69D8 2A12B4 0064+00 1/1 0/0 0/0 .text seekFreeBlock__16JAUSeqDataBlocksFUl */
 JSULink<JAUSeqDataBlock>* JAUSeqDataBlocks::seekFreeBlock(u32 size) {
     u32 currentBlockSize = 0xffffffff;
     JSULink<JAUSeqDataBlock>* rv = NULL;
@@ -49,20 +45,14 @@ JSULink<JAUSeqDataBlock>* JAUSeqDataBlocks::seekFreeBlock(u32 size) {
     return NULL;
 }
 
-/* 802A69D8-802A69F8 2A1318 0020+00 5/5 0/0 0/0 .text
- * append__16JAUSeqDataBlocksFP26JSULink<15JAUSeqDataBlock>     */
 bool JAUSeqDataBlocks::append(JSULink<JAUSeqDataBlock>* param_0) {
     return JSUList::append(param_0);
 }
 
-/* 802A69F8-802A6A18 2A1338 0020+00 4/4 0/0 0/0 .text
- * remove__16JAUSeqDataBlocksFP26JSULink<15JAUSeqDataBlock>     */
 bool JAUSeqDataBlocks::remove(JSULink<JAUSeqDataBlock>* param_0) {
     return JSUList::remove(param_0);
 }
 
-/* 802A6A18-802A6A58 2A1358 0040+00 1/1 0/0 0/0 .text
- * hasFailedBlock__16JAUSeqDataBlocksF10JAISoundID              */
 bool JAUSeqDataBlocks::hasFailedBlock(JAISoundID param_0) {
     JSULink<JAUSeqDataBlock>* rv = NULL;
     for (JSULink<JAUSeqDataBlock>* link = getFirst(); link != NULL; link = link->getNext())
@@ -75,20 +65,14 @@ bool JAUSeqDataBlocks::hasFailedBlock(JAISoundID param_0) {
     return false;
 }
 
-/* 802A6A58-802A6AA0 2A1398 0048+00 0/0 2/2 0/0 .text            __ct__23JAUDynamicSeqDataBlocksFv
- */
 JAUDynamicSeqDataBlocks::JAUDynamicSeqDataBlocks() {
     seqDataArchive_ = NULL;
 }
 
-/* 802A6AA0-802A6AA8 -00001 0008+00 0/0 0/0 0/0 .text
- * setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive   */
 void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) {
     seqDataArchive_ = param_0;
 }
 
-/* 802A6AA8-802A6B8C 2A13E8 00E4+00 0/0 1/1 0/0 .text
- * getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab */
 s32 JAUDynamicSeqDataBlocks::getSeqData(JAISoundID param_0, JAISeqDataUser* param_1,
                                         JAISeqData* param_2, bool param_3) {
     rearrangeLoadingSeqs_();
@@ -113,8 +97,6 @@ s32 JAUDynamicSeqDataBlocks::getSeqData(JAISoundID param_0, JAISeqDataUser* para
     return 0;
 }
 
-/* 802A6B8C-802A6BF4 2A14CC 0068+00 0/0 2/2 0/0 .text
- * appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock */
 bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqDataBlock) {
     rearrangeLoadingSeqs_();
     if (seqDataBlock->field_0x10.isAnonymous()) {
@@ -125,8 +107,6 @@ bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqData
     return 1;
 }
 
-/* 802A6BF4-802A6C18 2A1534 0024+00 1/1 0/0 0/0 .text
- * JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl                */
 static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) {
     JAUSeqDataBlock* seqDataBlock = ((JSULink<JAUSeqDataBlock>*)param_1)->getObject();
     if (param_0 != NULL) {
@@ -136,8 +116,6 @@ static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) {
     }
 }
 
-/* 802A6C18-802A6D48 2A1558 0130+00 1/1 2/2 0/0 .text
- * loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser */
 bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1,
                                              JAISeqDataUser* param_2) {
     if (seqDataArchive_ == NULL) {
@@ -172,8 +150,6 @@ bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1,
     return true;
 }
 
-/* 802A6D48-802A6E00 2A1688 00B8+00 0/0 1/1 0/0 .text
- * releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser */
 u32 JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock(JAISeqDataUser* param_0) {
     rearrangeLoadingSeqs_();
     u32 size = 0;
@@ -195,8 +171,6 @@ u32 JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock(JAISeqDataUser* para
     return size;
 }
 
-/* 802A6E00-802A6EDC 2A1740 00DC+00 1/1 0/0 0/0 .text
- * releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl */
 JAUSeqDataBlock*
 JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock_(JAISeqDataUser* param_0, u32 param_1) {
     rearrangeLoadingSeqs_();
@@ -226,8 +200,6 @@ JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock_(JAISeqDataUser* param_0
     return NULL;
 }
 
-/* 802A6EDC-802A6F70 2A181C 0094+00 4/4 0/0 0/0 .text
- * rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv           */
 void JAUDynamicSeqDataBlocks::rearrangeLoadingSeqs_() {
     JSULink<JAUSeqDataBlock>* link = field_0xc.getFirst();
     JSULink<JAUSeqDataBlock>* nextLink;
diff --git a/src/JSystem/JAudio2/JAUSoundAnimator.cpp b/src/JSystem/JAudio2/JAUSoundAnimator.cpp
index 31be267d6a..21d97eeb1a 100644
--- a/src/JSystem/JAudio2/JAUSoundAnimator.cpp
+++ b/src/JSystem/JAudio2/JAUSoundAnimator.cpp
@@ -6,8 +6,6 @@
 
 #include "JSystem/JAudio2/JAUSoundAnimator.h"
 
-/* 802A6F70-802A7044 2A18B0 00D4+00 0/0 1/1 0/0 .text getStartSoundIndex__17JAUSoundAnimationCFf
- */
 int JAUSoundAnimation::getStartSoundIndex(f32 param_0) const {
     int i;
     for (i = 0; i < getNumSounds(); i++) {
@@ -18,7 +16,6 @@ int JAUSoundAnimation::getStartSoundIndex(f32 param_0) const {
     return i;
 }
 
-/* 802A7044-802A7114 2A1984 00D0+00 0/0 1/1 0/0 .text getEndSoundIndex__17JAUSoundAnimationCFf */
 int JAUSoundAnimation::getEndSoundIndex(f32 param_0) const {
     int i;
     for (i = 0; i < getNumSounds(); i++) {
diff --git a/src/JSystem/JAudio2/JAUSoundTable.cpp b/src/JSystem/JAudio2/JAUSoundTable.cpp
index beeca0335f..b398d8c1c0 100644
--- a/src/JSystem/JAudio2/JAUSoundTable.cpp
+++ b/src/JSystem/JAudio2/JAUSoundTable.cpp
@@ -6,7 +6,6 @@
 
 #include "JSystem/JAudio2/JAUSoundTable.h"
 
-/* 802A7114-802A7160 2A1A54 004C+00 0/0 1/1 0/0 .text            init__13JAUSoundTableFPCv */
 void JAUSoundTable::init(void const* param_0) {
     if (param_0 != NULL) {
         field_0x0.init(param_0);
@@ -15,8 +14,6 @@ void JAUSoundTable::init(void const* param_0) {
     }
 }
 
-/* 802A7160-802A728C 2A1AA0 012C+00 0/0 10/10 0/0 .text getTypeID__13JAUSoundTableCF10JAISoundID
- */
 u8 JAUSoundTable::getTypeID(JAISoundID param_0) const {
     if (param_0.isAnonymous()) {
         return 0xff;
@@ -32,7 +29,6 @@ u8 JAUSoundTable::getTypeID(JAISoundID param_0) const {
     return group->getTypeID(param_0.id_.info.waveID);
 }
 
-/* 802A728C-802A73D4 2A1BCC 0148+00 0/0 7/7 0/0 .text getData__13JAUSoundTableCF10JAISoundID */
 JAUSoundTableItem* JAUSoundTable::getData(JAISoundID param_0) const {
     if (param_0.isAnonymous()) {
         return NULL;
@@ -48,7 +44,6 @@ JAUSoundTableItem* JAUSoundTable::getData(JAISoundID param_0) const {
     return getItem(group, param_0.id_.info.waveID);
 }
 
-/* 802A73D4-802A7420 2A1D14 004C+00 0/0 1/1 0/0 .text            init__17JAUSoundNameTableFPCv */
 void JAUSoundNameTable::init(void const* param_0) {
     if (param_0 != NULL) {
         field_0x0.init(param_0);
diff --git a/src/JSystem/JAudio2/JAUStreamFileTable.cpp b/src/JSystem/JAudio2/JAUStreamFileTable.cpp
index e646e0ddc4..ccd18b890c 100644
--- a/src/JSystem/JAudio2/JAUStreamFileTable.cpp
+++ b/src/JSystem/JAudio2/JAUStreamFileTable.cpp
@@ -2,12 +2,10 @@
 
 #include "JSystem/JAudio2/JAUStreamFileTable.h"
 
-/* 802A7420-802A742C 2A1D60 000C+00 0/0 1/1 0/0 .text            __ct__18JAUStreamFileTableFv */
 JAUStreamFileTable::JAUStreamFileTable() {
     mData = NULL;
 }
 
-/* 802A742C-802A7478 2A1D6C 004C+00 0/0 1/1 0/0 .text            init__18JAUStreamFileTableFPCv */
 void JAUStreamFileTable::init(void const* data) {
     if (data == NULL) {
         mData = NULL;
@@ -20,12 +18,10 @@ void JAUStreamFileTable::init(void const* data) {
     }
 }
 
-/* 802A7478-802A7484 2A1DB8 000C+00 0/0 1/1 0/0 .text getNumFiles__18JAUStreamFileTableCFv */
 int JAUStreamFileTable::getNumFiles() const {
     return mData->mNumFiles;
 }
 
-/* 802A7484-802A74AC 2A1DC4 0028+00 1/1 1/1 0/0 .text getFilePath__18JAUStreamFileTableCFi */
 const char* JAUStreamFileTable::getFilePath(int index) const {
     if (mData == NULL) {
         return 0;
@@ -36,8 +32,6 @@ const char* JAUStreamFileTable::getFilePath(int index) const {
     return (char*)(data + *(int*)(data + 8 + (index * sizeof(s32))));
 }
 
-/* 802A74AC-802A74E8 2A1DEC 003C+00 1/0 0/0 0/0 .text
- * getStreamFileEntry__32JAUStreamDataMgr_StreamFileTableF10JAISoundID */
 s32 JAUStreamDataMgr_StreamFileTable::getStreamFileEntry(JAISoundID soundId) {
     const char* filePath = getFilePath(soundId.id_.info.waveID);
     if (filePath == NULL) {
diff --git a/src/JSystem/JAudio2/dspproc.cpp b/src/JSystem/JAudio2/dspproc.cpp
index a7efc896f7..8d4dd26dfe 100644
--- a/src/JSystem/JAudio2/dspproc.cpp
+++ b/src/JSystem/JAudio2/dspproc.cpp
@@ -4,7 +4,6 @@
 #include "JSystem/JAudio2/dsptask.h"
 #include "JSystem/JAudio2/JASDSPInterface.h"
 
-/* 8029E4E0-8029E528 298E20 0048+00 0/0 1/1 0/0 .text            DSPReleaseHalt2__FUl */
 void DSPReleaseHalt2(u32 msg) {
     u32 msgs[2];
     u16 dspMap = DSP_CreateMap2(msg);
@@ -13,16 +12,13 @@ void DSPReleaseHalt2(u32 msg) {
     DSPSendCommands2(msgs, 0, NULL);
 }
 
-/* 804512F8-80451300 0007F8 0004+04 2/2 0/0 0/0 .sbss            flag */
 static volatile BOOL flag;
 
-/* 8029E540-8029E54C 298E80 000C+00 1/1 0/0 0/0 .text            setup_callback__FUs */
 static void setup_callback(u16 param_0) {
     OS_REPORT("Finish %d\n", param_0);
     flag = FALSE;
 }
 
-/* 8029E560-8029E5C4 298EA0 0064+00 0/0 1/1 0/0 .text            DsetupTable__FUlUlUlUlUl */
 void DsetupTable(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
     u32 table[5];
     table[0] = (param_0 & 0xFFFF) | 0x81000000;
@@ -41,15 +37,12 @@ void DsetupTable(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4
     }
 }
 
-/* 804507C8-804507D0 000248 0002+06 3/3 0/0 0/0 .sdata           DSP_MIXERLEVEL */
 static u16 DSP_MIXERLEVEL = 0x4000;
 
-/* 8029E5E0-8029E604 298F20 0024+00 0/0 1/1 0/0 .text            DsetMixerLevel__Ff */
 void DsetMixerLevel(f32 level) {
     DSP_MIXERLEVEL = 4096.0f * level;
 }
 
-/* 8029E620-8029E674 298F60 0054+00 0/0 1/1 0/0 .text            DsyncFrame2ch__FUlUlUl */
 void DsyncFrame2ch(u32 param_0, u32 param_1, u32 param_2) {
     u32 msgs[5];
     msgs[0] = (param_0 & 0xff) << 0x10 | 0x82000000 | DSP_MIXERLEVEL;
@@ -60,7 +53,6 @@ void DsyncFrame2ch(u32 param_0, u32 param_1, u32 param_2) {
     DSPSendCommands2(msgs, 5, 0);
 }
 
-/* 8029E680-8029E6D0 298FC0 0050+00 0/0 1/1 0/0 .text            DsyncFrame4ch__FUlUlUlUlUl */
 void DsyncFrame4ch(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
     u32 msgs[5];
     msgs[0] = (param_0 & 0xff) << 0x10 | 0x82000000 | DSP_MIXERLEVEL;
diff --git a/src/JSystem/JAudio2/dsptask.cpp b/src/JSystem/JAudio2/dsptask.cpp
index 772cacbc17..a24a33c70d 100644
--- a/src/JSystem/JAudio2/dsptask.cpp
+++ b/src/JSystem/JAudio2/dsptask.cpp
@@ -11,7 +11,6 @@ static int DspStartWork(u32 param_0, void (*param_1)(u16));
 extern int Dsp_Running_Check();
 extern int Dsp_Running_Start();
 
-/* 8029E6E0-8029E718 299020 0038+00 1/1 0/0 0/0 .text            DspHandShake__FPv */
 void DspHandShake(void*) {
     OS_REPORT("DSP InitCallback \n");
     while (DSPCheckMailFromDSP() == 0) {}
@@ -24,8 +23,7 @@ void DspHandShake(void*) {
     Dsp_Running_Start();
 }
 
-/* 803C7920-803C9820 024A40 1F00+00 1/1 0/0 0/0 .data            jdsp */
-static u8 jdsp[7936] ALIGN_DECL(32) = {
+static u8 jdsp[7936] ATTRIBUTE_ALIGN(32) = {
     0x02, 0x9F, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00,
     0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0x9F, 0x06, 0xA5,
     0x02, 0x9F, 0x00, 0x4E, 0x12, 0x05, 0x02, 0xBF, 0x00, 0x57, 0x81, 0x00, 0x00, 0x9F, 0x10, 0x00,
@@ -524,13 +522,10 @@ static u8 jdsp[7936] ALIGN_DECL(32) = {
     0x80, 0x01, 0x02, 0xBF, 0x00, 0xF4, 0x02, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80431F80-80431FE0 05ECA0 0050+10 1/1 0/0 0/0 .bss             audio_task */
-static DSPTaskInfo audio_task ALIGN_DECL(32);
+static DSPTaskInfo audio_task ATTRIBUTE_ALIGN(32);
 
-/* 80431FE0-80433FE0 05ED00 2000+00 1/1 0/0 0/0 .bss             AUDIO_YIELD_BUFFER */
-static u8 AUDIO_YIELD_BUFFER[8192] ALIGN_DECL(32);
+static u8 AUDIO_YIELD_BUFFER[8192] ATTRIBUTE_ALIGN(32);
 
-/* 8029E720-8029E7CC 299060 00AC+00 0/0 1/1 0/0 .text            DspBoot__FPFPv_v */
 void DspBoot(void (*param_0)(void*)) {
     DspInitWork();
     OS_REPORT("Dsp をブートします\n");
@@ -552,7 +547,6 @@ void DspBoot(void (*param_0)(void*)) {
     OS_REPORT("Dspブートしました\n");
 }
 
-/* 8029E7E0-8029E8C8 299120 00E8+00 0/0 4/4 0/0 .text            DSPSendCommands2__FPUlUlPFUs_v */
 int DSPSendCommands2(u32* param_1, u32 param_2, void (*callBack)(u16)) {
     s32 i;
     BOOL interruptFlag;
@@ -590,7 +584,6 @@ int DSPSendCommands2(u32* param_1, u32 param_2, void (*callBack)(u16)) {
     return startWorkStatus;
 }
 
-/* 80433FE0-80434060 060D00 0080+00 3/3 0/0 0/0 .bss             taskwork */
 typedef struct {
     u16 field_0x0;
     u16 field_0x2;
@@ -599,20 +592,16 @@ typedef struct {
 
 static TaskWorkStruct taskwork[16];
 
-/* 8029E8E0-8029E90C 299220 002C+00 1/1 0/0 0/0 .text            DspInitWork__Fv */
 static void DspInitWork() {
     for (int i = 0; i < 16; i++) {
         taskwork[i].field_0x4 = NULL;
     }
 }
 
-/* 80451300-80451304 000800 0004+00 2/2 0/0 0/0 .sbss            taskreadp */
 static u32 taskreadp;
 
-/* 80451304-80451308 000804 0004+00 1/1 0/0 0/0 .sbss            taskwritep */
 static u32 taskwritep;
 
-/* 8029E920-8029E968 299260 0048+00 1/1 0/0 0/0 .text            DspStartWork__FUlPFUs_v */
 static int DspStartWork(u32 param_0, void (*param_1)(u16)) {
     u32 taskWritePrev = taskwritep;
     u32 writeVal = ((taskWritePrev + 1) & 0xf);
@@ -627,7 +616,6 @@ static int DspStartWork(u32 param_0, void (*param_1)(u16)) {
     return taskWritePrev + 1;
 }
 
-/* 8029E980-8029E9E8 2992C0 0068+00 0/0 1/1 0/0 .text            DspFinishWork__FUs */
 void DspFinishWork(u16 param_0) {
     if (param_0 != taskwork[taskreadp].field_0x0) {
         OS_REPORT("Error:: Not finish task\n");
diff --git a/src/JSystem/JAudio2/osdsp.cpp b/src/JSystem/JAudio2/osdsp.cpp
index 788979df5c..ff222269ec 100644
--- a/src/JSystem/JAudio2/osdsp.cpp
+++ b/src/JSystem/JAudio2/osdsp.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: osdsp
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/osdsp.h"
@@ -13,7 +8,6 @@
 extern "C" void __DSP_insert_task(DSPTaskInfo*);
 extern "C" void __DSP_boot_task(DSPTaskInfo*);
 
-/* 8029EA00-8029EA84 299340 0084+00 0/0 1/1 0/0 .text            DSPAddTask */
 DSPTaskInfo* DSPAddTask(DSPTaskInfo* task) {
     if (DSP_prior_task == NULL) {
         OSReport("Prior Task is not inited\n");
@@ -27,9 +21,7 @@ DSPTaskInfo* DSPAddTask(DSPTaskInfo* task) {
     return task;
 }
 
-/* ############################################################################################## */
 
-/* 8029EAA0-8029EB1C 2993E0 007C+00 0/0 1/1 0/0 .text DSPAddPriorTask__FP15STRUCT_DSP_TASK */
 void DSPAddPriorTask(STRUCT_DSP_TASK* task) {
     if (DSP_prior_task != NULL) {
         OSReport("Already inited prior DSP task\n");
diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/src/JSystem/JAudio2/osdsp_task.cpp
index 6a7f8bdca5..520e1cd446 100644
--- a/src/JSystem/JAudio2/osdsp_task.cpp
+++ b/src/JSystem/JAudio2/osdsp_task.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: osdsp_task
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JAudio2/osdsp_task.h"
@@ -17,16 +12,13 @@ extern "C" void __DSP_remove_task(DSPTaskInfo* task);
 
 static void Dsp_Update_Request();
 
-/* 80451308-8045130C -00001 0004+00 6/6 0/0 0/0 .sbss            None */
 /* 80451308 0001+00 data_80451308 None */
 /* 80451309 0003+00 data_80451309 None */
 static vu8 struct_80451308;
 static u8 struct_80451309;
 
-/* 8045130C-80451310 00080C 0004+00 1/1 2/2 0/0 .sbss            DSP_prior_task */
 DSPTaskInfo* DSP_prior_task;
 
-/* 8029EB20-8029EE24 299460 0304+00 0/0 1/1 0/0 .text            __DSPHandler */
 extern "C" void __DSPHandler(__OSInterrupt interrupt, OSContext* context) {
     OSContext funcContext;
     __DSPRegs[5] = ((u16)(__DSPRegs[5]) & ~0x28) | 0x80;
@@ -120,10 +112,8 @@ extern "C" void __DSPHandler(__OSInterrupt interrupt, OSContext* context) {
     OSSetCurrentContext(context);
 }
 
-/* 80434060-80434078 060D80 0014+04 3/3 0/0 0/0 .bss             sync_stack */
 static u32 sync_stack[5];
 
-/* 8029EE40-8029EE90 299780 0050+00 1/1 1/1 0/0 .text            DsyncFrame2__FUlUlUl */
 void DsyncFrame2(u32 param_0, u32 param_1, u32 param_2) {
     if (struct_80451308 != 1) {
         sync_stack[0] = param_0;
@@ -136,7 +126,6 @@ void DsyncFrame2(u32 param_0, u32 param_1, u32 param_2) {
     struct_80451309 = 0;
 }
 
-/* 8029EEA0-8029EEF8 2997E0 0058+00 1/1 0/0 0/0 .text            DsyncFrame3__FUlUlUlUlUl */
 static void DsyncFrame3(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
     if (struct_80451308 != 1) {
         sync_stack[0] = param_0;
@@ -151,7 +140,6 @@ static void DsyncFrame3(u32 param_0, u32 param_1, u32 param_2, u32 param_3, u32
     struct_80451309 = 0;
 }
 
-/* 8029EF00-8029EF78 299840 0078+00 1/1 0/0 0/0 .text            Dsp_Update_Request__Fv */
 static void Dsp_Update_Request() {
     switch (struct_80451309) {
     case 0:
@@ -165,12 +153,10 @@ static void Dsp_Update_Request() {
     }
 }
 
-/* 8029EF80-8029EF94 2998C0 0014+00 0/0 1/1 0/0 .text            Dsp_Running_Check__Fv */
 bool Dsp_Running_Check() {
     return struct_80451308 == 1;
 }
 
-/* 8029EFA0-8029EFAC 2998E0 000C+00 0/0 1/1 0/0 .text            Dsp_Running_Start__Fv */
 void Dsp_Running_Start() {
     struct_80451308 = 1;
 }
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index a42f21c60f..4d62a8f483 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/src/JSystem/JFramework/JFWDisplay.cpp
@@ -10,7 +10,6 @@
 #include <dolphin/vi.h>
 #include "global.h"
 
-/* 80272040-802720F8 26C980 00B8+00 1/1 0/0 0/0 .text            ctor_subroutine__10JFWDisplayFb */
 void JFWDisplay::ctor_subroutine(bool enableAlpha) {
     mEnableAlpha = enableAlpha;
     mClamp = GX_CLAMP_TOP | GX_CLAMP_BOTTOM;
@@ -36,30 +35,24 @@ void JFWDisplay::ctor_subroutine(bool enableAlpha) {
     field_0x44 = 0;
 }
 
-/* ############################################################################################## */
-/* 803C4020-803C4060 021140 0030+10 1/1 0/0 0/0 .data            e_mtx */
-static Mtx e_mtx ALIGN_DECL(32) = {
+static Mtx e_mtx ATTRIBUTE_ALIGN(32) = {
     {1.0f, 0.0f, 0.0f, 0.0f},
     {0.0f, 1.0f, 0.0f, 0.0f},
     {0.0f, 0.0f, 1.0f, 0.0f},
 };
 
-/* 803C4060-803C40A0 021180 0040+00 1/1 0/0 0/0 .data            clear_z_TX */
-static u8 clear_z_TX[64] ALIGN_DECL(32) = {
+static u8 clear_z_TX[64] ATTRIBUTE_ALIGN(32) = {
     0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
     0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF,
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 };
 
-/* 802720F8-80272160 26CA38 0068+00 1/1 0/0 0/0 .text
- * __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb           */
 JFWDisplay::JFWDisplay(JKRHeap* p_heap, JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
     ctor_subroutine(enableAlpha);
     mXfbManager = JUTXfb::createManager(p_heap, xfb_num);
 }
 
-/* 80272160-802721DC 26CAA0 007C+00 1/0 0/0 0/0 .text            __dt__10JFWDisplayFv */
 JFWDisplay::~JFWDisplay() {
     if (JUTVideo::getManager() != NULL) {
         waitBlanking(2);
@@ -69,12 +62,8 @@ JFWDisplay::~JFWDisplay() {
     mXfbManager = NULL;
 }
 
-/* ############################################################################################## */
-/* 804511C0-804511C4 0006C0 0004+00 2/2 40/40 1/1 .sbss            sManager__10JFWDisplay */
 JFWDisplay* JFWDisplay::sManager;
 
-/* 802721DC-80272260 26CB1C 0084+00 0/0 1/1 0/0 .text
- * createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb */
 JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p_heap,
                                       JUTXfb::EXfbNumber xfb_num, bool enableAlpha) {
     if (p_rObj != NULL) {
@@ -88,7 +77,6 @@ JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p
     return sManager;
 }
 
-/* 80272260-802722B8 26CBA0 0058+00 2/2 0/0 0/0 .text            callDirectDraw__Fv */
 static void callDirectDraw() {
     JUTChangeFrameBuffer(JUTXfb::getManager()->getDrawingXfb(),
                          JUTVideo::getManager()->getEfbHeight(),
@@ -96,7 +84,6 @@ static void callDirectDraw() {
     JUTAssertion::flushMessage();
 }
 
-/* 802722B8-802723AC 26CBF8 00F4+00 3/3 0/0 0/0 .text            prepareCopyDisp__10JFWDisplayFv */
 void JFWDisplay::prepareCopyDisp() {
     u16 width = JUTVideo::getManager()->getFbWidth();
     u16 height = JUTVideo::getManager()->getEfbHeight();
@@ -119,8 +106,6 @@ void JFWDisplay::prepareCopyDisp() {
     }
 }
 
-/* 802723AC-802723F4 26CCEC 0048+00 1/1 0/0 0/0 .text            drawendXfb_single__10JFWDisplayFv
- */
 void JFWDisplay::drawendXfb_single() {
     JUTXfb* manager = JUTXfb::getManager();
     if (manager->getDrawingXfbIndex() >= 0) {
@@ -131,8 +116,6 @@ void JFWDisplay::drawendXfb_single() {
     }
 }
 
-/* 802723F4-802724FC 26CD34 0108+00 1/1 0/0 0/0 .text            exchangeXfb_double__10JFWDisplayFv
- */
 void JFWDisplay::exchangeXfb_double() {
     JUTXfb* xfbMng = JUTXfb::getManager();
 
@@ -167,8 +150,6 @@ void JFWDisplay::exchangeXfb_double() {
     }
 }
 
-/* 802724FC-80272574 26CE3C 0078+00 1/1 0/0 0/0 .text            exchangeXfb_triple__10JFWDisplayFv
- */
 void JFWDisplay::exchangeXfb_triple() {
     JUTXfb* xfbMng = JUTXfb::getManager();
 
@@ -187,7 +168,6 @@ void JFWDisplay::exchangeXfb_triple() {
     xfbMng->setDrawingXfbIndex(drawing_idx);
 }
 
-/* 80272574-802725F8 26CEB4 0084+00 1/1 0/0 0/0 .text            copyXfb_triple__10JFWDisplayFv */
 void JFWDisplay::copyXfb_triple() {
     JUTXfb* xfbMng = JUTXfb::getManager();
 
@@ -201,7 +181,6 @@ void JFWDisplay::copyXfb_triple() {
     }
 }
 
-/* 802725F8-8027268C 26CF38 0094+00 1/1 0/0 0/0 .text            preGX__10JFWDisplayFv */
 void JFWDisplay::preGX() {
     GXInvalidateTexAll();
     GXInvalidateVtxCache();
@@ -220,7 +199,6 @@ void JFWDisplay::preGX() {
     }
 }
 
-/* 8027268C-80272798 26CFCC 010C+00 1/1 0/0 0/0 .text            endGX__10JFWDisplayFv */
 void JFWDisplay::endGX() {
     f32 width = JUTVideo::getManager()->getFbWidth();
     f32 height = JUTVideo::getManager()->getEfbHeight();
@@ -248,7 +226,6 @@ void JFWDisplay::endGX() {
     GXFlush();
 }
 
-/* 80272798-80272A04 26D0D8 026C+00 1/0 0/0 0/0 .text            beginRender__10JFWDisplayFv */
 void JFWDisplay::beginRender() {
     if (field_0x40) {
         JUTProcBar::getManager()->wholeLoopEnd();
@@ -309,7 +286,6 @@ void JFWDisplay::beginRender() {
     }
 }
 
-/* 80272A04-80272AB0 26D344 00AC+00 1/0 0/0 0/0 .text            endRender__10JFWDisplayFv */
 void JFWDisplay::endRender() {
     endGX();
 
@@ -330,7 +306,6 @@ void JFWDisplay::endRender() {
     calcCombinationRatio();
 }
 
-/* 80272AB0-80272C60 26D3F0 01B0+00 1/0 0/0 0/0 .text            endFrame__10JFWDisplayFv */
 void JFWDisplay::endFrame() {
     JUTProcBar::getManager()->cpuEnd();
 
@@ -363,14 +338,12 @@ void JFWDisplay::endFrame() {
     }
 }
 
-/* 80272C60-80272CB0 26D5A0 0050+00 1/1 1/1 0/0 .text            waitBlanking__10JFWDisplayFi */
 void JFWDisplay::waitBlanking(int param_0) {
     while (param_0-- > 0) {
         waitForTick(mTickRate, mFrameRate);
     }
 }
 
-/* 80272CB0-80272DD0 26D5F0 0120+00 2/2 0/0 0/0 .text            waitForTick__FUlUs */
 static void waitForTick(u32 p1, u16 p2) {
     if (p1 != 0) {
         static OSTime nextTick = OSGetTime();
@@ -394,18 +367,14 @@ static void waitForTick(u32 p1, u16 p2) {
     }
 }
 
-/* 80430FE4-80430FF0 05DD04 000C+00 4/4 0/0 0/0 .bss             sList__8JFWAlarm */
 JSUList<JFWAlarm> JFWAlarm::sList(false);
 
-/* 80272DD0-80272E10 26D710 0040+00 1/1 0/0 0/0 .text JFWThreadAlarmHandler__FP7OSAlarmP9OSContext
- */
 static void JFWThreadAlarmHandler(OSAlarm* p_alarm, OSContext* p_ctx) {
     JFWAlarm* alarm = static_cast<JFWAlarm*>(p_alarm);
     alarm->removeLink();
     OSResumeThread(alarm->getThread());
 }
 
-/* 80272E10-80272EB8 26D750 00A8+00 1/1 0/0 0/0 .text            threadSleep__10JFWDisplayFx */
 void JFWDisplay::threadSleep(s64 time) {
     JFWAlarm alarm;
     alarm.createAlarm();
@@ -418,23 +387,18 @@ void JFWDisplay::threadSleep(s64 time) {
     OSRestoreInterrupts(status);
 }
 
-/* ############################################################################################## */
-/* 80430FF0-80431010 05DD10 0020+00 2/2 0/0 0/0 .bss             clear_z_tobj */
 static GXTexObj clear_z_tobj;
 
-/* 80272EB8-80272F2C 26D7F8 0074+00 1/1 0/0 0/0 .text            clearEfb_init__10JFWDisplayFv */
 void JFWDisplay::clearEfb_init() {
     GXInitTexObj(&clear_z_tobj, &clear_z_TX, 4, 4, GX_TF_Z24X8, GX_REPEAT, GX_REPEAT, GX_FALSE);
     GXInitTexObjLOD(&clear_z_tobj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE,
                     GX_ANISO_1);
 }
 
-/* 80272F2C-80272F58 26D86C 002C+00 1/1 0/0 0/0 .text            clearEfb__10JFWDisplayFv */
 void JFWDisplay::clearEfb() {
     clearEfb(mClearColor);
 }
 
-/* 80272F58-80272F9C 26D898 0044+00 3/3 0/0 0/0 .text            clearEfb__10JFWDisplayF8_GXColor */
 void JFWDisplay::clearEfb(GXColor color) {
     int width = JUTVideo::getManager()->getFbWidth();
     int height = JUTVideo::getManager()->getEfbHeight();
@@ -442,7 +406,6 @@ void JFWDisplay::clearEfb(GXColor color) {
     clearEfb(0, 0, width, height, color);
 }
 
-/* 80272F9C-8027331C 26D8DC 0380+00 1/1 0/0 0/0 .text clearEfb__10JFWDisplayFiiii8_GXColor */
 void JFWDisplay::clearEfb(int param_0, int param_1, int param_2, int param_3, GXColor color) {
     u16 width;
     u16 height;
@@ -509,7 +472,6 @@ void JFWDisplay::clearEfb(int param_0, int param_1, int param_2, int param_3, GX
     }
 }
 
-/* 8027331C-802733A8 26DC5C 008C+00 1/1 0/0 0/0 .text calcCombinationRatio__10JFWDisplayFv */
 void JFWDisplay::calcCombinationRatio() {
     u32 vidInterval = JUTVideo::getVideoInterval();
     s32 unk30 = field_0x30 * 2;
@@ -528,7 +490,6 @@ void JFWDisplay::calcCombinationRatio() {
     }
 }
 
-/* 802733A8-80273484 26DCE8 00DC+00 2/2 0/0 0/0 .text            JFWDrawDoneAlarm__Fv */
 static void JFWDrawDoneAlarm() {
     JFWAlarm alarm;
     s32 status = OSDisableInterrupts();
@@ -541,8 +502,6 @@ static void JFWDrawDoneAlarm() {
     OSRestoreInterrupts(status);
 }
 
-/* 80273484-802734FC 26DDC4 0078+00 1/1 0/0 0/0 .text
- * JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext                */
 static void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) {
     diagnoseGpHang();
     GXAbortFrame();
@@ -558,7 +517,6 @@ static void JFWGXAbortAlarmHandler(OSAlarm* param_0, OSContext* param_1) {
     GXSetDrawDone();
 }
 
-/* 802734FC-802736DC 26DE3C 01E0+00 1/1 0/0 0/0 .text            diagnoseGpHang__Fv */
 static void diagnoseGpHang() {
     u32 sp28;
     u32 sp24;
diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp
index 84dc644d34..3246e6224c 100644
--- a/src/JSystem/JFramework/JFWSystem.cpp
+++ b/src/JSystem/JFramework/JFWSystem.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JFWSystem
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JFramework/JFWSystem.h"
@@ -18,53 +13,33 @@
 #include "JSystem/JUtility/JUTResFont.h"
 #include "JSystem/JUtility/JUTDbPrint.h"
 
-/* 80450770-80450774 0001F0 0004+00 1/1 1/1 0/0 .sdata maxStdHeaps__Q29JFWSystem11CSetUpParam */
 s32 JFWSystem::CSetUpParam::maxStdHeaps = 2;
 
-/* 80450774-80450778 0001F4 0004+00 1/1 1/1 0/0 .sdata sysHeapSize__Q29JFWSystem11CSetUpParam */
 u32 JFWSystem::CSetUpParam::sysHeapSize = 0x400000;
 
-/* 804511A0-804511A4 0006A0 0004+00 2/2 0/0 0/0 .sbss            rootHeap__9JFWSystem */
 JKRExpHeap* JFWSystem::rootHeap;
 
-/* 804511A4-804511A8 0006A4 0004+00 2/2 1/1 0/0 .sbss            systemHeap__9JFWSystem */
 JKRExpHeap* JFWSystem::systemHeap;
 
 
-/* 80450778-8045077C 0001F8 0004+00 1/1 1/1 0/0 .sdata fifoBufSize__Q29JFWSystem11CSetUpParam */
 u32 JFWSystem::CSetUpParam::fifoBufSize = 0x40000;
 
-/* 8045077C-80450780 0001FC 0004+00 1/1 1/1 0/0 .sdata aramAudioBufSize__Q29JFWSystem11CSetUpParam
- */
 u32 JFWSystem::CSetUpParam::aramAudioBufSize = 0x800000;
 
-/* 80450780-80450784 000200 0004+00 1/1 1/1 0/0 .sdata aramGraphBufSize__Q29JFWSystem11CSetUpParam
- */
 u32 JFWSystem::CSetUpParam::aramGraphBufSize = 0x600000;
 
-/* 80450784-80450788 000204 0004+00 1/1 0/0 0/0 .sdata streamPriority__Q29JFWSystem11CSetUpParam
- */
 s32 JFWSystem::CSetUpParam::streamPriority = 8;
 
-/* 80450788-8045078C 000208 0004+00 1/1 0/0 0/0 .sdata decompPriority__Q29JFWSystem11CSetUpParam
- */
 s32 JFWSystem::CSetUpParam::decompPriority = 7;
 
-/* 8045078C-80450790 00020C 0004+00 1/1 0/0 0/0 .sdata aPiecePriority__Q29JFWSystem11CSetUpParam
- */
 s32 JFWSystem::CSetUpParam::aPiecePriority = 6;
 
-/* 80450790-80450794 -00001 0004+00 1/1 0/0 0/0 .sdata systemFontRes__Q29JFWSystem11CSetUpParam */
 ResFONT* JFWSystem::CSetUpParam::systemFontRes = (ResFONT*)&JUTResFONT_Ascfont_fix12;
 
-/* 80450794-80450798 -00001 0004+00 1/1 1/1 0/0 .sdata renderMode__Q29JFWSystem11CSetUpParam */
 const GXRenderModeObj* JFWSystem::CSetUpParam::renderMode = &GXNtsc480IntDf;
 
-/* 80450798-804507A0 000218 0004+04 1/1 0/0 0/0 .sdata
- * exConsoleBufferSize__Q29JFWSystem11CSetUpParam               */
 u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
 
-/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text            firstInit__9JFWSystemFv */
 void JFWSystem::firstInit() {
     JUT_ASSERT(80, rootHeap == NULL);
     OSInit();
@@ -73,25 +48,18 @@ void JFWSystem::firstInit() {
     systemHeap = JKRExpHeap::create(CSetUpParam::sysHeapSize, rootHeap, false);
 }
 
-/* 804511A8-804511AC 0006A8 0004+00 1/1 0/0 0/0 .sbss            mainThread__9JFWSystem */
 JKRThread* JFWSystem::mainThread;
 
-/* 804511AC-804511B0 0006AC 0004+00 1/1 0/0 0/0 .sbss            debugPrint__9JFWSystem */
 JUTDbPrint* JFWSystem::debugPrint;
 
-/* 804511B0-804511B4 0006B0 0004+00 1/1 0/0 0/0 .sbss            systemFont__9JFWSystem */
 JUTResFont* JFWSystem::systemFont;
 
-/* 804511B4-804511B8 0006B4 0004+00 1/1 0/0 0/0 .sbss            systemConsoleManager__9JFWSystem */
 JUTConsoleManager* JFWSystem::systemConsoleManager;
 
-/* 804511B8-804511BC 0006B8 0004+00 1/1 7/7 0/0 .sbss            systemConsole__9JFWSystem */
 JUTConsole* JFWSystem::systemConsole;
 
-/* 804511BC-804511C0 0006BC 0004+00 1/1 0/0 0/0 .sbss            None */
 bool JFWSystem::sInitCalled = false;
 
-/* 80271D18-80272040 26C658 0328+00 0/0 1/1 0/0 .text            init__9JFWSystemFv */
 // NONMATCHING - regalloc, equivalent
 void JFWSystem::init() {
     JUT_ASSERT(101, sInitCalled == false);
diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp
index 67b6afab96..e6c25a9044 100644
--- a/src/JSystem/JGadget/binary.cpp
+++ b/src/JSystem/JGadget/binary.cpp
@@ -1,14 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: binary
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JGadget/binary.h"
 
-/* 802DC864-802DC8C8 2D71A4 0064+00 0/0 2/2 0/0 .text
- * parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit */
 const void*
 JGadget::binary::parseVariableUInt_16_32_following(void const* buffer, u32* param_1, u32* param_2,
                                                    JGadget::binary::TEBit* param_3) {
@@ -35,13 +28,9 @@ JGadget::binary::parseVariableUInt_16_32_following(void const* buffer, u32* para
     return rv;
 }
 
-/* 802DC8C8-802DC910 2D7208 0048+00 0/0 4/4 0/0 .text
- * __dt__Q37JGadget6binary19TParse_header_blockFv               */
 JGadget::binary::TParse_header_block::~TParse_header_block() {
 }
 
-/* 802DC910-802DCA1C 2D7250 010C+00 0/0 9/9 0/0 .text
- * parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl    */
 bool JGadget::binary::TParse_header_block::parse_next(void const** ptrLocation, u32 idx) {
     u32 headerEnd, blockEnd;
     
diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp
index 9f9efab470..2bbe15f882 100644
--- a/src/JSystem/JGadget/linklist.cpp
+++ b/src/JSystem/JGadget/linklist.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: linklist
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JGadget/linklist.h"
@@ -18,12 +13,8 @@ private:
     const T* p_;
 };
 
-/* 802DCA1C-802DCA58 2D735C 003C+00 1/1 6/6 0/0 .text            __dt__Q27JGadget13TNodeLinkListFv
- */
 JGadget::TNodeLinkList::~TNodeLinkList() {}
 
-/* 802DCA58-802DCAA0 2D7398 0048+00 0/0 2/2 0/0 .text
- * erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iterator */
 JGadget::TNodeLinkList::iterator
 JGadget::TNodeLinkList::erase(JGadget::TNodeLinkList::iterator it) {
     iterator next = it;
@@ -63,8 +54,6 @@ void JGadget::TNodeLinkList::splice(iterator it, TNodeLinkList& rSrc, iterator i
     }
 }
 
-/* 802DCBA8-802DCBD4 2D74E8 002C+00 1/1 7/7 0/0 .text
- * Insert__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorPQ27JGadget13TLinkListNode */
 JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Insert(iterator it, TLinkListNode* p) {
     TLinkListNode* pIt = it.node;
     TLinkListNode* pItPrev = pIt->mPrev;
@@ -77,8 +66,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Insert(iterator it, TLi
     return iterator(p);
 }
 
-/* 802DCBD4-802DCBF8 2D7514 0024+00 2/2 4/4 0/0 .text
- * Erase__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode  */
 JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Erase(TLinkListNode* p) {
     TLinkListNode* pNext = p->mNext;
     TLinkListNode* pPrev = p->mPrev;
@@ -88,8 +75,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::Erase(TLinkListNode* p)
     return iterator(pNext);
 }
 
-/* 802DCBF8-802DCCC8 2D7538 00D0+00 0/0 2/2 0/0 .text
- * Remove__Q27JGadget13TNodeLinkListFPQ27JGadget13TLinkListNode */
 // NONMATCHING - missing stack
 void JGadget::TNodeLinkList::Remove(TLinkListNode* p) {
     remove_if(TPRIsEqual_pointer_<TLinkListNode>(p));
diff --git a/src/JSystem/JGadget/std-vector.cpp b/src/JSystem/JGadget/std-vector.cpp
index 760ce30fce..57a9c29b1b 100644
--- a/src/JSystem/JGadget/std-vector.cpp
+++ b/src/JSystem/JGadget/std-vector.cpp
@@ -1,23 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: std-vector
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JGadget/std-vector.h"
 
-/* 802DCCC8-802DCCD0 2D7608 0008+00 1/1 0/0 0/0 .text extend_default__Q27JGadget6vectorFUlUlUl */
 u32 JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) {
     return param_1 << 1;
 }
 
-/* 802DCCD0-802DCCFC 2D7610 002C+00 0/0 1/1 0/0 .text
- * __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator<Pv> */
 JGadget::TVector_pointer_void::TVector_pointer_void(JGadget::TAllocator<void*> const& param_0) : TVector<void*>(param_0) {
 }
 
-/* 802DCCFC-802DCDA4 2D763C 00A8+00 0/0 2/2 0/0 .text __dt__Q27JGadget20TVector_pointer_voidFv */
 JGadget::TVector_pointer_void::~TVector_pointer_void() {
 }
 
@@ -25,14 +16,10 @@ void dummy_weak_order(JGadget::TVector<void*> vec) {
     vec.insert(NULL, 0, NULL);
 }
 
-/* 802DCDA4-802DCDC4 2D76E4 0020+00 0/0 1/1 0/0 .text
- * insert__Q27JGadget20TVector_pointer_voidFPPvRCPv             */
 void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) {
     TVector<void*>::insert(param_0, param_1);
 }
 
-/* 802DCDC4-802DCE1C 2D7704 0058+00 0/0 1/1 0/0 .text
- * erase__Q27JGadget20TVector_pointer_voidFPPvPPv               */
 void** JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) {
     return TVector<void*>::erase(param_0, param_1);
 }
diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp
index 20435aaf64..315054a33e 100644
--- a/src/JSystem/JKernel/JKRAram.cpp
+++ b/src/JSystem/JKernel/JKRAram.cpp
@@ -16,10 +16,8 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
                                           u32 offset, u32* resourceSize);
 int decompSZS_subroutine(u8* src, u8* dest);
 
-/* 804513C8-804513CC 0008C8 0004+00 3/3 9/9 0/0 .sbss            sAramObject__7JKRAram */
 JKRAram* JKRAram::sAramObject;
 
-/* 802D1FA4-802D2040 2CC8E4 009C+00 0/0 1/1 0/0 .text            create__7JKRAramFUlUllll */
 JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size, s32 stream_priority,
                          s32 decomp_priority, s32 piece_priority) {
     if (!sAramObject) {
@@ -33,8 +31,6 @@ JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size,
     return sAramObject;
 }
 
-/* ############################################################################################## */
-/* 803CC128-803CC138 029248 0010+00 1/1 0/0 0/0 .data            sMessageBuffer__7JKRAram */
 OSMessage JKRAram::sMessageBuffer[4] = {
     NULL,
     NULL,
@@ -42,10 +38,8 @@ OSMessage JKRAram::sMessageBuffer[4] = {
     NULL,
 };
 
-/* 803CC138-803CC158 029258 0020+00 1/1 1/1 0/0 .data            sMessageQueue__7JKRAram */
 OSMessageQueue JKRAram::sMessageQueue = {0};
 
-/* 802D2040-802D214C 2CC980 010C+00 1/1 0/0 0/0 .text            __ct__7JKRAramFUlUll */
 JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
     : JKRThread(0xC00, 0x10, priority) {
     u32 aramBase = ARInit(mStackArray, ARRAY_SIZEU(mStackArray));
@@ -74,14 +68,12 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority)
     mAramHeap = new (JKRHeap::getSystemHeap(), 0) JKRAramHeap(mGraphMemoryPtr, mGraphMemorySize);
 }
 
-/* 802D214C-802D21DC 2CCA8C 0090+00 1/0 0/0 0/0 .text            __dt__7JKRAramFv */
 JKRAram::~JKRAram() {
     sAramObject = NULL;
     if (mAramHeap)
         delete mAramHeap;
 }
 
-/* 802D21DC-802D2248 2CCB1C 006C+00 1/0 0/0 0/0 .text            run__7JKRAramFv */
 void* JKRAram::run(void) {
     int result;
     JKRAMCommand* command;
@@ -101,8 +93,6 @@ void* JKRAram::run(void) {
     } while (true);
 }
 
-/* 802D2248-802D22DC 2CCB88 0094+00 2/2 0/0 0/0 .text
- * checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl              */
 void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_4) {
     if (!IS_ALIGNED((uintptr_t)addr, 0x20) && !IS_ALIGNED(size, 0x20)) {
         JUTException::panic(__FILE__, 219, ":::address not 32Byte aligned.");
@@ -113,8 +103,6 @@ void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_
     }
 }
 
-/* 802D22DC-802D233C 2CCC1C 0060+00 1/1 0/0 0/0 .text            changeGroupIdIfNeed__7JKRAramFPUci
- */
 void JKRAram::changeGroupIdIfNeed(u8* data, int groupId) {
     JKRHeap* currentHeap = JKRHeap::getCurrentHeap();
     if (currentHeap->getHeapType() == 'EXPH' && groupId >= 0) {
@@ -123,8 +111,6 @@ void JKRAram::changeGroupIdIfNeed(u8* data, int groupId) {
     }
 }
 
-/* 802D233C-802D25B4 2CCC7C 0278+00 0/0 3/3 0/0 .text
- * mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl */
 JKRAramBlock* JKRAram::mainRamToAram(u8* buf, u32 bufSize, u32 alignedSize,
                                      JKRExpandSwitch expandSwitch, u32 fileSize, JKRHeap* heap,
                                      int id, u32* pSize) {
@@ -193,8 +179,6 @@ JKRAramBlock* JKRAram::mainRamToAram(u8* buf, u32 bufSize, u32 alignedSize,
     return block;
 }
 
-/* 802D25B4-802D2830 2CCEF4 027C+00 0/0 6/6 0/0 .text
- * aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl */
 u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandSwitch, u32 p5,
                            JKRHeap* heap, int id, u32* pSize) {
     JKRCompression compression = COMPRESSION_NONE;
@@ -271,62 +255,42 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS
     }
 }
 
-/* 804342DC-804342E8 060FFC 000C+00 1/1 0/0 0/0 .bss             sAramCommandList__7JKRAram */
 JSUList<JKRAMCommand> JKRAram::sAramCommandList;
 
-/* 804342E8-80434300 061008 0018+00 1/1 0/0 0/0 .bss             decompMutex */
 static OSMutex decompMutex;
 
-/* 804508B8-804508C0 000338 0004+04 1/1 1/1 0/0 .sdata           sSZSBufferSize__7JKRAram */
 u32 JKRAram::sSZSBufferSize = 0x00000400;
 
-/* 804513CC-804513D0 0008CC 0004+00 3/3 0/0 0/0 .sbss            szpBuf */
 static u8* szpBuf;
 
-/* 804513D0-804513D4 0008D0 0004+00 3/3 0/0 0/0 .sbss            szpEnd */
 static u8* szpEnd;
 
-/* 804513D4-804513D8 0008D4 0004+00 2/2 0/0 0/0 .sbss            refBuf */
 static u8* refBuf;
 
-/* 804513D8-804513DC 0008D8 0004+00 2/2 0/0 0/0 .sbss            refEnd */
 static u8* refEnd;
 
-/* 804513DC-804513E0 0008DC 0004+00 2/2 0/0 0/0 .sbss            refCurrent */
 static u8* refCurrent;
 
-/* 804513E0-804513E4 0008E0 0004+00 3/3 0/0 0/0 .sbss            srcOffset */
 static u32 srcOffset;
 
-/* 804513E4-804513E8 0008E4 0004+00 4/4 0/0 0/0 .sbss            transLeft */
 static u32 transLeft;
 
-/* 804513E8-804513EC 0008E8 0004+00 3/3 0/0 0/0 .sbss            srcLimit */
 static u8* srcLimit;
 
-/* 804513EC-804513F0 0008EC 0004+00 3/3 0/0 0/0 .sbss            srcAddress */
 static u32 srcAddress;
 
-/* 804513F0-804513F4 0008F0 0004+00 2/2 0/0 0/0 .sbss            fileOffset */
 static u32 fileOffset;
 
-/* 804513F4-804513F8 0008F4 0004+00 2/2 0/0 0/0 .sbss            readCount */
 static u32 readCount;
 
-/* 804513F8-804513FC 0008F8 0004+00 2/2 0/0 0/0 .sbss            maxDest */
 static u32 maxDest;
 
-/* 804513FC-80451400 0008FC 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool s_is_decompress_mutex_initialized;
 
-/* 80451400-80451404 000900 0004+00 2/2 0/0 0/0 .sbss            tsPtr */
 static u32* tsPtr;
 
-/* 80451404-80451408 000904 0004+00 1/1 0/0 0/0 .sbss            tsArea */
 static u32 tsArea;
 
-/* 802D2830-802D29A0 2CD170 0170+00 1/1 0/0 0/0 .text
- * JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl               */
 static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 dstLength,
                                           u32 offset, u32* resourceSize) {
     BOOL interrupts = OSDisableInterrupts();
@@ -369,7 +333,6 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32
     return 0;
 }
 
-/* 802D29A0-802D2C40 2CD2E0 02A0+00 1/1 0/0 0/0 .text            decompSZS_subroutine__FPUcPUc */
 int decompSZS_subroutine(u8* src, u8* dest) {
     u8* endPtr;
     s32 validBitCount = 0;
@@ -482,7 +445,6 @@ int decompSZS_subroutine(u8* src, u8* dest) {
     return 0;
 }
 
-/* 802D2C40-802D2CE4 2CD580 00A4+00 1/1 0/0 0/0 .text            firstSrcData__Fv */
 static u8* firstSrcData() {
     srcLimit = szpEnd - 0x19;
     u8* buffer = szpBuf;
@@ -509,7 +471,6 @@ static u8* firstSrcData() {
     return buffer;
 }
 
-/* 802D2CE4-802D2DAC 2CD624 00C8+00 1/1 0/0 0/0 .text            nextSrcData__FPUc */
 static u8* nextSrcData(u8* current) {
     u8* dest;
     u32 left = (uintptr_t)(szpEnd - current);
@@ -534,6 +495,4 @@ static u8* nextSrcData(u8* current) {
     return dest;
 }
 
-/* ############################################################################################## */
-/* 8039D0A6-8039D0B8 029706 000E+04 0/0 0/0 0/0 .rodata          None */
 static const char* stringBase_8039D0A6 = "bad aramSync\n";
diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp
index 8874cd8c8f..8af54f234b 100644
--- a/src/JSystem/JKernel/JKRAramArchive.cpp
+++ b/src/JSystem/JKernel/JKRAramArchive.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JKRAramArchive
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JKernel/JKRAramArchive.h"
@@ -15,8 +10,6 @@
 #include "math.h"
 #include "string.h"
 
-/* 802D70C0-802D7168 2D1A00 00A8+00 0/0 1/1 0/0 .text
- * __ct__14JKRAramArchiveFlQ210JKRArchive15EMountDirection      */
 JKRAramArchive::JKRAramArchive(s32 entryNumber, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNumber, MOUNT_ARAM) {
     mMountDirection = mountDirection;
@@ -31,7 +24,6 @@ JKRAramArchive::JKRAramArchive(s32 entryNumber, JKRArchive::EMountDirection moun
     mIsMounted = true;
 }
 
-/* 802D7168-802D72A8 2D1AA8 0140+00 1/0 0/0 0/0 .text            __dt__14JKRAramArchiveFv */
 JKRAramArchive::~JKRAramArchive() {
     if (mIsMounted == true) {
         if (mArcInfoBlock != NULL) {
@@ -68,7 +60,6 @@ inline u32 alignNext(u32 var, u32 align) {
     return (var + align - 1) & ~(align - 1);
 }
 
-/* 802D72A8-802D75E0 2D1BE8 0338+00 1/1 0/0 0/0 .text            open__14JKRAramArchiveFl */
 bool JKRAramArchive::open(s32 entryNum) {
     mArcInfoBlock = NULL;
     mNodes = NULL;
@@ -163,8 +154,6 @@ cleanup:
     return true;
 }
 
-/* 802D75E0-802D76F4 2D1F20 0114+00 1/0 0/0 0/0 .text
- * fetchResource__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) {
     JUT_ASSERT(442, isMounted());
     u32 outSize;
@@ -199,8 +188,6 @@ void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) {
     return pEntry->data;
 }
 
-/* 802D76F4-802D77F8 2D2034 0104+00 1/0 0/0 0/0 .text
- * fetchResource__14JKRAramArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* pEntry,
                                     u32* resourceSize) {
     JUT_ASSERT(515, isMounted());
@@ -233,8 +220,6 @@ void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry*
     return buffer;
 }
 
-/* 802D77F8-802D781C 2D2138 0024+00 1/1 0/0 0/0 .text
- * getAramAddress_Entry__14JKRAramArchiveFPQ210JKRArchive12SDIFileEntry */
 u32 JKRAramArchive::getAramAddress_Entry(SDIFileEntry* pEntry) {
     JUT_ASSERT(572, isMounted());
     if (pEntry == NULL) {
@@ -244,13 +229,10 @@ u32 JKRAramArchive::getAramAddress_Entry(SDIFileEntry* pEntry) {
     }
 }
 
-/* 802D781C-802D7858 2D215C 003C+00 0/0 1/1 0/0 .text getAramAddress__14JKRAramArchiveFPCc */
 u32 JKRAramArchive::getAramAddress(char const* name) {
     return JKRAramArchive::getAramAddress_Entry(this->findFsResource(name, 0));
 }
 
-/* 802D7858-802D7914 2D2198 00BC+00 1/1 1/1 0/0 .text
- * fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli        */
 u32 JKRAramArchive::fetchResource_subroutine(u32 srcAram, u32 srcLength, u8* dst, u32 dstLength,
                                              int compression) {
     JUT_ASSERT(628, (srcAram & 0x1f) == 0);
@@ -275,8 +257,6 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 srcAram, u32 srcLength, u8* dst
     }
 }
 
-/* 802D7914-802D7A64 2D2254 0150+00 1/1 1/1 0/0 .text
- * fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc */
 u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap* pHeap,
                                              int compression, u8** out) {
     u32 alignedLen = ALIGN_NEXT(length, 0x20);
@@ -311,7 +291,6 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
     }
 }
 
-/* 802D7A64-802D7B90 2D23A4 012C+00 1/0 0/0 0/0 .text getExpandedResSize__14JKRAramArchiveCFPCv */
 u32 JKRAramArchive::getExpandedResSize(const void* ptr) const {
     if (mExpandedSize == NULL) {
         return this->getResSize(ptr);
diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/src/JSystem/JKernel/JKRAramBlock.cpp
index a6794cbdcc..c1416686e9 100644
--- a/src/JSystem/JKernel/JKRAramBlock.cpp
+++ b/src/JSystem/JKernel/JKRAramBlock.cpp
@@ -4,7 +4,6 @@
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 802D3304-802D3378 2CDC44 0074+00 2/2 1/1 0/0 .text            __ct__12JKRAramBlockFUlUlUlUcb */
 JKRAramBlock::JKRAramBlock(u32 address, u32 size, u32 freeSize, u8 groupId, bool isTempMemory)
     : mBlockLink(this) {
     mAddress = address;
@@ -14,7 +13,6 @@ JKRAramBlock::JKRAramBlock(u32 address, u32 size, u32 freeSize, u8 groupId, bool
     mIsTempMemory = isTempMemory;
 }
 
-/* 802D3378-802D3434 2CDCB8 00BC+00 1/0 0/0 0/0 .text            __dt__12JKRAramBlockFv */
 JKRAramBlock::~JKRAramBlock() {
     JSUList<JKRAramBlock>* list = mBlockLink.getSupervisor();
     JSULink<JKRAramBlock>* prev = mBlockLink.getPrev();
@@ -29,8 +27,6 @@ JKRAramBlock::~JKRAramBlock() {
     }
 }
 
-/* 802D3434-802D34D0 2CDD74 009C+00 0/0 1/1 0/0 .text allocHead__12JKRAramBlockFUlUcP11JKRAramHeap
- */
 JKRAramBlock* JKRAramBlock::allocHead(u32 size, u8 groupId, JKRAramHeap* aramHeap) {
     u32 address = mAddress;
     u32 usedSize = mSize;
@@ -48,8 +44,6 @@ JKRAramBlock* JKRAramBlock::allocHead(u32 size, u8 groupId, JKRAramHeap* aramHea
     return block;
 }
 
-/* 802D34D0-802D3574 2CDE10 00A4+00 0/0 1/1 0/0 .text allocTail__12JKRAramBlockFUlUcP11JKRAramHeap
- */
 JKRAramBlock* JKRAramBlock::allocTail(u32 size, u8 groupId, JKRAramHeap* aramHeap) {
     u32 freeSize = mFreeSize;
     u32 address = mAddress;
diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp
index 2ef579b411..91fea19b00 100644
--- a/src/JSystem/JKernel/JKRAramHeap.cpp
+++ b/src/JSystem/JKernel/JKRAramHeap.cpp
@@ -5,10 +5,8 @@
 #include "global.h"
 #include <limits.h>
 
-/* 8043430C-80434318 06102C 000C+00 8/8 0/0 0/0 .bss             sAramList__11JKRAramHeap */
 JSUList<JKRAramBlock> JKRAramHeap::sAramList;
 
-/* 802D2E44-802D2F14 2CD784 00D0+00 0/0 1/1 0/0 .text            __ct__11JKRAramHeapFUlUl */
 JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) {
     OSInitMutex(&mMutex);
 
@@ -22,7 +20,6 @@ JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) {
     sAramList.append(&block->mBlockLink);
 }
 
-/* 802D2F14-802D2FBC 2CD854 00A8+00 1/0 0/0 0/0 .text            __dt__11JKRAramHeapFv */
 JKRAramHeap::~JKRAramHeap() {
     JSUListIterator<JKRAramBlock> iterator(sAramList.getFirst());
     while (iterator != sAramList.getEnd())
@@ -31,8 +28,6 @@ JKRAramHeap::~JKRAramHeap() {
     }
 }
 
-/* 802D2FBC-802D3034 2CD8FC 0078+00 0/0 5/5 0/0 .text
- * alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode           */
 JKRAramBlock* JKRAramHeap::alloc(u32 size, JKRAramHeap::EAllocMode allocationMode) {
     lock();
 
@@ -47,7 +42,6 @@ JKRAramBlock* JKRAramHeap::alloc(u32 size, JKRAramHeap::EAllocMode allocationMod
     return block;
 }
 
-/* 802D3034-802D30BC 2CD974 0088+00 1/1 0/0 0/0 .text            allocFromHead__11JKRAramHeapFUl */
 JKRAramBlock* JKRAramHeap::allocFromHead(u32 size) {
     u32 alignedSize = ALIGN_NEXT(size, 0x20);
     u32 bestFreeSize = UINT_MAX;
@@ -76,7 +70,6 @@ JKRAramBlock* JKRAramHeap::allocFromHead(u32 size) {
     return NULL;
 }
 
-/* 802D30BC-802D3134 2CD9FC 0078+00 1/1 0/0 0/0 .text            allocFromTail__11JKRAramHeapFUl */
 JKRAramBlock* JKRAramHeap::allocFromTail(u32 size) {
     u32 alignedSize = ALIGN_NEXT(size, 0x20);
     JKRAramBlock* tailBlock = NULL;
@@ -98,7 +91,6 @@ JKRAramBlock* JKRAramHeap::allocFromTail(u32 size) {
     return NULL;
 }
 
-/* 802D3134-802D31AC 2CDA74 0078+00 0/0 1/1 0/0 .text            getFreeSize__11JKRAramHeapFv */
 u32 JKRAramHeap::getFreeSize(void) {
     u32 maxFreeSize = 0;
 
@@ -116,8 +108,6 @@ u32 JKRAramHeap::getFreeSize(void) {
     return maxFreeSize;
 }
 
-/* 802D31AC-802D3218 2CDAEC 006C+00 0/0 2/2 0/0 .text            getTotalFreeSize__11JKRAramHeapFv
- */
 u32 JKRAramHeap::getTotalFreeSize(void) {
     u32 totalFreeSize = 0;
 
@@ -133,7 +123,6 @@ u32 JKRAramHeap::getTotalFreeSize(void) {
     return totalFreeSize;
 }
 
-/* 802D3218-802D326C 2CDB58 0054+00 0/0 2/2 0/0 .text            dump__11JKRAramHeapFv */
 void JKRAramHeap::dump(void) {
     lock();
 
diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/src/JSystem/JKernel/JKRAramPiece.cpp
index 64dd77ada4..60322fc2be 100644
--- a/src/JSystem/JKernel/JKRAramPiece.cpp
+++ b/src/JSystem/JKernel/JKRAramPiece.cpp
@@ -6,8 +6,6 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "dolphin/os.h"
 
-/* 802D3574-802D35F4 2CDEB4 0080+00 1/1 0/0 0/0 .text
- * prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v  */
 JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length,
                                            JKRAramBlock* block,
                                            JKRAMCommand::AsyncCallback callback) {
@@ -21,21 +19,15 @@ JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32
     return command;
 }
 
-/* 802D35F4-802D3614 2CDF34 0020+00 0/0 1/1 0/0 .text sendCommand__12JKRAramPieceFP12JKRAMCommand
- */
 void JKRAramPiece::sendCommand(JKRAMCommand* command) {
     startDMA(command);
 }
 
-/* 80434324-80434330 061044 000C+00 3/3 0/0 0/0 .bss sAramPieceCommandList__12JKRAramPiece */
 // JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
 JSUList<JKRAMCommand> JKRAramPiece::sAramPieceCommandList;
 
-/* 80434330-80434348 061050 0018+00 3/3 0/0 0/0 .bss             mMutex__12JKRAramPiece */
 OSMutex JKRAramPiece::mMutex;
 
-/* 802D3614-802D3770 2CDF54 015C+00 1/1 0/0 0/0 .text
- * orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v      */
 JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destination, u32 length,
                                        JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) {
     lock();
@@ -62,7 +54,6 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destinatio
     return command;
 }
 
-/* 802D3770-802D3838 2CE0B0 00C8+00 1/1 0/0 0/0 .text sync__12JKRAramPieceFP12JKRAMCommandi */
 BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) {
     OSMessage message;
 
@@ -85,8 +76,6 @@ BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) {
     return TRUE;
 }
 
-/* 802D3838-802D38CC 2CE178 0094+00 0/0 6/6 0/0 .text
- * orderSync__12JKRAramPieceFiUlUlUlP12JKRAramBlock             */
 BOOL JKRAramPiece::orderSync(int direction, u32 source, u32 destination, u32 length,
                              JKRAramBlock* block) {
     lock();
@@ -100,7 +89,6 @@ BOOL JKRAramPiece::orderSync(int direction, u32 source, u32 destination, u32 len
     return result;
 }
 
-/* 802D38CC-802D3944 2CE20C 0078+00 1/1 1/1 0/0 .text startDMA__12JKRAramPieceFP12JKRAMCommand */
 void JKRAramPiece::startDMA(JKRAMCommand* command) {
     if (command->mTransferDirection == 1) {
         DCInvalidateRange((void*)command->mDst, command->mDataLength);
@@ -112,7 +100,6 @@ void JKRAramPiece::startDMA(JKRAMCommand* command) {
                    command->mDst, command->mDataLength, JKRAramPiece::doneDMA);
 }
 
-/* 802D3944-802D39EC 2CE284 00A8+00 1/1 0/0 0/0 .text            doneDMA__12JKRAramPieceFUl */
 void JKRAramPiece::doneDMA(u32 requestAddress) {
     JKRAMCommand* command = (JKRAMCommand*)requestAddress;
 
@@ -136,7 +123,6 @@ void JKRAramPiece::doneDMA(u32 requestAddress) {
     }
 }
 
-/* 802D39EC-802D3A5C 2CE32C 0070+00 1/1 0/0 0/0 .text            __ct__12JKRAMCommandFv */
 JKRAMCommand::JKRAMCommand() : mPieceLink(this), field_0x30(this) {
     OSInitMessageQueue(&mMessageQueue, &mMessage, 1);
     mCallback = NULL;
@@ -147,7 +133,6 @@ JKRAMCommand::JKRAMCommand() : mPieceLink(this), field_0x30(this) {
     field_0x94 = NULL;
 }
 
-/* 802D3A5C-802D3B04 2CE39C 00A8+00 1/1 0/0 0/0 .text            __dt__12JKRAMCommandFv */
 JKRAMCommand::~JKRAMCommand() {
     if (field_0x8C)
         delete field_0x8C;
diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp
index 77c8b5eb51..409314f574 100644
--- a/src/JSystem/JKernel/JKRAramStream.cpp
+++ b/src/JSystem/JKernel/JKRAramStream.cpp
@@ -6,12 +6,8 @@
 #include "JSystem/JUtility/JUTException.h"
 #include <stdint.h>
 
-/* ############################################################################################## */
-/* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss            sAramStreamObject__13JKRAramStream
- */
 JKRAramStream* JKRAramStream::sAramStreamObject;
 
-/* 802D3B48-802D3BB8 2CE488 0070+00 0/0 1/1 0/0 .text            create__13JKRAramStreamFl */
 JKRAramStream* JKRAramStream::create(s32 priority) {
     if (!sAramStreamObject) {
         sAramStreamObject = new (JKRGetSystemHeap(), 0) JKRAramStream(priority);
@@ -21,8 +17,6 @@ JKRAramStream* JKRAramStream::create(s32 priority) {
     return sAramStreamObject;
 }
 
-/* ############################################################################################## */
-/* 803CC188-803CC198 0292A8 0010+00 1/1 0/0 0/0 .data            sMessageBuffer__13JKRAramStream */
 void* JKRAramStream::sMessageBuffer[4] = {
     NULL,
     NULL,
@@ -30,18 +24,14 @@ void* JKRAramStream::sMessageBuffer[4] = {
     NULL,
 };
 
-/* 803CC198-803CC1B8 0292B8 0020+00 2/2 0/0 0/0 .data            sMessageQueue__13JKRAramStream */
 OSMessageQueue JKRAramStream::sMessageQueue = {0};
 
-/* 802D3BB8-802D3C08 2CE4F8 0050+00 1/1 0/0 0/0 .text            __ct__13JKRAramStreamFl */
 JKRAramStream::JKRAramStream(s32 priority) : JKRThread(0xc00, 0x10, priority) {
     resume();
 }
 
-/* 802D3C08-802D3C68 2CE548 0060+00 1/0 0/0 0/0 .text            __dt__13JKRAramStreamFv */
 JKRAramStream::~JKRAramStream() {}
 
-/* 802D3C68-802D3CD8 2CE5A8 0070+00 1/0 0/0 0/0 .text            run__13JKRAramStreamFv */
 void* JKRAramStream::run() {
     OSInitMessageQueue(&sMessageQueue, sMessageBuffer, ARRAY_SIZEU(sMessageBuffer));
 
@@ -61,12 +51,10 @@ void* JKRAramStream::run() {
     }
 }
 
-/* 802D3CD8-802D3CE0 2CE618 0008+00 1/1 0/0 0/0 .text            readFromAram__13JKRAramStreamFv */
 s32 JKRAramStream::readFromAram() {
     return 1;
 }
 
-/* ############################################################################################## */
 s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
     u32 dstSize = command->mSize;
     u32 offset = command->mOffset;
@@ -137,18 +125,12 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) {
     return writtenLength;
 }
 
-/* ############################################################################################## */
-/* 8045140C-80451410 00090C 0004+00 2/2 0/0 0/0 .sbss            transBuffer__13JKRAramStream */
 u8* JKRAramStream::transBuffer;
 
-/* 80451410-80451414 000910 0004+00 2/2 0/0 0/0 .sbss            transSize__13JKRAramStream */
 u32 JKRAramStream::transSize;
 
-/* 80451414-80451418 000914 0004+00 2/2 0/0 0/0 .sbss            transHeap__13JKRAramStream */
 JKRHeap* JKRAramStream::transHeap;
 
-/* 802D3ED0-802D3FA0 2CE810 00D0+00 0/0 1/1 0/0 .text
- * write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl */
 JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream* stream, u32 addr,
                                                               u32 size, u32 offset,
                                                               u32* returnSize) {
@@ -172,8 +154,6 @@ JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream
     return command;
 }
 
-/* 802D3FA0-802D4034 2CE8E0 0094+00 0/0 1/1 0/0 .text
- * sync__13JKRAramStreamFP20JKRAramStreamCommandi               */
 JKRAramStreamCommand* JKRAramStream::sync(JKRAramStreamCommand* command, BOOL isNonBlocking) {
     OSMessage message;
     if (isNonBlocking == 0) {
@@ -199,8 +179,6 @@ JKRAramStreamCommand* JKRAramStream::sync(JKRAramStreamCommand* command, BOOL is
     }
 }
 
-/* 802D4034-802D4088 2CE974 0054+00 1/1 1/1 0/0 .text
- * setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap               */
 void JKRAramStream::setTransBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) {
     transBuffer = NULL;
     transSize = 0x8000;
@@ -219,7 +197,6 @@ void JKRAramStream::setTransBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) {
     }
 }
 
-/* 802D4088-802D4094 2CE9C8 000C+00 1/1 0/0 0/0 .text            __ct__20JKRAramStreamCommandFv */
 JKRAramStreamCommand::JKRAramStreamCommand() {
     mAllocatedTransferBuffer = false;
 }
diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp
index 1e6a8df8f6..92d655ec9a 100644
--- a/src/JSystem/JKernel/JKRArchivePri.cpp
+++ b/src/JSystem/JKernel/JKRArchivePri.cpp
@@ -5,12 +5,8 @@
 #include "ctype.h"
 #include "string.h"
 
-/* ############################################################################################## */
-/* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss            sCurrentDirID__10JKRArchive */
 u32 JKRArchive::sCurrentDirID;
 
-/* 802D6294-802D6334 2D0BD4 00A0+00 0/0 5/5 0/0 .text
- * __ct__10JKRArchiveFlQ210JKRArchive10EMountMode               */
 JKRArchive::JKRArchive(s32 entryNumber, JKRArchive::EMountMode mountMode) {
     mIsMounted = false;
     mMountMode = mountMode;
@@ -29,11 +25,8 @@ JKRArchive::JKRArchive(s32 entryNumber, JKRArchive::EMountMode mountMode) {
     }
 }
 
-/* 802D6334-802D6394 2D0C74 0060+00 0/0 5/4 0/0 .text            __dt__10JKRArchiveFv */
 JKRArchive::~JKRArchive() {}
 
-/* 802D6394-802D63E0 2D0CD4 004C+00 4/4 0/0 0/0 .text
- * isSameName__10JKRArchiveCFRQ210JKRArchive8CArcNameUlUs       */
 bool JKRArchive::isSameName(JKRArchive::CArcName& name, u32 nameOffset, u16 nameHash) const {
     u16 hash = name.getHash();
     if (hash != nameHash)
@@ -41,7 +34,6 @@ bool JKRArchive::isSameName(JKRArchive::CArcName& name, u32 nameOffset, u16 name
     return strcmp(mStringTable + nameOffset, name.getString()) == 0;
 }
 
-/* 802D63E0-802D641C 2D0D20 003C+00 1/1 0/0 0/0 .text            findResType__10JKRArchiveCFUl */
 JKRArchive::SDIDirEntry* JKRArchive::findResType(u32 type) const {
     SDIDirEntry* node = mNodes;
     u32 count = 0;
@@ -57,8 +49,6 @@ JKRArchive::SDIDirEntry* JKRArchive::findResType(u32 type) const {
     return NULL;
 }
 
-/* 802D641C-802D64F4 2D0D5C 00D8+00 0/0 3/3 0/0 .text            findDirectory__10JKRArchiveCFPCcUl
- */
 JKRArchive::SDIDirEntry* JKRArchive::findDirectory(const char* name, u32 directoryId) const {
     if (name == NULL) {
         return mNodes + directoryId;
@@ -80,7 +70,6 @@ JKRArchive::SDIDirEntry* JKRArchive::findDirectory(const char* name, u32 directo
     return NULL;
 }
 
-/* 802D64F4-802D65A4 2D0E34 00B0+00 0/0 2/2 0/0 .text findTypeResource__10JKRArchiveCFUlPCc */
 JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* name) const {
     if (type) {
         CArcName arcName(name);
@@ -99,8 +88,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* nam
     return NULL;
 }
 
-/* 802D65A4-802D6684 2D0EE4 00E0+00 0/0 4/4 0/0 .text            findFsResource__10JKRArchiveCFPCcUl
- */
 JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 directoryId) const {
     if (name) {
         CArcName arcName(&name, '/');
@@ -125,8 +112,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 direc
     return NULL;
 }
 
-/* 802D6684-802D66AC 2D0FC4 0028+00 0/0 7/7 0/0 .text            findIdxResource__10JKRArchiveCFUl
- */
 JKRArchive::SDIFileEntry* JKRArchive::findIdxResource(u32 fileIndex) const {
     if (fileIndex < mArcInfoBlock->num_file_entries) {
         return mFiles + fileIndex;
@@ -135,8 +120,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findIdxResource(u32 fileIndex) const {
     return NULL;
 }
 
-/* 802D66AC-802D6734 2D0FEC 0088+00 0/0 4/4 0/0 .text            findNameResource__10JKRArchiveCFPCc
- */
 JKRArchive::SDIFileEntry* JKRArchive::findNameResource(const char* name) const {
     SDIFileEntry* fileEntry = mFiles;
 
@@ -150,8 +133,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findNameResource(const char* name) const {
     return NULL;
 }
 
-/* 802D6734-802D6770 2D1074 003C+00 0/0 9/9 0/0 .text            findPtrResource__10JKRArchiveCFPCv
- */
 JKRArchive::SDIFileEntry* JKRArchive::findPtrResource(const void* resource) const {
     SDIFileEntry* fileEntry = mFiles;
     for (int i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) {
@@ -163,7 +144,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findPtrResource(const void* resource) cons
     return NULL;
 }
 
-/* 802D6770-802D67F4 2D10B0 0084+00 0/0 4/4 0/0 .text            findIdResource__10JKRArchiveCFUs */
 JKRArchive::SDIFileEntry* JKRArchive::findIdResource(u16 id) const {
     if (id != 0xFFFF) {
         if (id < mArcInfoBlock->num_file_entries) {
@@ -184,8 +164,6 @@ JKRArchive::SDIFileEntry* JKRArchive::findIdResource(u16 id) const {
     return NULL;
 }
 
-/* 802D67F4-802D6884 2D1134 0090+00 2/2 0/0 0/0 .text            store__Q210JKRArchive8CArcNameFPCc
- */
 void JKRArchive::CArcName::store(const char* name) {
     mHash = 0;
     s32 length = 0;
@@ -202,8 +180,6 @@ void JKRArchive::CArcName::store(const char* name) {
     mData[length] = 0;
 }
 
-/* 802D6884-802D693C 2D11C4 00B8+00 2/2 0/0 0/0 .text            store__Q210JKRArchive8CArcNameFPCcc
- */
 const char* JKRArchive::CArcName::store(const char* name, char endChar) {
     mHash = 0;
     s32 length = 0;
@@ -224,8 +200,6 @@ const char* JKRArchive::CArcName::store(const char* name, char endChar) {
     return name + 1;
 }
 
-/* 802D693C-802D6978 2D127C 003C+00 0/0 5/0 0/0 .text
- * setExpandSize__10JKRArchiveFPQ210JKRArchive12SDIFileEntryUl  */
 void JKRArchive::setExpandSize(SDIFileEntry* fileEntry, u32 expandSize) {
     int index = fileEntry - mFiles;
     if (!mExpandedSize || index >= mArcInfoBlock->num_file_entries)
@@ -234,8 +208,6 @@ void JKRArchive::setExpandSize(SDIFileEntry* fileEntry, u32 expandSize) {
     mExpandedSize[index] = expandSize;
 }
 
-/* 802D6978-802D69B8 2D12B8 0040+00 0/0 5/0 0/0 .text
- * getExpandSize__10JKRArchiveCFPQ210JKRArchive12SDIFileEntry   */
 u32 JKRArchive::getExpandSize(SDIFileEntry* fileEntry) const {
     int index = fileEntry - mFiles;
     if (!mExpandedSize || index >= mArcInfoBlock->num_file_entries)
diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp
index a2899fd432..ef20df7c2d 100644
--- a/src/JSystem/JKernel/JKRArchivePub.cpp
+++ b/src/JSystem/JKernel/JKRArchivePub.cpp
@@ -9,8 +9,6 @@
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 802D5778-802D57E4 2D00B8 006C+00 2/2 0/0 0/0 .text check_mount_already__10JKRArchiveFlP7JKRHeap
- */
 JKRArchive* JKRArchive::check_mount_already(s32 entryNum, JKRHeap* heap) {
     if (heap == NULL) {
         heap = JKRGetCurrentHeap();
@@ -31,8 +29,6 @@ JKRArchive* JKRArchive::check_mount_already(s32 entryNum, JKRHeap* heap) {
     return NULL;
 }
 
-/* 802D57E4-802D5840 2D0124 005C+00 0/0 1/1 0/0 .text
- * mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection */
 JKRArchive* JKRArchive::mount(const char* path, EMountMode mountMode, JKRHeap* heap,
                               EMountDirection mountDirection) {
     s32 entryNum = DVDConvertPathToEntrynum(path);
@@ -42,8 +38,6 @@ JKRArchive* JKRArchive::mount(const char* path, EMountMode mountMode, JKRHeap* h
     return mount(entryNum, mountMode, heap, mountDirection);
 }
 
-/* 802D5840-802D58C8 2D0180 0088+00 0/0 1/1 0/0 .text
- * mount__10JKRArchiveFPvP7JKRHeapQ210JKRArchive15EMountDirection */
 JKRArchive* JKRArchive::mount(void* ptr, JKRHeap* heap,
                               EMountDirection mountDirection) {
     JKRArchive* archive = check_mount_already((s32)ptr, heap);
@@ -61,8 +55,6 @@ JKRArchive* JKRArchive::mount(void* ptr, JKRHeap* heap,
     return archive;
 }
 
-/* 802D58C8-802D5A38 2D0208 0170+00 1/1 1/1 0/0 .text
- * mount__10JKRArchiveFlQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection */
 JKRArchive* JKRArchive::mount(s32 entryNum, JKRArchive::EMountMode mountMode, JKRHeap* heap,
                               JKRArchive::EMountDirection mountDirection) {
     JKRArchive* archive = check_mount_already(entryNum, heap);
@@ -101,7 +93,6 @@ JKRArchive* JKRArchive::mount(s32 entryNum, JKRArchive::EMountMode mountMode, JK
     }
 }
 
-/* 802D5A38-802D5AC0 2D0378 0088+00 1/0 4/0 0/0 .text            becomeCurrent__10JKRArchiveFPCc */
 bool JKRArchive::becomeCurrent(const char* path) {
     SDIDirEntry* dirEntry;
     if (*path == '/') {
@@ -123,8 +114,6 @@ bool JKRArchive::becomeCurrent(const char* path) {
     return found;
 }
 
-/* 802D5AC0-802D5B38 2D0400 0078+00 0/0 1/1 0/0 .text
- * getDirEntry__10JKRArchiveCFPQ210JKRArchive9SDirEntryUl       */
 bool JKRArchive::getDirEntry(SDirEntry* dirEntry, u32 index) const {
     SDIFileEntry* fileEntry = findIdxResource(index);
     if (!fileEntry)
@@ -136,8 +125,6 @@ bool JKRArchive::getDirEntry(SDirEntry* dirEntry, u32 index) const {
     return true;
 }
 
-/* 802D5B38-802D5BE8 2D0478 00B0+00 0/0 9/9 0/0 .text
- * getGlbResource__10JKRArchiveFUlPCcP10JKRArchive              */
 void* JKRArchive::getGlbResource(u32 param_1, const char* path, JKRArchive* archive) {
     void* resource = NULL;
     if (archive) {
@@ -157,7 +144,6 @@ void* JKRArchive::getGlbResource(u32 param_1, const char* path, JKRArchive* arch
     return resource;
 }
 
-/* 802D5BE8-802D5C64 2D0528 007C+00 1/0 4/0 0/0 .text            getResource__10JKRArchiveFPCc */
 void* JKRArchive::getResource(const char* path) {
     JUT_ASSERT(303, isMounted());
     SDIFileEntry* fileEntry;
@@ -174,7 +160,6 @@ void* JKRArchive::getResource(const char* path) {
     return NULL;
 }
 
-/* 802D5C64-802D5CE4 2D05A4 0080+00 1/0 4/0 0/0 .text            getResource__10JKRArchiveFUlPCc */
 void* JKRArchive::getResource(u32 type, const char* path) {
     JUT_ASSERT(347, isMounted());
     SDIFileEntry* fileEntry;
@@ -191,7 +176,6 @@ void* JKRArchive::getResource(u32 type, const char* path) {
     return NULL;
 }
 
-/* 802D5CE4-802D5D38 2D0624 0054+00 0/0 1/1 0/0 .text            getIdxResource__10JKRArchiveFUl */
 void* JKRArchive::getIdxResource(u32 index) {
     JUT_ASSERT(384, isMounted());
     SDIFileEntry* fileEntry = findIdxResource(index);
@@ -202,7 +186,6 @@ void* JKRArchive::getIdxResource(u32 index) {
     return NULL;
 }
 
-/* 802D5D38-802D5D8C 2D0678 0054+00 0/0 1/1 0/0 .text            getResource__10JKRArchiveFUs */
 void* JKRArchive::getResource(u16 id) {
     JUT_ASSERT(409, isMounted());
     SDIFileEntry* fileEntry = findIdResource(id);
@@ -213,7 +196,6 @@ void* JKRArchive::getResource(u16 id) {
     return NULL;
 }
 
-/* 802D5D8C-802D5E30 2D06CC 00A4+00 1/0 4/0 0/0 .text readResource__10JKRArchiveFPvUlUlPCc */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char* path) {
     JUT_ASSERT(493, isMounted());
     SDIFileEntry* fileEntry;
@@ -232,8 +214,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char*
     return 0;
 }
 
-/* 802D5E30-802D5ECC 2D0770 009C+00 1/0 4/0 0/0 .text            readResource__10JKRArchiveFPvUlPCc
- */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) {
     JUT_ASSERT(539, isMounted());
     SDIFileEntry* fileEntry;
@@ -252,7 +232,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) {
     return 0;
 }
 
-/* 802D5ECC-802D5F40 2D080C 0074+00 0/0 7/7 1/1 .text readIdxResource__10JKRArchiveFPvUlUl */
 u32 JKRArchive::readIdxResource(void* buffer, u32 bufferSize, u32 index) {
     JUT_ASSERT(593, isMounted());
     SDIFileEntry* fileEntry = findIdxResource(index);
@@ -265,8 +244,6 @@ u32 JKRArchive::readIdxResource(void* buffer, u32 bufferSize, u32 index) {
     return 0;
 }
 
-/* 802D5F40-802D5FB4 2D0880 0074+00 0/0 1/1 0/0 .text            readResource__10JKRArchiveFPvUlUs
- */
 u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u16 id) {
     JUT_ASSERT(625, isMounted());
     SDIFileEntry* fileEntry = findIdResource(id);
@@ -279,8 +256,6 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u16 id) {
     return 0;
 }
 
-/* 802D5FB4-802D603C 2D08F4 0088+00 1/0 2/0 0/0 .text            removeResourceAll__10JKRArchiveFv
- */
 void JKRArchive::removeResourceAll() {
     if (mArcInfoBlock && mMountMode != MOUNT_MEM) {
         SDIFileEntry* fileEntry = mFiles;
@@ -293,7 +268,6 @@ void JKRArchive::removeResourceAll() {
     }
 }
 
-/* 802D603C-802D609C 2D097C 0060+00 1/0 2/0 0/0 .text            removeResource__10JKRArchiveFPv */
 bool JKRArchive::removeResource(void* resource) {
     JUT_ASSERT(678, resource != NULL);
     SDIFileEntry* fileEntry = findPtrResource(resource);
@@ -305,7 +279,6 @@ bool JKRArchive::removeResource(void* resource) {
     return true;
 }
 
-/* 802D609C-802D60D8 2D09DC 003C+00 1/0 4/0 0/0 .text            detachResource__10JKRArchiveFPv */
 bool JKRArchive::detachResource(void* resource) {
     JUT_ASSERT(707, resource != NULL);
     SDIFileEntry* fileEntry = findPtrResource(resource);
@@ -316,7 +289,6 @@ bool JKRArchive::detachResource(void* resource) {
     return true;
 }
 
-/* 802D60D8-802D610C 2D0A18 0034+00 1/0 4/0 0/0 .text            getResSize__10JKRArchiveCFPCv */
 u32 JKRArchive::getResSize(const void* resource) const {
     JUT_ASSERT(732, resource != NULL);
     SDIFileEntry* fileEntry = findPtrResource(resource);
@@ -326,7 +298,6 @@ u32 JKRArchive::getResSize(const void* resource) const {
     return fileEntry->data_size;
 }
 
-/* 802D610C-802D6150 2D0A4C 0044+00 0/0 1/1 0/0 .text            countResource__10JKRArchiveCFv */
 u32 JKRArchive::countResource() const {
     u32 count = 0;
     for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) {
@@ -337,7 +308,6 @@ u32 JKRArchive::countResource() const {
     return count;
 }
 
-/* 802D6150-802D61B0 2D0A90 0060+00 1/0 4/0 0/0 .text            countFile__10JKRArchiveCFPCc */
 u32 JKRArchive::countFile(const char* path) const {
     SDIDirEntry* dirEntry;
     if (*path == '/') {
@@ -357,7 +327,6 @@ u32 JKRArchive::countFile(const char* path) const {
     return 0;
 }
 
-/* 802D61B0-802D625C 2D0AF0 00AC+00 1/0 4/0 0/0 .text            getFirstFile__10JKRArchiveCFPCc */
 JKRFileFinder* JKRArchive::getFirstFile(const char* path) const {
     SDIDirEntry* dirEntry;
     if (*path == '/') {
@@ -379,8 +348,6 @@ JKRFileFinder* JKRArchive::getFirstFile(const char* path) const {
     return NULL;
 }
 
-/* 802D625C-802D6294 2D0B9C 0038+00 0/0 2/2 0/0 .text            getFileAttribute__10JKRArchiveCFUl
- */
 u32 JKRArchive::getFileAttribute(u32 index) const {
     SDIFileEntry* fileEntry = findIdxResource(index);
     if (fileEntry) {
diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/src/JSystem/JKernel/JKRAssertHeap.cpp
index 4ba86df214..d38ff3b909 100644
--- a/src/JSystem/JKernel/JKRAssertHeap.cpp
+++ b/src/JSystem/JKernel/JKRAssertHeap.cpp
@@ -2,17 +2,13 @@
 
 #include "JSystem/JKernel/JKRAssertHeap.h"
 
-/* 802D12C4-802D1300 2CBC04 003C+00 1/1 0/0 0/0 .text __ct__13JKRAssertHeapFPvUlP7JKRHeapb */
 JKRAssertHeap::JKRAssertHeap(void* data, unsigned long size, JKRHeap* parent, bool errorFlag)
     : JKRHeap(data, size, parent, errorFlag) {}
 
-/* 802D1300-802D1368 2CBC40 0068+00 1/0 0/0 0/0 .text            __dt__13JKRAssertHeapFv */
 JKRAssertHeap::~JKRAssertHeap() {
     this->dispose();
 }
 
-/* 802D1368-802D13D8 2CBCA8 0070+00 0/0 1/1 0/0 .text            create__13JKRAssertHeapFP7JKRHeap
- */
 JKRAssertHeap* JKRAssertHeap::create(JKRHeap* parent) {
     if (!parent) {
         parent = JKRHeap::getRootHeap();
@@ -29,82 +25,63 @@ JKRAssertHeap* JKRAssertHeap::create(JKRHeap* parent) {
     return new (ptr) JKRAssertHeap(NULL, 0, parent, false);
 }
 
-/* 802D13D8-802D1408 2CBD18 0030+00 1/0 0/0 0/0 .text            do_destroy__13JKRAssertHeapFv */
 void JKRAssertHeap::do_destroy() {
     this->~JKRAssertHeap();
 }
 
-/* 802D1408-802D1414 2CBD48 000C+00 1/0 0/0 0/0 .text            getHeapType__13JKRAssertHeapFv */
 u32 JKRAssertHeap::getHeapType() {
     return 'ASTH';
 }
 
-/* 802D1414-802D141C 2CBD54 0008+00 1/0 0/0 0/0 .text            check__13JKRAssertHeapFv */
 bool JKRAssertHeap::check() {
     return true;
 }
 
-/* 802D141C-802D1424 2CBD5C 0008+00 1/0 0/0 0/0 .text            dump__13JKRAssertHeapFv */
 bool JKRAssertHeap::dump() {
     return true;
 }
 
-/* 802D1424-802D142C 2CBD64 0008+00 1/0 0/0 0/0 .text            dump_sort__13JKRAssertHeapFv */
 bool JKRAssertHeap::dump_sort() {
     return true;
 }
 
-/* 802D142C-802D1434 2CBD6C 0008+00 1/0 0/0 0/0 .text do_changeGroupID__13JKRAssertHeapFUc */
 
 s32 JKRAssertHeap::do_changeGroupID(u8) {
     return 0;
 }
 
-/* 802D1434-802D143C 2CBD74 0008+00 1/0 0/0 0/0 .text do_getCurrentGroupId__13JKRAssertHeapFv */
 u8 JKRAssertHeap::do_getCurrentGroupId() {
     return 0;
 }
 
-/* 802D143C-802D1444 2CBD7C 0008+00 1/0 0/0 0/0 .text            do_alloc__13JKRAssertHeapFUli */
 void* JKRAssertHeap::do_alloc(u32, int) {
     return NULL;
 }
 
-/* 802D1444-802D1448 2CBD84 0004+00 1/0 0/0 0/0 .text            do_free__13JKRAssertHeapFPv */
 void JKRAssertHeap::do_free(void* param_0) {}
 
-/* 802D1448-802D144C 2CBD88 0004+00 1/0 0/0 0/0 .text            do_freeAll__13JKRAssertHeapFv */
 void JKRAssertHeap::do_freeAll() {}
 
-/* 802D144C-802D1450 2CBD8C 0004+00 1/0 0/0 0/0 .text            do_freeTail__13JKRAssertHeapFv */
 void JKRAssertHeap::do_freeTail() {}
 
-/* 802D1450-802D1454 2CBD90 0004+00 1/0 0/0 0/0 .text            do_fillFreeArea__13JKRAssertHeapFv
- */
 void JKRAssertHeap::do_fillFreeArea() {}
 
-/* 802D1454-802D145C 2CBD94 0008+00 1/0 0/0 0/0 .text            do_resize__13JKRAssertHeapFPvUl */
 s32 JKRAssertHeap::do_resize(void*, u32) {
     return 0;
 }
 
-/* 802D145C-802D1464 2CBD9C 0008+00 1/0 0/0 0/0 .text            do_getSize__13JKRAssertHeapFPv */
 s32 JKRAssertHeap::do_getSize(void*) {
     return 0;
 }
 
-/* 802D1464-802D146C 2CBDA4 0008+00 1/0 0/0 0/0 .text            do_getFreeSize__13JKRAssertHeapFv
- */
 s32 JKRAssertHeap::do_getFreeSize() {
     return 0;
 }
 
-/* 802D146C-802D1474 2CBDAC 0008+00 1/0 0/0 0/0 .text do_getMaxFreeBlock__13JKRAssertHeapFv */
 void* JKRAssertHeap::do_getMaxFreeBlock() {
     return NULL;
 }
 
-/* 802D1474-802D147C 2CBDB4 0008+00 1/0 0/0 0/0 .text do_getTotalFreeSize__13JKRAssertHeapFv */
 s32 JKRAssertHeap::do_getTotalFreeSize() {
     return 0;
 }
diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp
index 12d18c32cd..6f419b1a52 100644
--- a/src/JSystem/JKernel/JKRCompArchive.cpp
+++ b/src/JSystem/JKernel/JKRCompArchive.cpp
@@ -14,8 +14,6 @@
 #include "string.h"
 #include <stdint.h>
 
-/* 802D87D4-802D887C 2D3114 00A8+00 0/0 1/1 0/0 .text
- * __ct__14JKRCompArchiveFlQ210JKRArchive15EMountDirection      */
 JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection)
     : JKRArchive(entryNum, MOUNT_COMP) {
     mMountDirection = eMountDirection;
@@ -30,7 +28,6 @@ JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountD
     mIsMounted = true;
 }
 
-/* 802D887C-802D89BC 2D31BC 0140+00 1/0 0/0 0/0 .text            __dt__14JKRCompArchiveFv */
 JKRCompArchive::~JKRCompArchive() {
     if (mArcInfoBlock != NULL) {
         SDIFileEntry* file = mFiles;
@@ -63,7 +60,6 @@ JKRCompArchive::~JKRCompArchive() {
     mIsMounted = false;
 }
 
-/* 802D89BC-802D8F40 2D32FC 0584+00 1/1 0/0 0/0 .text            open__14JKRCompArchiveFl */
 bool JKRCompArchive::open(s32 entryNum) {
     mArcInfoBlock = NULL;
     field_0x64 = 0;
@@ -223,8 +219,6 @@ bool JKRCompArchive::open(s32 entryNum) {
 }
 
 
-/* 802D8F40-802D90C0 2D3880 0180+00 1/0 0/0 0/0 .text
- * fetchResource__14JKRCompArchiveFPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRCompArchive::fetchResource(SDIFileEntry *fileEntry, u32 *pSize) {
     JUT_ASSERT(597, isMounted());
     u32 ptrSize;
@@ -269,10 +263,7 @@ void* JKRCompArchive::fetchResource(SDIFileEntry *fileEntry, u32 *pSize) {
     return fileEntry->data;
 }
 
-/* ############################################################################################## */
 
-/* 802D90C0-802D9260 2D3A00 01A0+00 1/0 0/0 0/0 .text
- * fetchResource__14JKRCompArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
 void *JKRCompArchive::fetchResource(void *data, u32 compressedSize, SDIFileEntry *fileEntry, u32 *pSize)
 {
     u32 size = 0;
@@ -320,7 +311,6 @@ void *JKRCompArchive::fetchResource(void *data, u32 compressedSize, SDIFileEntry
     return data;
 }
 
-/* 802D9260-802D92F4 2D3BA0 0094+00 1/0 0/0 0/0 .text removeResourceAll__14JKRCompArchiveFv */
 void JKRCompArchive::removeResourceAll() {
     if (mArcInfoBlock != NULL && mMountMode != MOUNT_MEM) {
         SDIFileEntry* fileEntry = mFiles;
@@ -338,8 +328,6 @@ void JKRCompArchive::removeResourceAll() {
     }
 }
 
-/* 802D92F4-802D9360 2D3C34 006C+00 1/0 0/0 0/0 .text            removeResource__14JKRCompArchiveFPv
- */
 bool JKRCompArchive::removeResource(void* resource) {
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (!fileEntry)
@@ -353,9 +341,7 @@ bool JKRCompArchive::removeResource(void* resource) {
     return true;
 }
 
-/* ############################################################################################## */
 
-/* 802D9360-802D9518 2D3CA0 01B8+00 1/0 0/0 0/0 .text getExpandedResSize__14JKRCompArchiveCFPCv */
 u32 JKRCompArchive::getExpandedResSize(const void *resource) const
 {
     if (mExpandedSize == NULL) {
diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp
index 21a4396dfb..67c1e84339 100644
--- a/src/JSystem/JKernel/JKRDecomp.cpp
+++ b/src/JSystem/JKernel/JKRDecomp.cpp
@@ -4,8 +4,6 @@
 #include "JSystem/JKernel/JKRAramPiece.h"
 #include "global.h"
 
-/* ############################################################################################## */
-/* 804514B0-804514B8 0009B0 0004+04 1/1 0/0 0/0 .sbss            sDecompObject__9JKRDecomp */
 JKRDecomp* JKRDecomp::sDecompObject;
 
 JKRDecomp* JKRDecomp::create(s32 priority) {
@@ -16,22 +14,16 @@ JKRDecomp* JKRDecomp::create(s32 priority) {
     return sDecompObject;
 }
 
-/* ############################################################################################## */
-/* 803CC460-803CC480 029580 0020+00 1/1 0/0 0/0 .data            sMessageBuffer__9JKRDecomp */
 OSMessage JKRDecomp::sMessageBuffer[8] = {0};
 
-/* 803CC480-803CC4A0 0295A0 0020+00 2/2 0/0 0/0 .data            sMessageQueue__9JKRDecomp */
 OSMessageQueue JKRDecomp::sMessageQueue = {0};
 
-/* 802DB6E0-802DB730 2D6020 0050+00 1/1 0/0 0/0 .text            __ct__9JKRDecompFl */
 JKRDecomp::JKRDecomp(s32 priority) : JKRThread(0x800, 0x10, priority) {
     resume();
 }
 
-/* 802DB730-802DB790 2D6070 0060+00 1/0 0/0 0/0 .text            __dt__9JKRDecompFv */
 JKRDecomp::~JKRDecomp() {}
 
-/* 802DB790-802DB858 2D60D0 00C8+00 1/0 0/0 0/0 .text            run__9JKRDecompFv */
 void* JKRDecomp::run() {
     OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 8);
     for (;;) {
@@ -61,8 +53,6 @@ void* JKRDecomp::run() {
     }
 }
 
-/* 802DB858-802DB8D0 2D6198 0078+00 1/1 0/0 0/0 .text prepareCommand__9JKRDecompFPUcPUcUlUlPFUl_v
- */
 JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 srcLength,
                                             u32 dstLength,
                                             JKRDecompCommand::AsyncCallback callback) {
@@ -75,13 +65,10 @@ JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 sr
     return command;
 }
 
-/* 802DB8D0-802DB900 2D6210 0030+00 1/1 1/1 0/0 .text sendCommand__9JKRDecompFP16JKRDecompCommand
- */
 void JKRDecomp::sendCommand(JKRDecompCommand* command) {
     OSSendMessage(&sMessageQueue, command, OS_MESSAGE_NOBLOCK);
 }
 
-/* 802DB900-802DB934 2D6240 0034+00 1/1 0/0 0/0 .text orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v */
 JKRDecompCommand* JKRDecomp::orderAsync(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength,
                                         JKRDecompCommand::AsyncCallback callback) {
     JKRDecompCommand* command =
@@ -90,7 +77,6 @@ JKRDecompCommand* JKRDecomp::orderAsync(u8* srcBuffer, u8* dstBuffer, u32 srcLen
     return command;
 }
 
-/* 802DB934-802DB988 2D6274 0054+00 1/1 0/0 0/0 .text sync__9JKRDecompFP16JKRDecompCommandi */
 bool JKRDecomp::sync(JKRDecompCommand* command, int isNonBlocking) {
     OSMessage message;
     bool result;
@@ -105,7 +91,6 @@ bool JKRDecomp::sync(JKRDecompCommand* command, int isNonBlocking) {
     return result;
 }
 
-/* 802DB988-802DB9DC 2D62C8 0054+00 0/0 5/5 0/0 .text            orderSync__9JKRDecompFPUcPUcUlUl */
 bool JKRDecomp::orderSync(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength) {
     JKRDecompCommand* command = orderAsync(srcBuffer, dstBuffer, srcLength, dstLength, NULL);
     bool result = sync(command, JKRDECOMP_SYNC_BLOCKING);
@@ -113,7 +98,6 @@ bool JKRDecomp::orderSync(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLe
     return result;
 }
 
-/* 802DB9DC-802DBA58 2D631C 007C+00 1/1 0/0 0/0 .text            decode__9JKRDecompFPUcPUcUlUl */
 void JKRDecomp::decode(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength) {
     JKRCompression compression = checkCompressed(srcBuffer);
     if (compression == COMPRESSION_YAY0) {
@@ -123,7 +107,6 @@ void JKRDecomp::decode(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLengt
     }
 }
 
-/* 802DBA58-802DBC14 2D6398 01BC+00 1/1 0/0 0/0 .text            decodeSZP__9JKRDecompFPUcPUcUlUl */
 void JKRDecomp::decodeSZP(u8* src, u8* dst, u32 srcLength, u32 dstLength) {
     int srcChunkOffset;
     int count;
@@ -208,7 +191,6 @@ void JKRDecomp::decodeSZP(u8* src, u8* dst, u32 srcLength, u32 dstLength) {
     } while (dstOffset < decodedSize);
 }
 
-/* 802DBC14-802DBCF8 2D6554 00E4+00 1/1 0/0 0/0 .text            decodeSZS__9JKRDecompFPUcPUcUlUl */
 void JKRDecomp::decodeSZS(u8* src_buffer, u8* dst_buffer, u32 srcSize, u32 dstSize) {
     u8* decompEnd;
     u8* copyStart;
@@ -273,7 +255,6 @@ void JKRDecomp::decodeSZS(u8* src_buffer, u8* dst_buffer, u32 srcSize, u32 dstSi
     } while (dst_buffer != decompEnd);
 }
 
-/* 802DBCF8-802DBD70 2D6638 0078+00 1/1 4/4 0/0 .text            checkCompressed__9JKRDecompFPUc */
 JKRCompression JKRDecomp::checkCompressed(u8* src) {
     if ((src[0] == 'Y') && (src[1] == 'a') && (src[3] == '0')) {
         if (src[2] == 'y') {
@@ -292,7 +273,6 @@ JKRCompression JKRDecomp::checkCompressed(u8* src) {
     return COMPRESSION_NONE;
 }
 
-/* 802DBD70-802DBDC0 2D66B0 0050+00 1/1 0/0 0/0 .text            __ct__16JKRDecompCommandFv */
 JKRDecompCommand::JKRDecompCommand() {
     OSInitMessageQueue(&mMessageQueue, &mMessage, 1);
     mCallback = NULL;
@@ -301,5 +281,4 @@ JKRDecompCommand::JKRDecompCommand() {
     field_0x20 = 0;
 }
 
-/* 802DBDC0-802DBDFC 2D6700 003C+00 1/1 0/0 0/0 .text            __dt__16JKRDecompCommandFv */
 JKRDecompCommand::~JKRDecompCommand() {}
diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/src/JSystem/JKernel/JKRDisposer.cpp
index 9bfa3eb06b..2c2f2bc30c 100644
--- a/src/JSystem/JKernel/JKRDisposer.cpp
+++ b/src/JSystem/JKernel/JKRDisposer.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 802D147C-802D14E4 2CBDBC 0068+00 0/0 12/12 0/0 .text            __ct__11JKRDisposerFv */
 JKRDisposer::JKRDisposer() : mLink(this) {
     mHeap = JKRHeap::findFromRoot(this);
     if (mHeap) {
@@ -11,7 +10,6 @@ JKRDisposer::JKRDisposer() : mLink(this) {
     }
 }
 
-/* 802D14E4-802D1568 2CBE24 0084+00 1/0 10/10 0/0 .text            __dt__11JKRDisposerFv */
 JKRDisposer::~JKRDisposer() {
     JKRHeap* heap = mHeap;
     if (heap) {
diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
index d0ddbf8e05..e157ee5bec 100644
--- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -19,8 +19,6 @@ static u8* firstSrcData();
 static u8* nextSrcData(u8*);
 static u32 dmaBufferFlush(u32);
 
-/* 802DA874-802DA918 2D51B4 00A4+00 0/0 3/3 0/0 .text
- * loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl   */
 JKRAramBlock* JKRDvdAramRipper::loadToAram(s32 entryNumber, u32 address,
                                            JKRExpandSwitch expandSwitch, u32 param_3, u32 param_4,
                                            u32* param_5) {
@@ -32,8 +30,6 @@ JKRAramBlock* JKRDvdAramRipper::loadToAram(s32 entryNumber, u32 address,
     }
 }
 
-/* 802DA918-802DA9C0 2D5258 00A8+00 1/1 0/0 0/0 .text
- * loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl */
 JKRAramBlock* JKRDvdAramRipper::loadToAram(JKRDvdFile* dvdFile, u32 address,
                                            JKRExpandSwitch expandSwitch, u32 param_3, u32 param_4,
                                            u32* param_5) {
@@ -56,8 +52,6 @@ JKRAramBlock* JKRDvdAramRipper::loadToAram(JKRDvdFile* dvdFile, u32 address,
     return result;
 }
 
-/* 802DA9C0-802DAA74 2D5300 00B4+00 1/1 0/0 0/0 .text
- * loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl */
 JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 address,
                                                  JKRExpandSwitch expandSwitch,
                                                  void (*callback)(u32), u32 param_4, u32 param_5,
@@ -80,14 +74,10 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres
     return command;
 }
 
-/* 804343B4-804343C0 0610D4 000C+00 3/3 0/0 0/0 .bss sDvdAramAsyncList__16JKRDvdAramRipper */
 JSUList<JKRADCommand> JKRDvdAramRipper::sDvdAramAsyncList;
 
-/* 804508D0-804508D4 000350 0004+00 3/3 0/0 0/0 .sdata           None */
 bool JKRDvdAramRipper::errorRetry = true;
 
-/* 802DAA74-802DADD8 2D53B4 0364+00 1/1 0/0 0/0 .text
- * callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand        */
 JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
     s32 compression;
     s32 uncompressedSize;
@@ -198,8 +188,6 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) {
     return bVar1 == true ? command : NULL;
 }
 
-/* 802DAE48-802DAF1C 2D5788 00D4+00 1/1 0/0 0/0 .text
- * syncAram__16JKRDvdAramRipperFP12JKRADCommandi                */
 bool JKRDvdAramRipper::syncAram(JKRADCommand* command, int param_1) {
     JKRDvdFile* dvdFile = command->mDvdFile;
     OSLockMutex(&dvdFile->mMutex2);
@@ -225,82 +213,57 @@ bool JKRDvdAramRipper::syncAram(JKRADCommand* command, int param_1) {
     return true;
 }
 
-/* 802DAF1C-802DAF5C 2D585C 0040+00 1/1 0/0 0/0 .text            __ct__12JKRADCommandFv */
 JKRADCommand::JKRADCommand() : mLink(this) {
     field_0x48 = 0;
     field_0x4c = 0;
 }
 
-/* 802DAF5C-802DAFE8 2D589C 008C+00 2/2 0/0 0/0 .text            __dt__12JKRADCommandFv */
 JKRADCommand::~JKRADCommand() {
     if (field_0x4c == 1) {
         delete mDvdFile;
     }
 }
 
-/* 804343C0-804343D8 0610E0 0018+00 1/1 0/0 0/0 .bss             decompMutex */
 static OSMutex decompMutex;
 
-/* 804508D4-804508D8 000354 0004+00 1/1 1/1 0/0 .sdata           sSZSBufferSize__16JKRDvdAramRipper
- */
 u32 JKRDvdAramRipper::sSZSBufferSize = 0x00000400;
 
-/* 80451468-8045146C 000968 0004+00 3/3 0/0 0/0 .sbss            szpBuf */
 static u8* szpBuf;
 
-/* 8045146C-80451470 00096C 0004+00 3/3 0/0 0/0 .sbss            szpEnd */
 static u8* szpEnd;
 
-/* 80451470-80451474 000970 0004+00 2/2 0/0 0/0 .sbss            refBuf */
 static u8* refBuf;
 
-/* 80451474-80451478 000974 0004+00 2/2 0/0 0/0 .sbss            refEnd */
 static u8* refEnd;
 
-/* 80451478-8045147C 000978 0004+00 2/2 0/0 0/0 .sbss            refCurrent */
 static u8* refCurrent;
 
-/* 8045147C-80451480 00097C 0004+00 2/2 0/0 0/0 .sbss            dmaBuf */
 static u8* dmaBuf;
 
-/* 80451480-80451484 000980 0004+00 2/2 0/0 0/0 .sbss            dmaEnd */
 static u8* dmaEnd;
 
-/* 80451484-80451488 000984 0004+00 3/3 0/0 0/0 .sbss            dmaCurrent */
 static u8* dmaCurrent;
 
-/* 80451488-8045148C 000988 0004+00 3/3 0/0 0/0 .sbss            srcOffset */
 static u32 srcOffset;
 
-/* 8045148C-80451490 00098C 0004+00 4/4 0/0 0/0 .sbss            transLeft */
 static u32 transLeft;
 
-/* 80451490-80451494 000990 0004+00 3/3 0/0 0/0 .sbss            srcLimit */
 static u8* srcLimit;
 
-/* 80451494-80451498 000994 0004+00 3/3 0/0 0/0 .sbss            srcFile */
 static JKRDvdFile* srcFile;
 
-/* 80451498-8045149C 000998 0004+00 2/2 0/0 0/0 .sbss            fileOffset */
 static u32 fileOffset;
 
-/* 8045149C-804514A0 00099C 0004+00 2/2 0/0 0/0 .sbss            readCount */
 static int readCount;
 
-/* 804514A0-804514A4 0009A0 0004+00 2/2 0/0 0/0 .sbss            maxDest */
 static u32 maxDest;
 
-/* 804514A4-804514A8 0009A4 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool data_804514A4;
 
-/* 804514A8-804514AC 0009A8 0004+00 2/2 0/0 0/0 .sbss            tsPtr */
 static u32* tsPtr;
 
-/* 804514AC-804514B0 0009AC 0004+00 1/1 0/0 0/0 .sbss            tsArea */
 static u32 tsArea;
 
-/* 802DAFE8-802DB160 2D5928 0178+00 1/1 0/0 0/0 .text
- * JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl      */
 int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 fileSize, u32 uncompressedSize,
                                u32 param_4, u32 param_5, u32* param_6) {
     BOOL level = OSDisableInterrupts();
@@ -338,7 +301,6 @@ int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 fileSize, u
     return result;
 }
 
-/* 802DB160-802DB3E8 2D5AA0 0288+00 1/1 0/0 0/0 .text            decompSZS_subroutine__FPUcUl */
 static int decompSZS_subroutine(u8* src, u32 dest) {
     u32 endAddr;
     u8* copySource;
@@ -438,7 +400,6 @@ static int decompSZS_subroutine(u8* src, u32 dest) {
     return 0;
 }
 
-/* 802DB3E8-802DB49C 2D5D28 00B4+00 1/1 0/0 0/0 .text            firstSrcData__Fv */
 static u8* firstSrcData() {
     srcLimit = szpEnd - 0x19;
     u8* buffer = szpBuf;
@@ -459,7 +420,6 @@ static u8* firstSrcData() {
     return buffer;
 }
 
-/* 802DB49C-802DB580 2D5DDC 00E4+00 1/1 0/0 0/0 .text            nextSrcData__FPUc */
 static u8* nextSrcData(u8* src) {
     u32 size = szpEnd - src;
     u8* dest;
@@ -492,7 +452,6 @@ static u8* nextSrcData(u8* src) {
     return dest;
 }
 
-/* 802DB580-802DB5E8 2D5EC0 0068+00 1/1 0/0 0/0 .text            dmaBufferFlush__FUl */
 static u32 dmaBufferFlush(u32 param_1) {
     if (dmaCurrent == dmaBuf) {
         return 0;
diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp
index 3443aff128..f80674994c 100644
--- a/src/JSystem/JKernel/JKRDvdArchive.cpp
+++ b/src/JSystem/JKernel/JKRDvdArchive.cpp
@@ -11,8 +11,6 @@
 #include "global.h"
 #include <stdint.h>
 
-/* 802D7BF0-802D7C98 2D2530 00A8+00 0/0 1/1 0/0 .text
- * __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection       */
 JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_DVD) {
     mMountDirection = mountDirection;
@@ -25,7 +23,6 @@ JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDire
     mIsMounted = true;
 }
 
-/* 802D7C98-802D7DB4 2D25D8 011C+00 1/0 0/0 0/0 .text            __dt__13JKRDvdArchiveFv */
 JKRDvdArchive::~JKRDvdArchive() {
     if (mIsMounted == true) {
         if (mArcInfoBlock) {
@@ -55,7 +52,6 @@ JKRDvdArchive::~JKRDvdArchive() {
     }
 }
 
-/* 802D7DB4-802D8050 2D26F4 029C+00 1/1 0/0 0/0 .text            open__13JKRDvdArchiveFl */
 bool JKRDvdArchive::open(s32 entryNum) {
     mArcInfoBlock = NULL;
     mDataOffset = 0;
@@ -140,8 +136,6 @@ cleanup:
     return true;
 }
 
-/* 802D8050-802D8168 2D2990 0118+00 1/0 0/0 0/0 .text
- * fetchResource__13JKRDvdArchiveFPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRDvdArchive::fetchResource(SDIFileEntry* fileEntry, u32* returnSize) {
     JUT_ASSERT(428, isMounted());
     u32 tempReturnSize;
@@ -176,8 +170,6 @@ void* JKRDvdArchive::fetchResource(SDIFileEntry* fileEntry, u32* returnSize) {
     return fileEntry->data;
 }
 
-/* 802D8168-802D826C 2D2AA8 0104+00 1/0 0/0 0/0 .text
- * fetchResource__13JKRDvdArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRDvdArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* fileEntry,
                                    u32* returnSize) {
     JUT_ASSERT(504, isMounted());
@@ -211,8 +203,6 @@ void* JKRDvdArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* f
     return buffer;
 }
 
-/* 802D826C-802D8474 2D2BAC 0208+00 1/1 1/1 0/0 .text
- * fetchResource_subroutine__13JKRDvdArchiveFlUlUlPUcUlii       */
 u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size, u8* dst,
                                             u32 dstLength, JKRCompression fileCompression,
                                             JKRCompression archiveCompression) {
@@ -276,8 +266,6 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
     }
 }
 
-/* 802D8474-802D8698 2D2DB4 0224+00 1/1 1/1 0/0 .text
- * fetchResource_subroutine__13JKRDvdArchiveFlUlUlP7JKRHeapiiPPUc */
 u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size, JKRHeap* heap,
                                             JKRCompression fileCompression,
                                             JKRCompression archiveCompression,
@@ -343,7 +331,6 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
     }
 }
 
-/* 802D8698-802D87D4 2D2FD8 013C+00 1/0 0/0 0/0 .text getExpandedResSize__13JKRDvdArchiveCFPCv */
 u32 JKRDvdArchive::getExpandedResSize(const void* resource) const {
     u32 resourceSize;
     if (!mExpandedSize) {
diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp
index 90e277c686..9df201adb7 100644
--- a/src/JSystem/JKernel/JKRDvdFile.cpp
+++ b/src/JSystem/JKernel/JKRDvdFile.cpp
@@ -4,15 +4,12 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
 
-/* 8043436C-80434378 06108C 000C+00 4/4 0/0 0/0 .bss             sDvdList__10JKRDvdFile */
 JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
 
-/* 802D9584-802D95F8 2D3EC4 0074+00 0/0 3/3 0/0 .text            __ct__10JKRDvdFileFv */
 JKRDvdFile::JKRDvdFile() : mDvdLink(this) {
     initiate();
 }
 
-/* 802D95F8-802D96A0 2D3F38 00A8+00 0/0 2/2 0/0 .text            __ct__10JKRDvdFileFPCc */
 JKRDvdFile::JKRDvdFile(const char* name) : mDvdLink(this) {
     initiate();
     bool result = open(name);
@@ -24,7 +21,6 @@ JKRDvdFile::JKRDvdFile(const char* name) : mDvdLink(this) {
         return;
 }
 
-/* 802D96A0-802D9748 2D3FE0 00A8+00 0/0 3/3 0/0 .text            __ct__10JKRDvdFileFl */
 JKRDvdFile::JKRDvdFile(s32 entryNum) : mDvdLink(this) {
     initiate();
     bool result = open(entryNum);
@@ -36,12 +32,10 @@ JKRDvdFile::JKRDvdFile(s32 entryNum) : mDvdLink(this) {
         return;
 }
 
-/* 802D9748-802D97E4 2D4088 009C+00 1/0 5/5 0/0 .text            __dt__10JKRDvdFileFv */
 JKRDvdFile::~JKRDvdFile() {
     close();
 }
 
-/* 802D97E4-802D9850 2D4124 006C+00 3/3 0/0 0/0 .text            initiate__10JKRDvdFileFv */
 void JKRDvdFile::initiate(void) {
     mDvdFile = this;
     OSInitMutex(&mMutex1);
@@ -53,7 +47,6 @@ void JKRDvdFile::initiate(void) {
     field_0x58 = 0;
 }
 
-/* 802D9850-802D98C4 2D4190 0074+00 1/0 1/1 0/0 .text            open__10JKRDvdFileFPCc */
 bool JKRDvdFile::open(const char* name) {
     if (!mIsAvailable) {
         mIsAvailable = DVDOpen(name, &mFileInfo);
@@ -65,7 +58,6 @@ bool JKRDvdFile::open(const char* name) {
     return mIsAvailable;
 }
 
-/* 802D98C4-802D9938 2D4204 0074+00 1/0 2/2 0/0 .text            open__10JKRDvdFileFl */
 bool JKRDvdFile::open(s32 entryNum) {
     if (!mIsAvailable) {
         mIsAvailable = DVDFastOpen(entryNum, &mFileInfo);
@@ -77,7 +69,6 @@ bool JKRDvdFile::open(s32 entryNum) {
     return mIsAvailable;
 }
 
-/* 802D9938-802D99B4 2D4278 007C+00 1/0 0/0 0/0 .text            close__10JKRDvdFileFv */
 void JKRDvdFile::close() {
     if (mIsAvailable) {
         s32 result = DVDClose(&mFileInfo);
@@ -90,7 +81,6 @@ void JKRDvdFile::close() {
     }
 }
 
-/* 802D99B4-802D9A68 2D42F4 00B4+00 1/0 0/0 0/0 .text            readData__10JKRDvdFileFPvll */
 s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) {
     /* clang-format off */
     // The assert condition gets stringified as "( length & 0x1f ) == 0", 
@@ -120,7 +110,6 @@ s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) {
     return result;
 }
 
-/* 802D9A68-802D9A70 2D43A8 0008+00 1/0 0/0 0/0 .text            writeData__10JKRDvdFileFPCvll */
 s32 JKRDvdFile::writeData(void const* param_0, s32 length, s32 param_2) {
     /* clang-format off */
     JUT_ASSERT(344, ( length & 0x1f ) == 0);
@@ -128,7 +117,6 @@ s32 JKRDvdFile::writeData(void const* param_0, s32 length, s32 param_2) {
     return -1;
 }
 
-/* 802D9A70-802D9AC4 2D43B0 0054+00 1/1 0/0 0/0 .text            sync__10JKRDvdFileFv */
 s32 JKRDvdFile::sync(void) {
     OSMessage message;
     OSLockMutex(&mMutex1);
@@ -138,14 +126,12 @@ s32 JKRDvdFile::sync(void) {
     return (int)message;
 }
 
-/* 802D9AC4-802D9AF8 2D4404 0034+00 1/1 0/0 0/0 .text doneProcess__10JKRDvdFileFlP11DVDFileInfo */
 void JKRDvdFile::doneProcess(s32 id, DVDFileInfo* fileInfo) {
     // fileInfo->field_0x3c looks like some kind of user pointer?
     JKRDvdFile* dvdFile = *(JKRDvdFile**)((u8*)fileInfo + 0x3c);
     OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)id, OS_MESSAGE_NOBLOCK);
 }
 
-/* 802D9AF8-802D9B00 2D4438 0008+00 1/0 0/0 0/0 .text            getFileSize__10JKRDvdFileCFv */
 s32 JKRDvdFile::getFileSize(void) const {
     return mFileInfo.length;
 }
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 19df91fa1f..15a0ad5fe4 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -48,7 +48,6 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa
                          pCompression, param_8);
 }
 
-/* 804508C8-804508CC 000348 0004+00 3/2 0/0 0/0 .sdata           None */
 static u8 errorRetry = 0x01;
 
 /* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text
@@ -241,66 +240,44 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch
     return NULL;
 }
 
-/* ############################################################################################## */
-/* 80434378-80434384 061098 000C+00 1/1 0/0 0/0 .bss             @491 */
 static u8 lit_491[12];
 
-/* 80434384-80434390 0610A4 000C+00 1/1 0/0 0/0 .bss             sDvdAsyncList__12JKRDvdRipper */
 JSUList<JKRDMCommand> JKRDvdRipper::sDvdAsyncList;
 
-/* 80434390-804343A8 0610B0 0018+00 1/1 0/0 0/0 .bss             decompMutex */
 static OSMutex decompMutex;
 
-/* 804508CC-804508D0 00034C 0004+00 1/1 1/1 0/0 .sdata           sSZSBufferSize__12JKRDvdRipper */
 u32 JKRDvdRipper::sSZSBufferSize = 0x00000400;
 
-/* 80451428-8045142C 000928 0004+00 3/3 0/0 0/0 .sbss            szpBuf */
 static u8* szpBuf;
 
-/* 8045142C-80451430 00092C 0004+00 3/3 0/0 0/0 .sbss            szpEnd */
 static u8* szpEnd;
 
-/* 80451430-80451434 000930 0004+00 2/2 0/0 0/0 .sbss            refBuf */
 static u8* refBuf;
 
-/* 80451434-80451438 000934 0004+00 2/2 0/0 0/0 .sbss            refEnd */
 static u8* refEnd;
 
-/* 80451438-8045143C 000938 0004+00 2/2 0/0 0/0 .sbss            refCurrent */
 static u8* refCurrent;
 
-/* 8045143C-80451440 00093C 0004+00 3/3 0/0 0/0 .sbss            srcOffset */
 static u32 srcOffset;
 
-/* 80451440-80451444 000940 0004+00 4/4 0/0 0/0 .sbss            transLeft */
 static u32 transLeft;
 
-/* 80451444-80451448 000944 0004+00 3/3 0/0 0/0 .sbss            srcLimit */
 static u8* srcLimit;
 
-/* 80451448-8045144C 000948 0004+00 3/3 0/0 0/0 .sbss            srcFile */
 static JKRDvdFile* srcFile;
 
-/* 8045144C-80451450 00094C 0004+00 2/2 0/0 0/0 .sbss            fileOffset */
 static u32 fileOffset;
 
-/* 80451450-80451454 000950 0004+00 2/2 0/0 0/0 .sbss            readCount */
 static u32 readCount;
 
-/* 80451454-80451458 000954 0004+00 2/2 0/0 0/0 .sbss            maxDest */
 static u32 maxDest;
 
-/* 80451458-8045145C 000958 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool data_80451458;
 
-/* 8045145C-80451460 00095C 0004+00 2/2 0/0 0/0 .sbss            tsPtr */
 static u32* tsPtr;
 
-/* 80451460-80451468 000960 0004+04 1/1 0/0 0/0 .sbss            tsArea */
 static u32 tsArea;
 
-/* 802DA1E4-802DA35C 2D4B24 0178+00 1/1 0/0 0/0 .text
- * JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl            */
 static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u32 inMaxDest,
                                 u32 inFileOffset, u32 inSrcOffset, u32* inTsPtr) {
     BOOL interrupts = OSDisableInterrupts();
@@ -352,7 +329,6 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3
     return result;
 }
 
-/* 802DA35C-802DA60C 2D4C9C 02B0+00 1/1 0/0 0/0 .text            decompSZS_subroutine__FPUcPUc */
 int decompSZS_subroutine(u8* src, u8* dest) {
     u8 *endPtr;
     s32 validBitCount = 0;
@@ -501,7 +477,6 @@ int decompSZS_subroutine(u8* src, u8* dest) {
     return 0;
 }
 
-/* 802DA60C-802DA6D8 2D4F4C 00CC+00 1/1 0/0 0/0 .text            firstSrcData__Fv */
 static u8* firstSrcData() {
     srcLimit = szpEnd - 0x19;
     u8* buffer = szpBuf;
@@ -526,7 +501,6 @@ static u8* firstSrcData() {
     return buffer;
 }
 
-/* 802DA6D8-802DA7D4 2D5018 00FC+00 1/1 0/0 0/0 .text            nextSrcData__FPUc */
 static u8* nextSrcData(u8* src) {
     u32 limit = szpEnd - src;
     u8 *buf;
@@ -559,7 +533,6 @@ static u8* nextSrcData(u8* src) {
     return buf;
 }
 
-/* 802DA7D4-802DA7DC -00001 0008+00 0/0 0/0 0/0 .text            isErrorRetry__12JKRDvdRipperFv */
 u8 JKRDvdRipper::isErrorRetry() {
     return errorRetry;
 }
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index 143b05e21b..bffe0680ef 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTException.h"
 
-/* 802CEDB4-802CEE2C 2C96F4 0078+00 0/0 1/1 0/0 .text            createRoot__10JKRExpHeapFib */
 JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
     JKRExpHeap* heap = NULL;
     if (!sRootHeap) {
@@ -25,8 +24,6 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {
     return heap;
 }
 
-/* 802CEE2C-802CEF00 2C976C 00D4+00 0/0 19/19 1/1 .text            create__10JKRExpHeapFUlP7JKRHeapb
- */
 JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) {
     if (!parent) {
         parent = sRootHeap;
@@ -59,8 +56,6 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) {
     return newHeap;
 }
 
-/* 802CEF00-802CEFAC 2C9840 00AC+00 0/0 1/1 0/0 .text            create__10JKRExpHeapFPvUlP7JKRHeapb
- */
 JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorFlag) {
     JKRHeap* parent2;
     if (parent == NULL) {
@@ -88,7 +83,6 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorF
     return newHeap;
 }
 
-/* 802CEFAC-802CF030 2C98EC 0084+00 1/0 0/0 0/0 .text            do_destroy__10JKRExpHeapFv */
 void JKRExpHeap::do_destroy() {
     if (!field_0x6e) {
         JKRHeap* heap = mChildTree.getParent()->getObject();
@@ -101,8 +95,6 @@ void JKRExpHeap::do_destroy() {
     }
 }
 
-/* 802CF030-802CF0C0 2C9970 0090+00 3/3 0/0 0/0 .text            __ct__10JKRExpHeapFPvUlP7JKRHeapb
- */
 JKRExpHeap::JKRExpHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     : JKRHeap(data, size, parent, errorFlag) {
     mAllocMode = 0;
@@ -114,12 +106,10 @@ JKRExpHeap::JKRExpHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     mTailUsedList = NULL;
 }
 
-/* 802CF0C0-802CF128 2C9A00 0068+00 1/0 0/0 0/0 .text            __dt__10JKRExpHeapFv */
 JKRExpHeap::~JKRExpHeap() {
     dispose();
 }
 
-/* 802CF128-802CF234 2C9A68 010C+00 1/0 0/0 0/0 .text            do_alloc__10JKRExpHeapFUli */
 void* JKRExpHeap::do_alloc(u32 size, int alignment) {
     void* ptr;
 
@@ -153,23 +143,16 @@ void* JKRExpHeap::do_alloc(u32 size, int alignment) {
     return ptr;
 }
 
-/* ############################################################################################## */
-/* 80451398-8045139C 000898 0004+00 1/1 0/0 0/0 .sbss            DBfoundSize */
 static u32 DBfoundSize;
 
-/* 8045139C-804513A0 00089C 0004+00 1/1 0/0 0/0 .sbss            DBfoundOffset */
 static u32 DBfoundOffset;
 
-/* 804513A0-804513A4 0008A0 0004+00 1/1 0/0 0/0 .sbss            DBfoundBlock */
 static JKRExpHeap::CMemBlock* DBfoundBlock;
 
-/* 804513A4-804513A8 0008A4 0004+00 1/1 0/0 0/0 .sbss            DBnewFreeBlock */
 static JKRExpHeap::CMemBlock* DBnewFreeBlock;
 
-/* 804513A8-804513B0 0008A8 0004+04 1/1 0/0 0/0 .sbss            DBnewUsedBlock */
 static JKRExpHeap::CMemBlock* DBnewUsedBlock;
 
-/* 802CF234-802CF490 2C9B74 025C+00 1/1 0/0 0/0 .text            allocFromHead__10JKRExpHeapFUli */
 void* JKRExpHeap::allocFromHead(u32 size, int align) {
     u32 foundOffset;
     int foundSize;
@@ -273,7 +256,6 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) {
     return NULL;
 }
 
-/* 802CF490-802CF574 2C9DD0 00E4+00 1/1 0/0 0/0 .text            allocFromHead__10JKRExpHeapFUl */
 void* JKRExpHeap::allocFromHead(u32 size) {
     size = ALIGN_NEXT(size, 4);
     s32 foundSize = -1;
@@ -311,7 +293,6 @@ void* JKRExpHeap::allocFromHead(u32 size) {
     return NULL;
 }
 
-/* 802CF574-802CF6D4 2C9EB4 0160+00 1/1 0/0 0/0 .text            allocFromTail__10JKRExpHeapFUli */
 void* JKRExpHeap::allocFromTail(u32 size, int align) {
     u32 offset = 0;
     CMemBlock* foundBlock = NULL;
@@ -354,7 +335,6 @@ void* JKRExpHeap::allocFromTail(u32 size, int align) {
     return NULL;
 }
 
-/* 802CF6D4-802CF7AC 2CA014 00D8+00 1/1 0/0 0/0 .text            allocFromTail__10JKRExpHeapFUl */
 void* JKRExpHeap::allocFromTail(u32 size) {
     u32 size2 = ALIGN_NEXT(size, 4);
     CMemBlock* foundBlock = NULL;
@@ -385,7 +365,6 @@ void* JKRExpHeap::allocFromTail(u32 size) {
     return NULL;
 }
 
-/* 802CF7AC-802CF820 2CA0EC 0074+00 1/0 0/0 0/0 .text            do_free__10JKRExpHeapFPv */
 void JKRExpHeap::do_free(void* ptr) {
     lock();
     if (getStartAddr() <= ptr && ptr <= getEndAddr()) {
@@ -397,7 +376,6 @@ void JKRExpHeap::do_free(void* ptr) {
     unlock();
 }
 
-/* 802CF820-802CF89C 2CA160 007C+00 1/0 0/0 0/0 .text            do_freeAll__10JKRExpHeapFv */
 void JKRExpHeap::do_freeAll() {
     lock();
     JKRHeap::callAllDisposer();
@@ -409,7 +387,6 @@ void JKRExpHeap::do_freeAll() {
     unlock();
 }
 
-/* 802CF89C-802CF924 2CA1DC 0088+00 1/0 0/0 0/0 .text            do_freeTail__10JKRExpHeapFv */
 void JKRExpHeap::do_freeTail() {
     lock();
     for (CMemBlock* block = mHeadUsedList; block != NULL;) {
@@ -425,11 +402,8 @@ void JKRExpHeap::do_freeTail() {
     unlock();
 }
 
-/* 802CF924-802CF928 2CA264 0004+00 1/0 0/0 0/0 .text            do_fillFreeArea__10JKRExpHeapFv */
 void JKRExpHeap::do_fillFreeArea() {}
 
-/* 802CF928-802CF978 2CA268 0050+00 1/0 0/0 0/0 .text            do_changeGroupID__10JKRExpHeapFUc
- */
 s32 JKRExpHeap::do_changeGroupID(u8 param_0) {
     lock();
     u8 prev = mCurrentGroupId;
@@ -438,7 +412,6 @@ s32 JKRExpHeap::do_changeGroupID(u8 param_0) {
     return prev;
 }
 
-/* 802CF978-802CFB24 2CA2B8 01AC+00 1/0 0/0 0/0 .text            do_resize__10JKRExpHeapFPvUl */
 s32 JKRExpHeap::do_resize(void* ptr, u32 size) {
     lock();
     CMemBlock* block = CMemBlock::getHeapBlock(ptr);
@@ -493,7 +466,6 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) {
     return block->size;
 }
 
-/* 802CFB24-802CFBA4 2CA464 0080+00 1/0 0/0 0/0 .text            do_getSize__10JKRExpHeapFPv */
 s32 JKRExpHeap::do_getSize(void* ptr) {
     lock();
     CMemBlock* block = CMemBlock::getHeapBlock(ptr);
@@ -505,7 +477,6 @@ s32 JKRExpHeap::do_getSize(void* ptr) {
     return block->getSize();
 }
 
-/* 802CFBA4-802CFC10 2CA4E4 006C+00 1/0 0/0 0/0 .text            do_getFreeSize__10JKRExpHeapFv */
 s32 JKRExpHeap::do_getFreeSize() {
     lock();
     s32 size = 0;
@@ -518,8 +489,6 @@ s32 JKRExpHeap::do_getFreeSize() {
     return size;
 }
 
-/* 802CFC10-802CFC84 2CA550 0074+00 1/0 0/0 0/0 .text            do_getMaxFreeBlock__10JKRExpHeapFv
- */
 void* JKRExpHeap::do_getMaxFreeBlock() {
     lock();
     s32 size = 0;
@@ -534,8 +503,6 @@ void* JKRExpHeap::do_getMaxFreeBlock() {
     return res;
 }
 
-/* 802CFC84-802CFCE8 2CA5C4 0064+00 1/0 0/0 0/0 .text            do_getTotalFreeSize__10JKRExpHeapFv
- */
 s32 JKRExpHeap::do_getTotalFreeSize() {
     u32 size = 0;
     lock();
@@ -546,7 +513,6 @@ s32 JKRExpHeap::do_getTotalFreeSize() {
     return size;
 }
 
-/* 802CFCE8-802CFD64 2CA628 007C+00 1/1 0/0 0/0 .text            getUsedSize__10JKRExpHeapCFUc */
 s32 JKRExpHeap::getUsedSize(u8 groupId) const {
     JKRExpHeap* this2 = const_cast<JKRExpHeap*>(this);
     this2->lock();
@@ -563,8 +529,6 @@ s32 JKRExpHeap::getUsedSize(u8 groupId) const {
     return size;
 }
 
-/* 802CFD64-802CFDCC 2CA6A4 0068+00 0/0 5/5 0/0 .text            getTotalUsedSize__10JKRExpHeapCFv
- */
 s32 JKRExpHeap::getTotalUsedSize() const {
     JKRExpHeap* this2 = const_cast<JKRExpHeap*>(this);
     this2->lock();
@@ -578,8 +542,6 @@ s32 JKRExpHeap::getTotalUsedSize() const {
     return size;
 }
 
-/* 802CFDCC-802CFE68 2CA70C 009C+00 4/4 0/0 0/0 .text
- * appendUsedList__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock       */
 void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock* newblock) {
     if (!newblock) {
         JUTException::panic(__FILE__, 1568, "bad appendUsedList\n");
@@ -625,8 +587,6 @@ void JKRExpHeap::setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next
     block->mMagic = 0;
 }
 
-/* 802CFEB4-802CFEE8 2CA7F4 0034+00 5/5 0/0 0/0 .text
- * removeFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock      */
 void JKRExpHeap::removeFreeBlock(CMemBlock* block) {
     CMemBlock* prev = block->mPrev;
     CMemBlock* next = block->mNext;
@@ -644,8 +604,6 @@ void JKRExpHeap::removeFreeBlock(CMemBlock* block) {
     }
 }
 
-/* 802CFEE8-802CFF1C 2CA828 0034+00 1/1 0/0 0/0 .text
- * removeUsedBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock      */
 void JKRExpHeap::removeUsedBlock(JKRExpHeap::CMemBlock* block) {
     CMemBlock* prev = block->mPrev;
     CMemBlock* next = block->mNext;
@@ -663,8 +621,6 @@ void JKRExpHeap::removeUsedBlock(JKRExpHeap::CMemBlock* block) {
     }
 }
 
-/* 802CFF1C-802D00B4 2CA85C 0198+00 2/2 0/0 0/0 .text
- * recycleFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock     */
 void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* block) {
     JKRExpHeap::CMemBlock* newBlock = block;
     int size = block->size;
@@ -717,8 +673,6 @@ void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* block) {
     }
 }
 
-/* 802D00B4-802D0190 2CA9F4 00DC+00 1/1 0/0 0/0 .text
- * joinTwoBlocks__10JKRExpHeapFPQ210JKRExpHeap9CMemBlock        */
 void JKRExpHeap::joinTwoBlocks(CMemBlock* block) {
     u32 endAddr = (uintptr_t)(block + 1) + block->size;
     CMemBlock* next = block->mNext;
@@ -735,7 +689,6 @@ void JKRExpHeap::joinTwoBlocks(CMemBlock* block) {
     }
 }
 
-/* 802D0190-802D03B8 2CAAD0 0228+00 1/0 0/0 0/0 .text            check__10JKRExpHeapFv */
 bool JKRExpHeap::check() {
     lock();
     int totalBytes = 0;
@@ -804,7 +757,6 @@ bool JKRExpHeap::check() {
     return ok;
 }
 
-/* 802D03B8-802D05CC 2CACF8 0214+00 1/0 0/0 0/0 .text            dump__10JKRExpHeapFv */
 bool JKRExpHeap::dump() {
     lock();
     bool result = check();
@@ -852,7 +804,6 @@ bool JKRExpHeap::dump() {
     return result;
 }
 
-/* 802D05CC-802D0810 2CAF0C 0244+00 1/0 0/0 0/0 .text            dump_sort__10JKRExpHeapFv */
 bool JKRExpHeap::dump_sort() {
     lock();
     bool result = check();
@@ -914,8 +865,6 @@ bool JKRExpHeap::dump_sort() {
     return result;
 }
 
-/* 802D0810-802D0830 2CB150 0020+00 4/4 0/0 0/0 .text
- * initiate__Q210JKRExpHeap9CMemBlockFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockUlUcUc */
 void JKRExpHeap::CMemBlock::initiate(JKRExpHeap::CMemBlock* prev, JKRExpHeap::CMemBlock* next,
                                      u32 size, u8 groupId, u8 alignment) {
     mMagic = 'HM';
@@ -926,8 +875,6 @@ void JKRExpHeap::CMemBlock::initiate(JKRExpHeap::CMemBlock* prev, JKRExpHeap::CM
     mNext = next;
 }
 
-/* 802D0830-802D0874 2CB170 0044+00 3/3 0/0 0/0 .text
- * allocFore__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc               */
 JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u8 alignment1,
                                                         u8 groupId2, u8 alignment2) {
     CMemBlock* block = NULL;
@@ -944,8 +891,6 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u
     return block;
 }
 
-/* 802D0874-802D08CC 2CB1B4 0058+00 1/1 0/0 0/0 .text
- * allocBack__Q210JKRExpHeap9CMemBlockFUlUcUcUcUc               */
 JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 groupId1, u8 alignment1,
                                                         u8 groupId2, u8 alignment2) {
     CMemBlock* newblock = NULL;
@@ -964,15 +909,12 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 groupId1, u
     return newblock;
 }
 
-/* 802D08CC-802D091C 2CB20C 0050+00 2/2 0/0 0/0 .text free__Q210JKRExpHeap9CMemBlockFP10JKRExpHeap
- */
 int JKRExpHeap::CMemBlock::free(JKRExpHeap* heap) {
     heap->removeUsedBlock(this);
     heap->recycleFreeBlock(this);
     return 0;
 }
 
-/* 802D091C-802D0938 2CB25C 001C+00 3/3 0/0 0/0 .text getHeapBlock__Q210JKRExpHeap9CMemBlockFPv */
 JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::getHeapBlock(void* ptr) {
     if (ptr) {
         CMemBlock* block = (CMemBlock*)ptr - 1;
@@ -983,8 +925,6 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::getHeapBlock(void* ptr) {
     return NULL;
 }
 
-/* 802D0938-802D09E0 2CB278 00A8+00 1/0 0/0 0/0 .text
- * state_register__10JKRExpHeapCFPQ27JKRHeap6TStateUl           */
 void JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
     p->mId = param_1;
     if (param_1 <= 0xff) {
@@ -1008,8 +948,6 @@ void JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const {
     p->mCheckCode = checkCode;
 }
 
-/* 802D09E0-802D0A10 2CB320 0030+00 1/0 0/0 0/0 .text
- * state_compare__10JKRExpHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRExpHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const {
     bool result = true;
     if (r1.mCheckCode != r2.mCheckCode) {
@@ -1023,12 +961,10 @@ bool JKRExpHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState const&
     return result;
 }
 
-/* 802D0A10-802D0A1C 2CB350 000C+00 1/0 0/0 0/0 .text            getHeapType__10JKRExpHeapFv */
 u32 JKRExpHeap::getHeapType() {
     return 'EXPH';
 }
 
-/* 802D0A1C-802D0A24 2CB35C 0008+00 1/0 0/0 0/0 .text do_getCurrentGroupId__10JKRExpHeapFv */
 u8 JKRExpHeap::do_getCurrentGroupId() {
     return mCurrentGroupId;
 }
diff --git a/src/JSystem/JKernel/JKRFile.cpp b/src/JSystem/JKernel/JKRFile.cpp
index 590c9f049d..e9681a4885 100644
--- a/src/JSystem/JKernel/JKRFile.cpp
+++ b/src/JSystem/JKernel/JKRFile.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/JKernel/JKRFile.h"
 #include "dolphin/vi.h"
 
-/* 802D9518-802D9584 2D3E58 006C+00 0/0 2/2 0/0 .text            read__7JKRFileFPvll */
 s32 JKRFile::read(void* data, s32 size, s32 offset) {
     while (true) {
         s32 result = readData(data, size, offset);
diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp
index 2213eace42..05c8201f11 100644
--- a/src/JSystem/JKernel/JKRFileCache.cpp
+++ b/src/JSystem/JKernel/JKRFileCache.cpp
@@ -9,7 +9,6 @@
 #include "string.h"
 #include "global.h"
 
-/* 802D49B4-802D4AB4 2CF2F4 0100+00 0/0 2/2 0/0 .text mount__12JKRFileCacheFPCcP7JKRHeapPCc */
 JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) {
     if (!path || *path != '/') {
         return NULL;
@@ -37,7 +36,6 @@ JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* p
     return new (heap, 0) JKRFileCache(path, param_3);
 }
 
-/* 802D4AB4-802D4C70 2CF3F4 01BC+00 1/1 0/0 0/0 .text            __ct__12JKRFileCacheFPCcPCc */
 JKRFileCache::JKRFileCache(const char* path, const char* volume) {
     mParentHeap = JKRHeap::findFromRoot(this);
     mMountCount = 1;
@@ -82,7 +80,6 @@ JKRFileCache::JKRFileCache(const char* path, const char* volume) {
     mIsMounted = true;
 }
 
-/* 802D4C70-802D4D44 2CF5B0 00D4+00 1/0 0/0 0/0 .text            __dt__12JKRFileCacheFv */
 JKRFileCache::~JKRFileCache() {
     removeResourceAll();
     if (mRootPath)
@@ -95,8 +92,6 @@ JKRFileCache::~JKRFileCache() {
     getVolumeList().remove(&mFileLoaderLink);
 }
 
-/* 802D4D44-802D4DD8 2CF684 0094+00 1/0 0/0 0/0 .text            becomeCurrent__12JKRFileCacheFPCc
- */
 bool JKRFileCache::becomeCurrent(const char* path) {
     char* dvdPathName = getDvdPathName(path);
 
@@ -115,7 +110,6 @@ bool JKRFileCache::becomeCurrent(const char* path) {
     return result;
 }
 
-/* 802D4DD8-802D4EDC 2CF718 0104+00 1/0 0/0 0/0 .text            getResource__12JKRFileCacheFPCc */
 void* JKRFileCache::getResource(const char* path) {
     JUT_ASSERT(237, isMounted());
 
@@ -146,8 +140,6 @@ void* JKRFileCache::getResource(const char* path) {
     return buffer;
 }
 
-/* 802D4EDC-802D4F64 2CF81C 0088+00 1/0 0/0 0/0 .text            getResource__12JKRFileCacheFUlPCc
- */
 void* JKRFileCache::getResource(u32, const char* path) {
     JUT_ASSERT(303, isMounted());
 
@@ -163,7 +155,6 @@ void* JKRFileCache::getResource(u32, const char* path) {
     return getResource(filePath);
 }
 
-/* 802D4F64-802D503C 2CF8A4 00D8+00 1/0 0/0 0/0 .text readResource__12JKRFileCacheFPvUlPCc */
 u32 JKRFileCache::readResource(void* dst, u32 dstLength, const char* path) {
     JUT_ASSERT(412, isMounted());
 
@@ -197,7 +188,6 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, const char* path) {
     return resourceSize;
 }
 
-/* 802D503C-802D50D4 2CF97C 0098+00 1/0 0/0 0/0 .text readResource__12JKRFileCacheFPvUlUlPCc */
 u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path) {
     JUT_ASSERT(344, isMounted());
 
@@ -213,8 +203,6 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path)
     return readResource(dst, dstLength, filePath);
 }
 
-/* 802D50D4-802D5164 2CFA14 0090+00 1/0 0/0 0/0 .text            removeResourceAll__12JKRFileCacheFv
- */
 void JKRFileCache::removeResourceAll(void) {
     JUT_ASSERT(412, isMounted());
 
@@ -228,8 +216,6 @@ void JKRFileCache::removeResourceAll(void) {
     }
 }
 
-/* 802D5164-802D51F8 2CFAA4 0094+00 1/0 0/0 0/0 .text            removeResource__12JKRFileCacheFPv
- */
 bool JKRFileCache::removeResource(void* resource) {
     JUT_ASSERT(463, isMounted());
 
@@ -248,8 +234,6 @@ bool JKRFileCache::removeResource(void* resource) {
     return true;
 }
 
-/* 802D51F8-802D526C 2CFB38 0074+00 1/0 0/0 0/0 .text            detachResource__12JKRFileCacheFPv
- */
 bool JKRFileCache::detachResource(void* resource) {
     JUT_ASSERT(490, isMounted());
 
@@ -262,7 +246,6 @@ bool JKRFileCache::detachResource(void* resource) {
     return true;
 }
 
-/* 802D526C-802D52A0 2CFBAC 0034+00 1/0 0/0 0/0 .text            getResSize__12JKRFileCacheCFPCv */
 u32 JKRFileCache::getResSize(const void* resource) const {
     CCacheBlock* cacheBlock = findCacheBlock(resource);
     if (cacheBlock == NULL) {
@@ -272,7 +255,6 @@ u32 JKRFileCache::getResSize(const void* resource) const {
     }
 }
 
-/* 802D52A0-802D531C 2CFBE0 007C+00 1/0 0/0 0/0 .text            countFile__12JKRFileCacheCFPCc */
 u32 JKRFileCache::countFile(const char* path) const {
     DVDDir dir;
     DVDDirEntry dirEntry;
@@ -292,8 +274,6 @@ u32 JKRFileCache::countFile(const char* path) const {
     return count;
 }
 
-/* 802D531C-802D53B8 2CFC5C 009C+00 1/0 0/0 0/0 .text            getFirstFile__12JKRFileCacheCFPCc
- */
 JKRFileFinder* JKRFileCache::getFirstFile(const char* path) const {
     char* name = getDvdPathName(path);
     JKRHeap* systemHeap = JKRHeap::getSystemHeap();
@@ -308,8 +288,6 @@ JKRFileFinder* JKRFileCache::getFirstFile(const char* path) const {
     return finder;
 }
 
-/* 802D53B8-802D53E4 2CFCF8 002C+00 3/3 0/0 0/0 .text            findCacheBlock__12JKRFileCacheCFPCv
- */
 JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(const void* resource) const {
     JSUListIterator<CCacheBlock> iterator;
     for (iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) {
@@ -321,8 +299,6 @@ JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(const void* resource) co
     return NULL;
 }
 
-/* 802D53E4-802D5410 2CFD24 002C+00 2/2 0/0 0/0 .text            findCacheBlock__12JKRFileCacheCFUl
- */
 JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(u32 fileID) const {
     JSUListIterator<CCacheBlock> iterator;
     for (iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) {
@@ -334,7 +310,6 @@ JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(u32 fileID) const {
     return NULL;
 }
 
-/* 802D5410-802D551C 2CFD50 010C+00 2/2 0/0 0/0 .text            findFile__12JKRFileCacheCFPcPCc */
 bool JKRFileCache::findFile(char* path, const char* fileName) const {
     DVDDir dir;
     DVDDirEntry dirEntry;
@@ -367,8 +342,6 @@ bool JKRFileCache::findFile(char* path, const char* fileName) const {
     return result;
 }
 
-/* 802D551C-802D5624 2CFE5C 0108+00 5/5 0/0 0/0 .text            getDvdPathName__12JKRFileCacheCFPCc
- */
 char* JKRFileCache::getDvdPathName(const char* path) const {
     char* newPath;
     if (path[0] == '/') {
@@ -393,15 +366,12 @@ char* JKRFileCache::getDvdPathName(const char* path) const {
     return newPath;
 }
 
-/* 802D5624-802D566C 2CFF64 0048+00 2/2 0/0 0/0 .text            convStrLower__12JKRFileCacheCFPc */
 void JKRFileCache::convStrLower(char* buffer) const {
     while (*buffer) {
         *buffer++ = tolower(*buffer);
     }
 }
 
-/* 802D566C-802D56C8 2CFFAC 005C+00 1/1 0/0 0/0 .text __ct__Q212JKRFileCache11CCacheBlockFUlUlPCv
- */
 JKRFileCache::CCacheBlock::CCacheBlock(u32 fileId, u32 fileSize, const void* resource)
     : mCacheBlockLink(this) {
     mReferenceCount = 1;
@@ -410,24 +380,18 @@ JKRFileCache::CCacheBlock::CCacheBlock(u32 fileId, u32 fileSize, const void* res
     mMemoryPtr = (void*)resource;  // todo: don't cast away const
 }
 
-/* 802D56C8-802D56F4 2D0008 002C+00 1/0 0/0 0/0 .text            getFsResource__12JKRFileCacheFPCc
- */
 void* JKRFileCache::getFsResource(const char* path) {
     return getResource(path);
 }
 
-/* 802D56F4-802D5720 2D0034 002C+00 1/0 0/0 0/0 .text getNameResource__12JKRFileCacheFUlPCc */
 void* JKRFileCache::getNameResource(u32 type, const char* path) {
     return getResource(type, path);
 }
 
-/* 802D5720-802D574C 2D0060 002C+00 1/0 0/0 0/0 .text readFsResource__12JKRFileCacheFPvUlPCc */
 u32 JKRFileCache::readFsResource(void* dst, u32 dstLength, const char* path) {
     return readResource(dst, dstLength, path);
 }
 
-/* 802D574C-802D5778 2D008C 002C+00 1/0 0/0 0/0 .text readNameResource__12JKRFileCacheFPvUlUlPCc
- */
 u32 JKRFileCache::readNameResource(void* dst, u32 dstLength, u32 type, const char* path) {
     return readResource(dst, dstLength, type, path);
 }
diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/src/JSystem/JKernel/JKRFileFinder.cpp
index 1e407537ab..fd2067aabb 100644
--- a/src/JSystem/JKernel/JKRFileFinder.cpp
+++ b/src/JSystem/JKernel/JKRFileFinder.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/JKernel/JKRFileFinder.h"
 #include "JSystem/JKernel/JKRArchive.h"
 
-/* 802D4638-802D46C4 2CEF78 008C+00 0/0 1/1 0/0 .text __ct__12JKRArcFinderFP10JKRArchivell */
 JKRArcFinder::JKRArcFinder(JKRArchive* archive, s32 startIndex, s32 numEntries) : JKRFileFinder() {
     mArchive = archive;
     mIsAvailable = numEntries > 0;
@@ -13,7 +12,6 @@ JKRArcFinder::JKRArcFinder(JKRArchive* archive, s32 startIndex, s32 numEntries)
     findNextFile();
 }
 
-/* 802D46C4-802D4770 2CF004 00AC+00 1/0 0/0 0/0 .text            findNextFile__12JKRArcFinderFv */
 bool JKRArcFinder::findNextFile(void) {
     JKRArchive::SDirEntry entry;
 
@@ -32,21 +30,18 @@ bool JKRArcFinder::findNextFile(void) {
     return mIsAvailable;
 }
 
-/* 802D4770-802D47F4 2CF0B0 0084+00 0/0 1/1 0/0 .text            __ct__12JKRDvdFinderFPCc */
 JKRDvdFinder::JKRDvdFinder(const char* directory) : JKRFileFinder() {
     mDvdIsOpen = DVDOpenDir(directory, &mDvdDirectory);
     mIsAvailable = mDvdIsOpen;
     findNextFile();
 }
 
-/* 802D47F4-802D4874 2CF134 0080+00 1/0 0/0 0/0 .text            __dt__12JKRDvdFinderFv */
 JKRDvdFinder::~JKRDvdFinder() {
     if (mDvdIsOpen) {
         DVDCloseDir(&mDvdDirectory);
     }
 }
 
-/* 802D4874-802D4910 2CF1B4 009C+00 1/0 0/0 0/0 .text            findNextFile__12JKRDvdFinderFv */
 bool JKRDvdFinder::findNextFile(void) {
     if (mIsAvailable) {
         DVDDirEntry directoryEntry;
diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp
index 2d5a399808..8a96cafceb 100644
--- a/src/JSystem/JKernel/JKRFileLoader.cpp
+++ b/src/JSystem/JKernel/JKRFileLoader.cpp
@@ -5,24 +5,18 @@
 #include "ctype.h"
 #include "global.h"
 
-/* ############################################################################################## */
-/* 80451418-80451420 000918 0004+04 2/2 3/3 0/0 .sbss            sCurrentVolume__13JKRFileLoader */
 JKRFileLoader* JKRFileLoader::sCurrentVolume;
-/* 80434354-80434360 061074 000C+00 5/5 14/14 0/0 .bss             sVolumeList__13JKRFileLoader */
 JSUList<JKRFileLoader> JKRFileLoader::sVolumeList;
 
-/* 802D40F0-802D4148 2CEA30 0058+00 0/0 2/2 0/0 .text            __ct__13JKRFileLoaderFv */
 JKRFileLoader::JKRFileLoader(void)
     : mFileLoaderLink(this), mVolumeName(NULL), mVolumeType(0), mMountCount(0) {}
 
-/* 802D4148-802D41D4 2CEA88 008C+00 1/0 2/2 0/0 .text            __dt__13JKRFileLoaderFv */
 JKRFileLoader::~JKRFileLoader() {
     if (getCurrentVolume() == this) {
         setCurrentVolume(NULL);
     }
 }
 
-/* 802D41D4-802D4224 2CEB14 0050+00 1/0 6/0 0/0 .text            unmount__13JKRFileLoaderFv */
 void JKRFileLoader::unmount(void) {
     s32 count = mMountCount;
     if (mMountCount != 0) {
@@ -34,8 +28,6 @@ void JKRFileLoader::unmount(void) {
     }
 }
 
-/* 802D4224-802D4270 2CEB64 004C+00 0/0 2/2 0/0 .text            getGlbResource__13JKRFileLoaderFPCc
- */
 void* JKRFileLoader::getGlbResource(const char* name) {
     const char* name_reference[1];
     name_reference[0] = name;
@@ -51,8 +43,6 @@ void* JKRFileLoader::getGlbResource(const char* name) {
     return resource;
 }
 
-/* 802D4270-802D4308 2CEBB0 0098+00 0/0 29/29 1/1 .text
- * getGlbResource__13JKRFileLoaderFPCcP13JKRFileLoader          */
 void* JKRFileLoader::getGlbResource(const char* name, JKRFileLoader* fileLoader) {
     void* resource = NULL;
     if (fileLoader) {
@@ -69,8 +59,6 @@ void* JKRFileLoader::getGlbResource(const char* name, JKRFileLoader* fileLoader)
     return resource;
 }
 
-/* 802D4308-802D43A0 2CEC48 0098+00 0/0 1/1 0/0 .text
- * removeResource__13JKRFileLoaderFPvP13JKRFileLoader           */
 bool JKRFileLoader::removeResource(void* resource, JKRFileLoader* fileLoader) {
     if (fileLoader) {
         return fileLoader->removeResource(resource);
@@ -87,8 +75,6 @@ bool JKRFileLoader::removeResource(void* resource, JKRFileLoader* fileLoader) {
     return false;
 }
 
-/* 802D43A0-802D4438 2CECE0 0098+00 0/0 2/2 0/0 .text
- * detachResource__13JKRFileLoaderFPvP13JKRFileLoader           */
 bool JKRFileLoader::detachResource(void* resource, JKRFileLoader* fileLoader) {
     if (fileLoader) {
         return fileLoader->detachResource(resource);
@@ -105,7 +91,6 @@ bool JKRFileLoader::detachResource(void* resource, JKRFileLoader* fileLoader) {
     return false;
 }
 
-/* 802D4438-802D44C4 2CED78 008C+00 1/1 0/0 0/0 .text            findVolume__13JKRFileLoaderFPPCc */
 JKRFileLoader* JKRFileLoader::findVolume(const char** volumeName) {
     if (*volumeName[0] != '/') {
         return getCurrentVolume();
@@ -125,12 +110,9 @@ JKRFileLoader* JKRFileLoader::findVolume(const char** volumeName) {
     return NULL;
 }
 
-/* ############################################################################################## */
 
-/* 804508C0-804508C8 000340 0002+06 1/1 0/0 0/0 .sdata           rootPath$2498 */
 static char rootPath[2] = "/";
 
-/* 802D44C4-802D45A0 2CEE04 00DC+00 1/1 0/0 0/0 .text fetchVolumeName__13JKRFileLoaderFPclPCc */
 const char* JKRFileLoader::fetchVolumeName(char* buffer, s32 bufferSize, const char* path) {
     if (strcmp(path, "/") == 0) {
         strcpy(buffer, rootPath);
diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp
index e50388817a..0f9404edc0 100644
--- a/src/JSystem/JKernel/JKRHeap.cpp
+++ b/src/JSystem/JKernel/JKRHeap.cpp
@@ -18,26 +18,20 @@ u8 data_804508B2;
 u8 data_804508B3;
 #endif
 
-/* 80451370-80451374 000870 0004+00 3/3 44/44 0/0 .sbss            sSystemHeap__7JKRHeap */
 JKRHeap* JKRHeap::sSystemHeap;
 
-/* 80451374-80451378 000874 0004+00 4/4 23/22 0/0 .sbss            sCurrentHeap__7JKRHeap */
 JKRHeap* JKRHeap::sCurrentHeap;
 
-/* 80451378-8045137C 000878 0004+00 3/3 10/10 0/0 .sbss            sRootHeap__7JKRHeap */
 JKRHeap* JKRHeap::sRootHeap;
 
 #if PLATFORM_WII || PLATFORM_SHIELD
 JKRHeap* JKRHeap::sRootHeap2;
 #endif
 
-/* 8045137C-80451380 00087C 0004+00 2/2 3/3 0/0 .sbss            mErrorHandler__7JKRHeap */
 JKRErrorHandler JKRHeap::mErrorHandler;
 
-/* 80451380-80451384 000880 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool data_80451380;
 
-/* 802CE138-802CE264 2C8A78 012C+00 0/0 3/3 0/0 .text            __ct__7JKRHeapFPvUlP7JKRHeapb */
 JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     : JKRDisposer(), mChildTree(this), mDisposerList() {
     OSInitMutex(&mMutex);
@@ -70,7 +64,6 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag)
     mInitFlag = false;
 }
 
-/* 802CE264-802CE378 2C8BA4 0114+00 1/0 3/3 0/0 .text            __dt__7JKRHeapFv */
 JKRHeap::~JKRHeap() {
     mChildTree.getParent()->removeChild(&mChildTree);
     JSUTree<JKRHeap>* nextRootHeap = sRootHeap->mChildTree.getFirstChild();
@@ -84,23 +77,16 @@ JKRHeap::~JKRHeap() {
     }
 }
 
-/* ############################################################################################## */
-/* 80451384-80451388 000884 0004+00 1/1 1/1 0/0 .sbss            mCodeStart__7JKRHeap */
 void* JKRHeap::mCodeStart;
 
-/* 80451388-8045138C 000888 0004+00 1/1 1/1 0/0 .sbss            mCodeEnd__7JKRHeap */
 void* JKRHeap::mCodeEnd;
 
-/* 8045138C-80451390 00088C 0004+00 1/1 1/1 0/0 .sbss            mUserRamStart__7JKRHeap */
 void* JKRHeap::mUserRamStart;
 
-/* 80451390-80451394 000890 0004+00 1/1 1/1 0/0 .sbss            mUserRamEnd__7JKRHeap */
 void* JKRHeap::mUserRamEnd;
 
-/* 80451394-80451398 000894 0004+00 1/1 2/2 0/0 .sbss            mMemorySize__7JKRHeap */
 u32 JKRHeap::mMemorySize;
 
-/* 802CE378-802CE428 2C8CB8 00B0+00 0/0 1/1 0/0 .text            initArena__7JKRHeapFPPcPUli */
 bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
     void* ram_start;
     void* ram_end;
@@ -131,26 +117,22 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) {
     return true;
 }
 
-/* 802CE428-802CE438 2C8D68 0010+00 1/1 0/0 0/0 .text            becomeSystemHeap__7JKRHeapFv */
 JKRHeap* JKRHeap::becomeSystemHeap() {
     JKRHeap* prev = sSystemHeap;
     sSystemHeap = this;
     return prev;
 }
 
-/* 802CE438-802CE448 2C8D78 0010+00 1/1 22/22 1/1 .text            becomeCurrentHeap__7JKRHeapFv */
 JKRHeap* JKRHeap::becomeCurrentHeap() {
     JKRHeap* prev = sCurrentHeap;
     sCurrentHeap = this;
     return prev;
 }
 
-/* 802CE448-802CE474 2C8D88 002C+00 0/0 5/5 1/1 .text            destroy__7JKRHeapFv */
 void JKRHeap::destroy() {
     do_destroy();
 }
 
-/* 802CE474-802CE4D4 2C8DB4 0060+00 6/6 23/23 0/0 .text            alloc__7JKRHeapFUliP7JKRHeap */
 void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
     if (heap != NULL) {
         return heap->alloc(size, alignment);
@@ -163,7 +145,6 @@ void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) {
     return NULL;
 }
 
-/* 802CE4D4-802CE500 2C8E14 002C+00 1/1 30/30 1/1 .text            alloc__7JKRHeapFUli */
 void* JKRHeap::alloc(u32 size, int alignment) {
     if (mInitFlag) {
         JUT_WARN(393, "alloc %x byte in heap %x", size, this);
@@ -171,7 +152,6 @@ void* JKRHeap::alloc(u32 size, int alignment) {
     return do_alloc(size, alignment);
 }
 
-/* 802CE500-802CE548 2C8E40 0048+00 2/2 38/38 1/1 .text            free__7JKRHeapFPvP7JKRHeap */
 void JKRHeap::free(void* ptr, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
@@ -182,7 +162,6 @@ void JKRHeap::free(void* ptr, JKRHeap* heap) {
     heap->free(ptr);
 }
 
-/* 802CE548-802CE574 2C8E88 002C+00 1/1 29/29 0/0 .text            free__7JKRHeapFPv */
 void JKRHeap::free(void* ptr) {
     if (mInitFlag) {
         JUT_WARN(441, "free %x in heap %x", ptr, this);
@@ -190,7 +169,6 @@ void JKRHeap::free(void* ptr) {
     do_free(ptr);
 }
 
-/* 802CE574-802CE5CC 2C8EB4 0058+00 1/0 5/2 0/0 .text            callAllDisposer__7JKRHeapFv */
 void JKRHeap::callAllDisposer() {
     JSUListIterator<JKRDisposer> iterator;
 
@@ -199,7 +177,6 @@ void JKRHeap::callAllDisposer() {
     }
 }
 
-/* 802CE5CC-802CE5F8 2C8F0C 002C+00 0/0 12/12 0/0 .text            freeAll__7JKRHeapFv */
 void JKRHeap::freeAll() {
     if (mInitFlag) {
         JUT_WARN(493, "freeAll in heap %x", this);
@@ -207,7 +184,6 @@ void JKRHeap::freeAll() {
     do_freeAll();
 }
 
-/* 802CE5F8-802CE624 2C8F38 002C+00 0/0 1/1 0/0 .text            freeTail__7JKRHeapFv */
 void JKRHeap::freeTail() {
     if (mInitFlag) {
         JUT_WARN(507, "freeTail in heap %x", this);
@@ -215,7 +191,6 @@ void JKRHeap::freeTail() {
     do_freeTail();
 }
 
-/* 802CE624-802CE684 2C8F64 0060+00 0/0 1/1 0/0 .text            resize__7JKRHeapFPvUlP7JKRHeap */
 s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
@@ -226,7 +201,6 @@ s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) {
     return heap->resize(ptr, size);
 }
 
-/* 802CE684-802CE6B0 2C8FC4 002C+00 1/1 1/1 0/0 .text            resize__7JKRHeapFPvUl */
 s32 JKRHeap::resize(void* ptr, u32 size) {
     if (mInitFlag) {
         JUT_WARN(567, "resize block %x into %x in heap %x", ptr, size, this);
@@ -234,7 +208,6 @@ s32 JKRHeap::resize(void* ptr, u32 size) {
     return do_resize(ptr, size);
 }
 
-/* 802CE6B0-802CE700 2C8FF0 0050+00 0/0 4/4 0/0 .text            getSize__7JKRHeapFPvP7JKRHeap */
 s32 JKRHeap::getSize(void* ptr, JKRHeap* heap) {
     if (!heap) {
         heap = findFromRoot(ptr);
@@ -245,27 +218,22 @@ s32 JKRHeap::getSize(void* ptr, JKRHeap* heap) {
     return heap->getSize(ptr);
 }
 
-/* 802CE700-802CE72C 2C9040 002C+00 1/1 1/1 0/0 .text            getSize__7JKRHeapFPv */
 s32 JKRHeap::getSize(void* ptr) {
     return do_getSize(ptr);
 }
 
-/* 802CE72C-802CE758 2C906C 002C+00 1/1 18/18 0/0 .text            getFreeSize__7JKRHeapFv */
 s32 JKRHeap::getFreeSize() {
     return do_getFreeSize();
 }
 
-/* 802CE758-802CE784 2C9098 002C+00 1/1 0/0 0/0 .text            getMaxFreeBlock__7JKRHeapFv */
 void* JKRHeap::getMaxFreeBlock() {
     return do_getMaxFreeBlock();
 }
 
-/* 802CE784-802CE7B0 2C90C4 002C+00 0/0 32/32 0/0 .text            getTotalFreeSize__7JKRHeapFv */
 s32 JKRHeap::getTotalFreeSize() {
     return do_getTotalFreeSize();
 }
 
-/* 802CE7B0-802CE7DC 2C90F0 002C+00 0/0 1/1 0/0 .text            changeGroupID__7JKRHeapFUc */
 s32 JKRHeap::changeGroupID(u8 groupID) {
     if (mInitFlag) {
         JUT_WARN(646, "change heap ID into %x in heap %x", groupID, this);
@@ -273,15 +241,12 @@ s32 JKRHeap::changeGroupID(u8 groupID) {
     return do_changeGroupID(groupID);
 }
 
-/* 802CE7DC-802CE83C 2C911C 0060+00 0/0 2/2 0/0 .text            getMaxAllocatableSize__7JKRHeapFi
- */
 u32 JKRHeap::getMaxAllocatableSize(int alignment) {
     u32 maxFreeBlock = (uintptr_t)getMaxFreeBlock();
     u32 ptrOffset = (alignment - 1) & alignment - (maxFreeBlock & 0xf);
     return ~(alignment - 1) & (getFreeSize() - ptrOffset);
 }
 
-/* 802CE83C-802CE894 2C917C 0058+00 3/3 8/8 0/0 .text            findFromRoot__7JKRHeapFPv */
 JKRHeap* JKRHeap::findFromRoot(void* ptr) {
     if (sRootHeap == NULL) {
         return NULL;
@@ -294,7 +259,6 @@ JKRHeap* JKRHeap::findFromRoot(void* ptr) {
     return sRootHeap->findAllHeap(ptr);
 }
 
-/* 802CE894-802CE93C 2C91D4 00A8+00 1/1 1/1 0/0 .text            find__7JKRHeapCFPv */
 JKRHeap* JKRHeap::find(void* memory) const {
     if (mStart <= memory && memory < mEnd) {
         if (mChildTree.getNumChildren() != 0) {
@@ -314,7 +278,6 @@ JKRHeap* JKRHeap::find(void* memory) const {
     return NULL;
 }
 
-/* 802CE93C-802CE9E4 2C927C 00A8+00 1/1 0/0 0/0 .text            findAllHeap__7JKRHeapCFPv */
 JKRHeap* JKRHeap::findAllHeap(void* ptr) const {
     if (mChildTree.getNumChildren() != 0) {
         for (JSUTreeIterator<JKRHeap> iterator(mChildTree.getFirstChild());
@@ -335,8 +298,6 @@ JKRHeap* JKRHeap::findAllHeap(void* ptr) const {
     return NULL;
 }
 
-/* 802CE9E4-802CEA78 2C9324 0094+00 2/2 0/0 0/0 .text            dispose_subroutine__7JKRHeapFUlUl
- */
 void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
     JSUListIterator<JKRDisposer> last_iterator;
     JSUListIterator<JKRDisposer> next_iterator;
@@ -364,18 +325,15 @@ void JKRHeap::dispose_subroutine(u32 begin, u32 end) {
     }
 }
 
-/* 802CEA78-802CEAA0 2C93B8 0028+00 0/0 1/1 0/0 .text            dispose__7JKRHeapFPvUl */
 bool JKRHeap::dispose(void* ptr, u32 size) {
     dispose_subroutine((uintptr_t)ptr, (uintptr_t)ptr + size);
     return false;
 }
 
-/* 802CEAA0-802CEAC0 2C93E0 0020+00 0/0 1/1 0/0 .text            dispose__7JKRHeapFPvPv */
 void JKRHeap::dispose(void* begin, void* end) {
     dispose_subroutine((uintptr_t)begin, (uintptr_t)end);
 }
 
-/* 802CEAC0-802CEB18 2C9400 0058+00 0/0 3/3 0/0 .text            dispose__7JKRHeapFv */
 void JKRHeap::dispose() {
     JSUListIterator<JKRDisposer> iterator;
     while ((iterator = mDisposerList.getFirst()) != mDisposerList.getEnd()) {
@@ -383,7 +341,6 @@ void JKRHeap::dispose() {
     }
 }
 
-/* 802CEB18-802CEB40 2C9458 0028+00 0/0 4/4 0/0 .text            copyMemory__7JKRHeapFPvPvUl */
 void JKRHeap::copyMemory(void* dst, void* src, u32 size) {
     u32 count = (size + 3) / 4;
 
@@ -397,7 +354,6 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) {
     }
 }
 
-/* 802CEB40-802CEB78 2C9480 0038+00 2/2 0/0 0/0 .text JKRDefaultMemoryErrorRoutine__FPvUli */
 void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) {
 #ifdef DEBUG
     OSReport("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size,
@@ -406,15 +362,12 @@ void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) {
     JUTException::panic(__FILE__, 831, "abort\n");
 }
 
-/* 802CEB78-802CEB88 2C94B8 0010+00 0/0 2/2 0/0 .text            setErrorFlag__7JKRHeapFb */
 bool JKRHeap::setErrorFlag(bool errorFlag) {
     bool prev = mErrorFlag;
     mErrorFlag = errorFlag;
     return prev;
 }
 
-/* 802CEB88-802CEBA8 2C94C8 0020+00 0/0 1/1 0/0 .text            setErrorHandler__7JKRHeapFPFPvUli_v
- */
 JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler errorHandler) {
     JKRErrorHandler prev = mErrorHandler;
 
@@ -426,7 +379,6 @@ JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler errorHandler) {
     return prev;
 }
 
-/* 802CEBA8-802CEC4C 2C94E8 00A4+00 0/0 1/1 0/0 .text            isSubHeap__7JKRHeapCFP7JKRHeap */
 bool JKRHeap::isSubHeap(JKRHeap* heap) const {
     if (!heap)
         return false;
@@ -449,73 +401,58 @@ bool JKRHeap::isSubHeap(JKRHeap* heap) const {
     return false;
 }
 
-/* 802CEC4C-802CEC74 2C958C 0028+00 0/0 278/278 377/377 .text            __nw__FUl */
 void* operator new(size_t size) {
     return JKRHeap::alloc(size, 4, NULL);
 }
 
-/* 802CEC74-802CEC98 2C95B4 0024+00 0/0 15/15 0/0 .text            __nw__FUli */
 void* operator new(size_t size, int alignment) {
     return JKRHeap::alloc(size, alignment, NULL);
 }
 
-/* 802CEC98-802CECC4 2C95D8 002C+00 0/0 47/47 0/0 .text            __nw__FUlP7JKRHeapi */
 void* operator new(size_t size, JKRHeap* heap, int alignment) {
     return JKRHeap::alloc(size, alignment, heap);
 }
 
-/* 802CECC4-802CECEC 2C9604 0028+00 0/0 52/52 15/15 .text            __nwa__FUl */
 void* operator new[](size_t size) {
     return JKRHeap::alloc(size, 4, NULL);
 }
 
-/* 802CECEC-802CED10 2C962C 0024+00 0/0 29/29 0/0 .text            __nwa__FUli */
 void* operator new[](size_t size, int alignment) {
     return JKRHeap::alloc(size, alignment, NULL);
 }
 
-/* 802CED10-802CED3C 2C9650 002C+00 0/0 25/25 0/0 .text            __nwa__FUlP7JKRHeapi */
 void* operator new[](size_t size, JKRHeap* heap, int alignment) {
     return JKRHeap::alloc(size, alignment, heap);
 }
 
-/* 802CED3C-802CED60 2C967C 0024+00 1/1 847/847 4665/4665 .text            __dl__FPv */
 void operator delete(void* ptr) {
     JKRHeap::free(ptr, NULL);
 }
 
-/* 802CED60-802CED84 2C96A0 0024+00 0/0 20/20 3/3 .text            __dla__FPv */
 void operator delete[](void* ptr) {
     JKRHeap::free(ptr, NULL);
 }
 
-/* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text
- * state_register__7JKRHeapCFPQ27JKRHeap6TStateUl               */
 void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
     JUT_ASSERT(1213, p != NULL);
     JUT_ASSERT(1214, p->getHeap() == this);
 }
 
-/* 802CED88-802CEDA0 2C96C8 0018+00 1/0 1/0 0/0 .text
- * state_compare__7JKRHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRHeap::state_compare(const JKRHeap::TState& r1, const JKRHeap::TState& r2) const {
     JUT_ASSERT(1222, r1.getHeap() == r2.getHeap());
     return r1.getCheckCode() == r2.getCheckCode();
 }
 
-/* 802CEDA0-802CEDA4 2C96E0 0004+00 1/0 3/0 0/0 .text state_dump__7JKRHeapCFRCQ27JKRHeap6TState */
 void JKRHeap::state_dump(const JKRHeap::TState& p) const {
     JUT_LOG(1246, "check-code : 0x%08x", p.getCheckCode());
     JUT_LOG(1247, "id         : 0x%08x", p.getId());
     JUT_LOG(1248, "used size  : %u", p.getUsedSize());
 }
 
-/* 802CEDA4-802CEDAC 2C96E4 0008+00 1/0 1/0 0/0 .text            do_changeGroupID__7JKRHeapFUc */
 s32 JKRHeap::do_changeGroupID(u8 param_0) {
     return 0;
 }
 
-/* 802CEDAC-802CEDB4 2C96EC 0008+00 1/0 1/0 0/0 .text            do_getCurrentGroupId__7JKRHeapFv */
 u8 JKRHeap::do_getCurrentGroupId() {
     return 0;
 }
diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp
index d773e5f05a..1fa9fd4ffc 100644
--- a/src/JSystem/JKernel/JKRMemArchive.cpp
+++ b/src/JSystem/JKernel/JKRMemArchive.cpp
@@ -9,8 +9,6 @@
 #include "global.h"
 #include <stdint.h>
 
-/* 802D69B8-802D6A6C 2D12F8 00B4+00 0/0 2/2 0/0 .text
- * __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection       */
 JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection)
     : JKRArchive(entryNum, MOUNT_MEM) {
     mIsMounted = false;
@@ -26,8 +24,6 @@ JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDire
     mIsMounted = true;
 }
 
-/* 802D6A6C-802D6B24 2D13AC 00B8+00 0/0 2/2 0/0 .text __ct__13JKRMemArchiveFPvUl15JKRMemBreakFlag
- */
 JKRMemArchive::JKRMemArchive(void* buffer, u32 bufferSize, JKRMemBreakFlag param_3)
     : JKRArchive((s32)buffer, MOUNT_MEM) {
     mIsMounted = false;
@@ -42,7 +38,6 @@ JKRMemArchive::JKRMemArchive(void* buffer, u32 bufferSize, JKRMemBreakFlag param
     mIsMounted = true;
 }
 
-/* 802D6B24-802D6BCC 2D1464 00A8+00 1/0 0/0 0/0 .text            __dt__13JKRMemArchiveFv */
 JKRMemArchive::~JKRMemArchive() {
     if (mIsMounted == true) {
         if (mIsOpen) {
@@ -55,8 +50,6 @@ JKRMemArchive::~JKRMemArchive() {
     }
 }
 
-/* 802D6BCC-802D6D30 2D150C 0164+00 1/1 0/0 0/0 .text
- * open__13JKRMemArchiveFlQ210JKRArchive15EMountDirection       */
 bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirection) {
     mArcHeader = NULL;
     mArcInfoBlock = NULL;
@@ -110,8 +103,6 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio
     return (mMountMode == UNKNOWN_MOUNT_MODE) ? false : true;
 }
 
-/* 802D6D30-802D6DDC 2D1670 00AC+00 1/1 0/0 0/0 .text open__13JKRMemArchiveFPvUl15JKRMemBreakFlag
- */
 bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) {
     mArcHeader = (SArcHeader *)buffer;
     JUT_ASSERT(491, mArcHeader->signature =='RARC');
@@ -126,8 +117,6 @@ bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) {
     return true;
 }
 
-/* 802D6DDC-802D6E10 2D171C 0034+00 1/0 0/0 0/0 .text
- * fetchResource__13JKRMemArchiveFPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRMemArchive::fetchResource(SDIFileEntry* fileEntry, u32* resourceSize) {
     JUT_ASSERT(555, isMounted());
     if (!fileEntry->data) {
@@ -141,8 +130,6 @@ void* JKRMemArchive::fetchResource(SDIFileEntry* fileEntry, u32* resourceSize) {
     return fileEntry->data;
 }
 
-/* 802D6E10-802D6ED0 2D1750 00C0+00 1/0 0/0 0/0 .text
- * fetchResource__13JKRMemArchiveFPvUlPQ210JKRArchive12SDIFileEntryPUl */
 void* JKRMemArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* fileEntry,
                                    u32* resourceSize) {
     JUT_ASSERT(595, isMounted());
@@ -167,7 +154,6 @@ void* JKRMemArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* f
     return buffer;
 }
 
-/* 802D6ED0-802D6F20 2D1810 0050+00 1/0 0/0 0/0 .text removeResourceAll__13JKRMemArchiveFv */
 void JKRMemArchive::removeResourceAll(void) {
     JUT_ASSERT(642, isMounted());
 
@@ -186,8 +172,6 @@ void JKRMemArchive::removeResourceAll(void) {
     }
 }
 
-/* 802D6F20-802D6F5C 2D1860 003C+00 1/0 0/0 0/0 .text            removeResource__13JKRMemArchiveFPv
- */
 bool JKRMemArchive::removeResource(void* resource) {
     JUT_ASSERT(673, isMounted());
 
@@ -199,8 +183,6 @@ bool JKRMemArchive::removeResource(void* resource) {
     return true;
 }
 
-/* 802D6F5C-802D7030 2D189C 00D4+00 1/1 1/1 0/0 .text
- * fetchResource_subroutine__13JKRMemArchiveFPUcUlPUcUli        */
 u32 JKRMemArchive::fetchResource_subroutine(u8* src, u32 srcLength, u8* dst, u32 dstLength,
                                             JKRCompression compression) {
     switch (compression) {
@@ -231,7 +213,6 @@ u32 JKRMemArchive::fetchResource_subroutine(u8* src, u32 srcLength, u8* dst, u32
     return 0;
 }
 
-/* 802D7030-802D70C0 2D1970 0090+00 1/0 0/0 0/0 .text getExpandedResSize__13JKRMemArchiveCFPCv */
 u32 JKRMemArchive::getExpandedResSize(const void* resource) const {
     SDIFileEntry* fileEntry = findPtrResource(resource);
     if (fileEntry == NULL)
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index c30ff8c2ac..c2e159a8d7 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -6,8 +6,6 @@
 #include "global.h"
 #include <stdint.h>
 
-/* 802D0A24-802D0AD0 2CB364 00AC+00 0/0 4/4 1/1 .text            create__12JKRSolidHeapFUlP7JKRHeapb
- */
 JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) {
     if (!heap) {
         heap = getRootHeap();
@@ -32,7 +30,6 @@ JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler
     return solidHeap;
 }
 
-/* 802D0AD0-802D0B30 2CB410 0060+00 1/0 0/0 0/0 .text            do_destroy__12JKRSolidHeapFv */
 void JKRSolidHeap::do_destroy(void) {
     JKRHeap* parent = getParent();
     if (parent) {
@@ -41,8 +38,6 @@ void JKRSolidHeap::do_destroy(void) {
     }
 }
 
-/* 802D0B30-802D0B8C 2CB470 005C+00 1/1 0/0 0/0 .text            __ct__12JKRSolidHeapFPvUlP7JKRHeapb
- */
 JKRSolidHeap::JKRSolidHeap(void* start, u32 size, JKRHeap* parent, bool useErrorHandler)
     : JKRHeap(start, size, parent, useErrorHandler) {
     mFreeSize = mSize;
@@ -51,12 +46,10 @@ JKRSolidHeap::JKRSolidHeap(void* start, u32 size, JKRHeap* parent, bool useError
     field_0x78 = NULL;
 }
 
-/* 802D0B8C-802D0BF4 2CB4CC 0068+00 1/0 0/0 0/0 .text            __dt__12JKRSolidHeapFv */
 JKRSolidHeap::~JKRSolidHeap(void) {
     dispose();
 }
 
-/* 802D0BF4-802D0CB0 2CB534 00BC+00 0/0 5/5 1/1 .text            adjustSize__12JKRSolidHeapFv */
 s32 JKRSolidHeap::adjustSize(void) {
     JKRHeap* parent = getParent();
     if (parent) {
@@ -79,7 +72,6 @@ s32 JKRSolidHeap::adjustSize(void) {
     return -1;
 }
 
-/* 802D0CB0-802D0D58 2CB5F0 00A8+00 1/0 0/0 0/0 .text            do_alloc__12JKRSolidHeapFUli */
 void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
 #ifdef DEBUG
     // TODO(Julgodis): JUTAssertion::setConfirmMessage
@@ -113,8 +105,6 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) {
     return ptr;
 }
 
-/* 802D0D58-802D0E20 2CB698 00C8+00 1/1 0/0 0/0 .text            allocFromHead__12JKRSolidHeapFUli
- */
 void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 0x4);
     void* ptr = NULL;
@@ -135,8 +125,6 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) {
     return ptr;
 }
 
-/* 802D0E20-802D0EE4 2CB760 00C4+00 1/1 0/0 0/0 .text            allocFromTail__12JKRSolidHeapFUli
- */
 void* JKRSolidHeap::allocFromTail(u32 size, int alignment) {
     size = ALIGN_NEXT(size, 4);
     void* ptr = NULL;
@@ -155,12 +143,10 @@ void* JKRSolidHeap::allocFromTail(u32 size, int alignment) {
     return ptr;
 }
 
-/* 802D0EE4-802D0F14 2CB824 0030+00 1/0 0/0 0/0 .text            do_free__12JKRSolidHeapFPv */
 void JKRSolidHeap::do_free(void* ptr) {
     JUTWarningConsole_f("free: cannot free memory block (%08x)\n", ptr);
 }
 
-/* 802D0F14-802D0F74 2CB854 0060+00 1/0 0/0 0/0 .text            do_freeAll__12JKRSolidHeapFv */
 void JKRSolidHeap::do_freeAll(void) {
     lock();
 
@@ -173,7 +159,6 @@ void JKRSolidHeap::do_freeAll(void) {
     unlock();
 }
 
-/* 802D0F74-802D1000 2CB8B4 008C+00 1/0 0/0 0/0 .text            do_freeTail__12JKRSolidHeapFv */
 void JKRSolidHeap::do_freeTail(void) {
     lock();
 
@@ -193,27 +178,22 @@ void JKRSolidHeap::do_freeTail(void) {
     unlock();
 }
 
-/* 802D1000-802D1004 2CB940 0004+00 1/0 0/0 0/0 .text            do_fillFreeArea__12JKRSolidHeapFv
- */
 void JKRSolidHeap::do_fillFreeArea() {
 #ifdef DEBUG
     // fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba);
 #endif
 }
 
-/* 802D1004-802D1038 2CB944 0034+00 1/0 0/0 0/0 .text            do_resize__12JKRSolidHeapFPvUl */
 s32 JKRSolidHeap::do_resize(void* ptr, u32 newSize) {
     JUTWarningConsole_f("resize: cannot resize memory block (%08x: %d)\n", ptr, newSize);
     return -1;
 }
 
-/* 802D1038-802D106C 2CB978 0034+00 1/0 0/0 0/0 .text            do_getSize__12JKRSolidHeapFPv */
 s32 JKRSolidHeap::do_getSize(void* ptr) {
     JUTWarningConsole_f("getSize: cannot get memory block size (%08x)\n", ptr);
     return -1;
 }
 
-/* 802D106C-802D10FC 2CB9AC 0090+00 1/0 0/0 0/0 .text            check__12JKRSolidHeapFv */
 bool JKRSolidHeap::check(void) {
     lock();
 
@@ -231,7 +211,6 @@ bool JKRSolidHeap::check(void) {
     return result;
 }
 
-/* 802D10FC-802D11FC 2CBA3C 0100+00 1/0 0/0 0/0 .text            dump__12JKRSolidHeapFv */
 bool JKRSolidHeap::dump(void) {
     bool result = check();
 
@@ -249,8 +228,6 @@ bool JKRSolidHeap::dump(void) {
 
     return result;
 }
-/* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text
- * state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl         */
 void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
     JUT_ASSERT(604, p != NULL);
     JUT_ASSERT(605, p->getHeap() == this);
@@ -263,8 +240,6 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
     setState_u32CheckCode_(p, r29);
 }
 
-/* 802D1258-802D1288 2CBB98 0030+00 1/0 0/0 0/0 .text
- * state_compare__12JKRSolidHeapCFRCQ27JKRHeap6TStateRCQ27JKRHeap6TState */
 bool JKRSolidHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const {
     JUT_ASSERT(632, r1.getHeap() == r2.getHeap());
 
@@ -280,22 +255,18 @@ bool JKRSolidHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState cons
     return result;
 }
 
-/* 802D1288-802D1294 2CBBC8 000C+00 1/0 0/0 0/0 .text            getHeapType__12JKRSolidHeapFv */
 u32 JKRSolidHeap::getHeapType(void) {
     return 'SLID';
 }
 
-/* 802D1294-802D129C 2CBBD4 0008+00 1/0 0/0 0/0 .text            do_getFreeSize__12JKRSolidHeapFv */
 s32 JKRSolidHeap::do_getFreeSize(void) {
     return mFreeSize;
 }
 
-/* 802D129C-802D12A4 2CBBDC 0008+00 1/0 0/0 0/0 .text do_getMaxFreeBlock__12JKRSolidHeapFv */
 void* JKRSolidHeap::do_getMaxFreeBlock(void) {
     return mSolidHead;
 }
 
-/* 802D12A4-802D12C4 2CBBE4 0020+00 1/0 0/0 0/0 .text do_getTotalFreeSize__12JKRSolidHeapFv */
 s32 JKRSolidHeap::do_getTotalFreeSize(void) {
     return getFreeSize();
 }
diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp
index 0050ba609a..2fe3104dcb 100644
--- a/src/JSystem/JKernel/JKRThread.cpp
+++ b/src/JSystem/JKernel/JKRThread.cpp
@@ -7,29 +7,20 @@
 #include "global.h"
 #include <stdint.h>
 
-/* 8043428C-80434298 060FAC 000C+00 5/6 0/0 0/0 .bss             sThreadList__9JKRThread */
 JSUList<JKRThread> JKRThread::sThreadList(0);
 
-/* 804513B0-804513B4 0008B0 0004+00 2/2 1/1 0/0 .sbss            sManager__15JKRThreadSwitch */
 JKRThreadSwitch* JKRThreadSwitch::sManager;
 
-/* 804513B4-804513B8 0008B4 0004+00 3/3 0/0 0/0 .sbss            sTotalCount__15JKRThreadSwitch */
 u32 JKRThreadSwitch::sTotalCount;
 
-/* 804513B8-804513BC 0008B8 0004+00 1/1 0/0 0/0 .sbss            sTotalStart__15JKRThreadSwitch */
 u32 JKRThreadSwitch::sTotalStart;
 
-/* 804513BC-804513C0 0008BC 0004+00 1/1 0/0 0/0 .sbss            None */
 static u32 data_804513BC;
 
-/* 804513C0-804513C4 0008C0 0004+00 1/1 0/0 0/0 .sbss            mUserPreCallback__15JKRThreadSwitch
- */
 JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback;
 
-/* 804513C4-804513C8 0008C4 0004+00 1/1 0/0 0/0 .sbss mUserPostCallback__15JKRThreadSwitch */
 JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback;
 
-/* 802D1568-802D1610 2CBEA8 00A8+00 0/0 4/4 0/0 .text            __ct__9JKRThreadFUlii */
 JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) {
     JKRHeap* heap = JKRHeap::findFromRoot(this);
     if (heap == NULL) {
@@ -40,7 +31,6 @@ JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadLi
     setCommon_mesgQueue(mHeap, message_count);
 }
 
-/* 802D1610-802D16B8 2CBF50 00A8+00 0/0 2/2 0/0 .text            __ct__9JKRThreadFP7JKRHeapUlii */
 JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4)
     : mThreadListLink(this) {
     if (heap == NULL) {
@@ -51,7 +41,6 @@ JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param
     setCommon_mesgQueue(mHeap, message_count);
 }
 
-/* 802D16B8-802D1758 2CBFF8 00A0+00 0/0 5/5 0/0 .text            __ct__9JKRThreadFP8OSThreadi */
 JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this) {
     mHeap = NULL;
     mThreadRecord = thread;
@@ -61,7 +50,6 @@ JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this
     setCommon_mesgQueue(JKRHeap::getSystemHeap(), message_count);
 }
 
-/* 802D1758-802D1830 2CC098 00D8+00 1/0 9/9 0/0 .text            __dt__9JKRThreadFv */
 JKRThread::~JKRThread() {
     getList().remove(&mThreadListLink);
 
@@ -77,8 +65,6 @@ JKRThread::~JKRThread() {
     JKRFree(mMessages);
 }
 
-/* 802D1830-802D18A4 2CC170 0074+00 3/3 0/0 0/0 .text setCommon_mesgQueue__9JKRThreadFP7JKRHeapi
- */
 void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
     mMessageCount = message_count;
     mMessages = (OSMessage*)JKRHeap::alloc(mMessageCount * sizeof(OSMessage), 0, heap);
@@ -90,8 +76,6 @@ void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) {
     mCurrentHeapError = NULL;
 }
 
-/* 802D18A4-802D1934 2CC1E4 0090+00 2/2 0/0 0/0 .text
- * setCommon_heapSpecified__9JKRThreadFP7JKRHeapUli             */
 void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3) {
     mHeap = heap;
     mStackSize = stack_size & 0xffffffe0;
@@ -102,14 +86,11 @@ void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param
     OSCreateThread(mThreadRecord, start, this, stackBase, mStackSize, param_3, 1);
 }
 
-/* 802D1934-802D1960 2CC274 002C+00 1/1 0/0 0/0 .text            start__9JKRThreadFPv */
 void* JKRThread::start(void* param) {
     JKRThread* thread = (JKRThread*)param;
     return thread->run();
 }
 
-/* 802D1960-802D199C 2CC2A0 003C+00 1/1 0/0 0/0 .text            searchThread__9JKRThreadFP8OSThread
- */
 JKRThread* JKRThread::searchThread(OSThread* thread) {
     JSUList<JKRThread>& threadList = getList();
     JSUListIterator<JKRThread> iterator;
@@ -122,8 +103,6 @@ JKRThread* JKRThread::searchThread(OSThread* thread) {
     return NULL;
 }
 
-/* 802D199C-802D1A14 2CC2DC 0078+00 1/1 0/0 0/0 .text            __ct__15JKRThreadSwitchFP7JKRHeap
- */
 JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
     mHeap = param_0;
     OSSetSwitchThreadCallback(JKRThreadSwitch::callback);
@@ -138,8 +117,6 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
     mSetNextHeap = true;
 }
 
-/* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap
- */
 JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
     JUT_ASSERT(343, sManager == NULL);
 
@@ -151,7 +128,6 @@ JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
     return sManager;
 }
 
-/* 802D1A70-802D1AE4 2CC3B0 0074+00 0/0 1/1 0/0 .text enter__15JKRThreadSwitchFP9JKRThreadi */
 JKRThread* JKRThreadSwitch::enter(JKRThread* thread, int thread_id) {
     if (!thread) {
         return NULL;
@@ -175,8 +151,6 @@ static void dummyStrings() {
     DEAD_STRING("JKRThread:%x  OSThread:%x  Load:ID:%d  (%s)\n");
 }
 
-/* 802D1AE4-802D1C74 2CC424 0190+00 1/1 0/0 0/0 .text
- * callback__15JKRThreadSwitchFP8OSThreadP8OSThread             */
 void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
     if (mUserPreCallback) {
         (*mUserPreCallback)(current, next);
@@ -245,8 +219,6 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) {
     }
 }
 
-/* 802D1C74-802D1E14 2CC5B4 01A0+00 1/0 0/0 0/0 .text
- * draw__15JKRThreadSwitchFP14JKRThreadName_P10JUTConsole       */
 void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console) {
     const char* print_0 = " total: switch:%3d  time:%d(%df)\n";
     const char* print_1 = " -------------------------------------\n";
@@ -304,27 +276,21 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console
     }
 }
 
-/* 802D1E14-802D1E1C 2CC754 0008+00 1/0 0/0 0/0 .text            run__9JKRThreadFv */
 void* JKRThread::run() {
     return NULL;
 }
 
-/* 802D1E1C-802D1E4C 2CC75C 0030+00 1/0 0/0 0/0 .text draw__15JKRThreadSwitchFP14JKRThreadName_ */
 void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list) {
     draw(thread_name_list, NULL);
 }
 
-/* 802D1E4C-802D1E94 2CC78C 0048+00 1/0 0/0 0/0 .text            __dt__15JKRThreadSwitchFv */
 JKRThreadSwitch::~JKRThreadSwitch() {}
 
-/* 804342A4-804342B0 060FC4 000C+00 0/1 0/0 0/0 .bss             sTaskList__7JKRTask */
 #pragma push
 #pragma force_active on
 JSUList<JKRTask> JKRTask::sTaskList;
 #pragma pop
 
-/* ############################################################################################## */
-/* 804342B0-804342D0 060FD0 0020+00 0/0 0/0 0/0 .bss             sEndMesgQueue__7JKRTask */
 #pragma push
 #pragma force_active on
 u8 JKRTask::sEndMesgQueue[32];
diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp
index 6da6a60c19..b6649594da 100644
--- a/src/JSystem/JMath/JMATrigonometric.cpp
+++ b/src/JSystem/JMath/JMATrigonometric.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JMATrigonometric
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 // don't include header until this "zero" mess is figured out
@@ -75,14 +70,10 @@ struct TAsinAcosTable {
 
 namespace JMath {
 
-/* ############################################################################################## */
-/* 80439A20-80449A20 066740 10000+00 1/1 265/265 705/705 .bss             sincosTable___5JMath */
 TSinCosTable<13, f32> sincosTable_;
 
-/* 80449A20-8044AA40 076740 1020+00 1/1 0/0 0/0 .bss             atanTable___5JMath */
 TAtanTable atanTable_;
 
-/* 8044AA40-8044BA60 077760 1020+00 1/1 1/1 0/0 .bss             asinAcosTable___5JMath */
 TAsinAcosTable asinAcosTable_;
 
 }  // namespace JMath
diff --git a/src/JSystem/JMath/JMath.cpp b/src/JSystem/JMath/JMath.cpp
index 3972d26e8d..ec60a65305 100644
--- a/src/JSystem/JMath/JMath.cpp
+++ b/src/JSystem/JMath/JMath.cpp
@@ -1,15 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JMath
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JMath/JMATrigonometric.h"
 
-/* 80339878-80339938 3341B8 00C0+00 0/0 11/11 2/2 .text            JMAEulerToQuat__FsssP10Quaternion
- */
 void JMAEulerToQuat(s16 x, s16 y, s16 z, Quaternion* quat) {
     f32 cosX = JMASCos(x / 2);
     f32 cosY = JMASCos(y / 2);
@@ -26,8 +19,6 @@ void JMAEulerToQuat(s16 x, s16 y, s16 z, Quaternion* quat) {
     quat->z = sinZ * (cosX * cosY) - cosZ * (sinX * sinY);
 }
 
-/* 80339938-80339A30 334278 00F8+00 0/0 5/5 0/0 .text
- * JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion     */
 void JMAQuatLerp(register const Quaternion* p, register const Quaternion* q, f32 t,
                  Quaternion* dst) {
     register f32 pxy, pzw, qxy, qzw;
@@ -61,8 +52,6 @@ void JMAQuatLerp(register const Quaternion* p, register const Quaternion* q, f32
     }
 }
 
-/* 80339A30-80339A5C 334370 002C+00 0/0 1/1 0/0 .text            JMAFastVECNormalize__FPC3VecP3Vec
- */
 void JMAFastVECNormalize(register const Vec* src, register Vec* dst) {
     register f32 vxy, rxy, vz, length;
 #ifdef __MWERKS__  // clang-format off
@@ -81,8 +70,6 @@ void JMAFastVECNormalize(register const Vec* src, register Vec* dst) {
 #endif  // clang-format on
 }
 
-/* 80339A5C-80339A84 33439C 0028+00 0/0 1/1 0/0 .text            JMAVECScaleAdd__FPC3VecPC3VecP3Vecf
- */
 void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst,
                     register f32 scale) {
     register f32 v1xy;
@@ -103,8 +90,6 @@ void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register
 #endif  // clang-format on
 }
 
-/* 80339A84-80339AE4 3343C4 0060+00 0/0 5/5 0/0 .text            JMAMTXApplyScale__FPA4_CfPA4_ffff
- */
 void JMAMTXApplyScale(register const Mtx src, register Mtx dst, register f32 xScale,
                       register f32 yScale, register f32 zScale) {
     register f32 scale = yScale;
diff --git a/src/JSystem/JMath/random.cpp b/src/JSystem/JMath/random.cpp
index dc910ac072..add311c729 100644
--- a/src/JSystem/JMath/random.cpp
+++ b/src/JSystem/JMath/random.cpp
@@ -1,13 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: random
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JMath/random.h"
 
-/* 80339AE4-80339AEC -00001 0008+00 0/0 0/0 0/0 .text            __ct__Q25JMath13TRandom_fast_FUl */
 JMath::TRandom_fast_::TRandom_fast_(u32 param_0) {
     value = param_0;
 }
diff --git a/src/JSystem/JMessage/control.cpp b/src/JSystem/JMessage/control.cpp
index d549fb5de5..acd5387f77 100644
--- a/src/JSystem/JMessage/control.cpp
+++ b/src/JSystem/JMessage/control.cpp
@@ -7,7 +7,6 @@
 
 #include "JSystem/JMessage/control.h"
 
-/* 802A7548-802A758C 2A1E88 0044+00 0/0 2/2 0/0 .text            __ct__Q28JMessage8TControlFv */
 JMessage::TControl::TControl()
     : pSequenceProcessor_(NULL),
       pRenderingProcessor_(NULL),
@@ -20,10 +19,8 @@ JMessage::TControl::TControl()
       pMessageText_current_(NULL)
       {}
 
-/* 802A758C-802A75D4 2A1ECC 0048+00 1/0 2/2 0/0 .text            __dt__Q28JMessage8TControlFv */
 JMessage::TControl::~TControl() {}
 
-/* 802A75D4-802A7634 2A1F14 0060+00 0/0 9/9 0/0 .text            reset__Q28JMessage8TControlFv */
 void JMessage::TControl::reset() {
     pEntry_ = NULL;
     pMessageText_begin_ = NULL;
@@ -40,7 +37,6 @@ void JMessage::TControl::reset() {
     }
 }
 
-/* 802A7634-802A76BC 2A1F74 0088+00 0/0 4/4 0/0 .text            update__Q28JMessage8TControlFv */
 int JMessage::TControl::update() {
     if (!isReady_update_()) {
         return 0;
@@ -55,7 +51,6 @@ int JMessage::TControl::update() {
     return 1;
 }
 
-/* 802A76BC-802A77E8 2A1FFC 012C+00 0/0 5/5 0/0 .text            render__Q28JMessage8TControlFv */
 void JMessage::TControl::render() {
     if (isReady_render_()) {
         pRenderingProcessor_->setBegin_messageEntryText(pResourceCache_, pEntry_, pMessageText_current_);
@@ -64,14 +59,12 @@ void JMessage::TControl::render() {
     }
 }
 
-/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
 int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) {
     TProcessor* pProcessor = getProcessor();
     JUT_ASSERT(120, pProcessor!=NULL);
     return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index);
 }
 
-/* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */
 int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) {
     TProcessor* pProcessor = getProcessor();
     JUT_ASSERT(132, pProcessor!=NULL);
@@ -84,8 +77,6 @@ int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) {
     return setMessageCode_inReset_(pProcessor, uCode >> 16, uCode & 0xFFFF);
 }
 
-/* 802A7A20-802A7AF8 2A2360 00D8+00 2/2 1/1 0/0 .text
- * setMessageCode_inSequence___Q28JMessage8TControlFPCQ28JMessage10TProcessorUsUs */
 bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* pProcessor, u16 u16GroupID, u16 u16Index) {
     pEntry_ = pProcessor->getMessageEntry_messageCode(u16GroupID, u16Index);
     if (pEntry_ == NULL) {
diff --git a/src/JSystem/JMessage/data.cpp b/src/JSystem/JMessage/data.cpp
index e88dafdb42..4750591a72 100644
--- a/src/JSystem/JMessage/data.cpp
+++ b/src/JSystem/JMessage/data.cpp
@@ -2,7 +2,6 @@
 
 #include "JSystem/JMessage/data.h"
 
-/* 80455818-80455820 003E18 0004+04 0/0 1/1 0/0 .sdata2          ga4cSignature__Q28JMessage4data */
 const u32 JMessage::data::ga4cSignature = 'MESG';
 
 const u32 JMessage::data::ga4cSignature_color = 'MGCL';
diff --git a/src/JSystem/JMessage/locale.cpp b/src/JSystem/JMessage/locale.cpp
index fca9ad6621..78c4292f4e 100644
--- a/src/JSystem/JMessage/locale.cpp
+++ b/src/JSystem/JMessage/locale.cpp
@@ -2,8 +2,6 @@
 
 #include "JSystem/JMessage/locale.h"
 
-/* 802A9528-802A958C 2A3E68 0064+00 0/0 1/0 0/0 .text
- * parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc             */
 int JMessage::locale::parseCharacter_ShiftJIS(const char** ppszText) {
     int c = *(u8*)*ppszText & 0xFF;
     (*ppszText)++;
@@ -17,8 +15,6 @@ int JMessage::locale::parseCharacter_ShiftJIS(const char** ppszText) {
     return c;
 }
 
-/* 802A958C-802A968C 2A3ECC 0100+00 0/0 1/0 0/0 .text parseCharacter_UTF8__Q28JMessage6localeFPPCc
- */
 int JMessage::locale::parseCharacter_UTF8(const char** ppszText) {
     int c = *(u8*)*ppszText & 0xFF;
     (*ppszText)++;
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index 5155863aed..2be956ef19 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -5,25 +5,19 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include <cstdint.h>
 
-/* 802A7AF8-802A7B40 2A2438 0048+00 1/0 2/2 0/0 .text            __dt__Q28JMessage10TReferenceFv */
 JMessage::TReference::~TReference() {}
 
-/* 802A7B40-802A7B48 2A2480 0008+00 1/0 2/0 0/0 .text do_word__Q28JMessage10TReferenceCFUl */
 const char* JMessage::TReference::do_word(u32 param_0) const {
     return NULL;
 }
 
-/* 802A7B48-802A7B90 2A2488 0048+00 3/2 0/0 0/0 .text            __dt__Q28JMessage10TProcessorFv */
 JMessage::TProcessor::~TProcessor() {}
 
-/* 802A7B90-802A7BF8 2A24D0 0068+00 0/0 1/1 0/0 .text            reset__Q28JMessage10TProcessorFv */
 void JMessage::TProcessor::reset() {
     on_resetStatus_(NULL);
     do_reset();
 }
 
-/* 802A7BF8-802A7C30 2A2538 0038+00 1/1 8/8 0/0 .text
- * stack_pushCurrent__Q28JMessage10TProcessorFPCc               */
 void JMessage::TProcessor::stack_pushCurrent(char const* pszText) {
     if (pszText != NULL) {
         if (!oStack_.IsPushable()) {
@@ -35,15 +29,11 @@ void JMessage::TProcessor::stack_pushCurrent(char const* pszText) {
     }
 }
 
-/* 802A7C30-802A7C54 2A2570 0024+00 1/1 0/0 0/0 .text stack_popCurrent__Q28JMessage10TProcessorFv
- */
 void JMessage::TProcessor::stack_popCurrent() {
     JGADGET_ASSERTWARN(122, !oStack_.empty());
     stack_popCurrent_();
 }
 
-/* 802A7C54-802A7CD4 2A2594 0080+00 1/1 1/1 0/0 .text
- * getResource_groupID__Q28JMessage10TProcessorCFUs             */
 const JMessage::TResource* JMessage::TProcessor::getResource_groupID(u16 u16GroupID) const {
     if (isResourceCache_groupID(u16GroupID)) {
         return pResourceCache_;
@@ -53,8 +43,6 @@ const JMessage::TResource* JMessage::TProcessor::getResource_groupID(u16 u16Grou
     return pResourceCache_;
 }
 
-/* 802A7CD4-802A7E38 2A2614 0164+00 0/0 1/1 0/0 .text
- * toMessageCode_messageID__Q28JMessage10TProcessorCFUlUlPb     */
 u32 JMessage::TProcessor::toMessageCode_messageID(u32 uMsgID, u32 param_1, bool* pbValid) const {
     const TResource* pResourceCache = (const TResource*)getResourceCache();
     if (pResourceCache != NULL) {
@@ -85,8 +73,6 @@ u32 JMessage::TProcessor::toMessageCode_messageID(u32 uMsgID, u32 param_1, bool*
     return 0xFFFFFFFF;
 }
 
-/* 802A7E38-802A7EDC 2A2778 00A4+00 1/1 0/0 0/0 .text
- * on_select_begin__Q28JMessage10TProcessorFPFPQ28JMessage10TProcessor_PCcPCvPCcUl */
 void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcessor*),
                                            void const* pOffset, char const* pcBase, u32 uNumber) {
     JUT_ASSERT(191, uNumber>0);
@@ -110,7 +96,6 @@ void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcess
     }
 }
 
-/* 802A7EDC-802A7F34 2A281C 0058+00 1/1 0/0 0/0 .text on_select_end__Q28JMessage10TProcessorFv */
 void JMessage::TProcessor::on_select_end() {
     TProcess_::rdata& rData = oProcess_.rData;
     JUT_ASSERT(219, rData.uRest==0);
@@ -121,8 +106,6 @@ void JMessage::TProcessor::on_select_end() {
     do_select_end();
 }
 
-/* 802A7F34-802A7FC0 2A2874 008C+00 1/1 0/0 0/0 .text
- * on_select_separate__Q28JMessage10TProcessorFv                */
 void JMessage::TProcessor::on_select_separate() {
     stack_popCurrent_();
     JUT_ASSERT(234, stack_isPushable());
@@ -140,38 +123,24 @@ void JMessage::TProcessor::on_select_separate() {
     do_select_separate();
 }
 
-/* 802A7FC0-802A7FC4 2A2900 0004+00 3/0 2/0 0/0 .text            do_reset__Q28JMessage10TProcessorFv
- */
 void JMessage::TProcessor::do_reset() {}
 
-/* 802A7FC4-802A7FC8 2A2904 0004+00 3/0 0/0 0/0 .text do_begin__Q28JMessage10TProcessorFPCvPCc */
 void JMessage::TProcessor::do_begin(void const* pEntry, char const* pszText) {}
 
-/* 802A7FC8-802A7FCC 2A2908 0004+00 3/0 0/0 0/0 .text            do_end__Q28JMessage10TProcessorFv
- */
 void JMessage::TProcessor::do_end() {}
 
-/* 802A7FCC-802A7FD0 2A290C 0004+00 3/0 0/0 0/0 .text do_character__Q28JMessage10TProcessorFi */
 void JMessage::TProcessor::do_character(int iCharacter) {}
 
-/* 802A7FD0-802A7FD8 2A2910 0008+00 3/0 0/0 0/0 .text do_tag__Q28JMessage10TProcessorFUlPCvUl */
 bool JMessage::TProcessor::do_tag(u32 uTag, void const* pData, u32 uSize) {
     return false;
 }
 
-/* 802A7FD8-802A7FDC 2A2918 0004+00 3/0 6/0 0/0 .text do_select_begin__Q28JMessage10TProcessorFUl
- */
 void JMessage::TProcessor::do_select_begin(u32 uNumber) {}
 
-/* 802A7FDC-802A7FE0 2A291C 0004+00 3/0 6/0 0/0 .text do_select_end__Q28JMessage10TProcessorFv */
 void JMessage::TProcessor::do_select_end() {}
 
-/* 802A7FE0-802A7FE4 2A2920 0004+00 3/0 6/0 0/0 .text
- * do_select_separate__Q28JMessage10TProcessorFv                */
 void JMessage::TProcessor::do_select_separate() {}
 
-/* 802A7FE4-802A8084 2A2924 00A0+00 1/1 0/0 0/0 .text            on_tag___Q28JMessage10TProcessorFv
- */
 void JMessage::TProcessor::on_tag_() {
     u32 uSize;
     char* psz = (char*)getCurrent();
@@ -197,17 +166,12 @@ void JMessage::TProcessor::on_tag_() {
     on_tag(uTag, psz, uSize - 5);
 }
 
-/* 802A8084-802A8088 2A29C4 0004+00 2/0 4/0 0/0 .text do_resetStatus___Q28JMessage10TProcessorFPCc
- */
 void JMessage::TProcessor::do_resetStatus_(char const* pszText) {}
 
-/* 802A8088-802A8090 2A29C8 0008+00 2/0 4/0 0/0 .text
- * do_setBegin_isReady___Q28JMessage10TProcessorCFv             */
 bool JMessage::TProcessor::do_setBegin_isReady_() const {
     return true;
 }
 
-/* 802A8090-802A81EC 2A29D0 015C+00 2/2 0/0 0/0 .text do_tag___Q28JMessage10TProcessorFUlPCvUl */
 void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
     u8 uGroupID = data::getTagGroup(uTag);
     unsigned int uCode = data::getTagCode(uTag);
@@ -251,8 +215,6 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
     JGADGET_WARNMSG4(387, "unknown tag-value : [", (unsigned int)uGroupID, "-", uCode & 0xFFFF, ']');
 }
 
-/* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text
- * process_character___Q28JMessage10TProcessorFv                */
 bool JMessage::TProcessor::process_character_() {
     JUT_ASSERT(397, pszCurrent_!=NULL);
     int iCharacter = on_parseCharacter(&pszCurrent_);
@@ -273,8 +235,6 @@ bool JMessage::TProcessor::process_character_() {
     return true;
 }
 
-/* 802A828C-802A82F4 2A2BCC 0068+00 6/6 6/6 0/0 .text
- * process_onCharacterEnd_normal___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
 bool JMessage::TProcessor::process_onCharacterEnd_normal_(JMessage::TProcessor* pThis) {
     JUT_ASSERT(420, pThis->oProcess_.pfnProcess_onCharacterEnd== &process_onCharacterEnd_normal_);
 
@@ -287,8 +247,6 @@ bool JMessage::TProcessor::process_onCharacterEnd_normal_(JMessage::TProcessor*
     return false;
 }
 
-/* 802A82F4-802A833C 2A2C34 0048+00 1/1 0/0 0/0 .text
- * process_onCharacterEnd_select___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
 bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor* pThis) {
     JUT_ASSERT(435, pThis->oProcess_.pfnProcess_onCharacterEnd== &process_onCharacterEnd_select_);
     JUT_ASSERT(436, !pThis->oStack_.empty());
@@ -306,8 +264,6 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor*
     return true;
 }
 
-/* 802A833C-802A8358 2A2C7C 001C+00 1/1 0/0 0/0 .text
- * process_onSelect_limited___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
 const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) {
     TProcess_::rdata& rData = pThis->oProcess_.rData;
     JUT_ASSERT(454, rData.pfn==&process_onSelect_limited_);
@@ -322,8 +278,6 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor
     return &rData.pcBase[uData];
 }
 
-/* 802A8358-802A8374 2A2C98 001C+00 1/1 0/0 0/0 .text
- * process_onSelect___Q28JMessage10TProcessorFPQ28JMessage10TProcessor */
 const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) {
     TProcess_::rdata& rData = pThis->oProcess_.rData;
     JUT_ASSERT(471, rData.pfn==&process_onSelect_);
@@ -338,8 +292,6 @@ const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis)
     return &rData.pcBase[uData];
 }
 
-/* 802A8374-802A83B8 2A2CB4 0044+00 0/0 2/2 0/0 .text
- * __ct__Q28JMessage18TSequenceProcessorFPCQ28JMessage10TReferencePQ28JMessage8TControl */
 JMessage::TSequenceProcessor::TSequenceProcessor(JMessage::TReference const* pReference,
                                                  JMessage::TControl* pControl)
     : TProcessor(pReference),
@@ -347,11 +299,8 @@ JMessage::TSequenceProcessor::TSequenceProcessor(JMessage::TReference const* pRe
       eStatus_(STATUS_READY)
       {}
 
-/* 802A83B8-802A8418 2A2CF8 0060+00 1/0 2/2 0/0 .text __dt__Q28JMessage18TSequenceProcessorFv */
 JMessage::TSequenceProcessor::~TSequenceProcessor() {}
 
-/* 802A8418-802A85A4 2A2D58 018C+00 0/0 1/1 0/0 .text process__Q28JMessage18TSequenceProcessorFPCc
- */
 const char* JMessage::TSequenceProcessor::process(char const* pszText) {
     do {
         switch (eStatus_) {
@@ -425,15 +374,11 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
     return NULL;
 }
 
-/* 802A85A4-802A85D0 2A2EE4 002C+00 1/1 0/0 0/0 .text
- * on_isReady__Q28JMessage18TSequenceProcessorFv                */
 bool JMessage::TSequenceProcessor::on_isReady() {
     JUT_ASSERT(629, eStatus_==STATUS_NORMAL);
     return do_isReady();
 }
 
-/* 802A85D0-802A85E4 2A2F10 0014+00 1/1 0/0 0/0 .text
- * on_jump_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessor_PCvUl */
 void JMessage::TSequenceProcessor::on_jump_register(JMessage::TSequenceProcessor::jumpPfn pfn, u32 u32Target) {
     JUT_ASSERT(638, eStatus_==STATUS_NORMAL);
     eStatus_ = STATUS_JUMP;
@@ -443,15 +388,11 @@ void JMessage::TSequenceProcessor::on_jump_register(JMessage::TSequenceProcessor
     process.process.jump_process.u32Target = u32Target;
 }
 
-/* 802A85E4-802A8610 2A2F24 002C+00 1/1 0/0 0/0 .text
- * on_jump_isReady__Q28JMessage18TSequenceProcessorFv           */
 bool JMessage::TSequenceProcessor::on_jump_isReady() {
     JUT_ASSERT(649, eStatus_==STATUS_JUMP);
     return do_jump_isReady();
 }
 
-/* 802A8610-802A8690 2A2F50 0080+00 1/1 0/0 0/0 .text
- * on_jump__Q28JMessage18TSequenceProcessorFPCvPCc              */
 void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszText) {
     on_resetStatus_(pszText);
 
@@ -473,24 +414,18 @@ void JMessage::TSequenceProcessor::on_branch_register(JMessage::TSequenceProcess
     process.process.branch_process.uTarget = uTarget;
 }
 
-/* 802A86A0-802A86D4 2A2FE0 0034+00 1/1 0/0 0/0 .text
- * on_branch_query__Q28JMessage18TSequenceProcessorFUl          */
 void JMessage::TSequenceProcessor::on_branch_query(u32 uCode) {
     JUT_ASSERT(680, eStatus_==STATUS_NORMAL);
     eStatus_ = STATUS_BRANCH;
     do_branch_query(uCode);
 }
 
-/* 802A86D4-802A8700 2A3014 002C+00 1/1 0/0 0/0 .text
- * on_branch_queryResult__Q28JMessage18TSequenceProcessorFv     */
 u32 JMessage::TSequenceProcessor::on_branch_queryResult() {
     JUT_ASSERT(691, eStatus_==STATUS_BRANCH);
     u32 result = do_branch_queryResult();
     return result;
 }
 
-/* 802A8700-802A8780 2A3040 0080+00 1/1 0/0 0/0 .text
- * on_branch__Q28JMessage18TSequenceProcessorFPCvPCc            */
 void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* pszText) {
     on_resetStatus_(pszText);
 
@@ -500,38 +435,24 @@ void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* psz
     do_branch(pEntry, pszText);
 }
 
-/* 802A8780-802A8788 2A30C0 0008+00 1/0 0/0 0/0 .text
- * do_isReady__Q28JMessage18TSequenceProcessorFv                */
 bool JMessage::TSequenceProcessor::do_isReady() {
     return true;
 }
 
-/* 802A8788-802A8790 2A30C8 0008+00 1/0 0/0 0/0 .text
- * do_jump_isReady__Q28JMessage18TSequenceProcessorFv           */
 bool JMessage::TSequenceProcessor::do_jump_isReady() {
     return true;
 }
 
-/* 802A8790-802A8794 2A30D0 0004+00 1/0 0/0 0/0 .text
- * do_jump__Q28JMessage18TSequenceProcessorFPCvPCc              */
 void JMessage::TSequenceProcessor::do_jump(void const* pEntry, char const* pszText) {}
 
-/* 802A8794-802A8798 2A30D4 0004+00 1/0 2/0 0/0 .text
- * do_branch_query__Q28JMessage18TSequenceProcessorFUl          */
 void JMessage::TSequenceProcessor::do_branch_query(u32 uCode) {}
 
-/* 802A8798-802A87A0 2A30D8 0008+00 1/0 2/0 0/0 .text
- * do_branch_queryResult__Q28JMessage18TSequenceProcessorFv     */
 s32 JMessage::TSequenceProcessor::do_branch_queryResult() {
     return -2;
 }
 
-/* 802A87A0-802A87A4 2A30E0 0004+00 1/0 2/0 0/0 .text
- * do_branch__Q28JMessage18TSequenceProcessorFPCvPCc            */
 void JMessage::TSequenceProcessor::do_branch(void const* pEntry, char const* pszText) {}
 
-/* 802A87A4-802A87C0 2A30E4 001C+00 1/0 2/0 0/0 .text
- * do_resetStatus___Q28JMessage18TSequenceProcessorFPCc         */
 void JMessage::TSequenceProcessor::do_resetStatus_(char const* pszText) {
     eStatus_ = STATUS_READY;
 
@@ -540,27 +461,19 @@ void JMessage::TSequenceProcessor::do_resetStatus_(char const* pszText) {
     }
 }
 
-/* 802A87C0-802A87D0 2A3100 0010+00 1/0 2/0 0/0 .text
- * do_setBegin_isReady___Q28JMessage18TSequenceProcessorCFv     */
 bool JMessage::TSequenceProcessor::do_setBegin_isReady_() const {
     return eStatus_ == STATUS_READY;
 }
 
-/* 802A87D0-802A87D4 2A3110 0004+00 1/0 2/0 0/0 .text
- * do_begin___Q28JMessage18TSequenceProcessorFPCvPCc            */
 void JMessage::TSequenceProcessor::do_begin_(void const* pEntry, char const* pszText) {
     JUT_ASSERT(782, eStatus_==STATUS_NORMAL);
 }
 
-/* 802A87D4-802A87E0 2A3114 000C+00 1/0 2/0 0/0 .text do_end___Q28JMessage18TSequenceProcessorFv
- */
 void JMessage::TSequenceProcessor::do_end_() {
     JUT_ASSERT(789, eStatus_==STATUS_NORMAL);
     eStatus_ = STATUS_ONE;
 }
 
-/* 802A87E0-802A892C 2A3120 014C+00 2/0 2/0 0/0 .text
- * do_tag___Q28JMessage18TSequenceProcessorFUlPCvUl             */
 void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
     u8 uGroupID = data::getTagGroup(uTag);
     unsigned int uCode = data::getTagCode(uTag);
@@ -630,8 +543,6 @@ void JMessage::TSequenceProcessor::do_tag_(u32 uTag, void const* pData, u32 uSiz
     }
 }
 
-/* 802A892C-802A8944 2A326C 0018+00 1/1 0/0 0/0 .text
- * process_setMessageIndex_reserved___Q28JMessage18TSequenceProcessorFUs */
 void JMessage::TSequenceProcessor::process_setMessageIndex_reserved_(u16 u16Index) {
     JUT_ASSERT(890, (data::MESSAGEINDEX_RESERVED_ENUM_MIN<=u16Index)&& (u16Index<=data::MESSAGEINDEX_RESERVED_ENUM_MAX));
 
@@ -642,8 +553,6 @@ void JMessage::TSequenceProcessor::process_setMessageIndex_reserved_(u16 u16Inde
     }
 }
 
-/* 802A8944-802A89B8 2A3284 0074+00 4/4 0/0 0/0 .text
- * process_setMessageCode___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUsUs */
 void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceProcessor const* pProcessor, u16 u16GroupID, u16 u16Index) {
     JGADGET_ASSERTWARN(904, u16GroupID<=data::MESSAGEGROUPID_USER_ENUM_MIN);
 
@@ -663,8 +572,6 @@ void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceP
     return pControl->getMessageEntry();
 }
 
-/* 802A89B8-802A89EC 2A32F8 0034+00 1/1 0/0 0/0 .text
- * process_onJump_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor */
 const void*
 JMessage::TSequenceProcessor::process_onJump_limited_(JMessage::TSequenceProcessor const* pProcessor) {
     const TProcess_::processData::jumpData& rData = pProcessor->oProcess2_.process.jump_process;
@@ -673,16 +580,12 @@ JMessage::TSequenceProcessor::process_onJump_limited_(JMessage::TSequenceProcess
     return process_setMessageIndex_(pProcessor, rData.u32Target);
 }
 
-/* 802A89EC-802A8A18 2A332C 002C+00 1/1 0/0 0/0 .text
- * process_onJump___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessor */
 const void*
 JMessage::TSequenceProcessor::process_onJump_(JMessage::TSequenceProcessor const* pProcessor) {
     const TProcess_::processData::jumpData& rData = pProcessor->oProcess2_.process.jump_process;
     return process_setMessageCode_(pProcessor, rData.u32Target);
 }
 
-/* 802A8A18-802A8A50 2A3358 0038+00 1/1 0/0 0/0 .text
- * process_onBranch_limited___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl */
 const void*
 JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
     const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
@@ -694,8 +597,6 @@ JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProce
     return process_setMessageIndex_(pProcessor, u16Index);
 }
 
-/* 802A8A50-802A8A84 2A3390 0034+00 1/1 0/0 0/0 .text
- * process_onBranch___Q28JMessage18TSequenceProcessorFPCQ28JMessage18TSequenceProcessorUl */
 const void*
 JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
     const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
@@ -707,16 +608,11 @@ JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor con
     return process_setMessageCode_(pProcessor, uCode);
 }
 
-/* 802A8A84-802A8AC0 2A33C4 003C+00 0/0 4/4 0/0 .text
- * __ct__Q28JMessage19TRenderingProcessorFPCQ28JMessage10TReference */
 JMessage::TRenderingProcessor::TRenderingProcessor(JMessage::TReference const* pReference)
     : TProcessor(pReference) {}
 
-/* 802A8AC0-802A8B20 2A3400 0060+00 1/0 6/6 0/0 .text __dt__Q28JMessage19TRenderingProcessorFv */
 JMessage::TRenderingProcessor::~TRenderingProcessor() {}
 
-/* 802A8B20-802A8BA4 2A3460 0084+00 0/0 4/4 0/0 .text
- * process__Q28JMessage19TRenderingProcessorFPCc                */
 int JMessage::TRenderingProcessor::process(char const* pszText) {
     do {
         if (pszCurrent_ == pszText) {
@@ -728,16 +624,10 @@ int JMessage::TRenderingProcessor::process(char const* pszText) {
     return 0;
 }
 
-/* 802A8BA4-802A8BA8 2A34E4 0004+00 1/0 4/0 0/0 .text
- * do_begin___Q28JMessage19TRenderingProcessorFPCvPCc           */
 void JMessage::TRenderingProcessor::do_begin_(void const* pEntry, char const* pszText) {}
 
-/* 802A8BA8-802A8BAC 2A34E8 0004+00 1/0 4/0 0/0 .text do_end___Q28JMessage19TRenderingProcessorFv
- */
 void JMessage::TRenderingProcessor::do_end_() {}
 
-/* 802A8BAC-802A8C24 2A34EC 0078+00 1/0 4/0 0/0 .text
- * do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl            */
 void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
     u8 uGroupID = data::getTagGroup(uTag);
     unsigned int uCode = data::getTagCode(uTag);
diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp
index 145a92fef1..ba8916e9a0 100644
--- a/src/JSystem/JMessage/resource.cpp
+++ b/src/JSystem/JMessage/resource.cpp
@@ -6,8 +6,6 @@
 #include <algorithm.h>
 #include <string.h>
 
-/* 802A8CDC-802A8EC0 2A361C 01E4+00 0/0 1/1 0/0 .text
- * toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb      */
 u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const {
     if (!oParse_TBlock_messageID_.getRaw()) {
         return 0xFFFF;
@@ -89,8 +87,6 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo
     return nIndex;
 }
 
-/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
- * sapfnParseCharacter___Q28JMessage18TResourceContainer        */
 JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
     NULL,
     JMessage::locale::parseCharacter_1Byte,
@@ -99,18 +95,12 @@ JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnPar
     JMessage::locale::parseCharacter_UTF8,
 };
 
-/* 802A8EC0-802A8EF8 2A3800 0038+00 1/1 0/0 0/0 .text
- * __ct__Q38JMessage18TResourceContainer10TCResourceFv          */
 JMessage::TResourceContainer::TCResource::TCResource() {}
 
-/* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text
- * __dt__Q38JMessage18TResourceContainer10TCResourceFv          */
 JMessage::TResourceContainer::TCResource::~TCResource() {
     JGADGET_ASSERTWARN(173, empty());
 }
 
-/* 802A8F6C-802A8FFC 2A38AC 0090+00 0/0 1/1 0/0 .text
- * Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs  */
 // NONMATCHING - likely due to incorrect enumerator setup compared to debug
 JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 u16GroupID) {
     JGadget::TContainerEnumerator<TResource, 0> enumerator(this);
@@ -123,24 +113,17 @@ JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 u
 	return NULL;
 }
 
-/* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text
- * Do_create__Q38JMessage18TResourceContainer10TCResourceFv     */
 JMessage::TResource* JMessage::TResourceContainer::TCResource::Do_create() {
     return new TResource();
 }
 
-/* 802A9048-802A906C 2A3988 0024+00 1/0 0/0 0/0 .text
- * Do_destroy__Q38JMessage18TResourceContainer10TCResourceFPQ28JMessage9TResource */
 // NONMATCHING extra null comparison
 void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* pResource) {
     delete pResource;
 }
 
-/* 802A906C-802A90B8 2A39AC 004C+00 0/0 2/2 0/0 .text __ct__Q28JMessage18TResourceContainerFv */
 JMessage::TResourceContainer::TResourceContainer() : encodingType_(0), pfnParseCharacter_(NULL) {}
 
-/* 802A90B8-802A90F0 2A39F8 0038+00 1/1 0/0 0/0 .text
- * setEncoding__Q28JMessage18TResourceContainerFUc              */
 void JMessage::TResourceContainer::setEncoding(u8 e) {
     if (e == 0) {
         encodingType_ = e;
@@ -151,27 +134,20 @@ void JMessage::TResourceContainer::setEncoding(u8 e) {
     }
 }
 
-/* 802A90F0-802A9130 2A3A30 0040+00 1/1 0/0 0/0 .text
- * setEncoding___Q28JMessage18TResourceContainerFUc             */
 void JMessage::TResourceContainer::setEncoding_(u8 e) {
     encodingType_ = e;
     pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(e, sapfnParseCharacter_, 5, NULL);
     JUT_ASSERT(299, pfnParseCharacter_!=NULL);
 }
 
-/* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text
- * __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer    */
 JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
     JUT_ASSERT(324, pContainer!=NULL);
     pContainer_ = pContainer;
     pResource_ = NULL;
 }
 
-/* 802A9158-802A91B8 2A3A98 0060+00 1/0 0/0 0/0 .text            __dt__Q28JMessage6TParseFv */
 JMessage::TParse::~TParse() {}
 
-/* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
- * parseHeader_next__Q28JMessage6TParseFPPCvPUlUl               */
 // NONMATCHING regalloc, missing clrlwi
 bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 param_2) {
     JUT_ASSERT(343, ppData_inout!=NULL);
@@ -227,8 +203,6 @@ bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_
     }
 }
 
-/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
- * parseBlock_next__Q28JMessage6TParseFPPCvPUlUl                */
 bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 param_2) {
     JUT_ASSERT(401, ppData_inout!=NULL);
     JUT_ASSERT(402, puData_out!=NULL);
@@ -297,8 +271,6 @@ bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_ou
     return 1;
 }
 
-/* 802A9490-802A94A8 2A3DD0 0018+00 1/0 0/0 0/0 .text
- * parseCharacter_1Byte__Q28JMessage6localeFPPCc                */
 int JMessage::locale::parseCharacter_1Byte(char const** ppszText) {
     u8** ppuText = (u8**)ppszText;
     int parse_char = **ppuText & 0xFF;
@@ -307,8 +279,6 @@ int JMessage::locale::parseCharacter_1Byte(char const** ppszText) {
     return parse_char;
 }
 
-/* 802A94A8-802A94D4 2A3DE8 002C+00 1/0 0/0 0/0 .text
- * parseCharacter_2Byte__Q28JMessage6localeFPPCc                */
 int JMessage::locale::parseCharacter_2Byte(char const** ppszText) {
     u8** ppuText = (u8**)ppszText;
 
diff --git a/src/JSystem/JParticle/JPABaseShape.cpp b/src/JSystem/JParticle/JPABaseShape.cpp
index 0125cf197c..94523299c0 100644
--- a/src/JSystem/JParticle/JPABaseShape.cpp
+++ b/src/JSystem/JParticle/JPABaseShape.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPABaseShape
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPABaseShape.h"
@@ -14,29 +9,22 @@
 #include "dolphin/mtx.h"
 #include "dolphin/gx.h"
 
-/* 80276A90-80276ACC 2713D0 003C+00 0/0 1/1 0/0 .text JPASetPointSize__FP18JPAEmitterWorkData */
 void JPASetPointSize(JPAEmitterWorkData* work) {
     GXSetPointSize((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }
 
-/* 80276ACC-80276B08 27140C 003C+00 0/0 1/1 0/0 .text JPASetLineWidth__FP18JPAEmitterWorkData */
 void JPASetLineWidth(JPAEmitterWorkData* work) {
     GXSetLineWidth((u8)(25.0f * work->mGlobalPtclScl.x), GX_TO_ONE);
 }
 
-/* 80276B08-80276B4C 271448 0044+00 0/0 1/1 0/0 .text
- * JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle    */
 void JPASetPointSize(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetPointSize((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }
 
-/* 80276B4C-80276B90 27148C 0044+00 0/0 1/1 0/0 .text
- * JPASetLineWidth__FP18JPAEmitterWorkDataP15JPABaseParticle    */
 void JPASetLineWidth(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetLineWidth((u8)(ptcl->mParticleScaleX * (25.0f * work->mGlobalPtclScl.x)), GX_TO_ONE);
 }
 
-/* 80276B90-80276C2C 2714D0 009C+00 0/0 1/1 0/0 .text JPARegistPrm__FP18JPAEmitterWorkData */
 void JPARegistPrm(JPAEmitterWorkData* work) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
@@ -47,7 +35,6 @@ void JPARegistPrm(JPAEmitterWorkData* work) {
     GXSetTevColor(GX_TEVREG0, prm);
 }
 
-/* 80276C2C-80276CB0 27156C 0084+00 0/0 1/1 0/0 .text JPARegistEnv__FP18JPAEmitterWorkData */
 void JPARegistEnv(JPAEmitterWorkData* work) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor env = emtr->mEnvClr;
@@ -57,7 +44,6 @@ void JPARegistEnv(JPAEmitterWorkData* work) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 80276CB0-80276DB0 2715F0 0100+00 0/0 1/1 0/0 .text JPARegistPrmEnv__FP18JPAEmitterWorkData */
 void JPARegistPrmEnv(JPAEmitterWorkData* work) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
@@ -73,8 +59,6 @@ void JPARegistPrmEnv(JPAEmitterWorkData* work) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 80276DB0-80276E60 2716F0 00B0+00 0/0 1/1 0/0 .text
- * JPARegistAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle     */
 void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
@@ -86,8 +70,6 @@ void JPARegistAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetTevColor(GX_TEVREG0, prm);
 }
 
-/* 80276E60-80276F10 2717A0 00B0+00 0/0 1/1 0/0 .text
- * JPARegistPrmAlpha__FP18JPAEmitterWorkDataP15JPABaseParticle  */
 void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = ptcl->mPrmClr;
@@ -99,8 +81,6 @@ void JPARegistPrmAlpha(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetTevColor(GX_TEVREG0, prm);
 }
 
-/* 80276F10-80277024 271850 0114+00 0/0 1/1 0/0 .text
- * JPARegistPrmAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = ptcl->mPrmClr;
@@ -117,8 +97,6 @@ void JPARegistPrmAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 80277024-80277138 271964 0114+00 0/0 1/1 0/0 .text
- * JPARegistAlphaEnv__FP18JPAEmitterWorkDataP15JPABaseParticle  */
 void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor prm = emtr->mPrmClr;
@@ -135,8 +113,6 @@ void JPARegistAlphaEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 80277138-802771BC 271A78 0084+00 0/0 1/1 0/0 .text
- * JPARegistEnv__FP18JPAEmitterWorkDataP15JPABaseParticle       */
 void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     GXColor env = ptcl->mEnvClr;
@@ -146,8 +122,6 @@ void JPARegistEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 802771BC-802771E8 271AFC 002C+00 0/0 1/1 0/0 .text JPACalcClrIdxNormal__FP18JPAEmitterWorkData
- */
 void JPACalcClrIdxNormal(JPAEmitterWorkData* work) {
     JPABaseShape* bsp = work->mpRes->getBsp();
     s16 keyFrame;
@@ -159,8 +133,6 @@ void JPACalcClrIdxNormal(JPAEmitterWorkData* work) {
     work->mClrKeyFrame = keyFrame;
 }
 
-/* 802771E8-80277210 271B28 0028+00 0/0 1/1 0/0 .text
- * JPACalcClrIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcClrIdxNormal(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s16 age = param_1->mAge;
@@ -174,15 +146,11 @@ void JPACalcClrIdxNormal(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     work->mClrKeyFrame = keyFrame;
 }
 
-/* 80277210-80277240 271B50 0030+00 0/0 1/1 0/0 .text JPACalcClrIdxRepeat__FP18JPAEmitterWorkData
- */
 void JPACalcClrIdxRepeat(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     work->mClrKeyFrame = work->mpEmtr->mTick % (shape->getClrAnmMaxFrm() + 1);
 }
 
-/* 80277240-8027727C 271B80 003C+00 0/0 1/1 0/0 .text
- * JPACalcClrIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcClrIdxRepeat(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 tick = shape->getClrLoopOfst(param_1->mAnmRandom);
@@ -190,8 +158,6 @@ void JPACalcClrIdxRepeat(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     work->mClrKeyFrame = tick % (shape->getClrAnmMaxFrm() + 1);
 }
 
-/* 8027727C-802772BC 271BBC 0040+00 0/0 1/1 0/0 .text JPACalcClrIdxReverse__FP18JPAEmitterWorkData
- */
 void JPACalcClrIdxReverse(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     int maxFrm = shape->getClrAnmMaxFrm();
@@ -202,8 +168,6 @@ void JPACalcClrIdxReverse(JPAEmitterWorkData* work) {
     work->mClrKeyFrame = tick + (uVar1) * (maxFrm - tick * 2);
 }
 
-/* 802772BC-80277308 271BFC 004C+00 0/0 1/1 0/0 .text
- * JPACalcClrIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcClrIdxReverse(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 tick = param_1->mAge + shape->getClrLoopOfst(param_1->mAnmRandom);
@@ -212,14 +176,10 @@ void JPACalcClrIdxReverse(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     work->mClrKeyFrame = rem + ((tick / maxFrm) & 1) * (maxFrm - rem * 2);
 }
 
-/* 80277308-80277314 271C48 000C+00 0/0 1/1 0/0 .text JPACalcClrIdxMerge__FP18JPAEmitterWorkData
- */
 void JPACalcClrIdxMerge(JPAEmitterWorkData* work) {
     work->mClrKeyFrame = 0;
 }
 
-/* 80277314-80277384 271C54 0070+00 0/0 1/1 0/0 .text
- * JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcClrIdxMerge(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 maxFrm = shape->getClrAnmMaxFrm() + 1;
@@ -227,14 +187,10 @@ void JPACalcClrIdxMerge(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     work->mClrKeyFrame = tick % maxFrm;
 }
 
-/* 80277384-80277390 271CC4 000C+00 0/0 1/1 0/0 .text JPACalcClrIdxRandom__FP18JPAEmitterWorkData
- */
 void JPACalcClrIdxRandom(JPAEmitterWorkData* work) {
     work->mClrKeyFrame = 0;
 }
 
-/* 80277390-802773C4 271CD0 0034+00 0/0 1/1 0/0 .text
- * JPACalcClrIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcClrIdxRandom(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 tick = shape->getClrLoopOfst(param_1->mAnmRandom);
@@ -242,58 +198,40 @@ void JPACalcClrIdxRandom(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     work->mClrKeyFrame = tick % maxFrm;
 }
 
-/* 802773C4-80277404 271D04 0040+00 0/0 1/1 0/0 .text            JPACalcPrm__FP18JPAEmitterWorkData
- */
 void JPACalcPrm(JPAEmitterWorkData* work) {
     work->mpRes->getBsp()->getPrmClr(work->mClrKeyFrame, &work->mpEmtr->mPrmClr);
 }
 
-/* 80277404-80277440 271D44 003C+00 0/0 1/1 0/0 .text
- * JPACalcPrm__FP18JPAEmitterWorkDataP15JPABaseParticle         */
 void JPACalcPrm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mpRes->getBsp()->getPrmClr(work->mClrKeyFrame, &ptcl->mPrmClr);
 }
 
-/* 80277440-80277480 271D80 0040+00 0/0 1/1 0/0 .text            JPACalcEnv__FP18JPAEmitterWorkData
- */
 void JPACalcEnv(JPAEmitterWorkData* work) {
     work->mpRes->getBsp()->getEnvClr(work->mClrKeyFrame, &work->mpEmtr->mEnvClr);
 }
 
-/* 80277480-802774BC 271DC0 003C+00 0/0 1/1 0/0 .text
- * JPACalcEnv__FP18JPAEmitterWorkDataP15JPABaseParticle         */
 void JPACalcEnv(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mpRes->getBsp()->getEnvClr(work->mClrKeyFrame, &ptcl->mEnvClr);
 }
 
-/* 802774BC-80277504 271DFC 0048+00 0/0 1/1 0/0 .text
- * JPACalcColorCopy__FP18JPAEmitterWorkDataP15JPABaseParticle   */
 void JPACalcColorCopy(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPABaseEmitter* emtr = work->mpEmtr;
     ptcl->mPrmClr = emtr->mPrmClr;
     ptcl->mEnvClr = emtr->mEnvClr;
 }
 
-/* 80277504-8027753C 271E44 0038+00 0/0 1/1 0/0 .text JPAGenTexCrdMtxIdt__FP18JPAEmitterWorkData
- */
 void JPAGenTexCrdMtxIdt(JPAEmitterWorkData* param_0) {
     GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY, GX_FALSE, GX_PTIDENTITY);
 }
 
-/* 8027753C-80277574 271E7C 0038+00 0/0 1/1 0/0 .text JPAGenTexCrdMtxAnm__FP18JPAEmitterWorkData
- */
 void JPAGenTexCrdMtxAnm(JPAEmitterWorkData* param_0) {
     GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_TEXMTX0, GX_FALSE, GX_PTIDENTITY);
 }
 
-/* 80277574-802775AC 271EB4 0038+00 0/0 1/1 0/0 .text JPAGenTexCrdMtxPrj__FP18JPAEmitterWorkData
- */
 void JPAGenTexCrdMtxPrj(JPAEmitterWorkData* param_0) {
     GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX3x4, GX_TG_POS, GX_TEXMTX0, GX_FALSE, GX_PTIDENTITY);
 }
 
-/* 802775AC-80277758 271EEC 01AC+00 0/0 1/1 0/0 .text
- * JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData               */
 void JPAGenCalcTexCrdMtxAnm(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     f32 dVar16 = work->mpEmtr->mTick;
@@ -325,8 +263,6 @@ void JPAGenCalcTexCrdMtxAnm(JPAEmitterWorkData* work) {
     GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x1e, false, 0x7d);
 }
 
-/* 80277758-802778EC 272098 0194+00 0/0 1/1 0/0 .text
- * JPALoadCalcTexCrdMtxAnm__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     f32 dVar16 = param_1->mAge;
@@ -357,25 +293,18 @@ void JPALoadCalcTexCrdMtxAnm(JPAEmitterWorkData* work, JPABaseParticle* param_1)
     GXLoadTexMtxImm(local_108, 0x1e, GX_MTX2x4);
 }
 
-/* 802778EC-80277940 27222C 0054+00 0/0 1/1 0/0 .text            JPALoadTex__FP18JPAEmitterWorkData
- */
 void JPALoadTex(JPAEmitterWorkData* work) {
     work->mpResMgr->load(work->mpRes->getTexIdx(work->mpRes->getBsp()->getTexIdx()), GX_TEXMAP0);
 }
 
-/* 80277940-80277990 272280 0050+00 0/0 1/1 0/0 .text JPALoadTexAnm__FP18JPAEmitterWorkData */
 void JPALoadTexAnm(JPAEmitterWorkData* work) {
     work->mpResMgr->load(work->mpRes->getTexIdx(work->mpEmtr->mTexAnmIdx), GX_TEXMAP0);
 }
 
-/* 80277990-802779DC 2722D0 004C+00 0/0 1/1 0/0 .text
- * JPALoadTexAnm__FP18JPAEmitterWorkDataP15JPABaseParticle      */
 void JPALoadTexAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mpResMgr->load(work->mpRes->getTexIdx(ptcl->mTexAnmIdx), GX_TEXMAP0);
 }
 
-/* 802779DC-80277A18 27231C 003C+00 0/0 1/1 0/0 .text JPACalcTexIdxNormal__FP18JPAEmitterWorkData
- */
 void JPACalcTexIdxNormal(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     u8 tick = shape->getTexAnmKeyNum() - 1 < work->mpEmtr->mTick
@@ -383,8 +312,6 @@ void JPACalcTexIdxNormal(JPAEmitterWorkData* work) {
     work->mpEmtr->mTexAnmIdx = shape->getTexIdx(tick);
 }
 
-/* 80277A18-80277A50 272358 0038+00 0/0 1/1 0/0 .text
- * JPACalcTexIdxNormal__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcTexIdxNormal(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     u8 tick = shape->getTexAnmKeyNum() - 1 < param_1->mAge
@@ -392,15 +319,11 @@ void JPACalcTexIdxNormal(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     param_1->mTexAnmIdx = shape->getTexIdx(tick);
 }
 
-/* 80277A50-80277A88 272390 0038+00 0/0 1/1 0/0 .text JPACalcTexIdxRepeat__FP18JPAEmitterWorkData
- */
 void JPACalcTexIdxRepeat(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     work->mpEmtr->mTexAnmIdx = shape->getTexIdx(work->mpEmtr->mTick % shape->getTexAnmKeyNum());
 }
 
-/* 80277A88-80277ACC 2723C8 0044+00 0/0 1/1 0/0 .text
- * JPACalcTexIdxRepeat__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcTexIdxRepeat(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     param_1->mTexAnmIdx = shape->getTexIdx(
@@ -408,8 +331,6 @@ void JPACalcTexIdxRepeat(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
             % shape->getTexAnmKeyNum());
 }
 
-/* 80277ACC-80277B1C 27240C 0050+00 0/0 1/1 0/0 .text JPACalcTexIdxReverse__FP18JPAEmitterWorkData
- */
 void JPACalcTexIdxReverse(JPAEmitterWorkData* work) {
     JPABaseShape* shape = work->mpRes->getBsp();
     int tick = work->mpEmtr->mTick;
@@ -419,8 +340,6 @@ void JPACalcTexIdxReverse(JPAEmitterWorkData* work) {
     work->mpEmtr->mTexAnmIdx = shape->getTexIdx(rem + (div & 1) * (keyNum - rem * 2));
 }
 
-/* 80277B1C-80277B78 27245C 005C+00 0/0 1/1 0/0 .text
- * JPACalcTexIdxReverse__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcTexIdxReverse(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 tick = shape->getTexLoopOfst(param_1->mAnmRandom) + param_1->mAge;
@@ -430,14 +349,10 @@ void JPACalcTexIdxReverse(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     param_1->mTexAnmIdx = shape->getTexIdx(rem + (div & 1) * (keyNum - rem * 2));
 }
 
-/* 80277B78-80277B94 2724B8 001C+00 0/0 1/1 0/0 .text JPACalcTexIdxMerge__FP18JPAEmitterWorkData
- */
 void JPACalcTexIdxMerge(JPAEmitterWorkData* work) {
     work->mpEmtr->mTexAnmIdx = work->mpRes->getBsp()->getTexIdx();
 }
 
-/* 80277B94-80277C0C 2724D4 0078+00 0/0 1/1 0/0 .text
- * JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcTexIdxMerge(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     s32 maxFrm = shape->getTexAnmKeyNum();
@@ -445,38 +360,30 @@ void JPACalcTexIdxMerge(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     param_1->mTexAnmIdx = shape->getTexIdx(tick % maxFrm);
 }
 
-/* 80277C0C-80277C28 27254C 001C+00 0/0 1/1 0/0 .text JPACalcTexIdxRandom__FP18JPAEmitterWorkData
- */
 void JPACalcTexIdxRandom(JPAEmitterWorkData* work) {
     work->mpEmtr->mTexAnmIdx = work->mpRes->getBsp()->getTexIdx();
 }
 
-/* 80277C28-80277C64 272568 003C+00 0/0 1/1 0/0 .text
- * JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcTexIdxRandom(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     JPABaseShape* shape = work->mpRes->getBsp();
     param_1->mTexAnmIdx = shape->getTexIdx(((int)shape->getTexLoopOfst(param_1->mAnmRandom))
         % shape->getTexAnmKeyNum());
 }
 
-/* 80277C64-80277C8C 2725A4 0028+00 0/0 1/1 0/0 .text JPALoadPosMtxCam__FP18JPAEmitterWorkData */
 void JPALoadPosMtxCam(JPAEmitterWorkData* work) {
     GXLoadPosMtxImm(work->mPosCamMtx, GX_PNMTX0);
 }
 
-/* 80277C8C-80277C90 2725CC 0004+00 1/0 0/0 0/0 .text noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf */
 static void noLoadPrj(JPAEmitterWorkData const* work, const Mtx srt) {
     /* empty function */
 }
 
-/* 80277C90-80277CC8 2725D0 0038+00 1/0 0/0 0/0 .text loadPrj__FPC18JPAEmitterWorkDataPA4_Cf */
 void loadPrj(JPAEmitterWorkData const* work, const Mtx srt) {
     Mtx mtx;
     MTXConcat(work->mPrjMtx, srt, mtx);
     GXLoadTexMtxImm(mtx, GX_TEXMTX0, GX_MTX3x4);
 }
 
-/* 80277CC8-80277E88 272608 01C0+00 1/0 0/0 0/0 .text loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf */
 static void loadPrjAnm(JPAEmitterWorkData const* work, const Mtx srt) {
     JPABaseShape* shape = work->mpRes->getBsp();
     f32 dVar16 = work->mpEmtr->getAge();
@@ -509,13 +416,11 @@ static void loadPrjAnm(JPAEmitterWorkData const* work, const Mtx srt) {
     GXLoadTexMtxImm(local_108, 0x1e, GX_MTX3x4);
 }
 
-/* 803C42E0-803C4300 021400 0020+00 10/9 0/0 0/0 .data            jpa_dl */
 static u8 jpa_dl[32] = {
     0x80, 0x00, 0x04, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803C4300-803C4320 021420 0020+00 1/0 0/0 0/0 .data            jpa_dl_x */
 static u8 jpa_dl_x[32] = {
     0x80, 0x00, 0x08, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x48, 0x00, 0x49, 0x01, 0x4A,
     0x02, 0x4B, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -523,15 +428,12 @@ static u8 jpa_dl_x[32] = {
 
 typedef void (*projectionFunc)(JPAEmitterWorkData const*, const Mtx);
 
-/* 803C4320-803C432C -00001 000C+00 6/10 0/0 0/0 .data            p_prj */
 static projectionFunc p_prj[3] = {
     noLoadPrj,
     loadPrj,
     loadPrjAnm,
 };
 
-/* 80277E88-80277F70 2727C8 00E8+00 0/0 1/1 0/0 .text
- * JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle   */
 void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_48;
@@ -555,8 +457,6 @@ void JPADrawBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     }
 }
 
-/* 80277F70-80278088 2728B0 0118+00 0/0 1/1 0/0 .text
- * JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_48;
@@ -585,8 +485,6 @@ void JPADrawRotBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     }
 }
 
-/* 80278088-80278184 2729C8 00FC+00 0/0 1/1 0/0 .text
- * JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle  */
 void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
      if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_48;
@@ -611,8 +509,6 @@ void JPADrawYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     }
 }
 
-/* 80278184-802782B4 272AC4 0130+00 0/0 1/1 0/0 .text
- * JPADrawRotYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_48;
@@ -644,37 +540,27 @@ void JPADrawRotYBillboard(JPAEmitterWorkData* work, JPABaseParticle* param_1) {
     }
 }
 
-/* 802782B4-802782D0 272BF4 001C+00 1/0 0/0 0/0 .text
- * dirTypeVel__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3<f> */
 void dirTypeVel(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
                     JGeometry::TVec3<f32>* param_2) {
     param_1->getVelVec(*param_2);
 }
 
-/* 802782D0-802782EC 272C10 001C+00 1/0 0/0 0/0 .text
- * dirTypePos__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3<f> */
 void dirTypePos(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
                     JGeometry::TVec3<f32>* param_2) {
     param_1->getLocalPosition(*param_2);
 }
 
-/* 802782EC-80278320 272C2C 0034+00 1/0 0/0 0/0 .text
- * dirTypePosInv__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3<f> */
 void dirTypePosInv(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
                     JGeometry::TVec3<f32>* param_2) {
     param_1->getLocalPosition(*param_2);
     param_2->negate();
 }
 
-/* 80278320-8027833C 272C60 001C+00 1/0 0/0 0/0 .text
- * dirTypeEmtrDir__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3<f> */
 void dirTypeEmtrDir(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
                     JGeometry::TVec3<f32>* param_2) {
     param_2->set(work->mGlobalEmtrDir);
 }
 
-/* 8027833C-802783D4 272C7C 0098+00 1/0 0/0 0/0 .text
- * dirTypePrevPtcl__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3<f> */
 void dirTypePrevPtcl(JPAEmitterWorkData const* work, JPABaseParticle const* param_1,
                     JGeometry::TVec3<f32>* param_2) {
     JGeometry::TVec3<f32> aTStack_24;
@@ -691,7 +577,6 @@ void dirTypePrevPtcl(JPAEmitterWorkData const* work, JPABaseParticle const* para
     param_2->sub(aTStack_24);
 }
 
-/* 802783D4-80278414 272D14 0040+00 1/0 0/0 0/0 .text            rotTypeY__FffRA3_A4_f */
 static void rotTypeY(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[0][0] = param_1;
     param_2[0][1] = 0.0f;
@@ -707,7 +592,6 @@ static void rotTypeY(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[2][3] = 0.0f;
 }
 
-/* 80278414-80278454 272D54 0040+00 1/0 0/0 0/0 .text            rotTypeX__FffRA3_A4_f */
 static void rotTypeX(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[0][0] = 1.0f;
     param_2[0][1] = 0.0f;
@@ -723,7 +607,6 @@ static void rotTypeX(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[2][3] = 0.0f;
 }
 
-/* 80278454-80278494 272D94 0040+00 1/0 0/0 0/0 .text            rotTypeZ__FffRA3_A4_f */
 static void rotTypeZ(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[0][0] = param_1;
     param_2[0][1] = -param_0;
@@ -739,7 +622,6 @@ static void rotTypeZ(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[2][3] = 0.0f;
 }
 
-/* 80278494-802784F0 272DD4 005C+00 1/0 0/0 0/0 .text            rotTypeXYZ__FffRA3_A4_f */
 static void rotTypeXYZ(f32 param_0, f32 param_1, Mtx& param_2) {
     f32 f3 = 0.33333298563957214f * (1.0f - param_1);
     f32 fVar1;
@@ -761,7 +643,6 @@ static void rotTypeXYZ(f32 param_0, f32 param_1, Mtx& param_2) {
     param_2[2][3] = 0.0f;
 }
 
-/* 802784F0-8027853C 272E30 004C+00 1/0 0/0 0/0 .text            basePlaneTypeXY__FPA4_fff */
 static void basePlaneTypeXY(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[0][0] *= param_1;
     param_0[1][0] *= param_1;
@@ -771,7 +652,6 @@ static void basePlaneTypeXY(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[2][1] *= param_2;
 }
 
-/* 8027853C-80278588 272E7C 004C+00 1/0 0/0 0/0 .text            basePlaneTypeXZ__FPA4_fff */
 static void basePlaneTypeXZ(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[0][0] *= param_1;
     param_0[1][0] *= param_1;
@@ -781,7 +661,6 @@ static void basePlaneTypeXZ(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[2][2] *= param_2;
 }
 
-/* 80278588-802785F8 272EC8 0070+00 1/0 0/0 0/0 .text            basePlaneTypeX__FPA4_fff */
 static void basePlaneTypeX(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[0][0] *= param_1;
     param_0[1][0] *= param_1;
@@ -794,7 +673,6 @@ static void basePlaneTypeX(MtxP param_0, f32 param_1, f32 param_2) {
     param_0[2][2] *= param_1;
 }
 
-/* 803C432C-803C4340 -00001 0014+00 2/5 0/0 0/0 .data            p_direction */
 typedef void (*dirTypeFunc)(JPAEmitterWorkData const*, JPABaseParticle const*,
                             JGeometry::TVec3<f32>*);
 static dirTypeFunc p_direction[5] = {
@@ -802,7 +680,6 @@ static dirTypeFunc p_direction[5] = {
     dirTypeEmtrDir, dirTypePrevPtcl,
 };
 
-/* 803C4340-803C4354 -00001 0014+00 0/2 0/0 0/0 .data            p_rot */
 typedef void (*rotTypeFunc)(f32, f32, Mtx&);
 #pragma push
 #pragma force_active on
@@ -812,7 +689,6 @@ static rotTypeFunc p_rot[5] = {
 };
 #pragma pop
 
-/* 803C4354-803C4360 -00001 000C+00 0/3 0/0 0/0 .data            p_plane */
 
 typedef void (*planeFunc)(MtxP, f32, f32);
 
@@ -822,14 +698,11 @@ static planeFunc p_plane[3] = {
     basePlaneTypeX,
 };
 
-/* 804507A0-804507A8 -00001 0008+00 3/3 0/0 0/0 .sdata           p_dl */
 static u8* p_dl[2] = {
     jpa_dl,
     jpa_dl_x,
 };
 
-/* 802785F8-80278994 272F38 039C+00 0/0 1/1 0/0 .text
- * JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle   */
 void JPADrawDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_6c;
@@ -867,8 +740,6 @@ void JPADrawDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     }
 }
 
-/* 80278994-80278DA8 2732D4 0414+00 0/0 1/1 0/0 .text
- * JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPADrawRotDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         f32 sinRot = JMASSin(param_1->mRotateAngle);
@@ -911,8 +782,6 @@ void JPADrawRotDirection(JPAEmitterWorkData* param_0, JPABaseParticle* param_1)
     }
 }
 
-/* 80278DA8-80278FC8 2736E8 0220+00 0/0 1/1 0/0 .text
- * JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle  */
 void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_70;
@@ -948,8 +817,6 @@ void JPADrawDBillboard(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     }
 }
 
-/* 80278FC8-80279110 273908 0148+00 0/0 1/1 0/0 .text
- * JPADrawRotation__FP18JPAEmitterWorkDataP15JPABaseParticle    */
 void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         f32 sinRot = JMASSin(param_1->mRotateAngle);
@@ -969,8 +836,6 @@ void JPADrawRotation(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     }
 }
 
-/* 80279110-802791B0 273A50 00A0+00 0/0 1/1 0/0 .text
- * JPADrawPoint__FP18JPAEmitterWorkDataP15JPABaseParticle       */
 void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (!!(ptcl->mStatus & JPAPtclStts_Invisible))
         return;
@@ -985,8 +850,6 @@ void JPADrawPoint(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
 }
 
-/* 802791B0-80279364 273AF0 01B4+00 0/0 1/1 0/0 .text
- * JPADrawLine__FP18JPAEmitterWorkDataP15JPABaseParticle        */
 void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     if (param_1->checkStatus(8) == 0) {
         JGeometry::TVec3<f32> local_1c;
@@ -1010,19 +873,16 @@ void JPADrawLine(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) {
     }
 }
 
-/* 80279364-8027936C 273CA4 0008+00 2/2 0/0 0/0 .text getNext__FP26JPANode<15JPABaseParticle> */
 JPANode<JPABaseParticle>* getNext(JPANode<JPABaseParticle>* param_0) {
     return param_0->getNext();
 }
 
-/* 8027936C-80279374 273CAC 0008+00 2/2 0/0 0/0 .text getPrev__FP26JPANode<15JPABaseParticle> */
 JPANode<JPABaseParticle>* getPrev(JPANode<JPABaseParticle>* param_0) {
     return param_0->getPrev();
 }
 
 typedef JPANode<JPABaseParticle>* (*getNodeFunc)(JPANode<JPABaseParticle>*);
 
-/* 80279374-8027996C 273CB4 05F8+00 0/0 1/1 0/0 .text JPADrawStripe__FP18JPAEmitterWorkData */
 void JPADrawStripe(JPAEmitterWorkData* param_0) {
     JPABaseShape* shape = param_0->mpRes->getBsp();
     u32 ptcl_num = param_0->mpAlivePtcl->getNum();
@@ -1109,7 +969,6 @@ void JPADrawStripe(JPAEmitterWorkData* param_0) {
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
 }
 
-/* 8027996C-8027A3D8 2742AC 0A6C+00 0/0 1/1 0/0 .text JPADrawStripeX__FP18JPAEmitterWorkData */
 void JPADrawStripeX(JPAEmitterWorkData* param_0) {
     JPABaseShape* shape = param_0->mpRes->getBsp();
     u32 ptcl_num = param_0->mpAlivePtcl->getNum();
@@ -1249,8 +1108,6 @@ void JPADrawStripeX(JPAEmitterWorkData* param_0) {
     GXSetVtxDesc(GX_VA_TEX0, GX_INDEX8);
 }
 
-/* 8027A3D8-8027A414 274D18 003C+00 0/0 1/1 0/0 .text
- * JPADrawEmitterCallBackB__FP18JPAEmitterWorkData              */
 void JPADrawEmitterCallBackB(JPAEmitterWorkData* work) {
     if (work->mpEmtr->mpEmtrCallBack == NULL)
         return;
@@ -1258,8 +1115,6 @@ void JPADrawEmitterCallBackB(JPAEmitterWorkData* work) {
     work->mpEmtr->mpEmtrCallBack->draw(work->mpEmtr);
 }
 
-/* 8027A414-8027A454 274D54 0040+00 0/0 1/1 0/0 .text
- * JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (work->mpEmtr->mpPtclCallBack == NULL)
         return;
@@ -1267,8 +1122,6 @@ void JPADrawParticleCallBack(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mpEmtr->mpPtclCallBack->draw(work->mpEmtr, ptcl);
 }
 
-/* 8027A454-8027A6DC 274D94 0288+00 1/1 0/0 0/0 .text
- * makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap */
 static void makeColorTable(GXColor** o_color_table, JPAClrAnmKeyData const* i_data, u8 param_2,
                            s16 i_size, JKRHeap* i_heap) {
     GXColor* color_table = (GXColor*)JKRAllocFromHeap(i_heap, (i_size + 1) * 4, 4);
@@ -1310,8 +1163,6 @@ static void makeColorTable(GXColor** o_color_table, JPAClrAnmKeyData const* i_da
     *o_color_table = color_table;
 }
 
-/* 8027A6DC-8027A7E8 27501C 010C+00 0/0 1/1 0/0 .text            __ct__12JPABaseShapeFPCUcP7JKRHeap
- */
 JPABaseShape::JPABaseShape(u8 const* pData, JKRHeap* pHeap) {
     mpData = (const JPABaseShapeData*)pData;
 
@@ -1345,33 +1196,28 @@ JPABaseShape::JPABaseShape(u8 const* pData, JKRHeap* pHeap) {
     }
 }
 
-/* 803C4360-803C436C 021480 000C+00 0/1 0/0 0/0 .data            st_bm__12JPABaseShape */
 GXBlendMode JPABaseShape::st_bm[3] = {
     GX_BM_NONE,
     GX_BM_BLEND,
     GX_BM_LOGIC,
 };
 
-/* 803C436C-803C4394 02148C 0028+00 0/1 0/0 0/0 .data            st_bf__12JPABaseShape */
 GXBlendFactor JPABaseShape::st_bf[10] = {
     GX_BL_ZERO,      GX_BL_ONE,           GX_BL_SRCCLR, GX_BL_INVSRCCLR,
     GX_BL_DSTCLR, GX_BL_INVDSTCLR, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
     GX_BL_DSTALPHA, GX_BL_INVDSTALPHA,
 };
 
-/* 803C4394-803C43D4 0214B4 0040+00 0/1 0/0 0/0 .data            st_lo__12JPABaseShape */
 GXLogicOp JPABaseShape::st_lo[16] = {
     GX_LO_CLEAR,   GX_LO_SET,     GX_LO_COPY,   GX_LO_INVCOPY, GX_LO_NOOP, GX_LO_INV,
     GX_LO_AND,     GX_LO_NAND,    GX_LO_OR,     GX_LO_NOR,      GX_LO_XOR,  GX_LO_EQUIV,
     GX_LO_REVAND, GX_LO_INVAND, GX_LO_REVOR, GX_LO_INVOR,
 };
 
-/* 803C43D4-803C43F4 0214F4 0020+00 0/1 0/0 0/0 .data            st_c__12JPABaseShape */
 GXCompare JPABaseShape::st_c[8] = {
     GX_NEVER, GX_LESS, GX_LEQUAL, GX_EQUAL, GX_NEQUAL, GX_GEQUAL, GX_GREATER, GX_ALWAYS,
 };
 
-/* 803C43F4-803C4404 021514 0010+00 0/1 0/0 0/0 .data            st_ao__12JPABaseShape */
 GXAlphaOp JPABaseShape::st_ao[4] = {
     GX_AOP_AND,
     GX_AOP_OR,
@@ -1379,7 +1225,6 @@ GXAlphaOp JPABaseShape::st_ao[4] = {
     GX_AOP_XNOR,
 };
 
-/* 803C4404-803C4464 021524 0060+00 0/1 0/0 0/0 .data            st_ca__12JPABaseShape */
 GXTevColorArg JPABaseShape::st_ca[6][4] = {
     {
         GX_CC_ZERO,
@@ -1419,7 +1264,6 @@ GXTevColorArg JPABaseShape::st_ca[6][4] = {
     },
 };
 
-/* 803C4464-803C4488 021584 0020+04 0/1 0/0 0/0 .data            st_aa__12JPABaseShape */
 GXTevAlphaArg JPABaseShape::st_aa[2][4] = {
     {
         GX_CA_ZERO,
@@ -1435,8 +1279,6 @@ GXTevAlphaArg JPABaseShape::st_aa[2][4] = {
     },
 };
 
-/* 8027A7E8-8027A918 275128 0130+00 0/0 1/1 0/0 .text setGX__12JPABaseShapeCFP18JPAEmitterWorkData
- */
 void JPABaseShape::setGX(JPAEmitterWorkData* work) const {
     const GXTevColorArg* colorArg = getTevColorArg();
     const GXTevAlphaArg* alphaArg = getTevAlphaArg();
diff --git a/src/JSystem/JParticle/JPAChildShape.cpp b/src/JSystem/JParticle/JPAChildShape.cpp
index 3f26bd5313..906c1f1c1b 100644
--- a/src/JSystem/JParticle/JPAChildShape.cpp
+++ b/src/JSystem/JParticle/JPAChildShape.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAChildShape
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAChildShape.h"
@@ -11,8 +6,6 @@
 #include "dolphin/gx.h"
 #include "dolphin/os.h"
 
-/* 8027AEBC-8027AFDC 2757FC 0120+00 0/0 1/1 0/0 .text JPARegistChildPrmEnv__FP18JPAEmitterWorkData
- */
 void JPARegistChildPrmEnv(JPAEmitterWorkData* work) {
     JPAChildShape* csp = work->mpRes->getCsp();
     JPABaseEmitter* emtr = work->mpEmtr;
@@ -30,21 +23,16 @@ void JPARegistChildPrmEnv(JPAEmitterWorkData* work) {
     GXSetTevColor(GX_TEVREG1, env);
 }
 
-/* 8027AFDC-8027B008 27591C 002C+00 0/0 1/1 0/0 .text
- * JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcChildAlphaOut(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     f32 anm = (1.0f - ptcl->mTime) * 255.0f;
     OSf32tou8(&anm, &ptcl->mPrmColorAlphaAnm);
 }
 
-/* 8027B008-8027B038 275948 0030+00 0/0 1/1 0/0 .text
- * JPACalcChildScaleOut__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcChildScaleOut(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     ptcl->mParticleScaleX = ptcl->mScaleOut * (1.0f - ptcl->mTime);
     ptcl->mParticleScaleY = ptcl->mAlphaWaveRandom * (1.0f - ptcl->mTime);
 }
 
-/* 8027B038-8027B040 -00001 0008+00 0/0 0/0 0/0 .text            __ct__13JPAChildShapeFPCUc */
 JPAChildShape::JPAChildShape(u8 const* pData) {
     mpData = (JPAChildShapeData*)pData;
 }
diff --git a/src/JSystem/JParticle/JPADynamicsBlock.cpp b/src/JSystem/JParticle/JPADynamicsBlock.cpp
index 2c2baab133..2a0616f5d1 100644
--- a/src/JSystem/JParticle/JPADynamicsBlock.cpp
+++ b/src/JSystem/JParticle/JPADynamicsBlock.cpp
@@ -1,15 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPADynamicsBlock
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPADynamicsBlock.h"
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JParticle/JPAEmitter.h"
 
-/* 8027B144-8027B220 275A84 00DC+00 1/1 0/0 0/0 .text JPAVolumePoint__FP18JPAEmitterWorkData */
 void JPAVolumePoint(JPAEmitterWorkData* work) {
     work->mVolumeCalcData.mVolumePos.zero();
     work->mVolumeCalcData.mVelOmni.set(work->mpEmtr->get_r_zh(), work->mpEmtr->get_r_zh(),
@@ -18,7 +12,6 @@ void JPAVolumePoint(JPAEmitterWorkData* work) {
                                        work->mVolumeCalcData.mVelOmni.z);
 }
 
-/* 8027B220-8027B33C 275B60 011C+00 1/1 0/0 0/0 .text JPAVolumeLine */
 void JPAVolumeLine(JPAEmitterWorkData* work) {
     if (work->mpEmtr->checkFlag(JPADynFlag_FixedInterval)) {
         work->mVolumeCalcData.mVolumePos.set(
@@ -35,7 +28,6 @@ void JPAVolumeLine(JPAEmitterWorkData* work) {
     work->mVolumeCalcData.mVelAxis.set(0.0f, 0.0f, work->mVolumeCalcData.mVolumePos.z);
 }
 
-/* 8027B33C-8027B4E8 275C7C 01AC+00 1/1 0/0 0/0 .text JPAVolumeCircle */
 // NONMATCHING regalloc. Could be issue with mul asm implementations
 void JPAVolumeCircle(JPAEmitterWorkData* work) {
     s16 theta;
@@ -62,7 +54,6 @@ void JPAVolumeCircle(JPAEmitterWorkData* work) {
                                        work->mVolumeCalcData.mVolumePos.z);
 }
 
-/* 8027B4E8-8027B5F0 275E28 0108+00 1/1 0/0 0/0 .text JPAVolumeCube */
 void JPAVolumeCube(JPAEmitterWorkData* work) {
     work->mVolumeCalcData.mVolumePos.set(work->mpEmtr->get_r_zh() * work->mVolumeSize,
                          work->mpEmtr->get_r_zh() * work->mVolumeSize,
@@ -71,7 +62,6 @@ void JPAVolumeCube(JPAEmitterWorkData* work) {
     work->mVolumeCalcData.mVelAxis.set(work->mVolumeCalcData.mVolumePos.x, 0.0f, work->mVolumeCalcData.mVolumePos.z);
 }
 
-/* 8027B5F0-8027B87C 275F30 028C+00 1/1 0/0 0/0 .text JPAVolumeSphere__FP18JPAEmitterWorkData */
 static void JPAVolumeSphere(JPAEmitterWorkData* work) {
     s16 phi, theta;
     if (work->mpEmtr->checkFlag(JPADynFlag_FixedInterval)) {
@@ -106,7 +96,6 @@ static void JPAVolumeSphere(JPAEmitterWorkData* work) {
                                        work->mVolumeCalcData.mVolumePos.z);
 }
 
-/* 8027B87C-8027B9F8 2761BC 017C+00 1/1 0/0 0/0 .text JPAVolumeCylinder__FP18JPAEmitterWorkData */
 static void JPAVolumeCylinder(JPAEmitterWorkData* work) {
     s16 theta = work->mVolumeSweep * work->mpEmtr->get_r_ss();
     f32 rnd = work->mpEmtr->get_r_f();
@@ -121,7 +110,6 @@ static void JPAVolumeCylinder(JPAEmitterWorkData* work) {
                                        work->mVolumeCalcData.mVolumePos.z);
 }
 
-/* 8027B9F8-8027BB18 276338 0120+00 1/1 0/0 0/0 .text JPAVolumeTorus__FP18JPAEmitterWorkData */
 static void JPAVolumeTorus(JPAEmitterWorkData* work) {
     s16 theta = work->mVolumeSweep * work->mpEmtr->get_r_ss();
     s16 phi = work->mpEmtr->get_r_ss();
@@ -135,7 +123,6 @@ static void JPAVolumeTorus(JPAEmitterWorkData* work) {
     work->mVolumeCalcData.mVelOmni.mul(work->mVolumeCalcData.mVolumePos, work->mGlobalScl);
 }
 
-/* 8027BB18-8027BB4C 276458 0034+00 0/0 1/1 0/0 .text            __ct__16JPADynamicsBlockFPCUc */
 JPADynamicsBlock::JPADynamicsBlock(u8 const* data) {
     mpData = (const JPADynamicsBlockData*)data;
     init();
@@ -151,7 +138,6 @@ enum {
     VOL_Line = 0x06,
 };
 
-/* 8027BB4C-8027BBE8 27648C 009C+00 2/1 0/0 0/0 .text            init__16JPADynamicsBlockFv */
 void JPADynamicsBlock::init() {
     switch (getVolumeType()) {
     case VOL_Cube:
@@ -178,8 +164,6 @@ void JPADynamicsBlock::init() {
     }
 }
 
-/* 8027BBE8-8027BDEC 276528 0204+00 0/0 1/1 0/0 .text
- * create__16JPADynamicsBlockFP18JPAEmitterWorkData             */
 void JPADynamicsBlock::create(JPAEmitterWorkData* work) {
     if (work->mpEmtr->checkStatus(JPAEmtrStts_RateStepEmit)) {
         s32 emitCount;
diff --git a/src/JSystem/JParticle/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp
index ef34168adb..1972c4f4a1 100644
--- a/src/JSystem/JParticle/JPAEmitter.cpp
+++ b/src/JSystem/JParticle/JPAEmitter.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAEmitter
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAEmitter.h"
@@ -12,12 +7,9 @@
 #include "JSystem/JParticle/JPABaseShape.h"
 #include "dolphin/types.h"
 
-/* 8027E6A4-8027E6EC 278FE4 0048+00 0/0 14/14 16/16 .text            __dt__18JPAEmitterCallBackFv */
 JPAEmitterCallBack::~JPAEmitterCallBack() {
 }
 
-/* 8027E6EC-8027EA40 27902C 0354+00 0/0 1/1 0/0 .text
- * init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource    */
 void JPABaseEmitter::init(JPAEmitterManager* param_0, JPAResource* param_1) {
     mpEmtrMgr = param_0;
     mpRes = param_1;
@@ -65,8 +57,6 @@ void JPABaseEmitter::init(JPAEmitterManager* param_0, JPAResource* param_1) {
     mTexAnmIdx = 0;
 }
 
-/* 8027EA40-8027EB60 279380 0120+00 0/0 3/3 0/0 .text            createParticle__14JPABaseEmitterFv
- */
 JPABaseParticle* JPABaseEmitter::createParticle() {
     if (mpPtclPool->getNum() != 0) {
         JPANode<JPABaseParticle>* node = mpPtclPool->pop_front();
@@ -79,8 +69,6 @@ JPABaseParticle* JPABaseEmitter::createParticle() {
     return NULL;
 }
 
-/* 8027EB60-8027EC60 2794A0 0100+00 0/0 1/1 0/0 .text
- * createChild__14JPABaseEmitterFP15JPABaseParticle             */
 JPABaseParticle* JPABaseEmitter::createChild(JPABaseParticle* parent) {
     if (mpPtclPool->getNum() != 0) {
         JPANode<JPABaseParticle>* node = mpPtclPool->pop_front();
@@ -92,7 +80,6 @@ JPABaseParticle* JPABaseEmitter::createChild(JPABaseParticle* parent) {
     return NULL;
 }
 
-/* 8027EC60-8027EDD4 2795A0 0174+00 0/0 2/2 21/21 .text deleteAllParticle__14JPABaseEmitterFv */
 void JPABaseEmitter::deleteAllParticle() {
     while (mAlivePtclBase.getNum())
         mpPtclPool->push_front(mAlivePtclBase.pop_back());
@@ -100,7 +87,6 @@ void JPABaseEmitter::deleteAllParticle() {
         mpPtclPool->push_front(mAlivePtclChld.pop_back());
 }
 
-/* 8027EDD4-8027EE14 279714 0040+00 0/0 1/1 0/0 .text processTillStartFrame__14JPABaseEmitterFv */
 bool JPABaseEmitter::processTillStartFrame() {
     JPADynamicsBlock* dyn = mpRes->getDyn();
     s16 startFrame = dyn->getStartFrame();
@@ -114,7 +100,6 @@ bool JPABaseEmitter::processTillStartFrame() {
     return false;
 }
 
-/* 8027EE14-8027EEB0 279754 009C+00 0/0 1/1 0/0 .text processTermination__14JPABaseEmitterFv */
 bool JPABaseEmitter::processTermination() {
     if (checkStatus(0x100)) {
         return true;
@@ -137,8 +122,6 @@ bool JPABaseEmitter::processTermination() {
     return false;
 }
 
-/* 8027EEB0-8027EF30 2797F0 0080+00 0/0 1/1 0/0 .text
- * calcEmitterGlobalPosition__14JPABaseEmitterCFPQ29JGeometry8TVec3<f> */
 void JPABaseEmitter::calcEmitterGlobalPosition(JGeometry::TVec3<f32>* dst) const {
     Mtx mtx;
     MTXScale(mtx, mGlobalScl.x, mGlobalScl.y, mGlobalScl.z);
@@ -149,20 +132,14 @@ void JPABaseEmitter::calcEmitterGlobalPosition(JGeometry::TVec3<f32>* dst) const
     MTXMultVec(mtx, mLocalTrs, *dst);
 }
 
-/* 8027EF30-8027EF40 279870 0010+00 0/0 1/1 0/0 .text getCurrentCreateNumber__14JPABaseEmitterCFv
- */
 u32 JPABaseEmitter::getCurrentCreateNumber() const {
     return mpEmtrMgr->pWd->mEmitCount;
 }
 
-/* 8027EF40-8027EF50 279880 0010+00 0/0 3/3 0/0 .text            getDrawCount__14JPABaseEmitterCFv
- */
 u8 JPABaseEmitter::getDrawCount() const {
     return mpEmtrMgr->pWd->mDrawCount;
 }
 
-/* 8027EF50-8027EFA4 279890 0054+00 0/0 1/1 0/0 .text
- * loadTexture__14JPABaseEmitterFUc11_GXTexMapID                */
 bool JPABaseEmitter::loadTexture(u8 idx, GXTexMapID texMapID) {
     mpEmtrMgr->pWd->mpResMgr->load(mpRes->getTexIdx(idx), texMapID);
     return true;
diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp
index adad4698e8..8a61d9f4dc 100644
--- a/src/JSystem/JParticle/JPAEmitterManager.cpp
+++ b/src/JSystem/JParticle/JPAEmitterManager.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAEmitterManager
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAEmitterManager.h"
@@ -13,8 +8,6 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "dolphin/gx.h"
 
-/* 8027DCA0-8027DEBC 2785E0 021C+00 0/0 1/1 0/0 .text __ct__17JPAEmitterManagerFUlUlP7JKRHeapUcUc
- */
 JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHeap, u8 i_gidMax,
                                      u8 i_ridMax) {
     emtrNum = i_emtrNum;
@@ -80,7 +73,6 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3<f32> c
     return NULL;
 }
 
-/* 8027DFA0-8027E028 2788E0 0088+00 0/0 3/3 0/0 .text            calc__17JPAEmitterManagerFUc */
 void JPAEmitterManager::calc(u8 group_id) {
     JUT_ASSERT(154, group_id < gidMax);
     JSULink<JPABaseEmitter>* pNext = NULL;
@@ -95,8 +87,6 @@ void JPAEmitterManager::calc(u8 group_id) {
     }
 }
 
-/* 8027E028-8027E220 278968 01F8+00 0/0 1/1 0/0 .text draw__17JPAEmitterManagerFPC11JPADrawInfoUc
- */
 void JPAEmitterManager::draw(JPADrawInfo const* drawInfo, u8 group_id) {
     JUT_ASSERT(192, group_id < gidMax);
     drawInfo->getCamMtx(pWd->mPosCamMtx);
@@ -133,23 +123,17 @@ void JPAEmitterManager::draw(JPADrawInfo const* drawInfo, u8 group_id) {
     }
 }
 
-/* 8027E220-8027E278 278B60 0058+00 0/0 1/1 0/0 .text forceDeleteAllEmitter__17JPAEmitterManagerFv
- */
 void JPAEmitterManager::forceDeleteAllEmitter() {
     for (u8 i = 0; i < gidMax; i++)
         forceDeleteGroupEmitter(i);
 }
 
-/* 8027E278-8027E2D8 278BB8 0060+00 1/1 0/0 0/0 .text
- * forceDeleteGroupEmitter__17JPAEmitterManagerFUc              */
 void JPAEmitterManager::forceDeleteGroupEmitter(u8 group_id) {
     JUT_ASSERT(288, group_id < gidMax);
     while (pEmtrUseList[group_id].getNumLinks())
         forceDeleteEmitter(pEmtrUseList[group_id].getLast()->getObject());
 }
 
-/* 8027E2D8-8027E344 278C18 006C+00 3/3 1/1 0/0 .text
- * forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter    */
 void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
     emtr->deleteAllParticle();
     emtr->setStatus(0x300);
@@ -157,8 +141,6 @@ void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
     mFreeEmtrList.prepend(&emtr->mLink);
 }
 
-/* 8027E344-8027E354 278C84 0010+00 0/0 2/2 0/0 .text
- * entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc */
 void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resMgrID) {
     JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == NULL,
                      "res_id %d res_id_max %d array[%d] = %x", resMgrID, ridMax, resMgrID,
@@ -166,8 +148,6 @@ void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resM
     pResMgrAry[resMgrID] = resMgr;
 }
 
-/* 8027E354-8027E3F4 278C94 00A0+00 0/0 1/1 0/0 .text clearResourceManager__17JPAEmitterManagerFUc
- */
 void JPAEmitterManager::clearResourceManager(u8 res_mgr_id) {
     JUT_ASSERT(339, res_mgr_id < ridMax);
     for (u8 i = 0; i < gidMax; i++) {
@@ -184,8 +164,6 @@ void JPAEmitterManager::clearResourceManager(u8 res_mgr_id) {
     pResMgrAry[res_mgr_id] = NULL;
 }
 
-/* 8027E3F4-8027E51C 278D34 0128+00 1/1 0/0 0/0 .text            calcYBBCam__17JPAEmitterManagerFv
- */
 void JPAEmitterManager::calcYBBCam() {
     JGeometry::TVec3<float> v(0.0f, pWd->mPosCamMtx[1][1], pWd->mPosCamMtx[2][1]);
     JUT_ASSERT(367, !v.isZero());
diff --git a/src/JSystem/JParticle/JPAExTexShape.cpp b/src/JSystem/JParticle/JPAExTexShape.cpp
index adf76ba905..79e3c5a339 100644
--- a/src/JSystem/JParticle/JPAExTexShape.cpp
+++ b/src/JSystem/JParticle/JPAExTexShape.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAExTexShape
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAExTexShape.h"
@@ -10,7 +5,6 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "dolphin/gx.h"
 
-/* 8027B040-8027B13C 275980 00FC+00 0/0 1/1 0/0 .text JPALoadExTex__FP18JPAEmitterWorkData */
 void JPALoadExTex(JPAEmitterWorkData* work) {
     JPAExTexShape* ets = work->mpRes->getEts();
 
@@ -31,7 +25,6 @@ void JPALoadExTex(JPAEmitterWorkData* work) {
     }
 }
 
-/* 8027B13C-8027B144 -00001 0008+00 0/0 0/0 0/0 .text            __ct__13JPAExTexShapeFPCUc */
 JPAExTexShape::JPAExTexShape(u8 const* data) {
     mpData = (const JPAExTexShapeData*)data;
 }
diff --git a/src/JSystem/JParticle/JPAExtraShape.cpp b/src/JSystem/JParticle/JPAExtraShape.cpp
index 548dad37af..49eed254cb 100644
--- a/src/JSystem/JParticle/JPAExtraShape.cpp
+++ b/src/JSystem/JParticle/JPAExtraShape.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAExtraShape
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAExtraShape.h"
@@ -11,8 +6,6 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "dolphin/os.h"
 
-/* 8027A918-8027A990 275258 0078+00 0/0 1/1 0/0 .text
- * JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle      */
 void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     if (work->mScaleAnm < esp->getScaleInTiming()) {
@@ -27,8 +20,6 @@ void JPACalcScaleX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     }
 }
 
-/* 8027A990-8027AA08 2752D0 0078+00 0/0 1/1 0/0 .text
- * JPACalcScaleY__FP18JPAEmitterWorkDataP15JPABaseParticle      */
 void JPACalcScaleY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     if (work->mScaleAnm < esp->getScaleInTiming()) {
@@ -43,35 +34,25 @@ void JPACalcScaleY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     }
 }
 
-/* 8027AA08-8027AA14 275348 000C+00 0/0 1/1 0/0 .text
- * JPACalcScaleCopy__FP18JPAEmitterWorkDataP15JPABaseParticle   */
 void JPACalcScaleCopy(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     ptcl->mParticleScaleY = ptcl->mParticleScaleX;
 }
 
-/* 8027AA14-8027AA20 275354 000C+00 0/0 1/1 0/0 .text
- * JPACalcScaleAnmNormal__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcScaleAnmNormal(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mScaleAnm = ptcl->mTime;
 }
 
-/* 8027AA20-8027AA84 275360 0064+00 0/0 1/1 0/0 .text
- * JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcScaleAnmRepeatX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     work->mScaleAnm = (ptcl->mAge % esp->getScaleAnmCycleX()) / (f32)esp->getScaleAnmCycleX();
 }
 
-/* 8027AA84-8027AAE8 2753C4 0064+00 0/0 1/1 0/0 .text
- * JPACalcScaleAnmRepeatY__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcScaleAnmRepeatY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     work->mScaleAnm = (ptcl->mAge % esp->getScaleAnmCycleY()) / (f32)esp->getScaleAnmCycleY();
 }
 
-/* 8027AAE8-8027AB7C 275428 0094+00 0/0 1/1 0/0 .text
- * JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcScaleAnmReverseX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     s32 cycle = ptcl->mAge / esp->getScaleAnmCycleX();
@@ -79,8 +60,6 @@ void JPACalcScaleAnmReverseX(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mScaleAnm = base + ((cycle & 1) * (1.0f - base * 2.0f));
 }
 
-/* 8027AB7C-8027AC10 2754BC 0094+00 0/0 1/1 0/0 .text
- * JPACalcScaleAnmReverseY__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcScaleAnmReverseY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     s32 cycle = ptcl->mAge / esp->getScaleAnmCycleY();
@@ -88,8 +67,6 @@ void JPACalcScaleAnmReverseY(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     work->mScaleAnm = base + ((cycle & 1) * (1.0f - base * 2.0f));
 }
 
-/* 8027AC10-8027AC98 275550 0088+00 0/0 1/1 0/0 .text
- * JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle    */
 void JPACalcAlphaAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     f32 alpha;
@@ -104,8 +81,6 @@ void JPACalcAlphaAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     OSf32tou8(&alpha, &ptcl->mPrmColorAlphaAnm);
 }
 
-/* 8027AC98-8027AD88 2755D8 00F0+00 0/0 1/1 0/0 .text
- * JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPACalcAlphaFlickAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     JPAExtraShape* esp = work->mpRes->getEsp();
     f32 alpha;
@@ -123,13 +98,11 @@ void JPACalcAlphaFlickAnm(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     OSf32tou8(&alpha, &ptcl->mPrmColorAlphaAnm);
 }
 
-/* 8027AD88-8027ADBC 2756C8 0034+00 0/0 1/1 0/0 .text            __ct__13JPAExtraShapeFPCUc */
 JPAExtraShape::JPAExtraShape(u8 const* data) {
     mpData = (const JPAExtraShapeData*)data;
     init();
 }
 
-/* 8027ADBC-8027AEBC 2756FC 0100+00 1/1 0/0 0/0 .text            init__13JPAExtraShapeFv */
 void JPAExtraShape::init() {
     mAlphaIncRate = (getAlphaInTiming() != 0.0f) ?
                         (getAlphaBaseValue() - getAlphaInValue()) / getAlphaInTiming() :
diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/src/JSystem/JParticle/JPAFieldBlock.cpp
index 9cb667764c..34397601e5 100644
--- a/src/JSystem/JParticle/JPAFieldBlock.cpp
+++ b/src/JSystem/JParticle/JPAFieldBlock.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAFieldBlock
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAFieldBlock.h"
@@ -10,8 +5,6 @@
 #include "JSystem/JParticle/JPAEmitter.h"
 #include "JSystem/JParticle/JPAParticle.h"
 
-/* 8027BDEC-8027BF18 27672C 012C+00 8/8 0/0 0/0 .text
- * calcAffect__12JPAFieldBaseFP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldBase::calcAffect(JPAFieldBlock* block, JPABaseParticle* ptcl) {
     JGeometry::TVec3<f32> vec = mAccel;
     if (!ptcl->checkStatus(4) && block->checkStatus(0x78)) {
@@ -31,8 +24,6 @@ void JPAFieldBase::calcAffect(JPAFieldBlock* block, JPABaseParticle* ptcl) {
     }
 }
 
-/* 8027BF18-8027BFB4 276858 009C+00 2/2 0/0 0/0 .text
- * calcFadeAffect__12JPAFieldBaseCFP13JPAFieldBlockf            */
 f32 JPAFieldBase::calcFadeAffect(JPAFieldBlock* block, f32 time) const {
     f32 fade = 1.0f;
     if ((block->checkStatus(8) && time < block->getEnTime())
@@ -47,8 +38,6 @@ f32 JPAFieldBase::calcFadeAffect(JPAFieldBlock* block, f32 time) const {
     return fade;
 }
 
-/* 8027BFB4-8027C054 2768F4 00A0+00 1/0 0/0 0/0 .text
- * prepare__15JPAFieldGravityFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldGravity::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     if (block->checkStatus(2)) {
         mAccel.scale(block->getMag(), block->getDir());
@@ -58,14 +47,10 @@ void JPAFieldGravity::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     }
 }
 
-/* 8027C054-8027C07C 276994 0028+00 1/0 0/0 0/0 .text
- * calc__15JPAFieldGravityFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldGravity::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     calcAffect(block, ptcl);
 }
 
-/* 8027C07C-8027C1B8 2769BC 013C+00 1/0 0/0 0/0 .text
- * prepare__11JPAFieldAirFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldAir::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     JGeometry::TVec3<f32> vec;
     vec.normalize(block->getDir());
@@ -77,8 +62,6 @@ void JPAFieldAir::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     }
 }
 
-/* 8027C1B8-8027C24C 276AF8 0094+00 1/0 0/0 0/0 .text
- * calc__11JPAFieldAirFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldAir::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     calcAffect(block, ptcl);
     if (block->checkStatus(4)) {
@@ -89,31 +72,23 @@ void JPAFieldAir::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABasePa
     }
 }
 
-/* 8027C24C-8027C29C 276B8C 0050+00 1/0 0/0 0/0 .text
- * prepare__14JPAFieldMagnetFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldMagnet::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     mDir.sub(block->getPos(), work->mEmitterPos);
     MTXMultVecSR(work->mRotationMtx, &mDir, &mDir);
 }
 
-/* 8027C29C-8027C36C 276BDC 00D0+00 1/0 0/0 0/0 .text
- * calc__14JPAFieldMagnetFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldMagnet::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     mAccel.sub(mDir, ptcl->mLocalPosition);
     mAccel.setLength(block->getMag());
     calcAffect(block, ptcl);
 }
 
-/* 8027C36C-8027C3E0 276CAC 0074+00 1/0 0/0 0/0 .text
- * prepare__14JPAFieldNewtonFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldNewton::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     mDir.sub(block->getPos(), work->mEmitterPos);
     MTXMultVecSR(work->mRotationMtx, &mDir, &mDir);
     mCutoff = block->getVal1() * block->getVal1();
 }
 
-/* 8027C3E0-8027C56C 276D20 018C+00 1/0 0/0 0/0 .text
- * calc__14JPAFieldNewtonFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldNewton::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     mAccel.sub(mDir, ptcl->mLocalPosition);
     f32 len_sq = mAccel.squared();
@@ -125,8 +100,6 @@ void JPAFieldNewton::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABas
     calcAffect(block, ptcl);
 }
 
-/* 8027C56C-8027C674 276EAC 0108+00 1/0 0/0 0/0 .text
- * prepare__14JPAFieldVortexFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldVortex::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     MTXMultVecSR(work->mGlobalRot, &block->getDir(), &field_0x10);
     field_0x10.normalize();
@@ -134,8 +107,6 @@ void JPAFieldVortex::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     field_0x20 = 1.0f / field_0x1c;
 }
 
-/* 8027C674-8027C814 276FB4 01A0+00 1/0 0/0 0/0 .text
- * calc__14JPAFieldVortexFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldVortex::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     JGeometry::TVec3<f32> vec;
     vec.scale(field_0x10.dot(ptcl->mLocalPosition), field_0x10);
@@ -153,8 +124,6 @@ void JPAFieldVortex::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABas
     calcAffect(block, ptcl);
 }
 
-/* 8027C814-8027CA94 277154 0280+00 1/0 0/0 0/0 .text
- * prepare__18JPAFieldConvectionFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldConvection::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     JGeometry::TVec3<f32> vec1, vec2;
     vec2.cross(block->getPos(), block->getDir());
@@ -167,8 +136,6 @@ void JPAFieldConvection::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block)
     field_0x28.normalize();
 }
 
-/* 8027CA94-8027CCCC 2773D4 0238+00 1/0 0/0 0/0 .text
- * calc__18JPAFieldConvectionFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldConvection::calc(JPAEmitterWorkData* work, JPAFieldBlock* block,
                               JPABaseParticle* ptcl) {
     JGeometry::TVec3<f32> vec1, vec2, vec3;
@@ -183,8 +150,6 @@ void JPAFieldConvection::calc(JPAEmitterWorkData* work, JPAFieldBlock* block,
     calcAffect(block, ptcl);
 }
 
-/* 8027CCCC-8027CDE4 27760C 0118+00 1/0 0/0 0/0 .text
- * calc__14JPAFieldRandomFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldRandom::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     if (ptcl->mAge == 0 || (block->getCycle() != 0 && ptcl->mAge % block->getCycle() == 0)) {
         JPABaseEmitter* emtr = work->mpEmtr;
@@ -194,8 +159,6 @@ void JPAFieldRandom::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABas
     }
 }
 
-/* 8027CDE4-8027CE64 277724 0080+00 1/0 0/0 0/0 .text
- * calc__12JPAFieldDragFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldDrag::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     if (!ptcl->checkStatus(4)) {
         f32 fade = calcFadeAffect(block, ptcl->mTime);
@@ -205,8 +168,6 @@ void JPAFieldDrag::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseP
     }
 }
 
-/* 8027CE64-8027CFA8 2777A4 0144+00 1/0 0/0 0/0 .text
- * prepare__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlock */
 void JPAFieldSpin::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     JGeometry::TVec3<f32> axis;
     MTXMultVecSR(work->mGlobalRot, &block->getDir(), &axis);
@@ -218,8 +179,6 @@ void JPAFieldSpin::prepare(JPAEmitterWorkData* work, JPAFieldBlock* block) {
     field_0x28.set(mtx[0][2], mtx[1][2], mtx[2][2]);
 }
 
-/* 8027CFA8-8027D088 2778E8 00E0+00 1/0 0/0 0/0 .text
- * calc__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */
 void JPAFieldSpin::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseParticle* ptcl) {
     Mtx mtx;
     mtx[0][0] = field_0x10.x;
@@ -239,14 +198,11 @@ void JPAFieldSpin::calc(JPAEmitterWorkData* work, JPAFieldBlock* block, JPABaseP
     calcAffect(block, ptcl);
 }
 
-/* 8027D088-8027D0C0 2779C8 0038+00 0/0 1/1 0/0 .text            __ct__13JPAFieldBlockFPCUcP7JKRHeap
- */
 JPAFieldBlock::JPAFieldBlock(u8 const* data, JKRHeap* heap)
     : mpData((const JPAFieldBlockData*)data) {
     init(heap);
 }
 
-/* 8027D0C0-8027D3AC 277A00 02EC+00 2/1 0/0 0/0 .text            init__13JPAFieldBlockFP7JKRHeap */
 void JPAFieldBlock::init(JKRHeap* heap) {
     mFadeInRate = getFadeInTime() - getEnTime();
     if (mFadeInRate == 0.0f) {
diff --git a/src/JSystem/JParticle/JPAKeyBlock.cpp b/src/JSystem/JParticle/JPAKeyBlock.cpp
index ab1e2142bc..c574618eee 100644
--- a/src/JSystem/JParticle/JPAKeyBlock.cpp
+++ b/src/JSystem/JParticle/JPAKeyBlock.cpp
@@ -1,21 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAKeyBlock
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAKeyBlock.h"
 #include "JSystem/JParticle/JPAMath.h"
 
-/* 8027D730-8027D740 278070 0010+00 0/0 1/1 0/0 .text            __ct__11JPAKeyBlockFPCUc */
 JPAKeyBlock::JPAKeyBlock(const u8* data)
     : mDataStart(data)
     , field_0x4(reinterpret_cast<const float*>(&data[0xC]))
 {
 }
 
-/* 8027D740-8027D7D4 278080 0094+00 0/0 1/1 0/0 .text            calc__11JPAKeyBlockFf */
 f32 JPAKeyBlock::calc(float p1) {
 	if (mDataStart[0xB] != '\0') {
 		int v1 = (int)field_0x4[(mDataStart[9] - 1) * 4] + 1;
diff --git a/src/JSystem/JParticle/JPAMath.cpp b/src/JSystem/JParticle/JPAMath.cpp
index 4238c5db90..aa3807a4fe 100644
--- a/src/JSystem/JParticle/JPAMath.cpp
+++ b/src/JSystem/JParticle/JPAMath.cpp
@@ -1,22 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAMath
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAMath.h"
 #include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/J2DGraph/J2DAnimation.h"
 
-/* ############################################################################################## */
 // Probably some local function needed to change float literal order
 static f32 floatDummyFunc() {
     return 1.0f;
 }
 
-/* 80280588-802806C0 27AEC8 0138+00 0/0 1/1 0/0 .text JPAGetDirMtx__FRCQ29JGeometry8TVec3<f>PA4_f
- */
 void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]) {
     JGeometry::TVec3<float> local_78(param_0.y, -param_0.x, 0.0f);
     f32 len = local_78.length();
@@ -45,7 +37,6 @@ void JPAGetDirMtx(JGeometry::TVec3<f32> const& param_0, f32 (*param_1)[4]) {
     param_1[2][3] = 0.0f;
 }
 
-/* 802806C0-80280734 27B000 0074+00 0/0 1/1 0/0 .text            JPAGetYZRotateMtx__FssPA4_f */
 void JPAGetYZRotateMtx(s16 angleY, s16 angleZ, f32 (*param_2)[4]) {
     f32 cosy = JMASCos(angleY);
     f32 cosz = JMASCos(angleZ);
@@ -65,7 +56,6 @@ void JPAGetYZRotateMtx(s16 angleY, s16 angleZ, f32 (*param_2)[4]) {
     param_2[0][3] = 0.0f;
 }
 
-/* 80280734-802807E0 27B074 00AC+00 0/0 6/6 11/11 .text            JPAGetXYZRotateMtx__FsssPA4_f */
 void JPAGetXYZRotateMtx(s16 x, s16 y, s16 z, Mtx mtx) {
     f32 cosx = JMASCos(x);
     f32 cosy = JMASCos(y);
@@ -91,16 +81,12 @@ void JPAGetXYZRotateMtx(s16 x, s16 y, s16 z, Mtx mtx) {
     mtx[0][3] = 0.0f;
 }
 
-/* 802807E0-80280808 27B120 0028+00 0/0 11/11 71/71 .text
- * JPASetRMtxTVecfromMtx__FPA4_CfPA4_fPQ29JGeometry8TVec3<f>    */
 void JPASetRMtxTVecfromMtx(f32 const (*param_0)[4], f32 (*param_1)[4],
                                JGeometry::TVec3<f32>* param_2) {
     JGeometry::TVec3<f32> dummy;
     JPASetRMtxSTVecfromMtx(param_0, param_1, &dummy, param_2);
 }
 
-/* 80280808-80280984 27B148 017C+00 1/1 1/1 53/53 .text
- * JPASetRMtxSTVecfromMtx__FPA4_CfPA4_fPQ29JGeometry8TVec3<f>PQ29JGeometry8TVec3<f> */
 void JPASetRMtxSTVecfromMtx(f32 const (*param_0)[4], f32 (*param_1)[4],
                                 JGeometry::TVec3<f32>* param_2, JGeometry::TVec3<f32>* param_3) {
     JGeometry::TVec3<float> aTStack_54;
@@ -132,7 +118,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*param_0)[4], f32 (*param_1)[4],
     param_3->set(param_0[0][3], param_0[1][3], param_0[2][3]);
 }
 
-/* 80280984-80280A48 27B2C4 00C4+00 0/0 2/1 0/0 .text            JPACalcKeyAnmValue__FfUsPCf */
 f32 JPACalcKeyAnmValue(f32 param_0, u16 param_1, f32 const* param_2) {
     if (param_0 < param_2[0]) {
         return param_2[1];
diff --git a/src/JSystem/JParticle/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp
index d28f6b4bef..a9294e0b4e 100644
--- a/src/JSystem/JParticle/JPAParticle.cpp
+++ b/src/JSystem/JParticle/JPAParticle.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAParticle
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAParticle.h"
@@ -12,13 +7,10 @@
 #include "JSystem/JParticle/JPAEmitterManager.h"
 #include "JSystem/JParticle/JPAExtraShape.h"
 
-/* 8027EFA4-8027EFEC 2798E4 0048+00 0/0 11/11 1/1 .text            __dt__19JPAParticleCallBackFv */
 JPAParticleCallBack::~JPAParticleCallBack() {
     /* empty function */
 }
 
-/* 8027EFEC-8027F8C8 27992C 08DC+00 0/0 1/1 0/0 .text
- * init_p__15JPABaseParticleFP18JPAEmitterWorkData              */
 void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
     JPABaseEmitter* emtr = work->mpEmtr;
     JPAExtraShape* esp = work->mpRes->getEsp();
@@ -129,8 +121,6 @@ void JPABaseParticle::init_p(JPAEmitterWorkData* work) {
     }
 }
 
-/* 8027F8C8-8027FFD0 27A208 0708+00 0/0 1/1 0/0 .text
- * init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent) {
     JPABaseEmitter* emtr = work->mpEmtr;
     JPAChildShape* csp = work->mpRes->getCsp();
@@ -214,8 +204,6 @@ void JPABaseParticle::init_c(JPAEmitterWorkData* work, JPABaseParticle* parent)
     mTexAnmIdx = 0;
 }
 
-/* 8027FFD0-80280260 27A910 0290+00 0/0 1/1 0/0 .text
- * calc_p__15JPABaseParticleFP18JPAEmitterWorkData              */
 bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
     if (++mAge >= mLifeTime) {
         return true;
@@ -262,8 +250,6 @@ bool JPABaseParticle::calc_p(JPAEmitterWorkData* work) {
     return false;
 }
 
-/* 80280260-802804C8 27ABA0 0268+00 0/0 1/1 0/0 .text
- * calc_c__15JPABaseParticleFP18JPAEmitterWorkData              */
 bool JPABaseParticle::calc_c(JPAEmitterWorkData* work) {
     if (++mAge >= mLifeTime) {
         return true;
@@ -306,8 +292,6 @@ bool JPABaseParticle::calc_c(JPAEmitterWorkData* work) {
     return false;
 }
 
-/* 802804C8-80280548 27AE08 0080+00 1/1 0/0 0/0 .text
- * canCreateChild__15JPABaseParticleFP18JPAEmitterWorkData      */
 bool JPABaseParticle::canCreateChild(JPAEmitterWorkData* work) {
     JPAChildShape* csp = work->mpRes->getCsp();
     bool ret = false;
@@ -318,14 +302,10 @@ bool JPABaseParticle::canCreateChild(JPAEmitterWorkData* work) {
     return ret;
 }
 
-/* 80280548-80280568 27AE88 0020+00 0/0 3/3 0/0 .text
- * getWidth__15JPABaseParticleCFPC14JPABaseEmitter              */
 f32 JPABaseParticle::getWidth(JPABaseEmitter const* emtr) const {
     return mParticleScaleX * 2.0f * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.x;
 }
 
-/* 80280568-80280588 27AEA8 0020+00 0/0 3/3 0/0 .text
- * getHeight__15JPABaseParticleCFPC14JPABaseEmitter             */
 f32 JPABaseParticle::getHeight(JPABaseEmitter const* emtr) const {
     return mParticleScaleY * 2.0f * emtr->mpEmtrMgr->pWd->mGlobalPtclScl.y;
 }
diff --git a/src/JSystem/JParticle/JPAResource.cpp b/src/JSystem/JParticle/JPAResource.cpp
index 281955f70d..925726ccae 100644
--- a/src/JSystem/JParticle/JPAResource.cpp
+++ b/src/JSystem/JParticle/JPAResource.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAResource
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAResource.h"
@@ -19,7 +14,6 @@
 #include "dolphin/gx.h"
 #include "global.h"
 
-/* 80274010-80274080 26E950 0070+00 0/0 1/1 0/0 .text            __ct__11JPAResourceFv */
 JPAResource::JPAResource() {
     mpDrawEmitterChildFuncList = NULL;
     mpDrawEmitterFuncList = NULL;
@@ -49,8 +43,7 @@ JPAResource::JPAResource() {
     mUsrIdx = 0;
 }
 
-/* 803C40C0-803C4220 0211E0 0144+1C 2/2 0/0 0/0 .data            jpa_pos */
-static u8 jpa_pos[324] ALIGN_DECL(32) = {
+static u8 jpa_pos[324] ATTRIBUTE_ALIGN(32) = {
     0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x32, 0xCE, 0x00, 0x00, 0xCE, 0x00, 0xE7, 0x00, 0x00, 0x19,
     0x00, 0x00, 0x19, 0xCE, 0x00, 0xE7, 0xCE, 0x00, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCE,
     0x00, 0xCE, 0xCE, 0x00, 0x00, 0x19, 0x00, 0x32, 0x19, 0x00, 0x32, 0xE7, 0x00, 0x00, 0xE7, 0x00,
@@ -74,13 +67,11 @@ static u8 jpa_pos[324] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0xCE,
 };
 
-/* 803C4220-803C4240 021340 0020+00 2/2 0/0 0/0 .data            jpa_crd */
-static u8 jpa_crd[32] ALIGN_DECL(32) = {
+static u8 jpa_crd[32] ATTRIBUTE_ALIGN(32) = {
     0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x02, 0x01, 0x00, 0x01,
     0x00, 0x00, 0x01, 0x00, 0x01, 0x02, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x02,
 };
 
-/* 80274080-802755E8 26E9C0 1568+00 2/0 1/1 0/0 .text            init__11JPAResourceFP7JKRHeap */
 void JPAResource::init(JKRHeap* heap) {
     BOOL is_glbl_clr_anm = mpBaseShape->isGlblClrAnm();
     BOOL is_glbl_tex_anm = mpBaseShape->isGlblTexAnm();
@@ -701,8 +692,6 @@ void JPAResource::init(JKRHeap* heap) {
     }
 }
 
-/* 802755E8-80275A94 26FF28 04AC+00 0/0 1/1 0/0 .text
- * calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter   */
 bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     work->mpEmtr = emtr;
     work->mpRes = this;
@@ -788,8 +777,6 @@ bool JPAResource::calc(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     return false;
 }
 
-/* 80275A94-80275B74 2703D4 00E0+00 0/0 1/1 0/0 .text
- * draw__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter   */
 void JPAResource::draw(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     work->mpEmtr = emtr;
     work->mpRes = this;
@@ -806,8 +793,6 @@ void JPAResource::draw(JPAEmitterWorkData* work, JPABaseEmitter* emtr) {
     }
 }
 
-/* 80275B74-80275EB0 2704B4 033C+00 1/1 0/0 0/0 .text drawP__11JPAResourceFP18JPAEmitterWorkData
- */
 void JPAResource::drawP(JPAEmitterWorkData* work) {
     work->mpEmtr->clearStatus(0x80);
 
@@ -870,8 +855,6 @@ void JPAResource::drawP(JPAEmitterWorkData* work) {
     }
 }
 
-/* 80275EB0-802761A8 2707F0 02F8+00 1/1 0/0 0/0 .text drawC__11JPAResourceFP18JPAEmitterWorkData
- */
 void JPAResource::drawC(JPAEmitterWorkData* work) {
     work->mpEmtr->setStatus(0x80);
 
@@ -934,7 +917,6 @@ void JPAResource::drawC(JPAEmitterWorkData* work) {
     }
 }
 
-/* 802761A8-8027642C 270AE8 0284+00 1/1 0/0 0/0 .text            setPTev__11JPAResourceFv */
 void JPAResource::setPTev() {
     GXTexCoordID tex_coord = GX_TEXCOORD1;
     u8 tev_stages = 1;
@@ -991,8 +973,6 @@ void JPAResource::setPTev() {
     GXSetNumTexGens(tex_gens);
 }
 
-/* 8027642C-8027658C 270D6C 0160+00 1/1 0/0 0/0 .text setCTev__11JPAResourceFP18JPAEmitterWorkData
- */
 void JPAResource::setCTev(JPAEmitterWorkData* work) {
     int base_plane_type = (mpChildShape->getType() == 3 || mpChildShape->getType() == 7) ?
         mpChildShape->getBasePlaneType() : 0;
@@ -1014,8 +994,6 @@ void JPAResource::setCTev(JPAEmitterWorkData* work) {
     work->mpResMgr->load(work->mpRes->getTexIdx(mpChildShape->getTexIdx()), GX_TEXMAP1);
 }
 
-/* 8027658C-80276608 270ECC 007C+00 0/0 1/1 0/0 .text
- * calc_p__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPAResource::calc_p(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (mpCalcParticleFuncList != NULL) {
         for (int i = mpCalcParticleFuncListNum - 1; i >= 0; i--) {
@@ -1024,8 +1002,6 @@ void JPAResource::calc_p(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     }
 }
 
-/* 80276608-80276684 270F48 007C+00 0/0 1/1 0/0 .text
- * calc_c__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPAResource::calc_c(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     if (mpCalcParticleChildFuncList != NULL) {
         for (int i = mpCalcParticleChildFuncListNum - 1; i >= 0; i--) {
@@ -1034,16 +1010,12 @@ void JPAResource::calc_c(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     }
 }
 
-/* 80276684-80276700 270FC4 007C+00 0/0 2/2 0/0 .text
- * calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle */
 void JPAResource::calcField(JPAEmitterWorkData* work, JPABaseParticle* ptcl) {
     for (int i = mFieldBlockNum - 1; i >= 0; i--) {
         mpFieldBlocks[i]->calc(work, ptcl);
     }
 }
 
-/* 80276700-80276840 271040 0140+00 2/1 0/0 0/0 .text calcKey__11JPAResourceFP18JPAEmitterWorkData
- */
 void JPAResource::calcKey(JPAEmitterWorkData* work) {
     for (int i = mKeyBlockNum - 1; i >= 0; i--) {
         f32 val = mpKeyBlocks[i]->calc(work->mpEmtr->mTick);
@@ -1079,8 +1051,6 @@ void JPAResource::calcKey(JPAEmitterWorkData* work) {
     }
 }
 
-/* 80276840-80276A0C 271180 01CC+00 1/1 0/0 0/0 .text
- * calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData          */
 void JPAResource::calcWorkData_c(JPAEmitterWorkData* work) {
     work->mVolumeSize = work->mpEmtr->mVolumeSize;
     work->mVolumeMinRad = work->mpEmtr->mVolumeMinRad;
@@ -1110,8 +1080,6 @@ void JPAResource::calcWorkData_c(JPAEmitterWorkData* work) {
     MTXMultVec(global_mtx, &work->mpEmtr->mLocalTrs, &work->mGlobalPos);
 }
 
-/* 80276A0C-80276A8C 27134C 0080+00 1/1 0/0 0/0 .text
- * calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData          */
 void JPAResource::calcWorkData_d(JPAEmitterWorkData* work) {
     Mtx mtx;
     JPAGetXYZRotateMtx(work->mpEmtr->mLocalRot.x * 0xB6, work->mpEmtr->mLocalRot.y * 0xB6,
diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/src/JSystem/JParticle/JPAResourceLoader.cpp
index f486a734e2..e065ee72b3 100644
--- a/src/JSystem/JParticle/JPAResourceLoader.cpp
+++ b/src/JSystem/JParticle/JPAResourceLoader.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAResourceLoader
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAResourceLoader.h"
@@ -17,8 +12,6 @@
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 
-/* 8027D8A0-8027D8E0 2781E0 0040+00 0/0 1/1 0/0 .text
- * __ct__17JPAResourceLoaderFPCUcP18JPAResourceManager          */
 JPAResourceLoader::JPAResourceLoader(u8 const* data, JPAResourceManager* mgr) {
     if (*(u32*)(data + 4) == '2-10') {
         load_jpc(data, mgr);
@@ -33,8 +26,6 @@ struct JPAResourceHeader {
     /* 0x6 */ u8 mTDB1Num;
 };
 
-/* 8027D8E0-8027DCA0 278220 03C0+00 1/1 0/0 0/0 .text
- * load_jpc__17JPAResourceLoaderFPCUcP18JPAResourceManager      */
 void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) {
     JKRHeap* heap = mgr->mpHeap;
     mgr->mResMax = *(u16*)(data + 8);
diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp
index 9532114ff8..7b0de811bc 100644
--- a/src/JSystem/JParticle/JPAResourceManager.cpp
+++ b/src/JSystem/JParticle/JPAResourceManager.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPAResourceManager
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPAResourceManager.h"
@@ -11,10 +6,9 @@
 #include "string.h"
 
 struct JPAResourceLoader {
-    /* 8027D8A0 */ JPAResourceLoader(u8 const*, JPAResourceManager*);
+    JPAResourceLoader(u8 const*, JPAResourceManager*);
 };
 
-/* 80273E10-80273E68 26E750 0058+00 0/0 2/2 0/0 .text __ct__18JPAResourceManagerFPCvP7JKRHeap */
 JPAResourceManager::JPAResourceManager(void const* pData, JKRHeap* pHeap) {
     mpResArr = NULL;
     mpTexArr = NULL;
@@ -26,7 +20,6 @@ JPAResourceManager::JPAResourceManager(void const* pData, JKRHeap* pHeap) {
     JPAResourceLoader loader((u8 const*)pData, this);
 }
 
-/* 80273E68-80273EA8 26E7A8 0040+00 1/1 1/1 0/0 .text getResource__18JPAResourceManagerCFUs */
 JPAResource* JPAResourceManager::getResource(u16 usrIdx) const {
     for (u16 i = 0; i < mResNum; i++)
         if (mpResArr[i]->getUsrIdx() == usrIdx)
@@ -34,8 +27,6 @@ JPAResource* JPAResourceManager::getResource(u16 usrIdx) const {
     return NULL;
 }
 
-/* 80273EA8-80273EEC 26E7E8 0044+00 0/0 2/2 0/0 .text
- * checkUserIndexDuplication__18JPAResourceManagerCFUs          */
 bool JPAResourceManager::checkUserIndexDuplication(u16 usrIdx) const {
     for (s32 i = 0; i < mResNum; i++)
         if (mpResArr[i]->getUsrIdx() == usrIdx)
@@ -43,8 +34,6 @@ bool JPAResourceManager::checkUserIndexDuplication(u16 usrIdx) const {
     return false;
 }
 
-/* 80273EEC-80273F8C 26E82C 00A0+00 0/0 2/2 0/0 .text
- * swapTexture__18JPAResourceManagerFPC7ResTIMGPCc              */
 const ResTIMG* JPAResourceManager::swapTexture(ResTIMG const* img, char const* swapName) {
     const ResTIMG* ret = NULL;
 
@@ -60,21 +49,16 @@ const ResTIMG* JPAResourceManager::swapTexture(ResTIMG const* img, char const* s
     return ret;
 }
 
-/* 80273F8C-80273FAC 26E8CC 0020+00 0/0 1/1 0/0 .text
- * registRes__18JPAResourceManagerFP11JPAResource               */
 void JPAResourceManager::registRes(JPAResource* res) {
     mpResArr[mResNum] = res;
     mResNum++;
 }
 
-/* 80273FAC-80273FCC 26E8EC 0020+00 0/0 1/1 0/0 .text
- * registTex__18JPAResourceManagerFP10JPATexture                */
 void JPAResourceManager::registTex(JPATexture* tex) {
     mpTexArr[mTexNum] = tex;
     mTexNum++;
 }
 
-/* 80273FCC-80274010 26E90C 0044+00 0/0 6/6 0/0 .text getResUserWork__18JPAResourceManagerCFUs */
 u32 JPAResourceManager::getResUserWork(u16 usrIdx) const {
     u32 ret = 0;
 
diff --git a/src/JSystem/JParticle/JPATexture.cpp b/src/JSystem/JParticle/JPATexture.cpp
index a812bee764..2e41bbd3c7 100644
--- a/src/JSystem/JParticle/JPATexture.cpp
+++ b/src/JSystem/JParticle/JPATexture.cpp
@@ -1,17 +1,10 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JPATexture
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JParticle/JPATexture.h"
 
-/* 8027D7D4-8027D83C 278114 0068+00 0/0 1/1 0/0 .text            __ct__10JPATextureFPCUc */
 JPATexture::JPATexture(u8 const* pData) {
     mpData = (const JPATextureData*)pData;
     mTexture.storeTIMG(&mpData->mResTIMG, (u8)0);
 }
 
-/* 8027D83C-8027D8A0 27817C 0064+00 1/0 0/0 0/0 .text            __dt__10JPATextureFv */
 JPATexture::~JPATexture() {}
diff --git a/src/JSystem/JStage/JSGActor.cpp b/src/JSystem/JStage/JSGActor.cpp
index 0fb86da90f..8562580145 100644
--- a/src/JSystem/JStage/JSGActor.cpp
+++ b/src/JSystem/JStage/JSGActor.cpp
@@ -2,96 +2,64 @@
 
 #include "JSystem/JStage/JSGActor.h"
 
-/* 80280A48-80280AA8 27B388 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage6TActorFv */
 JStage::TActor::~TActor() {}
 
-/* 80280AA8-80280AB0 27B3E8 0008+00 1/0 1/0 0/0 .text            JSGFGetType__Q26JStage6TActorCFv */
 s32 JStage::TActor::JSGFGetType() const {
     return 2;
 }
 
-/* 80280AB0-80280AB4 27B3F0 0004+00 1/0 0/0 0/0 .text JSGGetTranslation__Q26JStage6TActorCFP3Vec
- */
 void JStage::TActor::JSGGetTranslation(Vec*) const {}
 
-/* 80280AB4-80280AB8 27B3F4 0004+00 1/0 0/0 0/0 .text JSGSetTranslation__Q26JStage6TActorFRC3Vec
- */
 void JStage::TActor::JSGSetTranslation(Vec const&) {}
 
-/* 80280AB8-80280ABC 27B3F8 0004+00 1/0 0/0 0/0 .text JSGGetScaling__Q26JStage6TActorCFP3Vec */
 void JStage::TActor::JSGGetScaling(Vec*) const {}
 
-/* 80280ABC-80280AC0 27B3FC 0004+00 1/0 0/0 0/0 .text JSGSetScaling__Q26JStage6TActorFRC3Vec */
 void JStage::TActor::JSGSetScaling(Vec const&) {}
 
-/* 80280AC0-80280AC4 27B400 0004+00 1/0 0/0 0/0 .text JSGGetRotation__Q26JStage6TActorCFP3Vec */
 void JStage::TActor::JSGGetRotation(Vec*) const {}
 
-/* 80280AC4-80280AC8 27B404 0004+00 1/0 0/0 0/0 .text JSGSetRotation__Q26JStage6TActorFRC3Vec */
 void JStage::TActor::JSGSetRotation(Vec const&) {}
 
-/* 80280AC8-80280AD0 27B408 0008+00 1/0 1/0 0/0 .text            JSGGetShape__Q26JStage6TActorCFv */
 s32 JStage::TActor::JSGGetShape() const {
     return -1;
 }
 
-/* 80280AD0-80280AD4 27B410 0004+00 1/0 0/0 0/0 .text            JSGSetShape__Q26JStage6TActorFUl */
 void JStage::TActor::JSGSetShape(u32) {}
 
-/* 80280AD4-80280ADC 27B414 0008+00 1/0 1/0 0/0 .text JSGGetAnimation__Q26JStage6TActorCFv */
 s32 JStage::TActor::JSGGetAnimation() const {
     return -1;
 }
 
-/* 80280ADC-80280AE0 27B41C 0004+00 1/0 0/0 0/0 .text JSGSetAnimation__Q26JStage6TActorFUl */
 void JStage::TActor::JSGSetAnimation(u32) {}
 
-/* 80280AE0-80280AE8 27B420 0008+00 1/0 1/0 0/0 .text JSGGetAnimationFrame__Q26JStage6TActorCFv */
 f32 JStage::TActor::JSGGetAnimationFrame() const {
     return 0.0f;
 }
 
-/* 80280AE8-80280AEC 27B428 0004+00 1/0 0/0 0/0 .text JSGSetAnimationFrame__Q26JStage6TActorFf */
 void JStage::TActor::JSGSetAnimationFrame(f32) {}
 
-/* 80280AEC-80280AF4 27B42C 0008+00 1/0 0/0 0/0 .text JSGGetAnimationFrameMax__Q26JStage6TActorCFv
- */
 f32 JStage::TActor::JSGGetAnimationFrameMax() const {
     return 0.0f;
 }
 
-/* 80280AF4-80280AFC 27B434 0008+00 1/0 1/0 0/0 .text
- * JSGGetAnimationTransition__Q26JStage6TActorCFv               */
 f32 JStage::TActor::JSGGetAnimationTransition() const {
     return 0.0f;
 }
 
-/* 80280AFC-80280B00 27B43C 0004+00 1/0 0/0 0/0 .text
- * JSGSetAnimationTransition__Q26JStage6TActorFf                */
 void JStage::TActor::JSGSetAnimationTransition(f32) {}
 
-/* 80280B00-80280B08 27B440 0008+00 1/0 1/0 0/0 .text JSGGetTextureAnimation__Q26JStage6TActorCFv
- */
 s32 JStage::TActor::JSGGetTextureAnimation() const {
     return -1;
 }
 
-/* 80280B08-80280B0C 27B448 0004+00 1/0 0/0 0/0 .text JSGSetTextureAnimation__Q26JStage6TActorFUl
- */
 void JStage::TActor::JSGSetTextureAnimation(u32) {}
 
-/* 80280B0C-80280B14 27B44C 0008+00 1/0 1/0 0/0 .text
- * JSGGetTextureAnimationFrame__Q26JStage6TActorCFv             */
 f32 JStage::TActor::JSGGetTextureAnimationFrame() const {
     return 0.0f;
 }
 
-/* 80280B14-80280B18 27B454 0004+00 1/0 0/0 0/0 .text
- * JSGSetTextureAnimationFrame__Q26JStage6TActorFf              */
 void JStage::TActor::JSGSetTextureAnimationFrame(f32) {}
 
-/* 80280B18-80280B20 27B458 0008+00 1/0 0/0 0/0 .text
- * JSGGetTextureAnimationFrameMax__Q26JStage6TActorCFv          */
 f32 JStage::TActor::JSGGetTextureAnimationFrameMax() const {
     return 0.0f;
 }
diff --git a/src/JSystem/JStage/JSGAmbientLight.cpp b/src/JSystem/JStage/JSGAmbientLight.cpp
index c1fe9047db..e7954c8cf3 100644
--- a/src/JSystem/JStage/JSGAmbientLight.cpp
+++ b/src/JSystem/JStage/JSGAmbientLight.cpp
@@ -2,19 +2,14 @@
 
 #include "JSystem/JStage/JSGAmbientLight.h"
 
-/* 80280B20-80280B80 27B460 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage13TAmbientLightFv */
 JStage::TAmbientLight::~TAmbientLight() {}
 
-/* 80280B80-80280B88 27B4C0 0008+00 1/0 1/0 0/0 .text JSGFGetType__Q26JStage13TAmbientLightCFv */
 s32 JStage::TAmbientLight::JSGFGetType() const {
     return 4;
 }
 
-/* 80280B88-80280B9C 27B4C8 0014+00 1/0 1/0 0/0 .text JSGGetColor__Q26JStage13TAmbientLightCFv */
 GXColor JStage::TAmbientLight::JSGGetColor() const {
     return (GXColor){255, 255, 255, 255};
 }
 
-/* 80280B9C-80280BA0 27B4DC 0004+00 1/0 0/0 0/0 .text
- * JSGSetColor__Q26JStage13TAmbientLightF8_GXColor              */
 void JStage::TAmbientLight::JSGSetColor(GXColor) {}
diff --git a/src/JSystem/JStage/JSGCamera.cpp b/src/JSystem/JStage/JSGCamera.cpp
index 1acc80e6e7..33cbbf5410 100644
--- a/src/JSystem/JStage/JSGCamera.cpp
+++ b/src/JSystem/JStage/JSGCamera.cpp
@@ -4,107 +4,66 @@
 #include "math.h"
 #include "limits.h"
 
-/* 80280BA0-80280C00 27B4E0 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage7TCameraFv */
 JStage::TCamera::~TCamera() {}
 
-/* 80280C00-80280C08 27B540 0008+00 1/0 1/0 0/0 .text            JSGFGetType__Q26JStage7TCameraCFv
- */
 s32 JStage::TCamera::JSGFGetType() const {
     return 3;
 }
 
-/* 80280C08-80280C10 27B548 0008+00 1/0 1/0 0/0 .text JSGGetProjectionType__Q26JStage7TCameraCFv
- */
 bool JStage::TCamera::JSGGetProjectionType() const {
     return true;
 }
 
-/* 80280C10-80280C14 27B550 0004+00 1/0 1/0 0/0 .text
- * JSGSetProjectionType__Q26JStage7TCameraFQ26JStage18TECameraProjection */
 void JStage::TCamera::JSGSetProjectionType(JStage::TECameraProjection) {}
 
-/* 80280C14-80280C1C 27B554 0008+00 1/0 0/0 0/0 .text JSGGetProjectionNear__Q26JStage7TCameraCFv
- */
 f32 JStage::TCamera::JSGGetProjectionNear() const {
     return 0.0f;
 }
 
-/* 80280C1C-80280C20 27B55C 0004+00 1/0 0/0 0/0 .text JSGSetProjectionNear__Q26JStage7TCameraFf */
 void JStage::TCamera::JSGSetProjectionNear(f32) {}
 
-/* 80280C20-80280C2C 27B560 000C+00 1/0 0/0 0/0 .text JSGGetProjectionFar__Q26JStage7TCameraCFv */
 f32 JStage::TCamera::JSGGetProjectionFar() const {
     return std::numeric_limits<f32>::max();
 }
 
-/* 80280C2C-80280C30 27B56C 0004+00 1/0 0/0 0/0 .text JSGSetProjectionFar__Q26JStage7TCameraFf */
 void JStage::TCamera::JSGSetProjectionFar(f32) {}
 
-/* 80280C30-80280C38 27B570 0008+00 1/0 0/0 0/0 .text JSGGetProjectionFovy__Q26JStage7TCameraCFv
- */
 f32 JStage::TCamera::JSGGetProjectionFovy() const {
     return 0.0f;
 }
 
-/* 80280C38-80280C3C 27B578 0004+00 1/0 0/0 0/0 .text JSGSetProjectionFovy__Q26JStage7TCameraFf */
 void JStage::TCamera::JSGSetProjectionFovy(f32) {}
 
-/* 80280C3C-80280C44 27B57C 0008+00 1/0 0/0 0/0 .text JSGGetProjectionAspect__Q26JStage7TCameraCFv
- */
 f32 JStage::TCamera::JSGGetProjectionAspect() const {
     return 0.0f;
 }
 
-/* 80280C44-80280C48 27B584 0004+00 1/0 0/0 0/0 .text JSGSetProjectionAspect__Q26JStage7TCameraFf
- */
 void JStage::TCamera::JSGSetProjectionAspect(f32) {}
 
-/* 80280C48-80280C4C 27B588 0004+00 1/0 1/0 0/0 .text JSGGetProjectionField__Q26JStage7TCameraCFPf
- */
 void JStage::TCamera::JSGGetProjectionField(f32*) const {}
 
-/* 80280C4C-80280C50 27B58C 0004+00 1/0 1/0 0/0 .text JSGSetProjectionField__Q26JStage7TCameraFPCf
- */
 void JStage::TCamera::JSGSetProjectionField(f32 const*) {}
 
-/* 80280C50-80280C58 27B590 0008+00 1/0 1/0 0/0 .text JSGGetViewType__Q26JStage7TCameraCFv */
 bool JStage::TCamera::JSGGetViewType() const {
     return true;
 }
 
-/* 80280C58-80280C5C 27B598 0004+00 1/0 1/0 0/0 .text
- * JSGSetViewType__Q26JStage7TCameraFQ26JStage12TECameraView    */
 void JStage::TCamera::JSGSetViewType(JStage::TECameraView) {}
 
-/* 80280C5C-80280C60 27B59C 0004+00 1/0 0/0 0/0 .text JSGGetViewPosition__Q26JStage7TCameraCFP3Vec
- */
 void JStage::TCamera::JSGGetViewPosition(Vec*) const {}
 
-/* 80280C60-80280C64 27B5A0 0004+00 1/0 0/0 0/0 .text JSGSetViewPosition__Q26JStage7TCameraFRC3Vec
- */
 void JStage::TCamera::JSGSetViewPosition(Vec const&) {}
 
-/* 80280C64-80280C68 27B5A4 0004+00 1/0 0/0 0/0 .text JSGGetViewUpVector__Q26JStage7TCameraCFP3Vec
- */
 void JStage::TCamera::JSGGetViewUpVector(Vec*) const {}
 
-/* 80280C68-80280C6C 27B5A8 0004+00 1/0 0/0 0/0 .text JSGSetViewUpVector__Q26JStage7TCameraFRC3Vec
- */
 void JStage::TCamera::JSGSetViewUpVector(Vec const&) {}
 
-/* 80280C6C-80280C70 27B5AC 0004+00 1/0 0/0 0/0 .text
- * JSGGetViewTargetPosition__Q26JStage7TCameraCFP3Vec           */
 void JStage::TCamera::JSGGetViewTargetPosition(Vec*) const {}
 
-/* 80280C70-80280C74 27B5B0 0004+00 1/0 0/0 0/0 .text
- * JSGSetViewTargetPosition__Q26JStage7TCameraFRC3Vec           */
 void JStage::TCamera::JSGSetViewTargetPosition(Vec const&) {}
 
-/* 80280C74-80280C7C 27B5B4 0008+00 1/0 0/0 0/0 .text JSGGetViewRoll__Q26JStage7TCameraCFv */
 f32 JStage::TCamera::JSGGetViewRoll() const {
     return 0.0f;
 }
 
-/* 80280C7C-80280C80 27B5BC 0004+00 1/0 0/0 0/0 .text            JSGSetViewRoll__Q26JStage7TCameraFf
- */
 void JStage::TCamera::JSGSetViewRoll(f32) {}
diff --git a/src/JSystem/JStage/JSGFog.cpp b/src/JSystem/JStage/JSGFog.cpp
index 211217f075..e9b4506d08 100644
--- a/src/JSystem/JStage/JSGFog.cpp
+++ b/src/JSystem/JStage/JSGFog.cpp
@@ -3,43 +3,32 @@
 #include "JSystem/JStage/JSGFog.h"
 #include "math.h"
 
-/* 80280C80-80280CE0 27B5C0 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage4TFogFv */
 JStage::TFog::~TFog() {}
 
-/* 80280CE0-80280CE8 27B620 0008+00 1/0 1/0 0/0 .text            JSGFGetType__Q26JStage4TFogCFv */
 s32 JStage::TFog::JSGFGetType() const {
     return 6;
 }
 
-/* 80280CE8-80280CF0 27B628 0008+00 1/0 1/0 0/0 .text JSGGetFogFunction__Q26JStage4TFogCFv */
 bool JStage::TFog::JSGGetFogFunction() const {
     return false;
 }
 
-/* 80280CF0-80280CF4 27B630 0004+00 1/0 0/0 0/0 .text
- * JSGSetFogFunction__Q26JStage4TFogF10_GXFogType               */
 void JStage::TFog::JSGSetFogFunction(GXFogType) {}
 
-/* 80280CF4-80280CFC 27B634 0008+00 1/0 1/0 0/0 .text            JSGGetStartZ__Q26JStage4TFogCFv */
 f32 JStage::TFog::JSGGetStartZ() const {
     return 0.0f;
 }
 
-/* 80280CFC-80280D00 27B63C 0004+00 1/0 0/0 0/0 .text            JSGSetStartZ__Q26JStage4TFogFf */
 void JStage::TFog::JSGSetStartZ(f32) {}
 
-/* 80280D00-80280D0C 27B640 000C+00 1/0 1/0 0/0 .text            JSGGetEndZ__Q26JStage4TFogCFv */
 f32 JStage::TFog::JSGGetEndZ() const {
     return FLT_MAX;
 }
 
-/* 80280D0C-80280D10 27B64C 0004+00 1/0 0/0 0/0 .text            JSGSetEndZ__Q26JStage4TFogFf */
 void JStage::TFog::JSGSetEndZ(f32) {}
 
-/* 80280D10-80280D24 27B650 0014+00 1/0 1/0 0/0 .text            JSGGetColor__Q26JStage4TFogCFv */
 GXColor JStage::TFog::JSGGetColor() const {
     return (GXColor){255, 255, 255, 255};
 }
 
-/* 80280D24-80280D28 27B664 0004+00 1/0 0/0 0/0 .text JSGSetColor__Q26JStage4TFogF8_GXColor */
 void JStage::TFog::JSGSetColor(GXColor) {}
diff --git a/src/JSystem/JStage/JSGLight.cpp b/src/JSystem/JStage/JSGLight.cpp
index e0e161bba1..a9797befcf 100644
--- a/src/JSystem/JStage/JSGLight.cpp
+++ b/src/JSystem/JStage/JSGLight.cpp
@@ -2,55 +2,36 @@
 
 #include "JSystem/JStage/JSGLight.h"
 
-/* 80280D28-80280D88 27B668 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage6TLightFv */
 JStage::TLight::~TLight() {}
 
-/* 80280D88-80280D90 27B6C8 0008+00 1/0 1/0 0/0 .text            JSGFGetType__Q26JStage6TLightCFv */
 s32 JStage::TLight::JSGFGetType() const {
     return 5;
 }
 
-/* 80280D90-80280D98 27B6D0 0008+00 1/0 1/0 0/0 .text JSGGetLightType__Q26JStage6TLightCFv */
 bool JStage::TLight::JSGGetLightType() const {
     return true;
 }
 
-/* 80280D98-80280D9C 27B6D8 0004+00 1/0 0/0 0/0 .text
- * JSGSetLightType__Q26JStage6TLightFQ26JStage7TELight          */
 void JStage::TLight::JSGSetLightType(JStage::TELight) {}
 
-/* 80280D9C-80280DB0 27B6DC 0014+00 1/0 1/0 0/0 .text            JSGGetColor__Q26JStage6TLightCFv */
 GXColor JStage::TLight::JSGGetColor() const {
     return (GXColor){255, 255, 255, 255};
 }
 
-/* 80280DB0-80280DB4 27B6F0 0004+00 1/0 0/0 0/0 .text JSGSetColor__Q26JStage6TLightF8_GXColor */
 void JStage::TLight::JSGSetColor(GXColor) {}
 
-/* 80280DB4-80280DB8 27B6F4 0004+00 1/0 1/0 0/0 .text
- * JSGGetDistanceAttenuation__Q26JStage6TLightCFPfPfP13_GXDistAttnFn */
 void JStage::TLight::JSGGetDistanceAttenuation(f32*, f32*, GXDistAttnFn*) const {}
 
-/* 80280DB8-80280DBC 27B6F8 0004+00 1/0 0/0 0/0 .text
- * JSGSetDistanceAttenuation__Q26JStage6TLightFff13_GXDistAttnFn */
 void JStage::TLight::JSGSetDistanceAttenuation(f32, f32, GXDistAttnFn) {}
 
-/* 80280DBC-80280DC0 27B6FC 0004+00 1/0 1/0 0/0 .text
- * JSGGetAngleAttenuation__Q26JStage6TLightCFPfP9_GXSpotFn      */
 void JStage::TLight::JSGGetAngleAttenuation(f32*, GXSpotFn*) const {}
 
-/* 80280DC0-80280DC4 27B700 0004+00 1/0 0/0 0/0 .text
- * JSGSetAngleAttenuation__Q26JStage6TLightFf9_GXSpotFn         */
 void JStage::TLight::JSGSetAngleAttenuation(f32, GXSpotFn) {}
 
-/* 80280DC4-80280DC8 27B704 0004+00 1/0 1/0 0/0 .text JSGGetPosition__Q26JStage6TLightCFP3Vec */
 void JStage::TLight::JSGGetPosition(Vec*) const {}
 
-/* 80280DC8-80280DCC 27B708 0004+00 1/0 0/0 0/0 .text JSGSetPosition__Q26JStage6TLightFRC3Vec */
 void JStage::TLight::JSGSetPosition(Vec const&) {}
 
-/* 80280DCC-80280DD0 27B70C 0004+00 1/0 1/0 0/0 .text JSGGetDirection__Q26JStage6TLightCFP3Vec */
 void JStage::TLight::JSGGetDirection(Vec*) const {}
 
-/* 80280DD0-80280DD4 27B710 0004+00 1/0 0/0 0/0 .text JSGSetDirection__Q26JStage6TLightFRC3Vec */
 void JStage::TLight::JSGSetDirection(Vec const&) {}
diff --git a/src/JSystem/JStage/JSGObject.cpp b/src/JSystem/JStage/JSGObject.cpp
index bf93e99598..df715ce9d9 100644
--- a/src/JSystem/JStage/JSGObject.cpp
+++ b/src/JSystem/JStage/JSGObject.cpp
@@ -2,56 +2,37 @@
 
 #include "JSystem/JStage/JSGObject.h"
 
-/* 80280DD4-80280E1C 27B714 0048+00 0/0 6/6 0/0 .text            __dt__Q26JStage7TObjectFv */
 JStage::TObject::~TObject() {}
 
-/* 80280E1C-80280E24 27B75C 0008+00 1/0 12/0 0/0 .text            JSGGetName__Q26JStage7TObjectCFv
- */
 
 bool JStage::TObject::JSGGetName() const {
     return false;
 }
 
-/* 80280E24-80280E28 27B764 0004+00 1/0 12/0 0/0 .text            JSGUpdate__Q26JStage7TObjectFv */
 void JStage::TObject::JSGUpdate() {}
 
-/* 80280E28-80280E30 27B768 0008+00 1/0 12/0 0/0 .text            JSGGetFlag__Q26JStage7TObjectCFv
- */
 u32 JStage::TObject::JSGGetFlag() const {
     return 0;
 }
 
-/* 80280E30-80280E34 27B770 0004+00 1/0 12/0 0/0 .text            JSGSetFlag__Q26JStage7TObjectFUl
- */
 void JStage::TObject::JSGSetFlag(u32) {}
 
-/* 80280E34-80280E3C 27B774 0008+00 1/0 12/0 0/0 .text JSGGetData__Q26JStage7TObjectCFUlPvUl */
 bool JStage::TObject::JSGGetData(u32, void*, u32) const {
     return false;
 }
 
-/* 80280E3C-80280E40 27B77C 0004+00 1/0 11/0 0/0 .text JSGSetData__Q26JStage7TObjectFUlPCvUl */
 void JStage::TObject::JSGSetData(u32, void const*, u32) {}
 
-/* 80280E40-80280E44 27B780 0004+00 1/0 12/0 0/0 .text
- * JSGGetParent__Q26JStage7TObjectCFPPQ26JStage7TObjectPUl      */
 void JStage::TObject::JSGGetParent(JStage::TObject**, u32*) const {}
 
-/* 80280E44-80280E48 27B784 0004+00 1/0 12/0 0/0 .text
- * JSGSetParent__Q26JStage7TObjectFPQ26JStage7TObjectUl         */
 void JStage::TObject::JSGSetParent(JStage::TObject*, u32) {}
 
-/* 80280E48-80280E4C 27B788 0004+00 1/0 12/0 0/0 .text
- * JSGSetRelation__Q26JStage7TObjectFbPQ26JStage7TObjectUl      */
 void JStage::TObject::JSGSetRelation(bool, JStage::TObject*, u32) {}
 
-/* 80280E4C-80280E54 27B78C 0008+00 1/0 11/0 0/0 .text JSGFindNodeID__Q26JStage7TObjectCFPCc */
 s32 JStage::TObject::JSGFindNodeID(char const*) const {
     return -1;
 }
 
-/* 80280E54-80280E90 27B794 003C+00 1/0 11/0 0/0 .text
- * JSGGetNodeTransformation__Q26JStage7TObjectCFUlPA4_f         */
 bool JStage::TObject::JSGGetNodeTransformation(u32, MtxP mtx) const {
     mtx[0][0] = 0.0f;
     mtx[0][1] = 0.0f;
diff --git a/src/JSystem/JStage/JSGSystem.cpp b/src/JSystem/JStage/JSGSystem.cpp
index 53cd88a226..98cab4f9ec 100644
--- a/src/JSystem/JStage/JSGSystem.cpp
+++ b/src/JSystem/JStage/JSGSystem.cpp
@@ -2,35 +2,24 @@
 
 #include "JSystem/JStage/JSGSystem.h"
 
-/* 80280E90-80280EF0 27B7D0 0060+00 0/0 1/1 0/0 .text            __dt__Q26JStage7TSystemFv */
 JStage::TSystem::~TSystem() {}
 
-/* 80280EF0-80280EF8 27B830 0008+00 1/0 1/0 0/0 .text            JSGFGetType__Q26JStage7TSystemCFv
- */
 s32 JStage::TSystem::JSGFGetType() const {
     return 1;
 }
 
-/* 80280EF8-80280F00 27B838 0008+00 1/0 0/0 0/0 .text
- * JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */
 int JStage::TSystem::JSGFindObject(JStage::TObject**, char const*, JStage::TEObject) const {
     return 1;
 }
 
-/* 80280F00-80280F08 27B840 0008+00 1/0 1/0 0/0 .text
- * JSGCreateObject__Q26JStage7TSystemFPCcQ26JStage8TEObjectUl   */
 bool JStage::TSystem::JSGCreateObject(char const*, JStage::TEObject, u32) {
     return false;
 }
 
-/* 80280F08-80280F0C 27B848 0004+00 1/0 1/0 0/0 .text
- * JSGDestroyObject__Q26JStage7TSystemFPQ26JStage7TObject       */
 void JStage::TSystem::JSGDestroyObject(JStage::TObject*) {}
 
-/* 80280F0C-80280F14 27B84C 0008+00 1/0 1/0 0/0 .text JSGGetSystemData__Q26JStage7TSystemFUl */
 bool JStage::TSystem::JSGGetSystemData(u32) {
     return false;
 }
 
-/* 80280F14-80280F18 27B854 0004+00 1/0 1/0 0/0 .text JSGSetSystemData__Q26JStage7TSystemFUlUl */
 void JStage::TSystem::JSGSetSystemData(u32, u32) {}
diff --git a/src/JSystem/JStudio/JStudio/ctb-data.cpp b/src/JSystem/JStudio/JStudio/ctb-data.cpp
index af3919d86e..55a83f0d3f 100644
--- a/src/JSystem/JStudio/JStudio/ctb-data.cpp
+++ b/src/JSystem/JStudio/JStudio/ctb-data.cpp
@@ -2,7 +2,4 @@
 
 #include "JSystem/JStudio/JStudio/ctb.h"
 
-/* ############################################################################################## */
-/* 804553F8-80455400 0039F8 0004+04 0/0 1/1 0/0 .sdata2          ga4cSignature__Q37JStudio3ctb4data
- */
 const u32 JStudio::ctb::data::ga4cSignature = 'CTB\0';
diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp
index 4ca8717e21..ac3bd711d3 100644
--- a/src/JSystem/JStudio/JStudio/ctb.cpp
+++ b/src/JSystem/JStudio/JStudio/ctb.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: ctb
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/ctb.h"
@@ -10,54 +5,38 @@
 #include "string.h"
 #include <algorithm.h>
 
-/* 80280F18-80280F60 27B858 0048+00 1/1 0/0 0/0 .text            __dt__Q37JStudio3ctb7TObjectFv */
 JStudio::ctb::TObject::~TObject() {}
 
-/* 80280F60-80280FBC 27B8A0 005C+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3ctb14TObject_TxyzRyFRCQ47JStudio3ctb4data13TParse_TBlock */
 JStudio::ctb::TObject_TxyzRy::TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const& param_0)
     : TObject(param_0.get_ID(), param_0.get_IDSize(), param_0.getContent()) {}
 
-/* 80280FBC-80280FC4 27B8FC 0008+00 1/0 0/0 0/0 .text getScheme__Q37JStudio3ctb14TObject_TxyzRyCFv
- */
 int JStudio::ctb::TObject_TxyzRy::getScheme() const {
     return 1;
 }
 
-/* 80280FC4-80280FF4 27B904 0030+00 0/0 1/1 0/0 .text            __ct__Q37JStudio3ctb8TControlFv */
 JStudio::ctb::TControl::TControl() : pFactory_(NULL) {}
 
-/* 80280FF4-80281060 27B934 006C+00 1/0 1/1 0/0 .text            __dt__Q37JStudio3ctb8TControlFv */
 JStudio::ctb::TControl::~TControl() {}
 
-/* 80281060-802810AC 27B9A0 004C+00 1/1 0/0 0/0 .text
- * appendObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject */
 void JStudio::ctb::TControl::appendObject(JStudio::ctb::TObject* param_0) {
     mList.Push_back(param_0);
 }
 
-/* 802810AC-802810DC 27B9EC 0030+00 1/1 0/0 0/0 .text
- * removeObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject */
 void JStudio::ctb::TControl::removeObject(JStudio::ctb::TObject* param_0) {
     mList.Erase(param_0);
 }
 
-/* 802810DC-8028112C 27BA1C 0050+00 1/1 0/0 0/0 .text
- * destroyObject__Q37JStudio3ctb8TControlFPQ37JStudio3ctb7TObject */
 void JStudio::ctb::TControl::destroyObject(JStudio::ctb::TObject* param_0) {
     removeObject(param_0);
     getFactory()->destroy(param_0);
 }
 
-/* 8028112C-80281190 27BA6C 0064+00 0/0 2/2 0/0 .text destroyObject_all__Q37JStudio3ctb8TControlFv
- */
 void JStudio::ctb::TControl::destroyObject_all() {
     while (!mList.empty()) {
         destroyObject(&mList.back());
     }
 }
 
-/* 80281190-80281230 27BAD0 00A0+00 1/1 0/0 0/0 .text getObject__Q37JStudio3ctb8TControlFPCvUl */
 // NONMATCHING - TPRObject_ID_equal issues
 JStudio::ctb::TObject* JStudio::ctb::TControl::getObject(void const* param_0, u32 param_1) {
     JGadget::TLinkList<TObject, -12>::iterator begin = mList.begin();
@@ -69,8 +48,6 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject(void const* param_0, u3
     return NULL;
 }
 
-/* 80281230-80281274 27BB70 0044+00 0/0 1/1 0/0 .text getObject_index__Q37JStudio3ctb8TControlFUl
- */
 JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
     if (param_0 >= mList.size()) {
         return 0;
@@ -80,11 +57,8 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
     return &*aiStack_14;
 }
 
-/* 80281274-802812BC 27BBB4 0048+00 1/0 1/1 0/0 .text            __dt__Q37JStudio3ctb8TFactoryFv */
 JStudio::ctb::TFactory::~TFactory() {}
 
-/* 802812BC-80281320 27BBFC 0064+00 1/0 0/0 0/0 .text
- * create__Q37JStudio3ctb8TFactoryFRCQ47JStudio3ctb4data13TParse_TBlock */
 JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse_TBlock const& param_0) {
     switch(param_0.get_scheme()) {
     case 1:
@@ -94,22 +68,15 @@ JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse
     }
 }
 
-/* 80281320-8028135C 27BC60 003C+00 1/0 0/0 0/0 .text
- * destroy__Q37JStudio3ctb8TFactoryFPQ37JStudio3ctb7TObject     */
 void JStudio::ctb::TFactory::destroy(JStudio::ctb::TObject* param_0) {
     delete param_0;
 }
 
-/* 8028135C-8028137C 27BC9C 0020+00 0/0 1/1 0/0 .text
- * __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl         */
 // NONMATCHING TParse_header_block vtable location
 JStudio::ctb::TParse::TParse(JStudio::ctb::TControl* param_0) : pControl_(param_0) {}
 
-/* 8028137C-802813DC 27BCBC 0060+00 1/0 1/1 0/0 .text            __dt__Q37JStudio3ctb6TParseFv */
 JStudio::ctb::TParse::~TParse() {}
 
-/* 802813DC-80281470 27BD1C 0094+00 1/0 0/0 0/0 .text
- * parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl            */
 bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_3) {
     JUT_ASSERT(221, ppData_inout!=NULL);
     JUT_ASSERT(222, puBlock_out!=NULL);
@@ -131,8 +98,6 @@ bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBl
     return version <= 1;
 }
 
-/* 80281470-80281554 27BDB0 00E4+00 1/0 0/0 0/0 .text
- * parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl             */
 bool JStudio::ctb::TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 param_3) {
     JUT_ASSERT(260, ppData_inout!=NULL);
     JUT_ASSERT(261, puData_out!=NULL);
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 27aa708d25..f87f5f0699 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: functionvalue
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/functionvalue.h"
@@ -56,8 +51,6 @@ static f64 dummy_literal1() {
 
 namespace functionvalue {
 
-/* 80281710-80281774 27C050 0064+00 4/4 0/0 0/0 .text
- * interpolateValue_hermite__Q27JStudio13functionvalueFddddddd  */
 f64 interpolateValue_hermite(f64 c0, f64 c1, f64 x, f64 c2, f64 x2, f64 c3, f64 x3) {
     f64 a;
     f64 b;
@@ -76,8 +69,6 @@ f64 interpolateValue_hermite(f64 c0, f64 c1, f64 x, f64 c2, f64 x2, f64 c3, f64
 }
 
 
-/* 80281774-802817D8 27C0B4 0064+00 1/1 0/0 0/0 .text
- * interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd */
 f64 interpolateValue_BSpline_uniform(f64 interpolationFactor, f64 point2, f64 point3, f64 point4, f64 point5) {
     f64 inverseInterpolationFactor = (1.0 - interpolationFactor);
     f64 inverseInterpolationFactorSquared = inverseInterpolationFactor * inverseInterpolationFactor;
@@ -99,8 +90,6 @@ f64 interpolateValue_BSpline_uniform(f64 interpolationFactor, f64 point2, f64 po
            (blendFactorForPoint4 * point4);
 }
 
-/* 802817D8-802818B8 27C118 00E0+00 1/1 0/0 0/0 .text
- * interpolateValue_BSpline_nonuniform__Q27JStudio13functionvalueFdPCdPCd */
 f64 interpolateValue_BSpline_nonuniform(f64 interpolationFactor, const f64* controlPoints, const f64* knotVector) {
     f64 knot0              = knotVector[0];
     f64 knot1              = knotVector[1];
@@ -140,8 +129,6 @@ inline f64 interpolateValue_plateau(f64 a1, f64 a2, f64 a3, f64 a4, f64 a5) {
     return interpolateValue_hermite(a1, a2, a3, 0.0, a4, a5, 0.0);
 }
 
-/* 802818B8-80281918 27C1F8 0060+00 1/0 0/0 0/0 .text
- * extrapolateParameter_turn__Q27JStudio13functionvalueFdd      */
 f64 extrapolateParameter_turn(f64 param_0, f64 param_1) {
     f64 dVar2 = 2.0 * param_1;
     f64 dVar1 = extrapolateParameter_repeat(param_0, dVar2);
@@ -239,8 +226,6 @@ TFunctionValueAttribute_range::TFunctionValueAttribute_range()
       mProgress(TFunctionValue::PROG_INIT), mAdjust(TFunctionValue::ADJ_INIT), _20(fBegin_),
       _28(fBegin_), mBegin(TFunctionValue::OUT_INIT), mEnd(TFunctionValue::OUT_INIT) {}
 
-/* 80281D5C-80281DB8 27C69C 005C+00 0/0 1/1 0/0 .text __ct__Q27JStudio24TFunctionValue_compositeFv
- */
 TFunctionValue_composite::TFunctionValue_composite() : pfn_(NULL), data((void*)NULL) {
 }
 
@@ -490,8 +475,6 @@ void TFunctionValue_transition::prepare() {
     interpolate_prepare();
 }
 
-/* 802824F4-802826BC 27CE34 01C8+00 1/0 0/0 0/0 .text
- * getValue__Q27JStudio25TFunctionValue_transitionFd            */
 f64 TFunctionValue_transition::getValue(f64 param_1) {
     f64 progress = range_getParameter_progress(param_1);
     f64 dVar3 = range_getParameter_outside(progress);
@@ -580,8 +563,6 @@ void TFunctionValue_list::prepare() {
     }
 }
 
-/* 80282858-80282C10 27D198 03B8+00 1/0 0/0 0/0 .text getValue__Q27JStudio19TFunctionValue_listFd
- */
 f64 TFunctionValue_list::getValue(f64 param_1) {
     f64 dVar9 = range_getParameter_progress(param_1);
     u32 iVar7 = uData_ - 1;
@@ -744,8 +725,6 @@ void TFunctionValue_list_parameter::prepare() {
     }
 }
 
-/* 80282F10-80282FE8 27D850 00D8+00 1/0 0/0 0/0 .text
- * getValue__Q27JStudio29TFunctionValue_list_parameterFd        */
 f64 TFunctionValue_list_parameter::getValue(f64 param_0) {
     param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
     JUT_ASSERT(1395, pfData_!=NULL)
@@ -908,8 +887,6 @@ void TFunctionValue_hermite::prepare() {
     range_prepare();
 }
 
-/* 8028344C-80283570 27DD8C 0124+00 1/0 0/0 0/0 .text
- * getValue__Q27JStudio22TFunctionValue_hermiteFd               */
 f64 TFunctionValue_hermite::getValue(f64 param_0) {
     param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
     JUT_ASSERT(1716, pfData_!=NULL)
diff --git a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
index 5ba63e1e39..c5d374b619 100644
--- a/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb-data-parse.cpp
@@ -1,14 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: fvb-data-parse
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/fvb-data-parse.h"
 
-/* 802850AC-80285114 27F9EC 0068+00 0/0 1/1 0/0 .text
- * getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData */
 void JStudio::fvb::data::TParse_TParagraph::getData(TParse_TParagraph::TData* data) const
 {
 	u16* parse = (u16*)JGadget::binary::parseVariableUInt_16_32_following(getRaw(), (u32*)data, (u32*)&data->u32Type, NULL);
diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp
index 8ac57d6dda..f3500035b9 100644
--- a/src/JSystem/JStudio/JStudio/fvb.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: fvb
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/fvb.h"
@@ -203,16 +198,12 @@ const data::CompositeOperation saCompositeOperation_[8] = {
     {&TFunctionValue_composite::composite_divide, &getCompositeData_divide_},
 };
 
-/* 80284240-80284254 27EB80 0014+00 1/1 0/0 0/0 .text
- * getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite */
 static const data::CompositeOperation* getCompositeOperation_(data::TEComposite comp) {
     return &saCompositeOperation_[comp];
 }
 
 } // namespace
 
-/* 80284254-802842D4 27EB94 0080+00 1/1 0/0 0/0 .text
-    * __ct__Q37JStudio3fvb17TObject_compositeFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_composite::TObject_composite(const data::TParse_TBlock& block) : TObject(block, &fnValue) {}
 
 void TObject_composite::prepare_data_(const data::TParse_TParagraph::TData& rData,
@@ -235,8 +226,6 @@ void TObject_composite::prepare_data_(const data::TParse_TParagraph::TData& rDat
     fnValue.data_set(op->composite, pfn(&pContent->data));
 }
 
-/* 80284338-802843B8 27EC78 0080+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3fvb16TObject_constantFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_constant::TObject_constant(data::TParse_TBlock const& param_0)
     : TObject(param_0, &fnValue) {}
 
@@ -252,8 +241,6 @@ void TObject_constant::prepare_data_(const data::TParse_TParagraph::TData& rData
     fnValue.data_set(val);
 }
 
-/* 802843C8-80284448 27ED08 0080+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3fvb18TObject_transitionFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_transition::TObject_transition(data::TParse_TBlock const& param_0)
     : TObject(param_0, &fnValue) {}
 
@@ -270,8 +257,6 @@ void TObject_transition::prepare_data_(const data::TParse_TParagraph::TData& rDa
     fnValue.data_set(pContent[0], pContent[1]);
 }
 
-/* 80284460-802844E0 27EDA0 0080+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3fvb12TObject_listFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_list::TObject_list(data::TParse_TBlock const& param_0) : TObject(param_0, &fnValue) {}
 
 void TObject_list::prepare_data_(const data::TParse_TParagraph::TData& rData, TControl* control) {
@@ -287,8 +272,6 @@ void TObject_list::prepare_data_(const data::TParse_TParagraph::TData& rData, TC
     fnValue.data_set(pContent->_8, pContent->_4);
 }
 
-/* 80284500-80284580 27EE40 0080+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3fvb22TObject_list_parameterFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_list_parameter::TObject_list_parameter(data::TParse_TBlock const& param_0)
     : TObject(param_0, &fnValue) {}
 
@@ -305,8 +288,6 @@ void TObject_list_parameter::prepare_data_(const data::TParse_TParagraph::TData&
     fnValue.data_set(pContent->_4, pContent->_0);
 }
 
-/* 802845B0-80284630 27EEF0 0080+00 1/1 0/0 0/0 .text
- * __ct__Q37JStudio3fvb15TObject_hermiteFRCQ47JStudio3fvb4data13TParse_TBlock */
 TObject_hermite::TObject_hermite(data::TParse_TBlock const& param_0) : TObject(param_0, &fnValue) {}
 
 void TObject_hermite::prepare_data_(const data::TParse_TParagraph::TData& rData,
@@ -328,34 +309,25 @@ TControl::~TControl() {
     JUT_EXPECT(ocObject_.empty());
 }
 
-/* 80284704-80284750 27F044 004C+00 1/1 0/0 0/0 .text
- * appendObject__Q37JStudio3fvb8TControlFPQ37JStudio3fvb7TObject */
 void TControl::appendObject(TObject* object) {
     ocObject_.Push_back(object);
 }
 
-/* 80284750-80284780 27F090 0030+00 1/1 0/0 0/0 .text
- * removeObject__Q37JStudio3fvb8TControlFPQ37JStudio3fvb7TObject */
 void TControl::removeObject(TObject* object) {
     ocObject_.Erase(object);
 }
 
-/* 80284780-802847D0 27F0C0 0050+00 1/1 0/0 0/0 .text
- * destroyObject__Q37JStudio3fvb8TControlFPQ37JStudio3fvb7TObject */
 void TControl::destroyObject(TObject* object) {
     removeObject(object);
     getFactory()->destroy(object);
 }
 
-/* 802847D0-80284834 27F110 0064+00 0/0 2/2 0/0 .text destroyObject_all__Q37JStudio3fvb8TControlFv
- */
 void TControl::destroyObject_all() {
     while (!ocObject_.empty()) {
         destroyObject(&ocObject_.back());
     }
 }
 
-/* 80284834-802848D4 27F174 00A0+00 2/2 1/1 0/0 .text getObject__Q37JStudio3fvb8TControlFPCvUl */
 TObject* TControl::getObject(void const* id, u32 idSize) {
     typedef JGadget::TLinkList<TObject, -12>::iterator iterator;
     iterator begin = ocObject_.begin();
@@ -364,8 +336,6 @@ TObject* TControl::getObject(void const* id, u32 idSize) {
     return it != end ? &*it : NULL;
 }
 
-/* 802848D4-80284918 27F214 0044+00 1/1 1/1 0/0 .text getObject_index__Q37JStudio3fvb8TControlFUl
- */
 TObject* TControl::getObject_index(u32 index) {
     if (index >= ocObject_.size()) {
         return NULL;
diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp
index 0a6a241e20..2b49a80e80 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/JStudio/JStudio/jstudio-data.h"
 #include "string.h"
 
-/* 80285114-802851AC 27FA54 0098+00 0/0 1/1 0/0 .text            __ct__Q27JStudio8TControlFv */
 JStudio::TControl::TControl() {
     mTransformOnSet = false;
     mTransformOnGet = false;
@@ -17,11 +16,8 @@ JStudio::TControl::TControl() {
     transform_setOrigin_TxyzRy(aVStack_20, 0.0f);
 }
 
-/* 802851AC-80285228 27FAEC 007C+00 1/0 0/0 0/0 .text            __dt__Q27JStudio8TControlFv */
 JStudio::TControl::~TControl() {}
 
-/* 80285228-80285250 27FB68 0028+00 0/0 1/1 0/0 .text
- * setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory         */
 void JStudio::TControl::setFactory(JStudio::TFactory* factory) {
     fvb::TFactory* fvbFactory = NULL;
     ctb::TFactory* ctbFactory = NULL;
@@ -34,8 +30,6 @@ void JStudio::TControl::setFactory(JStudio::TFactory* factory) {
     ctb_Control.setFactory(ctbFactory);
 }
 
-/* 80285250-802852D0 27FB90 0080+00 3/3 1/1 0/0 .text
- * transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf */
 int JStudio::TControl::transformOnSet_setOrigin_TxyzRy(Vec const& param_0, f32 param_1) {
     field_0x8c = param_0;
     mTransformOnSet_RotationY = param_1;
@@ -43,8 +37,6 @@ int JStudio::TControl::transformOnSet_setOrigin_TxyzRy(Vec const& param_0, f32 p
     return 1;
 }
 
-/* 802852D0-80285368 27FC10 0098+00 3/3 1/1 0/0 .text
- * transformOnGet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf */
 int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 param_1) {
     field_0x98 =  param_0;
     mTransformOnGet_RotationY = param_1;
@@ -54,8 +46,6 @@ int JStudio::TControl::transformOnGet_setOrigin_TxyzRy(Vec const& param_0, f32 p
     return 1;
 }
 
-/* 80285368-8028543C 27FCA8 00D4+00 1/1 0/0 0/0 .text
- * transform_setOrigin_ctb__Q27JStudio8TControlFRCQ37JStudio3ctb7TObject */
 int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& param_0) {
     switch (param_0.getScheme()) {
     case 1:
@@ -72,8 +62,6 @@ int JStudio::TControl::transform_setOrigin_ctb(JStudio::ctb::TObject const& para
     return 1;
 }
 
-/* 8028543C-80285488 27FD7C 004C+00 1/1 0/0 0/0 .text
- * transform_setOrigin_ctb_index__Q27JStudio8TControlFUl        */
 bool JStudio::TControl::transform_setOrigin_ctb_index(u32 index) {
     ctb::TObject* object = ctb_getObject_index(index);
     if (object == NULL) {
@@ -83,21 +71,14 @@ bool JStudio::TControl::transform_setOrigin_ctb_index(u32 index) {
     return true;
 }
 
-/* 80285488-802854D0 27FDC8 0048+00 0/0 4/4 0/0 .text            __dt__Q27JStudio13TCreateObjectFv
- */
 JStudio::TCreateObject::~TCreateObject() {}
 
-/* 802854D0-80285560 27FE10 0090+00 1/0 0/0 0/0 .text            __dt__Q27JStudio8TFactoryFv */
 JStudio::TFactory::~TFactory() {}
 
-/* 80285560-802855AC 27FEA0 004C+00 0/0 1/1 0/0 .text
- * appendCreateObject__Q27JStudio8TFactoryFPQ27JStudio13TCreateObject */
 void JStudio::TFactory::appendCreateObject(JStudio::TCreateObject* param_0) {
     mList.Push_back(param_0);
 }
 
-/* 802855AC-8028566C 27FEEC 00C0+00 1/0 0/0 0/0 .text
- * create__Q27JStudio8TFactoryFRCQ47JStudio3stb4data20TParse_TBlock_object */
 JStudio::TObject* JStudio::TFactory::create(JStudio::stb::data::TParse_TBlock_object const& param_0) {
     JGadget::TContainerEnumerator<TCreateObject, -4> aTStack_368(&mList);
     while(aTStack_368) {
@@ -110,16 +91,11 @@ JStudio::TObject* JStudio::TFactory::create(JStudio::stb::data::TParse_TBlock_ob
     return NULL;
 }
 
-/* 8028566C-802856A8 27FFAC 003C+00 0/0 1/1 0/0 .text __ct__Q27JStudio6TParseFPQ27JStudio8TControl
- */
 JStudio::TParse::TParse(JStudio::TControl* param_0) : stb::TParse(param_0) {
 }
 
-/* 802856A8-80285708 27FFE8 0060+00 1/0 1/1 0/0 .text            __dt__Q27JStudio6TParseFv */
 JStudio::TParse::~TParse() {}
 
-/* 80285708-802857E4 280048 00DC+00 1/0 0/0 0/0 .text
- * parseHeader__Q27JStudio6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl */
 bool JStudio::TParse::parseHeader(JStudio::stb::data::TParse_THeader const& param_0,
                                       u32 param_1) {
     const JStudio::stb::data::THeader::Target& target = param_0.get_target();
@@ -142,8 +118,6 @@ bool JStudio::TParse::parseHeader(JStudio::stb::data::TParse_THeader const& para
     return true;
 }
 
-/* 802857E4-80285844 280124 0060+00 1/0 0/0 0/0 .text
- * parseBlock_block__Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl */
 bool JStudio::TParse::parseBlock_block(JStudio::stb::data::TParse_TBlock const& param_0,
                                            u32 param_1) {
     switch(param_0.get_type()) {
@@ -156,8 +130,6 @@ bool JStudio::TParse::parseBlock_block(JStudio::stb::data::TParse_TBlock const&
     }
 }
 
-/* 80285844-802858F0 280184 00AC+00 1/1 0/0 0/0 .text
- * parseBlock_block_fvb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl */
 bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const& param_0,
                                                 u32 param_1) {
     TControl* pControl = getControl();
@@ -181,8 +153,6 @@ bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock co
     return true;
 }
 
-/* 802858F0-802859DC 280230 00EC+00 1/1 0/0 0/0 .text
- * parseBlock_block_ctb___Q27JStudio6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl */
 bool JStudio::TParse::parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const& param_0,
                                                 u32 param_1) {
     TControl* pControl = getControl();
diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp
index 54eb8d280f..a2faada02a 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: jstudio-math
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/jstudio-math.h"
@@ -10,7 +5,6 @@
 #include "JSystem/TPosition3.h"
 #include "math.h"
 
-/* 802859DC-80285B44 28031C 0168+00 1/1 0/0 0/0 .text getRotation_xyz__Q27JStudio4mathFPA4_ffff */
 void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
     f32 cosx = i_cosf(DEG_TO_RAD(x));
     f32 sinx = i_sinf(DEG_TO_RAD(x));
@@ -37,8 +31,6 @@ void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) {
     param_1[2][3] = 0.0f;
 }
 
-/* 80285B44-80285BCC 280484 0088+00 0/0 2/2 0/0 .text
- * getTransformation_SRxyzT__Q27JStudio4mathFPA4_fRC3VecRC3VecRC3Vec */
 void JStudio::math::getTransformation_SRxyzT(MtxP param_1, Vec const& param_2, Vec const& param_3,
                                              Vec const& param_4) {
     Mtx afStack_40;
@@ -48,8 +40,6 @@ void JStudio::math::getTransformation_SRxyzT(MtxP param_1, Vec const& param_2, V
     MTXTransApply(amStack_70, param_1, param_4.x, param_4.y, param_4.z);
 }
 
-/* 80285BCC-80285E0C 28050C 0240+00 0/0 2/2 0/0 .text
- * getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf */
 void JStudio::math::getFromTransformation_SRxyzT(Vec* param_1, Vec* param_2, Vec* param_3,
                                                      CMtxP param_4) {
     getFromTransformation_S(param_1, param_4);
diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp
index 67e5dcc5b4..8a3fde8851 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: jstudio-object
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/jstudio-object.h"
@@ -29,71 +24,41 @@ private:
     Func mFunc;
 };
 
-/* 8043101C-8043102C 05DD3C 0010+00 1/2 0/0 0/0 .bss
- * soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_actor>
     soovv_actor_PARENT_ENABLE_(&JStudio::TAdaptor_actor::adaptor_do_PARENT_ENABLE);
-/* 80431038-80431048 05DD58 0010+00 1/2 0/0 0/0 .bss
- * soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_actor>
     soovv_actor_RELATION_ENABLE_(&JStudio::TAdaptor_actor::adaptor_do_RELATION_ENABLE);
 
-/* 80431054-80431064 05DD74 0010+00 1/2 0/0 0/0 .bss
- * soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_camera>
     soovv_camera_PARENT_ENABLE_(&JStudio::TAdaptor_camera::adaptor_do_PARENT_ENABLE);
-/* 80431070-80431080 05DD90 0010+00 1/2 0/0 0/0 .bss
- * soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_camera>
     soovv_camera_TARGET_PARENT_ENABLE_(&JStudio::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE);
 
-/* 8043108C-8043109C 05DDAC 0010+00 1/2 0/0 0/0 .bss
- * soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_light>
     soovv_light_ENABLE_(&JStudio::TAdaptor_light::adaptor_do_ENABLE);
 
-/* 804310A8-804310B8 05DDC8 0010+00 0/1 0/0 0/0 .bss
- * soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_particle>
     soovv_particle_PARENT_ENABLE_(&JStudio::TAdaptor_particle::adaptor_do_PARENT_ENABLE);
-/* 804310C4-804310D4 05DDE4 0010+00 0/1 0/0 0/0 .bss
- * soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_particle>
     soovv_particle_REPEAT_(&JStudio::TAdaptor_particle::adaptor_do_REPEAT);
-/* 804310E0-804310F0 05DE00 0010+00 0/1 0/0 0/0 .bss
- * soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_particle>
     soovv_particle_ON_EXIT_NOT_END_(&JStudio::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END);
 
-/* 804310FC-8043110C 05DE1C 0010+00 0/1 0/0 0/0 .bss
- * soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_sound>
     soovv_sound_PARENT_ENABLE_(&JStudio::TAdaptor_sound::adaptor_do_PARENT_ENABLE);
-/* 80431118-80431128 05DE38 0010+00 0/1 0/0 0/0 .bss
- * soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_sound>
     soovv_sound_REPEAT_(&JStudio::TAdaptor_sound::adaptor_do_REPEAT);
-/* 80431134-80431144 05DE54 0010+00 0/1 0/0 0/0 .bss
- * soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_sound>
     soovv_sound_CONTINUOUS_(&JStudio::TAdaptor_sound::adaptor_do_CONTINUOUS);
-/* 80431150-80431160 05DE70 0010+00 0/1 0/0 0/0 .bss
- * soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_sound>
     soovv_sound_LOCATED_(&JStudio::TAdaptor_sound::adaptor_do_LOCATED);
-/* 8043116C-8043117C 05DE8C 0010+00 0/1 0/0 0/0 .bss
- * soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ */
 TOutputVariableValue_BOOL_<JStudio::TAdaptor_sound>
     soovv_sound_ON_EXIT_NOT_END_(&JStudio::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END);
 };  // namespace
 };  // namespace JStudio
 
-/* 80285E0C-80285E54 28074C 0048+00 6/6 11/11 0/0 .text __dt__Q37JStudio14TVariableValue7TOutputFv
- */
 JStudio::TVariableValue::TOutput::~TOutput() {}
 
-/* 80285E54-80285EB8 280794 0064+00 1/1 0/0 0/0 .text
- * update__Q27JStudio14TVariableValueFdPQ27JStudio8TAdaptor     */
 void JStudio::TVariableValue::update(f64 param_0, JStudio::TAdaptor* param_1) {
     if (field_0x8) {
         field_0x8(this, param_0);
@@ -102,67 +67,50 @@ void JStudio::TVariableValue::update(f64 param_0, JStudio::TAdaptor* param_1) {
     }
 }
 
-/* 80285EB8-80285ECC 2807F8 0014+00 4/4 4/4 0/0 .text
- * update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued */
 void JStudio::TVariableValue::update_immediate_(JStudio::TVariableValue* param_0, f64 param_1) {
     param_0->mValue = param_0->field_0xc.val;
     param_0->field_0x8 = NULL;
 }
 
-/* 80285ECC-80285F08 28080C 003C+00 1/1 0/0 0/0 .text
- * update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued */
 void JStudio::TVariableValue::update_time_(JStudio::TVariableValue* param_0, f64 param_1) {
     param_0->mValue = param_0->field_0xc.val * (param_0->field_0x4 * param_1);
 }
 
-/* 80285F08-80285F6C 280848 0064+00 2/2 0/0 0/0 .text
- * update_functionValue___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued */
 void JStudio::TVariableValue::update_functionValue_(JStudio::TVariableValue* param_0,
                                                         f64 param_1) {
     param_0->mValue = param_0->field_0xc.fv->getValue(param_0->field_0x4 * param_1);
 }
 
-/* 80285F6C-80285FCC 2808AC 0060+00 2/1 0/0 0/0 .text
- * __dt__Q37JStudio14TVariableValue13TOutput_none_Fv            */
 JStudio::TVariableValue::TOutput_none_::~TOutput_none_() {}
 
-/* 80285FCC-80285FD0 28090C 0004+00 1/0 0/0 0/0 .text
- * __cl__Q37JStudio14TVariableValue13TOutput_none_CFfPQ27JStudio8TAdaptor */
 void JStudio::TVariableValue::TOutput_none_::operator()(f32 param_0,
                                                         JStudio::TAdaptor* param_1) const {
     /* empty function */
 }
 
-/* 80285FD0-80286018 280910 0048+00 8/8 0/0 0/0 .text            __dt__Q27JStudio8TAdaptorFv */
 JStudio::TAdaptor::~TAdaptor() {}
 
 const char *JStudio::TAdaptor::adaptor_getID_string() const {
     return pObject_ != NULL ? (const char*)pObject_->getID() : "(unnamed)";
 }
 
-/* 80286018-8028601C 280958 0004+00 8/0 2/0 0/0 .text adaptor_do_prepare__Q27JStudio8TAdaptorFv */
 // void JStudio::TAdaptor::adaptor_do_prepare() {
 void JStudio::TAdaptor::adaptor_do_prepare() {
     /* empty function */
 }
 
-/* 8028601C-80286020 28095C 0004+00 8/0 4/0 0/0 .text adaptor_do_begin__Q27JStudio8TAdaptorFv */
 void JStudio::TAdaptor::adaptor_do_begin() {
     /* empty function */
 }
 
-/* 80286020-80286024 280960 0004+00 8/0 2/0 0/0 .text adaptor_do_end__Q27JStudio8TAdaptorFv */
 void JStudio::TAdaptor::adaptor_do_end() {
     /* empty function */
 }
 
-/* 80286024-80286028 280964 0004+00 8/0 2/0 0/0 .text adaptor_do_update__Q27JStudio8TAdaptorFUl */
 void JStudio::TAdaptor::adaptor_do_update(u32 param_0) {
     /* empty function */
 }
 
-/* 80286028-8028602C 280968 0004+00 8/0 4/0 0/0 .text
- * adaptor_do_data__Q27JStudio8TAdaptorFPCvUlPCvUl              */
 void JStudio::TAdaptor::adaptor_do_data(void const* param_0, u32 param_1, void const* param_2,
                                         u32 param_3) {
     /* empty function */
@@ -251,8 +199,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_immediate(
     }
 }
 
-/* 80286204-80286274 280B44 0070+00 0/0 4/4 0/0 .text
- * adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec */
 void JStudio::TAdaptor::adaptor_setVariableValue_Vec(u32 const* puIndex, Vec const& param_2) {
     JUT_ASSERT(400, puIndex!=NULL);
     adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.x);
@@ -260,16 +206,12 @@ void JStudio::TAdaptor::adaptor_setVariableValue_Vec(u32 const* puIndex, Vec con
     adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.z);
 }
 
-/* 80286274-802862AC 280BB4 0038+00 0/0 6/6 0/0 .text
- * adaptor_getVariableValue_Vec__Q27JStudio8TAdaptorCFP3VecPCUl */
 void JStudio::TAdaptor::adaptor_getVariableValue_Vec(Vec* param_1, u32 const* param_2) const {
     param_1->x = adaptor_getVariableValue(param_2[0])->getValue();
     param_1->y = adaptor_getVariableValue(param_2[1])->getValue();
     param_1->z = adaptor_getVariableValue(param_2[2])->getValue();
 }
 
-/* 802862AC-8028638C 280BEC 00E0+00 0/0 3/3 0/0 .text
- * adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor */
 void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* puIndex,
                                                          GXColor const& param_2) {
     JUT_ASSERT(431, puIndex!=NULL);
@@ -279,8 +221,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* puIndex,
     adaptor_referVariableValue(puIndex[3])->setValue_immediate(param_2.a);
 }
 
-/* 8028638C-802864D8 280CCC 014C+00 0/0 4/4 0/0 .text
- * adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl */
 void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1,
                                                              u32 const* param_2) const {
     param_1->r = adaptor_getVariableValue(param_2[0])->getValue_uint8();
@@ -289,8 +229,6 @@ void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1,
     param_1->a = adaptor_getVariableValue(param_2[3])->getValue_uint8();
 }
 
-/* 802864D8-8028656C 280E18 0094+00 1/1 0/0 0/0 .text
- * adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl */
 void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, u32 param_2) {
     JUT_ASSERT(479, pControl!=NULL);
     f64 dVar3 = pControl->getSecondPerFrame();
@@ -352,12 +290,10 @@ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* p
     value->setValue_functionValue(param_2->getFunctionValue_index(*(u32*)param_4));
 }
 
-/* 802866B0-80286734 280FF0 0084+00 8/8 0/0 0/0 .text            __dt__Q27JStudio7TObjectFv */
 JStudio::TObject::~TObject() {
     delete mpAdaptor;
 }
 
-/* 80286734-8028679C 281074 0068+00 1/1 0/0 0/0 .text forward_value__Q27JStudio7TObjectFUl */
 void JStudio::TObject::forward_value(u32 param_0) {
     TAdaptor* adaptor = getAdaptor();
     if (adaptor != NULL) {
@@ -366,7 +302,6 @@ void JStudio::TObject::forward_value(u32 param_0) {
     }
 }
 
-/* 8028679C-802867D4 2810DC 0038+00 9/0 0/0 0/0 .text            do_begin__Q27JStudio7TObjectFv */
 void JStudio::TObject::do_begin() {
     TAdaptor* adaptor = getAdaptor();
     if (adaptor != NULL) {
@@ -374,7 +309,6 @@ void JStudio::TObject::do_begin() {
     }
 }
 
-/* 802867D4-8028680C 281114 0038+00 9/0 0/0 0/0 .text            do_end__Q27JStudio7TObjectFv */
 void JStudio::TObject::do_end() {
     TAdaptor* adaptor = getAdaptor();
     if (adaptor != NULL) {
@@ -382,12 +316,10 @@ void JStudio::TObject::do_end() {
     }
 }
 
-/* 8028680C-8028682C 28114C 0020+00 9/0 0/0 0/0 .text            do_wait__Q27JStudio7TObjectFUl */
 void JStudio::TObject::do_wait(u32 param_0) {
     forward_value(param_0);
 }
 
-/* 8028682C-80286864 28116C 0038+00 9/0 0/0 0/0 .text do_data__Q27JStudio7TObjectFPCvUlPCvUl */
 void JStudio::TObject::do_data(void const* param_0, u32 param_1, void const* param_2,
                                    u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
@@ -396,14 +328,10 @@ void JStudio::TObject::do_data(void const* param_0, u32 param_1, void const* par
     }
 }
 
-/* 80286864-802868B0 2811A4 004C+00 8/8 0/0 0/0 .text
- * __ct__Q27JStudio7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio8TAdaptor */
 JStudio::TObject::TObject(JStudio::stb::data::TParse_TBlock_object const& param_0,
                           JStudio::TAdaptor* param_1)
     : stb::TObject(param_0), mpAdaptor(param_1) {}
 
-/* 802868B0-80286910 2811F0 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_actorFv
- */
 JStudio::TAdaptor_actor::~TAdaptor_actor() {
 }
 
@@ -415,32 +343,20 @@ JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object c
 
 }
 
-/* ############################################################################################## */
-/* 8039AA68-8039AA74 0270C8 000C+00 3/3 2/2 0/0 .rodata
- * sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor */
 u32 const JStudio::TAdaptor_actor::sauVariableValue_3_TRANSLATION_XYZ[3] = {
     3, 4, 5,
 };
 
-/* ############################################################################################## */
-/* 8039AA74-8039AA80 0270D4 000C+00 0/0 2/2 0/0 .rodata
- * sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor  */
  u32 const JStudio::TAdaptor_actor::sauVariableValue_3_ROTATION_XYZ[3] = {
     6, 7, 8,
 };
 
-/* 8039AA80-8039AA8C 0270E0 000C+00 0/0 2/2 0/0 .rodata
- * sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor   */
 u32 const JStudio::TAdaptor_actor::sauVariableValue_3_SCALING_XYZ[3] = {
     9, 10, 11,
 };
 
-/* 804511F0-804511F8 0006F0 0004+04 6/6 6/6 0/0 .sbss soOutput_none___Q27JStudio14TVariableValue
- */
  JStudio::TVariableValue::TOutput_none_ JStudio::TVariableValue::soOutput_none_;
 
-/* 8028694C-80286C9C 28128C 0350+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio13TObject_actorFUlPCvUl              */
 void JStudio::TObject_actor::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
@@ -573,7 +489,6 @@ fun:
     return;
 }
 
-/* 80286C9C-80286CFC 2815DC 0060+00 0/0 1/1 0/0 .text __dt__Q27JStudio21TAdaptor_ambientLightFv */
 JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {}
 
 /* 80286CFC-80286D38 28163C 003C+00 0/0 1/1 0/0 .text
@@ -584,20 +499,14 @@ JStudio::TObject_ambientLight::TObject_ambientLight(
     JStudio::TAdaptor_ambientLight* param_1) : TObject(param_0, param_1) {
 }
 
-/* 8039AA8C-8039AA98 0270EC 000C+00 1/1 0/0 0/0 .rodata
- * sauVariableValue_3_COLOR_RGB__Q27JStudio21TAdaptor_ambientLight */
 u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_3_COLOR_RGB[3] = {
     0, 1, 2,
 };
 
-/* 8039AA98-8039AAA8 0270F8 0010+00 1/1 2/2 0/0 .rodata
- * sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight */
 u32 const JStudio::TAdaptor_ambientLight::sauVariableValue_4_COLOR_RGBA[4] = {
     0, 1, 2, 3,
 };
 
-/* 80286D38-80286E1C 281678 00E4+00 1/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio20TObject_ambientLightFUlPCvUl       */
 void JStudio::TObject_ambientLight::do_paragraph(u32 param_1, void const* param_2,
                                                      u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
@@ -645,8 +554,6 @@ value_n:
     return;
 }
 
-/* 80286E1C-80286E7C 28175C 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio15TAdaptor_cameraFv
- */
 JStudio::TAdaptor_camera::~TAdaptor_camera() {}
 
 /* 80286E7C-80286EB8 2817BC 003C+00 0/0 1/1 0/0 .text
@@ -656,27 +563,18 @@ JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object
                                         JStudio::TAdaptor_camera* param_1)
     : TObject(param_0, param_1) {}
 
-/* ############################################################################################## */
-/* 8039AAA8-8039AAB4 027108 000C+00 1/1 2/2 0/0 .rodata
- * sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera */
 u32 const JStudio::TAdaptor_camera::sauVariableValue_3_POSITION_XYZ[3] = {
     0, 1, 2,
 };
 
-/* 8039AAB4-8039AAC0 027114 000C+00 1/1 2/2 0/0 .rodata
- * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera */
 u32 const JStudio::TAdaptor_camera::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
     3, 4, 5,
 };
 
-/* 804554B0-804554B8 003AB0 0008+00 1/1 0/0 0/0 .sdata2
- * sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera */
 u32 const JStudio::TAdaptor_camera::sauVariableValue_2_DISTANCE_NEAR_FAR[2] = {
     8, 9,
 };
 
-/* 80286EB8-8028717C 2817F8 02C4+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio14TObject_cameraFUlPCvUl             */
 void JStudio::TObject_camera::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
@@ -791,7 +689,6 @@ fun:
     return;
 }
 
-/* 8028717C-802871DC 281ABC 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio12TAdaptor_fogFv */
 JStudio::TAdaptor_fog::~TAdaptor_fog() {}
 
 /* 802871DC-80287218 281B1C 003C+00 0/0 1/1 0/0 .text
@@ -800,27 +697,18 @@ JStudio::TAdaptor_fog::~TAdaptor_fog() {}
 JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                       JStudio::TAdaptor_fog* param_1) : TObject(param_0, param_1) {}
 
-/* ############################################################################################## */
-/* 8039AAC0-8039AACC 027120 000C+00 1/1 0/0 0/0 .rodata
- * sauVariableValue_3_COLOR_RGB__Q27JStudio12TAdaptor_fog       */
 u32 const JStudio::TAdaptor_fog::sauVariableValue_3_COLOR_RGB[3] = {
     0, 1, 2,
 };
 
-/* 8039AACC-8039AADC 02712C 0010+00 1/1 2/2 0/0 .rodata
- * sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog      */
 u32 const JStudio::TAdaptor_fog::sauVariableValue_4_COLOR_RGBA[4] = {
     0, 1, 2, 3,
 };
 
-/* 804554B8-804554C0 003AB8 0008+00 1/1 0/0 0/0 .sdata2
- * sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog */
 u32 const JStudio::TAdaptor_fog::sauVariableValue_2_RANGE_BEGIN_END[2] = {
     4, 5,
 };
 
-/* 80287218-80287308 281B58 00F0+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio11TObject_fogFUlPCvUl                */
 void JStudio::TObject_fog::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
@@ -877,8 +765,6 @@ value_n:
     return;
 }
 
-/* 80287308-80287368 281C48 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_lightFv
- */
 JStudio::TAdaptor_light::~TAdaptor_light() {}
 
 /* 80287368-802873A4 281CA8 003C+00 0/0 1/1 0/0 .text
@@ -887,39 +773,26 @@ JStudio::TAdaptor_light::~TAdaptor_light() {}
 JStudio::TObject_light::TObject_light(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_light* param_1) : TObject(param_0, param_1) {}
 
-/* 804554C0-804554C8 003AC0 0008+00 1/1 0/0 0/0 .sdata2
- * sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light */
 u32 const JStudio::TAdaptor_light::sauVariableValue_2_DIRECTION_THETA_PHI[2] = {
     10, 11,
 };
 
-/* ############################################################################################## */
-/* 8039AADC-8039AAE8 02713C 000C+00 0/0 0/0 0/0 .rodata
- * sauVariableValue_3_COLOR_RGB__Q27JStudio14TAdaptor_light     */
  u32 const JStudio::TAdaptor_light::sauVariableValue_3_COLOR_RGB[3] = {
     0, 1, 2,
 };
 
-/* 8039AAE8-8039AAF8 027148 0010+00 0/0 2/2 0/0 .rodata
- * sauVariableValue_4_COLOR_RGBA__Q27JStudio14TAdaptor_light    */
 u32 const JStudio::TAdaptor_light::sauVariableValue_4_COLOR_RGBA[4] = {
     0, 1, 2, 3,
 };
 
-/* 8039AAF8-8039AB04 027158 000C+00 0/0 2/2 0/0 .rodata
- * sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light  */
 u32 const JStudio::TAdaptor_light::sauVariableValue_3_POSITION_XYZ[3] = {
     4, 5, 6,
 };
 
-/* 8039AB04-8039AB10 027164 000C+00 0/0 2/2 0/0 .rodata
- * sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light */
 u32 const JStudio::TAdaptor_light::sauVariableValue_3_TARGET_POSITION_XYZ[3] = {
     7, 8, 9,
 };
 
-/* 802873A4-802875E0 281CE4 023C+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio13TObject_lightFUlPCvUl              */
 void JStudio::TObject_light::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
@@ -1031,7 +904,6 @@ fun:
     return;
 }
 
-/* 802875E0-80287640 281F20 0060+00 0/0 1/1 0/0 .text __dt__Q27JStudio16TAdaptor_messageFv */
 JStudio::TAdaptor_message::~TAdaptor_message() {}
 
 /* 80287640-8028767C 281F80 003C+00 0/0 1/1 0/0 .text
@@ -1041,8 +913,6 @@ JStudio::TObject_message::TObject_message(JStudio::stb::data::TParse_TBlock_obje
                                           JStudio::TAdaptor_message* param_1)
     : TObject(param_0, param_1) {}
 
-/* 8028767C-8028770C 281FBC 0090+00 1/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio15TObject_messageFUlPCvUl            */
 void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     if (adaptor != NULL) {
@@ -1063,7 +933,6 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3
 
 }
 
-/* 8028770C-8028776C 28204C 0060+00 0/0 1/1 0/0 .text __dt__Q27JStudio17TAdaptor_particleFv */
 JStudio::TAdaptor_particle::~TAdaptor_particle() {}
 
 /* 8028776C-802877A8 2820AC 003C+00 0/0 1/1 0/0 .text
@@ -1072,50 +941,34 @@ JStudio::TAdaptor_particle::~TAdaptor_particle() {}
 JStudio::TObject_particle::TObject_particle(
     JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_particle* param_1) : TObject(param_0, param_1) {}
 
-/* 8039AB10-8039AB1C 027170 000C+00 0/0 1/1 0/0 .rodata
- * sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle */
  u32 const JStudio::TAdaptor_particle::sauVariableValue_3_TRANSLATION_XYZ[3] = {
     0, 1, 2,
 };
 
-/* 8039AB1C-8039AB28 02717C 000C+00 0/0 1/1 0/0 .rodata
- * sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_3_ROTATION_XYZ[3] = {
     3, 4, 5,
 };
 
-/* 8039AB28-8039AB34 027188 000C+00 0/0 1/1 0/0 .rodata
- * sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_3_SCALING_XYZ[3] = {
     6, 7, 8,
 };
 
-/* 8039AB34-8039AB40 027194 000C+00 0/0 0/0 0/0 .rodata
- * sauVariableValue_3_COLOR_RGB__Q27JStudio17TAdaptor_particle  */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR_RGB[3] = {
     9, 10, 11,
 };
 
-/* 8039AB40-8039AB50 0271A0 0010+00 0/0 1/1 0/0 .rodata
- * sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR_RGBA[4] = {
     9, 10, 11, 12,
 };
 
-/* 8039AB50-8039AB5C 0271B0 000C+00 0/0 0/0 0/0 .rodata
- * sauVariableValue_3_COLOR1_RGB__Q27JStudio17TAdaptor_particle */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_3_COLOR1_RGB[3] = {
     9, 10, 11,
 };
 
-/* 8039AB5C-8039AB6C 0271BC 0010+00 0/0 0/0 0/0 .rodata
- * sauVariableValue_4_COLOR1_RGBA__Q27JStudio17TAdaptor_particle */
 u32 const JStudio::TAdaptor_particle::sauVariableValue_4_COLOR1_RGBA[4] = {
     9, 10, 11, 12,
 };
 
-/* 802877A8-80287B3C 2820E8 0394+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio16TObject_particleFUlPCvUl           */
 void JStudio::TObject_particle::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
@@ -1281,8 +1134,6 @@ fun:
     return;
 }
 
-/* 80287B3C-80287B9C 28247C 0060+00 0/0 1/1 0/0 .text            __dt__Q27JStudio14TAdaptor_soundFv
- */
 JStudio::TAdaptor_sound::~TAdaptor_sound() {}
 
 /* 80287B9C-80287BD8 2824DC 003C+00 0/0 1/1 0/0 .text
@@ -1291,14 +1142,10 @@ JStudio::TAdaptor_sound::~TAdaptor_sound() {}
 JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_sound* param_1) : TObject(param_0, param_1) {}
 
-/* 8039AB6C-8039AB78 0271CC 000C+00 1/1 1/1 0/0 .rodata
- * sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound  */
 u32 const JStudio::TAdaptor_sound::sauVariableValue_3_POSITION_XYZ[3] = {
     0, 1, 2,
 };
 
-/* 80287BD8-80287F04 282518 032C+00 2/0 0/0 0/0 .text
- * do_paragraph__Q27JStudio13TObject_soundFUlPCvUl              */
 void JStudio::TObject_sound::do_paragraph(u32 param_1, void const* param_2, u32 param_3) {
     TAdaptor* adaptor = getAdaptor();
     TControl* control;
diff --git a/src/JSystem/JStudio/JStudio/object-id.cpp b/src/JSystem/JStudio/JStudio/object-id.cpp
index 75220d8740..80bc1529d5 100644
--- a/src/JSystem/JStudio/JStudio/object-id.cpp
+++ b/src/JSystem/JStudio/JStudio/object-id.cpp
@@ -7,8 +7,6 @@
 #include "JSystem/JStudio/JStudio/object-id.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80288988-80288A78 2832C8 00F0+00 0/0 3/3 0/0 .text
- * isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData */
 bool JStudio::object::TIDData::isEqual(JStudio::object::TIDData const& a,
                                        JStudio::object::TIDData const& b) {
     u32 aSize = a.getIDSize();
diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
index 8cba3d99c5..c98f658239 100644
--- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: stb-data-parse
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/stb-data-parse.h"
diff --git a/src/JSystem/JStudio/JStudio/stb-data.cpp b/src/JSystem/JStudio/JStudio/stb-data.cpp
index 889a3cd7c4..f7164b6902 100644
--- a/src/JSystem/JStudio/JStudio/stb-data.cpp
+++ b/src/JSystem/JStudio/JStudio/stb-data.cpp
@@ -1,7 +1,6 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio/stb-data.h"
-#include "dol2asm.h"
 
 const s32 JStudio::stb::data::gauDataSize_TEParagraph_data[8] = {0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40};
-SECTION_SDATA2 u32 JStudio::stb::data::ga4cSignature = 'STB\0';
+const u32 JStudio::stb::data::ga4cSignature = 'STB\0';
diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp
index 027784e432..b3e20a63f7 100644
--- a/src/JSystem/JStudio/JStudio/stb.cpp
+++ b/src/JSystem/JStudio/JStudio/stb.cpp
@@ -297,8 +297,6 @@ TControl::~TControl() {
     JUT_EXPECT(ocObject_.empty());
 }
 
-/* 80289228-80289278 283B68 0050+00 1/1 0/0 0/0 .text
- * appendObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject */
 void TControl::appendObject(TObject* p) {
     p->setControl_(this);
     mObjectContainer.Push_back(p);
@@ -317,15 +315,12 @@ void TControl::destroyObject(TObject* p) {
     pFactory->destroy(p);
 }
 
-/* 80289300-80289364 283C40 0064+00 0/0 2/2 0/0 .text destroyObject_all__Q37JStudio3stb8TControlFv
- */
 void TControl::destroyObject_all() {
     while (!mObjectContainer.empty()) {
         destroyObject(&mObjectContainer.back());
     }
 }
 
-/* 80289364-80289404 283CA4 00A0+00 1/1 0/0 0/0 .text getObject__Q37JStudio3stb8TControlFPCvUl */
 // NONMATCHING - TPRObject_ID_equal copy issue
 TObject* TControl::getObject(void const* param_0, u32 param_1) {
     JGadget::TLinkList<TObject, -12>::iterator begin = mObjectContainer.begin();
@@ -337,7 +332,6 @@ TObject* TControl::getObject(void const* param_0, u32 param_1) {
     return NULL;
 }
 
-/* 80289404-802894B4 283D44 00B0+00 0/0 1/1 0/0 .text            reset__Q37JStudio3stb8TControlFv */
 void TControl::reset() {
     resetStatus_();
     mObject_control.reset(NULL);
@@ -347,8 +341,6 @@ void TControl::reset() {
     }
 }
 
-/* 802894B4-802895B4 283DF4 0100+00 0/0 2/2 0/0 .text            forward__Q37JStudio3stb8TControlFUl
- */
 bool TControl::forward(u32 param_0) {
     _54 = mObject_control.getSuspend();
     bool rv = mObject_control.forward(param_0);
diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
index 753c73df07..d53afdf8d6 100644
--- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
@@ -7,8 +7,6 @@
 #include "JSystem/JStudio/JStudio_JAudio2/control.h"
 #include "JSystem/JGadget/pointer.h"
 
-/* 8028D550-8028D5B0 287E90 0060+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio213TCreateObjectFv
- */
 JStudio_JAudio2::TCreateObject::~TCreateObject() {}
 
 /* 8028D5B0-8028D624 287EF0 0074+00 1/0 0/0 0/0 .text
diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
index bf2e25ceac..223e740245 100644
--- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
@@ -11,26 +11,18 @@
 namespace JStudio_JAudio2 {
 namespace {
     
-/* 8028D728-8028D750 288068 0028+00 1/1 0/0 0/0 .text
- * setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_VOLUME_(JAISound *param_1, float param_2) {
     param_1->getAuxiliary().moveVolume(param_2, 0);
 }
 
-/* 8028D750-8028D778 288090 0028+00 1/1 0/0 0/0 .text
- * setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_PAN_(JAISound *param_1, float param_2) {
     param_1->getAuxiliary().movePan(param_2, 0);
 }
 
-/* 8028D778-8028D7A0 2880B8 0028+00 1/1 0/0 0/0 .text
- * setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_PITCH_(JAISound *param_1, float param_2) {
     param_1->getAuxiliary().movePitch(param_2, 0);
 }
 
-/* 8028D7A0-8028D800 2880E0 0060+00 1/1 0/0 0/0 .text
- * setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_TEMPO_(JAISound *param_1, float param_2) {
     JAITempoMgr* tempoMgr = param_1->getTempoMgr();
     if (tempoMgr != NULL) {
@@ -38,8 +30,6 @@ static void setValue_TEMPO_(JAISound *param_1, float param_2) {
     }
 }
 
-/* 8028D800-8028D828 288140 0028+00 1/1 0/0 0/0 .text
- * setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
 static void setValue_ECHO_(JAISound *param_1, float param_2) {
     param_1->getAuxiliary().moveFxMix(param_2, 0);
 }
@@ -47,8 +37,6 @@ static void setValue_ECHO_(JAISound *param_1, float param_2) {
 };  // namespace
 };  // namespace JStudio_JAudio2
 
-/* 8028D828-8028D8F4 288168 00CC+00 0/0 1/1 0/0 .text
- * __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject */
 JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) :
     pCreateObject_(param_1) {
     field_0x11c = 0;
@@ -65,8 +53,6 @@ JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject*
     JUT_ASSERT(112, pCreateObject_!=NULL);
 }
 
-/* 8028D8F4-8028D9A4 288234 00B0+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio214TAdaptor_soundFv
- */
 JStudio_JAudio2::TAdaptor_sound::~TAdaptor_sound() {
     if (opJAISoundHandle_) {
         if (field_0x11f == 0) {
@@ -79,8 +65,6 @@ JStudio_JAudio2::TAdaptor_sound::~TAdaptor_sound() {
     }
 }
 
-/* 8028D9A4-8028DA74 2882E4 00D0+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv    */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() {
     static JStudio::TAdaptor::TSetVariableValue_immediate aoData[4] = {
         TSetVariableValue_immediate(0, 0.0f),
@@ -94,8 +78,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_prepare() {
     }
 }
 
-/* 804314F8-80431540 05E218 0048+00 1/2 0/0 0/0 .bss
- * saoVVOSetValue___Q215JStudio_JAudio214TAdaptor_sound         */
 JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::saoVVOSetValue_[6] = {
     JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_(
         JStudio_JAudio2::TAdaptor_sound::UNK_7, setValue_VOLUME_ 
@@ -117,13 +99,9 @@ JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_ JStudio_JAudio2::TAdaptor_sound::
     ),
 };
 
-/* 8028DA74-8028DA78 2883B4 0004+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q215JStudio_JAudio214TAdaptor_soundFv        */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() {
 }
 
-/* 8028DA78-8028DC20 2883B8 01A8+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl    */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
     const JStudio::TObject* pObject = adaptor_getObject();
     JUT_ASSERT(194, pObject!=NULL);
@@ -166,8 +144,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
     }
 }
 
-/* 8028DC20-8028DC54 288560 0034+00 1/0 0/0 0/0 .text
- * adaptor_do_SOUND__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperationData param_1,
                                                            void const* pContent, u32 uSize) {
     switch(param_1) {
@@ -180,8 +156,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperatio
     }
 }
 
-/* 8028DC54-8028DC88 288594 0034+00 1/0 0/0 0/0 .text
- * adaptor_do_BEGIN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1,
                                                        void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -206,8 +180,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(
     }
 }
 
-/* 8028DCD0-8028DD00 288610 0030+00 1/0 0/0 0/0 .text
- * adaptor_do_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationData param_1,
                                                      void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -232,8 +204,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(
     }
 }
 
-/* 8028DD48-8028DDB4 288688 006C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -288,8 +258,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(
     }
 }
 
-/* 8028DE50-8028DE6C 288790 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_REPEAT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1,
                                                         const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -311,8 +279,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe
     }
 }
 
-/* 8028DE88-8028DEB0 2887C8 0028+00 1/0 0/0 0/0 .text
- * adaptor_do_LOCATED__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1,
                                                          const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -338,8 +304,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
     }
 }
 
-/* 8028DECC-8028DF04 28880C 0038+00 1/0 0/0 0/0 .text
- * __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */
 void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1,
                                                                 JStudio::TAdaptor* param_2) const {
     JUT_ASSERT(596, param_2 != NULL);
@@ -349,8 +313,6 @@ void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1,
     }
 }
 
-/* 8028DF04-8028DFA4 288844 00A0+00 2/2 0/0 0/0 .text
- * prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv         */
 void JStudio_JAudio2::TAdaptor_sound::prepareSound_() {
     if (opJAISoundHandle_) {
         opJAISoundHandle_stop_();
@@ -366,8 +328,6 @@ void JStudio_JAudio2::TAdaptor_sound::prepareSound_() {
     }
 }
 
-/* 8028DFA4-8028E054 2888E4 00B0+00 3/3 0/0 0/0 .text
- * beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv    */
 void JStudio_JAudio2::TAdaptor_sound::beginSound_fadeIn_() {
     if (opJAISoundHandle_) {
         opJAISoundHandle_->fadeIn(field_0x128);
@@ -376,8 +336,6 @@ void JStudio_JAudio2::TAdaptor_sound::beginSound_fadeIn_() {
     }
 }
 
-/* 8028E054-8028E094 288994 0040+00 2/2 0/0 0/0 .text
- * endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl    */
 void JStudio_JAudio2::TAdaptor_sound::endSound_fadeOut_(u32 u32FadeTime) {
 	if (opJAISoundHandle_) {
 		opJAISoundHandle_->stop(u32FadeTime);
diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
index 0925aaa37e..0d240bb15f 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
@@ -8,8 +8,6 @@
 #include "JSystem/JParticle/JPAEmitterManager.h"
 #include "JSystem/JGadget/pointer.h"
 
-/* 8028E3A0-8028E400 288CE0 0060+00 1/0 1/1 0/0 .text __dt__Q217JStudio_JParticle13TCreateObjectFv
- */
 JStudio_JParticle::TCreateObject::~TCreateObject() {}
 
 /* 8028E400-8028E474 288D40 0074+00 1/0 1/0 0/0 .text
@@ -31,8 +29,6 @@ JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject,
     return true;
 }
 
-/* 8028E474-8028E4E4 288DB4 0070+00 1/0 0/0 0/0 .text
- * emitter_create__Q217JStudio_JParticle13TCreateObjectFUl      */
 JPABaseEmitter* JStudio_JParticle::TCreateObject::emitter_create(u32 param_1) {
     JGeometry::TVec3<f32> local_08;
     Vec local_1c = {0.0f, 0.0f, 0.0f};
@@ -41,8 +37,6 @@ JPABaseEmitter* JStudio_JParticle::TCreateObject::emitter_create(u32 param_1) {
         local_08, param_1 & 0xffff, (param_1 >> 24) & 0xff, (param_1 >> 16) & 0xff, NULL, NULL);
 }
 
-/* 8028E4E4-8028E508 288E24 0024+00 1/0 1/0 0/0 .text
- * emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter */
 void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter) {
     pJPAEmitterManager_->forceDeleteEmitter(pEmitter);
 }
diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
index b5f2d9b895..95257c90d8 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
@@ -7,8 +7,6 @@
 #include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
 #include "JSystem/JStudio/JStudio_JStage/control.h"
 
-/* 8028E60C-8028E700 288F4C 00F4+00 0/0 1/1 0/0 .text
- * __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject */
 JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
     JStudio_JParticle::TCreateObject* param_1) :
     pCreateObject_(param_1),
@@ -30,8 +28,6 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
     JUT_ASSERT(90, pCreateObject_!=NULL);
 }
 
-/* 8028E760-8028E850 2890A0 00F0+00 1/0 0/0 0/0 .text
- * __dt__Q217JStudio_JParticle17TAdaptor_particleFv             */
 JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() {
     if (pJPAEmitter_ != NULL) {
         if (field_0x1b6 == 0) {
@@ -45,8 +41,6 @@ JStudio_JParticle::TAdaptor_particle::~TAdaptor_particle() {
     }
 }
 
-/* 8028E850-8028E97C 289190 012C+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_prepare() {
     static JStudio::TAdaptor::TSetVariableValue_immediate aoData[18] = {
         JStudio::TAdaptor::TSetVariableValue_immediate(0, 0.0f),
@@ -71,13 +65,9 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_prepare() {
     adaptor_setVariableValue_immediate(aoData);
 }
 
-/* 8028E97C-8028E980 2892BC 0004+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv   */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() {
 }
 
-/* 8028E980-8028EA68 2892C0 00E8+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
     const JStudio::TObject* pObject = adaptor_getObject();
     JUT_ASSERT(179, pObject != NULL);
@@ -148,8 +138,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
     }
 }
 
-/* 8028EAF8-8028EB24 289438 002C+00 1/0 0/0 0/0 .text
- * adaptor_do_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOperationData param_1,
                                                           const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x1) {
@@ -265,8 +253,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::d
     }
 }
 
-/* 8028ECC0-8028F060 289600 03A0+00 1/0 0/0 0/0 .text
- * execute__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */
 void
 JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmitter* pJPAEmitter) {
     JUT_ASSERT(518, pJPAEmitter==pThis_->pJPAEmitter_);
@@ -356,8 +342,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABas
     }
 }
 
-/* 8028F098-8028F0D0 2899D8 0038+00 1/0 0/0 0/0 .text
- * draw__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */
 void
 JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter* pJPAEmitter) {
     if (pOld != NULL) {
@@ -365,8 +349,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::draw(JPABaseEmitter
     }
 }
 
-/* 8028F0D0-8028F108 289A10 0038+00 1/0 0/0 0/0 .text
- * drawAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */
 void
 JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEmitter* pJPAEmitter) {
     if (pOld != NULL) {
@@ -374,8 +356,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::drawAfter(JPABaseEm
     }
 }
 
-/* 8028F108-8028F1C0 289A48 00B8+00 3/3 0/0 0/0 .text
- * beginParticle_fadeIn___Q217JStudio_JParticle17TAdaptor_particleFv */
 void JStudio_JParticle::TAdaptor_particle::beginParticle_fadeIn_() {
     if (pJPAEmitter_ != NULL) {
         pCreateObject_->emitter_destroy(pJPAEmitter_);
@@ -396,8 +376,6 @@ void JStudio_JParticle::TAdaptor_particle::beginParticle_fadeIn_() {
     }
 }
 
-/* 8028F1C0-8028F2E8 289B00 0128+00 1/1 0/0 0/0 .text
- * endParticle_fadeOut___Q217JStudio_JParticle17TAdaptor_particleFUl */
 void JStudio_JParticle::TAdaptor_particle::endParticle_fadeOut_(u32 param_1) {
     if (pJPAEmitter_ == NULL) {
         return;
diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp
index acb33f66c6..b27bb05780 100644
--- a/src/JSystem/JStudio/JStudio_JStage/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: control
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio_JStage/control.h"
@@ -12,7 +7,6 @@
 #include "JSystem/JStage/JSGCamera.h"
 #include "JSystem/JStage/JSGAmbientLight.h"
 
-/* 80289B00-80289B60 284440 0060+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage13TCreateObjectFv */
 JStudio_JStage::TCreateObject::~TCreateObject() {}
 
 /* 80289B60-80289CE4 2844A0 0184+00 1/0 0/0 0/0 .text
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
index a8bcd1fed8..f7ba8bea84 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
@@ -1,14 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: object-actor
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio_JStage/object-actor.h"
 
-/* 8028A5F0-8028A6B4 284F30 00C4+00 0/0 1/1 0/0 .text
- * __ct__Q214JStudio_JStage14TAdaptor_actorFPCQ26JStage7TSystemPQ26JStage6TActor */
 JStudio_JStage::TAdaptor_actor::TAdaptor_actor(JStage::TSystem const* param_1,
                                                    JStage::TActor* param_2)         :
                                                    TAdaptor_object_(param_1,param_2) {
@@ -22,14 +15,10 @@ JStudio_JStage::TAdaptor_actor::TAdaptor_actor(JStage::TSystem const* param_1,
     field_0x14c = -1;
 }
 
-/* 8028A6B4-8028A728 284FF4 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage14TAdaptor_actorFv
- */
 JStudio_JStage::TAdaptor_actor::~TAdaptor_actor() {
     adaptor_do_end();
 }
 
-/* 8028A728-8028A7B4 285068 008C+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_actorFv     */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() {
     const TVVOutputObject* pOutput = saoVVOutput_;
     while (!pOutput->isEnd_()) {
@@ -44,8 +33,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_prepare() {
     }
 }
 
-/* 8028A7B4-8028A8D8 2850F4 0124+00 1/0 0/0 0/0 .text
- * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_actorFv       */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
     adaptor_object_begin_();
     const JStage::TActor* pActor = get_pJSG_();
@@ -75,14 +62,10 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
     }
 }
 
-/* 8028A8D8-8028A92C 285218 0054+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q214JStudio_JStage14TAdaptor_actorFv         */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_end() {
     adaptor_object_end_();
 }
 
-/* 8028A92C-8028A974 28526C 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl     */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) {
     const JStudio::TObject* pObject = adaptor_getObject();
     JUT_ASSERT(104, pObject != NULL);
@@ -92,23 +75,17 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) {
     pJSGObject_->JSGUpdate();
 }
 
-/* 8028A974-8028A998 2852B4 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_data__Q214JStudio_JStage14TAdaptor_actorFPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_data(void const* param_1, u32 param_2,
                                                      void const* param_3, u32 param_4) {
     adaptor_object_data_(param_1, param_2, param_3, param_4);
 }
 
-/* 8028A998-8028A9F0 2852D8 0058+00 1/0 0/0 0/0 .text
- * adaptor_do_SHAPE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_SHAPE(JStudio::data::TEOperationData operation,
                                                           void const* param_2, u32 param_3) {
     setJSG_ID_(&JStage::TActor::JSGSetShape, operation, param_2, param_3);
 }
 
 
-/* 8028A9F0-8028AA48 285330 0058+00 1/0 0/0 0/0 .text
- * adaptor_do_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOperationData operation,
                                                           void const* param_2, u32 param_3) {
     setJSG_ID_(&JStage::TActor::JSGSetAnimation, operation, param_2, param_3);
@@ -151,8 +128,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE(
     }
 }
 
-/* 8028AAC8-8028AB0C 285408 0044+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -227,8 +202,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION(
     }
 }
 
-/* 8028AC04-8028AC48 285544 0044+00 1/0 0/0 0/0 .text
- * adaptor_do_RELATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -286,8 +259,6 @@ void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*function)
     }
 }
 
-/* 8028AD38-8028AECC 285678 0194+00 1/1 0/0 0/0 .text
- * setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_actor::setJSG_SRT_(JStudio::TControl const* pControl) {
     JStudio::TControl::TTransform_translation_rotation_scaling transform;
     JStudio::TControl::TTransform_translation_rotation_scaling multipliedTransform;
@@ -328,8 +299,6 @@ void JStudio_JStage::TAdaptor_actor::setJSG_SRT_(JStudio::TControl const* pContr
     pActor->JSGSetScaling(pTransform->scaling);
 }
 
-/* 8028AECC-8028B064 28580C 0198+00 1/1 0/0 0/0 .text
- * getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_actor::getJSG_SRT_(JStudio::TControl const* pControl) {
     JStudio::TControl::TTransform_translation_rotation_scaling transform;
     JStudio::TControl::TTransform_translation_rotation_scaling trs;
@@ -371,8 +340,6 @@ void JStudio_JStage::TAdaptor_actor::getJSG_SRT_(JStudio::TControl const* pContr
     adaptor_setVariableValue_Vec(sauVariableValue_3_SCALING_XYZ, outTransform->scaling);
 }
 
-/* 8028B064-8028B138 2859A4 00D4+00 1/0 0/0 0/0 .text
- * __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStudio8TAdaptor */
 void JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()(
     f32 param_1, JStudio::TAdaptor* adaptor) const {
     JStage::TActor* actor = static_cast<TAdaptor_actor*>(adaptor)->get_pJSG_();
@@ -397,22 +364,16 @@ void JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::operator()(
     (actor->*mSetter)(param_1);
 }
 
-/* 8028B138-8028B198 285A78 0060+00 2/1 0/0 0/0 .text
- * __dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv */
 JStudio_JStage::TAdaptor_actor::TVVOutput_ANIMATION_FRAME_::~TVVOutput_ANIMATION_FRAME_() {
 }
 
 namespace JStudio_JStage {
     
-/* 804311A0-804311E0 05DEC0 0040+00 2/3 0/0 0/0 .bss
- * saoVVOutput___Q214JStudio_JStage14TAdaptor_actor             */
 const TAdaptor_actor::TVVOutputObject TAdaptor_actor::saoVVOutput_[] = {
     TVVOutputObject(TAdaptor_actor::TEACTOR_1, &JStage::TActor::JSGSetAnimationTransition, &JStage::TActor::JSGGetAnimationTransition),
     TVVOutputObject()
 };
 
-/* 80431204-80431298 05DF24 0090+04 2/3 0/0 0/0 .bss
- * saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor */
 const TAdaptor_actor::TVVOutput_ANIMATION_FRAME_ TAdaptor_actor::saoVVOutput_ANIMATION_FRAME_[] = {
     TVVOutput_ANIMATION_FRAME_(0, 305, &JStage::TActor::JSGSetAnimationFrame, &JStage::TActor::JSGGetAnimationFrame, &JStage::TActor::JSGGetAnimationFrameMax),
     TVVOutput_ANIMATION_FRAME_(2, 309, &JStage::TActor::JSGSetTextureAnimationFrame, &JStage::TActor::JSGGetTextureAnimationFrame, &JStage::TActor::JSGGetTextureAnimationFrameMax),
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp
index 20ff9c88e0..2d14618769 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp
@@ -6,39 +6,27 @@
 
 #include "JSystem/JStudio/JStudio_JStage/object-ambientlight.h"
 
-/* 8028B610-8028B6AC 285F50 009C+00 0/0 1/1 0/0 .text
- * __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight */
 JStudio_JStage::TAdaptor_ambientLight::TAdaptor_ambientLight(JStage::TSystem const* param_1,
                                                              JStage::TAmbientLight* param_2)
     : TAdaptor_object_(param_1, param_2) {}
 
-/* 8028B6AC-8028B720 285FEC 0074+00 1/0 0/0 0/0 .text
- * __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv            */
 JStudio_JStage::TAdaptor_ambientLight::~TAdaptor_ambientLight() {
     adaptor_do_end();
 }
 
-/* 8028B720-8028B724 286060 0004+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv */
 void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_prepare() {
 }
 
-/* 8028B724-8028B7B0 286064 008C+00 1/0 0/0 0/0 .text
- * adaptor_do_begin__Q214JStudio_JStage21TAdaptor_ambientLightFv */
 void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_begin() {
     adaptor_object_begin_();
     GXColor color = get_pJSG_()->JSGGetColor();
     adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, color);
 }
 
-/* 8028B7B0-8028B804 2860F0 0054+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q214JStudio_JStage21TAdaptor_ambientLightFv  */
 void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_end() {
     adaptor_object_end_();
 }
 
-/* 8028B804-8028B87C 286144 0078+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q214JStudio_JStage21TAdaptor_ambientLightFUl */
 void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(u32 param_1) {
     JStage::TAmbientLight* lightObj = get_pJSG_();
     GXColor color;
@@ -47,8 +35,6 @@ void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_update(u32 param_1) {
     pJSGObject_->JSGUpdate();
 }
 
-/* 8028B87C-8028B8A0 2861BC 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_ambientLight::adaptor_do_data(void const* param_1, u32 param_2,
                                                             void const* param_3, u32 param_4) {
     adaptor_object_data_(param_1, param_2, param_3, param_4);
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
index 0ab70536d1..7f5849bb1b 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
@@ -6,8 +6,6 @@
 
 #include "JSystem/JStudio/JStudio_JStage/object-camera.h"
 
-/* 8028B8A0-8028B960 2861E0 00C0+00 0/0 1/1 0/0 .text
- * __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera */
 JStudio_JStage::TAdaptor_camera::TAdaptor_camera(JStage::TSystem const* param_1,
                                                  JStage::TCamera* param_2)
     : TAdaptor_object_(param_1, param_2) {
@@ -20,14 +18,10 @@ JStudio_JStage::TAdaptor_camera::TAdaptor_camera(JStage::TSystem const* param_1,
     field_0x120 = 0;
 }
 
-/* 8028B960-8028B9D4 2862A0 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage15TAdaptor_cameraFv
- */
 JStudio_JStage::TAdaptor_camera::~TAdaptor_camera() {
     adaptor_do_end();
 }
 
-/* 804312D4-80431378 05DFF4 00A0+04 2/3 0/0 0/0 .bss
- * saoVVOutput___Q214JStudio_JStage15TAdaptor_camera            */
 JStudio_JStage::TAdaptor_camera::TVVOutput JStudio_JStage::TAdaptor_camera::saoVVOutput_[5] = {
     TVVOutput(JStudio_JStage::TAdaptor_camera::TECAMERA_7, &JStage::TCamera::JSGSetViewRoll,
               &JStage::TCamera::JSGGetViewRoll),
@@ -40,8 +34,6 @@ JStudio_JStage::TAdaptor_camera::TVVOutput JStudio_JStage::TAdaptor_camera::saoV
     TVVOutput(),
 };
 
-/* 8028B9D4-8028BA1C 286314 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q214JStudio_JStage15TAdaptor_cameraFv    */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_prepare() {
     TVVOutput* pOutput = saoVVOutput_;
     while (!pOutput->isEnd_()) {
@@ -50,8 +42,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_prepare() {
     }
 }
 
-/* 8028BA1C-8028BAF8 28635C 00DC+00 1/0 0/0 0/0 .text
- * adaptor_do_begin__Q214JStudio_JStage15TAdaptor_cameraFv      */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() {
     adaptor_object_begin_();
     JStage::TCamera* pCamera = get_pJSG_();
@@ -68,14 +58,10 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() {
     }
 }
 
-/* 8028BAF8-8028BB4C 286438 0054+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q214JStudio_JStage15TAdaptor_cameraFv        */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_end() {
     adaptor_object_end_();
 }
 
-/* 8028BB4C-8028BBAC 28648C 0060+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl    */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) {
     const JStudio::TObject* pObject = adaptor_getObject();
     JUT_ASSERT(98, pObject != NULL);
@@ -86,15 +72,11 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) {
     pJSGObject_->JSGUpdate();
 }
 
-/* 8028BBAC-8028BBD0 2864EC 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_data__Q214JStudio_JStage15TAdaptor_cameraFPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_data(void const* param_1, u32 param_2,
                                                       void const* param_3, u32 param_4) {
     adaptor_object_data_(param_1, param_2, param_3, param_4);
 }
 
-/* 8028BBD0-8028BC14 286510 0044+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperationData param_1,
                                                         void const* pContent, u32 uSize) {
     switch(param_1) {
@@ -215,8 +197,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE(
     }
 }
 
-/* 8028BDBC-8028BEB8 2866FC 00FC+00 1/1 0/0 0/0 .text
- * setJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const* param_1) {
     JStudio::TControl::TTransform_position VStack_138;
     JStudio::TControl::TTransform_position VStack_144;
@@ -242,8 +222,6 @@ void JStudio_JStage::TAdaptor_camera::setJSG_position_(JStudio::TControl const*
     get_pJSG_()->JSGSetViewPosition(*pViewPosition);
 }
 
-/* 8028BEB8-8028BFBC 2867F8 0104+00 1/1 0/0 0/0 .text
- * getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_camera::getJSG_position_(JStudio::TControl const* param_1) {
     Mtx mtx;
     JStudio::TControl::TTransform_position transform;
@@ -281,8 +259,6 @@ void JStudio_JStage::TAdaptor_camera::getJSG_position_(JStudio::TControl const*
     adaptor_setVariableValue_Vec(sauVariableValue_3_POSITION_XYZ, *outTransform);
 }
 
-/* 8028BFBC-8028C09C 2868FC 00E0+00 1/1 0/0 0/0 .text
- * setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_camera::setJSG_targetPosition_(JStudio::TControl const* param_1) {
 	JStudio::TControl::TTransform_position transform;
 	JStudio::TControl::TTransform_position tempTransform;
@@ -301,8 +277,6 @@ void JStudio_JStage::TAdaptor_camera::setJSG_targetPosition_(JStudio::TControl c
     get_pJSG_()->JSGSetViewTargetPosition(*outTransform);
 }
 
-/* 8028C09C-8028C180 2869DC 00E4+00 1/1 0/0 0/0 .text
- * getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl */
 void JStudio_JStage::TAdaptor_camera::getJSG_targetPosition_(JStudio::TControl const* param_1) {
     Mtx mtx;
     JStudio::TControl::TTransform_position transform;
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp
index 08dee86502..9d884d2aa9 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-fog.cpp
@@ -6,26 +6,19 @@
 
 #include "JSystem/JStudio/JStudio_JStage/object-fog.h"
 
-/* 8028C574-8028C610 286EB4 009C+00 0/0 1/1 0/0 .text
- * __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog */
 JStudio_JStage::TAdaptor_fog::TAdaptor_fog(JStage::TSystem const* param_0, JStage::TFog* param_1)
     : TAdaptor_object_(param_0, param_1) {}
 
-/* 8028C610-8028C684 286F50 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage12TAdaptor_fogFv */
 JStudio_JStage::TAdaptor_fog::~TAdaptor_fog() {
     adaptor_do_end();
 }
 
-/* 8043139C-80431400 05E0BC 0060+04 2/3 0/0 0/0 .bss
- * saoVVOutput___Q214JStudio_JStage12TAdaptor_fog               */
 JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog> JStudio_JStage::TAdaptor_fog::saoVVOutput_[3] = {
     JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(JStudio_JStage::TAdaptor_fog::TEFOG_4, &JStage::TFog::JSGSetStartZ, &JStage::TFog::JSGGetStartZ),
     JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(JStudio_JStage::TAdaptor_fog::TEFOG_5, &JStage::TFog::JSGSetEndZ, &JStage::TFog::JSGGetEndZ),
     JStudio_JStage::TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>(),
 };
 
-/* 8028C684-8028C6CC 286FC4 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv       */
 void JStudio_JStage::TAdaptor_fog::adaptor_do_prepare() {
     TVariableValueOutput_object_<JStudio_JStage::TAdaptor_fog, JStage::TFog>* pOutput =
         saoVVOutput_;
@@ -35,8 +28,6 @@ void JStudio_JStage::TAdaptor_fog::adaptor_do_prepare() {
     }
 }
 
-/* 8028C6CC-8028C7B4 28700C 00E8+00 1/0 0/0 0/0 .text
- * adaptor_do_begin__Q214JStudio_JStage12TAdaptor_fogFv         */
 void JStudio_JStage::TAdaptor_fog::adaptor_do_begin() {
     adaptor_object_begin_();
     JStage::TFog* pFog = get_pJSG_();
@@ -49,14 +40,10 @@ void JStudio_JStage::TAdaptor_fog::adaptor_do_begin() {
     }
 }
 
-/* 8028C7B4-8028C808 2870F4 0054+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv           */
 void JStudio_JStage::TAdaptor_fog::adaptor_do_end() {
     adaptor_object_end_();
 }
 
-/* 8028C808-8028C880 287148 0078+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl       */
 void JStudio_JStage::TAdaptor_fog::adaptor_do_update(u32 param_1) {
     JStage::TFog* pFog = get_pJSG_();
     GXColor color;
@@ -65,8 +52,6 @@ void JStudio_JStage::TAdaptor_fog::adaptor_do_update(u32 param_1) {
     pJSGObject_->JSGUpdate();
 }
 
-/* 8028C880-8028C8A4 2871C0 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_fog::adaptor_do_data(void const* param_1, u32 param_2,
                                                        void const* param_3, u32 param_4) {
     adaptor_object_data_(param_1, param_2, param_3, param_4);
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp
index 13779d74e1..21536bd449 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp
@@ -1,28 +1,17 @@
-//
-// Generated By: dol2asm
-// Translation Unit: object-light
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JStudio/JStudio_JStage/object-light.h"
 
-/* 8028CB50-8028CBF4 287490 00A4+00 0/0 1/1 0/0 .text
- * __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight */
 JStudio_JStage::TAdaptor_light::TAdaptor_light(JStage::TSystem const* param_1,
                                                JStage::TLight* param_2)
     : JStudio_JStage::TAdaptor_object_(param_1, param_2) {
     field_0x11c = 0;
 }
 
-/* 8028CBF4-8028CC68 287534 0074+00 1/0 0/0 0/0 .text __dt__Q214JStudio_JStage14TAdaptor_lightFv
- */
 JStudio_JStage::TAdaptor_light::~TAdaptor_light() {
     adaptor_do_end();
 }
 
-/* 80431448-80431490 05E168 0048+00 1/2 0/0 0/0 .bss
- * saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light   */
 JStudio_JStage::TAdaptor_light::TVVOutput_direction_
     JStudio_JStage::TAdaptor_light::saoVVOutput_direction_[6] = {
         JStudio_JStage::TAdaptor_light::TVVOutput_direction_(
@@ -43,8 +32,6 @@ JStudio_JStage::TAdaptor_light::TVVOutput_direction_
         JStudio_JStage::TAdaptor_light::TVVOutput_direction_(),
 };
 
-/* 8028CC68-8028CCB0 2875A8 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv     */
 void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() {
     TVVOutput_direction_* pOutput = saoVVOutput_direction_;
     while (!pOutput->isEnd_()) {
@@ -53,8 +40,6 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() {
     }
 }
 
-/* 8028CCB0-8028CF68 2875F0 02B8+00 1/0 0/0 0/0 .text
- * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv       */
 // NONMATCHING - regalloc
 void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
     {
@@ -87,14 +72,10 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
     }
 }
 
-/* 8028CF68-8028CFBC 2878A8 0054+00 1/0 0/0 0/0 .text
- * adaptor_do_end__Q214JStudio_JStage14TAdaptor_lightFv         */
 void JStudio_JStage::TAdaptor_light::adaptor_do_end() {
     adaptor_object_end_();
 }
 
-/* 8028CFBC-8028D18C 2878FC 01D0+00 1/0 0/0 0/0 .text
- * adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl     */
 void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
     JStage::TLight* lightObj = get_pJSG_();
     const JStudio::TObject* pObject = adaptor_getObject();
@@ -132,15 +113,11 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
     pJSGObject_->JSGUpdate();
 }
 
-/* 8028D18C-8028D1B0 287ACC 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_light::adaptor_do_data(void const* param_1, u32 param_2,
                                                      void const* param_3, u32 param_4) {
     adaptor_object_data_(param_1, param_2, param_3, param_4);
 }
 
-/* 8028D1B0-8028D228 287AF0 0078+00 1/0 0/0 0/0 .text
- * adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperationData param_1,
                                                         void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -168,15 +145,11 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperati
     end:;
 }
 
-/* 8028D228-8028D24C 287B68 0024+00 1/0 0/0 0/0 .text
- * adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl */
 void JStudio_JStage::TAdaptor_light::adaptor_do_ENABLE(JStudio::data::TEOperationData param_1,
                                                        void const* param_2, u32 param_3) {
     adaptor_object_ENABLE_(param_1, param_2, param_3);
 }
 
-/* 8028D24C-8028D258 287B8C 000C+00 1/0 0/0 0/0 .text
- * __cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor */
 void JStudio_JStage::TAdaptor_light::TVVOutput_direction_::operator()(
     f32 param_0, JStudio::TAdaptor* param_1) const {
     ((JStudio_JStage::TAdaptor_light*)param_1)->field_0x11c = field_0x8;
diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp
index 2950bf0203..d7f048fc14 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp
@@ -88,8 +88,6 @@ bool JStudio_JStage::transform_toLocalFromGlobal(
     return true;
 }
 
-/* 8028A470-8028A4BC 284DB0 004C+00 0/0 5/5 0/0 .text
- * adaptor_object_data___Q214JStudio_JStage16TAdaptor_object_FPCvUlPCvUl */
 void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_1, u32 param_2,
                                                             void const* param_3, u32 param_4) {
     int uVar3;
@@ -101,8 +99,6 @@ void JStudio_JStage::TAdaptor_object_::adaptor_object_data_(void const* param_1,
     pJSGObject_->JSGSetData(uVar3, param_3, param_4);
 }
 
-/* 8028A4BC-8028A50C 284DFC 0050+00 0/0 4/4 0/0 .text
- * adaptor_object_findJSGObject___Q214JStudio_JStage16TAdaptor_object_FPCc */
 JStage::TObject*
 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_1) {
     JStage::TObject* pJSGObject;
@@ -114,8 +110,6 @@ JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* para
     return pJSGObject;
 }
 
-/* 8028A50C-8028A550 284E4C 0044+00 0/0 4/4 0/0 .text
- * adaptor_object_findJSGObjectNode___Q214JStudio_JStage16TAdaptor_object_FPCQ26JStage7TObjectPCc */
 s32 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_(
     JStage::TObject const* param_1, char const* param_2) {
     if (param_1 == NULL) {
diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/src/JSystem/JSupport/JSUFileStream.cpp
index de0f9446e3..c05bc5d2cb 100644
--- a/src/JSystem/JSupport/JSUFileStream.cpp
+++ b/src/JSystem/JSupport/JSUFileStream.cpp
@@ -1,21 +1,13 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JSUFileStream
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUFileStream.h"
 #include "JSystem/JKernel/JKRFile.h"
 
-/* 802DC638-802DC67C 2D6F78 0044+00 0/0 1/1 0/0 .text __ct__18JSUFileInputStreamFP7JKRFile */
 JSUFileInputStream::JSUFileInputStream(JKRFile* pFile) {
     mFile = pFile;
     mPosition = 0;
 }
 
-/* 802DC67C-802DC74C 2D6FBC 00D0+00 1/0 0/0 0/0 .text            readData__18JSUFileInputStreamFPvl
- */
 u32 JSUFileInputStream::readData(void* pBuffer, s32 length) {
     s32 lenRead = 0;
     if (mFile->isAvailable()) {
@@ -36,8 +28,6 @@ u32 JSUFileInputStream::readData(void* pBuffer, s32 length) {
     return lenRead;
 }
 
-/* 802DC74C-802DC82C 2D708C 00E0+00 1/0 0/0 0/0 .text
- * seekPos__18JSUFileInputStreamFl17JSUStreamSeekFrom           */
 s32 JSUFileInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) {
     s32 oldPos = mPosition;
 
@@ -64,13 +54,10 @@ s32 JSUFileInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) {
     return mPosition - oldPos;
 }
 
-/* 802DC82C-802DC85C 2D716C 0030+00 1/0 0/0 0/0 .text            getLength__18JSUFileInputStreamCFv
- */
 s32 JSUFileInputStream::getLength() const {
     return mFile->getFileSize();
 }
 
-/* 802DC85C-802DC864 2D719C 0008+00 1/0 0/0 0/0 .text getPosition__18JSUFileInputStreamCFv */
 s32 JSUFileInputStream::getPosition() const {
     return mPosition;
 }
diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp
index 3fa8ca0a30..c5f566a577 100644
--- a/src/JSystem/JSupport/JSUInputStream.cpp
+++ b/src/JSystem/JSupport/JSUInputStream.cpp
@@ -1,22 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JSUInputStream
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUInputStream.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include <dolphin.h>
 
-/* 802DC23C-802DC298 2D6B7C 005C+00 1/0 6/6 0/0 .text            __dt__14JSUInputStreamFv */
 JSUInputStream::~JSUInputStream() {
     if (!isGood()) {
         OS_REPORT("JSUInputStream: occur error.\n");
     }
 }
 
-/* 802DC298-802DC2F0 2D6BD8 0058+00 1/1 20/20 0/0 .text            read__14JSUInputStreamFPvl */
 s32 JSUInputStream::read(void* buffer, s32 numBytes) {
     s32 bytesRead = readData(buffer, numBytes);
     if (bytesRead != numBytes) {
@@ -41,7 +34,6 @@ char* JSUInputStream::read(char* str) {
     return str;
 }
 
-/* 802DC2F0-802DC370 2D6C30 0080+00 1/0 0/0 0/0 .text            skip__14JSUInputStreamFl */
 s32 JSUInputStream::skip(s32 count) {
     u8 buffer;
     s32 skipCount = 0;
@@ -55,7 +47,6 @@ s32 JSUInputStream::skip(s32 count) {
     return skipCount;
 }
 
-/* 802DC370-802DC3FC 2D6CB0 008C+00 0/0 1/1 0/0 .text            align__20JSURandomInputStreamFl */
 s32 JSURandomInputStream::align(s32 alignment) {
     s32 seekLen = 0;
     s32 currentPos = getPosition();
@@ -72,7 +63,6 @@ s32 JSURandomInputStream::align(s32 alignment) {
     return alignmentOffset;
 }
 
-/* 802DC3FC-802DC458 2D6D3C 005C+00 1/0 2/0 0/0 .text            skip__20JSURandomInputStreamFl */
 s32 JSURandomInputStream::skip(s32 param_0) {
     s32 val = seekPos(param_0, JSUStreamSeekFrom_CUR);
     if (val != param_0) {
@@ -81,7 +71,6 @@ s32 JSURandomInputStream::skip(s32 param_0) {
     return val;
 }
 
-/* 802DC458-802DC4DC 2D6D98 0084+00 0/0 8/8 0/0 .text            peek__20JSURandomInputStreamFPvl */
 s32 JSURandomInputStream::peek(void* buffer, s32 numBytes) {
     s32 oldPos = getPosition();
     s32 bytesRead = read(buffer, numBytes);
@@ -91,8 +80,6 @@ s32 JSURandomInputStream::peek(void* buffer, s32 numBytes) {
     return bytesRead;
 }
 
-/* 802DC4DC-802DC520 2D6E1C 0044+00 0/0 16/16 0/0 .text
- * seek__20JSURandomInputStreamFl17JSUStreamSeekFrom            */
 s32 JSURandomInputStream::seek(s32 param_0, JSUStreamSeekFrom param_1) {
     s32 seekResult = seekPos(param_0, param_1);
     clrState(IOS_STATE_1);
diff --git a/src/JSystem/JSupport/JSUList.cpp b/src/JSystem/JSupport/JSUList.cpp
index ee9538bca5..1a544fb60c 100644
--- a/src/JSystem/JSupport/JSUList.cpp
+++ b/src/JSystem/JSupport/JSUList.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JSUList
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUList.h"
diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp
index 135fd5d20c..02913807d5 100644
--- a/src/JSystem/JSupport/JSUMemoryStream.cpp
+++ b/src/JSystem/JSupport/JSUMemoryStream.cpp
@@ -1,21 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JSUMemoryStream
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JSupport/JSUMemoryStream.h"
 #include "string.h"
 
-/* 802DC520-802DC534 2D6E60 0014+00 0/0 3/3 0/0 .text setBuffer__20JSUMemoryInputStreamFPCvl */
 void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) {
     mBuffer = pBuffer;
     mLength = length;
     mPosition = 0;
 }
 
-/* 802DC534-802DC5AC 2D6E74 0078+00 1/0 0/0 0/0 .text readData__20JSUMemoryInputStreamFPvl */
 u32 JSUMemoryInputStream::readData(void* pData, s32 length) {
     if (mPosition + length > mLength) {
         length = mLength - mPosition;
@@ -29,8 +22,6 @@ u32 JSUMemoryInputStream::readData(void* pData, s32 length) {
     return length;
 }
 
-/* 802DC5AC-802DC628 2D6EEC 007C+00 1/0 0/0 0/0 .text
- * seekPos__20JSUMemoryInputStreamFl17JSUStreamSeekFrom         */
 s32 JSUMemoryInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) {
     s32 oldPos = mPosition;
 
@@ -57,12 +48,10 @@ s32 JSUMemoryInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) {
     return mPosition - oldPos;
 }
 
-/* 802DC628-802DC630 2D6F68 0008+00 1/0 0/0 0/0 .text getLength__20JSUMemoryInputStreamCFv */
 s32 JSUMemoryInputStream::getLength() const {
     return mLength;
 }
 
-/* 802DC630-802DC638 2D6F70 0008+00 1/0 0/0 0/0 .text getPosition__20JSUMemoryInputStreamCFv */
 s32 JSUMemoryInputStream::getPosition() const {
     return mPosition;
 }
diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp
index 174b384034..72113f6863 100644
--- a/src/JSystem/JUtility/JUTAssert.cpp
+++ b/src/JSystem/JUtility/JUTAssert.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTAssert
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTAssert.h"
@@ -12,25 +7,17 @@
 #include "stdio.h"
 #include <dolphin/vi.h>
 
-/* 804508F8-80450900 000378 0008+00 0/0 3/3 0/0 .sdata           None */
 bool sAssertVisible = true;
 
 namespace JUTAssertion {
 
-/* 802E495C-802E4960 2DF29C 0004+00 0/0 1/1 0/0 .text            create__12JUTAssertionFv */
 void create() {}
 
 namespace {
-/* 80451530-80451538 000A30 0004+04 2/2 0/0 0/0 .sbss
- * sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@      */
 static u32 sMessageLife;
 
-/* 80434870-804348B0 061590 0040+00 2/2 0/0 0/0 .bss
- * sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@  */
 static char sMessageFileLine[64];
 
-/* 804348B0-804349B0 0615D0 0100+00 2/2 0/0 0/0 .bss
- * sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@    */
 static char sMessageString[256];
 
 static s32 sDisplayTime = -1;
@@ -40,8 +27,6 @@ static s32 sMessageOwner;
 static u8 mSynchro;
 };  // namespace
 
-/* 802E4960-802E499C 2DF2A0 003C+00 2/2 0/0 0/0 .text            flush_subroutine__12JUTAssertionFv
- */
 u32 flush_subroutine() {
     if (sMessageLife == 0) {
         return 0;
@@ -58,7 +43,6 @@ u32 flush_subroutine() {
     return 0;
 }
 
-/* 802E499C-802E4A54 2DF2DC 00B8+00 0/0 1/1 0/0 .text            flushMessage__12JUTAssertionFv */
 void flushMessage() {
     if (flush_subroutine() && sAssertVisible == true) {
         JUTDirectPrint* manager = JUTDirectPrint::getManager();
@@ -70,7 +54,6 @@ void flushMessage() {
     }
 }
 
-/* 802E4A54-802E4C34 2DF394 01E0+00 0/0 1/1 0/0 .text flushMessage_dbPrint__12JUTAssertionFv */
 void flushMessage_dbPrint() {
     if (flush_subroutine() && sAssertVisible == true && JUTDbPrint::getManager() != NULL) {
         JUTFont* font = JUTDbPrint::getManager()->getFont();
@@ -88,7 +71,6 @@ u32 getSDevice() {
     return sDevice;
 }
 
-/* 802C7698-802C7788       .text setConfirmMessage__12JUTAssertionFUlPcibPCc */
 void setConfirmMessage(u32 param_1, char* file, int line, bool param_4, const char* msg) {
     if (param_4 == 1) {
         return;
@@ -148,12 +130,10 @@ void showAssert_f(u32 device, const char* file, int line, const char* msg, ...)
     va_end(args);
 }
 
-/* 802C7788-802C78E4       .text showAssert__12JUTAssertionFUlPCciPCc */
 void showAssert(u32 device, const char* file, int line, const char* msg) {
     showAssert_f(device, file, line, "%s", msg);
 }
 
-/* 802C78E4-802C79FC       .text setWarningMessage_f_va */
 void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args) {
     u32 messageLife = sMessageLife;
     bool r26 = false;
@@ -177,7 +157,6 @@ void setWarningMessage_f_va(u32 device, const char* file, int line, const char*
     }
 }
 
-/* 802C79FC-802C7A7C       .text setWarningMessage_f__12JUTAssertionFUlPciPCce */
 void setWarningMessage_f(u32 device, char* file, int line, const char* msg, ...) {
     va_list args;
     va_start(args, msg);
@@ -185,7 +164,6 @@ void setWarningMessage_f(u32 device, char* file, int line, const char* msg, ...)
     va_end(args);
 }
 
-/* 802C7A7C-802C7B94       .text setLogMessage_f_va */
 void setLogMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args) {
     u32 messageLife = sMessageLife;
     bool r26 = false;
@@ -209,7 +187,6 @@ void setLogMessage_f_va(u32 device, const char* file, int line, const char* msg,
     }
 }
 
-/* 802C7B94-802C7C14       .text setLogMessage_f__12JUTAssertionFUlPciPCce */
 void setLogMessage_f(u32 device, char* file, int line, const char* msg, ...) {
     va_list args;
     va_start(args, msg);
@@ -217,13 +194,10 @@ void setLogMessage_f(u32 device, char* file, int line, const char* msg, ...) {
     va_end(args);
 }
 
-/* 802E4C34-802E4C3C 2DF574 0008+00 0/0 2/2 0/0 .text            setVisible__12JUTAssertionFb */
 void setVisible(bool visible) {
     sAssertVisible = visible;
 }
 
-/* 802E4C3C-802E4C54 2DF57C 0018+00 0/0 2/2 0/0 .text            setMessageCount__12JUTAssertionFi
- */
 void setMessageCount(int msg_count) {
     sMessageLife = msg_count <= 0 ? 0 : msg_count;
 }
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index 53886e6393..4ddb4bbc52 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTCacheFont
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTCacheFont.h"
@@ -12,8 +7,6 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "dolphin/gx.h"
 
-/* 802DD188-802DD208 2D7AC8 0080+00 0/0 1/1 0/0 .text __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap
- */
 JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) {
     initialize_state();
     JUTResFont::initialize_state();
@@ -21,7 +14,6 @@ JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_h
     initiate(p_fontRes, NULL, cacheSize, p_heap);
 }
 
-/* 802DD208-802DD29C 2D7B48 0094+00 1/0 0/0 0/0 .text            __dt__12JUTCacheFontFv */
 JUTCacheFont::~JUTCacheFont() {
     if (isValid()) {
         deleteMemBlocks_CacheFont();
@@ -34,8 +26,6 @@ JUTCacheFont::~JUTCacheFont() {
     }
 }
 
-/* 802DD29C-802DD320 2D7BDC 0084+00 3/3 0/0 0/0 .text deleteMemBlocks_CacheFont__12JUTCacheFontFv
- */
 void JUTCacheFont::deleteMemBlocks_CacheFont() {
     if (field_0xb0 != 0) {
         delete[] mCacheBuffer;
@@ -49,8 +39,6 @@ void JUTCacheFont::deleteMemBlocks_CacheFont() {
     delete field_0x84;
 }
 
-/* 802DD320-802DD35C 2D7C60 003C+00 3/3 0/0 0/0 .text            initialize_state__12JUTCacheFontFv
- */
 void JUTCacheFont::initialize_state() {
     field_0xb0 = 0;
     mCacheBuffer = NULL;
@@ -70,8 +58,6 @@ void JUTCacheFont::initialize_state() {
     field_0xa0 = NULL;
 }
 
-/* 802DD35C-802DD4EC 2D7C9C 0190+00 1/1 0/0 0/0 .text
- * getMemorySize__12JUTCacheFontFPC7ResFONTPUsPUlPUsPUlPUsPUlPUl */
 int JUTCacheFont::getMemorySize(ResFONT const* p_font, u16* o_widCount, u32* o_widSize,
                                 u16* o_glyCount, u32* o_glySize, u16* o_mapCount, u32* o_mapSize,
                                 u32* o_glyTexSize) {
@@ -148,8 +134,6 @@ int JUTCacheFont::getMemorySize(ResFONT const* p_font, u16* o_widCount, u32* o_w
     return 1;
 }
 
-/* 802DD4EC-802DD54C 2D7E2C 0060+00 1/1 0/0 0/0 .text
- * initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap             */
 int JUTCacheFont::initiate(ResFONT const* p_fontRes, void* param_1, u32 param_2, JKRHeap* p_heap) {
     if (!internal_initiate(p_fontRes, param_1, param_2, p_heap)) {
         deleteMemBlocks_CacheFont();
@@ -162,8 +146,6 @@ int JUTCacheFont::initiate(ResFONT const* p_fontRes, void* param_1, u32 param_2,
     return 1;
 }
 
-/* 802DD54C-802DD650 2D7E8C 0104+00 1/1 0/0 0/0 .text
- * internal_initiate__12JUTCacheFontFPC7ResFONTPvUlP7JKRHeap    */
 bool JUTCacheFont::internal_initiate(ResFONT const* p_fontRes, void* param_1, u32 param_2,
                                      JKRHeap* param_3) {
     deleteMemBlocks_CacheFont();
@@ -191,7 +173,6 @@ bool JUTCacheFont::internal_initiate(ResFONT const* p_fontRes, void* param_1, u3
     return true;
 }
 
-/* 802DD650-802DD804 2D7F90 01B4+00 1/1 0/0 0/0 .text allocArea__12JUTCacheFontFPvUlP7JKRHeap */
 bool JUTCacheFont::allocArea(void* param_0, u32 param_1, JKRHeap* heap) {
     mInf1Ptr = (ResFONT::INF1*)new (heap, 0) ResFONT();
     if (mInf1Ptr == NULL) {
@@ -247,7 +228,6 @@ bool JUTCacheFont::allocArea(void* param_0, u32 param_1, JKRHeap* heap) {
     return true;
 }
 
-/* 802DD804-802DD8EC 2D8144 00E8+00 1/1 0/0 0/0 .text allocArray__12JUTCacheFontFP7JKRHeap */
 bool JUTCacheFont::allocArray(JKRHeap* param_0) {
     mMemBlocks = (void**)new (param_0, 0) u32[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum];
     if (mMemBlocks == NULL) {
@@ -272,7 +252,6 @@ bool JUTCacheFont::allocArray(JKRHeap* param_0) {
     return true;
 }
 
-/* 802DD8EC-802DDB0C 2D822C 0220+00 1/0 0/0 0/0 .text            setBlock__12JUTCacheFontFv */
 void JUTCacheFont::setBlock() {
     int widthNum = 0;
     int gylphNum = 0;
@@ -332,7 +311,6 @@ void JUTCacheFont::setBlock() {
     }
 }
 
-/* 802DDB0C-802DDBBC 2D844C 00B0+00 1/1 0/0 0/0 .text determineBlankPage__12JUTCacheFontFv */
 JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() {
     TGlyphCacheInfo* pVar1 = field_0xa4;
     if (pVar1 != NULL) {
@@ -385,7 +363,6 @@ void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0,
                     GX_ANISO_1);
 }
 
-/* 802DDCE4-802DDD98 2D8624 00B4+00 1/0 0/0 0/0 .text loadImage__12JUTCacheFontFi11_GXTexMapID */
 void JUTCacheFont::loadImage(int param_0, _GXTexMapID texMapId) {
     TCachePage* cachePage = loadCache_char_subroutine(&param_0, false);
     if (cachePage != NULL) {
@@ -399,8 +376,6 @@ void JUTCacheFont::loadImage(int param_0, _GXTexMapID texMapId) {
     }
 }
 
-/* 802DDD98-802DDEE0 2D86D8 0148+00 1/1 0/0 0/0 .text
- * loadCache_char_subroutine__12JUTCacheFontFPib                */
 JUTCacheFont::TCachePage* JUTCacheFont::loadCache_char_subroutine(int* param_0, bool param_1) {
     TCachePage* rv = NULL;
     for (TCachePage* pCachePage = (TCachePage*)field_0x9c; pCachePage != NULL;
@@ -442,7 +417,6 @@ JUTCacheFont::TCachePage* JUTCacheFont::loadCache_char_subroutine(int* param_0,
     return rv;
 }
 
-/* 802DDEE0-802DDF68 2D8820 0088+00 1/1 0/0 0/0 .text invalidiateAllCache__12JUTCacheFontFv */
 void JUTCacheFont::invalidiateAllCache() {
     int* piVar3 = (int*)mCacheBuffer;
     for (int uVar2 = 0; uVar2 < mCachePage; uVar2++) {
@@ -467,8 +441,6 @@ void JUTCacheFont::invalidiateAllCache() {
     field_0xa0 = NULL;
 }
 
-/* 802DDF68-802DDFAC 2D88A8 0044+00 2/2 0/0 0/0 .text
- * unlink__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo    */
 void JUTCacheFont::unlink(JUTCacheFont::TGlyphCacheInfo* cacheInfo) {
     if (cacheInfo->mPrev == NULL) {
         field_0x9c = cacheInfo->mNext;
@@ -483,8 +455,6 @@ void JUTCacheFont::unlink(JUTCacheFont::TGlyphCacheInfo* cacheInfo) {
     }
 }
 
-/* 802DDFAC-802DDFD8 2D88EC 002C+00 2/2 0/0 0/0 .text
- * prepend__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfo   */
 void JUTCacheFont::prepend(JUTCacheFont::TGlyphCacheInfo* cacheInfo) {
     TGlyphCacheInfo* oldHead = field_0x9c;
     field_0x9c = cacheInfo;
@@ -498,37 +468,30 @@ void JUTCacheFont::prepend(JUTCacheFont::TGlyphCacheInfo* cacheInfo) {
     }
 }
 
-/* 802DDFD8-802DDFE0 2D8918 0008+00 1/0 1/0 0/0 .text            getResFont__10JUTResFontCFv */
 ResFONT* JUTResFont::getResFont() const {
     return (ResFONT*)mResFont;
 }
 
-/* 802DDFE0-802DDFEC 2D8920 000C+00 1/0 1/0 0/0 .text            getFontType__10JUTResFontCFv */
 int JUTResFont::getFontType() const {
     return mInf1Ptr->fontType;
 }
 
-/* 802DDFEC-802DDFF8 2D892C 000C+00 1/0 1/0 0/0 .text            getLeading__10JUTResFontCFv */
 int JUTResFont::getLeading() const {
     return mInf1Ptr->leading;
 }
 
-/* 802DDFF8-802DE004 2D8938 000C+00 1/0 1/0 0/0 .text            getWidth__10JUTResFontCFv */
 s32 JUTResFont::getWidth() const {
     return mInf1Ptr->width;
 }
 
-/* 802DE004-802DE010 2D8944 000C+00 1/0 1/0 0/0 .text            getAscent__10JUTResFontCFv */
 s32 JUTResFont::getAscent() const {
     return mInf1Ptr->ascent;
 }
 
-/* 802DE010-802DE01C 2D8950 000C+00 1/0 1/0 0/0 .text            getDescent__10JUTResFontCFv */
 s32 JUTResFont::getDescent() const {
     return mInf1Ptr->descent;
 }
 
-/* 802DE01C-802DE078 2D895C 005C+00 1/0 1/0 0/0 .text            getHeight__10JUTResFontCFv */
 s32 JUTResFont::getHeight() const {
     return getAscent() + getDescent();
 }
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index 8c042fdf88..4111950c19 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -10,11 +10,8 @@
 #include <stdio.h>
 #include "global.h"
 
-/* 80451570-80451574 000A70 0004+00 4/4 7/7 0/0 .sbss            sManager__17JUTConsoleManager */
 JUTConsoleManager* JUTConsoleManager::sManager;
 
-/* 802E7354-802E73E4 2E1C94 0090+00 0/0 1/1 0/0 .text            create__10JUTConsoleFUiUiP7JKRHeap
- */
 JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
     JUT_ASSERT(33, pManager != NULL);
@@ -29,7 +26,6 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH
     return console;
 }
 
-/* 802E73E4-802E746C 2E1D24 0088+00 0/0 1/1 0/0 .text            create__10JUTConsoleFUiPvUl */
 JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) {
     JUTConsoleManager* pManager = JUTConsoleManager::getManager();
     JUT_ASSERT(59, pManager != NULL);
@@ -45,7 +41,6 @@ JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSiz
     return console;
 }
 
-/* 802E746C-802E755C 2E1DAC 00F0+00 2/2 0/0 0/0 .text            __ct__10JUTConsoleFUiUib */
 JUTConsole::JUTConsole(unsigned int param_0, unsigned int maxLines, bool param_2) {
     field_0x2c = param_2;
     field_0x20 = param_0;
@@ -71,24 +66,19 @@ JUTConsole::JUTConsole(unsigned int param_0, unsigned int maxLines, bool param_2
     field_0x64 = 8;
 }
 
-/* 802E755C-802E75CC 2E1E9C 0070+00 1/0 0/0 0/0 .text            __dt__10JUTConsoleFv */
 JUTConsole::~JUTConsole() {
     JUT_ASSERT(154, JUTConsoleManager::getManager());
     JUTConsoleManager::getManager()->removeConsole(this);
 }
 
-/* 802E75CC-802E75DC 2E1F0C 0010+00 1/1 0/0 0/0 .text
- * getObjectSizeFromBufferSize__10JUTConsoleFUiUi               */
 size_t JUTConsole::getObjectSizeFromBufferSize(unsigned int param_0, unsigned int maxLines) {
     return (param_0 + 2) * maxLines + sizeof(JUTConsole);
 }
 
-/* 802E75DC-802E75EC 2E1F1C 0010+00 1/1 1/1 0/0 .text getLineFromObjectSize__10JUTConsoleFUlUi */
 size_t JUTConsole::getLineFromObjectSize(u32 bufferSize, unsigned int param_1) {
     return (bufferSize - sizeof(JUTConsole)) / (param_1 + 2);
 }
 
-/* 802E75EC-802E7648 2E1F2C 005C+00 2/2 2/2 0/0 .text            clear__10JUTConsoleFv */
 void JUTConsole::clear() {
     field_0x30 = 0;
     field_0x34 = 0;
@@ -103,8 +93,6 @@ void JUTConsole::clear() {
     *getLinePtr(0) = 0;
 }
 
-/* 802E7648-802E7BB8 2E1F88 0570+00 2/2 0/0 0/0 .text
- * doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType           */
 void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const {
     f32 font_yOffset;
     s32 changeLine_1;
@@ -184,7 +172,6 @@ void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const {
     }
 }
 
-/* 802E7BB8-802E7C38 2E24F8 0080+00 0/0 13/13 0/0 .text            print_f__10JUTConsoleFPCce */
 void JUTConsole::print_f(char const* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -192,7 +179,6 @@ void JUTConsole::print_f(char const* fmt, ...) {
     va_end(args);
 }
 
-/* 802E7C38-802E7F30 2E2578 02F8+00 2/2 10/10 0/0 .text            print__10JUTConsoleFPCc */
 void JUTConsole::print(char const* str) {
     if (mOutput & 2) {
         OS_REPORT("%s", str);
@@ -260,7 +246,6 @@ void JUTConsole::print(char const* str) {
     }
 }
 
-/* 802E7F30-802E7F7C 2E2870 004C+00 1/1 1/1 0/0 .text            JUTConsole_print_f_va_ */
 extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) {
     JUT_ASSERT(563, console!=NULL);
 
@@ -269,7 +254,6 @@ extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_
     console->print(buf);
 }
 
-/* 802E7F7C-802E80A8 2E28BC 012C+00 0/0 2/2 0/0 .text            dumpToTerminal__10JUTConsoleFUi */
 void JUTConsole::dumpToTerminal(unsigned int param_0) {
     if (param_0 == 0) {
         return;
@@ -311,7 +295,6 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) {
     OS_REPORT(":::dump of console[%x] END----------------------------\n", this);
 }
 
-/* 802E80A8-802E8184 2E29E8 00DC+00 0/0 3/3 0/0 .text            scroll__10JUTConsoleFi */
 void JUTConsole::scroll(int scrollAmnt) {
     if (scrollAmnt < 0) {
         int diff = diffIndex(field_0x34, field_0x30);
@@ -342,24 +325,19 @@ void JUTConsole::scroll(int scrollAmnt) {
     }
 }
 
-/* 802E8184-802E81A8 2E2AC4 0024+00 0/0 2/2 0/0 .text            getUsedLine__10JUTConsoleCFv */
 int JUTConsole::getUsedLine() const {
     return diffIndex(field_0x34, field_0x38);
 }
 
-/* 802E81A8-802E81CC 2E2AE8 0024+00 0/0 3/3 0/0 .text            getLineOffset__10JUTConsoleCFv */
 int JUTConsole::getLineOffset() const {
     return diffIndex(field_0x34, field_0x30);
 }
 
-/* 802E81CC-802E81F4 2E2B0C 0028+00 1/1 0/0 0/0 .text            __ct__17JUTConsoleManagerFv */
 JUTConsoleManager::JUTConsoleManager() {
     mActiveConsole = NULL;
     mDirectConsole = NULL;
 }
 
-/* 802E81F4-802E8240 2E2B34 004C+00 0/0 1/1 0/0 .text createManager__17JUTConsoleManagerFP7JKRHeap
- */
 JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
     JUT_ASSERT(0x39c, sManager == NULL);
 
@@ -372,8 +350,6 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
     return manager;
 }
 
-/* 802E8240-802E82B0 2E2B80 0070+00 3/3 0/0 0/0 .text
- * appendConsole__17JUTConsoleManagerFP10JUTConsole             */
 void JUTConsoleManager::appendConsole(JUTConsole* console) {
     JUT_ASSERT(961, sManager != NULL && console != NULL);
 
@@ -385,8 +361,6 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) {
     }
 }
 
-/* 802E82B0-802E8384 2E2BF0 00D4+00 2/2 0/0 0/0 .text
- * removeConsole__17JUTConsoleManagerFP10JUTConsole             */
 void JUTConsoleManager::removeConsole(JUTConsole* console) {
     JUT_ASSERT(982, sManager != NULL && console != NULL);
     JUT_ASSERT(985, soLink_.Find( console ) != soLink_.end());
@@ -407,7 +381,6 @@ void JUTConsoleManager::removeConsole(JUTConsole* console) {
     soLink_.Remove(console);
 }
 
-/* 802E8384-802E8450 2E2CC4 00CC+00 0/0 1/1 0/0 .text            draw__17JUTConsoleManagerCFv */
 void JUTConsoleManager::draw() const {
     ConsoleList::const_iterator iter = soLink_.begin();
     ConsoleList::const_iterator end = soLink_.end();
@@ -422,8 +395,6 @@ void JUTConsoleManager::draw() const {
         mActiveConsole->doDraw(JUTConsole::CONSOLE_TYPE_0);
 }
 
-/* 802E8450-802E84C4 2E2D90 0074+00 0/0 5/5 0/0 .text            drawDirect__17JUTConsoleManagerCFb
- */
 void JUTConsoleManager::drawDirect(bool waitRetrace) const {
     if (mDirectConsole != NULL) {
         if (waitRetrace) {
@@ -439,8 +410,6 @@ void JUTConsoleManager::drawDirect(bool waitRetrace) const {
     }
 }
 
-/* 802E84C4-802E8520 2E2E04 005C+00 0/0 2/2 0/0 .text
- * setDirectConsole__17JUTConsoleManagerFP10JUTConsole          */
 void JUTConsoleManager::setDirectConsole(JUTConsole* console) {
     if (mDirectConsole != NULL) {
         appendConsole(mDirectConsole);
@@ -452,33 +421,26 @@ void JUTConsoleManager::setDirectConsole(JUTConsole* console) {
     mDirectConsole = console;
 }
 
-/* 80451574-80451578 000A74 0004+00 2/1 0/0 0/0 .sbss            sReportConsole */
 static JUTConsole* sReportConsole;
 
-/* 802E8520-802E8528 2E2E60 0008+00 1/1 1/1 0/0 .text            JUTSetReportConsole */
 extern "C" void JUTSetReportConsole(JUTConsole* console) {
     sReportConsole = console;
 }
 
-/* 802E8528-802E8530 -00001 0008+00 0/0 0/0 0/0 .text            JUTGetReportConsole */
 extern "C" JUTConsole* JUTGetReportConsole() {
     return sReportConsole;
 }
 
-/* 80451578-80451580 000A78 0004+04 2/1 0/0 0/0 .sbss            sWarningConsole */
 static JUTConsole* sWarningConsole;
 
-/* 802E8530-802E8538 2E2E70 0008+00 1/1 1/1 0/0 .text            JUTSetWarningConsole */
 extern "C" void JUTSetWarningConsole(JUTConsole* console) {
     sWarningConsole = console;
 }
 
-/* 802E8538-802E8540 -00001 0008+00 0/0 0/0 0/0 .text            JUTGetWarningConsole */
 extern "C" JUTConsole* JUTGetWarningConsole() {
     return sWarningConsole;
 }
 
-/* 802E8540-802E85C8 2E2E80 0088+00 2/2 0/0 0/0 .text            JUTReportConsole_f_va */
 extern "C" void JUTReportConsole_f_va(const char* fmt, va_list args) {
     char buf[256];
 
@@ -492,7 +454,6 @@ extern "C" void JUTReportConsole_f_va(const char* fmt, va_list args) {
     }
 }
 
-/* 802E85C8-802E8648 2E2F08 0080+00 2/2 8/8 0/0 .text            JUTReportConsole_f */
 extern "C" void JUTReportConsole_f(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -505,7 +466,6 @@ static void dummyString() {
     DEAD_STRING(":::dump of console[%x] END------------\n");
 }
 
-/* 802E8648-802E867C 2E2F88 0034+00 0/0 6/6 0/0 .text            JUTReportConsole */
 void JUTReportConsole(const char* message) {
     JUTReportConsole_f("%s", message);
 }
@@ -524,7 +484,6 @@ void JUTWarningConsole_f_va(const char* fmt, va_list args) {
     }
 }
 
-/* 802E867C-802E86FC 2E2FBC 0080+00 0/0 9/9 0/0 .text            JUTWarningConsole_f */
 void JUTWarningConsole_f(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -532,7 +491,6 @@ void JUTWarningConsole_f(const char* fmt, ...) {
     va_end(args);
 }
 
-/* 802E86FC-802E8730 2E303C 0034+00 0/0 2/2 0/0 .text            JUTWarningConsole */
 void JUTWarningConsole(const char* message) {
     JUTReportConsole_f("%s", message);
 }
diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp
index 3a9326939e..73fdb28545 100644
--- a/src/JSystem/JUtility/JUTDbPrint.cpp
+++ b/src/JSystem/JUtility/JUTDbPrint.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTDbPrint
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTDbPrint.h"
@@ -11,7 +6,6 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include "stdio.h"
 
-/* 802E0148-802E0190 2DAA88 0048+00 1/1 0/0 0/0 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */
 JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
     mFont = pFont;
     mFirst = NULL;
@@ -20,11 +14,8 @@ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
     mVisible = true;
 }
 
-/* ############################################################################################## */
-/* 804514C8-804514D0 0009C8 0004+04 3/3 6/6 0/0 .sbss            sDebugPrint__10JUTDbPrint */
 JUTDbPrint* JUTDbPrint::sDebugPrint;
 
-/* 802E0190-802E0204 2DAAD0 0074+00 0/0 2/2 0/0 .text start__10JUTDbPrintFP7JUTFontP7JKRHeap */
 JUTDbPrint* JUTDbPrint::start(JUTFont* pFont, JKRHeap* pHeap) {
     if (sDebugPrint == NULL) {
         if (pHeap == NULL) {
@@ -36,8 +27,6 @@ JUTDbPrint* JUTDbPrint::start(JUTFont* pFont, JKRHeap* pHeap) {
     return sDebugPrint;
 }
 
-/* 802E0204-802E021C 2DAB44 0018+00 0/0 1/1 0/0 .text            changeFont__10JUTDbPrintFP7JUTFont
- */
 JUTFont* JUTDbPrint::changeFont(JUTFont* pFont) {
     JUTFont* old = mFont;
     if (pFont != NULL) {
@@ -46,7 +35,6 @@ JUTFont* JUTDbPrint::changeFont(JUTFont* pFont) {
     return old;
 }
 
-/* 802E021C-802E02A4 2DAB5C 0088+00 2/2 0/0 0/0 .text            enter__10JUTDbPrintFiiiPCci */
 void JUTDbPrint::enter(int param_0, int param_1, int param_2, char const* param_3, int param_4) {
     if (param_4 > 0) {
         unk_print* ptr = static_cast<unk_print*>(JKRAllocFromHeap(mHeap, param_4 + 0x10, -4));
@@ -62,12 +50,10 @@ void JUTDbPrint::enter(int param_0, int param_1, int param_2, char const* param_
     }
 }
 
-/* 802E02A4-802E02DC 2DABE4 0038+00 0/0 1/1 0/0 .text            flush__10JUTDbPrintFv */
 void JUTDbPrint::flush() {
     this->flush(0, 0, JUTVideo::getManager()->getFbWidth(), JUTVideo::getManager()->getEfbHeight());
 }
 
-/* 802E02DC-802E0440 2DAC1C 0164+00 1/1 0/0 0/0 .text            flush__10JUTDbPrintFiiii */
 void JUTDbPrint::flush(int param_0, int param_1, int param_2, int param_3) {
     // weird cast
     unk_print* curPtr = (unk_print*)&mFirst;
@@ -96,14 +82,12 @@ void JUTDbPrint::flush(int param_0, int param_1, int param_2, int param_3) {
     }
 }
 
-/* 802E0440-802E0530 2DAD80 00F0+00 1/1 0/0 0/0 .text            drawString__10JUTDbPrintFiiiPCUc */
 void JUTDbPrint::drawString(int param_0, int param_1, int param_2, u8 const* param_3) {
     JUTFont* font = mFont;
     font->drawString_size_scale(param_0, param_1, font->getWidth(), font->getHeight(),
                                 (const char*)param_3, param_2, true);
 }
 
-/* 802E0530-802E0600 2DAE70 00D0+00 0/0 2/2 2/2 .text            JUTReport__FiiPCce */
 void JUTReport(int param_0, int param_1, char const* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -118,7 +102,6 @@ void JUTReport(int param_0, int param_1, char const* fmt, ...) {
     JUTDbPrint::sDebugPrint->enter(param_0, param_1, 1, buf, ret < 0x100 ? ret : 0xFF);
 }
 
-/* 802E0600-802E06DC 2DAF40 00DC+00 0/0 1/1 0/0 .text            JUTReport__FiiiPCce */
 void JUTReport(int param_0, int param_1, int param_2, char const* fmt, ...) {
     va_list args;
     va_start(args, fmt);
diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp
index 487b858b22..d091d12ad1 100644
--- a/src/JSystem/JUtility/JUTDirectFile.cpp
+++ b/src/JSystem/JUtility/JUTDirectFile.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTDirectFile
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTDirectFile.h"
@@ -10,7 +5,6 @@
 #include "global.h"
 #include <stdint.h>
 
-/* 802E8730-802E87F8 2E3070 00C8+00 1/1 0/0 0/0 .text            fetch32byte__13JUTDirectFileFv */
 int JUTDirectFile::fetch32byte() {
 	mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE);
 
@@ -33,7 +27,6 @@ int JUTDirectFile::fetch32byte() {
 	}
 }
 
-/* 802E87F8-802E881C 2E3138 0024+00 0/0 1/1 0/0 .text            __ct__13JUTDirectFileFv */
 JUTDirectFile::JUTDirectFile() {
 	mLength      = 0;
 	mPos         = 0;
@@ -43,12 +36,10 @@ JUTDirectFile::JUTDirectFile() {
 }
 
 
-/* 802E881C-802E8860 2E315C 0044+00 0/0 1/1 0/0 .text            __dt__13JUTDirectFileFv */
 JUTDirectFile::~JUTDirectFile() {
     mIsOpen = false;
 }
 
-/* 802E8860-802E88FC 2E31A0 009C+00 0/0 1/1 0/0 .text            fopen__13JUTDirectFileFPCc */
 bool JUTDirectFile::fopen(const char* filename) {
 	if (!filename) {
 		return false;
@@ -72,7 +63,6 @@ bool JUTDirectFile::fopen(const char* filename) {
 	return true;
 }
 
-/* 802E88FC-802E8958 2E323C 005C+00 0/0 1/1 0/0 .text            fclose__13JUTDirectFileFv */
 void JUTDirectFile::fclose() {
 	if (mIsOpen) {
 		int interrupts = OSEnableInterrupts();
@@ -82,7 +72,6 @@ void JUTDirectFile::fclose() {
 	}
 }
 
-/* 802E8958-802E8B08 2E3298 01B0+00 0/0 1/1 0/0 .text            fgets__13JUTDirectFileFPvi */
 int JUTDirectFile::fgets(void* buf, int len) {
 	// if file isn't open, return error (-1).
 	if (!mIsOpen) {
diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp
index e7bb18daef..9f270696b3 100644
--- a/src/JSystem/JUtility/JUTDirectPrint.cpp
+++ b/src/JSystem/JUtility/JUTDirectPrint.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTDirectPrint
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTDirectPrint.h"
@@ -10,16 +5,13 @@
 #include <dolphin/os.h>
 #include "global.h"
 
-/* 80451528-80451530 000A28 0004+04 1/1 4/4 0/0 .sbss            sDirectPrint__14JUTDirectPrint */
 JUTDirectPrint* JUTDirectPrint::sDirectPrint;
 
-/* 802E41E8-802E4240 2DEB28 0058+00 1/1 0/0 0/0 .text            __ct__14JUTDirectPrintFv */
 JUTDirectPrint::JUTDirectPrint() {
     changeFrameBuffer(NULL, 0, 0);
     setCharColor(0xff, 0xff, 0xff);
 }
 
-/* 802E4240-802E4288 2DEB80 0048+00 0/0 1/1 0/0 .text            start__14JUTDirectPrintFv */
 JUTDirectPrint* JUTDirectPrint::start() {
     if (!sDirectPrint) {
         sDirectPrint = new JUTDirectPrint();
@@ -28,7 +20,6 @@ JUTDirectPrint* JUTDirectPrint::start() {
     return sDirectPrint;
 }
 
-/* 802E4288-802E431C 2DEBC8 0094+00 1/1 1/1 0/0 .text            erase__14JUTDirectPrintFiiii */
 void JUTDirectPrint::erase(int x, int y, int width, int height) {
     if (!this->field_0x00) {
         return;
@@ -55,8 +46,6 @@ void JUTDirectPrint::erase(int x, int y, int width, int height) {
     }
 }
 
-/* ############################################################################################## */
-/* 803CC6B8-803CC738 0297D8 0080+00 2/2 0/0 0/0 .data            sAsciiTable__14JUTDirectPrint */
 u8 JUTDirectPrint::sAsciiTable[128] = {
     0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A, 0xFD, 0xFE, 0x7A, 0x7A, 0x7A, 0x7A, 0x7A,
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -68,7 +57,6 @@ u8 JUTDirectPrint::sAsciiTable[128] = {
     0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x76, 0x77, 0x78, 0x79, 0x7A,
 };
 
-/* 803CC738-803CC838 -00001 0100+00 0/1 0/0 0/0 .data            sFontData__14JUTDirectPrint */
 u32 JUTDirectPrint::sFontData[64] = {
     0x70871C30, 0x8988A250, 0x88808290, 0x88830C90, 0x888402F8, 0x88882210, 0x71CF9C10, 0xF9CF9C70,
     0x8208A288, 0xF200A288, 0x0BC11C78, 0x0A222208, 0x8A222208, 0x71C21C70, 0x23C738F8, 0x5228A480,
@@ -80,7 +68,6 @@ u32 JUTDirectPrint::sFontData[64] = {
     0x70800000, 0x88822200, 0x08820400, 0x108F8800, 0x20821000, 0x00022200, 0x20800020, 0x00000000,
 };
 
-/* 803CC838-803CC96C -00001 0134+00 0/1 0/0 0/0 .data            sFontData2__14JUTDirectPrint */
 u32 JUTDirectPrint::sFontData2[77] = {
     0x51421820, 0x53E7A420, 0x014A2C40, 0x01471000, 0x0142AA00, 0x03EAA400, 0x01471A78, 0x00000000,
     0x50008010, 0x20010820, 0xF8020040, 0x20420820, 0x50441010, 0x00880000, 0x00070E00, 0x01088840,
@@ -94,7 +81,6 @@ u32 JUTDirectPrint::sFontData2[77] = {
     0xF8000000, 0x10000000, 0x20000000, 0x40000000, 0xF8000000,
 };
 
-/* 803CC96C-803CC980 029A8C 0010+04 0/1 0/0 0/0 .data            twiceBit$371 */
 static u32 twiceBit[4] = {
     0,
     3,
@@ -102,7 +88,6 @@ static u32 twiceBit[4] = {
     15,
 };
 
-/* 802E431C-802E456C 2DEC5C 0250+00 1/1 0/0 0/0 .text            drawChar__14JUTDirectPrintFiii */
 void JUTDirectPrint::drawChar(int position_x, int position_y, int ch) {
     int codepoint = (100 <= ch) ? ch - 100 : ch;
     int col_index = (codepoint % 5) * 6;
@@ -160,8 +145,6 @@ void JUTDirectPrint::drawChar(int position_x, int position_y, int ch) {
     }
 }
 
-/* 802E456C-802E45A4 2DEEAC 0038+00 1/1 4/4 0/0 .text changeFrameBuffer__14JUTDirectPrintFPvUsUs
- */
 void JUTDirectPrint::changeFrameBuffer(void* frameBuffer, u16 width, u16 height) {
     this->field_0x00 = frameBuffer;
     mFrameBuffer = (u16*)frameBuffer;
@@ -171,8 +154,6 @@ void JUTDirectPrint::changeFrameBuffer(void* frameBuffer, u16 width, u16 height)
     mFrameBufferSize = (u32)mStride * (u32)mFrameBufferHeight * 2;
 }
 
-/* 802E45A4-802E46D8 2DEEE4 0134+00 1/1 0/0 0/0 .text
- * printSub__14JUTDirectPrintFUsUsPCcP16__va_list_structb       */
 void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format, va_list args,
                               bool clear) {
     char buffer[256];
@@ -218,13 +199,10 @@ void JUTDirectPrint::print(u16 position_x, u16 position_y, char const* format, .
     }
 }
 
-/* 802E46D8-802E4708 2DF018 0030+00 0/0 2/2 0/0 .text            drawString__14JUTDirectPrintFUsUsPc
- */
 void JUTDirectPrint::drawString(u16 position_x, u16 position_y, char* text) {
     drawString_f(position_x, position_y, "%s", text);
 }
 
-/* 802E4708-802E4798 2DF048 0090+00 1/1 0/0 0/0 .text drawString_f__14JUTDirectPrintFUsUsPCce */
 void JUTDirectPrint::drawString_f(u16 position_x, u16 position_y, char const* format, ...) {
     if (mFrameBuffer) {
         va_list args;
@@ -234,13 +212,10 @@ void JUTDirectPrint::drawString_f(u16 position_x, u16 position_y, char const* fo
     }
 }
 
-/* 802E4798-802E47C8 2DF0D8 0030+00 0/0 2/2 0/0 .text
- * setCharColor__14JUTDirectPrintFQ28JUtility6TColor            */
 void JUTDirectPrint::setCharColor(JUtility::TColor color) {
     setCharColor(color.r, color.g, color.b);
 }
 
-/* 802E47C8-802E495C 2DF108 0194+00 2/2 0/0 0/0 .text setCharColor__14JUTDirectPrintFUcUcUc */
 void JUTDirectPrint::setCharColor(u8 r, u8 g, u8 b) {
     mCharColor.set(r, g, b, 0xFF);
 
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 626da42e86..3b72375a40 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/src/JSystem/JUtility/JUTException.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTException
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTException.h"
@@ -15,13 +10,10 @@
 #include <dolphin.h>
 #include <stdint.h>
 
-/* 803CC620-803CC640 029740 0020+00 3/3 0/0 0/0 .data            sMessageQueue__12JUTException */
 OSMessageQueue JUTException::sMessageQueue = {0};
 
-/* 803CC640-803CC660 029760 0020+00 1/1 0/0 0/0 .data            c3bcnt */
 static OSTime c3bcnt[4] = {0, 0, 0, 0};
 
-/* 803CC660-803CC6A4 -00001 0044+00 1/1 0/0 0/0 .data            sCpuExpName__12JUTException */
 const char* JUTException::sCpuExpName[17] = {
     "SYSTEM RESET",
     "MACHINE CHECK",
@@ -42,17 +34,12 @@ const char* JUTException::sCpuExpName[17] = {
     "FLOATING POINT",
 };
 
-/* 80451508-8045150C 000A08 0004+00 4/4 3/3 0/0 .sbss            sErrorManager__12JUTException */
 JUTException* JUTException::sErrorManager;
 
-/* 8045150C-80451510 000A0C 0004+00 4/4 0/0 0/0 .sbss            sPreUserCallback__12JUTException */
 JUTExceptionUserCallback JUTException::sPreUserCallback;
 
-/* 80451510-80451514 000A10 0004+00 3/3 0/0 0/0 .sbss            sPostUserCallback__12JUTException
- */
  JUTExceptionUserCallback JUTException::sPostUserCallback;
 
-/* 802E1D5C-802E1E40 2DC69C 00E4+00 1/1 0/0 0/0 .text __ct__12JUTExceptionFP14JUTDirectPrint */
 JUTException::JUTException(JUTDirectPrint* directPrint)
     : JKRThread(0x1C00, 0x10, 0), mDirectPrint(directPrint) {
     OSSetErrorHandler(__OS_EXCEPTION_DSI, (OSErrorHandler)errorHandler);
@@ -75,7 +62,6 @@ JUTException::JUTException(JUTDirectPrint* directPrint)
         JUT_PRINT_GPR | JUT_PRINT_GPR_MAP | JUT_PRINT_SRR0_MAP | JUT_PRINT_FLOAT | JUT_PRINT_STACK;
 }
 
-/* 802E1E40-802E1EA8 2DC780 0068+00 0/0 1/1 0/0 .text create__12JUTExceptionFP14JUTDirectPrint */
 JUTException* JUTException::create(JUTDirectPrint* directPrint) {
     if (!sErrorManager) {
         JKRHeap* systemHeap = JKRGetSystemHeap();
@@ -86,7 +72,6 @@ JUTException* JUTException::create(JUTDirectPrint* directPrint) {
     return sErrorManager;
 }
 
-/* 804508F0-804508F8 000370 0004+04 1/1 0/0 0/0 .sdata           sMessageBuffer__12JUTException */
 OSMessage JUTException::sMessageBuffer[1] = {0};
 
 struct CallbackObject {
@@ -99,7 +84,6 @@ struct CallbackObject {
     /* 0x14 */
 };
 
-/* 802E1EA8-802E1FCC 2DC7E8 0124+00 1/0 0/0 0/0 .text            run__12JUTExceptionFv */
 void* JUTException::run() {
     PPCMtmsr(PPCMfmsr() & ~0x0900);
     OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 1);
@@ -132,28 +116,19 @@ void* JUTException::run() {
     }
 }
 
-/* 80434578-8043458C 061298 0014+00 2/2 0/0 0/0 .bss             exCallbackObject */
 STATIC_ASSERT(sizeof(CallbackObject) == 0x14);
 static CallbackObject exCallbackObject;
 
-/* 80451514-80451518 000A14 0004+00 1/1 0/0 0/0 .sbss            sConsoleBuffer__12JUTException */
 void* JUTException::sConsoleBuffer;
 
-/* 80451518-8045151C 000A18 0004+00 1/1 0/0 0/0 .sbss            sConsoleBufferSize__12JUTException
- */
 u32 JUTException::sConsoleBufferSize;
 
-/* 8045151C-80451520 000A1C 0004+00 13/13 1/1 0/0 .sbss            sConsole__12JUTException */
 JUTConsole* JUTException::sConsole;
 
-/* 80451520-80451524 000A20 0004+00 2/2 0/0 0/0 .sbss            msr__12JUTException */
 u32 JUTException::msr;
 
-/* 80451524-80451528 000A24 0004+00 3/3 0/0 0/0 .sbss            fpscr__12JUTException */
 u32 JUTException::fpscr;
 
-/* 802E1FCC-802E20C0 2DC90C 00F4+00 2/2 0/0 0/0 .text
- * errorHandler__12JUTExceptionFUsP9OSContextUlUl               */
 void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, u32 param_4) {
     msr = PPCMfmsr();
     fpscr = context->fpscr;
@@ -177,14 +152,10 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3,
     OSYieldThread();
 }
 
-/* 80434598-804345A8 0612B8 000C+04 4/4 0/0 0/0 .bss             sMapFileList__12JUTException */
 JSUList<JUTException::JUTExMapFile> JUTException::sMapFileList(false);
 
-/* 804345A8-80434870 0612C8 02C8+00 1/1 0/0 0/0 .bss             context$2230 */
 static OSContext context;
 
-/* 802E20C0-802E21FC 2DCA00 013C+00 1/1 0/0 0/0 .text
- * panic_f_va__12JUTExceptionFPCciPCcP16__va_list_struct        */
 void JUTException::panic_f_va(char const* file, int line, char const* format, va_list args) {
     char buffer[256];
     vsnprintf(buffer, sizeof(buffer) - 1, format, args);
@@ -215,8 +186,6 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va
     OSSuspendThread(current_thread);
 }
 
-/* 802E21FC-802E227C 2DCB3C 0080+00 0/0 16/16 0/0 .text            panic_f__12JUTExceptionFPCciPCce
- */
 void JUTException::panic_f(char const* file, int line, char const* format, ...) {
     va_list args;
     va_start(args, format);
@@ -224,8 +193,6 @@ void JUTException::panic_f(char const* file, int line, char const* format, ...)
     va_end(args);
 }
 
-/* 802E227C-802E22C4 2DCBBC 0048+00 1/1 0/0 0/0 .text            setFPException__12JUTExceptionFUl
- */
 void JUTException::setFPException(u32 fpscr_enable_bits) {
     __OSFpscrEnableBits = fpscr_enable_bits;
     if (fpscr_enable_bits) {
@@ -238,7 +205,6 @@ void JUTException::setFPException(u32 fpscr_enable_bits) {
 // u8 doesn't work in other places for signbit? temp fix
 #define __signbit(x) ((*(unsigned char*)&(x)) & 0x80)
 
-/* 802E22C4-802E2454 2DCC04 0190+00 1/1 0/0 0/0 .text            showFloatSub__12JUTExceptionFif */
 void JUTException::showFloatSub(int index, f32 value) {
     if (isnan(value)) {
         sConsole->print_f("F%02d: Nan      ", index);
@@ -255,7 +221,6 @@ void JUTException::showFloatSub(int index, f32 value) {
     }
 }
 
-/* 802E2454-802E2578 2DCD94 0124+00 1/1 0/0 0/0 .text showFloat__12JUTExceptionFP9OSContext */
 void JUTException::showFloat(OSContext* context) {
     if (!sConsole) {
         return;
@@ -276,8 +241,6 @@ void JUTException::showFloat(OSContext* context) {
     sConsole->print("\n");
 }
 
-/* 802E2578-802E2638 2DCEB8 00C0+00 1/1 0/0 0/0 .text
- * searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl           */
 bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section_id,
                                        u32* section_offset, u32* name_offset) {
     if (!address) {
@@ -310,7 +273,6 @@ bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section
     return false;
 }
 
-/* 802E2638-802E26B0 2DCF78 0078+00 1/1 0/0 0/0 .text            search_name_part__FPUcPUci */
 static void search_name_part(u8* src, u8* dst, int dst_length) {
     for (u8* p = src; *p; p++) {
         if (*p == '\\') {
@@ -332,7 +294,6 @@ static void search_name_part(u8* src, u8* dst, int dst_length) {
     *dst = '\0';
 }
 
-/* 802E26B0-802E27B0 2DCFF0 0100+00 1/1 0/0 0/0 .text showStack__12JUTExceptionFP9OSContext */
 void JUTException::showStack(OSContext* context) {
     if (!sConsole) {
         return;
@@ -358,8 +319,6 @@ void JUTException::showStack(OSContext* context) {
     }
 }
 
-/* 802E27B0-802E2A84 2DD0F0 02D4+00 1/1 0/0 0/0 .text
- * showMainInfo__12JUTExceptionFUsP9OSContextUlUl               */
 void JUTException::showMainInfo(u16 error, OSContext* context, u32 dsisr, u32 dar) {
     if (!sConsole) {
         return;
@@ -420,8 +379,6 @@ void JUTException::showMainInfo(u16 error, OSContext* context, u32 dsisr, u32 da
     sConsole->print_f("DSISR:  %08XH   DAR: %08XH\n", dsisr, dar);
 }
 
-/* 802E2A84-802E2B44 2DD3C4 00C0+00 1/1 0/0 0/0 .text            showGPR__12JUTExceptionFP9OSContext
- */
 void JUTException::showGPR(OSContext* context) {
     if (!sConsole) {
         return;
@@ -435,8 +392,6 @@ void JUTException::showGPR(OSContext* context) {
     sConsole->print_f("R%02d:%08XH  R%02d:%08XH\n", 10, context->gpr[10], 21, context->gpr[21]);
 }
 
-/* 802E2B44-802E2CA0 2DD484 015C+00 3/3 0/0 0/0 .text showMapInfo_subroutine__12JUTExceptionFUlb
- */
 bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline) {
     if ((address < 0x80000000) || (0x82ffffff < address)) {
         return false;
@@ -485,7 +440,6 @@ bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline)
     return false;
 }
 
-/* 802E2CA0-802E2DAC 2DD5E0 010C+00 1/1 0/0 0/0 .text showGPRMap__12JUTExceptionFP9OSContext */
 void JUTException::showGPRMap(OSContext* context) {
     if (!sConsole) {
         return;
@@ -514,7 +468,6 @@ void JUTException::showGPRMap(OSContext* context) {
     }
 }
 
-/* 802E2DAC-802E2E70 2DD6EC 00C4+00 1/1 0/0 0/0 .text showSRR0Map__12JUTExceptionFP9OSContext */
 void JUTException::showSRR0Map(OSContext* context) {
     if (!sConsole) {
         return;
@@ -531,8 +484,6 @@ void JUTException::showSRR0Map(OSContext* context) {
     }
 }
 
-/* 802E2E70-802E2F18 2DD7B0 00A8+00 1/1 0/0 0/0 .text
- * printDebugInfo__12JUTExceptionFQ212JUTException9EInfoPageUsP9OSContextUlUl */
 void JUTException::printDebugInfo(JUTException::EInfoPage page, OSError error, OSContext* context,
                                   u32 param_3, u32 param_4) {
     switch (page) {
@@ -553,7 +504,6 @@ void JUTException::printDebugInfo(JUTException::EInfoPage page, OSError error, O
     }
 }
 
-/* 802E2F18-802E2F54 2DD858 003C+00 1/1 1/1 0/0 .text            isEnablePad__12JUTExceptionCFv */
 bool JUTException::isEnablePad() const {
     if (mGamePad == (JUTGamePad*)0xFFFFFFFF)
         return true;
@@ -564,7 +514,6 @@ bool JUTException::isEnablePad() const {
     return mGamePad;
 }
 
-/* 802E2F54-802E34C0 2DD894 056C+00 1/1 1/1 0/0 .text            readPad__12JUTExceptionFPUlPUl */
 bool JUTException::readPad(u32* out_trigger, u32* out_button) {
     bool result = false;
     OSTime start_time = OSGetTime();
@@ -644,8 +593,6 @@ bool JUTException::readPad(u32* out_trigger, u32* out_button) {
     return result;
 }
 
-/* 802E34C0-802E3980 2DDE00 04C0+00 1/1 0/0 0/0 .text
- * printContext__12JUTExceptionFUsP9OSContextUlUl               */
 // clean up
 void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u32 dar) {
     bool is_pad_enabled = isEnablePad() == 0;
@@ -807,7 +754,6 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3
     }
 }
 
-/* 802E3980-802E3A08 2DE2C0 0088+00 3/3 2/2 0/0 .text            waitTime__12JUTExceptionFl */
 void JUTException::waitTime(s32 timeout_ms) {
     if (timeout_ms) {
         OSTime start_time = OSGetTime();
@@ -820,7 +766,6 @@ void JUTException::waitTime(s32 timeout_ms) {
     }
 }
 
-/* 802E3A08-802E3AEC 2DE348 00E4+00 1/1 0/0 0/0 .text            createFB__12JUTExceptionFv */
 void JUTException::createFB() {
     _GXRenderModeObj* renderMode = &GXNtsc480Int;
     void* end = (void*)OSGetArenaHi();
@@ -849,24 +794,18 @@ void JUTException::createFB() {
     mFrameMemory = (JUTExternalFB*)object;
 }
 
-/* 802E3AEC-802E3AFC 2DE42C 0010+00 0/0 1/1 0/0 .text
- * setPreUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v     */
  JUTExceptionUserCallback JUTException::setPreUserCallback(JUTExceptionUserCallback callback) {
     JUTExceptionUserCallback previous = sPreUserCallback;
     sPreUserCallback = callback;
     return previous;
 }
 
-/* 802E3AFC-802E3B0C 2DE43C 0010+00 0/0 1/1 0/0 .text
- * setPostUserCallback__12JUTExceptionFPFUsP9OSContextUlUl_v    */
  JUTExceptionUserCallback JUTException::setPostUserCallback(JUTExceptionUserCallback callback) {
     JUTExceptionUserCallback previous = sPostUserCallback;
     sPostUserCallback = callback;
     return previous;
 }
 
-/* 802E3B0C-802E3BA0 2DE44C 0094+00 0/0 1/1 0/0 .text            appendMapFile__12JUTExceptionFPCc
- */
 void JUTException::appendMapFile(char const* path) {
     if (!path) {
         return;
@@ -883,8 +822,6 @@ void JUTException::appendMapFile(char const* path) {
     sMapFileList.append(&mapFile->mLink);
 }
 
-/* 802E3BA0-802E3C90 2DE4E0 00F0+00 1/1 0/0 0/0 .text
- * queryMapAddress__12JUTExceptionFPcUllPUlPUlPcUlbb            */
 bool JUTException::queryMapAddress(char* mapPath, u32 address, s32 section_id, u32* out_addr,
                                    u32* out_size, char* out_line, u32 line_length, bool print,
                                    bool begin_with_newline) {
@@ -909,8 +846,6 @@ bool JUTException::queryMapAddress(char* mapPath, u32 address, s32 section_id, u
     return false;
 }
 
-/* 802E3C90-802E3FEC 2DE5D0 035C+00 1/1 0/0 0/0 .text
- * queryMapAddress_single__12JUTExceptionFPcUllPUlPUlPcUlbb     */
 // 2 additional instructions (addi r5,r1,8) related to section_name variable.
 bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 section_id, u32* out_addr,
                                           u32* out_size, char* out_line, u32 line_length,
@@ -1036,8 +971,6 @@ bool JUTException::queryMapAddress_single(char* mapPath, u32 address, s32 sectio
 	return result ? true : false;
 }
 
-/* 802E3FEC-802E40CC 2DE92C 00E0+00 0/0 1/1 0/0 .text            createConsole__12JUTExceptionFPvUl
- */
 void JUTException::createConsole(void* console_buffer, u32 console_buffer_size) {
     if (!console_buffer || !console_buffer_size) {
         return;
@@ -1060,8 +993,6 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size)
     }
 }
 
-/* 802E40CC-802E40EC 2DEA0C 0020+00 1/1 0/0 0/0 .text
- * __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl       */
 JUTExternalFB::JUTExternalFB(_GXRenderModeObj* renderMode, GXGamma gamma, void* buffer, u32 size) {
     mRenderMode = renderMode;
     mSize = size;
@@ -1070,5 +1001,4 @@ JUTExternalFB::JUTExternalFB(_GXRenderModeObj* renderMode, GXGamma gamma, void*
     field_0x10 = false;
 }
 
-/* 802E40EC-802E414C 2DEA2C 0060+00 1/0 0/0 0/0 .text            __dt__12JUTExceptionFv */
 JUTException::~JUTException() {}
diff --git a/src/JSystem/JUtility/JUTFader.cpp b/src/JSystem/JUtility/JUTFader.cpp
index 3e9cd76ec2..57a7e09395 100644
--- a/src/JSystem/JUtility/JUTFader.cpp
+++ b/src/JSystem/JUtility/JUTFader.cpp
@@ -8,7 +8,6 @@
 #include "JSystem/JUtility/JUTFader.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 
-/* 802E5530-802E55DC 2DFE70 00AC+00 0/0 1/1 0/0 .text __ct__8JUTFaderFiiiiQ28JUtility6TColor */
 JUTFader::JUTFader(int x, int y, int width, int height, JUtility::TColor pColor)
     : mColor(pColor), mBox(x, y, x + width, y + height) {
     mStatus = 0;
@@ -18,7 +17,6 @@ JUTFader::JUTFader(int x, int y, int width, int height, JUtility::TColor pColor)
     mEStatus = UNKSTATUS_M1;
 }
 
-/* 802E55DC-802E56DC 2DFF1C 0100+00 0/0 1/1 0/0 .text            control__8JUTFaderFv */
 void JUTFader::control() {
     if (0 <= mEStatus && mEStatus-- == 0) {
 		mStatus = field_0x24;
@@ -52,7 +50,6 @@ void JUTFader::control() {
 	draw();
 }
 
-/* 802E56DC-802E576C 2E001C 0090+00 1/0 0/0 0/0 .text            draw__8JUTFaderFv */
 void JUTFader::draw() {
     if (mColor.a == 0) {
 		return;
@@ -63,7 +60,6 @@ void JUTFader::draw() {
 	orthograph.fillBox(mBox);
 }
 
-/* 802E576C-802E579C 2E00AC 0030+00 1/0 0/0 0/0 .text            startFadeIn__8JUTFaderFi */
 bool JUTFader::startFadeIn(int param_0) {
     bool statusCheck = mStatus == 0;
 
@@ -76,7 +72,6 @@ bool JUTFader::startFadeIn(int param_0) {
     return statusCheck;
 }
 
-/* 802E579C-802E57D0 2E00DC 0034+00 1/0 0/0 0/0 .text            startFadeOut__8JUTFaderFi */
 bool JUTFader::startFadeOut(int param_0) {
     bool statusCheck = mStatus == 1;
 
@@ -89,7 +84,6 @@ bool JUTFader::startFadeOut(int param_0) {
     return statusCheck;
 }
 
-/* 802E57D0-802E5840 2E0110 0070+00 0/0 1/1 0/0 .text setStatus__8JUTFaderFQ28JUTFader7EStatusi */
 void JUTFader::setStatus(JUTFader::EStatus i_status, int param_1) {
     switch (i_status) {
     case 0: 
@@ -117,5 +111,4 @@ void JUTFader::setStatus(JUTFader::EStatus i_status, int param_1) {
     }
 }
 
-/* 802E5840-802E5888 2E0180 0048+00 1/0 0/0 0/0 .text            __dt__8JUTFaderFv */
 JUTFader::~JUTFader() {}
diff --git a/src/JSystem/JUtility/JUTFont.cpp b/src/JSystem/JUtility/JUTFont.cpp
index b0dfb4c617..eedd0d8e85 100644
--- a/src/JSystem/JUtility/JUTFont.cpp
+++ b/src/JSystem/JUtility/JUTFont.cpp
@@ -7,12 +7,10 @@
 
 #include "JSystem/JUtility/JUTFont.h"
 
-/* 802DECF8-802DED24 2D9638 002C+00 0/0 2/2 0/0 .text            __ct__7JUTFontFv */
 JUTFont::JUTFont() : mColor1(), mColor2(), mColor3(), mColor4() {
     mValid = false;
 }
 
-/* 802DED24-802DED70 2D9664 004C+00 0/0 9/9 0/0 .text            initialize_state__7JUTFontFv */
 void JUTFont::initialize_state() {
     setCharColor(JUtility::TColor());
     mFixed = false;
@@ -20,7 +18,6 @@ void JUTFont::initialize_state() {
     mValid = false;
 }
 
-/* 802DED70-802DEDC4 2D96B0 0054+00 1/1 3/3 0/0 .text setCharColor__7JUTFontFQ28JUtility6TColor */
 void JUTFont::setCharColor(JUtility::TColor col1) {
     mColor1 = col1;
     mColor2 = col1;
@@ -28,8 +25,6 @@ void JUTFont::setCharColor(JUtility::TColor col1) {
     mColor4 = col1;
 }
 
-/* 802DEDC4-802DEE28 2D9704 0064+00 0/0 2/2 0/0 .text
- * setGradColor__7JUTFontFQ28JUtility6TColorQ28JUtility6TColor  */
 void JUTFont::setGradColor(JUtility::TColor col1, JUtility::TColor col2) {
     mColor1 = col1;
     mColor2 = col1;
@@ -37,8 +32,6 @@ void JUTFont::setGradColor(JUtility::TColor col1, JUtility::TColor col2) {
     mColor4 = col2;
 }
 
-/* 802DEE28-802DEF48 2D9768 0120+00 0/0 3/3 0/0 .text drawString_size_scale__7JUTFontFffffPCcUlb
- */
 f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* str, u32 usz,
                                    bool a7) {
     f32 temp = a1;
diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
index db2b735fb9..3a1e55086e 100644
--- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
+++ b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
@@ -3,8 +3,7 @@
 #include <dolphin.h>
 #include "global.h"
 
-/* 8039DA20-803A1B80 02A080 4160+00 0/0 1/0 0/0 .rodata          JUTResFONT_Ascfont_fix12 */
-extern u8 const JUTResFONT_Ascfont_fix12[16736] ALIGN_DECL(32) = {
+extern u8 const JUTResFONT_Ascfont_fix12[16736] ATTRIBUTE_ALIGN(32) = {
     0x46, 0x4F, 0x4E, 0x54, 0x62, 0x66, 0x6E, 0x31, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x04,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x49, 0x4E, 0x46, 0x31, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C,
diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp
index 25bce37730..c705bcab66 100644
--- a/src/JSystem/JUtility/JUTGamePad.cpp
+++ b/src/JSystem/JUtility/JUTGamePad.cpp
@@ -3,7 +3,6 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include <math.h>
 
-/* 803CC5F0-803CC600 029710 0010+00 3/3 0/0 0/0 .data sChannelMask__Q210JUTGamePad7CRumble */
 u32 JUTGamePad::CRumble::sChannelMask[4] = {
     PAD_CHAN0_BIT,
     PAD_CHAN1_BIT,
@@ -11,20 +10,14 @@ u32 JUTGamePad::CRumble::sChannelMask[4] = {
     PAD_CHAN3_BIT,
 };
 
-/* 803CC600-803CC610 029720 0010+00 2/2 0/0 0/0 .data            channel_mask */
 static u32 channel_mask[4] = {PAD_CHAN0_BIT, PAD_CHAN1_BIT, PAD_CHAN2_BIT, PAD_CHAN3_BIT};
 
-/* 804343E4-804343F0 061104 000C+00 4/6 0/0 0/0 .bss             mPadList__10JUTGamePad */
 JSUList<JUTGamePad> JUTGamePad::mPadList(false);
 
-/* 804514D0-804514D4 0009D0 0004+00 1/1 0/0 0/0 .sbss            None */
 bool JUTGamePad::mListInitialized;
 
-/* 804514D4-804514D8 0009D4 0004+00 3/3 0/0 0/0 .sbss            mPadAssign__10JUTGamePad */
 u8 JUTGamePad::mPadAssign[4];
 
-/* 802E06DC-802E07B0 2DB01C 00D4+00 0/0 4/4 0/0 .text __ct__10JUTGamePadFQ210JUTGamePad8EPadPort
- */
 JUTGamePad::JUTGamePad(EPadPort port) : mRumble(this), mLink(this) {
     mPortNum = port;
     if (mPortNum >= 0) {
@@ -39,7 +32,6 @@ JUTGamePad::JUTGamePad(EPadPort port) : mRumble(this), mLink(this) {
     clear();
 }
 
-/* 802E07B0-802E085C 2DB0F0 00AC+00 1/0 2/2 0/0 .text            __dt__10JUTGamePadFv */
 JUTGamePad::~JUTGamePad() {
     if (mPortNum >= 0) {
         mPadAssign[mPortNum]--;
@@ -49,7 +41,6 @@ JUTGamePad::~JUTGamePad() {
     mPadList.remove(&mLink);
 }
 
-/* 802E085C-802E0898 2DB19C 003C+00 1/1 0/0 0/0 .text            initList__10JUTGamePadFv */
 void JUTGamePad::initList() {
     if (!mListInitialized) {
         mPadList.initiate();
@@ -57,47 +48,35 @@ void JUTGamePad::initList() {
     }
 }
 
-/* 804514D8-804514DC 0009D8 0004+00 2/2 0/0 0/0 .sbss            sSuppressPadReset__10JUTGamePad */
 u32 JUTGamePad::sSuppressPadReset;
 
-/* 804514DC-804514E0 0009DC 0004+00 1/1 1/1 0/0 .sbss            sAnalogMode__10JUTGamePad */
 s32 JUTGamePad::sAnalogMode;
 
-/* 802E0898-802E08D0 2DB1D8 0038+00 0/0 1/1 0/0 .text            init__10JUTGamePadFv */
 BOOL JUTGamePad::init() {
     PADSetSpec(PAD_SPEC_5);
     setAnalogMode(3);
     return PADInit();
 }
 
-/* 802E08D0-802E08E4 2DB210 0014+00 1/1 0/0 0/0 .text            clear__10JUTGamePadFv */
 void JUTGamePad::clear() {
     mButtonReset.mReset = false;
     field_0xa8 = 1;
 }
 
-/* 804343F0-80434420 061110 0030+00 1/3 1/1 0/0 .bss             mPadStatus__10JUTGamePad */
 PADStatus JUTGamePad::mPadStatus[4];
 
-/* 80434420-804344E0 061140 00C0+00 1/4 0/0 0/0 .bss             mPadButton__10JUTGamePad */
 JUTGamePad::CButton JUTGamePad::mPadButton[4];
 
-/* 804344E0-80434520 061200 0040+00 0/3 0/0 0/0 .bss             mPadMStick__10JUTGamePad */
 JUTGamePad::CStick JUTGamePad::mPadMStick[4];
 
-/* 80434520-80434560 061240 0040+00 0/3 0/0 0/0 .bss             mPadSStick__10JUTGamePad */
 JUTGamePad::CStick JUTGamePad::mPadSStick[4];
 
-/* 804508D8-804508DC 000358 0004+00 1/1 0/0 0/0 .sdata           sStickMode__10JUTGamePad */
 JUTGamePad::EStickMode JUTGamePad::sStickMode = EStickMode1;
 
-/* 804508DC-804508E0 00035C 0004+00 2/2 0/0 0/0 .sdata           sClampMode__10JUTGamePad */
 int JUTGamePad::sClampMode = EClampStick;
 
-/* 804514E0-804514E4 0009E0 0004+00 1/1 2/2 0/0 .sbss            sRumbleSupported__10JUTGamePad */
 u32 JUTGamePad::sRumbleSupported;
 
-/* 802E08E4-802E0BBC 2DB224 02D8+00 0/0 2/2 0/0 .text            read__10JUTGamePadFv */
 u32 JUTGamePad::read() {
     sRumbleSupported = PADRead(mPadStatus);
 
@@ -171,7 +150,6 @@ u32 JUTGamePad::read() {
     return sRumbleSupported;
 }
 
-/* 802E0BBC-802E0C6C 2DB4FC 00B0+00 1/1 0/0 0/0 .text            assign__10JUTGamePadFv */
 void JUTGamePad::assign() {
     for (int i = 0; i < 4; i++) {
         if (mPadStatus[i].err == 0 && mPadAssign[i] == 0) {
@@ -184,20 +162,14 @@ void JUTGamePad::assign() {
     }
 }
 
-/* 804514E4-804514E8 0009E4 0004+00 5/5 0/0 0/0 .sbss            mStatus__Q210JUTGamePad7CRumble */
 bool JUTGamePad::CRumble::mStatus[4];
 
-/* 804514E8-804514EC 0009E8 0004+00 5/5 0/0 0/0 .sbss            mEnabled__Q210JUTGamePad7CRumble */
 u32 JUTGamePad::CRumble::mEnabled;
 
-/* 804514EC-804514F0 0009EC 0004+00 2/2 4/4 0/0 .sbss sCallback__Q210JUTGamePad13C3ButtonReset */
 callbackFn JUTGamePad::C3ButtonReset::sCallback;
 
-/* 804514F0-804514F8 0009F0 0004+04 2/2 4/4 0/0 .sbss sCallbackArg__Q210JUTGamePad13C3ButtonReset
- */
 void* JUTGamePad::C3ButtonReset::sCallbackArg;
 
-/* 804514F8-80451500 0009F8 0008+00 2/2 0/0 0/0 .sbss sThreshold__Q210JUTGamePad13C3ButtonReset */
 OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30;
 
 /* 80451500 0001+00 data_80451500 None */
@@ -206,12 +178,8 @@ bool JUTGamePad::C3ButtonReset::sResetSwitchPushing;
 /* 80451501 0003+00 data_80451501 None */
 bool JUTGamePad::C3ButtonReset::sResetOccurred;
 
-/* 80451504-80451508 000A04 0004+00 2/2 0/0 0/0 .sbss
- * sResetOccurredPort__Q210JUTGamePad13C3ButtonReset            */
 s32 JUTGamePad::C3ButtonReset::sResetOccurredPort;
 
-/* 802E0C6C-802E0CD8 2DB5AC 006C+00 1/1 1/1 0/0 .text            checkResetCallback__10JUTGamePadFx
- */
 void JUTGamePad::checkResetCallback(OSTime holdTime) {
     if (holdTime >= JUTGamePad::C3ButtonReset::sThreshold) {
         JUTGamePad::C3ButtonReset::sResetOccurred = true;
@@ -223,22 +191,14 @@ void JUTGamePad::checkResetCallback(OSTime holdTime) {
     }
 }
 
-/* 804508E0-804508E4 000360 0004+00 1/1 0/0 0/0 .sdata           sPressPoint__Q210JUTGamePad6CStick
- */
 f32 JUTGamePad::CStick::sPressPoint = 0.5f;
 
-/* 804508E4-804508E8 000364 0004+00 1/1 0/0 0/0 .sdata sReleasePoint__Q210JUTGamePad6CStick */
 f32 JUTGamePad::CStick::sReleasePoint = 0.25f;
 
-/* 804508E8-804508EC 000368 0004+00 1/1 0/0 0/0 .sdata
- * sResetPattern__Q210JUTGamePad13C3ButtonReset                 */
 u32 JUTGamePad::C3ButtonReset::sResetPattern = PAD_BUTTON_START | PAD_BUTTON_X | PAD_BUTTON_B;
 
-/* 804508EC-804508F0 00036C 0004+00 1/1 0/0 0/0 .sdata
- * sResetMaskPattern__Q210JUTGamePad13C3ButtonReset             */
 u32 JUTGamePad::C3ButtonReset::sResetMaskPattern = 0x0000FFFF;
 
-/* 802E0CD8-802E0FA4 2DB618 02CC+00 2/2 0/0 0/0 .text            update__10JUTGamePadFv */
 void JUTGamePad::update() {
     if (mPortNum != EPortInvalid) {
         if (mPortNum >= 0 && mPortNum < 4) {
@@ -284,11 +244,8 @@ void JUTGamePad::update() {
     }
 }
 
-/* 8043456C-80434578 06128C 000C+00 1/2 0/0 0/0 .bss             sPatternList__19JUTGamePadLongPress
- */
 JSUList<JUTGamePadLongPress> JUTGamePadLongPress::sPatternList(false);
 
-/* 802E0FA4-802E1024 2DB8E4 0080+00 1/1 0/0 0/0 .text            checkResetSwitch__10JUTGamePadFv */
 void JUTGamePad::checkResetSwitch() {
     if (!JUTGamePad::C3ButtonReset::sResetOccurred) {
         if (OSGetResetSwitchState()) {
@@ -307,13 +264,11 @@ void JUTGamePad::checkResetSwitch() {
     }
 }
 
-/* 802E1024-802E1050 2DB964 002C+00 0/0 1/1 0/0 .text            clearForReset__10JUTGamePadFv */
 void JUTGamePad::clearForReset() {
     CRumble::setEnabled(0);
     recalibrate(PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT);
 }
 
-/* 802E1050-802E108C 2DB990 003C+00 2/2 0/0 0/0 .text            clear__Q210JUTGamePad7CButtonFv */
 void JUTGamePad::CButton::clear() {
     mButton = 0;
     mTrigger = 0;
@@ -330,8 +285,6 @@ void JUTGamePad::CButton::clear() {
     mRepeatRate = 0;
 }
 
-/* 802E108C-802E121C 2DB9CC 0190+00 1/1 0/0 0/0 .text
- * update__Q210JUTGamePad7CButtonFPC9PADStatusUl                */
 void JUTGamePad::CButton::update(const PADStatus* padStatus, u32 stickStatus) {
     u32 buttons;
     if (padStatus != NULL) {
@@ -386,7 +339,6 @@ void JUTGamePad::CButton::update(const PADStatus* padStatus, u32 stickStatus) {
     mAnalogRf = (s32)mAnalogR / 150.0f;
 }
 
-/* 802E121C-802E1238 2DBB5C 001C+00 2/2 0/0 0/0 .text            clear__Q210JUTGamePad6CStickFv */
 void JUTGamePad::CStick::clear() {
     mPosX = 0.0f;
     mPosY = 0.0f;
@@ -394,8 +346,6 @@ void JUTGamePad::CStick::clear() {
     mAngle = 0;
 }
 
-/* 802E1238-802E1500 2DBB78 02C8+00 1/1 0/0 0/0 .text
- * update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl */
 u32 JUTGamePad::CStick::update(s8 x, s8 y, JUTGamePad::EStickMode mode,
                                JUTGamePad::EWhichStick stick, u32 buttons) {
     s32 clamp;
@@ -441,8 +391,6 @@ u32 JUTGamePad::CStick::update(s8 x, s8 y, JUTGamePad::EStickMode mode,
     return getButton(buttons >> button_shift);
 }
 
-/* 802E1500-802E15B4 2DBE40 00B4+00 1/1 0/0 0/0 .text            getButton__Q210JUTGamePad6CStickFUl
- */
 u32 JUTGamePad::CStick::getButton(u32 buttons) {
     u32 button = buttons & 0xF;
 
@@ -465,7 +413,6 @@ u32 JUTGamePad::CStick::getButton(u32 buttons) {
     return button;
 }
 
-/* 802E15B4-802E15D8 2DBEF4 0024+00 1/1 0/0 0/0 .text            clear__Q210JUTGamePad7CRumbleFv */
 void JUTGamePad::CRumble::clear() {
     mFrame = 0;
     mLength = 0;
@@ -475,8 +422,6 @@ void JUTGamePad::CRumble::clear() {
     mEnabled = (PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT);
 }
 
-/* 802E15D8-802E1634 2DBF18 005C+00 2/2 0/0 0/0 .text clear__Q210JUTGamePad7CRumbleFP10JUTGamePad
- */
 void JUTGamePad::CRumble::clear(JUTGamePad* pad) {
     if (pad->getPortNum() >= 0 && pad->getPortNum() < 4) {
         mStatus[pad->getPortNum()] = false;
@@ -485,7 +430,6 @@ void JUTGamePad::CRumble::clear(JUTGamePad* pad) {
     clear();
 }
 
-/* 802E1634-802E168C 2DBF74 0058+00 1/1 0/0 0/0 .text startMotor__Q210JUTGamePad7CRumbleFi */
 void JUTGamePad::CRumble::startMotor(int port) {
     if (isEnabledPort(port)) {
         PADControlMotor(port, PAD_MOTOR_RUMBLE);
@@ -493,7 +437,6 @@ void JUTGamePad::CRumble::startMotor(int port) {
     }
 }
 
-/* 802E168C-802E16F8 2DBFCC 006C+00 4/4 3/3 0/0 .text stopMotor__Q210JUTGamePad7CRumbleFib */
 void JUTGamePad::CRumble::stopMotor(int port, bool hard_stop) {
     if (isEnabledPort(port)) {
         u8 command = hard_stop ? PAD_MOTOR_STOP_HARD : PAD_MOTOR_STOP;
@@ -502,13 +445,11 @@ void JUTGamePad::CRumble::stopMotor(int port, bool hard_stop) {
     }
 }
 
-/* 802E16F8-802E1720 2DC038 0028+00 1/1 0/0 0/0 .text            getNumBit__FPUci */
 static bool getNumBit(u8* pattern, int index) {
     u8 bit = pattern[index >> 3] & (0x80 >> (index & 7));
     return bit != 0;
 }
 
-/* 802E1720-802E18A4 2DC060 0184+00 1/1 0/0 0/0 .text            update__Q210JUTGamePad7CRumbleFs */
 void JUTGamePad::CRumble::update(s16 port) {
     if (isEnabledPort(port) == false) {
         mFrame = 0;
@@ -553,8 +494,6 @@ void JUTGamePad::CRumble::update(s16 port) {
     mFrame++;
 }
 
-/* 802E18A4-802E18CC 2DC1E4 0028+00 1/1 0/0 0/0 .text
- * triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl            */
 void JUTGamePad::CRumble::triggerPatternedRumble(u32 length) {
     if (mPattern != NULL && mFrameCount != 0) {
         mLength = length;
@@ -562,8 +501,6 @@ void JUTGamePad::CRumble::triggerPatternedRumble(u32 length) {
     }
 }
 
-/* 802E18CC-802E1948 2DC20C 007C+00 0/0 2/2 0/0 .text
- * startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl */
 void JUTGamePad::CRumble::startPatternedRumble(void* data, JUTGamePad::CRumble::ERumble rumble,
                                                u32 length) {
     mFrameCount = ((*(u8*)data) << 8) + *((u8*)data + 1);
@@ -582,20 +519,15 @@ void JUTGamePad::CRumble::startPatternedRumble(void* data, JUTGamePad::CRumble::
     }
 }
 
-/* 802E1948-802E1978 2DC288 0030+00 1/1 3/3 0/0 .text
- * stopPatternedRumble__Q210JUTGamePad7CRumbleFs                */
 void JUTGamePad::CRumble::stopPatternedRumble(s16 port) {
     mLength = 0;
     stopMotorHard(port);
 }
 
-/* 802E1978-802E199C 2DC2B8 0024+00 0/0 1/1 0/0 .text
- * stopPatternedRumbleAtThePeriod__Q210JUTGamePad7CRumbleFv     */
 void JUTGamePad::CRumble::stopPatternedRumbleAtThePeriod() {
     mLength = (mFrame + mFrameCount - 1) % mFrameCount;
 }
 
-/* 802E199C-802E19D8 2DC2DC 003C+00 1/1 1/1 0/0 .text            getGamePad__10JUTGamePadFi */
 JUTGamePad* JUTGamePad::getGamePad(int port) {
     JSUListIterator<JUTGamePad> pad(mPadList.getFirst());
 
@@ -608,7 +540,6 @@ JUTGamePad* JUTGamePad::getGamePad(int port) {
     return NULL;
 }
 
-/* 802E19D8-802E1A7C 2DC318 00A4+00 1/1 1/1 0/0 .text setEnabled__Q210JUTGamePad7CRumbleFUl */
 void JUTGamePad::CRumble::setEnabled(u32 mask) {
     for (int i = 0; i < 4; i++) {
         if ((mEnabled & channel_mask[i]) == 0) {
@@ -626,7 +557,6 @@ void JUTGamePad::CRumble::setEnabled(u32 mask) {
     mEnabled = (mask & (PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT));
 }
 
-/* 802E1A7C-802E1A98 2DC3BC 001C+00 1/1 0/0 0/0 .text setRepeat__Q210JUTGamePad7CButtonFUlUlUl */
 void JUTGamePad::CButton::setRepeat(u32 mask, u32 delay, u32 rate) {
     mRepeatStart = 0;
     mRepeatCount = 0;
@@ -635,7 +565,6 @@ void JUTGamePad::CButton::setRepeat(u32 mask, u32 delay, u32 rate) {
     mRepeatRate = rate;
 }
 
-/* 802E1A98-802E1AFC 2DC3D8 0064+00 1/1 0/0 0/0 .text            recalibrate__10JUTGamePadFUl */
 bool JUTGamePad::recalibrate(u32 mask) {
     for (int i = 0; i < 4; i++) {
         if (sSuppressPadReset & channel_mask[i]) {
@@ -646,7 +575,6 @@ bool JUTGamePad::recalibrate(u32 mask) {
     return PADRecalibrate(mask);
 }
 
-/* 802E1AFC-802E1B60 2DC43C 0064+00 1/1 0/0 0/0 .text checkCallback__19JUTGamePadLongPressFiUl */
 void JUTGamePadLongPress::checkCallback(int port, u32 hold_time) {
     if (port >= 0 && hold_time >= mThreshold) {
         field_0x11 = true;
diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp
index 496fc2005c..2add552e85 100644
--- a/src/JSystem/JUtility/JUTGraphFifo.cpp
+++ b/src/JSystem/JUtility/JUTGraphFifo.cpp
@@ -1,20 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTGraphFifo
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTGraphFifo.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 804514B8-804514BC 0009B8 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool data_804514B8;
 
-/* 804514BC-804514C0 0009BC 0004+00 2/2 0/0 0/0 .sbss            sCurrentFifo__12JUTGraphFifo */
 JUTGraphFifo* JUTGraphFifo::sCurrentFifo;
 
-/* 802DEB58-802DEC34 2D9498 00DC+00 0/0 1/1 0/0 .text            __ct__12JUTGraphFifoFUl */
 JUTGraphFifo::JUTGraphFifo(u32 size) {
     mSize = size + 0x1F & ~0x1F;
     if (data_804514B8) {
@@ -31,11 +23,8 @@ JUTGraphFifo::JUTGraphFifo(u32 size) {
     }
 }
 
-/* ############################################################################################## */
-/* 804514C0-804514C8 0009C0 0005+03 1/1 0/0 0/0 .sbss            mGpStatus__12JUTGraphFifo */
 bool JUTGraphFifo::mGpStatus[5];
 
-/* 802DEC34-802DECF8 2D9574 00C4+00 1/0 0/0 0/0 .text            __dt__12JUTGraphFifoFv */
 JUTGraphFifo::~JUTGraphFifo() {
     sCurrentFifo->save();
 
diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp
index dcf0d9a14e..7ad26bf58e 100644
--- a/src/JSystem/JUtility/JUTNameTab.cpp
+++ b/src/JSystem/JUtility/JUTNameTab.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTNameTab
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTNameTab.h"
diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp
index 779ed82712..235132832b 100644
--- a/src/JSystem/JUtility/JUTProcBar.cpp
+++ b/src/JSystem/JUtility/JUTProcBar.cpp
@@ -6,7 +6,6 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include <stdint.h>
 
-/* 802E5888-802E599C 2E01C8 0114+00 1/1 0/0 0/0 .text            __ct__10JUTProcBarFv */
 JUTProcBar::JUTProcBar() {
     mVisible = true;
     mHeapBarVisible = true;
@@ -28,16 +27,12 @@ JUTProcBar::JUTProcBar() {
     mWatchHeap = NULL;
 }
 
-/* ############################################################################################## */
-/* 80451558-8045155C 000A58 0004+00 4/4 6/6 0/0 .sbss            sManager__10JUTProcBar */
 JUTProcBar* JUTProcBar::sManager;
 
-/* 802E599C-802E59E0 2E02DC 0044+00 1/1 0/0 0/0 .text            __dt__10JUTProcBarFv */
 JUTProcBar::~JUTProcBar() {
     sManager = NULL;
 }
 
-/* 802E59E0-802E5A28 2E0320 0048+00 0/0 1/1 0/0 .text            create__10JUTProcBarFv */
 JUTProcBar* JUTProcBar::create() {
     if (!sManager) {
         sManager = new JUTProcBar();
@@ -45,7 +40,6 @@ JUTProcBar* JUTProcBar::create() {
     return sManager;
 }
 
-/* 802E5A28-802E5A60 2E0368 0038+00 0/0 1/1 0/0 .text            destroy__10JUTProcBarFv */
 void JUTProcBar::destroy() {
     if (sManager) {
         delete sManager;
@@ -53,14 +47,10 @@ void JUTProcBar::destroy() {
     sManager = NULL;
 }
 
-/* ############################################################################################## */
-/* 80450900-80450904 000380 0004+00 2/2 0/0 0/0 .sdata           oneFrameRate */
 static f32 oneFrameRate = 8.0f;
 
-/* 80450904-80450908 000384 0004+00 2/2 0/0 0/0 .sdata           oneFrameRateUser */
 static f32 oneFrameRateUser = 10.0f;
 
-/* 802E5A60-802E5B30 2E03A0 00D0+00 0/0 1/1 0/0 .text            clear__10JUTProcBarFv */
 void JUTProcBar::clear() {
     sManager->idleStart();
     sManager->cpuStart();
@@ -71,8 +61,6 @@ void JUTProcBar::clear() {
     oneFrameRateUser = 10.0f;
 }
 
-/* 802E5B30-802E5CC4 2E0470 0194+00 1/1 0/0 0/0 .text
- * bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor */
 void JUTProcBar::bar_subroutine(int param_0, int param_1, int param_2, int param_3, int param_4,
                                 int param_5, int param_6, JUtility::TColor param_7,
                                 JUtility::TColor param_8) {
@@ -88,7 +76,6 @@ void JUTProcBar::bar_subroutine(int param_0, int param_1, int param_2, int param
     }
 }
 
-/* 802E5CC4-802E5E08 2E0604 0144+00 1/1 0/0 0/0 .text adjustMeterLength__10JUTProcBarFUlPfffPi */
 void JUTProcBar::adjustMeterLength(u32 param_0, f32* param_1, f32 param_2, f32 param_3,
                                    int* param_4) {
     BOOL var2 = false;
@@ -117,13 +104,11 @@ void JUTProcBar::adjustMeterLength(u32 param_0, f32* param_1, f32 param_2, f32 p
     *param_1 = var1;
 }
 
-/* 802E5E08-802E5E3C 2E0748 0034+00 0/0 1/1 0/0 .text            draw__10JUTProcBarFv */
 void JUTProcBar::draw() {
     drawProcessBar();
     drawHeapBar();
 }
 
-/* 802E5E3C-802E6D3C 2E077C 0F00+00 1/1 0/0 0/0 .text            drawProcessBar__10JUTProcBarFv */
 void JUTProcBar::drawProcessBar() {
     if (mVisible) {
         int frameDuration = 16666;  // duration in miliseconds? for how long a frame takes,
@@ -264,17 +249,14 @@ void JUTProcBar::drawProcessBar() {
     }
 }
 
-/* 802E6D3C-802E6DA4 2E167C 0068+00 2/2 0/0 0/0 .text            addrToXPos__FPvi */
 static int addrToXPos(void* param_0, int param_1) {
     return param_1 * (((uintptr_t)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize);
 }
 
-/* 802E6DA4-802E6E0C 2E16E4 0068+00 2/2 0/0 0/0 .text            byteToXLen__Fii */
 static int byteToXLen(int param_0, int param_1) {
     return param_1 * (param_0 / (float)JKRHeap::mMemorySize);
 }
 
-/* 802E6E0C-802E6FA0 2E174C 0194+00 1/1 0/0 0/0 .text            heapBar__FP7JKRHeapiiiii */
 static void heapBar(JKRHeap* param_0, int param_1, int param_2, int param_3, int param_4,
                     int param_5) {
     int stack52 = param_1 + addrToXPos(param_0->getStartAddr(), param_4);
@@ -286,7 +268,6 @@ static void heapBar(JKRHeap* param_0, int param_1, int param_2, int param_3, int
                JUtility::TColor(255, 180, 250, 255));
 }
 
-/* 802E6FA0-802E7340 2E18E0 03A0+00 1/1 0/0 0/0 .text            drawHeapBar__10JUTProcBarFv */
 void JUTProcBar::drawHeapBar() {
     if (mHeapBarVisible) {
         int start;  // required/workaround for regswaps, end might be a shared variable too, however
diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp
index e7aa4239f9..52c8ca7d1e 100644
--- a/src/JSystem/JUtility/JUTResFont.cpp
+++ b/src/JSystem/JUtility/JUTResFont.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTResFont
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTResFont.h"
@@ -12,20 +7,17 @@
 #include "JSystem/JUtility/JUTConsole.h"
 #include "dolphin/gx.h"
 
-/* 802DEF48-802DEF94 2D9888 004C+00 0/0 1/1 0/0 .text            __ct__10JUTResFontFv */
 JUTResFont::JUTResFont() {
     initialize_state();
     JUTFont::initialize_state();
 }
 
-/* 802DEF94-802DF000 2D98D4 006C+00 0/0 10/10 0/0 .text __ct__10JUTResFontFPC7ResFONTP7JKRHeap */
 JUTResFont::JUTResFont(const ResFONT* pFont, JKRHeap* pHeap) {
     initialize_state();
     JUTFont::initialize_state();
     initiate(pFont, pHeap);
 }
 
-/* 802DF000-802DF08C 2D9940 008C+00 1/0 2/2 0/0 .text            __dt__10JUTResFontFv */
 JUTResFont::~JUTResFont() {
     if (mValid) {
         deleteMemBlocks_ResFont();
@@ -34,12 +26,10 @@ JUTResFont::~JUTResFont() {
     }
 }
 
-/* 802DF08C-802DF0B0 2D99CC 0024+00 3/3 3/3 0/0 .text deleteMemBlocks_ResFont__10JUTResFontFv */
 void JUTResFont::deleteMemBlocks_ResFont() {
     delete[] mMemBlocks;
 }
 
-/* 802DF0B0-802DF0DC 2D99F0 002C+00 5/5 3/3 0/0 .text            initialize_state__10JUTResFontFv */
 void JUTResFont::initialize_state() {
     mResFont = NULL;
     mMemBlocks = NULL;
@@ -51,8 +41,6 @@ void JUTResFont::initialize_state() {
     mTexPageIdx = -1;
 }
 
-/* 802DF0DC-802DF13C 2D9A1C 0060+00 1/1 0/0 0/0 .text initiate__10JUTResFontFPC7ResFONTP7JKRHeap
- */
 bool JUTResFont::initiate(const ResFONT* pFont, JKRHeap* pHeap) {
     if (!protected_initiate(pFont, pHeap)) {
         deleteMemBlocks_ResFont();
@@ -64,8 +52,6 @@ bool JUTResFont::initiate(const ResFONT* pFont, JKRHeap* pHeap) {
     return true;
 }
 
-/* 802DF13C-802DF248 2D9A7C 010C+00 1/1 0/0 0/0 .text
- * protected_initiate__10JUTResFontFPC7ResFONTP7JKRHeap         */
 bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) {
     void** p;
     delete_and_initialize();
@@ -100,7 +86,6 @@ bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) {
     }
 }
 
-/* 802DF248-802DF344 2D9B88 00FC+00 1/1 0/0 0/0 .text            countBlock__10JUTResFontFv */
 void JUTResFont::countBlock() {
     mWid1BlockNum = 0;
     mGly1BlockNum = 0;
@@ -127,15 +112,12 @@ void JUTResFont::countBlock() {
     }
 }
 
-/* ############################################################################################## */
-/* 8039D390-8039D39C -00001 000C+00 1/1 1/1 0/0 .rodata          saoAboutEncoding___10JUTResFont */
 IsLeadByte_func const JUTResFont::saoAboutEncoding_[3] = {
     JUTFont::isLeadByte_1Byte,
     JUTFont::isLeadByte_2Byte,
     JUTFont::isLeadByte_ShiftJIS,
 };
 
-/* 802DF344-802DF48C 2D9C84 0148+00 1/0 0/0 0/0 .text            setBlock__10JUTResFontFv */
 void JUTResFont::setBlock() {
 	s32 widthNum, glyphNum, mapNum;
 	widthNum = 0;
@@ -178,7 +160,6 @@ void JUTResFont::setBlock() {
 	}
 }
 
-/* 802DF48C-802DF584 2D9DCC 00F8+00 1/0 1/0 0/0 .text            setGX__10JUTResFontFv */
 void JUTResFont::setGX() {
     GXSetNumChans(1);
     GXSetNumTevStages(1);
@@ -197,8 +178,6 @@ void JUTResFont::setGX() {
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
 }
 
-/* 802DF584-802DF7C4 2D9EC4 0240+00 1/0 1/0 0/0 .text
- * setGX__10JUTResFontFQ28JUtility6TColorQ28JUtility6TColor     */
 void JUTResFont::setGX(JUtility::TColor col1, JUtility::TColor col2) {
     if (col1 == 0 && col2 == -1) {
         setGX();
@@ -231,8 +210,6 @@ void JUTResFont::setGX(JUtility::TColor col1, JUtility::TColor col2) {
     }
 }
 
-/* 802DF7C4-802DFBE8 2DA104 0424+00 1/0 1/0 0/0 .text            drawChar_scale__10JUTResFontFffffib
- */
 f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, int str_int,
                                bool flag) {
     f32 x1;
@@ -296,8 +273,6 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i
     return retval;
 }
 
-/* 802DFBE8-802DFC64 2DA528 007C+00 1/1 0/0 0/0 .text
- * loadFont__10JUTResFontFi11_GXTexMapIDPQ27JUTFont6TWidth      */
 void JUTResFont::loadFont(int code, GXTexMapID texMapID, JUTFont::TWidth* pDstWidth) {
     if (pDstWidth != 0) {
         getWidthEntry(code, pDstWidth);
@@ -307,8 +282,6 @@ void JUTResFont::loadFont(int code, GXTexMapID texMapID, JUTFont::TWidth* pDstWi
     loadImage(fontCode, texMapID);
 }
 
-/* 802DFC64-802DFD0C 2DA5A4 00A8+00 1/0 1/0 0/0 .text
- * getWidthEntry__10JUTResFontCFiPQ27JUTFont6TWidth             */
 void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const {
     int fontCode = getFontCode(code);
     i_width->field_0x0 = 0;
@@ -324,7 +297,6 @@ void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const {
     }
 }
 
-/* 802DFD0C-802DFD58 2DA64C 004C+00 1/0 1/0 0/0 .text            getCellWidth__10JUTResFontCFv */
 s32 JUTResFont::getCellWidth() const {
     if (mpGlyphBlocks) {
         ResFONT::GLY1* glyphBlock = *mpGlyphBlocks;
@@ -336,7 +308,6 @@ s32 JUTResFont::getCellWidth() const {
     return getWidth();
 }
 
-/* 802DFD58-802DFDA4 2DA698 004C+00 1/0 1/0 0/0 .text            getCellHeight__10JUTResFontCFv */
 s32 JUTResFont::getCellHeight() const {
     if (mpGlyphBlocks) {
         ResFONT::GLY1* glyphBlock = *mpGlyphBlocks;
@@ -348,13 +319,10 @@ s32 JUTResFont::getCellHeight() const {
     return getHeight();
 }
 
-/* 802DFDA4-802DFDD8 2DA6E4 0034+00 1/0 1/0 0/0 .text            isLeadByte__10JUTResFontCFi */
 bool JUTResFont::isLeadByte(int chr) const {
     return (*mIsLeadByte)(chr);
 }
 
-/* ############################################################################################## */
-/* 8039D39C-8039D45C 0299FC 00BE+02 1/1 0/0 0/0 .rodata          halftofull$726 */
 static const u16 halftofull[95] = {
     0x8140, 0x8149, 0x8168, 0x8194, 0x8190, 0x8193, 0x8195, 0x8166, 0x8169, 0x816A, 0x8196, 0x817B,
     0x8143, 0x817C, 0x8144, 0x815E, 0x824F, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, 0x8255, 0x8256,
@@ -366,7 +334,6 @@ static const u16 halftofull[95] = {
     0x8294, 0x8295, 0x8296, 0x8297, 0x8298, 0x8299, 0x829A, 0x816F, 0x8162, 0x8170, 0x8160,
 };
 
-/* 802DFDD8-802DFF60 2DA718 0188+00 2/2 0/0 0/0 .text            getFontCode__10JUTResFontCFi */
 int JUTResFont::getFontCode(int chr) const {
     int ret = mInf1Ptr->defaultCode;
     if ((getFontType() == 2) && (mMaxCode >= 0x8000U) && (chr >= 0x20) && (chr < 0x7FU)) {
@@ -415,7 +382,6 @@ int JUTResFont::getFontCode(int chr) const {
     return ret;
 }
 
-/* 802DFF60-802E00C4 2DA8A0 0164+00 1/0 0/0 0/0 .text loadImage__10JUTResFontFi11_GXTexMapID */
 void JUTResFont::loadImage(int code, GXTexMapID id){
     int i = 0;
     for (; i < mGly1BlockNum; i++)
@@ -451,7 +417,6 @@ void JUTResFont::loadImage(int code, GXTexMapID id){
     GXLoadTexObj(&mTexObj, id);
 }
 
-/* 802E00C4-802E0108 2DAA04 0044+00 1/1 0/0 0/0 .text            convertSjis__10JUTResFontCFiPUs */
 int JUTResFont::convertSjis(int inChr, u16* inLead) const {
     int tmp = JSUHiByte(inChr);
     int tmp2 = JSULoByte(inChr) - 0x40;
diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp
index be03109669..9d74852f58 100644
--- a/src/JSystem/JUtility/JUTResource.cpp
+++ b/src/JSystem/JUtility/JUTResource.cpp
@@ -5,8 +5,6 @@
 #include "JSystem/JSupport/JSUInputStream.h"
 #include "string.h"
 
-/* 802DE078-802DE120 2D89B8 00A8+00 0/0 1/1 0/0 .text
- * getResource__15JUTResReferenceFP14JSUInputStreamUlP10JKRArchive */
 void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) {
     stream->read(&mType, 1);
     stream->read(&mNameLength, 1);
@@ -19,8 +17,6 @@ void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchi
     return getResource(resType, archive);
 }
 
-/* 802DE120-802DE1BC 2D8A60 009C+00 0/0 2/2 0/0 .text
- * getResource__15JUTResReferenceFPCvUlP10JKRArchive            */
 
 void* JUTResReference::getResource(const void* data, u32 resType, JKRArchive* archive) {
     mType = *(u8*)data;
@@ -37,8 +33,6 @@ void* JUTResReference::getResource(const void* data, u32 resType, JKRArchive* ar
     return getResource(resType, archive);
 }
 
-/* 802DE1BC-802DE234 2D8AFC 0078+00 2/2 0/0 0/0 .text
- * getResource__15JUTResReferenceFUlP10JKRArchive               */
 void* JUTResReference::getResource(u32 resType, JKRArchive* archive) {
     void* res = NULL;
     switch (mType) {
diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp
index 78c93b4a2e..d62f8961ee 100644
--- a/src/JSystem/JUtility/JUTTexture.cpp
+++ b/src/JSystem/JUtility/JUTTexture.cpp
@@ -4,7 +4,6 @@
 #include "JSystem/JUtility/JUTPalette.h"
 #include "dolphin/gx.h"
 
-/* 802DE234-802DE2A8 2D8B74 0074+00 0/0 30/30 0/0 .text            __dt__10JUTTextureFv */
 JUTTexture::~JUTTexture() {
     if (getCaptureFlag()) {
         delete[] field_0x3c;
@@ -14,7 +13,6 @@ JUTTexture::~JUTTexture() {
     }
 }
 
-/* 802DE2A8-802DE44C 2D8BE8 01A4+00 0/0 18/18 0/0 .text storeTIMG__10JUTTextureFPC7ResTIMGUc */
 void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) {
     _GXTlut tlut;
 
@@ -60,8 +58,6 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) {
     }
 }
 
-/* 802DE44C-802DE480 2D8D8C 0034+00 0/0 6/6 0/0 .text
- * storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette              */
 void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1) {
     _GXTlut type;
 
@@ -73,8 +69,6 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1) {
     storeTIMG(param_0, param_1, type);
 }
 
-/* 802DE480-802DE5B0 2D8DC0 0130+00 1/1 3/3 0/0 .text
- * storeTIMG__10JUTTextureFPC7ResTIMGP10JUTPalette7_GXTlut      */
 void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, _GXTlut param_2) {
     _GXTlut type;
 
@@ -115,7 +109,6 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, _GXTlut
     init();
 }
 
-/* 802DE5B0-802DE608 2D8EF0 0058+00 1/1 7/7 0/0 .text attachPalette__10JUTTextureFP10JUTPalette */
 void JUTTexture::attachPalette(JUTPalette* param_0) {
     if (mTexInfo->indexTexture) {
         if (param_0 == NULL && mEmbPalette != NULL) {
@@ -128,7 +121,6 @@ void JUTTexture::attachPalette(JUTPalette* param_0) {
     }
 }
 
-/* 802DE608-802DE658 2D8F48 0050+00 1/1 0/0 0/0 .text            init__10JUTTextureFv */
 void JUTTexture::init() {
     if (mTexInfo->numColors == 0) {
         initTexObj();
@@ -142,7 +134,6 @@ void JUTTexture::init() {
     }
 }
 
-/* 802DE658-802DE744 2D8F98 00EC+00 2/2 0/0 0/0 .text            initTexObj__10JUTTextureFv */
 void JUTTexture::initTexObj() {
     GXBool mipmapEnabled;
     if (mTexInfo->mipmapEnabled != 0) {
@@ -160,8 +151,6 @@ void JUTTexture::initTexObj() {
                     mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy);
 }
 
-/* 802DE744-802DE840 2D9084 00FC+00 2/2 0/0 0/0 .text            initTexObj__10JUTTextureF7_GXTlut
- */
 void JUTTexture::initTexObj(_GXTlut param_0) {
     GXBool mipmapEnabled;
     if (mTexInfo->mipmapEnabled != 0) {
@@ -180,8 +169,6 @@ void JUTTexture::initTexObj(_GXTlut param_0) {
                     mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy);
 }
 
-/* 802DE840-802DE890 2D9180 0050+00 0/0 14/14 0/0 .text            load__10JUTTextureF11_GXTexMapID
- */
 void JUTTexture::load(_GXTexMapID param_0) {
     if (field_0x2c) {
         field_0x2c->load();
diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp
index 8a45a9c7bf..fc05d945b5 100644
--- a/src/JSystem/JUtility/JUTVideo.cpp
+++ b/src/JSystem/JUtility/JUTVideo.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTVideo
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTVideo.h"
@@ -11,20 +6,14 @@
 #include "dolphin/gx.h"
 #include <dolphin/vi.h>
 
-/* 80451538-8045153C 000A38 0004+00 4/4 18/18 1/1 .sbss            sManager__8JUTVideo */
 JUTVideo* JUTVideo::sManager;
 
-/* 8045153C-80451540 000A3C 0004+00 2/2 1/1 0/0 .sbss            sVideoLastTick__8JUTVideo */
 OSTick JUTVideo::sVideoLastTick;
 
-/* 80451540-80451544 000A40 0004+00 2/2 1/1 0/0 .sbss            sVideoInterval__8JUTVideo */
 OSTick JUTVideo::sVideoInterval;
 
-/* 80451544-80451548 000A44 0004+00 4/4 0/0 0/0 .sbss            None */
 static bool data_80451544;
 
-/* 802E4C54-802E4CAC 2DF594 0058+00 0/0 1/1 0/0 .text
- * createManager__8JUTVideoFPC16_GXRenderModeObj                */
 JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) {
     if (sManager == NULL) {
         sManager = new JUTVideo(param_0);
@@ -32,7 +21,6 @@ JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) {
     return sManager;
 }
 
-/* 802E4CAC-802E4CF4 2DF5EC 0048+00 0/0 2/2 0/0 .text            destroyManager__8JUTVideoFv */
 void JUTVideo::destroyManager() {
     if (sManager != NULL) {
         delete sManager;
@@ -40,7 +28,6 @@ void JUTVideo::destroyManager() {
     }
 }
 
-/* 802E4CF4-802E4DE8 2DF634 00F4+00 1/1 0/0 0/0 .text __ct__8JUTVideoFPC16_GXRenderModeObj */
 JUTVideo::JUTVideo(GXRenderModeObj const* param_0) {
     mRenderObj = NULL;
     VIInit();
@@ -63,13 +50,11 @@ JUTVideo::JUTVideo(GXRenderModeObj const* param_0) {
     GXSetDrawDoneCallback(drawDoneCallback);
 }
 
-/* 802E4DE8-802E4E50 2DF728 0068+00 1/0 0/0 0/0 .text            __dt__8JUTVideoFv */
 JUTVideo::~JUTVideo() {
     VISetPreRetraceCallback(mPreRetraceCallback);
     VISetPostRetraceCallback(mPostRetraceCallback);
 }
 
-/* 802E4E50-802E5088 2DF790 0238+00 1/1 0/0 0/0 .text            preRetraceProc__8JUTVideoFUl */
 void JUTVideo::preRetraceProc(u32 retrace_count) {
     if (!sManager) {
         return;
@@ -152,18 +137,15 @@ void JUTVideo::preRetraceProc(u32 retrace_count) {
     }
 }
 
-/* 802E5088-802E50B0 2DF9C8 0028+00 0/0 1/1 0/0 .text            drawDoneStart__8JUTVideoFv */
 void JUTVideo::drawDoneStart() {
     data_80451544 = true;
     GXSetDrawDone();
 }
 
-/* 802E50B0-802E50BC 2DF9F0 000C+00 0/0 1/1 0/0 .text            dummyNoDrawWait__8JUTVideoFv */
 void JUTVideo::dummyNoDrawWait() {
     data_80451544 = false;
 }
 
-/* 802E50BC-802E5144 2DF9FC 0088+00 1/1 0/0 0/0 .text            drawDoneCallback__8JUTVideoFv */
 void JUTVideo::drawDoneCallback() {
     JUTXfb* xfb = JUTXfb::getManager();
     if (!xfb) {
@@ -184,7 +166,6 @@ void JUTVideo::drawDoneCallback() {
     }
 }
 
-/* 802E5144-802E5198 2DFA84 0054+00 1/1 0/0 0/0 .text            postRetraceProc__8JUTVideoFUl */
 void JUTVideo::postRetraceProc(u32 retrace_count) {
     if (!sManager) {
         return;
@@ -198,8 +179,6 @@ void JUTVideo::postRetraceProc(u32 retrace_count) {
     OSSendMessage(&sManager->mMessageQueue, message, OS_MESSAGE_NOBLOCK);
 }
 
-/* 802E5198-802E5210 2DFAD8 0078+00 1/1 2/2 0/0 .text
- * setRenderMode__8JUTVideoFPC16_GXRenderModeObj                */
 void JUTVideo::setRenderMode(GXRenderModeObj const* pObj) {
     if (mRenderObj != NULL && pObj->viTVmode != mRenderObj->viTVmode) {
         mSetBlack = true;
@@ -215,5 +194,4 @@ void JUTVideo::setRenderMode(GXRenderModeObj const* pObj) {
     }
 }
 
-/* 802E5210-802E5214 2DFB50 0004+00 0/0 1/1 0/0 .text            waitRetraceIfNeed__8JUTVideoFv */
 void JUTVideo::waitRetraceIfNeed() {}
diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp
index b23fdae484..73d9c1889a 100644
--- a/src/JSystem/JUtility/JUTXfb.cpp
+++ b/src/JSystem/JUtility/JUTXfb.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: JUTXfb
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTXfb.h"
@@ -22,8 +17,6 @@ void JUTXfb::common_init(int bufNum) {
     mSDrawingFlag = 99;
 }
 
-/* 802E5260-802E5308 2DFBA0 00A8+00 1/1 0/0 0/0 .text
- * __ct__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber */
 JUTXfb::JUTXfb(GXRenderModeObj const* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
     common_init(xfbNum);
 
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c
index 9aafb8e069..6c9275730e 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c
@@ -2,7 +2,6 @@
 #include "critical_regions.h"
 #include "errno.h"
 
-/* 80365E90-80365F74 3607D0 00E4+00 0/0 2/2 0/0 .text            ftell */
 long ftell(FILE* stream) {
     int retval;
 
@@ -44,7 +43,6 @@ int _ftell(FILE* file) {
     return (position);
 }
 
-/* 80365C20-80365E90 360560 0270+00 1/1 0/0 0/0 .text            _fseek */
 int _fseek(FILE* file, unsigned long offset, int whence) {
     int bufferCode;
     int pos;
@@ -137,11 +135,10 @@ int _fseek(FILE* file, unsigned long offset, int whence) {
     return 0;
 }
 
-/* 80365BB4-80365C20 3604F4 006C+00 0/0 2/2 0/0 .text            fseek */
 int fseek(FILE* stream, unsigned long offset, int whence) {
     int code;
     __begin_critical_region(stdin_access);
     code = _fseek(stream, offset, whence);  // 0 if successful, -1 if error
     __end_critical_region(stdin_access);
     return code;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c
index 7d653242bd..3c49dff88d 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c
@@ -4,22 +4,16 @@
 
 extern void (*_dtors[])(void);
 
-/* 8044D440-8044D540 07A160 0100+00 2/2 0/0 0/0 .bss             __atexit_funcs */
 static void (*__atexit_funcs[64])(void);
 
-/* 8045199C-804519A0 000E9C 0004+00 2/2 0/0 0/0 .sbss            __console_exit */
 static void (*__console_exit)(void);
 
-/* 80451998-8045199C 000E98 0004+00 1/1 1/1 0/0 .sbss            __stdio_exit */
 void (*__stdio_exit)(void);
 
-/* 80451994-80451998 000E94 0004+00 2/2 0/0 0/0 .sbss            __atexit_curr_func */
 static int __atexit_curr_func;
 
-/* 80451990-80451994 000E90 0004+00 2/2 0/0 0/0 .sbss            __aborting */
 static int __aborting;
 
-/* 80362ABC-80362B58 35D3FC 009C+00 0/0 9/9 0/0 .text            abort */
 void abort(void) {
     raise(1);
     __aborting = 1;
@@ -39,7 +33,6 @@ void abort(void) {
     _ExitProcess();
 }
 
-/* 803629CC-80362ABC 35D30C 00F0+00 0/0 2/2 0/0 .text            exit */
 void exit(int status) {
     int i;
     void (**dtor)(void);
@@ -74,4 +67,4 @@ void exit(int status) {
     }
 
     _ExitProcess();
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c
index fdaf9844b8..7c34f725b3 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c
@@ -222,7 +222,6 @@ static inline Block* __unlink(__mem_pool_obj* pool_obj, Block* bp) {
     return result;
 }
 
-/* 80362D78-8036300C 35D6B8 0294+00 2/2 0/0 0/0 .text            deallocate_from_var_pools */
 static void deallocate_from_var_pools(__mem_pool_obj* pool_obj, void* ptr) {
     SubBlock* sb = SubBlock_from_pointer(ptr);
     SubBlock* _sb;
@@ -251,7 +250,6 @@ static inline __mem_pool* get_malloc_pool(void) {
     return &protopool;
 }
 
-/* 80362C20-80362D78 35D560 0158+00 1/1 0/0 0/0 .text            deallocate_from_fixed_pools */
 void deallocate_from_fixed_pools(__mem_pool_obj* pool_obj, void* ptr, unsigned long size) {
     unsigned long i = 0;
     FixSubBlock* p;
@@ -308,7 +306,6 @@ void deallocate_from_fixed_pools(__mem_pool_obj* pool_obj, void* ptr, unsigned l
     }
 }
 
-/* 80362BC8-80362C20 35D508 0058+00 1/1 0/0 0/0 .text            __pool_free */
 void __pool_free(__mem_pool* pool, void* ptr) {
     __mem_pool_obj* pool_obj;
     unsigned long size;
@@ -327,7 +324,6 @@ void __pool_free(__mem_pool* pool, void* ptr) {
     }
 }
 
-/* 80362B58-80362BC8 35D498 0070+00 0/0 2/2 0/0 .text            free */
 void free(void* ptr) {
     __begin_critical_region(malloc_pool_access);
     __pool_free(get_malloc_pool(), ptr);
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c
index e8b656c3a6..55116eb5e9 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c
@@ -1,16 +1,12 @@
 #include "ansi_files.h"
 #include "critical_regions.h"
 
-/* 8044D778-8044D878 07A498 0100+00 1/0 0/0 0/0 .bss             stdin_buff */
 static unsigned char stdin_buff[0x100];
 
-/* 8044D678-8044D778 07A398 0100+00 1/0 0/0 0/0 .bss             stdout_buff */
 static unsigned char stdout_buff[0x100];
 
-/* 8044D578-8044D678 07A298 0100+00 1/0 0/0 0/0 .bss             stderr_buff */
 static unsigned char stderr_buff[0x100];
 
-/* 803D29B0-803D2AF0 -00001 0140+00 3/2 15/15 0/0 .data            __files */
 extern files __files = {
     {
         0,
@@ -114,7 +110,6 @@ extern files __files = {
     },
 };
 
-/* 8036307C-80363124 35D9BC 00A8+00 0/0 1/1 0/0 .text            __close_all */
 void __close_all(void) {
     FILE* file = &__files._stdin;
     FILE* last_file;
@@ -142,7 +137,6 @@ void __close_all(void) {
     __end_critical_region(stdin_access);
 }
 
-/* 8036300C-8036307C 35D94C 0070+00 0/0 2/2 0/0 .text            __flush_all */
 unsigned int __flush_all(void) {
     unsigned int ret = 0;
     FILE* file = &__files._stdin;
@@ -155,4 +149,4 @@ unsigned int __flush_all(void) {
     }
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c
index 7953ff3238..3d72a9263b 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c
@@ -1,6 +1,5 @@
 #include "arith.h"
 
-/* 803650D0-803650E0 35FA10 0010+00 0/0 66/66 225/225 .text            abs */
 int abs(int n) {
     if (n < 0)
         return (-n);
@@ -8,7 +7,6 @@ int abs(int n) {
         return (n);
 }
 
-/* 80365078-803650D0 35F9B8 0058+00 0/0 1/1 0/0 .text            div */
 div_t div(int numerator, int denominator) {
     div_t ret;
     int i = 1;
@@ -27,4 +25,4 @@ div_t div(int numerator, int denominator) {
     ret.quot = (numerator / denominator) * (i * j);
     ret.rem = numerator * i - j * (ret.quot * denominator);
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c
index fda0958d03..4cdc54f7ea 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c
@@ -4,7 +4,6 @@ void __convert_from_newlines(unsigned char* buf, size_t* n) {}
 
 void __convert_to_newlines(unsigned char* buf, size_t* n) {}
 
-/* 803651A4-803651D8 35FAE4 0034+00 0/0 2/2 0/0 .text            __prep_buffer */
 void __prep_buffer(FILE* file) {
     file->buffer_ptr = file->buffer;
     file->buffer_length = file->buffer_size;
@@ -12,7 +11,6 @@ void __prep_buffer(FILE* file) {
     file->buffer_position = file->position;
 }
 
-/* 803650E0-803651A4 35FA20 00C4+00 0/0 5/5 0/0 .text            __flush_buffer */
 int __flush_buffer(FILE* file, size_t* bytes_flushed) {
     size_t buffer_len;
     int ioresult;
@@ -40,4 +38,4 @@ int __flush_buffer(FILE* file, size_t* bytes_flushed) {
     __prep_buffer(file);
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c
index b2163b72dd..c480f2745d 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c
@@ -3,7 +3,6 @@
 #include "misc_io.h"
 #include "wchar_io.h"
 
-/* 803652AC-80365464 35FBEC 01B8+00 1/1 0/0 0/0 .text            __put_char */
 int __put_char(int c, FILE* stream) {
     int ret;
 
@@ -62,7 +61,6 @@ exit:
     return ret;
 }
 
-/* 803651D8-803652AC 35FB18 00D4+00 0/0 1/1 0/0 .text            fputs */
 int fputs(const char* s, FILE* stream) {
     char c;
     int var_r3;
@@ -95,4 +93,4 @@ int fputs(const char* s, FILE* stream) {
     __end_critical_region(stdin_access);
 
     return ret;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c
index 8d0e5a8f63..556432dc7b 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c
@@ -12,7 +12,6 @@
 #define uhex (hexd | uppc)
 #define lhex (hexd | lowc)
 
-/* 803D2C18-803D2D18 02FD38 0100+00 0/0 3/3 0/0 .data            __ctype_map */
 unsigned char __ctype_map[256] = {
     // clang-format off
     ctrl, ctrl, ctrl, ctrl, ctrl, ctrl, ctrl, ctrl, ctrl, motn, motn, motn, motn, motn, ctrl, ctrl,
@@ -26,7 +25,6 @@ unsigned char __ctype_map[256] = {
     // clang-format on
 };
 
-/* 803D2D18-803D2E18 02FE38 0100+00 1/1 3/3 0/0 .data            __lower_map */
 unsigned char __lower_map[256] = {
     // clang-format off
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
@@ -48,7 +46,6 @@ unsigned char __lower_map[256] = {
     // clang-format on
 };
 
-/* 80365470-80365494 35FDB0 0024+00 0/0 4/4 0/0 .text            tolower */
 int tolower(int __c) {
     {
         if (__c == -1) {
@@ -59,8 +56,6 @@ int tolower(int __c) {
     }
 }
 
-/* ############################################################################################## */
-/* 803D2E18-803D2F18 02FF38 0100+00 0/0 1/1 0/0 .data            __upper_map */
 unsigned char __upper_map[256] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
@@ -79,4 +74,4 @@ unsigned char __upper_map[256] = {
     0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF,
     0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF,
     // clang-format on
-};
\ No newline at end of file
+};
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c
index a0b356217c..d4edd12dc3 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c
@@ -2,7 +2,6 @@
 #include "critical_regions.h"
 #include "wchar_io.h"
 
-/* 80365494-803657A0 35FDD4 030C+00 1/1 0/0 0/0 .text            __fwrite */
 size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream) {
     size_t retval;
 
@@ -13,7 +12,6 @@ size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream) {
     return (retval);
 }
 
-/* 803657A0-8036581C 3600E0 007C+00 0/0 1/1 0/0 .text            fwrite */
 size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) {
     unsigned char* write_ptr;
     size_t num_bytes, bytes_to_go, bytes_written;
@@ -118,4 +116,4 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) {
         stream->buffer_length = 0;
 
     return ((bytes_written + size - 1) / size);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c
index 32c234704b..afee599b79 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c
@@ -1,4 +1,3 @@
 #include "errno.h"
 
-/* 804519A8-804519B0 000EA8 0004+04 0/0 6/6 0/0 .sbss            errno */
-int errno;
\ No newline at end of file
+int errno;
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c
index 646299035b..f7e9fd4c80 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c
@@ -1,7 +1,6 @@
 #include "extras.h"
 #include "ctype.h"
 
-/* 8036CA94-8036CB20 3673D4 008C+00 0/0 1/1 0/0 .text            stricmp */
 int stricmp(const char* str1, const char* str2) {
 	char a_var;
 	char b_var;
@@ -21,7 +20,6 @@ int stricmp(const char* str1, const char* str2) {
 	return 0;
 }
 
-/* 8036CA74-8036CA94 3673B4 0020+00 0/0 1/1 0/0 .text            strnicmp */
 int strnicmp(const char* str1, const char* str2, int n) {
     return __msl_strnicmp(str1, str2, n);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c
index 061977fa03..df816b2b45 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c
@@ -1,7 +1,6 @@
 #include "file_io.h"
 #include "ctype.h"
 
-/* 803659F8-80365BB4 360338 01BC+00 0/0 1/1 0/0 .text            fclose */
 int fclose(FILE* file) {
     int flush_result, close_result;
 
@@ -22,7 +21,6 @@ int fclose(FILE* file) {
     return ((flush_result || close_result) ? -1 : 0);
 }
 
-/* 803658C0-803659F8 360200 0138+00 0/0 4/4 0/0 .text            fflush */
 int fflush(FILE* file) {
     int pos;
 
@@ -69,7 +67,6 @@ int fflush(FILE* file) {
     return 0;
 }
 
-/* 8036581C-803658C0 36015C 00A4+00 0/0 1/1 0/0 .text            __msl_strnicmp */
 int __msl_strnicmp(const char* str1, const char* str2, int n) {
     int i;
     char c1, c2;
@@ -92,4 +89,4 @@ int __msl_strnicmp(const char* str1, const char* str2, int n) {
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c
index c21b5a2b4d..782bc99688 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c
@@ -1,13 +1,9 @@
 #include "float.h"
 
-/* 80450AE0-80450AE4 000560 0004+00 0/0 204/204 1060/1060 .sdata           __float_nan */
 unsigned long __float_nan[] = {0x7FFFFFFF};
 
-/* 80450AE4-80450AE8 000564 0004+00 0/0 1/1 0/0 .sdata           __float_huge */
 unsigned long __float_huge[] = {0x7F800000};
 
-/* 80450AE8-80450AEC 000568 0004+00 0/0 18/18 14/14 .sdata           __float_max */
 unsigned long __float_max[] = {0x7F7FFFFF};
 
-/* 80450AEC-80450AF0 00056C 0004+00 0/0 28/28 0/0 .sdata           __float_epsilon */
-unsigned long __float_epsilon[] = {0x34000000};
\ No newline at end of file
+unsigned long __float_epsilon[] = {0x34000000};
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c
index ef75e9cc9f..83e6ef90e4 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c
@@ -36,7 +36,6 @@ inline static int unicode_to_UTF8(char* s, wchar_t wchar) {
 
 inline int wctomb(char* s, wchar_t wchar) { return (unicode_to_UTF8(s, wchar)); }
 
-/* 80365F74-8036608C 3608B4 0118+00 0/0 1/1 0/0 .text            wcstombs */
 size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) {
 	int chars_written = 0;
 	int result;
@@ -62,4 +61,4 @@ size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) {
 	}
 
 	return chars_written;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c
index 6323fb82c6..2676978173 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c
@@ -1,6 +1,5 @@
 #include "string.h"
 
-/* 80366130-803661FC 360A70 00CC+00 0/0 2/2 0/0 .text            memmove */
 void* memmove(void* dst, const void* src, size_t n) {
     unsigned char* csrc;
     unsigned char* cdst;
@@ -46,7 +45,6 @@ void* memmove(void* dst, const void* src, size_t n) {
     return dst;
 }
 
-/* 80366104-80366130 360A44 002C+00 0/0 1/1 0/0 .text            memchr */
 void* memchr(const void* ptr, int ch, size_t count) {
     const unsigned char* p;
 
@@ -59,7 +57,6 @@ void* memchr(const void* ptr, int ch, size_t count) {
     return NULL;
 }
 
-/* 803660D8-80366104 360A18 002C+00 0/0 1/1 0/0 .text            __memrchr */
 void* __memrchr(const void* ptr, int ch, size_t count) {
     const unsigned char* p;
 
@@ -72,7 +69,6 @@ void* __memrchr(const void* ptr, int ch, size_t count) {
     return NULL;
 }
 
-/* 8036608C-803660D8 3609CC 004C+00 0/0 19/19 5/5 .text            memcmp */
 int memcmp(const void* lhs, const void* rhs, size_t count) {
     const unsigned char* p1;
     const unsigned char* p2;
@@ -82,4 +78,4 @@ int memcmp(const void* lhs, const void* rhs, size_t count) {
             return ((*p1 < *p2) ? -1 : +1);
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c
index bc2eae802b..f06bc3c306 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c
@@ -6,7 +6,6 @@
 #define lpd ((unsigned long*)dst)
 #define deref_auto_inc(p) *++(p)
 
-/* 80366410-803664CC 360D50 00BC+00 0/0 1/1 0/0 .text            __copy_longs_aligned */
 void __copy_longs_aligned(void* dst, const void* src, size_t n) {
     unsigned long i;
 
@@ -60,7 +59,6 @@ void __copy_longs_aligned(void* dst, const void* src, size_t n) {
     return;
 }
 
-/* 80366368-80366410 360CA8 00A8+00 0/0 1/1 0/0 .text            __copy_longs_rev_aligned */
 void __copy_longs_rev_aligned(void* dst, const void* src, size_t n) {
     unsigned long i;
 
@@ -108,7 +106,6 @@ void __copy_longs_rev_aligned(void* dst, const void* src, size_t n) {
     return;
 }
 
-/* 803662A8-80366368 360BE8 00C0+00 0/0 1/1 0/0 .text            __copy_longs_unaligned */
 void __copy_longs_unaligned(void* dst, const void* src, size_t n) {
     unsigned long i, v1, v2;
     unsigned int src_offset, left_shift, right_shift;
@@ -167,7 +164,6 @@ void __copy_longs_unaligned(void* dst, const void* src, size_t n) {
     return;
 }
 
-/* 803661FC-803662A8 360B3C 00AC+00 0/0 1/1 0/0 .text            __copy_longs_rev_unaligned */
 void __copy_longs_rev_unaligned(void* dst, const void* src, size_t n) {
     unsigned long i, v1, v2;
     unsigned int src_offset, left_shift, right_shift;
@@ -218,4 +214,4 @@ void __copy_longs_rev_unaligned(void* dst, const void* src, size_t n) {
     }
 
     return;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c
index d1b7ffdfac..61bc212519 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c
@@ -2,7 +2,6 @@
 #include "abort_exit.h"
 #include "ansi_files.h"
 
-/* 803664CC-803664DC 360E0C 0010+00 0/0 2/2 0/0 .text            __stdio_atexit */
 void __stdio_atexit(void) {
     __stdio_exit = __close_all;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c
index 77ddf8efbd..99f31c8a63 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c
@@ -43,7 +43,6 @@ typedef struct {
     int precision;
 } print_format;
 
-/* 80368288-8036878C 362BC8 0504+00 3/1 0/0 0/0 .text            parse_format */
 static const char* parse_format(const char* format_string, va_list* arg, print_format* format) {
     print_format f;
     const char* s = format_string;
@@ -282,7 +281,6 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f
     return ((const char*)s + 1);
 }
 
-/* 80368030-80368288 362970 0258+00 3/2 0/0 0/0 .text            long2str */
 static char* long2str(signed long num, char* buff, print_format format) {
     unsigned long unsigned_num, base;
     char* p;
@@ -386,7 +384,6 @@ static char* long2str(signed long num, char* buff, print_format format) {
     return p;
 }
 
-/* 80367D1C-80368030 36265C 0314+00 2/1 0/0 0/0 .text            longlong2str */
 static char* longlong2str(signed long long num, char* pBuf, print_format fmt) {
     unsigned long long unsigned_num, base;
     char* p;
@@ -488,7 +485,6 @@ static char* longlong2str(signed long long num, char* pBuf, print_format fmt) {
     return p;
 }
 
-/* 803679E4-80367D1C 362324 0338+00 1/1 0/0 0/0 .text            double2hex */
 static char* double2hex(long double num, char* buff, print_format format) {
     int offset, what_nibble = 0;
     char* wrk_byte_ptr;
@@ -617,7 +613,6 @@ static char* double2hex(long double num, char* buff, print_format format) {
     return p;
 }
 
-/* 803678B8-803679E4 3621F8 012C+00 1/1 0/0 0/0 .text            round_decimal */
 static void round_decimal(decimal* dec, int new_length) {
     char c;
     char* p;
@@ -671,7 +666,6 @@ static void round_decimal(decimal* dec, int new_length) {
     dec->sig.length = new_length;
 }
 
-/* 8036719C-803678B8 361ADC 071C+00 1/1 0/0 0/0 .text            float2str */
 static char* float2str(long double num, char* buff, print_format format) {
     decimal dec;
     decform form;
@@ -893,7 +887,6 @@ static char* float2str(long double num, char* buff, print_format format) {
     return p;
 }
 
-/* 80366A28-8036719C 361368 0774+00 6/6 0/0 0/0 .text            __pformatter */
 static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProcArg,
                         const char* format_str, va_list arg) {
     int num_chars, chars_written, field_width;
@@ -1164,12 +1157,10 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr
     return chars_written;
 }
 
-/* 803669D0-80366A28 361310 0058+00 3/3 0/0 0/0 .text            __FileWrite */
 static void* __FileWrite(void* pFile, const char* pBuffer, size_t char_num) {
     return (fwrite(pBuffer, 1, char_num, (FILE*)pFile) == char_num ? pFile : 0);
 }
 
-/* 80366964-803669D0 3612A4 006C+00 3/3 0/0 0/0 .text            __StringWrite */
 static void* __StringWrite(void* pCtrl, const char* pBuffer, size_t char_num) {
     size_t chars;
     __OutStrCtrl* ctrl = (__OutStrCtrl*)pCtrl;
@@ -1183,7 +1174,6 @@ static void* __StringWrite(void* pCtrl, const char* pBuffer, size_t char_num) {
     return (void*)1;
 }
 
-/* 8036687C-80366964 3611BC 00E8+00 0/0 4/4 0/0 .text            printf */
 int printf(const char* format, ...) {
     int res;
 
@@ -1201,7 +1191,6 @@ int printf(const char* format, ...) {
     return res;
 }
 
-/* 8036679C-8036687C 3610DC 00E0+00 0/0 9/9 0/0 .text            fprintf */
 int fprintf(FILE* file, const char* format, ...) {
     int res;
 
@@ -1219,7 +1208,6 @@ int fprintf(FILE* file, const char* format, ...) {
     return res;
 }
 
-/* 80366704-8036679C 361044 0098+00 0/0 2/2 0/0 .text            vprintf */
 int vprintf(const char* format, va_list arg) {
     int ret;
 
@@ -1233,7 +1221,6 @@ int vprintf(const char* format, va_list arg) {
     return ret;
 }
 
-/* 80366690-80366704 360FD0 0074+00 0/0 8/8 0/0 .text            vsnprintf */
 int vsnprintf(char* s, size_t n, const char* format, va_list arg) {
     int end;
     __OutStrCtrl osc;
@@ -1250,16 +1237,14 @@ int vsnprintf(char* s, size_t n, const char* format, va_list arg) {
     return end;
 }
 
-/* 803665BC-80366690 360EFC 00D4+00 0/0 19/19 0/0 .text            snprintf */
 int snprintf(char* s, size_t n, const char* format, ...) {
     va_list args;
     va_start(args, format);
     return vsnprintf(s, n, format, args);
 }
 
-/* 803664DC-803665BC 360E1C 00E0+00 0/0 32/32 14/14 .text            sprintf */
 int sprintf(char* s, const char* format, ...) {
     va_list args;
     va_start(args, format);
     return vsnprintf(s, 0xFFFFFFFF, format, args);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c
index ca8a17fbb1..ec5fb5536a 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c
@@ -1,6 +1,5 @@
 #include "scanf.h"
 
-/* 8036878C-8036881C 3630CC 0090+00 0/0 2/2 0/0 .text            __StringRead */
 int __StringRead(void* pPtr, int ch, int act) {
     char ret;
     __InStrCtrl* Iscp = (__InStrCtrl*)pPtr;
@@ -31,4 +30,4 @@ int __StringRead(void* pPtr, int ch, int act) {
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c
index 76042b075a..bf23819570 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c
@@ -3,10 +3,8 @@
 
 #define __std(ref) ref
 
-/* 8044D878-8044D890 07A598 0018+00 1/1 0/0 0/0 .bss             signal_funcs */
 __signal_func_ptr signal_funcs[6];
 
-/* 8036881C-803688DC 36315C 00C0+00 0/0 1/1 0/0 .text            raise */
 int raise(int sig) {
     __signal_func_ptr signal_func;
 
@@ -35,4 +33,4 @@ int raise(int sig) {
 
     (*signal_func)(sig);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c
index 9afa7acf9d..1025b855fa 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c
@@ -3,7 +3,6 @@
 #define K1 0x80808080
 #define K2 0xFEFEFEFF
 
-/* 80368BE4-80368C00 363524 001C+00 0/0 28/28 8/8 .text            strlen */
 size_t strlen(const char* str) {
     size_t len = -1;
     unsigned char* p = (unsigned char*)str - 1;
@@ -15,7 +14,6 @@ size_t strlen(const char* str) {
     return len;
 }
 
-/* 80368B2C-80368BE4 36346C 00B8+00 0/0 131/131 13/13 .text            strcpy */
 char* strcpy(char* dst, const char* src) {
     register unsigned char *destb, *fromb;
     register unsigned long w, t, align;
@@ -79,7 +77,6 @@ bytecopy:
     return dst;
 }
 
-/* 80368AE8-80368B2C 363428 0044+00 0/0 9/9 1/1 .text            strncpy */
 char* strncpy(char* dst, const char* src, size_t n) {
     const unsigned char* p = (const unsigned char*)src - 1;
     unsigned char* q = (unsigned char*)dst - 1;
@@ -97,7 +94,6 @@ char* strncpy(char* dst, const char* src, size_t n) {
     return dst;
 }
 
-/* 80368ABC-80368AE8 3633FC 002C+00 0/0 20/20 8/8 .text            strcat */
 char* strcat(char* dst, const char* src) {
     const unsigned char* p = (unsigned char*)src - 1;
     unsigned char* q = (unsigned char*)dst - 1;
@@ -113,7 +109,6 @@ char* strcat(char* dst, const char* src) {
     return dst;
 }
 
-/* 80368994-80368ABC 3632D4 0128+00 0/0 155/155 279/279 .text            strcmp */
 int strcmp(const char* str1, const char* str2) {
     register unsigned char* left = (unsigned char*)str1;
     register unsigned char* right = (unsigned char*)str2;
@@ -192,7 +187,6 @@ bytecopy:
     } while (1);
 }
 
-/* 80368954-80368994 363294 0040+00 0/0 6/6 0/0 .text            strncmp */
 int strncmp(const char* str1, const char* str2, size_t n) {
     const unsigned char* p1 = (unsigned char*)str1 - 1;
     const unsigned char* p2 = (unsigned char*)str2 - 1;
@@ -210,7 +204,6 @@ int strncmp(const char* str1, const char* str2, size_t n) {
     return 0;
 }
 
-/* 80368924-80368954 363264 0030+00 0/0 3/3 0/0 .text            strchr */
 char* strchr(const char* str, int c) {
     const unsigned char* p = (unsigned char*)str - 1;
     unsigned long chr = (c & 0xFF);
@@ -225,7 +218,6 @@ char* strchr(const char* str, int c) {
     return chr ? NULL : (char*)p;
 }
 
-/* 803688DC-80368924 36321C 0048+00 0/0 1/1 0/0 .text            strrchr */
 char* strrchr(const char* str, int c) {
     const unsigned char* p = (unsigned char*)str - 1;
     const unsigned char* q = NULL;
@@ -243,4 +235,4 @@ char* strrchr(const char* str, int c) {
     }
 
     return chr ? NULL : (char*)p;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c
index 50cb3fe2a6..212dc341d1 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c
@@ -19,7 +19,6 @@ enum scan_states {
 #define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar))
 #define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar)
 
-/* 80368D9C-80369114 3636DC 0378+00 3/2 0/0 0/0 .text            __strtoul */
 unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int),
                         void* ReadProcArg, int* chars_scanned, int* negative, int* overflow) {
     int scan_state = start;
@@ -151,7 +150,6 @@ unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int
     return value;
 }
 
-/* 80368CF0-80368D9C 363630 00AC+00 0/0 2/2 0/0 .text            strtoul */
 unsigned long strtoul(const char* str, char** end, int base) {
     unsigned long value;
     int count, negative, overflow;
@@ -176,7 +174,6 @@ unsigned long strtoul(const char* str, char** end, int base) {
     return value;
 }
 
-/* 80368C00-80368CF0 363540 00F0+00 0/0 3/3 0/0 .text            strtol */
 long strtol(const char* str, char** end, int base) {
     unsigned long uvalue;
     long svalue;
@@ -200,4 +197,4 @@ long strtol(const char* str, char** end, int base) {
     }
 
     return svalue;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c
index f54bcc6b35..699e2721d8 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c
@@ -1,6 +1,5 @@
 #include "wchar_io.h"
 
-/* 80369114-8036919C 363A54 0088+00 0/0 5/5 0/0 .text            fwide */
 int fwide(FILE* file, int mode) {
     if (file == NULL || file->file_mode.file_kind == __closed_file) {
         return 0;
@@ -19,4 +18,4 @@ int fwide(FILE* file, int mode) {
     case CHAR_ORIENTED:
         return -1;
     }
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c
index a6c331a101..64aa5aaf53 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_acos.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C6E0-8036C700 367020 0020+00 0/0 2/2 3/3 .text            acos */
 double acos(double x) {
     return __ieee754_acos(x);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c
index 779c1e9b4f..80150cd875 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_asin.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C700-8036C720 367040 0020+00 0/0 2/2 0/0 .text            asin */
 double asin(double x) {
     return __ieee754_asin(x);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c
index 8a2dd2ec73..c329f4b74e 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C720-8036C740 367060 0020+00 0/0 6/6 0/0 .text            atan2 */
 double atan2(double x, double y) {
     return __ieee754_atan2(x, y);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c
index d8768d6e90..061ce96b61 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C740-8036C760 367080 0020+00 0/0 1/1 0/0 .text            exp */
 double exp(double x) {
     return __ieee754_exp(x);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c
index fafd1f90da..724c0bd201 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C760-8036C780 3670A0 0020+00 0/0 8/8 0/0 .text            fmod */
 double fmod(double x, double y) {
     return __ieee754_fmod(x, y);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c
index 650114d46f..95235ed834 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036C780-8036C7A0 3670C0 0020+00 0/0 3/3 24/24 .text            pow */
 double pow(double x, double y) {
     return __ieee754_pow(x, y);
 }
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c
index 7469b6ed0c..cb7a159f2e 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c
@@ -1,6 +1,5 @@
 #include "fdlibm.h"
 
-/* 8036CA54-8036CA74 367394 0020+00 0/0 8/8 1/1 .text            sqrt */
 double sqrt(double x) {
     return __ieee754_sqrt(x);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c
index eb751768ce..85120d1a0b 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c
@@ -133,7 +133,6 @@ void __ull2dec(decimal* result, unsigned long long val) {
     result->exp = result->sig.length - 1;
 }
 
-/* 80364E00-80365078 35F740 0278+00 2/2 0/0 0/0 .text            __timesdec */
 void __timesdec(decimal* result, const decimal* x, const decimal* y) {
     unsigned long accumulator = 0;
     unsigned char mantissa[SIGDIGLEN * 2];
@@ -235,7 +234,6 @@ void __str2dec(decimal* d, const char* s, short exp) {
 
 static const char* const unused = "179769313486231580793729011405303420";
 
-/* 8036367C-80364E00 35DFBC 1784+00 2/1 0/0 0/0 .text            __two_exp */
 void __two_exp(decimal* result, long exp) {
     switch (exp) {
     case -64:
@@ -506,7 +504,6 @@ done:
     z->sig.length = (unsigned char)(i - ib + 1);
 }
 
-/* 803632C8-8036367C 35DC08 03B4+00 1/1 0/0 0/0 .text            __num2dec_internal */
 void __num2dec_internal(decimal* d, double x) {
     signed char sign = (signed char)(signbit(x) != 0);
 
@@ -545,7 +542,6 @@ void __num2dec_internal(decimal* d, double x) {
     }
 }
 
-/* 80363124-803632C8 35DA64 01A4+00 0/0 2/2 0/0 .text            __num2dec */
 void __num2dec(const decform* form, double x, decimal* d) {
     short digits = form->digits;
     int i;
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c
index bb9b68f165..63e7894c1a 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c
@@ -1,10 +1,7 @@
 #include "critical_regions.gamecube.h"
 
-/* 8036546C-80365470 35FDAC 0004+00 0/0 2/2 0/0 .text            __kill_critical_regions */
 void __kill_critical_regions() {}
 
-/* 80365468-8036546C 35FDA8 0004+00 0/0 12/12 0/0 .text            __begin_critical_region */
 void __begin_critical_region() {}
 
-/* 80365464-80365468 35FDA4 0004+00 0/0 12/12 0/0 .text            __end_critical_region */
-void __end_critical_region() {}
\ No newline at end of file
+void __end_critical_region() {}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c
index db002e0a0a..e4d8023c9e 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c
@@ -1,22 +1,31 @@
 #include "math_ppc.h"
 #include "fdlibm.h"
 
-/* 8036CA30-8036CA54 367370 0024+00 0/0 1/1 0/0 .text            acosf */
-__declspec(weak) float acosf(float x) {
+// TODO: where should this go?
+#ifndef DECL_WEAK
+#if defined(__MWERKS__)
+#define DECL_WEAK __declspec(weak)
+#elif defined(__GNUC__)
+#define DECL_WEAK __attribute__((weak))
+#elif defined(_MSC_VER)
+#define DECL_WEAK
+#else
+#error unknown compiler
+#endif
+#endif
+
+DECL_WEAK float acosf(float x) {
     return acos(x);
 }
 
-/* 8036CA0C-8036CA30 36734C 0024+00 0/0 4/4 0/0 .text            cosf */
-__declspec(weak) float cosf(float x) {
+DECL_WEAK float cosf(float x) {
     return cos(x);
 }
 
-/* 8036C9E8-8036CA0C 367328 0024+00 0/0 4/4 0/0 .text            sinf */
-__declspec(weak) float sinf(float x) {
+DECL_WEAK float sinf(float x) {
     return sin(x);
 }
 
-/* 8036C9C4-8036C9E8 367304 0024+00 0/0 2/2 0/0 .text            tanf */
-__declspec(weak) float tanf(float x) {
+DECL_WEAK float tanf(float x) {
     return tan(x);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c
index b727148ca5..ea52db1e2a 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c
@@ -6,7 +6,6 @@ int WriteUARTN(unsigned char*, size_t);
 int __TRK_write_console(__file_handle handle, unsigned char* buffer, size_t* count,
                         __idle_proc idle_fn);
 
-/* 803691A4-80369274 363AE4 00D0+00 0/0 1/0 0/0 .text            __write_console */
 int __write_console(__file_handle handle, unsigned char* buffer, size_t* count,
                     __idle_proc idle_fn) {
     static int initialized;
@@ -35,7 +34,6 @@ int __write_console(__file_handle handle, unsigned char* buffer, size_t* count,
     return 0;
 }
 
-/* 8036919C-803691A4 363ADC 0008+00 0/0 1/0 0/0 .text            __close_console */
 int __close_console(__file_handle handle) {
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp b/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp
index 0b98e49659..d05c8c3b55 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp
+++ b/src/PowerPC_EABI_Support/Runtime/Src/CPlusLibPPC.cp
@@ -1,6 +1,5 @@
 #include "CPlusLibPPC.h"
 
-/* 80361C3C-80361C6C 35C57C 0030+00 0/0 0/0 4/4 .text            __copy */
 extern "C" void* __copy(char *dest, char *src, size_t size) {
 	char *p;
 	
@@ -15,4 +14,4 @@ extern "C" void* __copy(char *dest, char *src, size_t size) {
 	}
 	
 	return(dest);
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c b/src/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c
index edb71d0398..f3f2c182e8 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/GCN_Mem_Alloc.c
@@ -25,7 +25,6 @@ inline static void InitDefaultHeap(void) {
 	OSSetArenaLo(arenaLo = arenaHi);
 }
 
-/* 80362914-803629CC 35D254 00B8+00 0/0 1/1 0/0 .text            __sys_free */
 void __sys_free(void* p) {
     if (__OSCurrHeap == -1) {
         InitDefaultHeap();
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp b/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp
index 5e535efe29..aaef53c5d4 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp
+++ b/src/PowerPC_EABI_Support/Runtime/Src/Gecko_ExceptionPPC.cp
@@ -11,10 +11,8 @@ typedef struct ProcessInfo {
     int active;
 } ProcessInfo;
 
-/* 8044D430-8044D440 07A150 000C+04 2/2 0/0 0/0 .bss             fragmentinfo */
 static ProcessInfo fragmentinfo[1];
 
-/* 803628E0-80362914 35D220 0034+00 0/0 1/1 0/0 .text            __register_fragment */
 int __register_fragment(struct __eti_init_info* info, char* TOC) {
     ProcessInfo* f;
     int i;
@@ -31,7 +29,6 @@ int __register_fragment(struct __eti_init_info* info, char* TOC) {
     return -1;
 }
 
-/* 803628AC-803628E0 35D1EC 0034+00 0/0 1/1 0/0 .text            __unregister_fragment */
 void __unregister_fragment(int fragmentId) {
     ProcessInfo* f;
     if (fragmentId >= 0 && fragmentId < 1) {
@@ -40,4 +37,4 @@ void __unregister_fragment(int fragmentId) {
         f->TOC = 0;
         f->active = 0;
     }
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp b/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp
index 770f206405..837d356546 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp
+++ b/src/PowerPC_EABI_Support/Runtime/Src/__init_cpp_exceptions.cpp
@@ -20,7 +20,6 @@ extern int __register_fragment(struct __eti_init_info* info, char* TOC);
 }
 #endif
 
-/* 80450AD0-80450AD8 000550 0004+04 2/2 0/0 0/0 .sdata           fragmentID */
 static int fragmentID = -2;
 
 extern void GetR2(char** R2) {
@@ -31,7 +30,6 @@ extern void GetR2(char** R2) {
 	*R2 = temp;
 }
 
-/* 80362870-803628AC 35D1B0 003C+00 1/0 1/0 0/0 .text            __init_cpp_exceptions */
 void __init_cpp_exceptions(void) {
     char* R2;
 
@@ -41,7 +39,6 @@ void __init_cpp_exceptions(void) {
     }
 }
 
-/* 8036283C-80362870 35D17C 0034+00 1/0 1/0 0/0 .text            __fini_cpp_exceptions */
 void __fini_cpp_exceptions(void) {
     char* R2;
     if (fragmentID != -2) {
@@ -50,17 +47,14 @@ void __fini_cpp_exceptions(void) {
     }
 }
 
-/* 803737C0-803737C4 000000 0004+00 0/0 1/1 0/0 .ctors           __init_cpp_exceptions_reference */
 #pragma section ".ctors$10"
 __declspec(section ".ctors$10")
 extern void* const __init_cpp_exceptions_reference = __init_cpp_exceptions;
 
-/* 80373980-80373984 000000 0004+00 0/0 1/1 0/0 .dtors           __destroy_global_chain_reference */
 #pragma section ".dtors$10"
 __declspec(section ".dtors$10")
 extern void* const __destroy_global_chain_reference = __destroy_global_chain;
 
-/* 80373984-80373988 000004 0004+00 0/0 0/1 0/0 .dtors           __fini_cpp_exceptions_reference */
 #pragma section ".dtors$15"
 __declspec(section ".dtors$15")
 extern void* const __fini_cpp_exceptions_reference = __fini_cpp_exceptions;
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c b/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
index 51625f39b4..dfafa506f8 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
@@ -1,8 +1,6 @@
-#include "dol2asm.h"
 #include <dolphin.h>
 
-/* 80003540-80003590 000440 0050+00 1/1 63/63 6/6 .init            memcpy */
-SECTION_INIT void* memcpy(void* dst, const void* src, size_t n) {
+__declspec(section ".init") void* memcpy(void* dst, const void* src, size_t n) {
     const unsigned char* s;
     unsigned char* d;
 
@@ -22,8 +20,7 @@ SECTION_INIT void* memcpy(void* dst, const void* src, size_t n) {
     return dst;
 }
 
-/* 80003488-80003540 000388 00B8+00 1/1 0/0 0/0 .init            __fill_mem */
-SECTION_INIT void __fill_mem(void* dst, int val, size_t n) {
+__declspec(section ".init") void __fill_mem(void* dst, int val, size_t n) {
     unsigned long v = (unsigned char)val;
     unsigned long i;
 
@@ -81,8 +78,7 @@ SECTION_INIT void __fill_mem(void* dst, int val, size_t n) {
     return;
 }
 
-/* 80003458-80003488 000358 0030+00 1/1 55/55 137/137 .init            memset */
-SECTION_INIT void* memset(void* dst, int val, size_t n) {
+__declspec(section ".init") void* memset(void* dst, int val, size_t n) {
     __fill_mem(dst, val, n);
 
     return dst;
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
index e57ec2d44b..5db5c5d080 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c
@@ -3,7 +3,6 @@
 
 #undef __va_arg
 
-/* 80361B14-80361BDC 35C454 00C8+00 0/0 3/3 0/0 .text            __va_arg */
 void* __va_arg(_va_list_struct* list, int type) {
     char* addr;
     char* reg = &(list->gpr);
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c b/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c
index ad8ad14ca1..931e0746f1 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c
@@ -1,10 +1,8 @@
 #include "NMWException.h"
 #include "MWCPlusLib.h"
 
-/* 80451988-80451990 000E88 0004+04 2/2 0/0 0/0 .sbss            __global_destructor_chain */
 DestructorChain* __global_destructor_chain;
 
-/* 80361C24-80361C3C 35C564 0018+00 0/0 116/116 0/0 .text            __register_global_object */
 void* __register_global_object(void* object, void* destructor, void* regmem) {
     ((DestructorChain*)regmem)->next = __global_destructor_chain;
     ((DestructorChain*)regmem)->destructor = destructor;
@@ -13,7 +11,6 @@ void* __register_global_object(void* object, void* destructor, void* regmem) {
     return object;
 }
 
-/* 80361BDC-80361C24 35C51C 0048+00 0/0 2/1 0/0 .text            __destroy_global_chain */
 void __destroy_global_chain(void) {
     DestructorChain* iter;
     while ((iter = __global_destructor_chain) != 0) {
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c b/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
index 11d0592905..fabb78df99 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/ptmf.c
@@ -1,14 +1,11 @@
 #include "ptmf.h"
 
-/* ############################################################################################## */
-/* 803A2180-803A2190 02E7E0 000C+04 0/0 23/23 249/249 .rodata          __ptmf_null */
 __ptmf const __ptmf_null = {
     0,
     0,
     0,
 };
 
-/* 80362018-80362048 35C958 0030+00 0/0 10/10 345/345 .text            __ptmf_test */
 asm long __ptmf_test(register __ptmf* ptmf) {
     // clang-format off
     nofralloc
@@ -28,7 +25,6 @@ asm long __ptmf_test(register __ptmf* ptmf) {
     // clang-format on
 }
 
-/* 80362048-80362084 35C988 003C+00 0/0 0/0 217/217 .text            __ptmf_cmpr */
 asm long __ptmf_cmpr(void) {
     // clang-format off
     nofralloc
@@ -51,7 +47,6 @@ asm long __ptmf_cmpr(void) {
     // clang-format on
 }
 
-/* 80362084-803620AC 35C9C4 0028+00 0/0 125/125 741/741 .text            __ptmf_scall */
 asm void __ptmf_scall(...) {
     // clang-format off
     nofralloc
@@ -70,4 +65,4 @@ lbl_803620A4:
     mtctr r12
     bctr
     // clang-format on
-}
\ No newline at end of file
+}
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
index ff412b4b04..b8cebbc67d 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
@@ -106,7 +106,6 @@ static const u32 __constants[] = {
 	0x00000000, 0x00000000, 0x41F00000, 0x00000000, 0x41E00000, 0x00000000,
 };
 
-/* 803620AC-80362108 35C9EC 005C+00 0/0 42/42 89/89 .text            __cvt_fp2unsigned */
 asm u32 __cvt_fp2unsigned(register f64 d)
 {
 #ifdef __MWERKS__ // clang-format off
@@ -138,7 +137,6 @@ asm u32 __cvt_fp2unsigned(register f64 d)
 #endif // clang-format on
 }
 
-/* 80362108-80362134 35CA48 002C+00 0/0 0/0 0/0 .text            __save_fpr */
 asm static void __save_fpr(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -182,7 +180,6 @@ asm static void __save_fpr(void) {
 #endif // clang-format on
 }
 
-/* 80362154-80362180 35CA94 002C+00 0/0 0/0 0/0 .text            __restore_fpr */
 asm static void __restore_fpr(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -226,7 +223,6 @@ asm static void __restore_fpr(void) {
 #endif // clang-format on
 }
 
-/* 803621A0-803621A4 35CAE0 0004+00 0/0 22/22 13/13 .text            _savegpr_14 */
 asm static void __save_gpr(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -270,7 +266,6 @@ asm static void __save_gpr(void) {
 #endif // clang-format on
 }
 
-/* 803621EC-803621F0 35CB2C 0004+00 0/0 22/22 13/13 .text            _restgpr_14 */
 asm static void __restore_gpr(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -314,7 +309,6 @@ asm static void __restore_gpr(void) {
 #endif // clang-format on
 }
 
-/* 80362238-80362324 35CB78 00EC+00 0/0 2/2 0/0 .text            __div2u */
 asm void __div2u(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -389,7 +383,6 @@ lab9:
 #endif // clang-format on
 }
 
-/* 80362324-8036245C 35CC64 0138+00 0/0 16/16 1/1 .text            __div2i */
 asm void __div2i(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -489,7 +482,6 @@ func_end:
 #endif // clang-format on
 }
 
-/* 8036245C-80362540 35CD9C 00E4+00 0/0 2/2 0/0 .text            __mod2u */
 asm void __mod2u(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -562,7 +554,6 @@ lab9:
 #endif // clang-format on
 }
 
-/* 80362540-8036264C 35CE80 010C+00 0/0 2/2 0/0 .text            __mod2i */
 asm void __mod2i(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -649,7 +640,6 @@ no_adjust:
 #endif // clang-format on
 }
 
-/* 8036264C-80362670 35CF8C 0024+00 0/0 2/2 0/0 .text            __shl2i */
 asm void __shl2i(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -665,7 +655,6 @@ asm void __shl2i(void) {
 #endif // clang-format on
 }
 
-/* 80362670-80362694 35CFB0 0024+00 0/0 2/2 0/0 .text            __shr2u */
 asm void __shr2u(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -681,7 +670,6 @@ asm void __shr2u(void) {
 #endif // clang-format on
 }
 
-/* 80362694-803626BC 35CFD4 0028+00 0/0 3/3 0/0 .text            __shr2i */
 asm void __shr2i(void) {
 #ifdef __MWERKS__ // clang-format off
 	nofralloc
@@ -699,7 +687,6 @@ around:
 #endif // clang-format on
 }
 
-/* 803626BC-80362770 35CFFC 00B4+00 0/0 1/1 0/0 .text            __cvt_sll_flt */
 asm void __cvt_sll_flt(void)
 {
 #ifdef __MWERKS__ // clang-format off
@@ -756,7 +743,6 @@ lbl_80362758:
 #endif // clang-format on
 }
 
-/* 80362770-8036283C 35D0B0 00CC+00 0/0 2/2 0/0 .text            __cvt_dbl_usll */
 asm void __cvt_dbl_usll(void)
 {
 #ifdef __MWERKS__ // clang-format off
@@ -824,4 +810,4 @@ func_end:
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/SSystem/SComponent/c_API.cpp b/src/SSystem/SComponent/c_API.cpp
index 8821d68ad9..8e075e10ef 100644
--- a/src/SSystem/SComponent/c_API.cpp
+++ b/src/SSystem/SComponent/c_API.cpp
@@ -12,9 +12,7 @@ extern void mDoGph_AfterOfDraw();
 extern void mDoGph_Painter();
 extern void mDoGph_Create();
 
-/* ############################################################################################## */
-/* 803C3528-803C3540 0018+00 s=0 e=3 z=0  None .data      g_cAPI_Interface */
 cAPI_Interface g_cAPI_Interface = {
     mDoGph_Create,  mDoGph_BeforeOfDraw, mDoGph_AfterOfDraw,
     mDoGph_Painter, mDoGph_BlankingON,   mDoGph_BlankingOFF,
-};
\ No newline at end of file
+};
diff --git a/src/SSystem/SComponent/c_API_controller_pad.cpp b/src/SSystem/SComponent/c_API_controller_pad.cpp
index 4ac6aad2db..634ff74e4d 100644
--- a/src/SSystem/SComponent/c_API_controller_pad.cpp
+++ b/src/SSystem/SComponent/c_API_controller_pad.cpp
@@ -11,7 +11,6 @@
 #include "m_Do/m_Re_controller_pad.h"
 #endif
 
-/* 8026328C-802632AC 25DBCC 0020+00 0/0 3/3 0/0 .text            cAPICPad_recalibrate__Fv */
 void cAPICPad_recalibrate() {
     mDoCPd_c::recalibrate();
 
@@ -20,7 +19,6 @@ void cAPICPad_recalibrate() {
     #endif
 }
 
-/* 802632AC-802632C8 25DBEC 001C+00 0/0 3/3 1/1 .text            cAPICPad_ANY_BUTTON__FUl */
 u32 cAPICPad_ANY_BUTTON(u32 portNo) {
     return mDoCPd_c::getTrig(portNo) & (PAD_BUTTON_A | PAD_BUTTON_B | PAD_BUTTON_START);
 }
diff --git a/src/SSystem/SComponent/c_API_graphic.cpp b/src/SSystem/SComponent/c_API_graphic.cpp
index ade89fcae9..caa74e8d00 100644
--- a/src/SSystem/SComponent/c_API_graphic.cpp
+++ b/src/SSystem/SComponent/c_API_graphic.cpp
@@ -6,17 +6,14 @@
 #include "SSystem/SComponent/c_API_graphic.h"
 #include "SSystem/SComponent/c_API.h"
 
-/* 802632C8-802632F8 0030+00 s=0 e=1 z=0  None .text      cAPIGph_Painter__Fv */
 void cAPIGph_Painter() {
     g_cAPI_Interface.painterMtd();
 }
 
-/* 802632F8-80263328 0030+00 s=0 e=1 z=0  None .text      cAPIGph_BeforeOfDraw__Fv */
 void cAPIGph_BeforeOfDraw() {
     g_cAPI_Interface.beforeOfDrawMtd();
 }
 
-/* 80263328-80263358 0030+00 s=0 e=1 z=0  None .text      cAPIGph_AfterOfDraw__Fv */
 void cAPIGph_AfterOfDraw() {
     g_cAPI_Interface.afterOfDrawMtd();
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_angle.cpp b/src/SSystem/SComponent/c_angle.cpp
index f5d2847c12..4d04f980b2 100644
--- a/src/SSystem/SComponent/c_angle.cpp
+++ b/src/SSystem/SComponent/c_angle.cpp
@@ -14,175 +14,141 @@ const cSAngle cSAngle::_180(static_cast<s16>(-0x8000));
 const cSAngle cSAngle::_270(static_cast<s16>(-0x4000));
 
 #ifdef __MWERKS__
-/* 80270F68-80270F98 0030+00 s=0 e=33 z=2  None .text      __ct__7cSAngleFRC7cSAngle */
 cSAngle::cSAngle(const cSAngle& angle) {
     Val(angle);
 }
 #endif
 
-/* 80270F98-80270FC8 0030+00 s=14 e=50 z=4  None .text      __ct__7cSAngleFs */
 cSAngle::cSAngle(s16 angle) {
     Val(angle);
 }
 
-/* 80270FC8-80270FF8 0030+00 s=0 e=22 z=0  None .text      __ct__7cSAngleFf */
 cSAngle::cSAngle(f32 angle) {
     Val(angle);
 }
 
-/* 80270FF8-80271004 000C+00 s=2 e=6 z=0  None .text      Val__7cSAngleFRC7cSAngle */
 void cSAngle::Val(const cSAngle& other) {
     mAngle = other.mAngle;
 }
 
-/* 80271004-8027100C 0008+00 s=4 e=7 z=0  None .text      Val__7cSAngleFs */
 void cSAngle::Val(s16 val) {
     mAngle = val;
 }
 
-/* 8027100C-80271030 0024+00 s=1 e=8 z=0  None .text      Val__7cSAngleFf */
 void cSAngle::Val(f32 degree) {
     mAngle = cAngle::Degree_to_SAngle(degree);
 }
 
-/* 80271030-80271064 0034+00 s=0 e=11 z=0  None .text      Degree__7cSAngleCFv */
 f32 cSAngle::Degree() const {
     return cAngle::SAngle_to_Degree(mAngle);
 }
 
-/* 80271064-80271098 0034+00 s=3 e=0 z=0  None .text      Radian__7cSAngleCFv */
 f32 cSAngle::Radian() const {
     return cAngle::SAngle_to_Radian(mAngle);
 }
 
-/* 80271098-802710CC 0034+00 s=0 e=1 z=0  None .text      Norm__7cSAngleCFv */
 f32 cSAngle::Norm() const {
     return cAngle::SAngle_to_Normal(mAngle);
 }
 
-/* 802710CC-802710E8 001C+00 s=0 e=5 z=1  None .text      Abs__7cSAngleCFv */
 s16 cSAngle::Abs() const {
     return mAngle >= 0 ? mAngle : -mAngle;
 }
 
-/* 802710E8-802710F8 0010+00 s=2 e=22 z=2  None .text      Inv__7cSAngleCFv */
 s16 cSAngle::Inv() const {
     return mAngle - 0x8000;
 }
 
-/* 802710F8-80271120 0028+00 s=0 e=6 z=1  None .text      Sin__7cSAngleCFv */
 f32 cSAngle::Sin() const {
     return sin(Radian());
 }
 
-/* 80271120-80271148 0028+00 s=0 e=8 z=1  None .text      Cos__7cSAngleCFv */
 f32 cSAngle::Cos() const {
     return cos(Radian());
 }
 
-/* 80271148-80271174 002C+00 s=2 e=8 z=0  None .text      __mi__7cSAngleCFv */
 cSAngle cSAngle::operator-() const {
     return cSAngle(static_cast<s16>(-mAngle));
 }
 
-/* 80271174-802711A4 0030+00 s=0 e=30 z=1  None .text      __pl__7cSAngleCFRC7cSAngle */
 cSAngle cSAngle::operator+(const cSAngle& other) const {
     return cSAngle(static_cast<s16>(mAngle + other.mAngle));
 }
 
-/* 802711A4-802711D4 0030+00 s=2 e=37 z=0  None .text      __mi__7cSAngleCFRC7cSAngle */
 cSAngle cSAngle::operator-(const cSAngle& other) const {
     return cSAngle(static_cast<s16>(mAngle - other.mAngle));
 }
 
-/* 802711D4-802711E8 0014+00 s=0 e=15 z=0  None .text      __apl__7cSAngleFRC7cSAngle */
 void cSAngle::operator+=(const cSAngle& other) {
     mAngle += other.mAngle;
 }
 
-/* 802711E8-802711FC 0014+00 s=0 e=3 z=0  None .text      __ami__7cSAngleFRC7cSAngle */
 void cSAngle::operator-=(const cSAngle& other) {
     mAngle -= other.mAngle;
 }
 
-/* 802711FC-80271228 002C+00 s=0 e=5 z=0  None .text      __pl__7cSAngleCFs */
 cSAngle cSAngle::operator+(s16 other) const {
     return cSAngle(static_cast<s16>(mAngle + other));
 }
 
-/* 80271228-80271254 002C+00 s=0 e=9 z=3  None .text      __mi__7cSAngleCFs */
 cSAngle cSAngle::operator-(s16 other) const {
     return cSAngle(static_cast<s16>(mAngle - other));
 }
 
-/* 80271254-80271264 0010+00 s=0 e=1 z=0  None .text      __apl__7cSAngleFs */
 void cSAngle::operator+=(s16 other) {
     mAngle += other;
 }
 
-/* 80271264-802712B4 0050+00 s=0 e=31 z=0  None .text      __ml__7cSAngleCFf */
 cSAngle cSAngle::operator*(f32 f1) const {
     return cSAngle(static_cast<s16>(mAngle * f1));
 }
 
-/* 802712B4-802712F4 0040+00 s=0 e=3 z=0  None .text      __amu__7cSAngleFf */
 void cSAngle::operator*=(f32 f1) {
     mAngle *= f1;
 }
 
-/* 802712F4-80271320 002C+00 s=0 e=2 z=0  None .text      __pl__FsRC7cSAngle */
 cSAngle operator+(s16 other, const cSAngle& angle) {
     return cSAngle(static_cast<s16>(other + angle.Val()));
 }
 
-/* 80271320-8027134C 002C+00 s=0 e=5 z=0  None .text      __mi__FsRC7cSAngle */
 cSAngle operator-(s16 other, const cSAngle& angle) {
     return cSAngle(static_cast<s16>(other - angle.Val()));
 }
 
-/* 8027134C-8027137C 0030+00 s=0 e=3 z=0  None .text      __ct__7cDegreeFf */
 cDegree::cDegree(f32 f) {
     Val(f);
 }
 
-/* 8027137C-802713BC 0040+00 s=1 e=0 z=0  None .text      Formal__7cDegreeFv */
 cDegree& cDegree::Formal() {
     mDegree = cAngle::Adjust<f32>(mDegree, -180.0f, 180.0f);
     return *this;
 }
 
-/* 802713BC-802713E0 0024+00 s=1 e=0 z=0  None .text      Val__7cDegreeFf */
 void cDegree::Val(f32 f) {
     mDegree = f;
     Formal();
 }
 
-/* 802713E0-802713F0 0010+00 s=3 e=0 z=0  None .text      Radian__7cDegreeCFv */
 f32 cDegree::Radian() const {
     return cAngle::Degree_to_Radian(mDegree);
 }
 
-/* 802713F0-80271418 0028+00 s=0 e=1 z=0  None .text      Sin__7cDegreeCFv */
 f32 cDegree::Sin() const {
     return sin(Radian());
 }
 
-/* 80271418-80271440 0028+00 s=0 e=2 z=0  None .text      Cos__7cDegreeCFv */
 f32 cDegree::Cos() const {
     return cos(Radian());
 }
 
-/* 80271440-80271468 0028+00 s=0 e=1 z=0  None .text      Tan__7cDegreeCFv */
 f32 cDegree::Tan() const {
     return tan(Radian());
 }
 
-/* 80271468-80271498 0030+00 s=1 e=0 z=0  None .text      __ct__7cSPolarFRC4cXyz */
 cSPolar::cSPolar(const cXyz& xyz) {
     Val(xyz);
 }
 
-/* 80271498-80271558 00C0+00 s=2 e=0 z=0  None .text      Formal__7cSPolarFv */
 cSPolar& cSPolar::Formal() {
     if (mRadial < 0.0f) {
         mRadial = -mRadial;
@@ -199,7 +165,6 @@ cSPolar& cSPolar::Formal() {
     return *this;
 }
 
-/* 80271558-802715BC 0064+00 s=1 e=0 z=0  None .text      Val__7cSPolarFfss */
 void cSPolar::Val(f32 f, s16 s1, s16 s2) {
     mRadial = f;
     mAngle1 = cSAngle(s1);
@@ -211,7 +176,6 @@ inline double square(f32 f) {
     return f * f;
 }
 
-/* 802715BC-802716EC 0130+00 s=1 e=0 z=0  None .text      Val__7cSPolarFRC4cXyz */
 void cSPolar::Val(const cXyz& xyz) {
     f32 x, y, z, tmp4;
     x = xyz.x;
@@ -226,7 +190,6 @@ void cSPolar::Val(const cXyz& xyz) {
     Formal();
 }
 
-/* 802716EC-802717B4 00C8+00 s=1 e=1 z=0  None .text      Xyz__7cSPolarCFv */
 cXyz cSPolar::Xyz() const {
     f32 ang1Cos;
     f32 ang2Cos;
@@ -237,34 +200,28 @@ cXyz cSPolar::Xyz() const {
     return cXyz(ang1Sin * ang2Sin, ang1Cos, ang1Sin * ang2Cos);
 }
 
-/* 802717B4-802717F0 003C+00 s=1 e=0 z=0  None .text      Globe__7cSPolarCFP7cSGlobe */
 void cSPolar::Globe(cSGlobe* globe) const {
     globe->Val(mRadial, 0x4000 - mAngle1.Val(), mAngle2.Val());
 }
 
 #ifdef __MWERKS__
-/* 802717F0-80271820 0030+00 s=0 e=6 z=0  None .text      __ct__7cSGlobeFRC7cSGlobe */
 cSGlobe::cSGlobe(const cSGlobe& other) {
     Val(other);
 }
 #endif
 
-/* 80271820-80271850 0030+00 s=0 e=3 z=0  None .text      __ct__7cSGlobeFfss */
 cSGlobe::cSGlobe(f32 f, s16 s1, s16 s2) {
     Val(f, s1, s2);
 }
 
-/* 80271850-80271880 0030+00 s=1 e=4 z=0  None .text      __ct__7cSGlobeFfRC7cSAngleRC7cSAngle */
 cSGlobe::cSGlobe(f32 f, const cSAngle& a1, const cSAngle& a2) {
     Val(f, a1, a2);
 }
 
-/* 80271880-802718B0 0030+00 s=0 e=35 z=3  None .text      __ct__7cSGlobeFRC4cXyz */
 cSGlobe::cSGlobe(const cXyz& xyz) {
     Val(xyz);
 }
 
-/* 802718B0-8027196C 00BC+00 s=5 e=0 z=0  None .text      Formal__7cSGlobeFv */
 cSGlobe& cSGlobe::Formal() {
     if (mRadius < 0.0f) {
         mRadius = -mRadius;
@@ -280,7 +237,6 @@ cSGlobe& cSGlobe::Formal() {
     return *this;
 }
 
-/* 8027196C-802719A4 0038+00 s=1 e=0 z=0  None .text      Val__7cSGlobeFRC7cSGlobe */
 void cSGlobe::Val(const cSGlobe& other) {
     mRadius = other.mRadius;
     mInclination = other.mInclination;
@@ -288,7 +244,6 @@ void cSGlobe::Val(const cSGlobe& other) {
     Formal();
 }
 
-/* 802719A4-80271A08 0064+00 s=2 e=3 z=0  None .text      Val__7cSGlobeFfss */
 void cSGlobe::Val(f32 f, s16 s1, s16 s2) {
     mRadius = f;
     mInclination = cSAngle(s1);
@@ -296,7 +251,6 @@ void cSGlobe::Val(f32 f, s16 s1, s16 s2) {
     Formal();
 }
 
-/* 80271A08-80271A70 0068+00 s=1 e=11 z=0  None .text      Val__7cSGlobeFfRC7cSAngleRC7cSAngle */
 void cSGlobe::Val(f32 f, const cSAngle& a1, const cSAngle& a2) {
     mRadius = f;
     mInclination = cSAngle(a1.Val());
@@ -304,32 +258,27 @@ void cSGlobe::Val(f32 f, const cSAngle& a1, const cSAngle& a2) {
     Formal();
 }
 
-/* 80271A70-80271AB4 0044+00 s=1 e=38 z=0  None .text      Val__7cSGlobeFRC4cXyz */
 void cSGlobe::Val(const cXyz& xyz) {
     cSPolar csp(xyz);
     csp.Globe(this);
     Formal();
 }
 
-/* 80271AB4-80271AF4 0040+00 s=1 e=38 z=0  None .text      Xyz__7cSGlobeCFv */
 cXyz cSGlobe::Xyz() const {
     cSPolar csp;
     Polar(&csp);
     return csp.Xyz();
 }
 
-/* 80271AF4-80271B30 003C+00 s=1 e=0 z=0  None .text      Polar__7cSGlobeCFP7cSPolar */
 void cSGlobe::Polar(cSPolar* csp) const {
     csp->Val(mRadius, 0x4000 - mInclination.Val(), mAzimuth.Val());
 }
 
-/* 80271B30-80271B7C 004C+00 s=0 e=3 z=0  None .text      Norm__7cSGlobeCFv */
 cXyz cSGlobe::Norm() const {
     cSGlobe glob(1.0f, mInclination, mAzimuth);
     return glob.Xyz();
 }
 
-/* 80271B7C-80271BA8 002C+00 s=0 e=2 z=0  None .text      Invert__7cSGlobeFv */
 cSGlobe& cSGlobe::Invert() {
     mRadius = -mRadius;
     return Formal();
diff --git a/src/SSystem/SComponent/c_bg_s_chk.cpp b/src/SSystem/SComponent/c_bg_s_chk.cpp
index 5ad8e264b6..e7b35c8f9c 100644
--- a/src/SSystem/SComponent/c_bg_s_chk.cpp
+++ b/src/SSystem/SComponent/c_bg_s_chk.cpp
@@ -6,17 +6,14 @@
 #include "SSystem/SComponent/c_bg_s_chk.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 80267B4C-80267B70 26248C 0024+00 0/0 7/7 0/0 .text            __ct__8cBgS_ChkFv */
 cBgS_Chk::cBgS_Chk() {
     mPolyPassChk = NULL;
     mGrpPassChk = NULL;
     mSameActorChk = true;
 }
 
-/* 80267B70-80267BB8 2624B0 0048+00 1/0 7/7 0/0 .text            __dt__8cBgS_ChkFv */
 cBgS_Chk::~cBgS_Chk() {}
 
-/* 80267BB8-80267BDC 2624F8 0024+00 0/0 4/4 0/0 .text            SetExtChk__8cBgS_ChkFR8cBgS_Chk */
 void cBgS_Chk::SetExtChk(cBgS_Chk& other) {
     mPolyPassChk = other.mPolyPassChk;
     mGrpPassChk = other.mGrpPassChk;
@@ -24,7 +21,6 @@ void cBgS_Chk::SetExtChk(cBgS_Chk& other) {
     mSameActorChk = other.mSameActorChk;
 }
 
-/* 80267BDC-80267C1C 26251C 0040+00 0/0 7/7 0/0 .text            ChkSameActorPid__8cBgS_ChkCFUi */
 bool cBgS_Chk::ChkSameActorPid(fpc_ProcID pid) const {
     if (mActorPid == fpcM_ERROR_PROCESS_ID_e || pid == fpcM_ERROR_PROCESS_ID_e || !mSameActorChk) {
         return FALSE;
diff --git a/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp
index e752288821..687bf217fe 100644
--- a/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp
+++ b/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp
@@ -6,28 +6,22 @@
 #include "SSystem/SComponent/c_bg_s_gnd_chk.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 80267C1C-80267C94 26255C 0078+00 0/0 2/2 123/123 .text            __ct__11cBgS_GndChkFv */
 cBgS_GndChk::cBgS_GndChk() {
     m_pos = cXyz::Zero;
     SetActorPid(fpcM_ERROR_PROCESS_ID_e);
     mFlags = 2;
 }
 
-/* 80267C94-80267D0C 2625D4 0078+00 2/1 4/4 110/110 .text            __dt__11cBgS_GndChkFv */
 cBgS_GndChk::~cBgS_GndChk() {}
 
-/* 80267D0C-80267D28 26264C 001C+00 0/0 0/0 62/62 .text            SetPos__11cBgS_GndChkFPC3Vec */
 void cBgS_GndChk::SetPos(Vec const* pos) {
     m_pos = *pos;
 }
 
-/* 80267D28-80267D44 262668 001C+00 0/0 51/51 185/185 .text            SetPos__11cBgS_GndChkFPC4cXyz
- */
 void cBgS_GndChk::SetPos(cXyz const* pos) {
     m_pos = *pos;
 }
 
-/* 80267D44-80267D54 262684 0010+00 0/0 1/1 0/0 .text            PreCheck__11cBgS_GndChkFv */
 void cBgS_GndChk::PreCheck() {
     mWallPrecheck = mFlags & 2;
 }
diff --git a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp
index 0e6a5d8892..ddfd9274b6 100644
--- a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp
+++ b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp
@@ -6,15 +6,12 @@
 #include "SSystem/SComponent/c_bg_s_lin_chk.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 80267D5C-80267DBC 26269C 0060+00 0/0 2/2 0/0 .text            __ct__11cBgS_LinChkFv */
 cBgS_LinChk::cBgS_LinChk() {
     ct();
 }
 
-/* 80267DBC-80267E48 2626FC 008C+00 2/1 2/2 0/0 .text            __dt__11cBgS_LinChkFv */
 cBgS_LinChk::~cBgS_LinChk() {}
 
-/* 80267E48-80267ED0 262788 0088+00 1/1 0/0 0/0 .text            ct__11cBgS_LinChkFv */
 void cBgS_LinChk::ct() {
     cXyz start_end(cXyz::Zero);
     mLin.SetStartEnd(start_end, start_end);
@@ -26,7 +23,6 @@ void cBgS_LinChk::ct() {
     mBackFlag = 0;
 }
 
-/* 80267ED0-80267F40 262810 0070+00 0/0 2/2 0/0 .text Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi */
 void cBgS_LinChk::Set2(cXyz const* startPos, cXyz const* endPos, unsigned int actorPid) {
     mLin.SetStartEnd(*startPos, *endPos);
     field_0x40 = *endPos;
@@ -35,7 +31,6 @@ void cBgS_LinChk::Set2(cXyz const* startPos, cXyz const* endPos, unsigned int ac
     ClearPi();
 }
 
-/* 80267F40-80267F80 262880 0040+00 0/0 1/1 0/0 .text            PreCalc__11cBgS_LinChkFv */
 void cBgS_LinChk::PreCalc() {
     mPreWallChk = !(mStts & STTS_WALL_OFF);
     mPreGroundChk = !(mStts & STTS_GROUND_OFF);
diff --git a/src/SSystem/SComponent/c_bg_s_poly_info.cpp b/src/SSystem/SComponent/c_bg_s_poly_info.cpp
index f6f389bb75..8d6f273d66 100644
--- a/src/SSystem/SComponent/c_bg_s_poly_info.cpp
+++ b/src/SSystem/SComponent/c_bg_s_poly_info.cpp
@@ -6,15 +6,12 @@
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80268074-802680B0 2629B4 003C+00 0/0 7/7 9/9 .text            __ct__13cBgS_PolyInfoFv */
 cBgS_PolyInfo::cBgS_PolyInfo() {
     ClearPi();
 }
 
-/* 802680B0-802680F8 2629F0 0048+00 1/0 10/10 393/393 .text            __dt__13cBgS_PolyInfoFv */
 cBgS_PolyInfo::~cBgS_PolyInfo() {}
 
-/* 802680F8-80268120 262A38 0028+00 0/0 4/4 0/0 .text            ChkSetInfo__13cBgS_PolyInfoCFv */
 bool cBgS_PolyInfo::ChkSetInfo() const {
     if (mPolyIndex == 0xFFFF || mBgIndex == 0x100) {
         return false;
@@ -23,7 +20,6 @@ bool cBgS_PolyInfo::ChkSetInfo() const {
     }
 }
 
-/* 80268120-80268148 262A60 0028+00 1/1 11/11 0/0 .text            ClearPi__13cBgS_PolyInfoFv */
 void cBgS_PolyInfo::ClearPi() {
     mPolyIndex = -1;
     mBgIndex = 0x100;
@@ -31,14 +27,10 @@ void cBgS_PolyInfo::ClearPi() {
     mActorId = -1;
 }
 
-/* 80268148-8026816C 262A88 0024+00 0/0 11/11 1/1 .text
- * SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo               */
 void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& poly) {
     *this = poly;
 }
 
-/* 8026816C-8026817C 262AAC 0010+00 0/0 6/6 0/0 .text            SetActorInfo__13cBgS_PolyInfoFiPvUi
- */
 void cBgS_PolyInfo::SetActorInfo(int bg_index, void* p_data, fpc_ProcID actor_id) {
     JUT_ASSERT(74, 0 <= bg_index);
     mBgIndex = bg_index;
@@ -46,7 +38,6 @@ void cBgS_PolyInfo::SetActorInfo(int bg_index, void* p_data, fpc_ProcID actor_id
     mActorId = actor_id;
 }
 
-/* 8026817C-802681A4 262ABC 0028+00 0/0 1/1 0/0 .text            ChkSafe__13cBgS_PolyInfoCFPCvUi */
 bool cBgS_PolyInfo::ChkSafe(const void* param_1, fpc_ProcID actor_id) const {
     if (unk_0x04 == param_1 && mActorId == actor_id) {
         return true;
@@ -55,14 +46,11 @@ bool cBgS_PolyInfo::ChkSafe(const void* param_1, fpc_ProcID actor_id) const {
     }
 }
 
-/* 802681A4-802681AC 262AE4 0008+00 0/0 11/11 0/0 .text            SetPolyIndex__13cBgS_PolyInfoFi
- */
 void cBgS_PolyInfo::SetPolyIndex(int poly_index) {
     JUT_ASSERT(103, 0 <= poly_index);
     mPolyIndex = poly_index;
 }
 
-/* 802681AC-802681C0 262AEC 0014+00 0/0 3/3 0/0 .text            ChkBgIndex__13cBgS_PolyInfoCFv */
 bool cBgS_PolyInfo::ChkBgIndex() const {
     if (mBgIndex == 0x100) {
         return false;
diff --git a/src/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/src/SSystem/SComponent/c_bg_s_shdw_draw.cpp
index 4bf815606e..09aa16bdc1 100644
--- a/src/SSystem/SComponent/c_bg_s_shdw_draw.cpp
+++ b/src/SSystem/SComponent/c_bg_s_shdw_draw.cpp
@@ -5,20 +5,14 @@
 
 #include "SSystem/SComponent/c_bg_s_shdw_draw.h"
 
-/* 80267F88-80267FD0 2628C8 0048+00 0/0 1/1 0/0 .text            __ct__13cBgS_ShdwDrawFv */
 cBgS_ShdwDraw::cBgS_ShdwDraw() {}
 
-/* 80267FD0-80268048 262910 0078+00 1/0 2/2 0/0 .text            __dt__13cBgS_ShdwDrawFv */
 cBgS_ShdwDraw::~cBgS_ShdwDraw() {}
 
-/* 80268048-8026806C 262988 0024+00 0/0 1/1 0/0 .text            Set__13cBgS_ShdwDrawFR4cXyzR4cXyz
- */
 void cBgS_ShdwDraw::Set(cXyz& bound_min, cXyz& bound_max) {
     mM3dGAab.Set(&bound_min, &bound_max);
 }
 
-/* 8026806C-80268074 -00001 0008+00 0/0 0/0 0/0 .text
- * SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla_i */
 void cBgS_ShdwDraw::SetCallback(cBgS_ShdwDraw_Callback callback) {
     mCallbackFun = callback;
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_bg_w.cpp b/src/SSystem/SComponent/c_bg_w.cpp
index fb680d5326..a7bd8b370f 100644
--- a/src/SSystem/SComponent/c_bg_w.cpp
+++ b/src/SSystem/SComponent/c_bg_w.cpp
@@ -5,17 +5,14 @@
 
 #include "SSystem/SComponent/c_bg_w.h"
 
-/* 802681C0-802681C8 262B00 0008+00 0/0 1/1 0/0 .text            Regist__9cBgW_BgIdFi */
 void cBgW_BgId::Regist(int id) {
     m_id = id;
 }
 
-/* 802681C8-802681D4 262B08 000C+00 0/0 2/2 0/0 .text            Release__9cBgW_BgIdFv */
 void cBgW_BgId::Release() {
     m_id = 0x100;
 }
 
-/* 802681D4-802681E4 262B14 0010+00 0/0 7/7 121/121 .text            ChkUsed__9cBgW_BgIdCFv */
 bool cBgW_BgId::ChkUsed() const {
     if (m_id < 0x100) {
         return true;
@@ -24,7 +21,6 @@ bool cBgW_BgId::ChkUsed() const {
     return false;
 }
 
-/* 802681E4-802681FC 262B24 0018+00 1/1 22/22 8/8 .text            cBgW_CheckBGround__Ff */
 bool cBgW_CheckBGround(float y) {
     if (y >= 0.5f) {
         return true;
@@ -33,7 +29,6 @@ bool cBgW_CheckBGround(float y) {
     }
 }
 
-/* 802681FC-80268210 262B3C 0014+00 1/1 6/6 0/0 .text            cBgW_CheckBRoof__Ff */
 bool cBgW_CheckBRoof(float y) {
     if (y < (-4.0f / 5.0f)) {
         return true;
@@ -42,7 +37,6 @@ bool cBgW_CheckBRoof(float y) {
     }
 }
 
-/* 80268210-80268260 262B50 0050+00 0/0 16/16 4/4 .text            cBgW_CheckBWall__Ff */
 bool cBgW_CheckBWall(float y) {
     if (!cBgW_CheckBGround(y) && !cBgW_CheckBRoof(y))
         return true;
diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp
index 2c9fd58562..7c57b18e0e 100644
--- a/src/SSystem/SComponent/c_cc_d.cpp
+++ b/src/SSystem/SComponent/c_cc_d.cpp
@@ -8,19 +8,14 @@
 
 #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
 
-/* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss             m_virtual_center__14cCcD_ShapeAttr
- */
 cXyz cCcD_ShapeAttr::m_virtual_center = cXyz::Zero;
 
-/* 80263358-80263368 25DC98 0010+00 2/2 1/1 0/0 .text            Set__15cCcD_DivideInfoFUlUlUl */
 void cCcD_DivideInfo::Set(u32 xDivInfo, u32 yDivInfo, u32 zDivInfo) {
     mXDivInfo = xDivInfo;
     mYDivInfo = yDivInfo;
     mZDivInfo = zDivInfo;
 }
 
-/* 80263368-802633A8 25DCA8 0040+00 0/0 5/5 0/0 .text Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo
- */
 bool cCcD_DivideInfo::Chk(const cCcD_DivideInfo& other) const {
     if ((mXDivInfo & other.mXDivInfo) == 0 || (mZDivInfo & other.mZDivInfo) == 0 ||
         (mYDivInfo & other.mYDivInfo) == 0)
@@ -31,7 +26,6 @@ bool cCcD_DivideInfo::Chk(const cCcD_DivideInfo& other) const {
     }
 }
 
-/* 802633A8-802634D4 25DCE8 012C+00 0/0 2/2 0/0 .text SetArea__15cCcD_DivideAreaFRC8cM3dGAab */
 void cCcD_DivideArea::SetArea(const cM3dGAab& aab) {
     Set(aab.GetMinP(), aab.GetMaxP());
 
@@ -54,7 +48,6 @@ void cCcD_DivideArea::SetArea(const cM3dGAab& aab) {
     }
 }
 
-/* 8039A7E8-8039A868 026E48 0080+00 2/2 0/0 0/0 .rodata          l_base */
 static const u32 l_base[32] = {
     0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F, 0x0000003F, 0x0000007F, 0x000000FF,
     0x000001FF, 0x000003FF, 0x000007FF, 0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF,
@@ -62,8 +55,6 @@ static const u32 l_base[32] = {
     0x01FFFFFF, 0x03FFFFFF, 0x07FFFFFF, 0x0FFFFFFF, 0x1FFFFFFF, 0x3FFFFFFF, 0x7FFFFFFF, 0xFFFFFFFF,
 };
 
-/* 802634D4-802636A0 25DE14 01CC+00 0/0 2/2 0/0 .text
- * CalcDivideInfo__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAabUl */
 void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, const cM3dGAab& aab,
                                      u32 param_2) {
     if (param_2 != 0) {
@@ -122,8 +113,6 @@ void cCcD_DivideArea::CalcDivideInfo(cCcD_DivideInfo* pDivideInfo, const cM3dGAa
     }
 }
 
-/* 802636A0-80263894 25DFE0 01F4+00 0/0 3/3 0/0 .text
- * CalcDivideInfoOverArea__15cCcD_DivideAreaFP15cCcD_DivideInfoRC8cM3dGAab */
 void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, const cM3dGAab& aab) {
     u32 xDivInfo, yDivInfo, zDivInfo;
     if (!mXDiffIsZero) {
@@ -186,17 +175,14 @@ void cCcD_DivideArea::CalcDivideInfoOverArea(cCcD_DivideInfo* pDivideInfo, const
     pDivideInfo->Set(xDivInfo, yDivInfo, zDivInfo);
 }
 
-/* 80263894-8026389C 25E1D4 0008+00 1/0 1/0 0/0 .text            GetGStts__9cCcD_SttsCFv */
 const cCcD_GStts* cCcD_Stts::GetGStts() const {
     return NULL;
 }
 
-/* 8026389C-802638A4 25E1DC 0008+00 1/0 0/0 0/0 .text            GetGStts__9cCcD_SttsFv */
 cCcD_GStts* cCcD_Stts::GetGStts() {
     return NULL;
 }
 
-/* 802638A4-80263904 25E1E4 0060+00 0/0 1/1 0/0 .text            Init__9cCcD_SttsFiiPvUi */
 void cCcD_Stts::Init(int weight, int param_1, void* pactor, fpc_ProcID apid) {
     Ct();
     m_weight = weight;
@@ -205,7 +191,6 @@ void cCcD_Stts::Init(int weight, int param_1, void* pactor, fpc_ProcID apid) {
     m_apid = apid;
 }
 
-/* 80263904-80263934 25E244 0030+00 1/0 1/1 0/0 .text            Ct__9cCcD_SttsFv */
 void cCcD_Stts::Ct() {
     m_cc_move.x = 0.0f;
     m_cc_move.y = 0.0f;
@@ -217,7 +202,6 @@ void cCcD_Stts::Ct() {
     m_dmg = 0;
 }
 
-/* 80263934-8026395C 25E274 0028+00 0/0 3/3 0/0 .text            PlusCcMove__9cCcD_SttsFfff */
 void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
     m_cc_move.x += x;
     m_cc_move.y += y;
@@ -232,14 +216,12 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
     CHECK_FLOAT_RANGE(428, m_cc_move.z);
 }
 
-/* 8026395C-80263970 25E29C 0014+00 0/0 10/10 23/23 .text            ClrCcMove__9cCcD_SttsFv */
 void cCcD_Stts::ClrCcMove() {
     m_cc_move.z = 0.0f;
     m_cc_move.y = 0.0f;
     m_cc_move.x = 0.0f;
 }
 
-/* 80263970-80263984 25E2B0 0014+00 0/0 2/2 0/0 .text            PlusDmg__9cCcD_SttsFi */
 void cCcD_Stts::PlusDmg(int dmg) {
     if (m_dmg >= dmg) {
         return;
@@ -247,38 +229,31 @@ void cCcD_Stts::PlusDmg(int dmg) {
     m_dmg = dmg;
 }
 
-/* 80263984-802639B0 25E2C4 002C+00 0/0 1/1 0/0 .text            GetWeightF__9cCcD_SttsCFv */
 f32 cCcD_Stts::GetWeightF() const {
     return (s32)m_weight;
 }
 
-/* 802639B0-802639C4 25E2F0 0014+00 0/0 1/1 0/0 .text            ct__18cCcD_ObjCommonBaseFv */
 void cCcD_ObjCommonBase::ct() {
     mSPrm = 0;
     mRPrm = 0;
     mHitObj = NULL;
 }
 
-/* 802639C4-80263A10 25E304 004C+00 1/1 0/0 0/0 .text Set__14cCcD_ObjHitInfFRC17cCcD_SrcObjHitInf
- */
 void cCcD_ObjHitInf::Set(const cCcD_SrcObjHitInf& src) {
     mObjAt.Set(src.mObjAt);
     mObjTg.Set(src.mObjTg);
     mObjCo.Set(src.mObjCo);
 }
 
-/* 80263A10-80263A1C 25E350 000C+00 0/0 1/1 0/0 .text            ct__8cCcD_ObjFv */
 void cCcD_Obj::ct() {
     mFlags = 0;
 }
 
-/* 80263A1C-80263A48 25E35C 002C+00 0/0 1/1 0/0 .text            Set__8cCcD_ObjFRC11cCcD_SrcObj */
 void cCcD_Obj::Set(const cCcD_SrcObj& src) {
     mFlags = src.mFlags;
     cCcD_ObjHitInf::Set(src.mSrcObjHitInf);
 }
 
-/* 80263A48-80263A64 25E388 001C+00 0/0 9/9 87/87 .text            GetAc__8cCcD_ObjFv */
 fopAc_ac_c* cCcD_Obj::GetAc() {
     if (mStts == NULL) {
         return NULL;
@@ -287,8 +262,6 @@ fopAc_ac_c* cCcD_Obj::GetAc() {
     }
 }
 
-/* 80263A64-80263A88 25E3A4 0024+00 3/0 2/0 0/0 .text
- * getShapeAccess__14cCcD_ShapeAttrCFPQ214cCcD_ShapeAttr5Shape  */
 void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
     pshape->_0 = 2;
     pshape->_14 = 0.0f;
@@ -314,8 +287,6 @@ bool cCcD_PntAttr::GetNVec(cXyz const& param_0, cXyz* param_1) const {
 }
 
 
-/* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz            */
 bool cCcD_TriAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     if (cM3dGTri::Cross(cpsAttr, pxyz)) {
         return true;
@@ -324,8 +295,6 @@ bool cCcD_TriAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263B58-80263B90 25E498 0038+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CylAttrP4cXyz            */
 bool cCcD_TriAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     if (cM3dGTri::Cross(cylAttr, pxyz)) {
         return true;
@@ -334,8 +303,6 @@ bool cCcD_TriAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263B90-80263BCC 25E4D0 003C+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_SphAttrP4cXyz            */
 bool cCcD_TriAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     if (cM3dGTri::Cross(sphAttr, pxyz)) {
         return true;
@@ -344,8 +311,6 @@ bool cCcD_TriAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263BCC-80263C04 25E50C 0038+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_TriAttrCFRC12cCcD_TriAttrP4cXyz            */
 bool cCcD_TriAttr::CrossAtTg(const cCcD_TriAttr& other, cXyz* pxyz) const {
     if (cM3dGTri::Cross(other, pxyz)) {
         return true;
@@ -354,7 +319,6 @@ bool cCcD_TriAttr::CrossAtTg(const cCcD_TriAttr& other, cXyz* pxyz) const {
     }
 }
 
-/* 80263C04-80263C9C 25E544 0098+00 1/0 1/0 0/0 .text            CalcAabBox__12cCcD_TriAttrFv */
 void cCcD_TriAttr::CalcAabBox() {
     mAab.ClearForMinMax();
     mAab.SetMinMax(mA);
@@ -362,7 +326,6 @@ void cCcD_TriAttr::CalcAabBox() {
     mAab.SetMinMax(mC);
 }
 
-/* 80263C9C-80263D38 25E5DC 009C+00 1/0 1/0 0/0 .text GetNVec__12cCcD_TriAttrCFRC4cXyzP4cXyz */
 bool cCcD_TriAttr::GetNVec(const cXyz& param_0, cXyz* pOut) const {
     if (getPlaneFunc(&param_0) >= 0.0f) {
         *pOut = mNormal;
@@ -373,8 +336,6 @@ bool cCcD_TriAttr::GetNVec(const cXyz& param_0, cXyz* pOut) const {
     return true;
 }
 
-/* 80263D38-80263D7C 25E678 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CpsAttrP4cXyz            */
 bool cCcD_CpsAttr::CrossAtTg(const cCcD_CpsAttr& other, cXyz* pxyz) const {
     if (cM3dGCps::Cross(&other, pxyz)) {
         return true;
@@ -383,8 +344,6 @@ bool cCcD_CpsAttr::CrossAtTg(const cCcD_CpsAttr& other, cXyz* pxyz) const {
     }
 }
 
-/* 80263D7C-80263DC0 25E6BC 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_CylAttrP4cXyz            */
 bool cCcD_CpsAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     if (cM3dGCps::Cross(&cylAttr, pxyz)) {
         return true;
@@ -393,8 +352,6 @@ bool cCcD_CpsAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263DC0-80263E04 25E700 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_SphAttrP4cXyz            */
 bool cCcD_CpsAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     if (cM3dGCps::Cross(&sphAttr, pxyz)) {
         return true;
@@ -403,8 +360,6 @@ bool cCcD_CpsAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263E04-80263ED4 25E744 00D0+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CpsAttrCFRC12cCcD_TriAttrP4cXyz            */
 bool cCcD_CpsAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     if (triAttr.cM3dGTri::Cross(*this, pxyz)) {
         return true;
@@ -413,8 +368,6 @@ bool cCcD_CpsAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80263ED4-80263F24 25E814 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_CpsAttrPf
- */
 bool cCcD_CpsAttr::CrossCo(const cCcD_CpsAttr& other, f32* param_1) const {
     *param_1 = 0.0f;
     cXyz xyz;
@@ -425,8 +378,6 @@ bool cCcD_CpsAttr::CrossCo(const cCcD_CpsAttr& other, f32* param_1) const {
     }
 }
 
-/* 80263F24-80263F74 25E864 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_CylAttrPf
- */
 bool cCcD_CpsAttr::CrossCo(const cCcD_CylAttr& cylAttr, f32* param_1) const {
     *param_1 = 0.0f;
     cXyz xyz;
@@ -437,8 +388,6 @@ bool cCcD_CpsAttr::CrossCo(const cCcD_CylAttr& cylAttr, f32* param_1) const {
     }
 }
 
-/* 80263F74-80263FC4 25E8B4 0050+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CpsAttrCFRC12cCcD_SphAttrPf
- */
 bool cCcD_CpsAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* param_1) const {
     *param_1 = 0.0f;
     cXyz xyz;
@@ -449,7 +398,6 @@ bool cCcD_CpsAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* param_1) const {
     }
 }
 
-/* 80263FC4-80264014 25E904 0050+00 1/0 2/1 0/0 .text            CalcAabBox__12cCcD_CpsAttrFv */
 void cCcD_CpsAttr::CalcAabBox() {
     mAab.ClearForMinMax();
     mAab.SetMinMax(mStart);
@@ -457,7 +405,6 @@ void cCcD_CpsAttr::CalcAabBox() {
     mAab.PlusR(mRadius);
 }
 
-/* 80264014-8026417C 25E954 0168+00 1/0 1/0 0/0 .text GetNVec__12cCcD_CpsAttrCFRC4cXyzP4cXyz */
 bool cCcD_CpsAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     Vec diff;
     const cXyz& endP = GetEndP();
@@ -492,8 +439,6 @@ bool cCcD_CpsAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     }
 }
 
-/* 8026417C-802641C8 25EABC 004C+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CpsAttrP4cXyz            */
 bool cCcD_CylAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     if (cM3dGCyl::Cross(&cpsAttr, pxyz)) {
         return true;
@@ -502,8 +447,6 @@ bool cCcD_CylAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     }
 }
 
-/* 802641C8-8026420C 25EB08 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_CylAttrP4cXyz            */
 bool cCcD_CylAttr::CrossAtTg(const cCcD_CylAttr& other, cXyz* pxyz) const {
     if (cross(&other, pxyz)) {
         return true;
@@ -512,8 +455,6 @@ bool cCcD_CylAttr::CrossAtTg(const cCcD_CylAttr& other, cXyz* pxyz) const {
     }
 }
 
-/* 8026420C-80264250 25EB4C 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_SphAttrP4cXyz            */
 bool cCcD_CylAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     if (cross(&sphAttr, pxyz)) {
         return true;
@@ -522,8 +463,6 @@ bool cCcD_CylAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80264250-80264288 25EB90 0038+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_CylAttrCFRC12cCcD_TriAttrP4cXyz            */
 bool cCcD_CylAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     if (cM3dGCyl::Cross(triAttr, pxyz)) {
         return true;
@@ -532,8 +471,6 @@ bool cCcD_CylAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80264288-802642CC 25EBC8 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CylAttrPf
- */
 bool cCcD_CylAttr::CrossCo(const cCcD_CylAttr& other, f32* f) const {
     if (cM3dGCyl::Cross(&other, f)) {
         return true;
@@ -542,8 +479,6 @@ bool cCcD_CylAttr::CrossCo(const cCcD_CylAttr& other, f32* f) const {
     }
 }
 
-/* 802642CC-80264310 25EC0C 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_SphAttrPf
- */
 bool cCcD_CylAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* f) const {
     if (cM3dGCyl::Cross(&sphAttr, f)) {
         return true;
@@ -552,8 +487,6 @@ bool cCcD_CylAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* f) const {
     }
 }
 
-/* 80264310-80264368 25EC50 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_CylAttrCFRC12cCcD_CpsAttrPf
- */
 bool cCcD_CylAttr::CrossCo(const cCcD_CpsAttr& cpsAttr, f32* f) const {
     *f = 0.0f;
     cXyz xyz;
@@ -564,7 +497,6 @@ bool cCcD_CylAttr::CrossCo(const cCcD_CpsAttr& cpsAttr, f32* f) const {
     }
 }
 
-/* 80264368-802643D0 25ECA8 0068+00 1/0 1/0 0/0 .text            CalcAabBox__12cCcD_CylAttrFv */
 void cCcD_CylAttr::CalcAabBox() {
     cXyz min;
     cXyz max;
@@ -577,7 +509,6 @@ void cCcD_CylAttr::CalcAabBox() {
     mAab.Set(&min, &max);
 }
 
-/* 802643D0-802644B8 25ED10 00E8+00 1/0 1/0 0/0 .text GetNVec__12cCcD_CylAttrCFRC4cXyzP4cXyz */
 bool cCcD_CylAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     Vec vec;
     if (GetCP()->y > param_0.y) {
@@ -605,8 +536,6 @@ bool cCcD_CylAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     return false;
 }
 
-/* 802644B8-802644EC 25EDF8 0034+00 1/0 1/0 0/0 .text
- * getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape    */
 void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
     pshape->_0 = 1;
     pshape->_4.x = mCenter.x;
@@ -620,8 +549,6 @@ inline bool inlineCross(const cM3dGSph& sph, const cM3dGCps* pcps, cXyz* pxyz) {
     return cM3d_Cross_CpsSph(*pcps, sph, pxyz);
 }
 
-/* 802644EC-80264538 25EE2C 004C+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CpsAttrP4cXyz            */
 bool cCcD_SphAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     if (inlineCross(*this, &cpsAttr, pxyz)) {
         return true;
@@ -630,8 +557,6 @@ bool cCcD_SphAttr::CrossAtTg(const cCcD_CpsAttr& cpsAttr, cXyz* pxyz) const {
     }
 }
 
-/* 80264538-8026457C 25EE78 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_CylAttrP4cXyz            */
 bool cCcD_SphAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     if (cross(&cylAttr, pxyz)) {
         return true;
@@ -640,8 +565,6 @@ bool cCcD_SphAttr::CrossAtTg(const cCcD_CylAttr& cylAttr, cXyz* pxyz) const {
     }
 }
 
-/* 8026457C-802645C0 25EEBC 0044+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_SphAttrP4cXyz            */
 bool cCcD_SphAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     if (cross(&sphAttr, pxyz)) {
         return true;
@@ -650,8 +573,6 @@ bool cCcD_SphAttr::CrossAtTg(const cCcD_SphAttr& sphAttr, cXyz* pxyz) const {
     }
 }
 
-/* 802645C0-802645F8 25EF00 0038+00 1/0 1/0 0/0 .text
- * CrossAtTg__12cCcD_SphAttrCFRC12cCcD_TriAttrP4cXyz            */
 bool cCcD_SphAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     if (triAttr.cM3dGTri::Cross(*this, pxyz)) {
         return true;
@@ -660,8 +581,6 @@ bool cCcD_SphAttr::CrossAtTg(const cCcD_TriAttr& triAttr, cXyz* pxyz) const {
     }
 }
 
-/* 802645F8-80264644 25EF38 004C+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CylAttrPf
- */
 bool cCcD_SphAttr::CrossCo(const cCcD_CylAttr& cylAttr, f32* f) const {
     if (cM3dGSph::Cross(&cylAttr, f)) {
         return true;
@@ -670,8 +589,6 @@ bool cCcD_SphAttr::CrossCo(const cCcD_CylAttr& cylAttr, f32* f) const {
     }
 }
 
-/* 80264644-80264688 25EF84 0044+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_SphAttrPf
- */
 bool cCcD_SphAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* f) const {
     if (cM3dGSph::Cross(&sphAttr, f)) {
         return true;
@@ -680,8 +597,6 @@ bool cCcD_SphAttr::CrossCo(const cCcD_SphAttr& sphAttr, f32* f) const {
     }
 }
 
-/* 80264688-802646E0 25EFC8 0058+00 1/0 1/0 0/0 .text CrossCo__12cCcD_SphAttrCFRC12cCcD_CpsAttrPf
- */
 bool cCcD_SphAttr::CrossCo(const cCcD_CpsAttr& cpsAttr, f32* f) const {
     *f = 0.0f;
     cXyz xyz;
@@ -692,7 +607,6 @@ bool cCcD_SphAttr::CrossCo(const cCcD_CpsAttr& cpsAttr, f32* f) const {
     }
 }
 
-/* 802646E0-8026476C 25F020 008C+00 1/0 2/1 0/0 .text            CalcAabBox__12cCcD_SphAttrFv */
 void cCcD_SphAttr::CalcAabBox() {
     cXyz min;
     cXyz max;
@@ -710,7 +624,6 @@ void cCcD_SphAttr::CalcAabBox() {
     mAab.Set(&min, &max);
 }
 
-/* 8026476C-80264808 25F0AC 009C+00 1/0 1/0 0/0 .text GetNVec__12cCcD_SphAttrCFRC4cXyzP4cXyz */
 bool cCcD_SphAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     param_1->x = param_0.x - mCenter.x;
     param_1->y = param_0.y - mCenter.y;
@@ -727,8 +640,6 @@ bool cCcD_SphAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
     }
 }
 
-/* 80264808-8026483C 25F148 0034+00 1/0 1/0 0/0 .text
- * getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape    */
 void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
     pshape->_0 = 0;
     pshape->_4.x = mCenter.x;
@@ -738,70 +649,57 @@ void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
     pshape->_14 = 0.0f;
 }
 
-/* 8026483C-8026484C 25F17C 0010+00 0/0 1/1 0/0 .text            SetHit__10cCcD_ObjAtFP8cCcD_Obj */
 void cCcD_ObjAt::SetHit(cCcD_Obj* pObj) {
     mRPrm = 1;
     mHitObj = pObj;
 }
 
-/* 8026484C-80264868 25F18C 001C+00 1/1 0/0 0/0 .text            Set__10cCcD_ObjAtFRC13cCcD_SrcObjAt
- */
 void cCcD_ObjAt::Set(const cCcD_SrcObjAt& src) {
     cCcD_ObjCommonBase::Set(src.mBase);
     mType = src.mType;
     mAtp = src.mAtp;
 }
 
-/* 80264868-80264880 25F1A8 0018+00 0/0 2/2 0/0 .text            ClrHit__10cCcD_ObjAtFv */
 void cCcD_ObjAt::ClrHit() {
     mRPrm &= ~1;
     mHitObj = NULL;
 }
 
-/* 80264880-80264894 25F1C0 0014+00 1/1 0/0 0/0 .text            Set__10cCcD_ObjTgFRC13cCcD_SrcObjTg
- */
 void cCcD_ObjTg::Set(const cCcD_SrcObjTg& src) {
     cCcD_ObjCommonBase::Set(src.mBase);
     mType = src.mType;
 }
 
-/* 80264894-802648B0 25F1D4 001C+00 0/0 0/0 2/2 .text            SetGrp__10cCcD_ObjTgFUl */
 void cCcD_ObjTg::SetGrp(u32 grp) {
     mSPrm &= ~0x1E;
     mSPrm |= grp;
 }
 
-/* 802648B0-802648C8 25F1F0 0018+00 0/0 2/2 0/0 .text            ClrHit__10cCcD_ObjTgFv */
 void cCcD_ObjTg::ClrHit() {
     mRPrm &= ~1;
     mHitObj = NULL;
 }
 
-/* 802648C8-802648D8 25F208 0010+00 0/0 1/1 0/0 .text            SetHit__10cCcD_ObjTgFP8cCcD_Obj */
 void cCcD_ObjTg::SetHit(cCcD_Obj* pObj) {
     mRPrm = 1;
     mHitObj = pObj;
 }
 
-/* 802648D8-802648E8 25F218 0010+00 0/0 1/1 0/0 .text            SetHit__10cCcD_ObjCoFP8cCcD_Obj */
 void cCcD_ObjCo::SetHit(cCcD_Obj* pObj) {
     mRPrm = 1;
     mHitObj = pObj;
 }
 
-/* 802648E8-80264900 25F228 0018+00 0/0 2/2 0/0 .text            ClrHit__10cCcD_ObjCoFv */
 void cCcD_ObjCo::ClrHit() {
     mRPrm &= ~1;
     mHitObj = NULL;
 }
 
-/* 80264900-8026491C 25F240 001C+00 0/0 1/1 1/1 .text            SetIGrp__10cCcD_ObjCoFUl */
 void cCcD_ObjCo::SetIGrp(u32 grp) {
     mSPrm &= ~0xE;
     mSPrm |= grp;
 }
 
-/* 8026491C-80264938 25F25C 001C+00 0/0 1/1 7/7 .text            SetVsGrp__10cCcD_ObjCoFUl */
 void cCcD_ObjCo::SetVsGrp(u32 grp) {
     mSPrm &= ~0x70;
     mSPrm |= grp;
diff --git a/src/SSystem/SComponent/c_cc_s.cpp b/src/SSystem/SComponent/c_cc_s.cpp
index 8c6f4bffed..4b47620d78 100644
--- a/src/SSystem/SComponent/c_cc_s.cpp
+++ b/src/SSystem/SComponent/c_cc_s.cpp
@@ -9,10 +9,8 @@
 #define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !isnan(x));
 #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
 
-/* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text            __ct__4cCcSFv */
 cCcS::cCcS() {}
 
-/* 80264A94-80264B60 25F3D4 00CC+00 1/1 1/1 0/0 .text            Ct__4cCcSFv */
 void cCcS::Ct() {
     for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + ARRAY_SIZEU(mpObjAt); ++obj) {
         *obj = NULL;
@@ -35,12 +33,10 @@ void cCcS::Ct() {
     mObjCount = 0;
 }
 
-/* 80264B60-80264B80 25F4A0 0020+00 0/0 1/1 0/0 .text            Dt__4cCcSFv */
 void cCcS::Dt() {
     Ct();
 }
 
-/* 80264B80-80264BA8 25F4C0 0028+00 1/1 0/0 0/0 .text            GetWt__4cCcSCFUc */
 WeightType cCcS::GetWt(u8 param_0) const {
     if (param_0 == 0xFF) {
         return WeightType_0;
@@ -51,7 +47,6 @@ WeightType cCcS::GetWt(u8 param_0) const {
     return WeightType_2;
 }
 
-/* 80264BA8-80264C5C 25F4E8 00B4+00 0/0 7/7 454/454 .text            Set__4cCcSFP8cCcD_Obj */
 void cCcS::Set(cCcD_Obj* obj) {
     if (obj->ChkAtSet()) {
         if (mObjAtCount >= ARRAY_SIZEU(mpObjAt)) {
@@ -96,7 +91,6 @@ void cCcS::Set(cCcD_Obj* obj) {
     }
 }
 
-/* 80264C5C-80264CF0 25F59C 0094+00 1/1 0/0 0/0 .text            ClrCoHitInf__4cCcSFv */
 void cCcS::ClrCoHitInf() {
     for (cCcD_Obj** obj = mpObjCo; obj < mpObjCo + mObjCoCount; ++obj) {
         if (*obj != NULL) {
@@ -110,7 +104,6 @@ void cCcS::ClrCoHitInf() {
     }
 }
 
-/* 80264CF0-80264D90 25F630 00A0+00 1/1 0/0 0/0 .text            ClrTgHitInf__4cCcSFv */
 void cCcS::ClrTgHitInf() {
     for (cCcD_Obj** obj = mpObjTg; obj < mpObjTg + mObjTgCount; ++obj) {
         if (*obj != NULL) {
@@ -124,7 +117,6 @@ void cCcS::ClrTgHitInf() {
     }
 }
 
-/* 80264D90-80264E2C 25F6D0 009C+00 1/1 0/0 0/0 .text            ClrAtHitInf__4cCcSFv */
 void cCcS::ClrAtHitInf() {
     for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + mObjAtCount; ++obj) {
         if (*obj != NULL) {
@@ -138,7 +130,6 @@ void cCcS::ClrAtHitInf() {
     }
 }
 
-/* 80264E2C-80264F40 25F76C 0114+00 1/1 0/0 0/0 .text ChkNoHitAtTg__4cCcSFP8cCcD_ObjP8cCcD_Obj */
 bool cCcS::ChkNoHitAtTg(cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj) {
     fopAc_ac_c* pat_ac = pat_obj->GetAc();
     fopAc_ac_c* ptg_ac = ptg_obj->GetAc();
@@ -153,7 +144,6 @@ bool cCcS::ChkNoHitAtTg(cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj) {
     }
 }
 
-/* 80264F40-8026515C 25F880 021C+00 1/1 0/0 0/0 .text            ChkAtTg__4cCcSFv */
 void cCcS::ChkAtTg() {
     cCcD_Obj** objTgEnd = mpObjTg + mObjTgCount;
     ClrAtHitInf();
@@ -195,7 +185,6 @@ void cCcS::ChkAtTg() {
     }
 }
 
-/* 8026515C-80265230 25FA9C 00D4+00 1/1 0/0 0/0 .text ChkNoHitCo__4cCcSFP8cCcD_ObjP8cCcD_Obj */
 bool cCcS::ChkNoHitCo(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {
     fopAc_ac_c* ac1 = pco1_obj->GetAc();
     fopAc_ac_c* ac2 = pco2_obj->GetAc();
@@ -211,7 +200,6 @@ bool cCcS::ChkNoHitCo(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {
     }
 }
 
-/* 80265230-802653A0 25FB70 0170+00 1/1 0/0 0/0 .text            ChkCo__4cCcSFv */
 void cCcS::ChkCo() {
     ClrCoHitInf();
     if (mObjCoCount <= 1)
@@ -246,15 +234,11 @@ void cCcS::ChkCo() {
     }
 }
 
-/* 802653A0-802653C8 25FCE0 0028+00 1/0 0/0 0/0 .text
- * CalcTgPlusDmg__4cCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts */
 void cCcS::CalcTgPlusDmg(cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj, cCcD_Stts* pat_stts,
                          cCcD_Stts* ptg_stts) {
     ptg_stts->PlusDmg(pat_obj->GetAtAtp());
 }
 
-/* 802653C8-802655E4 25FD08 021C+00 1/1 0/0 0/0 .text
- * SetAtTgCommonHitInf__4cCcSFP8cCcD_ObjP8cCcD_ObjP4cXyz        */
 void cCcS::SetAtTgCommonHitInf(cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj, cXyz* pcross) {
     cCcD_Stts* pat_stts = pat_obj->GetStts();
     cCcD_Stts* ptg_stts = ptg_obj->GetStts();
@@ -279,8 +263,6 @@ void cCcS::SetAtTgCommonHitInf(cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj, cXyz* pcros
     }
 }
 
-/* 802655E4-80265750 25FF24 016C+00 1/1 0/0 0/0 .text
- * SetCoCommonHitInf__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf   */
 void cCcS::SetCoCommonHitInf(cCcD_Obj* pco1_obj, cXyz* ppos1, cCcD_Obj* pco2_obj, cXyz* ppos2,
                              f32 cross_len) {
     bool co2_inf_set = !pco2_obj->ChkCoNoCoHitInfSet();
@@ -303,8 +285,6 @@ void cCcS::SetCoCommonHitInf(cCcD_Obj* pco1_obj, cXyz* ppos1, cCcD_Obj* pco2_obj
                  pco1_stts, pco2_stts, pco1_stts->GetGStts(), pco2_stts->GetGStts());
 }
 
-/* 80265750-80265BB4 260090 0464+00 1/0 0/0 0/0 .text
- * SetPosCorrect__4cCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf       */
 void cCcS::SetPosCorrect(cCcD_Obj* pco1_obj, cXyz* ppos1, cCcD_Obj* pco2_obj, cXyz* ppos2,
                          f32 cross_len) {
     CHECK_FLOAT_CLASS(616, cross_len);
@@ -447,7 +427,6 @@ void cCcS::SetPosCorrect(cCcD_Obj* pco1_obj, cXyz* ppos1, cCcD_Obj* pco2_obj, cX
     }
 }
 
-/* 80265BB4-80265CCC 2604F4 0118+00 1/1 0/0 0/0 .text            CalcArea__4cCcSFv */
 void cCcS::CalcArea() {
     cM3dGAab aab;
     aab.ClearForMinMax();
@@ -474,7 +453,6 @@ void cCcS::CalcArea() {
     }
 }
 
-/* 80265CCC-80265D30 26060C 0064+00 0/0 1/1 0/0 .text            Move__4cCcSFv */
 void cCcS::Move() {
     CalcArea();
     ChkAtTg();
@@ -486,7 +464,6 @@ void cCcS::Move() {
     mObjCount = 0;
 }
 
-/* 80265D30-80265DF4 260670 00C4+00 0/0 1/1 0/0 .text            DrawClear__4cCcSFv */
 void cCcS::DrawClear() {
     for (cCcD_Obj** obj = mpObjAt; obj < mpObjAt + mObjAtCount; ++obj) {
         *obj = NULL;
@@ -510,8 +487,6 @@ void cCcS::DrawClear() {
     mObjCount = 0;
 }
 
-/* 80265DF4-80265DF8 260734 0004+00 1/0 1/0 0/0 .text
- * SetCoGCorrectProc__4cCcSFP8cCcD_ObjP8cCcD_Obj                */
 void cCcS::SetCoGCorrectProc(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {}
 
 /* 80265DF8-80265DFC 260738 0004+00 1/0 0/0 0/0 .text
@@ -529,8 +504,6 @@ void cCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* pat_obj, cCcD_Ob
                           cCcD_Stts* ptg_stts, cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts,
                           cXyz* pcross) {}
 
-/* 80265E00-80265E08 260740 0008+00 1/0 0/0 0/0 .text
- * ChkNoHitGAtTg__4cCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts */
 bool cCcS::ChkNoHitGAtTg(const cCcD_GObjInf* pat_gobj, const cCcD_GObjInf* ptg_gobj,
                          cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts) {
     return false;
@@ -545,10 +518,8 @@ bool cCcS::ChkAtTgHitAfterCross(bool param_0, bool param_1, const cCcD_GObjInf*
     return false;
 }
 
-/* 80265E10-80265E18 260750 0008+00 1/0 0/0 0/0 .text ChkNoHitGCo__4cCcSFP8cCcD_ObjP8cCcD_Obj */
 bool cCcS::ChkNoHitGCo(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {
     return false;
 }
 
-/* 80265E18-80265E1C 260758 0004+00 1/0 0/0 0/0 .text            MoveAfterCheck__4cCcSFv */
 void cCcS::MoveAfterCheck() {}
diff --git a/src/SSystem/SComponent/c_counter.cpp b/src/SSystem/SComponent/c_counter.cpp
index e205ee2fc3..7da967f25f 100644
--- a/src/SSystem/SComponent/c_counter.cpp
+++ b/src/SSystem/SComponent/c_counter.cpp
@@ -5,11 +5,8 @@
 
 #include "SSystem/SComponent/c_counter.h"
 
-/* ############################################################################################## */
-/* 80430CD8-80430CE8 000C+04 s=1 e=12 z=22  None .bss       g_Counter */
 counter_class g_Counter;
 
-/* 80265E1C-80265E64 0048+00 s=0 e=1 z=0  None .text      cCt_Counter__Fi */
 void cCt_Counter(int resetCounter1) {
     if (resetCounter1 == 1) {
         g_Counter.mCounter1 = 0;
@@ -18,4 +15,4 @@ void cCt_Counter(int resetCounter1) {
     }
 
     g_Counter.mCounter0++;
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp
index 482c23b58b..4a867e7431 100644
--- a/src/SSystem/SComponent/c_lib.cpp
+++ b/src/SSystem/SComponent/c_lib.cpp
@@ -7,7 +7,6 @@
 #include "string.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 8026F93C-8026F95C 26A27C 0020+00 0/0 3/3 0/0 .text            cLib_memCpy__FPvPCvUl */
 /**
  * Copies a source block of memory to a destination block of memory
  * @param dst Pointer to destination memory
@@ -18,7 +17,6 @@ void cLib_memCpy(void* dst, const void* src, unsigned long num) {
     memcpy(dst, src, num);
 }
 
-/* 8026F95C-8026F97C 26A29C 0020+00 0/0 4/4 0/0 .text            cLib_memSet__FPviUl */
 /**
  * Sets the first num bytes of given block of memory to specified value
  * @param ptr Pointer to block of memory
@@ -29,7 +27,6 @@ void cLib_memSet(void* ptr, int value, unsigned long num) {
     memset(ptr, value, num);
 }
 
-/* 8026F97C-8026FA3C 26A2BC 00C0+00 0/0 50/50 178/178 .text            cLib_addCalc__FPfffff */
 /**
  * Changes value by step towards target. Step amount is clamped between a min and max, and
  * scaled as a fraction of the remaining distance.
@@ -75,7 +72,6 @@ f32 cLib_addCalc(f32* pvalue, f32 target, f32 scale, f32 maxStep, f32 minStep) {
     return fabsf(target - *pvalue);
 }
 
-/* 8026FA3C-8026FA80 26A37C 0044+00 0/0 20/20 701/701 .text            cLib_addCalc2__FPffff */
 /**
  * Changes value by step towards target. Step amount is clamped between a max and -max, and
  * scaled as a fraction of the remaining distance.
@@ -96,7 +92,6 @@ void cLib_addCalc2(f32* pvalue, f32 target, f32 scale, f32 maxStep) {
     }
 }
 
-/* 8026FA80-8026FAB8 26A3C0 0038+00 0/0 2/2 322/322 .text            cLib_addCalc0__FPfff */
 /**
  * Changes value by step towards zero. Step amount is clamped between a max and -max, and
  * scaled as a fraction of the remaining distance.
@@ -114,7 +109,6 @@ void cLib_addCalc0(f32* pvalue, f32 scale, f32 maxStep) {
     *pvalue -= step;
 }
 
-/* 8026FAB8-8026FDF4 26A3F8 033C+00 0/0 3/3 78/78 .text cLib_addCalcPos__FP4cXyzRC4cXyzfff */
 /**
  * Changes position by step towards target position. Step amount is clamped between a min and max,
  * and scaled as a fraction of the remaining distance.
@@ -149,7 +143,6 @@ f32 cLib_addCalcPos(cXyz* ppos, const cXyz& target, f32 scale, f32 maxStep, f32
     return ppos->abs(target);
 }
 
-/* 8026FDF4-80270178 26A734 0384+00 0/0 1/1 4/4 .text cLib_addCalcPosXZ__FP4cXyzRC4cXyzfff */
 /**
  * Changes position's X/Z components by step towards target position. Step amount is clamped
  * between a min and max, and scaled as a fraction of the remaining distance.
@@ -187,7 +180,6 @@ f32 cLib_addCalcPosXZ(cXyz* ppos, const cXyz& target, f32 scale, f32 maxStep, f3
     return (*ppos - target).absXZ();
 }
 
-/* 80270178-80270350 26AAB8 01D8+00 0/0 2/2 33/33 .text cLib_addCalcPos2__FP4cXyzRC4cXyzff */
 /**
  * Changes position by step towards target position. Step amount is clamped between a max and -max
  * and scaled as a fraction of the remaining distance.
@@ -207,7 +199,6 @@ void cLib_addCalcPos2(cXyz* ppos, const cXyz& target, f32 scale, f32 maxStep) {
     }
 }
 
-/* 80270350-80270540 26AC90 01F0+00 0/0 0/0 4/4 .text cLib_addCalcPosXZ2__FP4cXyzRC4cXyzff */
 /**
  * Changes position's X/Z components by step towards target position. Step amount is clamped between
  * a max and -max and scaled as a fraction of the remaining distance.
@@ -230,8 +221,6 @@ void cLib_addCalcPosXZ2(cXyz* ppos, const cXyz& target, f32 scale, f32 maxStep)
     }
 }
 
-/* 80270540-80270608 26AE80 00C8+00 0/0 81/81 244/244 .text            cLib_addCalcAngleS__FPsssss
- */
 /**
  * Changes angle value by step towards target. Step amount is clamped between a min and max, and
  * scaled as a fraction of the remaining distance.
@@ -273,7 +262,6 @@ s16 cLib_addCalcAngleS(s16* pvalue, s16 target, const s16 scale, s16 maxStep, s1
     return target - *pvalue;
 }
 
-/* 80270608-8027065C 26AF48 0054+00 0/0 2/2 849/849 .text            cLib_addCalcAngleS2__FPssss */
 /**
  * Changes angle value by step towards target angle. Step amount is clamped between a max and -max
  * and scaled as a fraction of the remaining distance.
@@ -294,7 +282,6 @@ void cLib_addCalcAngleS2(s16* pvalue, s16 target, s16 scale, s16 maxStep) {
     }
 }
 
-/* 8027065C-802706D0 26AF9C 0074+00 0/0 3/3 14/14 .text            cLib_chaseUC__FPUcUcUc */
 /**
  * Changes unsigned char value by step towards target
  * @param pvalue Pointer to value to change
@@ -325,7 +312,6 @@ int cLib_chaseUC(u8* pvalue, u8 target, u8 step) {
     return 0;
 }
 
-/* 802706D0-80270740 26B010 0070+00 0/0 4/4 49/49 .text            cLib_chaseS__FPsss */
 /**
  * Changes signed short value by step towards target
  * @param pvalue Pointer to value to change
@@ -349,7 +335,6 @@ int cLib_chaseS(s16* pvalue, s16 target, s16 step) {
     return 0;
 }
 
-/* 80270740-802707AC 26B080 006C+00 0/0 70/70 448/448 .text            cLib_chaseF__FPfff */
 /**
  * Changes float value by step towards target
  * @param pvalue Pointer to value to change
@@ -373,7 +358,6 @@ int cLib_chaseF(f32* pvalue, f32 target, f32 step) {
     return 0;
 }
 
-/* 802707AC-80270990 26B0EC 01E4+00 0/0 3/3 60/60 .text            cLib_chasePos__FP4cXyzRC4cXyzf */
 /**
  * Changes position by step towards target
  * @param pvalue Pointer to position to change
@@ -396,8 +380,6 @@ int cLib_chasePos(cXyz* pvalue, const cXyz& target, f32 step) {
     return 0;
 }
 
-/* 80270990-80270B90 26B2D0 0200+00 0/0 1/0 19/19 .text            cLib_chasePosXZ__FP4cXyzRC4cXyzf
- */
 /**
  * Changes position's X/Z components by step towards target
  * @param pvalue Pointer to position to change
@@ -421,7 +403,6 @@ int cLib_chasePosXZ(cXyz* pvalue, const cXyz& target, f32 step) {
     return 0;
 }
 
-/* 80270B90-80270C04 26B4D0 0074+00 0/0 4/4 213/213 .text            cLib_chaseAngleS__FPsss */
 /**
  * Changes angle value by step towards target
  * @param pvalue Pointer to value to change
@@ -445,7 +426,6 @@ int cLib_chaseAngleS(s16* pvalue, s16 target, s16 step) {
     return 0;
 }
 
-/* 80270C04-80270C3C 26B544 0038+00 0/0 39/39 454/454 .text cLib_targetAngleY__FPC3VecPC3Vec */
 /**
  * Gets the target y-angle from position A to position B
  * @param lhs Pointer to position A
@@ -456,7 +436,6 @@ s16 cLib_targetAngleY(const Vec* lhs, const Vec* rhs) {
     return cM_atan2s(rhs->x - lhs->x, rhs->z - lhs->z);
 }
 
-/* 80270C3C-80270C74 26B57C 0038+00 0/0 0/0 7/7 .text            cLib_targetAngleY__FRC3VecRC3Vec */
 /**
  * Gets the target y-angle from position A to position B
  * @param lhs Reference to position A
@@ -467,7 +446,6 @@ s16 cLib_targetAngleY(const Vec& lhs, const Vec& rhs) {
     return cM_atan2s(rhs.x - lhs.x, rhs.z - lhs.z);
 }
 
-/* 80270C74-80270DC0 26B5B4 014C+00 0/0 2/2 109/109 .text cLib_targetAngleX__FPC4cXyzPC4cXyz */
 /**
  * Gets the target x-angle from position A to position B
  * @param lhs Pointer to position A
@@ -480,8 +458,6 @@ s16 cLib_targetAngleX(cXyz const* lhs, cXyz const* rhs) {
     return cM_atan2s(diff.y, f1);
 }
 
-/* 80270DC0-80270E24 26B700 0064+00 0/0 2/2 118/118 .text cLib_offsetPos__FP4cXyzPC4cXyzsPC4cXyz
- */
 /**
  * Adds an offset to a source position in a given angle direction and places the result in pdest
  * @param pdest The resulting position
@@ -497,7 +473,6 @@ void cLib_offsetPos(cXyz* pdest, cXyz const* psrc, s16 angle, cXyz const* vec) {
     pdest->z = psrc->z + (vec->z * cos - vec->x * sin);
 }
 
-/* 80270E24-80270E4C 26B764 0028+00 0/0 48/48 71/71 .text            cLib_distanceAngleS__Fss */
 /**
  * Gets the target x-angle from position A to position B
  * @param lhs Pointer to position A
@@ -508,13 +483,10 @@ s32 cLib_distanceAngleS(s16 x, s16 y) {
     return abs(static_cast<s16>(x - y));
 }
 
-/* 80430DB8-80430F98 05DAD8 01E0+00 2/1 0/0 0/0 .bss             mtx */
 static Mtx mtx[10];
 
-/* 80450768-80450770 -00001 0004+04 6/6 2/2 695/695 .sdata           calc_mtx */
 Mtx* calc_mtx = mtx;
 
-/* 80270E4C-80270E5C 26B78C 0010+00 0/0 1/1 0/0 .text            MtxInit__Fv */
 /**
  * Initializes calc_mtx to mtx stack
  */
@@ -522,7 +494,6 @@ void MtxInit() {
     calc_mtx = mtx;
 }
 
-/* 80270E5C-80270EA4 26B79C 0048+00 0/0 0/0 43/43 .text            MtxTrans__FfffUc */
 void MtxTrans(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) {
     if (param_3 == 0) {
         MTXTrans(*calc_mtx, x_trans, y_trans, z_trans);
@@ -533,7 +504,6 @@ void MtxTrans(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) {
     }
 }
 
-/* 80270EA4-80270EEC 26B7E4 0048+00 0/0 0/0 46/46 .text            MtxScale__FfffUc */
 void MtxScale(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) {
     if (param_3 == 0) {
         MTXScale(*calc_mtx, x_trans, y_trans, z_trans);
@@ -544,7 +514,6 @@ void MtxScale(f32 x_trans, f32 y_trans, f32 z_trans, u8 param_3) {
     }
 }
 
-/* 80270EEC-80270F1C 26B82C 0030+00 0/0 2/2 615/615 .text            MtxPosition__FP4cXyzP4cXyz */
 /**
  * Multiplies a src position by the calc_mtx and puts the result in dest
  * @param src The src position to be multiplied
@@ -554,7 +523,6 @@ void MtxPosition(cXyz* src, cXyz* dest) {
     MTXMultVec(*calc_mtx, src, dest);
 }
 
-/* 80270F1C-80270F58 26B85C 003C+00 0/0 0/0 20/20 .text            MtxPush__Fv */
 void MtxPush() {
     Mtx mtx;
     MTXCopy(*calc_mtx, mtx);
@@ -562,7 +530,6 @@ void MtxPush() {
     MTXCopy(mtx, *calc_mtx);
 }
 
-/* 80270F58-80270F68 26B898 0010+00 0/0 0/0 20/20 .text            MtxPull__Fv */
 Mtx* MtxPull() {
     return calc_mtx--;
 }
diff --git a/src/SSystem/SComponent/c_list.cpp b/src/SSystem/SComponent/c_list.cpp
index 72cce7dd9a..57f49cec1a 100644
--- a/src/SSystem/SComponent/c_list.cpp
+++ b/src/SSystem/SComponent/c_list.cpp
@@ -7,14 +7,12 @@
 #include "SSystem/SComponent/c_node.h"
 #include <dolphin/types.h>
 
-/* 80265E64-80265E78 0014+00 s=1 e=0 z=0  None .text      cLs_Init__FP15node_list_class */
 void cLs_Init(node_list_class* list) {
     list->mpHead = NULL;
     list->mpTail = NULL;
     list->mSize = 0;
 }
 
-/* 80265E78-80265EFC 0084+00 s=1 e=4 z=0  None .text      cLs_SingleCut__FP10node_class */
 int cLs_SingleCut(node_class* node) {
     node_list_class* list = (node_list_class*)node->mpData;
 
@@ -36,8 +34,6 @@ int cLs_SingleCut(node_class* node) {
     return ret;
 }
 
-/* 80265EFC-80265F70 0074+00 s=1 e=4 z=0  None .text
- * cLs_Addition__FP15node_list_classP10node_class               */
 int cLs_Addition(node_list_class* list, node_class* node) {
     if (list->mpTail == NULL) {
         list->mpHead = node;
@@ -51,8 +47,6 @@ int cLs_Addition(node_list_class* list, node_class* node) {
     return list->mSize;
 }
 
-/* 80265F70-80265FF8 0088+00 s=0 e=1 z=0  None .text cLs_Insert__FP15node_list_classiP10node_class
- */
 int cLs_Insert(node_list_class* list, int idx, node_class* node) {
     node_class* pExisting = cNd_Order(list->mpHead, idx);
     if (pExisting == NULL) {
@@ -66,7 +60,6 @@ int cLs_Insert(node_list_class* list, int idx, node_class* node) {
     return list->mSize;
 }
 
-/* 80265FF8-80266040 0048+00 s=0 e=1 z=0  None .text      cLs_GetFirst__FP15node_list_class */
 node_class* cLs_GetFirst(node_list_class* list) {
     if (list->mSize != 0) {
         node_class* pHead = list->mpHead;
@@ -77,7 +70,6 @@ node_class* cLs_GetFirst(node_list_class* list) {
     return NULL;
 }
 
-/* 80266040-80266060 0020+00 s=0 e=4 z=0  None .text      cLs_Create__FP15node_list_class */
 void cLs_Create(node_list_class* list) {
     cLs_Init(list);
 }
diff --git a/src/SSystem/SComponent/c_list_iter.cpp b/src/SSystem/SComponent/c_list_iter.cpp
index 13b9e430b1..19e502ba7b 100644
--- a/src/SSystem/SComponent/c_list_iter.cpp
+++ b/src/SSystem/SComponent/c_list_iter.cpp
@@ -7,8 +7,6 @@
 #include "SSystem/SComponent/c_list.h"
 #include "dolphin/types.h"
 
-/* 80266060-80266098 0038+00 s=0 e=5 z=0  None .text
- * cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv       */
 int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) {
     if (list->mSize > 0)
         return cNdIt_Method(list->mpHead, method, data);
@@ -16,11 +14,9 @@ int cLsIt_Method(node_list_class* list, cNdIt_MethodFunc method, void* data) {
         return 1;
 }
 
-/* 80266098-802660D0 0038+00 s=0 e=4 z=0  None .text
- * cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv       */
 void* cLsIt_Judge(node_list_class* list, cNdIt_JudgeFunc judge, void* data) {
     if (list->mSize > 0)
         return cNdIt_Judge(list->mpHead, judge, data);
     else
         return NULL;
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_m2d.cpp b/src/SSystem/SComponent/c_m2d.cpp
index 17bd3ae3af..9629819e55 100644
--- a/src/SSystem/SComponent/c_m2d.cpp
+++ b/src/SSystem/SComponent/c_m2d.cpp
@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_m3d_g_cir.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80268260-80268560 262BA0 0300+00 0/0 4/4 0/0 .text cM2d_CrossCirLin__FR8cM2dGCirffffPfPf */
 void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                       f32* param_5, f32* param_6) {
     int ans = 0;
diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp
index dc332909e6..1eea1ff0d9 100644
--- a/src/SSystem/SComponent/c_m3d.cpp
+++ b/src/SSystem/SComponent/c_m3d.cpp
@@ -12,26 +12,20 @@
 #include "SSystem/SComponent/c_math.h"
 #include "SSystem/SComponent/c_sxyz.h"
 
-/* 80451180-80451188 000680 0004+04 29/29 44/44 65/65 .sbss            G_CM3D_F_ABS_MIN */
 const f32 G_CM3D_F_ABS_MIN = 32 * FLT_EPSILON;
 
-/* 80268560-802685B0 262EA0 0050+00 2/2 0/0 0/0 .text            cM3d_InDivPos1__FPC3VecPC3VecfP3Vec
- */
 void cM3d_InDivPos1(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) {
     Vec tmp;
     VECScale(pVecB, &tmp, pF);
     VECAdd(&tmp, pVecA, pOut);
 }
 
-/* 802685B0-80268614 262EF0 0064+00 2/2 1/1 2/2 .text            cM3d_InDivPos2__FPC3VecPC3VecfP3Vec
- */
 void cM3d_InDivPos2(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) {
     Vec tmp;
     VECSubtract(pVecB, pVecA, &tmp);
     cM3d_InDivPos1(pVecA, &tmp, pF, pOut);
 }
 
-/* 80268614-8026862C 262F54 0018+00 3/3 4/4 0/0 .text            cM3d_Len2dSq__Fffff */
 f32 cM3d_Len2dSq(f32 pX1, f32 pY1, f32 pX2, f32 pY2) {
     f32 xDiff = pX1 - pX2;
     f32 yDiff = pY1 - pY2;
@@ -42,8 +36,6 @@ static f32 dummy(f32 x) {
     return sqrtf(x);
 }
 
-/* 8026862C-80268710 262F6C 00E4+00 0/0 10/10 3/3 .text cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf
- */
 bool cM3d_Len2dSqPntAndSegLine(f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 p5, f32 p6,
                                f32* param_7, f32* param_8, f32* param_9) {
     bool retVal = false;
@@ -65,8 +57,6 @@ bool cM3d_Len2dSqPntAndSegLine(f32 param_1, f32 param_2, f32 param_3, f32 param_
     }
 }
 
-/* 80268710-80268814 263050 0104+00 2/2 8/8 9/9 .text
- * cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf         */
 bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin* pLine, const Vec* pVec, Vec* pOutVec, f32* pOutF) {
     bool retVal = false;
     Vec tmp;
@@ -92,8 +82,6 @@ bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin* pLine, const Vec* pVec, Vec* pOut
     }
 }
 
-/* 80268814-80268894 263154 0080+00 1/1 3/3 0/0 .text cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec
- */
 f32 cM3d_SignedLenPlaAndPos(const cM3dGPla* pPlane, const Vec* pPosition) {
     f32 mag = VECMag(pPlane->GetNP());
     if (cM3d_IsZero(mag)) {
@@ -103,13 +91,10 @@ f32 cM3d_SignedLenPlaAndPos(const cM3dGPla* pPlane, const Vec* pPosition) {
     }
 }
 
-/* 80268894-802688B4 2631D4 0020+00 11/11 2/2 2/2 .text            cM3d_VectorProduct2d__Fffffff */
 f32 cM3d_VectorProduct2d(f32 pX1, f32 pY1, f32 pX2, f32 pY2, f32 pX3, f32 pY3) {
     return (pX2 - pX1) * (pY3 - pY1) - (pY2 - pY1) * (pX3 - pX1);
 }
 
-/* 802688B4-8026891C 2631F4 0068+00 0/0 0/0 1/1 .text
- * cM3d_VectorProduct__FPC4cXyzPC4cXyzPC4cXyzP4cXyz             */
 void cM3d_VectorProduct(const cXyz* pVecA, const cXyz* pVecB, const cXyz* pVecC, cXyz* pVecOut) {
     Vec tmp1;
     Vec tmp2;
@@ -118,7 +103,6 @@ void cM3d_VectorProduct(const cXyz* pVecA, const cXyz* pVecB, const cXyz* pVecC,
     VECCrossProduct(&tmp1, &tmp2, pVecOut);
 }
 
-/* 8026891C-802689E8 26325C 00CC+00 0/0 2/2 0/0 .text cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf */
 void cM3d_CalcPla(const Vec* pVecA, const Vec* pVecB, const Vec* pVecC, Vec* pVecOut, f32* pD) {
     Vec tmp2;
     Vec tmp1;
@@ -151,8 +135,6 @@ inline bool cM3d_CrossNumSection(f32 lMinX, f32 lMaxX, f32 rMinX, f32 rMaxX) {
     }
 }
 
-/* 802689E8-80268B0C 263328 0124+00 0/0 4/4 0/0 .text cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab
- */
 bool cM3d_Cross_AabAab(const cM3dGAab* pAabA, const cM3dGAab* pAabB) {
     if (cM3d_CrossNumSection(pAabA->GetMinP()->x, pAabA->GetMaxP()->x, pAabB->GetMinP()->x,
                              pAabB->GetMaxP()->x) &&
@@ -167,8 +149,6 @@ bool cM3d_Cross_AabAab(const cM3dGAab* pAabA, const cM3dGAab* pAabB) {
     }
 }
 
-/* 80268B0C-80268BB4 26344C 00A8+00 0/0 4/4 0/0 .text cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl
- */
 bool cM3d_Cross_AabCyl(const cM3dGAab* pAab, const cM3dGCyl* pCyl) {
     if (pAab->GetMinP()->x > pCyl->GetCP()->x + pCyl->GetR()) {
         return false;
@@ -187,8 +167,6 @@ bool cM3d_Cross_AabCyl(const cM3dGAab* pAab, const cM3dGCyl* pCyl) {
     }
 }
 
-/* 80268BB4-80268C5C 2634F4 00A8+00 0/0 2/2 0/0 .text cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph
- */
 bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) {
     f32 radius = pSph->GetR();
     f32 cx = pSph->GetC().x;
@@ -214,8 +192,6 @@ bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) {
     return true;
 }
 
-/* 80268C5C-80268ED4 26359C 0278+00 3/3 0/0 0/0 .text
- * cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf               */
 int cM3d_Check_LinLin(const cM3dGLin* lin_a, const cM3dGLin* lin_b, f32* dst_a, f32* dst_b) {
     Vec linAVec;
     Vec linBVec;
@@ -268,8 +244,6 @@ int cM3d_Check_LinLin(const cM3dGLin* lin_a, const cM3dGLin* lin_b, f32* dst_a,
 }
 
 
-/* 80268ED4-80268F34 263814 0060+00 2/2 0/0 0/0 .text
- * cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec       */
 static bool cM3d_CrossInfLineVsInfPlane_proc(f32 pFloatA, f32 pFloatB, const Vec* pVecA,
                                              const Vec* pVecB, Vec* pVecOut) {
     if (cM3d_IsZero(pFloatA - pFloatB)) {
@@ -281,8 +255,6 @@ static bool cM3d_CrossInfLineVsInfPlane_proc(f32 pFloatA, f32 pFloatB, const Vec
     }
 }
 
-/* 80268F34-80269050 263874 011C+00 3/3 1/1 0/0 .text
- * cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb            */
 bool cM3d_Cross_LinPla(const cM3dGLin* lin, const cM3dGPla* pla, Vec* dst, bool a, bool b) {
     f32 startVal = pla->getPlaneFunc(&lin->GetStartP());
     f32 endVal = pla->getPlaneFunc(&lin->GetEndP());
@@ -304,82 +276,56 @@ bool cM3d_Cross_LinPla(const cM3dGLin* lin, const cM3dGPla* pla, Vec* dst, bool
     }
 }
 
-/* 80455140-80455144 003740 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE0 */
 static u32 const BPCP_OUTCODE0 = 0x00000001;
 
-/* 80455144-80455148 003744 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE1 */
 static u32 const BPCP_OUTCODE1 = 0x00000002;
 
-/* 80455148-8045514C 003748 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE4 */
 static u32 const BPCP_OUTCODE4 = 0x00000010;
 
-/* 8045514C-80455150 00374C 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE5 */
 static u32 const BPCP_OUTCODE5 = 0x00000020;
 
-/* 80455150-80455154 003750 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE2 */
 static u32 const BPCP_OUTCODE2 = 0x00000004;
 
-/* 80455154-80455158 003754 0004+00 1/1 0/0 0/0 .sdata2          BPCP_OUTCODE3 */
 static u32 const BPCP_OUTCODE3 = 0x00000008;
 
-/* 80455158-8045515C 003758 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE0 */
 static u32 const BEVEL2D_OUTCODE0 = 0x00000001;
 
-/* 8045515C-80455160 00375C 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE1 */
 static u32 const BEVEL2D_OUTCODE1 = 0x00000002;
 
-/* 80455160-80455164 003760 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE2 */
 static u32 const BEVEL2D_OUTCODE2 = 0x00000004;
 
-/* 80455164-80455168 003764 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE3 */
 static u32 const BEVEL2D_OUTCODE3 = 0x00000008;
 
-/* 80455168-8045516C 003768 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE4 */
 static u32 const BEVEL2D_OUTCODE4 = 0x00000010;
 
-/* 8045516C-80455170 00376C 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE5 */
 static u32 const BEVEL2D_OUTCODE5 = 0x00000020;
 
-/* 80455170-80455174 003770 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE6 */
 static u32 const BEVEL2D_OUTCODE6 = 0x00000040;
 
-/* 80455174-80455178 003774 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE7 */
 static u32 const BEVEL2D_OUTCODE7 = 0x00000080;
 
-/* 80455178-8045517C 003778 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE8 */
 static u32 const BEVEL2D_OUTCODE8 = 0x00000100;
 
-/* 8045517C-80455180 00377C 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE9 */
 static u32 const BEVEL2D_OUTCODE9 = 0x00000200;
 
-/* 80455180-80455184 003780 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE10 */
 static u32 const BEVEL2D_OUTCODE10 = 0x00000400;
 
-/* 80455184-80455188 003784 0004+00 1/1 0/0 0/0 .sdata2          BEVEL2D_OUTCODE11 */
 static u32 const BEVEL2D_OUTCODE11 = 0x00000800;
 
-/* 80455188-8045518C 003788 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE0 */
 static u32 const BEVEL3D_OUTCODE0 = 0x00000001;
 
-/* 8045518C-80455190 00378C 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE1 */
 static u32 const BEVEL3D_OUTCODE1 = 0x00000002;
 
-/* 80455190-80455194 003790 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE2 */
 static u32 const BEVEL3D_OUTCODE2 = 0x00000004;
 
-/* 80455194-80455198 003794 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE3 */
 static u32 const BEVEL3D_OUTCODE3 = 0x00000008;
 
-/* 80455198-8045519C 003798 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE4 */
 static u32 const BEVEL3D_OUTCODE4 = 0x00000010;
 
-/* 8045519C-804551A0 00379C 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE5 */
 static u32 const BEVEL3D_OUTCODE5 = 0x00000020;
 
-/* 804551A0-804551A4 0037A0 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE6 */
 static u32 const BEVEL3D_OUTCODE6 = 0x00000040;
 
-/* 804551A4-804551A8 0037A4 0004+00 1/1 0/0 0/0 .sdata2          BEVEL3D_OUTCODE7 */
 static u32 const BEVEL3D_OUTCODE7 = 0x00000080;
 
 inline u32 cM3d_CheckBoxEdgePlane_Bevel2DCheck(Vec const* param_0, Vec const* param_1,
@@ -454,8 +400,6 @@ inline u32 cM3d_CheckBoxEdgePlane_Bevel3DCheck(Vec const* param_0, Vec const* pa
     return ret;
 }
 
-/* 80269050-80269C2C 263990 0BDC+00 0/0 2/2 0/0 .text
- * cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec          */
 bool cM3d_Cross_MinMaxBoxLine(Vec const* param_0, Vec const* param_1, Vec const* param_2,
                               Vec const* param_3) {
     u32 uVar3 = 0;
@@ -623,8 +567,6 @@ bool cM3d_Cross_MinMaxBoxLine(Vec const* param_0, Vec const* param_1, Vec const*
     return false;
 }
 
-/* 80269C2C-80269D64 26456C 0138+00 1/1 0/0 0/0 .text
- * cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf */
 bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec* pVecA, const Vec* pVecB, const Vec* pVecC,
                                        const Vec* pVecD, f32 pF) {
     f32 min, max;
@@ -678,8 +620,6 @@ bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec* pVecA, const Vec* pVecB, const
     return true;
 }
 
-/* 80269D64-80269E18 2646A4 00B4+00 11/11 0/0 0/0 .text
- * cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff                */
 static bool cM3d_InclusionCheckPosIn3PosBox2d(f32 param_1, f32 param_2, f32 param_3,
                                               f32 param_4, f32 param_5, f32 param_6,
                                               f32 param_7, f32 param_8, f32 param_9) {
@@ -726,7 +666,6 @@ static bool cM3d_InclusionCheckPosIn3PosBox2d(f32 param_1, f32 param_2, f32 para
     return true;
 }
 
-/* 80269E18-80269FBC 264758 01A4+00 1/1 0/0 0/0 .text cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf */
 static bool cM3d_CrossX_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     if (cM3d_IsZero(tri->GetNP()->x)) {
         return false;
@@ -756,8 +695,6 @@ static bool cM3d_CrossX_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     return false;
 }
 
-/* 80269FBC-8026A160 2648FC 01A4+00 1/1 0/0 0/0 .text            cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_CrossX_Tri(cM3dGTri const* tri, Vec const* vec) {
     if (cM3d_IsZero(tri->GetNP()->x)) {
         return false;
@@ -787,8 +724,6 @@ static bool cM3d_CrossX_Tri(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026A160-8026A2E4 264AA0 0184+00 1/1 0/0 0/0 .text cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_CrossX_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     if (!cM3d_InclusionCheckPosIn3PosBox2d(tri->mA.y, tri->mA.z, tri->mB.y, tri->mB.z,
                                            tri->mC.y, tri->mC.z, vec->y, vec->z, 0.005f)) {
@@ -814,8 +749,6 @@ static bool cM3d_CrossX_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026A2E4-8026A488 264C24 01A4+00 2/2 0/0 1/1 .text            cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec
- */
 bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec) {
     if (cM3d_IsZero(tri->GetNP()->y)) {
         return false;
@@ -845,8 +778,6 @@ bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026A488-8026A60C 264DC8 0184+00 1/1 0/0 0/0 .text cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_CrossY_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     if (!cM3d_InclusionCheckPosIn3PosBox2d(tri->mA.z, tri->mA.x, tri->mB.z, tri->mB.x,
                                            tri->mC.z, tri->mC.x, vec->z, vec->x, 0.005f)) {
@@ -872,8 +803,6 @@ static bool cM3d_CrossY_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026A60C-8026A7B8 264F4C 01AC+00 0/0 2/2 0/0 .text
- * cM3d_CrossY_Tri__FRC3VecRC3VecRC3VecRC8cM3dGPlaPC3Vec        */
 bool cM3d_CrossY_Tri(Vec const& a, Vec const& b, Vec const& c, cM3dGPla const& plane,
                      Vec const* vec) {
     if (cM3d_IsZero(plane.mNormal.y)) {
@@ -904,8 +833,6 @@ bool cM3d_CrossY_Tri(Vec const& a, Vec const& b, Vec const& c, cM3dGPla const& p
     return false;
 }
 
-/* 8026A7B8-8026A8C0 2650F8 0108+00 0/0 1/1 0/0 .text
- * cM3d_CrossY_Tri_Front__FRC3VecRC3VecRC3VecPC3Vec             */
 bool cM3d_CrossY_Tri_Front(Vec const& a, Vec const& b, Vec const& c, Vec const* vec) {
     if (!cM3d_InclusionCheckPosIn3PosBox2d(a.z, a.x, b.z, b.x,
                                            c.z, c.x, vec->z, vec->x, 0.005f)) {
@@ -922,7 +849,6 @@ bool cM3d_CrossY_Tri_Front(Vec const& a, Vec const& b, Vec const& c, Vec const*
     return false;
 }
 
-/* 8026A8C0-8026A944 265200 0084+00 1/1 0/0 0/0 .text cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf */
 static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, f32* param_2) {
     if (cM3d_CrossY_Tri(tri, vec)) {
         *param_2 = (vec->x * -tri->GetNP()->x - vec->z * tri->GetNP()->z - tri->GetD()) / tri->GetNP()->y;
@@ -932,7 +858,6 @@ static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, f32* param_2) {
     return false;
 }
 
-/* 8026A944-8026AAE8 265284 01A4+00 1/1 0/0 0/0 .text cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf */
 static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     if (cM3d_IsZero(tri->GetNP()->y)) {
         return false;
@@ -962,8 +887,6 @@ static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     return false;
 }
 
-/* 8026AAE8-8026ABD8 265428 00F0+00 1/1 0/0 0/0 .text
- * cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf          */
 static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, cM3d_Range const* range,
                             f32* param_3) {
     if (cM3d_IsZero(tri->GetNP()->y)) {
@@ -985,7 +908,6 @@ static bool cM3d_CrossY_Tri(cM3dGTri const* tri, Vec const* vec, cM3d_Range cons
     return cM3d_CrossY_Tri(tri, vec, param_3);
 }
 
-/* 8026ABD8-8026AD7C 265518 01A4+00 1/1 0/0 0/0 .text cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf */
 static bool cM3d_CrossZ_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     if (cM3d_IsZero(tri->GetNP()->z)) {
         return false;
@@ -1015,8 +937,6 @@ static bool cM3d_CrossZ_Tri(cM3dGTri const* tri, Vec const* vec, f32 param_2) {
     return false;
 }
 
-/* 8026AD7C-8026AF20 2656BC 01A4+00 1/1 0/0 0/0 .text            cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_CrossZ_Tri(cM3dGTri const* tri, Vec const* vec) {
     if (cM3d_IsZero(tri->GetNP()->z)) {
         return false;
@@ -1046,8 +966,6 @@ static bool cM3d_CrossZ_Tri(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026AF20-8026B0A4 265860 0184+00 1/1 0/0 0/0 .text cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_CrossZ_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     if (!cM3d_InclusionCheckPosIn3PosBox2d(tri->mA.x, tri->mA.y, tri->mB.x, tri->mB.y,
                                            tri->mC.x, tri->mC.y, vec->x, vec->y, 0.005f)) {
@@ -1073,8 +991,6 @@ static bool cM3d_CrossZ_LinTri_proc(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026B0A4-8026B17C 2659E4 00D8+00 1/1 1/1 0/0 .text
- * cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb            */
 bool cM3d_Cross_LinTri(cM3dGLin const* line, cM3dGTri const* tri, Vec* vec, bool param_3,
                        bool param_4) {
     if (!cM3d_Cross_LinPla(line, tri, vec, param_3, param_4)) {
@@ -1091,8 +1007,6 @@ bool cM3d_Cross_LinTri(cM3dGLin const* line, cM3dGTri const* tri, Vec* vec, bool
     return false;
 }
 
-/* 8026B17C-8026B238 265ABC 00BC+00 1/1 0/0 0/0 .text cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec
- */
 static bool cM3d_Cross_LinTri_Easy(cM3dGTri const* tri, Vec const* vec) {
     if ((cM3d_IsZero(tri->GetNP()->x) || cM3d_CrossX_Tri(tri, vec))
         && (cM3d_IsZero(tri->GetNP()->y) || cM3d_CrossY_Tri(tri, vec))
@@ -1104,13 +1018,10 @@ static bool cM3d_Cross_LinTri_Easy(cM3dGTri const* tri, Vec const* vec) {
     return false;
 }
 
-/* 8026B238-8026B280 265B78 0048+00 1/1 0/0 0/0 .text cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec */
 static bool cM3d_Cross_SphPnt(cM3dGSph const* sph, Vec const* point) {
     return cM3d_LenSq(sph->GetCP(), point) <= sph->GetR() * sph->GetR();
 }
 
-/* 8026B280-8026B4E8 265BC0 0268+00 1/1 0/0 2/2 .text
- * cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec              */
 bool cM3d_Cross_LinSph(cM3dGLin const* line, cM3dGSph const* sph, Vec* param_2) {
     Vec lin_vec;
     cXyz vec;
@@ -1179,8 +1090,6 @@ bool cM3d_Cross_LinSph(cM3dGLin const* line, cM3dGSph const* sph, Vec* param_2)
     return false;
 }
 
-/* 8026B4E8-8026B8A4 265E28 03BC+00 1/1 2/2 0/0 .text
- * cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec */
 int cM3d_Cross_LinSph_CrossPos(cM3dGSph const& sph, cM3dGLin const& line, Vec* param_2,
                                Vec* param_3) {
     int ret;
@@ -1225,8 +1134,6 @@ int cM3d_Cross_LinSph_CrossPos(cM3dGSph const& sph, cM3dGLin const& line, Vec* p
     return ret;
 }
 
-/* 8026B8A4-8026BA48 2661E4 01A4+00 0/0 2/2 0/0 .text cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf
- */
 bool cM3d_Cross_CylSph(cM3dGCyl const* cyl, cM3dGSph const* sph, f32* param_2) {
     const cXyz* sph_center = sph->GetCP();
     const cXyz* cyl_center = cyl->GetCP();
@@ -1247,8 +1154,6 @@ bool cM3d_Cross_CylSph(cM3dGCyl const* cyl, cM3dGSph const* sph, f32* param_2) {
     return false;
 }
 
-/* 8026BA48-8026BC7C 266388 0234+00 1/1 2/2 0/0 .text
- * cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf            */
 bool cM3d_Cross_CylSph(cM3dGCyl const* cyl, cM3dGSph const* sph, Vec* param_2, f32* param_3) {
     const Vec* sph_center = sph->GetCP();
     const Vec* cyl_center = cyl->GetCP();
@@ -1282,8 +1187,6 @@ bool cM3d_Cross_CylSph(cM3dGCyl const* cyl, cM3dGSph const* sph, Vec* param_2, f
     return false;
 }
 
-/* 8026BC7C-8026BCFC 2665BC 0080+00 0/0 1/1 0/0 .text cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf
- */
 bool cM3d_Cross_SphSph(cM3dGSph const* sph1, cM3dGSph const* sph2, f32* param_2) {
     Vec delta;
     VECSubtract(sph1->GetCP(), sph2->GetCP(), &delta);
@@ -1297,8 +1200,6 @@ bool cM3d_Cross_SphSph(cM3dGSph const* sph1, cM3dGSph const* sph2, f32* param_2)
     }
 }
 
-/* 8026BCFC-8026BD88 26663C 008C+00 1/1 0/0 0/0 .text
- * cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf               */
 static bool cM3d_Cross_SphSph(cM3dGSph const* sph1, cM3dGSph const* sph2, f32* param_2,
                               f32* param_3) {
     Vec delta;
@@ -1313,8 +1214,6 @@ static bool cM3d_Cross_SphSph(cM3dGSph const* sph1, cM3dGSph const* sph2, f32* p
     }
 }
 
-/* 8026BD88-8026BE5C 2666C8 00D4+00 0/0 1/1 0/0 .text
- * cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec              */
 bool cM3d_Cross_SphSph(const cM3dGSph* pSphereA, const cM3dGSph* pSphereB, Vec* pVecOut) {
     f32 centerDist;
     f32 overlapLen;
@@ -1335,8 +1234,6 @@ bool cM3d_Cross_SphSph(const cM3dGSph* pSphereA, const cM3dGSph* pSphereB, Vec*
     }
 }
 
-/* 8026BE5C-8026BF04 26679C 00A8+00 1/1 0/0 0/0 .text
- * cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec    */
 void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph* pSphere, const cM3dGTri* pTriangle, Vec* pVecOut) {
     Vec tmp2;
     Vec tmp;
@@ -1350,8 +1247,6 @@ void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph* pSphere, const cM3dGTri* pTrian
     }
 }
 
-/* 8026BF04-8026C22C 266844 0328+00 1/1 4/4 0/0 .text
- * cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec              */
 bool cM3d_Cross_SphTri(cM3dGSph const* sph, cM3dGTri const* tri, Vec* param_2) {
     if (!cM3d_InclusionCheckPosIn3PosBox3d(&tri->mA, &tri->mB, &tri->mC, sph->GetCP(), sph->GetR())) {
         return false;
@@ -1416,8 +1311,6 @@ bool cM3d_Cross_SphTri(cM3dGSph const* sph, cM3dGTri const* tri, Vec* param_2) {
     return false;
 }
 
-/* 8026C22C-8026C3B4 266B6C 0188+00 0/0 1/1 0/0 .text cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf
- */
 bool cM3d_Cross_CylCyl(cM3dGCyl const* cyl1, cM3dGCyl const* cyl2, f32* param_2) {
     const Vec& center1 = cyl1->GetC();
     const Vec& center2 = cyl2->GetC();
@@ -1440,8 +1333,6 @@ bool cM3d_Cross_CylCyl(cM3dGCyl const* cyl1, cM3dGCyl const* cyl2, f32* param_2)
     return true;
 }
 
-/* 8026C3B4-8026C5D0 266CF4 021C+00 0/0 1/1 0/0 .text
- * cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec              */
 bool cM3d_Cross_CylCyl(cM3dGCyl const* cyl1, cM3dGCyl const* cyl2, Vec* param_2) {
     const Vec& center1 = cyl1->GetC();
     const Vec& center2 = cyl2->GetC();
@@ -1480,8 +1371,6 @@ bool cM3d_Cross_CylCyl(cM3dGCyl const* cyl1, cM3dGCyl const* cyl2, Vec* param_2)
     return true;
 }
 
-/* 8026C5D0-8026C944 266F10 0374+00 0/0 2/2 0/0 .text
- * cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec              */
 bool cM3d_Cross_CylTri(cM3dGCyl const* cyl, cM3dGTri const* tri, Vec* param_2) {
     const Vec& center = cyl->GetC();
     f32 top_y = center.y + cyl->GetH();
@@ -1544,8 +1433,6 @@ bool cM3d_Cross_CylTri(cM3dGCyl const* cyl, cM3dGTri const* tri, Vec* param_2) {
     return false;
 }
 
-/* 8026C944-8026D044 267284 0700+00 1/1 2/2 1/1 .text
- * cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec         */
 int cM3d_Cross_CylLin(cM3dGCyl const* cyl, cM3dGLin const* line, Vec* param_2, Vec* param_3) {
     f32 ratio;
     f32 f2;
@@ -1720,8 +1607,6 @@ int cM3d_Cross_CylLin(cM3dGCyl const* cyl, cM3dGLin const* line, Vec* param_2, V
     return count;
 }
 
-/* 8026D044-8026D0B0 267984 006C+00 1/1 0/0 0/0 .text
- * cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec     */
 static int cM3d_Cross_CylPntPnt(const cM3dGCyl* pCylinder, const Vec* pVecStart, const Vec* pVecEnd,
                                 Vec* pVecOutA, Vec* pVecOutB) {
     cM3dGLin lin;
@@ -1729,7 +1614,6 @@ static int cM3d_Cross_CylPntPnt(const cM3dGCyl* pCylinder, const Vec* pVecStart,
     return cM3d_Cross_CylLin(pCylinder, &lin, pVecOutA, pVecOutB);
 }
 
-/* 8026D0B0-8026D114 2679F0 0064+00 2/2 0/0 0/0 .text cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec */
 bool cM3d_Cross_CylPnt(const cM3dGCyl* pCylinder, const Vec* pPoint) {
     f32 dX = pCylinder->GetCP()->getXDiff(pPoint);
     f32 dZ = pCylinder->GetCP()->getZDiff(pPoint);
@@ -1743,8 +1627,6 @@ bool cM3d_Cross_CylPnt(const cM3dGCyl* pCylinder, const Vec* pPoint) {
     }
 }
 
-/* 8026D114-8026D3D4 267A54 02C0+00 0/0 2/2 0/0 .text
- * cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec              */
 bool cM3d_Cross_CpsCps(cM3dGCps const& cps1, cM3dGCps const& cps2, Vec* param_2) {
     f32 f1, f2;
     int iVar1 = cM3d_Check_LinLin(&cps1, &cps2, &f1, &f2);
@@ -1816,8 +1698,6 @@ inline bool cM3d_Cross_CpsCyl_Check(cM3dGCps const& cps, cM3dGCyl const& cyl, Ve
     return false;
 }
 
-/* 8026D3D4-8026DAE0 267D14 070C+00 0/0 4/4 0/0 .text
- * cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec              */
 bool cM3d_Cross_CpsCyl(cM3dGCps const& cps, cM3dGCyl const& cyl, Vec* param_2) {
     cM3dGLin line;
 
@@ -1924,8 +1804,6 @@ bool cM3d_Cross_CpsCyl(cM3dGCps const& cps, cM3dGCyl const& cyl, Vec* param_2) {
     return false;
 }
 
-/* 8026DAE0-8026DC3C 268420 015C+00 1/1 0/0 0/0 .text
- * cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec */
 static void cM3d_Cross_CpsSph_CrossPos(cM3dGCps const& param_1, cM3dGSph const& param_2,
                                            Vec const& param_3, Vec* param_4) {
     Vec aVStack_70;
@@ -1955,8 +1833,6 @@ static void cM3d_Cross_CpsSph_CrossPos(cM3dGCps const& param_1, cM3dGSph const&
 }
 
 
-/* 8026DC3C-8026DE2C 26857C 01F0+00 0/0 4/4 0/0 .text
- * cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec              */
 bool cM3d_Cross_CpsSph(cM3dGCps const& param_1, cM3dGSph const& param_2, Vec* param_3) {
     f32 local_38 = VECDistance(&param_1.GetStartP(), param_2.GetCP());
     if (local_38 < param_1.GetR() + param_2.GetR()) {
@@ -1978,8 +1854,6 @@ bool cM3d_Cross_CpsSph(cM3dGCps const& param_1, cM3dGSph const& param_2, Vec* pa
     return false;
 }
 
-/* 8026DE2C-8026E12C 26876C 0300+00 0/0 1/1 0/0 .text
- * cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec              */
 bool cM3d_Cross_TriTri(cM3dGTri const& tri1, cM3dGTri const& tri2, Vec* param_2) {
     f32 f1 = tri1.getPlaneFunc(&tri2.mA);
     f32 f2 = tri1.getPlaneFunc(&tri2.mB);
@@ -2040,8 +1914,6 @@ inline f32 cM3d_2LinCenter(cM3dGLin const& pLinA, f32 pLinAF, cM3dGLin const& pL
     return VECDistance(&tmp, &tmp2);
 }
 
-/* 8026E12C-8026E4FC 268A6C 03D0+00 0/0 2/2 0/0 .text
- * cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec                */
 bool cM3d_Cross_CpsTri(cM3dGCps const& cps, cM3dGTri tri, Vec* param_2) {
     cM3dGSph sph;
     sph.SetC(cps.GetStartP());
@@ -2094,14 +1966,11 @@ bool cM3d_Cross_CpsTri(cM3dGCps const& cps, cM3dGTri tri, Vec* param_2) {
     return false;
 }
 
-/* 8026E4FC-8026E570 268E3C 0074+00 0/0 0/0 1/1 .text            cM3d_CalcVecAngle__FRC3VecPsPs */
 void cM3d_CalcVecAngle(const Vec& pVec, s16* pOutA, s16* pOutB) {
     *pOutA = -cM_atan2s(-pVec.z * pVec.y, 1.0f);
     *pOutB = cM_atan2s(-pVec.x * pVec.y, 1.0f);
 }
 
-/* 8026E570-8026E6C4 268EB0 0154+00 0/0 1/1 0/0 .text            cM3d_CalcVecZAngle__FRC3VecP5csXyz
- */
 void cM3d_CalcVecZAngle(Vec const& param_0, csXyz* param_1) {
     param_1->x = -cM_atan2s(param_0.y, sqrtf(param_0.x * param_0.x + param_0.z * param_0.z));
     param_1->y = cM_atan2s(param_0.x, param_0.z);
@@ -2109,15 +1978,12 @@ void cM3d_CalcVecZAngle(Vec const& param_0, csXyz* param_1) {
 }
 
 
-/* 8026E6C4-8026E6F0 269004 002C+00 1/1 0/0 0/0 .text cM3d_PlaneCrossLineProcWork__FfffffffPfPf */
 void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, f32 f7, f32* pF1,
                                  f32* pF2) {
     *pF1 = ((f2 * f7) - (f4 * f6)) / f5;
     *pF2 = ((f3 * f6) - (f1 * f7)) / f5;
 }
 
-/* 8026E6F0-8026E8A0 269030 01B0+00 2/2 0/0 0/0 .text
- * cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin      */
 static int cM3d_2PlaneCrossLine(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB,
                                 cM3dGLin* pLinOut) {
     Vec tmp;
@@ -2154,8 +2020,6 @@ static int cM3d_2PlaneCrossLine(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB
     }
 }
 
-/* 8026E8A0-8026E980 2691E0 00E0+00 0/0 1/1 0/0 .text
- * cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec */
 BOOL cM3d_3PlaneCrossPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, const cM3dGPla& pPlaneC,
                          Vec* pVecOut) {
     cM3dGLin lin;
@@ -2173,8 +2037,6 @@ BOOL cM3d_3PlaneCrossPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, const
     }
 }
 
-/* 8026E980-8026EA5C 2692C0 00DC+00 1/1 1/1 0/0 .text
- * cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec           */
 f32 cM3d_lineVsPosSuisenCross(const cM3dGLin* pLine, const Vec* pPoint, Vec* pVecOut) {
     Vec tmp1;
     Vec tmp2;
@@ -2193,8 +2055,6 @@ f32 cM3d_lineVsPosSuisenCross(const cM3dGLin* pLine, const Vec* pPoint, Vec* pVe
     }
 }
 
-/* 8026EA5C-8026EB38 26939C 00DC+00 0/0 1/1 0/0 .text
- * cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec          */
 f32 cM3d_lineVsPosSuisenCross(const Vec& pLinePointA, const Vec& pLinePointB, const Vec& pPoint,
                               Vec* pVecOut) {
     Vec tmp1;
@@ -2215,8 +2075,6 @@ f32 cM3d_lineVsPosSuisenCross(const Vec& pLinePointA, const Vec& pLinePointB, co
     }
 }
 
-/* 8026EB38-8026EBBC 269478 0084+00 0/0 1/1 0/0 .text
- * cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec */
 int cM3d_2PlaneLinePosNearPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, const Vec* pVec,
                               Vec* pVecOut) {
     cM3dGLin lin;
@@ -2228,7 +2086,6 @@ int cM3d_2PlaneLinePosNearPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB,
     }
 }
 
-/* 8026EBBC-8026EC3C 2694FC 0080+00 0/0 1/1 0/0 .text            cM3d_CrawVec__FRC3VecRC3VecP3Vec */
 void cM3d_CrawVec(const Vec& pVecA, const Vec& pVecB, Vec* pVecOut) {
     Vec tmp;
     VECScale(&pVecA, &tmp, fabsf(pVecB.x * pVecA.x + pVecB.y * pVecA.y + pVecB.z * pVecA.z));
diff --git a/src/SSystem/SComponent/c_m3d_g_aab.cpp b/src/SSystem/SComponent/c_m3d_g_aab.cpp
index 0fc5d0ed30..aa15a7f736 100644
--- a/src/SSystem/SComponent/c_m3d_g_aab.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_aab.cpp
@@ -5,13 +5,11 @@
 
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 
-/* 8026EC54-8026EC88 0034+00 s=0 e=4 z=0  None .text      Set__8cM3dGAabFPC4cXyzPC4cXyz */
 void cM3dGAab::Set(const cXyz* min, const cXyz* max) {
     mMin = *min;
     mMax = *max;
 }
 
-/* 8026EC88-8026ECD0 0048+00 s=0 e=6 z=0  None .text      CrossY__8cM3dGAabCFPC4cXyz */
 bool cM3dGAab::CrossY(const cXyz* other) const {
     if (mMin.x > other->x || mMax.x < other->x || mMin.z > other->z || mMax.z < other->z) {
         return false;
@@ -20,7 +18,6 @@ bool cM3dGAab::CrossY(const cXyz* other) const {
     }
 }
 
-/* 8026ECD0-8026ECE4 0014+00 s=0 e=6 z=0  None .text      UnderPlaneYUnder__8cM3dGAabCFf */
 bool cM3dGAab::UnderPlaneYUnder(f32 y) const {
     if (mMin.y < y) {
         return true;
@@ -29,7 +26,6 @@ bool cM3dGAab::UnderPlaneYUnder(f32 y) const {
     return false;
 }
 
-/* 8026ECE4-8026ECF8 0014+00 s=0 e=6 z=0  None .text      TopPlaneYUnder__8cM3dGAabCFf */
 bool cM3dGAab::TopPlaneYUnder(f32 y) const {
     if (mMax.y < y) {
         return true;
@@ -38,25 +34,21 @@ bool cM3dGAab::TopPlaneYUnder(f32 y) const {
     return false;
 }
 
-/* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0  None .text      ClearForMinMax__8cM3dGAabFv */
 void cM3dGAab::ClearForMinMax() {
     mMin.x = mMin.y = mMin.z = G_CM3D_F_INF;
     mMax.x = mMax.y = mMax.z = -G_CM3D_F_INF;
 }
 
-/* 8026ED1C-8026ED60 0044+00 s=1 e=3 z=0  None .text      SetMinMax__8cM3dGAabFRC4cXyz */
 void cM3dGAab::SetMinMax(const cXyz& pMinMax) {
     this->SetMin(pMinMax);
     this->SetMax(pMinMax);
 }
 
-/* 8026ED60-8026EDA4 0044+00 s=0 e=2 z=0  None .text      SetMinMax__8cM3dGAabFRC8cM3dGAab */
 void cM3dGAab::SetMinMax(const cM3dGAab& other) {
     this->SetMinMax(other.mMin);
     this->SetMinMax(other.mMax);
 }
 
-/* 8026EDA4-8026EDE4 0040+00 s=1 e=1 z=0  None .text      SetMin__8cM3dGAabFRC4cXyz */
 void cM3dGAab::SetMin(const cXyz& min) {
     if (mMin.x > min.x) {
         mMin.x = min.x;
@@ -69,7 +61,6 @@ void cM3dGAab::SetMin(const cXyz& min) {
     }
 }
 
-/* 8026EDE4-8026EE24 0040+00 s=1 e=1 z=0  None .text      SetMax__8cM3dGAabFRC4cXyz */
 void cM3dGAab::SetMax(const cXyz& max) {
     if (mMax.x < max.x) {
         mMax.x = max.x;
@@ -82,13 +73,11 @@ void cM3dGAab::SetMax(const cXyz& max) {
     }
 }
 
-/* 8026EE24-8026EE68 0044+00 s=0 e=1 z=0  None .text      CalcCenter__8cM3dGAabCFP4cXyz */
 void cM3dGAab::CalcCenter(cXyz* out) const {
     PSVECAdd(&mMin, &mMax, out);
     PSVECScale(out, out, 0.5f);
 }
 
-/* 8026EE68-8026EEB4 004C+00 s=0 e=1 z=0  None .text      PlusR__8cM3dGAabFf */
 void cM3dGAab::PlusR(f32 r) {
     mMin.x -= r;
     mMin.y -= r;
diff --git a/src/SSystem/SComponent/c_m3d_g_cir.cpp b/src/SSystem/SComponent/c_m3d_g_cir.cpp
index 9d102d11ae..56ca47afa3 100644
--- a/src/SSystem/SComponent/c_m3d_g_cir.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_cir.cpp
@@ -5,13 +5,10 @@
 
 #include "SSystem/SComponent/c_m3d_g_cir.h"
 
-/* 8026EEB4-8026EED0 001C+00 s=0 e=1 z=0  None .text      __ct__8cM3dGCirFv */
 cM3dGCir::cM3dGCir() {}
 
-/* 8026EF18-8026EF74 005C+00 s=1 e=4 z=386  None .text      __dt__8cM3dGCirFv */
 cM3dGCir::~cM3dGCir() {}
 
-/* 8026EF74-8026EF88 0014+00 s=0 e=1 z=0  None .text      Set__8cM3dGCirFffff */
 void cM3dGCir::Set(f32 pos_x, f32 pos_y, f32 pos_z, f32 radius) {
     cM2dGCir::Set(pos_x, pos_y, radius);
     mPosZ = pos_z;
diff --git a/src/SSystem/SComponent/c_m3d_g_cps.cpp b/src/SSystem/SComponent/c_m3d_g_cps.cpp
index 835251483d..adbaf1af4c 100644
--- a/src/SSystem/SComponent/c_m3d_g_cps.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_cps.cpp
@@ -5,25 +5,20 @@
 
 #include "SSystem/SComponent/c_m3d_g_cps.h"
 
-/* 8026EF88-8026EFA4 2698C8 001C+00 0/0 5/5 20/20 .text            __ct__8cM3dGCpsFv */
 cM3dGCps::cM3dGCps() {}
 
-/* 8026EFA4-8026F000 2698E4 005C+00 1/0 7/7 6/6 .text            __dt__8cM3dGCpsFv */
 cM3dGCps::~cM3dGCps() {}
 
-/* 8026F000-8026F03C 269940 003C+00 1/1 2/2 10/10 .text            Set__8cM3dGCpsFRC4cXyzRC4cXyzf */
 void cM3dGCps::Set(const cXyz& start, const cXyz& end, f32 radius) {
     SetStartEnd(start, end);
     SetR(radius);
 }
 
-/* 8026F03C-8026F080 26997C 0044+00 0/0 1/1 10/10 .text            Set__8cM3dGCpsFRC9cM3dGCpsS */
 void cM3dGCps::Set(const cM3dGCpsS& other) {
     SetStartEnd(other.mStart, other.mEnd);
     SetR(other.mRadius);
 }
 
-/* 8026F080-8026F0A8 2699C0 0028+00 0/0 1/1 0/0 .text            SetCps__8cM3dGCpsFRC8cM3dGCps */
 void cM3dGCps::SetCps(const cM3dGCps& other) {
     Set(other.GetStart(), other.GetEnd(), other.GetR());
 }
diff --git a/src/SSystem/SComponent/c_m3d_g_cyl.cpp b/src/SSystem/SComponent/c_m3d_g_cyl.cpp
index 99e168a333..19bf8d795c 100644
--- a/src/SSystem/SComponent/c_m3d_g_cyl.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_cyl.cpp
@@ -6,57 +6,45 @@
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d.h"
 
-/* 8026F0A8-8026F114 2699E8 006C+00 0/0 1/1 0/0 .text            __ct__8cM3dGCylFPC4cXyzff */
 cM3dGCyl::cM3dGCyl(const cXyz* center, f32 radius, f32 height) {
     SetC(*center);
     SetR(radius);
     SetH(height);
 }
 
-/* 8026F114-8026F180 269A54 006C+00 0/0 1/1 4/4 .text            Set__8cM3dGCylFRC9cM3dGCylS */
 void cM3dGCyl::Set(const cM3dGCylS& other) {
     SetC(cXyz(other.mCenter));
     SetR(other.mRadius);
     SetH(other.mHeight);
 }
 
-/* 8026F180-8026F1DC 269AC0 005C+00 0/0 2/2 1/1 .text            Set__8cM3dGCylFRC4cXyzff */
 void cM3dGCyl::Set(const cXyz& center, f32 radius, f32 height) {
     SetC(center);
     SetR(radius);
     SetH(height);
 }
 
-/* 8026F1DC-8026F1F8 269B1C 001C+00 3/3 13/13 257/257 .text            SetC__8cM3dGCylFRC4cXyz */
 void cM3dGCyl::SetC(const cXyz& center) {
     mCenter = center;
 }
 
-/* 8026F1F8-8026F200 269B38 0008+00 3/3 11/11 197/197 .text            SetH__8cM3dGCylFf */
 void cM3dGCyl::SetH(f32 height) {
     mHeight = height;
 }
 
-/* 8026F200-8026F208 269B40 0008+00 3/3 6/6 204/204 .text            SetR__8cM3dGCylFf */
 void cM3dGCyl::SetR(f32 radius) {
     mRadius = radius;
 }
 
-/* 8026F208-8026F22C 269B48 0024+00 0/0 1/1 0/0 .text            cross__8cM3dGCylCFPC8cM3dGSphP4cXyz
- */
 bool cM3dGCyl::cross(const cM3dGSph* other, cXyz* out) const {
     f32 f;
     return cM3d_Cross_CylSph(this, other, out, &f);
 }
 
-/* 8026F22C-8026F24C 269B6C 0020+00 0/0 1/1 0/0 .text            cross__8cM3dGCylCFPC8cM3dGCylP4cXyz
- */
 bool cM3dGCyl::cross(const cM3dGCyl* other, cXyz* out) const {
     return cM3d_Cross_CylCyl(this, other, out);
 }
 
-/* 8026F24C-8026F2A8 269B8C 005C+00 0/0 2/2 0/0 .text            calcMinMax__8cM3dGCylFP4cXyzP4cXyz
- */
 void cM3dGCyl::calcMinMax(cXyz* min, cXyz* max) {
     min->x = mCenter.x - mRadius;
     min->y = mCenter.y;
@@ -64,4 +52,4 @@ void cM3dGCyl::calcMinMax(cXyz* min, cXyz* max) {
     max->x = mCenter.x + mRadius;
     max->y = mCenter.y + mHeight;
     max->z = mCenter.z + mRadius;
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_m3d_g_lin.cpp b/src/SSystem/SComponent/c_m3d_g_lin.cpp
index a9daac2c41..e4a1a284c8 100644
--- a/src/SSystem/SComponent/c_m3d_g_lin.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_lin.cpp
@@ -5,25 +5,21 @@
 
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 
-/* 8026F2A8-8026F2E8 0040+00 s=0 e=8 z=1  None .text      __ct__8cM3dGLinFRC4cXyzRC4cXyz */
 cM3dGLin::cM3dGLin(const cXyz& start, const cXyz& end) {
     mStart = start;
     mEnd = end;
 }
 
-/* 8026F2E8-8026F31C 0034+00 s=0 e=8 z=10  None .text      SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz */
 void cM3dGLin::SetStartEnd(const cXyz& start, const cXyz& end) {
     mStart = start;
     mEnd = end;
 }
 
-/* 8026F31C-8026F350 0034+00 s=0 e=7 z=4  None .text      SetStartEnd__8cM3dGLinFRC3VecRC3Vec */
 void cM3dGLin::SetStartEnd(const Vec& start, const Vec& end) {
     mStart.set(start);
     mEnd.set(end);
 }
 
-/* 8026F350-8026F3C0 0070+00 s=0 e=3 z=0  None .text      CalcPos__8cM3dGLinCFP3Vecf */
 void cM3dGLin::CalcPos(Vec* out, f32 scale) const {
     cXyz tmp;
     PSVECSubtract(&mEnd, &mStart, &tmp);
@@ -31,7 +27,6 @@ void cM3dGLin::CalcPos(Vec* out, f32 scale) const {
     PSVECAdd(&tmp, &mStart, out);
 }
 
-/* 8026F3C0-8026F3DC 001C+00 s=0 e=1 z=0  None .text      SetEnd__8cM3dGLinFRC4cXyz */
 void cM3dGLin::SetEnd(const cXyz& end) {
     mEnd = end;
 }
diff --git a/src/SSystem/SComponent/c_m3d_g_pla.cpp b/src/SSystem/SComponent/c_m3d_g_pla.cpp
index 7bfe588c2d..e798e63a17 100644
--- a/src/SSystem/SComponent/c_m3d_g_pla.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_pla.cpp
@@ -6,14 +6,11 @@
 #include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_m3d.h"
 
-/* 8026F3DC-8026F408 269D1C 002C+00 0/0 3/3 0/0 .text            __ct__8cM3dGPlaFPC4cXyzf */
 cM3dGPla::cM3dGPla(const cXyz* normal, f32 d) {
     mNormal = *normal;
     mD = d;
 }
 
-/* 8026F408-8026F4C4 269D48 00BC+00 0/0 3/3 0/0 .text crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz
- */
 bool cM3dGPla::crossInfLin(const cXyz& start, const cXyz& end, cXyz& out) const {
     f32 tmp1 = getPlaneFunc(&start);
     f32 tmp2 = getPlaneFunc(&end);
@@ -27,20 +24,17 @@ bool cM3dGPla::crossInfLin(const cXyz& start, const cXyz& end, cXyz& out) const
     return true;
 }
 
-/* 8026F4C4-8026F52C 269E04 0068+00 0/0 1/1 0/0 .text            SetupNP0__8cM3dGPlaFRC3VecRC3Vec */
 void cM3dGPla::SetupNP0(const Vec& normal, const Vec& point) {
     mNormal = normal;
     PSVECNormalize(&mNormal, &mNormal);
     mD = -PSVECDotProduct(&mNormal, &point);
 }
 
-/* 8026F52C-8026F57C 269E6C 0050+00 0/0 2/2 0/0 .text            SetupNP__8cM3dGPlaFRC3VecRC3Vec */
 void cM3dGPla::SetupNP(const Vec& normal, const Vec& point) {
     mNormal = normal;
     mD = -PSVECDotProduct(&mNormal, &point);
 }
 
-/* 8026F57C-8026F5D4 269EBC 0058+00 0/0 2/2 0/0 .text            getCrossY__8cM3dGPlaCFRC4cXyzPf */
 bool cM3dGPla::getCrossY(const cXyz& point, f32* out) const {
     if (cM3d_IsZero(mNormal.y)) {
         return false;
@@ -50,8 +44,6 @@ bool cM3dGPla::getCrossY(const cXyz& point, f32* out) const {
     }
 }
 
-/* 8026F5D4-8026F624 269F14 0050+00 0/0 1/1 0/0 .text            getCrossYLessD__8cM3dGPlaCFRC3VecPf
- */
 bool cM3dGPla::getCrossYLessD(const Vec& point, f32* out) const {
     if (cM3d_IsZero(mNormal.y)) {
         return false;
@@ -61,7 +53,6 @@ bool cM3dGPla::getCrossYLessD(const Vec& point, f32* out) const {
     }
 }
 
-/* 8026F624-8026F648 269F64 0024+00 0/0 1/1 0/0 .text            Set__8cM3dGPlaFPC8cM3dGPla */
 void cM3dGPla::Set(const cM3dGPla* other) {
     mNormal = *other->GetNP();
     mD = other->GetD();
diff --git a/src/SSystem/SComponent/c_m3d_g_sph.cpp b/src/SSystem/SComponent/c_m3d_g_sph.cpp
index ed91e0ea94..3fd65af53a 100644
--- a/src/SSystem/SComponent/c_m3d_g_sph.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_sph.cpp
@@ -6,41 +6,32 @@
 #include "SSystem/SComponent/c_m3d_g_sph.h"
 #include "SSystem/SComponent/c_m3d.h"
 
-/* 8026F648-8026F664 269F88 001C+00 2/2 5/5 254/254 .text            SetC__8cM3dGSphFRC4cXyz */
 void cM3dGSph::SetC(const cXyz& center) {
     mCenter = center;
 }
 
-/* 8026F664-8026F6A8 269FA4 0044+00 0/0 3/3 2/2 .text            Set__8cM3dGSphFRC4cXyzf */
 void cM3dGSph::Set(const cXyz& center, f32 radius) {
     SetC(center);
     SetR(radius);
 }
 
-/* 8026F6A8-8026F708 269FE8 0060+00 0/0 2/2 0/0 .text            Set__8cM3dGSphFRC9cM3dGSphS */
 void cM3dGSph::Set(const cM3dGSphS& other) {
     SetC(cXyz(other.mCenter));
     SetR(other.mRadius);
 }
 
-/* 8026F708-8026F710 26A048 0008+00 2/2 10/10 197/197 .text            SetR__8cM3dGSphFf */
 void cM3dGSph::SetR(f32 radius) {
     mRadius = radius;
 }
 
-/* 8026F710-8026F73C 26A050 002C+00 0/0 1/1 0/0 .text            cross__8cM3dGSphCFPC8cM3dGSphP4cXyz
- */
 bool cM3dGSph::cross(const cM3dGSph* other, cXyz* out) const {
     return cM3d_Cross_SphSph(other, this, out);
 }
 
-/* 8026F73C-8026F76C 26A07C 0030+00 0/0 1/1 0/0 .text            cross__8cM3dGSphCFPC8cM3dGCylP4cXyz
- */
 bool cM3dGSph::cross(const cM3dGCyl* cyl, cXyz* out) const {
     return cM3d_Cross_CylSph(cyl, this, out);
 }
 
-/* 8026F76C-8026F7B0 26A0AC 0044+00 0/0 1/1 0/0 .text GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz */
 void cM3dGSph::GetMinMaxCube(cXyz& min, cXyz& max) const {
     min.x = mCenter.x - mRadius;
     min.y = mCenter.y - mRadius;
diff --git a/src/SSystem/SComponent/c_m3d_g_tri.cpp b/src/SSystem/SComponent/c_m3d_g_tri.cpp
index 00e0c0e7cb..fcf135b3b8 100644
--- a/src/SSystem/SComponent/c_m3d_g_tri.cpp
+++ b/src/SSystem/SComponent/c_m3d_g_tri.cpp
@@ -7,13 +7,10 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 8026F7B0-8026F7DC 26A0F0 002C+00 0/0 1/1 0/0 .text            cross__8cM3dGTriCFPC8cM3dGCylP3Vec
- */
 bool cM3dGTri::cross(const cM3dGCyl* cyl, Vec* out) const {
     return cM3d_Cross_CylTri(cyl, this, out);
 }
 
-/* 8026F7DC-8026F85C 26A11C 0080+00 0/0 0/0 6/6 .text setPos__8cM3dGTriFPC3VecPC3VecPC3Vec */
 void cM3dGTri::setPos(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c) {
     mA = *vtx_a;
     mB = *vtx_b;
@@ -23,8 +20,6 @@ void cM3dGTri::setPos(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c) {
     JUT_ASSERT(99, !cM3d_IsZero(GetNP()->x) || !cM3d_IsZero(GetNP()->y) || !cM3d_IsZero(GetNP()->z));
 }
 
-/* 8026F85C-8026F8C8 26A19C 006C+00 0/0 2/2 0/0 .text
- * setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla               */
 void cM3dGTri::setBg(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c, const cM3dGPla* plane) {
     mA.x = vtx_a->x;
     mA.y = vtx_a->y;
@@ -41,7 +36,6 @@ void cM3dGTri::setBg(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c, const
     Set(plane);
 }
 
-/* 8026F8C8-8026F93C 26A208 0074+00 0/0 1/1 0/0 .text set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec */
 void cM3dGTri::set(const Vec* vtx_a, const Vec* vtx_b, const Vec* vtx_c, const Vec* normal) {
     mA.x = vtx_a->x;
     mA.y = vtx_a->y;
diff --git a/src/SSystem/SComponent/c_malloc.cpp b/src/SSystem/SComponent/c_malloc.cpp
index cedf67fbe2..3de7fcbf62 100644
--- a/src/SSystem/SComponent/c_malloc.cpp
+++ b/src/SSystem/SComponent/c_malloc.cpp
@@ -6,15 +6,12 @@
 #include "SSystem/SComponent/c_malloc.h"
 #include "JSystem/JKernel/JKRHeap.h"
 
-/* 80451150-80451158 0004+04 s=3 e=0 z=0  None .sbss      Heap__3cMl */
 JKRHeap* cMl::Heap;
 
-/* 80263220-80263228 0008+00 s=0 e=1 z=0  None .text      init__3cMlFP7JKRHeap */
 void cMl::init(JKRHeap* heap) {
     Heap = heap;
 }
 
-/* 80263228-80263260 0038+00 s=0 e=8 z=0  None .text      memalignB__3cMlFiUl */
 void* cMl::memalignB(int alignment, u32 size) {
     void* ret;
     if (size == 0) {
@@ -26,7 +23,6 @@ void* cMl::memalignB(int alignment, u32 size) {
     return ret;
 }
 
-/* 80263260-8026328C 002C+00 s=0 e=4 z=0  None .text      free__3cMlFPv */
 void cMl::free(void* ptr) {
     if (ptr != NULL) {
         Heap->free(ptr);
diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp
index 983b47d705..38d6cbdff1 100644
--- a/src/SSystem/SComponent/c_math.cpp
+++ b/src/SSystem/SComponent/c_math.cpp
@@ -7,7 +7,6 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include <cmath.h>
 
-/* 802675E4-80267640 261F24 005C+00 0/0 23/23 11/11 .text            cM_rad2s__Ff */
 s16 cM_rad2s(f32 rad) {
     s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI));
     if (s < -0x8000) {
@@ -18,7 +17,6 @@ s16 cM_rad2s(f32 rad) {
     return s;
 }
 
-/* 803C3778-803C3F80 020898 0802+06 1/1 0/0 0/0 .data            atntable */
 static u16 atntable[1025] = {
     0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070,
     0x007A, 0x0084, 0x008F, 0x0099, 0x00A3, 0x00AD, 0x00B7, 0x00C2, 0x00CC, 0x00D6, 0x00E0, 0x00EA,
@@ -108,13 +106,11 @@ static u16 atntable[1025] = {
     0x1FEC, 0x1FF1, 0x1FF6, 0x1FFB, 0x2000,
 };
 
-/* 80267640-80267674 261F80 0034+00 1/1 0/0 0/0 .text            U_GetAtanTable__Fff */
 u16 U_GetAtanTable(f32 f0, f32 f1) {
     int idx = f0 / f1 * 0x400;
     return atntable[idx];
 }
 
-/* 80267674-80267814 261FB4 01A0+00 1/1 82/82 822/822 .text            cM_atan2s__Fff */
 s16 cM_atan2s(f32 y, f32 x) {
     u32 ret;
     if (cM3d_IsZero(y)) {
@@ -159,30 +155,24 @@ s16 cM_atan2s(f32 y, f32 x) {
     return ret;
 }
 
-/* 80267814-8026785C 262154 0048+00 0/0 4/4 5/5 .text            cM_atan2f__Fff */
 f32 cM_atan2f(f32 y, f32 x) {
     f32 atanS = cM_atan2s(y, x);
     f32 ret = ((2 * M_PI) / 0x10000) * atanS;
     return ret;
 }
 
-/* 80451168-8045116C 000668 0004+00 2/2 0/0 0/0 .sbss            r0 */
 static s32 r0;
 
-/* 8045116C-80451170 00066C 0004+00 2/2 0/0 0/0 .sbss            r1 */
 static s32 r1;
 
-/* 80451170-80451174 000670 0004+00 2/2 0/0 0/0 .sbss            r2 */
 static s32 r2;
 
-/* 8026785C-8026786C 26219C 0010+00 0/0 1/1 0/0 .text            cM_initRnd__Fiii */
 void cM_initRnd(int s0, int s1, int s2) {
     r0 = s0;
     r1 = s1;
     r2 = s2;
 }
 
-/* 8026786C-80267954 2621AC 00E8+00 2/2 15/15 113/113 .text            cM_rnd__Fv */
 /**
  * Gets a random value
  * @return a random value
@@ -196,7 +186,6 @@ f32 cM_rnd() {
     return fabsf(fmodf(var_f31, 1.0));
 }
 
-/* 80267954-8026798C 262294 0038+00 0/0 34/34 951/951 .text            cM_rndF__Ff */
 /**
  * Gets a random value between 0 and a given upper bound
  * @param max The upper bound the random value can be
@@ -206,7 +195,6 @@ f32 cM_rndF(f32 max) {
     return cM_rnd() * max;
 }
 
-/* 8026798C-802679D4 2622CC 0048+00 0/0 24/24 450/450 .text            cM_rndFX__Ff */
 /**
  * Gets a random value between given bounds
  * @param max The upper and lower bound the random value can be
@@ -216,24 +204,18 @@ f32 cM_rndFX(f32 max) {
     return max * (cM_rnd() - 0.5f) * 2.0f;
 }
 
-/* ############################################################################################## */
-/* 80451174-80451178 000674 0004+00 2/2 0/0 0/0 .sbss            r02 */
 static s32 r02;
 
-/* 80451178-8045117C 000678 0004+00 2/2 0/0 0/0 .sbss            r12 */
 static s32 r12;
 
-/* 8045117C-80451180 00067C 0004+00 2/2 0/0 0/0 .sbss            r22 */
 static s32 r22;
 
-/* 802679D4-802679E4 262314 0010+00 0/0 0/0 8/8 .text            cM_initRnd2__Fiii */
 void cM_initRnd2(int s0, int s1, int s2) {
     r02 = s0;
     r12 = s1;
     r22 = s2;
 }
 
-/* 802679E4-80267ACC 262324 00E8+00 2/2 0/0 0/0 .text            cM_rnd2__Fv */
 f32 cM_rnd2() {
     r02 = (r02 * 171) % 30269;
     r12 = (r12 * 172) % 30307;
@@ -243,12 +225,10 @@ f32 cM_rnd2() {
     return fabsf(fmodf(var_f31, 1.0));
 }
 
-/* 80267ACC-80267B04 26240C 0038+00 0/0 0/0 14/14 .text            cM_rndF2__Ff */
 f32 cM_rndF2(f32 max) {
     return cM_rnd2() * max;
 }
 
-/* 80267B04-80267B4C 262444 0048+00 0/0 0/0 7/7 .text            cM_rndFX2__Ff */
 f32 cM_rndFX2(f32 max) {
     return max * (cM_rnd2() - 0.5f) * 2.0f;
 }
diff --git a/src/SSystem/SComponent/c_node.cpp b/src/SSystem/SComponent/c_node.cpp
index a8b26b4c24..a1957273ef 100644
--- a/src/SSystem/SComponent/c_node.cpp
+++ b/src/SSystem/SComponent/c_node.cpp
@@ -6,13 +6,11 @@
 #include "SSystem/SComponent/c_node.h"
 #include <dolphin/types.h>
 
-/* 802660D0-802660DC 000C+00 s=1 e=0 z=0  None .text      cNd_Join__FP10node_classP10node_class */
 void cNd_Join(node_class* node_a, node_class* node_b) {
     node_a->mpNextNode = node_b;
     node_b->mpPrevNode = node_a;
 }
 
-/* 802660DC-8026610C 0030+00 s=0 e=2 z=0  None .text      cNd_LengthOf__FP10node_class */
 int cNd_LengthOf(node_class* node) {
     int count = 0;
     while (node) {
@@ -22,7 +20,6 @@ int cNd_LengthOf(node_class* node) {
     return count;
 }
 
-/* 8026610C-8026613C 0030+00 s=0 e=1 z=0  None .text      cNd_First__FP10node_class */
 node_class* cNd_First(node_class* node) {
     node_class* ret = NULL;
     while (node) {
@@ -32,7 +29,6 @@ node_class* cNd_First(node_class* node) {
     return ret;
 }
 
-/* 8026613C-8026616C 0030+00 s=1 e=1 z=0  None .text      cNd_Last__FP10node_class */
 node_class* cNd_Last(node_class* node) {
     node_class* ret = NULL;
     while (node) {
@@ -42,7 +38,6 @@ node_class* cNd_Last(node_class* node) {
     return ret;
 }
 
-/* 8026616C-802661BC 0050+00 s=0 e=1 z=0  None .text      cNd_Order__FP10node_classi */
 node_class* cNd_Order(node_class* node, int idx) {
     node_class* ret = NULL;
     int i = 0;
@@ -55,7 +50,6 @@ node_class* cNd_Order(node_class* node, int idx) {
     return i < idx ? ret : NULL;
 }
 
-/* 802661BC-802661F0 0034+00 s=0 e=1 z=0  None .text      cNd_SingleCut__FP10node_class */
 void cNd_SingleCut(node_class* node) {
     node_class* prev = node->mpPrevNode;
     node_class* next = node->mpNextNode;
@@ -68,21 +62,17 @@ void cNd_SingleCut(node_class* node) {
     node->mpNextNode = NULL;
 }
 
-/* 802661F0-80266210 0020+00 s=1 e=0 z=0  None .text      cNd_Cut__FP10node_class */
 void cNd_Cut(node_class* node) {
     if (node->mpPrevNode)
         node->mpPrevNode->mpNextNode = NULL;
     node->mpPrevNode = NULL;
 }
 
-/* 80266210-80266244 0034+00 s=1 e=1 z=0  None .text      cNd_Addition__FP10node_classP10node_class
- */
 void cNd_Addition(node_class* node_a, node_class* node_b) {
     node_class* pLast = cNd_Last(node_a);
     cNd_Join(pLast, node_b);
 }
 
-/* 80266244-802662B0 006C+00 s=0 e=1 z=0  None .text      cNd_Insert__FP10node_classP10node_class */
 void cNd_Insert(node_class* node_a, node_class* node_b) {
     if (node_a->mpPrevNode == NULL) {
         cNd_Addition(node_b, node_a);
@@ -94,7 +84,6 @@ void cNd_Insert(node_class* node_a, node_class* node_b) {
     }
 }
 
-/* 802662B0-802662D8 0028+00 s=1 e=2 z=0  None .text      cNd_SetObject__FP10node_classPv */
 void cNd_SetObject(node_class* node, void* data) {
     while (node) {
         node->mpData = data;
@@ -102,19 +91,16 @@ void cNd_SetObject(node_class* node, void* data) {
     }
 }
 
-/* 802662D8-802662FC 0024+00 s=0 e=1 z=0  None .text      cNd_ClearObject__FP10node_class */
 void cNd_ClearObject(node_class* node) {
     cNd_SetObject(node, NULL);
 }
 
-/* 802662FC-80266310 0014+00 s=0 e=1 z=0  None .text      cNd_ForcedClear__FP10node_class */
 void cNd_ForcedClear(node_class* node) {
     node->mpPrevNode = NULL;
     node->mpNextNode = NULL;
     node->mpData = NULL;
 }
 
-/* 80266310-80266324 0014+00 s=0 e=2 z=0  None .text      cNd_Create__FP10node_classPv */
 void cNd_Create(node_class* node, void* data) {
     node->mpPrevNode = NULL;
     node->mpNextNode = NULL;
diff --git a/src/SSystem/SComponent/c_node_iter.cpp b/src/SSystem/SComponent/c_node_iter.cpp
index 82f3263ace..a26b6a1743 100644
--- a/src/SSystem/SComponent/c_node_iter.cpp
+++ b/src/SSystem/SComponent/c_node_iter.cpp
@@ -7,8 +7,6 @@
 #include "SSystem/SComponent/c_node.h"
 #include <dolphin/types.h>
 
-/* 80266324-802663B4 0090+00 s=0 e=1 z=0  None .text
- * cNdIt_Method__FP10node_classPFP10node_classPv_iPv            */
 int cNdIt_Method(node_class* node, cNdIt_MethodFunc method, void* data) {
     int ret = 1;
     node_class* pNext = NODE_GET_NEXT(node);
@@ -23,8 +21,6 @@ int cNdIt_Method(node_class* node, cNdIt_MethodFunc method, void* data) {
     return ret;
 }
 
-/* 802663B4-80266440 008C+00 s=0 e=1 z=0  None .text
- * cNdIt_Judge__FP10node_classPFP10node_classPv_PvPv            */
 void* cNdIt_Judge(node_class* node, cNdIt_JudgeFunc judge, void* data) {
     node_class* pNext = NODE_GET_NEXT(node);
 
diff --git a/src/SSystem/SComponent/c_phase.cpp b/src/SSystem/SComponent/c_phase.cpp
index 594e18efd9..c31fd9b2d0 100644
--- a/src/SSystem/SComponent/c_phase.cpp
+++ b/src/SSystem/SComponent/c_phase.cpp
@@ -5,35 +5,25 @@
 
 #include "SSystem/SComponent/c_phase.h"
 
-/* 80266624-80266630 000C+00 s=1 e=2 z=0  None .text
- * cPhs_Reset__FP30request_of_phase_process_class               */
 void cPhs_Reset(request_of_phase_process_class* phase) {
     phase->id = cPhs_INIT_e;
 }
 
-/* 80266630-80266640 0010+00 s=0 e=3 z=0  None .text
- * cPhs_Set__FP30request_of_phase_process_classPPFPv_i          */
 void cPhs_Set(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl) {
     phase->mpHandlerTable = handlerTbl;
     phase->id = cPhs_INIT_e;
 }
 
-/* 80266640-80266668 0028+00 s=1 e=0 z=0  None .text
- * cPhs_UnCompleate__FP30request_of_phase_process_class         */
 void cPhs_UnCompleate(request_of_phase_process_class* phase) {
     phase->mpHandlerTable = NULL;
     cPhs_Reset(phase);
 }
 
-/* 80266668-80266678 0010+00 s=2 e=0 z=0  None .text
- * cPhs_Compleate__FP30request_of_phase_process_class           */
 int cPhs_Compleate(request_of_phase_process_class* phase) {
     phase->mpHandlerTable = NULL;
     return cPhs_COMPLEATE_e;
 }
 
-/* 80266678-802666D8 0060+00 s=1 e=0 z=0  None .text cPhs_Next__FP30request_of_phase_process_class
- */
 int cPhs_Next(request_of_phase_process_class* phase) {
     if (phase->mpHandlerTable != NULL) {
         cPhs__Handler* handler = phase->mpHandlerTable;
@@ -52,8 +42,6 @@ int cPhs_Next(request_of_phase_process_class* phase) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 802666D8-802667AC 00D4+00 s=1 e=3 z=0  None .text cPhs_Do__FP30request_of_phase_process_classPv
- */
 int cPhs_Do(request_of_phase_process_class* phase, void* data) {
     cPhs__Handler* handler = phase->mpHandlerTable;
 
@@ -87,8 +75,6 @@ int cPhs_Do(request_of_phase_process_class* phase, void* data) {
     return cPhs_Compleate(phase);
 }
 
-/* 802667AC-802667D4 0028+00 s=0 e=2 z=0  None .text
- * cPhs_Handler__FP30request_of_phase_process_classPPFPv_iPv    */
 int cPhs_Handler(request_of_phase_process_class* phase, cPhs__Handler* handlerTbl, void* data) {
     phase->mpHandlerTable = handlerTbl;
     return cPhs_Do(phase, data);
diff --git a/src/SSystem/SComponent/c_request.cpp b/src/SSystem/SComponent/c_request.cpp
index 1bc3814b06..fa5eea6d79 100644
--- a/src/SSystem/SComponent/c_request.cpp
+++ b/src/SSystem/SComponent/c_request.cpp
@@ -5,7 +5,6 @@
 
 #include "SSystem/SComponent/c_request.h"
 
-/* 802667D4-80266800 261114 002C+00 0/0 3/3 0/0 .text cReq_Is_Done__FP18request_base_class */
 int cReq_Is_Done(request_base_class* i_this) {
     if (i_this->flag1 == 1) {
         i_this->flag1 = 0;
@@ -14,20 +13,16 @@ int cReq_Is_Done(request_base_class* i_this) {
     return 0;
 }
 
-/* 80266800-80266830 261140 0030+00 0/0 3/3 0/0 .text            cReq_Done__FP18request_base_class
- */
 void cReq_Done(request_base_class* i_this) {
     i_this->flag0 = 0;
     i_this->flag1 = 1;
     i_this->flag2 = 0;
 }
 
-/* 80266830-80266850 261170 0020+00 0/0 2/2 0/0 .text cReq_Command__FP18request_base_classUc */
 void cReq_Command(request_base_class* i_this, u8 param_1) {
     cReq_Create(i_this, param_1);
 }
 
-/* 80266850-80266880 261190 0030+00 1/1 2/2 0/0 .text cReq_Create__FP18request_base_classUc */
 void cReq_Create(request_base_class* i_this, u8 param_1) {
     i_this->flag0 = 1;
     i_this->flag1 = 0;
diff --git a/src/SSystem/SComponent/c_sxyz.cpp b/src/SSystem/SComponent/c_sxyz.cpp
index f627b0facb..1679155a20 100644
--- a/src/SSystem/SComponent/c_sxyz.cpp
+++ b/src/SSystem/SComponent/c_sxyz.cpp
@@ -7,31 +7,26 @@
 
 const csXyz csXyz::Zero = csXyz(0, 0, 0);
 
-/* 802673F4-80267404 0010+00 s=4 e=19 z=119  None .text      __ct__5csXyzFsss */
 csXyz::csXyz(s16 x, s16 y, s16 z) {
     this->x = x;
     this->y = y;
     this->z = z;
 }
 
-/* 80267404-8026745C 0058+00 s=0 e=0 z=3  None .text      __pl__5csXyzFR5csXyz */
 csXyz csXyz::operator+(csXyz& other) {
     return csXyz(x + other.x, y + other.y, z + other.z);
 }
 
-/* 8026745C-80267490 0034+00 s=0 e=2 z=11  None .text      __apl__5csXyzFR5csXyz */
 void csXyz::operator+=(csXyz& other) {
     x += other.x;
     y += other.y;
     z += other.z;
 }
 
-/* 80267490-802674E8 0058+00 s=0 e=0 z=1  None .text      __mi__5csXyzFR5csXyz */
 csXyz csXyz::operator-(csXyz& other) {
     return csXyz(x - other.x, y - other.y, z - other.z);
 }
 
-/* 802674E8-8026758C 00A4+00 s=0 e=0 z=1  None .text      __ml__5csXyzFf */
 csXyz csXyz::operator*(f32 mul) {
     return csXyz(x * mul, y * mul, z * mul);
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_tag.cpp b/src/SSystem/SComponent/c_tag.cpp
index d18004f927..4229262cae 100644
--- a/src/SSystem/SComponent/c_tag.cpp
+++ b/src/SSystem/SComponent/c_tag.cpp
@@ -7,13 +7,10 @@
 #include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_tree.h"
 
-/* 80266880-8026688C 000C+00 s=0 e=3 z=0  None .text      cTg_IsUse__FP16create_tag_class */
 int cTg_IsUse(create_tag_class* tag) {
     return tag->mbIsUse;
 }
 
-/* 8026688C-802668CC 0040+00 s=0 e=4 z=0  None .text cTg_SingleCutFromTree__FP16create_tag_class
- */
 int cTg_SingleCutFromTree(create_tag_class* tag) {
     if (tag->mbIsUse == true) {
         tag->mbIsUse = false;
@@ -24,8 +21,6 @@ int cTg_SingleCutFromTree(create_tag_class* tag) {
     }
 }
 
-/* 802668CC-8026691C 0050+00 s=0 e=3 z=0  None .text
- * cTg_AdditionToTree__FP21node_lists_tree_classiP16create_tag_class */
 int cTg_AdditionToTree(node_lists_tree_class* tree, int listIdx, create_tag_class* tag) {
     if (!tag->mbIsUse) {
         int ret = cTr_Addition(tree, listIdx, &tag->mpNode);
@@ -38,8 +33,6 @@ int cTg_AdditionToTree(node_lists_tree_class* tree, int listIdx, create_tag_clas
     return 0;
 }
 
-/* 8026691C-8026696C 0050+00 s=0 e=1 z=0  None .text
- * cTg_InsertToTree__FP21node_lists_tree_classiP16create_tag_classi */
 int cTg_InsertToTree(node_lists_tree_class* tree, int listIdx, create_tag_class* tag, int idx) {
     if (!tag->mbIsUse) {
         int ret = cTr_Insert(tree, listIdx, &tag->mpNode, idx);
@@ -52,7 +45,6 @@ int cTg_InsertToTree(node_lists_tree_class* tree, int listIdx, create_tag_class*
     return 0;
 }
 
-/* 8026696C-802669A4 0038+00 s=0 e=1 z=0  None .text      cTg_GetFirst__FP15node_list_class */
 node_class* cTg_GetFirst(node_list_class* list) {
     create_tag_class* tag = (create_tag_class*)cLs_GetFirst(list);
     if (tag != NULL) {
@@ -63,7 +55,6 @@ node_class* cTg_GetFirst(node_list_class* list) {
     return NULL;
 }
 
-/* 802669A4-802669E4 0040+00 s=0 e=7 z=0  None .text      cTg_SingleCut__FP16create_tag_class */
 int cTg_SingleCut(create_tag_class* tag) {
     if (tag->mbIsUse == 1) {
         tag->mbIsUse = false;
@@ -74,8 +65,6 @@ int cTg_SingleCut(create_tag_class* tag) {
     return 0;
 }
 
-/* 802669E4-80266A34 0050+00 s=0 e=7 z=0  None .text
- * cTg_Addition__FP15node_list_classP16create_tag_class         */
 int cTg_Addition(node_list_class* list, create_tag_class* tag) {
     if (!tag->mbIsUse) {
         int ret = cLs_Addition(list, &tag->mpNode);
@@ -88,7 +77,6 @@ int cTg_Addition(node_list_class* list, create_tag_class* tag) {
     return 0;
 }
 
-/* 80266A34-80266A7C 0048+00 s=0 e=10 z=0  None .text      cTg_Create__FP16create_tag_classPv */
 void cTg_Create(create_tag_class* tag, void* data) {
     cNd_Create(&tag->mpNode, NULL);
     tag->mpTagData = data;
diff --git a/src/SSystem/SComponent/c_tag_iter.cpp b/src/SSystem/SComponent/c_tag_iter.cpp
index 6ff2c42217..e9ed4565bb 100644
--- a/src/SSystem/SComponent/c_tag_iter.cpp
+++ b/src/SSystem/SComponent/c_tag_iter.cpp
@@ -6,14 +6,10 @@
 #include "SSystem/SComponent/c_tag_iter.h"
 #include "SSystem/SComponent/c_tag.h"
 
-/* 80266A7C-80266AB0 0034+00 s=0 e=4 z=0  None .text
- * cTgIt_MethodCall__FP16create_tag_classP13method_filter       */
 int cTgIt_MethodCall(create_tag_class* tag, method_filter* filter) {
     return filter->mpMethodFunc((node_class*)tag->mpTagData, filter->mpUserData);
 }
 
-/* 80266AB0-80266AE4 0034+00 s=0 e=5 z=0  None .text
- * cTgIt_JudgeFilter__FP16create_tag_classP12judge_filter       */
 void* cTgIt_JudgeFilter(create_tag_class* tag, judge_filter* filter) {
     return filter->mpJudgeFunc((node_class*)tag->mpTagData, filter->mpUserData);
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_tree.cpp b/src/SSystem/SComponent/c_tree.cpp
index ab3d1b032d..7b51f874f0 100644
--- a/src/SSystem/SComponent/c_tree.cpp
+++ b/src/SSystem/SComponent/c_tree.cpp
@@ -6,13 +6,10 @@
 #include "SSystem/SComponent/c_tree.h"
 #include "SSystem/SComponent/c_list.h"
 
-/* 80266440-80266460 0020+00 s=0 e=1 z=0  None .text      cTr_SingleCut__FP10node_class */
 int cTr_SingleCut(node_class* node) {
     return cLs_SingleCut(node);
 }
 
-/* 80266460-802664A4 0044+00 s=0 e=1 z=0  None .text
- * cTr_Addition__FP21node_lists_tree_classiP10node_class        */
 int cTr_Addition(node_lists_tree_class* tree, int listIdx, node_class* node) {
     if (listIdx >= tree->mNumLists)
         return 0;
@@ -20,8 +17,6 @@ int cTr_Addition(node_lists_tree_class* tree, int listIdx, node_class* node) {
     return cLs_Addition(&tree->mpLists[listIdx], node);
 }
 
-/* 802664A4-802664E8 0044+00 s=0 e=1 z=0  None .text
- * cTr_Insert__FP21node_lists_tree_classiP10node_classi         */
 int cTr_Insert(node_lists_tree_class* tree, int listIdx, node_class* node, int idx) {
     if (listIdx >= tree->mNumLists)
         return 0;
@@ -29,12 +24,10 @@ int cTr_Insert(node_lists_tree_class* tree, int listIdx, node_class* node, int i
     return cLs_Insert(&tree->mpLists[listIdx], idx, node);
 }
 
-/* 802664E8-80266540 0058+00 s=0 e=2 z=0  None .text
- * cTr_Create__FP21node_lists_tree_classP15node_list_classi     */
 void cTr_Create(node_lists_tree_class* tree, node_list_class* lists, int numLists) {
     tree->mpLists = lists;
     tree->mNumLists = numLists;
 
     while (numLists-- > 0)
         cLs_Create(lists++);
-}
\ No newline at end of file
+}
diff --git a/src/SSystem/SComponent/c_tree_iter.cpp b/src/SSystem/SComponent/c_tree_iter.cpp
index 3e43e40961..f7ffabf4c7 100644
--- a/src/SSystem/SComponent/c_tree_iter.cpp
+++ b/src/SSystem/SComponent/c_tree_iter.cpp
@@ -9,8 +9,6 @@
 #include "SSystem/SComponent/c_tree.h"
 #include <dolphin/types.h>
 
-/* 80266540-802665B4 0074+00 s=0 e=2 z=0  None .text
- * cTrIt_Method__FP21node_lists_tree_classPFP10node_classPv_iPv */
 int cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* data) {
     node_list_class* list = tree->mpLists;
     int i = tree->mNumLists;
@@ -22,8 +20,6 @@ int cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* dat
     return ret;
 }
 
-/* 802665B4-80266624 0070+00 s=0 e=2 z=0  None .text
- * cTrIt_Judge__FP21node_lists_tree_classPFP10node_classPv_PvPv */
 void* cTrIt_Judge(node_lists_tree_class* tree, cNdIt_JudgeFunc judge, void* data) {
     node_list_class* list = tree->mpLists;
     int i = tree->mNumLists;
diff --git a/src/SSystem/SComponent/c_xyz.cpp b/src/SSystem/SComponent/c_xyz.cpp
index 75b8a3c1f2..41ff834864 100644
--- a/src/SSystem/SComponent/c_xyz.cpp
+++ b/src/SSystem/SComponent/c_xyz.cpp
@@ -7,28 +7,24 @@
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80266AE4-80266B34 0050+00 s=0 e=103 z=300  None .text      __pl__4cXyzCFRC3Vec */
 cXyz cXyz::operator+(const Vec& vec) const {
     Vec ret;
     PSVECAdd(this, &vec, &ret);
     return ret;
 }
 
-/* 80266B34-80266B84 0050+00 s=0 e=196 z=1082  None .text      __mi__4cXyzCFRC3Vec */
 cXyz cXyz::operator-(const Vec& vec) const {
     Vec ret;
     PSVECSubtract(this, &vec, &ret);
     return ret;
 }
 
-/* 80266B84-80266BD0 004C+00 s=1 e=99 z=158  None .text      __ml__4cXyzCFf */
 cXyz cXyz::operator*(f32 scale) const {
     Vec ret;
     PSVECScale(this, &ret, scale);
     return ret;
 }
 
-/* 80266BD0-80266C18 0048+00 s=0 e=7 z=0  None .text      __ml__4cXyzCFRC3Vec */
 cXyz cXyz::operator*(const Vec& vec) const {
     cXyz ret;
     ret.x = this->x * vec.x;
@@ -37,26 +33,22 @@ cXyz cXyz::operator*(const Vec& vec) const {
     return ret;
 }
 
-/* 80266C18-80266C6C 0054+00 s=0 e=3 z=12  None .text      __dv__4cXyzCFf */
 cXyz cXyz::operator/(f32 scale) const {
     Vec ret;
     PSVECScale(this, &ret, 1.0f / scale);
     return ret;
 }
 
-/* 80266C6C-80266CBC 0050+00 s=1 e=0 z=0  None .text      getCrossProduct__4cXyzCFRC3Vec */
 cXyz cXyz::getCrossProduct(const Vec& vec) const {
     Vec ret;
     PSVECCrossProduct(this, &vec, &ret);
     return ret;
 }
 
-/* 80266CBC-80266CE4 0028+00 s=0 e=7 z=6  None .text      outprod__4cXyzCFRC3Vec */
 cXyz cXyz::outprod(const Vec& vec) const {
     return this->getCrossProduct(vec);
 }
 
-/* 80266CE4-80266D30 004C+00 s=0 e=10 z=1  None .text      norm__4cXyzCFv */
 cXyz cXyz::norm() const {
     Vec ret;
     JUT_CONFIRM(251, isNearZeroSquare() == FALSE);
@@ -64,7 +56,6 @@ cXyz cXyz::norm() const {
     return ret;
 }
 
-/* 80266D30-80266DC4 0094+00 s=1 e=4 z=0  None .text      normZP__4cXyzCFv */
 cXyz cXyz::normZP() const {
     Vec vec;
     if (this->isNearZeroSquare() == false) {
@@ -75,7 +66,6 @@ cXyz cXyz::normZP() const {
     return vec;
 }
 
-/* 80266DC4-80266EF4 0130+00 s=0 e=0 z=2  None .text      normZC__4cXyzCFv */
 cXyz cXyz::normZC() const {
     Vec outVec;
     if (isNearZeroSquare() == 0) {
@@ -94,14 +84,12 @@ cXyz cXyz::normZC() const {
     return outVec;
 }
 
-/* 80266EF4-80266F48 0054+00 s=0 e=13 z=17  None .text      normalize__4cXyzFv */
 cXyz cXyz::normalize() {
     JUT_ASSERT(285, isNearZeroSquare() == FALSE);
     PSVECNormalize(this, this);
     return *this;
 }
 
-/* 80266F48-80266FDC 0094+00 s=0 e=19 z=59  None .text      normalizeZP__4cXyzFv */
 cXyz cXyz::normalizeZP() {
     if (this->isNearZeroSquare() == false) {
         PSVECNormalize(this, this);
@@ -111,7 +99,6 @@ cXyz cXyz::normalizeZP() {
     return *this;
 }
 
-/* 80266FDC-8026702C 0050+00 s=0 e=2 z=3  None .text      normalizeRS__4cXyzFv */
 bool cXyz::normalizeRS() {
     if (this->isNearZeroSquare()) {
         return false;
@@ -121,28 +108,23 @@ bool cXyz::normalizeRS() {
     }
 }
 
-/* 8026702C-8026706C 0040+00 s=0 e=5 z=9  None .text      __eq__4cXyzCFRC3Vec */
 bool cXyz::operator==(const Vec& vec) const {
     return this->x == vec.x && this->y == vec.y && this->z == vec.z;
 }
 
-/* 8026706C-802670AC 0040+00 s=0 e=6 z=6  None .text      __ne__4cXyzCFRC3Vec */
 bool cXyz::operator!=(const Vec& vec) const {
     return this->x != vec.x || this->y != vec.y || this->z != vec.z;
 }
 
-/* 802670AC-80267128 007C+00 s=0 e=4 z=7  None .text      isZero__4cXyzCFv */
 bool cXyz::isZero() const {
     return fabsf(this->x) < 32.0f * FLT_EPSILON && fabsf(this->y) < 32.0f * FLT_EPSILON &&
            fabsf(this->z) < 32.0f * FLT_EPSILON;
 }
 
-/* 80267128-80267150 0028+00 s=0 e=81 z=85  None .text      atan2sX_Z__4cXyzCFv */
 s16 cXyz::atan2sX_Z() const {
     return cM_atan2s(this->x, this->z);
 }
 
-/* 80267150-80267290 0140+00 s=0 e=21 z=33  None .text      atan2sY_XZ__4cXyzCFv */
 s16 cXyz::atan2sY_XZ() const {
     return cM_atan2s(-this->y, absXZ());
 }
diff --git a/src/SSystem/SStandard/s_basic.cpp b/src/SSystem/SStandard/s_basic.cpp
index 94d72e9087..21ce5fe1c6 100644
--- a/src/SSystem/SStandard/s_basic.cpp
+++ b/src/SSystem/SStandard/s_basic.cpp
@@ -1,11 +1,5 @@
-//
-// Generated By: dol2asm
-// Translation Unit: s_basic
-//
-
 #include "SSystem/SStandard/s_basic.h"
 
-/* 80271C8C-80271CAC 0020+00 s=1 e=0 z=0  None .text      sBs_FillArea_s__FPvUls */
 void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue) {
     s16* castPtr = (s16*)pPtr;
     for (int i = 0; i < pNumBytes / 2; i++) {
@@ -14,7 +8,6 @@ void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue) {
     }
 }
 
-/* 80271CAC-80271CD0 0024+00 s=0 e=2 z=0  None .text      sBs_ClearArea__FPvUl */
 void sBs_ClearArea(void* pPtr, u32 pNumBytes) {
     sBs_FillArea_s(pPtr, pNumBytes, 0);
 }
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c
index a01dd8b8ea..0ae2c53b7e 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c
@@ -8,7 +8,6 @@ DSIOResult __close_file(u32 handle, u8* buffer, size_t* count, void* ref_con);
 DSIOResult __access_file(u32 handle, u8* buffer, size_t* count, void* ref_con,
                          MessageCommandID cmd);
 
-/* 80372258-80372314 36CB98 00BC+00 0/0 1/0 0/0 .text            __read_console */
 DSIOResult __read_console(u32 handle, u8* buffer, size_t* count, void* ref_con) {
     if (GetUseSerialIO() == 0) {
         return DS_IOError;
@@ -16,7 +15,6 @@ DSIOResult __read_console(u32 handle, u8* buffer, size_t* count, void* ref_con)
     return __read_file(DS_Stdin, buffer, count, ref_con);
 }
 
-/* 8037219C-80372258 36CADC 00BC+00 0/0 1/1 0/0 .text            __TRK_write_console */
 DSIOResult __TRK_write_console(u32 handle, u8* buffer, size_t* count, void* ref_con) {
     if (GetUseSerialIO() == 0) {
         return DS_IOError;
@@ -53,4 +51,4 @@ static DSIOResult __access_file(u32 handle, u8* buffer, size_t* count, void* ref
     }
 
     return DS_IOError;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c
index 96b9d5cd89..b68bfccb16 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c
@@ -5,47 +5,38 @@
 
 #include "TRK_MINNOW_DOLPHIN/Os/dolphin/UDP_Stubs.h"
 
-/* 80372354-8037235C 36CC94 0008+00 0/0 1/1 0/0 .text            udp_cc_initialize */
-__declspec(weak) int udp_cc_initialize(void* flagOut, __OSInterruptHandler handler) {
+DECL_WEAK int udp_cc_initialize(void* flagOut, __OSInterruptHandler handler) {
     return -1;
 }
 
-/* 8037234C-80372354 36CC8C 0008+00 0/0 1/1 0/0 .text            udp_cc_shutdown */
-__declspec(weak) int udp_cc_shutdown(void) {
+DECL_WEAK int udp_cc_shutdown(void) {
     return -1;
 }
 
-/* 80372344-8037234C 36CC84 0008+00 0/0 1/1 0/0 .text            udp_cc_open */
-__declspec(weak) int udp_cc_open(void) {
+DECL_WEAK int udp_cc_open(void) {
     return -1;
 }
 
-/* 8037233C-80372344 36CC7C 0008+00 0/0 1/1 0/0 .text            udp_cc_close */
-__declspec(weak) int udp_cc_close(void) {
+DECL_WEAK int udp_cc_close(void) {
     return -1;
 }
 
-/* 80372334-8037233C 36CC74 0008+00 0/0 1/1 0/0 .text            udp_cc_read */
-__declspec(weak) int udp_cc_read(u8* dest, int size) {
+DECL_WEAK int udp_cc_read(u8* dest, int size) {
     return 0;
 }
 
-/* 8037232C-80372334 36CC6C 0008+00 0/0 1/1 0/0 .text            udp_cc_write */
-__declspec(weak) int udp_cc_write(const u8* src, int size) {
+DECL_WEAK int udp_cc_write(const u8* src, int size) {
     return 0;
 }
 
-/* 80372324-8037232C 36CC64 0008+00 0/0 1/1 0/0 .text            udp_cc_peek */
-__declspec(weak) int udp_cc_peek(void) {
+DECL_WEAK int udp_cc_peek(void) {
     return 0;
 }
 
-/* 8037231C-80372324 36CC5C 0008+00 0/0 1/1 0/0 .text            udp_cc_pre_continue */
-__declspec(weak) int udp_cc_pre_continue(void) {
+DECL_WEAK int udp_cc_pre_continue(void) {
     return -1;
 }
 
-/* 80372314-8037231C 36CC54 0008+00 0/0 1/1 0/0 .text            udp_cc_post_stop */
-__declspec(weak) int udp_cc_post_stop(void) {
+DECL_WEAK int udp_cc_post_stop(void) {
     return -1;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
index 1efa3cc872..a589d74be3 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c
@@ -10,10 +10,8 @@ extern u32 _db_stack_addr;
 
 #define EXCEPTIONMASK_ADDR 0x80000044
 
-/* 8044F810-8044F818 07C530 0004+04 3/3 0/0 0/0 .bss             lc_base */
 static u32 lc_base;
 
-/* 803D3268-803D32A8 030388 003C+04 1/1 0/0 0/0 .data            TRK_ISR_OFFSETS */
 static u32 TRK_ISR_OFFSETS[15] = {PPC_SystemReset,
                                   PPC_MachineCheck,
                                   PPC_DataStorage,
@@ -33,12 +31,10 @@ static u32 TRK_ISR_OFFSETS[15] = {PPC_SystemReset,
 void __TRK_copy_vectors(void);
 __declspec(section ".init") void __TRK_reset(void) { OSResetSystem(FALSE, 0, FALSE); }
 
-/* 80371B7C-80371B9C 36C4BC 0020+00 0/0 1/1 0/0 .text EnableMetroTRKInterrupts */
 void EnableMetroTRKInterrupts(void) {
     EnableEXI2Interrupts();
 }
 
-/* 80371B24-80371B7C 36C464 0058+00 0/0 1/1 0/0 .text            TRKTargetTranslate */
 u32 TRKTargetTranslate(u32 param_0) {
     if (param_0 >= lc_base) {
         if ((param_0 < lc_base + 0x4000) && ((gTRKCPUState.Extended1.DBAT3U & 3) != 0)) {
@@ -59,7 +55,6 @@ void TRK_copy_vector(u32 offset) {
     TRK_flush_cache(destPtr, 0x100);
 }
 
-/* 803719F8-80371B24 36C338 012C+00 0/0 1/1 0/0 .text            __TRK_copy_vectors */
 void __TRK_copy_vectors(void) {
     u32 r3 = lc_base;
     u32* isrOffsetPtr;
@@ -85,7 +80,6 @@ void __TRK_copy_vectors(void) {
     } while (i <= 14);
 }
 
-/* 803719AC-803719F8 36C2EC 004C+00 0/0 1/1 0/0 .text TRKInitializeTarget */
 DSError TRKInitializeTarget() {
     gTRKState.isStopped = TRUE;
     gTRKState.msr = __TRK_get_MSR();
@@ -96,7 +90,6 @@ DSError TRKInitializeTarget() {
 #define __dcbi(a, b) asm { dcbi a, b }
 #define __dcbfASM(a, b) asm { dcbf a, b }
 
-/* 80371878-803719AC 36C1B8 0134+00 0/0 1/1 0/0 .text            TRK__read_aram */
 void TRK__read_aram(register int c, register u32 p2, void* p3) {
     u32 err;
     int i;
@@ -138,9 +131,8 @@ void TRK__read_aram(register int c, register u32 p2, void* p3) {
     }
 }
 
-/* 8037168C-80371878 36BFCC 01EC+00 0/0 1/1 0/0 .text            TRK__write_aram */
 void TRK__write_aram(register int c, register u32 p2, void* p3) {
-    u8 buff[32] ALIGN_DECL(32);
+    u8 buff[32] ATTRIBUTE_ALIGN(32);
     u32 err;
     register int count = c;
     register u32 bf;
@@ -217,7 +209,6 @@ void TRK__write_aram(register int c, register u32 p2, void* p3) {
     }
 }
 
-/* 80371560-803715F8 36BEA0 0098+00 0/0 1/1 0/0 .text InitMetroTRK */
 asm void InitMetroTRK() {
     // clang-format off
     nofralloc
@@ -279,7 +270,6 @@ initCommTableSuccess:
     // clang-format on
 }
 
-/* 803715F8-8037168C 36BF38 0094+00 0/0 1/1 0/0 .text            InitMetroTRK_BBA */
 asm void InitMetroTRK_BBA() {
     // clang-format off
     nofralloc
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c
index 2b7e769dc8..e22f2c565b 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c
@@ -7,21 +7,17 @@
 
 void TRKInterruptHandler();
 
-/* 8044F824-8044F828 07C544 0004+00 0/0 0/0 0/0 .bss             _MetroTRK_Has_Framing */
 BOOL _MetroTRK_Has_Framing;
 
 u8 TRK_Use_BBA;
 
-/* 803D32A8-803D32D0 0303C8 0028+00 8/8 0/0 0/0 .data            gDBCommTable */
 DBCommTable gDBCommTable = {};
 
-/* 80372114-8037214C 36CA54 0038+00 1/1 0/0 0/0 .text            TRKEXICallBack */
 void TRKEXICallBack(s16 param_0, OSContext* ctx) {
     OSEnableScheduler();
     TRKLoadContext(ctx, 0x500);
 }
 
-/* 80371EA8-80372114 36C7E8 026C+00 0/0 2/2 0/0 .text            InitMetroTRKCommTable */
 int InitMetroTRKCommTable(int hwId) {
     int result = 1;
     OSReport("Devkit set to : %ld\n", hwId);
@@ -83,14 +79,12 @@ int InitMetroTRKCommTable(int hwId) {
     return result;
 }
 
-/* 80371E58-80371EA8 36C798 0050+00 0/0 1/1 0/0 .text            TRKInitializeIntDrivenUART */
 DSError TRKInitializeIntDrivenUART(u32 param_0, u32 param_1, u32 param_2, void* param_3) {
     gDBCommTable.initialize_func(param_3, TRKEXICallBack);
     gDBCommTable.open_func();
     return DS_NoError;
 }
 
-/* 80371E10-80371E58 36C750 0048+00 0/0 1/1 0/0 .text            EnableEXI2Interrupts */
 void EnableEXI2Interrupts(void) {
     if (!TRK_Use_BBA) {
         if (gDBCommTable.init_interrupts_func != NULL) {
@@ -99,39 +93,32 @@ void EnableEXI2Interrupts(void) {
     }
 }
 
-/* 80371DE0-80371E10 36C720 0030+00 0/0 1/1 0/0 .text            TRKPollUART */
 int TRKPollUART(void) {
     return gDBCommTable.peek_func();
 }
 
-/* 80371DA4-80371DE0 36C6E4 003C+00 0/0 1/1 0/0 .text            TRKReadUARTN */
 UARTError TRKReadUARTN(void* bytes, u32 length) {
     int readErr = gDBCommTable.read_func(bytes, length);
     return ((-readErr | readErr) >> 31);
 }
 
-/* 80371D68-80371DA4 36C6A8 003C+00 0/0 13/13 0/0 .text            TRKWriteUARTN */
 UARTError TRKWriteUARTN(const void* bytes, u32 length) {
     int writeErr = gDBCommTable.write_func(bytes, length);
     return ((-writeErr | writeErr) >> 31);
 }
 
-/* 80371D38-80371D68 36C678 0030+00 0/0 1/1 0/0 .text            ReserveEXI2Port */
 void ReserveEXI2Port(void) {
     gDBCommTable.post_stop_func();
 }
 
-/* 80371D08-80371D38 36C648 0030+00 0/0 1/1 0/0 .text            UnreserveEXI2Port */
 void UnreserveEXI2Port(void) {
     gDBCommTable.pre_continue_func();
 }
 
-/* 80371CD8-80371D08 36C618 0030+00 0/0 1/1 0/0 .text            TRK_board_display */
 void TRK_board_display(char* str) {
     OSReport("%s\n", str);
 }
 
-/* 80371C80-80371CD8 36C5C0 0058+00 0/0 1/1 0/0 .text            InitializeProgramEndTrap */
 DSError InitializeProgramEndTrap(void) {
     static const u32 EndofProgramInstruction = 'END';
 
@@ -142,10 +129,8 @@ DSError InitializeProgramEndTrap(void) {
     DCFlushRange(ppcHaltPtr + 4, 4);
 }
 
-/* 80371C7C-80371C80 36C5BC 0004+00 0/0 1/1 0/0 .text            TRKUARTInterruptHandler */
 void TRKUARTInterruptHandler() {}
 
-/* 80371BF4-80371C7C 36C534 0088+00 1/1 0/0 0/0 .text            TRKLoadContext */
 asm void TRKLoadContext(OSContext* ctx, u32) {
     // clang-format off
 	nofralloc
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c
index 8f025458e5..4ea2c7eee3 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c
@@ -5,11 +5,10 @@
 
 #include "TRK_MINNOW_DOLPHIN/Os/dolphin/targcont.h"
 
-/* 8037214C-80372180 36CA8C 0034+00 0/0 2/2 0/0 .text            TRKTargetContinue */
 DSError TRKTargetContinue(void) {
     TRKTargetSetStopped(0);
     UnreserveEXI2Port();
     TRKSwapAndGo();
     ReserveEXI2Port();
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c
index fa282e06d6..db290b3647 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c
@@ -7,12 +7,10 @@
 
 static u8 useSerialIO;
 
-/* 80372190-8037219C 36CAD0 000C+00 0/0 1/1 0/0 .text            SetUseSerialIO */
 void SetUseSerialIO(u8 serialIO) {
     useSerialIO = serialIO;
 }
 
-/* 80372180-80372190 36CAC0 0010+00 0/0 2/2 0/0 .text            GetUseSerialIO */
 u8 GetUseSerialIO(void) {
     return useSerialIO;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c
index a1f955446a..76d5f961b8 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c
@@ -10,7 +10,6 @@
 // look into issue later
 extern void OSReport(char* fmt);
 
-/* 8036DB14-8036DB9C 368454 0088+00 0/0 2/2 0/0 .text            usr_puts_serial */
 BOOL usr_puts_serial(const char* msg) {
     BOOL connect_ = FALSE;
     char c;
@@ -32,5 +31,4 @@ BOOL usr_puts_serial(const char* msg) {
     return connect_;
 }
 
-/* 8036DB10-8036DB14 368450 0004+00 0/0 1/1 0/0 .text            usr_put_initialize */
-void usr_put_initialize(void) {}
\ No newline at end of file
+void usr_put_initialize(void) {}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c
index 65f2414c32..255818839e 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c
@@ -7,12 +7,10 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h"
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 
-/* 8036DD0C-8036DD14 36864C 0008+00 0/0 1/1 0/0 .text            TRKInitializeDispatcher */
 DSError TRKInitializeDispatcher() {
     return DS_NoError;
 }
 
-/* 8036DB9C-8036DD0C 3684DC 0170+00 1/0 1/1 0/0 .text            TRKDispatchMessage */
 BOOL TRKDispatchMessage(TRKBuffer* msg) {
     u32 err;
 
@@ -66,4 +64,4 @@ BOOL TRKDispatchMessage(TRKBuffer* msg) {
 	}
 	MWTRACE(1, "Dispatch complete err = %ld\n", err);
 	return err;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c
index 993dc86e73..e15c3f2e77 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c
@@ -6,10 +6,8 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.h"
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 
-/* 8044F818-8044F820 07C538 0004+04 1/1 0/0 0/0 .bss             TRK_mainError */
 static DSError TRK_mainError;
 
-/* 80371B9C-80371BF4 36C4DC 0058+00 0/0 2/2 0/0 .text            TRK_main */
 DSError TRK_main(void) {
     MWTRACE(1, "TRK_Main \n");
     TRK_mainError = TRKInitializeNub();
@@ -21,4 +19,4 @@ DSError TRK_main(void) {
 
     TRK_mainError = TRKTerminateNub();
     return TRK_mainError;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c
index 339365225a..eb04b7fcdd 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c
@@ -2,7 +2,6 @@
 #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h"
 #include "trk.h"
 
-/* 8036CB20-8036CC18 367460 00F8+00 0/0 1/1 0/0 .text            TRKNubMainLoop */
 void TRKNubMainLoop(void) {
     void* msg;
     TRKEvent event;
@@ -53,4 +52,4 @@ void TRKNubMainLoop(void) {
         }
         isNewInput = FALSE;
     }
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
index 7d8aecac06..a30ab8c7a8 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c
@@ -7,7 +7,6 @@
 #include <stdint.h>
 
 #pragma dont_inline on
-/* 8036F580-8036F638 369EC0 00B8+00 0/0 1/1 0/0 .text            TRK_fill_mem */
 void TRK_fill_mem(void* dst, int val, u32 n) {
     u32 v, i, j;
     v = (u8)val;
@@ -60,7 +59,6 @@ void TRK_fill_mem(void* dst, int val, u32 n) {
 }
 #pragma dont_inline reset
 
-/* 800035C0-800035E4 0004C0 0024+00 0/0 12/12 0/0 .init            TRK_memcpy */
 __declspec(section ".init") void* TRK_memcpy(void* dst, const void* src, size_t n) {
     const unsigned char* s = (const unsigned char*)src - 1;
     unsigned char* d = (unsigned char*)dst - 1;
@@ -71,7 +69,6 @@ __declspec(section ".init") void* TRK_memcpy(void* dst, const void* src, size_t
     return dst;
 }
 
-/* 80003590-800035C0 000490 0030+00 0/0 1/1 0/0 .init            TRK_memset */
 __declspec(section ".init") void* TRK_memset(void* dst, int val, size_t n) {
     TRK_fill_mem(dst, val, n);
 
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c
index 6689b9837f..df80aa7605 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c
@@ -7,9 +7,8 @@
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 #include "trk.h"
 
-/* 8036CFD8-8036D01C 367918 0044+00 0/0 6/6 0/0 .text            TRKMessageSend */
 DSError TRKMessageSend(TRK_Msg* msg) {
     DSError write_err = TRKWriteUARTN(&msg->m_msg, msg->m_msgLength);
     MWTRACE(1, "MessageSend : cc_write returned %ld\n", write_err);
     return DS_NoError;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
index 2268ad9a0f..55e298a88a 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c
@@ -1,14 +1,12 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h"
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.h"
 
-/* 8044D8C0-8044F270 07A5E0 19B0+00 4/4 0/0 0/0 .bss             gTRKMsgBufs */
 TRKBuffer gTRKMsgBufs[3];
 
 void TRKSetBufferUsed(TRKBuffer* msg, BOOL state) {
     msg->isInUse = state;
 }
 
-/* 8036D7E4-8036D858 368124 0074+00 0/0 1/1 0/0 .text            TRKInitializeMessageBuffers */
 DSError TRKInitializeMessageBuffers(void) {
     int i;
     for (i = 0; i < 3; i++) {
@@ -21,7 +19,6 @@ DSError TRKInitializeMessageBuffers(void) {
     return DS_NoError;
 }
 
-/* 8036D71C-8036D7E4 36805C 00C8+00 0/0 6/6 0/0 .text            TRKGetFreeBuffer */
 DSError TRKGetFreeBuffer(int* msgID, TRKBuffer** outMsg) {
     TRKBuffer* buf;
     DSError error = DS_NoMessageBufferAvailable;
@@ -51,7 +48,6 @@ DSError TRKGetFreeBuffer(int* msgID, TRKBuffer** outMsg) {
     return error;
 }
 
-/* 8036D6F0-8036D71C 368030 002C+00 0/0 7/7 0/0 .text            TRKGetBuffer */
 void* TRKGetBuffer(int idx) {
     TRKBuffer* buf = NULL;
     if (idx >= 0 && idx < 3) {
@@ -61,7 +57,6 @@ void* TRKGetBuffer(int idx) {
     return buf;
 }
 
-/* 8036D68C-8036D6F0 367FCC 0064+00 0/0 8/8 0/0 .text            TRKReleaseBuffer */
 void TRKReleaseBuffer(int idx) {
     TRKBuffer* msg;
     if (idx != -1 && idx >= 0 && idx < 3) {
@@ -72,7 +67,6 @@ void TRKReleaseBuffer(int idx) {
     }
 }
 
-/* 8036D64C-8036D68C 367F8C 0040+00 0/0 4/4 0/0 .text            TRKResetBuffer */
 void TRKResetBuffer(TRKBuffer* msg, BOOL keepData) {
     msg->length = 0;
     msg->position = 0;
@@ -82,7 +76,6 @@ void TRKResetBuffer(TRKBuffer* msg, BOOL keepData) {
     }
 }
 
-/* 8036D61C-8036D64C 367F5C 0030+00 0/0 7/7 0/0 .text            TRKSetBufferPosition */
 DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos) {
     DSError error = DS_NoError;
 
@@ -100,7 +93,6 @@ DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos) {
     return error;
 }
 
-/* 8036D578-8036D61C 367EB8 00A4+00 0/0 3/3 0/0 .text            TRKAppendBuffer */
 DSError TRKAppendBuffer(TRKBuffer* msg, const void* data, size_t length) {
     DSError error = DS_NoError;  // r31
     u32 bytesLeft;
@@ -134,7 +126,6 @@ DSError TRKAppendBuffer(TRKBuffer* msg, const void* data, size_t length) {
     return error;
 }
 
-/* 8036D4EC-8036D578 367E2C 008C+00 0/0 1/1 0/0 .text            TRKReadBuffer */
 DSError TRKReadBuffer(TRKBuffer* msg, void* data, size_t length) {
     DSError error = DS_NoError;
     unsigned int bytesLeft;  // this has to be unsigned int not u32 to match lmfao.
@@ -188,7 +179,6 @@ DSError TRKAppendBuffer1_ui32(TRKBuffer* buffer, const u32 data) {
     return TRKAppendBuffer(buffer, (const void*)bigEndianData, sizeof(data));
 }
 
-/* 8036D3F0-8036D4EC 367D30 00FC+00 0/0 2/2 0/0 .text            TRKAppendBuffer1_ui64 */
 DSError TRKAppendBuffer1_ui64(TRKBuffer* buffer, const u64 data) {
     u8* bigEndianData;
     u8* byteData;
@@ -212,7 +202,6 @@ DSError TRKAppendBuffer1_ui64(TRKBuffer* buffer, const u64 data) {
     return TRKAppendBuffer(buffer, (const void*)bigEndianData, sizeof(data));
 }
 
-/* 8036D388-8036D3F0 367CC8 0068+00 0/0 8/8 0/0 .text            TRKAppendBuffer_ui8 */
 DSError TRKAppendBuffer_ui8(TRKBuffer* buffer, const u8* data, int count) {
     DSError err;
     int i;
@@ -224,7 +213,6 @@ DSError TRKAppendBuffer_ui8(TRKBuffer* buffer, const u8* data, int count) {
     return err;
 }
 
-/* 8036D28C-8036D388 367BCC 00FC+00 0/0 2/2 0/0 .text            TRKAppendBuffer_ui32 */
 DSError TRKAppendBuffer_ui32(TRKBuffer* buffer, const u32* data, int count) {
     DSError err;
     int i;
@@ -268,7 +256,6 @@ DSError TRKReadBuffer1_ui32(TRKBuffer* buffer, u32* data) {
     // UNUSED FUNCTION
 }
 
-/* 8036D1A4-8036D28C 367AE4 00E8+00 0/0 2/2 0/0 .text            TRKReadBuffer1_ui64 */
 DSError TRKReadBuffer1_ui64(TRKBuffer* buffer, u64* data) {
     DSError err;
 
@@ -300,7 +287,6 @@ DSError TRKReadBuffer1_ui64(TRKBuffer* buffer, u64* data) {
     return err;
 }
 
-/* 8036D10C-8036D1A4 367A4C 0098+00 0/0 1/1 0/0 .text            TRKReadBuffer_ui8 */
 DSError TRKReadBuffer_ui8(TRKBuffer* buffer, u8* data, int count) {
     DSError err;
     int i;
@@ -312,7 +298,6 @@ DSError TRKReadBuffer_ui8(TRKBuffer* buffer, u8* data, int count) {
     return err;
 }
 
-/* 8036D01C-8036D10C 36795C 00F0+00 0/0 2/2 0/0 .text            TRKReadBuffer_ui32 */
 DSError TRKReadBuffer_ui32(TRKBuffer* buffer, u32* data, int count) {
     DSError err;
     s32 i;
@@ -322,4 +307,4 @@ DSError TRKReadBuffer_ui32(TRKBuffer* buffer, u32* data, int count) {
     }
 
     return err;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c
index d89400be91..cc0f89a25d 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c
@@ -4,10 +4,8 @@
 #include "trk.h"
 #include <string.h>
 
-/* 8044F288-8044F290 07BFA8 0004+04 4/4 0/0 0/0 .bss             IsTRKConnected */
 static BOOL IsTRKConnected;
 
-/* 8036ECDC-8036ED84 36961C 00A8+00 0/0 1/1 0/0 .text            OutputData */
 void OutputData(void* data, int length) {
     // u8 byte;
     int i;
@@ -23,12 +21,10 @@ void OutputData(void* data, int length) {
     MWTRACE(8, "\n");
 }
 
-/* 8036ECCC-8036ECDC 36960C 0010+00 0/0 3/3 0/0 .text            GetTRKConnected */
 BOOL GetTRKConnected(void) {
     return IsTRKConnected;
 }
 
-/* 8036ECC0-8036ECCC 369600 000C+00 0/0 1/1 0/0 .text            SetTRKConnected */
 void SetTRKConnected(BOOL isTRKConnected) {
     IsTRKConnected = isTRKConnected;
 }
@@ -53,13 +49,11 @@ DSError TRKStandardACK(TRKBuffer* buffer, MessageCommandID commandID,
     return DS_NoError;
 }
 
-/* 8036EC5C-8036ECC0 36959C 0064+00 0/0 1/1 0/0 .text            TRKDoConnect */
 DSError TRKDoConnect(TRKBuffer* buffer) {
     IsTRKConnected = TRUE;
     return TRKStandardACK(buffer, 0x80, DSREPLY_NoError);
 }
 
-/* 8036EBE4-8036EC5C 369524 0078+00 0/0 1/1 0/0 .text            TRKDoDisconnect */
 DSError TRKDoDisconnect(TRKBuffer* buffer) {
     TRKEvent event;
 
@@ -70,33 +64,28 @@ DSError TRKDoDisconnect(TRKBuffer* buffer) {
     return DS_NoError;
 }
 
-/* 8036EB8C-8036EBE4 3694CC 0058+00 0/0 1/1 0/0 .text            TRKDoReset */
 DSError TRKDoReset(TRKBuffer* buffer) {
     TRKStandardACK(buffer, 0x80, DSREPLY_NoError);
     __TRK_reset();
     return DS_NoError;
 }
 
-/* 8036EB34-8036EB8C 369474 0058+00 0/0 1/1 0/0 .text            TRKDoOverride */
 DSError TRKDoOverride(TRKBuffer* buffer) {
     TRKStandardACK(buffer, 0x80, DSREPLY_NoError);
     __TRK_copy_vectors();
     return DS_NoError;
 }
 
-/* 8036EB2C-8036EB34 36946C 0008+00 0/0 1/1 0/0 .text            TRKDoVersions */
 DSError TRKDoVersions(TRKBuffer*) {
     return DS_NoError;
 }
 
-/* 8036EB24-8036EB2C 369464 0008+00 0/0 1/1 0/0 .text            TRKDoSupportMask */
 DSError TRKDoSupportMask(TRKBuffer*) {
     return DS_NoError;
 }
 
-/* 8036E8E0-8036EB24 369220 0244+00 1/0 1/1 0/0 .text            TRKDoReadMemory */
 DSError TRKDoReadMemory(TRKBuffer* buffer) {
-    u8 buf[0x820] __attribute__((aligned(32)));
+    u8 buf[0x820] ATTRIBUTE_ALIGN(32);
     size_t tempLength;
     int result;
     int replyErr;
@@ -168,9 +157,8 @@ DSError TRKDoReadMemory(TRKBuffer* buffer) {
     return TRKSendACK(buffer);
 }
 
-/* 8036E6A4-8036E8E0 368FE4 023C+00 1/0 1/1 0/0 .text            TRKDoWriteMemory */
 DSError TRKDoWriteMemory(TRKBuffer* b) {
-    u8 buf[0x820] __attribute__((aligned(32)));
+    u8 buf[0x820] ATTRIBUTE_ALIGN(32);
     size_t tempLength;
     int options;
     int result;
@@ -239,7 +227,6 @@ DSError TRKDoWriteMemory(TRKBuffer* b) {
     return TRKSendACK(b);
 }
 
-/* 8036E3C4-8036E6A4 368D04 02E0+00 0/0 1/1 0/0 .text            TRKDoReadRegisters */
 DSError TRKDoReadRegisters(TRKBuffer* b) {
     int error;
     u8 options;
@@ -318,7 +305,6 @@ DSError TRKDoReadRegisters(TRKBuffer* b) {
     }
 }
 
-/* 8036E134-8036E3C4 368A74 0290+00 0/0 1/1 0/0 .text            TRKDoWriteRegisters */
 DSError TRKDoWriteRegisters(TRKBuffer* b) {
     int error;
     int replyError;
@@ -409,7 +395,6 @@ void TRKDoFlushCache(void) {
     // UNUSED FUNCTION
 }
 
-/* 8036E084-8036E134 3689C4 00B0+00 0/0 1/1 0/0 .text            TRKDoContinue */
 DSError TRKDoContinue(TRKBuffer*) {
     MWTRACE(1, "DoContinue\n");
     if (!TRKTargetStopped()) {
@@ -435,7 +420,6 @@ DSError TRKDoContinue(TRKBuffer*) {
     }
 }
 
-/* 8036DE64-8036E084 3687A4 0220+00 0/0 1/1 0/0 .text            TRKDoStep */
 DSError TRKDoStep(TRKBuffer* b) {
     DSError result;
     u8 options;
@@ -487,7 +471,6 @@ DSError TRKDoStep(TRKBuffer* b) {
     }
 }
 
-/* 8036DDBC-8036DE64 3686FC 00A8+00 0/0 1/1 0/0 .text            TRKDoStop */
 DSError TRKDoStop(TRKBuffer* b) {
     MessageCommandID c;
 
@@ -514,7 +497,6 @@ DSError TRKDoStop(TRKBuffer* b) {
     return DS_NoError;
 }
 
-/* 8036DD14-8036DDBC 368654 00A8+00 0/0 1/1 0/0 .text            TRKDoSetOption */
 DSError TRKDoSetOption(TRKBuffer* message) {
     u8 enable = message->data[0xc];
 
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c
index 5678a17d73..91fbed5a1a 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mutex_TRK.c
@@ -5,17 +5,14 @@
 
 #include "trk.h"
 
-/* 8036F4A8-8036F4B0 369DE8 0008+00 0/0 2/2 0/0 .text            TRKInitializeMutex */
 DSError TRKInitializeMutex(void*) {
     return DS_NoError;
 }
 
-/* 8036F4A0-8036F4A8 369DE0 0008+00 0/0 6/6 0/0 .text            TRKAcquireMutex */
 DSError TRKAcquireMutex(void*) {
     return DS_NoError;
 }
 
-/* 8036F498-8036F4A0 369DD8 0008+00 0/0 6/6 0/0 .text            TRKReleaseMutex */
 DSError TRKReleaseMutex(void*) {
     return DS_NoError;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c
index 11baea7cf0..b27c777763 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c
@@ -1,7 +1,6 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/notify.h"
 #include "trk.h"
 
-/* 8036F4B0-8036F548 369DF0 0098+00 0/0 1/1 0/0 .text            TRKDoNotifyStopped */
 DSError TRKDoNotifyStopped(MessageCommandID cmd) {
     int reqIdx;
     int bufIdx;
@@ -26,4 +25,4 @@ DSError TRKDoNotifyStopped(MessageCommandID cmd) {
         TRKReleaseBuffer(bufIdx);
     }
     return err;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c
index b0b7056987..dde0b4bf61 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c
@@ -2,7 +2,6 @@
 
 TRKEventQueue gTRKEventQueue;
 
-/* 8036CDE8-8036CE40 367728 0058+00 0/0 1/1 0/0 .text            TRKInitializeEventQueue */
 DSError TRKInitializeEventQueue() {
     TRKInitializeMutex(&gTRKEventQueue);
     TRKAcquireMutex(&gTRKEventQueue);
@@ -13,7 +12,6 @@ DSError TRKInitializeEventQueue() {
     return DS_NoError;
 }
 
-/* 8036CD34-8036CDE8 367674 00B4+00 0/0 1/1 0/0 .text            TRKGetNextEvent */
 BOOL TRKGetNextEvent(TRKEvent* event) {
     BOOL status = 0;
     TRKAcquireMutex(&gTRKEventQueue);
@@ -29,7 +27,6 @@ BOOL TRKGetNextEvent(TRKEvent* event) {
     return status;
 }
 
-/* 8036CC54-8036CD34 367594 00E0+00 0/0 5/5 0/0 .text            TRKPostEvent */
 DSError TRKPostEvent(TRKEvent* event) {
     DSError ret = DS_NoError;
     int nextEventID;
@@ -55,14 +52,12 @@ DSError TRKPostEvent(TRKEvent* event) {
     return ret;
 }
 
-/* 8036CC3C-8036CC54 36757C 0018+00 0/0 5/5 0/0 .text            TRKConstructEvent */
 void TRKConstructEvent(TRKEvent* event, NubEventType eventType) {
     event->eventType = eventType;
     event->eventID = 0;
     event->msgBufID = -1;
 }
 
-/* 8036CC18-8036CC3C 367558 0024+00 0/0 1/1 0/0 .text            TRKDestructEvent */
 void TRKDestructEvent(TRKEvent* event) {
     TRKReleaseBuffer(event->msgBufID);
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c
index 30b70d0125..451aad2e9e 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c
@@ -1,16 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: MetroTRK/Portable/nubinit
-//
-
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.h"
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.h"
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 
-/* 8044D8B8-8044D8C0 07A5D8 0004+04 1/1 4/4 0/0 .bss             gTRKBigEndian */
 BOOL gTRKBigEndian;
 
-/* 8036CE8C-8036CFD8 3677CC 014C+00 0/0 1/1 0/0 .text            TRKInitializeNub */
 DSError TRKInitializeNub(void) {
     DSError ret;
     DSError uartErr;
@@ -47,13 +40,11 @@ DSError TRKInitializeNub(void) {
     return ret;
 }
 
-/* 8036CE68-8036CE8C 3677A8 0024+00 0/0 1/1 0/0 .text            TRKTerminateNub */
 DSError TRKTerminateNub(void) {
     TRKTerminateSerialHandler();
     return DS_NoError;
 }
 
-/* 8036CE40-8036CE68 367780 0028+00 0/0 1/1 0/0 .text            TRKNubWelcome */
 void TRKNubWelcome(void) {
     TRK_board_display("MetroTRK for GAMECUBE v2.6");
     return;
@@ -77,4 +68,4 @@ BOOL TRKInitializeEndian(void) {
         result = TRUE;
     }
     return result;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c
index 0b22247370..7ac1a7e406 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c
@@ -3,13 +3,10 @@
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 #include "trk.h"
 
-/* 8044F270-8044F288 07BF90 0014+04 3/3 0/0 0/0 .bss             gTRKFramingState */
 static TRKFramingState gTRKFramingState;
 
-/* 804519B8-804519C0 000EB8 0004+04 0/0 2/2 0/0 .sbss            gTRKInputPendingPtr */
 void* gTRKInputPendingPtr;
 
-/* 8036D9D4-8036DB10 368314 013C+00 1/1 1/1 0/0 .text            TRKTestForPacket */
 MessageBufferID TRKTestForPacket() {
     u8 payloadBuf[0x880];
     u8 packetBuf[0x40];
@@ -52,7 +49,6 @@ MessageBufferID TRKTestForPacket() {
     return result;
 }
 
-/* 8036D974-8036D9D4 3682B4 0060+00 0/0 1/1 0/0 .text            TRKGetInput */
 void TRKGetInput(void) {
     MessageBufferID id = TRKTestForPacket();
     if (id != -1) {
@@ -65,7 +61,6 @@ void TRKGetInput(void) {
     }
 }
 
-/* 8036D924-8036D974 368264 0050+00 0/0 1/1 0/0 .text            TRKProcessInput */
 void TRKProcessInput(int bufferIdx) {
     TRKEvent event;
 
@@ -75,7 +70,6 @@ void TRKProcessInput(int bufferIdx) {
     TRKPostEvent(&event);
 }
 
-/* 8036D860-8036D924 3681A0 00C4+00 0/0 1/1 0/0 .text            TRKInitializeSerialHandler */
 DSError TRKInitializeSerialHandler() {
     gTRKFramingState.msgBufID = -1;
     gTRKFramingState.receiveState = DSRECV_Wait;
@@ -91,7 +85,6 @@ DSError TRKInitializeSerialHandler() {
     return DS_NoError;
 }
 
-/* 8036D858-8036D860 368198 0008+00 0/0 1/1 0/0 .text            TRKTerminateSerialHandler */
 DSError TRKTerminateSerialHandler(void) {
     return DS_NoError;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c
index ad54c84636..bef5bf5a7e 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c
@@ -3,7 +3,6 @@
 #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h"
 #include <string.h>
 
-/* 8036F278-8036F498 369BB8 0220+00 0/0 1/1 0/0 .text            TRKSuppAccessFile */
 DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult* io_result,
                           BOOL need_reply, BOOL read) {
     DSError error;
@@ -91,7 +90,6 @@ DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult*
     return error;
 }
 
-/* 8036F098-8036F278 3699D8 01E0+00 4/4 1/1 0/0 .text            TRKRequestSend */
 DSError TRKRequestSend(TRKBuffer* msgBuf, int* bufferId, u32 p1, u32 p2, int p3) {
     int error = DS_NoError;
     TRKBuffer* buffer;
@@ -169,7 +167,6 @@ DSError TRKRequestSend(TRKBuffer* msgBuf, int* bufferId, u32 p1, u32 p2, int p3)
     return error;
 }
 
-/* 8036EF7C-8036F098 3698BC 011C+00 0/0 1/1 0/0 .text            HandleOpenFileSupportRequest */
 DSError HandleOpenFileSupportRequest(const char* path, u8 replyError, u32* param_3,
                                      DSIOResult* ioResult) {
     DSError error;
@@ -208,7 +205,6 @@ DSError HandleOpenFileSupportRequest(const char* path, u8 replyError, u32* param
     return error;
 }
 
-/* 8036EE94-8036EF7C 3697D4 00E8+00 0/0 1/1 0/0 .text            HandleCloseFileSupportRequest */
 DSError HandleCloseFileSupportRequest(int replyError, DSIOResult* ioResult) {
     DSError error;
     int replyBufferId;
@@ -246,7 +242,6 @@ DSError HandleCloseFileSupportRequest(int replyError, DSIOResult* ioResult) {
     return error;
 }
 
-/* 8036ED84-8036EE94 3696C4 0110+00 0/0 1/1 0/0 .text            HandlePositionFileSupportRequest */
 DSError HandlePositionFileSupportRequest(DSReplyError replyErr, u32* param_2, u8 param_3,
                                          DSIOResult* ioResult) {
     DSError error;
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c
index 076f5a2483..fcfbd12a37 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c
@@ -5,7 +5,6 @@
 
 #include "dolphin/types.h"
 
-/* 8036F548-8036F580 369E88 0038+00 0/0 5/5 0/0 .text            TRK_flush_cache */
 asm void TRK_flush_cache(u32, int) {
     // clang-format off
     nofralloc
@@ -28,4 +27,4 @@ loop:
     isync 
     blr
     // clang-format on
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c
index 63c9449cd2..98683f938c 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c
@@ -3,7 +3,6 @@
 
 extern u8 gTRKRestoreFlags[9 + 3 /* padding */];
 
-/* 803711F0-803713A8 36BB30 01B8+00 0/0 3/3 0/0 .text            TRKSaveExtended1Block */
 asm void TRKSaveExtended1Block() {
     // clang-format off
     nofralloc
@@ -122,7 +121,6 @@ lbl_80371340:
     // clang-format on
 }
 
-/* 803713A8-80371560 36BCE8 01B8+00 0/0 1/1 0/0 .text            TRKRestoreExtended1Block */
 asm void TRKRestoreExtended1Block() {
     // clang-format off
     nofralloc
@@ -241,4 +239,4 @@ lbl_8037149C:
     mtspr 0x11a, r31
     blr
     // clang-format on
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
index f2b52b2f4d..0a749db364 100644
--- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
+++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c
@@ -81,7 +81,6 @@ void TRK_ppc_memcpy(register void* dest, register const void* src, register int
 void TRKRestoreExtended1Block();
 void TRKUARTInterruptHandler();
 
-/* 80370F20-803711C4 36B860 02A4+00 1/1 0/0 0/0 .text            TRKValidMemory32 */
 DSError TRKValidMemory32(const void* addr, size_t length, ValidMemoryOptions readWriteable) {
     DSError err = DS_InvalidMemory; /* assume range is invalid */
 
@@ -162,7 +161,6 @@ DSError TRKValidMemory32(const void* addr, size_t length, ValidMemoryOptions rea
     return err;
 }
 
-/* 80370DD4-80370F20 36B714 014C+00 1/1 2/2 0/0 .text            TRKTargetAccessMemory */
 DSError TRKTargetAccessMemory(void* data, u32 start, size_t* length,
                               MemoryAccessOptions accessOptions, BOOL read) {
     DSError error;
@@ -201,7 +199,6 @@ DSError TRKTargetAccessMemory(void* data, u32 start, size_t* length,
     return error;
 }
 
-/* 80370D88-80370DD4 36B6C8 004C+00 3/3 0/0 0/0 .text            TRKTargetReadInstruction */
 DSError TRKTargetReadInstruction(void* data, u32 start) {
     DSError error;
     size_t registersLength = 4;
@@ -215,7 +212,6 @@ DSError TRKTargetReadInstruction(void* data, u32 start) {
     return error;
 }
 
-/* 80370C94-80370D88 36B5D4 00F4+00 0/0 2/2 0/0 .text            TRKTargetAccessDefault */
 DSError TRKTargetAccessDefault(u32 firstRegister, u32 lastRegister, TRKBuffer* b,
                                size_t* registersLengthPtr, BOOL read) {
     DSError error;
@@ -249,7 +245,6 @@ DSError TRKTargetAccessDefault(u32 firstRegister, u32 lastRegister, TRKBuffer* b
     return error;
 }
 
-/* 80370788-80370C94 36B0C8 050C+00 0/0 2/2 0/0 .text            TRKTargetAccessFP */
 DSError TRKTargetAccessFP(u32 firstRegister, u32 lastRegister, TRKBuffer* b,
                           size_t* registersLengthPtr, BOOL read) {
     u64 temp;
@@ -290,7 +285,6 @@ DSError TRKTargetAccessFP(u32 firstRegister, u32 lastRegister, TRKBuffer* b,
     return error;
 }
 
-/* 80370618-80370788 36AF58 0170+00 0/0 2/2 0/0 .text            TRKTargetAccessExtended1 */
 DSError TRKTargetAccessExtended1(u32 firstRegister, u32 lastRegister, TRKBuffer* b,
                                  size_t* registersLengthPtr, BOOL read) {
     TRKExceptionStatus tempExceptionStatus;
@@ -338,7 +332,6 @@ DSError TRKTargetAccessExtended1(u32 firstRegister, u32 lastRegister, TRKBuffer*
     return error;
 }
 
-/* 803701E0-80370618 36AB20 0438+00 0/0 2/2 0/0 .text            TRKTargetAccessExtended2 */
 DSError TRKTargetAccessExtended2(u32 firstRegister, u32 lastRegister, TRKBuffer* b,
                                  size_t* registerStorageSize, BOOL read) {
     TRKExceptionStatus savedException;
@@ -393,7 +386,6 @@ DSError TRKTargetAccessExtended2(u32 firstRegister, u32 lastRegister, TRKBuffer*
     return err;
 }
 
-/* 80370134-803701E0 36AA74 00AC+00 2/2 0/0 0/0 .text            TRKPostInterruptEvent */
 void TRKPostInterruptEvent(void) {
     int eventType;
     int local_14;
@@ -425,7 +417,6 @@ void TRKPostInterruptEvent(void) {
     }
 }
 
-/* 8036FFA4-80370134 36A8E4 0190+00 0/0 1/1 0/0 .text            TRKTargetInterrupt */
 DSError TRKTargetInterrupt(TRKEvent* event) {
     DSError error = DS_NoError;
     switch (event->eventType) {
@@ -443,7 +434,6 @@ DSError TRKTargetInterrupt(TRKEvent* event) {
     return error;
 }
 
-/* 8036FF18-8036FFA4 36A858 008C+00 0/0 1/1 0/0 .text            TRKTargetAddStopInfo */
 u32* ConvertAddress(u32 addr) {
     return (u32*)(addr | 0x80000000);
 }
@@ -464,7 +454,6 @@ DSError TRKTargetAddStopInfo(TRKBuffer* b) {
     return error;
 }
 
-/* 8036FE94-8036FF18 36A7D4 0084+00 0/0 1/1 0/0 .text            TRKTargetAddExceptionInfo */
 void TRKTargetAddExceptionInfo(TRKBuffer* b) {
     size_t local_58;
     u32 local_54;
@@ -545,7 +534,6 @@ static BOOL TRKTargetCheckStep() {
     return gTRKStepStatus.active;
 }
 
-/* 8036FDE8-8036FE94 36A728 00AC+00 0/0 1/1 0/0 .text            TRKTargetSingleStep */
 DSError TRKTargetSingleStep(u32 count, BOOL stepOver) {
     DSError error = DS_NoError;
 
@@ -560,7 +548,6 @@ DSError TRKTargetSingleStep(u32 count, BOOL stepOver) {
     return error;
 }
 
-/* 8036FD30-8036FDE8 36A670 00B8+00 0/0 1/1 0/0 .text            TRKTargetStepOutOfRange */
 DSError TRKTargetStepOutOfRange(u32 rangeStart, u32 rangeEnd, BOOL stepOver) {
     DSError error = DS_NoError;
 
@@ -578,12 +565,10 @@ DSError TRKTargetStepOutOfRange(u32 rangeStart, u32 rangeEnd, BOOL stepOver) {
     return error;
 }
 
-/* 8036FD20-8036FD30 36A660 0010+00 0/0 1/1 0/0 .text            TRKTargetGetPC */
 u32 TRKTargetGetPC() {
     return gTRKCPUState.Default.PC;
 }
 
-/* 8036FB20-8036FD20 36A460 0200+00 0/0 1/1 0/0 .text            TRKTargetSupportRequest */
 DSError TRKTargetSupportRequest() {
     DSIOResult ioResult;
     size_t* length;
@@ -649,17 +634,14 @@ DSError TRKTargetSupportRequest() {
     return error;
 }
 
-/* 8036FB10-8036FB20 36A450 0010+00 0/0 3/3 0/0 .text            TRKTargetStopped */
 BOOL TRKTargetStopped() {
     return gTRKState.isStopped;
 }
 
-/* 8036FB00-8036FB10 36A440 0010+00 0/0 1/1 0/0 .text            TRKTargetSetStopped */
 void TRKTargetSetStopped(unsigned int stopped) {
     gTRKState.isStopped = stopped;
 }
 
-/* 8036FAE8-8036FB00 36A428 0018+00 0/0 1/1 0/0 .text            TRKTargetStop */
 u32 TRKTargetStop() {
     gTRKState.isStopped = TRUE;
     return 0;
@@ -810,12 +792,10 @@ DSError TRKPPCAccessSpecialReg(void* value, u32* access_func, BOOL read) {
     return DS_NoError;
 }
 
-/* 8036FAD8-8036FAE8 36A418 0010+00 0/0 1/1 0/0 .text            TRKTargetSetInputPendingPtr */
 void TRKTargetSetInputPendingPtr(void* ptr) {
     gTRKState.inputPendingPtr = ptr;
 }
 
-/* 8036FA14-8036FAD8 36A354 00C4+00 0/0 2/2 0/0 .text            TRKTargetAccessARAM */
 DSError TRKTargetAccessARAM(u32 p1, u32 p2, u32* p3, BOOL read) {
     DSError err;
     TRKExceptionStatus status;
@@ -839,7 +819,6 @@ DSError TRKTargetAccessARAM(u32 p1, u32 p2, u32* p3, BOOL read) {
     return err;
 }
 
-/* 8036F638-8036F640 -00001 0008+00 0/0 0/0 0/0 .text            __TRK_get_MSR */
 asm u32 __TRK_get_MSR() {
     // clang-format off
 	nofralloc
@@ -848,7 +827,6 @@ asm u32 __TRK_get_MSR() {
     // clang-format on
 }
 
-/* 8036F640-8036F648 -00001 0008+00 0/0 0/0 0/0 .text            __TRK_set_MSR */
 asm void __TRK_set_MSR(register u32) {
     // clang-format off
 	nofralloc
@@ -857,7 +835,6 @@ asm void __TRK_set_MSR(register u32) {
     // clang-format on
 }
 
-/* 8036F648-8036F684 369F88 003C+00 1/1 0/0 0/0 .text            TRK_ppc_memcpy */
 static asm void TRK_ppc_memcpy(register void* dest, register const void* src, register int n,
                                register u32 param_4, register u32 param_5) {
     // clang-format off
@@ -897,7 +874,6 @@ static asm void TRK_ppc_memcpy(register void* dest, register const void* src, re
     // clang-format on
 }
 
-/* 8036F684-8036F818 369FC4 0194+00 0/0 1/1 0/0 .text            TRKInterruptHandler */
 asm void TRKInterruptHandler() {
     // clang-format off
 	nofralloc
@@ -1007,7 +983,6 @@ L_802CF694:
     // clang-format on
 }
 
-/* 8036F818-8036F8B4 36A158 009C+00 1/1 0/0 0/0 .text            TRKExceptionHandler */
 static asm void TRKExceptionHandler(u16) {
     // clang-format off
 	nofralloc
@@ -1055,7 +1030,6 @@ LAB_00010bb0:
     // clang-format on
 }
 
-/* 8036F8B4-8036F978 36A1F4 00C4+00 0/0 1/1 0/0 .text            TRKSwapAndGo */
 asm void TRKSwapAndGo() {
     // clang-format off
 	nofralloc
@@ -1112,8 +1086,6 @@ L_802CF930:
     // clang-format on
 }
 
-/* 8036F978-8036F9CC 36A2B8 0054+00 1/1 0/0 0/0 .text            TRKInterruptHandlerEnableInterrupts
- */
 asm void TRKInterruptHandlerEnableInterrupts(void) {
     // clang-format off
 	nofralloc;
@@ -1141,7 +1113,6 @@ asm void TRKInterruptHandlerEnableInterrupts(void) {
     // clang-format on
 }
 
-/* 8036F9CC-8036F9F0 36A30C 0024+00 1/1 0/0 0/0 .text            ReadFPSCR */
 asm void ReadFPSCR(register f64*) {
     // clang-format off
 	nofralloc
@@ -1157,7 +1128,6 @@ asm void ReadFPSCR(register f64*) {
     // clang-format on
 }
 
-/* 8036F9F0-8036FA14 36A330 0024+00 1/1 0/0 0/0 .text            WriteFPSCR */
 asm void WriteFPSCR(register f64*) {
     // clang-format off
 	nofralloc
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c
index ee439979ca..43c1dbe374 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c
@@ -8,16 +8,12 @@
 
 #define DDH_BUF_SIZE (0x800)
 
-/* 80450030-80450050 07CD50 001C+04 3/3 0/0 0/0 .bss             gRecvCB */
 static CircleBuffer gRecvCB;
 
-/* 8044F830-80450030 07C550 0800+00 1/1 0/0 0/0 .bss             gRecvBuf */
 static u8 gRecvBuf[DDH_BUF_SIZE];
 
-/* 804519C0-804519C8 000EC0 0004+04 3/3 0/0 0/0 .sbss            gIsInitialized */
 static BOOL gIsInitialized;
 
-/* 80372618-803726A0 36CF58 0088+00 0/0 1/1 0/0 .text            ddh_cc_initialize */
 int ddh_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
     MWTRACE(1, "CALLING EXI2_Init\n");
     EXI2_Init(inputPendingPtrRef, monitorCallback);
@@ -26,12 +22,10 @@ int ddh_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
     return 0;
 }
 
-/* 80372610-80372618 36CF50 0008+00 0/0 1/1 0/0 .text            ddh_cc_shutdown */
 int ddh_cc_shutdown() {
     return 0;
 }
 
-/* 803725EC-80372610 36CF2C 0024+00 0/0 1/1 0/0 .text            ddh_cc_open */
 int ddh_cc_open() {
     if (gIsInitialized != 0) {
         return DDH_ERR_ALREADY_INITIALIZED;
@@ -41,12 +35,10 @@ int ddh_cc_open() {
     return 0;
 }
 
-/* 803725E4-803725EC 36CF24 0008+00 0/0 1/1 0/0 .text            ddh_cc_close */
 int ddh_cc_close() {
     return 0;
 }
 
-/* 803724F8-803725E4 36CE38 00EC+00 0/0 1/1 0/0 .text            ddh_cc_read */
 int ddh_cc_read(u8* data, int size) {
     u8 buff[DDH_BUF_SIZE];
     int originalDataSize;
@@ -83,7 +75,6 @@ int ddh_cc_read(u8* data, int size) {
     return result;
 }
 
-/* 80372438-803724F8 36CD78 00C0+00 0/0 1/1 0/0 .text            ddh_cc_write */
 int ddh_cc_write(const u8* bytes, int length) {
     int exi2Len;
     int n_copy;
@@ -112,19 +103,16 @@ int ddh_cc_write(const u8* bytes, int length) {
     return 0;
 }
 
-/* 80372414-80372438 36CD54 0024+00 0/0 1/1 0/0 .text            ddh_cc_pre_continue */
 int ddh_cc_pre_continue() {
     EXI2_Unreserve();
     return 0;
 }
 
-/* 803723F0-80372414 36CD30 0024+00 0/0 1/1 0/0 .text            ddh_cc_post_stop */
 int ddh_cc_post_stop() {
     EXI2_Reserve();
     return 0;
 }
 
-/* 80372380-803723F0 36CCC0 0070+00 0/0 1/1 0/0 .text            ddh_cc_peek */
 int ddh_cc_peek() {
     int poll;
     u8 buff[DDH_BUF_SIZE];
@@ -143,7 +131,6 @@ int ddh_cc_peek() {
     return poll;
 }
 
-/* 8037235C-80372380 36CC9C 0024+00 0/0 1/1 0/0 .text            ddh_cc_initinterrupts */
 int ddh_cc_initinterrupts() {
     EXI2_EnableInterrupts();
     return 0;
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
index 10a3706b47..9e8a51a5a9 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
@@ -5,16 +5,12 @@
 
 #define GDEV_BUF_SIZE (0x500)
 
-/* 80450550-8045056C 07D270 001C+00 3/3 0/0 0/0 .bss             gRecvCB */
 static CircleBuffer gRecvCB;
 
-/* 80450050-80450550 07CD70 0500+00 1/1 0/0 0/0 .bss             gRecvBuf */
 static u8 gRecvBuf[GDEV_BUF_SIZE];
 
-/* 804519C8-804519D0 000EC8 0004+04 3/3 0/0 0/0 .sbss            gIsInitialized */
 static BOOL gIsInitialized;
 
-/* 80372BCC-80372C54 36D50C 0088+00 0/0 1/1 0/0 .text            gdev_cc_initialize */
 int gdev_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
     MWTRACE(1, "CALLING EXI2_Init\n");
     DBInitComm(inputPendingPtrRef, (int*)monitorCallback);
@@ -23,12 +19,10 @@ int gdev_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
     return 0;
 }
 
-/* 80372BC4-80372BCC 36D504 0008+00 0/0 1/1 0/0 .text            gdev_cc_shutdown */
 int gdev_cc_shutdown() {
     return 0;
 }
 
-/* 80372BA0-80372BC4 36D4E0 0024+00 0/0 1/1 0/0 .text            gdev_cc_open */
 int gdev_cc_open() {
     if (gIsInitialized != 0) {
         return -10005;
@@ -38,12 +32,10 @@ int gdev_cc_open() {
     return 0;
 }
 
-/* 80372B98-80372BA0 36D4D8 0008+00 0/0 1/1 0/0 .text            gdev_cc_close */
 int gdev_cc_close() {
     return 0;
 }
 
-/* 80372AA4-80372B98 36D3E4 00F4+00 0/0 1/1 0/0 .text            gdev_cc_read */
 int gdev_cc_read(u8* data, int size) {
     u8 buff[GDEV_BUF_SIZE];
     int p1;
@@ -79,7 +71,6 @@ int gdev_cc_read(u8* data, int size) {
     return retval;
 }
 
-/* 803729E4-80372AA4 36D324 00C0+00 0/0 1/1 0/0 .text            gdev_cc_write */
 int gdev_cc_write(const u8* bytes, int length) {
     int exi2Len;
     int n_copy;
@@ -108,19 +99,16 @@ int gdev_cc_write(const u8* bytes, int length) {
     return 0;
 }
 
-/* 803729C0-803729E4 36D300 0024+00 0/0 1/1 0/0 .text            gdev_cc_pre_continue */
 int gdev_cc_pre_continue() {
     DBClose();
     return 0;
 }
 
-/* 8037299C-803729C0 36D2DC 0024+00 0/0 1/1 0/0 .text            gdev_cc_post_stop */
 int gdev_cc_post_stop() {
     DBOpen();
     return 0;
 }
 
-/* 8037292C-8037299C 36D26C 0070+00 0/0 1/1 0/0 .text            gdev_cc_peek */
 int gdev_cc_peek() {
     int poll;
     u8 buff[GDEV_BUF_SIZE];
@@ -139,7 +127,6 @@ int gdev_cc_peek() {
     return poll;
 }
 
-/* 80372908-8037292C 36D248 0024+00 0/0 1/1 0/0 .text            gdev_cc_initinterrupts */
 int gdev_cc_initinterrupts() {
     DBInitInterrupts();
     return 0;
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c
index 7f96b25602..81b8825b10 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c
@@ -1,11 +1,9 @@
 #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h"
 
-/* 80372900-80372908 36D240 0008+00 0/0 2/2 0/0 .text            CBGetBytesAvailableForRead */
 u32 CBGetBytesAvailableForRead(CircleBuffer* cb) {
     return cb->mBytesToRead;
 }
 
-/* 803728B0-80372900 36D1F0 0050+00 0/0 2/2 0/0 .text            CircleBufferInitialize */
 void CircleBufferInitialize(CircleBuffer* cb, u8* buf, s32 size) {
     cb->start_ptr = buf;
     cb->size = size;
@@ -16,7 +14,6 @@ void CircleBufferInitialize(CircleBuffer* cb, u8* buf, s32 size) {
     MWInitializeCriticalSection(&cb->mCriticalSection);
 }
 
-/* 803727A8-803728B0 36D0E8 0108+00 0/0 4/4 0/0 .text            CircleBufferWriteBytes */
 int CircleBufferWriteBytes(CircleBuffer* cb, u8* buf, u32 size) {
     int availSize;
 
@@ -44,7 +41,6 @@ int CircleBufferWriteBytes(CircleBuffer* cb, u8* buf, u32 size) {
     return 0;
 }
 
-/* 803726A0-803727A8 36CFE0 0108+00 0/0 2/2 0/0 .text            CircleBufferReadBytes */
 int CircleBufferReadBytes(CircleBuffer* cb, u8* buf, u32 size) {
     int availSize;
 
@@ -70,4 +66,4 @@ int CircleBufferReadBytes(CircleBuffer* cb, u8* buf, u32 size) {
     cb->mBytesToRead -= size;
     MWExitCriticalSection(&cb->mCriticalSection);
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c
index 594123540a..73efd5b6ea 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c
@@ -5,5 +5,4 @@
 
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
 
-/* 80372C54-80372CA4 36D594 0050+00 0/0 22/22 0/0 .text            MWTRACE */
-void MWTRACE(u8, char*, ...) {}
\ No newline at end of file
+void MWTRACE(u8, char*, ...) {}
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c
index c4bf0be06f..2159c27d3f 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c
@@ -8,15 +8,12 @@
 extern BOOL OSRestoreInterrupts(unsigned int);
 extern unsigned int OSDisableInterrupts();
 
-/* 80372CF8-80372CFC 36D638 0004+00 0/0 1/1 0/0 .text            MWInitializeCriticalSection */
 extern void MWInitializeCriticalSection(unsigned int*) {}
 
-/* 80372CC8-80372CF8 36D608 0030+00 0/0 2/2 0/0 .text            MWEnterCriticalSection */
 extern void MWEnterCriticalSection(unsigned int* section) {
     *section = OSDisableInterrupts();
 }
 
-/* 80372CA4-80372CC8 36D5E4 0024+00 0/0 2/2 0/0 .text            MWExitCriticalSection */
 extern void MWExitCriticalSection(unsigned int* section) {
     OSRestoreInterrupts(*section);
-}
\ No newline at end of file
+}
diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp
index a2491c9762..dd7baa72ca 100644
--- a/src/Z2AudioLib/Z2Audience.cpp
+++ b/src/Z2AudioLib/Z2Audience.cpp
@@ -8,15 +8,11 @@
 #include "JSystem/JGeometry.h"
 #include "JSystem/J3DU/J3DUD.h"
 
-/* 802BBCDC-802BBD18 2B661C 003C+00 1/1 0/0 0/0 .text
- * calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3<f>              */
 void Z2AudibleAbsPos::calc(const JGeometry::TVec3<f32>& pos) {
     velocity_.sub(pos, field_0x0);
     field_0x0.set(pos);
 }
 
-/* 802BBD18-802BBD94 2B6658 007C+00 1/1 0/0 0/0 .text
- * init__15Z2AudibleAbsPosFPQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f>PCQ29JGeometry8TVec3<f> */
 void Z2AudibleAbsPos::init(JGeometry::TVec3<f32>* param_0, const JGeometry::TVec3<f32>& param_1,
                            const JGeometry::TVec3<f32>* param_2) {
     param_0->set(param_1);
@@ -30,8 +26,6 @@ void Z2AudibleAbsPos::init(JGeometry::TVec3<f32>* param_0, const JGeometry::TVec
     }
 }
 
-/* 802BBD94-802BBE74 2B66D4 00E0+00 1/1 0/0 0/0 .text
- * __ct__9Z2AudibleFRCQ29JGeometry8TVec3<f>PCQ29JGeometry8TVec3<f>Ulb */
 Z2Audible::Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f32>* param_1,
                      u32 channel, bool param_3) {
     mParam.field_0x0.raw = 0xFFFFFFFF;
@@ -48,25 +42,20 @@ Z2Audible::Z2Audible(const JGeometry::TVec3<f32>& pos, const JGeometry::TVec3<f3
     }
 }
 
-/* 802BBE74-802BBE98 2B67B4 0024+00 1/1 0/0 0/0 .text            __ct__16Z2AudibleChannelFv */
 Z2AudibleChannel::Z2AudibleChannel() {}
 
-/* 802BBE98-802BBED0 2B67D8 0038+00 1/0 0/0 0/0 .text            calc__9Z2AudibleFv */
 void Z2Audible::calc() {
     if (isDoppler()) {
         mAbsPos.calc(mPos);
     }
 }
 
-/* 802BBED0-802BBEE4 2B6810 0014+00 1/0 0/0 0/0 .text            getOuterParams__9Z2AudibleFi */
 JASSoundParams* Z2Audible::getOuterParams(int index) {
     JUT_ASSERT(80, index >= 0);
     JUT_ASSERT(81, index < 1);
     return &mChannel[index].mParams;
 }
 
-/* 802BBEE4-802BC204 2B6824 0320+00 1/1 0/0 0/0 .text
- * setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi */
 void Z2Audible::setOuterParams(const JASSoundParams& outParams, const JASSoundParams& inParams,
                                int index) {
     JUT_ASSERT(89, index >= 0);
@@ -145,14 +134,12 @@ void Z2Audible::setOuterParams(const JASSoundParams& outParams, const JASSoundPa
     channel->mDolby = params.mDolby;
 }
 
-/* 802BC204-802BC218 2B6B44 0014+00 4/4 0/0 0/0 .text            getChannel__9Z2AudibleFi */
 Z2AudibleChannel* Z2Audible::getChannel(int index) {
     JUT_ASSERT(220, index >= 0);
     JUT_ASSERT(221, index < 1);
     return &mChannel[index];
 }
 
-/* 802BC218-802BC248 2B6B58 0030+00 3/3 0/0 0/0 .text            getDistVolBit__9Z2AudibleFv */
 u32 Z2Audible::getDistVolBit() {
     u16 uVar1 = getAudibleParam()->field_0x0.half.f1;
     if (uVar1 != 0) {
@@ -167,14 +154,12 @@ u32 Z2Audible::getDistVolBit() {
     return 0;
 }
 
-/* 802BC248-802BC284 2B6B88 003C+00 1/1 0/0 0/0 .text            __ct__19Z2Audience3DSettingFv */
 Z2Audience3DSetting::Z2Audience3DSetting() {
     mVolumeDistInit = false;
     mDolbyDistInit = false;
     init();
 }
 
-/* 802BC284-802BC308 2B6BC4 0084+00 1/1 0/0 0/0 .text            init__19Z2Audience3DSettingFv */
 void Z2Audience3DSetting::init() {
     field_0x40 = Z2Param::MIN_DISTANCE_VOLUME;
     field_0x48 = Z2Param::DOLBY_BEHIND_DISTANCE_MAX;
@@ -191,7 +176,6 @@ void Z2Audience3DSetting::init() {
     initDolbyDist();
 }
 
-/* 802BC308-802BC4D0 2B6C48 01C8+00 2/2 0/0 0/0 .text initVolumeDist__19Z2Audience3DSettingFv */
 void Z2Audience3DSetting::initVolumeDist() {
     if (mVolumeDistInit) return;
 
@@ -205,10 +189,8 @@ void Z2Audience3DSetting::initVolumeDist() {
     mVolumeDistInit = true;
 }
 
-/* 80451350-80451354 000850 0004+00 2/2 0/0 0/0 .sbss            cNearFarRatio */
 static f32 cNearFarRatio = Z2Param::MAX_VOLUME_DISTANCE / Z2Param::DISTANCE_MAX;
 
-/* 802BC4D0-802BC6A4 2B6E10 01D4+00 1/1 0/0 0/0 .text updateVolumeDist__19Z2Audience3DSettingFf */
 void Z2Audience3DSetting::updateVolumeDist(f32 param_0) {
     field_0x0[0] = param_0;
 
@@ -225,7 +207,6 @@ void Z2Audience3DSetting::updateVolumeDist(f32 param_0) {
     mVolumeDistInit = false;
 }
 
-/* 802BC6A4-802BC6F8 2B6FE4 0054+00 1/1 0/0 0/0 .text initDolbyDist__19Z2Audience3DSettingFv */
 void Z2Audience3DSetting::initDolbyDist() {
     if (!mDolbyDistInit) {
         field_0x44 = Z2Param::DOLBY_FLONT_DISTANCE_MAX;
@@ -236,7 +217,6 @@ void Z2Audience3DSetting::initDolbyDist() {
     }
 }
 
-/* 802BC6F8-802BC758 2B7038 0060+00 1/1 0/0 0/0 .text updateDolbyDist__19Z2Audience3DSettingFff */
 void Z2Audience3DSetting::updateDolbyDist(f32 param_0, f32 param_1) {
     if (param_0 > -1.0f * Z2Param::DOLBY_FLONT_DISTANCE_MAX) {
         field_0x44 = -1.0f * param_0;
@@ -257,7 +237,6 @@ void Z2Audience3DSetting::updateDolbyDist(f32 param_0, f32 param_1) {
     mDolbyDistInit = false;
 }
 
-/* 802BC758-802BC788 2B7098 0030+00 1/1 0/0 0/0 .text            __ct__13Z2AudioCameraFv */
 Z2AudioCamera::Z2AudioCamera() {
     mFovySin = 1.0f;
     mVolCenterZ = 0.0f;
@@ -269,7 +248,6 @@ Z2AudioCamera::Z2AudioCamera() {
     mSetMainCamera = 0;
 }
 
-/* 802BC788-802BC7DC 2B70C8 0054+00 1/1 0/0 0/0 .text            init__13Z2AudioCameraFv */
 void Z2AudioCamera::init() {
     JGeometry::TPosition3f32 aTStack_38;
     aTStack_38.identity();
@@ -278,8 +256,6 @@ void Z2AudioCamera::init() {
     setCameraState(aTStack_38, *(Vec*)&VStack_44, true);
 }
 
-/* 802BC7DC-802BC8AC 2B711C 00D0+00 2/2 0/0 0/0 .text setCameraState__13Z2AudioCameraFPA4_CfR3Vecb
- */
 void Z2AudioCamera::setCameraState(f32 const (*param_0)[4], Vec& pos, bool param_2) {
     field_0x0.set(param_0);
     if (param_2) {
@@ -293,8 +269,6 @@ void Z2AudioCamera::setCameraState(f32 const (*param_0)[4], Vec& pos, bool param
     }
 }
 
-/* 802BC8AC-802BCBEC 2B71EC 0340+00 1/1 0/0 0/0 .text
- * setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb          */
 void Z2AudioCamera::setCameraState(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 param_3,
                                    f32 param_4, bool param_5, bool param_6) {
     JGeometry::TVec3<f32> aTStack_c0;
@@ -348,8 +322,6 @@ void Z2AudioCamera::setCameraState(f32 (*param_0)[4], Vec& pos, Vec& param_2, f3
     setCameraState(param_0, pos, param_6);
 }
 
-/* 802BCBEC-802BCC7C 2B752C 0090+00 2/2 0/0 0/0 .text
- * convertAbsToRel__13Z2AudioCameraFP9Z2Audiblei                */
 void Z2AudioCamera::convertAbsToRel(Z2Audible* audible, int channelNum) {
     JUT_ASSERT(508, audible);
     JUT_ASSERT(509, channelNum >= 0);
@@ -369,15 +341,11 @@ void Z2AudioCamera::convertAbsToRel(Z2Audible* audible, int channelNum) {
     relPos->field_0x10 = aTStack_38.length();
 }
 
-/* 802BCC7C-802BCCC0 2B75BC 0044+00 2/2 0/0 0/0 .text convertAbsToRel__13Z2AudioCameraCFR3VecP3Vec
- */
 bool Z2AudioCamera::convertAbsToRel(Vec& src, Vec* dst) const {
     MTXMultVec(field_0x0, &src, dst);
     return isInSight(*dst);
 }
 
-/* 802BCCC0-802BCD28 2B7600 0068+00 1/1 0/0 0/0 .text            isInSight__13Z2AudioCameraCFR3Vec
- */
 bool Z2AudioCamera::isInSight(Vec& param_0) const {
     if (param_0.z >= 0.0f) {
         return false;
@@ -394,7 +362,6 @@ bool Z2AudioCamera::isInSight(Vec& param_0) const {
     return true;
 }
 
-/* 802BCD28-802BCDA8 2B7668 0080+00 1/1 0/0 0/0 .text            __ct__9Z2SpotMicFv */
 Z2SpotMic::Z2SpotMic() {
     field_0x0 = 200.0f;
     field_0x4 = 400.0f;
@@ -410,7 +377,6 @@ Z2SpotMic::Z2SpotMic() {
     }
 }
 
-/* 802BCDA8-802BCDE8 2B76E8 0040+00 2/2 0/0 0/0 .text            clearMicState__9Z2SpotMicFi */
 void Z2SpotMic::clearMicState(int camID) {
     field_0x10[camID] = NULL;
     field_0x18[camID] = field_0xc;
@@ -418,12 +384,10 @@ void Z2SpotMic::clearMicState(int camID) {
     calcVolumeFactor(camID);
 }
 
-/* 802BCDE8-802BCE14 2B7728 002C+00 2/2 0/0 0/0 .text            calcVolumeFactor__9Z2SpotMicFi */
 void Z2SpotMic::calcVolumeFactor(int camID) {
     field_0x20[camID] = (field_0x8 - field_0x18[camID]) / (field_0x4 - field_0x0);
 }
 
-/* 802BCE14-802BCF5C 2B7754 0148+00 1/1 0/0 0/0 .text setMicState__9Z2SpotMicFP13Z2AudioCamerai */
 void Z2SpotMic::setMicState(Z2AudioCamera* camera, int camID) {
     JUT_ASSERT(622, camID >= 0);
     JUT_ASSERT(623, camID < 1);
@@ -456,8 +420,6 @@ void Z2SpotMic::setMicState(Z2AudioCamera* camera, int camID) {
     }
 }
 
-/* 802BCF5C-802BCFE4 2B789C 0088+00 2/2 0/0 0/0 .text            calcMicDist__9Z2SpotMicFP9Z2Audible
- */
 f32 Z2SpotMic::calcMicDist(Z2Audible* audible) {
     if (!mMicOn) {
         return 0.0f;
@@ -476,7 +438,6 @@ f32 Z2SpotMic::calcMicDist(Z2Audible* audible) {
     return aTStack_1c.length();
 }
 
-/* 802BCFE4-802BD03C 2B7924 0058+00 1/1 0/0 0/0 .text            calcMicPriority__9Z2SpotMicFf */
 u32 Z2SpotMic::calcMicPriority(f32 param_0) {
     if (param_0 > field_0x4) {
         return Z2GetAudience()->getSetting()->field_0x64;
@@ -489,7 +450,6 @@ u32 Z2SpotMic::calcMicPriority(f32 param_0) {
     return field_0x1c * (param_0 - field_0x0);
 }
 
-/* 802BD03C-802BD130 2B797C 00F4+00 1/1 0/0 0/0 .text            calcMicVolume__9Z2SpotMicFfif */
 f32 Z2SpotMic::calcMicVolume(f32 param_0, int camID, f32 param_2) {
     JUT_ASSERT(687, camID >= 0);
     JUT_ASSERT(688, camID < 1);
@@ -531,7 +491,6 @@ f32 Z2SpotMic::calcMicVolume(f32 param_0, int camID, f32 param_2) {
     return param_2;
 }
 
-/* 802BD130-802BD1FC 2B7A70 00CC+00 0/0 1/1 0/0 .text            __ct__10Z2AudienceFv */
 Z2Audience::Z2Audience() : JASGlobalInstance<Z2Audience>(true), field_0x4(1.0f), field_0x8(0x7f) {
     mNumPlayers = 1;
     mUsingOffMicVol = false;
@@ -540,13 +499,10 @@ Z2Audience::Z2Audience() : JASGlobalInstance<Z2Audience>(true), field_0x4(1.0f),
     mLinkMic = mSpotMic;
 }
 
-/* 802BD1FC-802BD288 2B7B3C 008C+00 1/0 1/1 0/0 .text            __dt__10Z2AudienceFv */
 Z2Audience::~Z2Audience() {
     // JUT_ASSERT(751, !isActive()); // TODO: need to setup rest of JASMemPool stuff
 }
 
-/* 802BD2DC-802BD338 2B7C1C 005C+00 0/0 1/1 0/0 .text
- * setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib            */
 void Z2Audience::setAudioCamera(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 param_3,
                                 f32 param_4, bool param_5, int camID, bool param_7) {
     JUT_ASSERT(687, camID >= 0);
@@ -555,8 +511,6 @@ void Z2Audience::setAudioCamera(f32 (*param_0)[4], Vec& pos, Vec& param_2, f32 p
     mLinkMic->setMicState(&mAudioCamera[camID], camID);
 }
 
-/* 802BD338-802BD4D4 2B7C78 019C+00 1/0 0/0 0/0 .text
- * newAudible__10Z2AudienceFRCQ29JGeometry8TVec3<f>10JAISoundIDPCQ29JGeometry8TVec3<f>Ul */
 JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID soundID,
                                    const JGeometry::TVec3<f32>* param_2, u32 param_3) {
     u32 channelNum = param_3 | ~((1 << mNumPlayers) + -1);
@@ -593,15 +547,12 @@ JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3<f32>& pos, JAISoundID
     return audible;
 }
 
-/* 802BD4D4-802BD510 2B7E14 003C+00 1/0 0/0 0/0 .text deleteAudible__10Z2AudienceFP10JAIAudible */
 void Z2Audience::deleteAudible(JAIAudible* audible) {
     delete audible;
 }
 
-/* 802BD510-802BD5B8 2B7E50 00A8+00 1/0 0/0 0/0 .text            __dt__9Z2AudibleFv */
 Z2Audible::~Z2Audible() {}
 
-/* 802BD5B8-802BD704 2B7EF8 014C+00 1/0 0/0 0/0 .text calcPriority__10Z2AudienceFP10JAIAudible */
 u32 Z2Audience::calcPriority(JAIAudible* audible) {
     Z2Audible* Z2audible = (Z2Audible*)audible;
 
@@ -640,7 +591,6 @@ u32 Z2Audience::calcPriority(JAIAudible* audible) {
     return rv;
 }
 
-/* 802BD704-802BD71C 2B8044 0018+00 1/1 1/1 0/0 .text            calcOffMicSound__10Z2AudienceFf */
 f32 Z2Audience::calcOffMicSound(f32 param_0) {
     if (mUsingOffMicVol == 0) {
         return param_0;
@@ -649,8 +599,6 @@ f32 Z2Audience::calcOffMicSound(f32 param_0) {
     return param_0 * field_0x4;
 }
 
-/* 802BD71C-802BD90C 2B805C 01F0+00 1/0 0/0 0/0 .text
- * mixChannelOut__10Z2AudienceFRC14JASSoundParamsP10JAIAudiblei */
 void Z2Audience::mixChannelOut(const JASSoundParams& outParams, JAIAudible* audible, int channelNum) {
     Z2Audible* Z2audible = (Z2Audible*)audible;
     Z2AudibleChannel* channel = Z2audible->getChannel(channelNum);
@@ -711,19 +659,16 @@ void Z2Audience::mixChannelOut(const JASSoundParams& outParams, JAIAudible* audi
 }
 
 
-/* 802BD90C-802BD92C 2B824C 0020+00 0/0 1/1 0/0 .text            setTargetVolume__10Z2AudienceFfi */
 void Z2Audience::setTargetVolume(f32 volume, int index) {
     mAudioCamera[index].setTargetVolume(volume);
 }
 
-/* 802BD92C-802BD95C 2B826C 0030+00 0/0 4/4 0/0 .text convertAbsToRel__10Z2AudienceFR3VecP3Veci */
 bool Z2Audience::convertAbsToRel(Vec& src, Vec* dst, int camID) {
     JUT_ASSERT(1036, camID >= 0);
     JUT_ASSERT(1037, camID < mNumPlayers);
     return getAudioCamera(camID)->convertAbsToRel(src, dst);
 }
 
-/* 802BD95C-802BDA44 2B829C 00E8+00 0/0 3/3 0/0 .text calcRelPosVolume__10Z2AudienceFRC3Vecfi */
 f32 Z2Audience::calcRelPosVolume(const Vec& param_0, f32 param_1, int camID) {
     JGeometry::TVec3<f32> aTStack_3c(param_0);
     aTStack_3c.z += mAudioCamera[camID].getVolCenterZ();
@@ -745,8 +690,6 @@ f32 Z2Audience::calcRelPosVolume(const Vec& param_0, f32 param_1, int camID) {
         0.0f, 1.0f);
 }
 
-/* 802BDA44-802BDB44 2B8384 0100+00 1/1 3/3 0/0 .text            calcRelPosPan__10Z2AudienceFRC3Veci
- */
 f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
     Vec local_54 = param_0;
     local_54.y = 0.0f;
@@ -781,7 +724,6 @@ f32 Z2Audience::calcRelPosPan(const Vec& param_0, int camID) {
     return dVar6;
 }
 
-/* 802BDB44-802BDBDC 2B8484 0098+00 1/1 3/3 0/0 .text calcRelPosDolby__10Z2AudienceFRC3Veci */
 f32 Z2Audience::calcRelPosDolby(const Vec& param_0, int camID) {
     f32 fVar1 = param_0.z + mAudioCamera[camID].getDolbyCenterZ();
     if (fVar1 > mSetting.field_0x48) {
@@ -805,7 +747,6 @@ f32 Z2Audience::calcRelPosDolby(const Vec& param_0, int camID) {
         1.0f, Z2Calc::CURVE_NEGATIVE);
 }
 
-/* 802BDBDC-802BDC44 2B851C 0068+00 1/1 0/0 0/0 .text            calcVolume___10Z2AudienceCFfi */
 f32 Z2Audience::calcVolume_(f32 param_0, int distVolBit) const {
     if (param_0 > mSetting.field_0x0[distVolBit]) {
         return mSetting.field_0x40;
@@ -818,7 +759,6 @@ f32 Z2Audience::calcVolume_(f32 param_0, int distVolBit) const {
     return JGeometry::TUtil<f32>::clamp((mSetting.field_0x70[distVolBit] * (param_0 - mSetting.field_0x3c)) + 1.0f, 0.0f, 1.0f);
 }
 
-/* 802BDC44-802BDCB0 2B8584 006C+00 2/2 0/0 0/0 .text calcDeltaPriority___10Z2AudienceCFfib */
 u32 Z2Audience::calcDeltaPriority_(f32 param_0, int distVolBit, bool param_2) const {
     if (param_0 > mSetting.field_0x0[distVolBit]) {
         if (param_2) {
@@ -845,7 +785,6 @@ f32 Z2Audience::calcPitchDoppler_(const JGeometry::TVec3<f32>& param_0,
     return (mSetting.field_0x5c + param_3 * dVar8) / (mSetting.field_0x5c + param_3 * dVar7);
 }
 
-/* 802BDD00-802BDD48 2B8640 0048+00 1/1 0/0 0/0 .text            calcFxMix___10Z2AudienceCFfi */
 f32 Z2Audience::calcFxMix_(f32 param_0, int distVolBit) const {
     if (param_0 > mSetting.field_0x0[distVolBit]) {
         return mSetting.field_0x54;
@@ -856,8 +795,6 @@ f32 Z2Audience::calcFxMix_(f32 param_0, int distVolBit) const {
     return mSetting.field_0x50 + mSetting.field_0xe8[distVolBit] * (param_0 - mSetting.field_0x3c);
 }
 
-/* 802BDD48-802BDED4 2B8688 018C+00 1/1 0/0 0/0 .text
- * calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera */
 f32 Z2Audience::calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible, const Z2AudioCamera* camera) const {
     JAUAudibleParam audParam = *audible->getAudibleParam();
     if ((*(u8*)&audParam.field_0x0.raw >> 4) & 0xf) {
@@ -890,7 +827,6 @@ f32 Z2Audience::calcPitch_(Z2AudibleChannel* channel, const Z2Audible* audible,
     return 1.0f;
 }
 
-/* 802BDED4-802BDEDC 2B8814 0008+00 1/0 0/0 0/0 .text            getMaxChannels__10Z2AudienceFv */
 int Z2Audience::getMaxChannels() {
     return mNumPlayers;
 }
diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp
index 6281f1d197..d16a9d82ab 100644
--- a/src/Z2AudioLib/Z2AudioArcLoader.cpp
+++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp
@@ -6,10 +6,8 @@
 #include "Z2AudioLib/Z2FxLineMgr.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 802A9A34-802A9A70 2A4374 003C+00 0/0 1/1 0/0 .text __ct__16Z2AudioArcLoaderFP10JAUSection */
 Z2AudioArcLoader::Z2AudioArcLoader(JAUSection* section) : JAUAudioArcLoader(section) {}
 
-/* 802A9A70-802A9AC8 2A43B0 0058+00 1/0 0/0 0/0 .text readCommandMore__16Z2AudioArcLoaderFUl */
 bool Z2AudioArcLoader::readCommandMore(u32 command) {
     bool rv = false;
     u32 read = 0;
@@ -25,7 +23,6 @@ bool Z2AudioArcLoader::readCommandMore(u32 command) {
     return rv;
 }
 
-/* 802A9AC8-802A9B54 2A4408 008C+00 1/1 0/0 0/0 .text            readBFCA__16Z2AudioArcLoaderFPCv */
 void Z2AudioArcLoader::readBFCA(const void* addr) {
     JUT_ASSERT(76, addr);
 
@@ -38,8 +35,6 @@ void Z2AudioArcLoader::readBFCA(const void* addr) {
     JKRUnmountArchive(archive);
 }
 
-/* 802A9B54-802A9B58 2A4494 0004+00 1/0 0/0 0/0 .text            readBSTN__16Z2AudioArcLoaderFPCvUl
- */
 void Z2AudioArcLoader::readBSTN(const void* addr, u32 param_1) {
 #if VERSION == VERSION_SHIELD_DEBUG
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
diff --git a/src/Z2AudioLib/Z2AudioMgr.cpp b/src/Z2AudioLib/Z2AudioMgr.cpp
index 15039ca082..14af97ccd0 100644
--- a/src/Z2AudioLib/Z2AudioMgr.cpp
+++ b/src/Z2AudioLib/Z2AudioMgr.cpp
@@ -16,19 +16,14 @@
 #include "Z2AudioLib/Z2AudioCS.h"
 #endif
 
-/* 80451368-80451370 000868 0004+04 1/1 251/251 900/900 .sbss            mAudioMgrPtr__10Z2AudioMgr
- */
 Z2AudioMgr* Z2AudioMgr::mAudioMgrPtr;
 
-/* 802CD248-802CD34C 2C7B88 0104+00 0/0 1/1 0/0 .text            __ct__10Z2AudioMgrFv */
 Z2AudioMgr::Z2AudioMgr() : mSoundStarter(true) {
     mAudioMgrPtr = this;
     mResettingFlag = false;
     field_0x519 = false;
 }
 
-/* 802CD34C-802CD7F8 2C7C8C 04AC+00 0/0 1/1 0/0 .text
- * init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive          */
 // NONMATCHING JASPoolAllocObject<_> locations
 void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive* seqArc) {
     JAU_JASInitializer JASInitializer;
@@ -139,14 +134,12 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive
     #endif
 }
 
-/* 802CD888-802CD8B4 2C81C8 002C+00 0/0 5/5 0/0 .text            setOutputMode__10Z2AudioMgrFUl */
 void Z2AudioMgr::setOutputMode(u32 mode) {
     if (mode <= 2) {
         JAISetOutputMode(mode);
     }
 }
 
-/* 802CD8B4-802CD904 2C81F4 0050+00 1/1 0/0 0/0 .text            zeldaGFrameWork__10Z2AudioMgrFv */
 void Z2AudioMgr::zeldaGFrameWork() {
     processTime();
     mSpeechMgr.framework();
@@ -159,7 +152,6 @@ void Z2AudioMgr::zeldaGFrameWork() {
     #endif
 }
 
-/* 802CD904-802CD974 2C8244 0070+00 0/0 1/1 0/0 .text            gframeProcess__10Z2AudioMgrFv */
 void Z2AudioMgr::gframeProcess() {
     zeldaGFrameWork();
 
@@ -173,7 +165,6 @@ void Z2AudioMgr::gframeProcess() {
     }
 }
 
-/* 802CD974-802CD9CC 2C82B4 0058+00 0/0 3/3 0/0 .text            resetProcess__10Z2AudioMgrFUlb */
 void Z2AudioMgr::resetProcess(u32 param_0, bool param_1) {
     JUT_ASSERT(413, !mResettingFlag);
 
@@ -182,7 +173,6 @@ void Z2AudioMgr::resetProcess(u32 param_0, bool param_1) {
     mResettingFlag = true;
 }
 
-/* 802CD9CC-802CDA6C 2C830C 00A0+00 0/0 1/1 0/0 .text            resetRecover__10Z2AudioMgrFv */
 void Z2AudioMgr::resetRecover() {
     JUT_ASSERT(427, mResettingFlag);
     JUT_ASSERT(428, mAudioReseter.checkDone());
@@ -199,14 +189,11 @@ void Z2AudioMgr::resetRecover() {
 }
 
 
-/* 802CDA6C-802CDB1C 2C83AC 00B0+00 0/0 2/2 0/0 .text            hasReset__10Z2AudioMgrCFv */
 bool Z2AudioMgr::hasReset() const {
     return mResettingFlag && mAudioReseter.checkDone() &&
         (field_0x519 || (mSoundMgr.getSeMgr()->getNumActiveSe() == 0 && mSoundMgr.getSeqMgr()->getNumActiveSeqs() == 0));
 }
 
-/* 802CDB1C-802CDB68 2C845C 004C+00 1/0 1/0 0/0 .text
- * startSound__10Z2AudioMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool Z2AudioMgr::startSound(JAISoundID soundID, JAISoundHandle* handle,
                             const JGeometry::TVec3<f32>* posPtr) {
     if (mResettingFlag) {
diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp
index 9ba1fb58ec..91eccdcfb6 100644
--- a/src/Z2AudioLib/Z2Calc.cpp
+++ b/src/Z2AudioLib/Z2Calc.cpp
@@ -2,8 +2,6 @@
 #include "JSystem/JMath/random.h"
 #include <math.h>
 
-/* 802A968C-802A96F4 2A3FCC 0068+00 1/1 16/16 0/0 .text            linearTransform__6Z2CalcFfffffb
- */
 f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 outMax, bool noClamp) {
     f32 transformed = outMin + ((inValue - inMin) * ((outMax - outMin) / (inMax - inMin)));
     if (noClamp) {
@@ -21,14 +19,10 @@ f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 o
     }
 }
 
-/* 80455820-80455824 003E20 0004+00 0/0 1/1 0/0 .sdata2          cEqualCSlope__6Z2Calc */
 const f32 Z2Calc::cEqualCSlope = 1.0f;
 
-/* 80455824-80455828 003E24 0004+00 0/0 1/1 0/0 .sdata2          cEqualPSlope__6Z2Calc */
 const f32 Z2Calc::cEqualPSlope = 0.5f;
 
-/* 802A96F4-802A9814 2A4034 0120+00 0/0 29/29 0/0 .text
- * getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign             */
 f32 Z2Calc::getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 outMin, f32 outMax, Z2Calc::CurveSign curveSign) {
     if (curveSign == Z2Calc::CURVE_POSITIVE) {
         value = linearTransform(value, inMin, inMax, 0.0f, exponent, true);
@@ -47,7 +41,6 @@ f32 Z2Calc::getParamByExp(f32 value, f32 inMin, f32 inMax, f32 exponent, f32 out
                             value;
 }
 
-/* 802A9814-802A98D4 2A4154 00C0+00 0/0 2/2 0/0 .text            getRandom__6Z2CalcFfff */
 f32 Z2Calc::getRandom(f32 magnitude, f32 exponent, f32 bias) {
     f32 posBias = 2.0f * bias;
     f32 negBias = (1.0f - bias) * -2.0f;
@@ -57,13 +50,11 @@ f32 Z2Calc::getRandom(f32 magnitude, f32 exponent, f32 bias) {
     return exprnd * magnitude;
 }
 
-/* 802A98D4-802A9944 2A4214 0070+00 1/1 1/1 0/0 .text            getRandom_0_1__6Z2CalcFv */
 f32 Z2Calc::getRandom_0_1() {
     static JMath::TRandom_<JMath::TRandom_fast_> oRandom(0);
     return oRandom.get_ufloat_1();
 }
 
-/* 802A9944-802A9958 2A4284 0014+00 0/0 1/1 0/0 .text            setParam__Q26Z2Calc8FNoise1fFfff */
 void Z2Calc::FNoise1f::setParam(f32 value, f32 threshold, f32 step) {
     value_ = value;
     targetValue_ = value;
@@ -71,7 +62,6 @@ void Z2Calc::FNoise1f::setParam(f32 value, f32 threshold, f32 step) {
     step_ = step;
 }
 
-/* 802A9958-802A99A0 2A4298 0048+00 1/1 0/0 0/0 .text            tau__Q26Z2Calc8FNoise1fFf */
 f32 Z2Calc::FNoise1f::tau(f32 input) {
     f32 var_f30 = 1.0f;
 
@@ -91,8 +81,6 @@ f32 Z2Calc::FNoise1f::tau(f32 input) {
     return result;
 }
 
-/* 802A99A0-802A9A34 2A42E0 0094+00 0/0 5/5 0/0 .text            calcNoise1f__Q26Z2Calc8FNoise1fFv
- */
 f32 Z2Calc::FNoise1f::calcNoise1f() {
     if (value_ < targetValue_) {
         value_ += step_;
diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp
index 44e05e2af1..db9f521507 100644
--- a/src/Z2AudioLib/Z2Creature.cpp
+++ b/src/Z2AudioLib/Z2Creature.cpp
@@ -8,29 +8,21 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32);
 static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32);
 static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32);
 
-/* ############################################################################################## */
-/* 80451358-80451360 -00001 0008+00 0/0 1/1 0/0 .sbss            None */
 /* 80451358 0001+00 data_80451358 None */
 /* 80451359 0007+00 data_80451359 None */
 s8 data_80451358;
 s8 data_80451359;
 
-/* 80455BD8-80455BDC 0041D8 0004+00 1/1 0/0 0/0 .sdata2          sAreaDefault */
 static Z2EnemyArea const sAreaDefault = {true, 700, 1100, 1500};
 
-/* 80455BE0-80455BE4 0041E0 0004+00 1/1 0/0 0/0 .sdata2          sAreaFloating */
 static Z2EnemyArea const sAreaFloating = {false, 700, 1100, 1500};
 
-/* 80455BE8-80455BEC 0041E8 0004+00 1/1 0/0 0/0 .sdata2          sAreaWide */
 static Z2EnemyArea const sAreaWide = {true, 700, 1500, 3300};
 
-/* 80455BF0-80455BF4 0041F0 0004+00 1/1 0/0 0/0 .sdata2          sAreaWideFloating */
 static Z2EnemyArea const sAreaWideFloating = {false, 700, 1500, 3300};
 
-/* 80455BF8-80455BFC 0041F8 0004+00 1/1 0/0 0/0 .sdata2          sAreaSmall */
 static Z2EnemyArea const sAreaSmall = {true, 300, 700, 1000};
 
-/* 80455C00-80455C04 004200 0004+00 1/1 0/0 0/0 .sdata2          sAreaSmallFloating */
 static Z2EnemyArea const sAreaSmallFloating = {false, 500, 800, 1200};
 
 struct EnemyInfo {
@@ -38,7 +30,6 @@ struct EnemyInfo {
     Z2EnemyArea mEnemyArea;
 };
 
-/* 803CB230-803CB630 028350 0400+00 1/1 0/0 0/0 .data            mEnemyInfo */
 static EnemyInfo mEnemyInfo[64] = {
     {"Dummy", sAreaDefault},
     {"E_s1", {true, 700, 1200, 2000}},
@@ -106,17 +97,14 @@ static EnemyInfo mEnemyInfo[64] = {
     {"B_tn", sAreaDefault},
 };
 
-/* 802C03C8-802C0420 2BAD08 0058+00 3/3 3/3 129/129 .text            __ct__10Z2CreatureFv */
 Z2Creature::Z2Creature() {
     mpPos = NULL;
 }
 
-/* 802C0420-802C04E8 2BAD60 00C8+00 1/1 4/4 91/91 .text            __dt__10Z2CreatureFv */
 Z2Creature::~Z2Creature() {
     deleteObject();
 }
 
-/* 802C04E8-802C0530 2BAE28 0048+00 4/2 2/2 0/0 .text            deleteObject__10Z2CreatureFv */
 void Z2Creature::deleteObject() {
     mSoundObjAnime.stopAnime();
     mSoundObjAnime.deleteObject();
@@ -124,7 +112,6 @@ void Z2Creature::deleteObject() {
     mSoundObjSimple2.deleteObject();
 }
 
-/* 802C0530-802C05B0 2BAE70 0080+00 5/5 1/1 125/125 .text init__10Z2CreatureFP3VecP3VecUcUc */
 void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
     if (animePosPtr) {
         mSoundObjAnime.init(animePosPtr, animeHandleNum);
@@ -136,7 +123,6 @@ void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8
     }
 }
 
-/* 802C05B0-802C0618 2BAEF0 0068+00 2/2 1/1 0/0 .text init__10Z2CreatureFP3VecP3VecP3VecUcUcUc */
 void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
                       u8 simple2HandleNum) {
     init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
@@ -146,38 +132,30 @@ void Z2Creature::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u
     }
 }
 
-/* 802C0618-802C0628 2BAF58 0010+00 7/0 2/0 0/0 .text
- * setSoundStarter__10Z2CreatureFP14Z2SoundStarter              */
 void Z2Creature::setSoundStarter(Z2SoundStarter* soundStarter) {
     mSoundObjAnime.setSoundStarter(soundStarter);
     mSoundObjSimple1.setSoundStarter(soundStarter);
     mSoundObjSimple2.setSoundStarter(soundStarter);
 }
 
-/* 802C0628-802C064C 2BAF68 0024+00 0/0 4/4 2/2 .text            initAnime__10Z2CreatureFPvbff */
 void Z2Creature::initAnime(void* animation, bool param_1, f32 startFrame, f32 param_3) {
     mSoundObjAnime.initAnime(animation, param_1, startFrame, param_3);
 }
 
-/* 802C064C-802C06D0 2BAF8C 0084+00 7/3 2/1 0/0 .text            framework__10Z2CreatureFUlSc */
 void Z2Creature::framework(u32 mapinfo, s8 reverb) {
     mSoundObjAnime.framework(mapinfo, reverb);
     mSoundObjSimple1.framework(mapinfo, reverb);
     mSoundObjSimple2.framework(mapinfo, reverb);
 }
 
-/* 802C06D0-802C06F4 2BB010 0024+00 0/0 3/3 2/2 .text            updateAnime__10Z2CreatureFff */
 void Z2Creature::updateAnime(f32 param_0, f32 param_1) {
     mSoundObjAnime.updateAnime(param_0, param_1);
 }
 
-/* 802C06F4-802C0720 2BB034 002C+00 0/0 0/0 7/7 .text            stopAnime__10Z2CreatureFv */
 void Z2Creature::stopAnime() {
     deleteObject();
 }
 
-/* 802C0720-802C087C 2BB060 015C+00 4/0 2/0 0/0 .text
- * startCreatureSound__10Z2CreatureF10JAISoundIDUlSc            */
 Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     switch (soundID) {
     case Z2SE_KOSARU_V_KAGO_WAIT:
@@ -199,8 +177,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureSound(JAISoundID soundID, u32 mapinf
     }
 }
 
-/* 802C087C-802C0A4C 2BB1BC 01D0+00 4/0 2/0 0/0 .text
- * startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc       */
 Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     switch (soundID) {
     case Z2SE_FAIRY_S_LV:
@@ -229,8 +205,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureSoundLevel(JAISoundID soundID, u32 m
     }
 }
 
-/* 802C0A4C-802C0AF8 2BB38C 00AC+00 4/1 2/0 0/0 .text
- * startCreatureVoice__10Z2CreatureF10JAISoundIDSc              */
 Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID soundID, s8 reverb) {
     switch (soundID) {
     case Z2SE_MDN_V_FLY_OUT:
@@ -263,8 +237,6 @@ Z2SoundHandlePool* Z2Creature::startCreatureVoice(JAISoundID soundID, s8 reverb)
     return mSoundObjSimple1.startSound(soundID, 0, reverb);
 }
 
-/* 802C0AF8-802C0B70 2BB438 0078+00 3/0 2/0 0/0 .text
- * startCreatureVoiceLevel__10Z2CreatureF10JAISoundIDSc         */
 Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
     if (soundID == Z2SE_MDN_V_WAITD) {
         if (Z2GetStatusMgr()->getDemoStatus() == 2 || !Z2GetSceneMgr()->isInGame()) {
@@ -275,24 +247,18 @@ Z2SoundHandlePool* Z2Creature::startCreatureVoiceLevel(JAISoundID soundID, s8 re
     return mSoundObjSimple1.startLevelSound((u32)soundID, 0, reverb);
 }
 
-/* 802C0B70-802C0BAC 2BB4B0 003C+00 4/0 2/0 0/0 .text
- * startCreatureExtraSound__10Z2CreatureF10JAISoundIDUlSc       */
 Z2SoundHandlePool* Z2Creature::startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     return mSoundObjSimple2.startSound(soundID, mapinfo, reverb);
 }
 
-/* 802C0BAC-802C0BE8 2BB4EC 003C+00 4/0 2/0 0/0 .text
- * startCreatureExtraSoundLevel__10Z2CreatureF10JAISoundIDUlSc  */
 Z2SoundHandlePool* Z2Creature::startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     return mSoundObjSimple2.startLevelSound(soundID, mapinfo, reverb);
 }
 
-/* 802C0BE8-802C0C10 2BB528 0028+00 4/0 2/0 0/0 .text startCollisionSE__10Z2CreatureFUlUl */
 Z2SoundHandlePool* Z2Creature::startCollisionSE(u32 hitID, u32 mapinfo) {
     return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL);
 }
 
-/* 802C0C10-802C0C6C 2BB550 005C+00 0/0 0/0 12/12 .text            __ct__17Z2CreatureCitizenFv */
 Z2CreatureCitizen::Z2CreatureCitizen() :
     JSULink<Z2CreatureCitizen>(this),
     mCitizenID(-1),
@@ -300,15 +266,12 @@ Z2CreatureCitizen::Z2CreatureCitizen() :
     mLinkSearch(false)
 {}
 
-/* 802C0C6C-802C0CE4 2BB5AC 0078+00 0/0 0/0 12/12 .text            __dt__17Z2CreatureCitizenFv */
 Z2CreatureCitizen::~Z2CreatureCitizen() {}
 
-/* 802C0CE4-802C0D04 2BB624 0020+00 0/0 2/2 7/7 .text init__17Z2CreatureCitizenFP3VecP3VecUcUc */
 void Z2CreatureCitizen::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
     Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
 }
 
-/* 802C0D04-802C0D48 2BB644 0044+00 1/0 0/0 0/0 .text   deleteObject__17Z2CreatureCitizenFv */
 void Z2CreatureCitizen::deleteObject() {
     if (mLinkSearch == false) {
         Z2GetSeMgr()->decrCrowdSize();
@@ -317,7 +280,6 @@ void Z2CreatureCitizen::deleteObject() {
     Z2Creature::deleteObject();
 }
 
-/* 802C0D48-802C0E18 2BB688 00D0+00 0/0 2/2 4/4 .text setMdlType__17Z2CreatureCitizenFScbb */
 void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) {
     s8 a = param_0 & 0x3f;
     s8 b = param_1 ? 0x40 : 0;
@@ -337,8 +299,6 @@ void Z2CreatureCitizen::setMdlType(s8 param_0, bool param_1, bool param_2) {
     }
 }
 
-/* 802C0E18-802C0ED8 2BB758 00C0+00 0/0 0/0 21/21 .text            playVoice__17Z2CreatureCitizenFi
- */
 void Z2CreatureCitizen::playVoice(int i_sound) {
     u32 sound_id = Z2SE_MAN_A1_V_AWAY + 6 * (s8)mCitizenID + i_sound;
     switch (mCitizenID) {
@@ -357,8 +317,6 @@ void Z2CreatureCitizen::playVoice(int i_sound) {
     }
 }
 
-/* 802C0ED8-802C0F64 2BB818 008C+00 1/0 0/0 0/0 .text
- * startCreatureVoice__17Z2CreatureCitizenF10JAISoundIDSc       */
 Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID soundID, s8 reverb) {
     switch (soundID) {
     case Z2SE_KIU_V_FEAR:
@@ -374,7 +332,6 @@ Z2SoundHandlePool* Z2CreatureCitizen::startCreatureVoice(JAISoundID soundID, s8
     return Z2Creature::startCreatureVoice(soundID, -1);
 }
 
-/* 802C0F64-802C0FC4 2BB8A4 0060+00 2/2 0/0 100/100 .text            __ct__15Z2CreatureEnemyFv */
 Z2CreatureEnemy::Z2CreatureEnemy() :
     JSULink<Z2CreatureEnemy>(this),
     mEnemyID(0),
@@ -383,8 +340,6 @@ Z2CreatureEnemy::Z2CreatureEnemy() :
     field_0xa3(0)
 {}
 
-/* 802C0FC4-802C1094 2BB904 00D0+00 3/2 0/0 0/0 .text            deleteObject__15Z2CreatureEnemyFv
- */
 void Z2CreatureEnemy::deleteObject() {
     if (mEnemyID == Z2_ENEMY_GB) {
         Z2GetSeqMgr()->unMuteSceneBgm(33);
@@ -400,19 +355,15 @@ void Z2CreatureEnemy::deleteObject() {
     mSoundObjSimple2.deleteObject();
 }
 
-/* 802C1094-802C10B4 2BB9D4 0020+00 0/0 0/0 98/98 .text init__15Z2CreatureEnemyFP3VecP3VecUcUc */
 void Z2CreatureEnemy::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
     Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
 }
 
-/* 802C10B4-802C10D4 2BB9F4 0020+00 0/0 0/0 3/3 .text init__15Z2CreatureEnemyFP3VecP3VecP3VecUcUcUc
- */
 void Z2CreatureEnemy::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
                            u8 simple2HandleNum) {
     Z2Creature::init(animePosPtr, simplePosPtr, simple2PosPtr, animeHandleNum, simpleHandleNum, simple2HandleNum);
 }
 
-/* 802C10D4-802C110C 2BBA14 0038+00 1/0 0/0 0/0 .text framework__15Z2CreatureEnemyFUlSc */
 void Z2CreatureEnemy::framework(u32 mapinfo, s8 reverb) {
     if (field_0xa1 < 1) {
         field_0xa1++;
@@ -421,8 +372,6 @@ void Z2CreatureEnemy::framework(u32 mapinfo, s8 reverb) {
     Z2Creature::framework(mapinfo, reverb);
 }
 
-/* 802C110C-802C136C 2BBA4C 0260+00 4/0 0/0 0/0 .text
- * startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc       */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = mSoundObjAnime.startSound(soundID, mapinfo, reverb);
 
@@ -482,8 +431,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSound(JAISoundID soundID, u32 m
     return handle;
 }
 
-/* 802C136C-802C168C 2BBCAC 0320+00 2/0 0/0 0/0 .text
- * startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc  */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     if (soundID == 0x7FFFF) {
         Vec pos;
@@ -535,8 +482,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureSoundLevel(JAISoundID soundID,
     return handle;
 }
 
-/* 802C168C-802C1948 2BBFCC 02BC+00 4/0 0/0 0/0 .text
- * startCreatureVoice__15Z2CreatureEnemyF10JAISoundIDSc         */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID soundID, s8 reverb) {
     if (Z2GetSeqMgr()->getMainBgmID() == Z2BGM_BOSS_ZANT) {
         switch (Z2GetSeqMgr()->mBgmStatus) {
@@ -639,8 +584,6 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoice(JAISoundID soundID, s8 re
     return handle;
 }
 
-/* 802C1948-802C199C 2BC288 0054+00 3/0 0/0 0/0 .text
- * startCreatureVoiceLevel__15Z2CreatureEnemyF10JAISoundIDSc    */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
     u32 mapinfo = 0;
     if (mEnemyID == Z2_ENEMY_RDY) {
@@ -649,19 +592,14 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCreatureVoiceLevel(JAISoundID soundID,
     return mSoundObjSimple1.startLevelSound(soundID, mapinfo, reverb);
 }
 
-/* 802C199C-802C19D8 2BC2DC 003C+00 3/0 0/0 0/0 .text
- * startCreatureExtraSound__15Z2CreatureEnemyF10JAISoundIDUlSc  */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     return mSoundObjSimple2.startSound(soundID, mapinfo, reverb);
 }
 
-/* 802C19D8-802C1A14 2BC318 003C+00 3/0 0/0 0/0 .text
- * startCreatureExtraSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */
 Z2SoundHandlePool* Z2CreatureEnemy::startCreatureExtraSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     return mSoundObjSimple2.startLevelSound(soundID, mapinfo, reverb);
 }
 
-/* 802C1A14-802C1B7C 2BC354 0168+00 4/0 0/0 0/0 .text startCollisionSE__15Z2CreatureEnemyFUlUl */
 Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
     u8 var1;
     switch (mEnemyID) {
@@ -711,14 +649,12 @@ Z2SoundHandlePool* Z2CreatureEnemy::startCollisionSE(u32 hitID, u32 mapinfo) {
     }
 }
 
-/* 802C1B7C-802C1B90 2BC4BC 0014+00 0/0 0/0 55/55 .text setLinkSearch__15Z2CreatureEnemyFb */
 void Z2CreatureEnemy::setLinkSearch(bool isLinkSearch) {
     if (field_0xa3 == 0) {
         mLinkSearch = isLinkSearch;
     }
 }
 
-/* 802C1B90-802C1BE8 2BC4D0 0058+00 0/0 0/0 72/72 .text setEnemyName__15Z2CreatureEnemyFPCc */
 void Z2CreatureEnemy::setEnemyName(const char* enemyName) {
     if (enemyName == NULL) {
         field_0xa1 = -1;
@@ -727,10 +663,8 @@ void Z2CreatureEnemy::setEnemyName(const char* enemyName) {
     }
 }
 
-/* 802C1BE8-802C1C24 2BC528 003C+00 0/0 0/0 1/1 .text            __ct__16Z2CreatureSumomoFv */
 Z2CreatureSumomo::Z2CreatureSumomo() {}
 
-/* 802C1C24-802C1CA0 2BC564 007C+00 0/0 0/0 8/8 .text playSumomoBgm__16Z2CreatureSumomoFUl */
 void Z2CreatureSumomo::playSumomoBgm(u32 dist) {
     if (Z2GetSeqMgr()->getSubBgmID() != Z2BGM_SUMOMO) {
         if (dist < 700) {
@@ -743,8 +677,6 @@ void Z2CreatureSumomo::playSumomoBgm(u32 dist) {
     }
 }
 
-/* 802C1CA0-802C1D10 2BC5E0 0070+00 1/0 0/0 0/0 .text            deleteObject__16Z2CreatureSumomoFv
- */
 void Z2CreatureSumomo::deleteObject() {
     if (Z2GetSeqMgr()->getSubBgmID() == Z2BGM_SUMOMO && Z2GetStatusMgr()->getDemoStatus() != 6) {
         Z2GetSeqMgr()->subBgmStop();
@@ -754,17 +686,12 @@ void Z2CreatureSumomo::deleteObject() {
     Z2Creature::deleteObject();
 }
 
-/* 802C1D10-802C1D4C 2BC650 003C+00 0/0 0/0 3/3 .text            __ct__18Z2SoundObjBeeGroupFv */
 Z2SoundObjBeeGroup::Z2SoundObjBeeGroup() {}
 
-/* 802C1D4C-802C1D6C 2BC68C 0020+00 1/0 0/0 0/0 .text            init__18Z2SoundObjBeeGroupFP3VecUc
- */
 void Z2SoundObjBeeGroup::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
 }
 
-/* 802C1D6C-802C1F54 2BC6AC 01E8+00 0/0 0/0 2/2 .text
- * playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc       */
 void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) {
     if (param_1 == 0) {
         return;
@@ -803,10 +730,8 @@ void Z2SoundObjBeeGroup::playBeeGroupSound(JAISoundID soundID, u8 param_1) {
     }
 }
 
-/* 802C1F54-802C1FB0 2BC894 005C+00 0/0 0/0 1/1 .text            __ct__12Z2CreatureFMFv */
 Z2CreatureFM::Z2CreatureFM() {}
 
-/* 802C1FB0-802C1FFC 2BC8F0 004C+00 1/0 0/0 0/0 .text            deleteObject__12Z2CreatureFMFv */
 void Z2CreatureFM::deleteObject() {
     Z2CreatureEnemy::deleteObject();
     field_0xa4.deleteObject();
@@ -815,8 +740,6 @@ void Z2CreatureFM::deleteObject() {
     field_0x104.deleteObject();
 }
 
-/* 802C1FFC-802C20E8 2BC93C 00EC+00 0/0 0/0 1/1 .text
- * init__12Z2CreatureFMFP3VecP3VecP3VecP3VecP3VecP3VecUcUcUcUcUcUc */
 void Z2CreatureFM::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* param_2, Vec* param_3, Vec* param_4,
                         Vec* param_5, u8 animeHandleNum, u8 simpleHandleNum, u8 param_8, u8 param_9,
                         u8 param_10, u8 param_11) {
@@ -835,7 +758,6 @@ void Z2CreatureFM::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* param_2, Vec*
     }
 }
 
-/* 802C20E8-802C2194 2BCA28 00AC+00 1/0 0/0 0/0 .text            framework__12Z2CreatureFMFUlSc */
 void Z2CreatureFM::framework(u32 mapinfo, s8 reverb) {
     Z2Creature::framework(mapinfo, reverb);
     field_0xa4.framework(mapinfo, reverb);
@@ -844,8 +766,6 @@ void Z2CreatureFM::framework(u32 mapinfo, s8 reverb) {
     field_0x104.framework(mapinfo, reverb);
 }
 
-/* 802C2194-802C2290 2BCAD4 00FC+00 0/0 0/0 1/1 .text
- * startChainSound__12Z2CreatureFMF10JAISoundIDUcfUlSc          */
 Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1, f32 param_2,
                                                  u32 mapinfo, s8 reverb) {
     switch (param_1) {
@@ -862,8 +782,6 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSound(JAISoundID soundID, u8 param_1,
     }
 }
 
-/* 802C2290-802C24B0 2BCBD0 0220+00 0/0 0/0 1/1 .text
- * startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc     */
 Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 param_1, f32 param_2,
                                                       u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle;
@@ -910,15 +828,11 @@ Z2SoundHandlePool* Z2CreatureFM::startChainSoundLevel(JAISoundID soundID, u8 par
     }
 }
 
-/* 802C24B0-802C24D0 2BCDF0 0020+00 0/0 0/0 1/1 .text init__13Z2CreatureGobFP3VecP3VecP3VecUcUcUc
- */
 void Z2CreatureGob::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr, u8 animeHandleNum, u8 simpleHandleNum,
                          u8 simple2HandleNum) {
     Z2Creature::init(animePosPtr, simplePosPtr, simple2PosPtr, animeHandleNum, simpleHandleNum, simple2HandleNum);
 }
 
-/* 802C24D0-802C2578 2BCE10 00A8+00 1/0 0/0 0/0 .text
- * startCreatureVoiceLevel__13Z2CreatureGobF10JAISoundIDSc      */
 Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID soundID, s8 reverb) {
     if (mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_DAMAGE) != NULL ||
         mSoundObjSimple1.getHandleSoundID(Z2SE_EN_GOB_V_STOMACH) != NULL)
@@ -929,10 +843,8 @@ Z2SoundHandlePool* Z2CreatureGob::startCreatureVoiceLevel(JAISoundID soundID, s8
     return mSoundObjSimple1.startLevelSound(soundID, 0, reverb);
 }
 
-/* 802C2578-802C25EC 2BCEB8 0074+00 0/0 0/0 1/1 .text            __ct__12Z2CreatureOIFv */
 Z2CreatureOI::Z2CreatureOI() {}
 
-/* 802C25EC-802C2670 2BCF2C 0084+00 1/0 0/0 0/0 .text            deleteObject__12Z2CreatureOIFv */
 void Z2CreatureOI::deleteObject() {
     Z2CreatureEnemy::deleteObject();
     field_0xa4.deleteObject();
@@ -948,8 +860,6 @@ void Z2CreatureOI::deleteObject() {
     mTentacleSounds[7].deleteObject();
 }
 
-/* 802C2670-802C2864 2BCFB0 01F4+00 0/0 0/0 1/1 .text
- * init__12Z2CreatureOIFP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3VecP3Vec */
 void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3, Vec* param_4,
                         Vec* param_5, Vec* param_6, Vec* param_7, Vec* param_8, Vec* param_9,
                         Vec* param_10, Vec* param_11, Vec* param_12) {
@@ -989,7 +899,6 @@ void Z2CreatureOI::init(Vec* param_0, Vec* param_1, Vec* param_2, Vec* param_3,
     }
 }
 
-/* 802C2864-802C29D4 2BD1A4 0170+00 1/0 0/0 0/0 .text            framework__12Z2CreatureOIFUlSc */
 void Z2CreatureOI::framework(u32 mapinfo, s8 reverb) {
     Z2Creature::framework(mapinfo, reverb);
     field_0xa4.framework(mapinfo, reverb);
@@ -1005,8 +914,6 @@ void Z2CreatureOI::framework(u32 mapinfo, s8 reverb) {
     mTentacleSounds[7].framework(mapinfo, reverb);
 }
 
-/* 802C29D4-802C2C84 2BD314 02B0+00 1/0 0/0 0/0 .text
- * startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc     */
 Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     if (soundID == Z2SE_EN_OI_MOVE) {
         Z2SoundHandlePool* handle1 = mSoundObjAnime.startLevelSound(soundID, mapinfo, reverb);
@@ -1052,14 +959,10 @@ Z2SoundHandlePool* Z2CreatureOI::startCreatureSoundLevel(JAISoundID soundID, u32
     }
 }
 
-/* 802C2C84-802C2CD4 2BD5C4 0050+00 0/0 0/0 1/1 .text
- * startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc        */
 Z2SoundHandlePool* Z2CreatureOI::startTentacleSound(JAISoundID soundID, u8 tentacleIndex, u32 mapinfo, s8 reverb) {
     return mTentacleSounds[tentacleIndex].startSound(soundID, mapinfo, reverb);
 }
 
-/* 802C2CD4-802C2DE0 2BD614 010C+00 0/0 0/0 1/1 .text
- * startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc  */
 Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8 tentacleIndex,
                                                          f32 param_2, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = NULL;
@@ -1077,7 +980,6 @@ Z2SoundHandlePool* Z2CreatureOI::startTentacleSoundLevel(JAISoundID soundID, u8
     }
 }
 
-/* 802C2DE0-802C2E54 2BD720 0074+00 3/3 0/0 0/0 .text Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl */
 static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
     if (handle != NULL && *handle != NULL) {
         f32 pitch = 1.0f;
@@ -1093,7 +995,6 @@ static void Z2_E_sw_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
     }
 }
 
-/* 802C2E54-802C2E9C 2BD794 0048+00 2/2 0/0 0/0 .text Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl */
 static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) {
     if (handle != NULL && *handle != NULL) {
         f32 var_f31 = 0.2f;
@@ -1103,7 +1004,6 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool* handle, u32 mapinfo) {
     }
 }
 
-/* 802C2E9C-802C2EE4 2BD7DC 0048+00 2/2 0/0 0/0 .text Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl */
 static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
     if (handle != NULL && *handle != NULL) {
         f32 var_f31 = 0.7f;
@@ -1113,7 +1013,6 @@ static void Z2_E_mm_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
     }
 }
 
-/* 802C2EE4-802C3040 2BD824 015C+00 2/2 0/0 0/0 .text Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl */
 static void Z2_B_zan_modPitch(Z2SoundHandlePool* handle, u32 mapinfo) {
     if (handle != NULL && *handle != NULL) {
         f32 pitch = 1.0f;
diff --git a/src/Z2AudioLib/Z2EnvSeMgr.cpp b/src/Z2AudioLib/Z2EnvSeMgr.cpp
index 11917dda9c..7bd284d543 100644
--- a/src/Z2AudioLib/Z2EnvSeMgr.cpp
+++ b/src/Z2AudioLib/Z2EnvSeMgr.cpp
@@ -90,16 +90,12 @@ static const char* sSpotName[] = {
 };
 #endif
 
-/* 802C589C-802C58AC 2C01DC 0010+00 3/3 0/0 0/0 .text            __ct__11Z2EnvSeBaseFP3Vec */
 Z2EnvSeBase::Z2EnvSeBase(Vec* posPtr) {
     mPos = posPtr;
 }
 
-/* 802C58AC-802C5908 2C01EC 005C+00 3/3 0/0 0/0 .text            __dt__11Z2EnvSeBaseFv */
 Z2EnvSeBase::~Z2EnvSeBase() {}
 
-/* 802C5908-802C5AB4 2C0248 01AC+00 2/2 0/0 0/0 .text
- * startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl                */
 bool Z2EnvSeBase::startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan, f32 dolby, f32 pitch, u32 moveSteps) {
     if (Z2GetStatusMgr()->isPaused()) {
         volume *= 0.33f;
@@ -127,8 +123,6 @@ bool Z2EnvSeBase::startEnvSe(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan,
     return rv;
 }
 
-/* 802C5AB4-802C5C9C 2C03F4 01E8+00 9/9 0/0 0/0 .text
- * startEnvSeLevel__11Z2EnvSeBaseF10JAISoundIDfffffUl           */
 bool Z2EnvSeBase::startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32 pan,
                                   f32 dolby, f32 pitch, u32 moveSteps) {
     if (Z2GetStatusMgr()->isPaused()) {
@@ -163,7 +157,6 @@ bool Z2EnvSeBase::startEnvSeLevel(JAISoundID soundID, f32 fxMix, f32 volume, f32
     return rv;
 }
 
-/* 802C5C9C-802C5D1C 2C05DC 0080+00 1/1 0/0 0/0 .text            __ct__10Z2EnvSeDirFP3Vec */
 Z2EnvSeDir::Z2EnvSeDir(Vec* dir) {
     mPan = 0.5f;
     mDolby = 0.5f;
@@ -175,10 +168,8 @@ Z2EnvSeDir::Z2EnvSeDir(Vec* dir) {
     }
 }
 
-/* 802C5D1C-802C5D70 2C065C 0054+00 1/1 0/0 0/0 .text            __dt__10Z2EnvSeDirFv */
 Z2EnvSeDir::~Z2EnvSeDir() {}
 
-/* 802C5D70-802C5D9C 2C06B0 002C+00 2/2 0/0 0/0 .text            setPanDir__10Z2EnvSeDirFP3Vec */
 void Z2EnvSeDir::setPanDir(Vec* dir) {
     JUT_ASSERT(249, dir);
     mPanDir.x = dir->x * -1000.0f;
@@ -186,7 +177,6 @@ void Z2EnvSeDir::setPanDir(Vec* dir) {
     mPanDir.z = dir->z * -1000.0f;
 }
 
-/* 802C5D9C-802C5E90 2C06DC 00F4+00 1/1 0/0 0/0 .text            calcPan__10Z2EnvSeDirFf */
 void Z2EnvSeDir::calcPan(f32 param_0) {
     if (*getHandle()) {
         if (0.0f == mPanDir.x && 0.0f == mPanDir.y && 0.0f == mPanDir.z) {
@@ -205,14 +195,11 @@ void Z2EnvSeDir::calcPan(f32 param_0) {
     }
 }
 
-/* 802C5E90-802C5ECC 2C07D0 003C+00 1/1 0/0 0/0 .text
- * startEnvSeDirLevel__10Z2EnvSeDirF10JAISoundIDff              */
 bool Z2EnvSeDir::startEnvSeDirLevel(JAISoundID soundID, f32 fxMix, f32 volume) {
     f32 var_f31 = mDolby;
     return Z2EnvSeBase::startEnvSeLevel(soundID, fxMix, volume, mPan, mDolby, 1.0f, 0);
 }
 
-/* 802C5ECC-802C5F28 2C080C 005C+00 1/1 0/0 0/0 .text            __ct__14Z2EnvSeAutoPanFv */
 Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
     mPan = 0.5f;
     mDolby = 0.5f;
@@ -222,10 +209,8 @@ Z2EnvSeAutoPan::Z2EnvSeAutoPan() {
     field_0x19 = 1;
 }
 
-/* 802C5F28-802C5F7C 2C0868 0054+00 1/1 0/0 0/0 .text            __dt__14Z2EnvSeAutoPanFv */
 Z2EnvSeAutoPan::~Z2EnvSeAutoPan() {}
 
-/* 802C5F7C-802C5F98 2C08BC 001C+00 2/2 0/0 0/0 .text setPanParam__14Z2EnvSeAutoPanFffbbff */
 void Z2EnvSeAutoPan::setPanParam(f32 pan, f32 dolby, bool param_3, bool param_4, f32 param_5,
                                  f32 param_6) {
     mPan = pan;
@@ -236,7 +221,6 @@ void Z2EnvSeAutoPan::setPanParam(f32 pan, f32 dolby, bool param_3, bool param_4,
     field_0x19 = param_4;
 }
 
-/* 802C5F98-802C60E0 2C08D8 0148+00 2/2 0/0 0/0 .text            calcPan__14Z2EnvSeAutoPanFv */
 void Z2EnvSeAutoPan::calcPan() {
     if (field_0x18) {
         mPan += field_0x10;
@@ -272,15 +256,12 @@ void Z2EnvSeAutoPan::calcPan() {
     }
 }
 
-/* 802C60E0-802C611C 2C0A20 003C+00 2/2 0/0 0/0 .text
- * startEnvSeAutoPanLevel__14Z2EnvSeAutoPanF10JAISoundIDfff     */
 bool Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID soundID, f32 fxMix, f32 volume,
                                             f32 pitch) {
     f32 var_f31 = mDolby;
     return Z2EnvSeBase::startEnvSeLevel(soundID, fxMix, volume, mPan, mDolby, pitch, 0);
 }
 
-/* 802C611C-802C6540 2C0A5C 0424+00 0/0 1/1 0/0 .text            __ct__10Z2EnvSeMgrFv */
 Z2EnvSeMgr::Z2EnvSeMgr()
     : JASGlobalInstance<Z2EnvSeMgr>(true), field_0x38(), field_0x48(1.0f), field_0x4c(1.0f),
       field_0x50(1.0f), field_0x140(), mSnowPower(), mWindType(), field_0x188(), field_0x1ac(1.0f),
@@ -315,10 +296,8 @@ Z2EnvSeMgr::Z2EnvSeMgr()
     field_0x130.setParam(0.1f, 0.0037908785f, 0.005f);
 }
 
-/* 802C6540-802C66B0 2C0E80 0170+00 0/0 1/1 0/0 .text            __dt__10Z2EnvSeMgrFv */
 Z2EnvSeMgr::~Z2EnvSeMgr() {}
 
-/* 802C66B0-802C6998 2C0FF0 02E8+00 0/0 1/1 0/0 .text            framework__10Z2EnvSeMgrFv */
 void Z2EnvSeMgr::framework() {
     int sceneNum = Z2GetSceneMgr()->getCurrentSceneNum();
     if (field_0x64.getPosCount() >= 0) {
@@ -396,10 +375,8 @@ void Z2EnvSeMgr::framework() {
     }
 }
 
-/* 802C6998-802C699C 2C12D8 0004+00 0/0 1/1 0/0 .text            resetScene__10Z2EnvSeMgrFv */
 void Z2EnvSeMgr::resetScene() {}
 
-/* 802C699C-802C6AC0 2C12DC 0124+00 0/0 1/1 0/0 .text            resetSceneInner__10Z2EnvSeMgrFv */
 void Z2EnvSeMgr::resetSceneInner() {
     if (-1.0f == field_0x60) {
         field_0x38 = 0;
@@ -453,8 +430,6 @@ void Z2EnvSeMgr::resetSceneInner() {
     field_0x64.resetMultiSePos();
 }
 
-/* 802C6AC0-802C6C1C 2C1400 015C+00 0/0 1/1 0/0 .text            initSceneEnvSe__10Z2EnvSeMgrFlScf
- */
 void Z2EnvSeMgr::initSceneEnvSe(s32 sceneID, s8 room, f32 param_3) {
     field_0x60 = -1.0f;
     if (-1.0f == param_3) {
@@ -509,7 +484,6 @@ void Z2EnvSeMgr::initSceneEnvSe(s32 sceneID, s8 room, f32 param_3) {
     field_0x60 = param_3;
 }
 
-/* 802C6C1C-802C6C84 2C155C 0068+00 1/1 0/0 0/0 .text            playSceneEnvSe__10Z2EnvSeMgrFv */
 void Z2EnvSeMgr::playSceneEnvSe() {
     if (-1.0f != field_0x60) {
         if (field_0x1b8 != 100) {
@@ -519,8 +493,6 @@ void Z2EnvSeMgr::playSceneEnvSe() {
     }
 }
 
-/* 802C6C84-802C70C8 2C15C4 0444+00 2/1 1/1 0/0 .text initStaticEnvSe__10Z2EnvSeMgrFUcUcUcUcP3Vec
- */
 void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4, Vec* param_5) {
     f32 dVar7;
     f32 dVar6;
@@ -669,8 +641,6 @@ void Z2EnvSeMgr::initStaticEnvSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4,
     }
 }
 
-/* 802C70C8-802C780C 2C1A08 0744+00 2/1 1/1 0/0 .text            startStaticEnvSe__10Z2EnvSeMgrFSc
- */
 bool Z2EnvSeMgr::startStaticEnvSe(s8 reverb) {
     field_0x1b8 = 100;
 
@@ -857,13 +827,10 @@ bool Z2EnvSeMgr::startStaticEnvSe(s8 reverb) {
     return iVar9 && iVar11;
 }
 
-/* 802C780C-802C7830 2C214C 0024+00 0/0 1/1 0/0 .text            registWindowPos__10Z2EnvSeMgrFP3Vec
- */
 void Z2EnvSeMgr::registWindowPos(Vec* posPtr) {
     field_0x64.registMultiSePos(posPtr);
 }
 
-/* 802C7830-802C7CF4 2C2170 04C4+00 1/1 1/1 0/0 .text            startRainSe__10Z2EnvSeMgrFlSc */
 bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
     if (mSnowPower > 0) {
         return false;
@@ -951,8 +918,6 @@ bool Z2EnvSeMgr::startRainSe(s32 param_1, s8 param_2) {
                                       0);
 }
 
-/* 802C7CF4-802C7E68 2C2634 0174+00 0/0 1/1 0/0 .text            startNearThunderSe__10Z2EnvSeMgrFSc
- */
 void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
     if (field_0x64.getPosCount() < 0) {
         f32 dVar10 = Z2Calc::getRandom(0.25f, Z2Calc::cEqualCSlope, Z2Calc::cEqualPSlope);
@@ -967,7 +932,6 @@ void Z2EnvSeMgr::startNearThunderSe(s8 param_1) {
     }
 }
 
-/* 802C7E68-802C7FB4 2C27A8 014C+00 0/0 2/2 0/0 .text startFarThunderSe__10Z2EnvSeMgrFP3VecSc */
 void Z2EnvSeMgr::startFarThunderSe(Vec* posPtr, s8 reverb) {
     if (field_0x64.getPosCount() < 0) {
         field_0x110.setPos(posPtr);
@@ -979,17 +943,14 @@ void Z2EnvSeMgr::startFarThunderSe(Vec* posPtr, s8 reverb) {
     }
 }
 
-/* 802C7FB4-802C7FBC -00001 0008+00 0/0 0/0 0/0 .text            setSnowPower__10Z2EnvSeMgrFSc */
 void Z2EnvSeMgr::setSnowPower(s8 power) {
     mSnowPower = power;
 }
 
-/* 802C7FBC-802C7FC8 2C28FC 000C+00 0/0 1/1 1/1 .text            initStrongWindSe__10Z2EnvSeMgrFv */
 void Z2EnvSeMgr::initStrongWindSe() {
     mWindType = WIND_TYPE_3;
 }
 
-/* 802C7FC8-802C800C 2C2908 0044+00 0/0 1/1 1/1 .text setWindDirection__10Z2EnvSeMgrFP3Vec */
 void Z2EnvSeMgr::setWindDirection(Vec* dir) {
     if (mWindType == WIND_TYPE_3) {
         field_0x144.setPanDir(const_cast<Vec*>(&Z2Calc::cNullVec));
@@ -998,8 +959,6 @@ void Z2EnvSeMgr::setWindDirection(Vec* dir) {
     }
 }
 
-/* 802C800C-802C80F8 2C294C 00EC+00 0/0 1/1 1/1 .text            startStrongWindSe__10Z2EnvSeMgrFSc
- */
 bool Z2EnvSeMgr::startStrongWindSe(s8 reverb) {
     field_0x144.calcPan(1.0f);
 
@@ -1022,8 +981,6 @@ bool Z2EnvSeMgr::startStrongWindSe(s8 reverb) {
     return field_0x144.startEnvSeDirLevel(aJStack_24, fxMix, 1.0f);
 }
 
-/* 802C80F8-802C8234 2C2A38 013C+00 0/0 1/1 0/0 .text            initRiverSe__10Z2EnvSeMgrFUcUcUcUc
- */
 void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     field_0x188 = param_1;
     if (param_2 >= 100) {
@@ -1060,7 +1017,6 @@ void Z2EnvSeMgr::initRiverSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     }
 }
 
-/* 802C8234-802C8258 2C2B74 0024+00 1/1 1/1 0/0 .text registRiverSePos__10Z2EnvSeMgrFP3Vec */
 void Z2EnvSeMgr::registRiverSePos(Vec* posPtr) {
     f32 var_f31;
     if (posPtr != NULL) {
@@ -1072,8 +1028,6 @@ void Z2EnvSeMgr::registRiverSePos(Vec* posPtr) {
     mRiverSeMgr.registMultiSePos(posPtr);
 }
 
-/* 802C8258-802C8300 2C2B98 00A8+00 0/0 0/0 1/1 .text            setHyrulSewerOpen__10Z2EnvSeMgrFb
- */
 void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) {
     if (isSewerOpen) {
         field_0x1b8 = 1;
@@ -1084,7 +1038,6 @@ void Z2EnvSeMgr::setHyrulSewerOpen(bool isSewerOpen) {
     }
 }
 
-/* 802C8300-802C8730 2C2C40 0430+00 2/1 1/1 0/0 .text            startRiverSe__10Z2EnvSeMgrFSc */
 bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
     #ifdef DEBUG
     const char** spotName = sSpotName;
@@ -1184,8 +1137,6 @@ bool Z2EnvSeMgr::startRiverSe(s8 param_1) {
     return r30;
 }
 
-/* 802C8730-802C886C 2C3070 013C+00 1/1 1/1 0/0 .text            initFallSe__10Z2EnvSeMgrFUcUcUcUc
- */
 void Z2EnvSeMgr::initFallSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     field_0x1e0 = param_1;
     if (param_2 >= 100) {
@@ -1222,8 +1173,6 @@ void Z2EnvSeMgr::initFallSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     }
 }
 
-/* 802C886C-802C8890 2C31AC 0024+00 0/0 1/1 0/0 .text            registFallSePos__10Z2EnvSeMgrFP3Vec
- */
 void Z2EnvSeMgr::registFallSePos(Vec* posPtr) {
     f32 var_f31;
     if (posPtr != NULL) {
@@ -1235,7 +1184,6 @@ void Z2EnvSeMgr::registFallSePos(Vec* posPtr) {
     mFallSeMgr.registMultiSePos(posPtr);
 }
 
-/* 802C8890-802C8A90 2C31D0 0200+00 1/1 1/1 0/0 .text            startFallSe__10Z2EnvSeMgrFSc */
 bool Z2EnvSeMgr::startFallSe(s8 reverb) {
     if (mFallSeMgr.getPosCount() < 0) {
         return false;
@@ -1271,7 +1219,6 @@ bool Z2EnvSeMgr::startFallSe(s8 reverb) {
     return rv;
 }
 
-/* 802C8A90-802C8C24 2C33D0 0194+00 2/1 1/1 0/0 .text            initEtcSe__10Z2EnvSeMgrFUcUcUcUc */
 void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     field_0x214 = param_1;
     if (param_2 >= 100) {
@@ -1319,13 +1266,10 @@ void Z2EnvSeMgr::initEtcSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     }
 }
 
-/* 802C8C24-802C8C48 2C3564 0024+00 1/1 1/1 0/0 .text            registEtcSePos__10Z2EnvSeMgrFP3Vec
- */
 void Z2EnvSeMgr::registEtcSePos(Vec* posPtr) {
     mEtcSeMgr.registMultiSePos(posPtr);
 }
 
-/* 802C8C48-802C92C8 2C3588 0680+00 2/1 1/1 0/0 .text            startEtcSe__10Z2EnvSeMgrFSc */
 bool Z2EnvSeMgr::startEtcSe(s8 reverb) {
     #ifdef DEBUG
     const char** spotName = sSpotName;
@@ -1440,12 +1384,10 @@ bool Z2EnvSeMgr::startEtcSe(s8 reverb) {
     return rv;
 }
 
-/* 802C92C8-802C92EC 2C3C08 0024+00 0/0 0/0 1/1 .text registWolfSmellSePos__10Z2EnvSeMgrFP3Vec */
 void Z2EnvSeMgr::registWolfSmellSePos(Vec* posPtr) {
     mWolfSmellSeMgr.registMultiSePos(posPtr);
 }
 
-/* 802C92EC-802C93A0 2C3C2C 00B4+00 0/0 0/0 1/1 .text startFogWipeTrigger__10Z2EnvSeMgrFP3Vec */
 void Z2EnvSeMgr::startFogWipeTrigger(Vec* pos) {
     JUT_ASSERT(1919, pos);
 
@@ -1458,12 +1400,10 @@ void Z2EnvSeMgr::startFogWipeTrigger(Vec* pos) {
     }
 }
 
-/* 802C93A0-802C93E4 2C3CE0 0044+00 0/0 0/0 1/1 .text            setFogWipeWidth__10Z2EnvSeMgrFf */
 void Z2EnvSeMgr::setFogWipeWidth(f32 width) {
     mFogDensity = Z2Calc::linearTransform(width, 0.0f, 1.0f, 1.0f, 0.4f, true);
 }
 
-/* 802C93E4-802C9400 2C3D24 001C+00 3/3 2/2 0/0 .text            getFogDensity__10Z2EnvSeMgrFv */
 f32 Z2EnvSeMgr::getFogDensity() {
     if (field_0x214 == 16) {
         return mFogDensity;
@@ -1472,7 +1412,6 @@ f32 Z2EnvSeMgr::getFogDensity() {
     return 0.0f;
 }
 
-/* 802C9400-802C950C 2C3D40 010C+00 0/0 0/0 1/1 .text            startFogSe__10Z2EnvSeMgrFv */
 bool Z2EnvSeMgr::startFogSe() { 
     bool iVar5 = false;
     f32 dVar10 = field_0x2e8.calcNoise1f();
@@ -1496,7 +1435,6 @@ bool Z2EnvSeMgr::startFogSe() {
     return (iVar6 && iVar5);
 }
 
-/* 802C950C-802C9F58 2C3E4C 0A4C+00 2/0 1/1 0/0 .text initLv3WaterSe__10Z2EnvSeMgrFUcUcUcUc */
 void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     switch (param_1) {
     case 110:
@@ -1746,7 +1684,6 @@ void Z2EnvSeMgr::initLv3WaterSe(u8 param_1, u8 param_2, u8 param_3, u8 param_4)
     }
 }
 
-/* 802C9F58-802CA794 2C4898 083C+00 2/0 1/1 0/0 .text registLv3WaterSePos__10Z2EnvSeMgrFUcP3Vec */
 void Z2EnvSeMgr::registLv3WaterSePos(u8 param_1, Vec* posPtr) {
     switch (param_1) {
     case 110:
@@ -1890,7 +1827,6 @@ void Z2EnvSeMgr::registLv3WaterSePos(u8 param_1, Vec* posPtr) {
     }
 }
 
-/* 802CA794-802CAAC0 2C50D4 032C+00 1/1 1/1 0/0 .text            startLv3WaterSe__10Z2EnvSeMgrFSc */
 void Z2EnvSeMgr::startLv3WaterSe(s8 reverb) {
     if (Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_LAKEBED_TEMPLE) {
         if (reverb >= 0) {
diff --git a/src/Z2AudioLib/Z2FxLineMgr.cpp b/src/Z2AudioLib/Z2FxLineMgr.cpp
index d0f9a1d9a0..61d37c6785 100644
--- a/src/Z2AudioLib/Z2FxLineMgr.cpp
+++ b/src/Z2AudioLib/Z2FxLineMgr.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
 
-/* 802BA7DC-802BA7FC 2B511C 0020+00 0/0 1/1 0/0 .text            __ct__11Z2FxLineMgrFv */
 Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
     mConfig = NULL;
     mLineID = -1;
@@ -17,8 +16,6 @@ Z2FxLineMgr::Z2FxLineMgr() : JASGlobalInstance<Z2FxLineMgr>(true) {
     #endif
 }
 
-/* 802BA7FC-802BAC28 2B513C 042C+00 0/0 1/1 0/0 .text
- * initDataArc__11Z2FxLineMgrFP10JKRArchiveP7JKRHeap            */
 void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
     JUT_ASSERT(44, arc);
     JUT_ASSERT(45, heap);
@@ -76,7 +73,6 @@ void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) {
     setLineID(-1, true, false);
 }
 
-/* 802BAC28-802BAC74 2B5568 004C+00 4/4 0/0 0/0 .text            setLineID__11Z2FxLineMgrFScbb */
 void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
     JUT_ASSERT(109, fxID < mFxDataNum);
 
@@ -89,8 +85,6 @@ void Z2FxLineMgr::setLineID(s8 fxID, bool param_1, bool param_2) {
     setLine(&mConfig[mLineID], param_1, param_2);
 }
 
-/* 802BAC74-802BAE1C 2B55B4 01A8+00 1/1 0/0 0/0 .text setLine__11Z2FxLineMgrFP14Z2FxLineConfigbb
- */
 void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
     JUT_ASSERT(121, config);
 
@@ -154,12 +148,10 @@ void Z2FxLineMgr::setLine(Z2FxLineConfig* config, bool param_1, bool param_2) {
     JASDsp::setFXLine(buf2, (s16*)mFxLineBuffer[buf2], &dsp_config);
 }
 
-/* 802BAE1C-802BAE48 2B575C 002C+00 0/0 1/1 0/0 .text            setFxForceOff__11Z2FxLineMgrFb */
 void Z2FxLineMgr::setFxForceOff(bool param_0) {
     setLineID(mLineID, true, param_0);
 }
 
-/* 802BAE48-802BAEB8 2B5788 0070+00 0/0 1/1 0/0 .text            setUnderWaterFx__11Z2FxLineMgrFb */
 void Z2FxLineMgr::setUnderWaterFx(bool isUnderWaterFx) {
     if (mSetUnderWaterFx != isUnderWaterFx) {
         if (isUnderWaterFx) {
@@ -173,7 +165,6 @@ void Z2FxLineMgr::setUnderWaterFx(bool isUnderWaterFx) {
     }
 }
 
-/* 802BAEB8-802BB00C 2B57F8 0154+00 2/1 1/1 0/0 .text            setSceneFx__11Z2FxLineMgrFl */
 void Z2FxLineMgr::setSceneFx(s32 sceneNo) {
     if (Z2GetSceneMgr()->isInDarkness()) {
         setLineID(11, true, false);
diff --git a/src/Z2AudioLib/Z2LinkMgr.cpp b/src/Z2AudioLib/Z2LinkMgr.cpp
index d916aa34af..f3d7e82d0d 100644
--- a/src/Z2AudioLib/Z2LinkMgr.cpp
+++ b/src/Z2AudioLib/Z2LinkMgr.cpp
@@ -5,15 +5,12 @@
 #include "Z2AudioLib/Z2AudioCS.h"
 #endif
 
-/* 802C321C-802C3220 2BDB5C 0004+00 0/0 1/1 0/0 .text setLinkGroupInfo__14Z2CreatureLinkFUc */
 void Z2CreatureLink::setLinkGroupInfo(u8) {}
 
-/* 802C3220-802C3228 -00001 0008+00 0/0 0/0 0/0 .text            setLinkHp__14Z2CreatureLinkFll */
 void Z2CreatureLink::setLinkHp(s32 linkHp, s32) {
     mLinkHp = linkHp;
 }
 
-/* 802C3228-802C328C 2BDB68 0064+00 0/0 1/1 0/0 .text setLinkSwordType__14Z2CreatureLinkFll */
 void Z2CreatureLink::setLinkSwordType(s32 swordType, s32 param_1) {
     mLinkSwordType = swordType;
     mFlag3 = param_1 == 1;
@@ -28,7 +25,6 @@ void Z2CreatureLink::setLinkSwordType(s32 swordType, s32 param_1) {
     mFlag5 = false;
 }
 
-/* 802C328C-802C32F0 2BDBCC 0064+00 0/0 1/1 0/0 .text setLinkShieldType__14Z2CreatureLinkFll */
 void Z2CreatureLink::setLinkShieldType(s32 shieldType, s32 param_1) {
     mLinkShieldType = shieldType;
     mFlag4 = param_1 == 1;
@@ -43,7 +39,6 @@ void Z2CreatureLink::setLinkShieldType(s32 shieldType, s32 param_1) {
     mFlag5 = false;
 }
 
-/* 802C32F0-802C333C 2BDC30 004C+00 0/0 1/1 0/0 .text setLinkBootsType__14Z2CreatureLinkFl */
 void Z2CreatureLink::setLinkBootsType(s32 bootsType) {
     mLinkBootsType = bootsType;
 
@@ -52,10 +47,8 @@ void Z2CreatureLink::setLinkBootsType(s32 bootsType) {
     }
 }
 
-/* 80451360-80451368 000860 0004+04 3/3 15/15 0/0 .sbss            mLinkPtr__14Z2CreatureLink */
 Z2CreatureLink* Z2CreatureLink::mLinkPtr;
 
-/* 802C333C-802C3464 2BDC7C 0128+00 0/0 1/1 0/0 .text            __ct__14Z2CreatureLinkFv */
 Z2CreatureLink::Z2CreatureLink() {
     mLinkState = 0;
     mLinkPtr = this;
@@ -82,15 +75,12 @@ Z2CreatureLink::Z2CreatureLink() {
     mUsingIronBall = false;
 }
 
-/* 802C3464-802C3500 2BDDA4 009C+00 1/0 0/0 0/0 .text            __dt__18Z2LinkSoundStarterFv */
 inline Z2LinkSoundStarter::~Z2LinkSoundStarter() {}
 
-/* 802C3500-802C35F8 2BDE40 00F8+00 2/1 1/1 0/0 .text            __dt__14Z2CreatureLinkFv */
 Z2CreatureLink::~Z2CreatureLink() {
     deleteObject();
 }
 
-/* 802C35F8-802C3638 2BDF38 0040+00 1/0 0/0 0/0 .text            deleteObject__14Z2CreatureLinkFv */
 void Z2CreatureLink::deleteObject() {
     if (mKantera.isAlive()) {
         deleteKantera();
@@ -99,7 +89,6 @@ void Z2CreatureLink::deleteObject() {
     Z2Creature::deleteObject();
 }
 
-/* 802C3638-802C3710 2BDF78 00D8+00 0/0 1/1 0/0 .text init__14Z2CreatureLinkFP3VecP3VecP3Vec */
 void Z2CreatureLink::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPtr) {
     OS_REPORT("[Z2CreatureLink::init]");
 
@@ -121,26 +110,20 @@ void Z2CreatureLink::init(Vec* animePosPtr, Vec* simplePosPtr, Vec* simple2PosPt
     mSinkDepth = -1;
 }
 
-/* 802C3710-802C374C 2BE050 003C+00 0/0 1/1 0/0 .text            initKantera__14Z2CreatureLinkFP3Vec
- */
 void Z2CreatureLink::initKantera(Vec* posPtr) {
     mKanteraState = 0;
     mKantera.init(posPtr, 2);
 }
 
-/* 802C374C-802C3778 2BE08C 002C+00 1/1 1/1 0/0 .text            deleteKantera__14Z2CreatureLinkFv
- */
 void Z2CreatureLink::deleteKantera() {
     mKanteraState = 0;
     mKantera.deleteObject();
 }
 
-/* 802C3778-802C3780 -00001 0008+00 0/0 0/0 0/0 .text setKanteraState__14Z2CreatureLinkFUc */
 void Z2CreatureLink::setKanteraState(u8 state) {
     mKanteraState = state;
 }
 
-/* 802C3780-802C3A64 2BE0C0 02E4+00 1/0 0/0 0/0 .text            framework__14Z2CreatureLinkFUlSc */
 void Z2CreatureLink::framework(u32 mapinfo, s8 reverb) {
     Z2Creature::framework(mapinfo, reverb);
 
@@ -190,13 +173,10 @@ void Z2CreatureLink::framework(u32 mapinfo, s8 reverb) {
     }
 }
 
-/* 802C3A64-802C3A6C -00001 0008+00 0/0 0/0 0/0 .text            setSinkDepth__14Z2CreatureLinkFSc
- */
 void Z2CreatureLink::setSinkDepth(s8 sinkDepth) {
     mSinkDepth = sinkDepth;
 }
 
-/* 802C3A6C-802C3AEC 2BE3AC 0080+00 0/0 4/4 0/0 .text            setRiding__14Z2CreatureLinkFb */
 void Z2CreatureLink::setRiding(bool isRiding) {
     if (mRiding != isRiding) {
         if (isRiding) {
@@ -211,14 +191,10 @@ void Z2CreatureLink::setRiding(bool isRiding) {
     }
 }
 
-/* 802C3AEC-802C3AFC 2BE42C 0010+00 0/0 5/5 0/0 .text            setMagnetized__14Z2CreatureLinkFb
- */
 void Z2CreatureLink::setMagnetized(bool isMagnetized) {
     mMagnetized = isMagnetized;
 }
 
-/* 802C3AFC-802C3BD4 2BE43C 00D8+00 0/0 2/2 0/0 .text            setWolfEyeOpen__14Z2CreatureLinkFb
- */
 void Z2CreatureLink::setWolfEyeOpen(bool wolfEyeOpen) {
     mWolfEyeOpen = wolfEyeOpen;
 
@@ -245,8 +221,6 @@ void Z2CreatureLink::setWolfEyeOpen(bool wolfEyeOpen) {
     }
 }
 
-/* 802C3BD4-802C3E68 2BE514 0294+00 3/3 3/3 0/0 .text
- * startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc            */
 Z2SoundHandlePool* Z2CreatureLink::startLinkSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = startCreatureSound(soundID, mapinfo, reverb);
 
@@ -282,8 +256,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkSound(JAISoundID soundID, u32 mapinf
     return handle;
 }
 
-/* 802C3E68-802C4320 2BE7A8 04B8+00 1/1 3/3 0/0 .text
- * startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc       */
 JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     #if PLATFORM_WII || PLATFORM_SHIELD
     if (Z2GetSceneMgr()->isSceneExist()) {
@@ -377,8 +349,6 @@ JAISoundHandle* Z2CreatureLink::startLinkSoundLevel(JAISoundID soundID, u32 mapi
     return handle;
 }
 
-/* 802C4320-802C45B0 2BEC60 0290+00 1/1 1/1 0/0 .text
- * startLinkVoice__14Z2CreatureLinkF10JAISoundIDSc              */
 Z2SoundHandlePool* Z2CreatureLink::startLinkVoice(JAISoundID soundID, s8 reverb) {
     if (mLinkState == 1) {
         switch (soundID) {
@@ -448,8 +418,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkVoice(JAISoundID soundID, s8 reverb)
     return startCreatureVoice(soundID, reverb);
 }
 
-/* 802C45B0-802C46F0 2BEEF0 0140+00 0/0 1/1 0/0 .text
- * startLinkVoiceLevel__14Z2CreatureLinkF10JAISoundIDSc         */
 Z2SoundHandlePool* Z2CreatureLink::startLinkVoiceLevel(JAISoundID soundID, s8 reverb) {
     if (mLinkState == 1) {
         switch (soundID) {
@@ -487,8 +455,6 @@ Z2SoundHandlePool* Z2CreatureLink::startLinkVoiceLevel(JAISoundID soundID, s8 re
     return startCreatureVoiceLevel(soundID, reverb);
 }
 
-/* 802C46F0-802C4784 2BF030 0094+00 0/0 2/2 0/0 .text
- * startLinkSwordSound__14Z2CreatureLinkF10JAISoundIDUlSc       */
 void Z2CreatureLink::startLinkSwordSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     u32 sound_ID = soundID;  // fakematch
 
@@ -515,7 +481,6 @@ void Z2CreatureLink::startLinkSwordSound(JAISoundID soundID, u32 mapinfo, s8 rev
     }
 }
 
-/* 802C4784-802C4814 2BF0C4 0090+00 1/0 0/0 0/0 .text startCollisionSE__14Z2CreatureLinkFUlUl */
 Z2SoundHandlePool* Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) {
     switch (mapinfo) {
     case 0x28:
@@ -533,8 +498,6 @@ Z2SoundHandlePool* Z2CreatureLink::startCollisionSE(u32 hitID, u32 mapinfo) {
     return mSoundObjAnime.startCollisionSE(hitID, mapinfo, NULL);
 }
 
-/* 802C4814-802C48D8 2BF154 00C4+00 0/0 4/4 2/2 .text
- * startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef      */
 Z2SoundHandlePool* Z2CreatureLink::startHitItemSE(u32 soundID, u32 mapinfo, Z2SoundObjBase* other, f32 speed) {
     if (other == NULL) {
         other = &mSoundObjSimple2;
@@ -558,17 +521,12 @@ Z2SoundHandlePool* Z2CreatureLink::startHitItemSE(u32 soundID, u32 mapinfo, Z2So
     return handle;
 }
 
-/* 802C48D8-802C48E8 2BF218 0010+00 0/0 1/1 0/0 .text            setResumeAttack__14Z2CreatureLinkFb
- */
 void Z2CreatureLink::setResumeAttack(bool resumeAttack) {
     mResumeAttack = resumeAttack;
 }
 
-/* 802C48E8-802C4928 2BF228 0040+00 1/1 0/0 0/0 .text            __ct__18Z2LinkSoundStarterFv */
 Z2LinkSoundStarter::Z2LinkSoundStarter() : Z2SoundStarter(false) {}
 
-/* 802C4928-802C4FFC 2BF268 06D4+00 2/0 0/0 0/0 .text
- * startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
 bool Z2LinkSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
                                     const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
                                     f32 fxMix, f32 pitch, f32 volume, f32 pan,
@@ -718,43 +676,33 @@ bool Z2LinkSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
     return ret;
 }
 
-/* 802C4FFC-802C5078 2BF93C 007C+00 0/0 0/0 3/3 .text            __ct__14Z2CreatureRideFv */
 Z2CreatureRide::Z2CreatureRide() : Z2RideSoundStarter(this) {
     mLinkRiding = false;
 
     setSoundStarter(this);
 }
 
-/* 802C5114-802C51EC 2BFA54 00D8+00 2/1 0/0 2/2 .text            __dt__14Z2CreatureRideFv */
 Z2CreatureRide::~Z2CreatureRide() {
     deleteObject();
 }
 
-/* 802C51EC-802C520C 2BFB2C 0020+00 1/0 0/0 0/0 .text            deleteObject__14Z2CreatureRideFv */
 void Z2CreatureRide::deleteObject() {
     Z2Creature::deleteObject();
 }
 
-/* 802C520C-802C522C 2BFB4C 0020+00 0/0 0/0 3/3 .text init__14Z2CreatureRideFP3VecP3VecUcUc */
 void Z2CreatureRide::init(Vec* animePosPtr, Vec* simplePosPtr, u8 animeHandleNum, u8 simpleHandleNum) {
     Z2Creature::init(animePosPtr, simplePosPtr, animeHandleNum, simpleHandleNum);
 }
 
-/* 802C522C-802C5234 -00001 0008+00 0/0 0/0 0/0 .text            setLinkRiding__14Z2CreatureRideFb
- */
 void Z2CreatureRide::setLinkRiding(bool isRiding) {
     mLinkRiding = isRiding;
 }
 
-/* 802C5234-802C5284 2BFB74 0050+00 1/1 0/0 0/0 .text __ct__18Z2RideSoundStarterFP14Z2CreatureRide
- */
 Z2RideSoundStarter::Z2RideSoundStarter(Z2CreatureRide* ride) : Z2SoundStarter(false) {
     mRide = ride;
     JUT_ASSERT(1294, ride);
 }
 
-/* 802C5284-802C54B8 2BFBC4 0234+00 2/0 0/0 0/0 .text
- * startSound__18Z2RideSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
 bool Z2RideSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
                                     const JGeometry::TVec3<f32>* posPtr, u32 mapinfo,
                                     f32 fxMix, f32 pitch, f32 volume, f32 pan,
@@ -809,17 +757,14 @@ bool Z2RideSoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handle,
     return ret;
 }
 
-/* 802C54B8-802C54FC 2BFDF8 0044+00 0/0 0/0 1/1 .text            __ct__15Z2SoundObjCoachFv */
 Z2SoundObjCoach::Z2SoundObjCoach() {
     field_0x20 = 0.0f;
 }
 
-/* 802C54FC-802C551C 2BFE3C 0020+00 1/0 0/0 0/0 .text            init__15Z2SoundObjCoachFP3VecUc */
 void Z2SoundObjCoach::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
 }
 
-/* 802C551C-802C56C0 2BFE5C 01A4+00 0/0 0/0 1/1 .text startWheelSound__15Z2SoundObjCoachFf */
 Z2SoundHandlePool* Z2SoundObjCoach::startWheelSound(f32 param_0) {
     Z2SoundHandlePool* handle = NULL;
 
@@ -851,7 +796,6 @@ Z2SoundHandlePool* Z2SoundObjCoach::startWheelSound(f32 param_0) {
     return handle;
 }
 
-/* 802C56C0-802C57C0 2C0000 0100+00 0/0 0/0 1/1 .text startFireSound__15Z2SoundObjCoachFUs */
 Z2SoundHandlePool* Z2SoundObjCoach::startFireSound(u16 param_0) {
     Z2SoundHandlePool* handle = startLevelSound(Z2SE_COACH_FIRE, 0, -1);
     
@@ -867,8 +811,6 @@ Z2SoundHandlePool* Z2SoundObjCoach::startFireSound(u16 param_0) {
     return handle;
 }
 
-/* 802C57C0-802C588C 2C0100 00CC+00 1/0 0/0 0/0 .text
- * startSound__15Z2SoundObjCoachF10JAISoundIDUlSc               */
 Z2SoundHandlePool* Z2SoundObjCoach::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb);
 
diff --git a/src/Z2AudioLib/Z2Param.cpp b/src/Z2AudioLib/Z2Param.cpp
index 5b71d16a38..201f6f5e89 100644
--- a/src/Z2AudioLib/Z2Param.cpp
+++ b/src/Z2AudioLib/Z2Param.cpp
@@ -5,123 +5,74 @@
 
 #include "Z2AudioLib/Z2Param.h"
 
-/* 804507D8-804507DC 000258 0004+00 0/0 4/4 0/0 .sdata           DISTANCE_MAX__7Z2Param */
 f32 Z2Param::DISTANCE_MAX = 2000.0f;
 
-/* 804507DC-804507E0 00025C 0004+00 0/0 3/3 0/0 .sdata           MAX_VOLUME_DISTANCE__7Z2Param */
 f32 Z2Param::MAX_VOLUME_DISTANCE = 300.0f;
 
-/* 804507E0-804507E4 000260 0004+00 0/0 1/1 0/0 .sdata           DOLBY_CENTER_VALUE__7Z2Param */
 f32 Z2Param::DOLBY_CENTER_VALUE = 0.3f;
 
-/* 804507E4-804507E8 000264 0004+00 0/0 3/3 0/0 .sdata           DOLBY_FLONT_DISTANCE_MAX__7Z2Param
- */
 f32 Z2Param::DOLBY_FLONT_DISTANCE_MAX = -300.0f;
 
-/* 804507E8-804507EC 000268 0004+00 0/0 3/3 0/0 .sdata           DOLBY_BEHIND_DISTANCE_MAX__7Z2Param
- */
 f32 Z2Param::DOLBY_BEHIND_DISTANCE_MAX = 600.0f;
 
-/* 804507EC-804507F0 00026C 0004+00 0/0 1/1 0/0 .sdata           DISTANCE_FX_PARAM__7Z2Param */
 f32 Z2Param::DISTANCE_FX_PARAM = 10.0f / 127.0f;
 
-/* 804507F0-804507F4 000270 0004+00 0/0 1/1 0/0 .sdata           SONIC_SPEED__7Z2Param */
 f32 Z2Param::SONIC_SPEED = 360.0f;
 
-/* 804507F4-804507F8 000274 0004+00 0/0 3/3 0/0 .sdata           VOL_BGM_DEFAULT__7Z2Param */
 f32 Z2Param::VOL_BGM_DEFAULT = 1.0f;
 
-/* 804507F8-804507FC 000278 0004+00 0/0 2/2 0/0 .sdata           VOL_SE_SYSTEM_DEFAULT__7Z2Param */
 f32 Z2Param::VOL_SE_SYSTEM_DEFAULT = 120.0f / 127.0f;
 
-/* 804507FC-80450800 00027C 0004+00 0/0 3/3 0/0 .sdata           VOL_SE_LINK_VOICE_DEFAULT__7Z2Param
- */
 f32 Z2Param::VOL_SE_LINK_VOICE_DEFAULT = 1.0f;
 
-/* 80450800-80450804 000280 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_MOTION_DEFAULT__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_MOTION_DEFAULT = 120.0f / 127.0f;
 
-/* 80450804-80450808 000284 0004+00 0/0 3/3 0/0 .sdata VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT = 120.0f / 127.0f;
 
-/* 80450808-8045080C 000288 0004+00 0/0 3/3 0/0 .sdata           VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_VOICE_DEFAULT = 120.0f / 127.0f;
 
-/* 8045080C-80450810 00028C 0004+00 0/0 3/3 0/0 .sdata           VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_MOVE_DEFAULT = 120.0f / 127.0f;
 
-/* 80450810-80450814 000290 0004+00 0/0 3/3 0/0 .sdata           VOL_SE_OBJECT_DEFAULT__7Z2Param */
 f32 Z2Param::VOL_SE_OBJECT_DEFAULT = 120.0f / 127.0f;
 
-/* 80450814-80450818 000294 0004+00 0/0 3/3 0/0 .sdata           VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param
- */
 f32 Z2Param::VOL_SE_ATMOSPHERE_DEFAULT = 120.0f / 127.0f;
 
-/* 80450818-8045081C 000298 0004+00 0/0 1/1 0/0 .sdata           VOL_BGM_TALKING__7Z2Param */
 f32 Z2Param::VOL_BGM_TALKING = 0.5f;
 
-/* 8045081C-80450820 00029C 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_SYSTEM_TALKING__7Z2Param */
 f32 Z2Param::VOL_SE_SYSTEM_TALKING = 112.0f / 127.0f;
 
-/* 80450820-80450824 0002A0 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_LINK_VOICE_TALKING__7Z2Param
- */
 f32 Z2Param::VOL_SE_LINK_VOICE_TALKING = 104.0f / 127.0f;
 
-/* 80450824-80450828 0002A4 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_TALKING__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_MOTION_TALKING = 96.0f / 127.0f;
 
-/* 80450828-8045082C 0002A8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING = 96.0f / 127.0f;
 
-/* 8045082C-80450830 0002AC 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_CHAR_VOICE_TALKING__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_VOICE_TALKING = 120.0f / 127.0f;
 
-/* 80450830-80450834 0002B0 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_CHAR_MOVE_TALKING__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_MOVE_TALKING = 119.0f / 127.0f;
 
-/* 80450834-80450838 0002B4 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_OBJECT_TALKING__7Z2Param */
 f32 Z2Param::VOL_SE_OBJECT_TALKING = 96.0f / 127.0f;
 
-/* 80450838-8045083C 0002B8 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_ATMOSPHERE_TALKING__7Z2Param
- */
 f32 Z2Param::VOL_SE_ATMOSPHERE_TALKING = 96.0f / 127.0f;
 
-/* 8045083C-80450840 0002BC 0004+00 0/0 1/1 0/0 .sdata           VOL_BGM_PAUSING__7Z2Param */
 f32 Z2Param::VOL_BGM_PAUSING = 0.3f;
 
-/* 80450840-80450844 0002C0 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_SYSTEM_PAUSING__7Z2Param */
 f32 Z2Param::VOL_SE_SYSTEM_PAUSING = 112.0f / 127.0f;
 
-/* 80450844-80450848 0002C4 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_LINK_VOICE_PAUSING__7Z2Param
- */
 f32 Z2Param::VOL_SE_LINK_VOICE_PAUSING = 80.0f / 127.0f;
 
-/* 80450848-8045084C 0002C8 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_MOTION_PAUSING__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_MOTION_PAUSING = 72.0f / 127.0f;
 
-/* 8045084C-80450850 0002CC 0004+00 0/0 1/1 0/0 .sdata VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param */
 f32 Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING = 72.0f / 127.0f;
 
-/* 80450850-80450854 0002D0 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_CHAR_VOICE_PAUSING__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_VOICE_PAUSING = 72.0f / 127.0f;
 
-/* 80450854-80450858 0002D4 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_CHAR_MOVE_PAUSING__7Z2Param
- */
 f32 Z2Param::VOL_SE_CHAR_MOVE_PAUSING = 72.0f / 127.0f;
 
-/* 80450858-8045085C 0002D8 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_OBJECT_PAUSING__7Z2Param */
 f32 Z2Param::VOL_SE_OBJECT_PAUSING = 72.0f / 127.0f;
 
-/* 8045085C-80450860 0002DC 0004+00 0/0 1/1 0/0 .sdata           VOL_SE_ATMOSPHERE_PAUSING__7Z2Param
- */
 f32 Z2Param::VOL_SE_ATMOSPHERE_PAUSING = 72.0f / 127.0f;
 
-/* 80450860-80450864 -00001 0004+00 0/0 15/15 0/0 .sdata           None */
 u8 Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME = 33;
 
 u8 Z2Param::BGM_CROSS_FADEIN_TIME = 60;
@@ -130,7 +81,6 @@ u8 Z2Param::BGM_CROSS_FADEOUT_TIME = 60;
 
 u8 Z2Param::BATTLE_BGM_WAIT_TIME = 30;
 
-/* 80450864-80450868 -00001 0004+00 0/0 2/2 0/0 .sdata           None */
 u8 Z2Param::FOUND_TRACK_FI_TIME = 20;
 
 u8 Z2Param::FOUND_TRACK_FO_TIME = 30;
@@ -139,7 +89,6 @@ u8 Z2Param::CLOSE_BATTLE_TRACK_FI_TIME = 10;
 
 u8 Z2Param::CLOSE_BATTLE_TRACK_FO_TIME = 30;
 
-/* 80450868-8045086C -00001 0004+00 0/0 5/5 0/0 .sdata           None */
 u8 Z2Param::ENDING_BLOW_VOL_DOWN_TIME = 1;
 
 u8 Z2Param::ENDING_BLOW_VOL_LOWER_TIME = 10;
@@ -148,17 +97,12 @@ u8 Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME = 30;
 
 u8 Z2Param::ENDING_BLOW_MIN_FINISH_TIME = 20;
 
-/* 8045086C-80450870 0002EC 0004+00 0/0 3/3 0/0 .sdata           None */
 u8 data_8045086C = 1;
 
-/* 80451338-8045133C 000838 0004+00 0/0 1/1 0/0 .sbss            MIN_DISTANCE_VOLUME__7Z2Param */
 f32 Z2Param::MIN_DISTANCE_VOLUME;
 
-/* 8045133C-80451340 00083C 0004+00 0/0 1/1 0/0 .sbss            ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param
- */
 f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME;
 
-/* 80451340-80451348 -00001 0008+00 0/0 2/2 0/0 .sbss            None */
 /* 80451340 0001+00 data_80451340 None */
 u8 Z2Param::DARK_SE_FILTER_ON;
 
diff --git a/src/Z2AudioLib/Z2SceneMgr.cpp b/src/Z2AudioLib/Z2SceneMgr.cpp
index 14751161b0..91189b4fa3 100644
--- a/src/Z2AudioLib/Z2SceneMgr.cpp
+++ b/src/Z2AudioLib/Z2SceneMgr.cpp
@@ -10,7 +10,6 @@
 #include "Z2AudioLib/Z2StatusMgr.h"
 #include "d/d_com_inf_game.h"
 
-/* 802B6840-802B68B0 2B1180 0070+00 0/0 1/1 0/0 .text            __ct__10Z2SceneMgrFv */
 Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
     sceneNum = -1;
     BGM_ID = -1;
@@ -35,7 +34,6 @@ Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
     load1stWait = 0;
 }
 
-/* 802B68B0-802B68E0 2B11F0 0030+00 0/0 1/1 0/0 .text            setInDarkness__10Z2SceneMgrFb */
 void Z2SceneMgr::setInDarkness(bool inDarkness) {
     OS_REPORT("[Z2SceneMgr::setInDarkness] inDarkness = %d\n", inDarkness);
 
@@ -129,7 +127,6 @@ static char* sSpotName[81] = {
     "D_SB10",
 };
 
-/* 802B68E0-802B697C 2B1220 009C+00 3/3 2/2 2/2 .text            setSceneExist__10Z2SceneMgrFb */
 void Z2SceneMgr::setSceneExist(bool isSceneExist) {
     sceneExist = isSceneExist;
     timer = 0;
@@ -151,7 +148,6 @@ void Z2SceneMgr::setSceneExist(bool isSceneExist) {
     }
 }
 
-/* 802B697C-802B6A18 2B12BC 009C+00 0/0 1/1 0/0 .text            setFadeOutStart__10Z2SceneMgrFUc */
 void Z2SceneMgr::setFadeOutStart(u8 fadeType) {
     OS_REPORT("[Z2SceneMgr::setFadeOutStart] fadeType = %d\n", fadeType);
 
@@ -163,7 +159,6 @@ void Z2SceneMgr::setFadeOutStart(u8 fadeType) {
     timer = -1;
 }
 
-/* 802B6A18-802B6AF8 2B1358 00E0+00 0/0 1/1 0/0 .text            setFadeInStart__10Z2SceneMgrFUc */
 void Z2SceneMgr::setFadeInStart(u8 fadeType) {
     OS_REPORT("[Z2SceneMgr::setFadeInStart] fadeType = %d\n", fadeType);
 
@@ -187,7 +182,6 @@ void Z2SceneMgr::setFadeInStart(u8 fadeType) {
     inGame = true;
 }
 
-/* 802B6AF8-802B995C 2B1438 2E64+00 8/0 1/1 0/0 .text            setSceneName__10Z2SceneMgrFPcll */
 // NONMATCHING JSULink<JAIStream>::getNext() inlining
 void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
     OS_REPORT("[Z2SceneMgr::setSceneName] spot = %s, room = %d, layer = %d\n", spot, room, layer);
@@ -1747,8 +1741,6 @@ void Z2SceneMgr::setSceneName(char* spot, s32 room, s32 layer) {
     roomNum = room;
 }
 
-/* 802B9B68-802B9C50 2B44A8 00E8+00 1/1 0/0 0/0 .text
- * sceneChange__10Z2SceneMgrF10JAISoundIDUcUcUcUcUcb            */
 void Z2SceneMgr::sceneChange(JAISoundID bgm, u8 seWave1, u8 seWave2, u8 bgmWave1, u8 bgmWave2,
                              u8 demoWave, bool param_6) {
     OS_REPORT("[Z2SceneMgr::sceneChange] bgm:0x%08x, SeWave1:%d, SeWave2:%d BgmWave1:%d BgmWave2:%d demoWave:%d (%d)\n",
@@ -1781,7 +1773,6 @@ void Z2SceneMgr::sceneChange(JAISoundID bgm, u8 seWave1, u8 seWave2, u8 bgmWave1
     Z2GetFxLineMgr()->setSceneFx(sceneNum);
 }
 
-/* 802B9C50-802B9D40 2B4590 00F0+00 0/0 1/1 0/0 .text            framework__10Z2SceneMgrFv */
 void Z2SceneMgr::framework() {
     if (load1stWait > 0) {
         load1stWait--;
@@ -1807,8 +1798,6 @@ void Z2SceneMgr::framework() {
     }
 }
 
-/* 802B9D40-802B9D98 2B4680 0058+00 0/0 1/1 0/0 .text            load1stDynamicWave__10Z2SceneMgrFv
- */
 void Z2SceneMgr::load1stDynamicWave() {
     OS_REPORT("[Z2SceneMgr::load1stDynamicWave] load1stWait:%d\n", load1stWait);
 
@@ -1820,7 +1809,6 @@ void Z2SceneMgr::load1stDynamicWave() {
     }
 }
 
-/* 802B9D98-802B9FC8 2B46D8 0230+00 2/2 0/0 0/0 .text            _load1stWaveInner_1__10Z2SceneMgrFv */
 void Z2SceneMgr::_load1stWaveInner_1() {
     OS_REPORT("[Z2SceneMgr::_load1stWaveInner_1] requestSe:%d loadedSe:%d\n", requestSeWave_1, loadedSeWave_1);
 
@@ -1871,8 +1859,6 @@ void Z2SceneMgr::_load1stWaveInner_1() {
     }
 }
 
-/* 802B9FC8-802BA09C 2B4908 00D4+00 2/2 0/0 0/0 .text            _load1stWaveInner_2__10Z2SceneMgrFv
- */
 void Z2SceneMgr::_load1stWaveInner_2() {
     OS_REPORT("[Z2SceneMgr::_load1stWaveInner_2] requestBgm:%d loadedBgm:%d\n", requestBgmWave_1, loadedBgmWave_1);
 
@@ -1896,14 +1882,10 @@ void Z2SceneMgr::_load1stWaveInner_2() {
     }
 }
 
-/* 802BA09C-802BA120 2B49DC 0084+00 0/0 1/1 0/0 .text            check1stDynamicWave__10Z2SceneMgrFv
- */
 bool Z2SceneMgr::check1stDynamicWave() {
     return load1stWait != 0 || getSeLoadStatus(requestSeWave_1) == 1 || getBgmLoadStatus(requestBgmWave_1) == 1;
 }
 
-/* 802BA120-802BA294 2B4A60 0174+00 0/0 2/2 0/0 .text            load2ndDynamicWave__10Z2SceneMgrFv
- */
 void Z2SceneMgr::load2ndDynamicWave() {
     OS_REPORT("[Z2SceneMgr::load2ndDynamicWave] requestSe:%d, loadedSe:%d requestBgm:%d loadedBgm:%d requestDemo:%d loadedDemo:%d\n",
         requestSeWave_2, loadedSeWave_2, requestBgmWave_2, loadedBgmWave_2, requestDemoWave, loadedDemoWave);
@@ -1945,7 +1927,6 @@ void Z2SceneMgr::load2ndDynamicWave() {
     }
 }
 
-/* 802BA294-802BA56C 2B4BD4 02D8+00 1/0 2/2 0/0 .text            sceneBgmStart__10Z2SceneMgrFv */
 // NONMATCHING - extra BGM_ID load
 void Z2SceneMgr::sceneBgmStart() {
     OS_REPORT("[Z2SceneMgr::sceneBgmStart] %08x\n", *(u32*)&BGM_ID);
@@ -2039,7 +2020,6 @@ void Z2SceneMgr::sceneBgmStart() {
     field_0x1a = false;
 }
 
-/* 802BA56C-802BA5C0 2B4EAC 0054+00 0/0 1/1 0/0 .text            loadStaticWaves__10Z2SceneMgrFv */
 void Z2SceneMgr::loadStaticWaves() {
     OS_REPORT("[Z2SceneMgr::loadStaticWaves] 常駐シーン波形を読み込みます\n");
     #if PLATFORM_SHIELD
@@ -2052,12 +2032,10 @@ void Z2SceneMgr::loadStaticWaves() {
     field_0x19 = 0x58;
 }
 
-/* 802BA5C0-802BA5C8 2B4F00 0008+00 0/0 1/1 0/0 .text            checkFirstWaves__10Z2SceneMgrFv */
 BOOL Z2SceneMgr::checkFirstWaves() {
     return false;
 }
 
-/* 802BA5C8-802BA630 2B4F08 0068+00 2/2 0/0 0/0 .text            eraseSeWave__10Z2SceneMgrFUl */
 bool Z2SceneMgr::eraseSeWave(u32 wave) {
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
     JUT_ASSERT(2976, sectionHeap);
@@ -2072,7 +2050,6 @@ bool Z2SceneMgr::eraseSeWave(u32 wave) {
     return false;
 }
 
-/* 802BA630-802BA698 2B4F70 0068+00 2/2 0/0 0/0 .text            eraseBgmWave__10Z2SceneMgrFUl */
 bool Z2SceneMgr::eraseBgmWave(u32 wave) {
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
     JUT_ASSERT(2988, sectionHeap);
@@ -2087,7 +2064,6 @@ bool Z2SceneMgr::eraseBgmWave(u32 wave) {
     return false;
 }
 
-/* 802BA698-802BA704 2B4FD8 006C+00 1/1 0/0 0/0 .text getWaveLoadStatus__10Z2SceneMgrFUlUl */
 s32 Z2SceneMgr::getWaveLoadStatus(u32 wave, u32 bank) {
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
     JUT_ASSERT(3001, sectionHeap);
@@ -2118,7 +2094,6 @@ bool Z2SceneMgr::loadSceneWave(u32 wave, u32 bank) {
 }
 #endif
 
-/* 802BA704-802BA770 2B5044 006C+00 3/3 0/0 0/0 .text            loadSeWave__10Z2SceneMgrFUl */
 bool Z2SceneMgr::loadSeWave(u32 wave) {
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
     JUT_ASSERT(3030, sectionHeap);
@@ -2135,7 +2110,6 @@ bool Z2SceneMgr::loadSeWave(u32 wave) {
     return false;
 }
 
-/* 802BA770-802BA7DC 2B50B0 006C+00 3/3 0/0 0/0 .text            loadBgmWave__10Z2SceneMgrFUl */
 bool Z2SceneMgr::loadBgmWave(u32 wave) {
     JAUSectionHeap* sectionHeap = JASGlobalInstance<JAUSectionHeap>::getInstance();
     JUT_ASSERT(3047, sectionHeap);
diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp
index f4f02fe6e9..7ec10da077 100644
--- a/src/Z2AudioLib/Z2SeMgr.cpp
+++ b/src/Z2AudioLib/Z2SeMgr.cpp
@@ -10,7 +10,6 @@
 #include "Z2AudioLib/Z2SeqMgr.h"
 #include "JSystem/J3DU/J3DUD.h"
 
-/* 802AB64C-802AB710 2A5F8C 00C4+00 0/0 1/1 0/0 .text            __ct__7Z2SeMgrFv */
 Z2SeMgr::Z2SeMgr() : JASGlobalInstance(true), mSoundHandles(mSoundHandle, 24) {
     field_0x3c0 = 0;
     field_0x3c1 = 0;
@@ -30,7 +29,6 @@ Z2MultiSeObj::Z2MultiSeObj() {
     reverb_ = 0;
 }
 
-/* 802AB750-802AB80C 2A6090 00BC+00 0/0 1/1 0/0 .text            initSe__7Z2SeMgrFv */
 void Z2SeMgr::initSe() {
     #if VERSION == VERSION_SHIELD_DEBUG
     dbg_field_0x68.releaseSound();
@@ -64,8 +62,6 @@ void Z2SeMgr::resetModY() {
     }
 }
 
-/* 802AB830-802AB93C 2A6170 010C+00 1/1 0/0 0/0 .text            modHeightAtCamera__7Z2SeMgrFPPC3Vec
- */
 void Z2SeMgr::modHeightAtCamera(const Vec** param_0) {
     if (*param_0 != NULL) {
         int idx = 9999;
@@ -118,8 +114,6 @@ void Z2SeMgr::decrCrowdSize() {
         mCrowdSize = 0;
 }
 
-/* 802AB984-802AC50C 2A62C4 0B88+00 1/1 196/196 549/549 .text
- * seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc               */
 bool Z2SeMgr::seStart(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 reverb,
                       f32 pitch, f32 volume, f32 pan, f32 dolby, u8 param_8) {
     if (soundID == 0xFFFFFFFF) {
@@ -353,8 +347,6 @@ bool Z2SeMgr::seStart(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 rev
                                            pitch, volume, pan, dolby, 0);
 }
 
-/* 802AC50C-802AD8B0 2A6E4C 13A4+00 3/2 19/19 199/199 .text
- * seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc          */
 bool Z2SeMgr::seStartLevel(JAISoundID soundID, const Vec* posPtr, u32 param_2, s8 reverb,
                            f32 pitch, f32 volume, f32 pan, f32 dolby, u8 param_8) {
     if (param_8 != 1) {
@@ -710,7 +702,6 @@ bool Z2SeMgr::seStartLevel(JAISoundID soundID, const Vec* posPtr, u32 param_2, s
     return ret;
 }
 
-/* 802AD8B0-802AD94C 2A81F0 009C+00 1/1 0/0 4/4 .text            seStop__7Z2SeMgrF10JAISoundIDUl */
 void Z2SeMgr::seStop(JAISoundID soundID, u32 fadeTime) {
     if (soundID != -1) {
         for (u8 i = 0; i < 24; i++) {
@@ -722,7 +713,6 @@ void Z2SeMgr::seStop(JAISoundID soundID, u32 fadeTime) {
     }
 }
 
-/* 802AD94C-802AD9F4 2A828C 00A8+00 0/0 1/1 0/0 .text            seStopAll__7Z2SeMgrFUl */
 void Z2SeMgr::seStopAll(u32 fadeTime) {
     JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr();
     seMgr->getCategory(0)->stop(fadeTime);
@@ -737,7 +727,6 @@ void Z2SeMgr::seStopAll(u32 fadeTime) {
     seMgr->getCategory(9)->stop(fadeTime);
 }
 
-/* 802AD9F4-802ADB14 2A8334 0120+00 3/3 5/5 1/1 .text            seMoveVolumeAll__7Z2SeMgrFfUl */
 void Z2SeMgr::seMoveVolumeAll(f32 volume, u32 moveTime) {
     if (Z2GetStatusMgr()->getDemoStatus() == 13) {
         volume = 0.0f;
@@ -758,13 +747,10 @@ void Z2SeMgr::seMoveVolumeAll(f32 volume, u32 moveTime) {
     }
 }
 
-/* 802ADB14-802ADB50 2A8454 003C+00 0/0 1/1 0/0 .text            messageSePlay__7Z2SeMgrFUsP3VecSc
- */
 void Z2SeMgr::messageSePlay(u16 param_0, Vec* param_1, s8 param_2) {
     Z2GetSpeechMgr2()->playOneShotVoice(0, param_0, param_1, param_2);
 }
 
-/* 802ADB50-802ADC54 2A8490 0104+00 0/0 1/1 0/0 .text            talkInSe__7Z2SeMgrFv */
 void Z2SeMgr::talkInSe() {
     if (Z2GetSceneMgr()->isInGame()) {
         if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -788,7 +774,6 @@ void Z2SeMgr::talkInSe() {
     }
 }
 
-/* 802ADC54-802ADD58 2A8594 0104+00 0/0 2/2 0/0 .text            talkOutSe__7Z2SeMgrFv */
 void Z2SeMgr::talkOutSe() {
     if (Z2GetSceneMgr()->isInGame()) {
         if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -812,7 +797,6 @@ void Z2SeMgr::talkOutSe() {
     }
 }
 
-/* 802ADD58-802ADE5C 2A8698 0104+00 0/0 1/1 0/0 .text            menuInSe__7Z2SeMgrFv */
 void Z2SeMgr::menuInSe() {
     if (Z2GetSceneMgr()->isInGame()) {
         if (Z2GetStatusMgr()->getDemoStatus() == 13) {
@@ -836,7 +820,6 @@ void Z2SeMgr::menuInSe() {
     }
 }
 
-/* 802ADE5C-802ADFF4 2A879C 0198+00 1/1 0/0 0/0 .text            setLevObjSE__7Z2SeMgrFUlP3VecSc */
 void Z2SeMgr::setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb) {
     u8 i = 0;
     for (; i < mLevelObjectSeCount; i++) {
@@ -880,7 +863,6 @@ void Z2SeMgr::setLevObjSE(u32 soundID, Vec* posPtr, s8 reverb) {
     }
 }
 
-/* 802ADFF4-802AE184 2A8934 0190+00 1/1 0/0 0/0 .text setMultiTriggerSE__7Z2SeMgrFUlP3VecSc */
 void Z2SeMgr::setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb) {
     u8 i = 0;
     for (; i < mMultiTriggerSeCount; i++) {
@@ -926,7 +908,6 @@ void Z2SeMgr::setMultiTriggerSE(u32 soundID, Vec* posPtr, s8 reverb) {
     }
 }
 
-/* 802AE184-802AE524 2A8AC4 03A0+00 0/0 1/1 0/0 .text            processSeFramework__7Z2SeMgrFv */
 void Z2SeMgr::processSeFramework() {
     if (Z2GetSceneMgr()->isSceneExist() && mCrowdSize != 0) {
         seStartLevel(Z2SE_ENV_PEOPLE_CROWD, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1019,7 +1000,6 @@ void Z2SeMgr::processSeFramework() {
 }
 
 
-/* 802AE524-802AE5B0 2A8E64 008C+00 1/1 0/0 0/0 .text            isLevelSe__7Z2SeMgrF10JAISoundID */
 bool Z2SeMgr::isLevelSe(JAISoundID soundID) {
     switch (soundID) {
     case JA_SE_LK_MOVE_ROCK:
@@ -1036,7 +1016,6 @@ bool Z2SeMgr::isLevelSe(JAISoundID soundID) {
     }
 }
 
-/* 802AE5B0-802AEB04 2A8EF0 0554+00 2/2 3/3 0/0 .text isSoundCulling__7Z2SeMgrF10JAISoundID */
 bool Z2SeMgr::isSoundCulling(JAISoundID soundID) {
     if (Z2GetSeqMgr()->isItemGetDemo()) {
         switch (soundID) {
@@ -1192,7 +1171,6 @@ Z2MultiSeMgr::Z2MultiSeMgr() {
 
 Z2MultiSeMgr::~Z2MultiSeMgr() {}
 
-/* 802AEB70-802AECBC 2A94B0 014C+00 2/2 6/6 0/0 .text registMultiSePos__12Z2MultiSeMgrFP3Vec */
 s8 Z2MultiSeMgr::registMultiSePos(Vec* posPtr) {
     if (posPtr == NULL) {
         return 0;
@@ -1246,7 +1224,6 @@ void Z2MultiSeMgr::resetMultiSePos() {
     maxVolume_ = 0.0f;
 }
 
-/* 802AECE0-802AEDC0 2A9620 00E0+00 1/1 8/8 0/0 .text            getPanPower__12Z2MultiSeMgrFv */
 f32 Z2MultiSeMgr::getPanPower() {
     f32 pow_r = getMaxPowR();
     f32 pow_l = getMaxPowL();
@@ -1259,7 +1236,6 @@ f32 Z2MultiSeMgr::getPanPower() {
     }
 }
 
-/* 802AEDC0-802AEEA0 2A9700 00E0+00 1/1 8/8 0/0 .text            getDolbyPower__12Z2MultiSeMgrFv */
 f32 Z2MultiSeMgr::getDolbyPower() {
     f32 pow_b = getMaxPowB();
     f32 pow_f = getMaxPowF();
diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/src/Z2AudioLib/Z2SeqMgr.cpp
index da9f8b1ced..66848bcefd 100644
--- a/src/Z2AudioLib/Z2SeqMgr.cpp
+++ b/src/Z2AudioLib/Z2SeqMgr.cpp
@@ -93,7 +93,6 @@ static const char* sSpotName[] = {
     "D_SB10",
 };
 
-/* 802AEEA0-802AF010 2A97E0 0170+00 0/0 1/1 0/0 .text            __ct__8Z2SeqMgrFv */
 Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
     mMainBgmMaster.forceIn();
     mSubBgmMaster.forceIn();
@@ -130,7 +129,6 @@ Z2SeqMgr::Z2SeqMgr() : JASGlobalInstance<Z2SeqMgr>(true) {
     mFlags.mTimeProcVolMod = false;
 }
 
-/* 802AF010-802AF408 2A9950 03F8+00 3/3 5/5 38/38 .text            bgmStart__8Z2SeqMgrFUlUll */
 void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) {
     switch (bgmID) {
     case -1:
@@ -229,7 +227,6 @@ void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) {
     #endif
 }
 
-/* 802AF408-802AF49C 2A9D48 0094+00 3/3 5/5 30/30 .text            bgmStop__8Z2SeqMgrFUll */
 void Z2SeqMgr::bgmStop(u32 fadeTime, s32 param_1) {
     if (mMainBgmHandle) {
         mMainBgmHandle->stop(fadeTime);
@@ -247,7 +244,6 @@ void Z2SeqMgr::bgmStop(u32 fadeTime, s32 param_1) {
     }
 }
 
-/* 802AF49C-802AF884 2A9DDC 03E8+00 3/2 6/6 65/65 .text            subBgmStart__8Z2SeqMgrFUl */
 void Z2SeqMgr::subBgmStart(u32 bgmID) {
     #if DEBUG
     const char** spotName = sSpotName;
@@ -453,7 +449,6 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) {
     #endif
 }
 
-/* 802AF884-802AF9D0 2AA1C4 014C+00 4/3 4/4 42/42 .text            subBgmStop__8Z2SeqMgrFv */
 void Z2SeqMgr::subBgmStop() {
     switch (getSubBgmID()) {
     case Z2BGM_ITEM_GET:
@@ -548,7 +543,6 @@ void Z2SeqMgr::subBgmStop() {
     #endif
 }
 
-/* 802AF9D0-802AFB94 2AA310 01C4+00 2/2 0/0 0/0 .text            subBgmStopInner__8Z2SeqMgrFv */
 void Z2SeqMgr::subBgmStopInner() {
     if (field_0xb8 == -1) {
         return;
@@ -589,7 +583,6 @@ void Z2SeqMgr::subBgmStopInner() {
     field_0xb8 = -1;
 }
 
-/* 802AFB94-802AFDEC 2AA4D4 0258+00 1/1 3/3 46/46 .text            bgmStreamPrepare__8Z2SeqMgrFUl */
 void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) {
     if (mStreamBgmHandle) {
         bgmStreamStop(0);
@@ -635,7 +628,6 @@ void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) {
 }
 
 
-/* 802AFDEC-802AFE18 2AA72C 002C+00 0/0 1/1 0/0 .text            bgmStreamCheckReady__8Z2SeqMgrFv */
 bool Z2SeqMgr::bgmStreamCheckReady() {
     if (mStreamBgmHandle) {
         return mStreamBgmHandle->isPrepared();
@@ -644,7 +636,6 @@ bool Z2SeqMgr::bgmStreamCheckReady() {
     }
 }
 
-/* 802AFE18-802AFEDC 2AA758 00C4+00 1/1 4/4 46/46 .text            bgmStreamPlay__8Z2SeqMgrFv */
 void Z2SeqMgr::bgmStreamPlay() {
     if (mStreamBgmHandle) {
         mStreamBgmHandle->unlockIfLocked();
@@ -666,7 +657,6 @@ void Z2SeqMgr::bgmStreamPlay() {
     #endif
 }
 
-/* 802AFEDC-802AFF8C 2AA81C 00B0+00 2/2 1/1 27/27 .text            bgmStreamStop__8Z2SeqMgrFUl */
 void Z2SeqMgr::bgmStreamStop(u32 fadeTime) {
     if (getStreamBgmID() == 0x200003f || getStreamBgmID() == 0x200005c) {
         Z2GetStatusMgr()->setDemoName("force_end");
@@ -679,7 +669,6 @@ void Z2SeqMgr::bgmStreamStop(u32 fadeTime) {
     mStreamBgmHandle.releaseSound();
 }
 
-/* 802AFF8C-802B1DF4 2AA8CC 1E68+00 5/4 8/7 26/26 .text            changeBgmStatus__8Z2SeqMgrFl */
 void Z2SeqMgr::changeBgmStatus(s32 status) {
     if (!mMainBgmHandle) {
         return;
@@ -1130,8 +1119,6 @@ void Z2SeqMgr::changeBgmStatus(s32 status) {
     mBgmStatus = status & 0xff;
 }
 
-/* 802B1DF4-802B299C 2AC734 0BA8+00 2/2 3/3 31/31 .text            changeSubBgmStatus__8Z2SeqMgrFl
- */
 void Z2SeqMgr::changeSubBgmStatus(s32 status) {
     if (!mSubBgmHandle) {
         return;
@@ -1309,7 +1296,6 @@ void Z2SeqMgr::changeSubBgmStatus(s32 status) {
     mSubBgmStatus = status & 0xff;
 }
 
-/* 802B299C-802B2A88 2AD2DC 00EC+00 0/0 1/1 0/0 .text            onVariantBgmJumpEnd__8Z2SeqMgrFb */
 void Z2SeqMgr::onVariantBgmJumpEnd(bool param_0) {
     if (param_0) {
         u32 moveTime = 0;
@@ -1328,7 +1314,6 @@ void Z2SeqMgr::onVariantBgmJumpEnd(bool param_0) {
     Z2GetSoundMgr()->getSeqMgr()->mixOut();
 }
 
-/* 802B2A88-802B2CA4 2AD3C8 021C+00 1/1 0/0 9/9 .text            changeFishingBgm__8Z2SeqMgrFl */
 void Z2SeqMgr::changeFishingBgm(s32 param_0) {
     switch (param_0) {
     case 0:
@@ -1356,7 +1341,6 @@ void Z2SeqMgr::changeFishingBgm(s32 param_0) {
     }
 }
 
-/* 802B2CA4-802B2D64 2AD5E4 00C0+00 0/0 1/1 0/0 .text            talkInBgm__8Z2SeqMgrFv */
 void Z2SeqMgr::talkInBgm() {
     if (getStreamBgmID() == 0x2000038 || getStreamBgmID() == 0x200007c || getMainBgmID() == Z2BGM_WCS_D01) {
         return;
@@ -1365,22 +1349,18 @@ void Z2SeqMgr::talkInBgm() {
     mBgmPause.move(Z2Param::VOL_BGM_TALKING, 2);
 }
 
-/* 802B2D64-802B2DAC 2AD6A4 0048+00 0/0 1/1 0/0 .text            talkOutBgm__8Z2SeqMgrFv */
 void Z2SeqMgr::talkOutBgm() {
     mBgmPause.move(Z2Param::VOL_BGM_DEFAULT, 2);
 }
 
-/* 802B2DAC-802B2DF4 2AD6EC 0048+00 0/0 1/1 0/0 .text            menuInBgm__8Z2SeqMgrFv */
 void Z2SeqMgr::menuInBgm() {
     mBgmPause.move(Z2Param::VOL_BGM_PAUSING, 2);
 }
 
-/* 802B2DF4-802B2E3C 2AD734 0048+00 0/0 1/1 0/0 .text            menuOutBgm__8Z2SeqMgrFv */
 void Z2SeqMgr::menuOutBgm() {
     mBgmPause.move(Z2Param::VOL_BGM_DEFAULT, 2);
 }
 
-/* 802B2E3C-802B327C 2AD77C 0440+00 1/1 0/0 0/0 .text            fanfareFramework__8Z2SeqMgrFv */
 void Z2SeqMgr::fanfareFramework() {
     switch (mFanfareID) {
     case Z2BGM_OPEN_BOX:
@@ -1454,7 +1434,6 @@ void Z2SeqMgr::fanfareFramework() {
     }
 }
 
-/* 802B327C-802B3318 2ADBBC 009C+00 2/0 1/1 0/0 .text            stopWolfHowlSong__8Z2SeqMgrFv */
 void Z2SeqMgr::stopWolfHowlSong() {
     switch (mFanfareID) {
     case Z2BGM_HOWL_TOBIKUSA:
@@ -1499,7 +1478,6 @@ void Z2SeqMgr::stopWolfHowlSong() {
     }
 }
 
-/* 802B3318-802B3398 2ADC58 0080+00 0/0 1/1 0/0 .text            setHeightVolMod__8Z2SeqMgrFbUl */
 void Z2SeqMgr::setHeightVolMod(bool isVolMod, u32 fadeTime) {
     mFlags.mHeightVolMod = isVolMod;
     if (!isVolMod) {
@@ -1507,21 +1485,16 @@ void Z2SeqMgr::setHeightVolMod(bool isVolMod, u32 fadeTime) {
     }
 }
 
-/* 802B3398-802B33A8 2ADCD8 0010+00 0/0 1/1 0/0 .text            setTimeProcVolMod__8Z2SeqMgrFbUl */
 void Z2SeqMgr::setTimeProcVolMod(bool isVolMod, u32 fadeTime) {
     mFlags.mTimeProcVolMod = isVolMod;
 }
 
-/* 80450870-80450874 0002F0 0004+00 1/1 0/0 0/0 .sdata           sDeathMtBottom */
 static f32 sDeathMtBottom = -1000.0f;
 
-/* 80450874-80450878 0002F4 0004+00 1/1 0/0 0/0 .sdata           sDeathMtTop */
 static f32 sDeathMtTop = 3650.0f;
 
-/* 80450878-80450880 0002F8 0004+04 1/1 0/0 0/0 .sdata           sUnderWaterDepthMax */
 static f32 sUnderWaterDepthMax = 3500.0f;
 
-/* 802B33A8-802B3EAC 2ADCE8 0B04+00 0/0 1/1 0/0 .text            processBgmFramework__8Z2SeqMgrFv */
 void Z2SeqMgr::processBgmFramework() {
     fanfareFramework();
     battleBgmFramework();
@@ -1673,7 +1646,6 @@ void Z2SeqMgr::processBgmFramework() {
     setWindStoneVol(1.0f, 30);
 }
 
-/* 802B3EAC-802B3F40 2AE7EC 0094+00 0/0 2/2 0/0 .text            checkBgmIDPlaying__8Z2SeqMgrFUl */
 bool Z2SeqMgr::checkBgmIDPlaying(u32 bgmID) {
     if (getMainBgmID() == bgmID) {
         return true;
@@ -1690,8 +1662,6 @@ bool Z2SeqMgr::checkBgmIDPlaying(u32 bgmID) {
     return false;
 }
 
-/* 802B3F40-802B3FEC 2AE880 00AC+00 1/1 0/0 0/0 .text
- * getChildTrackVolume__8Z2SeqMgrFP14JAISoundHandlei            */
 f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) {
     f32 volume = 0.0f;
     if (*handle) {
@@ -1707,8 +1677,6 @@ f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) {
     return volume;
 }
 
-/* 802B3FEC-802B4128 2AE92C 013C+00 9/9 2/2 0/0 .text
- * setChildTrackVolume__8Z2SeqMgrFP14JAISoundHandleifUlff       */
 void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volume,
                                    u32 moveTime, f32 pan, f32 dolby) {
     if (!*handle) {
@@ -1745,15 +1713,12 @@ void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volu
     }
 }
 
-/* 802B4128-802B4164 2AEA68 003C+00 1/1 1/1 0/0 .text            resetBattleBgmParams__8Z2SeqMgrFv
- */
 void Z2SeqMgr::resetBattleBgmParams() {
     if (Z2GetSoundObjMgr() != NULL) {
         Z2GetSoundObjMgr()->setForceBattleArea(false, 700, 1100, 1500);
     }
 }
 
-/* 802B4164-802B421C 2AEAA4 00B8+00 4/4 3/3 10/10 .text            setBattleBgmOff__8Z2SeqMgrFb */
 void Z2SeqMgr::setBattleBgmOff(bool isBgmOff) {
     if (mFlags.mBattleBgmOff != isBgmOff && isBgmOff &&
         (getSubBgmID() == Z2BGM_BATTLE_NORMAL || getSubBgmID() == Z2BGM_BATTLE_TWILIGHT))
@@ -1764,7 +1729,6 @@ void Z2SeqMgr::setBattleBgmOff(bool isBgmOff) {
     mFlags.mBattleBgmOff = isBgmOff;
 }
 
-/* 802B421C-802B43D0 2AEB5C 01B4+00 0/0 1/1 0/0 .text            setBattleSearched__8Z2SeqMgrFb */
 void Z2SeqMgr::setBattleSearched(bool isBattleSearched) {
     if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()
         && mFlags.mBattleSearched != isBattleSearched && mBattleSeqState != 3)
@@ -1786,12 +1750,10 @@ void Z2SeqMgr::setBattleSearched(bool isBattleSearched) {
     }
 }
 
-/* 802B43D0-802B43E0 2AED10 0010+00 3/3 0/0 0/0 .text            setBattleDistIgnore__8Z2SeqMgrFb */
 void Z2SeqMgr::setBattleDistIgnore(bool isBattleDistIgnore) {
     mFlags.mBattleDistIgnore = isBattleDistIgnore;
 }
 
-/* 802B43E0-802B4498 2AED20 00B8+00 0/0 2/2 0/0 .text            setBattleGhostMute__8Z2SeqMgrFb */
 void Z2SeqMgr::setBattleGhostMute(bool isBattleGhostMute) {
     if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) {
         if (isBattleGhostMute) {
@@ -1802,7 +1764,6 @@ void Z2SeqMgr::setBattleGhostMute(bool isBattleGhostMute) {
     }
 }
 
-/* 802B4498-802B4844 2AEDD8 03AC+00 0/0 1/1 0/0 .text            setBattleDistState__8Z2SeqMgrFUc */
 void Z2SeqMgr::setBattleDistState(u8 state) {
     if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()) {
         if (!mFlags.mBattleDistIgnore) {
@@ -1873,7 +1834,6 @@ void Z2SeqMgr::setBattleDistState(u8 state) {
     }
 }
 
-/* 802B4844-802B4AFC 2AF184 02B8+00 1/1 3/3 1/1 .text            setBattleSeqState__8Z2SeqMgrFUc */
 void Z2SeqMgr::setBattleSeqState(u8 state) {
     if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist() && mBattleSeqState != state) {
         if (state == 0) {
@@ -1913,7 +1873,6 @@ void Z2SeqMgr::setBattleSeqState(u8 state) {
     }
 }
 
-/* 802B4AFC-802B4BD0 2AF43C 00D4+00 0/0 4/4 0/0 .text            setBattleLastHit__8Z2SeqMgrFUc */
 void Z2SeqMgr::setBattleLastHit(u8 lastHit) {
     if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) {
         setBattleDistIgnore(true);
@@ -1923,7 +1882,6 @@ void Z2SeqMgr::setBattleLastHit(u8 lastHit) {
     }
 }
 
-/* 802B4BD0-802B4EB0 2AF510 02E0+00 1/1 0/0 0/0 .text            battleBgmFramework__8Z2SeqMgrFv */
 void Z2SeqMgr::battleBgmFramework() {
     if (getSubBgmID() == Z2BGM_BATTLE_NORMAL || getSubBgmID() == Z2BGM_BATTLE_TWILIGHT) {
         if (mBattleSeqCount != 0) {
@@ -1971,7 +1929,6 @@ void Z2SeqMgr::battleBgmFramework() {
     }
 }
 
-/* 802B4EB0-802B5204 2AF7F0 0354+00 1/1 0/0 0/0 .text            startBattleBgm__8Z2SeqMgrFb */
 void Z2SeqMgr::startBattleBgm(bool isFadeIn) {
     if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist()
         && mBattleSeqState == 0 && (mFlags.mBattleDistIgnore || mBattleDistState <= 1))
@@ -2031,7 +1988,6 @@ void Z2SeqMgr::startBattleBgm(bool isFadeIn) {
     }
 }
 
-/* 802B5204-802B545C 2AFB44 0258+00 3/3 1/1 0/0 .text            stopBattleBgm__8Z2SeqMgrFUcUc */
 void Z2SeqMgr::stopBattleBgm(u8 subFadeoutTime, u8 mainFadeinTime) {
     if (mBattleSeqCount == 0) {
         s16 ivar6 = 0;
@@ -2072,7 +2028,6 @@ void Z2SeqMgr::stopBattleBgm(u8 subFadeoutTime, u8 mainFadeinTime) {
     }
 }
 
-/* 802B545C-802B556C 2AFD9C 0110+00 1/1 0/0 0/0 .text            fieldBgmStart__8Z2SeqMgrFv */
 void Z2SeqMgr::fieldBgmStart() {
     if (Z2GetSceneMgr()->isSceneExist() && mFlags.mFieldBgmPlay) {
         if (Z2GetStatusMgr()->checkDayTime()) {
@@ -2096,7 +2051,6 @@ void Z2SeqMgr::fieldBgmStart() {
     }
 }
 
-/* 802B556C-802B5750 2AFEAC 01E4+00 3/3 0/0 0/0 .text            fieldRidingMute__8Z2SeqMgrFv */
 void Z2SeqMgr::fieldRidingMute() {
     if (Z2GetSceneMgr()->isSceneExist() && mMainBgmHandle) {
         f32 volume1, volume2;
@@ -2122,13 +2076,11 @@ void Z2SeqMgr::fieldRidingMute() {
     }
 }
 
-/* 802B5750-802B579C 2B0090 004C+00 0/0 1/1 0/0 .text            onFieldBgmJumpStart__8Z2SeqMgrFv */
 void Z2SeqMgr::onFieldBgmJumpStart() {
     field_0xc8 = getChildTrackVolume(&mMainBgmHandle, 5);
     field_0xcc = getChildTrackVolume(&mMainBgmHandle, 12);
 }
 
-/* 802B579C-802B594C 2B00DC 01B0+00 0/0 1/1 0/0 .text            onFieldBgmJumpEnd__8Z2SeqMgrFv */
 void Z2SeqMgr::onFieldBgmJumpEnd() {
     setChildTrackVolume(&mMainBgmHandle, 5, field_0xc8, 0, -1.0f, -1.0f);
     setChildTrackVolume(&mMainBgmHandle, 6, field_0xc8, 0, -1.0f, -1.0f);
@@ -2150,7 +2102,6 @@ void Z2SeqMgr::onFieldBgmJumpEnd() {
     }
 }
 
-/* 802B594C-802B5E80 2B028C 0534+00 2/1 0/0 0/0 .text            fieldBgmFramework__8Z2SeqMgrFv */
 void Z2SeqMgr::fieldBgmFramework() {
     if (Z2GetSceneMgr()->isSceneExist() && !Z2GetSceneMgr()->isInDarkness()
         && (Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_HYRULE_FIELD || Z2GetSceneMgr()->getCurrentSceneNum() == Z2SCENE_CASTLE_TOWN_GATES)
@@ -2319,21 +2270,16 @@ void Z2SeqMgr::fieldBgmFramework() {
     }
 }
 
-/* 802B5E80-802B5E84 2B07C0 0004+00 1/1 0/0 0/0 .text            mbossBgmMuteProcess__8Z2SeqMgrFv */
 void Z2SeqMgr::mbossBgmMuteProcess() {}
 
-/* 802B5E84-802B5E88 2B07C4 0004+00 0/0 2/2 0/0 .text            bgmSetSwordUsing__8Z2SeqMgrFl */
 void Z2SeqMgr::bgmSetSwordUsing(s32 param_0) {}
 
-/* 802B5E88-802B5E8C 2B07C8 0004+00 0/0 1/1 0/0 .text            bgmNowBattle__8Z2SeqMgrFf */
 void Z2SeqMgr::bgmNowBattle(f32 param_0) {}
 
-/* 802B5E8C-802B5ED4 2B07CC 0048+00 0/0 1/1 0/0 .text            taktModeMute__8Z2SeqMgrFv */
 void Z2SeqMgr::taktModeMute() {
     mBgmPause.move(0.3f, 10);
 }
 
-/* 802B5ED4-802B5F1C 2B0814 0048+00 0/0 1/1 0/0 .text            taktModeMuteOff__8Z2SeqMgrFv */
 void Z2SeqMgr::taktModeMuteOff() {
     mBgmPause.fadeIn(10);
 }
diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/src/Z2AudioLib/Z2SoundHandles.cpp
index d59433bb01..bbd1dba50f 100644
--- a/src/Z2AudioLib/Z2SoundHandles.cpp
+++ b/src/Z2AudioLib/Z2SoundHandles.cpp
@@ -13,7 +13,6 @@ void Z2SoundHandles::initHandlesPool(u8 handleNum) {
     handleNum_ = handleNum;
 }
 
-/* 802AB120-802AB200 2A5A60 00E0+00 1/1 1/1 0/0 .text deleteHandlesPool__14Z2SoundHandlesFv */
 void Z2SoundHandles::deleteHandlesPool() {
     JSULink<Z2SoundHandlePool>* i;
     while (i = getFirst(), i != NULL) {
@@ -55,8 +54,6 @@ Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 userData) {
     return NULL;
 }
 
-/* 802AB2D8-802AB3D0 2A5C18 00F8+00 0/0 3/3 0/0 .text            getFreeHandle__14Z2SoundHandlesFv
- */
 Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
     JSULink<Z2SoundHandlePool>* i;
     for (i = getFirst(); i != NULL; i = i->getNext()) {
@@ -80,8 +77,6 @@ Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() {
     return NULL;
 }
 
-/* 802AB3D0-802AB4A0 2A5D10 00D0+00 0/0 2/2 0/0 .text
- * getLowPrioSound__14Z2SoundHandlesF10JAISoundID               */
 Z2SoundHandlePool* Z2SoundHandles::getLowPrioSound(JAISoundID soundID) {
     JAISoundInfo* soundInfo = JASGlobalInstance<JAISoundInfo>::getInstance();
     u32 low_prio = 0xFFFF;
@@ -135,8 +130,6 @@ bool Z2SoundHandles::isActive() const {
     return false;
 }
 
-/* 802AB538-802AB64C 2A5E78 0114+00 0/0 1/1 0/0 .text
- * setPos__14Z2SoundHandlesFRCQ29JGeometry8TVec3<f>             */
 void Z2SoundHandles::setPos(const JGeometry::TVec3<f32>& pos) {
     JSULink<Z2SoundHandlePool>* i;
     for (i = getFirst(); i != NULL; i = i->getNext()) {
diff --git a/src/Z2AudioLib/Z2SoundInfo.cpp b/src/Z2AudioLib/Z2SoundInfo.cpp
index eba28a7d08..a298213dca 100644
--- a/src/Z2AudioLib/Z2SoundInfo.cpp
+++ b/src/Z2AudioLib/Z2SoundInfo.cpp
@@ -16,8 +16,6 @@ struct JAUStdSoundTableType {
     };
 };
 
-/* 802BB00C-802BB090 2B594C 0084+00 2/1 0/0 0/0 .text
- * getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID             */
 u16 Z2SoundInfo::getBgmSeqResourceID(JAISoundID soundID) const {
     JUT_ASSERT(20, isValid());
     JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -33,7 +31,6 @@ u16 Z2SoundInfo::getBgmSeqResourceID(JAISoundID soundID) const {
     return 0xffff;
 }
 
-/* 802BB090-802BB0D8 2B59D0 0048+00 1/0 0/0 0/0 .text getSoundType__11Z2SoundInfoCF10JAISoundID */
 int Z2SoundInfo::getSoundType(JAISoundID soundID) const {
     switch (soundID.id_.info.type.parts.sectionID) {
     case 0:
@@ -47,12 +44,10 @@ int Z2SoundInfo::getSoundType(JAISoundID soundID) const {
     return -1;
 }
 
-/* 802BB0D8-802BB0E0 2B5A18 0008+00 1/0 0/0 0/0 .text getCategory__11Z2SoundInfoCF10JAISoundID */
 int Z2SoundInfo::getCategory(JAISoundID soundID) const {
     return soundID.id_.info.type.parts.groupID;
 }
 
-/* 802BB0E0-802BB158 2B5A20 0078+00 1/0 0/0 0/0 .text getPriority__11Z2SoundInfoCF10JAISoundID */
 u32 Z2SoundInfo::getPriority(JAISoundID soundID) const {
     JUT_ASSERT(63, isValid());
     JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -65,8 +60,6 @@ u32 Z2SoundInfo::getPriority(JAISoundID soundID) const {
     return 0;
 }
 
-/* 802BB158-802BB448 2B5A98 02F0+00 0/0 1/1 0/0 .text getAudibleSwFull__11Z2SoundInfoF10JAISoundID
- */
 JAUAudibleParam Z2SoundInfo::getAudibleSwFull(JAISoundID soundID) {
     JAUAudibleParam audibleParam;
     JUT_ASSERT(82, isValid());
@@ -139,7 +132,6 @@ JAUAudibleParam Z2SoundInfo::getAudibleSwFull(JAISoundID soundID) {
     return audibleParam;
 }
 
-/* 802BB448-802BB6DC 2B5D88 0294+00 2/1 0/0 0/0 .text getAudibleSw__11Z2SoundInfoCF10JAISoundID */
 u16 Z2SoundInfo::getAudibleSw(JAISoundID soundID) const {
     JAUAudibleParam audibleParam;
     JUT_ASSERT(184, isValid());
@@ -205,8 +197,6 @@ u16 Z2SoundInfo::getAudibleSw(JAISoundID soundID) const {
     return audibleParam.field_0x0.half.f0;
 }
 
-/* 802BB6DC-802BB8B4 2B601C 01D8+00 1/0 0/0 0/0 .text
- * getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe                */
 void Z2SoundInfo::getSeInfo(JAISoundID soundID, JAISe* sePtr) const {
     getSoundInfo_(soundID, sePtr);
     JUT_ASSERT(292, isValid());
@@ -236,17 +226,12 @@ void Z2SoundInfo::getSeInfo(JAISoundID soundID, JAISe* sePtr) const {
     }
 }
 
-/* 802BB8B4-802BB8E0 2B61F4 002C+00 1/0 0/0 0/0 .text
- * getSeqInfo__11Z2SoundInfoCF10JAISoundIDP6JAISeq              */
 void Z2SoundInfo::getSeqInfo(JAISoundID soundID, JAISeq* seqPtr) const {
     getSoundInfo_(soundID, seqPtr);
 }
 
-/* 80455A90-80455A94 004090 0004+00 1/1 0/0 0/0 .sdata2 STRM_CH_SHIFT__20JAUStdSoundTableType */
 const u32 JAUStdSoundTableType::STRM_CH_SHIFT = 2;
 
-/* 802BB8E0-802BBA10 2B6220 0130+00 1/0 0/0 0/0 .text
- * getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream        */
 void Z2SoundInfo::getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const {
     int numChild;
     JAUSoundTableItem* data;
@@ -286,8 +271,6 @@ void Z2SoundInfo::getStreamInfo(JAISoundID soundID, JAIStream* streamPtr) const
     }
 }
 
-/* 802BBA10-802BBA88 2B6350 0078+00 1/1 0/0 0/0 .text
- * getStreamFilePath__11Z2SoundInfoF10JAISoundID                */
 const char* Z2SoundInfo::getStreamFilePath(JAISoundID soundID) {
     JUT_ASSERT(387, isValid());
     JAUSoundTableItem* data;
@@ -305,14 +288,11 @@ const char* Z2SoundInfo::getStreamFilePath(JAISoundID soundID) {
     }
 }
 
-/* 802BBA88-802BBAC8 2B63C8 0040+00 2/1 0/0 0/0 .text
- * getStreamFileEntry__11Z2SoundInfoF10JAISoundID               */
 s32 Z2SoundInfo::getStreamFileEntry(JAISoundID soundID) {
     const char* path = getStreamFilePath(soundID);
     return !path ? -1 : DVDConvertPathToEntrynum(path);
 }
 
-/* 802BBAC8-802BBB48 2B6408 0080+00 3/3 4/4 0/0 .text getSwBit__11Z2SoundInfoCF10JAISoundID */
 int Z2SoundInfo::getSwBit(JAISoundID soundID) const {
     JUT_ASSERT(418, isValid());
     JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
@@ -328,8 +308,6 @@ int Z2SoundInfo::getSwBit(JAISoundID soundID) const {
     return 0xFFFFFFFF;
 }
 
-/* 802BBB48-802BBBE0 2B6488 0098+00 3/3 0/0 0/0 .text
- * getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound         */
 void Z2SoundInfo::getSoundInfo_(JAISoundID soundID, JAISound* soundPtr) const {
     JUT_ASSERT(440, isValid());
     JAUSoundTableItem* data = JASGlobalInstance<JAUSoundTable>::getInstance()->getData(soundID);
diff --git a/src/Z2AudioLib/Z2SoundMgr.cpp b/src/Z2AudioLib/Z2SoundMgr.cpp
index 9833ed9985..ef0f515829 100644
--- a/src/Z2AudioLib/Z2SoundMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundMgr.cpp
@@ -11,7 +11,6 @@
 #include "JSystem/JAudio2/JAUSectionHeap.h"
 #include "d/d_com_inf_game.h"
 
-/* 802A9BC8-802A9E80 2A4508 02B8+00 1/0 1/1 0/0 .text            seqCallback__FP8JASTrackUs */
 u16 seqCallback(JASTrack* track, u16 command) {
     switch (command) {
     case 0x1000:
@@ -101,7 +100,6 @@ u16 seqCallback(JASTrack* track, u16 command) {
     return 0;
 }
 
-/* 802A9E80-802A9EE8 2A47C0 0068+00 0/0 1/1 0/0 .text            __ct__10Z2SoundMgrFv */
 Z2SoundMgr::Z2SoundMgr() :
     JASGlobalInstance<Z2SoundMgr>(true),
     seMgr_(true),
@@ -111,8 +109,6 @@ Z2SoundMgr::Z2SoundMgr() :
     soundID_.setAnonymous();
 }
 
-/* 802A9EE8-802AA1B0 2A4828 02C8+00 1/0 0/0 0/0 .text
- * startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JGeometry::TVec3<f32>* posPtr) {
     int soundType = Z2GetSoundInfo()->getSoundType(soundID);
     switch (soundType) {
@@ -185,7 +181,6 @@ bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JG
     return false;
 }
 
-/* 802AA1B0-802AA270 2A4AF0 00C0+00 2/2 0/0 0/0 .text            calc__10Z2SoundMgrFv */
 void Z2SoundMgr::calc() {
     seMgr_.calc();
     if (!soundID_.isAnonymous() && !isPlayingSoundID(soundID_)) {
@@ -198,8 +193,6 @@ void Z2SoundMgr::calc() {
     streamMgr_.calc();
 }
 
-/* 802AA270-802AA33C 2A4BB0 00CC+00 1/1 2/2 0/0 .text            setIIR__10Z2SoundMgrFP8JAISoundPCs
- */
 void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
     if (sound != NULL) {
         JASTrack* track = sound->getTrack();
@@ -219,12 +212,10 @@ void Z2SoundMgr::setIIR(JAISound* sound, const s16* iir) {
     }
 }
 
-/* 8039B9C0-8039B9D0 028020 0010+00 1/1 0/0 0/0 .rodata          cResetFilterTable */
 static s16 const cResetFilterTable[8] = {
     0x7FFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-/* 802AA33C-802AA430 2A4C7C 00F4+00 1/1 0/0 0/0 .text setFilterOff__10Z2SoundMgrFP8JAISound */
 void Z2SoundMgr::setFilterOff(JAISound* sound) {
     if (sound != NULL) {
         JASTrack* track = sound->getTrack();
@@ -246,7 +237,6 @@ void Z2SoundMgr::setFilterOff(JAISound* sound) {
     }
 }
 
-/* 802AA430-802AA528 2A4D70 00F8+00 0/0 1/1 0/0 .text            resetFilterAll__10Z2SoundMgrFv */
 void Z2SoundMgr::resetFilterAll() {
     int i = 1;
     if (Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING) {
@@ -274,7 +264,6 @@ void Z2SoundMgr::resetFilterAll() {
     }
 }
 
-/* 802AA528-802AA67C 2A4E68 0154+00 2/2 0/0 0/0 .text            mixOut__10Z2SoundMgrFv */
 void Z2SoundMgr::mixOut() {
     if (Z2Param::DARK_SE_FILTER_ON && Z2GetSceneMgr()->isInDarkness()) {
         int i = 1;
@@ -308,14 +297,11 @@ void Z2SoundMgr::mixOut() {
     streamMgr_.mixOut();
 }
 
-/* 802AA67C-802AA6B0 2A4FBC 0034+00 0/0 1/1 0/0 .text            framework__10Z2SoundMgrFv */
 void Z2SoundMgr::framework() {
     calc();
     mixOut();
 }
 
-/* 802AA6B0-802AA7DC 2A4FF0 012C+00 0/0 1/1 0/0 .text            pauseAllGameSound__10Z2SoundMgrFb
- */
 void Z2SoundMgr::pauseAllGameSound(bool paused) {
     seMgr_.getCategory(0)->pause(paused);
     seMgr_.getCategory(1)->pause(paused);
@@ -341,14 +327,12 @@ void Z2SoundMgr::pauseAllGameSound(bool paused) {
     }
 }
 
-/* 802AA7DC-802AA84C 2A511C 0070+00 0/0 1/1 0/0 .text stopSoundID__10Z2SoundMgrF10JAISoundID */
 void Z2SoundMgr::stopSoundID(JAISoundID soundID) {
     seMgr_.stopSoundID(soundID);
     seqMgr_.stopSoundID(soundID);
     streamMgr_.stopSoundID(soundID);
 }
 
-/* 802AA84C-802AA8C8 2A518C 007C+00 0/0 1/1 0/0 .text            stopSync__10Z2SoundMgrFv */
 void Z2SoundMgr::stopSync() {
     stop();
     while (seMgr_.getNumActiveSe() > 0 || seqMgr_.getNumActiveSeqs() > 0) {
@@ -361,14 +345,12 @@ void Z2SoundMgr::stopSync() {
     }
 }
 
-/* 802AA8C8-802AA908 2A5208 0040+00 1/1 0/0 0/0 .text            stop__10Z2SoundMgrFv */
 void Z2SoundMgr::stop() {
     seMgr_.stop();
     seqMgr_.stop();
     streamMgr_.stop();
 }
 
-/* 802AA908-802AA9E8 2A5248 00E0+00 0/0 1/1 0/0 .text            initParams__10Z2SoundMgrFv */
 void Z2SoundMgr::initParams() {
     JUT_ASSERT(613, ! seMgr_.isActive());
     JUT_ASSERT(614, ! seqMgr_.isActive());
@@ -378,8 +360,6 @@ void Z2SoundMgr::initParams() {
     streamMgr_.getParams()->init();
 }
 
-/* 802AA9E8-802AAAC4 2A5328 00DC+00 0/0 1/1 0/0 .text
- * multiVolumeSoundID__10Z2SoundMgrF10JAISoundIDf               */
 void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
     if (!soundID.isAnonymous() && Z2GetSoundInfo()->getSoundType(soundID) == 0) {
         int category = Z2GetSoundInfo()->getCategory(soundID);
@@ -391,8 +371,6 @@ void Z2SoundMgr::multiVolumeSoundID(JAISoundID soundID, f32 volume) {
     }
 }
 
-/* 802AAAC4-802AAB94 2A5404 00D0+00 1/1 0/0 0/0 .text isPlayingSoundID__10Z2SoundMgrF10JAISoundID
- */
 bool Z2SoundMgr::isPlayingSoundID(JAISoundID soundID) {
     if (soundID.isAnonymous()) {
         return false;
diff --git a/src/Z2AudioLib/Z2SoundObjMgr.cpp b/src/Z2AudioLib/Z2SoundObjMgr.cpp
index 6b3d29964b..c945865dd5 100644
--- a/src/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/src/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -5,7 +5,6 @@
 #include "Z2AudioLib/Z2SceneMgr.h"
 #include "Z2AudioLib/Z2LinkMgr.h"
 
-/* 802BF920-802BF980 2BA260 0060+00 0/0 1/1 0/0 .text            __ct__13Z2SoundObjMgrFv */
 Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) {
     ghostEnemyState_ = 0;
     twilightBattle_ = 0;
@@ -13,8 +12,6 @@ Z2SoundObjMgr::Z2SoundObjMgr() : JASGlobalInstance<Z2SoundObjMgr>(true) {
     setForceBattleArea(false, 700, 1100, 1500);
 }
 
-/* 802BF980-802BF994 2BA2C0 0014+00 1/1 3/3 3/3 .text setForceBattleArea__13Z2SoundObjMgrFbUsUsUs
- */
 void Z2SoundObjMgr::setForceBattleArea(bool forceBattle, u16 param_1, u16 param_2, u16 param_3) {
     forceBattle_ = forceBattle;
     enemyArea_.field_0x2 = param_1;
@@ -22,22 +19,16 @@ void Z2SoundObjMgr::setForceBattleArea(bool forceBattle, u16 param_1, u16 param_
     enemyArea_.field_0x6 = param_3;
 }
 
-/* 80455B80-80455B84 004180 0004+00 1/1 0/0 0/0 .sdata2          sAreaDefault */
 static Z2EnemyArea const sAreaDefault = {true, 700, 1100, 1500};
 
-/* 80455B88-80455B8C 004188 0004+00 1/1 0/0 0/0 .sdata2          sAreaFloating */
 static Z2EnemyArea const sAreaFloating = {false, 700, 1100, 1500};
 
-/* 80455B90-80455B94 004190 0004+00 1/1 0/0 0/0 .sdata2          sAreaWide */
 static Z2EnemyArea const sAreaWide = {true, 700, 1500, 3300};
 
-/* 80455B98-80455B9C 004198 0004+00 1/1 0/0 0/0 .sdata2          sAreaWideFloating */
 static Z2EnemyArea const sAreaWideFloating = {false, 700, 1500, 3300};
 
-/* 80455BA0-80455BA4 0041A0 0004+00 1/1 0/0 0/0 .sdata2          sAreaSmall */
 static Z2EnemyArea const sAreaSmall = {true, 300, 700, 1000};
 
-/* 80455BA8-80455BAC 0041A8 0004+00 1/1 0/0 0/0 .sdata2          sAreaSmallFloating */
 static Z2EnemyArea const sAreaSmallFloating = {false, 500, 800, 1200};
 
 struct Z2EnemyInfo {
@@ -45,7 +36,6 @@ struct Z2EnemyInfo {
     Z2EnemyArea mEnemyArea;
 };
 
-/* 803CAD70-803CB170 027E90 0400+00 3/3 0/0 0/0 .data            mEnemyInfo */
 static Z2EnemyInfo mEnemyInfo[64] = {
     {"Dummy", sAreaDefault},
     {"E_s1", {true, 700, 1200, 2000}},
@@ -113,7 +103,6 @@ static Z2EnemyInfo mEnemyInfo[64] = {
     {"B_tn", sAreaDefault},
 };
 
-/* 802BF994-802BFFEC 2BA2D4 0658+00 1/0 1/1 0/0 .text            searchEnemy__13Z2SoundObjMgrFv */
 void Z2SoundObjMgr::searchEnemy() {
     twilightBattle_ = 0;
 
@@ -356,8 +345,6 @@ void Z2SoundObjMgr::setGhostEnemyState(u8 state) {
     ghostEnemyState_ = state + (ghostEnemyState_ & 1);
 }
 
-/* 802C0074-802C0100 2BA9B4 008C+00 0/0 1/1 0/0 .text
- * getEnemyID__13Z2SoundObjMgrFPCcP26JSULink<15Z2CreatureEnemy> */
 u8 Z2SoundObjMgr::getEnemyID(const char* enemyName, JSULink<Z2CreatureEnemy>* enemyLink) {
     if (enemyName != NULL) {
         for (u8 i = 0; i < ARRAY_SIZEU(mEnemyInfo); i++) {
@@ -371,7 +358,6 @@ u8 Z2SoundObjMgr::getEnemyID(const char* enemyName, JSULink<Z2CreatureEnemy>* en
     return Z2_ENEMY_NULL;
 }
 
-/* 802C0100-802C0120 2BAA40 0020+00 1/1 1/1 0/0 .text            setBattleInit__13Z2SoundObjMgrFv */
 void Z2SoundObjMgr::setBattleInit() {
     field_0x14 = 0;
     enemuNumNear_ = 0;
@@ -381,7 +367,6 @@ void Z2SoundObjMgr::setBattleInit() {
     field_0x1a = false;
 }
 
-/* 802C0120-802C013C 2BAA60 001C+00 0/0 1/1 0/0 .text checkBattleFinish__13Z2SoundObjMgrFv */
 bool Z2SoundObjMgr::checkBattleFinish() {
     if (enemuNumVeryFar_ - field_0x18 > 0) {
         return false;
@@ -390,8 +375,6 @@ bool Z2SoundObjMgr::checkBattleFinish() {
     }
 }
 
-/* 802C013C-802C0190 2BAA7C 0054+00 0/0 1/1 0/0 .text            deleteEnemyAll__13Z2SoundObjMgrFv
- */
 void Z2SoundObjMgr::deleteEnemyAll() {
     JSULink<Z2CreatureEnemy>* i;
 
@@ -406,8 +389,6 @@ void Z2SoundObjMgr::deleteEnemyAll() {
     }
 }
 
-/* 802C0190-802C01E4 2BAAD0 0054+00 0/0 2/2 0/0 .text
- * removeEnemy__13Z2SoundObjMgrFP26JSULink<15Z2CreatureEnemy>   */
 bool Z2SoundObjMgr::removeEnemy(JSULink<Z2CreatureEnemy>* enemyLink) {
     if (enemyLink == NULL) {
         return false;
@@ -422,8 +403,6 @@ bool Z2SoundObjMgr::removeEnemy(JSULink<Z2CreatureEnemy>* enemyLink) {
     return result;
 }
 
-/* 802C01E4-802C01EC 2BAB24 0008+00 0/0 4/4 0/0 .text            isTwilightBattle__13Z2SoundObjMgrFv
- */
 u8 Z2SoundObjMgr::isTwilightBattle() {
     return twilightBattle_;
 }
diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp
index 308ef9e78e..e6d48cdc59 100644
--- a/src/Z2AudioLib/Z2SoundObject.cpp
+++ b/src/Z2AudioLib/Z2SoundObject.cpp
@@ -39,8 +39,6 @@ void Z2SoundObjBase::init(Vec* posPtr, u8 handleNum) {
     alive_ = true;
 }
 
-/* 802BDFF8-802BE038 2B8938 0040+00 1/1 8/8 61/61 .text            deleteObject__14Z2SoundObjBaseFv
- */
 void Z2SoundObjBase::deleteObject() {
     #if VERSION == VERSION_SHIELD_DEBUG
     Z2GetSoundObjMgr()->getAllList()->remove(this);
@@ -58,7 +56,6 @@ void Z2SoundObjBase::framework(u32 param_0, s8 reverb) {
     }
 }
 
-/* 802BE070-802BE104 2B89B0 0094+00 5/0 3/0 0/0 .text            dispose__14Z2SoundObjBaseFv */
 void Z2SoundObjBase::dispose() {
     JAISoundHandle* handle;
     JSULink<Z2SoundHandlePool>* i;
@@ -76,8 +73,6 @@ void Z2SoundObjBase::dispose() {
     alive_ = false;
 }
 
-/* 802BE104-802BE144 2B8A44 0040+00 5/0 3/0 0/0 .text
- * stopOK__14Z2SoundObjBaseFR17Z2SoundHandlePool                */
 bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& handlePool) {
     if ((Z2GetSoundInfo()->getSwBit(handlePool->getID()) & 0x8000) != 0) {
         return false;
@@ -86,8 +81,6 @@ bool Z2SoundObjBase::stopOK(Z2SoundHandlePool& handlePool) {
     }
 }
 
-/* 802BE144-802BE2D4 2B8A84 0190+00 5/3 3/1 0/0 .text
- * startSound__14Z2SoundObjBaseF10JAISoundIDUlSc                */
 Z2SoundHandlePool* Z2SoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     if (!alive_) {
         return NULL;
@@ -132,8 +125,6 @@ Z2SoundHandlePool* Z2SoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s
     return handle;
 }
 
-/* 802BE2D4-802BE4A4 2B8C14 01D0+00 4/2 3/0 0/0 .text
- * startLevelSound__14Z2SoundObjBaseF10JAISoundIDUlSc           */
 Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     if (!alive_) {
         return NULL;
@@ -195,8 +186,6 @@ Z2SoundHandlePool* Z2SoundObjBase::startLevelSound(JAISoundID soundID, u32 mapin
     return handle;
 }
 
-/* 802BE4A4-802BE5A0 2B8DE4 00FC+00 0/0 5/5 21/21 .text
- * startCollisionSE__14Z2SoundObjBaseFUlUlP14Z2SoundObjBase     */
 Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 hitID, u32 mapinfo, Z2SoundObjBase* other) {
     if (other != NULL) {
         return other->startCollisionSE(hitID, mapinfo, NULL);
@@ -229,16 +218,13 @@ Z2SoundHandlePool* Z2SoundObjBase::startCollisionSE(u32 hitID, u32 mapinfo, Z2So
     return handle;
 }
 
-/* 802BE5A0-802BE5FC 2B8EE0 005C+00 1/1 0/0 0/0 .text            __ct__21Z2DopplerSoundObjBaseFv */
 Z2DopplerSoundObjBase::Z2DopplerSoundObjBase() : Z2SoundObjBase() {
     field_0x20 = Z2Calc::cNullVec;
     field_0x2c = Z2Calc::cNullVec;
 }
 
-/* 802BE5FC-802BE65C 2B8F3C 0060+00 0/0 0/0 1/1 .text            __dt__21Z2DopplerSoundObjBaseFv */
 Z2DopplerSoundObjBase::~Z2DopplerSoundObjBase() {}
 
-/* 802BE65C-802BE6B8 2B8F9C 005C+00 1/0 0/0 0/0 .text init__21Z2DopplerSoundObjBaseFP3VecUc */
 void Z2DopplerSoundObjBase::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
     if (pos_ != NULL) {
@@ -247,7 +233,6 @@ void Z2DopplerSoundObjBase::init(Vec* posPtr, u8 handleNum) {
     }
 }
 
-/* 802BE6B8-802BE714 2B8FF8 005C+00 2/0 0/0 0/0 .text framework__21Z2DopplerSoundObjBaseFUlSc */
 void Z2DopplerSoundObjBase::framework(u32 param_0, s8 reverb) {
     Z2SoundObjBase::framework(param_0, reverb);
     if (pos_ != NULL) {
@@ -256,8 +241,6 @@ void Z2DopplerSoundObjBase::framework(u32 param_0, s8 reverb) {
     }
 }
 
-/* 802BE714-802BE7AC 2B9054 0098+00 2/0 0/0 0/0 .text
- * startSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc         */
 Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     JGeometry::TVec3<f32>* pos = pos_;
     pos_ = NULL;
@@ -273,8 +256,6 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startSound(JAISoundID soundID, u32 map
     return handle;
 }
 
-/* 802BE7AC-802BE844 2B90EC 0098+00 2/0 0/0 0/0 .text
- * startLevelSound__21Z2DopplerSoundObjBaseF10JAISoundIDUlSc    */
 Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     JGeometry::TVec3<f32>* pos = pos_;
     pos_ = NULL;
@@ -290,15 +271,12 @@ Z2SoundHandlePool* Z2DopplerSoundObjBase::startLevelSound(JAISoundID soundID, u3
     return handle;
 }
 
-/* 802BE844-802BE880 2B9184 003C+00 0/0 8/8 65/65 .text            __ct__16Z2SoundObjSimpleFv */
 Z2SoundObjSimple::Z2SoundObjSimple() : Z2SoundObjBase() {}
 
 void Z2SoundObjSimple::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
 }
 
-/* 802BE8A0-802BE9B0 2B91E0 0110+00 1/0 0/0 0/0 .text
- * startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc              */
 Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = Z2SoundObjBase::startSound(soundID, mapinfo, reverb);
 
@@ -312,8 +290,6 @@ Z2SoundHandlePool* Z2SoundObjSimple::startSound(JAISoundID soundID, u32 mapinfo,
     return handle;
 }
 
-/* 802BE9B0-802BEB38 2B92F0 0188+00 1/0 0/0 0/0 .text
- * startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc         */
 Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID soundID, u32 mapinfo, s8 reverb) {
     Z2SoundHandlePool* handle = Z2SoundObjBase::startLevelSound(soundID, mapinfo, reverb);
 
@@ -343,27 +319,21 @@ Z2SoundHandlePool* Z2SoundObjSimple::startLevelSound(JAISoundID soundID, u32 map
     return handle;
 }
 
-/* 802BEB38-802BEB74 2B9478 003C+00 0/0 0/0 2/2 .text            __ct__15Z2SoundObjArrowFv */
 Z2SoundObjArrow::Z2SoundObjArrow() : Z2DopplerSoundObjBase() {}
 
-/* 802BEB74-802BEB94 2B94B4 0020+00 1/0 0/0 0/0 .text            init__15Z2SoundObjArrowFP3VecUc */
 void Z2SoundObjArrow::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
 }
 
-/* 802BEB94-802BEBDC 2B94D4 0048+00 0/0 2/2 0/0 .text            __ct__15Z2SoundObjAnimeFv */
 Z2SoundObjAnime::Z2SoundObjAnime() : Z2SoundObjBase() {
     animation_ = NULL;
     reverse_ = false;
 }
 
-/* 802BEBDC-802BEBFC 2B951C 0020+00 1/0 1/0 0/0 .text            init__15Z2SoundObjAnimeFP3VecUc */
 void Z2SoundObjAnime::init(Vec* posPtr, u8 handleNum) {
     Z2SoundObjBase::init(posPtr, handleNum);
 }
 
-/* 802BEBFC-802BED68 2B953C 016C+00 0/0 2/2 0/0 .text            initAnime__15Z2SoundObjAnimeFPvbff
- */
 void Z2SoundObjAnime::initAnime(void* animation, bool param_1, f32 startFrame, f32 param_3) {
     ageSounds_();
     animation_ = (JAUSoundAnimation*)animation;
@@ -389,7 +359,6 @@ void Z2SoundObjAnime::initAnime(void* animation, bool param_1, f32 startFrame, f
     }
 }
 
-/* 802BED68-802BEED4 2B96A8 016C+00 1/1 0/0 0/0 .text            ageSounds___15Z2SoundObjAnimeFv */
 void Z2SoundObjAnime::ageSounds_() {
     for (int i = 0; i < getNumHandles(); i++) {
         if ((*getHandle(i))) {
@@ -415,8 +384,6 @@ void Z2SoundObjAnime::ageSounds_() {
     }
 }
 
-/* 802BEED4-802BF304 2B9814 0430+00 0/0 2/2 0/0 .text            updateAnime__15Z2SoundObjAnimeFff
- */
 void Z2SoundObjAnime::updateAnime(f32 param_0, f32 param_1) {
     for (int i = 0; i < getNumHandles(); i++) {
         if ((*getHandle(i)) && (*getHandle(i))->isAnimated()) {
@@ -467,8 +434,6 @@ void Z2SoundObjAnime::updateAnime(f32 param_0, f32 param_1) {
     curSoundFrame_ = param_0;
 }
 
-/* 802BF304-802BF660 2B9C44 035C+00 1/1 0/0 0/0 .text updateSoundLifeTime___15Z2SoundObjAnimeFff
- */
 void Z2SoundObjAnime::updateSoundLifeTime_(f32 param_0, f32 param_1) {
     if (animation_ == NULL) {
         return;
@@ -511,8 +476,6 @@ void Z2SoundObjAnime::updateSoundLifeTime_(f32 param_0, f32 param_1) {
     }
 }
 
-/* 802BF660-802BF890 2B9FA0 0230+00 1/1 0/0 0/0 .text
- * startSoundInner__15Z2SoundObjAnimeFRCQ29JGeometry8TVec3<f>fP14Z2SoundStarterUlSc */
 void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3<f32>& pos, f32 param_1,
                                       Z2SoundStarter* soundStarter, u32 mapinfo, s8 reverb) {
     JUT_ASSERT(746, curSoundIndex_ >= 0);
@@ -558,15 +521,11 @@ void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3<f32>& pos, f32 para
     }
 }
 
-/* 802BF890-802BF898 2BA1D0 0008+00 1/1 0/0 0/0 .text
- * getSoundID__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
 u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound,
                                 const JGeometry::TVec3<f32>& param_1, f32 param_2) {
     return animationSound->mSoundId;
 }
 
-/* 802BF898-802BF920 2BA1D8 0088+00 1/1 0/0 0/0 .text
- * playsSound__15Z2SoundObjAnimeFPC22JAUSoundAnimationSoundRCQ29JGeometry8TVec3<f>f */
 bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound,
                                  const JGeometry::TVec3<f32>& param_1, f32 param_2) {
     (void)param_1;
diff --git a/src/Z2AudioLib/Z2SoundStarter.cpp b/src/Z2AudioLib/Z2SoundStarter.cpp
index fa8ca55990..2b51fcd4bb 100644
--- a/src/Z2AudioLib/Z2SoundStarter.cpp
+++ b/src/Z2AudioLib/Z2SoundStarter.cpp
@@ -2,18 +2,13 @@
 #include "Z2AudioLib/Z2EnvSeMgr.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
 
-/* 802AAB94-802AABF4 2A54D4 0060+00 0/0 4/4 0/0 .text            __ct__14Z2SoundStarterFb */
 Z2SoundStarter::Z2SoundStarter(bool setInstance) :
     JAISoundStarter(setInstance), JASGlobalInstance<Z2SoundStarter>(setInstance) {}
 
-/* 802AABF4-802AAC3C 2A5534 0048+00 1/0 5/0 0/0 .text
- * startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f> */
 bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr, const JGeometry::TVec3<f32>* posPtr) {
     return Z2SoundStarter::startSound(soundID, handlePtr, posPtr, 0, 0.0f, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 802AAC3C-802AAEDC 2A557C 02A0+00 2/1 2/2 0/0 .text
- * startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
 bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
                                 const JGeometry::TVec3<f32>* posPtr, u32 mapinfo, f32 fxMix,
                                 f32 pitch, f32 volume, f32 pan, f32 dolby, u32 moveSteps) {
@@ -73,8 +68,6 @@ bool Z2SoundStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
     return startSoundRes;
 }
 
-/* 802AAEDC-802AAF74 2A581C 0098+00 1/1 10/10 0/0 .text
- * setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc        */
 void Z2SoundStarter::setPortData(JAISoundHandle* handlePtr, u32 portNum, u16 data, s8 childIndex) {
     if (handlePtr != NULL && *handlePtr) {
         JASTrack* track = handlePtr->getSound()->getTrack();
@@ -90,8 +83,6 @@ void Z2SoundStarter::setPortData(JAISoundHandle* handlePtr, u32 portNum, u16 dat
     }
 }
 
-/* 802AAF74-802AAFF0 2A58B4 007C+00 0/0 1/1 0/0 .text
- * getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc          */
 u16 Z2SoundStarter::getPortData(JAISoundHandle* handlePtr, u32 portNum, s8 childIndex) {
     if (handlePtr != NULL && *handlePtr) {
         JASTrack* track = NULL;
diff --git a/src/Z2AudioLib/Z2SpeechMgr2.cpp b/src/Z2AudioLib/Z2SpeechMgr2.cpp
index 416651a221..b6a1757f2b 100644
--- a/src/Z2AudioLib/Z2SpeechMgr2.cpp
+++ b/src/Z2AudioLib/Z2SpeechMgr2.cpp
@@ -73,7 +73,6 @@ struct Z2MdnPrm {
     static Prm const sPrm[17];
 };
 
-/* 8039C260-8039C2C4 0288C0 0064+00 1/0 0/0 0/0 .rodata          sReply__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
     0x6A, 0x8A, 0x50, 0x5F, 0x53, 0x37, 0x37, 0x4F, 0x4F, 0x5E, 0xAA, 0x46, 0x52, 0x5A, 0x5A,
     0x4F, 0x4F, 0x45, 0x45, 0x56, 0x64, 0x79, 0x79, 0x79, 0x87, 0x95, 0x95, 0x89, 0x89, 0x4C,
@@ -84,12 +83,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReply[50] = {
     0x71, 0x85, 0x85, 0xA2, 0xA2, 0x52, 0x52, 0x5C, 0x5C, 0x75,
 };
 
-/* 8039C2C4-8039C2D0 028924 000A+02 1/0 0/0 0/0 .rodata          sReplyTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sReplyTail[10] = {
     0x5E, 0x7F, 0x68, 0x39, 0x56, 0x75, 0x47, 0x71, 0x7D, 0x33,
 };
 
-/* 8039C2D0-8039C334 028930 0064+00 1/0 0/0 0/0 .rodata          sJoke__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
     0x68, 0x57, 0x57, 0x55, 0x55, 0x51, 0x5B, 0x64, 0x6B, 0x7B, 0x7B, 0x5C, 0x77, 0x97, 0x8D,
     0x97, 0x97, 0x8D, 0x66, 0x69, 0xA2, 0x5C, 0x87, 0x4F, 0x69, 0x5F, 0x5F, 0x83, 0x83, 0x82,
@@ -100,12 +97,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sJoke[50] = {
     0x45, 0x45, 0x29, 0x4C, 0x4B, 0x64, 0x64, 0x60, 0x5C, 0xB1,
 };
 
-/* 8039C334-8039C340 028994 000A+02 1/0 0/0 0/0 .rodata          sJokeTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sJokeTail[10] = {
     0x51, 0x97, 0x60, 0xB0, 0x6F, 0x5E, 0x5A, 0xA6, 0x4F, 0x4F,
 };
 
-/* 8039C340-8039C3A4 0289A0 0064+00 1/0 0/0 0/0 .rodata          sSexy__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
     0x5E, 0x60, 0x5F, 0x63, 0x63, 0x72, 0x72, 0x78, 0x4D, 0x7A, 0x6E, 0x6E, 0x6E, 0x6E, 0x6E,
     0x59, 0x59, 0x7A, 0x7A, 0xA5, 0x90, 0x8D, 0x86, 0x62, 0x72, 0x79, 0x79, 0x86, 0x7F, 0x8B,
@@ -116,12 +111,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSexy[50] = {
     0x79, 0x65, 0x65, 0x4A, 0x5C, 0x78, 0x78, 0x8B, 0x8D, 0x7C,
 };
 
-/* 8039C3A4-8039C3B0 028A04 000A+02 1/0 0/0 0/0 .rodata          sSexyTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sSexyTail[10] = {
     0x52, 0x79, 0x82, 0xA5, 0x62, 0x86, 0x3F, 0x7D, 0x57, 0x7C,
 };
 
-/* 8039C3B0-8039C414 028A10 0064+00 1/0 0/0 0/0 .rodata          sRidicule__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
     0xA7, 0x5A, 0x5A, 0x52, 0x52, 0x85, 0x85, 0x8C, 0x63, 0x73, 0x73, 0x90, 0x50, 0x46, 0x74,
     0x74, 0xA3, 0xA7, 0x41, 0x51, 0x58, 0x34, 0x34, 0x2A, 0x5A, 0x81, 0x5D, 0x42, 0x4B, 0x70,
@@ -132,12 +125,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sRidicule[50] = {
     0x2D, 0x2D, 0x2D, 0x8C, 0x8C, 0x8B, 0x8B, 0x93, 0x93, 0x6E,
 };
 
-/* 8039C414-8039C420 028A74 000A+02 1/0 0/0 0/0 .rodata          sRidiculeTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sRidiculeTail[10] = {
     0x81, 0x67, 0x6D, 0x8C, 0x90, 0x85, 0xB1, 0x4D, 0x4F, 0x6E,
 };
 
-/* 8039C420-8039C48C 028A80 006C+00 1/0 0/0 0/0 .rodata          sBoring__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
     0x8E, 0x9C, 0x9C, 0x5A, 0x5A, 0x52, 0x52, 0x5B, 0x5C, 0x56, 0x5C, 0x52, 0x52, 0x2D, 0x2D, 0x5B,
     0x59, 0x56, 0x56, 0x56, 0x56, 0x6B, 0x6B, 0x58, 0x4C, 0x8E, 0x8E, 0x59, 0x61, 0x54, 0xA0, 0x4D,
@@ -148,12 +139,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sBoring[54] = {
     0x5B, 0x5E, 0x70, 0x56, 0x56, 0x4C, 0x4C, 0x59, 0x59, 0x5B, 0x5B, 0x71,
 };
 
-/* 80455EE0-80455EE8 0044E0 0006+02 1/0 0/0 0/0 .sdata2          sBoringTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sBoringTail[6] = {
     0x92, 0x58, 0x59, 0x5B, 0x70, 0x71,
 };
 
-/* 8039C48C-8039C4EC 028AEC 005E+02 1/0 0/0 0/0 .rodata          sIrritated__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
     0x6C, 0x91, 0x67, 0x8B, 0x8B, 0xA2, 0xA2, 0xAB, 0x48, 0x64, 0x73, 0x61, 0x61, 0x64, 0x64, 0x6D,
     0x60, 0x7E, 0x4A, 0x55, 0x6A, 0x63, 0x66, 0x78, 0x5C, 0x5A, 0x6E, 0x79, 0x75, 0x62, 0x62, 0x57,
@@ -163,12 +152,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sIrritated[47] = {
     0xAD, 0x6E, 0x72, 0x82, 0x83, 0x87, 0x85, 0x85, 0x85, 0x8E, 0x60, 0x6D, 0x80, 0x80,
 };
 
-/* 8039C4EC-8039C4F8 028B4C 000A+02 1/0 0/0 0/0 .rodata          sIrritatedTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sIrritatedTail[10] = {
     0x64, 0x61, 0x4E, 0x91, 0xA0, 0x85, 0x9B, 0x67, 0x6F, 0x64,
 };
 
-/* 8039C4F8-8039C56C 028B58 0072+02 1/0 0/0 0/0 .rodata          sOrder__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
     0x77, 0x5F, 0x5F, 0x73, 0x73, 0x66, 0x66, 0x6B, 0x6B, 0x7A, 0x7A, 0x60, 0x54, 0x5F, 0x5F,
     0x69, 0x69, 0x5A, 0x86, 0x84, 0x84, 0x96, 0x96, 0x94, 0x94, 0x8A, 0x87, 0x84, 0x5A, 0x2C,
@@ -180,12 +167,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sOrder[57] = {
     0x48, 0x48, 0x69, 0x69, 0x6D, 0x6D, 0x94, 0x94, 0x97,
 };
 
-/* 80455EE8-80455EF0 0044E8 0006+02 1/0 0/0 0/0 .sdata2          sOrderTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sOrderTail[6] = {
     0x60, 0xA8, 0x5B, 0x4E, 0x5D, 0x87,
 };
 
-/* 8039C56C-8039C5D8 028BCC 006A+02 1/0 0/0 0/0 .rodata          sResent__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
     0x6F, 0x5F, 0x5F, 0x66, 0x66, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x4B, 0x4B, 0x6B, 0x6B, 0x86,
     0x86, 0x4A, 0x4A, 0x6D, 0x6D, 0x6D, 0x6D, 0x8C, 0x8C, 0x84, 0x84, 0x64, 0x64, 0x6C, 0x6C, 0x92,
@@ -196,12 +181,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sResent[53] = {
     0x5E, 0xAA, 0xAA, 0x9E, 0x9E, 0x5A, 0x5A, 0x57, 0x57, 0x57,
 };
 
-/* 80455EF0-80455EF8 0044F0 0005+03 1/0 0/0 0/0 .sdata2          sResentTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sResentTail[5] = {
     0x4A, 0x98, 0x8A, 0x7E, 0x57,
 };
 
-/* 8039C5D8-8039C644 028C38 006A+02 1/0 0/0 0/0 .rodata          sCheerful__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
     0x64, 0x6D, 0x6D, 0x6D, 0x99, 0x6D, 0x40, 0x51, 0x51, 0x6F, 0x6F, 0x66, 0x66, 0x60, 0xA7, 0xAF,
     0xB3, 0x61, 0x61, 0xA7, 0xA7, 0x5E, 0x8B, 0x75, 0x77, 0x72, 0x72, 0x93, 0x93, 0x8B, 0x8B, 0x88,
@@ -212,12 +195,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sCheerful[53] = {
     0x65, 0x70, 0x6B, 0x6B, 0x6B, 0x6D, 0x6D, 0x57, 0x57, 0x7B,
 };
 
-/* 80455EF8-80455F00 0044F8 0008+00 1/0 0/0 0/0 .sdata2          sCheerfulTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sCheerfulTail[8] = {
     0x60, 0x6D, 0x4D, 0x44, 0x9C, 0x54, 0x70, 0x7B,
 };
 
-/* 8039C644-8039C6B0 028CA4 006A+02 1/0 0/0 0/0 .rodata          sConfused__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
     0x83, 0x80, 0x80, 0x82, 0x82, 0x82, 0x82, 0x5B, 0x75, 0x84, 0x84, 0x84, 0x84, 0x75, 0x75, 0x62,
     0x62, 0x62, 0x4D, 0x56, 0x56, 0x59, 0x59, 0x59, 0x59, 0x74, 0x74, 0x85, 0x7D, 0x8D, 0x8D, 0x70,
@@ -228,12 +209,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sConfused[53] = {
     0x38, 0x38, 0x38, 0x83, 0x83, 0x8E, 0x8E, 0x4C, 0x56, 0x56,
 };
 
-/* 80455F00-80455F08 004500 0005+03 1/0 0/0 0/0 .sdata2          sConfusedTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sConfusedTail[5] = {
     0x2C, 0x42, 0x4C, 0x7C, 0x49,
 };
 
-/* 8039C6B0-8039C718 028D10 0068+00 1/0 0/0 0/0 .rodata          sHostility__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
     0x85, 0x71, 0x71, 0x73, 0x73, 0x3B, 0x62, 0x84, 0x94, 0x94, 0x94, 0xAF, 0x98, 0xAD, 0xAD,
     0x5A, 0x5A, 0x63, 0x63, 0x97, 0x90, 0x90, 0x7B, 0x73, 0x73, 0x63, 0x63, 0x55, 0x55, 0x65,
@@ -244,12 +223,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sHostility[52] = {
     0x62, 0x6A, 0x5F, 0x72, 0x72, 0x62, 0x62, 0x65, 0x5E, 0x69, 0x69, 0x63, 0x63, 0x7F,
 };
 
-/* 80455F08-80455F10 004508 0007+01 1/0 0/0 0/0 .sdata2          sHostilityTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sHostilityTail[7] = {
     0x97, 0x67, 0x94, 0x6A, 0x66, 0x4F, 0x6A,
 };
 
-/* 8039C718-8039C784 028D78 006A+02 1/0 0/0 0/0 .rodata          sTired__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
     0x70, 0x70, 0x70, 0x5C, 0x5C, 0x5C, 0x6F, 0x6F, 0x6F, 0x93, 0x8C, 0x9A, 0x9D, 0x89, 0x99, 0x7A,
     0x91, 0x8D, 0x8D, 0x8D, 0x8D, 0x69, 0x69, 0x72, 0x72, 0x65, 0x65, 0x65, 0x9E, 0x98, 0x98, 0x2A,
@@ -260,12 +237,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sTired[53] = {
     0x84, 0x6D, 0x6D, 0x6A, 0x6A, 0x8D, 0x8D, 0x8D, 0x8D, 0x3B,
 };
 
-/* 80455F10-80455F18 004510 0008+00 1/0 0/0 0/0 .sdata2          sTiredTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sTiredTail[8] = {
     0x66, 0x6F, 0x3B, 0x7A, 0x49, 0x91, 0x5C, 0x6A,
 };
 
-/* 8039C784-8039C7F0 028DE4 006A+02 1/0 0/0 0/0 .rodata          sSerious__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
     0x52, 0x65, 0x65, 0x72, 0x5A, 0x61, 0x61, 0x7B, 0x80, 0x92, 0x93, 0x9D, 0x9D, 0x70, 0x79, 0x76,
     0x62, 0x57, 0x5A, 0x53, 0x53, 0x59, 0x59, 0x65, 0x63, 0x60, 0x60, 0x6A, 0x83, 0x80, 0x7F, 0x5D,
@@ -276,12 +251,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sSerious[53] = {
     0x70, 0x60, 0x3C, 0x81, 0x81, 0x92, 0x92, 0x8E, 0x98, 0x87,
 };
 
-/* 80455F18-80455F20 004518 0007+01 1/0 0/0 0/0 .sdata2          sSeriousTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sSeriousTail[7] = {
     0x7B, 0x69, 0x4B, 0x61, 0x52, 0x59, 0x87,
 };
 
-/* 8039C7F0-8039C844 028E50 0054+00 1/0 0/0 0/0 .rodata          sReplyb__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
     0x5C, 0x45, 0x45, 0x71, 0x9F, 0x57, 0xB4, 0xB4, 0x56, 0x62, 0x8E, 0x61, 0x61, 0xB0,
     0xB0, 0x3C, 0x59, 0x4A, 0x64, 0xA4, 0xA4, 0x5A, 0x5A, 0x5A, 0x5A, 0x72, 0x72, 0x4B,
@@ -291,12 +264,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sReplyb[42] = {
     0x44, 0x4F, 0x52, 0x58, 0x5A, 0x6F, 0x6E, 0x8A, 0x8E, 0x8E, 0x8E, 0x8C, 0x8C, 0x9B,
 };
 
-/* 80455F20-80455F28 004520 0007+01 1/0 0/0 0/0 .sdata2          sReplybTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sReplybTail[7] = {
     0x4F, 0x4A, 0xA2, 0x4F, 0x65, 0x98, 0x5C,
 };
 
-/* 8039C844-8039C8A8 028EA4 0064+00 1/0 0/0 0/0 .rodata          sApologize__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
     0x6A, 0x6A, 0x6A, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x51, 0x57, 0x57, 0x57, 0x63, 0x61,
     0x54, 0x54, 0x54, 0x54, 0x58, 0x58, 0x58, 0x58, 0x45, 0x45, 0x56, 0x56, 0x5B, 0x5B, 0x37,
@@ -307,12 +278,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sApologize[50] = {
     0x64, 0x60, 0x61, 0x63, 0x6A, 0x62, 0x62, 0x64, 0x65, 0x71,
 };
 
-/* 8039C8A8-8039C8B4 028F08 0009+03 1/0 0/0 0/0 .rodata          sApologizeTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sApologizeTail[9] = {
     0x7C, 0x6E, 0x63, 0x71, 0x51, 0x37, 0x75, 0x58, 0x5C,
 };
 
-/* 8039C8B4-8039C918 028F14 0064+00 1/0 0/0 0/0 .rodata          sDeside__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
     0x77, 0x77, 0x77, 0x58, 0x58, 0x6F, 0x78, 0x5F, 0x66, 0x5E, 0x6E, 0x62, 0x62, 0x2E, 0x5A,
     0x58, 0x54, 0x52, 0x52, 0x5C, 0x59, 0x56, 0x56, 0x4B, 0x4B, 0x63, 0x63, 0x4D, 0x4E, 0x4A,
@@ -323,12 +292,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sDeside[50] = {
     0x75, 0x6A, 0x66, 0x76, 0x69, 0x69, 0x69, 0x60, 0x60, 0x5F,
 };
 
-/* 80455F28-80455F30 004528 0008+00 1/0 0/0 0/0 .sdata2          sDesideTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sDesideTail[8] = {
     0x64, 0x2E, 0x4A, 0x57, 0x80, 0x48, 0x7C, 0x5F,
 };
 
-/* 8039C918-8039C980 028F78 0068+00 1/0 0/0 0/0 .rodata          sAfford__8Z2MdnPrm */
 Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
     0x4E, 0x45, 0x52, 0x5B, 0x56, 0x5B, 0x59, 0x52, 0x52, 0x57, 0x5C, 0x50, 0x50, 0x49, 0x80,
     0x6E, 0x6E, 0x5A, 0x5C, 0x60, 0x6A, 0x62, 0x62, 0x6A, 0x71, 0x48, 0x4C, 0x5B, 0x5A, 0x40,
@@ -339,12 +306,10 @@ Z2MdnPrm::Unit const Z2MdnPrm::sAfford[52] = {
     0x63, 0x5D, 0x69, 0x70, 0x56, 0x50, 0x4B, 0x92, 0x86, 0x8F, 0x4B, 0x4F, 0x57, 0x56,
 };
 
-/* 8039C980-8039C98C 028FE0 000C+00 1/0 0/0 0/0 .rodata          sAffordTail__8Z2MdnPrm */
 u8 const Z2MdnPrm::sAffordTail[12] = {
     0x63, 0x8E, 0x5B, 0x59, 0x4C, 0x3A, 0x69, 0x47, 0x41, 0x59, 0x50, 0x55,
 };
 
-/* 8039C98C-8039CA58 -00001 00CC+00 2/2 0/0 0/0 .rodata          sPrm__8Z2MdnPrm */
 const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
     {Z2MdnPrm::sReply,     Z2MdnPrm::sReplyTail,     ARRAY_SIZE(Z2MdnPrm::sReply),      6, 4},
     {Z2MdnPrm::sJoke,      Z2MdnPrm::sJokeTail,      ARRAY_SIZE(Z2MdnPrm::sJoke),       3, 7},
@@ -365,7 +330,6 @@ const Z2MdnPrm::Prm Z2MdnPrm::sPrm[17] = {
     {Z2MdnPrm::sAfford,    Z2MdnPrm::sAffordTail,    ARRAY_SIZE(Z2MdnPrm::sAfford),    2, 10},
 };
 
-/* 802CBC60-802CBCEC 2C65A0 008C+00 0/0 1/1 0/0 .text            __ct__12Z2SpeechMgr2Fv */
 Z2SpeechMgr2::Z2SpeechMgr2() : JASGlobalInstance<Z2SpeechMgr2>(true), random(0) {
     mTextNum = 0;
     mTextCount = -1;
@@ -379,8 +343,6 @@ Z2SpeechMgr2::Z2SpeechMgr2() : JASGlobalInstance<Z2SpeechMgr2>(true), random(0)
     }
 }
 
-/* 802CBD88-802CBF60 2C66C8 01D8+00 1/0 1/1 0/0 .text            setString__12Z2SpeechMgr2FPCUssUcUs
- */
 void Z2SpeechMgr2::setString(const u16* s, s16 textNum, u8 speakerID, u16 mood) {
     switch (speakerID) {
     case 0x13:
@@ -534,7 +496,6 @@ void Z2SpeechMgr2::setString(const u16* s, s16 textNum, u8 speakerID, u16 mood)
     selectUnit(false);
 }
 
-/* 802CBF60-802CC190 2C68A0 0230+00 1/0 2/2 0/0 .text            setTextCount__12Z2SpeechMgr2Fs */
 void Z2SpeechMgr2::setTextCount(s16 textCount) {
     if (mVoice != 99) {
         field_0x3ff = 0x0;
@@ -604,7 +565,6 @@ void Z2SpeechMgr2::setTextCount(s16 textCount) {
     }
 }
 
-/* 802CC190-802CC2FC 2C6AD0 016C+00 1/1 1/1 0/0 .text            speakOneWord__12Z2SpeechMgr2Fb */
 void Z2SpeechMgr2::speakOneWord(bool param_0) {
     if (Z2GetSceneMgr()->isSceneExist() && (mVoice == 1 || mVoice == 2) &&
         field_0x400 == 0 && field_0x3ff <= 30)
@@ -627,7 +587,6 @@ void Z2SpeechMgr2::speakOneWord(bool param_0) {
     }
 }
 
-/* 802CC2FC-802CC4C0 2C6C3C 01C4+00 2/2 0/0 0/0 .text            isNonVerbal__12Z2SpeechMgr2Fv */
 bool Z2SpeechMgr2::isNonVerbal() {
     switch(mText[mTextCount]) {
     case '\0':
@@ -723,7 +682,6 @@ typedef struct {
     u8 field_0x1;
 } Z2ConnectCost;
 
-/* 802CC4C0-802CC738 2C6E00 0278+00 2/2 0/0 0/0 .text            selectUnit__12Z2SpeechMgr2Fb */
 void Z2SpeechMgr2::selectUnit(bool param_0) {
     Z2ConnectCost cost[5];
 
@@ -791,7 +749,6 @@ void Z2SpeechMgr2::selectUnit(bool param_0) {
     field_0x401++;
 }
 
-/* 802CC738-802CC9D0 2C7078 0298+00 1/1 0/0 0/0 .text            selectTail__12Z2SpeechMgr2Fv */
 void Z2SpeechMgr2::selectTail() {
     Z2ConnectCost cost[5];
     s8 cVar9 = 0;
@@ -846,7 +803,6 @@ void Z2SpeechMgr2::selectTail() {
     }
 }
 
-/* 802CC9D0-802CCA18 2C7310 0048+00 0/0 1/1 0/0 .text            framework__12Z2SpeechMgr2Fv */
 void Z2SpeechMgr2::framework() {
     switch (mVoice) {
     case 1:
@@ -863,8 +819,6 @@ void Z2SpeechMgr2::framework() {
     }
 }
 
-/* 802CCA18-802CCF88 2C7358 0570+00 0/0 2/2 0/0 .text playOneShotVoice__12Z2SpeechMgr2FUcUsP3VecSc
- */
 void Z2SpeechMgr2::playOneShotVoice(u8 speakerID, u16 param_1, Vec* posPtr, s8 param_3) {
     if (speakerID == 0) {
         return;
@@ -1019,7 +973,6 @@ void Z2SpeechMgr2::playOneShotVoice(u8 speakerID, u16 param_1, Vec* posPtr, s8 p
     }
 }
 
-/* 802CCF88-802CCFB8 2C78C8 0030+00 0/0 1/1 0/0 .text            isMidnaSpeak__12Z2SpeechMgr2Fv */
 bool Z2SpeechMgr2::isMidnaSpeak() {
     if ((mVoice == 1 || mVoice == 2) && field_0x0) {
         return true;
@@ -1028,11 +981,8 @@ bool Z2SpeechMgr2::isMidnaSpeak() {
     return false;
 }
 
-/* 802CCFB8-802CCFF8 2C78F8 0040+00 1/1 0/0 0/0 .text            __ct__15Z2SpeechStarterFv */
 Z2SpeechStarter::Z2SpeechStarter() : Z2SoundStarter(false) {}
 
-/* 802CCFF8-802CD248 2C7938 0250+00 1/0 0/0 0/0 .text
- * startSound__15Z2SpeechStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3<f>UlfffffUl */
 bool Z2SpeechStarter::startSound(JAISoundID soundID, JAISoundHandle* handlePtr,
                                  const JGeometry::TVec3<f32>* posPtr, u32 portData, f32 fxmix,
                                  f32 pitch, f32 volume, f32 pan, f32 dolby, u32 moveSteps) {
diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp
index 461348dd0a..619055090f 100644
--- a/src/Z2AudioLib/Z2StatusMgr.cpp
+++ b/src/Z2AudioLib/Z2StatusMgr.cpp
@@ -87,7 +87,6 @@ static const char* sSpotName[] = {
     "D_SB10",
 };
 
-/* 802B5F1C-802B5F70 2B085C 0054+00 0/0 1/1 0/0 .text            __ct__11Z2StatusMgrFv */
 Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(true) {
     mHour = 0;
     mMinute = 0;
@@ -109,12 +108,10 @@ Z2StatusMgr::Z2StatusMgr() : JASGlobalInstance(true) {
     mHeartGaugeOn = 0;
 }
 
-/* 802B5F70-802B5F7C 2B08B0 000C+00 0/0 1/1 0/0 .text            heartGaugeOn__11Z2StatusMgrFv */
 void Z2StatusMgr::heartGaugeOn() {
     mHeartGaugeOn = 2;
 }
 
-/* 802B5F7C-802B60CC 2B08BC 0150+00 0/0 1/1 0/0 .text processHeartGaugeSound__11Z2StatusMgrFv */
 void Z2StatusMgr::processHeartGaugeSound() {
     if (!dComIfGp_event_runCheck() && mHeartGaugeOn != 0) {
         if (dScnPly_c::isPause()) {
@@ -144,7 +141,6 @@ void Z2StatusMgr::processHeartGaugeSound() {
     }
 }
 
-/* 802B60CC-802B6104 2B0A0C 0038+00 0/0 1/1 0/0 .text            talkIn__11Z2StatusMgrFv */
 void Z2StatusMgr::talkIn() {
     if (!isMovieDemo()) {
         Z2GetSeqMgr()->talkInBgm();
@@ -152,7 +148,6 @@ void Z2StatusMgr::talkIn() {
     }
 }
 
-/* 802B6104-802B613C 2B0A44 0038+00 0/0 1/1 0/0 .text            talkOut__11Z2StatusMgrFv */
 void Z2StatusMgr::talkOut() {
     if (!isMovieDemo()) {
         Z2GetSeqMgr()->talkOutBgm();
@@ -160,7 +155,6 @@ void Z2StatusMgr::talkOut() {
     }
 }
 
-/* 802B613C-802B617C 2B0A7C 0040+00 0/0 1/1 0/0 .text            menuIn__11Z2StatusMgrFv */
 void Z2StatusMgr::menuIn() {
     Z2GetSeqMgr()->menuInBgm();
     Z2GetSeMgr()->menuInSe();
@@ -168,7 +162,6 @@ void Z2StatusMgr::menuIn() {
     mPauseFlag = true;
 }
 
-/* 802B617C-802B61BC 2B0ABC 0040+00 0/0 3/3 0/0 .text            menuOut__11Z2StatusMgrFv */
 void Z2StatusMgr::menuOut() {
     Z2GetSeqMgr()->menuOutBgm();
     Z2GetSeMgr()->talkOutSe();
@@ -176,12 +169,10 @@ void Z2StatusMgr::menuOut() {
     mPauseFlag = false;
 }
 
-/* 802B61BC-802B61E8 2B0AFC 002C+00 2/2 1/1 0/0 .text            isMovieDemo__11Z2StatusMgrFv */
 bool Z2StatusMgr::isMovieDemo() {
     return mDemoStatus == 2 || mDemoStatus == 8 || mDemoStatus == 9;
 }
 
-/* 802B61E8-802B671C 2B0B28 0534+00 1/0 7/7 11/11 .text            setDemoName__11Z2StatusMgrFPc */
 void Z2StatusMgr::setDemoName(char* demoName) {
     if (mDemoStatus == 11) {
         mDemoStatus = 0;
@@ -290,13 +281,11 @@ void Z2StatusMgr::setDemoName(char* demoName) {
     }
 }
 
-/* 802B671C-802B6734 2B105C 0018+00 0/0 1/1 0/0 .text            processTime__11Z2StatusMgrFv */
 void Z2StatusMgr::processTime() {
     u16 processed_hour = mHour * 256;
     mTime = processed_hour + mMinute;
 }
 
-/* 802B6734-802B6758 2B1074 0024+00 0/0 5/5 0/0 .text            checkDayTime__11Z2StatusMgrFv */
 bool Z2StatusMgr::checkDayTime() {
     if (mHour >= 6 && mHour < 19) {
         return true;
@@ -305,22 +294,18 @@ bool Z2StatusMgr::checkDayTime() {
     return false;
 }
 
-/* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text            setEventBit__11Z2StatusMgrFPv */
 void Z2StatusMgr::setEventBit(void* eventBit) {
     mEventBit = eventBit;
 }
 
-/* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */
 void Z2StatusMgr::setCameraPolygonPos(Vec* polygonPos) {
     if (polygonPos != NULL) {
         mPolygonPosition = *polygonPos;
     }
 }
 
-/* 802B6784-802B6788 2B10C4 0004+00 0/0 1/1 0/0 .text setCameraGroupInfo__11Z2StatusMgrFUc */
 void Z2StatusMgr::setCameraGroupInfo(u8) {}
 
-/* 802B6788-802B6840 2B10C8 00B8+00 0/0 2/2 0/0 .text setCameraInWaterDepth__11Z2StatusMgrFf */
 void Z2StatusMgr::setCameraInWaterDepth(f32 depth) {
     if (0.0f == depth) {
         mCameraInWaterDepthRatio = 0.0f;
diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/src/Z2AudioLib/Z2WolfHowlMgr.cpp
index 8209c03978..2350c90129 100644
--- a/src/Z2AudioLib/Z2WolfHowlMgr.cpp
+++ b/src/Z2AudioLib/Z2WolfHowlMgr.cpp
@@ -7,36 +7,27 @@
 #include "Z2AudioLib/Z2Audience.h"
 #include "d/d_demo.h"
 
-/* 80450880-80450884 000300 0004+00 2/2 0/0 0/0 .sdata           cPitchDown */
 static f32 cPitchDown = 0.8909f;
 
-/* 80450884-80450888 000304 0004+00 4/4 0/0 0/0 .sdata           cPitchCenter */
 static f32 cPitchCenter = 1.0f;
 
-/* 80450888-8045088C 000308 0004+00 2/2 0/0 0/0 .sdata           cPitchUp */
 static f32 cPitchUp = 1.1892f;
 
 static u8 struct_8045088C = 7;
 static u8 struct_8045088D = 7;
 
-/* 8045088E-80450890 00030E 0002+00 4/4 0/0 0/0 .sdata           None */
 static u8 cBeginHowlTime = 30;
 static u8 data_8045088F = 0;
 
-/* 80450890-80450894 000310 0004+00 1/1 0/0 0/0 .sdata           cR_FlatWidth */
 static f32 cR_FlatWidth = 0.94387f;  // 1.0f / 12th root of 2
 
-/* 80450894-80450898 -00001 0004+00 3/3 0/0 0/0 .sdata           None */
 static u8 struct_80450894 = 5;
 static u8 struct_80450895 = 30;
 
-/* 80450898-8045089C 000318 0004+00 1/1 0/0 0/0 .sdata           sStickHigh */
 static f32 sStickHigh = 0.5f;
 
-/* 8045089C-804508A0 00031C 0004+00 1/1 0/0 0/0 .sdata           sStickCenter */
 static f32 sStickCenter = 1.0f / 5.0f;
 
-/* 804508A0-804508A8 000320 0008+00 1/0 0/0 0/0 .sdata           sHowlTobikusa */
 static Z2WolfHowlLine sHowlTobikusa[4] = {
     {HOWL_LINE_HIGH, 30},
     {HOWL_LINE_LOW, 30},
@@ -44,7 +35,6 @@ static Z2WolfHowlLine sHowlTobikusa[4] = {
     {HOWL_LINE_LOW, 30},
 };
 
-/* 803CBC50-803CBC5C 028D70 000C+00 1/0 0/0 0/0 .data            sHowlUmakusa */
 static Z2WolfHowlLine sHowlUmakusa[6] = {
     {HOWL_LINE_HIGH, 15},
     {HOWL_LINE_MID, 15},
@@ -54,7 +44,6 @@ static Z2WolfHowlLine sHowlUmakusa[6] = {
     {HOWL_LINE_LOW, 60},
 };
 
-/* 803CBC5C-803CBC68 028D7C 000C+00 1/0 0/0 0/0 .data            sHowlZeldaSong */
 static Z2WolfHowlLine sHowlZeldaSong[6] = {
     {HOWL_LINE_MID, 30},
     {HOWL_LINE_HIGH, 15},
@@ -64,7 +53,6 @@ static Z2WolfHowlLine sHowlZeldaSong[6] = {
     {HOWL_LINE_LOW, 45},
 };
 
-/* 803CBC68-803CBC74 028D88 000C+00 1/0 0/0 0/0 .data            sHowlLightPrelude */
 static Z2WolfHowlLine sHowlLightPrelude[6] = {
     {HOWL_LINE_HIGH, 20},
     {HOWL_LINE_LOW, 40},
@@ -74,7 +62,6 @@ static Z2WolfHowlLine sHowlLightPrelude[6] = {
     {HOWL_LINE_HIGH, 30},
 };
 
-/* 803CBC74-803CBC80 028D94 000C+00 1/0 0/0 0/0 .data            sHowlSoulRequiem */
 static Z2WolfHowlLine sHowlSoulRequiem[6] = {
     {HOWL_LINE_LOW, 30},
     {HOWL_LINE_MID, 15},
@@ -84,7 +71,6 @@ static Z2WolfHowlLine sHowlSoulRequiem[6] = {
     {HOWL_LINE_LOW, 30},
 };
 
-/* 803CBC80-803CBC8C 028DA0 000C+00 1/0 0/0 0/0 .data            sHealingSong */
 static Z2WolfHowlLine sHealingSong[6] = {
     {HOWL_LINE_HIGH, 30},
     {HOWL_LINE_MID, 30},
@@ -94,7 +80,6 @@ static Z2WolfHowlLine sHealingSong[6] = {
     {HOWL_LINE_LOW, 30},
 };
 
-/* 803CBC8C-803CBC9C 028DAC 000E+02 1/0 0/0 0/0 .data            sNewSong1 */
 static Z2WolfHowlLine sNewSong1[7] = {
     {HOWL_LINE_LOW, 30},
     {HOWL_LINE_MID, 30},
@@ -105,7 +90,6 @@ static Z2WolfHowlLine sNewSong1[7] = {
     {HOWL_LINE_HIGH, 30},
 };
 
-/* 803CBC9C-803CBCAC 028DBC 0010+00 1/0 0/0 0/0 .data            sNewSong2 */
 static Z2WolfHowlLine sNewSong2[8] = {
     {HOWL_LINE_HIGH, 20},
     {HOWL_LINE_MID, 20},
@@ -117,7 +101,6 @@ static Z2WolfHowlLine sNewSong2[8] = {
     {HOWL_LINE_LOW, 30},
 };
 
-/* 803CBCAC-803CBCC0 028DCC 0012+02 1/0 0/0 0/0 .data            sNewSong3 */
 static Z2WolfHowlLine sNewSong3[9] = {
     {HOWL_LINE_MID, 30},
     {HOWL_LINE_LOW, 60},
@@ -130,7 +113,6 @@ static Z2WolfHowlLine sNewSong3[9] = {
     {HOWL_LINE_MID, 45},
 };
 
-/* 803CBCC0-803CBD08 -00001 0048+00 1/1 0/0 0/0 .data            sGuideData */
 static Z2WolfHowlData sGuideData[9] = {
     {ARRAY_SIZE(sHowlTobikusa), sHowlTobikusa},
     {ARRAY_SIZE(sHowlUmakusa), sHowlUmakusa},
@@ -143,7 +125,6 @@ static Z2WolfHowlData sGuideData[9] = {
     {ARRAY_SIZE(sNewSong3), sNewSong3},
 };
 
-/* 802CAAC0-802CAB8C 2C5400 00CC+00 0/0 1/1 0/0 .text            __ct__13Z2WolfHowlMgrFv */
 Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) {
     mNowHowlData = NULL;
     mNowInputValue = 0.0f;
@@ -174,7 +155,6 @@ Z2WolfHowlMgr::Z2WolfHowlMgr() : JASGlobalInstance(true) {
     mGuideData = (Z2WolfHowlData*)&sGuideData;
 }
 
-/* 802CAB8C-802CABEC 2C54CC 0060+00 1/1 0/0 0/0 .text            resetState__13Z2WolfHowlMgrFv */
 void Z2WolfHowlMgr::resetState() {
     mWolfHowlVolume = 1.0f;
     mNowPitch = cPitchCenter;
@@ -192,7 +172,6 @@ void Z2WolfHowlMgr::resetState() {
     field_0x30 = 0.0f;
 }
 
-/* 802CABEC-802CACB0 2C552C 00C4+00 1/1 0/0 0/0 .text            calcVolumeMod__13Z2WolfHowlMgrFf */
 void Z2WolfHowlMgr::calcVolumeMod(f32) {
     f32 volume;
 
@@ -214,7 +193,6 @@ void Z2WolfHowlMgr::calcVolumeMod(f32) {
     }
 }
 
-/* 802CACB0-802CACCC 2C55F0 001C+00 1/1 0/0 0/0 .text            getNowPitch__13Z2WolfHowlMgrFv */
 f32 Z2WolfHowlMgr::getNowPitch() {
     if (mWolfHowlHandle) {
         return mWolfHowlHandle->getAuxiliary().params_.mPitch;
@@ -223,13 +201,10 @@ f32 Z2WolfHowlMgr::getNowPitch() {
     return 1.0f;
 }
 
-/* 802CACCC-802CACD4 2C560C 0008+00 0/0 2/2 0/0 .text            getNowInputValue__13Z2WolfHowlMgrFv
- */
 f32 Z2WolfHowlMgr::getNowInputValue() {
     return mNowInputValue;
 }
 
-/* 802CACD4-802CAED4 2C5614 0200+00 1/1 0/0 0/0 .text            calcPitchMod__13Z2WolfHowlMgrFff */
 void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) {
     (void)param_0;
 
@@ -278,7 +253,6 @@ void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) {
     }
 }
 
-/* 802CAED4-802CB100 2C5814 022C+00 0/0 1/1 0/0 .text startWolfHowlSound__13Z2WolfHowlMgrFffbf */
 s8 Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 stickValue, bool isHowl, f32 param_3) {
     if (mCorrectCurveID > Z2WOLFHOWL_UMAKUSA) {
         Z2GetSeqMgr()->setWindStoneVol(0.0f, 0);
@@ -328,8 +302,6 @@ s8 Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 stickValue, bool isHowl, f
     return checkLine();
 }
 
-/* 802CB100-802CB320 2C5A40 0220+00 0/0 1/1 0/0 .text
- * setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData          */
 void Z2WolfHowlMgr::setCorrectData(s8 curveID, Z2WolfHowlData* data) {
     if (curveID == mCorrectCurveID) {
         return;
@@ -405,8 +377,6 @@ void Z2WolfHowlMgr::setCorrectData(s8 curveID, Z2WolfHowlData* data) {
     mFullScore -= FAST_DIV(length, 4);
 }
 
-/* 802CB320-802CB370 2C5C60 0050+00 3/3 2/2 0/0 .text            getCorrectLine__13Z2WolfHowlMgrFUc
- */
 Z2WolfHowlLine Z2WolfHowlMgr::getCorrectLine(u8 lineIndex) {
     u16 local_18;
 
@@ -420,7 +390,6 @@ Z2WolfHowlLine Z2WolfHowlMgr::getCorrectLine(u8 lineIndex) {
     return mNowHowlData->lineData[lineIndex];
 }
 
-/* 802CB370-802CB38C 2C5CB0 001C+00 2/2 1/1 0/0 .text getCorrectLineNum__13Z2WolfHowlMgrFv */
 u8 Z2WolfHowlMgr::getCorrectLineNum() {
     if (mNowHowlData != NULL) {
         return mNowHowlData->lineNum;
@@ -429,7 +398,6 @@ u8 Z2WolfHowlMgr::getCorrectLineNum() {
     return 0;
 }
 
-/* 804341F8-8043421C 060F18 0024+00 2/2 0/0 0/0 .bss             sCorrectPhrase */
 static JAISoundID sCorrectPhrase[9] = {
     Z2BGM_HOWL_TOBIKUSA,
     Z2BGM_HOWL_UMAKUSA,
@@ -442,7 +410,6 @@ static JAISoundID sCorrectPhrase[9] = {
     Z2BGM_NEW_03_HOWL,
 };
 
-/* 8043421C-80434240 060F3C 0024+00 2/3 0/0 0/0 .bss             sWindStoneSound */
 static JAISoundID sWindStoneSound[9] = {
     0xFFFFFFFF,
     0xFFFFFFFF,
@@ -455,7 +422,6 @@ static JAISoundID sWindStoneSound[9] = {
     Z2BGM_NEW_03_STONE,
 };
 
-/* 80434240-80434268 060F60 0024+04 1/2 0/0 0/0 .bss             sCorrectDuo */
 static JAISoundID sCorrectDuo[9] = {
     0xFFFFFFFF,
     0xFFFFFFFF,
@@ -468,7 +434,6 @@ static JAISoundID sCorrectDuo[9] = {
     Z2BGM_NEW_03_DUO,
 };
 
-/* 802CB38C-802CB650 2C5CCC 02C4+00 1/1 0/0 0/0 .text            checkLine__13Z2WolfHowlMgrFv */
 s8 Z2WolfHowlMgr::checkLine() {
     if (mCorrectCurveID == Z2WOLFHOWL_NONE || mNowHowlData == NULL) {
         return -1;
@@ -540,7 +505,6 @@ s8 Z2WolfHowlMgr::checkLine() {
     return -1;
 }
 
-/* 802CB650-802CB6EC 2C5F90 009C+00 1/1 1/1 0/0 .text            getOnLineNum__13Z2WolfHowlMgrFv */
 s8 Z2WolfHowlMgr::getOnLineNum() {
     Z2WolfHowlLine line = getCorrectLine(mNowLineIndex);
     u8 type = line.type;
@@ -555,8 +519,6 @@ s8 Z2WolfHowlMgr::getOnLineNum() {
     return -1;
 }
 
-/* 802CB6EC-802CBA88 2C602C 039C+00 0/0 0/0 2/2 .text startWindStoneSound__13Z2WolfHowlMgrFScP3Vec
- */
 void Z2WolfHowlMgr::startWindStoneSound(s8 curveID, Vec* pos) {
     if (pos == NULL || Z2GetLink() == NULL || Z2GetLink()->getCurrentPos() == NULL) {
         return; 
@@ -592,8 +554,6 @@ void Z2WolfHowlMgr::startWindStoneSound(s8 curveID, Vec* pos) {
     }
 }
 
-/* 802CBA88-802CBB58 2C63C8 00D0+00 0/0 1/1 0/0 .text            startGuideMelody__13Z2WolfHowlMgrFb
- */
 int Z2WolfHowlMgr::startGuideMelody(bool startSound) {
     Z2GetSeqMgr()->setWindStoneVol(0.0f, 0);
 
@@ -610,8 +570,6 @@ int Z2WolfHowlMgr::startGuideMelody(bool startSound) {
     return 0;
 }
 
-/* 802CBB58-802CBB7C 2C6498 0024+00 0/0 1/1 0/0 .text            skipCorrectDemo__13Z2WolfHowlMgrFv
- */
 void Z2WolfHowlMgr::skipCorrectDemo() {
     Z2GetSeqMgr()->stopWolfHowlSong();
 }
diff --git a/src/amcstubs/AmcExi2Stubs.c b/src/amcstubs/AmcExi2Stubs.c
index 0053d2e54a..dcb3b944f7 100644
--- a/src/amcstubs/AmcExi2Stubs.c
+++ b/src/amcstubs/AmcExi2Stubs.c
@@ -5,34 +5,26 @@
 
 #include <dolphin/amc/AmcExi2Comm.h>
 
-/* 80372CFC-80372D00 36D63C 0004+00 0/0 1/1 0/0 .text            EXI2_Init */
 void EXI2_Init(vu8**, EXICallback) {}
 
-/* 80372D00-80372D04 36D640 0004+00 0/0 1/1 0/0 .text            EXI2_EnableInterrupts */
 void EXI2_EnableInterrupts(void) {}
 
-/* 80372D04-80372D0C 36D644 0008+00 0/0 2/2 0/0 .text            EXI2_Poll */
 int EXI2_Poll(void) {
     return 0;
 }
 
-/* 80372D0C-80372D14 36D64C 0008+00 0/0 2/2 0/0 .text            EXI2_ReadN */
 AmcExiError EXI2_ReadN(void*, u32) {
     return 0;
 }
 
-/* 80372D14-80372D1C 36D654 0008+00 0/0 1/1 0/0 .text            EXI2_WriteN */
 AmcExiError EXI2_WriteN(const void*, u32) {
     return 0;
 }
 
-/* 80372D1C-80372D20 36D65C 0004+00 0/0 1/1 0/0 .text            EXI2_Reserve */
 void EXI2_Reserve(void) {}
 
-/* 80372D20-80372D24 36D660 0004+00 0/0 1/1 0/0 .text            EXI2_Unreserve */
 void EXI2_Unreserve(void) {}
 
-/* 80372D24-80372D2C 36D664 0008+00 0/0 1/1 0/0 .text            AMC_IsStub */
 BOOL AMC_IsStub(void) {
     return TRUE;
 }
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index e24e99ad55..f95ac063b4 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -1,28 +1,18 @@
-//
-// Generated By: dol2asm
-// Translation Unit: c/c_damagereaction
-//
-
 #include "c/c_damagereaction.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* ############################################################################################## */
-/* 80450C98-80450C9C -00001 0004+00 0/0 0/0 50/50 .sbss            None */
 u8 cDmr_SkipInfo;
 u8 data_80450C99;
 u8 data_80450C9A;
 u8 data_80450C9B;
 
-/* 80450C9C-80450CA0 -00001 0004+00 0/0 0/0 6/6 .sbss            None */
 u8 data_80450C9C;
 u8 data_80450C9D;
 u8 data_80450C9E;
 u8 cDmr_FishingWether;
 
-/* 8001817C-800182A4 012ABC 0128+00 1/0 0/0 0/0 .text
- * execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
 void JPTraceParticleCallBack4::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     u32 age = param_1->getAge();
     if (age != 0) {
@@ -44,13 +34,10 @@ void JPTraceParticleCallBack4::execute(JPABaseEmitter* param_0, JPABaseParticle*
 }
 
 
-/* 800182A4-800182A8 012BE4 0004+00 1/0 0/0 0/0 .text
- * draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */
 void JPTraceParticleCallBack4::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     /* empty function */
 }
 
-/* 800182A8-80018328 012BE8 0080+00 0/0 0/0 22/22 .text            cDmrNowMidnaTalk__Fv */
 BOOL cDmrNowMidnaTalk() {
     if (dComIfGp_event_runCheck()) {
         fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass());
@@ -66,8 +53,6 @@ BOOL cDmrNowMidnaTalk() {
     return 0;
 }
 
-/* 80450CA0-80450CA4 0001A0 0004+00 0/0 0/0 2/2 .sbss            None */
 u8 data_80450CA0;
 
-/* 80450CA4-80450CA8 0001A4 0004+00 1/1 1/1 1/1 .sbss            JPTracePCB4 */
 JPTraceParticleCallBack4 JPTracePCB4;
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 1670a38d51..503219ae69 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -15,7 +15,6 @@
 #include "m_Do/m_Do_ext2.h"
 #endif
 
-/* 80374640-80375DE8 -00001 17A8+00 1/1 0/0 0/0 .rodata          DynamicNameTable */
 static DynamicNameTableEntry const DynamicNameTable[] = {
     {PROC_ALLDIE, "d_a_alldie"},
     {PROC_Obj_Swpush, "d_a_obj_swpush"},
@@ -799,16 +798,12 @@ static DynamicNameTableEntry const DynamicNameTable[] = {
     {0xFFFF, NULL},
 };
 
-/* 803F0F50-803F1BB0 01DC70 0C60+00 4/4 0/0 0/0 .bss             DMC */
 static DynamicModuleControlBase* DMC[PROC_MAX_NUM];
 
-/* 80450CA8-80450CAC 0001A8 0004+00 1/1 0/0 0/0 .sbss            None */
 static bool DMC_initialized;
 
-/* 80450CAC-80450CB0 0001AC 0004+00 2/2 0/0 0/0 .sbss            cDyl_Initialized */
 static BOOL cDyl_Initialized;
 
-/* 800183DC-80018544 012D1C 0168+00 1/1 0/0 0/0 .text            cCc_Init__Fv */
 int cCc_Init() {
     JUT_ASSERT(37, !DMC_initialized);
 
@@ -878,7 +873,6 @@ BOOL cDyl_IsInitialized() {
     return cDyl_Initialized;
 }
 
-/* 80018544-8001857C 012E84 0038+00 0/0 1/1 0/0 .text            cDyl_IsLinked__Fs */
 BOOL cDyl_IsLinked(s16 i_ProfName) {
     JUT_ASSERT(183, cDyl_Initialized);
     
@@ -894,7 +888,6 @@ BOOL cDyl_IsLinked(s16 i_ProfName) {
     return rt;
 }
 
-/* 8001857C-800185C0 012EBC 0044+00 1/1 1/1 0/0 .text            cDyl_Unlink__Fs */
 BOOL cDyl_Unlink(s16 i_ProfName) {
     #if DEBUG
     cCc_Check();
@@ -911,7 +904,6 @@ BOOL cDyl_Unlink(s16 i_ProfName) {
     return FALSE;
 }
 
-/* 800185C0-80018688 012F00 00C8+00 1/1 1/1 0/0 .text            cDyl_LinkASync__Fs */
 int cDyl_LinkASync(s16 i_ProfName) {
     #if DEBUG
     cCc_Check();
@@ -951,7 +943,6 @@ int cDyl_LinkASync(s16 i_ProfName) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80018688-80018764 012FC8 00DC+00 1/1 0/0 0/0 .text            cDyl_InitCallback__FPv */
 static int cDyl_InitCallback(void* param_0) {
     JUT_ASSERT(335, !cDyl_Initialized);
 
@@ -984,17 +975,14 @@ static int cDyl_InitCallback(void* param_0) {
     return 1;
 }
 
-/* 80450CB0-80450CB8 0001B0 0004+04 2/2 0/0 0/0 .sbss            cDyl_DVD */
 static mDoDvdThd_callback_c* cDyl_DVD;
 
-/* 80018764-80018798 0130A4 0034+00 0/0 1/1 0/0 .text            cDyl_InitAsync__Fv */
 void cDyl_InitAsync() {
     cCc_Init();
     JUT_ASSERT(367, cDyl_DVD == NULL);
     cDyl_DVD = mDoDvdThd_callback_c::create((mDoDvdThd_callback_func)cDyl_InitCallback, NULL);
 }
 
-/* 80018798-80018804 0130D8 006C+00 0/0 2/1 0/0 .text            cDyl_InitAsyncIsDone__Fv */
 BOOL cDyl_InitAsyncIsDone() {
     if (cDyl_DVD == NULL) {
         return TRUE;
@@ -1009,12 +997,10 @@ BOOL cDyl_InitAsyncIsDone() {
     return FALSE;
 }
 
-/* 80018804-8001880C 013144 0008+00 1/0 0/0 0/0 .text            phase_01__7cDylPhsFPv */
 int cDylPhs::phase_01(void* param_0) {
     return cPhs_NEXT_e;
 }
 
-/* 8001880C-80018844 01314C 0038+00 1/0 0/0 0/0 .text            phase_02__7cDylPhsFPs */
 int cDylPhs::phase_02(s16* p_profName) {
     int ret = cDyl_LinkASync(*p_profName);
     if (ret == cPhs_COMPLEATE_e) {
@@ -1024,13 +1010,10 @@ int cDylPhs::phase_02(s16* p_profName) {
     return ret;
 }
 
-/* 80018844-8001884C 013184 0008+00 1/0 0/0 0/0 .text            phase_03__7cDylPhsFPv */
 int cDylPhs::phase_03(void* param_0) {
     return cPhs_INIT_e;
 }
 
-/* 8001884C-80018890 01318C 0044+00 0/0 2/2 0/0 .text
- * Link__7cDylPhsFP30request_of_phase_process_classs            */
 int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) {
     static request_of_phase_process_fn l_method[3] = {
         (request_of_phase_process_fn)cDylPhs::phase_01, 
@@ -1045,8 +1028,6 @@ int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 i_ProfName) {
     return dComLbG_PhaseHandler(i_phase, l_method, &i_ProfName);
 }
 
-/* 80018890-800188DC 0131D0 004C+00 0/0 1/1 0/0 .text
- * Unlink__7cDylPhsFP30request_of_phase_process_classs          */
 int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 i_ProfName) {
     JUT_ASSERT(460, i_phase->id != cPhs_LOADING_e);
 
diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp
index dc8c98b55d..a969977cb1 100644
--- a/src/d/actor/d_a_L7demo_dr.cpp
+++ b/src/d/actor/d_a_L7demo_dr.cpp
@@ -13,8 +13,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_overlap_mng.h"
 
-/* 805A9238-805A92DC 000078 00A4+00 5/5 0/0 0/0 .text            setAction__6daDr_cFM6daDr_cFPCvPv_v
- */
 void daDr_c::setAction(daDr_c::actionFn i_action) {
     if (mAction != NULL) {
         field_0x654 = -1;
@@ -27,12 +25,10 @@ void daDr_c::setAction(daDr_c::actionFn i_action) {
     (this->*mAction)();
 }
 
-/* 805A92DC-805A9304 00011C 0028+00 1/1 0/0 0/0 .text            action__6daDr_cFv */
 void daDr_c::action() {
     (this->*mAction)();
 }
 
-/* 805A9304-805A93D4 000144 00D0+00 1/1 0/0 0/0 .text            mtx_set__6daDr_cFv */
 void daDr_c::mtx_set() {
     J3DModel* model = mpModelMorf->getModel();
 
@@ -49,7 +45,6 @@ void daDr_c::mtx_set() {
     eyePos = field_0x618;
 }
 
-/* 805A93D4-805A9458 000214 0084+00 1/1 0/0 0/0 .text            draw__6daDr_cFv */
 int daDr_c::draw() {
     if (mIsHide) {
         return 1;
@@ -63,12 +58,10 @@ int daDr_c::draw() {
     return 1;
 }
 
-/* 805A9458-805A9478 000298 0020+00 1/0 0/0 0/0 .text            daDr_Draw__FP6daDr_c */
 static int daDr_Draw(daDr_c* i_this) {
     return i_this->draw();
 }
 
-/* 805A9478-805A963C 0002B8 01C4+00 2/0 0/0 0/0 .text            wait__6daDr_cFv */
 void daDr_c::wait() {
     if (field_0x654 == 0) {
         mIsHide = TRUE;
@@ -99,7 +92,6 @@ void daDr_c::wait() {
     }
 }
 
-/* 805A963C-805A9914 00047C 02D8+00 1/0 0/0 0/0 .text            pl_walk__6daDr_cFv */
 void daDr_c::pl_walk() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera0 = dComIfGp_getCamera(0);
@@ -148,7 +140,6 @@ void daDr_c::pl_walk() {
     }
 }
 
-/* 805A9914-805A9A34 000754 0120+00 2/0 0/0 0/0 .text            pl_turn__6daDr_cFv */
 void daDr_c::pl_turn() {
     dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dComIfGp_getCamera(0);
@@ -175,7 +166,6 @@ void daDr_c::pl_turn() {
     }
 }
 
-/* 805A9A34-805A9D10 000874 02DC+00 1/0 0/0 0/0 .text            bridge_destroy__6daDr_cFv */
 void daDr_c::bridge_destroy() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera0 = dComIfGp_getCamera(0);
@@ -225,7 +215,6 @@ void daDr_c::bridge_destroy() {
     }
 }
 
-/* 805A9D10-805A9EE4 000B50 01D4+00 1/0 0/0 0/0 .text            bridge_destroy2__6daDr_cFv */
 void daDr_c::bridge_destroy2() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dComIfGp_getCamera(0);
@@ -269,7 +258,6 @@ void daDr_c::bridge_destroy2() {
     }
 }
 
-/* 805A9EE4-805A9FD4 000D24 00F0+00 1/1 0/0 0/0 .text            execute__6daDr_cFv */
 int daDr_c::execute() {
     if (mTimer != 0) {
         mTimer--;
@@ -292,17 +280,14 @@ int daDr_c::execute() {
     return 1;
 }
 
-/* 805A9FD4-805A9FF4 000E14 0020+00 2/1 0/0 0/0 .text            daDr_Execute__FP6daDr_c */
 static int daDr_Execute(daDr_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A9FF4-805A9FFC 000E34 0008+00 1/0 0/0 0/0 .text            daDr_IsDelete__FP6daDr_c */
 static int daDr_IsDelete(daDr_c* i_this) {
     return 1;
 }
 
-/* 805A9FFC-805AA064 000E3C 0068+00 1/1 0/0 0/0 .text            _delete__6daDr_cFv */
 int daDr_c::_delete() {
     fpc_ProcID id = fopAcM_GetID(this);
 
@@ -318,12 +303,10 @@ int daDr_c::_delete() {
     return 1;
 }
 
-/* 805AA064-805AA084 000EA4 0020+00 1/0 0/0 0/0 .text            daDr_Delete__FP6daDr_c */
 static int daDr_Delete(daDr_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805AA084-805AA17C 000EC4 00F8+00 1/1 0/0 0/0 .text            CreateHeap__6daDr_cFv */
 int daDr_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
     JUT_ASSERT(655, modelData != NULL);
@@ -336,13 +319,11 @@ int daDr_c::CreateHeap() {
     return 1;
 }
 
-/* 805AA17C-805AA19C 000FBC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daDr_c* a_this = (daDr_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 805AA19C-805AA224 000FDC 0088+00 1/1 0/0 0/0 .text            check_start__6daDr_cFv */
 BOOL daDr_c::check_start() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz player_pos;
@@ -359,7 +340,6 @@ BOOL daDr_c::check_start() {
     return FALSE;
 }
 
-/* 805AA224-805AA42C 001064 0208+00 1/1 0/0 0/0 .text            create__6daDr_cFv */
 int daDr_c::create() {
     fopAcM_ct(this, daDr_c);
 
@@ -415,12 +395,10 @@ int daDr_c::create() {
     return phase_state;
 }
 
-/* 805AA42C-805AA44C 00126C 0020+00 1/0 0/0 0/0 .text            daDr_Create__FP6daDr_c */
 static int daDr_Create(daDr_c* i_this) {
     return i_this->create();
 }
 
-/* 805AA524-805AA544 -00001 0020+00 1/0 0/0 0/0 .data            l_daDr_Method */
 static actor_method_class l_daDr_Method = {
     (process_method_func)daDr_Create,
     (process_method_func)daDr_Delete,
@@ -429,7 +407,6 @@ static actor_method_class l_daDr_Method = {
     (process_method_func)daDr_Draw,
 };
 
-/* 805AA544-805AA574 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DR */
 extern actor_process_profile_definition g_profile_DR = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp
index c7df44bfa9..f4d4868849 100644
--- a/src/d/actor/d_a_L7low_dr.cpp
+++ b/src/d/actor/d_a_L7low_dr.cpp
@@ -8,8 +8,6 @@
 #include "d/actor/d_a_L7low_dr.h"
 #include "d/d_com_inf_game.h"
 
-/* 805AA5F8-805AA69C 000078 00A4+00 1/1 0/0 0/0 .text
- * setAction__11daL7lowDr_cFM11daL7lowDr_cFPCvPv_v              */
 void daL7lowDr_c::setAction(daL7lowDr_c::actionFn i_action) {
     if (mAction != NULL) {
         field_0x63c = -1;
@@ -22,7 +20,6 @@ void daL7lowDr_c::setAction(daL7lowDr_c::actionFn i_action) {
     (this->*mAction)();
 }
 
-/* 805AA69C-805AA748 00011C 00AC+00 1/1 0/0 0/0 .text            action__11daL7lowDr_cFv */
 void daL7lowDr_c::action() {
     if (field_0x640 != 0) {
         field_0x640--;
@@ -38,7 +35,6 @@ void daL7lowDr_c::action() {
     eyePos = current.pos;
 }
 
-/* 805AA748-805AA798 0001C8 0050+00 1/1 0/0 0/0 .text            _delete__11daL7lowDr_cFv */
 int daL7lowDr_c::_delete() {
     dComIfG_resDelete(&mPhase, "L7lowDr");
 
@@ -49,13 +45,10 @@ int daL7lowDr_c::_delete() {
     return 1;
 }
 
-/* 805AA798-805AA7B8 000218 0020+00 1/0 0/0 0/0 .text            daL7lowDr_Delete__FP11daL7lowDr_c
- */
 static int daL7lowDr_Delete(daL7lowDr_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805AA7B8-805AA828 000238 0070+00 1/1 0/0 0/0 .text            mtx_set__11daL7lowDr_cFv */
 void daL7lowDr_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -67,7 +60,6 @@ void daL7lowDr_c::mtx_set() {
     mpModelMorf->modelCalc();
 }
 
-/* 805AA828-805AABF8 0002A8 03D0+00 1/0 0/0 0/0 .text            fly__11daL7lowDr_cFv */
 void daL7lowDr_c::fly() {
     if (field_0x63c == 0) {
         s16 var_r28 = cM_rndFX(32768.0f);
@@ -115,25 +107,20 @@ void daL7lowDr_c::fly() {
     }
 }
 
-/* 805AABF8-805AAC1C 000678 0024+00 1/1 0/0 0/0 .text            execute__11daL7lowDr_cFv */
 int daL7lowDr_c::execute() {
     action();
     return 1;
 }
 
-/* 805AAC1C-805AAC3C 00069C 0020+00 2/1 0/0 0/0 .text            daL7lowDr_Execute__FP11daL7lowDr_c
- */
 static int daL7lowDr_Execute(daL7lowDr_c* i_this) {
     return i_this->execute();
 }
 
-/* 805AAC3C-805AAC5C 0006BC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daL7lowDr_c* a_this = (daL7lowDr_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text            CreateHeap__11daL7lowDr_cFv */
 int daL7lowDr_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
     JUT_ASSERT(244, modelData != NULL);
@@ -147,7 +134,6 @@ int daL7lowDr_c::CreateHeap() {
     return 1;
 }
 
-/* 805AAD58-805AAE88 0007D8 0130+00 1/1 0/0 0/0 .text            create__11daL7lowDr_cFv */
 int daL7lowDr_c::create() {
     fopAcM_ct(this, daL7lowDr_c);
 
@@ -177,13 +163,10 @@ int daL7lowDr_c::create() {
     return phase_state;
 }
 
-/* 805AAE88-805AAEA8 000908 0020+00 1/0 0/0 0/0 .text            daL7lowDr_Create__FP11daL7lowDr_c
- */
 static int daL7lowDr_Create(daL7lowDr_c* i_this) {
     return i_this->create();
 }
 
-/* 805AAEA8-805AAF44 000928 009C+00 1/1 0/0 0/0 .text            draw__11daL7lowDr_cFv */
 int daL7lowDr_c::draw() {
          /* dSv_event_flag_c::F_0510 - City in the Sky - Watched City in the Sky start cutscene */
     if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[510])) {
@@ -198,18 +181,14 @@ int daL7lowDr_c::draw() {
     return 1;
 }
 
-/* 805AAF44-805AAF64 0009C4 0020+00 1/0 0/0 0/0 .text            daL7lowDr_Draw__FP11daL7lowDr_c */
 static int daL7lowDr_Draw(daL7lowDr_c* i_this) {
     return i_this->draw();
 }
 
-/* 805AAF64-805AAF6C 0009E4 0008+00 1/0 0/0 0/0 .text            daL7lowDr_IsDelete__FP11daL7lowDr_c
- */
 static int daL7lowDr_IsDelete(daL7lowDr_c* i_this) {
     return 1;
 }
 
-/* 805AAFC4-805AAFE4 -00001 0020+00 1/0 0/0 0/0 .data            l_daL7lowDr_Method */
 static actor_method_class l_daL7lowDr_Method = {
     (process_method_func)daL7lowDr_Create,
     (process_method_func)daL7lowDr_Delete,
@@ -218,7 +197,6 @@ static actor_method_class l_daL7lowDr_Method = {
     (process_method_func)daL7lowDr_Draw,
 };
 
-/* 805AAFE4-805AB014 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L7lowDr */
 extern actor_process_profile_definition g_profile_L7lowDr = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp
index 7c0380f45b..2a94a9a9f3 100644
--- a/src/d/actor/d_a_L7op_demo_dr.cpp
+++ b/src/d/actor/d_a_L7op_demo_dr.cpp
@@ -13,7 +13,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 805AB098-805AB13C 000078 00A4+00 2/2 0/0 0/0 .text setAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v */
 void daL7ODR_c::setAction(daL7ODR_c::actionFn i_action) {
     if (mAction != NULL) {
         field_0x888 = -1;
@@ -26,13 +25,10 @@ void daL7ODR_c::setAction(daL7ODR_c::actionFn i_action) {
     (this->*mAction)();
 }
 
-/* 805AB13C-805AB164 00011C 0028+00 1/1 0/0 0/0 .text            action__9daL7ODR_cFv */
 void daL7ODR_c::action() {
     (this->*mAction)();
 }
 
-/* 805AB164-805AB208 000144 00A4+00 2/2 0/0 0/0 .text setDrAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v
- */
 void daL7ODR_c::setDrAction(daL7ODR_c::actionFn i_action) {
     if (mDrAction != NULL) {
         field_0x88c = -1;
@@ -45,12 +41,10 @@ void daL7ODR_c::setDrAction(daL7ODR_c::actionFn i_action) {
     (this->*mDrAction)();
 }
 
-/* 805AB208-805AB230 0001E8 0028+00 1/1 0/0 0/0 .text            dr_action__9daL7ODR_cFv */
 void daL7ODR_c::dr_action() {
     (this->*mDrAction)();
 }
 
-/* 805AB230-805AB2E8 000210 00B8+00 1/1 0/0 0/0 .text            mtx_set__9daL7ODR_cFv */
 void daL7ODR_c::mtx_set() {
     J3DModel* model = mpModelMorf->getModel();
 
@@ -66,7 +60,6 @@ void daL7ODR_c::mtx_set() {
     fopAcM_SetMtx(this, model->getBaseTRMtx());
 }
 
-/* 805AB2E8-805AB3D0 0002C8 00E8+00 1/1 0/0 0/0 .text            draw__9daL7ODR_cFv */
 int daL7ODR_c::draw() {
     if (field_0x8b4) {
         return 1;
@@ -84,12 +77,10 @@ int daL7ODR_c::draw() {
     return 1;
 }
 
-/* 805AB3D0-805AB3F0 0003B0 0020+00 1/0 0/0 0/0 .text            daL7ODR_Draw__FP9daL7ODR_c */
 static int daL7ODR_Draw(daL7ODR_c* i_this) {
     return i_this->draw();
 }
 
-/* 805AB3F0-805AB520 0003D0 0130+00 1/0 0/0 0/0 .text            wait__9daL7ODR_cFv */
 void daL7ODR_c::wait() {
     if (field_0x888 == 0) {
         field_0x888++;
@@ -114,7 +105,6 @@ void daL7ODR_c::wait() {
     }
 }
 
-/* 805AB520-805ABC2C 000500 070C+00 1/0 0/0 0/0 .text            pl_walk__9daL7ODR_cFv */
 void daL7ODR_c::pl_walk() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera0 = dComIfGp_getCamera(0);
@@ -241,8 +231,6 @@ void daL7ODR_c::pl_walk() {
     }
 }
 
-/* 805ABC2C-805ABCF8 000C0C 00CC+00 1/1 0/0 0/0 .text setZoomOutCamPos__9daL7ODR_cFR4cXyzR4cXyzf
- */
 void daL7ODR_c::setZoomOutCamPos(cXyz& param_0, cXyz& param_1, f32 param_2) {
     csXyz spC;
     spC.x = -cLib_targetAngleX(&param_1, &param_0);
@@ -256,7 +244,6 @@ void daL7ODR_c::setZoomOutCamPos(cXyz& param_0, cXyz& param_1, f32 param_2) {
     mDoMtx_stack_c::multVecZero(&param_0);
 }
 
-/* 805ABCF8-805ABE0C 000CD8 0114+00 1/0 0/0 0/0 .text            dr_wait__9daL7ODR_cFv */
 void daL7ODR_c::dr_wait() {
     if (field_0x88c == 0) {
         cXyz sp8(0.0f, 0.0f, 0.0f);
@@ -276,7 +263,6 @@ void daL7ODR_c::dr_wait() {
     }
 }
 
-/* 805ABE0C-805AD7B4 000DEC 19A8+00 2/0 0/0 0/0 .text            dr_fly__9daL7ODR_cFv */
 void daL7ODR_c::dr_fly() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera0 = dComIfGp_getCamera(0);
@@ -723,7 +709,6 @@ void daL7ODR_c::dr_fly() {
     }
 }
 
-/* 805AD7B4-805AD854 002794 00A0+00 1/1 0/0 0/0 .text            execute__9daL7ODR_cFv */
 int daL7ODR_c::execute() {
     if (field_0x8b5 != 0) {
         field_0x8b5--;
@@ -741,17 +726,14 @@ int daL7ODR_c::execute() {
     return 1;
 }
 
-/* 805AD854-805AD874 002834 0020+00 2/1 0/0 0/0 .text            daL7ODR_Execute__FP9daL7ODR_c */
 static int daL7ODR_Execute(daL7ODR_c* i_this) {
     return i_this->execute();
 }
 
-/* 805AD874-805AD87C 002854 0008+00 1/0 0/0 0/0 .text            daL7ODR_IsDelete__FP9daL7ODR_c */
 static int daL7ODR_IsDelete(daL7ODR_c* i_this) {
     return 1;
 }
 
-/* 805AD87C-805AD8EC 00285C 0070+00 1/1 0/0 0/0 .text            _delete__9daL7ODR_cFv */
 int daL7ODR_c::_delete() {
     fopAcM_GetID(this);
     dComIfG_resDelete(&mPhase, "B_dr");
@@ -767,12 +749,10 @@ int daL7ODR_c::_delete() {
     return 1;
 }
 
-/* 805AD8EC-805AD90C 0028CC 0020+00 1/0 0/0 0/0 .text            daL7ODR_Delete__FP9daL7ODR_c */
 static int daL7ODR_Delete(daL7ODR_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805AD90C-805ADA0C 0028EC 0100+00 1/1 0/0 0/0 .text            CreateHeap__9daL7ODR_cFv */
 int daL7ODR_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
     JUT_ASSERT(1146, modelData != NULL);
@@ -785,13 +765,11 @@ int daL7ODR_c::CreateHeap() {
     return 1;
 }
 
-/* 805ADA0C-805ADA2C 0029EC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daL7ODR_c* a_this = (daL7ODR_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 805ADA2C-805ADAC0 002A0C 0094+00 1/1 0/0 0/0 .text            check_start__9daL7ODR_cFv */
 BOOL daL7ODR_c::check_start() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz player_pos;
@@ -804,7 +782,6 @@ BOOL daL7ODR_c::check_start() {
     return FALSE;
 }
 
-/* 805ADAC0-805ADCD8 002AA0 0218+00 1/1 0/0 0/0 .text            create__9daL7ODR_cFv */
 int daL7ODR_c::create() {
     fopAcM_ct(this, daL7ODR_c);
     field_0x8b7 = 0;
@@ -850,12 +827,10 @@ int daL7ODR_c::create() {
     return phase_state;
 }
 
-/* 805ADD48-805ADD68 002D28 0020+00 1/0 0/0 0/0 .text            daL7ODR_Create__FP9daL7ODR_c */
 static int daL7ODR_Create(daL7ODR_c* i_this) {
     return i_this->create();
 }
 
-/* 805AE0F4-805AE114 -00001 0020+00 1/0 0/0 0/0 .data            l_daL7ODR_Method */
 static actor_method_class l_daL7ODR_Method = {
     (process_method_func)daL7ODR_Create,
     (process_method_func)daL7ODR_Delete,
@@ -864,7 +839,6 @@ static actor_method_class l_daL7ODR_Method = {
     (process_method_func)daL7ODR_Draw,
 };
 
-/* 805AE114-805AE144 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L7ODR */
 extern actor_process_profile_definition g_profile_L7ODR = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp
index bae3146912..0b5e6371bd 100644
--- a/src/d/actor/d_a_alink.cpp
+++ b/src/d/actor/d_a_alink.cpp
@@ -14,7 +14,6 @@
 #include "d/d_item.h"
 #include "d/d_meter2_draw.h"
 #include "d/d_pane_class.h"
-#include "dol2asm.h"
 #include "d/d_demo.h"
 #include "d/actor/d_a_crod.h"
 #include "d/actor/d_a_mg_rod.h"
@@ -49,115 +48,82 @@
 
 static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data);
 
-/* 8009D87C-8009D884 0981BC 0008+00 0/0 1/1 0/0 .text            getE3Zhint__9daAlink_cFv */
 BOOL daAlink_c::getE3Zhint() {
     return false;
 }
 
 #include "d/actor/d_a_alink_HIO.inc"
 
-/* 80452C50-80452C58 001250 0005+03 2/2 0/0 0/0 .sdata2          l_wArcName */
 static const char l_wArcName[] = "Wmdl";
 
-/* 80452C58-80452C60 001258 0005+03 2/2 0/0 0/0 .sdata2          l_bArcName */
 static const char l_bArcName[] = "Bmdl";
 
-/* 80452C60-80452C68 001260 0005+03 2/2 0/0 0/0 .sdata2          l_kArcName */
 static const char l_kArcName[] = "Kmdl";
 
-/* 80452C68-80452C70 001268 0005+03 2/2 0/0 0/0 .sdata2          l_zArcName */
 static const char l_zArcName[] = "Zmdl";
 
-/* 80452C70-80452C78 001270 0005+03 3/3 0/0 0/0 .sdata2          l_mArcName */
 static const char l_mArcName[] = "Mmdl";
 
-/* 80452C78-80452C80 001278 0006+02 1/1 0/0 0/0 .sdata2          l_hyShdArcName */
 static const char l_hyShdArcName[] = "HyShd";
 
-/* 80452C80-80452C88 001280 0006+02 1/1 0/0 0/0 .sdata2          l_cWShdArcName */
 static const char l_cWShdArcName[] = "CWShd";
 
-/* 80452C88-80452C90 001288 0006+02 1/1 0/0 0/0 .sdata2          l_sWShdArcName */
 static const char l_sWShdArcName[] = "SWShd";
 
-/* 80452C90-80452C98 001290 0006+02 7/7 0/0 0/0 .sdata2          l_arcName */
 static const char l_arcName[] = "Alink";
 
-/* 8009D884-8009D88C 0981C4 0008+00 0/0 0/0 13/13 .text            getAlinkArcName__9daAlink_cFv */
 const char* daAlink_c::getAlinkArcName() {
     return l_arcName;
 }
 
-/* 8009D88C-8009D8B8 0981CC 002C+00 1/1 0/0 0/0 .text
- * daAlink_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daAlink_tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2,
                                   dCcD_GObjInf* param_3) {
     static_cast<daAlink_c*>(param_0)->tgHitCallback(param_2, param_1, param_3);
 }
 
-/* 8009D8B8-8009D8E4 0981F8 002C+00 1/1 0/0 0/0 .text
- * daAlink_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daAlink_coHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2,
                                   dCcD_GObjInf* param_3) {
     static_cast<daAlink_c*>(param_0)->coHitCallback(param_2, param_1);
 }
 
-/* 80425514-80425520 052234 000C+00 32/35 0/0 0/0 .bss             l_waitBaseAnime */
 static cXyz l_waitBaseAnime(1.24279f, 102.00054f, 5.0f);
 
-/* 8042552C-80425538 05224C 000C+00 2/3 0/0 0/0 .bss             l_ironBallBaseAnime */
 static cXyz l_ironBallBaseAnime(-4.248938f, 89.0f, -5.267045f);
 
-/* 80425544-80425550 052264 000C+00 15/17 0/0 0/0 .bss             l_halfAtnWaitBaseAnime */
 static cXyz l_halfAtnWaitBaseAnime(3.5f, 97.0f, -7.0f);
 
-/* 8042555C-80425568 05227C 000C+00 1/2 0/0 0/0 .bss             l_rWaitBaseAnime */
 static cXyz l_rWaitBaseAnime(4.313951f, 93.94436f, -5.207283f);
 
-/* 80425574-80425580 052294 000C+00 0/1 0/0 0/0 .bss             l_lWaitBaseAnime */
 static cXyz l_lWaitBaseAnime(-4.300988f, 93.95595f, -5.218504f);
 
-/* 8042558C-80425598 0522AC 000C+00 3/5 0/0 0/0 .bss             l_horseBaseAnime */
 static cXyz l_horseBaseAnime(-l_waitBaseAnime.x, 225.7f, 1.81f - l_waitBaseAnime.z);
 
-/* 804255A4-804255B0 0522C4 000C+00 3/5 0/0 0/0 .bss             l_boarBaseAnime */
 static cXyz l_boarBaseAnime(-l_waitBaseAnime.x, 186.17f, -20.29f - l_waitBaseAnime.z);
 
-/* 804255BC-804255C8 0522DC 000C+00 1/3 0/0 0/0 .bss             l_localHorseRidePos */
 static cXyz l_localHorseRidePos(-68.208984f, 41.609924f, 0.883789f);
 
-/* 804255D4-804255E0 0522F4 000C+00 1/3 0/0 0/0 .bss             l_localBoarRidePos */
 static cXyz l_localBoarRidePos(0.0f, 15.0f, 0.0f);
 
-/* 804255EC-804255F8 05230C 000C+00 2/3 0/0 0/0 .bss             l_canoeBaseAnime */
 static cXyz l_canoeBaseAnime(1.24279f - l_waitBaseAnime.x, 56.0f, -72.0f - l_waitBaseAnime.z);
 
-/* 80425604-80425610 052324 000C+00 0/1 0/0 0/0 .bss             l_sumouBaseAnimeSp */
 static cXyz l_sumouBaseAnimeSp(0.0f, 0.0f, 32.0f - l_waitBaseAnime.z);
 
-/* 8042561C-80425628 05233C 000C+00 37/39 0/0 0/0 .bss             l_wolfBaseAnime */
 static cXyz l_wolfBaseAnime(1.0f, 88.63934f, -28.497932f);
 
-/* 80425634-80425640 052354 000C+00 2/3 0/0 0/0 .bss             l_wolfRopeBaseAnime */
 static cXyz l_wolfRopeBaseAnime(0.115164f, 68.336296f, -7.667817f);
 
-/* 8038D658-8038D664 019CB8 000C+00 69/69 0/0 0/0 .rodata          @3757 */
 static u8 const lit_3757[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 #include "d/actor/d_a_alink_HIO_data.inc"
 
-/* 8038FA10-8038FA20 01C070 0010+00 0/0 0/0 0/0 .rodata          l_worldChangeEventName */
 static char const l_worldChangeEventName[16] = "WORLD_CHANGE_IN";
 
-/* 8038FA20-8038FA38 01C080 0015+03 0/0 0/0 0/0 .rodata          l_wolfWorldChangeEventName */
 static char const l_wolfWorldChangeEventName[21] = "WOLF_WORLD_CHANGE_IN";
 
-/* 8038FA38-8038FA48 01C098 0010+00 0/1 0/0 0/0 .rodata          l_defaultGetEventName */
 static char const l_defaultGetEventName[16] = "DEFAULT_GETITEM";
 
-/* 803AF99C-803AF9A8 00CABC 000A+02 2/2 0/0 0/0 .data            l_peepEventName */
 static char l_peepEventName[10] = "PEEP_HOLE";
 
 daAlink_procInitTable daAlink_c::m_procInitTable[] = {
@@ -515,7 +481,6 @@ daAlink_procInitTable daAlink_c::m_procInitTable[] = {
     { &daAlink_c::procDemoCommon, 0x1 },
 };
 
-/* 803B22E0-803B2754 00F400 0474+00 1/2 0/0 0/0 .data            m_demoInitTable__9daAlink_c */
 daAlink_procFunc daAlink_c::m_demoInitTable[] = {
     NULL,
     NULL,
@@ -614,76 +579,52 @@ daAlink_procFunc daAlink_c::m_demoInitTable[] = {
     NULL,
 };
 
-/* 8038FA48-8038FA54 01C0A8 000C+00 0/0 0/0 0/0 .rodata          l_crawlStartFrontOffset */
 static f32 const l_crawlStartFrontOffset[3] = {0.0f, 30.0f, 112.0f};
 
-/* 8038FA54-8038FA60 01C0B4 000C+00 1/2 0/0 0/0 .rodata          l_crawlFrontOffset */
 static Vec const l_crawlFrontOffset = {0.0f, 30.0f, 80.0f};
 
-/* 8038FA60-8038FA6C 01C0C0 000C+00 0/1 0/0 0/0 .rodata          l_crawlBackOffset */
 static Vec const l_crawlBackOffset = {0.0f, 30.0f, -30.0f};
 
-/* 8038FA6C-8038FA78 01C0CC 000C+00 1/1 0/0 0/0 .rodata          l_crawlTopOffset */
 static Vec const l_crawlTopOffset = {0.0f, 30.0f, 0.0f};
 
-/* 8038FA78-8038FA84 01C0D8 000C+00 1/2 0/0 0/0 .rodata          l_crawlFrontUpOffset */
 static Vec const l_crawlFrontUpOffset = {0.0f, 80.0f, 80.0f};
 
-/* 8038FA84-8038FA90 01C0E4 000C+00 0/1 0/0 0/0 .rodata          l_wolfLieFrontUpOffset */
 static Vec const l_wolfLieFrontUpOffset = {0.0f, 75.0f, 100.0f};
 
-/* 8038FA90-8038FA9C 01C0F0 000C+00 1/2 0/0 0/0 .rodata          l_crawlBackUpOffset */
 static Vec const l_crawlBackUpOffset = {0.0f, 80.0f, -30.0f};
 
-/* 8038FA9C-8038FAA8 01C0FC 000C+00 0/1 0/0 0/0 .rodata          l_wolfLieBackUpOffset */
 static Vec const l_wolfLieBackUpOffset = {0.0f, 75.0f, -70.0f};
 
-/* 8038FAA8-8038FAB4 01C108 000C+00 0/1 0/0 0/0 .rodata          l_crawlStandUpOffset */
 static Vec const l_crawlStandUpOffset = {0.0f, 80.0f, -30.0f};
 
-/* 8038FAB4-8038FAC0 01C114 000C+00 0/1 0/0 0/0 .rodata          l_wolfLieStandUpOffset */
 static Vec const l_wolfLieStandUpOffset = {0.0f, 80.0f, -70.0f};
 
-/* 8038FAC0-8038FACC 01C120 000C+00 1/2 0/0 0/0 .rodata          l_crawlTopUpOffset */
 static Vec const l_crawlTopUpOffset = {0.0f, 80.0f, 0.0f};
 
-/* 8038FACC-8038FAD8 01C12C 000C+00 0/1 0/0 0/0 .rodata          l_wolfLieTopUpOffset */
 static Vec const l_wolfLieTopUpOffset = {0.0f, 75.0f, 0.0f};
 
-/* 8038FAD8-8038FAE4 01C138 000C+00 0/1 0/0 0/0 .rodata          l_crawlSideOffset */
 static Vec const l_crawlSideOffset = {55.0f, 80.0f, 0.0f};
 
-/* 8038FAE4-8038FAF0 01C144 000C+00 0/1 0/0 0/0 .rodata          l_wolfLieSideOffset */
 static Vec const l_wolfLieSideOffset = {55.0f, 75.0f, 0.0f};
 
-/* 8038FAF0-8038FAFC 01C150 000C+00 0/1 0/0 0/0 .rodata          l_crawlLSideOffset */
 static Vec const l_crawlLSideOffset = {55.0f, 0.0f, 0.0f};
 
-/* 8038FAFC-8038FB08 01C15C 000C+00 0/1 0/0 0/0 .rodata          l_crawlRSideOffset */
 static Vec const l_crawlRSideOffset = {-55.0f, 0.0f, 0.0f};
 
-/* 8038FB08-8038FB14 01C168 000C+00 0/1 0/0 0/0 .rodata          l_crawlLSideFrontOffset */
 static Vec const l_crawlLSideFrontOffset = {55.0f, 5.0f, 80.0f};
 
-/* 8038FB14-8038FB20 01C174 000C+00 0/1 0/0 0/0 .rodata          l_crawlRSideFrontOffset */
 static Vec const l_crawlRSideFrontOffset = {-55.0f, 5.0f, 80.0f};
 
-/* 8038FB20-8038FB2C 01C180 000C+00 0/2 0/0 0/0 .rodata          l_crawlMinSideOffset */
 static Vec const l_crawlMinSideOffset = {35.0f, 0.0f, 0.0f};
 
-/* 8038FB2C-8038FB38 01C18C 000C+00 0/2 0/0 0/0 .rodata          l_swordTopLocalN */
 static Vec const l_swordTopLocalN = {100.0f, 0.0f, 0.0f};
 
-/* 8038FB38-8038FB44 01C198 000C+00 0/2 0/0 0/0 .rodata          l_swordTopLocalM */
 static Vec const l_swordTopLocalM = {120.0f, 0.0f, 0.0f};
 
-/* 8038FB44-8038FB50 01C1A4 000C+00 1/2 0/0 0/0 .rodata          l_ironBallChainVec */
 static const Vec l_ironBallChainVec = {0.0f, 0.0f, 10.0f};
 
-/* 8038FB50-8038FB5C 01C1B0 000C+00 1/2 0/0 0/0 .rodata          l_ironBallCenterVec */
 static Vec const l_ironBallCenterVec = {0.0f, 0.0f, 42.0f};
 
-/* 8038FB5C-8038FBBC 01C1BC 0060+00 1/2 0/0 0/0 .rodata          l_wolfFootOnFrame */
 static f32 const l_wolfFootOnFrame[6][4] = {
     {0.0f, 16.0f, 19.0f, 6.0f},
     {10.0f, 12.0f, 7.0f, 3.0f},
@@ -693,7 +634,6 @@ static f32 const l_wolfFootOnFrame[6][4] = {
     {56.0f, 0.0f, 44.0f, 58.0f},
 };
 
-/* 8038FBBC-8038FBD4 01C21C 0018+00 1/1 0/0 0/0 .rodata          l_insectNameList */
 static s16 const l_insectNameList[12] = {
     PROC_Obj_Kabuto, PROC_Obj_Cho, PROC_Obj_Kuw, PROC_Obj_Batta, PROC_Obj_Nan, PROC_Obj_Dan,
     PROC_Obj_Kam,    PROC_Obj_Ten, PROC_Obj_Kat, PROC_Obj_Tombo, PROC_Obj_Ari, PROC_Obj_Kag,
@@ -703,7 +643,6 @@ static s16 const l_insectNameList[12] = {
 f32 l_jumpTop;
 #endif
 
-/* 8038FBD4-8038FC24 01C234 0050+00 0/1 0/0 0/0 .rodata          m_mainBckShield__9daAlink_c */
 daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
     {0x0025, 0x0025}, {0x0023, 0x0023}, {0x0012, 0x001B}, {0x0010, 0x001B}, {0x0021, 0x0021},
     {0x001E, 0x001E}, {0x003C, 0x003C}, {0x002C, 0x002C}, {0x003E, 0x003E}, {0x002E, 0x002E},
@@ -711,12 +650,10 @@ daAlink_BckData const daAlink_c::m_mainBckShield[20] = {
     {0x0020, 0x001B}, {0x001B, 0x001B}, {0x0026, 0x0026}, {0x0277, 0x001B}, {0x00CD, 0x001B},
 };
 
-/* 8038FC24-8038FC38 01C284 0014+00 0/1 0/0 0/0 .rodata          m_mainBckSword__9daAlink_c */
 daAlink_BckData const daAlink_c::m_mainBckSword[5] = {
     {0x001A, 0x001A}, {0x001C, 0x001C}, {0x0277, 0x0277}, {0x00CD, 0x00CD}, {0x0243, 0x0244},
 };
 
-/* 8038FC38-8038FCA8 01C298 0070+00 0/1 0/0 0/0 .rodata          m_mainBckFishing__9daAlink_c */
 daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
     {0x0025, 0x0273}, {0x0023, 0x00C8}, {0x0012, 0x0273}, {0x0010, 0x00C8}, {0x0021, 0x0273},
     {0x001E, 0x00C8}, {0x003C, 0x0273}, {0x002C, 0x0273}, {0x003E, 0x0273}, {0x002E, 0x0273},
@@ -726,7 +663,6 @@ daAlink_BckData const daAlink_c::m_mainBckFishing[28] = {
     {0x026A, 0x0273}, {0x0256, 0x0273}, {0x0257, 0x0273},
 };
 
-/* 8038FCA8-80391010 01C308 1368+00 3/4 0/0 0/0 .rodata          m_anmDataTable__9daAlink_c */
 daAlink_AnmData const daAlink_c::m_anmDataTable[414] = {
     {37, 36, 254, 254, 0, 232, 0},
     {35, 34, 254, 254, 0, 232, 0},
@@ -1144,7 +1080,6 @@ daAlink_AnmData const daAlink_c::m_anmDataTable[414] = {
     {11, 11, 254, 254, 137, 231, 0},
 };
 
-/* 80391010-803914A8 -00001 0498+00 4/4 0/0 0/0 .rodata          m_wlAnmDataTable__9daAlink_c */
 daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[147] = {
     {767, 0, 1, 2600, 255, 255},      {778, 0, 2, 270, 255, 255},
     {779, 0, 2, 270, 255, 255},       {692, 0, 12, 65535, 255, 255},
@@ -1222,7 +1157,6 @@ daAlink_WlAnmData const daAlink_c::m_wlAnmDataTable[147] = {
     {32811, 12, 12, 65535, 255, 255},
 };
 
-/* 803914A8-80391734 01DB08 028C+00 2/2 0/0 0/0 .rodata          m_faceTexDataTable__9daAlink_c */
 daAlink_FaceTexData const daAlink_c::m_faceTexDataTable[] = {
     0x03DF, 0x0379, 0x03E0, 0x037A, 0x03E1, 0x037B, 0x03DF, 0x0378, 0x03DF, 0x0383, 0x03E2, 0x032C,
     0x03C6, 0x036A, 0x03D5, 0x036B, 0x03B0, 0x032D, 0x03B1, 0x032E, 0x03E6, 0x0382, 0x03E5, 0x0381,
@@ -1274,10 +1208,8 @@ static const Vec lit_5908 = { 0.0f, 0.0f, 0.0f };
 
 #include "d/actor/d_a_alink_bomb.inc"
 
-/* 80450690-80450694 000110 0004+00 20/20 0/0 0/0 .sdata           l_autoUpHeight */
 static f32 l_autoUpHeight = 30.010000228881836f;
 
-/* 80450694-80450698 000114 0004+00 12/12 0/0 0/0 .sdata           l_autoDownHeight */
 static f32 l_autoDownHeight = -30.010000228881836f;
 
 #include "d/actor/d_a_alink_grab.inc"
@@ -1290,7 +1222,6 @@ static f32 l_autoDownHeight = -30.010000228881836f;
 
 #include "d/actor/d_a_alink_crawl.inc"
 
-/* 80450698-8045069C 000118 0004+00 4/4 0/0 0/0 .sdata           l_ladderAnmBaseTransY */
 static f32 l_ladderAnmBaseTransY = 102.00054168701172f;
 
 #include "d/actor/d_a_alink_hang.inc"
@@ -1309,7 +1240,6 @@ static f32 l_ladderAnmBaseTransY = 102.00054168701172f;
 
 #include "d/actor/d_a_alink_whistle.inc"
 
-/* 803B2754-803B2798 00F874 0044+00 0/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0, {{AT_TYPE_WOLF_ATTACK, 3, 0x1A}, {0xD8FFFDFF, 5}, 0x73}},
@@ -1324,7 +1254,6 @@ static dCcD_SrcCyl l_cylSrc = {
     },
 };
 
-/* 803B2798-803B27D8 00F8B8 0040+00 1/2 0/0 0/0 .data            l_sphSrc */
 static dCcD_SrcSph l_sphSrc = {
     {
         {0, {{AT_TYPE_NORMAL_SWORD, 3, 0x1A}, {0xD8FBFDFF, 5}, 0x73}},
@@ -1338,7 +1267,6 @@ static dCcD_SrcSph l_sphSrc = {
     }},
 };
 
-/* 803B27D8-803B281C 00F8F8 0044+00 0/1 0/0 0/0 .data            l_atCylSrc */
 static dCcD_SrcCyl l_atCylSrc = {
     {
         {0, {{AT_TYPE_NORMAL_SWORD, 2, 0x1B}, {0, 0}, 0}},
@@ -1353,7 +1281,6 @@ static dCcD_SrcCyl l_atCylSrc = {
     },
 };
 
-/* 803B281C-803B2868 00F93C 004C+00 0/1 0/0 0/0 .data            l_atCpsSrc */
 static dCcD_SrcCps l_atCpsSrc = {
     {
         {0, {{AT_TYPE_NORMAL_SWORD, 1, 0x1B}, {0, 0}, 0}},
@@ -1368,92 +1295,76 @@ static dCcD_SrcCps l_atCpsSrc = {
     }},
 };
 
-/* 803B2868-803B2880 00F988 0018+00 1/0 0/0 0/0 .data            l_jntColPos0 */
 static Vec l_jntColPos0[] = {
     {0.0f, 0.0f, 0.0f},
     {44.0f, 0.0f, 0.0f}
 };
 
-/* 803B2880-803B288C 00F9A0 000C+00 1/0 0/0 0/0 .data            l_jntColPos1 */
 static Vec l_jntColPos1 = {
     0.0f, -10.0f, 0.0f
 };
 
-/* 803B288C-803B28A4 00F9AC 0018+00 1/0 0/0 0/0 .data            l_jntColPos2 */
 static Vec l_jntColPos2[] = {
     {-5.0f, 0.0f, 0.0f},
     {28.0f, 0.0f, 0.0f}
 };
 
-/* 803B28A4-803B28BC 00F9C4 0018+00 1/0 0/0 0/0 .data            l_jntColPos4 */
 static Vec l_jntColPos4[] = {
     {-4.0f, 0.0f, 0.0f},
     {28.0f, 0.0f, 0.0f}
 };
 
-/* 803B28BC-803B28C8 00F9DC 000C+00 1/0 0/0 0/0 .data            l_jntColPos6 */
 static Vec l_jntColPos6 = { 8.0f, 0.0f, 0.0f };
 
-/* 803B28C8-803B28E0 00F9E8 0018+00 1/0 0/0 0/0 .data            l_jntColPos8 */
 static Vec l_jntColPos8[] = {
     {0.0f, 0.0f, 0.0f},
     {38.0f, 0.0f, 0.0f}
 };
 
-/* 803B28E0-803B28F8 00FA00 0018+00 1/0 0/0 0/0 .data            l_jntColPos9 */
 static Vec l_jntColPos9[] = {
     {0.0f, -5.0f, 0.0f},
     {35.0f, 0.0f, 0.0f}
 };
 
-/* 803B28F8-803B2910 00FA18 0018+00 1/0 0/0 0/0 .data            l_jntColPos10 */
 static Vec l_jntColPos10[] = {
     {0.0f, 5.0f, 0.0f},
     {35.0f, 0.0f, 0.0f}
 };
 
-/* 803B2910-803B2928 00FA30 0018+00 1/0 0/0 0/0 .data            l_jntColPos11 */
 static Vec l_jntColPos11[] = {
     {0.0f, 0.0f, 0.0f},
     {48.0f, 2.0f, 0.0f}
 };
 
-/* 803B2928-803B2940 00FA48 0018+00 1/0 0/0 0/0 .data            l_jntColPos12 */
 static Vec l_jntColPos12[] = {
     {0.0f, 0.0f, 0.0f},
     {48.0f, -2.0f, 0.0f}
 };
 
-/* 803B2940-803B2958 00FA60 0018+00 1/0 0/0 0/0 .data            l_jntColPos13 */
 static Vec l_jntColPos13[] = {
     {0.0f, 5.0f, 0.0f},
     {22.0f, 0.0f, 0.0f}
 };
 
-/* 803B2958-803B2970 00FA78 0018+00 1/0 0/0 0/0 .data            l_jntColPos14 */
 static Vec l_jntColPos14[] = {
     {0.0f, -5.0f, 0.0f},
     {22.0f, 0.0f, 0.0f}
 };
 
-/* 803B2970-803B2988 00FA90 0018+00 1/0 0/0 0/0 .data            l_jntColPos15 */
 static Vec l_jntColPos15[] = {
     {-15.0f, 0.0f, 17.0f},
     {0.0f, 0.0f, 1.0f}
 };
 
-/* 803B2988-803B29A0 00FAA8 0018+00 1/0 0/0 0/0 .data            l_jntColPos16 */
 static Vec l_jntColPos16[] = {
     {13.0f, 13.0f, -8.0f},
     {0.0f, 1.0f, 0.0f}
 };
 
-/* 803B29A0-803B29AC 00FAC0 000C+00 1/0 0/0 0/0 .data            l_jntColPos17 */
 static Vec l_jntColPos17 = {
     -15.0f, -10.0f, -30.0f
 };
 
-/* 803B29AC-803B2A84 -00001 00D8+00 1/1 0/0 0/0 .data            l_jntColData */
 static dJntColData_c l_jntColData[] = {
     {
         1,
@@ -1583,66 +1494,55 @@ static dJntColData_c l_jntColData[] = {
     },
 };
 
-/* 803B2A84-803B2A9C 00FBA4 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos0 */
 static Vec l_wolfJntColPos0[] = {
     {-25.0f, 20.0f, 0.0f},
     {80.0f, 0.0f, 0.0f}
 };
 
-/* 803B2A9C-803B2AA8 00FBBC 000C+00 1/0 0/0 0/0 .data            l_wolfJntColPos1 */
 static Vec l_wolfJntColPos1 = {
     5.0f, 3.0f, 0.0f
 };
 
-/* 803B2AA8-803B2AC0 00FBC8 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos2 */
 static Vec l_wolfJntColPos2[] = {
     {0.0f, 0.0f, 0.0f},
     {35.0f, 3.0f, 0.0f}
 };
 
-/* 803B2AC0-803B2AD8 00FBE0 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos4 */
 static Vec l_wolfJntColPos4[] = {
     {0.0f, 2.0f, 0.0f},
     {30.0f, 0.0f, 0.0f}
 };
 
-/* 803B2AD8-803B2AF0 00FBF8 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos6 */
 static Vec l_wolfJntColPos6[] = {
     {0.0f, 0.0f, 0.0f},
     {20.0f, 0.0f, 0.0f}
 };
 
-/* 803B2AF0-803B2B08 00FC10 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos8 */
 static Vec l_wolfJntColPos8[] = {
     {0.0f, -2.0f, 0.0f},
     {12.0f, -2.0f, 0.0f}
 };
 
-/* 803B2B08-803B2B20 00FC28 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos10 */
 static Vec l_wolfJntColPos10[] = {
     {0.0f, 0.0f, 0.0f},
     {33.0f, -2.0f, 0.0f}
 };
 
-/* 803B2B20-803B2B38 00FC40 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos12 */
 static Vec l_wolfJntColPos12[] = {
     {-5.0f, -2.0f, 0.0f},
     {15.0f, 0.0f, 0.0f}
 };
 
-/* 803B2B38-803B2B50 00FC58 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos14 */
 static Vec l_wolfJntColPos14[] = {
     {-4.0f, 0.0f, 0.0f},
     {33.0f, 0.0f, 0.0f}
 };
 
-/* 803B2B50-803B2B68 00FC70 0018+00 1/0 0/0 0/0 .data            l_wolfJntColPos16 */
 static Vec l_wolfJntColPos16[] = {
     {0.0f, -3.0f, 0.0f},
     {13.0f, -3.0f, 0.0f}
 };
 
-/* 803B2B68-803B2C40 -00001 00D8+00 1/1 0/0 0/0 .data            l_wolfJntColData */
 static dJntColData_c l_wolfJntColData[] = {
     {
         1,
@@ -1782,26 +1682,18 @@ static dJntColData_c l_wolfJntColData[] = {
 
 #include "d/actor/d_a_alink_swindow.inc"
 
-/* 80140B88-80140B98 13B4C8 0010+00 1/1 0/0 0/0 .text            __ct__12daAlinkHIO_cFv */
 daAlinkHIO_c::daAlinkHIO_c() {}
 
-/* 80140B98-80140BD4 13B4D8 003C+00 1/1 0/0 0/0 .text            __dt__17daAlinkHIO_wolf_cFv */
 daAlinkHIO_wolf_c::~daAlinkHIO_wolf_c() {}
 
-/* 80140BD4-80140C10 13B514 003C+00 1/1 0/0 0/0 .text            __dt__16daAlinkHIO_cut_cFv */
 daAlinkHIO_cut_c::~daAlinkHIO_cut_c() {}
 
-/* 80140C10-80140C80 13B550 0070+00 1/0 0/0 0/0 .text            __dt__12daAlinkHIO_cFv */
 daAlinkHIO_c::~daAlinkHIO_c() {}
 
-/* 80450FC8-80450FCC -00001 0004+00 5/5 0/0 0/0 .sbss            None */
-/* 80450FC8 0001+00 data_80450FC8 None */
 bool daAlink_matAnm_c::m_eye_move_flg;
 
-/* 80450FC9 0003+00 data_80450FC9 None */
 u8 daAlink_matAnm_c::m_morf_frame;
 
-/* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text            init__16daAlink_matAnm_cFv */
 void daAlink_matAnm_c::init() {
     field_0xf4 = 0.0f;
     field_0xf8 = 0.0f;
@@ -1812,7 +1704,6 @@ void daAlink_matAnm_c::init() {
     mSetFlag = 0;
 }
 
-/* 8009D90C-8009DA60 09824C 0154+00 1/0 0/0 0/0 .text calc__16daAlink_matAnm_cCFP11J3DMaterial */
 void daAlink_matAnm_c::calc(J3DMaterial* param_0) const {
     J3DMaterialAnm::calc(param_0);
 
@@ -1846,8 +1737,6 @@ bool daAlink_c::checkStageName(const char* stage) {
     return strcmp(dComIfGp_getStartStageName(), stage) == 0;
 }
 
-/* 8009DA98-8009DB64 0983D8 00CC+00 1/1 0/0 0/0 .text
- * tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf */
 void daAlink_c::tgHitCallback(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_tgObjInf, dCcD_GObjInf* i_atObjInf) {
     if (i_atObjInf->ChkAtType(AT_TYPE_40000)) {
         field_0x369c = *i_atObjInf->GetAtVecP();
@@ -1868,8 +1757,6 @@ void daAlink_c::tgHitCallback(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_tgObjInf, d
     }
 }
 
-/* 8009DB64-8009DC6C 0984A4 0108+00 1/1 0/0 0/0 .text
- * coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf       */
 void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj) {
     if (!checkWolf() && !checkNoResetFlg3(FLG3_UNK_20000000)) {
         if (((mProcID != PROC_CUT_HEAD && mProcID != PROC_CUT_DOWN) || i_coHitActor != field_0x280c.getActor()) && (!checkModeFlg(0x10040) || fopAcM_GetName(i_coHitActor) == PROC_CSTAF)) {
@@ -1892,8 +1779,6 @@ void daAlink_c::coHitCallback(fopAc_ac_c* i_coHitActor, dCcD_GObjInf* i_coHitObj
     }
 }
 
-/* 8009DC6C-8009DD90 0985AC 0124+00 5/5 0/0 0/0 .text
- * setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz           */
 void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s16 param_3,
                                       int param_4, cXyz const* param_5) {
     cXyz tmp;
@@ -1917,7 +1802,6 @@ void daAlink_c::setMatrixWorldAxisRot(MtxP param_0, s16 param_1, s16 param_2, s1
     }
 }
 
-/* 8009DD90-8009E7B8 0986D0 0A28+00 2/2 0/0 0/0 .text            jointControll__9daAlink_cFi */
 int daAlink_c::jointControll(int param_0) {
     csXyz sp18(0, 0, 0);
     int var_r27 = 0;
@@ -2125,7 +2009,6 @@ int daAlink_c::jointControll(int param_0) {
     return 1;
 }
 
-/* 8009E7B8-8009E91C 0990F8 0164+00 1/1 0/0 0/0 .text            setUpperFront__9daAlink_cFv */
 void daAlink_c::setUpperFront() {
     if ((checkReinRide() && checkUpperReadyThrowAnime()) || (checkBoardRide() && !checkNoUpperAnime())) {
         cMtx_copy(J3DSys::mCurrentMtx, mRootMtx);
@@ -2155,7 +2038,6 @@ void daAlink_c::setUpperFront() {
     }
 }
 
-/* 8009E91C-8009EB18 09925C 01FC+00 1/1 0/0 0/0 .text            changeBlendRate__9daAlink_cFi */
 void daAlink_c::changeBlendRate(int param_0) {
     if (field_0x2fb6 == 5) {
         if (param_0 == 0) {
@@ -2218,13 +2100,11 @@ void daAlink_c::changeBlendRate(int param_0) {
     }
 }
 
-/* 8009EB18-8009EB58 099458 0040+00 1/1 0/0 0/0 .text            resetRootMtx__9daAlink_cFv */
 void daAlink_c::resetRootMtx() {
     MTXCopy(mRootMtx, J3DSys::mCurrentMtx);
     field_0x2f90 = 0;
 }
 
-/* 8009EB58-8009EC28 099498 00D0+00 1/1 0/0 0/0 .text            modelCallBack__9daAlink_cFi */
 bool daAlink_c::modelCallBack(int i_jointNo) {
     jointControll(i_jointNo);
 
@@ -2245,8 +2125,6 @@ bool daAlink_c::modelCallBack(int i_jointNo) {
     return true;
 }
 
-/* 8009EC28-8009ECA0 099568 0078+00 1/1 0/0 0/0 .text            daAlink_modelCallBack__FP8J3DJointi
- */
 static int daAlink_modelCallBack(J3DJoint* p_joint, int param_1) {
     int jntNo = p_joint->getJntNo();
     daAlink_c* alink = (daAlink_c*)j3dSys.getModel()->getUserArea();
@@ -2260,7 +2138,6 @@ static int daAlink_modelCallBack(J3DJoint* p_joint, int param_1) {
     return 1;
 }
 
-/* 8009ECA0-8009EF38 0995E0 0298+00 1/1 0/0 0/0 .text            headModelCallBack__9daAlink_cFi */
 int daAlink_c::headModelCallBack(int param_0) {
     if (mpDemoHDTmpBck == NULL || !mpDemoHDTmpBck->getBckAnm() || (checkEndResetFlg1(ERFLG1_UNK_400000) && param_0 < 6)) {
         if (checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) {
@@ -2306,7 +2183,6 @@ int daAlink_c::headModelCallBack(int param_0) {
     return 1;
 }
 
-/* 8009EF38-8009EF7C 099878 0044+00 1/1 0/0 0/0 .text daAlink_headModelCallBack__FP8J3DJointi */
 static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1) {
     int joint_no = i_joint->getJntNo();
     daAlink_c* this_ = (daAlink_c*)j3dSys.getModel()->getUserArea();
@@ -2318,7 +2194,6 @@ static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8009EF7C-8009EFF0 0998BC 0074+00 1/1 0/0 0/0 .text            wolfModelCallBack__9daAlink_cFi */
 int daAlink_c::wolfModelCallBack(int i_jointNo) {
     jointControll(i_jointNo);
 
@@ -2331,7 +2206,6 @@ int daAlink_c::wolfModelCallBack(int i_jointNo) {
     return 1;
 }
 
-/* 8009EFF0-8009F034 099930 0044+00 1/1 0/0 0/0 .text daAlink_wolfModelCallBack__FP8J3DJointi */
 static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1) {
     int joint_no = i_joint->getJntNo();
     daAlink_c* this_ = (daAlink_c*)j3dSys.getModel()->getUserArea();
@@ -2343,7 +2217,6 @@ static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8009F034-8009FFF8 099974 0FC4+00 1/1 0/0 0/0 .text            setHatAngle__9daAlink_cFv */
 void daAlink_c::setHatAngle() {
     if (field_0x2060->getOldFrameFlg()) {
         if (checkEndResetFlg0(ERFLG0_UNK_800000)) {
@@ -2597,13 +2470,10 @@ void daAlink_c::setHatAngle() {
     }
 }
 
-/* 8009FFF8-800A002C 09A938 0034+00 1/1 0/0 0/0 .text            calcHairAngle__9daAlink_cFPs */
 void daAlink_c::calcHairAngle(s16* o_angle) {
     cLib_addCalcAngleS(o_angle, 0, 5, 400, 50);
 }
 
-/* 800A002C-800A0744 09A96C 0718+00 1/1 0/0 0/0 .text            setHairAngle__9daAlink_cFP4cXyzff
- */
 void daAlink_c::setHairAngle(cXyz* param_0, f32 param_1, f32 param_2) {
     f32 var_f31 = param_0->abs();
     f32 temp_f27 = param_0->absXZ();
@@ -2677,7 +2547,6 @@ void daAlink_c::setHairAngle(cXyz* param_0, f32 param_1, f32 param_2) {
     field_0x302c[5] = -7000.0f * sp8 * temp_f29;
 }
 
-/* 800A0744-800A07D8 09B084 0094+00 0/0 1/1 0/0 .text setLookPosFromOut__9daAlink_cFP4cXyz */
 void daAlink_c::setLookPosFromOut(cXyz* p_pos) {
     if (checkEndResetFlg0(ERFLG0_UNK_4)) {
         if (current.pos.abs2(mLookPosFromOut) < current.pos.abs2(*p_pos)) {
@@ -2689,7 +2558,6 @@ void daAlink_c::setLookPosFromOut(cXyz* p_pos) {
     mLookPosFromOut = *p_pos;
 }
 
-/* 800A07D8-800A0868 09B118 0090+00 2/2 0/0 0/0 .text checkAttentionPosAngle__9daAlink_cFP4cXyz */
 bool daAlink_c::checkAttentionPosAngle(cXyz* param_0) {
     if (checkNoResetFlg1(FLG1_UNK_4)) {
         return true;
@@ -2706,8 +2574,6 @@ bool daAlink_c::checkAttentionPosAngle(cXyz* param_0) {
     return cLib_distanceAngleS(targetY, field_0x2fe6) <= tmp;
 }
 
-/* 800A0868-800A093C 09B1A8 00D4+00 1/1 0/0 0/0 .text
- * checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz          */
 bool daAlink_c::checkActorPosAngle(fopAc_ac_c* param_0, cXyz** param_1) {
     if (param_0 != NULL && checkAttentionPosAngle(&param_0->eyePos)) {
         s16 temp_r3 = fopAcM_GetName(param_0);
@@ -2729,8 +2595,6 @@ bool daAlink_c::checkActorPosAngle(fopAc_ac_c* param_0, cXyz** param_1) {
     return 0;
 }
 
-/* 800A093C-800A142C 09B27C 0AF0+00 1/1 0/0 0/0 .text            getNeckAimPos__9daAlink_cFP4cXyzPii
- */
 cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) {
     fopAc_ac_c* var_r29 = NULL;
     s16 spA = field_0x311c;
@@ -2946,8 +2810,6 @@ cXyz* daAlink_c::getNeckAimPos(cXyz* param_0, int* param_1, int param_2) {
     return NULL;
 }
 
-/* 800A142C-800A1AEC 09BD6C 06C0+00 1/1 0/0 0/0 .text getNeckAimAngle__9daAlink_cFP4cXyzPsPsPsPs
- */
 // NONMATCHING - regalloc / one clib_minMaxLimit instance with issues
 s16 daAlink_c::getNeckAimAngle(cXyz* param_0, s16* param_1, s16* param_2, s16* param_3,
                                     s16* param_4) {
@@ -3070,7 +2932,6 @@ s16 daAlink_c::getNeckAimAngle(cXyz* param_0, s16* param_1, s16* param_2, s16* p
     return sp18;
 }
 
-/* 800A1AEC-800A1F90 09C42C 04A4+00 1/1 0/0 0/0 .text            setEyeMove__9daAlink_cFP4cXyzss */
 void daAlink_c::setEyeMove(cXyz* param_0, s16 param_1, s16 param_2) {
     u32 temp_r28 = field_0x2fa7;
     f32 sp18 = field_0x3418;
@@ -3175,7 +3036,6 @@ void daAlink_c::setEyeMove(cXyz* param_0, s16 param_1, s16 param_2) {
     }
 }
 
-/* 800A1F90-800A2160 09C8D0 01D0+00 1/1 0/0 0/0 .text            setNeckAngle__9daAlink_cFv */
 void daAlink_c::setNeckAngle() {
     cXyz sp18;
     s16 sp10 = 0;
@@ -3213,8 +3073,6 @@ void daAlink_c::setNeckAngle() {
     setEyeMove(var_r30, spC, spA);
 }
 
-/* 800A2160-800A2198 09CAA0 0038+00 1/0 0/0 0/0 .text getStickAngleFromPlayerShape__9daAlink_cCFPs
- */
 bool daAlink_c::getStickAngleFromPlayerShape(s16* o_angle) const {
     if (checkInputOnR()) {
         *o_angle = field_0x2fe2 - shape_angle.y;
@@ -3225,15 +3083,11 @@ bool daAlink_c::getStickAngleFromPlayerShape(s16* o_angle) const {
     return false;
 }
 
-/* 800A2198-800A21E0 09CAD8 0048+00 42/42 0/0 0/0 .text commonLineCheck__9daAlink_cFP4cXyzP4cXyz
- */
 bool daAlink_c::commonLineCheck(cXyz* i_startPos, cXyz* i_endPos) {
     mLinkLinChk.Set(i_startPos, i_endPos, this);
     return dComIfG_Bgsp().LineCross(&mLinkLinChk);
 }
 
-/* 800A21E0-800A2280 09CB20 00A0+00 18/18 0/0 2/2 .text
- * getMoveBGActorName__9daAlink_cFR13cBgS_PolyInfoi             */
 /**
  * Gets the Actor Name of a given polygon's associated actor
  *
@@ -3251,7 +3105,6 @@ s16 daAlink_c::getMoveBGActorName(cBgS_PolyInfo& i_polyinf, BOOL i_forceCheck) {
     return PROC_ALINK;
 }
 
-/* 800A2280-800A22E8 09CBC0 0068+00 2/2 0/0 0/0 .text            checkGoronRide__9daAlink_cFv */
 fopAc_ac_c* daAlink_c::checkGoronRide() {
     if (mLinkAcch.ChkGroundHit() && getMoveBGActorName(mLinkAcch.m_gnd, FALSE) == PROC_OBJ_GRA) {
         return dComIfG_Bgsp().GetActorPointer(mLinkAcch.m_gnd);
@@ -3260,7 +3113,6 @@ fopAc_ac_c* daAlink_c::checkGoronRide() {
     return NULL;
 }
 
-/* 800A22E8-800A2710 09CC28 0428+00 1/1 0/0 0/0 .text            setMoveSlantAngle__9daAlink_cFv */
 void daAlink_c::setMoveSlantAngle() {
     f32 temp_f31 = fabsf(speedF / field_0x594);
 
@@ -3356,7 +3208,6 @@ void daAlink_c::setMoveSlantAngle() {
     }
 }
 
-/* 800A2710-800A29DC 09D050 02CC+00 1/1 0/0 0/0 .text            setArmMatrix__9daAlink_cFv */
 int daAlink_c::setArmMatrix() {
     static Vec const arm1Vec = {29.0f, 0.0f, 0.0f};
     static Vec const arm2Vec = {26.5f, 0.0f, 0.0f};
@@ -3423,7 +3274,6 @@ int daAlink_c::setArmMatrix() {
     return 1;
 }
 
-/* 800A29DC-800A2C24 09D31C 0248+00 1/1 0/0 0/0 .text            setFootMatrix__9daAlink_cFv */
 int daAlink_c::setFootMatrix() {
     static Vec const leg1Vec = {30.0f, 0.0f, 0.0f};
     static Vec const leg2Vec = {39.363499f, 0.0f, 0.0f};
@@ -3481,7 +3331,6 @@ int daAlink_c::setFootMatrix() {
     return 1;
 }
 
-/* 800A2C24-800A2CE0 09D564 00BC+00 3/3 0/0 0/0 .text            setMatrixOffset__9daAlink_cFPff */
 void daAlink_c::setMatrixOffset(f32* param_0, f32 param_1) {
     if (param_0 != &mSinkShapeOffset) {
         cLib_addCalc(param_0, param_1, 0.5f, 7.5f, 2.5f);
@@ -3497,8 +3346,6 @@ void daAlink_c::setMatrixOffset(f32* param_0, f32 param_1) {
     mDoMtx_copy(mDoMtx_stack_c::get(), field_0x2be8);
 }
 
-/* 800A2CE0-800A3430 09D620 0750+00 3/3 0/0 0/0 .text
- * setLegAngle__9daAlink_cFfP18daAlink_footData_cPsPsi          */
 int daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* param_2,
                                 s16* param_3, int param_4) {
     cXyz spA4;
@@ -3640,7 +3487,6 @@ int daAlink_c::setLegAngle(f32 param_0, daAlink_footData_c* param_1, s16* param_
     return 1;
 }
 
-/* 800A3430-800A39B8 09DD70 0588+00 1/1 0/0 0/0 .text            footBgCheck__9daAlink_cFv */
 void daAlink_c::footBgCheck() {
     static Vec const localLeftFootOffset = {-3.0f, 13.0f, 0.0f};
     static Vec const localRightFootOffset = {-3.0f, -13.0f, 0.0f};
@@ -3775,7 +3621,6 @@ void daAlink_c::footBgCheck() {
     }
 }
 
-/* 800A39B8-800A3C8C 09E2F8 02D4+00 1/1 0/0 0/0 .text            handBgCheck__9daAlink_cFv */
 void daAlink_c::handBgCheck() {
     static Vec const localHandPos[] = {
         {22.096375f, 5.4923248f, 0.0f},
@@ -3862,7 +3707,6 @@ void daAlink_c::handBgCheck() {
     }
 }
 
-/* 800A3C8C-800A3CE4 09E5CC 0058+00 11/11 0/0 0/0 .text            setItemHeap__9daAlink_cFv */
 JKRHeap* daAlink_c::setItemHeap() {
     if (!checkResetFlg0(RFLG0_UNK_4000)) {
         field_0x2fa0 ^= 1;
@@ -3877,7 +3721,6 @@ JKRHeap* daAlink_c::setItemHeap() {
  * The left most digit is the arcNo if not 0
  * The latter 3 digits are the resource ID
  */
-/* 800A3CE4-800A3D0C 09E624 0028+00 4/4 0/0 0/0 .text            setIdxMask__9daAlink_cFPUsPUs */
 void daAlink_c::setIdxMask(u16* o_arcNo, u16* o_resID) {
     if (*o_arcNo == 0xFFFF) {
         u16 arc_id = (*o_resID >> 12) & 0xF;
@@ -3889,8 +3732,6 @@ void daAlink_c::setIdxMask(u16* o_arcNo, u16* o_resID) {
     }
 }
 
-/* 800A3D0C-800A3D7C 09E64C 0070+00 5/5 0/0 0/0 .text
- * getAnimeResource__9daAlink_cFP14daPy_anmHeap_cUsUl           */
 J3DAnmTransform* daAlink_c::getAnimeResource(daPy_anmHeap_c* p_anmHeap, u16 i_anmID, u32 buf_size) {
     u16 arcNo;
     u16 resID = i_anmID;
@@ -3907,8 +3748,6 @@ J3DAnmTransform* daAlink_c::getAnimeResource(daPy_anmHeap_c* p_anmHeap, u16 i_an
     return (J3DAnmTransform*)p_anmHeap->loadDataDemoRID(resID, arcNo);
 }
 
-/* 800A3D7C-800A3E30 09E6BC 00B4+00 16/16 0/0 0/0 .text initModel__9daAlink_cFP12J3DModelDataUlUl
- */
 J3DModel* daAlink_c::initModel(J3DModelData* i_modelData, u32 mdlFlags, u32 diffFlags) {
     J3DTexture* tex = i_modelData->getTexture();
     int texNo = tex->getNum() - 1;
@@ -3936,18 +3775,14 @@ J3DModel* daAlink_c::initModel(J3DModelData* i_modelData, u32 mdlFlags, u32 diff
     return model;
 }
 
-/* 800A3E30-800A3E98 09E770 0068+00 1/1 0/0 0/0 .text            initModel__9daAlink_cFUsUl */
 J3DModel* daAlink_c::initModel(u16 i_resNo, u32 i_flags) {
     return initModel((J3DModelData*)dComIfG_getObjectRes(l_arcName, i_resNo), i_flags);
 }
 
-/* 800A3E98-800A3F00 09E7D8 0068+00 1/1 0/0 0/0 .text            initModelEnv__9daAlink_cFUsUl */
 J3DModel* daAlink_c::initModelEnv(u16 i_resNo, u32 i_flags) {
     return initModelEnv((J3DModelData*)dComIfG_getObjectRes(l_arcName, i_resNo), i_flags);
 }
 
-/* 800A3F00-800A3F98 09E840 0098+00 1/1 0/0 0/0 .text initDemoModel__9daAlink_cFPP8J3DModelPCcUl
- */
 int daAlink_c::initDemoModel(J3DModel** i_ppmodel, char const* i_resname, u32 i_flags) {
     *i_ppmodel = NULL;
 
@@ -3964,8 +3799,6 @@ int daAlink_c::initDemoModel(J3DModel** i_ppmodel, char const* i_resname, u32 i_
     return 1;
 }
 
-/* 800A3F98-800A4068 09E8D8 00D0+00 1/1 0/0 1/1 .text initDemoBck__9daAlink_cFPP13mDoExt_bckAnmPCc
- */
 int daAlink_c::initDemoBck(mDoExt_bckAnm** p_bck, char const* resName) {
     J3DAnmTransform* res =
         (J3DAnmTransform*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName);
@@ -3991,7 +3824,6 @@ static int daAlink_Delete(daAlink_c* i_this);
 static int daAlink_Execute(daAlink_c* i_this);
 static int daAlink_Draw(daAlink_c* i_this);
 
-/* 800A4068-800A4820 09E9A8 07B8+00 1/1 0/0 0/0 .text            createHeap__9daAlink_cFv */
 int daAlink_c::createHeap() {
     ResTIMG* sp14 = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5D);
     mpWarpTexData = (void*)((uintptr_t)sp14 + sp14->imageOffset);
@@ -4143,13 +3975,10 @@ int daAlink_c::createHeap() {
     return 1;
 }
 
-/* 800A48F0-800A4910 09F230 0020+00 1/1 0/0 0/0 .text            daAlink_createHeap__FP10fopAc_ac_c
- */
 static int daAlink_createHeap(fopAc_ac_c* i_this) {
     return ((daAlink_c*)i_this)->createHeap();
 }
 
-/* 800A4910-800A4BC8 09F250 02B8+00 5/5 0/0 0/0 .text            setSelectEquipItem__9daAlink_cFi */
 void daAlink_c::setSelectEquipItem(int param_0) {
     if (!checkWolf()) {
         J3DModel* temp = mSwordModel;
@@ -4223,19 +4052,16 @@ void daAlink_c::setSelectEquipItem(int param_0) {
     }
 }
 
-/* 800A4BC8-800A4C40 09F508 0078+00 2/2 0/0 0/0 .text            checkBoarStart__9daAlink_cFv */
 BOOL daAlink_c::checkBoarStart() {
     // Stage: Bulblin Camp   Room: Outside Arbiter's
     return (checkStageName("F_SP118") && getStartRoomNo() == 3) && dComIfGs_getStartPoint() == 0;
 }
 
-/* 800A4C40-800A4CB4 09F580 0074+00 2/2 0/0 0/0 .text            checkCanoeStart__9daAlink_cFv */
 BOOL daAlink_c::checkCanoeStart() {
     // Stage: Lake Hylia   Room: Lake
     return (checkStageName("F_SP115") && getStartRoomNo() == 0) && dComIfGs_getStartPoint() == 2;
 }
 
-/* 800A4CB4-800A54F4 09F5F4 0840+00 1/1 0/0 0/0 .text            playerInit__9daAlink_cFv */
 void daAlink_c::playerInit() {
     mHeavySpeedMultiplier = 1.0f;
 
@@ -4452,12 +4278,10 @@ void daAlink_c::playerInit() {
     }
 }
 
-/* 800A54F4-800A551C 09FE34 0028+00 3/3 0/0 0/0 .text            checkHorseStart__9daAlink_cFUli */
 BOOL daAlink_c::checkHorseStart(u32 pLastMode, int pStartMode) {
     return pLastMode == 1 || pStartMode == 2 || pLastMode == 8;
 }
 
-/* 800A551C-800A5CC8 09FE5C 07AC+00 1/1 0/0 0/0 .text            setStartProcInit__9daAlink_cFv */
 int daAlink_c::setStartProcInit() {
     BOOL sp10 = 0;
     int start_mode = getStartMode();
@@ -4645,7 +4469,6 @@ int daAlink_c::setStartProcInit() {
     return sp10;
 }
 
-/* 800A5CC8-800A660C 0A0608 0944+00 1/1 0/0 0/0 .text            create__9daAlink_cFv */
 int daAlink_c::create() {
     fopAcM_ct(this, daAlink_c);
 
@@ -4841,12 +4664,10 @@ int daAlink_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 800A660C-800A662C 0A0F4C 0020+00 1/0 0/0 0/0 .text            daAlink_Create__FP10fopAc_ac_c */
 static int daAlink_Create(fopAc_ac_c* i_this) {
     return static_cast<daAlink_c*>(i_this)->create();
 }
 
-/* 800A662C-800A67E0 0A0F6C 01B4+00 2/2 0/0 0/0 .text            setRoomInfo__9daAlink_cFv */
 s32 daAlink_c::setRoomInfo() {
     s32 roomID;
 
@@ -4895,8 +4716,6 @@ s32 daAlink_c::setRoomInfo() {
     return roomID;
 }
 
-/* 800A67E0-800A6B0C 0A1120 032C+00 1/1 0/0 0/0 .text            setShapeAngleOnGround__9daAlink_cFv
- */
 void daAlink_c::setShapeAngleOnGround() {
     field_0x33cc = cLib_minMaxLimit<f32>(field_0x33cc, 0.0f, 1.0f);
 
@@ -4963,7 +4782,6 @@ void daAlink_c::setShapeAngleOnGround() {
     }
 }
 
-/* 800A6B0C-800A6DCC 0A144C 02C0+00 1/1 0/0 0/0 .text            setStepsOffset__9daAlink_cFv */
 void daAlink_c::setStepsOffset() {
     field_0x2b9c = 0.0f;
     cLib_addCalc(&field_0x2b98, 0.0f, 0.5f, 25.0f, 5.0f);
@@ -4993,7 +4811,6 @@ void daAlink_c::setStepsOffset() {
     }
 }
 
-/* 800A6DCC-800A7050 0A170C 0284+00 1/1 0/0 0/0 .text            iceSlipBgCheck__9daAlink_cFv */
 void daAlink_c::iceSlipBgCheck() {
     if (mLinkAcch.ChkGroundHit() && checkModeFlg(1)) {
         f32 var_f30 = field_0x35c4.absXZ();
@@ -5021,7 +4838,6 @@ void daAlink_c::iceSlipBgCheck() {
     }
 }
 
-/* 800A7050-800A7358 0A1990 0308+00 1/1 0/0 0/0 .text            setIceSlipSpeed__9daAlink_cFv */
 void daAlink_c::setIceSlipSpeed() {
     field_0x35d0 = field_0x35c4;
 
@@ -5061,7 +4877,6 @@ void daAlink_c::setIceSlipSpeed() {
     field_0x35c4.y = 0.0f;
 }
 
-/* 800A7358-800A7950 0A1C98 05F8+00 1/1 0/0 0/0 .text            setPolygonSpeed__9daAlink_cFv */
 void daAlink_c::setPolygonSpeed() {
     offNoResetFlg3(daPy_FLG3(FLG3_UNK_1000 | FLG3_UNK_2000));
     if ((!checkEventRun() || checkNoResetFlg0(FLG0_UNK_14000)) && !checkMagneBootsOn()) {
@@ -5155,7 +4970,6 @@ void daAlink_c::setPolygonSpeed() {
     }
 }
 
-/* 800A7950-800A79EC 0A2290 009C+00 4/4 0/0 0/0 .text checkWindSpeedOnAngle__9daAlink_cCFv */
 bool daAlink_c::checkWindSpeedOnAngle() const {
     if (!checkWindSpeedOnXZ()) {
         return false;
@@ -5165,18 +4979,15 @@ bool daAlink_c::checkWindSpeedOnAngle() const {
     return tmp >= 0x6000 || (tmp >= 0x4000 && checkWindDashAnime());
 }
 
-/* 800A79EC-800A7A5C 0A232C 0070+00 2/2 0/0 0/0 .text checkWindSpeedOnAngleAnime__9daAlink_cCFi */
 bool daAlink_c::checkWindSpeedOnAngleAnime(int param_0) const {
     return checkWindSpeedOnAngle() &&
            ((field_0x2f8c == 1 || field_0x2f8c == 3) || (param_0 != 0 && field_0x2f8c == 2));
 }
 
-/* 800A7A5C-800A7ABC 0A239C 0060+00 7/7 0/0 0/0 .text            checkDashAnime__9daAlink_cCFv */
 bool daAlink_c::checkDashAnime() const {
     return checkUnderMove0BckNoArc(ANM_RUN) || checkUnderMove0BckNoArc(ANM_RUN_B);
 }
 
-/* 800A7ABC-800A7CB0 0A23FC 01F4+00 1/1 0/0 0/0 .text checkWindWallRate__9daAlink_cFRC4cXyz */
 f32 daAlink_c::checkWindWallRate(cXyz const& param_0) {
     cXyz sp24(current.pos.x, current.pos.y + (0.5f * field_0x598), current.pos.z);
     cXyz sp18 = sp24 - (param_0 * daAlinkHIO_basic_c0::m.mMaxWindInfluenceDist);
@@ -5194,7 +5005,6 @@ f32 daAlink_c::checkWindWallRate(cXyz const& param_0) {
     return var_f31;
 }
 
-/* 800A7CB0-800A8310 0A25F0 0660+00 1/1 0/0 0/0 .text            setWindSpeed__9daAlink_cFv */
 void daAlink_c::setWindSpeed() {
     if (!checkModeFlg(0x40000) && !checkNoResetFlg0(FLG0_UNDERWATER)) {
         cXyz sp3C;
@@ -5271,7 +5081,6 @@ void daAlink_c::setWindSpeed() {
     }
 }
 
-/* 800A8310-800A87D8 0A2C50 04C8+00 2/2 0/0 0/0 .text            setBodyPartPos__9daAlink_cFv */
 void daAlink_c::setBodyPartPos() {
     static Vec const localHeadCenter = {0.0f, -8.0f, 0.0f};
     static Vec const localEye = {12.0f, -8.0f, 0.0f};
@@ -5351,7 +5160,6 @@ void daAlink_c::setBodyPartPos() {
     }
 }
 
-/* 800A87D8-800A87F8 0A3118 0020+00 1/0 0/0 0/0 .text            setRollJump__9daAlink_cFffs */
 int daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) {
     field_0x3410 = param_0;
     field_0x3414 = param_1;
@@ -5360,7 +5168,6 @@ int daAlink_c::setRollJump(f32 param_0, f32 param_1, s16 param_2) {
     return 1;
 }
 
-/* 800A87F8-800A8CE4 0A3138 04EC+00 2/2 0/0 0/0 .text            setAttentionPos__9daAlink_cFv */
 void daAlink_c::setAttentionPos() {
     static Vec const wlLocalEyeFromRoot = {0.0f, -6.0f, 85.5f};
     static Vec const normalOffset = {0.0f, 150.0f, 0.0f};
@@ -5464,7 +5271,6 @@ void daAlink_c::setAttentionPos() {
     }
 }
 
-/* 800A8CE4-800A9248 0A3624 0564+00 3/3 0/0 0/0 .text            setMatrix__9daAlink_cFv */
 void daAlink_c::setMatrix() {
     f32 var_f31;
     if (field_0x3174 == 8 && mLinkAcch.ChkGroundHit() && !checkModeFlg(0x70C52)) {
@@ -5545,7 +5351,6 @@ void daAlink_c::setMatrix() {
     }
 }
 
-/* 800A9248-800A92F0 0A3B88 00A8+00 15/15 0/0 5/5 .text simpleAnmPlay__9daAlink_cFP10J3DAnmBase */
 int daAlink_c::simpleAnmPlay(J3DAnmBase* i_anm) {
     if (i_anm == NULL) {
         return 0;
@@ -5568,7 +5373,6 @@ int daAlink_c::simpleAnmPlay(J3DAnmBase* i_anm) {
     return ret;
 }
 
-/* 800A92F0-800A9450 0A3C30 0160+00 2/2 0/0 0/0 .text            setSwordPos__9daAlink_cFv */
 void daAlink_c::setSwordPos() {
     static Vec const swordMoveLocal0 = {0.0f, 0.0f, -1.0f};
     static Vec const swordMoveLocal1 = {0.0f, 0.0f, 1.0f};
@@ -5599,7 +5403,6 @@ void daAlink_c::setSwordPos() {
     }
 }
 
-/* 800A9450-800A9F4C 0A3D90 0AFC+00 4/4 0/0 0/0 .text            setItemMatrix__9daAlink_cFi */
 void daAlink_c::setItemMatrix(int param_0) {
     mSheathModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30b6));
     modelCalc(mSheathModel);
@@ -5801,7 +5604,6 @@ void daAlink_c::setItemMatrix(int param_0) {
     }
 }
 
-/* 800A9F4C-800AA2BC 0A488C 0370+00 4/4 0/0 0/0 .text            setWolfItemMatrix__9daAlink_cFv */
 void daAlink_c::setWolfItemMatrix() {
     mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(2));
     mDoMtx_stack_c::transM(31.0f, -29.0f, 19.0f);
@@ -5863,15 +5665,11 @@ void daAlink_c::setWolfItemMatrix() {
     }
 }
 
-/* 800AA2BC-800AA2E0 0A4BFC 0024+00 3/3 0/0 0/0 .text
- * setHandIndex__9daAlink_cFQ29daAlink_c11daAlink_ANM           */
 void daAlink_c::setHandIndex(daAlink_c::daAlink_ANM i_anmID) {
     field_0x2f92 = getAnmData(i_anmID)->field_0x4;
     field_0x2f93 = getAnmData(i_anmID)->field_0x5;
 }
 
-/* 800AA2E0-800AA5E8 0A4C20 0308+00 1/1 0/0 0/0 .text            setSwordAtCollision__9daAlink_cFi
- */
 void daAlink_c::setSwordAtCollision(int param_0) {
     cXyz sp74;
 
@@ -5931,7 +5729,6 @@ void daAlink_c::setSwordAtCollision(int param_0) {
     }
 }
 
-/* 800AA5E8-800AA6B4 0A4F28 00CC+00 4/4 0/0 0/0 .text checkNoCollisionCorret__9daAlink_cFv */
 BOOL daAlink_c::checkNoCollisionCorret() {
     if (checkModeFlg(0x12800) || mDemo.getDemoType() == daPy_demo_c::DEMO_TYPE_TOOL_e || mProcID == PROC_DOOR_OPEN ||
         (checkEventRun() &&
@@ -5946,7 +5743,6 @@ BOOL daAlink_c::checkNoCollisionCorret() {
     return false;
 }
 
-/* 800AA6B4-800AA714 0A4FF4 0060+00 1/1 0/0 0/0 .text            decSwordBlur__9daAlink_cFv */
 void daAlink_c::decSwordBlur() {
     if (m_swordBlur.field_0x14 < 10) {
         m_swordBlur.field_0x14 = 0;
@@ -5956,8 +5752,6 @@ void daAlink_c::decSwordBlur() {
     }
 }
 
-/* 800AA714-800AA7EC 0A5054 00D8+00 2/2 0/0 0/0 .text            resetWolfAtCollision__9daAlink_cFv
- */
 void daAlink_c::resetWolfAtCollision() {
     if (checkNoResetFlg0(FLG0_UNK_40)) {
         if (!setSwordHitVibration(&mAtCyl) && !setSwordHitVibration(&field_0x850[0]) &&
@@ -5980,7 +5774,6 @@ void daAlink_c::resetWolfAtCollision() {
     }
 }
 
-/* 800AA7EC-800AA9DC 0A512C 01F0+00 1/1 0/0 0/0 .text            setWolfAtCollision__9daAlink_cFv */
 void daAlink_c::setWolfAtCollision() {
     cXyz sp8;
 
@@ -6030,7 +5823,6 @@ void daAlink_c::setWolfAtCollision() {
     }
 }
 
-/* 800AA9DC-800AAABC 0A531C 00E0+00 3/3 0/0 0/0 .text            resetAtCollision__9daAlink_cFi */
 void daAlink_c::resetAtCollision(int param_0) {
     if (checkNoResetFlg0(FLG0_UNK_40)) {
         if (param_0 && !setSwordHitVibration(&mAtCps[0]) && !setSwordHitVibration(&mAtCps[1]) &&
@@ -6050,7 +5842,6 @@ void daAlink_c::resetAtCollision(int param_0) {
     }
 }
 
-/* 800AAABC-800AB878 0A53FC 0DBC+00 1/1 0/0 0/0 .text            setAtCollision__9daAlink_cFv */
 void daAlink_c::setAtCollision() {
     static const Vec bottleTopPos = {
         0.0f, 20.0f, 0.0f
@@ -6306,8 +6097,6 @@ void daAlink_c::setAtCollision() {
     }
 }
 
-/* 800AB878-800ABAE0 0A61B8 0268+00 1/1 0/0 0/0 .text            setWolfCollisionPos__9daAlink_cFv
- */
 void daAlink_c::setWolfCollisionPos() {
     static Vec const localHead = {15.0f, 5.0f, 0.0f};
 
@@ -6363,7 +6152,6 @@ void daAlink_c::setWolfCollisionPos() {
     field_0x3454 = field_0x850[0].GetC().y + (field_0x850[0].GetH() * 0.5f);
 }
 
-/* 800ABAE0-800ABB28 0A6420 0048+00 2/2 0/0 0/0 .text            initLockAt__9daAlink_cFv */
 void daAlink_c::initLockAt() {
     mAtCps[0].OnAtSPrmBit(0x20);
     mAtCps[0].OnAtNoHitMark();
@@ -6371,7 +6159,6 @@ void daAlink_c::initLockAt() {
     mAtCps[0].ResetAtHit();
 }
 
-/* 800ABB28-800ABB84 0A6468 005C+00 3/3 0/0 0/0 .text            cancelLockAt__9daAlink_cFv */
 void daAlink_c::cancelLockAt() {
     mAtCps[0].OffAtSPrmBit(0x20);
     mAtCps[0].OffAtNoHitMark();
@@ -6380,7 +6167,6 @@ void daAlink_c::cancelLockAt() {
     field_0x814.SetAtApid(0xFFFFFFFF);
 }
 
-/* 800ABB84-800ABDB8 0A64C4 0234+00 1/1 0/0 0/0 .text            setCollisionPos__9daAlink_cFv */
 void daAlink_c::setCollisionPos() {
     cXyz sp74;
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &sp74);
@@ -6431,7 +6217,6 @@ void daAlink_c::setCollisionPos() {
     field_0x3454 = field_0x3834.y;
 }
 
-/* 800ABDB8-800AC328 0A66F8 0570+00 1/1 0/0 0/0 .text            setCollision__9daAlink_cFv */
 void daAlink_c::setCollision() {
     field_0x814.Move();
     field_0x173c.Move();
@@ -6571,7 +6356,6 @@ void daAlink_c::setCollision() {
     }
 }
 
-/* 800AC328-800AC378 0A6C68 0050+00 1/0 0/0 0/0 .text            getBaseAnimeFrame__9daAlink_cCFv */
 f32 daAlink_c::getBaseAnimeFrame() const {
     if (mProcID == PROC_SUMOU_ACTION && mSpeedModifier > 0.0f) {
         return mProcVar2.field_0x300c;
@@ -6580,7 +6364,6 @@ f32 daAlink_c::getBaseAnimeFrame() const {
     return mUnderFrameCtrl[0].getFrame();
 }
 
-/* 800AC378-800AC394 0A6CB8 001C+00 1/0 0/0 0/0 .text            setAnimeFrame__9daAlink_cFf */
 void daAlink_c::setAnimeFrame(f32 frame) {
     mUnderFrameCtrl[0].setFrame(frame);
     mUnderFrameCtrl[1].setFrame(frame);
@@ -6591,8 +6374,6 @@ void daAlink_c::setAnimeFrame(f32 frame) {
     mUpperFrameCtrl[2].setFrame(frame);
 }
 
-/* 800AC394-800AC450 0A6CD4 00BC+00 6/6 0/0 0/0 .text
- * setFrameCtrl__9daAlink_cFP16daPy_frameCtrl_cUcssff           */
 void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s16 i_end,
                              f32 i_rate, f32 i_frame) {
     if (checkNoResetFlg0(FLG0_UNDERWATER)) {
@@ -6606,8 +6387,6 @@ void daAlink_c::setFrameCtrl(daPy_frameCtrl_c* i_ctrl, u8 i_attr, s16 i_start, s
     i_ctrl->setFrameCtrl(i_attr, i_start, i_end, i_rate, i_frame);
 }
 
-/* 800AC450-800AC558 0A6D90 0108+00 23/23 0/0 0/0 .text
- * getMainBckData__9daAlink_cCFQ29daAlink_c11daAlink_ANM        */
 const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID) const {
     static const daAlink_BckData kandelaarAnm[2] = {
         {0x026A, 0x0268},  // waits, waitk
@@ -6641,23 +6420,16 @@ const daAlink_BckData* daAlink_c::getMainBckData(daAlink_c::daAlink_ANM i_anmID)
     return &m_anmDataTable[i_anmID].field_0x0;
 }
 
-/* 800AC558-800AC5B4 0A6E98 005C+00 51/51 0/0 2/2 .text
- * checkUnderMove0BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM */
 BOOL daAlink_c::checkUnderMove0BckNoArc(daAlink_c::daAlink_ANM i_anmID) const {
     return mUnderAnmHeap[0].checkNoSetArcNo() &&
            mUnderAnmHeap[0].getIdx() == getMainBckData(i_anmID)->m_underID;
 }
 
-/* 800AC5B4-800AC610 0A6EF4 005C+00 4/4 0/0 0/0 .text
- * checkUnderMove1BckNoArc__9daAlink_cCFQ29daAlink_c11daAlink_ANM */
 BOOL daAlink_c::checkUnderMove1BckNoArc(daAlink_c::daAlink_ANM i_anmID) const {
     return mUnderAnmHeap[1].checkNoSetArcNo() &&
            mUnderAnmHeap[1].getIdx() == getMainBckData(i_anmID)->m_underID;
 }
 
-/* 800AC610-800AC738 0A6F50 0128+00 3/3 0/0 0/0 .text
- * getUnderUpperAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMPP15J3DAnmTransformPP15J3DAnmTransformiUl
- */
 int daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransform** i_underBck,
                                   J3DAnmTransform** i_upperBck, int i_anmPackID, u32 i_bufSize) {
     s32 var_r31;
@@ -6699,7 +6471,6 @@ int daAlink_c::getUnderUpperAnime(daAlink_c::daAlink_ANM i_anmID, J3DAnmTransfor
     return var_r31;
 }
 
-/* 800AC738-800AC754 0A7078 001C+00 7/7 0/0 0/0 .text setDoubleAnimeBlendRatio__9daAlink_cFf */
 void daAlink_c::setDoubleAnimeBlendRatio(f32 param_0) {
     mNowAnmPackUnder[0].setRatio(1.0f - param_0);
     mNowAnmPackUnder[1].setRatio(param_0);
@@ -6707,9 +6478,6 @@ void daAlink_c::setDoubleAnimeBlendRatio(f32 param_0) {
     mNowAnmPackUpper[1].setRatio(param_0);
 }
 
-/* 800AC754-800ACA14 0A7094 02C0+00 2/2 0/0 0/0 .text
- * commonDoubleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformP15J3DAnmTransformfffi
- */
 void daAlink_c::commonDoubleAnime(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
                                       J3DAnmTransform* param_2, J3DAnmTransform* param_3,
                                       f32 param_4, f32 param_5, f32 param_6, int param_7) {
@@ -6769,8 +6537,6 @@ void daAlink_c::commonDoubleAnime(J3DAnmTransform* param_0, J3DAnmTransform* par
     field_0x2f8c = param_7;
 }
 
-/* 800ACA14-800ACD40 0A7354 032C+00 14/14 0/0 0/0 .text
- * setDoubleAnime__9daAlink_cFfffQ29daAlink_c11daAlink_ANMQ29daAlink_c11daAlink_ANMif */
 int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
                               daAlink_c::daAlink_ANM i_anmA, daAlink_c::daAlink_ANM i_anmB,
                               int param_5, f32 i_morf) {
@@ -6851,8 +6617,6 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
     return 1;
 }
 
-/* 800ACD40-800ACF80 0A7680 0240+00 2/2 0/0 0/0 .text
- * commonSingleAnime__9daAlink_cFP15J3DAnmTransformP15J3DAnmTransformffs */
 void daAlink_c::commonSingleAnime(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
                                       f32 param_2, f32 param_3, s16 param_4) {
     mUnderAnmHeap[1].resetIdx();
@@ -6913,26 +6677,18 @@ void daAlink_c::commonSingleAnime(J3DAnmTransform* param_0, J3DAnmTransform* par
     field_0x2f8c = 0;
 }
 
-/* 800ACF80-800ACFB0 0A78C0 0030+00 88/88 0/0 0/0 .text
- * setSingleAnimeBase__9daAlink_cFQ29daAlink_c11daAlink_ANM     */
 void daAlink_c::setSingleAnimeBase(daAlink_c::daAlink_ANM i_anmID) {
     setSingleAnime(i_anmID, 1.0f, 0.0f, -1, 3.0f);
 }
 
-/* 800ACFB0-800ACFE0 0A78F0 0030+00 27/27 0/0 0/0 .text
- * setSingleAnimeBaseMorf__9daAlink_cFQ29daAlink_c11daAlink_ANMf */
 void daAlink_c::setSingleAnimeBaseMorf(daAlink_c::daAlink_ANM i_anmID, f32 param_1) {
     setSingleAnime(i_anmID, 1.0f, 0.0f, -1, param_1);
 }
 
-/* 800ACFE0-800AD00C 0A7920 002C+00 77/77 0/0 0/0 .text
- * setSingleAnimeBaseSpeed__9daAlink_cFQ29daAlink_c11daAlink_ANMff */
 void daAlink_c::setSingleAnimeBaseSpeed(daAlink_c::daAlink_ANM i_anmID, f32 param_1, f32 param_2) {
     setSingleAnime(i_anmID, param_1, 0.0f, -1, param_2);
 }
 
-/* 800AD00C-800AD0F4 0A794C 00E8+00 58/58 0/0 0/0 .text
- * setSingleAnime__9daAlink_cFQ29daAlink_c11daAlink_ANMffsf     */
 int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_start, s16 i_end,
                               f32 i_morf) {
     J3DAnmTransform* under_bck;
@@ -6951,16 +6707,12 @@ int daAlink_c::setSingleAnime(daAlink_c::daAlink_ANM i_anmID, f32 i_rate, f32 i_
     return 1;
 }
 
-/* 800AD0F4-800AD128 0A7A34 0034+00 93/93 0/0 0/0 .text
- * setSingleAnimeParam__9daAlink_cFQ29daAlink_c11daAlink_ANMPC16daAlinkHIO_anm_c */
 int daAlink_c::setSingleAnimeParam(daAlink_c::daAlink_ANM i_anmID,
                                    daAlinkHIO_anm_c const* i_anmData) {
     return setSingleAnime(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame,
                           i_anmData->mInterpolation);
 }
 
-/* 800AD128-800AD170 0A7A68 0048+00 1/1 0/0 0/0 .text
- * animePlay__9daAlink_cFP15J3DAnmTransformP16daPy_frameCtrl_c  */
 void daAlink_c::animePlay(J3DAnmTransform* i_anm, daPy_frameCtrl_c* i_frameCtrl) {
     if (i_anm != NULL) {
         i_frameCtrl->updateFrame();
@@ -6968,7 +6720,6 @@ void daAlink_c::animePlay(J3DAnmTransform* i_anm, daPy_frameCtrl_c* i_frameCtrl)
     }
 }
 
-/* 800AD170-800AD2D8 0A7AB0 0168+00 2/2 0/0 0/0 .text            allAnimePlay__9daAlink_cFv */
 void daAlink_c::allAnimePlay() {
     J3DAnmTransform* under0_bck = getNowAnmPackUnder(UNDER_0);
     J3DAnmTransform* under1_bck = getNowAnmPackUnder(UNDER_1);
@@ -7023,7 +6774,6 @@ void daAlink_c::allAnimePlay() {
     simpleAnmPlay(field_0x06f8);
 }
 
-/* 800AD2D8-800AD340 0A7C18 0068+00 2/2 0/0 0/0 .text            setUpperAnimeMorf__9daAlink_cFf */
 void daAlink_c::setUpperAnimeMorf(f32 param_0) {
     if (param_0 >= 0.0f) {
         u16 temp_r29;
@@ -7043,24 +6793,18 @@ void daAlink_c::setUpperAnimeMorf(f32 param_0) {
     }
 }
 
-/* 800AD340-800AD374 0A7C80 0034+00 15/15 0/0 0/0 .text            setUpperAnimeBase__9daAlink_cFUs
- */
 void daAlink_c::setUpperAnimeBase(u16 i_anmResID) {
     setUpperAnime(i_anmResID, UPPER_2, 1.0f, 0.0f, -1, 3.0f);
 }
 
-/* 800AD374-800AD3A8 0A7CB4 0034+00 7/7 0/0 0/0 .text setUpperAnimeBaseMorf__9daAlink_cFUsf */
 void daAlink_c::setUpperAnimeBaseMorf(u16 i_anmResID, f32 i_morf) {
     setUpperAnime(i_anmResID, UPPER_2, 1.0f, 0.0f, -1, i_morf);
 }
 
-/* 800AD3A8-800AD3D8 0A7CE8 0030+00 18/18 0/0 0/0 .text setUpperAnimeBaseSpeed__9daAlink_cFUsff */
 void daAlink_c::setUpperAnimeBaseSpeed(u16 i_anmResID, f32 i_speed, f32 i_morf) {
     setUpperAnime(i_anmResID, UPPER_2, i_speed, 0.0f, -1, i_morf);
 }
 
-/* 800AD3D8-800AD6F0 0A7D18 0318+00 13/13 0/0 0/0 .text
- * setUpperAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERffsf  */
 int daAlink_c::setUpperAnime(u16 i_anmResID, daAlink_c::daAlink_UPPER param_1, f32 i_speed,
                                   f32 i_startFrame, s16 i_endFrame, f32 i_morf) {
     BOOL var_r28 = 0;
@@ -7128,16 +6872,12 @@ int daAlink_c::setUpperAnime(u16 i_anmResID, daAlink_c::daAlink_UPPER param_1, f
     return 1;
 }
 
-/* 800AD6F0-800AD724 0A8030 0034+00 21/21 0/0 0/0 .text
- * setUpperAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UPPERPC16daAlinkHIO_anm_c */
 void daAlink_c::setUpperAnimeParam(u16 i_anmResID, daAlink_c::daAlink_UPPER param_1,
                                    daAlinkHIO_anm_c const* i_anmParam) {
     setUpperAnime(i_anmResID, param_1, i_anmParam->mSpeed, i_anmParam->mStartFrame,
                   i_anmParam->mEndFrame, i_anmParam->mInterpolation);
 }
 
-/* 800AD724-800AD8F4 0A8064 01D0+00 65/65 0/0 0/0 .text
- * resetUpperAnime__9daAlink_cFQ29daAlink_c13daAlink_UPPERf     */
 int daAlink_c::resetUpperAnime(daAlink_c::daAlink_UPPER param_0, f32 param_1) {
     BOOL var_r29 = 0;
     if (checkFmChainGrabAnime()) {
@@ -7178,7 +6918,6 @@ int daAlink_c::resetUpperAnime(daAlink_c::daAlink_UPPER param_0, f32 param_1) {
     return 1;
 }
 
-/* 800AD8F4-800AD964 0A8234 0070+00 2/2 0/0 0/0 .text            setUnderAnimeMorf__9daAlink_cFf */
 void daAlink_c::setUnderAnimeMorf(f32 param_0) {
     if (param_0 >= 0.0f) {
         if (field_0x2060->getOldFrameRate() > 0.1f &&
@@ -7192,8 +6931,6 @@ void daAlink_c::setUnderAnimeMorf(f32 param_0) {
     }
 }
 
-/* 800AD964-800ADAB8 0A82A4 0154+00 5/5 0/0 0/0 .text
- * setUnderAnime__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERffsf  */
 int daAlink_c::setUnderAnime(u16 i_resID, daAlink_c::daAlink_UNDER i_packIdx, f32 i_speed,
                                  f32 i_startF, s16 i_endF, f32 i_morf) {
     J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[i_packIdx], i_resID, 0x2C00);
@@ -7222,16 +6959,12 @@ int daAlink_c::setUnderAnime(u16 i_resID, daAlink_c::daAlink_UNDER i_packIdx, f3
     return 1;
 }
 
-/* 800ADAB8-800ADAEC 0A83F8 0034+00 2/2 0/0 0/0 .text
- * setUnderAnimeParam__9daAlink_cFUsQ29daAlink_c13daAlink_UNDERPC16daAlinkHIO_anm_c */
 int daAlink_c::setUnderAnimeParam(u16 i_resID, daAlink_c::daAlink_UNDER i_packIdx,
                                   daAlinkHIO_anm_c const* i_anmData) {
     return setUnderAnime(i_resID, i_packIdx, i_anmData->mSpeed, i_anmData->mStartFrame,
                          i_anmData->mEndFrame, i_anmData->mInterpolation);
 }
 
-/* 800ADAEC-800ADB78 0A842C 008C+00 17/17 0/0 0/0 .text
- * resetUnderAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDERf     */
 int daAlink_c::resetUnderAnime(daAlink_c::daAlink_UNDER param_0, f32 i_morf) {
     mNowAnmPackUnder[param_0].setAnmTransform(NULL);
     mNowAnmPackUnder[param_0].setRatio(0.0f);
@@ -7241,7 +6974,6 @@ int daAlink_c::resetUnderAnime(daAlink_c::daAlink_UNDER param_0, f32 i_morf) {
     return 1;
 }
 
-/* 800ADB78-800ADC50 0A84B8 00D8+00 34/34 0/0 0/0 .text setOldRootQuaternion__9daAlink_cFsss */
 void daAlink_c::setOldRootQuaternion(s16 param_0, s16 param_1, s16 param_2) {
     Quaternion quat;
     Quaternion quat2;
@@ -7260,7 +6992,6 @@ void daAlink_c::setOldRootQuaternion(s16 param_0, s16 param_1, s16 param_2) {
     }
 }
 
-/* 800ADC50-800ADCEC 0A8590 009C+00 2/2 0/0 0/0 .text            checkAtnLeftAnime__9daAlink_cFv */
 BOOL daAlink_c::checkAtnLeftAnime() {
     return checkUnderMove0BckNoArc(ANM_ATN_WAIT_LEFT) ||
            checkUnderMove0BckNoArc(ANM_ATN_WALK_LEFT) ||
@@ -7269,7 +7000,6 @@ BOOL daAlink_c::checkAtnLeftAnime() {
            checkUnderMove0BckNoArc(ANM_ATN_LOCK_RUN_LEFT);
 }
 
-/* 800ADCEC-800ADD88 0A862C 009C+00 1/1 0/0 0/0 .text            checkAtnRightAnime__9daAlink_cFv */
 BOOL daAlink_c::checkAtnRightAnime() {
     return checkUnderMove0BckNoArc(ANM_ATN_WAIT_RIGHT) ||
            checkUnderMove0BckNoArc(ANM_ATN_WALK_RIGHT) ||
@@ -7278,7 +7008,6 @@ BOOL daAlink_c::checkAtnRightAnime() {
            checkUnderMove0BckNoArc(ANM_ATN_LOCK_RUN_RIGHT);
 }
 
-/* 800ADD88-800ADE14 0A86C8 008C+00 3/3 0/0 0/0 .text getMoveGroundAngleSpeedRate__9daAlink_cFv */
 f32 daAlink_c::getMoveGroundAngleSpeedRate() {
     s16 gnd_angle;
 
@@ -7291,8 +7020,6 @@ f32 daAlink_c::getMoveGroundAngleSpeedRate() {
     return fabsf((mNormalSpeed * cM_scos(gnd_angle)) / field_0x594);
 }
 
-/* 800ADE14-800AEA70 0A8754 0C5C+00 20/20 0/0 0/0 .text            setBlendMoveAnime__9daAlink_cFf
- */
 void daAlink_c::setBlendMoveAnime(f32 param_0) {
     daPy_frameCtrl_c* sp34 = &mUnderFrameCtrl[0];
     daPy_frameCtrl_c* sp30 = &mUnderFrameCtrl[1];
@@ -7573,7 +7300,6 @@ void daAlink_c::setBlendMoveAnime(f32 param_0) {
     }
 }
 
-/* 800AEA70-800AF11C 0A93B0 06AC+00 17/17 0/0 0/0 .text setBlendAtnMoveAnime__9daAlink_cFf */
 void daAlink_c::setBlendAtnMoveAnime(f32 param_0) {
     s16 spA = (current.angle.y - shape_angle.y);
     f32 sp44 = cM_ssin(spA);
@@ -7802,7 +7528,6 @@ void daAlink_c::setBlendAtnMoveAnime(f32 param_0) {
     }
 }
 
-/* 800AF11C-800AF4B0 0A9A5C 0394+00 1/1 0/0 0/0 .text setBlendAtnBackMoveAnime__9daAlink_cFf */
 void daAlink_c::setBlendAtnBackMoveAnime(f32 param_0) {
     f32 var_f27;
     f32 var_f31;
@@ -7896,7 +7621,6 @@ void daAlink_c::setBlendAtnBackMoveAnime(f32 param_0) {
     }
 }
 
-/* 800AF4B0-800AF61C 0A9DF0 016C+00 29/29 0/0 0/0 .text            setFaceBck__9daAlink_cFUsiUs */
 void daAlink_c::setFaceBck(u16 param_0, int param_1, u16 param_2) {
     if (!checkNoResetFlg0(FLG0_SWIM_UP) && mProcID != PROC_GET_ITEM) {
         param_0 = 0x157;
@@ -7926,7 +7650,6 @@ void daAlink_c::setFaceBck(u16 param_0, int param_1, u16 param_2) {
     }
 }
 
-/* 800AF61C-800AF7D0 0A9F5C 01B4+00 7/7 0/0 0/0 .text            setFaceBtp__9daAlink_cFUsiUs */
 void daAlink_c::setFaceBtp(u16 param_0, int param_1, u16 param_2) {
     setIdxMask(&param_2, &param_0);
 
@@ -7969,7 +7692,6 @@ void daAlink_c::setFaceBtp(u16 param_0, int param_1, u16 param_2) {
     }
 }
 
-/* 800AF7D0-800AF8A0 0AA110 00D0+00 6/6 0/0 0/0 .text            setFaceBtk__9daAlink_cFUsiUs */
 void daAlink_c::setFaceBtk(u16 i_resID, int param_1, u16 i_arcNo) {
     setIdxMask(&i_arcNo, &i_resID);
 
@@ -7992,8 +7714,6 @@ void daAlink_c::setFaceBtk(u16 i_resID, int param_1, u16 i_arcNo) {
     }
 }
 
-/* 800AF8A0-800AF9A8 0AA1E0 0108+00 31/31 0/0 0/0 .text
- * setFaceBasicTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM  */
 daAlink_c::daAlink_FTANM daAlink_c::setFaceBasicTexture(daAlink_c::daAlink_FTANM param_0) {
     if (checkWindSpeedOnAngleAnime(0)) {
         if (param_0 == FTANM_UNK_0) {
@@ -8018,8 +7738,6 @@ daAlink_c::daAlink_FTANM daAlink_c::setFaceBasicTexture(daAlink_c::daAlink_FTANM
     return param_0;
 }
 
-/* 800AF9A8-800AFAA8 0AA2E8 0100+00 5/5 0/0 0/0 .text
- * setFaceBasicAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM      */
 void daAlink_c::setFaceBasicAnime(daAlink_c::daAlink_ANM param_0) {
     const daAlink_AnmData* temp_r3 = getAnmData(param_0);
 
@@ -8039,15 +7757,11 @@ void daAlink_c::setFaceBasicAnime(daAlink_c::daAlink_ANM param_0) {
     }
 }
 
-/* 800AFAA8-800AFB14 0AA3E8 006C+00 16/16 0/0 0/0 .text
- * setFacePriTexture__9daAlink_cFQ29daAlink_c13daAlink_FTANM    */
 void daAlink_c::setFacePriTexture(daAlink_c::daAlink_FTANM i_anmID) {
     setFacePriBtp(getFaceTexData(i_anmID)->m_btpID);
     setFacePriBtk(getFaceTexData(i_anmID)->m_btkID);
 }
 
-/* 800AFB14-800AFB74 0AA454 0060+00 6/6 0/0 0/0 .text
- * setFacePriAnime__9daAlink_cFQ29daAlink_c11daAlink_ANM        */
 void daAlink_c::setFacePriAnime(daAlink_c::daAlink_ANM i_anmID) {
     const daAlink_AnmData* anm_data = getAnmData(i_anmID);
 
@@ -8055,7 +7769,6 @@ void daAlink_c::setFacePriAnime(daAlink_c::daAlink_ANM i_anmID) {
     setFacePriBck(anm_data->m_faceBckID);
 }
 
-/* 800AFB74-800AFBD0 0AA4B4 005C+00 1/1 0/0 0/0 .text            resetFacePriBck__9daAlink_cFv */
 void daAlink_c::resetFacePriBck() {
     if (!mFaceBckHeap.checkNoSetPriIdx()) {
         mFaceBckHeap.resetPriIdx();
@@ -8070,7 +7783,6 @@ void daAlink_c::resetFacePriBck() {
     }
 }
 
-/* 800AFBD0-800AFC2C 0AA510 005C+00 1/1 0/0 0/0 .text            resetFacePriBtp__9daAlink_cFv */
 void daAlink_c::resetFacePriBtp() {
     if (!mFaceBtpHeap.checkNoSetPriIdx()) {
         mFaceBtpHeap.resetPriIdx();
@@ -8085,7 +7797,6 @@ void daAlink_c::resetFacePriBtp() {
     }
 }
 
-/* 800AFC2C-800AFC88 0AA56C 005C+00 1/1 0/0 0/0 .text            resetFacePriBtk__9daAlink_cFv */
 void daAlink_c::resetFacePriBtk() {
     if (!mFaceBtkHeap.checkNoSetPriIdx()) {
         mFaceBtkHeap.resetPriIdx();
@@ -8100,21 +7811,16 @@ void daAlink_c::resetFacePriBtk() {
     }
 }
 
-/* 800AFC88-800AFCBC 0AA5C8 0034+00 1/1 0/0 0/0 .text            resetFacePriTexture__9daAlink_cFv
- */
 void daAlink_c::resetFacePriTexture() {
     resetFacePriBtp();
     resetFacePriBtk();
 }
 
-/* 800AFCBC-800AFCF0 0AA5FC 0034+00 7/7 0/0 0/0 .text            resetFacePriAnime__9daAlink_cFv */
 void daAlink_c::resetFacePriAnime() {
     resetFacePriTexture();
     resetFacePriBck();
 }
 
-/* 800AFCF0-800B0098 0AA630 03A8+00 2/2 0/0 0/0 .text            playFaceTextureAnime__9daAlink_cFv
- */
 void daAlink_c::playFaceTextureAnime() {
     if (checkNoResetFlg1(FLG1_UNK_200) && !mFaceBtpHeap.checkNoSetPriIdx()) {
         simpleAnmPlay(field_0x2154);
@@ -8212,8 +7918,6 @@ void daAlink_c::playFaceTextureAnime() {
     }
 }
 
-/* 800B0098-800B0150 0AA9D8 00B8+00 14/14 0/0 0/0 .text
- * getGroundAngle__9daAlink_cFP13cBgS_PolyInfos                 */
 s16 daAlink_c::getGroundAngle(cBgS_PolyInfo* i_poly, s16 i_angle) {
     if (!dComIfG_Bgsp().ChkPolySafe(*i_poly)) {
         return 0;
@@ -8227,8 +7931,6 @@ s16 daAlink_c::getGroundAngle(cBgS_PolyInfo* i_poly, s16 i_angle) {
     return fopAcM_getPolygonAngle(&plane, i_angle);
 }
 
-/* 800B0150-800B01FC 0AAA90 00AC+00 1/1 0/0 0/0 .text getRoofAngle__9daAlink_cFP13cBgS_PolyInfos
- */
 s16 daAlink_c::getRoofAngle(cBgS_PolyInfo* param_0, s16 param_1) {
     cM3dGPla plane;
 
@@ -8239,8 +7941,6 @@ s16 daAlink_c::getRoofAngle(cBgS_PolyInfo* param_0, s16 param_1) {
     return fopAcM_getPolygonAngle(&plane, param_1) + 0x8000;
 }
 
-/* 800B01FC-800B02BC 0AAB3C 00C0+00 2/2 0/0 0/0 .text
- * getWallEdgePos__9daAlink_cFRC4cXyzP8cM3dGPlaP8cM3dGPlaP4cXyzi */
 BOOL daAlink_c::getWallEdgePos(cXyz const& param_0, cM3dGPla* i_planeA, cM3dGPla* i_planeB,
                                cXyz* o_outVec, int unused) {
     cXyz normal(i_planeA->mNormal.z, 0.0f, -i_planeA->mNormal.x);
@@ -8251,7 +7951,6 @@ BOOL daAlink_c::getWallEdgePos(cXyz const& param_0, cM3dGPla* i_planeA, cM3dGPla
     return cM3d_3PlaneCrossPos(*i_planeA, *i_planeB, planeC, o_outVec);
 }
 
-/* 800B02BC-800B146C 0AABFC 11B0+00 9/9 0/0 0/0 .text            setFrontWallType__9daAlink_cFv */
 void daAlink_c::setFrontWallType() {
     f32 var_f31;
     if (checkWolf()) {
@@ -8666,12 +8365,10 @@ void daAlink_c::setFrontWallType() {
     }
 }
 
-/* 800B1488-800B14B4 0ABDC8 002C+00 4/4 0/0 0/0 .text checkWaterPolygonUnder__9daAlink_cFv */
 BOOL daAlink_c::checkWaterPolygonUnder() {
     return checkModeFlg(MODE_SWIMMING) || current.pos.y < mWaterY;
 }
 
-/* 800B14B4-800B154C 0ABDF4 0098+00 2/2 0/0 0/0 .text            setWaterY__9daAlink_cFv */
 void daAlink_c::setWaterY() {
     if (mLinkAcch.ChkWaterHit()) {
         onNoResetFlg0(FLG0_UNK_80);
@@ -8687,7 +8384,6 @@ void daAlink_c::setWaterY() {
     }
 }
 
-/* 800B154C-800B172C 0ABE8C 01E0+00 2/2 0/0 0/0 .text            setHangWaterY__9daAlink_cFv */
 void daAlink_c::setHangWaterY() {
     cXyz sp14;
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &sp14);
@@ -8742,7 +8438,6 @@ void daAlink_c::setHangWaterY() {
 
 }
 
-/* 800B172C-800B1770 0AC06C 0044+00 3/3 0/0 0/0 .text setSandDownBgCheckWallH__9daAlink_cFv */
 void daAlink_c::setSandDownBgCheckWallH() {
     if (!checkModeFlg(0x400)) {
         for (int i = 0; i < 3; i++) {
@@ -8751,7 +8446,6 @@ void daAlink_c::setSandDownBgCheckWallH() {
     }
 }
 
-/* 800B1770-800B1B28 0AC0B0 03B8+00 2/2 0/0 0/0 .text            setBgCheckParam__9daAlink_cFv */
 void daAlink_c::setBgCheckParam() {
     mAcchCir[0].SetWallH(l_autoUpHeight);
     mAcchCir[1].SetWallH(129.99f);
@@ -8847,21 +8541,16 @@ void daAlink_c::setBgCheckParam() {
     setSandDownBgCheckWallH();
 }
 
-/* 800B1B28-800B1B68 0AC468 0040+00 4/4 0/0 0/0 .text            checkNotJumpSinkLimit__9daAlink_cFv
- */
 BOOL daAlink_c::checkNotJumpSinkLimit() {
     return mSinkShapeOffset < -30.0f || field_0x2fbd == 3 ||
            (field_0x2fbd == 4 && mSinkShapeOffset < -15.0f);
 }
 
-/* 800B1B68-800B1BAC 0AC4A8 0044+00 2/2 0/0 0/0 .text            checkNotItemSinkLimit__9daAlink_cFv
- */
 BOOL daAlink_c::checkNotItemSinkLimit() {
     return mSinkShapeOffset < -34.0f &&
            (field_0x2fbd == 1 || field_0x2fbd == 2 || field_0x2fbd == 3 || field_0x2fbd == 4);
 }
 
-/* 800B1BAC-800B1FB8 0AC4EC 040C+00 2/2 0/0 0/0 .text            setSandShapeOffset__9daAlink_cFv */
 void daAlink_c::setSandShapeOffset() {
     f32 var_f30 = 0.0f;
     f32 var_f31 = 0.0f;
@@ -8970,12 +8659,10 @@ void daAlink_c::setSandShapeOffset() {
     }
 }
 
-/* 800B1FB8-800B1FD8 0AC8F8 0020+00 2/2 0/0 0/0 .text checkLv2MiddleBossBgRide__9daAlink_cFs */
 bool daAlink_c::checkLv2MiddleBossBgRide(s16 i_procName) {
     return i_procName == PROC_OBJ_MSIMA || i_procName == PROC_B_ZANTS;
 }
 
-/* 800B1FD8-800B21EC 0AC918 0214+00 11/11 0/0 0/0 .text getSlidePolygon__9daAlink_cFP8cM3dGPla */
 bool daAlink_c::getSlidePolygon(cM3dGPla* param_0) {
     if (!checkMagneBootsOn() && mLinkAcch.ChkGroundHit() && !checkModeFlg(0x40000) && (mGndPolySpecialCode != 6) && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) {
         if ((checkEquipHeavyBoots() && daTagMagne_c::checkMagnetCode(mLinkAcch.m_gnd)) || mProcID == PROC_GORON_MOVE) {
@@ -8997,13 +8684,10 @@ bool daAlink_c::getSlidePolygon(cM3dGPla* param_0) {
     return 0;
 }
 
-/* 800B21EC-800B221C 0ACB2C 0030+00 4/4 0/0 0/0 .text            checkSlope__9daAlink_cCFv */
 BOOL daAlink_c::checkSlope() const {
     return field_0x3174 != 8 && field_0x2ff0 < -field_0x3122;
 }
 
-/* 800B221C-800B23FC 0ACB5C 01E0+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daAlink_cFPC4cXyzsi
- */
 void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2) {
     if (checkEventRun() || param_2 != 0 || mSpecialMode != 0) {
         if (p_pos != NULL) {
@@ -9045,8 +8729,6 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2
     }
 }
 
-/* 800B23FC-800B24F4 0ACD3C 00F8+00 1/0 0/0 0/0 .text
- * setPlayerPosAndAngle__9daAlink_cFPC4cXyzPC5csXyz             */
 void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) {
     if (checkEventRun() || mSpecialMode != 0) {
         if (p_pos != NULL) {
@@ -9068,7 +8750,6 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, csXyz const* p_angle) {
     }
 }
 
-/* 800B24F4-800B25CC 0ACE34 00D8+00 1/0 0/0 0/0 .text setPlayerPosAndAngle__9daAlink_cFPA4_f */
 void daAlink_c::setPlayerPosAndAngle(Mtx param_0) {
     if (checkEventRun() || mSpecialMode != 0) {
         current.pos.x = param_0[0][3];
@@ -9086,14 +8767,11 @@ void daAlink_c::setPlayerPosAndAngle(Mtx param_0) {
     }
 }
 
-/* 800B25CC-800B25E8 0ACF0C 001C+00 16/16 0/0 0/0 .text            itemTriggerCheck__9daAlink_cFUc
- */
 BOOL daAlink_c::itemTriggerCheck(u8 btnFlag) {
     field_0x2fae |= btnFlag;
     return mItemTrigger & btnFlag;
 }
 
-/* 800B25E8-800B2604 0ACF28 001C+00 11/11 0/0 0/0 .text            itemButtonCheck__9daAlink_cFUc */
 BOOL daAlink_c::itemButtonCheck(u8 btnFlag) {
     field_0x2fae |= btnFlag;
     return mItemButton & btnFlag;
@@ -9123,17 +8801,14 @@ BOOL daAlink_c::swordSwingTrigger() {
     return itemTriggerCheck(BTN_B);
 }
 
-/* 800B26DC-800B26FC 0AD01C 0020+00 2/2 0/0 0/0 .text setItemActionButtonStatus__9daAlink_cFUc */
 void daAlink_c::setItemActionButtonStatus(u8 param_0) {
     setRStatusEmphasys(param_0);
 }
 
-/* 800B26FC-800B271C 0AD03C 0020+00 2/2 0/0 1/1 .text            itemActionTrigger__9daAlink_cFv */
 BOOL daAlink_c::itemActionTrigger() {
     return spActionTrigger();
 }
 
-/* 800B271C-800B2EA4 0AD05C 0788+00 1/1 0/0 0/0 .text            setStickData__9daAlink_cFv */
 void daAlink_c::setStickData() {
     BOOL var_r31 = false;
     field_0x2f8f = mItemButton;
@@ -9324,7 +8999,6 @@ void daAlink_c::setStickData() {
     }
 }
 
-/* 800B2EA4-800B3220 0AD7E4 037C+00 1/1 0/0 0/0 .text            setAtnList__9daAlink_cFv */
 void daAlink_c::setAtnList() {
     mAttList = NULL;
     mAttList2 = NULL;
@@ -9418,38 +9092,30 @@ void daAlink_c::setAtnList() {
     mZ2Link.setMarkState(var_r30);
 }
 
-/* 800B3220-800B3238 0ADB60 0018+00 5/5 0/0 0/0 .text            setRStatus__9daAlink_cFUc */
 void daAlink_c::setRStatus(u8 status) {
     dComIfGp_setRStatus(status, 0);
 }
 
-/* 800B3238-800B3250 0ADB78 0018+00 1/1 0/0 0/0 .text            setRStatusEmphasys__9daAlink_cFUc
- */
 void daAlink_c::setRStatusEmphasys(u8 status) {
     dComIfGp_setRStatus(status, 2);
 }
 
-/* 800B3250-800B3268 0ADB90 0018+00 61/61 0/0 0/0 .text            setDoStatus__9daAlink_cFUc */
 void daAlink_c::setDoStatus(u8 status) {
     dComIfGp_setDoStatus(status, 0);
 }
 
-/* 800B3268-800B3280 0ADBA8 0018+00 19/19 0/0 0/0 .text setDoStatusEmphasys__9daAlink_cFUc */
 void daAlink_c::setDoStatusEmphasys(u8 status) {
     dComIfGp_setDoStatus(status, 2);
 }
 
-/* 800B3280-800B3298 0ADBC0 0018+00 2/2 0/0 0/0 .text setDoStatusContinuation__9daAlink_cFUc */
 void daAlink_c::setDoStatusContinuation(u8 status) {
     dComIfGp_setDoStatus(status, 4);
 }
 
-/* 800B3298-800B32B0 0ADBD8 0018+00 8/8 0/0 0/0 .text            setBStatus__9daAlink_cFUc */
 void daAlink_c::setBStatus(u8 status) {
     dComIfGp_setAStatus(status, 0);
 }
 
-/* 800B32B0-800B3358 0ADBF0 00A8+00 2/2 0/0 0/0 .text            checkAtnWaitAnime__9daAlink_cFv */
 BOOL daAlink_c::checkAtnWaitAnime() {
     if ((mTargetedActor != NULL &&
          (checkEnemyGroup(mTargetedActor) || checkGoatCatchActor(mTargetedActor) ||
@@ -9464,8 +9130,6 @@ BOOL daAlink_c::checkAtnWaitAnime() {
     return false;
 }
 
-/* 800B3358-800B33E4 0ADC98 008C+00 2/2 0/0 0/0 .text
- * setTiredVoice__9daAlink_cFP16daPy_frameCtrl_c                */
 void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) {
     if (i_frameCtrl->checkPass(12.0f)) {
         if (dComIfGs_getLife() <= 2) {
@@ -9476,7 +9140,6 @@ void daAlink_c::setTiredVoice(daPy_frameCtrl_c* i_frameCtrl) {
     }
 }
 
-/* 800B33E4-800B3494 0ADD24 00B0+00 4/4 0/0 0/0 .text            checkRestHPAnime__9daAlink_cFv */
 BOOL daAlink_c::checkRestHPAnime() {
     if (!checkPlayerGuard() && (checkNoUpperAnime() || checkHorseTiredAnime()) &&
         mTargetedActor == NULL && !checkWindSpeedOnAngle() &&
@@ -9488,7 +9151,6 @@ BOOL daAlink_c::checkRestHPAnime() {
     return false;
 }
 
-/* 800B3494-800B3500 0ADDD4 006C+00 44/44 0/0 0/0 .text getDirectionFromAngle__9daAlink_cFs */
 int daAlink_c::getDirectionFromAngle(s16 angle) {
     if (abs(angle) > 0x6000) {
         return DIR_BACKWARD;
@@ -9505,8 +9167,6 @@ int daAlink_c::getDirectionFromAngle(s16 angle) {
     return DIR_FORWARD;
 }
 
-/* 800B3500-800B3630 0ADE40 0130+00 13/13 0/0 0/0 .text            checkAttentionState__9daAlink_cFv
- */
 bool daAlink_c::checkAttentionState() {
     return (checkAttentionLock() || checkFmChainGrabAnime()) ||
            (mTargetedActor != NULL && (mTargetedActor == mThrowBoomerangAcKeep.getActor() || mTargetedActor == mCopyRodAcKeep.getActor())) ||
@@ -9514,7 +9174,6 @@ bool daAlink_c::checkAttentionState() {
            mDemo.getDemoMode() == 0x17;
 }
 
-/* 800B3630-800B3734 0ADF70 0104+00 5/5 0/0 0/0 .text getShapeAngleYAtnActor__9daAlink_cFv */
 s16 daAlink_c::getShapeAngleYAtnActor() {
     s16 var_r29;
 
@@ -9547,7 +9206,6 @@ s16 daAlink_c::getShapeAngleYAtnActor() {
     return var_r29;
 }
 
-/* 800B3734-800B3844 0AE074 0110+00 26/26 0/0 0/0 .text setShapeAngleToAtnActor__9daAlink_cFi */
 bool daAlink_c::setShapeAngleToAtnActor(int param_0) {
     if (mTargetedActor != NULL) {
         if ((mTargetedActor == mThrowBoomerangAcKeep.getActor() && (checkBoomerangThrowAnime() || !checkInputOnR())) ||
@@ -9568,8 +9226,6 @@ bool daAlink_c::setShapeAngleToAtnActor(int param_0) {
     return false;
 }
 
-/* 800B3844-800B3904 0AE184 00C0+00 9/9 0/0 0/0 .text            initServiceWaitTime__9daAlink_cFv
- */
 void daAlink_c::initServiceWaitTime() {
     field_0x30ca = cM_rndF(150.0f) + 300.0f;
 
@@ -9580,12 +9236,10 @@ void daAlink_c::initServiceWaitTime() {
     }
 }
 
-/* 800B3904-800B3924 0AE244 0020+00 50/50 0/0 0/0 .text            checkZeroSpeedF__9daAlink_cCFv */
 bool daAlink_c::checkZeroSpeedF() const {
     return fabsf(mNormalSpeed) < 0.0010000000474974513f;
 }
 
-/* 800B3924-800B3F2C 0AE264 0608+00 14/14 0/0 0/0 .text            setNormalSpeedF__9daAlink_cFff */
 void daAlink_c::setNormalSpeedF(f32 i_incSpeed, f32 param_1) {
     f32 var_f31;
     if (getSumouMode()) {
@@ -9700,7 +9354,6 @@ void daAlink_c::setNormalSpeedF(f32 i_incSpeed, f32 param_1) {
     }
 }
 
-/* 800B3F2C-800B3FD4 0AE86C 00A8+00 2/2 0/0 0/0 .text getStickAngleDistanceRate__9daAlink_cFv */
 f32 daAlink_c::getStickAngleDistanceRate() {
     f32 rate;
 
@@ -9721,7 +9374,6 @@ f32 daAlink_c::getStickAngleDistanceRate() {
     return rate;
 }
 
-/* 800B3FD4-800B444C 0AE914 0478+00 3/3 0/0 0/0 .text setSpeedAndAngleNormal__9daAlink_cFv */
 void daAlink_c::setSpeedAndAngleNormal() {
     bool var_r26 = false;
 
@@ -9831,8 +9483,6 @@ void daAlink_c::setSpeedAndAngleNormal() {
     setNormalSpeedF(var_f31, daAlinkHIO_move_c0::m.mDeceleration);
 }
 
-/* 800B444C-800B477C 0AED8C 0330+00 1/1 0/0 0/0 .text            setSpeedAndAngleAtn__9daAlink_cFv
- */
 void daAlink_c::setSpeedAndAngleAtn() {
     int var_r29 = field_0x2f98;
 
@@ -9943,8 +9593,6 @@ void daAlink_c::setSpeedAndAngleAtn() {
     setNormalSpeedF(var_f28, var_f30);
 }
 
-/* 800B477C-800B47B4 0AF0BC 0038+00 2/2 0/0 0/0 .text
- * checkRequestTalkActor__9daAlink_cFP10dAttList_cP10fopAc_ac_c */
 int daAlink_c::checkRequestTalkActor(dAttList_c* param_0, fopAc_ac_c* param_1) {
     if (param_0 != NULL &&
         (param_0->mType == fopAc_attn_SPEAK_e || (param_0->mType == fopAc_attn_TALK_e && mTargetedActor == param_1)))
@@ -9955,8 +9603,6 @@ int daAlink_c::checkRequestTalkActor(dAttList_c* param_0, fopAc_ac_c* param_1) {
     return false;
 }
 
-/* 800B47B4-800B48D0 0AF0F4 011C+00 4/4 0/0 0/0 .text            checkServiceWaitMode__9daAlink_cFv
- */
 bool daAlink_c::checkServiceWaitMode() {
     return !checkEventRun() &&
            !checkEndResetFlg0(ERFLG0_BOSS_ROOM_WAIT) &&
@@ -9969,7 +9615,6 @@ bool daAlink_c::checkServiceWaitMode() {
            mSinkShapeOffset >= -30.0f;
 }
 
-/* 800B48D0-800B4908 0AF210 0038+00 18/18 0/0 0/0 .text            setJumpMode__9daAlink_cFv */
 void daAlink_c::setJumpMode() {
     onModeFlg(MODE_JUMP);
     mLastJumpPos = current.pos;
@@ -9977,29 +9622,24 @@ void daAlink_c::setJumpMode() {
     field_0x33c8 = mLastJumpPos.y;
 }
 
-/* 800B4908-800B4918 0AF248 0010+00 0/0 0/0 1/1 .text getMetamorphoseNearDis__9daAlink_cCFv */
 f32 daAlink_c::getMetamorphoseNearDis() const {
     return daAlinkHIO_basic_c0::m.mTransformBlockNearDis;
 }
 
-/* 800B4918-800B4928 0AF258 0010+00 0/0 0/0 1/1 .text getMetamorphoseFarDis__9daAlink_cCFv */
 f32 daAlink_c::getMetamorphoseFarDis() const {
     return daAlinkHIO_basic_c0::m.mTransformBlockFarDis;
 }
 
-/* 800B4928-800B4938 0AF268 0010+00 0/0 0/0 1/1 .text getMetamorphoseFarAngle__9daAlink_cCFv */
 s16 daAlink_c::getMetamorphoseFarAngle() const {
     return daAlinkHIO_basic_c0::m.mTransformBlockFarAngle;
 }
 
-/* 800B4938-800B4950 0AF278 0018+00 0/0 1/1 0/0 .text            setMidnaMsg__9daAlink_cFv */
 void daAlink_c::setMidnaMsg() {
     if (mMidnaMsg != NULL) {
         mMidnaMsg->onUseFlg();
     }
 }
 
-/* 800B4950-800B4A08 0AF290 00B8+00 3/3 0/0 0/0 .text            notTalk__9daAlink_cFv */
 BOOL daAlink_c::notTalk() {
     BOOL safe_poly;
     if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && dBgS_CheckBGroundPoly(mLinkAcch.m_gnd)) {
@@ -10019,7 +9659,6 @@ BOOL daAlink_c::notTalk() {
     return false;
 }
 
-/* 800B4A08-800B4B2C 0AF348 0124+00 11/11 0/0 0/0 .text            setTalkStatus__9daAlink_cFv */
 BOOL daAlink_c::setTalkStatus() {
     if (checkEndResetFlg0(ERFLG0_BEE_FOLLOW) || field_0x27f4 == NULL) {
         return 0;
@@ -10056,7 +9695,6 @@ BOOL daAlink_c::setTalkStatus() {
     return 0;
 }
 
-/* 800B4B2C-800B4B7C 0AF46C 0050+00 1/1 0/0 0/0 .text            getFrontRollRate__9daAlink_cFv */
 f32 daAlink_c::getFrontRollRate() {
     if (checkHeavyStateOn(1, 1)) {
         return 0.75f * mHeavySpeedMultiplier;
@@ -10065,8 +9703,6 @@ f32 daAlink_c::getFrontRollRate() {
     }
 }
 
-/* 800B4B7C-800B5284 0AF4BC 0708+00 2/2 0/0 0/0 .text            decideCommonDoStatus__9daAlink_cFv
- */
 void daAlink_c::decideCommonDoStatus() {
     if (!checkFmChainGrabAnime() && dComIfGp_getDoStatus() == 0) {
         bool temp_r3 = checkStageName("R_SP127");
@@ -10203,7 +9839,6 @@ void daAlink_c::decideCommonDoStatus() {
     }
 }
 
-/* 800B5284-800B58EC 0AFBC4 0668+00 1/1 0/0 0/0 .text            decideDoStatus__9daAlink_cFv */
 void daAlink_c::decideDoStatus() {
     if (!checkFmChainGrabAnime()) {
         if (checkNoResetFlg0(FLG0_UNK_1000000)) {
@@ -10343,7 +9978,6 @@ void daAlink_c::decideDoStatus() {
     }
 }
 
-/* 800B58EC-800B5BC0 0B022C 02D4+00 25/25 0/0 0/0 .text            checkWaitAction__9daAlink_cFv */
 BOOL daAlink_c::checkWaitAction() {
     if (checkWolf()) {
         if (checkModeFlg(0x01000000)) {
@@ -10414,7 +10048,6 @@ BOOL daAlink_c::checkWaitAction() {
     return procWaitInit();
 }
 
-/* 800B5BC0-800B5C34 0B0500 0074+00 3/3 0/0 0/0 .text            setFallVoice__9daAlink_cFv */
 void daAlink_c::setFallVoice() {
     if (mFallVoiceInit == 0 && 0.0099999998f * (mFallHeight - current.pos.y) > 20.0f) {
         voiceStart(Z2SE_AL_V_FALL);
@@ -10422,7 +10055,6 @@ void daAlink_c::setFallVoice() {
     }
 }
 
-/* 800B5C34-800B5C64 0B0574 0030+00 2/2 0/0 0/0 .text            setLandPassiveData__9daAlink_cFv */
 void daAlink_c::setLandPassiveData() {
     if (field_0x30f0 == 0) {
         if (doTrigger()) {
@@ -10433,8 +10065,6 @@ void daAlink_c::setLandPassiveData() {
     }
 }
 
-/* 800B5C64-800B5CCC 0B05A4 0068+00 5/5 0/0 0/0 .text            setStepLandVibration__9daAlink_cFv
- */
 void daAlink_c::setStepLandVibration() {
     int shock;
     if (checkBootsOrArmorHeavy()) {
@@ -10446,7 +10076,6 @@ void daAlink_c::setStepLandVibration() {
     dComIfGp_getVibration().StartShock(shock, 15, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 800B5CCC-800B5F6C 0B060C 02A0+00 5/5 0/0 0/0 .text            checkLandAction__9daAlink_cFi */
 BOOL daAlink_c::checkLandAction(int param_0) {
     f32 temp_f31 = 0.0099999998f * (mFallHeight - current.pos.y);
     int temp_r3 = getDirectionFromCurrentAngle();
@@ -10506,7 +10135,6 @@ BOOL daAlink_c::checkLandAction(int param_0) {
     return 1;
 }
 
-/* 800B5F6C-800B607C 0B08AC 0110+00 3/3 0/0 0/0 .text            checkSlideAction__9daAlink_cFv */
 BOOL daAlink_c::checkSlideAction() {
     cM3dGPla sp28;
     if (getSlidePolygon(&sp28)) {
@@ -10531,8 +10159,6 @@ BOOL daAlink_c::checkSlideAction() {
     }
 }
 
-/* 800B607C-800B69CC 0B09BC 0950+00 2/2 0/0 0/0 .text            checkAutoJumpAction__9daAlink_cFv
- */
 BOOL daAlink_c::checkAutoJumpAction() {
     if (checkMagneBootsFly()) {
         return 1;
@@ -10717,7 +10343,6 @@ BOOL daAlink_c::checkAutoJumpAction() {
     return 0;
 }
 
-/* 800B69CC-800B6A30 0B130C 0064+00 2/2 0/0 0/0 .text            checkCutJumpInFly__9daAlink_cFv */
 BOOL daAlink_c::checkCutJumpInFly() {
     if ((mEquipItem == 0x103 && checkResetFlg0(RFLG0_UNK_80)) || checkForceSwordSwing()) {
         return procCutJumpInit(1);
@@ -10725,7 +10350,6 @@ BOOL daAlink_c::checkCutJumpInFly() {
     return false;
 }
 
-/* 800B6A30-800B6F28 0B1370 04F8+00 16/16 0/0 0/0 .text checkFrontWallTypeAction__9daAlink_cFv */
 BOOL daAlink_c::checkFrontWallTypeAction() {
     setFrontWallType();
 
@@ -10846,7 +10470,6 @@ BOOL daAlink_c::checkFrontWallTypeAction() {
     return 0;
 }
 
-/* 800B6F28-800B7090 0B1868 0168+00 3/3 0/0 0/0 .text checkItemActionInitStart__9daAlink_cFv */
 int daAlink_c::checkItemActionInitStart() {
     if (checkBowAndSlingItem(mEquipItem)) {
         return checkNextActionBow();
@@ -10880,7 +10503,6 @@ int daAlink_c::checkItemActionInitStart() {
     return -1;
 }
 
-/* 800B7090-800B7168 0B19D0 00D8+00 1/1 0/0 0/0 .text checkItemChangeAutoAction__9daAlink_cFv */
 int daAlink_c::checkItemChangeAutoAction() {
     if (checkResetFlg0(RFLG0_UNK_80)) {
         if (mEquipItem == 0x103) {
@@ -10908,14 +10530,12 @@ int daAlink_c::checkItemChangeAutoAction() {
     return 0;
 }
 
-/* 800B7168-800B7190 0B1AA8 0028+00 7/7 0/0 0/0 .text            setFastShotTimer__9daAlink_cFv */
 void daAlink_c::setFastShotTimer() {
     if (!dComIfGp_checkPlayerStatus0(0, 0x2000)) {
         mFastShotTime = daAlinkHIO_item_c0::m.mItemFPTransitionTimer;
     }
 }
 
-/* 800B7190-800B71EC 0B1AD0 005C+00 9/9 0/0 0/0 .text            cancelItemUseQuake__9daAlink_cFi */
 void daAlink_c::cancelItemUseQuake(int param_0) {
     if (checkNoResetFlg3(FLG3_UNK_4) && (param_0 != 0 || mProcID != PROC_HOOKSHOT_FLY)) {
         offNoResetFlg3(FLG3_UNK_4);
@@ -10923,7 +10543,6 @@ void daAlink_c::cancelItemUseQuake(int param_0) {
     }
 }
 
-/* 800B71EC-800B72E4 0B1B2C 00F8+00 6/6 0/0 0/0 .text cancelUpperItemReadyAnime__9daAlink_cFi */
 int daAlink_c::cancelUpperItemReadyAnime(int param_0) {
     if ((dComIfGp_getDoStatus() == 0x12 || param_0 != 0) &&
         ((param_0 == 0 && doTrigger()) ||
@@ -10946,8 +10565,6 @@ int daAlink_c::cancelUpperItemReadyAnime(int param_0) {
     return 0;
 }
 
-/* 800B72E4-800B7390 0B1C24 00AC+00 8/8 0/0 0/0 .text            checkItemActorPointer__9daAlink_cFv
- */
 BOOL daAlink_c::checkItemActorPointer() {
     if (mItemAcKeep.getActor() != NULL) {
         return true;
@@ -10970,8 +10587,6 @@ BOOL daAlink_c::checkItemActorPointer() {
     return false;
 }
 
-/* 800B7390-800B74B4 0B1CD0 0124+00 2/2 0/0 0/0 .text            checkSwordTwirlAction__9daAlink_cFv
- */
 bool daAlink_c::checkSwordTwirlAction() {
     daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2];
 
@@ -11000,7 +10615,6 @@ bool daAlink_c::checkSwordTwirlAction() {
     return true;
 }
 
-/* 800B74B4-800B7528 0B1DF4 0074+00 3/3 0/0 0/0 .text checkUpperItemActionFly__9daAlink_cFv */
 BOOL daAlink_c::checkUpperItemActionFly() {
     if (checkBowAndSlingItem(mEquipItem)) {
         checkUpperItemActionBowFly();
@@ -11013,8 +10627,6 @@ BOOL daAlink_c::checkUpperItemActionFly() {
     return checkCanoeJumpRide();
 }
 
-/* 800B7528-800B75EC 0B1E68 00C4+00 1/1 0/0 0/0 .text            checkItemButtonChange__9daAlink_cFv
- */
 void daAlink_c::checkItemButtonChange() {
     if (mProcID != PROC_CANOE_PADDLE_PUT && mEquipItem != fpcNm_ITEM_NONE && !checkEquipAnime()) {
         u8 temp_r0;
@@ -11029,8 +10641,6 @@ void daAlink_c::checkItemButtonChange() {
     }
 }
 
-/* 800B75EC-800B7B7C 0B1F2C 0590+00 1/1 0/0 0/0 .text            checkUpperItemAction__9daAlink_cFv
- */
 BOOL daAlink_c::checkUpperItemAction() {
     if (checkNoUpperAnime()) {
         if (checkModeFlg(0x1000)) {
@@ -11155,7 +10765,6 @@ BOOL daAlink_c::checkUpperItemAction() {
     return false;
 }
 
-/* 800B7B7C-800B7BF8 0B24BC 007C+00 1/1 0/0 0/0 .text            orderPeep__9daAlink_cFv */
 void daAlink_c::orderPeep() {
     mPeepExitID = ((kytag05_class*)field_0x27f4)->getSceneListID();
     field_0x2ff2 = 20;
@@ -11167,7 +10776,6 @@ void daAlink_c::orderPeep() {
     }
 }
 
-/* 800B7BF8-800B7D4C 0B2538 0154+00 13/13 0/0 0/0 .text            orderTalk__9daAlink_cFi */
 int daAlink_c::orderTalk(int i_checkZTalk) {
     static const u16 itemTalkType[2] = {6, 7};
 
@@ -11203,7 +10811,6 @@ int daAlink_c::orderTalk(int i_checkZTalk) {
     return 0;
 }
 
-/* 800B7D4C-800B7F84 0B268C 0238+00 1/1 0/0 0/0 .text daAlink_searchBouDoor__FP10fopAc_ac_cPv */
 static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_NPC_BOU && ((daNpc_Bou_c*)i_actor)->speakTo()) {
         return i_actor;
@@ -11212,7 +10819,6 @@ static void* daAlink_searchBouDoor(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 800B7F84-800B80C4 0B28C4 0140+00 1/1 0/0 0/0 .text daAlink_searchKolin__FP10fopAc_ac_cPv */
 static void* daAlink_searchKolin(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_NPC_KOLIN && ((daNpc_Kolin_c*)i_actor)->orderNoRideEvt()) {
         return i_actor;
@@ -11221,7 +10827,6 @@ static void* daAlink_searchKolin(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 800B80C4-800B8374 0B2A04 02B0+00 2/2 0/0 0/0 .text            orderZTalk__9daAlink_cFv */
 int daAlink_c::orderZTalk() {
     if ((!checkReinRide() && !checkModeFlg(0x40000) && !checkMagneBootsOn()
          && (!mLinkAcch.ChkGroundHit() || checkModeFlg(0x70C52))) || mThrowBoomerangAcKeep.getActor() != NULL
@@ -11272,7 +10877,6 @@ int daAlink_c::orderZTalk() {
     return 0;
 }
 
-/* 800B8374-800B8930 0B2CB4 05BC+00 1/1 0/0 0/0 .text            checkNormalAction__9daAlink_cFv */
 int daAlink_c::checkNormalAction() {
     int wall_grab_status = getWallGrabStatus();
 
@@ -11453,7 +11057,6 @@ int daAlink_c::checkNormalAction() {
     return 0;
 }
 
-/* 800B8930-800B8988 0B3270 0058+00 11/11 0/0 0/0 .text            checkReadyItem__9daAlink_cFv */
 bool daAlink_c::checkReadyItem() {
     if (mEquipItem == fpcNm_ITEM_NONE) {
         return false;
@@ -11462,7 +11065,6 @@ bool daAlink_c::checkReadyItem() {
     return getReadyItem() == mEquipItem;
 }
 
-/* 800B8988-800B9010 0B32C8 0688+00 2/2 0/0 0/0 .text            checkItemAction__9daAlink_cFv */
 BOOL daAlink_c::checkItemAction() {
     if (checkEquipAnime() || checkKandelaarSwingAnime() || checkCopyRodThrowAnime() || checkBoomerangThrowAnime()) {
         return false;
@@ -11618,12 +11220,10 @@ BOOL daAlink_c::checkItemAction() {
     return false;
 }
 
-/* 800B9010-800B9018 0B3950 0008+00 1/1 0/0 0/0 .text            checkRAction__9daAlink_cFv */
 BOOL daAlink_c::checkRAction() {
     return false;
 }
 
-/* 800B9018-800B9148 0B3958 0130+00 1/1 0/0 0/0 .text            checkMoveDoAction__9daAlink_cFv */
 BOOL daAlink_c::checkMoveDoAction() {
     if (doTrigger()) {
         if (dComIfGp_getDoStatus() == 0x19) {
@@ -11655,8 +11255,6 @@ BOOL daAlink_c::checkMoveDoAction() {
     return false;
 }
 
-/* 800B9148-800B9254 0B3A88 010C+00 3/3 0/0 0/0 .text            checkSideRollAction__9daAlink_cFi
- */
 BOOL daAlink_c::checkSideRollAction(int param_0) {
     if (checkNotJumpSinkLimit() || checkHeavyStateOn(1, 1) || !checkInputOnR() ||
         !checkCutBackState())
@@ -11677,42 +11275,31 @@ BOOL daAlink_c::checkSideRollAction(int param_0) {
     return procSideRollInit(param_0);
 }
 
-/* 800B9254-800B92D0 0B3B94 007C+00 35/35 0/0 0/0 .text            checkNoUpperAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkNoUpperAnime() const {
     return checkNoSetUpperAnime() || checkSwimMoveHandAnime() || checkWindDashAnime() ||
            checkSwordTwirlAnime() || checkKandelaarEquipAnime();
 }
 
-/* 800B92D0-800B92F8 0B3C10 0028+00 1/1 0/0 0/0 .text checkOneHandItemEquipAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkOneHandItemEquipAnime() const {
     return checkUpperAnime(0x247) || checkUpperAnime(0x248);
 }
 
-/* 800B92F8-800B9340 0B3C38 0048+00 1/1 0/0 0/0 .text            checkItemEquipAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkItemEquipAnime() const {
     return checkTwoHandItemEquipAnime() || checkOneHandItemEquipAnime();
 }
 
-/* 800B9340-800B9398 0B3C80 0058+00 30/30 0/0 1/1 .text            checkEquipAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkEquipAnime() const {
     return checkSwordEquipAnime() || checkItemEquipAnime();
 }
 
-/* 800B9398-800B93CC 0B3CD8 0034+00 4/4 0/0 0/0 .text            checkWindDashAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkWindDashAnime() const {
     return checkUpperAnime(0x2B7) || (checkUpperAnime(0xCE) && mProcID != PROC_SLIDE);
 }
 
-/* 800B93CC-800B93F4 0B3D0C 0028+00 4/4 0/0 0/0 .text            checkSwordTwirlAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkSwordTwirlAnime() const {
     return checkUpperAnime(0x40) || checkUpperAnime(0x3F);
 }
 
-/* 800B93F4-800B9580 0B3D34 018C+00 7/7 0/0 0/0 .text            swordEquip__9daAlink_cFi */
 void daAlink_c::swordEquip(int param_0) {
     if (checkSwordGet()) {
         field_0x2fde = 0x103;
@@ -11752,7 +11339,6 @@ void daAlink_c::swordEquip(int param_0) {
     }
 }
 
-/* 800B9580-800B9640 0B3EC0 00C0+00 1/1 0/0 0/0 .text            swordUnequip__9daAlink_cFv */
 void daAlink_c::swordUnequip() {
     f32 anm_speed;
     if (checkFastUnequip()) {
@@ -11770,7 +11356,6 @@ void daAlink_c::swordUnequip() {
     setFaceBck(0x15E, 1, 0xFFFF);
 }
 
-/* 800B9640-800B96A4 0B3F80 0064+00 6/6 0/0 0/0 .text            itemEquip__9daAlink_cFUs */
 void daAlink_c::itemEquip(u16 i_itemID) {
     if (mThrowBoomerangAcKeep.getActor() == NULL || i_itemID != fpcNm_ITEM_BOOMERANG) {
         field_0x2fde = i_itemID;
@@ -11780,7 +11365,6 @@ void daAlink_c::itemEquip(u16 i_itemID) {
     }
 }
 
-/* 800B96A4-800B97EC 0B3FE4 0148+00 2/2 0/0 0/0 .text            itemUnequip__9daAlink_cFUsf */
 /**
  * This handles setting the animation for both equipping and unequipping items
  * When `param_1` is positive, it will play the unequip animation
@@ -11819,12 +11403,10 @@ void daAlink_c::itemUnequip(u16 i_itemID, f32 i_playSpeed) {
                   anm_data->mInterpolation);
 }
 
-/* 800B97EC-800B983C 0B412C 0050+00 2/2 0/0 0/0 .text            checkFastUnequip__9daAlink_cFv */
 bool daAlink_c::checkFastUnequip() {
     return mProcID == PROC_PREACTION_UNEQUIP || mProcID == PROC_HORSE_GETOFF || checkEventRun();
 }
 
-/* 800B983C-800B994C 0B417C 0110+00 10/10 0/0 0/0 .text            allUnequip__9daAlink_cFi */
 void daAlink_c::allUnequip(int param_0) {
     if (checkNoResetFlg2(FLG2_UNK_1) && param_0 != 0 && !checkCanoeRide() &&
         mEquipItem != fpcNm_ITEM_KANTERA)
@@ -11849,7 +11431,6 @@ void daAlink_c::allUnequip(int param_0) {
     field_0x2fde = 0xFF;
 }
 
-/* 800B994C-800B9D2C 0B428C 03E0+00 8/8 0/0 0/0 .text checkItemChangeFromButton__9daAlink_cFv */
 BOOL daAlink_c::checkItemChangeFromButton() {
     if (checkModeFlg(4) && !checkEquipAnime() && !checkBoomerangThrowAnime() &&
         !checkCopyRodThrowAnime() && !checkKandelaarSwingAnime() && !checkKandelaarSwingAnime())
@@ -11916,7 +11497,6 @@ BOOL daAlink_c::checkItemChangeFromButton() {
     return 0;
 }
 
-/* 800B9D2C-800B9F50 0B466C 0224+00 12/12 0/0 0/0 .text checkNextActionFromButton__9daAlink_cFv */
 BOOL daAlink_c::checkNextActionFromButton() {
     if (checkItemChangeAutoAction()) {
         return 1;
@@ -11975,7 +11555,6 @@ BOOL daAlink_c::checkNextActionFromButton() {
     return checkItemChangeFromButton();
 }
 
-/* 800B9F50-800BA09C 0B4890 014C+00 14/14 0/0 0/0 .text checkGroundSpecialMode__9daAlink_cFv */
 BOOL daAlink_c::checkGroundSpecialMode() {
     if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() &&
         checkEndResetFlg0(ERFLG0_UNK_2))
@@ -12019,8 +11598,6 @@ BOOL daAlink_c::checkGroundSpecialMode() {
     return NULL;
 }
 
-/* 800BA09C-800BA0D0 0B49DC 0034+00 4/4 0/0 0/0 .text            commonCheckNextAction__9daAlink_cFi
- */
 int daAlink_c::commonCheckNextAction(int param_0) {
     if (checkWolf()) {
         return checkNextActionWolf(param_0);
@@ -12029,7 +11606,6 @@ int daAlink_c::commonCheckNextAction(int param_0) {
     }
 }
 
-/* 800BA0D0-800BA6A0 0B4A10 05D0+00 91/91 0/0 0/0 .text            checkNextAction__9daAlink_cFi */
 int daAlink_c::checkNextAction(int param_0) {
     f32 temp_f31 = field_0x594;
 
@@ -12152,7 +11728,6 @@ int daAlink_c::checkNextAction(int param_0) {
     return ret;
 }
 
-/* 800BA6A0-800BA914 0B4FE0 0274+00 3/3 0/0 0/0 .text            commonChangeItem__9daAlink_cFv */
 void daAlink_c::commonChangeItem() {
     if (mEquipItem == fpcNm_ITEM_KANTERA && field_0x2fde == 0xFF && (mProcID != PROC_PREACTION_UNEQUIP || mProcVar4.field_0x3010 != 0)) {
         offKandelaarModel();
@@ -12209,7 +11784,6 @@ void daAlink_c::commonChangeItem() {
     }
 }
 
-/* 800BA914-800BAF08 0B5254 05F4+00 1/1 0/0 0/0 .text            setItemAction__9daAlink_cFv */
 void daAlink_c::setItemAction() {
     if (mEquipItem == fpcNm_ITEM_IRONBALL) {
         checkIronBallDelete();
@@ -12345,7 +11919,6 @@ void daAlink_c::setItemAction() {
     }
 }
 
-/* 800BAF08-800BAF80 0B5848 0078+00 2/2 0/0 0/0 .text checkNextActionFromCrouch__9daAlink_cFi */
 BOOL daAlink_c::checkNextActionFromCrouch(int param_0) {
     if (checkNextAction(param_0)) {
         if (field_0x2f8c == 1 || field_0x2f8c == 2 || field_0x2f8c == 3) {
@@ -12358,14 +11931,11 @@ BOOL daAlink_c::checkNextActionFromCrouch(int param_0) {
     return false;
 }
 
-/* 800BAF80-800BB020 0B58C0 00A0+00 18/18 0/0 0/0 .text checkUpperReadyThrowAnime__9daAlink_cCFv
- */
 int daAlink_c::checkUpperReadyThrowAnime() const {
     return checkBoomerangAnime() || checkCopyRodAnime() || checkHookshotAnime() ||
            checkIronBallAnime() || checkBowAnime();
 }
 
-/* 800BB020-800BB084 0B5960 0064+00 2/2 0/0 0/0 .text getBodyAngleXBasePos__9daAlink_cFP4cXyz */
 void daAlink_c::getBodyAngleXBasePos(cXyz* o_pos) {
     int mtx_id;
 
@@ -12382,8 +11952,6 @@ void daAlink_c::getBodyAngleXBasePos(cXyz* o_pos) {
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(mtx_id), o_pos);
 }
 
-/* 800BB084-800BB2B0 0B59C4 022C+00 3/3 0/0 0/0 .text            getBodyAngleXAtnActor__9daAlink_cFi
- */
 s16 daAlink_c::getBodyAngleXAtnActor(int param_0) {
     s16 var_r30;
 
@@ -12417,7 +11985,6 @@ s16 daAlink_c::getBodyAngleXAtnActor(int param_0) {
     return var_r30;
 }
 
-/* 800BB2B0-800BB324 0B5BF0 0074+00 13/13 0/0 0/0 .text setBodyAngleXReadyAnime__9daAlink_cFi */
 void daAlink_c::setBodyAngleXReadyAnime(int param_0) {
     s16 angle_x = getBodyAngleXAtnActor(param_0);
 
@@ -12429,7 +11996,6 @@ void daAlink_c::setBodyAngleXReadyAnime(int param_0) {
     field_0x310a = mBodyAngle.x;
 }
 
-/* 800BB324-800BB408 0B5C64 00E4+00 2/2 0/0 0/0 .text            setMagicArmorBrk__9daAlink_cFi */
 void daAlink_c::setMagicArmorBrk(int param_0) {
     static const char* bodyBrkName[3] = {
         "ml_body_power_down.brk",
@@ -12458,19 +12024,14 @@ void daAlink_c::setMagicArmorBrk(int param_0) {
     field_0x2fd7 = param_0;
 }
 
-/* 800BB408-800BB458 0B5D48 0050+00 6/6 0/0 0/0 .text            checkMagicArmorHeavy__9daAlink_cCFv
- */
 BOOL daAlink_c::checkMagicArmorHeavy() const {
     return checkMagicArmorWearAbility() && dComIfGs_getRupee() == 0;
 }
 
-/* 800BB458-800BB4B8 0B5D98 0060+00 1/0 0/0 0/0 .text checkBootsOrArmorHeavy__9daAlink_cCFv */
 BOOL daAlink_c::checkBootsOrArmorHeavy() const {
     return checkEquipHeavyBoots() || checkMagicArmorHeavy() || checkIronBallWaitAnime();
 }
 
-/* 800BB4B8-800BB560 0B5DF8 00A8+00 29/29 0/0 0/0 .text            checkHeavyStateOn__9daAlink_cFii
- */
 // param_0 something related to boots
 BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) {
     if (!checkEventRun()) {
@@ -12484,7 +12045,6 @@ BOOL daAlink_c::checkHeavyStateOn(int param_0, int param_1) {
     return false;
 }
 
-/* 800BB560-800BB644 0B5EA0 00E4+00 1/0 0/0 0/0 .text            setOutPower__9daAlink_cFfsi */
 void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) {
     if (!checkFmChainGrabAnime() || !checkBossRoom() || fopAcM_GetRoomNo(this) != 50 ||
         !checkEquipHeavyBoots())
@@ -12498,7 +12058,6 @@ void daAlink_c::setOutPower(f32 param_0, s16 param_1, int param_2) {
     }
 }
 
-/* 800BB644-800BB770 0B5F84 012C+00 3/3 0/0 0/0 .text            initGravity__9daAlink_cFv */
 void daAlink_c::initGravity() {
     f32 gravity;
     f32 max_fall_speed;
@@ -12531,8 +12090,6 @@ void daAlink_c::initGravity() {
     setSpecialGravity(gravity, max_fall_speed, 1);
 }
 
-/* 800BB770-800BB7A0 0B60B0 0030+00 64/64 0/0 0/0 .text            setSpecialGravity__9daAlink_cFffi
- */
 void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) {
     if (i_offFlag) {
         offNoResetFlg3(FLG3_UNK_4000);
@@ -12544,8 +12101,6 @@ void daAlink_c::setSpecialGravity(f32 i_gravity, f32 i_speed, int i_offFlag) {
     maxFallSpeed = i_speed;
 }
 
-/* 800BB7A0-800BBD40 0B60E0 05A0+00 1/1 0/0 0/0 .text            transAnimeProc__9daAlink_cFP4cXyzff
- */
 void daAlink_c::transAnimeProc(cXyz* param_0, f32 param_1, f32 param_2) {
     mDoExt_MtxCalcAnmBlendTbl* temp_r26 = field_0x1f20;
     *param_0 = field_0x34d4;
@@ -12674,7 +12229,6 @@ void daAlink_c::transAnimeProc(cXyz* param_0, f32 param_1, f32 param_2) {
     field_0x34d4.z = sp60.mTranslate.z;
 }
 
-/* 800BBD40-800BBF68 0B6680 0228+00 1/1 0/0 0/0 .text            setFootSpeed__9daAlink_cFv */
 void daAlink_c::setFootSpeed() {
     cXyz sp18[2];
 
@@ -12715,7 +12269,6 @@ void daAlink_c::setFootSpeed() {
     field_0x33a0 = var_f31;
 }
 
-/* 800BBF68-800BD6FC 0B68A8 1794+00 1/1 0/0 0/0 .text            posMove__9daAlink_cFv */
 void daAlink_c::posMove() {
     cXyz sp108;
 
@@ -13101,7 +12654,6 @@ void daAlink_c::posMove() {
     }
 }
 
-/* 800BD6FC-800BDD70 0B803C 0674+00 1/1 0/0 0/0 .text            autoGroundHit__9daAlink_cFv */
 void daAlink_c::autoGroundHit() {
     offNoResetFlg0(FLG0_UNK_2000);
 
@@ -13209,7 +12761,6 @@ void daAlink_c::autoGroundHit() {
     }
 }
 
-/* 800BDD70-800BDE20 0B86B0 00B0+00 2/2 0/0 0/0 .text            startPeepChange__9daAlink_cFv */
 bool daAlink_c::startPeepChange() {
     if (!checkNoResetFlg0(FLG0_UNK_4000)) {
         onNoResetFlg0(FLG0_UNK_4000);
@@ -13231,8 +12782,6 @@ bool daAlink_c::startPeepChange() {
     return 0;
 }
 
-/* 800BDE20-800BDE48 0B8760 0028+00 3/3 0/0 0/0 .text            setLastSceneDamage__9daAlink_cFiPUl
- */
 void daAlink_c::setLastSceneDamage(int i_dmgAmount, u32* o_mode) {
     if (i_dmgAmount <= 0) {
         return;
@@ -13245,7 +12794,6 @@ void daAlink_c::setLastSceneDamage(int i_dmgAmount, u32* o_mode) {
     *o_mode |= i_dmgAmount << 4;
 }
 
-/* 800BDE48-800BDF60 0B8788 0118+00 0/0 1/1 0/0 .text            setLastSceneMode__9daAlink_cFPUl */
 void daAlink_c::setLastSceneMode(u32* o_mode) {
     if (checkEquipHeavyBoots()) {
         *o_mode |= 0x400000;
@@ -13280,8 +12828,6 @@ void daAlink_c::setLastSceneMode(u32* o_mode) {
     }
 }
 
-/* 800BDF60-800BE26C 0B88A0 030C+00 4/4 1/1 0/0 .text            startRestartRoom__9daAlink_cFUliii
- */
 int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_eventRun) {
     if (!checkNoResetFlg0(FLG0_UNK_4000) &&
         (i_eventRun != 0 || dComIfGp_event_compulsory(this, NULL, 0xFFFF)))
@@ -13325,14 +12871,11 @@ int daAlink_c::startRestartRoom(u32 i_mode, int param_1, int i_dmgAmount, int i_
     return 0;
 }
 
-/* 800BE26C-800BE2C0 0B8BAC 0054+00 2/2 0/0 0/0 .text            checkCoachGuardGame__9daAlink_cFv
- */
 BOOL daAlink_c::checkCoachGuardGame() {
     return !checkBoarSingleBattle() &&
            fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchCoach, NULL);
 }
 
-/* 800BE2C0-800BE3E4 0B8C00 0124+00 1/1 0/0 0/0 .text            checkRoofRestart__9daAlink_cFv */
 void daAlink_c::checkRoofRestart() {
     daSpinner_c* spinner;
 
@@ -13369,7 +12912,6 @@ void daAlink_c::checkRoofRestart() {
     }
 }
 
-/* 800BE3E4-800BE9D4 0B8D24 05F0+00 1/1 0/0 0/0 .text            checkRestartRoom__9daAlink_cFv */
 BOOL daAlink_c::checkRestartRoom() {
     if (checkMagneBootsOn()) {
         if (checkNoResetFlg0(FLG0_UNK_2000) && (dKy_pol_argument_get(&mMagneLineChk) & 0x80)) {
@@ -13460,8 +13002,6 @@ BOOL daAlink_c::checkRestartRoom() {
     return false;
 }
 
-/* 800BE9D4-800BEAF8 0B9314 0124+00 2/2 0/0 0/0 .text            getSceneExitMoveAngle__9daAlink_cFv
- */
 s16 daAlink_c::getSceneExitMoveAngle() {
     if (field_0x2f58 == NULL) {
         return current.angle.y;
@@ -13494,7 +13034,6 @@ s16 daAlink_c::getSceneExitMoveAngle() {
     return cM_atan2s(dx, dz);
 }
 
-/* 800BEAF8-800BF084 0B9438 058C+00 1/1 0/0 0/0 .text            checkSceneChange__9daAlink_cFi */
 int daAlink_c::checkSceneChange(int exitID) {
     BOOL var_r3 = mProcID != PROC_FOG_DEAD && (field_0x3174 == 9 || checkNoResetFlg2(FLG2_UNK_4000));
 
@@ -13648,44 +13187,34 @@ int daAlink_c::checkSceneChange(int exitID) {
     return 0;
 }
 
-/* 800BF084-800BF0B8 0B99C4 0034+00 1/0 0/0 0/0 .text            voiceStart__9daAlink_cFUl */
 void daAlink_c::voiceStart(u32 i_seID) {
     mZ2Link.startLinkVoice(i_seID, mVoiceReverbIntensity);
 }
 
-/* 800BF0B8-800BF0EC 0B99F8 0034+00 14/14 0/0 0/0 .text            voiceStartLevel__9daAlink_cFUl */
 void daAlink_c::voiceStartLevel(u32 i_seID) {
     mZ2Link.startLinkVoiceLevel(i_seID, mVoiceReverbIntensity);
 }
 
-/* 800BF0EC-800BF124 0B9A2C 0038+00 21/21 0/0 0/0 .text            seStartSwordCut__9daAlink_cFUl */
 void daAlink_c::seStartSwordCut(u32 i_seID) {
     mZ2Link.startLinkSwordSound(i_seID, 0, mVoiceReverbIntensity);
 }
 
-/* 800BF124-800BF15C 0B9A64 0038+00 1/0 0/0 0/0 .text            seStartOnlyReverb__9daAlink_cFUl */
 void daAlink_c::seStartOnlyReverb(u32 i_seID) {
     mZ2Link.startLinkSound(i_seID, 0, mVoiceReverbIntensity);
 }
 
-/* 800BF15C-800BF194 0B9A9C 0038+00 1/0 0/0 0/0 .text seStartOnlyReverbLevel__9daAlink_cFUl */
 void daAlink_c::seStartOnlyReverbLevel(u32 i_seID) {
     mZ2Link.startLinkSoundLevel(i_seID, 0, mVoiceReverbIntensity);
 }
 
-/* 800BF194-800BF1CC 0B9AD4 0038+00 10/10 0/0 0/0 .text            seStartMapInfo__9daAlink_cFUl */
 void daAlink_c::seStartMapInfo(u32 i_seID) {
     mZ2Link.startLinkSound(i_seID, mPolySound, mVoiceReverbIntensity);
 }
 
-/* 800BF1CC-800BF204 0B9B0C 0038+00 9/9 0/0 0/0 .text            seStartMapInfoLevel__9daAlink_cFUl
- */
 void daAlink_c::seStartMapInfoLevel(u32 i_seID) {
     mZ2Link.startLinkSoundLevel(i_seID, mPolySound, mVoiceReverbIntensity);
 }
 
-/* 800BF204-800BF37C 0B9B44 0178+00 3/3 0/0 0/0 .text
- * setBasAnime__9daAlink_cFQ29daAlink_c13daAlink_UNDER          */
 void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER param_0) {
     daPy_anmHeap_c* temp_r29 = &mUnderAnmHeap[param_0];
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[param_0];
@@ -13738,7 +13267,6 @@ void daAlink_c::setBasAnime(daAlink_c::daAlink_UNDER param_0) {
     }
 }
 
-/* 800BF37C-800BF4E0 0B9CBC 0164+00 11/11 0/0 0/0 .text            initBasAnime__9daAlink_cFv */
 void daAlink_c::initBasAnime() {
     if (field_0x2d7c != NULL) {
         f32 var_f31;
@@ -13762,7 +13290,6 @@ void daAlink_c::initBasAnime() {
     }
 }
 
-/* 800BF4E0-800BF500 0B9E20 0020+00 6/6 0/0 0/0 .text            resetBasAnime__9daAlink_cFv */
 void daAlink_c::resetBasAnime() {
     field_0x3084 = 0xFFFF;
     field_0x3086 = 0xFFFF;
@@ -13770,8 +13297,6 @@ void daAlink_c::resetBasAnime() {
     field_0x2d80 = NULL;
 }
 
-/* 800BF500-800BF79C 0B9E40 029C+00 5/5 0/0 0/0 .text            checkSightLine__9daAlink_cFfP4cXyz
- */
 BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
     camera_class* camera = dComIfGp_getCamera(field_0x317c);
     cXyz* var_r29 = fopCamM_GetEye_p(camera);
@@ -13830,8 +13355,6 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
     return temp_r3;
 }
 
-/* 800BF79C-800BF854 0BA0DC 00B8+00 2/2 0/0 0/0 .text            setMetamorphoseModel__9daAlink_cFi
- */
 void daAlink_c::setMetamorphoseModel(int param_0) {
     J3DAnmTransform* bck =
         (J3DAnmTransform*)mAnmHeap9.loadDataIdx(param_0 != 0 ? (u16)0x27C : (u16)0x27D);
@@ -13846,13 +13369,11 @@ void daAlink_c::setMetamorphoseModel(int param_0) {
     field_0x33dc = mUnderFrameCtrl[0].getFrame();
 }
 
-/* 800BF854-800BF884 0BA194 0030+00 10/10 0/0 0/0 .text            keepItemData__9daAlink_cFv */
 void daAlink_c::keepItemData() {
     mKeepItem = mEquipItem;
     deleteEquipItem(FALSE, FALSE);
 }
 
-/* 800BF884-800BF8D0 0BA1C4 004C+00 8/8 0/0 0/0 .text            returnKeepItemData__9daAlink_cFv */
 void daAlink_c::returnKeepItemData() {
     deleteEquipItem(FALSE, FALSE);
     mEquipItem = mKeepItem;
@@ -13860,7 +13381,6 @@ void daAlink_c::returnKeepItemData() {
     makeItemType();
 }
 
-/* 800BF8D0-800BF9F0 0BA210 0120+00 2/2 0/0 0/0 .text            setItemModel__9daAlink_cFv */
 BOOL daAlink_c::setItemModel() {
     if (checkBowItem(mEquipItem)) {
         setBowModel();
@@ -13906,7 +13426,6 @@ BOOL daAlink_c::setItemModel() {
     return 0;
 }
 
-/* 800BF9F0-800BFD74 0BA330 0384+00 4/4 0/0 0/0 .text            setItemActor__9daAlink_cFv */
 BOOL daAlink_c::setItemActor() {
     if (mEquipItem == fpcNm_ITEM_BOOMERANG) {
         fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &current.pos, -1,
@@ -13996,24 +13515,20 @@ BOOL daAlink_c::setItemActor() {
     return 0;
 }
 
-/* 800BFD74-800BFDB0 0BA6B4 003C+00 2/2 0/0 0/0 .text            makeItemType__9daAlink_cFv */
 void daAlink_c::makeItemType() {
     if (!setItemModel()) {
         setItemActor();
     }
 }
 
-/* 800BFDB0-800BFDFC 0BA6F0 004C+00 28/28 0/0 0/0 .text checkZoraWearAbility__9daAlink_cCFv */
 BOOL daAlink_c::checkZoraWearAbility() const {
     return (!checkWolf() && checkZoraWearFlg()) && !checkNoResetFlg2(FLG2_UNK_80000);
 }
 
-/* 800BFDFC-800BFE48 0BA73C 004C+00 5/5 0/0 0/0 .text checkMagicArmorWearAbility__9daAlink_cCFv */
 BOOL daAlink_c::checkMagicArmorWearAbility() const {
     return (!checkWolf() && checkMagicArmorWearFlg()) && !checkNoResetFlg2(FLG2_UNK_80000);
 }
 
-/* 800BFE48-800BFF04 0BA788 00BC+00 9/9 0/0 0/0 .text            loadAramBmd__9daAlink_cFUsUl */
 J3DModelData* daAlink_c::loadAramBmd(u16 i_resID, u32 i_bufSize) {
     JKRArchive* anm_arc = dComIfGp_getAnmArchive();
     u8* tmpBuffer = new (0x20) u8[i_bufSize];
@@ -14034,14 +13549,12 @@ J3DModelData* daAlink_c::loadAramBmd(u16 i_resID, u32 i_bufSize) {
     return dRes_info_c::loaderBasicBmd(type, tmpBuffer);
 }
 
-/* 800BFF04-800BFF70 0BA844 006C+00 5/5 0/0 0/0 .text            loadAram__9daAlink_cFUsUl */
 void* daAlink_c::loadAram(u16 i_resID, u32 i_bufSize) {
     u8* tmpBuffer = new (0x20) u8[i_bufSize];
     dComIfGp_getAnmArchive()->readIdxResource(tmpBuffer, i_bufSize, i_resID);
     return J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
 }
 
-/* 800BFF70-800BFFCC 0BA8B0 005C+00 3/3 0/0 0/0 .text loadAramItemBrk__9daAlink_cFUsP8J3DModel */
 J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 i_resID, J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
     J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)loadAram(i_resID, 0x400);
@@ -14053,7 +13566,6 @@ J3DAnmTevRegKey* daAlink_c::loadAramItemBrk(u16 i_resID, J3DModel* i_model) {
     return brk;
 }
 
-/* 800BFFCC-800C0028 0BA90C 005C+00 2/2 0/0 0/0 .text loadAramItemBtk__9daAlink_cFUsP8J3DModel */
 J3DAnmTextureSRTKey* daAlink_c::loadAramItemBtk(u16 i_resID, J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
     J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)loadAram(i_resID, 0x400);
@@ -14065,7 +13577,6 @@ J3DAnmTextureSRTKey* daAlink_c::loadAramItemBtk(u16 i_resID, J3DModel* i_model)
     return btk;
 }
 
-/* 800C0028-800C0084 0BA968 005C+00 1/1 0/0 0/0 .text loadAramItemBtp__9daAlink_cFUsP8J3DModel */
 J3DAnmTexPattern* daAlink_c::loadAramItemBtp(u16 i_resID, J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
     J3DAnmTexPattern* btp = (J3DAnmTexPattern*)loadAram(i_resID, 0x400);
@@ -14077,7 +13588,6 @@ J3DAnmTexPattern* daAlink_c::loadAramItemBtp(u16 i_resID, J3DModel* i_model) {
     return btp;
 }
 
-/* 800C0084-800C0114 0BA9C4 0090+00 5/5 0/0 0/0 .text            changeItemBck__9daAlink_cFUsf */
 void daAlink_c::changeItemBck(u16 i_resID, f32 param_1) {
     J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(i_resID);
     if (bck != NULL) {
@@ -14091,7 +13601,6 @@ void daAlink_c::changeItemBck(u16 i_resID, f32 param_1) {
     }
 }
 
-/* 800C0114-800C0164 0BAA54 0050+00 2/2 0/0 0/0 .text            checkGroupItem__9daAlink_cCFii */
 int daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const {
     if (i_itemNo == 0x107) {
         return checkDrinkBottleItem(i_selItem);
@@ -14102,8 +13611,6 @@ int daAlink_c::checkGroupItem(int i_itemNo, int i_selItem) const {
     }
 }
 
-/* 800C0164-800C0208 0BAAA4 00A4+00 11/11 0/0 0/0 .text            checkSetItemTrigger__9daAlink_cFi
- */
 int daAlink_c::checkSetItemTrigger(int i_itemNo) {
     for (u8 i = 0; i < 2; i++) {
         if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i)) && itemTriggerCheck(1 << i)) {
@@ -14117,7 +13624,6 @@ int daAlink_c::checkSetItemTrigger(int i_itemNo) {
     return 0;
 }
 
-/* 800C0208-800C0284 0BAB48 007C+00 6/6 0/0 0/0 .text            checkItemSetButton__9daAlink_cFi */
 int daAlink_c::checkItemSetButton(int i_itemNo) {
     for (u8 i = 0; i < 2; i++) {
         if (checkGroupItem(i_itemNo, dComIfGp_getSelectItem(i))) {
@@ -14128,75 +13634,60 @@ int daAlink_c::checkItemSetButton(int i_itemNo) {
     return 2;
 }
 
-/* 800C0284-800C02C8 0BABC4 0044+00 1/1 0/0 0/0 .text            checkField__9daAlink_cFv */
 bool daAlink_c::checkField() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_FIELD;
 }
 
-/* 800C02C8-800C0310 0BAC08 0048+00 6/6 0/0 0/0 .text            checkBossRoom__9daAlink_cFv */
 bool daAlink_c::checkBossRoom() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_BOSS_ROOM;
 }
 
-/* 800C0310-800C0358 0BAC50 0048+00 4/4 0/0 0/0 .text            checkDungeon__9daAlink_cFv */
 bool daAlink_c::checkDungeon() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON;
 }
 
-/* 800C0358-800C03A0 0BAC98 0048+00 3/3 0/0 0/0 .text            checkCastleTown__9daAlink_cFv */
 bool daAlink_c::checkCastleTown() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_CASTLE_TOWN;
 }
 
-/* 800C03A0-800C03E8 0BACE0 0048+00 6/6 0/0 1/1 .text            checkCloudSea__9daAlink_cFv */
 bool daAlink_c::checkCloudSea() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_CLOUD_SEA;
 }
 
-/* 800C03E8-800C044C 0BAD28 0064+00 5/5 0/0 0/0 .text            checkRoomOnly__9daAlink_cFv */
 bool daAlink_c::checkRoomOnly() {
     return dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_ROOM ||
            checkLv7DungeonShop();
 }
 
-/* 800C044C-800C04B4 0BAD8C 0068+00 3/3 0/0 0/0 .text checkLv2DungeonRoomSpecial__9daAlink_cFv */
 bool daAlink_c::checkLv2DungeonRoomSpecial() {
     return checkStageName("D_MN04") &&
            (dComIfGp_roomControl_getStayNo() == 14 || dComIfGp_roomControl_getStayNo() == 16 ||
             dComIfGp_roomControl_getStayNo() == 17);
 }
 
-/* 800C04B4-800C0520 0BADF4 006C+00 2/2 0/0 0/0 .text            checkRoomSpecial__9daAlink_cFv */
 bool daAlink_c::checkRoomSpecial() {
     return (checkStageName("D_MN11") &&
             (dComIfGp_roomControl_getStayNo() == 1 || dComIfGp_roomControl_getStayNo() == 2)) ||
            checkLv2DungeonRoomSpecial();
 }
 
-/* 800C0520-800C0594 0BAE60 0074+00 1/1 0/0 0/0 .text            checkRoom__9daAlink_cFv */
 bool daAlink_c::checkRoom() {
     return checkRoomOnly() || checkRoomSpecial() ||
            checkStageName("R_SP161") && !dComIfGs_isOneZoneSwitch(14, -1);
 }
 
-/* 800C0594-800C05DC 0BAED4 0048+00 8/8 0/0 0/0 .text            checkNotBattleStage__9daAlink_cFv
- */
 bool daAlink_c::checkNotBattleStage() {
     return checkRoom() || checkCastleTown();
 }
 
-/* 800C05DC-800C0630 0BAF1C 0054+00 2/2 0/0 0/0 .text checkNotHeavyBootsStage__9daAlink_cFv */
 bool daAlink_c::checkNotHeavyBootsStage() {
     return (checkNotBattleStage() || checkCloudSea()) && !checkLv2DungeonRoomSpecial();
 }
 
-/* 800C0630-800C0678 0BAF70 0048+00 1/1 0/0 0/0 .text            checkNotAutoJumpStage__9daAlink_cFv
- */
 bool daAlink_c::checkNotAutoJumpStage() {
     return checkRoomOnly() || checkCastleTown();
 }
 
-/* 800C0678-800C077C 0BAFB8 0104+00 3/3 0/0 0/0 .text checkCastleTownUseItem__9daAlink_cFUs */
 bool daAlink_c::checkCastleTownUseItem(u16 i_itemNo) {
     if (checkNotBattleStage()) {
         if (i_itemNo == fpcNm_ITEM_KANTERA || checkTradeItem(i_itemNo) ||
@@ -14233,7 +13724,6 @@ enum daAlink_ItemProc {
     /* 15 */ ITEM_PROC_GRASS_WHISTLE,
 };
 
-/* 800C077C-800C0A9C 0BB0BC 0320+00 1/1 0/0 0/0 .text changeItemTriggerKeepProc__9daAlink_cFUci */
 int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) {
     u32 sel_item = dComIfGp_getSelectItem(i_selItemIdx);
     mSelectItemId = i_selItemIdx;
@@ -14298,8 +13788,6 @@ int daAlink_c::changeItemTriggerKeepProc(u8 i_selItemIdx, int i_procType) {
     return 1;
 }
 
-/* 800C0A9C-800C12DC 0BB3DC 0840+00 1/1 0/0 0/0 .text            checkNewItemChange__9daAlink_cFUc
- */
 /**
  * Determines whether an item action can occur, and which action to use.
  *
@@ -14445,7 +13933,6 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
     return ITEM_PROC_NONE;
 }
 
-/* 800C12DC-800C1704 0BBC1C 0428+00 67/67 0/0 0/0 .text            deleteEquipItem__9daAlink_cFii */
 void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
     if (i_deleteKantera || mProcID == PROC_UNEQUIP) {
         offKandelaarModel();
@@ -14562,7 +14049,6 @@ void daAlink_c::deleteEquipItem(BOOL i_playSound, BOOL i_deleteKantera) {
     }
 }
 
-/* 800C1704-800C1CEC 0BC044 05E8+00 1/1 0/0 0/0 .text            setLight__9daAlink_cFv */
 void daAlink_c::setLight() {
     const daAlinkHIO_huLight_c1* light_m = &daAlinkHIO_huLight_c0::m;
     BOOL var_r28 = false;
@@ -14698,7 +14184,6 @@ void daAlink_c::setLight() {
     }
 }
 
-/* 800C1CEC-800C1DAC 0BC62C 00C0+00 3/3 0/0 0/0 .text setFrontRollCrashShock__9daAlink_cFUc */
 void daAlink_c::setFrontRollCrashShock(u8 param_0) {
     dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f));
 
@@ -14706,7 +14191,6 @@ void daAlink_c::setFrontRollCrashShock(u8 param_0) {
     dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5);
 }
 
-/* 800C1DAC-800C1DE0 0BC6EC 0034+00 1/0 0/0 0/0 .text            getModelJointMtx__9daAlink_cFUs */
 MtxP daAlink_c::getModelJointMtx(u16 param_0) {
     if (param_0 >= field_0x30c6) {
         return mpLinkModel->mBaseTransformMtx;
@@ -14714,7 +14198,6 @@ MtxP daAlink_c::getModelJointMtx(u16 param_0) {
     return mpLinkModel->getAnmMtx(param_0);
 }
 
-/* 800C1DE0-800C1E0C 0BC720 002C+00 1/0 0/0 0/0 .text            onFrollCrashFlg__9daAlink_cFUci */
 void daAlink_c::onFrollCrashFlg(u8 param_0, BOOL param_1) {
     if (param_1) {
         onNoResetFlg0(FLG0_UNK_10);
@@ -14725,8 +14208,6 @@ void daAlink_c::onFrollCrashFlg(u8 param_0, BOOL param_1) {
     mRollCrashFlg = param_0;
 }
 
-/* 800C1E0C-800C1F6C 0BC74C 0160+00 4/4 0/0 0/0 .text
- * changeWarpMaterial__9daAlink_cFQ29daAlink_c21daAlink_WARP_MAT_MODE */
 void daAlink_c::changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE i_matMode) {
     void (*mat_func_tbl[])(J3DModelData*) = {dRes_info_c::onWarpMaterial, dRes_info_c::offWarpMaterial};
 
@@ -14755,8 +14236,6 @@ void daAlink_c::changeWarpMaterial(daAlink_c::daAlink_WARP_MAT_MODE i_matMode) {
     }
 }
 
-/* 800C1F6C-800C2DA4 0BC8AC 0E38+00 229/229 0/0 0/0 .text
- * commonProcInit__9daAlink_cFQ29daAlink_c12daAlink_PROC        */
 void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
     if (mProcID == PROC_TOOL_DEMO) {
         speed.y = 0.0f;
@@ -15141,8 +14620,6 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
     }
 }
 
-/* 800C2DA4-800C2DDC 0BD6E4 0038+00 121/121 0/0 0/0 .text
- * commonProcInitNotSameProc__9daAlink_cFQ29daAlink_c12daAlink_PROC */
 BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC procID) {
     if (mProcID == procID) {
         return false;
@@ -15152,8 +14629,6 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC procID) {
     }
 }
 
-/* 800C2DDC-800C2EAC 0BD71C 00D0+00 17/17 0/0 0/0 .text
- * procPreActionUnequipInit__9daAlink_cFiP10fopAc_ac_c          */
  int daAlink_c::procPreActionUnequipInit(int i_procAfter, fopAc_ac_c* param_1) {
     commonProcInit(PROC_PREACTION_UNEQUIP);
     mNormalSpeed = 0.0f;
@@ -15180,8 +14655,6 @@ BOOL daAlink_c::commonProcInitNotSameProc(daAlink_PROC procID) {
     return 1;
 }
 
-/* 800C2EAC-800C3098 0BD7EC 01EC+00 1/0 0/0 0/0 .text            procPreActionUnequip__9daAlink_cFv
- */
 int daAlink_c::procPreActionUnequip() {
     if (checkNoUpperAnime()) {
         if (mProcVar3.field_0x300e != 0 && (field_0x27f4 == NULL || field_0x27f4 != field_0x280c.getActor()))
@@ -15231,8 +14704,6 @@ int daAlink_c::procPreActionUnequip() {
     return 1;
 }
 
-/* 800C3098-800C30F0 0BD9D8 0058+00 1/1 0/0 0/0 .text            procServiceWaitInit__9daAlink_cFv
- */
 int daAlink_c::procServiceWaitInit() {
     commonProcInit(PROC_SERVICE_WAIT);
     setSingleAnimeBase(ANM_SERVICE_WAIT);
@@ -15242,7 +14713,6 @@ int daAlink_c::procServiceWaitInit() {
     return 1;
 }
 
-/* 800C30F0-800C3224 0BDA30 0134+00 1/0 0/0 0/0 .text            procServiceWait__9daAlink_cFv */
 int daAlink_c::procServiceWait() {
     J3DFrameCtrl* frameCtrl_p = mUnderFrameCtrl;
     if ((!checkNextAction(0) && !checkFrontWallTypeAction()) &&
@@ -15262,7 +14732,6 @@ int daAlink_c::procServiceWait() {
     return 1;
 }
 
-/* 800C3224-800C3338 0BDB64 0114+00 2/2 0/0 0/0 .text            procTiredWaitInit__9daAlink_cFv */
 int daAlink_c::procTiredWaitInit() {
     BOOL no_upper_anm = checkNoSetUpperAnime();
 
@@ -15294,7 +14763,6 @@ int daAlink_c::procTiredWaitInit() {
     return 1;
 }
 
-/* 800C3338-800C33B8 0BDC78 0080+00 1/0 0/0 0/0 .text            procTiredWait__9daAlink_cFv */
 int daAlink_c::procTiredWait() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -15309,7 +14777,6 @@ int daAlink_c::procTiredWait() {
     return 1;
 }
 
-/* 800C33B8-800C3504 0BDCF8 014C+00 26/26 0/0 0/0 .text            procWaitInit__9daAlink_cFv */
 int daAlink_c::procWaitInit() {
     if (mProcID == PROC_TURN_BACK) {
         onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -15352,7 +14819,6 @@ int daAlink_c::procWaitInit() {
     return 1;
 }
 
-/* 800C3504-800C36CC 0BDE44 01C8+00 1/0 0/0 0/0 .text            procWait__9daAlink_cFv */
 int daAlink_c::procWait() {
     BOOL anm_wait_b = checkUnderMove0BckNoArc(ANM_WAIT_B);
 
@@ -15392,7 +14858,6 @@ int daAlink_c::procWait() {
     return 1;
 }
 
-/* 800C36CC-800C3730 0BE00C 0064+00 3/3 0/0 0/0 .text            procMoveInit__9daAlink_cFv */
 int daAlink_c::procMoveInit() {
     if (!commonProcInitNotSameProc(PROC_MOVE)) {
         return 0;
@@ -15403,7 +14868,6 @@ int daAlink_c::procMoveInit() {
     return 1;
 }
 
-/* 800C3730-800C3810 0BE070 00E0+00 1/0 0/0 0/0 .text            procMove__9daAlink_cFv */
 int daAlink_c::procMove() {
     setFootEffectProcType(3);
     if (!checkNextAction(0) && !checkFrontWallTypeAction()) {
@@ -15424,7 +14888,6 @@ int daAlink_c::procMove() {
     return 1;
 }
 
-/* 800C3810-800C3868 0BE150 0058+00 1/1 0/0 0/0 .text            procAtnMoveInit__9daAlink_cFv */
 int daAlink_c::procAtnMoveInit() {
     if (!commonProcInitNotSameProc(PROC_ATN_MOVE)) {
         return 0;
@@ -15434,7 +14897,6 @@ int daAlink_c::procAtnMoveInit() {
     return 1;
 }
 
-/* 800C3868-800C38CC 0BE1A8 0064+00 1/0 0/0 0/0 .text            procAtnMove__9daAlink_cFv */
 int daAlink_c::procAtnMove() {
     if (!checkNextAction(0)) {
         if (field_0x2f98 != 0 || !checkFrontWallTypeAction()) {
@@ -15445,8 +14907,6 @@ int daAlink_c::procAtnMove() {
     return 1;
 }
 
-/* 800C38CC-800C397C 0BE20C 00B0+00 4/4 0/0 0/0 .text            procAtnActorWaitInit__9daAlink_cFv
- */
 int daAlink_c::procAtnActorWaitInit() {
     if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_WAIT)) {
         return 0;
@@ -15470,7 +14930,6 @@ int daAlink_c::procAtnActorWaitInit() {
     return 1;
 }
 
-/* 800C397C-800C39EC 0BE2BC 0070+00 1/0 0/0 0/0 .text            procAtnActorWait__9daAlink_cFv */
 int daAlink_c::procAtnActorWait() {
     if (!checkNextAction(0)) {
         if (checkAtnWaitAnime()) {
@@ -15484,8 +14943,6 @@ int daAlink_c::procAtnActorWait() {
     return 1;
 }
 
-/* 800C39EC-800C3A44 0BE32C 0058+00 3/3 0/0 0/0 .text            procAtnActorMoveInit__9daAlink_cFv
- */
 int daAlink_c::procAtnActorMoveInit() {
     if (!commonProcInitNotSameProc(PROC_ATN_ACTOR_MOVE)) {
         return 0;
@@ -15495,7 +14952,6 @@ int daAlink_c::procAtnActorMoveInit() {
     return 1;
 }
 
-/* 800C3A44-800C3A94 0BE384 0050+00 1/0 0/0 0/0 .text            procAtnActorMove__9daAlink_cFv */
 int daAlink_c::procAtnActorMove() {
     if (!checkNextAction(0)) {
         setBlendAtnMoveAnime(-1.0f);
@@ -15505,7 +14961,6 @@ int daAlink_c::procAtnActorMove() {
     return 1;
 }
 
-/* 800C3A94-800C3B1C 0BE3D4 0088+00 2/2 0/0 0/0 .text            procWaitTurnInit__9daAlink_cFv */
 int daAlink_c::procWaitTurnInit() {
     if (!commonProcInitNotSameProc(PROC_WAIT_TURN)) {
         return 0;
@@ -15522,7 +14977,6 @@ int daAlink_c::procWaitTurnInit() {
     return 1;
 }
 
-/* 800C3B1C-800C3C3C 0BE45C 0120+00 1/0 0/0 0/0 .text            procWaitTurn__9daAlink_cFv */
 int daAlink_c::procWaitTurn() {
     cLib_chaseF(&mNormalSpeed, 0.0f, daAlinkHIO_move_c0::m.mDeceleration);
 
@@ -15552,7 +15006,6 @@ int daAlink_c::procWaitTurn() {
     return 1;
 }
 
-/* 800C3C3C-800C3D38 0BE57C 00FC+00 2/2 0/0 0/0 .text            procMoveTurnInit__9daAlink_cFi */
 int daAlink_c::procMoveTurnInit(int param_0) {
     if (!commonProcInitNotSameProc(PROC_MOVE_TURN)) {
         return 0;
@@ -15578,7 +15031,6 @@ int daAlink_c::procMoveTurnInit(int param_0) {
     return 1;
 }
 
-/* 800C3D38-800C3DA0 0BE678 0068+00 1/0 0/0 0/0 .text            procMoveTurn__9daAlink_cFv */
 int daAlink_c::procMoveTurn() {
     setSpeedAndAngleNormal();
     cLib_addCalcAngleS(&shape_angle.y, current.angle.y, mProcVar1.field_0x300a, mProcVar3.field_0x300e, mProcVar4.field_0x3010);
@@ -15590,7 +15042,6 @@ int daAlink_c::procMoveTurn() {
     return 1;
 }
 
-/* 800C3DA0-800C3F60 0BE6E0 01C0+00 2/2 0/0 0/0 .text            procSideStepInit__9daAlink_cFi */
 int daAlink_c::procSideStepInit(int jump_type) {
     if (jump_type == 1 && !checkHeavyStateOn(1, 1) &&
         (checkNoUpperAnime() || checkEquipAnime() || field_0x2fcc != 0 && checkUpperGuardAnime()))
@@ -15634,7 +15085,6 @@ int daAlink_c::procSideStepInit(int jump_type) {
     return 1;
 }
 
-/* 800C3F60-800C40F0 0BE8A0 0190+00 1/0 0/0 0/0 .text            procSideStep__9daAlink_cFv */
 int daAlink_c::procSideStep() {
     if (mTargetedActor != NULL && mProcVar1.field_0x300a != 0) {
         s16 actor_angle = fopAcM_searchActorAngleY(this, mTargetedActor);
@@ -15672,8 +15122,6 @@ int daAlink_c::procSideStep() {
     return 1;
 }
 
-/* 800C40F0-800C4278 0BEA30 0188+00 1/1 0/0 0/0 .text            procSideStepLandInit__9daAlink_cFv
- */
 int daAlink_c::procSideStepLandInit() {
     commonProcInit(PROC_SIDESTEP_LAND);
 
@@ -15718,7 +15166,6 @@ int daAlink_c::procSideStepLandInit() {
     return 1;
 }
 
-/* 800C4278-800C4378 0BEBB8 0100+00 1/0 0/0 0/0 .text            procSideStepLand__9daAlink_cFv */
 int daAlink_c::procSideStepLand() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -15747,7 +15194,6 @@ int daAlink_c::procSideStepLand() {
     return 1;
 }
 
-/* 800C4378-800C4514 0BECB8 019C+00 1/1 0/0 0/0 .text            procSlideInit__9daAlink_cFs */
 int daAlink_c::procSlideInit(s16 param_0) {
     commonProcInit(PROC_SLIDE);
 
@@ -15788,7 +15234,6 @@ int daAlink_c::procSlideInit(s16 param_0) {
     return 1;
 }
 
-/* 800C4514-800C47AC 0BEE54 0298+00 1/0 0/0 0/0 .text            procSlide__9daAlink_cFv */
 int daAlink_c::procSlide() {
     cM3dGPla slide_poly;
 
@@ -15850,7 +15295,6 @@ int daAlink_c::procSlide() {
     return 1;
 }
 
-/* 800C47AC-800C4894 0BF0EC 00E8+00 1/1 0/0 0/0 .text            procSlideLandInit__9daAlink_cFi */
 int daAlink_c::procSlideLandInit(int param_0) {
     commonProcInit(PROC_SLIDE_LAND);
 
@@ -15871,7 +15315,6 @@ int daAlink_c::procSlideLandInit(int param_0) {
     return 1;
 }
 
-/* 800C4894-800C494C 0BF1D4 00B8+00 1/0 0/0 0/0 .text            procSlideLand__9daAlink_cFv */
 int daAlink_c::procSlideLand() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -15895,7 +15338,6 @@ int daAlink_c::procSlideLand() {
     return 1;
 }
 
-/* 800C494C-800C4B40 0BF28C 01F4+00 4/3 0/0 0/0 .text            procFrontRollInit__9daAlink_cFv */
 int daAlink_c::procFrontRollInit() {
     BOOL is_guard_anime = checkUpperGuardAnime();
 
@@ -15953,7 +15395,6 @@ int daAlink_c::procFrontRollInit() {
     return 1;
 }
 
-/* 800C4B40-800C4F14 0BF480 03D4+00 1/0 0/0 0/0 .text            procFrontRoll__9daAlink_cFv */
 int daAlink_c::procFrontRoll() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -16049,7 +15490,6 @@ int daAlink_c::procFrontRoll() {
     return 1;
 }
 
-/* 800C4F14-800C4FFC 0BF854 00E8+00 1/1 0/0 0/0 .text procFrontRollCrashInit__9daAlink_cFv */
 int daAlink_c::procFrontRollCrashInit() {
     commonProcInit(PROC_FRONT_ROLL_CRASH);
     setSingleAnime(ANM_ROLL_CRASH, 0.0f,
@@ -16073,7 +15513,6 @@ int daAlink_c::procFrontRollCrashInit() {
     return 1;
 }
 
-/* 800C4FFC-800C5160 0BF93C 0164+00 1/0 0/0 0/0 .text            procFrontRollCrash__9daAlink_cFv */
 int daAlink_c::procFrontRollCrash() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -16104,7 +15543,6 @@ int daAlink_c::procFrontRollCrash() {
     return 1;
 }
 
-/* 800C5160-800C5240 0BFAA0 00E0+00 3/3 0/0 0/0 .text procFrontRollSuccessInit__9daAlink_cFv */
 int daAlink_c::procFrontRollSuccessInit() {
     BOOL dk_caught = mProcID == PROC_DK_CAUGHT;
 
@@ -16129,8 +15567,6 @@ int daAlink_c::procFrontRollSuccessInit() {
     return 1;
 }
 
-/* 800C5240-800C5328 0BFB80 00E8+00 1/0 0/0 0/0 .text            procFrontRollSuccess__9daAlink_cFv
- */
 int daAlink_c::procFrontRollSuccess() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -16154,7 +15590,6 @@ int daAlink_c::procFrontRollSuccess() {
     return 1;
 }
 
-/* 800C5328-800C5484 0BFC68 015C+00 3/3 0/0 0/0 .text            procSideRollInit__9daAlink_cFi */
 int daAlink_c::procSideRollInit(int param_0) {
     BOOL guard_anime = checkUpperGuardAnime();
 
@@ -16197,7 +15632,6 @@ int daAlink_c::procSideRollInit(int param_0) {
     return 1;
 }
 
-/* 800C5484-800C5700 0BFDC4 027C+00 1/0 0/0 0/0 .text            procSideRoll__9daAlink_cFv */
 int daAlink_c::procSideRoll() {
     onEndResetFlg0(ERFLG0_UNK_8000000);
     if (mTargetedActor != NULL) {
@@ -16258,7 +15692,6 @@ int daAlink_c::procSideRoll() {
     return 1;
 }
 
-/* 800C5700-800C57A4 0C0040 00A4+00 2/2 0/0 0/0 .text            backJumpSpeedDec__9daAlink_cFv */
 void daAlink_c::backJumpSpeedDec() {
     if (mLinkAcch.ChkGroundHit()) {
         if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) {
@@ -16279,7 +15712,6 @@ void daAlink_c::backJumpSpeedDec() {
     }
 }
 
-/* 800C57A4-800C5964 0C00E4 01C0+00 6/6 0/0 0/0 .text            procBackJumpInit__9daAlink_cFi */
 int daAlink_c::procBackJumpInit(int param_0) {
     u32 horse_ride = checkHorseRide();
     BOOL guard_anime = checkUpperGuardAnime();
@@ -16325,7 +15757,6 @@ int daAlink_c::procBackJumpInit(int param_0) {
     return 1;
 }
 
-/* 800C5964-800C5A54 0C02A4 00F0+00 1/0 0/0 0/0 .text            procBackJump__9daAlink_cFv */
 int daAlink_c::procBackJump() {
     if (mProcVar0.field_0x3008 != 0) {
         mProcVar0.field_0x3008--;
@@ -16351,8 +15782,6 @@ int daAlink_c::procBackJump() {
     return 1;
 }
 
-/* 800C5A54-800C5AF0 0C0394 009C+00 1/1 0/0 0/0 .text            procBackJumpLandInit__9daAlink_cFi
- */
 int daAlink_c::procBackJumpLandInit(int i_cutDirection) {
     commonProcInit(PROC_BACK_JUMP_LAND);
     setSingleAnimeParam(ANM_BACKFLIP_LAND, &daAlinkHIO_backJump_c0::m.mLandAnm);
@@ -16370,7 +15799,6 @@ int daAlink_c::procBackJumpLandInit(int i_cutDirection) {
     return 1;
 }
 
-/* 800C5AF0-800C5C28 0C0430 0138+00 1/0 0/0 0/0 .text            procBackJumpLand__9daAlink_cFv */
 int daAlink_c::procBackJumpLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -16400,7 +15828,6 @@ int daAlink_c::procBackJumpLand() {
     return 1;
 }
 
-/* 800C5C28-800C5CA4 0C0568 007C+00 1/1 0/0 0/0 .text            procSlipInit__9daAlink_cFv */
 int daAlink_c::procSlipInit() {
     commonProcInit(PROC_SLIP);
     setSingleAnimeParam(ANM_SLIP, &daAlinkHIO_move_c0::m.mSlideAnm);
@@ -16413,7 +15840,6 @@ int daAlink_c::procSlipInit() {
     return 1;
 }
 
-/* 800C5CA4-800C5E68 0C05E4 01C4+00 1/0 0/0 0/0 .text            procSlip__9daAlink_cFv */
 int daAlink_c::procSlip() {
     cLib_chaseF(&mNormalSpeed, 0.0f, daAlinkHIO_move_c0::m.mSlideDeceleration);
 
@@ -16466,7 +15892,6 @@ public:
     /* 0x5F0 */ s8 mType;
 };
 
-/* 800C5E68-800C61EC 0C07A8 0384+00 4/4 0/0 0/0 .text            procAutoJumpInit__9daAlink_cFi */
 int daAlink_c::procAutoJumpInit(int param_0) {
     u32 chk_mode_400 = checkModeFlg(0x400);
     BOOL not_front_roll = mProcID != PROC_FRONT_ROLL ? TRUE : FALSE;
@@ -16571,7 +15996,6 @@ int daAlink_c::procAutoJumpInit(int param_0) {
     return 1;
 }
 
-/* 800C61EC-800C66DC 0C0B2C 04F0+00 1/0 0/0 0/0 .text            procAutoJump__9daAlink_cFv */
 int daAlink_c::procAutoJump() {
     int direction = getDirectionFromCurrentAngle();
 
@@ -16700,7 +16124,6 @@ int daAlink_c::procAutoJump() {
     return 1;
 }
 
-/* 800C66DC-800C6798 0C101C 00BC+00 1/1 0/0 0/0 .text            procDiveJumpInit__9daAlink_cFv */
 int daAlink_c::procDiveJumpInit() {
     commonProcInit(PROC_DIVE_JUMP);
     setSingleAnimeParam(ANM_DIVE_START, &daAlinkHIO_autoJump_c0::m.mDiveAnm);
@@ -16719,7 +16142,6 @@ int daAlink_c::procDiveJumpInit() {
     return 1;
 }
 
-/* 800C6798-800C6850 0C10D8 00B8+00 1/0 0/0 0/0 .text            procDiveJump__9daAlink_cFv */
 int daAlink_c::procDiveJump() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -16744,7 +16166,6 @@ int daAlink_c::procDiveJump() {
     return 1;
 }
 
-/* 800C6850-800C692C 0C1190 00DC+00 1/1 0/0 0/0 .text            procRollJumpInit__9daAlink_cFv */
 int daAlink_c::procRollJumpInit() {
     commonProcInit(PROC_ROLL_JUMP);
     setSingleAnimeBaseSpeed(ANM_ROLL_JUMP, 0.0f,
@@ -16769,7 +16190,6 @@ int daAlink_c::procRollJumpInit() {
     return 1;
 }
 
-/* 800C692C-800C6A48 0C126C 011C+00 1/0 0/0 0/0 .text            procRollJump__9daAlink_cFv */
 int daAlink_c::procRollJump() {
     if (mLinkAcch.ChkGroundHit()) {
         return checkLandAction(0);
@@ -16802,7 +16222,6 @@ int daAlink_c::procRollJump() {
 
 #include "d/d_com_inf_game.h"
 
-/* 800C6A48-800C6D20 0C1388 02D8+00 30/30 0/0 0/0 .text            procFallInit__9daAlink_cFif */
 int daAlink_c::procFallInit(int param_0, f32 param_1) {
     if (mDemo.getDemoMode() == 0x11) {
         mLinkAcch.SetGrndNone();
@@ -16880,7 +16299,6 @@ int daAlink_c::procFallInit(int param_0, f32 param_1) {
     return 1;
 }
 
-/* 800C6D20-800C6F18 0C1660 01F8+00 1/0 0/0 0/0 .text            procFall__9daAlink_cFv */
 int daAlink_c::procFall() {
     if (mProcVar5.field_0x3012 == 0) {
         cLib_chaseF(&mNormalSpeed, 0.0f, 0.1f);
@@ -16937,7 +16355,6 @@ int daAlink_c::procFall() {
     return 1;
 }
 
-/* 800C6F18-800C6FE4 0C1858 00CC+00 6/6 0/0 0/0 .text            procLandInit__9daAlink_cFf */
 int daAlink_c::procLandInit(f32 param_0) {
     commonProcInit(PROC_LAND);
     mNormalSpeed = 0.0f;
@@ -16961,7 +16378,6 @@ int daAlink_c::procLandInit(f32 param_0) {
     return 1;
 }
 
-/* 800C6FE4-800C70F8 0C1924 0114+00 1/0 0/0 0/0 .text            procLand__9daAlink_cFv */
 int daAlink_c::procLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -16988,7 +16404,6 @@ int daAlink_c::procLand() {
     return 1;
 }
 
-/* 800C70F8-800C72D4 0C1A38 01DC+00 3/3 0/0 0/0 .text            procSmallJumpInit__9daAlink_cFi */
 int daAlink_c::procSmallJumpInit(int param_0) {
     commonProcInit(PROC_SMALL_JUMP);
 
@@ -17033,7 +16448,6 @@ int daAlink_c::procSmallJumpInit(int param_0) {
     return 1;
 }
 
-/* 800C72D4-800C74D4 0C1C14 0200+00 1/0 0/0 0/0 .text            procSmallJump__9daAlink_cFv */
 int daAlink_c::procSmallJump() {
     if (checkModeFlg(2)) {
         if (checkCanoeJumpRide()) {
@@ -17076,7 +16490,6 @@ int daAlink_c::procSmallJump() {
     return 1;
 }
 
-/* 800C74D4-800C755C 0C1E14 0088+00 1/1 0/0 0/0 .text            procStepMoveInit__9daAlink_cFv */
 int daAlink_c::procStepMoveInit() {
     commonProcInit(PROC_STEP_MOVE);
     setSingleAnimeParam(ANM_S_JUMP_START, &daAlinkHIO_smallJump_c0::m.mStepClimbAnm);
@@ -17089,7 +16502,6 @@ int daAlink_c::procStepMoveInit() {
     return 1;
 }
 
-/* 800C755C-800C7690 0C1E9C 0134+00 1/0 0/0 0/0 .text            procStepMove__9daAlink_cFv */
 int daAlink_c::procStepMove() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -17120,7 +16532,6 @@ int daAlink_c::procStepMove() {
     return 1;
 }
 
-/* 800C7690-800C76F8 0C1FD0 0068+00 1/0 0/0 0/0 .text            procCrouchInit__9daAlink_cFv */
 int daAlink_c::procCrouchInit() {
     if (!commonProcInitNotSameProc(PROC_CROUCH)) {
         return 0;
@@ -17132,7 +16543,6 @@ int daAlink_c::procCrouchInit() {
     return 1;
 }
 
-/* 800C76F8-800C77F4 0C2038 00FC+00 1/0 0/0 0/0 .text            procCrouch__9daAlink_cFv */
 int daAlink_c::procCrouch() {
     cLib_chaseF(&mNormalSpeed, 0.0f, daAlinkHIO_move_c0::m.mDeceleration);
 
@@ -17151,7 +16561,6 @@ int daAlink_c::procCrouch() {
     return 1;
 }
 
-/* 800C77F4-800C7C64 0C2134 0470+00 4/2 0/0 0/0 .text procCoMetamorphoseInit__9daAlink_cFv */
 int daAlink_c::procCoMetamorphoseInit() {
     int var_r29 = 0;
 
@@ -17269,7 +16678,6 @@ int daAlink_c::procCoMetamorphoseInit() {
     return 1;
 }
 
-/* 800C7C64-800C82E8 0C25A4 0684+00 1/0 0/0 0/0 .text            procCoMetamorphose__9daAlink_cFv */
 int daAlink_c::procCoMetamorphose() {
     if (mProcVar1.field_0x300a != 0) {
         if (!checkEventRun()) {
@@ -17427,7 +16835,6 @@ int daAlink_c::procCoMetamorphose() {
     return 1;
 }
 
-/* 800C82E8-800C83A0 0C2C28 00B8+00 2/0 0/0 0/0 .text procCoMetamorphoseOnlyInit__9daAlink_cFv */
 int daAlink_c::procCoMetamorphoseOnlyInit() {
     if (!commonProcInitNotSameProc(PROC_METAMORPHOSE_ONLY)) {
         return 1;
@@ -17451,7 +16858,6 @@ int daAlink_c::procCoMetamorphoseOnlyInit() {
     return 1;
 }
 
-/* 800C83A0-800C8460 0C2CE0 00C0+00 1/0 0/0 0/0 .text procCoMetamorphoseOnly__9daAlink_cFv */
 int daAlink_c::procCoMetamorphoseOnly() {
     if (mProcVar2.field_0x300c == 0) {
         mClothesChangeWaitTimer = 4;
@@ -17474,7 +16880,6 @@ int daAlink_c::procCoMetamorphoseOnly() {
     return 1;
 }
 
-/* 800C8460-800C84D0 0C2DA0 0070+00 2/2 0/0 0/0 .text procFloorDownReboundInit__9daAlink_cFv */
 int daAlink_c::procFloorDownReboundInit() {
     commonProcInit(PROC_FLOOR_DOWN_REBOUND);
     setSingleAnime(ANM_JUMP_LAND, 0.69999999f, daAlinkHIO_autoJump_c0::m.mLandAnm.mStartFrame,
@@ -17486,8 +16891,6 @@ int daAlink_c::procFloorDownReboundInit() {
     return 1;
 }
 
-/* 800C84D0-800C854C 0C2E10 007C+00 1/0 0/0 0/0 .text            procFloorDownRebound__9daAlink_cFv
- */
 int daAlink_c::procFloorDownRebound() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -17500,8 +16903,6 @@ int daAlink_c::procFloorDownRebound() {
     return 1;
 }
 
-/* 800C854C-800C85D8 0C2E8C 008C+00 1/1 0/0 0/0 .text
- * procGoronRideWaitInit__9daAlink_cFP10fopAc_ac_c              */
 int daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) {
     if (!commonProcInitNotSameProc(PROC_GORON_RIDE_WAIT)) {
         return 0;
@@ -17517,7 +16918,6 @@ int daAlink_c::procGoronRideWaitInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 800C85D8-800C8700 0C2F18 0128+00 1/0 0/0 0/0 .text            procGoronRideWait__9daAlink_cFv */
 int daAlink_c::procGoronRideWait() {
     if (!checkGoronRide()) {
         checkNextAction(0);
@@ -17550,7 +16950,6 @@ int daAlink_c::procGoronRideWait() {
     return 1;
 }
 
-/* 800C8700-800CAFA8 0C3040 28A8+00 1/1 0/0 0/0 .text            execute__9daAlink_cFv */
 int daAlink_c::execute() {
     loadModelDVD();
 
@@ -18541,12 +17940,10 @@ int daAlink_c::execute() {
     return 1;
 }
 
-/* 800CAFA8-800CAFC8 0C58E8 0020+00 1/0 0/0 0/0 .text            daAlink_Execute__FP9daAlink_c */
 static int daAlink_Execute(daAlink_c* i_this) {
     return i_this->execute();
 }
 
-/* 800CAFC8-800CB480 0C5908 04B8+00 2/2 0/0 0/0 .text            setDrawHand__9daAlink_cFv */
 void daAlink_c::setDrawHand() {
     field_0x06d0->hide();
     field_0x06d4->hide();
@@ -18668,7 +18065,6 @@ void daAlink_c::setDrawHand() {
     }
 }
 
-/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text            checkSwordDraw__9daAlink_cFv */
 bool daAlink_c::checkSwordDraw() {
     return ((checkSwordGet() && mSwordChangeWaitTimer == 0) &&
             !checkNoResetFlg2(FLG2_UNK_2080000)) &&
@@ -18677,7 +18073,6 @@ bool daAlink_c::checkSwordDraw() {
             || !dComIfGs_isEventBit(0x0C08));
 }
 
-/* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text            checkShieldDraw__9daAlink_cFv */
 bool daAlink_c::checkShieldDraw() {
     return ((checkShieldGet() && mShieldChangeWaitTimer == 0) &&
             !checkNoResetFlg2(FLG2_UNK_4080000)) &&
@@ -18686,7 +18081,6 @@ bool daAlink_c::checkShieldDraw() {
             || !dComIfGs_isEventBit(0x0C08));
 }
 
-/* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text            checkItemDraw__9daAlink_cFv */
 bool daAlink_c::checkItemDraw() {
     if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) {
         if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !checkShieldGet() ||
@@ -18698,8 +18092,6 @@ bool daAlink_c::checkItemDraw() {
     return false;
 }
 
-/* 800CB694-800CBA38 0C5FD4 03A4+00 0/0 0/0 1/1 .text            initShadowScaleLight__9daAlink_cFv
- */
 int daAlink_c::initShadowScaleLight() {
     dKy_shadow_mode_set(4);
 
@@ -18770,8 +18162,6 @@ int daAlink_c::initShadowScaleLight() {
     return var_r28;
 }
 
-/* 800CBA38-800CBC18 0C6378 01E0+00 0/0 0/0 1/1 .text            moveShadowScaleLight__9daAlink_cFv
- */
 int daAlink_c::moveShadowScaleLight() {
     int var_r29 = 0;
 
@@ -18819,7 +18209,6 @@ int daAlink_c::moveShadowScaleLight() {
     return var_r29;
 }
 
-/* 800CBC18-800CC25C 0C6558 0644+00 1/1 0/0 0/0 .text            shadowDraw__9daAlink_cFv */
 void daAlink_c::shadowDraw() {
     daMidna_c* temp_r3 = getMidnaActor();
     if (temp_r3 != NULL && ((temp_r3->checkShadowModelDraw() && (field_0x2ff4 >= 0x3FF0 || !checkMidnaRide())) || temp_r3->checkShadowModelDrawDemoForce())) {
@@ -18977,21 +18366,17 @@ void daAlink_c::shadowDraw() {
     }
 }
 
-/* 800CC25C-800CC298 0C6B9C 003C+00 3/3 0/0 0/0 .text            modelCalc__9daAlink_cFP8J3DModel */
 void daAlink_c::modelCalc(J3DModel* p_model) {
     if (mClothesChangeWaitTimer == 0) {
         p_model->calc();
     }
 }
 
-/* 800CC298-800CC2E0 0C6BD8 0048+00 2/2 0/0 0/0 .text basicModelDraw__9daAlink_cFP8J3DModel */
 void daAlink_c::basicModelDraw(J3DModel* i_model) {
     g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
     mDoExt_modelEntryDL(i_model);
 }
 
-/* 800CC2E0-800CC364 0C6C20 0084+00 1/1 0/0 0/0 .text            modelDraw__9daAlink_cFP8J3DModeli
- */
 void daAlink_c::modelDraw(J3DModel* i_model, int param_1) {
     g_env_light.setLightTevColorType_MAJI(i_model, &tevStr);
 
@@ -19005,8 +18390,6 @@ void daAlink_c::modelDraw(J3DModel* i_model, int param_1) {
     daMirror_c::entry(i_model);
 }
 
-/* 800CC364-800CC7DC 0C6CA4 0478+00 2/2 0/0 0/0 .text
- * setWaterDropColor__9daAlink_cFPC13J3DGXColorS10              */
 void daAlink_c::setWaterDropColor(const J3DGXColorS10* i_color) {
     static const GXColorS10 notColor0 = {0x00, 0x00, 0x00, 0xFF};
     J3DGXColorS10* var_r31;
@@ -19056,7 +18439,6 @@ void daAlink_c::setWaterDropColor(const J3DGXColorS10* i_color) {
     }
 }
 
-/* 800CC7DC-800CC7FC 0C711C 0020+00 2/2 0/0 0/0 .text            initTevCustomColor__9daAlink_cFv */
 void daAlink_c::initTevCustomColor() {
     tevStr.mLightInf.a = 0;
     tevStr.TevColor.r = 0;
@@ -19066,7 +18448,6 @@ void daAlink_c::initTevCustomColor() {
     tevStr.TevKColor.b = 0;
 }
 
-/* 800CC7FC-800CD78C 0C713C 0F90+00 1/1 0/0 0/0 .text            draw__9daAlink_cFv */
 int daAlink_c::draw() {
     if (checkWolf()) {
         g_env_light.settingTevStruct(9, &current.pos, &tevStr);
@@ -19409,12 +18790,10 @@ int daAlink_c::draw() {
     return 1;
 }
 
-/* 800CD78C-800CD7AC 0C80CC 0020+00 1/0 0/0 0/0 .text            daAlink_Draw__FP9daAlink_c */
 static int daAlink_Draw(daAlink_c* i_this) {
     return i_this->draw();
 }
 
-/* 800CD7AC-800CE208 0C80EC 0A5C+00 1/1 0/0 0/0 .text            __dt__9daAlink_cFv */
 daAlink_c::~daAlink_c() {
     dComIfGp_clearPlayerStatus0(0, ~0x400030);
     dComIfGp_clearPlayerStatus1(0, 0x7FB7B78);
@@ -19451,7 +18830,6 @@ daAlink_c::~daAlink_c() {
     dComIfGp_setLinkPlayer(NULL);
 }
 
-/* 800CE208-800CE294 0C8B48 008C+00 1/0 0/0 0/0 .text            daAlink_Delete__FP9daAlink_c */
 static int daAlink_Delete(daAlink_c* i_this) {
     if (i_this->getClothesChangeWaitTimer() != 0) {
         i_this->loadModelDVD();
@@ -19465,14 +18843,12 @@ static int daAlink_Delete(daAlink_c* i_this) {
     }
 }
 
-/* 803B2DAC-803B2DCC -00001 0020+00 1/0 0/0 0/0 .data            l_daAlink_Method */
 static actor_method_class l_daAlink_Method = {
     (process_method_func)daAlink_Create,  (process_method_func)daAlink_Delete,
     (process_method_func)daAlink_Execute, (process_method_func)NULL,
     (process_method_func)daAlink_Draw,
 };
 
-/* 803B2DCC-803B2E20 -00001 0030+24 0/0 0/0 1/0 .data            g_profile_ALINK */
 extern actor_process_profile_definition g_profile_ALINK = {
     fpcLy_CURRENT_e,
     5,
diff --git a/src/d/actor/d_a_alink_HIO_data.inc b/src/d/actor/d_a_alink_HIO_data.inc
index a27867accc..feb49c6d3d 100644
--- a/src/d/actor/d_a_alink_HIO_data.inc
+++ b/src/d/actor/d_a_alink_HIO_data.inc
@@ -1,7 +1,6 @@
 #include "d/actor/d_a_alink.h"
 
 // clang-format off
-/* 8038D664-8038D6BC 019CC4 0058+00 41/50 0/0 0/0 .rodata          m__19daAlinkHIO_basic_c0 */
 const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
     false,
 	20000,
@@ -31,7 +30,6 @@ const daAlinkHIO_basic_c1 daAlinkHIO_basic_c0::m = {
 	5000.0f,
 };
 
-/* 8038D6BC-8038D714 019D1C 0058+00 34/47 0/0 0/0 .rodata          m__18daAlinkHIO_move_c0 */
 const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
 	{
         11,
@@ -60,7 +58,6 @@ const daAlinkHIO_move_c1 daAlinkHIO_move_c0::m = {
     0.4f,
 };
 
-/* 8038D714-8038D768 019D74 0054+00 10/16 0/0 0/0 .rodata          m__21daAlinkHIO_atnMove_c0 */
 const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
     3000,
 	2000,
@@ -86,7 +83,6 @@ const daAlinkHIO_atnMove_c1 daAlinkHIO_atnMove_c0::m = {
 	1.3f,
 };
 
-/* 8038D768-8038D7BC 019DC8 0054+00 3/9 0/0 0/0 .rodata          m__26daAlinkHIO_noActAtnMove_c0 */
 const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
     3000,
 	2000,
@@ -112,7 +108,6 @@ const daAlinkHIO_noActAtnMove_c1 daAlinkHIO_noActAtnMove_c0::m = {
 	2.3f,
 };
 
-/* 8038D7BC-8038D82C 019E1C 0070+00 5/7 0/0 0/0 .rodata          m__23daAlinkHIO_frontRoll_c0 */
 const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
 	{
         29,
@@ -152,7 +147,6 @@ const daAlinkHIO_frontRoll_c1 daAlinkHIO_frontRoll_c0::m = {
     60.0f,
 };
 
-/* 8038D82C-8038D864 019E8C 0038+00 5/5 0/0 0/0 .rodata          m__22daAlinkHIO_backJump_c0 */
 const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
 	{
 		9,
@@ -174,7 +168,6 @@ const daAlinkHIO_backJump_c1 daAlinkHIO_backJump_c0::m = {
 	10.0f,
 };
 
-/* 8038D864-8038D8CC 019EC4 0068+00 3/3 0/0 0/0 .rodata          m__22daAlinkHIO_sideStep_c0 */
 const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
 	{
 		5,
@@ -212,7 +205,6 @@ const daAlinkHIO_sideStep_c1 daAlinkHIO_sideStep_c0::m = {
     10.0f,
 };
 
-/* 8038D8CC-8038D944 019F2C 0078+00 5/10 0/0 0/0 .rodata          m__19daAlinkHIO_slide_c0 */
 const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
 	{
 		14,
@@ -254,7 +246,6 @@ const daAlinkHIO_slide_c1 daAlinkHIO_slide_c0::m = {
     1.2f,
 };
 
-/* 8038D944-8038D964 019FA4 0020+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutNmV_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
@@ -271,7 +262,6 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmV_c0::m = {
 };
 #pragma pop
 
-/* 8038D964-8038D984 019FC4 0020+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutNmL_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
@@ -288,7 +278,6 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmL_c0::m = {
 };
 #pragma pop
 
-/* 8038D984-8038D9A4 019FE4 0020+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutNmR_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
@@ -305,7 +294,6 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmR_c0::m = {
 };
 #pragma pop
 
-/* 8038D9A4-8038D9C4 01A004 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_cutNmSL_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
@@ -322,7 +310,6 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSL_c0::m = {
 };
 #pragma pop
 
-/* 8038D9C4-8038D9E4 01A024 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_cutNmSR_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
@@ -339,7 +326,6 @@ const daAlinkHIO_cutNormal_c1 daAlinkHIO_cutNmSR_c0::m = {
 };
 #pragma pop
 
-/* 8038D9E4-8038DA10 01A044 002C+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutFnL_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
@@ -360,7 +346,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnL_c0::m = {
 };
 #pragma pop
 
-/* 8038DA10-8038DA3C 01A070 002C+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutFnV_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
@@ -381,7 +366,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnV_c0::m = {
 };
 #pragma pop
 
-/* 8038DA3C-8038DA68 01A09C 002C+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutFnS_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
@@ -402,7 +386,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnS_c0::m = {
 };
 #pragma pop
 
-/* 8038DA68-8038DA94 01A0C8 002C+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_cutFnSl_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
@@ -423,7 +406,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSl_c0::m = {
 };
 #pragma pop
 
-/* 8038DA94-8038DAC0 01A0F4 002C+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_cutFnSm_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
@@ -444,7 +426,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnSm_c0::m = {
 };
 #pragma pop
 
-/* 8038DAC0-8038DAEC 01A120 002C+00 0/1 0/0 0/0 .rodata          m__20daAlinkHIO_cutFnR_c0 */
 #pragma push
 const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
 	{
@@ -464,7 +445,6 @@ const daAlinkHIO_cutFinish_c1 daAlinkHIO_cutFnR_c0::m = {
 };
 #pragma pop
 
-/* 8038DAEC-8038DB40 01A14C 0054+00 3/4 0/0 0/0 .rodata          m__21daAlinkHIO_cutFnJU_c0 */
 const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
 	{
 		19,
@@ -494,7 +474,6 @@ const daAlinkHIO_cutFnJU_c1 daAlinkHIO_cutFnJU_c0::m = {
     80.0f,
 };
 
-/* 8038DB40-8038DB84 01A1A0 0044+00 4/4 0/0 0/0 .rodata          m__21daAlinkHIO_cutJump_c0 */
 const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
 	{
 		17,
@@ -519,7 +498,6 @@ const daAlinkHIO_cutJump_c1 daAlinkHIO_cutJump_c0::m = {
     3.0f,
 };
 
-/* 8038DB84-8038DC1C 01A1E4 0098+00 5/6 0/0 0/0 .rodata          m__21daAlinkHIO_cutTurn_c0 */
 const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
 	{
 		47,
@@ -568,7 +546,6 @@ const daAlinkHIO_cutTurn_c1 daAlinkHIO_cutTurn_c0::m = {
     35.0f,
 };
 
-/* 8038DC1C-8038DC3C 01A27C 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_hoCutLA_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
@@ -585,7 +562,6 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLA_c0::m = {
 };
 #pragma pop
 
-/* 8038DC3C-8038DC5C 01A29C 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_hoCutLB_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
@@ -602,7 +578,6 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutLB_c0::m = {
 };
 #pragma pop
 
-/* 8038DC5C-8038DC7C 01A2BC 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_hoCutRA_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
@@ -619,7 +594,6 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRA_c0::m = {
 };
 #pragma pop
 
-/* 8038DC7C-8038DC9C 01A2DC 0020+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_hoCutRB_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
@@ -636,7 +610,6 @@ const daAlinkHIO_hoCut_c1 daAlinkHIO_hoCutRB_c0::m = {
 };
 #pragma pop
 
-/* 8038DC9C-8038DCF0 01A2FC 0054+00 3/3 0/0 0/0 .rodata          m__25daAlinkHIO_hoCutCharge_c0 */
 const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
 	{
 		6,
@@ -668,7 +641,6 @@ const daAlinkHIO_hoCutCharge_c1 daAlinkHIO_hoCutCharge_c0::m = {
     300.0f,
 };
 
-/* 8038DCF0-8038DD0C 01A350 001C+00 0/3 0/0 0/0 .rodata          m__20daAlinkHIO_cutDaL_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
@@ -684,7 +656,6 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaL_c0::m = {
 };
 #pragma pop
 
-/* 8038DD0C-8038DD28 01A36C 001C+00 0/3 0/0 0/0 .rodata          m__20daAlinkHIO_cutDaR_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
@@ -700,7 +671,6 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaR_c0::m = {
 };
 #pragma pop
 
-/* 8038DD28-8038DD44 01A388 001C+00 0/3 0/0 0/0 .rodata          m__25daAlinkHIO_cutDaCharge_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
@@ -716,7 +686,6 @@ const daAlinkHIO_cutDash_c1 daAlinkHIO_cutDaCharge_c0::m = {
 };
 #pragma pop
 
-/* 8038DD44-8038DDB8 01A3A4 0074+00 5/5 0/0 0/0 .rodata          m__21daAlinkHIO_cutDown_c0 */
 const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
 	{
 		8,
@@ -760,7 +729,6 @@ const daAlinkHIO_cutDown_c1 daAlinkHIO_cutDown_c0::m = {
     10.0f,
 };
 
-/* 8038DDB8-8038DE18 01A418 0060+00 4/4 0/0 0/0 .rodata          m__21daAlinkHIO_cutHead_c0 */
 const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
 	{
 		8,
@@ -794,7 +762,6 @@ const daAlinkHIO_cutHead_c1 daAlinkHIO_cutHead_c0::m = {
     1.6f,
 };
 
-/* 8038DE18-8038DE8C 01A478 0074+00 5/5 0/0 0/0 .rodata          m__26daAlinkHIO_cutLargeJump_c0 */
 const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
 	{
 		29,
@@ -835,7 +802,6 @@ const daAlinkHIO_cutLargeJump_c1 daAlinkHIO_cutLargeJump_c0::m = {
     5.0f,
 };
 
-/* 8038DE8C-8038DF28 01A4EC 009C+00 21/30 0/0 0/0 .rodata          m__17daAlinkHIO_cut_c0 */
 const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
 	{
 		18,
@@ -891,7 +857,6 @@ const daAlinkHIO_cut_c1 daAlinkHIO_cut_c0::m = {
     0.0f,
 };
 
-/* 8038DF28-8038DF4C 01A588 0024+00 1/1 0/0 0/0 .rodata          m__21daAlinkHIO_gAtPush_c0 */
 const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
 	{
 		14,
@@ -906,7 +871,6 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtPush_c0::m = {
 	14.0f,
 };
 
-/* 8038DF4C-8038DF70 01A5AC 0024+00 0/0 0/0 0/0 .rodata          m__21daAlinkHIO_gAtKick_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
@@ -924,7 +888,6 @@ const daAlinkHIO_guardAttack_c1 daAlinkHIO_gAtKick_c0::m = {
 };
 #pragma pop
 
-/* 8038DF70-8038DF9C 01A5D0 002C+00 4/4 0/0 0/0 .rodata          m__22daAlinkHIO_turnMove_c0 */
 const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
 	{
 		27,
@@ -943,7 +906,6 @@ const daAlinkHIO_turnMove_c1 daAlinkHIO_turnMove_c0::m = {
 	25.0f,
 };
 
-/* 8038DF9C-8038E01C 01A5FC 0080+00 6/7 0/0 0/0 .rodata          m__19daAlinkHIO_guard_c0 */
 const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
 	{
 		11,
@@ -989,7 +951,6 @@ const daAlinkHIO_guard_c1 daAlinkHIO_guard_c0::m = {
     18.0f,
 };
 
-/* 8038E01C-8038E068 01A67C 004C+00 8/9 0/0 0/0 .rodata          m__20daAlinkHIO_crouch_c0 */
 const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
 	{
 		9,
@@ -1017,7 +978,6 @@ const daAlinkHIO_crouch_c1 daAlinkHIO_crouch_c0::m = {
     5.0f,
 };
 
-/* 8038E068-8038E11C 01A6C8 00B4+00 26/32 0/0 0/0 .rodata          m__22daAlinkHIO_autoJump_c0 */
 const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
 	{
 		6,
@@ -1076,7 +1036,6 @@ const daAlinkHIO_autoJump_c1 daAlinkHIO_autoJump_c0::m = {
     23.0f,
 };
 
-/* 8038E11C-8038E164 01A77C 0048+00 7/7 0/0 0/0 .rodata          m__23daAlinkHIO_smallJump_c0 */
 const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
 	{
 		8,
@@ -1104,7 +1063,6 @@ const daAlinkHIO_smallJump_c1 daAlinkHIO_smallJump_c0::m = {
     7.0f,
 };
 
-/* 8038E164-8038E1B8 01A7C4 0054+00 15/15 0/0 0/0 .rodata          m__23daAlinkHIO_wallCatch_c0 */
 const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
 	{
 		19,
@@ -1137,7 +1095,6 @@ const daAlinkHIO_wallCatch_c1 daAlinkHIO_wallCatch_c0::m = {
     4.0f,
 };
 
-/* 8038E1B8-8038E1E0 01A818 0028+00 4/4 0/0 0/0 .rodata          m__22daAlinkHIO_wallFall_c0 */
 const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
 	{
 		22,
@@ -1155,7 +1112,6 @@ const daAlinkHIO_wallFall_c1 daAlinkHIO_wallFall_c0::m = {
 	},
 };
 
-/* 8038E1E0-8038E1F4 01A840 0014+00 2/2 0/0 0/0 .rodata          m__22daAlinkHIO_wallMove_c0 */
 const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
     0.8f,
 	1.1f,
@@ -1164,7 +1120,6 @@ const daAlinkHIO_wallMove_c1 daAlinkHIO_wallMove_c0::m = {
 	3.0f,
 };
 
-/* 8038E1F4-8038E210 01A854 001C+00 2/5 0/0 0/0 .rodata          m__22daAlinkHIO_wallHang_c0 */
 const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
     2,
 	3,
@@ -1176,7 +1131,6 @@ const daAlinkHIO_wallHang_c1 daAlinkHIO_wallHang_c0::m = {
 	200.0f,
 };
 
-/* 8038E210-8038E24C 01A870 003C+00 7/7 0/0 0/0 .rodata          m__22daAlinkHIO_pushpull_c0 */
 const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
     0,
 	120,
@@ -1199,7 +1153,6 @@ const daAlinkHIO_pushpull_c1 daAlinkHIO_pushpull_c0::m = {
 	0.75f,
 };
 
-/* 8038E24C-8038E2B0 01A8AC 0064+00 1/3 0/0 0/0 .rodata          m__23daAlinkHIO_damNormal_c0 */
 const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
 	{
 		22,
@@ -1237,7 +1190,6 @@ const daAlinkHIO_damNormal_c1 daAlinkHIO_damNormal_c0::m = {
     0.5f,
 };
 
-/* 8038E2B0-8038E36C 01A910 00BC+00 2/4 0/0 0/0 .rodata          m__22daAlinkHIO_damLarge_c0 */
 const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
 	{
 		49,
@@ -1304,7 +1256,6 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damLarge_c0::m = {
     0.5f,
 };
 
-/* 8038E36C-8038E428 01A9CC 00BC+00 1/3 0/0 0/0 .rodata          m__21daAlinkHIO_damHuge_c0 */
 const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
 	{
 		49,
@@ -1371,7 +1322,6 @@ const daAlinkHIO_damLaHu_c1 daAlinkHIO_damHuge_c0::m = {
     0.5f,
 };
 
-/* 8038E428-8038E454 01AA88 002C+00 1/1 0/0 0/0 .rodata          m__22daAlinkHIO_damHorse_c0 */
 const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
 	{
 		9,
@@ -1391,7 +1341,6 @@ const daAlinkHIO_damHorse_c1 daAlinkHIO_damHorse_c0::m = {
     5000,
 };
 
-/* 8038E454-8038E49C 01AAB4 0048+00 9/9 0/0 0/0 .rodata          m__21daAlinkHIO_damFall_c0 */
 const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
 	{
 		11,
@@ -1418,7 +1367,6 @@ const daAlinkHIO_damFall_c1 daAlinkHIO_damFall_c0::m = {
     15.0f,
 };
 
-/* 8038E49C-8038E4C0 01AAFC 0024+00 6/7 0/0 0/0 .rodata          m__23daAlinkHIO_damCaught_c0 */
 const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
 	{
 		59,
@@ -1434,7 +1382,6 @@ const daAlinkHIO_damCaught_c1 daAlinkHIO_damCaught_c0::m = {
 	1.3f,
 };
 
-/* 8038E4C0-8038E54C 01AB20 008C+00 1/2 0/0 0/0 .rodata          m__21daAlinkHIO_damSwim_c0 */
 const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
 	{
 		22,
@@ -1486,7 +1433,6 @@ const daAlinkHIO_damSwim_c1 daAlinkHIO_damSwim_c0::m = {
     15.0f,
 };
 
-/* 8038E54C-8038E5A4 01ABAC 0058+00 10/12 0/0 0/0 .rodata          m__20daAlinkHIO_damage_c0 */
 const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
 	{
 		14,
@@ -1525,7 +1471,6 @@ const daAlinkHIO_damage_c1 daAlinkHIO_damage_c0::m = {
     35.0f,
 };
 
-/* 8038E5A4-8038E610 01AC04 006C+00 7/8 0/0 0/0 .rodata          m__19daAlinkHIO_horse_c0 */
 const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
 	{
 		18,
@@ -1567,8 +1512,6 @@ const daAlinkHIO_horse_c1 daAlinkHIO_horse_c0::m = {
     5.0f,
 };
 
-/* ############################################################################################## */
-/* 8038E610-8038E658 01AC70 0048+00 11/11 0/0 0/0 .rodata          m__19daAlinkHIO_canoe_c0 */
 const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
 	{
 		23,
@@ -1593,7 +1536,6 @@ const daAlinkHIO_canoe_c1 daAlinkHIO_canoe_c0::m = {
     0.2f,
 };
 
-/* 8038E658-8038E6C8 01ACB8 0070+00 9/9 0/0 0/0 .rodata          m__17daAlinkHIO_bow_c0 */
 const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
 	{
 		9,
@@ -1630,7 +1572,6 @@ const daAlinkHIO_bow_c1 daAlinkHIO_bow_c0::m = {
     800.0f,
 };
 
-/* 8038E6C8-8038E714 01AD28 004C+00 22/23 0/0 0/0 .rodata          m__18daAlinkHIO_boom_c0 */
 const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
 	{
 		21,
@@ -1658,7 +1599,6 @@ const daAlinkHIO_boom_c1 daAlinkHIO_boom_c0::m = {
     40.0f,
 };
 
-/* 8038E714-8038E760 01AD74 004C+00 14/14 0/0 0/0 .rodata          m__18daAlinkHIO_bomb_c0 */
 const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
     160,
 	50,
@@ -1682,7 +1622,6 @@ const daAlinkHIO_bomb_c1 daAlinkHIO_bomb_c0::m = {
 	300.0f,
 };
 
-/* 8038E760-8038E77C 01ADC0 001C+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_huLight_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
@@ -1700,7 +1639,6 @@ const daAlinkHIO_huLight_c1 daAlinkHIO_huLight_c0::m = {
 };
 #pragma pop
 
-/* 8038E77C-8038E7CC 01ADDC 0050+00 7/8 0/0 0/0 .rodata          m__23daAlinkHIO_kandelaar_c0 */
 const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
 	{
 		30,
@@ -1734,7 +1672,6 @@ const daAlinkHIO_kandelaar_c1 daAlinkHIO_kandelaar_c0::m = {
     0.5f,
 };
 
-/* 8038E7CC-8038E7F4 01AE2C 0028+00 2/2 0/0 0/0 .rodata          m__21daAlinkHIO_fmChain_c0 */
 const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
 	{
 		20,
@@ -1752,7 +1689,6 @@ const daAlinkHIO_fmChain_c1 daAlinkHIO_fmChain_c0::m = {
 	},
 };
 
-/* 8038E7F4-8038E840 01AE54 004C+00 17/21 0/0 0/0 .rodata          m__24daAlinkHIO_magneBoots_c0 */
 const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
 	{
 		29,
@@ -1777,7 +1713,6 @@ const daAlinkHIO_magneBoots_c1 daAlinkHIO_magneBoots_c0::m = {
     0.7f,
 };
 
-/* 8038E840-8038E870 01AEA0 0030+00 6/6 0/0 0/0 .rodata          m__20daAlinkHIO_pickUp_c0 */
 const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
 	{
 		18,
@@ -1797,7 +1732,6 @@ const daAlinkHIO_pickUp_c1 daAlinkHIO_pickUp_c0::m = {
     30.0f,
 };
 
-/* 8038E870-8038E90C 01AED0 009C+00 16/17 0/0 0/0 .rodata          m__19daAlinkHIO_board_c0 */
 const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
 	{
 		9,
@@ -1848,7 +1782,6 @@ const daAlinkHIO_board_c1 daAlinkHIO_board_c0::m = {
     50.0f,
 };
 
-/* 8038E90C-8038E9C0 01AF6C 00B4+00 12/12 0/0 0/0 .rodata          m__20daAlinkHIO_bottle_c0 */
 const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
 	{
 		56,
@@ -1915,7 +1848,6 @@ const daAlinkHIO_bottle_c1 daAlinkHIO_bottle_c0::m = {
 	},
 };
 
-/* 8038E9C0-8038EA30 01B020 0070+00 15/16 0/0 0/0 .rodata          m__22daAlinkHIO_hookshot_c0 */
 const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
 	{
 		12,
@@ -1953,7 +1885,6 @@ const daAlinkHIO_hookshot_c1 daAlinkHIO_hookshot_c0::m = {
     90.0f,
 };
 
-/* 8038EA30-8038EA70 01B090 0040+00 10/10 0/0 0/0 .rodata          m__21daAlinkHIO_spinner_c0 */
 const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
 	{
 		21,
@@ -1977,7 +1908,6 @@ const daAlinkHIO_spinner_c1 daAlinkHIO_spinner_c0::m = {
     60.0f,
 };
 
-/* 8038EA70-8038EAFC 01B0D0 008C+00 10/12 0/0 0/0 .rodata          m__22daAlinkHIO_ironBall_c0 */
 const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
 	{
 		19,
@@ -2019,7 +1949,6 @@ const daAlinkHIO_ironBall_c1 daAlinkHIO_ironBall_c0::m = {
     0.5f,
 };
 
-/* 8038EAFC-8038EB34 01B15C 0038+00 4/4 0/0 0/0 .rodata          m__21daAlinkHIO_copyRod_c0 */
 const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
     19,
 	1.0f,
@@ -2037,7 +1966,6 @@ const daAlinkHIO_copyRod_c1 daAlinkHIO_copyRod_c0::m = {
 	2000.0f,
 };
 
-/* 8038EB34-8038EB50 01B194 001C+00 0/0 0/0 0/0 .rodata          m__21daAlinkHIO_zwLight_c0 */
 const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
     771,
 	0,
@@ -2051,7 +1979,6 @@ const daAlinkHIO_zwLight_c1 daAlinkHIO_zwLight_c0::m = {
 	0.0f,
 };
 
-/* 8038EB50-8038EB8C 01B1B0 003C+00 3/3 0/0 0/0 .rodata          m__18daAlinkHIO_item_c0 */
 const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
 	{
 		12,
@@ -2076,7 +2003,6 @@ const daAlinkHIO_item_c1 daAlinkHIO_item_c0::m = {
     1.3f,
 };
 
-/* 8038EB8C-8038EBFC 01B1EC 0070+00 14/14 0/0 0/0 .rodata          m__20daAlinkHIO_ladder_c0 */
 const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
 	{
 		13,
@@ -2112,7 +2038,6 @@ const daAlinkHIO_ladder_c1 daAlinkHIO_ladder_c0::m = {
     80.0f,
 };
 
-/* 8038EBFC-8038EC48 01B25C 004C+00 11/11 0/0 0/0 .rodata          m__22daAlinkHIO_roofHang_c0 */
 const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
 	{
 		34,
@@ -2138,7 +2063,6 @@ const daAlinkHIO_roofHang_c1 daAlinkHIO_roofHang_c0::m = {
     3.0f,
 };
 
-/* 8038EC48-8038ED2C 01B2A8 00E4+00 10/11 0/0 0/0 .rodata          m__18daAlinkHIO_grab_c0 */
 const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
 	{
 		4,
@@ -2222,7 +2146,6 @@ const daAlinkHIO_grab_c1 daAlinkHIO_grab_c0::m = {
     0.55f,
 };
 
-/* 8038ED2C-8038EE28 01B38C 00FC+00 21/30 0/0 0/0 .rodata          m__18daAlinkHIO_swim_c0 */
 const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
 	{
 		25,
@@ -2301,7 +2224,6 @@ const daAlinkHIO_swim_c1 daAlinkHIO_swim_c0::m = {
     1.3f,
 };
 
-/* 8038EE28-8038EF28 01B488 0100+00 32/41 0/0 0/0 .rodata          m__20daAlinkHIO_wlMove_c0 */
 const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
 	{
 		14,
@@ -2381,7 +2303,6 @@ const daAlinkHIO_wlMove_c1 daAlinkHIO_wlMove_c0::m = {
     0.5f,
 };
 
-/* 8038EF28-8038EF70 01B588 0048+00 19/27 0/0 0/0 .rodata          m__23daAlinkHIO_wlMoveNoP_c0 */
 const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
     9000,
 	100,
@@ -2404,7 +2325,6 @@ const daAlinkHIO_wlMoveNoP_c1 daAlinkHIO_wlMoveNoP_c0::m = {
 	30.0f,
 };
 
-/* 8038EF70-8038EFA8 01B5D0 0038+00 3/6 0/0 0/0 .rodata          m__23daAlinkHIO_wlAtnMove_c0 */
 const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
     9000,
 	100,
@@ -2423,7 +2343,6 @@ const daAlinkHIO_wlAtnMove_c1 daAlinkHIO_wlAtnMove_c0::m = {
 	2.0f,
 };
 
-/* 8038EFA8-8038F010 01B608 0068+00 3/3 0/0 0/0 .rodata          m__24daAlinkHIO_wlSideStep_c0 */
 const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
 	{
 		5,
@@ -2461,7 +2380,6 @@ const daAlinkHIO_wlSideStep_c1 daAlinkHIO_wlSideStep_c0::m = {
     10.0f,
 };
 
-/* 8038F010-8038F048 01B670 0038+00 3/4 0/0 0/0 .rodata          m__24daAlinkHIO_wlBackJump_c0 */
 const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
 	{
 		11,
@@ -2483,7 +2401,6 @@ const daAlinkHIO_wlBackJump_c1 daAlinkHIO_wlBackJump_c0::m = {
 	10.0f,
 };
 
-/* 8038F048-8038F0A8 01B6A8 0060+00 2/2 0/0 0/0 .rodata          m__20daAlinkHIO_wlHowl_c0 */
 const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
 	{
 		49,
@@ -2519,7 +2436,6 @@ const daAlinkHIO_wlHowl_c1 daAlinkHIO_wlHowl_c0::m = {
     0.7f,
 };
 
-/* 8038F0A8-8038F124 01B708 007C+00 8/13 0/0 0/0 .rodata          m__24daAlinkHIO_wlAutoJump_c0 */
 const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
 	{
 		3,
@@ -2562,7 +2478,6 @@ const daAlinkHIO_wlAutoJump_c1 daAlinkHIO_wlAutoJump_c0::m = {
     100.0f,
 };
 
-/* 8038F124-8038F138 01B784 0014+00 4/4 0/0 0/0 .rodata          m__20daAlinkHIO_wlPush_c0 */
 const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
     1.0f,
 	3.0f,
@@ -2571,7 +2486,6 @@ const daAlinkHIO_wlPush_c1 daAlinkHIO_wlPush_c0::m = {
 	0.75f,
 };
 
-/* 8038F138-8038F184 01B798 004C+00 13/15 0/0 0/0 .rodata          m__19daAlinkHIO_wlLie_c0 */
 const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
 	{
 		14,
@@ -2599,7 +2513,6 @@ const daAlinkHIO_wlLie_c1 daAlinkHIO_wlLie_c0::m = {
     3.0f,
 };
 
-/* 8038F184-8038F1A0 01B7E4 001C+00 0/1 0/0 0/0 .rodata          m__21daAlinkHIO_wlLight_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
@@ -2616,7 +2529,6 @@ const daAlinkHIO_wlLight_c1 daAlinkHIO_wlLight_c0::m = {
 };
 #pragma pop
 
-/* 8038F1A0-8038F23C 01B800 009C+00 9/11 0/0 0/0 .rodata          m__24daAlinkHIO_wlWallHang_c0 */
 const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
 	{
 		13,
@@ -2671,7 +2583,6 @@ const daAlinkHIO_wlWallHang_c1 daAlinkHIO_wlWallHang_c0::m = {
     10.0f,
 };
 
-/* 8038F23C-8038F29C 01B89C 0060+00 2/3 0/0 0/0 .rodata          m__25daAlinkHIO_wlDamNormal_c0 */
 const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
 	{
 		9,
@@ -2707,7 +2618,6 @@ const daAlinkHIO_wlDamNormal_c1 daAlinkHIO_wlDamNormal_c0::m = {
     0.25f,
 };
 
-/* 8038F29C-8038F308 01B8FC 006C+00 2/4 0/0 0/0 .rodata          m__24daAlinkHIO_wlDamLarge_c0 */
 const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
 	{
 		49,
@@ -2746,7 +2656,6 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamLarge_c0::m = {
     0.5f,
 };
 
-/* 8038F308-8038F374 01B968 006C+00 0/2 0/0 0/0 .rodata          m__23daAlinkHIO_wlDamHuge_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
@@ -2788,7 +2697,6 @@ const daAlinkHIO_wlDamLaHu_c1 daAlinkHIO_wlDamHuge_c0::m = {
 };
 #pragma pop
 
-/* 8038F374-8038F3B4 01B9D4 0040+00 6/6 0/0 0/0 .rodata          m__23daAlinkHIO_wlDamFall_c0 */
 const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
 	{
 		11,
@@ -2813,7 +2721,6 @@ const daAlinkHIO_wlDamFall_c1 daAlinkHIO_wlDamFall_c0::m = {
     15.0f,
 };
 
-/* 8038F3B4-8038F3C4 01BA14 0010+00 1/1 0/0 0/0 .rodata          m__25daAlinkHIO_wlDamCaught_c0 */
 const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
     300,
 	5,
@@ -2822,7 +2729,6 @@ const daAlinkHIO_wlDamCaught_c1 daAlinkHIO_wlDamCaught_c0::m = {
 	1.5f,
 };
 
-/* 8038F3C4-8038F3F0 01BA24 002C+00 3/4 0/0 0/0 .rodata          m__22daAlinkHIO_wlDamage_c0 */
 const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
 	{
 		9,
@@ -2841,7 +2747,6 @@ const daAlinkHIO_wlDamage_c1 daAlinkHIO_wlDamage_c0::m = {
     0.7f,
 };
 
-/* 8038F3F0-8038F46C 01BA50 007C+00 10/14 0/0 0/0 .rodata          m__21daAlinkHIO_wlSlide_c0 */
 const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
 	{
 		20,
@@ -2885,7 +2790,6 @@ const daAlinkHIO_wlSlide_c1 daAlinkHIO_wlSlide_c0::m = {
     30.0f,
 };
 
-/* 8038F46C-8038F4A4 01BACC 0038+00 7/7 0/0 0/0 .rodata          m__20daAlinkHIO_wlRope_c0 */
 const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
 	{
 		16,
@@ -2906,7 +2810,6 @@ const daAlinkHIO_wlRope_c1 daAlinkHIO_wlRope_c0::m = {
 	0.8f,
 };
 
-/* 8038F4A4-8038F4E0 01BB04 003C+00 0/1 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtWaLr_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
@@ -2931,7 +2834,6 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaLr_c0::m = {
 };
 #pragma pop
 
-/* 8038F4E0-8038F51C 01BB40 003C+00 0/1 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtWaSc_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
@@ -2956,7 +2858,6 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaSc_c0::m = {
 };
 #pragma pop
 
-/* 8038F51C-8038F558 01BB7C 003C+00 0/1 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtWaTl_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
@@ -2981,7 +2882,6 @@ const daAlinkHIO_wlAtWait_c1 daAlinkHIO_wlAtWaTl_c0::m = {
 };
 #pragma pop
 
-/* 8038F558-8038F578 01BBB8 0020+00 2/2 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtRoll_c0 */
 const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
 	{
 		40,
@@ -2995,7 +2895,6 @@ const daAlinkHIO_wlAtRoll_c1 daAlinkHIO_wlAtRoll_c0::m = {
     0.0f,
 };
 
-/* 8038F578-8038F5B4 01BBD8 003C+00 3/5 0/0 0/0 .rodata          m__23daAlinkHIO_wlAtNjump_c0 */
 const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
 	{
 		6,
@@ -3016,7 +2915,6 @@ const daAlinkHIO_wlAtNjump_c1 daAlinkHIO_wlAtNjump_c0::m = {
     10.0f,
 };
 
-/* 8038F5B4-8038F618 01BC14 0064+00 1/4 0/0 0/0 .rodata          m__23daAlinkHIO_wlAtCjump_c0 */
 const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
 	{
 		3,
@@ -3049,7 +2947,6 @@ const daAlinkHIO_wlAtCjump_c1 daAlinkHIO_wlAtCjump_c0::m = {
     0.1f,
 };
 
-/* 8038F618-8038F658 01BC78 0040+00 4/4 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtLand_c0 */
 const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
 	{
 		19,
@@ -3075,7 +2972,6 @@ const daAlinkHIO_wlAtLand_c1 daAlinkHIO_wlAtLand_c0::m = {
     2.0f,
 };
 
-/* 8038F658-8038F6F4 01BCB8 009C+00 6/7 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtDown_c0 */
 const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
 	{
 		3,
@@ -3133,7 +3029,6 @@ const daAlinkHIO_wlAtDown_c1 daAlinkHIO_wlAtDown_c0::m = {
     13.0f,
 };
 
-/* 8038F6F4-8038F748 01BD54 0054+00 6/6 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtLock_c0 */
 const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
 	{
 		6,
@@ -3162,7 +3057,6 @@ const daAlinkHIO_wlAtLock_c1 daAlinkHIO_wlAtLock_c0::m = {
     1000.0f,
 };
 
-/* 8038F748-8038F7A4 01BDA8 005C+00 5/5 0/0 0/0 .rodata          m__22daAlinkHIO_wlAtBite_c0 */
 const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
 	{
 		5,
@@ -3194,7 +3088,6 @@ const daAlinkHIO_wlAtBite_c1 daAlinkHIO_wlAtBite_c0::m = {
     0.02f,
 };
 
-/* 8038F7A4-8038F7DC 01BE04 0038+00 7/10 0/0 0/0 .rodata          m__22daAlinkHIO_wlAttack_c0 */
 const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
 	{
 		59,
@@ -3215,7 +3108,6 @@ const daAlinkHIO_wlAttack_c1 daAlinkHIO_wlAttack_c0::m = {
 	30.0f,
 };
 
-/* 8038F7DC-8038F858 01BE3C 007C+00 5/5 0/0 0/0 .rodata          m__21daAlinkHIO_wlPoint_c0 */
 const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
 	{
 		6,
@@ -3258,7 +3150,6 @@ const daAlinkHIO_wlPoint_c1 daAlinkHIO_wlPoint_c0::m = {
     0.2f,
 };
 
-/* 8038F858-8038F8B4 01BEB8 005C+00 6/6 0/0 0/0 .rodata          m__21daAlinkHIO_wlChain_c0 */
 const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
 	{
 		39,
@@ -3292,7 +3183,6 @@ const daAlinkHIO_wlChain_c1 daAlinkHIO_wlChain_c0::m = {
     5.0f,
 };
 
-/* 8038F8B4-8038F95C 01BF14 00A8+00 16/24 0/0 0/0 .rodata          m__20daAlinkHIO_wlSwim_c0 */
 const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
 	{
 		25,
@@ -3347,7 +3237,6 @@ const daAlinkHIO_wlSwim_c1 daAlinkHIO_wlSwim_c0::m = {
     7.0f,
 };
 
-/* 8038F95C-8038F9C0 01BFBC 0064+00 6/6 0/0 0/0 .rodata          m__20daAlinkHIO_wlGrab_c0 */
 const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
 	{
 		20,
@@ -3386,7 +3275,6 @@ const daAlinkHIO_wlGrab_c1 daAlinkHIO_wlGrab_c0::m = {
 	},
 };
 
-/* 8038F9C0-8038F9F8 01C020 0038+00 0/0 0/0 0/0 .rodata          m__20daAlinkHIO_wlBall_c0 */
 #pragma push
 #pragma force_active on
 const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
@@ -3411,7 +3299,6 @@ const daAlinkHIO_wlBall_c1 daAlinkHIO_wlBall_c0::m = {
 };
 #pragma pop
 
-/* 8038F9F8-8038FA10 01C058 0018+00 5/6 0/0 0/0 .rodata          m__18daAlinkHIO_wolf_c0 */
 const daAlinkHIO_wolf_c1 daAlinkHIO_wolf_c0::m = {
     13000,
 	-10000,
diff --git a/src/d/actor/d_a_alink_bomb.inc b/src/d/actor/d_a_alink_bomb.inc
index dc4f695504..b0d1a9a3ba 100644
--- a/src/d/actor/d_a_alink_bomb.inc
+++ b/src/d/actor/d_a_alink_bomb.inc
@@ -5,67 +5,54 @@
 
 #include "d/actor/d_a_alink.h"
 
-/* 800E3760-800E3770 0DE0A0 0010+00 0/0 0/0 7/7 .text            getBombExplodeTime__9daAlink_cCFv */
 s16 daAlink_c::getBombExplodeTime() const {
     return daAlinkHIO_bomb_c0::m.mExplodeTime;
 }
 
-/* 800E3770-800E3780 0DE0B0 0010+00 0/0 0/0 2/2 .text            getBombGravity__9daAlink_cCFv */
 f32 daAlink_c::getBombGravity() const {
     return daAlinkHIO_bomb_c0::m.mGravity;
 }
 
-/* 800E3780-800E3790 0DE0C0 0010+00 0/0 0/0 2/2 .text            getBombMaxFallSpeed__9daAlink_cCFv */
 f32 daAlink_c::getBombMaxFallSpeed() const {
     return daAlinkHIO_bomb_c0::m.mMaxFallSpeed;
 }
 
-/* 800E3790-800E37A0 0DE0D0 0010+00 0/0 0/0 1/1 .text            getBombBoundRate__9daAlink_cCFv */
 f32 daAlink_c::getBombBoundRate() const {
     return daAlinkHIO_bomb_c0::m.mBoundRate;
 }
 
-/* 800E37A0-800E37B0 0DE0E0 0010+00 0/0 0/0 1/1 .text            getBombStopSpeedY__9daAlink_cCFv */
 f32 daAlink_c::getBombStopSpeedY() const {
     return daAlinkHIO_bomb_c0::m.mStopSpeedY;
 }
 
-/* 800E37B0-800E37C0 0DE0F0 0010+00 0/0 0/0 1/1 .text            getBombMaxSpeedY__9daAlink_cCFv */
 f32 daAlink_c::getBombMaxSpeedY() const {
     return daAlinkHIO_bomb_c0::m.mMaxSpeedY;
 }
 
-/* 800E37C0-800E37D0 0DE100 0010+00 0/0 0/0 1/1 .text            getBombEffScale__9daAlink_cCFv */
 f32 daAlink_c::getBombEffScale() const {
     return daAlinkHIO_bomb_c0::m.mEffScale;
 }
 
-/* 800E37D0-800E37E0 0DE110 0010+00 0/0 0/0 1/1 .text            getBombAtR__9daAlink_cCFv */
 f32 daAlink_c::getBombAtR() const {
     return daAlinkHIO_bomb_c0::m.mAttackRadius;
 }
 
-/* 800E37E0-800E37F0 0DE120 0010+00 0/0 0/0 1/1 .text            getEnemyBombColorR__9daAlink_cCFv */
 s16 daAlink_c::getEnemyBombColorR() const {
     return daAlinkHIO_bomb_c0::m.mEnemyBombColorR;
 }
 
-/* 800E37F0-800E3800 0DE130 0010+00 0/0 0/0 2/2 .text            getBombWaterGravity__9daAlink_cCFv */
 f32 daAlink_c::getBombWaterGravity() const {
     return daAlinkHIO_bomb_c0::m.mWaterGravity;
 }
 
-/* 800E3800-800E3810 0DE140 0010+00 0/0 0/0 2/2 .text            getBombWaterMaxFallSpeed__9daAlink_cCFv */
 f32 daAlink_c::getBombWaterMaxFallSpeed() const {
     return daAlinkHIO_bomb_c0::m.mWaterMaxFallSpeed;
 }
 
-/* 800E3810-800E3820 0DE150 0010+00 0/0 0/0 1/1 .text            getBombExplodeWaterEffectLimit__9daAlink_cCFv */
 f32 daAlink_c::getBombExplodeWaterEffectLimit() const {
     return daAlinkHIO_bomb_c0::m.mExplodeWaterEffectLimit;
 }
 
-/* 800E3820-800E3830 0DE160 0010+00 0/0 0/0 1/1 .text            getBombInsectLimitAngle__9daAlink_cCFv */
 s16 daAlink_c::getBombInsectLimitAngle() const {
     return daAlinkHIO_bomb_c0::m.mBombInsectLimitAngle;
 }
diff --git a/src/d/actor/d_a_alink_boom.inc b/src/d/actor/d_a_alink_boom.inc
index 0395a4e2ed..ec1409db3e 100644
--- a/src/d/actor/d_a_alink_boom.inc
+++ b/src/d/actor/d_a_alink_boom.inc
@@ -6,12 +6,10 @@
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_boomerang.h"
 
-/* 800DFFE0-800E0010 0DA920 0030+00 0/0 0/0 1/1 .text checkBoomerangLockAccept__9daAlink_cFv */
 BOOL daAlink_c::checkBoomerangLockAccept() {
     return mSight.getDrawFlg() && dComIfGp_checkPlayerStatus0(0, 0x80000);
 }
 
-/* 800E0010-800E00B0 0DA950 00A0+00 0/0 0/0 1/1 .text            getBoomSpeed__9daAlink_cFv */
 f32 daAlink_c::getBoomSpeed() {
     f32 speed;
     if (checkBoomerangChargeEndWait()) {
@@ -30,12 +28,10 @@ f32 daAlink_c::getBoomSpeed() {
     return speed;
 }
 
-/* 800E00B0-800E00C0 0DA9F0 0010+00 0/0 0/0 1/1 .text            getBoomCatchSpeed__9daAlink_cCFv */
 f32 daAlink_c::getBoomCatchSpeed() const {
     return daAlinkHIO_boom_c0::m.mCatchSpeed;
 }
 
-/* 800E00C0-800E011C 0DAA00 005C+00 1/1 0/0 1/1 .text            getBoomFlyMax__9daAlink_cCFv */
 f32 daAlink_c::getBoomFlyMax() const {
     if (checkModeFlg(0x400) && !checkCanoeRide()) {
         return daAlinkHIO_boom_c0::m.mHorsebackFlyDistMax;
@@ -44,7 +40,6 @@ f32 daAlink_c::getBoomFlyMax() const {
     }
 }
 
-/* 800E011C-800E0190 0DAA5C 0074+00 1/1 0/0 2/2 .text            getBoomLockMax__9daAlink_cFv */
 f32 daAlink_c::getBoomLockMax() {
     f32 fly_max = getBoomFlyMax();
 
@@ -57,19 +52,14 @@ f32 daAlink_c::getBoomLockMax() {
     }
 }
 
-/* 800E0190-800E01A0 0DAAD0 0010+00 0/0 0/0 1/1 .text            getBoomBgThroughTime__9daAlink_cCFv
- */
 s16 daAlink_c::getBoomBgThroughTime() const {
     return daAlinkHIO_boom_c0::m.mBgThroughTime;
 }
 
-/* 800E01A0-800E01CC 0DAAE0 002C+00 1/1 0/0 0/0 .text            checkBossBabaRoom__9daAlink_cFv */
 bool daAlink_c::checkBossBabaRoom() {
     return checkStageName("D_MN05A");
 }
 
-/* 800E01CC-800E0210 0DAB0C 0044+00 0/0 1/1 0/0 .text
- * cancelBoomerangLock__9daAlink_cFP10fopAc_ac_c                */
 void daAlink_c::cancelBoomerangLock(fopAc_ac_c* i_actor) {
     daBoomerang_c* boomerang = (daBoomerang_c*)getBoomerangActor();
 
@@ -78,7 +68,6 @@ void daAlink_c::cancelBoomerangLock(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 800E0210-800E0244 0DAB50 0034+00 2/2 0/0 0/0 .text            getBoomerangActor__9daAlink_cFv */
 fopAc_ac_c* daAlink_c::getBoomerangActor() {
     if (mThrowBoomerangAcKeep.getID() != 0xFFFFFFFF) {
         return mThrowBoomerangAcKeep.getActor();
@@ -91,7 +80,6 @@ fopAc_ac_c* daAlink_c::getBoomerangActor() {
     return NULL;
 }
 
-/* 800E0244-800E02B8 0DAB84 0074+00 0/0 1/1 0/0 .text checkBoomerangChargeEnd__9daAlink_cFv */
 bool daAlink_c::checkBoomerangChargeEnd() {
     if (checkBoomerangChargeEndWait()) {
         return true;
@@ -105,8 +93,6 @@ bool daAlink_c::checkBoomerangChargeEnd() {
     return false;
 }
 
-/* 800E02B8-800E03D0 0DABF8 0118+00 0/0 1/1 0/0 .text
- * checkBoomerangCarry__9daAlink_cFP10fopAc_ac_c                */
 BOOL daAlink_c::checkBoomerangCarry(fopAc_ac_c* i_grabActor) {
     if (checkNoResetFlg0(FLG0_UNK_20) && !checkEventRun() && !checkWolf() &&
         checkModeFlg(0x10000000) &&
@@ -124,8 +110,6 @@ BOOL daAlink_c::checkBoomerangCarry(fopAc_ac_c* i_grabActor) {
     return 0;
 }
 
-/* 800E03D0-800E0440 0DAD10 0070+00 6/6 0/0 0/0 .text initBoomerangUpperAnimeSpeed__9daAlink_cFi
- */
 void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) {
     if (!checkBoomerangThrowAnime()) {
         if (param_0 != 0) {
@@ -139,19 +123,15 @@ void daAlink_c::initBoomerangUpperAnimeSpeed(int param_0) {
     }
 }
 
-/* 800E0440-800E04AC 0DAD80 006C+00 9/9 0/0 0/0 .text            checkBoomerangAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkBoomerangAnime() const {
     return checkBoomerangReadyAnime() || checkBoomerangThrowAnime();
 }
 
-/* 800E04AC-800E04E8 0DADEC 003C+00 13/13 0/0 0/0 .text checkBoomerangThrowAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkBoomerangThrowAnime() const {
     return (mEquipItem == fpcNm_ITEM_BOOMERANG || checkNoResetFlg1(FLG1_UNK_2) || mEquipItem == 0x102) &&
            checkUpperAnime(0x53);
 }
 
-/* 800E04E8-800E055C 0DAE28 0074+00 1/1 0/0 0/0 .text setBoomerangReadyQuake__9daAlink_cFv */
 void daAlink_c::setBoomerangReadyQuake() {
     f32 tmp_0 = 0.0f;
     dComIfGp_getVibration().StartQuake(1, 1, cXyz(tmp_0, 1.0f, tmp_0));
@@ -160,7 +140,6 @@ void daAlink_c::setBoomerangReadyQuake() {
     mItemVar0.field_0x3018 = daAlinkHIO_boom_c0::m.mChargeTime;
 }
 
-/* 800E055C-800E05E8 0DAE9C 008C+00 2/2 0/0 0/0 .text setBoomerangReadyAnime__9daAlink_cFv */
 void daAlink_c::setBoomerangReadyAnime() {
     f32 var_f31;
     if (checkAttentionLock()) {
@@ -173,13 +152,11 @@ void daAlink_c::setBoomerangReadyAnime() {
     setBoomerangReadyQuake();
 }
 
-/* 800E05E8-800E0630 0DAF28 0048+00 2/2 0/0 0/0 .text setThrowBoomerangAnime__9daAlink_cFv */
 void daAlink_c::setThrowBoomerangAnime() {
     setUpperAnimeParam(0x53, UPPER_2, &daAlinkHIO_boom_c0::m.mThrowAnm);
     cancelItemUseQuake(0);
 }
 
-/* 800E0630-800E06B8 0DAF70 0088+00 2/2 0/0 0/0 .text setBoomerangCatchAnime__9daAlink_cFv */
 void daAlink_c::setBoomerangCatchAnime() {
     setUpperAnimeParam(0x52, UPPER_2, &daAlinkHIO_boom_c0::m.mCatchAnm);
     setFacePriBck(0xE8);
@@ -190,7 +167,6 @@ void daAlink_c::setBoomerangCatchAnime() {
     }
 }
 
-/* 800E06B8-800E08C4 0DAFF8 020C+00 1/1 0/0 0/0 .text            throwBoomerang__9daAlink_cFv */
 void daAlink_c::throwBoomerang() {
     daBoomerang_c* item = (daBoomerang_c*)mItemAcKeep.getActor();
     onNoResetFlg1(FLG1_UNK_2);
@@ -255,7 +231,6 @@ void daAlink_c::throwBoomerang() {
     }
 }
 
-/* 800E08C4-800E0A9C 0DB204 01D8+00 0/0 0/0 1/1 .text            returnBoomerang__9daAlink_cFi */
 int daAlink_c::returnBoomerang(int param_0) {
     dComIfGp_clearPlayerStatus0(0, 0x400000);
 
@@ -281,8 +256,6 @@ int daAlink_c::returnBoomerang(int param_0) {
     return 0;
 }
 
-/* 800E0A9C-800E0B58 0DB3DC 00BC+00 2/2 0/0 0/0 .text checkUpperItemActionBoomerang__9daAlink_cFv
- */
 int daAlink_c::checkUpperItemActionBoomerang() {
     if (mItemVar0.field_0x3018 != 0) {
         mItemVar0.field_0x3018--;
@@ -300,8 +273,6 @@ int daAlink_c::checkUpperItemActionBoomerang() {
     return cancelUpperItemReadyAnime(0);
 }
 
-/* 800E0B58-800E0BE4 0DB498 008C+00 1/1 0/0 0/0 .text
- * checkUpperItemActionBoomerangFly__9daAlink_cFv               */
 void daAlink_c::checkUpperItemActionBoomerangFly() {
     if (checkBoomerangReadyAnime()) {
         checkUpperItemActionBoomerang();
@@ -310,7 +281,6 @@ void daAlink_c::checkUpperItemActionBoomerangFly() {
     }
 }
 
-/* 800E0BE4-800E0D8C 0DB524 01A8+00 4/4 0/0 0/0 .text checkNextActionBoomerang__9daAlink_cFv */
 int daAlink_c::checkNextActionBoomerang() {
     if ((checkBoomerangCatchAnime() &&
          mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) ||
@@ -352,7 +322,6 @@ int daAlink_c::checkNextActionBoomerang() {
     }
 }
 
-/* 800E0D8C-800E0E64 0DB6CC 00D8+00 1/1 0/0 0/0 .text checkBoomerangCatchAction__9daAlink_cFv */
 int daAlink_c::checkBoomerangCatchAction() {
     if (checkNoResetFlg0(FLG0_UNK_20)) {
         if (!checkEventRun() && !checkWolf() && checkModeFlg(0x10000000)) {
@@ -371,7 +340,6 @@ int daAlink_c::checkBoomerangCatchAction() {
     return FALSE;
 }
 
-/* 800E0E64-800E0F10 0DB7A4 00AC+00 3/3 0/0 0/0 .text            setBoomerangSight__9daAlink_cFv */
 void daAlink_c::setBoomerangSight() {
     if (mItemAcKeep.getActor() && !checkBoomerangThrowAnime()) {
         BOOL check_line = checkSightLine(getBoomLockMax(), &mHeldItemRootPos);
@@ -387,7 +355,6 @@ void daAlink_c::setBoomerangSight() {
     }
 }
 
-/* 800E0F10-800E0FA0 0DB850 0090+00 1/1 0/0 0/0 .text procBoomerangSubjectInit__9daAlink_cFv */
 int daAlink_c::procBoomerangSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_BOOMERANG_SUBJECT)) {
         return 0;
@@ -403,8 +370,6 @@ int daAlink_c::procBoomerangSubjectInit() {
     return 1;
 }
 
-/* 800E0FA0-800E1060 0DB8E0 00C0+00 1/0 0/0 0/0 .text            procBoomerangSubject__9daAlink_cFv
- */
 int daAlink_c::procBoomerangSubject() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -427,8 +392,6 @@ int daAlink_c::procBoomerangSubject() {
     return 1;
 }
 
-/* 800E1060-800E10F4 0DB9A0 0094+00 1/1 0/0 0/0 .text            procBoomerangMoveInit__9daAlink_cFv
- */
 int daAlink_c::procBoomerangMoveInit() {
     if (!commonProcInitNotSameProc(PROC_BOOMERANG_MOVE)) {
         return 0;
@@ -445,7 +408,6 @@ int daAlink_c::procBoomerangMoveInit() {
     return 1;
 }
 
-/* 800E10F4-800E11D8 0DBA34 00E4+00 1/0 0/0 0/0 .text            procBoomerangMove__9daAlink_cFv */
 int daAlink_c::procBoomerangMove() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -477,7 +439,6 @@ int daAlink_c::procBoomerangMove() {
     return 1;
 }
 
-/* 800E11D8-800E1248 0DBB18 0070+00 1/1 0/0 0/0 .text procBoomerangCatchInit__9daAlink_cFv */
 int daAlink_c::procBoomerangCatchInit() {
     if (!commonProcInitNotSameProc(PROC_BOOMERANG_CATCH)) {
         return 0;
@@ -490,7 +451,6 @@ int daAlink_c::procBoomerangCatchInit() {
     return 1;
 }
 
-/* 800E1248-800E12E0 0DBB88 0098+00 1/0 0/0 0/0 .text            procBoomerangCatch__9daAlink_cFv */
 int daAlink_c::procBoomerangCatch() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc
index 067f90dc8d..6e3de0e917 100644
--- a/src/d/actor/d_a_alink_bottle.inc
+++ b/src/d/actor/d_a_alink_bottle.inc
@@ -10,8 +10,6 @@
 
 static int daAlink_bottleModelCallBack(J3DJoint* i_joint, int param_1);
 
-/* 8010E48C-8010E52C 108DCC 00A0+00 1/1 0/0 0/0 .text            bottleModelCallBack__9daAlink_cFv
- */
 int daAlink_c::bottleModelCallBack() {
     if (mItemMode != 0) {
         mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c2));
@@ -23,7 +21,6 @@ int daAlink_c::bottleModelCallBack() {
     return 1;
 }
 
-/* 8010E52C-8010E568 108E6C 003C+00 1/1 0/0 0/0 .text daAlink_bottleModelCallBack__FP8J3DJointi */
 static int daAlink_bottleModelCallBack(J3DJoint* i_joint, int param_1) {
     daAlink_c* player_p = (daAlink_c*)j3dSys.getModel()->getUserArea();
 
@@ -34,7 +31,6 @@ static int daAlink_bottleModelCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8010E568-8010E584 108EA8 001C+00 1/0 0/0 0/0 .text getBottleOpenAppearItem__9daAlink_cCFv */
 s32 daAlink_c::getBottleOpenAppearItem() const {
     if (mProcID == PROC_BOTTLE_OPEN) {
         return mEquipItem;
@@ -43,13 +39,11 @@ s32 daAlink_c::getBottleOpenAppearItem() const {
     return -1;
 }
 
-/* 8010E584-8010E5D8 108EC4 0054+00 2/2 0/0 0/0 .text checkOilBottleItemNotGet__9daAlink_cFUs */
 BOOL daAlink_c::checkOilBottleItemNotGet(u16 i_itemNo) {
     return mProcID != PROC_BOTTLE_GET && mProcID != PROC_BOTTLE_SWING &&
            checkOilBottleItem(i_itemNo);
 }
 
-/* 8010E5D8-8010EAC4 108F18 04EC+00 7/7 0/0 0/0 .text            setBottleModel__9daAlink_cFUs */
 void daAlink_c::setBottleModel(u16 i_itemNo) {
     JKRHeap* prev_heap = setItemHeap();
     mHeldItemModel = initModelEnv(loadAramBmd(0x310, 0x5C00), 0x1020200);
@@ -146,7 +140,6 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
 }
 
 
-/* 8010EAC4-8010F45C 109404 0998+00 3/3 0/0 0/0 .text            commonBottleDrink__9daAlink_cFi */
 int daAlink_c::commonBottleDrink(int param_0) {
     simpleAnmPlay(field_0x0718);
     simpleAnmPlay(field_0x071c);
@@ -337,7 +330,6 @@ int daAlink_c::commonBottleDrink(int param_0) {
 }
 
 
-/* 8010F45C-8010F54C 109D9C 00F0+00 2/2 0/0 0/0 .text            makeFairy__9daAlink_cFP4cXyzUl */
 fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) {
     cXyz fairy_pos;
 
@@ -367,8 +359,6 @@ fopAc_ac_c* daAlink_c::makeFairy(cXyz* i_pos, u32 i_params) {
     return field_0x285c.getActor();
 }
 
-/* 8010F54C-8010F698 109E8C 014C+00 2/2 0/0 0/0 .text            procBottleDrinkInit__9daAlink_cFUs
- */
 int daAlink_c::procBottleDrinkInit(u16 i_itemNo) {
     if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_42_e) {
         if (mProcID == PROC_BOTTLE_DRINK) {
@@ -401,7 +391,6 @@ int daAlink_c::procBottleDrinkInit(u16 i_itemNo) {
     return 1;
 }
 
-/* 8010F698-8010F6F4 109FD8 005C+00 1/0 0/0 0/0 .text            procBottleDrink__9daAlink_cFv */
 int daAlink_c::procBottleDrink() {
     if (mProcVar3.field_0x300e != 0) {
         dComIfGp_evmng_cutEnd(mAlinkStaffId);
@@ -412,8 +401,6 @@ int daAlink_c::procBottleDrink() {
     return 1;
 }
 
-/* 8010F6F4-8010F8E4 10A034 01F0+00 1/1 0/0 0/0 .text            procBottleOpenInit__9daAlink_cFUs
- */
 int daAlink_c::procBottleOpenInit(u16 param_0) {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
         return 0;
@@ -463,7 +450,6 @@ int daAlink_c::procBottleOpenInit(u16 param_0) {
 }
 
 
-/* 8010F8E4-8010FC38 10A224 0354+00 1/0 0/0 0/0 .text            procBottleOpen__9daAlink_cFv */
 int daAlink_c::procBottleOpen() {
     static Vec const bottleTop = {0.0f, 25.0f, 0.0f};
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
@@ -549,8 +535,6 @@ int daAlink_c::procBottleOpen() {
 }
 
 
-/* 8010FC38-8010FF58 10A578 0320+00 4/4 0/0 0/0 .text
- * procBottleSwingInit__9daAlink_cFP10fopAc_ac_ci               */
 int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
     fopAc_ac_c* var_r31 = param_0;
     if (var_r31 != NULL && mEquipItem != fpcNm_ITEM_KANTERA) {
@@ -639,7 +623,6 @@ int daAlink_c::procBottleSwingInit(fopAc_ac_c* param_0, int param_1) {
 }
 
 
-/* 8010FF58-801102D0 10A898 0378+00 1/0 0/0 0/0 .text            procBottleSwing__9daAlink_cFv */
 int daAlink_c::procBottleSwing() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -720,7 +703,6 @@ int daAlink_c::procBottleSwing() {
 }
 
 
-/* 801102D0-80110518 10AC10 0248+00 2/2 0/0 0/0 .text            procBottleGetInit__9daAlink_cFi */
 int daAlink_c::procBottleGetInit(int param_0) {
     BOOL proc_pickup = mProcID == PROC_PICK_UP;
     commonProcInit(PROC_BOTTLE_GET);
@@ -783,7 +765,6 @@ int daAlink_c::procBottleGetInit(int param_0) {
     return 1;
 }
 
-/* 80110518-80110648 10AE58 0130+00 1/0 0/0 0/0 .text            procBottleGet__9daAlink_cFv */
 int daAlink_c::procBottleGet() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
diff --git a/src/d/actor/d_a_alink_bow.inc b/src/d/actor/d_a_alink_bow.inc
index 6f292b789b..c4fa78568c 100644
--- a/src/d/actor/d_a_alink_bow.inc
+++ b/src/d/actor/d_a_alink_bow.inc
@@ -8,8 +8,6 @@
 #include "d/actor/d_a_arrow.h"
 #include "d/actor/d_a_horse.h"
 
-/* 800DE64C-800DE740 0D8F8C 00F4+00 1/1 0/0 2/2 .text            getArrowFlyData__9daAlink_cCFPfPfi
- */
 void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge) const {
     if (mEquipItem == fpcNm_ITEM_PACHINKO) {
         *o_distance = daAlinkHIO_bow_c0::m.mSlingshotDistance;
@@ -34,32 +32,26 @@ void daAlink_c::getArrowFlyData(f32* o_distance, f32* o_speed, int i_forceCharge
     }
 }
 
-/* 800DE740-800DE750 0D9080 0010+00 0/0 0/0 1/1 .text            getArrowIncAtR__9daAlink_cCFv */
 f32 daAlink_c::getArrowIncAtR() const {
     return daAlinkHIO_bow_c0::m.mArrowAttackRadius;
 }
 
-/* 800DE750-800DE760 0D9090 0010+00 0/0 0/0 1/1 .text getBombArrowFlyExplodeTime__9daAlink_cCFv */
 s16 daAlink_c::getBombArrowFlyExplodeTime() const {
     return daAlinkHIO_bow_c0::m.mBombArrowFlyExplodeTime;
 }
 
-/* 800DE760-800DE770 0D90A0 0010+00 0/0 0/0 1/1 .text getArrowIncAtMaxStart__9daAlink_cCFv */
 f32 daAlink_c::getArrowIncAtMaxStart() const {
     return daAlinkHIO_bow_c0::m.mArrowIncAttackMaxStart;
 }
 
-/* 800DE770-800DE780 0D90B0 0010+00 0/0 0/0 1/1 .text            getArrowIncAtMax__9daAlink_cCFv */
 f32 daAlink_c::getArrowIncAtMax() const {
     return daAlinkHIO_bow_c0::m.mArrowIncAttackMax;
 }
 
-/* 800DE780-800DE7D4 0D90C0 0054+00 10/10 0/0 0/0 .text checkBowAndSlingItem__9daAlink_cFi */
 BOOL daAlink_c::checkBowAndSlingItem(int i_itemNo) {
     return checkBowItem(i_itemNo) || i_itemNo == fpcNm_ITEM_PACHINKO;
 }
 
-/* 800DE7D4-800DE884 0D9114 00B0+00 1/1 0/0 0/0 .text            setSlingModel__9daAlink_cFv */
 void daAlink_c::setSlingModel() {
     J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x1F9);
     JKRHeap* prev_heap = setItemHeap();
@@ -73,7 +65,6 @@ void daAlink_c::setSlingModel() {
     field_0x2f94 = 103;
 }
 
-/* 800DE884-800DE990 0D91C4 010C+00 0/0 1/1 1/1 .text checkBowCameraArrowPosP__9daAlink_cFPsPs */
 cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) {
     if (!checkBowAnime() || mEquipItem == fpcNm_ITEM_PACHINKO) {
         return NULL;
@@ -102,24 +93,18 @@ cXyz* daAlink_c::checkBowCameraArrowPosP(s16* param_0, s16* param_1) {
     return &mHeldItemRootPos;
 }
 
-/* 800DE990-800DE9B8 0D92D0 0028+00 1/0 0/0 0/0 .text            checkArrowChargeEnd__9daAlink_cCFv
- */
 bool daAlink_c::checkArrowChargeEnd() const {
     return checkBowChargeWaitAnime() && field_0x301c == 0;
 }
 
-/* 800DE9B8-800DE9E8 0D92F8 0030+00 3/3 0/0 0/0 .text            checkBowReadyAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkBowReadyAnime() const {
     return checkBowReloadAnime() || checkBowChargeWaitAnime() || checkBowWaitAnime();
 }
 
-/* 800DE9E8-800DEA3C 0D9328 0054+00 16/16 0/0 0/0 .text            checkBowAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkBowAnime() const {
     return checkBowReadyAnime() || checkBowShootAnime();
 }
 
-/* 800DEA3C-800DEAE4 0D937C 00A8+00 2/2 0/0 0/0 .text            makeArrow__9daAlink_cFv */
 void daAlink_c::makeArrow() {
     if (dComIfGs_getArrowNum() != 0) {
         if (field_0x301e == 1 && dComIfGp_getSelectItemNum(mSelectItemId) == 0) {
@@ -133,7 +118,6 @@ void daAlink_c::makeArrow() {
     mItemVar0.field_0x3018 = 0;
 }
 
-/* 800DEAE4-800DEB8C 0D9424 00A8+00 3/3 0/0 0/0 .text            deleteArrow__9daAlink_cFv */
 void daAlink_c::deleteArrow() {
     daArrow_c* arrow_p = (daArrow_c*)mItemAcKeep.getActor();
 
@@ -151,8 +135,6 @@ void daAlink_c::deleteArrow() {
     }
 }
 
-/* 800DEB8C-800DEBC8 0D94CC 003C+00 6/6 0/0 0/0 .text            setBowOrSlingStatus__9daAlink_cFv
- */
 void daAlink_c::setBowOrSlingStatus() {
     if (mEquipItem == fpcNm_ITEM_PACHINKO) {
         dComIfGp_setPlayerStatus0(0, 0x40);
@@ -161,7 +143,6 @@ void daAlink_c::setBowOrSlingStatus() {
     }
 }
 
-/* 800DEBC8-800DED88 0D9508 01C0+00 1/1 0/0 0/0 .text            changeArrowType__9daAlink_cFv */
 void daAlink_c::changeArrowType() {
     if (checkCanoeSlider() || (mEquipItem == fpcNm_ITEM_BOW && field_0x301e == 0) ||
         (mEquipItem == fpcNm_ITEM_BOMB_ARROW && field_0x301e == 0 &&
@@ -199,12 +180,10 @@ void daAlink_c::changeArrowType() {
 }
 
 
-/* 800DED88-800DEE1C 0D96C8 0094+00 1/1 0/0 0/0 .text cancelBowMoveRideNotAtn__9daAlink_cFv */
 BOOL daAlink_c::cancelBowMoveRideNotAtn() {
     return checkModeFlg(0x400) && checkAttentionLock() && mTargetedActor == NULL;
 }
 
-/* 800DEE1C-800DEEDC 0D975C 00C0+00 3/3 0/0 0/0 .text            cancelBowMove__9daAlink_cFv */
 BOOL daAlink_c::cancelBowMove() {
     if (mTargetedActor == NULL && !checkAttentionLock() && mFastShotTime == 0 &&
         !checkBowReadyAnime() && (!checkBowShootAnime() || mUpperFrameCtrl[2].checkAnmEnd()))
@@ -216,7 +195,6 @@ BOOL daAlink_c::cancelBowMove() {
     return false;
 }
 
-/* 800DEEDC-800DEFB8 0D981C 00DC+00 3/3 0/0 0/0 .text            setBowReadyAnime__9daAlink_cFv */
 void daAlink_c::setBowReadyAnime() {
     if (!checkBowAnime()) {
         if (mEquipItem == fpcNm_ITEM_BOMB_ARROW) {
@@ -248,7 +226,6 @@ void daAlink_c::setBowReadyAnime() {
     }
 }
 
-/* 800DEFB8-800DF0BC 0D98F8 0104+00 2/2 0/0 0/0 .text            setBowReloadAnime__9daAlink_cFv */
 void daAlink_c::setBowReloadAnime() {
     setUpperAnimeParam(9, UPPER_2, &daAlinkHIO_bow_c0::m.mLoadAnm);
     setFacePriTexture(FTANM_UNK_8);
@@ -268,7 +245,6 @@ void daAlink_c::setBowReloadAnime() {
     field_0x301c = daAlinkHIO_bow_c0::m.mChargeArrowTime;
 }
 
-/* 800DF0BC-800DF798 0D99FC 06DC+00 2/2 0/0 0/0 .text checkUpperItemActionBow__9daAlink_cFv */
 BOOL daAlink_c::checkUpperItemActionBow() {
     daPy_frameCtrl_c* frameCtrl_p = &mUpperFrameCtrl[2];
 
@@ -448,7 +424,6 @@ BOOL daAlink_c::checkUpperItemActionBow() {
 }
 
 
-/* 800DF798-800DF814 0DA0D8 007C+00 1/1 0/0 0/0 .text checkUpperItemActionBowFly__9daAlink_cFv */
 void daAlink_c::checkUpperItemActionBowFly() {
     if (checkBowAnime()) {
         checkUpperItemActionBow();
@@ -459,7 +434,6 @@ void daAlink_c::checkUpperItemActionBowFly() {
     }
 }
 
-/* 800DF814-800DFAE8 0DA154 02D4+00 4/4 0/0 0/0 .text            checkNextActionBow__9daAlink_cFv */
 int daAlink_c::checkNextActionBow() {
     if (mFastShotTime != 0 && checkBowReadyAnime()) {
         mFastShotTime--;
@@ -529,7 +503,6 @@ int daAlink_c::checkNextActionBow() {
 }
 
 
-/* 800DFAE8-800DFBC8 0DA428 00E0+00 1/1 0/0 0/0 .text            setBowModel__9daAlink_cFv */
 void daAlink_c::setBowModel() {
     J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x59);
     JKRHeap* old_heap = setItemHeap();
@@ -544,20 +517,16 @@ void daAlink_c::setBowModel() {
 }
 
 
-/* 800DFBC8-800DFC28 0DA508 0060+00 4/4 0/0 0/0 .text            checkBowGrabLeftHand__9daAlink_cCFv
- */
 bool daAlink_c::checkBowGrabLeftHand() const {
     return checkReinRide() && !checkBowAnime();
 }
 
-/* 800DFC28-800DFC70 0DA568 0048+00 6/6 0/0 0/0 .text            setBowHangAnime__9daAlink_cFv */
 void daAlink_c::setBowHangAnime() {
     if (checkBowItem(mEquipItem)) {
         changeItemBck(0x58, 0.0f);
     }
 }
 
-/* 800DFC70-800DFCD8 0DA5B0 0068+00 3/3 0/0 0/0 .text            setBowNormalAnime__9daAlink_cFv */
 void daAlink_c::setBowNormalAnime() {
     if (checkBowItem(mEquipItem)) {
         changeItemBck(0x59, -1.0f);
@@ -566,7 +535,6 @@ void daAlink_c::setBowNormalAnime() {
     }
 }
 
-/* 800DFCD8-800DFD6C 0DA618 0094+00 3/3 0/0 0/0 .text            setBowSight__9daAlink_cFv */
 void daAlink_c::setBowSight() {
     if (checkBowChargeWaitAnime() && !dComIfGp_checkPlayerStatus0(0, 0x200000)) {
         cXyz sight_pos;
@@ -582,7 +550,6 @@ void daAlink_c::setBowSight() {
     }
 }
 
-/* 800DFD6C-800DFDDC 0DA6AC 0070+00 1/1 0/0 0/0 .text            procBowSubjectInit__9daAlink_cFv */
 int daAlink_c::procBowSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_BOW_SUBJECT)) {
         return 0;
@@ -595,7 +562,6 @@ int daAlink_c::procBowSubjectInit() {
     return 1;
 }
 
-/* 800DFDDC-800DFE3C 0DA71C 0060+00 1/0 0/0 0/0 .text            procBowSubject__9daAlink_cFv */
 int daAlink_c::procBowSubject() {
     setDoStatus(0x12);
     if (!checkNextAction(0) && setBodyAngleToCamera()) {
@@ -605,7 +571,6 @@ int daAlink_c::procBowSubject() {
     return 1;
 }
 
-/* 800DFE3C-800DFEC0 0DA77C 0084+00 1/1 0/0 0/0 .text            procBowMoveInit__9daAlink_cFv */
 int daAlink_c::procBowMoveInit() {
     if (!commonProcInitNotSameProc(PROC_BOW_MOVE)) {
         return 0;
@@ -621,7 +586,6 @@ int daAlink_c::procBowMoveInit() {
     return 1;
 }
 
-/* 800DFEC0-800DFFE0 0DA800 0120+00 1/0 0/0 0/0 .text            procBowMove__9daAlink_cFv */
 int daAlink_c::procBowMove() {
     cancelBowMove();
 
diff --git a/src/d/actor/d_a_alink_canoe.inc b/src/d/actor/d_a_alink_canoe.inc
index 5e2c15aae3..38472f1b46 100644
--- a/src/d/actor/d_a_alink_canoe.inc
+++ b/src/d/actor/d_a_alink_canoe.inc
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_mg_rod.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 800F3BB0-800F3BDC 0EE4F0 002C+00 1/1 0/0 2/2 .text            getCanoeMaxSpeed__9daAlink_cCFv */
 f32 daAlink_c::getCanoeMaxSpeed() const {
     if (checkCanoeSlider()) {
         return daAlinkHIO_canoe_c0::m.mMaxSpeed_RiverRide;
@@ -17,13 +16,10 @@ f32 daAlink_c::getCanoeMaxSpeed() const {
     }
 }
 
-/* 800F3BDC-800F3BEC 0EE51C 0010+00 0/0 0/0 1/1 .text            getCanoeBackMaxSpeed__9daAlink_cCFv
- */
 f32 daAlink_c::getCanoeBackMaxSpeed() const {
     return daAlinkHIO_canoe_c0::m.mBackMaxSpeed;
 }
 
-/* 800F3BEC-800F3C18 0EE52C 002C+00 0/0 0/0 1/1 .text            getCanoeCres__9daAlink_cCFv */
 f32 daAlink_c::getCanoeCres() const {
     if (checkCanoeSlider()) {
         return daAlinkHIO_canoe_c0::m.mDeceleration_RiverRide;
@@ -32,7 +28,6 @@ f32 daAlink_c::getCanoeCres() const {
     }
 }
 
-/* 800F3C18-800F3C44 0EE558 002C+00 2/2 0/0 0/0 .text            getCanoeSpeedRate__9daAlink_cCFv */
 f32 daAlink_c::getCanoeSpeedRate() const {
     if (checkCanoeSlider()) {
         return daAlinkHIO_canoe_c0::m.mSpeedRate_RiverRide;
@@ -41,8 +36,6 @@ f32 daAlink_c::getCanoeSpeedRate() const {
     }
 }
 
-/* 800F3C44-800F3CCC 0EE584 0088+00 0/0 0/0 1/1 .text            getCanoeMaxRotSpeed__9daAlink_cCFv
- */
 s16 daAlink_c::getCanoeMaxRotSpeed() const {
     s16 var_r30;
     if (checkCanoeSlider()) {
@@ -54,13 +47,11 @@ s16 daAlink_c::getCanoeMaxRotSpeed() const {
     return var_r30 * (((mUnderFrameCtrl[0].getRate() - daAlinkHIO_canoe_c0::m.mStickRowAnmSpeed) * 0.5f) + 1.0f);
 }
 
-/* 800F3CCC-800F3CD8 0EE60C 000C+00 1/1 0/0 1/1 .text getCanoeLocalPaddleTop__9daAlink_cFv */
 cXyz* daAlink_c::getCanoeLocalPaddleTop() {
     static Vec const localPaddleTop = {0.0f, 0.0f, -158.0f};
     return (cXyz*)&localPaddleTop;
 }
 
-/* 800F3CD8-800F3CF8 0EE618 0020+00 3/3 0/0 0/0 .text daAlink_searchCanoe__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_CANOE && ((daCanoe_c*)i_actor)->getModel() != NULL) {
         return i_actor;
@@ -69,8 +60,6 @@ static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 800F3CF8-800F3D58 0EE638 0060+00 0/0 2/2 0/0 .text            checkCanoeRideTandem__9daAlink_cFv
- */
 BOOL daAlink_c::checkCanoeRideTandem() {
     daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
 
@@ -81,12 +70,10 @@ BOOL daAlink_c::checkCanoeRideTandem() {
     return false;
 }
 
-/* 800F3D58-800F3DA0 0EE698 0048+00 7/7 0/0 0/0 .text checkFishingRodAndLureItem__9daAlink_cCFv */
 BOOL daAlink_c::checkFishingRodAndLureItem() const {
     return checkFisingRodLure() || checkFishingRodItem(mEquipItem);
 }
 
-/* 800F3DA0-800F3DFC 0EE6E0 005C+00 4/4 0/0 0/0 .text            initFishingRodHand__9daAlink_cFv */
 void daAlink_c::initFishingRodHand() {
     field_0x2f94 = 0x65;
     field_0x2f95 = 0x65;
@@ -101,35 +88,26 @@ void daAlink_c::initFishingRodHand() {
     }
 }
 
-/* 800F3DFC-800F3E4C 0EE73C 0050+00 1/1 0/0 1/1 .text            getCanoePaddleMatrix__9daAlink_cFv
- */
 MtxP daAlink_c::getCanoePaddleMatrix() {
     mDoMtx_stack_c::copy(getRightItemMatrix());
     mDoMtx_stack_c::transM(0.0f, 0.0f, 25.0f);
     return mDoMtx_stack_c::get();
 }
 
-/* 800F3E4C-800F3EB8 0EE78C 006C+00 0/0 0/0 4/4 .text
- * checkFishingRodGrab__9daAlink_cCFP10fopAc_ac_c               */
 BOOL daAlink_c::checkFishingRodGrab(fopAc_ac_c* i_actor) const {
     return checkFishingRodAndLureItem() && mItemAcKeep.getID() == fopAcM_GetID(i_actor);
 }
 
-/* 800F3EB8-800F3F38 0EE7F8 0080+00 0/0 0/0 2/2 .text
- * checkCanoePaddleGrab__9daAlink_cCFP10fopAc_ac_c              */
 BOOL daAlink_c::checkCanoePaddleGrab(fopAc_ac_c* i_actor) const {
     return mEquipItem == 0x10B && checkCanoeRideOwn(i_actor);
 }
 
-/* 800F3F38-800F3FC4 0EE878 008C+00 0/0 0/0 1/1 .text checkCanoeFishingRodGrabOrPut__9daAlink_cCFv
- */
 BOOL daAlink_c::checkCanoeFishingRodGrabOrPut() const {
     return checkFisingRodLure() && checkCanoeRide() &&
            (checkEquipAnime() || mProcID == PROC_CANOE_PADDLE_PUT ||
             mProcID == PROC_CANOE_PADDLE_GRAB || mProcID == PROC_CANOE_ROD_GRAB);
 }
 
-/* 800F3FC4-800F4008 0EE904 0044+00 2/2 0/0 0/0 .text            initCanoeRide__9daAlink_cFv */
 void daAlink_c::initCanoeRide() {
     mProcVar5.field_0x3012 = 1;
     field_0x3588 = l_waitBaseAnime;
@@ -138,7 +116,6 @@ void daAlink_c::initCanoeRide() {
     mProcVar4.field_0x3010 = 0;
 }
 
-/* 800F4008-800F40E4 0EE948 00DC+00 2/2 0/0 0/0 .text            checkCanoeJumpRide__9daAlink_cFv */
 BOOL daAlink_c::checkCanoeJumpRide() {
     daCanoe_c* canoe = NULL;
 
@@ -157,7 +134,6 @@ BOOL daAlink_c::checkCanoeJumpRide() {
     return 0;
 }
 
-/* 800F40E4-800F4140 0EEA24 005C+00 2/2 0/0 0/0 .text            setArmReelAnime__9daAlink_cFv */
 void daAlink_c::setArmReelAnime() {
     setUpperAnimeBaseSpeed(0x1FB, 1.0f, -1.0f);
     mUpperFrameCtrl[2].setRate(0.0f);
@@ -166,8 +142,6 @@ void daAlink_c::setArmReelAnime() {
     offNoResetFlg1(FLG1_UNK_8000);
 }
 
-/* 800F4140-800F4490 0EEA80 0350+00 1/1 0/0 0/0 .text            setFishingWaitAction__9daAlink_cFv
- */
 void daAlink_c::setFishingWaitAction() {
     daPy_frameCtrl_c* frame_ctrl0 = &mUnderFrameCtrl[0];
     daPy_frameCtrl_c* frame_ctrl1 = &mUnderFrameCtrl[1];
@@ -224,7 +198,6 @@ void daAlink_c::setFishingWaitAction() {
     setDoubleAnimeBlendRatio(1.0f - sp8);
 }
 
-/* 800F4490-800F4564 0EEDD0 00D4+00 3/3 0/0 0/0 .text            setFishGetFace__9daAlink_cFv */
 void daAlink_c::setFishGetFace() {
     if (field_0x2fc8 == 1) {
         setFacePriBck(0x140);
@@ -242,8 +215,6 @@ void daAlink_c::setFishGetFace() {
     }
 }
 
-/* 800F4564-800F459C 0EEEA4 0038+00 3/3 0/0 0/0 .text
- * setRideCanoeBasePos__9daAlink_cFP10fopAc_ac_c                */
 void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) {
     field_0x37c8.x = 0.0f;
     field_0x37c8.y = 25.0f;
@@ -254,7 +225,6 @@ void daAlink_c::setRideCanoeBasePos(fopAc_ac_c* param_0) {
     }
 }
 
-/* 800F459C-800F47D8 0EEEDC 023C+00 20/20 0/0 0/0 .text            setSyncCanoePos__9daAlink_cFv */
 void daAlink_c::setSyncCanoePos() {
     daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
     if (canoe->checkTandem()) {
@@ -307,7 +277,6 @@ void daAlink_c::setSyncCanoePos() {
     cLib_chaseF(&field_0x33f0, var_f31, 0.2f);
 }
 
-/* 800F47D8-800F4924 0EF118 014C+00 19/19 0/0 0/0 .text            canoeCommon__9daAlink_cFv */
 int daAlink_c::canoeCommon() {
     if (mRideAcKeep.getActor() == NULL) {
         return checkNextAction(0);
@@ -337,7 +306,6 @@ int daAlink_c::canoeCommon() {
     return 0;
 }
 
-/* 800F4924-800F4A50 0EF264 012C+00 10/10 0/0 0/0 .text checkNextActionCanoe__9daAlink_cFv */
 int daAlink_c::checkNextActionCanoe() {
     if ((!checkFishingRodAndLureItem() || mItemAcKeep.getActor() == NULL ||
         ((dmg_rod_class*)mItemAcKeep.getActor())->checkRodEquipPermission()) &&
@@ -360,7 +328,6 @@ int daAlink_c::checkNextActionCanoe() {
     }
 }
 
-/* 800F4A50-800F4B90 0EF390 0140+00 2/2 0/0 0/0 .text            procCanoeRideInit__9daAlink_cFv */
 int daAlink_c::procCanoeRideInit() {
     commonProcInit(PROC_CANOE_RIDE);
     setHeavyBoots(0);
@@ -397,7 +364,6 @@ int daAlink_c::procCanoeRideInit() {
     return 1;
 }
 
-/* 800F4B90-800F4C78 0EF4D0 00E8+00 1/0 0/0 0/0 .text            procCanoeRide__9daAlink_cFv */
 int daAlink_c::procCanoeRide() {
     daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
     if (canoe == NULL) {
@@ -423,8 +389,6 @@ int daAlink_c::procCanoeRide() {
     return 1;
 }
 
-/* 800F4C78-800F4D84 0EF5B8 010C+00 4/4 0/0 0/0 .text
- * procCanoeJumpRideInit__9daAlink_cFP10fopAc_ac_c              */
 int daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) {
     BOOL var_r31;
     daCanoe_c* canoe = (daCanoe_c*)param_0;
@@ -459,7 +423,6 @@ int daAlink_c::procCanoeJumpRideInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 800F4D84-800F4DF8 0EF6C4 0074+00 1/0 0/0 0/0 .text            procCanoeJumpRide__9daAlink_cFv */
 int daAlink_c::procCanoeJumpRide() {
     daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
     if (canoe == NULL) {
@@ -475,8 +438,6 @@ int daAlink_c::procCanoeJumpRide() {
     return 1;
 }
 
-/* 800F4DF8-800F5048 0EF738 0250+00 2/2 0/0 0/0 .text            procCanoeGetOffInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeGetOffInit() {
     commonProcInit(PROC_CANOE_GETOFF);
     daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
@@ -534,7 +495,6 @@ int daAlink_c::procCanoeGetOffInit() {
     return 1;
 }
 
-/* 800F5048-800F51E4 0EF988 019C+00 1/1 0/0 0/0 .text            procCanoeGetOff__9daAlink_cFv */
 int daAlink_c::procCanoeGetOff() {
     if (checkCanoeRide()) {
         daCanoe_c* canoe = (daCanoe_c*)mRideAcKeep.getActor();
@@ -574,8 +534,6 @@ int daAlink_c::procCanoeGetOff() {
     return 1;
 }
 
-/* 800F51E4-800F542C 0EFB24 0248+00 15/15 0/0 0/0 .text            procCanoeWaitInit__9daAlink_cFi
- */
 int daAlink_c::procCanoeWaitInit(int param_0) {
     if (mProcID == PROC_CANOE_FISHING_WAIT) {
         mProcVar5.field_0x3012 = 1;
@@ -648,7 +606,6 @@ int daAlink_c::procCanoeWaitInit(int param_0) {
     return 1;
 }
 
-/* 800F542C-800F571C 0EFD6C 02F0+00 1/0 0/0 0/0 .text            procCanoeWait__9daAlink_cFv */
 int daAlink_c::procCanoeWait() {
     if (canoeCommon() != 0) {
         return 1;
@@ -721,7 +678,6 @@ int daAlink_c::procCanoeWait() {
     return 1;
 }
 
-/* 800F571C-800F5A1C 0F005C 0300+00 3/3 0/0 0/0 .text            procCanoeRowInit__9daAlink_cFi */
 // NONMATCHING - incorrect code gen related to daAlink_ANM
 int daAlink_c::procCanoeRowInit(int param_0) {
     fopAc_ac_c* temp_r26 = mRideAcKeep.getActor();
@@ -835,7 +791,6 @@ int daAlink_c::procCanoeRowInit(int param_0) {
     return 1;
 }
 
-/* 800F5A1C-800F5D04 0F035C 02E8+00 1/0 0/0 0/0 .text            procCanoeRow__9daAlink_cFv */
 int daAlink_c::procCanoeRow() {
     daCanoe_c* temp_r29 = (daCanoe_c*)mRideAcKeep.getActor();
     if (canoeCommon()) {
@@ -913,7 +868,6 @@ int daAlink_c::procCanoeRow() {
     return 1;
 }
 
-/* 800F5D04-800F5DB8 0F0644 00B4+00 1/1 0/0 0/0 .text procCanoePaddleShiftInit__9daAlink_cFi */
 int daAlink_c::procCanoePaddleShiftInit(int param_0) {
     commonProcInit(PROC_CANOE_PADDLE_SHIFT);
 
@@ -936,8 +890,6 @@ int daAlink_c::procCanoePaddleShiftInit(int param_0) {
     return 1;
 }
 
-/* 800F5DB8-800F5EA8 0F06F8 00F0+00 1/0 0/0 0/0 .text            procCanoePaddleShift__9daAlink_cFv
- */
 int daAlink_c::procCanoePaddleShift() {
     if (canoeCommon()) {
         return 1;
@@ -966,7 +918,6 @@ int daAlink_c::procCanoePaddleShift() {
     return 1;
 }
 
-/* 800F5EA8-800F5FEC 0F07E8 0144+00 3/3 0/0 0/0 .text procCanoePaddlePutInit__9daAlink_cFi */
 int daAlink_c::procCanoePaddlePutInit(int param_0) {
     if (checkCanoeSlider() && mEquipItem == 0x10B) {
         if (checkEquipAnime() && checkBowItem(field_0x2fde)) {
@@ -1006,7 +957,6 @@ int daAlink_c::procCanoePaddlePutInit(int param_0) {
     return 1;
 }
 
-/* 800F5FEC-800F6140 0F092C 0154+00 1/0 0/0 0/0 .text            procCanoePaddlePut__9daAlink_cFv */
 int daAlink_c::procCanoePaddlePut() {
     if (canoeCommon()) {
         return 1;
@@ -1049,7 +999,6 @@ int daAlink_c::procCanoePaddlePut() {
     return 1;
 }
 
-/* 800F6140-800F6188 0F0A80 0048+00 2/2 0/0 0/0 .text procCanoePaddleGrabInit__9daAlink_cFv */
 int daAlink_c::procCanoePaddleGrabInit() {
     commonProcInit(PROC_CANOE_PADDLE_GRAB);
     setSingleAnimeBase(ANM_CANOE_PADDLE_TO_ROD);
@@ -1057,8 +1006,6 @@ int daAlink_c::procCanoePaddleGrabInit() {
     return 1;
 }
 
-/* 800F6188-800F6320 0F0AC8 0198+00 1/0 0/0 0/0 .text            procCanoePaddleGrab__9daAlink_cFv
- */
 int daAlink_c::procCanoePaddleGrab() {
     if (canoeCommon()) {
         return 1;
@@ -1109,8 +1056,6 @@ int daAlink_c::procCanoePaddleGrab() {
     return 1;
 }
 
-/* 800F6320-800F6394 0F0C60 0074+00 1/1 0/0 0/0 .text            procCanoeRodGrabInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeRodGrabInit() {
     commonProcInit(PROC_CANOE_ROD_GRAB);
 
@@ -1126,7 +1071,6 @@ int daAlink_c::procCanoeRodGrabInit() {
     return 1;
 }
 
-/* 800F6394-800F6464 0F0CD4 00D0+00 1/0 0/0 0/0 .text            procCanoeRodGrab__9daAlink_cFv */
 int daAlink_c::procCanoeRodGrab() {
     if (canoeCommon()) {
         return 1;
@@ -1153,7 +1097,6 @@ int daAlink_c::procCanoeRodGrab() {
     return 1;
 }
 
-/* 800F6464-800F659C 0F0DA4 0138+00 6/6 0/0 0/0 .text procCanoeFishingWaitInit__9daAlink_cFv */
 int daAlink_c::procCanoeFishingWaitInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_FISHING_WAIT)) {
         field_0x311a = 0;
@@ -1180,8 +1123,6 @@ int daAlink_c::procCanoeFishingWaitInit() {
     return 1;
 }
 
-/* 800F659C-800F67C0 0F0EDC 0224+00 1/0 0/0 0/0 .text            procCanoeFishingWait__9daAlink_cFv
- */
 int daAlink_c::procCanoeFishingWait() {
     if (canoeCommon()) {
         return 1;
@@ -1228,7 +1169,6 @@ int daAlink_c::procCanoeFishingWait() {
     return 1;
 }
 
-/* 800F67C0-800F6874 0F1100 00B4+00 1/1 0/0 0/0 .text procCanoeFishingReelInit__9daAlink_cFv */
 int daAlink_c::procCanoeFishingReelInit() {
     commonProcInit(PROC_CANOE_FISHING_REEL);
     setDoubleAnime(0.0f, 0.0f, 0.0f, ANM_REEL, ANM_REEL_LEFT_RIGHT, 2, 5.0f);
@@ -1239,8 +1179,6 @@ int daAlink_c::procCanoeFishingReelInit() {
     return 1;
 }
 
-/* 800F6874-800F69D4 0F11B4 0160+00 1/0 0/0 0/0 .text            procCanoeFishingReel__9daAlink_cFv
- */
 int daAlink_c::procCanoeFishingReel() {
     if (canoeCommon()) {
         mItemVar0.field_0x3018 = 1;
@@ -1277,7 +1215,6 @@ int daAlink_c::procCanoeFishingReel() {
     return 1;
 }
 
-/* 800F69D4-800F6A70 0F1314 009C+00 1/1 0/0 0/0 .text procCanoeFishingGetInit__9daAlink_cFv */
 int daAlink_c::procCanoeFishingGetInit() {
     commonProcInit(PROC_CANOE_FISHING_GET);
 
@@ -1299,8 +1236,6 @@ int daAlink_c::procCanoeFishingGetInit() {
     return 1;
 }
 
-/* 800F6A70-800F6BEC 0F13B0 017C+00 1/0 0/0 0/0 .text            procCanoeFishingGet__9daAlink_cFv
- */
 int daAlink_c::procCanoeFishingGet() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -1339,7 +1274,6 @@ int daAlink_c::procCanoeFishingGet() {
     return 1;
 }
 
-/* 800F6BEC-800F6C30 0F152C 0044+00 1/1 0/0 0/0 .text procCanoeSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procCanoeSubjectivityInit() {
     commonProcInit(PROC_CANOE_SUBJECTIVITY);
     setSyncCanoePos();
@@ -1347,8 +1281,6 @@ int daAlink_c::procCanoeSubjectivityInit() {
     return 1;
 }
 
-/* 800F6C30-800F6D10 0F1570 00E0+00 1/0 0/0 0/0 .text            procCanoeSubjectivity__9daAlink_cFv
- */
 int daAlink_c::procCanoeSubjectivity() {
     onResetFlg0(RFLG0_UNK_4000000);
 
@@ -1379,7 +1311,6 @@ int daAlink_c::procCanoeSubjectivity() {
     return 1;
 }
 
-/* 800F6D10-800F6D64 0F1650 0054+00 1/1 0/0 0/0 .text procCanoeBowSubjectInit__9daAlink_cFv */
 int daAlink_c::procCanoeBowSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_BOW_SUBJECT)) {
         return 0;
@@ -1390,8 +1321,6 @@ int daAlink_c::procCanoeBowSubjectInit() {
     return 1;
 }
 
-/* 800F6D64-800F6DF0 0F16A4 008C+00 1/0 0/0 0/0 .text            procCanoeBowSubject__9daAlink_cFv
- */
 int daAlink_c::procCanoeBowSubject() {
     setDoStatus(0x12);
 
@@ -1411,8 +1340,6 @@ int daAlink_c::procCanoeBowSubject() {
     return 1;
 }
 
-/* 800F6DF0-800F6E44 0F1730 0054+00 1/1 0/0 0/0 .text            procCanoeBowMoveInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeBowMoveInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_BOW_MOVE)) {
         return 0;
@@ -1423,7 +1350,6 @@ int daAlink_c::procCanoeBowMoveInit() {
     return 1;
 }
 
-/* 800F6E44-800F6EB0 0F1784 006C+00 1/0 0/0 0/0 .text            procCanoeBowMove__9daAlink_cFv */
 int daAlink_c::procCanoeBowMove() {
     setDoStatus(0x12);
 
@@ -1440,8 +1366,6 @@ int daAlink_c::procCanoeBowMove() {
     return 1;
 }
 
-/* 800F6EB0-800F6EFC 0F17F0 004C+00 2/2 0/0 0/0 .text            procCanoeGrabMoveInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeGrabMoveInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_GRAB_MOVE)) {
         return 0;
@@ -1451,7 +1375,6 @@ int daAlink_c::procCanoeGrabMoveInit() {
     return 1;
 }
 
-/* 800F6EFC-800F6FA4 0F183C 00A8+00 1/0 0/0 0/0 .text            procCanoeGrabMove__9daAlink_cFv */
 int daAlink_c::procCanoeGrabMove() {
     if (canoeCommon()) {
         return 1;
@@ -1472,8 +1395,6 @@ int daAlink_c::procCanoeGrabMove() {
     return 1;
 }
 
-/* 800F6FA4-800F7010 0F18E4 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangSubjectInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeBoomerangSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_BOOMERANG_SUBJECT)) {
         return 0;
@@ -1485,7 +1406,6 @@ int daAlink_c::procCanoeBoomerangSubjectInit() {
     return 1;
 }
 
-/* 800F7010-800F70F0 0F1950 00E0+00 1/0 0/0 0/0 .text procCanoeBoomerangSubject__9daAlink_cFv */
 int daAlink_c::procCanoeBoomerangSubject() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -1515,7 +1435,6 @@ int daAlink_c::procCanoeBoomerangSubject() {
     return 1;
 }
 
-/* 800F70F0-800F715C 0F1A30 006C+00 1/1 0/0 0/0 .text procCanoeBoomerangMoveInit__9daAlink_cFv */
 int daAlink_c::procCanoeBoomerangMoveInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_BOOMERANG_MOVE)) {
         return 0;
@@ -1527,7 +1446,6 @@ int daAlink_c::procCanoeBoomerangMoveInit() {
     return 1;
 }
 
-/* 800F715C-800F7208 0F1A9C 00AC+00 1/0 0/0 0/0 .text procCanoeBoomerangMove__9daAlink_cFv */
 int daAlink_c::procCanoeBoomerangMove() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -1548,8 +1466,6 @@ int daAlink_c::procCanoeBoomerangMove() {
     return 1;
 }
 
-/* 800F7208-800F7274 0F1B48 006C+00 1/1 0/0 0/0 .text procCanoeHookshotSubjectInit__9daAlink_cFv
- */
 int daAlink_c::procCanoeHookshotSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_HOOKSHOT_SUBJECT)) {
         return 0;
@@ -1561,7 +1477,6 @@ int daAlink_c::procCanoeHookshotSubjectInit() {
     return 1;
 }
 
-/* 800F7274-800F731C 0F1BB4 00A8+00 1/0 0/0 0/0 .text procCanoeHookshotSubject__9daAlink_cFv */
 int daAlink_c::procCanoeHookshotSubject() {
     if (checkHookshotWait()) {
         setDoStatus(0x12);
@@ -1587,7 +1502,6 @@ int daAlink_c::procCanoeHookshotSubject() {
     return 1;
 }
 
-/* 800F731C-800F7388 0F1C5C 006C+00 1/1 0/0 0/0 .text procCanoeHookshotMoveInit__9daAlink_cFv */
 int daAlink_c::procCanoeHookshotMoveInit() {
     if (!commonProcInitNotSameProc(PROC_CANOE_HOOKSHOT_MOVE)) {
         return 0;
@@ -1599,8 +1513,6 @@ int daAlink_c::procCanoeHookshotMoveInit() {
     return 1;
 }
 
-/* 800F7388-800F7404 0F1CC8 007C+00 1/0 0/0 0/0 .text            procCanoeHookshotMove__9daAlink_cFv
- */
 int daAlink_c::procCanoeHookshotMove() {
     cancelHookshotMove();
 
@@ -1619,7 +1531,6 @@ int daAlink_c::procCanoeHookshotMove() {
     return 1;
 }
 
-/* 800F7404-800F7550 0F1D44 014C+00 1/1 0/0 0/0 .text procCanoeBottleDrinkInit__9daAlink_cFUs */
 int daAlink_c::procCanoeBottleDrinkInit(u16 param_0) {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
         return 0;
@@ -1646,8 +1557,6 @@ int daAlink_c::procCanoeBottleDrinkInit(u16 param_0) {
     return 1;
 }
 
-/* 800F7550-800F75BC 0F1E90 006C+00 1/0 0/0 0/0 .text            procCanoeBottleDrink__9daAlink_cFv
- */
 int daAlink_c::procCanoeBottleDrink() {
     if (canoeCommon()) {
         resetUpperAnime(UPPER_2, 3.0f);
@@ -1660,7 +1569,6 @@ int daAlink_c::procCanoeBottleDrink() {
     return 1;
 }
 
-/* 800F75BC-800F7684 0F1EFC 00C8+00 1/1 0/0 0/0 .text procCanoeKandelaarPourInit__9daAlink_cFv */
 int daAlink_c::procCanoeKandelaarPourInit() {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFBFF)) {
         return 0;
@@ -1680,7 +1588,6 @@ int daAlink_c::procCanoeKandelaarPourInit() {
     return 1;
 }
 
-/* 800F7684-800F7708 0F1FC4 0084+00 1/0 0/0 0/0 .text procCanoeKandelaarPour__9daAlink_cFv */
 int daAlink_c::procCanoeKandelaarPour() {
     if (canoeCommon()) {
         resetUpperAnime(UPPER_2, 3.0f);
@@ -1696,14 +1603,11 @@ int daAlink_c::procCanoeKandelaarPour() {
     return 1;
 }
 
-/* 800F7708-800F7760 0F2048 0058+00 2/2 0/0 0/0 .text setGroundFishingRodActor__9daAlink_cFv */
 void daAlink_c::setGroundFishingRodActor() {
     mItemAcKeep.setID(fopAcM_create(PROC_MG_ROD, 0xFFFF011D, &mLeftHandPos, -1, NULL, NULL, -1));
     initFishingRodHand();
 }
 
-/* 800F7760-800F7814 0F20A0 00B4+00 1/1 0/0 0/0 .text            procFishingCastInit__9daAlink_cFv
- */
 int daAlink_c::procFishingCastInit() {
     if (!commonProcInitNotSameProc(PROC_FISHING_CAST)) {
         return 1;
@@ -1726,7 +1630,6 @@ int daAlink_c::procFishingCastInit() {
     return 1;
 }
 
-/* 800F7814-800F7988 0F2154 0174+00 1/0 0/0 0/0 .text            procFishingCast__9daAlink_cFv */
 int daAlink_c::procFishingCast() {
     setFishGetFace();
 
@@ -1773,8 +1676,6 @@ int daAlink_c::procFishingCast() {
     return 1;
 }
 
-/* 800F7988-800F7AA8 0F22C8 0120+00 1/1 0/0 0/0 .text            procFishingFoodInit__9daAlink_cFv
- */
 int daAlink_c::procFishingFoodInit() {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
         return 0;
@@ -1803,7 +1704,6 @@ int daAlink_c::procFishingFoodInit() {
     return 1;
 }
 
-/* 800F7AA8-800F7C50 0F23E8 01A8+00 1/0 0/0 0/0 .text            procFishingFood__9daAlink_cFv */
 int daAlink_c::procFishingFood() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         if (mProcVar2.field_0x300c != 0) {
diff --git a/src/d/actor/d_a_alink_copyrod.inc b/src/d/actor/d_a_alink_copyrod.inc
index 99f52e79de..7cc9e5fd7d 100644
--- a/src/d/actor/d_a_alink_copyrod.inc
+++ b/src/d/actor/d_a_alink_copyrod.inc
@@ -7,24 +7,18 @@
 #include "d/actor/d_a_crod.h"
 #include "d/actor/d_a_cstatue.h"
 
-/* 800E12E0-800E1310 0DBC20 0030+00 1/1 0/0 0/0 .text            checkLv6BossRoom__9daAlink_cFv */
 BOOL daAlink_c::checkLv6BossRoom() {
     return checkStageName("D_MN06A");
 }
 
-/* 800E1310-800E1320 0DBC50 0010+00 0/0 0/0 1/1 .text            getCopyRodBallSpeed__9daAlink_cCFv
- */
 f32 daAlink_c::getCopyRodBallSpeed() const {
     return daAlinkHIO_copyRod_c0::m.mBallSpeed;
 }
 
-/* 800E1320-800E1330 0DBC60 0010+00 0/0 0/0 1/1 .text getCopyRodBallReturnSpeed__9daAlink_cCFv */
 f32 daAlink_c::getCopyRodBallReturnSpeed() const {
     return daAlinkHIO_copyRod_c0::m.mBallReturnSpeed;
 }
 
-/* 800E1330-800E1374 0DBC70 0044+00 3/3 0/0 2/2 .text            getCopyRodBallDisMax__9daAlink_cCFv
- */
 f32 daAlink_c::getCopyRodBallDisMax() const {
     if (checkLv6BossRoom()) {
         return daAlinkHIO_copyRod_c0::m.mBossBallMaxDistance;
@@ -33,7 +27,6 @@ f32 daAlink_c::getCopyRodBallDisMax() const {
     return daAlinkHIO_copyRod_c0::m.mBallMaxDistance;
 }
 
-/* 800E1374-800E1390 0DBCB4 001C+00 6/6 0/0 7/7 .text getCopyRodControllActor__9daAlink_cFv */
 fopAc_ac_c* daAlink_c::getCopyRodControllActor() {
     if (mCopyRodAcKeep.getActor() != NULL) {
         return ((daCrod_c*)mCopyRodAcKeep.getActor())->getControllActor();
@@ -42,8 +35,6 @@ fopAc_ac_c* daAlink_c::getCopyRodControllActor() {
     return NULL;
 }
 
-/* 800E1390-800E13AC 0DBCD0 001C+00 0/0 4/4 1/1 .text            getCopyRodCameraActor__9daAlink_cFv
- */
 fopAc_ac_c* daAlink_c::getCopyRodCameraActor() {
     if (mCopyRodAcKeep.getActor() != NULL) {
         return ((daCrod_c*)mCopyRodAcKeep.getActor())->getCameraActor();
@@ -52,7 +43,6 @@ fopAc_ac_c* daAlink_c::getCopyRodCameraActor() {
     return NULL;
 }
 
-/* 800E13AC-800E1408 0DBCEC 005C+00 2/2 0/0 0/0 .text initCopyRodUpperAnimeSpeed__9daAlink_cFi */
 void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) {
     if (!checkCopyRodThrowAnime()) {
         if (param_0) {
@@ -65,13 +55,10 @@ void daAlink_c::initCopyRodUpperAnimeSpeed(int param_0) {
     }
 }
 
-/* 800E1408-800E145C 0DBD48 0054+00 2/2 0/0 0/0 .text            checkForestOldCentury__9daAlink_cFv
- */
 BOOL daAlink_c::checkForestOldCentury() {
     return checkStageName("F_SP117") && dComIfGp_roomControl_getStayNo() == 2;
 }
 
-/* 800E145C-800E1530 0DBD9C 00D4+00 1/0 0/0 0/0 .text            checkCopyRodTopUse__9daAlink_cFv */
 BOOL daAlink_c::checkCopyRodTopUse() {
     // Event flag 0x2580: Dominion Rod power restored
     return (dComIfGs_isEventBit(0x2580) &&
@@ -80,12 +67,10 @@ BOOL daAlink_c::checkCopyRodTopUse() {
            checkForestOldCentury();
 }
 
-/* 800E1530-800E158C 0DBE70 005C+00 4/4 0/0 0/0 .text            checkCopyRodAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkCopyRodAnime() const {
     return checkCopyRodReadyAnime() || checkCopyRodThrowAnime();
 }
 
-/* 800E158C-800E15FC 0DBECC 0070+00 2/2 0/0 0/0 .text setCopyRodControllAnime__9daAlink_cFv */
 void daAlink_c::setCopyRodControllAnime() {
     if (checkNoUpperAnime() && getCopyRodControllActor()) {
         setUpperAnimeBaseSpeed(0x202, 0.0f, 3.0f);
@@ -95,8 +80,6 @@ void daAlink_c::setCopyRodControllAnime() {
     }
 }
 
-/* 800E15FC-800E1748 0DBF3C 014C+00 1/1 0/0 0/0 .text
- * setCopyRodControllUpperSpeedRate__9daAlink_cFv               */
 void daAlink_c::setCopyRodControllUpperSpeedRate() {
     f32 var_f31;
     if (checkAttentionLock()) {
@@ -124,7 +107,6 @@ void daAlink_c::setCopyRodControllUpperSpeedRate() {
     getNowAnmPackUpper(UPPER_2)->setFrame(frame_ctrl->getFrame());
 }
 
-/* 800E1748-800E1840 0DC088 00F8+00 2/2 0/0 0/0 .text            setCopyRodModel__9daAlink_cFv */
 void daAlink_c::setCopyRodModel() {
     JKRHeap* heap = setItemHeap();
     J3DModelData* mdl_data = loadAramBmd(0x315, 0x5400);
@@ -147,8 +129,6 @@ void daAlink_c::setCopyRodModel() {
     mHeldItemModel->calc();
 }
 
-/* 800E1840-800E191C 0DC180 00DC+00 2/2 0/0 0/0 .text            setCopyRodReadyAnime__9daAlink_cFv
- */
 void daAlink_c::setCopyRodReadyAnime() {
     f32 speed;
     if (checkAttentionLock()) {
@@ -170,7 +150,6 @@ void daAlink_c::setCopyRodReadyAnime() {
     initLockAt();
 }
 
-/* 800E191C-800E1A30 0DC25C 0114+00 1/1 0/0 0/0 .text            throwCopyRod__9daAlink_cFv */
 void daAlink_c::throwCopyRod() {
     daCrod_c* copy_rod = ((daCrod_c*)mItemAcKeep.getActor());
     onNoResetFlg1(FLG1_UNK_10000);
@@ -197,7 +176,6 @@ void daAlink_c::throwCopyRod() {
     }
 }
 
-/* 800E1A30-800E1ADC 0DC370 00AC+00 0/0 0/0 1/1 .text            returnCopyRod__9daAlink_cFv */
 int daAlink_c::returnCopyRod() {
     offNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER);
 
@@ -217,7 +195,6 @@ int daAlink_c::returnCopyRod() {
     return var_r31;
 }
 
-/* 800E1ADC-800E1BB4 0DC41C 00D8+00 2/2 0/0 0/0 .text checkUpperItemActionCopyRod__9daAlink_cFv */
 BOOL daAlink_c::checkUpperItemActionCopyRod() {
     if (mItemVar0.field_0x3018 != 0) {
         mItemVar0.field_0x3018--;
@@ -237,8 +214,6 @@ BOOL daAlink_c::checkUpperItemActionCopyRod() {
     return cancelUpperItemReadyAnime(0);
 }
 
-/* 800E1BB4-800E1C44 0DC4F4 0090+00 1/1 0/0 0/0 .text checkUpperItemActionCopyRodFly__9daAlink_cFv
- */
 void daAlink_c::checkUpperItemActionCopyRodFly() {
     if (mCopyRodAcKeep.getActor() == NULL) {
         if (checkCopyRodReadyAnime()) {
@@ -249,7 +224,6 @@ void daAlink_c::checkUpperItemActionCopyRodFly() {
     }
 }
 
-/* 800E1C44-800E1D6C 0DC584 0128+00 2/2 0/0 0/0 .text checkNextActionCopyRod__9daAlink_cFv */
 int daAlink_c::checkNextActionCopyRod() {
     if ((checkBoomerangCatchAnime() &&
          mUpperFrameCtrl[2].getFrame() <= daAlinkHIO_boom_c0::m.mCatchAnm.mCancelFrame) ||
@@ -278,7 +252,6 @@ int daAlink_c::checkNextActionCopyRod() {
     return procCopyRodMoveInit();
 }
 
-/* 800E1D6C-800E1E20 0DC6AC 00B4+00 1/1 0/0 0/0 .text            setCopyRodSight__9daAlink_cFv */
 void daAlink_c::setCopyRodSight() {
     if (mItemAcKeep.getActor() && !checkCopyRodThrowAnime()) {
         cXyz sight_pos;
@@ -295,7 +268,6 @@ void daAlink_c::setCopyRodSight() {
     }
 }
 
-/* 800E1E20-800E1EB0 0DC760 0090+00 1/1 0/0 0/0 .text procCopyRodSubjectInit__9daAlink_cFv */
 int daAlink_c::procCopyRodSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_COPY_ROD_SUBJECT)) {
         return 0;
@@ -310,7 +282,6 @@ int daAlink_c::procCopyRodSubjectInit() {
     return 1;
 }
 
-/* 800E1EB0-800E1F68 0DC7F0 00B8+00 1/0 0/0 0/0 .text            procCopyRodSubject__9daAlink_cFv */
 int daAlink_c::procCopyRodSubject() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -333,8 +304,6 @@ int daAlink_c::procCopyRodSubject() {
     return 1;
 }
 
-/* 800E1F68-800E1FFC 0DC8A8 0094+00 1/1 0/0 0/0 .text            procCopyRodMoveInit__9daAlink_cFv
- */
 int daAlink_c::procCopyRodMoveInit() {
     if (!commonProcInitNotSameProc(PROC_COPY_ROD_MOVE)) {
         return 0;
@@ -351,7 +320,6 @@ int daAlink_c::procCopyRodMoveInit() {
     return 1;
 }
 
-/* 800E1FFC-800E20C8 0DC93C 00CC+00 1/0 0/0 0/0 .text            procCopyRodMove__9daAlink_cFv */
 int daAlink_c::procCopyRodMove() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -378,8 +346,6 @@ int daAlink_c::procCopyRodMove() {
     return 1;
 }
 
-/* 800E20C8-800E21FC 0DCA08 0134+00 1/1 0/0 0/0 .text            procCopyRodSwingInit__9daAlink_cFv
- */
 int daAlink_c::procCopyRodSwingInit() {
     commonProcInit(PROC_COPY_ROD_SWING);
     daCstatue_c* statue = (daCstatue_c*)getCopyRodControllActor();
@@ -413,7 +379,6 @@ int daAlink_c::procCopyRodSwingInit() {
     return 1;
 }
 
-/* 800E21FC-800E2308 0DCB3C 010C+00 1/0 0/0 0/0 .text            procCopyRodSwing__9daAlink_cFv */
 int daAlink_c::procCopyRodSwing() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     mProcVar2.field_0x300c = 0;
@@ -441,8 +406,6 @@ int daAlink_c::procCopyRodSwing() {
     return 1;
 }
 
-/* 800E2308-800E23A4 0DCC48 009C+00 1/0 0/0 0/0 .text            procCopyRodReviveInit__9daAlink_cFv
- */
 int daAlink_c::procCopyRodReviveInit() {
     if (!commonProcInitNotSameProc(PROC_COPY_ROD_REVIVE)) {
         return 1;
@@ -462,7 +425,6 @@ int daAlink_c::procCopyRodReviveInit() {
     return 1;
 }
 
-/* 800E23A4-800E23FC 0DCCE4 0058+00 1/0 0/0 0/0 .text            procCopyRodRevive__9daAlink_cFv */
 int daAlink_c::procCopyRodRevive() {
     simpleAnmPlay(field_0x0724);
 
diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc
index e4ceac8a64..3d8407fb4a 100644
--- a/src/d/actor/d_a_alink_crawl.inc
+++ b/src/d/actor/d_a_alink_crawl.inc
@@ -5,14 +5,11 @@
 
 #include "d/actor/d_a_alink.h"
 
-/* 800F7C50-800F7C74 0F2590 0024+00 2/2 0/0 0/0 .text            getCrawlMoveAnmSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getCrawlMoveAnmSpeed() {
     return getAnmSpeedStickRate(daAlinkHIO_crouch_c0::m.mCrawlAnmSpeedMin,
                                 daAlinkHIO_crouch_c0::m.mCrawlAnmSpeedMax);
 }
 
-/* 800F7C74-800F7CE8 0F25B4 0074+00 2/2 0/0 0/0 .text            getCrawlMoveSpeed__9daAlink_cFv */
 f32 daAlink_c::getCrawlMoveSpeed() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -26,7 +23,6 @@ f32 daAlink_c::getCrawlMoveSpeed() {
     return (daAlinkHIO_crouch_c0::m.mCrawlMoveRate * frame_ctrl->getRate()) * cM_fsin(frame * 0.18479956686496735f);
 }
 
-/* 800F7CE8-800F7E48 0F2628 0160+00 4/4 0/0 0/0 .text setCrawlMoveDirectionArrow__9daAlink_cFv */
 void daAlink_c::setCrawlMoveDirectionArrow() {
     static const u8 data_80452F38[1] = {1};
     static const u8 data_80452F39[1] = {4};
@@ -80,8 +76,6 @@ void daAlink_c::setCrawlMoveDirectionArrow() {
     dComIfGp_setAdvanceDirection(direction);
 }
 
-/* 800F7E48-800F81C0 0F2788 0378+00 2/2 0/0 0/0 .text changeCrawlAutoMoveProc__9daAlink_cFP4cXyz
- */
 BOOL daAlink_c::changeCrawlAutoMoveProc(cXyz* param_0) {
     cXyz sp70;
     cXyz sp64;
@@ -160,8 +154,6 @@ BOOL daAlink_c::changeCrawlAutoMoveProc(cXyz* param_0) {
     return 0;
 }
 
-/* 800F81C0-800F85C0 0F2B00 0400+00 2/2 0/0 0/0 .text
- * getCrawlMoveVec__9daAlink_cFP4cXyzP4cXyzP4cXyziiPUc          */
 int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3,
                                    int param_4, u8* param_5) {
     if (commonLineCheck(param_0, param_1) && ((param_4 == 0 && (!checkWolf() || !dComIfGp_checkPlayerStatus0(0, 0x08000000))) || dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 6) && (!checkWolf() || dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7)) {
@@ -216,7 +208,6 @@ int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int
     return 0;
 }
 
-/* 800F85C0-800F8700 0F2F00 0140+00 2/2 0/0 0/0 .text crawlBgCheck__9daAlink_cFP4cXyzP4cXyzi */
 void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) {
     cXyz sp28;
     cXyz sp34;
@@ -241,8 +232,6 @@ void daAlink_c::crawlBgCheck(cXyz* param_0, cXyz* param_1, int param_2) {
     }
 }
 
-/* 800F8700-800F88F8 0F3040 01F8+00 2/2 0/0 0/0 .text
- * checkCrawlSideWall__9daAlink_cFP4cXyzP4cXyzP4cXyzP4cXyzPsPs  */
 BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2, cXyz* param_3,
                                        s16* param_4, s16* param_5) {
     cXyz sp58;
@@ -274,8 +263,6 @@ BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2,
     return 0;
 }
 
-/* 800F88F8-800F89E0 0F3238 00E8+00 6/6 0/0 0/0 .text            decideCrawlDoStatus__9daAlink_cFv
- */
 void daAlink_c::decideCrawlDoStatus() {
     if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x80)) {
         if (checkSubjectEnd(1) || mWaterY > current.pos.y) {
@@ -294,14 +281,11 @@ void daAlink_c::decideCrawlDoStatus() {
     }
 }
 
-/* 800F89E0-800F8A50 0F3320 0070+00 3/3 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyz */
 BOOL daAlink_c::checkNotCrawlStand(cXyz* param_0) {
     mLinkRoofChk.SetPos(*param_0);
     return dComIfG_Bgsp().RoofChk(&mLinkRoofChk) - current.pos.y <= field_0x598;
 }
 
-/* 800F8A50-800F8B00 0F3390 00B0+00 2/2 0/0 0/0 .text checkNotCrawlStand__9daAlink_cFP4cXyzP4cXyz
- */
 BOOL daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) {
     cXyz sp20;
 
@@ -318,8 +302,6 @@ BOOL daAlink_c::checkNotCrawlStand(cXyz* param_0, cXyz* param_1) {
     return false;
 }
 
-/* 800F8B00-800F8D04 0F3440 0204+00 2/2 0/0 0/0 .text
- * checkCrawlInHoll__9daAlink_cFP4cXyzP4cXyzP4cXyzi             */
 BOOL daAlink_c::checkCrawlInHoll(cXyz* param_0, cXyz* param_1, cXyz* param_2, int param_3) {
     cXyz spC0;
     cXyz spB4;
@@ -353,7 +335,6 @@ BOOL daAlink_c::checkCrawlInHoll(cXyz* param_0, cXyz* param_1, cXyz* param_2, in
     return 0;
 }
 
-/* 800F8D04-800F8DBC 0F3644 00B8+00 2/2 0/0 0/0 .text            setCrawlMoveHoll__9daAlink_cFv */
 void daAlink_c::setCrawlMoveHoll() {
     f32 frame_ctrl_rate = mUnderFrameCtrl[0].getRate();
 
@@ -371,7 +352,6 @@ void daAlink_c::setCrawlMoveHoll() {
     }
 }
 
-/* 800F8DBC-800F8F08 0F36FC 014C+00 1/1 0/0 0/0 .text            setCrawlMoveAngle__9daAlink_cFv */
 void daAlink_c::setCrawlMoveAngle() {
     cXyz sp20;
     cXyz sp2C;
@@ -405,7 +385,6 @@ void daAlink_c::setCrawlMoveAngle() {
     }
 }
 
-/* 800F8F08-800F8F84 0F3848 007C+00 6/6 0/0 0/0 .text            stopHalfMoveAnime__9daAlink_cFf */
 void daAlink_c::stopHalfMoveAnime(f32 param_0) {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -421,7 +400,6 @@ void daAlink_c::stopHalfMoveAnime(f32 param_0) {
     getNowAnmPackUnder(UNDER_0)->setFrame(frame);
 }
 
-/* 800F8F84-800F9210 0F38C4 028C+00 2/2 0/0 0/0 .text setCrawlAutoMoveAimPos__9daAlink_cFv */
 void daAlink_c::setCrawlAutoMoveAimPos() {
     int temp_r30 = getDirectionFromShapeAngle();
     f32 temp_f31 = cM_ssin(shape_angle.y);
@@ -471,7 +449,6 @@ void daAlink_c::setCrawlAutoMoveAimPos() {
     }
 }
 
-/* 800F9210-800F9384 0F3B50 0174+00 2/2 0/0 0/0 .text            procCrawlStartInit__9daAlink_cFv */
 int daAlink_c::procCrawlStartInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_CRAWL_START, NULL);
@@ -501,7 +478,6 @@ int daAlink_c::procCrawlStartInit() {
     return 1;
 }
 
-/* 800F9384-800F9474 0F3CC4 00F0+00 1/0 0/0 0/0 .text            procCrawlStart__9daAlink_cFv */
 int daAlink_c::procCrawlStart() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -526,7 +502,6 @@ int daAlink_c::procCrawlStart() {
     return 1;
 }
 
-/* 800F9474-800F95B8 0F3DB4 0144+00 3/3 0/0 0/0 .text            procCrawlMoveInit__9daAlink_cFss */
 int daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) {
     BOOL var_r29;
     BOOL var_r28 = 0;
@@ -577,7 +552,6 @@ int daAlink_c::procCrawlMoveInit(s16 param_0, s16 param_1) {
     return 1;
 }
 
-/* 800F95B8-800F99FC 0F3EF8 0444+00 1/0 0/0 0/0 .text            procCrawlMove__9daAlink_cFv */
 int daAlink_c::procCrawlMove() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
     cXyz sp54;
@@ -672,7 +646,6 @@ int daAlink_c::procCrawlMove() {
     return 1;
 }
 
-/* 800F99FC-800F9ABC 0F433C 00C0+00 1/1 0/0 0/0 .text procCrawlAutoMoveInit__9daAlink_cFiP4cXyz */
 int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) {
     BOOL var_r30 = dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 ? TRUE : FALSE;
     commonProcInit(PROC_CRAWL_AUTO_MOVE);
@@ -694,7 +667,6 @@ int daAlink_c::procCrawlAutoMoveInit(int param_0, cXyz* param_1) {
     return 1;
 }
 
-/* 800F9ABC-800F9D7C 0F43FC 02C0+00 1/0 0/0 0/0 .text            procCrawlAutoMove__9daAlink_cFv */
 int daAlink_c::procCrawlAutoMove() {
     field_0x2f99 = 0xC;
 
@@ -781,7 +753,6 @@ int daAlink_c::procCrawlAutoMove() {
     return 1;
 }
 
-/* 800F9D7C-800F9F30 0F46BC 01B4+00 1/1 0/0 0/0 .text            procCrawlEndInit__9daAlink_cFiss */
 int daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
     f32 var_f31 = temp_r29->getFrame();
@@ -835,7 +806,6 @@ int daAlink_c::procCrawlEndInit(int param_0, s16 param_1, s16 param_2) {
     return 1;
 }
 
-/* 800F9F30-800F9FDC 0F4870 00AC+00 1/0 0/0 0/0 .text            procCrawlEnd__9daAlink_cFv */
 int daAlink_c::procCrawlEnd() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
diff --git a/src/d/actor/d_a_alink_cut.inc b/src/d/actor/d_a_alink_cut.inc
index e75605e538..3c0fbcfcdc 100644
--- a/src/d/actor/d_a_alink_cut.inc
+++ b/src/d/actor/d_a_alink_cut.inc
@@ -7,8 +7,6 @@
 #include "d/actor/d_a_b_gnd.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 800D0D38-800D0E08 0CB678 00D0+00 1/1 0/0 0/0 .text daAlink_searchNightStalker__FP10fopAc_ac_cPv
- */
 static fopAc_ac_c* daAlink_searchNightStalker(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_E_S1) {
         daPy_py_c* player_p = daPy_getLinkPlayerActorClass();
@@ -26,8 +24,6 @@ static fopAc_ac_c* daAlink_searchNightStalker(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 800D0E08-800D0E98 0CB748 0090+00 1/1 0/0 0/0 .text            checkLightSwordMtrl__9daAlink_cFv
- */
 void daAlink_c::checkLightSwordMtrl() {
     if (checkLightMasterSwordEquip()) {
         stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
@@ -43,30 +39,23 @@ void daAlink_c::checkLightSwordMtrl() {
     offNoResetFlg3(FLG3_UNK_100000);
 }
 
-/* 800D0E98-800D0ECC 0CB7D8 0034+00 5/5 0/0 0/0 .text            checkSwordEquipAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkSwordEquipAnime() const {
     return !checkNoResetFlg0(FLG0_UNK_1000000) &&
            (checkUpperAnime(0x255) || checkUpperAnime(0x261));
 }
 
-/* 800D0ECC-800D0EFC 0CB80C 0030+00 8/8 0/0 0/0 .text            checkCutDashAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkCutDashAnime() const {
     return checkUpperAnime(0x80) || checkUpperAnime(0x82) || checkUpperAnime(0x81);
 }
 
-/* 800D0EFC-800D0F5C 0CB83C 0060+00 1/1 0/0 0/0 .text
- * checkCutDashEnemyHit__9daAlink_cFR12dCcD_GObjInf             */
 BOOL daAlink_c::checkCutDashEnemyHit(dCcD_GObjInf& obj) {
     return obj.ChkAtHit() && checkEnemyGroup(obj.GetAtHitAc());
 }
 
-/* 800D0F5C-800D0F90 0CB89C 0034+00 6/6 0/0 0/0 .text            getSwordAtType__9daAlink_cFv */
 u32 daAlink_c::getSwordAtType() {
     return checkMasterSwordEquip() ? 0x4000002 : 2;
 }
 
-/* 800D0F90-800D102C 0CB8D0 009C+00 3/3 0/0 0/0 .text            initCutTurnAt__9daAlink_cFfi */
 void daAlink_c::initCutTurnAt(f32 param_0, int param_1) {
     field_0xFB8.ResetAtHit();
     field_0xFB8.OnAtSetBit();
@@ -86,8 +75,6 @@ void daAlink_c::initCutTurnAt(f32 param_0, int param_1) {
     field_0x2fd0 = 1;
 }
 
-/* 800D102C-800D1088 0CB96C 005C+00 2/2 0/0 0/0 .text            checkCutFinishJumpUp__9daAlink_cFv
- */
 bool daAlink_c::checkCutFinishJumpUp() {
     if (checkCutBackState() && !checkNotBattleStage() && swordSwingTrigger()) {
         return true;
@@ -96,7 +83,6 @@ bool daAlink_c::checkCutFinishJumpUp() {
     return false;
 }
 
-/* 800D1088-800D10E0 0CB9C8 0058+00 2/2 0/0 0/0 .text            changeCutFast__9daAlink_cFv */
 void daAlink_c::changeCutFast() {
     deleteEquipItem(FALSE, FALSE);
     setSwordModel();
@@ -105,7 +91,6 @@ void daAlink_c::changeCutFast() {
     onNoResetFlg0(FLG0_UNK_80000);
 }
 
-/* 800D10E0-800D1268 0CBA20 0188+00 1/1 0/0 0/0 .text            checkCutFastReady__9daAlink_cFv */
 bool daAlink_c::checkCutFastReady() {
     if (mProcID == PROC_CUT_FAST_READY) {
         return true;
@@ -137,7 +122,6 @@ bool daAlink_c::checkCutFastReady() {
 }
 
 
-/* 800D1268-800D1310 0CBBA8 00A8+00 9/9 0/0 0/0 .text            setSwordModel__9daAlink_cFv */
 void daAlink_c::setSwordModel() {
     field_0x2fde = 0xFF;
     mEquipItem = 0x103;
@@ -152,7 +136,6 @@ void daAlink_c::setSwordModel() {
     }
 }
 
-/* 800D1310-800D13AC 0CBC50 009C+00 2/2 0/0 0/0 .text            offSwordModel__9daAlink_cFv */
 void daAlink_c::offSwordModel() {
     mDoAud_bgmSetSwordUsing(0);
 
@@ -163,20 +146,15 @@ void daAlink_c::offSwordModel() {
     }
 }
 
-/* 800D13AC-800D13E4 0CBCEC 0038+00 1/1 0/0 0/0 .text            checkCutTypeNoBlur__9daAlink_cCFv
- */
 BOOL daAlink_c::checkCutTypeNoBlur() const {
     return mCutType == CUT_TYPE_NM_STAB || mCutType == CUT_TYPE_COMBO_STAB ||
            mCutType == CUT_TYPE_FINISH_STAB || checkNoResetFlg0(FLG0_UNDERWATER);
 }
 
-/* 800D13E4-800D1424 0CBD24 0040+00 7/7 0/0 0/0 .text            checkCutTurnInput__9daAlink_cCFv */
 bool daAlink_c::checkCutTurnInput() const {
     return 0xF800 < abs(field_0x3180);
 }
 
-/* 800D1424-800D1430 0CBD64 000C+00 7/7 0/0 0/0 .text            getCutTurnDirection__9daAlink_cCFv
- */
 // Debug version is correct, but breaks other versions due no longer inlining
 int daAlink_c::getCutTurnDirection() const {
 #if VERSION == VERSION_SHIELD_DEBUG
@@ -190,7 +168,6 @@ int daAlink_c::getCutTurnDirection() const {
 #endif
 }
 
-/* 800D1430-800D1454 0CBD70 0024+00 17/17 0/0 0/0 .text            resetCombo__9daAlink_cFi */
 void daAlink_c::resetCombo(int param_0) {
     mComboCutCount = 0;
     offNoResetFlg0(FLG0_UNK_8000);
@@ -199,7 +176,6 @@ void daAlink_c::resetCombo(int param_0) {
     }
 }
 
-/* 800D1454-800D152C 0CBD94 00D8+00 1/1 0/0 0/0 .text            checkComboCnt__9daAlink_cFv */
 void daAlink_c::checkComboCnt() {
     if ((mEquipItem == 0x103 && mComboCutCount == 2) &&
         (checkAttentionLock() &&
@@ -215,14 +191,11 @@ void daAlink_c::checkComboCnt() {
     }
 }
 
-/* 800D152C-800D1540 0CBE6C 0014+00 22/22 0/0 0/0 .text            setCutType__9daAlink_cFUc */
 void daAlink_c::setCutType(u8 type) {
     mCutType = type;
     offResetFlg0(RFLG0_UNK_8000000);
 }
 
-/* 800D1540-800D1688 0CBE80 0148+00 8/8 0/0 0/0 .text
- * setCylAtParam__9daAlink_cFUl11dCcG_At_SplUcUciff             */
 void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp,
                               f32 i_radius, f32 i_height) {
     if (checkWoodSwordEquip() && (i_AtSe == 14 || i_AtSe == 1 || i_AtSe == 16)) {
@@ -270,8 +243,6 @@ void daAlink_c::setCylAtParam(u32 i_AtType, dCcG_At_Spl i_spl, u8 i_hitMark, u8
     }
 }
 
-/* 800D1688-800D1788 0CBFC8 0100+00 9/9 0/0 0/0 .text
- * setSwordAtParam__9daAlink_cF11dCcG_At_SplUcUciff             */
 void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int i_atp, f32 param_4,
                                 f32 i_radius) {
     dCcD_Cps* atCps = mAtCps;
@@ -309,8 +280,6 @@ void daAlink_c::setSwordAtParam(dCcG_At_Spl i_spl, u8 i_hitMark, u8 i_AtSe, int
     field_0x33d0 = param_4;
 }
 
-/* 800D1788-800D17EC 0CC0C8 0064+00 1/1 0/0 1/1 .text
- * notSwordHitVibActor__9daAlink_cFP10fopAc_ac_c                */
 BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) {
     if (p_actor != NULL && fopAcM_GetGroup(p_actor) == 4) {
         s16 name = fopAcM_GetName(p_actor);
@@ -323,8 +292,6 @@ BOOL daAlink_c::notSwordHitVibActor(fopAc_ac_c* p_actor) {
     return false;
 }
 
-/* 800D17EC-800D1920 0CC12C 0134+00 4/4 0/0 0/0 .text
- * setSwordHitVibration__9daAlink_cFP12dCcD_GObjInf             */
 BOOL daAlink_c::setSwordHitVibration(dCcD_GObjInf* i_gobj) {
     if (i_gobj->ChkAtHit()) {
         if (notSwordHitVibActor(i_gobj->GetAtHitAc())) {
@@ -359,21 +326,15 @@ BOOL daAlink_c::setSwordHitVibration(dCcD_GObjInf* i_gobj) {
     return false;
 }
 
-/* 800D1920-800D1978 0CC260 0058+00 3/3 0/0 0/0 .text checkAtShieldHit__9daAlink_cFR12dCcD_GObjInf
- */
 BOOL daAlink_c::checkAtShieldHit(dCcD_GObjInf& param_0) {
     return param_0.ChkAtHit() && param_0.ChkAtShieldHit();
 }
 
-/* 800D1978-800D19C8 0CC2B8 0050+00 1/1 0/0 0/0 .text
- * checkCutReverseAt__9daAlink_cFP12dCcD_GObjInf                */
 BOOL daAlink_c::checkCutReverseAt(dCcD_GObjInf* param_0) {
     param_0->GetAtHitAc();
     return checkAtShieldHit(*param_0) ? TRUE : FALSE;
 }
 
-/* 800D19C8-800D1E1C 0CC308 0454+00 5/5 0/0 0/0 .text
- * changeCutReverseProc__9daAlink_cFQ29daAlink_c11daAlink_ANM   */
 BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) {
     if (checkCutReverseAt(&mAtCps[0]) || (mEquipItem != fpcNm_ITEM_COPY_ROD && (checkCutReverseAt(&mAtCps[1]) || checkCutReverseAt(&mAtCps[2])))) {
         return procCutReverseInit(param_0);
@@ -443,7 +404,6 @@ BOOL daAlink_c::changeCutReverseProc(daAlink_c::daAlink_ANM param_0) {
     return 0;
 }
 
-/* 800D1E1C-800D20B4 0CC75C 0298+00 4/4 0/0 0/0 .text            setCutDash__9daAlink_cFii */
 void daAlink_c::setCutDash(int param_0, int param_1) {
     if (!param_0 && checkNoResetFlg1(FLG1_UNK_4000000)) {
         checkCutAction();
@@ -507,13 +467,10 @@ void daAlink_c::setCutDash(int param_0, int param_1) {
     }
 }
 
-/* 800D20B4-800D20FC 0CC9F4 0048+00 4/4 0/0 0/0 .text            checkForceSwordSwing__9daAlink_cFv
- */
 BOOL daAlink_c::checkForceSwordSwing() {
     return mEquipItem == 0x103 && swordSwingTrigger();
 }
 
-/* 800D20FC-800D2188 0CCA3C 008C+00 7/7 0/0 0/0 .text            setComboReserb__9daAlink_cFv */
 void daAlink_c::setComboReserb() {
     if (checkWolf()) {
         field_0x307e = daAlinkHIO_wlAttack_c0::m.mComboDuration;
@@ -526,12 +483,10 @@ void daAlink_c::setComboReserb() {
     }
 }
 
-/* 800D2188-800D21D0 0CCAC8 0048+00 1/1 0/0 0/0 .text            checkComboReserb__9daAlink_cFv */
 BOOL daAlink_c::checkComboReserb() {
     return checkNoResetFlg2(FLG2_UNK_2) && !checkEventRun();
 }
 
-/* 800D21D0-800D2284 0CCB10 00B4+00 1/1 0/0 0/0 .text            commonCutAction__9daAlink_cFv */
 int daAlink_c::commonCutAction() {
     if (mComboCutCount == 4) {
         resetCombo(1);
@@ -553,15 +508,12 @@ int daAlink_c::commonCutAction() {
     return 0;
 }
 
-/* 800D2284-800D22BC 0CCBC4 0038+00 13/13 0/0 0/0 .text            setSwordVoiceSe__9daAlink_cFUl */
 void daAlink_c::setSwordVoiceSe(u32 i_seID) {
     if (!checkNoResetFlg0(FLG0_UNDERWATER)) {
         voiceStart(i_seID);
     }
 }
 
-/* 800D22BC-800D2304 0CCBFC 0048+00 3/3 0/0 0/0 .text            setSwordChargeVoiceSe__9daAlink_cFv
- */
 void daAlink_c::setSwordChargeVoiceSe() {
     if (mProcVar2.field_0x300c != 0) {
         mProcVar2.field_0x300c--;
@@ -572,7 +524,6 @@ void daAlink_c::setSwordChargeVoiceSe() {
     }
 }
 
-/* 800D2304-800D2368 0CCC44 0064+00 3/3 0/0 0/0 .text            setSwordComboVoice__9daAlink_cFv */
 void daAlink_c::setSwordComboVoice() {
     if (mProcID == PROC_CUT_JUMP || mComboCutCount == 4) {
         setSwordVoiceSe(Z2SE_AL_V_ATTACK_L);
@@ -583,12 +534,10 @@ void daAlink_c::setSwordComboVoice() {
     }
 }
 
-/* 800D2368-800D23C0 0CCCA8 0058+00 3/3 0/0 0/0 .text checkCutTurnInputTrigger__9daAlink_cFv */
 bool daAlink_c::checkCutTurnInputTrigger() {
     return swordSwingTrigger() && checkCutTurnInput();
 }
 
-/* 800D23C0-800D2684 0CCD00 02C4+00 7/7 0/0 0/0 .text            checkCutAction__9daAlink_cFv */
 int daAlink_c::checkCutAction() {
     static int const atnNormalType1[5] = {4, 1, 1, 2, 0};
     static int const atnNormalType2[5] = {3, 0, 0, 1, 1};
@@ -654,7 +603,6 @@ int daAlink_c::checkCutAction() {
     return 1;
 }
 
-/* 800D2684-800D26EC 0CCFC4 0068+00 9/9 0/0 0/0 .text            checkCutTurnCharge__9daAlink_cFv */
 void daAlink_c::checkCutTurnCharge() {
     if (swordButton()) {
         if (mProcVar5.field_0x3012 < 3) {
@@ -667,7 +615,6 @@ void daAlink_c::checkCutTurnCharge() {
     }
 }
 
-/* 800D26EC-800D2760 0CD02C 0074+00 4/4 0/0 0/0 .text            getCutDirection__9daAlink_cFv */
 int daAlink_c::getCutDirection() {
     s16 angle;
 
@@ -684,7 +631,6 @@ int daAlink_c::getCutDirection() {
     return getDirectionFromAngle(angle);
 }
 
-/* 800D2760-800D27E4 0CD0A0 0084+00 4/4 0/0 0/0 .text checkCutCancelNextMode__9daAlink_cFi */
 BOOL daAlink_c::checkCutCancelNextMode(int param_0) {
     f32 old_speed = mNormalSpeed;
     u8 old_2f98 = field_0x2f98;
@@ -702,7 +648,6 @@ BOOL daAlink_c::checkCutCancelNextMode(int param_0) {
     return 0;
 }
 
-/* 800D27E4-800D2890 0CD124 00AC+00 4/4 0/0 0/0 .text            checkDoCutAction__9daAlink_cFv */
 BOOL daAlink_c::checkDoCutAction() {
     // event flag 0x2A40: Learned Jump Strike
     if (doButton() && (dComIfGs_isEventBit(0x2A40) || checkNoResetFlg3(FLG3_UNK_200))) {
@@ -716,13 +661,11 @@ BOOL daAlink_c::checkDoCutAction() {
     }
 }
 
-/* 800D2890-800D28F4 0CD1D0 0064+00 2/2 0/0 0/0 .text            checkCutBackState__9daAlink_cFv */
 BOOL daAlink_c::checkCutBackState() {
     // event flag 0x2902: Learned Backslice
     return dComIfGs_isEventBit(0x2902) || checkNoResetFlg3(FL3_TRANING_CUT_BACK);
 }
 
-/* 800D28F4-800D29D4 0CD234 00E0+00 6/6 0/0 0/0 .text            checkCutHeadState__9daAlink_cFv */
 BOOL daAlink_c::checkCutHeadState() {
     fopEn_enemy_c* temp_r27 = (fopEn_enemy_c*)mTargetedActor;
 
@@ -733,8 +676,6 @@ BOOL daAlink_c::checkCutHeadState() {
            temp_r27->checkHeadLockFlg();
 }
 
-/* 800D29D4-800D2ABC 0CD314 00E8+00 4/4 0/0 0/0 .text            checkDownAttackState__9daAlink_cFv
- */
 BOOL daAlink_c::checkDownAttackState() {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)mTargetedActor;
 
@@ -753,7 +694,6 @@ BOOL daAlink_c::checkDownAttackState() {
     return false;
 }
 
-/* 800D2ABC-800D2B88 0CD3FC 00CC+00 1/1 1/1 0/0 .text checkCutLargeTurnState__9daAlink_cCFv */
 BOOL daAlink_c::checkCutLargeTurnState() const {
     // event flag 0x2A20: Learned Great Spin
     return ((dComIfGs_isEventBit(0x2A20) || checkNoResetFlg3(FLG3_UNK_100)) &&
@@ -761,7 +701,6 @@ BOOL daAlink_c::checkCutLargeTurnState() const {
            (mDemo.getDemoMode() == 0x24 && mDemo.getParam0() == 0x33);
 }
 
-/* 800D2B88-800D2BFC 0CD4C8 0074+00 2/2 0/0 0/0 .text            cancelCutCharge__9daAlink_cFv */
 void daAlink_c::cancelCutCharge() {
     if (mComboCutCount == 4) {
         resetCombo(1);
@@ -777,8 +716,6 @@ void daAlink_c::cancelCutCharge() {
     }
 }
 
-/* 800D2BFC-800D2C54 0CD53C 0058+00 3/3 0/0 0/0 .text            initCutAtnActorSearch__9daAlink_cFv
- */
 void daAlink_c::initCutAtnActorSearch() {
     if (cLib_distanceAngleS(getShapeAngleYAtnActor(), shape_angle.y) < 0x800) {
         mProcVar4.field_0x3010 = 1;
@@ -789,7 +726,6 @@ void daAlink_c::initCutAtnActorSearch() {
     field_0x32cc = (uintptr_t)mTargetedActor;
 }
 
-/* 800D2C54-800D2C78 0CD594 0024+00 3/3 0/0 0/0 .text checkCutAtnActorChange__9daAlink_cFv */
 void daAlink_c::checkCutAtnActorChange() {
     if (field_0x32cc != (uintptr_t)mTargetedActor) {
         mProcVar4.field_0x3010 = 0;
@@ -797,7 +733,6 @@ void daAlink_c::checkCutAtnActorChange() {
     }
 }
 
-/* 800D2C78-800D2F58 0CD5B8 02E0+00 2/2 0/0 0/0 .text            setCutJumpSpeed__9daAlink_cFi */
 void daAlink_c::setCutJumpSpeed(int i_airAt) {
     if (checkNoResetFlg0(FLG0_UNDERWATER)) {
         mNormalSpeed *= daAlinkHIO_magneBoots_c0::m.mWaterVelocityX;
@@ -837,7 +772,6 @@ void daAlink_c::setCutJumpSpeed(int i_airAt) {
 }
 
 
-/* 800D2F58-800D31B8 0CD898 0260+00 3/3 0/0 0/0 .text            procCutNormalInit__9daAlink_cFi */
 int daAlink_c::procCutNormalInit(int i_type) {
     static daAlink_cutParamTbl const cutParamTable[5] = {
         {
@@ -959,7 +893,6 @@ int daAlink_c::procCutNormalInit(int i_type) {
     return 1;
 }
 
-/* 800D31B8-800D34D8 0CDAF8 0320+00 1/0 0/0 0/0 .text            procCutNormal__9daAlink_cFv */
 int daAlink_c::procCutNormal() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1046,7 +979,6 @@ int daAlink_c::procCutNormal() {
     return 1;
 }
 
-/* 800D34D8-800D382C 0CDE18 0354+00 4/4 0/0 0/0 .text            procCutFinishInit__9daAlink_cFi */
 int daAlink_c::procCutFinishInit(int i_type) {
     static daAlink_cutParamTbl const cutParamTable[6] = {
         {
@@ -1214,7 +1146,6 @@ int daAlink_c::procCutFinishInit(int i_type) {
     return 1;
 }
 
-/* 800D382C-800D3ADC 0CE16C 02B0+00 1/0 0/0 0/0 .text            procCutFinish__9daAlink_cFv */
 int daAlink_c::procCutFinish() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1287,7 +1218,6 @@ int daAlink_c::procCutFinish() {
 }
 
 
-/* 800D3ADC-800D3CCC 0CE41C 01F0+00 2/2 0/0 0/0 .text procCutFinishJumpUpInit__9daAlink_cFv */
 int daAlink_c::procCutFinishJumpUpInit() {
     BOOL side_roll = mProcID == PROC_SIDE_ROLL;
 
@@ -1338,8 +1268,6 @@ int daAlink_c::procCutFinishJumpUpInit() {
     return 1;
 }
 
-/* 800D3CCC-800D3DD8 0CE60C 010C+00 1/0 0/0 0/0 .text            procCutFinishJumpUp__9daAlink_cFv
- */
 int daAlink_c::procCutFinishJumpUp() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -1374,7 +1302,6 @@ int daAlink_c::procCutFinishJumpUp() {
     return 1;
 }
 
-/* 800D3DD8-800D3ECC 0CE718 00F4+00 1/1 0/0 0/0 .text procCutFinishJumpUpLandInit__9daAlink_cFv */
 int daAlink_c::procCutFinishJumpUpLandInit() {
     commonProcInit(PROC_CUT_FINISH_JUMP_UP_LAND);
     checkCutLandDamage();
@@ -1401,7 +1328,6 @@ int daAlink_c::procCutFinishJumpUpLandInit() {
     return 1;
 }
 
-/* 800D3ECC-800D4068 0CE80C 019C+00 1/0 0/0 0/0 .text procCutFinishJumpUpLand__9daAlink_cFv */
 int daAlink_c::procCutFinishJumpUpLand() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1448,8 +1374,6 @@ int daAlink_c::procCutFinishJumpUpLand() {
     return 1;
 }
 
-/* 800D4068-800D41FC 0CE9A8 0194+00 2/2 0/0 0/0 .text
- * procCutReverseInit__9daAlink_cFQ29daAlink_c11daAlink_ANM     */
 int daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM i_anmID) {
     dKy_Sound_set(current.pos, 100, fopAcM_GetID(this), 5);
 
@@ -1491,7 +1415,6 @@ int daAlink_c::procCutReverseInit(daAlink_c::daAlink_ANM i_anmID) {
     return 1;
 }
 
-/* 800D41FC-800D42FC 0CEB3C 0100+00 1/0 0/0 0/0 .text            procCutReverse__9daAlink_cFv */
 int daAlink_c::procCutReverse() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1523,7 +1446,6 @@ int daAlink_c::procCutReverse() {
     return 1;
 }
 
-/* 800D42FC-800D43F8 0CEC3C 00FC+00 2/2 0/0 0/0 .text            procCutJumpInit__9daAlink_cFi */
 int daAlink_c::procCutJumpInit(int i_airCut) {
     commonProcInit(PROC_CUT_JUMP);
     setSingleAnimeParam(ANM_CUT_JUMP, &daAlinkHIO_cutJump_c0::m.mCutAnm);
@@ -1547,7 +1469,6 @@ int daAlink_c::procCutJumpInit(int i_airCut) {
     return 1;
 }
 
-/* 800D43F8-800D452C 0CED38 0134+00 1/0 0/0 0/0 .text            procCutJump__9daAlink_cFv */
 int daAlink_c::procCutJump() {
     if (current.angle.y == shape_angle.y && changeCutReverseProc(ANM_CUT_JUMP)) {
         current.angle.y += 0x8000;
@@ -1576,8 +1497,6 @@ int daAlink_c::procCutJump() {
     return 1;
 }
 
-/* 800D452C-800D4684 0CEE6C 0158+00 1/1 0/0 0/0 .text            procCutJumpLandInit__9daAlink_cFi
- */
 int daAlink_c::procCutJumpLandInit(int param_0) {
     commonProcInit(PROC_CUT_JUMP_LAND);
     checkCutLandDamage();
@@ -1608,7 +1527,6 @@ int daAlink_c::procCutJumpLandInit(int param_0) {
     return 1;
 }
 
-/* 800D4684-800D47DC 0CEFC4 0158+00 1/0 0/0 0/0 .text            procCutJumpLand__9daAlink_cFv */
 int daAlink_c::procCutJumpLand() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1649,7 +1567,6 @@ int daAlink_c::procCutJumpLand() {
     return 1;
 }
 
-/* 800D47DC-800D4A74 0CF11C 0298+00 7/7 0/0 0/0 .text            procCutTurnInit__9daAlink_cFii */
 // NONMATCHING - regalloc
 int daAlink_c::procCutTurnInit(int param_0, int param_1) {
     const daAlinkHIO_cutTurn_c1* cutData = &daAlinkHIO_cutTurn_c0::m;
@@ -1750,7 +1667,6 @@ int daAlink_c::procCutTurnInit(int param_0, int param_1) {
     return 1;
 }
 
-/* 800D4A74-800D4C68 0CF3B4 01F4+00 1/0 0/0 0/0 .text            procCutTurn__9daAlink_cFv */
 int daAlink_c::procCutTurn() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1800,8 +1716,6 @@ int daAlink_c::procCutTurn() {
     return 1;
 }
 
-/* 800D4C68-800D4D04 0CF5A8 009C+00 3/3 0/0 0/0 .text            procCutTurnChargeInit__9daAlink_cFv
- */
 int daAlink_c::procCutTurnChargeInit() {
     if (mComboCutCount == 0 && checkDashAnime()) {
         setUpperAnimeBase(0x83);
@@ -1816,7 +1730,6 @@ int daAlink_c::procCutTurnChargeInit() {
     return 1;
 }
 
-/* 800D4D04-800D4DDC 0CF644 00D8+00 1/0 0/0 0/0 .text            procCutTurnCharge__9daAlink_cFv */
 int daAlink_c::procCutTurnCharge() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -1840,8 +1753,6 @@ int daAlink_c::procCutTurnCharge() {
     return 1;
 }
 
-/* 800D4DDC-800D4EFC 0CF71C 0120+00 3/3 0/0 0/0 .text            procCutTurnMoveInit__9daAlink_cFi
- */
 int daAlink_c::procCutTurnMoveInit(int param_0) {
     commonProcInit(PROC_CUT_TURN_MOVE);
 
@@ -1876,7 +1787,6 @@ int daAlink_c::procCutTurnMoveInit(int param_0) {
     return 1;
 }
 
-/* 800D4EFC-800D53C8 0CF83C 04CC+00 1/0 0/0 0/0 .text            procCutTurnMove__9daAlink_cFv */
 int daAlink_c::procCutTurnMove() {
     setShapeAngleToAtnActor(0);
 
@@ -2003,7 +1913,6 @@ int daAlink_c::procCutTurnMove() {
 }
 
 
-/* 800D53C8-800D57F8 0CFD08 0430+00 2/1 0/0 0/0 .text            procCutDownInit__9daAlink_cFv */
 int daAlink_c::procCutDownInit() {
     if (mDemo.getDemoMode() == 0x51 && (mProcID == PROC_CUT_DOWN || mProcID == PROC_CUT_DOWN_LAND))
     {
@@ -2083,7 +1992,6 @@ int daAlink_c::procCutDownInit() {
 }
 
 
-/* 800D57F8-800D58A0 0D0138 00A8+00 1/0 0/0 0/0 .text            procCutDown__9daAlink_cFv */
 int daAlink_c::procCutDown() {
     if (mProcVar3.field_0x300e != 0) {
         return 1;
@@ -2099,8 +2007,6 @@ int daAlink_c::procCutDown() {
     return 1;
 }
 
-/* 800D58A0-800D5ADC 0D01E0 023C+00 1/1 0/0 0/0 .text
- * procCutDownLandInit__9daAlink_cFP13fopEn_enemy_c             */
 int daAlink_c::procCutDownLandInit(fopEn_enemy_c* i_enemy) {
     commonProcInit(PROC_CUT_DOWN_LAND);
     checkCutLandDamage();
@@ -2146,7 +2052,6 @@ int daAlink_c::procCutDownLandInit(fopEn_enemy_c* i_enemy) {
 }
 
 
-/* 800D5ADC-800D5C88 0D041C 01AC+00 1/0 0/0 0/0 .text            procCutDownLand__9daAlink_cFv */
 int daAlink_c::procCutDownLand() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -2198,7 +2103,6 @@ int daAlink_c::procCutDownLand() {
 }
 
 
-/* 800D5C88-800D5FC8 0D05C8 0340+00 2/1 0/0 0/0 .text            procCutHeadInit__9daAlink_cFv */
 int daAlink_c::procCutHeadInit() {
     fopEn_enemy_c* enemy_p = (fopEn_enemy_c*)mTargetedActor;
 
@@ -2245,7 +2149,6 @@ int daAlink_c::procCutHeadInit() {
     return 1;
 }
 
-/* 800D5FC8-800D6130 0D0908 0168+00 1/0 0/0 0/0 .text            procCutHead__9daAlink_cFv */
 int daAlink_c::procCutHead() {
     if (mProcVar3.field_0x300e == 0) {
         cLib_chaseF(&mNormalSpeed, 0.0f, field_0x3478);
@@ -2288,8 +2191,6 @@ int daAlink_c::procCutHead() {
     return 1;
 }
 
-/* 800D6130-800D618C 0D0A70 005C+00 1/1 0/0 0/0 .text            procCutHeadLandInit__9daAlink_cFv
- */
 int daAlink_c::procCutHeadLandInit() {
     commonProcInit(PROC_CUT_HEAD_LAND);
     checkCutLandDamage();
@@ -2298,7 +2199,6 @@ int daAlink_c::procCutHeadLandInit() {
     return 1;
 }
 
-/* 800D618C-800D6238 0D0ACC 00AC+00 1/0 0/0 0/0 .text            procCutHeadLand__9daAlink_cFv */
 int daAlink_c::procCutHeadLand() {
     onEndResetFlg0(ERFLG0_UNK_8000000);
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
@@ -2316,7 +2216,6 @@ int daAlink_c::procCutHeadLand() {
     return 1;
 }
 
-/* 800D6238-800D62A0 0D0B78 0068+00 2/2 0/0 0/0 .text procCutLargeJumpChargeInit__9daAlink_cFv */
 int daAlink_c::procCutLargeJumpChargeInit() {
     commonProcInit(PROC_CUT_LARGE_JUMP_CHARGE);
     setSingleAnimeParam(ANM_CUT_JUMP_LARGE_CHARGE, &daAlinkHIO_cutLargeJump_c0::m.mChargeAnm);
@@ -2326,7 +2225,6 @@ int daAlink_c::procCutLargeJumpChargeInit() {
     return 1;
 }
 
-/* 800D62A0-800D6374 0D0BE0 00D4+00 1/0 0/0 0/0 .text procCutLargeJumpCharge__9daAlink_cFv */
 int daAlink_c::procCutLargeJumpCharge() {
     if (checkGroundSpecialMode()) {
         return 1;
@@ -2351,8 +2249,6 @@ int daAlink_c::procCutLargeJumpCharge() {
     return 1;
 }
 
-/* 800D6374-800D6484 0D0CB4 0110+00 2/1 0/0 0/0 .text            procCutLargeJumpInit__9daAlink_cFv
- */
 int daAlink_c::procCutLargeJumpInit() {
     if (mDemo.getDemoMode() == 0x56 &&
         (mProcID == PROC_CUT_LARGE_JUMP || mProcID == PROC_CUT_LARGE_JUMP_LAND))
@@ -2378,7 +2274,6 @@ int daAlink_c::procCutLargeJumpInit() {
     return 1;
 }
 
-/* 800D6484-800D66C0 0D0DC4 023C+00 1/0 0/0 0/0 .text            procCutLargeJump__9daAlink_cFv */
 int daAlink_c::procCutLargeJump() {
     daPy_frameCtrl_c* frameCtrl = &mUnderFrameCtrl[0];
 
@@ -2442,7 +2337,6 @@ int daAlink_c::procCutLargeJump() {
     return 1;
 }
 
-/* 800D66C0-800D67FC 0D1000 013C+00 1/1 0/0 0/0 .text procCutLargeJumpLandInit__9daAlink_cFi */
 int daAlink_c::procCutLargeJumpLandInit(int param_0) {
     commonProcInit(PROC_CUT_LARGE_JUMP_LAND);
     checkCutLandDamage();
@@ -2467,8 +2361,6 @@ int daAlink_c::procCutLargeJumpLandInit(int param_0) {
     return 1;
 }
 
-/* 800D67FC-800D698C 0D113C 0190+00 1/0 0/0 0/0 .text            procCutLargeJumpLand__9daAlink_cFv
- */
 int daAlink_c::procCutLargeJumpLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -2510,7 +2402,6 @@ int daAlink_c::procCutLargeJumpLand() {
     return 1;
 }
 
-/* 800D698C-800D6A38 0D12CC 00AC+00 2/1 0/0 0/0 .text procSwordUnequipSpInit__9daAlink_cFv */
 int daAlink_c::procSwordUnequipSpInit() {
     if (!commonProcInitNotSameProc(PROC_SWORD_UNEQUIP_SP)) {
         return 0;
@@ -2527,7 +2418,6 @@ int daAlink_c::procSwordUnequipSpInit() {
     return 1;
 }
 
-/* 800D6A38-800D6D94 0D1378 035C+00 1/0 0/0 0/0 .text            procSwordUnequipSp__9daAlink_cFv */
 int daAlink_c::procSwordUnequipSp() {
     if (checkGroundSpecialMode()) {
         return 1;
diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc
index 320b34c579..553fd37d9c 100644
--- a/src/d/actor/d_a_alink_damage.inc
+++ b/src/d/actor/d_a_alink_damage.inc
@@ -9,27 +9,22 @@
 #include "d/actor/d_a_crod.h"
 #include "d/d_msg_object.h"
 
-/* 800D6D94-800D6DA4 0D16D4 0010+00 0/0 0/0 2/2 .text            getFreezeR__9daAlink_cCFv */
 s16 daAlink_c::getFreezeR() const {
     return daAlinkHIO_damage_c0::m.mFreezeR;
 }
 
-/* 800D6DA4-800D6DB4 0D16E4 0010+00 0/0 0/0 2/2 .text            getFreezeG__9daAlink_cCFv */
 s16 daAlink_c::getFreezeG() const {
     return daAlinkHIO_damage_c0::m.mFreezeG;
 }
 
-/* 800D6DB4-800D6DC4 0D16F4 0010+00 0/0 0/0 2/2 .text            getFreezeB__9daAlink_cCFv */
 s16 daAlink_c::getFreezeB() const {
     return daAlinkHIO_damage_c0::m.mFreezeB;
 }
 
-/* 800D6DC4-800D6DF0 0D1704 002C+00 2/2 0/0 0/0 .text checkMiddleBossGoronRoom__9daAlink_cFv */
 bool daAlink_c::checkMiddleBossGoronRoom() {
     return checkStageName("D_MN04B");
 }
 
-/* 800D6DF0-800D6E24 0D1730 0034+00 1/0 0/0 0/0 .text setDkCaught__9daAlink_cFP10fopAc_ac_c */
 void daAlink_c::setDkCaught(fopAc_ac_c* param_0) {
     if (!checkNoResetFlg1(FLG1_DK_CAUGHT)) {
         onNoResetFlg1(FLG1_DK_CAUGHT);
@@ -37,7 +32,6 @@ void daAlink_c::setDkCaught(fopAc_ac_c* param_0) {
     }
 }
 
-/* 800D6E24-800D6F00 0D1764 00DC+00 2/2 0/0 0/0 .text            freezeTimerDamage__9daAlink_cFv */
 void daAlink_c::freezeTimerDamage() {
     mProcVar0.field_0x3008--;
     mProcVar1.field_0x300a++;
@@ -59,15 +53,12 @@ void daAlink_c::freezeTimerDamage() {
     }
 }
 
-/* 800D6F00-800D6F2C 0D1840 002C+00 1/0 0/0 0/0 .text onPressedDamage__9daAlink_cFRC4cXyzs */
 void daAlink_c::onPressedDamage(cXyz const& param_0, s16 param_1) {
     onNoResetFlg2(FLG2_PRESSED_DAMAGE);
     field_0x3104 = param_1;
     field_0x3744 = param_0;
 }
 
-/* 800D6F2C-800D6FE0 0D186C 00B4+00 3/3 0/0 0/0 .text checkNoLandDamageSlidePolygon__9daAlink_cFv
- */
 BOOL daAlink_c::checkNoLandDamageSlidePolygon() {
     if (field_0x2fbb == 3) {
         return true;
@@ -86,7 +77,6 @@ BOOL daAlink_c::checkNoLandDamageSlidePolygon() {
 }
 
 
-/* 800D6FE0-800D70A0 0D1920 00C0+00 6/6 0/0 0/0 .text            checkCutLandDamage__9daAlink_cFv */
 void daAlink_c::checkCutLandDamage() {
     if (!checkEventRun()) {
         f32 var_f31 = (mFallHeight - current.pos.y) * 0.0099999998f;
@@ -104,7 +94,6 @@ void daAlink_c::checkCutLandDamage() {
     }
 }
 
-/* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */
 BOOL daAlink_c::checkCaughtEscapeCutTurn() {
     if (mLinkAcch.ChkGroundHit() && (checkSwordGet() || checkWolf()) &&
         checkCutTurnInputTrigger())
@@ -124,8 +113,6 @@ BOOL daAlink_c::checkCaughtEscapeCutTurn() {
     return 0;
 }
 
-/* 800D7160-800D7208 0D1AA0 00A8+00 1/0 0/0 0/0 .text            setThrowDamage__9daAlink_cFsffiii
- */
 bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_3, int param_4,
                                int param_5) {
     field_0x3408 = param_1;
@@ -152,8 +139,6 @@ bool daAlink_c::setThrowDamage(s16 param_0, f32 param_1, f32 param_2, int param_
     return true;
 }
 
-/* 800D7208-800D72BC 0D1B48 00B4+00 2/2 0/0 0/0 .text            damageMagnification__9daAlink_cFii
- */
 f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) {
     f32 base_mag;
 
@@ -176,7 +161,6 @@ f32 daAlink_c::damageMagnification(int i_checkZoraMag, int param_1) {
     return base_mag;
 }
 
-/* 800D72BC-800D7478 0D1BFC 01BC+00 6/6 1/1 0/0 .text            setDamagePoint__9daAlink_cFiiii */
 int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgTimer, int param_3) {
     if (i_dmgAmount <= 0) {
         dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
@@ -211,21 +195,16 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, int i_checkZoraMag, int i_setDmgT
     return 0;
 }
 
-/* 800D7478-800D74A4 0D1DB8 002C+00 6/6 0/0 0/0 .text            setDamagePointNormal__9daAlink_cFi
- */
 void daAlink_c::setDamagePointNormal(int i_dmgAmount) {
     setDamagePoint(i_dmgAmount, FALSE, TRUE, 0);
 }
 
-/* 800D74A4-800D74F4 0D1DE4 0050+00 3/3 0/0 0/0 .text            setLandDamagePoint__9daAlink_cFi */
 void daAlink_c::setLandDamagePoint(int i_dmgAmount) {
     onEndResetFlg2(ERFLG2_UNK_40);
     setDamagePoint(i_dmgAmount, FALSE, TRUE, 0);
     offEndResetFlg2(ERFLG2_UNK_40);
 }
 
-/* 800D74F4-800D76C4 0D1E34 01D0+00 11/11 0/0 0/0 .text getDamageVec__9daAlink_cFP12dCcD_GObjInf
- */
 cXyz* daAlink_c::getDamageVec(dCcD_GObjInf* i_hitObj) {
     cXyz* vec = i_hitObj->GetTgRVecP();
     cXyz sp40;
@@ -258,7 +237,6 @@ cXyz* daAlink_c::getDamageVec(dCcD_GObjInf* i_hitObj) {
     return vec;
 }
 
-/* 800D76C4-800D7768 0D2004 00A4+00 1/1 0/0 0/0 .text            setDashDamage__9daAlink_cFv */
 void daAlink_c::setDashDamage() {
     setUpperAnimeParam(0xAD, UPPER_2, &daAlinkHIO_damage_c0::m.mDashDmgAnm);
     setFacePriBck(0x121);
@@ -268,8 +246,6 @@ void daAlink_c::setDashDamage() {
     freeGrabItem();
 }
 
-/* 800D7768-800D77C8 0D20A8 0060+00 2/2 0/0 3/3 .text
- * checkIcePolygonDamage__9daAlink_cFP13cBgS_PolyInfo           */
 BOOL daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
     if (dComIfG_Bgsp().GetPolyAtt0(*i_poly) == 8 && dKy_pol_argument_get(i_poly) & 0x60) {
         return TRUE;
@@ -278,12 +254,10 @@ BOOL daAlink_c::checkIcePolygonDamage(cBgS_PolyInfo* i_poly) {
     return FALSE;
 }
 
-/* 800D77C8-800D7820 0D2108 0058+00 8/8 0/0 0/0 .text checkMagicArmorNoDamage__9daAlink_cFv */
 BOOL daAlink_c::checkMagicArmorNoDamage() {
     return checkMagicArmorWearAbility() && !checkMagicArmorHeavy();
 }
 
-/* 800D7820-800D7A98 0D2160 0278+00 1/1 0/0 0/0 .text            checkPolyDamage__9daAlink_cFv */
 int daAlink_c::checkPolyDamage() {
     if (dComIfGs_PolyDamageOff_Check()) {
         return 0;
@@ -339,8 +313,6 @@ int daAlink_c::checkPolyDamage() {
     return field_0x2fca;
 }
 
-/* 800D7A98-800D7B18 0D23D8 0080+00 1/1 0/0 0/0 .text
- * checkElecReturnDamage__9daAlink_cFR12dCcD_GObjInfPP10fopAc_ac_c */
 BOOL daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_1) {
     if (param_0.ChkAtHit() && param_0.GetAtHitGObj() != NULL) {
         dCcD_GObjInf* gobj_p = (dCcD_GObjInf*)param_0.GetAtHitGObj();
@@ -354,7 +326,6 @@ BOOL daAlink_c::checkElecReturnDamage(dCcD_GObjInf& param_0, fopAc_ac_c** param_
     return false;
 }
 
-/* 800D7B18-800D7BE8 0D2458 00D0+00 1/1 0/0 0/0 .text            damageTimerCount__9daAlink_cFv */
 void daAlink_c::damageTimerCount() {
     if (!checkModeFlg(8)) {
         if (mDamageColorTime != 0) {
@@ -378,17 +349,14 @@ void daAlink_c::damageTimerCount() {
     }
 }
 
-/* 800D7BE8-800D7C14 0D2528 002C+00 3/3 0/0 0/0 .text            checkHugeAttack__9daAlink_cCFi */
 bool daAlink_c::checkHugeAttack(int param_0) const {
     return param_0 == 2 || param_0 == 7 || param_0 == 11 || param_0 == 14;
 }
 
-/* 800D7C14-800D7C40 0D2554 002C+00 3/3 0/0 0/0 .text            checkLargeAttack__9daAlink_cCFi */
 bool daAlink_c::checkLargeAttack(int param_0) const {
     return param_0 == 1 || param_0 == 6 || param_0 == 10 || param_0 == 13;
 }
 
-/* 800D7C40-800D8F3C 0D2580 12FC+00 1/1 0/0 0/0 .text            checkDamageAction__9daAlink_cFv */
 BOOL daAlink_c::checkDamageAction() {
     s16 spE = mIceDamageWaitTimer;
     mIceDamageWaitTimer = 0;
@@ -785,8 +753,6 @@ BOOL daAlink_c::checkDamageAction() {
     return checkWolfBarrierHitReverse();
 }
 
-/* 800D8F3C-800D9514 0D387C 05D8+00 2/2 0/0 0/0 .text procDamageInit__9daAlink_cFP12dCcD_GObjInfi
- */
 int daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) {
     BOOL freeze_player;
 
@@ -888,7 +854,6 @@ int daAlink_c::procDamageInit(dCcD_GObjInf* param_0, int param_1) {
     return 1;
 }
 
-/* 800D9514-800D96DC 0D3E54 01C8+00 1/0 0/0 0/0 .text            procDamage__9daAlink_cFv */
 int daAlink_c::procDamage() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
     f32 var_f30 = frame_ctrl->getFrame() - frame_ctrl->getStart();
@@ -926,8 +891,6 @@ int daAlink_c::procDamage() {
     return 1;
 }
 
-/* 800D96DC-800D9E88 0D401C 07AC+00 12/12 0/0 0/0 .text
- * procCoLargeDamageInit__9daAlink_cFiissP12dCcD_GObjInfi       */
 int daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16 param_3,
                                          dCcD_GObjInf* param_4, int param_5) {
     u32 sp10 = checkReinRide();
@@ -1164,7 +1127,6 @@ int daAlink_c::procCoLargeDamageInit(int param_0, int param_1, s16 param_2, s16
     return 1;
 }
 
-/* 800D9E88-800DA180 0D47C8 02F8+00 1/0 0/0 0/0 .text            procCoLargeDamage__9daAlink_cFv */
 int daAlink_c::procCoLargeDamage() {
     if (field_0x32cc != 0) {
         field_0x32cc--;
@@ -1240,7 +1202,6 @@ int daAlink_c::procCoLargeDamage() {
     return 1;
 }
 
-/* 800DA180-800DA554 0D4AC0 03D4+00 2/2 0/0 0/0 .text procLargeDamageUpInit__9daAlink_cFiiss */
 int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) {
     if (!commonProcInitNotSameProc(PROC_LARGE_DAMAGE_UP)) {
         return 0;
@@ -1371,7 +1332,6 @@ int daAlink_c::procLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16
     return 1;
 }
 
-/* 800DA554-800DA82C 0D4E94 02D8+00 1/0 0/0 0/0 .text            procLargeDamageUp__9daAlink_cFv */
 int daAlink_c::procLargeDamageUp() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
     mProcVar4.field_0x3010 = 0;
@@ -1437,8 +1397,6 @@ int daAlink_c::procLargeDamageUp() {
     return 1;
 }
 
-/* 800DA82C-800DAC28 0D516C 03FC+00 1/1 0/0 0/0 .text procCoLargeDamageWallInit__9daAlink_cFiiss
- */
 int daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2, s16 param_3) {
     if (mProcID == PROC_LARGE_DAMAGE_WALL) {
         return 0;
@@ -1518,8 +1476,6 @@ int daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2,
     return 1;
 }
 
-/* 800DAC28-800DAC84 0D5568 005C+00 1/0 0/0 0/0 .text            procCoLargeDamageWall__9daAlink_cFv
- */
 int daAlink_c::procCoLargeDamageWall() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         procCoLargeDamageInit(field_0x3198, mProcVar0.field_0x3008, field_0x3080, field_0x3082, NULL, 0);
@@ -1528,8 +1484,6 @@ int daAlink_c::procCoLargeDamageWall() {
     return 1;
 }
 
-/* 800DAC84-800DAD90 0D55C4 010C+00 2/2 0/0 0/0 .text            procCoPolyDamageInit__9daAlink_cFv
- */
 int daAlink_c::procCoPolyDamageInit() {
     seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
 
@@ -1556,7 +1510,6 @@ int daAlink_c::procCoPolyDamageInit() {
     return 1;
 }
 
-/* 800DAD90-800DAE10 0D56D0 0080+00 1/0 0/0 0/0 .text            procCoPolyDamage__9daAlink_cFv */
 int daAlink_c::procCoPolyDamage() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         commonCheckNextAction(0);
@@ -1571,7 +1524,6 @@ int daAlink_c::procCoPolyDamage() {
     return 1;
 }
 
-/* 800DAE10-800DB060 0D5750 0250+00 2/2 0/0 0/0 .text            procLandDamageInit__9daAlink_cFi */
 int daAlink_c::procLandDamageInit(int param_0) {
     f32 var_f31;
     if (param_0 == 0) {
@@ -1619,7 +1571,6 @@ int daAlink_c::procLandDamageInit(int param_0) {
     return 1;
 }
 
-/* 800DB060-800DB140 0D59A0 00E0+00 1/0 0/0 0/0 .text            procLandDamage__9daAlink_cFv */
 int daAlink_c::procLandDamage() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -1644,8 +1595,6 @@ int daAlink_c::procLandDamage() {
     return 1;
 }
 
-/* 800DB140-800DB418 0D5A80 02D8+00 1/1 0/0 0/0 .text
- * procCoElecDamageInit__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfi */
 int daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, int param_2) {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFFEF)) {
         return 0;
@@ -1725,7 +1674,6 @@ int daAlink_c::procCoElecDamageInit(fopAc_ac_c* param_0, dCcD_GObjInf* param_1,
     return 1;
 }
 
-/* 800DB418-800DB5B0 0D5D58 0198+00 1/0 0/0 0/0 .text            procCoElecDamage__9daAlink_cFv */
 int daAlink_c::procCoElecDamage() {
     seStartOnlyReverbLevel(Z2SE_AL_ELEC_DAMAGE);
 
@@ -1766,7 +1714,6 @@ int daAlink_c::procCoElecDamage() {
     return 1;
 }
 
-/* 800DB5B0-800DB610 0D5EF0 0060+00 2/2 0/0 0/0 .text            procStEscapeInit__9daAlink_cFv */
 int daAlink_c::procStEscapeInit() {
     commonProcInit(PROC_HUMAN_ST_ESCAPE);
     setSingleAnimeParam(ANM_FROZEN_FREE, &daAlinkHIO_damCaught_c0::m.mEscapeAnm);
@@ -1778,7 +1725,6 @@ int daAlink_c::procStEscapeInit() {
     return 1;
 }
 
-/* 800DB610-800DB6A4 0D5F50 0094+00 1/0 0/0 0/0 .text            procStEscape__9daAlink_cFv */
 int daAlink_c::procStEscape() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -1793,7 +1739,6 @@ int daAlink_c::procStEscape() {
     return 1;
 }
 
-/* 800DB6A4-800DB860 0D5FE4 01BC+00 1/1 0/0 0/0 .text            procDkCaughtInit__9daAlink_cFUi */
 int daAlink_c::procDkCaughtInit(fpc_ProcID param_0) {
     if (!commonProcInitNotSameProc(PROC_DK_CAUGHT)) {
         return 0;
@@ -1819,7 +1764,6 @@ int daAlink_c::procDkCaughtInit(fpc_ProcID param_0) {
     return 1;
 }
 
-/* 800DB860-800DBC98 0D61A0 0438+00 1/0 0/0 0/0 .text            procDkCaught__9daAlink_cFv */
 int daAlink_c::procDkCaught() {
     fopAc_ac_c* temp_r3 = fopAcM_SearchByID(field_0x28f8);
     if (temp_r3 == NULL || !checkNoResetFlg1(FLG1_DK_CAUGHT)) {
@@ -1887,7 +1831,6 @@ int daAlink_c::procDkCaught() {
     return 1;
 }
 
-/* 800DBC98-800DBD1C 0D65D8 0084+00 2/2 0/0 0/0 .text            setScreamWaitAnime__9daAlink_cFv */
 void daAlink_c::setScreamWaitAnime() {
     setSingleAnimeBase(ANM_WAIT_F);
     voiceStart(Z2SE_AL_V_TERRORED);
@@ -1897,7 +1840,6 @@ void daAlink_c::setScreamWaitAnime() {
     dComIfGp_getVibration().StartQuake(5, 1, cXyz(tmp_0, 1.0f, tmp_0));
 }
 
-/* 800DBD1C-800DBDA4 0D665C 0088+00 1/1 0/0 0/0 .text            procScreamWaitInit__9daAlink_cFv */
 int daAlink_c::procScreamWaitInit() {
     commonProcInit(PROC_SCREAM_WAIT);
 
@@ -1914,7 +1856,6 @@ int daAlink_c::procScreamWaitInit() {
     return 1;
 }
 
-/* 800DBDA4-800DBE00 0D66E4 005C+00 1/0 0/0 0/0 .text            procScreamWait__9daAlink_cFv */
 int daAlink_c::procScreamWait() {
     onEndResetFlg0(ERFLG0_UNK_8000000);
 
@@ -1927,8 +1868,6 @@ int daAlink_c::procScreamWait() {
     return 1;
 }
 
-/* 800DBE00-800DBE74 0D6740 0074+00 1/1 0/0 0/0 .text            procCoSandWallHitInit__9daAlink_cFv
- */
 int daAlink_c::procCoSandWallHitInit() {
     if (!commonProcInitNotSameProc(PROC_SAND_WALL_HIT)) {
         return 1;
@@ -1945,7 +1884,6 @@ int daAlink_c::procCoSandWallHitInit() {
     return 1;
 }
 
-/* 800DBE74-800DBED8 0D67B4 0064+00 1/0 0/0 0/0 .text            procCoSandWallHit__9daAlink_cFv */
 int daAlink_c::procCoSandWallHit() {
     if (mLinkAcch.ChkGroundHit()) {
         offModeFlg(2);
@@ -1959,8 +1897,6 @@ int daAlink_c::procCoSandWallHit() {
     return 1;
 }
 
-/* 800DBED8-800DC214 0D6818 033C+00 1/1 0/0 0/0 .text            procCoLavaReturnInit__9daAlink_cFi
- */
 int daAlink_c::procCoLavaReturnInit(BOOL i_sandReturn) {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
         return 0;
@@ -2033,7 +1969,6 @@ int daAlink_c::procCoLavaReturnInit(BOOL i_sandReturn) {
     return 1;
 }
 
-/* 800DC214-800DC278 0D6B54 0064+00 1/0 0/0 0/0 .text            procCoLavaReturn__9daAlink_cFv */
 int daAlink_c::procCoLavaReturn() {
     cLib_chaseF(&mSinkShapeOffset, 0.0f, 6.0f);
 
@@ -2044,7 +1979,6 @@ int daAlink_c::procCoLavaReturn() {
     return 1;
 }
 
-/* 800DC278-800DC474 0D6BB8 01FC+00 1/1 0/0 0/0 .text procCoSwimFreezeReturnInit__9daAlink_cFv */
 int daAlink_c::procCoSwimFreezeReturnInit() {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
         return 0;
@@ -2095,7 +2029,6 @@ int daAlink_c::procCoSwimFreezeReturnInit() {
     return 1;
 }
 
-/* 800DC474-800DC548 0D6DB4 00D4+00 1/0 0/0 0/0 .text procCoSwimFreezeReturn__9daAlink_cFv */
 int daAlink_c::procCoSwimFreezeReturn() {
     if (mProcVar2.field_0x300c == 0) {
         if (checkRestartDead(4, 1)) {
diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc
index 9f43f141e3..afec347a5e 100644
--- a/src/d/actor/d_a_alink_demo.inc
+++ b/src/d/actor/d_a_alink_demo.inc
@@ -22,13 +22,10 @@
 #include "d/actor/d_a_obj_tks.h"
 #include "d/actor/d_a_npc_tkc.h"
 
-/* 80115C20-80115C50 110560 0030+00 72/72 0/0 0/0 .text            checkEventRun__9daAlink_cCFv */
 BOOL daAlink_c::checkEventRun() const {
     return dComIfGp_event_runCheck() || checkPlayerDemoMode();
 }
 
-/* 80115C50-80115D08 110590 00B8+00 2/2 0/0 0/0 .text            createNpcTks__9daAlink_cFP4cXyziUl
- */
 void daAlink_c::createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters) {
     cXyz pos(i_basePos->x + cM_ssin(shape_angle.y) * 200.0f, i_basePos->y,
              i_basePos->z + cM_scos(shape_angle.y) * 200.0f);
@@ -37,8 +34,6 @@ void daAlink_c::createNpcTks(cXyz* i_basePos, int i_roomNo, u32 i_parameters) {
 }
 
 
-/* 80115D08-80115EC0 110648 01B8+00 1/0 0/0 0/0 .text            checkSetNpcTks__9daAlink_cFP4cXyzii
- */
 bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
     u32 scene_mode = getLastSceneMode();
 
@@ -74,7 +69,6 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
     return false;
 }
 
-/* 80115EC0-80116E60 110800 0FA0+00 1/1 0/0 0/0 .text            checkDemoAction__9daAlink_cFv */
 int daAlink_c::checkDemoAction() {
     if (dComIfGp_getEvent().isOrderOK()) {
         if (!dComIfGp_event_runCheck()) {
@@ -479,13 +473,10 @@ int daAlink_c::checkDemoAction() {
 }
 
 
-/* 80116E60-80116E9C 1117A0 003C+00 4/4 0/0 0/0 .text            checkDemoMoveMode__9daAlink_cCFUl
- */
 bool daAlink_c::checkDemoMoveMode(u32 i_mode) const {
     return i_mode == daPy_demo_c::DEMO_UNK_2_e || i_mode == daPy_demo_c::DEMO_UNK_3_e || i_mode == daPy_demo_c::DEMO_UNK_38_e;
 }
 
-/* 80116E9C-80117064 1117DC 01C8+00 1/1 0/0 0/0 .text setDemoMoveData__9daAlink_cFPUlPC4cXyz */
 void daAlink_c::setDemoMoveData(u32* o_mode, cXyz const* i_goal) {
     cXyz sp20;
     sp20 = *i_goal - current.pos;
@@ -524,7 +515,6 @@ void daAlink_c::setDemoMoveData(u32* o_mode, cXyz const* i_goal) {
     mDemo.setMoveAngle(sp20.atan2sX_Z());
 }
 
-/* 80117064-801171F4 1119A4 0190+00 1/1 0/0 0/0 .text setNoDrawSwordShield__9daAlink_cFiUs */
 void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) {
     if (param_0 == 5) {
         if (param_1 == 2) {
@@ -575,7 +565,6 @@ void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) {
     }
 }
 
-/* 801171F4-80117B90 111B34 099C+00 1/1 0/0 0/0 .text            setDemoData__9daAlink_cFv */
 void daAlink_c::setDemoData() {
     if (dComIfGp_getEvent().isOrderOK()) {
         if (checkPlayerDemoMode() && mClothesChangeWaitTimer == 0) {
@@ -850,7 +839,6 @@ void daAlink_c::setDemoData() {
 }
 
 
-/* 80117B90-80117C34 1124D0 00A4+00 1/1 0/0 0/0 .text            resetDemoBck__9daAlink_cFv */
 void daAlink_c::resetDemoBck() {
     mFaceBckHeap.resetArcNo();
     mFaceBtpHeap.resetArcNo();
@@ -871,7 +859,6 @@ void daAlink_c::resetDemoBck() {
     }
 }
 
-/* 80117C34-80117C90 112574 005C+00 3/3 0/0 0/0 .text            endHighModel__9daAlink_cFv */
 void daAlink_c::endHighModel() {
     if (field_0x068c != NULL) {
         mpDemoFCTongueModel->getModelData()->removeTexMtxAnimator(field_0x068c);
@@ -882,15 +869,12 @@ void daAlink_c::endHighModel() {
     field_0x068c = NULL;
 }
 
-/* 80117C90-80117CF8 1125D0 0068+00 21/21 0/0 0/0 .text            resetSpecialEvent__9daAlink_cFv
- */
 void daAlink_c::resetSpecialEvent() {
     dComIfGp_event_reset();
     dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
     endDemoMode();
 }
 
-/* 80117CF8-801180EC 112638 03F4+00 4/4 0/0 0/0 .text            endDemoMode__9daAlink_cFv */
 void daAlink_c::endDemoMode() {
     BOOL temp_r30 = checkFlyAtnWait();
     endHighModel();
@@ -983,7 +967,6 @@ void daAlink_c::endDemoMode() {
     }
 }
 
-/* 801180EC-80118170 112A2C 0084+00 2/2 0/0 0/0 .text            getDemoLookActor__9daAlink_cFv */
 fopAc_ac_c* daAlink_c::getDemoLookActor() {
     if (mDemo.getParam0() == 1) {
         return dComIfGp_event_getPt1();
@@ -998,12 +981,10 @@ fopAc_ac_c* daAlink_c::getDemoLookActor() {
     return NULL;
 }
 
-/* 80118170-801181A0 112AB0 0030+00 4/4 0/0 0/0 .text            checkFlyAtnWait__9daAlink_cFv */
 BOOL daAlink_c::checkFlyAtnWait() {
     return mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_23_e && (mDemo.getParam1() == 4 || mDemo.getParam1() == 5);
 }
 
-/* 801181A0-801182D4 112AE0 0134+00 2/2 0/0 0/0 .text            setGetItemFace__9daAlink_cFUs */
 void daAlink_c::setGetItemFace(u16 param_0) {
     if (param_0 == 7 || param_0 == 6 || param_0 == 0x21 || param_0 == 0x22 || param_0 == 0x31 ||
         param_0 == 0x36 || (param_0 >= 0x40 && param_0 <= 0x47) || param_0 == 0x4A ||
@@ -1019,16 +1000,12 @@ void daAlink_c::setGetItemFace(u16 param_0) {
     }
 }
 
-/* 801182D4-80118308 112C14 0034+00 2/2 0/0 0/0 .text checkGrabTalkActor__9daAlink_cFP10fopAc_ac_c
- */
 BOOL daAlink_c::checkGrabTalkActor(fopAc_ac_c* i_actor) {
     s16 name = fopAcM_GetName(i_actor);
     return name == PROC_NPC_KYURY || name == PROC_MYNA || name == PROC_OBJ_SSITEM ||
            name == PROC_TAG_MSG;
 }
 
-/* 80118308-8011856C 112C48 0264+00 2/2 0/0 0/0 .text            setTalkStartBack__9daAlink_cFP4cXyz
- */
 int daAlink_c::setTalkStartBack(cXyz* param_0) {
     fopAc_ac_c* partner_p = fopAcM_getTalkEventPartner(this);
     if (partner_p != NULL) {
@@ -1062,7 +1039,6 @@ int daAlink_c::setTalkStartBack(cXyz* param_0) {
 }
 
 
-/* 8011856C-80118654 112EAC 00E8+00 4/4 0/0 0/0 .text setShapeAngleToTalkActor__9daAlink_cFv */
 void daAlink_c::setShapeAngleToTalkActor() {
     fopAc_ac_c* partner_p = fopAcM_getTalkEventPartner(this);
     if (partner_p != NULL) {
@@ -1089,7 +1065,6 @@ void daAlink_c::setShapeAngleToTalkActor() {
     }
 }
 
-/* 80118654-801186D4 112F94 0080+00 2/2 0/0 0/0 .text            setTalkAnime__9daAlink_cFv */
 void daAlink_c::setTalkAnime() {
     if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK_8_e || mEquipItem == fpcNm_ITEM_KANTERA ||
         (checkNoResetFlg2(FLG2_UNK_1) && field_0x2fde == 0x48))
@@ -1101,7 +1076,6 @@ void daAlink_c::setTalkAnime() {
     }
 }
 
-/* 801186D4-80118778 113014 00A4+00 2/2 0/0 0/0 .text            setTradeItemAnime__9daAlink_cFv */
 u8 daAlink_c::setTradeItemAnime() {
     setSingleAnimeBase(ANM_TRADE_ITEM_PULL_OUT);
     offModeFlg(0x100);
@@ -1123,8 +1097,6 @@ u8 daAlink_c::setTradeItemAnime() {
     return 1;
 }
 
-/* 80118778-801187B4 1130B8 003C+00 3/3 0/0 0/0 .text            setTradeItemOutHand__9daAlink_cFv
- */
 void daAlink_c::setTradeItemOutHand() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -1135,7 +1107,6 @@ void daAlink_c::setTradeItemOutHand() {
     }
 }
 
-/* 801187B4-80118840 1130F4 008C+00 5/5 0/0 0/0 .text            checkEndMessage__9daAlink_cFUl */
 BOOL daAlink_c::checkEndMessage(u32 param_0) {
     if (mMsgClassID == fpcM_ERROR_PROCESS_ID_e) {
         mMsgClassID = fopMsgM_messageSet(param_0, 1000);
@@ -1155,7 +1126,6 @@ BOOL daAlink_c::checkEndMessage(u32 param_0) {
     return 0;
 }
 
-/* 80118840-801188B0 113180 0070+00 1/1 0/0 0/0 .text setDemoRightHandIndex__9daAlink_cFUs */
 u8 daAlink_c::setDemoRightHandIndex(u16 param_0) {
     if (param_0 == 0xFD) {
         mProcVar4.field_0x3010 = 1;
@@ -1176,8 +1146,6 @@ u8 daAlink_c::setDemoRightHandIndex(u16 param_0) {
     }
 }
 
-/* 801188B0-8011894C 1131F0 009C+00 1/1 0/0 0/0 .text            setDemoLeftHandIndex__9daAlink_cFUs
- */
 u8 daAlink_c::setDemoLeftHandIndex(u16 param_0) {
     if (param_0 == 0xFD) {
         if (mEquipItem != 0x103) {
@@ -1199,7 +1167,6 @@ u8 daAlink_c::setDemoLeftHandIndex(u16 param_0) {
     }
 }
 
-/* 8011894C-801189F8 11328C 00AC+00 1/1 0/0 0/0 .text            setDemoRide__9daAlink_cFUs */
 void daAlink_c::setDemoRide(u16 param_0) {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -1220,8 +1187,6 @@ void daAlink_c::setDemoRide(u16 param_0) {
     }
 }
 
-/* 801189F8-80118AD0 113338 00D8+00 1/1 0/0 0/0 .text
- * setDemoBodyBck__9daAlink_cFP13dDemo_actor_cUs                */
 void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) {
     J3DAnmTransform* bck = (J3DAnmTransform*)mUnderAnmHeap[0].loadDataDemoRID(param_1, 0);
     if (bck != NULL) {
@@ -1241,12 +1206,10 @@ void daAlink_c::setDemoBodyBck(dDemo_actor_c* param_0, u16 param_1) {
 }
 
 
-/* 80118AD0-80118B34 113410 0064+00 1/1 0/0 0/0 .text            checkFinalBattle__9daAlink_cFv */
 BOOL daAlink_c::checkFinalBattle() {
     return checkStageName("D_MN09B") && dComIfGs_isSaveDunSwitch(1);
 }
 
-/* 80118B34-80118BF4 113474 00C0+00 3/3 0/0 0/0 .text            checkRestartDead__9daAlink_cFii */
 BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) {
     i_dmgAmount *= (int)damageMagnification(i_checkZoraMag, 1);
 
@@ -1261,7 +1224,6 @@ BOOL daAlink_c::checkRestartDead(int i_dmgAmount, int i_checkZoraMag) {
     return 0;
 }
 
-/* 80118BF4-80118C98 113534 00A4+00 2/2 0/0 0/0 .text            setDeadRideSyncPos__9daAlink_cFv */
 void daAlink_c::setDeadRideSyncPos() {
     if (checkModeFlg(MODE_RIDING) && mRideAcKeep.getActor() != NULL) {
         if (checkReinRide()) {
@@ -1274,14 +1236,12 @@ void daAlink_c::setDeadRideSyncPos() {
     }
 }
 
-/* 80118C98-80118D7C 1135D8 00E4+00 5/5 0/0 0/0 .text            checkDeadHP__9daAlink_cFv */
 BOOL daAlink_c::checkDeadHP() {
     return ((dComIfGs_getLife() == 0 && !checkResetFlg0(RFLG0_UNK_400)) && !dComIfGs_checkBottle(fpcNm_ITEM_FAIRY)) ||
            checkNoResetFlg2(FLG2_FORCE_GAMEOVER) ||
            (dComIfGp_getOxygenShowFlag() && dComIfGp_getNowOxygen() == 0);
 }
 
-/* 80118D7C-80118FF8 1136BC 027C+00 3/3 0/0 0/0 .text            checkDeadAction__9daAlink_cFi */
 BOOL daAlink_c::checkDeadAction(int param_0) {
     if (!checkEventRun()) {
         if (checkDeadHP() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF && mProcID != PROC_LARGE_DAMAGE && mProcID != PROC_LARGE_DAMAGE_WALL && (param_0 || (mProcID != PROC_LARGE_DAMAGE_UP && mProcID != PROC_WOLF_LARGE_DAMAGE_UP))) {
@@ -1319,8 +1279,6 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
     return 0;
 }
 
-/* 80118FF8-801190A4 113938 00AC+00 1/1 0/0 0/0 .text
- * setHighModelBck__9daAlink_cFP13mDoExt_bckAnmUs               */
 void daAlink_c::setHighModelBck(mDoExt_bckAnm* i_bck, u16 i_anmID) {
     if (i_bck != NULL) {
         J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectIDRes(
@@ -1336,8 +1294,6 @@ void daAlink_c::setHighModelBck(mDoExt_bckAnm* i_bck, u16 i_anmID) {
     }
 }
 
-/* 801190A4-80119134 1139E4 0090+00 1/1 0/0 0/0 .text            setHighModelFaceBtk__9daAlink_cFUs
- */
 void daAlink_c::setHighModelFaceBtk(u16 i_anmID) {
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectIDRes(
         dStage_roomControl_c::getDemoArcName(), i_anmID));
@@ -1351,8 +1307,6 @@ void daAlink_c::setHighModelFaceBtk(u16 i_anmID) {
     }
 }
 
-/* 80119134-801191C4 113A74 0090+00 1/1 0/0 0/0 .text
- * setDemoBrk__9daAlink_cFPP15J3DAnmTevRegKeyP8J3DModelUs       */
 void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 i_anmID) {
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectIDRes(
         dStage_roomControl_c::getDemoArcName(), i_anmID));
@@ -1366,8 +1320,6 @@ void daAlink_c::setDemoBrk(J3DAnmTevRegKey** param_0, J3DModel* param_1, u16 i_a
     }
 }
 
-/* 801191C4-80119464 113B04 02A0+00 1/1 0/0 0/0 .text
- * setStickAnmData__9daAlink_cFP10J3DAnmBaseiiUsi               */
 f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16 param_3,
                                int param_4) {
     dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
@@ -1437,8 +1389,6 @@ f32 daAlink_c::setStickAnmData(J3DAnmBase* i_anm, int param_1, int param_2, u16
     return var_f31;
 }
 
-/* 80119464-801195C0 113DA4 015C+00 1/1 0/0 0/0 .text
- * daAlink_c_getDemoIDData__FP13dDemo_actor_cPiPiPiPUsPiPi      */
 static int daAlink_c_getDemoIDData(dDemo_actor_c* param_0, int* param_1, int* param_2,
                                        int* param_3, u16* param_4, int* param_5, int* param_6) {
     JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > sp30(param_0->getPrm()->getData());
@@ -1467,13 +1417,11 @@ static int daAlink_c_getDemoIDData(dDemo_actor_c* param_0, int* param_1, int* pa
     return 1;
 }
 
-/* 801195C0-801195F8 113F00 0038+00 7/0 0/0 0/0 .text            procDemoCommon__9daAlink_cFv */
 int daAlink_c::procDemoCommon() {
     dComIfGp_evmng_cutEnd(mAlinkStaffId);
     return 1;
 }
 
-/* 801195F8-801196D8 113F38 00E0+00 1/1 0/0 0/0 .text            procCoToolDemoInit__9daAlink_cFv */
 int daAlink_c::procCoToolDemoInit() {
     if (!commonProcInitNotSameProc(PROC_TOOL_DEMO)) {
         return 1;
@@ -1506,7 +1454,6 @@ int daAlink_c::procCoToolDemoInit() {
     return 1;
 }
 
-/* 801196D8-80119D98 114018 06C0+00 1/0 0/0 0/0 .text            procCoToolDemo__9daAlink_cFv */
 int daAlink_c::procCoToolDemo() {
     dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
     BOOL var_r29 = 0;
@@ -1714,7 +1661,6 @@ int daAlink_c::procCoToolDemo() {
 }
 
 
-/* 80119D98-80119F64 1146D8 01CC+00 1/1 0/0 0/0 .text            procCoTalkInit__9daAlink_cFv */
 int daAlink_c::procCoTalkInit() {
     if (mProcID == PROC_TALK) {
         return 0;
@@ -1779,7 +1725,6 @@ int daAlink_c::procCoTalkInit() {
 }
 
 
-/* 80119F64-8011A214 1148A4 02B0+00 1/0 0/0 0/0 .text            procCoTalk__9daAlink_cFv */
 int daAlink_c::procCoTalk() {
     if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) {
         field_0x2f99 = 13;
@@ -1831,7 +1776,6 @@ int daAlink_c::procCoTalk() {
 }
 
 
-/* 8011A214-8011A42C 114B54 0218+00 1/0 0/0 0/0 .text procCoOpenTreasureInit__9daAlink_cFv */
 int daAlink_c::procCoOpenTreasureInit() {
     if (!commonProcInitNotSameProc(PROC_OPEN_TREASURE)) {
         return 1;
@@ -1894,7 +1838,6 @@ int daAlink_c::procCoOpenTreasureInit() {
 }
 
 
-/* 8011A42C-8011A4C0 114D6C 0094+00 1/0 0/0 0/0 .text            procCoOpenTreasure__9daAlink_cFv */
 int daAlink_c::procCoOpenTreasure() {
     onEndResetFlg1(ERFLG1_UNK_8);
 
@@ -1913,7 +1856,6 @@ int daAlink_c::procCoOpenTreasure() {
     return 1;
 }
 
-/* 8011A4C0-8011A5CC 114E00 010C+00 1/0 0/0 0/0 .text            procCoUnequipInit__9daAlink_cFv */
 int daAlink_c::procCoUnequipInit() {
     if (!commonProcInitNotSameProc(PROC_UNEQUIP)) {
         return 0;
@@ -1947,7 +1889,6 @@ int daAlink_c::procCoUnequipInit() {
 }
 
 
-/* 8011A5CC-8011A688 114F0C 00BC+00 1/0 0/0 0/0 .text            procCoUnequip__9daAlink_cFv */
 int daAlink_c::procCoUnequip() {
     if (mProcVar2.field_0x300c != 0) {
         if (checkAnmEnd(mUnderFrameCtrl)) {
@@ -1973,7 +1914,6 @@ int daAlink_c::procCoUnequip() {
     return 1;
 }
 
-/* 8011A688-8011A6FC 114FC8 0074+00 4/4 0/0 0/0 .text            setGetSubBgm__9daAlink_cFi */
 void daAlink_c::setGetSubBgm(int i_seTypeIdx) {
     static u8 const getSeType[255] = {
         0x08, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x08, 0x08, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
@@ -2011,7 +1951,6 @@ void daAlink_c::setGetSubBgm(int i_seTypeIdx) {
     }
 }
 
-/* 8011A6FC-8011A798 11503C 009C+00 1/0 0/0 0/0 .text checkTreasureRupeeReturn__9daAlink_cCFi */
 BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const {
     if (i_itemNo == fpcNm_ITEM_LINKS_SAVINGS) {
         i_itemNo = fpcNm_ITEM_PURPLE_RUPEE;
@@ -2026,7 +1965,6 @@ BOOL daAlink_c::checkTreasureRupeeReturn(int i_itemNo) const {
     return dComIfGs_getRupeeMax() < rupeeCount[i_itemNo] + dComIfGs_getRupee();
 }
 
-/* 8011A798-8011AC28 1150D8 0490+00 2/1 0/0 0/0 .text            procCoGetItemInit__9daAlink_cFv */
 int daAlink_c::procCoGetItemInit() {
     BOOL var_r31 = 0;
     BOOL var_r30 = 0;
@@ -2167,7 +2105,6 @@ int daAlink_c::procCoGetItemInit() {
 }
 
 
-/* 8011AC28-8011B3F0 115568 07C8+00 1/0 0/0 0/0 .text            procCoGetItem__9daAlink_cFv */
 int daAlink_c::procCoGetItem() {
     if (mProcVar4.field_0x3010 != 0) {
         onEndResetFlg1(ERFLG1_UNK_8);
@@ -2366,7 +2303,6 @@ int daAlink_c::procCoGetItem() {
 }
 
 
-/* 8011B3F0-8011B46C 115D30 007C+00 1/0 0/0 0/0 .text            procCoTurnBackInit__9daAlink_cFv */
 int daAlink_c::procCoTurnBackInit() {
     if (!commonProcInitNotSameProc(PROC_TURN_BACK)) {
         return 0;
@@ -2383,7 +2319,6 @@ int daAlink_c::procCoTurnBackInit() {
     return 1;
 }
 
-/* 8011B46C-8011B57C 115DAC 0110+00 1/0 0/0 0/0 .text            procCoTurnBack__9daAlink_cFv */
 int daAlink_c::procCoTurnBack() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2412,7 +2347,6 @@ int daAlink_c::procCoTurnBack() {
 }
 
 
-/* 8011B57C-8011B71C 115EBC 01A0+00 1/0 0/0 0/0 .text            procDoorOpenInit__9daAlink_cFv */
 int daAlink_c::procDoorOpenInit() {
     if (!commonProcInitNotSameProc(PROC_DOOR_OPEN)) {
         return 1;
@@ -2477,7 +2411,6 @@ int daAlink_c::procDoorOpenInit() {
 }
 
 
-/* 8011B71C-8011B914 11605C 01F8+00 1/0 0/0 0/0 .text            procDoorOpen__9daAlink_cFv */
 int daAlink_c::procDoorOpen() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2536,7 +2469,6 @@ int daAlink_c::procDoorOpen() {
 }
 
 
-/* 8011B914-8011BA20 116254 010C+00 1/1 0/0 0/0 .text            procCoLookWaitInit__9daAlink_cFv */
 int daAlink_c::procCoLookWaitInit() {
     if (!commonProcInitNotSameProc(PROC_LOOK_WAIT)) {
         return 0;
@@ -2566,7 +2498,6 @@ int daAlink_c::procCoLookWaitInit() {
 }
 
 
-/* 8011BA20-8011BABC 116360 009C+00 1/0 0/0 0/0 .text            procCoLookWait__9daAlink_cFv */
 int daAlink_c::procCoLookWait() {
     fopAc_ac_c* look_actor_p = getDemoLookActor();
 
@@ -2589,7 +2520,6 @@ int daAlink_c::procCoLookWait() {
     return 1;
 }
 
-/* 8011BABC-8011BB40 1163FC 0084+00 1/0 0/0 0/0 .text procCoDemoPushPullWaitInit__9daAlink_cFv */
 int daAlink_c::procCoDemoPushPullWaitInit() {
     if (!commonProcInitNotSameProc(PROC_DEMO_PUSH_PULL_WAIT)) {
         return 0;
@@ -2606,7 +2536,6 @@ int daAlink_c::procCoDemoPushPullWaitInit() {
     return 1;
 }
 
-/* 8011BB40-8011BC14 116480 00D4+00 1/0 0/0 0/0 .text procCoDemoPushMoveInit__9daAlink_cFv */
 int daAlink_c::procCoDemoPushMoveInit() {
     if (!commonProcInitNotSameProc(PROC_DEMO_PUSH_MOVE)) {
         return 0;
@@ -2632,7 +2561,6 @@ int daAlink_c::procCoDemoPushMoveInit() {
     return 1;
 }
 
-/* 8011BC14-8011BC74 116554 0060+00 2/2 0/0 0/0 .text            setMonkeyMoveAnime__9daAlink_cFv */
 void daAlink_c::setMonkeyMoveAnime() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -2651,7 +2579,6 @@ void daAlink_c::setMonkeyMoveAnime() {
     shape_angle.x = field_0x3088 >> 1;  // divide by 2
 }
 
-/* 8011BC74-8011BD18 1165B4 00A4+00 1/0 0/0 0/0 .text            procMonkeyMoveInit__9daAlink_cFv */
 int daAlink_c::procMonkeyMoveInit() {
     if (!commonProcInitNotSameProc(PROC_MONKEY_MOVE)) {
         return 0;
@@ -2672,7 +2599,6 @@ int daAlink_c::procMonkeyMoveInit() {
     return 1;
 }
 
-/* 8011BD18-8011BD6C 116658 0054+00 1/0 0/0 0/0 .text            procMonkeyMove__9daAlink_cFv */
 int daAlink_c::procMonkeyMove() {
     dComIfGp_evmng_cutEnd(mAlinkStaffId);
 
@@ -2682,7 +2608,6 @@ int daAlink_c::procMonkeyMove() {
     return 1;
 }
 
-/* 8011BD6C-8011BDF0 1166AC 0084+00 1/0 0/0 0/0 .text procDemoBoomerangCatchInit__9daAlink_cFv */
 int daAlink_c::procDemoBoomerangCatchInit() {
     if (!commonProcInitNotSameProc(PROC_DEMO_BOOMERANG_CATCH)) {
         return 0;
@@ -2696,7 +2621,6 @@ int daAlink_c::procDemoBoomerangCatchInit() {
     return 1;
 }
 
-/* 8011BDF0-8011BE54 116730 0064+00 1/0 0/0 0/0 .text procDemoBoomerangCatch__9daAlink_cFv */
 int daAlink_c::procDemoBoomerangCatch() {
     dComIfGp_evmng_cutEnd(mAlinkStaffId);
 
@@ -2706,7 +2630,6 @@ int daAlink_c::procDemoBoomerangCatch() {
     return 1;
 }
 
-/* 8011BE54-8011C1B4 116794 0360+00 2/2 0/0 0/0 .text            procCoDeadInit__9daAlink_cFi */
 int daAlink_c::procCoDeadInit(int param_0) {
     if (!commonProcInitNotSameProc(PROC_DEAD)) {
         return 1;
@@ -2802,7 +2725,6 @@ int daAlink_c::procCoDeadInit(int param_0) {
 }
 
 
-/* 8011C1B4-8011C62C 116AF4 0478+00 1/0 0/0 0/0 .text            procCoDead__9daAlink_cFv */
 int daAlink_c::procCoDead() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2903,8 +2825,6 @@ int daAlink_c::procCoDead() {
 }
 
 
-/* 8011C62C-8011C760 116F6C 0134+00 1/0 0/0 0/0 .text            procCoLookAroundInit__9daAlink_cFv
- */
 int daAlink_c::procCoLookAroundInit() {
     if (!commonProcInitNotSameProc(PROC_LOOK_AROUND)) {
         return 0;
@@ -2933,7 +2853,6 @@ int daAlink_c::procCoLookAroundInit() {
     return 1;
 }
 
-/* 8011C760-8011C81C 1170A0 00BC+00 1/0 0/0 0/0 .text            procCoLookAround__9daAlink_cFv */
 int daAlink_c::procCoLookAround() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -2952,8 +2871,6 @@ int daAlink_c::procCoLookAround() {
     return 1;
 }
 
-/* 8011C81C-8011C890 11715C 0074+00 1/0 0/0 0/0 .text            procBossAtnWaitInit__9daAlink_cFv
- */
 int daAlink_c::procBossAtnWaitInit() {
     if (!commonProcInitNotSameProc(PROC_BOSS_ATN_WAIT)) {
         return 0;
@@ -2965,8 +2882,6 @@ int daAlink_c::procBossAtnWaitInit() {
     return 1;
 }
 
-/* 8011C890-8011C904 1171D0 0074+00 1/0 0/0 0/0 .text            procCoQuakeWaitInit__9daAlink_cFv
- */
 int daAlink_c::procCoQuakeWaitInit() {
     if (!commonProcInitNotSameProc(PROC_QUAKE_WAIT)) {
         return 0;
@@ -2982,7 +2897,6 @@ int daAlink_c::procCoQuakeWaitInit() {
     return 1;
 }
 
-/* 8011C904-8011C9D0 117244 00CC+00 1/0 0/0 0/0 .text            procCoCaughtInit__9daAlink_cFv */
 int daAlink_c::procCoCaughtInit() {
     u32 chk_40000 = checkModeFlg(0x40000);
     if (!commonProcInitNotSameProc(PROC_CAUGHT)) {
@@ -3006,7 +2920,6 @@ int daAlink_c::procCoCaughtInit() {
     return 1;
 }
 
-/* 8011C9D0-8011CA4C 117310 007C+00 1/0 0/0 0/0 .text            procLookUpInit__9daAlink_cFv */
 int daAlink_c::procLookUpInit() {
     if (!commonProcInitNotSameProc(PROC_LOOK_UP)) {
         return 0;
@@ -3019,7 +2932,6 @@ int daAlink_c::procLookUpInit() {
     return 1;
 }
 
-/* 8011CA4C-8011CA98 11738C 004C+00 1/0 0/0 0/0 .text            procLookUp__9daAlink_cFv */
 int daAlink_c::procLookUp() {
     if (field_0x2f99 != 12) {
         field_0x2f99 = 4;
@@ -3029,7 +2941,6 @@ int daAlink_c::procLookUp() {
     return 1;
 }
 
-/* 8011CA98-8011CB20 1173D8 0088+00 1/0 0/0 0/0 .text procLookUpToGetItemInit__9daAlink_cFv */
 int daAlink_c::procLookUpToGetItemInit() {
     if (!commonProcInitNotSameProc(PROC_LOOK_UP_TO_GET_ITEM)) {
         return 0;
@@ -3043,8 +2954,6 @@ int daAlink_c::procLookUpToGetItemInit() {
     return 1;
 }
 
-/* 8011CB20-8011CBD4 117460 00B4+00 1/0 0/0 0/0 .text            procLookUpToGetItem__9daAlink_cFv
- */
 int daAlink_c::procLookUpToGetItem() {
     if (field_0x2f99 != 12) {
         field_0x2f99 = 4;
@@ -3062,7 +2971,6 @@ int daAlink_c::procLookUpToGetItem() {
     return 1;
 }
 
-/* 8011CBD4-8011CCA8 117514 00D4+00 1/0 0/0 0/0 .text            procHandPatInit__9daAlink_cFv */
 int daAlink_c::procHandPatInit() {
     if (!commonProcInitNotSameProc(PROC_HAND_PAT)) {
         return 0;
@@ -3083,7 +2991,6 @@ int daAlink_c::procHandPatInit() {
     return 1;
 }
 
-/* 8011CCA8-8011CDE0 1175E8 0138+00 1/0 0/0 0/0 .text            procHandPat__9daAlink_cFv */
 int daAlink_c::procHandPat() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -3119,7 +3026,6 @@ int daAlink_c::procHandPat() {
 }
 
 
-/* 8011CDE0-8011CF60 117720 0180+00 1/0 0/0 0/0 .text            procCoFogDeadInit__9daAlink_cFv */
 int daAlink_c::procCoFogDeadInit() {
     if (!commonProcInitNotSameProc(PROC_FOG_DEAD)) {
         return 1;
@@ -3157,7 +3063,6 @@ int daAlink_c::procCoFogDeadInit() {
     return 1;
 }
 
-/* 8011CF60-8011D0A0 1178A0 0140+00 1/0 0/0 0/0 .text            procCoFogDead__9daAlink_cFv */
 int daAlink_c::procCoFogDead() {
     if (mLinkAcch.ChkGroundHit() && checkModeFlg(0x2)) {
         offModeFlg(0x2);
@@ -3187,8 +3092,6 @@ int daAlink_c::procCoFogDead() {
 }
 
 
-/* 8011D0A0-8011D110 1179E0 0070+00 1/0 0/0 0/0 .text            procWolfSmellWaitInit__9daAlink_cFv
- */
 int daAlink_c::procWolfSmellWaitInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_SMELL_WAIT)) {
         return 1;
@@ -3201,7 +3104,6 @@ int daAlink_c::procWolfSmellWaitInit() {
     return 1;
 }
 
-/* 8011D110-8011D1F4 117A50 00E4+00 1/0 0/0 0/0 .text            procCoNodInit__9daAlink_cFv */
 int daAlink_c::procCoNodInit() {
     if (!commonProcInitNotSameProc(PROC_NOD)) {
         return 1;
@@ -3229,7 +3131,6 @@ int daAlink_c::procCoNodInit() {
     return 1;
 }
 
-/* 8011D1F4-8011D268 117B34 0074+00 1/0 0/0 0/0 .text            procCoNod__9daAlink_cFv */
 int daAlink_c::procCoNod() {
     if (checkAnmEnd(&mUpperFrameCtrl[2])) {
         mProcVar2.field_0x300c = 1;
@@ -3243,7 +3144,6 @@ int daAlink_c::procCoNod() {
     return 1;
 }
 
-/* 8011D268-8011D304 117BA8 009C+00 1/0 0/0 0/0 .text            procCoEyeAwayInit__9daAlink_cFv */
 int daAlink_c::procCoEyeAwayInit() {
     if (!commonProcInitNotSameProc(PROC_EYE_AWAY)) {
         return 1;
@@ -3261,7 +3161,6 @@ int daAlink_c::procCoEyeAwayInit() {
     return 1;
 }
 
-/* 8011D304-8011D3CC 117C44 00C8+00 1/0 0/0 0/0 .text            procCoGlareInit__9daAlink_cFv */
 int daAlink_c::procCoGlareInit() {
     if (!commonProcInitNotSameProc(PROC_GLARE)) {
         return 1;
@@ -3285,7 +3184,6 @@ int daAlink_c::procCoGlareInit() {
     return 1;
 }
 
-/* 8011D3CC-8011D474 117D0C 00A8+00 1/0 0/0 0/0 .text            procCoGlare__9daAlink_cFv */
 int daAlink_c::procCoGlare() {
     daPy_frameCtrl_c* frame_ctrl = &mUpperFrameCtrl[2];
 
@@ -3309,8 +3207,6 @@ int daAlink_c::procCoGlare() {
     return 1;
 }
 
-/* 8011D474-8011D4D4 117DB4 0060+00 1/0 0/0 0/0 .text            procGoatStopReadyInit__9daAlink_cFv
- */
 int daAlink_c::procGoatStopReadyInit() {
     if (!commonProcInitNotSameProc(PROC_GOAT_STOP_READY)) {
         return 1;
@@ -3322,7 +3218,6 @@ int daAlink_c::procGoatStopReadyInit() {
     return 1;
 }
 
-/* 8011D4D4-8011D544 117E14 0070+00 1/0 0/0 0/0 .text            procGoatStopReady__9daAlink_cFv */
 int daAlink_c::procGoatStopReady() {
     if (checkAnmEnd(mUnderFrameCtrl)) {
         setSingleAnimeBase(ANM_COW_MOVE_LEFT_RIGHT);
@@ -3336,8 +3231,6 @@ int daAlink_c::procGoatStopReady() {
     return 1;
 }
 
-/* 8011D544-8011D64C 117E84 0108+00 2/1 0/0 0/0 .text            procCoGetReadySitInit__9daAlink_cFv
- */
 int daAlink_c::procCoGetReadySitInit() {
     if (mProcID == PROC_GET_READY_SIT ||
         (mProcID == PROC_PREACTION_UNEQUIP && !checkNoUpperAnime()))
@@ -3364,7 +3257,6 @@ int daAlink_c::procCoGetReadySitInit() {
     return 1;
 }
 
-/* 8011D64C-8011D6D0 117F8C 0084+00 1/0 0/0 0/0 .text            procCoGetReadySit__9daAlink_cFv */
 int daAlink_c::procCoGetReadySit() {
     if (checkAnmEnd(mUnderFrameCtrl)) {
         mProcVar2.field_0x300c = 1;
@@ -3381,7 +3273,6 @@ int daAlink_c::procCoGetReadySit() {
     return 1;
 }
 
-/* 8011D6D0-8011D7D4 118010 0104+00 1/0 0/0 0/0 .text            procCoTwGateInit__9daAlink_cFv */
 int daAlink_c::procCoTwGateInit() {
     if (!commonProcInitNotSameProc(PROC_TW_GATE)) {
         return 1;
@@ -3405,7 +3296,6 @@ int daAlink_c::procCoTwGateInit() {
 }
 
 
-/* 8011D7D4-8011D82C 118114 0058+00 1/0 0/0 0/0 .text            procCoTwGate__9daAlink_cFv */
 int daAlink_c::procCoTwGate() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         dComIfGp_evmng_cutEnd(mAlinkStaffId);
@@ -3415,7 +3305,6 @@ int daAlink_c::procCoTwGate() {
     return 1;
 }
 
-/* 8011D82C-8011D8F8 11816C 00CC+00 1/0 0/0 0/0 .text procWolfSnowEscapeInit__9daAlink_cFv */
 int daAlink_c::procWolfSnowEscapeInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_SNOW_ESCAPE)) {
         return 1;
@@ -3433,7 +3322,6 @@ int daAlink_c::procWolfSnowEscapeInit() {
     return 1;
 }
 
-/* 8011D8F8-8011DB04 118238 020C+00 1/0 0/0 0/0 .text            procWolfSnowEscape__9daAlink_cFv */
 int daAlink_c::procWolfSnowEscape() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -3480,7 +3368,6 @@ int daAlink_c::procWolfSnowEscape() {
 }
 
 
-/* 8011DB04-8011DB9C 118444 0098+00 1/0 0/0 0/0 .text            procZoraMoveInit__9daAlink_cFv */
 int daAlink_c::procZoraMoveInit() {
     if (!commonProcInitNotSameProc(PROC_ZORA_MOVE)) {
         return 1;
@@ -3498,7 +3385,6 @@ int daAlink_c::procZoraMoveInit() {
     return 1;
 }
 
-/* 8011DB9C-8011DDD4 1184DC 0238+00 1/0 0/0 0/0 .text            procZoraMove__9daAlink_cFv */
 int daAlink_c::procZoraMove() {
     dComIfGp_evmng_cutEnd(mAlinkStaffId);
     fopAc_ac_c* temp_r29 = dComIfGp_event_getPt1();    
@@ -3526,7 +3412,6 @@ int daAlink_c::procZoraMove() {
     return 1;
 }
 
-/* 8011DDD4-8011DED8 118714 0104+00 1/0 0/0 0/0 .text procLookAroundTurnInit__9daAlink_cFv */
 int daAlink_c::procLookAroundTurnInit() {
     if (!commonProcInitNotSameProc(PROC_LOOK_AROUND_TURN)) {
         return 0;
@@ -3550,7 +3435,6 @@ int daAlink_c::procLookAroundTurnInit() {
     return 1;
 }
 
-/* 8011DED8-8011DF68 118818 0090+00 1/0 0/0 0/0 .text            procLookAroundTurn__9daAlink_cFv */
 int daAlink_c::procLookAroundTurn() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -3563,8 +3447,6 @@ int daAlink_c::procLookAroundTurn() {
     return 1;
 }
 
-/* 8011DF68-8011E060 1188A8 00F8+00 1/0 0/0 0/0 .text            procTradeItemOutInit__9daAlink_cFv
- */
 int daAlink_c::procTradeItemOutInit() {
     if (!commonProcInitNotSameProc(PROC_TRADE_ITEM_OUT)) {
         return 0;
@@ -3599,7 +3481,6 @@ int daAlink_c::procTradeItemOutInit() {
     return 1;
 }
 
-/* 8011E060-8011E3D8 1189A0 0378+00 1/0 0/0 0/0 .text            procTradeItemOut__9daAlink_cFv */
 int daAlink_c::procTradeItemOut() {
     setShapeAngleToTalkActor();
 
@@ -3677,13 +3558,11 @@ int daAlink_c::procTradeItemOut() {
 }
 
 
-/* 8011E3D8-8011E448 118D18 0070+00 2/2 0/0 0/0 .text            checkLetterItem__9daAlink_cFi */
 BOOL daAlink_c::checkLetterItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_LETTER || i_itemNo == fpcNm_ITEM_BILL || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO ||
            i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING;
 }
 
-/* 8011E448-8011E57C 118D88 0134+00 1/1 0/0 0/0 .text            procNotUseItemInit__9daAlink_cFi */
 int daAlink_c::procNotUseItemInit(int param_0) {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
         return 0;
@@ -3714,7 +3593,6 @@ int daAlink_c::procNotUseItemInit(int param_0) {
 }
 
 
-/* 8011E57C-8011E6E0 118EBC 0164+00 1/0 0/0 0/0 .text            procNotUseItem__9daAlink_cFv */
 int daAlink_c::procNotUseItem() {
     if (mProcVar2.field_0x300c == 0) {
         fpc_ProcID item_partner_id = fopAcM_createItemForPresentDemo(
@@ -3763,7 +3641,6 @@ int daAlink_c::procNotUseItem() {
     return 1;
 }
 
-/* 8011E6E0-8011E748 119020 0068+00 1/0 0/0 0/0 .text            procSwordReadyInit__9daAlink_cFv */
 int daAlink_c::procSwordReadyInit() {
     if (!commonProcInitNotSameProc(PROC_SWORD_READY)) {
         return 0;
@@ -3776,7 +3653,6 @@ int daAlink_c::procSwordReadyInit() {
     return 1;
 }
 
-/* 8011E748-8011E83C 119088 00F4+00 1/0 0/0 0/0 .text            procSwordReady__9daAlink_cFv */
 int daAlink_c::procSwordReady() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -3798,7 +3674,6 @@ int daAlink_c::procSwordReady() {
     return 1;
 }
 
-/* 8011E83C-8011E8E0 11917C 00A4+00 2/2 0/0 0/0 .text            setSwordPushAnime__9daAlink_cFv */
 void daAlink_c::setSwordPushAnime() {
     daAlink_ANM anm_id = (daAlink_ANM)(mDemo.getParam0() + ANM_GANON_CHANCE);
     if (field_0x3198 != anm_id) {
@@ -3814,7 +3689,6 @@ void daAlink_c::setSwordPushAnime() {
     }
 }
 
-/* 8011E8E0-8011E960 119220 0080+00 1/0 0/0 0/0 .text            procSwordPushInit__9daAlink_cFv */
 int daAlink_c::procSwordPushInit() {
     if (!commonProcInitNotSameProc(PROC_SWORD_PUSH)) {
         return 1;
@@ -3828,7 +3702,6 @@ int daAlink_c::procSwordPushInit() {
     return 1;
 }
 
-/* 8011E960-8011E9F8 1192A0 0098+00 1/0 0/0 0/0 .text            procSwordPush__9daAlink_cFv */
 int daAlink_c::procSwordPush() {
     field_0x2f99 = 4;
     onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -3845,8 +3718,6 @@ int daAlink_c::procSwordPush() {
     return 1;
 }
 
-/* 8011E9F8-8011EA78 119338 0080+00 1/0 0/0 0/0 .text            procGanonFinishInit__9daAlink_cFv
- */
 int daAlink_c::procGanonFinishInit() {
     if (!commonProcInitNotSameProc(PROC_GANON_FINISH)) {
         return 1;
@@ -3862,7 +3733,6 @@ int daAlink_c::procGanonFinishInit() {
     return 1;
 }
 
-/* 8011EA78-8011EAE8 1193B8 0070+00 1/0 0/0 0/0 .text            procGanonFinish__9daAlink_cFv */
 int daAlink_c::procGanonFinish() {
     onEndResetFlg1(ERFLG1_GANON_FINISH);
     current.pos = field_0x37c8;
@@ -3874,8 +3744,6 @@ int daAlink_c::procGanonFinish() {
     return 1;
 }
 
-/* 8011EAE8-8011EB8C 119428 00A4+00 1/0 0/0 0/0 .text            procCutFastReadyInit__9daAlink_cFv
- */
 int daAlink_c::procCutFastReadyInit() {
     if (!commonProcInitNotSameProc(PROC_CUT_FAST_READY)) {
         return 0;
@@ -3891,7 +3759,6 @@ int daAlink_c::procCutFastReadyInit() {
     return 1;
 }
 
-/* 8011EB8C-8011EBDC 1194CC 0050+00 1/0 0/0 0/0 .text            procCutFastReady__9daAlink_cFv */
 int daAlink_c::procCutFastReady() {
     if (checkAnmEnd(&mUpperFrameCtrl[2])) {
         dComIfGp_evmng_cutEnd(mAlinkStaffId);
@@ -3900,7 +3767,6 @@ int daAlink_c::procCutFastReady() {
     return 1;
 }
 
-/* 8011EBDC-8011EC60 11951C 0084+00 1/0 0/0 0/0 .text procMasterSwordStickInit__9daAlink_cFv */
 int daAlink_c::procMasterSwordStickInit() {
     if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_STICK)) {
         return 0;
@@ -3915,8 +3781,6 @@ int daAlink_c::procMasterSwordStickInit() {
     return 1;
 }
 
-/* 8011EC60-8011ED18 1195A0 00B8+00 1/0 0/0 0/0 .text            procMasterSwordStick__9daAlink_cFv
- */
 int daAlink_c::procMasterSwordStick() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -3933,7 +3797,6 @@ int daAlink_c::procMasterSwordStick() {
     return 1;
 }
 
-/* 8011ED18-8011ED8C 119658 0074+00 1/0 0/0 0/0 .text procMasterSwordPullInit__9daAlink_cFv */
 int daAlink_c::procMasterSwordPullInit() {
     if (!commonProcInitNotSameProc(PROC_MASTER_SWORD_PULL)) {
         return 0;
@@ -3946,8 +3809,6 @@ int daAlink_c::procMasterSwordPullInit() {
     return 1;
 }
 
-/* 8011ED8C-8011EE40 1196CC 00B4+00 1/0 0/0 0/0 .text            procMasterSwordPull__9daAlink_cFv
- */
 int daAlink_c::procMasterSwordPull() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -3964,13 +3825,10 @@ int daAlink_c::procMasterSwordPull() {
     return 1;
 }
 
-/* 8011EE40-8011EE94 119780 0054+00 5/5 0/0 0/0 .text            checkLv7DungeonShop__9daAlink_cFv
- */
 BOOL daAlink_c::checkLv7DungeonShop() {
     return checkStageName("D_MN07") && dComIfGp_roomControl_getStayNo() == 16;
 }
 
-/* 8011EE94-8011EFB8 1197D4 0124+00 1/1 0/0 0/0 .text procDungeonWarpReadyInit__9daAlink_cFv */
 int daAlink_c::procDungeonWarpReadyInit() {
     if (!dComIfGp_event_compulsory(this, NULL, -1)) {
         return 0;
@@ -4001,8 +3859,6 @@ int daAlink_c::procDungeonWarpReadyInit() {
     return 1;
 }
 
-/* 8011EFB8-8011F084 1198F8 00CC+00 1/0 0/0 0/0 .text            procDungeonWarpReady__9daAlink_cFv
- */
 int daAlink_c::procDungeonWarpReady() {
     if (mProcVar2.field_0x300c != 0) {
         fopAc_ac_c* temp_r3 = fopAcM_SearchByID(field_0x32cc);
@@ -4026,8 +3882,6 @@ int daAlink_c::procDungeonWarpReady() {
     return 1;
 }
 
-/* 8011F084-8011F0F4 1199C4 0070+00 1/0 0/0 0/0 .text            procDungeonWarpInit__9daAlink_cFv
- */
 int daAlink_c::procDungeonWarpInit() {
     if (!commonProcInitNotSameProc(PROC_DUNGEON_WARP)) {
         return 0;
@@ -4042,7 +3896,6 @@ int daAlink_c::procDungeonWarpInit() {
     return 1;
 }
 
-/* 8011F0F4-8011F360 119A34 026C+00 1/0 0/0 0/0 .text            procDungeonWarp__9daAlink_cFv */
 int daAlink_c::procDungeonWarp() {
     mProcVar2.field_0x300c += 0x200;
 
@@ -4096,8 +3949,6 @@ int daAlink_c::procDungeonWarp() {
 }
 
 
-/* 8011F360-8011F460 119CA0 0100+00 2/1 0/0 0/0 .text procDungeonWarpSceneStartInit__9daAlink_cFv
- */
 int daAlink_c::procDungeonWarpSceneStartInit() {
     commonProcInit(PROC_DUNGEON_WARP_SCN_START);
 
@@ -4122,7 +3973,6 @@ int daAlink_c::procDungeonWarpSceneStartInit() {
 }
 
 
-/* 8011F460-8011F5D4 119DA0 0174+00 1/0 0/0 0/0 .text procDungeonWarpSceneStart__9daAlink_cFv */
 int daAlink_c::procDungeonWarpSceneStart() {
     if (mProcVar4.field_0x3010 == 0) {
         mProcVar4.field_0x3010 = 1;
@@ -4156,7 +4006,6 @@ int daAlink_c::procDungeonWarpSceneStart() {
 }
 
 
-/* 8011F5D4-8011F658 119F14 0084+00 2/2 0/0 0/0 .text daAlink_searchPortal__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_KYTAG04) {
         cXyz* pos = (cXyz*)i_data;
@@ -4169,7 +4018,6 @@ static fopAc_ac_c* daAlink_searchPortal(fopAc_ac_c* i_actor, void* i_data) {
 }
 
 
-/* 8011F658-8011F7D8 119F98 0180+00 1/1 0/0 0/0 .text            checkAcceptWarp__9daAlink_cFv */
 bool daAlink_c::checkAcceptWarp() {
     #if VERSION != VERSION_WII_USA_R0
     cM3dGPla plane;
@@ -4207,7 +4055,6 @@ bool daAlink_c::checkAcceptWarp() {
 }
 
 
-/* 8011F7D8-8011F8B8 11A118 00E0+00 2/2 0/0 0/0 .text            dungeonReturnWarp__9daAlink_cFv */
 void daAlink_c::dungeonReturnWarp() {
     cXyz pos = dComIfGs_getWarpPlayerPos();
     s16 angle = dComIfGs_getWarpPlayerAngleY();
@@ -4222,7 +4069,6 @@ void daAlink_c::dungeonReturnWarp() {
     dComIfGs_setRestartRoomParam(data);
 }
 
-/* 8011F8B8-8011F9EC 11A1F8 0134+00 1/0 0/0 0/0 .text            skipPortalObjWarp__9daAlink_cFv */
 void daAlink_c::skipPortalObjWarp() {
     if (mProcID == PROC_WARP && mProcVar3.field_0x300e <= 0) {
         return;
@@ -4245,7 +4091,6 @@ void daAlink_c::skipPortalObjWarp() {
     }
 }
 
-/* 8011F9EC-8011FBC0 11A32C 01D4+00 1/1 0/0 0/0 .text            checkWarpStart__9daAlink_cFv */
 void daAlink_c::checkWarpStart() {
     static char defaultPortal[13] = "POTAL_WARPIN";
     static char kBridgePortal[20] = "PORTAL_WARP_KBRIDGE";
@@ -4303,7 +4148,6 @@ void daAlink_c::checkWarpStart() {
     }
 }
 
-/* 8011FBC0-8011FD4C 11A500 018C+00 3/3 0/0 0/0 .text            warpModelTexScroll__9daAlink_cFv */
 int daAlink_c::warpModelTexScroll() {
     field_0x3478 += 0.15f;
     if (field_0x3478 >= 1.0f) {
@@ -4330,7 +4174,6 @@ int daAlink_c::warpModelTexScroll() {
     return temp_r30;
 }
 
-/* 8011FD4C-80120124 11A68C 03D8+00 2/2 0/0 0/0 .text            procCoWarpInit__9daAlink_cFii */
 int daAlink_c::procCoWarpInit(int param_0, int param_1) {
     if (!commonProcInitNotSameProc(PROC_WARP)) {
         return 0;
@@ -4456,7 +4299,6 @@ int daAlink_c::procCoWarpInit(int param_0, int param_1) {
 }
 
 
-/* 80120124-80120440 11AA64 031C+00 1/0 0/0 0/0 .text            procCoWarp__9daAlink_cFv */
 int daAlink_c::procCoWarp() {
     if (mProcVar1.field_0x300a != 0 && mLinkAcch.ChkGroundHit()) {
         mProcVar1.field_0x300a = 0;
@@ -4532,7 +4374,6 @@ int daAlink_c::procCoWarp() {
 }
 
 
-/* 80120440-80120474 11AD80 0034+00 1/0 0/0 0/0 .text            commonWaitTurnInit__9daAlink_cFv */
 int daAlink_c::commonWaitTurnInit() {
     if (checkWolf()) {
         return procWolfWaitTurnInit();
@@ -4541,7 +4382,6 @@ int daAlink_c::commonWaitTurnInit() {
     }
 }
 
-/* 80120474-80120500 11ADB4 008C+00 2/1 0/0 0/0 .text            commonGrabPutInit__9daAlink_cFv */
 int daAlink_c::commonGrabPutInit() {
     if (mGrabItemAcKeep.getActor() == NULL) {
         if (mProcID != PROC_GRAB_STAND &&
@@ -4559,7 +4399,6 @@ int daAlink_c::commonGrabPutInit() {
     return procGrabPutInit();
 }
 
-/* 80120500-80120534 11AE40 0034+00 3/3 0/0 0/0 .text commonLargeDamageUpInit__9daAlink_cFiiss */
 int daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) {
     if (checkWolf()) {
         return procWolfLargeDamageUpInit(param_0, param_1, param_2, param_3);
@@ -4568,7 +4407,6 @@ int daAlink_c::commonLargeDamageUpInit(int param_0, int param_1, s16 param_2, s1
     }
 }
 
-/* 80120534-80120580 11AE74 004C+00 4/4 0/0 0/0 .text            commonFallInit__9daAlink_cFi */
 int daAlink_c::commonFallInit(int param_0) {
     if (checkWolf()) {
         return procWolfFallInit(param_0, daAlinkHIO_wlAutoJump_c0::m.mNormalFallInterp);
diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc
index 3e89bf1ce6..55b345bcd4 100644
--- a/src/d/actor/d_a_alink_effect.inc
+++ b/src/d/actor/d_a_alink_effect.inc
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_k_wmark.h"
 
-/* 803B2CEC-803B2D34 00FE0C 0048+00 1/2 0/0 0/0 .data            m_fEffParamProc__9daAlink_c */
 EffParamProc daAlink_c::m_fEffParamProc[] = {
     &daAlink_c::setEffectFrontRollParam,
     &daAlink_c::setEffectSlipParam,
@@ -19,8 +18,6 @@ EffParamProc daAlink_c::m_fEffParamProc[] = {
     &daAlink_c::setEffectSumouParam,
 };
 
-/* 80120580-80120634 11AEC0 00B4+00 21/21 0/0 0/0 .text
- * setEmitter__9daAlink_cFPUlUsPC4cXyzPC5csXyz                  */
 JPABaseEmitter* daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* param_2,
                                       csXyz const* param_3) {
     *param_0 = dComIfGp_particle_set(*param_0, param_1, param_2, &tevStr, param_3, NULL, 0xFF, NULL,
@@ -29,8 +26,6 @@ JPABaseEmitter* daAlink_c::setEmitter(u32* param_0, u16 param_1, cXyz const* par
     return dComIfGp_particle_getEmitter(*param_0);
 }
 
-/* 80120634-801206C4 11AF74 0090+00 4/4 0/0 0/0 .text
- * setEmitterPolyColor__9daAlink_cFPUlUsR13cBgS_PolyInfoPC4cXyzPC5csXyz */
 JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_PolyInfo& param_2,
                                                cXyz const* param_3, csXyz const* param_4) {
     *param_0 = dComIfGp_particle_setPolyColor(*param_0, param_1, param_2, param_3, &tevStr, param_4,
@@ -40,8 +35,6 @@ JPABaseEmitter* daAlink_c::setEmitterPolyColor(u32* param_0, u16 param_1, cBgS_P
     return dComIfGp_particle_getEmitter(*param_0);
 }
 
-/* 801206C4-80120778 11B004 00B4+00 2/2 0/0 0/0 .text
- * setEmitterColor__9daAlink_cFPUlUsPC4cXyzPC5csXyz             */
 JPABaseEmitter* daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const* param_2,
                                            csXyz const* param_3) {
     *param_0 = dComIfGp_particle_setColor(*param_0, param_1, param_2, &tevStr, NULL, NULL, 0.0f, -1,
@@ -51,7 +44,6 @@ JPABaseEmitter* daAlink_c::setEmitterColor(u32* param_0, u16 param_1, cXyz const
     return dComIfGp_particle_getEmitter(*param_0);
 }
 
-/* 80120778-801207BC 11B0B8 0044+00 9/9 0/0 0/0 .text            stopDrawParticle__9daAlink_cFUl */
 void daAlink_c::stopDrawParticle(u32 param_0) {
     JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(param_0);
 
@@ -60,7 +52,6 @@ void daAlink_c::stopDrawParticle(u32 param_0) {
     }
 }
 
-/* 801207BC-80120880 11B0FC 00C4+00 1/0 0/0 0/0 .text setEffectFrontRollParam__9daAlink_cFv */
 void daAlink_c::setEffectFrontRollParam() {
     int j, i;
 
@@ -77,7 +68,6 @@ void daAlink_c::setEffectFrontRollParam() {
     }
 }
 
-/* 80120880-80120B00 11B1C0 0280+00 1/0 0/0 0/0 .text            setEffectSlipParam__9daAlink_cFv */
 void daAlink_c::setEffectSlipParam() {
     JGeometry::TVec3<f32> sp30;
 
@@ -141,7 +131,6 @@ void daAlink_c::setEffectSlipParam() {
     }
 }
 
-/* 80120B00-80120DB0 11B440 02B0+00 1/0 0/0 0/0 .text            setEffectRunParam__9daAlink_cFv */
 void daAlink_c::setEffectRunParam() {
     static Vec const waterScale = {0.57999998f, 0.57999998f, 0.57999998f};
     static Vec const waterCenterScale = {1.2f, 1.2f, 1.2f};
@@ -203,7 +192,6 @@ void daAlink_c::setEffectRunParam() {
     }
 }
 
-/* 80120DB0-80121000 11B6F0 0250+00 1/0 0/0 0/0 .text setEffectSmallLandParam__9daAlink_cFv */
 void daAlink_c::setEffectSmallLandParam() {
     static Vec const smokeParticleScale = {0.8f, 0.8f, 0.8f};
     static Vec const waterScale = {1.25f, 1.25f, 1.25f};
@@ -254,11 +242,8 @@ void daAlink_c::setEffectSmallLandParam() {
     }
 }
 
-/* 80121000-80121004 11B940 0004+00 1/0 0/0 0/0 .text            setEffectLandParam__9daAlink_cFv */
 void daAlink_c::setEffectLandParam() {}
 
-/* 80121004-801211C0 11B944 01BC+00 1/0 0/0 0/0 .text            setEffectSumouParam__9daAlink_cFv
- */
 void daAlink_c::setEffectSumouParam() {
     static Vec const shikoScale = {0.69999999f, 0.69999999f, 0.69999999f};
     static Vec const pushedSlip = {0.8f, 0.8f, 0.8f};
@@ -297,7 +282,6 @@ void daAlink_c::setEffectSumouParam() {
     }
 }
 
-/* 801211C0-80121214 11BB00 0054+00 46/46 0/0 0/0 .text setFootEffectProcType__9daAlink_cFi */
 void daAlink_c::setFootEffectProcType(int param_0) {
     if (param_0 != field_0x2f9f) {
         field_0x2e54.clearFourAllID();
@@ -307,7 +291,6 @@ void daAlink_c::setFootEffectProcType(int param_0) {
     field_0x2f9f = mEffProc;
 }
 
-/* 80121214-80121304 11BB54 00F0+00 1/1 0/0 0/0 .text            setWolfFootOn__9daAlink_cFi */
 void daAlink_c::setWolfFootOn(int param_0) {
     daPy_frameCtrl_c* temp_r31 = &mUnderFrameCtrl[1];
 
@@ -322,15 +305,12 @@ void daAlink_c::setWolfFootOn(int param_0) {
     }
 }
 
-/* 80121304-80121388 11BC44 0084+00 1/1 0/0 0/0 .text            setFootMark__9daAlink_cFP4cXyzUsi
- */
 void daAlink_c::setFootMark(cXyz* i_pos, u16 i_mtxNo, int param_2) {
     cXyz sp8;
     mDoMtx_multVecSR(mpLinkModel->getAnmMtx(i_mtxNo), &cXyz::BaseX, &sp8);
     dkWmark_c::setFootMark(i_pos, sp8.atan2sX_Z(), param_2);
 }
 
-/* 80121388-801221F0 11BCC8 0E68+00 1/1 0/0 0/0 .text            setEffect__9daAlink_cFv */
 void daAlink_c::setEffect() {
     if (mProcID == PROC_CUT_TURN || mProcID == PROC_BOARD_CUT_TURN) {
         setCutTurnEffect();
@@ -658,7 +638,6 @@ void daAlink_c::setEffect() {
     setFirePointDamageEffect();
 }
 
-/* 801221F0-801225E8 11CB30 03F8+00 1/1 0/0 0/0 .text            setSumouEffect__9daAlink_cFv */
 void daAlink_c::setSumouEffect() {
     static Vec const releaeScale = {0.8f, 0.8f, 0.8f};
 
@@ -742,13 +721,11 @@ void daAlink_c::setSumouEffect() {
     }
 }
 
-/* 801225E8-80122654 11CF28 006C+00 1/1 0/0 0/0 .text setWaterfallEffect__9daAlink_cFPC4cXyzPUl */
 void daAlink_c::setWaterfallEffect(cXyz const* param_0, u32* param_1) {
     setEmitter(&param_1[0], 0x8614, param_0, NULL);
     setEmitter(&param_1[1], 0x8615, param_0, NULL);
 }
 
-/* 80122654-8012277C 11CF94 0128+00 1/1 0/0 0/0 .text            setWaterfallEffect__9daAlink_cFv */
 void daAlink_c::setWaterfallEffect() {
     Vec sp8;
     if (checkEndResetFlg1(ERFLG1_UNK_800)) {
@@ -773,8 +750,6 @@ void daAlink_c::setWaterfallEffect() {
     }
 }
 
-/* 8012277C-801228F4 11D0BC 0178+00 1/1 0/0 0/0 .text            setMagneBootsEffect__9daAlink_cFv
- */
 void daAlink_c::setMagneBootsEffect() {
     static const u16 effName[] = {
         0x0407,
@@ -813,8 +788,6 @@ void daAlink_c::setMagneBootsEffect() {
     }
 }
 
-/* 801228F4-80122BBC 11D234 02C8+00 1/1 0/0 0/0 .text            setSwordChargeEffect__9daAlink_cFv
- */
 void daAlink_c::setSwordChargeEffect() {
     static Vec const lightAParticleScale = {1.0f, 1.171f, 1.0f};
     static Vec const lightALocalTrans = {68.0f, 0.0f, 0.0f};
@@ -882,8 +855,6 @@ void daAlink_c::setSwordChargeEffect() {
     }
 }
 
-/* 80122BBC-80122F18 11D4FC 035C+00 1/1 0/0 0/0 .text            setElecDamageEffect__9daAlink_cFv
- */
 void daAlink_c::setElecDamageEffect() {
     static Vec const localOffset = {0.0f, -10.0f, -10.0f};
     static Vec const localScale0 = {0.69999999f, 0.85f, 1.5f};
@@ -930,8 +901,6 @@ void daAlink_c::setElecDamageEffect() {
     }
 }
 
-/* 80122F18-80122F78 11D858 0060+00 1/1 0/0 0/0 .text            clearCutTurnEffectID__9daAlink_cFv
- */
 void daAlink_c::clearCutTurnEffectID() {
     for (int i = 0; i < 6; i++) {
         stopDrawParticle(field_0x3204[i]);
@@ -939,7 +908,6 @@ void daAlink_c::clearCutTurnEffectID() {
     }
 }
 
-/* 80122F78-801233A4 11D8B8 042C+00 1/1 0/0 0/0 .text            setCutTurnEffect__9daAlink_cFv */
 void daAlink_c::setCutTurnEffect() {
     static const u16 effNameNormal[] = {
         0x0159,
@@ -1079,8 +1047,6 @@ void daAlink_c::setCutTurnEffect() {
     }
 }
 
-/* 801233A4-80123434 11DCE4 0090+00 1/1 0/0 0/0 .text            setHorseCutTurnEffect__9daAlink_cFv
- */
 void daAlink_c::setHorseCutTurnEffect() {
     cXyz sp20;
     csXyz sp28(0, shape_angle.y, shape_angle.z);
@@ -1090,7 +1056,6 @@ void daAlink_c::setHorseCutTurnEffect() {
     setEmitter(&field_0x3204[1], 0x1F1, &sp20, &sp28);
 }
 
-/* 80123434-801236BC 11DD74 0288+00 1/1 0/0 0/0 .text setCutLargeJumpLandEffect__9daAlink_cFv */
 void daAlink_c::setCutLargeJumpLandEffect() {
     cXyz sp50(current.pos.x + cM_ssin(shape_angle.y) * 20.0f, current.pos.y + 50.0f, current.pos.z + cM_scos(shape_angle.y) * 20.0f);
     csXyz sp58;
@@ -1116,8 +1081,6 @@ void daAlink_c::setCutLargeJumpLandEffect() {
     }
 }
 
-/* 801236BC-801237A8 11DFFC 00EC+00 1/1 0/0 0/0 .text            setBootsLightEffect__9daAlink_cFv
- */
 void daAlink_c::setBootsLightEffect() {
     static const u16 jointID[] = {0x0014, 0x0013, 0x0018, 0x0019};
     static const u16 effName[] = {0x88E1, 0x88E2, 0x88E3, 0x88E4};
@@ -1136,7 +1099,6 @@ void daAlink_c::setBootsLightEffect() {
     }
 }
 
-/* 801237A8-801238FC 11E0E8 0154+00 1/1 0/0 0/0 .text setLightningSwordEffect__9daAlink_cFv */
 void daAlink_c::setLightningSwordEffect() {
     static const u16 effName[] = {0x0A58, 0x0A59, 0x0B9D};
 
@@ -1168,7 +1130,6 @@ void daAlink_c::setLightningSwordEffect() {
     }
 }
 
-/* 801238FC-801239B0 11E23C 00B4+00 1/1 0/0 0/0 .text setWolfRollAttackEffect__9daAlink_cFv */
 void daAlink_c::setWolfRollAttackEffect() {
     cXyz sp20(current.pos.x, current.pos.y + 80.0f, current.pos.z);
     csXyz sp28(shape_angle.x, shape_angle.y, 0);
@@ -1183,7 +1144,6 @@ void daAlink_c::setWolfRollAttackEffect() {
     }
 }
 
-/* 801239B0-80123BF0 11E2F0 0240+00 1/1 0/0 0/0 .text            setWolfDigEffect__9daAlink_cFv */
 void daAlink_c::setWolfDigEffect() {
     if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo2)) {
         f32 var_f31 = 3.0f;
@@ -1242,8 +1202,6 @@ void daAlink_c::setWolfDigEffect() {
     }
 }
 
-/* 80123BF0-80123C8C 11E530 009C+00 2/2 0/0 0/0 .text
- * setWolfSwimEndEffect__9daAlink_cFPP14JPABaseEmitterPP14JPABaseEmitter */
 void daAlink_c::setWolfSwimEndEffect(JPABaseEmitter** param_0, JPABaseEmitter** param_1) {
     static const u16 name0[] = {
         0x02A3,
@@ -1268,7 +1226,6 @@ void daAlink_c::setWolfSwimEndEffect(JPABaseEmitter** param_0, JPABaseEmitter**
     }
 }
 
-/* 80123C8C-80123D88 11E5CC 00FC+00 1/1 0/0 0/0 .text setWolfLockAttackEffect__9daAlink_cFv */
 void daAlink_c::setWolfLockAttackEffect() {
     static const u16 effID[] = {
         0x0244,
@@ -1306,7 +1263,6 @@ void daAlink_c::setWolfLockAttackEffect() {
     }
 }
 
-/* 80123D88-80123ED0 11E6C8 0148+00 1/1 0/0 0/0 .text setWolfJumpAttackEffect__9daAlink_cFv */
 void daAlink_c::setWolfJumpAttackEffect() {
     cXyz sp8;
 
@@ -1343,8 +1299,6 @@ void daAlink_c::setWolfJumpAttackEffect() {
     }
 }
 
-/* 80123ED0-80124144 11E810 0274+00 2/2 0/0 0/0 .text
- * setWolfBarrierHitEffect__9daAlink_cFR11dBgS_LinChk           */
 void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) {
     static const u16 normalNameID[] = {
         0x8390,
@@ -1378,8 +1332,6 @@ void daAlink_c::setWolfBarrierHitEffect(dBgS_LinChk& param_0) {
     field_0x3100 = 3;
 }
 
-/* 80124144-801241E0 11EA84 009C+00 9/9 0/0 0/0 .text            setCutWaterDropEffect__9daAlink_cFv
- */
 void daAlink_c::setCutWaterDropEffect() {
     if (field_0x32c0[0] > 0) {
         cXyz sp18;
@@ -1389,7 +1341,6 @@ void daAlink_c::setCutWaterDropEffect() {
     }
 }
 
-/* 801241E0-801244E4 11EB20 0304+00 1/1 0/0 0/0 .text            setWaterDropEffect__9daAlink_cFv */
 void daAlink_c::setWaterDropEffect() {
     static const u16 effDataTable[] = {
         0x02A5, 0x02A6, 0x02A7, 0x02A8,
@@ -1470,8 +1421,6 @@ void daAlink_c::setWaterDropEffect() {
     }
 }
 
-/* 801244E4-801245EC 11EE24 0108+00 1/1 0/0 0/0 .text            setSwordUpColorEffect__9daAlink_cFv
- */
 void daAlink_c::setSwordUpColorEffect() {
     f32 max_intensity;
     if (mSwordUpTimer != 0) {
@@ -1489,7 +1438,6 @@ void daAlink_c::setSwordUpColorEffect() {
     }
 }
 
-/* 801245EC-80124738 11EF2C 014C+00 1/1 0/0 0/0 .text            setSwordCutSplash__9daAlink_cFv */
 void daAlink_c::setSwordCutSplash() {
     static const u16 cutSplashName[] = {0x01B8, 0x01B9, 0x01BA, 0x01BB};
     static Vec const swordCutSplashScale = {0.6f, 0.6f, 0.6f};
@@ -1515,16 +1463,12 @@ void daAlink_c::setSwordCutSplash() {
     }
 }
 
-/* 80124738-801247A8 11F078 0070+00 1/1 0/0 0/0 .text setMetamorphoseEffectStartLink__9daAlink_cFv
- */
 void daAlink_c::setMetamorphoseEffectStartLink() {
     setEmitter(&field_0x31f8, 0x24F, &field_0x37c8, NULL);
     setEmitter(&field_0x31fc, 0x250, &field_0x37c8, NULL);
     setEmitter(&field_0x3200, 0x6E8, &cXyz::Zero, NULL);
 }
 
-/* 801247A8-801248A8 11F0E8 0100+00 1/1 0/0 0/0 .text            setMetamorphoseEffect__9daAlink_cFv
- */
 void daAlink_c::setMetamorphoseEffect() {
     if (mProcVar1.field_0x300a == 0) {
         if (mProcVar5.field_0x3012 != 0) {
@@ -1547,7 +1491,6 @@ void daAlink_c::setMetamorphoseEffect() {
     }
 }
 
-/* 801248A8-80124A2C 11F1E8 0184+00 1/1 0/0 0/0 .text            setRunSplash__9daAlink_cFv */
 void daAlink_c::setRunSplash() {
     if (mProcID == PROC_MOVE && checkNoResetFlg0(FLG0_UNK_80) && checkDashAnime()) {
         f32 temp_f31 = mWaterY - current.pos.y;
@@ -1573,8 +1516,6 @@ void daAlink_c::setRunSplash() {
     }
 }
 
-/* 80124A2C-80124B68 11F36C 013C+00 1/0 0/0 0/0 .text
- * execute__29dAlink_bottleWaterPcallBack_cFP14JPABaseEmitterP15JPABaseParticle */
 void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     JGeometry::TVec3<f32> sp18;
     param_1->getGlobalPosition(sp18);
@@ -1612,13 +1553,11 @@ void dAlink_bottleWaterPcallBack_c::execute(JPABaseEmitter* param_0, JPABasePart
     }
 }
 
-/* 80124B68-80124BA4 11F4A8 003C+00 2/2 0/0 0/0 .text            resetFairyEffect__9daAlink_cFv */
 void daAlink_c::resetFairyEffect() {
     stopDrawParticle(field_0x3258);
     stopDrawParticle(field_0x325c);
 }
 
-/* 80124BA4-80124E28 11F4E4 0284+00 1/1 0/0 0/0 .text            setBottleEffect__9daAlink_cFv */
 void daAlink_c::setBottleEffect() {
     static Vec const fairyScale = {0.5f, 0.5f, 0.5f};
     static Vec const chuchuLocalOffset = {0.0f, 15.0f, 0.0f};
@@ -1661,7 +1600,6 @@ void daAlink_c::setBottleEffect() {
     }
 }
 
-/* 80124E28-80124EA8 11F768 0080+00 2/2 0/0 0/0 .text clearFirePointDamageEffect__9daAlink_cFi */
 void daAlink_c::clearFirePointDamageEffect(int i_effNo) {
     firePointEff_c* fire_eff = &field_0x32d8[i_effNo];
 
@@ -1673,8 +1611,6 @@ void daAlink_c::clearFirePointDamageEffect(int i_effNo) {
     fire_eff->field_0x24 = cXyz::Zero;
 }
 
-/* 80124EA8-80124FA4 11F7E8 00FC+00 1/1 0/0 0/0 .text initFirePointDamageEffectAll__9daAlink_cFv
- */
 void daAlink_c::initFirePointDamageEffectAll() {
     firePointEff_c* eff = field_0x32d8;
 
@@ -1717,8 +1653,6 @@ void daAlink_c::initFirePointDamageEffectAll() {
     }
 }
 
-/* 80124FA4-80125128 11F8E4 0184+00 1/1 0/0 0/0 .text
- * initFirePointDamageEffect__9daAlink_cFPC4cXyzP12dCcD_GObjInf */
 void daAlink_c::initFirePointDamageEffect(cXyz const* param_0, dCcD_GObjInf* param_1) {
     firePointEff_c* eff = field_0x32d8;
 
@@ -1753,7 +1687,6 @@ void daAlink_c::initFirePointDamageEffect(cXyz const* param_0, dCcD_GObjInf* par
     }
 }
 
-/* 80125128-80125338 11FA68 0210+00 1/1 0/0 0/0 .text setFirePointDamageEffect__9daAlink_cFv */
 void daAlink_c::setFirePointDamageEffect() {
     firePointEff_c* var_r30 = field_0x32d8;
     cXyz sp24;
@@ -1803,7 +1736,6 @@ void daAlink_c::setFirePointDamageEffect() {
     }
 }
 
-/* 80125338-80125524 11FC78 01EC+00 1/1 0/0 0/0 .text            setFreezeEffect__9daAlink_cFv */
 void daAlink_c::setFreezeEffect() {
     static Vec const effScale = {1.0f, 1.8f, 1.0f};
     static Vec const wolfEffScale = {1.0f, 1.0f, 1.5f};
@@ -1846,7 +1778,6 @@ void daAlink_c::setFreezeEffect() {
     }
 }
 
-/* 80125524-801255BC 11FE64 0098+00 1/1 0/0 0/0 .text setWoodShieldBurnEffect__9daAlink_cFv */
 void daAlink_c::setWoodShieldBurnEffect() {
     static const u16 effName[] = {
         0x0814,
@@ -1865,7 +1796,6 @@ void daAlink_c::setWoodShieldBurnEffect() {
     }
 }
 
-/* 801255BC-80125628 11FEFC 006C+00 3/3 0/0 0/0 .text clearWoodShieldBurnEffect__9daAlink_cFv */
 void daAlink_c::clearWoodShieldBurnEffect() {
     if (field_0x2fcb != 0) {
         for (int i = 0; i < 2; i++) {
@@ -1876,7 +1806,6 @@ void daAlink_c::clearWoodShieldBurnEffect() {
     }
 }
 
-/* 80125628-801256EC 11FF68 00C4+00 1/1 0/0 0/0 .text setWoodShieldBurnOutEffect__9daAlink_cFv */
 void daAlink_c::setWoodShieldBurnOutEffect() {
     static const u16 effName[] = {
         0x0816,
@@ -1896,8 +1825,6 @@ void daAlink_c::setWoodShieldBurnOutEffect() {
     clearWoodShieldBurnEffect();
 }
 
-/* 801256EC-80125778 12002C 008C+00 2/2 0/0 0/0 .text
- * initBlur__14daAlink_blur_cFfiPC4cXyzPC4cXyzPC4cXyz           */
 void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, cXyz const* param_3,
                               cXyz const* param_4) {
     field_0x24 = param_0;
@@ -1910,8 +1837,6 @@ void daAlink_blur_c::initBlur(f32 param_0, int param_1, cXyz const* param_2, cXy
     field_0x14 = 0;
 }
 
-/* 80125778-8012589C 1200B8 0124+00 1/1 0/0 0/0 .text
- * setBezierPos__FPC4cXyzPC4cXyzPC4cXyzPC4cXyzfP4cXyz           */
 static void setBezierPos(cXyz const* start, cXyz const* control_1, cXyz const* control_2,
                          cXyz const* end, f32 t, cXyz* out_pos) {
     f32 one_minus_t;
@@ -1934,8 +1859,6 @@ static void setBezierPos(cXyz const* start, cXyz const* control_1, cXyz const* c
                (*control_1 * t_squared);
 }
 
-/* 8012589C-80125B0C 1201DC 0270+00 1/1 0/0 0/0 .text
- * copyBlur__14daAlink_blur_cFPC4cXyzPC4cXyzPC4cXyz             */
 void daAlink_blur_c::copyBlur(cXyz const* param_0, cXyz const* param_1, cXyz const* param_2) {
     s32 temp = 10;
 
@@ -1973,8 +1896,6 @@ void daAlink_blur_c::copyBlur(cXyz const* param_0, cXyz const* param_1, cXyz con
     }
 }
 
-/* 80125B0C-80125BF4 12044C 00E8+00 1/1 0/0 0/0 .text traceBlur__14daAlink_blur_cFPC4cXyzPC4cXyzs
- */
 void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 param_2) {
     mDoMtx_stack_c::transS(*param_0);
     mDoMtx_stack_c::YrotM(param_2);
@@ -1990,7 +1911,6 @@ void daAlink_blur_c::traceBlur(cXyz const* param_0, cXyz const* param_1, s16 par
     }
 }
 
-/* 80125BF4-80125F14 120534 0320+00 1/0 0/0 0/0 .text            draw__14daAlink_blur_cFv */
 void daAlink_blur_c::draw() {
     j3dSys.reinitGX();
 
@@ -2054,7 +1974,6 @@ void daAlink_blur_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 80125F14-80126350 120854 043C+00 1/1 0/0 0/0 .text            create__20daAlink_lockCursor_cFv */
 BOOL daAlink_lockCursor_c::create() {
     JKRArchive* arc = dComIfG_getObjectResInfo(l_arcName)->getArchive();
 
@@ -2130,19 +2049,16 @@ BOOL daAlink_lockCursor_c::create() {
     return true;
 }
 
-/* 80126350-80126354 120C90 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP15J2DAnmTevRegKey */
 // void J2DPane::setAnimation(J2DAnmTevRegKey* param_0) {
 extern "C" void setAnimation__7J2DPaneFP15J2DAnmTevRegKey() {
     /* empty function */
 }
 
-/* 80126354-80126358 120C94 0004+00 0/0 4/0 0/0 .text setAnimation__7J2DPaneFP11J2DAnmColor */
 // void J2DPane::setAnimation(J2DAnmColor* param_0) {
 extern "C" void setAnimation__7J2DPaneFP11J2DAnmColor() {
     /* empty function */
 }
 
-/* 80126358-80126424 120C98 00CC+00 1/1 0/0 0/0 .text            update__20daAlink_lockCursor_cFv */
 void daAlink_lockCursor_c::update() {
     if (field_0x2c < 21.0f) {
         field_0x2c = 21.0f;
@@ -2163,7 +2079,6 @@ void daAlink_lockCursor_c::update() {
     cLib_chaseUC(&field_0x4, 0x80, 30);
 }
 
-/* 80126424-80126650 120D64 022C+00 1/0 0/0 0/0 .text            draw__20daAlink_lockCursor_cFv */
 void daAlink_lockCursor_c::draw() {
     if (field_0x4 != 0) {
         field_0x28->setFrame(field_0x2c);
@@ -2199,7 +2114,6 @@ void daAlink_lockCursor_c::draw() {
     }
 }
 
-/* 80126650-801266C0 120F90 0070+00 1/1 0/0 0/0 .text            create__15daAlink_sight_cFv */
 BOOL daAlink_sight_c::create() {
     if (!mLockCursor.create()) {
         return false;
@@ -2210,7 +2124,6 @@ BOOL daAlink_sight_c::create() {
     return true;
 }
 
-/* 801266C0-80126710 121000 0050+00 1/0 0/0 0/0 .text            draw__15daAlink_sight_cFv */
 void daAlink_sight_c::draw() {
     if (mLockFlag) {
         mLockCursor.setPos(field_0x14[0][3], field_0x14[1][3]);
@@ -2220,7 +2133,6 @@ void daAlink_sight_c::draw() {
     }
 }
 
-/* 80126710-80126740 121050 0030+00 2/2 0/0 0/0 .text            onLockFlg__15daAlink_sight_cFv */
 void daAlink_sight_c::onLockFlg() {
     if (mLockFlag) {
         return;
diff --git a/src/d/actor/d_a_alink_grab.inc b/src/d/actor/d_a_alink_grab.inc
index e70be29945..86536e654c 100644
--- a/src/d/actor/d_a_alink_grab.inc
+++ b/src/d/actor/d_a_alink_grab.inc
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_movebox.h"
 #include "d/actor/d_a_obj_gra2.h"
 
-/* 800E3830-800E3858 0DE170 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallA__FP10fopAc_ac_c */
 static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) {
     if (fopAcM_GetName(p_actor) == PROC_Obj_Carry &&
         static_cast<daObjCarry_c*>(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S)
@@ -18,7 +17,6 @@ static bool daAlink_checkLightBallA(fopAc_ac_c* p_actor) {
     return false;
 }
 
-/* 800E3858-800E3880 0DE198 0028+00 2/2 0/0 0/0 .text daAlink_checkLightBallB__FP10fopAc_ac_c */
 static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor) {
     if (fopAcM_GetName(p_actor) == PROC_Obj_Carry &&
         static_cast<daObjCarry_c*>(p_actor)->getType() == daObjCarry_c::TYPE_BALL_S_2)
@@ -28,7 +26,6 @@ static bool daAlink_checkLightBallB(fopAc_ac_c* p_actor) {
     return false;
 }
 
-/* 800E3880-800E38EC 0DE1C0 006C+00 1/1 0/0 0/0 .text daAlink_searchLightBall__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1) {
     if ((daPy_py_c::checkCarryStartLightBallA() && daAlink_checkLightBallA(p_actor)) ||
         (daPy_py_c::checkCarryStartLightBallB() && daAlink_checkLightBallB(p_actor)))
@@ -38,7 +35,6 @@ static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1) {
     return NULL;
 }
 
-/* 800E38EC-800E3994 0DE22C 00A8+00 1/1 0/0 0/0 .text            checkGrabLineCheck__9daAlink_cFv */
 BOOL daAlink_c::checkGrabLineCheck() {
     cXyz sp18(field_0x27f4->attention_info.position.x, field_0x27f4->attention_info.position.y + 10.0f, field_0x27f4->attention_info.position.z);
     if (fopAcM_lc_c::lineCheck(&attention_info.position, &sp18, field_0x27f4) && fopAcM_lc_c::checkWallHit()) {
@@ -48,8 +44,6 @@ BOOL daAlink_c::checkGrabLineCheck() {
     return false;
 }
 
-/* 800E3994-800E3A14 0DE2D4 0080+00 1/0 0/0 0/0 .text
- * setGrabCollisionOffset__9daAlink_cFffP13cBgS_PolyInfo        */
 void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo* param_2) {
     if (param_2 != NULL) {
         mPolyInfo4.SetPolyInfo(*param_2);
@@ -61,8 +55,6 @@ void daAlink_c::setGrabCollisionOffset(f32 param_0, f32 param_1, cBgS_PolyInfo*
     field_0x3430 = 0.8f * param_1;
 }
 
-/* 800E3A14-800E3A9C 0DE354 0088+00 1/0 0/0 0/0 .text exchangeGrabActor__9daAlink_cFP10fopAc_ac_c
- */
 BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) {
     fopAc_ac_c* actor = mGrabItemAcKeep.getActor();
     if (actor == NULL) {
@@ -82,7 +74,6 @@ BOOL daAlink_c::exchangeGrabActor(fopAc_ac_c* p_actor) {
     return true;
 }
 
-/* 800E3A9C-800E3BCC 0DE3DC 0130+00 1/0 0/0 0/0 .text setForceGrab__9daAlink_cFP10fopAc_ac_cii */
 BOOL daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) {
     if (((param_1 != 0 || !checkEventRun()) && !checkWolf()) &&
         (((mEquipItem == fpcNm_ITEM_NONE || (param_2 != 0 && checkHookshotItem(mEquipItem)))) &&
@@ -100,7 +91,6 @@ BOOL daAlink_c::setForceGrab(fopAc_ac_c* p_actor, int param_1, int param_2) {
     return false;
 }
 
-/* 800E3BCC-800E3C1C 0DE50C 0050+00 2/2 0/0 0/0 .text            getGrabThrowRate__9daAlink_cFv */
 f32 daAlink_c::getGrabThrowRate() {
     if (checkHeavyStateOn(1, 1)) {
         return 0.6f * mHeavySpeedMultiplier;
@@ -109,30 +99,23 @@ f32 daAlink_c::getGrabThrowRate() {
     return 0.6f;
 }
 
-/* 800E3C1C-800E3C6C 0DE55C 0050+00 3/3 0/0 0/0 .text            checkGrabThrowAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkGrabThrowAnime() const {
     return checkGrabUpThrowAnime() || checkGrabSideThrowAnime() || checkGrabHeavyThrowAnime();
 }
 
-/* 800E3C6C-800E3C9C 0DE5AC 0030+00 25/25 0/0 0/0 .text            checkGrabAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkGrabAnime() const {
     return checkGrabAnimeUp() || checkGrabAnimeSide() || checkGrabAnimeCarry();
 }
 
-/* 800E3C9C-800E3CF4 0DE5DC 0058+00 5/5 0/0 0/0 .text checkGrabAnimeAndThrow__9daAlink_cCFv */
 BOOL daAlink_c::checkGrabAnimeAndThrow() const {
     return checkGrabAnime() || checkGrabThrowAnime();
 }
 
-/* 800E3CF4-800E3D1C 0DE634 0028+00 10/10 0/0 0/0 .text            checkGrabCarryActor__9daAlink_cFv
- */
 BOOL daAlink_c::checkGrabCarryActor() {
     return mGrabItemAcKeep.getActor() != NULL &&
            fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_TYPE_8);
 }
 
-/* 800E3D1C-800E3D6C 0DE65C 0050+00 1/1 0/0 0/0 .text checkGrabSlowMoveActor__9daAlink_cFv */
 BOOL daAlink_c::checkGrabSlowMoveActor() {
     daObjCarry_c* var_r31 = (daObjCarry_c*)mGrabItemAcKeep.getActor();
     return var_r31 != NULL &&
@@ -140,20 +123,16 @@ BOOL daAlink_c::checkGrabSlowMoveActor() {
           (fopAcM_GetName(var_r31) == PROC_Obj_Carry && (var_r31->getType() == 1 || var_r31->getType() == 10 || var_r31->getType() == 4)));
 }
 
-/* 800E3D6C-800E3D94 0DE6AC 0028+00 1/1 0/0 0/0 .text            checkGrabHeavyActor__9daAlink_cFv
- */
 BOOL daAlink_c::checkGrabHeavyActor() {
     return mGrabItemAcKeep.getActor() != NULL &&
            fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_HEAVY);
 }
 
-/* 800E3D94-800E3DBC 0DE6D4 0028+00 2/2 0/0 0/0 .text            checkGrabSideActor__9daAlink_cFv */
 BOOL daAlink_c::checkGrabSideActor() {
     return mGrabItemAcKeep.getActor() != NULL &&
            fopAcM_CheckCarryType(mGrabItemAcKeep.getActor(), fopAcM_CARRY_SIDE);
 }
 
-/* 800E3DBC-800E3F20 0DE6FC 0164+00 5/5 0/0 0/0 .text            setGrabUpperAnime__9daAlink_cFf */
 void daAlink_c::setGrabUpperAnime(f32 param_0) {
     if (param_0 > 0.0f && checkNoResetFlg0(FLG0_UNDERWATER)) {
         if (checkZoraWearAbility()) {
@@ -182,7 +161,6 @@ void daAlink_c::setGrabUpperAnime(f32 param_0) {
     field_0x2f97 = 0xFE;
 }
 
-/* 800E3F20-800E3F50 0DE860 0030+00 8/8 0/0 0/0 .text            checkGrabRooster__9daAlink_cFv */
 BOOL daAlink_c::checkGrabRooster() {
     if (mGrabItemAcKeep.getActor() != NULL &&
         (fopAcM_GetName(mGrabItemAcKeep.getActor()) == PROC_NI ||
@@ -194,7 +172,6 @@ BOOL daAlink_c::checkGrabRooster() {
     return false;
 }
 
-/* 800E3F50-800E4BD4 0DE890 0C84+00 1/1 0/0 0/0 .text            setGrabItemPos__9daAlink_cFv */
 void daAlink_c::setGrabItemPos() {
     static cXyz grabCarryOffset0(0.0f, -30.0f, 25.0f);
     static cXyz grabCarryOffset1(0.0f, 20.0f, -5.0f);
@@ -401,7 +378,6 @@ void daAlink_c::setGrabItemPos() {
     }
 }
 
-/* 800E4BD4-800E4DEC 0DF514 0218+00 16/16 0/0 0/0 .text            freeGrabItem__9daAlink_cFv */
 void daAlink_c::freeGrabItem() {
     fopAc_ac_c* temp_r3 = mGrabItemAcKeep.getActor();
 
@@ -455,8 +431,6 @@ void daAlink_c::freeGrabItem() {
     }
 }
 
-/* 800E4DEC-800E4FA8 0DF72C 01BC+00 1/1 0/0 0/0 .text            setGrabUpperSpeedRate__9daAlink_cFv
- */
 void daAlink_c::setGrabUpperSpeedRate() {
     f32 var_f31;
 
@@ -491,7 +465,6 @@ void daAlink_c::setGrabUpperSpeedRate() {
     getNowAnmPackUpper(UPPER_2)->setFrame(temp_r30->getFrame());
 }
 
-/* 800E4FA8-800E5150 0DF8E8 01A8+00 7/7 0/0 0/0 .text            setCarryArmAngle__9daAlink_cFff */
 void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) {
     if (0.0f != field_0x33ec) {
         param_1 *= field_0x33ec;
@@ -515,13 +488,10 @@ void daAlink_c::setCarryArmAngle(f32 param_0, f32 param_1) {
     }
 }
 
-/* 800E5150-800E5170 0DFA90 0020+00 1/1 0/0 0/0 .text            checkGrabNotThrow__9daAlink_cFv */
 BOOL daAlink_c::checkGrabNotThrow() {
     return checkGrabCarryActor();
 }
 
-/* 800E5170-800E53AC 0DFAB0 023C+00 1/1 0/0 0/0 .text            checkNextActionGrab__9daAlink_cFv
- */
 BOOL daAlink_c::checkNextActionGrab() {
     fopAc_ac_c* temp_r3 = mGrabItemAcKeep.getActor();
     if (temp_r3 == NULL) {
@@ -565,7 +535,6 @@ BOOL daAlink_c::checkNextActionGrab() {
     return 0;
 }
 
-/* 800E53AC-800E53F8 0DFCEC 004C+00 2/2 0/0 0/0 .text            initGrabNextMode__9daAlink_cFv */
 void daAlink_c::initGrabNextMode() {
     if (!checkGrabAnime()) {
         setGrabUpperAnime(-1.0f);
@@ -574,7 +543,6 @@ void daAlink_c::initGrabNextMode() {
     checkNextAction(0);
 }
 
-/* 800E53F8-800E57AC 0DFD38 03B4+00 3/3 0/0 0/0 .text            setGrabItemThrow__9daAlink_cFv */
 void daAlink_c::setGrabItemThrow() {
     fopAc_ac_c* temp_r3 = mGrabItemAcKeep.getActor();
     if (temp_r3 != NULL) {
@@ -639,7 +607,6 @@ void daAlink_c::setGrabItemThrow() {
     }
 }
 
-/* 800E57AC-800E5830 0E00EC 0084+00 2/2 0/0 0/0 .text checkUpperGrabItemThrow__9daAlink_cFf */
 BOOL daAlink_c::checkUpperGrabItemThrow(f32 param_0) {
     if (checkAnmEnd(&mUpperFrameCtrl[2])) {
         resetUpperAnime(UPPER_2, param_0);
@@ -653,8 +620,6 @@ BOOL daAlink_c::checkUpperGrabItemThrow(f32 param_0) {
     return 0;
 }
 
-/* 800E5830-800E5B6C 0E0170 033C+00 2/2 0/0 0/0 .text
- * putObjLineCheck__9daAlink_cFR11dBgS_LinChkP4cXyzP10fopAc_ac_c */
 void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c* param_2) {
     if (!checkNoCollisionCorret()) {
         param_0.Set(&field_0x37c8, param_1, param_2);
@@ -681,14 +646,11 @@ void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c*
     }
 }
 
-/* 800E5B6C-800E5BB4 0E04AC 0048+00 3/3 0/0 0/0 .text grabLineCheck__9daAlink_cFP4cXyzP4cXyz */
 bool daAlink_c::grabLineCheck(cXyz* i_start, cXyz* i_end) {
     mObjLinChk.Set(i_start, i_end, mGrabItemAcKeep.getActor());
     return dComIfG_Bgsp().LineCross(&mObjLinChk);
 }
 
-/* 800E5BB4-800E5CBC 0E04F4 0108+00 6/6 0/0 0/0 .text setGrabItemActor__9daAlink_cFP10fopAc_ac_c
- */
 void daAlink_c::setGrabItemActor(fopAc_ac_c* param_0) {
     fopAcM_setCarryNow(param_0, 1);
     mGrabItemAcKeep.setData(param_0);
@@ -718,7 +680,6 @@ void daAlink_c::setGrabItemActor(fopAc_ac_c* param_0) {
     }
 }
 
-/* 800E5CBC-800E5EC8 0E05FC 020C+00 2/2 0/0 0/0 .text            procGrabReadyInit__9daAlink_cFv */
 int daAlink_c::procGrabReadyInit() {
     if (fopAcM_checkCarryNow(field_0x27f4)) {
         return checkWaitAction();
@@ -773,7 +734,6 @@ int daAlink_c::procGrabReadyInit() {
     return 1;
 }
 
-/* 800E5EC8-800E5FD0 0E0808 0108+00 1/0 0/0 0/0 .text            procGrabReady__9daAlink_cFv */
 int daAlink_c::procGrabReady() {
     if (mGrabItemAcKeep.getActor() == NULL) {
         return checkNextAction(0);
@@ -795,7 +755,6 @@ int daAlink_c::procGrabReady() {
     return 1;
 }
 
-/* 800E5FD0-800E6230 0E0910 0260+00 1/1 0/0 0/0 .text            procGrabUpInit__9daAlink_cFv */
 int daAlink_c::procGrabUpInit() {
     fopAc_ac_c* temp_r30 = mGrabItemAcKeep.getActor();
     commonProcInit(PROC_GRAB_UP);
@@ -825,7 +784,6 @@ int daAlink_c::procGrabUpInit() {
     return 1;
 }
 
-/* 800E6230-800E637C 0E0B70 014C+00 1/0 0/0 0/0 .text            procGrabUp__9daAlink_cFv */
 int daAlink_c::procGrabUp() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -856,7 +814,6 @@ int daAlink_c::procGrabUp() {
     return 1;
 }
 
-/* 800E637C-800E63F0 0E0CBC 0074+00 1/0 0/0 0/0 .text            procGrabMiss__9daAlink_cFv */
 int daAlink_c::procGrabMiss() {
     if (mGrabItemAcKeep.getActor() == NULL) {
         checkNextAction(0);
@@ -871,7 +828,6 @@ int daAlink_c::procGrabMiss() {
     return 1;
 }
 
-/* 800E63F0-800E65F8 0E0D30 0208+00 1/1 0/0 0/0 .text            procGrabThrowInit__9daAlink_cFi */
 int daAlink_c::procGrabThrowInit(int param_0) {
     if (checkModeFlg(0x400)) {
         if (checkGrabHeavyActor()) {
@@ -923,7 +879,6 @@ int daAlink_c::procGrabThrowInit(int param_0) {
     return 1;
 }
 
-/* 800E65F8-800E672C 0E0F38 0134+00 1/0 0/0 0/0 .text            procGrabThrow__9daAlink_cFv */
 int daAlink_c::procGrabThrow() {
     daPy_frameCtrl_c* var_r30;
     if (mProcVar2.field_0x300c == 1) {
@@ -964,7 +919,6 @@ int daAlink_c::procGrabThrow() {
     return 1;
 }
 
-/* 800E672C-800E6914 0E106C 01E8+00 2/2 0/0 0/0 .text            procGrabPutInit__9daAlink_cFv */
 int daAlink_c::procGrabPutInit() {
     if (mProcID == PROC_GRAB_STAND) {
         return 0;
@@ -1007,7 +961,6 @@ int daAlink_c::procGrabPutInit() {
     return 1;
 }
 
-/* 800E6914-800E6A9C 0E1254 0188+00 1/0 0/0 0/0 .text            procGrabPut__9daAlink_cFv */
 int daAlink_c::procGrabPut() {
     fopAc_ac_c* temp_r29 = mGrabItemAcKeep.getActor();
 
@@ -1043,7 +996,6 @@ int daAlink_c::procGrabPut() {
     return 1;
 }
 
-/* 800E6A9C-800E6C34 0E13DC 0198+00 2/2 0/0 0/0 .text            procGrabWaitInit__9daAlink_cFv */
 int daAlink_c::procGrabWaitInit() {
     if (checkEndResetFlg2(ERFLG2_UNK_8)) {
         return procGrabReboundInit(1);
@@ -1086,7 +1038,6 @@ int daAlink_c::procGrabWaitInit() {
     return 1;
 }
 
-/* 800E6C34-800E6D6C 0E1574 0138+00 1/0 0/0 0/0 .text            procGrabWait__9daAlink_cFv */
 int daAlink_c::procGrabWait() {
     if (mGrabItemAcKeep.getActor() == NULL) {
         if (checkGrabAnime()) {
@@ -1113,8 +1064,6 @@ int daAlink_c::procGrabWait() {
     return 1;
 }
 
-/* 800E6D6C-800E6E0C 0E16AC 00A0+00 2/2 0/0 0/0 .text            procGrabReboundInit__9daAlink_cFi
- */
 int daAlink_c::procGrabReboundInit(int param_0) {
     commonProcInit(PROC_GRAB_REBOUND);
     setSingleAnimeParam(ANM_PICK_UP_LARGE, &daAlinkHIO_grab_c0::m.mCarryAnm);
@@ -1130,7 +1079,6 @@ int daAlink_c::procGrabReboundInit(int param_0) {
     return 1;
 }
 
-/* 800E6E0C-800E6EEC 0E174C 00E0+00 1/0 0/0 0/0 .text            procGrabRebound__9daAlink_cFv */
 int daAlink_c::procGrabRebound() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -1151,7 +1099,6 @@ int daAlink_c::procGrabRebound() {
     return 1;
 }
 
-/* 800E6EEC-800E6FE0 0E182C 00F4+00 2/2 0/0 0/0 .text            procGrabStandInit__9daAlink_cFv */
 int daAlink_c::procGrabStandInit() {
     commonProcInit(PROC_GRAB_STAND);
 
@@ -1170,7 +1117,6 @@ int daAlink_c::procGrabStandInit() {
     return 1;
 }
 
-/* 800E6FE0-800E70C0 0E1920 00E0+00 1/0 0/0 0/0 .text            procGrabStand__9daAlink_cFv */
 int daAlink_c::procGrabStand() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -1191,8 +1137,6 @@ int daAlink_c::procGrabStand() {
     return 1;
 }
 
-/* 800E70C0-800E70FC 0E1A00 003C+00 1/1 0/0 0/0 .text
- * checkInsectActorName__9daAlink_cFP10fopAc_ac_c               */
 BOOL daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) {
     s16 insectName = fopAcM_GetName(insectActor);
 
@@ -1204,8 +1148,6 @@ BOOL daAlink_c::checkInsectActorName(fopAc_ac_c* insectActor) {
     return false;
 }
 
-/* 800E70FC-800E71D4 0E1A3C 00D8+00 2/2 0/0 0/0 .text            procInsectCatchInit__9daAlink_cFv
- */
 int daAlink_c::procInsectCatchInit() {
     if (fopAcM_checkCarryNow(field_0x27f4)) {
         return checkWaitAction();
@@ -1230,7 +1172,6 @@ int daAlink_c::procInsectCatchInit() {
     return 1;
 }
 
-/* 800E71D4-800E7254 0E1B14 0080+00 1/0 0/0 0/0 .text            procInsectCatch__9daAlink_cFv */
 int daAlink_c::procInsectCatch() {
     daPy_frameCtrl_c* frame_ctrl = &mUnderFrameCtrl[0];
 
@@ -1247,7 +1188,6 @@ int daAlink_c::procInsectCatch() {
     return true;
 }
 
-/* 800E7254-800E7460 0E1B94 020C+00 2/2 0/0 0/0 .text            procPickUpInit__9daAlink_cFv */
 int daAlink_c::procPickUpInit() {
     if (fopAcM_checkCarryNow(field_0x27f4)) {
         return checkWaitAction();
@@ -1305,7 +1245,6 @@ int daAlink_c::procPickUpInit() {
     return 1;
 }
 
-/* 800E7460-800E75EC 0E1DA0 018C+00 1/0 0/0 0/0 .text            procPickUp__9daAlink_cFv */
 int daAlink_c::procPickUp() {
     if (mProcVar4.field_0x3010 == 0 && mGrabItemAcKeep.getActor() == NULL && mItemAcKeep.getActor() == NULL) {
         return checkNextAction(0);
@@ -1344,7 +1283,6 @@ int daAlink_c::procPickUp() {
     return 1;
 }
 
-/* 800E75EC-800E76E0 0E1F2C 00F4+00 3/3 0/0 0/0 .text            procPickPutInit__9daAlink_cFi */
 int daAlink_c::procPickPutInit(int param_0) {
     if (param_0 != 0 && mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_PICK_PUT, NULL);
@@ -1372,7 +1310,6 @@ int daAlink_c::procPickPutInit(int param_0) {
     return 1;
 }
 
-/* 800E76E0-800E7894 0E2020 01B4+00 1/0 0/0 0/0 .text            procPickPut__9daAlink_cFv */
 int daAlink_c::procPickPut() {
     fopAc_ac_c* temp_r3 = mItemAcKeep.getActor();
     if (temp_r3 == NULL && mProcVar2.field_0x300c == 0 && field_0x3198 != 0) {
@@ -1409,13 +1346,10 @@ int daAlink_c::procPickPut() {
     return 1;
 }
 
-/* 800E7894-800E794C 0E21D4 00B8+00 2/2 0/0 0/0 .text checkSetChainPullAnime__9daAlink_cFs */
 BOOL daAlink_c::checkSetChainPullAnime(s16 param_0) {
     return checkInputOnR() && checkFmChainGrabAnime() && (field_0x3400 != 0.0f || field_0x3404 != 0.0f) && (checkBossRoom() || abs((s16)(field_0x2fe2 - param_0)) >= 0x3800);
 }
 
-/* 800E794C-800E7994 0E228C 0048+00 3/3 0/0 0/0 .text            getChainStickAngleY__9daAlink_cCFs
- */
 s16 daAlink_c::getChainStickAngleY(s16 param_0) const {
     s16 angle = field_0x2fe2 - param_0;
 
@@ -1428,7 +1362,6 @@ s16 daAlink_c::getChainStickAngleY(s16 param_0) const {
     return field_0x2fe2;
 }
 
-/* 800E7994-800E79F8 0E22D4 0064+00 1/1 0/0 0/0 .text            checkChainEmphasys__9daAlink_cFv */
 u8 daAlink_c::checkChainEmphasys() {
     fopAc_ac_c* temp_r3 = field_0x2844.getActor();
     if (temp_r3 != NULL && fopAcM_GetName(temp_r3) == PROC_Obj_SwChain && !((daObjSwChain_c*)temp_r3)->checkDispEmphasis()) {
@@ -1438,7 +1371,6 @@ u8 daAlink_c::checkChainEmphasys() {
     return 2;
 }
 
-/* 800E79F8-800E7AEC 0E2338 00F4+00 4/4 0/0 0/0 .text            searchFmChainPos__9daAlink_cFv */
 BOOL daAlink_c::searchFmChainPos() {
     if (field_0x2844.getActor() == NULL) {
         field_0x2fa3 = 0;
@@ -1456,8 +1388,6 @@ BOOL daAlink_c::searchFmChainPos() {
     return 0;
 }
 
-/* 800E7AEC-800E7BD0 0E242C 00E4+00 0/0 1/1 0/0 .text
- * setFmChainPosFromOut__9daAlink_cFP10fopAc_ac_cP4cXyzi        */
 BOOL daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int param_2) {
     field_0x354c[param_2] = *param_1;
 
@@ -1473,7 +1403,6 @@ BOOL daAlink_c::setFmChainPosFromOut(fopAc_ac_c* param_0, cXyz* param_1, int par
     return var_r29;
 }
 
-/* 800E7BD0-800E7C30 0E2510 0060+00 1/0 0/0 0/0 .text checkChainBlockPushPull__9daAlink_cFv */
 bool daAlink_c::checkChainBlockPushPull() {
     if (checkFmChainGrabAnime()) {
         fopAc_ac_c* actor = field_0x2844.getActor();
@@ -1489,7 +1418,6 @@ bool daAlink_c::checkChainBlockPushPull() {
     return false;
 }
 
-/* 800E7C30-800E7CC0 0E2570 0090+00 2/2 0/0 0/0 .text            procFmChainUpInit__9daAlink_cFv */
 int daAlink_c::procFmChainUpInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_CHAIN_UP, NULL);
@@ -1507,7 +1435,6 @@ int daAlink_c::procFmChainUpInit() {
     return 1;
 }
 
-/* 800E7CC0-800E7DD8 0E2600 0118+00 1/0 0/0 0/0 .text            procFmChainUp__9daAlink_cFv */
 int daAlink_c::procFmChainUp() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -1538,7 +1465,6 @@ int daAlink_c::procFmChainUp() {
     return 1;
 }
 
-/* 800E7DD8-800E7E50 0E2718 0078+00 2/1 0/0 0/0 .text procFmChainStrongPullInit__9daAlink_cFv */
 int daAlink_c::procFmChainStrongPullInit() {
     if (!commonProcInitNotSameProc(PROC_CHAIN_STRONG_PULL)) {
         return 0;
@@ -1551,8 +1477,6 @@ int daAlink_c::procFmChainStrongPullInit() {
     return 1;
 }
 
-/* 800E7E50-800E7ED0 0E2790 0080+00 1/0 0/0 0/0 .text            procFmChainStrongPull__9daAlink_cFv
- */
 int daAlink_c::procFmChainStrongPull() {
     setGrabStatus(0x96, 2);
 
@@ -1568,29 +1492,22 @@ int daAlink_c::procFmChainStrongPull() {
     return 1;
 }
 
-/* 800E7ED0-800E7EE4 0E2810 0014+00 9/9 0/0 0/0 .text            setWallGrabStatus__9daAlink_cFUcUc
- */
 void daAlink_c::setWallGrabStatus(u8 param_0, u8 param_1) {
     setRStatus(param_0, param_1);
 }
 
-/* 800E7EE4-800E7EF4 0E2824 0010+00 2/2 0/0 0/0 .text            getWallGrabStatus__9daAlink_cFv */
 int daAlink_c::getWallGrabStatus() {
     return dComIfGp_getRStatus();
 }
 
-/* 800E7EF4-800E7F18 0E2834 0024+00 1/1 0/0 0/0 .text            wallGrabTrigger__9daAlink_cFv */
 BOOL daAlink_c::wallGrabTrigger() {
     return itemTriggerCheck(BTN_R);
 }
 
-/* 800E7F18-800E7F3C 0E2858 0024+00 4/4 0/0 0/0 .text            wallGrabButton__9daAlink_cFv */
 BOOL daAlink_c::wallGrabButton() {
     return itemButtonCheck(BTN_R);
 }
 
-/* 800E7F3C-800E80A4 0E287C 0168+00 4/4 0/0 0/0 .text
- * setPushPullKeepData__9daAlink_cFQ29dBgW_Base13PushPullLabeli */
 int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, int param_1) {
     if (i_label != dBgW::PPLABEL_NONE) {
         if (checkPowerGloveGet()) {
@@ -1628,14 +1545,11 @@ int daAlink_c::setPushPullKeepData(dBgW_Base::PushPullLabel i_label, int param_1
     return 1;
 }
 
-/* 800E80A4-800E8148 0E29E4 00A4+00 2/2 0/0 0/0 .text checkPushPullTurnBlock__9daAlink_cFv */
 BOOL daAlink_c::checkPushPullTurnBlock() {
     s16 name = getMoveBGActorName(mPolyInfo1, 1);
     return name == PROC_Obj_SwTurn || name == PROC_Obj_Lv6SwTurn || name == PROC_Obj_PushDoor || name == PROC_PushDoor || name == PROC_Obj_Ytaihou;
 }
 
-/* 800E8148-800E8298 0E2A88 0150+00 1/1 0/0 0/0 .text            checkPullBehindWall__9daAlink_cFv
- */
 BOOL daAlink_c::checkPullBehindWall() {
     cXyz sp14;
     cXyz sp8;
@@ -1670,23 +1584,18 @@ BOOL daAlink_c::checkPullBehindWall() {
     return 0;
 }
 
-/* 800E8298-800E82B0 0E2BD8 0018+00 3/3 0/0 0/0 .text            offGoatStopGame__9daAlink_cFv */
 void daAlink_c::offGoatStopGame() {
     if (mSpecialMode == SMODE_GOAT_STOP) {
         mSpecialMode = 0;
     }
 }
 
-/* 800E82B0-800E8314 0E2BF0 0064+00 4/4 0/0 0/0 .text
- * checkGoatCatchActor__9daAlink_cFP10fopAc_ac_c                */
 BOOL daAlink_c::checkGoatCatchActor(fopAc_ac_c* param_0) {
     s16 name = fopAcM_GetName(param_0);
     return name == PROC_E_GOB || (name == PROC_OBJ_GRA && checkSpecialNpc(param_0)) ||
            name == PROC_COW;
 }
 
-/* 800E8314-800E8334 0E2C54 0020+00 2/2 0/0 0/0 .text            getGoatCatchDistance2__9daAlink_cFv
- */
 f32 daAlink_c::getGoatCatchDistance2() {
     if (fopAcM_GetName(field_0x27f4) == PROC_B_MGN) {
         return 1000000.0f;
@@ -1695,13 +1604,10 @@ f32 daAlink_c::getGoatCatchDistance2() {
     return 90000.0f;
 }
 
-/* 800E8334-800E8354 0E2C74 0020+00 3/3 0/0 0/0 .text            endPushPull__9daAlink_cFv */
 int daAlink_c::endPushPull() {
     return checkWaitAction();
 }
 
-/* 800E8354-800E8428 0E2C94 00D4+00 2/2 0/0 0/0 .text            getPushPullAnimeSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getPushPullAnimeSpeed() {
     f32 var_f31;
     if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
@@ -1721,7 +1627,6 @@ f32 daAlink_c::getPushPullAnimeSpeed() {
     return var_f31;
 }
 
-/* 800E8428-800E857C 0E2D68 0154+00 4/4 0/0 0/0 .text procCoPushPullWaitInit__9daAlink_cFi */
 int daAlink_c::procCoPushPullWaitInit(int param_0) {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_PUSH_PULL_WAIT, NULL);
@@ -1757,7 +1662,6 @@ int daAlink_c::procCoPushPullWaitInit(int param_0) {
     return 1;
 }
 
-/* 800E857C-800E875C 0E2EBC 01E0+00 1/0 0/0 0/0 .text            procCoPushPullWait__9daAlink_cFv */
 int daAlink_c::procCoPushPullWait() {
     if (mProcVar4.field_0x3010 == 0) {
         setWallGrabStatus(0x15, 2);
@@ -1799,8 +1703,6 @@ int daAlink_c::procCoPushPullWait() {
     return 1;
 }
 
-/* 800E875C-800E89F0 0E309C 0294+00 2/2 0/0 0/0 .text            procCoPushMoveInit__9daAlink_cFii
- */
 int daAlink_c::procCoPushMoveInit(int param_0, int param_1) {
     if (!setPushPullKeepData(dBgW_Base::PPLABEL_NONE, param_0)) {
         return 0;
@@ -1842,7 +1744,6 @@ int daAlink_c::procCoPushMoveInit(int param_0, int param_1) {
     return 1;
 }
 
-/* 800E89F0-800E8D1C 0E3330 032C+00 1/0 0/0 0/0 .text            procCoPushMove__9daAlink_cFv */
 int daAlink_c::procCoPushMove() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
     int var_r28 = 0x160;
@@ -1936,7 +1837,6 @@ int daAlink_c::procCoPushMove() {
     return 1;
 }
 
-/* 800E8D1C-800E8F44 0E365C 0228+00 2/2 0/0 0/0 .text            procPullMoveInit__9daAlink_cFi */
 int daAlink_c::procPullMoveInit(int param_0) {
     if (!setPushPullKeepData(dBgW::PPLABEL_NONE, param_0)) {
         return 0;
@@ -1966,7 +1866,6 @@ int daAlink_c::procPullMoveInit(int param_0) {
     return 1;
 }
 
-/* 800E8F44-800E91B0 0E3884 026C+00 1/0 0/0 0/0 .text            procPullMove__9daAlink_cFv */
 int daAlink_c::procPullMove() {
     setWallGrabStatus(0x15, 2);
 
@@ -2039,7 +1938,6 @@ int daAlink_c::procPullMove() {
     return 1;
 }
 
-/* 800E91B0-800E91C4 0E3AF0 0014+00 1/1 0/0 0/0 .text daAlink_searchGoat__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_COW) {
         return i_actor;
@@ -2048,8 +1946,6 @@ static fopAc_ac_c* daAlink_searchGoat(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 800E91C4-800E9210 0E3B04 004C+00 1/0 0/0 0/0 .text            cancelGoronThrowEvent__9daAlink_cFv
- */
 void daAlink_c::cancelGoronThrowEvent() {
     if (mProcID == PROC_GOAT_CATCH && mProcVar5.field_0x3012 == 0) {
         mProcVar5.field_0x3012 = 1;
@@ -2057,8 +1953,6 @@ void daAlink_c::cancelGoronThrowEvent() {
     }
 }
 
-/* 800E9210-800E9344 0E3B50 0134+00 2/2 0/0 0/0 .text
- * setGoatStopGameFail__9daAlink_cFP10fopAc_ac_c                */
 void daAlink_c::setGoatStopGameFail(fopAc_ac_c* param_0) {
     s16 temp_r3 = fopAcM_GetName(param_0);
     if (temp_r3 == PROC_OBJ_GRA) {
@@ -2093,7 +1987,6 @@ void daAlink_c::setGoatStopGameFail(fopAc_ac_c* param_0) {
     procCoLargeDamageInit(-1, 1, 0, 0, NULL, 0);
 }
 
-/* 800E9344-800E9434 0E3C84 00F0+00 1/1 0/0 0/0 .text            procGoatMoveInit__9daAlink_cFv */
 int daAlink_c::procGoatMoveInit() {
     if (!commonProcInitNotSameProc(PROC_GOAT_MOVE)) {
         return 0;
@@ -2122,7 +2015,6 @@ int daAlink_c::procGoatMoveInit() {
     return 1;
 }
 
-/* 800E9434-800E9894 0E3D74 0460+00 1/0 0/0 0/0 .text            procGoatMove__9daAlink_cFv */
 int daAlink_c::procGoatMove() {
     if (mProcVar2.field_0x300c == 0) {
         if (checkAnmEnd(&mUnderFrameCtrl[0])) {
@@ -2235,8 +2127,6 @@ int daAlink_c::procGoatMove() {
     return 1;
 }
 
-/* 800E9894-800E9BD0 0E41D4 033C+00 3/3 0/0 0/0 .text procGoatCatchInit__9daAlink_cFP10fopAc_ac_cf
- */
 int daAlink_c::procGoatCatchInit(fopAc_ac_c* param_0, f32 param_1) {
     s16 temp_r28 = cLib_targetAngleY(&current.pos, &param_0->current.pos);
 
@@ -2326,7 +2216,6 @@ int daAlink_c::procGoatCatchInit(fopAc_ac_c* param_0, f32 param_1) {
     return 1;
 }
 
-/* 800E9BD0-800EA2A8 0E4510 06D8+00 1/0 0/0 0/0 .text            procGoatCatch__9daAlink_cFv */
 int daAlink_c::procGoatCatch() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     fopAc_ac_c* temp_r3 = field_0x280c.getActor();
@@ -2517,7 +2406,6 @@ int daAlink_c::procGoatCatch() {
     return 1;
 }
 
-/* 800EA2A8-800EA3AC 0E4BE8 0104+00 2/2 0/0 0/0 .text            procGoatStrokeInit__9daAlink_cFv */
 int daAlink_c::procGoatStrokeInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_GOAT_STROKE, field_0x27f4);
@@ -2542,7 +2430,6 @@ int daAlink_c::procGoatStrokeInit() {
 }
 
 
-/* 800EA3AC-800EA3F4 0E4CEC 0048+00 1/0 0/0 0/0 .text            procGoatStroke__9daAlink_cFv */
 int daAlink_c::procGoatStroke() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         checkNextAction(0);
@@ -2551,7 +2438,6 @@ int daAlink_c::procGoatStroke() {
     return 1;
 }
 
-/* 800EA3F4-800EA4CC 0E4D34 00D8+00 2/2 0/0 0/0 .text            procGoronMoveInit__9daAlink_cFv */
 int daAlink_c::procGoronMoveInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_GORON_MOVE, NULL);
@@ -2578,7 +2464,6 @@ int daAlink_c::procGoronMoveInit() {
     return 1;
 }
 
-/* 800EA4CC-800EA844 0E4E0C 0378+00 1/0 0/0 0/0 .text            procGoronMove__9daAlink_cFv */
 int daAlink_c::procGoronMove() {
     mCargoCarryAcKeep.setActor();
 
diff --git a/src/d/actor/d_a_alink_guard.inc b/src/d/actor/d_a_alink_guard.inc
index 908b6f038c..edc20df0e2 100644
--- a/src/d/actor/d_a_alink_guard.inc
+++ b/src/d/actor/d_a_alink_guard.inc
@@ -7,8 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_obj_gra2.h"
 
-/* 800DC548-800DC5A4 0D6E88 005C+00 13/13 0/0 0/0 .text checkEnemyGroup__9daAlink_cFP10fopAc_ac_c
- */
 BOOL daAlink_c::checkEnemyGroup(fopAc_ac_c* i_actor) {
     return i_actor != NULL && (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e ||
                                fopAcM_GetName(i_actor) == PROC_E_ZH || checkSpecialNpc(i_actor));
@@ -20,7 +18,6 @@ public:
     bool checkBattleMode() { return true; }
 };
 
-/* 800DC5A4-800DC5DC 0D6EE4 0038+00 4/4 0/0 0/0 .text checkSpecialNpc__9daAlink_cFP10fopAc_ac_c */
 BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
     s16 name = fopAcM_GetName(i_actor);
 
@@ -29,7 +26,6 @@ BOOL daAlink_c::checkSpecialNpc(fopAc_ac_c* i_actor) {
            (name == PROC_OBJ_GRA && !static_cast<daObj_GrA_c*>(i_actor)->checkNpcObjGra());
 }
 
-/* 800DC5DC-800DC678 0D6F1C 009C+00 1/1 0/0 0/0 .text checkShieldAttackEmphasys__9daAlink_cFv */
 BOOL daAlink_c::checkShieldAttackEmphasys() {
     return mTargetedActor != NULL && (mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x200000) &&
            !checkCutHeadState() &&
@@ -37,15 +33,12 @@ BOOL daAlink_c::checkShieldAttackEmphasys() {
             !static_cast<fopEn_enemy_c*>(mTargetedActor)->checkDownFlg());
 }
 
-/* 800DC678-800DC79C 0D6FB8 0124+00 5/5 0/0 0/0 .text checkGuardActionChange__9daAlink_cFv */
 BOOL daAlink_c::checkGuardActionChange() {
     return checkAttentionLock() && !checkIronBallWaitAnime() && !checkGrabAnime() &&
            !checkCopyRodControllAnime() && !((mTargetedActor != NULL && !checkSpecialNpc(mTargetedActor)) &&
            (fopAcM_GetGroup(mTargetedActor) == 3 || fopAcM_GetGroup(mTargetedActor) == fopAc_NPC_e));
 }
 
-/* 800DC79C-800DC8C4 0D70DC 0128+00 3/3 0/0 0/0 .text            stickArrowIncrement__9daAlink_cFi
- */
 void daAlink_c::stickArrowIncrement(int param_0) {
     if (!checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) {
         s16 arrow_num = 0;
@@ -77,8 +70,6 @@ void daAlink_c::stickArrowIncrement(int param_0) {
 }
 
 
-/* 800DC8C4-800DCA2C 0D7204 0168+00 0/0 0/0 1/1 .text
- * setArrowShieldActor__9daAlink_cFP10fopAc_ac_ci               */
 void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
     fpc_ProcID new_arrow_id = fopAcM_GetID(i_actor);
 
@@ -116,14 +107,10 @@ void daAlink_c::setArrowShieldActor(fopAc_ac_c* i_actor, int param_1) {
 }
 
 
-/* 800DCA2C-800DCA80 0D736C 0054+00 1/1 0/0 2/2 .text
- * checkWoodShieldEquipNotIronBall__9daAlink_cCFv               */
 BOOL daAlink_c::checkWoodShieldEquipNotIronBall() const {
     return checkWoodShieldEquip() && !checkIronBallEquip();
 }
 
-/* 800DCA80-800DCD74 0D73C0 02F4+00 0/0 0/0 1/1 .text
- * getArrowShieldOffset__9daAlink_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */
 void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1, cXyz* param_2,
                                      cXyz* param_3) const {
     cXyz sp54;
@@ -154,8 +141,6 @@ void daAlink_c::getArrowShieldOffset(cXyz const* param_0, csXyz const* param_1,
 }
 
 
-/* 800DCD74-800DCDF0 0D76B4 007C+00 0/0 0/0 2/2 .text
- * setArrowShieldPos__9daAlink_cCFP4cXyzP5csXyzPC4cXyzPC4cXyz   */
 void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* param_2,
                                   cXyz const* param_3) const {
     cXyz sp1C;
@@ -167,37 +152,30 @@ void daAlink_c::setArrowShieldPos(cXyz* param_0, csXyz* param_1, cXyz const* par
     mDoMtx_multVec(getShieldMtx(), param_2, param_0);
 }
 
-/* 800DCDF0-800DCE6C 0D7730 007C+00 17/17 0/0 0/0 .text checkUpperGuardAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkUpperGuardAnime() const {
     return checkNoResetFlg2(FLG2_UNK_8000000) && !checkEventRun() &&
            !checkNoResetFlg0(FLG0_UNK_2) && mProcID != PROC_GUARD_BREAK &&
            mProcID != PROC_CUT_REVERSE && mProcID != PROC_GUARD_ATTACK;
 }
 
-/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text            checkPlayerGuard__9daAlink_cCFv */
 BOOL daAlink_c::checkPlayerGuard() const {
     return (checkSmallUpperGuardAnime() || (checkShieldGet() && checkHorseLieAnime())) ||
            checkUpperGuardAnime();
 }
 
-/* 800DCF04-800DCF64 0D7844 0060+00 5/5 0/0 0/0 .text checkPlayerGuardAndAttack__9daAlink_cCFv */
 BOOL daAlink_c::checkPlayerGuardAndAttack() const {
     return checkPlayerGuard() || mProcID == PROC_GUARD_ATTACK;
 }
 
-/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text            checkGuardAccept__9daAlink_cFv */
 BOOL daAlink_c::checkGuardAccept() {
     return checkModeFlg(0x80) && checkShieldGet() && !checkFmChainGrabAnime() &&
            !checkNotBattleStage();
 }
 
-/* 800DD008-800DD018 0D7948 0010+00 11/11 0/0 0/0 .text            setUpperGuardAnime__9daAlink_cFf
- */
 void daAlink_c::setUpperGuardAnime(f32) {
     onNoResetFlg2(FLG2_UNK_8000000);
 }
 
-/* 800DD018-800DD114 0D7958 00FC+00 1/1 0/0 0/0 .text            setShieldGuard__9daAlink_cFv */
 void daAlink_c::setShieldGuard() {
     if ((mProcID == PROC_GUARD_SLIP && mEquipItem != fpcNm_ITEM_IRONBALL) || checkSmallUpperGuardAnime() ||
         (checkGuardAccept() && !checkGrabAnime() && !checkUpperReadyThrowAnime() &&
@@ -211,7 +189,6 @@ void daAlink_c::setShieldGuard() {
     }
 }
 
-/* 800DD114-800DD1D4 0D7A54 00C0+00 1/1 0/0 0/0 .text setGuardSe__9daAlink_cFP12dCcD_GObjInf */
 void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) {
     int var_r31;
     int var_r30;
@@ -234,7 +211,6 @@ void daAlink_c::setGuardSe(dCcD_GObjInf* i_objinf) {
     mZ2Link.startCollisionSE(hit_se, var_r31);
 }
 
-/* 800DD1D4-800DD3E4 0D7B14 0210+00 1/1 0/0 0/0 .text setSmallGuard__9daAlink_cFP12dCcD_GObjInf */
 void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) {
     setUpperAnimeBase(0x16);
     cXyz* dmg_vec = getDamageVec(i_objinf);
@@ -251,8 +227,6 @@ void daAlink_c::setSmallGuard(dCcD_GObjInf* i_objinf) {
     mBodyAngle.x = cLib_minMaxLimit<s16>(cM_atan2s(dmg_vec->y, dmg_vec->absXZ()), -daAlinkHIO_guard_c0::m.mSmallGuardFBAngleMax, daAlinkHIO_guard_c0::m.mSmallGuardFBAngleMax);
 }
 
-/* 800DD3E4-800DD894 0D7D24 04B0+00 1/1 0/0 0/0 .text
- * procGuardSlipInit__9daAlink_cFiP12dCcD_GObjInf               */
 // NONMATCHING - extra useless mr
 int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) {
     if (mProcID == PROC_GUARD_SLIP) {
@@ -338,7 +312,6 @@ int daAlink_c::procGuardSlipInit(int param_0, dCcD_GObjInf* param_1) {
     return 1;
 }
 
-/* 800DD894-800DDA10 0D81D4 017C+00 1/0 0/0 0/0 .text            procGuardSlip__9daAlink_cFv */
 int daAlink_c::procGuardSlip() {
     if (mEquipItem != fpcNm_ITEM_IRONBALL) {
         setUpperGuardAnime(-1.0f);
@@ -384,8 +357,6 @@ int daAlink_c::procGuardSlip() {
     return 1;
 }
 
-/* 800DDA10-800DDBA8 0D8350 0198+00 2/1 0/0 0/0 .text            procGuardAttackInit__9daAlink_cFv
- */
 int daAlink_c::procGuardAttackInit() {
     if (mDemo.getDemoMode() == 0x4B && mProcID == PROC_GUARD_ATTACK) {
         return 1;
@@ -434,7 +405,6 @@ int daAlink_c::procGuardAttackInit() {
     return 1;
 }
 
-/* 800DDBA8-800DDE58 0D84E8 02B0+00 1/0 0/0 0/0 .text            procGuardAttack__9daAlink_cFv */
 int daAlink_c::procGuardAttack() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -509,7 +479,6 @@ int daAlink_c::procGuardAttack() {
     return 1;
 }
 
-/* 800DDE58-800DDF2C 0D8798 00D4+00 2/2 0/0 0/0 .text            procGuardBreakInit__9daAlink_cFv */
 int daAlink_c::procGuardBreakInit() {
     commonProcInit(PROC_GUARD_BREAK);
     setSingleAnimeParam(ANM_GUARD_BREAK, &daAlinkHIO_guard_c0::m.mGuardBreakAnm);
@@ -525,7 +494,6 @@ int daAlink_c::procGuardBreakInit() {
     return 1;
 }
 
-/* 800DDF2C-800DE008 0D886C 00DC+00 1/0 0/0 0/0 .text            procGuardBreak__9daAlink_cFv */
 int daAlink_c::procGuardBreak() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -550,7 +518,6 @@ int daAlink_c::procGuardBreak() {
     return 1;
 }
 
-/* 800DE008-800DE380 0D8948 0378+00 2/2 0/0 0/0 .text            procTurnMoveInit__9daAlink_cFi */
 int daAlink_c::procTurnMoveInit(int param_0) {
     BOOL temp_r27 = checkUpperGuardAnime();
     fopAc_ac_c* temp_r28 = mTargetedActor;
@@ -620,7 +587,6 @@ int daAlink_c::procTurnMoveInit(int param_0) {
     return 1;
 }
 
-/* 800DE380-800DE64C 0D8CC0 02CC+00 1/0 0/0 0/0 .text            procTurnMove__9daAlink_cFv */
 int daAlink_c::procTurnMove() {
     onEndResetFlg0(ERFLG0_UNK_8000000);
     s16 temp_r28 = mProcVar2.field_0x300c;
diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc
index 2b5ef8eeed..414792af90 100644
--- a/src/d/actor/d_a_alink_hang.inc
+++ b/src/d/actor/d_a_alink_hang.inc
@@ -12,14 +12,11 @@
 #include "d/actor/d_a_obj_lv5yiblltray.h"
 #include "d/actor/d_a_obj_swhang.h"
 
-/* 800F9FDC-800F9FFC 0F491C 0020+00 2/2 0/0 0/0 .text            getHangMoveAnmSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getHangMoveAnmSpeed() {
     return getAnmSpeedStickRate(daAlinkHIO_wallMove_c0::m.mMinAnmSpeed,
                                 daAlinkHIO_wallMove_c0::m.mMaxAnmSpeed);
 }
 
-/* 800F9FFC-800FA070 0F493C 0074+00 3/3 0/0 0/0 .text getHangDirectionFromAngle__9daAlink_cFv */
 int daAlink_c::getHangDirectionFromAngle() {
     s16 angle = field_0x2fe2 - shape_angle.y;
     if (abs(angle) > 0x78E4) {
@@ -37,8 +34,6 @@ int daAlink_c::getHangDirectionFromAngle() {
     return DIR_FORWARD;
 }
 
-/* 800FA070-800FA338 0F49B0 02C8+00 2/2 0/0 0/0 .text            hangMoveBgCheck__9daAlink_cFsP4cXyz
- */
 BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) {
     BOOL rt = false;
     cM3dGPla sp78;
@@ -98,7 +93,6 @@ BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) {
 }
 
 
-/* 800FA338-800FA5C8 0F4C78 0290+00 3/3 0/0 0/0 .text            changeHangMoveProc__9daAlink_cFi */
 BOOL daAlink_c::changeHangMoveProc(int i_direction) {
     if (!mLinkAcch.ChkGroundHit() || !dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd)) {
         return false;
@@ -158,7 +152,6 @@ BOOL daAlink_c::changeHangMoveProc(int i_direction) {
 }
 
 
-/* 800FA5C8-800FA6E4 0F4F08 011C+00 5/5 0/0 0/0 .text            checkHangFootWall__9daAlink_cFv */
 bool daAlink_c::checkHangFootWall() {
     f32 var_f31 = cM_ssin(shape_angle.y);
     f32 var_f30 = cM_scos(shape_angle.y);
@@ -181,7 +174,6 @@ bool daAlink_c::checkHangFootWall() {
 }
 
 
-/* 800FA6E4-800FA78C 0F5024 00A8+00 10/10 0/0 0/0 .text            setHangGroundY__9daAlink_cFv */
 void daAlink_c::setHangGroundY() {
     cXyz pos;
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &pos);
@@ -194,7 +186,6 @@ void daAlink_c::setHangGroundY() {
 }
 
 
-/* 800FA78C-800FA85C 0F50CC 00D0+00 5/5 0/0 0/0 .text            changeHangEndProc__9daAlink_cFv */
 int daAlink_c::changeHangEndProc() {
     setHangGroundY();
 
@@ -215,7 +206,6 @@ int daAlink_c::changeHangEndProc() {
     return 0;
 }
 
-/* 800FA85C-800FAA7C 0F519C 0220+00 3/3 0/0 0/0 .text checkHangStartSideWall__9daAlink_cFs */
 void daAlink_c::checkHangStartSideWall(s16 param_0) {
     s16 var_r28 = param_0 - 0x4000;
     s16 var_r27 = param_0 + 0x8000;
@@ -265,7 +255,6 @@ void daAlink_c::checkHangStartSideWall(s16 param_0) {
 }
 
 
-/* 800FAA7C-800FAE14 0F53BC 0398+00 3/3 0/0 0/0 .text            procHangStartInit__9daAlink_cFv */
 int daAlink_c::procHangStartInit() {
     cXyz sp2C = field_0x34ec - current.pos;
 
@@ -321,7 +310,6 @@ int daAlink_c::procHangStartInit() {
 }
 
 
-/* 800FAE14-800FAECC 0F5754 00B8+00 1/0 0/0 0/0 .text            procHangStart__9daAlink_cFv */
 int daAlink_c::procHangStart() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -340,8 +328,6 @@ int daAlink_c::procHangStart() {
     return 1;
 }
 
-/* 800FAECC-800FB1A4 0F580C 02D8+00 1/1 0/0 0/0 .text procHangFallStartInit__9daAlink_cFP8cM3dGPla
- */
 int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) {
     s16 var_r30 = param_0->mNormal.atan2sX_Z();
     current.pos.x -= param_0->mNormal.x * 1.5f;
@@ -412,7 +398,6 @@ int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) {
 }
 
 
-/* 800FB1A4-800FB2A0 0F5AE4 00FC+00 1/0 0/0 0/0 .text            procHangFallStart__9daAlink_cFv */
 int daAlink_c::procHangFallStart() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -444,7 +429,6 @@ int daAlink_c::procHangFallStart() {
     return 1;
 }
 
-/* 800FB2A0-800FB328 0F5BE0 0088+00 1/1 0/0 0/0 .text            procHangUpInit__9daAlink_cFi */
 int daAlink_c::procHangUpInit(int param_0) {
     commonProcInit(PROC_HANG_UP);
     setSingleAnimeParam(ANM_HANG_ONE_HAND_MOVE, &daAlinkHIO_wallFall_c0::m.mTwoHandGrabAnm);
@@ -457,7 +441,6 @@ int daAlink_c::procHangUpInit(int param_0) {
     return 1;
 }
 
-/* 800FB328-800FB43C 0F5C68 0114+00 1/0 0/0 0/0 .text            procHangUp__9daAlink_cFv */
 int daAlink_c::procHangUp() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -483,7 +466,6 @@ int daAlink_c::procHangUp() {
 }
 
 
-/* 800FB43C-800FB544 0F5D7C 0108+00 3/3 0/0 0/0 .text            procHangWaitInit__9daAlink_cFv */
 int daAlink_c::procHangWaitInit() {
     commonProcInit(PROC_HANG_WAIT);
 
@@ -507,7 +489,6 @@ int daAlink_c::procHangWaitInit() {
 }
 
 
-/* 800FB544-800FB650 0F5E84 010C+00 1/0 0/0 0/0 .text            procHangWait__9daAlink_cFv */
 int daAlink_c::procHangWait() {
     if (changeHangEndProc()) {
         return 1;
@@ -537,7 +518,6 @@ int daAlink_c::procHangWait() {
 }
 
 
-/* 800FB650-800FB790 0F5F90 0140+00 3/3 0/0 0/0 .text            procHangMoveInit__9daAlink_cFi */
 int daAlink_c::procHangMoveInit(int param_0) {
     commonProcInit(PROC_HANG_MOVE);
 
@@ -585,7 +565,6 @@ int daAlink_c::procHangMoveInit(int param_0) {
 }
 
 
-/* 800FB790-800FBBC8 0F60D0 0438+00 1/0 0/0 0/0 .text            procHangMove__9daAlink_cFv */
 int daAlink_c::procHangMove() {
     int direction = getHangDirectionFromAngle();
     field_0x2f99 = 1;
@@ -694,7 +673,6 @@ int daAlink_c::procHangMove() {
 }
 
 
-/* 800FBBC8-800FBCD4 0F6508 010C+00 6/6 0/0 0/0 .text            procHangClimbInit__9daAlink_cFf */
 int daAlink_c::procHangClimbInit(f32 param_0) {
     if (mLinkAcch.ChkRoofHit() || field_0x3174 == 6) {
         return 0;
@@ -723,7 +701,6 @@ int daAlink_c::procHangClimbInit(f32 param_0) {
 }
 
 
-/* 800FBCD4-800FBE04 0F6614 0130+00 1/0 0/0 0/0 .text            procHangClimb__9daAlink_cFv */
 int daAlink_c::procHangClimb() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     setHangGroundY();
@@ -762,8 +739,6 @@ int daAlink_c::procHangClimb() {
 }
 
 
-/* 800FBE04-800FC0D8 0F6744 02D4+00 3/3 0/0 0/0 .text            procHangWallCatchInit__9daAlink_cFv
- */
 int daAlink_c::procHangWallCatchInit() {
     cXyz sp2C = field_0x34ec - current.pos;
     if (sp2C.absXZ() > mAcchCir[0].GetWallR() + 20.0f) {
@@ -802,7 +777,6 @@ int daAlink_c::procHangWallCatchInit() {
 }
 
 
-/* 800FC0D8-800FC178 0F6A18 00A0+00 1/0 0/0 0/0 .text            procHangWallCatch__9daAlink_cFv */
 int daAlink_c::procHangWallCatch() {
     setHangGroundY();
 
@@ -819,7 +793,6 @@ int daAlink_c::procHangWallCatch() {
     return 1;
 }
 
-/* 800FC178-800FC240 0F6AB8 00C8+00 4/4 0/0 0/0 .text            procHangReadyInit__9daAlink_cFv */
 int daAlink_c::procHangReadyInit() {
     if (field_0x2f91 == 3 && mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(0x5C, NULL);
@@ -842,7 +815,6 @@ int daAlink_c::procHangReadyInit() {
     return 1;
 }
 
-/* 800FC240-800FC2F4 0F6B80 00B4+00 1/0 0/0 0/0 .text            procHangReady__9daAlink_cFv */
 int daAlink_c::procHangReady() {
     cLib_addCalcAngleS(&shape_angle.y, mProcVar2.field_0x300c, 2, 0x1000, 0x400);
     current.angle.y = shape_angle.y;
@@ -868,8 +840,6 @@ int daAlink_c::procHangReady() {
     return 1;
 }
 
-/* 800FC2F4-800FC390 0F6C34 009C+00 2/2 0/0 0/0 .text            procHangLeverDownInit__9daAlink_cFv
- */
 int daAlink_c::procHangLeverDownInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_HANG_LEVER_DOWN, field_0x27f4);
@@ -887,7 +857,6 @@ int daAlink_c::procHangLeverDownInit() {
     return 1;
 }
 
-/* 800FC390-800FC568 0F6CD0 01D8+00 1/0 0/0 0/0 .text            procHangLeverDown__9daAlink_cFv */
 int daAlink_c::procHangLeverDown() {
     daObjYIblltray_c* lever = (daObjYIblltray_c*)field_0x280c.getActor();
     if (lever == NULL) {
@@ -932,15 +901,12 @@ int daAlink_c::procHangLeverDown() {
 }
 
 
-/* 800FC568-800FC5A4 0F6EA8 003C+00 1/0 0/0 0/0 .text changeDragonActor__9daAlink_cFP10fopAc_ac_c
- */
 void daAlink_c::changeDragonActor(fopAc_ac_c* param_0) {
     if (field_0x280c.getActor() != NULL && fopAcM_GetName(field_0x280c.getActor()) == PROC_B_DR) {
         field_0x280c.setData(param_0);
     }
 }
 
-/* 800FC5A4-800FC6B4 0F6EE4 0110+00 1/1 0/0 0/0 .text            setDragonHangPos__9daAlink_cFv */
 int daAlink_c::setDragonHangPos() {
     fopAc_ac_c* dragon = field_0x280c.getActor();
     if (dragon == NULL) {
@@ -968,7 +934,6 @@ int daAlink_c::setDragonHangPos() {
 }
 
 
-/* 800FC6B4-800FC748 0F6FF4 0094+00 1/1 0/0 0/0 .text            setOctaIealHangPos__9daAlink_cFv */
 int daAlink_c::setOctaIealHangPos() {
     b_ob_class* boss = (b_ob_class*)field_0x280c.getActor();
     if (boss == NULL) {
@@ -982,7 +947,6 @@ int daAlink_c::setOctaIealHangPos() {
     return 1;
 }
 
-/* 800FC748-800FC77C 0F7088 0034+00 2/2 0/0 0/0 .text            setBossBodyHangPos__9daAlink_cFv */
 int daAlink_c::setBossBodyHangPos() {
     if (field_0x32cc != 0) {
         return setDragonHangPos();
@@ -991,8 +955,6 @@ int daAlink_c::setBossBodyHangPos() {
     }
 }
 
-/* 800FC77C-800FC870 0F70BC 00F4+00 1/1 0/0 0/0 .text
- * procBossBodyHangInit__9daAlink_cFP10fopAc_ac_c               */
 int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_BOSS_BODY_HANG);
 
@@ -1027,7 +989,6 @@ int daAlink_c::procBossBodyHangInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 800FC870-800FCF58 0F71B0 06E8+00 1/0 0/0 0/0 .text            procBossBodyHang__9daAlink_cFv */
 int daAlink_c::procBossBodyHang() {
     fopEn_enemy_c* boss = (fopEn_enemy_c*)field_0x280c.getActor();
 
@@ -1190,13 +1151,10 @@ int daAlink_c::procBossBodyHang() {
 }
 
 
-/* 800FCF58-800FCF84 0F7898 002C+00 2/2 0/0 0/0 .text            getLadderUnitCount__9daAlink_cCFv
- */
 int daAlink_c::getLadderUnitCount() const {
     return (current.pos.y - field_0x34ec.y) * 0.026666667f;
 }
 
-/* 800FCF84-800FD048 0F78C4 00C4+00 1/1 0/0 0/0 .text            setLadderInit__9daAlink_cFv */
 int daAlink_c::setLadderInit() {
     onNoResetFlg3(FLG3_UNK_400000);
 
@@ -1217,7 +1175,6 @@ int daAlink_c::setLadderInit() {
 }
 
 
-/* 800FD048-800FD1F0 0F7988 01A8+00 1/1 0/0 0/0 .text            setLadderPosInit__9daAlink_cFv */
 void daAlink_c::setLadderPosInit() {
     cXyz sp20;
     cXyz sp2C;
@@ -1265,7 +1222,6 @@ void daAlink_c::setLadderPosInit() {
 }
 
 
-/* 800FD1F0-800FD288 0F7B30 0098+00 2/2 0/0 0/0 .text            setLadderPos__9daAlink_cFi */
 void daAlink_c::setLadderPos(int param_0) {
     f32 var_f31 = cM_ssin(field_0x306e);
     f32 var_f30 = cM_scos(field_0x306e);
@@ -1278,15 +1234,11 @@ void daAlink_c::setLadderPos(int param_0) {
 }
 
 
-/* 800FD288-800FD2AC 0F7BC8 0024+00 2/2 0/0 0/0 .text            getLadderMoveAnmSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getLadderMoveAnmSpeed() {
     return getAnmSpeedStickRate(daAlinkHIO_ladder_c0::m.mMoveMinASpeed,
                                 daAlinkHIO_ladder_c0::m.mMoveMaxSpeed);
 }
 
-/* 800FD2AC-800FD4A8 0F7BEC 01FC+00 3/3 0/0 0/0 .text            changeLadderMoveProc__9daAlink_cFi
- */
 int daAlink_c::changeLadderMoveProc(int param_0) {
     cLib_addCalc(&current.pos.x, field_0x37c8.x, 0.5f, 0.5f, 0.05f);
     cLib_addCalc(&current.pos.y, field_0x37c8.y, 0.5f, 0.5f, 0.05f);
@@ -1339,7 +1291,6 @@ int daAlink_c::changeLadderMoveProc(int param_0) {
 }
 
 
-/* 800FD4A8-800FD5E4 0F7DE8 013C+00 5/5 0/0 0/0 .text setMoveBGLadderCorrect__9daAlink_cFv */
 int daAlink_c::setMoveBGLadderCorrect() {
     if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo1) && dComIfG_Bgsp().ChkMoveBG(mPolyInfo1)) {
         dComIfG_Bgsp().MoveBgTransPos(mPolyInfo1, true, &current.pos, &current.angle, &shape_angle);
@@ -1359,7 +1310,6 @@ int daAlink_c::setMoveBGLadderCorrect() {
 }
 
 
-/* 800FD5E4-800FD648 0F7F24 0064+00 8/8 0/0 0/0 .text            checkLadderFall__9daAlink_cFv */
 int daAlink_c::checkLadderFall() {
     setDoStatus(0x33);
 
@@ -1371,8 +1321,6 @@ int daAlink_c::checkLadderFall() {
     return 0;
 }
 
-/* 800FD648-800FD7B0 0F7F88 0168+00 2/2 0/0 0/0 .text            procLadderUpStartInit__9daAlink_cFv
- */
 int daAlink_c::procLadderUpStartInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_LADDER_UP_START, NULL);
@@ -1410,7 +1358,6 @@ int daAlink_c::procLadderUpStartInit() {
 }
 
 
-/* 800FD7B0-800FD824 0F80F0 0074+00 1/0 0/0 0/0 .text            procLadderUpStart__9daAlink_cFv */
 int daAlink_c::procLadderUpStart() {
     if (setMoveBGLadderCorrect()) {
         return 1;
@@ -1425,8 +1372,6 @@ int daAlink_c::procLadderUpStart() {
     return 1;
 }
 
-/* 800FD824-800FD8E8 0F8164 00C4+00 2/2 0/0 0/0 .text            procLadderUpEndInit__9daAlink_cFi
- */
 int daAlink_c::procLadderUpEndInit(int param_0) {
     commonProcInit(PROC_LADDER_UP_END);
 
@@ -1449,7 +1394,6 @@ int daAlink_c::procLadderUpEndInit(int param_0) {
     return 1;
 }
 
-/* 800FD8E8-800FD9CC 0F8228 00E4+00 1/0 0/0 0/0 .text            procLadderUpEnd__9daAlink_cFv */
 int daAlink_c::procLadderUpEnd() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -1476,7 +1420,6 @@ int daAlink_c::procLadderUpEnd() {
     return 1;
 }
 
-/* 800FD9CC-800FDB74 0F830C 01A8+00 2/2 0/0 0/0 .text procLadderDownStartInit__9daAlink_cFv */
 int daAlink_c::procLadderDownStartInit() {
     onNoResetFlg3(FLG3_UNK_400000);
 
@@ -1520,8 +1463,6 @@ int daAlink_c::procLadderDownStartInit() {
 }
 
 
-/* 800FDB74-800FDC18 0F84B4 00A4+00 1/0 0/0 0/0 .text            procLadderDownStart__9daAlink_cFv
- */
 int daAlink_c::procLadderDownStart() {
     if (setMoveBGLadderCorrect()) {
         return 1;
@@ -1542,8 +1483,6 @@ int daAlink_c::procLadderDownStart() {
     return 1;
 }
 
-/* 800FDC18-800FDCCC 0F8558 00B4+00 1/1 0/0 0/0 .text            procLadderDownEndInit__9daAlink_cFi
- */
 int daAlink_c::procLadderDownEndInit(int param_0) {
     commonProcInit(PROC_LADDER_DOWN_END);
 
@@ -1561,7 +1500,6 @@ int daAlink_c::procLadderDownEndInit(int param_0) {
     return 1;
 }
 
-/* 800FDCCC-800FDD90 0F860C 00C4+00 1/0 0/0 0/0 .text            procLadderDownEnd__9daAlink_cFv */
 int daAlink_c::procLadderDownEnd() {
     if (setMoveBGLadderCorrect()) {
         return 1;
@@ -1585,7 +1523,6 @@ int daAlink_c::procLadderDownEnd() {
     return 1;
 }
 
-/* 800FDD90-800FDF50 0F86D0 01C0+00 3/3 0/0 0/0 .text procLadderMoveInit__9daAlink_cFiiP4cXyz */
 int daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) {
     BOOL var_r28 = checkModeFlg(2) ? true : false;
     f32 anm_speed = getLadderMoveAnmSpeed();
@@ -1652,7 +1589,6 @@ int daAlink_c::procLadderMoveInit(int param_0, int param_1, cXyz* param_2) {
 }
 
 
-/* 800FDF50-800FE010 0F8890 00C0+00 1/0 0/0 0/0 .text            procLadderMove__9daAlink_cFv */
 int daAlink_c::procLadderMove() {
     if (setMoveBGLadderCorrect()) {
         return 1;
@@ -1677,20 +1613,16 @@ int daAlink_c::procLadderMove() {
     return 1;
 }
 
-/* 800FE010-800FE034 0F8950 0024+00 3/3 0/0 0/0 .text getClimbMoveUpDownAnmSpeed__9daAlink_cFv */
 f32 daAlink_c::getClimbMoveUpDownAnmSpeed() {
     return getAnmSpeedStickRate(daAlinkHIO_ladder_c0::m.mWallVerticalMinAnmSpeed,
                                 daAlinkHIO_ladder_c0::m.mWallVerticalMaxAnmSpeed);
 }
 
-/* 800FE034-800FE058 0F8974 0024+00 4/4 0/0 0/0 .text getClimbMoveSideAnmSpeed__9daAlink_cFv */
 f32 daAlink_c::getClimbMoveSideAnmSpeed() {
     return getAnmSpeedStickRate(daAlinkHIO_ladder_c0::m.mWallHorizontalMinAnmSpeed,
                                 daAlinkHIO_ladder_c0::m.mWallHorizontalMaxAnmSpeed);
 }
 
-/* 800FE058-800FE114 0F8998 00BC+00 9/9 0/0 0/0 .text checkClimbCode__9daAlink_cFR13cBgS_PolyInfo
- */
 BOOL daAlink_c::checkClimbCode(cBgS_PolyInfo& i_poly) {
     dBgW_Base* bgw_p = dComIfG_Bgsp().GetBgWBasePointer(i_poly);
 
@@ -1699,7 +1631,6 @@ BOOL daAlink_c::checkClimbCode(cBgS_PolyInfo& i_poly) {
            bgw_p->ChkPushPullOk();
 }
 
-/* 800FE114-800FE174 0F8A54 0060+00 1/1 0/0 0/0 .text            setClimbInit__9daAlink_cFv */
 BOOL daAlink_c::setClimbInit() {
     onNoResetFlg3(FLG3_UNK_400000);
 
@@ -1712,8 +1643,6 @@ BOOL daAlink_c::setClimbInit() {
     }
 }
 
-/* 800FE174-800FE3C4 0F8AB4 0250+00 8/8 0/0 0/0 .text            setClimbShapeOffset__9daAlink_cFv
- */
 void daAlink_c::setClimbShapeOffset() {
     cXyz sp54;
     cXyz sp60;
@@ -1765,7 +1694,6 @@ void daAlink_c::setClimbShapeOffset() {
 }
 
 
-/* 800FE3C4-800FE438 0F8D04 0074+00 1/1 0/0 0/0 .text getClimbDirectionFromAngle__9daAlink_cFv */
 int daAlink_c::getClimbDirectionFromAngle() {
     s16 angle = field_0x2fe2 - shape_angle.y;
     if (abs(angle) > 0x7000) {
@@ -1783,8 +1711,6 @@ int daAlink_c::getClimbDirectionFromAngle() {
     return DIR_FORWARD;
 }
 
-/* 800FE438-800FE5A0 0F8D78 0168+00 3/3 0/0 0/0 .text            changeClimbMoveProc__9daAlink_cFi
- */
 void daAlink_c::changeClimbMoveProc(int param_0) {
     s16 temp_r29 = field_0x308c;
 
@@ -1814,7 +1740,6 @@ void daAlink_c::changeClimbMoveProc(int param_0) {
 }
 
 
-/* 800FE5A0-800FE6E8 0F8EE0 0148+00 2/2 0/0 0/0 .text checkClimbMoveUpDownProc__9daAlink_cFi */
 BOOL daAlink_c::checkClimbMoveUpDownProc(int i_direction) {
     f32 var_f31 = cM_ssin(shape_angle.y);
     f32 var_f30 = cM_scos(shape_angle.y);
@@ -1844,7 +1769,6 @@ BOOL daAlink_c::checkClimbMoveUpDownProc(int i_direction) {
 }
 
 
-/* 800FE6E8-800FE868 0F9028 0180+00 2/2 0/0 0/0 .text checkClimbMoveSideProc__9daAlink_cFi */
 BOOL daAlink_c::checkClimbMoveSideProc(int i_direction) {
     f32 var_f31 = cM_ssin(shape_angle.y);
     f32 var_f30 = cM_scos(shape_angle.y);
@@ -1876,8 +1800,6 @@ BOOL daAlink_c::checkClimbMoveSideProc(int i_direction) {
 }
 
 
-/* 800FE868-800FEB90 0F91A8 0328+00 6/6 0/0 0/0 .text            setMoveBGClimbCorrect__9daAlink_cFv
- */
 int daAlink_c::setMoveBGClimbCorrect() {
     if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo1) && dComIfG_Bgsp().ChkMoveBG(mPolyInfo1)) {
         dComIfG_Bgsp().MoveBgTransPos(mPolyInfo1, true, &current.pos, &current.angle, &shape_angle);
@@ -1939,8 +1861,6 @@ int daAlink_c::setMoveBGClimbCorrect() {
 }
 
 
-/* 800FEB90-800FEC70 0F94D0 00E0+00 1/1 0/0 0/0 .text
- * checkBgCorrectClimbMove__9daAlink_cFP4cXyzP4cXyz             */
 int daAlink_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) {
     if (commonLineCheck(i_startPos, i_endPos)) {
         cM3dGPla tri_plane;
@@ -1958,7 +1878,6 @@ int daAlink_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) {
 }
 
 
-/* 800FEC70-800FED50 0F95B0 00E0+00 2/2 0/0 0/0 .text            checkClimbRoof__9daAlink_cFf */
 BOOL daAlink_c::checkClimbRoof(f32 param_0) {
     cXyz sp44(current.pos.x - cM_ssin(shape_angle.y) * 30.0f, param_0 - 30.0f,
               current.pos.z - cM_scos(shape_angle.y) * 30.0f);
@@ -1974,7 +1893,6 @@ BOOL daAlink_c::checkClimbRoof(f32 param_0) {
 }
 
 
-/* 800FED50-800FEEC0 0F9690 0170+00 2/2 0/0 0/0 .text checkClimbGround__9daAlink_cFP4cXyzf */
 int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
     f32 var_f30 = cM_ssin(shape_angle.y);
     f32 var_f29 = cM_scos(shape_angle.y);
@@ -2001,7 +1919,6 @@ int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
 }
 
 
-/* 800FEEC0-800FF28C 0F9800 03CC+00 5/5 0/0 0/0 .text            checkBgClimbMove__9daAlink_cFi */
 BOOL daAlink_c::checkBgClimbMove(int i_direction) {
     f32 var_r28 = cM_ssin(shape_angle.y);
     f32 var_r27 = cM_scos(shape_angle.y);
@@ -2087,7 +2004,6 @@ BOOL daAlink_c::checkBgClimbMove(int i_direction) {
 }
 
 
-/* 800FF28C-800FF450 0F9BCC 01C4+00 2/2 0/0 0/0 .text setClimbStartNotGround__9daAlink_cFv */
 int daAlink_c::setClimbStartNotGround() {
     if (mProcID == PROC_HOOKSHOT_FLY) {
         current.pos.y = mHookshotTopPos.y;
@@ -2129,8 +2045,6 @@ int daAlink_c::setClimbStartNotGround() {
 }
 
 
-/* 800FF450-800FF704 0F9D90 02B4+00 2/2 0/0 0/0 .text            procClimbUpStartInit__9daAlink_cFi
- */
 int daAlink_c::procClimbUpStartInit(int param_0) {
     setFrontWallType();
     if (field_0x2f91 != 3) {
@@ -2188,7 +2102,6 @@ int daAlink_c::procClimbUpStartInit(int param_0) {
 }
 
 
-/* 800FF704-800FF818 0FA044 0114+00 1/0 0/0 0/0 .text            procClimbUpStart__9daAlink_cFv */
 int daAlink_c::procClimbUpStart() {
     if (setMoveBGClimbCorrect()) {
         return 1;
@@ -2214,7 +2127,6 @@ int daAlink_c::procClimbUpStart() {
 }
 
 
-/* 800FF818-800FF9A8 0FA158 0190+00 1/1 0/0 0/0 .text procClimbDownStartInit__9daAlink_cFs */
 int daAlink_c::procClimbDownStartInit(s16 param_0) {
     onNoResetFlg3(FLG3_UNK_400000);
     commonProcInit(PROC_CLIMB_DOWN_START);
@@ -2251,7 +2163,6 @@ int daAlink_c::procClimbDownStartInit(s16 param_0) {
 }
 
 
-/* 800FF9A8-800FFAB0 0FA2E8 0108+00 1/0 0/0 0/0 .text            procClimbDownStart__9daAlink_cFv */
 int daAlink_c::procClimbDownStart() {
     if (setMoveBGClimbCorrect()) {
         return 1;
@@ -2284,7 +2195,6 @@ int daAlink_c::procClimbDownStart() {
 }
 
 
-/* 800FFAB0-800FFC58 0FA3F0 01A8+00 1/1 0/0 0/0 .text procClimbMoveUpDownInit__9daAlink_cFi */
 int daAlink_c::procClimbMoveUpDownInit(int param_0) {
     commonProcInit(PROC_CLIMB_MOVE_UPDOWN);
     current.angle.y = shape_angle.y;
@@ -2343,8 +2253,6 @@ int daAlink_c::procClimbMoveUpDownInit(int param_0) {
 }
 
 
-/* 800FFC58-800FFDB0 0FA598 0158+00 1/0 0/0 0/0 .text            procClimbMoveUpDown__9daAlink_cFv
- */
 int daAlink_c::procClimbMoveUpDown() {
     if (setMoveBGClimbCorrect()) {
         return 1;
@@ -2387,8 +2295,6 @@ int daAlink_c::procClimbMoveUpDown() {
 }
 
 
-/* 800FFDB0-800FFF4C 0FA6F0 019C+00 1/1 0/0 0/0 .text            procClimbMoveSideInit__9daAlink_cFv
- */
 int daAlink_c::procClimbMoveSideInit() {
     f32 anm_speed = getClimbMoveSideAnmSpeed();
     commonProcInit(PROC_CLIMB_MOVE_SIDE);
@@ -2432,7 +2338,6 @@ int daAlink_c::procClimbMoveSideInit() {
 }
 
 
-/* 800FFF4C-801000F8 0FA88C 01AC+00 1/0 0/0 0/0 .text            procClimbMoveSide__9daAlink_cFv */
 int daAlink_c::procClimbMoveSide() {
     f32 var_f30 = current.pos.y;
 
@@ -2479,7 +2384,6 @@ int daAlink_c::procClimbMoveSide() {
 }
 
 
-/* 801000F8-80100258 0FAA38 0160+00 7/7 0/0 0/0 .text            procClimbWaitInit__9daAlink_cFii */
 int daAlink_c::procClimbWaitInit(int param_0, int param_1) {
     if (!commonProcInitNotSameProc(PROC_CLIMB_WAIT)) {
         return 0;
@@ -2522,7 +2426,6 @@ int daAlink_c::procClimbWaitInit(int param_0, int param_1) {
 }
 
 
-/* 80100258-801003E4 0FAB98 018C+00 1/0 0/0 0/0 .text            procClimbWait__9daAlink_cFv */
 int daAlink_c::procClimbWait() {
     if (setMoveBGClimbCorrect()) {
         return 1;
@@ -2563,8 +2466,6 @@ int daAlink_c::procClimbWait() {
 }
 
 
-/* 801003E4-80100464 0FAD24 0080+00 2/2 0/0 0/0 .text            procClimbToRoofInit__9daAlink_cFv
- */
 int daAlink_c::procClimbToRoofInit() {
     commonProcInit(PROC_CLIMB_TO_ROOF);
     setSingleAnimeBase(ANM_ROOF_UP);
@@ -2579,7 +2480,6 @@ int daAlink_c::procClimbToRoofInit() {
     return 1;
 }
 
-/* 80100464-801005CC 0FADA4 0168+00 1/0 0/0 0/0 .text            procClimbToRoof__9daAlink_cFv */
 int daAlink_c::procClimbToRoof() {
     if (setMoveBGClimbCorrect()) {
         return 1;
@@ -2612,20 +2512,16 @@ int daAlink_c::procClimbToRoof() {
 }
 
 
-/* 801005CC-801005F0 0FAF0C 0024+00 2/2 0/0 0/0 .text getRoofHangFMoveAnmSpeed__9daAlink_cCFv */
 f32 daAlink_c::getRoofHangFMoveAnmSpeed() const {
     return getAnmSpeedStickRate(daAlinkHIO_roofHang_c0::m.mVertMoveMinASpeed,
                                 daAlinkHIO_roofHang_c0::m.mVertMoveMaxASpeed);
 }
 
-/* 801005F0-80100614 0FAF30 0024+00 2/2 0/0 0/0 .text getRoofHangSMoveAnmSpeed__9daAlink_cCFv */
 f32 daAlink_c::getRoofHangSMoveAnmSpeed() const {
     return getAnmSpeedStickRate(daAlinkHIO_roofHang_c0::m.mHorizMoveMinASpeed,
                                 daAlinkHIO_roofHang_c0::m.mHorizMoveMaxASpeed);
 }
 
-/* 80100614-80100668 0FAF54 0054+00 3/3 0/0 0/0 .text
- * setRoofHangHandOnSE__9daAlink_cFP13cBgS_PolyInfo             */
 void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* unused) {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -2634,8 +2530,6 @@ void daAlink_c::setRoofHangHandOnSE(cBgS_PolyInfo* unused) {
     }
 }
 
-/* 80100668-80100770 0FAFA8 0108+00 3/3 0/0 0/0 .text            checkRoofHangMovePos__9daAlink_cFv
- */
 int daAlink_c::checkRoofHangMovePos() {
     static const s16 offsetAngle[] = {
         0x0000,
@@ -2664,7 +2558,6 @@ int daAlink_c::checkRoofHangMovePos() {
 }
 
 
-/* 80100770-801008EC 0FB0B0 017C+00 5/5 0/0 0/0 .text            commonRoofHangProc__9daAlink_cFv */
 int daAlink_c::commonRoofHangProc() {
     if (dComIfG_Bgsp().ChkPolySafe(mPolyInfo2) && dComIfG_Bgsp().ChkMoveBG(mPolyInfo2)) {
         dComIfG_Bgsp().MoveBgTransPos(mPolyInfo2, true, &current.pos, &current.angle, &shape_angle);
@@ -2693,7 +2586,6 @@ int daAlink_c::commonRoofHangProc() {
 }
 
 
-/* 801008EC-80100A10 0FB22C 0124+00 5/5 0/0 0/0 .text checkNextActionRoofHang__9daAlink_cFv */
 int daAlink_c::checkNextActionRoofHang() {
     if (checkInputOnR()) {
         field_0x2f98 = getDirectionFromShapeAngle();
@@ -2729,8 +2621,6 @@ int daAlink_c::checkNextActionRoofHang() {
 }
 
 
-/* 80100A10-80100AE4 0FB350 00D4+00 2/2 0/0 0/0 .text
- * procRoofHangStartInit__9daAlink_cFRC13cBgS_PolyInfoRC4cXyzi  */
 int daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& param_1,
                                      int param_2) {
     commonProcInit(PROC_ROOF_HANG_START);
@@ -2752,7 +2642,6 @@ int daAlink_c::procRoofHangStartInit(cBgS_PolyInfo const& param_0, cXyz const& p
     return 1;
 }
 
-/* 80100AE4-80100BB4 0FB424 00D0+00 1/0 0/0 0/0 .text            procRoofHangStart__9daAlink_cFv */
 int daAlink_c::procRoofHangStart() {
     if (commonRoofHangProc()) {
         return 1;
@@ -2776,8 +2665,6 @@ int daAlink_c::procRoofHangStart() {
     return 1;
 }
 
-/* 80100BB4-80100D38 0FB4F4 0184+00 4/4 0/0 0/0 .text            procRoofHangWaitInit__9daAlink_cFi
- */
 int daAlink_c::procRoofHangWaitInit(int param_0) {
     if (!commonProcInitNotSameProc(PROC_ROOF_HANG_WAIT)) {
         return 0;
@@ -2808,7 +2695,6 @@ int daAlink_c::procRoofHangWaitInit(int param_0) {
     return 1;
 }
 
-/* 80100D38-80100DA4 0FB678 006C+00 1/0 0/0 0/0 .text            procRoofHangWait__9daAlink_cFv */
 int daAlink_c::procRoofHangWait() {
     if (commonRoofHangProc()) {
         return 1;
@@ -2825,7 +2711,6 @@ int daAlink_c::procRoofHangWait() {
     return 1;
 }
 
-/* 80100DA4-80100EEC 0FB6E4 0148+00 1/1 0/0 0/0 .text procRoofHangFrontMoveInit__9daAlink_cFv */
 int daAlink_c::procRoofHangFrontMoveInit() {
     commonProcInit(PROC_ROOF_HANG_FRONT_MOVE);
 
@@ -2862,8 +2747,6 @@ int daAlink_c::procRoofHangFrontMoveInit() {
 }
 
 
-/* 80100EEC-8010121C 0FB82C 0330+00 1/0 0/0 0/0 .text            procRoofHangFrontMove__9daAlink_cFv
- */
 int daAlink_c::procRoofHangFrontMove() {
     if (commonRoofHangProc()) {
         return 1;
@@ -2937,7 +2820,6 @@ int daAlink_c::procRoofHangFrontMove() {
 }
 
 
-/* 8010121C-80101308 0FBB5C 00EC+00 1/1 0/0 0/0 .text procRoofHangSideMoveInit__9daAlink_cFv */
 int daAlink_c::procRoofHangSideMoveInit() {
     commonProcInit(PROC_ROOF_HANG_SIDE_MOVE);
 
@@ -2965,8 +2847,6 @@ int daAlink_c::procRoofHangSideMoveInit() {
     return 1;
 }
 
-/* 80101308-801013B8 0FBC48 00B0+00 1/0 0/0 0/0 .text            procRoofHangSideMove__9daAlink_cFv
- */
 int daAlink_c::procRoofHangSideMove() {
     if (commonRoofHangProc()) {
         return 1;
@@ -2989,8 +2869,6 @@ int daAlink_c::procRoofHangSideMove() {
     return 1;
 }
 
-/* 801013B8-80101534 0FBCF8 017C+00 1/1 0/0 0/0 .text            procRoofHangTurnInit__9daAlink_cFv
- */
 int daAlink_c::procRoofHangTurnInit() {
     commonProcInit(PROC_ROOF_HANG_TURN);
 
@@ -3030,7 +2908,6 @@ int daAlink_c::procRoofHangTurnInit() {
     return 1;
 }
 
-/* 80101534-8010163C 0FBE74 0108+00 1/0 0/0 0/0 .text            procRoofHangTurn__9daAlink_cFv */
 int daAlink_c::procRoofHangTurn() {
     if (commonRoofHangProc()) {
         return 1;
@@ -3058,7 +2935,6 @@ int daAlink_c::procRoofHangTurn() {
     return 1;
 }
 
-/* 8010163C-801016AC 0FBF7C 0070+00 2/2 0/0 0/0 .text            setRoofHangSwitch__9daAlink_cFv */
 void daAlink_c::setRoofHangSwitch() {
     daObjSwHang_c* swhang_p = (daObjSwHang_c*)field_0x280c.getActor();
     current.pos = swhang_p->getHangPos();
@@ -3066,8 +2942,6 @@ void daAlink_c::setRoofHangSwitch() {
     swhang_p->setHangPlayer();
 }
 
-/* 801016AC-801017AC 0FBFEC 0100+00 1/1 0/0 0/0 .text
- * procRoofSwitchHangInit__9daAlink_cFP10fopAc_ac_c             */
 int daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_ROOF_SWITCH_HANG);
     deleteEquipItem(TRUE, FALSE);
@@ -3094,7 +2968,6 @@ int daAlink_c::procRoofSwitchHangInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 801017AC-80101874 0FC0EC 00C8+00 1/0 0/0 0/0 .text            procRoofSwitchHang__9daAlink_cFv */
 int daAlink_c::procRoofSwitchHang() {
     if (field_0x280c.getActor() == NULL) {
         return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation);
diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc
index 881da65cb8..c500f5ad88 100644
--- a/src/d/actor/d_a_alink_hook.inc
+++ b/src/d/actor/d_a_alink_hook.inc
@@ -17,7 +17,6 @@ enum {
     HS_MODE_RETURN_e = 6,
 };
 
-/* 80107900-801083C8 102240 0AC8+00 1/0 0/0 0/0 .text draw__Q29daAlink_c14hsChainShape_cFv */
 void daAlink_c::hsChainShape_c::draw() {
     daAlink_c* temp_r3 = (daAlink_c*)getUserArea();
     J3DModelData* sp60 = temp_r3->getItemModelData();
@@ -209,8 +208,6 @@ void daAlink_c::hsChainShape_c::draw() {
     }
 }
 
-/* 801083C8-8010859C 102D08 01D4+00 1/1 0/0 0/0 .text
- * hookshotAtHitCallBack__9daAlink_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor,
                                       dCcD_GObjInf* i_tgObjInf) {
     if (i_tgActor != NULL && fopAcM_IsActor(i_tgActor) && !i_tgObjInf->ChkTgHookshotThrough()) {
@@ -236,14 +233,11 @@ void daAlink_c::hookshotAtHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tg
     }
 }
 
-/* 8010859C-801085BC 102EDC 0020+00 1/1 0/0 0/0 .text
- * daAlink_hookshotAtHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daAlink_hookshotAtHitCallBack(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf,
                                           fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) {
     static_cast<daAlink_c*>(i_atActor)->hookshotAtHitCallBack(i_atObjInf, i_tgActor, i_tgObjInf);
 }
 
-/* 801085BC-80108600 102EFC 0044+00 1/0 0/0 0/0 .text            getHookshotTopPos__9daAlink_cFv */
 cXyz* daAlink_c::getHookshotTopPos() {
     if (checkHookshotItem(mEquipItem)) {
         return &mHookshotTopPos;
@@ -252,28 +246,22 @@ cXyz* daAlink_c::getHookshotTopPos() {
     return NULL;
 }
 
-/* 80108600-80108668 102F40 0068+00 1/0 0/0 0/0 .text checkHookshotReturnMode__9daAlink_cCFv */
 bool daAlink_c::checkHookshotReturnMode() const {
     return checkHookshotItem(mEquipItem) &&
            (mItemMode == HS_MODE_FLY_e || mItemMode == 5 || mItemMode == HS_MODE_RETURN_e);
 }
 
-/* 80108668-801086DC 102FA8 0074+00 1/0 0/0 0/0 .text checkHookshotShootReturnMode__9daAlink_cCFv
- */
 bool daAlink_c::checkHookshotShootReturnMode() const {
     return (checkHookshotItem(mEquipItem) && mItemMode == HS_MODE_SHOOT_e) ||
            checkHookshotReturnMode();
 }
 
-/* 801086DC-8010871C 10301C 0040+00 6/6 0/0 0/0 .text            resetHookshotMode__9daAlink_cFv */
 void daAlink_c::resetHookshotMode() {
     mItemMode = HS_MODE_NONE_e;
     initLockAt();
     mSearchBallScale = FLT_MAX;
 }
 
-/* 8010871C-80108784 10305C 0068+00 0/0 0/0 1/1 .text
- * setEnemyBombHookshot__9daAlink_cFP10fopAc_ac_c               */
 BOOL daAlink_c::setEnemyBombHookshot(fopAc_ac_c* i_actor) {
     if (mHookTargetAcKeep.getActor() != NULL) {
         cancelHookshotCarry();
@@ -284,13 +272,10 @@ BOOL daAlink_c::setEnemyBombHookshot(fopAc_ac_c* i_actor) {
     return false;
 }
 
-/* 80108784-801087B0 1030C4 002C+00 3/3 0/0 0/0 .text            checkLv7BossRoom__9daAlink_cFv */
 bool daAlink_c::checkLv7BossRoom() {
     return checkStageName("D_MN07A");
 }
 
-/* 801087B0-80108828 1030F0 0078+00 6/6 0/0 0/0 .text
- * checkHookshotStickBG__9daAlink_cFR13cBgS_PolyInfo            */
 BOOL daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& i_poly) {
     if (dComIfG_Bgsp().ChkPolyHSStick(i_poly)) {
         dBgW_Base* bgw_p = dComIfG_Bgsp().GetBgWBasePointer(i_poly);
@@ -302,8 +287,6 @@ BOOL daAlink_c::checkHookshotStickBG(cBgS_PolyInfo& i_poly) {
     return false;
 }
 
-/* 80108828-80108864 103168 003C+00 4/4 0/0 0/0 .text            cancelHookshotCarry__9daAlink_cFv
- */
 void daAlink_c::cancelHookshotCarry() {
     if (mHookTargetAcKeep.getActor() != NULL) {
         fopAcM_cancelHookCarryNow(mHookTargetAcKeep.getActor());
@@ -311,7 +294,6 @@ void daAlink_c::cancelHookshotCarry() {
     }
 }
 
-/* 80108864-801088A0 1031A4 003C+00 2/2 0/0 0/0 .text changeHookshotDrawModel__9daAlink_cFv */
 void daAlink_c::changeHookshotDrawModel() {
     if (mEquipItem == fpcNm_ITEM_HOOKSHOT && field_0x3020 == 1) {
         J3DModel* old_item = mHeldItemModel;
@@ -324,13 +306,11 @@ void daAlink_c::changeHookshotDrawModel() {
     }
 }
 
-/* 801088A0-801088C8 1031E0 0028+00 6/6 0/0 0/0 .text checkHookshotRoofLv7Boss__9daAlink_cFv */
 BOOL daAlink_c::checkHookshotRoofLv7Boss() {
     return mCargoCarryAcKeep.getActor() != NULL &&
            fopAcM_GetName(mCargoCarryAcKeep.getActor()) == PROC_B_DR;
 }
 
-/* 801088C8-80108980 103208 00B8+00 2/2 0/0 0/0 .text            checkChaseHookshot__9daAlink_cFv */
 BOOL daAlink_c::checkChaseHookshot() {
     if (field_0x2804 == NULL) {
         if (mTargetedActor != NULL) {
@@ -352,33 +332,24 @@ BOOL daAlink_c::checkChaseHookshot() {
     return false;
 }
 
-/* 80108980-801089E8 1032C0 0068+00 2/2 0/0 0/0 .text checkOctaIealSpecialCollect__9daAlink_cFv */
 BOOL daAlink_c::checkOctaIealSpecialCollect() {
     return mProcID == PROC_HOOKSHOT_FLY && checkHookshotItem(mEquipItem) && checkBossOctaIealRoom();
 }
 
-/* 801089E8-80108A18 103328 0030+00 5/5 0/0 0/0 .text            checkBossOctaIealRoom__9daAlink_cFv
- */
 BOOL daAlink_c::checkBossOctaIealRoom() {
     return checkStageName("D_MN01A");
 }
 
-/* 80108A18-80108A3C 103358 0024+00 19/19 0/0 0/0 .text            checkHookshotWait__9daAlink_cCFv
- */
 BOOL daAlink_c::checkHookshotWait() const {
     return mItemMode == HS_MODE_NONE_e || mItemMode == HS_MODE_READY_e;
 }
 
-/* 80108A3C-80108A90 10337C 0054+00 1/1 0/0 0/0 .text            setHookshotCatchNow__9daAlink_cFv
- */
 void daAlink_c::setHookshotCatchNow() {
     field_0x3026 = 5;
     dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f));
 }
 
 
-/* 80108A90-80108B34 1033D0 00A4+00 1/0 0/0 0/0 .text setHookshotCarryOffset__9daAlink_cFUiPC4cXyz
- */
 bool daAlink_c::setHookshotCarryOffset(fpc_ProcID i_carryActorID, cXyz const* i_posOffset) {
     if (dComIfGp_checkPlayerStatus1(0, 0x10000)) {
         fopAc_ac_c* carryActor_p = mCargoCarryAcKeep.getActor();
@@ -402,7 +373,6 @@ bool daAlink_c::setHookshotCarryOffset(fpc_ProcID i_carryActorID, cXyz const* i_
     return false;
 }
 
-/* 80108B34-80108DB4 103474 0280+00 1/1 0/0 0/0 .text            setHookshotModel__9daAlink_cFv */
 void daAlink_c::setHookshotModel() {
     J3DAnmTransform* bck = (J3DAnmTransform*)mAnmHeap9.loadDataIdx(0x17E);
 
@@ -452,7 +422,6 @@ void daAlink_c::setHookshotModel() {
     mpHookSound->init(&mHookshotTopPos, 1);
 }
 
-/* 80108DB4-80108EEC 1036F4 0138+00 6/6 0/0 0/0 .text            setHookshotSight__9daAlink_cFv */
 void daAlink_c::setHookshotSight() {
     cXyz sight_pos;
     f32 length;
@@ -496,7 +465,6 @@ void daAlink_c::setHookshotSight() {
 }
 
 
-/* 80108EEC-80108F64 10382C 0078+00 1/1 0/0 0/0 .text            cancelHookshotShot__9daAlink_cFv */
 void daAlink_c::cancelHookshotShot() {
     if (checkHookshotItem(mEquipItem) &&
         (mItemMode == HS_MODE_SHOOT_e || mItemMode == 5 || mItemMode == HS_MODE_FLY_e))
@@ -509,7 +477,6 @@ void daAlink_c::cancelHookshotShot() {
     }
 }
 
-/* 80108F64-8010903C 1038A4 00D8+00 4/4 0/0 0/0 .text            cancelHookshotMove__9daAlink_cFv */
 bool daAlink_c::cancelHookshotMove() {
     if (mFastShotTime == 0 && mItemMode == HS_MODE_NONE_e) {
         if (checkHookshotAnime() &&
@@ -524,14 +491,11 @@ bool daAlink_c::cancelHookshotMove() {
 }
 
 
-/* 8010903C-80109070 10397C 0034+00 2/2 0/0 0/0 .text
- * checkHookshotReadyMaterialOffMode__9daAlink_cCFv             */
 BOOL daAlink_c::checkHookshotReadyMaterialOffMode() const {
     return mProcID == PROC_HOOKSHOT_WALL_SHOOT || mProcID == PROC_HORSE_HOOKSHOT_SUBJECT ||
            mProcID == PROC_SWIM_HOOKSHOT_SUBJECT || mProcID == PROC_HOOKSHOT_SUBJECT;
 }
 
-/* 80109070-801090EC 1039B0 007C+00 5/5 0/0 0/0 .text setHookshotReadyMaterial__9daAlink_cFv */
 void daAlink_c::setHookshotReadyMaterial() {
     if (checkNoResetFlg2(FLG2_UNK_80000) || checkCasualWearFlg()) {
         mFallVoiceInit = 0;
@@ -547,7 +511,6 @@ void daAlink_c::setHookshotReadyMaterial() {
     }
 }
 
-/* 801090EC-80109170 103A2C 0084+00 8/8 0/0 0/0 .text initHookshotUpperAnimeSpeed__9daAlink_cFi */
 int daAlink_c::initHookshotUpperAnimeSpeed(int param_0) {
     if (checkHookshotWait()) {
         if (param_0) {
@@ -565,7 +528,6 @@ int daAlink_c::initHookshotUpperAnimeSpeed(int param_0) {
     return 0;
 }
 
-/* 80109170-801091E4 103AB0 0074+00 4/4 0/0 0/0 .text            initHookshotReady__9daAlink_cFv */
 void daAlink_c::initHookshotReady() {
     mItemMode = HS_MODE_READY_e;
 
@@ -578,8 +540,6 @@ void daAlink_c::initHookshotReady() {
     field_0x3494 = -1.0f;
 }
 
-/* 801091E4-80109284 103B24 00A0+00 1/1 0/0 0/0 .text            setHookshotReadyAnime__9daAlink_cFv
- */
 void daAlink_c::setHookshotReadyAnime() {
     f32 speed;
     if (!checkAttentionLock() && mFastShotTime == 0) {
@@ -593,8 +553,6 @@ void daAlink_c::setHookshotReadyAnime() {
     initHookshotReady();
 }
 
-/* 80109284-801095C8 103BC4 0344+00 3/3 0/0 0/0 .text checkUpperItemActionHookshot__9daAlink_cFv
- */
 int daAlink_c::checkUpperItemActionHookshot() {
     if (checkHookshotWait()) {
         mSearchBallScale = FLT_MAX;
@@ -689,7 +647,6 @@ int daAlink_c::checkUpperItemActionHookshot() {
     return cancelUpperItemReadyAnime(0);
 }
 
-/* 801095C8-801097A0 103F08 01D8+00 7/7 0/0 0/0 .text checkNextActionHookshot__9daAlink_cFv */
 int daAlink_c::checkNextActionHookshot() {
     if (mProcID == PROC_HOOKSHOT_ROOF_SHOOT || mProcID == PROC_HOOKSHOT_WALL_SHOOT) {
         return 0;
@@ -733,8 +690,6 @@ int daAlink_c::checkNextActionHookshot() {
     }
 }
 
-/* 801097A0-80109890 1040E0 00F0+00 2/2 0/0 0/0 .text            setHookshotReturnEnd__9daAlink_cFv
- */
 void daAlink_c::setHookshotReturnEnd() {
     resetHookshotMode();
     cancelItemUseQuake(0);
@@ -752,8 +707,6 @@ void daAlink_c::setHookshotReturnEnd() {
     mFastShotTime = 0;
 }
 
-/* 80109890-80109AAC 1041D0 021C+00 3/3 0/0 0/0 .text setHookshotHangMoveBGCollect__9daAlink_cFv
- */
 int daAlink_c::setHookshotHangMoveBGCollect() {
     cBgS_PolyInfo* poly;
     if (mItemMode == 4) {
@@ -805,8 +758,6 @@ int daAlink_c::setHookshotHangMoveBGCollect() {
     return 1;
 }
 
-/* 80109AAC-80109BDC 1043EC 0130+00 2/2 0/0 0/0 .text            setHookshotTopPosFly__9daAlink_cFv
- */
 void daAlink_c::setHookshotTopPosFly() {
     fopAc_ac_c* targetAc_p = mHookTargetAcKeep.getActor();
 
@@ -830,10 +781,8 @@ void daAlink_c::setHookshotTopPosFly() {
     }
 }
 
-/* 804256AC-804256B8 0523CC 000C+00 1/2 0/0 0/0 .bss             l_hookSnowSandHitScale */
 static cXyz l_hookSnowSandHitScale(0.5f, 0.5f, 0.5f);
 
-/* 80109BDC-8010B2DC 10451C 1700+00 1/1 0/0 0/0 .text            setHookshotPos__9daAlink_cFv */
 void daAlink_c::setHookshotPos() {
     mDoMtx_stack_c::copy(mpLinkModel->getAnmMtx(field_0x30c0));
     mDoMtx_stack_c::transM(-2.0f, 1.0f, 1.0f);
@@ -1223,7 +1172,6 @@ void daAlink_c::setHookshotPos() {
     field_0x0714->calc();
 }
 
-/* 8010B2DC-8010B35C 105C1C 0080+00 2/2 0/0 0/0 .text setHookshotRoofWaitAnime__9daAlink_cFv */
 void daAlink_c::setHookshotRoofWaitAnime() {
     daAlink_ANM anm;
     if (checkHookshotRoofLv7Boss()) {
@@ -1245,7 +1193,6 @@ void daAlink_c::setHookshotRoofWaitAnime() {
     setSingleAnimeBaseMorf(anm, 2.0f);
 }
 
-/* 8010B35C-8010B3AC 105C9C 0050+00 2/2 0/0 0/0 .text setHookshotWallWaitAnime__9daAlink_cFv */
 void daAlink_c::setHookshotWallWaitAnime() {
     daAlink_ANM anm;
     if (field_0x3020 == 0) {
@@ -1258,7 +1205,6 @@ void daAlink_c::setHookshotWallWaitAnime() {
     onModeFlg(0x100);
 }
 
-/* 8010B3AC-8010B644 105CEC 0298+00 2/2 0/0 0/0 .text            hookshotRoofTurn__9daAlink_cFv */
 void daAlink_c::hookshotRoofTurn() {
     BOOL play_sound = false;
     if (!dComIfGp_checkPlayerStatus0(0, 0x2000)) {
@@ -1325,8 +1271,6 @@ void daAlink_c::hookshotRoofTurn() {
 }
 
 
-/* 8010B644-8010B720 105F84 00DC+00 3/3 0/0 0/0 .text
- * initHookshotRoofWaitActor__9daAlink_cFP10fopAc_ac_c          */
 void daAlink_c::initHookshotRoofWaitActor(fopAc_ac_c* i_actor) {
     if (i_actor != NULL) {
         mCargoCarryAcKeep.setData(i_actor);
@@ -1345,7 +1289,6 @@ void daAlink_c::initHookshotRoofWaitActor(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8010B720-8010B84C 106060 012C+00 2/2 0/0 0/0 .text            checkNextHookPoint__9daAlink_cFv */
 int daAlink_c::checkNextHookPoint() {
     if (field_0x3026 != 0) {
         fopAc_ac_c* targetAc_p = mHookTargetAcKeep.getActor();
@@ -1368,8 +1311,6 @@ int daAlink_c::checkNextHookPoint() {
     return procFallInit(1, 5.0f);
 }
 
-/* 8010B84C-8010B96C 10618C 0120+00 2/2 0/0 0/0 .text            checkLandHookshotHang__9daAlink_cFv
- */
 int daAlink_c::checkLandHookshotHang() {
     mLinkGndChk.SetPos(&field_0x3834);
 
@@ -1395,7 +1336,6 @@ int daAlink_c::checkLandHookshotHang() {
     return 0;
 }
 
-/* 8010B96C-8010BA6C 1062AC 0100+00 3/3 0/0 0/0 .text commonHookshotRoofWait__9daAlink_cFv */
 int daAlink_c::commonHookshotRoofWait() {
     setJumpMode();
     if (mProcVar4.field_0x3010 != 0) {
@@ -1425,13 +1365,11 @@ int daAlink_c::commonHookshotRoofWait() {
     return 0;
 }
 
-/* 8010BA6C-8010BAA8 1063AC 003C+00 2/2 0/0 0/0 .text commonHookshotWallWait__9daAlink_cFv */
 int daAlink_c::commonHookshotWallWait() {
     setJumpMode();
     return checkLandHookshotHang() ? TRUE : FALSE;
 }
 
-/* 8010BAA8-8010BB48 1063E8 00A0+00 1/1 0/0 0/0 .text procHookshotSubjectInit__9daAlink_cFv */
 int daAlink_c::procHookshotSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_HOOKSHOT_SUBJECT)) {
         return 0;
@@ -1451,8 +1389,6 @@ int daAlink_c::procHookshotSubjectInit() {
 }
 
 
-/* 8010BB48-8010BC08 106488 00C0+00 1/0 0/0 0/0 .text            procHookshotSubject__9daAlink_cFv
- */
 int daAlink_c::procHookshotSubject() {
     if (checkHookshotWait()) {
         setDoStatus(0x12);
@@ -1476,8 +1412,6 @@ int daAlink_c::procHookshotSubject() {
     return 1;
 }
 
-/* 8010BC08-8010BCA4 106548 009C+00 1/1 0/0 0/0 .text            procHookshotMoveInit__9daAlink_cFv
- */
 int daAlink_c::procHookshotMoveInit() {
     if (!commonProcInitNotSameProc(PROC_HOOKSHOT_MOVE)) {
         return 0;
@@ -1495,7 +1429,6 @@ int daAlink_c::procHookshotMoveInit() {
     return 1;
 }
 
-/* 8010BCA4-8010BD90 1065E4 00EC+00 1/0 0/0 0/0 .text            procHookshotMove__9daAlink_cFv */
 int daAlink_c::procHookshotMove() {
     cancelHookshotMove();
 
@@ -1524,8 +1457,6 @@ int daAlink_c::procHookshotMove() {
     return 1;
 }
 
-/* 8010BD90-8010BEF0 1066D0 0160+00 2/2 0/0 0/0 .text            procHookshotFlyInit__9daAlink_cFv
- */
 int daAlink_c::procHookshotFlyInit() {
     commonProcInit(PROC_HOOKSHOT_FLY);
 
@@ -1570,7 +1501,6 @@ int daAlink_c::procHookshotFlyInit() {
 }
 
 
-/* 8010BEF0-8010C830 106830 0940+00 2/1 0/0 0/0 .text            procHookshotFly__9daAlink_cFv */
 int daAlink_c::procHookshotFly() {
     fopAc_ac_c* targetAc_p = mHookTargetAcKeep.getActor();
 
@@ -1712,8 +1642,6 @@ int daAlink_c::procHookshotFly() {
 }
 
 
-/* 8010C830-8010C9F4 107170 01C4+00 4/4 0/0 0/0 .text
- * procHookshotRoofWaitInit__9daAlink_cFiP10fopAc_ac_ci         */
 int daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int param_2) {
     commonProcInit(PROC_HOOKSHOT_ROOF_WAIT);
 
@@ -1764,8 +1692,6 @@ int daAlink_c::procHookshotRoofWaitInit(int param_0, fopAc_ac_c* param_1, int pa
 }
 
 
-/* 8010C9F4-8010CC80 107334 028C+00 1/0 0/0 0/0 .text            procHookshotRoofWait__9daAlink_cFv
- */
 int daAlink_c::procHookshotRoofWait() {
     if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x80)) {
         if (checkSubjectEnd(1)) {
@@ -1827,8 +1753,6 @@ int daAlink_c::procHookshotRoofWait() {
 }
 
 
-/* 8010CC80-8010CD60 1075C0 00E0+00 1/1 0/0 0/0 .text
- * procHookshotRoofShootInit__9daAlink_cFP10fopAc_ac_c          */
 int daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_HOOKSHOT_ROOF_SHOOT);
 
@@ -1859,8 +1783,6 @@ int daAlink_c::procHookshotRoofShootInit(fopAc_ac_c* param_0) {
 }
 
 
-/* 8010CD60-8010CF6C 1076A0 020C+00 1/0 0/0 0/0 .text            procHookshotRoofShoot__9daAlink_cFv
- */
 int daAlink_c::procHookshotRoofShoot() {
     if (checkHookshotWait()) {
         setDoStatus(0x12);
@@ -1925,8 +1847,6 @@ int daAlink_c::procHookshotRoofShoot() {
 }
 
 
-/* 8010CF6C-8010D034 1078AC 00C8+00 1/1 0/0 0/0 .text
- * procHookshotRoofBootsInit__9daAlink_cFP10fopAc_ac_c          */
 int daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_HOOKSHOT_ROOF_BOOTS);
 
@@ -1954,8 +1874,6 @@ int daAlink_c::procHookshotRoofBootsInit(fopAc_ac_c* param_0) {
 }
 
 
-/* 8010D034-8010D174 107974 0140+00 1/0 0/0 0/0 .text            procHookshotRoofBoots__9daAlink_cFv
- */
 int daAlink_c::procHookshotRoofBoots() {
     if (commonHookshotRoofWait()) {
         return 1;
@@ -1984,7 +1902,6 @@ int daAlink_c::procHookshotRoofBoots() {
 }
 
 
-/* 8010D174-8010D38C 107AB4 0218+00 3/3 0/0 0/0 .text procHookshotWallWaitInit__9daAlink_cFisi */
 int daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) {
     commonProcInit(PROC_HOOKSHOT_WALL_WAIT);
 
@@ -2036,8 +1953,6 @@ int daAlink_c::procHookshotWallWaitInit(int param_0, s16 param_1, int param_2) {
 }
 
 
-/* 8010D38C-8010D5F4 107CCC 0268+00 1/0 0/0 0/0 .text            procHookshotWallWait__9daAlink_cFv
- */
 int daAlink_c::procHookshotWallWait() {
     if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x80)) {
         if (checkSubjectEnd(1)) {
@@ -2101,7 +2016,6 @@ int daAlink_c::procHookshotWallWait() {
 }
 
 
-/* 8010D5F4-8010D6CC 107F34 00D8+00 1/1 0/0 0/0 .text procHookshotWallShootInit__9daAlink_cFv */
 int daAlink_c::procHookshotWallShootInit() {
     commonProcInit(PROC_HOOKSHOT_WALL_SHOOT);
 
@@ -2131,8 +2045,6 @@ int daAlink_c::procHookshotWallShootInit() {
 }
 
 
-/* 8010D6CC-8010D93C 10800C 0270+00 1/0 0/0 0/0 .text            procHookshotWallShoot__9daAlink_cFv
- */
 int daAlink_c::procHookshotWallShoot() {
     if (checkHookshotWait()) {
         setDoStatus(0x12);
diff --git a/src/d/actor/d_a_alink_horse.inc b/src/d/actor/d_a_alink_horse.inc
index 242f5c8f1e..b965b6e9b5 100644
--- a/src/d/actor/d_a_alink_horse.inc
+++ b/src/d/actor/d_a_alink_horse.inc
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_obj_iceleaf.h"
 #include "d/actor/d_a_spinner.h"
 
-/* 800EC724-800EC758 0E7064 0034+00 3/3 0/0 0/0 .text daAlink_searchBoar__FP10fopAc_ac_cPv */
 static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_E_WB) {
         e_wb_class* e_wb_p = (e_wb_class*)i_actor;
@@ -23,7 +22,6 @@ static void* daAlink_searchBoar(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 800EC758-800EC76C 0E7098 0014+00 1/1 0/0 0/0 .text daAlink_searchCoach__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_NPC_COACH) {
         return i_actor;
@@ -32,7 +30,6 @@ static fopAc_ac_c* daAlink_searchCoach(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 800EC76C-800EC7B0 0E70AC 0044+00 3/3 0/0 0/0 .text checkHorseZeldaBowMode__9daAlink_cFv */
 BOOL daAlink_c::checkHorseZeldaBowMode() {
     if (dComIfGp_getHorseActor() == NULL) {
         return false;
@@ -42,8 +39,6 @@ BOOL daAlink_c::checkHorseZeldaBowMode() {
     return zelda_p != NULL && zelda_p->checkBowMode();
 }
 
-/* 800EC7B0-800EC7DC 0E70F0 002C+00 4/4 0/0 0/0 .text            setHorseZeldaDamage__9daAlink_cFv
- */
 void daAlink_c::setHorseZeldaDamage() {
     if (dComIfGp_getHorseActor() != NULL) {
         daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->getZeldaActor();
@@ -53,20 +48,15 @@ void daAlink_c::setHorseZeldaDamage() {
     }
 }
 
-/* 800EC7DC-800EC814 0E711C 0038+00 2/2 0/0 0/0 .text            checkHorseDashAccept__9daAlink_cFv
- */
 BOOL daAlink_c::checkHorseDashAccept() {
     return !checkStageName("F_SP103");
 }
 
-/* 800EC814-800EC87C 0E7154 0068+00 1/1 0/0 0/0 .text            checkCowGame__9daAlink_cFv */
 BOOL daAlink_c::checkCowGame() {
     return checkStageName("F_SP00") &&
            (dComIfGp_getStartStageLayer() == 4 || dComIfGp_getStartStageLayer() == 5);
 }
 
-/* 800EC87C-800EC8F8 0E71BC 007C+00 2/2 0/0 0/0 .text            getReinRideDirection__9daAlink_cFv
- */
 int daAlink_c::getReinRideDirection() {
     s16 angle = fopAcM_searchActorAngleY(field_0x27f4, this) - field_0x27f4->shape_angle.y;
 
@@ -79,29 +69,22 @@ int daAlink_c::getReinRideDirection() {
     return DIR_RIGHT;
 }
 
-/* 803918E8-803918F4 01DF48 000C+00 0/1 0/0 0/0 .rodata          m_handLeftOutSidePos__9daAlink_c */
 Vec const daAlink_c::m_handLeftOutSidePos = {
     9.0f, -5.0f, 3.0f
 };
 
-/* 803918F4-80391900 01DF54 000C+00 0/1 0/0 0/0 .rodata          m_handRightOutSidePos__9daAlink_c
- */
 Vec const daAlink_c::m_handRightOutSidePos = {
     9.0f, -5.0f, -3.0f
 };
 
-/* 80391900-8039190C 01DF60 000C+00 0/1 0/0 1/1 .rodata          m_handLeftInSidePos__9daAlink_c */
 Vec const daAlink_c::m_handLeftInSidePos = {
     9.0f, 5.0f, 3.0f
 };
 
-/* 8039190C-80391918 01DF6C 000C+00 0/1 0/0 1/1 .rodata          m_handRightInSidePos__9daAlink_c */
 Vec const daAlink_c::m_handRightInSidePos = {
     9.0f, 5.0f, -3.0f
 };
 
-/* 800EC8F8-800ECA3C 0E7238 0144+00 1/1 0/0 0/0 .text            checkReinRideBgCheck__9daAlink_cFv
- */
 int daAlink_c::checkReinRideBgCheck() {
     static const Vec horseLocalLeft = {20.0f, 0.0f, 0.0f};
     static const Vec horseLocalRight = {-20.0f, 0.0f, 0.0f};
@@ -154,7 +137,6 @@ int daAlink_c::checkReinRideBgCheck() {
     return 1;
 }
 
-/* 800ECA3C-800ECAAC 0E737C 0070+00 3/3 0/0 0/0 .text commonInitForceRideRein__9daAlink_cFv */
 void daAlink_c::commonInitForceRideRein() {
     setHeavyBoots(0);
     onModeFlg(0x400);
@@ -169,7 +151,6 @@ void daAlink_c::commonInitForceRideRein() {
     mUnderFrameCtrl[0].onEndFlg();
 }
 
-/* 800ECAAC-800ECB58 0E73EC 00AC+00 1/1 0/0 0/0 .text            initForceRideBoar__9daAlink_cFv */
 int daAlink_c::initForceRideBoar() {
     e_wb_class* e_wb = (e_wb_class*)fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchBoar, NULL);
     fopAc_ac_c* e_wb_actor = (fopAc_ac_c*)e_wb;
@@ -190,7 +171,6 @@ int daAlink_c::initForceRideBoar() {
     return 1;
 }
 
-/* 800ECB58-800ECBD0 0E7498 0078+00 4/4 0/0 0/0 .text            initForceRideHorse__9daAlink_cFv */
 void daAlink_c::initForceRideHorse() {
     commonInitForceRideRein();
     mRideStatus = 1;
@@ -200,7 +180,6 @@ void daAlink_c::initForceRideHorse() {
     mZ2Link.setRiding(true);
 }
 
-/* 800ECBD0-800ECD90 0E7510 01C0+00 5/5 0/0 0/0 .text            rideGetOff__9daAlink_cFv */
 void daAlink_c::rideGetOff() {
     if (checkHorseRide()) {
         daHorse_c* horse_p = dComIfGp_getHorseActor();
@@ -244,24 +223,19 @@ void daAlink_c::rideGetOff() {
     shape_angle.z = 0;
 }
 
-/* 800ECD90-800ECDC4 0E76D0 0034+00 1/1 0/0 0/0 .text checkHorseNotDamageReaction__9daAlink_cCFv
- */
 BOOL daAlink_c::checkHorseNotDamageReaction() const {
     return mProcID == PROC_HORSE_TURN || mProcID == PROC_HORSE_JUMP || mProcID == PROC_HORSE_HANG ||
            mProcID == PROC_HORSE_LAND;
 }
 
-/* 800ECDC4-800ECDEC 0E7704 0028+00 1/1 0/0 2/2 .text checkHorseWaitLashAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkHorseWaitLashAnime() const {
     return checkHorseUnderDashStartAnime() && checkModeFlg(1);
 }
 
-/* 800ECDEC-800ECE10 0E772C 0024+00 1/1 0/0 0/0 .text checkHorseReinLeftOnly__9daAlink_cCFv */
 BOOL daAlink_c::checkHorseReinLeftOnly() const {
     return (field_0x2fab & 8) && !(field_0x2fab & 0x10);
 }
 
-/* 800ECE10-800ECF04 0E7750 00F4+00 2/2 0/0 0/0 .text            getReinHandType__9daAlink_cCFv */
 int daAlink_c::getReinHandType() const {
     if (mProcID == PROC_TOOL_DEMO) {
         if ((field_0x2fab & 8) && (field_0x2fab & 0x10)) {
@@ -286,27 +260,21 @@ int daAlink_c::getReinHandType() const {
     return -1;
 }
 
-/* 800ECF04-800ECF5C 0E7844 0058+00 5/5 0/0 1/1 .text            checkHorseLieAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkHorseLieAnime() const {
     return checkUnderMove0BckNoArc(ANM_HORSE_CROUCH) || checkUpperHorseLieAnime();
 }
 
-/* 800ECF5C-800ECF9C 0E789C 0040+00 0/0 0/0 3/3 .text checkHorseSubjectivity__9daAlink_cCFv */
 BOOL daAlink_c::checkHorseSubjectivity() const {
     return dComIfGp_checkPlayerStatus0(0, 0x2000) || mProcID == PROC_HORSE_BOW_SUBJECT ||
            mProcID == PROC_HORSE_HOOKSHOT_SUBJECT || mProcID == PROC_HORSE_BOOMERANG_SUBJECT;
 }
 
-/* 800ECF9C-800ECFF4 0E78DC 0058+00 2/2 0/0 0/0 .text            setHorseSwordUpAnime__9daAlink_cFv
- */
 void daAlink_c::setHorseSwordUpAnime() {
     setUpperAnimeBaseSpeed(0xCC, daAlinkHIO_horse_c0::m.mSwordUpAnmSpeed,
                            daAlinkHIO_horse_c0::m.mSwordUpInterpolation);
     setFaceBck(0xE8, 1, 0xFFFF);
 }
 
-/* 800ECFF4-800ED074 0E7934 0080+00 1/1 0/0 0/0 .text setHorseTurnUpperAnime__9daAlink_cFi */
 void daAlink_c::setHorseTurnUpperAnime(int i_useLAnime) {
     if (checkHorseNoUpperAnime() || (i_useLAnime == FALSE && checkHorseTurnRAnime()) ||
         (i_useLAnime == TRUE && checkHorseTurnLAnime()))
@@ -315,13 +283,10 @@ void daAlink_c::setHorseTurnUpperAnime(int i_useLAnime) {
     }
 }
 
-/* 800ED074-800ED0D4 0E79B4 0060+00 9/9 0/0 0/0 .text checkHorseNoUpperAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkHorseNoUpperAnime() const {
     return checkHorseTiredAnime() || checkNoUpperAnime() || checkHorseSwordUpAnime();
 }
 
-/* 800ED0D4-800ED1F0 0E7A14 011C+00 0/0 0/0 2/2 .text getHorseReinHandPos__9daAlink_cFP4cXyzP4cXyz
- */
 void daAlink_c::getHorseReinHandPos(cXyz* param_0, cXyz* param_1) {
     int hand_type = getReinHandType();
     if (hand_type == 2) {
@@ -336,7 +301,6 @@ void daAlink_c::getHorseReinHandPos(cXyz* param_0, cXyz* param_1) {
     }
 }
 
-/* 800ED1F0-800ED310 0E7B30 0120+00 1/1 0/0 1/1 .text            checkHorseNotGrab__9daAlink_cCFv */
 BOOL daAlink_c::checkHorseNotGrab() const {
     return checkBowAnime() ||
            mProcID == PROC_HORSE_BOTTLE_DRINK ||
@@ -357,7 +321,6 @@ BOOL daAlink_c::checkHorseNotGrab() const {
            (mProcID == PROC_BOAR_RUN && mProcVar2.field_0x300c != 0);
 }
 
-/* 800ED310-800ED4B8 0E7C50 01A8+00 1/1 0/0 0/0 .text            setHorseStirrup__9daAlink_cFv */
 void daAlink_c::setHorseStirrup() {
     daHorse_c* temp_r3 = dComIfGp_getHorseActor();
     if (temp_r3 == NULL || (!checkHorseRide() && (mProcID != PROC_TOOL_DEMO || field_0x2fab == 0))) {
@@ -390,12 +353,10 @@ void daAlink_c::setHorseStirrup() {
     }
 }
 
-/* 800ED4B8-800ED4DC 0E7DF8 0024+00 1/1 0/0 0/0 .text            changeBoarRunRide__9daAlink_cFv */
 void daAlink_c::changeBoarRunRide() {
     ((e_wb_class*)mRideAcKeep.getActor())->setRunRideMode();
 }
 
-/* 800ED4DC-800ED78C 0E7E1C 02B0+00 7/7 0/0 0/0 .text            setSyncHorsePos__9daAlink_cFv */
 int daAlink_c::setSyncHorsePos() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -462,7 +423,6 @@ int daAlink_c::setSyncHorsePos() {
     return 1;
 }
 
-/* 800ED78C-800ED90C 0E80CC 0180+00 4/4 0/0 0/0 .text            setSyncBoarPos__9daAlink_cFv */
 int daAlink_c::setSyncBoarPos() {
     e_wb_class* e_wb_p = (e_wb_class*)mRideAcKeep.getActor();
     if (e_wb_p == NULL) {
@@ -509,7 +469,6 @@ int daAlink_c::setSyncBoarPos() {
     return 1;
 }
 
-/* 800ED90C-800EDA24 0E824C 0118+00 1/1 0/0 0/0 .text            setSyncBoarRunPos__9daAlink_cFv */
 int daAlink_c::setSyncBoarRunPos() {
     e_wb_class* e_wb_p = (e_wb_class*)mRideAcKeep.getActor();
     if (e_wb_p == NULL || e_wb_p->checkDownDamage()) {
@@ -543,7 +502,6 @@ int daAlink_c::setSyncBoarRunPos() {
     return 1;
 }
 
-/* 800EDA24-800EDA78 0E8364 0054+00 33/33 0/0 0/0 .text            setSyncRidePos__9daAlink_cFv */
 BOOL daAlink_c::setSyncRidePos() {
     if (checkHorseRide()) {
         return setSyncHorsePos();
@@ -552,7 +510,6 @@ BOOL daAlink_c::setSyncRidePos() {
     }
 }
 
-/* 800EDA78-800EDB48 0E83B8 00D0+00 6/6 0/0 0/0 .text            setHorseTurnAnime__9daAlink_cFv */
 void daAlink_c::setHorseTurnAnime() {
     daHorse_c* temp_r3 = dComIfGp_getHorseActor();
     u16 temp_r3_2 = temp_r3->getAnmIdx(0);
@@ -584,8 +541,6 @@ void daAlink_c::setHorseTurnAnime() {
     }
 }
 
-/* 800EDB48-800EDD6C 0E8488 0224+00 2/2 0/0 0/0 .text
- * getBaseHorseAnime__9daAlink_cFPQ29daAlink_c11daAlink_ANM     */
 void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) {
     daHorse_c* temp_r27 = dComIfGp_getHorseActor();
 
@@ -648,8 +603,6 @@ void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) {
     }
 }
 
-/* 800EDD6C-800EDE8C 0E86AC 0120+00 9/9 0/0 0/0 .text            checkHorseSpecialProc__9daAlink_cFv
- */
 int daAlink_c::checkHorseSpecialProc() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -681,12 +634,10 @@ int daAlink_c::checkHorseSpecialProc() {
     return 0;
 }
 
-/* 800EDE8C-800EDEEC 0E87CC 0060+00 2/2 0/0 0/0 .text checkHorseServiceWaitAnime__9daAlink_cFv */
 BOOL daAlink_c::checkHorseServiceWaitAnime() {
     return checkUnderMove0BckNoArc(ANM_HORSE_WAIT_A) || checkUnderMove0BckNoArc(ANM_HORSE_WAIT_B);
 }
 
-/* 800EDEEC-800EE64C 0E882C 0760+00 1/1 0/0 0/0 .text            setSyncHorse__9daAlink_cFi */
 int daAlink_c::setSyncHorse(int param_0) {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
     daPy_frameCtrl_c* sp24 = &mUnderFrameCtrl[0];
@@ -863,7 +814,6 @@ int daAlink_c::setSyncHorse(int param_0) {
     return 1;
 }
 
-/* 800EE64C-800EE918 0E8F8C 02CC+00 1/1 0/0 0/0 .text            setSyncBoar__9daAlink_cFi */
 int daAlink_c::setSyncBoar(int param_0) {
     e_wb_class* e_wb_p = (e_wb_class*)mRideAcKeep.getActor();
     fopAc_ac_c* e_wb_actor = (fopAc_ac_c*)e_wb_p;
@@ -926,7 +876,6 @@ int daAlink_c::setSyncBoar(int param_0) {
     return 1;
 }
 
-/* 800EE918-800EEAE8 0E9258 01D0+00 12/12 0/0 0/0 .text            setSyncRide__9daAlink_cFi */
 int daAlink_c::setSyncRide(int param_0) {
     BOOL var_r31;
     if (param_0 && mMidnaTalkDelayTimer == 0 && dComIfGp_getDoStatus() == 0 &&
@@ -964,7 +913,6 @@ int daAlink_c::setSyncRide(int param_0) {
     }
 }
 
-/* 800EEAE8-800EEC98 0E9428 01B0+00 2/2 0/0 0/0 .text setBaseHorseAnimeFrame__9daAlink_cFv */
 void daAlink_c::setBaseHorseAnimeFrame() {
     daHorse_c* temp_r29 = dComIfGp_getHorseActor();
     BOOL var_r27 = 0;
@@ -1003,7 +951,6 @@ void daAlink_c::setBaseHorseAnimeFrame() {
     getNowAnmPackUpper(UPPER_1)->setFrame(getNowAnmPackUnder(UNDER_1)->getFrame());
 }
 
-/* 800EEC98-800EED98 0E95D8 0100+00 2/2 0/0 0/0 .text            setBaseBoarAnime__9daAlink_cFv */
 void daAlink_c::setBaseBoarAnime() {
     e_wb_class* temp_r30 = (e_wb_class*)mRideAcKeep.getActor();
 
@@ -1023,7 +970,6 @@ void daAlink_c::setBaseBoarAnime() {
     }
 }
 
-/* 800EED98-800EEE30 0E96D8 0098+00 18/18 0/0 0/0 .text            setBaseRideAnime__9daAlink_cFv */
 void daAlink_c::setBaseRideAnime() {
     if (checkHorseRide()) {
         daHorse_c* horse_p = dComIfGp_getHorseActor();
@@ -1037,13 +983,11 @@ void daAlink_c::setBaseRideAnime() {
     }
 }
 
-/* 800EEE30-800EEE5C 0E9770 002C+00 1/1 0/0 0/0 .text checkHorseSwordUpSpped__9daAlink_cFv */
 bool daAlink_c::checkHorseSwordUpSpped() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
     return horse_p->speedF > horse_p->getLashMaxSpeedF() * 0.89999998f;
 }
 
-/* 800EEE5C-800EEF30 0E979C 00D4+00 2/2 0/0 0/0 .text            setHorseSwordUp__9daAlink_cFi */
 void daAlink_c::setHorseSwordUp(int param_0) {
     if (checkHorseRide() && checkNoUpperAnime() && mEquipItem == 0x103 &&
         !checkHorseZeldaBowMode() &&
@@ -1057,8 +1001,6 @@ void daAlink_c::setHorseSwordUp(int param_0) {
     offNoResetFlg1(FLG1_UNK_800);
 }
 
-/* 800EEF30-800EF050 0E9870 0120+00 9/9 0/0 0/0 .text            setRideSubjectAngle__9daAlink_cFs
- */
 int daAlink_c::setRideSubjectAngle(s16 param_0) {
     shape_angle.y += mBodyAngle.y;
     BOOL temp_r27 = setBodyAngleToCamera();
@@ -1091,7 +1033,6 @@ int daAlink_c::setRideSubjectAngle(s16 param_0) {
     return temp_r27;
 }
 
-/* 800EF050-800EF0E8 0E9990 0098+00 7/7 0/0 0/0 .text setBodyAngleRideReadyAnime__9daAlink_cFv */
 void daAlink_c::setBodyAngleRideReadyAnime() {
     setBodyAngleXReadyAnime(0);
 
@@ -1107,8 +1048,6 @@ void daAlink_c::setBodyAngleRideReadyAnime() {
     daPy_addCalcShort(&mBodyAngle.y, angle, 4, 0xC00, 0x180);
 }
 
-/* 800EF0E8-800EF198 0E9A28 00B0+00 1/1 0/0 0/0 .text
- * checkHorseGetOffWallCheck__9daAlink_cFP4cXyzP4cXyzs          */
 BOOL daAlink_c::checkHorseGetOffWallCheck(cXyz* i_lineStartPos, cXyz* i_lineEndPos, s16 param_2) {
     if (!commonLineCheck(i_lineStartPos, i_lineEndPos)) {
         return FALSE;
@@ -1125,7 +1064,6 @@ BOOL daAlink_c::checkHorseGetOffWallCheck(cXyz* i_lineStartPos, cXyz* i_lineEndP
     return FALSE;
 }
 
-/* 800EF198-800EF35C 0E9AD8 01C4+00 2/2 0/0 0/0 .text checkHorseGetOffDirection__9daAlink_cFv */
 int daAlink_c::checkHorseGetOffDirection() {
     fopAc_ac_c* ride_actor_p = mRideAcKeep.getActor();
 
@@ -1174,12 +1112,10 @@ int daAlink_c::checkHorseGetOffDirection() {
     return 2;
 }
 
-/* 800EF35C-800EF394 0E9C9C 0038+00 4/4 0/0 0/0 .text            boarForceGetOff__9daAlink_cFv */
 void daAlink_c::boarForceGetOff() {
     procCoLargeDamageInit(-4, 1, 0, 0, NULL, 0);
 }
 
-/* 800EF394-800EF450 0E9CD4 00BC+00 2/2 0/0 0/0 .text            horseGetOffEnd__9daAlink_cFv */
 void daAlink_c::horseGetOffEnd() {
     if (field_0x2fc0 == 0) {
         shape_angle.y -= 0x4000;
@@ -1198,7 +1134,6 @@ void daAlink_c::horseGetOffEnd() {
     field_0x2fe4 = shape_angle.y;
 }
 
-/* 800EF450-800EF598 0E9D90 0148+00 12/12 0/0 0/0 .text checkNextActionHorse__9daAlink_cFv */
 int daAlink_c::checkNextActionHorse() {
     if ((!checkGrabAnimeAndThrow() || mProcID == PROC_HORSE_GRAB_MOVE) &&
         checkNextActionFromButton())
@@ -1239,7 +1174,6 @@ int daAlink_c::checkNextActionHorse() {
     return procHorseWaitInit();
 }
 
-/* 800EF598-800EF6B0 0E9ED8 0118+00 2/2 0/0 0/0 .text            checkHorseGetOff__9daAlink_cFv */
 // NONMATCHING - regalloc
 BOOL daAlink_c::checkHorseGetOff() {
     return (checkHorseRide() && dComIfGp_getHorseActor() != NULL &&
@@ -1248,8 +1182,6 @@ BOOL daAlink_c::checkHorseGetOff() {
             ((e_wb_class*)mRideAcKeep.getActor())->checkGetOff());
 }
 
-/* 800EF6B0-800EF884 0E9FF0 01D4+00 3/3 0/0 0/0 .text checkHorseGetOffAndSetDoStatus__9daAlink_cFv
- */
 int daAlink_c::checkHorseGetOffAndSetDoStatus() {
     daHorse_c* temp_r29 = dComIfGp_getHorseActor();
     int var_r30 = 0;
@@ -1283,7 +1215,6 @@ int daAlink_c::checkHorseGetOffAndSetDoStatus() {
     return var_r30;
 }
 
-/* 800EF884-800EF95C 0EA1C4 00D8+00 2/2 0/0 0/0 .text            setHorseGetOff__9daAlink_cFi */
 int daAlink_c::setHorseGetOff(int param_0) {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -1300,7 +1231,6 @@ int daAlink_c::setHorseGetOff(int param_0) {
     return 0;
 }
 
-/* 800EF95C-800EFDC4 0EA29C 0468+00 1/1 0/0 0/0 .text            procHorseRideInit__9daAlink_cFv */
 int daAlink_c::procHorseRideInit() {
     BOOL var_r25 = 0;
 
@@ -1425,7 +1355,6 @@ int daAlink_c::procHorseRideInit() {
     return 1;
 }
 
-/* 800EFDC4-800F038C 0EA704 05C8+00 1/0 0/0 0/0 .text            procHorseRide__9daAlink_cFv */
 int daAlink_c::procHorseRide() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -1557,8 +1486,6 @@ int daAlink_c::procHorseRide() {
     return 1;
 }
 
-/* 800F038C-800F0620 0EACCC 0294+00 1/1 0/0 0/0 .text            procHorseGetOffInit__9daAlink_cFi
- */
 int daAlink_c::procHorseGetOffInit(int param_0) {
     cXyz spC;
     commonProcInit(PROC_HORSE_GETOFF);
@@ -1635,7 +1562,6 @@ int daAlink_c::procHorseGetOffInit(int param_0) {
     return 1;
 }
 
-/* 800F0620-800F0980 0EAF60 0360+00 1/0 0/0 0/0 .text            procHorseGetOff__9daAlink_cFv */
 int daAlink_c::procHorseGetOff() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -1712,8 +1638,6 @@ int daAlink_c::procHorseGetOff() {
     return 1;
 }
 
-/* 800F0980-800F0AA4 0EB2C0 0124+00 16/16 0/0 0/0 .text            procHorseWaitInit__9daAlink_cFv
- */
 int daAlink_c::procHorseWaitInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_WAIT)) {
         return 0;
@@ -1733,7 +1657,6 @@ int daAlink_c::procHorseWaitInit() {
     return 1;
 }
 
-/* 800F0AA4-800F0C6C 0EB3E4 01C8+00 1/0 0/0 0/0 .text            procHorseWait__9daAlink_cFv */
 int daAlink_c::procHorseWait() {
     BOOL temp_r27 = checkHorseGetOffAndSetDoStatus();
     if (!setSyncRide(1)) {
@@ -1773,7 +1696,6 @@ int daAlink_c::procHorseWait() {
     return 1;
 }
 
-/* 800F0C6C-800F0CE4 0EB5AC 0078+00 1/1 0/0 0/0 .text            procHorseTurnInit__9daAlink_cFv */
 int daAlink_c::procHorseTurnInit() {
     commonProcInit(PROC_HORSE_TURN);
 
@@ -1787,7 +1709,6 @@ int daAlink_c::procHorseTurnInit() {
     return 1;
 }
 
-/* 800F0CE4-800F1060 0EB624 037C+00 1/0 0/0 0/0 .text            procHorseTurn__9daAlink_cFv */
 int daAlink_c::procHorseTurn() {
     daHorse_c* temp_r29 = dComIfGp_getHorseActor();
     if (!setSyncRidePos()) {
@@ -1866,7 +1787,6 @@ int daAlink_c::procHorseTurn() {
     return 1;
 }
 
-/* 800F1060-800F10F8 0EB9A0 0098+00 1/1 0/0 0/0 .text            procHorseJumpInit__9daAlink_cFv */
 int daAlink_c::procHorseJumpInit() {
     commonProcInit(PROC_HORSE_JUMP);
 
@@ -1882,7 +1802,6 @@ int daAlink_c::procHorseJumpInit() {
     return 1;
 }
 
-/* 800F10F8-800F1188 0EBA38 0090+00 1/0 0/0 0/0 .text            procHorseJump__9daAlink_cFv */
 int daAlink_c::procHorseJump() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -1899,7 +1818,6 @@ int daAlink_c::procHorseJump() {
     return 1;
 }
 
-/* 800F1188-800F1204 0EBAC8 007C+00 1/1 0/0 0/0 .text            procHorseLandInit__9daAlink_cFv */
 int daAlink_c::procHorseLandInit() {
     commonProcInit(PROC_HORSE_LAND);
 
@@ -1914,7 +1832,6 @@ int daAlink_c::procHorseLandInit() {
     return 1;
 }
 
-/* 800F1204-800F1294 0EBB44 0090+00 1/0 0/0 0/0 .text            procHorseLand__9daAlink_cFv */
 int daAlink_c::procHorseLand() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -1931,7 +1848,6 @@ int daAlink_c::procHorseLand() {
     return 1;
 }
 
-/* 800F1294-800F12F8 0EBBD4 0064+00 1/1 0/0 0/0 .text procHorseSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procHorseSubjectivityInit() {
     commonProcInit(PROC_HORSE_SUBJECTIVITY);
     if (checkHorseUnderItemAnime()) {
@@ -1943,8 +1859,6 @@ int daAlink_c::procHorseSubjectivityInit() {
     return 1;
 }
 
-/* 800F12F8-800F13D8 0EBC38 00E0+00 1/0 0/0 0/0 .text            procHorseSubjectivity__9daAlink_cFv
- */
 int daAlink_c::procHorseSubjectivity() {
     onResetFlg0(RFLG0_UNK_4000000);
     s16 old_shape_angle = shape_angle.y;
@@ -1973,7 +1887,6 @@ int daAlink_c::procHorseSubjectivity() {
     return 1;
 }
 
-/* 800F13D8-800F1688 0EBD18 02B0+00 1/1 0/0 0/0 .text            procHorseCutInit__9daAlink_cFv */
 int daAlink_c::procHorseCutInit() {
     commonProcInit(PROC_HORSE_CUT);
     BOOL var_r26 = 0;
@@ -2099,7 +2012,6 @@ int daAlink_c::procHorseCutInit() {
     return 1;
 }
 
-/* 800F1688-800F1894 0EBFC8 020C+00 1/0 0/0 0/0 .text            procHorseCut__9daAlink_cFv */
 int daAlink_c::procHorseCut() {
     daPy_frameCtrl_c* temp_r30 = &mUpperFrameCtrl[2];
 
@@ -2155,7 +2067,6 @@ int daAlink_c::procHorseCut() {
     return 1;
 }
 
-/* 800F1894-800F194C 0EC1D4 00B8+00 3/3 0/0 0/0 .text procHorseCutChargeReadyInit__9daAlink_cFv */
 int daAlink_c::procHorseCutChargeReadyInit() {
     commonProcInit(PROC_HORSE_CUT_CHARGE_READY);
     setUpperAnimeParam(0x96, UPPER_2, &daAlinkHIO_hoCutCharge_c0::m.mChargeAnm);
@@ -2173,7 +2084,6 @@ int daAlink_c::procHorseCutChargeReadyInit() {
     return 1;
 }
 
-/* 800F194C-800F1AAC 0EC28C 0160+00 1/0 0/0 0/0 .text procHorseCutChargeReady__9daAlink_cFv */
 int daAlink_c::procHorseCutChargeReady() {
     daPy_frameCtrl_c* temp_r30 = &mUpperFrameCtrl[2];
 
@@ -2213,8 +2123,6 @@ int daAlink_c::procHorseCutChargeReady() {
     return 1;
 }
 
-/* 800F1AAC-800F1BA4 0EC3EC 00F8+00 3/3 0/0 0/0 .text            procHorseCutTurnInit__9daAlink_cFv
- */
 int daAlink_c::procHorseCutTurnInit() {
     commonProcInit(PROC_HORSE_CUT_TURN);
 
@@ -2234,7 +2142,6 @@ int daAlink_c::procHorseCutTurnInit() {
     return 1;
 }
 
-/* 800F1BA4-800F1D18 0EC4E4 0174+00 1/0 0/0 0/0 .text            procHorseCutTurn__9daAlink_cFv */
 int daAlink_c::procHorseCutTurn() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -2274,8 +2181,6 @@ int daAlink_c::procHorseCutTurn() {
     return 1;
 }
 
-/* 800F1D18-800F2028 0EC658 0310+00 2/2 0/0 0/0 .text
- * procHorseDamageInit__9daAlink_cFP12dCcD_GObjInf              */
 int daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) {
     commonProcInit(PROC_HORSE_DAMAGE);
 
@@ -2323,7 +2228,6 @@ int daAlink_c::procHorseDamageInit(dCcD_GObjInf* param_0) {
     return 1;
 }
 
-/* 800F2028-800F2150 0EC968 0128+00 1/0 0/0 0/0 .text            procHorseDamage__9daAlink_cFv */
 int daAlink_c::procHorseDamage() {
     if (!setSyncRide(0)) {
         return 1;
@@ -2343,7 +2247,6 @@ int daAlink_c::procHorseDamage() {
     return 1;
 }
 
-/* 800F2150-800F21B4 0ECA90 0064+00 1/1 0/0 0/0 .text procHorseBowSubjectInit__9daAlink_cFv */
 int daAlink_c::procHorseBowSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_BOW_SUBJECT)) {
         return 0;
@@ -2356,8 +2259,6 @@ int daAlink_c::procHorseBowSubjectInit() {
     return 1;
 }
 
-/* 800F21B4-800F224C 0ECAF4 0098+00 1/0 0/0 0/0 .text            procHorseBowSubject__9daAlink_cFv
- */
 int daAlink_c::procHorseBowSubject() {
     setDoStatus(0x12);
 
@@ -2378,8 +2279,6 @@ int daAlink_c::procHorseBowSubject() {
     return 1;
 }
 
-/* 800F224C-800F22A8 0ECB8C 005C+00 1/1 0/0 0/0 .text            procHorseBowMoveInit__9daAlink_cFv
- */
 int daAlink_c::procHorseBowMoveInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_BOW_MOVE)) {
         return 0;
@@ -2391,7 +2290,6 @@ int daAlink_c::procHorseBowMoveInit() {
     return 1;
 }
 
-/* 800F22A8-800F2334 0ECBE8 008C+00 1/0 0/0 0/0 .text            procHorseBowMove__9daAlink_cFv */
 int daAlink_c::procHorseBowMove() {
     setDoStatus(0x12);
 
@@ -2413,8 +2311,6 @@ int daAlink_c::procHorseBowMove() {
     return 1;
 }
 
-/* 800F2334-800F2390 0ECC74 005C+00 2/2 0/0 0/0 .text            procHorseGrabMoveInit__9daAlink_cFv
- */
 int daAlink_c::procHorseGrabMoveInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_GRAB_MOVE)) {
         return 0;
@@ -2426,7 +2322,6 @@ int daAlink_c::procHorseGrabMoveInit() {
     return 1;
 }
 
-/* 800F2390-800F2454 0ECCD0 00C4+00 1/0 0/0 0/0 .text            procHorseGrabMove__9daAlink_cFv */
 int daAlink_c::procHorseGrabMove() {
     if (!setSyncRidePos()) {
         return 1;
@@ -2453,8 +2348,6 @@ int daAlink_c::procHorseGrabMove() {
     return 1;
 }
 
-/* 800F2454-800F24C8 0ECD94 0074+00 1/1 0/0 0/0 .text procHorseBoomerangSubjectInit__9daAlink_cFv
- */
 int daAlink_c::procHorseBoomerangSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_BOOMERANG_SUBJECT)) {
         return 0;
@@ -2467,7 +2360,6 @@ int daAlink_c::procHorseBoomerangSubjectInit() {
     return 1;
 }
 
-/* 800F24C8-800F25B4 0ECE08 00EC+00 1/0 0/0 0/0 .text procHorseBoomerangSubject__9daAlink_cFv */
 int daAlink_c::procHorseBoomerangSubject() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -2498,7 +2390,6 @@ int daAlink_c::procHorseBoomerangSubject() {
     return 1;
 }
 
-/* 800F25B4-800F2628 0ECEF4 0074+00 1/1 0/0 0/0 .text procHorseBoomerangMoveInit__9daAlink_cFv */
 int daAlink_c::procHorseBoomerangMoveInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_BOOMERANG_MOVE)) {
         return 0;
@@ -2511,7 +2402,6 @@ int daAlink_c::procHorseBoomerangMoveInit() {
     return 1;
 }
 
-/* 800F2628-800F26F4 0ECF68 00CC+00 1/0 0/0 0/0 .text procHorseBoomerangMove__9daAlink_cFv */
 int daAlink_c::procHorseBoomerangMove() {
     if (!checkItemActorPointer()) {
         return 1;
@@ -2538,8 +2428,6 @@ int daAlink_c::procHorseBoomerangMove() {
     return 1;
 }
 
-/* 800F26F4-800F2770 0ED034 007C+00 1/1 0/0 0/0 .text procHorseHookshotSubjectInit__9daAlink_cFv
- */
 int daAlink_c::procHorseHookshotSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_HOOKSHOT_SUBJECT)) {
         return 0;
@@ -2553,7 +2441,6 @@ int daAlink_c::procHorseHookshotSubjectInit() {
     return 1;
 }
 
-/* 800F2770-800F2824 0ED0B0 00B4+00 1/0 0/0 0/0 .text procHorseHookshotSubject__9daAlink_cFv */
 int daAlink_c::procHorseHookshotSubject() {
     if (checkHookshotWait()) {
         setDoStatus(0x12);
@@ -2580,7 +2467,6 @@ int daAlink_c::procHorseHookshotSubject() {
     return 1;
 }
 
-/* 800F2824-800F2898 0ED164 0074+00 1/1 0/0 0/0 .text procHorseHookshotMoveInit__9daAlink_cFv */
 int daAlink_c::procHorseHookshotMoveInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_HOOKSHOT_MOVE)) {
         return 0;
@@ -2593,8 +2479,6 @@ int daAlink_c::procHorseHookshotMoveInit() {
     return 1;
 }
 
-/* 800F2898-800F2934 0ED1D8 009C+00 1/0 0/0 0/0 .text            procHorseHookshotMove__9daAlink_cFv
- */
 int daAlink_c::procHorseHookshotMove() {
     cancelHookshotMove();
 
@@ -2619,7 +2503,6 @@ int daAlink_c::procHorseHookshotMove() {
     return 1;
 }
 
-/* 800F2934-800F2AD8 0ED274 01A4+00 1/1 0/0 0/0 .text procHorseBottleDrinkInit__9daAlink_cFUs */
 int daAlink_c::procHorseBottleDrinkInit(u16 param_0) {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
         return 0;
@@ -2656,8 +2539,6 @@ int daAlink_c::procHorseBottleDrinkInit(u16 param_0) {
     return 1;
 }
 
-/* 800F2AD8-800F2B4C 0ED418 0074+00 1/0 0/0 0/0 .text            procHorseBottleDrink__9daAlink_cFv
- */
 int daAlink_c::procHorseBottleDrink() {
     dComIfGp_getHorseActor();
 
@@ -2673,7 +2554,6 @@ int daAlink_c::procHorseBottleDrink() {
     return 1;
 }
 
-/* 800F2B4C-800F2C78 0ED48C 012C+00 1/1 0/0 0/0 .text procHorseKandelaarPourInit__9daAlink_cFv */
 int daAlink_c::procHorseKandelaarPourInit() {
     if (!dComIfGp_event_compulsory(this, NULL, 0xFBFF)) {
         return 0;
@@ -2704,7 +2584,6 @@ int daAlink_c::procHorseKandelaarPourInit() {
     return 1;
 }
 
-/* 800F2C78-800F2D84 0ED5B8 010C+00 1/0 0/0 0/0 .text procHorseKandelaarPour__9daAlink_cFv */
 int daAlink_c::procHorseKandelaarPour() {
     if (!setSyncRidePos()) {
         mRideAcKeep.getActor()->speedF = field_0x3478;
@@ -2728,8 +2607,6 @@ int daAlink_c::procHorseKandelaarPour() {
     return 1;
 }
 
-/* 800F2D84-800F2DE4 0ED6C4 0060+00 2/2 0/0 0/0 .text            procHorseComebackInit__9daAlink_cFv
- */
 int daAlink_c::procHorseComebackInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_COMEBACK)) {
         return 0;
@@ -2741,7 +2618,6 @@ int daAlink_c::procHorseComebackInit() {
     return 1;
 }
 
-/* 800F2DE4-800F2EE0 0ED724 00FC+00 1/0 0/0 0/0 .text            procHorseComeback__9daAlink_cFv */
 int daAlink_c::procHorseComeback() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2763,7 +2639,6 @@ int daAlink_c::procHorseComeback() {
     return 1;
 }
 
-/* 800F2EE0-800F2F98 0ED820 00B8+00 2/2 0/0 0/0 .text            procHorseRunInit__9daAlink_cFv */
 int daAlink_c::procHorseRunInit() {
     commonProcInit(PROC_HORSE_RUN);
     initForceRideHorse();
@@ -2784,7 +2659,6 @@ int daAlink_c::procHorseRunInit() {
     return 1;
 }
 
-/* 800F2F98-800F3430 0ED8D8 0498+00 1/0 0/0 0/0 .text            procHorseRun__9daAlink_cFv */
 int daAlink_c::procHorseRun() {
     daHorse_c* temp_r29 = dComIfGp_getHorseActor();
     if (!setSyncHorsePos()) {
@@ -2877,8 +2751,6 @@ int daAlink_c::procHorseRun() {
     return 1;
 }
 
-/* 800F3430-800F3580 0EDD70 0150+00 1/1 0/0 0/0 .text
- * procHorseHangInit__9daAlink_cFP12dCcD_GObjInfi               */
 int daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) {
     if (checkBoarRide()) {
         return procHorseDamageInit(param_0);
@@ -2917,7 +2789,6 @@ int daAlink_c::procHorseHangInit(dCcD_GObjInf* param_0, int param_1) {
     return 1;
 }
 
-/* 800F3580-800F36E4 0EDEC0 0164+00 1/0 0/0 0/0 .text            procHorseHang__9daAlink_cFv */
 int daAlink_c::procHorseHang() {
     if (!setSyncHorsePos()) {
         return 1;
@@ -2956,8 +2827,6 @@ int daAlink_c::procHorseHang() {
     return 1;
 }
 
-/* 800F36E4-800F3754 0EE024 0070+00 1/0 0/0 0/0 .text            procHorseGetKeyInit__9daAlink_cFv
- */
 int daAlink_c::procHorseGetKeyInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_GET_KEY)) {
         return 0;
@@ -2970,7 +2839,6 @@ int daAlink_c::procHorseGetKeyInit() {
     return 1;
 }
 
-/* 800F3754-800F3818 0EE094 00C4+00 1/0 0/0 0/0 .text            procHorseGetKey__9daAlink_cFv */
 int daAlink_c::procHorseGetKey() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2990,8 +2858,6 @@ int daAlink_c::procHorseGetKey() {
     return 1;
 }
 
-/* 800F3818-800F3894 0EE158 007C+00 1/0 0/0 0/0 .text            procHorseLookDownInit__9daAlink_cFv
- */
 int daAlink_c::procHorseLookDownInit() {
     if (!commonProcInitNotSameProc(PROC_HORSE_LOOK_DOWN)) {
         return 0;
@@ -3007,7 +2873,6 @@ int daAlink_c::procHorseLookDownInit() {
     return 1;
 }
 
-/* 800F3894-800F38E8 0EE1D4 0054+00 1/0 0/0 0/0 .text            procHorseLookDown__9daAlink_cFv */
 int daAlink_c::procHorseLookDown() {
     setSyncRidePos();
 
@@ -3017,7 +2882,6 @@ int daAlink_c::procHorseLookDown() {
     return 1;
 }
 
-/* 800F38E8-800F3998 0EE228 00B0+00 1/1 0/0 0/0 .text            procBoarRunInit__9daAlink_cFv */
 int daAlink_c::procBoarRunInit() {
     commonProcInit(PROC_BOAR_RUN);
     resetUpperAnime(UPPER_2, -1.0f);
@@ -3035,7 +2899,6 @@ int daAlink_c::procBoarRunInit() {
     return 1;
 }
 
-/* 800F3998-800F3BB0 0EE2D8 0218+00 1/0 0/0 0/0 .text            procBoarRun__9daAlink_cFv */
 int daAlink_c::procBoarRun() {
     e_wb_class* temp_r30 = (e_wb_class*)mRideAcKeep.getActor();
     fopAc_ac_c* temp_r29 = (fopAc_ac_c*)temp_r30;
diff --git a/src/d/actor/d_a_alink_hvyboots.inc b/src/d/actor/d_a_alink_hvyboots.inc
index c61795b2ca..9465d66435 100644
--- a/src/d/actor/d_a_alink_hvyboots.inc
+++ b/src/d/actor/d_a_alink_hvyboots.inc
@@ -6,30 +6,24 @@
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_tag_magne.h"
 
-/* 800E23FC-800E243C 0DCD3C 0040+00 6/6 0/0 0/0 .text            concatMagneBootMtx__9daAlink_cFv */
 void daAlink_c::concatMagneBootMtx() {
     if (checkMagneBootsOn()) {
         mDoMtx_stack_c::concat(mMagneBootMtx);
     }
 }
 
-/* 800E243C-800E247C 0DCD7C 0040+00 1/1 0/0 0/0 .text            concatMagneBootInvMtx__9daAlink_cFv
- */
 void daAlink_c::concatMagneBootInvMtx() {
     if (checkMagneBootsOn()) {
         mDoMtx_stack_c::concat(mMagneBootInvMtx);
     }
 }
 
-/* 800E247C-800E24B0 0DCDBC 0034+00 8/8 0/0 0/0 .text multVecMagneBootInvMtx__9daAlink_cFP4cXyz */
 void daAlink_c::multVecMagneBootInvMtx(cXyz* vec) {
     if (checkMagneBootsOn()) {
         mDoMtx_multVecSR(mMagneBootInvMtx, vec, vec);
     }
 }
 
-/* 800E24B0-800E251C 0DCDF0 006C+00 2/2 0/0 0/0 .text
- * commonMagneLineCheck__9daAlink_cFP4cXyzP4cXyz                */
 bool daAlink_c::commonMagneLineCheck(cXyz* i_start, cXyz* i_end) {
     mMagneLineChk.Set(i_start, i_end, this);
 
@@ -40,14 +34,11 @@ bool daAlink_c::commonMagneLineCheck(cXyz* i_start, cXyz* i_end) {
     return false;
 }
 
-/* 800E251C-800E2580 0DCE5C 0064+00 2/2 0/0 0/0 .text            checkBootsMoveAnime__9daAlink_cFi
- */
 BOOL daAlink_c::checkBootsMoveAnime(int param_0) {
     return (checkHeavyStateOn(param_0, 1) && !checkNoResetFlg0(FLG0_UNDERWATER)) ||
            checkDkCaught2Anime();
 }
 
-/* 800E2580-800E2738 0DCEC0 01B8+00 17/17 0/0 0/0 .text            setHeavyBoots__9daAlink_cFi */
 int daAlink_c::setHeavyBoots(int param_0) {
     if (checkEquipHeavyBoots()) {
         offNoResetFlg0(FLG0_EQUIP_HVY_BOOTS);
@@ -102,7 +93,6 @@ int daAlink_c::setHeavyBoots(int param_0) {
 }
 
 
-/* 800E2738-800E2808 0DD078 00D0+00 2/2 0/0 0/0 .text getMagneBootsLocalAngleY__9daAlink_cFsi */
 s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) {
     if (param_1 == 1 || (param_1 != 2 && field_0x3114 <= 0x4000 && field_0x3114 != -0x8000)) {
         return param_0;
@@ -118,8 +108,6 @@ s16 daAlink_c::getMagneBootsLocalAngleY(s16 param_0, int param_1) {
 }
 
 
-/* 800E2808-800E2DC4 0DD148 05BC+00 3/3 0/0 0/0 .text
- * setMagneBootsMtx__9daAlink_cFP13cBgS_PolyInfoi               */
 void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) {
     cM3dGPla poly;
     dComIfG_Bgsp().GetTriPla(*i_polyinfo, &poly);
@@ -214,7 +202,6 @@ void daAlink_c::setMagneBootsMtx(cBgS_PolyInfo* i_polyinfo, int param_1) {
 }
 
 
-/* 800E2DC4-800E2F88 0DD704 01C4+00 7/7 0/0 0/0 .text            cancelMagneBootsOn__9daAlink_cFv */
 int daAlink_c::cancelMagneBootsOn() {
     offNoResetFlg0(FLG0_MAGNE_BOOTS_ON);
     mZ2Link.setMagnetized(false);
@@ -256,7 +243,6 @@ int daAlink_c::cancelMagneBootsOn() {
 }
 
 
-/* 800E2F88-800E3048 0DD8C8 00C0+00 1/1 0/0 0/0 .text            checkMagneBootsFly__9daAlink_cFv */
 int daAlink_c::checkMagneBootsFly() {
     if (field_0x2fb8 != 0 && checkEquipHeavyBoots() && !checkDeadHP() &&
         mProcID != PROC_MAGNE_BOOTS_FLY && !checkEventRun())
@@ -272,7 +258,6 @@ int daAlink_c::checkMagneBootsFly() {
     return 0;
 }
 
-/* 800E3048-800E30DC 0DD988 0094+00 2/2 0/0 0/0 .text            procBootsEquipInit__9daAlink_cFv */
 int daAlink_c::procBootsEquipInit() {
     commonProcInit(PROC_BOOTS_EQUIP);
     setSingleAnimeParam(ANM_HVY_BOOTS_PUT_ON, &daAlinkHIO_magneBoots_c0::m.mEquipAnm);
@@ -288,7 +273,6 @@ int daAlink_c::procBootsEquipInit() {
     return 1;
 }
 
-/* 800E30DC-800E3218 0DDA1C 013C+00 1/0 0/0 0/0 .text            procBootsEquip__9daAlink_cFv */
 int daAlink_c::procBootsEquip() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     onEndResetFlg0(ERFLG0_UNK_8000000);
@@ -315,8 +299,6 @@ int daAlink_c::procBootsEquip() {
 }
 
 
-/* 800E3218-800E3454 0DDB58 023C+00 1/1 0/0 0/0 .text            procMagneBootsFlyInit__9daAlink_cFv
- */
 int daAlink_c::procMagneBootsFlyInit() {
     cXyz sp44 = field_0x369c.normZP();
     cM3dGPla sp50(&sp44, -sp44.inprod(field_0x3834));
@@ -363,7 +345,6 @@ int daAlink_c::procMagneBootsFlyInit() {
 }
 
 
-/* 800E3454-800E3760 0DDD94 030C+00 1/0 0/0 0/0 .text            procMagneBootsFly__9daAlink_cFv */
 int daAlink_c::procMagneBootsFly() {
     field_0x3478 += daAlinkHIO_magneBoots_c0::m.mMagneFlyAccelRate;
     if (field_0x3478 > field_0x594) {
diff --git a/src/d/actor/d_a_alink_iceleaf.inc b/src/d/actor/d_a_alink_iceleaf.inc
index d552ca0936..a9582b1edb 100644
--- a/src/d/actor/d_a_alink_iceleaf.inc
+++ b/src/d/actor/d_a_alink_iceleaf.inc
@@ -7,7 +7,6 @@
 #include "d/actor/d_a_obj_iceleaf.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80105A84-80105A98 1003C4 0014+00 1/1 0/0 0/0 .text daAlink_searchIceLeaf__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_Obj_IceLeaf) {
         return i_actor;
@@ -16,24 +15,19 @@ static fopAc_ac_c* daAlink_searchIceLeaf(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80105A98-80105ABC 1003D8 0024+00 3/3 0/0 0/0 .text            checkSnowCode__9daAlink_cCFv */
 bool daAlink_c::checkSnowCode() const {
     return mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || mGndPolySpecialCode == dBgW_SPCODE_LIGHT_SNOW;
 }
 
-/* 80105ABC-80105B10 1003FC 0054+00 1/1 0/0 1/1 .text
- * checkSnowCodePolygon__9daAlink_cFR13cBgS_PolyInfo            */
 bool daAlink_c::checkSnowCodePolygon(cBgS_PolyInfo& i_poly) {
     int code = dComIfG_Bgsp().GetSpecialCode(i_poly);
     return code == dBgW_SPCODE_HEAVY_SNOW || code == dBgW_SPCODE_LIGHT_SNOW;
 }
 
-/* 80105B10-80105B58 100450 0048+00 2/2 0/0 0/0 .text            checkBoardRestart__9daAlink_cFv */
 bool daAlink_c::checkBoardRestart() {
     return (mRideStatus == 0 && mRideAcKeep.getActor() != NULL) && fopAcM_GetName(mRideAcKeep.getActor()) == PROC_Obj_IceLeaf;
 }
 
-/* 80105B58-80106534 100498 09DC+00 7/7 0/0 0/0 .text            boardCommon__9daAlink_cFi */
 int daAlink_c::boardCommon(BOOL i_canMove) {
     int sp18 = abs(shape_angle.x);
     int var_r25 = abs(shape_angle.z);
@@ -233,16 +227,12 @@ int daAlink_c::boardCommon(BOOL i_canMove) {
     return 0;
 }
 
-/* 80106534-8010658C 100E74 0058+00 6/6 0/0 0/0 .text            setCommonBoardAnime__9daAlink_cFi
- */
 void daAlink_c::setCommonBoardAnime(BOOL i_is_ride_front) {
     setDoubleAnime(0.0f, daAlinkHIO_board_c0::m.mStandAnmSpeed, 1.0f,
                    i_is_ride_front ? ANM_RIDE_FRONT : ANM_RIDE_WAIT, ANM_RIDE_STOP,
                    11, daAlinkHIO_board_c0::m.mStandInterpolation);
 }
 
-/* 8010658C-80106618 100ECC 008C+00 5/5 0/0 0/0 .text            checkNextActionBoard__9daAlink_cFv
- */
 int daAlink_c::checkNextActionBoard() {
     if (checkNextActionFromButton()) {
         return 1;
@@ -256,8 +246,6 @@ int daAlink_c::checkNextActionBoard() {
     return procBoardWaitInit(NULL);
 }
 
-/* 80106618-80106650 100F58 0038+00 2/2 0/0 0/0 .text checkBoardSwordTriggerAction__9daAlink_cFv
- */
 int daAlink_c::checkBoardSwordTriggerAction() {
     if (checkModeFlg(2)) {
         return procBoardCutInit();
@@ -266,8 +254,6 @@ int daAlink_c::checkBoardSwordTriggerAction() {
     }
 }
 
-/* 80106650-801066B8 100F90 0068+00 3/3 0/0 0/0 .text
- * commonProcBoardInit__9daAlink_cFQ29daAlink_c12daAlink_PROC   */
 int daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC i_procID) {
     if (mProcID == i_procID) {
         return 0;
@@ -283,22 +269,18 @@ int daAlink_c::commonProcBoardInit(daAlink_c::daAlink_PROC i_procID) {
     return 1;
 }
 
-/* 801066B8-801066EC 100FF8 0034+00 1/1 0/0 0/0 .text            getBoardRowAnmSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getBoardRowAnmSpeed() {
     return daAlinkHIO_board_c0::m.mPushAnmMinSpeed +
            ((daAlinkHIO_board_c0::m.mPushAnmMaxSpeed - daAlinkHIO_board_c0::m.mPushAnmMinSpeed) *
            (1.0f - (mNormalSpeed / daAlinkHIO_board_c0::m.mFastPushSwitchSpeed)));
 }
 
-/* 801066EC-80106774 10102C 0088+00 3/3 0/0 0/0 .text            setBoardLandAnime__9daAlink_cFv */
 void daAlink_c::setBoardLandAnime() {
     setSingleAnimeParam(ANM_RIDE_JUMP_LAND, &daAlinkHIO_board_c0::m.mLandAnm);
     seStartOnlyReverb(Z2SE_AL_SNOBO_LAND);
     dComIfGp_getVibration().StartShock(2, 15, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80106774-801069D0 1010B4 025C+00 1/1 0/0 0/0 .text            procBoardRideInit__9daAlink_cFv */
 int daAlink_c::procBoardRideInit() {
     commonProcInit(PROC_BOARD_RIDE);
     setSingleAnime(ANM_VJUMP_START, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mSpeed, 6.0f, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mEndFrame, daAlinkHIO_smallJump_c0::m.mSmallJumpAnm.mInterpolation);
@@ -328,7 +310,6 @@ int daAlink_c::procBoardRideInit() {
     return 1;
 }
 
-/* 801069D0-80106A38 101310 0068+00 1/0 0/0 0/0 .text            procBoardRide__9daAlink_cFv */
 int daAlink_c::procBoardRide() {
     field_0x2f99 = 15;
 
@@ -345,8 +326,6 @@ int daAlink_c::procBoardRide() {
     return 1;
 }
 
-/* 80106A38-80106BCC 101378 0194+00 13/13 0/0 0/0 .text
- * procBoardWaitInit__9daAlink_cFP10fopAc_ac_c                  */
 int daAlink_c::procBoardWaitInit(fopAc_ac_c* i_board) {
     if (mEquipItem != 0x103) {
         deleteEquipItem(TRUE, TRUE);
@@ -398,7 +377,6 @@ int daAlink_c::procBoardWaitInit(fopAc_ac_c* i_board) {
     return 1;
 }
 
-/* 80106BCC-80106E88 10150C 02BC+00 1/0 0/0 0/0 .text            procBoardWait__9daAlink_cFv */
 int daAlink_c::procBoardWait() {
     if (boardCommon(TRUE)) {
         return 1;
@@ -473,7 +451,6 @@ int daAlink_c::procBoardWait() {
     return 1;
 }
 
-/* 80106E88-80106F00 1017C8 0078+00 1/1 0/0 0/0 .text            procBoardRowInit__9daAlink_cFv */
 int daAlink_c::procBoardRowInit() {
     commonProcInit(PROC_BOARD_ROW);
     setSingleAnimeBaseSpeed(ANM_RIDE_KICK, getBoardRowAnmSpeed(), daAlinkHIO_board_c0::m.mPushInterpolation);
@@ -484,7 +461,6 @@ int daAlink_c::procBoardRowInit() {
     return 1;
 }
 
-/* 80106F00-80107060 101840 0160+00 1/0 0/0 0/0 .text            procBoardRow__9daAlink_cFv */
 int daAlink_c::procBoardRow() {
     if (boardCommon(TRUE)) {
         return 1;
@@ -517,7 +493,6 @@ int daAlink_c::procBoardRow() {
     return 1;
 }
 
-/* 80107060-801070DC 1019A0 007C+00 1/1 0/0 0/0 .text            procBoardTurnInit__9daAlink_cFv */
 int daAlink_c::procBoardTurnInit() {
     commonProcInit(PROC_BOARD_TURN);
     setSingleAnime(ANM_RIDE_JUMP, 0.0f, 1.0f, daAlinkHIO_board_c0::m.mAirborneAnm.mEndFrame, 3.0f);
@@ -529,7 +504,6 @@ int daAlink_c::procBoardTurnInit() {
     return 1;
 }
 
-/* 801070DC-80107218 101A1C 013C+00 1/0 0/0 0/0 .text            procBoardTurn__9daAlink_cFv */
 int daAlink_c::procBoardTurn() {
     if (boardCommon(FALSE)) {
         return 1;
@@ -561,7 +535,6 @@ int daAlink_c::procBoardTurn() {
     return 1;
 }
 
-/* 80107218-80107300 101B58 00E8+00 4/4 0/0 0/0 .text            procBoardJumpInit__9daAlink_cFfi */
 int daAlink_c::procBoardJumpInit(f32 i_jump_speed, BOOL i_no_speed_set) {
     commonProcInit(PROC_BOARD_JUMP);
     mProcVar0.field_0x3008 = 0;
@@ -581,7 +554,6 @@ int daAlink_c::procBoardJumpInit(f32 i_jump_speed, BOOL i_no_speed_set) {
     return 1;
 }
 
-/* 80107300-801073D0 101C40 00D0+00 1/0 0/0 0/0 .text            procBoardJump__9daAlink_cFv */
 int daAlink_c::procBoardJump() {
     if (boardCommon(TRUE)) {
         return 1;
@@ -603,7 +575,6 @@ int daAlink_c::procBoardJump() {
     return 1;
 }
 
-/* 801073D0-80107418 101D10 0048+00 1/1 0/0 0/0 .text procBoardSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procBoardSubjectivityInit() {
     commonProcBoardInit(PROC_BOARD_SUBJECTIVITY);
     setSubjectMode();
@@ -612,8 +583,6 @@ int daAlink_c::procBoardSubjectivityInit() {
     return 1;
 }
 
-/* 80107418-801074AC 101D58 0094+00 1/0 0/0 0/0 .text            procBoardSubjectivity__9daAlink_cFv
- */
 int daAlink_c::procBoardSubjectivity() {
     onResetFlg0(RFLG0_UNK_4000000);
     s16 old_shape_angle = shape_angle.y;
@@ -634,7 +603,6 @@ int daAlink_c::procBoardSubjectivity() {
     return 1;
 }
 
-/* 801074AC-8010755C 101DEC 00B0+00 3/3 0/0 0/0 .text            procBoardCutInit__9daAlink_cFv */
 int daAlink_c::procBoardCutInit() {
     commonProcBoardInit(PROC_BOARD_CUT);
 
@@ -652,7 +620,6 @@ int daAlink_c::procBoardCutInit() {
     return 1;
 }
 
-/* 8010755C-801075D4 101E9C 0078+00 1/0 0/0 0/0 .text            procBoardCut__9daAlink_cFv */
 int daAlink_c::procBoardCut() {
     if (boardCommon(TRUE)) {
         return 1;
@@ -666,8 +633,6 @@ int daAlink_c::procBoardCut() {
     return 1;
 }
 
-/* 801075D4-80107744 101F14 0170+00 2/2 0/0 0/0 .text            procBoardCutTurnInit__9daAlink_cFv
- */
 int daAlink_c::procBoardCutTurnInit() {
     commonProcBoardInit(PROC_BOARD_CUT_TURN);
     setSingleAnimeParam(ANM_RIDE_CUT_TURN, &daAlinkHIO_board_c0::m.mSpinAnm);
@@ -698,7 +663,6 @@ int daAlink_c::procBoardCutTurnInit() {
     return 1;
 }
 
-/* 80107744-80107900 102084 01BC+00 1/0 0/0 0/0 .text            procBoardCutTurn__9daAlink_cFv */
 int daAlink_c::procBoardCutTurn() {
     if (boardCommon(TRUE)) {
         return 1;
diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc
index 57aba3a6f7..58ac7642b1 100644
--- a/src/d/actor/d_a_alink_ironball.inc
+++ b/src/d/actor/d_a_alink_ironball.inc
@@ -5,8 +5,6 @@
 
 #include "d/actor/d_a_alink.h"
 
-/* 8011243C-80112458 10CD7C 001C+00 1/0 0/0 0/0 .text            getIronBallCenterPos__9daAlink_cFv
- */
 cXyz* daAlink_c::getIronBallCenterPos() {
     if (mEquipItem == fpcNm_ITEM_IRONBALL) {
         return &mIronBallCenterPos;
@@ -15,7 +13,6 @@ cXyz* daAlink_c::getIronBallCenterPos() {
     return NULL;
 }
 
-/* 80112458-80112474 10CD98 001C+00 1/0 0/0 0/0 .text            getIronBallBgHit__9daAlink_cCFv */
 int daAlink_c::getIronBallBgHit() const {
     if (mEquipItem == fpcNm_ITEM_IRONBALL) {
         return field_0x301c;
@@ -24,32 +21,25 @@ int daAlink_c::getIronBallBgHit() const {
     return 0;
 }
 
-/* 80112474-801124B4 10CDB4 0040+00 0/0 2/2 1/1 .text checkIronBallThrowMode__9daAlink_cCFv */
 bool daAlink_c::checkIronBallThrowMode() const {
     return mEquipItem == fpcNm_ITEM_IRONBALL &&
            (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 || mItemVar0.field_0x3018 == 3);
 }
 
-/* 801124B4-801124FC 10CDF4 0048+00 0/0 1/1 1/1 .text checkIronBallThrowReturnMode__9daAlink_cCFv
- */
 bool daAlink_c::checkIronBallThrowReturnMode() const {
     return mEquipItem == fpcNm_ITEM_IRONBALL && (mItemVar0.field_0x3018 == 4 || mItemVar0.field_0x3018 == 5 || mItemVar0.field_0x3018 == 6 ||
                                       mItemVar0.field_0x3018 == 7 || mItemVar0.field_0x3018 == 3);
 }
 
-/* 801124FC-80112524 10CE3C 0028+00 1/0 0/0 0/0 .text            checkIronBallReturn__9daAlink_cCFv
- */
 bool daAlink_c::checkIronBallReturn() const {
     return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 == 7;
 }
 
-/* 80112524-80112568 10CE64 0044+00 1/0 0/0 0/0 .text checkIronBallGroundStop__9daAlink_cCFv */
 bool daAlink_c::checkIronBallGroundStop() const {
     return mEquipItem == fpcNm_ITEM_IRONBALL && mItemVar0.field_0x3018 != 0 && mItemVar0.field_0x3018 != 8 && field_0x301e == 0 &&
            field_0x301e < 10;
 }
 
-/* 80112568-80112628 10CEA8 00C0+00 5/5 0/0 0/0 .text setIronBallWaitUpperAnime__9daAlink_cFi */
 void daAlink_c::setIronBallWaitUpperAnime(int param_0) {
     if (!checkIronBallWaitAnime() && !checkIronBallPreSwingAnime() &&
         (mItemVar0.field_0x3018 == 0 || mItemVar0.field_0x3018 == 8) && (param_0 || checkNoUpperAnime())) {
@@ -62,8 +52,6 @@ void daAlink_c::setIronBallWaitUpperAnime(int param_0) {
     }
 }
 
-/* 80112628-801126F8 10CF68 00D0+00 1/1 0/0 0/0 .text            checkIronBallDelete__9daAlink_cFv
- */
 void daAlink_c::checkIronBallDelete() {
     if (mProcID == PROC_IRON_BALL_SUBJECT || mProcID == PROC_IRON_BALL_MOVE ||
         mProcID == PROC_IRON_BALL_THROW || mProcID == PROC_IRON_BALL_RETURN) {
@@ -78,7 +66,6 @@ void daAlink_c::checkIronBallDelete() {
     }
 }
 
-/* 801126F8-80112768 10D038 0070+00 2/2 0/0 0/0 .text            setIronBallReturn__9daAlink_cFi */
 void daAlink_c::setIronBallReturn(int param_0) {
     if (param_0 && field_0x301e != 0) {
         field_0x301e--;
@@ -89,8 +76,6 @@ void daAlink_c::setIronBallReturn(int param_0) {
     }
 }
 
-/* 80112768-801127F0 10D0A8 0088+00 2/2 0/0 0/0 .text            setIronBallBgCheckPos__9daAlink_cFv
- */
 void daAlink_c::setIronBallBgCheckPos() {
     cXyz sp8;
     mDoMtx_stack_c::transS(*mIronBallChainPos);
@@ -101,7 +86,6 @@ void daAlink_c::setIronBallBgCheckPos() {
     cLib_chaseF(&mSearchBallScale, 0.0f, 2.0f);
 }
 
-/* 801127F0-80112C80 10D130 0490+00 1/1 0/0 0/0 .text            setIronBallModel__9daAlink_cFv */
 void daAlink_c::setIronBallModel() {
     JKRHeap* prev_heap = setItemHeap();
 
@@ -184,8 +168,6 @@ void daAlink_c::setIronBallModel() {
     field_0x1778.SetCoVsGrp(0x60);
 }
 
-/* 80112C84-80112E7C 10D5C4 01F8+00 1/1 0/0 0/0 .text
- * setIronBallGroundVec__9daAlink_cFPC4cXyzP4cXyz               */
 int daAlink_c::setIronBallGroundVec(cXyz const* param_0, cXyz* param_1) {
     cXyz sp3C(param_0->x, param_0->y + 50.0f, param_0->z);
 
@@ -212,8 +194,6 @@ int daAlink_c::setIronBallGroundVec(cXyz const* param_0, cXyz* param_1) {
     return 0;
 }
 
-/* 80112E7C-80113CA0 10D7BC 0E24+00 1/1 0/0 0/0 .text            setIronBallChainPos__9daAlink_cFv
- */
 void daAlink_c::setIronBallChainPos() {
     cXyz sp2A4;
     cXyz sp298;
@@ -464,7 +444,6 @@ void daAlink_c::setIronBallChainPos() {
     }
 }
 
-/* 80113CA0-80113D58 10E5E0 00B8+00 1/1 0/0 0/0 .text checkIronBallReturnChange__9daAlink_cFv */
 BOOL daAlink_c::checkIronBallReturnChange() {
     if (mProcID != PROC_IRON_BALL_THROW ||
         (!(mBodyAngle.x > 0x400) && mIronBallBgChkPos.y < (current.pos.y - 200.0f)) ||
@@ -478,7 +457,6 @@ BOOL daAlink_c::checkIronBallReturnChange() {
     return false;
 }
 
-/* 80113D58-801150E4 10E698 138C+00 1/1 0/0 0/0 .text            setIronBallPos__9daAlink_cFv */
 void daAlink_c::setIronBallPos() {
     cXyz sp10C;
     cXyz sp100;
@@ -826,14 +804,10 @@ void daAlink_c::setIronBallPos() {
     field_0x2f1c->setEffectCenter(&tevStr, &mIronBallBgChkPos, 0x3B, 0x40000, var_r25 ? &mIronBallBgChkPos : NULL, NULL, NULL, fopAcM_GetRoomNo(this), field_0x3420, 0.0f);
 }
 
-/* 801150E4-8011510C 10FA24 0028+00 10/10 0/0 0/0 .text            checkIronBallAnime__9daAlink_cCFv
- */
 BOOL daAlink_c::checkIronBallAnime() const {
     return checkIronBallPreSwingAnime() || checkIronBallSwingAnime();
 }
 
-/* 8011510C-801151E0 10FA4C 00D4+00 1/1 0/0 0/0 .text            setIronBallReadyAnime__9daAlink_cFv
- */
 void daAlink_c::setIronBallReadyAnime() {
     resetUpperAnime(UPPER_2, -1.0f);
     setSingleAnime(ANM_IRONBALL_ATTACK, daAlinkHIO_ironBall_c0::m.mPrepareAnmSpeed, 0.0f,
@@ -852,8 +826,6 @@ void daAlink_c::setIronBallReadyAnime() {
     mSearchBallScale = 0.0f;
 }
 
-/* 801151E0-80115254 10FB20 0074+00 2/2 0/0 0/0 .text            setIronBallBaseAnime__9daAlink_cFv
- */
 void daAlink_c::setIronBallBaseAnime() {
     if (checkIronBallSwingAnime() && !checkUnderMove0BckNoArc(ANM_IRONBALL_TURN)) {
         setSingleAnimeBaseSpeed(ANM_IRONBALL_TURN, daAlinkHIO_ironBall_c0::m.mTurnAnmSpeed, daAlinkHIO_ironBall_c0::m.mTurnInterpolation);
@@ -862,8 +834,6 @@ void daAlink_c::setIronBallBaseAnime() {
     }
 }
 
-/* 80115254-801153F8 10FB94 01A4+00 1/1 0/0 0/0 .text checkUpperItemActionIronBall__9daAlink_cFv
- */
 BOOL daAlink_c::checkUpperItemActionIronBall() {
     if (!itemButton() && checkReadyItem()) {
         field_0x3020 = 1;
@@ -903,7 +873,6 @@ BOOL daAlink_c::checkUpperItemActionIronBall() {
     return cancelUpperItemReadyAnime(0);
 }
 
-/* 801153F8-801154E4 10FD38 00EC+00 2/2 0/0 0/0 .text checkNextActionIronBall__9daAlink_cFv */
 int daAlink_c::checkNextActionIronBall() {
     if (mFastShotTime != 0) {
         mFastShotTime--;
@@ -925,7 +894,6 @@ int daAlink_c::checkNextActionIronBall() {
     }
 }
 
-/* 801154E4-80115564 10FE24 0080+00 1/1 0/0 0/0 .text procIronBallSubjectInit__9daAlink_cFv */
 int daAlink_c::procIronBallSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_IRON_BALL_SUBJECT)) {
         return 0;
@@ -942,8 +910,6 @@ int daAlink_c::procIronBallSubjectInit() {
     return 1;
 }
 
-/* 80115564-801155EC 10FEA4 0088+00 1/0 0/0 0/0 .text            procIronBallSubject__9daAlink_cFv
- */
 int daAlink_c::procIronBallSubject() {
     if (checkIronBallAnime()) {
         setDoStatus(0x12);
@@ -958,8 +924,6 @@ int daAlink_c::procIronBallSubject() {
     return 1;
 }
 
-/* 801155EC-80115674 10FF2C 0088+00 1/1 0/0 0/0 .text            procIronBallMoveInit__9daAlink_cFv
- */
 int daAlink_c::procIronBallMoveInit() {
     if (!commonProcInitNotSameProc(PROC_IRON_BALL_MOVE)) {
         return 0;
@@ -977,7 +941,6 @@ int daAlink_c::procIronBallMoveInit() {
     return 1;
 }
 
-/* 80115674-8011577C 10FFB4 0108+00 1/0 0/0 0/0 .text            procIronBallMove__9daAlink_cFv */
 int daAlink_c::procIronBallMove() {
     if (checkIronBallAnime()) {
         setDoStatus(0x12);
@@ -1015,8 +978,6 @@ int daAlink_c::procIronBallMove() {
     return 1;
 }
 
-/* 8011577C-80115860 1100BC 00E4+00 1/1 0/0 0/0 .text            procIronBallThrowInit__9daAlink_cFv
- */
 int daAlink_c::procIronBallThrowInit() {
     commonProcInit(PROC_IRON_BALL_THROW);
     setSingleAnime(ANM_IRONBALL_ATTACK, daAlinkHIO_ironBall_c0::m.mPreThrowAnmSpeed, 22.0f, 30, daAlinkHIO_ironBall_c0::m.mPreThrowAnmInterpolation);
@@ -1035,7 +996,6 @@ int daAlink_c::procIronBallThrowInit() {
     return 1;
 }
 
-/* 80115860-801159F0 1101A0 0190+00 1/0 0/0 0/0 .text            procIronBallThrow__9daAlink_cFv */
 int daAlink_c::procIronBallThrow() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -1077,7 +1037,6 @@ int daAlink_c::procIronBallThrow() {
     return 1;
 }
 
-/* 801159F0-80115AA0 110330 00B0+00 2/2 0/0 0/0 .text procIronBallReturnInit__9daAlink_cFv */
 int daAlink_c::procIronBallReturnInit() {
     commonProcInit(PROC_IRON_BALL_RETURN);
 
@@ -1095,7 +1054,6 @@ int daAlink_c::procIronBallReturnInit() {
     return 1;
 }
 
-/* 80115AA0-80115C20 1103E0 0180+00 1/0 0/0 0/0 .text            procIronBallReturn__9daAlink_cFv */
 int daAlink_c::procIronBallReturn() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc
index 0a24d7516c..a9529caf36 100644
--- a/src/d/actor/d_a_alink_kandelaar.inc
+++ b/src/d/actor/d_a_alink_kandelaar.inc
@@ -10,8 +10,6 @@
 #include "m_Do/m_Do_lib.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80110654-80110668 10AF94 0014+00 1/1 0/0 0/0 .text daAlink_searchTagKandelaar__FP10fopAc_ac_cPv
- */
 static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_TAG_LANTERN) {
         return i_actor;
@@ -20,8 +18,6 @@ static fopAc_ac_c* daAlink_searchTagKandelaar(fopAc_ac_c* i_actor, void* i_data)
     return NULL;
 }
 
-/* 80110668-801106E8 10AFA8 0080+00 1/1 0/0 0/0 .text daAlink_searchTagKtOnFire__FP10fopAc_ac_cPv
- */
 static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data) {
     daAlink_c* player_p = daAlink_getAlinkActorClass();
 
@@ -35,8 +31,6 @@ static fopAc_ac_c* daAlink_searchTagKtOnFire(fopAc_ac_c* i_actor, void* i_data)
     return NULL;
 }
 
-/* 801106E8-8011078C 10B028 00A4+00 1/0 0/0 0/0 .text            setKandelaarMtx__9daAlink_cFPA4_fii
- */
 void daAlink_c::setKandelaarMtx(Mtx i_mtx, int param_1, int param_2) {
     if (mpKanteraModel != NULL) {
         if (checkNoResetFlg2(FLG2_UNK_1)) {
@@ -56,7 +50,6 @@ void daAlink_c::setKandelaarMtx(Mtx i_mtx, int param_1, int param_2) {
     }
 }
 
-/* 8011078C-801107BC 10B0CC 0030+00 2/2 0/0 0/0 .text checkWaterInKandelaarOffset__9daAlink_cFf */
 BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) {
     f32 tmp_65 = 65.0f;  // tmp can be removed with literals
     f32 base_y_pos;
@@ -69,8 +62,6 @@ BOOL daAlink_c::checkWaterInKandelaarOffset(f32 param_0) {
     return param_0 > tmp_65 + base_y_pos;
 }
 
-/* 801107BC-80110840 10B0FC 0084+00 2/2 0/0 0/0 .text            checkWaterInKandelaar__9daAlink_cFf
- */
 void daAlink_c::checkWaterInKandelaar(f32 param_0) {
     if (checkNoResetFlg2(FLG2_UNK_1) && checkWaterInKandelaarOffset(param_0)) {
         if (mEquipItem == fpcNm_ITEM_KANTERA) {
@@ -82,21 +73,16 @@ void daAlink_c::checkWaterInKandelaar(f32 param_0) {
     }
 }
 
-/* 80110840-8011087C 10B180 003C+00 13/13 0/0 0/0 .text            offKandelaarModel__9daAlink_cFv
- */
 void daAlink_c::offKandelaarModel() {
     offNoResetFlg2(FLG2_UNK_10000001);
     mZ2Link.setKanteraState(0);
 }
 
-/* 8011087C-801108B4 10B1BC 0038+00 1/0 0/0 0/0 .text            checkUseKandelaar__9daAlink_cFi */
 bool daAlink_c::checkUseKandelaar(int param_0) {
     return (param_0 == 0 && checkNoResetFlg2(FLG2_UNK_1)) ||
            (param_0 != 0 && mEquipItem == fpcNm_ITEM_KANTERA);
 }
 
-/* 801108B4-801108EC 10B1F4 0038+00 1/0 0/0 0/0 .text            checkKandelaarSwing__9daAlink_cCFi
- */
 bool daAlink_c::checkKandelaarSwing(int param_0) const {
     if ((checkKandelaarSwingAnime() || mProcID == PROC_KANDELAAR_SWING) &&
         (dComIfGs_getOil() != 0 || param_0 == 0))
@@ -107,7 +93,6 @@ bool daAlink_c::checkKandelaarSwing(int param_0) const {
     return false;
 }
 
-/* 801108EC-80110BEC 10B22C 0300+00 1/1 0/0 0/0 .text kandelaarModelCallBack__9daAlink_cFv */
 int daAlink_c::kandelaarModelCallBack() {
     cXyz sp44;
     mDoMtx_multVecZero(J3DSys::mCurrentMtx, &sp44);
@@ -151,8 +136,6 @@ int daAlink_c::kandelaarModelCallBack() {
     return 1;
 }
 
-/* 80110BEC-80110C28 10B52C 003C+00 1/1 0/0 0/0 .text daAlink_kandelaarModelCallBack__FP8J3DJointi
- */
 static int daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) {
     daAlink_c* player_p = (daAlink_c*)j3dSys.getModel()->getUserArea();
 
@@ -163,8 +146,6 @@ static int daAlink_kandelaarModelCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80110C28-80110C6C 10B568 0044+00 1/0 0/0 0/0 .text            getKandelaarFlamePos__9daAlink_cFv
- */
 cXyz* daAlink_c::getKandelaarFlamePos() {
     if ((!checkNoResetFlg2((daPy_FLG2)0x20001) && !checkEndResetFlg1(ERFLG1_UNK_4)) ||
         checkWolf() || !checkNoResetFlg1(FLG1_UNK_80))
@@ -175,12 +156,10 @@ cXyz* daAlink_c::getKandelaarFlamePos() {
     return &mKandelaarFlamePos;
 }
 
-/* 80110C6C-80110C94 10B5AC 0028+00 3/3 0/0 0/0 .text checkKandelaarEquipAnime__9daAlink_cCFv */
 BOOL daAlink_c::checkKandelaarEquipAnime() const {
     return checkUpperAnime(0x264) || checkUpperAnime(0x268);
 }
 
-/* 80110C94-80110E80 10B5D4 01EC+00 1/1 0/0 0/0 .text            preKandelaarDraw__9daAlink_cFv */
 void daAlink_c::preKandelaarDraw() {
     J3DMaterial* mat_p = mpKanteraGlowModel->getModelData()->getMaterialNodePointer(0);
 
@@ -225,7 +204,6 @@ void daAlink_c::preKandelaarDraw() {
     field_0x344c = ((near + (far * near) / proj.z) / (far - near) + 1.0f) * 1.6777215E7f;
 }
 
-/* 80110E84-80110F88 10B7C4 0104+00 4/4 0/0 0/0 .text            setKandelaarModel__9daAlink_cFv */
 void daAlink_c::setKandelaarModel() {
     field_0x2f94 = 0;
 
@@ -250,8 +228,6 @@ void daAlink_c::setKandelaarModel() {
 }
 
 
-/* 80110F88-80110FE0 10B8C8 0058+00 3/3 0/0 0/0 .text            resetOilBottleModel__9daAlink_cFv
- */
 void daAlink_c::resetOilBottleModel() {
     deleteEquipItem(FALSE, TRUE);
 
@@ -263,7 +239,6 @@ void daAlink_c::resetOilBottleModel() {
     returnKeepItemData();
 }
 
-/* 80110FE0-801110B8 10B920 00D8+00 3/3 0/0 0/0 .text commonKandelaarPourInit__9daAlink_cFv */
 void daAlink_c::commonKandelaarPourInit() {
     if (checkNoResetFlg2(FLG2_UNK_1)) {
         mProcVar3.field_0x300e = 1;
@@ -281,8 +256,6 @@ void daAlink_c::commonKandelaarPourInit() {
     dCam_getBody()->StartEventCamera(0x12, fopAcM_GetID(this), "Type", 1, &field_0x3194, 0);
 }
 
-/* 801110B8-8011130C 10B9F8 0254+00 3/3 0/0 0/0 .text            commonKandelaarPour__9daAlink_cFi
- */
 int daAlink_c::commonKandelaarPour(int param_0) {
     simpleAnmPlay(field_0x0718);
     simpleAnmPlay(field_0x071c);
@@ -345,7 +318,6 @@ int daAlink_c::commonKandelaarPour(int param_0) {
 }
 
 
-/* 8011130C-80111440 10BC4C 0134+00 1/1 0/0 0/0 .text            initKandelaarSwing__9daAlink_cFv */
 void daAlink_c::initKandelaarSwing() {
     if (mEquipItem == fpcNm_ITEM_KANTERA) {
         if (dComIfGs_getOil() != 0) {
@@ -371,7 +343,6 @@ void daAlink_c::initKandelaarSwing() {
     field_0xFB8.SetAtMtrl(dCcD_MTRL_FIRE);
 }
 
-/* 80111440-801115CC 10BD80 018C+00 2/1 0/0 0/0 .text procKandelaarSwingInit__9daAlink_cFv */
 int daAlink_c::procKandelaarSwingInit() {
     fopAc_ac_c* catch_target_p = dComIfGp_att_getCatghTarget();
     if (catch_target_p != NULL) {
@@ -413,7 +384,6 @@ int daAlink_c::procKandelaarSwingInit() {
 }
 
 
-/* 801115CC-8011167C 10BF0C 00B0+00 1/0 0/0 0/0 .text            procKandelaarSwing__9daAlink_cFv */
 int daAlink_c::procKandelaarSwing() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -431,8 +401,6 @@ int daAlink_c::procKandelaarSwing() {
     return 1;
 }
 
-/* 8011167C-80111724 10BFBC 00A8+00 1/1 0/0 0/0 .text            procKandelaarPourInit__9daAlink_cFv
- */
 int daAlink_c::procKandelaarPourInit() {
     if (!dComIfGp_event_compulsory(this, 0, 0xFBFF)) {
         return 0;
@@ -448,7 +416,6 @@ int daAlink_c::procKandelaarPourInit() {
     return 1;
 }
 
-/* 80111724-8011174C 10C064 0028+00 1/0 0/0 0/0 .text            procKandelaarPour__9daAlink_cFv */
 int daAlink_c::procKandelaarPour() {
     commonKandelaarPour(0);
     return 1;
diff --git a/src/d/actor/d_a_alink_link.inc b/src/d/actor/d_a_alink_link.inc
index f6a019a795..629ac2381f 100644
--- a/src/d/actor/d_a_alink_link.inc
+++ b/src/d/actor/d_a_alink_link.inc
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_tag_mstop.h"
 #include "d/actor/d_a_tag_mhint.h"
 
-/* 800CE294-800CE468 0C8BD4 01D4+00 1/1 0/0 0/0 .text checkNoSubjectModeCamera__9daAlink_cFv */
 bool daAlink_c::checkNoSubjectModeCamera() {
     return dCam_getBody()->Type() == dCam_getBody()->GetCameraTypeFromCameraName("Rotary") ||
            dCam_getBody()->Type() == dCam_getBody()->GetCameraTypeFromCameraName("Rampart2") ||
@@ -22,7 +21,6 @@ bool daAlink_c::checkNoSubjectModeCamera() {
            dCam_getBody()->Type() == dCam_getBody()->GetCameraTypeFromCameraName("Street");
 }
 
-/* 800CE468-800CE628 0C8DA8 01C0+00 2/2 0/0 0/0 .text acceptSubjectModeChange__9daAlink_cFv */
 bool daAlink_c::acceptSubjectModeChange() {
     return dCam_getBody()->ChangeModeOK(4) &&
            !checkNoSubjectModeCamera() &&
@@ -34,7 +32,6 @@ bool daAlink_c::acceptSubjectModeChange() {
            !(checkWolf() && checkWolfWaitSlipPolygon() && mLinkAcch.ChkGroundHit());
 }
 
-/* 800CE628-800CE728 0C8F68 0100+00 5/5 0/0 0/0 .text            checkSubjectAction__9daAlink_cFv */
 int daAlink_c::checkSubjectAction() {
     if (acceptSubjectModeChange()) {
         onResetFlg0(RFLG0_UNK_4000000);
@@ -65,7 +62,6 @@ int daAlink_c::checkSubjectAction() {
     return 0;
 }
 
-/* 800CE728-800CE8A0 0C9068 0178+00 1/1 0/0 0/0 .text            checkBodyAngleX__9daAlink_cFs */
 s16 daAlink_c::checkBodyAngleX(s16 param_0) {
     if (checkWolf() || mProcID == PROC_PEEP_SUBJECTIVITY || mProcID == PROC_HOOKSHOT_WALL_SHOOT) {
         return param_0;
@@ -100,7 +96,6 @@ s16 daAlink_c::checkBodyAngleX(s16 param_0) {
     return param_0;
 }
 
-/* 800CE8A0-800CEAF4 0C91E0 0254+00 15/15 0/0 0/0 .text setBodyAngleToCamera__9daAlink_cFv */
 BOOL daAlink_c::setBodyAngleToCamera() {
     if (dComIfGp_checkCameraAttentionStatus(field_0x317c, 0x10)) {
         field_0x310e = field_0x310a;
@@ -149,14 +144,11 @@ BOOL daAlink_c::setBodyAngleToCamera() {
     return 0;
 }
 
-/* 800CEAF4-800CEB58 0C9434 0064+00 9/9 0/0 0/0 .text            setSubjectMode__9daAlink_cFv */
 void daAlink_c::setSubjectMode() {
     dComIfGp_setPlayerStatus0(0, 0x2000);
     seStartSystem(Z2SE_SUBJ_VIEW_IN);
 }
 
-/* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text            subjectCancelTrigger__9daAlink_cFv
- */
 BOOL daAlink_c::subjectCancelTrigger() {
     if (checkWolf() || checkNotBattleStage() || !checkSwordGet() ||
         (checkModeFlg(0x40000) && !checkEquipHeavyBoots()))
@@ -167,7 +159,6 @@ BOOL daAlink_c::subjectCancelTrigger() {
     return false;
 }
 
-/* 800CEBD8-800CECE4 0C9518 010C+00 9/9 0/0 0/0 .text            checkSubjectEnd__9daAlink_cFi */
 int daAlink_c::checkSubjectEnd(BOOL i_playSound) {
     setDoStatus(0x12);
 
@@ -183,7 +174,6 @@ int daAlink_c::checkSubjectEnd(BOOL i_playSound) {
     return false;
 }
 
-/* 800CECE4-800CED48 0C9624 0064+00 1/1 0/0 0/0 .text searchPeepObj__9daAlink_cFP10fopAc_ac_cPv */
 void daAlink_c::searchPeepObj(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_KYTAG05) {
         f32 var_f31 = current.pos.abs2(i_actor->current.pos);
@@ -194,13 +184,11 @@ void daAlink_c::searchPeepObj(fopAc_ac_c* i_actor, void* i_data) {
     }
 }
 
-/* 800CED48-800CED84 0C9688 003C+00 1/1 0/0 0/0 .text daAlink_searchPeepObj__FP10fopAc_ac_cPv */
 static int daAlink_searchPeepObj(fopAc_ac_c* i_actor, void* i_data) {
     daAlink_getAlinkActorClass()->searchPeepObj(i_actor, i_data);
     return 0;
 }
 
-/* 800CED84-800CEE08 0C96C4 0084+00 2/2 0/0 0/0 .text procCoSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procCoSubjectivityInit() {
     commonProcInit(PROC_SUBJECTIVITY);
     mNormalSpeed = 0.0f;
@@ -217,7 +205,6 @@ int daAlink_c::procCoSubjectivityInit() {
     return 1;
 }
 
-/* 800CEE08-800CEF70 0C9748 0168+00 1/0 0/0 0/0 .text            procCoSubjectivity__9daAlink_cFv */
 int daAlink_c::procCoSubjectivity() {
     onResetFlg0(RFLG0_UNK_4000000);
     setTalkStatus();
@@ -246,7 +233,6 @@ int daAlink_c::procCoSubjectivity() {
     return 1;
 }
 
-/* 800CEF70-800CF018 0C98B0 00A8+00 1/1 0/0 0/0 .text procCoSwimSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procCoSwimSubjectivityInit() {
     commonProcInit(PROC_SWIM_SUBJECTIVITY);
     mNormalSpeed = 0.0f;
@@ -267,7 +253,6 @@ int daAlink_c::procCoSwimSubjectivityInit() {
     return 1;
 }
 
-/* 800CF018-800CF100 0C9958 00E8+00 1/0 0/0 0/0 .text procCoSwimSubjectivity__9daAlink_cFv */
 int daAlink_c::procCoSwimSubjectivity() {
     onResetFlg0(RFLG0_UNK_4000000);
     setTalkStatus();
@@ -295,7 +280,6 @@ int daAlink_c::procCoSwimSubjectivity() {
     return 1;
 }
 
-/* 800CF100-800CF1B8 0C9A40 00B8+00 1/1 0/0 0/0 .text procCoPeepSubjectivityInit__9daAlink_cFv */
 int daAlink_c::procCoPeepSubjectivityInit() {
     commonProcInit(PROC_PEEP_SUBJECTIVITY);
     mNormalSpeed = 0.0f;
@@ -316,7 +300,6 @@ int daAlink_c::procCoPeepSubjectivityInit() {
     return 1;
 }
 
-/* 800CF1B8-800CF25C 0C9AF8 00A4+00 1/0 0/0 0/0 .text procCoPeepSubjectivity__9daAlink_cFv */
 int daAlink_c::procCoPeepSubjectivity() {
     if (doTrigger() || peepSubjectCancelTrigger()) {
         kytag05_class* peep = NULL;
@@ -334,66 +317,53 @@ int daAlink_c::procCoPeepSubjectivity() {
     return 1;
 }
 
-/* 800CF25C-800CF270 0C9B9C 0014+00 1/0 0/0 0/0 .text            checkBoardRide__9daAlink_cCFv */
 u32 daAlink_c::checkBoardRide() const {
     return mRideStatus == 4;
 }
 
-/* 800CF270-800CF284 0C9BB0 0014+00 1/0 0/0 0/0 .text            checkCanoeRide__9daAlink_cCFv */
 u32 daAlink_c::checkCanoeRide() const {
     return mRideStatus == 3;
 }
 
-/* 800CF284-800CF298 0C9BC4 0014+00 1/0 0/0 0/0 .text            checkHorseRide__9daAlink_cCFv */
 u32 daAlink_c::checkHorseRide() const {
     return mRideStatus == 1;
 }
 
-/* 800CF298-800CF2B4 0C9BD8 001C+00 1/0 0/0 0/0 .text            getLeftItemMatrix__9daAlink_cFv */
 MtxP daAlink_c::getLeftItemMatrix() {
     return mpLinkModel->getAnmMtx(field_0x30c0);
 }
 
-/* 800CF2B4-800CF2C8 0C9BF4 0014+00 1/0 0/0 0/0 .text            checkBoarRide__9daAlink_cCFv */
 u32 daAlink_c::checkBoarRide() const {
     return mRideStatus == 2;
 }
 
-/* 800CF2C8-800CF2DC 0C9C08 0014+00 1/0 0/0 0/0 .text            checkSpinnerRide__9daAlink_cCFv */
 u32 daAlink_c::checkSpinnerRide() const {
     return mRideStatus == 5;
 }
 
-/* 800CF2DC-800CF2F8 0C9C1C 001C+00 1/0 0/0 0/0 .text            getLeftHandMatrix__9daAlink_cFv */
 MtxP daAlink_c::getLeftHandMatrix() {
     return mpLinkModel->getAnmMtx(field_0x30b8);
 }
 
-/* 800CF2F8-800CF314 0C9C38 001C+00 1/0 0/0 0/0 .text            getRightHandMatrix__9daAlink_cFv */
 MtxP daAlink_c::getRightHandMatrix() {
     return mpLinkModel->getAnmMtx(field_0x30ba);
 }
 
-/* 800CF314-800CF328 0C9C54 0014+00 1/0 0/0 0/0 .text
- * onSceneChangeArea__9daAlink_cFUcUcP10fopAc_ac_c              */
 void daAlink_c::onSceneChangeArea(u8 exitID, u8 exitDirection, fopAc_ac_c* scexAc) {
     mExitID = exitID;
     mExitDirection = exitDirection;
     mpScnChg = (daScex_c*)scexAc;
 }
 
-/* 800CF328-800CF344 0C9C68 001C+00 1/0 0/0 0/0 .text            getRightItemMatrix__9daAlink_cFv */
 MtxP daAlink_c::getRightItemMatrix() {
     return mpLinkModel->getAnmMtx(field_0x30c2);
 }
 
-/* 800CF344-800CF380 0C9C84 003C+00 1/0 0/0 0/0 .text            checkPlayerNoDraw__9daAlink_cFv */
 u32 daAlink_c::checkPlayerNoDraw() {
     return dComIfGp_checkCameraAttentionStatus(field_0x317c, 2) ||
            checkNoResetFlg0(FLG0_PLAYER_NO_DRAW);
 }
 
-/* 800CF380-800CFC3C 0C9CC0 08BC+00 1/1 0/0 0/0 .text            __ct__9daAlink_cFv */
 daAlink_c::daAlink_c()
     : mAnmHeap3(0), mAnmHeap4(0), mFaceBtpHeap(0x800), mFaceBtkHeap(0x400), mFaceBckHeap(0xC00),
       mAnmHeap9(0x800) {}
diff --git a/src/d/actor/d_a_alink_spinner.inc b/src/d/actor/d_a_alink_spinner.inc
index 2a1272cf78..b4ceeb4c23 100644
--- a/src/d/actor/d_a_alink_spinner.inc
+++ b/src/d/actor/d_a_alink_spinner.inc
@@ -6,23 +6,18 @@
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_spinner.h"
 
-/* 8010D93C-8010D94C 10827C 0010+00 0/0 0/0 1/1 .text            getSpinnerGravity__9daAlink_cCFv */
 f32 daAlink_c::getSpinnerGravity() const {
     return daAlinkHIO_spinner_c0::m.mGravity;
 }
 
-/* 8010D94C-8010D95C 10828C 0010+00 0/0 0/0 1/1 .text getSpinnerMaxFallSpeed__9daAlink_cCFv */
 f32 daAlink_c::getSpinnerMaxFallSpeed() const {
     return daAlinkHIO_spinner_c0::m.mMaxFallSpeed;
 }
 
-/* 8010D95C-8010D96C 10829C 0010+00 0/0 0/0 1/1 .text            getSpinnerJumpRate__9daAlink_cCFv
- */
 f32 daAlink_c::getSpinnerJumpRate() const {
     return daAlinkHIO_spinner_c0::m.mJumpRate;
 }
 
-/* 8010D96C-8010D9B0 1082AC 0044+00 1/1 0/0 2/2 .text getSpinnerRideMoveTime__9daAlink_cFv */
 s16 daAlink_c::getSpinnerRideMoveTime() {
     if (checkLv4BossRoom()) {
         return daAlinkHIO_spinner_c0::m.mBossRideMoveTime;
@@ -31,8 +26,6 @@ s16 daAlink_c::getSpinnerRideMoveTime() {
     return daAlinkHIO_spinner_c0::m.mRideMoveTime;
 }
 
-/* 8010D9B0-8010D9F4 1082F0 0044+00 1/1 0/0 3/3 .text            getSpinnerRideSpeedF__9daAlink_cFv
- */
 f32 daAlink_c::getSpinnerRideSpeedF() {
     if (checkLv4BossRoom()) {
         return daAlinkHIO_spinner_c0::m.mBossRideSpeed;
@@ -41,40 +34,32 @@ f32 daAlink_c::getSpinnerRideSpeedF() {
     return daAlinkHIO_spinner_c0::m.mRideSpeed;
 }
 
-/* 8010D9F4-8010DA04 108334 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMax__9daAlink_cCFv */
 f32 daAlink_c::getSpinnerRideDecSpeedMax() const {
     return daAlinkHIO_spinner_c0::m.mDecelSpeedMax;
 }
 
-/* 8010DA04-8010DA14 108344 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedMin__9daAlink_cCFv */
 f32 daAlink_c::getSpinnerRideDecSpeedMin() const {
     return daAlinkHIO_spinner_c0::m.mDecelSpeedMin;
 }
 
-/* 8010DA14-8010DA24 108354 0010+00 0/0 0/0 1/1 .text getSpinnerRideDecSpeedRate__9daAlink_cCFv */
 f32 daAlink_c::getSpinnerRideDecSpeedRate() const {
     return daAlinkHIO_spinner_c0::m.mDecelRate;
 }
 
-/* 8010DA24-8010DA34 108364 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMax__9daAlink_cCFv */
 s16 daAlink_c::getSpinnerRideRotAngleMax() const {
     return daAlinkHIO_spinner_c0::m.mRideRotAngleMax;
 }
 
-/* 8010DA34-8010DA44 108374 0010+00 0/0 0/0 1/1 .text getSpinnerRideRotAngleMin__9daAlink_cCFv */
 s16 daAlink_c::getSpinnerRideRotAngleMin() const {
     return daAlinkHIO_spinner_c0::m.mRideRotAngleMin;
 }
 
-/* 8010DA44-8010DA98 108384 0054+00 1/0 0/0 0/0 .text onSpinnerPathForceRemove__9daAlink_cFv */
 void daAlink_c::onSpinnerPathForceRemove() {
     if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) {
         ((daSpinner_c*)mRideAcKeep.getActor())->onPathForceRemove();
     }
 }
 
-/* 8010DA98-8010DAFC 1083D8 0064+00 1/0 0/0 0/0 .text            checkSpinnerPathMove__9daAlink_cFv
- */
 bool daAlink_c::checkSpinnerPathMove() {
     if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) {
         if (((daSpinner_c*)mRideAcKeep.getActor())->checkPathMoveNow() != NULL) {
@@ -85,12 +70,10 @@ bool daAlink_c::checkSpinnerPathMove() {
     return false;
 }
 
-/* 8010DAFC-8010DB28 10843C 002C+00 2/2 0/0 0/0 .text            checkLv4BossRoom__9daAlink_cFv */
 bool daAlink_c::checkLv4BossRoom() {
     return checkStageName("D_MN10A");
 }
 
-/* 8010DB28-8010DBC8 108468 00A0+00 1/0 0/0 0/0 .text checkSpinnerTriggerAttack__9daAlink_cFv */
 bool daAlink_c::checkSpinnerTriggerAttack() {
     if (checkSpinnerRide() && mRideAcKeep.getActor() != NULL) {
         if (((daSpinner_c*)mRideAcKeep.getActor())->reflectAccept()) {
@@ -102,7 +85,6 @@ bool daAlink_c::checkSpinnerTriggerAttack() {
 }
 
 
-/* 8010DBC8-8010DC64 108508 009C+00 2/2 0/0 0/0 .text            setSpinnerSyncPos__9daAlink_cFv */
 void daAlink_c::setSpinnerSyncPos() {
     daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor();
 
@@ -113,8 +95,6 @@ void daAlink_c::setSpinnerSyncPos() {
     field_0x37a4 = spinner->current.pos;
 }
 
-/* 8010DC64-8010DDCC 1085A4 0168+00 1/1 0/0 0/0 .text            procSpinnerReadyInit__9daAlink_cFv
- */
 int daAlink_c::procSpinnerReadyInit() {
     fopAc_ac_c* spinner = (fopAc_ac_c*)fopAcM_fastCreate(
         PROC_SPINNER, daSpinner_c::getWaitArg(), &current.pos, fopAcM_GetRoomNo(this),
@@ -148,7 +128,6 @@ int daAlink_c::procSpinnerReadyInit() {
     return 1;
 }
 
-/* 8010DDCC-8010DE64 10870C 0098+00 1/0 0/0 0/0 .text            procSpinnerReady__9daAlink_cFv */
 int daAlink_c::procSpinnerReady() {
     daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor();
 
@@ -171,14 +150,10 @@ int daAlink_c::procSpinnerReady() {
     return 1;
 }
 
-/* 8010DE64-8010DE78 1087A4 0014+00 1/1 0/0 0/0 .text            setSpinnerStatus__9daAlink_cFUcUc
- */
 void daAlink_c::setSpinnerStatus(u8 status, u8 flag) {
     dComIfGp_setDoStatus(status, flag);
 }
 
-/* 8010DE78-8010DF4C 1087B8 00D4+00 2/2 0/0 0/0 .text            procSpinnerWaitInit__9daAlink_cFv
- */
 int daAlink_c::procSpinnerWaitInit() {
     if (!commonProcInitNotSameProc(PROC_SPINNER_WAIT)) {
         return 0;
@@ -203,7 +178,6 @@ int daAlink_c::procSpinnerWaitInit() {
 }
 
 
-/* 8010DF4C-8010E48C 10888C 0540+00 1/0 0/0 0/0 .text            procSpinnerWait__9daAlink_cFv */
 int daAlink_c::procSpinnerWait() {
     daSpinner_c* spinner = (daSpinner_c*)mRideAcKeep.getActor();
 
diff --git a/src/d/actor/d_a_alink_sumou.inc b/src/d/actor/d_a_alink_sumou.inc
index a9c3b33c5c..506b16c5c9 100644
--- a/src/d/actor/d_a_alink_sumou.inc
+++ b/src/d/actor/d_a_alink_sumou.inc
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_wrestler.h"
 #include "d/actor/d_a_boomerang.h"
 
-/* 800EA844-800EA8D0 0E5184 008C+00 5/5 0/0 0/0 .text            checkSumouVsActor__9daAlink_cFv */
 BOOL daAlink_c::checkSumouVsActor() {
     mCargoCarryAcKeep.setActor();
 
@@ -26,24 +25,19 @@ BOOL daAlink_c::checkSumouVsActor() {
     return true;
 }
 
-/* 800EA8D0-800EA908 0E5210 0038+00 5/5 0/0 0/0 .text            cancelSumouMode__9daAlink_cFv */
 void daAlink_c::cancelSumouMode() {
     mCargoCarryAcKeep.clearData();
     mSpecialMode = 0;
 }
 
-/* 800EA908-800EA92C 0E5248 0024+00 2/2 0/0 0/0 .text            sumouPunchTrigger__9daAlink_cFv */
 BOOL daAlink_c::sumouPunchTrigger() {
     return itemTriggerCheck(BTN_B);
 }
 
-/* 800EA92C-800EA950 0E526C 0024+00 5/5 0/0 0/0 .text            setSumouPunchStatus__9daAlink_cFv
- */
 void daAlink_c::setSumouPunchStatus() {
     setBStatus(ACTION_STR_SLAP);
 }
 
-/* 800EA950-800EAA28 0E5290 00D8+00 4/4 0/0 0/0 .text            procSumouReadyInit__9daAlink_cFv */
 int daAlink_c::procSumouReadyInit() {
     if (!commonProcInitNotSameProc(PROC_SUMOU_READY)) {
         return 0;
@@ -67,7 +61,6 @@ int daAlink_c::procSumouReadyInit() {
     return 1;
 }
 
-/* 800EAA28-800EAC4C 0E5368 0224+00 1/0 0/0 0/0 .text            procSumouReady__9daAlink_cFv */
 int daAlink_c::procSumouReady() {
     field_0x2f99 = 4;
 
@@ -134,7 +127,6 @@ int daAlink_c::procSumouReady() {
 }
 
 
-/* 800EAC4C-800EAD84 0E558C 0138+00 1/1 0/0 0/0 .text            procSumouMoveInit__9daAlink_cFv */
 int daAlink_c::procSumouMoveInit() {
     daNpcWrestler_c* wrestler_p = (daNpcWrestler_c*)mCargoCarryAcKeep.getActor();
     commonProcInit(PROC_SUMOU_MOVE);
@@ -183,7 +175,6 @@ int daAlink_c::procSumouMoveInit() {
 }
 
 
-/* 800EAD84-800EB208 0E56C4 0484+00 1/0 0/0 0/0 .text            procSumouMove__9daAlink_cFv */
 int daAlink_c::procSumouMove() {
     field_0x2f99 = 4;
 
@@ -321,8 +312,6 @@ int daAlink_c::procSumouMove() {
 }
 
 
-/* 800EB208-800EB2BC 0E5B48 00B4+00 4/4 0/0 0/0 .text            procSumouSideMoveInit__9daAlink_cFv
- */
 int daAlink_c::procSumouSideMoveInit() {
     commonProcInit(PROC_SUMOU_SIDE_MOVE);
     mSpecialMode = 0x16;
@@ -343,7 +332,6 @@ int daAlink_c::procSumouSideMoveInit() {
     return 1;
 }
 
-/* 800EB2BC-800EB624 0E5BFC 0368+00 1/0 0/0 0/0 .text            procSumouSideMove__9daAlink_cFv */
 int daAlink_c::procSumouSideMove() {
     field_0x2f99 = 4;
 
@@ -444,8 +432,6 @@ int daAlink_c::procSumouSideMove() {
 }
 
 
-/* 800EB624-800EBCE0 0E5F64 06BC+00 4/4 0/0 0/0 .text            procSumouActionInit__9daAlink_cFiii
- */
 int daAlink_c::procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int unused) {
     commonProcInit(PROC_SUMOU_ACTION);
 
@@ -649,7 +635,6 @@ int daAlink_c::procSumouActionInit(BOOL i_doTrigger, BOOL i_punchTrigger, int un
 }
 
 
-/* 800EBCE0-800EC0F8 0E6620 0418+00 1/0 0/0 0/0 .text            procSumouAction__9daAlink_cFv */
 int daAlink_c::procSumouAction() {
     field_0x2f99 = 4;
 
@@ -741,8 +726,6 @@ int daAlink_c::procSumouAction() {
 }
 
 
-/* 800EC0F8-800EC170 0E6A38 0078+00 1/1 0/0 0/0 .text            procSumouStaggerInit__9daAlink_cFv
- */
 int daAlink_c::procSumouStaggerInit() {
     commonProcInit(PROC_SUMOU_STAGGER);
 
@@ -759,7 +742,6 @@ int daAlink_c::procSumouStaggerInit() {
     return 1;
 }
 
-/* 800EC170-800EC20C 0E6AB0 009C+00 1/0 0/0 0/0 .text            procSumouStagger__9daAlink_cFv */
 int daAlink_c::procSumouStagger() {
     field_0x2f99 = 4;
 
@@ -777,8 +759,6 @@ int daAlink_c::procSumouStagger() {
     return 1;
 }
 
-/* 800EC20C-800EC3D8 0E6B4C 01CC+00 1/1 0/0 0/0 .text            procSumouWinLoseInit__9daAlink_cFv
- */
 int daAlink_c::procSumouWinLoseInit() {
     if (mSpecialMode == 0xB && mUnderFrameCtrl[0].getAttribute() == 2) {
         cancelSumouMode();
@@ -839,7 +819,6 @@ int daAlink_c::procSumouWinLoseInit() {
 }
 
 
-/* 800EC3D8-800EC538 0E6D18 0160+00 1/0 0/0 0/0 .text            procSumouWinLose__9daAlink_cFv */
 int daAlink_c::procSumouWinLose() {
     if (mProcVar3.field_0x300e == 0) {
         if (mProcVar2.field_0x300c != 0) {
@@ -882,7 +861,6 @@ int daAlink_c::procSumouWinLose() {
 }
 
 
-/* 800EC538-800EC5F4 0E6E78 00BC+00 1/0 0/0 0/0 .text            procSumouShikoInit__9daAlink_cFv */
 int daAlink_c::procSumouShikoInit() {
     if (!commonProcInitNotSameProc(PROC_SUMOU_SHIKO)) {
         return 0;
@@ -901,7 +879,6 @@ int daAlink_c::procSumouShikoInit() {
     return 1;
 }
 
-/* 800EC5F4-800EC724 0E6F34 0130+00 1/0 0/0 0/0 .text            procSumouShiko__9daAlink_cFv */
 int daAlink_c::procSumouShiko() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     if (field_0x2f99 != 12) {
diff --git a/src/d/actor/d_a_alink_swim.inc b/src/d/actor/d_a_alink_swim.inc
index e283fa879d..9d4ceb63cd 100644
--- a/src/d/actor/d_a_alink_swim.inc
+++ b/src/d/actor/d_a_alink_swim.inc
@@ -7,18 +7,14 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 80101890-801018E4 0FC1D0 0054+00 6/6 0/0 0/0 .text            checkZoraWearMaskDraw__9daAlink_cFv
- */
 BOOL daAlink_c::checkZoraWearMaskDraw() {
     return checkZoraWearAbility() && !checkNoResetFlg0(FLG0_SWIM_UP);
 }
 
-/* 801018E4-80101934 0FC224 0050+00 1/1 0/0 0/0 .text checkAcceptUseItemInWater__9daAlink_cCFUs */
 BOOL daAlink_c::checkAcceptUseItemInWater(u16 i_itemNo) const {
     return i_itemNo == fpcNm_ITEM_HVY_BOOTS || i_itemNo == fpcNm_ITEM_WATER_BOMB || checkHookshotItem(i_itemNo);
 }
 
-/* 80101934-801019B8 0FC274 0084+00 4/4 0/0 0/0 .text            swimDeleteItem__9daAlink_cFv */
 void daAlink_c::swimDeleteItem() {
     if (!checkHookshotItem(mEquipItem) && (mEquipItem != 0x103 || !checkBootsOrArmorHeavy())) {
         deleteEquipItem(1, 1);
@@ -29,13 +25,10 @@ void daAlink_c::swimDeleteItem() {
     }
 }
 
-/* 801019B8-80101A18 0FC2F8 0060+00 11/11 0/0 0/0 .text            getZoraSwim__9daAlink_cCFv */
 bool daAlink_c::getZoraSwim() const {
     return checkUnderMove0BckNoArc(ANM_SWIM_C) || checkUnderMove0BckNoArc(ANM_SWIM_ZORA_START);
 }
 
-/* 80101A18-80101AA8 0FC358 0090+00 6/6 0/0 0/0 .text            getSwimFrontMaxSpeed__9daAlink_cCFv
- */
 f32 daAlink_c::getSwimFrontMaxSpeed() const {
     if (checkBootsOrArmorHeavy()) {
         return daAlinkHIO_swim_c0::m.mUnderwaterFallMaxSpeed;
@@ -48,8 +41,6 @@ f32 daAlink_c::getSwimFrontMaxSpeed() const {
     }
 }
 
-/* 80101AA8-80101B44 0FC3E8 009C+00 5/5 0/0 0/0 .text            getSwimMaxFallSpeed__9daAlink_cCFv
- */
 f32 daAlink_c::getSwimMaxFallSpeed() const {
     if (mProcID == PROC_DIVE_JUMP) {
         return -daAlinkHIO_swim_c0::m.mUnderwaterMaxSpeed;
@@ -62,7 +53,6 @@ f32 daAlink_c::getSwimMaxFallSpeed() const {
     }
 }
 
-/* 80101B44-80101C94 0FC484 0150+00 1/1 0/0 0/0 .text            checkOxygenTimer__9daAlink_cFv */
 void daAlink_c::checkOxygenTimer() {
     BOOL hide_timer;
 
@@ -99,7 +89,6 @@ void daAlink_c::checkOxygenTimer() {
     }
 }
 
-/* 80101C94-80101CB8 0FC5D4 0024+00 3/3 0/0 0/0 .text            offOxygenTimer__9daAlink_cFv */
 void daAlink_c::offOxygenTimer() {
     dComIfGp_offOxygenShowFlag();
     s32 max = dComIfGp_getMaxOxygen();
@@ -108,14 +97,11 @@ void daAlink_c::offOxygenTimer() {
     field_0x2fbe = 90;
 }
 
-/* 80101CB8-80101CF4 0FC5F8 003C+00 2/2 0/0 0/0 .text checkPossibleWaterInMode__9daAlink_cCFv */
 BOOL daAlink_c::checkPossibleWaterInMode() const {
     return checkModeFlg(MODE_VINE_CLIMB) || dComIfGp_checkPlayerStatus1(0, 0x2000000) ||
            mProcID == PROC_HOOKSHOT_FLY;
 }
 
-/* 80101CF4-80101D70 0FC634 007C+00 18/18 0/0 0/0 .text
- * setWaterInAnmRate__9daAlink_cFP16daPy_frameCtrl_cf           */
 void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) {
     if (checkNoResetFlg0(FLG0_UNDERWATER)) {
         if (checkZoraWearAbility()) {
@@ -128,7 +114,6 @@ void daAlink_c::setWaterInAnmRate(daPy_frameCtrl_c* i_frameCtrl, f32 i_rate) {
     i_frameCtrl->setRate(i_rate);
 }
 
-/* 80101D70-801023E4 0FC6B0 0674+00 2/2 0/0 0/0 .text            swimBgCheck__9daAlink_cFf */
 void daAlink_c::swimBgCheck(f32 param_0) {
     offNoResetFlg1(FLG1_UNK_20000000);
 
@@ -207,8 +192,6 @@ void daAlink_c::swimBgCheck(f32 param_0) {
     }
 }
 
-/* 801023E4-801029C8 0FCD24 05E4+00 3/3 0/0 0/0 .text            setSpeedAndAngleSwim__9daAlink_cFv
- */
 void daAlink_c::setSpeedAndAngleSwim() {
     if (!checkBootsOrArmorHeavy() && dComIfGp_getDoStatus() == 0 && (!checkHookshotAnime() || (checkHookshotItem(mEquipItem) && (mItemMode == 0 || mItemMode == 1)))) {
         if (checkZoraWearAbility()) {
@@ -334,8 +317,6 @@ void daAlink_c::setSpeedAndAngleSwim() {
     }
 }
 
-/* 801029C8-80102B1C 0FD308 0154+00 3/3 0/0 0/0 .text            checkNextActionSwim__9daAlink_cFv
- */
 int daAlink_c::checkNextActionSwim() {
     if (checkSwimButtonMove() && getZoraSwim()) {
         field_0x3000 = 30;
@@ -369,7 +350,6 @@ int daAlink_c::checkNextActionSwim() {
     return checkNextActionFromButton();
 }
 
-/* 80102B1C-80103058 0FD45C 053C+00 3/3 0/0 0/0 .text            checkSwimAction__9daAlink_cFi */
 int daAlink_c::checkSwimAction(int param_0) {
     f32 var_f31;
     if (checkWolf()) {
@@ -513,7 +493,6 @@ int daAlink_c::checkSwimAction(int param_0) {
     return 0;
 }
 
-/* 80103058-801032C8 0FD998 0270+00 7/7 0/0 0/0 .text            checkSwimUpAction__9daAlink_cFv */
 int daAlink_c::checkSwimUpAction() {
     if (checkNoResetFlg0(FLG0_SWIM_UP)) {
         if (!checkHookshotAnime()) {
@@ -579,7 +558,6 @@ int daAlink_c::checkSwimUpAction() {
     return 0;
 }
 
-/* 801032C8-80103398 0FDC08 00D0+00 8/8 0/0 0/0 .text            swimOutAfter__9daAlink_cFi */
 void daAlink_c::swimOutAfter(int param_0) {
     onNoResetFlg0(FLG0_SWIM_UP);
     onEndResetFlg1(ERFLG1_UNK_100);
@@ -601,7 +579,6 @@ void daAlink_c::swimOutAfter(int param_0) {
     }
 }
 
-/* 80103398-801033CC 0FDCD8 0034+00 1/1 0/0 0/0 .text            checkSwimFall__9daAlink_cFv */
 BOOL daAlink_c::checkSwimFall() {
     if (!checkNoResetFlg0(FLG0_UNK_80) || current.pos.y > mWaterY + l_autoUpHeight) {
         return true;
@@ -610,7 +587,6 @@ BOOL daAlink_c::checkSwimFall() {
     return false;
 }
 
-/* 801033CC-80103698 0FDD0C 02CC+00 1/1 0/0 0/0 .text            checkSwimOutAction__9daAlink_cFv */
 int daAlink_c::checkSwimOutAction() {
     f32 var_f31;
     if (checkWolf()) {
@@ -653,7 +629,6 @@ int daAlink_c::checkSwimOutAction() {
     return 0;
 }
 
-/* 80103698-80103EE0 0FDFD8 0848+00 4/4 0/0 0/0 .text            setSwimMoveAnime__9daAlink_cFv */
 void daAlink_c::setSwimMoveAnime() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     daPy_frameCtrl_c* temp_r27 = &mUpperFrameCtrl[2];
@@ -878,37 +853,27 @@ void daAlink_c::setSwimMoveAnime() {
     }
 }
 
-/* 80103EE0-80103F08 0FE820 0028+00 5/5 0/0 0/0 .text            checkSwimButtonAccept__9daAlink_cFv
- */
 bool daAlink_c::checkSwimButtonAccept() {
     return dComIfGp_getDoStatus() == 0x41 || dComIfGp_getDoStatus() == 0x4C;
 }
 
-/* 80103F08-80103F24 0FE848 001C+00 4/4 0/0 0/0 .text checkUpSwimButtonAccept__9daAlink_cFv */
 bool daAlink_c::checkUpSwimButtonAccept() {
     return dComIfGp_getDoStatus() == 0x97;
 }
 
-/* 80103F24-80103F94 0FE864 0070+00 2/2 0/0 0/0 .text            checkSwimButtonMove__9daAlink_cFv
- */
 BOOL daAlink_c::checkSwimButtonMove() {
     return !checkNoResetFlg0(FLG0_SWIM_UP) &&
            (checkSwimButtonAccept() || checkUpSwimButtonAccept()) && doButton();
 }
 
-/* 80103F94-80103FE8 0FE8D4 0054+00 3/3 0/0 0/0 .text            checkZoraSwimMove__9daAlink_cFv */
 BOOL daAlink_c::checkZoraSwimMove() {
     return checkSwimButtonMove() || field_0x3000 != 0;
 }
 
-/* 80103FE8-80104034 0FE928 004C+00 2/2 0/0 0/0 .text            checkSwimNeckUpDown__9daAlink_cCFv
- */
 BOOL daAlink_c::checkSwimNeckUpDown() const {
     return !checkNoResetFlg0(FLG0_SWIM_UP) && checkUnderMove0BckNoArc(ANM_SWIM_WAIT);
 }
 
-/* 80104034-801040F8 0FE974 00C4+00 3/3 0/0 0/0 .text            setSwimUpDownOffset__9daAlink_cFv
- */
 void daAlink_c::setSwimUpDownOffset() {
     mProcVar2.field_0x300c += (s16)((cM_rndF(0.3f) + 0.85f) * 2330.0f);
 
@@ -926,7 +891,6 @@ void daAlink_c::setSwimUpDownOffset() {
     field_0x2b98 = var_f1 * cM_ssin(mProcVar2.field_0x300c);
 }
 
-/* 801040F8-801041E8 0FEA38 00F0+00 2/2 0/0 0/0 .text            procSwimUpInit__9daAlink_cFv */
 int daAlink_c::procSwimUpInit() {
     commonProcInit(PROC_SWIM_UP);
 
@@ -952,7 +916,6 @@ int daAlink_c::procSwimUpInit() {
     return 1;
 }
 
-/* 801041E8-801042F8 0FEB28 0110+00 1/0 0/0 0/0 .text            procSwimUp__9daAlink_cFv */
 int daAlink_c::procSwimUp() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -981,7 +944,6 @@ int daAlink_c::procSwimUp() {
     return 1;
 }
 
-/* 801042F8-801044B4 0FEC38 01BC+00 15/15 0/0 0/0 .text            procSwimWaitInit__9daAlink_cFi */
 int daAlink_c::procSwimWaitInit(int param_0) {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
     u32 mode_40000 = checkModeFlg(0x40000);
@@ -1033,7 +995,6 @@ int daAlink_c::procSwimWaitInit(int param_0) {
     return 1;
 }
 
-/* 801044B4-80104670 0FEDF4 01BC+00 1/0 0/0 0/0 .text            procSwimWait__9daAlink_cFv */
 int daAlink_c::procSwimWait() {
     if (mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) {
         setShapeAngleToTalkActor();
@@ -1085,7 +1046,6 @@ int daAlink_c::procSwimWait() {
     return 1;
 }
 
-/* 80104670-801047B8 0FEFB0 0148+00 9/9 0/0 0/0 .text            procSwimMoveInit__9daAlink_cFv */
 int daAlink_c::procSwimMoveInit() {
     u32 mode_40000 = checkModeFlg(0x40000);
     bool proc_dive_jump = mProcID == PROC_DIVE_JUMP;
@@ -1129,7 +1089,6 @@ int daAlink_c::procSwimMoveInit() {
     return 1;
 }
 
-/* 801047B8-80104958 0FF0F8 01A0+00 1/0 0/0 0/0 .text            procSwimMove__9daAlink_cFv */
 int daAlink_c::procSwimMove() {
     setSpeedAndAngleSwim();
 
@@ -1168,7 +1127,6 @@ int daAlink_c::procSwimMove() {
     return 1;
 }
 
-/* 80104958-80104AA0 0FF298 0148+00 4/4 0/0 0/0 .text            procSwimDiveInit__9daAlink_cFv */
 int daAlink_c::procSwimDiveInit() {
     commonProcInit(PROC_SWIM_DIVE);
     setSpecialGravity(0.0f, maxFallSpeed, 0);
@@ -1196,7 +1154,6 @@ int daAlink_c::procSwimDiveInit() {
 }
 
 
-/* 80104AA0-80104C50 0FF3E0 01B0+00 1/0 0/0 0/0 .text            procSwimDive__9daAlink_cFv */
 int daAlink_c::procSwimDive() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -1242,7 +1199,6 @@ int daAlink_c::procSwimDive() {
 }
 
 
-/* 80104C50-80104D7C 0FF590 012C+00 1/1 0/0 0/0 .text procSwimHookshotSubjectInit__9daAlink_cFv */
 int daAlink_c::procSwimHookshotSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_SWIM_HOOKSHOT_SUBJECT)) {
         return 0;
@@ -1281,7 +1237,6 @@ int daAlink_c::procSwimHookshotSubjectInit() {
     return 1;
 }
 
-/* 80104D7C-80104EB8 0FF6BC 013C+00 1/0 0/0 0/0 .text procSwimHookshotSubject__9daAlink_cFv */
 int daAlink_c::procSwimHookshotSubject() {
     maxFallSpeed = getSwimMaxFallSpeed();
     field_0x594 = getSwimFrontMaxSpeed();
@@ -1320,7 +1275,6 @@ int daAlink_c::procSwimHookshotSubject() {
     return 1;
 }
 
-/* 80104EB8-80104FC4 0FF7F8 010C+00 1/1 0/0 0/0 .text procSwimHookshotMoveInit__9daAlink_cFv */
 int daAlink_c::procSwimHookshotMoveInit() {
     if (!commonProcInitNotSameProc(PROC_SWIM_HOOKSHOT_MOVE)) {
         return 0;
@@ -1358,8 +1312,6 @@ int daAlink_c::procSwimHookshotMoveInit() {
     return 1;
 }
 
-/* 80104FC4-8010519C 0FF904 01D8+00 1/0 0/0 0/0 .text            procSwimHookshotMove__9daAlink_cFv
- */
 int daAlink_c::procSwimHookshotMove() {
     cancelHookshotMove();
 
@@ -1412,8 +1364,6 @@ int daAlink_c::procSwimHookshotMove() {
     return 1;
 }
 
-/* 8010519C-80105728 0FFADC 058C+00 1/1 0/0 0/0 .text
- * procSwimDamageInit__9daAlink_cFP12dCcD_GObjInf               */
 int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
     seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
     dComIfGp_getVibration().StartShock(2, 31, cXyz(0.0f, 1.0f, 0.0f));
@@ -1493,7 +1443,6 @@ int daAlink_c::procSwimDamageInit(dCcD_GObjInf* param_0) {
     return 1;
 }
 
-/* 80105728-801058A0 100068 0178+00 1/0 0/0 0/0 .text            procSwimDamage__9daAlink_cFv */
 int daAlink_c::procSwimDamage() {
     daPy_frameCtrl_c* frame_ctrl = mUnderFrameCtrl;
 
@@ -1522,8 +1471,6 @@ int daAlink_c::procSwimDamage() {
 }
 
 
-/* 801058A0-80105A00 1001E0 0160+00 2/2 0/0 0/0 .text            procOctaIealSpitInit__9daAlink_cFv
- */
 int daAlink_c::procOctaIealSpitInit() {
     u32 temp_r30 = checkModeFlg(MODE_SWIMMING);
     commonProcInit(PROC_OCTAIEAL_SPIT);
@@ -1571,7 +1518,6 @@ static f32 dummyFloat() {
     return -34.0f;
 }
 
-/* 80105A00-80105A84 100340 0084+00 1/0 0/0 0/0 .text            procOctaIealSpit__9daAlink_cFv */
 int daAlink_c::procOctaIealSpit() {
     if (mDemo.getDemoMode() == 0x2E) {
         cancelOriginalDemo();
diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc
index 741cf4b197..79225d79c7 100644
--- a/src/d/actor/d_a_alink_swindow.inc
+++ b/src/d/actor/d_a_alink_swindow.inc
@@ -10,7 +10,6 @@ static int daAlink_modelCallBack(J3DJoint* p_joint, int param_1);
 static int daAlink_headModelCallBack(J3DJoint* i_joint, int param_1);
 static int daAlink_wolfModelCallBack(J3DJoint* i_joint, int param_1);
 
-/* 8013FF28-8013FF90 13A868 0068+00 2/2 0/0 0/0 .text            setArcName__9daAlink_cFi */
 void daAlink_c::setArcName(BOOL i_isWolf) {
     if (i_isWolf) {
         mArcName = l_wArcName;
@@ -33,7 +32,6 @@ inline bool checkShopWoodShieldEquip() {
     return dComIfGs_getSelectEquipShield() == fpcNm_ITEM_SHIELD;
 }
 
-/* 8013FF90-8013FFD8 13A8D0 0048+00 2/2 0/0 0/0 .text            setShieldArcName__9daAlink_cFv */
 void daAlink_c::setShieldArcName() {
     if (checkCarvingWoodShieldEquip() || !checkShieldGet()) {
         mShieldArcName = l_cWShdArcName;
@@ -44,8 +42,6 @@ void daAlink_c::setShieldArcName() {
     }
 }
 
-/* 8013FFD8-80140038 13A918 0060+00 1/1 0/0 0/0 .text setOriginalHeap__9daAlink_cFPP10JKRExpHeapUl
- */
 void daAlink_c::setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size) {
     if (*i_ppheap == NULL) {
         *i_ppheap =
@@ -53,7 +49,6 @@ void daAlink_c::setOriginalHeap(JKRExpHeap** i_ppheap, u32 i_size) {
     }
 }
 
-/* 80140038-80140064 13A978 002C+00 1/0 0/0 0/0 .text            setClothesChange__9daAlink_cFi */
 void daAlink_c::setClothesChange(int param_0) {
     if (!checkWolf()) {
         mClothesChangeWaitTimer = 4;
@@ -64,12 +59,10 @@ void daAlink_c::setClothesChange(int param_0) {
     }    
 }
 
-/* 80140064-80140070 13A9A4 000C+00 0/0 1/1 0/0 .text            setShieldChange__9daAlink_cFv */
 void daAlink_c::setShieldChange() {
     mShieldChangeWaitTimer = 4;
 }
 
-/* 80140070-801401F8 13A9B0 0188+00 3/3 0/0 0/0 .text            loadModelDVD__9daAlink_cFv */
 int daAlink_c::loadModelDVD() {
     if (mClothesChangeWaitTimer != 0) {
         mClothesChangeWaitTimer--;
@@ -123,7 +116,6 @@ int daAlink_c::loadModelDVD() {
     return 0;
 }
 
-/* 801401F8-80140274 13AB38 007C+00 2/2 0/0 0/0 .text            setShieldModel__9daAlink_cFv */
 void daAlink_c::setShieldModel() {
     JKRHeap* heap = mAnmHeap4.setAnimeHeap();
     mShieldModel = initModel((J3DModelData*)dComIfG_getObjectRes(mShieldArcName, 3), 0);
@@ -131,7 +123,6 @@ void daAlink_c::setShieldModel() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 80140274-80140338 13ABB4 00C4+00 2/2 0/0 0/0 .text            loadShieldModelDVD__9daAlink_cFv */
 int daAlink_c::loadShieldModelDVD() {
     if (mShieldChangeWaitTimer != 0) {
         mShieldChangeWaitTimer--;
@@ -158,8 +149,6 @@ int daAlink_c::loadShieldModelDVD() {
     return 0;
 }
 
-/* 80140338-80140550 13AC78 0218+00 3/3 0/0 0/0 .text            changeModelDataDirect__9daAlink_cFi
- */
 void daAlink_c::changeModelDataDirect(int param_0) {
     u16 i;
 
@@ -212,7 +201,6 @@ void daAlink_c::changeModelDataDirect(int param_0) {
     }
 }
 
-/* 80140550-801406A8 13AE90 0158+00 3/3 0/0 0/0 .text changeModelDataDirectWolf__9daAlink_cFi */
 void daAlink_c::changeModelDataDirectWolf(int param_0) {
     u16 i;
 
@@ -248,7 +236,6 @@ void daAlink_c::changeModelDataDirectWolf(int param_0) {
     }
 }
 
-/* 801406A8-80140888 13AFE8 01E0+00 0/0 1/1 0/0 .text            initStatusWindow__9daAlink_cFv */
 void daAlink_c::initStatusWindow() {
     onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW);
     
@@ -301,7 +288,6 @@ void daAlink_c::initStatusWindow() {
 }
 
 
-/* 80140888-80140984 13B1C8 00FC+00 0/0 1/1 0/0 .text statusWindowExecute__9daAlink_cFPC4cXyzs */
 void daAlink_c::statusWindowExecute(const cXyz* i_pos, s16 i_angle) {
     if (loadModelDVD()) {
         if (mSwordChangeWaitTimer != 0) {
@@ -330,7 +316,6 @@ void daAlink_c::statusWindowExecute(const cXyz* i_pos, s16 i_angle) {
     }
 }
 
-/* 80140984-80140AC8 13B2C4 0144+00 0/0 1/1 0/0 .text            statusWindowDraw__9daAlink_cFv */
 void daAlink_c::statusWindowDraw() {
     static const GXColorS10 waterColor = {0, 0, 0, 0};
 
@@ -370,7 +355,6 @@ void daAlink_c::statusWindowDraw() {
     }
 }
 
-/* 80140AC8-80140B88 13B408 00C0+00 0/0 1/1 0/0 .text            resetStatusWindow__9daAlink_cFv */
 void daAlink_c::resetStatusWindow() {
     offNoResetFlg2(FLG2_STATUS_WINDOW_DRAW);
 
diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc
index 8655e9744d..f96a9af975 100644
--- a/src/d/actor/d_a_alink_whistle.inc
+++ b/src/d/actor/d_a_alink_whistle.inc
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_npc_tk.h"
 #include "d/actor/d_a_obj_yobikusa.h"
 
-/* 8011174C-80111770 10C08C 0024+00 1/1 0/0 0/0 .text daAlink_searchWhistle__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchWhistle(fopAc_ac_c* i_actor, void* i_data) {
     if (daAlink_getAlinkActorClass()->getGrassHowlEventActor() == fopAcM_GetName(i_actor)) {
         return i_actor;
@@ -19,7 +18,6 @@ static fopAc_ac_c* daAlink_searchWhistle(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80111770-80111784 10C0B0 0014+00 1/1 0/0 0/0 .text daAlink_searchHawk__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchHawk(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_NPC_TK) {
         return i_actor;
@@ -28,8 +26,6 @@ static fopAc_ac_c* daAlink_searchHawk(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80111784-8011181C 10C0C4 0098+00 1/1 0/0 0/0 .text            setGrassWhistleModel__9daAlink_cFi
- */
 void daAlink_c::setGrassWhistleModel(int modelType) {
     static const char* grassWhistleArcName[] = {
         "J_Tobi",
@@ -51,8 +47,6 @@ void daAlink_c::setGrassWhistleModel(int modelType) {
     field_0x2f94 = 2;
 }
 
-/* 8011181C-80111894 10C15C 0078+00 1/1 0/0 0/0 .text            setHorseWhistleModel__9daAlink_cFv
- */
 void daAlink_c::setHorseWhistleModel() {
     JKRHeap* prev_heap = setItemHeap();
 
@@ -63,7 +57,6 @@ void daAlink_c::setHorseWhistleModel() {
     field_0x2f94 = 2;
 }
 
-/* 80111894-801119D8 10C1D4 0144+00 2/2 0/0 0/0 .text procGrassWhistleGetInit__9daAlink_cFv */
 int daAlink_c::procGrassWhistleGetInit() {
     if (mEquipItem != fpcNm_ITEM_NONE) {
         return procPreActionUnequipInit(PROC_GRASS_WHISTLE_GET, field_0x27f4);
@@ -91,8 +84,6 @@ int daAlink_c::procGrassWhistleGetInit() {
 }
 
 
-/* 801119D8-80111A9C 10C318 00C4+00 1/0 0/0 0/0 .text            procGrassWhistleGet__9daAlink_cFv
- */
 int daAlink_c::procGrassWhistleGet() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -111,8 +102,6 @@ int daAlink_c::procGrassWhistleGet() {
     return 1;
 }
 
-/* 80111A9C-80111CA4 10C3DC 0208+00 2/2 0/0 0/0 .text
- * procGrassWhistleWaitInit__9daAlink_cFiiisP4cXyz              */
 int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s16 param_3,
                                         cXyz* param_4) {
     u16 var_r6;
@@ -179,8 +168,6 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
 }
 
 
-/* 80111CA4-80111FF0 10C5E4 034C+00 1/0 0/0 0/0 .text            procGrassWhistleWait__9daAlink_cFv
- */
 // NONMATCHING - small regalloc
 int daAlink_c::procGrassWhistleWait() {
     if (mProcVar5.field_0x3012 != 0) {
@@ -277,7 +264,6 @@ int daAlink_c::procGrassWhistleWait() {
     return 1;
 }
 
-/* 80111FF0-801120C8 10C930 00D8+00 2/2 0/0 0/0 .text procCoHorseCallWaitInit__9daAlink_cFi */
 int daAlink_c::procCoHorseCallWaitInit(int param_0) {
     commonProcInit(PROC_HORSE_CALL_WAIT);
 
@@ -300,8 +286,6 @@ int daAlink_c::procCoHorseCallWaitInit(int param_0) {
     return 1;
 }
 
-/* 801120C8-801121B4 10CA08 00EC+00 1/0 0/0 0/0 .text            procCoHorseCallWait__9daAlink_cFv
- */
 int daAlink_c::procCoHorseCallWait() {
     setGrassCancelStatus(0);
 
@@ -328,7 +312,6 @@ int daAlink_c::procCoHorseCallWait() {
     return 1;
 }
 
-/* 801121B4-80112220 10CAF4 006C+00 1/0 0/0 0/0 .text            procHawkCatchInit__9daAlink_cFv */
 int daAlink_c::procHawkCatchInit() {
     if (mProcID == PROC_HAWK_SUBJECT || !commonProcInitNotSameProc(PROC_HAWK_CATCH)) {
         return 0;
@@ -339,7 +322,6 @@ int daAlink_c::procHawkCatchInit() {
     return 1;
 }
 
-/* 80112220-80112278 10CB60 0058+00 1/0 0/0 0/0 .text            procHawkCatch__9daAlink_cFv */
 int daAlink_c::procHawkCatch() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         dComIfGp_evmng_cutEnd(mAlinkStaffId);
@@ -349,8 +331,6 @@ int daAlink_c::procHawkCatch() {
     return 1;
 }
 
-/* 80112278-80112304 10CBB8 008C+00 2/2 0/0 0/0 .text            procHawkSubjectInit__9daAlink_cFv
- */
 int daAlink_c::procHawkSubjectInit() {
     if (!commonProcInitNotSameProc(PROC_HAWK_SUBJECT)) {
         return 0;
@@ -369,7 +349,6 @@ int daAlink_c::procHawkSubjectInit() {
     return 1;
 }
 
-/* 80112304-8011243C 10CC44 0138+00 1/0 0/0 0/0 .text            procHawkSubject__9daAlink_cFv */
 int daAlink_c::procHawkSubject() {
     if (mProcVar2.field_0x300c != 0) {
         if (mProcVar2.field_0x300c != 0) {
diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc
index f887ab2bae..3c2be85cb8 100644
--- a/src/d/actor/d_a_alink_wolf.inc
+++ b/src/d/actor/d_a_alink_wolf.inc
@@ -68,7 +68,6 @@ extern cXyz l_wolfBaseAnime;
 extern cXyz l_wolfRopeBaseAnime;
 
 
-/* 80126740-80126928 121080 01E8+00 2/2 0/0 0/0 .text            changeCommon__9daAlink_cFv */
 void daAlink_c::changeCommon() {
     fopAcM_SetMtx(this, mpLinkModel->getBaseTRMtx());
     model = mpLinkModel;
@@ -144,7 +143,6 @@ void daAlink_c::changeCommon() {
     field_0x2fc3 = 10;
 }
 
-/* 80126928-80126F3C 121268 0614+00 2/2 0/0 0/0 .text            changeWolf__9daAlink_cFv */
 void daAlink_c::changeWolf() {
     JKRHeap* current_heap = mAnmHeap3.setAnimeHeap();
 
@@ -276,7 +274,6 @@ void daAlink_c::changeWolf() {
     field_0x2fc7 = (u8)dStage_stagInfo_GetWolfDashType(dComIfGp_getStage()->getStagInfo());
 }
 
-/* 80126F3C-80127C54 12187C 0D18+00 2/2 0/0 0/0 .text            changeLink__9daAlink_cFi */
 void daAlink_c::changeLink(int param_0) {
     JKRHeap* current_heap = mAnmHeap3.setAnimeHeap();
     offNoResetFlg2(daPy_FLG2(FLG2_UNK_100000 | FLG2_UNK_80000));
@@ -534,7 +531,6 @@ void daAlink_c::changeLink(int param_0) {
     }
 }
 
-/* 80127C54-80127CAC 122594 0058+00 2/2 0/0 0/0 .text            onWolfEyeUp__9daAlink_cFv */
 void daAlink_c::onWolfEyeUp() {
     if (mWolfEyeUp == 0) {
         mZ2Link.setWolfEyeOpen(true);
@@ -543,7 +539,6 @@ void daAlink_c::onWolfEyeUp() {
     }
 }
 
-/* 80127CAC-80127CF0 1225EC 0044+00 5/5 0/0 0/0 .text            offWolfEyeUp__9daAlink_cFv */
 void daAlink_c::offWolfEyeUp() {
     if (mWolfEyeUp != 0) {
         mWolfEyeUp = 0;
@@ -552,28 +547,22 @@ void daAlink_c::offWolfEyeUp() {
     }
 }
 
-/* 80127CF0-80127D14 122630 0024+00 1/1 0/0 0/0 .text            wolfSenseTrigger__9daAlink_cFv */
 BOOL daAlink_c::wolfSenseTrigger() {
     return itemTriggerCheck(BTN_X);
 }
 
-/* 80127D14-80127D2C 122654 0018+00 1/1 0/0 0/0 .text            setWolfSenceStatus__9daAlink_cFUc
- */
 void daAlink_c::setWolfSenceStatus(u8 status) {
     dComIfGp_setXStatus(status, 0);
 }
 
-/* 80127D2C-80127D50 12266C 0024+00 1/1 0/0 0/0 .text            wolfClawTrigger__9daAlink_cFv */
 BOOL daAlink_c::wolfClawTrigger() {
     return itemTriggerCheck(BTN_Y);
 }
 
-/* 80127D50-80127D68 122690 0018+00 2/2 0/0 0/0 .text            setWolfDigStatus__9daAlink_cFUc */
 void daAlink_c::setWolfDigStatus(u8 flag) {
     dComIfGp_setYStatus(13, flag);
 }
 
-/* 80127D68-80127DC4 1226A8 005C+00 4/4 0/0 0/0 .text checkWolfShapeReverse__9daAlink_cCFv */
 BOOL daAlink_c::checkWolfShapeReverse() const {
     return ((mProcID == PROC_WOLF_SLIDE_READY || mProcID == PROC_WOLF_LOCK_ATTACK_TURN ||
              mProcID == PROC_WOLF_JUMP_AT_SLIDE_LAND) &&
@@ -583,14 +572,12 @@ BOOL daAlink_c::checkWolfShapeReverse() const {
            mProcID == PROC_WOLF_ROPE_TURN;
 }
 
-/* 80127DC4-80127E08 122704 0044+00 1/1 0/0 0/0 .text            checkWolfSideStep__9daAlink_cCFv */
 BOOL daAlink_c::checkWolfSideStep() const {
     return field_0x2f98 != 0 &&
            ((mProcID == PROC_WOLF_ATN_AC_MOVE && !checkModeFlg(1)) ||
             mProcID == PROC_WOLF_SIDESTEP_LAND || mProcID == PROC_WOLF_BACKJUMP_LAND);
 }
 
-/* 80127E08-80127F20 122748 0118+00 1/1 0/0 0/0 .text            setWolfTailAngle__9daAlink_cFv */
 void daAlink_c::setWolfTailAngle() {
     s16* var_r30 = field_0x3094;
     s16* var_r29 = field_0x309a;
@@ -617,13 +604,10 @@ void daAlink_c::setWolfTailAngle() {
     }
 }
 
-/* 80127F20-80127F50 122860 0030+00 5/5 0/0 0/0 .text            checkWolfSlowDash__9daAlink_cFv */
 BOOL daAlink_c::checkWolfSlowDash() {
     return field_0x2fc7 == 1 || field_0x2fc7 == 3 || field_0x3174 == 11;
 }
 
-/* 80127F50-80128478 122890 0528+00 1/1 0/0 0/0 .text            setSpeedAndAngleWolf__9daAlink_cFv
- */
 void daAlink_c::setSpeedAndAngleWolf() {
     f32 var_f31 = 0.0f;
 
@@ -756,7 +740,6 @@ void daAlink_c::setSpeedAndAngleWolf() {
     setNormalSpeedF(var_f31, var_f29);
 }
 
-/* 80128478-80128798 122DB8 0320+00 2/2 0/0 0/0 .text setSpeedAndAngleWolfAtn__9daAlink_cFv */
 void daAlink_c::setSpeedAndAngleWolfAtn() {
     f32 var_f31;
     f32 var_f30;
@@ -843,7 +826,6 @@ void daAlink_c::setSpeedAndAngleWolfAtn() {
     setNormalSpeedF(var_f31, var_f29);
 }
 
-/* 80128798-8012880C 1230D8 0074+00 4/4 0/0 0/0 .text            checkWolfAtnWait__9daAlink_cFv */
 BOOL daAlink_c::checkWolfAtnWait() {
     if ((checkEnemyGroup(mTargetedActor) || mDemo.getDemoMode() == 0x17) ||
         (mTargetedActor != NULL && fopAcM_GetName(mTargetedActor) == PROC_NPC_MOI &&
@@ -855,14 +837,11 @@ BOOL daAlink_c::checkWolfAtnWait() {
     return false;
 }
 
-/* 8012880C-80128844 12314C 0038+00 27/27 0/0 0/0 .text
- * checkUnderMove0BckNoArcWolf__9daAlink_cCFQ29daAlink_c12daAlink_WANM */
 BOOL daAlink_c::checkUnderMove0BckNoArcWolf(daAlink_c::daAlink_WANM anm_id) const {
     return mUnderAnmHeap[0].checkNoSetArcNo() &&
            m_wlAnmDataTable[anm_id].field_0x0 == mUnderAnmHeap[0].getIdx();
 }
 
-/* 80128844-80128F0C 123184 06C8+00 11/11 0/0 0/0 .text setBlendWolfMoveAnime__9daAlink_cFf */
 void daAlink_c::setBlendWolfMoveAnime(f32 param_0) {
     f32 sp8;
     if (field_0x3174 == 8) {
@@ -1041,15 +1020,12 @@ void daAlink_c::setBlendWolfMoveAnime(f32 param_0) {
     }
 }
 
-/* 80128F0C-80128F5C 12384C 0050+00 2/2 0/0 0/0 .text            checkWolfAtnMoveBack__9daAlink_cFs
- */
 BOOL daAlink_c::checkWolfAtnMoveBack(s16 param_0) {
     f32 cos = cM_scos(param_0);
     return (field_0x2f98 != 1 && cos < -0.3826834261417389f) ||
            (field_0x2f98 == 1 && cos < -0.1736481785774231f);
 }
 
-/* 80128F5C-80129114 12389C 01B8+00 5/5 0/0 0/0 .text setWolfAtnMoveDirection__9daAlink_cFv */
 void daAlink_c::setWolfAtnMoveDirection() {
     if (!checkAttentionState() && mProcID != PROC_WOLF_ROLL_ATTACK_MOVE) {
         field_0x2f98 = 0;
@@ -1102,7 +1078,6 @@ void daAlink_c::setWolfAtnMoveDirection() {
     }
 }
 
-/* 80129114-8012933C 123A54 0228+00 2/2 0/0 0/0 .text setBlendWolfAtnMoveAnime__9daAlink_cFf */
 void daAlink_c::setBlendWolfAtnMoveAnime(f32 param_0) {
     if (checkSetChainPullAnime(field_0x2fe4)) {
         daAlink_WANM var_r29;
@@ -1172,8 +1147,6 @@ void daAlink_c::setBlendWolfAtnMoveAnime(f32 param_0) {
     }
 }
 
-/* 8012933C-8012948C 123C7C 0150+00 1/1 0/0 0/0 .text setBlendWolfAtnBackMoveAnime__9daAlink_cFf
- */
 void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) {
     field_0x594 = daAlinkHIO_wlAtnMove_c0::m.mRearMaxSpeed;
 
@@ -1217,8 +1190,6 @@ void daAlink_c::setBlendWolfAtnBackMoveAnime(f32 param_0) {
     }
 }
 
-/* 8012948C-80129678 123DCC 01EC+00 3/3 0/0 0/0 .text
- * setDoubleAnimeWolf__9daAlink_cFfffQ29daAlink_c12daAlink_WANMQ29daAlink_c12daAlink_WANMif */
 int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2,
                                    daAlink_c::daAlink_WANM param_3, daAlink_c::daAlink_WANM param_4,
                                    int param_5, f32 param_6) {
@@ -1277,27 +1248,19 @@ int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2,
     return 1;
 }
 
-/* 80129678-801296A8 123FB8 0030+00 35/35 0/0 0/0 .text
- * setSingleAnimeWolfBase__9daAlink_cFQ29daAlink_c12daAlink_WANM */
 void daAlink_c::setSingleAnimeWolfBase(daAlink_c::daAlink_WANM i_anmID) {
     setSingleAnimeWolf(i_anmID, 1.0f, 0.0f, -1, 3.0f);
 }
 
-/* 801296A8-801296D8 123FE8 0030+00 3/3 0/0 0/0 .text
- * setSingleAnimeWolfBaseMorf__9daAlink_cFQ29daAlink_c12daAlink_WANMf */
 void daAlink_c::setSingleAnimeWolfBaseMorf(daAlink_c::daAlink_WANM i_anmID, f32 i_morf) {
     setSingleAnimeWolf(i_anmID, 1.0f, 0.0f, -1, i_morf);
 }
 
-/* 801296D8-80129704 124018 002C+00 44/44 0/0 0/0 .text
- * setSingleAnimeWolfBaseSpeed__9daAlink_cFQ29daAlink_c12daAlink_WANMff */
 void daAlink_c::setSingleAnimeWolfBaseSpeed(daAlink_c::daAlink_WANM i_anmID, f32 i_speed,
                                             f32 i_morf) {
     setSingleAnimeWolf(i_anmID, i_speed, 0.0f, -1, i_morf);
 }
 
-/* 80129704-80129848 124044 0144+00 29/29 0/0 0/0 .text
- * setSingleAnimeWolf__9daAlink_cFQ29daAlink_c12daAlink_WANMffsf */
 int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, f32 i_start,
                                    s16 i_endFrame, f32 i_morf) {
     if (!checkWolf()) {
@@ -1331,16 +1294,12 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed,
     return 1;
 }
 
-/* 80129848-8012987C 124188 0034+00 53/53 0/0 0/0 .text
- * setSingleAnimeWolfParam__9daAlink_cFQ29daAlink_c12daAlink_WANMPC16daAlinkHIO_anm_c */
 void daAlink_c::setSingleAnimeWolfParam(daAlink_c::daAlink_WANM i_anmID,
                                         daAlinkHIO_anm_c const* i_anmData) {
     setSingleAnimeWolf(i_anmID, i_anmData->mSpeed, i_anmData->mStartFrame, i_anmData->mEndFrame,
                        i_anmData->mInterpolation);
 }
 
-/* 8012987C-80129958 1241BC 00DC+00 5/5 0/0 0/0 .text            checkWolfLandAction__9daAlink_cFi
- */
 int daAlink_c::checkWolfLandAction(int param_0) {
     f32 temp_f31 = 0.0099999998f * (mFallHeight - current.pos.y);
 
@@ -1366,14 +1325,10 @@ int daAlink_c::checkWolfLandAction(int param_0) {
     return 1;
 }
 
-/* 80129958-801299A8 124298 0050+00 1/1 0/0 1/1 .text            checkMidnaUseAbility__9daAlink_cCFv
- */
 BOOL daAlink_c::checkMidnaUseAbility() const {
     return dComIfGp_checkPlayerStatus1(0, 0x800000) || dKy_withwarp_capture_check();
 }
 
-/* 801299A8-80129A80 1242E8 00D8+00 1/1 0/0 0/0 .text            checkWolfUseAbility__9daAlink_cFv
- */
 void daAlink_c::checkWolfUseAbility() {
     if (mProcID == PROC_WOLF_GIANT_PUZZLE) {
         return;
@@ -1395,8 +1350,6 @@ void daAlink_c::checkWolfUseAbility() {
     }
 }
 
-/* 80129A80-80129B44 1243C0 00C4+00 13/13 0/0 0/0 .text checkWolfGroundSpecialMode__9daAlink_cFv
- */
 int daAlink_c::checkWolfGroundSpecialMode() {
     if (mLinkAcch.ChkGroundHit() && !checkModeFlg(MODE_PLAYER_FLY) &&
         checkEndResetFlg0(ERFLG0_UNK_1))
@@ -1414,8 +1367,6 @@ int daAlink_c::checkWolfGroundSpecialMode() {
     return 0;
 }
 
-/* 80129B44-8012A02C 124484 04E8+00 46/46 0/0 0/0 .text            checkNextActionWolf__9daAlink_cFi
- */
 int daAlink_c::checkNextActionWolf(int param_0) {
     if (checkDeadAction(1)) {
         return 1;
@@ -1537,7 +1488,6 @@ int daAlink_c::checkNextActionWolf(int param_0) {
     return var_r30;
 }
 
-/* 8012A02C-8012A228 12496C 01FC+00 3/3 0/0 0/0 .text            wolfSideBgCheck__9daAlink_cFs */
 BOOL daAlink_c::wolfSideBgCheck(s16 param_0) {
     s16 var_r31 = current.angle.y - param_0;
     if (var_r31 == 0) {
@@ -1583,7 +1533,6 @@ BOOL daAlink_c::wolfSideBgCheck(s16 param_0) {
     return false;
 }
 
-/* 8012A228-8012A330 124B68 0108+00 4/4 0/0 0/0 .text checkWolfAttackReverse__9daAlink_cFi */
 BOOL daAlink_c::checkWolfAttackReverse(int param_0) {
     if (mProcID != PROC_WOLF_LOCK_ATTACK && checkAtShieldHit(mAtCyl)) {
         return procWolfAttackReverseInit();
@@ -1607,7 +1556,6 @@ BOOL daAlink_c::checkWolfAttackReverse(int param_0) {
     return false;
 }
 
-/* 8012A330-8012A41C 124C70 00EC+00 1/1 0/0 0/0 .text checkWolfBarrierHitReverse__9daAlink_cFv */
 int daAlink_c::checkWolfBarrierHitReverse() {
     if (field_0x3100 != 0 && mProcID != PROC_FRONT_ROLL_SUCCESS && mProcID != PROC_DAMAGE &&
         mProcID != PROC_WOLF_ATTACK_REVERSE && mProcID != PROC_WOLF_DASH_REVERSE)
@@ -1630,8 +1578,6 @@ int daAlink_c::checkWolfBarrierHitReverse() {
     return 0;
 }
 
-/* 8012A41C-8012A498 124D5C 007C+00 2/2 0/0 0/0 .text
- * checkWolfBarrierWallHit__9daAlink_cFR13cBgS_PolyInfo         */
 BOOL daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_poly) {
     if (field_0x3100 != 0 || checkZeroSpeedF()) {
         return false;
@@ -1645,7 +1591,6 @@ BOOL daAlink_c::checkWolfBarrierWallHit(cBgS_PolyInfo& i_poly) {
     return false;
 }
 
-/* 8012A498-8012ACCC 124DD8 0834+00 1/1 0/0 0/0 .text            wolfBgCheck__9daAlink_cFv */
 void daAlink_c::wolfBgCheck() {
     offNoResetFlg3(daPy_FLG3(FLG3_UNK_800000 | FLG3_UNK_400));
 
@@ -1840,8 +1785,6 @@ void daAlink_c::wolfBgCheck() {
     }
 }
 
-/* 8012ACCC-8012AD1C 12560C 0050+00 1/1 0/0 0/0 .text            changeWolfBlendRate__9daAlink_cFi
- */
 void daAlink_c::changeWolfBlendRate(int param_0) {
     if (checkWolfGrabAnime()) {
         if (param_0 == 7) {
@@ -1858,7 +1801,6 @@ void daAlink_c::changeWolfBlendRate(int param_0) {
     }
 }
 
-/* 8012AD1C-8012B724 12565C 0A08+00 1/1 0/0 0/0 .text            setWolfFootMatrix__9daAlink_cFv */
 void daAlink_c::setWolfFootMatrix() {
     static const u16 fFootJoint[] = {
         0x0010,
@@ -1955,7 +1897,6 @@ void daAlink_c::setWolfFootMatrix() {
     }
 }
 
-/* 8012B724-8012BFA8 126064 0884+00 1/1 0/0 0/0 .text            wolfFootBgCheck__9daAlink_cFv */
 void daAlink_c::wolfFootBgCheck() {
     int i;
     int j;
@@ -2193,7 +2134,6 @@ void daAlink_c::wolfFootBgCheck() {
     }
 }
 
-/* 8012BFA8-8012C1F4 1268E8 024C+00 6/6 0/0 0/0 .text checkWolfWaitSlipPolygon__9daAlink_cFv */
 BOOL daAlink_c::checkWolfWaitSlipPolygon() {
     if (!dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) || mGndPolySpecialCode == dBgW_SPCODE_HEAVY_SNOW || field_0x3174 == 8) {
         return 0;
@@ -2211,7 +2151,6 @@ BOOL daAlink_c::checkWolfWaitSlipPolygon() {
     return cM_atan2s(sp8.mNormal.absXZ(), sp8.mNormal.y) > field_0x3122;
 }
 
-/* 8012C1F4-8012C308 126B34 0114+00 2/2 0/0 0/0 .text            setWolfWaitSlip__9daAlink_cFv */
 f32 daAlink_c::setWolfWaitSlip() {
     cM3dGPla sp8;
     dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp8);
@@ -2233,11 +2172,8 @@ f32 daAlink_c::setWolfWaitSlip() {
     return temp_f30;
 }
 
-/* 8012C308-8012C30C 126C48 0004+00 4/4 0/0 0/0 .text            checkWolfAtnDoCharge__9daAlink_cFv
- */
 void daAlink_c::checkWolfAtnDoCharge() {}
 
-/* 8012C30C-8012CB0C 126C4C 0800+00 1/1 0/0 0/0 .text            setWolfChainPos__9daAlink_cFv */
 void daAlink_c::setWolfChainPos() {
     static Vec const wolfChainBaseOffset = {22.0f, 0.0f, -12.0f};
     static Vec const wolfChainVec = {0.0f, 0.0f, -9.0f};
@@ -2376,7 +2312,6 @@ void daAlink_c::setWolfChainPos() {
     }
 }
 
-/* 8012CB0C-8012CBE4 12744C 00D8+00 1/1 0/0 0/0 .text            setWolfAnmVoice__9daAlink_cFv */
 void daAlink_c::setWolfAnmVoice() {
     static u32 const label[12] = {
         Z2SE_WL_V_BREATH_SIT, Z2SE_WL_V_BREATH_WAIT, Z2SE_WL_V_BREATH_WALK, Z2SE_WL_V_BREATH_TIRED,
@@ -2402,7 +2337,6 @@ void daAlink_c::setWolfAnmVoice() {
     }
 }
 
-/* 8012CBE4-8012CD28 127524 0144+00 4/4 0/0 0/0 .text procWolfServiceWaitInit__9daAlink_cFi */
 int daAlink_c::procWolfServiceWaitInit(int param_0) {
     commonProcInit(PROC_WOLF_SERVICE_WAIT);
     mProcVar5.field_0x3012 = 0;
@@ -2439,8 +2373,6 @@ int daAlink_c::procWolfServiceWaitInit(int param_0) {
     return 1;
 }
 
-/* 8012CD28-8012CF68 127668 0240+00 1/0 0/0 0/0 .text            procWolfServiceWait__9daAlink_cFv
- */
 int daAlink_c::procWolfServiceWait() {
     daPy_frameCtrl_c* temp_r30 = &mUnderFrameCtrl[0];
 
@@ -2482,8 +2414,6 @@ int daAlink_c::procWolfServiceWait() {
     return 1;
 }
 
-/* 8012CF68-8012CFEC 1278A8 0084+00 1/1 0/0 0/0 .text            procWolfTiredWaitInit__9daAlink_cFv
- */
 int daAlink_c::procWolfTiredWaitInit() {
     if (checkWolfWaitSlipPolygon() && !checkInputOnR()) {
         return procWolfWaitSlipInit();
@@ -2498,7 +2428,6 @@ int daAlink_c::procWolfTiredWaitInit() {
     return 1;
 }
 
-/* 8012CFEC-8012D050 12792C 0064+00 1/0 0/0 0/0 .text            procWolfTiredWait__9daAlink_cFv */
 int daAlink_c::procWolfTiredWait() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -2509,7 +2438,6 @@ int daAlink_c::procWolfTiredWait() {
     return 1;
 }
 
-/* 8012D050-8012D104 127990 00B4+00 3/2 0/0 0/0 .text procWolfMidnaRideShockInit__9daAlink_cFv */
 int daAlink_c::procWolfMidnaRideShockInit() {
     if (!checkWolf()) {
         dComIfGp_evmng_cutEnd(mAlinkStaffId);
@@ -2530,7 +2458,6 @@ int daAlink_c::procWolfMidnaRideShockInit() {
     return 1;
 }
 
-/* 8012D104-8012D1A8 127A44 00A4+00 1/0 0/0 0/0 .text procWolfMidnaRideShock__9daAlink_cFv */
 int daAlink_c::procWolfMidnaRideShock() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -2547,7 +2474,6 @@ int daAlink_c::procWolfMidnaRideShock() {
     return 1;
 }
 
-/* 8012D1A8-8012D2A8 127AE8 0100+00 13/13 0/0 0/0 .text            procWolfWaitInit__9daAlink_cFv */
 int daAlink_c::procWolfWaitInit() {
     if (checkWolfWaitSlipPolygon() && !checkInputOnR()) {
         return procWolfWaitSlipInit();
@@ -2572,7 +2498,6 @@ int daAlink_c::procWolfWaitInit() {
     return 1;
 }
 
-/* 8012D2A8-8012D380 127BE8 00D8+00 1/0 0/0 0/0 .text            procWolfWait__9daAlink_cFv */
 int daAlink_c::procWolfWait() {
     s16 old_shapeangle = shape_angle.y;
 
@@ -2594,7 +2519,6 @@ int daAlink_c::procWolfWait() {
     return 1;
 }
 
-/* 8012D380-8012D3E4 127CC0 0064+00 2/2 0/0 0/0 .text            procWolfMoveInit__9daAlink_cFv */
 int daAlink_c::procWolfMoveInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_MOVE)) {
         return 0;
@@ -2606,7 +2530,6 @@ int daAlink_c::procWolfMoveInit() {
     return 1;
 }
 
-/* 8012D3E4-8012D474 127D24 0090+00 1/0 0/0 0/0 .text            procWolfMove__9daAlink_cFv */
 int daAlink_c::procWolfMove() {
     if (!checkNextActionWolf(0) && !checkFrontWallTypeAction()) {
         if (mDemo.getDemoMode() == 2) {
@@ -2622,7 +2545,6 @@ int daAlink_c::procWolfMove() {
     return 1;
 }
 
-/* 8012D474-8012D590 127DB4 011C+00 1/1 0/0 0/0 .text            procWolfDashInit__9daAlink_cFv */
 int daAlink_c::procWolfDashInit() {
     commonProcInit(PROC_WOLF_DASH);
     setSingleAnimeWolfParam(WANM_DASH_START, &daAlinkHIO_wlMove_c0::m.mADashAnm);
@@ -2659,7 +2581,6 @@ int daAlink_c::procWolfDashInit() {
     return 1;
 }
 
-/* 8012D590-8012D8C0 127ED0 0330+00 1/0 0/0 0/0 .text            procWolfDash__9daAlink_cFv */
 int daAlink_c::procWolfDash() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     cM3dGPla poly;
@@ -2733,7 +2654,6 @@ int daAlink_c::procWolfDash() {
     return 1;
 }
 
-/* 8012D8C0-8012DA5C 128200 019C+00 2/2 0/0 0/0 .text procWolfDashReverseInit__9daAlink_cFi */
 int daAlink_c::procWolfDashReverseInit(int param_0) {
     commonProcInit(PROC_WOLF_DASH_REVERSE);
     setSingleAnimeWolf(WANM_ATTACK_RECOIL_GROUND, daAlinkHIO_wlMove_c0::m.mDashReboundAnm.mSpeed,
@@ -2766,8 +2686,6 @@ int daAlink_c::procWolfDashReverseInit(int param_0) {
     return 1;
 }
 
-/* 8012DA5C-8012DBA8 12839C 014C+00 1/0 0/0 0/0 .text            procWolfDashReverse__9daAlink_cFv
- */
 int daAlink_c::procWolfDashReverse() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -2804,7 +2722,6 @@ int daAlink_c::procWolfDashReverse() {
     return 1;
 }
 
-/* 8012DBA8-8012DC44 1284E8 009C+00 1/1 0/0 0/0 .text procWolfAtnActorMoveInit__9daAlink_cFv */
 int daAlink_c::procWolfAtnActorMoveInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_ATN_AC_MOVE)) {
         return 0;
@@ -2824,8 +2741,6 @@ int daAlink_c::procWolfAtnActorMoveInit() {
     return 1;
 }
 
-/* 8012DC44-8012DD08 128584 00C4+00 1/0 0/0 0/0 .text            procWolfAtnActorMove__9daAlink_cFv
- */
 int daAlink_c::procWolfAtnActorMove() {
     setWolfAtnMoveDirection();
 
@@ -2850,8 +2765,6 @@ int daAlink_c::procWolfAtnActorMove() {
     return 1;
 }
 
-/* 8012DD08-8012DDB4 128648 00AC+00 1/1 0/0 0/0 .text            procWolfWaitTurnInit__9daAlink_cFv
- */
 int daAlink_c::procWolfWaitTurnInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_WAIT_TURN)) {
         return 0;
@@ -2875,7 +2788,6 @@ int daAlink_c::procWolfWaitTurnInit() {
     return 1;
 }
 
-/* 8012DDB4-8012DEC8 1286F4 0114+00 1/0 0/0 0/0 .text            procWolfWaitTurn__9daAlink_cFv */
 int daAlink_c::procWolfWaitTurn() {
     f32 step_amount;
     if (checkWolfDashMode()) {
@@ -2911,8 +2823,6 @@ int daAlink_c::procWolfWaitTurn() {
     return 1;
 }
 
-/* 8012DEC8-8012E0AC 128808 01E4+00 2/2 0/0 0/0 .text            procWolfSideStepInit__9daAlink_cFi
- */
 int daAlink_c::procWolfSideStepInit(int param_0) {
     if (field_0x2f98 == 1 && !param_0 && checkFirstMidnaDemo() && !checkWolfGrabAnime() &&
         field_0x2fcc != 0)
@@ -2962,7 +2872,6 @@ int daAlink_c::procWolfSideStepInit(int param_0) {
     return 1;
 }
 
-/* 8012E0AC-8012E1E8 1289EC 013C+00 1/0 0/0 0/0 .text            procWolfSideStep__9daAlink_cFv */
 int daAlink_c::procWolfSideStep() {
     if (mProcVar1.field_0x300a == 0) {
         cLib_addCalcAngleS(
@@ -2997,7 +2906,6 @@ int daAlink_c::procWolfSideStep() {
     return 1;
 }
 
-/* 8012E1E8-8012E2DC 128B28 00F4+00 1/1 0/0 0/0 .text procWolfSideStepLandInit__9daAlink_cFs */
 int daAlink_c::procWolfSideStepLandInit(s16 param_0) {
     commonProcInit(PROC_WOLF_SIDESTEP_LAND);
 
@@ -3023,8 +2931,6 @@ int daAlink_c::procWolfSideStepLandInit(s16 param_0) {
     return 1;
 }
 
-/* 8012E2DC-8012E398 128C1C 00BC+00 1/0 0/0 0/0 .text            procWolfSideStepLand__9daAlink_cFv
- */
 int daAlink_c::procWolfSideStepLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3048,8 +2954,6 @@ int daAlink_c::procWolfSideStepLand() {
     return 1;
 }
 
-/* 8012E398-8012E508 128CD8 0170+00 3/3 0/0 0/0 .text            procWolfBackJumpInit__9daAlink_cFi
- */
 int daAlink_c::procWolfBackJumpInit(int param_0) {
     commonProcInit(PROC_WOLF_BACKJUMP);
 
@@ -3092,7 +2996,6 @@ int daAlink_c::procWolfBackJumpInit(int param_0) {
     return 1;
 }
 
-/* 8012E508-8012E5F4 128E48 00EC+00 1/0 0/0 0/0 .text            procWolfBackJump__9daAlink_cFv */
 int daAlink_c::procWolfBackJump() {
     cLib_addCalcAngleS(&shape_angle.y, mProcVar2.field_0x300c, daAlinkHIO_wlAtnMove_c0::m.mTurnAngleRate,
                        daAlinkHIO_wlAtnMove_c0::m.mTurnAngleMax, daAlinkHIO_wlAtnMove_c0::m.mTurnAngleMin);
@@ -3116,7 +3019,6 @@ int daAlink_c::procWolfBackJump() {
     return 1;
 }
 
-/* 8012E5F4-8012E684 128F34 0090+00 1/1 0/0 0/0 .text procWolfBackJumpLandInit__9daAlink_cFss */
 int daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) {
     commonProcInit(PROC_WOLF_BACKJUMP_LAND);
     setSingleAnimeWolfParam(WANM_BACKFLIP_END, &daAlinkHIO_wlBackJump_c0::m.mBackLandAnm);
@@ -3131,8 +3033,6 @@ int daAlink_c::procWolfBackJumpLandInit(s16 param_0, s16 param_1) {
     return 1;
 }
 
-/* 8012E684-8012E754 128FC4 00D0+00 1/0 0/0 0/0 .text            procWolfBackJumpLand__9daAlink_cFv
- */
 int daAlink_c::procWolfBackJumpLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3159,7 +3059,6 @@ int daAlink_c::procWolfBackJumpLand() {
     return 1;
 }
 
-/* 8012E754-8012E83C 129094 00E8+00 2/2 0/0 0/0 .text            procWolfHowlInit__9daAlink_cFi */
 int daAlink_c::procWolfHowlInit(int param_0) {
     if (checkEventRun() && mProcID == PROC_WOLF_HOWL) {
         return 0;
@@ -3184,7 +3083,6 @@ int daAlink_c::procWolfHowlInit(int param_0) {
     return 1;
 }
 
-/* 8012E83C-8012E9C8 12917C 018C+00 1/0 0/0 0/0 .text            procWolfHowl__9daAlink_cFv */
 int daAlink_c::procWolfHowl() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -3221,8 +3119,6 @@ int daAlink_c::procWolfHowl() {
     return 1;
 }
 
-/* 8012E9C8-8012EB94 129308 01CC+00 2/2 0/0 0/0 .text            procWolfAutoJumpInit__9daAlink_cFi
- */
 int daAlink_c::procWolfAutoJumpInit(int param_0) {
     commonProcInit(PROC_WOLF_AUTO_JUMP);
 
@@ -3271,7 +3167,6 @@ int daAlink_c::procWolfAutoJumpInit(int param_0) {
     return 1;
 }
 
-/* 8012EB94-8012EDD0 1294D4 023C+00 1/0 0/0 0/0 .text            procWolfAutoJump__9daAlink_cFv */
 int daAlink_c::procWolfAutoJump() {
     if (mSpecialMode != 0x27) {
         if (checkInputOnR() && getDirectionFromCurrentAngle() == DIR_BACKWARD) {
@@ -3324,8 +3219,6 @@ int daAlink_c::procWolfAutoJump() {
     return 1;
 }
 
-/* 8012EDD0-8012EFB8 129710 01E8+00 12/12 0/0 0/0 .text            procWolfFallInit__9daAlink_cFif
- */
 int daAlink_c::procWolfFallInit(int param_0, f32 i_morf) {
     if (!commonProcInitNotSameProc(PROC_WOLF_FALL)) {
         return 0;
@@ -3377,7 +3270,6 @@ int daAlink_c::procWolfFallInit(int param_0, f32 i_morf) {
     return 1;
 }
 
-/* 8012EFB8-8012F138 1298F8 0180+00 1/0 0/0 0/0 .text            procWolfFall__9daAlink_cFv */
 int daAlink_c::procWolfFall() {
     if (mProcVar5.field_0x3012 == 0) {
         cLib_chaseF(&mNormalSpeed, 0.0f, 0.1f);
@@ -3418,7 +3310,6 @@ int daAlink_c::procWolfFall() {
     return 1;
 }
 
-/* 8012F138-8012F1F0 129A78 00B8+00 2/2 0/0 0/0 .text            procWolfLandInit__9daAlink_cFv */
 int daAlink_c::procWolfLandInit() {
     commonProcInit(PROC_WOLF_LAND);
     mNormalSpeed = 0.0f;
@@ -3435,7 +3326,6 @@ int daAlink_c::procWolfLandInit() {
     return 1;
 }
 
-/* 8012F1F0-8012F278 129B30 0088+00 1/0 0/0 0/0 .text            procWolfLand__9daAlink_cFv */
 int daAlink_c::procWolfLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3452,7 +3342,6 @@ int daAlink_c::procWolfLand() {
     return 1;
 }
 
-/* 8012F278-8012F358 129BB8 00E0+00 1/1 0/0 0/0 .text            procWolfSitInit__9daAlink_cFi */
 int daAlink_c::procWolfSitInit(int param_0) {
     if (!commonProcInitNotSameProc(PROC_WOLF_SIT)) {
         return 0;
@@ -3476,7 +3365,6 @@ int daAlink_c::procWolfSitInit(int param_0) {
     return 1;
 }
 
-/* 8012F358-8012F41C 129C98 00C4+00 1/0 0/0 0/0 .text            procWolfSit__9daAlink_cFv */
 int daAlink_c::procWolfSit() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3495,8 +3383,6 @@ int daAlink_c::procWolfSit() {
     return 1;
 }
 
-/* 8012F41C-8012F500 129D5C 00E4+00 1/1 0/0 0/0 .text            procWolfStepMoveInit__9daAlink_cFv
- */
 int daAlink_c::procWolfStepMoveInit() {
     commonProcInit(PROC_WOLF_STEP_MOVE);
     setSingleAnimeWolfParam(WANM_BUMP_START, &daAlinkHIO_wlWallHang_c0::m.mLedgeClimbAnm);
@@ -3512,7 +3398,6 @@ int daAlink_c::procWolfStepMoveInit() {
     return 1;
 }
 
-/* 8012F500-8012F634 129E40 0134+00 1/0 0/0 0/0 .text            procWolfStepMove__9daAlink_cFv */
 int daAlink_c::procWolfStepMove() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -3543,7 +3428,6 @@ int daAlink_c::procWolfStepMove() {
     return 1;
 }
 
-/* 8012F634-8012F6EC 129F74 00B8+00 1/1 0/0 0/0 .text            procWolfSlipInit__9daAlink_cFv */
 int daAlink_c::procWolfSlipInit() {
     commonProcInit(PROC_WOLF_SLIP);
     setSingleAnimeWolfParam(WANM_SLIP, &daAlinkHIO_wlMove_c0::m.mSlipAnm);
@@ -3560,7 +3444,6 @@ int daAlink_c::procWolfSlipInit() {
     return 1;
 }
 
-/* 8012F6EC-8012F840 12A02C 0154+00 1/0 0/0 0/0 .text            procWolfSlip__9daAlink_cFv */
 int daAlink_c::procWolfSlip() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -3597,8 +3480,6 @@ int daAlink_c::procWolfSlip() {
     return 1;
 }
 
-/* 8012F840-8012F9C0 12A180 0180+00 2/2 0/0 0/0 .text            procWolfSlipTurnInit__9daAlink_cFi
- */
 int daAlink_c::procWolfSlipTurnInit(int param_0) {
     if (!commonProcInitNotSameProc(PROC_WOLF_SLIP_TURN)) {
         return 0;
@@ -3633,7 +3514,6 @@ int daAlink_c::procWolfSlipTurnInit(int param_0) {
     return 1;
 }
 
-/* 8012F9C0-8012FB18 12A300 0158+00 1/0 0/0 0/0 .text            procWolfSlipTurn__9daAlink_cFv */
 int daAlink_c::procWolfSlipTurn() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     field_0x2f99 = 5;
@@ -3662,7 +3542,6 @@ int daAlink_c::procWolfSlipTurn() {
     return 1;
 }
 
-/* 8012FB18-8012FBB4 12A458 009C+00 1/1 0/0 0/0 .text procWolfSlipTurnLandInit__9daAlink_cFv */
 int daAlink_c::procWolfSlipTurnLandInit() {
     commonProcInit(PROC_WOLF_SLIP_TURN_LAND);
 
@@ -3679,8 +3558,6 @@ int daAlink_c::procWolfSlipTurnLandInit() {
     return 1;
 }
 
-/* 8012FBB4-8012FC38 12A4F4 0084+00 1/0 0/0 0/0 .text            procWolfSlipTurnLand__9daAlink_cFv
- */
 int daAlink_c::procWolfSlipTurnLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3695,7 +3572,6 @@ int daAlink_c::procWolfSlipTurnLand() {
     return 1;
 }
 
-/* 8012FC38-8012FD2C 12A578 00F4+00 2/2 0/0 0/0 .text procWolfSlideReadyInit__9daAlink_cFsi */
 int daAlink_c::procWolfSlideReadyInit(s16 i_angle, int param_1) {
     commonProcInit(PROC_WOLF_SLIDE_READY);
     field_0x3090 = 8;
@@ -3713,7 +3589,6 @@ int daAlink_c::procWolfSlideReadyInit(s16 i_angle, int param_1) {
     return 1;
 }
 
-/* 8012FD2C-8012FE80 12A66C 0154+00 1/0 0/0 0/0 .text            procWolfSlideReady__9daAlink_cFv */
 int daAlink_c::procWolfSlideReady() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     field_0x2f99 = 5;
@@ -3745,7 +3620,6 @@ int daAlink_c::procWolfSlideReady() {
     return 1;
 }
 
-/* 8012FE80-8012FFA4 12A7C0 0124+00 2/2 0/0 0/0 .text            procWolfSlideInit__9daAlink_cFsi */
 int daAlink_c::procWolfSlideInit(s16 i_angle, int param_1) {
     if (cLib_distanceAngleS(i_angle, shape_angle.y) < 0x3800 && !param_1) {
         return procWolfSlideReadyInit(i_angle, 1);
@@ -3769,7 +3643,6 @@ int daAlink_c::procWolfSlideInit(s16 i_angle, int param_1) {
     return 1;
 }
 
-/* 8012FFA4-801300D4 12A8E4 0130+00 1/0 0/0 0/0 .text            procWolfSlide__9daAlink_cFv */
 int daAlink_c::procWolfSlide() {
     cM3dGPla slide_poly;
 
@@ -3794,8 +3667,6 @@ int daAlink_c::procWolfSlide() {
     return 1;
 }
 
-/* 801300D4-80130138 12AA14 0064+00 1/1 0/0 0/0 .text            procWolfSlideLandInit__9daAlink_cFv
- */
 int daAlink_c::procWolfSlideLandInit() {
     commonProcInit(PROC_WOLF_SLIDE_LAND);
     setSingleAnimeWolfParam(WANM_SLIDE_BACKWARD_END, &daAlinkHIO_wlSlide_c0::m.mLandingAnm);
@@ -3805,7 +3676,6 @@ int daAlink_c::procWolfSlideLandInit() {
     return 1;
 }
 
-/* 80130138-801301E4 12AA78 00AC+00 1/0 0/0 0/0 .text            procWolfSlideLand__9daAlink_cFv */
 int daAlink_c::procWolfSlideLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3826,8 +3696,6 @@ int daAlink_c::procWolfSlideLand() {
     return 1;
 }
 
-/* 801301E4-80130268 12AB24 0084+00 3/3 0/0 0/0 .text            procWolfWaitSlipInit__9daAlink_cFv
- */
 int daAlink_c::procWolfWaitSlipInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_WAIT_SLIP)) {
         return 0;
@@ -3843,7 +3711,6 @@ int daAlink_c::procWolfWaitSlipInit() {
     return 1;
 }
 
-/* 80130268-80130440 12ABA8 01D8+00 1/0 0/0 0/0 .text            procWolfWaitSlip__9daAlink_cFv */
 int daAlink_c::procWolfWaitSlip() {
     f32 var_f31 = mNormalSpeed;
     mNormalSpeed = 0.0f;
@@ -3889,7 +3756,6 @@ int daAlink_c::procWolfWaitSlip() {
     return 1;
 }
 
-/* 80130440-801304D4 12AD80 0094+00 2/2 0/0 0/0 .text procWolfSlopeStartInit__9daAlink_cFi */
 int daAlink_c::procWolfSlopeStartInit(int param_0) {
     commonProcInit(PROC_WOLF_SLOPE_START);
     setSingleAnimeWolfParam(WANM_SLIDE_W, &daAlinkHIO_wlSlide_c0::m.mSlipDownRecoveryAnm);
@@ -3904,7 +3770,6 @@ int daAlink_c::procWolfSlopeStartInit(int param_0) {
     return 1;
 }
 
-/* 801304D4-8013056C 12AE14 0098+00 1/0 0/0 0/0 .text            procWolfSlopeStart__9daAlink_cFv */
 int daAlink_c::procWolfSlopeStart() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -3921,7 +3786,6 @@ int daAlink_c::procWolfSlopeStart() {
     return 1;
 }
 
-/* 8013056C-80130580 12AEAC 0014+00 1/1 0/0 0/0 .text daAlink_searchGoldWolf__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_NPC_GWOLF) {
         return i_actor;
@@ -3930,7 +3794,6 @@ static fopAc_ac_c* daAlink_searchGoldWolf(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 80130580-80130654 12AEC0 00D4+00 1/1 0/0 0/0 .text daAlink_searchWolfHowl__FP10fopAc_ac_cPv */
 static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) {
     s16 actor_name = fopAcM_GetName(i_actor);
     daAlink_c* player_p = daAlink_getAlinkActorClass();
@@ -3947,8 +3810,6 @@ static void* daAlink_searchWolfHowl(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80130654-80130700 12AF94 00AC+00 1/1 0/0 0/0 .text            setWolfHowlNotHappen__9daAlink_cFi
- */
 void daAlink_c::setWolfHowlNotHappen(int param_0) {
     mMsgClassID = -1;
 
@@ -3970,8 +3831,6 @@ void daAlink_c::setWolfHowlNotHappen(int param_0) {
     }
 }
 
-/* 80130700-80130BC4 12B040 04C4+00 1/1 0/0 0/0 .text            procWolfHowlDemoInit__9daAlink_cFv
- */
 int daAlink_c::procWolfHowlDemoInit() {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
         return 0;
@@ -4101,7 +3960,6 @@ int daAlink_c::procWolfHowlDemoInit() {
     return 1;
 }
 
-/* 80130BC4-801312C8 12B504 0704+00 1/0 0/0 0/0 .text            procWolfHowlDemo__9daAlink_cFv */
 int daAlink_c::procWolfHowlDemo() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     daNpc_GWolf_c* gwolf_p = (daNpc_GWolf_c*)field_0x280c.getActor();
@@ -4292,14 +4150,11 @@ int daAlink_c::procWolfHowlDemo() {
     return 1;
 }
 
-/* 80131408-80131450 12BD48 0048+00 1/0 0/0 0/0 .text            checkWolfRope__9daAlink_cFv */
 BOOL daAlink_c::checkWolfRope() {
     return checkModeFlg(0x20000) && field_0x280c.getActor() != NULL &&
            fopAcM_GetName(field_0x280c.getActor()) == PROC_Obj_Crope;
 }
 
-/* 80131450-80131628 12BD90 01D8+00 2/2 0/0 0/0 .text
- * checkWolfRopeHit__9daAlink_cCFP12dCcD_GObjInfPC4cXyzi        */
 fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const* param_1,
                                         int param_2) const {
     daObjCrope_c* rope_p = (daObjCrope_c*)i_collider->GetCoHitAc();
@@ -4330,8 +4185,6 @@ fopAc_ac_c* daAlink_c::checkWolfRopeHit(dCcD_GObjInf* i_collider, cXyz const* pa
     return NULL;
 }
 
-/* 80131628-801316A4 12BF68 007C+00 2/2 0/0 0/0 .text            checkWolfRopeJumpHang__9daAlink_cFv
- */
 int daAlink_c::checkWolfRopeJumpHang() {
     fopAc_ac_c* hit_actor = checkWolfRopeHit(&field_0x850[0], &current.pos, TRUE);
     if (hit_actor == NULL) {
@@ -4346,8 +4199,6 @@ int daAlink_c::checkWolfRopeJumpHang() {
     return 0;
 }
 
-/* 801316A4-80131718 12BFE4 0074+00 1/1 0/0 0/0 .text            getWolfRopeMoveSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getWolfRopeMoveSpeed() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     f32 frame = frameCtrl->getFrame();
@@ -4359,7 +4210,6 @@ f32 daAlink_c::getWolfRopeMoveSpeed() {
     return daAlinkHIO_wlRope_c0::m.mMovementRate * frameCtrl->getRate() * cM_fsin(0.23271057f * frame);
 }
 
-/* 80131718-801319F0 12C058 02D8+00 6/6 0/0 0/0 .text            setWolfRopePosY__9daAlink_cFv */
 int daAlink_c::setWolfRopePosY() {
     daObjCrope_c* temp_r3 = (daObjCrope_c*)field_0x280c.getActor();
     cXyz* temp_r28 = temp_r3->getRopeStartPos();
@@ -4396,7 +4246,6 @@ int daAlink_c::setWolfRopePosY() {
     return 0;
 }
 
-/* 801319F0-80131A6C 12C330 007C+00 5/5 0/0 0/0 .text initWolfRopeShapeAngle__9daAlink_cFv */
 s16 daAlink_c::initWolfRopeShapeAngle() {
     fopAc_ac_c* actor = field_0x280c.getActor();
     int a = abs((s16)(actor->shape_angle.y - shape_angle.y));
@@ -4413,7 +4262,6 @@ s16 daAlink_c::initWolfRopeShapeAngle() {
     return angle;
 }
 
-/* 80131A6C-80131AFC 12C3AC 0090+00 5/5 0/0 0/0 .text            wolfRopeSwingInc__9daAlink_cFf */
 void daAlink_c::wolfRopeSwingInc(f32 param_0) {
     field_0x3478 += param_0;
 
@@ -4425,7 +4273,6 @@ void daAlink_c::wolfRopeSwingInc(f32 param_0) {
     mDoAud_seStart(Z2SE_FN_ROPE_CREAK_ADD, &current.pos, var_r6, mVoiceReverbIntensity);
 }
 
-/* 80131AFC-80131C00 12C43C 0104+00 8/8 0/0 0/0 .text            setWolfRopeOffsetY__9daAlink_cFi */
 void daAlink_c::setWolfRopeOffsetY(int param_0) {
     if (param_0) {
         field_0x3478 = 0.0f;
@@ -4448,8 +4295,6 @@ void daAlink_c::setWolfRopeOffsetY(int param_0) {
     }
 }
 
-/* 80131C00-80131C74 12C540 0074+00 2/2 0/0 0/0 .text            getDirectionRopeMove__9daAlink_cCFv
- */
 int daAlink_c::getDirectionRopeMove() const {
     s16 angle = field_0x2fe2 - shape_angle.y;
 
@@ -4468,8 +4313,6 @@ int daAlink_c::getDirectionRopeMove() const {
     return DIR_FORWARD;
 }
 
-/* 80131C74-80131DA0 12C5B4 012C+00 5/5 0/0 0/0 .text            procWolfRopeMoveInit__9daAlink_cFii
- */
 int daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) {
     daObjCrope_c* rope_p = (daObjCrope_c*)field_0x280c.getActor();
     commonProcInit(PROC_WOLF_ROPE_MOVE);
@@ -4501,7 +4344,6 @@ int daAlink_c::procWolfRopeMoveInit(int param_0, int param_1) {
     return 1;
 }
 
-/* 80131DA0-80132738 12C6E0 0998+00 1/0 0/0 0/0 .text            procWolfRopeMove__9daAlink_cFv */
 int daAlink_c::procWolfRopeMove() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     daObjCrope_c* temp_r29 = (daObjCrope_c*)field_0x280c.getActor();
@@ -4665,8 +4507,6 @@ int daAlink_c::procWolfRopeMove() {
     return 1;
 }
 
-/* 80132738-80132914 12D078 01DC+00 5/5 0/0 0/0 .text            procWolfRopeHangInit__9daAlink_cFi
- */
 int daAlink_c::procWolfRopeHangInit(int param_0) {
     daObjCrope_c* rope_p = (daObjCrope_c*)field_0x280c.getActor();
     commonProcInit(PROC_WOLF_ROPE_HANG);
@@ -4721,7 +4561,6 @@ int daAlink_c::procWolfRopeHangInit(int param_0) {
     return 1;
 }
 
-/* 80132914-80132D68 12D254 0454+00 1/0 0/0 0/0 .text            procWolfRopeHang__9daAlink_cFv */
 int daAlink_c::procWolfRopeHang() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     daObjCrope_c* temp_r3 = (daObjCrope_c*)field_0x280c.getActor();
@@ -4840,8 +4679,6 @@ int daAlink_c::procWolfRopeHang() {
     return 1;
 }
 
-/* 80132D68-80132E88 12D6A8 0120+00 1/1 0/0 0/0 .text            procWolfRopeTurnInit__9daAlink_cFv
- */
 int daAlink_c::procWolfRopeTurnInit() {
     commonProcInit(PROC_WOLF_ROPE_TURN);
     setSingleAnimeWolfParam(WANM_ROPE_TURN, &daAlinkHIO_wlRope_c0::m.mFlipAnm);
@@ -4861,7 +4698,6 @@ int daAlink_c::procWolfRopeTurnInit() {
     return 1;
 }
 
-/* 80132E88-80133054 12D7C8 01CC+00 1/0 0/0 0/0 .text            procWolfRopeTurn__9daAlink_cFv */
 int daAlink_c::procWolfRopeTurn() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     daObjCrope_c* temp_r29 = (daObjCrope_c*)field_0x280c.getActor();
@@ -4906,7 +4742,6 @@ int daAlink_c::procWolfRopeTurn() {
     return 1;
 }
 
-/* 80133054-80133164 12D994 0110+00 1/1 0/0 0/0 .text procWolfRopeStaggerInit__9daAlink_cFi */
 int daAlink_c::procWolfRopeStaggerInit(int param_0) {
     commonProcInit(PROC_WOLF_ROPE_STAGGER);
 
@@ -4936,8 +4771,6 @@ int daAlink_c::procWolfRopeStaggerInit(int param_0) {
     return 1;
 }
 
-/* 80133164-8013384C 12DAA4 06E8+00 1/0 0/0 0/0 .text            procWolfRopeStagger__9daAlink_cFv
- */
 int daAlink_c::procWolfRopeStagger() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
     daObjCrope_c* temp_r3 = (daObjCrope_c*)field_0x280c.getActor();
@@ -5020,8 +4853,6 @@ int daAlink_c::procWolfRopeStagger() {
     return 1;
 }
 
-/* 8013384C-80133930 12E18C 00E4+00 1/1 0/0 0/0 .text procWolfRopeSubjectivityInit__9daAlink_cFv
- */
 int daAlink_c::procWolfRopeSubjectivityInit() {
     commonProcInit(PROC_WOLF_ROPE_SUBJECTIVITY);
 
@@ -5048,7 +4879,6 @@ int daAlink_c::procWolfRopeSubjectivityInit() {
     return 1;
 }
 
-/* 80133930-80133D6C 12E270 043C+00 1/0 0/0 0/0 .text procWolfRopeSubjectivity__9daAlink_cFv */
 int daAlink_c::procWolfRopeSubjectivity() {
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
     daObjCrope_c* temp_r3 = (daObjCrope_c*)field_0x280c.getActor();
@@ -5095,8 +4925,6 @@ int daAlink_c::procWolfRopeSubjectivity() {
     return 1;
 }
 
-/* 80133D6C-80133EF0 12E6AC 0184+00 0/0 0/0 1/1 .text            getWolfTagJumpTime__9daAlink_cCFv
- */
 int daAlink_c::getWolfTagJumpTime() const {
     int time;
     if (mProcID == PROC_WOLF_TAG_JUMP) {
@@ -5116,7 +4944,6 @@ int daAlink_c::getWolfTagJumpTime() const {
     return time;
 }
 
-/* 80133EF0-80134000 12E830 0110+00 3/3 1/1 1/1 .text checkMidnaLockJumpPoint__9daAlink_cCFv */
 const cXyz* daAlink_c::checkMidnaLockJumpPoint() const {
     if ((!mLinkAcch.ChkGroundHit() && mProcID != PROC_WOLF_TAG_JUMP) || checkMidnaUseAbility() ||
         getMidnaActor()->eventInfo.checkCommandTalk())
@@ -5147,8 +4974,6 @@ const cXyz* daAlink_c::checkMidnaLockJumpPoint() const {
     return NULL;
 }
 
-/* 80134000-80134838 12E940 0838+00 4/4 0/0 0/0 .text
- * procWolfTagJumpInit__9daAlink_cFP10fopAc_ac_c                */
 int daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_WOLF_TAG_JUMP);
 
@@ -5214,7 +5039,6 @@ int daAlink_c::procWolfTagJumpInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 80134838-80134DB8 12F178 0580+00 1/0 0/0 0/0 .text            procWolfTagJump__9daAlink_cFv */
 int daAlink_c::procWolfTagJump() {
     daTagWljump_c* temp_r29 = (daTagWljump_c*)field_0x280c.getActor();
     daPy_frameCtrl_c* temp_r28 = &mUnderFrameCtrl[0];
@@ -5308,8 +5132,6 @@ int daAlink_c::procWolfTagJump() {
     return 1;
 }
 
-/* 80134DB8-80134EBC 12F6F8 0104+00 1/1 0/0 0/0 .text
- * procWolfTagJumpLandInit__9daAlink_cFP10fopAc_ac_c            */
 int daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) {
     commonProcInit(PROC_WOLF_TAG_JUMP_LAND);
     setSingleAnimeWolfParam(WANM_ATTACK_A_END_FRONT, &daAlinkHIO_wlPoint_c0::m.mTagLandingAnm);
@@ -5335,8 +5157,6 @@ int daAlink_c::procWolfTagJumpLandInit(fopAc_ac_c* param_0) {
     return 1;
 }
 
-/* 80134EBC-80135050 12F7FC 0194+00 1/0 0/0 0/0 .text            procWolfTagJumpLand__9daAlink_cFv
- */
 int daAlink_c::procWolfTagJumpLand() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -5375,7 +5195,6 @@ int daAlink_c::procWolfTagJumpLand() {
     return 1;
 }
 
-/* 80135050-801350A4 12F990 0054+00 1/1 0/0 0/0 .text daAlink_searchGiant__FP10fopAc_ac_cPv */
 static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) {
     cXyz* gnd_chk_pos = static_cast<cXyz*>(i_data);
 
@@ -5388,7 +5207,6 @@ static fopAc_ac_c* daAlink_searchGiant(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 801350A4-80135160 12F9E4 00BC+00 1/1 0/0 0/0 .text daAlink_searchGiantTalk__FP10fopAc_ac_cPv */
 static void* daAlink_searchGiantTalk(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA &&
         static_cast<daObj_Sekizoa_c*>(i_actor)->getType() == 0)
@@ -5399,7 +5217,6 @@ static void* daAlink_searchGiantTalk(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80135160-801351F8 12FAA0 0098+00 1/1 0/0 0/0 .text procWolfGiantPuzzleInit__9daAlink_cFv */
 int daAlink_c::procWolfGiantPuzzleInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_GIANT_PUZZLE)) {
         return 0;
@@ -5418,8 +5235,6 @@ int daAlink_c::procWolfGiantPuzzleInit() {
     return 1;
 }
 
-/* 801351F8-80135458 12FB38 0260+00 1/0 0/0 0/0 .text            procWolfGiantPuzzle__9daAlink_cFv
- */
 int daAlink_c::procWolfGiantPuzzle() {
     if (mSpecialMode == 0) {
         return checkNextActionWolf(0);
@@ -5479,7 +5294,6 @@ int daAlink_c::procWolfGiantPuzzle() {
     return 1;
 }
 
-/* 80135458-801354C8 12FD98 0070+00 2/2 0/0 0/0 .text            setWolfHangGroundY__9daAlink_cFv */
 void daAlink_c::setWolfHangGroundY() {
     cXyz pos;
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(0), &pos);
@@ -5488,8 +5302,6 @@ void daAlink_c::setWolfHangGroundY() {
     field_0x33d8 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
 }
 
-/* 801354C8-801355EC 12FE08 0124+00 2/2 0/0 0/0 .text            changeWolfHangEndProc__9daAlink_cFv
- */
 int daAlink_c::changeWolfHangEndProc() {
     setWolfHangGroundY();
 
@@ -5518,8 +5330,6 @@ int daAlink_c::changeWolfHangEndProc() {
     return 0;
 }
 
-/* 801355EC-80135668 12FF2C 007C+00 2/2 0/0 0/0 .text            procWolfHangReadyInit__9daAlink_cFv
- */
 int daAlink_c::procWolfHangReadyInit() {
     commonProcInit(PROC_WOLF_HANG_READY);
     setSingleAnimeWolf(WANM_VJMP_START, daAlinkHIO_wlWallHang_c0::m.mPreGrabJumpAnm.mSpeed,
@@ -5535,7 +5345,6 @@ int daAlink_c::procWolfHangReadyInit() {
     return 1;
 }
 
-/* 80135668-801356F0 12FFA8 0088+00 1/0 0/0 0/0 .text            procWolfHangReady__9daAlink_cFv */
 int daAlink_c::procWolfHangReady() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -5554,7 +5363,6 @@ int daAlink_c::procWolfHangReady() {
     return 1;
 }
 
-/* 801356F0-80135AF4 130030 0404+00 3/3 0/0 0/0 .text procWolfHangWallCatchInit__9daAlink_cFi */
 int daAlink_c::procWolfHangWallCatchInit(int param_0) {
     cXyz sp18;
 
@@ -5626,8 +5434,6 @@ int daAlink_c::procWolfHangWallCatchInit(int param_0) {
     return 1;
 }
 
-/* 80135AF4-80135CD8 130434 01E4+00 1/0 0/0 0/0 .text            procWolfHangWallCatch__9daAlink_cFv
- */
 int daAlink_c::procWolfHangWallCatch() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -5678,8 +5484,6 @@ int daAlink_c::procWolfHangWallCatch() {
     return 1;
 }
 
-/* 80135CD8-80135F00 130618 0228+00 1/1 0/0 0/0 .text
- * procWolfHangFallStartInit__9daAlink_cFP8cM3dGPla             */
 int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) {
     if (mProcID == PROC_WOLF_HANG_WALL_CATCH || checkNoResetFlg1(FLG1_UNK_20)) {
         return 0;
@@ -5730,8 +5534,6 @@ int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) {
     return 1;
 }
 
-/* 80135F00-80136064 130840 0164+00 1/0 0/0 0/0 .text            procWolfHangFallStart__9daAlink_cFv
- */
 int daAlink_c::procWolfHangFallStart() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -5762,7 +5564,6 @@ int daAlink_c::procWolfHangFallStart() {
     return 1;
 }
 
-/* 80136064-801360EC 1309A4 0088+00 1/1 0/0 0/0 .text            setWolfHeadDamage__9daAlink_cFv */
 void daAlink_c::setWolfHeadDamage() {
     setUpperAnimeParam(0x2A7, UPPER_2, &daAlinkHIO_wlDamage_c0::m.mRunningAnm);
     seStartOnlyReverb(Z2SE_AL_DAMAGE_NORMAL);
@@ -5771,8 +5572,6 @@ void daAlink_c::setWolfHeadDamage() {
     voiceStart(Z2SE_WL_V_DAMAGE);
 }
 
-/* 801360EC-80136508 130A2C 041C+00 1/1 0/0 0/0 .text
- * procWolfDamageInit__9daAlink_cFP12dCcD_GObjInf               */
 int daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) {
     commonProcInit(PROC_WOLF_DAMAGE);
 
@@ -5837,7 +5636,6 @@ int daAlink_c::procWolfDamageInit(dCcD_GObjInf* param_0) {
     return 1;
 }
 
-/* 80136508-80136624 130E48 011C+00 1/0 0/0 0/0 .text            procWolfDamage__9daAlink_cFv */
 int daAlink_c::procWolfDamage() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -5869,8 +5667,6 @@ int daAlink_c::procWolfDamage() {
     return 1;
 }
 
-/* 80136624-801369E4 130F64 03C0+00 2/2 0/0 0/0 .text procWolfLargeDamageUpInit__9daAlink_cFiiss
- */
 int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2, s16 param_3) {
     if (!commonProcInitNotSameProc(PROC_WOLF_LARGE_DAMAGE_UP)) {
         return 0;
@@ -5996,8 +5792,6 @@ int daAlink_c::procWolfLargeDamageUpInit(int param_0, int param_1, s16 param_2,
     return 1;
 }
 
-/* 801369E4-80136C18 131324 0234+00 1/0 0/0 0/0 .text            procWolfLargeDamageUp__9daAlink_cFv
- */
 int daAlink_c::procWolfLargeDamageUp() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
     mProcVar4.field_0x3010 = 0;
@@ -6063,7 +5857,6 @@ int daAlink_c::procWolfLargeDamageUp() {
     return 1;
 }
 
-/* 80136C18-80136DE4 131558 01CC+00 1/1 0/0 0/0 .text procWolfLandDamageInit__9daAlink_cFi */
 int daAlink_c::procWolfLandDamageInit(int param_0) {
     f32 var_f31;
 
@@ -6108,7 +5901,6 @@ int daAlink_c::procWolfLandDamageInit(int param_0) {
     return 1;
 }
 
-/* 80136DE4-80136EC4 131724 00E0+00 1/0 0/0 0/0 .text            procWolfLandDamage__9daAlink_cFv */
 int daAlink_c::procWolfLandDamage() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -6131,7 +5923,6 @@ int daAlink_c::procWolfLandDamage() {
     return 1;
 }
 
-/* 80136EC4-80136F54 131804 0090+00 2/2 0/0 0/0 .text setWolfScreamWaitAnime__9daAlink_cFv */
 void daAlink_c::setWolfScreamWaitAnime() {
     setSingleAnimeWolfBase(WANM_WAIT_STUNNED);
     setFaceBasicTexture(FTANM_UNK_91);
@@ -6141,7 +5932,6 @@ void daAlink_c::setWolfScreamWaitAnime() {
     dComIfGp_getVibration().StartQuake(5, 1, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80136F54-80136FF8 131894 00A4+00 1/1 0/0 0/0 .text procWolfScreamWaitInit__9daAlink_cFv */
 int daAlink_c::procWolfScreamWaitInit() {
     commonProcInit(PROC_WOLF_SCREAM_WAIT);
     if (checkEndResetFlg1(ERFLG1_UNK_2)) {
@@ -6159,7 +5949,6 @@ int daAlink_c::procWolfScreamWaitInit() {
     return 1;
 }
 
-/* 80136FF8-801370E4 131938 00EC+00 1/0 0/0 0/0 .text            procWolfScreamWait__9daAlink_cFv */
 int daAlink_c::procWolfScreamWait() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -6187,7 +5976,6 @@ int daAlink_c::procWolfScreamWait() {
     return 1;
 }
 
-/* 801370E4-8013712C 131A24 0048+00 3/3 0/0 0/0 .text getWolfLieMoveAnmSpeed__9daAlink_cFv */
 f32 daAlink_c::getWolfLieMoveAnmSpeed() {
     if (field_0x3198 != 0) {
         return getAnmSpeedStickRate(0.5f, 2.0f);
@@ -6197,8 +5985,6 @@ f32 daAlink_c::getWolfLieMoveAnmSpeed() {
                                 daAlinkHIO_wlLie_c0::m.mProneMaxAnmSpeed);
 }
 
-/* 8013712C-801371A0 131A6C 0074+00 3/3 0/0 0/0 .text            getWolfLieMoveSpeed__9daAlink_cFv
- */
 f32 daAlink_c::getWolfLieMoveSpeed() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -6213,7 +5999,6 @@ f32 daAlink_c::getWolfLieMoveSpeed() {
            cM_fsin(var_f1 * 0.20943952f);
 }
 
-/* 801371A0-801371FC 131AE0 005C+00 0/0 0/0 2/2 .text checkMidnaDisappearMode__9daAlink_cCFv */
 BOOL daAlink_c::checkMidnaDisappearMode() const {
     return mProcID == PROC_WOLF_DIG_THROUGH ||
            (checkWolf() && dComIfGp_checkPlayerStatus0(0, 0x8000000) &&
@@ -6221,8 +6006,6 @@ BOOL daAlink_c::checkMidnaDisappearMode() const {
             (mTargetedActor == NULL || !(mTargetedActor->attention_info.flags & fopAc_AttnFlag_UNK_0x800000)));
 }
 
-/* 801371FC-801372B4 131B3C 00B8+00 3/3 0/0 0/0 .text            checkWolfLieContinue__9daAlink_cFi
- */
 BOOL daAlink_c::checkWolfLieContinue(int param_0) {
     cM3dGPla slide_poly;
 
@@ -6238,7 +6021,6 @@ BOOL daAlink_c::checkWolfLieContinue(int param_0) {
     return false;
 }
 
-/* 801372B4-80137330 131BF4 007C+00 3/3 0/0 0/0 .text checkNextActionWolfFromLie__9daAlink_cFv */
 int daAlink_c::checkNextActionWolfFromLie() {
     if (checkNextActionWolf(0)) {
         if (field_0x2f8c == 1 || field_0x2f8c == 2 || field_0x2f8c == 3) {
@@ -6250,8 +6032,6 @@ int daAlink_c::checkNextActionWolfFromLie() {
     return false;
 }
 
-/* 80137330-801373F8 131C70 00C8+00 3/3 0/0 0/0 .text            setWolfLieMoveVoice__9daAlink_cFi
- */
 void daAlink_c::setWolfLieMoveVoice(int param_0) {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -6267,7 +6047,6 @@ void daAlink_c::setWolfLieMoveVoice(int param_0) {
     }
 }
 
-/* 801373F8-80137420 131D38 0028+00 2/2 0/0 0/0 .text            checkWolfLieCode__9daAlink_cFv */
 bool daAlink_c::checkWolfLieCode() {
     if (mLinkAcch.ChkGroundHit() && mGndPolySpecialCode == 4) {
         return true;
@@ -6276,8 +6055,6 @@ bool daAlink_c::checkWolfLieCode() {
     return false;
 }
 
-/* 80137420-8013753C 131D60 011C+00 2/2 0/0 0/0 .text            procWolfLieStartInit__9daAlink_cFi
- */
 int daAlink_c::procWolfLieStartInit(int param_0) {
     commonProcInit(PROC_WOLF_LIE_START);
     field_0x3588 = l_wolfBaseAnime;
@@ -6300,7 +6077,6 @@ int daAlink_c::procWolfLieStartInit(int param_0) {
     return 1;
 }
 
-/* 8013753C-80137634 131E7C 00F8+00 1/0 0/0 0/0 .text            procWolfLieStart__9daAlink_cFv */
 int daAlink_c::procWolfLieStart() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     decideCrawlDoStatus();
@@ -6326,8 +6102,6 @@ int daAlink_c::procWolfLieStart() {
     return 1;
 }
 
-/* 80137634-801377F0 131F74 01BC+00 5/5 0/0 0/0 .text            procWolfLieMoveInit__9daAlink_cFi
- */
 int daAlink_c::procWolfLieMoveInit(int param_0) {
     BOOL var_r30 = mProcID == PROC_TALK;
     BOOL var_r29 = checkUnderMove0BckNoArcWolf(WANM_CROUCH_WALK) == FALSE;
@@ -6384,7 +6158,6 @@ int daAlink_c::procWolfLieMoveInit(int param_0) {
     return 1;
 }
 
-/* 801377F0-80137C90 132130 04A0+00 1/0 0/0 0/0 .text            procWolfLieMove__9daAlink_cFv */
 int daAlink_c::procWolfLieMove() {
     daPy_frameCtrl_c* temp_r29 = &mUnderFrameCtrl[0];
 
@@ -6504,8 +6277,6 @@ int daAlink_c::procWolfLieMove() {
     return 1;
 }
 
-/* 80137C90-80137D4C 1325D0 00BC+00 1/1 0/0 0/0 .text procWolfLieAutoMoveInit__9daAlink_cFiP4cXyz
- */
 int daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) {
     BOOL var_r30 = dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 ? TRUE : FALSE;
     commonProcInit(PROC_WOLF_LIE_AUTO_MOVE);
@@ -6528,8 +6299,6 @@ int daAlink_c::procWolfLieAutoMoveInit(int param_0, cXyz* param_1) {
     return 1;
 }
 
-/* 80137D4C-80138000 13268C 02B4+00 1/0 0/0 0/0 .text            procWolfLieAutoMove__9daAlink_cFv
- */
 int daAlink_c::procWolfLieAutoMove() {
     field_0x2f99 = 0xD;
 
@@ -6617,7 +6386,6 @@ int daAlink_c::procWolfLieAutoMove() {
     return 1;
 }
 
-/* 80138000-80138188 132940 0188+00 2/2 0/0 0/0 .text setSpeedAndAngleSwimWolf__9daAlink_cFv */
 void daAlink_c::setSpeedAndAngleSwimWolf() {
     if (checkWolfDashMode()) {
         field_0x594 = daAlinkHIO_wlSwim_c0::m.mMaxSpeed;
@@ -6660,7 +6428,6 @@ void daAlink_c::setSpeedAndAngleSwimWolf() {
     }
 }
 
-/* 80138188-801381F8 132AC8 0070+00 2/2 0/0 0/0 .text getWolfSwimMoveAnmSpeed__9daAlink_cFv */
 f32 daAlink_c::getWolfSwimMoveAnmSpeed() {
     f32 anm_speed = fabsf(mNormalSpeed) / field_0x594;
     if (anm_speed > 1.0f) {
@@ -6680,7 +6447,6 @@ f32 daAlink_c::getWolfSwimMoveAnmSpeed() {
     return anm_speed;
 }
 
-/* 801381F8-801383D8 132B38 01E0+00 2/2 0/0 0/0 .text decideDoStatusSwimWolf__9daAlink_cFv */
 int daAlink_c::decideDoStatusSwimWolf() {
     setTalkStatus();
 
@@ -6723,7 +6489,6 @@ int daAlink_c::decideDoStatusSwimWolf() {
     return 0;
 }
 
-/* 801383D8-80138484 132D18 00AC+00 2/2 0/0 0/0 .text            procWolfSwimUpInit__9daAlink_cFv */
 int daAlink_c::procWolfSwimUpInit() {
     commonProcInit(PROC_WOLF_SWIM_UP);
     speed.y = 0.0f;
@@ -6739,7 +6504,6 @@ int daAlink_c::procWolfSwimUpInit() {
     return 1;
 }
 
-/* 80138484-8013852C 132DC4 00A8+00 1/0 0/0 0/0 .text            procWolfSwimUp__9daAlink_cFv */
 int daAlink_c::procWolfSwimUp() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
     setNormalSpeedF(0.0f, daAlinkHIO_wlSwim_c0::m.mDeceleration);
@@ -6757,8 +6521,6 @@ int daAlink_c::procWolfSwimUp() {
     return 1;
 }
 
-/* 8013852C-80138644 132E6C 0118+00 7/7 0/0 0/0 .text            procWolfSwimWaitInit__9daAlink_cFi
- */
 int daAlink_c::procWolfSwimWaitInit(int param_0) {
     f32 morf;
     if (mProcID == PROC_WOLF_SWIM_UP) {
@@ -6796,7 +6558,6 @@ int daAlink_c::procWolfSwimWaitInit(int param_0) {
     return 1;
 }
 
-/* 80138644-8013871C 132F84 00D8+00 1/0 0/0 0/0 .text            procWolfSwimWait__9daAlink_cFv */
 int daAlink_c::procWolfSwimWait() {
     if (mDemo.getDemoMode() == 6 || mDemo.getDemoMode() == 8) {
         setShapeAngleToTalkActor();
@@ -6827,8 +6588,6 @@ int daAlink_c::procWolfSwimWait() {
     return 1;
 }
 
-/* 8013871C-801387A0 13305C 0084+00 4/4 0/0 0/0 .text            procWolfSwimMoveInit__9daAlink_cFv
- */
 int daAlink_c::procWolfSwimMoveInit() {
     commonProcInit(PROC_WOLF_SWIM_MOVE);
     setSingleAnimeWolfBaseSpeed(WANM_SWIM, getWolfSwimMoveAnmSpeed(),
@@ -6843,7 +6602,6 @@ int daAlink_c::procWolfSwimMoveInit() {
     return 1;
 }
 
-/* 801387A0-8013890C 1330E0 016C+00 1/0 0/0 0/0 .text            procWolfSwimMove__9daAlink_cFv */
 int daAlink_c::procWolfSwimMove() {
     setSpeedAndAngleSwimWolf();
 
@@ -6884,7 +6642,6 @@ int daAlink_c::procWolfSwimMove() {
     return 1;
 }
 
-/* 8013890C-80138A18 13324C 010C+00 2/2 0/0 0/0 .text procWolfSwimEndWaitInit__9daAlink_cFi */
 int daAlink_c::procWolfSwimEndWaitInit(int param_0) {
     commonProcInit(PROC_WOLF_SWIM_END_WAIT);
     setSingleAnimeWolfParam(WANM_WAIT_SHAKE, &daAlinkHIO_wlSwim_c0::m.mWaterSplashIdleAnm);
@@ -6917,8 +6674,6 @@ int daAlink_c::procWolfSwimEndWaitInit(int param_0) {
     return 1;
 }
 
-/* 80138A18-80138B6C 133358 0154+00 1/0 0/0 0/0 .text            procWolfSwimEndWait__9daAlink_cFv
- */
 int daAlink_c::procWolfSwimEndWait() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     mDoMtx_multVecZero(mpLinkModel->getAnmMtx(3), &field_0x37c8);
@@ -6954,8 +6709,6 @@ int daAlink_c::procWolfSwimEndWait() {
     return 1;
 }
 
-/* 80138B6C-80138C04 1334AC 0098+00 1/0 0/0 0/0 .text
- * onWolfEnemyBiteAll__9daAlink_cFP10fopAc_ac_cQ29daPy_py_c9daPy_FLG2 */
 bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 param_1) {
     if (field_0x281c.getActor() != NULL) {
         return 0;
@@ -6977,14 +6730,11 @@ bool daAlink_c::onWolfEnemyBiteAll(fopAc_ac_c* param_0, daPy_py_c::daPy_FLG2 par
     return 1;
 }
 
-/* 80138C04-80138C44 133544 0040+00 4/4 0/0 0/0 .text            resetWolfEnemyBiteAll__9daAlink_cFv
- */
 void daAlink_c::resetWolfEnemyBiteAll() {
     field_0x281c.clearData();
     offNoResetFlg2(FLG2_UNK_58);
 }
 
-/* 80138C44-80138CB8 133584 0074+00 1/1 0/0 0/0 .text checkWolfEnemyThrowAction__9daAlink_cFv */
 void daAlink_c::checkWolfEnemyThrowAction() {
     daPy_frameCtrl_c* frameCtrl = &mUpperFrameCtrl[2];
 
@@ -6995,8 +6745,6 @@ void daAlink_c::checkWolfEnemyThrowAction() {
     }
 }
 
-/* 80138CB8-80138DC0 1335F8 0108+00 1/1 0/0 0/0 .text            setWolfLockDomeModel__9daAlink_cFv
- */
 void daAlink_c::setWolfLockDomeModel() {
     JKRHeap* prev_heap = setItemHeap();
 
@@ -7019,7 +6767,6 @@ void daAlink_c::setWolfLockDomeModel() {
     }
 }
 
-/* 80138DC0-80138F18 133700 0158+00 1/1 0/0 0/0 .text            setWolfBallModel__9daAlink_cFv */
 void daAlink_c::setWolfBallModel() {
     JKRHeap* prev_heap = setItemHeap();
 
@@ -7041,7 +6788,6 @@ void daAlink_c::setWolfBallModel() {
     mpHookSound->init(&mHeldItemRootPos, 1);
 }
 
-/* 80138F18-80139048 133858 0130+00 2/2 0/0 0/0 .text            resetWolfBallGrab__9daAlink_cFv */
 void daAlink_c::resetWolfBallGrab() {
     if (mEquipItem == 0x10A) {
         seStartOnlyReverb(Z2SE_OBJ_POU_SOUL_BREAK);
@@ -7058,7 +6804,6 @@ void daAlink_c::resetWolfBallGrab() {
     }
 }
 
-/* 80139048-8013911C 133988 00D4+00 1/1 0/0 0/0 .text            checkWolfLockData__9daAlink_cFv */
 void daAlink_c::checkWolfLockData() {
     for (int i = 0; i < 10; i++) {
         mWolfLockAcKeep[i].setActor();
@@ -7078,7 +6823,6 @@ void daAlink_c::checkWolfLockData() {
     }
 }
 
-/* 8013911C-8013916C 133A5C 0050+00 1/0 0/0 0/0 .text checkWolfLock__9daAlink_cCFP10fopAc_ac_c */
 BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
     fpc_ProcID actor_id = fopAcM_GetID(i_actor);
 
@@ -7090,7 +6834,6 @@ BOOL daAlink_c::checkWolfLock(fopAc_ac_c* i_actor) const {
     return false;
 }
 
-/* 8013916C-801391DC 133AAC 0070+00 1/0 0/0 0/0 .text cancelWolfLock__9daAlink_cFP10fopAc_ac_c */
 bool daAlink_c::cancelWolfLock(fopAc_ac_c* i_actor) {
     fpc_ProcID actor_id = fopAcM_GetID(i_actor);
 
@@ -7103,14 +6846,10 @@ bool daAlink_c::cancelWolfLock(fopAc_ac_c* i_actor) {
     return false;
 }
 
-/* 801391DC-801391E4 133B1C 0008+00 0/0 0/0 1/1 .text            getWolfLockActorEnd__9daAlink_cFv
- */
 fopAc_ac_c* daAlink_c::getWolfLockActorEnd() {
     return mWolfLockAcKeep[0].getActor();
 }
 
-/* 801391E4-801392A8 133B24 00C4+00 1/1 0/0 0/0 .text
- * searchWolfLockEnemy__9daAlink_cFP10fopAc_ac_cPv              */
 void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) {
     fopAc_ac_c** lock_actor_pp = (fopAc_ac_c**)i_data;
 
@@ -7133,14 +6872,11 @@ void daAlink_c::searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) {
     }
 }
 
-/* 801392A8-801392E4 133BE8 003C+00 1/1 0/0 0/0 .text
- * daAlink_searchWolfLockEnemy__FP10fopAc_ac_cPv                */
 static int daAlink_searchWolfLockEnemy(fopAc_ac_c* i_actor, void* i_data) {
     daAlink_getAlinkActorClass()->searchWolfLockEnemy(i_actor, i_data);
     return 0;
 }
 
-/* 801392E4-801393A4 133C24 00C0+00 1/1 0/0 0/0 .text            checkWolfComboCnt__9daAlink_cFv */
 void daAlink_c::checkWolfComboCnt() {
     if (!dComIfGp_checkPlayerStatus1(0, 0x1000000)) {
         if (mComboCutCount == 2 && checkAttentionLock() && mAtCyl.ChkAtHit()) {
@@ -7155,8 +6891,6 @@ void daAlink_c::checkWolfComboCnt() {
     }
 }
 
-/* 801393A4-801395B4 133CE4 0210+00 4/4 0/0 0/0 .text            checkWolfAttackAction__9daAlink_cFv
- */
 BOOL daAlink_c::checkWolfAttackAction() {
     static int const normalType0[] = {3, 3, 3, 0, 0};
     static int const normalType1[] = {0, 0, 0, 3, 3};
@@ -7210,15 +6944,11 @@ BOOL daAlink_c::checkWolfAttackAction() {
     }
 }
 
-/* 801395B4-80139600 133EF4 004C+00 2/2 0/0 0/0 .text
- * setWolfEnemyThrowUpperAnime__9daAlink_cFQ29daAlink_c12daAlink_WANMf */
 void daAlink_c::setWolfEnemyThrowUpperAnime(daAlink_c::daAlink_WANM i_anmID, f32 param_1) {
     setUpperAnime(i_anmID == WANM_FLING_LEFT ? (u16)0x2BD : (u16)0x2BE, UPPER_2,
                   daAlinkHIO_wlAtBite_c0::m.mEnemyBiteThrowAnmSpeed, param_1, -1, -1.0f);
 }
 
-/* 80139600-801396F8 133F40 00F8+00 2/2 0/0 0/0 .text
- * setWolfEnemyHangBitePos__9daAlink_cFP13fopEn_enemy_c         */
 BOOL daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* i_enemy) {
     if (i_enemy != NULL) {
         cXyz old_pos = current.pos = i_enemy->getDownPos();
@@ -7238,18 +6968,13 @@ BOOL daAlink_c::setWolfEnemyHangBitePos(fopEn_enemy_c* i_enemy) {
     return 0;
 }
 
-/* ############################################################################################## */
-/* 804256EC-804256F8 05240C 000C+00 0/1 0/0 0/0 .bss             @50952 */
 /* #pragma push
 #pragma force_active on
 static u8 lit_50952[12];
 #pragma pop */
 
-/* 804256F8-80425708 052418 000C+04 1/2 0/0 0/0 .bss             l_wolfBiteHitMarkScale */
 static cXyz l_wolfBiteHitMarkScale(0.5f, 0.5f, 0.5f);
 
-/* 801396F8-801397A4 134038 00AC+00 1/1 0/0 0/0 .text
- * setWolfBiteDamage__9daAlink_cFP13fopEn_enemy_c               */
 void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* i_enemy) {
     i_enemy->onWolfBiteDamage();
 
@@ -7259,15 +6984,11 @@ void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* i_enemy) {
     dComIfGp_getVibration().StartShock(3, 31, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 801397A4-801398A8 1340E4 0104+00 1/1 0/0 0/0 .text checkWolfLockAttackChargeState__9daAlink_cFv
- */
 BOOL daAlink_c::checkWolfLockAttackChargeState() {
     return checkMidnaRide() && checkMidnaChargeAttack() && !daMidna_c::checkMidnaTired() &&
            daMidna_c::checkMidnaRealBody();
 }
 
-/* 801398A8-80139908 1341E8 0060+00 1/1 0/0 0/0 .text procWolfRollAttackChargeInit__9daAlink_cFv
- */
 int daAlink_c::procWolfRollAttackChargeInit() {
     commonProcInit(PROC_WOLF_ROLL_ATTACK_CHARGE);
     setSingleAnimeWolfBaseSpeed(WANM_CUT_TURN_CHARGE, 0.0f,
@@ -7276,7 +6997,6 @@ int daAlink_c::procWolfRollAttackChargeInit() {
     return 1;
 }
 
-/* 80139908-801399C4 134248 00BC+00 1/0 0/0 0/0 .text procWolfRollAttackCharge__9daAlink_cFv */
 int daAlink_c::procWolfRollAttackCharge() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -7296,7 +7016,6 @@ int daAlink_c::procWolfRollAttackCharge() {
     return 1;
 }
 
-/* 801399C4-80139A70 134304 00AC+00 1/1 0/0 0/0 .text procWolfRollAttackMoveInit__9daAlink_cFv */
 int daAlink_c::procWolfRollAttackMoveInit() {
     commonProcInit(PROC_WOLF_ROLL_ATTACK_MOVE);
     if (checkZeroSpeedF()) {
@@ -7313,7 +7032,6 @@ int daAlink_c::procWolfRollAttackMoveInit() {
     return 1;
 }
 
-/* 80139A70-80139DE0 1343B0 0370+00 1/0 0/0 0/0 .text procWolfRollAttackMove__9daAlink_cFv */
 int daAlink_c::procWolfRollAttackMove() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -7423,7 +7141,6 @@ int daAlink_c::procWolfRollAttackMove() {
     return 1;
 }
 
-/* 80139DE0-8013A4F8 134720 0718+00 5/5 0/0 0/0 .text procWolfJumpAttackInit__9daAlink_cFi */
 int daAlink_c::procWolfJumpAttackInit(int param_0) {
     commonProcInit(PROC_WOLF_JUMP_ATTACK);
     mProcVar0.field_0x3008 = 0;
@@ -7554,7 +7271,6 @@ int daAlink_c::procWolfJumpAttackInit(int param_0) {
     return 1;
 }
 
-/* 8013A4F8-8013A7EC 134E38 02F4+00 1/0 0/0 0/0 .text            procWolfJumpAttack__9daAlink_cFv */
 int daAlink_c::procWolfJumpAttack() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -7636,7 +7352,6 @@ int daAlink_c::procWolfJumpAttack() {
     return 1;
 }
 
-/* 8013A7EC-8013A8A0 13512C 00B4+00 2/2 0/0 0/0 .text procWolfJumpAttackKickInit__9daAlink_cFv */
 int daAlink_c::procWolfJumpAttackKickInit() {
     commonProcInit(PROC_WOLF_JUMP_AT_KICK);
     setSingleAnimeWolfParam(WANM_JUMP_KICK, &daAlinkHIO_wlAtCjump_c0::m.mFlipKickAnm);
@@ -7652,7 +7367,6 @@ int daAlink_c::procWolfJumpAttackKickInit() {
     return 1;
 }
 
-/* 8013A8A0-8013A8FC 1351E0 005C+00 1/0 0/0 0/0 .text procWolfJumpAttackKick__9daAlink_cFv */
 int daAlink_c::procWolfJumpAttackKick() {
     if (mUnderFrameCtrl[0].checkAnmEnd()) {
         procWolfBackJumpInit(2);
@@ -7662,8 +7376,6 @@ int daAlink_c::procWolfJumpAttackKick() {
     return 1;
 }
 
-/* 8013A8FC-8013AAC4 13523C 01C8+00 2/2 0/0 0/0 .text
- * procWolfJumpAttackSlideLandInit__9daAlink_cFiii              */
 int daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int param_2) {
     commonProcInit(PROC_WOLF_JUMP_AT_SLIDE_LAND);
 
@@ -7707,7 +7419,6 @@ int daAlink_c::procWolfJumpAttackSlideLandInit(int param_0, int param_1, int par
     return 1;
 }
 
-/* 8013AAC4-8013AC44 135404 0180+00 1/0 0/0 0/0 .text procWolfJumpAttackSlideLand__9daAlink_cFv */
 int daAlink_c::procWolfJumpAttackSlideLand() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -7752,8 +7463,6 @@ int daAlink_c::procWolfJumpAttackSlideLand() {
     return 1;
 }
 
-/* 8013AC44-8013ACF4 135584 00B0+00 1/1 0/0 0/0 .text
- * procWolfJumpAttackNormalLandInit__9daAlink_cFi               */
 int daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) {
     commonProcInit(PROC_WOLF_JUMP_AT_NORMAL_LAND);
     setSingleAnimeWolfParam(WANM_ATTACK_A_END, &daAlinkHIO_wlAtLand_c0::m.mNormalLandingAnm);
@@ -7773,8 +7482,6 @@ int daAlink_c::procWolfJumpAttackNormalLandInit(int param_0) {
     return 1;
 }
 
-/* 8013ACF4-8013ADF0 135634 00FC+00 1/0 0/0 0/0 .text procWolfJumpAttackNormalLand__9daAlink_cFv
- */
 int daAlink_c::procWolfJumpAttackNormalLand() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -7803,7 +7510,6 @@ int daAlink_c::procWolfJumpAttackNormalLand() {
     return 1;
 }
 
-/* 8013ADF0-8013AFC0 135730 01D0+00 2/2 0/0 0/0 .text procWolfWaitAttackInit__9daAlink_cFi */
 int daAlink_c::procWolfWaitAttackInit(int i_attackType) {
     struct daAlink_WCutParamTbl {
         /* 0x0 */ daAlink_c::daAlink_WANM m_anmID;
@@ -7887,7 +7593,6 @@ int daAlink_c::procWolfWaitAttackInit(int i_attackType) {
     return 1;
 }
 
-/* 8013AFC0-8013B2A0 135900 02E0+00 1/0 0/0 0/0 .text            procWolfWaitAttack__9daAlink_cFv */
 int daAlink_c::procWolfWaitAttack() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -7961,7 +7666,6 @@ int daAlink_c::procWolfWaitAttack() {
     return 1;
 }
 
-/* 8013B2A0-8013B424 135BE0 0184+00 5/5 0/0 0/0 .text procWolfRollAttackInit__9daAlink_cFii */
 int daAlink_c::procWolfRollAttackInit(int param_0, int param_1) {
     commonProcInit(PROC_WOLF_ROLL_ATTACK);
 
@@ -8004,7 +7708,6 @@ int daAlink_c::procWolfRollAttackInit(int param_0, int param_1) {
     return 1;
 }
 
-/* 8013B424-8013B528 135D64 0104+00 1/0 0/0 0/0 .text            procWolfRollAttack__9daAlink_cFv */
 int daAlink_c::procWolfRollAttack() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -8031,7 +7734,6 @@ int daAlink_c::procWolfRollAttack() {
     return 1;
 }
 
-/* 8013B528-8013B808 135E68 02E0+00 1/1 0/0 0/0 .text procWolfDownAttackInit__9daAlink_cFv */
 int daAlink_c::procWolfDownAttackInit() {
     commonProcInit(PROC_WOLF_DOWN_ATTACK);
     setSingleAnimeWolfParam(WANM_ATTACK_POE_START, &daAlinkHIO_wlAtDown_c0::m.mLowStanceAnm);
@@ -8072,7 +7774,6 @@ int daAlink_c::procWolfDownAttackInit() {
     return 1;
 }
 
-/* 8013B808-8013B964 136148 015C+00 1/0 0/0 0/0 .text            procWolfDownAttack__9daAlink_cFv */
 int daAlink_c::procWolfDownAttack() {
     if (mLinkAcch.ChkGroundHit() && speed.y <= 0.0f) {
         fopEn_enemy_c* enemy_p = (fopEn_enemy_c*)field_0x280c.getActor();
@@ -8097,8 +7798,6 @@ int daAlink_c::procWolfDownAttack() {
     return 1;
 }
 
-/* 8013B964-8013BA44 1362A4 00E0+00 1/1 0/0 0/0 .text
- * procWolfDownAtLandInit__9daAlink_cFP13fopEn_enemy_c          */
 int daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* i_enemy) {
     commonProcInit(PROC_WOLF_DOWN_AT_LAND);
     field_0x280c.setData(i_enemy);
@@ -8115,7 +7814,6 @@ int daAlink_c::procWolfDownAtLandInit(fopEn_enemy_c* i_enemy) {
     return 1;
 }
 
-/* 8013BA44-8013BC94 136384 0250+00 1/0 0/0 0/0 .text            procWolfDownAtLand__9daAlink_cFv */
 int daAlink_c::procWolfDownAtLand() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -8153,7 +7851,6 @@ int daAlink_c::procWolfDownAtLand() {
     return 1;
 }
 
-/* 8013BC94-8013BD54 1365D4 00C0+00 1/1 0/0 0/0 .text procWolfDownAtMissLandInit__9daAlink_cFv */
 int daAlink_c::procWolfDownAtMissLandInit() {
     commonProcInit(PROC_WOLF_DOWN_AT_MISS_LAND);
     setSingleAnimeWolfParam(WANM_ATTACK_POE_MISS, &daAlinkHIO_wlAtDown_c0::m.mRollOverAnm);
@@ -8168,7 +7865,6 @@ int daAlink_c::procWolfDownAtMissLandInit() {
     return 1;
 }
 
-/* 8013BD54-8013BE24 136694 00D0+00 1/0 0/0 0/0 .text procWolfDownAtMissLand__9daAlink_cFv */
 int daAlink_c::procWolfDownAtMissLand() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -8190,7 +7886,6 @@ int daAlink_c::procWolfDownAtMissLand() {
     return 1;
 }
 
-/* 8013BE24-8013C3E4 136764 05C0+00 2/2 0/0 0/0 .text procWolfLockAttackInit__9daAlink_cFi */
 int daAlink_c::procWolfLockAttackInit(int param_0) {
     commonProcInit(PROC_WOLF_LOCK_ATTACK);
     setSingleAnimeWolfParam(WANM_ATTACK_A_START, &daAlinkHIO_wlAtNjump_c0::m.mAerialAttackAnm);
@@ -8256,7 +7951,6 @@ int daAlink_c::procWolfLockAttackInit(int param_0) {
     return 1;
 }
 
-/* 8013C3E4-8013C630 136D24 024C+00 1/0 0/0 0/0 .text            procWolfLockAttack__9daAlink_cFv */
 int daAlink_c::procWolfLockAttack() {
     BOOL var_r29 = false;
 
@@ -8317,7 +8011,6 @@ int daAlink_c::procWolfLockAttack() {
     return 1;
 }
 
-/* 8013C630-8013C7A4 136F70 0174+00 1/1 0/0 0/0 .text procWolfLockAttackTurnInit__9daAlink_cFi */
 int daAlink_c::procWolfLockAttackTurnInit(int param_0) {
     commonProcInit(PROC_WOLF_LOCK_ATTACK_TURN);
 
@@ -8352,7 +8045,6 @@ int daAlink_c::procWolfLockAttackTurnInit(int param_0) {
     return 1;
 }
 
-/* 8013C7A4-8013C8C8 1370E4 0124+00 1/0 0/0 0/0 .text procWolfLockAttackTurn__9daAlink_cFv */
 int daAlink_c::procWolfLockAttackTurn() {
     field_0x2f99 = 4;
 
@@ -8386,7 +8078,6 @@ int daAlink_c::procWolfLockAttackTurn() {
     return 1;
 }
 
-/* 8013C8C8-8013C9EC 137208 0124+00 1/1 0/0 0/0 .text procWolfAttackReverseInit__9daAlink_cFv */
 int daAlink_c::procWolfAttackReverseInit() {
     commonProcInit(PROC_WOLF_ATTACK_REVERSE);
     setSingleAnimeWolfBase(WANM_ATTACK_RECOIL_START);
@@ -8405,8 +8096,6 @@ int daAlink_c::procWolfAttackReverseInit() {
     return 1;
 }
 
-/* 8013C9EC-8013CB48 13732C 015C+00 1/0 0/0 0/0 .text            procWolfAttackReverse__9daAlink_cFv
- */
 int daAlink_c::procWolfAttackReverse() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -8441,7 +8130,6 @@ int daAlink_c::procWolfAttackReverse() {
     return 1;
 }
 
-/* 8013CB48-8013CC5C 137488 0114+00 2/2 0/0 0/0 .text procWolfEnemyThrowInit__9daAlink_cFi */
 int daAlink_c::procWolfEnemyThrowInit(int param_0) {
     commonProcInit(PROC_WOLF_ENEMY_THROW);
 
@@ -8472,7 +8160,6 @@ int daAlink_c::procWolfEnemyThrowInit(int param_0) {
     return 1;
 }
 
-/* 8013CC5C-8013CCF4 13759C 0098+00 1/0 0/0 0/0 .text            procWolfEnemyThrow__9daAlink_cFv */
 int daAlink_c::procWolfEnemyThrow() {
     if (checkWolfGroundSpecialMode()) {
         return 1;
@@ -8490,7 +8177,6 @@ int daAlink_c::procWolfEnemyThrow() {
     return 1;
 }
 
-/* 8013CCF4-8013CDEC 137634 00F8+00 1/1 0/0 0/0 .text procWolfEnemyHangBiteInit__9daAlink_cFv */
 int daAlink_c::procWolfEnemyHangBiteInit() {
     commonProcInit(PROC_WOLF_ENEMY_HANG_BITE);
     setSingleAnimeWolfParam(WANM_CATCH_START, &daAlinkHIO_wlAtBite_c0::m.mHangingBitePreparationAnm);
@@ -8518,8 +8204,6 @@ int daAlink_c::procWolfEnemyHangBiteInit() {
     return 1;
 }
 
-/* 8013CDEC-8013D0D4 13772C 02E8+00 1/0 0/0 0/0 .text            procWolfEnemyHangBite__9daAlink_cFv
- */
 int daAlink_c::procWolfEnemyHangBite() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -8596,7 +8280,6 @@ int daAlink_c::procWolfEnemyHangBite() {
     return 1;
 }
 
-/* 8013D0D4-8013D3FC 137A14 0328+00 1/1 0/0 0/0 .text            procWolfGrabUpInit__9daAlink_cFv */
 int daAlink_c::procWolfGrabUpInit() {
     if (fopAcM_checkCarryNow(field_0x27f4)) {
         return checkNextActionWolf(0);
@@ -8650,7 +8333,6 @@ int daAlink_c::procWolfGrabUpInit() {
     return 1;
 }
 
-/* 8013D3FC-8013D588 137D3C 018C+00 1/0 0/0 0/0 .text            procWolfGrabUp__9daAlink_cFv */
 int daAlink_c::procWolfGrabUp() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     fopAc_ac_c* item_p = mGrabItemAcKeep.getActor();
@@ -8685,8 +8367,6 @@ int daAlink_c::procWolfGrabUp() {
     return 1;
 }
 
-/* 8013D588-8013D65C 137EC8 00D4+00 2/2 0/0 0/0 .text            procWolfGrabPutInit__9daAlink_cFv
- */
 int daAlink_c::procWolfGrabPutInit() {
     if (mProcID == PROC_WOLF_GRAB_PUT) {
         return 0;
@@ -8709,7 +8389,6 @@ int daAlink_c::procWolfGrabPutInit() {
     return 1;
 }
 
-/* 8013D65C-8013D818 137F9C 01BC+00 1/0 0/0 0/0 .text            procWolfGrabPut__9daAlink_cFv */
 int daAlink_c::procWolfGrabPut() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     fopAc_ac_c* actor_p = mGrabItemAcKeep.getActor();
@@ -8752,8 +8431,6 @@ int daAlink_c::procWolfGrabPut() {
     return 1;
 }
 
-/* 8013D818-8013D86C 138158 0054+00 1/1 0/0 0/0 .text            procWolfGrabThrowInit__9daAlink_cFv
- */
 int daAlink_c::procWolfGrabThrowInit() {
     commonProcInit(PROC_WOLF_GRAB_THROW);
     setSingleAnimeWolfParam(WANM_PICKUP_THROW, &daAlinkHIO_wlGrab_c0::m.mThrowAnm);
@@ -8762,7 +8439,6 @@ int daAlink_c::procWolfGrabThrowInit() {
     return 1;
 }
 
-/* 8013D86C-8013D930 1381AC 00C4+00 1/0 0/0 0/0 .text            procWolfGrabThrow__9daAlink_cFv */
 int daAlink_c::procWolfGrabThrow() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -8783,7 +8459,6 @@ int daAlink_c::procWolfGrabThrow() {
     return 1;
 }
 
-/* 8013D930-8013DA8C 138270 015C+00 1/1 0/0 0/0 .text            procWolfPushInit__9daAlink_cFv */
 int daAlink_c::procWolfPushInit() {
     commonProcInit(PROC_WOLF_PUSH);
     mProcVar3.field_0x300e = 18;
@@ -8819,7 +8494,6 @@ int daAlink_c::procWolfPushInit() {
     return 1;
 }
 
-/* 8013DA8C-8013DB58 1383CC 00CC+00 1/0 0/0 0/0 .text            procWolfPush__9daAlink_cFv */
 int daAlink_c::procWolfPush() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -8842,8 +8516,6 @@ int daAlink_c::procWolfPush() {
     return 1;
 }
 
-/* 8013DB58-8013DB6C 138498 0014+00 1/1 0/0 0/0 .text daAlink_searchEnemyCargo__FP10fopAc_ac_cPv
- */
 static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* i_actor, void*) {
     if (fopAcM_GetName(i_actor) == PROC_E_YC) {
         return i_actor;
@@ -8852,7 +8524,6 @@ static fopAc_ac_c* daAlink_searchEnemyCargo(fopAc_ac_c* i_actor, void*) {
     return NULL;
 }
 
-/* 8013DB6C-8013DC5C 1384AC 00F0+00 3/2 0/0 0/0 .text procWolfCargoCarryInit__9daAlink_cFv */
 int daAlink_c::procWolfCargoCarryInit() {
     if (!commonProcInitNotSameProc(PROC_WOLF_CARGO_CARRY)) {
         return 1;
@@ -8888,7 +8559,6 @@ int daAlink_c::procWolfCargoCarryInit() {
     return 1;
 }
 
-/* 8013DC5C-8013DDF8 13859C 019C+00 1/0 0/0 0/0 .text            procWolfCargoCarry__9daAlink_cFv */
 int daAlink_c::procWolfCargoCarry() {
     setJumpMode();
 
@@ -8927,8 +8597,6 @@ int daAlink_c::procWolfCargoCarry() {
     return 1;
 }
 
-/* 8013DDF8-8013DE70 138738 0078+00 1/1 0/0 0/0 .text            procWolfChainUpInit__9daAlink_cFv
- */
 int daAlink_c::procWolfChainUpInit() {
     field_0x2fa3 = searchFmChainPos();
 
@@ -8943,7 +8611,6 @@ int daAlink_c::procWolfChainUpInit() {
     return 1;
 }
 
-/* 8013DE70-8013DF30 1387B0 00C0+00 1/0 0/0 0/0 .text            procWolfChainUp__9daAlink_cFv */
 int daAlink_c::procWolfChainUp() {
     daPy_frameCtrl_c* frameCtrl = mUnderFrameCtrl;
 
@@ -8967,7 +8634,6 @@ int daAlink_c::procWolfChainUp() {
     return 1;
 }
 
-/* 8013DF30-8013E034 138870 0104+00 1/1 0/0 0/0 .text procWolfGanonCatchInit__9daAlink_cFv */
 int daAlink_c::procWolfGanonCatchInit() {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFEF)) {
         return 0;
@@ -8994,7 +8660,6 @@ int daAlink_c::procWolfGanonCatchInit() {
     return 1;
 }
 
-/* 8013E034-8013E240 138974 020C+00 1/0 0/0 0/0 .text            procWolfGanonCatch__9daAlink_cFv */
 int daAlink_c::procWolfGanonCatch() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
 
@@ -9065,7 +8730,6 @@ int daAlink_c::procWolfGanonCatch() {
     return 1;
 }
 
-/* 8013E240-8013E2A8 138B80 0068+00 1/1 0/0 0/0 .text procWolfChainReadyInit__9daAlink_cFv */
 int daAlink_c::procWolfChainReadyInit() {
     commonProcInit(PROC_WOLF_CHAIN_READY);
     field_0x280c.setData(field_0x27f4);
@@ -9077,7 +8741,6 @@ int daAlink_c::procWolfChainReadyInit() {
     return 1;
 }
 
-/* 8013E2A8-8013E6C0 138BE8 0418+00 1/0 0/0 0/0 .text            procWolfChainReady__9daAlink_cFv */
 int daAlink_c::procWolfChainReady() {
     daObjWchain_c* chain = static_cast<daObjWchain_c*>(field_0x280c.getActor());
     if (chain == NULL || mLinkAcch.ChkWallHit()) {
@@ -9110,8 +8773,6 @@ int daAlink_c::procWolfChainReady() {
     return 1;
 }
 
-/* 8013E6C0-8013E80C 139000 014C+00 1/1 0/0 0/0 .text            procWolfChainWaitInit__9daAlink_cFv
- */
 int daAlink_c::procWolfChainWaitInit() {
     daObjWchain_c* chain = static_cast<daObjWchain_c*>(field_0x280c.getActor());
     commonProcInit(PROC_WOLF_CHAIN_WAIT);
@@ -9138,7 +8799,6 @@ int daAlink_c::procWolfChainWaitInit() {
     return 1;
 }
 
-/* 8013E80C-8013ED44 13914C 0538+00 1/0 0/0 0/0 .text            procWolfChainWait__9daAlink_cFv */
 int daAlink_c::procWolfChainWait() {
     daObjWchain_c* chain = static_cast<daObjWchain_c*>(field_0x280c.getActor());
     if (chain == NULL || mProcVar0.field_0x3008 <= -daAlinkHIO_wlChain_c0::m.mReleaseWaitTime) {
@@ -9218,7 +8878,6 @@ int daAlink_c::procWolfChainWait() {
     return 1;
 }
 
-/* 8013ED44-8013F1F0 139684 04AC+00 1/1 0/0 0/0 .text            procWolfDigInit__9daAlink_cFv */
 int daAlink_c::procWolfDigInit() {
     BOOL var_r28 = 1;
 
@@ -9349,7 +9008,6 @@ int daAlink_c::procWolfDigInit() {
     return 1;
 }
 
-/* 8013F1F0-8013F4A8 139B30 02B8+00 1/0 0/0 0/0 .text            procWolfDig__9daAlink_cFv */
 int daAlink_c::procWolfDig() {
     daPy_frameCtrl_c* frame_ctrl = &mUnderFrameCtrl[0];
 
@@ -9427,7 +9085,6 @@ int daAlink_c::procWolfDig() {
     return 1;
 }
 
-/* 8013F4A8-8013F7C4 139DE8 031C+00 2/2 0/0 0/0 .text procWolfDigThroughInit__9daAlink_cFi */
 int daAlink_c::procWolfDigThroughInit(int param_0) {
     static const u16 snowID[] = {
         0x884D, 0x884E, 0x8851, 0x8852,
@@ -9504,7 +9161,6 @@ int daAlink_c::procWolfDigThroughInit(int param_0) {
     return 1;
 }
 
-/* 8013F7C4-8013F90C 13A104 0148+00 1/0 0/0 0/0 .text            procWolfDigThrough__9daAlink_cFv */
 int daAlink_c::procWolfDigThrough() {
     daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
     field_0x2f99 = 4;
@@ -9541,7 +9197,6 @@ int daAlink_c::procWolfDigThrough() {
     return 1;
 }
 
-/* 8013F90C-8013FA14 13A24C 0108+00 1/1 0/0 0/0 .text            setSmellSave__9daAlink_cFv */
 void daAlink_c::setSmellSave() {
     if (dComIfGs_getCollectSmell() == fpcNm_ITEM_SMELL_MEDICINE) {
         dComIfGs_offEventBit(0x2F04);  // OFF: Got Medicine Scent
@@ -9564,8 +9219,6 @@ void daAlink_c::setSmellSave() {
     setGetSubBgm(mProcVar5.field_0x3012);
 }
 
-/* 8013FA14-8013FC24 13A354 0210+00 1/1 0/0 0/0 .text            procWolfGetSmellInit__9daAlink_cFv
- */
 int daAlink_c::procWolfGetSmellInit() {
     if (!dComIfGp_event_compulsory(this, 0, 0xFFFF)) {
         return 0;
@@ -9617,7 +9270,6 @@ int daAlink_c::procWolfGetSmellInit() {
     return 1;
 }
 
-/* 8013FC24-8013FF28 13A564 0304+00 1/0 0/0 0/0 .text            procWolfGetSmell__9daAlink_cFv */
 int daAlink_c::procWolfGetSmell() {
     kytag03_class* kytag3_p = (kytag03_class*)field_0x280c.getActor();
 
diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp
index 7a44b6a781..93bea23526 100644
--- a/src/d/actor/d_a_alldie.cpp
+++ b/src/d/actor/d_a_alldie.cpp
@@ -9,22 +9,18 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 804D5818-804D5824 000078 000C+00 2/2 0/0 0/0 .text            getEventNo__10daAlldie_cFv */
 u8 daAlldie_c::getEventNo() {
     return fopAcM_GetParam(this) >> 0x18;
 }
 
-/* 804D5824-804D5830 000084 000C+00 2/2 0/0 0/0 .text            getSwbit__10daAlldie_cFv */
 u8 daAlldie_c::getSwbit() {
     return fopAcM_GetParam(this) >> 0x8;
 }
 
-/* 804D5830-804D5838 000090 0008+00 1/1 0/0 0/0 .text            actionWait__10daAlldie_cFv */
 int daAlldie_c::actionWait() {
     return 1;
 }
 
-/* 804D5838-804D5888 000098 0050+00 1/1 0/0 0/0 .text            actionCheck__10daAlldie_cFv */
 int daAlldie_c::actionCheck() {
     if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) == NULL) {
         mAction = ACT_TIMER;
@@ -34,7 +30,6 @@ int daAlldie_c::actionCheck() {
     return 1;
 }
 
-/* 804D5888-804D5938 0000E8 00B0+00 1/1 0/0 0/0 .text            actionTimer__10daAlldie_cFv */
 int daAlldie_c::actionTimer() {
     if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this)) != NULL) {
         mAction = ACT_CHECK;
@@ -55,7 +50,6 @@ int daAlldie_c::actionTimer() {
     return 1;
 }
 
-/* 804D5938-804D59A0 000198 0068+00 1/1 0/0 0/0 .text            actionOrder__10daAlldie_cFv */
 int daAlldie_c::actionOrder() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         mAction = ACT_EVENT;
@@ -66,7 +60,6 @@ int daAlldie_c::actionOrder() {
     return 1;
 }
 
-/* 804D59A0-804D5A44 000200 00A4+00 2/2 0/0 0/0 .text            actionEvent__10daAlldie_cFv */
 int daAlldie_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         dComIfGp_getEvent().reset();
@@ -83,7 +76,6 @@ int daAlldie_c::actionEvent() {
     return 1;
 }
 
-/* 804D5A44-804D5B10 0002A4 00CC+00 1/1 0/0 0/0 .text            actionNext__10daAlldie_cFv */
 int daAlldie_c::actionNext() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         mEventIdx = mNextEventIdx;
@@ -108,7 +100,6 @@ int daAlldie_c::actionNext() {
     return 1;
 }
 
-/* 804D5B10-804D5B8C 000370 007C+00 1/1 0/0 0/0 .text            execute__10daAlldie_cFv */
 int daAlldie_c::execute() {
     switch (mAction) {
     case ACT_CHECK:
@@ -134,30 +125,24 @@ int daAlldie_c::execute() {
     return 1;
 }
 
-/* 804D5B8C-804D5B94 0003EC 0008+00 1/0 0/0 0/0 .text            daAlldie_Draw__FP10daAlldie_c */
 static int daAlldie_Draw(daAlldie_c*) {
     return 1;
 }
 
-/* 804D5B94-804D5BB8 0003F4 0024+00 1/0 0/0 0/0 .text            daAlldie_Execute__FP10daAlldie_c */
 static int daAlldie_Execute(daAlldie_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 804D5BB8-804D5BC0 000418 0008+00 1/0 0/0 0/0 .text            daAlldie_IsDelete__FP10daAlldie_c
- */
 static int daAlldie_IsDelete(daAlldie_c*) {
     return 1;
 }
 
-/* 804D5BC0-804D5BF0 000420 0030+00 1/0 0/0 0/0 .text            daAlldie_Delete__FP10daAlldie_c */
 static int daAlldie_Delete(daAlldie_c* i_this) {
     i_this->~daAlldie_c();
     return 1;
 }
 
-/* 804D5BF0-804D5D1C 000450 012C+00 1/0 0/0 0/0 .text            daAlldie_Create__FP10fopAc_ac_c */
 int daAlldie_c::create() {
     fopAcM_ct(this, daAlldie_c);
 
@@ -194,8 +179,6 @@ static int daAlldie_Create(fopAc_ac_c* i_this) {
     return static_cast<daAlldie_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 804D5D24-804D5D44 -00001 0020+00 1/0 0/0 0/0 .data            l_daAlldie_Method */
 static actor_method_class l_daAlldie_Method = {
     (process_method_func)daAlldie_Create,
     (process_method_func)daAlldie_Delete,
@@ -204,7 +187,6 @@ static actor_method_class l_daAlldie_Method = {
     (process_method_func)daAlldie_Draw,
 };
 
-/* 804D5D44-804D5D74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ALLDIE */
 extern actor_process_profile_definition g_profile_ALLDIE = {
     fpcLy_CURRENT_e,
     2,
diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp
index c3e5e63879..50bdb3455a 100644
--- a/src/d/actor/d_a_andsw.cpp
+++ b/src/d/actor/d_a_andsw.cpp
@@ -21,7 +21,6 @@ void daAndsw_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80457978-804579B8 000078 0040+00 1/1 0/0 0/0 .text            Create__9daAndsw_cFv */
 int daAndsw_c::Create() {
     mSwNo = getSwNo();
     mSwNo2 = getSwNo2();
@@ -37,7 +36,6 @@ int daAndsw_c::Create() {
     return 1;
 }
 
-/* 804579B8-80457A20 0000B8 0068+00 1/1 0/0 0/0 .text            create__9daAndsw_cFv */
 int daAndsw_c::create() {
     fopAcM_ct(this, daAndsw_c);
     if (!Create()) {
@@ -51,7 +49,6 @@ int daAndsw_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80457A20-80457ABC 000120 009C+00 1/1 0/0 0/0 .text            execute__9daAndsw_cFv */
 int daAndsw_c::execute() {
     if (fopAcM_isSwitch(this,mSwNo2)) {
         if (0 < mTimer) {
@@ -84,7 +81,6 @@ int daAndsw_c::execute() {
     return 1;
 }
 
-/* 80457ABC-80457AC4 0001BC 0008+00 1/1 0/0 0/0 .text            _delete__9daAndsw_cFv */
 int daAndsw_c::_delete() {
 #ifdef DEBUG
     l_HIO.removeHIO();
@@ -92,25 +88,20 @@ int daAndsw_c::_delete() {
     return 1;
 }
 
-/* 80457AC4-80457AE4 0001C4 0020+00 1/0 0/0 0/0 .text            daAndsw_Execute__FP9daAndsw_c */
 static int daAndsw_Execute(daAndsw_c* i_this) {
     return i_this->execute();
 }
 
-/* 80457AE4-80457B04 0001E4 0020+00 1/0 0/0 0/0 .text            daAndsw_Delete__FP9daAndsw_c */
 static int daAndsw_Delete(daAndsw_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Andsw");
     return i_this->_delete();
 }
 
-/* 80457B04-80457B24 000204 0020+00 1/0 0/0 0/0 .text            daAndsw_Create__FP10fopAc_ac_c */
 static int daAndsw_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daAndsw_c, i_this, "Andsw");
     return a_this->create();
 }
 
-/* ############################################################################################## */
-/* 80457B2C-80457B4C -00001 0020+00 1/0 0/0 0/0 .data            l_daAndsw_Method */
 static actor_method_class l_daAndsw_Method = {
     (process_method_func)daAndsw_Create,
     (process_method_func)daAndsw_Delete,
@@ -119,7 +110,6 @@ static actor_method_class l_daAndsw_Method = {
     (process_method_func)NULL,
 };
 
-/* 80457B4C-80457B7C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ANDSW */
 extern actor_process_profile_definition g_profile_ANDSW = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp
index cb46c6b3a1..10c8609932 100644
--- a/src/d/actor/d_a_andsw2.cpp
+++ b/src/d/actor/d_a_andsw2.cpp
@@ -10,37 +10,30 @@
 #include "d/d_lib.h"
 #include "d/d_procname.h"
 
-/* 804D5DF8-804D5E04 000078 000C+00 2/2 0/0 0/0 .text            getEventNo__10daAndsw2_cFv */
 u8 daAndsw2_c::getEventNo() {
     return home.angle.x & 0xFF;
 }
 
-/* 804D5E04-804D5E10 000084 000C+00 6/6 0/0 0/0 .text            getSwbit__10daAndsw2_cFv */
 u8 daAndsw2_c::getSwbit() {
     return fopAcM_GetParam(this) >> 0x10;
 }
 
-/* 804D5E10-804D5E1C 000090 000C+00 1/1 0/0 0/0 .text            getSwbit2__10daAndsw2_cFv */
 u8 daAndsw2_c::getSwbit2() {
     return fopAcM_GetParam(this) >> 0x18;
 }
 
-/* 804D5E1C-804D5E28 00009C 000C+00 6/6 0/0 0/0 .text            getType__10daAndsw2_cFv */
 u8 daAndsw2_c::getType() {
     return fopAcM_GetParam(this) >> 0x8;
 }
 
-/* 804D5E28-804D5E34 0000A8 000C+00 1/1 0/0 0/0 .text            getTimer__10daAndsw2_cFv */
 u8 daAndsw2_c::getTimer() {
     return home.angle.z & 0xFF;
 }
 
-/* 804D5E34-804D5E40 0000B4 000C+00 3/3 0/0 0/0 .text            getNum__10daAndsw2_cFv */
 u8 daAndsw2_c::getNum() {
     return fopAcM_GetParam(this) & 0xFF;
 }
 
-/* 804D5E40-804D5EB0 0000C0 0070+00 3/3 0/0 0/0 .text            getTopSw__10daAndsw2_cFv */
 u8 daAndsw2_c::getTopSw() {
     if (getSwbit2() != 0xFF) {
         return getSwbit2();
@@ -51,12 +44,10 @@ u8 daAndsw2_c::getTopSw() {
     }
 }
 
-/* 804D5EB0-804D5EBC 000130 000C+00 1/1 0/0 0/0 .text            getSwAns__10daAndsw2_cFv */
 u8 daAndsw2_c::getSwAns() {
     return (home.angle.x >> 8) & 0xFF;
 }
 
-/* 804D5EBC-804D5F64 00013C 00A8+00 4/4 0/0 0/0 .text            chkAllSw2__10daAndsw2_cFv */
 BOOL daAndsw2_c::chkAllSw2() {
     int top_sw = getTopSw();
     int num = getNum();
@@ -74,7 +65,6 @@ BOOL daAndsw2_c::chkAllSw2() {
     return true;
 }
 
-/* 804D5F64-804D6024 0001E4 00C0+00 4/4 0/0 0/0 .text            chkSwStatus__10daAndsw2_cFv */
 bool daAndsw2_c::chkSwStatus() {
     int top_sw = getTopSw();
     int num = getNum();
@@ -95,7 +85,6 @@ bool daAndsw2_c::chkSwStatus() {
     return false;
 }
 
-/* 804D6024-804D60CC 0002A4 00A8+00 1/1 0/0 0/0 .text            chkSwStatus2__10daAndsw2_cFv */
 bool daAndsw2_c::chkSwStatus2() {
     int top_sw = getTopSw();
     int num = getNum();
@@ -113,10 +102,8 @@ bool daAndsw2_c::chkSwStatus2() {
     return false;
 }
 
-/* 804D60CC-804D6120 00034C 0054+00 1/1 0/0 0/0 .text            __dt__10daAndsw2_cFv */
 daAndsw2_c::~daAndsw2_c() {}
 
-/* 804D6120-804D63A4 0003A0 0284+00 2/1 0/0 0/0 .text            create__10daAndsw2_cFv */
 int daAndsw2_c::create() {
     int sw = getSwbit();
     fopAcM_ct(this, daAndsw2_c);
@@ -181,7 +168,6 @@ int daAndsw2_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804D63A4-804D6580 000624 01DC+00 1/0 0/0 0/0 .text daAndsw2_actionOnAll__FP10daAndsw2_c */
 static int daAndsw2_actionOnAll(daAndsw2_c* i_this) {
     u8 var_r29 = false;
 
@@ -228,7 +214,6 @@ static int daAndsw2_actionOnAll(daAndsw2_c* i_this) {
     return 1;
 }
 
-/* 804D6580-804D6704 000800 0184+00 1/0 0/0 0/0 .text daAndsw2_actionTimer__FP10daAndsw2_c */
 static int daAndsw2_actionTimer(daAndsw2_c* i_this) {
     if ((i_this->getType() == 1 && !i_this->chkAllSw2()) ||
         (i_this->getType() == 3 && !i_this->chkSwStatus()) ||
@@ -252,7 +237,6 @@ static int daAndsw2_actionTimer(daAndsw2_c* i_this) {
     return 1;
 }
 
-/* 804D6704-804D68A4 000984 01A0+00 1/0 0/0 0/0 .text daAndsw2_actionOrder__FP10daAndsw2_c */
 static int daAndsw2_actionOrder(daAndsw2_c* i_this) {
     if (i_this->eventInfo.checkCommandDemoAccrpt()) {
         i_this->setActio(daAndsw2_c::ACT_EVENT_e);
@@ -278,7 +262,6 @@ static int daAndsw2_actionOrder(daAndsw2_c* i_this) {
     return 1;
 }
 
-/* 804D68A4-804D6960 000B24 00BC+00 1/0 0/0 0/0 .text daAndsw2_actionEvent__FP10daAndsw2_c */
 static int daAndsw2_actionEvent(daAndsw2_c* i_this) {
     if (dComIfGp_evmng_endCheck(i_this->mEventIdx)) {
         if (i_this->getType() == 1 || i_this->getType() == 3 || i_this->getType() == 5 ||
@@ -295,8 +278,6 @@ static int daAndsw2_actionEvent(daAndsw2_c* i_this) {
     return 1;
 }
 
-/* 804D6960-804D6A34 000BE0 00D4+00 1/0 0/0 0/0 .text            daAndsw2_actionOff__FP10daAndsw2_c
- */
 static int daAndsw2_actionOff(daAndsw2_c* i_this) {
     u8 var_r29 = false;
 
@@ -327,8 +308,6 @@ static int daAndsw2_actionOff(daAndsw2_c* i_this) {
     return 1;
 }
 
-/* 804D6A34-804D6A3C 000CB4 0008+00 1/0 0/0 0/0 .text            daAndsw2_actionWait__FP10daAndsw2_c
- */
 static int daAndsw2_actionWait(daAndsw2_c* i_this) {
     return 1;
 }
@@ -344,31 +323,25 @@ int daAndsw2_c::execute() {
     return 1;
 }
 
-/* 804D6A3C-804D6A78 000CBC 003C+00 1/0 0/0 0/0 .text            daAndsw2_Execute__FP10daAndsw2_c */
 static int daAndsw2_Execute(daAndsw2_c* i_this) {
     return i_this->execute();
 }
 
-/* 804D6A78-804D6AA0 000CF8 0028+00 1/0 0/0 0/0 .text            daAndsw2_Delete__FP10daAndsw2_c */
 static int daAndsw2_Delete(daAndsw2_c* i_this) {
     i_this->~daAndsw2_c();
     return 1;
 }
 
-/* 804D6AA0-804D6AC0 000D20 0020+00 1/0 0/0 0/0 .text            daAndsw2_Create__FP10fopAc_ac_c */
 static int daAndsw2_Create(fopAc_ac_c* i_this) {
     return static_cast<daAndsw2_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 804D6AFC-804D6B1C -00001 0020+00 1/0 0/0 0/0 .data            l_daAndsw2_Method */
 static actor_method_class l_daAndsw2_Method = {
     (process_method_func)daAndsw2_Create,
     (process_method_func)daAndsw2_Delete,
     (process_method_func)daAndsw2_Execute,
 };
 
-/* 804D6B1C-804D6B4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ANDSW2 */
 extern actor_process_profile_definition g_profile_ANDSW2 = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index da9bbff24b..79cb8dd9db 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -18,7 +18,6 @@
 #include "d/actor/d_a_horse.h"
 #include "d/actor/d_a_hozelda.h"
 
-/* 80499C6C-80499D6C 0000EC 0100+00 1/1 0/0 0/0 .text            createHeap__9daArrow_cFv */
 int daArrow_c::createHeap() {
     J3DModelData* model_data;
 
@@ -49,18 +48,14 @@ int daArrow_c::createHeap() {
     return TRUE;
 }
 
-/* 8049DC84-8049DC90 000000 000C+00 15/15 0/0 0/0 .rodata          @3768 */
 static u8 const lit_3768[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80499D6C-80499D8C 0001EC 0020+00 1/1 0/0 0/0 .text            daArrow_createHeap__FP10fopAc_ac_c
- */
 static int daArrow_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daArrow_c*>(i_this)->createHeap();
 }
 
-/* 8049DC90-8049DCDC 00000C 004C+00 0/1 0/0 0/0 .rodata          l_atCpsSrc */
 const static dCcD_SrcCps l_atCpsSrc = {
     {
         {0x0, {{AT_TYPE_ARROW, 0x2, 0x1b}, {0xd8fbffff, 0x11}, 0x0}}, // mObj
@@ -73,7 +68,6 @@ const static dCcD_SrcCps l_atCpsSrc = {
     } // mCpsAttr
 };
 
-/* 8049DCDC-8049DD1C 000058 0040+00 0/1 0/0 0/0 .rodata          l_coSphSrc */
 const static dCcD_SrcSph l_coSphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x319}}, // mObj
@@ -86,8 +80,6 @@ const static dCcD_SrcSph l_coSphSrc = {
     } // mSphAttr
 };
 
-/* 80499D8C-80499F9C 00020C 0210+00 1/1 0/0 0/0 .text
- * atHitCallBack__9daArrow_cFP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daArrow_c::atHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) {
     if (i_tgObjInf->ChkTgArrowThrough()) {
         if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_E_PZ) {
@@ -116,13 +108,10 @@ void daArrow_c::atHitCallBack(dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, d
     }
 }
 
-/* 80499F9C-80499FBC 00041C 0020+00 1/1 0/0 0/0 .text
- * daArrow_atHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daArrow_atHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf) {
     static_cast<daArrow_c*>(i_this)->atHitCallBack(i_atObjInf, i_tgActor, i_tgObjInf);
 }
 
-/* 80499FBC-8049A04C 00043C 0090+00 5/5 0/0 0/0 .text            decAlphaBlur__9daArrow_cFv */
 void daArrow_c::decAlphaBlur() {
     for (int i = 0; i < field_0x946; i++) {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(field_0x97c[0]);
@@ -138,7 +127,6 @@ void daArrow_c::decAlphaBlur() {
     }
 }
 
-/* 8049A04C-8049A110 0004CC 00C4+00 5/5 0/0 0/0 .text            setBlur__9daArrow_cFv */
 void daArrow_c::setBlur() {
     for (int i = 0; i < field_0x946; i++) {
         field_0x97c[i] = dComIfGp_particle_set(field_0x97c[i], field_0x94c, &current.pos, &tevStr);
@@ -146,7 +134,6 @@ void daArrow_c::setBlur() {
     }
 }
 
-/* 8049A110-8049A1EC 000590 00DC+00 1/1 0/0 0/0 .text setLightArrowHitMark__9daArrow_cFPC4cXyz */
 void daArrow_c::setLightArrowHitMark(cXyz const* param_0) {
     static u16 const effName[] = {0x896F, 0x8970, 0x8971, 0x8972, 0x8973, 0x8974};
     for (int i = 0; i < 6; i++) {
@@ -157,8 +144,6 @@ void daArrow_c::setLightArrowHitMark(cXyz const* param_0) {
     mSoundObjArrow.startSound(Z2SE_ZELDA_ARROW_HIT, 0, mReverb);
 }
 
-/* 8049A1EC-8049A334 00066C 0148+00 2/2 0/0 0/0 .text            setLightChargeEffect__9daArrow_cFi
- */
 void daArrow_c::setLightChargeEffect(int param_0) {
     static u16 const effName[] = {0x8975, 0x8976, 0x8977, 0x8978};
     static Vec const localEffPos = {0.0f, 0.0f, 90.0f};
@@ -180,8 +165,6 @@ void daArrow_c::setLightChargeEffect(int param_0) {
     }
 }
 
-/* 8049A370-8049A76C 0007F0 03FC+00 2/2 0/0 0/0 .text
- * setArrowWaterNextPos__9daArrow_cFP4cXyzP4cXyz                */
 int daArrow_c::setArrowWaterNextPos(cXyz* i_start, cXyz* i_end) {
     field_0x5dc.Set(i_start, i_end, this);
 
@@ -220,7 +203,6 @@ int daArrow_c::setArrowWaterNextPos(cXyz* i_start, cXyz* i_end) {
     return 0;
 }
 
-/* 8049A76C-8049A9CC 000BEC 0260+00 2/2 0/0 0/0 .text            setArrowAt__9daArrow_cFf */
 void daArrow_c::setArrowAt(f32 param_0) {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -274,7 +256,6 @@ void daArrow_c::setArrowAt(f32 param_0) {
     dComIfG_Ccsp()->SetMass(&field_0x688, 1);
 }
 
-/* 8049A9CC-8049AC84 000E4C 02B8+00 2/2 0/0 0/0 .text            arrowShooting__9daArrow_cFv */
 void daArrow_c::arrowShooting() {
     daAlink_c* link = daAlink_getAlinkActorClass();
 
@@ -347,13 +328,11 @@ void daArrow_c::arrowShooting() {
     clearNearActorData();
 }
 
-/* 8049AC84-8049ACE0 001104 005C+00 3/3 0/0 0/0 .text setBombArrowExplode__9daArrow_cFP4cXyz */
 void daArrow_c::setBombArrowExplode(cXyz* param_0) {
     dBomb_c::createNormalBombExplode(param_0);
     field_0x93f = 1;
 }
 
-/* 8049ACE0-8049AD74 001160 0094+00 1/1 0/0 0/0 .text            setRoomInfo__9daArrow_cFv */
 void daArrow_c::setRoomInfo() {
     int roomNo;
 
@@ -369,14 +348,12 @@ void daArrow_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, roomNo);
 }
 
-/* 8049AD74-8049AD94 0011F4 0020+00 2/2 0/0 0/0 .text            clearNearActorData__9daArrow_cFv */
 void daArrow_c::clearNearActorData() {
     field_0x93e = 0;
     field_0x998 = FLT_MAX;
     mHitAcID = -1;
 }
 
-/* 8049AD94-8049AE64 001214 00D0+00 2/2 0/0 0/0 .text            getVibAngle__9daArrow_cFv */
 s16 daArrow_c::getVibAngle() {
     s16 angle;
     if (cLib_calcTimer(&field_0x952)) {
@@ -391,7 +368,6 @@ s16 daArrow_c::getVibAngle() {
     return angle;
 }
 
-/* 8049AE64-8049AF18 0012E4 00B4+00 4/4 0/0 0/0 .text            setNormalMatrix__9daArrow_cFv */
 void daArrow_c::setNormalMatrix() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
@@ -406,7 +382,6 @@ void daArrow_c::setNormalMatrix() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8049AF18-8049AFEC 001398 00D4+00 3/3 0/0 0/0 .text            setSmokePos__9daArrow_cFv */
 void daArrow_c::setSmokePos() {
     static cXyz localOffset(-3.3f, -3.0f, 94.0f);
 
@@ -416,7 +391,6 @@ void daArrow_c::setSmokePos() {
     mSmokePos = (field_0x9cc - field_0x9d8) * 0.9f;
 }
 
-/* 8049AFEC-8049B120 00146C 0134+00 3/3 0/0 0/0 .text            setKeepMatrix__9daArrow_cFv */
 void daArrow_c::setKeepMatrix() {
     if (mArrowType == 2) {
         daHoZelda_c* actor = (daHoZelda_c*)field_0xa08.getActor();
@@ -440,7 +414,6 @@ void daArrow_c::setKeepMatrix() {
     current.angle.x = -shape_angle.x;
 }
 
-/* 8049B120-8049B214 0015A0 00F4+00 2/2 0/0 0/0 .text            setStopActorMatrix__9daArrow_cFv */
 fopAc_ac_c* daArrow_c::setStopActorMatrix() {
     s16 vibe_angle = getVibAngle();
     fopAc_ac_c* actor = fopAcM_SearchByID(mHitAcID);
@@ -462,7 +435,6 @@ fopAc_ac_c* daArrow_c::setStopActorMatrix() {
     return actor;
 }
 
-/* 8049B214-8049B370 001694 015C+00 4/4 0/0 0/0 .text            setBombMoveEffect__9daArrow_cFv */
 void daArrow_c::setBombMoveEffect() {
     if (mArrowType == 1 && field_0x945 == 0 && field_0x943 == 0) {
         setSmokePos();
@@ -482,7 +454,6 @@ void daArrow_c::setBombMoveEffect() {
     }
 }
 
-/* 8049B370-8049B45C 0017F0 00EC+00 2/2 0/0 0/0 .text            checkReget__9daArrow_cFv */
 bool daArrow_c::checkReget() {
     if (field_0x7cc.ChkCoHit()) {
         dComIfGp_setItemArrowNumCount(1);
@@ -497,7 +468,6 @@ bool daArrow_c::checkReget() {
     }
 }
 
-/* 8049B45C-8049B764 0018DC 0308+00 1/0 0/0 0/0 .text            procWait__9daArrow_cFv */
 int daArrow_c::procWait() {
     setKeepMatrix();
 
@@ -569,7 +539,6 @@ int daArrow_c::procWait() {
     return TRUE;
 }
 
-/* 8049B764-8049C6B8 001BE4 0F54+00 2/0 0/0 0/0 .text            procMove__9daArrow_cFv */
 int daArrow_c::procMove() {
     if (fopAcM_GetParam(this) == 6) {
         setBlur();
@@ -874,7 +843,6 @@ int daArrow_c::procMove() {
     return TRUE;
 }
 
-/* 8049C700-8049C874 002B80 0174+00 1/1 0/0 0/0 .text            procReturnInit__9daArrow_cFi */
 int daArrow_c::procReturnInit(int param_0) {
     setBlur();
     setBombMoveEffect();
@@ -902,7 +870,6 @@ int daArrow_c::procReturnInit(int param_0) {
     return TRUE;
 }
 
-/* 8049C874-8049CB70 002CF4 02FC+00 1/0 0/0 0/0 .text            procReturn__9daArrow_cFv */
 int daArrow_c::procReturn() {
     setBombMoveEffect();
 
@@ -946,7 +913,6 @@ int daArrow_c::procReturn() {
     return TRUE;
 }
 
-/* 8049CB70-8049CC60 002FF0 00F0+00 1/0 0/0 0/0 .text            procBGStop__9daArrow_cFv */
 int daArrow_c::procBGStop() {
     if (field_0x944 != 0 || !dComIfG_Bgsp().ChkPolySafe(field_0x56c)) {
         field_0x93f = 1;
@@ -975,7 +941,6 @@ int daArrow_c::procBGStop() {
     return TRUE;
 }
 
-/* 8049CC60-8049CCCC 0030E0 006C+00 1/0 0/0 0/0 .text            procActorStop__9daArrow_cFv */
 int daArrow_c::procActorStop() {
     decAlphaBlur();
 
@@ -991,15 +956,11 @@ int daArrow_c::procActorStop() {
     return TRUE;
 }
 
-/* 8049CCCC-8049CCF0 00314C 0024+00 2/1 0/0 0/0 .text            procActorControllStop__9daArrow_cFv
- */
 int daArrow_c::procActorControllStop() {
     decAlphaBlur();
     return TRUE;
 }
 
-/* 8049CCF0-8049CE50 003170 0160+00 1/1 0/0 0/0 .text
- * procSlingHitInit__9daArrow_cFP4cXyzP12dCcD_GObjInf           */
 int daArrow_c::procSlingHitInit(cXyz* param_0, dCcD_GObjInf* param_1) {
     fopAc_ac_c* hit_ac;
     if (param_1 != NULL) {
@@ -1032,7 +993,6 @@ int daArrow_c::procSlingHitInit(cXyz* param_0, dCcD_GObjInf* param_1) {
     return TRUE;
 }
 
-/* 8049CE50-8049CEA0 0032D0 0050+00 1/0 0/0 0/0 .text            procSlingHit__9daArrow_cFv */
 int daArrow_c::procSlingHit() {
     decAlphaBlur();
 
@@ -1044,7 +1004,6 @@ int daArrow_c::procSlingHit() {
     return TRUE;
 }
 
-/* 8049CEA0-8049D0AC 003320 020C+00 1/1 0/0 0/0 .text            execute__9daArrow_cFv */
 int daArrow_c::execute() {
     field_0xa08.setActor();
     mReverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
@@ -1099,12 +1058,10 @@ int daArrow_c::execute() {
     return TRUE;
 }
 
-/* 8049D0AC-8049D0CC 00352C 0020+00 1/0 0/0 0/0 .text            daArrow_execute__FP9daArrow_c */
 static int daArrow_execute(daArrow_c* i_this) {
     return i_this->execute();
 }
 
-/* 8049D0CC-8049D40C 00354C 0340+00 1/1 0/0 0/0 .text            draw__9daArrow_cFv */
 int daArrow_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
 
@@ -1163,13 +1120,10 @@ int daArrow_c::draw() {
     return TRUE;
 }
 
-/* 8049D40C-8049D42C 00388C 0020+00 1/0 0/0 0/0 .text            daArrow_draw__FP9daArrow_c */
 static int daArrow_draw(daArrow_c* i_this) {
     return i_this->draw();
 }
 
-/* 8049D42C-8049D440 0038AC 0014+00 1/1 0/0 0/0 .text daAlink_searchHorseZelda__FP10fopAc_ac_cPv
- */
 static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) {
     if (fopAcM_GetName(param_0) == PROC_HOZELDA) {
         return param_0;
@@ -1178,7 +1132,6 @@ static void* daAlink_searchHorseZelda(fopAc_ac_c* param_0, void* param_1) {
     return NULL;
 }
 
-/* 8049D440-8049D808 0038C0 03C8+00 1/1 0/0 0/0 .text            create__9daArrow_cFv */
 cPhs__Step daArrow_c::create() {
     fopAcM_ct(this, daArrow_c);
 
@@ -1241,18 +1194,15 @@ cPhs__Step daArrow_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8049D96C-8049D98C 003DEC 0020+00 1/0 0/0 0/0 .text            daArrow_create__FP9daArrow_c */
 static int daArrow_create(daArrow_c* i_this) {
     return i_this->create();
 }
 
-/* 8049D98C-8049DBD8 003E0C 024C+00 1/1 0/0 0/0 .text            __dt__9daArrow_cFv */
 daArrow_c::~daArrow_c() {
     mSoundObjArrow.deleteObject();
     setLightChargeEffect(1);
 }
 
-/* 8049DBD8-8049DC00 004058 0028+00 1/0 0/0 0/0 .text            daArrow_delete__FP9daArrow_c */
 static int daArrow_delete(daArrow_c* i_this) {
     i_this->~daArrow_c();
     return TRUE;
@@ -1262,7 +1212,6 @@ AUDIO_INSTANCES;
 template<>
 JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance;
 
-/* 8049DE8C-8049DEAC -00001 0020+00 1/0 0/0 0/0 .data            l_daArrowMethodTable */
 static actor_method_class l_daArrowMethodTable = {
     (process_method_func)daArrow_create,
     (process_method_func)daArrow_delete,
@@ -1271,7 +1220,6 @@ static actor_method_class l_daArrowMethodTable = {
     (process_method_func)daArrow_draw,
 };
 
-/* 8049DEAC-8049DEDC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ARROW */
 extern actor_process_profile_definition g_profile_ARROW = {
   fpcLy_CURRENT_e,        // mLayerID
   9,                      // mListID
diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp
index 5bf2ca645a..d85bba5e57 100644
--- a/src/d/actor/d_a_b_bh.cpp
+++ b/src/d/actor/d_a_b_bh.cpp
@@ -45,7 +45,6 @@ enum B_BH_RES_FILE_ID {
     /* 0x15 */ BMDV_BH = 0x15,
 };
 
-/* 805AE26C-805AE2A4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__12daB_BH_HIO_cFv */
 daB_BH_HIO_c::daB_BH_HIO_c() {
     no = -1;
     model_size = 1.25f;
@@ -64,13 +63,11 @@ void daB_BH_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 805AE2A4-805AE350 000124 00AC+00 10/10 0/0 0/0 .text            anm_init__FP10b_bh_classifUcf */
 static void anm_init(b_bh_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_BH", i_anmID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_anmID;
 }
 
-/* 805AE350-805AE430 0001D0 00E0+00 1/0 0/0 0/0 .text            daB_BH_Draw__FP10b_bh_class */
 static int daB_BH_Draw(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -100,13 +97,10 @@ static int daB_BH_Draw(b_bh_class* i_this) {
 /* 805B33ED 0003+00 data_805B33ED None */
 static u8 l_initHIO;
 
-/* 805B33FC-805B3414 000054 0018+00 10/11 0/0 0/0 .bss             l_HIO */
 static daB_BH_HIO_c l_HIO;
 
-/* 805B3414-805B341C 00006C 0008+00 2/3 0/0 0/0 .bss             bh */
 static b_bh_class* bh[2];
 
-/* 805AE430-805AEB04 0002B0 06D4+00 1/1 0/0 0/0 .text            b_bh_wait__FP10b_bh_class */
 static void b_bh_wait(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -208,7 +202,6 @@ static void b_bh_wait(b_bh_class* i_this) {
     fopAcM_effHamonSet(&i_this->field_0xf24, &pos, 3.5f + KREG_F(12), 0.05f);
 }
 
-/* 805AEB40-805AEF78 0009C0 0438+00 1/1 0/0 0/0 .text            b_bh_attack_1__FP10b_bh_class */
 static void b_bh_attack_1(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -302,7 +295,6 @@ static void b_bh_attack_1(b_bh_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, a_this->current.angle.x, 8, 0x400);
 }
 
-/* 805AEF78-805AF1F8 000DF8 0280+00 1/1 0/0 0/0 .text            b_bh_bombeat__FP10b_bh_class */
 static void b_bh_bombeat(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID);
@@ -354,7 +346,6 @@ static void b_bh_bombeat(b_bh_class* i_this) {
     }
 }
 
-/* 805AF1F8-805AF6E0 001078 04E8+00 1/1 0/0 0/0 .text            b_bh_down__FP10b_bh_class */
 static s8 b_bh_down(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(i_this->parentActorID);
@@ -449,7 +440,6 @@ static s8 b_bh_down(b_bh_class* i_this) {
     return sp8;
 }
 
-/* 805AF6E0-805AFCA8 001560 05C8+00 1/1 0/0 0/0 .text            b_bh_b_wait__FP10b_bh_class */
 static void b_bh_b_wait(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID);
@@ -538,7 +528,6 @@ static void b_bh_b_wait(b_bh_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, i_this->field_0x686, 8, 0x400);
 }
 
-/* 805AFCA8-805B00A8 001B28 0400+00 1/1 0/0 0/0 .text            b_bh_b_attack_1__FP10b_bh_class */
 static void b_bh_b_attack_1(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID);
@@ -623,7 +612,6 @@ static void b_bh_b_attack_1(b_bh_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, a_this->current.angle.x, 8, 0x400);
 }
 
-/* 805B00A8-805B0274 001F28 01CC+00 1/1 0/0 0/0 .text            b_bh_b_bombeat__FP10b_bh_class */
 static void b_bh_b_bombeat(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -665,7 +653,6 @@ static void b_bh_b_bombeat(b_bh_class* i_this) {
     }
 }
 
-/* 805B0274-805B060C 0020F4 0398+00 1/1 0/0 0/0 .text            b_bh_b_down__FP10b_bh_class */
 static s8 b_bh_b_down(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(i_this->parentActorID);
@@ -733,7 +720,6 @@ static s8 b_bh_b_down(b_bh_class* i_this) {
     return var_r27;
 }
 
-/* 805B060C-805B0B04 00248C 04F8+00 1/1 0/0 0/0 .text            b_bh_start__FP10b_bh_class */
 static void b_bh_start(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -828,7 +814,6 @@ static void b_bh_start(b_bh_class* i_this) {
     }
 }
 
-/* 805B0B04-805B0D6C 002984 0268+00 1/1 0/0 0/0 .text            kuki_control1__FP10b_bh_class */
 static void kuki_control1(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -885,7 +870,6 @@ static void kuki_control1(b_bh_class* i_this) {
     }
 }
 
-/* 805B0D6C-805B0EE0 002BEC 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10b_bh_class */
 static void kuki_control2(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -923,7 +907,6 @@ static void kuki_control2(b_bh_class* i_this) {
     }
 }
 
-/* 805B0EE0-805B10AC 002D60 01CC+00 1/1 0/0 0/0 .text            kuki_control3__FP10b_bh_class */
 static void kuki_control3(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -939,7 +922,6 @@ static void kuki_control3(b_bh_class* i_this) {
     i_this->field_0xa20 = sp20.abs();
 }
 
-/* 805B10AC-805B1254 002F2C 01A8+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && !dComIfGp_event_runCheck()) {
         cXyz vec_bomb_to_bh = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->eyePos;
@@ -952,7 +934,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805B1254-805B15A8 0030D4 0354+00 1/1 0/0 0/0 .text            damage_check__FP10b_bh_class */
 static void damage_check(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1036,7 +1017,6 @@ static void damage_check(b_bh_class* i_this) {
     }
 }
 
-/* 805B15A8-805B1F4C 003428 09A4+00 1/1 0/0 0/0 .text            action__FP10b_bh_class */
 static void action(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1212,7 +1192,6 @@ static void action(b_bh_class* i_this) {
     }
 }
 
-/* 805B1F4C-805B2110 003DCC 01C4+00 1/1 0/0 0/0 .text            anm_se_set__FP10b_bh_class */
 static void anm_se_set(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1245,7 +1224,6 @@ static void anm_se_set(b_bh_class* i_this) {
     }
 }
 
-/* 805B2110-805B2840 003F90 0730+00 2/1 0/0 0/0 .text            daB_BH_Execute__FP10b_bh_class */
 static int daB_BH_Execute(b_bh_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -1429,12 +1407,10 @@ static int daB_BH_Execute(b_bh_class* i_this) {
     return 1;
 }
 
-/* 805B2840-805B2848 0046C0 0008+00 1/0 0/0 0/0 .text            daB_BH_IsDelete__FP10b_bh_class */
 static int daB_BH_IsDelete(b_bh_class* i_this) {
     return 1;
 }
 
-/* 805B2848-805B28B0 0046C8 0068+00 1/0 0/0 0/0 .text            daB_BH_Delete__FP10b_bh_class */
 static int daB_BH_Delete(b_bh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
@@ -1452,7 +1428,6 @@ static int daB_BH_Delete(b_bh_class* i_this) {
     return 1;
 }
 
-/* 805B28B0-805B2AF8 004730 0248+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_bh_class* a_this = (b_bh_class*)i_this;
 
@@ -1492,7 +1467,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 805B2AF8-805B2F54 004978 045C+00 1/0 0/0 0/0 .text            daB_BH_Create__FP10fopAc_ac_c */
 static int daB_BH_Create(fopAc_ac_c* i_this) {
     b_bh_class* a_this = (b_bh_class*)i_this;
     fopAcM_ct(a_this, b_bh_class);
@@ -1598,7 +1572,6 @@ static int daB_BH_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 805B330C-805B332C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_BH_Method */
 static actor_method_class l_daB_BH_Method = {
     (process_method_func)daB_BH_Create,
     (process_method_func)daB_BH_Delete,
@@ -1607,7 +1580,6 @@ static actor_method_class l_daB_BH_Method = {
     (process_method_func)daB_BH_Draw,
 };
 
-/* 805B332C-805B335C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_BH */
 extern actor_process_profile_definition g_profile_B_BH = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp
index 25598292e7..b972f72a83 100644
--- a/src/d/actor/d_a_b_bq.cpp
+++ b/src/d/actor/d_a_b_bq.cpp
@@ -53,8 +53,8 @@ enum B_bq_RES_File_ID {
 
 class daB_BQ_HIO_c {
 public:
-    /* 805B356C */ daB_BQ_HIO_c();
-    /* 805B9FFC */ virtual ~daB_BQ_HIO_c() {}
+    daB_BQ_HIO_c();
+    virtual ~daB_BQ_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mModelSize;
@@ -219,7 +219,6 @@ enum daB_BQ_JNT {
     JNT_SLEAF_UR2,
 };
 
-/* 805B356C-805B35A0 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__12daB_BQ_HIO_cFv */
 daB_BQ_HIO_c::daB_BQ_HIO_c() {
     field_0x4 = -1;
     mModelSize = 1.0f;
@@ -227,14 +226,12 @@ daB_BQ_HIO_c::daB_BQ_HIO_c() {
     mWaterSprayTime = 150;
 }
 
-/* 805B35A0-805B364C 000120 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10b_bq_classifUcf */
 static void anm_init(b_bq_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes("B_bq", i_anmID);
     i_this->mpMorf->setAnm(pbck, i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 805B364C-805B37A4 0001CC 0158+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -268,7 +265,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805B37A4-805B3ABC 000324 0318+00 1/0 0/0 0/0 .text            daB_BQ_Draw__FP10b_bq_class */
 static int daB_BQ_Draw(b_bq_class* i_this) {
     if (i_this->mDisableDraw) {
         return 1;
@@ -338,7 +334,6 @@ static int daB_BQ_Draw(b_bq_class* i_this) {
     return 1;
 }
 
-/* 805B3ABC-805B3B0C 00063C 0050+00 1/1 0/0 0/0 .text            s_fw_sub0__FPvPv */
 static void* s_fw_sub0(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
         static_cast<obj_fw_class*>(i_actor)->field_0x58c = 0.0f;
@@ -347,7 +342,6 @@ static void* s_fw_sub0(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805B3B0C-805B3C20 00068C 0114+00 1/1 0/0 0/0 .text            s_fw_sub1__FPvPv */
 static void* s_fw_sub1(void* i_actor, void* i_data) {
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
 
@@ -379,16 +373,12 @@ static void* s_fw_sub1(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805BAD50-805BAD54 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_805BAD50;
 
-/* 805BAD60-805BAD70 000018 0010+00 5/5 0/0 0/0 .bss             l_HIO */
 static daB_BQ_HIO_c l_HIO;
 
-/* 805BAD70-805BAD74 000028 0004+00 2/2 0/0 0/0 .bss             None */
 static s8 data_805BAD70;
 
-/* 805B3C5C-805B3D60 0007DC 0104+00 1/1 0/0 0/0 .text            s_fw_sub2__FPvPv */
 static void* s_fw_sub2(void* i_actor, void* i_data) {
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
 
@@ -418,7 +408,6 @@ static void* s_fw_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805B3D60-805B3DAC 0008E0 004C+00 1/1 0/0 0/0 .text            s_fw_del_sub__FPvPv */
 static void* s_fw_del_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -427,7 +416,6 @@ static void* s_fw_del_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805B3DAC-805B3E00 00092C 0054+00 2/2 0/0 0/0 .text            s_bi_del_sub__FPvPv */
 static void* s_bi_del_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) &&
         (fopAcM_GetName(i_actor) == PROC_E_BI || fopAcM_GetName(i_actor) == PROC_E_BI_LEAF))
@@ -438,7 +426,6 @@ static void* s_bi_del_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805B3E00-805B4048 000980 0248+00 1/1 0/0 0/0 .text            damage_check__FP10b_bq_class */
 static void damage_check(b_bq_class* i_this) {
     dComIfGp_getPlayer(0);
 
@@ -499,7 +486,6 @@ static void damage_check(b_bq_class* i_this) {
     }
 }
 
-/* 805B4048-805B44D4 000BC8 048C+00 1/1 0/0 0/0 .text            b_bq_stay__FP10b_bq_class */
 static s8 b_bq_stay(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int anm_frame = i_this->mpMorf->getFrame();
@@ -566,7 +552,6 @@ static s8 b_bq_stay(b_bq_class* i_this) {
     return rt;
 }
 
-/* 805B44D4-805B4614 001054 0140+00 1/1 0/0 0/0 .text            b_bq_wait__FP10b_bq_class */
 static void b_bq_wait(b_bq_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -599,7 +584,6 @@ static void b_bq_wait(b_bq_class* i_this) {
     }
 }
 
-/* 805B4614-805B4D4C 001194 0738+00 2/1 0/0 0/0 .text            b_bq_damage__FP10b_bq_class */
 static void b_bq_damage(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     s8 set_wait_action = false;
@@ -749,7 +733,6 @@ static void b_bq_damage(b_bq_class* i_this) {
     }
 }
 
-/* 805B4D4C-805B54E0 0018CC 0794+00 1/1 0/0 0/0 .text            b_bq_attack__FP10b_bq_class */
 static s8 b_bq_attack(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -901,7 +884,6 @@ static s8 b_bq_attack(b_bq_class* i_this) {
     return set_dokuhaki;
 }
 
-/* 805B54E0-805B559C 002060 00BC+00 1/1 0/0 0/0 .text            b_bq_end__FP10b_bq_class */
 static void b_bq_end(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -922,7 +904,6 @@ static void b_bq_end(b_bq_class* i_this) {
     }
 }
 
-/* 805B559C-805B58C8 00211C 032C+00 1/1 0/0 0/0 .text            action__FP10b_bq_class */
 static void action(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp40;
@@ -1011,7 +992,6 @@ static void action(b_bq_class* i_this) {
     }
 }
 
-/* 805B58C8-805B6264 002448 099C+00 1/1 0/0 0/0 .text            anm_se_set__FP10b_bq_class */
 static void anm_se_set(b_bq_class* i_this) {
     int anm_frame = i_this->mpMorf->getFrame();
 
@@ -1176,7 +1156,6 @@ static void anm_se_set(b_bq_class* i_this) {
     }
 }
 
-/* 805B6264-805B6348 002DE4 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10b_bq_classf */
 static void cam_3d_morf(b_bq_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, i_scale,
                   i_this->field_0x1288.x * i_this->field_0x129c);
@@ -1193,7 +1172,6 @@ static void cam_3d_morf(b_bq_class* i_this, f32 i_scale) {
                   i_this->field_0x127c.z * i_this->field_0x129c);
 }
 
-/* 805B6348-805B63EC 002EC8 00A4+00 2/2 0/0 0/0 .text            fish_set__FP10b_bq_class */
 static void fish_set(b_bq_class* i_this) {
     cXyz pos;
 
@@ -1215,7 +1193,6 @@ static void fish_set(b_bq_class* i_this) {
     }
 }
 
-/* 805B63EC-805B8A04 002F6C 2618+00 2/1 0/0 0/0 .text            demo_camera__FP10b_bq_class */
 static void demo_camera(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -2207,7 +2184,6 @@ static void demo_camera(b_bq_class* i_this) {
     }
 }
 
-/* 805B8A24-805B92F0 0055A4 08CC+00 2/1 0/0 0/0 .text            daB_BQ_Execute__FP10b_bq_class */
 static int daB_BQ_Execute(b_bq_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -2423,12 +2399,10 @@ static int daB_BQ_Execute(b_bq_class* i_this) {
     return 1;
 }
 
-/* 805B92F0-805B92F8 005E70 0008+00 1/0 0/0 0/0 .text            daB_BQ_IsDelete__FP10b_bq_class */
 static int daB_BQ_IsDelete(b_bq_class* i_this) {
     return 1;
 }
 
-/* 805B92F8-805B9370 005E78 0078+00 1/0 0/0 0/0 .text            daB_BQ_Delete__FP10b_bq_class */
 static int daB_BQ_Delete(b_bq_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_bq");
 
@@ -2445,7 +2419,6 @@ static int daB_BQ_Delete(b_bq_class* i_this) {
     return 1;
 }
 
-/* 805B9370-805B9654 005EF0 02E4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_bq_class* a_this = (b_bq_class*)i_this;
 
@@ -2502,7 +2475,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return true;
 }
 
-/* 805B969C-805B9B3C 00621C 04A0+00 1/0 0/0 0/0 .text            daB_BQ_Create__FP10fopAc_ac_c */
 static int daB_BQ_Create(fopAc_ac_c* i_this) {
     b_bq_class* a_this = (b_bq_class*)i_this;
     fopAcM_ct(a_this, b_bq_class);
@@ -2687,17 +2659,14 @@ static int daB_BQ_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 805B9B3C-805B9D74 0066BC 0238+00 1/1 0/0 0/0 .text            __ct__10b_bq_classFv */
 b_bq_class::b_bq_class() {}
 
-/* 805BACAC-805BACCC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_BQ_Method */
 static actor_method_class l_daB_BQ_Method = {
     (process_method_func)daB_BQ_Create,  (process_method_func)daB_BQ_Delete,
     (process_method_func)daB_BQ_Execute, (process_method_func)daB_BQ_IsDelete,
     (process_method_func)daB_BQ_Draw,
 };
 
-/* 805BACCC-805BACFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_BQ */
 extern actor_process_profile_definition g_profile_B_BQ = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp
index 904e156527..5fb7adac5f 100644
--- a/src/d/actor/d_a_b_dr.cpp
+++ b/src/d/actor/d_a_b_dr.cpp
@@ -20,8 +20,8 @@
 
 class daB_DR_HIO_c : public JORReflexible {
 public:
-    /* 805BAE6C */ daB_DR_HIO_c();
-    /* 805C6B94 */ virtual ~daB_DR_HIO_c() {}
+    daB_DR_HIO_c();
+    virtual ~daB_DR_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -137,7 +137,6 @@ enum daB_DR_Action {
 };
 
 namespace {
-/* 805C7268-805C72AC 000020 0044+00 0/1 0/0 0/0 .data cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcCyl cc_dr_week_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4002, 0x43}, 0x0}}, // mObj
@@ -152,7 +151,6 @@ static dCcD_SrcCyl cc_dr_week_src = {
     } // mCyl
 };
 
-/* 805C72AC-805C72EC 000064 0040+00 0/1 0/0 0/0 .data cc_dr_tail_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcSph cc_dr_tail_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x43}, 0x0}}, // mObj
@@ -165,8 +163,6 @@ static dCcD_SrcSph cc_dr_tail_src = {
     } // mSphAttr
 };
 
-/* 805C72EC-805C732C 0000A4 0040+00 0/1 0/0 0/0 .data
- * cc_dr_breath_at_src__22@unnamed@d_a_b_dr_cpp@                */
 static dCcD_SrcSph cc_dr_breath_at_src = {
     {
         {0x0, {{0x100000, 0x4, 0xD}, {0x0, 0x0}, 0x0}}, // mObj
@@ -179,8 +175,6 @@ static dCcD_SrcSph cc_dr_breath_at_src = {
     } // mSphAttr
 };
 
-/* 805C732C-805C736C 0000E4 0040+00 0/1 0/0 0/0 .data cc_dr_wind_at_src__22@unnamed@d_a_b_dr_cpp@
- */
 static dCcD_SrcSph cc_dr_wind_at_src = {
     {
         {0x0, {{0x200, 0x0, 0x1D}, {0x0, 0x0}, 0x0}}, // mObj
@@ -193,8 +187,6 @@ static dCcD_SrcSph cc_dr_wind_at_src = {
     } // mSphAttr
 };
 
-/* 805C736C-805C73AC 000124 0040+00 0/1 0/0 0/0 .data cc_dr_foot_at_src__22@unnamed@d_a_b_dr_cpp@
- */
 static dCcD_SrcSph cc_dr_foot_at_src = {
     {
         {0x0, {{0x400, 0x4, 0xD}, {0x0, 0x0}, 0x0}}, // mObj
@@ -207,7 +199,6 @@ static dCcD_SrcSph cc_dr_foot_at_src = {
     } // mSphAttr
 };
 
-/* 805C73AC-805C73F0 000164 0044+00 0/1 0/0 0/0 .data cc_pillar_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcCyl cc_pillar_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x43}, 0x15}}, // mObj
@@ -222,7 +213,6 @@ static dCcD_SrcCyl cc_pillar_src = {
     } // mCyl
 };
 
-/* 805C73F0-805C7434 0001A8 0044+00 0/1 0/0 0/0 .data cc_down_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcCyl cc_down_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x15}}, // mObj
@@ -237,7 +227,6 @@ static dCcD_SrcCyl cc_down_src = {
     } // mCyl
 };
 
-/* 805C7434-805C7474 0001EC 0040+00 0/1 0/0 0/0 .data cc_downSph_src__22@unnamed@d_a_b_dr_cpp@ */
 static dCcD_SrcSph cc_downSph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x15}}, // mObj
@@ -251,7 +240,6 @@ static dCcD_SrcSph cc_downSph_src = {
 };
 }
 
-/* 805BAE6C-805BAF80 0000EC 0114+00 1/1 0/0 0/0 .text            __ct__12daB_DR_HIO_cFv */
 daB_DR_HIO_c::daB_DR_HIO_c() {
     field_0x4 = -1;
     model_size = 0.8f;
@@ -296,10 +284,8 @@ daB_DR_HIO_c::daB_DR_HIO_c() {
 /* 805C78FD 0003+00 l_initHIO None */
 static u8 l_initHIO;
 
-/* 805C790C-805C7974 000054 0068+00 18/18 0/0 0/0 .bss             l_HIO */
 static daB_DR_HIO_c l_HIO;
 
-/* 805BAF80-805BB0E4 000200 0164+00 1/1 0/0 0/0 .text ctrlJoint__8daB_DR_cFP8J3DJointP8J3DModel */
 int daB_DR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     cXyz unused_sp20;
     cXyz unused_sp14;
@@ -334,7 +320,6 @@ int daB_DR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 805BB120-805BB16C 0003A0 004C+00 1/1 0/0 0/0 .text JointCallBack__8daB_DR_cFP8J3DJointi */
 int daB_DR_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -348,7 +333,6 @@ int daB_DR_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805BB16C-805BB3E8 0003EC 027C+00 1/1 0/0 0/0 .text            draw__8daB_DR_cFv */
 int daB_DR_c::draw() {
     if (BREG_S(6) == 0 && (arg0 == 0xA || arg0 == 0xFF || arg0 == 0xFE)) {
         return 1;
@@ -484,18 +468,15 @@ int daB_DR_c::draw() {
     return 1;
 }
 
-/* 805BB3E8-805BB408 000668 0020+00 1/0 0/0 0/0 .text            daB_DR_Draw__FP8daB_DR_c */
 static int daB_DR_Draw(daB_DR_c* i_this) {
     return i_this->draw();
 }
 
-/* 805BB408-805BB4B4 000688 00AC+00 11/11 0/0 0/0 .text            setBck__8daB_DR_cFiUcff */
 void daB_DR_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_DR", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 805BB4B4-805BB4CC 000734 0018+00 13/13 0/0 0/0 .text            setActionMode__8daB_DR_cFii */
 void daB_DR_c::setActionMode(int i_action, int i_mode) {
     if (mActionMode != i_action) {
         mActionMode = i_action;
@@ -503,7 +484,6 @@ void daB_DR_c::setActionMode(int i_action, int i_mode) {
     }
 }
 
-/* 805BB4CC-805BB540 00074C 0074+00 1/1 0/0 0/0 .text            mGlider_WindPosSet__8daB_DR_cFv */
 void daB_DR_c::mGlider_WindPosSet() {
     cXyz mae;
     cMtx_YrotS(*calc_mtx, shape_angle.y);
@@ -515,7 +495,6 @@ void daB_DR_c::mGlider_WindPosSet() {
     mGlider_WindPos += current.pos;
 }
 
-/* 805BB540-805BB64C 0007C0 010C+00 2/2 0/0 0/0 .text            mBoot_c_tranceSet__8daB_DR_cFb */
 void daB_DR_c::mBoot_c_tranceSet(bool param_0) {
     cXyz mae;
     cXyz ato;
@@ -537,7 +516,6 @@ void daB_DR_c::mBoot_c_tranceSet(bool param_0) {
     }
 }
 
-/* 805BB64C-805BB6E8 0008CC 009C+00 9/9 0/0 0/0 .text            mStatusONOFF__8daB_DR_cFi */
 void daB_DR_c::mStatusONOFF(int i_status) {
     switch (i_status) {
     case 0:
@@ -561,7 +539,6 @@ void daB_DR_c::mStatusONOFF(int i_status) {
     }    
 }
 
-/* 805BB6E8-805BBFC0 000968 08D8+00 2/1 0/0 0/0 .text            setSe__8daB_DR_cFv */
 void daB_DR_c::setSe() {
     bool play_wing_se = false;
 
@@ -744,7 +721,6 @@ void daB_DR_c::setSe() {
     }
 }
 
-/* 805BBFC0-805BC0B8 001240 00F8+00 1/1 0/0 0/0 .text            setDeathLightEffect__8daB_DR_cFv */
 void daB_DR_c::setDeathLightEffect() {
     for (int i = 0; i < 4; i++) {
         static u16 w_eff_id[] = {0x854C, 0x854D, 0x854E, 0x854F};
@@ -754,7 +730,6 @@ void daB_DR_c::setDeathLightEffect() {
     fopAcM_seStart(this, JA_SE_CM_MONS_EXPLODE, 0);
 }
 
-/* 805BC0B8-805BC248 001338 0190+00 3/3 0/0 0/0 .text            chkPartCreate__8daB_DR_cFb */
 void daB_DR_c::chkPartCreate(bool param_0) {    
     static const struct {
         int jnt_no;
@@ -870,7 +845,6 @@ void daB_DR_c::chkPartCreate(bool param_0) {
     }
 }
 
-/* 805BC248-805BC57C 0014C8 0334+00 7/6 0/0 0/0 .text            mHabatakiAnmSet__8daB_DR_cFi */
 void daB_DR_c::mHabatakiAnmSet(int param_0) {
     switch (mAnm) {
     case ANM_DR_FLY_TO_GLIDE:
@@ -929,7 +903,6 @@ static u8 dummy(u8 param_0) {
     return cLib_calcTimer<u8>(&param_0);
 }
 
-/* 805BC57C-805BC8B4 0017FC 0338+00 3/2 0/0 0/0 .text            mGlider_AniSet__8daB_DR_cFb */
 void daB_DR_c::mGlider_AniSet(bool param_0) {
     if (param_0 && mTimer[0] != 0 && mAnm == ANM_DR_FLY) {
         mTimer[0] = 0;
@@ -981,7 +954,6 @@ void daB_DR_c::mGlider_AniSet(bool param_0) {
     }
 }
 
-/* 805BC8B4-805BCA10 001B34 015C+00 2/1 0/0 0/0 .text            mGliderAtAniSet__8daB_DR_cFv */
 void daB_DR_c::mGliderAtAniSet() {
     switch (mAnm) {
     case ANM_DR_FLY_TO_GLIDE:
@@ -1007,7 +979,6 @@ void daB_DR_c::mGliderAtAniSet() {
     }
 }
 
-/* 805BCA10-805BCAD4 001C90 00C4+00 1/1 0/0 0/0 .text            tail_hit_check__8daB_DR_cFv */
 void daB_DR_c::tail_hit_check() {
     if (health > 0) {
         daPy_getPlayerActorClass()->onBossRoomWait();
@@ -1024,7 +995,6 @@ void daB_DR_c::tail_hit_check() {
     }
 }
 
-/* 805BCAD4-805BCBD0 001D54 00FC+00 1/1 0/0 0/0 .text            week_hit_check__8daB_DR_cFv */
 void daB_DR_c::week_hit_check() {
     if (mWeekCc.ChkTgSet()) {
         daPy_getPlayerActorClass()->onBossRoomWait();
@@ -1043,27 +1013,23 @@ void daB_DR_c::week_hit_check() {
     }
 }
 
-/* 805BCBD0-805BCBF4 001E50 0024+00 1/1 0/0 0/0 .text            mTimerClr__8daB_DR_cFv */
 void daB_DR_c::mTimerClr() {
     for (int i = 0; i < 4; i++) {
         mTimer[i] = 0;
     }
 }
 
-/* 805BCBF4-805BCC18 001E74 0024+00 1/1 0/0 0/0 .text            mCountClr__8daB_DR_cFv */
 void daB_DR_c::mCountClr() {
     for (int i = 0; i < 4; i++) {
         mCount[i] = 0;
     }
 }
 
-/* 805BCC18-805BCC4C 001E98 0034+00 12/12 0/0 0/0 .text            mAllClr__8daB_DR_cFv */
 void daB_DR_c::mAllClr() {
     mTimerClr();
     mCountClr();
 }
 
-/* 805BCC4C-805BCD7C 001ECC 0130+00 1/1 0/0 0/0 .text            mHeadAngleSet__8daB_DR_cFv */
 void daB_DR_c::mHeadAngleSet() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz unused;
@@ -1103,7 +1069,6 @@ void daB_DR_c::mHeadAngleSet() {
     }
 }
 
-/* 805BCD7C-805BCEA4 001FFC 0128+00 2/2 0/0 0/0 .text            flapMove__8daB_DR_cFb */
 bool daB_DR_c::flapMove(bool param_0) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     f32 target_y = 2000.0f + NREG_F(1);
@@ -1138,7 +1103,6 @@ bool daB_DR_c::flapMove(bool param_0) {
     return false;
 }
 
-/* 805BCEA4-805BD05C 002124 01B8+00 3/3 0/0 0/0 .text            revolutionMove__8daB_DR_cFv */
 bool daB_DR_c::revolutionMove() {
     cXyz mae;
     cXyz unused;
@@ -1184,7 +1148,6 @@ bool daB_DR_c::revolutionMove() {
     return true;
 }
 
-/* 805BD05C-805BD15C 0022DC 0100+00 11/11 0/0 0/0 .text            mPlayerHighCheck__8daB_DR_cFv */
 bool daB_DR_c::mPlayerHighCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dBgS_GndChk gndchk;
@@ -1206,7 +1169,6 @@ bool daB_DR_c::mPlayerHighCheck() {
     return false;
 }
 
-/* 805BD15C-805BD3E4 0023DC 0288+00 3/3 0/0 0/0 .text            mBgFallGroundCheck__8daB_DR_cFv */
 bool daB_DR_c::mBgFallGroundCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dBgS_GndChk gndchk;
@@ -1260,7 +1222,6 @@ bool daB_DR_c::mBgFallGroundCheck() {
     return true;
 }
 
-/* 805BD3E4-805BD5FC 002664 0218+00 3/3 0/0 0/0 .text            normalHoverMove__8daB_DR_cFv */
 void daB_DR_c::normalHoverMove() {
     cXyz target_pos;
     cXyz target_vec;
@@ -1282,7 +1243,6 @@ void daB_DR_c::normalHoverMove() {
     }
 }
 
-/* 805BD5FC-805BD98C 00287C 0390+00 1/1 0/0 0/0 .text            executeWait__8daB_DR_cFv */
 void daB_DR_c::executeWait() {
     cXyz sp20;
     cXyz sp14;
@@ -1347,7 +1307,6 @@ void daB_DR_c::executeWait() {
     }
 }
 
-/* 805BD98C-805BDBC4 002C0C 0238+00 1/1 0/0 0/0 .text            executeFlyWait__8daB_DR_cFv */
 void daB_DR_c::executeFlyWait() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp8;
@@ -1418,7 +1377,6 @@ void daB_DR_c::executeFlyWait() {
     cLib_addCalcAngleS2(&field_0x750, 8, 10, 20);
 }
 
-/* 805BDBC4-805BE9B4 002E44 0DF0+00 1/1 0/0 0/0 .text            executeTailHit__8daB_DR_cFv */
 void daB_DR_c::executeTailHit() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1772,7 +1730,6 @@ void daB_DR_c::executeTailHit() {
     }
 }
 
-/* 805BE9B4-805BF4C8 003C34 0B14+00 1/1 0/0 0/0 .text            executeWeekHit__8daB_DR_cFv */
 void daB_DR_c::executeWeekHit() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz sp50;
@@ -2006,10 +1963,8 @@ void daB_DR_c::executeWeekHit() {
     daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &offset);
 }
 
-/* 805C7974-805C7978 0000BC 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_805C7974;
 
-/* 805BF4C8-805BF768 004748 02A0+00 2/2 0/0 0/0 .text            mBreathSet__8daB_DR_cFv */
 void daB_DR_c::mBreathSet() {
     cXyz mae;
     cXyz ato;
@@ -2052,7 +2007,6 @@ void daB_DR_c::mBreathSet() {
     }
 }
 
-/* 805BF768-805BFA6C 0049E8 0304+00 1/1 0/0 0/0 .text            mBreathHighSet__8daB_DR_cFb */
 bool daB_DR_c::mBreathHighSet(bool param_0) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz mae;
@@ -2101,7 +2055,6 @@ bool daB_DR_c::mBreathHighSet(bool param_0) {
     return false;
 }
 
-/* 805BFA6C-805BFD88 004CEC 031C+00 1/1 0/0 0/0 .text            mFeintBreath__8daB_DR_cFv */
 bool daB_DR_c::mFeintBreath() {
     s16 temp_r30 = field_0x754;
 
@@ -2170,7 +2123,6 @@ bool daB_DR_c::mFeintBreath() {
     return true;
 }
 
-/* 805BFD88-805C062C 005008 08A4+00 1/1 0/0 0/0 .text            executeBreathAttack__8daB_DR_cFv */
 void daB_DR_c::executeBreathAttack() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp1C;
@@ -2407,7 +2359,6 @@ void daB_DR_c::executeBreathAttack() {
     }
 }
 
-/* 805C062C-805C0CAC 0058AC 0680+00 1/1 0/0 0/0 .text            executeWindAttack__8daB_DR_cFv */
 void daB_DR_c::executeWindAttack() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp30;
@@ -2533,7 +2484,6 @@ void daB_DR_c::executeWindAttack() {
     cLib_addCalc2(&current.pos.y, 400.0f + mTargetHeight, 0.8f, 20.0f);
 }
 
-/* 805C0CAC-805C0EF8 005F2C 024C+00 1/1 0/0 0/0 .text            mGliderMoveSub__8daB_DR_cFf */
 bool daB_DR_c::mGliderMoveSub(f32 param_0) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp18;
@@ -2566,7 +2516,6 @@ bool daB_DR_c::mGliderMoveSub(f32 param_0) {
     return true;
 }
 
-/* 805C0EF8-805C1E0C 006178 0F14+00 2/1 0/0 0/0 .text            executeGliderAttack__8daB_DR_cFv */
 void daB_DR_c::executeGliderAttack() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz mae;
@@ -2871,7 +2820,6 @@ void daB_DR_c::executeGliderAttack() {
     }
 }
 
-/* 805C1E0C-805C24BC 00708C 06B0+00 1/1 0/0 0/0 .text            executePillarSearch__8daB_DR_cFv */
 void daB_DR_c::executePillarSearch() {
     static cXyz mPillarTop_dt[] = {
         cXyz(3100.0f, 5500.0f, 1500.0f),
@@ -2951,7 +2899,6 @@ void daB_DR_c::executePillarSearch() {
     }
 }
 
-/* 805C24BC-805C2BE8 00773C 072C+00 1/1 0/0 0/0 .text            executePillarWait__8daB_DR_cFv */
 void daB_DR_c::executePillarWait() {
 #ifdef DEBUG
     dDbVw_Report(30, 100, "Pole wait tyuu Timer:%d ", mTimer[0]);
@@ -3072,7 +3019,6 @@ void daB_DR_c::executePillarWait() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 10, 0x400);
 }
 
-/* 805C2BE8-805C2CD0 007E68 00E8+00 4/4 0/0 0/0 .text            startDemoCheck__8daB_DR_cFv */
 bool daB_DR_c::startDemoCheck() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera0 = dComIfGp_getCamera(0);
@@ -3091,7 +3037,6 @@ bool daB_DR_c::startDemoCheck() {
     }
 }
 
-/* 805C2CD0-805C3558 007F50 0888+00 2/1 0/0 0/0 .text            executeDamageDemo__8daB_DR_cFv */
 void daB_DR_c::executeDamageDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3287,7 +3232,6 @@ void daB_DR_c::executeDamageDemo() {
     daPy_getPlayerActorClass()->setHookshotCarryOffset(fopAcM_GetID(this), &offset);
 }
 
-/* 805C3558-805C36A4 0087D8 014C+00 1/1 0/0 0/0 .text            executeMiddleDemo__8daB_DR_cFv */
 void daB_DR_c::executeMiddleDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3319,7 +3263,6 @@ void daB_DR_c::executeMiddleDemo() {
     }
 }
 
-/* 805C36A4-805C382C 008924 0188+00 1/1 0/0 0/0 .text            executeDead__8daB_DR_cFv */
 void daB_DR_c::executeDead() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3358,7 +3301,6 @@ void daB_DR_c::executeDead() {
     }
 }
 
-/* 805C382C-805C39D8 008AAC 01AC+00 1/1 0/0 0/0 .text            executeBullet__8daB_DR_cFv */
 void daB_DR_c::executeBullet() {
     cXyz mae;
 
@@ -3402,7 +3344,6 @@ void daB_DR_c::executeBullet() {
     }
 }
 
-/* 805C39D8-805C3CB0 008C58 02D8+00 2/1 0/0 0/0 .text            executeParts__8daB_DR_cFv */
 void daB_DR_c::executeParts() {
     camera_class* camera = dComIfGp_getCamera(0);
     cXyz mae;
@@ -3474,7 +3415,6 @@ void daB_DR_c::executeParts() {
     }
 }
 
-/* 805C3CB0-805C40E0 008F30 0430+00 2/1 0/0 0/0 .text            action__8daB_DR_cFv */
 void daB_DR_c::action() {
     tail_hit_check();
     week_hit_check();
@@ -3599,14 +3539,12 @@ void daB_DR_c::action() {
     mpCoreBrk->play();
 }
 
-/* 805C40E0-805C4130 009360 0050+00 1/1 0/0 0/0 .text            action_fire__8daB_DR_cFv */
 void daB_DR_c::action_fire() {
     executeBullet();
     shape_angle = current.angle;
     fopAcM_posMove(this, mColliderStts.GetCCMoveP());
 }
 
-/* 805C4130-805C41A4 0093B0 0074+00 1/1 0/0 0/0 .text            action_parts__8daB_DR_cFv */
 void daB_DR_c::action_parts() {
     executeParts();
     fopAcM_posMoveF(this, mColliderStts.GetCCMoveP());
@@ -3614,7 +3552,6 @@ void daB_DR_c::action_parts() {
     mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 805C41A4-805C4684 009424 04E0+00 2/2 0/0 0/0 .text            mtx_set__8daB_DR_cFv */
 void daB_DR_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::transM(mBoot_c_trance.x, mBoot_c_trance.y, mBoot_c_trance.z);
@@ -3677,7 +3614,6 @@ void daB_DR_c::mtx_set() {
     }
 }
 
-/* 805C4684-805C46E0 009904 005C+00 1/1 0/0 0/0 .text            parts_mtx_set__8daB_DR_cFv */
 void daB_DR_c::parts_mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -3685,7 +3621,6 @@ void daB_DR_c::parts_mtx_set() {
     mpPartModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805C46E0-805C4E14 009960 0734+00 1/1 0/0 0/0 .text            cc_set__8daB_DR_cFv */
 void daB_DR_c::cc_set() {
     cXyz mae;
     cXyz ato;
@@ -3810,7 +3745,6 @@ void daB_DR_c::cc_set() {
     dComIfG_Ccsp()->Set(&mWeekCc);
 }
 
-/* 805C4E14-805C4FB4 00A094 01A0+00 1/1 0/0 0/0 .text            down_cc_set__8daB_DR_cFv */
 void daB_DR_c::down_cc_set() {
     cXyz mae;
     cXyz ato;
@@ -3870,7 +3804,6 @@ void daB_DR_c::down_cc_set() {
     }
 }
 
-/* 805C4FB4-805C50BC 00A234 0108+00 1/1 0/0 0/0 .text            demo_skip__8daB_DR_cFi */
 void daB_DR_c::demo_skip(int) {
     fopAc_ac_c* parent;
     if (cDmr_SkipInfo == 0 && fopAcM_SearchByID(parentActorID, &parent) && parent != NULL) {
@@ -3889,7 +3822,6 @@ void daB_DR_c::demo_skip(int) {
     }
 }
 
-/* 805C50BC-805C50F0 00A33C 0034+00 1/1 0/0 0/0 .text            DemoSkipCallBack__8daB_DR_cFPvi */
 int daB_DR_c::DemoSkipCallBack(void* i_proc, int param_1) {
     if (i_proc != NULL) {
         ((daB_DR_c*)i_proc)->demo_skip(param_1);
@@ -3899,7 +3831,6 @@ int daB_DR_c::DemoSkipCallBack(void* i_proc, int param_1) {
     return 0;
 }
 
-/* 805C50F0-805C5588 00A370 0498+00 1/1 0/0 0/0 .text            execute__8daB_DR_cFv */
 int daB_DR_c::execute() {
     if (field_0x7d5 != 0) {
         cXyz restart_pos;
@@ -4008,17 +3939,14 @@ int daB_DR_c::execute() {
     return 1;
 }
 
-/* 805C5588-805C55A8 00A808 0020+00 2/1 0/0 0/0 .text            daB_DR_Execute__FP8daB_DR_c */
 static int daB_DR_Execute(daB_DR_c* i_this) {
     return i_this->execute();
 }
 
-/* 805C55A8-805C55B0 00A828 0008+00 1/0 0/0 0/0 .text            daB_DR_IsDelete__FP8daB_DR_c */
 static int daB_DR_IsDelete(daB_DR_c* i_this) {
     return 1;
 }
 
-/* 805C55B0-805C5684 00A830 00D4+00 1/1 0/0 0/0 .text            _delete__8daB_DR_cFv */
 int daB_DR_c::_delete() {
     dComIfG_resDelete(&mPhase, "B_DR");
 
@@ -4045,12 +3973,10 @@ int daB_DR_c::_delete() {
     return 1;
 }
 
-/* 805C5684-805C56A4 00A904 0020+00 1/0 0/0 0/0 .text            daB_DR_Delete__FP8daB_DR_c */
 static int daB_DR_Delete(daB_DR_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805C56A4-805C590C 00A924 0268+00 1/1 0/0 0/0 .text            CreateHeap__8daB_DR_cFv */
 int daB_DR_c::CreateHeap() {
     if (arg0 == 0x14 || arg0 == 0x15) {
         static int mPartDt[] = {74, 74, 75, 76, 77, 78};
@@ -4095,12 +4021,10 @@ int daB_DR_c::CreateHeap() {
     return 1;
 }
 
-/* 805C5954-805C5974 00ABD4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daB_DR_c*)i_this)->CreateHeap();
 }
 
-/* 805C5974-805C62B0 00ABF4 093C+00 1/1 0/0 0/0 .text            create__8daB_DR_cFv */
 int daB_DR_c::create() {
     fopAcM_ct(this, daB_DR_c);
 
@@ -4349,15 +4273,12 @@ int daB_DR_c::create() {
     return phase_state;
 }
 
-/* 805C62B0-805C6678 00B530 03C8+00 1/1 0/0 0/0 .text            __ct__8daB_DR_cFv */
 daB_DR_c::daB_DR_c() {}
 
-/* 805C6B2C-805C6B4C 00BDAC 0020+00 1/0 0/0 0/0 .text            daB_DR_Create__FP8daB_DR_c */
 static int daB_DR_Create(daB_DR_c* i_this) {
     return i_this->create();
 }
 
-/* 805C77E4-805C7804 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_DR_Method */
 static actor_method_class l_daB_DR_Method = {
     (process_method_func)daB_DR_Create,
     (process_method_func)daB_DR_Delete,
@@ -4366,7 +4287,6 @@ static actor_method_class l_daB_DR_Method = {
     (process_method_func)daB_DR_Draw,
 };
 
-/* 805C7804-805C7834 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_DR */
 extern actor_process_profile_definition g_profile_B_DR = {
   fpcLy_CURRENT_e,        // mLayerID
   4,                      // mListID
diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp
index fee3997043..d7fa5a7114 100644
--- a/src/d/actor/d_a_b_dre.cpp
+++ b/src/d/actor/d_a_b_dre.cpp
@@ -49,18 +49,14 @@ int daB_DRE_c::CreateHeap() {
     return 1;
 }
 
-/* 805C7B2C-805C7D6C 0000EC 0240+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daB_DRE_c*)i_this)->CreateHeap();
 }
 
-/* 805C7DB4-805C7DD4 000374 0020+00 1/0 0/0 0/0 .text            daB_DRE_Create__FP10fopAc_ac_c */
 static int daB_DRE_Create(fopAc_ac_c* i_this) {
     return ((daB_DRE_c*)i_this)->create();
 }
 
-/* 805C7DD4-805C7E88 000394 00B4+00 4/4 0/0 0/0 .text SetAnm__9daB_DRE_cFP16mDoExt_McaMorfSOiiff
- */
 void daB_DRE_c::SetAnm(mDoExt_McaMorfSO* i_modelMorf, int i_anm, int i_attr, f32 i_morf,
                        f32 i_speed) {
     i_modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_DR", i_anm), i_attr, i_morf,
@@ -68,13 +64,11 @@ void daB_DRE_c::SetAnm(mDoExt_McaMorfSO* i_modelMorf, int i_anm, int i_attr, f32
     mAnm = i_anm;
 }
 
-/* 805C7E88-805C7EAC 000448 0024+00 1/0 0/0 0/0 .text            daB_DRE_Delete__FP9daB_DRE_c */
 static int daB_DRE_Delete(daB_DRE_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 805C7EAC-805C7FCC 00046C 0120+00 1/1 0/0 0/0 .text            CameraSet__9daB_DRE_cFv */
 bool daB_DRE_c::CameraSet() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* cam_body = dCam_getBody();
@@ -97,13 +91,11 @@ bool daB_DRE_c::CameraSet() {
     return 1;
 }
 
-/* 805C8008-805C808C 0005C8 0084+00 2/2 0/0 0/0 .text            SetStopingCam__9daB_DRE_cFv */
 void daB_DRE_c::SetStopingCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805C808C-805C81B8 00064C 012C+00 3/3 0/0 0/0 .text            SetStopCam__9daB_DRE_cF4cXyzffs */
 void daB_DRE_c::SetStopCam(cXyz i_center, f32 param_1, f32 i_eyeY, s16 i_offsetAngle) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -119,7 +111,6 @@ void daB_DRE_c::SetStopCam(cXyz i_center, f32 param_1, f32 i_eyeY, s16 i_offsetA
     field_0x608 = param_1;
 }
 
-/* 805C81B8-805C8208 000778 0050+00 1/1 0/0 0/0 .text            SetCMoveCam__9daB_DRE_cF4cXyzf */
 bool daB_DRE_c::SetCMoveCam(cXyz i_target, f32 i_step) {
     mCamCenterTarget = i_target;
     if (cLib_chasePos(&mCamCenter, mCamCenterTarget, i_step)) {
@@ -129,14 +120,11 @@ bool daB_DRE_c::SetCMoveCam(cXyz i_target, f32 i_step) {
     return 0;
 }
 
-/* 805C8208-805C824C 0007C8 0044+00 2/2 0/0 0/0 .text            SetCMoveCam__9daB_DRE_cF4cXyzff */
 void daB_DRE_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_step) {
     mCamCenterTarget = i_target;
     cLib_addCalcPos2(&mCamCenter, mCamCenterTarget, i_scale, i_step);
 }
 
-/* 805C824C-805C8348 00080C 00FC+00 2/2 0/0 0/0 .text            SetEyeMoveCam__9daB_DRE_cF4cXyzffsf
- */
 void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle,
                               f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -150,7 +138,6 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805C8348-805C8458 000908 0110+00 1/1 0/0 0/0 .text SetEyeMoveCam__9daB_DRE_cF4cXyzffsff */
 void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offsetAngle,
                               f32 i_scale, f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -163,7 +150,6 @@ void daB_DRE_c::SetEyeMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 i_offs
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805C8458-805C8544 000A18 00EC+00 1/1 0/0 0/0 .text            SetMoveCam__9daB_DRE_cFff */
 void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -173,7 +159,6 @@ void daB_DRE_c::SetMoveCam(f32 i_scale, f32 i_step) {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805C8544-805C85E8 000B04 00A4+00 1/1 0/0 0/0 .text            SetReleaseCam__9daB_DRE_cFv */
 void daB_DRE_c::SetReleaseCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -184,26 +169,19 @@ void daB_DRE_c::SetReleaseCam() {
 }
 
 namespace {
-/* 805CB080-805CB084 000048 0004+00 0/1 0/0 0/0 .bss             s_dis__23@unnamed@d_a_b_dre_cpp@ */
 static f32 s_dis;
 
-/* 805CB084-805CB088 00004C 0004+00 1/2 0/0 0/0 .bss s_LinkPos__23@unnamed@d_a_b_dre_cpp@ */
 static cXyz* s_LinkPos;
 
-/* 805CB088-805CB08C 000050 0002+02 0/1 0/0 0/0 .bss s_TargetAngle__23@unnamed@d_a_b_dre_cpp@ */
 static s16 s_TargetAngle;
 
-/* 805CB098-805CB0A4 000060 000C+00 3/6 0/0 0/0 .bss s_HeadPos__23@unnamed@d_a_b_dre_cpp@ */
 static cXyz s_HeadPos;
 
-/* 805CB0B0-805CB0BC 000078 000C+00 0/3 0/0 0/0 .bss s_BodyPos__23@unnamed@d_a_b_dre_cpp@ */
 static cXyz s_BodyPos;
 
-/* 805CB0C8-805CB0D4 000090 000C+00 0/3 0/0 0/0 .bss s_TalePos__23@unnamed@d_a_b_dre_cpp@ */
 static cXyz s_TalePos;
 }  // namespace
 
-/* 805C85E8-805C8BF8 000BA8 0610+00 1/1 0/0 0/0 .text            CamAction2__9daB_DRE_cFv */
 void daB_DRE_c::CamAction2() {
     cXyz pos;
     pos = current.pos;
@@ -316,7 +294,6 @@ void daB_DRE_c::CamAction2() {
     }
 }
 
-/* 805C8BF8-805C8EDC 0011B8 02E4+00 1/1 0/0 0/0 .text            DrAction2__9daB_DRE_cFv */
 void daB_DRE_c::DrAction2() {
     cXyz eye_pos;
     cXyz sp8;
@@ -385,7 +362,6 @@ void daB_DRE_c::DrAction2() {
     }
 }
 
-/* 805C8EDC-805C9318 00149C 043C+00 2/1 0/0 0/0 .text            CamAction__9daB_DRE_cFv */
 void daB_DRE_c::CamAction() {
     cXyz pos;
     pos = current.pos;
@@ -472,7 +448,6 @@ void daB_DRE_c::CamAction() {
     }
 }
 
-/* 805C9318-805C9378 0018D8 0060+00 1/1 0/0 0/0 .text            Action__9daB_DRE_cFv */
 void daB_DRE_c::Action() {
     switch (mAction) {
     case 0:
@@ -486,7 +461,6 @@ void daB_DRE_c::Action() {
     }
 }
 
-/* 805C9378-805C9B40 001938 07C8+00 2/1 0/0 0/0 .text            DrAction__9daB_DRE_cFv */
 void daB_DRE_c::DrAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp90;
@@ -666,7 +640,6 @@ void daB_DRE_c::DrAction() {
     }
 }
 
-/* 805C9B40-805CA158 002100 0618+00 2/1 0/0 0/0 .text            SoundChk__9daB_DRE_cFv */
 void daB_DRE_c::SoundChk() {
     switch (mAnm) {
     case 0x21:
@@ -740,7 +713,6 @@ void daB_DRE_c::SoundChk() {
     }
 }
 
-/* 805CA158-805CA49C 002718 0344+00 1/1 0/0 0/0 .text            Execute__9daB_DRE_cFv */
 int daB_DRE_c::Execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s_LinkPos = &fopAcM_GetPosition(player);
@@ -787,16 +759,13 @@ int daB_DRE_c::Execute() {
     return 1;
 }
 
-/* 805CA49C-805CA4FC 002A5C 0060+00 1/1 0/0 0/0 .text            SpeedSet__9daB_DRE_cFv */
 void daB_DRE_c::SpeedSet() {
     cLib_addCalc2(&speed.y, mTargetSpeedY, 0.2f, 10.0f);
     cLib_addCalc2(&speedF, mTargetSpeedF, 0.2f, 10.0f);
 }
 
-/* 805CB0D4-805CB0D8 00009C 0004+00 1/1 0/0 0/0 .bss             None */
 static u8 data_805CB0D4;
 
-/* 805CA4FC-805CA670 002ABC 0174+00 1/1 0/0 0/0 .text            BreathSet__9daB_DRE_cFv */
 void daB_DRE_c::BreathSet() {
     cXyz sp20;
     cXyz sp14;
@@ -818,7 +787,6 @@ void daB_DRE_c::BreathSet() {
     }
 }
 
-/* 805CA670-805CA6C0 002C30 0050+00 1/1 0/0 0/0 .text            Delete__9daB_DRE_cFv */
 int daB_DRE_c::Delete() {
     dComIfG_resDelete(&mPhase, "B_DR");
 
@@ -829,7 +797,6 @@ int daB_DRE_c::Delete() {
     return 1;
 }
 
-/* 805CA6C0-805CA780 002C80 00C0+00 2/2 0/0 0/0 .text            setBaseMtx__9daB_DRE_cFv */
 void daB_DRE_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -890,17 +857,14 @@ int daB_DRE_c::Draw() {
     return 1;
 }
 
-/* 805CA780-805CA924 002D40 01A4+00 1/0 0/0 0/0 .text            daB_DRE_Draw__FP9daB_DRE_c */
 static int daB_DRE_Draw(daB_DRE_c* i_this) {
     return i_this->Draw();
 }
 
-/* 805CA924-805CA944 002EE4 0020+00 2/1 0/0 0/0 .text            daB_DRE_Execute__FP9daB_DRE_c */
 static int daB_DRE_Execute(daB_DRE_c* i_this) {
     return i_this->Execute();
 }
 
-/* 805CA944-805CAC3C 002F04 02F8+00 1/1 0/0 0/0 .text            create__9daB_DRE_cFv */
 int daB_DRE_c::create() {
     fopAcM_ct(this, daB_DRE_c);
 
@@ -969,19 +933,16 @@ int daB_DRE_c::create() {
     return phase_state;
 }
 
-/* 805CACAC-805CACB4 00326C 0008+00 1/0 0/0 0/0 .text            daB_DRE_IsDelete__FP9daB_DRE_c */
 static int daB_DRE_IsDelete(daB_DRE_c* i_this) {
     return 1;
 }
 
-/* 805CAFB4-805CAFD4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_DRE_Method */
 static actor_method_class l_daB_DRE_Method = {
     (process_method_func)daB_DRE_Create,  (process_method_func)daB_DRE_Delete,
     (process_method_func)daB_DRE_Execute, (process_method_func)daB_DRE_IsDelete,
     (process_method_func)daB_DRE_Draw,
 };
 
-/* 805CAFD4-805CB004 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_DRE */
 extern actor_process_profile_definition g_profile_B_DRE = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp
index ba4a534351..9312f5ad89 100644
--- a/src/d/actor/d_a_b_ds.cpp
+++ b/src/d/actor/d_a_b_ds.cpp
@@ -81,7 +81,6 @@ enum daB_DS_head_Joint {
 };
 
 namespace {
-/* 805DD280-805DD2C0 000038 0040+00 0/1 0/0 0/0 .data cc_ds_week_src__22@unnamed@d_a_b_ds_cpp@ */
 static dCcD_SrcSph cc_ds_week_src = {
     {
         0,
@@ -96,7 +95,6 @@ static dCcD_SrcSph cc_ds_week_src = {
     }}                       // mSph
 };
 
-/* 805DD2C0-805DD300 000078 0040+00 0/1 0/0 0/0 .data cc_ds_head_src__22@unnamed@d_a_b_ds_cpp@ */
 static dCcD_SrcSph cc_ds_head_src = {
     {
         0,
@@ -111,7 +109,6 @@ static dCcD_SrcSph cc_ds_head_src = {
     }}                       // mSph
 };
 
-/* 805DD300-805DD340 0000B8 0040+00 0/0 0/0 0/0 .data cc_ds_body_src__22@unnamed@d_a_b_ds_cpp@ */
 static dCcD_SrcSph cc_ds_body_src = {
     {
         0,
@@ -126,8 +123,6 @@ static dCcD_SrcSph cc_ds_body_src = {
     }}                       // mSph
 };
 
-/* 805DD340-805DD384 0000F8 0044+00 0/1 0/0 0/0 .data cc_ds_backbone_src__22@unnamed@d_a_b_ds_cpp@
- */
 static dCcD_SrcCyl cc_ds_backbone_src = {
     {
         0,
@@ -143,8 +138,6 @@ static dCcD_SrcCyl cc_ds_backbone_src = {
     }                        // mCyl
 };
 
-/* 805DD384-805DD3C8 00013C 0044+00 0/1 0/0 0/0 .data
- * cc_ds_hand_at_cyl_src__22@unnamed@d_a_b_ds_cpp@              */
 static dCcD_SrcCyl cc_ds_hand_at_cyl_src = {
     {
         0,
@@ -160,8 +153,6 @@ static dCcD_SrcCyl cc_ds_hand_at_cyl_src = {
     }                        // mCyl
 };
 
-/* 805DD3C8-805DD408 000180 0040+00 0/1 0/0 0/0 .data
- * cc_ds_breath_at_src__22@unnamed@d_a_b_ds_cpp@                */
 static dCcD_SrcSph cc_ds_breath_at_src = {
     {
         0,
@@ -177,7 +168,6 @@ static dCcD_SrcSph cc_ds_breath_at_src = {
 };
 };  // namespace
 
-/* 805CB22C-805CB314 0000EC 00E8+00 1/1 0/0 0/0 .text            __ct__12daB_DS_HIO_cFv */
 daB_DS_HIO_c::daB_DS_HIO_c() {
     field_0x04 = -1;
     mModelSize = 1.0f;
@@ -211,22 +201,18 @@ daB_DS_HIO_c::daB_DS_HIO_c() {
 
 static bool hioInit;
 
-/* 805DDABC-805DDB0C 000054 0050+00 21/23 0/0 0/0 .bss             l_HIO */
 static daB_DS_HIO_c l_HIO;
 
-/* 805DDB0C-805DDB10 -00001 0004+00 0/1 0/0 0/0 .bss             None */
 /* 805DDB0C 0002+00 data_805DDB0C handL_ang */
 /* 805DDB0E 0002+00 data_805DDB0E handR_ang */
 static s16 handL_ang;
 static s16 handR_ang;
 
-/* 805DDB10-805DDB14 -00001 0004+00 3/4 0/0 0/0 .bss             None */
 /* 805DDB10 0002+00 data_805DDB10 handX_ang */
 /* 805DDB12 0002+00 breathTimerBase None */
 static s16 handX_ang;
 static u8 breathTimerBase;
 
-/* 805CB314-805CB4A4 0001D4 0190+00 2/1 0/0 0/0 .text ctrlJoint__8daB_DS_cFP8J3DJointP8J3DModel */
 int daB_DS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     cXyz sp40;
     cXyz sp4C;
@@ -271,7 +257,6 @@ int daB_DS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 805CB4A4-805CB4F0 000364 004C+00 1/1 0/0 0/0 .text JointCallBack__8daB_DS_cFP8J3DJointi */
 int daB_DS_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daB_DS_c* a_this = (daB_DS_c*)j3dSys.getModel()->getUserArea();
@@ -283,7 +268,6 @@ int daB_DS_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805CB4F0-805CBAA8 0003B0 05B8+00 1/1 0/0 0/0 .text            draw__8daB_DS_cFv */
 int daB_DS_c::draw() {
     if (arg0 == TYPE_BULLET_A || arg0 == TYPE_BULLET_B || arg0 == TYPE_BULLET_C ||
         mBossPhase == 100)
@@ -414,28 +398,23 @@ int daB_DS_c::draw() {
     }
 }
 
-/* 805CBAA8-805CBAC8 000968 0020+00 1/0 0/0 0/0 .text            daB_DS_Draw__FP8daB_DS_c */
 static int daB_DS_Draw(daB_DS_c* i_this) {
     return i_this->draw();
 }
 
-/* 805CBAC8-805CBB74 000988 00AC+00 18/18 0/0 0/0 .text            setBck__8daB_DS_cFiUcff */
 void daB_DS_c::setBck(int i_anmID, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* anm = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", i_anmID));
     mpMorf->setAnm(anm, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     mAnmID = i_anmID;
 }
 
-/* 805CBB74-805CBB80 000A34 000C+00 18/18 0/0 0/0 .text            setActionMode__8daB_DS_cFii */
 void daB_DS_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* 805DD470-805DD474 000228 0004+00 5/6 0/0 0/0 .data            eff_smoke_id */
 static u16 eff_smoke_id[2] = {0x8BC4, 0x8BC5};
 
-/* 805CBB80-805CBD00 000A40 0180+00 1/1 0/0 0/0 .text            mSmokeSet__8daB_DS_cFv */
 void daB_DS_c::mSmokeSet() {
     if (mSmokeCount >= 20) {
         return;
@@ -466,14 +445,12 @@ void daB_DS_c::mSmokeSet() {
     }
 }
 
-/* 805CBD00-805CBD64 000BC0 0064+00 3/3 0/0 0/0 .text            mHeadAngle_Clear__8daB_DS_cFv */
 void daB_DS_c::mHeadAngle_Clear() {
     cLib_addCalcAngleS2(&mHeadAngle.x, 0, 20, 0x100);
     cLib_addCalcAngleS2(&mHeadAngle.y, 0, 20, 0x100);
     cLib_addCalcAngleS2(&mHeadAngle.z, 0, 20, 0x100);
 }
 
-/* 805CBD64-805CBED0 000C24 016C+00 1/1 0/0 0/0 .text            HandHitSoundSet__8daB_DS_cFb */
 void daB_DS_c::HandHitSoundSet(bool i_isLeft) {
     csXyz hit_angle;
     cXyz sp18, hit_pos;
@@ -498,7 +475,6 @@ void daB_DS_c::HandHitSoundSet(bool i_isLeft) {
     dComIfGp_setHitMark(2, this, &hit_pos, &hit_angle, NULL, 0);
 }
 
-/* 805CBED0-805CC158 000D90 0288+00 1/1 0/0 0/0 .text            handSPosSet__8daB_DS_cFi */
 void daB_DS_c::handSPosSet(int i_hand) {
     cXyz chk_pos, particle_pos;
     csXyz particle_angle;
@@ -545,7 +521,6 @@ void daB_DS_c::handSPosSet(int i_hand) {
     dComIfGp_getVibration().StartShock(2, 0x4F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 805CC158-805CC1C4 001018 006C+00 8/8 0/0 0/0 .text            hand_smokeSet__8daB_DS_cFUc */
 void daB_DS_c::hand_smokeSet(u8 i_hand) {
     if (i_hand == 0 || i_hand == 1) {
         handSPosSet(0);
@@ -556,7 +531,6 @@ void daB_DS_c::hand_smokeSet(u8 i_hand) {
     }
 }
 
-/* 805CC1C4-805CC454 001084 0290+00 1/1 0/0 0/0 .text            mZsMoveChk__8daB_DS_cFv */
 void daB_DS_c::mZsMoveChk() {
     cXyz offset, zs_pos;
 
@@ -629,7 +603,6 @@ void daB_DS_c::mZsMoveChk() {
     mIsAppear = true;
 }
 
-/* 805CC454-805CC6F4 001314 02A0+00 1/1 0/0 0/0 .text            mZsMoveChk_Guard__8daB_DS_cFv */
 void daB_DS_c::mZsMoveChk_Guard() {
     static s16 mGuardDt[5] = {-0x1800, 0xC00, -0xC00, 0, 0x1800};
 
@@ -693,7 +666,6 @@ void daB_DS_c::mZsMoveChk_Guard() {
     }
 }
 
-/* 805CC6F4-805CC80C 0015B4 0118+00 1/1 0/0 0/0 .text            mTrapScale__8daB_DS_cFv */
 void daB_DS_c::mTrapScale() {
     f32 target_scale = 1.0f;
     if (mBossPhase != 0) {
@@ -716,7 +688,6 @@ void daB_DS_c::mTrapScale() {
     }
 }
 
-/* 805CC80C-805CC8A4 0016CC 0098+00 2/2 0/0 0/0 .text            mClearTrap__8daB_DS_cFb */
 void daB_DS_c::mClearTrap(bool i_delete) {
     for (int i = 0; i < 20; i++) {
         if (mTrapID[i] == 0) {
@@ -736,7 +707,6 @@ void daB_DS_c::mClearTrap(bool i_delete) {
     }
 }
 
-/* 805CC8A4-805CCEB4 001764 0610+00 3/3 0/0 0/0 .text            mCreateTrap__8daB_DS_cFb */
 void daB_DS_c::mCreateTrap(bool param_0) {
     daPy_py_c* pla = daPy_getPlayerActorClass();
     if (mBossPhase == 0) {
@@ -871,7 +841,6 @@ void daB_DS_c::mCreateTrap(bool param_0) {
     }
 }
 
-/* 805CCEB4-805CD074 001D74 01C0+00 1/1 0/0 0/0 .text            mChangeVer2__8daB_DS_cFv */
 void daB_DS_c::mChangeVer2() {
     if (bitSw != 0xFF) {
         fopAcM_offSwitch(this, bitSw);
@@ -919,7 +888,6 @@ void daB_DS_c::mChangeVer2() {
     field_0x560 = health = l_HIO.mP2Health;
 }
 
-/* 805CD074-805CD628 001F34 05B4+00 1/1 0/0 0/0 .text            damage_check__8daB_DS_cFv */
 void daB_DS_c::damage_check() {
     if (health <= 1 || mBossPhase == 100) {
         return;
@@ -1059,7 +1027,6 @@ void daB_DS_c::damage_check() {
     }
 }
 
-/* 805CD628-805CD844 0024E8 021C+00 1/1 0/0 0/0 .text            neck_set__8daB_DS_cFv */
 void daB_DS_c::neck_set() {
     static f32 HeadAngleDt[3] = {-850.0f, -350.0f, -50.0f};
     cXyz mae;
@@ -1118,7 +1085,6 @@ void daB_DS_c::neck_set() {
     }
 }
 
-/* 805CD844-805CD8D8 002704 0094+00 1/1 0/0 0/0 .text            mCutTypeCheck__8daB_DS_cFv */
 bool daB_DS_c::mCutTypeCheck() {
     daPy_py_c* pla = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -1149,7 +1115,6 @@ bool daB_DS_c::mCutTypeCheck() {
     return false;
 }
 
-/* 805CD8D8-805CDA08 002798 0130+00 5/5 0/0 0/0 .text            startDemoCheck__8daB_DS_cFv */
 bool daB_DS_c::startDemoCheck() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -1172,13 +1137,11 @@ bool daB_DS_c::startDemoCheck() {
     }
 }
 
-/* 805CDA08-805CDA44 0028C8 003C+00 1/1 0/0 0/0 .text            setYoMessage__8daB_DS_cFi */
 void daB_DS_c::setYoMessage(int i_msgIdx) {
     mMsgIdx = i_msgIdx;
     mMsgPcID = fopMsgM_messageSet(i_msgIdx, 1000);
 }
 
-/* 805CDA44-805CDAC0 002904 007C+00 1/1 0/0 0/0 .text            doYoMessage__8daB_DS_cFv */
 bool daB_DS_c::doYoMessage() {
     if (mpMsg != NULL) {
         if (mpMsg->mode == 0xE) {
@@ -1195,7 +1158,6 @@ bool daB_DS_c::doYoMessage() {
     return false;
 }
 
-/* 805CDAC0-805CFA08 002980 1F48+00 2/1 0/0 0/0 .text            executeOpeningDemo__8daB_DS_cFv */
 void daB_DS_c::executeOpeningDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* pla = daPy_getPlayerActorClass();
@@ -1766,7 +1728,6 @@ void daB_DS_c::executeOpeningDemo() {
     }
 }
 
-/* 805CFC8C-805D002C 004B4C 03A0+00 3/3 0/0 0/0 .text            mHandBreathChk__8daB_DS_cFv */
 bool daB_DS_c::mHandBreathChk() {
     daPy_py_c* pla = daPy_getPlayerActorClass();
     if (daPy_getPlayerActorClass()->getDamageWaitTimer() > 10) {
@@ -1806,7 +1767,6 @@ bool daB_DS_c::mHandBreathChk() {
     return false;
 }
 
-/* 805D002C-805D0194 004EEC 0168+00 1/1 0/0 0/0 .text            executeWait__8daB_DS_cFv */
 void daB_DS_c::executeWait() {
     static int Ds_wait_id[3] = {
         ANM_WAIT01_A,
@@ -1845,7 +1805,6 @@ void daB_DS_c::executeWait() {
     mHandBreathChk();
 }
 
-/* 805D0194-805D02F8 005054 0164+00 1/1 0/0 0/0 .text            executeCircle__8daB_DS_cFv */
 void daB_DS_c::executeCircle() {
     static int Ds_circle_id[6] = {
         ANM_CIRCLE_L_A, ANM_CIRCLE_L_B, ANM_CIRCLE_L_C,
@@ -1878,7 +1837,6 @@ void daB_DS_c::executeCircle() {
     mHandBreathChk();
 }
 
-/* 805D02F8-805D0374 0051B8 007C+00 1/1 0/0 0/0 .text            mBreakBoneSUB__8daB_DS_cFv */
 void daB_DS_c::mBreakBoneSUB() {
     if (bitSw3 != 0xFF) {
         fopAcM_offSwitch(this, bitSw3);
@@ -1887,7 +1845,6 @@ void daB_DS_c::mBreakBoneSUB() {
     }
 }
 
-/* 805D0374-805D03EC 005234 0078+00 1/1 0/0 0/0 .text            damageSet__8daB_DS_cFv */
 void daB_DS_c::damageSet() {
     if (mBossPhase == 0) {
         dScnPly_c::setPauseTimer(5);
@@ -1898,7 +1855,6 @@ void daB_DS_c::damageSet() {
     dComIfGp_getVibration().StartShock(3, 0x4f, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 805D03EC-805D0584 0052AC 0198+00 1/1 0/0 0/0 .text            damageHitCamera__8daB_DS_cFv */
 void daB_DS_c::damageHitCamera() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz offset, pos;
@@ -1928,7 +1884,6 @@ void daB_DS_c::damageHitCamera() {
     camera->mCamera.Set(mCameraCenter, mCameraEye);
 }
 
-/* 805D0584-805D074C 005444 01C8+00 1/1 0/0 0/0 .text            damageDownCheck__8daB_DS_cFv */
 void daB_DS_c::damageDownCheck() {
     cXyz particle_scale(1.0f, 1.0f, 1.0f);
     csXyz particle_angle = shape_angle;
@@ -1966,7 +1921,6 @@ void daB_DS_c::damageDownCheck() {
     }
 }
 
-/* 805D074C-805D1E30 00560C 16E4+00 1/1 0/0 0/0 .text            executeDamage__8daB_DS_cFv */
 void daB_DS_c::executeDamage() {
     static cXyz down_center_dt[5] = {
         cXyz(345.0f, 2100.0f, -1575.0f),   cXyz(1490.0f, 1160.0f, -2050.0f),
@@ -2385,7 +2339,6 @@ void daB_DS_c::executeDamage() {
     }
 }
 
-/* 805D1E30-805D203C 006CF0 020C+00 1/1 0/0 0/0 .text            executeEtcDamage__8daB_DS_cFv */
 void daB_DS_c::executeEtcDamage() {
     static int Ds_Etc_damage_id[9] = {
         ANM_NODAMAGE_01_A, ANM_NODAMAGE_01_B, ANM_NODAMAGE_01_C,
@@ -2430,7 +2383,6 @@ void daB_DS_c::executeEtcDamage() {
     }
 }
 
-/* 805D203C-805D226C 006EFC 0230+00 1/1 0/0 0/0 .text            breath_smokeSet__8daB_DS_cFv */
 void daB_DS_c::breath_smokeSet() {
     static u16 effId[3] = {0x85F6, 0x89B0, 0x89B1};
     cXyz particle_scale(1.0f, 1.0f, 1.0f);
@@ -2466,7 +2418,6 @@ void daB_DS_c::breath_smokeSet() {
     }
 }
 
-/* 805D226C-805D2520 00712C 02B4+00 1/1 0/0 0/0 .text            executeBreathAttack__8daB_DS_cFv */
 void daB_DS_c::executeBreathAttack() {
     static int Ds_breath_id[9] = {
         ANM_ATTACK02_A_A, ANM_ATTACK02_B_A, ANM_ATTACK02_C_A, ANM_ATTACK02_A_B, ANM_ATTACK02_B_B,
@@ -2519,7 +2470,6 @@ void daB_DS_c::executeBreathAttack() {
     }
 }
 
-/* 805D2520-805D272C 0073E0 020C+00 1/1 0/0 0/0 .text            executeHandAttack__8daB_DS_cFv */
 void daB_DS_c::executeHandAttack() {
     static int Ds_HandAt_id[6] = {
         ANM_ATTACK_R_A, ANM_ATTACK_R_B, ANM_ATTACK_R_C,
@@ -2564,7 +2514,6 @@ void daB_DS_c::executeHandAttack() {
     }
 }
 
-/* 805D272C-805D28D0 0075EC 01A4+00 1/1 0/0 0/0 .text            executeBreathSearch__8daB_DS_cFv */
 void daB_DS_c::executeBreathSearch() {
     static int Ds_BS_id[3] = {ANM_ATTACK01_A, ANM_ATTACK01_B, ANM_ATTACK01_C};
     mHeadAngle_Clear();
@@ -2597,7 +2546,6 @@ void daB_DS_c::executeBreathSearch() {
     }
 }
 
-/* 805D28D0-805D3900 007790 1030+00 2/1 0/0 0/0 .text executeBattle2OpeningDemo__8daB_DS_cFv */
 void daB_DS_c::executeBattle2OpeningDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* pla = daPy_getPlayerActorClass();
@@ -2891,7 +2839,6 @@ void daB_DS_c::executeBattle2OpeningDemo() {
     }
 }
 
-/* 805D3900-805D39A4 0087C0 00A4+00 2/2 0/0 0/0 .text            mFlyBMove__8daB_DS_cFf */
 void daB_DS_c::mFlyBMove(f32 param_0) {
     cLib_addCalc2(&mChkHigh, param_0, 0.8f, 30.0f);
     mSandPos.y += mChkHigh;
@@ -2906,7 +2853,6 @@ void daB_DS_c::mFlyBMove(f32 param_0) {
     cLib_addCalc2(&current.pos.y, mSandPos.y, 0.8f, step);
 }
 
-/* 805D39A4-805D3D14 008864 0370+00 5/5 0/0 0/0 .text            mFuwafuwaSet__8daB_DS_cFb */
 void daB_DS_c::mFuwafuwaSet(bool param_0) {
     if (fabsf(current.pos.y - mSandPos.y) < 20.0f) {
         field_0x82c += 2.0f;
@@ -2972,15 +2918,12 @@ void daB_DS_c::mFuwafuwaSet(bool param_0) {
     }
 }
 
-/* 805D3D14-805D3D80 008BD4 006C+00 1/1 0/0 0/0 .text            mBattle2BreathFireSet__8daB_DS_cFUl
- */
 void daB_DS_c::mBattle2BreathFireSet(u32 i_params) {
     fopAcM_createChild(PROC_B_DS, fopAcM_GetID(this), i_params, &mMouthPos, fopAcM_GetRoomNo(this),
                        &shape_angle, NULL, -1, NULL);
     mCreateFireBreath = false;
 }
 
-/* 805D3D80-805D3EA0 008C40 0120+00 3/3 0/0 0/0 .text            mNeckAngleSet__8daB_DS_cFv */
 bool daB_DS_c::mNeckAngleSet() {
     s16 svar5 = 0;
     cXyz vec = daPy_getPlayerActorClass()->current.pos - mMouthPos;
@@ -2994,7 +2937,6 @@ bool daB_DS_c::mNeckAngleSet() {
     return abs((s16)(shape_angle.y - (svar5 + vec.atan2sX_Z()))) <= 0x200;
 }
 
-/* 805D3EA0-805D3F90 008D60 00F0+00 2/2 0/0 0/0 .text            mSetFirstPos__8daB_DS_cFv */
 void daB_DS_c::mSetFirstPos() {
     daPy_py_c* pla = daPy_getPlayerActorClass();
     home.pos.set(0.0f, 1900.0f, 0.0f);
@@ -3015,7 +2957,6 @@ void daB_DS_c::mSetFirstPos() {
     shape_angle.z = 0;
 }
 
-/* 805D3F90-805D4054 008E50 00C4+00 2/2 0/0 0/0 .text            mChkScreenIn__8daB_DS_cFv */
 bool daB_DS_c::mChkScreenIn() {
     camera_class* camera = dComIfGp_getCamera(0);
     cXyz vec1, vec2;
@@ -3025,14 +2966,12 @@ bool daB_DS_c::mChkScreenIn() {
     return abs((s16)(vec1.atan2sX_Z() - vec2.atan2sX_Z())) < 0x3000;
 }
 
-/* 805D4054-805D41CC 008F14 0178+00 2/2 0/0 0/0 .text            mRailInOutCheck__8daB_DS_cFv */
 bool daB_DS_c::mRailInOutCheck() {
     cXyz vec = daPy_getPlayerActorClass()->current.pos - home.pos;
     vec.y = 0.0f;
     return !(vec.abs() < l_HIO.mP2MoveAxis);
 }
 
-/* 805D41CC-805D429C 00908C 00D0+00 1/1 0/0 0/0 .text            executeBattle2Wait__8daB_DS_cFv */
 void daB_DS_c::executeBattle2Wait() {
     switch (mMode) {
     case 0:
@@ -3057,7 +2996,6 @@ void daB_DS_c::executeBattle2Wait() {
     mFuwafuwaSet(true);
 }
 
-/* 805D429C-805D497C 00915C 06E0+00 2/2 0/0 0/0 .text            mBattle2MoveFSet__8daB_DS_cFv */
 bool daB_DS_c::mBattle2MoveFSet() {
     daPy_py_c* pla = daPy_getPlayerActorClass();
     f32 move_axis = l_HIO.mP2MoveAxis;
@@ -3136,7 +3074,6 @@ bool daB_DS_c::mBattle2MoveFSet() {
     return ret;
 }
 
-/* 805D497C-805D5040 00983C 06C4+00 1/1 0/0 0/0 .text            executeBattle2FMove__8daB_DS_cFv */
 void daB_DS_c::executeBattle2FMove() {
     daPy_py_c* pla = daPy_getPlayerActorClass();
     bool mMvFlag = mBattle2MoveFSet();
@@ -3260,7 +3197,6 @@ void daB_DS_c::executeBattle2FMove() {
     mFuwafuwaSet(true);
 }
 
-/* 805D5040-805D52D4 009F00 0294+00 1/1 0/0 0/0 .text            executeBattle2Tired__8daB_DS_cFv */
 void daB_DS_c::executeBattle2Tired() {
     switch (mMode) {
     case 0:
@@ -3316,8 +3252,6 @@ void daB_DS_c::executeBattle2Tired() {
     mFuwafuwaSet(false);
 }
 
-/* 805D52D4-805D60BC 00A194 0DE8+00 1/1 0/0 0/0 .text            executeBattle2Damage__8daB_DS_cFv
- */
 void daB_DS_c::executeBattle2Damage() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* pla = daPy_getPlayerActorClass();
@@ -3597,7 +3531,6 @@ void daB_DS_c::executeBattle2Damage() {
     }
 }
 
-/* 805D60BC-805D6534 00AF7C 0478+00 1/1 0/0 0/0 .text            mDeadMove__8daB_DS_cFv */
 bool daB_DS_c::mDeadMove() {
     mTimerCount++;
     cXyz vec1;
@@ -3689,7 +3622,6 @@ bool daB_DS_c::mDeadMove() {
     }
 }
 
-/* 805D6534-805D7C10 00B3F4 16DC+00 2/1 0/0 0/0 .text            executeBattle2Dead__8daB_DS_cFv */
 void daB_DS_c::executeBattle2Dead() {
     static cXyz mEd2CenterDt[2] = {
         cXyz(70.0f, 1890.0f, -1190.0f),
@@ -4188,7 +4120,6 @@ void daB_DS_c::executeBattle2Dead() {
     }
 }
 
-/* 805D7C10-805D8078 00CAD0 0468+00 1/1 0/0 0/0 .text            executeBullet__8daB_DS_cFv */
 void daB_DS_c::executeBullet() {
     static u16 effId[4] = {0x89AC, 0x89AD, 0x89AE, 0x89AF};
     cXyz sp38;
@@ -4290,7 +4221,6 @@ void daB_DS_c::executeBullet() {
     }
 }
 
-/* 805D8078-805D80F0 00CF38 0078+00 1/1 0/0 0/0 .text            mBulletAction__8daB_DS_cFv */
 void daB_DS_c::mBulletAction() {
     executeBullet();
     fopAcM_posMove(this, mCcStts.GetCCMoveP());
@@ -4301,7 +4231,6 @@ void daB_DS_c::mBulletAction() {
     }
 }
 
-/* 805D80F0-805D8D04 00CFB0 0C14+00 2/1 0/0 0/0 .text            mSoundSE_Set__8daB_DS_cFv */
 void daB_DS_c::mSoundSE_Set() {
     static JAISoundID mWaitDt[3] = {
         Z2SE_EN_DS_V_WAIT_A,
@@ -4505,7 +4434,6 @@ void daB_DS_c::mSoundSE_Set() {
     }
 }
 
-/* 805D8D04-805D91A4 00DBC4 04A0+00 2/1 0/0 0/0 .text            action__8daB_DS_cFv */
 void daB_DS_c::action() {
     static const struct {
         u16 particle;
@@ -4629,7 +4557,6 @@ void daB_DS_c::action() {
     }
 }
 
-/* 805D91A4-805D951C 00E064 0378+00 1/1 0/0 0/0 .text            mtx_set__8daB_DS_cFv */
 void daB_DS_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -4696,7 +4623,6 @@ void daB_DS_c::mtx_set() {
     mpZantMorf->modelCalc();
 }
 
-/* 805D951C-805D9A40 00E3DC 0524+00 1/1 0/0 0/0 .text            cc_set__8daB_DS_cFv */
 void daB_DS_c::cc_set() {
     static cXyz head_cc_dt[5] = {
         cXyz(380.0f, 0.0f, 0.0f),  cXyz(50.0f, -50.0f, 0.0f),   cXyz(-300.0f, -70.0f, 0.0f),
@@ -4776,7 +4702,6 @@ void daB_DS_c::cc_set() {
     mDoMtx_stack_c::multVecZero(&mFingerPos[1]);
 }
 
-/* 805D9A40-805D9B74 00E900 0134+00 1/1 0/0 0/0 .text            cc_etc_set__8daB_DS_cFv */
 void daB_DS_c::cc_etc_set() {
     static const struct {
         int joint_no;
@@ -4827,7 +4752,6 @@ void daB_DS_c::cc_etc_set() {
     }
 }
 
-/* 805D9B74-805D9CFC 00EA34 0188+00 1/1 0/0 0/0 .text            mBattle2Action__8daB_DS_cFv */
 void daB_DS_c::mBattle2Action() {
     mBattle2_spinner_damage_check();
 
@@ -4884,8 +4808,6 @@ void daB_DS_c::mBattle2Action() {
     }
 }
 
-/* 805D9CFC-805D9FF4 00EBBC 02F8+00 1/1 0/0 0/0 .text mBattle2_spinner_damage_check__8daB_DS_cFv
- */
 void daB_DS_c::mBattle2_spinner_damage_check() {
     if (cLib_calcTimer(&mDamageTimer) != 0 || mAnmID == ANM_HEAD_RETURN ||
         mAction == ACT_B2_DAMAGE || mAction == ACT_B2_DEAD || health < 1)
@@ -4946,8 +4868,6 @@ void daB_DS_c::mBattle2_spinner_damage_check() {
     mCcStts.Move();
 }
 
-/* 805D9FF4-805DA584 00EEB4 0590+00 1/1 0/0 0/0 .text            mBattle2_damage_check__8daB_DS_cFv
- */
 bool daB_DS_c::mBattle2_damage_check() {
     if (health < 1) {
         return false;
@@ -5049,7 +4969,6 @@ bool daB_DS_c::mBattle2_damage_check() {
     return 0;
 }
 
-/* 805DA584-805DA9A4 00F444 0420+00 1/1 0/0 0/0 .text            mBattle2_mtx_set__8daB_DS_cFv */
 void daB_DS_c::mBattle2_mtx_set() {
     cXyz vec1, vec2, vec3;
 
@@ -5130,7 +5049,6 @@ void daB_DS_c::mBattle2_mtx_set() {
     }
 }
 
-/* 805DA9A4-805DAA98 00F864 00F4+00 1/1 0/0 0/0 .text            mBattle2_cc_etc_set__8daB_DS_cFv */
 void daB_DS_c::mBattle2_cc_etc_set() {
     static const struct {
         int joint_no;
@@ -5155,7 +5073,6 @@ void daB_DS_c::mBattle2_cc_etc_set() {
     }
 }
 
-/* 805DAA98-805DADC4 00F958 032C+00 1/1 0/0 0/0 .text            mBattle2_cc_set__8daB_DS_cFv */
 void daB_DS_c::mBattle2_cc_set() {
     cXyz center_base;
     cXyz center;
@@ -5205,7 +5122,6 @@ void daB_DS_c::mBattle2_cc_set() {
     }
 }
 
-/* 805DADC4-805DB184 00FC84 03C0+00 1/1 0/0 0/0 .text            execute__8daB_DS_cFv */
 int daB_DS_c::execute() {
     if (arg0 == TYPE_BULLET_A || arg0 == TYPE_BULLET_B || arg0 == TYPE_BULLET_C) {
         mBulletAction();
@@ -5329,17 +5245,14 @@ int daB_DS_c::execute() {
     return 1;
 }
 
-/* 805DB184-805DB1A4 010044 0020+00 2/1 0/0 0/0 .text            daB_DS_Execute__FP8daB_DS_c */
 static int daB_DS_Execute(daB_DS_c* i_this) {
     return i_this->execute();
 }
 
-/* 805DB1A4-805DB1AC 010064 0008+00 1/0 0/0 0/0 .text            daB_DS_IsDelete__FP8daB_DS_c */
 static int daB_DS_IsDelete(daB_DS_c* i_this) {
     return 1;
 }
 
-/* 805DB1AC-805DB244 01006C 0098+00 1/1 0/0 0/0 .text            _delete__8daB_DS_cFv */
 int daB_DS_c::_delete() {
     dComIfG_resDelete(&mPhase, "B_DS");
 
@@ -5358,12 +5271,10 @@ int daB_DS_c::_delete() {
     return 1;
 }
 
-/* 805DB244-805DB264 010104 0020+00 1/0 0/0 0/0 .text            daB_DS_Delete__FP8daB_DS_c */
 static int daB_DS_Delete(daB_DS_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805DB264-805DB90C 010124 06A8+00 1/1 0/0 0/0 .text            CreateHeap__8daB_DS_cFv */
 int daB_DS_c::CreateHeap() {
     if (arg0 == TYPE_BATTLE_1) {
         if (dComIfGs_isZoneSwitch(6, fopAcM_GetRoomNo(this)) &&
@@ -5511,12 +5422,10 @@ int daB_DS_c::CreateHeap() {
     return 1;
 }
 
-/* 805DB954-805DB974 010814 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daB_DS_c*>(i_this)->CreateHeap();
 }
 
-/* 805DB974-805DC1E8 010834 0874+00 1/1 0/0 0/0 .text            create__8daB_DS_cFv */
 cPhs__Step daB_DS_c::create() {
     fopAcM_ct(this, daB_DS_c);
 
@@ -5765,22 +5674,18 @@ cPhs__Step daB_DS_c::create() {
     return phase_state;
 }
 
-/* 805DC1E8-805DC4CC 0110A8 02E4+00 1/1 0/0 0/0 .text            __ct__8daB_DS_cFv */
 daB_DS_c::daB_DS_c() {}
 
-/* 805DC834-805DC854 0116F4 0020+00 1/0 0/0 0/0 .text            daB_DS_Create__FP8daB_DS_c */
 static cPhs__Step daB_DS_Create(daB_DS_c* i_this) {
     return i_this->create();
 }
 
-/* 805DD994-805DD9B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_DS_Method */
 static actor_method_class l_daB_DS_Method = {
     (process_method_func)daB_DS_Create,  (process_method_func)daB_DS_Delete,
     (process_method_func)daB_DS_Execute, (process_method_func)daB_DS_IsDelete,
     (process_method_func)daB_DS_Draw,
 };
 
-/* 805DD9B4-805DD9E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_DS */
 extern actor_process_profile_definition g_profile_B_DS = {
     fpcLy_CURRENT_e,
     4,
diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp
index 1f4d5ecc93..7297f802a3 100644
--- a/src/d/actor/d_a_b_gg.cpp
+++ b/src/d/actor/d_a_b_gg.cpp
@@ -15,8 +15,8 @@
 
 class daB_GG_HIO_c : public JORReflexible {
 public:
-    /* 805DE40C */ daB_GG_HIO_c();
-    /* 805EC9C4 */ virtual ~daB_GG_HIO_c() {}
+    daB_GG_HIO_c();
+    virtual ~daB_GG_HIO_c() {}
     void genMessage(JORMContext*) {}
 
     /* 0x04 */ s8 id;
@@ -138,7 +138,6 @@ enum Joint {
     /* 0x23 */ JNT_TAIL04,
 };
 
-/* 805DE40C-805DE464 0000EC 0058+00 1/1 0/0 0/0 .text            __ct__12daB_GG_HIO_cFv */
 daB_GG_HIO_c::daB_GG_HIO_c() {
     id = -1;
     base_size = 0.8f;
@@ -150,7 +149,6 @@ daB_GG_HIO_c::daB_GG_HIO_c() {
     field_0x18 = 0.5f;
 }
 
-/* 805DE464-805DE630 000144 01CC+00 1/1 0/0 0/0 .text            CreateHeap__8daB_GG_cFv */
 int daB_GG_c::CreateHeap() {
     J3DModelData* modelData;
     modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23);
@@ -184,13 +182,11 @@ int daB_GG_c::CreateHeap() {
     return 1;
 }
 
-/* 805DE630-805DE650 000310 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daB_GG_c* a_this = (daB_GG_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 805DE650-805DE7A4 000330 0154+00 1/1 0/0 0/0 .text            initCc__8daB_GG_cFv */
 void daB_GG_c::initCc() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -273,14 +269,11 @@ void daB_GG_c::initCc() {
     }
 }
 
-/* 805ED6FC-805ED700 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 805ED6FD 0003+00 l_HIOInit None */
 static u8 l_HIOInit;
 
-/* 805ED70C-805ED728 000054 001C+00 4/9 0/0 0/0 .bss             l_HIO */
 static daB_GG_HIO_c l_HIO;
 
-/* 805DE7A4-805DE9B8 000484 0214+00 1/1 0/0 0/0 .text            setCcCylinder__8daB_GG_cFv */
 void daB_GG_c::setCcCylinder() {
     mCcCyl.SetC(current.pos);
     mCcCyl.SetR(100.0f * l_HIO.base_size);
@@ -311,7 +304,6 @@ void daB_GG_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCcShieldSph);
 }
 
-/* 805DE9B8-805DEAD0 000698 0118+00 1/1 0/0 0/0 .text            G_setCcCylinder__8daB_GG_cFv */
 void daB_GG_c::G_setCcCylinder() {
     cXyz center_pos;
 
@@ -332,7 +324,6 @@ void daB_GG_c::G_setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCcShieldSph);
 }
 
-/* 805DEAD0-805DEB44 0007B0 0074+00 1/1 0/0 0/0 .text            MoveCo__8daB_GG_cFv */
 void daB_GG_c::MoveCo() {
     cXyz center_pos;
     center_pos = current.pos;
@@ -343,7 +334,6 @@ void daB_GG_c::MoveCo() {
     mCcHookCyl.SetC(center_pos);
 }
 
-/* 805DEB44-805DED0C 000824 01C8+00 1/1 0/0 0/0 .text ctrlJoint__8daB_GG_cFP8J3DJointP8J3DModel */
 int daB_GG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* temp_r28 = i_joint;
 
@@ -376,7 +366,6 @@ int daB_GG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 805DED0C-805DED58 0009EC 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -390,7 +379,6 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805DED58-805DEF18 000A38 01C0+00 1/1 0/0 0/0 .text            HeadctrlJoint__8daB_GG_cFP8J3DJointP8J3DModel                */
 int daB_GG_c::HeadctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -411,7 +399,6 @@ int daB_GG_c::HeadctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 805DEF18-805DEF64 000BF8 004C+00 1/1 0/0 0/0 .text            HeadJointCallBack__FP8J3DJointi */
 static int HeadJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -425,13 +412,11 @@ static int HeadJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805DEF64-805DF010 000C44 00AC+00 15/15 0/0 0/0 .text            SetAnm__8daB_GG_cFiiff */
 void daB_GG_c::SetAnm(int i_anm, int i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_gg", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 805DF010-805DF0B8 000CF0 00A8+00 1/1 0/0 0/0 .text way_bg_check2__FP8daB_GG_c4cXyz4cXyz */
 static BOOL way_bg_check2(daB_GG_c* a_this, cXyz i_start, cXyz i_end) {
     dBgS_LinChk line_chk;
     i_start.y += 30.0f;
@@ -448,7 +433,6 @@ static f32 dummyFloat() {
     return 300.0f;
 }
 
-/* 805DF0B8-805DF178 000D98 00C0+00 1/1 0/0 0/0 .text            roofchk__FP8daB_GG_c */
 static BOOL roofchk(daB_GG_c* a_this) {
     dBgS_LinChk line_chk;
     cXyz sp24;
@@ -468,7 +452,6 @@ static BOOL roofchk(daB_GG_c* a_this) {
     return FALSE;
 }
 
-/* 805DF178-805DF250 000E58 00D8+00 2/2 0/0 0/0 .text other_bg_check__FP8daB_GG_cP10fopAc_ac_c */
 static BOOL other_bg_check(daB_GG_c* a_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* i_this = (fopAc_ac_c*)a_this;
     dBgS_LinChk line_chk;
@@ -495,8 +478,6 @@ static f32 dummyFloat2() {
     return 800.0f;
 }
 
-/* 805DF250-805DF9F4 000F30 07A4+00 1/1 0/0 0/0 .text            Hanekaeri__FP8daB_GG_c4cXyz4cXyzf
- */
 static cXyz Hanekaeri(daB_GG_c* a_this, cXyz param_1, cXyz param_2, f32 param_3) {
     cXyz sp28;
 
@@ -521,7 +502,6 @@ static cXyz Hanekaeri(daB_GG_c* a_this, cXyz param_1, cXyz param_2, f32 param_3)
     return ret;
 }
 
-/* 805DF9F4-805DFA48 0016D4 0054+00 1/1 0/0 0/0 .text            Yazirushi__8daB_GG_cFv */
 void daB_GG_c::Yazirushi() {
     eyePos = current.pos;
     eyePos.y += 150.0f;
@@ -530,7 +510,6 @@ void daB_GG_c::Yazirushi() {
     attention_info.position.y += 150.0f;
 }
 
-/* 805DFA48-805DFA64 001728 001C+00 8/8 0/0 0/0 .text            SpeedClear__8daB_GG_cFv */
 void daB_GG_c::SpeedClear() {
     speedF = 0.0f;
     field_0x5bc = 0.0f;
@@ -538,7 +517,6 @@ void daB_GG_c::SpeedClear() {
     field_0x5c0 = 0.0f;
 }
 
-/* 805DFA64-805DFA8C 001744 0028+00 13/13 0/0 0/0 .text            SetAction__8daB_GG_cFUcUcUc */
 void daB_GG_c::SetAction(u8 i_action, u8 i_subAction, u8 i_mode) {
     mPrevAction = mAction;
     mPrevSubAction = mSubAction;
@@ -549,7 +527,6 @@ void daB_GG_c::SetAction(u8 i_action, u8 i_subAction, u8 i_mode) {
     mMode = i_mode;
 }
 
-/* 805DFA8C-805DFACC 00176C 0040+00 1/1 0/0 0/0 .text            GetAction__8daB_GG_cFUcUcUc */
 u8 daB_GG_c::GetAction(u8 i_action, u8 i_subAction, u8 i_mode) {
     if (mPrevAction == i_action && mPrevSubAction == i_subAction && mPrevMode == i_mode) {
         return true;
@@ -559,16 +536,12 @@ u8 daB_GG_c::GetAction(u8 i_action, u8 i_subAction, u8 i_mode) {
 }
 
 namespace {
-/* 805ED728-805ED72C 000070 0004+00 4/7 0/0 0/0 .bss             s_dis__22@unnamed@d_a_b_gg_cpp@ */
 static f32 s_dis;
 
-/* 805ED72C-805ED730 000074 0004+00 8/16 0/0 0/0 .bss s_LinkPos__22@unnamed@d_a_b_gg_cpp@ */
 static cXyz* s_LinkPos;
 
-/* 805ED730-805ED734 000078 0002+02 12/19 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_b_gg_cpp@ */
 static s16 s_TargetAngle;
 
-/* 805ED740-805ED74C 000088 000C+00 0/2 0/0 0/0 .bss s_centerpos__22@unnamed@d_a_b_gg_cpp@ */
 static cXyz s_centerpos(217.0f, 1275.0f, -57.0f);
 
 /* 805ED74C 0002+00 data_805ED74C s_M_Action__22@unnamed@d_a_b_gg_cpp@ */
@@ -578,7 +551,6 @@ static s16 s_M_Action;
 static s16 s_W_Action;
 }
 
-/* 805DFACC-805DFC24 0017AC 0158+00 1/1 0/0 0/0 .text            DemoSkip__8daB_GG_cFi */
 void daB_GG_c::DemoSkip(int param_0) {
     cXyz offset(0.0f, 200.0f, 300.0f);
     cXyz sp14(0.0f, 0.0f, 0.0f);
@@ -608,7 +580,6 @@ void daB_GG_c::DemoSkip(int param_0) {
     dComIfGp_getVibration().StopQuake(0x1F);
 }
 
-/* 805DFC24-805DFC58 001904 0034+00 2/2 0/0 0/0 .text            DemoSkipCallBack__8daB_GG_cFPvi */
 int daB_GG_c::DemoSkipCallBack(void* i_process, int param_1) {
     if (i_process != NULL) {
         ((daB_GG_c*)i_process)->DemoSkip(param_1);
@@ -618,7 +589,6 @@ int daB_GG_c::DemoSkipCallBack(void* i_process, int param_1) {
     return 0;
 }
 
-/* 805DFC58-805DFD78 001938 0120+00 4/4 0/0 0/0 .text            CameraSet__8daB_GG_cFv */
 bool daB_GG_c::CameraSet() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* cam_body = dCam_getBody();
@@ -639,13 +609,11 @@ bool daB_GG_c::CameraSet() {
     return true;
 }
 
-/* 805DFD78-805DFDFC 001A58 0084+00 2/2 0/0 0/0 .text            SetStopingCam__8daB_GG_cFv */
 void daB_GG_c::SetStopingCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805DFDFC-805DFF4C 001ADC 0150+00 5/5 0/0 0/0 .text            SetStopCam__8daB_GG_cF4cXyzffs */
 void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -663,7 +631,6 @@ void daB_GG_c::SetStopCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805DFF4C-805E00D4 001C2C 0188+00 2/2 0/0 0/0 .text            SetMoveCam__8daB_GG_cF4cXyzffsff */
 void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f32 param_4,
                           f32 param_5) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -682,7 +649,6 @@ void daB_GG_c::SetMoveCam(cXyz param_0, f32 param_1, f32 param_2, s16 param_3, f
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805E00D4-805E01F8 001DB4 0124+00 4/4 0/0 0/0 .text            SetMoveCam1__8daB_GG_cFff */
 void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -694,7 +660,6 @@ void daB_GG_c::SetMoveCam1(f32 i_scale, f32 i_step) {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovy, 0);
 }
 
-/* 805E01F8-805E029C 001ED8 00A4+00 6/6 0/0 0/0 .text            SetReleaseCam__8daB_GG_cFv */
 void daB_GG_c::SetReleaseCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Reset(mCamCenter, mCamEye);
@@ -703,21 +668,18 @@ void daB_GG_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-/* 805ED774-805ED798 0000BC 0024+00 2/5 0/0 0/0 .bss             out_pos */
 static cXyz out_pos[] = {
     cXyz(5714.0f, 1200.0f, 218.0f),
     cXyz(20.0f, 950.0f, -4937.0),
     cXyz(-5560.0f, 1200.0f, 222.0f),
 };
 
-/* 805ED7BC-805ED7E0 000104 0024+00 1/7 0/0 0/0 .bss             in_pos */
 static cXyz in_pos[]= {
     cXyz(1185.0f, 1200.0f, 152.0f),
     cXyz(-121.0f, 950.0f, -1190.0f),
     cXyz(-1080.0f, 1200.0f, 7.0f),
 };
 
-/* 805E029C-805E0F2C 001F7C 0C90+00 2/1 0/0 0/0 .text            St_CamAction__8daB_GG_cFv */
 void daB_GG_c::St_CamAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -981,7 +943,6 @@ void daB_GG_c::St_CamAction() {
     }
 }
 
-/* 805E0F2C-805E18E8 002C0C 09BC+00 1/1 0/0 0/0 .text            St_DemoAction__8daB_GG_cFv */
 void daB_GG_c::St_DemoAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     
@@ -1119,7 +1080,6 @@ void daB_GG_c::St_DemoAction() {
     }
 }
 
-/* 805E18E8-805E1C28 0035C8 0340+00 1/1 0/0 0/0 .text            Md_CamAction__8daB_GG_cFv */
 void daB_GG_c::Md_CamAction() {
     cXyz sp2C;
     cXyz sp20;
@@ -1183,7 +1143,6 @@ void daB_GG_c::Md_CamAction() {
     }
 }
 
-/* 805E1C28-805E23E8 003908 07C0+00 2/2 0/0 0/0 .text            Md_DemoAction__8daB_GG_cFv */
 void daB_GG_c::Md_DemoAction() {
     s16 sp10 = 0;
     u8 var_r29 = 0;
@@ -1307,7 +1266,6 @@ void daB_GG_c::Md_DemoAction() {
     }
 }
 
-/* 805E23E8-805E2974 0040C8 058C+00 2/1 0/0 0/0 .text            Gn_CamAction__8daB_GG_cFv */
 void daB_GG_c::Gn_CamAction() {
     cXyz sp24;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1423,7 +1381,6 @@ void daB_GG_c::Gn_CamAction() {
     }
 }
 
-/* 805E2974-805E2F44 004654 05D0+00 1/1 0/0 0/0 .text            Gn_DemoAction__8daB_GG_cFv */
 void daB_GG_c::Gn_DemoAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp34;
@@ -1524,7 +1481,6 @@ void daB_GG_c::Gn_DemoAction() {
     shape_angle.y = current.angle.y;
 }
 
-/* 805E2F44-805E3024 004C24 00E0+00 1/1 0/0 0/0 .text            DemoAction__8daB_GG_cFv */
 void daB_GG_c::DemoAction() {
     switch (mSubAction) {
     case 0:
@@ -1549,7 +1505,6 @@ void daB_GG_c::DemoAction() {
     cLib_addCalcAngleS2(&current.angle.y, field_0x5ba, 0x10, 0x1000);
 }
 
-/* 805E3024-805E31E4 004D04 01C0+00 1/1 0/0 0/0 .text            F_WaitAction__8daB_GG_cFv */
 void daB_GG_c::F_WaitAction() {
     switch (mMode) {
     case 0:
@@ -1581,7 +1536,6 @@ void daB_GG_c::F_WaitAction() {
     }
 }
 
-/* 805E31E4-805E3448 004EC4 0264+00 2/2 0/0 0/0 .text            F_FookChk__8daB_GG_cFv */
 void daB_GG_c::F_FookChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* hookshot_top = player->getHookshotTopPos();
@@ -1613,7 +1567,6 @@ void daB_GG_c::F_FookChk() {
     }
 }
 
-/* 805E3448-805E3CAC 005128 0864+00 1/1 0/0 0/0 .text            F_MoveAction__8daB_GG_cFv */
 void daB_GG_c::F_MoveAction() {
     cXyz sp34;
     cXyz sp28;
@@ -1763,7 +1716,6 @@ void daB_GG_c::F_MoveAction() {
     }
 }
 
-/* 805E3CAC-805E3F0C 00598C 0260+00 1/1 0/0 0/0 .text            F_LV7_W_MoveAction__8daB_GG_cFv */
 void daB_GG_c::F_LV7_W_MoveAction() {
     cXyz sp20;
     cXyz sp14;
@@ -1818,7 +1770,6 @@ void daB_GG_c::F_LV7_W_MoveAction() {
     }
 }
 
-/* 805E3F0C-805E4914 005BEC 0A08+00 1/1 0/0 0/0 .text            F_AttackAction__8daB_GG_cFv */
 void daB_GG_c::F_AttackAction() {
     switch (mMode) {
     case 0:
@@ -1991,7 +1942,6 @@ void daB_GG_c::F_AttackAction() {
     }
 }
 
-/* 805E4914-805E5190 0065F4 087C+00 2/1 0/0 0/0 .text            F_DamageAction__8daB_GG_cFv */
 void daB_GG_c::F_DamageAction() {
     cXyz sp30;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2172,7 +2122,6 @@ void daB_GG_c::F_DamageAction() {
     }
 }
 
-/* 805E5190-805E5220 006E70 0090+00 1/1 0/0 0/0 .text            AttentionChk__8daB_GG_cFv */
 void daB_GG_c::AttentionChk() {
     daPy_getPlayerActorClass();
 
@@ -2191,7 +2140,6 @@ void daB_GG_c::AttentionChk() {
     }
 }
 
-/* 805E5220-805E53DC 006F00 01BC+00 1/1 0/0 0/0 .text            FlyAction__8daB_GG_cFv */
 void daB_GG_c::FlyAction() {
     s16 var_r29 = 0x1000;
 
@@ -2242,8 +2190,6 @@ void daB_GG_c::FlyAction() {
     }
 }
 
-/* 805E53DC-805E561C 0070BC 0240+00 2/2 0/0 0/0 .text            F_A_TargetMove__8daB_GG_cF4cXyzUc
- */
 bool daB_GG_c::F_A_TargetMove(cXyz param_0, u8 param_1) {
     field_0x5ba = cLib_targetAngleY(&current.pos, &param_0);
     field_0x5c0 = (param_0.y - current.pos.y) / (current.pos.absXZ(param_0) / speedF);
@@ -2270,7 +2216,6 @@ bool daB_GG_c::F_A_TargetMove(cXyz param_0, u8 param_1) {
     return false;
 }
 
-/* 805E561C-805E5808 0072FC 01EC+00 2/2 0/0 0/0 .text            F_A_TargetMove__8daB_GG_cF4cXyz */
 bool daB_GG_c::F_A_TargetMove(cXyz param_0) {
     field_0x5ba = cLib_targetAngleY(&current.pos, &param_0);
     field_0x5c0 = (param_0.y - current.pos.y) / (current.pos.absXZ(param_0) / speedF);
@@ -2280,7 +2225,6 @@ bool daB_GG_c::F_A_TargetMove(cXyz param_0) {
     return way_bg_check2(this, current.pos, out_pos[mInOutPosIdx]) == false;
 }
 
-/* 805E5808-805E5D0C 0074E8 0504+00 1/1 0/0 0/0 .text            F_A_MoveAction__8daB_GG_cFv */
 void daB_GG_c::F_A_MoveAction() {
     gravity = 0.0f;
     cXyz sp38(0.0f, 1000.0f, 3000.0f);
@@ -2364,12 +2308,10 @@ void daB_GG_c::F_A_MoveAction() {
     }
 }
 
-/* 805E5D0C-805E5D2C 0079EC 0020+00 1/1 0/0 0/0 .text            F_A_WaitAction__8daB_GG_cFv */
 void daB_GG_c::F_A_WaitAction() {
     Md_DemoAction();
 }
 
-/* 805E5D2C-805E5E78 007A0C 014C+00 1/1 0/0 0/0 .text            F_A_Action__8daB_GG_cFv */
 void daB_GG_c::F_A_Action() {
     daPy_py_c::cancelBoomerangLockActor(this);
  
@@ -2393,7 +2335,6 @@ void daB_GG_c::F_A_Action() {
     cLib_addCalcAngleS2(&field_0x6c4, (-cM_atan2s(sp8.y, JMAFastSqrt((sp8.x * sp8.x) + (sp8.z * sp8.z))) - shape_angle.x), 0x10, 0x600);
 }
 
-/* 805E5E78-805E608C 007B58 0214+00 2/2 0/0 0/0 .text            FookChk__8daB_GG_cFv */
 void daB_GG_c::FookChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* hookshot_top = player->getHookshotTopPos();
@@ -2408,7 +2349,6 @@ void daB_GG_c::FookChk() {
     }
 }
 
-/* 805E608C-805E6174 007D6C 00E8+00 2/2 0/0 0/0 .text            CutChk__8daB_GG_cFv */
 void daB_GG_c::CutChk() {
     int rnd = cM_rndF(100.0f);
     u32 cut_type = daPy_getPlayerActorClass()->getCutType();
@@ -2418,7 +2358,6 @@ void daB_GG_c::CutChk() {
     }
 }
 
-/* 805E6174-805E6AB0 007E54 093C+00 1/1 0/0 0/0 .text            G_MoveAction__8daB_GG_cFv */
 void daB_GG_c::G_MoveAction() {
     CutChk();
 
@@ -2631,7 +2570,6 @@ void daB_GG_c::G_MoveAction() {
     }
 }
 
-/* 805E6AB0-805E6E30 008790 0380+00 2/2 0/0 0/0 .text            FallChk__8daB_GG_cFv */
 void daB_GG_c::FallChk() {
     if (current.pos.y < (field_0x648 - 10.0f) && field_0x5b6 != 0) {
         if (!mAcch.ChkGroundHit()) {
@@ -2713,7 +2651,6 @@ void daB_GG_c::FallChk() {
     }
 }
 
-/* 805E6E30-805E73A8 008B10 0578+00 1/1 0/0 0/0 .text            G_AttackAction__8daB_GG_cFv */
 void daB_GG_c::G_AttackAction() {
     switch (mMode) {
     case 0:
@@ -2839,7 +2776,6 @@ void daB_GG_c::G_AttackAction() {
     F_AtHit();
 }
 
-/* 805E73A8-805E7D50 009088 09A8+00 2/1 0/0 0/0 .text            G_DamageAction__8daB_GG_cFv */
 void daB_GG_c::G_DamageAction() {
     cXyz sp38;
     if (mAnm != BCK_GGB_ATTACK_C && mAnm != BCK_GGB_GUARD) {
@@ -3078,7 +3014,6 @@ void daB_GG_c::G_DamageAction() {
     FallChk();
 }
 
-/* 805E7D50-805E7F50 009A30 0200+00 1/1 0/0 0/0 .text            G_DeathAction__8daB_GG_cFv */
 void daB_GG_c::G_DeathAction() {
     cXyz sp8;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3120,7 +3055,6 @@ void daB_GG_c::G_DeathAction() {
     }
 }
 
-/* 805E7F50-805E82A8 009C30 0358+00 1/1 0/0 0/0 .text            G_DeathAction1__8daB_GG_cFv */
 void daB_GG_c::G_DeathAction1() {
     cXyz sp50(0.0f, 0.0f, 0.0f);
     cXyz sp44(0.0f, 0.0f, 0.0f);
@@ -3180,7 +3114,6 @@ void daB_GG_c::G_DeathAction1() {
     }
 }
 
-/* 805E82F0-805E8D48 009FD0 0A58+00 1/1 0/0 0/0 .text            DeathCam__8daB_GG_cFv */
 void daB_GG_c::DeathCam() {
     cXyz sp48(0.0f, 0.0f, 0.0f);
     cXyz sp3C(0.0f, 0.0f, 0.0f);
@@ -3376,7 +3309,6 @@ void daB_GG_c::DeathCam() {
     }
 }
 
-/* 805E8D48-805E8EE8 00AA28 01A0+00 1/1 0/0 0/0 .text            GroundAction__8daB_GG_cFv */
 void daB_GG_c::GroundAction() {
     s16 var_r30 = 0;
 
@@ -3418,7 +3350,6 @@ void daB_GG_c::GroundAction() {
     cLib_addCalcAngleS2(&mArmL2Rot.z, 0, 0x10, 0x1000);
 }
 
-/* 805E8EE8-805E92A0 00ABC8 03B8+00 1/1 0/0 0/0 .text            StopAction__8daB_GG_cFv */
 void daB_GG_c::StopAction() {
     if (!other_bg_check(this, daPy_getPlayerActorClass())) {
         attention_info.flags = fopAc_AttnFlag_BATTLE_e;
@@ -3500,7 +3431,6 @@ void daB_GG_c::StopAction() {
     shape_angle.y = s_TargetAngle;
 }
 
-/* 805E92A0-805E9310 00AF80 0070+00 2/2 0/0 0/0 .text            HitChk__8daB_GG_cFv */
 void daB_GG_c::HitChk() {
     if (mAction == ACTION_GROUND && mSubAction == SUBACT_ATTACK) {
         if ((s_TargetAngle - shape_angle.y) < 0x3000 && (s_TargetAngle - shape_angle.y) > 0x300) {
@@ -3513,7 +3443,6 @@ void daB_GG_c::HitChk() {
     }
 }
 
-/* 805E9310-805E9418 00AFF0 0108+00 1/1 0/0 0/0 .text            Action__8daB_GG_cFv */
 void daB_GG_c::Action() {
     if (mType != TYPE_L7_MBOSS) {
         if (s_dis > 5000.0f) {
@@ -3552,7 +3481,6 @@ void daB_GG_c::Action() {
     }
 }
 
-/* 805E9418-805E9A28 00B0F8 0610+00 1/1 0/0 0/0 .text            HeadAction__8daB_GG_cFv */
 void daB_GG_c::HeadAction() {
     cXyz sp18;
     cXyz spC;
@@ -3633,7 +3561,6 @@ void daB_GG_c::HeadAction() {
     }
 }
 
-/* 805E9A28-805E9B48 00B708 0120+00 1/1 0/0 0/0 .text            SetHeadAngle__8daB_GG_cFv */
 void daB_GG_c::SetHeadAngle() {
     cXyz sp20;
     cXyz sp14(0.0f, 0.0f, 0.0f);
@@ -3653,7 +3580,6 @@ void daB_GG_c::SetHeadAngle() {
     field_0x65c = sp14;
 }
 
-/* 805E9B48-805EA344 00B828 07FC+00 2/1 0/0 0/0 .text            SoundChk__8daB_GG_cFv */
 void daB_GG_c::SoundChk() {
     switch (mAnm) {
     case BCK_GGA_ATTACK_1:
@@ -3763,7 +3689,6 @@ void daB_GG_c::SoundChk() {
     }
 }
 
-/* 805EA344-805EA72C 00C024 03E8+00 1/1 0/0 0/0 .text            Execute__8daB_GG_cFv */
 int daB_GG_c::Execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s_LinkPos = &fopAcM_GetPosition(player);
@@ -3831,12 +3756,10 @@ int daB_GG_c::Execute() {
     return 1;
 }
 
-/* 805EA72C-805EA74C 00C40C 0020+00 1/1 0/0 0/0 .text            ObjHit__8daB_GG_cFv */
 void daB_GG_c::ObjHit() {
     Guard();
 }
 
-/* 805EA74C-805EA938 00C42C 01EC+00 3/3 0/0 0/0 .text            At_Check__8daB_GG_cFv */
 void daB_GG_c::At_Check() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -3897,7 +3820,6 @@ void daB_GG_c::At_Check() {
     }
 }
 
-/* 805EA938-805EA9AC 00C618 0074+00 1/1 0/0 0/0 .text            MoveAt__8daB_GG_cFv */
 void daB_GG_c::MoveAt() {
     cXyz pos(0.0f, 10000.0f, 0.0f);
     for (int i = 0; i < 3; i++) {
@@ -3905,7 +3827,6 @@ void daB_GG_c::MoveAt() {
     }
 }
 
-/* 805EA9AC-805EAAFC 00C68C 0150+00 2/2 0/0 0/0 .text            F_AtHit__8daB_GG_cFv */
 void daB_GG_c::F_AtHit() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3933,7 +3854,6 @@ void daB_GG_c::F_AtHit() {
     }
 }
 
-/* 805EAAFC-805EB028 00C7DC 052C+00 1/1 0/0 0/0 .text            ChanceTime__8daB_GG_cFv */
 void daB_GG_c::ChanceTime() {
     if ((mCcCyl.ChkTgHit() && !mCcCyl.ChkTgShield()) || mCcHookCyl.ChkTgHit()) {
         s16 prev_hp = health;
@@ -4051,7 +3971,6 @@ void daB_GG_c::ChanceTime() {
     }
 }
 
-/* 805EB028-805EB090 00CD08 0068+00 2/1 0/0 0/0 .text            ArmAngleSet__8daB_GG_cFv */
 void daB_GG_c::ArmAngleSet() {
     daPy_getPlayerActorClass()->getCutType();
 
@@ -4077,7 +3996,6 @@ void daB_GG_c::ArmAngleSet() {
     }
 }
 
-/* 805EB090-805EB5E0 00CD70 0550+00 1/1 0/0 0/0 .text            Guard__8daB_GG_cFv */
 void daB_GG_c::Guard() {
     mCcStts.Move();
 
@@ -4213,7 +4131,6 @@ void daB_GG_c::Guard() {
     ChanceTime();
 }
 
-/* 805EB5E0-805EB8A8 00D2C0 02C8+00 1/1 0/0 0/0 .text            Draw__8daB_GG_cFv */
 int daB_GG_c::Draw() {
     J3DModel* model = mpModelMorf->getModel();
 
@@ -4263,7 +4180,6 @@ int daB_GG_c::Draw() {
     return 1;
 }
 
-/* 805EB8A8-805EB910 00D588 0068+00 1/1 0/0 0/0 .text            Delete__8daB_GG_cFv */
 int daB_GG_c::Delete() {
     dComIfG_resDelete(&mPhase, "B_gg");
 
@@ -4279,7 +4195,6 @@ int daB_GG_c::Delete() {
     return 1;
 }
 
-/* 805EB910-805EB980 00D5F0 0070+00 2/2 0/0 0/0 .text            setBaseMtx__8daB_GG_cFv */
 void daB_GG_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -4289,13 +4204,11 @@ void daB_GG_c::setBaseMtx() {
     mpModelMorf->modelCalc();
 }
 
-/* 805EB980-805EB9DC 00D660 005C+00 1/1 0/0 0/0 .text            setShieldMtx__8daB_GG_cFv */
 void daB_GG_c::setShieldMtx() {
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(0xB));
     mpShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805EB9DC-805EBA4C 00D6BC 0070+00 1/1 0/0 0/0 .text            setSwordMtx__8daB_GG_cFv */
 void daB_GG_c::setSwordMtx() {
     if (field_0x66d == 0) {
         mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(0x10));
@@ -4305,7 +4218,6 @@ void daB_GG_c::setSwordMtx() {
     }
 }
 
-/* 805EBA4C-805EBAB8 00D72C 006C+00 1/1 0/0 0/0 .text            setSwordMtx1__8daB_GG_cFv */
 void daB_GG_c::setSwordMtx1() {
     cXyz sp8(-20.0f, 60.0f, 0.0f);
     mDoMtx_stack_c::transS(mSwordPos);
@@ -4313,7 +4225,6 @@ void daB_GG_c::setSwordMtx1() {
     mpSwordModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805EBAB8-805EBB30 00D798 0078+00 1/1 0/0 0/0 .text            setHeadMtx__8daB_GG_cFv */
 void daB_GG_c::setHeadMtx() {
     if (field_0x5b1 == 0) {
         mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(5));
@@ -4323,34 +4234,28 @@ void daB_GG_c::setHeadMtx() {
     }
 }
 
-/* 805EBB30-805EBB7C 00D810 004C+00 1/1 0/0 0/0 .text            setHeadMtx1__8daB_GG_cFv */
 void daB_GG_c::setHeadMtx1() {
     mDoMtx_stack_c::transS(mHeadPos);
     mDoMtx_stack_c::ZXYrotM(mHeadRot);
     mpHelmetModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805EBB7C-805EBB9C 00D85C 0020+00 1/0 0/0 0/0 .text            daB_GG_Draw__FP8daB_GG_c */
 static int daB_GG_Draw(daB_GG_c* a_this) {
     return a_this->Draw();
 }
 
-/* 805EBB9C-805EBBBC 00D87C 0020+00 2/1 0/0 0/0 .text            daB_GG_Execute__FP8daB_GG_c */
 static int daB_GG_Execute(daB_GG_c* a_this) {
     return a_this->Execute();
 }
 
-/* 805EBBBC-805EBBC4 00D89C 0008+00 1/0 0/0 0/0 .text            daB_GG_IsDelete__FP8daB_GG_c */
 static int daB_GG_IsDelete(daB_GG_c* a_this) {
     return 1;
 }
 
-/* 805EBBC4-805EBBE4 00D8A4 0020+00 1/0 0/0 0/0 .text            daB_GG_Delete__FP8daB_GG_c */
 static int daB_GG_Delete(daB_GG_c* a_this) {
     return a_this->Delete();
 }
 
-/* 805EBBE4-805EC424 00D8C4 0840+00 1/1 0/0 0/0 .text            Create__8daB_GG_cFv */
 int daB_GG_c::Create() {
     fopAcM_ct(this, daB_GG_c);
 
@@ -4532,12 +4437,10 @@ int daB_GG_c::Create() {
     return phase_state;
 }
 
-/* 805EC95C-805EC97C 00E63C 0020+00 1/0 0/0 0/0 .text            daB_GG_Create__FP10fopAc_ac_c */
 static int daB_GG_Create(fopAc_ac_c* i_this) {
     return ((daB_GG_c*)i_this)->Create();
 }
 
-/* 805ED5E0-805ED600 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GG_Method */
 static actor_method_class l_daB_GG_Method = {
     (process_method_func)daB_GG_Create,
     (process_method_func)daB_GG_Delete,
@@ -4546,7 +4449,6 @@ static actor_method_class l_daB_GG_Method = {
     (process_method_func)daB_GG_Draw,
 };
 
-/* 805ED600-805ED630 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GG */
 extern actor_process_profile_definition g_profile_B_GG = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp
index f07b5b8ce7..ed60b409fd 100644
--- a/src/d/actor/d_a_b_gm.cpp
+++ b/src/d/actor/d_a_b_gm.cpp
@@ -56,8 +56,8 @@ enum daB_GM_ACTION {
 
 class daB_GM_HIO_c {
 public:
-    /* 805ED94C */ daB_GM_HIO_c();
-    /* 805F3E64 */ virtual ~daB_GM_HIO_c() {}
+    daB_GM_HIO_c();
+    virtual ~daB_GM_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 model_size;
@@ -84,7 +84,6 @@ public:
     /* 0x49 */ u8 eye_check;
 };
 
-/* 805ED94C-805ED9FC 0000EC 00B0+00 1/1 0/0 0/0 .text            __ct__12daB_GM_HIO_cFv */
 daB_GM_HIO_c::daB_GM_HIO_c() {
     field_0x4 = 0xFF;
     model_size = 1.0f;
@@ -114,13 +113,11 @@ daB_GM_HIO_c::daB_GM_HIO_c() {
     eye_check = false;
 }
 
-/* 805ED9FC-805EDAA8 00019C 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10b_gm_classifUcf */
 static void anm_init(b_gm_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_gm", i_anmID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 805EDAA8-805EDDA8 000248 0300+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -169,10 +166,8 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
 
 static u8 l_initHIO;
 
-/* 805F47DC-805F4828 000054 004C+00 11/12 0/0 0/0 .bss             l_HIO */
 static daB_GM_HIO_c l_HIO;
 
-/* 805EDDA8-805EE020 000548 0278+00 1/0 0/0 0/0 .text            daB_GM_Draw__FP10b_gm_class */
 static int daB_GM_Draw(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -226,7 +221,6 @@ static int daB_GM_Draw(b_gm_class* i_this) {
     return 1;
 }
 
-/* 805EE05C-805EE0B4 0007FC 0058+00 1/1 0/0 0/0 .text            s_ko_del__FPvPv */
 static void* s_ko_del(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 0) {
         ((daE_GM_c*)i_actor)->InstantKill();
@@ -235,7 +229,6 @@ static void* s_ko_del(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805EE0B4-805EE438 000854 0384+00 1/1 0/0 0/0 .text            damage_check__FP10b_gm_class */
 static void damage_check(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -306,7 +299,6 @@ static void damage_check(b_gm_class* i_this) {
     }
 }
 
-/* 805EE438-805EE5D8 000BD8 01A0+00 1/1 0/0 0/0 .text            bg_check__FP10b_gm_class */
 static BOOL bg_check(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -347,10 +339,8 @@ static BOOL bg_check(b_gm_class* i_this) {
     return FALSE;
 }
 
-/* 805F4828-805F482C 0000A0 0004+00 2/2 0/0 0/0 .bss             ko_ct */
 static int ko_ct;
 
-/* 805EE620-805EE678 000DC0 0058+00 1/1 0/0 0/0 .text            s_ko_sub__FPvPv */
 static void* s_ko_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM) {
         ko_ct++;
@@ -359,7 +349,6 @@ static void* s_ko_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805EE678-805EE6E0 000E18 0068+00 1/1 0/0 0/0 .text            s_ko2_move__FPvPv */
 static void* s_ko2_move(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) {
         ((daE_GM_c*)i_actor)->MoveStart(0);
@@ -369,7 +358,6 @@ static void* s_ko2_move(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805EE6E0-805EE738 000E80 0058+00 1/1 0/0 0/0 .text            s_ko2_get__FPvPv */
 static void* s_ko2_get(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 3) {
         return i_actor;
@@ -378,7 +366,6 @@ static void* s_ko2_get(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805EE738-805EE7B0 000ED8 0078+00 1/1 0/0 0/0 .text            s_ko_move__FPvPv */
 static void* s_ko_move(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_GM && fopAcM_GetParam(i_actor) == 1) {
         ((daE_GM_c*)i_actor)->MoveStart(cM_rndF(15.0f));
@@ -387,7 +374,6 @@ static void* s_ko_move(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805EE7B0-805EE888 000F50 00D8+00 1/1 0/0 0/0 .text            b_gm_wait__FP10b_gm_class */
 static void b_gm_wait(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -409,7 +395,6 @@ static void b_gm_wait(b_gm_class* i_this) {
     i_this->mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 805F485C-805F488C 0000D4 0030+00 2/3 0/0 0/0 .bss             target_pos */
 static cXyz target_pos[] = {
     cXyz(-1350.0f, 0.0f, -1350.0f),
     cXyz(-1350.0f, 0.0f, 1350.0f),
@@ -417,7 +402,6 @@ static cXyz target_pos[] = {
     cXyz(1350.0f, 0.0f, 1350.0f),
 };
 
-/* 805EE888-805EEE50 001028 05C8+00 2/2 0/0 0/0 .text            b_gm_move__FP10b_gm_class */
 static void b_gm_move(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -541,7 +525,6 @@ static void b_gm_move(b_gm_class* i_this) {
     }
 }
 
-/* 805EEE50-805EF010 0015F0 01C0+00 1/1 0/0 0/0 .text            b_gm_beam__FP10b_gm_class */
 static void b_gm_beam(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -584,7 +567,6 @@ static void b_gm_beam(b_gm_class* i_this) {
     cLib_addCalc2(&i_this->speedF, move_speed, 1.0f, 1.0f + (0.5f * l_HIO.dash_speed));
 }
 
-/* 805EF010-805EF504 0017B0 04F4+00 1/2 0/0 0/0 .text            b_gm_kogoma__FP10b_gm_class */
 static void b_gm_kogoma(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -650,7 +632,6 @@ static void b_gm_kogoma(b_gm_class* i_this) {
     cLib_addCalc2(&a_this->speedF, move_speed, 1.0f, 1.0f + (0.5f * l_HIO.dash_speed));
 }
 
-/* 805EF504-805EF630 001CA4 012C+00 1/1 0/0 0/0 .text            b_gm_damage__FP10b_gm_class */
 static void b_gm_damage(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int anm_frame = i_this->mpModelMorf->getFrame();
@@ -682,7 +663,6 @@ static void b_gm_damage(b_gm_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 5.0f);
 }
 
-/* 805EF630-805EF9BC 001DD0 038C+00 2/1 0/0 0/0 .text            b_gm_drop__FP10b_gm_class */
 static void b_gm_drop(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp20;
@@ -770,7 +750,6 @@ static void b_gm_drop(b_gm_class* i_this) {
     }
 }
 
-/* 805EF9BC-805EFB28 00215C 016C+00 2/1 0/0 0/0 .text            action__FP10b_gm_class */
 static void action(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_move;
@@ -820,8 +799,6 @@ static void action(b_gm_class* i_this) {
     }
 }
 
-/* 805EFB28-805EFDD4 0022C8 02AC+00 1/1 0/0 0/0 .text            foot_IK__FP10b_gm_classP9b_gm_foot
- */
 static int foot_IK(b_gm_class* i_this, b_gm_foot* i_foot) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int var_r28 = 0;
@@ -859,7 +836,6 @@ static int foot_IK(b_gm_class* i_this, b_gm_foot* i_foot) {
     return var_r28;
 }
 
-/* 805F48BC-805F48EC 000134 0030+00 1/2 0/0 0/0 .bss             top_pos_data */
 static cXyz top_pos_data[] = {
     cXyz(260.0f, 0.0f, 0.0f),
     cXyz(280.0f, 0.0f, 0.0f),
@@ -867,7 +843,6 @@ static cXyz top_pos_data[] = {
     cXyz(280.0f, 0.0f, 0.0f),
 };
 
-/* 805F4474-805F449C 0000E4 0028+00 2/2 0/0 0/0 .data            top_j */
 static int top_j[] = {
     0x1B,
     0x1F,
@@ -881,7 +856,6 @@ static int top_j[] = {
     0x41,
 };
 
-/* 805EFDD4-805EFF50 002574 017C+00 1/1 0/0 0/0 .text            foot_IK_main__FP10b_gm_class */
 static void foot_IK_main(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz spC;
@@ -920,7 +894,6 @@ static void foot_IK_main(b_gm_class* i_this) {
     }
 }
 
-/* 805EFF50-805F053C 0026F0 05EC+00 1/1 0/0 0/0 .text            anm_se_set__FP10b_gm_class */
 static void anm_se_set(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1013,7 +986,6 @@ static void anm_se_set(b_gm_class* i_this) {
     }
 }
 
-/* 805F053C-805F0620 002CDC 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10b_gm_classf */
 static void cam_3d_morf(b_gm_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, i_scale, i_this->mDemoCamCenterSpeed.x * i_this->field_0x1cdc);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->mDemoCamCenterTarget.y, i_scale, i_this->mDemoCamCenterSpeed.y * i_this->field_0x1cdc);
@@ -1024,7 +996,6 @@ static void cam_3d_morf(b_gm_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamEyeTarget.z, i_scale, i_this->mDemoCamEyeSpeed.z * i_this->field_0x1cdc);
 }
 
-/* 805F0620-805F06C0 002DC0 00A0+00 1/1 0/0 0/0 .text            cam_spd_set__FP10b_gm_class */
 static void cam_spd_set(b_gm_class* i_this) {
     i_this->mDemoCamEyeSpeed.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x);
     i_this->mDemoCamEyeSpeed.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y);
@@ -1037,7 +1008,6 @@ static void cam_spd_set(b_gm_class* i_this) {
     i_this->field_0x1cdc = 0.0f;
 }
 
-/* 805F06C0-805F1F58 002E60 1898+00 2/1 0/0 0/0 .text            demo_camera__FP10b_gm_class */
 static void demo_camera(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1638,7 +1608,6 @@ static void demo_camera(b_gm_class* i_this) {
     }
 }
 
-/* 805F1F58-805F30A0 0046F8 1148+00 2/1 0/0 0/0 .text            daB_GM_Execute__FP10b_gm_class */
 static int daB_GM_Execute(b_gm_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -2020,12 +1989,10 @@ static int daB_GM_Execute(b_gm_class* i_this) {
     return 1;
 }
 
-/* 805F30A0-805F30A8 005840 0008+00 1/0 0/0 0/0 .text            daB_GM_IsDelete__FP10b_gm_class */
 static int daB_GM_IsDelete(b_gm_class* i_this) {
     return 1;
 }
 
-/* 805F30A8-805F3118 005848 0070+00 1/0 0/0 0/0 .text            daB_GM_Delete__FP10b_gm_class */
 static int daB_GM_Delete(b_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -2043,7 +2010,6 @@ static int daB_GM_Delete(b_gm_class* i_this) {
     return 1;
 }
 
-/* 805F3118-805F3560 0058B8 0448+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_gm_class* a_this = (b_gm_class*)i_this;
 
@@ -2107,7 +2073,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 805F35A8-805F38E4 005D48 033C+00 1/0 0/0 0/0 .text            daB_GM_Create__FP10fopAc_ac_c */
 static int daB_GM_Create(fopAc_ac_c* i_this) {
     b_gm_class* a_this = (b_gm_class*)i_this;
     fopAcM_ct(a_this, b_gm_class);
@@ -2258,7 +2223,6 @@ static int daB_GM_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 805F46B4-805F46D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GM_Method */
 static actor_method_class l_daB_GM_Method = {
     (process_method_func)daB_GM_Create,
     (process_method_func)daB_GM_Delete,
@@ -2267,7 +2231,6 @@ static actor_method_class l_daB_GM_Method = {
     (process_method_func)daB_GM_Draw,
 };
 
-/* 805F46D4-805F4704 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GM */
 extern actor_process_profile_definition g_profile_B_GM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp
index da46d848c1..819bd88b85 100644
--- a/src/d/actor/d_a_b_gnd.cpp
+++ b/src/d/actor/d_a_b_gnd.cpp
@@ -19,8 +19,8 @@
 
 class daB_GND_HIO_c : public JORReflexible {
 public:
-    /* 805F4A4C */ daB_GND_HIO_c();
-    /* 80602230 */ virtual ~daB_GND_HIO_c() {}
+    daB_GND_HIO_c();
+    virtual ~daB_GND_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -195,7 +195,6 @@ enum daB_GND_ACTION {
 
 static u8 l_initHIO;
 
-/* 805F4A4C-805F4A94 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__13daB_GND_HIO_cFv */
 daB_GND_HIO_c::daB_GND_HIO_c() {
     no = -1;
     model_size = 1.0f;
@@ -205,7 +204,6 @@ daB_GND_HIO_c::daB_GND_HIO_c() {
     field_0x18 = 40.0f;
 }
 
-/* 805F4A94-805F4B48 000134 00B4+00 15/15 0/0 0/0 .text            anm_init__FP11b_gnd_classifUcf */
 static void anm_init(b_gnd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mAnmID = i_anmID;
     if (i_anmID == B_GND_BCK_EGND_RRUN) {
@@ -214,7 +212,6 @@ static void anm_init(b_gnd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f3
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_gnd", i_anmID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 805F4B48-805F4C00 0001E8 00B8+00 7/7 0/0 0/0 .text            h_anm_init__FP11b_gnd_classifUcf */
 static void h_anm_init(b_gnd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mHorseAnmID = i_anmID;
     if (i_anmID == B_HG_BCK_HG_RUN) {
@@ -223,7 +220,6 @@ static void h_anm_init(b_gnd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr,
     i_this->mpHorseMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_hg", i_anmID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 805F4C00-805F4DCC 0002A0 01CC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -256,7 +252,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 805F4DCC-805F4F38 00046C 016C+00 1/1 0/0 0/0 .text            h_nodeCallBack__FP8J3DJointi */
 static int h_nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -284,7 +279,6 @@ static int h_nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 805F4F38-805F53A4 0005D8 046C+00 1/0 0/0 0/0 .text            daB_GND_Draw__FP11b_gnd_class */
 static int daB_GND_Draw(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     
@@ -377,7 +371,6 @@ static int daB_GND_Draw(b_gnd_class* i_this) {
     return 1;
 }
 
-/* 805F53E0-805F5574 000A80 0194+00 1/1 0/0 0/0 .text            shot_s_sub__FPvPv */
 static void* shot_s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW &&
         (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2))
@@ -391,10 +384,8 @@ static void* shot_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80602FB4-80602FD0 000054 001C+00 3/5 0/0 0/0 .bss             l_HIO */
 static daB_GND_HIO_c l_HIO;
 
-/* 805F5574-805F5BE8 000C14 0674+00 1/1 0/0 0/0 .text            gake_check__FP11b_gnd_class */
 static u32 gake_check(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_GndChk gnd_chk;
@@ -518,7 +509,6 @@ static u32 gake_check(b_gnd_class* i_this) {
     return 0;
 }
 
-/* 805F5BE8-805F5EF4 001288 030C+00 1/1 0/0 0/0 .text            saku_jump_check__FP11b_gnd_class */
 static BOOL saku_jump_check(b_gnd_class* i_this) {
     if (i_this->mGakeChkType >= 4) {
         return FALSE;
@@ -582,7 +572,6 @@ static BOOL saku_jump_check(b_gnd_class* i_this) {
     return FALSE;
 }
 
-/* 805F5F3C-805F6068 0015DC 012C+00 1/1 0/0 0/0 .text            b_gnd_h_wait__FP11b_gnd_class */
 static void b_gnd_h_wait(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 player_distxz = i_this->mPlayerDistXZ;
@@ -613,7 +602,6 @@ static void b_gnd_h_wait(b_gnd_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 2.0f);
 }
 
-/* 805F6068-805F6290 001708 0228+00 1/1 0/0 0/0 .text            b_gnd_h_wait2__FP11b_gnd_class */
 static void b_gnd_h_wait2(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -669,10 +657,8 @@ static void b_gnd_h_wait2(b_gnd_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f);
 }
 
-/* 80602FF8-8060305C 000098 0060+04 2/4 0/0 0/0 .bss             b_path */
 static cXyz b_path[8];
 
-/* 805F6290-805F6FA4 001930 0D14+00 2/1 0/0 0/0 .text            b_gnd_h_run_a__FP11b_gnd_class */
 static void b_gnd_h_run_a(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -968,7 +954,6 @@ static void b_gnd_h_run_a(b_gnd_class* i_this) {
     }
 }
 
-/* 805F6FA4-805F74F4 002644 0550+00 1/1 0/0 0/0 .text            b_gnd_h_run_p__FP11b_gnd_class */
 static void b_gnd_h_run_p(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1137,7 +1122,6 @@ static void b_gnd_h_run_p(b_gnd_class* i_this) {
     cLib_addCalc2(&i_this->mPlaySpeed, anm_speed_target, 1.0f, 0.1f);
 }
 
-/* 805F74F4-805F76C4 002B94 01D0+00 1/1 0/0 0/0 .text            b_gnd_h_jump__FP11b_gnd_class */
 static void b_gnd_h_jump(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1174,7 +1158,6 @@ static void b_gnd_h_jump(b_gnd_class* i_this) {
     }
 }
 
-/* 805F76C4-805F7A10 002D64 034C+00 1/1 0/0 0/0 .text            b_gnd_h_end__FP11b_gnd_class */
 static void b_gnd_h_end(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID);
@@ -1245,7 +1228,6 @@ static void b_gnd_h_end(b_gnd_class* i_this) {
     }
 }
 
-/* 805F7A10-805F7E88 0030B0 0478+00 2/1 0/0 0/0 .text            b_gnd_g_wait__FP11b_gnd_class */
 static void b_gnd_g_wait(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 speed_target = 0.0f;
@@ -1368,7 +1350,6 @@ static void b_gnd_g_wait(b_gnd_class* i_this) {
     }
 }
 
-/* 805F7E88-805F878C 003528 0904+00 2/1 0/0 0/0 .text            b_gnd_g_attack__FP11b_gnd_class */
 static BOOL b_gnd_g_attack(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1670,7 +1651,6 @@ static BOOL b_gnd_g_attack(b_gnd_class* i_this) {
     return spC;
 }
 
-/* 805F878C-805F8C20 003E2C 0494+00 1/1 0/0 0/0 .text            b_gnd_g_defence__FP11b_gnd_class */
 static void b_gnd_g_defence(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int anm_frame = i_this->mpModelMorf->getFrame();
@@ -1778,7 +1758,6 @@ static void b_gnd_g_defence(b_gnd_class* i_this) {
     }
 }
 
-/* 805F8C20-805F8F88 0042C0 0368+00 1/1 0/0 0/0 .text            b_gnd_g_jump__FP11b_gnd_class */
 static int b_gnd_g_jump(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 var_f31 = 0.0f;
@@ -1866,7 +1845,6 @@ static int b_gnd_g_jump(b_gnd_class* i_this) {
     return sp10;
 }
 
-/* 805F8F88-805F9220 004628 0298+00 1/1 0/0 0/0 .text            b_gnd_g_side__FP11b_gnd_class */
 static void b_gnd_g_side(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID);
@@ -1930,7 +1908,6 @@ static void b_gnd_g_side(b_gnd_class* i_this) {
     }
 }
 
-/* 805F9220-805F92FC 0048C0 00DC+00 1/1 0/0 0/0 .text            b_gnd_g_tuba__FP11b_gnd_class */
 static void b_gnd_g_tuba(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID);
@@ -1950,7 +1927,6 @@ static void b_gnd_g_tuba(b_gnd_class* i_this) {
     }
 }
 
-/* 805F92FC-805F94A8 00499C 01AC+00 1/1 0/0 0/0 .text            b_gnd_g_damage__FP11b_gnd_class */
 static void b_gnd_g_damage(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1987,7 +1963,6 @@ static void b_gnd_g_damage(b_gnd_class* i_this) {
     cLib_addCalc2(&a_this->speedF, 0.0f, 1.0f, 10.0f);
 }
 
-/* 805F94A8-805F98A0 004B48 03F8+00 1/1 0/0 0/0 .text            b_gnd_g_down__FP11b_gnd_class */
 static void b_gnd_g_down(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopEn_enemy_c* e_this = (fopEn_enemy_c*)a_this;
@@ -2099,7 +2074,6 @@ static void b_gnd_g_down(b_gnd_class* i_this) {
     }
 }
 
-/* 805F98A0-805F98F8 004F40 0058+00 1/1 0/0 0/0 .text            b_gnd_g_end__FP11b_gnd_class */
 static void b_gnd_g_end(b_gnd_class* i_this) {
     i_this->mDamageInvulnerabilityTimer = 10;
     mant_class* mant_p = (mant_class*)fopAcM_SearchByID(i_this->mMantChildID);
@@ -2110,7 +2084,6 @@ static void b_gnd_g_end(b_gnd_class* i_this) {
     }
 }
 
-/* 805F98F8-805F9BE4 004F98 02EC+00 1/1 0/0 0/0 .text            damage_check__FP11b_gnd_class */
 static void damage_check(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2198,7 +2171,6 @@ static void damage_check(b_gnd_class* i_this) {
     }
 }
 
-/* 805F9BE4-805FA2FC 005284 0718+00 1/1 0/0 0/0 .text            eff_set_h__FP11b_gnd_class */
 static void eff_set_h(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp44;
@@ -2341,7 +2313,6 @@ static void eff_set_h(b_gnd_class* i_this) {
     }
 }
 
-/* 805FA2FC-805FA3E4 00599C 00E8+00 1/1 0/0 0/0 .text            eff_set__FP11b_gnd_class */
 static void eff_set(b_gnd_class* i_this) {
     if (i_this->field_0x2698 == 2) {
         if (i_this->mCounter & 1) {
@@ -2359,7 +2330,6 @@ static void eff_set(b_gnd_class* i_this) {
     i_this->field_0x2698 = 0;
 }
 
-/* 805FA3E4-805FA430 005A84 004C+00 2/2 0/0 0/0 .text            s_fkdel_sub__FPvPv */
 static void* s_fkdel_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FK) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -2368,7 +2338,6 @@ static void* s_fkdel_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805FA430-805FA47C 005AD0 004C+00 1/1 0/0 0/0 .text            s_objgbdel_sub__FPvPv */
 static void* s_objgbdel_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GB) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -2377,7 +2346,6 @@ static void* s_objgbdel_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805FA47C-805FA758 005B1C 02DC+00 1/1 0/0 0/0 .text            h_damage_check__FP11b_gnd_class */
 static void h_damage_check(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2475,7 +2443,6 @@ static void h_damage_check(b_gnd_class* i_this) {
     }
 }
 
-/* 805FA758-805FAFF0 005DF8 0898+00 2/1 0/0 0/0 .text            action__FP11b_gnd_class */
 static void action(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2732,7 +2699,6 @@ static void action(b_gnd_class* i_this) {
     i_this->field_0x26c2 = 0;
 }
 
-/* 805FAFF0-805FB0F0 006690 0100+00 1/1 0/0 0/0 .text            ball_bg_check__FP11b_gnd_classi */
 static BOOL ball_bg_check(b_gnd_class* i_this, int i_no) {
     cXyz start;
     cXyz end;
@@ -2750,7 +2716,6 @@ static BOOL ball_bg_check(b_gnd_class* i_this, int i_no) {
     return FALSE;
 }
 
-/* 805FB0F0-805FB414 006790 0324+00 1/1 0/0 0/0 .text himo_control1__FP11b_gnd_classP4cXyziSc */
 static void himo_control1(b_gnd_class* i_this, cXyz* param_2, int param_3, s8 param_4) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp60;
@@ -2830,7 +2795,6 @@ static void himo_control1(b_gnd_class* i_this, cXyz* param_2, int param_3, s8 pa
     }
 }
 
-/* 805FB414-805FB620 006AB4 020C+00 1/1 0/0 0/0 .text himo_control2__FP11b_gnd_classP4cXyziSc */
 static void himo_control2(b_gnd_class* i_this, cXyz* param_2, int param_3, s8 param_4) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp30;
@@ -2880,7 +2844,6 @@ static void himo_control2(b_gnd_class* i_this, cXyz* param_2, int param_3, s8 pa
     var_r29[param_3] = i_this->field_0x1ff0[param_3].field_0x0[15];
 }
 
-/* 805FB620-805FB704 006CC0 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP11b_gnd_classf */
 static void cam_3d_morf(b_gnd_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, i_scale, i_this->mDemoCamCenterSpd.x * i_this->field_0x2710.y);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->mDemoCamCenterTarget.y, i_scale, i_this->mDemoCamCenterSpd.y * i_this->field_0x2710.y);
@@ -2891,7 +2854,6 @@ static void cam_3d_morf(b_gnd_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamEyeTarget.z, i_scale, i_this->mDemoCamEyeSpd.z * i_this->field_0x2710.y);
 }
 
-/* 805FB704-805FB7A4 006DA4 00A0+00 1/1 0/0 0/0 .text            cam_spd_set__FP11b_gnd_class */
 static void cam_spd_set(b_gnd_class* i_this) {
     i_this->mDemoCamEyeSpd.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x);
     i_this->mDemoCamEyeSpd.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y);
@@ -2904,7 +2866,6 @@ static void cam_spd_set(b_gnd_class* i_this) {
     i_this->field_0x2710.y = 0.0f;
 }
 
-/* 805FB7A4-805FDAE0 006E44 233C+00 2/1 0/0 0/0 .text            demo_camera__FP11b_gnd_class */
 static void demo_camera(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0);
@@ -3768,7 +3729,6 @@ static void demo_camera(b_gnd_class* i_this) {
     }
 }
 
-/* 805FDAE0-805FEC58 009180 1178+00 1/1 0/0 0/0 .text            anm_se_set__FP11b_gnd_class */
 static void anm_se_set(b_gnd_class* i_this) {
     if (i_this->mAnmID == B_GND_BCK_EGND_RSPUR && i_this->mpModelMorf->checkFrame(15.0f) ||
         i_this->mAnmID == B_GND_BCK_EGND_RRETURN && i_this->mpModelMorf->checkFrame(86.0f)) {
@@ -3914,7 +3874,6 @@ static void anm_se_set(b_gnd_class* i_this) {
     } 
 }
 
-/* 805FEC58-806009F8 00A2F8 1DA0+00 2/1 0/0 0/0 .text            daB_GND_Execute__FP11b_gnd_class */
 static int daB_GND_Execute(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -4602,12 +4561,10 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
     return 1;
 }
 
-/* 80600A54-80600A5C 00C0F4 0008+00 1/0 0/0 0/0 .text            daB_GND_IsDelete__FP11b_gnd_class */
 static int daB_GND_IsDelete(b_gnd_class* i_this) {
     return 1;
 }
 
-/* 80600A5C-80600B14 00C0FC 00B8+00 1/0 0/0 0/0 .text            daB_GND_Delete__FP11b_gnd_class */
 static int daB_GND_Delete(b_gnd_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -4631,7 +4588,6 @@ static int daB_GND_Delete(b_gnd_class* i_this) {
     return 1;
 }
 
-/* 80600B14-80601468 00C1B4 0954+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     b_gnd_class* i_this = (b_gnd_class*)a_this;
 
@@ -4807,7 +4763,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 806014B0-80601960 00CB50 04B0+00 1/0 0/0 0/0 .text            daB_GND_Create__FP10fopAc_ac_c */
 static int daB_GND_Create(fopAc_ac_c* a_this) {
     b_gnd_class* i_this = (b_gnd_class*)a_this;
     fopAcM_ct(i_this, b_gnd_class);
@@ -4991,10 +4946,8 @@ static int daB_GND_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 80601960-80601D24 00D000 03C4+00 1/1 0/0 0/0 .text            __ct__11b_gnd_classFv */
 b_gnd_class::b_gnd_class() {}
 
-/* 80602E6C-80602E8C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GND_Method */
 static actor_method_class l_daB_GND_Method = {
     (process_method_func)daB_GND_Create,
     (process_method_func)daB_GND_Delete,
@@ -5003,7 +4956,6 @@ static actor_method_class l_daB_GND_Method = {
     (process_method_func)daB_GND_Draw,
 };
 
-/* 80602E8C-80602EBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GND */
 extern actor_process_profile_definition g_profile_B_GND = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp
index c8e68d4e76..4fd4ad4817 100644
--- a/src/d/actor/d_a_b_go.cpp
+++ b/src/d/actor/d_a_b_go.cpp
@@ -10,7 +10,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 
-/* 806031AC-806031EC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daB_GO_HIO_cFv */
 daB_GO_HIO_c::daB_GO_HIO_c() {
     field_0x4 = -1;
     mSmallSize = 1.5f;
@@ -19,14 +18,10 @@ daB_GO_HIO_c::daB_GO_HIO_c() {
     mDisplayModelImage = false;
 }
 
-/* ############################################################################################## */
-/* 80604140-80604144 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool data_80604140;
 
-/* 80604150-80604168 000018 0018+00 6/6 0/0 0/0 .bss             l_HIO */
 static daB_GO_HIO_c l_HIO;
 
-/* 806031EC-80603270 00012C 0084+00 1/0 0/0 0/0 .text            daB_GO_Draw__FP10b_go_class */
 static int daB_GO_Draw(b_go_class* i_this) {
     if (l_HIO.mDisplayModelImage) {
         J3DModel* model = i_this->mpMorf->getModel();
@@ -39,17 +34,14 @@ static int daB_GO_Draw(b_go_class* i_this) {
     return 1;
 }
 
-/* 80603270-8060331C 0001B0 00AC+00 3/3 0/0 0/0 .text            anm_init__FP10b_go_classifUcf */
 static void anm_init(b_go_class* i_this, int i_anmID, f32 i_morf, u8 i_attribute, f32 i_speed) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("B_go", i_anmID);
     i_this->mpMorf->setAnm(bck, i_attribute, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 8060331C-80603320 00025C 0004+00 1/1 0/0 0/0 .text            damage_check__FP10b_go_class */
 static void damage_check(b_go_class* i_this) {}
 
-/* 80603320-806033F0 000260 00D0+00 1/1 0/0 0/0 .text            h_wait__FP10b_go_class */
 static void h_wait(b_go_class* i_this) {
     i_this->speedF = 0.0f;
 
@@ -68,7 +60,6 @@ static void h_wait(b_go_class* i_this) {
     }
 }
 
-/* 806033F0-80603508 000330 0118+00 1/1 0/0 0/0 .text            h_walk__FP10b_go_class */
 static void h_walk(b_go_class* i_this) {
     f32 speed = 0.0f;
 
@@ -94,7 +85,6 @@ static void h_walk(b_go_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mAngleToPlayer, 1, 0x200);
 }
 
-/* 80603508-80603638 000448 0130+00 1/1 0/0 0/0 .text            h_attack__FP10b_go_class */
 static void h_attack(b_go_class* i_this) {
     int anm_frame = i_this->mpMorf->getFrame();
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
@@ -122,7 +112,6 @@ static void h_attack(b_go_class* i_this) {
     }
 }
 
-/* 80603638-806037E8 000578 01B0+00 1/1 0/0 0/0 .text            action__FP10b_go_class */
 static void action(b_go_class* i_this) {
     cXyz speed_offset;
     cXyz move_speed;
@@ -172,7 +161,6 @@ static void action(b_go_class* i_this) {
     i_this->mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 806037E8-806038EC 000728 0104+00 2/1 0/0 0/0 .text            daB_GO_Execute__FP10b_go_class */
 static int daB_GO_Execute(b_go_class* i_this) {
     i_this->unk_0x668++;
 
@@ -200,12 +188,10 @@ static int daB_GO_Execute(b_go_class* i_this) {
     return 1;
 }
 
-/* 806038EC-806038F4 00082C 0008+00 1/0 0/0 0/0 .text            daB_GO_IsDelete__FP10b_go_class */
 static int daB_GO_IsDelete(b_go_class* i_this) {
     return 1;
 }
 
-/* 806038F4-8060395C 000834 0068+00 1/0 0/0 0/0 .text            daB_GO_Delete__FP10b_go_class */
 static int daB_GO_Delete(b_go_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_go");
 
@@ -220,7 +206,6 @@ static int daB_GO_Delete(b_go_class* i_this) {
     return 1;
 }
 
-/* 8060395C-80603A54 00089C 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_go_class* a_this = (b_go_class*)i_this;
 
@@ -236,7 +221,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80603A54-80603CA0 000994 024C+00 1/0 0/0 0/0 .text            daB_GO_Create__FP10fopAc_ac_c */
 static int daB_GO_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, b_go_class);
     b_go_class* a_this = (b_go_class*)i_this;
@@ -298,17 +282,14 @@ static int daB_GO_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80603CA0-80603E54 000BE0 01B4+00 1/1 0/0 0/0 .text            __ct__10b_go_classFv */
 b_go_class::b_go_class() {}
 
-/* 80604094-806040B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GO_Method */
 static actor_method_class l_daB_GO_Method = {
     (process_method_func)daB_GO_Create,  (process_method_func)daB_GO_Delete,
     (process_method_func)daB_GO_Execute, (process_method_func)daB_GO_IsDelete,
     (process_method_func)daB_GO_Draw,
 };
 
-/* 806040B4-806040E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GO */
 extern actor_process_profile_definition g_profile_B_GO = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp
index e27f22c3df..4291a91ce2 100644
--- a/src/d/actor/d_a_b_gos.cpp
+++ b/src/d/actor/d_a_b_gos.cpp
@@ -27,7 +27,6 @@ enum B_GOS_RES_FILE_ID {
     /* 0x09 */ BMDR_GRA_A = 9,
 };
 
-/* 8060541C-80605514 000000 00F8+00 1/1 0/0 0/0 .data            j_info */
 static b_gos_j_info j_info[] = {
     {0x000E, 1.0f},   {0x000D, 1.0f},   {0x0F0D, 0.333f}, {0x0F0D, 0.666f}, {0x000F, 1.0f},
     {0x0003, 1.0f},   {0x0304, 0.5f},   {0x0004, 1.0f},   {0x0405, 0.5f},   {0x0005, 1.0f},
@@ -38,14 +37,12 @@ static b_gos_j_info j_info[] = {
     {0x0D08, 0.5f},
 };
 
-/* 8060426C-8060429C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__13daB_GOS_HIO_cFv */
 daB_GOS_HIO_c::daB_GOS_HIO_c() {
     field_0x4 = -1;
     mSize = 1.0f;
     mNormalSpeed = 10.0f;
 }
 
-/* 8060429C-80604370 00011C 00D4+00 1/0 0/0 0/0 .text            daB_GOS_Draw__FP11b_gos_class */
 static int daB_GOS_Draw(b_gos_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
 
@@ -62,17 +59,14 @@ static int daB_GOS_Draw(b_gos_class* i_this) {
     return 1;
 }
 
-/* 80604370-8060441C 0001F0 00AC+00 3/3 0/0 0/0 .text            anm_init__FP11b_gos_classifUcf */
 static void anm_init(b_gos_class* i_this, int i_anmID, f32 i_morf, u8 i_attribute, f32 i_speed) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("B_gos", i_anmID);
     i_this->mpMorf->setAnm(bck, i_attribute, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 8060441C-80604420 00029C 0004+00 1/1 0/0 0/0 .text            damage_check__FP11b_gos_class */
 static void damage_check(b_gos_class* i_this) {}
 
-/* 80604420-806044D8 0002A0 00B8+00 1/1 0/0 0/0 .text            wait__FP11b_gos_class */
 static void wait(b_gos_class* i_this) {
     i_this->speedF = 0.0f;
 
@@ -91,16 +85,12 @@ static void wait(b_gos_class* i_this) {
     }
 }
 
-/* 80605608-8060560C 000008 0004+00 3/3 0/0 0/0 .bss             boss */
 static b_go_class* boss;
 
-/* 8060560C-80605610 00000C 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_8060560C;
 
-/* 8060561C-8060562C 00001C 0010+00 5/5 0/0 0/0 .bss             l_HIO */
 static daB_GOS_HIO_c l_HIO;
 
-/* 806044D8-806045E4 000358 010C+00 1/1 0/0 0/0 .text            walk__FP11b_gos_class */
 static void walk(b_gos_class* i_this) {
     f32 speed = 0.0f;
 
@@ -124,7 +114,6 @@ static void walk(b_gos_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mWalkDirection, 1, 0x800);
 }
 
-/* 806045E4-806046E0 000464 00FC+00 1/1 0/0 0/0 .text            ball__FP11b_gos_class */
 static void ball(b_gos_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -149,7 +138,6 @@ static void ball(b_gos_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 806046E0-806048E0 000560 0200+00 1/1 0/0 0/0 .text            stick__FP11b_gos_class */
 static void stick(b_gos_class* i_this) {
     cXyz offset;
     cXyz move_pos;
@@ -194,7 +182,6 @@ static void stick(b_gos_class* i_this) {
                         0x400);
 }
 
-/* 806048E0-80604B7C 000760 029C+00 1/1 0/0 0/0 .text            action__FP11b_gos_class */
 static void action(b_gos_class* i_this) {
     u8 var_r29;
     bool on_cyl_co;
@@ -286,7 +273,6 @@ static void action(b_gos_class* i_this) {
     }
 }
 
-/* 80604B7C-80604CF4 0009FC 0178+00 2/1 0/0 0/0 .text            daB_GOS_Execute__FP11b_gos_class */
 static int daB_GOS_Execute(b_gos_class* i_this) {
     i_this->field_0x66c++;
 
@@ -321,13 +307,10 @@ static int daB_GOS_Execute(b_gos_class* i_this) {
     return 1;
 }
 
-/* 80604CF4-80604CFC 000B74 0008+00 1/0 0/0 0/0 .text            daB_GOS_IsDelete__FP11b_gos_class
- */
 static int daB_GOS_IsDelete(b_gos_class* i_this) {
     return 1;
 }
 
-/* 80604CFC-80604D64 000B7C 0068+00 1/0 0/0 0/0 .text            daB_GOS_Delete__FP11b_gos_class */
 static int daB_GOS_Delete(b_gos_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_gos");
 
@@ -342,7 +325,6 @@ static int daB_GOS_Delete(b_gos_class* i_this) {
     return 1;
 }
 
-/* 80604D64-80604E5C 000BE4 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_gos_class* a_this = (b_gos_class*)i_this;
 
@@ -358,7 +340,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return true;
 }
 
-/* 80604E5C-80605024 000CDC 01C8+00 1/0 0/0 0/0 .text            daB_GOS_Create__FP10fopAc_ac_c */
 static int daB_GOS_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, b_gos_class);
     b_gos_class* a_this = (b_gos_class*)i_this;
@@ -426,17 +407,14 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80605024-806051D8 000EA4 01B4+00 1/1 0/0 0/0 .text            __ct__11b_gos_classFv */
 b_gos_class::b_gos_class() {}
 
-/* 80605558-80605578 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_GOS_Method */
 static actor_method_class l_daB_GOS_Method = {
     (process_method_func)daB_GOS_Create,  (process_method_func)daB_GOS_Delete,
     (process_method_func)daB_GOS_Execute, (process_method_func)daB_GOS_IsDelete,
     (process_method_func)daB_GOS_Draw,
 };
 
-/* 80605578-806055A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_GOS */
 extern actor_process_profile_definition g_profile_B_GOS = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp
index 9004ced407..78122845a6 100644
--- a/src/d/actor/d_a_b_mgn.cpp
+++ b/src/d/actor/d_a_b_mgn.cpp
@@ -169,8 +169,8 @@ enum Joint {
 
 class daB_MGN_HIO_c : public JORReflexible {
 public:
-    /* 8060572C */ daB_MGN_HIO_c();
-    /* 8060F8D0 */ virtual ~daB_MGN_HIO_c() {}
+    daB_MGN_HIO_c();
+    virtual ~daB_MGN_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -184,7 +184,6 @@ public:
     /* 0x20 */ f32 jewel_B;
 };
 
-/* 8060572C-8060577C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__13daB_MGN_HIO_cFv */
 daB_MGN_HIO_c::daB_MGN_HIO_c() {
     no = -1;
     base_size = 1.2f;
@@ -210,7 +209,6 @@ void daB_MGN_HIO_c::genMessage(JORMContext* ctx) {
 #endif
 
 namespace {
-/* 806100CC-8061010C 000038 0040+00 0/1 0/0 0/0 .data cc_sph_src__23@unnamed@d_a_b_mgn_cpp@ */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 2, 3}, {0xDCFBFDFD, 0x43}, 0x75}},  // mObj
@@ -223,7 +221,6 @@ static dCcD_SrcSph cc_sph_src = {
     }  // mSphAttr
 };
 
-/* 8061010C-8061014C 000078 0040+00 0/1 0/0 0/0 .data at_sph_src__23@unnamed@d_a_b_mgn_cpp@ */
 static dCcD_SrcSph at_sph_src = {
     {
         {0, {{AT_TYPE_CSTATUE_BOSS_SWING, 2, 12}, {0xDCFBFDFD, 0}, 0}},  // mObj
@@ -236,7 +233,6 @@ static dCcD_SrcSph at_sph_src = {
     }  // mSphAttr
 };
 
-/* 8061014C-8061018C 0000B8 0040+00 0/1 0/0 0/0 .data tg_sph_src__23@unnamed@d_a_b_mgn_cpp@ */
 static dCcD_SrcSph tg_sph_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 12}, {0x04402020, 2}, 0}},  // mObj
@@ -249,13 +245,11 @@ static dCcD_SrcSph tg_sph_src = {
     }  // mSphAttr
 };
 
-/* 8061018C-8061019C 0000F8 000F+01 1/1 0/0 0/0 .data body_front_sph__23@unnamed@d_a_b_mgn_cpp@ */
 static u8 body_front_sph[15] = {
     1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1,
 };
 }  // namespace
 
-/* 8060577C-8060584C 00013C 00D0+00 1/1 0/0 0/0 .text ctrlJoint__9daB_MGN_cFP8J3DJointP8J3DModel */
 int daB_MGN_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     u16 jntNo = i_joint->getJntNo();
     int jointNo = jntNo;
@@ -272,7 +266,6 @@ int daB_MGN_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8060584C-80605898 00020C 004C+00 1/1 0/0 0/0 .text JointCallBack__9daB_MGN_cFP8J3DJointi */
 int daB_MGN_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -286,13 +279,10 @@ int daB_MGN_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80610440-80610444 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80610450-80610474 000018 0024+00 6/6 0/0 0/0 .bss             l_HIO */
 static daB_MGN_HIO_c l_HIO;
 
-/* 80605898-80605C8C 000258 03F4+00 1/1 0/0 0/0 .text            draw__9daB_MGN_cFv */
 int daB_MGN_c::draw() {
     J3DModel* model = mpMgnModelMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -355,12 +345,10 @@ int daB_MGN_c::draw() {
     return 1;
 }
 
-/* 80605C8C-80605CAC 00064C 0020+00 1/0 0/0 0/0 .text            daB_MGN_Draw__FP9daB_MGN_c */
 static int daB_MGN_Draw(daB_MGN_c* i_this) {
     return i_this->draw();
 }
 
-/* 80605CAC-80605D78 00066C 00CC+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) {
@@ -379,7 +367,6 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80605D78-8060601C 000738 02A4+00 2/2 0/0 0/0 .text            setDashSmokeEffect__9daB_MGN_cFv */
 void daB_MGN_c::setDashSmokeEffect() {
     static f32 foot_rand_frame[8] = {10.0f, 16.0f, 18.0f, 2.0f, 64.0f, 68.0f, 63.0f, 69.0f};
 
@@ -426,7 +413,6 @@ void daB_MGN_c::setDashSmokeEffect() {
     }
 }
 
-/* 8060601C-806062C0 0009DC 02A4+00 2/2 0/0 0/0 .text            setBackJumpEffect__9daB_MGN_cFv */
 void daB_MGN_c::setBackJumpEffect() {
     int jnt_no = -1;
     int var_r27;
@@ -468,7 +454,6 @@ void daB_MGN_c::setBackJumpEffect() {
     }
 }
 
-/* 806062C0-80606424 000C80 0164+00 1/1 0/0 0/0 .text            setSlideSmokeEffect__9daB_MGN_cFv */
 void daB_MGN_c::setSlideSmokeEffect() {
     dBgS_GndChk gndchk;
     cXyz effpos;
@@ -489,7 +474,6 @@ void daB_MGN_c::setSlideSmokeEffect() {
     }
 }
 
-/* 80606424-806065D4 000DE4 01B0+00 3/3 0/0 0/0 .text            setBodySlideEffect__9daB_MGN_cFv */
 void daB_MGN_c::setBodySlideEffect() {
     dBgS_GndChk gndchk;
     cXyz effpos;
@@ -516,7 +500,6 @@ void daB_MGN_c::setBodySlideEffect() {
     }
 }
 
-/* 806065D4-80606754 000F94 0180+00 1/1 0/0 0/0 .text            setOpeningEffect__9daB_MGN_cFv */
 void daB_MGN_c::setOpeningEffect() {
     dBgS_GndChk gndchk;
     cXyz effpos;
@@ -543,7 +526,6 @@ void daB_MGN_c::setOpeningEffect() {
     }
 }
 
-/* 80606754-8060688C 001114 0138+00 1/1 0/0 0/0 .text            setStepEffect__9daB_MGN_cFv */
 void daB_MGN_c::setStepEffect() {
     dBgS_GndChk gndchk;
     cXyz effpos;
@@ -564,7 +546,6 @@ void daB_MGN_c::setStepEffect() {
     }
 }
 
-/* 8060688C-80606A10 00124C 0184+00 2/2 0/0 0/0 .text            setFallAttackEffect__9daB_MGN_cFv */
 void daB_MGN_c::setFallAttackEffect() {
     dBgS_GndChk gndchk;
     cXyz effpos;
@@ -590,7 +571,6 @@ void daB_MGN_c::setFallAttackEffect() {
     }
 }
 
-/* 80606A10-80606AEC 0013D0 00DC+00 1/1 0/0 0/0 .text            setHeadLightEffect__9daB_MGN_cFv */
 void daB_MGN_c::setHeadLightEffect() {
     mHeadLightEmitterID = dComIfGp_particle_set(mHeadLightEmitterID, dPa_RM(ID_ZI_S_MGN_HEADCORE_A), &current.pos, &tevStr, &shape_angle,
                                                 NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -601,7 +581,6 @@ void daB_MGN_c::setHeadLightEffect() {
     }
 }
 
-/* 80606AEC-80606C6C 0014AC 0180+00 1/1 0/0 0/0 .text            setHeadHitEffect__9daB_MGN_cFv */
 void daB_MGN_c::setHeadHitEffect() {
     mHeadHitEmitterID = dComIfGp_particle_set(mHeadHitEmitterID, dPa_RM(ID_ZI_S_MGN_HEADCOREHIT_A), &current.pos, &tevStr, &shape_angle,
                                               NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -620,7 +599,6 @@ void daB_MGN_c::setHeadHitEffect() {
     }
 }
 
-/* 80606C6C-80606D60 00162C 00F4+00 2/2 0/0 0/0 .text setHideSmokeEffect__9daB_MGN_cFP4cXyzUc */
 int daB_MGN_c::setHideSmokeEffect(cXyz* i_pos, u8 i_type) {
     for (int i = 0; i < 4; i++) {
         if (mGdgateStatus[i] == 0) {
@@ -642,8 +620,6 @@ int daB_MGN_c::setHideSmokeEffect(cXyz* i_pos, u8 i_type) {
     return -1;
 }
 
-/* 80606D60-806071C4 001720 0464+00 2/1 0/0 0/0 .text            calcHideSmokeEffect__9daB_MGN_cFv
- */
 void daB_MGN_c::calcHideSmokeEffect() {
     csXyz eff_rot;
     cXyz eff_size(7.0f, 7.0f, 7.0f);
@@ -730,7 +706,6 @@ void daB_MGN_c::calcHideSmokeEffect() {
     }
 }
 
-/* 806071C4-8060729C 001B84 00D8+00 1/1 0/0 0/0 .text            drawHideSmokeEffect__9daB_MGN_cFv */
 void daB_MGN_c::drawHideSmokeEffect() {
     J3DModel* model = mpMgnModelMorf->getModel();
     J3DModelData* modelData;
@@ -752,7 +727,6 @@ void daB_MGN_c::drawHideSmokeEffect() {
     }
 }
 
-/* 8060729C-80607498 001C5C 01FC+00 5/5 0/0 0/0 .text            setBloodEffect__9daB_MGN_cFv */
 void daB_MGN_c::setBloodEffect() {
     if (mBloodEffTimer == 0) {
         for (int i = 0; i < 20; i++) {
@@ -775,7 +749,6 @@ void daB_MGN_c::setBloodEffect() {
     }
 }
 
-/* 80607498-8060778C 001E58 02F4+00 1/1 0/0 0/0 .text            calcBloodMove__9daB_MGN_cFv */
 void daB_MGN_c::calcBloodMove() {
     for (int i = 0; i < 20; i++) {
         switch (mBloodEffMode[i]) {
@@ -848,7 +821,6 @@ void daB_MGN_c::calcBloodMove() {
     }
 }
 
-/* 8060778C-806078DC 00214C 0150+00 2/2 0/0 0/0 .text            checkDownBeforeBG__9daB_MGN_cFv */
 void daB_MGN_c::checkDownBeforeBG() {
     cXyz line_end;
     line_end = current.pos;
@@ -876,13 +848,11 @@ void daB_MGN_c::checkDownBeforeBG() {
     }
 }
 
-/* 80607924-806079CC 0022E4 00A8+00 11/11 0/0 0/0 .text            setBck__9daB_MGN_cFiUcff */
 void daB_MGN_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) {
     mpMgnModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", i_anm), i_mode, i_morf,
                            i_speed, 0.0f, -1.0f);
 }
 
-/* 806079CC-80607A2C 00238C 0060+00 3/3 0/0 0/0 .text            checkBck__9daB_MGN_cFi */
 bool daB_MGN_c::checkBck(int i_anm) {
     if (mpMgnModelMorf->getAnm() == dComIfG_getObjectRes("B_mgn", i_anm))
         return true;
@@ -890,7 +860,6 @@ bool daB_MGN_c::checkBck(int i_anm) {
         return false;
 }
 
-/* 80607A2C-80607A80 0023EC 0054+00 16/16 0/0 0/0 .text            setActionMode__9daB_MGN_cFii */
 void daB_MGN_c::setActionMode(int i_action, int i_mode) {
     mActionMode = i_action;
     mMoveMode = i_mode;
@@ -902,7 +871,6 @@ void daB_MGN_c::setActionMode(int i_action, int i_mode) {
     }
 }
 
-/* 80607A80-80607B50 002440 00D0+00 2/2 0/0 0/0 .text            setExitMode__9daB_MGN_cFi */
 void daB_MGN_c::setExitMode(BOOL i_exitMode) {
     mpMgnBtk->init(mpMgnModelMorf->getModel()->getModelData(),
                    (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("B_mgn", BTK_MGN_EXIT),
@@ -918,7 +886,6 @@ void daB_MGN_c::setExitMode(BOOL i_exitMode) {
     mAtSph.OffAtSetBit();
 }
 
-/* 80607B50-80607B80 002510 0030+00 1/1 0/0 0/0 .text            onBodyShield__9daB_MGN_cFv */
 void daB_MGN_c::onBodyShield() {
     mTgType = 0xDCFBFDFD;
     for (int i = 0; i < 15; i++) {
@@ -926,7 +893,6 @@ void daB_MGN_c::onBodyShield() {
     }
 }
 
-/* 80607B80-80607BB0 002540 0030+00 1/1 0/0 0/0 .text            offBodyShield__9daB_MGN_cFv */
 void daB_MGN_c::offBodyShield() {
     mTgType = 0xFBFDFD;
     for (int i = 0; i < 15; i++) {
@@ -934,7 +900,6 @@ void daB_MGN_c::offBodyShield() {
     }
 }
 
-/* 80607BB0-80607BFC 002570 004C+00 3/3 0/0 0/0 .text            onBodySlideAt__9daB_MGN_cFv */
 void daB_MGN_c::onBodySlideAt() {
     for (int i = 0; i < 15; i++) {
         if (body_front_sph[i]) {
@@ -945,14 +910,12 @@ void daB_MGN_c::onBodySlideAt() {
     }
 }
 
-/* 80607BFC-80607C20 0025BC 0024+00 3/3 0/0 0/0 .text            offBodySlideAt__9daB_MGN_cFv */
 void daB_MGN_c::offBodySlideAt() {
     for (int i = 0; i < 15; i++) {
         mBodyCcSph[i].SetAtSPrm(3);
     }
 }
 
-/* 80607C20-80607CB0 0025E0 0090+00 1/1 0/0 0/0 .text            checkHitSlideAt__9daB_MGN_cFv */
 bool daB_MGN_c::checkHitSlideAt() {
     for (int i = 0; i < 15; i++) {
         if (mBodyCcSph[i].ChkAtHit() && !mBodyCcSph[i].ChkAtShieldHit()) {
@@ -965,7 +928,6 @@ bool daB_MGN_c::checkHitSlideAt() {
     return false;
 }
 
-/* 80607CB0-80607CE4 002670 0034+00 1/1 0/0 0/0 .text            onBodyFallAt__9daB_MGN_cFv */
 void daB_MGN_c::onBodyFallAt() {
     for (int i = 0; i < 15; i++) {
         mBodyCcSph[i].SetAtSPrm(31);
@@ -974,14 +936,12 @@ void daB_MGN_c::onBodyFallAt() {
     }
 }
 
-/* 80607CE4-80607D08 0026A4 0024+00 1/1 0/0 0/0 .text            offBodyFallAt__9daB_MGN_cFv */
 void daB_MGN_c::offBodyFallAt() {
     for (int i = 0; i < 15; i++) {
         mBodyCcSph[i].SetAtSPrm(3);
     }
 }
 
-/* 80607D08-80607D44 0026C8 003C+00 4/4 0/0 0/0 .text            onBodyCo__9daB_MGN_cFv */
 void daB_MGN_c::onBodyCo() {
     mAppearFlag = 1;
 
@@ -991,7 +951,6 @@ void daB_MGN_c::onBodyCo() {
     }
 }
 
-/* 80607D44-80607D7C 002704 0038+00 4/4 0/0 0/0 .text            offBodyCo__9daB_MGN_cFv */
 void daB_MGN_c::offBodyCo() {
     mAppearFlag = 0;
 
@@ -1001,7 +960,6 @@ void daB_MGN_c::offBodyCo() {
     }
 }
 
-/* 80607D7C-8060819C 00273C 0420+00 1/1 0/0 0/0 .text            getNearHitPos__9daB_MGN_cFP4cXyz */
 cXyz daB_MGN_c::getNearHitPos(cXyz* param_1) {
     cXyz sp38[6] = {
         cXyz(280.0f, -200.0f, 0.0f),
@@ -1047,7 +1005,6 @@ cXyz daB_MGN_c::getNearHitPos(cXyz* param_1) {
     }
 }
 
-/* 8060819C-80608738 002B5C 059C+00 1/1 0/0 0/0 .text            damage_check__9daB_MGN_cFv */
 void daB_MGN_c::damage_check() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1201,7 +1158,6 @@ void daB_MGN_c::damage_check() {
     }
 }
 
-/* 80608738-806087A8 0030F8 0070+00 1/1 0/0 0/0 .text            calcJointAngle__9daB_MGN_cFs */
 void daB_MGN_c::calcJointAngle(s16 i_targetAngle) {
     field_0xb18 = 1;
 
@@ -1212,7 +1168,6 @@ void daB_MGN_c::calcJointAngle(s16 i_targetAngle) {
     cLib_addCalcAngleS2(&field_0xb14, i_targetAngle, 4, 0xC00);
 }
 
-/* 806087A8-80608EF8 003168 0750+00 2/1 0/0 0/0 .text            executeCircle__9daB_MGN_cFv */
 void daB_MGN_c::executeCircle() {
     cXyz sp30(0.0f, 0.0f, -600.0f);
     cXyz sp24;
@@ -1353,7 +1308,6 @@ void daB_MGN_c::executeCircle() {
     }
 }
 
-/* 80608EF8-80609D70 0038B8 0E78+00 2/1 0/0 0/0 .text            executeDash__9daB_MGN_cFv */
 void daB_MGN_c::executeDash() {
     daPy_py_c* player_sp14 = daPy_getPlayerActorClass();
 
@@ -1685,7 +1639,6 @@ void daB_MGN_c::executeDash() {
     }
 }
 
-/* 80609D70-8060A670 004730 0900+00 2/1 0/0 0/0 .text            executeThrown__9daB_MGN_cFv */
 void daB_MGN_c::executeThrown() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz target;
@@ -1905,7 +1858,6 @@ void daB_MGN_c::executeThrown() {
     }
 }
 
-/* 8060A670-8060A72C 005030 00BC+00 3/3 0/0 0/0 .text            setDownEnd__9daB_MGN_cFv */
 void daB_MGN_c::setDownEnd() {
     field_0x20f4[0].OffTgSetBit();
     field_0x20f4[1].OffTgSetBit();
@@ -1924,7 +1876,6 @@ void daB_MGN_c::setDownEnd() {
     setActionMode(ACTION_DOWN_e, 7);
 }
 
-/* 8060A72C-8060ACB8 0050EC 058C+00 2/1 0/0 0/0 .text            executeDown__9daB_MGN_cFv */
 void daB_MGN_c::executeDown() {
     switch (mMoveMode) {
     case 0:
@@ -2079,7 +2030,6 @@ void daB_MGN_c::executeDown() {
     }
 }
 
-/* 8060ACB8-8060B028 005678 0370+00 1/1 0/0 0/0 .text            executeDownDamage__9daB_MGN_cFv */
 void daB_MGN_c::executeDownDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2189,7 +2139,6 @@ void daB_MGN_c::executeDownDamage() {
     }
 }
 
-/* 8060B028-8060B430 0059E8 0408+00 1/1 0/0 0/0 .text            executeDownBiteDamage__9daB_MGN_cFv */
 void daB_MGN_c::executeDownBiteDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2280,7 +2229,6 @@ void daB_MGN_c::executeDownBiteDamage() {
     }
 }
 
-/* 8060B430-8060B544 005DF0 0114+00 1/1 0/0 0/0 .text            executeWarp__9daB_MGN_cFv */
 void daB_MGN_c::executeWarp() {
     switch (mMoveMode) {
     case 0:
@@ -2315,7 +2263,6 @@ void daB_MGN_c::executeWarp() {
     }
 }
 
-/* 8060B544-8060BE6C 005F04 0928+00 2/1 0/0 0/0 .text            executeFall__9daB_MGN_cFv */
 void daB_MGN_c::executeFall() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz player_pos(player->current.pos);
@@ -2540,7 +2487,6 @@ void daB_MGN_c::executeFall() {
     }
 }
 
-/* 8060BE6C-8060C034 00682C 01C8+00 1/1 0/0 0/0 .text            demo_skip__9daB_MGN_cFi */
 void daB_MGN_c::demo_skip(int param_1) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2572,7 +2518,6 @@ void daB_MGN_c::demo_skip(int param_1) {
     setActionMode(ACTION_DASH_e, 0);
 }
 
-/* 8060C034-8060C068 0069F4 0034+00 1/1 0/0 0/0 .text            DemoSkipCallBack__9daB_MGN_cFPvi */
 int daB_MGN_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this) {
         ((daB_MGN_c*)i_this)->demo_skip(param_1);
@@ -2582,7 +2527,6 @@ int daB_MGN_c::DemoSkipCallBack(void* i_this, int param_1) {
     return 0;
 }
 
-/* 8060C068-8060D078 006A28 1010+00 2/1 0/0 0/0 .text            executeOpening__9daB_MGN_cFv */
 void daB_MGN_c::executeOpening() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2875,7 +2819,6 @@ void daB_MGN_c::executeOpening() {
     mSound.startCreatureVoiceLevel(Z2SE_EN_MGN_DEMO_OP, -1);
 }
 
-/* 8060D078-8060D880 007A38 0808+00 1/1 0/0 0/0 .text            executeDeath__9daB_MGN_cFv */
 void daB_MGN_c::executeDeath() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3039,7 +2982,6 @@ void daB_MGN_c::executeDeath() {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0);
 }
 
-/* 8060D880-8060DAC0 008240 0240+00 1/1 0/0 0/0 .text            executeJump__9daB_MGN_cFv */
 void daB_MGN_c::executeJump() {
     switch (mMoveMode) {
     case 0:
@@ -3078,7 +3020,6 @@ void daB_MGN_c::executeJump() {
     }
 }
 
-/* 8060DAC0-8060DDA0 008480 02E0+00 1/1 0/0 0/0 .text            checkStartJump__9daB_MGN_cFv */
 void daB_MGN_c::checkStartJump() {
     if (field_0xb0b >= 2) {
         if (!dComIfGs_isOneZoneSwitch(7, fopAcM_GetRoomNo(this))) {
@@ -3121,7 +3062,6 @@ void daB_MGN_c::checkStartJump() {
     }
 }
 
-/* 8060DDA0-8060E158 008760 03B8+00 2/1 0/0 0/0 .text            action__9daB_MGN_cFv */
 void daB_MGN_c::action() {
     damage_check();
     checkStartJump();
@@ -3238,7 +3178,6 @@ void daB_MGN_c::action() {
     mpMgnBtk->play();
 }
 
-/* 8060E158-8060E1D0 008B18 0078+00 1/1 0/0 0/0 .text            mtx_set__9daB_MGN_cFv */
 void daB_MGN_c::mtx_set() {
     cXyz work;
     J3DModel* model = mpMgnModelMorf->getModel();
@@ -3250,7 +3189,6 @@ void daB_MGN_c::mtx_set() {
     mpMgnModelMorf->modelCalc();
 }
 
-/* 8060E1D0-8060E820 008B90 0650+00 1/1 0/0 0/0 .text            cc_set__9daB_MGN_cFv */
 void daB_MGN_c::cc_set() {
     static f32 const cc_set_radius[15] = {
         200.0f, 280.0f, 100.0f, 100.0f, 100.0f, 100.0f, 70.0f,  70.0f,
@@ -3356,7 +3294,6 @@ void daB_MGN_c::cc_set() {
     dComIfG_Ccsp()->Set(&mAtSph);
 }
 
-/* 8060E820-8060EA10 0091E0 01F0+00 1/1 0/0 0/0 .text            execute__9daB_MGN_cFv */
 int daB_MGN_c::execute() {
     if (field_0xa9c != 0) {
         field_0xa9c--;
@@ -3417,17 +3354,14 @@ int daB_MGN_c::execute() {
     return 1;
 }
 
-/* 8060EA10-8060EA30 0093D0 0020+00 2/1 0/0 0/0 .text            daB_MGN_Execute__FP9daB_MGN_c */
 static int daB_MGN_Execute(daB_MGN_c* i_this) {
     return i_this->execute();
 }
 
-/* 8060EA30-8060EA38 0093F0 0008+00 1/0 0/0 0/0 .text            daB_MGN_IsDelete__FP9daB_MGN_c */
 static int daB_MGN_IsDelete(daB_MGN_c* i_this) {
     return 1;
 }
 
-/* 8060EA38-8060EAC0 0093F8 0088+00 1/1 0/0 0/0 .text            _delete__9daB_MGN_cFv */
 int daB_MGN_c::_delete() {
     dComIfG_resDelete(&mMgnPhase, "B_mgn");
     dComIfG_resDelete(&mMgnePhase, "B_mgne");
@@ -3444,7 +3378,6 @@ int daB_MGN_c::_delete() {
     return 1;
 }
 
-/* 8060EAC0-8060EAE0 009480 0020+00 1/0 0/0 0/0 .text            daB_MGN_Delete__FP9daB_MGN_c */
 static int daB_MGN_Delete(daB_MGN_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
@@ -3454,7 +3387,6 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) {
 char* const unused = "Delete -> B_MGN(id=%d)\n";
 #endif
 
-/* 8060EAE0-8060F068 0094A0 0588+00 1/1 0/0 0/0 .text            CreateHeap__9daB_MGN_cFv */
 int daB_MGN_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
     JUT_ASSERT(4010, modelData != NULL);
@@ -3558,13 +3490,11 @@ int daB_MGN_c::CreateHeap() {
     return 1;
 }
 
-/* 8060F0B0-8060F0D0 009A70 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daB_MGN_c* i_this = (daB_MGN_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 8060F0D0-8060F548 009A90 0478+00 1/1 0/0 0/0 .text            create__9daB_MGN_cFv */
 int daB_MGN_c::create() {
     fopAcM_ct(this, daB_MGN_c);
 
@@ -3644,19 +3574,16 @@ int daB_MGN_c::create() {
     return phase_state;
 }
 
-/* 8060F868-8060F888 00A228 0020+00 1/0 0/0 0/0 .text            daB_MGN_Create__FP9daB_MGN_c */
 static int daB_MGN_Create(daB_MGN_c* i_this) {
     return i_this->create();
 }
 
-/* 80610364-80610384 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_MGN_Method */
 static actor_method_class l_daB_MGN_Method = {
     (process_method_func)daB_MGN_Create,  (process_method_func)daB_MGN_Delete,
     (process_method_func)daB_MGN_Execute, (process_method_func)daB_MGN_IsDelete,
     (process_method_func)daB_MGN_Draw,
 };
 
-/* 80610384-806103B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_MGN */
 extern actor_process_profile_definition g_profile_B_MGN = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp
index dde55e3723..4c104b494d 100644
--- a/src/d/actor/d_a_b_ob.cpp
+++ b/src/d/actor/d_a_b_ob.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_b_ob
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_b_ob.h"
@@ -77,8 +72,8 @@ enum B_oh_RES_File_ID {
 class daB_OB_HIO_c {
 public:
 public:
-    /* 8061056C */ daB_OB_HIO_c();
-    /* 8061A808 */ virtual ~daB_OB_HIO_c() {}
+    daB_OB_HIO_c();
+    virtual ~daB_OB_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mCoreSize;
@@ -91,7 +86,6 @@ public:
 };
 
 
-/* 8061056C-806105BC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daB_OB_HIO_cFv */
 daB_OB_HIO_c::daB_OB_HIO_c() {
     field_0x04 = -1;
     mCoreSize = 1.0f;
@@ -103,14 +97,12 @@ daB_OB_HIO_c::daB_OB_HIO_c() {
     mRange = 3.0f;
 }
 
-/* 806105BC-8061066C 00013C 00B0+00 8/8 0/0 0/0 .text            anm_init__FP10b_ob_classifUcf */
 static void anm_init(b_ob_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes("B_oh", i_anmID);
     i_this->mBodyParts[0].mpMorf->setAnm(pbck, i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->mAnmID = i_anmID;
 }
 
-/* 8061066C-806107B4 0001EC 0148+00 1/1 0/0 0/0 .text            HeadCallBack__FP8J3DJointi */
 static int HeadCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -135,7 +127,6 @@ static int HeadCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806107B4-806109AC 000334 01F8+00 1/1 0/0 0/0 .text            TailCallBack__FP8J3DJointi */
 static int TailCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -174,22 +165,16 @@ static int TailCallBack(J3DJoint* i_joint, int param_1) {
 
 static u8 data_8061B4FD;
 
-/* 8061B500-8061B504 000048 0004+00 0/2 0/0 0/0 .bss             moveSW */
 static BOOL moveSW;
 
-/* 8061B504-8061B508 00004C 0004+00 1/4 0/0 0/0 .bss             moveSW2 */
 static BOOL moveSW2;
 
-/* 8061B514-8061B534 00005C 0020+00 4/7 0/0 0/0 .bss             l_HIO */
 static daB_OB_HIO_c l_HIO;
 
-/* 8061B534-8061B538 00007C 0004+00 3/4 0/0 0/0 .bss             pno */
 static int pno;
 
-/* 8061B538-8061B53C 000080 0004+00 1/2 0/0 0/0 .bss             fin */
 static int fin;
 
-/* 806109AC-80610B3C 00052C 0190+00 1/1 0/0 0/0 .text            FinACallBack__FP8J3DJointi */
 static int FinACallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -218,7 +203,6 @@ static int FinACallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80610B3C-80610C24 0006BC 00E8+00 1/1 0/0 0/0 .text            FinBCallBack__FP8J3DJointi */
 static int FinBCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -238,7 +222,6 @@ static int FinBCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80610C24-80610D24 0007A4 0100+00 1/1 0/0 0/0 .text            FinCCallBack__FP8J3DJointi */
 static int FinCCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -259,7 +242,6 @@ static int FinCCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80610D24-80610E2C 0008A4 0108+00 1/1 0/0 0/0 .text            sui_nodeCallBack__FP8J3DJointi */
 static int sui_nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -281,7 +263,6 @@ static int sui_nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80610E2C-80610EE4 0009AC 00B8+00 1/1 0/0 0/0 .text            dark__FP12J3DModelDatas */
 static void dark(J3DModelData* i_modelData, s16 i_color) {
     if (i_color != 0) {
         for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) {
@@ -293,7 +274,6 @@ static void dark(J3DModelData* i_modelData, s16 i_color) {
     }
 }
 
-/* 80610EE4-80611408 000A64 0524+00 1/0 0/0 0/0 .text            daB_OB_Draw__FP10b_ob_class */
 static int daB_OB_Draw(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -413,7 +393,6 @@ static int daB_OB_Draw(b_ob_class* i_this) {
     return 1;
 }
 
-/* 80611444-80611824 000FC4 03E0+00 1/1 0/0 0/0 .text            core_start__FP10b_ob_class */
 static void core_start(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp28;
@@ -518,7 +497,6 @@ static void core_start(b_ob_class* i_this) {
     a_this->shape_angle.z += 0xA00;
 }
 
-/* 80611824-80611C20 0013A4 03FC+00 1/1 0/0 0/0 .text            core_hand_move__FP10b_ob_class */
 static void core_hand_move(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp38;
@@ -614,10 +592,8 @@ static void core_hand_move(b_ob_class* i_this) {
     a_this->shape_angle.z += 0xA00;
 }
 
-/* 8061B53C-8061B540 000084 0004+00 2/2 0/0 0/0 .bss             bf_ct */
 static int bf_ct;
 
-/* 80611C20-80611C78 0017A0 0058+00 1/1 0/0 0/0 .text            s_bf_sub__FPvPv */
 static void* s_bf_sub(void* i_this, void* i_data) {
     if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
         bf_ct++;
@@ -626,7 +602,6 @@ static void* s_bf_sub(void* i_this, void* i_data) {
     return NULL;
 }
 
-/* 80611C78-80611CC4 0017F8 004C+00 1/1 0/0 0/0 .text            s_bfdel_sub__FPvPv */
 static void* s_bfdel_sub(void* i_this, void* i_data) {
     if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_OctBg) {
         fopAcM_delete((fopAc_ac_c*)i_this);
@@ -635,7 +610,6 @@ static void* s_bfdel_sub(void* i_this, void* i_data) {
     return NULL;
 }
 
-/* 80611CC4-80611D10 001844 004C+00 1/1 0/0 0/0 .text            s_kaisoudel_sub__FPvPv */
 static void* s_kaisoudel_sub(void* i_this, void* i_data) {
     if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_Obj_Kaisou) {
         fopAcM_delete((fopAc_ac_c*)i_this);
@@ -644,7 +618,6 @@ static void* s_kaisoudel_sub(void* i_this, void* i_data) {
     return NULL;
 }
 
-/* 80611D10-80611EF8 001890 01E8+00 1/1 0/0 0/0 .text            bombfishset__FP10b_ob_class */
 static void bombfishset(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz pos;
@@ -693,7 +666,6 @@ static void bombfishset(b_ob_class* i_this) {
     }
 }
 
-/* 80611F34-80611FAC 001AB4 0078+00 1/1 0/0 0/0 .text            core_hook__FP10b_ob_class */
 static void core_hook(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     i_this->mHitIFrameTimer = 20;
@@ -716,7 +688,6 @@ static void core_hook(b_ob_class* i_this) {
     a_this->shape_angle.z += 0xA00;
 }
 
-/* 80611FAC-80612484 001B2C 04D8+00 1/1 0/0 0/0 .text            core_chance__FP10b_ob_class */
 static int core_chance(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp68;
@@ -812,7 +783,6 @@ static int core_chance(b_ob_class* i_this) {
     return var_r30;
 }
 
-/* 80612484-8061285C 002004 03D8+00 1/1 0/0 0/0 .text            core_end__FP10b_ob_class */
 static void core_end(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int frame = i_this->mBodyParts[0].mpMorf->getFrame();
@@ -900,7 +870,6 @@ static void core_end(b_ob_class* i_this) {
     }
 }
 
-/* 8061285C-80612CC8 0023DC 046C+00 1/1 0/0 0/0 .text            core_action__FP10b_ob_class */
 static void core_action(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1005,8 +974,6 @@ static void core_action(b_ob_class* i_this) {
     }
 }
 
-/* 80612CC8-80612ED4 002848 020C+00 1/1 0/0 0/0 .text            core_damage_check__FP10b_ob_class
- */
 static void core_damage_check(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1046,8 +1013,6 @@ static void core_damage_check(b_ob_class* i_this) {
     }
 }
 
-/* 80612ED4-806131A8 002A54 02D4+00 1/1 0/0 0/0 .text            fish_damage_check__FP10b_ob_class
- */
 static void fish_damage_check(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1123,7 +1088,6 @@ static void fish_damage_check(b_ob_class* i_this) {
     }
 }
 
-/* 806131A8-80613270 002D28 00C8+00 2/2 0/0 0/0 .text            pl_check__FP10b_ob_classfs */
 static BOOL pl_check(b_ob_class* i_this, f32 i_range, s16 i_maxAngle) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1144,7 +1108,6 @@ static BOOL pl_check(b_ob_class* i_this, f32 i_range, s16 i_maxAngle) {
     return false;
 }
 
-/* 80613270-80613E00 002DF0 0B90+00 1/1 0/0 0/0 .text            fish_normal__FP10b_ob_class */
 static int fish_normal(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1388,7 +1351,6 @@ static int fish_normal(b_ob_class* i_this) {
     return ret;
 }
 
-/* 80613E00-80614228 003980 0428+00 1/1 0/0 0/0 .text            fish_vacume__FP10b_ob_class */
 static int fish_vacume(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1466,7 +1428,6 @@ static int fish_vacume(b_ob_class* i_this) {
     return 2;
 }
 
-/* 80614228-806147D4 003DA8 05AC+00 1/1 0/0 0/0 .text            fish_end__FP10b_ob_class */
 static int fish_end(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1583,18 +1544,15 @@ static int fish_end(b_ob_class* i_this) {
     return 4;
 }
 
-/* 8061B0D0-8061B11C 00002C 004C+00 1/1 0/0 0/0 .data            buf_p */
 static f32 buf_p[] = {
     0.0f, 1.0f,  2.0f,  3.0f,  4.0f,  5.0f,  6.0f,  7.0f,  8.0f,  8.8f,
     9.6f, 10.4f, 11.2f, 12.0f, 12.6f, 13.2f, 13.8f, 14.4f, 15.0f,
 };
 
-/* 8061B11C-8061B168 000078 004C+00 1/1 0/0 0/0 .data            size_p */
 static f32 size_p[] = {1.0f, 1.05f, 1.075f, 1.1f,  1.1f,  1.075f, 1.05f,
                                     1.0f, 0.9f,  0.85f,  0.8f,  0.75f, 0.7f,   0.65f,
                                     0.6f, 0.55f, 0.5f,   0.45f, 1.0f};
 
-/* 806147D4-80614B70 004354 039C+00 1/1 0/0 0/0 .text            dmcalc__FP10b_ob_class */
 static void dmcalc(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int i;
@@ -1695,7 +1653,6 @@ static void dmcalc(b_ob_class* i_this) {
     }
 }
 
-/* 80614B70-806158E0 0046F0 0D70+00 1/1 0/0 0/0 .text            fish_move__FP10b_ob_class */
 static void fish_move(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2012,7 +1969,6 @@ static void fish_move(b_ob_class* i_this) {
     i_this->mFishBattleMode = 2;
 }
 
-/* 806158E0-806159C4 005460 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10b_ob_classf */
 static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, i_scale,
                   i_this->field_0x5cc0 * i_this->field_0x5cd0);
@@ -2029,7 +1985,6 @@ static void cam_3d_morf(b_ob_class* i_this, f32 i_scale) {
                   i_this->field_0x5cbc * i_this->field_0x5cd0);
 }
 
-/* 806159C4-80615A10 005544 004C+00 1/1 0/0 0/0 .text            s_hasidel_sub__FPvPv */
 static void* s_hasidel_sub(void* i_this, void* i_data) {
     if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_OCTHASHI) {
         fopAcM_delete((fopAc_ac_c*)i_this);
@@ -2038,7 +1993,6 @@ static void* s_hasidel_sub(void* i_this, void* i_data) {
     return NULL;
 }
 
-/* 80615A10-80618540 005590 2B30+00 2/1 0/0 0/0 .text            demo_camera__FP10b_ob_class */
 static void demo_camera(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -3046,7 +3000,6 @@ static void demo_camera(b_ob_class* i_this) {
     }
 }
 
-/* 80618650-806193B4 0081D0 0D64+00 2/1 0/0 0/0 .text            daB_OB_Execute__FP10b_ob_class */
 static int daB_OB_Execute(b_ob_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -3314,12 +3267,10 @@ static int daB_OB_Execute(b_ob_class* i_this) {
     return 1;
 }
 
-/* 806193B4-806193BC 008F34 0008+00 1/0 0/0 0/0 .text            daB_OB_IsDelete__FP10b_ob_class */
 static int daB_OB_IsDelete(b_ob_class* i_this) {
     return 1;
 }
 
-/* 806193BC-80619438 008F3C 007C+00 1/0 0/0 0/0 .text            daB_OB_Delete__FP10b_ob_class */
 static int daB_OB_Delete(b_ob_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_oh");
 
@@ -3335,7 +3286,6 @@ static int daB_OB_Delete(b_ob_class* i_this) {
     return 1;
 }
 
-/* 80619438-80619C14 008FB8 07DC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_ob_class* a_this = (b_ob_class*)i_this;
 
@@ -3525,7 +3475,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80619C5C-8061A0C0 0097DC 0464+00 1/0 0/0 0/0 .text            daB_OB_Create__FP10fopAc_ac_c */
 static int daB_OB_Create(fopAc_ac_c* i_this) {
     b_ob_class* a_this = (b_ob_class*)i_this;
     fopAcM_ct(i_this, b_ob_class);
@@ -3691,7 +3640,6 @@ static int daB_OB_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 8061B3DC-8061B3FC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_OB_Method */
 static actor_method_class l_daB_OB_Method = {
     (process_method_func)daB_OB_Create,
     (process_method_func)daB_OB_Delete,
@@ -3700,7 +3648,6 @@ static actor_method_class l_daB_OB_Method = {
     (process_method_func)daB_OB_Draw,
 };
 
-/* 8061B3FC-8061B42C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_OB */
 extern actor_process_profile_definition g_profile_B_OB = {
     fpcLy_CURRENT_e,
     4,
diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp
index 97447d08fd..53e537f80d 100644
--- a/src/d/actor/d_a_b_oh.cpp
+++ b/src/d/actor/d_a_b_oh.cpp
@@ -67,22 +67,20 @@ enum B_oh_RES_File_ID {
 
 class daB_OH_HIO_c {
 public:
-    /* 8061B72C */ daB_OH_HIO_c();
-    /* 8061D93C */ virtual ~daB_OH_HIO_c() {}
+    daB_OH_HIO_c();
+    virtual ~daB_OH_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mModelSize;
     /* 0xC */ f32 mLength;
 };
 
-/* 8061B72C-8061B75C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__12daB_OH_HIO_cFv */
 daB_OH_HIO_c::daB_OH_HIO_c() {
     field_0x4 = -1;
     mModelSize = 1.0f;
     mLength = 70.0f;
 }
 
-/* 8061B75C-8061B8B0 00011C 0154+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -104,7 +102,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8061B8B0-8061B960 000270 00B0+00 1/0 0/0 0/0 .text            daB_OH_Draw__FP10b_oh_class */
 static int daB_OH_Draw(b_oh_class* i_this) {
     if (i_this->mAction == OH_ACTION_NON) {
         return 1;
@@ -121,20 +118,15 @@ static int daB_OH_Draw(b_oh_class* i_this) {
     return 1;
 }
 
-/* 8061DBB4-8061DBB8 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 8061DBB5 0003+00 data_8061DBB5 None */
 static u8 data_8061DBB5;
 
-/* 8061DBC4-8061DBD4 000054 0010+00 2/3 0/0 0/0 .bss             l_HIO */
 static daB_OH_HIO_c l_HIO;
 
-/* 8061DBD4-8061DBD8 000064 0004+00 6/7 0/0 0/0 .bss             boss */
 static b_ob_class* boss;
 
-/* 8061DBD8-8061DBDC 000068 0004+00 0/1 0/0 0/0 .bss             Cinit */
 static int Cinit;
 
-/* 8061B960-8061BB18 000320 01B8+00 1/1 0/0 0/0 .text            start__FP10b_oh_class */
 static void start(b_oh_class* i_this) {
     cXyz sp28;
 
@@ -171,7 +163,6 @@ static void start(b_oh_class* i_this) {
     }
 }
 
-/* 8061BB54-8061BC6C 000514 0118+00 1/1 0/0 0/0 .text            wait__FP10b_oh_class */
 static void wait(b_oh_class* i_this) {
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -196,7 +187,6 @@ static void wait(b_oh_class* i_this) {
     }
 }
 
-/* 8061BC6C-8061C070 00062C 0404+00 1/1 0/0 0/0 .text            attack__FP10b_oh_class */
 static void attack(b_oh_class* i_this) {
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
     i_this->field_0xca0++;
@@ -314,7 +304,6 @@ static void attack(b_oh_class* i_this) {
     }
 }
 
-/* 8061C070-8061C1F8 000A30 0188+00 1/1 0/0 0/0 .text            caught__FP10b_oh_class */
 static void caught(b_oh_class* i_this) {
     i_this->field_0x5f4 = 6;
 
@@ -352,7 +341,6 @@ static void caught(b_oh_class* i_this) {
     }
 }
 
-/* 8061C1F8-8061C298 000BB8 00A0+00 1/1 0/0 0/0 .text            end__FP10b_oh_class */
 static void end(b_oh_class* i_this) {
     i_this->field_0x5f4 = 6;
 
@@ -371,7 +359,6 @@ static void end(b_oh_class* i_this) {
     }
 }
 
-/* 8061C298-8061C2C4 000C58 002C+00 1/1 0/0 0/0 .text            non__FP10b_oh_class */
 static void non(b_oh_class* i_this) {
     i_this->field_0x5f4 = 6;
 
@@ -384,7 +371,6 @@ static void non(b_oh_class* i_this) {
     }
 }
 
-/* 8061C2C4-8061CB4C 000C84 0888+00 2/1 0/0 0/0 .text            action__FP10b_oh_class */
 static void action(b_oh_class* i_this) {
     b_oh_class* a_this = (b_oh_class*)i_this;
     int var_r28;
@@ -578,7 +564,6 @@ static void action(b_oh_class* i_this) {
     Cinit = 0;
 }
 
-/* 8061CB4C-8061CD98 00150C 024C+00 1/1 0/0 0/0 .text            damage_check__FP10b_oh_class */
 static void damage_check(b_oh_class* i_this) {
     i_this->mCcStts.Move();
 
@@ -630,7 +615,6 @@ static void damage_check(b_oh_class* i_this) {
     }
 }
 
-/* 8061CD98-8061D05C 001758 02C4+00 2/1 0/0 0/0 .text            daB_OH_Execute__FP10b_oh_class */
 static int daB_OH_Execute(b_oh_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -706,12 +690,10 @@ static int daB_OH_Execute(b_oh_class* i_this) {
     return 1;
 }
 
-/* 8061D05C-8061D064 001A1C 0008+00 1/0 0/0 0/0 .text            daB_OH_IsDelete__FP10b_oh_class */
 static int daB_OH_IsDelete(b_oh_class* i_this) {
     return 1;
 }
 
-/* 8061D064-8061D0B8 001A24 0054+00 1/0 0/0 0/0 .text            daB_OH_Delete__FP10b_oh_class */
 static int daB_OH_Delete(b_oh_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_oh");
     if (i_this->field_0x1f86) {
@@ -721,7 +703,6 @@ static int daB_OH_Delete(b_oh_class* i_this) {
     return 1;
 }
 
-/* 8061D0B8-8061D39C 001A78 02E4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_oh_class* this_ = (b_oh_class*)i_this;
 
@@ -771,7 +752,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8061D3E4-8061D718 001DA4 0334+00 1/0 0/0 0/0 .text            daB_OH_Create__FP10fopAc_ac_c */
 static int daB_OH_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, b_oh_class);
     b_oh_class* this_ = (b_oh_class*)i_this;
@@ -843,7 +823,6 @@ static int daB_OH_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 8061DAEC-8061DB0C -00001 0020+00 1/0 0/0 0/0 .data            l_daB_OH_Method */
 static actor_method_class l_daB_OH_Method = {
     (process_method_func)daB_OH_Create,
     (process_method_func)daB_OH_Delete,
@@ -852,7 +831,6 @@ static actor_method_class l_daB_OH_Method = {
     (process_method_func)daB_OH_Draw,
 };
 
-/* 8061DB0C-8061DB3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_OH */
 extern actor_process_profile_definition g_profile_B_OH = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp
index 7c774d9b41..22e049f97c 100644
--- a/src/d/actor/d_a_b_oh2.cpp
+++ b/src/d/actor/d_a_b_oh2.cpp
@@ -13,7 +13,6 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -35,7 +34,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8061DDB0-8061DE4C 000170 009C+00 1/0 0/0 0/0 .text            daB_OH2_Draw__FP11b_oh2_class */
 static int daB_OH2_Draw(b_oh2_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
 
@@ -49,11 +47,9 @@ static int daB_OH2_Draw(b_oh2_class* i_this) {
     return 1;
 }
 
-/* 8061EAE8-8061EAEC 000000 0004+00 3/3 0/0 0/0 .bss             boss */
 // pointer to main morpheel boss actor
 static b_ob_class* boss;
 
-/* 8061DE4C-8061E19C 00020C 0350+00 1/1 0/0 0/0 .text            dmcalc__FP11b_oh2_class */
 static void dmcalc(b_oh2_class* i_this) {
     cXyz sp20;
     cXyz sp14;
@@ -133,7 +129,6 @@ static void dmcalc(b_oh2_class* i_this) {
     }
 }
 
-/* 8061E1D8-8061E410 000598 0238+00 1/1 0/0 0/0 .text            action__FP11b_oh2_class */
 static void action(b_oh2_class* i_this) {
     cXyz local_20;
     cXyz vstack_2C;
@@ -176,7 +171,6 @@ static void action(b_oh2_class* i_this) {
     i_this->mpMorf->modelCalc();
 }
 
-/* 8061E410-8061E4E8 0007D0 00D8+00 2/1 0/0 0/0 .text            daB_OH2_Execute__FP11b_oh2_class */
 static int daB_OH2_Execute(b_oh2_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -206,13 +200,10 @@ static int daB_OH2_Execute(b_oh2_class* i_this) {
     return 1;
 }
 
-/* 8061E4E8-8061E4F0 0008A8 0008+00 1/0 0/0 0/0 .text            daB_OH2_IsDelete__FP11b_oh2_class
- */
 static int daB_OH2_IsDelete(b_oh2_class* i_this) {
     return 1;
 }
 
-/* 8061E4F0-8061E540 0008B0 0050+00 1/0 0/0 0/0 .text            daB_OH2_Delete__FP11b_oh2_class */
 static int daB_OH2_Delete(b_oh2_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "B_oh");
     if (i_this->heap != NULL) {
@@ -222,7 +213,6 @@ static int daB_OH2_Delete(b_oh2_class* i_this) {
     return 1;
 }
 
-/* 8061E540-8061E820 000900 02E0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     b_oh2_class* _this = static_cast<b_oh2_class*>(i_this);
 
@@ -274,7 +264,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8061E868-8061E9EC 000C28 0184+00 1/0 0/0 0/0 .text            daB_OH2_Create__FP10fopAc_ac_c */
 static int daB_OH2_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, b_oh2_class);
     b_oh2_class* _this = static_cast<b_oh2_class*>(i_this);
@@ -304,14 +293,12 @@ static int daB_OH2_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 8061EA8C-8061EAAC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_OH2_Method */
 static actor_method_class l_daB_OH2_Method = {
     (process_method_func)daB_OH2_Create,  (process_method_func)daB_OH2_Delete,
     (process_method_func)daB_OH2_Execute, (process_method_func)daB_OH2_IsDelete,
     (process_method_func)daB_OH2_Draw,
 };
 
-/* 8061EAAC-8061EADC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_OH2 */
 extern actor_process_profile_definition g_profile_B_OH2 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp
index c85d5608ae..0a82df0be1 100644
--- a/src/d/actor/d_a_b_tn.cpp
+++ b/src/d/actor/d_a_b_tn.cpp
@@ -16,8 +16,8 @@
 
 class daB_TN_HIO_c {
 public:
-    /* 8061EBEC */ daB_TN_HIO_c();
-    /* 8062D98C */ virtual ~daB_TN_HIO_c() {};
+    daB_TN_HIO_c();
+    virtual ~daB_TN_HIO_c() {};
 
     /* 0x04 */ s8 mUnk1;
     /* 0x08 */ f32 mScale;
@@ -136,8 +136,6 @@ enum B_TN_JOINT {
 
 };
 
-/* 8062E93C-8062E97C 000038 0040+00 0/1 0/0 0/0 .data            cc_tt_src__22@unnamed@d_a_b_tn_cpp@
- */
 namespace {
 static dCcD_SrcSph cc_tt_src = {
     {
@@ -152,7 +150,6 @@ static dCcD_SrcSph cc_tt_src = {
     }},
 };
 
-/* 8062E97C-8062E9BC 000078 0040+00 0/1 0/0 0/0 .data cc_tt_src2__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcSph cc_tt_src2 = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 0}, {0x00FBFDED, 0x43}, 0x0}},
@@ -166,7 +163,6 @@ static dCcD_SrcSph cc_tt_src2 = {
     }},
 };
 
-/* 8062E9BC-8062E9FC 0000B8 0040+00 0/1 0/0 0/0 .data cc_bomb_src__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcSph cc_bomb_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 0}, {0x00000000, 0x00}, 0x145}},
@@ -180,7 +176,6 @@ static dCcD_SrcSph cc_bomb_src = {
     }},
 };
 
-/* 8062E9FC-8062EA3C 0000F8 0040+00 0/1 0/0 0/0 .data cc_tt_at_src__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcSph cc_tt_at_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 0x5}, {0xD8FBFDFF, 0x00}, 0x15}},
@@ -194,7 +189,6 @@ static dCcD_SrcSph cc_tt_at_src = {
     }},
 };
 
-/* 8062EA3C-8062EA88 000138 004C+00 0/1 0/0 0/0 .data cc_tt_at_cps_src__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcCps cc_tt_at_cps_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 5}, {0xD8FBFDFF, 0x00}, 0x75}},
@@ -209,7 +203,6 @@ static dCcD_SrcCps cc_tt_at_cps_src = {
     }},
 };
 
-/* 8062EA88-8062EAC8 000184 0040+00 0/1 0/0 0/0 .data cc_tt_tate_src__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcSph cc_tt_tate_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 4}, {0xD8FBFDFF, 0x43}, 0x75}},
@@ -223,7 +216,6 @@ static dCcD_SrcSph cc_tt_tate_src = {
     }},
 };
 
-/* 8062EAC8-8062EB08 0001C4 0040+00 0/1 0/0 0/0 .data cc_part_src__22@unnamed@d_a_b_tn_cpp@ */
 static dCcD_SrcSph cc_part_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 0, 0}, {0x00000002, 0x00}, 0x75}},
@@ -237,17 +229,14 @@ static dCcD_SrcSph cc_part_src = {
     }},
 };
 
-/* 8062EB08-8062EB18 000204 0010+00 0/1 0/0 0/0 .data tn_model_brk_idx__22@unnamed@d_a_b_tn_cpp@ */
 static s8 tn_model_brk_idx[16] = {
     0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 1, 1, 2, -1, -1, -1,
 };
 
-/* 8062EB18-8062EB28 000214 0010+00 0/1 0/0 0/0 .data tn_model_brk_idx2__22@unnamed@d_a_b_tn_cpp@ */
 static s8 tn_model_brk_idx2[16] = {
     0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 2, -1, -1, -1,
 };
 
-/* 8062EB28-8062EBA8 000224 0080+00 0/1 0/0 0/0 .data tn_part_model_id__22@unnamed@d_a_b_tn_cpp@ */
 static int tn_part_model_id[32] = {
     /* TN */
     BMDR_TN_ARMOR_ARM_L, BMDR_TN_ARMOR_ARM_R, BMDR_TN_ARMOR_CHEST_B, BMDR_TN_ARMOR_CHEST_F, 
@@ -262,17 +251,14 @@ static int tn_part_model_id[32] = {
     BMDR_TN2_SHIELD, BMDR_TN2_MACE, BMDR_TN2_SWORD_B_SAYA, BMDR_TN2_SWORD_B,
 };
 
-/* 8062EBA8-8062EBE8 0002A4 0040+00 2/2 0/0 0/0 .data tn_part_joint__22@unnamed@d_a_b_tn_cpp@ */
 static int tn_part_joint[16] = {8, 14, 3, 3, 5, 5, 11, 17, 26, 25, 27, 28, 9, 27, 27, 27};
 
-/* 8062EBE8-8062EC28 0002E4 0040+00 1/2 0/0 0/0 .data ground_y_part__22@unnamed@d_a_b_tn_cpp@ */
 static f32 ground_y_part[16] = {
     15.0f, 15.0f, 0.0f, 0.0f, 23.0f, 12.0f, 25.0f, 25.0f,
     -5.0f, 5.0f,  8.0f, 5.0f, 12.0f, 7.0f,  0.0f,  0.0f,
 };
 }  // namespace
 
-/* 8061EBEC-8061EC58 0000EC 006C+00 1/1 0/0 0/0 .text            __ct__12daB_TN_HIO_cFv */
 daB_TN_HIO_c::daB_TN_HIO_c() {
     mUnk1 = -1;
     mScale = 1.3f;
@@ -287,7 +273,6 @@ daB_TN_HIO_c::daB_TN_HIO_c() {
     mTimer1Action2 = 0.0f;
 }
 
-/* 8061EC58-8061ED10 000158 00B8+00 1/1 0/0 0/0 .text ctrlJoint__8daB_TN_cFP8J3DJointP8J3DModel */
 int daB_TN_c::ctrlJoint(J3DJoint* i_joint, J3DModel* model) {
     int mJntNo = i_joint->getJntNo();
     mDoMtx_stack_c::copy(model->getAnmMtx(mJntNo));
@@ -303,7 +288,6 @@ int daB_TN_c::ctrlJoint(J3DJoint* i_joint, J3DModel* model) {
     return 1;
 }
 
-/* 8061ED10-8061ED5C 000210 004C+00 1/1 0/0 0/0 .text JointCallBack__8daB_TN_cFP8J3DJointi */
 int daB_TN_c::JointCallBack(J3DJoint* i_joint, int i_data) {
     if (i_data == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -316,7 +300,6 @@ int daB_TN_c::JointCallBack(J3DJoint* i_joint, int i_data) {
     return 1;
 }
 
-/* 8061ED5C-8061EE14 00025C 00B8+00 1/1 0/0 0/0 .text            calcNeckAngle__8daB_TN_cFv */
 void daB_TN_c::calcNeckAngle() {
     csXyz acStack_18;
     s16 sVar1 = 0;
@@ -338,7 +321,6 @@ void daB_TN_c::calcNeckAngle() {
     cLib_addCalcAngleS2(&mNeckAngle, sVar1, 4, 0x1000);
 }
 
-/* 8061EE14-8061EEC8 000314 00B4+00 1/1 0/0 0/0 .text            calcWaistAngle__8daB_TN_cFv */
 void daB_TN_c::calcWaistAngle() {
     csXyz acStack_18;
     s16 sVar1 = 0;
@@ -363,10 +345,8 @@ void daB_TN_c::calcWaistAngle() {
 /* 8062F01D 0003+00 data_8062F01D None */
 static u8 s_hioinit;
 
-/* 8062F02C-8062F05C 000054 0030+00 9/11 0/0 0/0 .bss             l_HIO */
 static daB_TN_HIO_c l_HIO;
 
-/* 8061EEC8-8061F1E0 0003C8 0318+00 1/1 0/0 0/0 .text            draw__8daB_TN_cFv */
 int daB_TN_c::draw() {
     J3DModel* model = mpModelMorf2->getModel();
     if (mDisappear || mInactive) {
@@ -433,12 +413,10 @@ int daB_TN_c::draw() {
     return 1;
 }
 
-/* 8061F1E0-8061F200 0006E0 0020+00 1/0 0/0 0/0 .text            daB_TN_Draw__FP8daB_TN_c */
 static int daB_TN_Draw(daB_TN_c* i_this) {
     return i_this->draw();
 }
 
-/* 8061F200-8061F31C 000700 011C+00 3/3 0/0 0/0 .text            setBreakPart__8daB_TN_cFi */
 void daB_TN_c::setBreakPart(int i_idx) {
     static int break_part_no[13] = {
         6, 11, 8, 1, 10, 0, 9, 7, 4, 5, 12, 2, 3,
@@ -477,7 +455,6 @@ void daB_TN_c::setBreakPart(int i_idx) {
     }
 }
 
-/* 8061F31C-8061F3D0 00081C 00B4+00 1/1 0/0 0/0 .text            setBreakHeadPart__8daB_TN_cFi */
 void daB_TN_c::setBreakHeadPart(int i_idx) {
     static int break_part_no2[13] = {
         4, 5, 7, 6, 11, 8, 1, 10, 0, 9, 12, 2, 3,
@@ -515,7 +492,6 @@ void daB_TN_c::setBreakHeadPart(int i_idx) {
     }
 }
 
-/* 8061F3D0-8061F520 0008D0 0150+00 4/4 0/0 0/0 .text            setPartLandEffect__8daB_TN_cFii */
 void daB_TN_c::setPartLandEffect(int i_idx, int i_data) {
     static int break_part_vib[16] = {
         2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 3, 2, 0xFF, 2,
@@ -535,7 +511,6 @@ void daB_TN_c::setPartLandEffect(int i_idx, int i_data) {
     }
 }
 
-/* 8062F11C-8062F1DC 000144 00C0+00 1/2 0/0 0/0 .bss offset_part__22@unnamed@d_a_b_tn_cpp@ */
 namespace {
 static cXyz offset_part[16] = {
     cXyz(-20.0f, 0.0f, 0.0f), cXyz(-20.0f, 0.0f, 0.0f),   cXyz(0.0f, 0.0f, 0.0f),
@@ -547,7 +522,6 @@ static cXyz offset_part[16] = {
 };
 }  // namespace
 
-/* 8062F29C-8062F2FC 0002C4 0060+00 4/5 0/0 0/0 .bss ground_angle_part__22@unnamed@d_a_b_tn_cpp@ */
 namespace {
 static csXyz ground_angle_part[16] = {
     csXyz(0x0000, 0x0000, 0x0000),   csXyz(0x0000, 0x0000, 0x0000),   csXyz(0x0000, 0x0000, 0x0000),
@@ -559,7 +533,6 @@ static csXyz ground_angle_part[16] = {
 };
 }  // namespace
 
-/* 8061F520-8061F9F4 000A20 04D4+00 1/1 0/0 0/0 .text            calcShieldMove__8daB_TN_cFv */
 void daB_TN_c::calcShieldMove() {
     s16 sVar2;
     int iVar1;
@@ -629,7 +602,6 @@ void daB_TN_c::calcShieldMove() {
     }
 }
 
-/* 8061F9F4-8061FD7C 000EF4 0388+00 1/1 0/0 0/0 .text            calcSwordMoveA__8daB_TN_cFv */
 void daB_TN_c::calcSwordMoveA() {
     int idx = 13;
     switch (mStates[idx]) {
@@ -712,7 +684,6 @@ void daB_TN_c::calcSwordMoveA() {
     }
 }
 
-/* 8061FD7C-8061FFE0 00127C 0264+00 1/1 0/0 0/0 .text            calcSwordMoveB__8daB_TN_cFv */
 void daB_TN_c::calcSwordMoveB() {
     switch (mStates[15]) {
     case 2:
@@ -764,7 +735,6 @@ void daB_TN_c::calcSwordMoveB() {
     }
 }
 
-/* 8061FFE0-8062070C 0014E0 072C+00 2/1 0/0 0/0 .text            calcOtherPartMove__8daB_TN_cFi */
 void daB_TN_c::calcOtherPartMove(int i_idx) {
     cXyz sp7c;
     s16 sVar1;
@@ -893,7 +863,6 @@ void daB_TN_c::calcOtherPartMove(int i_idx) {
     }
 }
 
-/* 8062070C-806208C8 001C0C 01BC+00 1/1 0/0 0/0 .text            calcPartMove__8daB_TN_cFv */
 void daB_TN_c::calcPartMove() {
     for (int i = 0; i < 16; i++) {
         if (field_0xa1c[i] != 0) {
@@ -932,25 +901,21 @@ void daB_TN_c::calcPartMove() {
     }
 }
 
-/* 806208C8-8062096C 001DC8 00A4+00 18/18 0/0 0/0 .text            setBck__8daB_TN_cFiUcff */
 void daB_TN_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpModelMorf2->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_tn", i_index), i_attr, i_morf,
                          i_rate, 0.0f, -1.0f);
 }
 
-/* 8062096C-806209C8 001E6C 005C+00 3/3 0/0 0/0 .text            checkBck__8daB_TN_cFi */
 int daB_TN_c::checkBck(int i_index) {
     return mpModelMorf2->getAnm() == dComIfG_getObjectRes("B_tn", i_index);
 }
 
-/* 806209C8-806209E0 001EC8 0018+00 22/22 0/0 0/0 .text            setActionMode__8daB_TN_cFii */
 void daB_TN_c::setActionMode(int i_mode1, int i_mode2) {
     offHeadLockFlg();
     mActionMode1 = i_mode1;
     mActionMode2 = i_mode2;
 }
 
-/* 806209E0-80620AE4 001EE0 0104+00 11/11 0/0 0/0 .text            setSwordAtBit__8daB_TN_cFi */
 void daB_TN_c::setSwordAtBit(int param_1) {
     if (param_1 == 0) {
         for (int i = 0; i < 4; i++) {
@@ -979,7 +944,6 @@ void daB_TN_c::setSwordAtBit(int param_1) {
     }
 }
 
-/* 80620AE4-80620B4C 001FE4 0068+00 5/5 0/0 0/0 .text            setSwordAtBreak__8daB_TN_cFi */
 void daB_TN_c::setSwordAtBreak(int param_1) {
     if (param_1 == 0) {
         for (int i = 0; i < 4; i++) {
@@ -995,7 +959,6 @@ void daB_TN_c::setSwordAtBreak(int param_1) {
     }
 }
 
-/* 80620B4C-80620E90 00204C 0344+00 1/1 0/0 0/0 .text            setBodyShield__8daB_TN_cFv */
 void daB_TN_c::setBodyShield() {
     daPy_py_c* player;
     bool check = true;
@@ -1095,14 +1058,10 @@ void daB_TN_c::setBodyShield() {
     }
 }
 
-/* 8062F2FC-8062F300 000324 0004+00 2/3 0/0 0/0 .bss             m_attack_tn */
 static daB_TN_c* m_attack_tn;
 
-/* 8062F300-8062F304 000328 0004+00 1/2 0/0 0/0 .bss             m_attack_timer */
 static int m_attack_timer;
 
-/* 80620E90-80620FA0 002390 0110+00 4/4 0/0 0/0 .text            checkNormalAttackAble__8daB_TN_cFv
- */
 bool daB_TN_c::checkNormalAttackAble() {
     if (mType == 1) {
         if (daPy_getPlayerActorClass()->getCutCount() != 0) {
@@ -1126,7 +1085,6 @@ bool daB_TN_c::checkNormalAttackAble() {
     return 1;
 }
 
-/* 80620FA0-80621070 0024A0 00D0+00 4/3 0/0 0/0 .text            getCutType__8daB_TN_cFv */
 u32 daB_TN_c::getCutType() {
     u32 rv = 0;
 
@@ -1183,7 +1141,6 @@ u32 daB_TN_c::getCutType() {
     }
 }
 
-/* 80621070-8062138C 002570 031C+00 1/1 0/0 0/0 .text            setDamage__8daB_TN_cFP8dCcD_Sphi */
 void daB_TN_c::setDamage(dCcD_Sph* i_sph, int param_2) {
     u8 uVar5;
 
@@ -1265,13 +1222,11 @@ void daB_TN_c::setDamage(dCcD_Sph* i_sph, int param_2) {
     }
 }
 
-/* 8062138C-806213FC 00288C 0070+00 1/1 0/0 0/0 .text setShieldEffect__8daB_TN_cFP8dCcD_Sph */
 void daB_TN_c::setShieldEffect(dCcD_Sph* i_sph) {
     def_se_set(&mSound, mAtInfo.mpCollider, 42, this);
     dComIfGp_setHitMark(2, this, i_sph->GetTgHitPosP(), NULL, NULL, 0);
 }
 
-/* 806213FC-806223A0 0028FC 0FA4+00 1/1 0/0 0/0 .text            damage_check__8daB_TN_cFv */
 void daB_TN_c::damage_check() {
     mStts1.Move();
 
@@ -1572,7 +1527,6 @@ void daB_TN_c::damage_check() {
     }
 }
 
-/* 806227D0-80622B60 003CD0 0390+00 4/4 0/0 0/0 .text            checkMoveArea__8daB_TN_cFv */
 int daB_TN_c::checkMoveArea() {
     if (mType != 0) {
         return 0;
@@ -1593,13 +1547,11 @@ int daB_TN_c::checkMoveArea() {
     return 0;
 }
 
-/* 80622B60-80622BE0 004060 0080+00 1/1 0/0 0/0 .text            checkMoveAngle__8daB_TN_cFv */
 bool daB_TN_c::checkMoveAngle() {
     s16 sVar1 = cM_atan2s(-current.pos.x, -current.pos.z);
     return abs((s16)(fopAcM_searchPlayerAngleY(this) - sVar1)) < 0x4000;
 }
 
-/* 80622BE0-80622CE4 0040E0 0104+00 1/1 0/0 0/0 .text            setAttackBlurEffect__8daB_TN_cFi */
 void daB_TN_c::setAttackBlurEffect(int i_data) {
     static u16 blur_effect_id_5997[4] = {
         0x87DA,
@@ -1621,7 +1573,6 @@ void daB_TN_c::setAttackBlurEffect(int i_data) {
     }
 }
 
-/* 80622CE4-80622DF4 0041E4 0110+00 1/1 0/0 0/0 .text            setArmorBreakEffect__8daB_TN_cFi */
 void daB_TN_c::setArmorBreakEffect(int i_idx) {
     static u16 blur_effect_id_6035[3] = {0x87DE, 0x87DF, 0x87E0};
 
@@ -1635,7 +1586,6 @@ void daB_TN_c::setArmorBreakEffect(int i_idx) {
     }
 }
 
-/* 80622DF4-80622ec8 0042F4 0170+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) &&
@@ -1680,7 +1630,6 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80622ec8-8062318C 004464 0228+00 1/1 0/0 0/0 .text            demo_skip__8daB_TN_cFi */
 void daB_TN_c::demo_skip(int param_1) {
     camera_class* cameraClass = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1715,7 +1664,6 @@ void daB_TN_c::demo_skip(int param_1) {
     }
 }
 
-/* 8062318C-806231C0 00468C 0034+00 2/2 0/0 0/0 .text            DemoSkipCallBack__8daB_TN_cFPvi */
 int daB_TN_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this) {
         ((daB_TN_c*)i_this)->demo_skip(param_1);
@@ -1725,7 +1673,6 @@ int daB_TN_c::DemoSkipCallBack(void* i_this, int param_1) {
     return 0;
 }
 
-/* 806231C0-80623920 0046C0 0760+00 2/1 0/0 0/0 .text            executeRoomDemo__8daB_TN_cFv */
 void daB_TN_c::executeRoomDemo() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1875,7 +1822,6 @@ void daB_TN_c::executeRoomDemo() {
     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
 }
 
-/* 80623920-806246E8 004E20 0DC8+00 2/1 0/0 0/0 .text            executeOpening__8daB_TN_cFv */
 void daB_TN_c::executeOpening() {
     cXyz sp7c, sp34;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2073,7 +2019,6 @@ void daB_TN_c::executeOpening() {
     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
 }
 
-/* 806246E8-806247D8 005BE8 00F0+00 1/1 0/0 0/0 .text            executeWaitH__8daB_TN_cFv */
 void daB_TN_c::executeWaitH() {
     fopAcM_searchPlayerAngleY(this);
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
@@ -2096,7 +2041,6 @@ void daB_TN_c::executeWaitH() {
     }
 }
 
-/* 806247D8-80624890 005CD8 00B8+00 1/1 0/0 0/0 .text            setAwaitSound__8daB_TN_cFv */
 void daB_TN_c::setAwaitSound() {
     if (mpModelMorf2->checkFrame(17.0f)) {
         mSound.startCreatureSound(Z2SE_EN_TN_FOOT_M1, 0, -1);
@@ -2107,7 +2051,6 @@ void daB_TN_c::setAwaitSound() {
     }
 }
 
-/* 80624890-80625394 005D90 0B04+00 1/1 0/0 0/0 .text            executeChaseH__8daB_TN_cFv */
 void daB_TN_c::executeChaseH() {
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
     s16 sVar4 = fopAcM_searchPlayerAngleY(this);
@@ -2417,7 +2360,6 @@ void daB_TN_c::executeChaseH() {
     }
 }
 
-/* 80625394-806255F0 006894 025C+00 1/1 0/0 0/0 .text            checkStartAttackH__8daB_TN_cFv */
 void daB_TN_c::checkStartAttackH() {
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
     fopAcM_searchPlayerAngleY(this);
@@ -2468,7 +2410,6 @@ void daB_TN_c::checkStartAttackH() {
     }
 }
 
-/* 806255F0-80625C74 006AF0 0684+00 1/1 0/0 0/0 .text            executeAttackH__8daB_TN_cFv */
 void daB_TN_c::executeAttackH() {
     f32 frame;
     s16 playerAngleY = fopAcM_searchPlayerAngleY(this);
@@ -2584,8 +2525,6 @@ void daB_TN_c::executeAttackH() {
     }
 }
 
-/* 80625C74-80625E40 007174 01CC+00 1/1 0/0 0/0 .text            executeAttackShieldH__8daB_TN_cFv
- */
 void daB_TN_c::executeAttackShieldH() {
     switch (mActionMode2) {
     case ACTION2_0_e:
@@ -2621,7 +2560,6 @@ void daB_TN_c::executeAttackShieldH() {
     }
 }
 
-/* 80625E40-80626034 007340 01F4+00 1/1 0/0 0/0 .text            executeGuardH__8daB_TN_cFv */
 void daB_TN_c::executeGuardH() {
     cXyz sp18;
     switch (mActionMode2) {
@@ -2664,7 +2602,6 @@ void daB_TN_c::executeGuardH() {
     }
 }
 
-/* 80626034-80626320 007534 02EC+00 1/1 0/0 0/0 .text            executeDamageH__8daB_TN_cFv */
 void daB_TN_c::executeDamageH() {
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2738,7 +2675,6 @@ void daB_TN_c::executeDamageH() {
     }
 }
 
-/* 80626320-80627100 007820 0DE0+00 1/1 0/0 0/0 .text            executeChangeDemo__8daB_TN_cFv */
 void daB_TN_c::executeChangeDemo() {
     cXyz sp28, sp34, sp40;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2992,8 +2928,6 @@ void daB_TN_c::executeChangeDemo() {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80627100-80627790 008600 0690+00 1/1 0/0 0/0 .text            executeZakoChangeDemo__8daB_TN_cFv
- */
 void daB_TN_c::executeZakoChangeDemo() {
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
 
@@ -3117,7 +3051,6 @@ void daB_TN_c::executeZakoChangeDemo() {
     }
 }
 
-/* 80627790-8062799C 008C90 020C+00 1/1 0/0 0/0 .text            setWalkDir__8daB_TN_cFv */
 void daB_TN_c::setWalkDir() {
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
 
@@ -3174,7 +3107,6 @@ void daB_TN_c::setWalkDir() {
     }
 }
 
-/* 8062799C-80627CBC 008E9C 0320+00 6/5 0/0 0/0 .text            initChaseL__8daB_TN_cFi */
 void daB_TN_c::initChaseL(int param_1) {
     mActionMode2 = param_1;
     speedF = 0.0f;
@@ -3260,7 +3192,6 @@ void daB_TN_c::initChaseL(int param_1) {
     }
 }
 
-/* 80627CBC-80627D3C 0091BC 0080+00 4/4 0/0 0/0 .text            checkAttackAble__8daB_TN_cFv */
 bool daB_TN_c::checkAttackAble() {
     if (fopAcM_searchPlayerDistance(this) < 500.0f &&
         abs((s16)(fopAcM_searchPlayerAngleY(this) - shape_angle.y)) < 0x3000)
@@ -3271,7 +3202,6 @@ bool daB_TN_c::checkAttackAble() {
     return false;
 }
 
-/* 80627D3C-8062868C 00923C 0950+00 1/1 0/0 0/0 .text            checkNextMove__8daB_TN_cFv */
 bool daB_TN_c::checkNextMove() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
@@ -3437,7 +3367,6 @@ bool daB_TN_c::checkNextMove() {
     return 0;
 }
 
-/* 8062868C-806292F8 009B8C 0C6C+00 2/1 0/0 0/0 .text            executeChaseL__8daB_TN_cFv */
 void daB_TN_c::executeChaseL() {
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
@@ -3725,7 +3654,6 @@ void daB_TN_c::executeChaseL() {
     }
 }
 
-/* 806292F8-80629D20 00A7F8 0A28+00 1/1 0/0 0/0 .text            executeAttackL__8daB_TN_cFv */
 void daB_TN_c::executeAttackL() {
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
     f32 mPlayerDistance = fopAcM_searchPlayerDistance(this);
@@ -3946,8 +3874,6 @@ void daB_TN_c::executeAttackL() {
     }
 }
 
-/* 80629D20-80629FB0 00B220 0290+00 1/1 0/0 0/0 .text            executeAttackShieldL__8daB_TN_cFv
- */
 void daB_TN_c::executeAttackShieldL() {
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
     fopAcM_searchPlayerDistance(this);
@@ -4001,7 +3927,6 @@ void daB_TN_c::executeAttackShieldL() {
     }
 }
 
-/* 80629FB0-8062A3D0 00B4B0 0420+00 1/1 0/0 0/0 .text            executeGuardL__8daB_TN_cFv */
 void daB_TN_c::executeGuardL() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this) - shape_angle.y;
@@ -4114,7 +4039,6 @@ void daB_TN_c::executeGuardL() {
     }
 }
 
-/* 8062A3D0-8062A71C 00B8D0 034C+00 1/1 0/0 0/0 .text            executeDamageL__8daB_TN_cFv */
 void daB_TN_c::executeDamageL() {
     s16 mPlayerAngleY = fopAcM_searchPlayerAngleY(this);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -4196,7 +4120,6 @@ void daB_TN_c::executeDamageL() {
     }
 }
 
-/* 8062A71C-8062A950 00BC1C 0234+00 1/1 0/0 0/0 .text            executeYoroke__8daB_TN_cFv */
 void daB_TN_c::executeYoroke() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -4253,7 +4176,6 @@ void daB_TN_c::executeYoroke() {
     }
 }
 
-/* 8062A950-8062B344 00BE50 09F4+00 1/1 0/0 0/0 .text            executeEnding__8daB_TN_cFv */
 void daB_TN_c::executeEnding() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -4434,7 +4356,6 @@ void daB_TN_c::executeEnding() {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 8062B344-8062B6A8 00C844 0364+00 1/1 0/0 0/0 .text            executeZakoEnding__8daB_TN_cFv */
 void daB_TN_c::executeZakoEnding() {
     cXyz sp20;
 
@@ -4509,7 +4430,6 @@ void daB_TN_c::executeZakoEnding() {
     }
 }
 
-/* 8062B6A8-8062BA5C 00CBA8 03B4+00 2/1 0/0 0/0 .text            action__8daB_TN_cFv */
 void daB_TN_c::action() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -4660,7 +4580,6 @@ void daB_TN_c::action() {
     mpModelMorf1->play(iVar2 + 10, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 8062BA5C-8062BDCC 00CF5C 0370+00 1/1 0/0 0/0 .text            mtx_set__8daB_TN_cFv */
 void daB_TN_c::mtx_set() {
     J3DModel* model2;
 
@@ -4736,7 +4655,6 @@ void daB_TN_c::mtx_set() {
     }
 }
 
-/* 8062BDCC-8062C5B4 00D2CC 07E8+00 1/1 0/0 0/0 .text            cc_set__8daB_TN_cFv */
 void daB_TN_c::cc_set() {
     cXyz sp38;
 
@@ -4910,7 +4828,6 @@ void daB_TN_c::cc_set() {
     }
 }
 
-/* 8062C5B4-8062C7A0 00DAB4 01EC+00 1/1 0/0 0/0 .text            execute__8daB_TN_cFv */
 int daB_TN_c::execute() {
     if (mTimer1 != 0) {
         mTimer1--;
@@ -4984,17 +4901,14 @@ int daB_TN_c::execute() {
     return 1;
 }
 
-/* 8062C7A0-8062C7C0 00DCA0 0020+00 2/1 0/0 0/0 .text            daB_TN_Execute__FP8daB_TN_c */
 static int daB_TN_Execute(daB_TN_c* i_this) {
     i_this->execute();
 }
 
-/* 8062C7C0-8062C7C8 00DCC0 0008+00 1/0 0/0 0/0 .text            daB_TN_IsDelete__FP8daB_TN_c */
 static int daB_TN_IsDelete(daB_TN_c* i_this) {
     return 1;
 }
 
-/* 8062C7C8-8062C848 00DCC8 0080+00 1/1 0/0 0/0 .text            _delete__8daB_TN_cFv */
 int daB_TN_c::_delete() {
     dComIfG_resDelete(&mPhaseReq1, "B_tn");
     dComIfG_resDelete(&mPhaseReq2, mArcName);
@@ -5009,12 +4923,10 @@ int daB_TN_c::_delete() {
     return 1;
 }
 
-/* 8062C848-8062C868 00DD48 0020+00 1/0 0/0 0/0 .text            daB_TN_Delete__FP8daB_TN_c */
 static int daB_TN_Delete(daB_TN_c* i_this) {
     i_this->_delete();
 }
 
-/* 8062C868-8062CD10 00DD68 04A8+00 1/1 0/0 0/0 .text            CreateHeap__8daB_TN_cFv */
 int daB_TN_c::CreateHeap() {
     static int tn2_brk_index[3] = {BRK_TN2_COLOR_1, BRK_TN2_COLOR_2, BRK_TN2_SHIELD};
 
@@ -5111,12 +5023,10 @@ int daB_TN_c::CreateHeap() {
     return 1;
 }
 
-/* 8062CD58-8062CD78 00E258 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     ((daB_TN_c*)actor)->CreateHeap();
 }
 
-/* 8062CD78-8062D2F0 00E278 0578+00 1/1 0/0 0/0 .text            create__8daB_TN_cFv */
 int daB_TN_c::create() {
     fopAcM_ct(this, daB_TN_c);
 
@@ -5254,19 +5164,16 @@ int daB_TN_c::create() {
     return step;
 }
 
-/* 8062D924-8062D944 00EE24 0020+00 1/0 0/0 0/0 .text            daB_TN_Create__FP8daB_TN_c */
 static int daB_TN_Create(daB_TN_c* i_this) {
     return i_this->create();
 }
 
-/* 8062EF10-8062EF30 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_TN_Method */
 static actor_method_class l_daB_TN_Method = {
     (process_method_func)daB_TN_Create,  (process_method_func)daB_TN_Delete,
     (process_method_func)daB_TN_Execute, (process_method_func)daB_TN_IsDelete,
     (process_method_func)daB_TN_Draw,
 };
 
-/* 8062EF30-8062EF60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_TN */
 extern actor_process_profile_definition g_profile_B_TN = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp
index 3b1afa94ab..c7625f788d 100644
--- a/src/d/actor/d_a_b_yo.cpp
+++ b/src/d/actor/d_a_b_yo.cpp
@@ -26,8 +26,8 @@
 
 class daB_YO_HIO_c {
 public:
-    /* 8062F46C */ daB_YO_HIO_c();
-    /* 806395E4 */ virtual ~daB_YO_HIO_c() {}
+    daB_YO_HIO_c();
+    virtual ~daB_YO_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mScale[8];
@@ -125,12 +125,10 @@ enum L5_R50_RES_FIL_ID {
 /* 80639F74 0001+00 data_80639F74 @1009 */
 static bool hioInit;
 
-/* 80639F84-80639FE0 000054 005C+00 12/13 0/0 0/0 .bss             l_HIO */
 static daB_YO_HIO_c l_HIO;
 
 namespace {
 
-/* 80639A80-80639AC4 000020 0044+00 0/1 0/0 0/0 .data            cc_yo_src__22@unnamed@d_a_b_yo_cpp@ */
 static dCcD_SrcCyl cc_yo_src = {
     {
         {0x0, {{0x100000, 0x4, 0xD}, {0x0, 0x0}, 0x75}}, // mObj
@@ -145,7 +143,6 @@ static dCcD_SrcCyl cc_yo_src = {
     } // mCyl
 };
 
-/* 80639AC4-80639B04 000064 0040+00 0/1 0/0 0/0 .data cc_yo_tg_src__22@unnamed@d_a_b_yo_cpp@ */
 static dCcD_SrcSph cc_yo_tg_src = {
     {
         {0x0, {{0x100, 0x4, 0x11}, {0xD8BBFDFF, 0x43}, 0x45}}, // mObj
@@ -158,7 +155,6 @@ static dCcD_SrcSph cc_yo_tg_src = {
     } // mSphAttr
 };
 
-/* 80639B04-80639B44 0000A4 0040+00 0/1 0/0 0/0 .data cc_yo_iron_src__22@unnamed@d_a_b_yo_cpp@ */
 static dCcD_SrcSph cc_yo_iron_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x400000, 0x3}, 0x0}}, // mObj
@@ -173,14 +169,12 @@ static dCcD_SrcSph cc_yo_iron_src = {
 
 }  // namespace
 
-/* 80639B44-80639B60 0000E4 001B+01 1/1 0/0 0/0 .data            yo_material_draw */
 static bool yo_material_draw[27] = {
     true, true, true, true, false, false, true, true, true,
     false, true, true, true, true, false, false, true, true,
     false, false, true, true, false, true, false, false, true,
 };
 
-/* 80639B60-80639BAC 000100 004C+00 0/1 0/0 0/0 .data            yo_demo_bck_idx */
 static int yo_demo_bck_idx[19] = {
     BCK_YKW_B_ANGRY,
     BCK_YKW_B_ANGRY_WAIT,
@@ -203,7 +197,6 @@ static int yo_demo_bck_idx[19] = {
     BCK_YKW_B_DOWN,
 };
 
-/* 80639BAC-80639BF8 00014C 004C+00 0/1 0/0 0/0 .data            yo_demo_btk_idx */
 static int yo_demo_btk_idx[19] = {
     BTK_YKW_B_ANGRY,
     0xFF,  // <none>
@@ -226,7 +219,6 @@ static int yo_demo_btk_idx[19] = {
     BTK_YKW_B_WAITA,
 };
 
-/* 80639BF8-80639C44 000198 004C+00 0/1 0/0 0/0 .data            yo_demo_btp_idx */
 static int yo_demo_btp_idx[19] = {
     BTP_YKW_B_ANGRY,
     BTP_YKW_B_FACEA,
@@ -249,7 +241,6 @@ static int yo_demo_btp_idx[19] = {
     BTP_YKW_B_FACEB,
 };
 
-/* 8062F46C-8062F51C 0000EC 00B0+00 1/1 0/0 0/0 .text            __ct__12daB_YO_HIO_cFv */
 daB_YO_HIO_c::daB_YO_HIO_c() {
     field_0x4 = -1;
     mScale[0] = 7.0f;
@@ -275,7 +266,6 @@ daB_YO_HIO_c::daB_YO_HIO_c() {
     field_0x58 = 5.0f;
 }
 
-/* 8062F51C-8062FB90 00019C 0674+00 1/1 0/0 0/0 .text            draw__8daB_YO_cFv */
 int daB_YO_c::draw() {
     cXyz pos(0.0f, 0.0f, 0.0f);
     g_env_light.settingTevStruct(0x10, &pos, &tevStr);
@@ -410,17 +400,14 @@ int daB_YO_c::draw() {
     return 1;
 }
 
-/* 8062FBCC-8062FBEC 00084C 0020+00 1/0 0/0 0/0 .text            daB_YO_Draw__FP8daB_YO_c */
 static int daB_YO_Draw(daB_YO_c* i_this) {
     return i_this->draw();
 }
 
-/* 8062FBEC-8062FC08 00086C 001C+00 0/0 0/0 4/4 .text            onIceBreak__8daB_YO_cFUs */
 void daB_YO_c::onIceBreak(u16 param_0) {
     mIceBreak |= (1 << param_0);
 }
 
-/* 8062FC08-8062FE0C 000888 0204+00 4/4 0/0 0/0 .text            setBck__8daB_YO_cFiUcff */
 void daB_YO_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("B_YO", yo_demo_bck_idx[i_anm]);
     mpYetaMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f);
@@ -455,13 +442,11 @@ void daB_YO_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpYetaBrkAnm->init(model_data, brk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1);
 }
 
-/* 8062FE0C-8062FE18 000A8C 000C+00 11/11 0/0 0/0 .text            setActionMode__8daB_YO_cFii */
 void daB_YO_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* 8062FE18-806300F4 000A98 02DC+00 1/1 0/0 0/0 .text            damage_check__8daB_YO_cFv */
 void daB_YO_c::damage_check() {
     mCcStts.Move();
     mCcIronStts.Move();
@@ -543,7 +528,6 @@ void daB_YO_c::damage_check() {
     }
 }
 
-/* 806300F4-8063022C 000D74 0138+00 1/1 0/0 0/0 .text            setBreakFrizad__8daB_YO_cFv */
 void daB_YO_c::setBreakFrizad() {
     cXyz pos;
     csXyz angle;
@@ -556,7 +540,6 @@ void daB_YO_c::setBreakFrizad() {
     }
 }
 
-/* 8063022C-806302B4 000EAC 0088+00 6/6 0/0 0/0 .text            setIcicleOperate__8daB_YO_cFi */
 void daB_YO_c::setIcicleOperate(int i_operate) {
     for (int i = 0; i < 10; i++) {
         if (mIcicleID[i] != -1) {
@@ -571,7 +554,6 @@ void daB_YO_c::setIcicleOperate(int i_operate) {
     }
 }
 
-/* 806302B4-80630330 000F34 007C+00 2/2 0/0 0/0 .text            setIcicleSubNumber__8daB_YO_cFv */
 void daB_YO_c::setIcicleSubNumber() {
     int sub_number = 0;
     for (int i = 0; i < 10; i++) {
@@ -586,8 +568,6 @@ void daB_YO_c::setIcicleSubNumber() {
     }
 }
 
-/* 80630330-8063040C 000FB0 00DC+00 1/1 0/0 0/0 .text            setWindowBreakEffect__8daB_YO_cFi
- */
 void daB_YO_c::setWindowBreakEffect(int param_0) {
     static s16 yo_window_angle[6] = {0xC000, 0xE000, 0x6000, 0x2000, 0x4000, 0x0000};
     static u16 madoware_effect_id[4] = {0x87C1, 0x87C2, 0x87C3, 0x87C4};
@@ -598,7 +578,6 @@ void daB_YO_c::setWindowBreakEffect(int param_0) {
     }
 }
 
-/* 8063040C-806305B8 00108C 01AC+00 1/1 0/0 0/0 .text            setHensinEffect__8daB_YO_cFv */
 void daB_YO_c::setHensinEffect() {
     static u16 hensin_effect_id[4] = {0x87B1, 0x87B2, 0x87B3, 0x87B4};
     cXyz scale(mHensinScale, mHensinScale, mHensinScale);
@@ -620,7 +599,6 @@ void daB_YO_c::setHensinEffect() {
     }
 }
 
-/* 806305B8-806306F0 001238 0138+00 2/2 0/0 0/0 .text            setLandingEffect__8daB_YO_cFf */
 void daB_YO_c::setLandingEffect(f32 i_scale) {
     static u16 l_landing_effect_id[6] = {0x86DC, 0x86DD, 0x86DE, 0x86DF, 0x86E0, 0x86E1};
     cXyz pos = current.pos;
@@ -635,7 +613,6 @@ void daB_YO_c::setLandingEffect(f32 i_scale) {
     dComIfGp_particle_set(0x86E2, &pos, &tevStr, &shape_angle, NULL);
 }
 
-/* 806306F0-8063089C 001370 01AC+00 4/4 0/0 0/0 .text            setBreakIceEffect__8daB_YO_cFv */
 void daB_YO_c::setBreakIceEffect() {
     static u16 break_ice_effect_id[12] = {
         0x86B4, 0x86B5, 0x879C,
@@ -667,7 +644,6 @@ void daB_YO_c::setBreakIceEffect() {
     }
 }
 
-/* 8063089C-80630A9C 00151C 0200+00 3/3 0/0 0/0 .text            setWallHitEffect__8daB_YO_cFv */
 void daB_YO_c::setWallHitEffect() {
     static u16 wall_hit_effect_id[6] = {
         0x879D, 0x879E,
@@ -696,7 +672,6 @@ void daB_YO_c::setWallHitEffect() {
     }
 }
 
-/* 80630A9C-80630BF0 00171C 0154+00 3/3 0/0 0/0 .text            setChillEffect__8daB_YO_cFv */
 void daB_YO_c::setChillEffect() {
     static u16 chill_effect_id[4] = {0x86DA, 0x87A2, 0x87A6, 0x87AC};
     cXyz scale;
@@ -720,7 +695,6 @@ void daB_YO_c::setChillEffect() {
     }
 }
 
-/* 80630BF0-80630CA0 001870 00B0+00 1/1 0/0 0/0 .text            setApperEffect__8daB_YO_cFv */
 void daB_YO_c::setApperEffect() {
     cXyz pos = current.pos;
     pos.y -= 230.0f;
@@ -728,7 +702,6 @@ void daB_YO_c::setApperEffect() {
                                       NULL, 0xff, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 80630CA0-80630D6C 001920 00CC+00 1/1 0/0 0/0 .text            setApperEffect2__8daB_YO_cFv */
 void daB_YO_c::setApperEffect2() {
     static u16 apper_effect_id[2] = {0x87AE, 0x87AF};
     cXyz pos = current.pos;
@@ -738,7 +711,6 @@ void daB_YO_c::setApperEffect2() {
     }
 }
 
-/* 80630D6C-80630DD8 0019EC 006C+00 1/1 0/0 0/0 .text            s_frizad_delete__FPvPv */
 static void* s_frizad_delete(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && !fpcM_IsCreating(fopAcM_GetID(param_0))
                                 && fopAcM_GetName(param_0) == PROC_E_FZ) {
@@ -747,14 +719,12 @@ static void* s_frizad_delete(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80630DD8-80630E3C 001A58 0064+00 1/1 0/0 0/0 .text            demo_skip__8daB_YO_cFi */
 void daB_YO_c::demo_skip(int param_0) {
     cDmr_SkipInfo = 1;
     dStage_changeScene(0, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
     Z2GetAudioMgr()->subBgmStop();
 }
 
-/* 80630E3C-80630E70 001ABC 0034+00 1/1 0/0 0/0 .text            DemoSkipCallBack__8daB_YO_cFPvi */
 int daB_YO_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this != NULL) {
         static_cast<daB_YO_c*>(i_this)->demo_skip(param_1);
@@ -763,13 +733,11 @@ int daB_YO_c::DemoSkipCallBack(void* i_this, int param_1) {
     return 0;
 }
 
-/* 80630E70-80630EAC 001AF0 003C+00 1/1 0/0 0/0 .text            setYoMessage__8daB_YO_cFi */
 void daB_YO_c::setYoMessage(int i_msgIdx) {
     mMsgIdx = i_msgIdx;
     mMsgPcID = fopMsgM_messageSet(i_msgIdx, 1000);
 }
 
-/* 80630EAC-80630F28 001B2C 007C+00 1/1 0/0 0/0 .text            doYoMessage__8daB_YO_cFv */
 int daB_YO_c::doYoMessage() {
     if (mpMsg != NULL) {
         if (mpMsg->mode == 0xE) {
@@ -786,7 +754,6 @@ int daB_YO_c::doYoMessage() {
     return 0;
 }
 
-/* 80630F28-80632598 001BA8 1670+00 2/1 0/0 0/0 .text            executeOpening__8daB_YO_cFv */
 void daB_YO_c::executeOpening() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz cam_pos, player_pos, ystone_pos;
@@ -1279,10 +1246,8 @@ void daB_YO_c::executeOpening() {
     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
 }
 
-/* 80639D0C-80639D2C 0002AC 0020+00 1/1 0/0 0/0 .data            yo_max_bound_speed */
 static f32 yo_max_bound_speed[8] = {10.0f, 12.0f, 15.0f, 18.0f, 21.0f, 24.0f, 27.0f, 30.0f};
 
-/* 80632598-80632660 003218 00C8+00 1/1 0/0 0/0 .text            reflectFreeMove__8daB_YO_cFv */
 void daB_YO_c::reflectFreeMove() {
     if (cM_rnd() < 0.5f) {
         mAngleSpeed = 0x200;
@@ -1294,7 +1259,6 @@ void daB_YO_c::reflectFreeMove() {
     speedF = 8.0f;
 }
 
-/* 80632660-8063290C 0032E0 02AC+00 4/4 0/0 0/0 .text            calcFreeMove__8daB_YO_cFf */
 void daB_YO_c::calcFreeMove(f32 param_0) {
     cLib_chaseF(&speedF, param_0, 0.05f);
 
@@ -1368,7 +1332,6 @@ void daB_YO_c::calcFreeMove(f32 param_0) {
     }
 }
 
-/* 8063290C-806329CC 00358C 00C0+00 2/2 0/0 0/0 .text            setReflectAngle__8daB_YO_cFv */
 void daB_YO_c::setReflectAngle() {
     current.angle.y += (s16)cM_rndFX(4000.0f);
     s16 angle_diff = current.angle.y - mWallAngle;
@@ -1381,16 +1344,12 @@ void daB_YO_c::setReflectAngle() {
     }
 }
 
-/* 80639D2C-80639D48 0002CC 001C+00 0/1 0/0 0/0 .data            yo_damage_speed */
 static f32 yo_damage_speed[7] = {12.0f, 14.0f, 16.0f, 18.0f, 20.0f, 22.0f, 24.0f};
 
-/* 80639D48-80639D68 0002E8 0020+00 0/1 0/0 0/0 .data            yo_chase_speed */
 static f32 yo_chase_speed[8] = {3.0f, 4.0f, 5.f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f};
 
-/* 80639D68-80639D84 000308 001C+00 0/1 0/0 0/0 .data            yo_damage_timer */
 static int yo_damage_timer[7] = {90, 100, 110, 120, 130, 140, 150};
 
-/* 806329CC-806331CC 00364C 0800+00 1/1 0/0 0/0 .text            executeChase__8daB_YO_cFv */
 void daB_YO_c::executeChase() {
     mAttentionTimer = 5;
 
@@ -1547,7 +1506,6 @@ void daB_YO_c::executeChase() {
     }
 }
 
-/* 806331CC-80633EDC 003E4C 0D10+00 1/1 0/0 0/0 .text            executeSeriousDemo__8daB_YO_cFv */
 void daB_YO_c::executeSeriousDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz pos;
@@ -1762,7 +1720,6 @@ void daB_YO_c::executeSeriousDemo() {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80633EDC-80633F50 004B5C 0074+00 1/1 0/0 0/0 .text            checkIcecleRevival__8daB_YO_cFv */
 u8 daB_YO_c::checkIcecleRevival() {
     int ret = 0;
     if (mIceBreak == 0x3ff && field_0xfb2 != 0) {
@@ -1780,8 +1737,6 @@ u8 daB_YO_c::checkIcecleRevival() {
     return ret;
 }
 
-/* 80633F50-80634040 004BD0 00F0+00 1/1 0/0 0/0 .text            createIcecleRevival__8daB_YO_cFUc
- */
 void daB_YO_c::createIcecleRevival(u8 param_0) {
     if (param_0 == 2) {
         setActionMode(ACT_DEMO_REVIVAL, 0);
@@ -1804,7 +1759,6 @@ void daB_YO_c::createIcecleRevival(u8 param_0) {
     }
 }
 
-/* 80634040-80634548 004CC0 0508+00 1/1 0/0 0/0 .text            executeJump__8daB_YO_cFv */
 void daB_YO_c::executeJump() {
     mIceAngle += mIceAngleSpeed;
     mCreatureSound.startCreatureSoundLevel(Z2SE_EN_YO_MOVE_FLY, 0, -1);
@@ -1895,7 +1849,6 @@ void daB_YO_c::executeJump() {
     }
 }
 
-/* 80634548-8063476C 0051C8 0224+00 1/1 0/0 0/0 .text            executeAttackIce__8daB_YO_cFv */
 void daB_YO_c::executeAttackIce() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_EN_YO_MOVE_FLY, 0, -1);
     mIceAngle += mIceAngleSpeed;
@@ -1937,7 +1890,6 @@ void daB_YO_c::executeAttackIce() {
     }
 }
 
-/* 8063476C-80634CEC 0053EC 0580+00 1/1 0/0 0/0 .text            executeAttackYose__8daB_YO_cFv */
 void daB_YO_c::executeAttackYose() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_EN_YO_MOVE_FLY, 0, -1);
     cXyz player_pos = daPy_getPlayerActorClass()->current.pos;
@@ -2029,7 +1981,6 @@ void daB_YO_c::executeAttackYose() {
     }
 }
 
-/* 80634CEC-80634E04 00596C 0118+00 1/1 0/0 0/0 .text checkDamageWithIceBreak__8daB_YO_cFv */
 void daB_YO_c::checkDamageWithIceBreak() {
     s16 player_angle = fopAcM_searchPlayerAngleY(this);
     if (mAtCyl.ChkAtHit() && fopAcM_GetName(mAtCyl.GetAtHitObj()->GetAc()) == PROC_ALINK) {
@@ -2048,7 +1999,6 @@ void daB_YO_c::checkDamageWithIceBreak() {
     }
 }
 
-/* 80634E04-806352C8 005A84 04C4+00 2/1 0/0 0/0 .text            executeAttackBody__8daB_YO_cFv */
 void daB_YO_c::executeAttackBody() {
     mIceCenterPos.y = current.pos.y;
 
@@ -2151,7 +2101,6 @@ void daB_YO_c::executeAttackBody() {
     }
 }
 
-/* 806352C8-80635798 005F48 04D0+00 1/1 0/0 0/0 .text            executeDemoRevival__8daB_YO_cFv */
 void daB_YO_c::executeDemoRevival() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -2254,7 +2203,6 @@ void daB_YO_c::executeDemoRevival() {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80635798-80635ABC 006418 0324+00 1/1 0/0 0/0 .text            executeDamage__8daB_YO_cFv */
 void daB_YO_c::executeDamage() {
     mIceAngle += mIceAngleSpeed;
     mIceCenterPos = current.pos;
@@ -2325,7 +2273,6 @@ void daB_YO_c::executeDamage() {
     }
 }
 
-/* 80635ABC-80636E9C 00673C 13E0+00 1/1 0/0 0/0 .text            executeDeath__8daB_YO_cFv */
 void daB_YO_c::executeDeath() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -2718,7 +2665,6 @@ void daB_YO_c::executeDeath() {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80636E9C-80637048 007B1C 01AC+00 2/2 0/0 0/0 .text reviseIceCenterPos__8daB_YO_cFP4cXyz */
 void daB_YO_c::reviseIceCenterPos(cXyz* param_0) {
     f32 fVar1 = mIceRange;
     if (fVar1 > 500.0f) {
@@ -2732,7 +2678,6 @@ void daB_YO_c::reviseIceCenterPos(cXyz* param_0) {
     }
 }
 
-/* 80637048-806374BC 007CC8 0474+00 1/1 0/0 0/0 .text            calcPlayerBufPos__8daB_YO_cFv */
 void daB_YO_c::calcPlayerBufPos() {
     cXyz player_pos = daPy_getPlayerActorClass()->current.pos;
     int dir = 0;
@@ -2781,7 +2726,6 @@ void daB_YO_c::calcPlayerBufPos() {
     }
 }
 
-/* 806374BC-80637990 00813C 04D4+00 3/1 0/0 0/0 .text            action__8daB_YO_cFv */
 void daB_YO_c::action() {
     damage_check();
 
@@ -2931,7 +2875,6 @@ void daB_YO_c::action() {
     }
 }
 
-/* 80637990-80637B30 008610 01A0+00 1/1 0/0 0/0 .text            mtx_set__8daB_YO_cFv */
 void daB_YO_c::mtx_set() {
     mpRoomModel[0]->setBaseTRMtx(mBgMtx);
     mpRoomModel[1]->setBaseTRMtx(mBgMtx);
@@ -2966,10 +2909,8 @@ void daB_YO_c::mtx_set() {
     }
 }
 
-/* 80639DF8-80639E14 000398 001C+00 0/1 0/0 0/0 .data            yo_att_pos_y */
 static f32 yo_att_pos_y[7] = {1300.0f, 950.0f, 700.0f, 450.0f, 850.0f, 470.0f, 300.0f};
 
-/* 80637B30-80637E10 0087B0 02E0+00 1/1 0/0 0/0 .text            cc_set__8daB_YO_cFv */
 void daB_YO_c::cc_set() {
     static f32 yo_at_sph_radius[8] = {658.0f, 600.0f, 550.0f, 440.0f,
                                       300.0f, 200.0f, 150.0f, 280.0f};
@@ -3043,7 +2984,6 @@ void daB_YO_c::cc_set() {
     }
 }
 
-/* 80637E10-80637FA0 008A90 0190+00 1/1 0/0 0/0 .text            execute__8daB_YO_cFv */
 int daB_YO_c::execute() {
     if (mIsInactive == 1) {
         mpRoomModel[mRoomType]->setBaseTRMtx(mBgMtx);
@@ -3105,17 +3045,14 @@ int daB_YO_c::execute() {
     return 1;
 }
 
-/* 80637FA0-80637FC0 008C20 0020+00 2/1 0/0 0/0 .text            daB_YO_Execute__FP8daB_YO_c */
 static int daB_YO_Execute(daB_YO_c* i_this) {
     return i_this->execute();
 }
 
-/* 80637FC0-80637FC8 008C40 0008+00 1/0 0/0 0/0 .text            daB_YO_IsDelete__FP8daB_YO_c */
 static int daB_YO_IsDelete(daB_YO_c* i_this) {
     return 1;
 }
 
-/* 80637FC8-806380D8 008C48 0110+00 1/1 0/0 0/0 .text            _delete__8daB_YO_cFv */
 int daB_YO_c::_delete() {
     dComIfG_resDelete(&mPhase2, "L5_R50");
 
@@ -3147,12 +3084,10 @@ int daB_YO_c::_delete() {
     return 1;
 }
 
-/* 806380D8-806380F8 008D58 0020+00 1/0 0/0 0/0 .text            daB_YO_Delete__FP8daB_YO_c */
 static int daB_YO_Delete(daB_YO_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806380F8-80638838 008D78 0740+00 1/1 0/0 0/0 .text            CreateHeap__8daB_YO_cFv */
 int daB_YO_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", BMDE_YO01);
     mpModel[0] = mDoExt_J3DModel__create(model_data, 0, 0x11000284);
@@ -3278,12 +3213,10 @@ int daB_YO_c::CreateHeap() {
     return 1;
 }
 
-/* 80638880-806388A0 009500 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daB_YO_c*>(i_this)->CreateHeap();
 }
 
-/* 806388A0-806389A0 009520 0100+00 1/1 0/0 0/0 .text            CreateHeap2__8daB_YO_cFv */
 int daB_YO_c::CreateHeap2() {
     mpRoomNormalBgW = new dBgW();
     if (mpRoomNormalBgW == NULL) {
@@ -3304,12 +3237,10 @@ int daB_YO_c::CreateHeap2() {
     return 1;
 }
 
-/* 806389A0-806389C0 009620 0020+00 1/1 0/0 0/0 .text            useHeapInit2__FP10fopAc_ac_c */
 static int useHeapInit2(fopAc_ac_c* i_this) {
     return static_cast<daB_YO_c*>(i_this)->CreateHeap2();
 }
 
-/* 806389C0-80639214 009640 0854+00 1/1 0/0 0/0 .text            create__8daB_YO_cFv */
 cPhs__Step daB_YO_c::create() {
     fopAcM_ct(this, daB_YO_c);
     cPhs__Step step;
@@ -3480,7 +3411,6 @@ cPhs__Step daB_YO_c::create() {
     }
 }
 
-/* 8063957C-8063959C 00A1FC 0020+00 1/0 0/0 0/0 .text            daB_YO_Create__FP8daB_YO_c */
 static cPhs__Step daB_YO_Create(daB_YO_c* i_this) {
     return i_this->create();
 }
@@ -3488,15 +3418,12 @@ static cPhs__Step daB_YO_Create(daB_YO_c* i_this) {
 namespace
 {
 
-/* 80639FEC-80639FF8 0000BC 000C+00 0/1 0/0 0/0 .bss m_common_pos__22@unnamed@d_a_b_yo_cpp@ */
 static cXyz m_common_pos;
 
-/* 80639FF8-80639FFC 0000C8 0004+00 0/0 0/0 0/0 .bss m_common_count__22@unnamed@d_a_b_yo_cpp@ */
 static u32 m_common_count;
 
 }  // namespace
 
-/* 80639E58-80639E78 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_YO_Method */
 static actor_method_class l_daB_YO_Method = {
     (process_method_func)daB_YO_Create,
     (process_method_func)daB_YO_Delete,
@@ -3505,7 +3432,6 @@ static actor_method_class l_daB_YO_Method = {
     (process_method_func)daB_YO_Draw,
 };
 
-/* 80639E78-80639EA8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_YO */
 extern actor_process_profile_definition g_profile_B_YO = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp
index d0fd991ca5..c6f4eb6d93 100644
--- a/src/d/actor/d_a_b_yo_ice.cpp
+++ b/src/d/actor/d_a_b_yo_ice.cpp
@@ -17,8 +17,8 @@
 
 class daB_YOI_HIO_c {
 public:
-    /* 8063A14C */ daB_YOI_HIO_c();
-    /* 8063DBD0 */ virtual ~daB_YOI_HIO_c() {}
+    daB_YOI_HIO_c();
+    virtual ~daB_YOI_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 mScaleY;
@@ -27,15 +27,12 @@ public:
 
 STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10);
 
-/* 8063DFE8-8063DFEC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 8063DFF8-8063E008 000018 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daB_YOI_HIO_c l_HIO;
 
 namespace {
 
-/* 8063DDC4-8063DE08 000020 0044+00 0/1 0/0 0/0 .data cc_yo_src__26@unnamed@d_a_b_yo_ice_cpp@ */
 static dCcD_SrcCyl cc_yo_src = {
     {
         {0x0, {{0x100000, 0x2, 0xC}, {0xD8BBFDFF, 0x43}, 0x55}}, // mObj
@@ -50,8 +47,6 @@ static dCcD_SrcCyl cc_yo_src = {
     } // mCyl
 };
 
-/* 8063DE08-8063DE4C 000064 0044+00 0/1 0/0 0/0 .data cc_yo_iron_src__26@unnamed@d_a_b_yo_ice_cpp@
- */
 static dCcD_SrcCyl cc_yo_iron_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x400000, 0x3}, 0x25}}, // mObj
@@ -66,8 +61,6 @@ static dCcD_SrcCyl cc_yo_iron_src = {
     } // mCyl
 };
 
-/* 8063DE4C-8063DE90 0000A8 0044+00 0/1 0/0 0/0 .data cc_yo_cam_src__26@unnamed@d_a_b_yo_ice_cpp@
- */
 static dCcD_SrcCyl cc_yo_cam_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x5}}, // mObj
@@ -84,14 +77,12 @@ static dCcD_SrcCyl cc_yo_cam_src = {
 
 }  // namespace
 
-/* 8063A14C-8063A17C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__13daB_YOI_HIO_cFv */
 daB_YOI_HIO_c::daB_YOI_HIO_c() {
     field_0x4 = -1;
     mScaleY = 1.0f;
     mScaleXZ = 1.2f;
 }
 
-/* 8063A17C-8063A2B8 00011C 013C+00 1/1 0/0 0/0 .text            draw__9daB_YOI_cFv */
 int daB_YOI_c::draw() {
     if (mDeleteTimer != 0) {
         return 1;
@@ -116,18 +107,15 @@ int daB_YOI_c::draw() {
     return 1;
 }
 
-/* 8063A2B8-8063A2D8 000258 0020+00 1/0 0/0 0/0 .text            daB_YOI_Draw__FP9daB_YOI_c */
 static int daB_YOI_Draw(daB_YOI_c* i_this) {
     return i_this->draw();
 }
 
-/* 8063A2D8-8063A2E4 000278 000C+00 2/2 0/0 0/0 .text            setActionMode__9daB_YOI_cFii */
 void daB_YOI_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* 8063A2E4-8063A480 000284 019C+00 1/1 0/0 0/0 .text            damage_check__9daB_YOI_cFv */
 void daB_YOI_c::damage_check() {
     mCcStts.Move();
 
@@ -169,7 +157,6 @@ void daB_YOI_c::damage_check() {
     }
 }
 
-/* 8063A480-8063A628 000420 01A8+00 1/0 0/0 3/3 .text            setOperate__9daB_YOI_cFi */
 void daB_YOI_c::setOperate(int param_0) {
     switch (param_0) {
     case 0:
@@ -220,13 +207,11 @@ void daB_YOI_c::setOperate(int param_0) {
     }
 }
 
-/* 8063A628-8063A638 0005C8 0010+00 2/2 0/0 0/0 .text            setWeight__9daB_YOI_cFUc */
 void daB_YOI_c::setWeight(u8 i_weight) {
     mCcStts.SetWeight(i_weight);
     mCcCyl0.SetStts(&mCcStts);
 }
 
-/* 8063A638-8063A6F8 0005D8 00C0+00 2/2 0/0 0/0 .text            setBreakIceEffect__9daB_YOI_cFv */
 void daB_YOI_c::setBreakIceEffect() {
     static u16 break_effect_id[3] = {0x87BB, 0x87BC, 0x87BD};
     current.angle.y = fopAcM_searchPlayerAngleY(this) + 0x8000;
@@ -235,8 +220,6 @@ void daB_YOI_c::setBreakIceEffect() {
     }
 }
 
-/* 8063A6F8-8063A79C 000698 00A4+00 1/1 0/0 0/0 .text            setWallBreakIceEffect__9daB_YOI_cFv
- */
 void daB_YOI_c::setWallBreakIceEffect() {
     static u16 wall_break_effect_id[3] = {0x87B8, 0x87B9, 0x87BA};
     for (int i = 0; i < 3; i++) {
@@ -244,12 +227,10 @@ void daB_YOI_c::setWallBreakIceEffect() {
     }
 }
 
-/* 8063A79C-8063A824 00073C 0088+00 1/1 0/0 0/0 .text            setApperEffect__9daB_YOI_cFv */
 void daB_YOI_c::setApperEffect() {
     mAppearKey = dComIfGp_particle_set(mAppearKey, 0x87B5, &current.pos, &tevStr);
 }
 
-/* 8063A824-8063A8C8 0007C4 00A4+00 1/1 0/0 0/0 .text            setApperEffect2__9daB_YOI_cFv */
 void daB_YOI_c::setApperEffect2() {
     static u16 apper_effect_id[2] = {0x87B6, 0x87B7};
     for (int i = 0; i < 2; i++) {
@@ -257,7 +238,6 @@ void daB_YOI_c::setApperEffect2() {
     }
 }
 
-/* 8063A8C8-8063A96C 000868 00A4+00 2/2 0/0 0/0 .text            setLandingEffect__9daB_YOI_cFv */
 void daB_YOI_c::setLandingEffect() {
     static u16 l_landing_effect_id[6] = {0x86DC, 0x86DD, 0x86DE, 0x86DF, 0x86E0, 0x86E1};
     for (int i = 0; i < 6; i++) {
@@ -265,7 +245,6 @@ void daB_YOI_c::setLandingEffect() {
     }
 }
 
-/* 8063A96C-8063ABC0 00090C 0254+00 1/1 0/0 0/0 .text            executeFirst__9daB_YOI_cFv */
 void daB_YOI_c::executeFirst() {
     cXyz pos = mpBlizzeta->getIceCenterPos();
     f32 range = mpBlizzeta->getIceRange();
@@ -312,12 +291,10 @@ void daB_YOI_c::executeFirst() {
     }
 }
 
-/* 8063DCB0-8063DCD8 00002C 0028+00 0/1 0/0 0/0 .rodata          yoi_fall_timer */
 static int const yoi_fall_timer[10] = {
     0x00, 0x0C, 0x18, 0x24, 0x30, 0x3C, 0x48, 0x54, 0x60, 0x6C,
 };
 
-/* 8063ABC0-8063ACCC 000B60 010C+00 2/2 0/0 0/0 .text            getSingleFallPos__9daB_YOI_cFv */
 cXyz daB_YOI_c::getSingleFallPos() {
     Vec eye = dCam_getBody()->Eye();
     Vec center = dCam_getBody()->Center();
@@ -332,7 +309,6 @@ cXyz daB_YOI_c::getSingleFallPos() {
     return pos;
 }
 
-/* 8063ACCC-8063B238 000C6C 056C+00 2/1 0/0 0/0 .text            executeRiseUp__9daB_YOI_cFv */
 void daB_YOI_c::executeRiseUp() {
     cXyz center_pos = mpBlizzeta->getIceCenterPos();
     f32 range = mpBlizzeta->getIceRange();
@@ -448,7 +424,6 @@ void daB_YOI_c::executeRiseUp() {
     }
 }
 
-/* 8063B238-8063BB40 0011D8 0908+00 2/1 0/0 0/0 .text            executeSingleFall__9daB_YOI_cFv */
 void daB_YOI_c::executeSingleFall() {
     switch (mMode) {
     case 0:
@@ -586,7 +561,6 @@ void daB_YOI_c::executeSingleFall() {
     }
 }
 
-/* 8063BB40-8063C3F0 001AE0 08B0+00 1/1 0/0 0/0 .text            executeYose__9daB_YOI_cFv */
 void daB_YOI_c::executeYose() {
     cXyz center_pos = mpBlizzeta->getIceCenterPos();
     f32 range = mpBlizzeta->getIceRange();
@@ -674,7 +648,6 @@ void daB_YOI_c::executeYose() {
     }
 }
 
-/* 8063C3F0-8063C76C 002390 037C+00 1/1 0/0 0/0 .text            executeYoseFall__9daB_YOI_cFv */
 void daB_YOI_c::executeYoseFall() {
     cXyz center_pos = mpBlizzeta->getIceCenterPos();
     f32 range = mpBlizzeta->getIceRange();
@@ -748,7 +721,6 @@ void daB_YOI_c::executeYoseFall() {
     }
 }
 
-/* 8063C76C-8063C900 00270C 0194+00 1/1 0/0 0/0 .text            executeDemoRevival__9daB_YOI_cFv */
 void daB_YOI_c::executeDemoRevival() {
     cXyz center_pos = mpBlizzeta->getIceCenterPos();
     f32 range = mpBlizzeta->getIceRange();
@@ -779,7 +751,6 @@ void daB_YOI_c::executeDemoRevival() {
     }
 }
 
-/* 8063C900-8063CC90 0028A0 0390+00 1/1 0/0 0/0 .text            executeDamage__9daB_YOI_cFv */
 void daB_YOI_c::executeDamage() {
     cXyz center_pos = mpBlizzeta->getIceCenterPos();
     s16 angle_diff;
@@ -822,7 +793,6 @@ void daB_YOI_c::executeDamage() {
     }
 }
 
-/* 8063CC90-8063CD14 002C30 0084+00 1/1 0/0 0/0 .text            executeDeath__9daB_YOI_cFv */
 void daB_YOI_c::executeDeath() {
     mSoundObj.startSound(Z2SE_EN_YO_ICE_BREAK, 0, -1);
     mpBlizzeta->onIceBreak(mIcicleNo);
@@ -830,7 +800,6 @@ void daB_YOI_c::executeDeath() {
     dComIfGp_particle_levelEmitterOnEventMove(mParticleKey);
 }
 
-/* 8063CD14-8063CD90 002CB4 007C+00 1/1 0/0 0/0 .text            crack_execute__9daB_YOI_cFv */
 void daB_YOI_c::crack_execute() {
     if (current.pos.y <= 0.0f) {
         if (speed.y == 0.0f) {
@@ -843,7 +812,6 @@ void daB_YOI_c::crack_execute() {
     }
 }
 
-/* 8063CD90-8063D0C8 002D30 0338+00 2/1 0/0 0/0 .text            action__9daB_YOI_cFv */
 void daB_YOI_c::action() {
     cXyz scale(mScaleF, mScaleF, mScaleF);
     mParticleKey = dComIfGp_particle_set(mParticleKey, 0x87BE, &current.pos, &tevStr, &shape_angle,
@@ -902,7 +870,6 @@ void daB_YOI_c::action() {
     crack_execute();
 }
 
-/* 8063D0C8-8063D1B0 003068 00E8+00 1/1 0/0 0/0 .text            mtx_set__9daB_YOI_cFv */
 void daB_YOI_c::mtx_set() {
     f32 scale_y = l_HIO.mScaleY * mScaleF;
     f32 scale_xz = l_HIO.mScaleXZ * mScaleF;
@@ -918,7 +885,6 @@ void daB_YOI_c::mtx_set() {
     mpCrackModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8063D1B0-8063D350 003150 01A0+00 1/1 0/0 0/0 .text            cc_set__9daB_YOI_cFv */
 void daB_YOI_c::cc_set() {
     cXyz center;
 
@@ -957,7 +923,6 @@ void daB_YOI_c::cc_set() {
     dComIfG_Ccsp()->Set(&mCcCyl1);
 }
 
-/* 8063D350-8063D434 0032F0 00E4+00 1/1 0/0 0/0 .text            execute__9daB_YOI_cFv */
 int daB_YOI_c::execute() {
     if (mDeleteTimer != 0) {
         dCam_getBody()->ForceLockOn(this);
@@ -991,17 +956,14 @@ int daB_YOI_c::execute() {
     }
 }
 
-/* 8063D434-8063D454 0033D4 0020+00 2/1 0/0 0/0 .text            daB_YOI_Execute__FP9daB_YOI_c */
 static int daB_YOI_Execute(daB_YOI_c* i_this) {
     return i_this->execute();
 }
 
-/* 8063D454-8063D45C 0033F4 0008+00 1/0 0/0 0/0 .text            daB_YOI_IsDelete__FP9daB_YOI_c */
 static int daB_YOI_IsDelete(daB_YOI_c* i_this) {
     return 1;
 }
 
-/* 8063D45C-8063D4D8 0033FC 007C+00 1/1 0/0 0/0 .text            _delete__9daB_YOI_cFv */
 int daB_YOI_c::_delete() {
     dComIfG_resDelete(&mPhase, "B_YO");
     
@@ -1017,12 +979,10 @@ int daB_YOI_c::_delete() {
     return 1;
 }
 
-/* 8063D4D8-8063D4F8 003478 0020+00 1/0 0/0 0/0 .text            daB_YOI_Delete__FP9daB_YOI_c */
 static int daB_YOI_Delete(daB_YOI_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8063D4F8-8063D5B0 003498 00B8+00 1/1 0/0 0/0 .text            CreateHeap__9daB_YOI_cFv */
 int daB_YOI_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", 0x21);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11000084);
@@ -1039,12 +999,10 @@ int daB_YOI_c::CreateHeap() {
     return 1;
 }
 
-/* 8063D5B0-8063D5D0 003550 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daB_YOI_c*>(i_this)->CreateHeap();
 }
 
-/* 8063D5D0-8063D8FC 003570 032C+00 1/1 0/0 0/0 .text            create__9daB_YOI_cFv */
 // data/rodata swap
 cPhs__Step daB_YOI_c::create() {
     fopAcM_ct(this, daB_YOI_c);
@@ -1119,17 +1077,14 @@ cPhs__Step daB_YOI_c::create() {
     return step;
 }
 
-/* 8063D8FC-8063DA7C 00389C 0180+00 1/1 0/0 0/0 .text            __ct__9daB_YOI_cFv */
 daB_YOI_c::daB_YOI_c() {
     /* empty function */
 }
 
-/* 8063DB68-8063DB88 003B08 0020+00 1/0 0/0 0/0 .text            daB_YOI_Create__FP9daB_YOI_c */
 static cPhs__Step daB_YOI_Create(daB_YOI_c* i_this) {
     return i_this->create();
 }
 
-/* 8063DF50-8063DF70 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_YOI_Method */
 static actor_method_class l_daB_YOI_Method = {
     (process_method_func)daB_YOI_Create,
     (process_method_func)daB_YOI_Delete,
@@ -1138,7 +1093,6 @@ static actor_method_class l_daB_YOI_Method = {
     (process_method_func)daB_YOI_Draw,
 };
 
-/* 8063DF70-8063DFA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_YOI */
 extern actor_process_profile_definition g_profile_B_YOI = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp
index e5cb60f023..4a1f56fd0e 100644
--- a/src/d/actor/d_a_b_zant.cpp
+++ b/src/d/actor/d_a_b_zant.cpp
@@ -98,7 +98,6 @@ static u8 const lit_3757[12] = {
 };
 
 namespace {
-/* 8064EEAC-8064EEEC 000020 0040+00 0/1 0/0 0/0 .data            cc_zant_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_src = {
     {
         {0x0, {{0x400, 0x1, 0x4}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj
@@ -111,7 +110,6 @@ dCcD_SrcSph cc_zant_src = {
     } // mSphAttr
 };
 
-/* 8064EEEC-8064EF2C 000060 0040+00 0/1 0/0 0/0 .data            cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_sword_src = {
     {
         {0x0, {{0x400, 0x1, 0x4}, {0xD8FBFDFF, 0x0}, 0x0}}, // mObj
@@ -124,7 +122,6 @@ dCcD_SrcSph cc_zant_sword_src = {
     } // mSphAttr
 };
 
-/* 8064EF2C-8064EF70 0000A0 0044+00 0/1 0/0 0/0 .data            cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcCyl cc_zant_roll_src = {
     {
         {0x0, {{0x400, 0x2, 0x4}, {0xD8FBFDFF, 0x42}, 0x74}},  // mObj
@@ -139,7 +136,6 @@ dCcD_SrcCyl cc_zant_roll_src = {
     }                        // mCyl
 };
 
-/* 8064EF70-8064EFB0 0000E4 0040+00 0/1 0/0 0/0 .data            cc_zant_foot_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_foot_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x400000, 0x3}, 0x0}}, // mObj
@@ -152,7 +148,6 @@ dCcD_SrcSph cc_zant_foot_src = {
     } // mSphAttr
 };
 
-/* 8064EFB0-8064EFF0 000124 0040+00 0/1 0/0 0/0 .data            cc_zant_foot_src2__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_foot_src2 = {
     {
         {0x0, {{0x400, 0x2, 0x1E}, {0xD8BBFDFF, 0x43}, 0x75}}, // mObj
@@ -165,7 +160,6 @@ dCcD_SrcSph cc_zant_foot_src2 = {
     } // mSphAttr
 };
 
-/* 8064EFF0-8064F030 000164 0040+00 0/1 0/0 0/0 .data            cc_zant_camera_src__24@unnamed@d_a_b_zant_cpp@ */
 dCcD_SrcSph cc_zant_camera_src = {
     {
         {0x0, {{0x400, 0x2, 0x1E}, {0xD8BBFDFF, 0x0}, 0x5}}, // mObj
@@ -178,7 +172,6 @@ dCcD_SrcSph cc_zant_camera_src = {
     } // mSphAttr
 };
 
-/* 8064F030-8064F038 0001A4 0007+01 4/4 0/0 0/0 .data warp_next_room__24@unnamed@d_a_b_zant_cpp@ */
 static s8 warp_next_room[] = {
     50,
     53,
@@ -190,7 +183,6 @@ static s8 warp_next_room[] = {
 };
 }
 
-/* 8063E10C-8063E19C 0000EC 0090+00 1/1 0/0 0/0 .text            __ct__14daB_ZANT_HIO_cFv */
 daB_ZANT_HIO_c::daB_ZANT_HIO_c() {
     field_0x4 = -1;
     mModelSize = 1.0f;
@@ -210,7 +202,6 @@ daB_ZANT_HIO_c::daB_ZANT_HIO_c() {
     mDisappearAnmSpeed = 0.5f;
 }
 
-/* 8063E19C-8063E264 00017C 00C8+00 1/1 0/0 0/0 .text ctrlJoint__10daB_ZANT_cFP8J3DJointP8J3DModel */
 int daB_ZANT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     u16 jnt_no = i_joint->getJntNo();
 
@@ -230,7 +221,6 @@ int daB_ZANT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8063E264-8063E2B0 000244 004C+00 1/1 0/0 0/0 .text JointCallBack__10daB_ZANT_cFP8J3DJointi */
 int daB_ZANT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -245,7 +235,6 @@ int daB_ZANT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
 }
 
 namespace {
-/* 8064EB5C-8064EB74 000040 0018+00 1/4 0/0 0/0 .rodata iron_tg_cc__24@unnamed@d_a_b_zant_cpp@ */
 static int const iron_tg_cc[] = {
     0,
     1,
@@ -256,7 +245,6 @@ static int const iron_tg_cc[] = {
 };
 }
 
-/* 8063E2B0-8063E568 000290 02B8+00 1/1 0/0 0/0 .text            draw__10daB_ZANT_cFv */
 int daB_ZANT_c::draw() {
     J3DModel* model = mpModelMorf->getModel();
 
@@ -316,22 +304,18 @@ int daB_ZANT_c::draw() {
     return 1;
 }
 
-/* 8063E5A4-8063E5C4 000584 0020+00 1/0 0/0 0/0 .text            daB_ZANT_Draw__FP10daB_ZANT_c */
 static int daB_ZANT_Draw(daB_ZANT_c* i_this) {
     return i_this->draw();
 }
 
-/* 8063E5C4-8063E668 0005A4 00A4+00 23/23 0/0 0/0 .text            setBck__10daB_ZANT_cFiUcff */
 void daB_ZANT_c::setBck(int i_resID, u8 i_attr, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("B_zan", i_resID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 8063E668-8063E6C4 000648 005C+00 3/3 0/0 0/0 .text            checkBck__10daB_ZANT_cFi */
 bool daB_ZANT_c::checkBck(int i_resID) {
     return mpModelMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", i_resID) ? TRUE : FALSE;
 }
 
-/* 8063E6C4-8063E6F8 0006A4 0034+00 24/24 0/0 0/0 .text            setActionMode__10daB_ZANT_cFii */
 void daB_ZANT_c::setActionMode(int i_action, int i_mode) {
     mSwordSize = 1.0f;
     field_0x701 = 0;
@@ -343,7 +327,6 @@ void daB_ZANT_c::setActionMode(int i_action, int i_mode) {
     mMode = i_mode;
 }
 
-/* 8063E6F8-8063E79C 0006D8 00A4+00 2/2 0/0 0/0 .text            checkBigDamage__10daB_ZANT_cFv */
 bool daB_ZANT_c::checkBigDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     BOOL taken_big_dmg = false;
@@ -361,7 +344,6 @@ bool daB_ZANT_c::checkBigDamage() {
     return taken_big_dmg;
 }
 
-/* 8063E79C-8063E810 00077C 0074+00 2/2 0/0 0/0 .text            checkDamageType__10daB_ZANT_cFv */
 int daB_ZANT_c::checkDamageType() {
     if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_HOOKSHOT) && mFightPhase == PHASE_OI) {
         return DMGTYPE_HOOK_OI;
@@ -386,7 +368,6 @@ int daB_ZANT_c::checkDamageType() {
     return DMGTYPE_MISC;
 }
 
-/* 8063E810-8063E938 0007F0 0128+00 2/2 0/0 0/0 .text setDamageSe__10daB_ZANT_cFP8dCcD_Sphi */
 void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) {
     health -= i_dmgAmount;
     if (health < 0) {
@@ -418,15 +399,12 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) {
     }
 }
 
-/* 8064F5F4-8064F5F8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 8064F5F5 0003+00 l_initHIO None */
 static u8 l_initHIO;
 
-/* 8064F604-8064F648 000054 0044+00 12/13 0/0 0/0 .bss             l_HIO */
 static daB_ZANT_HIO_c l_HIO;
 
 namespace {
-/* 8064F66C-8064F690 0000BC 0024+00 4/5 0/0 0/0 .bss fly_warp_pos__24@unnamed@d_a_b_zant_cpp@ */
 static cXyz fly_warp_pos[] = {
     cXyz(0.0f, 400.0f, 1000.0f),
     cXyz(1000.0f, 400.0f, 1500.0f),
@@ -434,7 +412,6 @@ static cXyz fly_warp_pos[] = {
 };
 }
 
-/* 8063E938-8063F0F4 000918 07BC+00 1/1 0/0 0/0 .text            damage_check__10daB_ZANT_cFv */
 void daB_ZANT_c::damage_check() {
     field_0x9a4.Move();
 
@@ -640,7 +617,6 @@ void daB_ZANT_c::damage_check() {
     }
 }
 
-/* 8063F524-8063F84C 001504 0328+00 1/1 0/0 0/0 .text            ice_damage_check__10daB_ZANT_cFv */
 void daB_ZANT_c::ice_damage_check() {
     field_0xc74.Move();
 
@@ -739,8 +715,6 @@ void daB_ZANT_c::ice_damage_check() {
     }
 }
 
-/* 8063F84C-8063F970 00182C 0124+00 3/3 0/0 0/0 .text            setNextDamageMode__10daB_ZANT_cFi
- */
 bool daB_ZANT_c::setNextDamageMode(BOOL i_checkHealth) {
     if (i_checkHealth) {
         if (mFightCycle == 0 && health < 140) {
@@ -765,7 +739,6 @@ bool daB_ZANT_c::setNextDamageMode(BOOL i_checkHealth) {
     return false;
 }
 
-/* 8063F970-8063FAB4 001950 0144+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor)) {
@@ -797,7 +770,6 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8063FAB4-8063FF6C 001A94 04B8+00 3/3 0/0 0/0 .text            checkAvoidWeapon__10daB_ZANT_cFi */
 bool daB_ZANT_c::checkAvoidWeapon(BOOL i_allowBoomerang) {
     if (i_allowBoomerang == 2) {
         return FALSE;
@@ -841,7 +813,6 @@ bool daB_ZANT_c::checkAvoidWeapon(BOOL i_allowBoomerang) {
     return FALSE;
 }
 
-/* 8063FF6C-8063FFAC 001F4C 0040+00 18/18 0/0 0/0 .text            setTgHitBit__10daB_ZANT_cFi */
 void daB_ZANT_c::setTgHitBit(BOOL i_onBit) {
     if (i_onBit) {
         mBodySphCc[0].OnTgSetBit();
@@ -852,7 +823,6 @@ void daB_ZANT_c::setTgHitBit(BOOL i_onBit) {
     }
 }
 
-/* 8063FFAC-8063FFEC 001F8C 0040+00 2/2 0/0 0/0 .text            setCoHitBit__10daB_ZANT_cFi */
 void daB_ZANT_c::setCoHitBit(BOOL i_onBit) {
     if (i_onBit) {
         mBodySphCc[0].OnCoSetBit();
@@ -863,7 +833,6 @@ void daB_ZANT_c::setCoHitBit(BOOL i_onBit) {
     }
 }
 
-/* 8063FFEC-806400BC 001FCC 00D0+00 2/2 0/0 0/0 .text            setTgShield__10daB_ZANT_cFi */
 void daB_ZANT_c::setTgShield(BOOL i_onShield) {
     if (i_onShield) {
         mBodySphCc[0].OnTgShield();
@@ -893,19 +862,16 @@ void daB_ZANT_c::setTgShield(BOOL i_onShield) {
     }
 }
 
-/* 806400BC-806400C8 00209C 000C+00 3/3 0/0 0/0 .text            setTgType__10daB_ZANT_cFUl */
 void daB_ZANT_c::setTgType(u32 i_type) {
     mBodySphCc[0].SetTgType(i_type);
     mBodySphCc[1].SetTgType(i_type);
 }
 
-/* 806400C8-80640104 0020A8 003C+00 1/1 0/0 0/0 .text            setZantMessage__10daB_ZANT_cFi */
 void daB_ZANT_c::setZantMessage(int i_msgNo) {
     mMsgNo = i_msgNo;
     mMsgID = fopMsgM_messageSet(i_msgNo, 1000);
 }
 
-/* 80640104-80640180 0020E4 007C+00 1/1 0/0 0/0 .text            doZantMessage__10daB_ZANT_cFv */
 int daB_ZANT_c::doZantMessage() {
     if (mpMsg != NULL) {
         if (mpMsg->mode == 14) {
@@ -922,8 +888,6 @@ int daB_ZANT_c::doZantMessage() {
     return 0;
 }
 
-/* 80640180-80640310 002160 0190+00 2/2 0/0 0/0 .text            setIceLandingEffect__10daB_ZANT_cFi
- */
 void daB_ZANT_c::setIceLandingEffect(BOOL i_landFootR) {
     static u16 l_landing_effect_id[] = {
         0x86DC, 0x86DD, 0x86DE, 0x86DF, 0x86E0, 0x86E1,
@@ -949,7 +913,6 @@ void daB_ZANT_c::setIceLandingEffect(BOOL i_landFootR) {
     dComIfGp_particle_set(0x86E2, &particle_pos, &tevStr, &shape_angle, NULL);
 }
 
-/* 80640310-806403D4 0022F0 00C4+00 1/1 0/0 0/0 .text            setWaterBubble__10daB_ZANT_cFv */
 void daB_ZANT_c::setWaterBubble() {
     cXyz particle_pos;
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_MOUTH));
@@ -958,8 +921,6 @@ void daB_ZANT_c::setWaterBubble() {
     field_0x389c[0] = dComIfGp_particle_set(field_0x389c[0], 0x1E8, &particle_pos, &tevStr);
 }
 
-/* 806403D4-80640478 0023B4 00A4+00 1/1 0/0 0/0 .text            setMonkeyFallEffect__10daB_ZANT_cFv
- */
 void daB_ZANT_c::setMonkeyFallEffect() {
     static u16 l_landing_effect_id[] = {0x8901, 0x8902, 0x8903};
 
@@ -968,8 +929,6 @@ void daB_ZANT_c::setMonkeyFallEffect() {
     }
 }
 
-/* 80640478-80640584 002458 010C+00 1/1 0/0 0/0 .text            setLastRollEffect__10daB_ZANT_cFv
- */
 void daB_ZANT_c::setLastRollEffect() {
     static u16 l_roll_effect_id[] = {0x8904, 0x8905};
 
@@ -982,10 +941,8 @@ void daB_ZANT_c::setLastRollEffect() {
     fopAcM_effSmokeSet2(&field_0x3894, &field_0x3898, &current.pos, NULL, 2.0f, &tevStr);
 }
 
-/* 8064F690-8064F694 0000E0 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80640584-80640654 002564 00D0+00 1/1 0/0 0/0 .text            s_pillar_sub__FPvPv */
 static void* s_pillar_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) {
@@ -1001,17 +958,14 @@ static void* s_pillar_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80640654-80640664 002634 0010+00 0/0 0/0 1/1 .text            getMagicSpeed__10daB_ZANT_cFv */
 f32 daB_ZANT_c::getMagicSpeed() {
     return l_HIO.mBulletSpeed;
 }
 
-/* 80640664-80640674 002644 0010+00 0/0 0/0 1/1 .text            getMagicWaterSpeed__10daB_ZANT_cFv */
 f32 daB_ZANT_c::getMagicWaterSpeed() {
     return l_HIO.mBulletSpeedUnderwater;
 }
 
-/* 80640674-80640C20 002654 05AC+00 1/1 0/0 0/0 .text            executeSmallAttack__10daB_ZANT_cFv */
 void daB_ZANT_c::executeSmallAttack() {
     cXyz sp44;
     s16 aim_target_angle = fopAcM_searchPlayerAngleY(this);
@@ -1137,7 +1091,6 @@ void daB_ZANT_c::executeSmallAttack() {
     }
 }
 
-/* 80640C20-80640D14 002C00 00F4+00 3/3 0/0 0/0 .text            calcScale__10daB_ZANT_cFi */
 bool daB_ZANT_c::calcScale(BOOL param_0) {
     if (!param_0) {
         cLib_addCalc(&mModelScaleXZ, 0.0f, 0.5f, 0.25f, 0.1f);
@@ -1163,7 +1116,6 @@ bool daB_ZANT_c::calcScale(BOOL param_0) {
     return false;
 }
 
-/* 80640D14-80641230 002CF4 051C+00 1/1 0/0 0/0 .text            executeWarp__10daB_ZANT_cFv */
 void daB_ZANT_c::executeWarp() {
     switch (mMode) {
     case 0:
@@ -1282,7 +1234,6 @@ void daB_ZANT_c::executeWarp() {
     }
 }
 
-/* 806412A8-806414E4 003288 023C+00 1/1 0/0 0/0 .text            executeDamage__10daB_ZANT_cFv */
 void daB_ZANT_c::executeDamage() {
     switch (mMode) {
     case 0:
@@ -1340,7 +1291,6 @@ void daB_ZANT_c::executeDamage() {
     }
 }
 
-/* 806414E4-80641640 0034C4 015C+00 1/1 0/0 0/0 .text            executeConfuse__10daB_ZANT_cFv */
 void daB_ZANT_c::executeConfuse() {
     switch (mMode) {
     case 0:
@@ -1372,7 +1322,6 @@ void daB_ZANT_c::executeConfuse() {
     }
 }
 
-/* 80641640-806427EC 003620 11AC+00 2/2 0/0 0/0 .text            executeOpening__10daB_ZANT_cFv */
 void daB_ZANT_c::executeOpening() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1714,7 +1663,6 @@ void daB_ZANT_c::executeOpening() {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
 }
 
-/* 806427EC-80642EC8 0047CC 06DC+00 2/1 0/0 0/0 .text            executeFly__10daB_ZANT_cFv */
 void daB_ZANT_c::executeFly() {
     dBgS_ObjGndChk_All gndchk;
     cXyz sp9C;
@@ -1835,7 +1783,6 @@ void daB_ZANT_c::executeFly() {
     }
 }
 
-/* 80642EC8-806430E0 004EA8 0218+00 1/1 0/0 0/0 .text            executeFlyGround__10daB_ZANT_cFv */
 void daB_ZANT_c::executeFlyGround() {
     switch (mMode) {
     case 0:
@@ -1867,7 +1814,6 @@ void daB_ZANT_c::executeFlyGround() {
     }
 }
 
-/* 806430E0-806432F8 0050C0 0218+00 1/1 0/0 0/0 .text checkSwimLinkNearMouth__10daB_ZANT_cFv */
 bool daB_ZANT_c::checkSwimLinkNearMouth() {
     fopAc_ac_c* pmobile;
     fopAcM_SearchByID(mMobileIDs[mCorrectMobileNo], &pmobile);
@@ -1887,8 +1833,6 @@ bool daB_ZANT_c::checkSwimLinkNearMouth() {
     return false;
 }
 
-/* 806432F8-8064350C 0052D8 0214+00 1/1 0/0 0/0 .text            checkSwimLinkNear__10daB_ZANT_cFv
- */
 bool daB_ZANT_c::checkSwimLinkNear() {
     fopAc_ac_c* pmobile;
     fopAcM_SearchByID(mMobileIDs[mCorrectMobileNo], &pmobile);
@@ -1916,7 +1860,6 @@ bool daB_ZANT_c::checkSwimLinkNear() {
     return false;
 }
 
-/* 8064350C-80643690 0054EC 0184+00 1/1 0/0 0/0 .text            executeHook__10daB_ZANT_cFv */
 void daB_ZANT_c::executeHook() {
     switch (mMode) {
     case 0:
@@ -1951,7 +1894,6 @@ void daB_ZANT_c::executeHook() {
     }
 }
 
-/* 80643690-80644074 005670 09E4+00 2/1 0/0 0/0 .text            executeWater__10daB_ZANT_cFv */
 void daB_ZANT_c::executeWater() {
     fopAc_ac_c* pmobile;
     fopAcM_SearchByID(mMobileIDs[mCorrectMobileNo], &pmobile);
@@ -2182,7 +2124,6 @@ void daB_ZANT_c::executeWater() {
     }
 }
 
-/* 80644074-80644A3C 006054 09C8+00 2/1 0/0 0/0 .text            executeSwim__10daB_ZANT_cFv */
 void daB_ZANT_c::executeSwim() {
     fopAc_ac_c* pmobile;
     fopAcM_SearchByID(mMobileIDs[mCorrectMobileNo], &pmobile);
@@ -2377,7 +2318,6 @@ void daB_ZANT_c::executeSwim() {
     }
 }
 
-/* 80644A3C-80645014 006A1C 05D8+00 1/1 0/0 0/0 .text            executeSimaJump__10daB_ZANT_cFv */
 void daB_ZANT_c::executeSimaJump() {
     switch (mMode) {
     case 0:
@@ -2527,7 +2467,6 @@ void daB_ZANT_c::executeSimaJump() {
     }
 }
 
-/* 80645014-8064524C 006FF4 0238+00 1/1 0/0 0/0 .text            executeIceDemo__10daB_ZANT_cFv */
 void daB_ZANT_c::executeIceDemo() {
     switch (mMode) {
     case 0:
@@ -2576,7 +2515,6 @@ void daB_ZANT_c::executeIceDemo() {
     }
 }
 
-/* 8064524C-80645DA4 00722C 0B58+00 2/1 0/0 0/0 .text            executeIceJump__10daB_ZANT_cFv */
 void daB_ZANT_c::executeIceJump() {
     cXyz sp44(daPy_getPlayerActorClass()->current.pos);
     f32 var_f31 = sp44.absXZ(current.pos);
@@ -2713,7 +2651,6 @@ void daB_ZANT_c::executeIceJump() {
     }
 }
 
-/* 80645DA4-8064687C 007D84 0AD8+00 1/1 0/0 0/0 .text            executeIceStep__10daB_ZANT_cFv */
 void daB_ZANT_c::executeIceStep() {
     s16 var_r29 = shape_angle.y;
     int var_r28;
@@ -2946,7 +2883,6 @@ void daB_ZANT_c::executeIceStep() {
     }
 }
 
-/* 8064687C-806471CC 00885C 0950+00 2/1 0/0 0/0 .text            executeIceDamage__10daB_ZANT_cFv */
 void daB_ZANT_c::executeIceDamage() {
     static f32 const damage_scale[] = {
         10.0f, 8.0f, 7.5f, 6.0f, 4.5f, 3.0f, 2.0f, 1.4f, 1.0f, 0.69999999f, 0.5f,
@@ -3163,7 +3099,6 @@ void daB_ZANT_c::executeIceDamage() {
     }
 }
 
-/* 806471CC-806473E4 0091AC 0218+00 1/1 0/0 0/0 .text            setFarPillarPos__10daB_ZANT_cFv */
 void daB_ZANT_c::setFarPillarPos() {
     fopAc_ac_c* ppillar;
     cXyz player_pos(daPy_getPlayerActorClass()->current.pos);
@@ -3196,7 +3131,6 @@ void daB_ZANT_c::setFarPillarPos() {
     }
 }
 
-/* 806473E4-80647468 0093C4 0084+00 4/4 0/0 0/0 .text            setNearPillarPos__10daB_ZANT_cFv */
 void daB_ZANT_c::setNearPillarPos() {
     fopAc_ac_c* ppillar;
     fopAcM_SearchByID(mPillarIDs[8], &ppillar);
@@ -3211,8 +3145,6 @@ void daB_ZANT_c::setNearPillarPos() {
     }
 }
 
-/* 80647468-806474F4 009448 008C+00 1/1 0/0 0/0 .text            setNextPillarInfo__10daB_ZANT_cFi
- */
 void daB_ZANT_c::setNextPillarInfo(int i_pillarNo) {
     fopAc_ac_c* ppillar;
     fopAcM_SearchByID(mPillarIDs[i_pillarNo], &ppillar);
@@ -3225,7 +3157,6 @@ void daB_ZANT_c::setNextPillarInfo(int i_pillarNo) {
     }
 }
 
-/* 806474F4-80647A34 0094D4 0540+00 1/1 0/0 0/0 .text            setNextPillarPos__10daB_ZANT_cFv */
 void daB_ZANT_c::setNextPillarPos() {
     fopAc_ac_c* ppillar;
     cXyz player_pos(daPy_getPlayerActorClass()->current.pos);
@@ -3277,7 +3208,6 @@ void daB_ZANT_c::setNextPillarPos() {
     }
 }
 
-/* 80647A34-80647AC8 009A14 0094+00 1/1 0/0 0/0 .text            checkPillarSwing__10daB_ZANT_cFv */
 void daB_ZANT_c::checkPillarSwing() {
     if (field_0x707 != 0) {
         fopAc_ac_c* ppillar;
@@ -3293,7 +3223,6 @@ void daB_ZANT_c::checkPillarSwing() {
     }
 }
 
-/* 80647AC8-806481F4 009AA8 072C+00 1/1 0/0 0/0 .text            executeMonkey__10daB_ZANT_cFv */
 void daB_ZANT_c::executeMonkey() {
     fopAc_ac_c* ppillar;
 
@@ -3432,8 +3361,6 @@ void daB_ZANT_c::executeMonkey() {
     }
 }
 
-/* 806481F4-80648544 00A1D4 0350+00 2/1 0/0 0/0 .text            executeMonkeyFall__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeMonkeyFall() {
     switch (mMode) {
     case 0:
@@ -3508,8 +3435,6 @@ void daB_ZANT_c::executeMonkeyFall() {
     }
 }
 
-/* 80648544-80648778 00A524 0234+00 1/1 0/0 0/0 .text            executeMonkeyDamage__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeMonkeyDamage() {
     switch (mMode) {
     case 0:
@@ -3562,7 +3487,6 @@ void daB_ZANT_c::executeMonkeyDamage() {
     }
 }
 
-/* 80648778-80648F64 00A758 07EC+00 5/5 0/0 0/0 .text            setLastWarp__10daB_ZANT_cFii */
 void daB_ZANT_c::setLastWarp(int param_0, int i_warpID) {
     mFlyWarpPosID = i_warpID;
 
@@ -3721,7 +3645,6 @@ void daB_ZANT_c::setLastWarp(int param_0, int i_warpID) {
     setActionMode(ACT_WARP, 1);
 }
 
-/* 80648F64-806494A8 00AF44 0544+00 2/1 0/0 0/0 .text executeLastStartDemo__10daB_ZANT_cFv */
 void daB_ZANT_c::executeLastStartDemo() {
     dCamera_c* camera = dCam_getBody();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3837,8 +3760,6 @@ void daB_ZANT_c::executeLastStartDemo() {
     camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
 }
 
-/* 806494A8-8064A58C 00B488 10E4+00 2/1 0/0 0/0 .text            executeLastAttack__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeLastAttack() {
     s16 angle_to_player = fopAcM_searchPlayerAngleY(this);
 
@@ -4235,7 +4156,6 @@ void daB_ZANT_c::executeLastAttack() {
     }
 }
 
-/* 8064A58C-8064A688 00C56C 00FC+00 1/1 0/0 0/0 .text            executeLastTired__10daB_ZANT_cFv */
 void daB_ZANT_c::executeLastTired() {
     switch (mMode) {
     case 0:
@@ -4266,8 +4186,6 @@ void daB_ZANT_c::executeLastTired() {
     }
 }
 
-/* 8064A688-8064AC20 00C668 0598+00 2/1 0/0 0/0 .text            executeLastDamage__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeLastDamage() {
     switch (mMode) {
     case 0:
@@ -4414,7 +4332,6 @@ void daB_ZANT_c::executeLastDamage() {
     }
 }
 
-/* 8064AC20-8064AC8C 00CC00 006C+00 1/1 0/0 0/0 .text            s_del_tp__FPvPv */
 static void* s_del_tp(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_TP) {
@@ -4425,8 +4342,6 @@ static void* s_del_tp(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8064AC8C-8064B270 00CC6C 05E4+00 1/1 0/0 0/0 .text            executeLastEndDemo__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeLastEndDemo() {
     dCamera_c* camera = dCam_getBody();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -4551,7 +4466,6 @@ void daB_ZANT_c::executeLastEndDemo() {
     camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
 }
 
-/* 8064B270-8064B49C 00D250 022C+00 1/1 0/0 0/0 .text            calcMahojinAnime__10daB_ZANT_cFv */
 void daB_ZANT_c::calcMahojinAnime() {
     switch (mMahojinAnmMode) {
     case 1:
@@ -4599,7 +4513,6 @@ void daB_ZANT_c::calcMahojinAnime() {
     }
 }
 
-/* 8064B49C-8064B69C 00D47C 0200+00 2/2 0/0 0/0 .text calcRoomChangeCamera__10daB_ZANT_cFi */
 void daB_ZANT_c::calcRoomChangeCamera(int param_0) {
     cXyz eye_target(-100.0f, 87.0f, -160.0f);
     cXyz center_target(106.0f, 483.0f, 843.0f);
@@ -4643,7 +4556,6 @@ void daB_ZANT_c::calcRoomChangeCamera(int param_0) {
     }
 }
 
-/* 8064B69C-8064B868 00D67C 01CC+00 3/3 0/0 0/0 .text            initNextRoom__10daB_ZANT_cFv */
 void daB_ZANT_c::initNextRoom() {
     field_0x70f = 0;
     field_0x6f0 = 0;
@@ -4698,8 +4610,6 @@ void daB_ZANT_c::initNextRoom() {
     tevStr.room_no = warp_next_room[mFightPhase];
 }
 
-/* 8064B868-8064C1C0 00D848 0958+00 2/1 0/0 0/0 .text            executeRoomChange__10daB_ZANT_cFv
- */
 void daB_ZANT_c::executeRoomChange() {
     dCamera_c* camera = dCam_getBody();
     cXyz sp34(0.0f, 0.0f, 0.0f);
@@ -4898,8 +4808,6 @@ void daB_ZANT_c::executeRoomChange() {
     camera->Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
 }
 
-/* 8064C1C0-8064C5A8 00E1A0 03E8+00 8/7 0/0 0/0 .text            setBaseActionMode__10daB_ZANT_cFi
- */
 void daB_ZANT_c::setBaseActionMode(int param_0) {
     switch (mFightPhase) {
     case PHASE_BB:
@@ -5003,7 +4911,6 @@ void daB_ZANT_c::setBaseActionMode(int param_0) {
     }
 }
 
-/* 8064C5A8-8064CB1C 00E588 0574+00 2/1 0/0 0/0 .text            action__10daB_ZANT_cFv */
 void daB_ZANT_c::action() {
     if (mFightPhase == PHASE_YO) {
         ice_damage_check();
@@ -5209,7 +5116,6 @@ void daB_ZANT_c::action() {
     mpModelMorf->play(sp44, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 8064CB1C-8064CD0C 00EAFC 01F0+00 2/2 0/0 0/0 .text            mtx_set__10daB_ZANT_cFv */
 void daB_ZANT_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -5253,7 +5159,6 @@ void daB_ZANT_c::mtx_set() {
     }
 }
 
-/* 8064CD0C-8064CFA8 00ECEC 029C+00 1/1 0/0 0/0 .text            cc_set__10daB_ZANT_cFv */
 void daB_ZANT_c::cc_set() {
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(JNT_NECK));
     mDoMtx_stack_c::multVecZero(&eyePos);
@@ -5297,7 +5202,6 @@ void daB_ZANT_c::cc_set() {
     }
 }
 
-/* 8064CFA8-8064DA48 00EF88 0AA0+00 1/1 0/0 0/0 .text            cc_ice_set__10daB_ZANT_cFv */
 void daB_ZANT_c::cc_ice_set() {
     class dZantSph_c {
     public:
@@ -5406,7 +5310,6 @@ void daB_ZANT_c::cc_ice_set() {
     }
 }
 
-/* 8064DA48-8064DB48 00FA28 0100+00 1/1 0/0 0/0 .text            execute__10daB_ZANT_cFv */
 int daB_ZANT_c::execute() {
     if (mModeTimer != 0) {
         mModeTimer--;
@@ -5449,18 +5352,14 @@ int daB_ZANT_c::execute() {
     return 1;
 }
 
-/* 8064DB48-8064DB68 00FB28 0020+00 1/0 0/0 0/0 .text            daB_ZANT_Execute__FP10daB_ZANT_c */
 static int daB_ZANT_Execute(daB_ZANT_c* i_this) {
     return i_this->execute();
 }
 
-/* 8064DB68-8064DB70 00FB48 0008+00 1/0 0/0 0/0 .text            daB_ZANT_IsDelete__FP10daB_ZANT_c
- */
 static int daB_ZANT_IsDelete(daB_ZANT_c* i_this) {
     return 1;
 }
 
-/* 8064DB70-8064DBE4 00FB50 0074+00 1/1 0/0 0/0 .text            _delete__10daB_ZANT_cFv */
 int daB_ZANT_c::_delete() {
     dComIfG_resDelete(&mPhase, "B_zan");
     
@@ -5475,12 +5374,10 @@ int daB_ZANT_c::_delete() {
     return 1;
 }
 
-/* 8064DBE4-8064DC04 00FBC4 0020+00 1/0 0/0 0/0 .text            daB_ZANT_Delete__FP10daB_ZANT_c */
 static int daB_ZANT_Delete(daB_ZANT_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text            CreateHeap__10daB_ZANT_cFv */
 int daB_ZANT_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN);
     JUT_ASSERT(0, modelData != NULL);
@@ -5566,12 +5463,10 @@ int daB_ZANT_c::CreateHeap() {
     return 1;
 }
 
-/* 8064E170-8064E190 010150 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daB_ZANT_c*)i_this)->CreateHeap();
 }
 
-/* 8064E190-8064E724 010170 0594+00 1/1 0/0 0/0 .text            create__10daB_ZANT_cFv */
 int daB_ZANT_c::create() {
     fopAcM_ct(this, daB_ZANT_c);
     OS_REPORT("B_ZANT PARAM %x\n", fopAcM_GetParam(this));
@@ -5691,12 +5586,10 @@ int daB_ZANT_c::create() {
     return phase_state;
 }
 
-/* 8064E92C-8064E94C 01090C 0020+00 1/0 0/0 0/0 .text            daB_ZANT_Create__FP10daB_ZANT_c */
 static int daB_ZANT_Create(daB_ZANT_c* i_this) {
     return i_this->create();
 }
 
-/* 8064F4AC-8064F4CC -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANT_Method */
 static actor_method_class l_daB_ZANT_Method = {
     (process_method_func)daB_ZANT_Create,
     (process_method_func)daB_ZANT_Delete,
@@ -5705,7 +5598,6 @@ static actor_method_class l_daB_ZANT_Method = {
     (process_method_func)daB_ZANT_Draw,
 };
 
-/* 8064F4CC-8064F4FC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANT */
 extern actor_process_profile_definition g_profile_B_ZANT = {
   fpcLy_CURRENT_e,              // mLayerID
   4,                            // mListID
diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp
index b8fc12bd19..21c814b1f9 100644
--- a/src/d/actor/d_a_b_zant_magic.cpp
+++ b/src/d/actor/d_a_b_zant_magic.cpp
@@ -12,19 +12,16 @@
 #include "SSystem/SComponent/c_math.h"
 #include <cmath.h>
 
-/* 8064F778-8064F7B4 000078 003C+00 1/1 0/0 0/0 .text            draw__11daB_ZANTM_cFv */
 int daB_ZANTM_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     return 1;
 }
 
-/* 8064F7B4-8064F7D4 0000B4 0020+00 1/0 0/0 0/0 .text            daB_ZANTM_Draw__FP11daB_ZANTM_c */
 static int daB_ZANTM_Draw(daB_ZANTM_c* i_this) {
     return i_this->draw();
 }
 
 namespace {
-/* 80650508-80650554 000020 004C+00 0/1 0/0 0/0 .data            cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ */
 dCcD_SrcCps cc_zant_src = {
     {
         {0, {{AT_TYPE_CSTATUE_SWING, 2, 0x1D}, {0xD8FBFDFF, 0}, 0}},
@@ -39,7 +36,6 @@ dCcD_SrcCps cc_zant_src = {
     }},
 };
 
-/* 80650554-80650594 00006C 0040+00 0/1 0/0 0/0 .data            cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@ */
 dCcD_SrcSph cc_zant_src2 = {
     {
         {0x0, {{0x400, 0x2, 0x0}, {0x6000, 0x3}, 0x0}}, // mObj
@@ -52,7 +48,6 @@ dCcD_SrcSph cc_zant_src2 = {
     } // mSphAttr
 };
 
-/* 80650594-806505D4 0000AC 0040+00 0/1 0/0 0/0 .data            cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@ */
 dCcD_SrcSph cc_zant_src3 = {
     {
         {0x0, {{0x400, 0x2, 0x0}, {0x2, 0x3}, 0x0}}, // mObj
@@ -66,7 +61,6 @@ dCcD_SrcSph cc_zant_src3 = {
 };
 }
 
-/* 8064F7D4-8064F938 0000D4 0164+00 1/1 0/0 0/0 .text            setMagicEffect__11daB_ZANTM_cFv */
 void daB_ZANTM_c::setMagicEffect() {
     static u16 magic_effect_id[] = {
         0x890D, 0x890E, 0x890F, 0x8910,
@@ -88,8 +82,6 @@ void daB_ZANTM_c::setMagicEffect() {
     }
 }
 
-/* 8064F938-8064FA50 000238 0118+00 1/1 0/0 0/0 .text            setMagicHitEffect__11daB_ZANTM_cFv
- */
 void daB_ZANTM_c::setMagicHitEffect() {
     static u16 magic_effect_id[] = {
         0x8862, 0x8863, 0x8864, 0x8865,
@@ -106,7 +98,6 @@ void daB_ZANTM_c::setMagicHitEffect() {
     }
 }
 
-/* 8064FA50-8064FD6C 000350 031C+00 1/1 0/0 0/0 .text            executeSmall__11daB_ZANTM_cFv */
 void daB_ZANTM_c::executeSmall() {
     cXyz target_pos;
     daPy_getPlayerActorClass();
@@ -185,7 +176,6 @@ void daB_ZANTM_c::executeSmall() {
     }
 }
 
-/* 8064FD6C-8064FE6C 00066C 0100+00 1/1 0/0 0/0 .text            cc_set__11daB_ZANTM_cFv */
 void daB_ZANTM_c::cc_set() {
     eyePos = current.pos;
     eyePos.y += 30.0f;
@@ -206,7 +196,6 @@ void daB_ZANTM_c::cc_set() {
     dComIfG_Ccsp()->Set(&mTgCollider);
 }
 
-/* 8064FE6C-8064FF04 00076C 0098+00 1/1 0/0 0/0 .text            execute__11daB_ZANTM_cFv */
 int daB_ZANTM_c::execute() {
     if (mAliveTimer != 0) {
         mAliveTimer--;
@@ -226,30 +215,22 @@ int daB_ZANTM_c::execute() {
     return 1;
 }
 
-/* 8064FF04-8064FF24 000804 0020+00 1/0 0/0 0/0 .text            daB_ZANTM_Execute__FP11daB_ZANTM_c
- */
 static int daB_ZANTM_Execute(daB_ZANTM_c* i_this) {
     return i_this->execute();
 }
 
-/* 8064FF24-8064FF2C 000824 0008+00 1/0 0/0 0/0 .text            daB_ZANTM_IsDelete__FP11daB_ZANTM_c
- */
 static int daB_ZANTM_IsDelete(daB_ZANTM_c* i_this) {
     return 1;
 }
 
-/* 8064FF2C-8064FF34 00082C 0008+00 1/1 0/0 0/0 .text            _delete__11daB_ZANTM_cFv */
 int daB_ZANTM_c::_delete() {
     return 1;
 }
 
-/* 8064FF34-8064FF54 000834 0020+00 1/0 0/0 0/0 .text            daB_ZANTM_Delete__FP11daB_ZANTM_c
- */
 static int daB_ZANTM_Delete(daB_ZANTM_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8064FF54-806500A8 000854 0154+00 1/1 0/0 0/0 .text            create__11daB_ZANTM_cFv */
 int daB_ZANTM_c::create() {
     fopAcM_ct(this, daB_ZANTM_c);
     OS_REPORT("B_ZANTM PARAM %x\n", fopAcM_GetParam(this));
@@ -287,7 +268,6 @@ static int daB_ZANTM_Create(daB_ZANTM_c* i_this) {
     return i_this->create();
 }
 
-/* 806505E4-80650604 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANTM_Method */
 static actor_method_class l_daB_ZANTM_Method = {
     (process_method_func)daB_ZANTM_Create,
     (process_method_func)daB_ZANTM_Delete,
@@ -296,7 +276,6 @@ static actor_method_class l_daB_ZANTM_Method = {
     (process_method_func)daB_ZANTM_Draw,
 };
 
-/* 80650604-80650634 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANTM */
 extern actor_process_profile_definition g_profile_B_ZANTM = {
   fpcLy_CURRENT_e,        // mLayerID
   4,                      // mListID
diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp
index b85efa5c28..afcd9b98d4 100644
--- a/src/d/actor/d_a_b_zant_mobile.cpp
+++ b/src/d/actor/d_a_b_zant_mobile.cpp
@@ -14,7 +14,6 @@
 #include <cmath.h>
 
 namespace {
-/* 806527DC-8065281C 000000 0040+00 1/1 0/0 0/0 .data            cc_zant_src__31@unnamed@d_a_b_zant_mobile_cpp@ */
 dCcD_SrcSph cc_zant_src = {
     {
         {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x3}, 0x55}}, // mObj
@@ -27,7 +26,6 @@ dCcD_SrcSph cc_zant_src = {
     } // mSphAttr
 };
 
-/* 8065281C-80652860 000040 0044+00 1/1 0/0 0/0 .data            cc_zant_snort_src__31@unnamed@d_a_b_zant_mobile_cpp@ */
 static dCcD_SrcCyl cc_zant_snort_src = {
     {
         {0, {{0x400, 0, 0}, {0xD8FBFDFF, 0}, 0x55}},
@@ -43,13 +41,11 @@ static dCcD_SrcCyl cc_zant_snort_src = {
 };
 }
 
-/* 8065078C-806507B0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__15daB_ZANTZ_HIO_cFv */
 daB_ZANTZ_HIO_c::daB_ZANTZ_HIO_c() {
     field_0x4 = -1;
     mModelSize = 1.0f;
 }
 
-/* 806507B0-80650834 000110 0084+00 1/1 0/0 0/0 .text            draw__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::draw() {
     J3DModel* model = mpMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -59,12 +55,10 @@ int daB_ZANTZ_c::draw() {
     return 1;
 }
 
-/* 80650834-80650854 000194 0020+00 1/0 0/0 0/0 .text            daB_ZANTZ_Draw__FP11daB_ZANTZ_c */
 static int daB_ZANTZ_Draw(daB_ZANTZ_c* i_this) {
     return i_this->draw();
 }
 
-/* 80650854-806508E0 0001B4 008C+00 0/0 0/0 2/2 .text            setSnortEffect__11daB_ZANTZ_cFi */
 void daB_ZANTZ_c::setSnortEffect(int param_0) {
     if (field_0x668 == 0) {
         Z2GetAudioMgr()->seStart(Z2SE_EN_ZZ_HANAIKI, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -73,7 +67,6 @@ void daB_ZANTZ_c::setSnortEffect(int param_0) {
     field_0x668 = param_0;
 }
 
-/* 806508E0-80650B7C 000240 029C+00 1/1 0/0 0/0 .text            calcSnortEffect__11daB_ZANTZ_cFv */
 void daB_ZANTZ_c::calcSnortEffect() {
     cXyz sp28;
     cXyz sp34;
@@ -122,7 +115,6 @@ void daB_ZANTZ_c::calcSnortEffect() {
     }
 }
 
-/* 80650B7C-80650D0C 0004DC 0190+00 0/0 0/0 3/3 .text            setMouthMode__11daB_ZANTZ_cFUc */
 void daB_ZANTZ_c::setMouthMode(u8 param_0) {
     if (param_0 == 2) {
         if (mMouthMode == 0 || mMouthMode == 1) {
@@ -139,7 +131,6 @@ void daB_ZANTZ_c::setMouthMode(u8 param_0) {
     }
 }
 
-/* 80650D0C-806510C0 00066C 03B4+00 0/0 0/0 1/1 .text            setAppearMode__11daB_ZANTZ_cFUc */
 void daB_ZANTZ_c::setAppearMode(u8 param_0) {
     cXyz sp34(0.0f, 0.0f, 2000.0f);
 
@@ -191,7 +182,6 @@ void daB_ZANTZ_c::setAppearMode(u8 param_0) {
     }
 }
 
-/* 806510C0-80651204 000A20 0144+00 2/2 0/0 0/0 .text            getGroundPos__11daB_ZANTZ_cFv */
 f32 daB_ZANTZ_c::getGroundPos() {
     cXyz sp88(current.pos);
     dBgS_ObjGndChk gndchk;
@@ -215,7 +205,6 @@ f32 daB_ZANTZ_c::getGroundPos() {
     return sp88.y;
 }
 
-/* 8065127C-80651B1C 000BDC 08A0+00 1/1 0/0 0/0 .text            action__11daB_ZANTZ_cFv */
 void daB_ZANTZ_c::action() {
     if (mMouthMode == 0) {
         if (mpMorf->checkFrame(4.0f) || mpMorf->checkFrame(10.0f) || mpMorf->checkFrame(15.0f)) {
@@ -332,7 +321,6 @@ void daB_ZANTZ_c::action() {
     mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80651B1C-80651C20 00147C 0104+00 1/1 0/0 0/0 .text            cc_set__11daB_ZANTZ_cFv */
 void daB_ZANTZ_c::cc_set() {
     cXyz cc_center;
     eyePos = current.pos;
@@ -349,13 +337,10 @@ void daB_ZANTZ_c::cc_set() {
     }
 }
 
-/* 80652928-8065292C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80652938-80652944 000018 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daB_ZANTZ_HIO_c l_HIO;
 
-/* 80651C20-80651CF4 001580 00D4+00 1/1 0/0 0/0 .text            execute__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::execute() {
     if (field_0x668 != 0) {
         field_0x668--;
@@ -385,19 +370,14 @@ int daB_ZANTZ_c::execute() {
     return 1;
 }
 
-/* 80651CF4-80651D14 001654 0020+00 1/0 0/0 0/0 .text            daB_ZANTZ_Execute__FP11daB_ZANTZ_c
- */
 static int daB_ZANTZ_Execute(daB_ZANTZ_c* i_this) {
     return i_this->execute();
 }
 
-/* 80651D14-80651D1C 001674 0008+00 1/0 0/0 0/0 .text            daB_ZANTZ_IsDelete__FP11daB_ZANTZ_c
- */
 static int daB_ZANTZ_IsDelete(daB_ZANTZ_c* i_this) {
     return 1;
 }
 
-/* 80651D1C-80651DA4 00167C 0088+00 1/1 0/0 0/0 .text            _delete__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::_delete() {
     if (mInitHIO) {
         l_initHIO = false;
@@ -413,13 +393,10 @@ int daB_ZANTZ_c::_delete() {
     return 1;
 }
 
-/* 80651DA4-80651DC4 001704 0020+00 1/0 0/0 0/0 .text            daB_ZANTZ_Delete__FP11daB_ZANTZ_c
- */
 static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text            CreateHeap__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ);
     JUT_ASSERT(0, modelData != NULL);
@@ -451,12 +428,10 @@ int daB_ZANTZ_c::CreateHeap() {
     return 1;
 }
 
-/* 80652018-80652038 001978 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daB_ZANTZ_c*)i_this)->CreateHeap();
 }
 
-/* 80652038-806522F4 001998 02BC+00 1/1 0/0 0/0 .text            create__11daB_ZANTZ_cFv */
 int daB_ZANTZ_c::create() {
     fopAcM_ct(this, daB_ZANTZ_c);
 
@@ -519,13 +494,10 @@ int daB_ZANTZ_c::create() {
     return phase_state;
 }
 
-/* 8065266C-8065268C 001FCC 0020+00 1/0 0/0 0/0 .text            daB_ZANTZ_Create__FP11daB_ZANTZ_c
- */
 static int daB_ZANTZ_Create(daB_ZANTZ_c* i_this) {
     return i_this->create();
 }
 
-/* 80652860-80652880 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANTZ_Method */
 static actor_method_class l_daB_ZANTZ_Method = {
     (process_method_func)daB_ZANTZ_Create,
     (process_method_func)daB_ZANTZ_Delete,
@@ -534,7 +506,6 @@ static actor_method_class l_daB_ZANTZ_Method = {
     (process_method_func)daB_ZANTZ_Draw,
 };
 
-/* 80652880-806528B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANTZ */
 extern actor_process_profile_definition g_profile_B_ZANTZ = {
   fpcLy_CURRENT_e,        // mLayerID
   4,                      // mListID
diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp
index 464a44bcb8..95d436f98c 100644
--- a/src/d/actor/d_a_b_zant_sima.cpp
+++ b/src/d/actor/d_a_b_zant_sima.cpp
@@ -14,7 +14,6 @@
 #define TIMER_PLAYER 0
 #define TIMER_ZANT 1
 
-/* 806529D8-80652AAC 000078 00D4+00 1/1 0/0 0/0 .text            draw__11daB_ZANTS_cFv */
 int daB_ZANTS_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -27,12 +26,10 @@ int daB_ZANTS_c::draw() {
     return 1;
 }
 
-/* 80652AAC-80652ACC 00014C 0020+00 1/0 0/0 0/0 .text            daB_ZANTS_Draw__FP11daB_ZANTS_c */
 static int daB_ZANTS_Draw(daB_ZANTS_c* i_this) {
     return i_this->draw();
 }
 
-/* 80652ACC-80652B28 00016C 005C+00 1/1 0/0 0/0 .text            zants_ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c      */
 static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_target) {
     if (fopAcM_GetName(i_target) == PROC_ALINK) {
         ((daB_ZANTS_c*)i_this)->mPlayerID = fopAcM_GetID(i_target);
@@ -43,7 +40,6 @@ static void zants_ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_
     }
 }
 
-/* 80652B28-80652DA8 0001C8 0280+00 1/1 0/0 0/0 .text            action__11daB_ZANTS_cFv */
 void daB_ZANTS_c::action() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (player->checkMagneBootsOn()) {
@@ -106,7 +102,6 @@ void daB_ZANTS_c::action() {
     }
 }
 
-/* 80652DA8-80652E98 000448 00F0+00 1/1 0/0 0/0 .text            execute__11daB_ZANTS_cFv */
 int daB_ZANTS_c::execute() {
     mpBrkAnm->play();
     mpBtkAnm->play();
@@ -128,17 +123,14 @@ int daB_ZANTS_c::execute() {
     return 1;
 }
 
-/* 80652E98-80652EB8 000538 0020+00 2/1 0/0 0/0 .text            daB_ZANTS_Execute__FP11daB_ZANTS_c */
 static int daB_ZANTS_Execute(daB_ZANTS_c* i_this) {
     return i_this->execute();
 }
 
-/* 80652EB8-80652EC0 000558 0008+00 1/0 0/0 0/0 .text            daB_ZANTS_IsDelete__FP11daB_ZANTS_c */
 static int daB_ZANTS_IsDelete(daB_ZANTS_c* i_this) {
     return 1;
 }
 
-/* 80652EC0-80652F18 000560 0058+00 1/1 0/0 0/0 .text            _delete__11daB_ZANTS_cFv */
 int daB_ZANTS_c::_delete() {
     dComIfG_resDelete(&mPhase, "MAGNESIMA");
     if (mpBgW != NULL) {
@@ -147,12 +139,10 @@ int daB_ZANTS_c::_delete() {
     return 1;
 }
 
-/* 80652F18-80652F38 0005B8 0020+00 1/0 0/0 0/0 .text            daB_ZANTS_Delete__FP11daB_ZANTS_c */
 static int daB_ZANTS_Delete(daB_ZANTS_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80652F38-80653180 0005D8 0248+00 1/1 0/0 0/0 .text            CreateHeap__11daB_ZANTS_cFv */
 int daB_ZANTS_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_S_MAGNE_SIMA);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -199,12 +189,10 @@ int daB_ZANTS_c::CreateHeap() {
     return TRUE;
 }
 
-/* 806531C8-806531E8 000868 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daB_ZANTS_c*>(i_this)->CreateHeap();
 }
 
-/* 806531E8-80653304 000888 011C+00 1/1 0/0 0/0 .text            create__11daB_ZANTS_cFv */
 int daB_ZANTS_c::create() {
     fopAcM_ct(this, daB_ZANTS_c);
 
@@ -229,19 +217,16 @@ int daB_ZANTS_c::create() {
     return phase_state;
 }
 
-/* 80653304-80653324 0009A4 0020+00 1/0 0/0 0/0 .text            daB_ZANTS_Create__FP11daB_ZANTS_c */
 static int daB_ZANTS_Create(daB_ZANTS_c* i_this) {
     return i_this->create();
 }
 
-/* 80653370-80653390 -00001 0020+00 1/0 0/0 0/0 .data            l_daB_ZANTS_Method */
 static actor_method_class l_daB_ZANTS_Method = {
     (process_method_func)daB_ZANTS_Create,  (process_method_func)daB_ZANTS_Delete,
     (process_method_func)daB_ZANTS_Execute, (process_method_func)daB_ZANTS_IsDelete,
     (process_method_func)daB_ZANTS_Draw,
 };
 
-/* 80653390-806533C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_B_ZANTS */
 extern actor_process_profile_definition g_profile_B_ZANTS = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp
index 6a49136da8..71ae6f843d 100644
--- a/src/d/actor/d_a_balloon_2D.cpp
+++ b/src/d/actor/d_a_balloon_2D.cpp
@@ -76,7 +76,7 @@ public:
         };
         memcpy(&m, &aParam, sizeof(aParam));
     }
-    /* 806553A8 */ virtual ~daBalloon2D_HIO_c() {}
+    virtual ~daBalloon2D_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -142,21 +142,17 @@ public:
     param m;
 };
 
-/* 806534CC-80653518 0000EC 004C+00 1/0 0/0 0/0 .text            draw__Q213daBalloon2D_c6c_listFv */
 void daBalloon2D_c::c_list::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
     mBalloon->drawMeter();
 }
 
-/* 80653518-80653538 000138 0020+00 1/1 0/0 0/0 .text daBalloon2D_createHeap__FP10fopAc_ac_c */
 static int daBalloon2D_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daBalloon2D_c*>(i_this)->createHeap();
 }
 
-/* 806556D4-806556D8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Balloon2D";
 
-/* 80653538-80653D24 000158 07EC+00 1/1 0/0 0/0 .text            createHeap__13daBalloon2D_cFv */
 int daBalloon2D_c::createHeap() {
     mScreen = new J2DScreen();
     if (mScreen == NULL) {
@@ -230,13 +226,10 @@ int daBalloon2D_c::createHeap() {
     return 1;
 }
 
-/* 8065577C-80655844 000014 00C8+00 3/3 0/0 0/0 .bss             l_HOSTIO */
 daBalloon2D_HIO_c l_HOSTIO;
 
-/* 80655844-80655848 0000DC 0004+00 2/2 0/0 0/0 .bss             myclass__13daBalloon2D_c */
 daBalloon2D_c* daBalloon2D_c::myclass;
 
-/* 80653D24-80653DB4 000944 0090+00 1/1 0/0 0/0 .text            create__13daBalloon2D_cFv */
 int daBalloon2D_c::create() {
     int rv = dComIfG_resLoad(this, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -250,7 +243,6 @@ int daBalloon2D_c::create() {
     return rv;
 }
 
-/* 80653DB4-80653E10 0009D4 005C+00 1/1 0/0 0/0 .text            destroy__13daBalloon2D_cFv */
 int daBalloon2D_c::destroy() {
     dComIfG_resDelete(this, l_arcName);
     myclass = NULL;
@@ -258,7 +250,6 @@ int daBalloon2D_c::destroy() {
     return 1;
 }
 
-/* 80653E10-80653EC0 000A30 00B0+00 1/1 0/0 0/0 .text            draw__13daBalloon2D_cFv */
 int daBalloon2D_c::draw() {
     if (isVisible() && !dComIfGp_isPauseFlag() &&
         !dMsgObject_isTalkNowCheck())
@@ -272,7 +263,6 @@ int daBalloon2D_c::draw() {
 }
 
 
-/* 80653EC0-80653F04 000AE0 0044+00 1/1 0/0 0/0 .text            execute__13daBalloon2D_cFv */
 int daBalloon2D_c::execute() {
     setAllAlpha();
     setComboAlpha();
@@ -280,7 +270,6 @@ int daBalloon2D_c::execute() {
     return 1;
 }
 
-/* 80653F04-80653F58 000B24 0054+00 1/1 0/0 0/0 .text            drawMeter__13daBalloon2D_cFv */
 void daBalloon2D_c::drawMeter() {
     update();
     mScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
@@ -288,8 +277,6 @@ void daBalloon2D_c::drawMeter() {
 }
 
 
-/* 80653F58-80653FC0 000B78 0068+00 0/0 0/0 1/1 .text            setComboCount__13daBalloon2D_cFUcUc
- */
 void daBalloon2D_c::setComboCount(u8 size, u8 comboNum) {
     if (mComboNum != comboNum) {
         setComboNum(comboNum);
@@ -299,15 +286,12 @@ void daBalloon2D_c::setComboCount(u8 size, u8 comboNum) {
     }
 }
 
-/* 80653FC0-80653FEC 000BE0 002C+00 0/0 0/0 2/2 .text            setScoreCount__13daBalloon2D_cFUl
- */
 void daBalloon2D_c::setScoreCount(u32 scoreCount) {
     if (mScoreCount != scoreCount) {
         setScoreNum(scoreCount);
     }
 }
 
-/* 80653FEC-806540B4 000C0C 00C8+00 0/0 0/0 1/1 .text addScoreCount__13daBalloon2D_cFP4cXyzUlUc */
 void daBalloon2D_c::addScoreCount(cXyz* param_1, u32 param_2, u8 param_3) {
     for (int i = 0; i < 19; i++) {
         int current = 19 - i;
@@ -325,15 +309,12 @@ void daBalloon2D_c::addScoreCount(cXyz* param_1, u32 param_2, u8 param_3) {
     field_0x5f8[0].field_0xf = param_3;
 }
 
-/* 806540B4-806540B8 000CD4 0004+00 1/1 0/0 0/0 .text            initiate__13daBalloon2D_cFv */
 void daBalloon2D_c::initiate() {
 }
 
-/* 806540B8-806540BC 000CD8 0004+00 1/1 0/0 0/0 .text            update__13daBalloon2D_cFv */
 void daBalloon2D_c::update() {
 }
 
-/* 806540BC-806541B4 000CDC 00F8+00 2/2 0/0 0/0 .text            setComboNum__13daBalloon2D_cFUc */
 void daBalloon2D_c::setComboNum(u8 comboNum) {
     if (comboNum > 99) {
         comboNum = 99;
@@ -346,8 +327,6 @@ void daBalloon2D_c::setComboNum(u8 comboNum) {
     setComboAlpha();
 }
 
-/* 806541B4-80654258 000DD4 00A4+00 2/2 0/0 0/0 .text            setBalloonSize__13daBalloon2D_cFUc
- */
 void daBalloon2D_c::setBalloonSize(u8 balloonSize) {
     mBalloonSize = balloonSize;
     switch(balloonSize) {
@@ -369,7 +348,6 @@ void daBalloon2D_c::setBalloonSize(u8 balloonSize) {
     }
 }
 
-/* 80654258-80654440 000E78 01E8+00 2/2 0/0 0/0 .text            setScoreNum__13daBalloon2D_cFi */
 void daBalloon2D_c::setScoreNum(int scoreNum) {
     if (scoreNum > 99999) {
         scoreNum = 99999;
@@ -395,7 +373,6 @@ void daBalloon2D_c::setScoreNum(int scoreNum) {
     field_0x5a8[4]->changeTexture(resTimg, 0);
 }
 
-/* 80654440-8065464C 001060 020C+00 1/1 0/0 0/0 .text            setAllAlpha__13daBalloon2D_cFv */
 void daBalloon2D_c::setAllAlpha() {
     mAllAlpha = field_0x578->getAlphaRate();
     if (isVisible()) {
@@ -426,7 +403,6 @@ void daBalloon2D_c::setAllAlpha() {
 }
 
 
-/* 8065464C-80654730 00126C 00E4+00 2/2 0/0 0/0 .text            setComboAlpha__13daBalloon2D_cFv */
 void daBalloon2D_c::setComboAlpha() {
     mComboAlpha = field_0x5a4->getAlphaRate() * field_0x578->getAlphaRate();
     if (mComboNum != 0) {
@@ -443,7 +419,6 @@ void daBalloon2D_c::setComboAlpha() {
     }
 }
 
-/* 80654730-80654E8C 001350 075C+00 1/1 0/0 0/0 .text            drawAddScore__13daBalloon2D_cFv */
 void daBalloon2D_c::drawAddScore() {
     for (s32 i = 19; i >= 0; i--) {
         if (field_0x5f8[i].field_0xe != 0) {
@@ -529,7 +504,6 @@ void daBalloon2D_c::drawAddScore() {
     }
 }
 
-/* 80654E8C-80655250 001AAC 03C4+00 2/2 0/0 0/0 .text            setHIO__13daBalloon2D_cFb */
 void daBalloon2D_c::setHIO(bool param_1) {
     if ((l_HOSTIO.m.mAdjustmentToggle != 0) || param_1) {
 #if DEBUG
@@ -589,32 +563,25 @@ void daBalloon2D_HIO_c::resetAddScoreSetFlag() {
     releaseJORMContext(ctx);
 }
 
-/* 80655250-80655304 001E70 00B4+00 1/0 0/0 0/0 .text daBalloon2D_create__FP13daBalloon2D_c */
 static int daBalloon2D_create(daBalloon2D_c* i_this) {
     fopAcM_ct(i_this, daBalloon2D_c);
     return i_this->create();
 }
 
-/* 80655304-80655340 001F24 003C+00 2/2 0/0 0/0 .text __dt__Q213daBalloon2D_c10CHeadScoreFv */
 daBalloon2D_c::CHeadScore::~CHeadScore() {
 }
 
-/* 80655340-80655344 001F60 0004+00 1/1 0/0 0/0 .text __ct__Q213daBalloon2D_c10CHeadScoreFv */
 daBalloon2D_c::CHeadScore::CHeadScore() {
 }
 
-/* 80655344-80655364 001F64 0020+00 1/0 0/0 0/0 .text daBalloon2D_destroy__FP13daBalloon2D_c */
 static int daBalloon2D_destroy(daBalloon2D_c* i_this) {
     return i_this->destroy();
 }
 
-/* 80655364-80655384 001F84 0020+00 1/0 0/0 0/0 .text daBalloon2D_execute__FP13daBalloon2D_c */
 static int daBalloon2D_execute(daBalloon2D_c* i_this) {
     return i_this->execute();
 }
 
-/* 80655384-806553A4 001FA4 0020+00 1/0 0/0 0/0 .text            daBalloon2D_draw__FP13daBalloon2D_c
- */
 static int daBalloon2D_draw(daBalloon2D_c* i_this) {
     return i_this->draw();
 }
@@ -741,8 +708,6 @@ void daBalloon2D_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* ############################################################################################## */
-/* 806556D8-806556F8 -00001 0020+00 1/0 0/0 0/0 .data            daBalloon2D_METHODS */
 static actor_method_class daBalloon2D_METHODS = {
     (process_method_func)daBalloon2D_create,
     (process_method_func)daBalloon2D_destroy,
@@ -751,7 +716,6 @@ static actor_method_class daBalloon2D_METHODS = {
     (process_method_func)daBalloon2D_draw,
 };
 
-/* 806556F8-80655728 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BALLOON2D */
 extern actor_process_profile_definition g_profile_BALLOON2D = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp
index 8ace770093..430ddc32a4 100644
--- a/src/d/actor/d_a_bd.cpp
+++ b/src/d/actor/d_a_bd.cpp
@@ -14,7 +14,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* ############################################################################################## */
 
 
 struct land_pos {
@@ -24,7 +23,6 @@ struct land_pos {
     /* 0x0C */ f32 z;
 };
 
-/* 804D9F88-804DA0C8 000000 0140+00 2/2 0/0 0/0 .data            land_pos103 */
 static land_pos land_pos103[20] = {
     {0, -556.0f, 319.0f, 6063.0f},  {0, 264.0f, 501.0f, 5199.0f},   {0, -313.0f, 267.0f, 4460.0f},
     {0, -714.0f, 116.0f, 3704.0f},  {0, -1208.0f, 100.0f, 2491.0f}, {0, -2478.0f, 135.0f, 3929.0f},
@@ -35,7 +33,6 @@ static land_pos land_pos103[20] = {
     {0, 605.0f, 81.0f, -2006.0f},   {-1, 0.0f, 0.0f, 0.0f},
 };
 
-/* 804DA0C8-804DA208 000140 0140+00 2/2 0/0 0/0 .data            land_pos127 */
 static land_pos land_pos127[20] = {
     {0, 3238.0f, 66.0f, -3141.0f},   {0, 2721.0f, 79.0f, -2194.0f}, {0, 3885.0f, 35.0f, -1399.0f},
     {0, 3862.0f, 35.0f, -220.0f},    {0, 4581.0f, 35.0f, 651.0f},   {0, 5495.0f, 35.0f, 1558.0f},
@@ -46,14 +43,11 @@ static land_pos land_pos127[20] = {
     {0, -2302.0f, 1216.0f, -242.0f}, {-1, 0.0f, 0.0f, 0.0f},
 };
 
-/* 804DA208-804DA214 000280 000C+00 3/3 0/0 0/0 .data            wait_bck */
 static int wait_bck[3] = {ANM_PITA_LEFTUP, ANM_PITA_RIGHT, ANM_PITA_DOWN};
 
-/* 804DA36C-804DA38C 000054 0020+00 8/10 0/0 0/0 .bss             l_HIO */
 static u8 l_HIOInit;
 static daBd_HIO_c l_HIO;
 
-/* 804DA3BC-804DA3EC 0000A4 0030+00 0/1 0/0 0/0 .bss             land_sp_pos */
 static cXyz land_sp_pos[4] = {
     cXyz(3350.0f, 474.0f, 1760.0f),
     cXyz(553.0f, 395.0f, -599.0f),
@@ -63,7 +57,6 @@ static cXyz land_sp_pos[4] = {
 
 static int rope_pt;
 
-/* 804D6C4C-804D6CA4 0000EC 0058+00 1/1 0/0 0/0 .text            __ct__10daBd_HIO_cFv */
 daBd_HIO_c::daBd_HIO_c() {
     id = -1;
     mBasicSize = 1.2f;
@@ -90,16 +83,13 @@ void daBd_HIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* ############################################################################################## */
 
-/* 804D6CA4-804D6D54 000144 00B0+00 8/8 0/0 0/0 .text            anm_init__FP8bd_classifUcf */
 static void anm_init(bd_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Bd", i_anmID), i_attr, i_morf,
                            i_speed, 0.0f, -1.0f, NULL);
     i_this->mAnmID = i_anmID;
 }
 
-/* 804D6D54-804D6DD8 0001F4 0084+00 1/0 0/0 0/0 .text            daBd_Draw__FP8bd_class */
 static int daBd_Draw(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -111,9 +101,7 @@ static int daBd_Draw(bd_class* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 804D6DD8-804D6ED4 000278 00FC+00 1/1 0/0 0/0 .text            way_bg_check__FP8bd_class */
 static int way_bg_check(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -136,9 +124,7 @@ static int way_bg_check(bd_class* i_this) {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 804D6F10-804D7210 0003B0 0300+00 1/1 0/0 0/0 .text            s_a_sub__FPvPv */
 static void* s_a_sub(void* i_target, void* i_bird) {
     fopAc_ac_c* a_target = (fopAc_ac_c*)i_target;
     bd_class* b_bird = (bd_class*)i_bird;
@@ -161,9 +147,7 @@ static void* s_a_sub(void* i_target, void* i_bird) {
     return NULL;
 }
 
-/* ############################################################################################## */
 
-/* 804D7210-804D7518 0006B0 0308+00 1/1 0/0 0/0 .text            pl_check__FP8bd_class */
 static void pl_check(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -207,7 +191,6 @@ static void pl_check(bd_class* i_this) {
     return;
 }
 
-/* 804D7518-804D75D0 0009B8 00B8+00 1/1 0/0 0/0 .text            pointBgCheck__FP4cXyzP4cXyz */
 static int pointBgCheck(cXyz* param_0, cXyz* param_1) {
     dBgS_LinChk sp20;
     cXyz spC = *param_1;
@@ -219,9 +202,7 @@ static int pointBgCheck(cXyz* param_0, cXyz* param_1) {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 804D75D0-804D785C 000A70 028C+00 1/1 0/0 0/0 .text            land_check__FP8bd_class */
 static int land_check(bd_class* i_this) {
     int land_pos_len;
     land_pos* land_pos;
@@ -287,9 +268,7 @@ static int land_check(bd_class* i_this) {
     return -1;
 }
 
-/* ############################################################################################## */
 
-/* 804D785C-804D7890 000CFC 0034+00 1/1 0/0 0/0 .text            drop_check__FP8bd_class */
 static void drop_check(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -300,18 +279,14 @@ static void drop_check(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D7890-804D78FC 000D30 006C+00 1/1 0/0 0/0 .text            turn_set__FP8bd_class */
 static void turn_set(bd_class* i_this) {
     s16 angle_table[3] = {0x8000, 0x4000, -0x4000};
     s16 angle = angle_table[(int)cM_rndF(2.99f)];
     i_this->mTargetAngleY = i_this->enemy.current.angle.y + angle;
 }
 
-/* ############################################################################################## */
 
-/* 804D78FC-804D7DF4 000D9C 04F8+00 1/1 0/0 0/0 .text            bd_ground__FP8bd_class */
 static void bd_ground(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -420,9 +395,7 @@ static void bd_ground(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D7DF4-804D82E4 001294 04F0+00 1/1 0/0 0/0 .text            bd_fly__FP8bd_class */
 static void bd_fly(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -542,9 +515,7 @@ static void bd_fly(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D82E4-804D8648 001784 0364+00 1/1 0/0 0/0 .text            bd_landing__FP8bd_class */
 static void bd_landing(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -608,7 +579,6 @@ static void bd_landing(bd_class* i_this) {
                         (TREG_S(3) + 1000));
 }
 
-/* 804D8648-804D8798 001AE8 0150+00 1/1 0/0 0/0 .text            bd_landing2__FP8bd_class */
 static void bd_landing2(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -635,9 +605,7 @@ static void bd_landing2(bd_class* i_this) {
                         TREG_S(7) + 1000);
 }
 
-/* ############################################################################################## */
 
-/* 804D8798-804D8A34 001C38 029C+00 1/1 0/0 0/0 .text            bd_landing3__FP8bd_class */
 static void bd_landing3(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -680,9 +648,7 @@ static void bd_landing3(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D8A34-804D8C48 001ED4 0214+00 1/1 0/0 0/0 .text            bd_rope__FP8bd_class */
 static void bd_rope(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -720,7 +686,6 @@ static void bd_rope(bd_class* i_this) {
     }
 }
 
-/* 804D8C48-804D8E20 0020E8 01D8+00 1/1 0/0 0/0 .text            bd_kkri__FP8bd_class */
 static void bd_kkri(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -753,7 +718,6 @@ static void bd_kkri(bd_class* i_this) {
     }
 }
 
-/* 804D8E20-804D8EB8 0022C0 0098+00 1/1 0/0 0/0 .text            bd_drop__FP8bd_class */
 static void bd_drop(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -772,9 +736,7 @@ static void bd_drop(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D8EB8-804D91F8 002358 0340+00 2/1 0/0 0/0 .text            action__FP8bd_class */
 static void action(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -890,9 +852,7 @@ static void action(bd_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 804D91F8-804D959C 002698 03A4+00 2/1 0/0 0/0 .text            daBd_Execute__FP8bd_class */
 static int daBd_Execute(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daNpc_Kkri_c* kkri;
@@ -963,12 +923,10 @@ static int daBd_Execute(bd_class* i_this) {
     return 1;
 }
 
-/* 804D959C-804D95A4 002A3C 0008+00 1/0 0/0 0/0 .text            daBd_IsDelete__FP8bd_class */
 static int daBd_IsDelete(bd_class* i_this) {
     return 1;
 }
 
-/* 804D95A4-804D960C 002A44 0068+00 1/0 0/0 0/0 .text            daBd_Delete__FP8bd_class */
 static int daBd_Delete(bd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -984,7 +942,6 @@ static int daBd_Delete(bd_class* i_this) {
     return 1;
 }
 
-/* 804D960C-804D97D4 002AAC 01C8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     bd_class* a_this = (bd_class*)i_this;
 
@@ -1009,9 +966,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 804D981C-804D9BB8 002CBC 039C+00 1/0 0/0 0/0 .text            daBd_Create__FP10fopAc_ac_c */
 static int daBd_Create(fopAc_ac_c* i_act_this) {
     bd_class* i_this = (bd_class*)i_act_this;
     fopAcM_ct(i_act_this, bd_class);
@@ -1093,14 +1048,12 @@ static int daBd_Create(fopAc_ac_c* i_act_this) {
     return phase_state;
 }
 
-/* 804DA274-804DA294 -00001 0020+00 1/0 0/0 0/0 .data            l_daBd_Method */
 static actor_method_class l_daBd_Method = {
     (process_method_func)daBd_Create,  (process_method_func)daBd_Delete,
     (process_method_func)daBd_Execute, (process_method_func)daBd_IsDelete,
     (process_method_func)daBd_Draw,
 };
 
-/* 804DA294-804DA2C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BD */
 extern actor_process_profile_definition g_profile_BD = {
     fpcLy_CURRENT_e,       // mLayerID
     8,                     // mListID
diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp
index 1dc9e70e4d..2df6dde570 100644
--- a/src/d/actor/d_a_bg.cpp
+++ b/src/d/actor/d_a_bg.cpp
@@ -16,7 +16,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 
-/* 80457BF8-80457C38 000078 0040+00 1/1 0/0 0/0 .text            setArcName__6daBg_cFv */
 const char* daBg_c::setArcName() {
     static char arcName[32];
 
@@ -24,7 +23,6 @@ const char* daBg_c::setArcName() {
     return arcName;
 }
 
-/* 80457C38-80457D78 0000B8 0140+00 2/2 0/0 0/0 .text            createMatAnm__FP12J3DModelDataUs */
 static int createMatAnm(J3DModelData* i_modelData, u16 i_materialID) {
     if (i_materialID != 0xFFFF) {
         J3DMaterial* material = i_modelData->getMaterialNodePointer(i_materialID);
@@ -42,13 +40,10 @@ static int createMatAnm(J3DModelData* i_modelData, u16 i_materialID) {
     return 1;
 }
 
-/* 80459374-80459380 000000 000C+00 1/1 0/0 0/0 .rodata          @3756 */
 static u8 const lit_3756[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80457F34-80458040 0003B4 010C+00 1/1 0/0 0/0 .text
- * create__13daBg_btkAnm_cFP12J3DModelDataP19J3DAnmTextureSRTKeyi */
 int daBg_btkAnm_c::create(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, int i_anmPlay) {
     mpBtk = new mDoExt_btkAnm();
     if (mpBtk == NULL) {
@@ -69,19 +64,15 @@ int daBg_btkAnm_c::create(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk,
     return 1;
 }
 
-/* 80458088-804580CC 000508 0044+00 1/1 0/0 0/0 .text entry__13daBg_btkAnm_cFP12J3DModelData */
 void daBg_btkAnm_c::entry(J3DModelData* i_modelData) {
     mpBtk->entry(i_modelData, 0.0f);
     field_0x4 = 0;
 }
 
-/* 804580CC-804580F0 00054C 0024+00 1/1 0/0 0/0 .text            play__13daBg_btkAnm_cFv */
 void daBg_btkAnm_c::play() {
     mpBtk->play();
 }
 
-/* 804580F0-80458230 000570 0140+00 1/1 0/0 0/0 .text
- * create__13daBg_brkAnm_cFP12J3DModelDataP15J3DAnmTevRegKeyi   */
 int daBg_brkAnm_c::create(J3DModelData* i_modelData, J3DAnmTevRegKey* i_brk, int i_anmPlay) {
     mpBrk = new mDoExt_brkAnm();
 
@@ -109,24 +100,20 @@ int daBg_brkAnm_c::create(J3DModelData* i_modelData, J3DAnmTevRegKey* i_brk, int
     return 1;
 }
 
-/* 80458230-80458274 0006B0 0044+00 1/1 0/0 0/0 .text entry__13daBg_brkAnm_cFP12J3DModelData */
 void daBg_brkAnm_c::entry(J3DModelData* i_modelData) {
     mpBrk->entry(i_modelData, 0.0f);
     field_0x4 = 0;
 }
 
-/* 80458274-80458298 0006F4 0024+00 1/1 0/0 0/0 .text            play__13daBg_brkAnm_cFv */
 void daBg_brkAnm_c::play() {
     mpBrk->play();
 }
 
-/* 80458298-804582B8 000718 0020+00 1/1 0/0 0/0 .text            checkCreateHeap__FP10fopAc_ac_c */
 static int checkCreateHeap(fopAc_ac_c* i_this) {
     daBg_c* a_this = (daBg_c*)i_this;
     return a_this->createHeap();
 }
 
-/* 804582B8-80458750 000738 0498+00 2/2 0/0 1/1 .text            createHeap__6daBg_cFv */
 int daBg_c::createHeap() {
     static char l_modelName[6][11] = {"model.bmd", "model1.bmd", "model2.bmd", "model3.bmd", "model4.bmd", "model5.bmd"};
     static char l_modelName2[6][11] = {"model.bdl", "model1.bdl", "model2.bdl", "model3.bdl", "model4.bdl", "model5.bdl"};
@@ -254,7 +241,6 @@ int daBg_c::createHeap() {
     return 1;
 }
 
-/* 80458788-804588A4 000C08 011C+00 1/1 0/0 0/0 .text            __dt__6daBg_cFv */
 daBg_c::~daBg_c() {
     int roomNo = fopAcM_GetParam(this);
 
@@ -279,12 +265,10 @@ daBg_c::~daBg_c() {
     dComIfGp_roomControl_offStatusFlag(roomNo, 0x10);
 }
 
-/* 804588A4-804588C4 000D24 0020+00 1/0 0/0 0/0 .text            daBg_Draw__FP6daBg_c */
 static int daBg_Draw(daBg_c* i_this) {
     return i_this->draw();
 }
 
-/* 804588C4-80458F38 000D44 0674+00 1/1 0/0 0/0 .text            draw__6daBg_cFv */
 int daBg_c::draw() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
 
@@ -499,7 +483,6 @@ int daBg_c::execute() {
     return 1;
 }
 
-/* 80458F38-8045901C 0013B8 00E4+00 1/0 0/0 0/0 .text            daBg_Execute__FP6daBg_c */
 static int daBg_Execute(daBg_c* i_this) {
     return i_this->execute();
 }
@@ -508,25 +491,21 @@ int daBg_c::isDelete() {
     return 1;
 }
 
-/* 8045901C-80459024 00149C 0008+00 1/0 0/0 0/0 .text            daBg_IsDelete__FP6daBg_c */
 static int daBg_IsDelete(daBg_c* i_this) {
     return i_this->isDelete();
 }
 
-/* 80459024-8045904C 0014A4 0028+00 1/0 0/0 0/0 .text            daBg_Delete__FP6daBg_c */
 static int daBg_Delete(daBg_c* i_this) {
     i_this->~daBg_c();
     return 1;
 }
 
-/* 8045904C-8045906C 0014CC 0020+00 1/0 0/0 0/0 .text            daBg_Create__FP10fopAc_ac_c */
 static int daBg_Create(fopAc_ac_c* i_this) {
     daBg_c* a_this = (daBg_c*)i_this;
     int rt = a_this->create();
     return rt;
 }
 
-/* 8045906C-8045933C 0014EC 02D0+00 1/1 0/0 0/0 .text            create__6daBg_cFv */
 int daBg_c::create() {
     int roomNo = fopAcM_GetParam(this);
     field_0x5f0 = 0;
@@ -636,7 +615,6 @@ int daBg_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8045954C-8045956C -00001 0020+00 1/0 0/0 0/0 .data            l_daBg_Method */
 static actor_method_class l_daBg_Method = {
     (process_method_func)daBg_Create,
     (process_method_func)daBg_Delete,
@@ -645,7 +623,6 @@ static actor_method_class l_daBg_Method = {
     (process_method_func)daBg_Draw,
 };
 
-/* 8045956C-804595A0 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_BG */
 extern actor_process_profile_definition2 g_profile_BG = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp
index 5aa22856ea..49727d8cab 100644
--- a/src/d/actor/d_a_bg_obj.cpp
+++ b/src/d/actor/d_a_bg_obj.cpp
@@ -13,11 +13,6 @@
 #include "d/d_s_play.h"
 #include "SSystem/SComponent/c_math.h"
 
-//
-// Declarations:
-//
-
-/* 80459658-804596C4 000078 006C+00 2/2 0/0 0/0 .text            getBmdName__Fii */
 static const char* getBmdName(int param_0, int param_1) {
     static char l_bmdName[16];
 
@@ -48,7 +43,6 @@ static const char* getBtkName(int param_0, int param_1) {
     return l_btkName;
 }
 
-/* 80459734-804597A4 000154 0070+00 2/2 0/0 0/0 .text            getBrkName__Fii */
 static const char* getBrkName(int param_0, int param_1) {
     static char l_brkName[16];
 
@@ -64,7 +58,6 @@ static const char* getBrkName(int param_0, int param_1) {
     return l_brkName;
 }
 
-/* 804597A4-804597E8 0001C4 0044+00 2/2 0/0 0/0 .text            getDzbName__Fi */
 static const char* getDzbName(int param_0) {
     static char l_dzbName[16];
 
@@ -76,8 +69,6 @@ static const char* dummy() {
     return "spec.dat";
 }
 
-/* 804597E8-80459814 000208 002C+00 1/1 0/0 0/0 .text
- * initParticleBlock__Q29daBgObj_c11spec_data_cFPUc             */
 u8* daBgObj_c::spec_data_c::initParticleBlock(u8* i_dataPtr) {
     mpParticleBlock = i_dataPtr;
     mParticleNum = *(u32*)mpParticleBlock >> 4 & 0xFFFFF;
@@ -85,8 +76,6 @@ u8* daBgObj_c::spec_data_c::initParticleBlock(u8* i_dataPtr) {
     return i_dataPtr + ((*(u32*)mpParticleBlock & 0xFFFFFF) + 4);
 }
 
-/* 80459814-80459840 000234 002C+00 1/1 0/0 0/0 .text
- * initSoundBlock__Q29daBgObj_c11spec_data_cFPUc                */
 u8* daBgObj_c::spec_data_c::initSoundBlock(u8* i_dataPtr) {
     mpSoundBlock = i_dataPtr;
     mSoundNum = *(u32*)mpSoundBlock >> 2 & 0x3FFFFF;
@@ -94,8 +83,6 @@ u8* daBgObj_c::spec_data_c::initSoundBlock(u8* i_dataPtr) {
     return i_dataPtr + ((*(u32*)mpSoundBlock & 0xFFFFFF) + 4);
 }
 
-/* 80459840-804598F4 000260 00B4+00 1/1 0/0 0/0 .text
- * initTexShareBlock__Q29daBgObj_c11spec_data_cFPUc             */
 u8* daBgObj_c::spec_data_c::initTexShareBlock(u8* i_dataPtr) {
     char sp48[64];
     char sp8[64];
@@ -122,15 +109,11 @@ u8* daBgObj_c::spec_data_c::initTexShareBlock(u8* i_dataPtr) {
     return dataPos;
 }
 
-/* 804598F4-80459904 000314 0010+00 1/1 0/0 0/0 .text
- * initFarInfoBlock__Q29daBgObj_c11spec_data_cFPUc              */
 u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) {
     mpFarInfoBlock = *(f32*)(i_dataPtr + 4);
     return i_dataPtr + 8;
 }
 
-/* 80459904-80459B64 000324 0260+00 1/1 0/0 1/1 .text            Set__Q29daBgObj_c11spec_data_cFPv
- */
 bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
     JUT_ASSERT(496, i_ptr != NULL);
 
@@ -262,22 +245,18 @@ bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
     return 1;
 }
 
-/* 80459B64-80459BB4 000584 0050+00 4/4 0/0 0/0 .text            release__9daBgObj_cFP4dBgW */
 void daBgObj_c::release(dBgW* param_0) {
     if (param_0 != NULL && param_0->ChkUsed()) {
         dComIfG_Bgsp().Release(param_0);
     }
 }
 
-/* 80459BB4-80459BEC 0005D4 0038+00 3/3 0/0 3/3 .text            regist__9daBgObj_cFP4dBgW */
 void daBgObj_c::regist(dBgW* param_0) {
     if (param_0 != NULL) {
         dComIfG_Bgsp().Regist(param_0, this);
     }
 }
 
-/* ############################################################################################## */
-/* 8045C9B8-8045C9FC 000000 0044+00 6/6 0/0 0/0 .rodata          l_cyl_src */
 static const dCcD_SrcCyl l_cyl_src = {
     {
         {0, {{0, 0, 0}, {0xD8400422, 0x11}, 0}},
@@ -292,7 +271,6 @@ static const dCcD_SrcCyl l_cyl_src = {
     },
 };
 
-/* 80459BEC-80459D0C 00060C 0120+00 1/1 0/0 0/1 .text            initAtt__9daBgObj_cFv */
 void daBgObj_c::initAtt() {
     u32 actor_params = 0;
     u32 cd3_val;
@@ -351,14 +329,11 @@ void daBgObj_c::initAtt() {
     eyePos.y += 0.5f * box->y;
 }
 
-/* 80459D0C-80459D3C 00072C 0030+00 2/2 0/0 0/0 .text setAttentionInfo__9daBgObj_cFP10fopAc_ac_c
- */
 void daBgObj_c::setAttentionInfo(fopAc_ac_c* param_0) {
     param_0->eyePos.y += 0.5f * fopAcM_getCullSizeBoxMax(this)->y;
     param_0->attention_info.position.y += fopAcM_getCullSizeBoxMax(this)->y;
 }
 
-/* 80459D3C-80459D94 00075C 0058+00 2/2 0/0 0/0 .text            initBaseMtx__9daBgObj_cFv */
 void daBgObj_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -366,7 +341,6 @@ void daBgObj_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80459D94-80459E04 0007B4 0070+00 2/2 0/0 0/0 .text            setBaseMtx__9daBgObj_cFv */
 void daBgObj_c::setBaseMtx() {
     for (int i = 0; i < 2; i++) {
         if (field_0x5a8[field_0xcc8][i] != NULL) {
@@ -375,7 +349,6 @@ void daBgObj_c::setBaseMtx() {
     }
 }
 
-/* 80459E04-80459F14 000824 0110+00 1/1 0/0 0/0 .text settingCullSizeBoxForCo__9daBgObj_cFi */
 void daBgObj_c::settingCullSizeBoxForCo(int param_0) {
     J3DModel* cur_model = field_0x5a8[param_0][0];
     if (cur_model != NULL) {
@@ -403,7 +376,6 @@ void daBgObj_c::settingCullSizeBoxForCo(int param_0) {
     }
 }
 
-/* 80459F14-8045A0EC 000934 01D8+00 3/3 0/0 0/0 .text settingCullSizeBoxForCull__9daBgObj_cFi */
 void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
     cXyz max(G_CM3D_F_INF, G_CM3D_F_INF, G_CM3D_F_INF);
     cXyz min(-G_CM3D_F_INF, -G_CM3D_F_INF, -G_CM3D_F_INF);
@@ -454,7 +426,6 @@ void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
     }
 }
 
-/* 8045A0EC-8045A160 000B0C 0074+00 1/0 0/0 0/0 .text            CreateInitType0__9daBgObj_cFv */
 int daBgObj_c::CreateInitType0() {
     field_0xcc8 = 0;
     initBaseMtx();
@@ -468,7 +439,6 @@ int daBgObj_c::CreateInitType0() {
     return 1;
 }
 
-/* 8045A160-8045A2B8 000B80 0158+00 3/0 0/0 0/0 .text            CreateInitType1__9daBgObj_cFv */
 int daBgObj_c::CreateInitType1() {
     if (fopAcM_isSwitch(this, daBgObj_prm::getSwBit(this))) {
         field_0xcc8 = 1;
@@ -509,7 +479,6 @@ int daBgObj_c::CreateInitType1() {
     return 1;
 }
 
-/* 8045CAE4-8045CB38 000020 0054+00 4/4 0/0 0/0 .data            l_tri_src */
 static dCcD_SrcTri l_tri_src = {
     {
         {0, {{0, 0, 0}, {0xD8400422, 0x11}, 0}},
@@ -526,10 +495,8 @@ static dCcD_SrcTri l_tri_src = {
     },
 };
 
-/* 8045CB38-8045CB3C -00001 0004+00 1/1 0/0 0/0 .data            l_specName */
 static char* l_specName = "spec.dat";
 
-/* 8045CB6C-8045CB9C 0000A8 0030+00 1/2 0/0 0/0 .data            mCreateHeapFunc__9daBgObj_c */
 createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
     &daBgObj_c::CreateHeapType0,
     &daBgObj_c::CreateHeapType1,
@@ -537,7 +504,6 @@ createHeapFunc daBgObj_c::mCreateHeapFunc[] = {
     &daBgObj_c::CreateHeapType1,
 };
 
-/* 8045CBCC-8045CBFC 000108 0030+00 1/2 0/0 0/0 .data            mCreateInitFunc__9daBgObj_c */
 createInitFunc daBgObj_c::mCreateInitFunc[] = {
     &daBgObj_c::CreateInitType0,
     &daBgObj_c::CreateInitType1,
@@ -545,12 +511,10 @@ createInitFunc daBgObj_c::mCreateInitFunc[] = {
     &daBgObj_c::CreateInitType1,
 };
 
-/* 8045A2B8-8045A2F0 000CD8 0038+00 1/0 0/0 0/0 .text            Create__9daBgObj_cFv */
 int daBgObj_c::Create() {
     return (this->*mCreateInitFunc[mSpecData.mSpecType])();
 }
 
-/* 8045CC2C-8045CC5C 000168 0030+00 1/2 0/0 0/0 .data            mExecuteFunc__9daBgObj_c */
 executeFunc daBgObj_c::mExecuteFunc[] = {
     &daBgObj_c::ExecuteType0,
     &daBgObj_c::ExecuteType1,
@@ -558,13 +522,11 @@ executeFunc daBgObj_c::mExecuteFunc[] = {
     &daBgObj_c::ExecuteType1,
 };
 
-/* 8045CC98-8045CCD4 0001D4 003C+00 1/2 0/0 0/0 .data            mTgSetFunc__9daBgObj_c */
 tgSetFunc daBgObj_c::mTgSetFunc[] = {
     &daBgObj_c::set_tri_0, &daBgObj_c::set_tri_1, &daBgObj_c::set_cyl_0,
     &daBgObj_c::set_tri_2, &daBgObj_c::set_tri_3,
 };
 
-/* 8045A2F0-8045A52C 000D10 023C+00 1/0 0/0 0/0 .text            CreateHeapType0__9daBgObj_cFv */
 int daBgObj_c::CreateHeapType0() {
     for (int i = 0; i < 2; i++) {
         J3DModelData* modelData =
@@ -614,7 +576,6 @@ int daBgObj_c::CreateHeapType0() {
     return 1;
 }
 
-/* 8045A574-8045A83C 000F94 02C8+00 3/0 0/0 0/0 .text            CreateHeapType1__9daBgObj_cFv */
 int daBgObj_c::CreateHeapType1() {
     for (int i = 0; i < 2; i++) {
         for (int j = 0; j < 2; j++) {
@@ -675,7 +636,6 @@ int daBgObj_c::CreateHeapType1() {
     return 1;
 }
 
-/* 8045A83C-8045A940 00125C 0104+00 2/2 0/0 0/0 .text            doShareTexture__9daBgObj_cFv */
 void daBgObj_c::doShareTexture() {
     char res_name[64];
     char share_res_name[64];
@@ -703,7 +663,6 @@ void daBgObj_c::doShareTexture() {
     }
 }
 
-/* 8045A940-8045A9E8 001360 00A8+00 1/0 0/0 0/0 .text            CreateHeap__9daBgObj_cFv */
 int daBgObj_c::CreateHeap() {
     const char* const specName = l_specName;
     void* spec_data_p = dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), specName);
@@ -717,7 +676,6 @@ int daBgObj_c::CreateHeap() {
     return (this->*mCreateHeapFunc[mSpecData.mSpecType])();
 }
 
-/* 8045A9E8-8045AAF0 001408 0108+00 1/1 0/0 0/0 .text            create1st__9daBgObj_cFv */
 int daBgObj_c::create1st() {
     if (field_0xcc9 == 0) {
         field_0xcca = home.angle.x;
@@ -748,7 +706,6 @@ int daBgObj_c::create1st() {
     return phase;
 }
 
-/* 8045AAF0-8045AB80 001510 0090+00 1/1 0/0 0/0 .text            setColCommon__9daBgObj_cFv */
 void daBgObj_c::setColCommon() {
     if (field_0xcc8 == 0) {
         (this->*mTgSetFunc[mSpecData.field_0x02])();
@@ -765,7 +722,6 @@ void daBgObj_c::setColCommon() {
     }
 }
 
-/* 8045AB80-8045ACC0 0015A0 0140+00 1/0 0/0 0/0 .text            set_tri_0__9daBgObj_cFv */
 void daBgObj_c::set_tri_0() {
     field_0xcc4 = 2;
     for (int i = 0; i < field_0xcc4; i++) {
@@ -788,7 +744,6 @@ void daBgObj_c::set_tri_0() {
     mTris[1].setPos(&cull_params[0], &cull_params[2], &cull_params[3]);
 }
 
-/* 8045ACC0-8045AE00 0016E0 0140+00 1/0 0/0 0/0 .text            set_tri_1__9daBgObj_cFv */
 void daBgObj_c::set_tri_1() {
     field_0xcc4 = 2;
     for (int i = 0; i < field_0xcc4; i++) {
@@ -811,7 +766,6 @@ void daBgObj_c::set_tri_1() {
     mTris[1].setPos(&cull_bounds[0], &cull_bounds[2], &cull_bounds[3]);
 }
 
-/* 8045AE00-8045AE98 001820 0098+00 1/0 0/0 0/0 .text            set_cyl_0__9daBgObj_cFv */
 void daBgObj_c::set_cyl_0() {
     field_0xcc4 = 0;
     mCyl.Set(l_cyl_src);
@@ -829,7 +783,6 @@ void daBgObj_c::set_cyl_0() {
     mCyl.SetR(radius);
 }
 
-/* 8045AE98-8045AFD4 0018B8 013C+00 1/0 0/0 0/0 .text            set_tri_2__9daBgObj_cFv */
 void daBgObj_c::set_tri_2() {
     field_0xcc4 = 2;
     for (int i = 0; i < field_0xcc4; i++) {
@@ -860,7 +813,6 @@ void daBgObj_c::set_tri_2() {
     mTris[1].setPos(&cull_bounds[0], &cull_bounds[2], &cull_bounds[3]);
 }
 
-/* 8045AFD4-8045B17C 0019F4 01A8+00 1/0 0/0 0/0 .text            set_tri_3__9daBgObj_cFv */
 void daBgObj_c::set_tri_3() {
     field_0xcc4 = 4;
     for (int i = 0; i < field_0xcc4; i++) {
@@ -919,7 +871,6 @@ struct blockItem {
     u8 envB;
 };
 
-/* 8045B17C-8045B3A0 001B9C 0224+00 3/3 0/0 0/0 .text            setParticle__9daBgObj_cFv */
 void daBgObj_c::setParticle() {
     u32 partNum = mSpecData.mParticleNum;
     u32* partBlockItems = (u32*)mSpecData.mpParticleBlock;
@@ -1016,7 +967,6 @@ void daBgObj_c::setParticle() {
     }
 }
 
-/* 8045B3A0-8045B44C 001DC0 00AC+00 3/3 0/0 0/0 .text            setSe__9daBgObj_cFv */
 void daBgObj_c::setSe() {
     u32 i = mSpecData.mSoundNum;
     u32* temp = (u32*)mSpecData.mpSoundBlock;
@@ -1029,7 +979,6 @@ void daBgObj_c::setSe() {
 }
 
 
-/* 8045B44C-8045B534 001E6C 00E8+00 1/1 0/0 0/0 .text            checkDestroy__9daBgObj_cFv */
 BOOL daBgObj_c::checkDestroy() {
     if (mSpecData.mSpecType != 1 && mSpecData.mSpecType != 2) {
         return false;
@@ -1049,8 +998,6 @@ BOOL daBgObj_c::checkDestroy() {
     return false;
 }
 
-/* 8045B534-8045B5E0 001F54 00AC+00 2/2 0/0 0/0 .text            checkHitAt__9daBgObj_cFP8cCcD_Obj
- */
 BOOL daBgObj_c::checkHitAt(cCcD_Obj* i_hitObj) {
     u32 hit_flags = 0;
     u32 var_r8 = 0;
@@ -1078,7 +1025,6 @@ BOOL daBgObj_c::checkHitAt(cCcD_Obj* i_hitObj) {
     return hit_flags != 0;
 }
 
-/* 8045B5E0-8045B7FC 002000 021C+00 1/1 0/0 0/0 .text            orderWait_tri__9daBgObj_cFv */
 void daBgObj_c::orderWait_tri() {
     for (int i = 0; i < field_0xcc4; i++) {
         if (mTris[i].ChkTgHit()) {
@@ -1123,7 +1069,6 @@ void daBgObj_c::orderWait_tri() {
 }
 
 
-/* 8045B7FC-8045B9C4 00221C 01C8+00 1/1 0/0 0/0 .text            orderWait_cyl__9daBgObj_cFv */
 void daBgObj_c::orderWait_cyl() {
     if (mCyl.ChkTgHit()) {
         cCcD_Obj* hitObj = mCyl.GetTgHitObj();
@@ -1163,7 +1108,6 @@ void daBgObj_c::orderWait_cyl() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 8045B9C4-8045BB38 0023E4 0174+00 1/1 0/0 0/0 .text            orderWait_spec__9daBgObj_cFv */
 void daBgObj_c::orderWait_spec() {
     setSe();
 
@@ -1195,7 +1139,6 @@ void daBgObj_c::orderWait_spec() {
 }
 
 
-/* 8045BB38-8045BBE0 002558 00A8+00 1/0 0/0 0/0 .text            actionOrderWait__9daBgObj_cFv */
 int daBgObj_c::actionOrderWait() {
     if (checkDestroy()) {
         switch (mSpecData.field_0x02) {
@@ -1217,7 +1160,6 @@ int daBgObj_c::actionOrderWait() {
     return 1;
 }
 
-/* 8045BBE0-8045BD50 002600 0170+00 1/0 0/0 0/0 .text            actionOrder__9daBgObj_cFv */
 int daBgObj_c::actionOrder() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(2);
@@ -1255,7 +1197,6 @@ int daBgObj_c::actionOrder() {
 }
 
 
-/* 8045BD50-8045BDB0 002770 0060+00 1/0 0/0 0/0 .text            actionEvent__9daBgObj_cFv */
 int daBgObj_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         setAction(3);
@@ -1265,12 +1206,10 @@ int daBgObj_c::actionEvent() {
     return 1;
 }
 
-/* 8045BDB0-8045BDB8 0027D0 0008+00 1/0 0/0 0/0 .text            actionWait__9daBgObj_cFv */
 int daBgObj_c::actionWait() {
     return 1;
 }
 
-/* 8045BDB8-8045BED0 0027D8 0118+00 1/0 0/0 0/0 .text            ExecuteType0__9daBgObj_cFv */
 int daBgObj_c::ExecuteType0() {
     u8 swBit = daBgObj_prm::getSwBit(this);
     u8 arg0 = daBgObj_prm::getObjArg0(this);
@@ -1302,7 +1241,6 @@ int daBgObj_c::ExecuteType0() {
     return 1;
 }
 
-/* 8045BED0-8045BFBC 0028F0 00EC+00 3/0 0/0 0/0 .text            ExecuteType1__9daBgObj_cFv */
 int daBgObj_c::ExecuteType1() {
     static actionFunc l_func[] = {&daBgObj_c::actionOrderWait, &daBgObj_c::actionOrder,
                                   &daBgObj_c::actionEvent, &daBgObj_c::actionWait};
@@ -1316,7 +1254,6 @@ int daBgObj_c::ExecuteType1() {
     return 1;
 }
 
-/* 8045BFBC-8045C078 0029DC 00BC+00 1/0 0/0 0/0 .text            Execute__9daBgObj_cFPPA3_A4_f */
 int daBgObj_c::Execute(Mtx** param_0) {
     (this->*mExecuteFunc[mSpecData.mSpecType])();
 
@@ -1335,7 +1272,6 @@ int daBgObj_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 8045C078-8045C25C 002A98 01E4+00 1/0 0/0 0/0 .text            Draw__9daBgObj_cFv */
 int daBgObj_c::Draw() {
     bool bvar = true;
     for (int i = 0; i < 2; i++) {
@@ -1379,8 +1315,6 @@ int daBgObj_c::Draw() {
     return 1;
 }
 
-/* 8045C25C-8045C2E8 002C7C 008C+00 1/1 0/0 0/0 .text            indirectProc__9daBgObj_cFP8J3DModel
- */
 void daBgObj_c::indirectProc(J3DModel* i_model) {
     if (i_model != NULL) {
         J3DModelData* modelData = i_model->getModelData();
@@ -1393,38 +1327,30 @@ void daBgObj_c::indirectProc(J3DModel* i_model) {
     }
 }
 
-/* 8045C2E8-8045C330 002D08 0048+00 1/0 0/0 0/0 .text            Delete__9daBgObj_cFv */
 int daBgObj_c::Delete() {
     release(mpBgW2);
     dComIfG_resDelete(&mPhase, daSetBgObj_c::getArcName(this));
     return 1;
 }
 
-/* 8045C330-8045C444 002D50 0114+00 1/0 0/0 0/0 .text            daBgObj_create1st__FP9daBgObj_c */
 static int daBgObj_create1st(daBgObj_c* i_this) {
     fopAcM_ct(i_this, daBgObj_c);
 
     return i_this->create1st();
 }
 
-/* 8045C744-8045C764 003164 0020+00 1/0 0/0 0/0 .text            daBgObj_MoveBGDelete__FP9daBgObj_c
- */
 static int daBgObj_MoveBGDelete(daBgObj_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8045C764-8045C784 003184 0020+00 1/0 0/0 0/0 .text            daBgObj_MoveBGExecute__FP9daBgObj_c
- */
 static int daBgObj_MoveBGExecute(daBgObj_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8045C784-8045C7B0 0031A4 002C+00 1/0 0/0 0/0 .text            daBgObj_MoveBGDraw__FP9daBgObj_c */
 static int daBgObj_MoveBGDraw(daBgObj_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 8045CD34-8045CD54 -00001 0020+00 1/0 0/0 0/0 .data            daBgObj_METHODS */
 static actor_method_class daBgObj_METHODS = {
     (process_method_func)daBgObj_create1st,
     (process_method_func)daBgObj_MoveBGDelete,
@@ -1433,7 +1359,6 @@ static actor_method_class daBgObj_METHODS = {
     (process_method_func)daBgObj_MoveBGDraw,
 };
 
-/* 8045CD54-8045CD84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BG_OBJ */
 extern actor_process_profile_definition g_profile_BG_OBJ = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp
index d87fece442..1d085066d3 100644
--- a/src/d/actor/d_a_boomerang.cpp
+++ b/src/d/actor/d_a_boomerang.cpp
@@ -14,8 +14,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 8049E0B8-8049E36C 000078 02B4+00 1/1 0/0 0/0 .text            createHeap__19daBoomerang_sight_cFv
- */
 int daBoomerang_sight_c::createHeap() {
     void* tmpData;
     JKRArchive* archive = dComIfG_getObjectResInfo(daAlink_c::getAlinkArcName())->getArchive();
@@ -103,19 +101,16 @@ int daBoomerang_sight_c::createHeap() {
     return 1;
 }
 
-/* 804A2850-804A285C 000000 000C+00 7/7 0/0 0/0 .rodata          @4078 */
 // unused
 static u8 const lit_4078[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804A285C-804A2868 00000C 000C+00 0/0 0/0 0/0 .rodata          l_blurTop */
 // unused
 static u8 const l_blurTop[12] = {
     0x42, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804A2868-804A287A 000018 000C+06 0/0 0/0 0/0 .rodata          l_blurRoot */
 // unused
 static u8 const l_blurRoot[12] = {
     0xC2,
@@ -142,27 +137,18 @@ static const u8 lbl_46_rodata_24[6] = {
     0x1E,
 };
 
-/* 804A287A-804A287C 00002A 0002+00 0/0 0/0 0/0 .rodata m_lockWaitTime__18daBoomerang_HIO_c0 */
 const u16 daBoomerang_HIO_c0::m_lockWaitTime = 10;
 
-/* 804A287C-804A2880 00002C 0004+00 0/0 0/0 0/0 .rodata          m_minCircleR__18daBoomerang_HIO_c0
- */
 const f32 daBoomerang_HIO_c0::m_minCircleR = 28.0f;
 
-/* 804A2880-804A2884 000030 0004+00 0/0 0/0 0/0 .rodata m_middleCircleR__18daBoomerang_HIO_c0 */
 const f32 daBoomerang_HIO_c0::m_middleCircleR = 35.0f;
 
-/* 804A2884-804A2888 000034 0004+00 0/0 0/0 0/0 .rodata          m_maxCircleR__18daBoomerang_HIO_c0
- */
 const f32 daBoomerang_HIO_c0::m_maxCircleR = 80.0f;
 
-/* 804A2888-804A288C 000038 0004+00 0/0 0/0 0/0 .rodata          m_scale__18daBoomerang_HIO_c0 */
 const f32 daBoomerang_HIO_c0::m_scale = 3.0f / 5.0f;
 
-/* 804A288C-804A2890 00003C 0004+00 0/0 0/0 0/0 .rodata m_lockWindScale__18daBoomerang_HIO_c0 */
 const f32 daBoomerang_HIO_c0::m_lockWindScale = 2.0f;
 
-/* 804A2890-804A28A4 000040 0014+00 0/1 0/0 0/0 .rodata          l_lockSeFlg */
 static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = {
     Z2SE_SY_BOOM_LOCK_ON_1,
     Z2SE_SY_BOOM_LOCK_ON_2,
@@ -171,8 +157,6 @@ static const u32 l_lockSeFlg[BOOMERANG_LOCK_MAX] = {
     Z2SE_SY_BOOM_LOCK_ON_5,
 };
 
-/* 8049E36C-8049EB64 00032C 07F8+00 1/1 0/0 0/0 .text            initialize__19daBoomerang_sight_cFv
- */
 void daBoomerang_sight_c::initialize() {
     m_cursorYellowAllPane = m_cursorYellowScrn->search('n_all');
     m_cursorYellow0Pane = m_cursorYellowScrn->search('cursor0');
@@ -267,8 +251,6 @@ void daBoomerang_sight_c::initialize() {
     m_cursorOrangeAllPane->setUserInfo(' ');
 }
 
-/* 8049EB64-8049EDA8 000B24 0244+00 1/1 0/0 0/0 .text            playAnime__19daBoomerang_sight_cFii
- */
 int daBoomerang_sight_c::playAnime(int param_0, int param_1) {
     int i;
     f32* var_r30 = field_0x98;
@@ -317,8 +299,6 @@ int daBoomerang_sight_c::playAnime(int param_0, int param_1) {
     return cLib_chaseUC(alpha_p, 0, 30);
 }
 
-/* 8049EDA8-8049EDE8 000D68 0040+00 2/2 0/0 0/0 .text            initFrame__19daBoomerang_sight_cFi
- */
 void daBoomerang_sight_c::initFrame(int i_no) {
     m_alpha[i_no] = 0;
     field_0x98[i_no] = 4.0f;
@@ -329,7 +309,6 @@ void daBoomerang_sight_c::initFrame(int i_no) {
     }
 }
 
-/* 8049EDE8-8049EE8C 000DA8 00A4+00 1/1 0/0 0/0 .text copyNumData__19daBoomerang_sight_cFi */
 void daBoomerang_sight_c::copyNumData(int i_no) {
     int next_no = i_no + 1;
 
@@ -351,7 +330,6 @@ void daBoomerang_sight_c::copyNumData(int i_no) {
     m_pos[next_no] = temp_pos;
 }
 
-/* 8049EEC8-8049EF60 000E88 0098+00 1/1 0/0 0/0 .text setSight__19daBoomerang_sight_cFPC4cXyzi */
 void daBoomerang_sight_c::setSight(const cXyz* i_pos, int i_no) {
     if (m_alpha[i_no]) {
         if (i_pos != NULL) {
@@ -365,7 +343,6 @@ void daBoomerang_sight_c::setSight(const cXyz* i_pos, int i_no) {
     }
 }
 
-/* 8049EF60-8049F280 000F20 0320+00 1/0 0/0 0/0 .text            draw__19daBoomerang_sight_cFv */
 void daBoomerang_sight_c::draw() {
     J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
     u8* alpha_p = m_alpha;
@@ -433,7 +410,6 @@ void daBoomerang_sight_c::draw() {
     }
 }
 
-/* 8049F280-8049F360 001240 00E0+00 1/1 0/0 0/0 .text windModelCallBack__13daBoomerang_cFv */
 void daBoomerang_c::windModelCallBack() {
     mDoMtx_stack_c::YrotS(shape_angle.y);
     mDoMtx_stack_c::ZrotM(-shape_angle.z);
@@ -449,8 +425,6 @@ void daBoomerang_c::windModelCallBack() {
     mp_shippuModel->setAnmMtx(4, mDoMtx_stack_c::get());
 }
 
-/* 8049F360-8049F39C 001320 003C+00 1/1 0/0 0/0 .text daBoomeang_windModelCallBack__FP8J3DJointi
- */
 static int daBoomeang_windModelCallBack(J3DJoint* i_joint, int param_1) {
     daBoomerang_c* boomerang = (daBoomerang_c*)j3dSys.getModel()->getUserArea();
     if (param_1 == 0) {
@@ -460,7 +434,6 @@ static int daBoomeang_windModelCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8049F39C-8049F5D4 00135C 0238+00 1/1 0/0 0/0 .text            draw__13daBoomerang_cFv */
 int daBoomerang_c::draw() {
     if (!checkStateFlg0(FLG0_4)) {
         for (int i = 0; i < BOOMERANG_LOCK_MAX; i++) {
@@ -517,14 +490,10 @@ int daBoomerang_c::draw() {
     return 1;
 }
 
-/* 8049F5D4-8049F5F4 001594 0020+00 1/0 0/0 0/0 .text            daBoomerang_Draw__FP13daBoomerang_c
- */
 static int daBoomerang_Draw(daBoomerang_c* i_this) {
     return i_this->draw();
 }
 
-/* 8049F5F4-8049F63C 0015B4 0048+00 1/1 0/0 0/0 .text
- * lockLineCallback__13daBoomerang_cFP10fopAc_ac_c              */
 void daBoomerang_c::lockLineCallback(fopAc_ac_c* i_actor) {
     if (i_actor != NULL && fopAcM_GetName(i_actor) != PROC_Obj_glowSphere &&
         fopAcM_GetName(i_actor) != PROC_E_VT && fopAcM_GetName(i_actor) != PROC_OBJ_BRG)
@@ -533,16 +502,12 @@ void daBoomerang_c::lockLineCallback(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8049F63C-8049F660 0015FC 0024+00 1/1 0/0 0/0 .text
- * daBoomerang_lockLineCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daBoomerang_lockLineCallback(fopAc_ac_c* i_actorP1, dCcD_GObjInf* param_1,
                                          fopAc_ac_c* i_actorP2, dCcD_GObjInf* param_3) {
     daBoomerang_c* boomerang = (daBoomerang_c*)i_actorP1;
     boomerang->lockLineCallback(i_actorP2);
 }
 
-/* 8049F660-8049F6EC 001620 008C+00 1/1 0/0 0/0 .text
- * moveLineCallback__13daBoomerang_cFP10fopAc_ac_c              */
 void daBoomerang_c::moveLineCallback(fopAc_ac_c* i_actor) {
     if (i_actor != NULL) {
         for (int i = 0; i < BOOMERANG_LOCK_MAX; i++) {
@@ -560,15 +525,12 @@ void daBoomerang_c::moveLineCallback(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8049F6EC-8049F710 0016AC 0024+00 1/1 0/0 0/0 .text
- * daBoomerang_moveLineCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daBoomerang_moveLineCallback(fopAc_ac_c* i_actorP1, dCcD_GObjInf* param_1,
                                          fopAc_ac_c* i_actorP2, dCcD_GObjInf* param_3) {
     daBoomerang_c* boomerang = (daBoomerang_c*)i_actorP1;
     boomerang->moveLineCallback(i_actorP2);
 }
 
-/* 8049F710-8049F818 0016D0 0108+00 3/3 0/0 0/0 .text            pushLockList__13daBoomerang_cFi */
 void daBoomerang_c::pushLockList(int param_0) {
     if (param_0 == 0) {
         m_sight.offRedSight();
@@ -596,8 +558,6 @@ void daBoomerang_c::pushLockList(int param_0) {
     }
 }
 
-/* 8049F818-8049F874 0017D8 005C+00 1/0 0/0 0/0 .text
- * cancelLockActorBase__13daBoomerang_cFP10fopAc_ac_c           */
 void daBoomerang_c::cancelLockActorBase(fopAc_ac_c* i_actor) {
     for (int i = 0; i < m_lockCnt; i++) {
         if (m_lockActors[i] == i_actor) {
@@ -607,8 +567,6 @@ void daBoomerang_c::cancelLockActorBase(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8049F874-8049F8B0 001834 003C+00 1/0 0/0 0/0 .text
- * setAimActorBase__13daBoomerang_cFP10fopAc_ac_c               */
 void daBoomerang_c::setAimActorBase(fopAc_ac_c* i_actor) {
     if (m_lockCnt == 0) {
         onStateFlg0(FLG0_4);
@@ -616,8 +574,6 @@ void daBoomerang_c::setAimActorBase(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8049F8B0-8049F9A4 001870 00F4+00 2/2 0/0 0/0 .text setLockActor__13daBoomerang_cFP10fopAc_ac_ci
- */
 int daBoomerang_c::setLockActor(fopAc_ac_c* i_actor, BOOL i_isLockline) {
     if (m_lockCnt >= BOOMERANG_LOCK_MAX) {
         return 0;
@@ -648,8 +604,6 @@ int daBoomerang_c::setLockActor(fopAc_ac_c* i_actor, BOOL i_isLockline) {
     return 1;
 }
 
-/* 8049F9A4-8049F9F0 001964 004C+00 3/3 0/0 0/0 .text            resetLockActor__13daBoomerang_cFv
- */
 void daBoomerang_c::resetLockActor() {
     for (int i = 0; i < BOOMERANG_LOCK_MAX; i++) {
         m_lockActorIDs[i] = fpcM_ERROR_PROCESS_ID_e;
@@ -661,7 +615,6 @@ void daBoomerang_c::resetLockActor() {
     field_0x951 = 0;
 }
 
-/* 8049F9F0-8049FAA4 0019B0 00B4+00 2/2 0/0 0/0 .text            setRoomInfo__13daBoomerang_cFv */
 void daBoomerang_c::setRoomInfo() {
     m_gndChk.SetPos(&current.pos);
     mGroundY = dComIfG_Bgsp().GroundCross(&m_gndChk);
@@ -680,7 +633,6 @@ void daBoomerang_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, roomNo);
 }
 
-/* 8049FAA4-8049FBAC 001A64 0108+00 2/2 0/0 0/0 .text            setKeepMatrix__13daBoomerang_cFv */
 void daBoomerang_c::setKeepMatrix() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -696,7 +648,6 @@ void daBoomerang_c::setKeepMatrix() {
     mp_setboomEfModel->setBaseTRMtx(player->getLeftItemMatrix());
 }
 
-/* 8049FBAC-8049FCD0 001B6C 0124+00 1/1 0/0 0/0 .text            setMoveMatrix__13daBoomerang_cFv */
 void daBoomerang_c::setMoveMatrix() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -721,7 +672,6 @@ void daBoomerang_c::setMoveMatrix() {
     mp_boomModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8049FCD0-8049FD6C 001C90 009C+00 1/1 0/0 0/0 .text            setRotAngle__13daBoomerang_cFv */
 void daBoomerang_c::setRotAngle() {
     s16 prev_rot = m_modelRotY;
 
@@ -731,7 +681,6 @@ void daBoomerang_c::setRotAngle() {
     }
 }
 
-/* 8049FD6C-8049FE6C 001D2C 0100+00 2/2 0/0 0/0 .text            setAimPos__13daBoomerang_cFv */
 void daBoomerang_c::setAimPos() {
     if (checkStateFlg0(FLG0_1)) {
         if (fopAcM_GetParam(this) != 1)
@@ -758,7 +707,6 @@ void daBoomerang_c::setAimPos() {
     }
 }
 
-/* 8049FE6C-804A006C 001E2C 0200+00 2/2 0/0 0/0 .text checkBgHit__13daBoomerang_cFP4cXyzP4cXyz */
 void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
     m_lineChk.Set(i_start, i_end, this);
     if (dComIfG_Bgsp().LineCross(&m_lineChk)) {
@@ -813,8 +761,6 @@ void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
     }
 }
 
-/* 804A006C-804A012C 00202C 00C0+00 1/1 0/0 0/0 .text setEffectTraceMatrix__13daBoomerang_cFPUlUs
- */
 JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* i_emitterID, u16 i_name) {
     *i_emitterID = dComIfGp_particle_set(*i_emitterID, i_name, &current.pos, &tevStr);
 
@@ -826,10 +772,8 @@ JPABaseEmitter* daBoomerang_c::setEffectTraceMatrix(u32* i_emitterID, u16 i_name
     return emitter;
 }
 
-/* 804A2D10-804A2D14 000040 0001+03 0/0 0/0 0/0 .bss             l_HIO */
 static daBoomerang_HIO_c0 l_HIO;
 
-/* 804A012C-804A082C 0020EC 0700+00 1/1 0/0 0/0 .text            setEffect__13daBoomerang_cFv */
 void daBoomerang_c::setEffect() {
     static JGeometry::TVec3<f32> effDirection(0.0f, 1.0f, 0.0f);
     static JGeometry::TVec3<f32> effScale0(1.5f, 1.5f, 1.5f);
@@ -935,7 +879,6 @@ void daBoomerang_c::setEffect() {
     }
 }
 
-/* 804A0874-804A0F0C 002834 0698+00 2/0 0/0 0/0 .text            procWait__13daBoomerang_cFv */
 int daBoomerang_c::procWait() {
     daAlink_c* player = daAlink_getAlinkActorClass();
     speedF = 0.0f;
@@ -1086,7 +1029,6 @@ int daBoomerang_c::procWait() {
     return 1;
 }
 
-/* 804A0F0C-804A1814 002ECC 0908+00 2/1 0/0 0/0 .text            procMove__13daBoomerang_cFv */
 int daBoomerang_c::procMove() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -1284,7 +1226,6 @@ int daBoomerang_c::procMove() {
     return 1;
 }
 
-/* 804A1814-804A1BD4 0037D4 03C0+00 1/1 0/0 0/0 .text            execute__13daBoomerang_cFv */
 int daBoomerang_c::execute() {
     if (field_0x957 != 0) {
         current.pos = field_0x9b8;
@@ -1391,23 +1332,19 @@ int daBoomerang_c::execute() {
     return 1;
 }
 
-/* 804A1BD4-804A1BF4 003B94 0020+00 1/0 0/0 0/0 .text daBoomerang_Execute__FP13daBoomerang_c */
 static int daBoomerang_Execute(daBoomerang_c* i_this) {
     return i_this->execute();
 }
 
-/* 804A1BF4-804A1EBC 003BB4 02C8+00 1/1 0/0 0/0 .text            __dt__13daBoomerang_cFv */
 daBoomerang_c::~daBoomerang_c() {
     m_sound.deleteObject();
 }
 
-/* 804A1EBC-804A1EE4 003E7C 0028+00 1/0 0/0 0/0 .text daBoomerang_Delete__FP13daBoomerang_c */
 static int daBoomerang_Delete(daBoomerang_c* i_this) {
     i_this->~daBoomerang_c();
     return 1;
 }
 
-/* 804A1EE4-804A2064 003EA4 0180+00 1/1 0/0 0/0 .text            createHeap__13daBoomerang_cFv */
 int daBoomerang_c::createHeap() {
     if (!m_sight.createHeap()) {
         return 0;
@@ -1445,12 +1382,10 @@ int daBoomerang_c::createHeap() {
     return 1;
 }
 
-/* 804A2064-804A2084 004024 0020+00 1/1 0/0 0/0 .text daBoomerang_createHeap__FP10fopAc_ac_c */
 static int daBoomerang_createHeap(fopAc_ac_c* i_this) {
     return ((daBoomerang_c*)i_this)->createHeap();
 }
 
-/* 804A2B14-804A2B60 000038 004C+00 0/1 0/0 0/0 .data            l_atCpsSrc */
 static dCcD_SrcCps l_atCpsSrc = {
     {
         {0, {{AT_TYPE_BOOMERANG, 0, 0x3B}, {0, 0}, 0}},
@@ -1467,7 +1402,6 @@ static dCcD_SrcCps l_atCpsSrc = {
     }
 };
 
-/* 804A2B60-804A2BA4 000084 0044+00 0/1 0/0 0/0 .data            l_windAtCylSrc */
 static dCcD_SrcCyl l_windAtCylSrc = {
     {
         {0, {{AT_TYPE_BOOMERANG, 0, 0x1B}, {0, 0}, 0}},
@@ -1482,7 +1416,6 @@ static dCcD_SrcCyl l_windAtCylSrc = {
     }
 };
 
-/* 804A2084-804A230C 004044 0288+00 1/1 0/0 0/0 .text            create__13daBoomerang_cFv */
 int daBoomerang_c::create() {
     fpc_ProcID id = fopAcM_GetID(this);
     fopAcM_ct(this, daBoomerang_c);
@@ -1547,16 +1480,12 @@ int daBoomerang_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804A230C-804A2524 0042CC 0218+00 1/1 0/0 0/0 .text            __ct__13daBoomerang_cFv */
 daBoomerang_c::daBoomerang_c() {}
 
-/* 804A26F8-804A2718 0046B8 0020+00 1/0 0/0 0/0 .text            daBoomerang_Create__FP10fopAc_ac_c
- */
 static int daBoomerang_Create(fopAc_ac_c* i_this) {
     return ((daBoomerang_c*)i_this)->create();
 }
 
-/* 804A2BC8-804A2BE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daBoomerang_Method */
 static actor_method_class l_daBoomerang_Method = {
     (process_method_func)daBoomerang_Create,
     (process_method_func)daBoomerang_Delete,
@@ -1565,7 +1494,6 @@ static actor_method_class l_daBoomerang_Method = {
     (process_method_func)daBoomerang_Draw,
 };
 
-/* 804A2BE8-804A2C18 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BOOMERANG */
 extern actor_process_profile_definition g_profile_BOOMERANG = {
   fpcLy_CURRENT_e,       // mLayerID
   6,                     // mListID
diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp
index db77058876..c166293f76 100644
--- a/src/d/actor/d_a_bullet.cpp
+++ b/src/d/actor/d_a_bullet.cpp
@@ -8,16 +8,12 @@
 #include "d/actor/d_a_bullet.h"
 #include "d/d_com_inf_game.h"
 
-/* 8065678C-80656790 -00001 0004+00 1/1 0/0 0/0 .data            l_resFileNameList */
 static char* l_resFileNameList[] = {"Hanjo1"};
 
-/* 80656790-80656794 -00001 0004+00 1/2 0/0 0/0 .data            l_bmdFileNameList */
 static char* l_bmdFileNameList[] = {"hanjo_stone.bmd"};
 
-/* 806568CC-806568D0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daBullet_Param_c l_HIO;
 
-/* 80656714-80656744 000000 0030+00 2/2 0/0 0/0 .rodata          mCcDObjInfo__10daBullet_c */
 const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
@@ -25,7 +21,6 @@ const dCcD_SrcGObjInf daBullet_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80656794-806567D4 000008 0040+00 2/2 0/0 0/0 .data            mCcDSph__10daBullet_c */
 dCcD_SrcSph daBullet_c::mCcDSph = {
     daBullet_c::mCcDObjInfo,
     {
@@ -33,12 +28,10 @@ dCcD_SrcSph daBullet_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 8065594C-80655B08 0000EC 01BC+00 1/0 0/0 0/0 .text            __dt__10daBullet_cFv */
 daBullet_c::~daBullet_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80655B08-80655C90 0002A8 0188+00 1/1 0/0 0/0 .text            create__10daBullet_cFv */
 int daBullet_c::create() {
     fopAcM_ct(this, daBullet_c);
     mType = getTypeFromParam();
@@ -55,7 +48,6 @@ int daBullet_c::create() {
     return phase_state;
 }
 
-/* 80655E5C-80655EDC 0005FC 0080+00 1/1 0/0 0/0 .text            CreateHeap__10daBullet_cFv */
 BOOL daBullet_c::CreateHeap() {
     void* mdlData_p = dComIfG_getObjectRes(getResName(), getBmdName());
     JUT_ASSERT(273, NULL != mdlData_p);
@@ -63,14 +55,12 @@ BOOL daBullet_c::CreateHeap() {
     return mpModel != NULL;
 }
 
-/* 80655EDC-80655F10 00067C 0034+00 1/1 0/0 0/0 .text            Delete__10daBullet_cFv */
 int daBullet_c::Delete() {
     fopAcM_GetID(this);
     this->~daBullet_c();
     return 1;
 }
 
-/* 80656744-8065675C 000030 0018+00 1/2 0/0 0/0 .rodata          m__16daBullet_Param_c */
 daBullet_HIOParam const daBullet_Param_c::m = {
     -3.0f,
     255.0f,
@@ -80,7 +70,6 @@ daBullet_HIOParam const daBullet_Param_c::m = {
     0x708,
 };
 
-/* 80655F10-806560FC 0006B0 01EC+00 2/2 0/0 0/0 .text            Execute__10daBullet_cFv */
 int daBullet_c::Execute() {
     gravity = daBullet_Param_c::m.gravity;
 
@@ -122,7 +111,6 @@ int daBullet_c::Execute() {
     return 1;
 }
 
-/* 806560FC-80656160 00089C 0064+00 1/1 0/0 0/0 .text            Draw__10daBullet_cFv */
 int daBullet_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -130,23 +118,18 @@ int daBullet_c::Draw() {
     return 1;
 }
 
-/* 80656160-80656180 000900 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daBullet_cFP10fopAc_ac_c               */
 int daBullet_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daBullet_c*)i_this)->CreateHeap();
 }
 
-/* 80656180-80656198 000920 0018+00 3/3 0/0 0/0 .text            getResName__10daBullet_cFv */
 const char* daBullet_c::getResName() {
     return l_resFileNameList[mType];
 }
 
-/* 80656198-806561B0 000938 0018+00 1/1 0/0 0/0 .text            getBmdName__10daBullet_cFv */
 const char* daBullet_c::getBmdName() {
     return l_bmdFileNameList[mType];
 }
 
-/* 806561B0-806561D0 000950 0020+00 1/1 0/0 0/0 .text            getTypeFromParam__10daBullet_cFv */
 int daBullet_c::getTypeFromParam() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm) {
@@ -167,7 +150,6 @@ static f32 dummyLiteral2() {
     return 0.0f;
 }
 
-/* 806561D0-80656378 000970 01A8+00 1/1 0/0 0/0 .text            initialize__10daBullet_cFv */
 void daBullet_c::initialize() {
     mpModel->getModelData();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -188,8 +170,6 @@ void daBullet_c::initialize() {
     Execute();
 }
 
-/* 80656378-80656420 000B18 00A8+00 2/2 0/0 0/0 .text
- * setProcess__10daBullet_cFM10daBullet_cFPCvPvPv_i             */
 int daBullet_c::setProcess(daBullet_c::processFn i_process) {
     mMode = 2;
     if (mProcess != NULL) {
@@ -206,7 +186,6 @@ int daBullet_c::setProcess(daBullet_c::processFn i_process) {
     return 1;
 }
 
-/* 80656420-806564B8 000BC0 0098+00 1/0 0/0 0/0 .text            wait__10daBullet_cFPv */
 int daBullet_c::wait(void*) {
     switch (mMode) {
     case 0:
@@ -224,7 +203,6 @@ int daBullet_c::wait(void*) {
     return 1;
 }
 
-/* 806564B8-80656548 000C58 0090+00 1/0 0/0 0/0 .text            move__10daBullet_cFPv */
 int daBullet_c::move(void*) {
     switch (mMode) {
     case 0:
@@ -244,32 +222,26 @@ int daBullet_c::move(void*) {
     return 1;
 }
 
-/* 80656548-80656568 000CE8 0020+00 1/0 0/0 0/0 .text            daBullet_Create__FPv */
 static int daBullet_Create(void* i_this) {
     return ((daBullet_c*)i_this)->create();
 }
 
-/* 80656568-80656588 000D08 0020+00 1/0 0/0 0/0 .text            daBullet_Delete__FPv */
 static int daBullet_Delete(void* i_this) {
     return ((daBullet_c*)i_this)->Delete();
 }
 
-/* 80656588-806565A8 000D28 0020+00 1/0 0/0 0/0 .text            daBullet_Execute__FPv */
 static int daBullet_Execute(void* i_this) {
     return ((daBullet_c*)i_this)->Execute();
 }
 
-/* 806565A8-806565C8 000D48 0020+00 1/0 0/0 0/0 .text            daBullet_Draw__FPv */
 static int daBullet_Draw(void* i_this) {
     return ((daBullet_c*)i_this)->Draw();
 }
 
-/* 806565C8-806565D0 000D68 0008+00 1/0 0/0 0/0 .text            daBullet_IsDelete__FPv */
 static int daBullet_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 806567EC-8065680C -00001 0020+00 1/0 0/0 0/0 .data            daBullet_MethodTable */
 static actor_method_class daBullet_MethodTable = {
     (process_method_func)daBullet_Create,
     (process_method_func)daBullet_Delete,
@@ -278,7 +250,6 @@ static actor_method_class daBullet_MethodTable = {
     (process_method_func)daBullet_Draw,
 };
 
-/* 8065680C-8065683C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BULLET */
 extern actor_process_profile_definition g_profile_BULLET = {
   fpcLy_CURRENT_e,        // mLayerID
   8,                      // mListID
diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp
index 556c75b989..2847607a5d 100644
--- a/src/d/actor/d_a_canoe.cpp
+++ b/src/d/actor/d_a_canoe.cpp
@@ -19,8 +19,6 @@
 static BOOL l_debugMode; 
 #endif
 
-/* 804DA54C-804DA5B8 0000EC 006C+00 1/1 0/0 0/0 .text daCanoe_searchTagWaterFall__FP10fopAc_ac_cPv
- */
 static BOOL daCanoe_searchTagWaterFall(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_Tag_WaterFall) {
         if (((daTagWaterFall_c*)i_actor)->checkHitWaterFall(*(cXyz*)i_data)) {
@@ -31,7 +29,6 @@ static BOOL daCanoe_searchTagWaterFall(fopAc_ac_c* i_actor, void* i_data) {
     return TRUE;
 }
 
-/* 804DA5F4-804DA720 000194 012C+00 1/1 0/0 0/0 .text            createHeap__9daCanoe_cFv */
 int daCanoe_c::createHeap() {
     void* modelData = dComIfG_getObjectRes(mArcName, 4);
     void* paddleModelData = dComIfG_getObjectRes(mArcName, 3);
@@ -59,30 +56,22 @@ int daCanoe_c::createHeap() {
     return 1;
 }
 
-/* 804DA720-804DA740 0002C0 0020+00 1/1 0/0 0/0 .text            daCanoe_createHeap__FP10fopAc_ac_c
- */
 static int daCanoe_createHeap(fopAc_ac_c* i_this) {
     return ((daCanoe_c*)i_this)->createHeap();
 }
 
-/* 804DD5DC-804DD5E8 000000 000C+00 8/8 0/0 0/0 .rodata          @3766 */
 static u8 const lit_3766[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804DD5E8-804DD5F0 00000C 0006+02 0/1 0/0 0/0 .rodata          l_arcName */
 static const char l_arcName[] = "Canoe";
 
-/* 804DD5F0-804DD5F8 000014 0007+01 0/1 0/0 0/0 .rodata          l_arcName2 */
 static const char l_arcName2[] = "CanoeB";
 
-/* 804DD5F8-804DD600 00001C 0008+00 0/1 0/0 0/0 .rodata          l_arcName3 */
 static const char l_arcName3[] = "CanoeE3";
 
-/* 804DD600-804DD614 000024 0014+00 2/3 0/0 0/0 .rodata          l_cylOffsetZ */
 static const f32 l_cylOffsetZ[5] = {200.0f, 110.0f, 20.0f, -70.0f, -160.0f};
 
-/* 804DD6F0-804DD734 000000 0044+00 1/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x10}, 0x79}}, // mObj
@@ -97,7 +86,6 @@ static dCcD_SrcCyl l_cylSrc = {
     } // mCyl
 };
 
-/* 804DA740-804DAB18 0002E0 03D8+00 1/1 0/0 0/0 .text            create__9daCanoe_cFv */
 int daCanoe_c::create() {
     fopAcM_ct(this, daCanoe_c);
 
@@ -176,27 +164,23 @@ int daCanoe_c::create() {
     return phase_state;
 }
 
-/* 804DAE88-804DAEA8 000A28 0020+00 1/0 0/0 0/0 .text            daCanoe_Create__FP10fopAc_ac_c */
 static int daCanoe_Create(fopAc_ac_c* i_this) {
     daCanoe_c* a_this = (daCanoe_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
-/* 804DAEA8-804DAFE0 000A48 0138+00 1/1 0/0 0/0 .text            __dt__9daCanoe_cFv */
 daCanoe_c::~daCanoe_c() {
     dComIfG_resDelete(&mPhaseReq, mArcName);
     mSound.deleteObject();
 }
 
-/* 804DAFE0-804DB008 000B80 0028+00 1/0 0/0 0/0 .text            daCanoe_Delete__FP9daCanoe_c */
 static int daCanoe_Delete(daCanoe_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->~daCanoe_c();
     return 1;
 }
 
-/* 804DB008-804DB0B0 000BA8 00A8+00 1/1 0/0 0/0 .text            setRoomInfo__9daCanoe_cFv */
 void daCanoe_c::setRoomInfo() {
     int room_no;
     if (mAcch[0].GetGroundH() != -G_CM3D_F_INF) {
@@ -214,7 +198,6 @@ void daCanoe_c::setRoomInfo() {
     }
 }
 
-/* 804DB0B0-804DB3F4 000C50 0344+00 2/2 0/0 0/0 .text            setMatrix__9daCanoe_cFv */
 void daCanoe_c::setMatrix() {
     f32 var_f29;
     if (mShapeOffsetY > 5.0f) {
@@ -280,7 +263,6 @@ void daCanoe_c::setMatrix() {
     eyePos = attention_info.position;
 }
 
-/* 804DB3F4-804DB578 000F94 0184+00 1/1 0/0 0/0 .text            setCollision__9daCanoe_cFv */
 void daCanoe_c::setCollision() {
     mCcStts.Move();
 
@@ -313,7 +295,6 @@ void daCanoe_c::setCollision() {
     }
 }
 
-/* 804DB578-804DB754 001118 01DC+00 1/1 0/0 0/0 .text            posMove__9daCanoe_cFv */
 void daCanoe_c::posMove() {
     f32 move_speed = speedF * cM_scos(field_0x1448);
     current.pos.x += move_speed * cM_ssin(current.angle.y);
@@ -343,15 +324,12 @@ void daCanoe_c::posMove() {
     current.pos.z += mWaterSpeed.z;
 }
 
-/* 804DB754-804DB7AC 0012F4 0058+00 2/2 0/0 0/0 .text checkGomikabe__9daCanoe_cFR13cBgS_PolyInfo
- */
 void daCanoe_c::checkGomikabe(cBgS_PolyInfo& i_polyinfo) {
     if (daAlink_c::getMoveBGActorName(i_polyinfo, 1) == PROC_Obj_GOMIKABE) {
         ((daObjGOMIKABE_c*)dComIfG_Bgsp().GetActorPointer(i_polyinfo))->BreakSet();
     }
 }
 
-/* 804DB7AC-804DB828 00134C 007C+00 3/3 0/0 0/0 .text            setFrontBackPos__9daCanoe_cFv */
 void daCanoe_c::setFrontBackPos() {
     f32 temp_f31 = cM_ssin(shape_angle.y);
     f32 temp_f1 = cM_scos(shape_angle.y);
@@ -359,7 +337,6 @@ void daCanoe_c::setFrontBackPos() {
     mBackPos.set(current.pos.x + (l_cylOffsetZ[4] * temp_f31), current.pos.y, current.pos.z + (l_cylOffsetZ[4] * temp_f1));
 }
 
-/* 804DB828-804DC2E8 0013C8 0AC0+00 1/1 0/0 0/0 .text            frontBackBgCheck__9daCanoe_cFv */
 void daCanoe_c::frontBackBgCheck() {
     setFrontBackPos();
     mAcch[1].CrrPos(dComIfG_Bgsp());
@@ -553,7 +530,6 @@ void daCanoe_c::frontBackBgCheck() {
     }
 }
 
-/* 804DC330-804DC554 001ED0 0224+00 1/1 0/0 0/0 .text            setPaddleEffect__9daCanoe_cFv */
 void daCanoe_c::setPaddleEffect() {
     static cXyz paddleRippleScale(0.7f, 0.7f, 0.7f);
 
@@ -605,8 +581,6 @@ void daCanoe_c::setPaddleEffect() {
     }
 }
 
-/* 804DC554-804DC7B4 0020F4 0260+00 1/1 0/0 0/0 .text            setCanoeSliderEffect__9daCanoe_cFv
- */
 void daCanoe_c::setCanoeSliderEffect() {
     if (daAlink_getAlinkActorClass()->checkCanoeSlider()) {
         if (mWaterSpeed.abs2XZ() > 25.0f || fabsf(speedF) > 5.0f) {
@@ -637,7 +611,6 @@ void daCanoe_c::setCanoeSliderEffect() {
     }
 }
 
-/* 804DC7B4-804DD33C 002354 0B88+00 1/1 0/0 0/0 .text            execute__9daCanoe_cFv */
 int daCanoe_c::execute() {
     daAlink_c* player = daAlink_getAlinkActorClass();
     mOldFrontPos = mFrontPos;
@@ -888,12 +861,10 @@ int daCanoe_c::execute() {
     return 1;
 }
 
-/* 804DD33C-804DD35C 002EDC 0020+00 1/0 0/0 0/0 .text            daCanoe_Execute__FP9daCanoe_c */
 static int daCanoe_Execute(daCanoe_c* i_this) {
     return i_this->execute();
 }
 
-/* 804DD35C-804DD554 002EFC 01F8+00 1/1 0/0 0/0 .text            draw__9daCanoe_cFv */
 int daCanoe_c::draw() {
     field_0x1444 = 1;
 
@@ -931,12 +902,10 @@ int daCanoe_c::draw() {
     return 1;
 }
 
-/* 804DD554-804DD574 0030F4 0020+00 1/0 0/0 0/0 .text            daCanoe_Draw__FP9daCanoe_c */
 static int daCanoe_Draw(daCanoe_c* i_this) {
     return i_this->draw();
 }
 
-/* 804DD734-804DD754 -00001 0020+00 1/0 0/0 0/0 .data            l_daCanoe_Method */
 static actor_method_class l_daCanoe_Method = {
     (process_method_func)daCanoe_Create,
     (process_method_func)daCanoe_Delete,
@@ -945,7 +914,6 @@ static actor_method_class l_daCanoe_Method = {
     (process_method_func)daCanoe_Draw,
 };
 
-/* 804DD754-804DD784 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CANOE */
 extern actor_process_profile_definition g_profile_CANOE = {
   fpcLy_CURRENT_e,         // mLayerID
   4,                       // mListID
diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp
index 829bb3d1ab..c6ca933a7c 100644
--- a/src/d/actor/d_a_coach_2D.cpp
+++ b/src/d/actor/d_a_coach_2D.cpp
@@ -87,30 +87,25 @@ public:
         memcpy(&param, &aParam, sizeof(Param));
     }
 
-    /* 80657738 */ virtual ~daCoach2D_HIO_c() {}
+    virtual ~daCoach2D_HIO_c() {}
     void genMessage(JORMContext*) {}
 
     /* 0x4 */ Param param;
 };
 
-/* 806569CC-80656A18 0000EC 004C+00 1/0 0/0 0/0 .text            draw__Q211daCoach2D_c6c_listFv */
 void daCoach2D_c::c_list::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
     mpCoach2D->drawMeter();
 }
 
-/* 80656A18-80656A38 000138 0020+00 1/1 0/0 0/0 .text daCoach2D_createHeap__FP10fopAc_ac_c */
 static int daCoach2D_createHeap(fopAc_ac_c* i_this) {
     return ((daCoach2D_c*)i_this)->createHeap();
 }
 
-/* 806579F4-806579F8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Coach2D";
 
-/* 80657A9C-80657AF8 000014 005C+00 5/5 0/0 0/0 .bss             l_HOSTIO */
 static daCoach2D_HIO_c l_HOSTIO;
 
-/* 80656A38-80656D18 000158 02E0+00 1/1 0/0 0/0 .text            createHeap__11daCoach2D_cFv */
 int daCoach2D_c::createHeap() {
     mpScrn = new J2DScreen();
     if (mpScrn == NULL) {
@@ -154,7 +149,6 @@ int daCoach2D_c::createHeap() {
     return 1;
 }
 
-/* 80656D18-80656D94 000438 007C+00 1/1 0/0 0/0 .text            create__11daCoach2D_cFv */
 int daCoach2D_c::create() {
     int phase_state = dComIfG_resLoad(this, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -170,7 +164,6 @@ int daCoach2D_c::create() {
     return phase_state;
 }
 
-/* 80656D94-80656DE4 0004B4 0050+00 1/1 0/0 0/0 .text            destroy__11daCoach2D_cFv */
 int daCoach2D_c::destroy() {
     dComIfG_resDelete(this, l_arcName);
 #ifdef DEBUG
@@ -181,7 +174,6 @@ int daCoach2D_c::destroy() {
     return 1;
 }
 
-/* 80656DE4-80656E94 000504 00B0+00 1/1 0/0 0/0 .text            draw__11daCoach2D_cFv */
 int daCoach2D_c::draw() {
     if (isVisible() && !dComIfGp_isPauseFlag() && !dMsgObject_isTalkNowCheck()) {
         dComIfGd_set2DOpa(&mList);
@@ -193,7 +185,6 @@ int daCoach2D_c::draw() {
     return 1;
 }
 
-/* 80656E94-80656ED0 0005B4 003C+00 1/1 0/0 0/0 .text            execute__11daCoach2D_cFv */
 int daCoach2D_c::execute() {
 #ifdef DEBUG
     s32 freeSize = mDoExt_getCurrentHeap()->getTotalFreeSize();
@@ -206,7 +197,6 @@ int daCoach2D_c::execute() {
     return 1;
 }
 
-/* 80656ED0-8065722C 0005F0 035C+00 1/1 0/0 0/0 .text            drawMeter__11daCoach2D_cFv */
 void daCoach2D_c::drawMeter() {
     update();
     if (l_HOSTIO.param.reverse_flag) {
@@ -278,7 +268,6 @@ void daCoach2D_c::drawMeter() {
     }
 }
 
-/* 8065722C-80657260 00094C 0034+00 1/1 0/0 0/0 .text            initiate__11daCoach2D_cFv */
 void daCoach2D_c::initiate() {
     for (int i = 0; i < 20; i++) {
         mIconInfo[i].field_0x15 = 0xFF;
@@ -287,7 +276,6 @@ void daCoach2D_c::initiate() {
     mMaxHitCount = l_HOSTIO.param.max_damage_num;
 }
 
-/* 80657260-80657490 000980 0230+00 1/1 0/0 0/0 .text            update__11daCoach2D_cFv */
 void daCoach2D_c::update() {
     f32 var_f29 = l_HOSTIO.param.icon_space_x;
     f32 icon_pos_x = l_HOSTIO.param.icon_pos_x + ((mMaxHitCount - 1) * var_f29);
@@ -319,7 +307,6 @@ void daCoach2D_c::update() {
     }
 }
 
-/* 80657490-8065764C 000BB0 01BC+00 2/2 0/0 0/0 .text            setBrkAnime__11daCoach2D_cFb */
 void daCoach2D_c::setBrkAnime(bool param_0) {
     if (mHitCount != 0) {
         mBrkSpeed = l_HOSTIO.param.blink_speed_min + ((l_HOSTIO.param.blink_speed_max - l_HOSTIO.param.blink_speed_min) * ((f32)mHitCount / (f32)mMaxHitCount));
@@ -342,31 +329,23 @@ void daCoach2D_c::setBrkAnime(bool param_0) {
     mpScrn->search('basha_p0')->setAnimation(mpFireIconBrk);
 }
 
-/* 8065764C-806576D4 000D6C 0088+00 1/0 0/0 0/0 .text            daCoach2D_create__FP11daCoach2D_c
- */
 static int daCoach2D_create(daCoach2D_c* i_this) {
     fopAcM_ct(i_this, daCoach2D_c);
     return i_this->create();
 }
 
-/* 806576D4-806576F4 000DF4 0020+00 1/0 0/0 0/0 .text            daCoach2D_destroy__FP11daCoach2D_c
- */
 static int daCoach2D_destroy(daCoach2D_c* i_this) {
     return i_this->destroy();
 }
 
-/* 806576F4-80657714 000E14 0020+00 1/0 0/0 0/0 .text            daCoach2D_execute__FP11daCoach2D_c
- */
 static int daCoach2D_execute(daCoach2D_c* i_this) {
     return i_this->execute();
 }
 
-/* 80657714-80657734 000E34 0020+00 1/0 0/0 0/0 .text            daCoach2D_draw__FP11daCoach2D_c */
 static int daCoach2D_draw(daCoach2D_c* i_this) {
     return i_this->draw();
 }
 
-/* 806579F8-80657A18 -00001 0020+00 1/0 0/0 0/0 .data            daCoach2D_METHODS */
 static actor_method_class daCoach2D_METHODS = {
     (process_method_func)daCoach2D_create,
     (process_method_func)daCoach2D_destroy,
@@ -375,7 +354,6 @@ static actor_method_class daCoach2D_METHODS = {
     (process_method_func)daCoach2D_draw,
 };
 
-/* 80657A18-80657A48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COACH2D */
 extern actor_process_profile_definition g_profile_COACH2D = {
   fpcLy_CURRENT_e,       // mLayerID
   3,                     // mListID
diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp
index 4257401594..2f6d2ea51c 100644
--- a/src/d/actor/d_a_coach_fire.cpp
+++ b/src/d/actor/d_a_coach_fire.cpp
@@ -7,7 +7,6 @@
 
 #include "d/actor/d_a_coach_fire.h"
 
-/* 806583E8-806583F8 000000 0010+00 3/3 0/0 0/0 .rodata          M_attr__13daCoachFire_c */
 CoachFireAttr const daCoachFire_c::M_attr = {
     50.0f,  // radius
     4.0f,   // field_0x04
@@ -18,7 +17,6 @@ CoachFireAttr const daCoachFire_c::M_attr = {
     700.0f, // pow
 };
 
-/* 80657B78-80657C48 000078 00D0+00 1/1 0/0 0/0 .text            create_init__13daCoachFire_cFv */
 void daCoachFire_c::create_init() {
     fopAcM_setStageLayer(this);
     fopAcM_setCullSizeBox(this, -100.0, -10.0, -100.0, 100.0, 200.0, 100.0);
@@ -36,7 +34,6 @@ void daCoachFire_c::create_init() {
     initCcSphere();
 }
 
-/* 80657C48-80657CA8 000148 0060+00 1/1 0/0 0/0 .text            initBaseMtx__13daCoachFire_cFv */
 void daCoachFire_c::initBaseMtx() {
     daNpcCoach_c* coach = (daNpcCoach_c*)fpcM_SearchByID(parentActorID);
     if (coach != NULL) {
@@ -46,7 +43,6 @@ void daCoachFire_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80657CA8-80657D2C 0001A8 0084+00 1/1 0/0 0/0 .text            setBaseMtx__13daCoachFire_cFv */
 void daCoachFire_c::setBaseMtx() {
     if (mpMtx != NULL) {
         mDoMtx_stack_c::copy(*mpMtx);
@@ -56,10 +52,7 @@ void daCoachFire_c::setBaseMtx() {
     }
 }
 
-/* 80658408-80658448 000020 0040+00 1/1 0/0 0/0 .rodata
- * ccSphSrc$localstatic3$initCcSphere__13daCoachFire_cFv        */
 
-/* 80657D2C-80657D9C 00022C 0070+00 1/1 0/0 0/0 .text            initCcSphere__13daCoachFire_cFv */
 void daCoachFire_c::initCcSphere() {
     static const dCcD_SrcSph ccSphSrc = {
         {
@@ -92,8 +85,6 @@ int daCoachFire_c::draw() {
     return 1;
 }
 
-/* 80657D9C-80657EA0 00029C 0104+00 1/0 0/0 0/0 .text            daCoachFire_Draw__FP13daCoachFire_c
- */
 static int daCoachFire_Draw(daCoachFire_c* i_this) {
     return i_this->draw();
 }
@@ -141,12 +132,10 @@ int daCoachFire_c::execute() {
     return 1;
 }
 
-/* 80657EA0-80658094 0003A0 01F4+00 1/0 0/0 0/0 .text daCoachFire_Execute__FP13daCoachFire_c */
 static int daCoachFire_Execute(daCoachFire_c* i_this) {
     return i_this->execute();
 }
 
-/* 80658094-8065809C 000594 0008+00 1/0 0/0 0/0 .text daCoachFire_IsDelete__FP13daCoachFire_c */
 static bool daCoachFire_IsDelete(daCoachFire_c* i_this) {
     return true;
 }
@@ -155,31 +144,25 @@ daCoachFire_c::~daCoachFire_c() {
     dKy_plight_cut(&mLightInfluence);
 }
 
-/* 8065809C-806581C0 00059C 0124+00 1/0 0/0 0/0 .text daCoachFire_Delete__FP13daCoachFire_c */
 static int daCoachFire_Delete(daCoachFire_c* i_this) {
     i_this->~daCoachFire_c();
     return 1;
 }
 
-/* 806581C0-806582AC 0006C0 00EC+00 1/0 0/0 0/0 .text            daCoachFire_Create__FP10fopAc_ac_c
- */
 static int daCoachFire_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, daCoachFire_c);
     static_cast<daCoachFire_c*>(i_this)->create_init();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80658454-8065845A 00006C 0006+00 0/0 0/0 0/0 .rodata          None */
 static char* stringBase_80658454 = "Coach";
 
-/* 8065845C-8065847C -00001 0020+00 1/0 0/0 0/0 .data            l_daCoachFire_Method */
 static actor_method_class l_daCoachFire_Method = {
     (process_method_func)daCoachFire_Create,  (process_method_func)daCoachFire_Delete,
     (process_method_func)daCoachFire_Execute, (process_method_func)daCoachFire_IsDelete,
     (process_method_func)daCoachFire_Draw,
 };
 
-/* 8065847C-806584AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COACH_FIRE */
 extern actor_process_profile_definition g_profile_COACH_FIRE = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp
index e20afd6e4c..8807f4443b 100644
--- a/src/d/actor/d_a_cow.cpp
+++ b/src/d/actor/d_a_cow.cpp
@@ -49,16 +49,13 @@ static dCcD_SrcSph cc_sph_src = {{{0, {{0, 0, {0}}, {0xfbfdfb, {0x11}}, {{0x79}}
 static s16 pen_dir = -0x4000;
 static s16 gate_dir = -0x8000;
 
-/* 80662FBC-80662FC0 000064 0004+00 0/2 0/0 0/0 .data l_CowRoomPosY__21@unnamed@d_a_cow_cpp@ */
 static f32 l_CowRoomPosY = 15000.0f;
 
-/* 80662FC0-80663010 000068 0050+00 1/3 0/0 0/0 .data l_CowRoomPosX__21@unnamed@d_a_cow_cpp@ */
 static f32 l_CowRoomPosX[20] = {-10600.0f, -10600.0f, -10800.0f, -10800.0f, -11000.0f,
                                 -11000.0f, -11200.0f, -11200.0f, -11400.0f, -11400.0f,
                                 -11600.0f, -11600.0f, -11800.0f, -11800.0f, -12000.0f,
                                 -12000.0f, -12200.0f, -12200.0f, -12400.0f, -12400.0f};
 
-/* 80663010-80663018 0000B8 0008+00 1/3 0/0 0/0 .data l_CowRoomPosZ__21@unnamed@d_a_cow_cpp@ */
 static f32 l_CowRoomPosZ[2] = {-19646.0f, -20926.0f};
 
 #define N_WOLF_BUSTERS 3
@@ -66,7 +63,6 @@ extern fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {-1, -1, -1};
 
 }  // namespace
 
-/* 806585CC-80658730 0000EC 0164+00 6/6 0/0 0/0 .text            calcRunAnime__7daCow_cFi */
 int daCow_c::calcRunAnime(int resetRunType) {
     if (resetRunType) {
         mRunType = daCow_c::RunType_None;
@@ -104,13 +100,11 @@ int daCow_c::calcRunAnime(int resetRunType) {
     return 1;
 }
 
-/* 80658730-806587D4 000250 00A4+00 20/20 0/0 0/0 .text            setBck__7daCow_cFiUcff */
 void daCow_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* animation = (J3DAnmTransform*)dComIfG_getObjectRes("Cow", i_index);
     mpMorf->setAnm(animation, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806587D4-80658830 0002F4 005C+00 1/1 0/0 0/0 .text            checkBck__7daCow_cFi */
 u8 daCow_c::checkBck(int i_index) {
     J3DAnmTransform* animation = (J3DAnmTransform*)dComIfG_getObjectRes("Cow", i_index);
     return mpMorf->getAnm() == animation;
@@ -121,12 +115,10 @@ namespace {
 static cXyz pen_pos(-10200.0f, 15000.0f, -20246.0f);
 static cXyz gate_pos(-9246.0f, 15000.0f, -22763.0f);
 
-/* 806634D0-806634D4 000078 0004+00 3/3 0/0 0/0 .bss l_CowRoomNo__21@unnamed@d_a_cow_cpp@ */
 static u32 l_CowRoomNo = 0;
 static u32 l_CowType = 0;
 }  // namespace
 
-/* 80658830-80658A68 000350 0238+00 1/1 0/0 0/0 .text            setEffect__7daCow_cFv */
 void daCow_c::setEffect() {
     if (mShouldSetEffect) {
         if (mShouldSetEffect == 1) {
@@ -174,7 +166,6 @@ void daCow_c::setEffect() {
     }
 }
 
-/* 80658AA4-80658B10 0005C4 006C+00 5/5 0/0 0/0 .text            isChaseCowGame__7daCow_cFv */
 bool daCow_c::isChaseCowGame() {
     if (!strcmp(dComIfGp_getStartStageName(), "F_SP00")) {
         if (dComIfG_play_c::getLayerNo(0) == 4 || dComIfG_play_c::getLayerNo(0) == 5) {
@@ -184,7 +175,6 @@ bool daCow_c::isChaseCowGame() {
     return false;
 }
 
-/* 80658B10-80658C18 000630 0108+00 6/6 0/0 0/0 .text            setCarryStatus__7daCow_cFv */
 void daCow_c::setCarryStatus() {
     f32 zMax = 270.0f;
     f32 xMax = 70.0f;
@@ -203,7 +193,6 @@ void daCow_c::setCarryStatus() {
     }
 }
 
-/* 80658C18-80658C78 000738 0060+00 5/5 0/0 0/0 .text            setActetcStatus__7daCow_cFv */
 void daCow_c::setActetcStatus() {
     if (!mNadeNade) {
         s32 playerAngle = fopAcM_seenPlayerAngleY(this);
@@ -215,7 +204,6 @@ void daCow_c::setActetcStatus() {
 
 // NOTE: nade nade seems to be petting the Goat
 
-/* 80658C78-80658CA4 000798 002C+00 3/3 0/0 0/0 .text            checkNadeNadeFinish__7daCow_cFv */
 bool daCow_c::checkNadeNadeFinish() {
     if (GET_FLAG(daCow_c::Flag_NaderuFinish)) {
         CLEAR_FLAG(daCow_c::Flag_NaderuFinish);
@@ -225,7 +213,6 @@ bool daCow_c::checkNadeNadeFinish() {
     return false;
 }
 
-/* 80658CA4-80658CD0 0007C4 002C+00 5/5 0/0 0/0 .text            checkNadeNade__7daCow_cFv */
 bool daCow_c::checkNadeNade() {
     if (GET_FLAG(daCow_c::Flag_Naderu)) {
         CLEAR_FLAG(daCow_c::Flag_Naderu);
@@ -235,21 +222,18 @@ bool daCow_c::checkNadeNade() {
     return 0;
 }
 
-/* 80658CD0-80658D3C 0007F0 006C+00 3/3 0/0 0/0 .text            setSeSnort__7daCow_cFv */
 void daCow_c::setSeSnort() {
     if (mpMorf->checkFrame(1.0f)) {
         mSound.startCreatureVoice(Z2SE_GOAT_V_BREATH, -1);
     }
 }
 
-/* 80658D3C-80658DB8 00085C 007C+00 2/2 0/0 0/0 .text            setRushVibration__7daCow_cFi */
 void daCow_c::setRushVibration(int i_vibmode) {
     if (mpMorf->checkFrame(1.0f)) {
         dComIfGp_getVibration().StartShock(i_vibmode, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
     }
 }
 
-/* 80658DB8-80658E98 0008D8 00E0+00 6/6 0/0 0/0 .text            checkThrow__7daCow_cFv */
 bool daCow_c::checkThrow() {
     if (mFlags) {
         if (GET_FLAG(daCow_c::Flag_CrazyBeforeCatch)) {
@@ -268,7 +252,6 @@ bool daCow_c::checkThrow() {
     return false;
 }
 
-/* 80658E98-80658F94 0009B8 00FC+00 3/3 0/0 0/0 .text            setBodyAngle__7daCow_cFs */
 void daCow_c::setBodyAngle(s16 angle) {
     s16 offsetAngle = mSavedAngle.y - angle;
 
@@ -282,7 +265,6 @@ void daCow_c::setBodyAngle(s16 angle) {
     cLib_chaseS(&mJoint1Offset.y, offsetAngle * 0.3f, 0x100);
 }
 
-/* 80658F94-806590E8 000AB4 0154+00 1/1 0/0 0/0 .text            setBodyAngle2__7daCow_cFs */
 void daCow_c::setBodyAngle2(s16 angle) {
     s16 offsetAngle = mSavedAngle.y - angle;
 
@@ -308,12 +290,10 @@ void daCow_c::setBodyAngle2(s16 angle) {
     cLib_chaseS(&mJoint8Offset.y, chaseAngle, 0x100);
 }
 
-/* 806590E8-80659114 000C08 002C+00 5/5 0/0 0/0 .text checkProcess__7daCow_cFM7daCow_cFPCvPv_v */
 BOOL daCow_c::checkProcess(void (daCow_c::*process)()) {
     return mProcess == process;
 }
 
-/* 80659114-806591BC 000C34 00A8+00 16/16 0/0 0/0 .text setProcess__7daCow_cFM7daCow_cFPCvPv_vi */
 bool daCow_c::setProcess(void (daCow_c::*process)(), BOOL doAnim6) {
     mMode = daCow_c::Mode_3;
     if (mProcess) {
@@ -333,7 +313,6 @@ bool daCow_c::setProcess(void (daCow_c::*process)(), BOOL doAnim6) {
 #define COW_ATTACK_TYPES                                                                           \
     (AT_TYPE_NORMAL_SWORD | AT_TYPE_BOMB | AT_TYPE_ARROW | AT_TYPE_SPINNER | AT_TYPE_IRON_BALL)
 
-/* 806591BC-8065945C 000CDC 02A0+00 1/1 0/0 0/0 .text            damage_check__7daCow_cFv */
 void daCow_c::damage_check() {
     mCcStts.Move();
 
@@ -394,7 +373,6 @@ void daCow_c::damage_check() {
     mSph[2].ClrTgHit();
 }
 
-/* 8065945C-80659540 000F7C 00E4+00 1/1 0/0 0/0 .text            setEnterCow20__7daCow_cFv */
 void daCow_c::setEnterCow20() {
     for (int iCow = 0; iCow < 20; iCow++) {
         cXyz spawnPosition(l_CowRoomPosX[iCow], l_CowRoomPosY, l_CowRoomPosZ[iCow & 1]);
@@ -413,11 +391,8 @@ void daCow_c::setEnterCow20() {
     }
 }
 
-/* ############################################################################################## */
-/* 80663084-806630AC 00012C 0028+00 0/1 0/0 0/0 .data            cow_number$4349 */
 static u32 cow_number[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
 
-/* 80659540-80659630 001060 00F0+00 1/1 0/0 0/0 .text            setEnterCow10__7daCow_cFv */
 void daCow_c::setEnterCow10() {
     for (int iCow = 0; iCow < 10; iCow++) {
         int cowNumber = cow_number[iCow];
@@ -437,7 +412,6 @@ void daCow_c::setEnterCow10() {
     }
 }
 
-/* 80659630-806596E4 001150 00B4+00 1/1 0/0 0/0 .text            setGroundAngle__7daCow_cFv */
 void daCow_c::setGroundAngle() {
     s16 alpha = 0;
     s16 beta = 0;
@@ -455,8 +429,6 @@ void daCow_c::setGroundAngle() {
     cLib_chaseAngleS(&mGroundTransform.y, beta, 128);
 }
 
-/* ############################################################################################## */
-/* 806634F4-806634F8 00009C 0004+00 0/3 0/0 0/0 .bss             m_near_dist */
 static f32 m_near_dist;
 
 /* 806634F8 0002+00 data_806634F8 m_view_angle_wide */
@@ -470,7 +442,6 @@ static s16 m_view_angle;
     (fopAcM_IsActor((cow_1)) && !fpcM_IsCreating(fopAcM_GetID((cow_1))) && IS_COW((cow_1)) &&      \
      (cow_1) != (actor))
 
-/* 8065972C-80659814 00124C 00E8+00 2/2 0/0 0/0 .text            s_near_cow__FPvPv */
 static void* s_near_cow(void* candidate, void* data) {
     if (IS_VALID_COW_INTERACTION(candidate, data)) {
         daCow_c* candidateCow = (daCow_c*)candidate;
@@ -490,10 +461,8 @@ static void* s_near_cow(void* candidate, void* data) {
     return NULL;
 }
 
-/* 806634FC-80663500 0000A4 0002+02 4/4 0/0 0/0 .bss             m_angry_cow */
 static s16 m_angry_cow;
 
-/* 80659814-806598D4 001334 00C0+00 1/1 0/0 0/0 .text            s_angry_cow__FPvPv */
 static void* s_angry_cow(void* candidate, void* data) {
     fopAc_ac_c* self = (fopAc_ac_c*)data;
     if (IS_VALID_COW_INTERACTION(candidate, self)) {
@@ -507,7 +476,6 @@ static void* s_angry_cow(void* candidate, void* data) {
     return NULL;
 }
 
-/* 806598D4-80659970 0013F4 009C+00 1/1 0/0 0/0 .text            s_angry_cow2__FPvPv */
 static void* s_angry_cow2(void* candidate, void* self) {
     if (IS_VALID_COW_INTERACTION(candidate, (fopAc_ac_c*)self)) {
         daCow_c* candidateCow = (daCow_c*)candidate;
@@ -519,12 +487,10 @@ static void* s_angry_cow2(void* candidate, void* self) {
     return NULL;
 }
 
-/* 80659970-806599C0 001490 0050+00 1/1 0/0 0/0 .text            checkRun__7daCow_cFv */
 bool daCow_c::checkRun() {
     return checkProcess(&daCow_c::action_run);
 }
 
-/* 806599C0-80659ADC 0014E0 011C+00 4/4 0/0 0/0 .text            checkNearCowRun__7daCow_cFv */
 bool daCow_c::checkNearCowRun() {
     if (getCowIn()) {
         return false;
@@ -563,7 +529,6 @@ bool daCow_c::checkNearCowRun() {
     return false;
 }
 
-/* 80659ADC-8065A0E8 0015FC 060C+00 15/0 0/0 0/0 .text            action_wait__7daCow_cFv */
 void daCow_c::action_wait() {
     f32 rand = cM_rnd();
 
@@ -655,7 +620,6 @@ void daCow_c::action_wait() {
     }
 }
 
-/* 8065A0E8-8065A594 001C08 04AC+00 4/0 0/0 0/0 .text            action_eat__7daCow_cFv */
 void daCow_c::action_eat() {
     switch (mMode) {
     case daCow_c::Mode_0:
@@ -721,7 +685,6 @@ void daCow_c::action_eat() {
     }
 }
 
-/* 8065A594-8065A8A4 0020B4 0310+00 9/0 0/0 0/0 .text            action_moo__7daCow_cFv */
 void daCow_c::action_moo() {
     switch (mMode) {
     case daCow_c::Mode_0:
@@ -775,7 +738,6 @@ void daCow_c::action_moo() {
     }
 }
 
-/* 8065A8A4-8065ACC8 0023C4 0424+00 5/0 0/0 0/0 .text            action_shake__7daCow_cFv */
 void daCow_c::action_shake() {
     switch (mMode) {
     case daCow_c::Mode_0:
@@ -834,7 +796,6 @@ void daCow_c::action_shake() {
     }
 }
 
-/* 8065ACC8-8065AD2C 0027E8 0064+00 4/4 0/0 0/0 .text            checkNearWolf__7daCow_cFv */
 bool daCow_c::checkNearWolf() {
     if (daPy_getPlayerActorClass()->checkNowWolf() && fopAcM_searchPlayerDistance(this) < 3000.f) {
         return true;
@@ -843,7 +804,6 @@ bool daCow_c::checkNearWolf() {
     }
 }
 
-/* 8065AD2C-8065ADB0 00284C 0084+00 5/5 0/0 0/0 .text            checkPlayerWait__7daCow_cFv */
 bool daCow_c::checkPlayerWait() {
     if ((daPy_getPlayerActorClass()->checkHorseRide() ||
          daPy_getPlayerActorClass()->checkNowWolf()) &&
@@ -855,8 +815,6 @@ bool daCow_c::checkPlayerWait() {
     }
 }
 
-/* 8065ADB0-8065AE88 0028D0 00D8+00 2/2 0/0 0/0 .text            checkPlayerSurprise__7daCow_cFv
- */
 bool daCow_c::checkPlayerSurprise() {
     if (getCowIn()) {
         return false;
@@ -877,7 +835,6 @@ bool daCow_c::checkPlayerSurprise() {
     }
 }
 
-/* 8065AE88-8065B034 0029A8 01AC+00 2/2 0/0 0/0 .text            checkPlayerPos__7daCow_cFv */
 bool daCow_c::checkPlayerPos() {
     if (getCowIn()) {
         return false;
@@ -932,7 +889,6 @@ bool daCow_c::checkPlayerPos() {
     return true;
 }
 
-/* 8065B034-8065B760 002B54 072C+00 2/2 0/0 0/0 .text            checkBeforeBg__7daCow_cFv */
 void daCow_c::checkBeforeBg() {
     s16 x[3] = {0, -0x2000, 0x2000};
     cXyz a;
@@ -1101,8 +1057,6 @@ void daCow_c::checkBeforeBg() {
     }
 }
 
-/* 8065B760-8065B8A8 003280 0148+00 6/6 0/0 0/0 .text            checkOutOfGate__7daCow_cF4cXyz
- */
 int daCow_c::checkOutOfGate(cXyz pos) {
     if (isChaseCowGame()) {
         return 0;
@@ -1123,18 +1077,15 @@ int daCow_c::checkOutOfGate(cXyz pos) {
     return x.z > 0.0f ? 2 : 0;
 }
 
-/* 8065B8A8-8065B8D8 0033C8 0030+00 3/3 0/0 0/0 .text            getCowshedAngle__7daCow_cFv */
 s16 daCow_c::getCowshedAngle() {
     return (s16)cLib_targetAngleY(&current.pos, &pen_pos);
 }
 
-/* 8065B8D8-8065BA30 0033F8 0158+00 1/1 0/0 0/0 .text            getCowshedDist__7daCow_cFv */
 double daCow_c::getCowshedDist() {
     cXyz diff = pen_pos - current.pos;
     return diff.absXZ();
 }
 
-/* 8065BA30-8065BB34 003550 0104+00 2/2 0/0 0/0 .text            checkCowIn__7daCow_cFff */
 int daCow_c::checkCowIn(f32 cowshedDist, f32 cowshedAngle) {
     if (!isChaseCowGame()) {
         return 0;
@@ -1159,7 +1110,6 @@ int daCow_c::checkCowIn(f32 cowshedDist, f32 cowshedAngle) {
     return 0;
 }
 
-/* 8065BB34-8065BC68 003654 0134+00 5/5 0/0 0/0 .text            checkCowInOwn__7daCow_cFi */
 bool daCow_c::checkCowInOwn(int angle) {
     if (!isChaseCowGame()) {
         return false;
@@ -1179,7 +1129,6 @@ bool daCow_c::checkCowInOwn(int angle) {
     return false;
 }
 
-/* 8065BC68-8065C32C 003788 06C4+00 9/0 0/0 0/0 .text            action_run__7daCow_cFv */
 void daCow_c::action_run() {
     switch (mMode) {
     case daCow_c::Mode_0:
@@ -1365,7 +1314,6 @@ void daCow_c::action_run() {
     }
 }
 
-/* 8065C32C-8065C508 003E4C 01DC+00 1/1 0/0 0/0 .text            checkCurringPen__7daCow_cFv */
 bool daCow_c::checkCurringPen() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (player->current.pos.abs(pen_pos) < 2500.0f) {
@@ -1387,7 +1335,6 @@ bool daCow_c::checkCurringPen() {
     }
 }
 
-/* 8065C508-8065C680 004028 0178+00 2/2 0/0 0/0 .text            setCowInCage__7daCow_cFv */
 void daCow_c::setCowInCage() {
     for (int iSphere = 0; iSphere < N_COW_COLLIDERS; iSphere++) {
         mSph[iSphere].OffCoSetBit();
@@ -1426,7 +1373,6 @@ void daCow_c::setCowInCage() {
     }
 }
 
-/* 8065C680-8065C70C 0041A0 008C+00 2/2 0/0 0/0 .text            setEnterCount__7daCow_cFv */
 void daCow_c::setEnterCount() {
     dTimer_createGetIn2D(2, current.pos);
     dMeter2Info_setNowCount(dMeter2Info_getNowCount() + 1);
@@ -1440,7 +1386,6 @@ void daCow_c::setEnterCount() {
     }
 }
 
-/* 8065C70C-8065CFBC 00422C 08B0+00 2/0 0/0 0/0 .text            action_enter__7daCow_cFv */
 void daCow_c::action_enter() {
     cXyz penDistance = current.pos - pen_pos;
     f32 penDistanceAbs = penDistance.absXZ();
@@ -1581,7 +1526,6 @@ void daCow_c::action_enter() {
     }
 }
 
-/* 8065CFBC-8065D03C 004ADC 0080+00 4/4 0/0 1/1 .text            isAngry__7daCow_cFv */
 bool daCow_c::isAngry() {
     if (checkProcess(&daCow_c::action_angry) &&
         (mCrazy == daCow_c::Crazy_Wait || mCrazy == daCow_c::Crazy_Dash ||
@@ -1593,7 +1537,6 @@ bool daCow_c::isAngry() {
     }
 }
 
-/* 8065D03C-8065D0B8 004B5C 007C+00 1/1 0/0 1/1 .text            isGuardFad__7daCow_cFv */
 bool daCow_c::isGuardFad() {
     if (checkProcess(&daCow_c::action_wolf)) {
         return true;
@@ -1604,7 +1547,6 @@ bool daCow_c::isGuardFad() {
     }
 }
 
-/* 8065D0B8-8065D17C 004BD8 00C4+00 0/0 0/0 1/1 .text            setAngryHit__7daCow_cFv */
 void daCow_c::setAngryHit() {
     if (isAngry()) {
         mTargetAngle = mSavedAngle.y - (s16)0x8000;
@@ -1625,8 +1567,6 @@ void daCow_c::setAngryHit() {
     }
 }
 
-/* 8065D17C-8065D230 004C9C 00B4+00 1/1 0/0 0/0 .text            checkBeforeBgAngry__7daCow_cFs
- */
 bool daCow_c::checkBeforeBgAngry(s16 angle) {
     checkBeforeBg();
 
@@ -1642,7 +1582,6 @@ bool daCow_c::checkBeforeBgAngry(s16 angle) {
     return false;
 }
 
-/* 8065D230-8065D29C 004D50 006C+00 2/2 0/0 0/0 .text            setRedTev__7daCow_cFv */
 void daCow_c::setRedTev() {
     if (mChangeRedTev < 2) {
         if (!mChangeRedTev) {
@@ -1657,14 +1596,12 @@ void daCow_c::setRedTev() {
     }
 }
 
-/* 8065D29C-8065D2F0 004DBC 0054+00 1/1 0/0 0/0 .text            setAngryTurn__7daCow_cFv */
 void daCow_c::setAngryTurn() {
     setBck(daCow_c::Animation_Jump, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f);
     speedF = mSpeed;
     mCrazy = daCow_c::Crazy_Attack;
 }
 
-/* 8065D2F0-8065DC08 004E10 0918+00 7/0 0/0 0/0 .text            action_angry__7daCow_cFv */
 void daCow_c::action_angry() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 playerDistance = fopAcM_searchPlayerDistance(this);
@@ -1913,7 +1850,6 @@ void daCow_c::action_angry() {
     }
 }
 
-/* 8065DC08-8065DE70 005728 0268+00 4/4 0/0 0/0 .text            calcCatchPos__7daCow_cFfi */
 void daCow_c::calcCatchPos(f32 distance, BOOL someBool) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 offsetAngle = player->shape_angle.y - (s16)0x8000;
@@ -1939,7 +1875,6 @@ void daCow_c::calcCatchPos(f32 distance, BOOL someBool) {
     }
 }
 
-/* 8065DE70-8065DF40 005990 00D0+00 1/1 0/0 0/0 .text            executeCrazyWait__7daCow_cFv */
 void daCow_c::executeCrazyWait() {
     if (GET_FLAG(daCow_c::Flag_CrazyReady)) {
         CLEAR_FLAG(daCow_c::Flag_CrazyReady);
@@ -1961,7 +1896,6 @@ void daCow_c::executeCrazyWait() {
     }
 }
 
-/* 8065DF40-8065E6BC 005A60 077C+00 1/1 0/0 0/0 .text            executeCrazyDash__7daCow_cFv */
 void daCow_c::executeCrazyDash() {
     mShouldSetEffect = 1;
     cXyz pathPointPosition = dPath_GetPnt(mPath, mPointIndex)->m_position;
@@ -2047,7 +1981,6 @@ void daCow_c::executeCrazyDash() {
     mSavedAngle.y = shape_angle.y;
 }
 
-/* 8065E6BC-8065E6E8 0061DC 002C+00 2/2 0/0 0/0 .text initCrazyBeforeCatch__7daCow_cFi */
 void daCow_c::initCrazyBeforeCatch(int _unused) {
     mCrazy = daCow_c::Crazy_BeforeCatch;
     speedF = 0.0f;
@@ -2056,8 +1989,6 @@ void daCow_c::initCrazyBeforeCatch(int _unused) {
     gravity = 0.0f;
 }
 
-/* 8065E6E8-8065E7D0 006208 00E8+00 2/2 0/0 0/0 .text executeCrazyBeforeCatch__7daCow_cFv
- */
 void daCow_c::executeCrazyBeforeCatch() {
     calcCatchPos(-220.0f, 1);
     if (GET_FLAG(daCow_c::Flag_CrazyCatch)) {
@@ -2074,7 +2005,6 @@ void daCow_c::executeCrazyBeforeCatch() {
     }
 }
 
-/* 8065E7D0-8065E888 0062F0 00B8+00 3/3 0/0 0/0 .text            initCrazyCatch__7daCow_cFi */
 void daCow_c::initCrazyCatch(int _unused) {
     setBck(daCow_c::Animation_Shock, J3DFrameCtrl::EMode_NONE, 0.0f, 1.0f);
     mCrazy = daCow_c::Crazy_Catch;
@@ -2092,8 +2022,6 @@ void daCow_c::initCrazyCatch(int _unused) {
     gravity = 0.0f;
 }
 
-/* 8065E888-8065EAF4 0063A8 026C+00 2/2 0/0 0/0 .text            executeCrazyCatch__7daCow_cFv
- */
 void daCow_c::executeCrazyCatch() {
     f32 catchDistance = -220.0f;
 
@@ -2155,7 +2083,6 @@ void daCow_c::executeCrazyCatch() {
     }
 }
 
-/* 8065EAF4-8065EBF0 006614 00FC+00 1/1 0/0 0/0 .text            initCrazyThrow__7daCow_cFi */
 void daCow_c::initCrazyThrow(int nextAction) {
     if (nextAction != daCow_c::Action_Wait) {
         setBck(daCow_c::Animation_FallR, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f);
@@ -2182,8 +2109,6 @@ void daCow_c::initCrazyThrow(int nextAction) {
     gravity = 0.0f;
 }
 
-/* 8065EBF0-8065F088 006710 0498+00 2/2 0/0 0/0 .text            executeCrazyThrow__7daCow_cFv
- */
 void daCow_c::executeCrazyThrow() {
     dBgS_LinChk linChk;
 
@@ -2289,7 +2214,6 @@ void daCow_c::executeCrazyThrow() {
     }
 }
 
-/* 8065F088-8065F144 006BA8 00BC+00 3/3 0/0 0/0 .text            initCrazyAttack__7daCow_cFi */
 void daCow_c::initCrazyAttack(int playerMoving) {
     mJoint8Offset.z = 0;
     mCrazy = daCow_c::Crazy_Attack;
@@ -2307,8 +2231,6 @@ void daCow_c::initCrazyAttack(int playerMoving) {
     gravity = -4.0f;
 }
 
-/* 8065F144-8065F308 006C64 01C4+00 2/2 0/0 0/0 .text            executeCrazyAttack__7daCow_cFv
- */
 void daCow_c::executeCrazyAttack() {
     switch (mAction) {
     case daCow_c::Action_Wait:
@@ -2341,7 +2263,6 @@ void daCow_c::executeCrazyAttack() {
     }
 }
 
-/* 8065F308-8065F37C 006E28 0074+00 1/1 0/0 0/0 .text            initCrazyAway__7daCow_cFi */
 void daCow_c::initCrazyAway(int _unused) {
     mCrazy = daCow_c::Crazy_Away;
     if (mPrm0 == 3) {
@@ -2351,7 +2272,6 @@ void daCow_c::initCrazyAway(int _unused) {
     gravity = -4.0f;
 }
 
-/* 8065F37C-8065F6E0 006E9C 0364+00 1/1 0/0 0/0 .text            executeCrazyAway__7daCow_cFv */
 void daCow_c::executeCrazyAway() {
     setSeSnort();
 
@@ -2388,7 +2308,6 @@ void daCow_c::executeCrazyAway() {
     }
 }
 
-/* 8065F6E0-8065F744 007200 0064+00 1/1 0/0 0/0 .text            executeCrazyEnd__7daCow_cFv */
 void daCow_c::executeCrazyEnd() {
     mAcchCir.SetWall(0.0f, 0.0f);
     mDrawOff = true;
@@ -2396,7 +2315,6 @@ void daCow_c::executeCrazyEnd() {
     mPath = dPath_GetRoomPath(COW_INDEX, fopAcM_GetRoomNo(this));
 }
 
-/* 8065F744-8065F7DC 007264 0098+00 1/1 0/0 0/0 .text            initCrazyBack__7daCow_cFi */
 void daCow_c::initCrazyBack(int _unused) {
     if (mPrm0 == 3) {
         setBck(daCow_c::Animation_WalkDejected, J3DFrameCtrl::EMode_LOOP, 10.0f, 1.0f);
@@ -2413,7 +2331,6 @@ void daCow_c::initCrazyBack(int _unused) {
     mCrazy = daCow_c::Crazy_Back;
 }
 
-/* 8065F7DC-8065FE50 0072FC 0674+00 2/1 0/0 0/0 .text            executeCrazyBack__7daCow_cFv */
 void daCow_c::executeCrazyBack() {
     cXyz pointPos;
     s16 angle;
@@ -2522,7 +2439,6 @@ void daCow_c::executeCrazyBack() {
     }
 }
 
-/* 8065FE50-8066010C 007970 02BC+00 4/0 0/0 0/0 .text            action_crazy__7daCow_cFv */
 void daCow_c::action_crazy() {
     cXyz acStack_28;
     s16 angle;
@@ -2608,8 +2524,6 @@ void daCow_c::action_crazy() {
     }
 }
 
-/* 8066010C-80660544 007C2C 0438+00 1/1 0/0 0/0 .text            executeCrazyBack2__7daCow_cFv
- */
 void daCow_c::executeCrazyBack2() {
     if (checkOutOfGate(daPy_getPlayerActorClass()->current.pos) || checkOutOfGate(current.pos)) {
         setProcess(&daCow_c::action_run, false);
@@ -2669,7 +2583,6 @@ void daCow_c::executeCrazyBack2() {
     }
 }
 
-/* 80660544-806607B8 008064 0274+00 4/0 0/0 0/0 .text            action_thrown__7daCow_cFv */
 void daCow_c::action_thrown() {
     daPy_py_c* player;
 
@@ -2731,7 +2644,6 @@ void daCow_c::action_thrown() {
     }
 }
 
-/* 806607B8-806608F0 0082D8 0138+00 1/1 0/0 0/0 .text            checkWolfBusters__7daCow_cFv */
 bool daCow_c::checkWolfBusters() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (!player->checkNowWolf()) {
@@ -2762,7 +2674,6 @@ bool daCow_c::checkWolfBusters() {
     return false;
 }
 
-/* 806608F0-806612DC 008410 09EC+00 2/0 0/0 0/0 .text            action_wolf__7daCow_cFv */
 void daCow_c::action_wolf() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2888,7 +2799,6 @@ void daCow_c::action_wolf() {
     }
 }
 
-/* 806612DC-806613EC 008DFC 0110+00 2/0 0/0 0/0 .text            action_damage__7daCow_cFv */
 void daCow_c::action_damage() {
     switch (mMode) {
     case daCow_c::Mode_0:
@@ -2914,7 +2824,6 @@ void daCow_c::action_damage() {
     }
 }
 
-/* 806613EC-80661580 008F0C 0194+00 1/1 0/0 0/0 .text            action__7daCow_cFv */
 void daCow_c::action() {
     if (fopAcM_checkCarryNow(this)) {
         fopAcM_cancelCarryNow(this);
@@ -2945,7 +2854,6 @@ void daCow_c::action() {
     dComIfGp_att_LookRequest(this, 1500.0f, 300.0f, -300.0f, 0x6000, 1);
 }
 
-/* 80661580-806615EC 0090A0 006C+00 1/1 0/0 0/0 .text            setMtx__7daCow_cFv */
 void daCow_c::setMtx() {
     if (mpMorf) {
         mDoMtx_stack_c::transS(current.pos);
@@ -2956,7 +2864,6 @@ void daCow_c::setMtx() {
     }
 }
 
-/* 806615EC-80661720 00910C 0134+00 1/1 0/0 0/0 .text            setAttnPos__7daCow_cFv */
 void daCow_c::setAttnPos() {
     cXyz arg;
     cXyz pos;
@@ -2978,10 +2885,8 @@ void daCow_c::setAttnPos() {
     }
 }
 
-/* 80663500-80663504 0000A8 0004+00 0/0 0/0 0/0 .bss             m_search_range */
 static f32 m_search_range;
 
-/* 80661720-80661940 009240 0220+00 1/1 0/0 0/0 .text            setCollisions__7daCow_cFv */
 void daCow_c::setCollisions() {
     J3DModel* pJVar1;
     Mtx* pMVar2;
@@ -3015,7 +2920,6 @@ void daCow_c::setCollisions() {
     }
 }
 
-/* 80661940-80661AD0 009460 0190+00 2/2 0/0 0/0 .text            Execute__7daCow_cFv */
 int daCow_c::Execute() {
     mCounter1++;
     mJointIndex = 0;
@@ -3056,12 +2960,10 @@ int daCow_c::Execute() {
     return 1;
 }
 
-/* 80661AD0-80661AF0 0095F0 0020+00 1/0 0/0 0/0 .text            daCow_Execute__FPv */
 static int daCow_Execute(void* actor) {
     return static_cast<daCow_c*>(actor)->Execute();
 }
 
-/* 80661AF0-80661CDC 009610 01EC+00 1/1 0/0 0/0 .text            CreateHeap__7daCow_cFv */
 int daCow_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("Cow", 0x1f));
 
@@ -3098,13 +3000,10 @@ int daCow_c::CreateHeap() {
     }
 }
 
-/* 80661D24-80661D44 009844 0020+00 1/1 0/0 0/0 .text createHeapCallBack__7daCow_cFP10fopAc_ac_c
- */
 int daCow_c::createHeapCallBack(fopAc_ac_c* actor) {
     return static_cast<daCow_c*>(actor)->CreateHeap();
 }
 
-/* 80661D44-80662228 009864 04E4+00 1/1 0/0 0/0 .text            initialize__7daCow_cFv */
 u8 daCow_c::initialize() {
     fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
     mSound.init(&current.pos, &eyePos, 3, 1);
@@ -3216,7 +3115,6 @@ u8 daCow_c::initialize() {
     return 1;
 }
 
-/* 80662228-806623D4 009D48 01AC+00 1/1 0/0 0/0 .text            create__7daCow_cFv */
 int daCow_c::create() {
     if (!fopAcM_CheckCondition(this, 8)) {
         new (this) daCow_c();
@@ -3251,13 +3149,10 @@ int daCow_c::create() {
     }
 }
 
-/* 806626F0-80662710 00A210 0020+00 1/0 0/0 0/0 .text            daCow_Create__FPv */
 static int daCow_Create(void* actor) {
     return static_cast<daCow_c*>(actor)->create();
 }
 
-/* 80662710-80662920 00A230 0210+00 1/1 0/0 0/0 .text ctrlJoint__7daCow_cFP8J3DJointP8J3DModel
- */
 int daCow_c::ctrlJoint(J3DJoint* joint, J3DModel* model) {
     int jointNo = joint->getJntNo();
 
@@ -3306,7 +3201,6 @@ int daCow_c::ctrlJoint(J3DJoint* joint, J3DModel* model) {
     return 1;
 }
 
-/* 80662920-8066296C 00A440 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__7daCow_cFP8J3DJointi */
 int daCow_c::ctrlJointCallBack(J3DJoint* joint, int skip) {
     if (!skip) {
         J3DModel* model = j3dSys.getModel();
@@ -3318,7 +3212,6 @@ int daCow_c::ctrlJointCallBack(J3DJoint* joint, int skip) {
     return 1;
 }
 
-/* 8066296C-80662BC4 00A48C 0258+00 1/1 0/0 0/0 .text            Draw__7daCow_cFv */
 int daCow_c::Draw() {
     if (mDrawOff) {
         return 1;
@@ -3361,12 +3254,10 @@ int daCow_c::Draw() {
     return 1;
 }
 
-/* 80662BC4-80662BE4 00A6E4 0020+00 1/0 0/0 0/0 .text            daCow_Draw__FPv */
 static int daCow_Draw(void* actor) {
     return static_cast<daCow_c*>(actor)->Draw();
 }
 
-/* 80662BE4-80662C40 00A704 005C+00 1/1 0/0 0/0 .text            Delete__7daCow_cFv */
 int daCow_c::Delete() {
     fopAcM_GetID(this);
     dComIfG_resDelete(&mPhase, "Cow");
@@ -3377,22 +3268,18 @@ int daCow_c::Delete() {
     return true;
 }
 
-/* 80662C40-80662C60 00A760 0020+00 1/0 0/0 0/0 .text            daCow_Delete__FPv */
 static int daCow_Delete(void* actor) {
     return static_cast<daCow_c*>(actor)->Delete();
 }
 
-/* 80662C60-80662C68 00A780 0008+00 1/0 0/0 0/0 .text            daCow_IsDelete__FPv */
 static int daCow_IsDelete(void* actor) {
     return true;
 }
 
-/* 80663390-806633B0 -00001 0020+00 1/0 0/0 0/0 .data            daCow_MethodTable */
 static actor_method_class daCow_MethodTable = {
     daCow_Create, daCow_Delete, daCow_Execute, daCow_IsDelete, daCow_Draw,
 };
 
-/* 806633B0-806633E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_COW */
 extern actor_process_profile_definition g_profile_COW = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp
index 396ffab37e..405c2255a7 100644
--- a/src/d/actor/d_a_crod.cpp
+++ b/src/d/actor/d_a_crod.cpp
@@ -24,17 +24,13 @@ enum daCrod_ANM {
     /* 18 */ ANM_WAIT_C,
 };
 
-/* ############################################################################################## */
-/* 804A40EC-804A40F8 000000 000C+00 2/2 0/0 0/0 .rodata          @3759 */
 // not sure what this is
 static u8 const lit_3759[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804A40F8-804A4104 00000C 000C+00 1/2 0/0 0/0 .rodata          l_localRodPos */
 static const Vec l_localRodPos = {81.0f, -12.5f, -12.0f};
 
-/* 804A2E38-804A2EF8 000078 00C0+00 1/1 0/0 0/0 .text            createHeap__8daCrod_cFv */
 int daCrod_c::createHeap() {
     J3DModelData* model_data =
         (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), RES_CROD_BALL_BMD);
@@ -53,14 +49,10 @@ int daCrod_c::createHeap() {
     return 1;
 }
 
-/* 804A2EF8-804A2F18 000138 0020+00 1/1 0/0 0/0 .text            daCrod_createHeap__FP10fopAc_ac_c
- */
 static int daCrod_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daCrod_c*>(i_this)->createHeap();
 }
 
-/* ############################################################################################## */
-/* 804A413C-804A4188 000000 004C+00 1/1 0/0 0/0 .data            l_atCpsSrc */
 static dCcD_SrcCps l_atCpsSrc = {
     {
         {0, {{AT_TYPE_1000000, 0, 0x1B}, {0, 0}, 0}},
@@ -77,7 +69,6 @@ static dCcD_SrcCps l_atCpsSrc = {
     }
 };
 
-/* 804A2F18-804A31F8 000158 02E0+00 1/1 0/0 0/0 .text            create__8daCrod_cFv */
 int daCrod_c::create() {
     fopAcM_ct(this, daCrod_c);
 
@@ -131,12 +122,10 @@ int daCrod_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804A32E4-804A3304 000524 0020+00 1/0 0/0 0/0 .text            daCrod_Create__FP10fopAc_ac_c */
 static int daCrod_Create(fopAc_ac_c* i_this) {
     return static_cast<daCrod_c*>(i_this)->create();
 }
 
-/* 804A3304-804A3488 000544 0184+00 1/1 0/0 0/0 .text            __dt__8daCrod_cFv */
 daCrod_c::~daCrod_c() {
     if (fopAcM_GetParam(this) == 6) {
         if (daAlink_getAlinkActorClass() != NULL) {
@@ -147,23 +136,19 @@ daCrod_c::~daCrod_c() {
     }
 }
 
-/* 804A3488-804A34B0 0006C8 0028+00 1/0 0/0 0/0 .text            daCrod_Delete__FP8daCrod_c */
 static int daCrod_Delete(daCrod_c* i_this) {
     i_this->~daCrod_c();
     return 1;
 }
 
-/* 804A34B0-804A34B4 0006F0 0004+00 2/2 0/0 0/0 .text            setRoomInfo__8daCrod_cFv */
 void daCrod_c::setRoomInfo() {}
 
-/* 804A34B4-804A3500 0006F4 004C+00 2/2 0/0 0/0 .text            setMatrix__8daCrod_cFv */
 void daCrod_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpBallModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 804A3500-804A3580 000740 0080+00 1/1 0/0 0/0 .text            posMove__8daCrod_cFv */
 void daCrod_c::posMove() {
     speed.set(
         speedF * cM_ssin(current.angle.y) * cM_scos(current.angle.x),
@@ -173,14 +158,12 @@ void daCrod_c::posMove() {
     current.pos += speed;
 }
 
-/* 804A3580-804A35FC 0007C0 007C+00 2/2 0/0 0/0 .text            setBckAnm__8daCrod_cFUs */
 void daCrod_c::setBckAnm(u16 i_anmResID) {
     J3DAnmTransform* bck =
         (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), i_anmResID);
     mBck.init(bck, TRUE, -1, 1.0f, 0, -1, true);
 }
 
-/* 804A35FC-804A365C 00083C 0060+00 1/1 0/0 0/0 .text            setReturn__8daCrod_cFv */
 void daCrod_c::setReturn() {
     if (fopAcM_GetParam(this) == 4) {
         setBckAnm(ANM_WAIT_A_T);
@@ -191,7 +174,6 @@ void daCrod_c::setReturn() {
     mControllActorKeep.clearData();
 }
 
-/* 804A365C-804A36D8 00089C 007C+00 2/2 0/0 0/0 .text            setLightPower__8daCrod_cFv */
 void daCrod_c::setLightPower() {
     if (daAlink_getAlinkActorClass()->checkCopyRodTopUse()) {
         mLight.mPow = 300.0f;
@@ -202,7 +184,6 @@ void daCrod_c::setLightPower() {
     }
 }
 
-/* 804A36D8-804A3FB4 000918 08DC+00 1/1 0/0 0/0 .text            execute__8daCrod_cFv */
 int daCrod_c::execute() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -374,12 +355,10 @@ int daCrod_c::execute() {
     return 1;
 }
 
-/* 804A3FB4-804A3FD4 0011F4 0020+00 1/0 0/0 0/0 .text            daCrod_Execute__FP8daCrod_c */
 static int daCrod_Execute(daCrod_c* i_this) {
     return i_this->execute();
 }
 
-/* 804A3FD4-804A407C 001214 00A8+00 1/1 0/0 0/0 .text            draw__8daCrod_cFv */
 int daCrod_c::draw() {
     if (fopAcM_GetParam(this) == 6 ||
         (!daAlink_getAlinkActorClass()->checkCopyRodTopUse() && field_0x732 == 0))
@@ -393,19 +372,16 @@ int daCrod_c::draw() {
     return 1;
 }
 
-/* 804A407C-804A409C 0012BC 0020+00 1/0 0/0 0/0 .text            daCrod_Draw__FP8daCrod_c */
 static int daCrod_Draw(daCrod_c* i_this) {
     return i_this->draw();
 }
 
-/* 804A4194-804A41B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daCrod_Method */
 static actor_method_class l_daCrod_Method = {
     (process_method_func)daCrod_Create,  (process_method_func)daCrod_Delete,
     (process_method_func)daCrod_Execute, (process_method_func)NULL,
     (process_method_func)daCrod_Draw,
 };
 
-/* 804A41B4-804A41E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CROD */
 extern actor_process_profile_definition g_profile_CROD = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp
index 848da95d97..5f3c9f5003 100644
--- a/src/d/actor/d_a_cstaF.cpp
+++ b/src/d/actor/d_a_cstaF.cpp
@@ -17,35 +17,27 @@ enum daCstaF_Action {
     ACTION_FALL,
 };
 
-/* 804DD958-804DD978 000078 0020+00 1/1 0/0 0/0 .text
- * daCstaF_rideCB__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void daCstaF_rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     if (i_rideActor == (fopAc_ac_c*)daPy_getLinkPlayerActorClass()) {
         ((daCstaF_c*)i_this)->onPlayerRide();
     }
 }
 
-/* 804DF8B8-804DF8C4 000000 000C+00 7/7 0/0 0/0 .rodata          @3765 */
 static u8 const lit_3765[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804DF8C4-804DF8CC 00000C 0006+02 0/1 0/0 0/0 .rodata          l_arcNameF */
 static const char l_arcNameF[] = "CstaF";
 
-/* 804DF8CC-804DF8D4 000014 0007+01 0/2 0/0 0/0 .rodata          l_arcNameFB */
 static const char l_arcNameFB[] = "CstaFB";
 
-/* 804DF8D4-804DF8DC 00001C 0008+00 1/1 0/0 0/0 .rodata          l_spStageName */
 static const char l_spStageName[8] = "R_SP209";
 
-/* 804DF8DC-804DF8EC 000024 0010+00 0/2 0/0 0/0 .rodata          m_bckIdxTable__9daCstaF_c */
 const daCstaF_c::BckTbl daCstaF_c::m_bckIdxTable[] = {
     {9, 9, 8, 7},
     {9, 9, 8, 7}
 };
 
-/* 804DD978-804DDB48 000098 01D0+00 1/0 0/0 0/0 .text            CreateHeap__9daCstaF_cFv */
 int daCstaF_c::CreateHeap() {
     struct data {
         u16 bmd_idx;
@@ -86,14 +78,12 @@ int daCstaF_c::CreateHeap() {
     return 1;
 }
 
-/* 804DDB48-804DDBB4 000268 006C+00 2/2 0/0 0/0 .text            checkCoverModel__9daCstaF_cFv */
 BOOL daCstaF_c::checkCoverModel() {
             /* dSv_event_flag_c::F_0303 - Kakariko Village - Saw Shad's spell 2 */
     return !dComIfGs_isEventBit(0x2540)
            && strcmp(dComIfGp_getStartStageName(), l_spStageName) == 0;
 }
 
-/* 804DF9A0-804DF9E4 000000 0044+00 1/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0x0, {{AT_TYPE_THROW_OBJ, 0x1, 0x12}, {0xd97afddf, 0x11}, 0x79}}, // mObj
@@ -108,7 +98,6 @@ static dCcD_SrcCyl l_cylSrc = {
     } // mCyl
 };
 
-/* 804DDBB4-804DE0C4 0002D4 0510+00 1/1 0/0 0/0 .text            create__9daCstaF_cFv */
 int daCstaF_c::create() {
     fopAcM_ct(this, daCstaF_c);
 
@@ -204,12 +193,10 @@ int daCstaF_c::create() {
     return phase_state;
 }
 
-/* 804DE2D8-804DE2F8 0009F8 0020+00 1/0 0/0 0/0 .text            daCstaF_Create__FP10fopAc_ac_c */
 static int daCstaF_Create(fopAc_ac_c* i_this) {
     return ((daCstaF_c*)i_this)->create();
 }
 
-/* 804DE2F8-804DE51C 000A18 0224+00 1/1 0/0 0/0 .text            __dt__9daCstaF_cFv */
 daCstaF_c::~daCstaF_c() {
     m_sound.deleteObject();
 
@@ -220,14 +207,12 @@ daCstaF_c::~daCstaF_c() {
     dComIfG_resDelete(&m_phase, m_arcName);
 }
 
-/* 804DE51C-804DE558 000C3C 003C+00 1/0 0/0 0/0 .text            daCstaF_Delete__FP9daCstaF_c */
 static int daCstaF_Delete(daCstaF_c* a_this) {
     a_this->MoveBGDelete();
     a_this->~daCstaF_c();
     return 1;
 }
 
-/* 804DE558-804DE5F0 000C78 0098+00 2/2 0/0 0/0 .text            setRoomInfo__9daCstaF_cFv */
 void daCstaF_c::setRoomInfo() {
     int room_no;
     if (m_acch.GetGroundH() != -G_CM3D_F_INF) {
@@ -243,7 +228,6 @@ void daCstaF_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, room_no);
 }
 
-/* 804DE5F0-804DE698 000D10 00A8+00 2/2 0/0 0/0 .text            setMatrix__9daCstaF_cFv */
 void daCstaF_c::setMatrix() {
     static const Vec fieldLocalBallPos = {0.0f, 200.0f, 0.0f};
 
@@ -257,7 +241,6 @@ void daCstaF_c::setMatrix() {
     eyePos = attention_info.position;
 }
 
-/* 804DE698-804DEB18 000DB8 0480+00 1/1 0/0 0/0 .text            posMove__9daCstaF_cFv */
 void daCstaF_c::posMove() {
     BOOL pre_gnd_hit = m_acch.ChkGroundHit();
     m_acch.OffLineCheck();
@@ -336,7 +319,6 @@ void daCstaF_c::posMove() {
     }
 }
 
-/* 804DEB60-804DEC14 001280 00B4+00 1/1 0/0 0/0 .text            setCollision__9daCstaF_cFv */
 void daCstaF_c::setCollision() {
     m_cc_stts.Move();
 
@@ -355,10 +337,8 @@ void daCstaF_c::setCollision() {
     dComIfG_Ccsp()->Set(&m_cc_cyl);
 }
 
-/* 804DFAD8-804DFADC 000000 0004+00 2/2 0/0 0/0 .bss             l_cancelOffset */
 static f32 l_cancelOffset = JMAFastSqrt(73225.008f) + 100.0f;
 
-/* 804DEC14-804DF0D8 001334 04C4+00 1/1 0/0 0/0 .text            setAnime__9daCstaF_cFv */
 void daCstaF_c::setAnime() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -454,13 +434,11 @@ void daCstaF_c::setAnime() {
     m_brk.play();
 }
 
-/* 804DF0D8-804DF150 0017F8 0078+00 3/3 0/0 0/0 .text            initBrk__9daCstaF_cFUs */
 BOOL daCstaF_c::initBrk(u16 i_brkIdx) {
     void* pbrk = dComIfG_getObjectRes(m_arcName, i_brkIdx);
     m_brk.init(mp_model->getModelData(), (J3DAnmTevRegKey*)pbrk, 1, -1, 1.0f, 0, -1);
 }
 
-/* 804DF150-804DF1A4 001870 0054+00 2/2 0/0 0/0 .text            initStopBrkBtk__9daCstaF_cFv */
 void daCstaF_c::initStopBrkBtk() {
     static const u16 brkIdx[] = {16, 17};
 
@@ -469,7 +447,6 @@ void daCstaF_c::initStopBrkBtk() {
     m_isStop = TRUE;
 }
 
-/* 804DF1A4-804DF37C 0018C4 01D8+00 1/1 0/0 0/0 .text            initStartBrkBtk__9daCstaF_cFv */
 void daCstaF_c::initStartBrkBtk() {
     m_isStartBrkBtkInit = TRUE;
     m_btk.setFrame(0.0f);
@@ -490,7 +467,6 @@ void daCstaF_c::initStartBrkBtk() {
     }
 }
 
-/* 804DF37C-804DF6C4 001A9C 0348+00 1/0 0/0 0/0 .text            Execute__9daCstaF_cFPPA3_A4_f */
 int daCstaF_c::Execute(Mtx** param_0) {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -567,12 +543,10 @@ int daCstaF_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 804DF6C4-804DF6E4 001DE4 0020+00 1/0 0/0 0/0 .text            daCstaF_Execute__FP9daCstaF_c */
 static int daCstaF_Execute(daCstaF_c* a_this) {
     return a_this->MoveBGExecute();
 }
 
-/* 804DF6E4-804DF800 001E04 011C+00 1/0 0/0 0/0 .text            Draw__9daCstaF_cFv */
 int daCstaF_c::Draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mp_model, &tevStr);
@@ -590,12 +564,10 @@ int daCstaF_c::Draw() {
     return 1;
 }
 
-/* 804DF800-804DF82C 001F20 002C+00 1/0 0/0 0/0 .text            daCstaF_Draw__FP9daCstaF_c */
 static int daCstaF_Draw(daCstaF_c* a_this) {
     return a_this->MoveBGDraw();
 }
 
-/* 804DF9E4-804DFA04 -00001 0020+00 1/0 0/0 0/0 .data            l_daCstaF_Method */
 static actor_method_class l_daCstaF_Method = {
     (process_method_func)daCstaF_Create,
     (process_method_func)daCstaF_Delete,
@@ -604,7 +576,6 @@ static actor_method_class l_daCstaF_Method = {
     (process_method_func)daCstaF_Draw,
 };
 
-/* 804DFA04-804DFA34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CSTAF */
 extern actor_process_profile_definition g_profile_CSTAF = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp
index d51d792a60..4435487b75 100644
--- a/src/d/actor/d_a_cstatue.cpp
+++ b/src/d/actor/d_a_cstatue.cpp
@@ -15,10 +15,8 @@
 
 static u8 const unused[12] = {};
 
-/* 806676A4-806676AC 00000C 0008+00 0/1 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[8] = "Cstatue";
 
-/* 806676AC-806676B4 000014 0007+01 0/1 0/0 0/0 .rodata          l_arcNameBS */
 static char const l_arcNameBS[7] = "CstaBS";
 
 enum CStatueAnim {
@@ -121,21 +119,17 @@ static dCcD_SrcSph l_sphSrc = {
     }  // mSphAttr
 };
 
-/* 806636AC-806636C8 0000EC 001C+00 1/1 0/0 0/0 .text atHitCallback__11daCstatue_cFP10fopAc_ac_c */
 void daCstatue_c::atHitCallback(fopAc_ac_c* actor) {
     if (fopAcM_GetName(actor) == PROC_B_GM) {
         onStateFlg0(daCstatue_FLG0_100);
     }
 }
 
-/* 806636C8-806636EC 000108 0024+00 1/1 0/0 0/0 .text
- * daCstatue_atHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daCstatue_atHitCallback(fopAc_ac_c* statue, dCcD_GObjInf* _objInfA, fopAc_ac_c* actor,
                                     dCcD_GObjInf* _objInfB) {
     static_cast<daCstatue_c*>(statue)->atHitCallback(actor);
 }
 
-/* 806636EC-80663AA4 00012C 03B8+00 1/1 0/0 0/0 .text            createHeap__11daCstatue_cFv */
 int daCstatue_c::createHeap() {
     static struct CStatueTblData const dataTbl[daCstatueType_N] = {
         // daCstatueType_NORMAL
@@ -207,12 +201,10 @@ int daCstatue_c::createHeap() {
     return cPhs_LOADING_e;
 }
 
-/* 80663D08-80663D28 000748 0020+00 1/1 0/0 0/0 .text daCstatue_createHeap__FP10fopAc_ac_c */
 static int daCstatue_createHeap(fopAc_ac_c* actor) {
     return static_cast<daCstatue_c*>(actor)->createHeap();
 }
 
-/* 80663D28-8066469C 000768 0974+00 1/1 0/0 0/0 .text            create__11daCstatue_cFv */
 int daCstatue_c::create() {
     static f32 const bossSphR[9] = {450.0f, 200.0f, 250.0f, 220.0f, 280.0f,
                                     200.0f, 250.0f, 220.0f, 280.0f};
@@ -405,12 +397,10 @@ int daCstatue_c::create() {
     return result;
 }
 
-/* 80664820-80664840 001260 0020+00 1/0 0/0 0/0 .text            daCstatue_Create__FP10fopAc_ac_c */
 static int daCstatue_Create(void* actor) {
     return static_cast<daCstatue_c*>(actor)->create();
 }
 
-/* 80664840-80664A78 001280 0238+00 1/1 0/0 0/0 .text            __dt__11daCstatue_cFv */
 daCstatue_c::~daCstatue_c() {
     mSound.deleteObject();
     if (mpMorf) {
@@ -423,14 +413,11 @@ daCstatue_c::~daCstatue_c() {
     dComIfG_resDelete(&mPhaseReq, mResName);
 }
 
-/* 80664A78-80664AA0 0014B8 0028+00 1/0 0/0 0/0 .text            daCstatue_Delete__FP11daCstatue_c
- */
 static int daCstatue_Delete(void* actor) {
     static_cast<daCstatue_c*>(actor)->~daCstatue_c();
     return cPhs_LOADING_e;
 }
 
-/* 80664AA0-80664B38 0014E0 0098+00 2/2 0/0 0/0 .text            setRoomInfo__11daCstatue_cFv */
 void daCstatue_c::setRoomInfo() {
     int roomId;
     if (mStatueAcch.GetGroundH() != -G_CM3D_F_INF) {
@@ -445,7 +432,6 @@ void daCstatue_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, roomId);
 }
 
-/* 80664B38-80664C9C 001578 0164+00 2/2 0/0 0/0 .text            setMatrix__11daCstatue_cFv */
 void daCstatue_c::setMatrix() {
     static Vec const normalLocalBallPos = {70.0f, 0.0f, 0.0f};
     static Vec const smallLocalBallPos = {0.0f, 35.0f, 0.0f};
@@ -471,7 +457,6 @@ void daCstatue_c::setMatrix() {
     eyePos = attention_info.position;
 }
 
-/* 80664C9C-80665514 0016DC 0878+00 1/1 0/0 0/0 .text            posMove__11daCstatue_cFv */
 void daCstatue_c::posMove() {
     if (checkStateFlg0(daCstatue_FLG0_8)) {
         mStatueAcch.CrrPos(dComIfG_Bgsp());
@@ -634,7 +619,6 @@ void daCstatue_c::posMove() {
     }
 }
 
-/* 8066555C-80665E14 001F9C 08B8+00 1/1 0/0 0/0 .text            setCollision__11daCstatue_cFv */
 void daCstatue_c::setCollision() {
     static Vec const localTop = {0.0f, 90.0f, 0.0f};
     static Vec const localRoot = {0.0f, -30.0f, 0.0f};
@@ -783,8 +767,6 @@ void daCstatue_c::setCollision() {
     }
 }
 
-/* 80665E14-80665F80 002854 016C+00 1/1 0/0 0/0 .text            checkHammerReverse__11daCstatue_cFv
- */
 BOOL daCstatue_c::checkHammerReverse() {
     if (!checkStateFlg0(daCstatue_FLG0_10)) {
         return false;
@@ -803,7 +785,6 @@ BOOL daCstatue_c::checkHammerReverse() {
     return false;
 }
 
-/* 80665F80-80666390 0029C0 0410+00 1/1 0/0 0/0 .text            setDemo__11daCstatue_cFv */
 void daCstatue_c::setDemo() {
     static Vec const hitEffectCenter = {-2.031f, 120.438995f, 320.46704f};
     static Vec const hitEffectEye = {-2.031f, -80.761f, 642.828f};
@@ -878,7 +859,6 @@ void daCstatue_c::setDemo() {
     }
 }
 
-/* 80666390-80666B80 002DD0 07F0+00 1/1 0/0 0/0 .text            setAnime__11daCstatue_cFv */
 void daCstatue_c::setAnime() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     daCstatue_c* controlledActor = static_cast<daCstatue_c*>(link->getCopyRodControllActor());
@@ -1035,14 +1015,12 @@ void daCstatue_c::setAnime() {
     mAnim2.play();
 }
 
-/* 80666B80-80666BF8 0035C0 0078+00 3/3 0/0 0/0 .text            initBrk__11daCstatue_cFUs */
 int daCstatue_c::initBrk(u16 i_index) {
     J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)::dComIfG_getObjectRes(mResName, i_index);
     J3DModelData* ctx = mModel->getModelData();
     return mAnim2.init(ctx, key, 1, -1, 1.0f, 0, -1);
 }
 
-/* 80666BF8-80666C38 003638 0040+00 2/2 0/0 0/0 .text            initStopBrkBtk__11daCstatue_cFv */
 void daCstatue_c::initStopBrkBtk() {
     static const u16 brkIdx[daCstatueType_N] = {0x1F, 0x1C, 0x1D, 0x12, 0x12};
 
@@ -1050,7 +1028,6 @@ void daCstatue_c::initStopBrkBtk() {
     initBrk(brkIdx[mType]);
 }
 
-/* 80666C38-80666DE8 003678 01B0+00 2/2 0/0 0/0 .text            initStartBrkBtk__11daCstatue_cFv */
 void daCstatue_c::initStartBrkBtk() {
     static const u16 brkIdx[daCstatueType_N] = {0x1E, 0x1B, 0x1D, 0x11, 0x11};
 
@@ -1068,7 +1045,6 @@ void daCstatue_c::initStartBrkBtk() {
     }
 }
 
-/* 80666DE8-80667418 003828 0630+00 1/1 0/0 0/0 .text            execute__11daCstatue_cFv */
 int daCstatue_c::execute() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     mBossAtGndHit = 0;
@@ -1190,13 +1166,10 @@ int daCstatue_c::execute() {
     return 1;
 }
 
-/* 80667418-80667438 003E58 0020+00 1/0 0/0 0/0 .text            daCstatue_Execute__FP11daCstatue_c
- */
 static int daCstatue_Execute(void* actor) {
     return static_cast<daCstatue_c*>(actor)->execute();
 }
 
-/* 80667438-80667610 003E78 01D8+00 1/1 0/0 0/0 .text            draw__11daCstatue_cFv */
 int daCstatue_c::draw() {
     int tevstrType = checkBossType() ? 0x10 : 8;
     g_env_light.settingTevStruct(tevstrType, &current.pos, &tevStr);
@@ -1227,17 +1200,14 @@ int daCstatue_c::draw() {
     return 1;
 }
 
-/* 80667610-80667630 004050 0020+00 1/0 0/0 0/0 .text            daCstatue_Draw__FP11daCstatue_c */
 static int daCstatue_Draw(void* actor) {
     return static_cast<daCstatue_c*>(actor)->draw();
 }
 
-/* 80667AA0-80667AC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daCstatue_Method */
 static actor_method_class l_daCstatue_Method = {
     daCstatue_Create, daCstatue_Delete, daCstatue_Execute, NULL, daCstatue_Draw,
 };
 
-/* 80667AC0-80667AF0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_CSTATUE */
 extern actor_process_profile_definition g_profile_CSTATUE = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp
index e9ecc05393..f5cab16b26 100644
--- a/src/d/actor/d_a_demo00.cpp
+++ b/src/d/actor/d_a_demo00.cpp
@@ -45,7 +45,6 @@ static UnknownLightData l_lightData = {
 static const u8 lit_3727[0xC] = {};
 #endif
 
-/* 804A430C-804A4338 0000EC 002C+00 3/3 0/0 0/0 .text            reset__16daDemo00_resID_cFv */
 void daDemo00_resID_c::reset() {
     mShapeID = -1;
     field_0x4 = -1;
@@ -58,7 +57,6 @@ void daDemo00_resID_c::reset() {
     field_0x20 = -1;
 }
 
-/* 804A4338-804A4388 000118 0050+00 1/1 0/0 0/0 .text            reset__16daDemo00_model_cFv */
 void daDemo00_model_c::reset() {
     mID.reset();
     field_0x5d4 = NULL;
@@ -71,7 +69,6 @@ void daDemo00_model_c::reset() {
     mpBlkAnm = NULL;
 }
 
-/* 804A4388-804A4420 000168 0098+00 1/1 0/0 0/0 .text            __dt__10daDemo00_cFv */
 daDemo00_c::~daDemo00_c() {
     if (heap != NULL) {
         if (mModel.mpModelMorf != NULL) {
@@ -96,7 +93,6 @@ inline int daDemo00_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804A4520-804A45A0 000300 0080+00 1/1 0/0 0/0 .text            get_foward_angle__FP4cXyzP4cXyzPsPs */
 static void get_foward_angle(cXyz* param_1, cXyz* param_2, s16* param_3, s16* param_4) {
     cXyz sp38;
     if (param_1 == NULL || param_2 == NULL || param_3 == NULL || param_4 == NULL) {
@@ -109,7 +105,6 @@ static void get_foward_angle(cXyz* param_1, cXyz* param_2, s16* param_3, s16* pa
     *param_4 = sp38.atan2sX_Z();
 }
 
-/* 804A45A0-804A4948 000380 03A8+00 2/2 0/0 0/0 .text            setBaseMtx__10daDemo00_cFv */
 void daDemo00_c::setBaseMtx() {
     s16 sVar1, sVar2;
     cXyz sp38;
@@ -169,7 +164,6 @@ void daDemo00_c::setBaseMtx() {
     mModel.field_0x5d4->setBaseScale(scale);
 }
 
-/* 804A4948-804A4D48 000728 0400+00 1/1 0/0 0/0 .text            setShadowSize__10daDemo00_cFv */
 void daDemo00_c::setShadowSize() {
     J3DModelData* modelData = mModel.field_0x5d4->getModelData();
     cXyz min(100000000.0f, 100000000.0f, 100000000.0f);
@@ -200,7 +194,6 @@ void daDemo00_c::setShadowSize() {
     mModel.mShadow->field_0x20 = spc8.absXZ() * 0.25f;
 }
 
-/* 804A4D48-804A4F54 000B28 020C+00 1/1 0/0 0/0 .text            awaCheck__FP8J3DModel */
 static BOOL awaCheck(J3DModel* i_model) {
     J3DModelData* modelData = i_model->getModelData();
     J3DTexture* texture = modelData->getTexture();
@@ -232,13 +225,11 @@ static BOOL awaCheck(J3DModel* i_model) {
     return TRUE;
 }
 
-/* 804A4F54-804A4F74 000D34 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c */
 static int createHeapCallBack(fopAc_ac_c* a_this) {
     daDemo00_c* i_this = (daDemo00_c*)a_this;
     return i_this->createHeap();
 }
 
-/* 804A4F74-804A5750 000D54 07DC+00 1/1 0/0 0/0 .text            createHeap__10daDemo00_cFv */
 int daDemo00_c::createHeap() {
     if (mModel.mID.mShapeID != -1) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.mShapeID);
@@ -460,7 +451,6 @@ int daDemo00_c::createHeap() {
     return 1;
 }
 
-/* 804A5798-804A594C 001578 01B4+00 2/0 0/0 0/0 .text actStandby__10daDemo00_cFP13dDemo_actor_c */
 int daDemo00_c::actStandby(dDemo_actor_c* actor) {
     if (field_0x588.mShapeID != -1) {
         mModel.mID = field_0x588;
@@ -493,7 +483,6 @@ int daDemo00_c::actStandby(dDemo_actor_c* actor) {
     return 1;
 }
 
-/* 804A594C-804A604C 00172C 0700+00 1/0 0/0 0/0 .text            actPerformance__10daDemo00_cFP13dDemo_actor_c */
 int daDemo00_c::actPerformance(dDemo_actor_c* actor) {
     f32 fVar1;
     if (mModel.mID.mShapeID != field_0x588.mShapeID) {
@@ -727,7 +716,6 @@ int daDemo00_c::actPerformance(dDemo_actor_c* actor) {
     return 1;
 }
 
-/* 804A604C-804A60B0 001E2C 0064+00 1/0 0/0 0/0 .text            actLeaving__10daDemo00_cFP13dDemo_actor_c */
 int daDemo00_c::actLeaving(dDemo_actor_c* actor) {
     if (mModel.mpModelMorf != NULL) {
         mModel.mpModelMorf->stopZelAnime();
@@ -738,7 +726,6 @@ int daDemo00_c::actLeaving(dDemo_actor_c* actor) {
     return 1;
 }
 
-/* 804A7BA8-804A84AC 003988 0904+00 7/1 0/0 0/0 .text            execute__10daDemo00_cFv */
 inline int daDemo00_c::execute() {
     field_0x6a1 = 0;
     dDemo_actor_c* actor = dDemo_c::getActor(demoActorID);
@@ -1206,7 +1193,6 @@ inline int daDemo00_c::execute() {
     return 1;
 }
 
-/* 804A60B0-804A61F0 001E90 0140+00 1/1 0/0 0/0 .text            mDad00_changeXluMaterial__FP11J3DMateriali */
 static void mDad00_changeXluMaterial(J3DMaterial* i_material, int param_2) {
     static J3DBlendInfo l_blendInfoOPA = {
         0,
@@ -1252,7 +1238,6 @@ static void mDad00_changeXluMaterial(J3DMaterial* i_material, int param_2) {
     }
 }
 
-/* 804A61F0-804A6428 001FD0 0238+00 1/1 0/0 0/0 .text            teduna_calc__FP4cXyzP4cXyzP4cXyzsi */
 static void teduna_calc(cXyz* param_1, cXyz* param_2, cXyz* param_3, s16 param_4, int param_5) {
     cXyz sp70(*param_1 - *param_2);
     f32 f31;
@@ -1281,19 +1266,14 @@ static void teduna_calc(cXyz* param_1, cXyz* param_2, cXyz* param_3, s16 param_4
     }
 }
 
-/* 804A8C64-804A8D24 000054 00C0+00 1/3 0/0 0/0 .bss             teduna_posL */
 static cXyz teduna_posL[16];
 
-/* 804A8D30-804A8DF0 000120 00C0+00 1/3 0/0 0/0 .bss             teduna_posR */
 static cXyz teduna_posR[16];
 
-/* 804A8DFC-804A8E08 0001EC 000C+00 2/4 0/0 0/0 .bss             S_ganon_left_hand_pos */
 static cXyz S_ganon_left_hand_pos;
 
-/* 804A8E14-804A8E20 000204 000C+00 2/4 0/0 0/0 .bss             S_ganon_right_hand_pos */
 static cXyz S_ganon_right_hand_pos;
 
-/* 804A6428-804A6868 002208 0440+00 1/1 0/0 0/0 .text            teduna_draw__FP8J3DModelP19mDoExt_3DlineMat1_cP12dKy_tevstr_ciiii */
 static void teduna_draw(J3DModel* i_model, mDoExt_3DlineMat1_c* param_2, dKy_tevstr_c* param_3, int param_4, int param_5, int param_6, int param_7) {
     static GXColor l_color = {
         0x14, 0x0F, 0x00, 0xFF,
@@ -1380,7 +1360,6 @@ static void teduna_draw(J3DModel* i_model, mDoExt_3DlineMat1_c* param_2, dKy_tev
     dComIfGd_set3DlineMat(param_2);
 }
 
-/* 804A6868-804A692C 002648 00C4+00 1/1 0/0 0/0 .text teduna_ganon_hand_set__FP8J3DModelii */
 static void teduna_ganon_hand_set(J3DModel* i_model, int param_2, int param_3) {
     cXyz sp20;
 
@@ -1393,7 +1372,6 @@ static void teduna_ganon_hand_set(J3DModel* i_model, int param_2, int param_3) {
     mDoMtx_stack_c::multVec(&sp20, &S_ganon_right_hand_pos);
 }
 
-/* 804A692C-804A6C48 00270C 031C+00 1/1 0/0 0/0 .text ke_control__FP10daDemo00_cP12demo_s1_ke_sif */
 static void ke_control(daDemo00_c* i_this, demo_s1_ke_s* param_2, int param_3, f32 param_4) {
     param_3;
     fopAc_ac_c* actor = i_this;
@@ -1468,7 +1446,6 @@ static void ke_control(daDemo00_c* i_this, demo_s1_ke_s* param_2, int param_3, f
     }
 }
 
-/* 804A6C48-804A6D20 002A28 00D8+00 1/1 0/0 0/0 .text            ke_move__FP10daDemo00_cP19mDoExt_3DlineMat0_cP12demo_s1_ke_sif */
 static void ke_move(daDemo00_c* i_this, mDoExt_3DlineMat0_c* param_2, demo_s1_ke_s* param_3, int param_4, f32 param_5) {
     ke_control(i_this, param_3, param_4, param_5);
     cXyz* pcVar1 = param_2->getPos(param_4);
@@ -1486,7 +1463,6 @@ static void ke_move(daDemo00_c* i_this, mDoExt_3DlineMat0_c* param_2, demo_s1_ke
     }
 }
 
-/* 804A6D20-804A6F74 002B00 0254+00 1/1 0/0 0/0 .text            ke_set__FP10daDemo00_c */
 static void ke_set(daDemo00_c* i_this) {
     static s16 ke_za[22] = {
         0xFCE0, 0xFE70, 0, 0x0190, 0x0320, 0xFCE0, 0xFE70, 0, 0x0190, 0x0320, 
@@ -1529,12 +1505,10 @@ static void ke_set(daDemo00_c* i_this) {
     }
 }
 
-/* 804A6F74-804A6F94 002D54 0020+00 1/0 0/0 0/0 .text            daDemo00_Draw__FP10daDemo00_c */
 static int daDemo00_Draw(daDemo00_c* i_this) {
     return i_this->draw();
 }
 
-/* 804A6F94-804A7B88 002D74 0BF4+00 1/1 0/0 0/0 .text            draw__10daDemo00_cFv */
 int daDemo00_c::draw() {
     f32 f31 = 15.0f;
     if (mModel.field_0x5d4 != NULL) {
@@ -1847,24 +1821,20 @@ int daDemo00_c::draw() {
     return 1;
 }
 
-/* 804A7B88-804A7BA8 003968 0020+00 1/0 0/0 0/0 .text            daDemo00_Execute__FP10daDemo00_c */
 static int daDemo00_Execute(daDemo00_c* i_this) {
     return i_this->execute();
 }
 
-/* 804A84AC-804A84B4 00428C 0008+00 1/0 0/0 0/0 .text            daDemo00_IsDelete__FP10daDemo00_c */
 static int daDemo00_IsDelete(daDemo00_c* i_this) {
     return 1;
 }
 
-/* 804A84B4-804A84DC 004294 0028+00 1/0 0/0 0/0 .text            daDemo00_Delete__FP10daDemo00_c */
 static int daDemo00_Delete(daDemo00_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Demo00");
     i_this->~daDemo00_c();
     return 1;
 }
 
-/* 804A84DC-804A86B4 0042BC 01D8+00 1/0 0/0 0/0 .text            daDemo00_Create__FP10fopAc_ac_c */
 static int daDemo00_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daDemo00_c, i_this, "Demo00");
     fopAcM_ct(a_this, daDemo00_c);
@@ -1914,7 +1884,6 @@ class JAUSectionHeap;
 template<>
 JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance;
 
-/* 804A8B94-804A8BB4 -00001 0020+00 1/0 0/0 0/0 .data            l_daDemo00_Method */
 static actor_method_class l_daDemo00_Method = {
     (process_method_func)daDemo00_Create,
     (process_method_func)daDemo00_Delete,
@@ -1923,7 +1892,6 @@ static actor_method_class l_daDemo00_Method = {
     (process_method_func)daDemo00_Draw,
 };
 
-/* 804A8BB4-804A8BE4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DEMO00 */
 extern actor_process_profile_definition g_profile_DEMO00 = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 16af2ff6e9..25807e3dea 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -14,13 +14,10 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 804E1C34-804E1C40 000054 000C+00 0/2 0/0 0/0 .bss             l_player_offset */
 static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f);
 
-/* 804E1C4C-804E1C58 00006C 000C+00 0/2 0/0 0/0 .bss             l_wolf_offset */
 static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f);
 
-/* 804E1C64-804E1C70 000084 000C+00 0/2 0/0 0/0 .bss             l_horse_offset */
 static cXyz l_horse_offset = cXyz(0.0f, 20.0f, 54.0f);
 
 #ifdef DEBUG
@@ -57,15 +54,12 @@ public:
 
 #endif
 
-/* 804DFBCC-804DFBD4 0000EC 0008+00 1/0 0/0 0/0 .text            __CreateHeap__9daDitem_cFv */
 int daDitem_c::__CreateHeap() {
     return 1;
 }
 
-/* 804E19D4-804E19D8 000000 0004+00 6/6 0/0 0/0 .rodata          l_light_color */
 static const GXColor l_light_color = {0x8C, 0x7C, 0x6A, 0xFF};
 
-/* 804DFBD4-804DFC98 0000F4 00C4+00 1/1 0/0 0/0 .text            CreateInit__9daDitem_cFv */
 int daDitem_c::CreateInit() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
@@ -88,7 +82,6 @@ int daDitem_c::CreateInit() {
     return 1;
 }
 
-/* 804DFC98-804DFD10 0001B8 0078+00 1/1 0/0 0/0 .text            action__9daDitem_cFv */
 void daDitem_c::action() {
     switch (mAction) {
     case ACTION_START_e:
@@ -108,7 +101,6 @@ void daDitem_c::action() {
     followInsectEffect();
 }
 
-/* 804DFD10-804E00A0 000230 0390+00 1/1 0/0 0/0 .text            actionStart__9daDitem_cFv */
 void daDitem_c::actionStart() {
     if (chkDraw()) {
         if (!chkArgFlag(0x2) && !chkArgFlag(0x4) && !mSetLightEff) {
@@ -166,7 +158,6 @@ void daDitem_c::actionStart() {
     }
 }
 
-/* 804E00DC-804E0A50 0005FC 0974+00 1/1 0/0 0/0 .text            actionEvent__9daDitem_cFv */
 void daDitem_c::actionEvent() {
     if (mSetLightEff) {
         cLib_addCalc2(&mLight.mPow, mLightStrength, 0.1f, 1.0f);
@@ -271,7 +262,6 @@ void daDitem_c::actionEvent() {
     }
 }
 
-/* 804E0A50-804E0B40 000F70 00F0+00 1/1 0/0 0/0 .text            actionWaitLightEnd__9daDitem_cFv */
 void daDitem_c::actionWaitLightEnd() {
     BOOL particle_hidden = TRUE;
 
@@ -298,12 +288,10 @@ void daDitem_c::actionWaitLightEnd() {
     }
 }
 
-/* 804E0B40-804E0B60 001060 0020+00 1/1 0/0 0/0 .text            actionEnd__9daDitem_cFv */
 void daDitem_c::actionEnd() {
     fopAcM_delete(this);
 }
 
-/* 804E0B60-804E0C44 001080 00E4+00 1/1 0/0 0/0 .text            setInsectEffect__9daDitem_cFv */
 void daDitem_c::setInsectEffect() {
     if (!chkArgFlag(0x2) && !chkArgFlag(0x4)) {
         field_0x994 = dComIfGp_particle_set(0xA1B, &current.pos, &home.angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -312,7 +300,6 @@ void daDitem_c::setInsectEffect() {
     field_0x998 = dComIfGp_particle_set(0xA1C, &current.pos, &home.angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 804E0C44-804E0CB0 001164 006C+00 1/1 0/0 0/0 .text            followInsectEffect__9daDitem_cFv */
 void daDitem_c::followInsectEffect() {
     if (field_0x994 != NULL) {
         field_0x994->setGlobalTranslation(current.pos);
@@ -323,7 +310,6 @@ void daDitem_c::followInsectEffect() {
     }
 }
 
-/* 804E0CB0-804E0D44 0011D0 0094+00 2/2 0/0 0/0 .text            endInsectEffect__9daDitem_cFv */
 void daDitem_c::endInsectEffect() {
     if (field_0x994 != NULL) {
         field_0x994->stopCreateParticle();
@@ -340,7 +326,6 @@ void daDitem_c::endInsectEffect() {
     }
 }
 
-/* 804E0D44-804E0DB4 001264 0070+00 1/1 0/0 0/0 .text            onEventReg__9daDitem_cFii */
 void daDitem_c::onEventReg(int i_regNo, int i_value) {
     static u16 const l_event_reg[] = {
         0xF0FF, 0xEFFF, 0xEEFF, 0xEDFF, 0xECFF, 0xEBFF,
@@ -355,7 +340,6 @@ void daDitem_c::onEventReg(int i_regNo, int i_value) {
     OS_REPORT("ハートの欠片：%d %d\n", i_regNo, i_value);
 }
 
-/* 804E0DB4-804E105C 0012D4 02A8+00 1/1 0/0 0/0 .text            set_pos__9daDitem_cFv */
 void daDitem_c::set_pos() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -396,12 +380,10 @@ void daDitem_c::set_pos() {
     current.pos = pos;
 }
 
-/* 804E105C-804E1098 00157C 003C+00 1/1 0/0 0/0 .text            anim_control__9daDitem_cFv */
 void daDitem_c::anim_control() {
     animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
 }
 
-/* 804E1098-804E10D0 0015B8 0038+00 1/1 0/0 0/0 .text            initEffectLight__9daDitem_cFv */
 void daDitem_c::initEffectLight() {
     mLight.mColor.r = l_light_color.r;
     mLight.mColor.g = l_light_color.g;
@@ -411,14 +393,12 @@ void daDitem_c::initEffectLight() {
     mSetLightEff = false;
 }
 
-/* 804E10D0-804E111C 0015F0 004C+00 2/2 0/0 0/0 .text            settingEffectLight__9daDitem_cFv */
 void daDitem_c::settingEffectLight() {
     f32 var_f31 = mpModel->getModelData()->getJointNodePointer(0)->getMax()->y;
     mLight.mPosition.set(current.pos.x, current.pos.y + (var_f31 * 0.5f), current.pos.z);
     mLightStrength = 8.0f;
 }
 
-/* 804E111C-804E11D4 00163C 00B8+00 2/2 0/0 0/0 .text            set_mtx__9daDitem_cFv */
 void daDitem_c::set_mtx() {
     mpModel->setBaseScale(scale);
 
@@ -432,16 +412,13 @@ void daDitem_c::set_mtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 804E11D4-804E122C 0016F4 0058+00 1/0 0/0 0/0 .text            setTevStr__9daDitem_cFv */
 void daDitem_c::setTevStr() {
     g_env_light.settingTevStruct(14, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
 }
 
-/* 804E122C-804E1230 00174C 0004+00 1/0 0/0 0/0 .text            setListStart__9daDitem_cFv */
 void daDitem_c::setListStart() {}
 
-/* 804E1230-804E12C8 001750 0098+00 1/1 0/0 0/0 .text            draw_WOOD_STICK__9daDitem_cFv */
 void daDitem_c::draw_WOOD_STICK() {
     static const char nodisp_mat[] = "parts_m";
     
@@ -474,7 +451,6 @@ int daDitem_c::Delete() {
     return DeleteBase(dItem_data::getArcName(m_itemNo));
 }
 
-/* 804E12C8-804E13C8 0017E8 0100+00 1/0 0/0 0/0 .text            daDitem_Delete__FP9daDitem_c */
 static int daDitem_Delete(daDitem_c* i_this) {
     return i_this->Delete();
 }
@@ -514,7 +490,6 @@ int daDitem_c::create() {
     return phase_state;
 }
 
-/* 804E13C8-804E15BC 0018E8 01F4+00 1/0 0/0 0/0 .text            daDitem_Create__FP9daDitem_c */
 static int daDitem_Create(daDitem_c* i_this) {
     return i_this->create();
 }
@@ -557,7 +532,6 @@ int daDitem_c::execute() {
     return 1;
 }
 
-/* 804E16BC-804E1878 001BDC 01BC+00 1/0 0/0 0/0 .text            daDitem_Execute__FP9daDitem_c */
 static int daDitem_Execute(daDitem_c* i_this) {
     return i_this->execute();
 }
@@ -573,12 +547,10 @@ int daDitem_c::draw() {
     return 1;
 }
 
-/* 804E1878-804E18CC 001D98 0054+00 1/0 0/0 0/0 .text            daDitem_Draw__FP9daDitem_c */
 static int daDitem_Draw(daDitem_c* i_this) {
     return i_this->draw();
 }
 
-/* 804E1B10-804E1B30 -00001 0020+00 1/0 0/0 0/0 .data            l_daDitem_Method */
 static actor_method_class l_daDitem_Method = {
     (process_method_func)daDitem_Create,
     (process_method_func)daDitem_Delete,
@@ -587,7 +559,6 @@ static actor_method_class l_daDitem_Method = {
     (process_method_func)daDitem_Draw,
 };
 
-/* 804E1B30-804E1B60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Demo_Item */
 extern actor_process_profile_definition g_profile_Demo_Item = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 99ca78f15b..d098009ede 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -9,12 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 804A8F18-804A8F20 000078 0008+00 1/0 0/0 0/0 .text daDisappear_Draw__FP15disappear_class */
 static int daDisappear_Draw(disappear_class* i_this) {
     return 1;
 }
 
-/* 804A8F20-804A8F6C 000080 004C+00 1/1 0/0 0/0 .text            s_ks_sub__FPvPv */
 static void* s_ks_sub(void* i_actor, void*) {
     fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
 
@@ -25,7 +23,6 @@ static void* s_ks_sub(void* i_actor, void*) {
     return NULL;
 }
 
-/* 804A8F6C-804A8FA8 0000CC 003C+00 1/0 0/0 0/0 .text daDisappear_Execute__FP15disappear_class */
 static int daDisappear_Execute(disappear_class* i_this) {
     if (i_this->mDeleteTimer != 0) {
         i_this->mDeleteTimer--;
@@ -36,17 +33,14 @@ static int daDisappear_Execute(disappear_class* i_this) {
     return 1;
 }
 
-/* 804A8FA8-804A8FB0 000108 0008+00 1/0 0/0 0/0 .text daDisappear_IsDelete__FP15disappear_class */
 static int daDisappear_IsDelete(disappear_class* i_this) {
     return 1;
 }
 
-/* 804A8FB0-804A8FB8 000110 0008+00 1/0 0/0 0/0 .text daDisappear_Delete__FP15disappear_class */
 static int daDisappear_Delete(disappear_class* i_this) {
     return 1;
 }
 
-/* 804A8FB8-804A9080 000118 00C8+00 1/1 0/0 0/0 .text yami_disappear__FP15disappear_classf */
 static void yami_disappear(disappear_class* i_this, f32 i_scale) {
     static u16 da_name[] = {0x826C, 0x826D, 0x826E, 0x826B};
 
@@ -63,7 +57,6 @@ static void yami_disappear(disappear_class* i_this, f32 i_scale) {
     }
 }
 
-/* 804A9080-804A9130 0001E0 00B0+00 1/1 0/0 0/0 .text ghost_disappear__FP15disappear_classf */
 static void ghost_disappear(disappear_class* i_this, f32 i_scale) {
     static u16 da_name[] = {0x86A7, 0x86A8, 0x86A9, 0x86AA, 0x86AB};
 
@@ -75,8 +68,6 @@ static void ghost_disappear(disappear_class* i_this, f32 i_scale) {
     }
 }
 
-/* 804A9130-804A9364 000290 0234+00 1/1 0/0 0/0 .text            set_disappear__FP15disappear_classf
- */
 static void set_disappear(disappear_class* i_this, f32 i_scale) {
     static u16 da_name[] = {0x0108, 0x0109, 0x010A, 0x010B, 0x010C, 0x0154, 0x0155};
 
@@ -103,8 +94,6 @@ static void set_disappear(disappear_class* i_this, f32 i_scale) {
     }
 }
 
-/* 804A9364-804A9458 0004C4 00F4+00 1/0 0/0 0/0 .text            daDisappear_Create__FP10fopAc_ac_c
- */
 static int daDisappear_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, disappear_class);
     disappear_class* this_ = (disappear_class*)i_this;
@@ -127,15 +116,12 @@ static int daDisappear_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 804A94A4-804A94C4 -00001 0020+00 1/0 0/0 0/0 .data            l_daDisappear_Method */
 static actor_method_class l_daDisappear_Method = {
     (process_method_func)daDisappear_Create,  (process_method_func)daDisappear_Delete,
     (process_method_func)daDisappear_Execute, (process_method_func)daDisappear_IsDelete,
     (process_method_func)daDisappear_Draw,
 };
 
-/* 804A94C4-804A94F4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DISAPPEAR */
 extern actor_process_profile_definition g_profile_DISAPPEAR = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp
index d23ffd5e56..cd6d496a35 100644
--- a/src/d/actor/d_a_dmidna.cpp
+++ b/src/d/actor/d_a_dmidna.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_dmidna.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8045D290-8045D298 000000 0007+01 3/3 0/0 0/0 .rodata          l_arcName */
 static const char l_arcName[] = "Dmidna";
 
-/* 8045CED8-8045CFC4 000078 00EC+00 1/1 0/0 0/0 .text            createHeap__10daDmidna_cFv */
 int daDmidna_c::createHeap() {
     mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL,
                                        NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4),
@@ -23,13 +21,10 @@ int daDmidna_c::createHeap() {
     return 1;
 }
 
-/* 8045CFC4-8045CFE4 000164 0020+00 1/1 0/0 0/0 .text            daDmidna_createHeap__FP10fopAc_ac_c
- */
 static int daDmidna_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daDmidna_c*>(i_this)->createHeap();
 }
 
-/* 8045CFE4-8045D094 000184 00B0+00 1/1 0/0 0/0 .text            create__10daDmidna_cFv */
 int daDmidna_c::create() {
     fopAcM_ct(this, daDmidna_c);
 
@@ -46,23 +41,19 @@ int daDmidna_c::create() {
     return phase;
 }
 
-/* 8045D094-8045D0B4 000234 0020+00 1/0 0/0 0/0 .text            daDmidna_Create__FP10fopAc_ac_c */
 static int daDmidna_Create(fopAc_ac_c* i_this) {
     return static_cast<daDmidna_c*>(i_this)->create();
 }
 
-/* 8045D0B4-8045D11C 000254 0068+00 1/1 0/0 0/0 .text            __dt__10daDmidna_cFv */
 daDmidna_c::~daDmidna_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 8045D11C-8045D144 0002BC 0028+00 1/0 0/0 0/0 .text            daDmidna_Delete__FP10daDmidna_c */
 static int daDmidna_Delete(daDmidna_c* i_this) {
     i_this->~daDmidna_c();
     return 1;
 }
 
-/* 8045D144-8045D1A0 0002E4 005C+00 2/2 0/0 0/0 .text            setMatrix__10daDmidna_cFv */
 void daDmidna_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -70,19 +61,16 @@ void daDmidna_c::setMatrix() {
     mpModelMorf->modelCalc();
 }
 
-/* 8045D1A0-8045D1E4 000340 0044+00 1/1 0/0 0/0 .text            execute__10daDmidna_cFv */
 int daDmidna_c::execute() {
     mpModelMorf->play(0, 0);
     setMatrix();
     return 1;
 }
 
-/* 8045D1E4-8045D204 000384 0020+00 1/0 0/0 0/0 .text            daDmidna_Execute__FP10daDmidna_c */
 static int daDmidna_Execute(daDmidna_c* i_this) {
     return i_this->execute();
 }
 
-/* 8045D204-8045D268 0003A4 0064+00 1/1 0/0 0/0 .text            draw__10daDmidna_cFv */
 int daDmidna_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(model, &tevStr);
@@ -90,20 +78,16 @@ int daDmidna_c::draw() {
     return 1;
 }
 
-/* 8045D268-8045D288 000408 0020+00 1/0 0/0 0/0 .text            daDmidna_Draw__FP10daDmidna_c */
 static int daDmidna_Draw(daDmidna_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 8045D29C-8045D2BC -00001 0020+00 1/0 0/0 0/0 .data            l_daDmidna_Method */
 static actor_method_class l_daDmidna_Method = {
     (process_method_func)daDmidna_Create,  (process_method_func)daDmidna_Delete,
     (process_method_func)daDmidna_Execute, (process_method_func)NULL,
     (process_method_func)daDmidna_Draw,
 };
 
-/* 8045D2BC-8045D2EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DMIDNA */
 extern actor_process_profile_definition g_profile_DMIDNA = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp
index f6ffcc7683..ed82391076 100644
--- a/src/d/actor/d_a_do.cpp
+++ b/src/d/actor/d_a_do.cpp
@@ -16,15 +16,12 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8066F2B4-8066F2B8 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 8066F2B6 0002+00 data_8066F2B6 None */
 static bool noFallCheck;
 static bool hioInit;
 
-/* 8066F2C4-8066F2E4 000054 0020+00 11/12 0/0 0/0 .bss             l_HIO */
 static daDo_HIO_c l_HIO;
 
-/* 80667D4C-80667DA8 0000EC 005C+00 1/1 0/0 0/0 .text            __ct__10daDo_HIO_cFv */
 daDo_HIO_c::daDo_HIO_c() {
     field_0x04 = -1;
     mBaseSize = 1.0f;
@@ -37,7 +34,6 @@ daDo_HIO_c::daDo_HIO_c() {
     mWaterHuntAnimType = 0;
 }
 
-/* 80667DA8-80667E68 000148 00C0+00 16/16 0/0 0/0 .text            anm_init__FP8do_classifUcf */
 static void anm_init(do_class* i_this, int i_resIdx, f32 i_morf, u8 i_mode, f32 i_speed) {
     if (!(i_this->field_0x608 > 1.0f)) {
         i_this->mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Do", i_resIdx)),
@@ -46,7 +42,6 @@ static void anm_init(do_class* i_this, int i_resIdx, f32 i_morf, u8 i_mode, f32
     }
 }
 
-/* 80667E68-80667FE4 000208 017C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_jntP, int param_1) {
     if (param_1 == 0) {
         int joint_num = i_jntP->getJntNo();
@@ -75,7 +70,6 @@ static int nodeCallBack(J3DJoint* i_jntP, int param_1) {
     return 1;
 }
 
-/* 80667FE4-80668134 000384 0150+00 1/0 0/0 0/0 .text            daDo_Draw__FP8do_class */
 static int daDo_Draw(do_class* i_this) {
     if (i_this->mNoDraw != 0) {
         i_this->mNoDraw = 0;
@@ -106,8 +100,6 @@ static int daDo_Draw(do_class* i_this) {
     return 1;
 }
 
-/* 80668170-80668264 000510 00F4+00 1/1 0/0 0/0 .text
- * daDo_other_bg_check__FP8do_classP10fopAc_ac_c                */
 static BOOL daDo_other_bg_check(do_class* i_this, fopAc_ac_c* i_actor) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     cXyz dog_pos;
@@ -132,7 +124,6 @@ static BOOL daDo_other_bg_check(do_class* i_this, fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80668264-8066833C 000604 00D8+00 1/1 0/0 0/0 .text daDo_other_bg_check2__FP8do_classP4cXyz */
 static BOOL daDo_other_bg_check2(do_class* i_this, cXyz* i_pos) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     cXyz dog_pos;
@@ -153,16 +144,12 @@ static BOOL daDo_other_bg_check2(do_class* i_this, cXyz* i_pos) {
     }
 }
 
-/* 8066F2E4-8066F2F8 000074 0014+00 1/2 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[5];
 
-/* 8066F2F8-8066F2FC 000088 0004+00 1/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 8066F2FC-8066F310 00008C 0014+00 0/1 0/0 0/0 .bss             target_bgc */
 static BOOL target_bgc[5];
 
-/* 8066833C-806683C0 0006DC 0084+00 1/1 0/0 0/0 .text            s_w_sub__FPvPv */
 static void* s_w_sub(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) &&
         (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_OBJ_KANBAN2) &&
@@ -174,7 +161,6 @@ static void* s_w_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 806683C0-8066858C 000760 01CC+00 1/1 0/0 0/0 .text            search_food__FP8do_class */
 static u32 search_food(do_class* i_this) {
     target_info_count = 0;
 
@@ -220,7 +206,6 @@ static u32 search_food(do_class* i_this) {
     return -1;
 }
 
-/* 8066858C-806685EC 00092C 0060+00 1/1 0/0 0/0 .text            food_check__FP8do_class */
 static void food_check(do_class* i_this) {
     i_this->mFoodActorID = search_food(i_this);
 
@@ -230,7 +215,6 @@ static void food_check(do_class* i_this) {
     }
 }
 
-/* 806685EC-80668624 00098C 0038+00 1/1 0/0 0/0 .text            do_carry_check__FP8do_class */
 static BOOL do_carry_check(do_class* i_this) {
     if (i_this->mAction != ACT_CARRY && fopAcM_checkCarryNow(i_this)) {
         i_this->mAction = ACT_CARRY;
@@ -241,7 +225,6 @@ static BOOL do_carry_check(do_class* i_this) {
     return false;
 }
 
-/* 80668624-80668754 0009C4 0130+00 1/1 0/0 0/0 .text            depth_check__FP8do_class4cXyzf */
 static BOOL depth_check(do_class* i_this, cXyz i_pos, f32 param_2) {
     dBgS_GndChk gnd_chk;
     Vec pos;
@@ -266,7 +249,6 @@ static BOOL depth_check(do_class* i_this, cXyz i_pos, f32 param_2) {
     }
 }
 
-/* 80668754-8066886C 000AF4 0118+00 1/1 0/0 0/0 .text            water_check__FP8do_class */
 static bool water_check(do_class* i_this) {
     dBgS_GndChk gnd_chk;
     Vec pos;
@@ -288,7 +270,6 @@ static bool water_check(do_class* i_this) {
     }
 }
 
-/* 8066886C-80668A30 000C0C 01C4+00 4/4 0/0 0/0 .text            dansa_check__FP8do_class4cXyzf */
 static int dansa_check(do_class* i_this, cXyz i_pos, f32 param_2) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     i_pos.y += 25.0f;
@@ -323,7 +304,6 @@ static int dansa_check(do_class* i_this, cXyz i_pos, f32 param_2) {
     }
 }
 
-/* 80668A30-80668B18 000DD0 00E8+00 3/3 0/0 0/0 .text            dansa_check2__FP8do_classf */
 static BOOL dansa_check2(do_class* i_this, f32 param_1) {
     cXyz pos, pos2;
 
@@ -338,7 +318,6 @@ static BOOL dansa_check2(do_class* i_this, f32 param_1) {
     return dansa_check(i_this, pos2, 100.0f) != 0 ? TRUE : FALSE;
 }
 
-/* 80668B18-80668BA0 000EB8 0088+00 4/4 0/0 0/0 .text            move_dansa_check__FP8do_classf */
 static BOOL move_dansa_check(do_class* i_this, f32 i_speed) {
     if (dansa_check2(i_this, 130.0f)) {
         i_this->mAction = ACT_WAIT_1;
@@ -355,7 +334,6 @@ static BOOL move_dansa_check(do_class* i_this, f32 i_speed) {
     }
 }
 
-/* 80668BA0-80668D5C 000F40 01BC+00 5/5 0/0 0/0 .text            area_check__FP8do_class */
 static void area_check(do_class* i_this) {
     cXyz pos_delta = i_this->home.pos - i_this->current.pos;
 
@@ -368,7 +346,6 @@ static void area_check(do_class* i_this) {
     }
 }
 
-/* 80668D5C-80669050 0010FC 02F4+00 2/1 0/0 0/0 .text            do_stay__FP8do_class */
 static void do_stay(do_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -460,7 +437,6 @@ static void do_stay(do_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 80669050-8066973C 0013F0 06EC+00 2/1 0/0 0/0 .text            do_walk__FP8do_class */
 static void do_walk(do_class* i_this) {
     cXyz local_5c;
     s16 angle_diff;
@@ -597,7 +573,6 @@ static void do_walk(do_class* i_this) {
     move_dansa_check(i_this, i_this->speedF);
 }
 
-/* 8066973C-806698D0 001ADC 0194+00 1/1 0/0 0/0 .text            do_walk_run__FP8do_class */
 static void do_walk_run(do_class* i_this) {
     i_this->field_0x616 = 1;
     i_this->mTailWagTarget = 3000.0f;
@@ -640,7 +615,6 @@ static void do_walk_run(do_class* i_this) {
     }
 }
 
-/* 806698D0-80669A1C 001C70 014C+00 1/1 0/0 0/0 .text            do_run__FP8do_class */
 static void do_run(do_class* i_this) {
     i_this->field_0x616 = 1;
     i_this->mTailWagTarget = 4000.0f;
@@ -673,7 +647,6 @@ static void do_run(do_class* i_this) {
     }
 }
 
-/* 80669A1C-80669B80 001DBC 0164+00 1/1 0/0 0/0 .text            do_run_walk__FP8do_class */
 static void do_run_walk(do_class* i_this) {
     i_this->field_0x616 = 1;
     i_this->mTailWagTarget = 3000.0f;
@@ -713,7 +686,6 @@ static void do_run_walk(do_class* i_this) {
     }
 }
 
-/* 80669B80-8066A1C4 001F20 0644+00 2/1 0/0 0/0 .text            do_wait_1__FP8do_class */
 static void do_wait_1(do_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     i_this->field_0x616 = 1;
@@ -883,7 +855,6 @@ case1:
     }
 }
 
-/* 8066A1C4-8066A3D0 002564 020C+00 1/1 0/0 0/0 .text            do_wait_2__FP8do_class */
 static void do_wait_2(do_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -937,7 +908,6 @@ static void do_wait_2(do_class* i_this) {
     area_check(i_this);
 }
 
-/* 8066A3D0-8066A5DC 002770 020C+00 1/1 0/0 0/0 .text            do_sit__FP8do_class */
 static void do_sit(do_class* i_this) {
     i_this->field_0x616 = 1;
     i_this->mTailWagTarget = 1000.0f;
@@ -1002,7 +972,6 @@ static void do_sit(do_class* i_this) {
     area_check(i_this);
 }
 
-/* 8066A5DC-8066A80C 00297C 0230+00 1/1 0/0 0/0 .text            hang_set__FP8do_class */
 static s16 hang_set(do_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -1040,7 +1009,6 @@ static s16 hang_set(do_class* i_this) {
     return cM_atan2s(vec1.x, vec1.z) + 0x4000;
 }
 
-/* 8066A80C-8066AB78 002BAC 036C+00 1/1 0/0 0/0 .text            do_hang__FP8do_class */
 static void do_hang(do_class* i_this) {
     i_this->mTailWagTarget = 3000.0f;
     i_this->field_0x616 = 2;
@@ -1121,7 +1089,6 @@ static void do_hang(do_class* i_this) {
     }
 }
 
-/* 8066AB78-8066B650 002F18 0AD8+00 2/1 0/0 0/0 .text            do_food__FP8do_class */
 static void do_food(do_class* i_this) {
     fopAc_ac_c* food = fopAcM_SearchByID(i_this->mFoodActorID);
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1345,7 +1312,6 @@ case1and2:
     }
 }
 
-/* 8066B650-8066B774 0039F0 0124+00 1/1 0/0 0/0 .text            do_swim__FP8do_class */
 static void do_swim(do_class* i_this) {
     cXyz pos;
     i_this->field_0x616 = 1;
@@ -1375,7 +1341,6 @@ static void do_swim(do_class* i_this) {
     fopAcM_effHamonSet(&i_this->mRippleKey, &pos, 0.7f, 0.1f);
 }
 
-/* 8066B774-8066B7C0 003B14 004C+00 2/2 0/0 0/0 .text            s_c_sub__FPvPv */
 static void* s_c_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_CANOE) {
         return param_0;
@@ -1383,7 +1348,6 @@ static void* s_c_sub(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 8066B7C0-8066BD3C 003B60 057C+00 1/1 0/0 0/0 .text            do_help__FP8do_class */
 static void do_help(do_class* i_this) {
     f32 target_speed = 0.0f;
     i_this->field_0x616 = 1;
@@ -1463,7 +1427,6 @@ static void do_help(do_class* i_this) {
     }
 }
 
-/* 8066BD3C-8066C894 0040DC 0B58+00 2/1 0/0 0/0 .text            do_boat__FP8do_class */
 static s8 do_boat(do_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     s8 ret = 1;
@@ -1679,7 +1642,6 @@ static s8 do_boat(do_class* i_this) {
     return ret;
 }
 
-/* 8066C894-8066CAA8 004C34 0214+00 1/1 0/0 0/0 .text            do_a_swim__FP8do_class */
 static void do_a_swim(do_class* i_this) {
     i_this->mTailWagTarget = 2000.0f;
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
@@ -1731,7 +1693,6 @@ static void do_a_swim(do_class* i_this) {
     }
 }
 
-/* 8066CAA8-8066CDEC 004E48 0344+00 1/1 0/0 0/0 .text            do_carry__FP8do_class */
 static s8 do_carry(do_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     s8 ret = 0;
@@ -1798,7 +1759,6 @@ static s8 do_carry(do_class* i_this) {
     return ret;
 }
 
-/* 8066CDEC-8066CEC4 00518C 00D8+00 1/1 0/0 0/0 .text            do_message__FP8do_class */
 static void do_message(do_class* i_this) {
     i_this->mTailWagTarget = 2000.0f;
 
@@ -1822,7 +1782,6 @@ static void do_message(do_class* i_this) {
     }
 }
 
-/* 8066CEC4-8066DD48 005264 0E84+00 2/1 0/0 0/0 .text            action__FP8do_class */
 static void action(do_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     cXyz vec1, vec2;
@@ -2221,7 +2180,6 @@ static void action(do_class* i_this) {
     }
 }
 
-/* 8066DD48-8066DE64 0060E8 011C+00 1/1 0/0 0/0 .text            message__FP8do_class */
 static void message(do_class* i_this) {
     if (i_this->mIsTalking) {
         i_this->mCcDisableTimer = 10;
@@ -2248,7 +2206,6 @@ static void message(do_class* i_this) {
     }
 }
 
-/* 8066DE64-8066E494 006204 0630+00 2/1 0/0 0/0 .text            daDo_Execute__FP8do_class */
 static int daDo_Execute(do_class* i_this) {
     if (cDmrNowMidnaTalk() && !fopAcM_checkCarryNow(i_this)) {
         return 1;
@@ -2381,12 +2338,10 @@ static int daDo_Execute(do_class* i_this) {
     return 1;
 }
 
-/* 8066E494-8066E49C 006834 0008+00 1/0 0/0 0/0 .text            daDo_IsDelete__FP8do_class */
 static int daDo_IsDelete(do_class* i_this) {
     return 1;
 }
 
-/* 8066E49C-8066E504 00683C 0068+00 1/0 0/0 0/0 .text            daDo_Delete__FP8do_class */
 static int daDo_Delete(do_class* i_this) {
     u32 actor_id = fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Do");
@@ -2399,7 +2354,6 @@ static int daDo_Delete(do_class* i_this) {
     return 1;
 }
 
-/* 8066E504-8066E7D4 0068A4 02D0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     do_class* _this = (do_class*)i_this;
 
@@ -2449,7 +2403,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8066E81C-8066EAE4 006BBC 02C8+00 1/0 0/0 0/0 .text            daDo_Create__FP10fopAc_ac_c */
 static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
     do_class* _this = static_cast<do_class*>(i_this);
     fopAcM_ct(i_this, do_class);
@@ -2539,7 +2492,6 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 8066F1CC-8066F1EC -00001 0020+00 1/0 0/0 0/0 .data            l_daDo_Method */
 static actor_method_class l_daDo_Method = {
     (process_method_func)daDo_Create,
     (process_method_func)daDo_Delete,
@@ -2548,7 +2500,6 @@ static actor_method_class l_daDo_Method = {
     (process_method_func)daDo_Draw,
 };
 
-/* 8066F1EC-8066F21C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DO */
 extern actor_process_profile_definition g_profile_DO = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp
index 396824ea8b..6024869822 100644
--- a/src/d/actor/d_a_door_boss.cpp
+++ b/src/d/actor/d_a_door_boss.cpp
@@ -12,27 +12,22 @@
 #include "d/d_door_param2.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 8066F418-8066F424 000078 000C+00 4/4 0/0 0/0 .text            getArcName__9daBdoor_cFv */
 char* daBdoor_c::getArcName() {
     return "Z_bdor00";
 }
 
-/* 8066F424-8066F434 000084 0010+00 1/1 0/0 0/0 .text            getBmd__9daBdoor_cFv */
 char* daBdoor_c::getBmd() {
     return "Z_bdor00.bmd";
 }
 
-/* 8066F434-8066F444 000094 0010+00 1/1 0/0 0/0 .text            getDzb__9daBdoor_cFv */
 char* daBdoor_c::getDzb() {
     return "door30.dzb";
 }
 
-/* 8066F444-8066F454 0000A4 0010+00 1/1 0/0 0/0 .text            getBmd2__9daBdoor_cFv */
 char* daBdoor_c::getBmd2() {
     return "door_shutterBoss.bmd";
 }
 
-/* 8066F454-8066F4C4 0000B4 0070+00 1/1 0/0 0/0 .text            getDoorModelData__9daBdoor_cFv */
 J3DModelData* daBdoor_c::getDoorModelData() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getStageRes(getBmd2());
     if (model_data == NULL) {
@@ -41,12 +36,10 @@ J3DModelData* daBdoor_c::getDoorModelData() {
     return model_data;
 }
 
-/* 8066F4C4-8066F4E4 000124 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daBdoor_c*>(i_this)->CreateHeap();
 }
 
-/* 8066F4E4-8066F6F0 000144 020C+00 1/1 0/0 0/0 .text            CreateHeap__9daBdoor_cFv */
 int daBdoor_c::CreateHeap() {
     J3DModelData* door_model_data = getDoorModelData();
     mpDoorModel = mDoExt_J3DModel__create(door_model_data, 0x80000, 0x11000084);
@@ -83,7 +76,6 @@ int daBdoor_c::CreateHeap() {
     return mpBgW->Set(dzb, 1, &mpDoorModel->getBaseTRMtx()) == 1 ? 0 : 1;
 }
 
-/* 8066F738-8066F7EC 000398 00B4+00 3/3 0/0 0/0 .text            calcMtx__9daBdoor_cFv */
 void daBdoor_c::calcMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mOffsetY, current.pos.z);
     mDoMtx_stack_c::YrotM(home.angle.y);
@@ -93,7 +85,6 @@ void daBdoor_c::calcMtx() {
     mpLockModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8066F7EC-8066F8E4 00044C 00F8+00 1/1 0/0 0/0 .text            CreateInit__9daBdoor_cFv */
 int daBdoor_c::CreateInit() {
     mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
     dComIfG_Bgsp().Regist(mpBgW, this);
@@ -113,7 +104,6 @@ int daBdoor_c::CreateInit() {
     return 1;
 }
 
-/* 8066F8E4-8066F9D8 000544 00F4+00 1/1 0/0 0/0 .text            create__9daBdoor_cFv */
 cPhs__Step daBdoor_c::create() {
     fopAcM_ct(this, daBdoor_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, getArcName());
@@ -128,7 +118,6 @@ cPhs__Step daBdoor_c::create() {
     return step;
 }
 
-/* 8066FAB8-8066FB00 000718 0048+00 1/1 0/0 0/0 .text            getDemoAction__9daBdoor_cFv */
 int daBdoor_c::getDemoAction() {
     static char* action_table[11] = {
         "WAIT",
@@ -146,7 +135,6 @@ int daBdoor_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, 11, 0, 0);
 }
 
-/* 8066FB00-8066FF04 000760 0404+00 5/3 0/0 0/0 .text            demoProc__9daBdoor_cFv */
 void daBdoor_c::demoProc() {
     cXyz goal;
     int done;
@@ -229,7 +217,6 @@ void daBdoor_c::demoProc() {
     }
 }
 
-/* 8066FF04-8067002C 000B64 0128+00 1/1 0/0 0/0 .text            calcGoal__9daBdoor_cFP4cXyzi */
 void daBdoor_c::calcGoal(cXyz* i_goalP, int param_1) {
     cXyz vec = daPy_getPlayerActorClass()->current.pos - current.pos;
     mDoMtx_stack_c::YrotS(-current.angle.y);
@@ -249,7 +236,6 @@ void daBdoor_c::calcGoal(cXyz* i_goalP, int param_1) {
     i_goalP->z = vec.z;
 }
 
-/* 8067002C-806700C4 000C8C 0098+00 1/1 0/0 0/0 .text            smokeInit__9daBdoor_cFv */
 void daBdoor_c::smokeInit() {
     mParticlePos = current.pos;
     mParticleAngle = shape_angle;
@@ -257,7 +243,6 @@ void daBdoor_c::smokeInit() {
                                    NULL, 0, NULL, fopAcM_GetRoomNo(this), NULL);
 }
 
-/* 806700C4-806701F4 000D24 0130+00 1/1 0/0 0/0 .text            checkArea__9daBdoor_cFv */
 BOOL daBdoor_c::checkArea() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz vec = player->current.pos - current.pos;
@@ -272,7 +257,6 @@ BOOL daBdoor_c::checkArea() {
     return (s16)fabs(current.angle.y - 0x7fff - player->current.angle.y) <= 0x4000 ? 1 : 0;
 }
 
-/* 806701F4-80670294 000E54 00A0+00 1/1 0/0 0/0 .text            checkFront__9daBdoor_cFv */
 BOOL daBdoor_c::checkFront() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz vec = player->current.pos - current.pos;
@@ -281,7 +265,6 @@ BOOL daBdoor_c::checkFront() {
     return vec.z > 0.0f;
 }
 
-/* 80670294-80670320 000EF4 008C+00 1/1 0/0 0/0 .text            checkOpen__9daBdoor_cFv */
 BOOL daBdoor_c::checkOpen() {
     if (daPy_py_c::checkNowWolf()) {
         return false;
@@ -298,18 +281,14 @@ BOOL daBdoor_c::checkOpen() {
     return true;
 }
 
-/* 80670320-80670328 000F80 0008+00 1/0 0/0 0/0 .text            actionWait__9daBdoor_cFv */
 BOOL daBdoor_c::actionWait() {
     return true;
 }
 
-/* 80670954-8067096C 000040 0015+03 1/1 0/0 0/0 .rodata          l_door_open_demo */
 static char const l_door_open_demo[21] = "DEFAULT_BS_SHUTTER_F";
 
-/* 8067096C-8067097C 000058 000D+03 2/2 0/0 0/0 .rodata          l_staff_name */
 static char const l_staff_name[13] = "SHUTTER_DOOR";
 
-/* 80670328-806703C0 000F88 0098+00 1/0 0/0 0/0 .text            actionCloseWait__9daBdoor_cFv */
 BOOL daBdoor_c::actionCloseWait() {
     if (eventInfo.checkCommandDoor()) {
         mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
@@ -324,13 +303,11 @@ BOOL daBdoor_c::actionCloseWait() {
     return 1;
 }
 
-/* 806703C0-806703E4 001020 0024+00 1/0 0/0 0/0 .text            actionOpen__9daBdoor_cFv */
 BOOL daBdoor_c::actionOpen() {
     demoProc();
     return true;
 }
 
-/* 806703E4-80670544 001044 0160+00 1/0 0/0 0/0 .text            actionEnd__9daBdoor_cFv */
 BOOL daBdoor_c::actionEnd() {
     if (!mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Regist(mpBgW, this);
@@ -353,7 +330,6 @@ BOOL daBdoor_c::actionEnd() {
     return true;
 }
 
-/* 80670544-80670664 0011A4 0120+00 1/1 0/0 0/0 .text            execute__9daBdoor_cFv */
 int daBdoor_c::execute() {
     typedef BOOL (daBdoor_c::*daBdoor_action)();
     static daBdoor_action l_action[4] = {
@@ -372,12 +348,10 @@ int daBdoor_c::execute() {
     return 1;
 }
 
-/* 80670664-806706A4 0012C4 0040+00 1/1 0/0 0/0 .text            checkDraw__9daBdoor_cFv */
 BOOL daBdoor_c::checkDraw() {
     return dComIfGp_roomControl_checkRoomDisp(fopAcM_GetRoomNo(this)) ? 1 : 0;
 }
 
-/* 806706A4-80670804 001304 0160+00 1/1 0/0 0/0 .text            draw__9daBdoor_cFv */
 int daBdoor_c::draw() {
     BOOL draw = checkDraw();
     if (!draw) {
@@ -408,7 +382,6 @@ int daBdoor_c::draw() {
     }
 }
 
-/* 80670804-80670874 001464 0070+00 1/1 0/0 0/0 .text            Delete__9daBdoor_cFv */
 int daBdoor_c::Delete() {
     if (heap != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -417,29 +390,24 @@ int daBdoor_c::Delete() {
     return 1;
 }
 
-/* 80670874-80670894 0014D4 0020+00 1/0 0/0 0/0 .text            daBdoor_Draw__FP9daBdoor_c */
 static int daBdoor_Draw(daBdoor_c* i_this) {
     return i_this->draw();
 }
 
-/* 80670894-806708B8 0014F4 0024+00 1/0 0/0 0/0 .text            daBdoor_Execute__FP9daBdoor_c */
 static int daBdoor_Execute(daBdoor_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 806708B8-806708DC 001518 0024+00 1/0 0/0 0/0 .text            daBdoor_Delete__FP9daBdoor_c */
 static int daBdoor_Delete(daBdoor_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 806708DC-806708FC 00153C 0020+00 1/0 0/0 0/0 .text            daBdoor_Create__FP10fopAc_ac_c */
 static cPhs__Step daBdoor_Create(fopAc_ac_c* i_this) {
     return static_cast<daBdoor_c*>(i_this)->create();
 }
 
-/* 80670B24-80670B44 -00001 0020+00 1/0 0/0 0/0 .data            l_daBdoor_Method */
 static actor_method_class l_daBdoor_Method = {
     (process_method_func)daBdoor_Create,
     (process_method_func)daBdoor_Delete,
@@ -448,7 +416,6 @@ static actor_method_class l_daBdoor_Method = {
     (process_method_func)daBdoor_Draw,
 };
 
-/* 80670B44-80670B74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BOSS_DOOR */
 extern actor_process_profile_definition g_profile_BOSS_DOOR = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp
index 6ae3300629..90c442e206 100644
--- a/src/d/actor/d_a_door_bossL1.cpp
+++ b/src/d/actor/d_a_door_bossL1.cpp
@@ -14,7 +14,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 804E4E18-804E4E68 -00001 0050+00 1/1 0/0 0/0 .data            l_stageName$3673 */
 static char* l_stageName[20] = {
     "D_MN05",
     "D_MN05A",
@@ -38,7 +37,6 @@ static char* l_stageName[20] = {
     "D_MN54A",
 };
 
-/* 804E1D98-804E1E2C 000078 0094+00 14/14 0/0 0/0 .text            getNowLevel__Fv */
 static int getNowLevel() {
     for (int i = 0; i < 20; i++) {
         if (strcmp(dComIfGp_getStartStageName(), l_stageName[i]) == 0) {
@@ -51,8 +49,6 @@ static int getNowLevel() {
     return -1;
 }
 
-/* 804E1E2C-804E1EE8 00010C 00BC+00 2/1 0/0 0/0 .text            getDoorEventName__11daBdoorL1_cFv
- */
 char* daBdoorL1_c::getDoorEventName() {
     switch (getNowLevel()) {
     case 1:
@@ -74,8 +70,6 @@ char* daBdoorL1_c::getDoorEventName() {
     }
 }
 
-/* 804E1EE8-804E1FA4 0001C8 00BC+00 2/1 0/0 0/0 .text            getDoorEventName2__11daBdoorL1_cFv
- */
 char* daBdoorL1_c::getDoorEventName2() {
     switch (getNowLevel()) {
     case 1:
@@ -98,7 +92,6 @@ char* daBdoorL1_c::getDoorEventName2() {
     }
 }
 
-/* 804E1FA4-804E2060 000284 00BC+00 6/5 0/0 0/0 .text            getArcName__11daBdoorL1_cFv */
 const char* daBdoorL1_c::getArcName() {
     switch (getNowLevel()) {
     case 1:
@@ -120,7 +113,6 @@ const char* daBdoorL1_c::getArcName() {
     }
 }
 
-/* 804E2060-804E20C4 000340 0064+00 5/5 0/0 0/0 .text            getAnmArcName__11daBdoorL1_cFv */
 const char* daBdoorL1_c::getAnmArcName() {
     switch(getDoorType()) {
     case DOOR_TYPE_0:
@@ -132,7 +124,6 @@ const char* daBdoorL1_c::getAnmArcName() {
     }
 }
 
-/* 804E20C4-804E2104 0003A4 0040+00 5/5 0/0 0/0 .text            getDoorType__11daBdoorL1_cFv */
 int daBdoorL1_c::getDoorType() {
     switch (getNowLevel()) {
     case 1:
@@ -143,7 +134,6 @@ int daBdoorL1_c::getDoorType() {
     }
 }
 
-/* 804E2104-804E2158 0003E4 0054+00 2/2 0/0 0/0 .text            getOpenAnm__11daBdoorL1_cFv */
 int daBdoorL1_c::getOpenAnm() {
     if (getDoorType() == 1) {
         return 5;
@@ -152,7 +142,6 @@ int daBdoorL1_c::getOpenAnm() {
     return getDoorType() == 0 ? 5 : -1;
 }
 
-/* 804E2158-804E21AC 000438 0054+00 1/1 0/0 0/0 .text            getCloseAnm__11daBdoorL1_cFv */
 int daBdoorL1_c::getCloseAnm() {
     if (getDoorType() == 1) {
         return 4;
@@ -161,47 +150,36 @@ int daBdoorL1_c::getCloseAnm() {
     return getDoorType() == 0 ? 4 : -1;
 }
 
-/* 804E21AC-804E21BC 00048C 0010+00 3/3 0/0 0/0 .text            getAlwaysArcName__11daBdoorL1_cFv
- */
 const char* daBdoorL1_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 804E21BC-804E21CC 00049C 0010+00 1/1 0/0 0/0 .text            getBmd__11daBdoorL1_cFv */
 const char* daBdoorL1_c::getBmd() {
     return "door_shutterBoss.bmd";
 }
 
-/* 804E21CC-804E21DC 0004AC 0010+00 1/1 0/0 0/0 .text            getDzb__11daBdoorL1_cFv */
-/* 804E21BC-804E21CC 00049C 0010+00 1/1 0/0 0/0 .text            getBmd__11daBdoorL1_cFv */
 const char* daBdoorL1_c::getDzb() {
     return "door-shutterBoss.dzb";
 }
 
-/* 804E21DC-804E2238 0004BC 005C+00 1/1 0/0 0/0 .text            getDoorModelData__11daBdoorL1_cFv
- */
 J3DModelData* daBdoorL1_c::getDoorModelData() {
     J3DModelData* door_model = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getBmd()));
     JUT_ASSERT(256, door_model != NULL)
     return door_model;
 }
 
-/* 804E2238-804E2258 000518 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daBdoorL1_c*>(i_this)->CreateHeap();
 }
 
-/* 804E4A14-804E4A24 000000 000D+03 12/12 0/0 0/0 .rodata          l_staff_name */
 static char const l_staff_name[13] = "SHUTTER_DOOR";
 
-/* 804E4A24-804E4A50 000010 002C+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[11] = {
     0x00, 0x1500, 0x2260,
     0x00, 0x2100, 0x00, 0x1500,
     0x1500, 0x1600, 0x1500, 0x2260,
 };
 
-/* 804E2258-804E2530 000538 02D8+00 1/1 0/0 0/0 .text            CreateHeap__11daBdoorL1_cFv */
 int daBdoorL1_c::CreateHeap() {
     int nowLevel = getNowLevel();
     J3DModelData* modelData = getDoorModelData();
@@ -272,7 +250,6 @@ static char* action_table[18] = {
     "INIT",
 };
 
-/* 804E2578-804E2754 000858 01DC+00 2/2 0/0 0/0 .text            calcMtx__11daBdoorL1_cFv */
 void daBdoorL1_c::calcMtx() {
     cXyz cStack_1c(0.0f, 0.0f, field_0x5a8);
     cXyz cStack_28(0.0f, 0.0f, 20.0f);
@@ -315,7 +292,6 @@ void daBdoorL1_c::calcMtx() {
     }
 }
 
-/* 804E2754-804E28E4 000A34 0190+00 1/1 0/0 0/0 .text            CreateInit__11daBdoorL1_cFv */
 int daBdoorL1_c::CreateInit() {
     field_0x7c4 = current.pos;
     field_0x7d0 = field_0x7c4;
@@ -344,7 +320,6 @@ int daBdoorL1_c::CreateInit() {
     return 1;
 }
 
-/* 804E28E4-804E2A98 000BC4 01B4+00 1/1 0/0 0/0 .text            create__11daBdoorL1_cFv */
 int daBdoorL1_c::create() {
     fopAcM_ct(this, daBdoorL1_c);
     int rv = dComIfG_resLoad(&mPhase1, getArcName());
@@ -378,12 +353,10 @@ int daBdoorL1_c::create() {
     return cPhs_ERROR_e;
 }
 
-/* 804E2B78-804E2BC0 000E58 0048+00 1/1 0/0 0/0 .text            getDemoAction__11daBdoorL1_cFv */
 int daBdoorL1_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x5a0, action_table, 18, 0, 0);
 }
 
-/* 804E2BC0-804E3180 000EA0 05C0+00 5/3 0/0 0/0 .text            demoProc__11daBdoorL1_cFv */
 void daBdoorL1_c::demoProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     int demoAction = getDemoAction();
@@ -546,7 +519,6 @@ void daBdoorL1_c::demoProc() {
     }
 }
 
-/* 804E3180-804E357C 001460 03FC+00 1/1 0/0 0/0 .text            openInit__11daBdoorL1_cFv */
 int daBdoorL1_c::openInit() {
     static u16 const l_lv1_eff[3] = {0x8C42, 0x8C43, 0x8C44};
     static u16 const l_lv2_eff[3] = {0x8C45, 0x8C46, 0x8C47};
@@ -614,7 +586,6 @@ int daBdoorL1_c::openInit() {
     return 1;
 }
 
-/* 804E357C-804E3794 00185C 0218+00 1/1 0/0 0/0 .text            openProc__11daBdoorL1_cFv */
 int daBdoorL1_c::openProc() {
     int rv = field_0x588->play();
     f32 frame = field_0x588->getFrame();
@@ -645,7 +616,6 @@ int daBdoorL1_c::openProc() {
     return rv;
 }
 
-/* 804E3794-804E3850 001A74 00BC+00 1/1 0/0 0/0 .text            openEnd__11daBdoorL1_cFv */
 int daBdoorL1_c::openEnd() {
     switch(getNowLevel()) {
     case 4:
@@ -662,7 +632,6 @@ int daBdoorL1_c::openEnd() {
     return 1;
 }
 
-/* 804E3850-804E3A2C 001B30 01DC+00 1/1 0/0 0/0 .text            closeInit__11daBdoorL1_cFv */
 int daBdoorL1_c::closeInit() {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
     JUT_ASSERT(1020, anm != NULL);
@@ -687,7 +656,6 @@ int daBdoorL1_c::closeInit() {
     return 1;
 }
 
-/* 804E3A2C-804E3C0C 001D0C 01E0+00 1/1 0/0 0/0 .text            closeProc__11daBdoorL1_cFv */
 int daBdoorL1_c::closeProc() {
     int rv = field_0x588->play();
     f32 frame = field_0x588->getFrame();
@@ -727,12 +695,10 @@ int daBdoorL1_c::closeProc() {
     return rv;
 }
 
-/* 804E3C0C-804E3C14 001EEC 0008+00 1/1 0/0 0/0 .text            closeEnd__11daBdoorL1_cFv */
 int daBdoorL1_c::closeEnd() {
     return 1;
 }
 
-/* 804E3C14-804E3CCC 001EF4 00B8+00 1/1 0/0 0/0 .text            unlockInit__11daBdoorL1_cFv */
 int daBdoorL1_c::unlockInit() {
     if (mKeyHoleId == -1) {
         return 1;
@@ -746,7 +712,6 @@ int daBdoorL1_c::unlockInit() {
     return 1;
 }
 
-/* 804E3CCC-804E3DE8 001FAC 011C+00 1/1 0/0 0/0 .text            setPos__11daBdoorL1_cFv */
 void daBdoorL1_c::setPos() {
     cXyz local_1c;
     cXyz local_28 = dComIfGp_getPlayer(0)->current.pos - current.pos;
@@ -767,7 +732,6 @@ void daBdoorL1_c::setPos() {
     dComIfGp_evmng_setGoal(&local_1c);
 }
 
-/* 804E3DE8-804E3F10 0020C8 0128+00 1/1 0/0 0/0 .text            calcGoal__11daBdoorL1_cFP4cXyzi */
 void daBdoorL1_c::calcGoal(cXyz* param_1, int param_2) {
     cXyz local_24 = dComIfGp_getPlayer(0)->current.pos - current.pos;
     mDoMtx_stack_c::YrotS(-current.angle.y);
@@ -787,7 +751,6 @@ void daBdoorL1_c::calcGoal(cXyz* param_1, int param_2) {
     param_1->z = local_24.z;
 }
 
-/* 804E3F10-804E3FF8 0021F0 00E8+00 1/1 0/0 0/0 .text            setAngle__11daBdoorL1_cFv */
 int daBdoorL1_c::setAngle() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz playerPos = player->current.pos;
@@ -803,7 +766,6 @@ int daBdoorL1_c::setAngle() {
     return 0;
 }
 
-/* 804E3FF8-804E4100 0022D8 0108+00 1/1 0/0 0/0 .text            createKey__11daBdoorL1_cFv */
 int daBdoorL1_c::createKey() {
     if (field_0x598 == 0) {
         cXyz cStack_24(current.pos);
@@ -824,12 +786,10 @@ int daBdoorL1_c::createKey() {
     return 1;
 }
 
-/* 804E4100-804E4104 0023E0 0004+00 1/1 0/0 0/0 .text            smokeInit__11daBdoorL1_cFv */
 void daBdoorL1_c::smokeInit() {
     /* empty function */
 }
 
-/* 804E4104-804E4158 0023E4 0054+00 1/1 0/0 0/0 .text            deleteEmitter__11daBdoorL1_cFv */
 void daBdoorL1_c::deleteEmitter() {
     for (int i = 0; i < 2; i++) {
         if (field_0x7e4[i] != NULL) {
@@ -840,7 +800,6 @@ void daBdoorL1_c::deleteEmitter() {
     }
 }
 
-/* 804E4158-804E432C 002438 01D4+00 1/1 0/0 0/0 .text            checkArea__11daBdoorL1_cFv */
 int daBdoorL1_c::checkArea() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz local_48;
@@ -872,7 +831,6 @@ int daBdoorL1_c::checkArea() {
     }
 }
 
-/* 804E432C-804E43A0 00260C 0074+00 3/3 0/0 0/0 .text            checkFront__11daBdoorL1_cFv */
 int daBdoorL1_c::checkFront() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN08A") == 0) {
         if (dComIfGp_roomControl_getStayNo() == 10) {
@@ -884,7 +842,6 @@ int daBdoorL1_c::checkFront() {
     return 1;
 }
 
-/* 804E43A0-804E4414 002680 0074+00 1/1 0/0 0/0 .text            checkOpen__11daBdoorL1_cFv */
 int daBdoorL1_c::checkOpen() {
     if (!dComIfGs_isDungeonItemBossKey()) {
         return 0;
@@ -899,12 +856,10 @@ int daBdoorL1_c::checkOpen() {
     }
 }
 
-/* 804E4414-804E441C 0026F4 0008+00 1/0 0/0 0/0 .text            actionWait__11daBdoorL1_cFv */
 int daBdoorL1_c::actionWait() {
     return 1;
 }
 
-/* 804E441C-804E44B4 0026FC 0098+00 1/0 0/0 0/0 .text            actionCloseWait__11daBdoorL1_cFv */
 int daBdoorL1_c::actionCloseWait() {
     if (eventInfo.checkCommandDoor()) {
         field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
@@ -918,14 +873,12 @@ int daBdoorL1_c::actionCloseWait() {
     return 1;
 }
 
-/* 804E44B4-804E44EC 002794 0038+00 1/0 0/0 0/0 .text            actionOpen__11daBdoorL1_cFv */
 int daBdoorL1_c::actionOpen() {
     demoProc();
     dMeter2Info_onGameStatus(2);
     return 1;
 }
 
-/* 804E44EC-804E464C 0027CC 0160+00 1/0 0/0 0/0 .text            actionEnd__11daBdoorL1_cFv */
 int daBdoorL1_c::actionEnd() {
     if (!field_0x590->ChkUsed()) {
         bool rt = dComIfG_Bgsp().Regist(field_0x590, this);
@@ -951,7 +904,6 @@ int daBdoorL1_c::actionEnd() {
     return 1;
 }
 
-/* 804E464C-804E476C 00292C 0120+00 1/1 0/0 0/0 .text            execute__11daBdoorL1_cFv */
 int daBdoorL1_c::execute() {
     static actionFunc l_action[4] = {&daBdoorL1_c::actionWait, &daBdoorL1_c::actionCloseWait, &daBdoorL1_c::actionOpen, &daBdoorL1_c::actionEnd};
     if (fopAcM_CheckStatus(this, 0x1000)) {
@@ -964,7 +916,6 @@ int daBdoorL1_c::execute() {
     return 1;
 }
 
-/* 804E476C-804E48BC 002A4C 0150+00 1/1 0/0 0/0 .text            draw__11daBdoorL1_cFv */
 int daBdoorL1_c::draw() {
     g_env_light.settingTevStruct( 0x10, &current.pos, &tevStr);
     dComIfGd_setListBG();
@@ -987,7 +938,6 @@ int daBdoorL1_c::draw() {
     return 1;
 }
 
-/* 804E48BC-804E4958 002B9C 009C+00 1/1 0/0 0/0 .text            Delete__11daBdoorL1_cFv */
 int daBdoorL1_c::Delete() {
     deleteEmitter();
     if (heap != NULL && field_0x590->ChkUsed()) {
@@ -999,31 +949,24 @@ int daBdoorL1_c::Delete() {
     return 1;
 }
 
-/* 804E4958-804E4978 002C38 0020+00 1/0 0/0 0/0 .text            daBdoorL1_Draw__FP11daBdoorL1_c */
 static int daBdoorL1_Draw(daBdoorL1_c* i_this) {
     return i_this->draw();
 }
 
-/* 804E4978-804E499C 002C58 0024+00 1/0 0/0 0/0 .text            daBdoorL1_Execute__FP11daBdoorL1_c
- */
 static int daBdoorL1_Execute(daBdoorL1_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 804E499C-804E49C0 002C7C 0024+00 1/0 0/0 0/0 .text            daBdoorL1_Delete__FP11daBdoorL1_c
- */
 static int daBdoorL1_Delete(daBdoorL1_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 804E49C0-804E49E0 002CA0 0020+00 1/0 0/0 0/0 .text            daBdoorL1_Create__FP10fopAc_ac_c */
 static int daBdoorL1_Create(fopAc_ac_c* i_this) {
     return static_cast<daBdoorL1_c*>(i_this)->create();
 }
 
-/* 804E5018-804E5038 -00001 0020+00 1/0 0/0 0/0 .data            l_daBdoorL1_Method */
 static actor_method_class l_daBdoorL1_Method = {
     (process_method_func)daBdoorL1_Create,
     (process_method_func)daBdoorL1_Delete,
@@ -1032,7 +975,6 @@ static actor_method_class l_daBdoorL1_Method = {
     (process_method_func)daBdoorL1_Draw,
 };
 
-/* 804E5038-804E5068 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L1BOSS_DOOR */
 extern actor_process_profile_definition g_profile_L1BOSS_DOOR = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp
index f11d2df1c9..fea59909aa 100644
--- a/src/d/actor/d_a_door_bossL5.cpp
+++ b/src/d/actor/d_a_door_bossL5.cpp
@@ -12,23 +12,18 @@
 #include "d/d_meter2_info.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80670C38-80670C44 000078 000C+00 4/4 0/0 0/0 .text            getArcName__11daBdoorL5_cFv */
 const char* daBdoorL5_c::getArcName() {
     return "Z_bdor00";
 }
 
-/* 80670C44-80670C54 000084 0010+00 3/3 0/0 0/0 .text            getAlwaysArcName__11daBdoorL5_cFv
- */
 const char* daBdoorL5_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 80670C54-80670C64 000094 0010+00 1/1 0/0 0/0 .text            getBmd__11daBdoorL5_cFv */
 const char* daBdoorL5_c::getBmd() {
     return "Z_bdor00.bmd";
 }
 
-/* 80670C64-80670C74 0000A4 0010+00 1/1 0/0 0/0 .text            getDzb__11daBdoorL5_cFv */
 const char* daBdoorL5_c::getDzb() {
     return "door-shutterBoss.dzb";
 }
@@ -37,37 +32,28 @@ const char* daBdoorL5_c::getAnmArcName() {
     return "BDoorTAnm";
 }
 
-/* 80670C84-80670C8C 0000C4 0008+00 2/2 0/0 0/0 .text            getOpenAnm__11daBdoorL5_cFv */
 s32 daBdoorL5_c::getOpenAnm() {
     return 5;
 }
 
-/* 80670C8C-80670C94 0000CC 0008+00 1/1 0/0 0/0 .text            getCloseAnm__11daBdoorL5_cFv */
 s32 daBdoorL5_c::getCloseAnm() {
     return 4;
 }
 
-/* 80670C94-80670CF0 0000D4 005C+00 1/1 0/0 0/0 .text            getDoorModelData__11daBdoorL5_cFv
- */
 J3DModelData* daBdoorL5_c::getDoorModelData() {
     return static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getBmd()));
 }
 
-/* 80670CF0-80670D10 000130 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daBdoorL5_c*>(i_this)->CreateHeap();
 }
 
-/* 806724C8-806724E0 000000 0016+02 4/4 0/0 0/0 .rodata          l_door_open_demo */
 static char const l_door_open_demo[22] = "DEFAULT_BS_SHUTTER_L5";
 
-/* 806724E0-806724FC 000018 001A+02 0/1 0/0 0/0 .rodata          l_door_open_demo_1st */
 static char const l_door_open_demo_1st[26] = "DEFAULT_BS_SHUTTER_L5_1ST";
 
-/* 806724FC-8067250C 000034 000D+03 3/3 0/0 0/0 .rodata          l_staff_name */
 static char const l_staff_name[13] = "SHUTTER_DOOR";
 
-/* 80672614-8067264C -00001 0038+00 1/1 0/0 0/0 .data            action_table$3861 */
 static char* action_table[14] = {
     "WAIT",
     "UNLOCK",
@@ -85,7 +71,6 @@ static char* action_table[14] = {
     "PLY_DISP",
 };
 
-/* 80670D10-80670EC0 000150 01B0+00 1/1 0/0 0/0 .text            CreateHeap__11daBdoorL5_cFv */
 int daBdoorL5_c::CreateHeap() {
     J3DModelData* modelData = getDoorModelData();
     JUT_ASSERT(313, modelData != NULL);
@@ -111,14 +96,12 @@ int daBdoorL5_c::CreateHeap() {
     return 1;
 }
 
-/* 80670F08-80670F5C 000348 0054+00 2/2 0/0 0/0 .text            calcMtx__11daBdoorL5_cFv */
 void daBdoorL5_c::calcMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(home.angle.y);
     field_0x580->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80670F5C-8067106C 00039C 0110+00 1/1 0/0 0/0 .text            CreateInit__11daBdoorL5_cFv */
 int daBdoorL5_c::CreateInit() {
     field_0x5b8.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1,
                      &field_0x790, fopAcM_GetSpeed_p(this), NULL, NULL);
@@ -140,7 +123,6 @@ int daBdoorL5_c::CreateInit() {
     return 1;
 }
 
-/* 8067106C-806711FC 0004AC 0190+00 1/1 0/0 0/0 .text            create__11daBdoorL5_cFv */
 int daBdoorL5_c::create() {
     fopAcM_ct(this, daBdoorL5_c);
     int rv = dComIfG_resLoad(&mPhase1, getArcName());
@@ -171,12 +153,10 @@ int daBdoorL5_c::create() {
     return cPhs_ERROR_e;
 }
 
-/* 806712DC-80671324 00071C 0048+00 1/1 0/0 0/0 .text            getDemoAction__11daBdoorL5_cFv */
 int daBdoorL5_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x59c, action_table, 14, 0, 0);
 }
 
-/* 80671324-806715D0 000764 02AC+00 5/3 0/0 0/0 .text            demoProc__11daBdoorL5_cFv */
 void daBdoorL5_c::demoProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     int demoAction = getDemoAction();
@@ -261,7 +241,6 @@ void daBdoorL5_c::demoProc() {
     }
 }
 
-/* 806715D0-80671670 000A10 00A0+00 1/1 0/0 0/0 .text            openInit__11daBdoorL5_cFv */
 int daBdoorL5_c::openInit() {
     dComIfG_Bgsp().Release(field_0x588);
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
@@ -271,7 +250,6 @@ int daBdoorL5_c::openInit() {
     return 1;
 }
 
-/* 80671670-80671718 000AB0 00A8+00 1/1 0/0 0/0 .text            openProc__11daBdoorL5_cFv */
 int daBdoorL5_c::openProc() {
     int rv = field_0x584->play();
     if (field_0x584->getFrame() == 18.0f) {
@@ -280,12 +258,10 @@ int daBdoorL5_c::openProc() {
     return rv;
 }
 
-/* 80671718-80671720 000B58 0008+00 1/1 0/0 0/0 .text            openEnd__11daBdoorL5_cFv */
 int daBdoorL5_c::openEnd() {
     return 1;
 }
 
-/* 80671720-806717FC 000B60 00DC+00 1/1 0/0 0/0 .text            closeInit__11daBdoorL5_cFv */
 int daBdoorL5_c::closeInit() {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
     JUT_ASSERT(511, anm != NULL);
@@ -295,18 +271,15 @@ int daBdoorL5_c::closeInit() {
     return 1;
 }
 
-/* 806717FC-80671820 000C3C 0024+00 1/1 0/0 0/0 .text            closeProc__11daBdoorL5_cFv */
 int daBdoorL5_c::closeProc() {
     return field_0x584->play();
 }
 
-/* 80671820-80671878 000C60 0058+00 1/1 0/0 0/0 .text            closeEnd__11daBdoorL5_cFv */
 int daBdoorL5_c::closeEnd() {
     dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f));
     return 1;
 }
 
-/* 80671878-80671954 000CB8 00DC+00 1/1 0/0 0/0 .text            unlockInit__11daBdoorL5_cFv */
 int daBdoorL5_c::unlockInit() {
     if (mKeyHoleId == -1) {
         return 1;
@@ -320,7 +293,6 @@ int daBdoorL5_c::unlockInit() {
     return 1;
 }
 
-/* 80671954-80671A7C 000D94 0128+00 1/1 0/0 0/0 .text            calcGoal__11daBdoorL5_cFP4cXyzi */
 void daBdoorL5_c::calcGoal(cXyz* param_1, int param_2) {
     cXyz local_24 = dComIfGp_getPlayer(0)->current.pos - current.pos;
     mDoMtx_stack_c::YrotS(-current.angle.y);
@@ -340,7 +312,6 @@ void daBdoorL5_c::calcGoal(cXyz* param_1, int param_2) {
     param_1->z = local_24.z;
 }
 
-/* 80671A7C-80671B14 000EBC 0098+00 1/1 0/0 0/0 .text            smokeInit__11daBdoorL5_cFv */
 void daBdoorL5_c::smokeInit() {
     field_0x5a4 = current.pos;
     field_0x5b0 = shape_angle;
@@ -348,7 +319,6 @@ void daBdoorL5_c::smokeInit() {
                                    0, 0, 0, fopAcM_GetRoomNo(this), 0);
 }
 
-/* 80671B14-80671C14 000F54 0100+00 1/1 0/0 0/0 .text            createKey__11daBdoorL5_cFv */
 int daBdoorL5_c::createKey() {
     if (field_0x590 == 0) {
         cXyz prevPos(current.pos);
@@ -366,7 +336,6 @@ int daBdoorL5_c::createKey() {
     return 1;
 }
 
-/* 80671C14-80671D44 001054 0130+00 1/1 0/0 0/0 .text            checkArea__11daBdoorL5_cFv */
 int daBdoorL5_c::checkArea() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz local_48 = player->current.pos - current.pos;
@@ -385,7 +354,6 @@ int daBdoorL5_c::checkArea() {
     }
 }
 
-/* 80671D44-80671DE4 001184 00A0+00 1/1 0/0 0/0 .text            checkFront__11daBdoorL5_cFv */
 int daBdoorL5_c::checkFront() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz distance = player->current.pos - current.pos;
@@ -394,7 +362,6 @@ int daBdoorL5_c::checkFront() {
     return distance.z > 0.0f;
 }
 
-/* 80671DE4-80671E70 001224 008C+00 1/1 0/0 0/0 .text            checkOpen__11daBdoorL5_cFv */
 int daBdoorL5_c::checkOpen() {
     if (daPy_py_c::checkNowWolf()) {
         return 0;
@@ -413,12 +380,10 @@ int daBdoorL5_c::checkOpen() {
     }
 }
 
-/* 80671E70-80671E78 0012B0 0008+00 1/0 0/0 0/0 .text            actionWait__11daBdoorL5_cFv */
 int daBdoorL5_c::actionWait() {
     return 1;
 }
 
-/* 80671E78-80671F58 0012B8 00E0+00 1/0 0/0 0/0 .text            actionCloseWait__11daBdoorL5_cFv */
 int daBdoorL5_c::actionCloseWait() {
     if (eventInfo.checkCommandDoor()) {
         field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
@@ -439,7 +404,6 @@ int daBdoorL5_c::actionCloseWait() {
     return 1;
 }
 
-/* 80671F58-80672004 001398 00AC+00 1/0 0/0 0/0 .text            actionOpen__11daBdoorL5_cFv */
 int daBdoorL5_c::actionOpen() {
     field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
     demoProc();
@@ -450,7 +414,6 @@ int daBdoorL5_c::actionOpen() {
     return 1;
 }
 
-/* 80672004-80672164 001444 0160+00 1/0 0/0 0/0 .text            actionEnd__11daBdoorL5_cFv */
 int daBdoorL5_c::actionEnd() {
     if (!field_0x588->ChkUsed()) {
         bool rt = dComIfG_Bgsp().Regist(field_0x588, this);
@@ -476,7 +439,6 @@ int daBdoorL5_c::actionEnd() {
     return 1;
 }
 
-/* 80672164-8067228C 0015A4 0128+00 1/1 0/0 0/0 .text            execute__11daBdoorL5_cFv */
 int daBdoorL5_c::execute() {
     static actionFunc l_action[4] = {&daBdoorL5_c::actionWait, &daBdoorL5_c::actionCloseWait, &daBdoorL5_c::actionOpen, &daBdoorL5_c::actionEnd};
     field_0x59c = -1;
@@ -490,7 +452,6 @@ int daBdoorL5_c::execute() {
     return 1;
 }
 
-/* 8067228C-80672374 0016CC 00E8+00 1/1 0/0 0/0 .text            draw__11daBdoorL5_cFv */
 int daBdoorL5_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(field_0x580, &tevStr);
@@ -503,7 +464,6 @@ int daBdoorL5_c::draw() {
     return 1;
 }
 
-/* 80672374-8067240C 0017B4 0098+00 1/1 0/0 0/0 .text            Delete__11daBdoorL5_cFv */
 int daBdoorL5_c::Delete() {
     if (heap != NULL && field_0x588->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x588);
@@ -514,32 +474,25 @@ int daBdoorL5_c::Delete() {
     return 1;
 }
 
-/* 8067240C-8067242C 00184C 0020+00 1/0 0/0 0/0 .text            daBdoorL5_Draw__FP11daBdoorL5_c */
 static int daBdoorL5_Draw(daBdoorL5_c* i_this) {
     return i_this->draw();
 }
 
-/* 8067242C-80672450 00186C 0024+00 1/0 0/0 0/0 .text            daBdoorL5_Execute__FP11daBdoorL5_c
- */
 static int daBdoorL5_Execute(daBdoorL5_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 80672450-80672474 001890 0024+00 1/0 0/0 0/0 .text            daBdoorL5_Delete__FP11daBdoorL5_c
- */
 static int daBdoorL5_Delete(daBdoorL5_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80672474-80672494 0018B4 0020+00 1/0 0/0 0/0 .text            daBdoorL5_Create__FP10fopAc_ac_c */
 static int daBdoorL5_Create(fopAc_ac_c* i_this) {
     return static_cast<daBdoorL5_c*>(i_this)->create();
 }
 
 
-/* 80672710-80672730 -00001 0020+00 1/0 0/0 0/0 .data            l_daBdoorL5_Method */
 static actor_method_class l_daBdoorL5_Method = {
     (process_method_func)daBdoorL5_Create,
     (process_method_func)daBdoorL5_Delete,
@@ -548,7 +501,6 @@ static actor_method_class l_daBdoorL5_Method = {
     (process_method_func)daBdoorL5_Draw,
 };
 
-/* 80672730-80672760 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L5BOSS_DOOR */
 extern actor_process_profile_definition g_profile_L5BOSS_DOOR = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp
index a85b58a4bb..11b42526f7 100644
--- a/src/d/actor/d_a_door_dbdoor00.cpp
+++ b/src/d/actor/d_a_door_dbdoor00.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_door_param2.h"
 
-/* 8045D378-8045D470 000078 00F8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         u16 jointNo = i_joint->getJntNo();
@@ -32,40 +31,30 @@ static char* dummyStringFunc() {
     return "door-pushDouble_";
 }
 
-/* 8045D470-8045D480 000170 0010+00 3/3 0/0 0/0 .text            getAlwaysArcName__12daDbDoor00_cFv
- */
 char* daDbDoor00_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 8045D480-8045D490 000180 0010+00 1/1 0/0 0/0 .text            getDzb__12daDbDoor00_cFv */
 char* daDbDoor00_c::getDzb() {
     return "door-pushDouble.dzb";
 }
 
-/* 8045D490-8045D4A0 000190 0010+00 1/1 0/0 0/0 .text            getDummyBmdName__12daDbDoor00_cFv
- */
 char* daDbDoor00_c::getDummyBmdName() {
     return "door-pushDoubleDummy.bmd";
 }
 
-/* 8045D4A0-8045D4B0 0001A0 0010+00 3/3 0/0 0/0 .text            getBmdArcName__12daDbDoor00_cFv */
 char* daDbDoor00_c::getBmdArcName() {
     return "DbDoor0";
 }
 
-/* 8045E684-8045E688 -00001 0004+00 1/1 0/0 0/0 .data            l_bmd_base_name */
 static char* l_bmd_base_name = "door-pushDouble_";
 
-/* 8045D4B0-8045D504 0001B0 0054+00 1/1 0/0 0/0 .text            getBmdName__12daDbDoor00_cFv */
 char* daDbDoor00_c::getBmdName() {
     static char l_bmdName[32];
     sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, door_param2_c::getDoorModel(this));
     return l_bmdName;
 }
 
-/* 8045D504-8045D574 000204 0070+00 1/1 0/0 0/0 .text            getDoorModelData__12daDbDoor00_cFv
- */
 J3DModelData* daDbDoor00_c::getDoorModelData() {
     J3DModelData* res = (J3DModelData*)dComIfG_getStageRes(getBmdName());
     if (res == NULL) {
@@ -74,12 +63,10 @@ J3DModelData* daDbDoor00_c::getDoorModelData() {
     return res;
 }
 
-/* 8045D574-8045D594 000274 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daDbDoor00_c*>(i_this)->CreateHeap();
 }
 
-/* 8045D594-8045D744 000294 01B0+00 1/1 0/0 0/0 .text            CreateHeap__12daDbDoor00_cFv */
 int daDbDoor00_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmdName());
@@ -112,7 +99,6 @@ int daDbDoor00_c::CreateHeap() {
     return mpBgW->Set(dzb, 1, &mpModel->getBaseTRMtx()) != 1 ? 1 : 0;
 }
 
-/* 8045D744-8045D8F4 000444 01B0+00 4/4 0/0 0/0 .text            calcMtx__12daDbDoor00_cFv */
 void daDbDoor00_c::calcMtx() {
     cXyz xyz;
 
@@ -144,7 +130,6 @@ void daDbDoor00_c::calcMtx() {
     }
 }
 
-/* 8045D8F4-8045D9A8 0005F4 00B4+00 1/1 0/0 0/0 .text            CreateInit__12daDbDoor00_cFv */
 int daDbDoor00_c::CreateInit() {
     u8 fRoomNo = door_param2_c::getFRoomNo(this);
     if (fopAcM_GetRoomNo(this) == -1) {
@@ -163,7 +148,6 @@ int daDbDoor00_c::CreateInit() {
     return 1;
 }
 
-/* 8045D9A8-8045DA68 0006A8 00C0+00 1/1 0/0 0/0 .text            create__12daDbDoor00_cFv */
 int daDbDoor00_c::create() {
     fopAcM_ct(this, daDbDoor00_c);
 
@@ -182,7 +166,6 @@ int daDbDoor00_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8045DA68-8045DAB0 000768 0048+00 1/1 0/0 0/0 .text            getDemoAction__12daDbDoor00_cFv */
 int daDbDoor00_c::getDemoAction() {
     static char* action_table[9] = {
         "WAIT",      "SET_START", "SET_ANGLE", "END",        "OPEN",
@@ -191,7 +174,6 @@ int daDbDoor00_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x598, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
-/* 8045DAB0-8045DE44 0007B0 0394+00 5/4 0/0 0/0 .text            demoProc__12daDbDoor00_cFv */
 void daDbDoor00_c::demoProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(LINK_PTR);
     s16 doorAngle;
@@ -277,7 +259,6 @@ void daDbDoor00_c::demoProc() {
     dComIfGp_evmng_cutEnd(field_0x598);
 }
 
-/* 8045DE44-8045DF70 000B44 012C+00 1/1 0/0 0/0 .text            checkArea__12daDbDoor00_cFv */
 int daDbDoor00_c::checkArea() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(LINK_PTR);
     cXyz sub = player->current.pos - home.pos;
@@ -303,18 +284,15 @@ int daDbDoor00_c::checkArea() {
     return 1;
 }
 
-/* 8045DF70-8045DF78 000C70 0008+00 1/1 0/0 0/0 .text            checkUnlock__12daDbDoor00_cFv */
 int daDbDoor00_c::checkUnlock() {
     return 1;
 }
 
-/* 8045DF78-8045DF9C 000C78 0024+00 1/0 0/0 0/0 .text            actionWait__12daDbDoor00_cFv */
 int daDbDoor00_c::actionWait() {
     calcMtx();
     return 1;
 }
 
-/* 8045DF9C-8045E000 000C9C 0064+00 1/0 0/0 0/0 .text            actionLockWait__12daDbDoor00_cFv */
 int daDbDoor00_c::actionLockWait() {
     if (checkUnlock() != 0) {
         setAction(2);
@@ -323,7 +301,6 @@ int daDbDoor00_c::actionLockWait() {
     return 1;
 }
 
-/* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text            actionLockOff__12daDbDoor00_cFv */
 int daDbDoor00_c::actionLockOff() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
@@ -335,7 +312,6 @@ int daDbDoor00_c::actionLockOff() {
     return 1;
 }
 
-/* 8045E094-8045E108 000D94 0074+00 1/0 0/0 0/0 .text            actionLockDemo__12daDbDoor00_cFv */
 int daDbDoor00_c::actionLockDemo() {
     if (dComIfGp_evmng_endCheck("DBDOOR00_STOP_OPEN")) {
         dComIfGp_event_reset();
@@ -346,8 +322,6 @@ int daDbDoor00_c::actionLockDemo() {
     return 1;
 }
 
-/* 8045E108-8045E1C8 000E08 00C0+00 1/0 0/0 0/0 .text            actionCloseWait__12daDbDoor00_cFv
- */
 int daDbDoor00_c::actionCloseWait() {
     if (eventInfo.checkCommandDoor()) {
         field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
@@ -364,13 +338,11 @@ int daDbDoor00_c::actionCloseWait() {
     return 1;
 }
 
-/* 8045E1C8-8045E1EC 000EC8 0024+00 1/0 0/0 0/0 .text            actionOpen__12daDbDoor00_cFv */
 int daDbDoor00_c::actionOpen() {
     demoProc();
     return 1;
 }
 
-/* 8045E1EC-8045E2DC 000EEC 00F0+00 1/1 0/0 0/0 .text            execute__12daDbDoor00_cFv */
 int daDbDoor00_c::execute() {
     typedef int (daDbDoor00_c::*actionFunc)();
     static actionFunc l_action[] = {
@@ -381,12 +353,10 @@ int daDbDoor00_c::execute() {
     return 1;
 }
 
-/* 8045E2DC-8045E31C 000FDC 0040+00 1/1 0/0 0/0 .text            checkDraw__12daDbDoor00_cFv */
 int daDbDoor00_c::checkDraw() {
     return dComIfGp_roomControl_checkRoomDisp(fopAcM_GetRoomNo(this)) != 0 ? 1 : 0;
 }
 
-/* 8045E31C-8045E428 00101C 010C+00 1/1 0/0 0/0 .text            draw__12daDbDoor00_cFv */
 int daDbDoor00_c::draw() {
     if (checkDraw() == 0) {
         if (field_0x584 != 0) {
@@ -407,7 +377,6 @@ int daDbDoor00_c::draw() {
     return 1;
 }
 
-/* 8045E428-8045E49C 001128 0074+00 1/1 0/0 0/0 .text            Delete__12daDbDoor00_cFv */
 int daDbDoor00_c::Delete() {
     if (heap != NULL) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -417,44 +386,34 @@ int daDbDoor00_c::Delete() {
     return 1;
 }
 
-/* 8045E49C-8045E4BC 00119C 0020+00 1/0 0/0 0/0 .text            daDbdoor00_Draw__FP12daDbDoor00_c
- */
 static int daDbdoor00_Draw(daDbDoor00_c* i_this) {
     return i_this->draw();
 }
 
-/* 8045E4BC-8045E4E0 0011BC 0024+00 1/0 0/0 0/0 .text daDbdoor00_Execute__FP12daDbDoor00_c */
 static int daDbdoor00_Execute(daDbDoor00_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 8045E4E0-8045E4E8 0011E0 0008+00 1/0 0/0 0/0 .text daDbdoor00_IsDelete__FP12daDbDoor00_c */
 static int daDbdoor00_IsDelete(daDbDoor00_c* i_this) {
     return 1;
 }
 
-/* 8045E4E8-8045E50C 0011E8 0024+00 1/0 0/0 0/0 .text            daDbdoor00_Delete__FP12daDbDoor00_c
- */
 static int daDbdoor00_Delete(daDbDoor00_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 8045E50C-8045E52C 00120C 0020+00 1/0 0/0 0/0 .text            daDbdoor00_Create__FP10fopAc_ac_c
- */
 static int daDbdoor00_Create(fopAc_ac_c* i_this) {
     return static_cast<daDbDoor00_c*>(i_this)->create();
 }
 
-/* 8045E760-8045E780 -00001 0020+00 1/0 0/0 0/0 .data            l_daDbdoor00_Method */
 static actor_method_class l_daDbdoor00_Method = {
     (process_method_func)daDbdoor00_Create,  (process_method_func)daDbdoor00_Delete,
     (process_method_func)daDbdoor00_Execute, (process_method_func)daDbdoor00_IsDelete,
     (process_method_func)daDbdoor00_Draw,
 };
 
-/* 8045E780-8045E7B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DBDOOR */
 extern actor_process_profile_definition g_profile_DBDOOR = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp
index 5c3e764fc8..fdc9949619 100644
--- a/src/d/actor/d_a_door_knob00.cpp
+++ b/src/d/actor/d_a_door_knob00.cpp
@@ -13,24 +13,18 @@
 #include "SSystem/SComponent/c_math.h"
 #include "printf.h"
 
-/* 8045E858-8045E864 000078 000C+00 1/1 0/0 0/0 .text getDoorModel__12knob_param_cFP10fopAc_ac_c
- */
 u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) {
     return fopAcM_GetParamBit(i_this, 5, 3);
 }
 
-/* 8045E864-8045E870 000084 000C+00 1/1 0/0 0/0 .text
- * getDoorLightInf__12knob_param_cFP10fopAc_ac_c                */
 u32 knob_param_c::getDoorLightInf(fopAc_ac_c* i_this) {
     return fopAcM_GetParamBit(i_this, 8, 3);
 }
 
-/* 8045E870-8045E87C 000090 000C+00 2/2 0/0 0/0 .text getMsgNo__12knob_param_cFP10fopAc_ac_c */
 u16 knob_param_c::getMsgNo(fopAc_ac_c* i_this) {
     return i_this->home.angle.x;
 }
 
-/* 8045E87C-8045E888 00009C 000C+00 2/2 0/0 0/0 .text getExitNo__12knob_param_cFP10fopAc_ac_c */
 u8 knob_param_c::getExitNo(fopAc_ac_c* i_this) {
     return fopAcM_GetParamBit(i_this, 25, 6);
 }
@@ -39,49 +33,39 @@ static char* dummyStringFunc() {
     return "door-knob_";
 }
 
-/* 8045E888-8045E898 0000A8 0010+00 4/4 0/0 0/0 .text            getAlwaysArcName__10daKnob20_cFv */
 char* daKnob20_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 8045E898-8045E8A8 0000B8 0010+00 3/3 0/0 0/0 .text            getEvArcName__10daKnob20_cFv */
 char* daKnob20_c::getEvArcName() {
     return "DoorK10";
 }
 
-/* 8045E8A8-8045E8B8 0000C8 0010+00 1/1 0/0 0/0 .text            getDzb__10daKnob20_cFv */
 char* daKnob20_c::getDzb() {
     return "door-knob.dzb";
 }
 
-/* 8045E8B8-8045E8C8 0000D8 0010+00 1/1 0/0 0/0 .text            getDummyBmd__10daKnob20_cFv */
 char* daKnob20_c::getDummyBmd() {
     return "door-knobDummy.bmd";
 }
 
-/* 80460894-80460898 -00001 0004+00 1/1 0/0 0/0 .data            l_bmd_base_name */
 static char* l_bmd_base_name = "door-knob_";
 
-/* 80460A98-80460AB8 000000 0020+00 1/1 0/0 0/0 .bss             l_bmdName$3809 */
 static char l_bmdName[32];
 
-/* 8045E8C8-8045E91C 0000E8 0054+00 1/1 0/0 0/0 .text            getBmd__10daKnob20_cFv */
 char* daKnob20_c::getBmd() {
     sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this));
     return l_bmdName;
 }
 
-/* 8045E91C-8045E940 00013C 0024+00 1/1 0/0 0/0 .text            getDoorModelData__10daKnob20_cFv */
 J3DModelData* daKnob20_c::getDoorModelData() {
     return (J3DModelData*)dComIfG_getStageRes(getBmd());
 }
 
-/* 8045E940-8045E960 000160 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daKnob20_c*>(i_this)->CreateHeap();
 }
 
-/* 8045E960-8045EBA0 000180 0240+00 1/1 0/0 0/0 .text            CreateHeap__10daKnob20_cFv */
 int daKnob20_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmd());
     JUT_ASSERT(201, modelData != NULL);
@@ -123,7 +107,6 @@ int daKnob20_c::CreateHeap() {
     }
 }
 
-/* 8045EBA0-8045EC44 0003C0 00A4+00 3/3 0/0 0/0 .text            calcMtx__10daKnob20_cFv */
 void daKnob20_c::calcMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -133,7 +116,6 @@ void daKnob20_c::calcMtx() {
     mModel1->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8045EC44-8045ED1C 000464 00D8+00 1/1 0/0 0/0 .text            CreateInit__10daKnob20_cFv */
 int daKnob20_c::CreateInit() {
     int rt = dComIfG_Bgsp().Regist(field_0x5a0, this);
     JUT_ASSERT(299, rt == 0);
@@ -153,7 +135,6 @@ int daKnob20_c::CreateInit() {
     return 1;
 }
 
-/* 8045ED1C-8045EE14 00053C 00F8+00 1/1 0/0 0/0 .text            create__10daKnob20_cFv */
 int daKnob20_c::create() {
     fopAcM_ct(this, daKnob20_c);
     int phase = dComIfG_resLoad(&mPhase2, getAlwaysArcName());
@@ -171,7 +152,6 @@ int daKnob20_c::create() {
     return 4;
 }
 
-/* 8045EE5C-8045EEE4 00067C 0088+00 1/1 0/0 0/0 .text            checkOpenDoor__10daKnob20_cFPi */
 int daKnob20_c::checkOpenDoor(int* param_1) {
     int msgNo = knob_param_c::getMsgNo(this);
     if (msgNo == 0xffff) {
@@ -184,8 +164,6 @@ int daKnob20_c::checkOpenDoor(int* param_1) {
     return rv;
 }
 
-/* 8045EEE4-8045EFCC 000704 00E8+00 1/1 0/0 0/0 .text            setActionFromFlow__10daKnob20_cFv
- */
 void daKnob20_c::setActionFromFlow() {
     if (mAction == ACTION_INIT || mAction == ACTION_DEMO || mAction == ACTION_TALK) {
         return;
@@ -214,7 +192,6 @@ void daKnob20_c::setActionFromFlow() {
     }
 }
 
-/* 80460898-804608B4 -00001 001C+00 1/1 0/0 0/0 .data            ev_name_table$4009 */
 static char* ev_name_table[7] = {
     "DEFAULT_KNOB_DOOR_F_OPEN",
     "DEFAULT_KNOB_DOOR_B_OPEN",
@@ -225,7 +202,6 @@ static char* ev_name_table[7] = {
     "DEFAULT_KNOB_TALK",
 };
 
-/* 8045EFCC-8045F058 0007EC 008C+00 1/1 0/0 0/0 .text            setEventId__10daKnob20_cFv */
 void daKnob20_c::setEventId() {
     for (int i = 0; i < 7; i++) {
         field_0x5b2[i] = 0xff;
@@ -234,7 +210,6 @@ void daKnob20_c::setEventId() {
     }
 }
 
-/* 8045F058-8045F29C 000878 0244+00 1/1 0/0 0/0 .text            checkArea__10daKnob20_cFfff */
 int daKnob20_c::checkArea(f32 param_1, f32 param_2, f32 param_3) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz playerDistance = player->current.pos - current.pos;
@@ -261,7 +236,6 @@ int daKnob20_c::checkArea(f32 param_1, f32 param_2, f32 param_3) {
     }
 }
 
-/* 8045F29C-8045F428 000ABC 018C+00 3/3 0/0 0/0 .text            setEventPrm__10daKnob20_cFv */
 void daKnob20_c::setEventPrm() {
     if (knob_param_c::getExitNo(this) == 62) {
         if (strcmp(dComIfGp_getStartStageName(), "F_SP116") == 0) {
@@ -302,7 +276,6 @@ void daKnob20_c::setEventPrm() {
     }
 }
 
-/* 8045F428-8045F478 000C48 0050+00 1/1 0/0 0/0 .text            releaseBG__10daKnob20_cFv */
 int daKnob20_c::releaseBG() {
     if (field_0x5a0->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x5a0);
@@ -310,7 +283,6 @@ int daKnob20_c::releaseBG() {
     return 1;
 }
 
-/* 8045F478-8045F520 000C98 00A8+00 1/1 0/0 0/0 .text            frontCheck__10daKnob20_cFv */
 int daKnob20_c::frontCheck() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz playerDist = player->current.pos - current.pos;
@@ -322,7 +294,6 @@ int daKnob20_c::frontCheck() {
     return 1;
 }
 
-/* 804608B4-804608F4 -00001 0040+00 1/1 0/0 0/0 .data            action_table$4177 */
 static char* action_table[16] = {
     "WAIT",
     "SETSTART",
@@ -342,12 +313,10 @@ static char* action_table[16] = {
     "DEMO_CLOSE",
 };
 
-/* 8045F520-8045F568 000D40 0048+00 1/1 0/0 0/0 .text            getDemoAction__10daKnob20_cFv */
 int daKnob20_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x5bc, action_table, 16, 0, 0);
 }
 
-/* 8045F568-8045F8A4 000D88 033C+00 9/7 0/0 0/0 .text            demoProc__10daKnob20_cFv */
 int daKnob20_c::demoProc() {
     int demoAction;
     int rv = 0;
@@ -454,7 +423,6 @@ int daKnob20_c::demoProc() {
     return rv;
 }
 
-/* 8045F8A4-8045F94C 0010C4 00A8+00 1/1 0/0 0/0 .text            setStart__10daKnob20_cFff */
 void daKnob20_c::setStart(f32 param_1, f32 param_2) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz pos(current.pos);
@@ -464,12 +432,10 @@ void daKnob20_c::setStart(f32 param_1, f32 param_2) {
     player->setPlayerPosAndAngle(&pos, player->shape_angle.y, 0);
 }
 
-/* 8045F94C-8045F968 00116C 001C+00 1/1 0/0 0/0 .text            setAngle__10daKnob20_cFv */
 void daKnob20_c::setAngle() {
   static_cast<daPy_py_c*>(dComIfGp_getPlayer(0))->changeDemoMoveAngle(shape_angle.y + 0x7fff);
 }
 
-/* 8045F968-8045FA98 001188 0130+00 1/1 0/0 0/0 .text            adjustmentProc__10daKnob20_cFv */
 int daKnob20_c::adjustmentProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz local_1c;
@@ -491,7 +457,6 @@ int daKnob20_c::adjustmentProc() {
     return 0;
 }
 
-/* 80460968-80460978 -00001 0010+00 1/1 0/0 0/0 .data            bck_table$4335 */
 static char* bck_table[4] = {
     "FDoorA.bck",
     "FDoorB.bck",
@@ -499,7 +464,6 @@ static char* bck_table[4] = {
     "FDoorB.bck",
 };
 
-/* 8045FA98-8045FBF8 0012B8 0160+00 1/1 0/0 0/0 .text            openInit__10daKnob20_cFi */
 int daKnob20_c::openInit(int param_1) {
     J3DAnmTransform* anm =
         (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), bck_table[param_1]);
@@ -516,7 +480,6 @@ int daKnob20_c::openInit(int param_1) {
     return 1;
 }
 
-/* 8045FBF8-8045FCA4 001418 00AC+00 1/1 0/0 0/0 .text            openProc__10daKnob20_cFi */
 int daKnob20_c::openProc(int param_1) {
     if (field_0x57c.play() != 0) {
         return 1;
@@ -528,7 +491,6 @@ int daKnob20_c::openProc(int param_1) {
     return 0;
 }
 
-/* 8045FCA4-8045FDF8 0014C4 0154+00 1/1 0/0 0/0 .text            openEnd__10daKnob20_cFi */
 int daKnob20_c::openEnd(int param_1) {
     offFlag(1);
     int rt = dComIfG_Bgsp().Regist(field_0x5a0, this);
@@ -551,7 +513,6 @@ int daKnob20_c::openEnd(int param_1) {
     return 1;
 }
 
-/* 8045FDF8-8045FE68 001618 0070+00 3/3 0/0 0/0 .text            initOpenDemo__10daKnob20_cFv */
 void daKnob20_c::initOpenDemo() {
     shape_angle.y = current.angle.y;
     if (field_0x60f == 1) {
@@ -560,7 +521,6 @@ void daKnob20_c::initOpenDemo() {
     field_0x5bc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0);
 }
 
-/* 8045FE68-8045FF08 001688 00A0+00 1/1 0/0 0/0 .text            startDemoProc__10daKnob20_cFv */
 void daKnob20_c::startDemoProc() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     field_0x5bc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0);
@@ -576,7 +536,6 @@ void daKnob20_c::startDemoProc() {
     }
 }
 
-/* 8045FF08-8045FFB0 001728 00A8+00 1/0 0/0 0/0 .text            actionWait__10daKnob20_cFv */
 int daKnob20_c::actionWait() {
     if (eventInfo.checkCommandDoor()) {
         initOpenDemo();
@@ -594,8 +553,6 @@ int daKnob20_c::actionWait() {
     return 1;
 }
 
-/* 8045FFB0-8046002C 0017D0 007C+00 1/0 0/0 0/0 .text            actionSpecialDemo__10daKnob20_cFv
- */
 int daKnob20_c::actionSpecialDemo() {
     field_0x5bc = dComIfGp_evmng_getMyStaffId("kdoor", 0, 0);
     if (field_0x5bc == -1) {
@@ -607,7 +564,6 @@ int daKnob20_c::actionSpecialDemo() {
     return 1;
 }
 
-/* 8046002C-804600C0 00184C 0094+00 1/0 0/0 0/0 .text            actionDemo__10daKnob20_cFv */
 int daKnob20_c::actionDemo() {
     if ( dComIfGp_evmng_endCheck(field_0x5a4[field_0x5b9])) {
         setAction(ACTION_WAIT);
@@ -620,7 +576,6 @@ int daKnob20_c::actionDemo() {
     return 1;
 }
 
-/* 804600C0-8046012C 0018E0 006C+00 1/0 0/0 0/0 .text            actionTalk__10daKnob20_cFv */
 int daKnob20_c::actionTalk() {
     dMeter2Info_onGameStatus(2);
     if (demoProc()) {
@@ -631,7 +586,6 @@ int daKnob20_c::actionTalk() {
     return 1;
 }
 
-/* 8046012C-804601D4 00194C 00A8+00 1/0 0/0 0/0 .text            actionTalkWait__10daKnob20_cFv */
 int daKnob20_c::actionTalkWait() {
     if (eventInfo.checkCommandDoor()) {
         initOpenDemo();
@@ -649,7 +603,6 @@ int daKnob20_c::actionTalkWait() {
     return 1;
 }
 
-/* 804601D4-8046027C 0019F4 00A8+00 1/0 0/0 0/0 .text            actionTalkOpen__10daKnob20_cFv */
 int daKnob20_c::actionTalkOpen() {
     if (eventInfo.checkCommandDoor()) {
         initOpenDemo();
@@ -667,7 +620,6 @@ int daKnob20_c::actionTalkOpen() {
     return 1;
 }
 
-/* 8046027C-804602D8 001A9C 005C+00 1/0 0/0 0/0 .text            actionInit__10daKnob20_cFv */
 int daKnob20_c::actionInit() {
     if (!field_0x5a0->ChkUsed()) {
         dComIfG_Bgsp().Regist(field_0x5a0, this);
@@ -676,12 +628,10 @@ int daKnob20_c::actionInit() {
     return 1;
 }
 
-/* 804602D8-804602E0 001AF8 0008+00 1/0 0/0 0/0 .text            actionDead__10daKnob20_cFv */
 int daKnob20_c::actionDead() {
     return 1;
 }
 
-/* 804602E0-8046045C 001B00 017C+00 1/1 0/0 0/0 .text            execute__10daKnob20_cFv */
 int daKnob20_c::execute() {
     static actionFunc l_action[8] = {
         &daKnob20_c::actionInit, &daKnob20_c::actionWait,        &daKnob20_c::actionDemo,
@@ -701,7 +651,6 @@ int daKnob20_c::execute() {
     return 1;
 }
 
-/* 8046045C-80460550 001C7C 00F4+00 1/1 0/0 0/0 .text            draw__10daKnob20_cFv */
 int daKnob20_c::draw() {
     g_env_light.settingTevStruct(0x14, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel2, &tevStr);
@@ -714,7 +663,6 @@ int daKnob20_c::draw() {
     return 1;
 }
 
-/* 80460550-804605DC 001D70 008C+00 1/1 0/0 0/0 .text            Delete__10daKnob20_cFv */
 int daKnob20_c::Delete() {
     if (heap != NULL && field_0x5a0 != NULL && field_0x5a0->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x5a0);
@@ -724,35 +672,29 @@ int daKnob20_c::Delete() {
     return 1;
 }
 
-/* 804605DC-804605FC 001DFC 0020+00 1/0 0/0 0/0 .text            daKnob20_Draw__FP10daKnob20_c */
 static int daKnob20_Draw(daKnob20_c* i_this) {
     return i_this->draw();
 }
 
-/* 804605FC-80460620 001E1C 0024+00 1/0 0/0 0/0 .text            daKnob20_Execute__FP10daKnob20_c */
 static int daKnob20_Execute(daKnob20_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 80460620-80460640 001E40 0020+00 1/0 0/0 0/0 .text            daKnob20_Delete__FP10daKnob20_c */
 static int daKnob20_Delete(daKnob20_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80460640-80460660 001E60 0020+00 1/0 0/0 0/0 .text            daKnob20_Create__FP10fopAc_ac_c */
 static int daKnob20_Create(fopAc_ac_c* i_this) {
     return static_cast<daKnob20_c*>(i_this)->create();
 }
 
-/* 80460A38-80460A58 -00001 0020+00 1/0 0/0 0/0 .data            l_daKnob20_Method */
 static actor_method_class l_daKnob20_Method = {
     (process_method_func)daKnob20_Create,  (process_method_func)daKnob20_Delete,
     (process_method_func)daKnob20_Execute, (process_method_func)NULL,
     (process_method_func)daKnob20_Draw,
 };
 
-/* 80460A58-80460A88 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KNOB20 */
 extern actor_process_profile_definition g_profile_KNOB20 = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp
index 25f299b495..56f717c5fd 100644
--- a/src/d/actor/d_a_door_mbossL1.cpp
+++ b/src/d/actor/d_a_door_mbossL1.cpp
@@ -15,12 +15,10 @@
 #include "SSystem/SComponent/c_lib.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80672838-80672844 000078 000C+00 15/15 0/0 0/0 .text            getNowLevel__FP10fopAc_ac_c */
 static int getNowLevel(fopAc_ac_c* i_this) {
     return static_cast<daMBdoorL1_c*>(i_this)->argument;
 }
 
-/* 80672844-80672894 000084 0050+00 1/1 0/0 0/0 .text            searchStop__FPvPv */
 static void* searchStop(void* param_1, void* param_2) {
     if (param_1 != NULL && fopAcM_IsActor(param_1) &&
         fopAcM_GetProfName(param_1) == PROC_Obj_Stopper)
@@ -30,12 +28,10 @@ static void* searchStop(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80672894-806728B4 0000D4 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daMBdoorL1_c*>(i_this)->CreateHeap();
 }
 
-/* 806728B4-80672970 0000F4 00BC+00 6/6 0/0 0/0 .text calcMtx__13dDoor_stop2_cFP10fopAc_ac_c */
 void dDoor_stop2_c::calcMtx(fopAc_ac_c* param_1) {
     if (field_0x8 == 0 || mModel == NULL) {
         return;
@@ -49,22 +45,18 @@ void dDoor_stop2_c::calcMtx(fopAc_ac_c* param_1) {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80677558-80677568 000000 000D+03 19/19 0/0 0/0 .rodata          l_staff_name */
 static char const l_staff_name[13] = "SHUTTER_DOOR";
 
-/* 80677568-80677580 000010 0018+00 1/1 0/0 0/0 .rodata          l_door_heap_size */
 static u16 const l_door_heap_size[12] = {
     0x0000, 0x0AE0, 0x1820, 0x1180, 0x1820, 0x1310,
     0x0AE0, 0x0AE0, 0x13A0, 0x1820, 0x0AE0, 0x1310,
 };
 
-/* 80677580-80677598 000028 0018+00 1/1 0/0 0/0 .rodata          l_stop_heap_size */
 static u16 const l_stop_heap_size[12] = {
     0x0000, 0x0000, 0x0800, 0x0000, 0x1540, 0x1BD0,
     0x0EA0, 0x0800, 0x0EB0, 0x0800, 0x0800, 0x1BD0,
 };
 
-/* 80677990-806779BC -00001 002C+00 0/1 0/0 0/0 .data            l_door_open_demo */
 static char* l_door_open_demo[11] = {
     NULL,
     "DEFAULT_MBS_SHUTTER_L1_F",
@@ -79,7 +71,6 @@ static char* l_door_open_demo[11] = {
     "DEFAULT_MBS_SHUTTER_L7_F",
 };
 
-/* 806779BC-806779E8 -00001 002C+00 0/1 0/0 0/0 .data            l_door_open_demoB */
 static char* l_door_open_demoB[11] = {
     NULL,
     "DEFAULT_MBS_SHUTTER_L1_B",
@@ -94,7 +85,6 @@ static char* l_door_open_demoB[11] = {
     "DEFAULT_MBS_SHUTTER_L7_B",
 };
 
-/* 806779E8-806779F8 -00001 0010+00 0/1 0/0 0/0 .data            l_door_open_demoLv5 */
 static char* l_door_open_demoLv5[4] = {
     "DEFAULT_MBS_KNOB_OPEN_B",
     "DEFAULT_MBS_KNOB_OPEN_F",
@@ -102,8 +92,6 @@ static char* l_door_open_demoLv5[4] = {
     "DEFAULT_MBS_KNOB_NOTOPEN_F",
 };
 
-/* 80672970-80672AE4 0001B0 0174+00 3/2 0/0 0/0 .text closeInit__13dDoor_stop2_cFP10fopAc_ac_cUc
- */
 void dDoor_stop2_c::closeInit(fopAc_ac_c* param_1, u8 param_2) {
     field_0x4 = getHeight();
     param_1->speedF = 0.0f;
@@ -128,7 +116,6 @@ void dDoor_stop2_c::closeInit(fopAc_ac_c* param_1, u8 param_2) {
     }
 }
 
-/* 80672AE4-80672B70 000324 008C+00 2/2 0/0 0/0 .text closeProc__13dDoor_stop2_cFP10fopAc_ac_c */
 int dDoor_stop2_c::closeProc(fopAc_ac_c* param_1) {
     if (field_0xb == 0) {
         return 1;
@@ -141,7 +128,6 @@ int dDoor_stop2_c::closeProc(fopAc_ac_c* param_1) {
     return 0;
 }
 
-/* 80672B70-80672CD8 0003B0 0168+00 2/1 0/0 0/0 .text openInit__13dDoor_stop2_cFP10fopAc_ac_cUc */
 void dDoor_stop2_c::openInit(fopAc_ac_c* param_1, u8 param_2) {
     field_0x4 = 0;
     param_1->speedF = 0.0f;
@@ -166,7 +152,6 @@ void dDoor_stop2_c::openInit(fopAc_ac_c* param_1, u8 param_2) {
     }
 }
 
-/* 80672CD8-80672D80 000518 00A8+00 1/1 0/0 0/0 .text openProc__13dDoor_stop2_cFP10fopAc_ac_c */
 int dDoor_stop2_c::openProc(fopAc_ac_c* param_1) {
     if (field_0xb == 0) {
         return 1;
@@ -182,7 +167,6 @@ int dDoor_stop2_c::openProc(fopAc_ac_c* param_1) {
     }
 }
 
-/* 80672D80-80672DCC 0005C0 004C+00 1/1 0/0 0/0 .text create__13dDoor_stop2_cFP12J3DModelData */
 int dDoor_stop2_c::create(J3DModelData* modelData) {
     mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     if (mModel == NULL) {
@@ -191,8 +175,6 @@ int dDoor_stop2_c::create(J3DModelData* modelData) {
     return 1;
 }
 
-/* 80672DCC-80672E44 00060C 0078+00 2/2 0/0 0/0 .text            draw__13dDoor_stop2_cFP10fopAc_ac_c
- */
 void dDoor_stop2_c::draw(fopAc_ac_c* param_1) {
     if (mModel != NULL) {
         g_env_light.settingTevStruct(16, &param_1->current.pos, &param_1->tevStr);
@@ -201,7 +183,6 @@ void dDoor_stop2_c::draw(fopAc_ac_c* param_1) {
     }
 }
 
-/* 80672E44-80672E70 000684 002C+00 2/2 0/0 0/0 .text            getHeight__13dDoor_stop2_cFv */
 f32 dDoor_stop2_c::getHeight() {
     if (mModel != NULL) {
         J3DJoint* root_jnt = mModel->getModelData()->getJointNodePointer(0);
@@ -212,7 +193,6 @@ f32 dDoor_stop2_c::getHeight() {
 }
 
 
-/* 80672E70-80672EE8 0006B0 0078+00 5/5 0/0 0/0 .text            getAnmArcName__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getAnmArcName() {
     switch(getDoorType()) {
     case 0:
@@ -225,7 +205,6 @@ char* daMBdoorL1_c::getAnmArcName() {
     return "DoorT00";
 }
 
-/* 80672EE8-80672F74 000728 008C+00 4/3 0/0 0/0 .text            getArcName__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getArcName() {
     switch (getNowLevel(this)) {
     case 0:
@@ -249,13 +228,10 @@ char* daMBdoorL1_c::getArcName() {
     }
 }
 
-/* 80672F74-80672F84 0007B4 0010+00 4/4 0/0 0/0 .text            getAlwaysArcName__12daMBdoorL1_cFv
- */
 char* daMBdoorL1_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 80672F84-80672FE4 0007C4 0060+00 15/15 0/0 0/0 .text            getDoorType__12daMBdoorL1_cFv */
 int daMBdoorL1_c::getDoorType() {
     switch(getNowLevel(this)) {
     case 1:
@@ -269,7 +245,6 @@ int daMBdoorL1_c::getDoorType() {
     }
 }
 
-/* 80672FE4-80673048 000824 0064+00 2/2 0/0 0/0 .text            getOpenAnm__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getOpenAnm() {
     if (getDoorType() == DOOR_TYPE_1) {
         return"oj_DoorOpD.bck";
@@ -280,7 +255,6 @@ char* daMBdoorL1_c::getOpenAnm() {
     return NULL;
 }
 
-/* 80673048-806730AC 000888 0064+00 1/1 0/0 0/0 .text            getCloseAnm__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getCloseAnm() {
     if (getDoorType() == DOOR_TYPE_1) {
         return"oj_DoorCloseD.bck";
@@ -291,7 +265,6 @@ char* daMBdoorL1_c::getCloseAnm() {
     return NULL;
 }
 
-/* 806730AC-80673100 0008EC 0054+00 1/1 0/0 0/0 .text            getBmd__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getBmd() {
     switch(getNowLevel(this)) {
     case 5:
@@ -302,12 +275,10 @@ char* daMBdoorL1_c::getBmd() {
     }
 }
 
-/* 80673100-80673110 000940 0010+00 1/1 0/0 0/0 .text            getBtk__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getBtk() {
     return "door-shutter_00.btk";
 }
 
-/* 80673110-80673140 000950 0030+00 1/1 0/0 0/0 .text            getDzb__12daMBdoorL1_cFv */
 char* daMBdoorL1_c::getDzb() {
     if (getNowLevel(this) == 5) {
         return "door-shutter.dzb";
@@ -315,13 +286,10 @@ char* daMBdoorL1_c::getDzb() {
     return "door-shutter.dzb";
 }
 
-/* 80673140-80673164 000980 0024+00 1/1 0/0 0/0 .text            getDoorModelData__12daMBdoorL1_cFv
- */
 J3DModelData* daMBdoorL1_c::getDoorModelData() {
     return static_cast<J3DModelData*>(dComIfG_getStageRes(getBmd()));
 }
 
-/* 80673164-806735B0 0009A4 044C+00 1/1 0/0 0/0 .text            CreateHeap__12daMBdoorL1_cFv */
 int daMBdoorL1_c::CreateHeap() {
     int level = getNowLevel(this);
     J3DModelData* modelData = getDoorModelData();
@@ -400,7 +368,6 @@ int daMBdoorL1_c::CreateHeap() {
     return 1;
 }
 
-/* 806735F8-80673790 000E38 0198+00 4/4 0/0 0/0 .text            calcMtx__12daMBdoorL1_cFv */
 void daMBdoorL1_c::calcMtx() {
     cXyz cStack_1c(220.0f, 0.0f, 0.0f);
     cXyz cStack_28(-220.0f, 0.0f, 0.0f);
@@ -435,7 +402,6 @@ void daMBdoorL1_c::calcMtx() {
     }
 }
 
-/* 80673790-806738CC 000FD0 013C+00 1/1 0/0 0/0 .text            createKey__12daMBdoorL1_cFv */
 int daMBdoorL1_c::createKey() {
     if (mKeyHoleId == 0xffffffff) {
         cXyz cStack_1c(current.pos);
@@ -459,7 +425,6 @@ int daMBdoorL1_c::createKey() {
     return 1;
 }
 
-/* 806738CC-80673B9C 00110C 02D0+00 1/1 0/0 0/0 .text            CreateInit__12daMBdoorL1_cFv */
 int daMBdoorL1_c::CreateInit() {
     field_0x81c = home.pos;
     field_0x828 = field_0x81c;
@@ -521,7 +486,6 @@ int daMBdoorL1_c::CreateInit() {
     return 1;
 }
 
-/* 80673B9C-80673D98 0013DC 01FC+00 1/1 0/0 0/0 .text            create__12daMBdoorL1_cFv */
 int daMBdoorL1_c::create() {
     fopAcM_ct(this, daMBdoorL1_c);
     int rv = dComIfG_resLoad(&mPhase1, getArcName());
@@ -564,7 +528,6 @@ int daMBdoorL1_c::create() {
     }
 }
 
-/* 80673E78-80673EC0 0016B8 0048+00 1/1 0/0 0/0 .text            getDemoAction__12daMBdoorL1_cFv */
 int daMBdoorL1_c::getDemoAction() {
     static char* action_table[26] = {
         "WAIT",
@@ -597,7 +560,6 @@ int daMBdoorL1_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x5e8, action_table, 26, 0, 0);
 }
 
-/* 80673EC0-80674AF4 001700 0C34+00 6/4 0/0 0/0 .text            demoProc__12daMBdoorL1_cFv */
 void daMBdoorL1_c::demoProc() {
     int demoAction = getDemoAction();
     cXyz cStack_20;
@@ -946,7 +908,6 @@ void daMBdoorL1_c::demoProc() {
     }
 }
 
-/* 80674AF4-80674DA4 002334 02B0+00 1/1 0/0 0/0 .text            openInit__12daMBdoorL1_cFv */
 int daMBdoorL1_c::openInit() {
     static u16 const l_eff_id[2] = {0x8295, 0x8296};
     static u16 const l_eff_id_lv3[5] = {0x8762, 0x8763, 0x8764, 0x8765, 0x8766};
@@ -1001,7 +962,6 @@ int daMBdoorL1_c::openInit() {
     return 1;
 }
 
-/* 80674DA4-80674FDC 0025E4 0238+00 1/1 0/0 0/0 .text            openProc__12daMBdoorL1_cFv */
 int daMBdoorL1_c::openProc() {
     int rv = mBckAnms[0]->play();
     if (getDoorType() == DOOR_TYPE_0) {
@@ -1040,7 +1000,6 @@ int daMBdoorL1_c::openProc() {
     return rv;
 }
 
-/* 80674FDC-80675068 00281C 008C+00 1/1 0/0 0/0 .text            openEnd__12daMBdoorL1_cFv */
 int daMBdoorL1_c::openEnd() {
     if (getDoorType() == DOOR_TYPE_0) {
         mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_OPEN_STOP, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -1048,7 +1007,6 @@ int daMBdoorL1_c::openEnd() {
     return 1;
 }
 
-/* 80675068-806752BC 0028A8 0254+00 1/1 0/0 0/0 .text            closeInit__12daMBdoorL1_cFv */
 int daMBdoorL1_c::closeInit() {
     if (getDoorType() == 0) {
         mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -1074,14 +1032,12 @@ int daMBdoorL1_c::closeInit() {
     return 1;
 }
 
-/* 806752BC-80675304 002AFC 0048+00 1/1 0/0 0/0 .text            closeProc__12daMBdoorL1_cFv */
 int daMBdoorL1_c::closeProc() {
     int rv = mBckAnms[0]->play();
     calcMtx();
     return rv;
 }
 
-/* 80675304-806753CC 002B44 00C8+00 1/1 0/0 0/0 .text            closeEnd__12daMBdoorL1_cFv */
 int daMBdoorL1_c::closeEnd() {
     dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
     if (getDoorType() == DOOR_TYPE_0) {
@@ -1092,7 +1048,6 @@ int daMBdoorL1_c::closeEnd() {
 }
 
 
-/* 806753CC-80675414 002C0C 0048+00 1/1 0/0 0/0 .text            unlockInit__12daMBdoorL1_cFv */
 int daMBdoorL1_c::unlockInit() {
     obj_keyhole_class* keyHole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
     if (keyHole != NULL) {
@@ -1101,7 +1056,6 @@ int daMBdoorL1_c::unlockInit() {
     return 1;
 }
 
-/* 80675414-80675470 002C54 005C+00 1/1 0/0 0/0 .text            unlock__12daMBdoorL1_cFv */
 int daMBdoorL1_c::unlock() {
     obj_keyhole_class* keyHole = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
     if ((keyHole != NULL && keyHole->checkOpenEnd()) || keyHole == NULL) {
@@ -1110,7 +1064,6 @@ int daMBdoorL1_c::unlock() {
     return 0;
 }
 
-/* 80675470-80675678 002CB0 0208+00 1/1 0/0 0/0 .text            openInitKnob__12daMBdoorL1_cFi */
 int daMBdoorL1_c::openInitKnob(int param_1) {
     static char* bck_table[4] = {
         "FDoorA.bck",
@@ -1142,7 +1095,6 @@ int daMBdoorL1_c::openInitKnob(int param_1) {
     return 1;
 }
 
-/* 80675678-80675734 002EB8 00BC+00 1/1 0/0 0/0 .text            openProcKnob__12daMBdoorL1_cFi */
 int daMBdoorL1_c::openProcKnob(int param_1) {
     if (field_0x590->play()) {
         return 1;
@@ -1157,7 +1109,6 @@ int daMBdoorL1_c::openProcKnob(int param_1) {
     return 0;
 }
 
-/* 80675734-80675894 002F74 0160+00 1/1 0/0 0/0 .text            openEndKnob__12daMBdoorL1_cFi */
 int daMBdoorL1_c::openEndKnob(int param_1) {
     if (field_0x598 != NULL && !field_0x598->ChkUsed()) {
         int rt = dComIfG_Bgsp().Regist(field_0x598, this);
@@ -1181,7 +1132,6 @@ int daMBdoorL1_c::openEndKnob(int param_1) {
     return 1;
 }
 
-/* 80675894-806759E4 0030D4 0150+00 1/1 0/0 0/0 .text            calcGoal__12daMBdoorL1_cFP4cXyzi */
 void daMBdoorL1_c::calcGoal(cXyz* param_1, int param_2) {
     cXyz dist = dComIfGp_getPlayer(0)->current.pos - current.pos;
     mDoMtx_stack_c::YrotS(-current.angle.y);
@@ -1210,7 +1160,6 @@ void daMBdoorL1_c::calcGoal(cXyz* param_1, int param_2) {
     param_1->z = dist.z;
 }
 
-/* 806759E4-80675ADC 003224 00F8+00 1/1 0/0 0/0 .text            setAngle__12daMBdoorL1_cFv */
 int daMBdoorL1_c::setAngle() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz playerPos;
@@ -1231,8 +1180,6 @@ int daMBdoorL1_c::setAngle() {
     return 0;
 }
 
-/* 80675ADC-80675B30 00331C 0054+00 1/1 0/0 0/0 .text            setAngleQuickly__12daMBdoorL1_cFv
- */
 void daMBdoorL1_c::setAngleQuickly() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     s16 doorAngle = shape_angle.y;
@@ -1242,7 +1189,6 @@ void daMBdoorL1_c::setAngleQuickly() {
     player->changeDemoMoveAngle(doorAngle);
 }
 
-/* 80675B30-80675DB0 003370 0280+00 1/1 0/0 0/0 .text            adjustmentProc__12daMBdoorL1_cFv */
 int daMBdoorL1_c::adjustmentProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz local_24;
@@ -1293,7 +1239,6 @@ int daMBdoorL1_c::adjustmentProc() {
     return 0;
 }
 
-/* 80675DB0-80675EE4 0035F0 0134+00 1/1 0/0 0/0 .text            setPos__12daMBdoorL1_cFv */
 void daMBdoorL1_c::setPos() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz local_1c;
@@ -1319,7 +1264,6 @@ void daMBdoorL1_c::setPos() {
     dComIfGp_evmng_setGoal(&local_1c);
 }
 
-/* 80675EE4-80675F8C 003724 00A8+00 1/1 0/0 0/0 .text            setStart__12daMBdoorL1_cFff */
 void daMBdoorL1_c::setStart(f32 param_1, f32 param_2) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz pos(current.pos);
@@ -1334,7 +1278,6 @@ static f32 dummy(f32 param_0) {
     return param_0 + -G_CM3D_F_INF + 50.0f;
 }
 
-/* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text            smokeInit2__12daMBdoorL1_cFv */
 void daMBdoorL1_c::smokeInit2() {
     if (getDoorType() == DOOR_TYPE_1) {
         field_0x81c.y -= 10.0f;
@@ -1345,7 +1288,6 @@ void daMBdoorL1_c::smokeInit2() {
     }
 }
 
-/* 806760B4-806762A4 0038F4 01F0+00 1/1 0/0 0/0 .text            checkArea__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkArea() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz local_48;
@@ -1382,7 +1324,6 @@ int daMBdoorL1_c::checkArea() {
     }
 }
 
-/* 806762A4-80676308 003AE4 0064+00 8/8 0/0 0/0 .text            checkFront__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkFront() {
     if (checkMBossRoom()) {
         return 0;
@@ -1394,7 +1335,6 @@ int daMBdoorL1_c::checkFront() {
     }
 }
 
-/* 80676308-806764D0 003B48 01C8+00 1/1 0/0 0/0 .text            checkOpen__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkOpen() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (getDoorType() == DOOR_TYPE_2 && daPy_py_c::checkNowWolf()) {
@@ -1426,7 +1366,6 @@ int daMBdoorL1_c::checkOpen() {
     return 1;
 }
 
-/* 806764D0-80676568 003D10 0098+00 2/2 0/0 0/0 .text            checkFrontKey__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkFrontKey() {
     if (!checkFront()) {
         return 0;
@@ -1439,12 +1378,10 @@ int daMBdoorL1_c::checkFrontKey() {
     return 0;
 }
 
-/* 80676568-80676570 003DA8 0008+00 1/1 0/0 0/0 .text            checkBackKey__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkBackKey() {
     return 0;
 }
 
-/* 80676570-80676610 003DB0 00A0+00 1/1 0/0 0/0 .text            checkFrontStop__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkFrontStop() {
     if (!checkFront()) {
         return 0;
@@ -1457,7 +1394,6 @@ int daMBdoorL1_c::checkFrontStop() {
     return 0;
 }
 
-/* 80676610-806766B0 003E50 00A0+00 1/1 0/0 0/0 .text            checkBackStop__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkBackStop() {
     if (checkFront()) {
         return 0;
@@ -1470,7 +1406,6 @@ int daMBdoorL1_c::checkBackStop() {
     return 0;
 }
 
-/* 806766B0-80676744 003EF0 0094+00 1/1 0/0 0/0 .text            checkFrontSw__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkFrontSw() {
     if (!checkFront()) {
         return 0;
@@ -1483,7 +1418,6 @@ int daMBdoorL1_c::checkFrontSw() {
     return 0;
 }
 
-/* 80676744-806767D8 003F84 0094+00 1/1 0/0 0/0 .text            checkBackSw__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkBackSw() {
     if (checkFront()) {
         return 0;
@@ -1496,7 +1430,6 @@ int daMBdoorL1_c::checkBackSw() {
     return 0;
 }
 
-/* 806767D8-8067684C 004018 0074+00 1/1 0/0 0/0 .text            checkStopOpen__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkStopOpen() {
     u8 swBit;
     if (field_0x5df == 0) {
@@ -1510,7 +1443,6 @@ int daMBdoorL1_c::checkStopOpen() {
     return 0;
 }
 
-/* 8067684C-806769A4 00408C 0158+00 1/1 0/0 0/0 .text            startDemoEnd__12daMBdoorL1_cFv */
 int daMBdoorL1_c::startDemoEnd() {
     if (!field_0x598->ChkUsed()) {
         int rt = dComIfG_Bgsp().Regist(field_0x598, this);
@@ -1527,7 +1459,6 @@ int daMBdoorL1_c::startDemoEnd() {
     return 1;
 }
 
-/* 806769A4-806769D0 0041E4 002C+00 1/1 0/0 0/0 .text            checkMBossRoom__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkMBossRoom() {
     s32 stayNo = dComIfGp_roomControl_getStayNo();
     if (stayNo == 0x33 || stayNo == 0x34) {
@@ -1536,7 +1467,6 @@ int daMBdoorL1_c::checkMBossRoom() {
     return 0;
 }
 
-/* 806769D0-80676AB4 004210 00E4+00 1/1 0/0 0/0 .text            checkStopClose__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkStopClose() {
     u8 FRoomNo = door_param2_c::getFRoomNo(this);
     door_param2_c::getFRoomNo(this);
@@ -1568,7 +1498,6 @@ int daMBdoorL1_c::checkStopClose() {
     }
 }
 
-/* 80676AB4-80676B64 0042F4 00B0+00 2/2 0/0 0/0 .text            checkMakeStop__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkMakeStop() {
     u8 option;
     u8 swBit;
@@ -1587,7 +1516,6 @@ int daMBdoorL1_c::checkMakeStop() {
     return 0;
 }
 
-/* 80676B64-80676BE0 0043A4 007C+00 1/1 0/0 0/0 .text            checkMakeKey__12daMBdoorL1_cFv */
 int daMBdoorL1_c::checkMakeKey() {
     u8 frontOption = door_param2_c::getFrontOption(this);
     u8 swBit = door_param2_c::getSwbit(this);
@@ -1597,13 +1525,10 @@ int daMBdoorL1_c::checkMakeKey() {
     return 0;
 }
 
-/* 80676BE0-80676BE8 004420 0008+00 1/0 0/0 0/0 .text            actionWait__12daMBdoorL1_cFv */
 int daMBdoorL1_c::actionWait() {
     return 1;
 }
 
-/* 80676BE8-80676DEC 004428 0204+00 2/1 0/0 0/0 .text            actionCloseWait__12daMBdoorL1_cFv
- */
 int daMBdoorL1_c::actionCloseWait() {
     if (eventInfo.checkCommandDoor()) {
         field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
@@ -1647,8 +1572,6 @@ int daMBdoorL1_c::actionCloseWait() {
     return 1;
 }
 
-/* 80676DEC-80676E40 00462C 0054+00 1/0 0/0 0/0 .text            actionStopClose__12daMBdoorL1_cFv
- */
 int daMBdoorL1_c::actionStopClose() {
     if (mDoorStop.closeProc(this)) {
         setAction(ACTION_CLOSE_WAIT);
@@ -1657,7 +1580,6 @@ int daMBdoorL1_c::actionStopClose() {
     return 1;
 }
 
-/* 80676E40-80676EB4 004680 0074+00 1/0 0/0 0/0 .text            actionDemo__12daMBdoorL1_cFv */
 int daMBdoorL1_c::actionDemo() {
     if (dComIfGp_evmng_endCheck(field_0x5d2)) {
         shape_angle.y = current.angle.y;
@@ -1669,13 +1591,11 @@ int daMBdoorL1_c::actionDemo() {
     return 1;
 }
 
-/* 80676EB4-80676ED8 0046F4 0024+00 1/0 0/0 0/0 .text            actionOpen__12daMBdoorL1_cFv */
 int daMBdoorL1_c::actionOpen() {
     demoProc();
     return 1;
 }
 
-/* 80676ED8-80676FE4 004718 010C+00 1/0 0/0 0/0 .text            actionInit__12daMBdoorL1_cFv */
 int daMBdoorL1_c::actionInit() {
     if (fopAcM_CheckStatus(this, 0x1000)) {
         setAction(ACTION_START_DEMO);
@@ -1699,8 +1619,6 @@ int daMBdoorL1_c::actionInit() {
     return 1;
 }
 
-/* 80676FE4-80677050 004824 006C+00 2/1 0/0 0/0 .text            actionStartDemo__12daMBdoorL1_cFv
- */
 int daMBdoorL1_c::actionStartDemo() {
     field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
     demoProc();
@@ -1710,7 +1628,6 @@ int daMBdoorL1_c::actionStartDemo() {
     return 1;
 }
 
-/* 80677050-80677158 004890 0108+00 1/1 0/0 0/0 .text            execute__12daMBdoorL1_cFv */
 int daMBdoorL1_c::execute() {
     static actionFunc l_action[7] = {
         &daMBdoorL1_c::actionInit,
@@ -1725,7 +1642,6 @@ int daMBdoorL1_c::execute() {
     return 1;
 }
 
-/* 80677158-806771B4 004998 005C+00 1/1 0/0 0/0 .text            draw__12daMBdoorL1_cFv */
 int daMBdoorL1_c::draw() {
     switch(getDoorType()) {
     case DOOR_TYPE_0:
@@ -1739,7 +1655,6 @@ int daMBdoorL1_c::draw() {
     return 1;
 }
 
-/* 806771B4-806772C4 0049F4 0110+00 1/1 0/0 0/0 .text            draw_sub0__12daMBdoorL1_cFv */
 void daMBdoorL1_c::draw_sub0() {
     g_env_light.settingTevStruct( 20, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModels[0], &tevStr);
@@ -1757,7 +1672,6 @@ void daMBdoorL1_c::draw_sub0() {
     }
 }
 
-/* 806772C4-806773DC 004B04 0118+00 1/1 0/0 0/0 .text            draw_sub1__12daMBdoorL1_cFv */
 void daMBdoorL1_c::draw_sub1() {
     g_env_light.settingTevStruct( 20, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModels[0], &tevStr);
@@ -1774,7 +1688,6 @@ void daMBdoorL1_c::draw_sub1() {
     }
 }
 
-/* 806773DC-80677484 004C1C 00A8+00 1/1 0/0 0/0 .text            Delete__12daMBdoorL1_cFv */
 int daMBdoorL1_c::Delete() {
     if (heap != NULL && field_0x598->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x598);
@@ -1787,32 +1700,24 @@ int daMBdoorL1_c::Delete() {
     return 1;
 }
 
-/* 80677484-806774A4 004CC4 0020+00 1/0 0/0 0/0 .text            daMBdoorL1_Draw__FP12daMBdoorL1_c
- */
 static int daMBdoorL1_Draw(daMBdoorL1_c* i_this) {
     return i_this->draw();
 }
 
-/* 806774A4-806774C8 004CE4 0024+00 1/0 0/0 0/0 .text daMBdoorL1_Execute__FP12daMBdoorL1_c */
 static int daMBdoorL1_Execute(daMBdoorL1_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 806774C8-806774EC 004D08 0024+00 1/0 0/0 0/0 .text            daMBdoorL1_Delete__FP12daMBdoorL1_c
- */
 static int daMBdoorL1_Delete(daMBdoorL1_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 806774EC-8067750C 004D2C 0020+00 1/0 0/0 0/0 .text            daMBdoorL1_Create__FP10fopAc_ac_c
- */
 static int daMBdoorL1_Create(fopAc_ac_c* i_this) {
     return static_cast<daMBdoorL1_c*>(i_this)->create();
 }
 
-/* 80677C78-80677C98 -00001 0020+00 1/0 0/0 0/0 .data            l_daMBdoorL1_Method */
 static actor_method_class l_daMBdoorL1_Method = {
     (process_method_func)daMBdoorL1_Create,
     (process_method_func)daMBdoorL1_Delete,
@@ -1821,7 +1726,6 @@ static actor_method_class l_daMBdoorL1_Method = {
     (process_method_func)daMBdoorL1_Draw,
 };
 
-/* 80677C98-80677CC8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_L1MBOSS_DOOR */
 extern actor_process_profile_definition g_profile_L1MBOSS_DOOR = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp
index a50727b31a..58ffaabb09 100644
--- a/src/d/actor/d_a_door_push.cpp
+++ b/src/d/actor/d_a_door_push.cpp
@@ -11,8 +11,6 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80677DB8-80677DE0 000078 0028+00 1/1 0/0 0/0 .text
- * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
                        dBgW_Base::PushPullLabel param_3) {
     if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) {
@@ -23,8 +21,6 @@ static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
     }
 }
 
-/* 80677DE0-80677E08 0000A0 0028+00 1/1 0/0 0/0 .text
- * PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
                         dBgW_Base::PushPullLabel param_3) {
     if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) {
@@ -35,7 +31,6 @@ static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
     }
 }
 
-/* 80677E08-80677F38 0000C8 0130+00 1/1 0/0 0/0 .text            initBaseMtx__12daDoorPush_cFv */
 void daDoorPush_c::initBaseMtx() {
     mpModel[0]->setBaseScale(scale);
     mpModel[1]->setBaseScale(scale);
@@ -53,7 +48,6 @@ void daDoorPush_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80677F38-80678060 0001F8 0128+00 2/2 0/0 0/0 .text            setBaseMtx__12daDoorPush_cFv */
 void daDoorPush_c::setBaseMtx() {
     mDoMtx_stack_c::transS(mXyz[0]);
     mDoMtx_stack_c::YrotM(field_0x630[0]);
@@ -76,16 +70,13 @@ void daDoorPush_c::setBaseMtx() {
     }
 }
 
-/* 80678F70-80678F74 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_OsuDoor";
 
-/* 80678F74-80678F8C 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-600.0f, 0.0f, -600.0f},
     {600.0f, 1000.0f, 600.0f},
 };
 
-/* 8067809C-806781FC 00035C 0160+00 1/0 0/0 0/0 .text            Create__12daDoorPush_cFv */
 int daDoorPush_c::Create() {
     if (mpDoorBgW != NULL && dComIfG_Bgsp().Regist(mpDoorBgW, this)) {
         return 0;
@@ -112,7 +103,6 @@ int daDoorPush_c::Create() {
     return 1;
 }
 
-/* 806781FC-80678318 0004BC 011C+00 1/0 0/0 0/0 .text            CreateHeap__12daDoorPush_cFv */
 int daDoorPush_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     for (int i = 0; i < 2; i++) {
@@ -131,7 +121,6 @@ int daDoorPush_c::CreateHeap() {
     return 1;
 }
 
-/* 80678318-8067839C 0005D8 0084+00 1/1 0/0 0/0 .text            create1st__12daDoorPush_cFv */
 int daDoorPush_c::create1st() {
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -143,8 +132,6 @@ int daDoorPush_c::create1st() {
     return phase;
 }
 
-/* 8067839C-8067840C 00065C 0070+00 1/0 0/0 0/0 .text            Execute__12daDoorPush_cFPPA3_A4_f
- */
 int daDoorPush_c::Execute(Mtx** i_mtx) {
     *i_mtx = &mBgMtx;
     action();
@@ -157,14 +144,12 @@ int daDoorPush_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 8067840C-80678488 0006CC 007C+00 1/1 0/0 0/0 .text            action__12daDoorPush_cFv */
 void daDoorPush_c::action() {
     typedef void (daDoorPush_c::*actionFunc)();
     static actionFunc l_func[] = {&daDoorPush_c::modeWait};
     (this->*l_func[field_0x638])();
 }
 
-/* 80678488-806784B4 000748 002C+00 1/1 0/0 0/0 .text            init_modeWait__12daDoorPush_cFv */
 void daDoorPush_c::init_modeWait() {
     for (int i = 0; i < 2; i++) {
         field_0x62e[i] = 0;
@@ -172,7 +157,6 @@ void daDoorPush_c::init_modeWait() {
     field_0x638 = 0;
 }
 
-/* 806784B4-80678664 000774 01B0+00 1/0 0/0 0/0 .text            modeWait__12daDoorPush_cFv */
 void daDoorPush_c::modeWait() {
     enum index_e {
         INDEX_0_e,
@@ -212,8 +196,6 @@ void daDoorPush_c::modeWait() {
     }
 }
 
-/* 80678664-80678708 000924 00A4+00 1/1 0/0 0/0 .text            event_proc_call__12daDoorPush_cFv
- */
 void daDoorPush_c::event_proc_call() {
     typedef void (daDoorPush_c::*actionFunc)();
     static actionFunc l_func[] = {
@@ -224,7 +206,6 @@ void daDoorPush_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80678708-8067877C 0009C8 0074+00 1/0 0/0 0/0 .text            actionOpenWait__12daDoorPush_cFv */
 void daDoorPush_c::actionOpenWait() {
     if (mIndex != 2) {
         setAction(1);
@@ -233,8 +214,6 @@ void daDoorPush_c::actionOpenWait() {
     }
 }
 
-/* 8067877C-806787F8 000A3C 007C+00 1/0 0/0 0/0 .text            actionOrderEvent__12daDoorPush_cFv
- */
 void daDoorPush_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(2);
@@ -245,15 +224,12 @@ void daDoorPush_c::actionOrderEvent() {
     }
 }
 
-/* 806787F8-80678818 000AB8 0020+00 1/0 0/0 0/0 .text            actionEvent__12daDoorPush_cFv */
 void daDoorPush_c::actionEvent() {
     demoProc();
 }
 
-/* 80678FEC-80678FF8 -00001 000C+00 1/1 0/0 0/0 .data            action_table$3910 */
 static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"};
 
-/* 80678818-80678AEC 000AD8 02D4+00 2/2 0/0 0/0 .text            demoProc__12daDoorPush_cFv */
 int daDoorPush_c::demoProc() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -312,14 +288,12 @@ int daDoorPush_c::demoProc() {
     return 0;
 }
 
-/* 80678AEC-80678B10 000DAC 0024+00 1/1 0/0 0/0 .text            rotateInit__12daDoorPush_cFv */
 void daDoorPush_c::rotateInit() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     player->onPushPullKeep();
     field_0x649 = 0;
 }
 
-/* 80678B10-80678BC0 000DD0 00B0+00 1/1 0/0 0/0 .text            rotate__12daDoorPush_cFv */
 int daDoorPush_c::rotate() {
     field_0x649++;
     field_0x630[mIndex] = field_0x634[mIndex];
@@ -334,7 +308,6 @@ int daDoorPush_c::rotate() {
     return 0;
 }
 
-/* 80678BC0-80678C70 000E80 00B0+00 1/1 0/0 0/0 .text            setGoal__12daDoorPush_cFv */
 void daDoorPush_c::setGoal() {
     cXyz goal;
     if (mIndex == 0) {
@@ -348,7 +321,6 @@ void daDoorPush_c::setGoal() {
     dComIfGp_evmng_setGoal(&goal);
 }
 
-/* 80678C70-80678D2C 000F30 00BC+00 1/0 0/0 0/0 .text            Draw__12daDoorPush_cFv */
 int daDoorPush_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     for (int i = 0; i < 2; i++) {
@@ -360,7 +332,6 @@ int daDoorPush_c::Draw() {
     return 1;
 }
 
-/* 80678D2C-80678DAC 000FEC 0080+00 1/0 0/0 0/0 .text            Delete__12daDoorPush_cFv */
 int daDoorPush_c::Delete() {
     if (mpDoorBgW != NULL && mpDoorBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpDoorBgW);
@@ -371,36 +342,29 @@ int daDoorPush_c::Delete() {
     return 1;
 }
 
-/* 80678DAC-80678E38 00106C 008C+00 1/0 0/0 0/0 .text daDoorPush_create1st__FP12daDoorPush_c */
 static int daDoorPush_create1st(daDoorPush_c* i_this) {
     fopAcM_ct(i_this, daDoorPush_c);
     return i_this->create1st();
 }
 
-/* 80678E3C-80678E5C 0010FC 0020+00 1/0 0/0 0/0 .text daDoorPush_MoveBGDelete__FP12daDoorPush_c */
 static int daDoorPush_MoveBGDelete(daDoorPush_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80678E5C-80678E7C 00111C 0020+00 1/0 0/0 0/0 .text daDoorPush_MoveBGExecute__FP12daDoorPush_c
- */
 static int daDoorPush_MoveBGExecute(daDoorPush_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80678E7C-80678EA8 00113C 002C+00 1/0 0/0 0/0 .text daDoorPush_MoveBGDraw__FP12daDoorPush_c */
 static int daDoorPush_MoveBGDraw(daDoorPush_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80678FF8-80679018 -00001 0020+00 1/0 0/0 0/0 .data            daDoorPush_METHODS */
 static actor_method_class daDoorPush_METHODS = {
     (process_method_func)daDoorPush_create1st,     (process_method_func)daDoorPush_MoveBGDelete,
     (process_method_func)daDoorPush_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daDoorPush_MoveBGDraw,
 };
 
-/* 80679018-80679048 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PushDoor */
 extern actor_process_profile_definition g_profile_PushDoor = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp
index be9481839e..45677ae8e9 100644
--- a/src/d/actor/d_a_door_shutter.cpp
+++ b/src/d/actor/d_a_door_shutter.cpp
@@ -16,7 +16,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "printf.h"
 
-/* 80460B38-80460B70 000078 0038+00 1/1 0/0 0/0 .text            getStopBmdName__10daDoor20_cFv */
 char* daDoor20_c::getStopBmdName() {
     switch (door_param2_c::getKind(this)) {
         case 3:
@@ -26,17 +25,14 @@ char* daDoor20_c::getStopBmdName() {
     }
 }
 
-/* 80460B70-80460B94 0000B0 0024+00 1/1 0/0 0/0 .text            getStopModelData__10daDoor20_cFv */
 J3DModelData* daDoor20_c::getStopModelData() {
     return (J3DModelData*)dComIfG_getStageRes(getStopBmdName());
 }
 
-/* 80460B94-80460BA4 0000D4 0010+00 4/4 0/0 0/0 .text            getAlwaysArcName__10daDoor20_cFv */
 char* daDoor20_c::getAlwaysArcName() {
     return "static";
 }
 
-/* 80460BA4-80460C40 0000E4 009C+00 9/8 0/0 0/0 .text            getArcName__10daDoor20_cFv */
 char* daDoor20_c::getArcName() {
     switch (door_param2_c::getKind(this)) {
     default:
@@ -54,10 +50,8 @@ char* daDoor20_c::getArcName() {
     }
 }
 
-/* 80467340-80467360 000000 0020+00 1/1 0/0 0/0 .bss             bmdName$3984 */
 static char bmdName[32];
 
-/* 80460C40-80460CF0 000180 00B0+00 1/1 0/0 0/0 .text            getBmdName__10daDoor20_cFv */
 char* daDoor20_c::getBmdName() {
     switch(door_param2_c::getKind(this)) {
     case 0:
@@ -75,12 +69,10 @@ char* daDoor20_c::getBmdName() {
     return bmdName;
 }
 
-/* 80460CF0-80460D00 000230 0010+00 1/1 0/0 0/0 .text            getBtk__10daDoor20_cFv */
 char* daDoor20_c::getBtk() {
     return "door-shutter_00.btk";
 }
 
-/* 80460D00-80460D5C 000240 005C+00 1/0 0/0 0/0 .text            getDzbName__10daDoor20_cFv */
 char* daDoor20_c::getDzbName() {
     switch(door_param2_c::getKind(this)) {
     case 0:
@@ -95,22 +87,18 @@ char* daDoor20_c::getDzbName() {
     }
 }
 
-/* 80460D5C-80460D80 00029C 0024+00 1/1 0/0 0/0 .text            getModelData__10daDoor20_cFv */
 J3DModelData* daDoor20_c::getModelData() {
     return (J3DModelData*)dComIfG_getStageRes(getBmdName());
 }
 
-/* 80460D80-80460D8C 0002C0 000C+00 1/1 0/0 0/0 .text            getSize2X__10daDoor20_cFv */
 f32 daDoor20_c::getSize2X() {
     return 12100.0f;
 }
 
-/* 80460D8C-80460DAC 0002CC 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daDoor20_c*>(i_this)->CreateHeap();
 }
 
-/* 80460DAC-80461254 0002EC 04A8+00 2/1 0/0 0/0 .text            CreateHeap__10daDoor20_cFv */
 int daDoor20_c::CreateHeap() {
     int kind = door_param2_c::getKind(this);
     J3DModelData* modelData = getModelData();
@@ -195,7 +183,6 @@ int daDoor20_c::CreateHeap() {
     return 1;
 }
 
-/* 8046129C-804616EC 0007DC 0450+00 1/1 0/0 0/0 .text            setEventPrm__10daDoor20_cFv */
 void daDoor20_c::setEventPrm() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     setStop();
@@ -308,8 +295,6 @@ void daDoor20_c::setEventPrm() {
     }
 }
 
-/* 804616EC-8046178C 000C2C 00A0+00 1/1 0/0 0/0 .text            checkOpenMsgDoor__10daDoor20_cFPi
- */
 int daDoor20_c::checkOpenMsgDoor(int* param_1) {
     if (!door_param2_c::isMsgDoor(this)) {
         return 1;
@@ -325,7 +310,6 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) {
     return rv;
 }
 
-/* 8046178C-80461874 000CCC 00E8+00 1/1 0/0 0/0 .text            adjustmentAngle__10daDoor20_cFv */
 int daDoor20_c::adjustmentAngle() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz playerPos;
@@ -343,7 +327,6 @@ int daDoor20_c::adjustmentAngle() {
     return 0;
 }
 
-/* 80461874-80461A44 000DB4 01D0+00 1/1 0/0 0/0 .text            adjustmentProc__10daDoor20_cFv */
 int daDoor20_c::adjustmentProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz local_2c;
@@ -379,13 +362,11 @@ int daDoor20_c::adjustmentProc() {
     return 0;
 }
 
-/* 80461A44-80461A60 000F84 001C+00 1/1 0/0 0/0 .text            setAngle__10daDoor20_cFv */
 void daDoor20_c::setAngle() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     player->changeDemoMoveAngle(shape_angle.y + 0x7fff);
 }
 
-/* 8046684C-80466858 00002C 000A+02 0/1 0/0 0/0 .rodata          l_eff_id_lv3$4376 */
 static u16 const l_eff_id_lv3[5] = {
     0x8762,
     0x8763,
@@ -394,7 +375,6 @@ static u16 const l_eff_id_lv3[5] = {
     0x8766,
 };
 
-/* 80466858-80466864 000038 000A+02 0/1 0/0 0/0 .rodata          l_eff_id_lv4$4377 */
 static u16 const l_eff_id_lv4[5] = {
     0x8AEB,
     0x8AEC,
@@ -403,7 +383,6 @@ static u16 const l_eff_id_lv4[5] = {
     0x8AEF,
 };
 
-/* 80461A60-80461D24 000FA0 02C4+00 1/1 0/0 0/0 .text            openInit_0__10daDoor20_cFv */
 void daDoor20_c::openInit_0() {
     J3DAnmTransform* anm;
     if (daPy_py_c::checkNowWolf()) {
@@ -443,7 +422,6 @@ void daDoor20_c::openInit_0() {
     }
 }
 
-/* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text            openInit_1__10daDoor20_cFv */
 void daDoor20_c::openInit_1() {
     J3DAnmTransform* anm;
     if (daPy_py_c::checkNowWolf()) {
@@ -468,7 +446,6 @@ void daDoor20_c::openInit_1() {
     }
 }
 
-/* 80461EC4-80461F60 001404 009C+00 2/1 0/0 0/0 .text            openInit__10daDoor20_cFi */
 int daDoor20_c::openInit(int param_1) {
     openInitCom(1);
     dMapInfo_c::setNextRoomNoForMapPat0(field_0x67f);
@@ -491,7 +468,6 @@ int daDoor20_c::openInit(int param_1) {
     return 1;
 }
 
-/* 80461F60-804622A8 0014A0 0348+00 2/1 0/0 0/0 .text            openProc__10daDoor20_cFi */
 int daDoor20_c::openProc(int param_1) {
     u32 sfx;
     f32 frame = field_0x584.getFrame();
@@ -563,16 +539,13 @@ int daDoor20_c::openProc(int param_1) {
     return rv;
 }
 
-/* 804622A8-804622AC 0017E8 0004+00 1/1 0/0 0/0 .text            openEnd_0__10daDoor20_cFv */
 void daDoor20_c::openEnd_0() {
 }
 
-/* 804622AC-80462328 0017EC 007C+00 1/1 0/0 0/0 .text            openEnd_1__10daDoor20_cFv */
 void daDoor20_c::openEnd_1() {
     mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_OPEN_STOP, &field_0x5e0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80462328-80462398 001868 0070+00 2/1 0/0 0/0 .text            openEnd__10daDoor20_cFi */
 int daDoor20_c::openEnd(int param_1) {
     offFlag(1);
     switch (door_param2_c::getKind(this)) {
@@ -592,7 +565,6 @@ int daDoor20_c::openEnd(int param_1) {
     return 1;
 }
 
-/* 80462398-8046266C 0018D8 02D4+00 1/1 0/0 0/0 .text            closeInit_0__10daDoor20_cFv */
 void daDoor20_c::closeInit_0() {
     J3DAnmTransform* anm;
     if (door_param2_c::getKind(this) == 10) {
@@ -625,7 +597,6 @@ void daDoor20_c::closeInit_0() {
     }
 }
 
-/* 8046266C-80462738 001BAC 00CC+00 1/1 0/0 0/0 .text            closeInit_1__10daDoor20_cFv */
 void daDoor20_c::closeInit_1() {
     J3DAnmTransform* anm =
         (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseC.bck");
@@ -636,7 +607,6 @@ void daDoor20_c::closeInit_1() {
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80462738-804627C4 001C78 008C+00 1/1 0/0 0/0 .text            closeInit__10daDoor20_cFi */
 int daDoor20_c::closeInit(int param_1) {
     onFlag(2);
     int rt = dComIfG_Bgsp().Regist(field_0x5c4, this);
@@ -655,21 +625,17 @@ int daDoor20_c::closeInit(int param_1) {
     return 1;
 }
 
-/* 804627C4-804627E8 001D04 0024+00 1/1 0/0 0/0 .text            closeProc__10daDoor20_cFi */
 int daDoor20_c::closeProc(int param_0) {
     return field_0x584.play();
 }
 
-/* 804627E8-804627EC 001D28 0004+00 1/1 0/0 0/0 .text            closeEnd_0__10daDoor20_cFv */
 void daDoor20_c::closeEnd_0() {
 }
 
-/* 804627EC-80462868 001D2C 007C+00 1/1 0/0 0/0 .text            closeEnd_1__10daDoor20_cFv */
 void daDoor20_c::closeEnd_1() {
     mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_CLOSE_STOP, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80462868-80462928 001DA8 00C0+00 2/1 0/0 0/0 .text            closeEnd__10daDoor20_cFi */
 int daDoor20_c::closeEnd(int param_0) {
     offFlag(2);
     closeEndCom();
@@ -693,7 +659,6 @@ int daDoor20_c::closeEnd(int param_0) {
     return 1;
 }
 
-/* 80462928-80462A1C 001E68 00F4+00 1/1 0/0 0/0 .text            openInit2__10daDoor20_cFv */
 void daDoor20_c::openInit2() {
     field_0x5f1 = field_0x68c;
     field_0x584.setFrame(0.0f);
@@ -714,14 +679,12 @@ void daDoor20_c::openInit2() {
     field_0x5e0.y += 100.0f;
 }
 
-/* 80462A1C-80462A5C 001F5C 0040+00 1/1 0/0 0/0 .text            closeEnd2__10daDoor20_cFv */
 void daDoor20_c::closeEnd2() {
     offFlag(1);
     closeEndCom();
     deleteKey();
 }
 
-/* 80462A5C-80462B58 001F9C 00FC+00 1/1 0/0 0/0 .text            calcMtx_2__10daDoor20_cFv */
 void daDoor20_c::calcMtx_2() {
     cXyz cStack_1c(220.0f, 0.0f, 0.0f);
     cXyz cStack_28(-220.0f, 0.0f, 0.0f);
@@ -738,7 +701,6 @@ void daDoor20_c::calcMtx_2() {
     mModel2->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80462B58-80462C2C 002098 00D4+00 4/3 0/0 0/0 .text            calcMtx__10daDoor20_cFv */
 void daDoor20_c::calcMtx() {
     switch (door_param2_c::getKind(this)) {
     case 9:
@@ -763,7 +725,6 @@ void daDoor20_c::calcMtx() {
     }
 }
 
-/* 80462C2C-80462EB4 00216C 0288+00 2/1 0/0 0/0 .text            CreateInit__10daDoor20_cFv */
 int daDoor20_c::CreateInit() {
     shape_angle.z = 0;
     shape_angle.x = 0;
@@ -826,7 +787,6 @@ int daDoor20_c::CreateInit() {
     return 1;
 }
 
-/* 80462EB4-80462F2C 0023F4 0078+00 1/1 0/0 0/0 .text            setKey__10daDoor20_cFv */
 void daDoor20_c::setKey() {
     int swBit = door_param2_c::getSwbit(this);
     if (chkMakeKey() == 1 && !dComIfGs_isSwitch(swBit, 0xffffffff)) {
@@ -836,7 +796,6 @@ void daDoor20_c::setKey() {
     }
 }
 
-/* 80462F2C-80462FE0 00246C 00B4+00 1/1 0/0 0/0 .text            create__10daDoor20_cFv */
 int daDoor20_c::create() {
     int rv = dComIfG_resLoad(&mPhase1, getAlwaysArcName());
     if (rv != cPhs_COMPLEATE_e) {
@@ -858,7 +817,6 @@ int daDoor20_c::create() {
     return rv;
 }
 
-/* 80462FE0-80463E30 002520 0E50+00 5/3 0/0 0/0 .text            demoProc__10daDoor20_cFv */
 int daDoor20_c::demoProc() {
     field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0);
     int demoAction = getDemoAction();
@@ -1168,7 +1126,6 @@ int daDoor20_c::demoProc() {
     return 0;
 }
 
-/* 80463E30-80463FBC 003370 018C+00 1/1 0/0 0/0 .text            orderStopEvent__10daDoor20_cFv */
 int daDoor20_c::orderStopEvent() {
     if (field_0x68c == 0) {
         if ((door_param2_c::getFrontOption(this) == 3 ||
@@ -1193,7 +1150,6 @@ int daDoor20_c::orderStopEvent() {
     return 1;
 }
 
-/* 80463FBC-80464118 0034FC 015C+00 2/2 0/0 0/0 .text            actionWait__10daDoor20_cFv */
 int daDoor20_c::actionWait() {
     if (eventInfo.checkCommandDoor()) {
         initOpenDemo(1);
@@ -1232,7 +1188,6 @@ int daDoor20_c::actionWait() {
     return 1;
 }
 
-/* 80464118-8046416C 003658 0054+00 1/1 0/0 0/0 .text            actionStopClose__10daDoor20_cFv */
 int daDoor20_c::actionStopClose() {
     if (mDoorStop.closeProc(this)) {
         setAction(ACTION_WAIT);
@@ -1241,7 +1196,6 @@ int daDoor20_c::actionStopClose() {
     return 1;
 }
 
-/* 8046416C-804641EC 0036AC 0080+00 1/1 0/0 0/0 .text             */
 int daDoor20_c::actionDemo() {
     if (dComIfGp_evmng_endCheck(field_0x692[field_0x6cb])) {
         setAction(ACTION_WAIT);
@@ -1253,7 +1207,6 @@ int daDoor20_c::actionDemo() {
     return 1;
 }
 
-/* 804641EC-80464240 00372C 0054+00 1/1 0/0 0/0 .text            actionInit__10daDoor20_cFv */
 int daDoor20_c::actionInit() {
     setDoorAngleSpec();
     setStop();
@@ -1263,7 +1216,6 @@ int daDoor20_c::actionInit() {
     return 1;
 }
 
-/* 80464240-804643B0 003780 0170+00 1/1 0/0 0/0 .text            execute__10daDoor20_cFv */
 int daDoor20_c::execute() {
     field_0x678 = -1;
     switch(checkExecute()) {
@@ -1305,7 +1257,6 @@ int daDoor20_c::execute() {
     return 1;
 }
 
-/* 804643B0-80464638 0038F0 0288+00 1/1 0/0 0/0 .text            draw__10daDoor20_cFv */
 int daDoor20_c::draw() {
     if (!drawCheck(0)) {
         if (field_0x5c9 == false) {
@@ -1358,7 +1309,6 @@ int daDoor20_c::draw() {
     return 1;
 }
 
-/* 80464638-804647BC 003B78 0184+00 3/3 0/0 0/0 .text            setDoorAngleSpec__10daDoor20_cFv */
 void daDoor20_c::setDoorAngleSpec() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz cStack_1c;
@@ -1393,7 +1343,6 @@ void daDoor20_c::setDoorAngleSpec() {
     }
 }
 
-/* 804647BC-80464858 003CFC 009C+00 1/1 0/0 0/0 .text            _delete__10daDoor20_cFv */
 int daDoor20_c::_delete() {
     if (heap != NULL &&
         field_0x5c4->ChkUsed())
@@ -1408,7 +1357,6 @@ int daDoor20_c::_delete() {
     return 1;
 }
 
-/* 80464858-80464AE4 003D98 028C+00 2/2 0/0 0/0 .text            createKey__10daDoor20_cFv */
 int daDoor20_c::createKey() {
     if (chkMakeKey() == 1 && field_0x5f0 && field_0x5ec == -1) {
         cXyz prevPos(current.pos);
@@ -1459,7 +1407,6 @@ int daDoor20_c::createKey() {
     return 1;
 }
 
-/* 80464AE4-80464B3C 004024 0058+00 4/4 0/0 0/0 .text            deleteKey__10daDoor20_cFv */
 int daDoor20_c::deleteKey() {
     if (field_0x5ec != -1 && !fpcM_IsCreating(field_0x5ec)) {
         fopAcM_delete(field_0x5ec);
@@ -1468,7 +1415,6 @@ int daDoor20_c::deleteKey() {
     return 1;
 }
 
-/* 80464B3C-80464BD8 00407C 009C+00 2/2 0/0 0/0 .text            adjoinPlayer__10daDoor20_cFv */
 int daDoor20_c::adjoinPlayer() {
     int fRoomNo = door_param2_c::getFRoomNo(this);
     int bRoomNo = door_param2_c::getBRoomNo(this);
@@ -1483,7 +1429,6 @@ int daDoor20_c::adjoinPlayer() {
     }
 }
 
-/* 80464BD8-80464C68 004118 0090+00 1/1 0/0 0/0 .text            frontCheckOld__10daDoor20_cFv */
 int daDoor20_c::frontCheckOld() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cSGlobe acStack_30(player->current.pos - current.pos);
@@ -1497,7 +1442,6 @@ int daDoor20_c::frontCheckOld() {
     }
 }
 
-/* 80464C68-80464CEC 0041A8 0084+00 1/1 0/0 0/0 .text            frontCheck__10daDoor20_cFv */
 int daDoor20_c::frontCheck() {
     int stayno = dComIfGp_roomControl_getStayNo();
     int fRoomNo = door_param2_c::getFRoomNo(this);
@@ -1513,7 +1457,6 @@ int daDoor20_c::frontCheck() {
     }
 }
 
-/* 80464CEC-80464E18 00422C 012C+00 1/1 0/0 0/0 .text            drawCheck__10daDoor20_cFi */
 int daDoor20_c::drawCheck(int param_1) {
     if (!adjoinPlayer() && !eventInfo.checkCommandDemoAccrpt() && !eventInfo.checkCommandDoor())
     {
@@ -1544,7 +1487,6 @@ int daDoor20_c::drawCheck(int param_1) {
     }
 }
 
-/* 80464E18-80464EC4 004358 00AC+00 1/1 0/0 0/0 .text            checkExecute__10daDoor20_cFv */
 int daDoor20_c::checkExecute() {
     field_0x68c = frontCheck();
     if (fopAcM_CheckStatus(this, 0x1000)) {
@@ -1563,7 +1505,6 @@ int daDoor20_c::checkExecute() {
     }
 }
 
-/* 80464EC4-80464F64 004404 00A0+00 1/1 0/0 0/0 .text            startDemoProc__10daDoor20_cFv */
 void daDoor20_c::startDemoProc() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     field_0x6cc = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", 0, 0);
@@ -1602,7 +1543,6 @@ static char* table[19] = {
     NULL,
 };
 
-/* 80467170-80467180 -00001 0010+00 0/1 0/0 0/0 .data            tate_table$5815 */
 static char* tate_table[4] = {
     "DEFAULT_SHUTTER_DOOR_10",
     "DEFAULT_SHUTTER_DOOR_10",
@@ -1610,7 +1550,6 @@ static char* tate_table[4] = {
     "DEFAULT_SHUTTER_DOOR_F_STOP",
 };
 
-/* 80467180-80467190 -00001 0010+00 0/1 0/0 0/0 .data            tate_w_table$5816 */
 static char* tate_w_table[4] = {
     "WOLF_SHUTTER_DOOR_10",
     "WOLF_SHUTTER_DOOR_10",
@@ -1618,7 +1557,6 @@ static char* tate_w_table[4] = {
     "WOLF_SHUTTER_DOOR_F_STOP",
 };
 
-/* 80467190-804671A0 -00001 0010+00 0/1 0/0 0/0 .data            yoko_table$5817 */
 static char* yoko_table[4] = {
     "DEFAULT_SHUTTER_DOOR_14",
     "DEFAULT_SHUTTER_DOOR_14",
@@ -1626,7 +1564,6 @@ static char* yoko_table[4] = {
     "DEFAULT_SHUTTER_DOOR_F_STOP_14",
 };
 
-/* 804671A0-804671B0 -00001 0010+00 0/1 0/0 0/0 .data            yoko_w_table$5818 */
 static char* yoko_w_table[4] = {
     "WOLF_SHUTTER_DOOR_14",
     "WOLF_SHUTTER_DOOR_14",
@@ -1634,7 +1571,6 @@ static char* yoko_w_table[4] = {
     "WOLF_SHUTTER_DOOR_F_STOP_14",
 };
 
-/* 804671B0-804671C0 -00001 0010+00 0/1 0/0 0/0 .data            lv8_table$5819 */
 static char* lv8_table[4] = {
     "DEFAULT_SHUTTER_DOOR_18",
     "DEFAULT_SHUTTER_DOOR_18",
@@ -1642,7 +1578,6 @@ static char* lv8_table[4] = {
     "DEFAULT_SHUTTER_DOOR_F_STOP_18",
 };
 
-/* 804671C0-804671D0 -00001 0010+00 0/1 0/0 0/0 .data            lv8_w_table$5820 */
 static char* lv8_w_table[4] = {
     "WOLF_SHUTTER_DOOR_18",
     "WOLF_SHUTTER_DOOR_18",
@@ -1650,7 +1585,6 @@ static char* lv8_w_table[4] = {
     "WOLF_SHUTTER_DOOR_F_STOP_18",
 };
 
-/* 804671D0-804671EC -00001 001C+00 0/1 0/0 0/0 .data            knob_table$5821 */
 static char* knob_table[7] = {
     "DEFAULT_KNOB_DOOR_F",
     "DEFAULT_KNOB_DOOR_B",
@@ -1661,7 +1595,6 @@ static char* knob_table[7] = {
     "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F",
 };
 
-/* 804671EC-804671FC -00001 0010+00 0/1 0/0 0/0 .data            lv7_table$5822 */
 static char* lv7_table[4] = {
     "DEFAULT_SHUTTER_DOOR_20",
     "DEFAULT_SHUTTER_DOOR_20",
@@ -1669,7 +1602,6 @@ static char* lv7_table[4] = {
     "DEFAULT_SHUTTER_DOOR_F_STOP_20",
 };
 
-/* 804671FC-8046720C -00001 0010+00 0/1 0/0 0/0 .data            lv7_w_table$5823 */
 static char* lv7_w_table[4] = {
     "WOLF_SHUTTER_DOOR_20",
     "WOLF_SHUTTER_DOOR_20",
@@ -1677,7 +1609,6 @@ static char* lv7_w_table[4] = {
     "WOLF_SHUTTER_DOOR_F_STOP_20",
 };
 
-/* 8046720C-8046721C -00001 0010+00 0/1 0/0 0/0 .data            lv9_table$5824 */
 static char* lv9_table[4] = {
     "DEFAULT_SHUTTER_DOOR_22",
     "DEFAULT_SHUTTER_DOOR_22",
@@ -1685,7 +1616,6 @@ static char* lv9_table[4] = {
     "DEFAULT_SHUTTER_DOOR_F_STOP_22",
 };
 
-/* 8046721C-8046722C -00001 0010+00 0/1 0/0 0/0 .data            lv9_w_table$5825 */
 static char* lv9_w_table[4] = {
     "WOLF_SHUTTER_DOOR_22",
     "WOLF_SHUTTER_DOOR_22",
@@ -1694,7 +1624,6 @@ static char* lv9_w_table[4] = {
 };
 
 
-/* 80464F64-804653B0 0044A4 044C+00 2/2 0/0 0/0 .text            makeEventId__10daDoor20_cFv */
 void daDoor20_c::makeEventId() {
     for (int i = 0; i < 19; i++) {
         field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xff);
@@ -1788,13 +1717,11 @@ void daDoor20_c::makeEventId() {
     }
 }
 
-/* 804653B0-80465400 0048F0 0050+00 1/1 0/0 0/0 .text            initProc__10daDoor20_cFv */
 void daDoor20_c::initProc() {
     field_0x680.set(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y));
     makeEventId();
 }
 
-/* 80465400-80465490 004940 0090+00 1/1 0/0 0/0 .text            initOpenDemo__10daDoor20_cFi */
 void daDoor20_c::initOpenDemo(int param_1) {
     shape_angle.y = current.angle.y;
     if (field_0x68c == 1) {
@@ -1806,7 +1733,6 @@ void daDoor20_c::initOpenDemo(int param_1) {
     }
 }
 
-/* 80465490-80465620 0049D0 0190+00 1/1 0/0 0/0 .text            checkArea__10daDoor20_cFfff */
 int daDoor20_c::checkArea(f32 param_1, f32 param_2, f32 param_3) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz acStack_68;
@@ -1837,7 +1763,6 @@ int daDoor20_c::checkArea(f32 param_1, f32 param_2, f32 param_3) {
     }
 }
 
-/* 80465620-804656F0 004B60 00D0+00 2/2 0/0 0/0 .text            openInitCom__10daDoor20_cFi */
 void daDoor20_c::openInitCom(int param_1) {
     dComIfGp_getPlayer(0);
     u8 fRoomNo = door_param2_c::getFRoomNo(this);
@@ -1857,7 +1782,6 @@ void daDoor20_c::openInitCom(int param_1) {
     Z2GetAudioMgr()->setSceneExist(false);
 }
 
-/* 804656F0-8046581C 004C30 012C+00 2/2 0/0 0/0 .text            closeEndCom__10daDoor20_cFv */
 void daDoor20_c::closeEndCom() {
     if (field_0x67e != field_0x67f && field_0x67e != 63 &&
         field_0x67f != 63)
@@ -1880,8 +1804,6 @@ void daDoor20_c::closeEndCom() {
     Z2GetAudioMgr()->setSceneExist(true);
 }
 
-/* 8046581C-80465918 004D5C 00FC+00 1/1 0/0 0/0 .text            getRestartPos__10daDoor20_cFP4cXyz
- */
 void daDoor20_c::getRestartPos(cXyz* param_1) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz acStack_78 = player->current.pos - current.pos;
@@ -1905,7 +1827,6 @@ void daDoor20_c::getRestartPos(cXyz* param_1) {
     param_1->z = current.pos.z - fVar1 * field_0x680.z;
 }
 
-/* 8046722C-804672A0 -00001 0074+00 1/1 0/0 0/0 .data            action_table$6155 */
 static char* action_table[29] = {
     "WAIT",
     "STOP_OPEN",
@@ -1938,12 +1859,10 @@ static char* action_table[29] = {
     "LIGHT_ANM2",
 };
 
-/* 80465918-80465960 004E58 0048+00 1/0 0/0 0/0 .text            getDemoAction__10daDoor20_cFv */
 int daDoor20_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(field_0x6cc, action_table, 29, 0, 0);
 }
 
-/* 80465960-80465AC0 004EA0 0160+00 1/1 0/0 0/0 .text            setGoal__10daDoor20_cFv */
 void daDoor20_c::setGoal() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz local_1c = player->current.pos - current.pos;
@@ -1970,7 +1889,6 @@ void daDoor20_c::setGoal() {
     dComIfGp_evmng_setGoal(&local_28);
 }
 
-/* 80465AC0-80465B34 005000 0074+00 2/2 0/0 0/0 .text            chkMakeStop__10daDoor20_cFv */
 int daDoor20_c::chkMakeStop() {
     u8 frontOption = door_param2_c::getFrontOption(this);
     u8 backOption = door_param2_c::getBackOption(this);
@@ -1981,7 +1899,6 @@ int daDoor20_c::chkMakeStop() {
     }
 }
 
-/* 80465B34-80465C04 005074 00D0+00 2/2 0/0 0/0 .text            chkStopF__10daDoor20_cFv */
 int daDoor20_c::chkStopF() {
     int fRoomNo = door_param2_c::getFRoomNo(this);
     u8 frontOption = door_param2_c::getFrontOption(this);
@@ -2000,7 +1917,6 @@ int daDoor20_c::chkStopF() {
     return 0;
 }
 
-/* 80465C04-80465CC0 005144 00BC+00 2/2 0/0 0/0 .text            chkStopB__10daDoor20_cFv */
 int daDoor20_c::chkStopB() {
     u8 swBit = door_param2_c::getSwbit2(this);
     int bRoomNo = door_param2_c::getBRoomNo(this);
@@ -2017,7 +1933,6 @@ int daDoor20_c::chkStopB() {
     return dComIfGs_isSwitch(swBit, bRoomNo) == 0;
 }
 
-/* 80465CC0-80465DA8 005200 00E8+00 1/1 0/0 0/0 .text            setStopDemo__10daDoor20_cFv */
 void daDoor20_c::setStopDemo() {
     u8 frontOption = door_param2_c::getFrontOption(this);
     u8 backOption = door_param2_c::getBackOption(this);
@@ -2041,7 +1956,6 @@ void daDoor20_c::setStopDemo() {
     }
 }
 
-/* 80465DA8-80465E8C 0052E8 00E4+00 1/1 0/0 0/0 .text            chkStopClose__10daDoor20_cFv */
 int daDoor20_c::chkStopClose() {
     if (mDoorStop.field_0x0 == 0) {
         return 0;
@@ -2073,7 +1987,6 @@ int daDoor20_c::chkStopClose() {
     }
 }
 
-/* 80465E8C-80465F20 0053CC 0094+00 3/3 0/0 0/0 .text            setStop__10daDoor20_cFv */
 void daDoor20_c::setStop() {
     if (chkMakeStop() && mDoorStop.field_0x0 != 0) {
         mDoorStop.field_0x9 = field_0x68c;
@@ -2088,7 +2001,6 @@ void daDoor20_c::setStop() {
     }
 }
 
-/* 80465F20-8046609C 005460 017C+00 1/1 0/0 0/0 .text            chkStopOpen__10daDoor20_cFv */
 int daDoor20_c::chkStopOpen() {
     u8 frontOption = door_param2_c::getFrontOption(this);
     u8 backOption = door_param2_c::getBackOption(this);
@@ -2123,7 +2035,6 @@ int daDoor20_c::chkStopOpen() {
     return 0;
 }
 
-/* 8046609C-804660F4 0055DC 0058+00 3/3 0/0 0/0 .text            chkMakeKey__10daDoor20_cFv */
 int daDoor20_c::chkMakeKey() {
     if (door_param2_c::getFrontOption(this) == 2 || door_param2_c::getBackOption(this) == 2) {
         return 1;
@@ -2132,7 +2043,6 @@ int daDoor20_c::chkMakeKey() {
     }
 }
 
-/* 804660F4-804661B0 005634 00BC+00 5/5 0/0 0/0 .text calcMtx__12dDoor_stop_cFP10daDoor20_c */
 void dDoor_stop_c::calcMtx(daDoor20_c* i_this) {
     if (field_0x8 == 0 || field_0x0 == NULL) {
         return;
@@ -2146,7 +2056,6 @@ void dDoor_stop_c::calcMtx(daDoor20_c* i_this) {
     field_0x0->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 804661B0-804662C0 0056F0 0110+00 2/2 0/0 0/0 .text closeInit__12dDoor_stop_cFP10daDoor20_c */
 void dDoor_stop_c::closeInit(daDoor20_c* i_this) {
     field_0x4 = 300.0f;
     i_this->speedF = 0;
@@ -2158,7 +2067,6 @@ void dDoor_stop_c::closeInit(daDoor20_c* i_this) {
     }
 }
 
-/* 804662C0-8046634C 005800 008C+00 2/2 0/0 0/0 .text closeProc__12dDoor_stop_cFP10daDoor20_c */
 int dDoor_stop_c::closeProc(daDoor20_c* i_this) {
     if (field_0xb == 0) {
         return 1;
@@ -2171,7 +2079,6 @@ int dDoor_stop_c::closeProc(daDoor20_c* i_this) {
     return 0;
 }
 
-/* 8046634C-80466458 00588C 010C+00 1/1 0/0 0/0 .text openInit__12dDoor_stop_cFP10daDoor20_c */
 void dDoor_stop_c::openInit(daDoor20_c* i_this) {
     field_0x4 = 0.0f;
     i_this->speedF = 0;
@@ -2183,7 +2090,6 @@ void dDoor_stop_c::openInit(daDoor20_c* i_this) {
     }
 }
 
-/* 80466458-804664E8 005998 0090+00 1/1 0/0 0/0 .text openProc__12dDoor_stop_cFP10daDoor20_c */
 int dDoor_stop_c::openProc(daDoor20_c* i_this) {
     if (field_0xb == 0) {
         return 1;
@@ -2198,7 +2104,6 @@ int dDoor_stop_c::openProc(daDoor20_c* i_this) {
     return 0;
 }
 
-/* 804664E8-80466538 005A28 0050+00 1/1 0/0 0/0 .text create__12dDoor_stop_cFP10daDoor20_c */
 int dDoor_stop_c::create(daDoor20_c* i_this) {
     J3DModelData* stopModelData = i_this->getStopModelData();
     JUT_ASSERT(3923, stopModelData != NULL);
@@ -2206,8 +2111,6 @@ int dDoor_stop_c::create(daDoor20_c* i_this) {
     return field_0x0 != NULL ? 1 : 0;
 }
 
-/* 80466538-804665B0 005A78 0078+00 1/1 0/0 0/0 .text            draw__12dDoor_stop_cFP10daDoor20_c
- */
 void dDoor_stop_c::draw(daDoor20_c* i_this) {
     if (field_0x0 != NULL) {
         g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr);
@@ -2216,37 +2119,31 @@ void dDoor_stop_c::draw(daDoor20_c* i_this) {
     }
 }
 
-/* 804665B0-804665D0 005AF0 0020+00 1/0 0/0 0/0 .text            daDoor20_Draw__FP10daDoor20_c */
 static int daDoor20_Draw(daDoor20_c* i_this) {
     return i_this->draw();
 }
 
-/* 804665D0-804665F4 005B10 0024+00 1/0 0/0 0/0 .text            daDoor20_Execute__FP10daDoor20_c */
 static int daDoor20_Execute(daDoor20_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 804665F4-80466618 005B34 0024+00 1/0 0/0 0/0 .text            daDoor20_Delete__FP10daDoor20_c */
 static int daDoor20_Delete(daDoor20_c* i_this) {
     i_this->_delete();
     return 1;
 }
 
-/* 80466618-8046670C 005B58 00F4+00 1/0 0/0 0/0 .text            daDoor20_Create__FP10fopAc_ac_c */
 static int daDoor20_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, daDoor20_c);
     return static_cast<daDoor20_c*>(i_this)->create();
 }
 
-/* 804672A0-804672C0 -00001 0020+00 1/0 0/0 0/0 .data            l_daDoor20_Method */
 static actor_method_class l_daDoor20_Method = {
     (process_method_func)daDoor20_Create,  (process_method_func)daDoor20_Delete,
     (process_method_func)daDoor20_Execute, (process_method_func)NULL,
     (process_method_func)daDoor20_Draw,
 };
 
-/* 804672C0-804672F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_DOOR20 */
 extern actor_process_profile_definition g_profile_DOOR20 = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp
index c5ea74bc1f..ea3c0f5319 100644
--- a/src/d/actor/d_a_dshutter.cpp
+++ b/src/d/actor/d_a_dshutter.cpp
@@ -9,24 +9,20 @@
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80467F7C-80467F88 -00001 000C+00 2/2 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {
     "K_tetd",
     "S_bsaku00",
     "S_lv7saku",
 };
 
-/* 80467498-8046751C 000078 0084+00 1/1 0/0 0/0 .text            __dt__7daDsh_cFv */
 daDsh_c::~daDsh_c() {}
 
-/* 80467F04-80467F10 000000 000C+00 2/2 0/0 0/0 .rodata          l_bmd */
 static int const l_bmd[] = {
     4,
     4,
     4,
 };
 
-/* 8046751C-8046759C 0000FC 0080+00 1/0 0/0 0/0 .text            CreateHeap__7daDsh_cFv */
 int daDsh_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
 
@@ -38,7 +34,6 @@ int daDsh_c::CreateHeap() {
     return 1;
 }
 
-/* 8046759C-80467640 00017C 00A4+00 1/0 0/0 0/0 .text            Draw__7daDsh_cFv */
 int daDsh_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -49,7 +44,6 @@ int daDsh_c::Draw() {
     return 1;
 }
 
-/* 80467640-80467694 000220 0054+00 1/0 0/0 0/0 .text            Execute__7daDsh_cFPPA3_A4_f */
 int daDsh_c::Execute(Mtx** param_0) {
     callExecute();
     setMtx();
@@ -58,7 +52,6 @@ int daDsh_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80467694-80467708 000274 0074+00 2/2 0/0 0/0 .text            setMtx__7daDsh_cFv */
 void daDsh_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -67,13 +60,11 @@ void daDsh_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80467708-8046772C 0002E8 0024+00 5/5 0/0 0/0 .text setAction__7daDsh_cFPQ27daDsh_c8action_c */
 void daDsh_c::setAction(daDsh_c::action_c* i_action) {
     mpAction = i_action;
     callInit();
 }
 
-/* 8046772C-8046777C 00030C 0050+00 1/1 0/0 0/0 .text            callInit__7daDsh_cFv */
 int daDsh_c::callInit() {
     if (mpAction->getInit() == NULL) {
         return 1;
@@ -82,7 +73,6 @@ int daDsh_c::callInit() {
     return (this->*mpAction->getInit())();
 }
 
-/* 8046777C-804677D4 00035C 0058+00 1/1 0/0 0/0 .text            callExecute__7daDsh_cFv */
 int daDsh_c::callExecute() {
     if (mpAction->getExecute() == NULL) {
         return 1;
@@ -91,19 +81,15 @@ int daDsh_c::callExecute() {
     return (this->*mpAction->getExecute())();
 }
 
-/* 804677D4-804677E4 0003B4 0010+00 1/0 0/0 0/0 .text            initOpenWait__7daDsh_cFv */
 int daDsh_c::initOpenWait() {
     current.pos.y = home.pos.y;
     return 1;
 }
 
-/* 804680B0-804680C8 000040 0018+00 2/3 0/0 0/0 .bss             l_openWaitAction */
 static daDsh_c::action_c l_openWaitAction(&daDsh_c::initOpenWait, &daDsh_c::executeOpenWait);
 
-/* 804680C8-804680E0 000058 0018+00 1/2 0/0 0/0 .bss             l_openAction */
 static daDsh_c::action_c l_openAction(&daDsh_c::initOpen, &daDsh_c::executeOpen);
 
-/* 804677E4-80467840 0003C4 005C+00 1/0 0/0 0/0 .text            executeOpenWait__7daDsh_cFv */
 int daDsh_c::executeOpenWait() {
     if (fopAcM_isSwitch(this, mSw)) {
         setAction(&l_openAction);
@@ -112,13 +98,10 @@ int daDsh_c::executeOpenWait() {
     return 1;
 }
 
-/* 80467F10-80467F1C 00000C 000C+00 1/1 0/0 0/0 .rodata          l_dzb */
 static int const l_dzb[] = {7, 7, 7};
 
-/* 80467F1C-80467F28 000018 000C+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[] = {0xC10, 0xC10, 0x3D60};
 
-/* 80467840-80467988 000420 0148+00 1/0 0/0 0/0 .text            initOpen__7daDsh_cFv */
 int daDsh_c::initOpen() {
     mTiltTime = getOpenTiltTime();
     speed.y = 0.0f;
@@ -137,10 +120,8 @@ int daDsh_c::initOpen() {
     return 1;
 }
 
-/* 804680E0-804680F8 000070 0018+00 2/3 0/0 0/0 .bss             l_closeWaitAction */
 static daDsh_c::action_c l_closeWaitAction(&daDsh_c::initCloseWait, &daDsh_c::executeCloseWait);
 
-/* 80467988-80467A64 000568 00DC+00 1/0 0/0 0/0 .text            executeOpen__7daDsh_cFv */
 int daDsh_c::executeOpen() {
     if (mTiltTime != 0) {
         current.pos.y = home.pos.y + cM_rndFX(2.0f);
@@ -164,16 +145,13 @@ int daDsh_c::executeOpen() {
     return 1;
 }
 
-/* 80467A64-80467A80 000644 001C+00 1/0 0/0 0/0 .text            initCloseWait__7daDsh_cFv */
 int daDsh_c::initCloseWait() {
     current.pos.y = home.pos.y - OPEN_SIZE;
     return 1;
 }
 
-/* 804680F8-80468110 000088 0018+00 1/2 0/0 0/0 .bss             l_closeAction */
 static daDsh_c::action_c l_closeAction(&daDsh_c::initClose, &daDsh_c::executeClose);
 
-/* 80467A80-80467ADC 000660 005C+00 1/0 0/0 0/0 .text            executeCloseWait__7daDsh_cFv */
 int daDsh_c::executeCloseWait() {
     if (!fopAcM_isSwitch(this, mSw)) {
         setAction(&l_closeAction);
@@ -182,7 +160,6 @@ int daDsh_c::executeCloseWait() {
     return 1;
 }
 
-/* 80467ADC-80467B04 0006BC 0028+00 1/0 0/0 0/0 .text            initClose__7daDsh_cFv */
 int daDsh_c::initClose() {
     mTiltTime = getCloseTiltTime();
     speed.y = 0.0f;
@@ -191,7 +168,6 @@ int daDsh_c::initClose() {
     return 1;
 }
 
-/* 80467B04-80467BE0 0006E4 00DC+00 1/0 0/0 0/0 .text            executeClose__7daDsh_cFv */
 int daDsh_c::executeClose() {
     if (mTiltTime != 0) {
         current.pos.y = (home.pos.y - OPEN_SIZE) + cM_rndFX(2.0f);
@@ -214,22 +190,18 @@ int daDsh_c::executeClose() {
     return 1;
 }
 
-/* 80467BE0-80467C0C 0007C0 002C+00 1/0 0/0 0/0 .text            daDsh_Draw__FP7daDsh_c */
 static int daDsh_Draw(daDsh_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80467C0C-80467C2C 0007EC 0020+00 1/0 0/0 0/0 .text            daDsh_Execute__FP7daDsh_c */
 static int daDsh_Execute(daDsh_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80467C2C-80467C34 00080C 0008+00 1/0 0/0 0/0 .text            daDsh_IsDelete__FP7daDsh_c */
 static int daDsh_IsDelete(daDsh_c* i_this) {
     return 1;
 }
 
-/* 80467C34-80467C7C 000814 0048+00 1/0 0/0 0/0 .text            daDsh_Delete__FP7daDsh_c */
 static int daDsh_Delete(daDsh_c* i_this) {
     int ret = i_this->MoveBGDelete();
     i_this->~daDsh_c();
@@ -238,7 +210,6 @@ static int daDsh_Delete(daDsh_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 80467C7C-80467DF8 00085C 017C+00 1/0 0/0 0/0 .text            daDsh_Create__FP10fopAc_ac_c */
 int daDsh_c::create() {
     fopAcM_ct(this, daDsh_c);
 
@@ -268,14 +239,12 @@ static int daDsh_Create(fopAc_ac_c* i_this) {
     return static_cast<daDsh_c*>(i_this)->create();
 }
 
-/* 80467FF0-80468010 -00001 0020+00 1/0 0/0 0/0 .data            l_daDsh_Method */
 static actor_method_class l_daDsh_Method = {
     (process_method_func)daDsh_Create,  (process_method_func)daDsh_Delete,
     (process_method_func)daDsh_Execute, (process_method_func)daDsh_IsDelete,
     (process_method_func)daDsh_Draw,
 };
 
-/* 80468010-80468044 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_DSHUTTER */
 extern actor_process_profile_definition2 g_profile_DSHUTTER = {
     {
         fpcLy_CURRENT_e,        // mLayerID
diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp
index 24969d87a6..87f0764873 100644
--- a/src/d/actor/d_a_e_ai.cpp
+++ b/src/d/actor/d_a_e_ai.cpp
@@ -11,8 +11,8 @@
 
 class daE_AI_HIO_c : public JORReflexible {
 public:
-    /* 8067916C */ daE_AI_HIO_c();
-    /* 8067BF40 */ virtual ~daE_AI_HIO_c() {}
+    daE_AI_HIO_c();
+    virtual ~daE_AI_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -25,7 +25,6 @@ public:
     /* 0x1C */ f32 home_distance;
 };
 
-/* 8067916C-806791BC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_AI_HIO_cFv */
 daE_AI_HIO_c::daE_AI_HIO_c() {
     id = -1;
     model_size = 1.0f;
@@ -36,7 +35,6 @@ daE_AI_HIO_c::daE_AI_HIO_c() {
     home_distance = 0.0f;
 }
 
-/* 806791BC-80679284 00013C 00C8+00 1/1 0/0 0/0 .text            initCcCylinder__10e_ai_classFv */
 void e_ai_class::initCcCylinder() {
     m_ccAtStts.Init(250, 0, this);
     m_ccShieldStts.Init(250, 0, this);
@@ -93,7 +91,6 @@ void e_ai_class::initCcCylinder() {
     m_ccCyl.OnTgIronBallRebound();
 }
 
-/* 80679284-80679350 000204 00CC+00 1/1 0/0 0/0 .text            setCcCylinder__10e_ai_classFv */
 void e_ai_class::setCcCylinder() {
     m_ccCyl.SetC(current.pos);
     dComIfG_Ccsp()->Set(&m_ccCyl);
@@ -112,13 +109,11 @@ void e_ai_class::setCcCylinder() {
     dComIfG_Ccsp()->Set(&m_ccShieldSph);
 }
 
-/* 80679350-806793FC 0002D0 00AC+00 6/6 0/0 0/0 .text            anm_init__10e_ai_classFifUcf */
 void e_ai_class::anm_init(int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     m_modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_AI", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     m_anm = i_anm;
 }
 
-/* 806793FC-806794F4 00037C 00F8+00 1/1 0/0 0/0 .text            Draw__10e_ai_classFv */
 int e_ai_class::Draw() {
     J3DModel* model_p = m_modelMorf->getModel();
 
@@ -136,7 +131,6 @@ int e_ai_class::Draw() {
     return 1;
 }
 
-/* 806794F4-80679538 000474 0044+00 1/1 0/0 0/0 .text            player_way_check__10e_ai_classFv */
 BOOL e_ai_class::player_way_check() {
     s16 angle_diff = shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y;
     if (angle_diff < 0) {
@@ -150,8 +144,6 @@ BOOL e_ai_class::player_way_check() {
     return TRUE;
 }
 
-/* 80679538-80679610 0004B8 00D8+00 1/1 0/0 0/0 .text other_bg_check__10e_ai_classFP10fopAc_ac_c
- */
 BOOL e_ai_class::other_bg_check(fopAc_ac_c* i_other) {
     dBgS_LinChk linchk;
     cXyz sp24;
@@ -172,7 +164,6 @@ BOOL e_ai_class::other_bg_check(fopAc_ac_c* i_other) {
     return FALSE;
 }
 
-/* 80679610-8067968C 000590 007C+00 2/2 0/0 0/0 .text            pl_check__10e_ai_classFfs */
 BOOL e_ai_class::pl_check(f32 i_range, s16 i_angle) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     
@@ -186,7 +177,6 @@ BOOL e_ai_class::pl_check(f32 i_range, s16 i_angle) {
     return FALSE;
 }
 
-/* 8067968C-80679DC8 00060C 073C+00 1/1 0/0 0/0 .text            damage_check__10e_ai_classFv */
 void e_ai_class::damage_check() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp44;
@@ -348,13 +338,10 @@ void e_ai_class::damage_check() {
     }
 }
 
-/* 8067C698-8067C69C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 8067C6A8-8067C6C8 000018 0020+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_AI_HIO_c l_HIO;
 
-/* 80679DC8-8067A2CC 000D48 0504+00 1/1 0/0 0/0 .text            e_ai_damage__10e_ai_classFv */
 void e_ai_class::e_ai_damage() {
     switch (field_0x692) {
     case 0:
@@ -450,7 +437,6 @@ void e_ai_class::e_ai_damage() {
     }
 }
 
-/* 8067A2CC-8067A54C 00124C 0280+00 1/1 0/0 0/0 .text            e_ai_attack__10e_ai_classFv */
 void e_ai_class::e_ai_attack() {
     speedF = 0.0f;
     cLib_addCalcAngleS2(&current.angle.y, field_0x6a8 + TREG_S(4) + 4000, 2, 0x400);
@@ -502,7 +488,6 @@ void e_ai_class::e_ai_attack() {
     }
 }
 
-/* 8067A54C-8067AA48 0014CC 04FC+00 1/1 0/0 0/0 .text            e_ai_move__10e_ai_classFv */
 void e_ai_class::e_ai_move() {
     if ((field_0x5cc == 0x10 || field_0x5cc == 0x12) && m_brk->isStop()) {
         m_brk->init(m_modelMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_AI", 0x11), 1, 2, 1.0f, 0, -1);
@@ -583,7 +568,6 @@ void e_ai_class::e_ai_move() {
     }
 }
 
-/* 8067AA48-8067ACA0 0019C8 0258+00 1/1 0/0 0/0 .text            e_ai_wait__10e_ai_classFv */
 void e_ai_class::e_ai_wait() {
     switch (m_mode) {
     case 0:
@@ -620,7 +604,6 @@ void e_ai_class::e_ai_wait() {
     }
 }
 
-/* 8067ACA0-8067B024 001C20 0384+00 1/1 0/0 0/0 .text            e_ai_return__10e_ai_classFv */
 void e_ai_class::e_ai_return() {
     switch (m_mode) {
     case 0:
@@ -674,7 +657,6 @@ void e_ai_class::e_ai_return() {
     }
 }
 
-/* 8067B024-8067B2B0 001FA4 028C+00 1/1 0/0 0/0 .text            action__10e_ai_classFv */
 void e_ai_class::action() {
     cXyz sp14;
     cXyz sp8;
@@ -749,7 +731,6 @@ void e_ai_class::action() {
     m_acch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 8067B2B0-8067B31C 002230 006C+00 1/1 0/0 0/0 .text            PlayerWaySet__10e_ai_classFv */
 void e_ai_class::PlayerWaySet() {
     if (player_way_check()) {
         m_ccCyl.OnTgShield();
@@ -762,7 +743,6 @@ void e_ai_class::PlayerWaySet() {
     }
 }
 
-/* 8067B31C-8067B378 00229C 005C+00 1/1 0/0 0/0 .text            AttentionSet__10e_ai_classFv */
 void e_ai_class::AttentionSet() {
     eyePos = current.pos;
     eyePos.y += 100.0f + TREG_F(2);
@@ -771,7 +751,6 @@ void e_ai_class::AttentionSet() {
     attention_info.position.y += 130.0f;
 }
 
-/* 8067B378-8067B598 0022F8 0220+00 1/1 0/0 0/0 .text            Execute__10e_ai_classFv */
 int e_ai_class::Execute() {
     cXyz sp38;
     cXyz sp2C;
@@ -834,7 +813,6 @@ int e_ai_class::Execute() {
     return 1;
 }
 
-/* 8067B598-8067B620 002518 0088+00 1/1 0/0 0/0 .text            setBaseMtx__10e_ai_classFv */
 void e_ai_class::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -846,7 +824,6 @@ void e_ai_class::setBaseMtx() {
     m_modelMorf->modelCalc();
 }
 
-/* 8067B620-8067B688 0025A0 0068+00 1/1 0/0 0/0 .text            Delete__10e_ai_classFv */
 int e_ai_class::Delete() {
     dComIfG_resDelete(&m_phase, "E_AI");
 
@@ -862,27 +839,22 @@ int e_ai_class::Delete() {
     return 1;
 }
 
-/* 8067B688-8067B6A8 002608 0020+00 1/0 0/0 0/0 .text            daE_AI_Draw__FP10e_ai_class */
 static int daE_AI_Draw(e_ai_class* i_this) {
     return i_this->Draw();
 }
 
-/* 8067B6A8-8067B6C8 002628 0020+00 2/1 0/0 0/0 .text            daE_AI_Execute__FP10e_ai_class */
 static int daE_AI_Execute(e_ai_class* i_this) {
     return i_this->Execute();
 }
 
-/* 8067B6C8-8067B6D0 002648 0008+00 1/0 0/0 0/0 .text            daE_AI_IsDelete__FP10e_ai_class */
 static int daE_AI_IsDelete(e_ai_class* i_this) {
     return 1;
 }
 
-/* 8067B6D0-8067B6F0 002650 0020+00 1/0 0/0 0/0 .text            daE_AI_Delete__FP10e_ai_class */
 static int daE_AI_Delete(e_ai_class* i_this) {
     return i_this->Delete();
 }
 
-/* 8067B6F0-8067B87C 002670 018C+00 1/1 0/0 0/0 .text            CreateHeap__10e_ai_classFv */
 int e_ai_class::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_AI", 0xD);
     JUT_ASSERT(1703, modelData != NULL);
@@ -905,12 +877,10 @@ int e_ai_class::CreateHeap() {
     return 1;
 }
 
-/* 8067B8C4-8067B8E4 002844 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((e_ai_class*)i_this)->CreateHeap();
 }
 
-/* 8067B8E4-8067BAEC 002864 0208+00 1/1 0/0 0/0 .text            Create__10e_ai_classFv */
 int e_ai_class::Create() {
     fopAcM_ct(this, e_ai_class);
 
@@ -966,12 +936,10 @@ int e_ai_class::Create() {
     return phase_state;
 }
 
-/* 8067BED8-8067BEF8 002E58 0020+00 1/0 0/0 0/0 .text            daE_AI_Create__FP10fopAc_ac_c */
 static int daE_AI_Create(fopAc_ac_c* i_this) {
     return ((e_ai_class*)i_this)->Create();
 }
 
-/* 8067C5BC-8067C5DC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_AI_Method */
 static actor_method_class l_daE_AI_Method = {
     (process_method_func)daE_AI_Create,
     (process_method_func)daE_AI_Delete,
@@ -980,7 +948,6 @@ static actor_method_class l_daE_AI_Method = {
     (process_method_func)daE_AI_Draw,
 };
 
-/* 8067C5DC-8067C60C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_AI */
 extern actor_process_profile_definition g_profile_E_AI = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp
index 2f168cb378..81fc58142a 100644
--- a/src/d/actor/d_a_e_arrow.cpp
+++ b/src/d/actor/d_a_e_arrow.cpp
@@ -17,7 +17,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "JSystem/JAudio2/JAUSectionHeap.h"
 
-/* 8067C7CC-8067C874 0000EC 00A8+00 1/0 0/0 0/0 .text            daE_ARROW_Draw__FP13e_arrow_class */
 static int daE_ARROW_Draw(e_arrow_class* i_this) {
     if (i_this->field_0xa14) {
         return 1;
@@ -41,7 +40,6 @@ static u8 const lit_3983[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8067C874-8067CB68 000194 02F4+00 1/1 0/0 0/0 .text            fire_eff_set__FP13e_arrow_class */
 static void fire_eff_set(e_arrow_class* i_this) {
     cXyz sp38;
     cXyz sp44;
@@ -100,7 +98,6 @@ static void fire_eff_set(e_arrow_class* i_this) {
     }
 }
 
-/* 8067CBA4-8067D21C 0004C4 0678+00 1/1 0/0 0/0 .text            hit_check__FP13e_arrow_class */
 static void hit_check(e_arrow_class* i_this) {
     dBgS_ObjGndChk_Spl ground_chk;
 
@@ -234,7 +231,6 @@ static void hit_check(e_arrow_class* i_this) {
     }
 }
 
-/* 8067D21C-8067D40C 000B3C 01F0+00 1/1 0/0 0/0 .text            e_arrow_shot__FP13e_arrow_class */
 static void e_arrow_shot(e_arrow_class* i_this) {
     switch (i_this->mMode) {
     case 0: {
@@ -289,7 +285,6 @@ static void e_arrow_shot(e_arrow_class* i_this) {
     }
 }
 
-/* 8067D40C-8067D530 000D2C 0124+00 1/1 0/0 0/0 .text            e_arrow_bg__FP13e_arrow_class */
 static void e_arrow_bg(e_arrow_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -311,7 +306,6 @@ static void e_arrow_bg(e_arrow_class* i_this) {
     }
 }
 
-/* 8067D530-8067D5FC 000E50 00CC+00 1/1 0/0 0/0 .text            e_arrow_spin__FP13e_arrow_class */
 static void e_arrow_spin(e_arrow_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -335,7 +329,6 @@ static void e_arrow_spin(e_arrow_class* i_this) {
     }
 }
 
-/* 8067D5FC-8067D68C 000F1C 0090+00 1/1 0/0 0/0 .text            s_limit_sub__FPvPv */
 static void* s_limit_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) != NULL && i_actor != i_data &&
         fopAcM_GetName(i_actor) == PROC_E_ARROW &&
@@ -349,7 +342,6 @@ static void* s_limit_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8067D68C-8067DA70 000FAC 03E4+00 1/1 0/0 0/0 .text e_arrow_demo_fire__FP13e_arrow_class */
 static void e_arrow_demo_fire(e_arrow_class* i_this) {
     cXyz sp9C;
     csXyz spB0;
@@ -435,8 +427,6 @@ static void e_arrow_demo_fire(e_arrow_class* i_this) {
     }
 }
 
-/* 8067DAE8-8067DB5C 001408 0074+00 1/1 0/0 0/0 .text
- * atHit_CB__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c* i_tgActor,
                      dCcD_GObjInf* i_tgObjInf) {
     if (i_tgActor != NULL && fopAcM_GetName(i_tgActor) == PROC_ALINK) {
@@ -449,8 +439,6 @@ static void atHit_CB(fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf, fopAc_ac_c
     }
 }
 
-/* 8067DB5C-8067DC58 00147C 00FC+00 1/1 0/0 0/0 .text            e_arrow_shield__FP13e_arrow_class
- */
 static void e_arrow_shield(e_arrow_class* i_this) {
     e_arrow_class* a_this = (e_arrow_class*)i_this;
     daAlink_getAlinkActorClass()->setArrowShieldPos(&a_this->current.pos, &a_this->shape_angle,
@@ -466,7 +454,6 @@ static void e_arrow_shield(e_arrow_class* i_this) {
     }
 }
 
-/* 8067DC58-8067DE54 001578 01FC+00 1/1 0/0 0/0 .text e_arrow_demo_bound__FP13e_arrow_class */
 static void e_arrow_demo_bound(e_arrow_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* const player_p = dComIfGp_getPlayer(0);
@@ -511,7 +498,6 @@ static void e_arrow_demo_bound(e_arrow_class* i_this) {
     a_this->current.pos.z = player_p->current.pos.z + 10.0f + 25.0f;
 }
 
-/* 8067DE54-8067E0BC 001774 0268+00 1/1 0/0 0/0 .text            action__FP13e_arrow_class */
 static void action(e_arrow_class* i_this) {
     s8 try_create_explosion = false;
 
@@ -573,7 +559,6 @@ static void action(e_arrow_class* i_this) {
     i_this->eyePos = i_this->current.pos;
 }
 
-/* 8067E0BC-8067E304 0019DC 0248+00 1/0 0/0 0/0 .text daE_ARROW_Execute__FP13e_arrow_class */
 static int daE_ARROW_Execute(e_arrow_class* i_this) {
     const fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
 
@@ -635,13 +620,10 @@ static int daE_ARROW_Execute(e_arrow_class* i_this) {
     return 1;
 }
 
-/* 8067E304-8067E30C 001C24 0008+00 1/0 0/0 0/0 .text daE_ARROW_IsDelete__FP13e_arrow_class */
 static int daE_ARROW_IsDelete(e_arrow_class* i_this) {
     return 1;
 }
 
-/* 8067E30C-8067E374 001C2C 0068+00 1/0 0/0 0/0 .text            daE_ARROW_Delete__FP13e_arrow_class
- */
 static int daE_ARROW_Delete(e_arrow_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, i_this->mResName);
@@ -655,7 +637,6 @@ static int daE_ARROW_Delete(e_arrow_class* i_this) {
     return 1;
 }
 
-/* 8067E374-8067E428 001C94 00B4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_arrow_class* a_this = static_cast<e_arrow_class*>(i_this);
 
@@ -682,7 +663,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8067E428-8067E724 001D48 02FC+00 1/0 0/0 0/0 .text            daE_ARROW_Create__FP10fopAc_ac_c */
 static int daE_ARROW_Create(fopAc_ac_c* i_this) {
     e_arrow_class* const a_this = static_cast<e_arrow_class*>(i_this);
     fopAcM_ct(i_this, e_arrow_class);
@@ -767,14 +747,12 @@ static int daE_ARROW_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8067EA60-8067EA80 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ARROW_Method */
 static actor_method_class l_daE_ARROW_Method = {
     (process_method_func)daE_ARROW_Create,  (process_method_func)daE_ARROW_Delete,
     (process_method_func)daE_ARROW_Execute, (process_method_func)daE_ARROW_IsDelete,
     (process_method_func)daE_ARROW_Draw,
 };
 
-/* 8067EA80-8067EAB0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ARROW */
 extern actor_process_profile_definition g_profile_E_ARROW = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp
index aa3ba4d769..11d7757715 100644
--- a/src/d/actor/d_a_e_ba.cpp
+++ b/src/d/actor/d_a_e_ba.cpp
@@ -16,8 +16,8 @@
 
 class daE_BA_HIO_c {
 public:
-    /* 8067ECEC */ daE_BA_HIO_c();
-    /* 80681F00 */ virtual ~daE_BA_HIO_c() {}
+    daE_BA_HIO_c();
+    virtual ~daE_BA_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mScale;
@@ -29,13 +29,10 @@ public:
 
 STATIC_ASSERT(sizeof(daE_BA_HIO_c) == 0x1C);
 
-/* 80682638-8068263C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80682648-80682664 000018 001C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_BA_HIO_c l_HIO;
 
-/* 8067ECEC-8067ED30 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__12daE_BA_HIO_cFv */
 daE_BA_HIO_c::daE_BA_HIO_c() {
     field_0x04 = -1;
     mScale = 1.0f;
@@ -45,7 +42,6 @@ daE_BA_HIO_c::daE_BA_HIO_c() {
     mAttackSpeed = 40.0f;
 }
 
-/* 8067ED30-8067ED90 000130 0060+00 2/2 0/0 0/0 .text            ba_disappear__FP10fopAc_ac_c */
 static void ba_disappear(fopAc_ac_c* i_this) {
     fopAcM_createDisappear(i_this, &i_this->current.pos, 6, 0, 3);
     int sw = fopAcM_GetParam(i_this) >> 24;
@@ -54,7 +50,6 @@ static void ba_disappear(fopAc_ac_c* i_this) {
     }
 }
 
-/* 8067ED90-8067EE38 000190 00A8+00 11/11 0/0 0/0 .text            anm_init__FP10e_ba_classifUcf */
 static void anm_init(e_ba_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm =
         static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(i_this->mArcName, i_index));
@@ -62,7 +57,6 @@ static void anm_init(e_ba_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32
     i_this->mAnm = i_index;
 }
 
-/* 8067EE38-8067EEA8 000238 0070+00 1/0 0/0 0/0 .text            daE_BA_Draw__FP10e_ba_class */
 static int daE_BA_Draw(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -72,7 +66,6 @@ static int daE_BA_Draw(e_ba_class* i_this) {
     return 1;
 }
 
-/* 8067EEA8-8067EF20 0002A8 0078+00 1/1 0/0 0/0 .text            shot_b_sub__FPvPv */
 static void* shot_b_sub(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_BOOMERANG
         && !dComIfGp_checkPlayerStatus0(0, 0x80000) && daPy_py_c::checkBoomerangCharge()
@@ -83,8 +76,6 @@ static void* shot_b_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 8067EF20-8067EFF8 000320 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_ba_classP10fopAc_ac_c
- */
 static BOOL other_bg_check(e_ba_class* i_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(&i_this->mEnemy);
     dBgS_LinChk lin_chk;
@@ -101,7 +92,6 @@ static BOOL other_bg_check(e_ba_class* i_this, fopAc_ac_c* i_other) {
     }
 }
 
-/* 8067EFF8-8067F0AC 0003F8 00B4+00 5/5 0/0 0/0 .text            pl_check__FP10e_ba_classfs */
 static BOOL pl_check(e_ba_class* i_this, f32 i_maxDistance, s16 i_maxAngle) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -123,7 +113,6 @@ static BOOL pl_check(e_ba_class* i_this, f32 i_maxDistance, s16 i_maxAngle) {
     return false;
 }
 
-/* 8067F0AC-8067F2DC 0004AC 0230+00 1/1 0/0 0/0 .text            damage_check__FP10e_ba_class */
 static void damage_check(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -177,7 +166,6 @@ static void damage_check(e_ba_class* i_this) {
     }
 }
 
-/* 8067F2DC-8067F544 0006DC 0268+00 2/3 0/0 0/0 .text            path_check__FP10e_ba_class */
 static BOOL path_check(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     if (i_this->mpPath != NULL) {
@@ -239,7 +227,6 @@ static BOOL path_check(e_ba_class* i_this) {
     return false;
 }
 
-/* 8067F544-8067F6D4 000944 0190+00 6/6 0/0 0/0 .text            fly_move__FP10e_ba_class */
 static void fly_move(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     f32 delta_x = i_this->mTargetPos.x - a_this->current.pos.x;
@@ -265,7 +252,6 @@ static void fly_move(e_ba_class* i_this) {
     a_this->current.pos += a_this->speed;
 }
 
-/* 8067F6D4-8067F81C 000AD4 0148+00 1/1 0/0 0/0 .text            e_ba_roof__FP10e_ba_class */
 static void e_ba_roof(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
 
@@ -293,7 +279,6 @@ static void e_ba_roof(e_ba_class* i_this) {
     }
 }
 
-/* 8067F81C-8067F9E0 000C1C 01C4+00 1/1 0/0 0/0 .text            e_ba_fight_fly__FP10e_ba_class */
 static void e_ba_fight_fly(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -339,7 +324,6 @@ static void e_ba_fight_fly(e_ba_class* i_this) {
     }
 }
 
-/* 8067F9E0-8067FD68 000DE0 0388+00 1/1 0/0 0/0 .text            e_ba_fight__FP10e_ba_class */
 static void e_ba_fight(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -412,7 +396,6 @@ static void e_ba_fight(e_ba_class* i_this) {
     }
 }
 
-/* 8067FD68-8067FF60 001168 01F8+00 1/1 0/0 0/0 .text            e_ba_attack__FP10e_ba_class */
 static void e_ba_attack(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -465,7 +448,6 @@ static void e_ba_attack(e_ba_class* i_this) {
     fly_move(i_this);
 }
 
-/* 8067FF60-8068018C 001360 022C+00 1/1 0/0 0/0 .text            e_ba_fly__FP10e_ba_class */
 static void e_ba_fly(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     switch (i_this->mMode) {
@@ -503,7 +485,6 @@ static void e_ba_fly(e_ba_class* i_this) {
     }
 }
 
-/* 8068018C-8068039C 00158C 0210+00 1/1 0/0 0/0 .text            e_ba_return__FP10e_ba_class */
 static void e_ba_return(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
 
@@ -533,7 +514,6 @@ static void e_ba_return(e_ba_class* i_this) {
     }
 }
 
-/* 8068039C-806806B4 00179C 0318+00 1/1 0/0 0/0 .text            e_ba_path_fly__FP10e_ba_class */
 static void e_ba_path_fly(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     dPnt* point;
@@ -590,7 +570,6 @@ static void e_ba_path_fly(e_ba_class* i_this) {
     fly_move(i_this);
 }
 
-/* 806806B4-806808AC 001AB4 01F8+00 1/1 0/0 0/0 .text            e_ba_chance__FP10e_ba_class */
 static void e_ba_chance(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
 
@@ -637,7 +616,6 @@ static void e_ba_chance(e_ba_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.z, i_this->mChanceAngle.z, 2, 0x1000);
 }
 
-/* 806808AC-80680AF4 001CAC 0248+00 1/1 0/0 0/0 .text            e_ba_wolfbite__FP10e_ba_class */
 static void e_ba_wolfbite(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -696,7 +674,6 @@ static void e_ba_wolfbite(e_ba_class* i_this) {
     }
 }
 
-/* 80680AF4-80680C98 001EF4 01A4+00 1/1 0/0 0/0 .text            e_ba_wind__FP10e_ba_class */
 static void e_ba_wind(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     fopAc_ac_c* boomerang = (fopAc_ac_c*)fpcM_Search(shot_b_sub, i_this);
@@ -735,7 +712,6 @@ static void e_ba_wind(e_ba_class* i_this) {
     a_this->current.angle.z = 0;
 }
 
-/* 80680C98-80680DCC 002098 0134+00 1/1 0/0 0/0 .text            e_ba_appear__FP10e_ba_class */
 static void e_ba_appear(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     cXyz vec;
@@ -767,7 +743,6 @@ static void e_ba_appear(e_ba_class* i_this) {
     fly_move(i_this);
 }
 
-/* 80680DCC-80681128 0021CC 035C+00 2/1 0/0 0/0 .text            action__FP10e_ba_class */
 static void action(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     cXyz vec1, vec2, vec3;
@@ -872,7 +847,6 @@ static void action(e_ba_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mCreatureSound, &a_this->eyePos, &vec3);
 }
 
-/* 80681128-80681734 002528 060C+00 2/1 0/0 0/0 .text            daE_BA_Execute__FP10e_ba_class */
 static int daE_BA_Execute(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -986,12 +960,10 @@ static int daE_BA_Execute(e_ba_class* i_this) {
     return 1;
 }
 
-/* 80681734-8068173C 002B34 0008+00 1/0 0/0 0/0 .text            daE_BA_IsDelete__FP10e_ba_class */
 static int daE_BA_IsDelete(e_ba_class* i_this) {
     return 1;
 }
 
-/* 8068173C-806817A0 002B3C 0064+00 1/0 0/0 0/0 .text            daE_BA_Delete__FP10e_ba_class */
 static int daE_BA_Delete(e_ba_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->mEnemy;
     dComIfG_resDelete(&i_this->mPhase, i_this->mArcName);
@@ -1004,7 +976,6 @@ static int daE_BA_Delete(e_ba_class* i_this) {
     return 1;
 }
 
-/* 806817A0-80681890 002BA0 00F0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_ba_class* _this = (e_ba_class*)i_this;
     _this->mpMorf = new mDoExt_McaMorfSO(
@@ -1018,7 +989,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 }
 
-/* 80681890-80681CEC 002C90 045C+00 1/0 0/0 0/0 .text            daE_BA_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
     static char* arc_name[3] = {"E_ba", "E_fb", "E_ib"};
 
@@ -1126,7 +1096,6 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80682570-80682590 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BA_Method */
 static actor_method_class l_daE_BA_Method = {
     (process_method_func)daE_BA_Create,
     (process_method_func)daE_BA_Delete,
@@ -1135,7 +1104,6 @@ static actor_method_class l_daE_BA_Method = {
     (process_method_func)daE_BA_Draw,
 };
 
-/* 80682590-806825C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BA */
 extern actor_process_profile_definition g_profile_E_BA = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp
index 62d201a77c..7a3b5e46fd 100644
--- a/src/d/actor/d_a_e_bee.cpp
+++ b/src/d/actor/d_a_e_bee.cpp
@@ -15,14 +15,11 @@
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80685674-80685678 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 80685675 0003+00 data_80685675 None */
 static bool hioInit;
 
-/* 80685684-80685694 000054 0010+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_Bee_HIO_c l_HIO;
 
-/* 8068286C-8068289C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__13daE_Bee_HIO_cFv */
 daE_Bee_HIO_c::daE_Bee_HIO_c() {
     field_0x4 = -1;
     mScale = 1.0f;
@@ -30,7 +27,6 @@ daE_Bee_HIO_c::daE_Bee_HIO_c() {
     mNoKill = false;
 }
 
-/* 8068289C-806829A8 00011C 010C+00 1/0 0/0 0/0 .text            daE_Bee_Draw__FP11e_bee_class */
 static int daE_Bee_Draw(e_bee_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     bee_s* bee = i_this->mBees;
@@ -55,7 +51,6 @@ static int daE_Bee_Draw(e_bee_class* i_this) {
     return 1;
 }
 
-/* 806829A8-80682A70 000228 00C8+00 3/3 0/0 0/0 .text            bee_mtxset__FP5bee_s */
 static void bee_mtxset(bee_s* i_bee) {
     mDoMtx_stack_c::transS(i_bee->mPos.x, i_bee->mPos.y, i_bee->mPos.z);
     mDoMtx_stack_c::YrotM(i_bee->mAngle.y);
@@ -70,7 +65,6 @@ static void bee_mtxset(bee_s* i_bee) {
     }
 }
 
-/* 80682A70-80682D78 0002F0 0308+00 1/1 0/0 0/0 .text            bee_ground_ang_set__FP5bee_s */
 static void bee_ground_ang_set(bee_s* i_bee) {
     dBgS_LinChk lin_chk;
     cXyz vec4, vec2, vec3, vec1;
@@ -115,10 +109,8 @@ static void bee_ground_ang_set(bee_s* i_bee) {
     }
 }
 
-/* 80685694-80685698 000064 0004+00 1/2 0/0 0/0 .bss             None */
 static u8 ccCylSet;
 
-/* 80682DB4-806835FC 000634 0848+00 1/1 0/0 0/0 .text bee_fly_action__FP11e_bee_classP5bee_s */
 static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) {
     e_nest_class* nest = static_cast<e_nest_class*>(fopAcM_SearchByID(i_this->parentActorID));
     if (nest == NULL) {
@@ -246,7 +238,6 @@ static int bee_fly_action(e_bee_class* i_this, bee_s* i_bee) {
     return ret;
 }
 
-/* 806835FC-80683DDC 000E7C 07E0+00 1/1 0/0 0/0 .text bee_nest_action__FP11e_bee_classP5bee_sSc */
 static void bee_nest_action(e_bee_class* i_this, bee_s* i_bee, s8 i_nestHealth) {
     i_bee->mIsFlying = 0;
     cXyz vec1 = i_bee->mTarget - i_bee->mPos;
@@ -376,7 +367,6 @@ static void bee_nest_action(e_bee_class* i_this, bee_s* i_bee, s8 i_nestHealth)
     }
 }
 
-/* 80683DDC-80683FF4 00165C 0218+00 1/1 0/0 0/0 .text            bee_fail__FP5bee_s */
 static void bee_fail(bee_s* i_bee) {
     if (i_bee->mMode <= 1) {
         i_bee->mPos += i_bee->mSpeed;
@@ -417,8 +407,6 @@ static void bee_fail(bee_s* i_bee) {
     bee_mtxset(i_bee);
 }
 
-/* 80683FF4-80684248 001874 0254+00 1/1 0/0 0/0 .text            bee_start__FP11e_bee_classP5bee_s
- */
 static void bee_start(e_bee_class* i_this, bee_s* i_bee) {
     cXyz vec = i_this->home.pos - i_bee->mPos;
     vec.y += 30;
@@ -456,7 +444,6 @@ static void bee_start(e_bee_class* i_this, bee_s* i_bee) {
     bee_mtxset(i_bee);
 }
 
-/* 80684248-80684A94 001AC8 084C+00 1/1 0/0 0/0 .text            bee_control__FP11e_bee_class */
 static void bee_control(e_bee_class* i_this) {
     fopAc_ac_c* a_this;
     a_this = (fopAc_ac_c*)i_this;
@@ -637,7 +624,6 @@ static void bee_control(e_bee_class* i_this) {
     }
 }
 
-/* 80684A94-80684B5C 002314 00C8+00 2/1 0/0 0/0 .text            daE_Bee_Execute__FP11e_bee_class */
 static int daE_Bee_Execute(e_bee_class* i_this) {
     if (l_HIO.mDelete) {
         fopAcM_delete(i_this);
@@ -668,13 +654,10 @@ static int daE_Bee_Execute(e_bee_class* i_this) {
 }
 
 
-/* 80684B5C-80684B64 0023DC 0008+00 1/0 0/0 0/0 .text            daE_Bee_IsDelete__FP11e_bee_class
- */
 static int daE_Bee_IsDelete(e_bee_class* param_0) {
     return 1;
 }
 
-/* 80684B64-80684C70 0023E4 010C+00 1/0 0/0 0/0 .text            daE_Bee_Delete__FP11e_bee_class */
 static int daE_Bee_Delete(e_bee_class* i_this) {
     static const u32 l_bmdidx[4] = {3, 4, 5, 6};
     if (i_this->mResLoaded) {
@@ -701,7 +684,6 @@ static int daE_Bee_Delete(e_bee_class* i_this) {
     return 1;
 }
 
-/* 80684C70-80684E24 0024F0 01B4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_bee_class* _this = static_cast<e_bee_class*>(i_this);
     
@@ -735,7 +717,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return true;
 }
 
-/* 80684E24-80685224 0026A4 0400+00 1/0 0/0 0/0 .text            daE_Bee_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
     e_bee_class* _this = static_cast<e_bee_class*>(i_this);
     fopAcM_ct(_this, e_bee_class);
@@ -825,7 +806,6 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 806855B0-806855D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Bee_Method */
 static actor_method_class l_daE_Bee_Method = {
     (process_method_func)daE_Bee_Create,
     (process_method_func)daE_Bee_Delete,
@@ -834,7 +814,6 @@ static actor_method_class l_daE_Bee_Method = {
     (process_method_func)daE_Bee_Draw,
 };
 
-/* 806855D0-80685600 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BEE */
 extern actor_process_profile_definition g_profile_E_BEE = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp
index 1ca226d8d7..be5ab07f42 100644
--- a/src/d/actor/d_a_e_bg.cpp
+++ b/src/d/actor/d_a_e_bg.cpp
@@ -16,7 +16,6 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 8068580C-8068585C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_BG_HIO_cFv */
 daE_BG_HIO_c::daE_BG_HIO_c() {
     field_0x4 = -1;
     mTrackingSpeed = 8.0f;
@@ -46,8 +45,6 @@ void daE_BG_HIO_c::genMessage(JORMContext* ctx) {
 #endif
 
 namespace {
-/* 8068A314-8068A354 000000 0040+00 1/1 0/0 0/0 .data            cc_bg_src__22@unnamed@d_a_e_bg_cpp@
- */
 dCcD_SrcSph cc_bg_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x03}, 0x75}}, // mObj
@@ -60,7 +57,6 @@ dCcD_SrcSph cc_bg_src = {
     } // mSphAttr
 };
 
-/* 8068A354-8068A394 000040 0040+00 1/1 0/0 0/0 .data cc_bg_at_src__22@unnamed@d_a_e_bg_cpp@ */
 dCcD_SrcSph cc_bg_at_src = {
     {
         {0x0, {{0x400, 0x1, 0xD}, {0x0, 0x0}, 0x0}}, // mObj
@@ -74,7 +70,6 @@ dCcD_SrcSph cc_bg_at_src = {
 };
 }
 
-/* 8068585C-80685948 00013C 00EC+00 1/1 0/0 0/0 .text ctrlJoint__8daE_BG_cFP8J3DJointP8J3DModel */
 int daE_BG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     s32 jointNo = joint->getJntNo();
@@ -100,7 +95,6 @@ int daE_BG_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80685948-80685994 000228 004C+00 2/2 0/0 0/0 .text JointCallBack__8daE_BG_cFP8J3DJointi */
 int daE_BG_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -113,7 +107,6 @@ int daE_BG_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80685994-80685B50 000274 01BC+00 1/1 0/0 0/0 .text            draw__8daE_BG_cFv */
 int daE_BG_c::draw() {
     if (field_0x6af != 0) {
         return 1;
@@ -152,18 +145,15 @@ int daE_BG_c::draw() {
     return 1;
 }
 
-/* 80685B50-80685B70 000430 0020+00 1/0 0/0 0/0 .text            daE_BG_Draw__FP8daE_BG_c */
 static int daE_BG_Draw(daE_BG_c* i_this) {
     return i_this->draw();
 }
 
-/* 80685B70-80685C14 000450 00A4+00 2/2 0/0 0/0 .text            setBck__8daE_BG_cFiUcff */
 void daE_BG_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) {
     mpMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_BG", param_0), param_1, param_2,
         param_3, 0.0f, -1.0f);
 }
 
-/* 80685C14-80685C2C 0004F4 0018+00 7/7 0/0 0/0 .text            setActionMode__8daE_BG_cFii */
 void daE_BG_c::setActionMode(int i_action, int i_mode) {
     if (mActionMode != i_action) {
         mActionMode = i_action;
@@ -171,7 +161,6 @@ void daE_BG_c::setActionMode(int i_action, int i_mode) {
     }
 }
 
-/* 80685C2C-80685DBC 00050C 0190+00 1/1 0/0 0/0 .text            damage_check__8daE_BG_cFv */
 void daE_BG_c::damage_check() {
     if (field_0x68e != 0) {
         return;
@@ -217,7 +206,6 @@ void daE_BG_c::damage_check() {
     }
 }
 
-/* 80685DBC-80685F04 00069C 0148+00 1/1 0/0 0/0 .text            setSparkEffect__8daE_BG_cFv */
 void daE_BG_c::setSparkEffect() {
     static u16 enemyBombID[5] = {
         0x0A0D,
@@ -241,7 +229,6 @@ void daE_BG_c::setSparkEffect() {
                                       dComIfGp_getReverb(dComIfGp_roomControl_getStayNo()));
 }
 
-/* 80685F04-80685F88 0007E4 0084+00 2/2 0/0 0/0 .text            search_esa__8daE_BG_cFv */
 fopAc_ac_c* daE_BG_c::search_esa() {
     dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD);
     if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->field_0x100d != 0 &&
@@ -252,14 +239,10 @@ fopAc_ac_c* daE_BG_c::search_esa() {
     }
 }
 
-/* ############################################################################################## */
-/* 8068A4B8-8068A4BC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 8068A4C8-8068A4EC 000018 0024+00 5/5 0/0 0/0 .bss             l_HIO */
 static daE_BG_HIO_c l_HIO;
 
-/* 80685F88-80686210 000868 0288+00 1/1 0/0 0/0 .text            executeBorn__8daE_BG_cFv */
 void daE_BG_c::executeBorn() {
     dBgS_GndChk gndChk;
     cXyz currentWithOffset;
@@ -329,7 +312,6 @@ void daE_BG_c::executeBorn() {
     }
 }
 
-/* 80686210-80686C90 000AF0 0A80+00 1/1 0/0 0/0 .text            executeSwim__8daE_BG_cFv */
 void daE_BG_c::executeSwim() {
     field_0x6a2 = nREG_S(0) + 0xc00;
     field_0x69c += field_0x6a0;
@@ -445,7 +427,6 @@ void daE_BG_c::executeSwim() {
     current.angle.y = shape_angle.y;
 }
 
-/* 80686C90-80687B38 001570 0EA8+00 2/1 0/0 0/0 .text            executeAttack__8daE_BG_cFv */
 void daE_BG_c::executeAttack() {
     s16 unusedShort1 = 0;
     u8 unkFlag1;
@@ -699,7 +680,6 @@ void daE_BG_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 80687B38-80687CD8 002418 01A0+00 1/1 0/0 0/0 .text            executeDamage__8daE_BG_cFv */
 void daE_BG_c::executeDamage() {
     field_0x694 = 160;
 
@@ -749,7 +729,6 @@ void daE_BG_c::executeDamage() {
     }
 }
 
-/* 80687CD8-80687DEC 0025B8 0114+00 3/3 0/0 0/0 .text            setBombCarry__8daE_BG_cFi */
 bool daE_BG_c::setBombCarry(int param_0) {
     fopAc_ac_c* bomb = NULL;
 
@@ -782,7 +761,6 @@ bool daE_BG_c::setBombCarry(int param_0) {
     return false;
 }
 
-/* 80687DEC-80687FC4 0026CC 01D8+00 1/1 0/0 0/0 .text            executeBomb__8daE_BG_cFv */
 void daE_BG_c::executeBomb() {
     switch (mMoveMode) {
     case 0:
@@ -844,7 +822,6 @@ void daE_BG_c::executeBomb() {
     }
 }
 
-/* 80687FC4-8068838C 0028A4 03C8+00 1/1 0/0 0/0 .text            executeBirth__8daE_BG_cFv */
 void daE_BG_c::executeBirth() {
     field_0x6ac = 0;
     field_0x6a2 = 0xc00;
@@ -941,7 +918,6 @@ void daE_BG_c::executeBirth() {
     }
 }
 
-/* 8068838C-806883D0 002C6C 0044+00 1/1 0/0 0/0 .text            executeHook__8daE_BG_cFv */
 void daE_BG_c::executeHook() {
     field_0x6ac = 0;
     field_0x6a2 = 0xc00;
@@ -950,7 +926,6 @@ void daE_BG_c::executeHook() {
     setBombCarry(1);
 }
 
-/* 806883D0-80689168 002CB0 0D98+00 2/1 0/0 0/0 .text            executeEat__8daE_BG_cFv */
 void daE_BG_c::executeEat() {
     fopAc_ac_c* rod = search_esa();
     if (rod == 0) {
@@ -1091,7 +1066,6 @@ void daE_BG_c::executeEat() {
     current.angle.y = shape_angle.y;
 }
 
-/* 80689168-80689544 003A48 03DC+00 2/1 0/0 0/0 .text            action__8daE_BG_cFv */
 void daE_BG_c::action() {
     damage_check();
     field_0x6b0 = 0;
@@ -1176,7 +1150,6 @@ void daE_BG_c::action() {
     mpMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80689544-8068966C 003E24 0128+00 1/1 0/0 0/0 .text            mtx_set__8daE_BG_cFv */
 void daE_BG_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x688, current.pos.z);
     mDoMtx_stack_c::transM(0.0f, 25.0f, 0.0f);
@@ -1199,7 +1172,6 @@ void daE_BG_c::mtx_set() {
     }
 }
 
-/* 8068966C-806897EC 003F4C 0180+00 1/1 0/0 0/0 .text            cc_set__8daE_BG_cFv */
 void daE_BG_c::cc_set() {
     cXyz unkXyz1;
     cXyz center;
@@ -1237,7 +1209,6 @@ void daE_BG_c::cc_set() {
     }
 }
 
-/* 806897EC-80689950 0040CC 0164+00 1/1 0/0 0/0 .text            execute__8daE_BG_cFv */
 int daE_BG_c::execute() {
     if (field_0x68f != 0) {
         field_0x68f--;
@@ -1288,17 +1259,14 @@ int daE_BG_c::execute() {
     return 1;
 }
 
-/* 80689950-80689970 004230 0020+00 2/1 0/0 0/0 .text            daE_BG_Execute__FP8daE_BG_c */
 static int daE_BG_Execute(daE_BG_c* i_this) {
     return i_this->execute();
 }
 
-/* 80689970-80689978 004250 0008+00 1/0 0/0 0/0 .text            daE_BG_IsDelete__FP8daE_BG_c */
 static int daE_BG_IsDelete(daE_BG_c* i_this) {
     return TRUE;
 }
 
-/* 80689978-806899EC 004258 0074+00 1/1 0/0 0/0 .text            _delete__8daE_BG_cFv */
 int daE_BG_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_BG");
 
@@ -1314,13 +1282,11 @@ int daE_BG_c::_delete() {
     return 1;
 }
 
-/* 806899EC-80689A0C 0042CC 0020+00 1/0 0/0 0/0 .text            daE_BG_Delete__FP8daE_BG_c */
 static int daE_BG_Delete(daE_BG_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80689A0C-80689BD0 0042EC 01C4+00 1/1 0/0 0/0 .text            CreateHeap__8daE_BG_cFv */
 int daE_BG_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10);
     JUT_ASSERT(0, modelData != NULL);
@@ -1354,13 +1320,11 @@ int daE_BG_c::CreateHeap() {
     return 1;
 }
 
-/* 80689C18-80689C38 0044F8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_BG_c* bg = (daE_BG_c*)i_this;
     return bg->CreateHeap();
 }
 
-/* 80689C38-8068A07C 004518 0444+00 1/1 0/0 0/0 .text            create__8daE_BG_cFv */
 int daE_BG_c::create() {
     fopAcM_ct(this, daE_BG_c);
 
@@ -1446,12 +1410,10 @@ int daE_BG_c::create() {
     return loadResult;
 }
 
-/* 8068A17C-8068A19C 004A5C 0020+00 1/0 0/0 0/0 .text            daE_BG_Create__FP8daE_BG_c */
 static int daE_BG_Create(daE_BG_c* i_this) {
     return i_this->create();
 }
 
-/* 8068A40C-8068A42C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BG_Method */
 static actor_method_class l_daE_BG_Method = {
     (process_method_func)daE_BG_Create,
     (process_method_func)daE_BG_Delete,
@@ -1460,7 +1422,6 @@ static actor_method_class l_daE_BG_Method = {
     (process_method_func)daE_BG_Draw,
 };
 
-/* 8068A42C-8068A45C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BG */
 extern actor_process_profile_definition g_profile_E_BG = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp
index c721115fce..352d8a0e05 100644
--- a/src/d/actor/d_a_e_bi.cpp
+++ b/src/d/actor/d_a_e_bi.cpp
@@ -14,8 +14,8 @@
 
 class daE_BI_HIO_c : public JORReflexible {
 public:
-    /* 8068A5EC */ daE_BI_HIO_c();
-    /* 8068D2DC */ virtual ~daE_BI_HIO_c() {}
+    daE_BI_HIO_c();
+    virtual ~daE_BI_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -55,7 +55,6 @@ enum Action {
     /* 0x7 */ ACTION_DISAP,
 };
 
-/* 8068A5EC-8068A634 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_BI_HIO_cFv */
 daE_BI_HIO_c::daE_BI_HIO_c() {
     field_0x4 = -1;
     basic_size = 1.0f;
@@ -65,13 +64,11 @@ daE_BI_HIO_c::daE_BI_HIO_c() {
     movement_spd = 10.0f;
 }
 
-/* 8068A634-8068A6E0 000134 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_bi_classifUcf */
 static void anm_init(e_bi_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_BI", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 8068A6E0-8068A90C 0001E0 022C+00 1/0 0/0 0/0 .text            daE_BI_Draw__FP10e_bi_class */
 static int daE_BI_Draw(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -111,7 +108,6 @@ static int daE_BI_Draw(e_bi_class* i_this) {
     return 1;
 }
 
-/* 8068A90C-8068A96C 00040C 0060+00 3/3 0/0 0/0 .text            pl_check__FP10e_bi_classf */
 static BOOL pl_check(e_bi_class* i_this, f32 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -127,7 +123,6 @@ static BOOL pl_check(e_bi_class* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 8068A96C-8068ABD8 00046C 026C+00 1/1 0/0 0/0 .text            damage_check__FP10e_bi_class */
 static void damage_check(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* actor_p = dComIfGp_getPlayer(0);
@@ -186,15 +181,12 @@ static void damage_check(e_bi_class* i_this) {
     }
 }
 
-/* 8068DB1C-8068DB20 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 8068DB1C 0001+00 data_8068DB1C @1009 */
 /* 8068DB1D 0003+00 data_8068DB1D None */
 static u8 l_initHIO;
 
-/* 8068DB2C-8068DB48 000054 001C+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_BI_HIO_c l_HIO;
 
-/* 8068ABD8-8068AED0 0006D8 02F8+00 1/1 0/0 0/0 .text            e_bi_wait__FP10e_bi_class */
 static void e_bi_wait(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp28;
@@ -241,7 +233,6 @@ static void e_bi_wait(e_bi_class* i_this) {
     }
 }
 
-/* 8068AED0-8068B068 0009D0 0198+00 1/1 0/0 0/0 .text            e_bi_up__FP10e_bi_class */
 static void e_bi_up(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -279,7 +270,6 @@ static void e_bi_up(e_bi_class* i_this) {
     }
 }
 
-/* 8068B068-8068B428 000B68 03C0+00 1/1 0/0 0/0 .text            e_bi_move__FP10e_bi_class */
 static void e_bi_move(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp40, sp4c;
@@ -345,7 +335,6 @@ static void e_bi_move(e_bi_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 4, 0x2000);
 }
 
-/* 8068B428-8068B764 000F28 033C+00 1/1 0/0 0/0 .text            e_bi_ex__FP10e_bi_class */
 static void e_bi_ex(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp48, sp54;
@@ -425,7 +414,6 @@ static void e_bi_ex(e_bi_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.y, a_this->current.angle.y, 4, 0x2000);
 }
 
-/* 8068B764-8068B938 001264 01D4+00 1/1 0/0 0/0 .text            e_bi_water__FP10e_bi_class */
 static void e_bi_water(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp34, sp40;
@@ -473,7 +461,6 @@ static void e_bi_water(e_bi_class* i_this) {
     }
 }
 
-/* 8068B938-8068BA28 001438 00F0+00 1/1 0/0 0/0 .text            e_bi_disap__FP10e_bi_class */
 static void e_bi_disap(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -500,7 +487,6 @@ static void e_bi_disap(e_bi_class* i_this) {
     i_this->mpModelMorf->setFrame(i_this->field_0x660);
 }
 
-/* 8068BA28-8068BAE0 001528 00B8+00 1/1 0/0 0/0 .text            water_check__FP10e_bi_class */
 static BOOL water_check(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     Vec i_pos;
@@ -519,7 +505,6 @@ static BOOL water_check(e_bi_class* i_this) {
     return FALSE;
 }
 
-/* 8068BAE0-8068C068 0015E0 0588+00 2/1 0/0 0/0 .text            action__FP10e_bi_class */
 static void action(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -660,7 +645,6 @@ static void action(e_bi_class* i_this) {
     setMidnaBindEffect(&i_this->actor, &i_this->mSound, &a_this->eyePos, &i_effSize);
 }
 
-/* 8068C068-8068C1E8 001B68 0180+00 1/1 0/0 0/0 .text            s_fw_sub__FPvPv */
 static void* s_fw_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FW) {
         cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos;
@@ -672,7 +656,6 @@ static void* s_fw_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8068C1E8-8068C350 001CE8 0168+00 1/1 0/0 0/0 .text            ride_movebg_init__FP10e_bi_class */
 static void ride_movebg_init(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp74, sp80;
@@ -697,7 +680,6 @@ static void ride_movebg_init(e_bi_class* i_this) {
     }
 }
 
-/* 8068C3C8-8068CA98 001EC8 06D0+00 2/1 0/0 0/0 .text            daE_BI_Execute__FP10e_bi_class */
 static int daE_BI_Execute(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -850,12 +832,10 @@ static int daE_BI_Execute(e_bi_class* i_this) {
     return 1;
 }
 
-/* 8068CA98-8068CAA0 002598 0008+00 1/0 0/0 0/0 .text            daE_BI_IsDelete__FP10e_bi_class */
 static int daE_BI_IsDelete(e_bi_class* i_this) {
     return 1;
 }
 
-/* 8068CAA0-8068CB08 0025A0 0068+00 1/0 0/0 0/0 .text            daE_BI_Delete__FP10e_bi_class */
 static int daE_BI_Delete(e_bi_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     
@@ -872,7 +852,6 @@ static int daE_BI_Delete(e_bi_class* i_this) {
     return 1;
 }
 
-/* 8068CB08-8068CC00 002608 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_bi_class* i_this = (e_bi_class*)a_this;
 
@@ -886,7 +865,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 8068CC00-8068D080 002700 0480+00 1/0 0/0 0/0 .text            daE_BI_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_BI_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, e_bi_class);
     e_bi_class* i_this = (e_bi_class*)a_this;
@@ -1007,7 +985,6 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 8068D9DC-8068D9FC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BI_Method */
 static actor_method_class l_daE_BI_Method = {
     (process_method_func)daE_BI_Create,
     (process_method_func)daE_BI_Delete,
@@ -1016,7 +993,6 @@ static actor_method_class l_daE_BI_Method = {
     (process_method_func)daE_BI_Draw,
 };
 
-/* 8068D9FC-8068DA2C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BI */
 extern actor_process_profile_definition g_profile_E_BI = {
   fpcLy_CURRENT_e,        // mLayerID
   9,                      // mListID
diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp
index 3cded1250c..1f5ad45f58 100644
--- a/src/d/actor/d_a_e_bi_leaf.cpp
+++ b/src/d/actor/d_a_e_bi_leaf.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_e_bi_leaf.h"
 #include "d/d_com_inf_game.h"
 
-/* 8068DC58-8068DCD0 000078 0078+00 1/0 0/0 0/0 .text daE_BI_LEAF_Draw__FP15e_bi_leaf_class */
 static int daE_BI_LEAF_Draw(e_bi_leaf_class* i_this) {
     if (i_this->field_0x5b4 == 1) {
         return 1;
@@ -20,7 +19,6 @@ static int daE_BI_LEAF_Draw(e_bi_leaf_class* i_this) {
     return 1;
 }
 
-/* 8068DCD0-8068DDD0 0000F0 0100+00 1/1 0/0 0/0 .text            action__FP15e_bi_leaf_class */
 static void action(e_bi_leaf_class* i_this) {
     switch (i_this->mAction) {
     case 0:
@@ -53,7 +51,6 @@ static void action(e_bi_leaf_class* i_this) {
     }
 }
 
-/* 8068DDD0-8068DE68 0001F0 0098+00 2/1 0/0 0/0 .text daE_BI_LEAF_Execute__FP15e_bi_leaf_class */
 static int daE_BI_LEAF_Execute(e_bi_leaf_class* i_this) {
     if (i_this->mTimer != 0) {
         i_this->mTimer--;
@@ -71,18 +68,15 @@ static int daE_BI_LEAF_Execute(e_bi_leaf_class* i_this) {
     return 1;
 }
 
-/* 8068DE68-8068DE70 000288 0008+00 1/0 0/0 0/0 .text daE_BI_LEAF_IsDelete__FP15e_bi_leaf_class */
 static int daE_BI_LEAF_IsDelete(e_bi_leaf_class* i_this) {
     return 1;
 }
 
-/* 8068DE70-8068DEA0 000290 0030+00 1/0 0/0 0/0 .text daE_BI_LEAF_Delete__FP15e_bi_leaf_class */
 static int daE_BI_LEAF_Delete(e_bi_leaf_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_BI");
     return 1;
 }
 
-/* 8068DEA0-8068DF24 0002C0 0084+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_bi_leaf_class* a_this = static_cast<e_bi_leaf_class*>(i_this);
 
@@ -99,8 +93,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8068DF24-8068DFD8 000344 00B4+00 1/0 0/0 0/0 .text            daE_BI_LEAF_Create__FP10fopAc_ac_c
- */
 static int daE_BI_LEAF_Create(fopAc_ac_c* i_this) {
     e_bi_leaf_class* a_this = static_cast<e_bi_leaf_class*>(i_this);
     fopAcM_ct(a_this, e_bi_leaf_class);
@@ -124,14 +116,12 @@ static int daE_BI_LEAF_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8068DFE8-8068E008 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BI_LEAF_Method */
 static actor_method_class l_daE_BI_LEAF_Method = {
     (process_method_func)daE_BI_LEAF_Create,  (process_method_func)daE_BI_LEAF_Delete,
     (process_method_func)daE_BI_LEAF_Execute, (process_method_func)daE_BI_LEAF_IsDelete,
     (process_method_func)daE_BI_LEAF_Draw,
 };
 
-/* 8068E008-8068E038 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BI_LEAF */
 extern actor_process_profile_definition g_profile_E_BI_LEAF = {
     fpcLy_CURRENT_e,
     9,
diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp
index 5ef0769af6..1abedf4744 100644
--- a/src/d/actor/d_a_e_bs.cpp
+++ b/src/d/actor/d_a_e_bs.cpp
@@ -10,8 +10,8 @@
 
 class daE_BS_HIO_c : public JORReflexible {
 public:
-    /* 8068E12C */ daE_BS_HIO_c();
-    /* 8069091C */ virtual ~daE_BS_HIO_c() {}
+    daE_BS_HIO_c();
+    virtual ~daE_BS_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -32,7 +32,6 @@ enum daE_BS_ACTION {
     ACTION_DAMAGE,
 };
 
-/* 8068E12C-8068E178 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__12daE_BS_HIO_cFv */
 daE_BS_HIO_c::daE_BS_HIO_c() {
     id = -1;
     base_size = 1.0f;
@@ -43,12 +42,10 @@ daE_BS_HIO_c::daE_BS_HIO_c() {
     battle_start_range = 200.0f;
 }
 
-/* 8068E178-8068E1F4 000138 007C+00 1/1 0/0 0/0 .text            wepon_anm_init__FP10e_bs_classi */
 static void wepon_anm_init(e_bs_class* i_this, int i_anm) {
     i_this->weponModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_BS", i_anm), 2, 5.0f, 1.0f, 0.0f, -1.0f, NULL);
 }
 
-/* 8068E1F4-8068E2D4 0001B4 00E0+00 5/5 0/0 0/0 .text            anm_init__FP10e_bs_classifUcf */
 static void anm_init(e_bs_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_BS", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->anm = i_anm;
@@ -60,7 +57,6 @@ static void anm_init(e_bs_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i
     }
 }
 
-/* 8068E2D4-8068E3D4 000294 0100+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -83,7 +79,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8068E3D4-8068E4F0 000394 011C+00 1/0 0/0 0/0 .text            daE_BS_Draw__FP10e_bs_class */
 static int daE_BS_Draw(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -107,7 +102,6 @@ static int daE_BS_Draw(e_bs_class* i_this) {
     return 1;
 }
 
-/* 8068E4F0-8068E534 0004B0 0044+00 1/1 0/0 0/0 .text            player_way_check__FP10e_bs_class */
 static BOOL player_way_check(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -124,7 +118,6 @@ static BOOL player_way_check(e_bs_class* i_this) {
     return TRUE;
 }
 
-/* 8068E534-8068E644 0004F4 0110+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_bs_classff */
 static BOOL way_bg_check(e_bs_class* i_this, f32 i_dist, f32 i_height) {
     fopAc_ac_c* actor = &i_this->enemy;
     dBgS_LinChk linchk;
@@ -150,7 +143,6 @@ static BOOL way_bg_check(e_bs_class* i_this, f32 i_dist, f32 i_height) {
     return FALSE;
 }
 
-/* 8068E644-8068E708 000604 00C4+00 2/2 0/0 0/0 .text            pl_check__FP10e_bs_classfs */
 static int pl_check(e_bs_class* i_this, f32 i_range, s16 i_angle) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -171,7 +163,6 @@ static int pl_check(e_bs_class* i_this, f32 i_range, s16 i_angle) {
     return 0;
 }
 
-/* 8068E708-8068E8C4 0006C8 01BC+00 1/1 0/0 0/0 .text            e_bs_appear__FP10e_bs_class */
 static void e_bs_appear(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -207,13 +198,10 @@ static void e_bs_appear(e_bs_class* i_this) {
     }
 }
 
-/* 80691090-80691094 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806910A0-806910C0 000018 0020+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_BS_HIO_c l_HIO;
 
-/* 8068E8C4-8068EB50 000884 028C+00 1/1 0/0 0/0 .text            e_bs_normal__FP10e_bs_class */
 static void e_bs_normal(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp28;
@@ -275,7 +263,6 @@ static void e_bs_normal(e_bs_class* i_this) {
     }
 }
 
-/* 8068EB50-8068EF2C 000B10 03DC+00 2/1 0/0 0/0 .text            e_bs_fight_run__FP10e_bs_class */
 static void e_bs_fight_run(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp18;
@@ -366,7 +353,6 @@ static void e_bs_fight_run(e_bs_class* i_this) {
     i_this->field_0x6a8 = 1;
 }
 
-/* 8068EF2C-8068EF8C 000EEC 0060+00 1/1 0/0 0/0 .text            at_hit_check__FP10e_bs_class */
 static fopAc_ac_c* at_hit_check(e_bs_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -381,7 +367,6 @@ static fopAc_ac_c* at_hit_check(e_bs_class* i_this) {
     return NULL;
 }
 
-/* 8068EF8C-8068F15C 000F4C 01D0+00 1/1 0/0 0/0 .text            e_bs_attack__FP10e_bs_class */
 static void e_bs_attack(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp18;
@@ -427,7 +412,6 @@ static void e_bs_attack(e_bs_class* i_this) {
     }
 }
 
-/* 8068F15C-8068F208 00111C 00AC+00 1/1 0/0 0/0 .text            e_bs_damage__FP10e_bs_class */
 static void e_bs_damage(e_bs_class* i_this) {
     switch (i_this->mode) {
     case 0:
@@ -443,7 +427,6 @@ static void e_bs_damage(e_bs_class* i_this) {
     }
 }
 
-/* 8068F208-8068F4C4 0011C8 02BC+00 1/1 0/0 0/0 .text            damage_check__FP10e_bs_class */
 static void damage_check(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -511,7 +494,6 @@ static void damage_check(e_bs_class* i_this) {
     }
 }
 
-/* 8068F4C4-8068FA04 001484 0540+00 1/1 0/0 0/0 .text            action__FP10e_bs_class */
 static void action(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -663,7 +645,6 @@ static void action(e_bs_class* i_this) {
     cLib_addCalcAngleS2(&i_this->head_rot_y, i_this->field_0x6ae, 4, 0x400);
 }
 
-/* 8068FA04-8068FBDC 0019C4 01D8+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_bs_class */
 static void anm_se_set(e_bs_class* i_this) {
     s8 do_sound = FALSE;
 
@@ -698,7 +679,6 @@ static void anm_se_set(e_bs_class* i_this) {
     }
 }
 
-/* 8068FBDC-8068FFA8 001B9C 03CC+00 2/1 0/0 0/0 .text            daE_BS_Execute__FP10e_bs_class */
 static int daE_BS_Execute(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp5C;
@@ -793,12 +773,10 @@ static int daE_BS_Execute(e_bs_class* i_this) {
     return 1;
 }
 
-/* 8068FFA8-8068FFB0 001F68 0008+00 1/0 0/0 0/0 .text            daE_BS_IsDelete__FP10e_bs_class */
 static int daE_BS_IsDelete(e_bs_class* i_this) {
     return 1;
 }
 
-/* 8068FFB0-80690018 001F70 0068+00 1/0 0/0 0/0 .text            daE_BS_Delete__FP10e_bs_class */
 static int daE_BS_Delete(e_bs_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -816,7 +794,6 @@ static int daE_BS_Delete(e_bs_class* i_this) {
     return 1;
 }
 
-/* 80690018-80690224 001FD8 020C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_bs_class* a_this = (e_bs_class*)i_this;
 
@@ -842,7 +819,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80690224-806905B8 0021E4 0394+00 1/0 0/0 0/0 .text            daE_BS_Create__FP10fopAc_ac_c */
 static int daE_BS_Create(fopAc_ac_c* i_this) {
     e_bs_class* a_this = (e_bs_class*)i_this;
     fopAcM_ct(i_this, e_bs_class);
@@ -944,7 +920,6 @@ static int daE_BS_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80690FC8-80690FE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BS_Method */
 static actor_method_class l_daE_BS_Method = {
     (process_method_func)daE_BS_Create,
     (process_method_func)daE_BS_Delete,
@@ -953,7 +928,6 @@ static actor_method_class l_daE_BS_Method = {
     (process_method_func)daE_BS_Draw,
 };
 
-/* 80690FE8-80691018 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BS */
 extern actor_process_profile_definition g_profile_E_BS = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp
index cc19217ca4..eb4ec7ba0f 100644
--- a/src/d/actor/d_a_e_bu.cpp
+++ b/src/d/actor/d_a_e_bu.cpp
@@ -10,8 +10,8 @@
 
 class daE_BU_HIO_c : public JORReflexible {
 public:
-    /* 806911AC */ daE_BU_HIO_c();
-    /* 806941D4 */ virtual ~daE_BU_HIO_c() {}
+    daE_BU_HIO_c();
+    virtual ~daE_BU_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -41,7 +41,6 @@ enum daE_BU_ACTION {
     ACTION_DEAD = 21,
 };
 
-/* 806911AC-806911F0 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__12daE_BU_HIO_cFv */
 daE_BU_HIO_c::daE_BU_HIO_c() {
     id = -1;
     base_size = 1.5f;
@@ -51,7 +50,6 @@ daE_BU_HIO_c::daE_BU_HIO_c() {
     dash_speed = 40.0f;
 }
 
-/* 806911F0-80691250 000130 0060+00 1/1 0/0 0/0 .text            bu_disappear__FP10fopAc_ac_c */
 static void bu_disappear(fopAc_ac_c* i_this) {
     fopAcM_createDisappear(i_this, &i_this->current.pos, 6, 0, 0x1C);
 
@@ -61,13 +59,11 @@ static void bu_disappear(fopAc_ac_c* i_this) {
     }
 }
 
-/* 80691250-806912FC 000190 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_bu_classifUcf */
 static void anm_init(e_bu_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_BU", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->anm = i_anm;
 }
 
-/* 806912FC-80691458 00023C 015C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -96,13 +92,10 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80694958-8069495C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80694968-80694984 000018 001C+00 11/11 0/0 0/0 .bss             l_HIO */
 static daE_BU_HIO_c l_HIO;
 
-/* 80691458-80691504 000398 00AC+00 1/0 0/0 0/0 .text            daE_BU_Draw__FP10e_bu_class */
 static int daE_BU_Draw(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -115,8 +108,6 @@ static int daE_BU_Draw(e_bu_class* i_this) {
     return 1;
 }
 
-/* 80691504-806915DC 000444 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_bu_classP10fopAc_ac_c
- */
 static BOOL other_bg_check(e_bu_class* i_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* actor = &i_this->enemy;
     dBgS_LinChk linchk;
@@ -138,7 +129,6 @@ static BOOL other_bg_check(e_bu_class* i_this, fopAc_ac_c* i_other) {
     return FALSE;
 }
 
-/* 806915DC-80691660 00051C 0084+00 5/5 0/0 0/0 .text            pl_check__FP10e_bu_classfs */
 static BOOL pl_check(e_bu_class* i_this, f32 i_range, s16 i_angle) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -153,7 +143,6 @@ static BOOL pl_check(e_bu_class* i_this, f32 i_range, s16 i_angle) {
     return FALSE;
 }
 
-/* 80691660-8069182C 0005A0 01CC+00 1/1 0/0 0/0 .text            damage_check__FP10e_bu_class */
 static void damage_check(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -204,7 +193,6 @@ static void damage_check(e_bu_class* i_this) {
     }
 }
 
-/* 8069182C-80691A94 00076C 0268+00 2/2 0/0 0/0 .text            path_check__FP10e_bu_class */
 static BOOL path_check(e_bu_class* i_this) {
     static u8 check_index[255];
 
@@ -274,7 +262,6 @@ static BOOL path_check(e_bu_class* i_this) {
     return FALSE;
 }
 
-/* 80691A94-80691C24 0009D4 0190+00 4/4 0/0 0/0 .text            fly_move__FP10e_bu_class */
 static void fly_move(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp8;
@@ -299,7 +286,6 @@ static void fly_move(e_bu_class* i_this) {
     actor->current.pos += actor->speed;
 }
 
-/* 80691C24-80691DC4 000B64 01A0+00 1/1 0/0 0/0 .text            e_bu_wait__FP10e_bu_class */
 static void e_bu_wait(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     int anm_frame = i_this->modelMorf->getFrame();
@@ -342,7 +328,6 @@ static void e_bu_wait(e_bu_class* i_this) {
     }
 }
 
-/* 80691DC4-80691F10 000D04 014C+00 1/1 0/0 0/0 .text            e_bu_fight_fly__FP10e_bu_class */
 static void e_bu_fight_fly(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -373,7 +358,6 @@ static void e_bu_fight_fly(e_bu_class* i_this) {
     fly_move(i_this);
 }
 
-/* 80691F10-8069222C 000E50 031C+00 1/1 0/0 0/0 .text            e_bu_fight__FP10e_bu_class */
 static void e_bu_fight(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -433,7 +417,6 @@ static void e_bu_fight(e_bu_class* i_this) {
     }
 }
 
-/* 8069222C-8069243C 00116C 0210+00 1/1 0/0 0/0 .text            e_bu_attack__FP10e_bu_class */
 static void e_bu_attack(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -487,7 +470,6 @@ static void e_bu_attack(e_bu_class* i_this) {
     fly_move(i_this);
 }
 
-/* 8069243C-8069262C 00137C 01F0+00 1/1 0/0 0/0 .text            e_bu_fly__FP10e_bu_class */
 static void e_bu_fly(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -525,7 +507,6 @@ static void e_bu_fly(e_bu_class* i_this) {
     }
 }
 
-/* 8069262C-80692930 00156C 0304+00 1/1 0/0 0/0 .text            e_bu_path_fly__FP10e_bu_class */
 static void e_bu_path_fly(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -584,7 +565,6 @@ static void e_bu_path_fly(e_bu_class* i_this) {
     }
 }
 
-/* 80692930-80692AF4 001870 01C4+00 1/1 0/0 0/0 .text            e_bu_chance__FP10e_bu_class */
 static s8 e_bu_chance(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     s8 is_smoke_eff = FALSE;
@@ -629,7 +609,6 @@ static s8 e_bu_chance(e_bu_class* i_this) {
     return is_smoke_eff;
 }
 
-/* 80692AF4-80693074 001A34 0580+00 2/1 0/0 0/0 .text            e_bu_head__FP10e_bu_class */
 static s8 e_bu_head(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp20;
@@ -759,7 +738,6 @@ static s8 e_bu_head(e_bu_class* i_this) {
     return is_smoke_eff;
 }
 
-/* 80693074-80693528 001FB4 04B4+00 2/1 0/0 0/0 .text            action__FP10e_bu_class */
 static s8 action(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -909,7 +887,6 @@ static s8 action(e_bu_class* i_this) {
     return is_mtrl_eff;
 }
 
-/* 80693528-80693A30 002468 0508+00 2/1 0/0 0/0 .text            daE_BU_Execute__FP10e_bu_class */
 static int daE_BU_Execute(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp34;
@@ -1006,12 +983,10 @@ static int daE_BU_Execute(e_bu_class* i_this) {
     return 1;
 }
 
-/* 80693A30-80693A38 002970 0008+00 1/0 0/0 0/0 .text            daE_BU_IsDelete__FP10e_bu_class */
 static int daE_BU_IsDelete(e_bu_class* i_this) {
     return 1;
 }
 
-/* 80693A38-80693AA0 002978 0068+00 1/0 0/0 0/0 .text            daE_BU_Delete__FP10e_bu_class */
 static int daE_BU_Delete(e_bu_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -1029,7 +1004,6 @@ static int daE_BU_Delete(e_bu_class* i_this) {
     return 1;
 }
 
-/* 80693AA0-80693BD4 0029E0 0134+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_bu_class* a_this = (e_bu_class*)i_this;
 
@@ -1048,7 +1022,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80693BD4-80693FC0 002B14 03EC+00 1/0 0/0 0/0 .text            daE_BU_Create__FP10fopAc_ac_c */
 static int daE_BU_Create(fopAc_ac_c* i_this) {
     e_bu_class* a_this = (e_bu_class*)i_this;
     fopAcM_ct(i_this, e_bu_class);
@@ -1154,7 +1127,6 @@ static int daE_BU_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80694890-806948B0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_BU_Method */
 static actor_method_class l_daE_BU_Method = {
     (process_method_func)daE_BU_Create,
     (process_method_func)daE_BU_Delete,
@@ -1163,7 +1135,6 @@ static actor_method_class l_daE_BU_Method = {
     (process_method_func)daE_BU_Draw,
 };
 
-/* 806948B0-806948E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BU */
 extern actor_process_profile_definition g_profile_E_BU = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp
index c6d941628d..8089ea8704 100644
--- a/src/d/actor/d_a_e_bug.cpp
+++ b/src/d/actor/d_a_e_bug.cpp
@@ -17,29 +17,24 @@ enum E_bug_RES_File_ID {
     /* 0x4 */ BMDG_MU05,
 };
 
-/* 80694B8C-80694BBC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__13daE_Bug_HIO_cFv */
 daE_Bug_HIO_c::daE_Bug_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.5f;
     field_0xc = 1.0f;
 }
 
-/* 80697E6C-80697E70 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 80697E6C 0001+00 data_80697E6C @1009 */
 /* 80697E6D 0003+00 data_80697E6D None */
 static u8 l_initHIO;
 
-/* 80697E7C-80697E8C 000054 0010+00 4/6 0/0 0/0 .bss             l_HIO */
 static daE_Bug_HIO_c l_HIO;
 
-/* 80697E8C-80697E90 -00001 0004+00 4/8 0/0 0/0 .bss             None */
 /* 80697E8C 0001+00 data_80697E8C None */
 static s8 l_roomNo;
 
 /* 80697E8D 0003+00 data_80697E8D None */
 static s8 data_80697E8D;
 
-/* 80694BBC-80694CC8 00011C 010C+00 1/0 0/0 0/0 .text            daE_Bug_Draw__FP11e_bug_class */
 static int daE_Bug_Draw(e_bug_class* i_this) {
     bug_s* bugs = i_this->Bug_s;
 
@@ -62,7 +57,6 @@ static int daE_Bug_Draw(e_bug_class* i_this) {
     return 1;
 }
 
-/* 80694CC8-80694F58 000228 0290+00 3/3 0/0 0/0 .text            simple_bg_check__FP5bug_si */
 static int simple_bg_check(bug_s* i_this, int param_2) {
     dBgS_LinChk lin_chk;
     cXyz start, end, spc0, spcc;
@@ -93,7 +87,6 @@ static int simple_bg_check(bug_s* i_this, int param_2) {
     return iVar1;
 }
 
-/* 80694F94-8069506C 0004F4 00D8+00 1/1 0/0 0/0 .text            bug_mtxset__FP5bug_s */
 static void bug_mtxset(bug_s* i_this) {
     mDoMtx_stack_c::transS(i_this->field_0x18.x, i_this->field_0x18.y, i_this->field_0x18.z);
     mDoMtx_stack_c::XrotM(i_this->field_0x44);
@@ -109,7 +102,6 @@ static void bug_mtxset(bug_s* i_this) {
     }
 }
 
-/* 8069506C-806951C8 0005CC 015C+00 1/1 0/0 0/0 .text            bug_mtxset_stick__FP5bug_s */
 static void bug_mtxset_stick(bug_s* i_this) {
     cXyz sp2c;
     mDoMtx_stack_c::transS(i_this->field_0x18.x, i_this->field_0x18.y, i_this->field_0x18.z);
@@ -134,7 +126,6 @@ static void bug_mtxset_stick(bug_s* i_this) {
     }
 }
 
-/* 806951C8-806953E4 000728 021C+00 1/1 0/0 0/0 .text            bug_mtxset_stickW__FP5bug_s */
 static void bug_mtxset_stickW(bug_s* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp38, sp44, sp50;
@@ -167,7 +158,6 @@ static void bug_mtxset_stickW(bug_s* i_this) {
     }
 }
 
-/* 806953E4-806954D4 000944 00F0+00 1/1 0/0 0/0 .text            bug_mtxset_fail__FP5bug_s */
 static void bug_mtxset_fail(bug_s* i_this) {
     mDoMtx_stack_c::transS(i_this->field_0x18.x, i_this->field_0x18.y, i_this->field_0x18.z);
     mDoMtx_stack_c::XrotM(i_this->field_0x44);
@@ -184,7 +174,6 @@ static void bug_mtxset_fail(bug_s* i_this) {
     }
 }
 
-/* 806954D4-806957DC 000A34 0308+00 1/1 0/0 0/0 .text            bug_ground_ang_set__FP5bug_s */
 static void bug_ground_ang_set(bug_s* i_this) {
     dBgS_LinChk lin_chk;
     cXyz sp8c, end, cross;
@@ -239,7 +228,6 @@ static void bug_ground_ang_set(bug_s* i_this) {
     }
 }
 
-/* 806957DC-806958E8 000D3C 010C+00 2/2 0/0 0/0 .text            bug_action__FP11e_bug_classP5bug_s */
 static int bug_action(e_bug_class* a_this, bug_s* i_this) {
     int rv = 0;
     i_this->field_0x18.x += i_this->field_0x30.x;
@@ -269,16 +257,12 @@ static int bug_action(e_bug_class* a_this, bug_s* i_this) {
     return rv;
 }
 
-/* 80697E9C-80697EA8 000074 000C+00 1/5 0/0 0/0 .bss             at_pos */
 static cXyz at_pos;
 
-/* 80697EA8-80697EAC 000080 0004+00 0/3 0/0 0/0 .bss             at_size */
 static f32 at_size;
 
-/* 80697EAC-80697EB0 000084 0004+00 2/3 0/0 0/0 .bss             None */
 static s8 data_80697EAC;
 
-/* 806958E8-80695BE4 000E48 02FC+00 1/1 0/0 0/0 .text            bug_stick__FP5bug_s */
 static void bug_stick(bug_s* i_this) {
     cXyz sp30, sp3c, sp48;
     daPy_py_c* player = daPy_getLinkPlayerActorClass();
@@ -327,7 +311,6 @@ static void bug_stick(bug_s* i_this) {
     }
 }
 
-/* 80695BE4-80695DE8 001144 0204+00 1/1 0/0 0/0 .text            bug_stickW__FP5bug_s */
 static void bug_stickW(bug_s* i_this) {
     cXyz sp34, sp40, sp4c;
 
@@ -359,7 +342,6 @@ static void bug_stickW(bug_s* i_this) {
     i_this->field_0x3c.y = i_this->field_0x48 + 0x8000;
 }
 
-/* 80695DE8-80695ECC 001348 00E4+00 1/1 0/0 0/0 .text            wind_move__FP5bug_s */
 static void wind_move(bug_s* i_this) {
     s16 sVar1 = i_this->field_0x52 * -0x1700;
     i_this->field_0x3c.x -= 0xD00;
@@ -376,7 +358,6 @@ static void wind_move(bug_s* i_this) {
     }
 }
 
-/* 80695ECC-80695FCC 00142C 0100+00 1/1 0/0 0/0 .text            bug_fail__FP11e_bug_classP5bug_s */
 static void bug_fail(e_bug_class* a_this, bug_s* i_this) {
     i_this->field_0x53 = bug_action(a_this, i_this);
 
@@ -403,7 +384,6 @@ static void bug_fail(e_bug_class* a_this, bug_s* i_this) {
     }
 }
 
-/* 80695FCC-806965B4 00152C 05E8+00 1/1 0/0 0/0 .text damage_check__FP11e_bug_classP5bug_s */
 static void damage_check(e_bug_class* a_this, bug_s* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&a_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -484,7 +464,6 @@ static void damage_check(e_bug_class* a_this, bug_s* i_this) {
     }
 }
 
-/* 806965B4-80696828 001B14 0274+00 1/1 0/0 0/0 .text            set_wait__FP11e_bug_classP5bug_s */
 static void set_wait(e_bug_class* a_this, bug_s* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp40;
@@ -520,7 +499,6 @@ static void set_wait(e_bug_class* a_this, bug_s* i_this) {
     }
 }
 
-/* 80696828-80696E84 001D88 065C+00 1/1 0/0 0/0 .text            normal_move__FP11e_bug_classP5bug_s */
 static void normal_move(e_bug_class* a_this, bug_s* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp68, sp74;
@@ -627,7 +605,6 @@ static void normal_move(e_bug_class* a_this, bug_s* i_this) {
     }
 }
 
-/* 80696E84-80697160 0023E4 02DC+00 1/1 0/0 0/0 .text            bug_control__FP11e_bug_class */
 static void bug_control(e_bug_class* a_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&a_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -711,7 +688,6 @@ static void bug_control(e_bug_class* a_this) {
     }
 }
 
-/* 80697160-806971EC 0026C0 008C+00 1/1 0/0 0/0 .text            s_boom_sub__FPvPv */
 static void* s_boom_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && daPy_py_c::checkBoomerangCharge() && fopAcM_GetParam(i_actor) == 1) {
         data_80697E8D = 1;
@@ -722,7 +698,6 @@ static void* s_boom_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806971EC-80697294 00274C 00A8+00 1/1 0/0 0/0 .text            s_bomb_sub__FPvPv */
 static void* s_bomb_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && ((daNbomb_c*)i_actor)->checkExplodeNow()) {
         data_80697E8D = 2;
@@ -734,7 +709,6 @@ static void* s_bomb_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80697294-806975A0 0027F4 030C+00 2/1 0/0 0/0 .text            daE_Bug_Execute__FP11e_bug_class */
 static int daE_Bug_Execute(e_bug_class* i_this) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -776,12 +750,10 @@ static int daE_Bug_Execute(e_bug_class* i_this) {
     return 1;
 }
 
-/* 806975A0-806975A8 002B00 0008+00 1/0 0/0 0/0 .text            daE_Bug_IsDelete__FP11e_bug_class */
 static int daE_Bug_IsDelete(e_bug_class* i_this) {
     return 1;
 }
 
-/* 806975A8-806976B4 002B08 010C+00 1/0 0/0 0/0 .text            daE_Bug_Delete__FP11e_bug_class */
 static int daE_Bug_Delete(e_bug_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -809,7 +781,6 @@ static int daE_Bug_Delete(e_bug_class* i_this) {
     return 1;
 }
 
-/* 806976B4-806977A8 002C14 00F4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_bug_class* i_this = (e_bug_class*)a_this;
     
@@ -834,7 +805,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 806977A8-80697B4C 002D08 03A4+00 1/0 0/0 0/0 .text            daE_Bug_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) {
     e_bug_class* i_this = (e_bug_class*)a_this;
 
@@ -926,7 +896,6 @@ static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 80697DC8-80697DE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Bug_Method */
 static actor_method_class l_daE_Bug_Method = {
     (process_method_func)daE_Bug_Create,
     (process_method_func)daE_Bug_Delete,
@@ -935,7 +904,6 @@ static actor_method_class l_daE_Bug_Method = {
     (process_method_func)daE_Bug_Draw,
 };
 
-/* 80697DE8-80697E18 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_BUG */
 extern actor_process_profile_definition g_profile_E_BUG = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp
index ec53ea6428..4ee02f5626 100644
--- a/src/d/actor/d_a_e_cr.cpp
+++ b/src/d/actor/d_a_e_cr.cpp
@@ -11,8 +11,8 @@
 
 class daE_CR_HIO_c : public JORReflexible {
 public:
-    /* 8069800C */ daE_CR_HIO_c();
-    /* 806997F4 */ virtual ~daE_CR_HIO_c() {}
+    daE_CR_HIO_c();
+    virtual ~daE_CR_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -28,7 +28,6 @@ enum daE_CR_ACTION {
     ACTION_DAMAGE,
 };
 
-/* 8069800C-80698044 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__12daE_CR_HIO_cFv */
 daE_CR_HIO_c::daE_CR_HIO_c() {
     id = -1;
     base_size = 3.0f;
@@ -36,13 +35,11 @@ daE_CR_HIO_c::daE_CR_HIO_c() {
     pl_search_range = 400.0f;
 }
 
-/* 80698044-806980F0 000124 00AC+00 3/3 0/0 0/0 .text            anm_init__FP10e_cr_classifUcf */
 static void anm_init(e_cr_class* a_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     a_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_CR", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     a_this->anm = i_anm;
 }
 
-/* 806980F0-806981B4 0001D0 00C4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -61,7 +58,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806981B4-80698250 000294 009C+00 1/0 0/0 0/0 .text            daE_CR_Draw__FP10e_cr_class */
 static int daE_CR_Draw(e_cr_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -74,8 +70,6 @@ static int daE_CR_Draw(e_cr_class* a_this) {
     return 1;
 }
 
-/* 80698250-80698328 000330 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_cr_classP10fopAc_ac_c
- */
 static BOOL other_bg_check(e_cr_class* a_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* actor = &a_this->enemy;
     dBgS_LinChk linchk;
@@ -96,7 +90,6 @@ static BOOL other_bg_check(e_cr_class* a_this, fopAc_ac_c* i_other) {
     return FALSE;
 }
 
-/* 80698328-806983A4 000408 007C+00 1/1 0/0 0/0 .text            pl_check__FP10e_cr_classfs */
 static BOOL pl_check(e_cr_class* a_this, f32 i_range, s16 i_angle) {
     fopAc_ac_c* actor = &a_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -111,7 +104,6 @@ static BOOL pl_check(e_cr_class* a_this, f32 i_range, s16 i_angle) {
     return FALSE;
 }
 
-/* 806983A4-80698498 000484 00F4+00 1/1 0/0 0/0 .text            damage_check__FP10e_cr_class */
 static void damage_check(e_cr_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -146,7 +138,6 @@ static void damage_check(e_cr_class* a_this) {
     }
 }
 
-/* 80698498-806985A4 000578 010C+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_cr_classf */
 static BOOL way_bg_check(e_cr_class* a_this, f32 param_1) {
     fopAc_ac_c* actor = &a_this->enemy;
     dBgS_LinChk linchk;
@@ -171,13 +162,10 @@ static BOOL way_bg_check(e_cr_class* a_this, f32 param_1) {
     return FALSE;
 }
 
-/* 80699E88-80699E8C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80699E98-80699EAC 000018 0014+00 4/4 0/0 0/0 .bss             l_HIO */
 static daE_CR_HIO_c l_HIO;
 
-/* 806985A4-80698A5C 000684 04B8+00 1/1 0/0 0/0 .text            e_cr_move__FP10e_cr_class */
 static void e_cr_move(e_cr_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     int anm_frame = a_this->modelMorf->getFrame();
@@ -258,7 +246,6 @@ static void e_cr_move(e_cr_class* a_this) {
     }
 }
 
-/* 80698A5C-80698B80 000B3C 0124+00 1/1 0/0 0/0 .text            e_cr_s_damage__FP10e_cr_class */
 static void e_cr_s_damage(e_cr_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -286,7 +273,6 @@ static void e_cr_s_damage(e_cr_class* a_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 4.0f);
 }
 
-/* 80698B80-80698D6C 000C60 01EC+00 1/1 0/0 0/0 .text            e_cr_damage__FP10e_cr_class */
 static void e_cr_damage(e_cr_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -333,7 +319,6 @@ static void e_cr_damage(e_cr_class* a_this) {
     actor->shape_angle.y += a_this->field_0x68e;
 }
 
-/* 80698D6C-80698F88 000E4C 021C+00 1/1 0/0 0/0 .text            action__FP10e_cr_class */
 static void action(e_cr_class* a_this) {
     fopEn_enemy_c* actor = &a_this->enemy;
     cXyz mae;
@@ -403,7 +388,6 @@ static void action(e_cr_class* a_this) {
     setMidnaBindEffect(actor, &a_this->sound, &actor->eyePos, &effsize);
 }
 
-/* 80698F88-806991BC 001068 0234+00 2/1 0/0 0/0 .text            daE_CR_Execute__FP10e_cr_class */
 static int daE_CR_Execute(e_cr_class* a_this) {
     fopEn_enemy_c* actor = &a_this->enemy;
     cXyz sp18;
@@ -453,12 +437,10 @@ static int daE_CR_Execute(e_cr_class* a_this) {
     return 1;
 }
 
-/* 806991BC-806991C4 00129C 0008+00 1/0 0/0 0/0 .text            daE_CR_IsDelete__FP10e_cr_class */
 static int daE_CR_IsDelete(e_cr_class* a_this) {
     return 1;
 }
 
-/* 806991C4-8069922C 0012A4 0068+00 1/0 0/0 0/0 .text            daE_CR_Delete__FP10e_cr_class */
 static int daE_CR_Delete(e_cr_class* a_this) {
     fopEn_enemy_c* actor = &a_this->enemy;
     fpc_ProcID id = fopAcM_GetID(a_this);
@@ -476,7 +458,6 @@ static int daE_CR_Delete(e_cr_class* a_this) {
     return 1;
 }
 
-/* 8069922C-8069936C 00130C 0140+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_cr_class* a_this = (e_cr_class*)i_this;
 
@@ -497,7 +478,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8069936C-806995E0 00144C 0274+00 1/0 0/0 0/0 .text            daE_CR_Create__FP10fopAc_ac_c */
 static int daE_CR_Create(fopAc_ac_c* i_this) {
     e_cr_class* a_this = (e_cr_class*)i_this;
     fopAcM_ct(i_this, e_cr_class);
@@ -557,7 +537,6 @@ static int daE_CR_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80699DC4-80699DE4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_CR_Method */
 static actor_method_class l_daE_CR_Method = {
     (process_method_func)daE_CR_Create,
     (process_method_func)daE_CR_Delete,
@@ -566,7 +545,6 @@ static actor_method_class l_daE_CR_Method = {
     (process_method_func)daE_CR_Draw,
 };
 
-/* 80699DE4-80699E14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_CR */
 extern actor_process_profile_definition g_profile_E_CR = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp
index 6f63a44090..7afb24af11 100644
--- a/src/d/actor/d_a_e_cr_egg.cpp
+++ b/src/d/actor/d_a_e_cr_egg.cpp
@@ -10,8 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80699F38-80699FC8 000078 0090+00 1/0 0/0 0/0 .text            daE_CR_EGG_Draw__FP14e_cr_egg_class
- */
 static int daE_CR_EGG_Draw(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -23,8 +21,6 @@ static int daE_CR_EGG_Draw(e_cr_egg_class* a_this) {
     return 1;
 }
 
-/* 80699FC8-8069A258 000108 0290+00 1/1 0/0 0/0 .text            e_cr_egg_move__FP14e_cr_egg_class
- */
 static void e_cr_egg_move(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -72,7 +68,6 @@ static void e_cr_egg_move(e_cr_egg_class* a_this) {
     }
 }
 
-/* 8069A258-8069A378 000398 0120+00 1/1 0/0 0/0 .text            action__FP14e_cr_egg_class */
 static void action(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     cXyz mae;
@@ -103,7 +98,6 @@ static void action(e_cr_egg_class* a_this) {
     actor->old.pos.y += 20.0f;
 }
 
-/* 8069A378-8069A4C4 0004B8 014C+00 2/1 0/0 0/0 .text daE_CR_EGG_Execute__FP14e_cr_egg_class */
 static int daE_CR_EGG_Execute(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     cXyz sp2C;
@@ -139,12 +133,10 @@ static int daE_CR_EGG_Execute(e_cr_egg_class* a_this) {
     return 1;
 }
 
-/* 8069A4C4-8069A4CC 000604 0008+00 1/0 0/0 0/0 .text daE_CR_EGG_IsDelete__FP14e_cr_egg_class */
 static int daE_CR_EGG_IsDelete(e_cr_egg_class* a_this) {
     return 1;
 }
 
-/* 8069A4CC-8069A510 00060C 0044+00 1/0 0/0 0/0 .text daE_CR_EGG_Delete__FP14e_cr_egg_class */
 static int daE_CR_EGG_Delete(e_cr_egg_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -154,7 +146,6 @@ static int daE_CR_EGG_Delete(e_cr_egg_class* a_this) {
     return 1;
 }
 
-/* 8069A510-8069A57C 000650 006C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_cr_egg_class* a_this = (e_cr_egg_class*)i_this;
 
@@ -169,8 +160,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8069A57C-8069A7B4 0006BC 0238+00 1/0 0/0 0/0 .text            daE_CR_EGG_Create__FP10fopAc_ac_c
- */
 static int daE_CR_EGG_Create(fopAc_ac_c* i_this) {
     e_cr_egg_class* a_this = (e_cr_egg_class*)i_this;
     fopAcM_ct(i_this, e_cr_egg_class);
@@ -226,7 +215,6 @@ static int daE_CR_EGG_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8069A960-8069A980 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_CR_EGG_Method */
 static actor_method_class l_daE_CR_EGG_Method = {
     (process_method_func)daE_CR_EGG_Create,
     (process_method_func)daE_CR_EGG_Delete,
@@ -235,7 +223,6 @@ static actor_method_class l_daE_CR_EGG_Method = {
     (process_method_func)daE_CR_EGG_Draw,
 };
 
-/* 8069A980-8069A9B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_CR_EGG */
 extern actor_process_profile_definition g_profile_E_CR_EGG = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp
index b959d4415e..f29b02251b 100644
--- a/src/d/actor/d_a_e_db.cpp
+++ b/src/d/actor/d_a_e_db.cpp
@@ -12,8 +12,8 @@
 
 class daE_DB_HIO_c : public JORReflexible {
 public:
-    /* 8069AAEC */ daE_DB_HIO_c();
-    /* 806A13D8 */ virtual ~daE_DB_HIO_c() {}
+    daE_DB_HIO_c();
+    virtual ~daE_DB_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -42,7 +42,6 @@ enum daE_DB_ACTION {
     ACTION_E_DEAD,
 };
 
-/* 8069AAEC-8069AB34 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_DB_HIO_cFv */
 daE_DB_HIO_c::daE_DB_HIO_c() {
     id = -1;
     base_size = 1.0f;
@@ -52,13 +51,11 @@ daE_DB_HIO_c::daE_DB_HIO_c() {
     attack_freq = 30;
 }
 
-/* 8069AB34-8069ABE0 000134 00AC+00 12/12 0/0 0/0 .text            anm_init__FP10e_db_classifUcf */
 static void anm_init(e_db_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_db", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->anm = i_anm;
 }
 
-/* 8069ABE0-8069ACB8 0001E0 00D8+00 11/11 0/0 0/0 .text leaf_anm_init__FP10e_db_classifUcf */
 static BOOL leaf_anm_init(e_db_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     e_db_leaf_class* pleaf = (e_db_leaf_class*)fopAcM_SearchByID(i_this->leaf_actor_id);
     if (pleaf != NULL) {
@@ -69,7 +66,6 @@ static BOOL leaf_anm_init(e_db_class* i_this, int i_anm, f32 i_morf, u8 i_mode,
     return FALSE;
 }
 
-/* 8069ACB8-8069AFB4 0002B8 02FC+00 1/0 0/0 0/0 .text            daE_DB_Draw__FP10e_db_class */
 static int daE_DB_Draw(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -121,7 +117,6 @@ static int daE_DB_Draw(e_db_class* i_this) {
     return 1;
 }
 
-/* 8069AFB4-8069B000 0005B4 004C+00 2/2 0/0 0/0 .text            pl_check__FP10e_db_classf */
 static BOOL pl_check(e_db_class* i_this, f32 i_range) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -133,7 +128,6 @@ static BOOL pl_check(e_db_class* i_this, f32 i_range) {
     }
 }
 
-/* 8069B000-8069B468 000600 0468+00 1/1 0/0 0/0 .text            damage_check__FP10e_db_class */
 static void damage_check(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -271,13 +265,10 @@ static void damage_check(e_db_class* i_this) {
     }
 }
 
-/* 806A1D98-806A1D9C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806A1DA8-806A1DC0 000018 0018+00 11/11 0/0 0/0 .bss             l_HIO */
 static daE_DB_HIO_c l_HIO;
 
-/* 8069B468-8069B7C0 000A68 0358+00 1/1 0/0 0/0 .text            e_db_stay__FP10e_db_class */
 static void e_db_stay(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -337,7 +328,6 @@ static void e_db_stay(e_db_class* i_this) {
     }
 }
 
-/* 8069B7C0-8069BA80 000DC0 02C0+00 1/1 0/0 0/0 .text            e_db_appear__FP10e_db_class */
 static void e_db_appear(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     int anm_frame = i_this->modelMorf->getFrame();
@@ -389,7 +379,6 @@ static void e_db_appear(e_db_class* i_this) {
     cLib_addCalc2(&i_this->size, l_HIO.appear_size, 1.0f, 0.1f);
 }
 
-/* 8069BA80-8069BC4C 001080 01CC+00 1/1 0/0 0/0 .text            e_db_appear_v__FP10e_db_class */
 static void e_db_appear_v(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -429,7 +418,6 @@ static void e_db_appear_v(e_db_class* i_this) {
     i_this->field_0xb14 = 1;
 }
 
-/* 8069BC4C-8069C1AC 00124C 0560+00 1/1 0/0 0/0 .text            e_db_wait__FP10e_db_class */
 static void e_db_wait(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp48;
@@ -517,7 +505,6 @@ static void e_db_wait(e_db_class* i_this) {
     }
 }
 
-/* 8069C1AC-8069C408 0017AC 025C+00 1/1 0/0 0/0 .text            e_db_mk_roof__FP10e_db_class */
 static void e_db_mk_roof(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz spC;
@@ -562,7 +549,6 @@ static void e_db_mk_roof(e_db_class* i_this) {
     actor->shape_angle.z = 0;
 }
 
-/* 8069C408-8069CED8 001A08 0AD0+00 1/1 0/0 0/0 .text            e_db_attack__FP10e_db_class */
 static void e_db_attack(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -766,7 +752,6 @@ static void e_db_attack(e_db_class* i_this) {
     }
 }
 
-/* 8069CED8-8069D234 0024D8 035C+00 1/1 0/0 0/0 .text            e_db_attack_s__FP10e_db_class */
 static void e_db_attack_s(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* temp_r28 = dComIfGp_getPlayer(0);
@@ -808,7 +793,6 @@ static void e_db_attack_s(e_db_class* i_this) {
     i_this->field_0xb14 = 1;
 }
 
-/* 8069D234-8069D534 002834 0300+00 1/1 0/0 0/0 .text            e_db_chance__FP10e_db_class */
 static void e_db_chance(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -873,7 +857,6 @@ static void e_db_chance(e_db_class* i_this) {
     cLib_addCalc2(&i_this->field_0x844, 0.5f + JREG_F(4), 1.0f, 0.05f);
 }
 
-/* 8069D534-8069D770 002B34 023C+00 1/1 0/0 0/0 .text            e_db_s_damage__FP10e_db_class */
 static void e_db_s_damage(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp10;
@@ -925,7 +908,6 @@ static void e_db_s_damage(e_db_class* i_this) {
     }
 }
 
-/* 8069D770-8069DB68 002D70 03F8+00 1/1 0/0 0/0 .text            e_db_damage__FP10e_db_class */
 static void e_db_damage(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp1C;
@@ -1000,7 +982,6 @@ static void e_db_damage(e_db_class* i_this) {
     }
 }
 
-/* 8069DB68-8069DEC4 003168 035C+00 1/1 0/0 0/0 .text            kuki_control1__FP10e_db_class */
 static void kuki_control1(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp40;
@@ -1091,7 +1072,6 @@ static void kuki_control1(e_db_class* i_this) {
     }
 }
 
-/* 8069DEC4-8069E038 0034C4 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10e_db_class */
 static void kuki_control2(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp28;
@@ -1127,7 +1107,6 @@ static void kuki_control2(e_db_class* i_this) {
     }
 }
 
-/* 8069E038-8069E114 003638 00DC+00 1/1 0/0 0/0 .text            kuki_control3__FP10e_db_class */
 static void kuki_control3(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp20;
@@ -1140,7 +1119,6 @@ static void kuki_control3(e_db_class* i_this) {
     }
 }
 
-/* 8069E114-8069E200 003714 00EC+00 1/1 0/0 0/0 .text            kuki_ha_set__FP10e_db_class */
 static void kuki_ha_set(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz* ppos = i_this->field_0x69c;
@@ -1160,7 +1138,6 @@ static void kuki_ha_set(e_db_class* i_this) {
     }
 }
 
-/* 8069E200-8069E504 003800 0304+00 1/1 0/0 0/0 .text            kuki_control1_e__FP10e_db_class */
 static void kuki_control1_e(e_db_class* i_this) {
     fopAc_ac_c* sp18 = &i_this->enemy;
     cXyz sp58;
@@ -1227,7 +1204,6 @@ static void kuki_control1_e(e_db_class* i_this) {
     }
 }
 
-/* 8069E504-8069F360 003B04 0E5C+00 2/1 0/0 0/0 .text            e_db_escape__FP10e_db_class */
 static s8 e_db_escape(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1538,7 +1514,6 @@ static s8 e_db_escape(e_db_class* i_this) {
     return spD;
 }
 
-/* 8069F360-8069F978 004960 0618+00 1/1 0/0 0/0 .text            e_db_e_dead__FP10e_db_class */
 static void e_db_e_dead(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp24;
@@ -1683,7 +1658,6 @@ static void e_db_e_dead(e_db_class* i_this) {
     }
 }
 
-/* 8069F978-8069FFFC 004F78 0684+00 2/1 0/0 0/0 .text            action__FP10e_db_class */
 static void action(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1854,7 +1828,6 @@ static void action(e_db_class* i_this) {
     setMidnaBindEffect((fopEn_enemy_c*)actor, &i_this->sound, &actor->eyePos, &effsize);
 }
 
-/* 8069FFFC-806A03C4 0055FC 03C8+00 1/1 0/0 0/0 .text            eff_set__FP10e_db_classi */
 static void eff_set(e_db_class* i_this, int param_1) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -1925,7 +1898,6 @@ static void eff_set(e_db_class* i_this, int param_1) {
     }
 }
 
-/* 806A03C4-806A052C 0059C4 0168+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_db_class */
 static void anm_se_set(e_db_class* i_this) {
     if (i_this->anm == 5) {
         if (i_this->modelMorf->checkFrame(22.0f)) {
@@ -1946,7 +1918,6 @@ static void anm_se_set(e_db_class* i_this) {
     }
 }
 
-/* 806A052C-806A08F0 005B2C 03C4+00 2/1 0/0 0/0 .text            daE_DB_Execute__FP10e_db_class */
 static int daE_DB_Execute(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp4C;
@@ -2038,12 +2009,10 @@ static int daE_DB_Execute(e_db_class* i_this) {
     return 1;
 }
 
-/* 806A08F0-806A08F8 005EF0 0008+00 1/0 0/0 0/0 .text            daE_DB_IsDelete__FP10e_db_class */
 static int daE_DB_IsDelete(e_db_class* i_this) {
     return 1;
 }
 
-/* 806A08F8-806A0960 005EF8 0068+00 1/0 0/0 0/0 .text            daE_DB_Delete__FP10e_db_class */
 static int daE_DB_Delete(e_db_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -2061,7 +2030,6 @@ static int daE_DB_Delete(e_db_class* i_this) {
     return 1;
 }
 
-/* 806A0960-806A0B54 005F60 01F4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_db_class* a_this = (e_db_class*)i_this;
 
@@ -2096,7 +2064,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806A0B54-806A106C 006154 0518+00 1/0 0/0 0/0 .text            daE_DB_Create__FP10fopAc_ac_c */
 static int daE_DB_Create(fopAc_ac_c* i_this) {
     e_db_class* a_this = (e_db_class*)i_this;
     fopAcM_ct(i_this, e_db_class);
@@ -2230,7 +2197,6 @@ static int daE_DB_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 806A1CC0-806A1CE0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DB_Method */
 static actor_method_class l_daE_DB_Method = {
     (process_method_func)daE_DB_Create,
     (process_method_func)daE_DB_Delete,
@@ -2239,7 +2205,6 @@ static actor_method_class l_daE_DB_Method = {
     (process_method_func)daE_DB_Draw,
 };
 
-/* 806A1CE0-806A1D10 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DB */
 extern actor_process_profile_definition g_profile_E_DB = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp
index ecf1a8c537..1fa30ffdb4 100644
--- a/src/d/actor/d_a_e_db_leaf.cpp
+++ b/src/d/actor/d_a_e_db_leaf.cpp
@@ -5,7 +5,6 @@
 #include "d/actor/d_a_e_db_leaf.h"
 #include "d/d_procname.h"
 
-/* 806A1E38-806A1EA0 000078 0068+00 1/0 0/0 0/0 .text daE_DB_LEAF_Draw__FP15e_db_leaf_class */
 static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) {
     g_env_light.settingTevStruct(0,&i_this->current.pos,&i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(),&i_this->tevStr);
@@ -13,7 +12,6 @@ static int daE_DB_LEAF_Draw(e_db_leaf_class* i_this) {
     return 1;
 }
 
-/* 806A1EA0-806A1F24 0000E0 0084+00 2/1 0/0 0/0 .text daE_DB_LEAF_Execute__FP15e_db_leaf_class */
 static int daE_DB_LEAF_Execute(e_db_leaf_class* i_this) {
     mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
     mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
@@ -23,18 +21,15 @@ static int daE_DB_LEAF_Execute(e_db_leaf_class* i_this) {
     return 1;
 }
 
-/* 806A1F24-806A1F2C 000164 0008+00 1/0 0/0 0/0 .text daE_DB_LEAF_IsDelete__FP15e_db_leaf_class */
 static int daE_DB_LEAF_IsDelete(e_db_leaf_class* i_this) {
     return 1;
 }
 
-/* 806A1F2C-806A1F5C 00016C 0030+00 1/0 0/0 0/0 .text daE_DB_LEAF_Delete__FP15e_db_leaf_class */
 static int daE_DB_LEAF_Delete(e_db_leaf_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_DB");
     return 1;
 }
 
-/* 806A1F5C-806A205C 00019C 0100+00 1/1 0/0 0/0 .text useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_db_leaf_class* leaf = static_cast<e_db_leaf_class*>(i_this);
 
@@ -48,7 +43,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 }  
 
-/* 806A205C-806A210C 00029C 00B0+00 1/0 0/0 0/0 .text daE_DB_LEAF_Create__FP10fopAc_ac_c */
 static int daE_DB_LEAF_Create(fopAc_ac_c* i_this) {
     e_db_leaf_class* leaf = (e_db_leaf_class*)i_this;
     fopAcM_ct(leaf, e_db_leaf_class);
@@ -65,8 +59,6 @@ static int daE_DB_LEAF_Create(fopAc_ac_c* i_this) {
     return ret;
 }
 
-/* ############################################################################################## */
-/* 806A2120-806A2140 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DB_LEAF_Method */
 static actor_method_class l_daE_DB_LEAF_Method = {
     (process_method_func)daE_DB_LEAF_Create,
     (process_method_func)daE_DB_LEAF_Delete,
@@ -75,7 +67,6 @@ static actor_method_class l_daE_DB_LEAF_Method = {
     (process_method_func)daE_DB_LEAF_Draw,
 };
 
-/* 806A2140-806A2170 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DB_LEAF */
 extern actor_process_profile_definition g_profile_E_DB_LEAF = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp
index d8a9404d5f..33b3f8fa3c 100644
--- a/src/d/actor/d_a_e_dd.cpp
+++ b/src/d/actor/d_a_e_dd.cpp
@@ -13,8 +13,8 @@
 
 class daE_DD_HIO_c : public JORReflexible {
 public:
-    /* 806A226C */ daE_DD_HIO_c();
-    /* 806A6D08 */ virtual ~daE_DD_HIO_c() {}
+    daE_DD_HIO_c();
+    virtual ~daE_DD_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -100,7 +100,6 @@ enum Action {
     /* 0xA */ ACTION_FALL,
 };
 
-/* 806A226C-806A22CC 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__12daE_DD_HIO_cFv */
 daE_DD_HIO_c::daE_DD_HIO_c() {
     field_0x4 = -1;
     basic_size = 1.0f;
@@ -113,13 +112,11 @@ daE_DD_HIO_c::daE_DD_HIO_c() {
     flame_mot_speed = 1.5f;
 }
 
-/* 806A22CC-806A2378 00014C 00AC+00 10/10 0/0 0/0 .text            anm_init__FP10e_dd_classifUcf */
 static void anm_init(e_dd_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_DD", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 806A2378-806A254C 0001F8 01D4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -148,7 +145,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 806A254C-806A264C 0003CC 0100+00 1/0 0/0 0/0 .text            daE_DD_Draw__FP10e_dd_class */
 static int daE_DD_Draw(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -168,7 +164,6 @@ static int daE_DD_Draw(e_dd_class* i_this) {
     return 1;
 }
 
-/* 806A264C-806A272C 0004CC 00E0+00 1/1 0/0 0/0 .text otherBgCheckS__FP10fopAc_ac_cP10fopAc_ac_c */
 static BOOL otherBgCheckS(fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     dBgS_LinChk lin_chk;
     cXyz start, end;
@@ -186,7 +181,6 @@ static BOOL otherBgCheckS(fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     return FALSE;
 }
 
-/* 806A272C-806A27A8 0005AC 007C+00 4/4 0/0 0/0 .text            pl_check__FP10e_dd_classfs */
 static BOOL pl_check(e_dd_class* i_this, f32 param_2, s16 param_3) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -202,7 +196,6 @@ static BOOL pl_check(e_dd_class* i_this, f32 param_2, s16 param_3) {
     return FALSE;
 }
 
-/* 806A27A8-806A28A8 000628 0100+00 1/1 0/0 0/0 .text            way_gake_check__FP10e_dd_classf */
 static BOOL way_gake_check(e_dd_class* i_this, f32 param_1) {
     fopAc_ac_c* a_this = &i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -225,7 +218,6 @@ static BOOL way_gake_check(e_dd_class* i_this, f32 param_1) {
     return FALSE;
 }
 
-/* 806A28A8-806A2BDC 000728 0334+00 1/1 0/0 0/0 .text            damage_check__FP10e_dd_class */
 static void damage_check(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -322,7 +314,6 @@ static void damage_check(e_dd_class* i_this) {
     }
 }
 
-/* 806A2BDC-806A2CE8 000A5C 010C+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_dd_classf */
 static BOOL way_bg_check(e_dd_class* i_this, f32 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     dBgS_LinChk lin_chk;
@@ -345,13 +336,10 @@ static BOOL way_bg_check(e_dd_class* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 806A74B8-806A74BC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 u8 l_initHIO;
 
-/* 806A74C8-806A74F0 000018 0028+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_DD_HIO_c l_HIO;
 
-/* 806A2CE8-806A2F14 000B68 022C+00 2/2 0/0 0/0 .text            path_check__FP10e_dd_class */
 static BOOL path_check(e_dd_class* i_this) {
     static u8 check_index[255];
     fopAc_ac_c* a_this = &i_this->actor;
@@ -414,7 +402,6 @@ static BOOL path_check(e_dd_class* i_this) {
     return TRUE;
 }
 
-/* 806A2F14-806A34DC 000D94 05C8+00 1/1 0/0 0/0 .text            e_dd_wall__FP10e_dd_class */
 static void e_dd_wall(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     int frame = i_this->mpModelMorf->getFrame();
@@ -529,7 +516,6 @@ static void e_dd_wall(e_dd_class* i_this) {
     }
 }
 
-/* 806A34DC-806A3AE8 00135C 060C+00 1/1 0/0 0/0 .text            e_dd_normal__FP10e_dd_class */
 static void e_dd_normal(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (i_this->field_0x6d4 != 0) {
@@ -653,7 +639,6 @@ static void e_dd_normal(e_dd_class* i_this) {
     }
 }
 
-/* 806A3AE8-806A3D64 001968 027C+00 1/1 0/0 0/0 .text            e_dd_run__FP10e_dd_class */
 static void e_dd_run(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -728,7 +713,6 @@ static void e_dd_run(e_dd_class* i_this) {
     }
 }
 
-/* 806A3D64-806A3F98 001BE4 0234+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) {
         cXyz sp2c(((e_dd_class*)i_data)->field_0xe40);
@@ -754,7 +738,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806A3F98-806A42F0 001E18 0358+00 1/1 0/0 0/0 .text            e_dd_attack__FP10e_dd_class */
 static void e_dd_attack(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->field_0x6c0 = 0x100;
@@ -843,7 +826,6 @@ static void e_dd_attack(e_dd_class* i_this) {
     }
 }
 
-/* 806A42F0-806A43C0 002170 00D0+00 1/1 0/0 0/0 .text            e_dd_guard__FP10e_dd_class */
 static void e_dd_guard(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -865,7 +847,6 @@ static void e_dd_guard(e_dd_class* i_this) {
     }
 }
 
-/* 806A43C0-806A460C 002240 024C+00 1/1 0/0 0/0 .text            e_dd_bombdamage__FP10e_dd_class */
 static void e_dd_bombdamage(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp2c;
@@ -922,7 +903,6 @@ static void e_dd_bombdamage(e_dd_class* i_this) {
     }
 }
 
-/* 806A460C-806A48DC 00248C 02D0+00 1/1 0/0 0/0 .text            e_dd_taildamage__FP10e_dd_class */
 static void e_dd_taildamage(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp24;
@@ -996,7 +976,6 @@ static void e_dd_taildamage(e_dd_class* i_this) {
     }
 }
 
-/* 806A48DC-806A4A58 00275C 017C+00 1/1 0/0 0/0 .text            e_dd_fall__FP10e_dd_class */
 static void e_dd_fall(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->field_0x6b2 = 100;
@@ -1033,7 +1012,6 @@ static void e_dd_fall(e_dd_class* i_this) {
     a_this->current.pos.z += i_this->field_0x6dc.z;
 }
 
-/* 806A4A58-806A4B60 0028D8 0108+00 1/1 0/0 0/0 .text            e_dd_dead__FP10e_dd_class */
 static void e_dd_dead(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -1063,7 +1041,6 @@ static void e_dd_dead(e_dd_class* i_this) {
     }
 }
 
-/* 806A4B60-806A4D98 0029E0 0238+00 1/1 0/0 0/0 .text            e_dd_arrowdamage__FP10e_dd_class */
 static void e_dd_arrowdamage(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp24;
@@ -1116,7 +1093,6 @@ static void e_dd_arrowdamage(e_dd_class* i_this) {
     }
 }
 
-/* 806A4D98-806A52CC 002C18 0534+00 2/1 0/0 0/0 .text            action__FP10e_dd_class */
 static void action(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz spa4, spb0;
@@ -1288,7 +1264,6 @@ static void action(e_dd_class* i_this) {
     setMidnaBindEffect(&i_this->actor, &i_this->mSound, &a_this->eyePos, &i_effSize);
 }
 
-/* 806A52CC-806A5A6C 00314C 07A0+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_dd_class */
 static void anm_se_set(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (i_this->mAnm == BCK_DD_FIRE_B) {
@@ -1405,7 +1380,6 @@ static void anm_se_set(e_dd_class* i_this) {
     }
 }
 
-/* 806A5A6C-806A60E0 0038EC 0674+00 2/1 0/0 0/0 .text            daE_DD_Execute__FP10e_dd_class */
 static int daE_DD_Execute(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp1c, sp28;
@@ -1577,12 +1551,10 @@ static int daE_DD_Execute(e_dd_class* i_this) {
     return 1;
 }
 
-/* 806A60E0-806A60E8 003F60 0008+00 1/0 0/0 0/0 .text            daE_DD_IsDelete__FP10e_dd_class */
 static int daE_DD_IsDelete(e_dd_class* i_this) {
     return 1;
 }
 
-/* 806A60E8-806A6154 003F68 006C+00 1/0 0/0 0/0 .text            daE_DD_Delete__FP10e_dd_class */
 static int daE_DD_Delete(e_dd_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     dComIfG_resDelete(&i_this->mPhase, "E_dd");
@@ -1598,7 +1570,6 @@ static int daE_DD_Delete(e_dd_class* i_this) {
     return 1;
 }
 
-/* 806A6154-806A63B8 003FD4 0264+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_dd_class* i_this = (e_dd_class*)a_this;
 
@@ -1649,7 +1620,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 806A6400-806A65C4 004280 01C4+00 1/1 0/0 0/0 .text kabe_initial_pos_set__FP10e_dd_class */
 static int kabe_initial_pos_set(e_dd_class* i_this) {
     static s16 ya[5] = {
         -0x4000, 0x4000, 0x0000, 0x8000, 0x0000,
@@ -1691,7 +1661,6 @@ static int kabe_initial_pos_set(e_dd_class* i_this) {
     return 0;
 }
 
-/* 806A65C4-806A69A4 004444 03E0+00 1/0 0/0 0/0 .text            daE_DD_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) {
     e_dd_class* i_this = (e_dd_class*)a_this;
     fopAcM_ct(a_this, e_dd_class);
@@ -1806,7 +1775,6 @@ static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 806A73E4-806A7404 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DD_Method */
 extern actor_method_class l_daE_DD_Method = {
     (process_method_func)daE_DD_Create,
     (process_method_func)daE_DD_Delete,
@@ -1815,7 +1783,6 @@ extern actor_method_class l_daE_DD_Method = {
     (process_method_func)daE_DD_Draw,
 };
 
-/* 806A7404-806A7434 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DD */
 extern actor_process_profile_definition g_profile_E_DD = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp
index feea52c0e8..ea86c9a9ff 100644
--- a/src/d/actor/d_a_e_df.cpp
+++ b/src/d/actor/d_a_e_df.cpp
@@ -12,8 +12,8 @@
 
 class daE_DF_HIO_c : public JORReflexible {
 public:
-    /* 806A76EC */ daE_DF_HIO_c();
-    /* 806A9A84 */ virtual ~daE_DF_HIO_c() {};
+    daE_DF_HIO_c();
+    virtual ~daE_DF_HIO_c() {};
 
     void genMessage(JORMContext*);
 
@@ -30,13 +30,11 @@ inline void daE_DF_HIO_c::genMessage(JORMContext* i_ctx) {
 }
 #endif
 
-/* 806A76EC-806A7710 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__12daE_DF_HIO_cFv */
 daE_DF_HIO_c::daE_DF_HIO_c() {
     mNo = -1;
     field_0x8 = 0.0f;
 }
 
-/* 806A7710-806A7808 000110 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_DF_cFv */
 int daE_DF_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD);
     JUT_ASSERT(161, modelData != NULL);
@@ -51,13 +49,11 @@ int daE_DF_c::CreateHeap() {
     return 1;
 }
 
-/* 806A7808-806A7828 000208 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_DF_c* actor = static_cast<daE_DF_c*>(i_this);
     actor->CreateHeap();
 }
 
-/* 806A7828-806A78A0 000228 0078+00 1/1 0/0 0/0 .text            initCcCylinder__8daE_DF_cFv */
 void daE_DF_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -81,19 +77,16 @@ void daE_DF_c::initCcCylinder() {
     mCyl.OnTgIronBallRebound();
 }
 
-/* 806A78A0-806A78D4 0002A0 0034+00 1/1 0/0 0/0 .text            setCcCylinder__8daE_DF_cFv */
 void daE_DF_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 806A78D4-806A7980 0002D4 00AC+00 6/6 0/0 0/0 .text            SetAnm__8daE_DF_cFiiff */
 void daE_DF_c::SetAnm(int i_index, int i_attr, f32 i_morf, f32 i_rate) {
     mpMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_DF", i_index), i_attr, i_morf,
                      i_rate, 0.0f, -1.0f);
     mAnim = i_index;
 }
 
-/* 806A7980-806A7B40 000380 01C0+00 2/2 0/0 0/0 .text            CameraSet__8daE_DF_cFf */
 void daE_DF_c::CameraSet(f32 i_posz) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz center = current.pos;
@@ -125,7 +118,6 @@ void daE_DF_c::CameraSet(f32 i_posz) {
     }
 }
 
-/* 806A7B40-806A7C3C 000540 00FC+00 2/2 0/0 0/0 .text            DemoStart__8daE_DF_cFv */
 bool daE_DF_c::DemoStart() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* body = dCam_getBody();
@@ -145,7 +137,6 @@ bool daE_DF_c::DemoStart() {
     return true;
 }
 
-/* 806A7C3C-806A7CE0 00063C 00A4+00 2/2 0/0 0/0 .text            SetReleaseCam__8daE_DF_cFv */
 void daE_DF_c::SetReleaseCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Reset(mCenterPos, mEyePos);
@@ -154,7 +145,6 @@ void daE_DF_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-/* 806A7CE0-806A7E30 0006E0 0150+00 1/1 0/0 0/0 .text ctrlJoint__8daE_DF_cFP8J3DJointP8J3DModel */
 int daE_DF_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int jnt_no = joint->getJntNo();
@@ -176,13 +166,10 @@ int daE_DF_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806AA0D0-806AA0D4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 806AA0E0-806AA0EC 000018 000C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daE_DF_HIO_c l_HIO;
 
-/* 806A7E30-806A7E7C 000830 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int i_inactive) {
     if (i_inactive == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -194,7 +181,6 @@ static int JointCallBack(J3DJoint* i_joint, int i_inactive) {
     return 1;
 }
 
-/* 806A7E7C-806A8030 00087C 01B4+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* param_1, void* param_2) {
     cXyz* pos_1 = &fopAcM_GetPosition((fopAc_ac_c*)param_1);
     cXyz* pos_2 = &fopAcM_GetPosition((fopAc_ac_c*)param_2);
@@ -212,7 +198,6 @@ static void* s_obj_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 806A8030-806A8098 000A30 0068+00 1/1 0/0 0/0 .text            Link_Eat_Pos__8daE_DF_cFv */
 void daE_DF_c::Link_Eat_Pos() {
     cXyz pos(current.pos.x, current.pos.y + 400.0f + nREG_F(5), current.pos.z);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -220,7 +205,6 @@ void daE_DF_c::Link_Eat_Pos() {
     player->setPlayerPosAndAngle(&pos, angle, 0);
 }
 
-/* 806A8098-806A816C 000A98 00D4+00 1/1 0/0 0/0 .text            Set_Angle__8daE_DF_cFP4cXyz */
 void daE_DF_c::Set_Angle(cXyz* i_angle) {
     s16 sVar1 = (s16)cLib_targetAngleY(&current.pos, i_angle);
     s16 sVar2 = (0x4000 - cLib_targetAngleX(&current.pos, i_angle));
@@ -231,7 +215,6 @@ void daE_DF_c::Set_Angle(cXyz* i_angle) {
     mChaseAngle.z = sVar2 * cM_scos(sVar1);
 }
 
-/* 806A816C-806A8244 000B6C 00D8+00 1/1 0/0 0/0 .text            Obj_Damage__8daE_DF_cFv */
 void daE_DF_c::Obj_Damage() {
     cCcD_ObjHitInf* hit_obj;
 
@@ -266,7 +249,6 @@ void daE_DF_c::Obj_Damage() {
     }
 }
 
-/* 806A8244-806A8368 000C44 0124+00 1/1 0/0 0/0 .text            DamageAction__8daE_DF_cFv */
 void daE_DF_c::DamageAction() {
     switch (mEatObjType) {
     case EAT_TYPE_OBJ:
@@ -287,7 +269,6 @@ void daE_DF_c::DamageAction() {
     }
 }
 
-/* 806A8368-806A8790 000D68 0428+00 1/1 0/0 0/0 .text            BombEatAction__8daE_DF_cFv */
 void daE_DF_c::BombEatAction() {
     switch (mEatStep) {
     case 0:
@@ -349,7 +330,6 @@ void daE_DF_c::BombEatAction() {
     cLib_chaseAngleS(&mChaseAngle.z, 0, 0x100);
 }
 
-/* 806A8790-806A8938 001190 01A8+00 1/1 0/0 0/0 .text            Spid_Out__8daE_DF_cFv */
 void daE_DF_c::Spid_Out() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -376,7 +356,6 @@ void daE_DF_c::Spid_Out() {
     }
 }
 
-/* 806A8938-806A8C80 001338 0348+00 1/1 0/0 0/0 .text            LinkEatAction__8daE_DF_cFv */
 void daE_DF_c::LinkEatAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz pos(current.pos.x, (current.pos.y - 4000.0f) + nREG_F(5), current.pos.z);
@@ -428,7 +407,6 @@ void daE_DF_c::LinkEatAction() {
     cLib_chaseAngleS(&mChaseAngle.z, 0, 0x100);
 }
 
-/* 806A8C80-806A8D98 001680 0118+00 3/3 0/0 0/0 .text            Mogu_Mogu__8daE_DF_cFv */
 bool daE_DF_c::Mogu_Mogu() {
     if (mMoguCount > 4) {
         mMoguCount = 0;
@@ -454,7 +432,6 @@ bool daE_DF_c::Mogu_Mogu() {
     return false;
 }
 
-/* 806A8D98-806A8ED4 001798 013C+00 1/1 0/0 0/0 .text            ObjEatAction__8daE_DF_cFv */
 void daE_DF_c::ObjEatAction() {
     switch (mEatStep) {
     case 0:
@@ -483,7 +460,6 @@ void daE_DF_c::ObjEatAction() {
     cLib_chaseAngleS(&mChaseAngle.z, 0, 0x100);
 }
 
-/* 806A8ED4-806A8F2C 0018D4 0058+00 1/1 0/0 0/0 .text            EatAction__8daE_DF_cFv */
 void daE_DF_c::EatAction() {
     switch (mEatObjType) {
     case EAT_TYPE_OBJ:
@@ -498,7 +474,6 @@ void daE_DF_c::EatAction() {
     }
 }
 
-/* 806A8F2C-806A91B4 00192C 0288+00 1/1 0/0 0/0 .text            SearchAction__8daE_DF_cFv */
 void daE_DF_c::SearchAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* player_pos = &fopAcM_GetPosition(player);
@@ -540,7 +515,6 @@ void daE_DF_c::SearchAction() {
     }
 }
 
-/* 806A91B4-806A9254 001BB4 00A0+00 1/1 0/0 0/0 .text            WaitAction__8daE_DF_cFv */
 void daE_DF_c::WaitAction() {
     switch (mEatObjType) {
     case EAT_TYPE_OBJ:
@@ -554,7 +528,6 @@ void daE_DF_c::WaitAction() {
     }
 }
 
-/* 806A9254-806A9304 001C54 00B0+00 1/1 0/0 0/0 .text            MissAction__8daE_DF_cFv */
 void daE_DF_c::MissAction() {
     switch (mEatObjType) {
     case EAT_TYPE_OBJ:
@@ -572,7 +545,6 @@ void daE_DF_c::MissAction() {
     }
 }
 
-/* 806A9304-806A9384 001D04 0080+00 1/1 0/0 0/0 .text            Action__8daE_DF_cFv */
 void daE_DF_c::Action() {
     switch (mAction) {
     case ACT_WAIT:
@@ -592,7 +564,6 @@ void daE_DF_c::Action() {
     }
 }
 
-/* 806A9384-806A949C 001D84 0118+00 1/1 0/0 0/0 .text            Execute__8daE_DF_cFv */
 int daE_DF_c::Execute() {
     mTimer--;
     if (mTimer <= 0) {
@@ -618,7 +589,6 @@ int daE_DF_c::Execute() {
     return 1;
 }
 
-/* 806A949C-806A94E0 001E9C 0044+00 1/1 0/0 0/0 .text            Yazirushi__8daE_DF_cFv */
 void daE_DF_c::Yazirushi() {
     eyePos.y = current.pos.y;
     eyePos.y += 80.0f;
@@ -628,7 +598,6 @@ void daE_DF_c::Yazirushi() {
     attention_info.position.z = current.pos.z;
 }
 
-/* 806A94E0-806A9550 001EE0 0070+00 1/1 0/0 0/0 .text            Draw__8daE_DF_cFv */
 int daE_DF_c::Draw() {
     J3DModel* model = mpMorfSO->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -637,7 +606,6 @@ int daE_DF_c::Draw() {
     return 1;
 }
 
-/* 806A9550-806A95B8 001F50 0068+00 1/1 0/0 0/0 .text            Delete__8daE_DF_cFv */
 int daE_DF_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "E_DF");
     if (mHIOInit) {
@@ -650,7 +618,6 @@ int daE_DF_c::Delete() {
     return 1;
 }
 
-/* 806A95B8-806A9610 001FB8 0058+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_DF_cFv */
 void daE_DF_c::setBaseMtx() {
     J3DModel* this_00;
 
@@ -660,28 +627,23 @@ void daE_DF_c::setBaseMtx() {
     mpMorfSO->modelCalc();
 }
 
-/* 806A9610-806A9630 002010 0020+00 1/0 0/0 0/0 .text            daE_DF_Draw__FP8daE_DF_c */
 static int daE_DF_Draw(daE_DF_c* i_this) {
     return i_this->Draw();
 }
 
-/* 806A9630-806A9650 002030 0020+00 2/1 0/0 0/0 .text            daE_DF_Execute__FP8daE_DF_c */
 static int daE_DF_Execute(daE_DF_c* i_this) {
     return i_this->Execute();
 }
 
-/* 806A9650-806A9658 002050 0008+00 1/0 0/0 0/0 .text            daE_DF_IsDelete__FP8daE_DF_c */
 static int daE_DF_IsDelete(daE_DF_c* i_this) {
     return 1;
 }
 
-/* 806A9658-806A9678 002058 0020+00 1/0 0/0 0/0 .text            daE_DF_Delete__FP8daE_DF_c */
 static int daE_DF_Delete(daE_DF_c* i_this) {
     fpc_ProcID proc_id = fopAcM_GetID(i_this);
     return i_this->Delete();
 }
 
-/* 806A9678-806A9930 002078 02B8+00 1/1 0/0 0/0 .text            Create__8daE_DF_cFv */
 int daE_DF_c::Create() {
     fopAcM_ct(this, daE_DF_c);
 
@@ -740,22 +702,18 @@ int daE_DF_c::Create() {
     return rv;
 }
 
-/* 806A9A1C-806A9A3C 00241C 0020+00 1/0 0/0 0/0 .text            daE_DF_Create__FP10fopAc_ac_c
- */
 static int daE_DF_Create(fopAc_ac_c* i_this) {
     daE_DF_c* a_this = (daE_DF_c*)i_this;
     fpc_ProcID proc_id = fopAcM_GetID(i_this);
     return a_this->Create();
 }
 
-/* 806AA03C-806AA05C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DF_Method */
 static actor_method_class l_daE_DF_Method = {
     (process_method_func)daE_DF_Create,  (process_method_func)daE_DF_Delete,
     (process_method_func)daE_DF_Execute, (process_method_func)daE_DF_IsDelete,
     (process_method_func)daE_DF_Draw,
 };
 
-/* 806AA05C-806AA08C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DF */
 extern actor_process_profile_definition g_profile_E_DF = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp
index d2f94aeed7..9a36c2d66f 100644
--- a/src/d/actor/d_a_e_dk.cpp
+++ b/src/d/actor/d_a_e_dk.cpp
@@ -74,7 +74,6 @@ static dCcD_SrcSph cc_dk_core_src = {
     { { { 0.0f, 0.0f, 0.0f }, 40.0f, } } // mSphAttr
 };
 
-/* 806AA1EC-806AA228 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__12daE_DK_HIO_cFv */
 daE_DK_HIO_c::daE_DK_HIO_c() {
     field_0x4 = -1;
     model_size = 2.0f;
@@ -86,7 +85,6 @@ daE_DK_HIO_c::daE_DK_HIO_c() {
 static u32 const dk_brk_name[2] = { BRK_DK_WAIT, BRK_DK_ATTACK };
 static u32 const dk_btk_name[2] = { BTK_DK_WAIT, BTK_DK_ATTACK };
 
-/* 806AA228-806AA5A8 000128 0380+00 1/1 0/0 0/0 .text            draw__8daE_DK_cFv */
 int daE_DK_c::draw() {
     J3DModel* model = mpMorfSO->getModel();
     J3DModel* modelCore = mpCoreMorfSO->getModel();
@@ -154,12 +152,10 @@ int daE_DK_c::draw() {
     return 1;
 }
 
-/* 806AA5A8-806AA5C8 0004A8 0020+00 1/0 0/0 0/0 .text            daE_DK_Draw__FP8daE_DK_c */
 static int daE_DK_Draw(daE_DK_c* i_this) {
     return i_this->draw();
 }
 
-/* 806AA5C8-806AA68C 0004C8 00C4+00 5/5 0/0 0/0 .text            setBck__8daE_DK_cFiUcff */
 void daE_DK_c::setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
     field_0x6a0 = 0;
     if (i_resIndex == BCK_DK_CHARGE || i_resIndex == BCK_DK_ATTACK) {
@@ -170,19 +166,16 @@ void daE_DK_c::setBck(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
         i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806AA68C-806AA730 00058C 00A4+00 5/5 0/0 0/0 .text            setBckCore__8daE_DK_cFiUcff */
 void daE_DK_c::setBckCore(int i_resIndex, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpCoreMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_DK", i_resIndex),
         i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806AA730-806AA73C 000630 000C+00 6/6 0/0 0/0 .text            setActionMode__8daE_DK_cFii */
 void daE_DK_c::setActionMode(int i_actionMode, int i_moveMode) {
     mActionMode = i_actionMode;
     mMoveMode = i_moveMode;
 }
 
-/* 806AA73C-806AA8B0 00063C 0174+00 1/1 0/0 0/0 .text            damage_check__8daE_DK_cFv */
 void daE_DK_c::damage_check() {
     if (field_0x694 == 0 && field_0x6a2 == 0) {
         mStts.Move();
@@ -226,13 +219,10 @@ void daE_DK_c::damage_check() {
     }
 }
 
-/* 806AD7F8-806AD7FC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_806AD7F8;
 
-/* 806AD808-806AD820 000018 0018+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_DK_HIO_c l_HIO;
 
-/* 806AA8B0-806AAB18 0007B0 0268+00 2/2 0/0 0/0 .text            checkPlayerSearch__8daE_DK_cFv */
 bool daE_DK_c::checkPlayerSearch() {
     if (current.pos.abs(home.pos) > field_0x6a8) {
         return 0;
@@ -249,7 +239,6 @@ bool daE_DK_c::checkPlayerSearch() {
     return 1;
 }
 
-/* 806AAB18-806AAC24 000A18 010C+00 2/2 0/0 0/0 .text            checkPlayerAttack__8daE_DK_cFf */
 int daE_DK_c::checkPlayerAttack(f32 param_0) {
     if (field_0x69c == 0) {
         f32 dist = fopAcM_searchPlayerDistance(this);
@@ -272,7 +261,6 @@ int daE_DK_c::checkPlayerAttack(f32 param_0) {
     return 0;
 }
 
-/* 806AAC24-806AAD68 000B24 0144+00 1/1 0/0 0/0 .text            checkWaterHeight__8daE_DK_cFv */
 void daE_DK_c::checkWaterHeight() {
     dBgS_ObjGndChk_Spl gndChk;
     Vec gndChkPos;
@@ -295,8 +283,6 @@ void daE_DK_c::checkWaterHeight() {
     }
 }
 
-/* 806AAD68-806AAE10 000C68 00A8+00 1/1 0/0 0/0 .text
- * SphBgcCallBack__8daE_DK_cFP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */
 void daE_DK_c::SphBgcCallBack(dBgS_SphChk* param_0, cBgD_Vtx_t* param_1, int param_2,
     int param_3, int param_4, cM3dGPla* param_5, void* param_6) {
     fopAc_ac_c* actor = (fopAc_ac_c*)param_6;
@@ -323,7 +309,6 @@ void daE_DK_c::SphBgcCallBack(dBgS_SphChk* param_0, cBgD_Vtx_t* param_1, int par
     }
 }
 
-/* 806AAE10-806AB054 000D10 0244+00 1/1 0/0 0/0 .text            setElectricEffect__8daE_DK_cFv */
 void daE_DK_c::setElectricEffect() {
     static u16 elect_effect_name[6] = {
         0x84BE, 0x84BF, 0x84C0, 0x84C1, 0x84C2, 0x84C3,
@@ -359,7 +344,6 @@ void daE_DK_c::setElectricEffect() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_EN_DK_ATTACK, 0, -1);
 }
 
-/* 806AB054-806AB158 000F54 0104+00 1/1 0/0 0/0 .text            setCoreDeadEffect__8daE_DK_cFv */
 void daE_DK_c::setCoreDeadEffect() {
     cXyz emitterPos;
     cXyz emitterScale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -377,7 +361,6 @@ void daE_DK_c::setCoreDeadEffect() {
                           -1, NULL, NULL, NULL);
 }
 
-/* 806AB158-806AB29C 001058 0144+00 1/1 0/0 0/0 .text            setBodyDeadEffect__8daE_DK_cFv */
 void daE_DK_c::setBodyDeadEffect() {
     static u16 dead_effect_name[2] = {
         0x860D,
@@ -404,7 +387,6 @@ void daE_DK_c::setBodyDeadEffect() {
     }
 }
 
-/* 806AB29C-806AB684 00119C 03E8+00 1/1 0/0 0/0 .text            executeWait__8daE_DK_cFv */
 void daE_DK_c::executeWait() {
     cXyz dirFromHome;
     switch (mMoveMode) {
@@ -469,7 +451,6 @@ void daE_DK_c::executeWait() {
     }
 }
 
-/* 806AB684-806ABA78 001584 03F4+00 1/1 0/0 0/0 .text            executeChase__8daE_DK_cFv */
 void daE_DK_c::executeChase() {
     cXyz dirFromHome;
     switch (mMoveMode) {
@@ -534,7 +515,6 @@ void daE_DK_c::executeChase() {
     }
 }
 
-/* 806ABA78-806ABCC8 001978 0250+00 1/1 0/0 0/0 .text            executeAttack__8daE_DK_cFv */
 void daE_DK_c::executeAttack() {
     switch (mMoveMode) {
     case 0: {
@@ -589,7 +569,6 @@ void daE_DK_c::executeAttack() {
     }
 }
 
-/* 806ABCC8-806ABE3C 001BC8 0174+00 1/1 0/0 0/0 .text            executeDamage__8daE_DK_cFv */
 void daE_DK_c::executeDamage() {
     switch (mMoveMode) {
     case 0:
@@ -630,7 +609,6 @@ void daE_DK_c::executeDamage() {
     }
 }
 
-/* 806ABE3C-806ABF6C 001D3C 0130+00 1/1 0/0 0/0 .text            BodyDeathMove__8daE_DK_cFv */
 void daE_DK_c::BodyDeathMove() {
     cLib_chaseF(&field_0x6ac, -2.0f, 0.2f);
     cLib_chaseF(&field_0x6b0, 0.0f, 0.2f);
@@ -652,7 +630,6 @@ void daE_DK_c::BodyDeathMove() {
     }
 }
 
-/* 806ABF6C-806AC390 001E6C 0424+00 1/1 0/0 0/0 .text            executeDeath__8daE_DK_cFv */
 void daE_DK_c::executeDeath() {
     cXyz itemPos;
     switch (mMoveMode) {
@@ -779,7 +756,6 @@ void daE_DK_c::executeDeath() {
     }
 }
 
-/* 806AC390-806AC5BC 002290 022C+00 1/1 0/0 0/0 .text            action__8daE_DK_cFv */
 void daE_DK_c::action() {
     checkWaterHeight();
 
@@ -845,7 +821,6 @@ void daE_DK_c::action() {
     mpCoreMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 806AC5BC-806AC754 0024BC 0198+00 1/1 0/0 0/0 .text            mtx_set__8daE_DK_cFv */
 void daE_DK_c::mtx_set() {
     if (field_0x6a2 == 0) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 100.0f, current.pos.z);
@@ -877,7 +852,6 @@ void daE_DK_c::mtx_set() {
     mpCoreMorfSO->modelCalc();
 }
 
-/* 806AC754-806AC968 002654 0214+00 1/1 0/0 0/0 .text            cc_set__8daE_DK_cFv */
 void daE_DK_c::cc_set() {
     cXyz sphCenter;
 
@@ -915,7 +889,6 @@ void daE_DK_c::cc_set() {
     }
 }
 
-/* 806AC968-806AC9E8 002868 0080+00 1/1 0/0 0/0 .text            execute__8daE_DK_cFv */
 int daE_DK_c::execute() {
     if (field_0x698 != 0) {
         field_0x698--;
@@ -934,17 +907,14 @@ int daE_DK_c::execute() {
     return 1;
 }
 
-/* 806AC9E8-806ACA08 0028E8 0020+00 2/1 0/0 0/0 .text            daE_DK_Execute__FP8daE_DK_c */
 static int daE_DK_Execute(daE_DK_c* i_this) {
     return i_this->execute();
 }
 
-/* 806ACA08-806ACA10 002908 0008+00 1/0 0/0 0/0 .text            daE_DK_IsDelete__FP8daE_DK_c */
 static int daE_DK_IsDelete(daE_DK_c* i_this) {
     return 1;
 }
 
-/* 806ACA10-806ACA84 002910 0074+00 1/1 0/0 0/0 .text            _delete__8daE_DK_cFv */
 int daE_DK_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_DK");
 
@@ -960,13 +930,11 @@ int daE_DK_c::_delete() {
     return 1;
 }
 
-/* 806ACA84-806ACAA4 002984 0020+00 1/0 0/0 0/0 .text            daE_DK_Delete__FP8daE_DK_c */
 static int daE_DK_Delete(daE_DK_c* i_this) {
     fpc_ProcID unusedId = fopAcM_GetID(i_this); // debug match
     return i_this->_delete();
 }
 
-/* 806ACAA4-806ACDAC 0029A4 0308+00 1/1 0/0 0/0 .text            CreateHeap__8daE_DK_cFv */
 int daE_DK_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK);
     JUT_ASSERT(1488, modelData != NULL);
@@ -1017,13 +985,11 @@ int daE_DK_c::CreateHeap() {
     }
 }
 
-/* 806ACDF4-806ACE14 002CF4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_DK_c* dk = (daE_DK_c*)i_this;
     return dk->CreateHeap();
 }
 
-/* 806ACE14-806AD0AC 002D14 0298+00 1/1 0/0 0/0 .text            create__8daE_DK_cFv */
 int daE_DK_c::create() {
     fopAcM_ct(this, daE_DK_c);
 
@@ -1099,16 +1065,13 @@ int daE_DK_c::create() {
     return loadRes;
 }
 
-/* 806AD0AC-806AD25C 002FAC 01B0+00 1/1 0/0 0/0 .text            __ct__8daE_DK_cFv */
 daE_DK_c::daE_DK_c() {
 }
 
-/* 806AD428-806AD448 003328 0020+00 1/0 0/0 0/0 .text            daE_DK_Create__FP8daE_DK_c */
 static int daE_DK_Create(daE_DK_c* i_this) {
     return i_this->create();
 }
 
-/* 806AD724-806AD744 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DK_Method */
 static actor_method_class l_daE_DK_Method = {
     (process_method_func)daE_DK_Create,
     (process_method_func)daE_DK_Delete,
@@ -1117,7 +1080,6 @@ static actor_method_class l_daE_DK_Method = {
     (process_method_func)daE_DK_Draw,
 };
 
-/* 806AD744-806AD774 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DK */
 extern actor_process_profile_definition g_profile_E_DK = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp
index 3346926770..7c62b43b46 100644
--- a/src/d/actor/d_a_e_dn.cpp
+++ b/src/d/actor/d_a_e_dn.cpp
@@ -16,8 +16,8 @@
 
 class daE_DN_HIO_c : public JORReflexible {
 public:
-    /* 804E51AC */ daE_DN_HIO_c();
-    /* 804EE39C */ virtual ~daE_DN_HIO_c() {}
+    daE_DN_HIO_c();
+    virtual ~daE_DN_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -91,7 +91,6 @@ enum Animation {
     /* 0x23 */ ANM_WALK,
 };
 
-/* 804E51AC-804E5220 0000EC 0074+00 1/1 0/0 0/0 .text            __ct__12daE_DN_HIO_cFv */
 daE_DN_HIO_c::daE_DN_HIO_c() {
     field_0x4 = -1;
     model_size = 1.1f;
@@ -107,7 +106,6 @@ daE_DN_HIO_c::daE_DN_HIO_c() {
     field_0x24 = 0;
 }
 
-/* 804E5220-804E52D0 000160 00B0+00 2/2 0/0 0/0 .text            dn_disappear__FP10e_dn_class */
 static void dn_disappear(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp1c, sp28;
@@ -125,14 +123,12 @@ static void dn_disappear(e_dn_class* i_this) {
     }
 }
 
-/* 804E52D0-804E537C 000210 00AC+00 18/18 0/0 0/0 .text            anm_init__FP10e_dn_classifUcf */
 static void anm_init(e_dn_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_dn", i_anmID), i_attr, i_morf,
                                 i_rate, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 804E537C-804E5838 0002BC 04BC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jointNo = i_joint->getJntNo();
@@ -208,7 +204,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 804E5838-804E5B20 000778 02E8+00 1/0 0/0 0/0 .text            daE_DN_Draw__FP10e_dn_class */
 static int daE_DN_Draw(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -270,7 +265,6 @@ static int daE_DN_Draw(e_dn_class* i_this) {
     return 1;
 }
 
-/* 804E5B20-804E5BF8 000A60 00D8+00 2/2 0/0 0/0 .text other_bg_check__FP10e_dn_classP10fopAc_ac_c */
 static BOOL other_bg_check(e_dn_class* i_this, fopAc_ac_c* i_actor) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -289,7 +283,6 @@ static BOOL other_bg_check(e_dn_class* i_this, fopAc_ac_c* i_actor) {
     return FALSE;
 }
 
-/* 804E5BF8-804E5CD0 000B38 00D8+00 1/1 0/0 0/0 .text other_bg_check2__FP10e_dn_classP4cXyz */
 static BOOL other_bg_check2(e_dn_class* i_this, cXyz* param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -312,16 +305,12 @@ static BOOL other_bg_check2(e_dn_class* i_this, cXyz* param_2) {
 /* 804EEF2D 0003+00 data_804EEF2D None */
 u8 l_initHIO;
 
-/* 804EEF3C-804EEF64 000054 0028+00 10/11 0/0 0/0 .bss             l_HIO */
 daE_DN_HIO_c l_HIO;
 
-/* 804EEF64-804EEF8C 00007C 0028+00 2/2 0/0 0/0 .bss             target_info */
 fopAc_ac_c* target_info[10];
 
-/* 804EEF8C-804EEF90 0000A4 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 int target_info_count;
 
-/* 804E5CD0-804E5D4C 000C10 007C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) {
         target_info[target_info_count] = (fopAc_ac_c*)i_actor;
@@ -331,7 +320,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804E5D4C-804E61D8 000C8C 048C+00 2/2 0/0 0/0 .text            search_bomb__FP10e_dn_classi */
 static dBomb_c* search_bomb(e_dn_class* i_this, int param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBomb_c* bomb;
@@ -398,17 +386,14 @@ static dBomb_c* search_bomb(e_dn_class* i_this, int param_2) {
     return NULL;
 }
 
-/* 804E61D8-804E61FC 001118 0024+00 4/4 0/0 0/0 .text            bomb_view_check__FP10e_dn_class */
 static dBomb_c* bomb_view_check(e_dn_class* i_this) {
     return search_bomb(i_this, TRUE);
 }
 
-/* 804E61FC-804E6220 00113C 0024+00 1/1 0/0 0/0 .text            bomb_check__FP10e_dn_class */
 static dBomb_c* bomb_check(e_dn_class* i_this) {
     return search_bomb(i_this, FALSE);
 }
 
-/* 804E6220-804E6264 001160 0044+00 1/1 0/0 0/0 .text            player_way_check__FP10e_dn_class */
 static BOOL player_way_check(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -424,7 +409,6 @@ static BOOL player_way_check(e_dn_class* i_this) {
     return TRUE;
 }
 
-/* 804E6264-804E6340 0011A4 00DC+00 4/4 0/0 0/0 .text            pl_check__FP10e_dn_classfs */
 static int pl_check(e_dn_class* i_this, f32 param_2, s16 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -447,7 +431,6 @@ static int pl_check(e_dn_class* i_this, f32 param_2, s16 param_3) {
     return 0;
 }
 
-/* 804E6340-804E6448 001280 0108+00 3/3 0/0 0/0 .text            move_gake_check__FP10e_dn_classfSc */
 static BOOL move_gake_check(e_dn_class* i_this, f32 param_2, s8 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -472,7 +455,6 @@ static BOOL move_gake_check(e_dn_class* i_this, f32 param_2, s8 param_3) {
     return FALSE;
 }
 
-/* 804E6448-804E6608 001388 01C0+00 1/1 0/0 0/0 .text jump_pos_check__FP10e_dn_classP4cXyz */
 static BOOL jump_pos_check(e_dn_class* i_this, cXyz* param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -513,7 +495,6 @@ static BOOL jump_pos_check(e_dn_class* i_this, cXyz* param_2) {
     return FALSE;
 }
 
-/* 804E6608-804E6A8C 001548 0484+00 2/1 0/0 0/0 .text            e_dn_stay__FP10e_dn_class */
 static void e_dn_stay(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp30;
@@ -615,7 +596,6 @@ static void e_dn_stay(e_dn_class* i_this) {
     }
 }
 
-/* 804E6A8C-804E6DBC 0019CC 0330+00 1/1 0/0 0/0 .text            e_dn_otoreac__FP10e_dn_class */
 static void e_dn_otoreac(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp40, sp4c;
@@ -671,7 +651,6 @@ static void e_dn_otoreac(e_dn_class* i_this) {
     }
 }
 
-/* 804E6DBC-804E72C8 001CFC 050C+00 2/1 0/0 0/0 .text            e_dn_bomb_action__FP10e_dn_class */
 static void e_dn_bomb_action(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s16 sVar2;
@@ -788,7 +767,6 @@ static void e_dn_bomb_action(e_dn_class* i_this) {
     i_this->field_0x738 = bomb->current.pos;
 }
 
-/* 804E72C8-804E7620 002208 0358+00 1/1 0/0 0/0 .text            e_dn_normal__FP10e_dn_class */
 static void e_dn_normal(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp44, sp50;
@@ -871,7 +849,6 @@ static void e_dn_normal(e_dn_class* i_this) {
     }
 }
 
-/* 804E7620-804E77A8 002560 0188+00 1/1 0/0 0/0 .text            e_dn_drawback__FP10e_dn_class */
 static void e_dn_drawback(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -905,7 +882,6 @@ static void e_dn_drawback(e_dn_class* i_this) {
     }
 }
 
-/* 804E77A8-804E7B34 0026E8 038C+00 1/1 0/0 0/0 .text            e_dn_wolfbite__FP10e_dn_class */
 static void e_dn_wolfbite(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -975,7 +951,6 @@ static void e_dn_wolfbite(e_dn_class* i_this) {
     }
 }
 
-/* 804E7B34-804E7B74 002A74 0040+00 1/1 0/0 0/0 .text            way_check__FP10e_dn_class */
 static int way_check(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s16 sVar1 = a_this->shape_angle.y - i_this->mYAngleToPlayer;
@@ -990,10 +965,8 @@ static int way_check(e_dn_class* i_this) {
     return 2;
 }
 
-/* 804EEF90-804EEF94 0000A8 0004+00 2/2 0/0 0/0 .bss             learn_check */
 int learn_check;
 
-/* 804E7B74-804E7D18 002AB4 01A4+00 1/1 0/0 0/0 .text            shot_s_sub__FPvPv */
 static void* shot_s_sub(void* i_actor, void* i_data) {
     e_dn_class* i_this = (e_dn_class*)i_data;
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
@@ -1008,7 +981,6 @@ static void* shot_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804E7D18-804E8620 002C58 0908+00 1/1 0/0 0/0 .text            e_dn_fight_run__FP10e_dn_class */
 static void e_dn_fight_run(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp4c, sp58;
@@ -1239,7 +1211,6 @@ static void e_dn_fight_run(e_dn_class* i_this) {
     }
 }
 
-/* 804E8620-804E8848 003560 0228+00 1/1 0/0 0/0 .text            e_dn_jump__FP10e_dn_class */
 static void e_dn_jump(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     
@@ -1296,7 +1267,6 @@ static void e_dn_jump(e_dn_class* i_this) {
     }
 }
 
-/* 804E8848-804E8D78 003788 0530+00 1/1 0/0 0/0 .text            e_dn_gakejump__FP10e_dn_class */
 static void e_dn_gakejump(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp24, sp30;
@@ -1398,7 +1368,6 @@ static void e_dn_gakejump(e_dn_class* i_this) {
     }
 }
 
-/* 804E8D78-804E8DD8 003CB8 0060+00 2/2 0/0 0/0 .text            at_hit_check__FP10e_dn_class */
 static fopAc_ac_c* at_hit_check(e_dn_class* i_this) {
     if (i_this->mMode >= 10) {
         return NULL;
@@ -1411,7 +1380,6 @@ static fopAc_ac_c* at_hit_check(e_dn_class* i_this) {
     return NULL;
 }
 
-/* 804E8DD8-804E8F78 003D18 01A0+00 1/1 0/0 0/0 .text            e_dn_attack_0__FP10e_dn_class */
 static void e_dn_attack_0(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp2c, sp38;
@@ -1446,7 +1414,6 @@ static void e_dn_attack_0(e_dn_class* i_this) {
     }
 }
 
-/* 804E8F78-804E91D4 003EB8 025C+00 1/1 0/0 0/0 .text            e_dn_attack__FP10e_dn_class */
 static void e_dn_attack(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -1507,7 +1474,6 @@ static void e_dn_attack(e_dn_class* i_this) {
     }
 }
 
-/* 804E91D4-804E9354 004114 0180+00 1/1 0/0 0/0 .text            tail_eff_set__FP10e_dn_class */
 static void tail_eff_set(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1527,7 +1493,6 @@ static void tail_eff_set(e_dn_class* i_this) {
     }
 }
 
-/* 804E9354-804E9544 004294 01F0+00 1/1 0/0 0/0 .text            e_dn_tail_attack__FP10e_dn_class */
 static void e_dn_tail_attack(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp30, sp3c;
@@ -1574,7 +1539,6 @@ static void e_dn_tail_attack(e_dn_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 804E9544-804E973C 004484 01F8+00 2/1 0/0 0/0 .text            e_dn_guard__FP10e_dn_class */
 static void e_dn_guard(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1636,7 +1600,6 @@ static void e_dn_guard(e_dn_class* i_this) {
     }
 }
 
-/* 804E973C-804E97EC 00467C 00B0+00 1/1 0/0 0/0 .text            e_dn_s_damage__FP10e_dn_class */
 static void e_dn_s_damage(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1658,7 +1621,6 @@ static void e_dn_s_damage(e_dn_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 804E97EC-804E99A0 00472C 01B4+00 1/1 0/0 0/0 .text            kado_check__FP10e_dn_class */
 static BOOL kado_check(e_dn_class* i_this) {
     static int kado_bit[2] = {
         1, 2,
@@ -1700,7 +1662,6 @@ static BOOL kado_check(e_dn_class* i_this) {
     return rv;
 }
 
-/* 804E99A0-804E9AF0 0048E0 0150+00 1/1 0/0 0/0 .text            body_gake__FP10e_dn_class */
 static BOOL body_gake(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -1722,7 +1683,6 @@ static BOOL body_gake(e_dn_class* i_this) {
     return FALSE;
 }
 
-/* 804E9B68-804EA700 004AA8 0B98+00 2/1 0/0 0/0 .text            e_dn_damage__FP10e_dn_class */
 static void e_dn_damage(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -2040,7 +2000,6 @@ static void e_dn_damage(e_dn_class* i_this) {
     }
 }
 
-/* 804EA700-804EA854 005640 0154+00 1/1 0/0 0/0 .text            e_dn_backdrop__FP10e_dn_class */
 static void e_dn_backdrop(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2076,7 +2035,6 @@ static void e_dn_backdrop(e_dn_class* i_this) {
     }
 }
 
-/* 804EA854-804EA9F4 005794 01A0+00 1/1 0/0 0/0 .text            e_dn_water__FP10e_dn_class */
 static void e_dn_water(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp20, sp2c, sp38;
@@ -2123,7 +2081,6 @@ static void e_dn_water(e_dn_class* i_this) {
     }
 }
 
-/* 804EA9F4-804EAD1C 005934 0328+00 1/1 0/0 0/0 .text            e_dn_reg__FP10e_dn_class */
 static void e_dn_reg(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -2208,7 +2165,6 @@ static void e_dn_reg(e_dn_class* i_this) {
     i_this->field_0x6f4 = 1;
 }
 
-/* 804EAD1C-804EADD4 005C5C 00B8+00 1/1 0/0 0/0 .text            wolfkick_damage__FP10e_dn_class */
 static void wolfkick_damage(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2225,7 +2181,6 @@ static void wolfkick_damage(e_dn_class* i_this) {
     i_this->field_0x710 = 1;
 }
 
-/* 804EADD4-804EAEE4 005D14 0110+00 1/1 0/0 0/0 .text            big_damage__FP10e_dn_class */
 static void big_damage(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2250,7 +2205,6 @@ static void big_damage(e_dn_class* i_this) {
     i_this->field_0x710 = 0;
 }
 
-/* 804EAEE4-804EAF94 005E24 00B0+00 1/1 0/0 0/0 .text            small_damage__FP10e_dn_class */
 static void small_damage(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2269,7 +2223,6 @@ static void small_damage(e_dn_class* i_this) {
     i_this->field_0x70c = i_this->mAtInfo.mHitDirection.y;
 }
 
-/* 804EAF94-804EB344 005ED4 03B0+00 1/1 0/0 0/0 .text            damage_check__FP10e_dn_class */
 static void damage_check(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2376,7 +2329,6 @@ static void damage_check(e_dn_class* i_this) {
     }
 }
 
-/* 804EB344-804EC854 006284 1510+00 2/1 0/0 0/0 .text            action__FP10e_dn_class */
 static void action(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2898,7 +2850,6 @@ static void action(e_dn_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &sp2a4);
 }
 
-/* 804EC854-804ECB50 007794 02FC+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_dn_class */
 static void anm_se_set(e_dn_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
 
@@ -2942,10 +2893,8 @@ static void anm_se_set(e_dn_class* i_this) {
     }
 }
 
-/* 804EEF94-804EEF98 0000AC 0004+00 1/2 0/0 0/0 .bss             c_start */
 int c_start;
 
-/* 804ECB50-804ED83C 007A90 0CEC+00 2/1 0/0 0/0 .text            daE_DN_Execute__FP10e_dn_class */
 static int daE_DN_Execute(e_dn_class* i_this) {
     if (i_this->field_0x10d8 != 0) {
         return 1;
@@ -3241,12 +3190,10 @@ static int daE_DN_Execute(e_dn_class* i_this) {
     return 1;
 }
 
-/* 804ED83C-804ED844 00877C 0008+00 1/0 0/0 0/0 .text            daE_DN_IsDelete__FP10e_dn_class */
 static int daE_DN_IsDelete(e_dn_class* i_this) {
     return 1;
 }
 
-/* 804ED844-804ED8AC 008784 0068+00 1/0 0/0 0/0 .text            daE_DN_Delete__FP10e_dn_class */
 static int daE_DN_Delete(e_dn_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dComIfG_resDelete(&i_this->mPhase, "E_dn");
@@ -3262,10 +3209,8 @@ static int daE_DN_Delete(e_dn_class* i_this) {
     return 1;
 }
 
-/* 80713CD8-80713CE4 0001D0 000C+00 1/0 0/0 0/0 .data            jv_offset */
 Vec jv_offset = { 0.0f, 0.0f, 0.0f };
 
-/* 80713CE4-80713D74 -00001 0090+00 1/1 0/0 0/0 .data            jc_data */
 dJntColData_c jc_data[12] = {
     {0, 1, 2, 40.0f, &jv_offset}, {0, 1, 3, 30.0f, &jv_offset},
     {0, 1, 22, 40.0f, &jv_offset}, {0, 1, 11, 15.0f, &jv_offset},
@@ -3275,7 +3220,6 @@ dJntColData_c jc_data[12] = {
     {0, 1, 28, 15.0f, &jv_offset}, {0, 1, 32, 20.0f, &jv_offset},
 };
 
-/* 804ED8AC-804EDAEC 0087EC 0240+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_dn_class* i_this = (e_dn_class*)a_this;
 
@@ -3325,7 +3269,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 804EDAEC-804EDE58 008A2C 036C+00 1/0 0/0 0/0 .text            daE_DN_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_DN_Create(fopAc_ac_c* a_this) {
     e_dn_class* i_this = (e_dn_class*)a_this;
 
@@ -3458,12 +3401,10 @@ static cPhs__Step daE_DN_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 804EDE58-804EE034 008D98 01DC+00 1/1 0/0 0/0 .text            __ct__10e_dn_classFv */
 e_dn_class::e_dn_class() {}
 
 AUDIO_INSTANCES;
 
-/* 804EEDF8-804EEE18 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DN_Method */
 static actor_method_class l_daE_DN_Method = {
     (process_method_func)daE_DN_Create,
     (process_method_func)daE_DN_Delete,
@@ -3472,7 +3413,6 @@ static actor_method_class l_daE_DN_Method = {
     (process_method_func)daE_DN_Draw,
 };
 
-/* 804EEE18-804EEE48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DN */
 extern actor_process_profile_definition g_profile_E_DN = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp
index 22bd5da0ae..64a0962fa7 100644
--- a/src/d/actor/d_a_e_dt.cpp
+++ b/src/d/actor/d_a_e_dt.cpp
@@ -23,8 +23,8 @@
 
 class daE_DT_HIO_c {
 public:
-    /* 806AD90C */ daE_DT_HIO_c();
-    /* 806B5BDC */ virtual ~daE_DT_HIO_c() {}
+    daE_DT_HIO_c();
+    virtual ~daE_DT_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mScale;
@@ -124,17 +124,14 @@ enum Joint {
     /* 0x2A */ JNT_TAIL_2,
 };
 
-/* 806B5EEC-806B5F14 000000 0028+00 1/1 0/0 0/0 .data            eDt_ShakeFrame__6E_DT_n */
 f32 E_DT_n::eDt_ShakeFrame[10] = {
     20.0f, 22.0f, 24.0f, 26.0f, 28.0f, 30.0f, 32.0f, 34.0f, 36.0f, 38.0f,
 };
 
-/* 806B5F14-806B5F3C 000028 0028+00 1/1 0/0 0/0 .data            eDt_ShakeFrameDemo__6E_DT_n */
 f32 E_DT_n::eDt_ShakeFrameDemo[10] = {
     310.0f, 312.0f, 314.0f, 316.0f, 318.0f, 320.0f, 322.0f, 324.0f, 326.0f, 328.0f,
 };
 
-/* 806B5F3C-806B5F7C 000050 0040+00 1/1 0/0 0/0 .data            cc_dt_body_src__6E_DT_n */
 dCcD_SrcSph E_DT_n::cc_dt_body_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
@@ -147,7 +144,6 @@ dCcD_SrcSph E_DT_n::cc_dt_body_src = {
     } // mSphAttr
 };
 
-/* 806B5F7C-806B5FBC 000090 0040+00 1/1 0/0 0/0 .data            cc_dt_tongue_src__6E_DT_n */
 dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0xd8fbfdff, 0x43}, 0x75}}, // mObj
@@ -160,14 +156,11 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = {
     } // mSphAttr
 };
 
-/* 806B629C-806B62A0 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 806B629D 0003+00 data_806B629D None */
 static bool hioInit;
 
-/* 806B62AC-806B62DC 000054 0030+00 7/8 0/0 0/0 .bss             l_HIO */
 static daE_DT_HIO_c l_HIO;
 
-/* 806AD90C-806AD97C 0000EC 0070+00 1/1 0/0 0/0 .text            __ct__12daE_DT_HIO_cFv */
 daE_DT_HIO_c::daE_DT_HIO_c() {
     field_0x4 = -1;
     mScale = 1.5f;
@@ -182,7 +175,6 @@ daE_DT_HIO_c::daE_DT_HIO_c() {
     field_0x28 = 105.0f;
 }
 
-/* 806AD97C-806ADBA0 00015C 0224+00 2/1 0/0 0/0 .text ctrlJoint__8daE_DT_cFP8J3DJointP8J3DModel */
 int daE_DT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     u16 jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -225,7 +217,6 @@ int daE_DT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806ADBA0-806ADBEC 000380 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_DT_cFP8J3DJointi */
 int daE_DT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -237,8 +228,6 @@ int daE_DT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806ADBEC-806ADD30 0003CC 0144+00 1/1 0/0 0/0 .text
- * ctrlJointTuba__8daE_DT_cFP8J3DJointP8J3DModel                */
 int daE_DT_c::ctrlJointTuba(J3DJoint* i_joint, J3DModel* i_model) {
     u16 jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -266,7 +255,6 @@ int daE_DT_c::ctrlJointTuba(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806ADD30-806ADD7C 000510 004C+00 1/1 0/0 0/0 .text JointCallBackTuba__8daE_DT_cFP8J3DJointi */
 int daE_DT_c::JointCallBackTuba(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -278,7 +266,6 @@ int daE_DT_c::JointCallBackTuba(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806ADD7C-806AE56C 00055C 07F0+00 1/1 0/0 0/0 .text            draw__8daE_DT_cFv */
 int daE_DT_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
 
@@ -377,18 +364,15 @@ int daE_DT_c::draw() {
     return 1;
 }
 
-/* 806AE5A8-806AE5C8 000D88 0020+00 1/0 0/0 0/0 .text            daE_DT_Draw__FP8daE_DT_c */
 static int daE_DT_Draw(daE_DT_c* i_this) {
     return i_this->draw();
 }
 
-/* 806AE5C8-806AE618 000DA8 0050+00 1/1 0/0 0/0 .text            demo_skip__8daE_DT_cFi */
 void daE_DT_c::demo_skip(int param_0) {
     cDmr_SkipInfo = 1;
     dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 806AE618-806AE64C 000DF8 0034+00 1/1 0/0 0/0 .text            DemoSkipCallBack__8daE_DT_cFPvi */
 int daE_DT_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this != NULL) {
         static_cast<daE_DT_c*>(i_this)->demo_skip(param_1);
@@ -398,25 +382,21 @@ int daE_DT_c::DemoSkipCallBack(void* i_this, int param_1) {
     }
 }
 
-/* 806AE64C-806AE6F0 000E2C 00A4+00 11/11 0/0 0/0 .text            setBck__8daE_DT_cFiUcff */
 void daE_DT_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("E_DT", i_anm);
     mpMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806AE6F0-806AE74C 000ED0 005C+00 5/5 0/0 0/0 .text            checkBck__8daE_DT_cFi */
 bool daE_DT_c::checkBck(int i_anm) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("E_DT", i_anm);
     return mpMorf->getAnm() == bck;
 }
 
-/* 806AE74C-806AE758 000F2C 000C+00 12/12 0/0 0/0 .text            setActionMode__8daE_DT_cFii */
 void daE_DT_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* 806AE758-806AEB48 000F38 03F0+00 1/1 0/0 0/0 .text            damage_check__8daE_DT_cFv */
 void daE_DT_c::damage_check() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -499,7 +479,6 @@ void daE_DT_c::damage_check() {
     }
 }
 
-/* 806AEB48-806AEBD4 001328 008C+00 1/1 0/0 0/0 .text            setStabPos__8daE_DT_cFv */
 void daE_DT_c::setStabPos() {
     cXyz pos;
     mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_TONGUE_5));
@@ -508,7 +487,6 @@ void daE_DT_c::setStabPos() {
     setDownPos(&pos);
 }
 
-/* 806AEBD4-806AED4C 0013B4 0178+00 1/1 0/0 0/0 .text            checkBeforeBg__8daE_DT_cFf */
 bool daE_DT_c::checkBeforeBg(f32 i_dist) {
     dBgS_LinChk lin_chk;
     cM3dGPla plane;
@@ -532,7 +510,6 @@ bool daE_DT_c::checkBeforeBg(f32 i_dist) {
     }
 }
 
-/* 806AED94-806AEEFC 001574 0168+00 1/1 0/0 0/0 .text            checkTongueBg__8daE_DT_cFv */
 void daE_DT_c::checkTongueBg() {
     if (mAction != ACT_DOWN && mAction != ACT_DAMAGE && mAction != ACT_JUMP) {
         cLib_chaseAngleS(&field_0x734, 0, 0x200);
@@ -557,7 +534,6 @@ void daE_DT_c::checkTongueBg() {
     }
 }
 
-/* 806AEEFC-806AEFE8 0016DC 00EC+00 1/1 0/0 0/0 .text            checkWaterSurface__8daE_DT_cFv */
 void daE_DT_c::checkWaterSurface() {
     dBgS_ObjGndChk_Spl wtr_chk;
     Vec pos;
@@ -577,7 +553,6 @@ void daE_DT_c::checkWaterSurface() {
     }
 }
 
-/* 806AEFE8-806AF09C 0017C8 00B4+00 3/3 0/0 0/0 .text            setSmallWaterEffect__8daE_DT_cFv */
 void daE_DT_c::setSmallWaterEffect() {
     cXyz scl(mScale, mScale, mScale);
     static u16 w_eff_id[5] = {0x8572, 0x8573, 0x8574, 0x8575, 0x8576};
@@ -586,7 +561,6 @@ void daE_DT_c::setSmallWaterEffect() {
     }
 }
 
-/* 806AF09C-806AF150 00187C 00B4+00 2/2 0/0 0/0 .text            setLargeWaterEffect__8daE_DT_cFv */
 void daE_DT_c::setLargeWaterEffect() {
     cXyz scl(mScale, mScale, mScale);
     static u16 w_eff_id[5] = {0x856d, 0x856e, 0x856f, 0x8570, 0x8571};
@@ -595,7 +569,6 @@ void daE_DT_c::setLargeWaterEffect() {
     }
 }
 
-/* 806AF150-806AF240 001930 00F0+00 1/1 0/0 0/0 .text            setHamonEffect__8daE_DT_cFi */
 void daE_DT_c::setHamonEffect(int param_0) {
     if (param_0 >= 2) {
         return;
@@ -610,7 +583,6 @@ void daE_DT_c::setHamonEffect(int param_0) {
     }
 }
 
-/* 806AF240-806AF2F4 001A20 00B4+00 1/1 0/0 0/0 .text            setJumpEffect__8daE_DT_cFv */
 void daE_DT_c::setJumpEffect() {
     cXyz scl(mScale, mScale, mScale);
     static u16 w_eff_id[5] = {0x8565, 0x8566, 0x8567, 0x8568, 0x8569};
@@ -619,7 +591,6 @@ void daE_DT_c::setJumpEffect() {
     }
 }
 
-/* 806AF2F4-806AF3D0 001AD4 00DC+00 1/1 0/0 0/0 .text            setJumpSizukuEffect__8daE_DT_cFv */
 void daE_DT_c::setJumpSizukuEffect() {
     mParticleKey[0] = dComIfGp_particle_set(mParticleKey[0], 0x856a, &current.pos, &tevStr,
                                             &shape_angle, NULL, 0xff, NULL, -1, NULL, NULL, NULL);
@@ -629,16 +600,12 @@ void daE_DT_c::setJumpSizukuEffect() {
     }
 }
 
-/* 806AF3D0-806AF460 001BB0 0090+00 2/2 0/0 0/0 .text            setDamageShibukiEffect__8daE_DT_cFi
- */
 void daE_DT_c::setDamageShibukiEffect(int param_0) {
     cXyz scl(mScale, mScale, mScale);
     static u16 w_eff_id[2] = {0x855d, 0x855f};
     dComIfGp_particle_set(w_eff_id[param_0], &current.pos, &tevStr, &shape_angle, &scl);
 }
 
-/* 806AF460-806AF548 001C40 00E8+00 2/2 0/0 0/0 .text            setDamageYodareEffect__8daE_DT_cFi
- */
 void daE_DT_c::setDamageYodareEffect(int param_0) {
     static u16 w_eff_id[2] = {0x855e, 0x8560};
     mParticleKey[0] = dComIfGp_particle_set(mParticleKey[0], w_eff_id[param_0], &current.pos,
@@ -650,13 +617,11 @@ void daE_DT_c::setDamageYodareEffect(int param_0) {
     }
 }
 
-/* 806AF548-806AF5CC 001D28 0084+00 2/2 0/0 0/0 .text            setSwingEffect__8daE_DT_cFv */
 void daE_DT_c::setSwingEffect() {
     cXyz scl(mScale, mScale, mScale);
     dComIfGp_particle_set(0x856c, &current.pos, &tevStr, &shape_angle, &scl);
 }
 
-/* 806AF5CC-806AF740 001DAC 0174+00 1/1 0/0 0/0 .text            setStepEffect__8daE_DT_cFv */
 void daE_DT_c::setStepEffect() {
     cXyz scl(mScale, mScale, mScale);
     if (!checkBck(ANM_STEP)) {
@@ -674,7 +639,6 @@ void daE_DT_c::setStepEffect() {
     }
 }
 
-/* 806AF740-806AF848 001F20 0108+00 1/1 0/0 0/0 .text            setBombEffect__8daE_DT_cFv */
 void daE_DT_c::setBombEffect() {
     static u16 w_eff_id[4] = {0x8552, 0x8553, 0x8554, 0x8555};
     for (int i = 0; i < 4; i++) {
@@ -688,7 +652,6 @@ void daE_DT_c::setBombEffect() {
     }
 }
 
-/* 806AF848-806AF924 002028 00DC+00 1/1 0/0 0/0 .text            setBombSmokeEffect__8daE_DT_cFv */
 void daE_DT_c::setBombSmokeEffect() {
     mSmokeKey = dComIfGp_particle_set(mSmokeKey, 0x8556, &current.pos, &tevStr, &shape_angle,
                                       NULL, 0xff, NULL, -1, NULL, NULL, NULL);
@@ -698,8 +661,6 @@ void daE_DT_c::setBombSmokeEffect() {
     }
 }
 
-/* 806AF924-806AF9D8 002104 00B4+00 1/1 0/0 0/0 .text            setDeadShibukiEffect__8daE_DT_cFv
- */
 void daE_DT_c::setDeadShibukiEffect() {
     cXyz scl(mScale, mScale, mScale);
     static u16 w_eff_id[2] = {0x8557, 0x8558};
@@ -708,7 +669,6 @@ void daE_DT_c::setDeadShibukiEffect() {
     }
 }
 
-/* 806AF9D8-806AFAE0 0021B8 0108+00 1/1 0/0 0/0 .text            setDeadYodareEffect__8daE_DT_cFv */
 void daE_DT_c::setDeadYodareEffect() {
     static u16 w_eff_id[4] = {0x8559, 0x855a, 0x855b, 0x855c};
     for (int i = 0; i < 4; i++) {
@@ -722,7 +682,6 @@ void daE_DT_c::setDeadYodareEffect() {
     }
 }
 
-/* 806AFAE0-806AFBBC 0022C0 00DC+00 1/1 0/0 0/0 .text            setBoxTubaEffect__8daE_DT_cFv */
 void daE_DT_c::setBoxTubaEffect() {
     mSpitKey = dComIfGp_particle_set(mSpitKey, 0x8598, &current.pos, &tevStr, &shape_angle,
                                      NULL, 0xff, NULL, -1, NULL, NULL, NULL);
@@ -732,8 +691,6 @@ void daE_DT_c::setBoxTubaEffect() {
     }
 }
 
-/* 806AFBBC-806AFC98 00239C 00DC+00 1/1 0/0 0/0 .text            setBoxTubaLandEffect__8daE_DT_cFv
- */
 void daE_DT_c::setBoxTubaLandEffect() {
     cXyz pos;
     mDoMtx_stack_c::copy(mpSpitModel->getAnmMtx(0));
@@ -744,13 +701,10 @@ void daE_DT_c::setBoxTubaLandEffect() {
     }
 }
 
-/* 806B62DC-806B62E0 000084 0004+00 2/2 0/0 0/0 .bss             mDt_OtamaNum__6E_DT_n */
 int E_DT_n::mDt_OtamaNum;
 
-/* 806B62E0-806B6330 000088 0050+00 3/3 0/0 0/0 .bss             mDt_OtamaNo__6E_DT_n */
 int E_DT_n::mDt_OtamaNo[20];
 
-/* 806AFC98-806AFD30 002478 0098+00 1/1 0/0 0/0 .text            s_otama_todo__FPvPv */
 static void* s_otama_todo(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
         && fopAcM_GetName(i_proc) == PROC_E_OT)
@@ -764,7 +718,6 @@ static void* s_otama_todo(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 806AFD30-806AFD94 002510 0064+00 3/3 0/0 0/0 .text            getNumberOfOtama__8daE_DT_cFv */
 int daE_DT_c::getNumberOfOtama() {
     E_DT_n::mDt_OtamaNum = 0;
     for (int i = 0; i < 20; i++) {
@@ -774,10 +727,8 @@ int daE_DT_c::getNumberOfOtama() {
     return E_DT_n::mDt_OtamaNum;
 }
 
-/* 806B6330-806B6334 0000D8 0004+00 3/3 0/0 0/0 .bss             m_fall_no__6E_DT_n */
 int E_DT_n::m_fall_no;
 
-/* 806AFD94-806AFE24 002574 0090+00 3/3 0/0 0/0 .text            s_fall_otama__FPvPv */
 static void* s_fall_otama(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
         && fopAcM_GetName(i_proc) == PROC_E_OT)
@@ -792,7 +743,6 @@ static void* s_fall_otama(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 806AFE24-806AFEAC 002604 0088+00 2/2 0/0 0/0 .text            setStayOtamaFall__8daE_DT_cFv */
 void daE_DT_c::setStayOtamaFall() {
     for (int i = field_0x704 * 2; i < (field_0x704 + 1) * 2; i++) {
         E_DT_n::m_fall_no = 19 - i;
@@ -803,7 +753,6 @@ void daE_DT_c::setStayOtamaFall() {
     }
 }
 
-/* 806AFEAC-806AFF1C 00268C 0070+00 1/1 0/0 0/0 .text            setStayOtamaDelete__8daE_DT_cFv */
 void daE_DT_c::setStayOtamaDelete() {
     for (int i = 0; i < 20; i++) {
         E_DT_n::m_fall_no = i;
@@ -814,7 +763,6 @@ void daE_DT_c::setStayOtamaDelete() {
     }
 }
 
-/* 806AFF1C-806AFF8C 0026FC 0070+00 1/1 0/0 0/0 .text            s_demo_otama__FPvPv */
 static void* s_demo_otama(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))
         && fopAcM_GetName(i_proc) == PROC_E_OT)
@@ -825,10 +773,8 @@ static void* s_demo_otama(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 806B6340-806B634C 0000E8 000C+00 2/3 0/0 0/0 .bss             m_tongue_pos__6E_DT_n */
 cXyz E_DT_n::m_tongue_pos;
 
-/* 806AFF8C-806B0114 00276C 0188+00 1/1 0/0 0/0 .text            s_bomb_search__FPvPv */
 static void* s_bomb_search(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc))) {
         fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(i_proc);
@@ -841,7 +787,6 @@ static void* s_bomb_search(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 806B0114-806B01B4 0028F4 00A0+00 1/1 0/0 0/0 .text            checkBombEat__8daE_DT_cFv */
 bool daE_DT_c::checkBombEat() {
     mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(JNT_TONGUE_3));
     mDoMtx_stack_c::multVecZero(&E_DT_n::m_tongue_pos);
@@ -853,7 +798,6 @@ bool daE_DT_c::checkBombEat() {
     return false;
 }
 
-/* 806B01B4-806B0200 002994 004C+00 1/1 0/0 0/0 .text            isShutterOpen__8daE_DT_cFv */
 bool daE_DT_c::isShutterOpen() {
     daAmiShutter_c* shutter;
     fopAcM_SearchByName(PROC_Obj_AmiShutter, (fopAc_ac_c**)&shutter);
@@ -864,7 +808,6 @@ bool daE_DT_c::isShutterOpen() {
     }
 }
 
-/* 806B0200-806B0368 0029E0 0168+00 1/1 0/0 0/0 .text            executeWait__8daE_DT_cFv */
 void daE_DT_c::executeWait() {
     switch (mMode) {
     case 0:
@@ -894,7 +837,6 @@ void daE_DT_c::executeWait() {
     setActionMode(ACT_CRY, 0);
 }
 
-/* 806B0368-806B063C 002B48 02D4+00 1/5 0/0 0/0 .text            executeCry__8daE_DT_cFv */
 void daE_DT_c::executeCry() {
     switch (mMode) {
     case 0:
@@ -955,7 +897,6 @@ void daE_DT_c::executeCry() {
     }
 }
 
-/* 806B063C-806B07C4 002E1C 0188+00 1/1 0/0 0/0 .text            executeShake__8daE_DT_cFv */
 void daE_DT_c::executeShake() {
     switch (mMode) {
     case 0:
@@ -991,7 +932,6 @@ void daE_DT_c::executeShake() {
     }
 }
 
-/* 806B07C4-806B0E9C 002FA4 06D8+00 2/1 0/0 0/0 .text            executeWalk__8daE_DT_cFv */
 void daE_DT_c::executeWalk() {
     cXyz offset;
 
@@ -1099,7 +1039,6 @@ void daE_DT_c::executeWalk() {
     }
 }
 
-/* 806B0E9C-806B177C 00367C 08E0+00 2/1 0/0 0/0 .text            executeJump__8daE_DT_cFv */
 void daE_DT_c::executeJump() {
     s16 player_angle = fopAcM_searchPlayerAngleY(this);
     cXyz pos, offset, press_pos;
@@ -1302,7 +1241,6 @@ void daE_DT_c::executeJump() {
     }
 }
 
-/* 806B177C-806B1B60 003F5C 03E4+00 1/1 0/0 0/0 .text            executeDown__8daE_DT_cFv */
 void daE_DT_c::executeDown() {
     switch (mMode) {
     case 0:
@@ -1390,7 +1328,6 @@ void daE_DT_c::executeDown() {
     }
 }
 
-/* 806B1B60-806B1BEC 004340 008C+00 1/1 0/0 0/0 .text            executeSearch__8daE_DT_cFv */
 void daE_DT_c::executeSearch() {
     switch (mMode) {
     case 0:
@@ -1407,7 +1344,6 @@ void daE_DT_c::executeSearch() {
     }
 }
 
-/* 806B1BEC-806B1D48 0043CC 015C+00 1/1 0/0 0/0 .text            executeDamage__8daE_DT_cFv */
 void daE_DT_c::executeDamage() {
     if (mTimer != 0) {
         if (!mLinkPressed) {
@@ -1439,7 +1375,6 @@ void daE_DT_c::executeDamage() {
     }
 }
 
-/* 806B1D48-806B1F78 004528 0230+00 1/1 0/0 0/0 .text            executeBombDamage__8daE_DT_cFv */
 void daE_DT_c::executeBombDamage() {
     mTongueCcSph[0].OnCoSetBit();
     mTongueCcSph[1].OnCoSetBit();
@@ -1481,7 +1416,6 @@ void daE_DT_c::executeBombDamage() {
     }
 }
 
-/* 806B1F78-806B28E4 004758 096C+00 2/1 0/0 0/0 .text            executeDeath__8daE_DT_cFv */
 void daE_DT_c::executeDeath() {
     cXyz player_pos(0.0f, 0.0f, 450.0f);
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1638,7 +1572,6 @@ void daE_DT_c::executeDeath() {
     }
 }
 
-/* 806B28E4-806B29D4 0050C4 00F0+00 1/1 0/0 0/0 .text            pointInSight__8daE_DT_cFP4cXyz */
 bool daE_DT_c::pointInSight(cXyz* i_point) {
     cXyz proj;
     u32 idx = fopCamM_GetParam(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)));
@@ -1653,7 +1586,6 @@ bool daE_DT_c::pointInSight(cXyz* i_point) {
     }
 }
 
-/* 806B29D4-806B3B08 0051B4 1134+00 2/1 0/0 0/0 .text            executeOpening__8daE_DT_cFv */
 void daE_DT_c::executeOpening() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camera = dCam_getBody();
@@ -2006,7 +1938,6 @@ void daE_DT_c::executeOpening() {
     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
 }
 
-/* 806B3B08-806B40D8 0062E8 05D0+00 1/1 0/0 0/0 .text            calcCamera__8daE_DT_cFv */
 void daE_DT_c::calcCamera() {
     dBgS_LinChk lin_chk;
     cXyz start, end, offset_pos, offset;
@@ -2108,7 +2039,6 @@ void daE_DT_c::calcCamera() {
     }
 }
 
-/* 806B40D8-806B4724 0068B8 064C+00 1/1 0/0 0/0 .text            calcBoxAndTuba__8daE_DT_cFv */
 void daE_DT_c::calcBoxAndTuba() {
     if (mChestMode == 0) {
         return;
@@ -2210,7 +2140,6 @@ void daE_DT_c::calcBoxAndTuba() {
     }
 }
 
-/* 806B4724-806B49F0 006F04 02CC+00 2/1 0/0 0/0 .text            action__8daE_DT_cFv */
 void daE_DT_c::action() {
     mBodyCcSph[1].OnTgShield();
     if (mLinkPressed) {
@@ -2301,7 +2230,6 @@ void daE_DT_c::action() {
     cLib_chaseAngleS(&field_0x744, field_0x740, 0x100);
 }
 
-/* 806B49F0-806B4B24 0071D0 0134+00 1/1 0/0 0/0 .text            mtx_set__8daE_DT_cFv */
 void daE_DT_c::mtx_set() {
     cXyz spit_pos;
 
@@ -2325,7 +2253,6 @@ void daE_DT_c::mtx_set() {
     mpSpitModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 806B4B24-806B4FD8 007304 04B4+00 1/1 0/0 0/0 .text            cc_set__8daE_DT_cFv */
 void daE_DT_c::cc_set() {
     cXyz center;
     J3DModel* model = mpMorf->getModel();
@@ -2418,7 +2345,6 @@ void daE_DT_c::cc_set() {
     dComIfG_Ccsp()->Set(&mLegCcSph[1]);
 }
 
-/* 806B4FD8-806B5130 0077B8 0158+00 1/1 0/0 0/0 .text            execute__8daE_DT_cFv */
 int daE_DT_c::execute() {
     if (mTimer != 0) {
         mTimer--;
@@ -2462,17 +2388,14 @@ int daE_DT_c::execute() {
     return 1;
 }
 
-/* 806B5130-806B5150 007910 0020+00 2/1 0/0 0/0 .text            daE_DT_Execute__FP8daE_DT_c */
 static int daE_DT_Execute(daE_DT_c* i_this) {
     return i_this->execute();
 }
 
-/* 806B5150-806B5158 007930 0008+00 1/0 0/0 0/0 .text            daE_DT_IsDelete__FP8daE_DT_c */
 static int daE_DT_IsDelete(daE_DT_c* i_this) {
     return 1;
 }
 
-/* 806B5158-806B51F4 007938 009C+00 1/1 0/0 0/0 .text            _delete__8daE_DT_cFv */
 int daE_DT_c::_delete() {
     dComIfG_resDelete(&mPhase[0], "E_DT");
     dComIfG_resDelete(&mPhase[1], "Dalways");
@@ -2486,12 +2409,10 @@ int daE_DT_c::_delete() {
     return 1;
 }
 
-/* 806B51F4-806B5214 0079D4 0020+00 1/0 0/0 0/0 .text            daE_DT_Delete__FP8daE_DT_c */
 static int daE_DT_Delete(daE_DT_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806B5214-806B5440 0079F4 022C+00 1/1 0/0 0/0 .text            CreateHeap__8daE_DT_cFv */
 int daE_DT_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_DT", 28);
     mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
@@ -2532,12 +2453,10 @@ int daE_DT_c::CreateHeap() {
     return 1;
 }
 
-/* 806B5440-806B5460 007C20 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_DT_c*>(i_this)->CreateHeap();
 }
 
-/* 806B5460-806B592C 007C40 04CC+00 1/1 0/0 0/0 .text            create__8daE_DT_cFv */
 cPhs__Step daE_DT_c::create() {
     fopAcM_ct(this, daE_DT_c);
 
@@ -2630,12 +2549,10 @@ cPhs__Step daE_DT_c::create() {
     return step;
 }
 
-/* 806B5BBC-806B5BDC 00839C 0020+00 1/0 0/0 0/0 .text            daE_DT_Create__FP8daE_DT_c */
 static cPhs__Step daE_DT_Create(daE_DT_c* i_this) {
     return i_this->create();
 }
 
-/* 806B61B0-806B61D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_DT_Method */
 static actor_method_class l_daE_DT_Method = {
     (process_method_func)daE_DT_Create,
     (process_method_func)daE_DT_Delete,
@@ -2644,7 +2561,6 @@ static actor_method_class l_daE_DT_Method = {
     (process_method_func)daE_DT_Draw,
 };
 
-/* 806B61D0-806B6200 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_DT */
 extern actor_process_profile_definition g_profile_E_DT = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp
index 68fd639c3c..764085f02a 100644
--- a/src/d/actor/d_a_e_fb.cpp
+++ b/src/d/actor/d_a_e_fb.cpp
@@ -14,7 +14,6 @@
 #include "d/d_debug_viewer.h"
 #endif
 
-/* 806B64AC-806B6520 0000EC 0074+00 1/1 0/0 0/0 .text            __ct__12daE_FB_HIO_cFv */
 daE_FB_HIO_c::daE_FB_HIO_c() {
     mId = -1;
     model_size = 1.5f;
@@ -87,7 +86,6 @@ namespace {
     };
 }
 
-/* 806B6520-806B65C0 000160 00A0+00 1/1 0/0 0/0 .text ctrlJoint__8daE_FB_cFP8J3DJointP8J3DModel */
 int daE_FB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int jnt_no = my_joint->getJntNo();
@@ -110,7 +108,6 @@ int daE_FB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806B65C0-806B660C 000200 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_FB_cFP8J3DJointi */
 int daE_FB_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -132,10 +129,8 @@ static f32 dummy_117095() {
 
 bool l_HIOInit;
 
-/* 806B91FC-806B9220 000054 0024+00 6/7 0/0 0/0 .bss             l_HIO */
 static daE_FB_HIO_c l_HIO;
 
-/* 806B660C-806B67C0 00024C 01B4+00 1/1 0/0 0/0 .text            draw__8daE_FB_cFv */
 int daE_FB_c::draw() {
     if (mType == 10 || mType == 11) {
         return 1;
@@ -179,24 +174,20 @@ int daE_FB_c::draw() {
     return 1;
 }
 
-/* 806B67C0-806B67E0 000400 0020+00 1/0 0/0 0/0 .text            daE_FB_Draw__FP8daE_FB_c */
 static int daE_FB_Draw(daE_FB_c* i_this) {
     return static_cast<daE_FB_c*>(i_this)->draw();
 }
 
-/* 806B67E0-806B688C 000420 00AC+00 3/3 0/0 0/0 .text            setBck__8daE_FB_cFiUcff */
 void daE_FB_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpMorf->setAnm((J3DAnmTransform *) dComIfG_getObjectRes("E_FL", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     field_0x670 = i_index;
 }
 
-/* 806B688C-806B6898 0004CC 000C+00 5/5 0/0 0/0 .text            setActionMode__8daE_FB_cFii */
 void daE_FB_c::setActionMode(int i_action, int i_mode) {
     mActionMode = i_action;
     mMoveMode = i_mode;
 }
 
-/* 806B6898-806B6D20 0004D8 0488+00 1/1 0/0 0/0 .text            damage_check__8daE_FB_cFv */
 void daE_FB_c::damage_check() {
     if (mType == 10 || mType == 11) {
         return;
@@ -283,7 +274,6 @@ void daE_FB_c::damage_check() {
     }
 }
 
-/* 806B6D20-806B6DF4 000960 00D4+00 3/3 0/0 0/0 .text            mBgLineCheck__8daE_FB_cFv */
 bool daE_FB_c::mBgLineCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dBgS_LinChk linchk;
@@ -298,7 +288,6 @@ bool daE_FB_c::mBgLineCheck() {
     return false;
 }
 
-/* 806B6DF4-806B6F40 000A34 014C+00 2/2 0/0 0/0 .text            search_check__8daE_FB_cFv */
 bool daE_FB_c::search_check() {
     bool retval = false;
     if (fopAcM_searchPlayerDistance(this) <= l_HIO.player_detection_range) {
@@ -325,7 +314,6 @@ bool daE_FB_c::search_check() {
     return retval;
 }
 
-/* 806B6F40-806B70FC 000B80 01BC+00 1/1 0/0 0/0 .text            executeWait__8daE_FB_cFv */
 void daE_FB_c::executeWait() {
     if (field_0x680) {
         --field_0x680;
@@ -388,10 +376,8 @@ void daE_FB_c::executeWait() {
     current.angle.y = shape_angle.y;
 }
 
-/* 806B9220-806B9224 000078 0004+00 2/2 0/0 0/0 .bss             mFireTimer */
 static int mFireTimer;
 
-/* 806B70FC-806B78A0 000D3C 07A4+00 1/1 0/0 0/0 .text            executeAttack__8daE_FB_cFv */
 void daE_FB_c::executeAttack() {
     // NONMATCHING - regalloc purgatory
     static u16 a_eff_id[3] = {
@@ -571,7 +557,6 @@ void daE_FB_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 806B78A0-806B7B88 0014E0 02E8+00 1/1 0/0 0/0 .text            executeDamage__8daE_FB_cFv */
 void daE_FB_c::executeDamage() {
     static u16 d_eff_id[2] = {
         dPa_RM(ID_ZI_S_FL_HIT_A),
@@ -632,10 +617,8 @@ void daE_FB_c::executeDamage() {
     current.angle.y = shape_angle.y;
 }
 
-/* 806B9224-806B9228 00007C 0004+00 2/3 0/0 0/0 .bss             None */
 static u8 lbl_188_bss_7C;
 
-/* 806B7B88-806B7DDC 0017C8 0254+00 1/1 0/0 0/0 .text            executeBullet__8daE_FB_cFv */
 void daE_FB_c::executeBullet() {
     cXyz sp_0x20;
     cXyz sp_0x14;
@@ -690,7 +673,6 @@ void daE_FB_c::executeBullet() {
     }
 }
 
-/* 806B7DDC-806B80A4 001A1C 02C8+00 1/1 0/0 0/0 .text            action__8daE_FB_cFv */
 void daE_FB_c::action() {
     mModelSize = l_HIO.model_size;
     if (mType == 1) {
@@ -759,7 +741,6 @@ void daE_FB_c::action() {
     mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 806B80A4-806B811C 001CE4 0078+00 1/1 0/0 0/0 .text            mtx_set__8daE_FB_cFv */
 void daE_FB_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -769,7 +750,6 @@ void daE_FB_c::mtx_set() {
     mpMorf->modelCalc();
 }
 
-/* 806B811C-806B82B4 001D5C 0198+00 1/1 0/0 0/0 .text            cc_set__8daE_FB_cFv */
 void daE_FB_c::cc_set() {
     cXyz sp8;
     mDoMtx_stack_c::copy(mpMorf->getModel()->getAnmMtx(2));
@@ -793,7 +773,6 @@ void daE_FB_c::cc_set() {
     eyePos = sp8;
 }
 
-/* 806B82B4-806B83F0 001EF4 013C+00 1/1 0/0 0/0 .text            normal_eff_set__8daE_FB_cFv */
 void daE_FB_c::normal_eff_set() {
     static u16 n_eff_id[5] = {
         dPa_RM(ID_ZI_S_FL_REIKI_A),
@@ -817,7 +796,6 @@ void daE_FB_c::normal_eff_set() {
     }
 }
 
-/* 806B83F0-806B8518 002030 0128+00 1/1 0/0 0/0 .text            dead_eff_set__8daE_FB_cFv */
 void daE_FB_c::dead_eff_set() {
     static u16 d_eff_id[5] = {
         dPa_RM(ID_ZI_S_FL_DEAD_A),
@@ -846,7 +824,6 @@ static char* dummy_117771() {
 }
 #endif
 
-/* 806B8518-806B85A0 002158 0088+00 1/1 0/0 0/0 .text            execute__8daE_FB_cFv */
 int daE_FB_c::execute() {
     if (field_0x69c != 0) {
         --field_0x69c;
@@ -866,17 +843,14 @@ int daE_FB_c::execute() {
     return 1;
 }
 
-/* 806B85A0-806B85C0 0021E0 0020+00 2/1 0/0 0/0 .text            daE_FB_Execute__FP8daE_FB_c */
 static int daE_FB_Execute(daE_FB_c* i_this) {
     return i_this->execute();
 }
 
-/* 806B85C0-806B85C8 002200 0008+00 1/0 0/0 0/0 .text            daE_FB_IsDelete__FP8daE_FB_c */
 static int daE_FB_IsDelete(daE_FB_c*) {
     return 1;
 }
 
-/* 806B85C8-806B8658 002208 0090+00 1/1 0/0 0/0 .text            _delete__8daE_FB_cFv */
 int daE_FB_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_FL");
     if (mType == 10 || mType == 11) {
@@ -895,13 +869,11 @@ int daE_FB_c::_delete() {
     return 1;
 }
 
-/* 806B8658-806B8678 002298 0020+00 1/0 0/0 0/0 .text            daE_FB_Delete__FP8daE_FB_c */
 static int daE_FB_Delete(daE_FB_c* i_this) {
     int id = fopAcM_GetID(i_this);
     return static_cast<daE_FB_c*>(i_this)->_delete();
 }
 
-/* 806B8678-806B8878 0022B8 0200+00 1/1 0/0 0/0 .text            CreateHeap__8daE_FB_cFv */
 int daE_FB_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_FL", 0xB);
     JUT_ASSERT(1516, modelData != NULL);
@@ -937,13 +909,11 @@ int daE_FB_c::CreateHeap() {
     return 1;
 }
 
-/* 806B88C0-806B88E0 002500 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_FB_c* a_this = static_cast<daE_FB_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 806B88E0-806B8C1C 002520 033C+00 1/1 0/0 0/0 .text            create__8daE_FB_cFv */
 cPhs__Step daE_FB_c::create() {
     fopAcM_ct(this, daE_FB_c);
     mType = fopAcM_GetParam(this);
@@ -1022,17 +992,14 @@ cPhs__Step daE_FB_c::create() {
     return phase;
 }
 
-/* 806B8C1C-806B8DC4 00285C 01A8+00 1/1 0/0 0/0 .text            __ct__8daE_FB_cFv */
 daE_FB_c::daE_FB_c() {
     // Empty function.
 }
 
-/* 806B8EC4-806B8EE4 002B04 0020+00 1/0 0/0 0/0 .text            daE_FB_Create__FP8daE_FB_c */
 static int daE_FB_Create(daE_FB_c* i_this) {
     return i_this->create();
 }
 
-/* 806B9100-806B9120 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_FB_Method */
 static actor_method_class l_daE_FB_Method = {
     (process_method_func)daE_FB_Create,
     (process_method_func)daE_FB_Delete,
@@ -1041,7 +1008,6 @@ static actor_method_class l_daE_FB_Method = {
     (process_method_func)daE_FB_Draw,
 };
 
-/* 806B9120-806B9150 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_FB */
 extern actor_process_profile_definition g_profile_E_FB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp
index 38c369b538..31377ac4f1 100644
--- a/src/d/actor/d_a_e_fk.cpp
+++ b/src/d/actor/d_a_e_fk.cpp
@@ -14,8 +14,8 @@
 
 class daE_FK_HIO_c : public JORReflexible {
 public:
-    /* 806B938C */ daE_FK_HIO_c();
-    /* 806BB594 */ virtual ~daE_FK_HIO_c() {}
+    daE_FK_HIO_c();
+    virtual ~daE_FK_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -26,7 +26,6 @@ public:
     /* 0x12 */ s16 generation_time;
 };
 
-/* 806B938C-806B93CC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daE_FK_HIO_cFv */
 daE_FK_HIO_c::daE_FK_HIO_c() {
     id = -1;
     model_size = 0.8f;
@@ -35,7 +34,6 @@ daE_FK_HIO_c::daE_FK_HIO_c() {
     generation_time = 750;
 }
 
-/* 806B93CC-806B9514 00012C 0148+00 1/1 0/0 0/0 .text            CreateHeap__8daE_FK_cFv */
 int daE_FK_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_fk", 15);
     JUT_ASSERT(189, modelData != NULL);
@@ -57,12 +55,10 @@ int daE_FK_c::CreateHeap() {
     return 1;
 }
 
-/* 806B9514-806B9534 000274 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daE_FK_c*)i_this)->CreateHeap();
 }
 
-/* 806B9534-806B95BC 000294 0088+00 1/1 0/0 0/0 .text            initBodySph__8daE_FK_cFv */
 void daE_FK_c::initBodySph() {
     const static dCcD_SrcSph ccBodySphSrc = {
         {
@@ -84,7 +80,6 @@ void daE_FK_c::initBodySph() {
     }
 }
 
-/* 806B95BC-806B9670 00031C 00B4+00 1/1 0/0 0/0 .text            initSwordSph__8daE_FK_cFv */
 void daE_FK_c::initSwordSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -113,10 +108,8 @@ void daE_FK_c::initSwordSph() {
 
 static u8 l_HIOInit;
 
-/* 806BB91C-806BB930 000054 0014+00 5/6 0/0 0/0 .bss             l_HIO */
 static daE_FK_HIO_c l_HIO;
 
-/* 806B9670-806B97A4 0003D0 0134+00 1/1 0/0 0/0 .text            SetBodySph__8daE_FK_cFv */
 void daE_FK_c::SetBodySph() {
     cXyz pos(0.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(1));
@@ -133,7 +126,6 @@ void daE_FK_c::SetBodySph() {
     dComIfG_Ccsp()->Set(&mCcBodySph[1]);
 }
 
-/* 806B97A4-806B98C4 000504 0120+00 1/1 0/0 0/0 .text            SetSwordSph__8daE_FK_cFv */
 void daE_FK_c::SetSwordSph() {
     cXyz pos0(0.0f, 0.0f, 0.0f);
     cXyz pos1(0.0f, 100.0f, -500.0f);
@@ -153,7 +145,6 @@ void daE_FK_c::SetSwordSph() {
     dComIfG_Ccsp()->Set(&mCcSwordSph[1]);
 }
 
-/* 806B98C4-806B99DC 000624 0118+00 1/1 0/0 0/0 .text ctrlJoint__8daE_FK_cFP8J3DJointP8J3DModel */
 int daE_FK_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -176,7 +167,6 @@ int daE_FK_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806B99DC-806B9A28 00073C 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -190,7 +180,6 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806B9A28-806B9AD8 000788 00B0+00 4/4 0/0 0/0 .text            SetAnm__8daE_FK_cFiiff */
 void daE_FK_c::SetAnm(int i_anm, int i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("e_fk", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     mAnm = i_anm;
@@ -205,7 +194,6 @@ static f32 dummyFloat3(int _) {
     }
 }
 
-/* 806B9AD8-806B9B2C 000838 0054+00 1/1 0/0 0/0 .text            Yazirushi__8daE_FK_cFv */
 void daE_FK_c::Yazirushi() {
     eyePos = current.pos;
     eyePos.y += 150.0f;
@@ -214,7 +202,6 @@ void daE_FK_c::Yazirushi() {
     attention_info.position.y += 150.0f;
 }
 
-/* 806B9B2C-806B9BB4 00088C 0088+00 5/5 0/0 0/0 .text            SpeedSet__8daE_FK_cFv */
 void daE_FK_c::SpeedSet() {
     field_0x5d2 = current.angle.y;
     cLib_addCalc2(&speedF, mMaxSpeed, 0.1f, 5.0f);
@@ -223,7 +210,6 @@ void daE_FK_c::SpeedSet() {
     field_0x5dc = 1.0f - (5.0f / mMaxSpeed);
 }
 
-/* 806B9BB4-806B9C14 000914 0060+00 4/4 0/0 0/0 .text            TnNeckSet__8daE_FK_cFs */
 void daE_FK_c::TnNeckSet(s16 i_rot) {
     cLib_addCalcAngleS2(&mKNeckRot, i_rot, 5, 0x1000);
 
@@ -234,16 +220,12 @@ void daE_FK_c::TnNeckSet(s16 i_rot) {
     }
 }
 
-/* 806B9C14-806B9C18 000974 0004+00 5/5 0/0 0/0 .text            HsAngleSet__8daE_FK_cFv */
 void daE_FK_c::HsAngleSet() {}
 
-/* 806B9C18-806B9C1C 000978 0004+00 4/4 0/0 0/0 .text            SpeedChk__8daE_FK_cFv */
 void daE_FK_c::SpeedChk() {}
 
-/* 806B9C1C-806B9C20 00097C 0004+00 4/4 0/0 0/0 .text            SetAnmSpeed__8daE_FK_cFv */
 void daE_FK_c::SetAnmSpeed() {}
 
-/* 806B9C20-806B9D00 000980 00E0+00 4/4 0/0 0/0 .text            TgChk__8daE_FK_cFv */
 void daE_FK_c::TgChk() {
     for (int i = 0; i < 2; i++) {
         if (mCcBodySph[i].ChkTgHit()) {
@@ -263,7 +245,6 @@ void daE_FK_c::TgChk() {
     }
 }
 
-/* 806B9D00-806B9D7C 000A60 007C+00 1/1 0/0 0/0 .text            AtChk__8daE_FK_cFv */
 void daE_FK_c::AtChk() {
     for (int i = 0; i < 2; i++) {
         if (mCcSwordSph[i].ChkAtHit()) {
@@ -273,7 +254,6 @@ void daE_FK_c::AtChk() {
     }
 }
 
-/* 806B9D7C-806B9DA4 000ADC 0028+00 1/1 0/0 0/0 .text            OnAt__8daE_FK_cFv */
 void daE_FK_c::OnAt() {
     for (int i = 0; i < 2; i++) {
         mCcSwordSph[i].OnAtSetBit();
@@ -292,30 +272,21 @@ static f32 dummyFloat4(int _) {
 }
 
 namespace {
-/* 806BB930-806BB934 000068 0004+00 0/1 0/0 0/0 .bss             s_dis__22@unnamed@d_a_e_fk_cpp@ */
 static f32 s_dis;
 
-/* 806BB934-806BB938 00006C 0004+00 0/1 0/0 0/0 .bss             s_LinkPos__22@unnamed@d_a_e_fk_cpp@
- */
 static cXyz* s_LinkPos;
 
-/* 806BB938-806BB93C 000070 0002+02 1/2 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_fk_cpp@ */
 static s16 s_TargetAngle;
 
-/* 806BB948-806BB954 000080 000C+00 0/1 0/0 0/0 .bss s_centerpos__22@unnamed@d_a_e_fk_cpp@ */
 static cXyz s_centerpos(217.0f, 1275.0f, -57.0f);
 
-/* 806BB960-806BB96C 000098 000C+00 0/2 0/0 0/0 .bss s_TargetPos__22@unnamed@d_a_e_fk_cpp@ */
 static cXyz s_TargetPos;
 
-/* 806BB96C-806BB970 0000A4 0002+02 1/3 0/0 0/0 .bss s_PointAngle__22@unnamed@d_a_e_fk_cpp@ */
 static s16 s_PointAngle;
 
-/* 806BB970-806BB974 0000A8 0004+00 1/3 0/0 0/0 .bss s_TargetDis__22@unnamed@d_a_e_fk_cpp@ */
 static f32 s_TargetDis;
 }
 
-/* 806B9DA4-806B9E6C 000B04 00C8+00 1/1 0/0 0/0 .text            R_MoveAction__8daE_FK_cFv */
 void daE_FK_c::R_MoveAction() {
     daPy_py_c* actor = daPy_getPlayerActorClass();
     cXyz pos(current.pos);
@@ -338,7 +309,6 @@ static f32 dummyFloat5() {
     return -100.0f;
 }
 
-/* 806B9E6C-806B9F20 000BCC 00B4+00 1/1 0/0 0/0 .text            StartAction__8daE_FK_cFv */
 void daE_FK_c::StartAction() {
     if (cLib_chaseF(&mAlpha, 0.5f, 0.02f)) {
         mAction = 1;
@@ -357,7 +327,6 @@ void daE_FK_c::StartAction() {
     TgChk();
 }
 
-/* 806B9F20-806BA004 000C80 00E4+00 1/1 0/0 0/0 .text            RunAction__8daE_FK_cFv */
 void daE_FK_c::RunAction() {
     switch (mAction) {
     case 1:
@@ -382,12 +351,10 @@ void daE_FK_c::RunAction() {
     }
 }
 
-/* 806BA004-806BA024 000D64 0020+00 1/1 0/0 0/0 .text            Action__8daE_FK_cFv */
 void daE_FK_c::Action() {
     RunAction();
 }
 
-/* 806BA024-806BA188 000D84 0164+00 1/1 0/0 0/0 .text            DeathAction__8daE_FK_cFv */
 void daE_FK_c::DeathAction() {
     switch (mMode) {
     case 0:
@@ -420,7 +387,6 @@ void daE_FK_c::DeathAction() {
     HsAngleSet();
 }
 
-/* 806BA188-806BA24C 000EE8 00C4+00 1/1 0/0 0/0 .text            DamageChk__8daE_FK_cFv */
 void daE_FK_c::DamageChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (health <= 0) {
@@ -440,7 +406,6 @@ void daE_FK_c::DamageChk() {
     }
 }
 
-/* 806BA24C-806BA330 000FAC 00E4+00 1/1 0/0 0/0 .text            DamageAction__8daE_FK_cFv */
 void daE_FK_c::DamageAction() {
     switch (mMode) {
     case 0:
@@ -462,7 +427,6 @@ void daE_FK_c::DamageAction() {
     TgChk();
 }
 
-/* 806BA330-806BA3B4 001090 0084+00 1/1 0/0 0/0 .text            checkViewArea__8daE_FK_cFv */
 bool daE_FK_c::checkViewArea() {
     Vec proj;
     mDoLib_project(&current.pos, &proj);
@@ -477,7 +441,6 @@ static s16 s_HorseAngle;
 static s16 s_AttackChk;
 }
 
-/* 806BA3B4-806BA61C 001114 0268+00 1/1 0/0 0/0 .text            AttackAction__8daE_FK_cFv */
 void daE_FK_c::AttackAction() {
     switch (mMode) {
     case 0:
@@ -542,7 +505,6 @@ void daE_FK_c::AttackAction() {
     AtChk();
 }
 
-/* 806BA61C-806BA6EC 00137C 00D0+00 1/1 0/0 0/0 .text            UpDown__8daE_FK_cFv */
 void daE_FK_c::UpDown() {
     switch (mUpDownMode) {
     case 0:
@@ -565,7 +527,6 @@ void daE_FK_c::UpDown() {
     current.pos.y += field_0x5e8;
 }
 
-/* 806BA6EC-806BABB8 00144C 04CC+00 1/1 0/0 0/0 .text            Execute__8daE_FK_cFv */
 int daE_FK_c::Execute() {
     if (dComIfGp_event_runCheck()) {
         return 1;
@@ -644,7 +605,6 @@ int daE_FK_c::Execute() {
     return 1;
 }
 
-/* 806BABB8-806BACEC 001918 0134+00 1/1 0/0 0/0 .text            At_Check__8daE_FK_cFi */
 void daE_FK_c::At_Check(int i_sphIdx) {
     mAtInfo.mpCollider = mCcBodySph[i_sphIdx].GetTgHitObj();
     mAtInfo.mpActor = at_power_check(&mAtInfo);
@@ -693,7 +653,6 @@ void daE_FK_c::At_Check(int i_sphIdx) {
     }
 }
 
-/* 806BACEC-806BADB4 001A4C 00C8+00 1/1 0/0 0/0 .text            Draw__8daE_FK_cFv */
 int daE_FK_c::Draw() {
     J3DModel* model_p = mpModelMorf->getModel();
     
@@ -708,7 +667,6 @@ int daE_FK_c::Draw() {
     return 1;
 }
 
-/* 806BADB4-806BAE1C 001B14 0068+00 1/1 0/0 0/0 .text            Delete__8daE_FK_cFv */
 int daE_FK_c::Delete() {
     dComIfG_resDelete(&mPhase, "E_fk");
 
@@ -721,7 +679,6 @@ int daE_FK_c::Delete() {
     return 1;
 }
 
-/* 806BAE1C-806BAEB0 001B7C 0094+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_FK_cFv */
 void daE_FK_c::setBaseMtx() {
     cXyz sp8(0.0f, 50.0f, 0.0f);
     scale.set(mSize, mSize, mSize);
@@ -735,33 +692,27 @@ void daE_FK_c::setBaseMtx() {
     mpModelMorf->modelCalc();
 }
 
-/* 806BAEB0-806BAF0C 001C10 005C+00 1/1 0/0 0/0 .text            setEfMtx__8daE_FK_cFv */
 void daE_FK_c::setEfMtx() {
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(0x18));
     mpEffModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 806BAF0C-806BAF2C 001C6C 0020+00 1/0 0/0 0/0 .text            daE_FK_Draw__FP8daE_FK_c */
 static int daE_FK_Draw(daE_FK_c* i_this) {
     return i_this->Draw();
 }
 
-/* 806BAF2C-806BAF4C 001C8C 0020+00 2/1 0/0 0/0 .text            daE_FK_Execute__FP8daE_FK_c */
 static int daE_FK_Execute(daE_FK_c* i_this) {
     return i_this->Execute();
 }
 
-/* 806BAF4C-806BAF54 001CAC 0008+00 1/0 0/0 0/0 .text            daE_FK_IsDelete__FP8daE_FK_c */
 static int daE_FK_IsDelete(daE_FK_c* i_this) {
     return 1;
 }
 
-/* 806BAF54-806BAF74 001CB4 0020+00 1/0 0/0 0/0 .text            daE_FK_Delete__FP8daE_FK_c */
 static int daE_FK_Delete(daE_FK_c* i_this) {
     return i_this->Delete();
 }
 
-/* 806BAF74-806BB004 001CD4 0090+00 1/1 0/0 0/0 .text            CreateChk__8daE_FK_cFv */
 void daE_FK_c::CreateChk() {
     u8 arg0 = fopAcM_GetParam(this) & 0xF;
     if (arg0 == 0) {
@@ -782,7 +733,6 @@ void daE_FK_c::CreateChk() {
     }
 }
 
-/* 806BB004-806BB324 001D64 0320+00 1/1 0/0 0/0 .text            Create__8daE_FK_cFv */
 int daE_FK_c::Create() {
     fopAcM_ct(this, daE_FK_c);
 
@@ -849,14 +799,12 @@ int daE_FK_c::Create() {
     return phase_state;
 }
 
-/* 806BB574-806BB594 0022D4 0020+00 1/0 0/0 0/0 .text            daE_FK_Create__FP10fopAc_ac_c */
 static int daE_FK_Create(fopAc_ac_c* i_this) {
     return ((daE_FK_c*)i_this)->Create();
 }
 
 AUDIO_INSTANCES
 
-/* 806BB82C-806BB84C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_FK_Method */
 static actor_method_class l_daE_FK_Method = {
     (process_method_func)daE_FK_Create,
     (process_method_func)daE_FK_Delete,
@@ -865,7 +813,6 @@ static actor_method_class l_daE_FK_Method = {
     (process_method_func)daE_FK_Draw,
 };
 
-/* 806BB84C-806BB87C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_FK */
 extern actor_process_profile_definition g_profile_E_FK = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp
index 9e6f07aa8f..382e1dc932 100644
--- a/src/d/actor/d_a_e_fm.cpp
+++ b/src/d/actor/d_a_e_fm.cpp
@@ -18,10 +18,10 @@
 
 class daE_FM_HIO_c : public JORReflexible {
 public:
-    /* 804EF0EC */ daE_FM_HIO_c();
+    daE_FM_HIO_c();
 
     void genMessage(JORMContext*);
-    /* 804FA3D8 */ virtual ~daE_FM_HIO_c() {}
+    virtual ~daE_FM_HIO_c() {}
 
     /* 0x04 */ s8 no;
     /* 0x08 */ f32 base_size;
@@ -171,7 +171,6 @@ enum daE_FM_TexAnm {
     TEXANM_DEMO_END02,
 };
 
-/* 804EF0EC-804EF250 0000EC 0164+00 1/1 0/0 0/0 .text            __ct__12daE_FM_HIO_cFv */
 daE_FM_HIO_c::daE_FM_HIO_c() {
     no = -1;
 
@@ -227,7 +226,6 @@ daE_FM_HIO_c::daE_FM_HIO_c() {
     field_0xa8 = 1200.0f;
 }
 
-/* 804EF250-804EF29C 000250 004C+00 2/2 0/0 0/0 .text            s_fmobj_del__FPvPv */
 static void* s_fmobj_del(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_FMOBJ) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -239,21 +237,16 @@ static void* s_fmobj_del(void* i_actor, void* i_data) {
 /* 804FAE95 0003+00 data_804FAE95 None */
 static u8 l_initHIO;
 
-/* 804FAEA4-804FAF54 000054 00B0+00 14/16 0/0 0/0 .bss             l_HIO */
 static daE_FM_HIO_c l_HIO;
 
-/* 804FAF60-804FAF6C 000110 000C+00 0/3 0/0 0/0 .bss             h_pos */
 static cXyz h_pos;
 
-/* 804FAF6C-804FAF70 00011C 0004+00 0/2 0/0 0/0 .bss             h_range */
 static f32 h_range;
 
-/* 804FAF70-804FAF78 000120 0004+04 0/2 0/0 0/0 .bss             h_power */
 static f32 h_power;
 
 static s8 h_unk;
 
-/* 804EF29C-804EF308 00029C 006C+00 1/1 0/0 0/0 .text            s_hasira_sub__FPvPv */
 static void* s_hasira_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) {
         ((daObjHHASHI_c*)i_actor)->Rolling(&h_pos, h_range, h_power, h_unk);
@@ -262,7 +255,6 @@ static void* s_hasira_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804EF308-804EF3CC 000308 00C4+00 1/1 0/0 0/0 .text            s_hasira_poscheck__FPvPv */
 static void* s_hasira_poscheck(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) {
         f32 x = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x;
@@ -278,10 +270,8 @@ static void* s_hasira_poscheck(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804FAF78-804FAF7C 000128 0004+00 2/2 0/0 0/0 .bss             fire_range */
 static f32 fire_range;
 
-/* 804EF3CC-804EF63C 0003CC 0270+00 1/1 0/0 0/0 .text            s_hasira_eff_sub__FPvPv */
 static void* s_hasira_eff_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_HHASHI) {
         daObjHHASHI_c* a_actor = (daObjHHASHI_c*)i_actor;
@@ -317,7 +307,6 @@ static void* s_hasira_eff_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804EF6B4-804EF710 0006B4 005C+00 6/6 0/0 0/0 .text            hasira_hahen_hit__FP4cXyzffSc */
 static void hasira_hahen_hit(cXyz* i_pos, f32 i_range, f32 i_power, s8 param_3) {
     h_pos = *i_pos;
     h_range = i_range;
@@ -326,7 +315,6 @@ static void hasira_hahen_hit(cXyz* i_pos, f32 i_range, f32 i_power, s8 param_3)
     fpcM_Search(s_hasira_sub, NULL);
 }
 
-/* 804EF710-804EF808 000710 00F8+00 5/5 0/0 0/0 .text            carry_off__FP10e_fm_classi */
 static void carry_off(e_fm_class* i_this, int i_chainNo) {
     if (i_this->mChain[i_chainNo].field_0x617e != 0) {
         i_this->mChain[i_chainNo].field_0x617e = 0;
@@ -341,13 +329,11 @@ static void carry_off(e_fm_class* i_this, int i_chainNo) {
     }
 }
 
-/* 804EF808-804EF8B8 000808 00B0+00 13/13 0/0 0/0 .text            anm_init__FP10e_fm_classifUcf */
 static void anm_init(e_fm_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpFmModelMorf->setAnm((J3DAnmTransform *)dComIfG_getObjectRes("E_fm", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->mAnm = i_anm;
 }
 
-/* 804EF8B8-804EF99C 0008B8 00E4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -397,7 +383,6 @@ static f32 chain_z[25] = {
     2300.0f,
 };
 
-/* 804EF99C-804EFC3C 00099C 02A0+00 1/1 0/0 0/0 .text chain_draw__FP10e_fm_classP7chain_si */
 static void chain_draw(e_fm_class* i_this, chain_s* i_chain_s, int i_chainNo) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     cXyz sp1C;
@@ -455,7 +440,6 @@ static void chain_draw(e_fm_class* i_this, chain_s* i_chain_s, int i_chainNo) {
     }
 }
 
-/* 804EFC3C-804EFF68 000C3C 032C+00 1/0 0/0 0/0 .text            daE_FM_Draw__FP10e_fm_class */
 static int daE_FM_Draw(e_fm_class* i_this) {
     J3DModel* model = i_this->mpFmModelMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -516,8 +500,6 @@ static int daE_FM_Draw(e_fm_class* i_this) {
     return 1;
 }
 
-/* 804EFF68-804F005C 000F68 00F4+00 1/1 0/0 0/0 .text other_bg_check__FP10e_fm_classP10fopAc_ac_c
- */
 static BOOL other_bg_check(e_fm_class* i_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     dBgS_LinChk linchk;
@@ -541,7 +523,6 @@ static BOOL other_bg_check(e_fm_class* i_this, fopAc_ac_c* i_other) {
     return TRUE;
 }
 
-/* 804F005C-804F00E4 00105C 0088+00 2/2 0/0 0/0 .text            pl_check__FP10e_fm_classfs */
 static BOOL pl_check(e_fm_class* i_this, f32 i_range, s16 i_sightRange) {
     if (i_sightRange != 0) {
         s16 angle_diff = i_this->shape_angle.y - i_this->mAngleToPlayer;
@@ -559,7 +540,6 @@ static BOOL pl_check(e_fm_class* i_this, f32 i_range, s16 i_sightRange) {
     return FALSE;
 }
 
-/* 804F00E4-804F0530 0010E4 044C+00 1/1 0/0 0/0 .text            e_fm_normal__FP10e_fm_class */
 static void e_fm_normal(e_fm_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (i_this->mMode >= 0 && !fopAcM_otherBgCheck(i_this, player)) {
@@ -650,7 +630,6 @@ static void e_fm_normal(e_fm_class* i_this) {
     i_this->speedF = move_speed;
 }
 
-/* 804F0530-804F0A78 001530 0548+00 1/1 0/0 0/0 .text            e_fm_fight_run__FP10e_fm_class */
 static void e_fm_fight_run(e_fm_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp4C;
@@ -754,7 +733,6 @@ static void e_fm_fight_run(e_fm_class* i_this) {
     }
 }
 
-/* 804F0A78-804F0D3C 001A78 02C4+00 1/1 0/0 0/0 .text            e_fm_n_fight__FP10e_fm_class */
 static void e_fm_n_fight(e_fm_class* i_this) {
     int anm_frame = i_this->mpFmModelMorf->getFrame();
     cXyz sp28;
@@ -822,7 +800,6 @@ static void e_fm_n_fight(e_fm_class* i_this) {
     }
 }
 
-/* 804F0D3C-804F0F80 001D3C 0244+00 1/1 0/0 0/0 .text            tame_eff_set__FP10e_fm_class */
 static void tame_eff_set(e_fm_class* i_this) {
     J3DModel* model = i_this->mpFmModelMorf->getModel();
     cXyz mae(0.0f, 0.0f, 0.0f);
@@ -848,7 +825,6 @@ static void tame_eff_set(e_fm_class* i_this) {
     }
 }
 
-/* 804F0F80-804F11D8 001F80 0258+00 1/1 0/0 0/0 .text            e_fm_f_fight__FP10e_fm_class */
 static void e_fm_f_fight(e_fm_class* i_this) {
     cXyz sp30;
     cXyz sp24;
@@ -899,7 +875,6 @@ static void e_fm_f_fight(e_fm_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 804F11D8-804F13FC 0021D8 0224+00 2/2 0/0 0/0 .text            animal_eff_set__FP10e_fm_classs */
 static void animal_eff_set(e_fm_class* i_this, s16 param_1) {
     J3DModel* model = i_this->mpFmModelMorf->getModel();
 
@@ -927,7 +902,6 @@ static void animal_eff_set(e_fm_class* i_this, s16 param_1) {
     }
 }
 
-/* 804F13FC-804F14C8 0023FC 00CC+00 1/1 0/0 0/0 .text            e_fm_animal__FP10e_fm_class */
 static void e_fm_animal(e_fm_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -946,7 +920,6 @@ static void e_fm_animal(e_fm_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 804F14C8-804F16C4 0024C8 01FC+00 1/1 0/0 0/0 .text            e_fm_fire__FP10e_fm_class */
 static void e_fm_fire(e_fm_class* i_this) {
     i_this->field_0x7c0 = 1;
 
@@ -990,7 +963,6 @@ static void e_fm_fire(e_fm_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 804F16C4-804F1918 0026C4 0254+00 1/1 0/0 0/0 .text            e_fm_stop__FP10e_fm_class */
 static void e_fm_stop(e_fm_class* i_this) {
     i_this->mDamageInvulnerabilityTimer = 6;
 
@@ -1045,7 +1017,6 @@ static void e_fm_stop(e_fm_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f);
 }
 
-/* 804F1918-804F20F4 002918 07DC+00 1/1 0/0 0/0 .text            e_fm_damage_run__FP10e_fm_class */
 static void e_fm_damage_run(e_fm_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp78;
@@ -1168,7 +1139,6 @@ static void e_fm_damage_run(e_fm_class* i_this) {
     }
 }
 
-/* 804F20F4-804F21F0 0030F4 00FC+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_fm_classf */
 static void cam_3d_morf(e_fm_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, param_1, i_this->mDemoCamCenterSpd.x * i_this->field_0x1b050);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->mDemoCamCenterTarget.y, param_1, i_this->mDemoCamCenterSpd.y * i_this->field_0x1b050);
@@ -1178,10 +1148,8 @@ static void cam_3d_morf(e_fm_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamEyeTarget.z, param_1, i_this->mDemoCamEyeSpd.z * i_this->field_0x1b050);
 }
 
-/* 804FAF7C-804FAF80 00012C 0004+00 2/3 0/0 0/0 .bss             demo_stop */
 static int demo_stop;
 
-/* 804F21F0-804F3E74 0031F0 1C84+00 1/1 0/0 0/0 .text            demo_camera__FP10e_fm_class */
 static void demo_camera(e_fm_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1811,7 +1779,6 @@ static void demo_camera(e_fm_class* i_this) {
     }
 }
 
-/* 804F3E74-804F448C 004E74 0618+00 1/1 0/0 0/0 .text            e_fm_down__FP10e_fm_class */
 static s8 e_fm_down(e_fm_class* i_this) {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)i_this;
     s8 sp8 = 1;
@@ -1949,7 +1916,6 @@ static s8 e_fm_down(e_fm_class* i_this) {
     return sp8;
 }
 
-/* 804F448C-804F4740 00548C 02B4+00 1/1 0/0 0/0 .text            e_fm_a_down__FP10e_fm_class */
 static s8 e_fm_a_down(e_fm_class* i_this) {
     int anm_frame = i_this->mpFmModelMorf->getFrame();
     i_this->mDamageInvulnerabilityTimer = 10;
@@ -2000,7 +1966,6 @@ static s8 e_fm_a_down(e_fm_class* i_this) {
     return 1;
 }
 
-/* 804F4740-804F4BDC 005740 049C+00 1/1 0/0 0/0 .text            e_fm_start__FP10e_fm_class */
 static s8 e_fm_start(e_fm_class* i_this) {
     cXyz sp50;
     cXyz sp44;
@@ -2108,7 +2073,6 @@ static s8 e_fm_start(e_fm_class* i_this) {
     return var_r25;
 }
 
-/* 804F4BDC-804F4D74 005BDC 0198+00 1/1 0/0 0/0 .text            e_fm_end__FP10e_fm_class */
 static s8 e_fm_end(e_fm_class* i_this) {
     int anm_frame = i_this->mpFmModelMorf->getFrame();
     i_this->mDamageInvulnerabilityTimer = 5;
@@ -2152,7 +2116,6 @@ static s8 e_fm_end(e_fm_class* i_this) {
     return var_r30;
 }
 
-/* 804F4D74-804F5148 005D74 03D4+00 1/1 0/0 0/0 .text            damage_check__FP10e_fm_class */
 static void damage_check(e_fm_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp30;
@@ -2240,7 +2203,6 @@ static void damage_check(e_fm_class* i_this) {
     }
 }
 
-/* 804F5148-804F5990 006148 0848+00 1/1 0/0 0/0 .text chain_control1__FP10e_fm_classP7chain_si */
 static void chain_control1(e_fm_class* i_this, chain_s* i_chain_s, int param_2) {
     fopAc_ac_c* actor = i_this;
     cXyz sp80;
@@ -2381,7 +2343,6 @@ static void chain_control1(e_fm_class* i_this, chain_s* i_chain_s, int param_2)
     }
 }
 
-/* 804F5990-804F5EF4 006990 0564+00 1/1 0/0 0/0 .text chain_control2__FP10e_fm_classP7chain_si */
 static void chain_control2(e_fm_class* i_this, chain_s* i_chain_s, int param_2) {
     if ((i_chain_s->field_0x617c != 0) || (i_chain_s->field_0x619c != 0) || (i_chain_s->field_0x617e != 0)) {
         fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2488,7 +2449,6 @@ static void chain_control2(e_fm_class* i_this, chain_s* i_chain_s, int param_2)
     }
 }
 
-/* 804F5EF4-804F64A8 006EF4 05B4+00 1/1 0/0 0/0 .text chain_control3__FP10e_fm_classP7chain_si */
 static void chain_control3(e_fm_class* i_this, chain_s* i_chain_s, int param_2) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2603,10 +2563,8 @@ static void chain_control3(e_fm_class* i_this, chain_s* i_chain_s, int param_2)
     }
 }
 
-/* 804FAF80-804FAF84 000130 0004+00 2/2 0/0 0/0 .bss             ba_count */
 static int ba_count;
 
-/* 804F64A8-804F6500 0074A8 0058+00 1/1 0/0 0/0 .text            s_ba_sub__FPvPv */
 static void* s_ba_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BA) {
         ba_count++;
@@ -2615,7 +2573,6 @@ static void* s_ba_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804F6500-804F6BD0 007500 06D0+00 2/1 0/0 0/0 .text            action__FP10e_fm_class */
 static void action(e_fm_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2811,7 +2768,6 @@ static void action(e_fm_class* i_this) {
     }
 }
 
-/* 804F6BD0-804F72D0 007BD0 0700+00 1/1 0/0 0/0 .text            effect_set__FP10e_fm_class */
 static void effect_set(e_fm_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     cXyz sp4C(l_HIO.field_0x2c, l_HIO.field_0x2c, l_HIO.field_0x2c);
@@ -2986,7 +2942,6 @@ static void effect_set(e_fm_class* i_this) {
     MtxPosition(&sp34, &i_this->mFootPos[1]);
 }
 
-/* 804F72D0-804F8C60 0082D0 1990+00 2/1 0/0 0/0 .text            daE_FM_Execute__FP10e_fm_class */
 static int daE_FM_Execute(e_fm_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -3494,12 +3449,10 @@ static int daE_FM_Execute(e_fm_class* i_this) {
     return 1;
 }
 
-/* 804F8C60-804F8C68 009C60 0008+00 1/0 0/0 0/0 .text            daE_FM_IsDelete__FP10e_fm_class */
 static int daE_FM_IsDelete(e_fm_class* i_this) {
     return 1;
 }
 
-/* 804F8C68-804F8CE8 009C68 0080+00 1/0 0/0 0/0 .text            daE_FM_Delete__FP10e_fm_class */
 static int daE_FM_Delete(e_fm_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "E_fm");
@@ -3518,7 +3471,6 @@ static int daE_FM_Delete(e_fm_class* i_this) {
     return 1;
 }
 
-/* 804F8CE8-804F95CC 009CE8 08E4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     J3DModelData* modelData;
     e_fm_class* a_this = (e_fm_class*)i_this;
@@ -3688,7 +3640,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 804F9614-804F9B64 00A614 0550+00 1/0 0/0 0/0 .text            daE_FM_Create__FP10fopAc_ac_c */
 static int daE_FM_Create(fopAc_ac_c* i_this) {
     e_fm_class* a_this = (e_fm_class*)i_this;
     fopAcM_ct(a_this, e_fm_class);
@@ -3919,10 +3870,8 @@ static int daE_FM_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 804F9B64-804F9E14 00AB64 02B0+00 1/1 0/0 0/0 .text            __ct__10e_fm_classFv */
 e_fm_class::e_fm_class() {}
 
-/* 804FAD88-804FADA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_FM_Method */
 static actor_method_class l_daE_FM_Method = {
     (process_method_func)daE_FM_Create,
     (process_method_func)daE_FM_Delete,
@@ -3931,7 +3880,6 @@ static actor_method_class l_daE_FM_Method = {
     (process_method_func)daE_FM_Draw,
 };
 
-/* 804FADA8-804FADD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_FM */
 extern actor_process_profile_definition g_profile_E_FM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp
index d5b8edaaa8..a7787262eb 100644
--- a/src/d/actor/d_a_e_fs.cpp
+++ b/src/d/actor/d_a_e_fs.cpp
@@ -19,8 +19,8 @@
 
 class daE_Fs_HIO_c {
 public:
-    /* 806BBACC */ daE_Fs_HIO_c();
-    /* 806BDF94 */ virtual ~daE_Fs_HIO_c() {}
+    daE_Fs_HIO_c();
+    virtual ~daE_Fs_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mScale;
@@ -67,19 +67,15 @@ enum Joint {
 
 namespace {
 
-/* 806BE79C-806BE7A0 -00001 0004+00 1/1 0/0 0/0 .bss             None */
 /* 806BE79E 0002+00 data_806BE79E s_AtCount__22@unnamed@d_a_e_fs_cpp@ */
 static s16 s_AtCount;
 
 }  // namespace
 
-/* 806BE7A0-806BE7A4 000048 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 806BE7B0-806BE7CC 000058 001C+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_Fs_HIO_c l_HIO;
 
-/* 806BBACC-806BBB10 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__12daE_Fs_HIO_cFv */
 daE_Fs_HIO_c::daE_Fs_HIO_c() {
     field_0x4 = -1;
     mScale = 1.0f;
@@ -89,14 +85,12 @@ daE_Fs_HIO_c::daE_Fs_HIO_c() {
     mDeleteRange = 2000.0f;
 }
 
-/* 806BBB10-806BBBBC 000130 00AC+00 7/7 0/0 0/0 .text            anm_init__FP10e_fs_classifUcf */
 static void anm_init(e_fs_class* i_this, int i_anm, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_FS", i_anm),
                            i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_anm;
 }
 
-/* 806BBBBC-806BBCDC 0001DC 0120+00 1/0 0/0 0/0 .text            daE_Fs_Draw__FP10e_fs_class */
 static int daE_Fs_Draw(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -115,7 +109,6 @@ static int daE_Fs_Draw(e_fs_class* i_this) {
     return 1;
 }
 
-/* 806BBCDC-806BBDF4 0002FC 0118+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_fs_classfs */
 static BOOL way_bg_check(e_fs_class* i_this, f32 i_offset, s16 i_angle) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     dBgS_LinChk lin_chk;
@@ -134,7 +127,6 @@ static BOOL way_bg_check(e_fs_class* i_this, f32 i_offset, s16 i_angle) {
     }
 }
 
-/* 806BBDF4-806BC0A8 000414 02B4+00 1/1 0/0 0/0 .text            e_fs_appear__FP10e_fs_class */
 static void e_fs_appear(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     daE_PM_c* skullkid;
@@ -204,7 +196,6 @@ static void e_fs_appear(e_fs_class* i_this) {
     }
 }
 
-/* 806BC0A8-806BC264 0006C8 01BC+00 1/1 0/0 0/0 .text            e_fs_wait__FP10e_fs_class */
 static void e_fs_wait(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     daE_PM_c* skullkid;
@@ -248,7 +239,6 @@ static void e_fs_wait(e_fs_class* i_this) {
     }
 }
 
-/* 806BC264-806BC444 000884 01E0+00 1/1 0/0 0/0 .text            e_fs_move__FP10e_fs_class */
 static void e_fs_move(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     switch (i_this->mMode) {
@@ -292,7 +282,6 @@ static void e_fs_move(e_fs_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetAngleY, 0x10, 0x400);
 }
 
-/* 806BC444-806BC750 000A64 030C+00 1/1 0/0 0/0 .text            e_fs_attack__FP10e_fs_class */
 static void e_fs_attack(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -338,7 +327,6 @@ static void e_fs_attack(e_fs_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 5, 0x400);
 }
 
-/* 806BC750-806BC818 000D70 00C8+00 1/1 0/0 0/0 .text            e_fs_damage__FP10e_fs_class */
 static void e_fs_damage(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     switch (i_this->mMode) {
@@ -358,7 +346,6 @@ static void e_fs_damage(e_fs_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 2.0f);
 }
 
-/* 806BC818-806BCC30 000E38 0418+00 1/1 0/0 0/0 .text            e_fs_end__FP10e_fs_class */
 static void e_fs_end(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     i_this->mIFrameTimer = 10;
@@ -429,7 +416,6 @@ static void e_fs_end(e_fs_class* i_this) {
     a_this->shape_angle.y += i_this->mTargetAngleY;
 }
 
-/* 806BCC30-806BCDDC 001250 01AC+00 1/1 0/0 0/0 .text            damage_check__FP10e_fs_class */
 static void damage_check(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     if (i_this->mAction != e_fs_class::ACT_END && a_this->health < 0) {
@@ -475,7 +461,6 @@ static void damage_check(e_fs_class* i_this) {
     }
 }
 
-/* 806BCDDC-806BCE5C 0013FC 0080+00 1/1 0/0 0/0 .text            checkViewArea__FP4cXyz */
 static bool checkViewArea(cXyz* i_pos) {
     Vec proj;
     mDoLib_project(i_pos, &proj);
@@ -486,7 +471,6 @@ static bool checkViewArea(cXyz* i_pos) {
     return ret;
 }
 
-/* 806BCE5C-806BD0A8 00147C 024C+00 2/1 0/0 0/0 .text            e_fs_demowait__FP10e_fs_class */
 static void e_fs_demowait(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     cXyz delta;
@@ -543,7 +527,6 @@ static void e_fs_demowait(e_fs_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetAngleY, 2, 0x1000);
 }
 
-/* 806BD0A8-806BD3E0 0016C8 0338+00 2/1 0/0 0/0 .text            action__FP10e_fs_class */
 static void action(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     cXyz vec1, vec2;
@@ -636,7 +619,6 @@ static void action(e_fs_class* i_this) {
     }
 }
 
-/* 806BD3E0-806BD6D0 001A00 02F0+00 2/1 0/0 0/0 .text            daE_Fs_Execute__FP10e_fs_class */
 static int daE_Fs_Execute(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     cXyz zero, center;
@@ -705,12 +687,10 @@ static int daE_Fs_Execute(e_fs_class* i_this) {
     return 1;
 }
 
-/* 806BD6D0-806BD6D8 001CF0 0008+00 1/0 0/0 0/0 .text            daE_Fs_IsDelete__FP10e_fs_class */
 static int daE_Fs_IsDelete(e_fs_class* i_this) {
     return 1;
 }
 
-/* 806BD6D8-806BD740 001CF8 0068+00 1/0 0/0 0/0 .text            daE_Fs_Delete__FP10e_fs_class */
 static int daE_Fs_Delete(e_fs_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->mEnemy;
     dComIfG_resDelete(&i_this->mPhase, "E_FS");
@@ -726,7 +706,6 @@ static int daE_Fs_Delete(e_fs_class* i_this) {
     return 1;
 }
 
-/* 806BD740-806BD838 001D60 00F8+00 1/1 0/0 0/0 .text            useHeapIe_fst__FP10fopAc_ac_c */
 static int useHeapIe_fst(fopAc_ac_c* i_this) {
     e_fs_class* _this = (e_fs_class*)i_this;
     _this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL,
@@ -740,7 +719,6 @@ static int useHeapIe_fst(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806BD838-806BDD38 001E58 0500+00 1/0 0/0 0/0 .text            daE_Fs_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_fs_class);
     e_fs_class* _this = (e_fs_class*)(i_this);
@@ -864,7 +842,6 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 806BE68C-806BE6AC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Fs_Method */
 static actor_method_class l_daE_Fs_Method = {
     (process_method_func)daE_Fs_Create,
     (process_method_func)daE_Fs_Delete,
@@ -873,7 +850,6 @@ static actor_method_class l_daE_Fs_Method = {
     (process_method_func)daE_Fs_Draw,
 };
 
-/* 806BE6AC-806BE6DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_FS */
 extern actor_process_profile_definition g_profile_E_FS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp
index 592c55860f..9d86113350 100644
--- a/src/d/actor/d_a_e_fz.cpp
+++ b/src/d/actor/d_a_e_fz.cpp
@@ -16,8 +16,8 @@
 
 class daE_FZ_HIO_c {
 public:
-    /* 806BE94C */ daE_FZ_HIO_c();
-    /* 806C1440 */ virtual ~daE_FZ_HIO_c() {};
+    daE_FZ_HIO_c();
+    virtual ~daE_FZ_HIO_c() {};
 
 public:
     /* 0x04 */ s8 field_0x04;
@@ -40,8 +40,6 @@ public:
 
 namespace {
 
-/* 806C1A38-806C1A78 000038 0040+00 1/1 0/0 0/0 .data            cc_fz_src__22@unnamed@d_a_e_fz_cpp@
- */
 static dCcD_SrcSph cc_fz_src = {
     {
         {0x0, {{0x100, 0x1, 0x0}, {0xd0fbfdff, 0x43}, 0x65}}, // mObj
@@ -54,7 +52,6 @@ static dCcD_SrcSph cc_fz_src = {
     } // mSphAttr
 };
 
-/* 806C1A78-806C1AB8 000078 0040+00 1/1 0/0 0/0 .data cc_fz_at_src__22@unnamed@d_a_e_fz_cpp@ */
 static dCcD_SrcSph cc_fz_at_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -69,7 +66,6 @@ static dCcD_SrcSph cc_fz_at_src = {
 
 }  // namespace
 
-/* 806BE94C-806BE9D4 0000EC 0088+00 1/1 0/0 0/0 .text            __ct__12daE_FZ_HIO_cFv */
 daE_FZ_HIO_c::daE_FZ_HIO_c() {
     field_0x04 = -1;
     field_0x0c = 1.4f;
@@ -87,7 +83,6 @@ daE_FZ_HIO_c::daE_FZ_HIO_c() {
     field_0x34 = 80.0f;
 }
 
-/* 806BE9D4-806BEAD8 000174 0104+00 1/1 0/0 0/0 .text            draw__8daE_FZ_cFv */
 s32 daE_FZ_c::draw() {
     if (field_0x714 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL,1)) {
         return 1;
@@ -110,18 +105,15 @@ s32 daE_FZ_c::draw() {
     return 1;
 }
 
-/* 806BEAD8-806BEAF8 000278 0020+00 1/0 0/0 0/0 .text            daE_FZ_Draw__FP8daE_FZ_c */
 static void daE_FZ_Draw(daE_FZ_c* i_this) {
     i_this->draw();
 }
 
-/* 806BEAF8-806BEB04 000298 000C+00 9/9 0/0 0/0 .text            setActionMode__8daE_FZ_cFii */
 void daE_FZ_c::setActionMode(int i_actionMode, int i_actionPhase) {
     mActionMode = i_actionMode;
     mActionPhase = i_actionPhase;
 }
 
-/* 806BEB04-806BEBA0 0002A4 009C+00 2/2 0/0 0/0 .text            setReflectAngle__8daE_FZ_cFv */
 void daE_FZ_c::setReflectAngle() {
     s16 x = current.angle.y - mLastWallHitAngle;
 
@@ -138,7 +130,6 @@ void daE_FZ_c::setReflectAngle() {
     }
 }
 
-/* 806BEBA0-806BEC08 000340 0068+00 2/2 0/0 0/0 .text            mBoundSoundset__8daE_FZ_cFv */
 void daE_FZ_c::mBoundSoundset() {
     u32 speed = speedF;
 
@@ -148,7 +139,6 @@ void daE_FZ_c::mBoundSoundset() {
     mCreature.startCreatureSound(Z2SE_EN_FZ_BOUND,speed,-1);
 }
 
-/* 806BEC08-806BED34 0003A8 012C+00 2/2 0/0 0/0 .text            deadnextSet__8daE_FZ_cFb */
 void daE_FZ_c::deadnextSet(bool param_0) {
     health = 0;
 
@@ -173,13 +163,10 @@ void daE_FZ_c::deadnextSet(bool param_0) {
     setActionMode(ACT_DAMAGE,0);
 }
 
-/* 806C1BA0-806C1BA4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_806C1BA0;
 
-/* 806C1BB0-806C1BE8 000018 0038+00 8/8 0/0 0/0 .bss             l_HIO */
 static daE_FZ_HIO_c l_HIO;
 
-/* 806BED34-806BF444 0004D4 0710+00 1/1 0/0 0/0 .text            damage_check__8daE_FZ_cFv */
 void daE_FZ_c::damage_check() {
   csXyz s_pos;
   cXyz pos;
@@ -355,7 +342,6 @@ void daE_FZ_c::damage_check() {
   }
 }
 
-/* 806BF444-806BF58C 000BE4 0148+00 3/3 0/0 0/0 .text            way_gake_check__8daE_FZ_cFv */
 bool daE_FZ_c::way_gake_check() {
     cXyz pos;
     dBgS_GndChk gnd_chk;
@@ -387,7 +373,6 @@ bool daE_FZ_c::way_gake_check() {
     return false;
 }
 
-/* 806BF58C-806BF8E8 000D2C 035C+00 1/1 0/0 0/0 .text            executeWait__8daE_FZ_cFv */
 void daE_FZ_c::executeWait() {
   cXyz pos;
   cXyz pos2;
@@ -467,7 +452,6 @@ void daE_FZ_c::executeWait() {
   }
 }
 
-/* 806BF8E8-806BFA64 001088 017C+00 1/1 0/0 0/0 .text            executeMove__8daE_FZ_cFv */
 void daE_FZ_c::executeMove() {
     switch (mActionPhase) {
         case 0:
@@ -494,7 +478,6 @@ void daE_FZ_c::executeMove() {
     }
 }
 
-/* 806BFA64-806BFB60 001204 00FC+00 1/1 0/0 0/0 .text            executeAttack__8daE_FZ_cFv */
 void daE_FZ_c::executeAttack() {
     switch (mActionPhase) {
     case 0:
@@ -516,7 +499,6 @@ void daE_FZ_c::executeAttack() {
     setActionMode(ACT_WAIT,0);
 }
 
-/* 806BFB60-806BFF94 001300 0434+00 2/1 0/0 0/0 .text            executeDamage__8daE_FZ_cFv */
 void daE_FZ_c::executeDamage() {
   cXyz pos;
   pos.set(l_HIO.field_0x0c, l_HIO.field_0x0c, l_HIO.field_0x0c);
@@ -617,7 +599,6 @@ void daE_FZ_c::executeDamage() {
   }
 }
 
-/* 806BFF94-806C0224 001734 0290+00 1/1 0/0 0/0 .text            executeRollMove__8daE_FZ_cFv */
 void daE_FZ_c::executeRollMove() {
     if (fopAcM_SearchByID(fopAcM_GetLinkId(this),&mpBlizzetaActor) == 0 || !mpBlizzetaActor) return;
     u32 model_no = static_cast<daB_YO_c*>(mpBlizzetaActor)->getModelNo();
@@ -684,7 +665,6 @@ void daE_FZ_c::executeRollMove() {
     shape_angle.y += field_0x704;
 }
 
-/* 806C0224-806C06DC 0019C4 04B8+00 1/1 0/0 0/0 .text            action__8daE_FZ_cFv */
 void daE_FZ_c::action() {
     int linkSearch;
     int i;
@@ -807,7 +787,6 @@ void daE_FZ_c::action() {
     }
 }
 
-/* 806C06DC-806C0760 001E7C 0084+00 2/2 0/0 0/0 .text            mtx_set__8daE_FZ_cFv */
 void daE_FZ_c::mtx_set() {
   mDoMtx_stack_c::transS(current.pos.x,current.pos.y,current.pos.z);
   mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -816,7 +795,6 @@ void daE_FZ_c::mtx_set() {
   mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 806C0760-806C08C4 001F00 0164+00 1/1 0/0 0/0 .text            cc_set__8daE_FZ_cFv */
 void daE_FZ_c::cc_set() {
     cXyz pos;
     cXyz pos2;
@@ -847,7 +825,6 @@ void daE_FZ_c::cc_set() {
     dComIfG_Ccsp()->Set(&mAtSph);
 }
 
-/* 806C08C4-806C0B00 002064 023C+00 1/1 0/0 0/0 .text            execute__8daE_FZ_cFv */
 s32 daE_FZ_c::execute() {
     if (field_0x714 == 2) {
         if (checkItemGet(fpcNm_ITEM_IRONBALL,1) == 0) {
@@ -899,12 +876,10 @@ s32 daE_FZ_c::execute() {
     return 1;
 }
 
-/* 806C0B00-806C0B20 0022A0 0020+00 1/0 0/0 0/0 .text            daE_FZ_Execute__FP8daE_FZ_c */
 static void daE_FZ_Execute(daE_FZ_c* i_this) {
     i_this->execute();
 }
 
-/* 806C0B20-806C0B8C 0022C0 006C+00 0/0 0/0 1/1 .text            demoDelete__8daE_FZ_cFv */
 void daE_FZ_c::demoDelete() {
     for (int i = 0; i < 3; i++) {
         dComIfGp_particle_levelEmitterOnEventMove(mParticleSet[i]);
@@ -913,12 +888,10 @@ void daE_FZ_c::demoDelete() {
     fopAcM_delete(this);
 }
 
-/* 806C0B8C-806C0B94 00232C 0008+00 1/0 0/0 0/0 .text            daE_FZ_IsDelete__FP8daE_FZ_c */
 static bool daE_FZ_IsDelete(daE_FZ_c* i_this) {
     return true;
 }
 
-/* 806C0B94-806C0C08 002334 0074+00 1/1 0/0 0/0 .text            _delete__8daE_FZ_cFv */
 s32 daE_FZ_c::_delete() {
     dComIfG_resDelete(&mPhaseReq,"E_FZ");
 
@@ -933,12 +906,10 @@ s32 daE_FZ_c::_delete() {
     return 1;
 }
 
-/* 806C0C08-806C0C28 0023A8 0020+00 1/0 0/0 0/0 .text            daE_FZ_Delete__FP8daE_FZ_c */
 static void daE_FZ_Delete(daE_FZ_c* i_this) {
     i_this->_delete();
 }
 
-/* 806C0C28-806C0CB0 0023C8 0088+00 1/1 0/0 0/0 .text            CreateHeap__8daE_FZ_cFv */
 s32 daE_FZ_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_FZ", 3);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203);
@@ -950,12 +921,10 @@ s32 daE_FZ_c::CreateHeap() {
     return mInvisibleModel.create(mpModel, 1) != 0 ? 1 : 0;
 }
 
-/* 806C0CB0-806C0CD0 002450 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
   return static_cast<daE_FZ_c*>(i_this)->CreateHeap();
 }
 
-/* 806C0CD0-806C1208 002470 0538+00 1/1 0/0 0/0 .text            create__8daE_FZ_cFv */
 s32 daE_FZ_c::create() {
   fopAcM_ct(this,daE_FZ_c);
 
@@ -1060,7 +1029,6 @@ s32 daE_FZ_c::create() {
   return phase;
 }
 
-/* 806C13D8-806C13F8 002B78 0020+00 1/0 0/0 0/0 .text            daE_FZ_Create__FP8daE_FZ_c */
 static void daE_FZ_Create(daE_FZ_c* i_this) {
     i_this->create();
 }
diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp
index 0b253dc9cc..ffa924646e 100644
--- a/src/d/actor/d_a_e_ga.cpp
+++ b/src/d/actor/d_a_e_ga.cpp
@@ -9,13 +9,11 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 804FB0EC-804FB110 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__12daE_Ga_HIO_cFv */
 daE_Ga_HIO_c::daE_Ga_HIO_c() {
     id = -1;
     base_size = 1.0f;
 }
 
-/* 804FB110-804FB1B0 000110 00A0+00 1/0 0/0 0/0 .text            daE_Ga_Draw__FP10e_ga_class */
 static int daE_Ga_Draw(e_ga_class* a_this) {
     fopAc_ac_c* actor = &a_this->actor;
 
@@ -33,7 +31,6 @@ static int daE_Ga_Draw(e_ga_class* a_this) {
     return 1;
 }
 
-/* 804FB1B0-804FB3A8 0001B0 01F8+00 1/1 0/0 0/0 .text            ga_fly__FP10e_ga_classP4ga_s */
 static void ga_fly(e_ga_class* a_this, ga_s* ga_s) {
     fopAc_ac_c* actor = &a_this->actor;
 
@@ -72,7 +69,6 @@ static void ga_fly(e_ga_class* a_this, ga_s* ga_s) {
     ga_s->field_0x44 += 0x3E00;
 }
 
-/* 804FB3A8-804FB5C0 0003A8 0218+00 1/1 0/0 0/0 .text            bt_fly__FP10e_ga_classP4ga_s */
 static void bt_fly(e_ga_class* a_this, ga_s* ga_s) {
     fopAc_ac_c* actor = &a_this->actor;
 
@@ -113,7 +109,6 @@ static void bt_fly(e_ga_class* a_this, ga_s* ga_s) {
     ga_s->field_0x3c = cM_ssin(ga_s->field_0x44);
 }
 
-/* 804FB5C0-804FB6F8 0005C0 0138+00 1/1 0/0 0/0 .text            ga_control__FP10e_ga_class */
 static void ga_control(e_ga_class* a_this) {
     cXyz sp10;
     ga_s* ga_s = a_this->ga_s;
@@ -147,21 +142,17 @@ static void ga_control(e_ga_class* a_this) {
     }
 }
 
-/* 804FB6F8-804FB71C 0006F8 0024+00 2/1 0/0 0/0 .text            daE_Ga_Execute__FP10e_ga_class */
 static int daE_Ga_Execute(e_ga_class* a_this) {
     ga_control(a_this);
     return 1;
 }
 
-/* 804FB71C-804FB724 00071C 0008+00 1/0 0/0 0/0 .text            daE_Ga_IsDelete__FP10e_ga_class */
 static int daE_Ga_IsDelete(e_ga_class* a_this) {
     return 1;
 }
 
-/* 804FBC48-804FBC4C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 804FB724-804FB7C4 000724 00A0+00 1/0 0/0 0/0 .text            daE_Ga_Delete__FP10e_ga_class */
 static int daE_Ga_Delete(e_ga_class* a_this) {
     fopAc_ac_c* actor = &a_this->actor;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -180,7 +171,6 @@ static int daE_Ga_Delete(e_ga_class* a_this) {
     return 1;
 }
 
-/* 804FB7C4-804FB874 0007C4 00B0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_ga_class* a_this = (e_ga_class*)i_this;
 
@@ -197,10 +187,8 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 804FBC58-804FBC64 000018 000C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daE_Ga_HIO_c l_HIO;
 
-/* 804FB874-804FBAB8 000874 0244+00 1/0 0/0 0/0 .text            daE_Ga_Create__FP10fopAc_ac_c */
 static int daE_Ga_Create(fopAc_ac_c* i_this) {
     static const int l_bmdidx[] = {3};
 
@@ -268,7 +256,6 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 804FBBE0-804FBC00 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Ga_Method */
 static actor_method_class l_daE_Ga_Method = {
     (process_method_func)daE_Ga_Create,
     (process_method_func)daE_Ga_Delete,
@@ -277,7 +264,6 @@ static actor_method_class l_daE_Ga_Method = {
     (process_method_func)daE_Ga_Draw,
 };
 
-/* 804FBC00-804FBC30 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GA */
 extern actor_process_profile_definition g_profile_E_GA = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp
index 94195620b5..f57cb33dd8 100644
--- a/src/d/actor/d_a_e_gb.cpp
+++ b/src/d/actor/d_a_e_gb.cpp
@@ -15,8 +15,8 @@
 
 class daE_GB_HIO_c : public JORReflexible{
 public:
-    /* 806C1CEC */ daE_GB_HIO_c();
-    /* 806C6F98 */ virtual ~daE_GB_HIO_c() {}
+    daE_GB_HIO_c();
+    virtual ~daE_GB_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -31,7 +31,6 @@ public:
 };
 
 
-/* 806C1CEC-806C1D3C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_GB_HIO_cFv */
 daE_GB_HIO_c::daE_GB_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.0f;
@@ -43,21 +42,18 @@ daE_GB_HIO_c::daE_GB_HIO_c() {
     field_0x1e = 10;
 }
 
-/* 806C1D3C-806C1DEC 00013C 00B0+00 7/7 0/0 0/0 .text            head_anm_init__FP10e_gb_classifUcf */
 static void head_anm_init(e_gb_class* i_this, int param_2, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpModelMorf1->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_gb", param_2), i_mode,
                                  i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->field_0x688 = param_2;
 }
 
-/* 806C1DEC-806C1E9C 0001EC 00B0+00 5/5 0/0 0/0 .text            body_anm_init__FP10e_gb_classifUcf */
 static void body_anm_init(e_gb_class* i_this, int param_2, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpModelMorf2->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_gb", param_2), i_mode,
                                  i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->field_0x68c = param_2;
 }
 
-/* 806C1E9C-806C2078 00029C 01DC+00 1/0 0/0 0/0 .text            daE_GB_Draw__FP10e_gb_class */
 static int daE_GB_Draw(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
 
@@ -105,13 +101,10 @@ static int daE_GB_Draw(e_gb_class* i_this) {
     return 1;
 }
 
-/* 806C7928-806C792C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_806C7928;
 
-/* 806C7938-806C7958 000018 0020+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_GB_HIO_c l_HIO;
 
-/* 806C2078-806C2560 000478 04E8+00 1/1 0/0 0/0 .text            e_gb_wait__FP10e_gb_class */
 static void e_gb_wait(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -177,7 +170,6 @@ static void e_gb_wait(e_gb_class* i_this) {
     }
 }
 
-/* 806C2560-806C2AB0 000960 0550+00 1/1 0/0 0/0 .text            e_gb_attack_1__FP10e_gb_class */
 static void e_gb_attack_1(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -274,7 +266,6 @@ static void e_gb_attack_1(e_gb_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, a_this->current.angle.x, 8, 0x400);
 }
 
-/* 806C2AB0-806C2FC0 000EB0 0510+00 1/1 0/0 0/0 .text            e_gb_attack_2__FP10e_gb_class */
 static void e_gb_attack_2(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -357,7 +348,6 @@ static void e_gb_attack_2(e_gb_class* i_this) {
     }
 }
 
-/* 806C2FC0-806C3194 0013C0 01D4+00 1/1 0/0 0/0 .text            e_gb_damage__FP10e_gb_class */
 static void e_gb_damage(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz sp24;
@@ -404,7 +394,6 @@ static void e_gb_damage(e_gb_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, 0, 4, 0x800);
 }
 
-/* 806C3194-806C33C8 001594 0234+00 1/1 0/0 0/0 .text            e_gb_end__FP10e_gb_class */
 static void e_gb_end(e_gb_class* i_this) {
     static u16 eno[2] = {
         0x832F,
@@ -455,7 +444,6 @@ static void e_gb_end(e_gb_class* i_this) {
     a_this->current.pos.y -= 5.0f;
 }
 
-/* 806C33C8-806C3558 0017C8 0190+00 1/1 0/0 0/0 .text            e_gb_start__FP10e_gb_class */
 static void e_gb_start(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz sp28;
@@ -495,7 +483,6 @@ static void e_gb_start(e_gb_class* i_this) {
     }
 }
 
-/* 806C3558-806C3904 001958 03AC+00 1/1 0/0 0/0 .text            kuki_control1__FP10e_gb_class */
 static void kuki_control1(e_gb_class* i_this) {
     static s16 pow_xa[17] = {
         0xD000, 0xD800, 0xE000, 0xE800, 0xF000,
@@ -594,7 +581,6 @@ static void kuki_control1(e_gb_class* i_this) {
     }
 }
 
-/* 806C3904-806C3A78 001D04 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10e_gb_class */
 static void kuki_control2(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz sp58, sp64;
@@ -630,7 +616,6 @@ static void kuki_control2(e_gb_class* i_this) {
     }
 }
 
-/* 806C3A78-806C3C44 001E78 01CC+00 1/1 0/0 0/0 .text            kuki_control3__FP10e_gb_class */
 static void kuki_control3(e_gb_class* i_this) {
     cXyz sp40;
     sp40 = i_this->field_0x6e4[0] - i_this->field_0x6d4;
@@ -644,7 +629,6 @@ static void kuki_control3(e_gb_class* i_this) {
     i_this->field_0x964 = sp40.abs();
 }
 
-/* 806C3C44-806C3D20 002044 00DC+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) {
         cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->home.pos;
@@ -656,7 +640,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806C3D20-806C3F0C 002120 01EC+00 1/1 0/0 0/0 .text            damage_check__FP10e_gb_class */
 static void damage_check(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
 
@@ -696,7 +679,6 @@ static void damage_check(e_gb_class* i_this) {
     }
 }
 
-/* 806C3F0C-806C44F8 00230C 05EC+00 2/1 0/0 0/0 .text            action__FP10e_gb_class */
 static void action(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -849,7 +831,6 @@ static void action(e_gb_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &sp4c);
 }
 
-/* 806C44F8-806C451C 0028F8 0024+00 1/1 0/0 0/0 .text            e_gf_wait__FP10e_gb_class */
 static void e_gf_wait(e_gb_class* i_this) {
     switch (i_this->field_0x6a0) {
         case 0:
@@ -862,7 +843,6 @@ static void e_gf_wait(e_gb_class* i_this) {
     }
 }
 
-/* 806C451C-806C4688 00291C 016C+00 1/1 0/0 0/0 .text            e_gf_chance__FP10e_gb_class */
 static void e_gf_chance(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz sp38;
@@ -898,7 +878,6 @@ static void e_gf_chance(e_gb_class* i_this) {
     }
 }
 
-/* 806C4688-806C48EC 002A88 0264+00 1/1 0/0 0/0 .text            e_gf_eatbomb__FP10e_gb_class */
 static void e_gf_eatbomb(e_gb_class* i_this) {
     static u16 eno[5] = {
         0x82E8,
@@ -946,7 +925,6 @@ static void e_gf_eatbomb(e_gb_class* i_this) {
     }
 }
 
-/* 806C48EC-806C4AB4 002CEC 01C8+00 1/1 0/0 0/0 .text            e_gf_end__FP10e_gb_class */
 static void e_gf_end(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz sp30;
@@ -983,7 +961,6 @@ static void e_gf_end(e_gb_class* i_this) {
     }
 }
 
-/* 806C4AB4-806C4CC4 002EB4 0210+00 1/1 0/0 0/0 .text            damage_check2__FP10e_gb_class */
 static void damage_check2(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
 
@@ -1011,7 +988,6 @@ static void damage_check2(e_gb_class* i_this) {
     }
 }
 
-/* 806C4CC4-806C4E28 0030C4 0164+00 1/1 0/0 0/0 .text            action2__FP10e_gb_class */
 static void action2(e_gb_class* i_this) {
     damage_check2(i_this);
 
@@ -1052,7 +1028,6 @@ static void action2(e_gb_class* i_this) {
     }
 }
 
-/* 806C4E28-806C4F0C 003228 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_gb_classf */
 static void cam_3d_morf(e_gb_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->field_0xeb8.x, param_2, 
                   i_this->field_0xed0.x * i_this->field_0xee4);
@@ -1069,7 +1044,6 @@ static void cam_3d_morf(e_gb_class* i_this, f32 param_2) {
                   i_this->field_0xec4.z * i_this->field_0xee4);
 }
 
-/* 806C4F0C-806C59F4 00330C 0AE8+00 1/1 0/0 0/0 .text            demo_camera__FP10e_gb_class */
 static void demo_camera(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1283,7 +1257,6 @@ static void demo_camera(e_gb_class* i_this) {
     }
 }
 
-/* 806C59F4-806C64A0 003DF4 0AAC+00 2/1 0/0 0/0 .text            daE_GB_Execute__FP10e_gb_class */
 static int daE_GB_Execute(e_gb_class* i_this) {
     static u16 key_eno[2] = {
         0x827A,
@@ -1504,12 +1477,10 @@ static int daE_GB_Execute(e_gb_class* i_this) {
     return 1;
 }
 
-/* 806C64A0-806C64A8 0048A0 0008+00 1/0 0/0 0/0 .text            daE_GB_IsDelete__FP10e_gb_class */
 static int daE_GB_IsDelete(e_gb_class* i_this) {
     return 1;
 }
 
-/* 806C64A8-806C651C 0048A8 0074+00 1/0 0/0 0/0 .text            daE_GB_Delete__FP10e_gb_class */
 static int daE_GB_Delete(e_gb_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     dComIfG_resDelete(&i_this->mPhase, "E_gb");
@@ -1524,7 +1495,6 @@ static int daE_GB_Delete(e_gb_class* i_this) {
     return 1;
 }
 
-/* 806C651C-806C6894 00491C 0378+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_gb_class* i_this = (e_gb_class*)a_this;
 
@@ -1579,7 +1549,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 806C68DC-806C6B94 004CDC 02B8+00 1/0 0/0 0/0 .text            daE_GB_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_GB_Create(fopAc_ac_c* a_this) {
     static dCcD_SrcSph head_cc_sph_src = {
         {
@@ -1680,10 +1649,8 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 806C6B94-806C6D34 004F94 01A0+00 1/1 0/0 0/0 .text            __ct__10e_gb_classFv */
 e_gb_class::e_gb_class() {}
 
-/* 806C784C-806C786C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GB_Method */
 static actor_method_class l_daE_GB_Method = {
     (process_method_func)daE_GB_Create,
     (process_method_func)daE_GB_Delete,
@@ -1692,7 +1659,6 @@ static actor_method_class l_daE_GB_Method = {
     (process_method_func)daE_GB_Draw,
 };
 
-/* 806C786C-806C789C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GB */
 extern actor_process_profile_definition g_profile_E_GB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp
index 68203511b9..ec46fbd893 100644
--- a/src/d/actor/d_a_e_ge.cpp
+++ b/src/d/actor/d_a_e_ge.cpp
@@ -14,8 +14,8 @@
 
 class daE_GE_HIO_c : public JORReflexible {
 public:
-    /* 806C7A4C */ daE_GE_HIO_c();
-    /* 806CCA58 */ virtual ~daE_GE_HIO_c() {}
+    daE_GE_HIO_c();
+    virtual ~daE_GE_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -46,13 +46,10 @@ enum daE_GE_Action {
     /* 9 */ ACTION_MAX
 };
 
-/* 806CD358-806CD35C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806CD368-806CD39C 000018 0034+00 12/12 0/0 0/0 .bss             l_HIO */
 static daE_GE_HIO_c l_HIO;
 
-/* 806C7A4C-806C7AB8 0000EC 006C+00 1/1 0/0 0/0 .text            __ct__12daE_GE_HIO_cFv */
 daE_GE_HIO_c::daE_GE_HIO_c() {
     id = -1;
     player_recognition_distance = 1000.0f;
@@ -68,13 +65,11 @@ daE_GE_HIO_c::daE_GE_HIO_c() {
     next_attack_timer = 110.0f;
 }
 
-/* 806C7AB8-806C7B5C 000158 00A4+00 10/10 0/0 0/0 .text            bckSet__8daE_GE_cFifUcf */
 void daE_GE_c::bckSet(int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_GE", i_index);
     mpMorfSO->setAnm(transform, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806C7B5C-806C7BB8 0001FC 005C+00 3/3 0/0 0/0 .text            bckCheck__8daE_GE_cFi */
 bool daE_GE_c::bckCheck(int i_index) {
     J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_GE", i_index);
 
@@ -85,7 +80,6 @@ bool daE_GE_c::bckCheck(int i_index) {
     return false;
 }
 
-/* 806C7BB8-806C7C8C 000258 00D4+00 1/1 0/0 0/0 .text            draw__8daE_GE_cFv */
 int daE_GE_c::draw() {
     J3DModel* model = mpMorfSO->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -99,12 +93,10 @@ int daE_GE_c::draw() {
     return 1;
 }
 
-/* 806C7C8C-806C7CAC 00032C 0020+00 1/0 0/0 0/0 .text            daE_GE_Draw__FP8daE_GE_c */
 static int daE_GE_Draw(daE_GE_c* i_this) {
     return i_this->draw();
 }
 
-/* 806C7CAC-806C7DB8 00034C 010C+00 1/1 0/0 0/0 .text            checkBeforeBg__8daE_GE_cFif */
 bool daE_GE_c::checkBeforeBg(int param_0, f32 param_1) {
     cXyz end;
     if (param_0 == 0) {
@@ -123,7 +115,6 @@ bool daE_GE_c::checkBeforeBg(int param_0, f32 param_1) {
     return false;
 }
 
-/* 806C7DB8-806C7E7C 000458 00C4+00 2/2 0/0 0/0 .text            s_arrow_sub__FPvPv */
 static void* s_arrow_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) {
@@ -138,7 +129,6 @@ static void* s_arrow_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806C7E7C-806C7F44 00051C 00C8+00 2/2 0/0 0/0 .text            s_ge_surprise__FPvPv */
 static void* s_ge_surprise(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) {
@@ -153,7 +143,6 @@ static void* s_ge_surprise(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806C7F44-806C7FE4 0005E4 00A0+00 2/2 0/0 0/0 .text            s_ge_caw__FPvPv */
 static void* s_ge_caw(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) {
@@ -168,10 +157,8 @@ static void* s_ge_caw(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806CD39C-806CD3A0 00004C 0004+00 4/4 0/0 0/0 .bss             target_count */
 static s32 target_count;
 
-/* 806C7FE4-806C8068 000684 0084+00 1/1 0/0 0/0 .text            s_ge_attack__FPvPv */
 static void* s_ge_attack(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) {
@@ -183,7 +170,6 @@ static void* s_ge_attack(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806C8068-806C80F8 000708 0090+00 1/1 0/0 0/0 .text            s_ge_attack2__FPvPv */
 static void* s_ge_attack2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GE) {
@@ -196,7 +182,6 @@ static void* s_ge_attack2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806C80F8-806C8130 000798 0038+00 12/12 0/0 0/0 .text            setActionMode__8daE_GE_cFi */
 void daE_GE_c::setActionMode(int i_actionMode) {
     mPrevActionMode = mActionMode;
     mActionMode = i_actionMode;
@@ -210,7 +195,6 @@ void daE_GE_c::setActionMode(int i_actionMode) {
     attention_info.distances[fopAc_attn_BATTLE_e] = 3;
 }
 
-/* 806C8130-806C8374 0007D0 0244+00 1/1 0/0 0/0 .text            damage_check__8daE_GE_cFv */
 void daE_GE_c::damage_check() {
     if (mDamageCooldownTimer == 0) {
         mStts.Move();
@@ -267,7 +251,6 @@ void daE_GE_c::damage_check() {
     }
 }
 
-/* 806C8374-806C83F8 000A14 0084+00 1/1 0/0 0/0 .text            checkOtherAttacker__8daE_GE_cFv */
 bool daE_GE_c::checkOtherAttacker() {
     if (mActionMode != ACTION_ATTACK) {
         return false;
@@ -283,7 +266,6 @@ bool daE_GE_c::checkOtherAttacker() {
     return false;
 }
 
-/* 806C83F8-806C84A0 000A98 00A8+00 2/2 0/0 0/0 .text            searchNextAttacker__8daE_GE_cFv */
 bool daE_GE_c::searchNextAttacker() {
     if (mMoveType == 2) {
         return false;
@@ -300,8 +282,6 @@ bool daE_GE_c::searchNextAttacker() {
     return true;
 }
 
-/* 806C84A0-806C8518 000B40 0078+00 2/2 0/0 0/0 .text checkCircleSpeedAdd__8daE_GE_cFP4cXyzP4cXyz
- */
 bool daE_GE_c::checkCircleSpeedAdd(cXyz* i_src, cXyz* param_1) {
     cXyz position;
     cLib_offsetPos(&position, i_src, field_0xb8c, param_1);
@@ -310,8 +290,6 @@ bool daE_GE_c::checkCircleSpeedAdd(cXyz* i_src, cXyz* param_1) {
     return abs((s16)(field_0xb8c - targetAngleY)) < 0x2000;
 }
 
-/* 806C8518-806C88C8 000BB8 03B0+00 1/1 0/0 0/0 .text setAddCalcSpeed__8daE_GE_cFR4cXyzRC4cXyzffff
- */
 void daE_GE_c::setAddCalcSpeed(cXyz& param_0, cXyz const& param_1, f32 param_2, f32 param_3,
                                f32 param_4, f32 param_5) {
     // Can't prove that this exists in debug but it seems necessary for the logic
@@ -335,7 +313,6 @@ void daE_GE_c::setAddCalcSpeed(cXyz& param_0, cXyz const& param_1, f32 param_2,
     cLib_chaseF(&speed.y, speed_vec.y, param_5);
 }
 
-/* 806C88C8-806C89C0 000F68 00F8+00 4/4 0/0 0/0 .text calcCircleFly__8daE_GE_cFP4cXyzP4cXyzsfsf */
 cXyz daE_GE_c::calcCircleFly(cXyz* i_src, cXyz* i_vec, s16 i_angle, f32 param_3, s16 i_scale,
                              f32 param_5) {
     cXyz position;
@@ -353,7 +330,6 @@ cXyz daE_GE_c::calcCircleFly(cXyz* i_src, cXyz* i_vec, s16 i_angle, f32 param_3,
     return current.pos - position;
 }
 
-/* 806C89C0-806C8C20 001060 0260+00 1/0 0/0 0/0 .text            executeWait__8daE_GE_cFv */
 void daE_GE_c::executeWait() {
     fpcM_Search(s_arrow_sub, this);
 
@@ -403,7 +379,6 @@ void daE_GE_c::executeWait() {
     }
 }
 
-/* 806C8C20-806C9150 0012C0 0530+00 1/0 0/0 0/0 .text            executeFly__8daE_GE_cFv */
 void daE_GE_c::executeFly() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz position;
@@ -493,8 +468,6 @@ void daE_GE_c::executeFly() {
     }
 }
 
-/* 806C9150-806C921C 0017F0 00CC+00 1/1 0/0 0/0 .text            checkAttackPossible__8daE_GE_cFsb
- */
 bool daE_GE_c::checkAttackPossible(s16 i_angle, bool param_1) {
     if (field_0xb8e[0] == 0 && (i_angle > (s16)l_HIO.attack_start_angle || param_1)) {
         if (fopAcM_searchPlayerDistanceXZ(this) < l_HIO.minimum_attack_radius) {
@@ -509,7 +482,6 @@ bool daE_GE_c::checkAttackPossible(s16 i_angle, bool param_1) {
     return false;
 }
 
-/* 806C921C-806C9F04 0018BC 0CE8+00 1/0 0/0 0/0 .text            executeAttack__8daE_GE_cFv */
 void daE_GE_c::executeAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz position;
@@ -664,7 +636,6 @@ void daE_GE_c::executeAttack() {
     cLib_chaseAngleS(&shape_angle.x, cM_atan2s(speedF, speed.y) - 0x4000, 0x180);
 }
 
-/* 806C9F04-806CA024 0025A4 0120+00 1/1 0/0 0/0 .text            setBackAnime__8daE_GE_cFi */
 void daE_GE_c::setBackAnime(int param_0) {
     if (speed.y > 0.0f || mBackAnimeTimer != 0) {
         J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_GE", 7);
@@ -684,7 +655,6 @@ void daE_GE_c::setBackAnime(int param_0) {
     }
 }
 
-/* 806CA024-806CAA34 0026C4 0A10+00 2/0 0/0 0/0 .text            executeBack__8daE_GE_cFv */
 void daE_GE_c::executeBack() {
     cXyz position;
     cXyz position2;
@@ -814,7 +784,6 @@ void daE_GE_c::executeBack() {
     cLib_chaseAngleS(&shape_angle.x, chaseAngle, 0x180);
 }
 
-/* 806CAA34-806CADCC 0030D4 0398+00 1/0 0/0 0/0 .text            executeDown__8daE_GE_cFv */
 void daE_GE_c::executeDown() {
     mDamageCooldownTimer = 10;
 
@@ -897,14 +866,12 @@ void daE_GE_c::executeDown() {
     }
 }
 
-/* 806CADCC-806CADF4 00346C 0028+00 2/2 0/0 0/0 .text            setSurpriseTime__8daE_GE_cFs */
 void daE_GE_c::setSurpriseTime(s16 i_surpriseTime) {
     if (getMoveType() == 0 && (mActionMode == ACTION_WAIT || mActionMode == ACTION_CAW)) {
         mSurpriseTime = i_surpriseTime;
     }
 }
 
-/* 806CADF4-806CAE58 003494 0064+00 1/1 0/0 0/0 .text            setSurprise__8daE_GE_cFv */
 void daE_GE_c::setSurprise() {
     if (getMoveType() == 0 && (mActionMode == ACTION_WAIT || mActionMode == ACTION_CAW)) {
         setActionMode(ACTION_SURPRISE);
@@ -912,7 +879,6 @@ void daE_GE_c::setSurprise() {
     fpcM_Search(s_ge_surprise, this);
 }
 
-/* 806CAE58-806CB280 0034F8 0428+00 1/0 0/0 0/0 .text            executeSurprise__8daE_GE_cFv */
 void daE_GE_c::executeSurprise() {
     cXyz vec;
 
@@ -972,7 +938,6 @@ void daE_GE_c::executeSurprise() {
     }
 }
 
-/* 806CB280-806CB2F0 003920 0070+00 1/1 0/0 0/0 .text            setCaw__8daE_GE_cFv */
 void daE_GE_c::setCaw() {
     if (getMoveType() == 0 && mActionMode == ACTION_WAIT) {
         setActionMode(ACTION_CAW);
@@ -980,7 +945,6 @@ void daE_GE_c::setCaw() {
     }
 }
 
-/* 806CB2F0-806CB6FC 003990 040C+00 1/0 0/0 0/0 .text            executeCaw__8daE_GE_cFv */
 void daE_GE_c::executeCaw() {
     fpcM_Search(s_arrow_sub, this);
 
@@ -1022,7 +986,6 @@ void daE_GE_c::executeCaw() {
     }
 }
 
-/* 806CB6FC-806CBAB8 003D9C 03BC+00 1/0 0/0 0/0 .text            executeWind__8daE_GE_cFv */
 void daE_GE_c::executeWind() {
     if (daPy_py_c::getThrowBoomerangActor() == NULL && mMode != 2) {
         mMode = 2;
@@ -1083,7 +1046,6 @@ void daE_GE_c::executeWind() {
     }
 }
 
-/* 806CBAB8-806CBC38 004158 0180+00 1/0 0/0 0/0 .text            executeShield__8daE_GE_cFv */
 void daE_GE_c::executeShield() {
     switch (mMode) {
     case 0:
@@ -1119,14 +1081,12 @@ void daE_GE_c::executeShield() {
     }
 }
 
-/* 806CD1E8-806CD254 0000D0 006C+00 1/2 0/0 0/0 .data            l_actionmenu__8daE_GE_c */
 daE_GE_c::actionFunc daE_GE_c::l_actionmenu[9] = {
     (&daE_GE_c::executeWait), (&daE_GE_c::executeFly),  (&daE_GE_c::executeAttack),
     (&daE_GE_c::executeBack), (&daE_GE_c::executeDown), (&daE_GE_c::executeSurprise),
     (&daE_GE_c::executeCaw),  (&daE_GE_c::executeWind), (&daE_GE_c::executeShield),
 };
 
-/* 806CBC38-806CBE98 0042D8 0260+00 1/1 0/0 0/0 .text            action__8daE_GE_cFv */
 void daE_GE_c::action() {
     mSphere.OffAtSetBit();
     damage_check();
@@ -1190,7 +1150,6 @@ void daE_GE_c::action() {
     mpMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 806CBE98-806CBEF0 004538 0058+00 2/2 0/0 0/0 .text            mtx_set__8daE_GE_cFv */
 void daE_GE_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -1198,7 +1157,6 @@ void daE_GE_c::mtx_set() {
     mpMorfSO->modelCalc();
 }
 
-/* 806CBEF0-806CC068 004590 0178+00 1/1 0/0 0/0 .text            cc_set__8daE_GE_cFv */
 void daE_GE_c::cc_set() {
     MTXCopy(mpMorfSO->getModel()->getAnmMtx(2), mDoMtx_stack_c::get());
 
@@ -1231,7 +1189,6 @@ void daE_GE_c::cc_set() {
     }
 }
 
-/* 806CC068-806CC1BC 004708 0154+00 1/1 0/0 0/0 .text            execute__8daE_GE_cFv */
 int daE_GE_c::execute() {
     for (int i = 0; i < 2; i++) {
         if (field_0xb8e[i] != 0) {
@@ -1272,17 +1229,14 @@ int daE_GE_c::execute() {
     return 1;
 }
 
-/* 806CC1BC-806CC1DC 00485C 0020+00 1/0 0/0 0/0 .text            daE_GE_Execute__FP8daE_GE_c */
 static int daE_GE_Execute(daE_GE_c* i_this) {
     return i_this->execute();
 }
 
-/* 806CC1DC-806CC1E4 00487C 0008+00 1/0 0/0 0/0 .text            daE_GE_IsDelete__FP8daE_GE_c */
 static int daE_GE_IsDelete(daE_GE_c* i_this) {
     return 1;
 }
 
-/* 806CC1E4-806CC258 004884 0074+00 1/1 0/0 0/0 .text            _delete__8daE_GE_cFv */
 int daE_GE_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_GE");
 
@@ -1298,12 +1252,10 @@ int daE_GE_c::_delete() {
     return 1;
 }
 
-/* 806CC258-806CC278 0048F8 0020+00 1/0 0/0 0/0 .text            daE_GE_Delete__FP8daE_GE_c */
 static int daE_GE_Delete(daE_GE_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806CC278-806CC370 004918 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_GE_cFv */
 int daE_GE_c::CreateHeap() {
     mpMorfSO = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_GE", 0xF), NULL, NULL,
                                     (J3DAnmTransform*)dComIfG_getObjectRes("E_GE", 0xC), 0, 1.0f, 0,
@@ -1316,12 +1268,10 @@ int daE_GE_c::CreateHeap() {
     return 1;
 }
 
-/* 806CC370-806CC390 004A10 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_GE_c*>(i_this)->CreateHeap();
 }
 
-/* 806CC390-806CC824 004A30 0494+00 1/1 0/0 0/0 .text            create__8daE_GE_cFv */
 int daE_GE_c::create() {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1416,19 +1366,16 @@ int daE_GE_c::create() {
     return phase;
 }
 
-/* 806CC9F0-806CCA10 005090 0020+00 1/0 0/0 0/0 .text            daE_GE_Create__FP8daE_GE_c */
 static int daE_GE_Create(daE_GE_c* i_this) {
     return i_this->create();
 }
 
-/* 806CD294-806CD2B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GE_Method */
 static actor_method_class l_daE_GE_Method = {
     (process_method_func)daE_GE_Create,  (process_method_func)daE_GE_Delete,
     (process_method_func)daE_GE_Execute, (process_method_func)daE_GE_IsDelete,
     (process_method_func)daE_GE_Draw,
 };
 
-/* 806CD2B4-806CD2E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GE */
 extern actor_process_profile_definition g_profile_E_GE = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp
index 180700e6d3..b39de4e9b4 100644
--- a/src/d/actor/d_a_e_gi.cpp
+++ b/src/d/actor/d_a_e_gi.cpp
@@ -12,8 +12,8 @@
 
 class daE_GI_HIO_c : public JORReflexible {
 public:
-    /* 806CD48C */ daE_GI_HIO_c();
-    /* 806D098C */ virtual ~daE_GI_HIO_c() {}
+    daE_GI_HIO_c();
+    virtual ~daE_GI_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -39,8 +39,6 @@ enum daE_GI_ACTION_e {
 };
 
 namespace {
-/* 806D0FBC-806D0FFC 000038 0040+00 1/1 0/0 0/0 .data            cc_gi_src__22@unnamed@d_a_e_gi_cpp@
- */
 static dCcD_SrcSph cc_gi_src = {
     {
         {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}}, // mObj
@@ -53,7 +51,6 @@ static dCcD_SrcSph cc_gi_src = {
     } // mSphAttr
 };
 
-/* 806D0FFC-806D103C 000078 0040+00 1/1 0/0 0/0 .data cc_gi_att_src__22@unnamed@d_a_e_gi_cpp@ */
 static dCcD_SrcSph cc_gi_att_src = {
     {
         {0x0, {{0x100000, 0x3, 0xD}, {0xD8FBFDFF, 0x0}, 0x75}}, // mObj
@@ -67,7 +64,6 @@ static dCcD_SrcSph cc_gi_att_src = {
 };
 }
 
-/* 806CD48C-806CD4F4 0000EC 0068+00 1/1 0/0 0/0 .text            __ct__12daE_GI_HIO_cFv */
 daE_GI_HIO_c::daE_GI_HIO_c() {
     id = -1;
     model_size = 1.1f;
@@ -81,7 +77,6 @@ daE_GI_HIO_c::daE_GI_HIO_c() {
     lever_spin_time = 35;
 }
 
-/* 806CD4F4-806CD594 000154 00A0+00 1/1 0/0 0/0 .text ctrlJoint__8daE_GI_cFP8J3DJointP8J3DModel */
 int daE_GI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -97,7 +92,6 @@ int daE_GI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806CD594-806CD5E0 0001F4 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_GI_cFP8J3DJointi */
 int daE_GI_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -111,7 +105,6 @@ int daE_GI_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806CD5E0-806CD848 000240 0268+00 1/1 0/0 0/0 .text            draw__8daE_GI_cFv */
 int daE_GI_c::draw() {
     J3DModel* model = mpModelMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -147,17 +140,14 @@ int daE_GI_c::draw() {
     return 1;
 }
 
-/* 806CD848-806CD868 0004A8 0020+00 1/0 0/0 0/0 .text            daE_GI_Draw__FP8daE_GI_c */
 static int daE_GI_Draw(daE_GI_c* a_this) {
     return a_this->draw();
 }
 
-/* 806CD868-806CD90C 0004C8 00A4+00 7/7 0/0 0/0 .text            setBck__8daE_GI_cFiUcff */
 void daE_GI_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_GI", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 806CD90C-806CD938 00056C 002C+00 8/8 0/0 0/0 .text            setActionMode__8daE_GI_cFii */
 void daE_GI_c::setActionMode(int i_actionMode, int i_moveMode) {
     mWallCheckRadius = 150.0f;
     mActionMode = i_actionMode;
@@ -166,13 +156,10 @@ void daE_GI_c::setActionMode(int i_actionMode, int i_moveMode) {
     offHeadLockFlg();
 }
 
-/* 806D1128-806D112C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806D1138-806D1164 000018 002C+00 15/15 0/0 0/0 .bss             l_HIO */
 static daE_GI_HIO_c l_HIO;
 
-/* 806CD938-806CDD1C 000598 03E4+00 1/1 0/0 0/0 .text            damage_check__8daE_GI_cFv */
 void daE_GI_c::damage_check() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     
@@ -280,7 +267,6 @@ void daE_GI_c::damage_check() {
     }
 }
 
-/* 806CDD1C-806CDD8C 00097C 0070+00 2/2 0/0 0/0 .text            setWeaponAtBit__8daE_GI_cFUc */
 void daE_GI_c::setWeaponAtBit(u8 i_onBit) {
     if (!i_onBit) {
         mAtSph[0].OffAtSetBit();
@@ -295,10 +281,8 @@ void daE_GI_c::setWeaponAtBit(u8 i_onBit) {
     }   
 }
 
-/* 806D1164-806D1168 000044 0004+00 4/4 0/0 0/0 .bss             m_cry_gi */
 static daE_GI_c* m_cry_gi;
 
-/* 806CDD8C-806CDED8 0009EC 014C+00 3/3 0/0 0/0 .text            setCryStop__8daE_GI_cFv */
 bool daE_GI_c::setCryStop() {
     if (m_cry_gi == NULL) {
         if (!daPy_getPlayerActorClass()->checkNowWolf()) {
@@ -322,14 +306,12 @@ bool daE_GI_c::setCryStop() {
     return false;
 }
 
-/* 806CDED8-806CDFB0 000B38 00D8+00 1/1 0/0 0/0 .text            setAttackEffect__8daE_GI_cFv */
 void daE_GI_c::setAttackEffect() {
     cXyz size(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     dComIfGp_particle_setPolyColor(0x8684, mAcch.m_gnd, &current.pos, &tevStr, &shape_angle, &size, 0, NULL, -1, NULL);
     dComIfGp_particle_set(0x8685, &current.pos, &tevStr, &shape_angle, &size);
 }
 
-/* 806CDFB0-806CE0D4 000C10 0124+00 1/1 0/0 0/0 .text            setDragSwordEffect__8daE_GI_cFv */
 void daE_GI_c::setDragSwordEffect() {
     cXyz size(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     cXyz pos;
@@ -349,7 +331,6 @@ void daE_GI_c::setDragSwordEffect() {
     mPolyColorKey = dComIfGp_particle_setPolyColor(mPolyColorKey, 0x8689, mAcch.m_gnd, &pos, &tevStr, &shape_angle, &size, 0, NULL, -1, NULL);
 }
 
-/* 806CE0D4-806CE184 000D34 00B0+00 1/1 0/0 0/0 .text            setDeathSmokeEffect__8daE_GI_cFv */
 void daE_GI_c::setDeathSmokeEffect() {
     cXyz size(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     cXyz pos;
@@ -359,7 +340,6 @@ void daE_GI_c::setDeathSmokeEffect() {
     dComIfGp_particle_setPolyColor(0xE7, mAcch.m_gnd, &pos, &tevStr, &shape_angle, &size, 0, NULL, -1, NULL);
 }
 
-/* 806CE184-806CE280 000DE4 00FC+00 3/3 0/0 0/0 .text            setDamageEffect__8daE_GI_cFv */
 void daE_GI_c::setDamageEffect() {
     cXyz size(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     cXyz pos;
@@ -372,7 +352,6 @@ void daE_GI_c::setDamageEffect() {
     }
 }
 
-/* 806CE280-806CE31C 000EE0 009C+00 1/1 0/0 0/0 .text            s_other_gi__FPvPv */
 static void* s_other_gi(void* i_actor, void* i_other) {
     if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI &&
         fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 1000.0f)
@@ -383,7 +362,6 @@ static void* s_other_gi(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 806CE31C-806CE3C4 000F7C 00A8+00 1/1 0/0 0/0 .text            s_battle_gi__FPvPv */
 static void* s_battle_gi(void* i_actor, void* i_other) {
     if (i_actor != i_other && fopAcM_IsActor(i_actor) && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_GI &&
         ((daE_GI_c*)i_actor)->isBattleOn() && fopAcM_searchActorDistance((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_other) < 500.0f)
@@ -394,7 +372,6 @@ static void* s_battle_gi(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 806CE3C4-806CE6AC 001024 02E8+00 1/1 0/0 0/0 .text            executeSleep__8daE_GI_cFv */
 void daE_GI_c::executeSleep() {
     switch (mMoveMode) {
     case 0:
@@ -453,7 +430,6 @@ void daE_GI_c::executeSleep() {
     }
 }
 
-/* 806CE6AC-806CE858 00130C 01AC+00 1/1 0/0 0/0 .text            executeWait__8daE_GI_cFv */
 void daE_GI_c::executeWait() {
     f32 player_dist = fopAcM_searchPlayerDistance(this);
 
@@ -481,7 +457,6 @@ void daE_GI_c::executeWait() {
     }
 }
 
-/* 806CE858-806CEC94 0014B8 043C+00 1/1 0/0 0/0 .text            executeChase__8daE_GI_cFv */
 void daE_GI_c::executeChase() {
     field_0x698 = 1;
 
@@ -555,7 +530,6 @@ void daE_GI_c::executeChase() {
     }
 }
 
-/* 806CEC94-806CF0B8 0018F4 0424+00 2/1 0/0 0/0 .text            executeAttack__8daE_GI_cFv */
 void daE_GI_c::executeAttack() {
     field_0x698 = 1;
 
@@ -642,7 +616,6 @@ void daE_GI_c::executeAttack() {
     }
 }
 
-/* 806CF0B8-806CF410 001D18 0358+00 1/1 0/0 0/0 .text            executeDamage__8daE_GI_cFv */
 void daE_GI_c::executeDamage() {
     switch (mMoveMode) {
     case 0:
@@ -714,7 +687,6 @@ void daE_GI_c::executeDamage() {
     }
 }
 
-/* 806CF410-806CF720 002070 0310+00 1/1 0/0 0/0 .text            executeBiteDamage__8daE_GI_cFv */
 void daE_GI_c::executeBiteDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -769,7 +741,6 @@ void daE_GI_c::executeBiteDamage() {
     }
 }
 
-/* 806CF720-806CF878 002380 0158+00 1/1 0/0 0/0 .text            PushButtonCount__8daE_GI_cFv */
 void daE_GI_c::PushButtonCount() {
     if (mPlayerStunTimer != 0) {
         if (abs((s16)(mPrevStickAngle - mDoCPd_c::getStickAngle3D(PAD_1))) > 0x1000) {
@@ -804,7 +775,6 @@ void daE_GI_c::PushButtonCount() {
     mPrevStickAngle = mDoCPd_c::getStickAngle3D(PAD_1);
 }
 
-/* 806CF878-806CFB60 0024D8 02E8+00 1/1 0/0 0/0 .text            action__8daE_GI_cFv */
 void daE_GI_c::action() {
     setWeaponAtBit(0);
     field_0x69f = 0;
@@ -888,7 +858,6 @@ void daE_GI_c::action() {
     mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 806CFB60-806CFBF0 0027C0 0090+00 1/1 0/0 0/0 .text            mtx_set__8daE_GI_cFv */
 void daE_GI_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -900,7 +869,6 @@ void daE_GI_c::mtx_set() {
     mpSwordModel->setBaseTRMtx(model->getAnmMtx(16));
 }
 
-/* 806CFBF0-806CFDF4 002850 0204+00 1/1 0/0 0/0 .text            cc_set__8daE_GI_cFv */
 void daE_GI_c::cc_set() {
     cXyz cc_center;
     J3DModel* model = mpModelMorf->getModel();
@@ -938,7 +906,6 @@ void daE_GI_c::cc_set() {
     }
 }
 
-/* 806CFDF4-806D002C 002A54 0238+00 1/1 0/0 0/0 .text            execute__8daE_GI_cFv */
 int daE_GI_c::execute() {
     if (field_0x684 != 0) {
         field_0x684--;
@@ -991,17 +958,14 @@ int daE_GI_c::execute() {
     return 1;
 }
 
-/* 806D002C-806D004C 002C8C 0020+00 2/1 0/0 0/0 .text            daE_GI_Execute__FP8daE_GI_c */
 static int daE_GI_Execute(daE_GI_c* a_this) {
     return a_this->execute();
 }
 
-/* 806D004C-806D0054 002CAC 0008+00 1/0 0/0 0/0 .text            daE_GI_IsDelete__FP8daE_GI_c */
 static int daE_GI_IsDelete(daE_GI_c* a_this) {
     return 1;
 }
 
-/* 806D0054-806D00C8 002CB4 0074+00 1/1 0/0 0/0 .text            _delete__8daE_GI_cFv */
 int daE_GI_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_GI");
 
@@ -1017,12 +981,10 @@ int daE_GI_c::_delete() {
     return 1;
 }
 
-/* 806D00C8-806D00E8 002D28 0020+00 1/0 0/0 0/0 .text            daE_GI_Delete__FP8daE_GI_c */
 static int daE_GI_Delete(daE_GI_c* a_this) {
     return a_this->_delete();
 }
 
-/* 806D00E8-806D025C 002D48 0174+00 1/1 0/0 0/0 .text            CreateHeap__8daE_GI_cFv */
 int daE_GI_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13);
     JUT_ASSERT(1621, modelData != NULL);
@@ -1051,12 +1013,10 @@ int daE_GI_c::CreateHeap() {
     return 1;
 }
 
-/* 806D025C-806D027C 002EBC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daE_GI_c*)i_this)->CreateHeap();
 }
 
-/* 806D027C-806D0608 002EDC 038C+00 1/1 0/0 0/1 .text            create__8daE_GI_cFv */
 int daE_GI_c::create() {
     fopAcM_ct(this, daE_GI_c);
 
@@ -1139,12 +1099,10 @@ int daE_GI_c::create() {
     return phase_state;
 }
 
-/* 806D0924-806D0944 003584 0020+00 1/0 0/0 0/0 .text            daE_GI_Create__FP8daE_GI_c */
 static int daE_GI_Create(daE_GI_c* a_this) {
     return a_this->create();
 }
 
-/* 806D1064-806D1084 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GI_Method */
 static actor_method_class l_daE_GI_Method = {
     (process_method_func)daE_GI_Create,
     (process_method_func)daE_GI_Delete,
@@ -1153,7 +1111,6 @@ static actor_method_class l_daE_GI_Method = {
     (process_method_func)daE_GI_Draw,
 };
 
-/* 806D1084-806D10B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GI */
 extern actor_process_profile_definition g_profile_E_GI = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp
index 2259c2a02e..f053165dc3 100644
--- a/src/d/actor/d_a_e_gm.cpp
+++ b/src/d/actor/d_a_e_gm.cpp
@@ -71,8 +71,8 @@ enum Type {
 
 class daE_GM_HIO_c {
 public:
-    /* 806D126C */ daE_GM_HIO_c();
-    /* 806D7428 */ virtual ~daE_GM_HIO_c() {}
+    daE_GM_HIO_c();
+    virtual ~daE_GM_HIO_c() {}
 
     /* 子ゴーマ - Baby Ghoma */
     /* 0x04 */ s8 id;
@@ -110,7 +110,6 @@ namespace {
     };
 } // namespace
 
-/* 806D126C-806D12C8 0000EC 005C+00 1/1 0/0 0/0 .text            __ct__12daE_GM_HIO_cFv */
 daE_GM_HIO_c::daE_GM_HIO_c() {
     id = -1;
     model_size = 1.3f;
@@ -123,7 +122,6 @@ daE_GM_HIO_c::daE_GM_HIO_c() {
     player_search_y_limit = 300.0f;
 }
 
-/* 806D12C8-806D136C 000148 00A4+00 16/16 0/0 0/0 .text setAction__8daE_GM_cFM8daE_GM_cFPCvPv_v */
 void daE_GM_c::setAction(actionFunc action) {
     if (mAction) {
         mMode = -1;
@@ -136,10 +134,8 @@ void daE_GM_c::setAction(actionFunc action) {
     (this->*mAction)();
 }
 
-/* 806D7EB8-806D7EC4 000048 000C+00 0/1 0/0 0/0 .bss             @4050 */
 static u8 l_initHIO;
 
-/* 806D7EC4-806D7EEC 000054 0028+00 5/8 0/0 0/0 .bss             l_HIO */
 static daE_GM_HIO_c l_HIO;
 
 namespace {
@@ -165,7 +161,6 @@ static u8 lbl_195_bss_AE;
 /* 806D7F1F 0001+00 data_806D7F1F None */
 static u8 lbl_195_bss_AF;
 
-/* 806D136C-806D14E0 0001EC 0174+00 1/1 0/0 0/0 .text            action__8daE_GM_cFv */
 void daE_GM_c::action() {
     if (field_0xa76) {
         if (checkAction(&daE_GM_c::egg_wait) || checkAction(&daE_GM_c::rebound)) {
@@ -186,7 +181,6 @@ void daE_GM_c::action() {
     (this->*mAction)();
 }
 
-/* 806D14E0-806D1580 000360 00A0+00 7/7 0/0 0/0 .text            s_obj_sub2__FPvPv */
 static void* s_obj_sub2(void* i_actor, void* i_data) {
     if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CSTATUE &&
         fopAcM_searchActorDistanceXZ((fopAc_ac_c*)i_actor, (fopAc_ac_c*)i_data) < 4000.0f && ((daCstatue_c*)i_actor)->checkBossAtGroundHit()) {
@@ -196,7 +190,6 @@ static void* s_obj_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806D1580-806D1A9C 000400 051C+00 3/6 0/0 0/0 .text            egg_wait__8daE_GM_cFv */
 void daE_GM_c::egg_wait() {
     if (mMode == 0) {
         cXyz sp3c, sp48;
@@ -306,7 +299,6 @@ void daE_GM_c::egg_wait() {
     }
 }
 
-/* 806D1A9C-806D1CC0 00091C 0224+00 2/0 0/0 0/0 .text            appear__8daE_GM_cFv */
 void daE_GM_c::appear() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -339,22 +331,18 @@ void daE_GM_c::appear() {
     }
 }
 
-/* 806D7A20-806D7A28 000080 0008+00 0/1 0/0 0/0 .rodata          l_rand */
 static s16 const l_rand[4] = {
     0xF800, 0x0400, 0xFC00, 0x0800,
 };
 
-/* 806D7A28-806D7A30 000088 0008+00 0/2 0/0 0/0 .rodata          l_rand2 */
 static s16 const l_rand2[4] = {
     0xD000, 0x3800, 0xB800, 0x5000,
 };
 
-/* 806D7A30-806D7A40 000090 0010+00 0/0 0/0 0/0 .rodata          l_rand_base_spd */
 static f32 const l_rand_base_spd[4] = {
     -2.0f, 0.0f, 0.0f, 2.0f,
 };
 
-/* 806D1CC0-806D21A4 000B40 04E4+00 4/0 0/0 0/0 .text            walk__8daE_GM_cFv */
 void daE_GM_c::walk() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -416,7 +404,6 @@ void daE_GM_c::walk() {
     }
 }
 
-/* 806D21A4-806D2294 001024 00F0+00 3/3 0/0 0/0 .text            create_item__8daE_GM_cFv */
 void daE_GM_c::create_item() {
     if (mType == TYPE_NORMAL) {
         fopAcM_createItemFromEnemyID(field_0x564, &current.pos, -1, -1, NULL, NULL, NULL, NULL);
@@ -441,7 +428,6 @@ void daE_GM_c::create_item() {
     }
 }
 
-/* 806D2294-806D24C0 001114 022C+00 1/0 0/0 0/0 .text            pechanko_damage__8daE_GM_cFv */
 void daE_GM_c::pechanko_damage() {
     if (mMode == 0) {
         mSph.SetAtType(AT_TYPE_0);
@@ -485,7 +471,6 @@ void daE_GM_c::pechanko_damage() {
     }
 }
 
-/* 806D24C0-806D25E8 001340 0128+00 1/0 0/0 0/0 .text            wait__8daE_GM_cFv */
 void daE_GM_c::wait() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -507,7 +492,6 @@ void daE_GM_c::wait() {
     }
 }
 
-/* 806D25E8-806D289C 001468 02B4+00 1/0 0/0 0/0 .text            egg_damage__8daE_GM_cFv */
 void daE_GM_c::egg_damage() {
     if (mMode == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -559,31 +543,26 @@ void daE_GM_c::egg_damage() {
     }
 }
 
-/* 806D7A70-806D7A78 0000D0 0008+00 1/1 0/0 0/0 .rodata          l_eff_id */
 static u16 const l_eff_id[4] = {
     dPa_RM(ID_ZI_S_DEADEFLIGHT_A), dPa_RM(ID_ZI_S_DEADEFLIGHT_B), dPa_RM(ID_ZI_S_DEADEFLIGHT_C), dPa_RM(ID_ZI_S_DEADEFLIGHT_D),
 };
 
-/* 806D289C-806D2940 00171C 00A4+00 5/5 0/0 0/0 .text            setDeathLightEffect__8daE_GM_cFv */
 void daE_GM_c::setDeathLightEffect() {
     for (int i = 0; i < 4; i++) {
         dComIfGp_particle_set(l_eff_id[i], &current.pos, &tevStr, NULL, NULL);
     }
 }
 
-/* 806D7C24-806D7C28 000128 0004+00 1/1 0/0 0/0 .data            l_egg_eff_id */
 static u16 l_egg_eff_id[2] = {
     dPa_RM(ID_ZI_S_GBEGG_HARETSU_A), dPa_RM(ID_ZI_S_GBEGG_HARETSU_B),
 };
 
-/* 806D2940-806D29E4 0017C0 00A4+00 1/1 0/0 0/0 .text            setEggBreakEffect__8daE_GM_cFv */
 void daE_GM_c::setEggBreakEffect() {
     for (int i = 0; i < 2; i++) {
         dComIfGp_particle_set(l_egg_eff_id[i], &current.pos, &tevStr, NULL, NULL);
     }
 }
 
-/* 806D29E4-806D2DD4 001864 03F0+00 1/0 0/0 0/0 .text            damage__8daE_GM_cFv */
 void daE_GM_c::damage() {
     if (mMode == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_DAMAGE), 2, 3.0f, 1.0f, 0.0f, -1.0f);
@@ -652,7 +631,6 @@ void daE_GM_c::damage() {
     }
 }
 
-/* 806D2DD4-806D3308 001C54 0534+00 1/0 0/0 0/0 .text            core_damage__8daE_GM_cFv */
 void daE_GM_c::core_damage() {
     if (mMode == 0) {
         bool bVar1 = false;
@@ -764,7 +742,6 @@ void daE_GM_c::core_damage() {
     }
 }
 
-/* 806D3308-806D344C 002188 0144+00 2/0 0/0 0/0 .text            core_delwait__8daE_GM_cFv */
 void daE_GM_c::core_delwait() {
     if (mMode == 0) {
         field_0xa75 = 0;
@@ -779,7 +756,6 @@ void daE_GM_c::core_delwait() {
     }
 }
 
-/* 806D344C-806D35E4 0022CC 0198+00 1/0 0/0 0/0 .text            core_piku__8daE_GM_cFv */
 void daE_GM_c::core_piku() {
     if (mMode == 0) {
         field_0xa69 = 2;
@@ -806,7 +782,6 @@ void daE_GM_c::core_piku() {
     }
 }
 
-/* 806D35E4-806D378C 002464 01A8+00 1/0 0/0 0/0 .text            core_pechanko_damage__8daE_GM_cFv */
 void daE_GM_c::core_pechanko_damage() {
     if (mMode == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_mg", BCK_MD_DEATH_PRESS), 2, 3.0f, 1.0f, 0.0f, -1.0f);
@@ -837,7 +812,6 @@ void daE_GM_c::core_pechanko_damage() {
     }
 }
 
-/* 806D378C-806D398C 00260C 0200+00 1/0 0/0 0/0 .text            hook__8daE_GM_cFv */
 void daE_GM_c::hook() {
     if (mMode == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -869,7 +843,6 @@ void daE_GM_c::hook() {
     }
 }
 
-/* 806D398C-806D3EC4 00280C 0538+00 13/0 0/0 0/0 .text            rebound__8daE_GM_cFv */
 void daE_GM_c::rebound() {
     if (mMode == 0) {
         daPy_getPlayerActorClass();
@@ -965,7 +938,6 @@ void daE_GM_c::rebound() {
     }
 }
 
-/* 806D3EC4-806D4288 002D44 03C4+00 2/0 0/0 0/0 .text            walk2__8daE_GM_cFv */
 void daE_GM_c::walk2() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -1020,7 +992,6 @@ void daE_GM_c::walk2() {
     }
 }
 
-/* 806D4288-806D4468 003108 01E0+00 3/0 0/0 0/0 .text            dead_wait__8daE_GM_cFv */
 void daE_GM_c::dead_wait() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -1063,7 +1034,6 @@ static f32 dummy() {
     return 1000.0f;
 }
 
-/* 806D4468-806D462C 0032E8 01C4+00 1/0 0/0 0/0 .text            core_wait__8daE_GM_cFv */
 void daE_GM_c::core_wait() {
     if (mMode == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1100,7 +1070,6 @@ void daE_GM_c::core_wait() {
     }
 }
 
-/* 806D462C-806D4D1C 0034AC 06F0+00 5/0 0/0 0/0 .text            core_escape__8daE_GM_cFv */
 void daE_GM_c::core_escape() {
     if (mMode == 0) {
         field_0xa69 = 2;
@@ -1192,7 +1161,6 @@ void daE_GM_c::core_escape() {
     }
 }
 
-/* 806D4D1C-806D4EF4 003B9C 01D8+00 2/2 0/0 0/0 .text            chaseCheck__8daE_GM_cFv */
 BOOL daE_GM_c::chaseCheck() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1212,7 +1180,6 @@ BOOL daE_GM_c::chaseCheck() {
     return FALSE;
 }
 
-/* 806D4EF4-806D545C 003D74 0568+00 3/0 0/0 0/0 .text            normal_wait__8daE_GM_cFv */
 void daE_GM_c::normal_wait() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -1290,7 +1257,6 @@ void daE_GM_c::normal_wait() {
     }
 }
 
-/* 806D545C-806D578C 0042DC 0330+00 1/0 0/0 0/0 .text            normal_chase__8daE_GM_cFv */
 void daE_GM_c::normal_chase() {
     if (mMode == 0) {
         field_0xa69 = 1;
@@ -1354,7 +1320,6 @@ void daE_GM_c::normal_chase() {
     }
 }
 
-/* 806D578C-806D59D0 00460C 0244+00 1/1 0/0 0/0 .text            mtx_set__8daE_GM_cFv */
 void daE_GM_c::mtx_set() {
     J3DModel* model;
 
@@ -1393,7 +1358,6 @@ void daE_GM_c::mtx_set() {
     }
 }
 
-/* 806D59D0-806D5D54 004850 0384+00 1/1 0/0 0/0 .text            cc_set__8daE_GM_cFv */
 void daE_GM_c::cc_set() {
     cXyz sp24, sp30, i_effPos, i_effSize;
 
@@ -1445,7 +1409,6 @@ void daE_GM_c::cc_set() {
     setMidnaBindEffect(this, &mSound, &i_effPos, &i_effSize);
 }
 
-/* 806D5D54-806D62FC 004BD4 05A8+00 1/1 0/0 0/0 .text            draw__8daE_GM_cFv */
 int daE_GM_c::draw() {
     if (field_0xa75 == 0) {
         return 1;
@@ -1518,12 +1481,10 @@ int daE_GM_c::draw() {
     return 1;
 }
 
-/* 806D62FC-806D631C 00517C 0020+00 1/0 0/0 0/0 .text            daE_GM_Draw__FP8daE_GM_c */
 static int daE_GM_Draw(daE_GM_c* i_this) {
     return i_this->draw();
 }
 
-/* 806D631C-806D6708 00519C 03EC+00 1/1 0/0 0/0 .text            damage_check__8daE_GM_cFv */
 void daE_GM_c::damage_check() {
     mStts.Move();
 
@@ -1598,7 +1559,6 @@ void daE_GM_c::damage_check() {
     }
 }
 
-/* 806D6708-806D6958 005588 0250+00 1/1 0/0 0/0 .text            execute__8daE_GM_cFv */
 int daE_GM_c::execute() {
     if (dMsgObject_isTalkNowCheck()) {
         return 1;
@@ -1654,17 +1614,14 @@ int daE_GM_c::execute() {
     return 1;
 }
 
-/* 806D6958-806D6978 0057D8 0020+00 2/1 0/0 0/0 .text            daE_GM_Execute__FP8daE_GM_c */
 static int daE_GM_Execute(daE_GM_c* i_this) {
     return i_this->execute();
 }
 
-/* 806D6978-806D6980 0057F8 0008+00 1/0 0/0 0/0 .text            daE_GM_IsDelete__FP8daE_GM_c */
 static int daE_GM_IsDelete(daE_GM_c* i_this) {
     return 1;
 }
 
-/* 806D6980-806D6AA8 005800 0128+00 1/1 0/0 0/0 .text            _delete__8daE_GM_cFv */
 int daE_GM_c::_delete() {
     fopAcM_GetID(this);
 
@@ -1701,12 +1658,10 @@ int daE_GM_c::_delete() {
     return 1;
 }
 
-/* 806D6AA8-806D6AC8 005928 0020+00 1/0 0/0 0/0 .text            daE_GM_Delete__FP8daE_GM_c */
 static int daE_GM_Delete(daE_GM_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806D6AC8-806D6CD0 005948 0208+00 1/1 0/0 0/0 .text            CreateHeap__8daE_GM_cFv */
 int daE_GM_c::CreateHeap() {
     J3DModelData* modelData;
 
@@ -1744,20 +1699,16 @@ int daE_GM_c::CreateHeap() {
     return 1;
 }
 
-/* 806D6CD0-806D6CF0 005B50 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     return static_cast<daE_GM_c*>(a_this)->CreateHeap();
 }
 
-/* 806D7ADC-806D7AE0 00013C 0004+00 0/1 0/0 0/0 .rodata          l_damage_count */
 static u8 const l_damage_count[4] = {1, 1, 1, 3};
 
-/* 806D7AE0-806D7AE8 000140 0008+00 0/1 0/0 0/0 .rodata          l_heapsize */
 static u16 const l_heapsize[4] = {
     0x3120, 0x3120, 0x21E0, 0x2DE0,
 };
 
-/* 806D6CF0-806D71F4 005B70 0504+00 1/1 0/0 0/0 .text            create__8daE_GM_cFv */
 cPhs__Step daE_GM_c::create() {
     fopAcM_ct(this, daE_GM_c);
 
@@ -1868,14 +1819,12 @@ cPhs__Step daE_GM_c::create() {
     return phase;
 }
 
-/* 806D73C0-806D73E0 006240 0020+00 1/0 0/0 0/0 .text            daE_GM_Create__FP8daE_GM_c */
 static int daE_GM_Create(daE_GM_c* i_this) {
     return i_this->create();
 }
 
 AUDIO_INSTANCES;
 
-/* 806D7DB4-806D7DD4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GM_Method */
 static actor_method_class l_daE_GM_Method = {
     (process_method_func)daE_GM_Create,
     (process_method_func)daE_GM_Delete,
@@ -1884,7 +1833,6 @@ static actor_method_class l_daE_GM_Method = {
     (process_method_func)daE_GM_Draw,
 };
 
-/* 806D7DD4-806D7E04 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GM */
 extern actor_process_profile_definition g_profile_E_GM = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp
index 1fdd6eee1c..ea3a36a972 100644
--- a/src/d/actor/d_a_e_gob.cpp
+++ b/src/d/actor/d_a_e_gob.cpp
@@ -19,10 +19,10 @@
 
 class daE_GOB_HIO_c : public JORReflexible {
 public:
-    /* 806D808C */ daE_GOB_HIO_c();
+    daE_GOB_HIO_c();
 
     void genMessage(JORMContext*);
-    /* 806DECD0 */ virtual ~daE_GOB_HIO_c() {}
+    virtual ~daE_GOB_HIO_c() {}
 
     /* 0x04 */ s8 id;
     /* 0x08 */ f32 size;
@@ -133,7 +133,6 @@ enum daE_GOB_ACTION {
     ACTION_MESSAGE,
 };
 
-/* 806D808C-806D80E0 0000EC 0054+00 1/1 0/0 0/0 .text            __ct__13daE_GOB_HIO_cFv */
 daE_GOB_HIO_c::daE_GOB_HIO_c() {
     id = -1;
     size = 1.1f;
@@ -145,7 +144,6 @@ daE_GOB_HIO_c::daE_GOB_HIO_c() {
     swing_time_b = 70;
 }
 
-/* 806D80E0-806D842C 000140 034C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -200,7 +198,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 806D842C-806D853C 00048C 0110+00 1/0 0/0 0/0 .text            daE_GOB_Draw__FP11e_gob_class */
 static int daE_GOB_Draw(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -221,13 +218,11 @@ static int daE_GOB_Draw(e_gob_class* i_this) {
     return 1;
 }
 
-/* 806D8578-806D8624 0005D8 00AC+00 11/11 0/0 0/0 .text            anm_init__FP11e_gob_classifUcf */
 static void anm_init(e_gob_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_gob", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_anm;
 }
 
-/* 806D8624-806D886C 000684 0248+00 1/1 0/0 0/0 .text            damage_check__FP11e_gob_class */
 static void damage_check(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     dComIfGp_getPlayer(0);
@@ -281,23 +276,17 @@ static void damage_check(e_gob_class* i_this) {
     }
 }
 
-/* 806DF2C4-806DF2C8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 806DF2C5 0003+00 data_806DF2C5 None */
 static u8 l_initHIO;
 
-/* 806DF2D4-806DF2F4 000054 0020+00 4/6 0/0 0/0 .bss             l_HIO */
 static daE_GOB_HIO_c l_HIO;
 
-/* 806DF2F4-806DF2F8 000074 0004+00 3/4 0/0 0/0 .bss             ms */
 static obj_msima_class* ms;
 
-/* 806DF2F8-806DF2FC 000078 0004+00 1/2 0/0 0/0 .bss             my */
 static obj_myogan_class* my;
 
-/* 806DF308-806DF314 000088 000C+00 3/5 0/0 0/0 .bss             base_sc */
 static cXyz base_sc(1.1f, 1.1f, 1.1f);
 
-/* 806D886C-806D8DAC 0008CC 0540+00 2/1 0/0 0/0 .text            fight__FP11e_gob_class */
 static void fight(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int anm_frame = i_this->mpModelMorf->getFrame();
@@ -427,7 +416,6 @@ static void fight(e_gob_class* i_this) {
     }
 }
 
-/* 806D8DAC-806D93CC 000E0C 0620+00 2/1 0/0 0/0 .text            attack__FP11e_gob_class */
 static u8 attack(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     s8 var_r26 = 0;
@@ -552,7 +540,6 @@ static u8 attack(e_gob_class* i_this) {
     return var_r25;
 }
 
-/* 806D93CC-806D9514 00142C 0148+00 1/1 0/0 0/0 .text            defence__FP11e_gob_class */
 static void defence(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     s8 anm_finished = FALSE;
@@ -593,7 +580,6 @@ static void defence(e_gob_class* i_this) {
     }
 }
 
-/* 806D9514-806D9C80 001574 076C+00 1/1 0/0 0/0 .text            ball__FP11e_gob_class */
 static u8 ball(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int anm_frame = i_this->mpModelMorf->getFrame();
@@ -741,7 +727,6 @@ static u8 ball(e_gob_class* i_this) {
     return sp8;
 }
 
-/* 806D9C80-806D9D44 001CE0 00C4+00 1/1 0/0 0/0 .text            s_damage__FP11e_gob_class */
 static void s_damage(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     f32 speed_target = 0.0f;
@@ -763,7 +748,6 @@ static void s_damage(e_gob_class* i_this) {
     cLib_addCalc2(&actor->speedF, speed_target, 1.0f, 2.0f);
 }
 
-/* 806D9D44-806D9DE0 001DA4 009C+00 1/1 0/0 0/0 .text            damage__FP11e_gob_class */
 static void damage(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     f32 speed_target = 0.0f;
@@ -783,7 +767,6 @@ static void damage(e_gob_class* i_this) {
     cLib_addCalc2(&actor->speedF, speed_target, 1.0f, 2.0f);
 }
 
-/* 806D9DE0-806DAB6C 001E40 0D8C+00 1/1 0/0 0/0 .text            glab__FP11e_gob_class */
 static u8 glab(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1030,7 +1013,6 @@ static u8 glab(e_gob_class* i_this) {
     return sp8;
 }
 
-/* 806DAB6C-806DB038 002BCC 04CC+00 1/1 0/0 0/0 .text            jump__FP11e_gob_class */
 static void jump(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     cXyz sp58;
@@ -1121,7 +1103,6 @@ static void jump(e_gob_class* i_this) {
     }
 }
 
-/* 806DB038-806DB304 003098 02CC+00 2/1 0/0 0/0 .text            start__FP11e_gob_class */
 static void start(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     dComIfGp_getPlayer(0);
@@ -1188,7 +1169,6 @@ static void start(e_gob_class* i_this) {
     }
 }
 
-/* 806DB304-806DB50C 003364 0208+00 1/1 0/0 0/0 .text            end__FP11e_gob_class */
 static void end(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     dComIfGp_getPlayer(0);
@@ -1231,7 +1211,6 @@ static void end(e_gob_class* i_this) {
     }
 }
 
-/* 806DB50C-806DB548 00356C 003C+00 1/1 0/0 0/0 .text            s_set__FP11e_gob_class */
 static void s_set(e_gob_class* i_this) {
     if ((dComIfGp_getPlayer(0)->current.pos.y - i_this->current.pos.y) < 300.0f) {
         i_this->mAction = ACTION_FIGHT;
@@ -1239,7 +1218,6 @@ static void s_set(e_gob_class* i_this) {
     }
 }
 
-/* 806DB548-806DB768 0035A8 0220+00 1/1 0/0 0/0 .text            message__FP11e_gob_class */
 static void message(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
 
@@ -1289,7 +1267,6 @@ static void message(e_gob_class* i_this) {
     }
 }
 
-/* 806DB768-806DC4F0 0037C8 0D88+00 2/1 0/0 0/0 .text            action__FP11e_gob_class */
 static void action(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1651,7 +1628,6 @@ static void action(e_gob_class* i_this) {
     }
 }
 
-/* 806DC4F0-806DC5D4 004550 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP11e_gob_classf */
 static void cam_3d_morf(e_gob_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, param_1, i_this->mDemoCamCenterSpd.x * i_this->field_0xd88);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->mDemoCamCenterTarget.y, param_1, i_this->mDemoCamCenterSpd.y * i_this->field_0xd88);
@@ -1661,7 +1637,6 @@ static void cam_3d_morf(e_gob_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamEyeTarget.z, param_1, i_this->mDemoCamEyeSpd.z * i_this->field_0xd88);
 }
 
-/* 806DC5D4-806DD800 004634 122C+00 1/1 0/0 0/0 .text            demo_camera__FP11e_gob_class */
 static void demo_camera(e_gob_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2027,7 +2002,6 @@ static void demo_camera(e_gob_class* i_this) {
     }
 }
 
-/* 806DD800-806DE4B8 005860 0CB8+00 2/1 0/0 0/0 .text            daE_GOB_Execute__FP11e_gob_class */
 static int daE_GOB_Execute(e_gob_class* i_this) {
     if (cDmr_SkipInfo != 0) {
         cDmr_SkipInfo--;
@@ -2248,13 +2222,10 @@ static int daE_GOB_Execute(e_gob_class* i_this) {
     return 1;
 }
 
-/* 806DE4B8-806DE4C0 006518 0008+00 1/0 0/0 0/0 .text            daE_GOB_IsDelete__FP11e_gob_class
- */
 static int daE_GOB_IsDelete(e_gob_class* i_this) {
     return 1;
 }
 
-/* 806DE4C0-806DE528 006520 0068+00 1/0 0/0 0/0 .text            daE_GOB_Delete__FP11e_gob_class */
 static int daE_GOB_Delete(e_gob_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "E_gob");
@@ -2271,7 +2242,6 @@ static int daE_GOB_Delete(e_gob_class* i_this) {
     return 1;
 }
 
-/* 806DE528-806DE69C 006588 0174+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_gob_class* a_this = (e_gob_class*)i_this;
 
@@ -2297,7 +2267,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806DE69C-806DEA10 0066FC 0374+00 1/0 0/0 0/0 .text            daE_GOB_Create__FP10fopAc_ac_c */
 static int daE_GOB_Create(fopAc_ac_c* i_this) {
     e_gob_class* a_this = (e_gob_class*)i_this;
     fopAcM_ct(a_this, e_gob_class);
@@ -2424,10 +2393,8 @@ static int daE_GOB_Create(fopAc_ac_c* i_this) {
     return sp14;
 }
 
-/* 806DEA10-806DEBD0 006A70 01C0+00 1/1 0/0 0/0 .text            __ct__11e_gob_classFv */
 e_gob_class::e_gob_class() {}
 
-/* 806DF1B4-806DF1D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GOB_Method */
 static actor_method_class l_daE_GOB_Method = {
     (process_method_func)daE_GOB_Create,
     (process_method_func)daE_GOB_Delete,
@@ -2436,7 +2403,6 @@ static actor_method_class l_daE_GOB_Method = {
     (process_method_func)daE_GOB_Draw,
 };
 
-/* 806DF1D4-806DF204 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GOB */
 extern actor_process_profile_definition g_profile_E_GOB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp
index ff269705a5..2a8e5c283e 100644
--- a/src/d/actor/d_a_e_gs.cpp
+++ b/src/d/actor/d_a_e_gs.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "c/c_damagereaction.h"
 
-/* 806DF46C-806DF4B4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_GS_HIO_cFv */
 daE_GS_HIO_c::daE_GS_HIO_c() {
     id = -1;
     base_size = 1.2f;
@@ -20,13 +19,11 @@ daE_GS_HIO_c::daE_GS_HIO_c() {
     react_distance = 300.0f;
 }
 
-/* 806DF4B4-806DF560 000134 00AC+00 1/1 0/0 0/0 .text            anm_init__FP10e_gs_classifUcf */
 static void anm_init(e_gs_class* a_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     a_this->model_morf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_gs", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     a_this->anm = i_anm;
 }
 
-/* 806DF560-806DF660 0001E0 0100+00 1/0 0/0 0/0 .text            daE_GS_Draw__FP10e_gs_class */
 static int daE_GS_Draw(e_gs_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -50,13 +47,10 @@ static int daE_GS_Draw(e_gs_class* a_this) {
     return 1;
 }
 
-/* 806DFE98-806DFE9C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806DFEA8-806DFEC4 000018 001C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daE_GS_HIO_c l_HIO;
 
-/* 806DF660-806DF7CC 0002E0 016C+00 1/1 0/0 0/0 .text            e_gs_wait__FP10e_gs_class */
 static void e_gs_wait(e_gs_class* a_this) {
     switch (a_this->mode) {
     case 0:
@@ -84,7 +78,6 @@ static void e_gs_wait(e_gs_class* a_this) {
     }
 }
 
-/* 806DF7CC-806DF874 00044C 00A8+00 1/1 0/0 0/0 .text            action__FP10e_gs_class */
 static void action(e_gs_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -104,7 +97,6 @@ static void action(e_gs_class* a_this) {
     cLib_addCalcAngleS2(&actor->shape_angle.z, actor->current.angle.z, 2, 0x2000);
 }
 
-/* 806DF874-806DFA48 0004F4 01D4+00 2/1 0/0 0/0 .text            daE_GS_Execute__FP10e_gs_class */
 static int daE_GS_Execute(e_gs_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -155,12 +147,10 @@ static int daE_GS_Execute(e_gs_class* a_this) {
     return 1;
 }
 
-/* 806DFA48-806DFA50 0006C8 0008+00 1/0 0/0 0/0 .text            daE_GS_IsDelete__FP10e_gs_class */
 static int daE_GS_IsDelete(e_gs_class* a_this) {
     return 1;
 }
 
-/* 806DFA50-806DFAB8 0006D0 0068+00 1/0 0/0 0/0 .text            daE_GS_Delete__FP10e_gs_class */
 static int daE_GS_Delete(e_gs_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -179,7 +169,6 @@ static int daE_GS_Delete(e_gs_class* a_this) {
     return 1;
 }
 
-/* 806DFAB8-806DFC00 000738 0148+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_gs_class* a_this = (e_gs_class*)i_this;
 
@@ -197,7 +186,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806DFC00-806DFD5C 000880 015C+00 1/0 0/0 0/0 .text            daE_GS_Create__FP10fopAc_ac_c */
 static int daE_GS_Create(fopAc_ac_c* i_this) {
     e_gs_class* a_this = (e_gs_class*)i_this;
     fopAcM_ct(i_this, e_gs_class);
@@ -236,7 +224,6 @@ static int daE_GS_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 806DFE34-806DFE54 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_GS_Method */
 static actor_method_class l_daE_GS_Method = {
     (process_method_func)daE_GS_Create,
     (process_method_func)daE_GS_Delete,
@@ -245,7 +232,6 @@ static actor_method_class l_daE_GS_Method = {
     (process_method_func)daE_GS_Draw,
 };
 
-/* 806DFE54-806DFE84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_GS */
 extern actor_process_profile_definition g_profile_E_GS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp
index f9afb69617..a28b43e334 100644
--- a/src/d/actor/d_a_e_hb.cpp
+++ b/src/d/actor/d_a_e_hb.cpp
@@ -27,8 +27,8 @@ public:
     virtual void genMessage(JORMContext*);
 #endif
 
-    /* 804FBD6C */ daE_HB_HIO_c();
-    /* 805005D0 */ virtual ~daE_HB_HIO_c() {}
+    daE_HB_HIO_c();
+    virtual ~daE_HB_HIO_c() {}
 
     /* 0x04 */ s8 id;
     /* 0x08 */ f32 base_size;
@@ -39,7 +39,6 @@ public:
     /* 0x18 */ u8 bite_pattern;
 };
 
-/* 804FBD6C-804FBDB8 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__12daE_HB_HIO_cFv */
 daE_HB_HIO_c::daE_HB_HIO_c() {
     id = -1;
     base_size = 1.0f;
@@ -50,14 +49,11 @@ daE_HB_HIO_c::daE_HB_HIO_c() {
     bite_pattern = 1;
 }
 
-/* 804FBDB8-804FBE64 000138 00AC+00 8/8 0/0 0/0 .text            anm_init__FP10e_hb_classifUcf */
 static void anm_init(e_hb_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_hb", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->anm = i_anm;
 }
 
-/* 804FBE64-804FBF3C 0001E4 00D8+00 8/8 0/0 0/0 .text            leaf_anm_init__FP10e_hb_classifUcf
- */
 static BOOL leaf_anm_init(e_hb_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     e_hb_leaf_class* pleaf = (e_hb_leaf_class*)fopAcM_SearchByID(i_this->leaf_actor_id);
     if (pleaf != NULL) {
@@ -68,7 +64,6 @@ static BOOL leaf_anm_init(e_hb_class* i_this, int i_anm, f32 i_morf, u8 i_mode,
     return FALSE;
 }
 
-/* 804FBF3C-804FC0C0 0002BC 0184+00 1/0 0/0 0/0 .text            daE_HB_Draw__FP10e_hb_class */
 static int daE_HB_Draw(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -98,7 +93,6 @@ static int daE_HB_Draw(e_hb_class* i_this) {
     return 1;
 }
 
-/* 804FC0C0-804FC118 000440 0058+00 2/2 0/0 0/0 .text            pl_check__FP10e_hb_classf */
 static BOOL pl_check(e_hb_class* i_this, f32 i_range) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -110,7 +104,6 @@ static BOOL pl_check(e_hb_class* i_this, f32 i_range) {
     }
 }
 
-/* 804FC118-804FC504 000498 03EC+00 1/1 0/0 0/0 .text            damage_check__FP10e_hb_class */
 static void damage_check(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -220,13 +213,10 @@ static void damage_check(e_hb_class* i_this) {
     }
 }
 
-/* 80500E60-80500E64 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80500E70-80500E8C 000018 001C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_HB_HIO_c l_HIO;
 
-/* 804FC504-804FC85C 000884 0358+00 1/1 0/0 0/0 .text            e_hb_stay__FP10e_hb_class */
 static void e_hb_stay(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -286,7 +276,6 @@ static void e_hb_stay(e_hb_class* i_this) {
     }
 }
 
-/* 804FC85C-804FCB1C 000BDC 02C0+00 1/1 0/0 0/0 .text            e_hb_appear__FP10e_hb_class */
 static void e_hb_appear(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     int anm_frame = i_this->modelMorf->getFrame();
@@ -338,7 +327,6 @@ static void e_hb_appear(e_hb_class* i_this) {
     cLib_addCalc2(&i_this->size, l_HIO.appear_size, 1.0f, 0.1f);
 }
 
-/* 804FCB1C-804FCCE8 000E9C 01CC+00 1/1 0/0 0/0 .text            e_hb_appear_v__FP10e_hb_class */
 static void e_hb_appear_v(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -378,7 +366,6 @@ static void e_hb_appear_v(e_hb_class* i_this) {
     i_this->field_0xb0c = 1;
 }
 
-/* 804FCCE8-804FD230 001068 0548+00 1/1 0/0 0/0 .text            e_hb_wait__FP10e_hb_class */
 static void e_hb_wait(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp48;
@@ -468,7 +455,6 @@ static void e_hb_wait(e_hb_class* i_this) {
     }
 }
 
-/* 804FD230-804FDC90 0015B0 0A60+00 1/1 0/0 0/0 .text            e_hb_attack__FP10e_hb_class */
 static void e_hb_attack(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -660,7 +646,6 @@ static void e_hb_attack(e_hb_class* i_this) {
     }
 }
 
-/* 804FDC90-804FDF90 002010 0300+00 1/1 0/0 0/0 .text            e_hb_chance__FP10e_hb_class */
 static void e_hb_chance(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -725,7 +710,6 @@ static void e_hb_chance(e_hb_class* i_this) {
     cLib_addCalc2(&i_this->field_0x848, 0.5f + JREG_F(4), 1.0f, 0.05f);
 }
 
-/* 804FDF90-804FE1E8 002310 0258+00 1/1 0/0 0/0 .text            e_hb_s_damage__FP10e_hb_class */
 static void e_hb_s_damage(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp10;
@@ -781,7 +765,6 @@ static void e_hb_s_damage(e_hb_class* i_this) {
     }
 }
 
-/* 804FE1E8-804FE5C8 002568 03E0+00 1/1 0/0 0/0 .text            e_hb_damage__FP10e_hb_class */
 static void e_hb_damage(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp1C;
@@ -851,7 +834,6 @@ static void e_hb_damage(e_hb_class* i_this) {
     }
 }
 
-/* 804FE5C8-804FE8F8 002948 0330+00 1/1 0/0 0/0 .text            kuki_control1__FP10e_hb_class */
 static void kuki_control1(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp40;
@@ -938,7 +920,6 @@ static void kuki_control1(e_hb_class* i_this) {
     }
 }
 
-/* 804FE8F8-804FEA6C 002C78 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10e_hb_class */
 static void kuki_control2(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp28;
@@ -974,7 +955,6 @@ static void kuki_control2(e_hb_class* i_this) {
     }
 }
 
-/* 804FEA6C-804FEB48 002DEC 00DC+00 1/1 0/0 0/0 .text            kuki_control3__FP10e_hb_class */
 static void kuki_control3(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp20;
@@ -987,7 +967,6 @@ static void kuki_control3(e_hb_class* i_this) {
     }
 }
 
-/* 804FEB48-804FEC34 002EC8 00EC+00 1/1 0/0 0/0 .text            kuki_ha_set__FP10e_hb_class */
 static void kuki_ha_set(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz* ppos = i_this->field_0x6a0;
@@ -1015,7 +994,6 @@ static f32 dummyFloat() {
     return temp;
 }
 
-/* 804FEC34-804FF214 002FB4 05E0+00 2/1 0/0 0/0 .text            action__FP10e_hb_class */
 static void action(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1158,7 +1136,6 @@ static void action(e_hb_class* i_this) {
     setMidnaBindEffect((fopEn_enemy_c*)actor, &i_this->sound, &actor->eyePos, &effsize);
 }
 
-/* 804FF214-804FF5DC 003594 03C8+00 1/1 0/0 0/0 .text            eff_set__FP10e_hb_classi */
 static void eff_set(e_hb_class* i_this, int param_1) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -1229,7 +1206,6 @@ static void eff_set(e_hb_class* i_this, int param_1) {
     }
 }
 
-/* 804FF5DC-804FF744 00395C 0168+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_hb_class */
 static void anm_se_set(e_hb_class* i_this) {
     if (i_this->anm == 5) {
         if (i_this->modelMorf->checkFrame(22.0f)) {
@@ -1249,7 +1225,6 @@ static void anm_se_set(e_hb_class* i_this) {
         }
     }
 }
-/* 804FF744-804FFAFC 003AC4 03B8+00 2/1 0/0 0/0 .text            daE_HB_Execute__FP10e_hb_class */
 static int daE_HB_Execute(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp4C;
@@ -1342,12 +1317,10 @@ static int daE_HB_Execute(e_hb_class* i_this) {
     return 1;
 }
 
-/* 804FFAFC-804FFB04 003E7C 0008+00 1/0 0/0 0/0 .text            daE_HB_IsDelete__FP10e_hb_class */
 static int daE_HB_IsDelete(e_hb_class* i_this) {
     return 1;
 }
 
-/* 804FFB04-804FFB6C 003E84 0068+00 1/0 0/0 0/0 .text            daE_HB_Delete__FP10e_hb_class */
 static int daE_HB_Delete(e_hb_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -1365,7 +1338,6 @@ static int daE_HB_Delete(e_hb_class* i_this) {
     return 1;
 }
 
-/* 804FFB6C-804FFD60 003EEC 01F4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_hb_class* a_this = (e_hb_class*)i_this;
 
@@ -1400,7 +1372,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 804FFD60-80500264 0040E0 0504+00 1/0 0/0 0/0 .text            daE_HB_Create__FP10fopAc_ac_c */
 static int daE_HB_Create(fopAc_ac_c* i_this) {
     e_hb_class* a_this = (e_hb_class*)i_this;
     fopAcM_ct(i_this, e_hb_class);
@@ -1531,7 +1502,6 @@ static int daE_HB_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80500D88-80500DA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HB_Method */
 static actor_method_class l_daE_HB_Method = {
     (process_method_func)daE_HB_Create,
     (process_method_func)daE_HB_Delete,
@@ -1540,7 +1510,6 @@ static actor_method_class l_daE_HB_Method = {
     (process_method_func)daE_HB_Draw,
 };
 
-/* 80500DA8-80500DD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HB */
 extern actor_process_profile_definition g_profile_E_HB = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp
index 2ef3b9f35b..78d68a54b7 100644
--- a/src/d/actor/d_a_e_hb_leaf.cpp
+++ b/src/d/actor/d_a_e_hb_leaf.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 806DFF58-806DFFC0 000078 0068+00 1/0 0/0 0/0 .text daE_HB_LEAF_Draw__FP15e_hb_leaf_class */
 static int daE_HB_LEAF_Draw(e_hb_leaf_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->tevStr);
@@ -17,7 +16,6 @@ static int daE_HB_LEAF_Draw(e_hb_leaf_class* i_this) {
     return 1;
 }
 
-/* 806DFFC0-806E00A0 0000E0 00E0+00 2/1 0/0 0/0 .text daE_HB_LEAF_Execute__FP15e_hb_leaf_class */
 static int daE_HB_LEAF_Execute(e_hb_leaf_class* i_this) {
     mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
     mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
@@ -38,18 +36,15 @@ static int daE_HB_LEAF_Execute(e_hb_leaf_class* i_this) {
     return 1;
 }
 
-/* 806E00A0-806E00A8 0001C0 0008+00 1/0 0/0 0/0 .text daE_HB_LEAF_IsDelete__FP15e_hb_leaf_class */
 static int daE_HB_LEAF_IsDelete(e_hb_leaf_class* i_this) {
     return 1;
 }
 
-/* 806E00A8-806E00D8 0001C8 0030+00 1/0 0/0 0/0 .text daE_HB_LEAF_Delete__FP15e_hb_leaf_class */
 static int daE_HB_LEAF_Delete(e_hb_leaf_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_HB");
     return 1;
 }
 
-/* 806E00D8-806E01D8 0001F8 0100+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_hb_leaf_class* a_this = static_cast<e_hb_leaf_class*>(i_this);
 
@@ -63,8 +58,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806E01D8-806E0288 0002F8 00B0+00 1/0 0/0 0/0 .text            daE_HB_LEAF_Create__FP10fopAc_ac_c
- */
 static int daE_HB_LEAF_Create(fopAc_ac_c* i_this) {
     e_hb_leaf_class* a_this = static_cast<e_hb_leaf_class*>(i_this);
     fopAcM_ct(a_this, e_hb_leaf_class);
@@ -87,14 +80,12 @@ static int daE_HB_LEAF_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 806E029C-806E02BC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HB_LEAF_Method */
 static actor_method_class l_daE_HB_LEAF_Method = {
     (process_method_func)daE_HB_LEAF_Create,  (process_method_func)daE_HB_LEAF_Delete,
     (process_method_func)daE_HB_LEAF_Execute, (process_method_func)daE_HB_LEAF_IsDelete,
     (process_method_func)daE_HB_LEAF_Draw,
 };
 
-/* 806E02BC-806E02EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HB_LEAF */
 extern actor_process_profile_definition g_profile_E_HB_LEAF = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp
index 2540a4592f..4a993f23e6 100644
--- a/src/d/actor/d_a_e_hm.cpp
+++ b/src/d/actor/d_a_e_hm.cpp
@@ -12,8 +12,8 @@
 
 class daE_HM_HIO_c : public JORReflexible {
 public:
-    /* 806E03EC */ daE_HM_HIO_c();
-    /* 806E53F8 */ virtual ~daE_HM_HIO_c() {}
+    daE_HM_HIO_c();
+    virtual ~daE_HM_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext* ctx);
@@ -53,7 +53,6 @@ void daE_HM_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 806E043C-806E0658 00013C 021C+00 1/1 0/0 0/0 .text            CreateHeap__8daE_HM_cFv */
 int daE_HM_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HM", 17);
     JUT_ASSERT(0xbf, modelData != NULL);
@@ -87,13 +86,11 @@ int daE_HM_c::CreateHeap() {
     return 1;
 }
 
-/* 806E06A0-806E06C0 0003A0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_HM_c* hm = (daE_HM_c*)i_this;
     return hm->CreateHeap();
 }
 
-/* 806E06C0-806E074C 0003C0 008C+00 1/1 0/0 0/0 .text            initCcCylinder__8daE_HM_cFv */
 void daE_HM_c::initCcCylinder() {
     static const dCcD_SrcSph ccShpSrc = {
         {
@@ -119,7 +116,6 @@ void daE_HM_c::initCcCylinder() {
     mSph.SetAtMtrl(1);
 }
 
-/* 806E074C-806E0880 00044C 0134+00 1/1 0/0 0/0 .text            setCcCylinder__8daE_HM_cFv */
 void daE_HM_c::setCcCylinder() {
     cXyz unkXyz1;
     switch (field_0x5d2) {
@@ -146,7 +142,6 @@ void daE_HM_c::setCcCylinder() {
     }
 }
 
-/* 806E0880-806E0958 000580 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP8daE_HM_cP10fopAc_ac_c */
 static int other_bg_check(daE_HM_c* i_this, fopAc_ac_c* i_other) {
     daE_HM_c* hm = (daE_HM_c*)i_this;
 
@@ -169,7 +164,6 @@ static int other_bg_check(daE_HM_c* i_this, fopAc_ac_c* i_other) {
     }
 }
 
-/* 806E0958-806E0D64 000658 040C+00 3/1 0/0 0/0 .text ctrlJoint__8daE_HM_cFP8J3DJointP8J3DModel */
 int daE_HM_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     u32 jointNo = joint->getJntNo();
@@ -225,7 +219,6 @@ int daE_HM_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806E0D64-806E0DB0 000A64 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -238,7 +231,6 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806E0DB0-806E0E8C 000AB0 00DC+00 2/2 0/0 0/0 .text            Particle_Set__8daE_HM_cFRUlUs */
 void daE_HM_c::Particle_Set(u32& param_0, u16 param_1) {
      param_0 = dComIfGp_particle_set(param_0, param_1, &current.pos, &tevStr, &shape_angle,
                                        &field_0x5e8, 0xff, 0, -1, 0, 0, 0);
@@ -249,15 +241,12 @@ void daE_HM_c::Particle_Set(u32& param_0, u16 param_1) {
     }
 }
 
-/* 806E0E8C-806E0F38 000B8C 00AC+00 12/12 0/0 0/0 .text            SetAnm__8daE_HM_cFiiff */
 void daE_HM_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) {
     mAnm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_HM", param_0), param_1, param_2,
                    param_3, 0.0f, -1.0f);
     field_0x61c = param_0;
 }
 
-/* 806E0F38-806E0FF4 000C38 00BC+00 2/2 0/0 0/0 .text            W_TargetAngle__8daE_HM_cF4cXyz4cXyz
- */
 s16 daE_HM_c::W_TargetAngle(cXyz param_0, cXyz param_1) {
      cXyz local_14;
      cXyz angleDiff = param_1 - param_0;
@@ -268,7 +257,6 @@ s16 daE_HM_c::W_TargetAngle(cXyz param_0, cXyz param_1) {
      return cM_atan2s(local_14.x, local_14.z);
 }
 
-/* 806E0FF4-806E1118 000CF4 0124+00 1/1 0/0 0/0 .text            W_DeathSpSet__8daE_HM_cFv */
 void daE_HM_c::W_DeathSpSet() {
     cXyz unkXyz1;
 
@@ -303,7 +291,6 @@ static f32 dummy1() {
     return 0.8f;
 }
 
-/* 806E1118-806E1370 000E18 0258+00 1/1 0/0 0/0 .text            W_DeathAction__8daE_HM_cFv */
 void daE_HM_c::W_DeathAction() {
     f32 frame = mAnm_p->getFrame();
     cXyz unusedXyz1;
@@ -352,7 +339,6 @@ void daE_HM_c::W_DeathAction() {
     }
 }
 
-/* 806E1370-806E155C 001070 01EC+00 1/1 0/0 0/0 .text            W_DeathMotion__8daE_HM_cFv */
 void daE_HM_c::W_DeathMotion() {
     switch (field_0x5d6) {
     case 0:
@@ -385,7 +371,6 @@ void daE_HM_c::W_DeathMotion() {
     }
 }
 
-/* 806E155C-806E1858 00125C 02FC+00 2/2 0/0 0/0 .text            W_MoveCheckWall__8daE_HM_cFv */
 int daE_HM_c::W_MoveCheckWall() {
     s16 unkFloat1;
     s16 unkFloat2;
@@ -434,7 +419,6 @@ int daE_HM_c::W_MoveCheckWall() {
     return 0;
 }
 
-/* 806E18A0-806E1A00 0015A0 0160+00 1/1 0/0 0/0 .text            W_WallCheck__8daE_HM_cFv */
 int daE_HM_c::W_WallCheck() {
     cXyz unkXyz1(0.0f, -300.0f, 300.0f);
     cXyz unkXyz2(0.0f, 200.0f, 0.0f);
@@ -462,7 +446,6 @@ int daE_HM_c::W_WallCheck() {
     return 0;
 }
 
-/* 806E1A00-806E1AA0 001700 00A0+00 1/1 0/0 0/0 .text            WallExecute__8daE_HM_cFv */
 void daE_HM_c::WallExecute() {
      switch (field_0x5d4) {
      case 4:
@@ -489,7 +472,6 @@ static f32 dummy2() {
      return -30.0f;
  }
 
-/* 806E1AA0-806E1B5C 0017A0 00BC+00 1/1 0/0 0/0 .text            WallCreateExecute__8daE_HM_cFv */
 void daE_HM_c::WallCreateExecute() {
     switch (field_0x5d6) {
     case 0:
@@ -509,7 +491,6 @@ void daE_HM_c::WallCreateExecute() {
     }
 }
 
-/* 806E1B5C-806E1C28 00185C 00CC+00 1/1 0/0 0/0 .text            CreateExecute__8daE_HM_cFv */
 void daE_HM_c::CreateExecute() {
     if (fopAcM_SearchByID(field_0x5c4) == NULL && field_0x5c4 != fpcM_ERROR_PROCESS_ID_e) {
         field_0x5c4 = fpcM_ERROR_PROCESS_ID_e;
@@ -521,7 +502,6 @@ void daE_HM_c::CreateExecute() {
     }
 }
 
-/* 806E1C28-806E1E78 001928 0250+00 1/1 0/0 0/0 .text            Tyakuchi_Set__8daE_HM_cFv */
 void daE_HM_c::Tyakuchi_Set() {
     cXyz unkXyz1(0.0f, 30.0f, 0.0f);
     cXyz unkXyz2;
@@ -552,7 +532,6 @@ void daE_HM_c::Tyakuchi_Set() {
     }
 }
 
-/* 806E1E78-806E20FC 001B78 0284+00 1/1 0/0 0/0 .text            UpDeathAction__8daE_HM_cFv */
 void daE_HM_c::UpDeathAction() {
     switch (field_0x5d6) {
     case 0:
@@ -601,10 +580,8 @@ void daE_HM_c::UpDeathAction() {
 
 static bool l_HIOInit;
 
-/* 806E5C24-806E5C44 000054 0020+00 6/7 0/0 0/0 .bss             l_HIO */
 static daE_HM_HIO_c l_HIO;
 
-/* 806E20FC-806E2410 001DFC 0314+00 1/1 0/0 0/0 .text            UpMoveAction__8daE_HM_cFv */
 void daE_HM_c::UpMoveAction() {
     switch (field_0x5d6) {
     case 0:
@@ -660,7 +637,6 @@ void daE_HM_c::UpMoveAction() {
     }
 }
 
-/* 806E2410-806E2568 002110 0158+00 1/1 0/0 0/0 .text            UpWaitAction__8daE_HM_cFv */
 void daE_HM_c::UpWaitAction() {
     switch (field_0x5d6) {
     case 0:
@@ -684,7 +660,6 @@ void daE_HM_c::UpWaitAction() {
     }
 }
 
-/* 806E2568-806E25E8 002268 0080+00 1/1 0/0 0/0 .text            UpExecute__8daE_HM_cFv */
 void daE_HM_c::UpExecute() {
     switch (field_0x5d4) {
     case 5:
@@ -706,7 +681,6 @@ void daE_HM_c::UpExecute() {
     }
 }
 
-/* 806E25E8-806E2694 0022E8 00AC+00 2/2 0/0 0/0 .text            WallCheck__8daE_HM_cFv */
 int daE_HM_c::WallCheck() {
     cXyz unkXyz1(0.0f, 300.0f, 150.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -721,7 +695,6 @@ int daE_HM_c::WallCheck() {
     }
 }
 
-/* 806E2694-806E29B8 002394 0324+00 2/2 0/0 0/0 .text            MoveCheck__8daE_HM_cFv */
 int daE_HM_c::MoveCheck() {
     cXyz unkXyz1(0.0f, 300.0f, 0.0f);
     cXyz unkXyz2(0.0f, -300.0f, (HREG_F(1) + 0.5f) * speedF);
@@ -767,7 +740,6 @@ int daE_HM_c::MoveCheck() {
     return 0;
 }
 
-/* 806E29B8-806E2B80 0026B8 01C8+00 3/3 0/0 0/0 .text            ShippuAction__8daE_HM_cFv */
 void daE_HM_c::ShippuAction() {
     bool unkFlag1;
 
@@ -809,7 +781,6 @@ void daE_HM_c::ShippuAction() {
     }
 }
 
-/* 806E2B80-806E2C50 002880 00D0+00 2/2 0/0 0/0 .text            ShieldMotion__8daE_HM_cFv */
 void daE_HM_c::ShieldMotion() {
     cLib_addCalc2(&speedF, nREG_F(2), kREG_F(5) + 0.5f, nREG_F(5) + 30.0f);
 
@@ -831,27 +802,19 @@ void daE_HM_c::ShieldMotion() {
 }
 
 namespace {
-/* 806E5C44-806E5C48 000074 0004+00 1/2 0/0 0/0 .bss             s_dis__22@unnamed@d_a_e_hm_cpp@ */
 static f32 s_dis;
 
-/* 806E5C48-806E5C4C 000078 0004+00 0/0 0/0 0/0 .bss             s_gnd__22@unnamed@d_a_e_hm_cpp@ */
 static u8 s_gnd[4];
 
-/* 806E5C58-806E5C64 000088 000C+00 0/1 0/0 0/0 .bss             s_up__22@unnamed@d_a_e_hm_cpp@ */
 static cXyz s_up;
 
-/* 806E5C70-806E5C7C 0000A0 000C+00 0/1 0/0 0/0 .bss             s_down__22@unnamed@d_a_e_hm_cpp@ */
 static cXyz s_down;
 
-/* 806E5C7C-806E5C80 0000AC 0004+00 0/1 0/0 0/0 .bss             sLink_Pos__22@unnamed@d_a_e_hm_cpp@
- */
 static cXyz* sLink_Pos;
 
-/* 806E5C80-806E5C84 0000B0 0002+02 3/4 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_hm_cpp@ */
 static s16 s_TargetAngle;
 }
 
-/* 806E2C50-806E2D08 002950 00B8+00 1/1 0/0 0/0 .text            ShieldAction__8daE_HM_cFv */
 void daE_HM_c::ShieldAction() {
     switch (field_0x5d6) {
     case 0:
@@ -867,7 +830,6 @@ void daE_HM_c::ShieldAction() {
     }
 }
 
-/* 806E2D08-806E2D40 002A08 0038+00 2/2 0/0 0/0 .text            DeathSpSet__8daE_HM_cFv */
 void daE_HM_c::DeathSpSet() {
     current.angle.y = s_TargetAngle + 0x500;
     speedF = l_HIO.flyDirSpeed;
@@ -875,7 +837,6 @@ void daE_HM_c::DeathSpSet() {
     gravity = l_HIO.gravity;
 }
 
-/* 806E2D40-806E2EA0 002A40 0160+00 2/2 0/0 0/0 .text            DeathMotion__8daE_HM_cFv */
 void daE_HM_c::DeathMotion() {
     f32 frame = mAnm_p->getFrame();
     if (mAcch.ChkGroundHit() && (field_0x5da++, field_0x5da) == 1) {
@@ -907,7 +868,6 @@ void daE_HM_c::DeathMotion() {
     }
 }
 
-/* 806E2EA0-806E2F5C 002BA0 00BC+00 1/1 0/0 0/0 .text            DeathCutDown__8daE_HM_cFv */
 void daE_HM_c::DeathCutDown() {
     speedF = 0.0f;
     speed.y = 0.0f;
@@ -920,7 +880,6 @@ void daE_HM_c::DeathCutDown() {
     }
 }
 
-/* 806E2F5C-806E31B0 002C5C 0254+00 1/1 0/0 0/0 .text            DeathAction__8daE_HM_cFv */
 void daE_HM_c::DeathAction() {
     switch (field_0x5d6) {
     case 0:
@@ -964,7 +923,6 @@ void daE_HM_c::DeathAction() {
     }
 }
 
-/* 806E31B0-806E3208 002EB0 0058+00 1/1 0/0 0/0 .text            AttackAfter__8daE_HM_cFv */
 void daE_HM_c::AttackAfter() {
     field_0x5b0 = 50.0f;
     field_0x5bc--;
@@ -974,7 +932,6 @@ void daE_HM_c::AttackAfter() {
     }
 }
 
-/* 806E3208-806E3420 002F08 0218+00 1/1 0/0 0/0 .text            AttackMotion__8daE_HM_cFv */
 void daE_HM_c::AttackMotion() {
     f32 frame = mAnm_p->getFrame();
     if (field_0x61c == 14) {
@@ -1001,7 +958,6 @@ void daE_HM_c::AttackMotion() {
     }
 }
 
-/* 806E3420-806E34C8 003120 00A8+00 2/2 0/0 0/0 .text            AttackAction__8daE_HM_cFv */
 void daE_HM_c::AttackAction() {
     switch (field_0x5d6) {
     case 0:
@@ -1020,7 +976,6 @@ void daE_HM_c::AttackAction() {
     }
 }
 
-/* 806E34C8-806E3690 0031C8 01C8+00 1/1 0/0 0/0 .text            FreeMove__8daE_HM_cFv */
 void daE_HM_c::FreeMove() {
     f32 frame = mAnm_p->getFrame();
     if (frame > yREG_F(1) + 21.0f) {
@@ -1053,7 +1008,6 @@ void daE_HM_c::FreeMove() {
     }
 }
 
-/* 806E3690-806E3724 003390 0094+00 1/1 0/0 0/0 .text            LinkSearch__8daE_HM_cFv */
 void daE_HM_c::LinkSearch() {
     field_0x5bc--;
     if (field_0x5bc < 0) {
@@ -1072,7 +1026,6 @@ void daE_HM_c::LinkSearch() {
     }
 }
 
-/* 806E3724-806E37F4 003424 00D0+00 2/2 0/0 0/0 .text            WaitAction__8daE_HM_cFv */
 void daE_HM_c::WaitAction() {
     switch (field_0x5d6) {
     case 0:
@@ -1089,12 +1042,10 @@ void daE_HM_c::WaitAction() {
     }
 }
 
-/* 806E37F4-806E3800 0034F4 000C+00 9/9 0/0 0/0 .text            MemberClear__8daE_HM_cFv */
 void daE_HM_c::MemberClear() {
     field_0x5d6 = 0;
 }
 
-/* 806E3800-806E3884 003500 0084+00 1/1 0/0 0/0 .text            DownExecute__8daE_HM_cFv */
 void daE_HM_c::DownExecute() {
     switch (field_0x5d4) {
     case 5:
@@ -1116,7 +1067,6 @@ void daE_HM_c::DownExecute() {
     }
 }
 
-/* 806E3884-806E39E8 003584 0164+00 1/1 0/0 0/0 .text            At_Check__8daE_HM_cFv */
 void daE_HM_c::At_Check() {
     mAtInfo.mpActor = at_power_check(&mAtInfo);
     if (mAtInfo.mpActor != NULL) {
@@ -1163,7 +1113,6 @@ void daE_HM_c::At_Check() {
     }
 }
 
-/* 806E39E8-806E3BE4 0036E8 01FC+00 1/1 0/0 0/0 .text            Obj_Damage__8daE_HM_cFv */
 void daE_HM_c::Obj_Damage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1213,7 +1162,6 @@ void daE_HM_c::Obj_Damage() {
     }
 }
 
-/* 806E3BE4-806E4008 0038E4 0424+00 1/1 0/0 0/0 .text            ActionMode__8daE_HM_cFv */
 void daE_HM_c::ActionMode() {
 
     s16 angleY = current.angle.y;
@@ -1319,7 +1267,6 @@ void daE_HM_c::ActionMode() {
     }
 }
 
-/* 806E4008-806E40B8 003D08 00B0+00 1/1 0/0 0/0 .text            Yazirushi__8daE_HM_cFv */
 void daE_HM_c::Yazirushi() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (!other_bg_check(this, player) && (field_0x5d4 != 1)) {
@@ -1333,12 +1280,10 @@ void daE_HM_c::Yazirushi() {
     }
 }
 
-/* 806E40B8-806E40D4 003DB8 001C+00 1/1 0/0 0/0 .text            setStabPos__8daE_HM_cFv */
 void daE_HM_c::setStabPos() {
     setDownPos(&current.pos);
 }
 
-/* 806E40D4-806E434C 003DD4 0278+00 1/1 0/0 0/0 .text            Execute__8daE_HM_cFv */
 int daE_HM_c::Execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1380,7 +1325,6 @@ int daE_HM_c::Execute() {
     return 1;
 }
 
-/* 806E434C-806E44F0 00404C 01A4+00 1/1 0/0 0/0 .text            Draw__8daE_HM_cFv */
 int daE_HM_c::Draw() {
     J3DModel* model = mAnm_p->getModel();
 
@@ -1413,7 +1357,6 @@ int daE_HM_c::Draw() {
     return 1;
 }
 
-/* 806E44F0-806E4558 0041F0 0068+00 1/1 0/0 0/0 .text            Delete__8daE_HM_cFv */
 int daE_HM_c::Delete() {
     dComIfG_resDelete(&mPhase,"E_HM");
 
@@ -1429,7 +1372,6 @@ int daE_HM_c::Delete() {
     return 1;
 }
 
-/* 806E4558-806E45B8 004258 0060+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_HM_cFv */
 void daE_HM_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x5cc);
@@ -1438,28 +1380,23 @@ void daE_HM_c::setBaseMtx() {
     mAnm_p->modelCalc();
 }
 
-/* 806E45B8-806E45D8 0042B8 0020+00 1/0 0/0 0/0 .text            daE_HM_Draw__FP8daE_HM_c */
 static int daE_HM_Draw(daE_HM_c* i_this) {
     return i_this->Draw();
 }
 
-/* 806E45D8-806E45F8 0042D8 0020+00 2/1 0/0 0/0 .text            daE_HM_Execute__FP8daE_HM_c */
 static int daE_HM_Execute(daE_HM_c* i_this) {
     return i_this->Execute();
 }
 
-/* 806E45F8-806E4600 0042F8 0008+00 1/0 0/0 0/0 .text            daE_HM_IsDelete__FP8daE_HM_c */
 static int daE_HM_IsDelete(daE_HM_c* i_this) {
     return TRUE;
 }
 
-/* 806E4600-806E4620 004300 0020+00 1/0 0/0 0/0 .text            daE_HM_Delete__FP8daE_HM_c */
 static int daE_HM_Delete(daE_HM_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->Delete();
 }
 
-/* 806E4620-806E486C 004320 024C+00 1/1 0/0 0/0 .text            CheckRoof__8daE_HM_cFv */
 void daE_HM_c::CheckRoof() {
     cXyz endPos(current.pos.x, current.pos.y + 300.0f, current.pos.z);
     dBgS_LinChk linChk;
@@ -1483,7 +1420,6 @@ void daE_HM_c::CheckRoof() {
     }
 }
 
-/* 806E486C-806E4CCC 00456C 0460+00 1/1 0/0 0/0 .text            CheckWall__8daE_HM_cFv */
 void daE_HM_c::CheckWall() {
     cXyz unkXyz1;
     cXyz unkXyz2(0.0f, 0.0f, 200.0f);
@@ -1532,7 +1468,6 @@ void daE_HM_c::CheckWall() {
     }
 }
 
-/* 806E4CCC-806E4E64 0049CC 0198+00 1/1 0/0 0/0 .text            CreateStyle__8daE_HM_cFv */
 void daE_HM_c::CreateStyle() {
     switch (field_0x5d2) {
     case 1:
@@ -1579,7 +1514,6 @@ void daE_HM_c::CreateStyle() {
     }
 }
 
-/* 806E4E64-806E51C4 004B64 0360+00 1/1 0/0 0/0 .text            Create__8daE_HM_cFv */
 int daE_HM_c::Create() {
     fopAcM_ct(this, daE_HM_c);
 
@@ -1653,7 +1587,6 @@ int daE_HM_c::Create() {
     return loadResult;
 }
 
-/* 806E5390-806E53B0 005090 0020+00 1/0 0/0 0/0 .text            daE_HM_Create__FP10fopAc_ac_c */
 static int daE_HM_Create(fopAc_ac_c* i_this) {
     daE_HM_c* hm = (daE_HM_c*)i_this;
     return hm->Create();
@@ -1661,7 +1594,6 @@ static int daE_HM_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES
 
-/* 806E5AFC-806E5B1C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HM_Method */
 static actor_method_class l_daE_HM_Method = {
     (process_method_func)daE_HM_Create,
     (process_method_func)daE_HM_Delete,
@@ -1670,7 +1602,6 @@ static actor_method_class l_daE_HM_Method = {
     (process_method_func)daE_HM_Draw,
 };
 
-/* 806E5B1C-806E5B4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HM */
 extern actor_process_profile_definition g_profile_E_HM = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp
index 79cebe5a79..4aad8f2684 100644
--- a/src/d/actor/d_a_e_hp.cpp
+++ b/src/d/actor/d_a_e_hp.cpp
@@ -12,8 +12,8 @@
 
 class daE_HP_HIO_c : public JORReflexible {
 public:
-    /* 806E5DEC */ daE_HP_HIO_c();
-    /* 806E9D38 */ virtual ~daE_HP_HIO_c() {}
+    daE_HP_HIO_c();
+    virtual ~daE_HP_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -28,8 +28,6 @@ public:
 };
 
 namespace {
-/* 806EA320-806EA364 000038 0044+00 0/1 0/0 0/0 .data            cc_hp_src__22@unnamed@d_a_e_hp_cpp@
- */
 static dCcD_SrcCyl cc_hp_src = {
     {
         {0, {{0x0, 0x0, 0x0}, {(s32)0xd8000000, 0x3}, 0x0}},
@@ -44,7 +42,6 @@ static dCcD_SrcCyl cc_hp_src = {
     }
 };
 
-/* 806EA364-806EA3A4 00007C 0040+00 0/1 0/0 0/0 .data cc_lamp_src__22@unnamed@d_a_e_hp_cpp@ */
 static dCcD_SrcSph cc_lamp_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {(s32)0xD8FBFDFF, 0x43}, 0x75}},  // mObj
@@ -57,7 +54,6 @@ static dCcD_SrcSph cc_lamp_src = {
     }  // mSphAttr
 };
 
-/* 806EA3A4-806EA3E8 0000BC 0044+00 0/1 0/0 0/0 .data cc_hp_at_src__22@unnamed@d_a_e_hp_cpp@ */
 static dCcD_SrcCyl cc_hp_at_src = {
     {
         {0, {{0x400, 0x1, 0xd}, {0x0, 0x0}, 0x0}},
@@ -73,7 +69,6 @@ static dCcD_SrcCyl cc_hp_at_src = {
 };
 }  // namespace
 
-/* 806E5DEC-806E5E30 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__12daE_HP_HIO_cFv */
 daE_HP_HIO_c::daE_HP_HIO_c() {
     mChild = -1;
     modelSize = 1.2f;
@@ -98,7 +93,6 @@ void daE_HP_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 806E5E30-806E5ED0 000130 00A0+00 1/1 0/0 0/0 .text ctrlJoint__8daE_HP_cFP8J3DJointP8J3DModel */
 int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     s32 jointNo = joint->getJntNo();
@@ -122,7 +116,6 @@ int daE_HP_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806E5ED0-806E5F1C 0001D0 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_HP_cFP8J3DJointi */
 int daE_HP_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -135,8 +128,6 @@ int daE_HP_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806E5F1C-806E5FCC 00021C 00B0+00 1/1 0/0 0/0 .text
- * LampCtrlJoint__8daE_HP_cFP8J3DJointP8J3DModel                */
 int daE_HP_c::LampCtrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     s32 jointNo = joint->getJntNo();
@@ -161,7 +152,6 @@ int daE_HP_c::LampCtrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806E5FCC-806E6018 0002CC 004C+00 1/1 0/0 0/0 .text LampJointCallBack__8daE_HP_cFP8J3DJointi */
 int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -174,13 +164,10 @@ int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806EA4E8-806EA4EC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 806EA4F8-806EA50C 000018 0014+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_HP_HIO_c l_HIO;
 
-/* 806E6018-806E64F4 000318 04DC+00 1/1 0/0 0/0 .text            draw__8daE_HP_cFv */
 int daE_HP_c::draw() {
     /* 806EA3E8-806EA3EC 000100 0004+00 1/1 0/0 0/0 .data            particleNmaeDt$4030 */
     static u16 particleNmaeDt[2] = {
@@ -298,25 +285,21 @@ int daE_HP_c::draw() {
     return 1;
 }
 
-/* 806E64F4-806E6514 0007F4 0020+00 1/0 0/0 0/0 .text            daE_HP_Draw__FP8daE_HP_c */
 static int daE_HP_Draw(daE_HP_c* param_0) {
     return param_0->draw();
 }
 
-/* 806E6514-806E65C0 000814 00AC+00 6/6 0/0 0/0 .text            setBck__8daE_HP_cFiUcff */
 void daE_HP_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) {
     mpMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_HP", param_0), param_1, param_2,
                      param_3, 0.0f, -1.0f);
     field_0x780 = param_0;
 }
 
-/* 806E65C0-806E65CC 0008C0 000C+00 9/9 0/0 0/0 .text            setActionMode__8daE_HP_cFii */
 void daE_HP_c::setActionMode(int param_0, int i_mode) {
     mAction = param_0;
     movemode = i_mode;
 }
 
-/* 806E65CC-806E673C 0008CC 0170+00 4/4 0/0 0/0 .text            mChkDistance__8daE_HP_cFf */
 bool daE_HP_c::mChkDistance(f32 param_0) {
     cXyz vecToPlayer = dComIfGp_getPlayer(0)->current.pos - current.pos;
     if (vecToPlayer.abs() < param_0) {
@@ -326,7 +309,6 @@ bool daE_HP_c::mChkDistance(f32 param_0) {
     }
 }
 
-/* 806E673C-806E6948 000A3C 020C+00 1/1 0/0 0/0 .text            damage_check__8daE_HP_cFv */
 void daE_HP_c::damage_check() {
     if (health <= 1 || !daPy_py_c::checkNowWolf() || field_0x71e != 0 || field_0x790 < 250.0f ||
         mAction == 5 || mAction == 6)
@@ -374,7 +356,6 @@ void daE_HP_c::damage_check() {
     }
 }
 
-/* 806E6948-806E6C74 000C48 032C+00 1/1 0/0 0/0 .text            executeWait__8daE_HP_cFv */
 void daE_HP_c::executeWait() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz homeToPlayer;
@@ -430,7 +411,6 @@ void daE_HP_c::executeWait() {
     cLib_addCalc0(&speedF, 0.7f, 5.0f);
 }
 
-/* 806E6C74-806E6ED8 000F74 0264+00 1/1 0/0 0/0 .text            executeMove__8daE_HP_cFv */
 void daE_HP_c::executeMove() {
     cXyz vecToHome;
     switch (movemode) {
@@ -464,7 +444,6 @@ void daE_HP_c::executeMove() {
     cLib_addCalcAngleS2(&current.angle.y, fopAcM_searchPlayerAngleY(this), 4, 0x800);
 }
 
-/* 806E6ED8-806E7228 0011D8 0350+00 1/1 0/0 0/0 .text            executeRetMove__8daE_HP_cFv */
 void daE_HP_c::executeRetMove() {
     cXyz vecToHome;
 
@@ -504,7 +483,6 @@ void daE_HP_c::executeRetMove() {
     }
 }
 
-/* 806E7228-806E7574 001528 034C+00 1/1 0/0 0/0 .text            executeAttack__8daE_HP_cFv */
 void daE_HP_c::executeAttack() {
     cXyz vecToHome;
     switch (movemode) {
@@ -556,7 +534,6 @@ void daE_HP_c::executeAttack() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 1, 0x1000);
 }
 
-/* 806E7574-806E77C0 001874 024C+00 1/1 0/0 0/0 .text            executeDamage__8daE_HP_cFv */
 void daE_HP_c::executeDamage() {
     switch (movemode) {
     case 0: {
@@ -591,7 +568,6 @@ void daE_HP_c::executeDamage() {
     cLib_addCalc0(&speedF, 0.7f, 5.0f);
 }
 
-/* 806E77C0-806E7E94 001AC0 06D4+00 1/1 0/0 0/0 .text            executeDown__8daE_HP_cFv */
 void daE_HP_c::executeDown() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dBgS_LinChk dStack_98;
@@ -730,7 +706,6 @@ void daE_HP_c::executeDown() {
     }
 }
 
-/* 806E7E94-806E814C 002194 02B8+00 1/1 0/0 0/0 .text            executeDead__8daE_HP_cFv */
 // NONMATCHING - g_dComIfG_gameInfo loading
 void daE_HP_c::executeDead() {
     if (field_0x78d == 0 && field_0x71c == 1) {
@@ -811,7 +786,6 @@ void daE_HP_c::executeDead() {
     }
 }
 
-/* 806E814C-806E8978 00244C 082C+00 2/1 0/0 0/0 .text            action__8daE_HP_cFv */
 void daE_HP_c::action() {
     s16 angleDiff = 0;
     s32 unkFlag1 = 0;
@@ -986,7 +960,6 @@ void daE_HP_c::action() {
     mSound1.setLinkSearch(unkFlag1);
 }
 
-/* 806E89C0-806E8DE0 002CC0 0420+00 2/2 0/0 0/0 .text            mtx_set__8daE_HP_cFv */
 void daE_HP_c::mtx_set() {
     J3DModel* model = mpMorfSO->getModel();
 
@@ -1039,7 +1012,6 @@ void daE_HP_c::mtx_set() {
     }
 }
 
-/* 806E8DE0-806E8FEC 0030E0 020C+00 1/1 0/0 0/0 .text            cc_set__8daE_HP_cFv */
 void daE_HP_c::cc_set() {
     cXyz cStack_1c;
     cXyz cStack_28;
@@ -1083,7 +1055,6 @@ void daE_HP_c::cc_set() {
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 806E8FEC-806E9170 0032EC 0184+00 1/1 0/0 0/0 .text            execute__8daE_HP_cFv */
 int daE_HP_c::execute() {
     if (field_0x77c != 0xff && !fopAcM_isSwitch(this, field_0x77c)) {
         attention_info.distances[fopAc_attn_BATTLE_e] = 0;
@@ -1145,17 +1116,14 @@ int daE_HP_c::execute() {
     return 1;
 }
 
-/* 806E9170-806E9190 003470 0020+00 1/0 0/0 0/0 .text            daE_HP_Execute__FP8daE_HP_c */
 static int daE_HP_Execute(daE_HP_c* i_this) {
     return i_this->execute();
 }
 
-/* 806E9190-806E9198 003490 0008+00 1/0 0/0 0/0 .text            daE_HP_IsDelete__FP8daE_HP_c */
 static int daE_HP_IsDelete(daE_HP_c* i_this) {
     return 1;
 }
 
-/* 806E9198-806E9220 003498 0088+00 1/1 0/0 0/0 .text            _delete__8daE_HP_cFv */
 int daE_HP_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_HP");
 
@@ -1172,13 +1140,11 @@ int daE_HP_c::_delete() {
     return 1;
 }
 
-/* 806E9220-806E9240 003520 0020+00 1/0 0/0 0/0 .text            daE_HP_Delete__FP8daE_HP_c */
 static int daE_HP_Delete(daE_HP_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 806E9240-806E94FC 003540 02BC+00 1/1 0/0 0/0 .text            CreateHeap__8daE_HP_cFv */
 int daE_HP_c::CreateHeap() {
     J3DModelData* modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19);
     JUT_ASSERT(0x764, modeldata != NULL);
@@ -1233,13 +1199,11 @@ int daE_HP_c::CreateHeap() {
     return 1;
 }
 
-/* 806E94FC-806E951C 0037FC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_HP_c* poe = (daE_HP_c*)i_this;
     return poe->CreateHeap();
 }
 
-/* 806E951C-806E9900 00381C 03E4+00 1/1 0/0 0/0 .text            create__8daE_HP_cFv */
 int daE_HP_c::create() {
     fopAcM_ct(this, daE_HP_c);
 
@@ -1351,23 +1315,19 @@ int daE_HP_c::create() {
     return loadResult;
 }
 
-/* 806E9900-806E9ABC 003C00 01BC+00 1/1 0/0 0/0 .text            __ct__8daE_HP_cFv */
 daE_HP_c::daE_HP_c() {
 }
 
-/* 806E9CD0-806E9CF0 003FD0 0020+00 1/0 0/0 0/0 .text            daE_HP_Create__FP8daE_HP_c */
 static int daE_HP_Create(daE_HP_c* i_this) {
     return i_this->create();
 }
 
-/* 806EA408-806EA428 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HP_Method */
 static actor_method_class l_daE_HP_Method = {
     (process_method_func)daE_HP_Create,  (process_method_func)daE_HP_Delete,
     (process_method_func)daE_HP_Execute, (process_method_func)daE_HP_IsDelete,
     (process_method_func)daE_HP_Draw,
 };
 
-/* 806EA428-806EA458 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HP */
 extern actor_process_profile_definition g_profile_E_HP = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp
index 32f9f3eba7..668f31e5fb 100644
--- a/src/d/actor/d_a_e_hz.cpp
+++ b/src/d/actor/d_a_e_hz.cpp
@@ -13,8 +13,8 @@
 
 class daE_HZ_HIO_c : public JORReflexible {
 public:
-    /* 806EA60C */ daE_HZ_HIO_c();
-    /* 806F0368 */ virtual ~daE_HZ_HIO_c() {}
+    daE_HZ_HIO_c();
+    virtual ~daE_HZ_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -49,7 +49,6 @@ enum daE_HZ_Action {
     /* 11 */ ACTION_DEATH_WAIT
 };
 
-/* 806EA60C-806EA690 0000EC 0084+00 1/1 0/0 0/0 .text            __ct__12daE_HZ_HIO_cFv */
 daE_HZ_HIO_c::daE_HZ_HIO_c() {
     enemy_sample = -1;
     basic_size = 1.0f;
@@ -67,14 +66,12 @@ daE_HZ_HIO_c::daE_HZ_HIO_c() {
     camera_off_timer = 50.0f;
 }
 
-/* 806EA690-806EA734 000170 00A4+00 12/12 0/0 0/0 .text            setBck__8daE_HZ_cFiUcff */
 void daE_HZ_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", i_index);
 
     mpMorfSO->setAnm(transform, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 806EA734-806EA790 000214 005C+00 5/5 0/0 0/0 .text            checkBck__8daE_HZ_cFi */
 bool daE_HZ_c::checkBck(int i_index) {
     J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", i_index);
 
@@ -85,7 +82,6 @@ bool daE_HZ_c::checkBck(int i_index) {
     return false;
 }
 
-/* 806EA790-806EA998 000270 0208+00 1/1 0/0 0/0 .text            draw__8daE_HZ_cFv */
 int daE_HZ_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel2, &tevStr);
@@ -124,26 +120,20 @@ int daE_HZ_c::draw() {
     return 1;
 }
 
-/* 806EA998-806EA9B8 000478 0020+00 1/0 0/0 0/0 .text            daE_HZ_Draw__FP8daE_HZ_c */
 static int daE_HZ_Draw(daE_HZ_c* i_this) {
     return i_this->draw();
 }
 
 static u8 l_HIOInit;
 
-/* 806F0B7C-806F0BB8 000054 003C+00 8/9 0/0 0/0 .bss             l_HIO */
 static daE_HZ_HIO_c l_HIO;
 
-/* 806F0BB8-806F0BBC 000090 0004+00 0/3 0/0 0/0 .bss             m_near_bomb */
 static daNbomb_c* m_near_bomb;
 
-/* 806F0BBC-806F0BC0 000094 0004+00 0/3 0/0 0/0 .bss             m_near_carry */
 static daObjCarry_c* m_near_carry;
 
-/* 806F0BC0-806F0BC4 000098 0004+00 0/3 0/0 0/0 .bss             m_near_weapon */
 static fopAc_ac_c* m_near_weapon;
 
-/* 806EA9B8-806EAADC 000498 0124+00 2/2 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor))
@@ -175,7 +165,6 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806EAADC-806EAB68 0005BC 008C+00 16/16 0/0 0/0 .text            setActionMode__8daE_HZ_cFi */
 void daE_HZ_c::setActionMode(int i_action) {
     if (mAction != i_action || i_action == 5) {
         if (mReadyNewAction) {
@@ -191,7 +180,6 @@ void daE_HZ_c::setActionMode(int i_action) {
     }
 }
 
-/* 806EAB68-806EAEDC 000648 0374+00 3/3 0/0 0/0 .text            checkHideStart__8daE_HZ_cFv */
 bool daE_HZ_c::checkHideStart() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -230,7 +218,6 @@ bool daE_HZ_c::checkHideStart() {
     return 0;
 }
 
-/* 806EAEDC-806EB05C 0009BC 0180+00 1/1 0/0 0/0 .text            checkAttackStart__8daE_HZ_cFv */
 bool daE_HZ_c::checkAttackStart() {
     field_0x6e9 = 0;
 
@@ -273,7 +260,6 @@ bool daE_HZ_c::checkAttackStart() {
     return false;
 }
 
-/* 806EB05C-806EB0A4 000B3C 0048+00 1/1 0/0 0/0 .text            checkArrowCharge__8daE_HZ_cFv */
 bool daE_HZ_c::checkArrowCharge() {
     if (daPy_getPlayerActorClass()->checkArrowChargeEnd()) {
         return true;
@@ -281,7 +267,6 @@ bool daE_HZ_c::checkArrowCharge() {
     return false;
 }
 
-/* 806EB0A4-806EB0FC 000B84 0058+00 11/11 0/0 0/0 .text            setTgSetBit__8daE_HZ_cFi */
 void daE_HZ_c::setTgSetBit(int i_setBit) {
     if (i_setBit) {
         mSpheres[1].OnTgSetBit();
@@ -294,7 +279,6 @@ void daE_HZ_c::setTgSetBit(int i_setBit) {
     }
 }
 
-/* 806EB0FC-806EB13C 000BDC 0040+00 0/0 0/0 1/1 .text            isWait__8daE_HZ_cFv */
 bool daE_HZ_c::isWait() {
     if (mAction == ACTION_WAIT || mAction == ACTION_HIDE) {
         return true;
@@ -306,7 +290,6 @@ bool daE_HZ_c::isWait() {
     return false;
 }
 
-/* 806EB13C-806EB2E8 000C1C 01AC+00 1/1 0/0 0/0 .text            checkFall__8daE_HZ_cFv */
 void daE_HZ_c::checkFall() {
     if (mAction == ACTION_DEATH_WAIT || mAction == ACTION_WATER_DEATH) {
         return;
@@ -338,7 +321,6 @@ void daE_HZ_c::checkFall() {
     }
 }
 
-/* 806EB2E8-806EB3EC 000DC8 0104+00 3/3 0/0 0/0 .text            setCloseSmokeEffect__8daE_HZ_cFv */
 void daE_HZ_c::setCloseSmokeEffect() {
     dBgS_GndChk gnd_chk;
 
@@ -354,7 +336,6 @@ void daE_HZ_c::setCloseSmokeEffect() {
     mSound.startCreatureSound(Z2SE_EN_HZ_CLOSE, 0, -1);
 }
 
-/* 806EB3EC-806EB7B0 000ECC 03C4+00 1/1 0/0 0/0 .text            executeWait__8daE_HZ_cFv */
 void daE_HZ_c::executeWait() {
     field_0x566 = 0;
     mSetModelAnmMtx = true;
@@ -455,7 +436,6 @@ void daE_HZ_c::executeWait() {
     }
 }
 
-/* 806EB7B0-806EB818 001290 0068+00 1/1 0/0 0/0 .text            getHideSpeed__8daE_HZ_cFv */
 f32 daE_HZ_c::getHideSpeed() {
     f32 ret;
     if (field_0x6cc < 3) {
@@ -473,7 +453,6 @@ f32 daE_HZ_c::getHideSpeed() {
     return ret;
 }
 
-/* 806EB818-806EBD44 0012F8 052C+00 1/1 0/0 0/0 .text            executeHide__8daE_HZ_cFv */
 void daE_HZ_c::executeHide() {
     field_0x566 = 0;
     mSetModelAnmMtx = true;
@@ -605,7 +584,6 @@ void daE_HZ_c::executeHide() {
     }
 }
 
-/* 806EBD44-806EC068 001824 0324+00 1/1 0/0 0/0 .text            executeAttack__8daE_HZ_cFv */
 void daE_HZ_c::executeAttack() {
     static u16 d_HZ_JUMP_EFFECT_ID[2] = {
         dPa_RM(ID_ZM_S_HAZIKIAPPEAR00),
@@ -664,7 +642,6 @@ void daE_HZ_c::executeAttack() {
     }
 }
 
-/* 806EC068-806EC348 001B48 02E0+00 2/2 0/0 0/0 .text            initBackWalk__8daE_HZ_cFv */
 void daE_HZ_c::initBackWalk() {
     cXyz position;
     cXyz start;
@@ -701,7 +678,6 @@ void daE_HZ_c::initBackWalk() {
     }
 }
 
-/* 806EC348-806ECAEC 001E28 07A4+00 1/1 0/0 0/0 .text            executeAway__8daE_HZ_cFv */
 void daE_HZ_c::executeAway() {
     switch (mMode) {
     case 0:
@@ -826,7 +802,6 @@ void daE_HZ_c::executeAway() {
     current.angle.y = shape_angle.y;
 }
 
-/* 806ECAEC-806ECB64 0025CC 0078+00 1/1 0/0 0/0 .text            setWindEnd__8daE_HZ_cFv */
 void daE_HZ_c::setWindEnd() {
     speed.y = 20.0f;
     field_0x6b2 = 0x1000;
@@ -841,7 +816,6 @@ void daE_HZ_c::setWindEnd() {
     gravity = -5.0f;
 }
 
-/* 806ECB64-806ED5B0 002644 0A4C+00 1/1 0/0 0/0 .text            executeWind__8daE_HZ_cFv */
 void daE_HZ_c::executeWind() {
     cXyz position;
     cXyz position2;
@@ -1019,7 +993,6 @@ void daE_HZ_c::executeWind() {
     }
 }
 
-/* 806ED5B0-806ED6C8 003090 0118+00 1/1 0/0 0/0 .text            executeChance__8daE_HZ_cFv */
 void daE_HZ_c::executeChance() {
     switch (mMode) {
     case 0:
@@ -1047,7 +1020,6 @@ void daE_HZ_c::executeChance() {
     }
 }
 
-/* 806ED6C8-806ED7A8 0031A8 00E0+00 2/2 0/0 0/0 .text            initRollDamage__8daE_HZ_cFv */
 void daE_HZ_c::initRollDamage() {
     current.angle.y = mAtInfo.mHitDirection.y + 0x8000;
     shape_angle.z = 0;
@@ -1087,7 +1059,6 @@ void daE_HZ_c::initRollDamage() {
     }
 }
 
-/* 806ED7A8-806ED8A4 003288 00FC+00 2/2 0/0 0/0 .text            doRollDamage__8daE_HZ_cFv */
 bool daE_HZ_c::doRollDamage() {
     shape_angle.y += field_0x6b6;
 
@@ -1104,7 +1075,6 @@ bool daE_HZ_c::doRollDamage() {
     return false;
 }
 
-/* 806ED8A4-806EDAA8 003384 0204+00 1/1 0/0 0/0 .text            executeDamage__8daE_HZ_cFv */
 void daE_HZ_c::executeDamage() {
     switch (mMode) {
     case 0:
@@ -1150,7 +1120,6 @@ void daE_HZ_c::executeDamage() {
     }
 }
 
-/* 806EDAA8-806EDDCC 003588 0324+00 1/1 0/0 0/0 .text            executeDeath__8daE_HZ_cFv */
 void daE_HZ_c::executeDeath() {
     mDamageDeathTimer = 10;
     field_0x566 = 0;
@@ -1217,14 +1186,12 @@ void daE_HZ_c::executeDeath() {
     }
 }
 
-/* 806EDDCC-806EDDE8 0038AC 001C+00 1/1 0/0 0/0 .text            setWindChanceEnd__8daE_HZ_cFv */
 void daE_HZ_c::setWindChanceEnd() {
     mWaitTimer = 30;
     mMode = 2;
     field_0x6b6 = 0x1800;
 }
 
-/* 806EDDE8-806EE120 0038C8 0338+00 1/1 0/0 0/0 .text            executeWindChance__8daE_HZ_cFv */
 void daE_HZ_c::executeWindChance() {
     cXyz end;
     cXyz start;
@@ -1292,7 +1259,6 @@ void daE_HZ_c::executeWindChance() {
     }
 }
 
-/* 806EE120-806EE2A4 003C00 0184+00 1/1 0/0 0/0 .text            executeWindWalk__8daE_HZ_cFv */
 void daE_HZ_c::executeWindWalk() {
     switch (mMode) {
     case 0:
@@ -1317,7 +1283,6 @@ void daE_HZ_c::executeWindWalk() {
     }
 }
 
-/* 806EE2A4-806EE3BC 003D84 0118+00 1/1 0/0 0/0 .text            setWaterEffect__8daE_HZ_cFv */
 void daE_HZ_c::setWaterEffect() {
     static u16 w_eff_id[4] = {
         ID_ZI_J_DOWNWTRA_A,
@@ -1334,7 +1299,6 @@ void daE_HZ_c::setWaterEffect() {
     }
 }
 
-/* 806EE3BC-806EE820 003E9C 0464+00 1/1 0/0 0/0 .text            executeWaterDeath__8daE_HZ_cFv */
 void daE_HZ_c::executeWaterDeath() {
     field_0x566 = 0;
 
@@ -1402,7 +1366,6 @@ void daE_HZ_c::executeWaterDeath() {
     }
 }
 
-/* 806EE820-806EE978 004300 0158+00 1/1 0/0 0/0 .text            executeDeathWait__8daE_HZ_cFv */
 void daE_HZ_c::executeDeathWait() {
     field_0x566 = 0;
 
@@ -1432,7 +1395,6 @@ void daE_HZ_c::executeDeathWait() {
     }
 }
 
-/* 806EE978-806EEE10 004458 0498+00 1/1 0/0 0/0 .text            damage_check__8daE_HZ_cFv */
 void daE_HZ_c::damage_check() {
     if (mAction != 1 || mMode < 4) {
         if (mSpheres[0].ChkTgHit() && mSpheres[0].GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
@@ -1580,7 +1542,6 @@ void daE_HZ_c::damage_check() {
     }
 }
 
-/* 806EEE10-806EEEE4 0048F0 00D4+00 1/1 0/0 0/0 .text            checkWaterSurface__8daE_HZ_cFv */
 bool daE_HZ_c::checkWaterSurface() {
     dBgS_ObjGndChk_Spl spline;
 
@@ -1601,7 +1562,6 @@ bool daE_HZ_c::checkWaterSurface() {
     return false;
 }
 
-/* 806EEEE4-806EF144 0049C4 0260+00 2/1 0/0 0/0 .text            action__8daE_HZ_cFv */
 void daE_HZ_c::action() {
     cXyz unused;
     cXyz unused2;
@@ -1699,7 +1659,6 @@ void daE_HZ_c::action() {
     mpMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 806EF144-806EF2C8 004C24 0184+00 1/1 0/0 0/0 .text            mtx_set__8daE_HZ_cFv */
 void daE_HZ_c::mtx_set() {
     mDoMtx_stack_c::transS(home.pos.x, home.pos.y - 13.0f, home.pos.z);
     mpModel2->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -1730,7 +1689,6 @@ void daE_HZ_c::mtx_set() {
     }
 }
 
-/* 806EF2C8-806EF46C 004DA8 01A4+00 1/1 0/0 0/0 .text            cc_set__8daE_HZ_cFv */
 void daE_HZ_c::cc_set() {
     if (field_0x6e8 == 0) {
         cXyz pos;
@@ -1760,7 +1718,6 @@ void daE_HZ_c::cc_set() {
     }
 }
 
-/* 806EF46C-806EF68C 004F4C 0220+00 1/1 0/0 0/0 .text            execute__8daE_HZ_cFv */
 int daE_HZ_c::execute() {
     if (field_0x6e8 != 0) {
         mtx_set();
@@ -1826,17 +1783,14 @@ int daE_HZ_c::execute() {
     return 1;
 }
 
-/* 806EF68C-806EF6AC 00516C 0020+00 2/1 0/0 0/0 .text            daE_HZ_Execute__FP8daE_HZ_c */
 static int daE_HZ_Execute(daE_HZ_c* i_this) {
     return i_this->execute();
 }
 
-/* 806EF6AC-806EF6B4 00518C 0008+00 1/0 0/0 0/0 .text            daE_HZ_IsDelete__FP8daE_HZ_c */
 static int daE_HZ_IsDelete(daE_HZ_c* i_this) {
     return 1;
 }
 
-/* 806EF6B4-806EF750 005194 009C+00 1/1 0/0 0/0 .text            _delete__8daE_HZ_cFv */
 int daE_HZ_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_HZ");
     dComIfG_resDelete(&mPhaseReq2, mpName);
@@ -1857,12 +1811,10 @@ int daE_HZ_c::_delete() {
     return 1;
 }
 
-/* 806EF750-806EF770 005230 0020+00 1/0 0/0 0/0 .text            daE_HZ_Delete__FP8daE_HZ_c */
 static int daE_HZ_Delete(daE_HZ_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806EF770-806EF880 005250 0110+00 1/1 0/0 0/0 .text ctrlJoint__8daE_HZ_cFP8J3DJointP8J3DModel */
 int daE_HZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     u16 joint_no = i_joint->getJntNo();
 
@@ -1890,7 +1842,6 @@ int daE_HZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806EF880-806EF8CC 005360 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_HZ_cFP8J3DJointi */
 int daE_HZ_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daE_HZ_c* a_this = (daE_HZ_c*)j3dSys.getModel()->getUserArea();
@@ -1902,7 +1853,6 @@ int daE_HZ_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806EF8CC-806EFB34 0053AC 0268+00 1/1 0/0 0/0 .text            CreateHeap__8daE_HZ_cFv */
 int daE_HZ_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", 0x16);
     JUT_ASSERT(2479, modelData != NULL);
@@ -1959,12 +1909,10 @@ int daE_HZ_c::CreateHeap() {
     return 1;
 }
 
-/* 806EFB34-806EFB54 005614 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_HZ_c*>(i_this)->CreateHeap();
 }
 
-/* 806EFB54-806EFC18 005634 00C4+00 1/1 0/0 0/0 .text            setInitPos__8daE_HZ_cFv */
 void daE_HZ_c::setInitPos() {
     dBgS_GndChk gnd_chk;
     cXyz modified_home_pos(home.pos);
@@ -1985,7 +1933,6 @@ void daE_HZ_c::setInitPos() {
     setActionMode(ACTION_HIDE);
 }
 
-/* 806EFC18-806EFFAC 0056F8 0394+00 1/1 0/0 0/0 .text            create__8daE_HZ_cFv */
 int daE_HZ_c::create() {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -2077,19 +2024,16 @@ int daE_HZ_c::create() {
     return phase;
 }
 
-/* 806F0300-806F0320 005DE0 0020+00 1/0 0/0 0/0 .text            daE_HZ_Create__FP8daE_HZ_c */
 static int daE_HZ_Create(daE_HZ_c* i_this) {
     return i_this->create();
 }
 
-/* 806F0A68-806F0A88 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HZ_Method */
 static actor_method_class l_daE_HZ_Method = {
     (process_method_func)daE_HZ_Create,  (process_method_func)daE_HZ_Delete,
     (process_method_func)daE_HZ_Execute, (process_method_func)daE_HZ_IsDelete,
     (process_method_func)daE_HZ_Draw,
 };
 
-/* 806F0A88-806F0AB8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HZ */
 extern actor_process_profile_definition g_profile_E_HZ = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp
index f699b92f8d..87be188988 100644
--- a/src/d/actor/d_a_e_hzelda.cpp
+++ b/src/d/actor/d_a_e_hzelda.cpp
@@ -98,21 +98,17 @@ enum hzelda_timer {
     TIMER_ATTACK_WAIT = 0,
 };
 
-/* 806F0D4C-806F0D70 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daE_HZELDA_HIO_cFv */
 daE_HZELDA_HIO_c::daE_HZELDA_HIO_c() {
     field_0x4 = -1;
     mModelSize = 1.0f;
 }
 
-/* 806F0D70-806F0E1C 000110 00AC+00 5/5 0/0 0/0 .text            anm_init__FP14e_hzelda_classifUcf
- */
 static void anm_init(e_hzelda_class* i_this, int i_resID, f32 i_morf, u8 i_attr,
                      f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Hzelda", i_resID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_resID;
 }
 
-/* 806F0E1C-806F1004 0001BC 01E8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -145,8 +141,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806F1004-806F1214 0003A4 0210+00 1/0 0/0 0/0 .text            daE_HZELDA_Draw__FP14e_hzelda_class
- */
 static int daE_HZELDA_Draw(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -186,7 +180,6 @@ static int daE_HZELDA_Draw(e_hzelda_class* i_this) {
     return 1;
 }
 
-/* 806F1214-806F13A8 0005B4 0194+00 1/1 0/0 0/0 .text            shot_s_sub__FPvPv */
 static void* shot_s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2)) {
         cXyz vec = ((fopAc_ac_c*)i_data)->current.pos - ((fopAc_ac_c*)i_actor)->current.pos;
@@ -198,8 +191,6 @@ static void* shot_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806F13A8-806F1758 000748 03B0+00 1/1 0/0 0/0 .text            e_hzelda_wait__FP14e_hzelda_class
- */
 static void e_hzelda_wait(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -288,7 +279,6 @@ static void e_hzelda_wait(e_hzelda_class* i_this) {
     cLib_addCalc0(&i_this->mDodgeMove, 1.0f, 2.0f);
 }
 
-/* 806F1758-806F1C9C 000AF8 0544+00 1/1 0/0 0/0 .text e_hzelda_attack_a__FP14e_hzelda_class */
 static int e_hzelda_attack_a(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -383,7 +373,6 @@ static int e_hzelda_attack_a(e_hzelda_class* i_this) {
     return ret;
 }
 
-/* 806F1C9C-806F1FA4 00103C 0308+00 1/1 0/0 0/0 .text e_hzelda_attack_b__FP14e_hzelda_class */
 static void e_hzelda_attack_b(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -452,7 +441,6 @@ static void e_hzelda_attack_b(e_hzelda_class* i_this) {
     cLib_addCalc2(&i_this->current.pos.z, i_this->mTargetMovePos.z, 0.05f, i_this->mMoveStep);
 }
 
-/* 806F1FA4-806F2054 001344 00B0+00 2/2 0/0 0/0 .text ball_crash_eff_set__FP14e_hzelda_classf */
 static void ball_crash_eff_set(e_hzelda_class* i_this, f32 i_size) {
     cXyz size(i_size, i_size, i_size);
     for (int i = 0; i < 3; i++) {
@@ -461,7 +449,6 @@ static void ball_crash_eff_set(e_hzelda_class* i_this, f32 i_size) {
     }
 }
 
-/* 806F2054-806F28C8 0013F4 0874+00 1/1 0/0 0/0 .text e_hzelda_attack_c__FP14e_hzelda_class */
 static void e_hzelda_attack_c(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -618,8 +605,6 @@ static void e_hzelda_attack_c(e_hzelda_class* i_this) {
     cLib_addCalc2(&a_this->current.pos.z, i_this->mTargetMovePos.z, 0.05f, i_this->mMoveStep);
 }
 
-/* 806F28C8-806F2A3C 001C68 0174+00 2/1 0/0 0/0 .text            e_hzelda_damage__FP14e_hzelda_class
- */
 static void e_hzelda_damage(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -661,7 +646,6 @@ static void e_hzelda_damage(e_hzelda_class* i_this) {
     }
 }
 
-/* 806F2A3C-806F2F9C 001DDC 0560+00 1/1 0/0 0/0 .text            action__FP14e_hzelda_class */
 static void action(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -819,8 +803,6 @@ static void action(e_hzelda_class* i_this) {
     }
 }
 
-/* 806F2F9C-806F3084 00233C 00E8+00 1/1 0/0 0/0 .text            ball_bg_check__FP14e_hzelda_class
- */
 static BOOL ball_bg_check(e_hzelda_class* i_this) {
     cXyz start;
     cXyz end;
@@ -838,7 +820,6 @@ static BOOL ball_bg_check(e_hzelda_class* i_this) {
     return FALSE;
 }
 
-/* 806F3084-806F3388 002424 0304+00 1/1 0/0 0/0 .text            demo_camera__FP14e_hzelda_class */
 static void demo_camera(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -916,7 +897,6 @@ static void demo_camera(e_hzelda_class* i_this) {
     }
 }
 
-/* 806F3388-806F3590 002728 0208+00 1/1 0/0 0/0 .text            anm_se_set__FP14e_hzelda_class */
 static void anm_se_set(e_hzelda_class* i_this) {
     if (i_this->mAnm == ANM_BEFORE_ATTACK && i_this->mpModelMorf->checkFrame(21)) {
         i_this->mSound.startCreatureVoice(Z2SE_EN_HZE_V_ATK_YOKOKU, -1);
@@ -933,13 +913,10 @@ static void anm_se_set(e_hzelda_class* i_this) {
     }
 }
 
-/* 806F5928-806F592C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 806F5938-806F5944 000018 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daE_HZELDA_HIO_c l_HIO;
 
-/* 806F3590-806F474C 002930 11BC+00 2/1 0/0 0/0 .text daE_HZELDA_Execute__FP14e_hzelda_class */
 static int daE_HZELDA_Execute(e_hzelda_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp114;
@@ -1312,12 +1289,10 @@ static int daE_HZELDA_Execute(e_hzelda_class* i_this) {
     return 1;
 }
 
-/* 806F474C-806F4754 003AEC 0008+00 1/0 0/0 0/0 .text daE_HZELDA_IsDelete__FP14e_hzelda_class */
 static int daE_HZELDA_IsDelete(e_hzelda_class* i_this) {
     return 1;
 }
 
-/* 806F4754-806F47C4 003AF4 0070+00 1/0 0/0 0/0 .text daE_HZELDA_Delete__FP14e_hzelda_class */
 static int daE_HZELDA_Delete(e_hzelda_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Hzelda");
 
@@ -1333,7 +1308,6 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) {
     return 1;
 }
 
-/* 806F47C4-806F4AD4 003B64 0310+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_hzelda_class* a_this = (e_hzelda_class*)i_this;
 
@@ -1391,8 +1365,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806F4B1C-806F4E48 003EBC 032C+00 1/0 0/0 0/0 .text            daE_HZELDA_Create__FP10fopAc_ac_c
- */
 static int daE_HZELDA_Create(fopAc_ac_c* i_this) {
     e_hzelda_class* a_this = (e_hzelda_class*)i_this;
     fopAcM_ct(a_this, e_hzelda_class);
@@ -1554,7 +1526,6 @@ static int daE_HZELDA_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 806F5854-806F5874 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_HZELDA_Method */
 static actor_method_class l_daE_HZELDA_Method = {
     (process_method_func)daE_HZELDA_Create,
     (process_method_func)daE_HZELDA_Delete,
@@ -1563,7 +1534,6 @@ static actor_method_class l_daE_HZELDA_Method = {
     (process_method_func)daE_HZELDA_Draw,
 };
 
-/* 806F5874-806F58A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_HZELDA */
 extern actor_process_profile_definition g_profile_E_HZELDA = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp
index 73b067ef51..b8c55ae6e6 100644
--- a/src/d/actor/d_a_e_is.cpp
+++ b/src/d/actor/d_a_e_is.cpp
@@ -23,7 +23,6 @@ enum daE_IS_ACTION {
     ACTION_SEKIZOU = 100,
 };
 
-/* 806F5A4C-806F5A94 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_IS_HIO_cFv */
 daE_IS_HIO_c::daE_IS_HIO_c() {
     id = -1;
     base_size = 1.0f;
@@ -33,13 +32,11 @@ daE_IS_HIO_c::daE_IS_HIO_c() {
     hit_width = 120.0f;
 }
 
-/* 806F5A94-806F5B40 000134 00AC+00 7/7 0/0 0/0 .text            anm_init__FP10e_is_classifUcf */
 static void anm_init(e_is_class* a_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     a_this->model_morf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_IS", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     a_this->anm = i_anm;
 }
 
-/* 806F5B40-806F5E38 0001E0 02F8+00 1/0 0/0 0/0 .text            daE_IS_Draw__FP10e_is_class */
 static int daE_IS_Draw(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -75,7 +72,6 @@ static int daE_IS_Draw(e_is_class* a_this) {
     return 1;
 }
 
-/* 806F5E38-806F5EB4 0004D8 007C+00 2/2 0/0 0/0 .text            pl_check__FP10e_is_classfs */
 static BOOL pl_check(e_is_class* a_this, f32 i_srchRange, s16 i_srchAngle) {
     fopAc_ac_c* actor = &a_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -90,7 +86,6 @@ static BOOL pl_check(e_is_class* a_this, f32 i_srchRange, s16 i_srchAngle) {
     return FALSE;
 }
 
-/* 806F5EB4-806F5F3C 000554 0088+00 1/1 0/0 0/0 .text            s_stop_sub__FPvPv */
 static void* s_stop_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_IS && i_data != i_actor &&
         ((e_is_class*)i_actor)->action == ACTION_POWEROFF && ((e_is_class*)i_actor)->mode == 10)
@@ -103,7 +98,6 @@ static void* s_stop_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 806F5F3C-806F6134 0005DC 01F8+00 1/1 0/0 0/0 .text            damage_check__FP10e_is_class */
 static void damage_check(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     dComIfGp_getPlayer(0);
@@ -150,7 +144,6 @@ static void damage_check(e_is_class* a_this) {
     }
 }
 
-/* 806F6134-806F6320 0007D4 01EC+00 1/1 0/0 0/0 .text            e_is_wait__FP10e_is_class */
 static void e_is_wait(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     actor->speedF = 0.0f;
@@ -204,13 +197,10 @@ static void e_is_wait(e_is_class* a_this) {
     }
 }
 
-/* 806F7DD0-806F7DD4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 806F7DE0-806F7DFC 000018 001C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daE_IS_HIO_c l_HIO;
 
-/* 806F6320-806F63FC 0009C0 00DC+00 1/1 0/0 0/0 .text            e_is_move__FP10e_is_class */
 static void e_is_move(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
     f32 speed_target = 0.0f;
@@ -233,7 +223,6 @@ static void e_is_move(e_is_class* a_this) {
     cLib_addCalcAngleS2(&actor->current.angle.y, a_this->angle_to_player, 1, 0x200);
 }
 
-/* 806F63FC-806F65BC 000A9C 01C0+00 1/1 0/0 0/0 .text            e_is_attack__FP10e_is_class */
 static void e_is_attack(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -279,7 +268,6 @@ static void e_is_attack(e_is_class* a_this) {
     }
 }
 
-/* 806F65BC-806F67B0 000C5C 01F4+00 1/1 0/0 0/0 .text            e_is_trap__FP10e_is_class */
 static void e_is_trap(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -325,7 +313,6 @@ static void e_is_trap(e_is_class* a_this) {
     cLib_addCalc2(&actor->current.pos.z, -1040.0f, 0.5f, 3.0f);
 }
 
-/* 806F67B0-806F691C 000E50 016C+00 1/1 0/0 0/0 .text            e_is_poweroff__FP10e_is_class */
 static void e_is_poweroff(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -368,7 +355,6 @@ static void e_is_poweroff(e_is_class* a_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 1.0f);
 }
 
-/* 806F691C-806F6A38 000FBC 011C+00 1/1 0/0 0/0 .text            e_is_damage__FP10e_is_class */
 static void e_is_damage(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -399,7 +385,6 @@ static void e_is_damage(e_is_class* a_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 2.0f);
 }
 
-/* 806F6A38-806F6B68 0010D8 0130+00 1/1 0/0 0/0 .text            e_is_break__FP10e_is_class */
 static void e_is_break(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -431,12 +416,10 @@ static void e_is_break(e_is_class* a_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 2.0f);
 }
 
-/* 806F6B68-806F6B7C 001208 0014+00 1/1 0/0 0/0 .text            e_is_sekizou__FP10e_is_class */
 static void e_is_sekizou(e_is_class* a_this) {
     a_this->model_morf->setPlaySpeed(0.0f);
 }
 
-/* 806F6B7C-806F6D90 00121C 0214+00 1/1 0/0 0/0 .text            action__FP10e_is_class */
 static void action(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -503,7 +486,6 @@ static void action(e_is_class* a_this) {
     }
 }
 
-/* 806F6D90-806F6E58 001430 00C8+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_is_class */
 static void anm_se_set(e_is_class* a_this) {
     if (a_this->anm == 0x10) {
         if (a_this->model_morf->checkFrame(39.0f)) {
@@ -514,7 +496,6 @@ static void anm_se_set(e_is_class* a_this) {
     }
 }
 
-/* 806F6E58-806F7204 0014F8 03AC+00 2/1 0/0 0/0 .text            daE_IS_Execute__FP10e_is_class */
 static int daE_IS_Execute(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -613,12 +594,10 @@ static int daE_IS_Execute(e_is_class* a_this) {
     return 1;
 }
 
-/* 806F7204-806F720C 0018A4 0008+00 1/0 0/0 0/0 .text            daE_IS_IsDelete__FP10e_is_class */
 static int daE_IS_IsDelete(e_is_class* a_this) {
     return 1;
 }
 
-/* 806F720C-806F7274 0018AC 0068+00 1/0 0/0 0/0 .text            daE_IS_Delete__FP10e_is_class */
 static int daE_IS_Delete(e_is_class* a_this) {
     fopAc_ac_c* actor = &a_this->enemy;
 
@@ -637,7 +616,6 @@ static int daE_IS_Delete(e_is_class* a_this) {
     return 1;
 }
 
-/* 806F7274-806F736C 001914 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_is_class* a_this = (e_is_class*)i_this;
 
@@ -649,7 +627,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 806F736C-806F76B4 001A0C 0348+00 1/0 0/0 0/0 .text            daE_IS_Create__FP10fopAc_ac_c */
 static int daE_IS_Create(fopAc_ac_c* i_this) {
     e_is_class* a_this = (e_is_class*)i_this;
     fopAcM_ct(i_this, e_is_class);
@@ -767,7 +744,6 @@ static int daE_IS_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 806F7D00-806F7D20 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_IS_Method */
 static actor_method_class l_daE_IS_Method = {
     (process_method_func)daE_IS_Create,
     (process_method_func)daE_IS_Delete,
@@ -776,7 +752,6 @@ static actor_method_class l_daE_IS_Method = {
     (process_method_func)daE_IS_Draw,
 };
 
-/* 806F7D20-806F7D50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_IS */
 extern actor_process_profile_definition g_profile_E_IS = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp
index 715ad6277a..a9f4060e5c 100644
--- a/src/d/actor/d_a_e_kg.cpp
+++ b/src/d/actor/d_a_e_kg.cpp
@@ -11,8 +11,8 @@
 
 class daE_KG_HIO_c {
 public:
-    /* 806F7EEC */ daE_KG_HIO_c();
-    /* 806F9EE8 */ virtual ~daE_KG_HIO_c() {}
+    daE_KG_HIO_c();
+    virtual ~daE_KG_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mSize;
@@ -20,7 +20,6 @@ public:
     /* 0x10 */ f32 mCheckRange;
 };
 
-/* 806F7EEC-806F7F24 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__12daE_KG_HIO_cFv */
 daE_KG_HIO_c::daE_KG_HIO_c() {
     field_0x4 = -1;
     mSize = 1.3f;
@@ -28,14 +27,12 @@ daE_KG_HIO_c::daE_KG_HIO_c() {
     mCheckRange = 600.0f;
 }
 
-/* 806F7F24-806F7FD0 000124 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_kg_classifUcf */
 static void anm_init(e_kg_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm = (J3DAnmTransform*) dComIfG_getObjectRes("E_kg", i_index);
     i_this->mpMorf->setAnm(anm, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mResIndex = i_index;
 }
 
-/* 806F7FD0-806F80D0 0001D0 0100+00 1/0 0/0 0/0 .text            daE_KG_Draw__FP10e_kg_class */
 static int daE_KG_Draw(e_kg_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -55,8 +52,6 @@ static int daE_KG_Draw(e_kg_class* i_this) {
     return 1;
 }
 
-/* 806F80D0-806F81A8 0002D0 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_kg_classP10fopAc_ac_c
- */
 static int other_bg_check(e_kg_class* i_this, fopAc_ac_c* i_player) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -75,7 +70,6 @@ static int other_bg_check(e_kg_class* i_this, fopAc_ac_c* i_player) {
     }
 }
 
-/* 806F81A8-806F8224 0003A8 007C+00 2/2 0/0 0/0 .text            pl_check__FP10e_kg_classfs */
 static int pl_check(e_kg_class* i_this, f32 i_check_range, s16 i_s16) {
     fopAc_ac_c* i_player = dComIfGp_getPlayer(0);
     if (i_this->mPlayerDist < i_check_range) {
@@ -90,7 +84,6 @@ static int pl_check(e_kg_class* i_this, f32 i_check_range, s16 i_s16) {
     return 0;
 }
 
-/* 806F8224-806F8328 000424 0104+00 1/1 0/0 0/0 .text            damage_check__FP10e_kg_class */
 static void damage_check(e_kg_class* i_this) {
     dComIfGp_getPlayer(0);
     if (i_this->field_0x69c == 0) {
@@ -130,7 +123,6 @@ static void damage_check(e_kg_class* i_this) {
     }
 }
 
-/* 806F8328-806F8434 000528 010C+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_kg_classf */
 static int way_bg_check(e_kg_class* i_this, f32 i_f32) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -153,13 +145,10 @@ static int way_bg_check(e_kg_class* i_this, f32 i_f32) {
     }
 }
 
-/* 806FA5E8-806FA5EC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 lbl_204_bss_8;
 
-/* 806FA5F8-806FA60C 000018 0014+00 5/5 0/0 0/0 .bss             l_HIO */
 static daE_KG_HIO_c l_HIO;
 
-/* 806F8434-806F8714 000634 02E0+00 1/1 0/0 0/0 .text            e_kg_move__FP10e_kg_class */
 static void e_kg_move(e_kg_class* i_this) {
     int frame = i_this->mpMorf->getFrame();
     f32 tgt_val = 0.0f;
@@ -222,7 +211,6 @@ static void e_kg_move(e_kg_class* i_this) {
     }
 }
 
-/* 806F8714-806F8A40 000914 032C+00 1/1 0/0 0/0 .text            e_kg_attack__FP10e_kg_class */
 static int e_kg_attack(e_kg_class* i_this) {
     int frame = i_this->mpMorf->getFrame();
     f32 next_speed = 0.0f;
@@ -318,7 +306,6 @@ static int e_kg_attack(e_kg_class* i_this) {
     return ret_val;
 }
 
-/* 806F8A40-806F8B50 000C40 0110+00 1/1 0/0 0/0 .text            e_kg_back__FP10e_kg_class */
 static void e_kg_back(e_kg_class* i_this) {
     switch (i_this->field_0x678) {
         case 0: {
@@ -350,7 +337,6 @@ static void e_kg_back(e_kg_class* i_this) {
     }
 }
 
-/* 806F8B50-806F8C90 000D50 0140+00 1/1 0/0 0/0 .text            e_kg_s_damage__FP10e_kg_class */
 static void e_kg_s_damage(e_kg_class* i_this) {
     switch (i_this->field_0x678) {
         case 0: {
@@ -383,7 +369,6 @@ static void e_kg_s_damage(e_kg_class* i_this) {
     }
 }
 
-/* 806F8C90-806F8F04 000E90 0274+00 1/1 0/0 0/0 .text            e_kg_damage__FP10e_kg_class */
 static void e_kg_damage(e_kg_class* i_this) {
     i_this->field_0x69c = 6;
     switch (i_this->field_0x678) {
@@ -445,7 +430,6 @@ static void e_kg_damage(e_kg_class* i_this) {
     }
 }
 
-/* 806F8F04-806F90F8 001104 01F4+00 1/1 0/0 0/0 .text            e_kg_roof__FP10e_kg_class */
 static void e_kg_roof(e_kg_class* i_this) {
     if ((i_this->field_0x674 & 0xF) == 0 && cM_rndF(1.0f) < 0.5f) {
         i_this->mSound.startCreatureVoice(Z2SE_EN_KG_V_WAIT, -1);
@@ -492,7 +476,6 @@ static void e_kg_roof(e_kg_class* i_this) {
     }
 }
 
-/* 806F90F8-806F9400 0012F8 0308+00 2/1 0/0 0/0 .text            action__FP10e_kg_class */
 static void action(e_kg_class* i_this) {
     fopAc_ac_c* actor_this = i_this;
     cXyz my_vec_0;
@@ -593,7 +576,6 @@ static void action(e_kg_class* i_this) {
     setMidnaBindEffect(i_this, &i_this->mSound, &i_this->eyePos, &eff_size);
 }
 
-/* 806F9400-806F94D0 001600 00D0+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_kg_class */
 static void anm_se_set(e_kg_class* i_this) {
     if (i_this->mResIndex == 0xF && (i_this->mpMorf->checkFrame(3.0f) || i_this->mpMorf->checkFrame(9.0f)
                                   || i_this->mpMorf->checkFrame(16.0f) || i_this->mpMorf->checkFrame(23.0f))) {
@@ -601,7 +583,6 @@ static void anm_se_set(e_kg_class* i_this) {
     }
 }
 
-/* 806F94D0-806F97A8 0016D0 02D8+00 2/1 0/0 0/0 .text            daE_KG_Execute__FP10e_kg_class */
 static int daE_KG_Execute(e_kg_class* i_this) {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -656,12 +637,10 @@ static int daE_KG_Execute(e_kg_class* i_this) {
     return 1;
 }
 
-/* 806F97A8-806F97B0 0019A8 0008+00 1/0 0/0 0/0 .text            daE_KG_IsDelete__FP10e_kg_class */
 static int daE_KG_IsDelete(e_kg_class* i_this) {
     return 1;
 }
 
-/* 806F97B0-806F9818 0019B0 0068+00 1/0 0/0 0/0 .text            daE_KG_Delete__FP10e_kg_class */
 static int daE_KG_Delete(e_kg_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_kg");
     if (i_this->field_0xa70) {
@@ -675,7 +654,6 @@ static int daE_KG_Delete(e_kg_class* i_this) {
     return 1;
 }
 
-/* 806F9818-806F99B8 001A18 01A0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_kg_class* a_this = (e_kg_class*) i_this;
     a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kg", 0x12), NULL, NULL,
@@ -694,7 +672,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return (!a_this->mpBtp->init(a_this->mpMorf->getModel()->getModelData(), btk, TRUE, 0, 1.0f, 0, -1)) ? cPhs_ERROR_e : 1;
 }
 
-/* 806F9A00-806F9CD4 001C00 02D4+00 1/0 0/0 0/0 .text            daE_KG_Create__FP10fopAc_ac_c */
 static int daE_KG_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -758,7 +735,6 @@ static int daE_KG_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 806FA518-806FA538 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_KG_Method */
 static actor_method_class l_daE_KG_Method = {
     (process_method_func)daE_KG_Create,
     (process_method_func)daE_KG_Delete,
@@ -767,7 +743,6 @@ static actor_method_class l_daE_KG_Method = {
     (process_method_func)daE_KG_Draw,
 };
 
-/* 806FA538-806FA568 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_KG */
 extern actor_process_profile_definition g_profile_E_KG = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp
index d0bcb744a7..2ccfd3bc20 100644
--- a/src/d/actor/d_a_e_kk.cpp
+++ b/src/d/actor/d_a_e_kk.cpp
@@ -13,8 +13,8 @@
 
 class daE_KK_HIO_c : public JORReflexible {
 public:
-    /* 806FA70C */ daE_KK_HIO_c();
-    /* 806FF0F0 */ virtual ~daE_KK_HIO_c() {}
+    daE_KK_HIO_c();
+    virtual ~daE_KK_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -42,8 +42,6 @@ enum daE_KK_Action {
 };
 
 namespace {
-/* 806FF6FC-806FF740 000038 0044+00 1/1 0/0 0/0 .data            cc_kk_src__22@unnamed@d_a_e_kk_cpp@
- */
 static dCcD_SrcCyl cc_kk_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBF9FF, 0x43}, 0x75}},  // mObj
@@ -58,7 +56,6 @@ static dCcD_SrcCyl cc_kk_src = {
     }  // mCyl
 };
 
-/* 806FF740-806FF780 00007C 0040+00 1/1 0/0 0/0 .data cc_kk_at_src__22@unnamed@d_a_e_kk_cpp@ */
 static dCcD_SrcSph cc_kk_at_src = {
     {
         {0x0, {{0x400, 0x1, 0xD}, {0xD8FBFDFF, 0x43}, 0x15}},  // mObj
@@ -72,7 +69,6 @@ static dCcD_SrcSph cc_kk_at_src = {
 };
 }  // namespace
 
-/* 806FA70C-806FA75C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_KK_HIO_cFv */
 daE_KK_HIO_c::daE_KK_HIO_c() {
     field_0x4 = -1;
     model_size = 1.0f;
@@ -83,7 +79,6 @@ daE_KK_HIO_c::daE_KK_HIO_c() {
     range_display = 0;
 }
 
-/* 806FA75C-806FA7FC 00013C 00A0+00 1/1 0/0 0/0 .text ctrlJoint__8daE_KK_cFP8J3DJointP8J3DModel */
 int daE_KK_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     s32 jntNo = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
@@ -101,7 +96,6 @@ int daE_KK_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 806FA7FC-806FA848 0001DC 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_KK_cFP8J3DJointi */
 int daE_KK_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -114,7 +108,6 @@ int daE_KK_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806FA848-806FAA48 000228 0200+00 1/1 0/0 0/0 .text            draw__8daE_KK_cFv */
 int daE_KK_c::draw() {
     if (field_0x679 == 2 && !checkItemGet(fpcNm_ITEM_IRONBALL, 1)) {
         return 1;
@@ -165,26 +158,22 @@ int daE_KK_c::draw() {
     return 1;
 }
 
-/* 806FAA48-806FAA68 000428 0020+00 1/0 0/0 0/0 .text            daE_KK_Draw__FP8daE_KK_c */
 static int daE_KK_Draw(daE_KK_c* i_this) {
     return i_this->draw();
 }
 
-/* 806FAA68-806FAB14 000448 00AC+00 10/10 0/0 0/0 .text            setBck__8daE_KK_cFiUcff */
 void daE_KK_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* animation = (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", i_index);
     mpMorfSO->setAnm(animation, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     field_0x764 = i_index;
 }
 
-/* 806FAB14-806FABC0 0004F4 00AC+00 5/5 0/0 0/0 .text            setWeaponBck__8daE_KK_cFiUcff */
 void daE_KK_c::setWeaponBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* animation = (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", i_index);
     mpWeaponMorfSO->setAnm(animation, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     field_0x768 = i_index;
 }
 
-/* 806FABC0-806FAC80 0005A0 00C0+00 1/1 0/0 0/0 .text            mCutTypeCheck__8daE_KK_cFi */
 bool daE_KK_c::mCutTypeCheck(int param_0) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -219,19 +208,15 @@ bool daE_KK_c::mCutTypeCheck(int param_0) {
     return 0;
 }
 
-/* 806FAC80-806FAC8C 000660 000C+00 7/7 0/0 0/0 .text            setActionMode__8daE_KK_cFii */
 void daE_KK_c::setActionMode(int i_action, int i_mode) {
     mActionMode = i_action;
     mMoveMode = i_mode;
 }
 
-/* 806FF880-806FF884 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 806FF890-806FF8AC 000018 001C+00 13/13 0/0 0/0 .bss             l_HIO */
 static daE_KK_HIO_c l_HIO;
 
-/* 806FAC8C-806FB2EC 00066C 0660+00 1/1 0/0 0/0 .text            damage_check__8daE_KK_cFv */
 void daE_KK_c::damage_check() {
     if (health <= 1 || field_0x679 == 1 || mActionMode == 10) {
         return;
@@ -345,7 +330,6 @@ void daE_KK_c::damage_check() {
     }
 }
 
-/* 806FB2EC-806FB4F4 000CCC 0208+00 8/8 0/0 0/0 .text            nextActionCheck__8daE_KK_cFv */
 void daE_KK_c::nextActionCheck() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (!dComIfGp_event_runCheck() && fopAcM_searchPlayerDistance(this) > l_HIO.direct_attack_range &&
@@ -383,7 +367,6 @@ void daE_KK_c::nextActionCheck() {
     }
 }
 
-/* 806FB4F4-806FB6C0 000ED4 01CC+00 2/2 0/0 0/0 .text            way_gake_check__8daE_KK_cFv */
 bool daE_KK_c::way_gake_check() {
     dBgS_GndChk gndChk;
     cXyz position;
@@ -416,7 +399,6 @@ bool daE_KK_c::way_gake_check() {
     return false;
 }
 
-/* 806FB6C0-806FB7D8 0010A0 0118+00 3/3 0/0 0/0 .text            mDeadEffSet__8daE_KK_cFR4cXyz */
 void daE_KK_c::mDeadEffSet(cXyz& param_0) {
     cXyz hioScale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
 
@@ -426,7 +408,6 @@ void daE_KK_c::mDeadEffSet(cXyz& param_0) {
     mCreatureSound.startCreatureSound(Z2SE_EN_KK_DEAD, 0, -1);
 }
 
-/* 806FB7D8-806FB908 0011B8 0130+00 1/1 0/0 0/0 .text            executeWait__8daE_KK_cFv */
 void daE_KK_c::executeWait() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     switch (mMoveMode) {
@@ -452,7 +433,6 @@ void daE_KK_c::executeWait() {
     }
 }
 
-/* 806FB908-806FBB1C 0012E8 0214+00 1/1 0/0 0/0 .text            executeIcicleWait__8daE_KK_cFv */
 void daE_KK_c::executeIcicleWait() {
     switch (mMoveMode) {
     case 0:
@@ -488,7 +468,6 @@ void daE_KK_c::executeIcicleWait() {
     }
 }
 
-/* 806FBB1C-806FBE98 0014FC 037C+00 1/1 0/0 0/0 .text            executeWalk__8daE_KK_cFv */
 void daE_KK_c::executeWalk() {
     dBgS_LinChk linChk;
     cXyz position1;
@@ -558,7 +537,6 @@ void daE_KK_c::executeWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 806FBE98-806FC370 001878 04D8+00 1/1 0/0 0/0 .text            executeSpearThrow__8daE_KK_cFv */
 void daE_KK_c::executeSpearThrow() {
     switch (mMoveMode) {
     case 0:
@@ -636,7 +614,6 @@ void daE_KK_c::executeSpearThrow() {
     }
 }
 
-/* 806FC370-806FC75C 001D50 03EC+00 1/1 0/0 0/0 .text            executeBackWalk__8daE_KK_cFv */
 void daE_KK_c::executeBackWalk() {
     dBgS_LinChk linChk;
     cXyz position1;
@@ -712,7 +689,6 @@ void daE_KK_c::executeBackWalk() {
     }
 }
 
-/* 806FC75C-806FC8F4 00213C 0198+00 1/1 0/0 0/0 .text            executeYoroke__8daE_KK_cFv */
 void daE_KK_c::executeYoroke() {
     switch (mMoveMode) {
     case 0:
@@ -746,7 +722,6 @@ void daE_KK_c::executeYoroke() {
     }
 }
 
-/* 806FC8F4-806FCA28 0022D4 0134+00 1/1 0/0 0/0 .text            executeGuard__8daE_KK_cFv */
 void daE_KK_c::executeGuard() {
     switch (mMoveMode) {
     case 0:
@@ -771,7 +746,6 @@ void daE_KK_c::executeGuard() {
     shape_angle.y = current.angle.y;
 }
 
-/* 806FCA28-806FCC34 002408 020C+00 1/1 0/0 0/0 .text            executeDamage__8daE_KK_cFv */
 void daE_KK_c::executeDamage() {
     switch (mMoveMode) {
     case 0:
@@ -810,7 +784,6 @@ void daE_KK_c::executeDamage() {
     }
 }
 
-/* 806FCC34-806FD068 002614 0434+00 1/1 0/0 0/0 .text            executeAttack__8daE_KK_cFv */
 void daE_KK_c::executeAttack() {
     dBgS_LinChk linChk;
     cXyz position1;
@@ -892,7 +865,6 @@ void daE_KK_c::executeAttack() {
     }
 }
 
-/* 806FD068-806FD294 002A48 022C+00 1/1 0/0 0/0 .text            executeDead__8daE_KK_cFv */
 void daE_KK_c::executeDead() {
     mDoMtx_stack_c::copy(mpMorfSO->getModel()->getAnmMtx(0x11));
     cXyz effect_position;
@@ -940,7 +912,6 @@ void daE_KK_c::executeDead() {
     }
 }
 
-/* 806FD294-806FD930 002C74 069C+00 1/1 0/0 0/0 .text            executeWeaponMove__8daE_KK_cFv */
 void daE_KK_c::executeWeaponMove() {
     fopAc_ac_c* actor = NULL;
     dBgS_LinChk linChk;
@@ -1075,7 +1046,6 @@ void daE_KK_c::executeWeaponMove() {
     }
 }
 
-/* 806FD930-806FDD0C 003310 03DC+00 2/1 0/0 0/0 .text            action__8daE_KK_cFv */
 void daE_KK_c::action() {
     BOOL link_search = false;
     damage_check();
@@ -1196,7 +1166,6 @@ void daE_KK_c::action() {
     }
 }
 
-/* 806FDD0C-806FDF0C 0036EC 0200+00 2/2 0/0 0/0 .text            mtx_set__8daE_KK_cFv */
 void daE_KK_c::mtx_set() {
     cXyz mult_vec;
 
@@ -1228,7 +1197,6 @@ void daE_KK_c::mtx_set() {
     }
 }
 
-/* 806FDF0C-806FE0B8 0038EC 01AC+00 2/2 0/0 0/0 .text            weapon_mtx_set__8daE_KK_cFv */
 void daE_KK_c::weapon_mtx_set() {
     cXyz mult_vec;
 
@@ -1253,7 +1221,6 @@ void daE_KK_c::weapon_mtx_set() {
     }
 }
 
-/* 806FE0B8-806FE2A8 003A98 01F0+00 1/1 0/0 0/0 .text            cc_set__8daE_KK_cFv */
 void daE_KK_c::cc_set() {
     if (field_0x679 != 1) {
         mDoMtx_stack_c::copy(mpMorfSO->getModel()->getAnmMtx(4));
@@ -1289,7 +1256,6 @@ void daE_KK_c::cc_set() {
     }
 }
 
-/* 806FE2A8-806FE3B8 003C88 0110+00 1/1 0/0 0/0 .text            execute__8daE_KK_cFv */
 int daE_KK_c::execute() {
     if (field_0x679 == 2) {
         if (!checkItemGet(fpcNm_ITEM_IRONBALL, 1)) {
@@ -1327,17 +1293,14 @@ int daE_KK_c::execute() {
     return 1;
 }
 
-/* 806FE3B8-806FE3D8 003D98 0020+00 1/0 0/0 0/0 .text            daE_KK_Execute__FP8daE_KK_c */
 static int daE_KK_Execute(daE_KK_c* i_this) {
     return i_this->execute();
 }
 
-/* 806FE3D8-806FE3E0 003DB8 0008+00 1/0 0/0 0/0 .text            daE_KK_IsDelete__FP8daE_KK_c */
 static int daE_KK_IsDelete(daE_KK_c* i_this) {
     return 1;
 }
 
-/* 806FE3E0-806FE460 003DC0 0080+00 1/1 0/0 0/0 .text            _delete__8daE_KK_cFv */
 int daE_KK_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, "E_KK");
 
@@ -1353,12 +1316,10 @@ int daE_KK_c::_delete() {
     return 1;
 }
 
-/* 806FE460-806FE480 003E40 0020+00 1/0 0/0 0/0 .text            daE_KK_Delete__FP8daE_KK_c */
 static int daE_KK_Delete(daE_KK_c* i_this) {
     return i_this->_delete();
 }
 
-/* 806FE480-806FE698 003E60 0218+00 1/1 0/0 0/0 .text            CreateHeap__8daE_KK_cFv */
 int daE_KK_c::CreateHeap() {
     if (field_0x679 != 1) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x22);
@@ -1391,12 +1352,10 @@ int daE_KK_c::CreateHeap() {
     return 1;
 }
 
-/* 806FE698-806FE6B8 004078 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_KK_c*>(i_this)->CreateHeap();
 }
 
-/* 806FE6B8-806FED20 004098 0668+00 1/1 0/0 0/0 .text            create__8daE_KK_cFv */
 int daE_KK_c::create() {
     fopAcM_ct(this, daE_KK_c);
 
@@ -1519,19 +1478,16 @@ int daE_KK_c::create() {
     return phase_state;
 }
 
-/* 806FF088-806FF0A8 004A68 0020+00 1/0 0/0 0/0 .text            daE_KK_Create__FP8daE_KK_c */
 static int daE_KK_Create(daE_KK_c* i_this) {
     return i_this->create();
 }
 
-/* 806FF7AC-806FF7CC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_KK_Method */
 static actor_method_class l_daE_KK_Method = {
     (process_method_func)daE_KK_Create,  (process_method_func)daE_KK_Delete,
     (process_method_func)daE_KK_Execute, (process_method_func)daE_KK_IsDelete,
     (process_method_func)daE_KK_Draw,
 };
 
-/* 806FF7CC-806FF7FC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_KK */
 extern actor_process_profile_definition g_profile_E_KK = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp
index 8566cf877f..8e60386094 100644
--- a/src/d/actor/d_a_e_kr.cpp
+++ b/src/d/actor/d_a_e_kr.cpp
@@ -49,7 +49,7 @@ public:
         field_0x6e = 20000;
         field_0x78 = -40.0f;
     }
-    /* 80705574 */ virtual ~e_krHIO_c() {}
+    virtual ~e_krHIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x04 */ u8 field_0x4;
@@ -91,10 +91,8 @@ public:
 
 STATIC_ASSERT(sizeof(e_krHIO_c) == 0x7c);
 
-/* 80705FF4-80706070 000014 007C+00 9/9 0/0 0/0 .bss             l_e_krHIO */
 static e_krHIO_c l_e_krHIO;
 
-/* 806FF9AC-806FFCD8 0000EC 032C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DJoint* joint = i_joint;
@@ -156,14 +154,12 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 806FFCD8-806FFD84 000418 00AC+00 8/8 0/0 0/0 .text            anm_init__FP10e_kr_classifUcf */
 static void anm_init(e_kr_class* i_this, int i_resIndex, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_kr", i_resIndex), i_attr,
                            i_morf, i_rate, 0.0f, -1.0f);
     i_this->field_0x5b8 = i_resIndex;
 }
 
-/* 806FFD84-806FFDB0 0004C4 002C+00 3/3 0/0 0/0 .text            kuti_open__FP10e_kr_classsUl */
 static void kuti_open(e_kr_class* i_this, s16 param_1, u32 param_2) {
     if (i_this->field_0xe82 == 0) {
         i_this->field_0xe82 = param_1;
@@ -172,7 +168,6 @@ static void kuti_open(e_kr_class* i_this, s16 param_1, u32 param_2) {
     }
 }
 
-/* 806FFDB0-806FFE90 0004F0 00E0+00 2/2 0/0 0/0 .text e_kr_player_bg_check__FP10e_kr_class */
 static BOOL e_kr_player_bg_check(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -194,7 +189,6 @@ static BOOL e_kr_player_bg_check(e_kr_class* i_this) {
     }
 }
 
-/* 806FFE90-806FFF54 0005D0 00C4+00 1/1 0/0 0/0 .text e_kr_setpos_bg_check__FP10e_kr_class */
 static BOOL e_kr_setpos_bg_check(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -215,7 +209,6 @@ static BOOL e_kr_setpos_bg_check(e_kr_class* i_this) {
     }
 }
 
-/* 806FFF54-80700108 000694 01B4+00 3/3 0/0 0/0 .text e_kr_player_view_check__FP10e_kr_class */
 static BOOL e_kr_player_view_check(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -264,7 +257,6 @@ static BOOL e_kr_player_view_check(e_kr_class* i_this) {
     return false;
 }
 
-/* 80700108-80700174 000848 006C+00 2/2 0/0 0/0 .text            pl_horse_check__FP10e_kr_class */
 static BOOL pl_horse_check(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF > 20.0f) {
@@ -274,8 +266,6 @@ static BOOL pl_horse_check(e_kr_class* i_this) {
     }
 }
 
-/* 80700174-80700204 0008B4 0090+00 1/1 0/0 0/0 .text            daE_Kr_shadowDraw__FP10e_kr_class
- */
 static void daE_Kr_shadowDraw(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -288,7 +278,6 @@ static void daE_Kr_shadowDraw(e_kr_class* i_this) {
         1.0f, dDlst_shadowControl_c::getSimpleTex());
 }
 
-/* 80700204-8070034C 000944 0148+00 1/0 0/0 0/0 .text            daE_Kr_Draw__FP10e_kr_class */
 static int daE_Kr_Draw(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -318,7 +307,6 @@ static int daE_Kr_Draw(e_kr_class* i_this) {
     return 1;
 }
 
-/* 8070034C-80700588 000A8C 023C+00 6/6 0/0 0/0 .text            e_kr_pos_move__FP10e_kr_class */
 static void e_kr_pos_move(e_kr_class* i_this) {
     cXyz unkXyz1;
 
@@ -404,7 +392,6 @@ static void e_kr_ground_pos_move(e_kr_class* i_this) {
     }
 }
 
-/* 80700588-80700638 000CC8 00B0+00 1/1 0/0 0/0 .text            coach_path_check__FP10e_kr_class */
 static BOOL coach_path_check(e_kr_class* i_this) {
     fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH);
     if (coach == NULL) {
@@ -421,7 +408,6 @@ static BOOL coach_path_check(e_kr_class* i_this) {
     }
 }
 
-/* 80700638-80700AF8 000D78 04C0+00 1/1 0/0 0/0 .text            e_kr_path_move__FP10e_kr_class */
 static s8 e_kr_path_move(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
@@ -576,7 +562,6 @@ static s8 e_kr_path_move(e_kr_class* i_this) {
     return retVal;
 }
 
-/* 80700AF8-80700E3C 001238 0344+00 1/1 0/0 0/0 .text            e_kr_auto_move__FP10e_kr_class */
 static void e_kr_auto_move(e_kr_class* i_this) {
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
     fopAc_ac_c* player = (daPy_py_c*)playerActor;
@@ -679,7 +664,6 @@ static void e_kr_auto_move(e_kr_class* i_this) {
     }
 }
 
-/* 80700E3C-80701CF4 00157C 0EB8+00 2/1 0/0 0/0 .text            e_kr_atack_move__FP10e_kr_class */
 static void e_kr_atack_move(e_kr_class* i_this) {
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
     daPy_py_c* player = (daPy_py_c*)playerActor;
@@ -1009,7 +993,6 @@ static void e_kr_atack_move(e_kr_class* i_this) {
     }
 }
 
-/* 80701CF4-807025B8 002434 08C4+00 1/1 0/0 0/0 .text            e_kr_horse_move__FP10e_kr_class */
 static void e_kr_horse_move(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1185,7 +1168,6 @@ static void e_kr_horse_move(e_kr_class* i_this) {
     }
 }
 
-/* 807025B8-80702C08 002CF8 0650+00 2/1 0/0 0/0 .text            e_kr_wait_move__FP10e_kr_class */
 static void e_kr_wait_move(e_kr_class* i_this) {
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
     daPy_py_c* player = (daPy_py_c*)playerActor;
@@ -1369,8 +1351,6 @@ static void e_kr_wait_move(e_kr_class* i_this) {
     }
 }
 
-/* 80702C08-8070320C 003348 0604+00 2/1 0/0 0/0 .text            e_kr_su_wait_move__FP10e_kr_class
- */
 static void e_kr_su_wait_move(e_kr_class* i_this) {
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
     daPy_py_c* player = (daPy_py_c*)playerActor;
@@ -1560,7 +1540,6 @@ static void e_kr_su_wait_move(e_kr_class* i_this) {
     }
 }
 
-/* 8070320C-8070329C 00394C 0090+00 1/1 0/0 0/0 .text            body_smoke_set__FP10e_kr_class */
 static void body_smoke_set(e_kr_class* i_this) {
     cXyz unkXyz1;
     cXyz unkXyz2;
@@ -1573,7 +1552,6 @@ static void body_smoke_set(e_kr_class* i_this) {
                         1.2f + XREG_F(4), &i_this->enemy.tevStr, 1);
 }
 
-/* 8070329C-8070338C 0039DC 00F0+00 1/1 0/0 0/0 .text            wing_smoke_set__FP10e_kr_class */
 static void wing_smoke_set(e_kr_class* i_this) {
     static int wing_j[4] = {0x0C, 0x0D, 0x11, 0x12};
 
@@ -1594,7 +1572,6 @@ static void wing_smoke_set(e_kr_class* i_this) {
     }
 }
 
-/* 8070338C-80703990 003ACC 0604+00 1/1 0/0 0/0 .text            e_kr_damage__FP10e_kr_class */
 static s8 e_kr_damage(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)actor;
@@ -1756,7 +1733,6 @@ static s8 e_kr_damage(e_kr_class* i_this) {
     return retVal;
 }
 
-/* 80703990-80703D74 0040D0 03E4+00 1/1 0/0 0/0 .text            damage_check__FP10e_kr_class */
 static void damage_check(e_kr_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* actor = &i_this->enemy;
@@ -1850,7 +1826,6 @@ static void damage_check(e_kr_class* i_this) {
     }
 }
 
-/* 80703D74-807040B0 0044B4 033C+00 1/1 0/0 0/0 .text            ground_angle_set__FP10e_kr_class */
 static void ground_angle_set(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -1942,7 +1917,6 @@ static void ground_angle_set(e_kr_class* i_this) {
     cLib_addCalcAngleS2(&i_this->field_0x6f0.z, unkShort1, 1, 0x400);
 }
 
-/* 807040B0-80704208 0047F0 0158+00 2/1 0/0 0/0 .text            action__FP10e_kr_class */
 static void action(e_kr_class* i_this) {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy;
 
@@ -2010,7 +1984,6 @@ static void action(e_kr_class* i_this) {
     setMidnaBindEffect(enemy, &i_this->mSound, &enemy->eyePos, &unkXyz3);
 }
 
-/* 80704208-80704B5C 004948 0954+00 2/1 0/0 0/0 .text            daE_Kr_Execute__FP10e_kr_class */
 static int daE_Kr_Execute(e_kr_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -2232,12 +2205,10 @@ static int daE_Kr_Execute(e_kr_class* i_this) {
     return 1;
 }
 
-/* 80704B5C-80704B64 00529C 0008+00 1/0 0/0 0/0 .text            daE_Kr_IsDelete__FP10e_kr_class */
 static int daE_Kr_IsDelete(e_kr_class* i_this) {
     return 1;
 }
 
-/* 80704B64-80704BB4 0052A4 0050+00 1/0 0/0 0/0 .text            daE_Kr_Delete__FP10e_kr_class */
 static int daE_Kr_Delete(e_kr_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_kr");
     fopEn_enemy_c* enemy = &i_this->enemy;
@@ -2250,7 +2221,6 @@ static int daE_Kr_Delete(e_kr_class* i_this) {
     return 1;
 }
 
-/* 80704BB4-80704CF0 0052F4 013C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_kr_class* kr = (e_kr_class*)i_this;
 
@@ -2273,7 +2243,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80704CF0-80705004 005430 0314+00 1/0 0/0 0/0 .text            daE_Kr_Create__FP10fopAc_ac_c */
 static int daE_Kr_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph at_sph_src = {
         {
@@ -2414,15 +2383,12 @@ static int daE_Kr_Create(fopAc_ac_c* i_this) {
 e_kr_class::e_kr_class() {
 }
 
-/* ############################################################################################## */
-/* 80705F08-80705F28 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Kr_Method */
 static actor_method_class l_daE_Kr_Method = {
     (process_method_func)daE_Kr_Create,  (process_method_func)daE_Kr_Delete,
     (process_method_func)daE_Kr_Execute, (process_method_func)daE_Kr_IsDelete,
     (process_method_func)daE_Kr_Draw,
 };
 
-/* 80705F28-80705F58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_KR */
 extern actor_process_profile_definition g_profile_E_KR = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp
index 4b4cd39d2b..3b016fceea 100644
--- a/src/d/actor/d_a_e_mb.cpp
+++ b/src/d/actor/d_a_e_mb.cpp
@@ -38,7 +38,6 @@
 #define ANM_MI_BOMB_POSE         21
 #define ANM_MI_ROPE_WAIT         22
 
-/* 8070616C-807061B4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_MB_HIO_cFv */
 daE_MB_HIO_c::daE_MB_HIO_c() {
     no = -1;
     base_size = 1.0f;
@@ -59,13 +58,11 @@ void daE_MB_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 807061B4-80706260 000134 00AC+00 5/5 0/0 0/0 .text            anm_init__FP10e_mb_classifUcf */
 static void anm_init(e_mb_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_mb", i_anmID), i_attr, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_anmID;
 }
 
-/* 80706260-807063B0 0001E0 0150+00 1/0 0/0 0/0 .text            daE_MB_Draw__FP10e_mb_class */
 static int daE_MB_Draw(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -95,31 +92,22 @@ static int daE_MB_Draw(e_mb_class* i_this) {
 /* 80708C2D 0003+00 data_80708C2D None */
 static u8 l_initHIO;
 
-/* 80708C3C-80708C58 000054 001C+00 2/5 0/0 0/0 .bss             l_HIO */
 static daE_MB_HIO_c l_HIO;
 
-/* 80708C64-80708C70 00007C 000C+00 0/2 0/0 0/0 .bss             L_pos1 */
 static cXyz L_pos1(-2575.0f, 1050.0f, 1060.0f);
 
-/* 80708C7C-80708C88 000094 000C+00 1/3 0/0 0/0 .bss             L_pos2 */
 static cXyz L_pos2(-1944.0f, 1050.0f, 1060.0f);
 
-/* 80708C94-80708CA0 0000AC 000C+00 0/2 0/0 0/0 .bss             L_Hpos */
 static cXyz L_Hpos(-1923.0f, 1432.0f, 1060.0f);
 
-/* 80708CAC-80708CB8 0000C4 000C+00 0/3 0/0 0/0 .bss             R_pos1 */
 static cXyz R_pos1(2606.0f, 1050.0f, 1070.0f);
 
-/* 80708CC4-80708CD0 0000DC 000C+00 2/4 0/0 0/0 .bss             R_pos2 */
 static cXyz R_pos2(2126.0f, 1050.0f, 1070.0f);
 
-/* 80708CDC-80708CE8 0000F4 000C+00 0/2 0/0 0/0 .bss             R_Hpos */
 static cXyz R_Hpos(2099.0f, 1432.0f, 1070.0f);
 
-/* 80708CF4-80708D00 00010C 000C+00 0/1 0/0 0/0 .bss             c_pos */
 static cXyz c_pos(0.0f, 1011.0f, 1060.0f);
 
-/* 807063B0-8070661C 000330 026C+00 2/1 0/0 0/0 .text            e_mb_standby__FP10e_mb_class */
 static void e_mb_standby(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(a_this->parentActorID);
@@ -182,7 +170,6 @@ static void e_mb_standby(e_mb_class* i_this) {
     }
 }
 
-/* 8070661C-80706898 00059C 027C+00 1/1 0/0 0/0 .text            e_mb_walk1__FP10e_mb_class */
 static void e_mb_walk1(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -216,7 +203,6 @@ static void e_mb_walk1(e_mb_class* i_this) {
     }
 }
 
-/* 807068D4-80706F90 000854 06BC+00 1/1 0/0 0/0 .text            e_mb_move__FP10e_mb_class */
 static s8 e_mb_move(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -305,7 +291,6 @@ static s8 e_mb_move(e_mb_class* i_this) {
     return var_r28;
 }
 
-/* 80706F90-8070723C 000F10 02AC+00 1/1 0/0 0/0 .text            e_mb_walk2__FP10e_mb_class */
 static void e_mb_walk2(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -343,7 +328,6 @@ static void e_mb_walk2(e_mb_class* i_this) {
     }
 }
 
-/* 8070723C-80707560 0011BC 0324+00 1/1 0/0 0/0 .text            e_mb_firstdemo__FP10e_mb_class */
 static void e_mb_firstdemo(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     b_bq_class* bq_p = (b_bq_class*)fopAcM_SearchByID(i_this->parentActorID);
@@ -397,12 +381,10 @@ static void e_mb_firstdemo(e_mb_class* i_this) {
     }
 }
 
-/* 80707560-80707570 0014E0 0010+00 1/1 0/0 0/0 .text            e_mb_end__FP10e_mb_class */
 static void e_mb_end(e_mb_class* i_this) {
     i_this->current.pos.y = 20000.0f;
 }
 
-/* 80707570-80707680 0014F0 0110+00 1/1 0/0 0/0 .text            action__FP10e_mb_class */
 static s8 action(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -442,7 +424,6 @@ static s8 action(e_mb_class* i_this) {
     return var_r29;
 }
 
-/* 80707680-80708148 001600 0AC8+00 2/1 0/0 0/0 .text            daE_MB_Execute__FP10e_mb_class */
 static int daE_MB_Execute(e_mb_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -633,12 +614,10 @@ static int daE_MB_Execute(e_mb_class* i_this) {
     return 1;
 }
 
-/* 80708148-80708150 0020C8 0008+00 1/0 0/0 0/0 .text            daE_MB_IsDelete__FP10e_mb_class */
 static int daE_MB_IsDelete(e_mb_class* i_this) {
     return 1;
 }
 
-/* 80708150-807081B8 0020D0 0068+00 1/0 0/0 0/0 .text            daE_MB_Delete__FP10e_mb_class */
 static int daE_MB_Delete(e_mb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
@@ -657,7 +636,6 @@ static int daE_MB_Delete(e_mb_class* i_this) {
     return 1;
 }
 
-/* 807081B8-8070853C 002138 0384+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_mb_class* a_this = (e_mb_class*)i_this;
 
@@ -699,7 +677,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80708584-8070879C 002504 0218+00 1/0 0/0 0/0 .text            daE_MB_Create__FP10fopAc_ac_c */
 static int daE_MB_Create(fopAc_ac_c* i_this) {
     e_mb_class* a_this = (e_mb_class*)i_this;
     fopAcM_ct(a_this, e_mb_class);
@@ -758,7 +735,6 @@ static int daE_MB_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80708B50-80708B70 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MB_Method */
 static actor_method_class l_daE_MB_Method = {
     (process_method_func)daE_MB_Create,
     (process_method_func)daE_MB_Delete,
@@ -767,7 +743,6 @@ static actor_method_class l_daE_MB_Method = {
     (process_method_func)daE_MB_Draw,
 };
 
-/* 80708B70-80708BA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MB */
 extern actor_process_profile_definition g_profile_E_MB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp
index 6475b03483..034bf6b943 100644
--- a/src/d/actor/d_a_e_md.cpp
+++ b/src/d/actor/d_a_e_md.cpp
@@ -24,7 +24,6 @@ enum daE_MD_ACTION {
     ACTION_VIB,
 };
 
-/* 80708DF8-80708E70 000078 0078+00 1/1 0/0 0/0 .text            initCcCylinder__8daE_MD_cFv */
 void daE_MD_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -48,7 +47,6 @@ void daE_MD_c::initCcCylinder() {
     mCyl.OnTgIronBallRebound();
 }
 
-/* 80708E70-80708EE8 0000F0 0078+00 3/3 0/0 0/0 .text            setCcCylinder__8daE_MD_cFf */
 void daE_MD_c::setCcCylinder(f32 i_height) {
     mCyl.SetC(current.pos);
     mCyl.SetR(80.0f);
@@ -95,34 +93,29 @@ int daE_MD_c::CreateHeap() {
     return 1;
 }
 
-/* 80708EE8-807091D0 000168 02E8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_MD_c* a_this = (daE_MD_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 807091D0-807091F0 000450 0020+00 1/0 0/0 0/0 .text            daE_MD_Create__FP10fopAc_ac_c */
 static int daE_MD_Create(fopAc_ac_c* i_this) {
     daE_MD_c* a_this = (daE_MD_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
     return a_this->create();
 }
 
-/* 807091F0-807092A4 000470 00B4+00 1/1 0/0 0/0 .text SetAnm__8daE_MD_cFP16mDoExt_McaMorfSOiiff */
 void daE_MD_c::SetAnm(mDoExt_McaMorfSO* i_modelMorf, int i_anm, int i_mode, f32 i_morf,
                       f32 i_speed) {
     i_modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MD", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 807092A4-807092C8 000524 0024+00 1/0 0/0 0/0 .text            daE_MD_Delete__FP8daE_MD_c */
 static int daE_MD_Delete(daE_MD_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->Delete();
     return 1;
 }
 
-/* 807092C8-80709378 000548 00B0+00 1/1 0/0 0/0 .text            At_Check__8daE_MD_cFv */
 void daE_MD_c::At_Check() {
     mAtInfo.mpCollider = mCyl.GetTgHitObj();
     mAtInfo.mpActor = at_power_check(&mAtInfo);
@@ -139,7 +132,6 @@ void daE_MD_c::At_Check() {
     }
 }
 
-/* 80709378-8070992C 0005F8 05B4+00 4/4 0/0 0/0 .text            CheckHit__8daE_MD_cFv */
 void daE_MD_c::CheckHit() {
     if (mInvulnerabilityTimer > 0) {
         mCyl.ClrTgHit();
@@ -205,12 +197,10 @@ void daE_MD_c::CheckHit() {
     }
 }
 
-/* 8070992C-8070994C 000BAC 0020+00 2/2 0/0 0/0 .text            WaitAction__8daE_MD_cFv */
 void daE_MD_c::WaitAction() {
     CheckHit();
 }
 
-/* 8070994C-80709A04 000BCC 00B8+00 1/1 0/0 0/0 .text            HalfBreakAction__8daE_MD_cFv */
 void daE_MD_c::HalfBreakAction() {
     CheckHit();
 
@@ -231,7 +221,6 @@ void daE_MD_c::HalfBreakAction() {
     }
 }
 
-/* 80709A04-80709ABC 000C84 00B8+00 3/3 0/0 0/0 .text            VibAction__8daE_MD_cFv */
 bool daE_MD_c::VibAction() {
     shape_angle.x = field_0x5ca * cM_ssin(field_0x5ce);
     cLib_addCalcAngleS(&field_0x5cc, 0x10, 3.0f + nREG_F(3), 0x100, 0);
@@ -244,7 +233,6 @@ bool daE_MD_c::VibAction() {
     return 0;
 }
 
-/* 80709ABC-80709BB4 000D3C 00F8+00 1/1 0/0 0/0 .text            DummyAction__8daE_MD_cFv */
 void daE_MD_c::DummyAction() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -279,7 +267,6 @@ void daE_MD_c::DummyAction() {
     }
 }
 
-/* 80709BB4-80709C3C 000E34 0088+00 1/1 0/0 0/0 .text            RealAction__8daE_MD_cFv */
 void daE_MD_c::RealAction() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -297,7 +284,6 @@ void daE_MD_c::RealAction() {
     }
 }
 
-/* 80709C3C-80709CFC 000EBC 00C0+00 1/1 0/0 0/0 .text            Action__8daE_MD_cFv */
 void daE_MD_c::Action() {
     switch (mType) {
     case TYPE_DUMMY:
@@ -314,7 +300,6 @@ void daE_MD_c::Action() {
     }
 }
 
-/* 80709CFC-80709D58 000F7C 005C+00 1/1 0/0 0/0 .text            Execute__8daE_MD_cFv */
 int daE_MD_c::Execute() {
     mInvulnerabilityTimer--;
     if (mInvulnerabilityTimer <= 0) {
@@ -326,7 +311,6 @@ int daE_MD_c::Execute() {
     return 1;
 }
 
-/* 80709D58-80709DA8 000FD8 0050+00 1/1 0/0 0/0 .text            Delete__8daE_MD_cFv */
 int daE_MD_c::Delete() {
     dComIfG_resDelete(&mPhase, "E_MD");
     if (heap != NULL) {
@@ -336,7 +320,6 @@ int daE_MD_c::Delete() {
     return 1;
 }
 
-/* 80709DA8-80709E6C 001028 00C4+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_MD_cFv */
 void daE_MD_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(field_0x5c8);
@@ -391,17 +374,14 @@ int daE_MD_c::Draw() {
     return 1;
 }
 
-/* 80709E6C-8070A024 0010EC 01B8+00 1/0 0/0 0/0 .text            daE_MD_Draw__FP8daE_MD_c */
 static int daE_MD_Draw(daE_MD_c* i_this) {
     return i_this->Draw();
 }
 
-/* 8070A024-8070A044 0012A4 0020+00 2/1 0/0 0/0 .text            daE_MD_Execute__FP8daE_MD_c */
 static int daE_MD_Execute(daE_MD_c* i_this) {
     return i_this->Execute();
 }
 
-/* 8070A044-8070A3CC 0012C4 0388+00 1/1 0/0 0/0 .text            create__8daE_MD_cFv */
 int daE_MD_c::create() {
     fopAcM_ct(this, daE_MD_c);
 
@@ -463,12 +443,10 @@ int daE_MD_c::create() {
     return phase_state;
 }
 
-/* 8070A4CC-8070A4D4 00174C 0008+00 1/0 0/0 0/0 .text            daE_MD_IsDelete__FP8daE_MD_c */
 static int daE_MD_IsDelete(daE_MD_c* i_this) {
     return 1;
 }
 
-/* 8070A578-8070A598 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MD_Method */
 static actor_method_class l_daE_MD_Method = {
     (process_method_func)daE_MD_Create,
     (process_method_func)daE_MD_Delete,
@@ -477,7 +455,6 @@ static actor_method_class l_daE_MD_Method = {
     (process_method_func)daE_MD_Draw,
 };
 
-/* 8070A598-8070A5C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MD */
 extern actor_process_profile_definition g_profile_E_MD = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp
index 903033a969..99e271328a 100644
--- a/src/d/actor/d_a_e_mf.cpp
+++ b/src/d/actor/d_a_e_mf.cpp
@@ -16,8 +16,8 @@
 
 class daE_MF_HIO_c : public JORReflexible {
 public:
-    /* 8070A70C */ daE_MF_HIO_c();
-    /* 80713464 */ virtual ~daE_MF_HIO_c() {}
+    daE_MF_HIO_c();
+    virtual ~daE_MF_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -88,7 +88,6 @@ enum Animation {
     /* 0x23 */ ANM_WALK,
 };
 
-/* 8070A70C-8070A77C 0000EC 0070+00 1/1 0/0 0/0 .text            __ct__12daE_MF_HIO_cFv */
 daE_MF_HIO_c::daE_MF_HIO_c() {
     field_0x4 = -1;
     model_size = 1.3f;
@@ -103,7 +102,6 @@ daE_MF_HIO_c::daE_MF_HIO_c() {
     invulnerable = 0;
 }
 
-/* 8070A77C-8070A82C 00015C 00B0+00 2/2 0/0 0/0 .text            mf_disappear__FP10e_mf_class */
 static void mf_disappear(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp1c, sp28;
@@ -121,14 +119,12 @@ static void mf_disappear(e_mf_class* i_this) {
     }
 }
 
-/* 8070A82C-8070A8D8 00020C 00AC+00 16/16 0/0 0/0 .text            anm_init__FP10e_mf_classifUcf */
 static void anm_init(e_mf_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_mf", i_anmID), i_attr, i_morf,
                                 i_rate, 0.0f, -1.0f);
     i_this->mAnmID = i_anmID;
 }
 
-/* 8070A8D8-8070AD94 0002B8 04BC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jointNo = i_joint->getJntNo();
@@ -204,7 +200,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8070AD94-8070B03C 000774 02A8+00 1/0 0/0 0/0 .text            daE_MF_Draw__FP10e_mf_class */
 static int daE_MF_Draw(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -257,7 +252,6 @@ static int daE_MF_Draw(e_mf_class* i_this) {
     return 1;
 }
 
-/* 8070B03C-8070B114 000A1C 00D8+00 2/2 0/0 0/0 .text other_bg_check__FP10e_mf_classP10fopAc_ac_c */
 static BOOL other_bg_check(e_mf_class* i_this, fopAc_ac_c* i_actor) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -276,7 +270,6 @@ static BOOL other_bg_check(e_mf_class* i_this, fopAc_ac_c* i_actor) {
     return FALSE;
 }
 
-/* 8070B114-8070B1EC 000AF4 00D8+00 1/1 0/0 0/0 .text other_bg_check2__FP10e_mf_classP4cXyz */
 static BOOL other_bg_check2(e_mf_class* i_this, cXyz* param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -298,16 +291,12 @@ static BOOL other_bg_check2(e_mf_class* i_this, cXyz* param_2) {
 
 u8 l_initHIO;
 
-/* 80713F74-80713F98 000054 0024+00 9/10 0/0 0/0 .bss             l_HIO */
 daE_MF_HIO_c l_HIO;
 
-/* 80713F98-80713FC0 000078 0028+00 2/2 0/0 0/0 .bss             target_info */
 fopAc_ac_c* target_info[10];
 
-/* 80713FC0-80713FC4 0000A0 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 int target_info_count;
 
-/* 8070B1EC-8070B268 000BCC 007C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) {
         target_info[target_info_count] = (fopAc_ac_c*)i_actor;
@@ -317,7 +306,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8070B268-8070B6E0 000C48 0478+00 2/2 0/0 0/0 .text            search_bomb__FP10e_mf_classi */
 static dBomb_c* search_bomb(e_mf_class* i_this, BOOL param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBomb_c* bomb;
@@ -380,17 +368,14 @@ static dBomb_c* search_bomb(e_mf_class* i_this, BOOL param_2) {
     return NULL;
 }
 
-/* 8070B6E0-8070B704 0010C0 0024+00 4/4 0/0 0/0 .text            bomb_view_check__FP10e_mf_class */
 static dBomb_c* bomb_view_check(e_mf_class* i_this) {
     return search_bomb(i_this, TRUE);
 }
 
-/* 8070B704-8070B728 0010E4 0024+00 1/1 0/0 0/0 .text            bomb_check__FP10e_mf_class */
 static dBomb_c* bomb_check(e_mf_class* i_this) {
     return search_bomb(i_this, FALSE);
 }
 
-/* 8070B728-8070B76C 001108 0044+00 1/1 0/0 0/0 .text            player_way_check__FP10e_mf_class */
 static BOOL player_way_check(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -406,7 +391,6 @@ static BOOL player_way_check(e_mf_class* i_this) {
     return TRUE;
 }
 
-/* 8070B76C-8070B848 00114C 00DC+00 4/4 0/0 0/0 .text            pl_check__FP10e_mf_classfs */
 static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -429,7 +413,6 @@ static int pl_check(e_mf_class* i_this, f32 param_2, s16 param_3) {
     return 0;
 }
 
-/* 8070B848-8070B950 001228 0108+00 3/3 0/0 0/0 .text            move_gake_check__FP10e_mf_classfSc */
 static BOOL move_gake_check(e_mf_class* i_this, f32 param_2, s8 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -454,7 +437,6 @@ static BOOL move_gake_check(e_mf_class* i_this, f32 param_2, s8 param_3) {
     return FALSE;
 }
 
-/* 8070B950-8070BB10 001330 01C0+00 1/1 0/0 0/0 .text jump_pos_check__FP10e_mf_classP4cXyz */
 static BOOL jump_pos_check(e_mf_class* i_this, cXyz* param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -495,7 +477,6 @@ static BOOL jump_pos_check(e_mf_class* i_this, cXyz* param_2) {
     return FALSE;
 }
 
-/* 8070BB10-8070BF94 0014F0 0484+00 2/1 0/0 0/0 .text            e_mf_stay__FP10e_mf_class */
 static void e_mf_stay(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp30;
@@ -597,7 +578,6 @@ static void e_mf_stay(e_mf_class* i_this) {
     }
 }
 
-/* 8070BF94-8070C2C4 001974 0330+00 1/1 0/0 0/0 .text            e_mf_otoreac__FP10e_mf_class */
 static void e_mf_otoreac(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp40, sp4c;
@@ -653,7 +633,6 @@ static void e_mf_otoreac(e_mf_class* i_this) {
     }
 }
 
-/* 8070C2C4-8070C7C4 001CA4 0500+00 2/1 0/0 0/0 .text            e_mf_bomb_action__FP10e_mf_class */
 static void e_mf_bomb_action(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s16 sVar2;
@@ -770,7 +749,6 @@ static void e_mf_bomb_action(e_mf_class* i_this) {
     i_this->field_0x718 = bomb->current.pos;
 }
 
-/* 8070C7C4-8070CB1C 0021A4 0358+00 1/1 0/0 0/0 .text            e_mf_normal__FP10e_mf_class */
 static void e_mf_normal(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp44, sp50;
@@ -853,7 +831,6 @@ static void e_mf_normal(e_mf_class* i_this) {
     }
 }
 
-/* 8070CB1C-8070CCB8 0024FC 019C+00 1/1 0/0 0/0 .text            e_mf_drawback__FP10e_mf_class */
 static void e_mf_drawback(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -888,7 +865,6 @@ static void e_mf_drawback(e_mf_class* i_this) {
     }
 }
 
-/* 8070CCB8-8070D090 002698 03D8+00 1/1 0/0 0/0 .text            e_mf_wolfbite__FP10e_mf_class */
 static void e_mf_wolfbite(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -966,7 +942,6 @@ static void e_mf_wolfbite(e_mf_class* i_this) {
     }
 }
 
-/* 8070D090-8070D0D0 002A70 0040+00 1/1 0/0 0/0 .text            way_check__FP10e_mf_class */
 static int way_check(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s16 sVar1 = a_this->shape_angle.y - i_this->mYAngleToPlayer;
@@ -981,7 +956,6 @@ static int way_check(e_mf_class* i_this) {
     return 2;
 }
 
-/* 8070D0D0-8070D2C8 002AB0 01F8+00 1/1 0/0 0/0 .text            shot_s_sub__FPvPv */
 static void* shot_s_sub(void* i_actor, void* i_data) {
     e_mf_class* i_this = (e_mf_class*)i_data;
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
@@ -1000,7 +974,6 @@ static void* shot_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8070D2C8-8070DBB4 002CA8 08EC+00 1/1 0/0 0/0 .text            e_mf_fight_run__FP10e_mf_class */
 static void e_mf_fight_run(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp4c, sp58;
@@ -1223,7 +1196,6 @@ static void e_mf_fight_run(e_mf_class* i_this) {
     }
 }
 
-/* 8070DBB4-8070DDDC 003594 0228+00 1/1 0/0 0/0 .text            e_mf_jump__FP10e_mf_class */
 static void e_mf_jump(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     
@@ -1280,7 +1252,6 @@ static void e_mf_jump(e_mf_class* i_this) {
     }
 }
 
-/* 8070DDDC-8070E30C 0037BC 0530+00 1/1 0/0 0/0 .text            e_mf_gakejump__FP10e_mf_class */
 static void e_mf_gakejump(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp24, sp30;
@@ -1382,7 +1353,6 @@ static void e_mf_gakejump(e_mf_class* i_this) {
     }
 }
 
-/* 8070E30C-8070E36C 003CEC 0060+00 2/2 0/0 0/0 .text            at_hit_check__FP10e_mf_class */
 static fopAc_ac_c* at_hit_check(e_mf_class* i_this) {
     if (i_this->field_0x5b4 >= 10) {
         return NULL;
@@ -1395,7 +1365,6 @@ static fopAc_ac_c* at_hit_check(e_mf_class* i_this) {
     return NULL;
 }
 
-/* 8070E36C-8070E5E0 003D4C 0274+00 1/1 0/0 0/0 .text            e_mf_attack__FP10e_mf_class */
 static void e_mf_attack(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -1460,7 +1429,6 @@ static void e_mf_attack(e_mf_class* i_this) {
     }
 }
 
-/* 8070E5E0-8070E760 003FC0 0180+00 1/1 0/0 0/0 .text            tail_eff_set__FP10e_mf_class */
 static void tail_eff_set(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1480,7 +1448,6 @@ static void tail_eff_set(e_mf_class* i_this) {
     }
 }
 
-/* 8070E760-8070EA10 004140 02B0+00 1/1 0/0 0/0 .text            e_mf_tail_attack__FP10e_mf_class */
 static void e_mf_tail_attack(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp30, sp3c;
@@ -1543,7 +1510,6 @@ static void e_mf_tail_attack(e_mf_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8070EA10-8070EC60 0043F0 0250+00 2/1 0/0 0/0 .text            e_mf_guard__FP10e_mf_class */
 static void e_mf_guard(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1613,7 +1579,6 @@ static void e_mf_guard(e_mf_class* i_this) {
     }
 }
 
-/* 8070EC60-8070ED10 004640 00B0+00 1/1 0/0 0/0 .text            e_mf_s_damage__FP10e_mf_class */
 static void e_mf_s_damage(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1635,7 +1600,6 @@ static void e_mf_s_damage(e_mf_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8070ED10-8070EEC4 0046F0 01B4+00 1/1 0/0 0/0 .text            kado_check__FP10e_mf_class */
 static int kado_check(e_mf_class* i_this) {
     static int kado_bit[2] = {
         1, 2,
@@ -1677,7 +1641,6 @@ static int kado_check(e_mf_class* i_this) {
     return rv;
 }
 
-/* 8070EEC4-8070F014 0048A4 0150+00 1/1 0/0 0/0 .text            body_gake__FP10e_mf_class */
 static BOOL body_gake(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -1699,7 +1662,6 @@ static BOOL body_gake(e_mf_class* i_this) {
     return FALSE;
 }
 
-/* 8070F08C-8070FBEC 004A6C 0B60+00 2/1 0/0 0/0 .text            e_mf_damage__FP10e_mf_class */
 static void e_mf_damage(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -2018,7 +1980,6 @@ static void e_mf_damage(e_mf_class* i_this) {
     }
 }
 
-/* 8070FBEC-8070FD40 0055CC 0154+00 1/1 0/0 0/0 .text            e_mf_backdrop__FP10e_mf_class */
 static void e_mf_backdrop(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2054,7 +2015,6 @@ static void e_mf_backdrop(e_mf_class* i_this) {
     }
 }
 
-/* 8070FD40-8070FEE0 005720 01A0+00 1/1 0/0 0/0 .text            e_mf_water__FP10e_mf_class */
 static void e_mf_water(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp20, sp2c, sp38;
@@ -2101,7 +2061,6 @@ static void e_mf_water(e_mf_class* i_this) {
     }
 }
 
-/* 8070FEE0-8070FF98 0058C0 00B8+00 1/1 0/0 0/0 .text            wolfkick_damage__FP10e_mf_class */
 static void wolfkick_damage(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2118,7 +2077,6 @@ static void wolfkick_damage(e_mf_class* i_this) {
     i_this->field_0x6f0 = 1;
 }
 
-/* 8070FF98-807100A8 005978 0110+00 1/1 0/0 0/0 .text            big_damage__FP10e_mf_class */
 static void big_damage(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2143,7 +2101,6 @@ static void big_damage(e_mf_class* i_this) {
     i_this->field_0x6f0 = 0;
 }
 
-/* 807100A8-80710158 005A88 00B0+00 1/1 0/0 0/0 .text            small_damage__FP10e_mf_class */
 static void small_damage(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2162,7 +2119,6 @@ static void small_damage(e_mf_class* i_this) {
     i_this->field_0x6ec = i_this->mAtInfo.mHitDirection.y;
 }
 
-/* 80710158-807104EC 005B38 0394+00 1/1 0/0 0/0 .text            damage_check__FP10e_mf_class */
 static void damage_check(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2265,7 +2221,6 @@ static void damage_check(e_mf_class* i_this) {
     }
 }
 
-/* 807104EC-807119BC 005ECC 14D0+00 2/1 0/0 0/0 .text            action__FP10e_mf_class */
 static void action(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2775,7 +2730,6 @@ static void action(e_mf_class* i_this) {
     }
 }
 
-/* 807119BC-80711CB8 00739C 02FC+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_mf_class */
 static void anm_se_set(e_mf_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
 
@@ -2819,10 +2773,8 @@ static void anm_se_set(e_mf_class* i_this) {
     }
 }
 
-/* 80713FC4-80713FC8 0000A4 0004+00 1/2 0/0 0/0 .bss             c_start */
 int c_start;
 
-/* 80711CB8-80712998 007698 0CE0+00 2/1 0/0 0/0 .text            daE_MF_Execute__FP10e_mf_class */
 static int daE_MF_Execute(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     f32 fVar1 = 0.0f;
@@ -3114,12 +3066,10 @@ static int daE_MF_Execute(e_mf_class* i_this) {
     return 1;
 }
 
-/* 80712998-807129A0 008378 0008+00 1/0 0/0 0/0 .text            daE_MF_IsDelete__FP10e_mf_class */
 static int daE_MF_IsDelete(e_mf_class* i_this) {
     return 1;
 }
 
-/* 807129A0-80712A08 008380 0068+00 1/0 0/0 0/0 .text            daE_MF_Delete__FP10e_mf_class */
 static int daE_MF_Delete(e_mf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dComIfG_resDelete(&i_this->mPhase, "E_mf");
@@ -3135,10 +3085,8 @@ static int daE_MF_Delete(e_mf_class* i_this) {
     return 1;
 }
 
-/* 80713CD8-80713CE4 0001D0 000C+00 1/0 0/0 0/0 .data            jv_offset */
 Vec jv_offset = { 0.0f, 0.0f, 0.0f };
 
-/* 80713CE4-80713D74 -00001 0090+00 1/1 0/0 0/0 .data            jc_data */
 dJntColData_c jc_data[12] = {
     {0, 1, 2, 40.0f, &jv_offset}, {0, 1, 3, 30.0f, &jv_offset},
     {0, 1, 22, 40.0f, &jv_offset}, {0, 1, 11, 15.0f, &jv_offset},
@@ -3148,7 +3096,6 @@ dJntColData_c jc_data[12] = {
     {0, 1, 28, 15.0f, &jv_offset}, {0, 1, 32, 20.0f, &jv_offset},
 };
 
-/* 80712A08-80712BF0 0083E8 01E8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_mf_class* i_this = (e_mf_class*)a_this;
 
@@ -3189,7 +3136,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80712BF0-80712F20 0085D0 0330+00 1/0 0/0 0/0 .text            daE_MF_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
     e_mf_class* i_this = (e_mf_class*)a_this;
 
@@ -3313,12 +3259,10 @@ static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80712F20-807130FC 008900 01DC+00 1/1 0/0 0/0 .text            __ct__10e_mf_classFv */
 e_mf_class::e_mf_class() {}
 
 AUDIO_INSTANCES;
 
-/* 80713E34-80713E54 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MF_Method */
 actor_method_class l_daE_MF_Method = {
     (process_method_func)daE_MF_Create,
     (process_method_func)daE_MF_Delete,
@@ -3327,7 +3271,6 @@ actor_method_class l_daE_MF_Method = {
     (process_method_func)daE_MF_Draw,
 };
 
-/* 80713E54-80713E84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MF */
 extern actor_process_profile_definition g_profile_E_MF = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp
index 4f44dbd124..0abd2cd7c1 100644
--- a/src/d/actor/d_a_e_mk.cpp
+++ b/src/d/actor/d_a_e_mk.cpp
@@ -22,8 +22,8 @@
 
 class daE_MK_HIO_c : public JORReflexible {
 public:
-    /* 8071412C */ daE_MK_HIO_c();
-    /* 8071C3EC */ virtual ~daE_MK_HIO_c() {}
+    daE_MK_HIO_c();
+    virtual ~daE_MK_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -35,7 +35,6 @@ public:
     /* 0x18 */ Vec mCrownPosAdjust;
 };
 
-/* 8071412C-8071417C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_MK_HIO_cFv */
 daE_MK_HIO_c::daE_MK_HIO_c() {
     field_0x4 = -1;
     mSize = 1.3f;
@@ -47,20 +46,17 @@ daE_MK_HIO_c::daE_MK_HIO_c() {
     mCrownPosAdjust.z = 0.0f;
 }
 
-/* 8071417C-80714228 00013C 00AC+00 9/9 0/0 0/0 .text            anm_init__FP10e_mk_classifUcf */
 static void anm_init(e_mk_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_mk", i_index),
                                 i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 80714228-807142D0 0001E8 00A8+00 2/2 0/0 0/0 .text            ok_anm_init__FP10e_mk_classifUcf */
 static void ok_anm_init(e_mk_class* i_this, int i_index, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpCrownModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_mk", i_index),
                                 i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
 }
 
-/* 807142D0-80714498 000290 01C8+00 1/0 0/0 0/0 .text            daE_MK_Draw__FP10e_mk_class */
 static int daE_MK_Draw(e_mk_class* i_this) {
     J3DModel* model_p = i_this->mpModelMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->enemy.current.pos, &i_this->enemy.tevStr);
@@ -101,7 +97,6 @@ static int daE_MK_Draw(e_mk_class* i_this) {
     return 1;
 }
 
-/* 807144D4-80714534 000494 0060+00 1/1 0/0 0/0 .text            s_obj_delete__FPvPv */
 static void* s_obj_delete(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         if (fopAcM_GetName(i_actor) == PROC_E_DB) {
@@ -114,16 +109,12 @@ static void* s_obj_delete(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8071CAB4-8071CAC0 000054 000C+00 0/2 0/0 0/0 .bss             demo_jump_pos_1 */
 static cXyz demo_jump_pos_1(1050.0f, 500.0f, -450.0f);
 
-/* 8071CACC-8071CAD8 00006C 000C+00 0/2 0/0 0/0 .bss             demo_jump_pos_2 */
 static cXyz demo_jump_pos_2(1262.0f, 1030.0f, -1665.0f);
 
-/* 8071CAE4-8071CAF0 000084 000C+00 0/2 0/0 0/0 .bss             demo_jump_pos_3 */
 static cXyz demo_jump_pos_3(2400.0f, 1115.0f, -1850.0f);
 
-/* 8071CAFC-8071CB08 00009C 000C+00 1/6 0/0 0/0 .bss             STAGE_CENTER_POS */
 static cXyz STAGE_CENTER_POS;
 
 /* 8071CB08 0002+00 data_8071CB08 STAGE_ANGLE_Y */
@@ -132,16 +123,12 @@ static s16 STAGE_ANGLE_Y;
 /* 8071CB0A 0001+00 .bss */
 u8 lbl_210_bss_AA;
 
-/* 8071CB18-8071CB3C 0000B8 0024+00 1/3 0/0 0/0 .bss             l_HIO */
 static daE_MK_HIO_c l_HIO;
 
-/* 8071CB3C-8071CB8C 0000DC 0050+00 4/7 0/0 0/0 .bss             target_info */
 static void* target_info[20];
 
-/* 8071CB8C-8071CB90 00012C 0004+00 4/7 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80714534-807145A4 0004F4 0070+00 4/4 0/0 0/0 .text            s_h_sub__FPvPv */
 static void* s_h_sub(void* i_actor, void* i_data) {
     if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) {
         target_info[target_info_count] = (daPillar_c*)i_actor;
@@ -151,7 +138,6 @@ static void* s_h_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807145A4-80714874 000564 02D0+00 1/1 0/0 0/0 .text            search_hasira__FP10e_mk_class */
 static daPillar_c* search_hasira(e_mk_class* i_this) {
     target_info_count = 0;
     for (int i = 0; i < 20; i++) {
@@ -205,7 +191,6 @@ static daPillar_c* search_hasira(e_mk_class* i_this) {
     return NULL;
 }
 
-/* 80714874-807148FC 000834 0088+00 1/1 0/0 0/0 .text            s_d_sub__FPvPv */
 static void* s_d_sub(void* i_actor, void* i_data) {
     if (((fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB) && static_cast<e_db_class*>(i_actor)->action == 10)
           && (static_cast<e_db_class*>(i_actor)->mode >= 1 && target_info_count < 20)) {
@@ -216,7 +201,6 @@ static void* s_d_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807148FC-80714B78 0008BC 027C+00 1/1 0/0 0/0 .text            search_db__FP10e_mk_class */
 static e_db_class* search_db(e_mk_class* i_this) {
     target_info_count = 0;
     for (int i = 0; i < 20; i++) {
@@ -255,7 +239,6 @@ static e_db_class* search_db(e_mk_class* i_this) {
     return NULL;
 }
 
-/* 80714B78-807154A8 000B38 0930+00 2/1 0/0 0/0 .text            e_mk_move__FP10e_mk_class */
 static void e_mk_move(e_mk_class* i_this) {
     cXyz sp28;
     int frame = i_this->mpModelMorf->getFrame();
@@ -413,7 +396,6 @@ static void e_mk_move(e_mk_class* i_this) {
     cLib_addCalc2(&i_this->enemy.current.pos.y, i_this->field_0x5b8.y, 1.0f, fabsf(i_this->field_0x6dc.y));
 }
 
-/* 807154A8-80715618 001468 0170+00 1/1 0/0 0/0 .text            e_mk_wait__FP10e_mk_class */
 static void e_mk_wait(e_mk_class* i_this) {
     switch (i_this->mMode) {
         case 0:
@@ -448,7 +430,6 @@ static void e_mk_wait(e_mk_class* i_this) {
     }
 }
 
-/* 80715618-80715B18 0015D8 0500+00 2/1 0/0 0/0 .text            e_mk_shoot__FP10e_mk_class */
 static void e_mk_shoot(e_mk_class* i_this) {
     cXyz sp48;
     int frame = i_this->mpModelMorf->getFrame();
@@ -592,10 +573,8 @@ static void e_mk_shoot(e_mk_class* i_this) {
     }
 }
 
-/* 8071CB90-8071CB94 000130 0004+00 1/2 0/0 0/0 .bss             None */
 static s8 lbl_210_bss_130;
 
-/* 80715B18-80715D2C 001AD8 0214+00 1/1 0/0 0/0 .text            e_mk_yoro__FP10e_mk_class */
 static void e_mk_yoro(e_mk_class* i_this) {
     switch (i_this->mMode) {
         case 0:
@@ -641,7 +620,6 @@ static void e_mk_yoro(e_mk_class* i_this) {
     }
 }
 
-/* 80715D2C-807160B0 001CEC 0384+00 1/1 0/0 0/0 .text            e_mk_drop__FP10e_mk_class */
 static void e_mk_drop(e_mk_class* i_this) {
     cXyz sp24;
     int frame = i_this->mpModelMorf->getFrame();
@@ -723,7 +701,6 @@ static void e_mk_drop(e_mk_class* i_this) {
     }
 }
 
-/* 807160B0-807161F8 002070 0148+00 1/1 0/0 0/0 .text            e_mk_damage__FP10e_mk_class */
 static void e_mk_damage(e_mk_class* i_this) {
     switch (i_this->mMode) {
         case 0:
@@ -751,7 +728,6 @@ static void e_mk_damage(e_mk_class* i_this) {
     }
 }
 
-/* 807161F8-8071637C 0021B8 0184+00 1/1 0/0 0/0 .text            damage_check__FP10e_mk_class */
 static void damage_check(e_mk_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (i_this->field_0x704 == 0) {
@@ -791,7 +767,6 @@ static void damage_check(e_mk_class* i_this) {
     }
 }
 
-/* 8071637C-80716780 00233C 0404+00 1/1 0/0 0/0 .text            e_mk_s_demo__FP10e_mk_class */
 static void e_mk_s_demo(e_mk_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
     i_this->field_0x704 = 5;
@@ -891,7 +866,6 @@ static void e_mk_s_demo(e_mk_class* i_this) {
     }
 }
 
-/* 80716780-80716F48 002740 07C8+00 1/1 0/0 0/0 .text            e_mk_e_demo__FP10e_mk_class */
 static int e_mk_e_demo(e_mk_class* i_this) {
     f32 fVar1;
     cXyz sp38, sp44;
@@ -1070,7 +1044,6 @@ static int e_mk_e_demo(e_mk_class* i_this) {
     return rv;
 }
 
-/* 80716F48-80717400 002F08 04B8+00 2/1 0/0 0/0 .text            e_mk_r04_demo__FP10e_mk_class */
 static void e_mk_r04_demo(e_mk_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
     f32 fVar2 = 0.0f;
@@ -1200,7 +1173,6 @@ static void e_mk_r04_demo(e_mk_class* i_this) {
     i_this->enemy.speed.y += i_this->enemy.gravity;
 }
 
-/* 80717400-807174E4 0033C0 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_mk_classf */
 static void cam_3d_morf(e_mk_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->mCamCenter.x, i_this->field_0xc5c.x, param_2, i_this->field_0xc74.x * i_this->field_0xc84);
     cLib_addCalc2(&i_this->mCamCenter.y, i_this->field_0xc5c.y, param_2, i_this->field_0xc74.y * i_this->field_0xc84);
@@ -1210,7 +1182,6 @@ static void cam_3d_morf(e_mk_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->mCamEye.z, i_this->field_0xc50.z, param_2, i_this->field_0xc68.z * i_this->field_0xc84);
 }
 
-/* 807174E4-8071823C 0034A4 0D58+00 1/1 0/0 0/0 .text            demo_camera_start__FP10e_mk_class */
 static void demo_camera_start(e_mk_class* i_this) {
     fopAc_ac_c* a_this = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1501,7 +1472,6 @@ static void demo_camera_start(e_mk_class* i_this) {
     }
 }
 
-/* 8071823C-80719488 0041FC 124C+00 1/1 0/0 0/0 .text            demo_camera_end__FP10e_mk_class */
 static void demo_camera_end(e_mk_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1899,7 +1869,6 @@ static void demo_camera_end(e_mk_class* i_this) {
     }
 }
 
-/* 80719488-807194E0 005448 0058+00 2/2 0/0 0/0 .text            s_ks_sub__FPvPv */
 static void* s_ks_sub(void* i_actor, void* i_data) {
     if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast<npc_ks_class*>(i_actor)->field_0x5b6 == 0) {
         return i_actor;
@@ -1908,7 +1877,6 @@ static void* s_ks_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807194E0-80719540 0054A0 0060+00 1/1 0/0 0/0 .text            s_brg_sub__FPvPv */
 static void* s_brg_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) {
         static_cast<obj_brg_class*>(i_actor)->field_0xaef4 = 500.0f;
@@ -1918,7 +1886,6 @@ static void* s_brg_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80719540-80719594 005500 0054+00 1/1 0/0 0/0 .text            s_brg_sub2__FPvPv */
 static void* s_brg_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) {
         static_cast<obj_brg_class*>(i_actor)->mType &= ~0x4;
@@ -1927,7 +1894,6 @@ static void* s_brg_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80719594-8071A06C 005554 0AD8+00 1/1 0/0 0/0 .text            demo_camera_r04__FP10e_mk_class */
 static void demo_camera_r04(e_mk_class* i_this) {
     u8 i_no;
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
@@ -2194,7 +2160,6 @@ static void demo_camera_r04(e_mk_class* i_this) {
     }
 }
 
-/* 8071A06C-8071A22C 00602C 01C0+00 1/1 0/0 0/0 .text            demo_camera_bohit__FP10e_mk_class */
 static void demo_camera_bohit(e_mk_class* i_this) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp20;
@@ -2247,7 +2212,6 @@ static void demo_camera_bohit(e_mk_class* i_this) {
     }
 }
 
-/* 8071A22C-8071A538 0061EC 030C+00 2/1 0/0 0/0 .text            demo_camera__FP10e_mk_class */
 static void demo_camera(e_mk_class* i_this) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp34, sp40;
@@ -2326,7 +2290,6 @@ static void demo_camera(e_mk_class* i_this) {
     }
 }
 
-/* 8071A538-8071A808 0064F8 02D0+00 2/1 0/0 0/0 .text            action__FP10e_mk_class */
 static void action(e_mk_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp28, sp34;
@@ -2424,7 +2387,6 @@ static void action(e_mk_class* i_this) {
     }
 }
 
-/* 8071A808-8071AF14 0067C8 070C+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_mk_class */
 static void anm_se_set(e_mk_class* i_this) {
     static u16 bo_eno_1[2] = {
         0x8214,
@@ -2529,7 +2491,6 @@ static void anm_se_set(e_mk_class* i_this) {
     }
 }
 
-/* 8071AF14-8071B9C4 006ED4 0AB0+00 2/1 0/0 0/0 .text            daE_MK_Execute__FP10e_mk_class */
 static int daE_MK_Execute(e_mk_class* i_this) {
     cXyz sp6c, sp78, sp84;
     i_this->field_0x6b4++;
@@ -2726,12 +2687,10 @@ static int daE_MK_Execute(e_mk_class* i_this) {
     return 1;
 }
 
-/* 8071B9C4-8071B9CC 007984 0008+00 1/0 0/0 0/0 .text            daE_MK_IsDelete__FP10e_mk_class */
 static int daE_MK_IsDelete(e_mk_class* i_this) {
     return 1;
 }
 
-/* 8071B9CC-8071BA34 00798C 0068+00 1/0 0/0 0/0 .text            daE_MK_Delete__FP10e_mk_class */
 static int daE_MK_Delete(e_mk_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "E_mk");
@@ -2746,7 +2705,6 @@ static int daE_MK_Delete(e_mk_class* i_this) {
     return 1;
 }
 
-/* 8071BA34-8071BCCC 0079F4 0298+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     e_mk_class* i_this = (e_mk_class*)actor;
     i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mk", 48), NULL, NULL,
@@ -2782,7 +2740,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 8071BD14-8071C190 007CD4 047C+00 1/0 0/0 0/0 .text            daE_MK_Create__FP10fopAc_ac_c */
 static int daE_MK_Create(fopAc_ac_c* i_actor) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -2898,7 +2855,6 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) {
 
 AUDIO_INSTANCES
 
-/* 8071C9B8-8071C9D8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MK_Method */
 static actor_method_class l_daE_MK_Method = {
     (process_method_func)daE_MK_Create,
     (process_method_func)daE_MK_Delete,
@@ -2907,7 +2863,6 @@ static actor_method_class l_daE_MK_Method = {
     (process_method_func)daE_MK_Draw,
 };
 
-/* 8071C9D8-8071CA08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MK */
 extern actor_process_profile_definition g_profile_E_MK = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp
index a60f3bed5b..f7c2beb779 100644
--- a/src/d/actor/d_a_e_mk_bo.cpp
+++ b/src/d/actor/d_a_e_mk_bo.cpp
@@ -12,8 +12,6 @@
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8071CCEC-8071CE30 0000EC 0144+00 1/0 0/0 0/0 .text            daE_MK_BO_Draw__FP13e_mk_bo_class
- */
 static int daE_MK_BO_Draw(e_mk_bo_class* i_this) {
     if (i_this->field_0x9b4 != 0) {
         return 1;
@@ -41,7 +39,6 @@ static int daE_MK_BO_Draw(e_mk_bo_class* i_this) {
     return 1;
 }
 
-/* 8071CE30-8071D084 000230 0254+00 1/1 0/0 0/0 .text            hit_check__FP13e_mk_bo_class */
 static void hit_check(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -85,7 +82,6 @@ static void hit_check(e_mk_bo_class* i_this) {
     }
 }
 
-/* 8071D084-8071D694 000484 0610+00 1/1 0/0 0/0 .text            e_mk_bo_shot__FP13e_mk_bo_class */
 static s8 e_mk_bo_shot(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* a_parent = (fopAc_ac_c*)fopAcM_SearchByID(actor->parentActorID);
@@ -183,7 +179,6 @@ static s8 e_mk_bo_shot(e_mk_bo_class* i_this) {
     return rt;
 }
 
-/* 8071D694-8071DBA0 000A94 050C+00 1/1 0/0 0/0 .text            e_mk_bo_start__FP13e_mk_bo_class */
 static s8 e_mk_bo_start(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* a_parent = fopAcM_SearchByID(actor->parentActorID);
@@ -258,7 +253,6 @@ static s8 e_mk_bo_start(e_mk_bo_class* i_this) {
     return rt;
 }
 
-/* 8071DBA0-8071DF04 000FA0 0364+00 1/1 0/0 0/0 .text            e_mk_bo_r04__FP13e_mk_bo_class */
 static s8 e_mk_bo_r04(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* a_parent = fopAcM_SearchByID(actor->parentActorID);
@@ -323,8 +317,6 @@ static s8 e_mk_bo_r04(e_mk_bo_class* i_this) {
     return rt;
 }
 
-/* 8071DF04-8071E1A4 001304 02A0+00 1/1 0/0 0/0 .text            e_mk_bo_hasira__FP13e_mk_bo_class
- */
 static void e_mk_bo_hasira(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* a_parent = fopAcM_SearchByID(actor->parentActorID);
@@ -392,7 +384,6 @@ static void e_mk_bo_hasira(e_mk_bo_class* i_this) {
     }
 }
 
-/* 8071E1A4-8071E200 0015A4 005C+00 1/1 0/0 0/0 .text e_mk_bo_demo_ground__FP13e_mk_bo_class */
 static void e_mk_bo_demo_ground(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -408,7 +399,6 @@ static void e_mk_bo_demo_ground(e_mk_bo_class* i_this) {
     e_mk_class* e_mk = (e_mk_class*)a_parent;
 }
 
-/* 8071E200-8071E6C4 001600 04C4+00 1/1 0/0 0/0 .text e_mk_bo_demo_spin__FP13e_mk_bo_class */
 static void e_mk_bo_demo_spin(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -505,7 +495,6 @@ static void e_mk_bo_demo_spin(e_mk_bo_class* i_this) {
     }
 }
 
-/* 8071E6C4-8071E8A4 001AC4 01E0+00 1/1 0/0 0/0 .text            action__FP13e_mk_bo_class */
 static void action(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp24;
@@ -564,7 +553,6 @@ static void action(e_mk_bo_class* i_this) {
     dComIfG_Ccsp()->Set(&i_this->ccAtSph);
 }
 
-/* 8071E8A4-8071EECC 001CA4 0628+00 2/1 0/0 0/0 .text daE_MK_BO_Execute__FP13e_mk_bo_class */
 static int daE_MK_BO_Execute(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp64;
@@ -721,13 +709,10 @@ static int daE_MK_BO_Execute(e_mk_bo_class* i_this) {
     return 1;
 }
 
-/* 8071EECC-8071EED4 0022CC 0008+00 1/0 0/0 0/0 .text daE_MK_BO_IsDelete__FP13e_mk_bo_class */
 static int daE_MK_BO_IsDelete(e_mk_bo_class* i_this) {
     return 1;
 }
 
-/* 8071EED4-8071EF24 0022D4 0050+00 1/0 0/0 0/0 .text            daE_MK_BO_Delete__FP13e_mk_bo_class
- */
 static int daE_MK_BO_Delete(e_mk_bo_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAcM_RegisterDeleteID(i_this, "E_MK_BO");
@@ -740,7 +725,6 @@ static int daE_MK_BO_Delete(e_mk_bo_class* i_this) {
     return 1;
 }
 
-/* 8071EF24-8071F120 002324 01FC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_mk_bo_class* a_this = (e_mk_bo_class*)i_this;
 
@@ -770,7 +754,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8071F168-8071F3D0 002568 0268+00 1/0 0/0 0/0 .text            daE_MK_BO_Create__FP10fopAc_ac_c */
 static int daE_MK_BO_Create(fopAc_ac_c* i_this) {
     e_mk_bo_class* a_this = (e_mk_bo_class*)i_this;
     fopAcM_ct(&a_this->enemy, e_mk_bo_class);
@@ -821,7 +804,6 @@ static int daE_MK_BO_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8071F75C-8071F77C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MK_BO_Method */
 static actor_method_class l_daE_MK_BO_Method = {
     (process_method_func)daE_MK_BO_Create,
     (process_method_func)daE_MK_BO_Delete,
@@ -830,7 +812,6 @@ static actor_method_class l_daE_MK_BO_Method = {
     (process_method_func)daE_MK_BO_Draw,
 };
 
-/* 8071F77C-8071F7AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MK_BO */
 extern actor_process_profile_definition g_profile_E_MK_BO = {
   fpcLy_CURRENT_e,       // mLayerID
   8,                     // mListID
diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp
index 39cc112e1c..3ea3a5be48 100644
--- a/src/d/actor/d_a_e_mm.cpp
+++ b/src/d/actor/d_a_e_mm.cpp
@@ -22,8 +22,8 @@ enum daE_MM_ACTION {
 
 class daE_MM_HIO_c : public JORReflexible {
 public:
-    /* 8071F9CC */ daE_MM_HIO_c();
-    /* 80722780 */ virtual ~daE_MM_HIO_c() {}
+    daE_MM_HIO_c();
+    virtual ~daE_MM_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -42,7 +42,6 @@ public:
     /* 0x32 */ s16 donketsu_angle;
 };
 
-/* 8071F9CC-8071FA44 0000EC 0078+00 1/1 0/0 0/0 .text            __ct__12daE_MM_HIO_cFv */
 daE_MM_HIO_c::daE_MM_HIO_c() {
     id = -1;
     base_size = 1.4f;
@@ -59,13 +58,11 @@ daE_MM_HIO_c::daE_MM_HIO_c() {
     donketsu_angle = 300;
 }
 
-/* 8071FA44-8071FAF0 000164 00AC+00 8/8 0/0 0/0 .text            anm_init__FP10e_mm_classifUcf */
 static void anm_init(e_mm_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MM", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->anm = i_anm;
 }
 
-/* 8071FAF0-8071FBC4 000210 00D4+00 1/0 0/0 0/0 .text            daE_MM_Draw__FP10e_mm_class */
 static int daE_MM_Draw(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -80,7 +77,6 @@ static int daE_MM_Draw(e_mm_class* i_this) {
     return 1;
 }
 
-/* 8071FBC4-8071FC24 0002E4 0060+00 1/1 0/0 0/0 .text            pl_check__FP10e_mm_classfs */
 static BOOL pl_check(e_mm_class* i_this, f32 i_range, s16) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -91,14 +87,10 @@ static BOOL pl_check(e_mm_class* i_this, f32 i_range, s16) {
     return 0;
 }
 
-/* 80722EB0-80722EB4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80722EC0-80722EF4 000018 0034+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_MM_HIO_c l_HIO;
 
-/* 8071FC24-8071FE98 000344 0274+00 1/1 0/0 0/0 .text            damage_checkMetOn__FP10e_mm_class
- */
 static void damage_checkMetOn(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -169,7 +161,6 @@ static void damage_checkMetOn(e_mm_class* i_this) {
     }
 }
 
-/* 8071FE98-807201A0 0005B8 0308+00 1/1 0/0 0/0 .text            damage_check__FP10e_mm_class */
 static void damage_check(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -257,7 +248,6 @@ static void damage_check(e_mm_class* i_this) {
     }
 }
 
-/* 807201A0-807202F0 0008C0 0150+00 2/2 0/0 0/0 .text            wall_check__FP10e_mm_classf */
 static bool wall_check(e_mm_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->enemy;
     dBgS_LinChk linchk;
@@ -290,8 +280,6 @@ static bool wall_check(e_mm_class* i_this, f32 param_1) {
     return TRUE;
 }
 
-/* 807202F0-807203E0 000A10 00F0+00 2/2 0/0 0/0 .text            mGround_WaterEffSet__FP10e_mm_class
- */
 static void mGround_WaterEffSet(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -313,7 +301,6 @@ static void mGround_WaterEffSet(e_mm_class* i_this) {
     }
 }
 
-/* 807203E0-80720590 000B00 01B0+00 1/1 0/0 0/0 .text            mWaterEffSet__FP10e_mm_classb */
 static void mWaterEffSet(e_mm_class* i_this, bool param_1) {
     fopAc_ac_c* actor = &i_this->enemy;
     J3DModel* model = i_this->modelMorf->getModel();
@@ -353,7 +340,6 @@ static void mWaterEffSet(e_mm_class* i_this, bool param_1) {
     }
 }
 
-/* 80720590-807206FC 000CB0 016C+00 3/3 0/0 0/0 .text            way_gake_check__FP10e_mm_class */
 static bool way_gake_check(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     dBgS_GndChk gndchk;
@@ -387,7 +373,6 @@ static bool way_gake_check(e_mm_class* i_this) {
     return FALSE;
 }
 
-/* 807206FC-80720B50 000E1C 0454+00 1/1 0/0 0/0 .text            e_mm_normal__FP10e_mm_class */
 static void e_mm_normal(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp38;
@@ -487,7 +472,6 @@ static void e_mm_normal(e_mm_class* i_this) {
     }
 }
 
-/* 80720B50-807211CC 001270 067C+00 1/1 0/0 0/0 .text            e_mm_dash__FP10e_mm_class */
 static void e_mm_dash(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp40;
@@ -645,7 +629,6 @@ static void e_mm_dash(e_mm_class* i_this) {
     cLib_addCalc2(&actor->speedF, move_speed, 1.0f, var_f30);
 }
 
-/* 807211CC-807212C8 0018EC 00FC+00 1/1 0/0 0/0 .text            e_mm_defence__FP10e_mm_class */
 static void e_mm_defence(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp14;
@@ -673,7 +656,6 @@ static void e_mm_defence(e_mm_class* i_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 3.0f);
 }
 
-/* 807212C8-807213BC 0019E8 00F4+00 1/1 0/0 0/0 .text            e_mm_magne_wait__FP10e_mm_class */
 static void e_mm_magne_wait(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp18;
@@ -696,7 +678,6 @@ static void e_mm_magne_wait(e_mm_class* i_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 3.0f);
 }
 
-/* 807213BC-80721538 001ADC 017C+00 1/1 0/0 0/0 .text            e_mm_turn__FP10e_mm_class */
 static void e_mm_turn(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -734,7 +715,6 @@ static void e_mm_turn(e_mm_class* i_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, 3.0f);
 }
 
-/* 80721538-807217F4 001C58 02BC+00 1/1 0/0 0/0 .text            e_mm_damage__FP10e_mm_class */
 static void e_mm_damage(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -799,7 +779,6 @@ static void e_mm_damage(e_mm_class* i_this) {
     cLib_addCalcAngleS2(&actor->current.angle.y, i_this->field_0x6ac, 2, 0x800);
 }
 
-/* 807217F4-80721D44 001F14 0550+00 2/1 0/0 0/0 .text            action__FP10e_mm_class */
 static void action(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp40;
@@ -935,7 +914,6 @@ static void action(e_mm_class* i_this) {
     }
 }
 
-/* 80721D44-80722004 002464 02C0+00 2/1 0/0 0/0 .text            daE_MM_Execute__FP10e_mm_class */
 static int daE_MM_Execute(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp20;
@@ -1010,12 +988,10 @@ static int daE_MM_Execute(e_mm_class* i_this) {
     return 1;
 }
 
-/* 80722004-8072200C 002724 0008+00 1/0 0/0 0/0 .text            daE_MM_IsDelete__FP10e_mm_class */
 static int daE_MM_IsDelete(e_mm_class* i_this) {
     return 1;
 }
 
-/* 8072200C-80722080 00272C 0074+00 1/0 0/0 0/0 .text            daE_MM_Delete__FP10e_mm_class */
 static int daE_MM_Delete(e_mm_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -1033,7 +1009,6 @@ static int daE_MM_Delete(e_mm_class* i_this) {
     return 1;
 }
 
-/* 80722080-8072218C 0027A0 010C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_mm_class* a_this = (e_mm_class*)i_this;
 
@@ -1050,7 +1025,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8072218C-8072256C 0028AC 03E0+00 1/0 0/0 0/0 .text            daE_MM_Create__FP10fopAc_ac_c */
 static int daE_MM_Create(fopAc_ac_c* actor) {
     fopAcM_ct(actor, e_mm_class);
     e_mm_class* i_this = (e_mm_class*)actor;
@@ -1157,7 +1131,6 @@ static int daE_MM_Create(fopAc_ac_c* actor) {
     return phase_state;
 }
 
-/* 80722DEC-80722E0C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MM_Method */
 static actor_method_class l_daE_MM_Method = {
     (process_method_func)daE_MM_Create,
     (process_method_func)daE_MM_Delete,
@@ -1166,7 +1139,6 @@ static actor_method_class l_daE_MM_Method = {
     (process_method_func)daE_MM_Draw,
 };
 
-/* 80722E0C-80722E3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MM */
 extern actor_process_profile_definition g_profile_E_MM = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp
index a66b3e87a2..75f2ff891d 100644
--- a/src/d/actor/d_a_e_mm_mt.cpp
+++ b/src/d/actor/d_a_e_mm_mt.cpp
@@ -8,8 +8,6 @@
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor_enemy.h"
 
-/* 80722F78-8072305C 000078 00E4+00 1/0 0/0 0/0 .text            daE_MM_MT_Draw__FP13e_mm_mt_class
- */
 static int daE_MM_MT_Draw(e_mm_mt_class* i_this) {
     i_this->enemy.model = i_this->mp_model;
     fopAc_ac_c* actor = (fopAc_ac_c*) i_this;
@@ -32,8 +30,6 @@ static int daE_MM_MT_Draw(e_mm_mt_class* i_this) {
     return 1;
 }
 
-/* 8072305C-80723270 00015C 0214+00 2/2 0/0 0/0 .text            e_mm_hookCheck__FP13e_mm_mt_class
- */
 static bool e_mm_hookCheck(e_mm_mt_class* i_this) {
 
     cCcD_Obj* hitObject;
@@ -89,8 +85,6 @@ static bool e_mm_hookCheck(e_mm_mt_class* i_this) {
     return 0;
 }
 
-/* 80723270-807234E8 000370 0278+00 1/1 0/0 0/0 .text            e_mm_mt_normal__FP13e_mm_mt_class
- */
 static void e_mm_mt_normal(e_mm_mt_class* i_this) {
     fopAc_ac_c* helmasaurActor;
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
@@ -153,8 +147,6 @@ static void e_mm_mt_normal(e_mm_mt_class* i_this) {
     }
 }
 
-/* 807234E8-80723744 0005E8 025C+00 1/1 0/0 0/0 .text            e_mm_mt_hagare__FP13e_mm_mt_class
- */
 static void e_mm_mt_hagare(e_mm_mt_class* i_this) {
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
     fopAc_ac_c* actor = (fopAc_ac_c*) i_this;
@@ -210,7 +202,6 @@ static void e_mm_mt_hagare(e_mm_mt_class* i_this) {
     }
 }
 
-/* 80723744-807239CC 000844 0288+00 1/1 0/0 0/0 .text            e_mm_mt_carry__FP13e_mm_mt_class */
 static void e_mm_mt_carry(e_mm_mt_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*) &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
@@ -302,7 +293,6 @@ static s16 wall_angle_get(e_mm_mt_class* i_this) {
     return  vec1.atan2sX_Z() + 0x4000;
 }
 
-/* 80723B70-80724190 000C70 0620+00 1/1 0/0 0/0 .text            e_mm_mt_drop__FP13e_mm_mt_class */
 static void e_mm_mt_drop(e_mm_mt_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*) i_this;
 
@@ -430,7 +420,6 @@ static void e_mm_mt_drop(e_mm_mt_class* i_this) {
     }
 }
 
-/* 80724190-80724D40 001290 0BB0+00 1/1 0/0 0/0 .text            action__FP13e_mm_mt_class */
 static void action(e_mm_mt_class* i_this) {
     fopAc_ac_c* unusedPlayer = dComIfGp_getPlayer(0);
     fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(&i_this->enemy);
@@ -713,7 +702,6 @@ static void action(e_mm_mt_class* i_this) {
     dComIfG_Ccsp()->Set(&i_this->m_sphere);
 }
 
-/* 80724D40-80724DF4 001E40 00B4+00 2/1 0/0 0/0 .text daE_MM_MT_Execute__FP13e_mm_mt_class */
 static int daE_MM_MT_Execute(e_mm_mt_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*) i_this;
     i_this->m_lifetime++;
@@ -732,13 +720,10 @@ static int daE_MM_MT_Execute(e_mm_mt_class* i_this) {
     return true;
 }
 
-/* 80724DF4-80724DFC 001EF4 0008+00 1/0 0/0 0/0 .text daE_MM_MT_IsDelete__FP13e_mm_mt_class */
 static int daE_MM_MT_IsDelete(e_mm_mt_class* i_this) {
     return 1;
 }
 
-/* 80724DFC-80724E58 001EFC 005C+00 1/0 0/0 0/0 .text            daE_MM_MT_Delete__FP13e_mm_mt_class
- */
 static int daE_MM_MT_Delete(e_mm_mt_class* i_this) {
     dComIfG_resDelete(&i_this->m_phase, "E_MM_MT");
     if (i_this->enemy.heap != NULL) {
@@ -747,7 +732,6 @@ static int daE_MM_MT_Delete(e_mm_mt_class* i_this) {
     return 1;
 }
 
-/* 80724E58-80724EE0 001F58 0088+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     J3DModelData* i_modelData;
     int resource_index = 4;
@@ -767,7 +751,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80724EE0-80725218 001FE0 0338+00 1/0 0/0 0/0 .text            daE_MM_MT_Create__FP10fopAc_ac_c */
 static int daE_MM_MT_Create(fopAc_ac_c* i_this) {
     cPhs__Step cVar1;
     bool bVar2;
@@ -859,7 +842,6 @@ static int daE_MM_MT_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 807259EC-80725A0C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MM_MT_Method */
 static actor_method_class l_daE_MM_MT_Method = {
     (process_method_func)daE_MM_MT_Create,
     (process_method_func)daE_MM_MT_Delete,
@@ -868,7 +850,6 @@ static actor_method_class l_daE_MM_MT_Method = {
     (process_method_func)daE_MM_MT_Draw,
 };
 
-/* 80725A0C-80725A3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MM_MT */
 extern actor_process_profile_definition g_profile_E_MM_MT = {
   fpcLy_CURRENT_e,        // mLayerID
   8,                      // mListID
diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp
index 9c70d4e502..a68682f589 100644
--- a/src/d/actor/d_a_e_ms.cpp
+++ b/src/d/actor/d_a_e_ms.cpp
@@ -14,8 +14,8 @@
 
 class daE_MS_HIO_c : public JORReflexible {
 public:
-    /* 80725B8C */ daE_MS_HIO_c();
-    /* 8072900C */ virtual ~daE_MS_HIO_c() {};
+    daE_MS_HIO_c();
+    virtual ~daE_MS_HIO_c() {};
 
     void genMessage(JORMContext*);
 
@@ -27,7 +27,6 @@ public:
     /* 0x18 */ f32 mPlayerDistanceLimit;
 };
 
-/* 80725B8C-80725BD4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_MS_HIO_cFv */
 daE_MS_HIO_c::daE_MS_HIO_c() {
     field_0x4 = -1;
     mScale = 1.0f;
@@ -37,14 +36,12 @@ daE_MS_HIO_c::daE_MS_HIO_c() {
     mPlayerDistanceLimit = 450.0f;
 }
 
-/* 80725BD4-80725C80 000134 00AC+00 7/7 0/0 0/0 .text            anm_init__FP10e_ms_classifUcf */
 static void anm_init(e_ms_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_MS", param_2), param_4,
                                 param_3, param_5, 0.0f, -1.0f);
     i_this->mNextSound = param_2;
 }
 
-/* 80725C80-80725CCC 0001E0 004C+00 3/3 0/0 0/0 .text            pl_check__FP10e_ms_classf */
 static int pl_check(e_ms_class* i_this, f32 i_dist) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (i_this->mPlayerDistance < i_dist && !fopAcM_otherBgCheck(i_this, player)) {
@@ -54,7 +51,6 @@ static int pl_check(e_ms_class* i_this, f32 i_dist) {
     return 0;
 }
 
-/* 80725CCC-80725DEC 00022C 0120+00 1/0 0/0 0/0 .text            daE_MS_Draw__FP10e_ms_class */
 static int daE_MS_Draw(e_ms_class* i_this) {
     if (i_this->field_0xba5) {
         return 1;
@@ -77,7 +73,6 @@ static int daE_MS_Draw(e_ms_class* i_this) {
     return 1;
 }
 
-/* 80725DEC-80725ED4 00034C 00E8+00 2/2 0/0 0/0 .text            sibuki_set__FP10e_ms_class */
 static void sibuki_set(e_ms_class* i_this) {
     if (!i_this->mCooldown2) {
         i_this->mCooldown2 = 20;
@@ -92,7 +87,6 @@ static void sibuki_set(e_ms_class* i_this) {
     }
 }
 
-/* 80725ED4-80725FF0 000434 011C+00 1/1 0/0 0/0 .text            ms_disappear__FP10e_ms_class */
 static void ms_disappear(e_ms_class* i_this) {
     fopAcM_createDisappear(i_this, &i_this->eyePos, 10, 0, 0x26);
     int no = (fopAcM_GetParam(i_this) >> 0x10) & 0xff;
@@ -114,20 +108,15 @@ static void ms_disappear(e_ms_class* i_this) {
     }
 }
 
-/* 807297FC-80729800 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 807297FD 0003+00 data_807297FD None */
 static u8 hioInit;
 
-/* 8072980C-80729828 000054 001C+00 7/8 0/0 0/0 .bss             l_HIO */
 static daE_MS_HIO_c l_HIO;
 
-/* 80729828-80729878 000070 0050+00 2/2 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[20];
 
-/* 80729878-8072987C 0000C0 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80725FF0-8072606C 000550 007C+00 1/1 0/0 0/0 .text            s_d_sub__FPvPv */
 static void* s_d_sub(void* param_1, void* param_2) {
     daObjCarry_c* i_this = (daObjCarry_c*)param_1;
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry && i_this->getType() == daObjCarry_c::TYPE_DOKURO &&
@@ -140,7 +129,6 @@ static void* s_d_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 8072606C-807261E8 0005CC 017C+00 1/1 0/0 0/0 .text            search_dokuro__FP10e_ms_class */
 static fopAc_ac_c* search_dokuro(e_ms_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     target_info_count = 0;
@@ -181,7 +169,6 @@ static fopAc_ac_c* search_dokuro(e_ms_class* i_this) {
     return NULL;
 }
 
-/* 807261E8-80726360 000748 0178+00 1/1 0/0 0/0 .text            way_set__FP10e_ms_class */
 static int way_set(e_ms_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -214,7 +201,6 @@ static int way_set(e_ms_class* i_this) {
     return 0;
 }
 
-/* 80726360-80726730 0008C0 03D0+00 1/1 0/0 0/0 .text            e_ms_normal__FP10e_ms_class */
 static s8 e_ms_normal(e_ms_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     f32 fVar1 = 0.0f;
@@ -296,7 +282,6 @@ static s8 e_ms_normal(e_ms_class* i_this) {
     return rv;
 }
 
-/* 80726730-80726A70 000C90 0340+00 1/1 0/0 0/0 .text            e_ms_attack__FP10e_ms_class */
 static s8 e_ms_attack(e_ms_class* i_this) {
     f32 fVar1 = 0.0f;
     s8 rv = 1;
@@ -367,7 +352,6 @@ static s8 e_ms_attack(e_ms_class* i_this) {
     return rv;
 }
 
-/* 80726A70-80726F54 000FD0 04E4+00 1/1 0/0 0/0 .text            search_ground_1__FP10e_ms_class */
 static void search_ground_1(e_ms_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     dBgS_LinChk dStack_174;
@@ -422,7 +406,6 @@ static void search_ground_1(e_ms_class* i_this) {
     }
 }
 
-/* 80726F58-80727100 0014B8 01A8+00 1/1 0/0 0/0 .text            e_ms_swim__FP10e_ms_class */
 static void e_ms_swim(e_ms_class* i_this) {
     s16 sVar3 = 0;
     switch (i_this->mMode) {
@@ -460,7 +443,6 @@ static void e_ms_swim(e_ms_class* i_this) {
     }
 }
 
-/* 80727100-807274D8 001660 03D8+00 1/1 0/0 0/0 .text            e_ms_dokuro__FP10e_ms_class */
 static void e_ms_dokuro(e_ms_class* i_this) {
     daObjCarry_c* mObjCarry = (daObjCarry_c*)fopAcM_SearchByID(i_this->mSkullID);
 
@@ -524,7 +506,6 @@ static void e_ms_dokuro(e_ms_class* i_this) {
     }
 }
 
-/* 807274D8-80727704 001A38 022C+00 1/1 0/0 0/0 .text            e_ms_damage__FP10e_ms_class */
 static void e_ms_damage(e_ms_class* i_this) {
     i_this->mCooldown1 = 6;
     switch (i_this->mMode) {
@@ -571,7 +552,6 @@ static void e_ms_damage(e_ms_class* i_this) {
     }
 }
 
-/* 80727704-80727834 001C64 0130+00 1/1 0/0 0/0 .text            e_ms_wolfbite__FP10e_ms_class */
 static void e_ms_wolfbite(e_ms_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -596,7 +576,6 @@ static void e_ms_wolfbite(e_ms_class* i_this) {
     }
 }
 
-/* 80727834-80727894 001D94 0060+00 1/1 0/0 0/0 .text            e_ms_standby__FP10e_ms_class */
 static void e_ms_standby(e_ms_class* i_this) {
     i_this->mCooldown1 = 6;
     if (dComIfGs_isSwitch(i_this->field_0x5b8, fopAcM_GetRoomNo(i_this))) {
@@ -606,7 +585,6 @@ static void e_ms_standby(e_ms_class* i_this) {
     }
 }
 
-/* 80727894-80727A20 001DF4 018C+00 1/1 0/0 0/0 .text            damage_check__FP10e_ms_class */
 static void damage_check(e_ms_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (i_this->mCooldown1 == 0) {
@@ -652,7 +630,6 @@ static void damage_check(e_ms_class* i_this) {
     }
 }
 
-/* 80727A20-8072803C 001F80 061C+00 2/1 0/0 0/0 .text            action__FP10e_ms_class */
 static void action(e_ms_class* i_this) {
     fopAc_ac_c* actor = i_this;
     i_this->mPlayerDistance = fopAcM_searchPlayerDistance(actor);
@@ -801,7 +778,6 @@ static void action(e_ms_class* i_this) {
     setMidnaBindEffect((fopEn_enemy_c*)actor, &i_this->mSound, &i_this->eyePos, &eff_size);
 }
 
-/* 8072803C-80728464 00259C 0428+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_ms_class */
 static void anm_se_set(e_ms_class* i_this) {
     s8 step = 0;
     int sound = i_this->mNextSound;
@@ -862,7 +838,6 @@ static void anm_se_set(e_ms_class* i_this) {
     }
 }
 
-/* 80728464-80728920 0029C4 04BC+00 2/1 0/0 0/0 .text            daE_MS_Execute__FP10e_ms_class */
 static int daE_MS_Execute(e_ms_class* i_this) {
     cXyz sp34;
     cXyz sp40;
@@ -967,12 +942,10 @@ static int daE_MS_Execute(e_ms_class* i_this) {
     return 1;
 }
 
-/* 80728920-80728928 002E80 0008+00 1/0 0/0 0/0 .text            daE_MS_IsDelete__FP10e_ms_class */
 static int daE_MS_IsDelete(e_ms_class* i_this) {
     return 1;
 }
 
-/* 80728928-80728990 002E88 0068+00 1/0 0/0 0/0 .text            daE_MS_Delete__FP10e_ms_class */
 static int daE_MS_Delete(e_ms_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "E_MS");
     if (i_this->mHIOInit) {
@@ -986,7 +959,6 @@ static int daE_MS_Delete(e_ms_class* i_this) {
     return 1;
 }
 
-/* 80728990-80728A88 002EF0 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     e_ms_class* i_this = (e_ms_class*)actor;
     mDoExt_McaMorfSO* mMorf =
@@ -1001,7 +973,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80728A88-80728DF8 002FE8 0370+00 1/0 0/0 0/0 .text            daE_MS_Create__FP10fopAc_ac_c */
 static int daE_MS_Create(fopAc_ac_c* actor) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1085,14 +1056,12 @@ static int daE_MS_Create(fopAc_ac_c* actor) {
     return phase;
 }
 
-/* 807296FC-8072971C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_MS_Method */
 static actor_method_class l_daE_MS_Method = {
     (process_method_func)daE_MS_Create,  (process_method_func)daE_MS_Delete,
     (process_method_func)daE_MS_Execute, (process_method_func)daE_MS_IsDelete,
     (process_method_func)daE_MS_Draw,
 };
 
-/* 8072971C-8072974C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_MS */
 extern actor_process_profile_definition g_profile_E_MS = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp
index 9a81c1c7f2..500bed3639 100644
--- a/src/d/actor/d_a_e_nest.cpp
+++ b/src/d/actor/d_a_e_nest.cpp
@@ -14,19 +14,15 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80504950-80504954 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_hioInit;
 
-/* 80504960-8050496C 000018 000C+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_Nest_HIO_c l_HIO;
 
-/* 80500F8C-80500FB0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daE_Nest_HIO_cFv */
 daE_Nest_HIO_c::daE_Nest_HIO_c() {
     field_0x4 = -1;
     mScale = 1.0f;
 }
 
-/* 80500FB0-80501040 000110 0090+00 1/1 0/0 0/0 .text            hahen_draw__FP12e_nest_class */
 static void hahen_draw(e_nest_class* i_this) {
     nest_hahen_s* debris = i_this->mDebris;
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -38,7 +34,6 @@ static void hahen_draw(e_nest_class* i_this) {
     }
 }
 
-/* 80501040-805011CC 0001A0 018C+00 1/1 0/0 0/0 .text            s_bomb_sub__FPvPv */
 static void* s_bomb_sub(void* i_actor, void* i_debris) {
     if (fopAcM_IsActor(i_actor)) {
         fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(i_actor);
@@ -56,8 +51,6 @@ static void* s_bomb_sub(void* i_actor, void* i_debris) {
     return NULL;
 }
 
-/* 805011CC-805017FC 00032C 0630+00 1/1 0/0 0/0 .text
- * hahen_normal__FP12e_nest_classP12nest_hahen_s                */
 static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) {
     fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -158,7 +151,6 @@ static void hahen_normal(e_nest_class* i_this, nest_hahen_s* i_debris) {
     }
 }
 
-/* 805017FC-80501930 00095C 0134+00 1/1 0/0 0/0 .text            hahen_move__FP12e_nest_class */
 static void hahen_move(e_nest_class* i_this) {
     nest_hahen_s* debris = i_this->mDebris;
     dBgS_LinChk lin_chk;
@@ -183,7 +175,6 @@ static void hahen_move(e_nest_class* i_this) {
     }
 }
 
-/* 80501930-80501A40 000A90 0110+00 1/0 0/0 0/0 .text            daE_Nest_Draw__FP12e_nest_class */
 static int daE_Nest_Draw(e_nest_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     if (i_this->mBreakStage != 0) {
@@ -206,7 +197,6 @@ static int daE_Nest_Draw(e_nest_class* i_this) {
     }
 }
 
-/* 80501A40-80501BDC 000BA0 019C+00 2/2 0/0 0/0 .text            mtx_cc_set__FP12e_nest_class */
 static void mtx_cc_set(e_nest_class* i_this) {
     mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
     mDoMtx_stack_c::YrotM(i_this->mRotation.y);
@@ -237,7 +227,6 @@ static void mtx_cc_set(e_nest_class* i_this) {
     }
 }
 
-/* 80501BDC-805020D0 000D3C 04F4+00 1/1 0/0 0/0 .text            e_nest_normal__FP12e_nest_class */
 static void e_nest_normal(e_nest_class* i_this) {
     fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
     if (i_this->mHitTimer != 0) {
@@ -345,7 +334,6 @@ static void e_nest_normal(e_nest_class* i_this) {
     }
 }
 
-/* 805020D0-80502280 001230 01B0+00 1/1 0/0 0/0 .text            wall_angle_get__FP12e_nest_class */
 static s16 wall_angle_get(e_nest_class* i_this) {
     fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -374,7 +362,6 @@ static s16 wall_angle_get(e_nest_class* i_this) {
     return cM_atan2s(vec1.x, vec1.z) + 0x4000;
 }
 
-/* 80502280-805025C4 0013E0 0344+00 1/1 0/0 0/0 .text            e_nest_drop__FP12e_nest_class */
 static void e_nest_drop(e_nest_class* i_this) {
     if (i_this->mAcch.ChkGroundHit()) {
         if (i_this->mKnockDown != 0) {
@@ -443,7 +430,6 @@ static void e_nest_drop(e_nest_class* i_this) {
     cLib_addCalcAngleS2(&i_this->mSpin, 0, 1, 100);
 }
 
-/* 805025C4-80502730 001724 016C+00 1/1 0/0 0/0 .text            e_nest_carry__FP12e_nest_class */
 static s8 e_nest_carry(e_nest_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     i_this->speed.y = 0.0f;
@@ -489,7 +475,6 @@ static s8 e_nest_carry(e_nest_class* i_this) {
     return ret;
 }
 
-/* 80502730-8050284C 001890 011C+00 1/1 0/0 0/0 .text            water_check__FP12e_nest_class */
 static int water_check(e_nest_class* i_this) {
     dBgS_LinChk lin_chk;
     cXyz vec;
@@ -510,8 +495,6 @@ static int water_check(e_nest_class* i_this) {
     }
 }
 
-/* 8050284C-80502AD4 0019AC 0288+00 1/1 0/0 0/0 .text            simple_bg_check__FP12e_nest_class
- */
 static int simple_bg_check(e_nest_class* i_this) {
     fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
     cXyz vec2, vec3, vec1;
@@ -540,7 +523,6 @@ static int simple_bg_check(e_nest_class* i_this) {
     return false;
 }
 
-/* 80502AD4-80502D30 001C34 025C+00 1/1 0/0 0/0 .text            e_nest_float__FP12e_nest_class */
 static void e_nest_float(e_nest_class* i_this) {
     cLib_addCalc0(&i_this->speed.y, 1.0f, 0.25f);
     i_this->current.pos += i_this->speed;
@@ -586,7 +568,6 @@ static void e_nest_float(e_nest_class* i_this) {
     }
 }
 
-/* 80502D30-80503120 001E90 03F0+00 1/1 0/0 0/0 .text            e_nest_hahen__FP12e_nest_class */
 static void e_nest_hahen(e_nest_class* i_this) {
     fopAc_ac_c* a_this = static_cast<fopAc_ac_c*>(i_this);
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -653,7 +634,6 @@ static void e_nest_hahen(e_nest_class* i_this) {
     }
 }
 
-/* 80503120-805031CC 002280 00AC+00 1/1 0/0 0/0 .text            e_nest_hook__FP12e_nest_class */
 static void e_nest_hook(e_nest_class* i_this) {
     i_this->mIframes = 10;
 
@@ -677,8 +657,6 @@ static void e_nest_hook(e_nest_class* i_this) {
     }
 }
 
-/* 805031CC-80503668 00232C 049C+00 1/1 0/0 0/0 .text            bee_nest_action__FP12e_nest_class
- */
 static void bee_nest_action(e_nest_class* i_this) {
     i_this->attention_info.position = i_this->eyePos = i_this->current.pos;
     i_this->eyePos.y += i_this->scale.x * -80.0f;
@@ -792,7 +770,6 @@ static void bee_nest_action(e_nest_class* i_this) {
     mtx_cc_set(i_this);
 }
 
-/* 80503668-805036E0 0027C8 0078+00 1/1 0/0 0/0 .text            shot_b_sub__FPvPv */
 static void* shot_b_sub(void* i_actor, void* i_data) {
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG
@@ -803,7 +780,6 @@ static void* shot_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805036E0-80503984 002840 02A4+00 1/1 0/0 0/0 .text            demo_camera__FP12e_nest_class */
 static void demo_camera(e_nest_class* i_this) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     s8 end_demo = false;
@@ -860,8 +836,6 @@ static void demo_camera(e_nest_class* i_this) {
     }
 }
 
-/* 80503984-80503E24 002AE4 04A0+00 1/0 0/0 0/0 .text            daE_Nest_Execute__FP12e_nest_class
- */
 static int daE_Nest_Execute(e_nest_class* i_this) {
     cXyz vec1, vec2;
 
@@ -939,14 +913,10 @@ static int daE_Nest_Execute(e_nest_class* i_this) {
     return 1;
 }
 
-/* 80503E24-80503E2C 002F84 0008+00 1/0 0/0 0/0 .text            daE_Nest_IsDelete__FP12e_nest_class
- */
 static int daE_Nest_IsDelete(e_nest_class* param_0) {
     return 1;
 }
 
-/* 80503E2C-80503EA0 002F8C 0074+00 1/0 0/0 0/0 .text            daE_Nest_Delete__FP12e_nest_class
- */
 static int daE_Nest_Delete(e_nest_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_nest");
     
@@ -962,7 +932,6 @@ static int daE_Nest_Delete(e_nest_class* i_this) {
     return 1;
 }
 
-/* 80503EA0-80503FCC 003000 012C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_nest_class* _this = static_cast<e_nest_class*>(i_this);
 
@@ -987,7 +956,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80503FCC-805044AC 00312C 04E0+00 1/0 0/0 0/0 .text            daE_Nest_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_nest_class);
     e_nest_class* _this = static_cast<e_nest_class*>(i_this);
@@ -1092,7 +1060,6 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 805048A4-805048C4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Nest_Method */
 static actor_method_class l_daE_Nest_Method = {
     (process_method_func)daE_Nest_Create,
     (process_method_func)daE_Nest_Delete,
@@ -1101,7 +1068,6 @@ static actor_method_class l_daE_Nest_Method = {
     (process_method_func)daE_Nest_Draw,
 };
 
-/* 805048C4-805048F4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_NEST */
 extern actor_process_profile_definition g_profile_E_NEST = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp
index 83b0af47af..d1bc0f0533 100644
--- a/src/d/actor/d_a_e_nz.cpp
+++ b/src/d/actor/d_a_e_nz.cpp
@@ -8,14 +8,13 @@
 #include "d/actor/d_a_e_nz.h"
 #include "c/c_damagereaction.h"
 #include "d/d_cc_d.h"
-#include "dol2asm.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "f_op/f_op_actor_enemy.h"
 
 class daE_NZ_HIO_c : public JORReflexible {
 public:
-    /* 807299EC */ daE_NZ_HIO_c();
-    /* 8072BC88 */ virtual ~daE_NZ_HIO_c() {}
+    daE_NZ_HIO_c();
+    virtual ~daE_NZ_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -36,7 +35,6 @@ enum Action {
     ACTION_DAMANGE,
 };
 
-/* 8072C284-8072C28C 000038 0008+00 5/5 0/0 0/0 .data            stick_bit */
 static u8 stick_bit[8] = {
     0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
 };
@@ -49,7 +47,6 @@ struct StickDef {
     s16 field_0x8;
 };
 
-/* 8072C28C-8072C2DC 000040 0050+00 1/1 0/0 0/0 .data            stick_d */
 static StickDef stick_d[8] = {
     0x03, 1500, 15000, 0, 0x14,
     0x00, 0, 32767,0, 0,
@@ -61,7 +58,6 @@ static StickDef stick_d[8] = {
      0x02,  5500, -20000, 24000, 0x0F,
 };
 
-/* 807299EC-80729A3C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_NZ_HIO_cFv */
 daE_NZ_HIO_c::daE_NZ_HIO_c() {
     mId = -1;
     mBasicSize = 1.2f;
@@ -93,14 +89,12 @@ void daE_NZ_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80729A3C-80729AE8 00013C 00AC+00 4/4 0/0 0/0 .text            anm_init__FP10e_nz_classifUcf */
 static void anm_init(e_nz_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_NZ", param_2), param_4,
                              param_3, param_5, 0.0f, -1.0f);
     i_this->field_0x5e4 = param_2;
 }
 
-/* 80729AE8-80729B24 0001E8 003C+00 1/1 0/0 0/0 .text            pl_check__FP10e_nz_classf */
 static BOOL pl_check(e_nz_class* i_this, f32 param_1) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     dComIfGp_getPlayer(0);
@@ -113,7 +107,6 @@ static BOOL pl_check(e_nz_class* i_this, f32 param_1) {
     return FALSE;
 }
 
-/* 80729B24-80729C24 000224 0100+00 1/0 0/0 0/0 .text            daE_NZ_Draw__FP10e_nz_class */
 static int daE_NZ_Draw(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -140,13 +133,10 @@ static int daE_NZ_Draw(e_nz_class* i_this) {
 
 bool l_HIOInit;
 
-/* 8072C434-8072C454 000054 0020+00 5/6 0/0 0/0 .bss             l_HIO */
 static daE_NZ_HIO_c l_HIO;
 
-/* 8072C454-8072C458 000074 0004+00 5/5 0/0 0/0 .bss             None */
 static u8 data_8072C454[4];
 
-/* 80729C24-8072A044 000324 0420+00 1/1 0/0 0/0 .text            e_nz_normal__FP10e_nz_class */
 static void e_nz_normal(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     f32 dVar9 = 0.0f;
@@ -230,7 +220,6 @@ static void e_nz_normal(e_nz_class* i_this) {
     cLib_addCalc2(&a_this->speedF, dVar9, 1.0f, l_HIO.mSpeed * 0.25f);
 }
 
-/* 8072A044-8072A680 000744 063C+00 1/1 0/0 0/0 .text            e_nz_attack__FP10e_nz_class */
 static s8 e_nz_attack(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     cXyz local_38;
@@ -297,7 +286,6 @@ static s8 e_nz_attack(e_nz_class* i_this) {
     return rv;
 }
 
-/* 8072A680-8072A7C4 000D80 0144+00 1/1 0/0 0/0 .text            e_nz_stick__FP10e_nz_class */
 static void e_nz_stick(e_nz_class* i_this) {
     s8 cVar4 = 0;
 
@@ -323,7 +311,6 @@ static void e_nz_stick(e_nz_class* i_this) {
     }
 }
 
-/* 8072A7C4-8072A8CC 000EC4 0108+00 1/1 0/0 0/0 .text            damage_check__FP10e_nz_class */
 static void damage_check(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     dComIfGp_getPlayer(0);
@@ -355,7 +342,6 @@ static void damage_check(e_nz_class* i_this) {
     }
 }
 
-/* 8072A8CC-8072AA90 000FCC 01C4+00 1/1 0/0 0/0 .text            e_nz_damage__FP10e_nz_class */
 static void e_nz_damage(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     i_this->field_0x6aa = 6;
@@ -389,8 +375,6 @@ static void e_nz_damage(e_nz_class* i_this) {
     }
 }
 
-/* 8072AA90-8072AB68 001190 00D8+00 1/1 0/0 0/0 .text
- * getPolyColor__FR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf    */
 static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, _GXColor* param_3,
                              _GXColor* param_4, u8* param_5, f32* param_6) {
     if (!dComIfG_Bgsp().ChkPolySafe(param_1)) {
@@ -412,7 +396,6 @@ static BOOL getPolyColor(cBgS_PolyInfo& param_1, int param_2, _GXColor* param_3,
     return TRUE;
 }
 
-/* 8072AB68-8072B09C 001268 0534+00 1/1 0/0 0/0 .text            action__FP10e_nz_class */
 static s8 action(e_nz_class* i_this) {
     static u16 eff_id[4] = {
         0x01B8,
@@ -538,7 +521,6 @@ static s8 action(e_nz_class* i_this) {
     return action_result;
 }
 
-/* 8072B09C-8072B5D4 00179C 0538+00 2/1 0/0 0/0 .text            daE_NZ_Execute__FP10e_nz_class */
 static int daE_NZ_Execute(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     
@@ -657,12 +639,10 @@ static int daE_NZ_Execute(e_nz_class* i_this) {
     return 1;
 }
 
-/* 8072B5D4-8072B5DC 001CD4 0008+00 1/0 0/0 0/0 .text            daE_NZ_IsDelete__FP10e_nz_class */
 static int daE_NZ_IsDelete(e_nz_class* i_this) {
     return 1;
 }
 
-/* 8072B5DC-8072B680 001CDC 00A4+00 1/0 0/0 0/0 .text            daE_NZ_Delete__FP10e_nz_class */
 static int daE_NZ_Delete(e_nz_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     fopAcM_GetID(i_this);
@@ -683,7 +663,6 @@ static int daE_NZ_Delete(e_nz_class* i_this) {
     return 1;
 }
 
-/* 8072B680-8072B7C4 001D80 0144+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_nz_class* i_this = (e_nz_class*)a_this;
     i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_NZ", 13), NULL,
@@ -701,7 +680,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 8072B7C4-8072BA74 001EC4 02B0+00 1/0 0/0 0/0 .text            daE_NZ_Create__FP10fopAc_ac_c */
 static int daE_NZ_Create(fopAc_ac_c* a_this) {
     e_nz_class* i_this = (e_nz_class*)a_this;
     fopAcM_ct(a_this, e_nz_class);
@@ -759,7 +737,6 @@ static int daE_NZ_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES
 
-/* 8072C324-8072C344 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_NZ_Method */
 static actor_method_class l_daE_NZ_Method = {
     (process_method_func)daE_NZ_Create,
     (process_method_func)daE_NZ_Delete,
@@ -768,7 +745,6 @@ static actor_method_class l_daE_NZ_Method = {
     (process_method_func)daE_NZ_Draw,
 };
 
-/* 8072C344-8072C374 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_NZ */
 extern actor_process_profile_definition g_profile_E_NZ = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp
index 98aeff4da2..30d4fb52d0 100644
--- a/src/d/actor/d_a_e_oc.cpp
+++ b/src/d/actor/d_a_e_oc.cpp
@@ -38,8 +38,8 @@ enum OC_ACTIONS {
 
 class daE_OC_HIO_c : public JORReflexible {
 public:
-    /* 8072C5CC */ daE_OC_HIO_c();
-    /* 80735630 */ virtual ~daE_OC_HIO_c() {}
+    daE_OC_HIO_c();
+    virtual ~daE_OC_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x05 */ u8 radius_representation;
@@ -57,19 +57,16 @@ public:
 #endif
 };
 
-/* 80735B54-80735B7C 00002C 0028+00 0/1 0/0 0/0 .rodata          oc_attackb_trans__6E_OC_n */
 f32 const E_OC_n::oc_attackb_trans[10] = {
     0.0f, 0.0f, 0.0f, 0.0f, 15.3f, 
     38.4f, 63.3f, 86.2f, 103.3f, 112.0f
 };
 
-/* 80735B7C-80735BA4 000054 0028+00 0/1 0/0 0/0 .rodata          oc_attackc_trans__6E_OC_n */
 f32 const E_OC_n::oc_attackc_trans[10] = {
     0.0f, 31.3f, 72.7f, 91.5f, 91.5f,
     91.5f, 91.5f, 91.5f, 91.5f, 91.5f
 };
 
-/* 80735D64-80735DA4 000038 0040+00 1/1 0/0 0/0 .data            cc_sph_src__6E_OC_n */
 dCcD_SrcSph E_OC_n::cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x3}, 0x75}}, // mObj
@@ -82,7 +79,6 @@ dCcD_SrcSph E_OC_n::cc_sph_src = {
     } // mSphAttr
 };
 
-/* 80735DA4-80735DE4 000078 0040+00 1/1 0/0 0/0 .data            at_sph_src__6E_OC_n */
 dCcD_SrcSph E_OC_n::at_sph_src = {
     {
         {0x0, {{0x1000, 0x1, 0xD}, {0x0, 0x0}, 0x0}}, // mObj
@@ -95,7 +91,6 @@ dCcD_SrcSph E_OC_n::at_sph_src = {
     } // mSphAttr
 };
 
-/* 8072C5CC-8072C630 0000EC 0064+00 1/1 0/0 0/0 .text            __ct__12daE_OC_HIO_cFv */
 daE_OC_HIO_c::daE_OC_HIO_c() {
     field_0x04 = -1;
     radius_representation = 0;
@@ -134,7 +129,6 @@ void daE_OC_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 8072C630-8072C6E8 000150 00B8+00 1/1 0/0 0/0 .text ctrlJoint__8daE_OC_cFP8J3DJointP8J3DModel */
 int daE_OC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) {
     J3DJoint* my_joint = i_joint;
     int jnt_no = my_joint->getJntNo();
@@ -149,7 +143,6 @@ int daE_OC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) {
     return 1;
 }
 
-/* 8072C6E8-8072C734 000208 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_OC_cFP8J3DJointi */
 int daE_OC_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -161,7 +154,6 @@ int daE_OC_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8072C734-8072C918 000254 01E4+00 1/1 0/0 0/0 .text            draw__8daE_OC_cFv */
 int daE_OC_c::draw() {
     J3DModel* model = mpMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -196,30 +188,22 @@ int daE_OC_c::draw() {
     return 1;
 }
 
-/* 8072C918-8072C938 000438 0020+00 1/0 0/0 0/0 .text            daE_OC_Draw__FP8daE_OC_c */
 static void daE_OC_Draw(daE_OC_c* i_this) {
     i_this->draw();
 }
 
-/* 80736040-80736044 000048 0004+00 0/2 0/0 0/0 .bss             m_battle_oc__6E_OC_n */
 daE_OC_c* E_OC_n::m_battle_oc;
 
-/* 80736044-80736048 00004C 0004+00 0/2 0/0 0/0 .bss             m_damage_oc__6E_OC_n */
 daE_OC_c* E_OC_n::m_damage_oc;
 
-/* 80736048-8073604C 000050 0004+00 0/2 0/0 0/0 .bss             m_death_oc__6E_OC_n */
 daE_OC_c* E_OC_n::m_death_oc;
 
-/* 8073604C-80736050 000054 0004+00 0/2 0/0 0/0 .bss             m_talk_oc__6E_OC_n */
 daE_OC_c* E_OC_n::m_talk_oc;
 
-/* 80736050-80736054 000058 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 lbl_216_bss_58;
 
-/* 80736060-80736088 000068 0028+00 6/7 0/0 0/0 .bss             l_HIO */
 static daE_OC_HIO_c l_HIO;
 
-/* 8072C938-8072CBD4 000458 029C+00 1/1 0/0 0/0 .text            s_other_oc__FPvPv */
 static void* s_other_oc(void* arg_lhs, void* arg_rhs) {
     f32 dist;
     if (arg_lhs != arg_rhs && fopAcM_IsActor(arg_lhs)) {
@@ -263,12 +247,10 @@ static void* s_other_oc(void* arg_lhs, void* arg_rhs) {
     return NULL;
 }
 
-/* 8072CBD4-8072CC10 0006F4 003C+00 1/1 0/0 0/0 .text getVisionAngle__8daE_OC_cFP10fopAc_ac_c */
 s16 daE_OC_c::getVisionAngle(fopAc_ac_c* other_oc) {
     return cLib_distanceAngleS(shape_angle.y, fopAcM_searchActorAngleY(this, other_oc));
 }
 
-/* 8072CC10-8072CDA8 000730 0198+00 1/1 0/0 0/0 .text            searchOtherOc__8daE_OC_cFv */
 void daE_OC_c::searchOtherOc() {
     if (field_0x6e3 == 0) {
         field_0x6dd = 0;
@@ -307,7 +289,6 @@ void daE_OC_c::searchOtherOc() {
     }
 }
 
-/* 8072CDA8-8072CE00 0008C8 0058+00 5/5 0/0 0/0 .text            setWatchMode__8daE_OC_cFv */
 bool daE_OC_c::setWatchMode() {
     if (field_0x6dd != 0) {
         if (field_0x6dd == 1) {
@@ -322,7 +303,6 @@ bool daE_OC_c::setWatchMode() {
     return false;
 }
 
-/* 8072CE00-8072CF00 000920 0100+00 1/1 0/0 0/0 .text            searchPlayer__8daE_OC_cFv */
 bool daE_OC_c::searchPlayer() {
     if (fopAcM_searchPlayerDistance(this) < mPlayerRange) {
         s16 diff = shape_angle.y - fopAcM_searchPlayerAngleY(this);
@@ -348,7 +328,6 @@ bool daE_OC_c::searchPlayer() {
     return false;
 }
 
-/* 8072CF00-8072CF90 000A20 0090+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* arg_lhs, void* arg_rhs) {
     if (fopAcM_IsActor(arg_lhs)) {
         if (fpcM_IsCreating(fopAcM_GetID(arg_lhs)) == 0 && fopAcM_GetName(arg_lhs) == PROC_Obj_RotBridge) {
@@ -361,7 +340,6 @@ static void* s_obj_sub(void* arg_lhs, void* arg_rhs) {
     return NULL;
 }
 
-/* 8072CF90-8072D100 000AB0 0170+00 6/6 0/0 0/0 .text            searchPlayer2__8daE_OC_cFv */
 bool daE_OC_c::searchPlayer2() {
     field_0x6e2 = 0;
     if (field_0x6b4 == 2) {
@@ -406,8 +384,6 @@ bool daE_OC_c::searchPlayer2() {
     return false;
 }
 
-/* 8072D100-8072D1DC 000C20 00DC+00 2/2 0/0 0/0 .text            searchPlayerShakeHead__8daE_OC_cFv
- */
 bool daE_OC_c::searchPlayerShakeHead() {
     if (field_0x6e3) {
         return false;
@@ -429,7 +405,6 @@ bool daE_OC_c::searchPlayerShakeHead() {
     return false;
 }
 
-/* 8072D1DC-8072D2E8 000CFC 010C+00 3/3 0/0 0/0 .text            searchSound__8daE_OC_cFv */
 bool daE_OC_c::searchSound() {
     if (field_0x6b4 == 2 && mpBridge && mpBridge->getPlayerRide()) {
         return false;
@@ -450,7 +425,6 @@ bool daE_OC_c::searchSound() {
     return false;
 }
 
-/* 8072D2E8-8072D364 000E08 007C+00 1/1 0/0 0/0 .text            s_demo_oc__FPvPv */
 static void* s_demo_oc(void* arg_lhs, void* arg_rhs) {
     (void) arg_rhs;
     if (fopAcM_IsActor(arg_lhs)) {
@@ -463,7 +437,6 @@ static void* s_demo_oc(void* arg_lhs, void* arg_rhs) {
     return NULL;
 }
 
-/* 8072D364-8072D5F8 000E84 0294+00 1/1 0/0 0/0 .text            checkBeforeBg__8daE_OC_cFv */
 int daE_OC_c::checkBeforeBg() {
     dBgS_LinChk link_chk;
     cM3dGPla plane;
@@ -495,7 +468,6 @@ int daE_OC_c::checkBeforeBg() {
     return 0;
 }
 
-/* 8072D640-8072D87C 001160 023C+00 1/2 0/0 0/0 .text            checkBeforeBgFind__8daE_OC_cFv */
 bool daE_OC_c::checkBeforeBgFind() {
     dBgS_LinChk line_chk;
     cXyz oc_pos;
@@ -532,7 +504,6 @@ bool daE_OC_c::checkBeforeBgFind() {
     }
 }
 
-/* 8072D87C-8072D994 00139C 0118+00 2/2 0/0 0/0 .text            checkBeforeFloorBg__8daE_OC_cFf */
 bool daE_OC_c::checkBeforeFloorBg(f32 arg) {
     cXyz my_vec_0;
     dBgS_ObjGndChk_Spl gnd_chk_spl;
@@ -552,7 +523,6 @@ bool daE_OC_c::checkBeforeFloorBg(f32 arg) {
     return false;
 }
 
-/* 8072D994-8072DB10 0014B4 017C+00 1/1 0/0 0/0 .text            checkDamageBg__8daE_OC_cFv */
 void daE_OC_c::checkDamageBg() {
     cXyz my_vec(current.pos);
     my_vec.y += 50.0f;
@@ -582,7 +552,6 @@ void daE_OC_c::checkDamageBg() {
     }
 }
 
-/* 8072DB10-8072DCBC 001630 01AC+00 1/1 0/0 0/0 .text            setGroundAngle__8daE_OC_cFv */
 void daE_OC_c::setGroundAngle() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -611,7 +580,6 @@ void daE_OC_c::setGroundAngle() {
     }
 }
 
-/* 8072DCBC-8072DD18 0017DC 005C+00 21/21 0/0 0/0 .text            setActionMode__8daE_OC_cFii */
 void daE_OC_c::setActionMode(int i_action, int i_state) {
     mOldActionMode = mActionMode;
     mActionMode = i_action;
@@ -624,7 +592,6 @@ void daE_OC_c::setActionMode(int i_action, int i_state) {
     offHeadLockFlg();
 }
 
-/* 8072DD18-8072DD8C 001838 0074+00 2/1 0/0 0/0 .text            getCutType__8daE_OC_cFv */
 int daE_OC_c::getCutType() {
     if (daPy_getPlayerActorClass()->getCutCount() >= 4) {
         return 5;
@@ -660,7 +627,6 @@ int daE_OC_c::getCutType() {
     }
 }
 
-/* 8072DD8C-8072DDF4 0018AC 0068+00 4/4 0/0 0/0 .text            offTgSph__8daE_OC_cFv */
 void daE_OC_c::offTgSph() {
     mSphs_cc[0].OffTgSetBit();
     mSphs_cc[0].ClrTgHit();
@@ -668,7 +634,6 @@ void daE_OC_c::offTgSph() {
     mSphs_cc[1].ClrTgHit();
 }
 
-/* 8072DDF4-8072E274 001914 0480+00 1/1 0/0 0/0 .text            damage_check__8daE_OC_cFv */
 void daE_OC_c::damage_check() {
     if (checkCutDownHitFlg()) {
         // Following needed to use r31 for debug asm:
@@ -812,13 +777,11 @@ void daE_OC_c::damage_check() {
     }
 }
 
-/* 8072E274-8072E31C 001D94 00A8+00 17/17 0/0 0/0 .text            setBck__8daE_OC_cFiUcff */
 void daE_OC_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpMorf->setAnm((J3DAnmTransform *) dComIfG_getObjectRes("E_ocb", i_index),
                     i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 8072E31C-8072E37C 001E3C 0060+00 11/11 0/0 0/0 .text            checkBck__8daE_OC_cFi */
 bool daE_OC_c::checkBck(int i_index) {
     if (mpMorf->getAnm() != dComIfG_getObjectRes("E_ocb", i_index)) {
         return false;
@@ -827,7 +790,6 @@ bool daE_OC_c::checkBck(int i_index) {
     }
 }
 
-/* 8072E37C-8072E42C 001E9C 00B0+00 3/3 0/0 0/0 .text            setSpitEffect__8daE_OC_cFv */
 void daE_OC_c::setSpitEffect() {
     MtxP my_mtx_p = mpMorf->getModel()->getAnmMtx(0x11);
     cXyz my_vec(my_mtx_p[0][3], my_mtx_p[1][3], my_mtx_p[2][3]);
@@ -836,7 +798,6 @@ void daE_OC_c::setSpitEffect() {
                                              -1, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 8072E42C-8072E498 001F4C 006C+00 1/1 0/0 0/0 .text            getHeadAngle__8daE_OC_cFv */
 s16 daE_OC_c::getHeadAngle() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -847,7 +808,6 @@ s16 daE_OC_c::getHeadAngle() {
     return (s16)cLib_targetAngleY(&my_vec_0, &my_vec_1);
 }
 
-/* 8072E498-8072E528 001FB8 0090+00 1/1 0/0 0/0 .text            setStabPos__8daE_OC_cFv */
 void daE_OC_c::setStabPos() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -857,14 +817,12 @@ void daE_OC_c::setStabPos() {
     setDownPos(&my_vec_0);
 }
 
-/* 8072E528-8072E5A4 002048 007C+00 1/1 0/0 0/0 .text            setWaitSound__8daE_OC_cFv */
 void daE_OC_c::setWaitSound() {
     if (checkBck(0x1b) && mpMorf->checkFrame(0.0f)) {
         mSound.startCreatureVoice(Z2SE_EN_OC_V_WAIT, -1);
     }
 }
 
-/* 8072E5A4-8072E670 0020C4 00CC+00 1/1 0/0 0/0 .text            setWalkSound__8daE_OC_cFv */
 void daE_OC_c::setWalkSound() {
     if (checkBck(0x1d)) {
         if (mpMorf->checkFrame(14.0f)) {
@@ -875,7 +833,6 @@ void daE_OC_c::setWalkSound() {
     }
 }
 
-/* 8072E670-8072E788 002190 0118+00 1/1 0/0 0/0 .text            setWalkStSound__8daE_OC_cFv */
 void daE_OC_c::setWalkStSound() {
     if (checkBck(0x1e)) {
         if (mpMorf->checkFrame(0.0f)) {
@@ -888,7 +845,6 @@ void daE_OC_c::setWalkStSound() {
     }
 }
 
-/* 8072E788-8072E910 0022A8 0188+00 1/1 0/0 0/0 .text            setDashSound__8daE_OC_cFv */
 void daE_OC_c::setDashSound() {
     if (checkBck(0xb)) {
         if (mpMorf->checkFrame(0.0f)) {
@@ -906,7 +862,6 @@ void daE_OC_c::setDashSound() {
     }
 }
 
-/* 8072E910-8072EA58 002430 0148+00 1/1 0/0 0/0 .text            setWaitStSound__8daE_OC_cFv */
 void daE_OC_c::setWaitStSound() {
     if (checkBck(0x1c)) {
         if (mpMorf->checkFrame(0.0f)) {
@@ -919,7 +874,6 @@ void daE_OC_c::setWaitStSound() {
     }
 }
 
-/* 8072EA58-8072EAA4 002578 004C+00 1/1 0/0 0/0 .text            setFootNoteSound__8daE_OC_cFv */
 void daE_OC_c::setFootNoteSound() {
     setWaitSound();
     setWalkSound();
@@ -928,7 +882,6 @@ void daE_OC_c::setFootNoteSound() {
     setWaitStSound();
 }
 
-/* 8072EAA4-8072F1A8 0025C4 0704+00 1/1 0/0 0/0 .text            executeWait__8daE_OC_cFv */
 void daE_OC_c::executeWait() {
     mPrevShapeAngle = shape_angle.y;
     field_0x6de = 0;
@@ -1019,7 +972,6 @@ void daE_OC_c::executeWait() {
     }
 }
 
-/* 8072F1A8-8072F5E0 002CC8 0438+00 1/1 0/0 0/0 .text            executeWalk__8daE_OC_cFv */
 void daE_OC_c::executeWalk() {
     mPrevShapeAngle = shape_angle.y;
     field_0x6de = 0;
@@ -1095,7 +1047,6 @@ void daE_OC_c::executeWalk() {
     }
 }
 
-/* 8072F5E0-8072F914 003100 0334+00 1/1 0/0 0/0 .text            executeTalk__8daE_OC_cFv */
 void daE_OC_c::executeTalk() {
     field_0x6de = 0;
     if (setWatchMode()) {
@@ -1172,7 +1123,6 @@ void daE_OC_c::executeTalk() {
     }
 }
 
-/* 8072F914-807302E8 003434 09D4+00 1/1 0/0 0/0 .text            executeFind__8daE_OC_cFv */
 void daE_OC_c::executeFind() {
     s16 pl_ang = fopAcM_searchPlayerAngleY(this);
     f32 pl_dist = fopAcM_searchPlayerDistance(this);
@@ -1381,8 +1331,6 @@ void daE_OC_c::executeFind() {
     }
 }
 
-/* 807302E8-807305C0 003E08 02D8+00 1/1 0/0 0/0 .text            setWeaponGroundAngle__8daE_OC_cFv
- */
 void daE_OC_c::setWeaponGroundAngle() {
     s16 my_val = 0;
     if (checkBck(5) && mpMorf->getFrame() >= 30.0f && mpMorf->getFrame() <= 45.0f) {
@@ -1416,7 +1364,6 @@ void daE_OC_c::setWeaponGroundAngle() {
     cLib_addCalcAngleS(&field_0x6d0, my_val, 4, 0x1000, 0x100);
 }
 
-/* 807305C0-80730DC0 0040E0 0800+00 1/1 0/0 0/0 .text            executeAttack__8daE_OC_cFv */
 void daE_OC_c::executeAttack() {
     f32 my_float = 0.0f;
     int frame_ctrl = (mpMorf->getFrame() - 9.0f);
@@ -1563,7 +1510,6 @@ void daE_OC_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 80730DC0-80731124 0048E0 0364+00 2/1 0/0 0/0 .text            executeDamage__8daE_OC_cFv */
 void daE_OC_c::executeDamage() {
     mBattleOn = true;
     mPrevShapeAngle = shape_angle.y;
@@ -1633,7 +1579,6 @@ void daE_OC_c::executeDamage() {
     }
 }
 
-/* 80731124-807316F8 004C44 05D4+00 1/1 0/0 0/0 .text            executeBigDamage__8daE_OC_cFv */
 void daE_OC_c::executeBigDamage() {
     mBattleOn = true;
     mPrevShapeAngle = shape_angle.y;
@@ -1757,7 +1702,6 @@ void daE_OC_c::executeBigDamage() {
     }
 }
 
-/* 807316F8-807319E4 005218 02EC+00 1/1 0/0 0/0 .text            executeWatch__8daE_OC_cFv */
 void daE_OC_c::executeWatch() {
     mPrevShapeAngle = shape_angle.y;
     switch (mOcState) {
@@ -1810,7 +1754,6 @@ void daE_OC_c::executeWatch() {
     }
 }
 
-/* 807319E4-80731D18 005504 0334+00 1/1 0/0 0/0 .text            executeSoundWatch__8daE_OC_cFv */
 void daE_OC_c::executeSoundWatch() {
     field_0x6bc = mPrevShapeAngle = cLib_targetAngleY(&current.pos, &mWatchPos);
     if (mOcState == 2) {
@@ -1860,7 +1803,6 @@ void daE_OC_c::executeSoundWatch() {
     }
 }
 
-/* 80731D18-80731D4C 005838 0034+00 1/1 0/0 0/0 .text            checkBeforeDeath__8daE_OC_cFv */
 bool daE_OC_c::checkBeforeDeath() {
     if (mActionMode == E_OC_ACTION_DEATH && mOcState >= 2 && field_0x6c0 < 2) {
         return true;
@@ -1869,7 +1811,6 @@ bool daE_OC_c::checkBeforeDeath() {
     return false;
 }
 
-/* 80731D4C-80731F5C 00586C 0210+00 1/1 0/0 0/0 .text            executeDeath__8daE_OC_cFv */
 void daE_OC_c::executeDeath() {
     mBattleOn = true;
     mPrevShapeAngle = shape_angle.y;
@@ -1917,7 +1858,6 @@ void daE_OC_c::executeDeath() {
     }
 }
 
-/* 80731F5C-80732074 005A7C 0118+00 1/1 0/0 0/0 .text            setWaterEffect__8daE_OC_cFv */
 void daE_OC_c::setWaterEffect() {
     cXyz my_vec_0(current.pos.x, mWaterLvl, current.pos.z);
     static cXyz sc(1.0f, 1.0f, 1.0f);
@@ -1935,7 +1875,6 @@ void daE_OC_c::setWaterEffect() {
     }
 }
 
-/* 80732074-807323A4 005B94 0330+00 1/1 0/0 0/0 .text            executeWaterDeath__8daE_OC_cFv */
 void daE_OC_c::executeWaterDeath() {
     switch (mOcState) {
         case 0:
@@ -1995,7 +1934,6 @@ void daE_OC_c::executeWaterDeath() {
     }
 }
 
-/* 807323A4-80732B04 005EC4 0760+00 2/1 0/0 0/0 .text            executeDemoMaster__8daE_OC_cFv */
 void daE_OC_c::executeDemoMaster() {
     cXyz my_vec_0(-4264.0f, 302.0f, -2330.0f);
     cXyz my_vec_1(16200.0f, 2850.0f, 7000.0f);
@@ -2116,7 +2054,6 @@ void daE_OC_c::executeDemoMaster() {
     }
 }
 
-/* 80732B04-80732E64 006624 0360+00 2/1 0/0 0/0 .text            executeDemoChild__8daE_OC_cFv */
 void daE_OC_c::executeDemoChild() {
     cXyz local_18(-4264.0f, 302.0f, -2330.0f);
     mPrevShapeAngle = shape_angle.y;
@@ -2180,7 +2117,6 @@ void daE_OC_c::executeDemoChild() {
     }
 }
 
-/* 80732E64-8073301C 006984 01B8+00 1/1 0/0 0/0 .text            checkFall__8daE_OC_cFv */
 void daE_OC_c::checkFall() {
     dBgS_GndChk gnd_chk;
     cXyz gnd_pos = current.pos;
@@ -2211,7 +2147,6 @@ void daE_OC_c::checkFall() {
     }
 }
 
-/* 8073301C-807331CC 006B3C 01B0+00 1/1 0/0 0/0 .text            executeFallDead__8daE_OC_cFv */
 void daE_OC_c::executeFallDead() {
     mPrevShapeAngle = shape_angle.y;
     switch (mOcState) {
@@ -2248,7 +2183,6 @@ void daE_OC_c::executeFallDead() {
     }
 }
 
-/* 807331CC-8073332C 006CEC 0160+00 1/1 0/0 0/0 .text            executeFall__8daE_OC_cFv */
 void daE_OC_c::executeFall() {
     mPrevShapeAngle = shape_angle.y;
     cLib_chaseF(&speedF, 0.0f, 0.1f);
@@ -2276,7 +2210,6 @@ void daE_OC_c::executeFall() {
     }
 }
 
-/* 8073332C-807335B4 006E4C 0288+00 1/1 0/0 0/0 .text            executeFindStay__8daE_OC_cFv */
 void daE_OC_c::executeFindStay() {
     s16 target_angle = fopAcM_searchPlayerAngleY(this);
     f32 target_dist = fopAcM_searchPlayerDistance(this);
@@ -2337,7 +2270,6 @@ void daE_OC_c::executeFindStay() {
     }
 }
 
-/* 807335B4-80733E48 0070D4 0894+00 1/1 0/0 0/0 .text            executeMoveOut__8daE_OC_cFv */
 void daE_OC_c::executeMoveOut() {
     f32 player_distance = fopAcM_searchPlayerDistance(this);
     s16 target_angle = fopAcM_searchPlayerAngleY(this);
@@ -2431,7 +2363,6 @@ void daE_OC_c::executeMoveOut() {
     }
 }
 
-/* 80733E48-80733F20 007968 00D8+00 1/1 0/0 0/0 .text            checkWaterSurface__8daE_OC_cFv */
 bool daE_OC_c::checkWaterSurface() {
     dBgS_ObjGndChk_Spl gnd_chk_spl;
     cXyz my_vec_0 = current.pos;
@@ -2449,7 +2380,6 @@ bool daE_OC_c::checkWaterSurface() {
     }
 }
 
-/* 80733F20-807345D8 007A40 06B8+00 2/1 0/0 0/0 .text            action__8daE_OC_cFv */
 void daE_OC_c::action() {
     mSphs_at[0].OffAtSetBit();
     mSphs_at[1].OffAtSetBit();
@@ -2572,7 +2502,6 @@ void daE_OC_c::action() {
     mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 807345D8-80734698 0080F8 00C0+00 1/1 0/0 0/0 .text            mtx_set__8daE_OC_cFv */
 void daE_OC_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(field_0x688);
@@ -2587,7 +2516,6 @@ void daE_OC_c::mtx_set() {
     }
 }
 
-/* 80734698-807348DC 0081B8 0244+00 1/1 0/0 0/0 .text            cc_set__8daE_OC_cFv */
 void daE_OC_c::cc_set() {
     cXyz my_vec_lhs;
     cXyz my_vec_rhs;
@@ -2623,7 +2551,6 @@ void daE_OC_c::cc_set() {
     dComIfG_Ccsp()->Set(&mSphs_at[1]);
 }
 
-/* 807348DC-80734B44 0083FC 0268+00 1/1 0/0 0/0 .text            execute__8daE_OC_cFv */
 int daE_OC_c::execute() {
     if (field_0x6c0) {
         --field_0x6c0;
@@ -2680,17 +2607,14 @@ int daE_OC_c::execute() {
     return 1;
 }
 
-/* 80734B44-80734B64 008664 0020+00 2/1 0/0 0/0 .text            daE_OC_Execute__FP8daE_OC_c */
 static void daE_OC_Execute(daE_OC_c* i_this) {
     i_this->execute();
 }
 
-/* 80734B64-80734B6C 008684 0008+00 1/0 0/0 0/0 .text            daE_OC_IsDelete__FP8daE_OC_c */
 static bool daE_OC_IsDelete(daE_OC_c* param_0) {
     return true;
 }
 
-/* 80734B6C-80734BF0 00868C 0084+00 1/1 0/0 0/0 .text            _delete__8daE_OC_cFv */
 int daE_OC_c::_delete() {
     dComIfG_resDelete(&mPhaseReqs[0], mName);
     dComIfG_resDelete(&mPhaseReqs[1], "E_ocb");
@@ -2706,13 +2630,11 @@ int daE_OC_c::_delete() {
     return 1;
 }
 
-/* 80734BF0-80734C10 008710 0020+00 1/0 0/0 0/0 .text            daE_OC_Delete__FP8daE_OC_c */
 static void daE_OC_Delete(daE_OC_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "E_OC");
     i_this->_delete();
 }
 
-/* 80734C10-80734D88 008730 0178+00 1/1 0/0 0/0 .text            CreateHeap__8daE_OC_cFv */
 int daE_OC_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(mName, 0x3);
     JUT_ASSERT(3443, modelData != NULL);
@@ -2742,13 +2664,11 @@ int daE_OC_c::CreateHeap() {
     return 1;
 }
 
-/* 80734D88-80734DA8 0088A8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_OC_c* a_this = static_cast<daE_OC_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 80734DA8-807352AC 0088C8 0504+00 1/1 0/0 0/0 .text            create__8daE_OC_cFv */
 cPhs__Step daE_OC_c::create() {
     fopAcM_ct(this, daE_OC_c);
     field_0x6b4 = fopAcM_GetParam(this) & 0xFF;
@@ -2871,12 +2791,10 @@ cPhs__Step daE_OC_c::create() {
     return phase;
 }
 
-/* 807355C8-807355E8 0090E8 0020+00 1/0 0/0 0/0 .text            daE_OC_Create__FP8daE_OC_c */
 static void daE_OC_Create(daE_OC_c* i_this) {
     i_this->create();
 }
 
-/* 80735F30-80735F50 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_OC_Method */
 static actor_method_class l_daE_OC_Method = {
     (process_method_func)daE_OC_Create,
     (process_method_func)daE_OC_Delete,
@@ -2885,7 +2803,6 @@ static actor_method_class l_daE_OC_Method = {
     (process_method_func)daE_OC_Draw,
 };
 
-/* 80735F50-80735F80 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_OC */
 extern actor_process_profile_definition g_profile_E_OC = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp
index c8f156619c..d7af586cf9 100644
--- a/src/d/actor/d_a_e_oct_bg.cpp
+++ b/src/d/actor/d_a_e_oct_bg.cpp
@@ -21,7 +21,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80739E80-80739EC0 00002C 0040+00 0/1 0/0 0/0 .data cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ */
 static dCcD_SrcSph cc_obg_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}},  // mObj
@@ -34,8 +33,6 @@ static dCcD_SrcSph cc_obg_src = {
     }                                // mSphAttr
 };
 
-/* 80739EC0-80739F00 00006C 0040+00 0/1 0/0 0/0 .data cc_obg_at_src__26@unnamed@d_a_e_oct_bg_cpp@
- */
 static dCcD_SrcSph cc_obg_at_src = {
     {
         {0x0, {{0x400, 0x1, 0xD}, {0x0, 0x0}, 0x0}},  // mObj
@@ -48,7 +45,6 @@ static dCcD_SrcSph cc_obg_at_src = {
     }                                // mSphAttr
 };
 
-/* 80739F00-80739F0C 0000AC 000A+02 1/1 0/0 0/0 .data            enemyBombID$3784 */
 static u16 enemyBombID[5] = {
     0x0A0D,
     0x0A0E,
@@ -57,7 +53,6 @@ static u16 enemyBombID[5] = {
     0x0A11,
 };
 
-/* 8073620C-8073626C 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__15daE_OctBg_HIO_cFv */
 daE_OctBg_HIO_c::daE_OctBg_HIO_c() {
     field_0x04 = -1;
     field_0x08 = 1200.0f;
@@ -70,8 +65,6 @@ daE_OctBg_HIO_c::daE_OctBg_HIO_c() {
     field_0x20 = 1;
 }
 
-/* 8073626C-80736310 00014C 00A4+00 9/9 0/0 0/0 .text
- * setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v              */
 void daE_OctBg_c::setAction(actionFunc param_0) {
     if (field_0xb58 != NULL) {
         field_0xb70 = -1;
@@ -83,7 +76,6 @@ void daE_OctBg_c::setAction(actionFunc param_0) {
     (this->*field_0xb58)();
 }
 
-/* 80736310-80736418 0001F0 0108+00 1/1 0/0 0/0 .text            setSparkEffect__11daE_OctBg_cFv */
 void daE_OctBg_c::setSparkEffect() {
     mDoMtx_stack_c::copy(field_0x5b4->getModel()->getAnmMtx(1));
     for (int i = 0; i < 5; i++) {
@@ -95,7 +87,6 @@ void daE_OctBg_c::setSparkEffect() {
     }
 }
 
-/* 80736418-8073651C 0002F8 0104+00 1/1 0/0 0/0 .text            checkExplode__11daE_OctBg_cFv */
 bool daE_OctBg_c::checkExplode() {
     if (field_0xb90 != 0) {
         setSparkEffect();
@@ -117,7 +108,6 @@ bool daE_OctBg_c::checkExplode() {
     return false;
 }
 
-/* 8073651C-80736840 0003FC 0324+00 1/1 0/0 0/0 .text            action__11daE_OctBg_cFv */
 void daE_OctBg_c::action() {
     if (field_0xbae != 0) {
         field_0xbae--;
@@ -164,11 +154,9 @@ void daE_OctBg_c::action() {
     }
 }
 
-/* 8073A13C-8073A140 -00001 0004+00 1/2 0/0 0/0 .bss             None */
 /* 8073A13D 0003+00 data_8073A13D None */
 static u8 struct_8073A13D;
 
-/* 80736840-807368A8 000720 0068+00 1/1 0/0 0/0 .text            _delete__11daE_OctBg_cFv */
 int daE_OctBg_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_bg");
     if (field_0xbb3 != 0) {
@@ -180,13 +168,10 @@ int daE_OctBg_c::_delete() {
     return 1;
 }
 
-/* 807368A8-807368C8 000788 0020+00 1/0 0/0 0/0 .text            daE_OctBg_Delete__FP11daE_OctBg_c
- */
 static int daE_OctBg_Delete(daE_OctBg_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8073A14C-8073A174 -00001 0028+00 7/10 0/0 0/0 .bss             None */
 /* 8073A14C 0024+01 data_8073A14C l_HIO */
 /* 8073A171 0001+00 data_8073A171 None */
 /* 8073A172 0002+00 data_8073A172 None */
@@ -196,7 +181,6 @@ static u8 struct_8073A14C_field_0x24;
 static u8 struct_8073A14C_field_0x25;
 static u8 struct_8073A14C_field_0x26;
 
-/* 807368C8-80736A78 0007A8 01B0+00 1/1 0/0 0/0 .text            cc_set__11daE_OctBg_cFv */
 void daE_OctBg_c::cc_set() {
     cXyz cStack_1c;
     cXyz cStack_28;
@@ -220,7 +204,6 @@ void daE_OctBg_c::cc_set() {
     dComIfG_Ccsp()->Set(&field_0x9f8);
 }
 
-/* 80736A78-80736BB4 000958 013C+00 1/1 0/0 0/0 .text            mtx_set__11daE_OctBg_cFv */
 void daE_OctBg_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::transM(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f);
@@ -238,8 +221,6 @@ void daE_OctBg_c::mtx_set() {
     }
 }
 
-/* 80736BB4-80736DAC 000A94 01F8+00 1/1 0/0 0/0 .text            checkNormalAttack__11daE_OctBg_cFv
- */
 bool daE_OctBg_c::checkNormalAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (dComIfGp_event_runCheck() != 0) {
@@ -258,7 +239,6 @@ bool daE_OctBg_c::checkNormalAttack() {
     return false;
 }
 
-/* 80736DAC-80736E30 000C8C 0084+00 1/1 0/0 0/0 .text            checkChase__11daE_OctBg_cFv */
 bool daE_OctBg_c::checkChase() {
     if (field_0xbac == 0) {
         return false;
@@ -273,7 +253,6 @@ bool daE_OctBg_c::checkChase() {
     return true;
 }
 
-/* 80736E30-80737028 000D10 01F8+00 1/0 0/0 0/0 .text            born_swim__11daE_OctBg_cFv */
 void daE_OctBg_c::born_swim() {
     if (field_0xb70 == 0) {
         field_0x8c0.SetTgType(0);
@@ -307,7 +286,6 @@ void daE_OctBg_c::born_swim() {
     }
 }
 
-/* 80737028-80737574 000F08 054C+00 7/0 0/0 0/0 .text            swim__11daE_OctBg_cFv */
 void daE_OctBg_c::swim() {
     if (field_0xb70 == 0) {
         field_0xb8c = 0;
@@ -365,8 +343,6 @@ void daE_OctBg_c::swim() {
     }
 }
 
-/* 80737574-8073762C 001454 00B8+00 2/2 0/0 0/0 .text            setChasePos__11daE_OctBg_cFR4cXyzf
- */
 void daE_OctBg_c::setChasePos(cXyz& param_1, f32 param_2) {
     mDoMtx_stack_c::YrotS(cM_rndFX(32768.0f));
     mDoMtx_stack_c::XrotM(cM_rndFX(32768.0f));
@@ -374,7 +350,6 @@ void daE_OctBg_c::setChasePos(cXyz& param_1, f32 param_2) {
     mDoMtx_stack_c::multVecZero(&param_1);
 }
 
-/* 8073762C-80737678 00150C 004C+00 1/1 0/0 0/0 .text checkCoreFishAttack__11daE_OctBg_cFv */
 bool daE_OctBg_c::checkCoreFishAttack() {
     fopAc_ac_c* actor;
     if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) {
@@ -386,7 +361,6 @@ bool daE_OctBg_c::checkCoreFishAttack() {
     return true;
 }
 
-/* 80737678-80737C48 001558 05D0+00 5/0 0/0 0/0 .text            chase_core__11daE_OctBg_cFv */
 void daE_OctBg_c::chase_core() {
     if (field_0xb70 == 0) {
         setChasePos(field_0x660, cM_rndF(struct_8073A14C.field_0x10));
@@ -438,7 +412,6 @@ void daE_OctBg_c::chase_core() {
     }
 }
 
-/* 80737C48-8073814C 001B28 0504+00 3/0 0/0 0/0 .text            normal_attack__11daE_OctBg_cFv */
 void daE_OctBg_c::normal_attack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (field_0xb70 == 0) {
@@ -499,8 +472,6 @@ void daE_OctBg_c::normal_attack() {
     }
 }
 
-/* 8073814C-80738714 00202C 05C8+00 2/0 0/0 0/0 .text            core_fish_attack__11daE_OctBg_cFv
- */
 void daE_OctBg_c::core_fish_attack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (field_0xb70 == 0) {
@@ -561,7 +532,6 @@ void daE_OctBg_c::core_fish_attack() {
     }
 }
 
-/* 80738714-80738914 0025F4 0200+00 1/0 0/0 0/0 .text            back_swim__11daE_OctBg_cFv */
 void daE_OctBg_c::back_swim() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (field_0xb70 == 0) {
@@ -591,7 +561,6 @@ void daE_OctBg_c::back_swim() {
     }
 }
 
-/* 80738914-807389E8 0027F4 00D4+00 2/2 0/0 0/0 .text            setBombCarry__11daE_OctBg_cFi */
 bool daE_OctBg_c::setBombCarry(int param_1) {
     fopAc_ac_c* actor = NULL;
     if (param_1 == 0) {
@@ -613,7 +582,6 @@ bool daE_OctBg_c::setBombCarry(int param_1) {
     return false;
 }
 
-/* 807389E8-80738A4C 0028C8 0064+00 1/0 0/0 0/0 .text            hook__11daE_OctBg_cFv */
 void daE_OctBg_c::hook() {
     if (field_0xb70 == 0) {
         field_0x9f8.OffAtSetBit();
@@ -625,7 +593,6 @@ void daE_OctBg_c::hook() {
     }
 }
 
-/* 80738A4C-80738C2C 00292C 01E0+00 3/0 0/0 0/0 .text            damage__11daE_OctBg_cFv */
 void daE_OctBg_c::damage() {
     field_0xb90 = 120;
     if (field_0xb70 == 0) {
@@ -662,7 +629,6 @@ void daE_OctBg_c::damage() {
     }
 }
 
-/* 80738C2C-80738E30 002B0C 0204+00 2/0 0/0 0/0 .text            bomb_wait__11daE_OctBg_cFv */
 void daE_OctBg_c::bomb_wait() {
     if (field_0xb70 == 0) {
         J3DAnmTransform* transform = (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 5);
@@ -711,7 +677,6 @@ void daE_OctBg_c::bomb_wait() {
     }
 }
 
-/* 80738E30-8073905C 002D10 022C+00 1/1 0/0 0/0 .text            damage_check__11daE_OctBg_cFv */
 void daE_OctBg_c::damage_check() {
     bool bVar1;
     field_0x884.Move();
@@ -753,7 +718,6 @@ void daE_OctBg_c::damage_check() {
     }
 }
 
-/* 8073905C-807390A4 002F3C 0048+00 1/1 0/0 0/0 .text            execute__11daE_OctBg_cFv */
 int daE_OctBg_c::execute() {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -762,19 +726,14 @@ int daE_OctBg_c::execute() {
     return 1;
 }
 
-/* 807390A4-807390C4 002F84 0020+00 2/1 0/0 0/0 .text            daE_OctBg_Execute__FP11daE_OctBg_c
- */
 static int daE_OctBg_Execute(daE_OctBg_c* i_this) {
     return i_this->execute();
 }
 
-/* 807390C4-807390E4 002FA4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_OctBg_c*>(i_this)->CreateHeap();
 }
 
-/* 807390E4-807391D0 002FC4 00EC+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daE_OctBg_cFP8J3DJointP8J3DModel                */
 int daE_OctBg_c::ctrlJoint(J3DJoint* param_1, J3DModel* param_2) {
     int jntNo = param_1->getJntNo();
     mDoMtx_stack_c::copy(param_2->getAnmMtx(jntNo));
@@ -794,7 +753,6 @@ int daE_OctBg_c::ctrlJoint(J3DJoint* param_1, J3DModel* param_2) {
     return 1;
 }
 
-/* 807391D0-8073921C 0030B0 004C+00 2/2 0/0 0/0 .text JointCallBack__11daE_OctBg_cFP8J3DJointi */
 int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -806,7 +764,6 @@ int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 8073921C-807393DC 0030FC 01C0+00 1/1 0/0 0/0 .text            CreateHeap__11daE_OctBg_cFv */
 int daE_OctBg_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bg", 10);
     JUT_ASSERT(1341, modelData != NULL);
@@ -831,7 +788,6 @@ int daE_OctBg_c::CreateHeap() {
     return 1;
 }
 
-/* 80739424-807397B8 003304 0394+00 1/1 0/0 0/0 .text            create__11daE_OctBg_cFv */
 int daE_OctBg_c::create() {
     fopAcM_ct(this, daE_OctBg_c);
 
@@ -882,13 +838,10 @@ int daE_OctBg_c::create() {
     return rv;
 }
 
-/* 80739984-807399A4 003864 0020+00 1/0 0/0 0/0 .text            daE_OctBg_Create__FP11daE_OctBg_c
- */
 static int daE_OctBg_Create(daE_OctBg_c* i_this) {
     return i_this->create();
 }
 
-/* 807399A4-80739BA0 003884 01FC+00 1/1 0/0 0/0 .text            draw__11daE_OctBg_cFv */
 int daE_OctBg_c::draw() {
     J3DModel* model = field_0x5b4->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -910,13 +863,10 @@ int daE_OctBg_c::draw() {
     return 1;
 }
 
-/* 80739BA0-80739BC0 003A80 0020+00 1/0 0/0 0/0 .text            daE_OctBg_Draw__FP11daE_OctBg_c */
 static int daE_OctBg_Draw(daE_OctBg_c* i_this) {
     return i_this->draw();
 }
 
-/* 80739BC0-80739C70 003AA0 00B0+00 1/0 0/0 0/0 .text            daE_OctBg_IsDelete__FP11daE_OctBg_c
- */
 static int daE_OctBg_IsDelete(daE_OctBg_c* i_this) {
     struct_8073A14C_field_0x23--;
     if (i_this->getChaseFlag() != 0) {
@@ -939,7 +889,6 @@ static actor_method_class l_daE_OctBg_Method = {
     (process_method_func)daE_OctBg_Draw,
 };
 
-/* 8073A04C-8073A07C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_OctBg */
 extern actor_process_profile_definition g_profile_E_OctBg = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp
index d901c4625e..c715cf7730 100644
--- a/src/d/actor/d_a_e_ot.cpp
+++ b/src/d/actor/d_a_e_ot.cpp
@@ -11,8 +11,8 @@
 
 class daE_OT_HIO_c {
 public:
-    /* 8073A2CC */ daE_OT_HIO_c();
-    /* 8073C9B0 */ virtual ~daE_OT_HIO_c() {}
+    daE_OT_HIO_c();
+    virtual ~daE_OT_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mAttackSpeed;
@@ -31,17 +31,12 @@ enum Animation {
 
 namespace {
 
-/* 8073CFAC-8073CFBC 000038 0010+00 0/1 0/0 0/0 .data rand_speed__22@unnamed@d_a_e_ot_cpp@ */
 static f32 rand_speed[4] = {-4.0f, -2.0f, 2.0f, 4.0f};
 
-/* 8073CFBC-8073CFC4 000048 0008+00 1/2 0/0 0/0 .data rand_angle__22@unnamed@d_a_e_ot_cpp@ */
 static s16 rand_angle[4] = {-0x800, 0x400, -0x400, 0x800};
 
-/* 8073CFC4-8073CFCC 000050 0008+00 0/1 0/0 0/0 .data rand_angle2__22@unnamed@d_a_e_ot_cpp@ */
 static s16 rand_angle2[4] = {-0x3000, 0x3000, -0x5000, 0x5000};
 
-/* 8073CFCC-8073D0BC 000058 00F0+00 0/1 0/0 0/0 .data            egg_pos__22@unnamed@d_a_e_ot_cpp@
- */
 static Vec egg_pos[20] = {
     {0.0f, 130.0f, 0.0f},
     {15.0f, 60.0f, 150.0f},
@@ -65,8 +60,6 @@ static Vec egg_pos[20] = {
     {-30.0f, 120.0f, -40.0f},
 };
 
-/* 8073D0BC-8073D0FC 000148 0040+00 0/1 0/0 0/0 .data            cc_ot_src__22@unnamed@d_a_e_ot_cpp@
- */
 static dCcD_SrcSph cc_ot_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x10}, {0xd8fafdff, 0x3}, 0x74}}, // mObj
@@ -79,7 +72,6 @@ static dCcD_SrcSph cc_ot_src = {
     } // mSphAttr
 };
 
-/* 8073D0FC-8073D13C 000188 0040+00 0/1 0/0 0/0 .data cc_ot_at_src__22@unnamed@d_a_e_ot_cpp@ */
 static dCcD_SrcSph cc_ot_at_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0c}, {0x0, 0x0}, 0x0}}, // mObj
@@ -94,20 +86,16 @@ static dCcD_SrcSph cc_ot_at_src = {
 
 }  // namespace
 
-/* 8073D2AC-8073D2B0 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 8073D2AD 0003+00 data_8073D2AD None */
 static bool hioInit;
 
-/* 8073D2BC-8073D2DC 000054 0020+00 4/4 0/0 0/0 .bss             l_HIO */
 static daE_OT_HIO_c l_HIO;
 
-/* 8073D2DC-8073D2E0 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 8073D2DC 0001+00 data_8073D2DC None */
 /* 8073D2DD 0003+00 data_8073D2DD None */
 static u8 data_8073D2DC;
 static u8 data_8073D2DD;
 
-/* 8073A2CC-8073A314 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_OT_HIO_cFv */
 daE_OT_HIO_c::daE_OT_HIO_c() {
     field_0x4 = -1;
     mAttackSpeed = 13.0f;
@@ -118,7 +106,6 @@ daE_OT_HIO_c::daE_OT_HIO_c() {
     field_0x1c = 20.0f;
 }
 
-/* 8073A314-8073A434 000134 0120+00 1/1 0/0 0/0 .text            draw__8daE_OT_cFv */
 int daE_OT_c::draw() {
     J3DModel* model;
     if (mHatched) {
@@ -147,18 +134,15 @@ int daE_OT_c::draw() {
     return 1;
 }
 
-/* 8073A434-8073A454 000254 0020+00 1/0 0/0 0/0 .text            daE_OT_Draw__FP8daE_OT_c */
 static int daE_OT_Draw(daE_OT_c* i_this) {
     return i_this->draw();
 }
 
-/* 8073A454-8073A4F8 000274 00A4+00 4/4 0/0 0/0 .text            setBck__8daE_OT_cFiUcff */
 void daE_OT_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("E_OT", i_anm);
     mpMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 8073A4F8-8073A510 000318 0018+00 4/4 0/0 0/0 .text            setActionMode__8daE_OT_cFii */
 void daE_OT_c::setActionMode(int i_action, int i_mode) {
     if (mAction != i_action) {
         mAction = i_action;
@@ -166,7 +150,6 @@ void daE_OT_c::setActionMode(int i_action, int i_mode) {
     }
 }
 
-/* 8073A510-8073A7B0 000330 02A0+00 1/1 0/0 0/0 .text            damage_check__8daE_OT_cFv */
 void daE_OT_c::damage_check() {
     if (mAction == ACT_DAMAGE) {
         return;
@@ -210,7 +193,6 @@ void daE_OT_c::damage_check() {
     }
 }
 
-/* 8073A7B0-8073A838 0005D0 0088+00 1/1 0/0 0/0 .text            checkWaterSurface__8daE_OT_cFv */
 void daE_OT_c::checkWaterSurface() {
     dBgS_ObjGndChk_Spl wtr_chk;
     Vec pos;
@@ -220,7 +202,6 @@ void daE_OT_c::checkWaterSurface() {
     mWaterSurface = dComIfG_Bgsp().GroundCross(&wtr_chk);
 }
 
-/* 8073A838-8073A99C 000658 0164+00 3/3 0/0 0/0 .text            setWaterEffect__8daE_OT_cFv */
 void daE_OT_c::setWaterEffect() {
     cXyz pos(current.pos.x, mWaterSurface, current.pos.z);
     static cXyz sc(0.5f, 0.5f, 0.5f);
@@ -236,7 +217,6 @@ void daE_OT_c::setWaterEffect() {
     mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1);
 }
 
-/* 8073A99C-8073AA40 0007BC 00A4+00 1/1 0/0 0/0 .text            setEggBreakEffect__8daE_OT_cFv */
 void daE_OT_c::setEggBreakEffect() {
     static u16 w_eff_id[2] = {0x8550, 0x8551};
     for (int i = 0; i < 2; i++) {
@@ -244,7 +224,6 @@ void daE_OT_c::setEggBreakEffect() {
     }
 }
 
-/* 8073AA40-8073AB38 000860 00F8+00 1/1 0/0 0/0 .text            setDeathLightEffect__8daE_OT_cFv */
 void daE_OT_c::setDeathLightEffect() {
     static u16 w_eff_id[4] = {0x854c, 0x854d, 0x854e, 0x854f};
     for (int i = 0; i < 4; i++) {
@@ -253,7 +232,6 @@ void daE_OT_c::setDeathLightEffect() {
     fopAcM_seStart(this, JA_SE_CM_MONS_EXPLODE, 0);
 }
 
-/* 8073AB38-8073AC14 000958 00DC+00 1/1 0/0 0/0 .text            setEggStay__8daE_OT_cFv */
 void daE_OT_c::setEggStay() {
     if (mpToadActor != NULL) {
         cXyz pos;
@@ -266,7 +244,6 @@ void daE_OT_c::setEggStay() {
     }
 }
 
-/* 8073AC14-8073AF70 000A34 035C+00 2/1 0/0 0/0 .text            executeEgg__8daE_OT_cFv */
 void daE_OT_c::executeEgg() {
     switch (mMode) {
     case 0:
@@ -350,7 +327,6 @@ void daE_OT_c::executeEgg() {
     }
 }
 
-/* 8073AF70-8073B0D0 000D90 0160+00 1/1 0/0 0/0 .text            executeBorn__8daE_OT_cFv */
 void daE_OT_c::executeBorn() {
     if (mDemoMode != 0 && mpToadActor->isDemoJump()) {
         fopAcM_delete(this);
@@ -381,7 +357,6 @@ void daE_OT_c::executeBorn() {
     }
 }
 
-/* 8073B0D0-8073B428 000EF0 0358+00 1/1 0/0 0/0 .text            executeAttack__8daE_OT_cFv */
 void daE_OT_c::executeAttack() {
     if (mDemoMode != 0 && mpToadActor->isDemoJump()) {
         fopAcM_delete(this);
@@ -445,7 +420,6 @@ void daE_OT_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8073B428-8073B854 001248 042C+00 2/1 0/0 0/0 .text            executePanic__8daE_OT_cFv */
 void daE_OT_c::executePanic() {
     switch (mMode) {
     case 0:
@@ -530,7 +504,6 @@ void daE_OT_c::executePanic() {
     }
 }
 
-/* 8073B854-8073BB9C 001674 0348+00 1/1 0/0 0/0 .text            executeDamage__8daE_OT_cFv */
 void daE_OT_c::executeDamage() {
     cXyz pos, vec;
 
@@ -603,7 +576,6 @@ void daE_OT_c::executeDamage() {
     }
 }
 
-/* 8073BB9C-8073BD78 0019BC 01DC+00 1/1 0/0 0/0 .text            action__8daE_OT_cFv */
 void daE_OT_c::action() {
     fopAcM_SearchByName(PROC_E_DT, (fopAc_ac_c**)&mpToadActor);
 
@@ -660,7 +632,6 @@ void daE_OT_c::action() {
     }
 }
 
-/* 8073BD78-8073BE10 001B98 0098+00 1/1 0/0 0/0 .text            mtx_set__8daE_OT_cFv */
 void daE_OT_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y - 20.0f, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -670,7 +641,6 @@ void daE_OT_c::mtx_set() {
     mpEggModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8073BE10-8073BF84 001C30 0174+00 1/1 0/0 0/0 .text            cc_set__8daE_OT_cFv */
 void daE_OT_c::cc_set() {
     cXyz vec, center;
     J3DModel* model = mpMorf->getModel();
@@ -696,7 +666,6 @@ void daE_OT_c::cc_set() {
     dComIfG_Ccsp()->Set(&mAtSph);
 }
 
-/* 8073BF84-8073C030 001DA4 00AC+00 1/1 0/0 0/0 .text            execute__8daE_OT_cFv */
 int daE_OT_c::execute() {
     if (mTimer1 != 0) {
         mTimer1--;
@@ -716,17 +685,14 @@ int daE_OT_c::execute() {
     return 1;
 }
 
-/* 8073C030-8073C050 001E50 0020+00 2/1 0/0 0/0 .text            daE_OT_Execute__FP8daE_OT_c */
 static int daE_OT_Execute(daE_OT_c* i_this) {
     return i_this->execute();
 }
 
-/* 8073C050-8073C058 001E70 0008+00 1/0 0/0 0/0 .text            daE_OT_IsDelete__FP8daE_OT_c */
 static int daE_OT_IsDelete(daE_OT_c* i_this) {
     return 1;
 }
 
-/* 8073C058-8073C0CC 001E78 0074+00 1/1 0/0 0/0 .text            _delete__8daE_OT_cFv */
 int daE_OT_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_OT");
 
@@ -741,12 +707,10 @@ int daE_OT_c::_delete() {
     return 1;
 }
 
-/* 8073C0CC-8073C0EC 001EEC 0020+00 1/0 0/0 0/0 .text            daE_OT_Delete__FP8daE_OT_c */
 static int daE_OT_Delete(daE_OT_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8073C0EC-8073C2B4 001F0C 01C8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_OT_cFv */
 int daE_OT_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_OT", 14);
     mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
@@ -776,12 +740,10 @@ int daE_OT_c::CreateHeap() {
     return 1;
 }
 
-/* 8073C2FC-8073C31C 00211C 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_OT_c*>(i_this)->CreateHeap();
 }
 
-/* 8073C31C-8073C77C 00213C 0460+00 1/1 0/0 0/0 .text            create__8daE_OT_cFv */
 cPhs__Step daE_OT_c::create() {
     fopAcM_ct(this, daE_OT_c);
 
@@ -866,12 +828,10 @@ cPhs__Step daE_OT_c::create() {
     return step;
 }
 
-/* 8073C948-8073C968 002768 0020+00 1/0 0/0 0/0 .text            daE_OT_Create__FP8daE_OT_c */
 static cPhs__Step daE_OT_Create(daE_OT_c* i_this) {
     return i_this->create();
 }
 
-/* 8073D19C-8073D1BC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_OT_Method */
 static actor_method_class l_daE_OT_Method = {
     (process_method_func)daE_OT_Create,
     (process_method_func)daE_OT_Delete,
@@ -880,7 +840,6 @@ static actor_method_class l_daE_OT_Method = {
     (process_method_func)daE_OT_Draw,
 };
 
-/* 8073D1BC-8073D1EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_OT */
 extern actor_process_profile_definition g_profile_E_OT = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp
index 4da2d26538..1e4e8c2028 100644
--- a/src/d/actor/d_a_e_ph.cpp
+++ b/src/d/actor/d_a_e_ph.cpp
@@ -32,7 +32,6 @@
 #define ANM_WIND_FALL 17
 
 
-/* 8073D44C-8073D48C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daE_PH_HIO_cFv */
 daE_PH_HIO_c::daE_PH_HIO_c() {
     field_0x4 = -1;
     mHangPos = 0.0f;
@@ -42,7 +41,6 @@ daE_PH_HIO_c::daE_PH_HIO_c() {
     mRotationYInterpolation = 0.1f;
 }
 
-/* 8073D48C-8073D4EC 00012C 0060+00 1/1 0/0 0/0 .text            initCcSph__8daE_PH_cFv */
 void daE_PH_c::initCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -62,7 +60,6 @@ void daE_PH_c::initCcSph() {
     mCcSph.SetC(current.pos);
 }
 
-/* 8073D4EC-8073D5C4 00018C 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP8daE_PH_cP10fopAc_ac_c */
 static BOOL other_bg_check(daE_PH_c* i_this, fopAc_ac_c* i_other) {
     daE_PH_c* start_actor = (daE_PH_c*)i_this;  // necessary to fix reg alloc
 
@@ -85,14 +82,12 @@ static BOOL other_bg_check(daE_PH_c* i_this, fopAc_ac_c* i_other) {
     return false;
 }
 
-/* 8073D5C4-8073D648 000264 0084+00 1/1 0/0 0/0 .text            SetStopingCam__8daE_PH_cFv */
 void daE_PH_c::SetStopingCam() {
     camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
     camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 8073D648-8073D768 0002E8 0120+00 1/1 0/0 0/0 .text            SetStopCam__8daE_PH_cF4cXyzffs */
 void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_offsetAngle) {
     camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz offset(0.0f, i_offsetY, i_offsetZ);
@@ -108,13 +103,11 @@ void daE_PH_c::SetStopCam(cXyz i_center, f32 i_offsetZ, f32 i_offsetY, s16 i_off
     camera_p->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 8073D768-8073D7AC 000408 0044+00 1/1 0/0 0/0 .text            SetCMoveCam__8daE_PH_cF4cXyzff */
 void daE_PH_c::SetCMoveCam(cXyz i_target, f32 i_scale, f32 i_maxStep) {
     mCamCenterTarget = i_target;
     cLib_addCalcPos2(&mCamCenter, mCamCenterTarget, i_scale, i_maxStep);
 }
 
-/* 8073D7AC-8073D850 00044C 00A4+00 1/1 0/0 0/0 .text            SetReleaseCam__8daE_PH_cFv */
 void daE_PH_c::SetReleaseCam() {
     camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -124,7 +117,6 @@ void daE_PH_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-/* 8073D850-8073D904 0004F0 00B4+00 1/1 0/0 0/0 .text ctrlJoint__8daE_PH_cFP8J3DJointP8J3DModel */
 int daE_PH_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -139,7 +131,6 @@ int daE_PH_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8073D904-8073D950 0005A4 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -152,7 +143,6 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8073D950-8073D9EC 0005F0 009C+00 1/1 0/0 0/0 .text            setCcSph__8daE_PH_cFv */
 void daE_PH_c::setCcSph() {
     cXyz center(0.0f, AREG_F(0) + -10.0f, 0.0f);
 
@@ -179,32 +169,27 @@ int daE_PH_c::CreateHeap() {
     return 1;
 }
 
-/* 8073D9EC-8073DAE4 00068C 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_PH_c*>(i_this)->CreateHeap();
 }
 
-/* 8073DAE4-8073DB04 000784 0020+00 1/0 0/0 0/0 .text            daE_PH_Create__FP10fopAc_ac_c */
 static int daE_PH_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daE_PH_c*>(i_this)->create();
 }
 
-/* 8073DB04-8073DB28 0007A4 0024+00 1/0 0/0 0/0 .text            daE_PH_Delete__FP8daE_PH_c */
 static int daE_PH_Delete(daE_PH_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->Delete();
     return 1;
 }
 
-/* 8073DB28-8073DBD4 0007C8 00AC+00 5/5 0/0 0/0 .text            SetAnm__8daE_PH_cFiiff */
 void daE_PH_c::SetAnm(int i_anmID, int i_attr, f32 i_morf, f32 i_speed) {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", i_anmID);
     mpMorf->setAnm(anm, i_attr, i_morf, i_speed, 0.0f, -1.0f);
     mAnmID = i_anmID;
 }
 
-/* 8073DBD4-8073DDF8 000874 0224+00 1/1 0/0 0/0 .text            SearchNearP__8daE_PH_cFv */
 void daE_PH_c::SearchNearP() {
     f32 nearest_dist = G_CM3D_F_INF;
 
@@ -237,7 +222,6 @@ void daE_PH_c::SearchNearP() {
     }
 }
 
-/* 8073DDF8-8073E068 000A98 0270+00 2/2 0/0 0/0 .text            FlyAnm__8daE_PH_cFv */
 void daE_PH_c::FlyAnm() {
     if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) {
         if (mpMorf->isStop()) {
@@ -272,13 +256,10 @@ void daE_PH_c::FlyAnm() {
     }
 }
 
-/* 80741DC0-80741DC4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 initialized;
 
-/* 80741DD0-80741DEC 000018 001C+00 8/8 0/0 0/0 .bss             l_HIO */
 static daE_PH_HIO_c l_HIO;
 
-/* 8073E068-8073E22C 000D08 01C4+00 1/1 0/0 0/0 .text            SetShapeAngle__8daE_PH_cFv */
 void daE_PH_c::SetShapeAngle() {
     mHeadRotX += field_0x612 * mAnmSpeed;
     mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612 * mAnmSpeed, -1);
@@ -298,7 +279,6 @@ void daE_PH_c::SetShapeAngle() {
     cLib_chaseAngleS(&shape_angle.x, -temp_r4 * (AREG_F(5) + 50.0f), 0x30);
 }
 
-/* 8073E22C-8073E4A4 000ECC 0278+00 1/1 0/0 0/0 .text            GoTarget__8daE_PH_cFv */
 void daE_PH_c::GoTarget() {
     cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
     cLib_addCalc2(&speed.y, mTargetSpeedY, l_HIO.mRotationYInterpolation, 10.0f);
@@ -322,7 +302,6 @@ void daE_PH_c::GoTarget() {
     }
 }
 
-/* 8073E4A4-8073E8B0 001144 040C+00 2/2 0/0 0/0 .text            SetCheckAngle__8daE_PH_cFv */
 void daE_PH_c::SetCheckAngle() {
     cXyz sp34(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
     mCurrentPntPos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position;
@@ -350,7 +329,6 @@ void daE_PH_c::SetCheckAngle() {
     }
 }
 
-/* 8073E8B0-8073E924 001550 0074+00 1/1 0/0 0/0 .text            C_CheckPoint__8daE_PH_cFv */
 bool daE_PH_c::C_CheckPoint() {
     cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
     s16 angle = field_0x61e - cLib_targetAngleY(&target_pos, &current.pos);
@@ -362,7 +340,6 @@ bool daE_PH_c::C_CheckPoint() {
     return false;
 }
 
-/* 8073E924-8073EA50 0015C4 012C+00 2/2 0/0 0/0 .text            DownBoots__8daE_PH_cFv */
 void daE_PH_c::DownBoots() {
     s16 temp_r0 = (f32)(field_0x612 * mAnmSpeed);
     mHeadRotX += temp_r0;
@@ -383,7 +360,6 @@ void daE_PH_c::DownBoots() {
     mpMorf->setPlaySpeed(mAnmSpeed);
 }
 
-/* 8073EA50-8073EB64 0016F0 0114+00 2/2 0/0 0/0 .text            UpBoots__8daE_PH_cFv */
 void daE_PH_c::UpBoots() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     mHeadRotX += 0x1000;
@@ -406,7 +382,6 @@ void daE_PH_c::UpBoots() {
     }
 }
 
-/* 8073EB64-8073ED0C 001804 01A8+00 1/1 0/0 0/0 .text            C_Action__8daE_PH_cFv */
 void daE_PH_c::C_Action() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -465,7 +440,6 @@ void daE_PH_c::C_Action() {
     FlyAnm();
 }
 
-/* 8073ED0C-8073ED58 0019AC 004C+00 2/2 0/0 0/0 .text            SearchNextPos__8daE_PH_cFv */
 void daE_PH_c::SearchNextPos() {
     cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
 
@@ -481,7 +455,6 @@ void daE_PH_c::SearchNextPos() {
     }
 }
 
-/* 8073ED58-8073EDA0 0019F8 0048+00 2/2 0/0 0/0 .text            SearchBackPos__8daE_PH_cFv */
 void daE_PH_c::SearchBackPos() {
     cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
 
@@ -497,7 +470,6 @@ void daE_PH_c::SearchBackPos() {
     }
 }
 
-/* 8073EDA0-8073EE68 001A40 00C8+00 1/1 0/0 0/0 .text            S_SetPlaySpeed__8daE_PH_cFv */
 void daE_PH_c::S_SetPlaySpeed() {
     mHeadRotX += field_0x612;
 
@@ -508,7 +480,6 @@ void daE_PH_c::S_SetPlaySpeed() {
     mpMorf->setPlaySpeed(mAnmSpeed);
 }
 
-/* 8073EE68-8073F250 001B08 03E8+00 1/1 0/0 0/0 .text            S_GoTarget__8daE_PH_cFv */
 void daE_PH_c::S_GoTarget() {
     cXyz unused(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
 
@@ -541,7 +512,6 @@ void daE_PH_c::S_GoTarget() {
     S_SetPlaySpeed();
 }
 
-/* 8073F250-8073F3D4 001EF0 0184+00 1/1 0/0 0/0 .text            S_CheckPoint__8daE_PH_cFv */
 bool daE_PH_c::S_CheckPoint() {
     cXyz target_pos(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
 
@@ -558,7 +528,6 @@ bool daE_PH_c::S_CheckPoint() {
     return false;
 }
 
-/* 8073F3D4-8073F8C8 002074 04F4+00 2/2 0/0 0/0 .text            S_SetAngle__8daE_PH_cFv */
 void daE_PH_c::S_SetAngle() {
     cXyz sp30(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z);
 
@@ -586,7 +555,6 @@ void daE_PH_c::S_SetAngle() {
     mStopTimer = l_HIO.mStopTime + (f32)mStopTimePrm;
 }
 
-/* 8073F8C8-8073FB70 002568 02A8+00 1/1 0/0 0/0 .text            FlyAnm2__8daE_PH_cFv */
 void daE_PH_c::FlyAnm2() {
     if (mAnmID == ANM_DAMAGE_ARROW || mAnmID == ANM_HANG_START || mAnmID == ANM_HANG_WAIT) {
         if (mpMorf->isStop()) {
@@ -628,7 +596,6 @@ void daE_PH_c::FlyAnm2() {
     }
 }
 
-/* 8073FB70-8073FBDC 002810 006C+00 1/1 0/0 0/0 .text            S_Action__8daE_PH_cFv */
 void daE_PH_c::S_Action() {
     if (S_CheckPoint()) {
         S_SetAngle();
@@ -644,7 +611,6 @@ void daE_PH_c::S_Action() {
     }
 }
 
-/* 8073FBDC-8073FD70 00287C 0194+00 1/1 0/0 0/0 .text            StopAction__8daE_PH_cFv */
 void daE_PH_c::StopAction() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -687,7 +653,6 @@ void daE_PH_c::StopAction() {
     }
 }
 
-/* 8073FD70-80740024 002A10 02B4+00 1/1 0/0 0/0 .text            Action__8daE_PH_cFv */
 void daE_PH_c::Action() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -764,7 +729,6 @@ void daE_PH_c::Action() {
     mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 80740024-80740098 002CC4 0074+00 1/1 0/0 0/0 .text            SetHeadAngle__8daE_PH_cFs */
 void daE_PH_c::SetHeadAngle(s16 i_targetAngle) {
     cLib_addCalcAngleS2(&field_0x612, i_targetAngle, 0x10, 0x1000);
     mHeadRotX += field_0x612;
@@ -772,7 +736,6 @@ void daE_PH_c::SetHeadAngle(s16 i_targetAngle) {
     mSound.startCreatureSoundLevel(Z2SE_EN_PH_PROPELLER, field_0x612, -1);
 }
 
-/* 80740098-80740318 002D38 0280+00 1/1 0/0 0/0 .text            CamAction__8daE_PH_cFv */
 void daE_PH_c::CamAction() {
     cXyz sp20(0.0f, 0.0f, 0.0f);
 
@@ -820,7 +783,6 @@ void daE_PH_c::CamAction() {
     }
 }
 
-/* 80740318-807408C0 002FB8 05A8+00 1/1 0/0 0/0 .text            DemoAction__8daE_PH_cFv */
 void daE_PH_c::DemoAction() {
     switch (mCAction) {
     case 0:
@@ -941,7 +903,6 @@ void daE_PH_c::DemoAction() {
     }
 }
 
-/* 807408C0-80740B3C 003560 027C+00 1/1 0/0 0/0 .text            ToumeiAction__8daE_PH_cFv */
 void daE_PH_c::ToumeiAction() {
     cXyz hs_offset;
 
@@ -981,7 +942,6 @@ void daE_PH_c::ToumeiAction() {
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80740B3C-80740C3C 0037DC 0100+00 1/1 0/0 0/0 .text            Execute__8daE_PH_cFv */
 int daE_PH_c::Execute() {
     daPy_getPlayerActorClass();
     cXyz sp28;
@@ -1025,7 +985,6 @@ int daE_PH_c::Execute() {
     return 1;
 }
 
-/* 80740C3C-80740E70 0038DC 0234+00 1/1 0/0 0/0 .text            AttentionSet__8daE_PH_cFv */
 void daE_PH_c::AttentionSet() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     cXyz sp38;
@@ -1055,7 +1014,6 @@ void daE_PH_c::AttentionSet() {
     }
 }
 
-/* 80740E70-807410B0 003B10 0240+00 1/1 0/0 0/0 .text            ObjHit__8daE_PH_cFv */
 void daE_PH_c::ObjHit() {
     f32 y = l_HIO.mHangPos;
     y -= 80.0f;
@@ -1105,7 +1063,6 @@ void daE_PH_c::ObjHit() {
     }
 }
 
-/* 807410B0-8074117C 003D50 00CC+00 1/1 0/0 0/0 .text            BaseSet__8daE_PH_cFv */
 void daE_PH_c::BaseSet() {
     cLib_chaseAngleS(&field_0x616, 0, 0x40);
     field_0x61a += field_0x618;
@@ -1114,7 +1071,6 @@ void daE_PH_c::BaseSet() {
     mHeadRotY = field_0x616 * cM_ssin(field_0x61a);
 }
 
-/* 8074117C-807411C0 003E1C 0044+00 1/1 0/0 0/0 .text            De_Timer__8daE_PH_cFv */
 void daE_PH_c::De_Timer() {
     field_0x5ae--;
     if (field_0x5ae <= 0) {
@@ -1127,7 +1083,6 @@ void daE_PH_c::De_Timer() {
     }
 }
 
-/* 807411C0-80741200 003E60 0040+00 1/1 0/0 0/0 .text            EyeSet__8daE_PH_cFv */
 void daE_PH_c::EyeSet() {
     eyePos = current.pos;
     eyePos.y += TREG_F(2);
@@ -1137,7 +1092,6 @@ void daE_PH_c::EyeSet() {
     attention_info.position.y = current.pos.y + 170.0f + TREG_F(1);
 }
 
-/* 80741200-80741268 003EA0 0068+00 1/1 0/0 0/0 .text            Delete__8daE_PH_cFv */
 int daE_PH_c::Delete() {
     dComIfG_resDelete(&mPhase, "E_PH");
     if (mInitializedHIO) {
@@ -1151,7 +1105,6 @@ int daE_PH_c::Delete() {
     return 1;
 }
 
-/* 80741268-807412E8 003F08 0080+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_PH_cFv */
 void daE_PH_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -1187,17 +1140,14 @@ int daE_PH_c::Draw() {
     return 1;
 }
 
-/* 807412E8-80741408 003F88 0120+00 1/0 0/0 0/0 .text            daE_PH_Draw__FP8daE_PH_c */
 static int daE_PH_Draw(daE_PH_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80741408-80741428 0040A8 0020+00 2/1 0/0 0/0 .text            daE_PH_Execute__FP8daE_PH_c */
 static int daE_PH_Execute(daE_PH_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80741428-80741A44 0040C8 061C+00 1/1 0/0 0/0 .text            create__8daE_PH_cFv */
 int daE_PH_c::create() {
     fopAcM_ct(this, daE_PH_c);
 
@@ -1336,19 +1286,16 @@ int daE_PH_c::create() {
     return phase_state;
 }
 
-/* 80741B44-80741B4C 0047E4 0008+00 1/0 0/0 0/0 .text            daE_PH_IsDelete__FP8daE_PH_c */
 static int daE_PH_IsDelete(daE_PH_c* i_this) {
     return 1;
 }
 
-/* 80741D1C-80741D3C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_PH_Method */
 static actor_method_class l_daE_PH_Method = {
     (process_method_func)daE_PH_Create,  (process_method_func)daE_PH_Delete,
     (process_method_func)daE_PH_Execute, (process_method_func)daE_PH_IsDelete,
     (process_method_func)daE_PH_Draw,
 };
 
-/* 80741D3C-80741D6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_PH */
 extern actor_process_profile_definition g_profile_E_PH = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp
index cf737a0731..f4eca05de1 100644
--- a/src/d/actor/d_a_e_pm.cpp
+++ b/src/d/actor/d_a_e_pm.cpp
@@ -22,8 +22,8 @@
 
 class daE_PM_HIO_c {
 public:
-    /* 80741EEC */ daE_PM_HIO_c();
-    /* 8074BA68 */ virtual ~daE_PM_HIO_c() {}
+    daE_PM_HIO_c();
+    virtual ~daE_PM_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mLampParticleScale;
@@ -128,14 +128,11 @@ enum Mode {
     /* 0x07 */ Mode7,
 };
 
-/* 8074C384-8074C388 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 8074C385 0003+00 data_8074C385 None */
 static bool hioInit;
 
-/* 8074C394-8074C3E0 000054 004C+00 11/13 0/0 0/0 .bss             l_HIO */
 static daE_PM_HIO_c l_HIO;
 
-/* 80741EEC-80741FB4 0000EC 00C8+00 1/1 0/0 0/0 .text            __ct__12daE_PM_HIO_cFv */
 daE_PM_HIO_c::daE_PM_HIO_c() {
     field_0x4 = -1;
     mLampParticleScale = 1.3f;
@@ -162,14 +159,12 @@ daE_PM_HIO_c::daE_PM_HIO_c() {
     field_0x48 = 4.0f;
 }
 
-/* 80741FB4-80742004 0001B4 0050+00 1/1 0/0 0/0 .text            DemoSkip__8daE_PM_cFi */
 void daE_PM_c::DemoSkip(int param_0) {
     cDmr_SkipInfo = 1;
     dComIfGp_getVibration().StopQuake(0x1f);
     SkipChk();
 }
 
-/* 80742004-80742038 000204 0034+00 2/2 0/0 0/0 .text            DemoSkipCallBack__8daE_PM_cFPvi */
 int daE_PM_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this != NULL) {
         static_cast<daE_PM_c*>(i_this)->DemoSkip(param_1);
@@ -178,7 +173,6 @@ int daE_PM_c::DemoSkipCallBack(void* i_this, int param_1) {
     return 0;
 }
 
-/* 80742038-80742388 000238 0350+00 1/1 0/0 0/0 .text            CreateHeap__8daE_PM_cFv */
 int daE_PM_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1d);
     mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
@@ -224,12 +218,10 @@ int daE_PM_c::CreateHeap() {
     return 1;
 }
 
-/* 807423D0-807423F0 0005D0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_PM_c*>(i_this)->CreateHeap();
 }
 
-/* 807423F0-80742448 0005F0 0058+00 2/2 0/0 0/0 .text            s_pm_sub__FPvPv */
 static void* s_pm_sub(void* i_proc, void* i_data) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM
                               && static_cast<daE_PM_c*>(i_proc)->SwitchChk() == 1) {
@@ -238,7 +230,6 @@ static void* s_pm_sub(void* i_proc, void* i_data) {
     return NULL;
 }
 
-/* 80742448-807424C0 000648 0078+00 1/1 0/0 0/0 .text            initCcCylinder__8daE_PM_cFv */
 void daE_PM_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -262,13 +253,11 @@ void daE_PM_c::initCcCylinder() {
     mCcCyl.OnTgSetBit();
 }
 
-/* 807424C0-80742508 0006C0 0048+00 1/1 0/0 0/0 .text            setCcCylinder__8daE_PM_cFv */
 void daE_PM_c::setCcCylinder() {
     mCcCyl.SetC(current.pos);
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80742508-807425B4 000708 00AC+00 1/1 0/0 0/0 .text ctrlJoint__8daE_PM_cFP8J3DJointP8J3DModel */
 int daE_PM_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
@@ -281,7 +270,6 @@ int daE_PM_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 807425B4-80742600 0007B4 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -293,12 +281,10 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80742600-80742674 000800 0074+00 6/6 0/0 0/0 .text            Particle_Set__8daE_PM_cFUs4cXyz */
 void daE_PM_c::Particle_Set(u16 i_id, cXyz i_pos) {
     dComIfGp_particle_set(i_id, &i_pos, &tevStr, &shape_angle, NULL);
 }
 
-/* 80742674-80742720 000874 00AC+00 20/20 0/0 0/0 .text            SetAnm__8daE_PM_cFiiff */
 void daE_PM_c::SetAnm(int i_anm, int i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", i_anm);
     mpMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f);
@@ -309,7 +295,6 @@ static void dummy() {
     delete (cM3dGPla*)NULL;
 }
 
-/* 80742768-80742810 000968 00A8+00 2/2 0/0 0/0 .text way_bg_check2__FP8daE_PM_c4cXyz4cXyz */
 static BOOL way_bg_check2(daE_PM_c* i_this, cXyz i_start, cXyz i_end) {
     dBgS_LinChk lin_chk;
     i_start.y += 30.0f;
@@ -321,7 +306,6 @@ static BOOL way_bg_check2(daE_PM_c* i_this, cXyz i_start, cXyz i_end) {
     }
 }
 
-/* 80742810-807428A8 000A10 0098+00 1/1 0/0 0/0 .text            Yazirushi__8daE_PM_cFv */
 void daE_PM_c::Yazirushi() {
     cXyz zero;
     MTXCopy(mpMorf->getModel()->getAnmMtx(JNT_HEAD), *calc_mtx);
@@ -331,7 +315,6 @@ void daE_PM_c::Yazirushi() {
     attention_info.position.y += 40.0f;
 }
 
-/* 807428A8-80742958 000AA8 00B0+00 1/1 0/0 0/0 .text            SearchRndP__8daE_PM_cFv */
 void daE_PM_c::SearchRndP() {
     int index;
     do {
@@ -343,18 +326,14 @@ void daE_PM_c::SearchRndP() {
 
 namespace {
 
-/* 8074C3E0-8074C3E4 0000A0 0004+00 2/5 0/0 0/0 .bss             s_dis__22@unnamed@d_a_e_pm_cpp@ */
 static f32 s_dis;
 
-/* 8074C3E4-8074C3E8 0000A4 0004+00 10/11 0/0 0/0 .bss s_LinkPos__22@unnamed@d_a_e_pm_cpp@ */
 static cXyz* s_LinkPos;
 
-/* 8074C3E8-8074C3EC 0000A8 0002+02 13/16 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_pm_cpp@ */
 static s16 s_TargetAngle;
 
 }  // namespace
 
-/* 80742958-80742C94 000B58 033C+00 1/1 0/0 0/0 .text            SearchFarP__8daE_PM_cFv */
 void daE_PM_c::SearchFarP() {
     //! @bug best_distance is not initialized
     f32 best_distance;
@@ -377,7 +356,6 @@ void daE_PM_c::SearchFarP() {
     mPoint = pnt->m_position;
 }
 
-/* 80742C94-80742E1C 000E94 0188+00 3/3 0/0 0/0 .text            SearchNearP__8daE_PM_cFv */
 void daE_PM_c::SearchNearP() {
     //! @bug Whatever this function is supposed to do is almost certainly not what it actually does.
     dPnt* pnt = dPath_GetPnt(mpPath, 0);
@@ -386,7 +364,6 @@ void daE_PM_c::SearchNearP() {
     }
 }
 
-/* 80742E1C-80742FB4 00101C 0198+00 2/2 0/0 0/0 .text            SearchNextPos__8daE_PM_cFv */
 BOOL daE_PM_c::SearchNextPos() {
     cXyz point(mPoint.x, mPoint.y, mPoint.z);
     if (current.pos.abs(point) < 100.0f) {
@@ -400,7 +377,6 @@ BOOL daE_PM_c::SearchNextPos() {
     return FALSE;
 }
 
-/* 80742FB4-807430C4 0011B4 0110+00 1/1 0/0 0/0 .text            SetGakkiEffect__8daE_PM_cFv */
 void daE_PM_c::SetGakkiEffect() {
     static u16 gakki_eff_id[3] = {0x8201, 0x8202, 0x8203};
     for (int i = 0; i < 3; i++) {
@@ -414,7 +390,6 @@ void daE_PM_c::SetGakkiEffect() {
     }
 }
 
-/* 807430C4-80743210 0012C4 014C+00 4/4 0/0 0/0 .text            CameraSet__8daE_PM_cFv */
 bool daE_PM_c::CameraSet() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* camera_body = dCam_getBody();
@@ -437,13 +412,11 @@ bool daE_PM_c::CameraSet() {
     return true;
 }
 
-/* 80743210-80743294 001410 0084+00 5/5 0/0 0/0 .text            SetStopingCam__8daE_PM_cFv */
 void daE_PM_c::SetStopingCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80743294-807433E8 001494 0154+00 6/6 0/0 0/0 .text            SetStopCam__8daE_PM_cF4cXyzffs */
 void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_angle) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz offset(0.0f, i_offsetY, i_offsetXZ);
@@ -458,7 +431,6 @@ void daE_PM_c::SetStopCam(cXyz i_center, f32 i_offsetXZ, f32 i_offsetY, s16 i_an
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 807433E8-80743524 0015E8 013C+00 1/1 0/0 0/0 .text            SetMoveCam2__8daE_PM_cFff */
 void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cLib_addCalcPos(&mCamCenterTarget2, mCamCenterTarget, i_scale * 2.0f, i_step * 2.0f, 0.0f);
@@ -468,7 +440,6 @@ void daE_PM_c::SetMoveCam2(f32 i_scale, f32 i_step) {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80743524-80743600 001724 00DC+00 9/9 0/0 0/0 .text            SetMoveCam__8daE_PM_cFff */
 void daE_PM_c::SetMoveCam(f32 i_scale, f32 i_step) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cLib_addCalcPos(&mCamCenter, mCamCenterTarget, i_scale, i_step, 0.0f);
@@ -476,7 +447,6 @@ void daE_PM_c::SetMoveCam(f32 i_scale, f32 i_step) {
     camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
 }
 
-/* 80743600-807436A4 001800 00A4+00 7/7 0/0 0/0 .text            SetReleaseCam__8daE_PM_cFv */
 void daE_PM_c::SetReleaseCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Reset(mCamCenter, mCamEye);
@@ -485,7 +455,6 @@ void daE_PM_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-/* 807436A4-80743D10 0018A4 066C+00 1/1 0/0 0/0 .text            Ap_StartAction__8daE_PM_cFv */
 void daE_PM_c::Ap_StartAction() {
     cXyz offset;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -620,7 +589,6 @@ void daE_PM_c::Ap_StartAction() {
     }
 }
 
-/* 80743D10-80743D8C 001F10 007C+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_proc, void* i_data) {
     for (int i = 0; i < 5; i++) {
         if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_PM && i_proc != NULL
@@ -631,7 +599,6 @@ static void* s_obj_sub(void* i_proc, void* i_data) {
     return NULL;
 }
 
-/* 80743D8C-807444F0 001F8C 0764+00 1/2 0/0 0/0 .text            Ap_CreateAction__8daE_PM_cFv */
 void daE_PM_c::Ap_CreateAction() {
     cXyz vec1;
     cXyz vec2(500.0f, 150.0f, 0.0f);
@@ -743,7 +710,6 @@ void daE_PM_c::Ap_CreateAction() {
     SetMoveCam(0.1f, 50.0f);
 }
 
-/* 807444F0-80744790 0026F0 02A0+00 1/1 0/0 0/0 .text            Ap_EscapeAction__8daE_PM_cFv */
 void daE_PM_c::Ap_EscapeAction() {
     cXyz point;
     SetMoveCam(0.1f, 50.0f);
@@ -804,7 +770,6 @@ void daE_PM_c::Ap_EscapeAction() {
     }
 }
 
-/* 80744790-80744878 002990 00E8+00 1/1 0/0 0/0 .text            AppearAction__8daE_PM_cFv */
 void daE_PM_c::AppearAction() {
     mTargetHeadAngleX = 0;
 
@@ -829,7 +794,6 @@ void daE_PM_c::AppearAction() {
     }
 }
 
-/* 80744878-80744DA0 002A78 0528+00 1/1 0/0 0/0 .text            DemoBeforeEscape__8daE_PM_cFv */
 void daE_PM_c::DemoBeforeEscape() {
     cXyz vec1, vec2;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -924,7 +888,6 @@ void daE_PM_c::DemoBeforeEscape() {
     mTargetAngleY = cLib_targetAngleY(&current.pos, &mCamEye);
 }
 
-/* 80744DA0-807453F4 002FA0 0654+00 1/1 0/0 0/0 .text            DemoAfterEscape__8daE_PM_cFv */
 void daE_PM_c::DemoAfterEscape() {
     cXyz vec1, vec2;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1042,7 +1005,6 @@ void daE_PM_c::DemoAfterEscape() {
     attention_info.position.y += 10000.0f;
 }
 
-/* 807453F4-80745438 0035F4 0044+00 1/1 0/0 0/0 .text            DemoMoveAction__8daE_PM_cFv */
 void daE_PM_c::DemoMoveAction() {
     switch (mMode) {
     case 0:
@@ -1054,7 +1016,6 @@ void daE_PM_c::DemoMoveAction() {
     }
 }
 
-/* 80745438-807455F4 003638 01BC+00 1/1 0/0 0/0 .text            WaitAction__8daE_PM_cFv */
 void daE_PM_c::WaitAction() {
     switch (mMode) {
     case 0:
@@ -1099,7 +1060,6 @@ void daE_PM_c::WaitAction() {
     }
 }
 
-/* 807455F4-807458F8 0037F4 0304+00 1/1 0/0 0/0 .text            GroundCheck__8daE_PM_cFv */
 void daE_PM_c::GroundCheck() {
     mTargetAngleY = s_TargetAngle + 0x8000;
 
@@ -1146,7 +1106,6 @@ void daE_PM_c::GroundCheck() {
     }
 }
 
-/* 80745970-80745C44 003B70 02D4+00 1/1 0/0 0/0 .text            EscapeAction__8daE_PM_cFv */
 void daE_PM_c::EscapeAction() {
     switch (mMode) {
     case 0:
@@ -1225,7 +1184,6 @@ void daE_PM_c::EscapeAction() {
     }
 }
 
-/* 80745C44-80745DBC 003E44 0178+00 1/1 0/0 0/0 .text            DeathAction__8daE_PM_cFv */
 void daE_PM_c::DeathAction() {
     switch (mMode) {
     case 0:
@@ -1258,7 +1216,6 @@ void daE_PM_c::DeathAction() {
     mTargetAngleY = s_TargetAngle;
 }
 
-/* 80745DBC-80745ED0 003FBC 0114+00 2/1 0/0 0/0 .text            Action__8daE_PM_cFv */
 void daE_PM_c::Action() {
     mTargetHeadAngleX = 0;
 
@@ -1302,7 +1259,6 @@ void daE_PM_c::Action() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80745ED0-80746624 0040D0 0754+00 2/1 0/0 0/0 .text            DemoBossStart2__8daE_PM_cFv */
 void daE_PM_c::DemoBossStart2() {
     daPy_py_c* player;
     bool bVar1 = false;
@@ -1474,7 +1430,6 @@ void daE_PM_c::DemoBossStart2() {
     }
 }
 
-/* 80746624-80747194 004824 0B70+00 2/1 0/0 0/0 .text            DemoBossStart__8daE_PM_cFv */
 void daE_PM_c::DemoBossStart() {
     bool bVar1 = false;
     cXyz vec1, vec2;
@@ -1682,7 +1637,6 @@ void daE_PM_c::DemoBossStart() {
     }
 }
 
-/* 80747194-80747500 005394 036C+00 1/1 0/0 0/0 .text            BossEscapeAction__8daE_PM_cFv */
 void daE_PM_c::BossEscapeAction() {
     cXyz vec1;
 
@@ -1739,7 +1693,6 @@ void daE_PM_c::BossEscapeAction() {
     }
 }
 
-/* 80747500-807476A0 005700 01A0+00 2/2 0/0 0/0 .text            s_boss_sub__FPvPv */
 static void* s_boss_sub(void* i_actor, void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(i_actor);
@@ -1754,7 +1707,6 @@ static void* s_boss_sub(void* i_actor, void* param_1) {
     return NULL;
 }
 
-/* 807476A0-80747F38 0058A0 0898+00 2/1 0/0 0/0 .text            BossDamageAction__8daE_PM_cFv */
 void daE_PM_c::BossDamageAction() {
     cXyz vec1, vec2, vec3, vec4;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1902,7 +1854,6 @@ void daE_PM_c::BossDamageAction() {
     }
 }
 
-/* 80747F38-807480A4 006138 016C+00 1/1 0/0 0/0 .text            BossWaitAction__8daE_PM_cFv */
 void daE_PM_c::BossWaitAction() {
     switch (mMode) {
     case 0:
@@ -1939,7 +1890,6 @@ void daE_PM_c::BossWaitAction() {
     }
 }
 
-/* 807480A4-80748964 0062A4 08C0+00 1/1 0/0 0/0 .text            BossDeathAction__8daE_PM_cFv */
 void daE_PM_c::BossDeathAction() {
     cXyz vec1, vec2, vec3;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2046,7 +1996,6 @@ void daE_PM_c::BossDeathAction() {
     }
 }
 
-/* 80748964-80748B18 006B64 01B4+00 2/1 0/0 0/0 .text            BossAction__8daE_PM_cFv */
 void daE_PM_c::BossAction() {
     mTargetHeadAngleX = 0;
 
@@ -2106,7 +2055,6 @@ void daE_PM_c::BossAction() {
     }
 }
 
-/* 80748B18-80748D74 006D18 025C+00 1/1 0/0 0/0 .text            Execute__8daE_PM_cFv */
 int daE_PM_c::Execute() {
     s_LinkPos = &fopAcM_GetPosition(daPy_getPlayerActorClass());
     s_TargetAngle = cLib_targetAngleY(&current.pos, s_LinkPos);
@@ -2142,7 +2090,6 @@ int daE_PM_c::Execute() {
     return 1;
 }
 
-/* 80748D74-8074954C 006F74 07D8+00 2/2 0/0 0/0 .text            StartAction__8daE_PM_cFv */
 void daE_PM_c::StartAction() {
     cXyz pos;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2292,8 +2239,6 @@ void daE_PM_c::StartAction() {
     }
 }
 
-/* 8074954C-807499C0 00774C 0474+00 4/4 0/0 0/0 .text            GakkiLoopAction__8daE_PM_cF4cXyzf
- */
 void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) {
     cXyz vec1(0.0f, 0.0f, 0.0f);
     cXyz vec2(0.0f, 0.0f, param_1);
@@ -2354,7 +2299,6 @@ void daE_PM_c::GakkiLoopAction(cXyz param_0, f32 param_1) {
     }
 }
 
-/* 807499C0-80749C0C 007BC0 024C+00 1/1 0/0 0/0 .text            DemoCreateAction__8daE_PM_cFv */
 void daE_PM_c::DemoCreateAction() {
     cXyz vec1, vec2, vec3;
     switch (mMode) {
@@ -2405,7 +2349,6 @@ void daE_PM_c::DemoCreateAction() {
     mTargetAngleY = s_TargetAngle;
 }
 
-/* 80749C0C-80749D9C 007E0C 0190+00 1/1 0/0 0/0 .text            CreateAction__8daE_PM_cFv */
 void daE_PM_c::CreateAction() {
     cXyz vec;
 
@@ -2441,7 +2384,6 @@ void daE_PM_c::CreateAction() {
     mTargetAngleY = s_TargetAngle;
 }
 
-/* 80749D9C-80749ED0 007F9C 0134+00 2/2 0/0 0/0 .text            CreateChk__8daE_PM_cFv */
 void daE_PM_c::CreateChk() {
     for (int i = 0; i < mPuppetNum; i++) {
         fopAc_ac_c* puppet = fopAcM_SearchByID(mPuppetID[i]);
@@ -2467,7 +2409,6 @@ void daE_PM_c::CreateChk() {
     }
 }
 
-/* 80749ED0-8074A14C 0080D0 027C+00 1/1 0/0 0/0 .text            LampAction__8daE_PM_cFv */
 void daE_PM_c::LampAction() {
     cXyz vec = mOldLampPosition - mLampPosition;
     f32 dist = vec.abs();
@@ -2478,7 +2419,6 @@ void daE_PM_c::LampAction() {
     mOldLampPosition = mLampPosition;
 }
 
-/* 8074A14C-8074A210 00834C 00C4+00 1/1 0/0 0/0 .text            DamageAction__8daE_PM_cFv */
 void daE_PM_c::DamageAction() {
     switch (mMode) {
     case 0:
@@ -2498,7 +2438,6 @@ void daE_PM_c::DamageAction() {
     mTargetAngleY = s_TargetAngle;
 }
 
-/* 8074A210-8074A3DC 008410 01CC+00 1/1 0/0 0/0 .text            At_Check__8daE_PM_cFv */
 void daE_PM_c::At_Check() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     mAtInfo.mpCollider = mCcCyl.GetTgHitObj();
@@ -2553,7 +2492,6 @@ void daE_PM_c::At_Check() {
     }
 }
 
-/* 8074A3DC-8074A644 0085DC 0268+00 2/2 0/0 0/0 .text            ObjHit__8daE_PM_cFv */
 void daE_PM_c::ObjHit() {
     mIFrameTimer--;
     if (mIFrameTimer <= 0) {
@@ -2616,7 +2554,6 @@ void daE_PM_c::ObjHit() {
     }
 }
 
-/* 8074A644-8074A6CC 008844 0088+00 1/1 0/0 0/0 .text            EyeMove__8daE_PM_cFv */
 void daE_PM_c::EyeMove() {
     if (mEyeAnmTimer == 0) {
         mEyeAnmTimer = cM_rndF(100.0f) + 30.0f;
@@ -2630,7 +2567,6 @@ void daE_PM_c::EyeMove() {
     }
 }
 
-/* 8074A6CC-8074AAC0 0088CC 03F4+00 1/1 0/0 0/0 .text            Draw__8daE_PM_cFv */
 int daE_PM_c::Draw() {
     if (mSecondEncounter && mBossLightOn) {
         GXColor color;
@@ -2683,7 +2619,6 @@ int daE_PM_c::Draw() {
     return 1;
 }
 
-/* 8074AAC0-8074AB28 008CC0 0068+00 1/1 0/0 0/0 .text            Delete__8daE_PM_cFv */
 int daE_PM_c::Delete() {
     dComIfG_resDelete(&mPhase, "E_PM");
     
@@ -2698,7 +2633,6 @@ int daE_PM_c::Delete() {
     return 1;
 }
 
-/* 8074AB28-8074ABA8 008D28 0080+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_PM_cFv */
 void daE_PM_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -2707,14 +2641,12 @@ void daE_PM_c::setBaseMtx() {
     mpEyeAnm->setFrame(mEyeAnmFrame);
 }
 
-/* 8074ABA8-8074AC10 008DA8 0068+00 1/1 0/0 0/0 .text            setGakkiBaseMtx__8daE_PM_cFv */
 void daE_PM_c::setGakkiBaseMtx() {
     mpTrumpetMorf->getModel()->setBaseTRMtx(mpMorf->getModel()->getAnmMtx(JNT_HAND_L));
     mpTrumpetMorf->play(NULL, 0, 0);
     mpTrumpetMorf->modelCalc();
 }
 
-/* 8074AC10-8074AE90 008E10 0280+00 1/1 0/0 0/0 .text            setLampBaseMtx__8daE_PM_cFv */
 void daE_PM_c::setLampBaseMtx() {
     cXyz vec1, vec2;
     MTXCopy(mpMorf->getModel()->getAnmMtx(JNT_HAND_R), *calc_mtx);
@@ -2745,27 +2677,22 @@ void daE_PM_c::setLampBaseMtx() {
     mpGlowEffectMorf->modelCalc();
 }
 
-/* 8074AE90-8074AEB0 009090 0020+00 1/0 0/0 0/0 .text            daE_PM_Draw__FP8daE_PM_c */
 static int daE_PM_Draw(daE_PM_c* i_this) {
     return i_this->Draw();
 }
 
-/* 8074AEB0-8074AED0 0090B0 0020+00 2/1 0/0 0/0 .text            daE_PM_Execute__FP8daE_PM_c */
 static int daE_PM_Execute(daE_PM_c* i_this) {
     return i_this->Execute();
 }
 
-/* 8074AED0-8074AED8 0090D0 0008+00 1/0 0/0 0/0 .text            daE_PM_IsDelete__FP8daE_PM_c */
 static int daE_PM_IsDelete(daE_PM_c* i_this) {
     return 1;
 }
 
-/* 8074AED8-8074AEF8 0090D8 0020+00 1/0 0/0 0/0 .text            daE_PM_Delete__FP8daE_PM_c */
 static int daE_PM_Delete(daE_PM_c* i_this) {
     return i_this->Delete();
 }
 
-/* 8074AEF8-8074B4DC 0090F8 05E4+00 1/1 0/0 0/0 .text            SkipChk__8daE_PM_cFv */
 void daE_PM_c::SkipChk() {
     fopAc_ac_c* puppet;
     cXyz vec1, vec2, vec3;
@@ -2864,7 +2791,6 @@ void daE_PM_c::SkipChk() {
     }
 }
 
-/* 8074B4DC-8074B834 0096DC 0358+00 1/1 0/0 0/0 .text            Create__8daE_PM_cFv */
 cPhs__Step daE_PM_c::Create() {
     fopAcM_ct(this, daE_PM_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "E_PM");
@@ -2926,14 +2852,12 @@ cPhs__Step daE_PM_c::Create() {
     return step;
 }
 
-/* 8074BA00-8074BA20 009C00 0020+00 1/0 0/0 0/0 .text            daE_PM_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_PM_Create(fopAc_ac_c* i_this) {
     return static_cast<daE_PM_c*>(i_this)->Create();
 }
 
 AUDIO_INSTANCES;
 
-/* 8074C23C-8074C25C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_PM_Method */
 static actor_method_class l_daE_PM_Method = {
     (process_method_func)daE_PM_Create,
     (process_method_func)daE_PM_Delete,
@@ -2942,7 +2866,6 @@ static actor_method_class l_daE_PM_Method = {
     (process_method_func)daE_PM_Draw,
 };
 
-/* 8074C25C-8074C28C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_PM */
 extern actor_process_profile_definition g_profile_E_PM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp
index d4278bc765..0e28a30c05 100644
--- a/src/d/actor/d_a_e_po.cpp
+++ b/src/d/actor/d_a_e_po.cpp
@@ -13,21 +13,17 @@
 #include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* ############################################################################################## */
 
-/* 80757ADA-80757ADC 000036 0002+00 6/7 0/0 0/0 .data            mAttackNo */
 static s16 mAttackNo = 3;
 
-/* 80757ADC-80757AE0 000038 0004+00 1/2 0/0 0/0 .data            mHaba */
 static f32 mHaba = 400.0f;
 
-/* 80757AE0-80757AE4 00003C 0002+02 2/4 0/0 0/0 .data            mRollHp */
 static s16 mRollHp = 90;
 
 class daE_PO_HIO_c {
 public:
-    /* 8074C54C */ daE_PO_HIO_c();
-    /* 80756DE8 */ virtual ~daE_PO_HIO_c() {}
+    daE_PO_HIO_c();
+    virtual ~daE_PO_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04[4];
     /* 0x08 */ f32 mBaseSize;
@@ -52,7 +48,6 @@ public:
     /* 0x38 */ f32 mModelSize;
 };
 
-/* 8074C54C-8074C5EC 0000EC 00A0+00 1/1 0/0 0/0 .text            __ct__12daE_PO_HIO_cFv */
 daE_PO_HIO_c::daE_PO_HIO_c() {
     field_0x04[0] = -1;
     mBaseSize = 1.2f;
@@ -76,19 +71,15 @@ daE_PO_HIO_c::daE_PO_HIO_c() {
     mModelSize = 1.0f;
 }
 
-/* 80757E5C-80757E98 000054 003C+00 9/11 0/0 0/0 .bss             l_HIO */
 static u8 l_HIOInit;
 static daE_PO_HIO_c l_HIO;
 
-/* 80757E98-80757E9C -00001 0004+00 0/1 0/0 0/0 .bss             None */
 static s16 mRollCount;
 static s16 mRollPlus;
 
-/* 80757E9C-80757EA0 -00001 0004+00 1/3 0/0 0/0 .bss             None */
 static s16 mRollDemoFlag;
 static s16 mHollDemoFlag;
 
-/* 8074C5EC-8074C660 00018C 0074+00 13/13 0/0 0/0 .text            mArg0Check */
 static int mArg0Check(e_po_class* i_this, s16 param_1) {
     if (param_1 != 0xFF) {
         return (param_1 == i_this->mArg0 ? 1 : 0);
@@ -105,16 +96,13 @@ static int mArg0Check(e_po_class* i_this, s16 param_1) {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 8074C660-8074C70C 000200 00AC+00 12/12 0/0 0/0 .text            anm_init__FP10e_po_classifUcf */
 static void anm_init(e_po_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_PO", i_index);
     i_this->mpMorf->setAnm(anm, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnmID = i_index;
 }
 
-/* 8074C70C-8074C858 0002AC 014C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -143,9 +131,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 8074C858-8074CCCC 0003F8 0474+00 1/0 0/0 0/0 .text            daE_PO_Draw__FP10e_po_class */
 static int daE_PO_Draw(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -228,9 +214,7 @@ static int daE_PO_Draw(e_po_class* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 8074CCCC-8074D16C 00086C 04A0+00 3/3 0/0 0/0 .text            e_po_opening__FP10e_po_class */
 static void e_po_opening(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -335,9 +319,7 @@ static void e_po_opening(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074D16C-8074D338 000D0C 01CC+00 1/1 0/0 0/0 .text            e_po_wait__FP10e_po_class */
 static void e_po_wait(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -380,9 +362,7 @@ static void e_po_wait(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074D338-8074D500 000ED8 01C8+00 1/1 0/0 0/0 .text            e_po_avoid__FP10e_po_class */
 static void e_po_avoid(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -420,9 +400,7 @@ static void e_po_avoid(e_po_class* i_this) {
     i_this->field_0x754 = 20;
 }
 
-/* ############################################################################################## */
 
-/* 8074D500-8074DC40 0010A0 0740+00 1/1 0/0 0/0 .text            e_po_search__FP10e_po_class */
 static void e_po_search(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -524,9 +502,7 @@ static void e_po_search(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074DC40-8074E168 0017E0 0528+00 1/1 0/0 0/0 .text            e_po_attack__FP10e_po_class */
 static void e_po_attack(e_po_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -623,9 +599,7 @@ static void e_po_attack(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074E168-8074E4EC 001D08 0384+00 1/1 0/0 0/0 .text            damage_check__FP10e_po_class */
 static void damage_check(e_po_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -709,9 +683,7 @@ static void damage_check(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074E4EC-8074E694 00208C 01A8+00 1/1 0/0 0/0 .text            e_po_damage__FP10e_po_class */
 static void e_po_damage(e_po_class* i_this) {
     i_this->field_0x754 = 10;
     switch (i_this->mType) {
@@ -750,7 +722,6 @@ static void e_po_damage(e_po_class* i_this) {
     cLib_addCalc0(&i_this->enemy.speedF, 1.0f, 2.0f);
 }
 
-/* 8074E694-8074EA6C 002234 03D8+00 1/1 0/0 0/0 .text            e_po_wolfbite__FP10e_po_class */
 static void e_po_wolfbite(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -831,9 +802,7 @@ static void e_po_wolfbite(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 8074EA6C-807501B0 00260C 1744+00 2/1 0/0 0/0 .text            e_po_dead__FP10e_po_class */
 static void e_po_dead(e_po_class* i_this) {
     static u16 particleNmaeDt[7] = {
         dPa_RM(ID_ZF_S_POFIREA01_XZSMK),
@@ -1334,9 +1303,7 @@ static void e_po_dead(e_po_class* i_this) {
     return;
 }
 
-/* ############################################################################################## */
 
-/* 807501B0-8075030C 003D50 015C+00 2/2 0/0 0/0 .text            e_rollingMove__FP10e_po_classsff */
 static f32 e_rollingMove(e_po_class* i_this, s16 param_1, f32 param_2, f32 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
@@ -1362,9 +1329,7 @@ static f32 e_rollingMove(e_po_class* i_this, s16 param_1, f32 param_2, f32 param
                            20.0f);
 }
 
-/* ############################################################################################## */
 
-/* 8075030C-80750E88 003EAC 0B7C+00 2/1 0/0 0/0 .text            e_po_limbering__FP10e_po_class */
 static void e_po_limbering(e_po_class* i_this) {
     cXyz local_48;
     cXyz local_54;
@@ -1597,9 +1562,7 @@ static void e_po_limbering(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 80750E88-80751408 004A28 0580+00 1/1 0/0 0/0 .text            e_po_roll_move__FP10e_po_class */
 static void e_po_roll_move(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     fopAc_ac_c* player_p = static_cast<fopAc_ac_c*>(dComIfGp_getPlayer(0));
@@ -1735,9 +1698,7 @@ static void e_po_roll_move(e_po_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.y, var_r4, 4, 0x800);
 }
 
-/* ############################################################################################## */
 
-/* 80751408-807549C0 004FA8 35B8+00 1/1 0/0 0/0 .text            e_po_holl_demo__FP10e_po_class */
 static void e_po_holl_demo(e_po_class* i_this) {
     static u16 holl_demo_eff_Dt[2] = {
         dPa_RM(ID_ZF_S_POFIRED00_GLOW),
@@ -2498,9 +2459,7 @@ static void e_po_holl_demo(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 80754AD8-807550EC 008678 0614+00 2/1 0/0 0/0 .text            action__FP10e_po_class */
 static void action(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2664,9 +2623,7 @@ static void action(e_po_class* i_this) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 807550EC-80755C00 008C8C 0B14+00 2/1 0/0 0/0 .text            daE_PO_Execute__FP10e_po_class */
 static int daE_PO_Execute(e_po_class* i_this) {
     static u8 po_bottleIn_dt[4] = {
         0xEF,
@@ -2868,19 +2825,15 @@ static int daE_PO_Execute(e_po_class* i_this) {
     return 1;
 }
 
-/* 80755C00-80755C04 0097A0 0004+00 1/1 0/0 0/0 .text
- * mPo_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void mPo_tgHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2,
                               dCcD_GObjInf* param_3) {
     /* empty function */
 }
 
-/* 80755C04-80755C0C 0097A4 0008+00 1/0 0/0 0/0 .text            daE_PO_IsDelete__FP10e_po_class */
 static int daE_PO_IsDelete(e_po_class* param_0) {
     return 1;
 }
 
-/* 80755C0C-80755C94 0097AC 0088+00 1/0 0/0 0/0 .text            daE_PO_Delete__FP10e_po_class */
 static int daE_PO_Delete(e_po_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
 
@@ -2895,7 +2848,6 @@ static int daE_PO_Delete(e_po_class* i_this) {
     return 1;
 }
 
-/* 80755C94-80756020 009834 038C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_po_class* a_this = (e_po_class*)i_this;
 
@@ -2950,9 +2902,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 80756020-80756900 009BC0 08E0+00 1/0 0/0 0/0 .text            daE_PO_Create__FP10fopAc_ac_c */
 static int daE_PO_Create(fopAc_ac_c* i_act_this) {
     e_po_class* i_this = (e_po_class*)i_act_this;
     fopAcM_ct(i_act_this, e_po_class);
@@ -3211,7 +3161,6 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) {
     return phase_state;
 }
 
-/* 80756900-80756B00 00A4A0 0200+00 1/1 0/0 0/0 .text            __ct__10e_po_classFv */
 e_po_class::e_po_class() {
     // empty method
 }
@@ -3222,7 +3171,6 @@ static actor_method_class l_daE_PO_Method = {
     (process_method_func)daE_PO_Draw,
 };
 
-/* 80757D20-80757D50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_PO */
 extern actor_process_profile_definition g_profile_E_PO = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp
index d34a5f8496..d8876d0974 100644
--- a/src/d/actor/d_a_e_pz.cpp
+++ b/src/d/actor/d_a_e_pz.cpp
@@ -17,8 +17,8 @@
 
 class daE_PZ_HIO_c : public JORReflexible {
 public:
-    /* 8075856C */ daE_PZ_HIO_c();
-    /* 80760C60 */ virtual ~daE_PZ_HIO_c() {}
+    daE_PZ_HIO_c();
+    virtual ~daE_PZ_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -32,8 +32,6 @@ public:
 };
 
 namespace {
-/* 807617F4-80761838 000038 0044+00 0/1 0/0 0/0 .data            cc_pz_src__22@unnamed@d_a_e_pz_cpp@
- */
 static dCcD_SrcCyl cc_pz_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8080002, 0x43}, 0x75}}, // mObj
@@ -48,7 +46,6 @@ static dCcD_SrcCyl cc_pz_src = {
     } // mCyl
 };
 
-/* 80761838-80761878 00007C 0040+00 0/1 0/0 0/0 .data cc_pz_at_src__22@unnamed@d_a_e_pz_cpp@ */
 static dCcD_SrcSph cc_pz_at_src = {
     {
         {0x0, {{0x400, 0x2, 0xD}, {0xD8FBFDFF, 0x43}, 0x0}}, // mObj
@@ -61,7 +58,6 @@ static dCcD_SrcSph cc_pz_at_src = {
     } // mSphAttr
 };
 
-/* 80761878-807618BC 0000BC 0044+00 0/1 0/0 0/0 .data cc_pz_wp_src__22@unnamed@d_a_e_pz_cpp@ */
 static dCcD_SrcCyl cc_pz_wp_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x416080, 0x3}, 0x0}}, // mObj
@@ -77,7 +73,6 @@ static dCcD_SrcCyl cc_pz_wp_src = {
 };
 }
 
-/* 8075856C-807585BC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_PZ_HIO_cFv */
 daE_PZ_HIO_c::daE_PZ_HIO_c() {
     no = -1;
     body_model_size = 1.0f;
@@ -88,7 +83,6 @@ daE_PZ_HIO_c::daE_PZ_HIO_c() {
     blur_start_timing = 40;
 }
 
-/* 807585BC-807587E0 00013C 0224+00 1/1 0/0 0/0 .text            draw__8daE_PZ_cFv */
 int daE_PZ_c::draw() {
     if (field_0x840 != 0) {
         return 1;
@@ -146,24 +140,20 @@ int daE_PZ_c::draw() {
     return 1;
 }
 
-/* 807587E0-80758800 000360 0020+00 1/0 0/0 0/0 .text            daE_PZ_Draw__FP8daE_PZ_c */
 static int daE_PZ_Draw(daE_PZ_c* i_this) {
     return i_this->draw();
 }
 
-/* 80758800-807588AC 000380 00AC+00 6/6 0/0 0/0 .text            setBck__8daE_PZ_cFiUcff */
 void daE_PZ_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 807588AC-807588B8 00042C 000C+00 7/7 0/0 0/0 .text            setActionMode__8daE_PZ_cFii */
 void daE_PZ_c::setActionMode(int i_action, int i_mode) {
     mActionMode = i_action;
     mMoveMode = i_mode;
 }
 
-/* 807588B8-80758A94 000438 01DC+00 4/4 0/0 0/0 .text            mEntrySUB__8daE_PZ_cFb */
 void daE_PZ_c::mEntrySUB(bool param_0) {
     cXyz eff_pos;
     eff_pos.set(current.pos);
@@ -202,7 +192,6 @@ static daE_PZ_HIO_c l_HIO;
 static u8 lbl_222_bss_70;
 static u8 lbl_222_bss_71;
 
-/* 80758A94-80758BA0 000614 010C+00 3/3 0/0 0/0 .text            mPzScaleSet__8daE_PZ_cFb */
 bool daE_PZ_c::mPzScaleSet(bool param_0) {
     if (!param_0) {
         cLib_addCalc2(&mPzScale.x, l_HIO.body_model_size, 0.7f, 1.0f);
@@ -225,7 +214,6 @@ bool daE_PZ_c::mPzScaleSet(bool param_0) {
     return true;
 }
 
-/* 80758BA0-80758D44 000720 01A4+00 1/1 0/0 0/0 .text            mEnemyScaleSet__8daE_PZ_cFv */
 void daE_PZ_c::mEnemyScaleSet() {
     if ((field_0x84c >= 7 || health <= 1) && (field_0x7d8 == 2 || health <= 1)) {
         for (int i = 0; i < 25; i++) {
@@ -255,7 +243,6 @@ void daE_PZ_c::mEnemyScaleSet() {
     }
 }
 
-/* 80758D44-80758DA4 0008C4 0060+00 2/1 0/0 0/0 .text            getCutType__8daE_PZ_cFv */
 u8 daE_PZ_c::getCutType() {
     switch(daPy_getPlayerActorClass()->getCutType()) {
     case daPy_py_c::CUT_TYPE_TURN_RIGHT:
@@ -291,7 +278,6 @@ u8 daE_PZ_c::getCutType() {
     }
 }
 
-/* 80758DA4-80758E04 000924 0060+00 1/1 0/0 0/0 .text            mSetFirePos__8daE_PZ_cFv */
 void daE_PZ_c::mSetFirePos() {
     fopAc_ac_c* parent;
     if (fopAcM_SearchByID(parentActorID, &parent) && parent != NULL) {
@@ -299,7 +285,6 @@ void daE_PZ_c::mSetFirePos() {
     }
 }
 
-/* 80758E04-8075923C 000984 0438+00 1/1 0/0 0/0 .text            damage_check__8daE_PZ_cFv */
 void daE_PZ_c::damage_check() {
     if (field_0x7d1 != 0 || mAnm == 0x13 || mPzScale.y != l_HIO.body_model_size || health <= 1) {
         mBombArrowHit = false;
@@ -394,7 +379,6 @@ void daE_PZ_c::damage_check() {
     mColliderStts.Move();
 }
 
-/* 8075923C-807592F4 000DBC 00B8+00 1/1 0/0 0/0 .text            s_PointSearch__FPvPv */
 static void* s_PointSearch(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_PZ && ((daE_PZ_c*)i_actor)->arg0 == 10) {
         ((daE_PZ_c*)i_data)->mPointPos[((daE_PZ_c*)i_data)->mPointNum].set(((daE_PZ_c*)i_actor)->current.pos);
@@ -409,7 +393,6 @@ static void* s_PointSearch(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807592F4-807593CC 000E74 00D8+00 1/1 0/0 0/0 .text            executeSearchPoint__8daE_PZ_cFv */
 void daE_PZ_c::executeSearchPoint() {
     if (field_0x7d3 == 0) {
         Z2GetAudioMgr()->subBgmStart(Z2BGM_P_ZANT);
@@ -427,7 +410,6 @@ void daE_PZ_c::executeSearchPoint() {
     }
 }
 
-/* 807593CC-8075B7CC 000F4C 2400+00 2/1 0/0 0/0 .text            executeOpeningDemo__8daE_PZ_cFv */
 void daE_PZ_c::executeOpeningDemo() {
     static cXyz mPzCenterInit_dt[] = {
         cXyz(-50.0f, 10.0f, -3150.0f),
@@ -1174,7 +1156,6 @@ void daE_PZ_c::executeOpeningDemo() {
     }
 }
 
-/* 8075B7E0-8075B970 003360 0190+00 1/1 0/0 0/0 .text            mPointerSet__8daE_PZ_cFv */
 void daE_PZ_c::mPointerSet() {
     u8 var_r30 = cM_rndF(mPointNum);
 
@@ -1205,7 +1186,6 @@ void daE_PZ_c::mPointerSet() {
     }
 }
 
-/* 8075B970-8075C6AC 0034F0 0D3C+00 2/1 0/0 0/0 .text            executeWait__8daE_PZ_cFv */
 void daE_PZ_c::executeWait() {
     daPy_py_c* sp18 = (daPy_py_c*)dComIfGp_getPlayer(0);
     fopAc_ac_c* sp14 = NULL;
@@ -1411,7 +1391,6 @@ void daE_PZ_c::executeWait() {
     }
 }
 
-/* 8075C6AC-8075CB80 00422C 04D4+00 1/1 0/0 0/0 .text            executeAttack__8daE_PZ_cFv */
 void daE_PZ_c::executeAttack() {
     int sp20 = 20;
 
@@ -1511,7 +1490,6 @@ void daE_PZ_c::executeAttack() {
     cLib_addCalcAngleS2(&current.angle.y, (s16)sp34.atan2sX_Z(), 4, 0x800);
 }
 
-/* 8075CB80-8075CE68 004700 02E8+00 1/1 0/0 0/0 .text            executeDamage__8daE_PZ_cFv */
 void daE_PZ_c::executeDamage() {
     switch (mMoveMode) {
     case 0:
@@ -1570,7 +1548,6 @@ void daE_PZ_c::executeDamage() {
     }
 }
 
-/* 8075CE68-8075D94C 0049E8 0AE4+00 2/1 0/0 0/0 .text            executeDead__8daE_PZ_cFv */
 void daE_PZ_c::executeDead() {
     camera_class* sp1C = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* sp18 = dComIfGp_getCamera(0);
@@ -1767,16 +1744,12 @@ void daE_PZ_c::executeDead() {
     }
 }
 
-/* 80761C28-80761C2C 00046C 0004+00 0/0 0/0 0/0 .data            eff_seed_id */
 static u16 eff_seed_id[] = {0x88A3, 0x88A4};
 
-/* 80761C2C-80761C34 000470 0006+02 0/1 0/0 0/0 .data            eff_summonBall_id */
 static u16 eff_summonBall_id[] = {0x8898, 0x8899, 0x889A};
 
-/* 80761C34-80761C38 000478 0004+00 0/1 0/0 0/0 .data            eff_summonBall2_id */
 static u16 eff_summonBall2_id[] = {0x8913, 0x8914};
 
-/* 80761C38-80761C3C 00047C 0004+00 0/0 0/0 0/0 .data            eff_summonShoot2_id */
 static u16 eff_summonShoot2_id[] = {0x8911, 0x8912};
 
 static const struct {
@@ -1792,13 +1765,11 @@ static const struct {
     {PROC_E_PZ, 0xFFFFFF28, 3},
 };
 
-/* 80761748-80761760 00024C 0018+00 0/0 0/0 0/0 .rodata          mDBaBa_birthAngle_dt */
 static const s16 mDBaBa_birthAngle_dt[] = {
     0x0000, 0x2AAA, 0x5554, 0x7FFE, 0xAAA8, 0xD552,
     0x1000, 0x3AAA, 0x6554, 0x8FFE, 0xBAA8, 0xE552,
 };
 
-/* 80761760-80761790 000264 0030+00 0/0 0/0 0/0 .rodata          mDBaBa_birthHani_dt */
 static const f32 mDBaBa_birthHani_dt[] = {
     600.0f,
     600.0f,
@@ -1814,8 +1785,6 @@ static const f32 mDBaBa_birthHani_dt[] = {
     1800.0f,
 };
 
-/* 8075D94C-8075F0BC 0054CC 1770+00 2/1 0/0 0/0 .text            executeSummonsBullet__8daE_PZ_cFv
- */
 void daE_PZ_c::executeSummonsBullet() {
     fopAc_ac_c* sp90 = dComIfGp_getPlayer(0);
     fopAc_ac_c* sp8C;
@@ -2158,7 +2127,6 @@ void daE_PZ_c::executeSummonsBullet() {
     }
 }
 
-/* 8075F0BC-8075F3A8 006C3C 02EC+00 1/1 0/0 0/0 .text            executeBullet__8daE_PZ_cFv */
 void daE_PZ_c::executeBullet() {
     cXyz mae;
     cXyz ato;
@@ -2205,7 +2173,6 @@ void daE_PZ_c::executeBullet() {
     }
 }
 
-/* 8075F3A8-8075F510 006F28 0168+00 1/1 0/0 0/0 .text            action__8daE_PZ_cFv */
 void daE_PZ_c::action() {
     field_0x7cc = l_HIO.body_model_size * (3.0f + BREG_F(1));
     damage_check();
@@ -2256,7 +2223,6 @@ void daE_PZ_c::action() {
     }
 }
 
-/* 8075F510-8075F578 007090 0068+00 1/1 0/0 0/0 .text            action_fire__8daE_PZ_cFv */
 void daE_PZ_c::action_fire() {
     if (mActionMode == 6) {
         executeSummonsBullet();
@@ -2269,7 +2235,6 @@ void daE_PZ_c::action_fire() {
     mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 8075F578-8075F734 0070F8 01BC+00 1/1 0/0 0/0 .text            fire_mtx_set__8daE_PZ_cFv */
 void daE_PZ_c::fire_mtx_set() {
     if (arg0 >= 20 && arg0 <= 23) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -2300,7 +2265,6 @@ void daE_PZ_c::fire_mtx_set() {
     }
 }
 
-/* 8075F734-8075F7E8 0072B4 00B4+00 1/1 0/0 0/0 .text            mtx_set__8daE_PZ_cFv */
 void daE_PZ_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -2315,7 +2279,6 @@ void daE_PZ_c::mtx_set() {
     mpModelMorf->modelCalc();
 }
 
-/* 8075F7E8-8075F964 007368 017C+00 1/1 0/0 0/0 .text            cc_set__8daE_PZ_cFv */
 void daE_PZ_c::cc_set() {
     cXyz mae;
     cXyz ato;
@@ -2347,7 +2310,6 @@ void daE_PZ_c::cc_set() {
     dComIfG_Ccsp()->Set(&mWarpCylCollider);
 }
 
-/* 8075F964-8075FA60 0074E4 00FC+00 1/1 0/0 0/0 .text            execute__8daE_PZ_cFv */
 int daE_PZ_c::execute() {
     if (arg0 == 10) {
         return 1;
@@ -2386,17 +2348,14 @@ int daE_PZ_c::execute() {
     return 1;
 }
 
-/* 8075FA60-8075FA80 0075E0 0020+00 2/1 0/0 0/0 .text            daE_PZ_Execute__FP8daE_PZ_c */
 static int daE_PZ_Execute(daE_PZ_c* i_this) {
     return i_this->execute();
 }
 
-/* 8075FA80-8075FA88 007600 0008+00 1/0 0/0 0/0 .text            daE_PZ_IsDelete__FP8daE_PZ_c */
 static int daE_PZ_IsDelete(daE_PZ_c* i_this) {
     return 1;
 }
 
-/* 8075FA88-8075FB2C 007608 00A4+00 1/1 0/0 0/0 .text            _delete__8daE_PZ_cFv */
 int daE_PZ_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_PZ");
     if (arg0 == 10) {
@@ -2419,12 +2378,10 @@ int daE_PZ_c::_delete() {
     return 1;
 }
 
-/* 8075FB2C-8075FB4C 0076AC 0020+00 1/0 0/0 0/0 .text            daE_PZ_Delete__FP8daE_PZ_c */
 static int daE_PZ_Delete(daE_PZ_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8075FB4C-807600A4 0076CC 0558+00 1/1 0/0 0/0 .text            CreateHeap__8daE_PZ_cFv */
 int daE_PZ_c::CreateHeap() {
     if (arg0 >= 20 && arg0 <= 23) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x18);
@@ -2504,12 +2461,10 @@ int daE_PZ_c::CreateHeap() {
     return 1;
 }
 
-/* 807600EC-8076010C 007C6C 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daE_PZ_c*)i_this)->CreateHeap();
 }
 
-/* 8076010C-807607EC 007C8C 06E0+00 1/1 0/0 0/0 .text            create__8daE_PZ_cFv */
 int daE_PZ_c::create() {
     fopAcM_ct(this, daE_PZ_c);
 
@@ -2686,15 +2641,12 @@ int daE_PZ_c::create() {
     return phase_state;
 }
 
-/* 807607EC-807609E0 00836C 01F4+00 1/1 0/0 0/0 .text            __ct__8daE_PZ_cFv */
 daE_PZ_c::daE_PZ_c() {}
 
-/* 80760BF8-80760C18 008778 0020+00 1/0 0/0 0/0 .text            daE_PZ_Create__FP8daE_PZ_c */
 static int daE_PZ_Create(daE_PZ_c* i_this) {
     return i_this->create();
 }
 
-/* 80761CE0-80761D00 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_PZ_Method */
 static actor_method_class l_daE_PZ_Method = {
     (process_method_func)daE_PZ_Create,
     (process_method_func)daE_PZ_Delete,
@@ -2703,7 +2655,6 @@ static actor_method_class l_daE_PZ_Method = {
     (process_method_func)daE_PZ_Draw,
 };
 
-/* 80761D00-80761D30 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_PZ */
 extern actor_process_profile_definition g_profile_E_PZ = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp
index f8057677f0..33b198bff2 100644
--- a/src/d/actor/d_a_e_rb.cpp
+++ b/src/d/actor/d_a_e_rb.cpp
@@ -11,8 +11,8 @@
 
 class daE_RB_HIO_c : public JORReflexible {
 public:
-    /* 8076238C */ daE_RB_HIO_c();
-    /* 80764838 */ virtual ~daE_RB_HIO_c() {}
+    daE_RB_HIO_c();
+    virtual ~daE_RB_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -32,26 +32,21 @@ enum daE_RB_ACTION {
     ACTION_DAMAGE = 10,
 };
 
-/* 8076238C-807623BC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__12daE_RB_HIO_cFv */
 daE_RB_HIO_c::daE_RB_HIO_c() {
     id = -1;
     base_size = 1.5f;
     ground_depth = -5.0f;
 }
 
-/* 807623BC-80762464 00011C 00A8+00 5/5 0/0 0/0 .text            anm_init__FP10e_rb_classifUcf */
 static void anm_init(e_rb_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->anm = i_anm;
     i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rb", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 80764F80-80764F84 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80764F90-80764FA0 000018 0010+00 8/8 0/0 0/0 .bss             l_HIO */
 static daE_RB_HIO_c l_HIO;
 
-/* 80762464-80762554 0001C4 00F0+00 1/0 0/0 0/0 .text            daE_RB_Draw__FP10e_rb_class */
 static int daE_RB_Draw(e_rb_class* i_this) {
     if (!i_this->isChild) {
         return 1;
@@ -74,7 +69,6 @@ static int daE_RB_Draw(e_rb_class* i_this) {
     return 1;
 }
 
-/* 80762554-80762764 0002B4 0210+00 1/1 0/0 0/0 .text            damage_check__FP10e_rb_class */
 static void damage_check(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
 
@@ -139,7 +133,6 @@ static void damage_check(e_rb_class* i_this) {
     }
 }
 
-/* 80762764-807627E4 0004C4 0080+00 1/1 0/0 0/0 .text            e_rb_stay__FP10e_rb_class */
 static void e_rb_stay(e_rb_class* i_this) {
     i_this->invincibilityTimer = 3;
 
@@ -154,7 +147,6 @@ static void e_rb_stay(e_rb_class* i_this) {
     }
 }
 
-/* 807627E4-807629D8 000544 01F4+00 1/1 0/0 0/0 .text            e_rb_appear__FP10e_rb_class */
 static s8 e_rb_appear(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
 
@@ -204,7 +196,6 @@ static s8 e_rb_appear(e_rb_class* i_this) {
     return 2;
 }
 
-/* 807629D8-80762C4C 000738 0274+00 1/1 0/0 0/0 .text            e_rb_move__FP10e_rb_class */
 static void e_rb_move(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -258,7 +249,6 @@ static void e_rb_move(e_rb_class* i_this) {
     i_this->sound.startCreatureSoundLevel(Z2SE_EN_RB_MOVE, enemy->speedF, -1);
 }
 
-/* 80762C4C-80762E90 0009AC 0244+00 1/1 0/0 0/0 .text            e_rb_attack__FP10e_rb_class */
 static void e_rb_attack(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     dComIfGp_getPlayer(0);
@@ -321,7 +311,6 @@ static void e_rb_attack(e_rb_class* i_this) {
     i_this->sound.startCreatureSoundLevel(Z2SE_EN_RB_MOVE, enemy->speedF, -1);
 }
 
-/* 80762E90-80762FD4 000BF0 0144+00 1/1 0/0 0/0 .text            e_rb_disappear__FP10e_rb_class */
 static s8 e_rb_disappear(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     s8 ret = 0;
@@ -354,7 +343,6 @@ static s8 e_rb_disappear(e_rb_class* i_this) {
     return ret;
 }
 
-/* 80762FD4-807631E0 000D34 020C+00 1/1 0/0 0/0 .text            e_rb_damage__FP10e_rb_class */
 static void e_rb_damage(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     i_this->invincibilityTimer = 10;
@@ -399,7 +387,6 @@ static void e_rb_damage(e_rb_class* i_this) {
     }
 }
 
-/* 807631E0-80763554 000F40 0374+00 2/1 0/0 0/0 .text            action__FP10e_rb_class */
 static void action(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     cXyz sp18;
@@ -503,7 +490,6 @@ static void action(e_rb_class* i_this) {
     }
 }
 
-/* 80763554-80763618 0012B4 00C4+00 1/1 0/0 0/0 .text            e_rb_base_0__FP10e_rb_class */
 static void e_rb_base_0(e_rb_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -516,13 +502,10 @@ static void e_rb_base_0(e_rb_class* i_this) {
     i_this->field_0xa10 = player->current.pos + (player->speed * (50.0f + hREG_F(13)));
 }
 
-/* 80764FA0-80764FC8 000028 0028+00 2/2 0/0 0/0 .bss             child */
 static e_rb_class* child[10];
 
-/* 80764FC8-80764FCC 000050 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80763618-807636BC 001378 00A4+00 1/1 0/0 0/0 .text            s_s_sub__FPvPv */
 static void* s_s_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* parent;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RB &&
@@ -536,7 +519,6 @@ static void* s_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807636BC-80763CF0 00141C 0634+00 1/1 0/0 0/0 .text            e_rb_base_1__FP10e_rb_class */
 static void e_rb_base_1(e_rb_class* i_this) {
     fopAc_ac_c* enemy = &i_this->enemy;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -667,7 +649,6 @@ static void e_rb_base_1(e_rb_class* i_this) {
     }
 }
 
-/* 80763DB0-80763DF4 001B10 0044+00 1/1 0/0 0/0 .text            e_rb_base__FP10e_rb_class */
 static void e_rb_base(e_rb_class* i_this) {
     switch (i_this->action) {
     case ACTION_STAY:
@@ -679,7 +660,6 @@ static void e_rb_base(e_rb_class* i_this) {
     }
 }
 
-/* 80763DF4-80764104 001B54 0310+00 2/1 0/0 0/0 .text            daE_RB_Execute__FP10e_rb_class */
 static int daE_RB_Execute(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     cXyz sp30;
@@ -752,12 +732,10 @@ static int daE_RB_Execute(e_rb_class* i_this) {
     return 1;
 }
 
-/* 80764104-8076410C 001E64 0008+00 1/0 0/0 0/0 .text            daE_RB_IsDelete__FP10e_rb_class */
 static int daE_RB_IsDelete(e_rb_class* i_this) {
     return 1;
 }
 
-/* 8076410C-80764174 001E6C 0068+00 1/0 0/0 0/0 .text            daE_RB_Delete__FP10e_rb_class */
 static int daE_RB_Delete(e_rb_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->enemy;
     fopAcM_GetID(i_this);
@@ -775,7 +753,6 @@ static int daE_RB_Delete(e_rb_class* i_this) {
     return 1;
 }
 
-/* 80764174-8076424C 001ED4 00D8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_rb_class* a_this = (e_rb_class*)i_this;
 
@@ -787,7 +764,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8076424C-80764624 001FAC 03D8+00 1/0 0/0 0/0 .text            daE_RB_Create__FP10fopAc_ac_c */
 static int daE_RB_Create(fopAc_ac_c* i_this) {
     e_rb_class* a_this = (e_rb_class*)i_this;
     fopAcM_ct(i_this, e_rb_class);
@@ -885,7 +861,6 @@ static int daE_RB_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80764E80-80764EA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_RB_Method */
 static actor_method_class l_daE_RB_Method = {
     (process_method_func)daE_RB_Create,
     (process_method_func)daE_RB_Delete,
@@ -894,7 +869,6 @@ static actor_method_class l_daE_RB_Method = {
     (process_method_func)daE_RB_Draw,
 };
 
-/* 80764EA0-80764ED0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_RB */
 extern actor_process_profile_definition g_profile_E_RB = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp
index a093feac26..ae8962bbf2 100644
--- a/src/d/actor/d_a_e_rd.cpp
+++ b/src/d/actor/d_a_e_rd.cpp
@@ -27,8 +27,8 @@
 
 class daE_RD_HIO_c : public JORReflexible {
 public:
-    /* 80504A6C */ daE_RD_HIO_c();
-    /* 8051801C */ virtual ~daE_RD_HIO_c() {}
+    daE_RD_HIO_c();
+    virtual ~daE_RD_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -204,7 +204,6 @@ enum Joint {
     /* 0x19 */ JNT_YUBIR,
 };
 
-/* 80504A6C-80504B20 0000EC 00B4+00 1/1 0/0 0/0 .text            __ct__12daE_RD_HIO_cFv */
 daE_RD_HIO_c::daE_RD_HIO_c() {
     field_0x4 = -1;
     model_size = 1.2f;
@@ -230,7 +229,6 @@ daE_RD_HIO_c::daE_RD_HIO_c() {
     jump_g = 5.0f;
 }
 
-/* 80504B20-80504BD4 0001A0 00B4+00 5/5 0/0 0/0 .text            get_pla__FP10fopAc_ac_c */
 static fopAc_ac_c* get_pla(fopAc_ac_c* a_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* actor = fopAcM_SearchByName(PROC_NPC_COACH);
@@ -251,7 +249,6 @@ static fopAc_ac_c* get_pla(fopAc_ac_c* a_this) {
     
 }
 
-/* 80504BD4-80504D28 000254 0154+00 36/36 0/0 0/0 .text            anm_init__FP10e_rd_classifUcf */
 static void anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) {
     if (i_this->field_0x680 == 0) {
         if (i_this->mBossMode != 0) {
@@ -272,7 +269,6 @@ static void anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32
     }
 }
 
-/* 80504D28-80504DDC 0003A8 00B4+00 2/2 0/0 0/0 .text            horn_anm_init__FP10e_rd_classifUcf */
 static void horn_anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode, f32 i_speed) {
     if (i_this->field_0x6a0 != 0) {
         i_this->mpMorfHornAnm->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_anmID),
@@ -280,7 +276,6 @@ static void horn_anm_init(e_rd_class* i_this, int i_anmID, f32 i_morf, u8 i_mode
     }
 }
 
-/* 80504DDC-805052F4 00045C 0518+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jointNo = i_joint->getJntNo();
@@ -368,7 +363,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 805052F4-80505404 000974 0110+00 1/1 0/0 0/0 .text            nodeCallBack_B__FP8J3DJointi */
 static int nodeCallBack_B(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jointNo = i_joint->getJntNo();
@@ -391,7 +385,6 @@ static int nodeCallBack_B(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80505404-805054CC 000A84 00C8+00 1/1 0/0 0/0 .text            nodeCallBack_bow__FP8J3DJointi */
 static int nodeCallBack_bow(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jointNo = i_joint->getJntNo();
@@ -409,7 +402,6 @@ static int nodeCallBack_bow(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 805054CC-805059A4 000B4C 04D8+00 1/0 0/0 0/0 .text            daE_RD_Draw__FP10e_rd_class */
 static int daE_RD_Draw(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     J3DModel* model;
@@ -525,7 +517,6 @@ static int daE_RD_Draw(e_rd_class* i_this) {
     return 1;
 }
 
-/* 805059A4-80505A94 001024 00F0+00 4/4 0/0 0/0 .text other_bg_check__FP10e_rd_classP10fopAc_ac_c */
 static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -547,7 +538,6 @@ static BOOL other_bg_check(e_rd_class* i_this, fopAc_ac_c* i_other) {
     return FALSE;
 }
 
-/* 80505A94-80505CD4 001114 0240+00 2/2 0/0 0/0 .text            otoCheck__FP10fopAc_ac_cf */
 static BOOL otoCheck(fopAc_ac_c* i_actor, f32 param_2) {
     SND_INFLUENCE* sound = dKy_Sound_get();
     fpc_ProcID uVar1;
@@ -573,7 +563,6 @@ static BOOL otoCheck(fopAc_ac_c* i_actor, f32 param_2) {
     return FALSE;
 }
 
-/* 80505CD4-80505D80 001354 00AC+00 1/1 0/0 0/0 .text            pl_pass_check__FP10e_rd_classf */
 static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* actor = get_pla(a_this);
@@ -590,13 +579,10 @@ static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 80519180-80519184 000048 0004+00 2/3 0/0 0/0 .bss             boss */
 static e_rd_class* boss;
 
-/* 80519184-80519188 00004C 0004+00 1/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80519194-805191E4 00005C 0050+00 14/18 0/0 0/0 .bss             l_HIO */
 static daE_RD_HIO_c l_HIO;
 
 /* 805191E4 0002+00 data_805191E4 S_find */
@@ -604,23 +590,18 @@ static s16 S_find;
 
 static s8 lbl_70_bss_AE;
 
-/* 805191F4-80519200 0000BC 000C+00 1/2 0/0 0/0 .bss             S_find_pos */
 static cXyz S_find_pos;
 
-/* 80519200-80519204 0000C8 0004+00 7/11 0/0 0/0 .bss             None */
 static u8 data_80519200;
 
 static u8 data_80519201;
 
-/* 80519204-8051922C 0000CC 0028+00 3/6 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[10];
 
-/* 8051922C-80519230 0000F4 0004+00 3/6 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
 static s8 data_80519230;
 
-/* 80505D80-80505DFC 001400 007C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && 
         !((dBomb_c*)i_actor)->checkStateExplode() && target_info_count < 10) {
@@ -631,7 +612,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80505DFC-80505E44 00147C 0048+00 2/2 0/0 0/0 .text            search_bomb__FP10e_rd_classi */
 static dBomb_c* search_bomb(e_rd_class* i_this, int param_2) {
     if ((i_this->field_0xa20 & 0x10000000) == 0) {
         return NULL;
@@ -645,7 +625,6 @@ static dBomb_c* search_bomb(e_rd_class* i_this, int param_2) {
     return NULL;
 }
 
-/* 80505E44-80505F50 0014C4 010C+00 3/3 0/0 0/0 .text            way_bg_check__FP10e_rd_classf */
 static BOOL way_bg_check(e_rd_class* i_this, f32 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -668,7 +647,6 @@ static BOOL way_bg_check(e_rd_class* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 80505F50-8050610C 0015D0 01BC+00 3/3 0/0 0/0 .text            ride_off__FP10e_rd_class */
 static void ride_off(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -714,7 +692,6 @@ static void ride_off(e_rd_class* i_this) {
     a_this->home.pos = a_this->current.pos;
 }
 
-/* 8050610C-805061DC 00178C 00D0+00 1/1 0/0 0/0 .text            s_wb_sub__FPvPv */
 static void* s_wb_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && ((e_wb_class*)i_actor)->mActionID != ACTION_DROP &&
         ((e_wb_class*)i_actor)->mActionID != ACTION_DAMAGE && ((e_wb_class*)i_actor)->mActionID != ACTION_A_DAMAGE && ((e_wb_class*)i_actor)->mActionID != ACTION_STAND) {
@@ -729,7 +706,6 @@ static void* s_wb_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 805061DC-8050642C 00185C 0250+00 2/2 0/0 0/0 .text            search_wb__FP10e_rd_classs */
 static fpc_ProcID search_wb(e_rd_class* i_this, s16 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -789,7 +765,6 @@ static fpc_ProcID search_wb(e_rd_class* i_this, s16 param_2) {
     return -1;
 }
 
-/* 8050642C-8050651C 001AAC 00F0+00 5/5 0/0 0/0 .text            wb_check__FP10e_rd_classs */
 static void wb_check(e_rd_class* i_this, s16 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -821,7 +796,6 @@ static void wb_check(e_rd_class* i_this, s16 param_2) {
     }
 }
 
-/* 8050651C-805065D4 001B9C 00B8+00 1/1 0/0 0/0 .text            wb_init_ride__FP10e_rd_class */
 static BOOL wb_init_ride(e_rd_class* i_this) {
     i_this->mWbActorID = search_wb(i_this, 1);
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -845,7 +819,6 @@ static BOOL wb_init_ride(e_rd_class* i_this) {
     return FALSE;
 }
 
-/* 805065D4-80506758 001C54 0184+00 10/10 0/0 0/0 .text            pl_check__FP10e_rd_classfs */
 static BOOL pl_check(e_rd_class* i_this, f32 param_2, s16 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* actor = get_pla(a_this);
@@ -881,17 +854,14 @@ static BOOL pl_check(e_rd_class* i_this, f32 param_2, s16 param_3) {
     return FALSE;
 }
 
-/* 80506758-8050677C 001DD8 0024+00 3/3 0/0 0/0 .text            bomb_view_check__FP10e_rd_class */
 static dBomb_c* bomb_view_check(e_rd_class* i_this) {
     return search_bomb(i_this, 1);
 }
 
-/* 8050677C-805067A0 001DFC 0024+00 1/1 0/0 0/0 .text            bomb_check__FP10e_rd_class */
 static dBomb_c* bomb_check(e_rd_class* i_this) {
     return search_bomb(i_this, 0);
 }
 
-/* 805067A0-80506890 001E20 00F0+00 5/5 0/0 0/0 .text            move_gake_check__FP10e_rd_classf */
 static BOOL move_gake_check(e_rd_class* i_this, f32 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -911,7 +881,6 @@ static BOOL move_gake_check(e_rd_class* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 80506890-80506A60 001F10 01D0+00 1/1 0/0 0/0 .text            way_check__FP10e_rd_class */
 static BOOL way_check(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz spac;
@@ -954,7 +923,6 @@ static BOOL way_check(e_rd_class* i_this) {
     return FALSE;
 }
 
-/* 80506A60-80506C8C 0020E0 022C+00 1/1 0/0 0/0 .text            path_check__FP10e_rd_class */
 static BOOL path_check(e_rd_class* i_this) {
     static u8 check_index[255];
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
@@ -1014,7 +982,6 @@ static BOOL path_check(e_rd_class* i_this) {
     return TRUE;
 }
 
-/* 80506C8C-80507144 00230C 04B8+00 1/1 0/0 0/0 .text            e_rd_normal__FP10e_rd_class */
 static void e_rd_normal(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1138,7 +1105,6 @@ static void e_rd_normal(e_rd_class* i_this) {
     }
 }
 
-/* 80507144-80507784 0027C4 0640+00 2/1 0/0 0/0 .text            e_rd_fight_run__FP10e_rd_class */
 static void e_rd_fight_run(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1302,7 +1268,6 @@ static void e_rd_fight_run(e_rd_class* i_this) {
     }
 }
 
-/* 80507784-805077E4 002E04 0060+00 1/1 0/0 0/0 .text            at_hit_check__FP10e_rd_class */
 static fopAc_ac_c* at_hit_check(e_rd_class* i_this) {
     if (i_this->mMode >= 10) {
         return NULL;
@@ -1315,7 +1280,6 @@ static fopAc_ac_c* at_hit_check(e_rd_class* i_this) {
     return NULL;
 }
 
-/* 805077E4-80507B90 002E64 03AC+00 1/1 0/0 0/0 .text            e_rd_fight__FP10e_rd_class */
 static void e_rd_fight(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp3c, sp48;
@@ -1413,7 +1377,6 @@ static void e_rd_fight(e_rd_class* i_this) {
     }
 }
 
-/* 80507B90-80507F98 003210 0408+00 2/1 0/0 0/0 .text            e_rd_bow_run__FP10e_rd_class */
 static void e_rd_bow_run(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     f32 fVar1 = 0.0f;
@@ -1517,7 +1480,6 @@ static void e_rd_bow_run(e_rd_class* i_this) {
     }
 }
 
-/* 80507F98-805082C8 003618 0330+00 1/1 0/0 0/0 .text            e_rd_bow__FP10e_rd_class */
 static void e_rd_bow(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     int frame = i_this->mpModelMorf->getFrame();
@@ -1590,7 +1552,6 @@ static void e_rd_bow(e_rd_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngleY, 4, 0x1000);
 }
 
-/* 805082C8-80508334 003948 006C+00 1/1 0/0 0/0 .text            s_command3_sub__FPvPv */
 static void* s_command3_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->mAction == ACTION_COMMANDER) {
         return i_actor;
@@ -1599,7 +1560,6 @@ static void* s_command3_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80508334-80508790 0039B4 045C+00 1/1 0/0 0/0 .text            e_rd_bow2__FP10e_rd_class */
 static s8 e_rd_bow2(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* actor = get_pla(a_this);
@@ -1702,7 +1662,6 @@ static s8 e_rd_bow2(e_rd_class* i_this) {
     return rv;
 }
 
-/* 80508790-80508A34 003E10 02A4+00 1/1 0/0 0/0 .text            e_rd_bow_ikki__FP10e_rd_class */
 static void e_rd_bow_ikki(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp2c;
@@ -1763,7 +1722,6 @@ static void e_rd_bow_ikki(e_rd_class* i_this) {
     a_this->current.angle.y = cM_atan2s(sp2c.x, sp2c.z);
 }
 
-/* 80508A34-80508B98 0040B4 0164+00 1/1 0/0 0/0 .text            e_rd_avoid__FP10e_rd_class */
 static void e_rd_avoid(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     int frame = i_this->mpModelMorf->getFrame();
@@ -1801,7 +1759,6 @@ static void e_rd_avoid(e_rd_class* i_this) {
     }
 }
 
-/* 80508B98-805096A0 004218 0B08+00 2/1 0/0 0/0 .text            e_rd_wb_search__FP10e_rd_class */
 static void e_rd_wb_search(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp54, sp60;
@@ -1988,7 +1945,6 @@ static void e_rd_wb_search(e_rd_class* i_this) {
     }
 }
 
-/* 805096A0-805098E4 004D20 0244+00 1/1 0/0 0/0 .text            e_rd_wb_ride__FP10e_rd_class */
 static void e_rd_wb_ride(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp1c, sp28;
@@ -2053,7 +2009,6 @@ static void e_rd_wb_ride(e_rd_class* i_this) {
     }
 }
 
-/* 805098E4-8050A3EC 004F64 0B08+00 2/1 0/0 0/0 .text            e_rd_wb_run__FP10e_rd_class */
 static void e_rd_wb_run(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp3c, sp48;
@@ -2306,7 +2261,6 @@ static void e_rd_wb_run(e_rd_class* i_this) {
     }
 }
 
-/* 8050A3EC-8050A578 005A6C 018C+00 1/1 0/0 0/0 .text            s_wbrun_sub__FPvPv */
 static void* s_wbrun_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) {
         e_wb_class* bullbo = (e_wb_class*)i_actor;
@@ -2321,7 +2275,6 @@ static void* s_wbrun_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050A578-8050A908 005BF8 0390+00 1/1 0/0 0/0 .text            e_rd_wb_run_B__FP10e_rd_class */
 static void e_rd_wb_run_B(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -2403,7 +2356,6 @@ static void e_rd_wb_run_B(e_rd_class* i_this) {
     }
 }
 
-/* 8050A908-8050AB1C 005F88 0214+00 1/1 0/0 0/0 .text            e_rd_wb_bjump__FP10e_rd_class */
 static void e_rd_wb_bjump(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -2448,7 +2400,6 @@ static void e_rd_wb_bjump(e_rd_class* i_this) {
     }
 }
 
-/* 8050AB1C-8050AF78 00619C 045C+00 2/1 0/0 0/0 .text            e_rd_bomb_action__FP10e_rd_class */
 static void e_rd_bomb_action(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp48, sp54;
@@ -2547,7 +2498,6 @@ static void e_rd_bomb_action(e_rd_class* i_this) {
     i_this->field_0x9d4 = bomb->current.pos;
 }
 
-/* 8050AF78-8050B0F4 0065F8 017C+00 1/1 0/0 0/0 .text            e_rd_s_damage__FP10e_rd_class */
 static void e_rd_s_damage(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2592,7 +2542,6 @@ static void e_rd_s_damage(e_rd_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8050B0F4-8050B2A8 006774 01B4+00 1/1 0/0 0/0 .text            kado_check__FP10e_rd_class */
 static int kado_check(e_rd_class* i_this) {
     static int kado_bit[2] = {
         1, 2,
@@ -2634,7 +2583,6 @@ static int kado_check(e_rd_class* i_this) {
     return rv;
 }
 
-/* 8050B2A8-8050B3E8 006928 0140+00 3/3 0/0 0/0 .text            rd_disappear__FP10e_rd_class */
 static void rd_disappear(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp1c, sp28;
@@ -2668,7 +2616,6 @@ static void rd_disappear(e_rd_class* i_this) {
     }
 }
 
-/* 8050B3E8-8050B53C 006A68 0154+00 1/1 0/0 0/0 .text            body_gake__FP10e_rd_class */
 static BOOL body_gake(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -2690,7 +2637,6 @@ static BOOL body_gake(e_rd_class* i_this) {
     return FALSE;
 }
 
-/* 8050B5B4-8050C12C 006C34 0B78+00 2/1 0/0 0/0 .text            e_rd_damage__FP10e_rd_class */
 static void e_rd_damage(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -3023,7 +2969,6 @@ static void e_rd_damage(e_rd_class* i_this) {
     }
 }
 
-/* 8050C12C-8050C2D8 0077AC 01AC+00 1/1 0/0 0/0 .text            gake_check__FP10e_rd_classf */
 static s16 gake_check(e_rd_class* i_this, f32 param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -3053,7 +2998,6 @@ static s16 gake_check(e_rd_class* i_this, f32 param_2) {
     return a_this->shape_angle.y;
 }
 
-/* 8050C2D8-8050C4B0 007958 01D8+00 1/1 0/0 0/0 .text            s_bikkuri_sub__FPvPv */
 static void* s_bikkuri_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data) {
         if (((e_rd_class*)i_actor)->mAction == ACTION_BOW3 && ((e_rd_class*)i_actor)->mMode <= 2) {
@@ -3069,7 +3013,6 @@ static void* s_bikkuri_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050C4B0-8050C630 007B30 0180+00 1/1 0/0 0/0 .text            s_saku_sub__FPvPv */
 static void* s_saku_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_H_Saku) {
         cXyz sp14 = ((daObjH_Saku_c*)i_actor)->field_0x5e0 - ((fopAc_ac_c*)i_data)->current.pos;
@@ -3081,7 +3024,6 @@ static void* s_saku_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050C630-8050CA64 007CB0 0434+00 1/1 0/0 0/0 .text            e_rd_drop__FP10e_rd_class */
 static void e_rd_drop(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     f32 fVar1 = 0.0f;
@@ -3186,7 +3128,6 @@ static void e_rd_drop(e_rd_class* i_this) {
     cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 3.0f);
 }
 
-/* 8050CA64-8050CB70 0080E4 010C+00 1/1 0/0 0/0 .text            e_rd_a_damage__FP10e_rd_class */
 static void e_rd_a_damage(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3217,7 +3158,6 @@ static void e_rd_a_damage(e_rd_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8050CB70-8050CD4C 0081F0 01DC+00 1/1 0/0 0/0 .text            e_rd_stand__FP10e_rd_class */
 static void e_rd_stand(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3265,7 +3205,6 @@ static void e_rd_stand(e_rd_class* i_this) {
     }
 }
 
-/* 8050CD4C-8050D168 0083CC 041C+00 2/1 0/0 0/0 .text            e_rd_bow3__FP10e_rd_class */
 static s8 e_rd_bow3(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3377,7 +3316,6 @@ static s8 e_rd_bow3(e_rd_class* i_this) {
     return 0;
 }
 
-/* 8050D168-8050D1F4 0087E8 008C+00 1/1 0/0 0/0 .text            s_command2_sub__FPvPv */
 static void* s_command2_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->mAction == ACTION_BOW3 && ((e_rd_class*)i_actor)->mMode < 10) {
         ((e_rd_class*)i_actor)->field_0x990[0] = cM_rndF(10.0f) + 10.0f;
@@ -3387,7 +3325,6 @@ static void* s_command2_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050D1F4-8050D260 008874 006C+00 1/1 0/0 0/0 .text            s_command4_sub__FPvPv */
 static void* s_command4_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && i_actor != i_data && ((e_rd_class*)i_actor)->mAction == ACTION_BOW3) {
         return i_actor;
@@ -3396,7 +3333,6 @@ static void* s_command4_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050D260-8050D6B4 0088E0 0454+00 2/1 0/0 0/0 .text            e_rd_commander__FP10e_rd_class */
 static void e_rd_commander(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s8 bVar1 = 0;
@@ -3506,7 +3442,6 @@ static void e_rd_commander(e_rd_class* i_this) {
     }
 }
 
-/* 8050D6B4-8050DAB8 008D34 0404+00 1/1 0/0 0/0 .text            e_rd_excite__FP10e_rd_class */
 static void e_rd_excite(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp40;
@@ -3574,7 +3509,6 @@ static void e_rd_excite(e_rd_class* i_this) {
     cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f);
 }
 
-/* 8050DAB8-8050DC10 009138 0158+00 1/1 0/0 0/0 .text            e_rd_water__FP10e_rd_class */
 static void e_rd_water(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp28;
@@ -3620,7 +3554,6 @@ static void e_rd_water(e_rd_class* i_this) {
     }
 }
 
-/* 8050DC10-8050DE00 009290 01F0+00 2/1 0/0 0/0 .text            e_rd_kiba_start__FP10e_rd_class */
 static void e_rd_kiba_start(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3667,7 +3600,6 @@ static void e_rd_kiba_start(e_rd_class* i_this) {
     }
 }
 
-/* 8050DE00-8050DF38 009480 0138+00 1/1 0/0 0/0 .text            e_rd_ikki2_start__FP10e_rd_class */
 static void e_rd_ikki2_start(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3699,7 +3631,6 @@ static void e_rd_ikki2_start(e_rd_class* i_this) {
     }
 }
 
-/* 8050DF38-8050E214 0095B8 02DC+00 1/1 0/0 0/0 .text            e_rd_kiba_end__FP10e_rd_class */
 static void e_rd_kiba_end(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -3777,7 +3708,6 @@ static void e_rd_kiba_end(e_rd_class* i_this) {
     }
 }
 
-/* 8050E214-8050E430 009894 021C+00 1/1 0/0 0/0 .text            e_rd_ikki_end__FP10e_rd_class */
 static void e_rd_ikki_end(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -3829,7 +3759,6 @@ static void e_rd_ikki_end(e_rd_class* i_this) {
     }
 }
 
-/* 8050E430-8050E668 009AB0 0238+00 1/1 0/0 0/0 .text            e_rd_ikki2_end__FP10e_rd_class */
 static void e_rd_ikki2_end(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -3883,7 +3812,6 @@ static void e_rd_ikki2_end(e_rd_class* i_this) {
     }
 }
 
-/* 8050E668-8050E6B4 009CE8 004C+00 1/1 0/0 0/0 .text            s_rdb_sub__FPvPv */
 static void* s_rdb_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RDB) {
         return i_actor;
@@ -3892,7 +3820,6 @@ static void* s_rdb_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050E6B4-8050E8F0 009D34 023C+00 1/1 0/0 0/0 .text            e_rd_lv9_end__FP10e_rd_class */
 static void e_rd_lv9_end(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID);
@@ -3947,7 +3874,6 @@ static void e_rd_lv9_end(e_rd_class* i_this) {
     }
 }
 
-/* 8050E8F0-8050E948 009F70 0058+00 1/1 0/0 0/0 .text            s_boom_sub__FPvPv */
 static void* s_boom_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x99a != 0) {
         return i_actor;
@@ -3956,7 +3882,6 @@ static void* s_boom_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050E948-8050E9E8 009FC8 00A0+00 1/1 0/0 0/0 .text            wolfkick_damage__FP10e_rd_class */
 static void wolfkick_damage(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3971,7 +3896,6 @@ static void wolfkick_damage(e_rd_class* i_this) {
     i_this->field_0x998 = 1000;
 }
 
-/* 8050E9E8-8050EBF8 00A068 0210+00 1/1 0/0 0/0 .text            big_damage__FP10e_rd_class */
 static void big_damage(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -4021,7 +3945,6 @@ static void big_damage(e_rd_class* i_this) {
 
 }
 
-/* 8050EBF8-8050ED28 00A278 0130+00 1/1 0/0 0/0 .text            small_damage__FP10e_rd_classi */
 static void small_damage(e_rd_class* i_this, int param_2) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -4050,7 +3973,6 @@ static void small_damage(e_rd_class* i_this, int param_2) {
     i_this->field_0x9f4 = i_this->mAtInfo.mHitDirection.y;
 }
 
-/* 8050ED28-8050EEC0 00A3A8 0198+00 1/1 0/0 0/0 .text            part_break__FP10e_rd_class */
 static void part_break(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -4082,7 +4004,6 @@ static void part_break(e_rd_class* i_this) {
     }
 }
 
-/* 8050EEC0-8050FADC 00A540 0C1C+00 1/2 0/0 0/0 .text            damage_check__FP10e_rd_class */
 static void damage_check(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -4391,7 +4312,6 @@ static void damage_check(e_rd_class* i_this) {
     }
 }
 
-/* 8050FADC-8050FB34 00B15C 0058+00 1/1 0/0 0/0 .text            s_other_sub__FPvPv */
 static void* s_other_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5b7 != 6) {
         return i_actor;
@@ -4400,7 +4320,6 @@ static void* s_other_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050FB34-8050FC04 00B1B4 00D0+00 1/1 0/0 0/0 .text            s_ep_sub__FPvPv */
 static void* s_ep_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     
@@ -4418,7 +4337,6 @@ static void* s_ep_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8050FC04-80510250 00B284 064C+00 2/1 0/0 0/0 .text            e_rd_yagura__FP10e_rd_class */
 static s8 e_rd_yagura(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     int frame = i_this->mpModelMorf->getFrame();
@@ -4559,7 +4477,6 @@ static s8 e_rd_yagura(e_rd_class* i_this) {
     return rv;
 }
 
-/* 80510250-80510734 00B8D0 04E4+00 1/1 0/0 0/0 .text            e_rd_jyunkai__FP10e_rd_class */
 static void e_rd_jyunkai(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     f32 fVar1 = 0.0f;
@@ -4668,7 +4585,6 @@ static void e_rd_jyunkai(e_rd_class* i_this) {
     }
 }
 
-/* 80510734-80510B34 00BDB4 0400+00 2/1 0/0 0/0 .text            e_rd_sleep__FP10e_rd_class */
 static void e_rd_sleep(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     int frame = i_this->mpModelMorf->getFrame();
@@ -4783,10 +4699,8 @@ static void e_rd_sleep(e_rd_class* i_this) {
     }
 }
 
-/* 80519334-80519338 0001FC 0004+00 2/2 0/0 0/0 .bss             rd_count */
 static int rd_count;
 
-/* 80510B34-80510B98 00C1B4 0064+00 1/1 0/0 0/0 .text            s_tag_sub__FPvPv */
 static void* s_tag_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5ba != 0) {
         rd_count++;
@@ -4795,7 +4709,6 @@ static void* s_tag_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80510B98-80510D2C 00C218 0194+00 1/1 0/0 0/0 .text            e_rd_tag__FP10e_rd_class */
 static void e_rd_tag(e_rd_class* i_this) {
     // FAKEMATCH
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
@@ -4832,7 +4745,6 @@ static void e_rd_tag(e_rd_class* i_this) {
     }
 }
 
-/* 80510D2C-80510DEC 00C3AC 00C0+00 1/1 0/0 0/0 .text            e_rd_reg__FP10e_rd_class */
 static void e_rd_reg(e_rd_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -4866,7 +4778,6 @@ static void e_rd_reg(e_rd_class* i_this) {
     }
 }
 
-/* 80510DEC-80512914 00C46C 1B28+00 2/1 0/0 0/0 .text            action__FP10e_rd_class */
 static void action(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* actor = get_pla(a_this);
@@ -5541,7 +5452,6 @@ static void action(e_rd_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &sp2d4);
 }
 
-/* 80512914-80512B40 00DF94 022C+00 1/1 0/0 0/0 .text            fire_eff_set__FP10e_rd_class */
 static void fire_eff_set(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp48, sp54;
@@ -5587,7 +5497,6 @@ static void fire_eff_set(e_rd_class* i_this) {
     }
 }
 
-/* 80512B40-80512BB0 00E1C0 0070+00 1/1 0/0 0/0 .text            s_wb_sub2__FPvPv */
 static void* s_wb_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && target_info_count < 2) {
         target_info[target_info_count] = (fopAc_ac_c*)i_actor;
@@ -5597,7 +5506,6 @@ static void* s_wb_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512BB0-80512C10 00E230 0060+00 1/1 0/0 0/0 .text            s_lv9dn_sub__FPvPv */
 static void* s_lv9dn_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->field_0x10d8 != 0) {
         ((e_dn_class*)i_actor)->field_0x10d8 = 0;
@@ -5607,7 +5515,6 @@ static void* s_lv9dn_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512C10-80512C70 00E290 0060+00 1/1 0/0 0/0 .text            s_lv9dn_sub2__FPvPv */
 static void* s_lv9dn_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN && ((e_dn_class*)i_actor)->field_0x10d8 == 0) {
         ((e_dn_class*)i_actor)->field_0x10d8 = 1;
@@ -5617,7 +5524,6 @@ static void* s_lv9dn_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512C70-80512CBC 00E2F0 004C+00 1/1 0/0 0/0 .text            s_lv9dn_sub3__FPvPv */
 static void* s_lv9dn_sub3(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) {
         ((e_dn_class*)i_actor)->mMode = 2;
@@ -5626,7 +5532,6 @@ static void* s_lv9dn_sub3(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512CBC-80512D14 00E33C 0058+00 1/1 0/0 0/0 .text            s_lv9rd_sub__FPvPv */
 static void* s_lv9rd_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0xafb != 0) {
         ((e_rd_class*)i_actor)->field_0xafb = 0;
@@ -5635,10 +5540,8 @@ static void* s_lv9rd_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80519338-8051933C 000200 0004+00 1/1 0/0 0/0 .bss             None */
 static u8 data_80519338;
 
-/* 80512D14-80512E08 00E394 00F4+00 1/1 0/0 0/0 .text            s_lv9rd_sub2__FPvPv */
 static void* s_lv9rd_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && ((e_rd_class*)i_actor)->field_0x5b7 == data_80519338 && ((e_rd_class*)i_actor)->mAction != ACTION_DROP) {
         e_rd_class* i_this = (e_rd_class*)i_actor;
@@ -5657,7 +5560,6 @@ static void* s_lv9rd_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512E08-80512E74 00E488 006C+00 1/1 0/0 0/0 .text            s_lv9rd_sub3__FPvPv */
 static void* s_lv9rd_sub3(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && (((e_rd_class*)i_actor)->field_0x5b7 == 13 || ((e_rd_class*)i_actor)->field_0x5b7 == 14)) {
         ((e_rd_class*)i_actor)->field_0x9a4 = 1;
@@ -5667,7 +5569,6 @@ static void* s_lv9rd_sub3(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512E74-80512EC0 00E4F4 004C+00 1/1 0/0 0/0 .text            s_lv9arrow_sub__FPvPv */
 static void* s_lv9arrow_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) {
         ((e_arrow_class*)i_actor)->field_0xa14 = 1;
@@ -5676,7 +5577,6 @@ static void* s_lv9arrow_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512EC0-80512F18 00E540 0058+00 1/1 0/0 0/0 .text            s_lv9arrow_sub2__FPvPv */
 static void* s_lv9arrow_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ARROW) {
         ((e_arrow_class*)i_actor)->field_0xa14 = 0;
@@ -5687,7 +5587,6 @@ static void* s_lv9arrow_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80512F18-80512FFC 00E598 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_rd_classf */
 static void cam_3d_morf(e_rd_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->field_0x12cc.x, param_2, i_this->field_0x12e4.x * i_this->field_0x130c);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->field_0x12cc.y, param_2, i_this->field_0x12e4.y * i_this->field_0x130c);
@@ -5697,7 +5596,6 @@ static void cam_3d_morf(e_rd_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->field_0x12c0.z, param_2, i_this->field_0x12d8.z * i_this->field_0x130c);
 }
 
-/* 80512FFC-8051309C 00E67C 00A0+00 1/1 0/0 0/0 .text            cam_spd_set__FP10e_rd_class */
 static void cam_spd_set(e_rd_class* i_this) {
     i_this->field_0x12d8.x = fabsf(i_this->field_0x12c0.x - i_this->mDemoCamEye.x);
     i_this->field_0x12d8.y = fabsf(i_this->field_0x12c0.y - i_this->mDemoCamEye.y);
@@ -5708,7 +5606,6 @@ static void cam_spd_set(e_rd_class* i_this) {
     i_this->field_0x130c = 0.0f;
 }
 
-/* 8051309C-80514640 00E71C 15A4+00 2/1 0/0 0/0 .text            demo_camera__FP10e_rd_class */
 static void demo_camera(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -6236,10 +6133,8 @@ static void demo_camera(e_rd_class* i_this) {
     }
 }
 
-/* 8051933C-80519340 000204 0004+00 0/2 0/0 0/0 .bss             c_start */
 static int c_start;
 
-/* 80514640-805163C0 00FCC0 1D80+00 2/1 0/0 0/0 .text            daE_RD_Execute__FP10e_rd_class */
 static int daE_RD_Execute(e_rd_class* i_this) {
     if (c_start == 0 && dComIfGp_event_runCheck()) {
         if (data_80519201 != 0) {
@@ -6900,12 +6795,10 @@ static u8 jv_offset[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 805164D4-805164DC 011B54 0008+00 1/0 0/0 0/0 .text            daE_RD_IsDelete__FP10e_rd_class */
 static int daE_RD_IsDelete(e_rd_class* i_this) {
     return 1;
 }
 
-/* 805164DC-80516540 011B5C 0064+00 1/0 0/0 0/0 .text            daE_RD_Delete__FP10e_rd_class */
 static int daE_RD_Delete(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -6921,7 +6814,6 @@ static int daE_RD_Delete(e_rd_class* i_this) {
     return 1;
 }
 
-/* 80516540-80516980 011BC0 0440+00 1/1 0/0 0/0 .text            ride_game_actor_set__FP10e_rd_class */
 static void ride_game_actor_set(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -6988,7 +6880,6 @@ static void ride_game_actor_set(e_rd_class* i_this) {
     }
 }
 
-/* 80516980-80516B04 012000 0184+00 1/1 0/0 0/0 .text coach_game_actor_set__FP10e_rd_class */
 static void coach_game_actor_set(e_rd_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -7013,7 +6904,6 @@ static void coach_game_actor_set(e_rd_class* i_this) {
 
 static s8 instanceCount;
 
-/* 80516B04-805171FC 012184 06F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_rd_class* i_this = (e_rd_class*)a_this;
     J3DModel* model;
@@ -7161,7 +7051,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 805171FC-80517AE0 01287C 08E4+00 1/0 0/0 0/0 .text            daE_RD_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
     e_rd_class* i_this = (e_rd_class*)a_this;
 
@@ -7471,12 +7360,10 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80517AE0-80517CB0 013160 01D0+00 1/1 0/0 0/0 .text            __ct__10e_rd_classFv */
 e_rd_class::e_rd_class() {}
 
 AUDIO_INSTANCES
 
-/* 80519048-80519068 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_RD_Method */
 static actor_method_class l_daE_RD_Method = {
     (process_method_func)daE_RD_Create,
     (process_method_func)daE_RD_Delete,
@@ -7485,7 +7372,6 @@ static actor_method_class l_daE_RD_Method = {
     (process_method_func)daE_RD_Draw,
 };
 
-/* 80519068-80519098 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_RD */
 extern actor_process_profile_definition g_profile_E_RD = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp
index b9e5af80e2..7b5f083b32 100644
--- a/src/d/actor/d_a_e_rdb.cpp
+++ b/src/d/actor/d_a_e_rdb.cpp
@@ -17,8 +17,8 @@
 
 class daE_RDB_HIO_c : public JORReflexible {
 public:
-    /* 807650CC */ daE_RDB_HIO_c();
-    /* 8076AF64 */ virtual ~daE_RDB_HIO_c() {};
+    daE_RDB_HIO_c();
+    virtual ~daE_RDB_HIO_c() {};
 
     void genMessage(JORMContext*);
     /* 0x04 */ s8 mID;
@@ -36,20 +36,17 @@ enum Action {
     /* 0x07 */ ACTION_END,
 };
 
-/* 807650CC-807650F0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__13daE_RDB_HIO_cFv */
 daE_RDB_HIO_c::daE_RDB_HIO_c() {
     mID = -1;
     field_0x8 = 1.55f;
 }
 
-/* 807650F0-8076519C 000110 00AC+00 9/9 0/0 0/0 .text            anm_init__FP11e_rdb_classifUcf */
 static void anm_init(e_rdb_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", i_index), i_attr,
                                 i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 8076519C-80765314 0001BC 0178+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     s16 sVar1;
     if (param_2 == 0) {
@@ -79,7 +76,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80765314-80765600 000334 02EC+00 1/0 0/0 0/0 .text            daE_RDB_Draw__FP11e_rdb_class */
 static int daE_RDB_Draw(e_rdb_class* i_this) {
     J3DMaterial* material;
     if (i_this->field_0xfe6 != 0) {
@@ -141,14 +137,11 @@ static int daE_RDB_Draw(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 80765600-8076563C 000620 003C+00 1/1 0/0 0/0 .text mtx_to_posAngle__FPA4_fP4cXyzP5csXyz */
 static void mtx_to_posAngle(Mtx param_1, cXyz* param_2, csXyz* param_3) {
     mDoMtx_multVecZero(param_1, param_2);
     mDoMtx_MtxToRot(param_1, param_3);
 }
 
-/* 8076563C-80765678 00065C 003C+00 1/1 0/0 0/0 .text            player_way_check__FP11e_rdb_class
- */
 static int player_way_check(e_rdb_class* i_this) {
     s16 sVar1 = i_this->enemy.shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y;
     if (sVar1 < 0x4000 && sVar1 > -0x4000) {
@@ -158,7 +151,6 @@ static int player_way_check(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 80765678-807658E0 000698 0268+00 1/1 0/0 0/0 .text            e_rdb_wait__FP11e_rdb_class */
 static void e_rdb_wait(e_rdb_class* i_this) {
     s16 sVar1 = i_this->enemy.shape_angle.y - i_this->mAngleToPlayer;
     f32 fVar1 = 0.0f;
@@ -215,7 +207,6 @@ static void e_rdb_wait(e_rdb_class* i_this) {
     }
 }
 
-/* 807658E0-80765A98 000900 01B8+00 1/1 0/0 0/0 .text            e_rdb_fight__FP11e_rdb_class */
 static void e_rdb_fight(e_rdb_class* i_this) {
     f32 fVar1 = 0.0f;
 
@@ -260,8 +251,6 @@ static void e_rdb_fight(e_rdb_class* i_this) {
     i_this->field_0x6c8 = 1;
 }
 
-/* 80765A98-80765B70 000AB8 00D8+00 2/2 0/0 0/0 .text
- * getPolyColor__FR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf */
 static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, _GXColor* p_effPrim,
                         _GXColor* p_effEnv, u8* p_alpha, f32* p_ratio) {
     if (dComIfG_Bgsp().ChkPolySafe(i_polyInfo) == 0) {
@@ -283,7 +272,6 @@ static int getPolyColor(cBgS_PolyInfo& i_polyInfo, int param_2, _GXColor* p_effP
     return 1;
 }
 
-/* 80765B70-80765E70 000B90 0300+00 1/1 0/0 0/0 .text            e_rdb_attack__FP11e_rdb_class */
 static void e_rdb_attack(e_rdb_class* i_this) {
     static u16 ap_name[3] = {
         0x8A5C,
@@ -356,8 +344,6 @@ static void e_rdb_attack(e_rdb_class* i_this) {
     i_this->field_0x6c8 = 1;
 }
 
-/* 80765E70-80766188 000E90 0318+00 1/1 0/0 0/0 .text            e_rdb_spin_attack__FP11e_rdb_class
- */
 static void e_rdb_spin_attack(e_rdb_class* i_this) {
     static u16 ap_name[2] = {
         0x8A5F,
@@ -428,7 +414,6 @@ static void e_rdb_spin_attack(e_rdb_class* i_this) {
     }
 }
 
-/* 80766188-80766294 0011A8 010C+00 1/1 0/0 0/0 .text            e_rdb_defence__FP11e_rdb_class */
 static int e_rdb_defence(e_rdb_class* i_this) {
     i_this->field_0x6c6 = 1;
     i_this->field_0x6c0 = 3;
@@ -460,7 +445,6 @@ static int e_rdb_defence(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 80766294-807665B4 0012B4 0320+00 1/1 0/0 0/0 .text            e_rdb_damage__FP11e_rdb_class */
 static void e_rdb_damage(e_rdb_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
     int iVar1;
@@ -534,7 +518,6 @@ static void e_rdb_damage(e_rdb_class* i_this) {
     cLib_addCalc0(&i_this->enemy.speedF, 1.0f, 3.0f);
 }
 
-/* 807665B4-80766A1C 0015D4 0468+00 2/1 0/0 0/0 .text            e_rdb_end__FP11e_rdb_class */
 static void e_rdb_end(e_rdb_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     e_wb_class* actor = (e_wb_class*)fopAcM_SearchByName(PROC_E_WB);
@@ -641,7 +624,6 @@ static void e_rdb_end(e_rdb_class* i_this) {
     cLib_addCalc2(&i_this->enemy.speedF, fVar1, 1.0f, 3.0f);
 }
 
-/* 80766A1C-80766DB4 001A3C 0398+00 2/1 0/0 0/0 .text            e_rdb_start__FP11e_rdb_class */
 static void e_rdb_start(e_rdb_class* i_this) {
     int frame = i_this->mpModelMorf->getFrame();
     f32 fVar1 = 0.0f;
@@ -728,7 +710,6 @@ static void e_rdb_start(e_rdb_class* i_this) {
     i_this->enemy.speedF = fVar1;
 }
 
-/* 80766DB4-80767294 001DD4 04E0+00 1/1 0/0 0/0 .text            damage_check__FP11e_rdb_class */
 static void damage_check(e_rdb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -881,7 +862,6 @@ static void damage_check(e_rdb_class* i_this) {
     }
 }
 
-/* 80767294-80767428 0022B4 0194+00 1/1 0/0 0/0 .text            shot_s_sub__FPvPv */
 static void* shot_s_sub(void* i_actor, void* i_data) {
     if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW) &&
         (fopAcM_GetParam(i_actor) == 1 || fopAcM_GetParam(i_actor) == 2))
@@ -896,13 +876,10 @@ static void* shot_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8076BA04-8076BA08 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 s_HIOinit;
 
-/* 8076BA14-8076BA20 000054 000C+00 3/4 0/0 0/0 .bss             l_HIO */
 static daE_RDB_HIO_c l_HIO;
 
-/* 80767428-80767CD0 002448 08A8+00 2/1 0/0 0/0 .text            action__FP11e_rdb_class */
 static void action(e_rdb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1082,7 +1059,6 @@ static void action(e_rdb_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &sp68);
 }
 
-/* 80767CD0-80767DB4 002CF0 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP11e_rdb_classf */
 static void cam_3d_morf(e_rdb_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->field_0x10d0.x, i_scale,
                   i_this->field_0x10e8.x * i_this->field_0x10f8);
@@ -1098,7 +1074,6 @@ static void cam_3d_morf(e_rdb_class* i_this, f32 i_scale) {
                   i_this->field_0x10dc.z * i_this->field_0x10f8);
 }
 
-/* 80767DB4-80767E54 002DD4 00A0+00 1/1 0/0 0/0 .text            cam_spd_set__FP11e_rdb_class */
 static void cam_spd_set(e_rdb_class* i_this) {
     i_this->field_0x10dc.x = fabsf(i_this->field_0x10c4.x - i_this->mDemoCamEye.x);
     i_this->field_0x10dc.y = fabsf(i_this->field_0x10c4.y - i_this->mDemoCamEye.y);
@@ -1109,7 +1084,6 @@ static void cam_spd_set(e_rdb_class* i_this) {
     i_this->field_0x10f8 = 0.0f;
 }
 
-/* 80767E54-80768B90 002E74 0D3C+00 2/1 0/0 0/0 .text            demo_camera__FP11e_rdb_class */
 static void demo_camera(e_rdb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1407,7 +1381,6 @@ static void demo_camera(e_rdb_class* i_this) {
     }
 }
 
-/* 80768B90-80769324 003BB0 0794+00 1/1 0/0 0/0 .text            anm_se_set__FP11e_rdb_class */
 static void anm_se_set(e_rdb_class* i_this) {
     if (i_this->mAnm == e_rdb_class::BCK_RB_WALK) {
         if (i_this->mpModelMorf->checkFrame(29.0f) || i_this->mpModelMorf->checkFrame(59.0f)) {
@@ -1487,7 +1460,6 @@ static void anm_se_set(e_rdb_class* i_this) {
     }
 }
 
-/* 80769324-8076A418 004344 10F4+00 2/1 0/0 0/0 .text            daE_RDB_Execute__FP11e_rdb_class */
 static int daE_RDB_Execute(e_rdb_class* i_this) {
     if (i_this->field_0xfe6 != 0) {
         demo_camera(i_this);
@@ -1757,13 +1729,10 @@ static int daE_RDB_Execute(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 8076A418-8076A420 005438 0008+00 1/0 0/0 0/0 .text            daE_RDB_IsDelete__FP11e_rdb_class
- */
 static int daE_RDB_IsDelete(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 8076A420-8076A488 005440 0068+00 1/0 0/0 0/0 .text            daE_RDB_Delete__FP11e_rdb_class */
 static int daE_RDB_Delete(e_rdb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAcM_GetID(i_this);
@@ -1780,7 +1749,6 @@ static int daE_RDB_Delete(e_rdb_class* i_this) {
     return 1;
 }
 
-/* 8076A488-8076A5FC 0054A8 0174+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     e_rdb_class* i_this = (e_rdb_class*)actor;
     i_this->mpModelMorf =
@@ -1807,7 +1775,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 0;
 }
 
-/* 8076A5FC-8076AA0C 00561C 0410+00 1/0 0/0 0/0 .text            daE_RDB_Create__FP10fopAc_ac_c */
 static int daE_RDB_Create(fopAc_ac_c* actor) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1944,14 +1911,12 @@ static s32 unused_bss_29c = 0;
 
 AUDIO_INSTANCES
 
-/* 8076B8F4-8076B914 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_RDB_Method */
 static actor_method_class l_daE_RDB_Method = {
     (process_method_func)daE_RDB_Create,  (process_method_func)daE_RDB_Delete,
     (process_method_func)daE_RDB_Execute, (process_method_func)daE_RDB_IsDelete,
     (process_method_func)daE_RDB_Draw,
 };
 
-/* 8076B914-8076B944 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_RDB */
 extern actor_process_profile_definition g_profile_E_RDB = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp
index f1932d9926..1033f09a25 100644
--- a/src/d/actor/d_a_e_rdy.cpp
+++ b/src/d/actor/d_a_e_rdy.cpp
@@ -22,8 +22,8 @@
 
 class daE_RDY_HIO_c : public JORReflexible {
 public:
-    /* 8076BDCC */ daE_RDY_HIO_c();
-    /* 80779880 */ virtual ~daE_RDY_HIO_c() {}
+    daE_RDY_HIO_c();
+    virtual ~daE_RDY_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -191,28 +191,20 @@ enum Joint {
     /* 4 */ WEAPON_BOW_BOMB,
  };
 
-/* 8077A870-8077A874 000048 0004+00 1/1 0/0 0/0 .bss             boss */
 static e_rdy_class* boss;
 
-/* 8077A874-8077A878 00004C 0004+00 1/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 8077A884-8077A8D4 00005C 0050+00 15/18 0/0 0/0 .bss             l_HIO */
 static daE_RDY_HIO_c l_HIO;
 
-/* 8077A8D4-8077A8D8 0000AC 0002+02 4/5 0/0 0/0 .bss             S_find */
 static s16 S_find;
 
-/* 8077A8E4-8077A8F0 0000BC 000C+00 2/3 0/0 0/0 .bss             S_find_pos */
 static cXyz S_find_pos;
 
-/* 8077A8F0-8077A918 0000C8 0028+00 2/2 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[10];
 
-/* 8077A918-8077A91C 0000F0 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 8076BDCC-8076BE80 0000EC 00B4+00 1/1 0/0 0/0 .text            __ct__13daE_RDY_HIO_cFv */
 daE_RDY_HIO_c::daE_RDY_HIO_c() {
     field_0x4 = -1;
     mScale = 1.2f;
@@ -242,7 +234,6 @@ void daE_RDY_HIO_c::genMessage(JORMContext* context) {
     // DEBUG NONMATCHING
 }
 
-/* 8076BE80-8076BF6C 0001A0 00EC+00 23/23 0/0 0/0 .text            anm_init__FP11e_rdy_classifUcf */
 static void anm_init(e_rdy_class* i_this, int i_anm, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, i_anm);
     i_this->mpMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f);
@@ -253,7 +244,6 @@ static void anm_init(e_rdy_class* i_this, int i_anm, f32 i_morf, u8 i_attr, f32
     }
 }
 
-/* 8076BF6C-8076C484 00028C 0518+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DJoint* dank_joint = i_joint;
@@ -342,7 +332,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8076C484-8076C54C 0007A4 00C8+00 1/1 0/0 0/0 .text            nodeCallBack_bow__FP8J3DJointi */
 static int nodeCallBack_bow(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -359,7 +348,6 @@ static int nodeCallBack_bow(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8076C54C-8076C9D0 00086C 0484+00 1/0 0/0 0/0 .text            daE_RDY_Draw__FP11e_rdy_class */
 static int daE_RDY_Draw(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (i_this->field_0x5b8 == 12
@@ -448,8 +436,6 @@ static int daE_RDY_Draw(e_rdy_class* i_this) {
     return 1;
 }
 
-/* 8076C9D0-8076CAA8 000CF0 00D8+00 3/3 0/0 0/0 .text other_bg_check__FP11e_rdy_classP10fopAc_ac_c
- */
 static BOOL other_bg_check(e_rdy_class* i_this, fopAc_ac_c* i_actor) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -466,7 +452,6 @@ static BOOL other_bg_check(e_rdy_class* i_this, fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8076CAA8-8076CB24 000DC8 007C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc)) {
         fopAc_ac_c* actor = (fopAc_ac_c*)i_proc;
@@ -489,7 +474,6 @@ inline u16 absoluteValue(s16 num) {
     return num;
 }
 
-/* 8076CB24-8076CE10 000E44 02EC+00 2/2 0/0 0/0 .text            search_bomb__FP11e_rdy_classi */
 static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) {
     if ((i_this->field_0xaf0 & 0x10000000) == 0) {
         return NULL;
@@ -555,7 +539,6 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) {
     return NULL;
 }
 
-/* 8076CE10-8076CF1C 001130 010C+00 3/3 0/0 0/0 .text            way_bg_check__FP11e_rdy_classf */
 static BOOL way_bg_check(e_rdy_class* i_this, f32 i_dist) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -576,7 +559,6 @@ static BOOL way_bg_check(e_rdy_class* i_this, f32 i_dist) {
     }
 }
 
-/* 8076CF1C-8076D004 00123C 00E8+00 1/1 0/0 0/0 .text            ride_off__FP11e_rdy_class */
 static void ride_off(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     e_yc_class* kargarok = (e_yc_class*)fopAcM_SearchByID(i_this->mKargarokID);
@@ -596,7 +578,6 @@ static void ride_off(e_rdy_class* i_this) {
     a_this->home.pos = a_this->current.pos;
 }
 
-/* 8076D004-8076D114 001324 0110+00 6/6 0/0 0/0 .text            pl_check__FP11e_rdy_classfs */
 static BOOL pl_check(e_rdy_class* i_this, f32 i_dist, s16 i_angle) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (dComIfGp_event_runCheck()) {
@@ -628,18 +609,14 @@ static BOOL pl_check(e_rdy_class* i_this, f32 i_dist, s16 i_angle) {
     return FALSE;
 }
 
-/* 8076D114-8076D138 001434 0024+00 3/3 0/0 0/0 .text            bomb_view_check__FP11e_rdy_class */
 static dBomb_c* bomb_view_check(e_rdy_class* i_this) {
     return search_bomb(i_this, TRUE);
 }
 
-/* 8076D138-8076D15C 001458 0024+00 1/1 0/0 0/0 .text            bomb_check__FP11e_rdy_class */
 static dBomb_c* bomb_check(e_rdy_class* i_this) {
     return search_bomb(i_this, FALSE);
 }
 
-/* 8076D15C-8076D24C 00147C 00F0+00 6/6 0/0 0/0 .text            move_gake_check__FP11e_rdy_classf
- */
 static BOOL move_gake_check(e_rdy_class* i_this, f32 i_dist) {
     fopAc_ac_c* a_this = &i_this->actor;
     dBgS_GndChk gnd_chk;
@@ -658,7 +635,6 @@ static BOOL move_gake_check(e_rdy_class* i_this, f32 i_dist) {
     }
 }
 
-/* 8076D24C-8076D3C4 00156C 0178+00 1/1 0/0 0/0 .text            way_check__FP11e_rdy_class */
 static BOOL way_check(e_rdy_class* i_this) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     cXyz start, end, vec;
@@ -688,7 +664,6 @@ static BOOL way_check(e_rdy_class* i_this) {
     return FALSE;
 }
 
-/* 8076D3C4-8076D5F0 0016E4 022C+00 1/1 0/0 0/0 .text            path_check__FP11e_rdy_class */
 static BOOL path_check(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     static bool check_index[0xff];
@@ -744,7 +719,6 @@ static BOOL path_check(e_rdy_class* i_this) {
     }
 }
 
-/* 8076D5F0-8076DA3C 001910 044C+00 1/1 0/0 0/0 .text            e_rdy_normal__FP11e_rdy_class */
 static void e_rdy_normal(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     f32 target_speed = 0.0f;
@@ -850,7 +824,6 @@ static void e_rdy_normal(e_rdy_class* i_this) {
     }
 }
 
-/* 8076DA3C-8076E00C 001D5C 05D0+00 2/1 0/0 0/0 .text            e_rdy_fight_run__FP11e_rdy_class */
 static void e_rdy_fight_run(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz unused_xyz_0;
@@ -1002,7 +975,6 @@ static void e_rdy_fight_run(e_rdy_class* i_this) {
     }
 }
 
-/* 8076E00C-8076E06C 00232C 0060+00 1/1 0/0 0/0 .text            at_hit_check__FP11e_rdy_class */
 static fopAc_ac_c* at_hit_check(e_rdy_class* i_this) {
     if (i_this->mMode >= 10) {
         return NULL;
@@ -1015,7 +987,6 @@ static fopAc_ac_c* at_hit_check(e_rdy_class* i_this) {
     }
 }
 
-/* 8076E06C-8076E418 00238C 03AC+00 1/1 0/0 0/0 .text            e_rdy_fight__FP11e_rdy_class */
 static void e_rdy_fight(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     int frame = (int)i_this->mpMorf->getFrame();
@@ -1104,7 +1075,6 @@ static void e_rdy_fight(e_rdy_class* i_this) {
     }
 }
 
-/* 8076E418-8076E81C 002738 0404+00 2/1 0/0 0/0 .text            e_rdy_bow_run__FP11e_rdy_class */
 static void e_rdy_bow_run(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     f32 target_speed = 0.0f;
@@ -1207,7 +1177,6 @@ static void e_rdy_bow_run(e_rdy_class* i_this) {
     }
 }
 
-/* 8076E81C-8076EB4C 002B3C 0330+00 1/1 0/0 0/0 .text            e_rdy_bow__FP11e_rdy_class */
 static void e_rdy_bow(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     J3DAnmTransform* bck;
@@ -1279,7 +1248,6 @@ static void e_rdy_bow(e_rdy_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mPlayerAngle, 4, 0x1000);
 }
 
-/* 8076EB4C-8076EBB8 002E6C 006C+00 1/1 0/0 0/0 .text            s_command3_sub__FPvPv */
 static void* s_command3_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
         e_rdy_class* other = (e_rdy_class*)i_proc;
@@ -1290,7 +1258,6 @@ static void* s_command3_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 8076EBB8-8076F0E0 002ED8 0528+00 1/1 0/0 0/0 .text            e_rdy_bow2__FP11e_rdy_class */
 static s8 e_rdy_bow2(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
@@ -1411,7 +1378,6 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) {
     return ret;
 }
 
-/* 8076F0E0-8076F438 003400 0358+00 2/1 0/0 0/0 .text            e_rdy_bow_ikki2__FP11e_rdy_class */
 static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1502,7 +1468,6 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) {
     }
 }
 
-/* 8076F438-8076F59C 003758 0164+00 1/1 0/0 0/0 .text            e_rdy_avoid__FP11e_rdy_class */
 static void e_rdy_avoid(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     int frame = (int)i_this->mpMorf->getFrame();
@@ -1541,7 +1506,6 @@ static void e_rdy_avoid(e_rdy_class* i_this) {
     }
 }
 
-/* 8076F59C-8076F71C 0038BC 0180+00 1/1 0/0 0/0 .text            s_kusa_sub__FPvPv */
 static void* s_kusa_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) {
         fopAc_ac_c* grass = (fopAc_ac_c*)i_proc;
@@ -1554,7 +1518,6 @@ static void* s_kusa_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 8076F71C-807701F4 003A3C 0AD8+00 2/1 0/0 0/0 .text            e_rdy_tkusa__FP11e_rdy_class */
 static void e_rdy_tkusa(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec;
@@ -1775,7 +1738,6 @@ static void e_rdy_tkusa(e_rdy_class* i_this) {
     cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, 5.0f);
 }
 
-/* 807701F4-8077089C 004514 06A8+00 1/1 0/0 0/0 .text            e_rdy_yc_ride__FP11e_rdy_class */
 static void e_rdy_yc_ride(e_rdy_class* i_this) {
     int frame = (int)i_this->mpMorf->getFrame();
     e_yc_class* kargarok = (e_yc_class*)fopAcM_SearchByID(i_this->mKargarokID);
@@ -1889,8 +1851,6 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) {
     }
 }
 
-/* 8077089C-80770CF8 004BBC 045C+00 2/1 0/0 0/0 .text            e_rdy_bomb_action__FP11e_rdy_class
- */
 static void e_rdy_bomb_action(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec1, vec2;
@@ -1988,7 +1948,6 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) {
     i_this->mArrowTarget = bomb->current.pos;
 }
 
-/* 80770CF8-80770E48 005018 0150+00 1/1 0/0 0/0 .text            e_rdy_s_damage__FP11e_rdy_class */
 static void e_rdy_s_damage(e_rdy_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     switch (i_this->mMode) {
@@ -2025,7 +1984,6 @@ static void e_rdy_s_damage(e_rdy_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 80770E48-80770FFC 005168 01B4+00 1/1 0/0 0/0 .text            kado_check__FP11e_rdy_class */
 static int kado_check(e_rdy_class* i_this) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -2063,7 +2021,6 @@ static int kado_check(e_rdy_class* i_this) {
     return ret;
 }
 
-/* 80770FFC-807710DC 00531C 00E0+00 3/3 0/0 0/0 .text            rd_disappear__FP11e_rdy_class */
 static void rd_disappear(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec1, vec2;
@@ -2085,7 +2042,6 @@ static void rd_disappear(e_rdy_class* i_this) {
     }
 }
 
-/* 807710DC-80771230 0053FC 0154+00 1/1 0/0 0/0 .text            body_gake__FP11e_rdy_class */
 static BOOL body_gake(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec1, vec2;
@@ -2103,7 +2059,6 @@ static BOOL body_gake(e_rdy_class* i_this) {
     }
 }
 
-/* 807712A8-80771DA4 0055C8 0AFC+00 2/1 0/0 0/0 .text            e_rdy_damage__FP11e_rdy_class */
 static void e_rdy_damage(e_rdy_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     cXyz vec1, vec2;
@@ -2389,7 +2344,6 @@ static void e_rdy_damage(e_rdy_class* i_this) {
     }
 }
 
-/* 80771DA4-80771F50 0060C4 01AC+00 1/1 0/0 0/0 .text            gake_check__FP11e_rdy_classf */
 static s16 gake_check(e_rdy_class* i_this, f32 i_dist) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     dBgS_GndChk gnd_chk;
@@ -2416,7 +2370,6 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) {
     return _this->shape_angle.y;
 }
 
-/* 80771F50-80772128 006270 01D8+00 1/1 0/0 0/0 .text            s_bikkuri_sub__FPvPv */
 static void* s_bikkuri_sub(void* i_proc, void* i_this) {
     if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
         if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode <= 2) {
@@ -2431,7 +2384,6 @@ static void* s_bikkuri_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80772128-807724A0 006448 0378+00 1/1 0/0 0/0 .text            e_rdy_drop__FP11e_rdy_class */
 static void e_rdy_drop(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     f32 target_speed = 0.0f;
@@ -2502,7 +2454,6 @@ static void e_rdy_drop(e_rdy_class* i_this) {
     cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, 3.0f);
 }
 
-/* 807724A0-80772580 0067C0 00E0+00 1/1 0/0 0/0 .text            e_rdy_a_damage__FP11e_rdy_class */
 static void e_rdy_a_damage(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->mIFrameTimer = 3;
@@ -2525,7 +2476,6 @@ static void e_rdy_a_damage(e_rdy_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 80772580-807726F0 0068A0 0170+00 1/1 0/0 0/0 .text            e_rdy_stand__FP11e_rdy_class */
 static void e_rdy_stand(e_rdy_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -2564,7 +2514,6 @@ static void e_rdy_stand(e_rdy_class* i_this) {
     }
 }
 
-/* 807726F0-80772B0C 006A10 041C+00 2/1 0/0 0/0 .text            e_rdy_bow3__FP11e_rdy_class */
 static s8 e_rdy_bow3(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (i_this->mIFrameTimer == 0 && i_this->mMode != 5
@@ -2671,7 +2620,6 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) {
     return false;
 }
 
-/* 80772B0C-80772B98 006E2C 008C+00 1/1 0/0 0/0 .text            s_command2_sub__FPvPv */
 static void* s_command2_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
         e_rdy_class* other = (e_rdy_class*)i_proc;
@@ -2683,7 +2631,6 @@ static void* s_command2_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80772B98-80772C04 006EB8 006C+00 1/1 0/0 0/0 .text            s_command4_sub__FPvPv */
 static void* s_command4_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) {
         e_rdy_class* other = (e_rdy_class*)i_proc;
@@ -2694,7 +2641,6 @@ static void* s_command4_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80772C04-80773070 006F24 046C+00 2/1 0/0 0/0 .text            e_rdy_commander__FP11e_rdy_class */
 static void e_rdy_commander(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     s8 bVar1 = false;
@@ -2803,7 +2749,6 @@ static void e_rdy_commander(e_rdy_class* i_this) {
     }
 }
 
-/* 80773070-80773474 007390 0404+00 1/1 0/0 0/0 .text            e_rdy_excite__FP11e_rdy_class */
 static void e_rdy_excite(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec;
@@ -2868,7 +2813,6 @@ static void e_rdy_excite(e_rdy_class* i_this) {
     cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, 5.0f);
 }
 
-/* 80773474-807735A8 007794 0134+00 1/1 0/0 0/0 .text            e_rdy_water__FP11e_rdy_class */
 static void e_rdy_water(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->mIFrameTimer = 10;
@@ -2902,7 +2846,6 @@ static void e_rdy_water(e_rdy_class* i_this) {
     }
 }
 
-/* 807735A8-80773A8C 0078C8 04E4+00 1/1 0/0 0/0 .text            e_rdy_jyunkai__FP11e_rdy_class */
 static void e_rdy_jyunkai(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz vec;
@@ -3002,7 +2945,6 @@ static void e_rdy_jyunkai(e_rdy_class* i_this) {
     }
 }
 
-/* 80773A8C-80773B24 007DAC 0098+00 1/1 0/0 0/0 .text            wolfkick_damage__FP11e_rdy_class */
 static void wolfkick_damage(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3015,7 +2957,6 @@ static void wolfkick_damage(e_rdy_class* i_this) {
     i_this->field_0xac8 = true;
 }
 
-/* 80773B24-80773D2C 007E44 0208+00 1/1 0/0 0/0 .text            big_damage__FP11e_rdy_class */
 static void big_damage(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->mAction = ACT_DAMAGE;
@@ -3055,7 +2996,6 @@ static void big_damage(e_rdy_class* i_this) {
     i_this->field_0xac8 = false;
 }
 
-/* 80773D2C-80773E5C 00804C 0130+00 1/1 0/0 0/0 .text            small_damage__FP11e_rdy_classi */
 static void small_damage(e_rdy_class* i_this, int i_collider) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (i_this->mAction != ACT_S_DAMAGE) {
@@ -3082,7 +3022,6 @@ static void small_damage(e_rdy_class* i_this, int i_collider) {
     i_this->mHitDirection = i_this->mAtInfo.mHitDirection.y;
 }
 
-/* 80773E5C-8077424C 00817C 03F0+00 1/1 0/0 0/0 .text            damage_check__FP11e_rdy_class */
 static void damage_check(e_rdy_class* i_this) {
     fopAc_ac_c* _this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -3213,7 +3152,6 @@ static void damage_check(e_rdy_class* i_this) {
     }
 }
 
-/* 8077424C-8077582C 00856C 15E0+00 2/1 0/0 0/0 .text            action__FP11e_rdy_class */
 static void action(e_rdy_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -3725,7 +3663,6 @@ static void action(e_rdy_class* i_this) {
     setMidnaBindEffect((fopEn_enemy_c *)a_this, &i_this->mSound, &a_this->eyePos, &bind_scl);
 }
 
-/* 8077582C-80775A20 009B4C 01F4+00 1/1 0/0 0/0 .text            fire_eff_set__FP11e_rdy_class */
 static void fire_eff_set(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     int eff_num;
@@ -3764,7 +3701,6 @@ static void fire_eff_set(e_rdy_class* i_this) {
     }
 }
 
-/* 80775A20-80775B04 009D40 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP11e_rdy_classf */
 static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mCamCenter.x, i_this->mCamCenterTarget.x, i_scale,
                   i_this->mCamCenterSpeed.x * i_this->mCamSpeed);
@@ -3780,7 +3716,6 @@ static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) {
                   i_this->mCamEyeSpeed.z * i_this->mCamSpeed);
 }
 
-/* 80775B04-80775B50 009E24 004C+00 1/1 0/0 0/0 .text            s_adel_sub__FPvPv */
 static void* s_adel_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) {
         fopAcM_delete((fopAc_ac_c*)i_proc);
@@ -3788,7 +3723,6 @@ static void* s_adel_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80775B50-80777330 009E70 17E0+00 2/1 0/0 0/0 .text            demo_camera__FP11e_rdy_class */
 static void demo_camera(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -4329,10 +4263,8 @@ static void demo_camera(e_rdy_class* i_this) {
     }
 }
 
-/* 8077AA1C-8077AA24 0001F4 0004+04 0/2 0/0 0/0 .bss             c_start */
 static BOOL c_start;
 
-/* 80777330-8077892C 00B650 15FC+00 2/1 0/0 0/0 .text            daE_RDY_Execute__FP11e_rdy_class */
 static int daE_RDY_Execute(e_rdy_class* i_this) {
     f32 scale;
     fopEn_enemy_c* a_this = &i_this->actor;
@@ -4754,13 +4686,10 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
     return 1;
 }
 
-/* 8077892C-80778934 00CC4C 0008+00 1/0 0/0 0/0 .text            daE_RDY_IsDelete__FP11e_rdy_class
- */
 static int daE_RDY_IsDelete(e_rdy_class* i_this) {
     return 1;
 }
 
-/* 80778934-80778998 00CC54 0064+00 1/0 0/0 0/0 .text            daE_RDY_Delete__FP11e_rdy_class */
 static int daE_RDY_Delete(e_rdy_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     dComIfG_resDelete(&i_this->mPhase, i_this->mpArcName);
@@ -4776,11 +4705,9 @@ static int daE_RDY_Delete(e_rdy_class* i_this) {
     return 1;
 }
 
-/* 8077A62C-8077A638 000550 000C+00 1/0 0/0 0/0 .data            jv_offset */
 static Vec jv_offset = {0.0f, 0.0f, 0.0f};
 static s8 data_8077aa20;
 
-/* 8077A638-8077A6BC -00001 0084+00 1/1 0/0 0/0 .data            jc_data */
 static dJntColData_c jc_data[11] = {
     {0, 1, JNT_HIP1, 30.0f, &jv_offset},
     {0, 1, JNT_MUNE2, 25.0f, &jv_offset},
@@ -4795,7 +4722,6 @@ static dJntColData_c jc_data[11] = {
     {0, 1, JNT_ASI_R, 5.0f, &jv_offset},
 };
 
-/* 80778998-80778D90 00CCB8 03F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_rdy_class* _this = (e_rdy_class*)i_this;
     
@@ -4870,7 +4796,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80778D90-80779340 00D0B0 05B0+00 1/0 0/0 0/0 .text            daE_RDY_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_rdy_class);
     e_rdy_class* _this = (e_rdy_class*)i_this;
@@ -5056,14 +4981,12 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80779340-807794E0 00D660 01A0+00 1/1 0/0 0/0 .text            __ct__11e_rdy_classFv */
 e_rdy_class::e_rdy_class() {
     /* empty function */
 }
 
 AUDIO_INSTANCES
 
-/* 8077A73C-8077A75C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_RDY_Method */
 static actor_method_class l_daE_RDY_Method = {
     (process_method_func)daE_RDY_Create,
     (process_method_func)daE_RDY_Delete,
@@ -5072,7 +4995,6 @@ static actor_method_class l_daE_RDY_Method = {
     (process_method_func)daE_RDY_Draw,
 };
 
-/* 8077A75C-8077A78C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_RDY */
 extern actor_process_profile_definition g_profile_E_RDY = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp
index 2066bebda6..3806e166f1 100644
--- a/src/d/actor/d_a_e_s1.cpp
+++ b/src/d/actor/d_a_e_s1.cpp
@@ -17,8 +17,8 @@
 
 class daE_S1_HIO_c {
 public:
-    /* 8077AB8C */ daE_S1_HIO_c();
-    /* 80780840 */ virtual ~daE_S1_HIO_c() {}
+    daE_S1_HIO_c();
+    virtual ~daE_S1_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mBaseSize;
@@ -78,7 +78,6 @@ enum daE_S1_ACTION {
     ACT_WARP_APPEAR = 20,
 };
 
-/* 8077AB8C-8077ABF8 0000EC 006C+00 1/1 0/0 0/0 .text            __ct__12daE_S1_HIO_cFv */
 daE_S1_HIO_c::daE_S1_HIO_c() {
     field_0x4 = -1;
     mBaseSize = 1.3f;
@@ -93,14 +92,12 @@ daE_S1_HIO_c::daE_S1_HIO_c() {
     mInvincible = 0;
 }
 
-/* 8077ABF8-8077ACA4 000158 00AC+00 12/12 0/0 0/0 .text            anm_init__FP10e_s1_classifUcf */
 static void anm_init(e_s1_class* i_this, int i_resNo, f32 i_morf, u8 i_attr, f32 i_speed) {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes("E_S2", i_resNo);
     i_this->mpMorf->setAnm(pbck, i_attr, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_resNo;
 }
 
-/* 8077ACA4-8077AE38 000204 0194+00 1/0 0/0 0/0 .text            daE_S1_Draw__FP10e_s1_class */
 static int daE_S1_Draw(e_s1_class* i_this) {
     if (i_this->field_0x306c != 0) {
         return 1;
@@ -138,7 +135,6 @@ static int daE_S1_Draw(e_s1_class* i_this) {
     return 1;
 }
 
-/* 8077AE38-8077AEFC 000398 00C4+00 3/3 0/0 0/0 .text            pl_check__FP10e_s1_classf */
 static BOOL pl_check(e_s1_class* i_this, f32 i_check_range) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     f32 x_dist = player->current.pos.x - i_this->home.pos.x;
@@ -156,7 +152,6 @@ static BOOL pl_check(e_s1_class* i_this, f32 i_check_range) {
     return false;
 }
 
-/* 8077AEFC-8077AF40 00045C 0044+00 4/4 0/0 0/0 .text            pl_at_check__FP10e_s1_classf */
 static BOOL pl_at_check(e_s1_class* i_this, f32 i_check_range) {
     return fopAcM_searchPlayerDistance(i_this) < i_check_range;
 }
@@ -164,10 +159,8 @@ static BOOL pl_at_check(e_s1_class* i_this, f32 i_check_range) {
 static u8 l_no_fail;  // when enabled, enemy will never revive after defeated
 static u8 l_initHIO;
 
-/* 8078138C-807813B8 000054 002C+00 8/11 0/0 0/0 .bss             l_HIO */
 static daE_S1_HIO_c l_HIO;
 
-/* 8077AF40-8077B1A8 0004A0 0268+00 1/1 0/0 0/0 .text            path_check__FP10e_s1_class */
 static BOOL path_check(e_s1_class* i_this) {
     static u8 check_index[255];
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
@@ -246,7 +239,6 @@ static BOOL path_check(e_s1_class* i_this) {
     return true;
 }
 
-/* 8077B1A8-8077B274 000708 00CC+00 1/1 0/0 0/0 .text            path_check2__FP10e_s1_class */
 static void path_check2(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -267,13 +259,10 @@ static void path_check2(e_s1_class* i_this) {
     }
 }
 
-/* 807814B8-807814BC 000180 0004+00 1/2 0/0 0/0 .bss             same_id */
 static int same_id;
 
-/* 807814BC-807814C0 000184 0004+00 1/2 0/0 0/0 .bss             fail_id */
 static int fail_id;
 
-/* 8077B274-8077B318 0007D4 00A4+00 1/1 0/0 0/0 .text            s_last_sub__FPvPv */
 static void* s_last_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -294,7 +283,6 @@ static void* s_last_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8077B318-8077B928 000878 0610+00 1/1 0/0 0/0 .text            damage_check__FP10e_s1_class */
 static void damage_check(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -445,7 +433,6 @@ static void damage_check(e_s1_class* i_this) {
     }
 }
 
-/* 8077B928-8077BC8C 000E88 0364+00 1/1 0/0 0/0 .text            e_s1_wait__FP10e_s1_class */
 static void e_s1_wait(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz dist_from_home;
@@ -524,7 +511,6 @@ static void e_s1_wait(e_s1_class* i_this) {
     }
 }
 
-/* 8077BC8C-8077BEAC 0011EC 0220+00 1/1 0/0 0/0 .text            e_s1_roof__FP10e_s1_class */
 static void e_s1_roof(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -577,7 +563,6 @@ static void e_s1_roof(e_s1_class* i_this) {
     }
 }
 
-/* 8077BEAC-8077BFFC 00140C 0150+00 1/1 0/0 0/0 .text            e_s1_fight_run__FP10e_s1_class */
 static void e_s1_fight_run(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp14;
@@ -604,7 +589,6 @@ static void e_s1_fight_run(e_s1_class* i_this) {
     }
 }
 
-/* 8077BFFC-8077C2F8 00155C 02FC+00 1/1 0/0 0/0 .text            e_s1_fight__FP10e_s1_class */
 static void e_s1_fight(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp28;
@@ -667,7 +651,6 @@ static void e_s1_fight(e_s1_class* i_this) {
     cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, 10.0f);
 }
 
-/* 8077C2F8-8077C52C 001858 0234+00 1/1 0/0 0/0 .text            e_s1_bibiri__FP10e_s1_class */
 static void e_s1_bibiri(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -702,7 +685,6 @@ static void e_s1_bibiri(e_s1_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, fopAcM_searchPlayerAngleY(a_this), 4, 0x1000);
 }
 
-/* 8077C52C-8077C5FC 001A8C 00D0+00 1/1 0/0 0/0 .text            e_s1_damage__FP10e_s1_class */
 static void e_s1_damage(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp14;
@@ -727,7 +709,6 @@ static void e_s1_damage(e_s1_class* i_this) {
     }
 }
 
-/* 8077C5FC-8077C894 001B5C 0298+00 1/1 0/0 0/0 .text            e_s1_path__FP10e_s1_class */
 static void e_s1_path(e_s1_class* i_this) {
     cXyz sp14;
     cXyz sp8;
@@ -795,7 +776,6 @@ static void e_s1_path(e_s1_class* i_this) {
     }
 }
 
-/* 8077C894-8077C938 001DF4 00A4+00 1/1 0/0 0/0 .text            s_down_sub__FPvPv */
 static void* s_down_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -820,7 +800,6 @@ static void* s_down_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8077C938-8077C9D8 001E98 00A0+00 1/1 0/0 0/0 .text            s_fail_sub__FPvPv */
 static void* s_fail_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -847,12 +826,10 @@ static void* s_fail_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8077C9D8-8077CA0C 001F38 0034+00 2/2 0/0 0/0 .text            all_fail_check__FP10e_s1_class */
 static BOOL all_fail_check(e_s1_class* i_this) {
     return fpcM_Search(s_fail_sub, i_this) == NULL ? TRUE : FALSE;
 }
 
-/* 8077CA0C-8077CAA4 001F6C 0098+00 1/1 0/0 0/0 .text            s_allfail_sub__FPvPv */
 static void* s_allfail_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -871,12 +848,10 @@ static void* s_allfail_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8077CAA4-8077CAD0 002004 002C+00 1/1 0/0 0/0 .text            all_fail__FP10e_s1_class */
 static void all_fail(e_s1_class* i_this) {
     fpcM_Search(s_allfail_sub, i_this);
 }
 
-/* 8077CAD0-8077CB68 002030 0098+00 1/1 0/0 0/0 .text            s_allwakeup_sub__FPvPv */
 static void* s_allwakeup_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -899,19 +874,15 @@ static void* s_allwakeup_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807814C0-807814C4 000188 0004+00 2/2 0/0 0/0 .bss             s_check */
 static int s_check;
 
-/* 807814DC-807814F4 0001A4 0018+00 1/2 0/0 0/0 .bss             s_p */
 static cXyz s_p[2] = {
     cXyz(-16500.0f, 0.0f, -100.0f),
     cXyz(-16300.0f, 0.0f, -400.0f),
 };
 
-/* 80780FE0-80780FE4 000038 0004+00 1/1 0/0 0/0 .data            s_ya */
 static s16 s_ya[2] = {0, 0};
 
-/* 8077CB68-8077CC54 0020C8 00EC+00 1/1 0/0 0/0 .text            s_posrevise_sub__FPvPv */
 static void* s_posrevise_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_data = (fopAc_ac_c*)i_data;
@@ -933,7 +904,6 @@ static void* s_posrevise_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8077CC54-8077CF30 0021B4 02DC+00 1/1 0/0 0/0 .text            e_s1_failwait__FP10e_s1_class */
 static void e_s1_failwait(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     i_this->mHitInvincibilityTimer = 20;
@@ -1002,7 +972,6 @@ static void e_s1_failwait(e_s1_class* i_this) {
     }
 }
 
-/* 8077CF30-8077D448 002490 0518+00 2/1 0/0 0/0 .text            e_s1_fail__FP10e_s1_class */
 static void e_s1_fail(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1129,7 +1098,6 @@ static void e_s1_fail(e_s1_class* i_this) {
     }
 }
 
-/* 8077D448-8077D6A0 0029A8 0258+00 1/1 0/0 0/0 .text            e_s1_shout__FP10e_s1_class */
 static void e_s1_shout(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     i_this->mHitInvincibilityTimer = 10;
@@ -1189,7 +1157,6 @@ static void e_s1_shout(e_s1_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8077D6A0-8077D8A8 002C00 0208+00 2/1 0/0 0/0 .text            e_s1_warpappear__FP10e_s1_class */
 static void e_s1_warpappear(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     i_this->mHitInvincibilityTimer = 20;
@@ -1240,7 +1207,6 @@ static void e_s1_warpappear(e_s1_class* i_this) {
     }
 }
 
-/* 8077D8A8-8077DBB8 002E08 0310+00 1/1 0/0 0/0 .text ke_control__FP10e_s1_classP7s1_ke_sif */
 static void ke_control(e_s1_class* i_this, s1_ke_s* i_ke, int i_no, f32 i_posZ) {
     cXyz sp4C;
     cXyz sp40;
@@ -1301,8 +1267,6 @@ static void ke_control(e_s1_class* i_this, s1_ke_s* i_ke, int i_no, f32 i_posZ)
     }
 }
 
-/* 8077DBB8-8077DC90 003118 00D8+00 1/1 0/0 0/0 .text
- * ke_move__FP10e_s1_classP19mDoExt_3DlineMat0_cP7s1_ke_sif     */
 static void ke_move(e_s1_class* i_this, mDoExt_3DlineMat0_c* i_line, s1_ke_s* i_ke, int i_no,
                     f32 i_posZ) {
     ke_control(i_this, i_ke, i_no, i_posZ);
@@ -1323,7 +1287,6 @@ static void ke_move(e_s1_class* i_this, mDoExt_3DlineMat0_c* i_line, s1_ke_s* i_
     }
 }
 
-/* 8077DC90-8077E070 0031F0 03E0+00 1/1 0/0 0/0 .text            e_s1_wolfbite__FP10e_s1_class */
 static void e_s1_wolfbite(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1399,7 +1362,6 @@ static void e_s1_wolfbite(e_s1_class* i_this) {
     }
 }
 
-/* 8077E070-8077E618 0035D0 05A8+00 2/1 0/0 0/0 .text            action__FP10e_s1_class */
 static void action(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz mae;
@@ -1577,7 +1539,6 @@ static void action(e_s1_class* i_this) {
     }
 }
 
-/* 8077E618-8077E870 003B78 0258+00 1/1 0/0 0/0 .text            ke_set__FP10e_s1_class */
 static void ke_set(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz mae;
@@ -1629,7 +1590,6 @@ static void ke_set(e_s1_class* i_this) {
     }
 }
 
-/* 8077E870-8077EE10 003DD0 05A0+00 2/1 0/0 0/0 .text            demo_camera__FP10e_s1_class */
 static void demo_camera(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1780,7 +1740,6 @@ static void demo_camera(e_s1_class* i_this) {
     }
 }
 
-/* 8077EE10-8077F250 004370 0440+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_s1_class */
 static void anm_se_set(e_s1_class* i_this) {
     if (i_this->mAnm == ANM_WALK) {
         if (i_this->mpMorf->checkFrame(27.0f)) {
@@ -1823,7 +1782,6 @@ static void anm_se_set(e_s1_class* i_this) {
     }
 }
 
-/* 8077F250-8077F314 0047B0 00C4+00 1/1 0/0 0/0 .text            body_eff_set__FP10e_s1_class */
 static void body_eff_set(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -1836,7 +1794,6 @@ static void body_eff_set(e_s1_class* i_this) {
     }
 }
 
-/* 8077F314-8077FC88 004874 0974+00 2/1 0/0 0/0 .text            daE_S1_Execute__FP10e_s1_class */
 static int daE_S1_Execute(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2068,12 +2025,10 @@ static int daE_S1_Execute(e_s1_class* i_this) {
     return 1;
 }
 
-/* 8077FC88-8077FC90 0051E8 0008+00 1/0 0/0 0/0 .text            daE_S1_IsDelete__FP10e_s1_class */
 static int daE_S1_IsDelete(e_s1_class* i_this) {
     return 1;
 }
 
-/* 8077FC90-8077FCF8 0051F0 0068+00 1/0 0/0 0/0 .text            daE_S1_Delete__FP10e_s1_class */
 static int daE_S1_Delete(e_s1_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dComIfG_resDelete(&i_this->mPhase, "E_S2");
@@ -2089,10 +2044,8 @@ static int daE_S1_Delete(e_s1_class* i_this) {
     return 1;
 }
 
-/* 8078116C-80781178 0001C4 000C+00 1/0 0/0 0/0 .data            jv_offset */
 static Vec jv_offset = {0.0f, 0.0f, 0.0f};
 
-/* 80781178-807811E4 -00001 006C+00 1/1 0/0 0/0 .data            jc_data */
 static dJntColData_c jc_data[] = {
     {0, 1, 1, 30.0f, &jv_offset},
     {0, 1, 2, 30.0f, &jv_offset},
@@ -2105,7 +2058,6 @@ static dJntColData_c jc_data[] = {
     {0, 1, 24, 10.0f, &jv_offset},
 };
 
-/* 8077FCF8-8077FE38 005258 0140+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_s1_class* a_this = (e_s1_class*)i_this;
 
@@ -2125,7 +2077,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8077FE38-807803F4 005398 05BC+00 1/0 0/0 0/0 .text            daE_S1_Create__FP10fopAc_ac_c */
 static int daE_S1_Create(fopAc_ac_c* i_this) {
     e_s1_class* a_this = (e_s1_class*)i_this;
     fopAcM_ct(a_this, e_s1_class);
@@ -2289,14 +2240,12 @@ static int daE_S1_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80781264-80781284 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_S1_Method */
 static actor_method_class l_daE_S1_Method = {
     (process_method_func)daE_S1_Create,  (process_method_func)daE_S1_Delete,
     (process_method_func)daE_S1_Execute, (process_method_func)daE_S1_IsDelete,
     (process_method_func)daE_S1_Draw,
 };
 
-/* 80781284-807812B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_S1 */
 extern actor_process_profile_definition g_profile_E_S1 = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp
index 8a6d8f81d5..6a6bfbb95b 100644
--- a/src/d/actor/d_a_e_sb.cpp
+++ b/src/d/actor/d_a_e_sb.cpp
@@ -13,7 +13,6 @@
 #include "d/d_com_inf_game.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8078164C-807816D8 0000EC 008C+00 1/1 0/0 0/0 .text            __ct__12daE_SB_HIO_cFv */
 daE_SB_HIO_c::daE_SB_HIO_c() {
     field_0x04 = -1;
     search_area = 1100.0f;
@@ -66,7 +65,6 @@ void daE_SB_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 807816D8-807817D0 000178 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_SB_cFv */
 int daE_SB_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_SB", 0xF);
     JUT_ASSERT(271, modelData != NULL);
@@ -81,12 +79,10 @@ int daE_SB_c::CreateHeap() {
     return 1;
 }
 
-/* 807817D0-807817F0 000270 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_SB_c*>(i_this)->CreateHeap();
 }
 
-/* 807817F0-80781850 000290 0060+00 1/1 0/0 0/0 .text            initCcCylinder__8daE_SB_cFv */
 void daE_SB_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -108,13 +104,11 @@ void daE_SB_c::initCcCylinder() {
     mCyl.SetC(current.pos);
 }
 
-/* 80781850-80781898 0002F0 0048+00 1/1 0/0 0/0 .text            setCcCylinder__8daE_SB_cFv */
 void daE_SB_c::setCcCylinder() {
     mCyl.SetC(current.pos);
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80781898-80781990 000338 00F8+00 1/1 0/0 0/0 .text ctrlJoint__8daE_SB_cFP8J3DJointP8J3DModel */
 int daE_SB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) {
     int jnt_no = i_joint->getJntNo();
     MtxP anmMtx = param_1->getAnmMtx(jnt_no);
@@ -143,7 +137,6 @@ int daE_SB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* param_1) {
     return 1;
 }
 
-/* 80781990-807819DC 000430 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daE_SB_c* sb_ptr = (daE_SB_c*) j3dSys.getModel()->getUserArea();
@@ -155,18 +148,15 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 807819DC-80781A4C 00047C 0070+00 6/6 0/0 0/0 .text            Particle_Set__8daE_SB_cFUs */
 void daE_SB_c::Particle_Set(u16 param_0) {
     dComIfGp_particle_set(param_0, &current.pos, &tevStr, &shape_angle, NULL);
 }
 
-/* 80781A4C-80781AF8 0004EC 00AC+00 8/8 0/0 0/0 .text            SetAnm__8daE_SB_cFiiff */
 void daE_SB_c::SetAnm(int param_0, int param_1, f32 param_2, f32 param_3) {
     mpMorf->setAnm((J3DAnmTransform*) dComIfG_getObjectRes("E_SB", param_0), param_1, param_2, param_3, 0.0f, -1.0f);
     field_0x608 = param_0;
 }
 
-/* 80781AF8-80781B54 000598 005C+00 8/8 0/0 0/0 .text            MemberClear__8daE_SB_cFv */
 void daE_SB_c::MemberClear() {
     gravity = -9.0f;
     speedF = 0.0f;
@@ -183,7 +173,6 @@ void daE_SB_c::MemberClear() {
     mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_2);
 }
 
-/* 80781B54-80781C2C 0005F4 00D8+00 2/2 0/0 0/0 .text other_bg_check__FP8daE_SB_cP10fopAc_ac_c */
 static BOOL other_bg_check(daE_SB_c* a_this, fopAc_ac_c* i_other) {
     fopAc_ac_c* i_this = (fopAc_ac_c*)a_this;
     dBgS_LinChk line_chk;
@@ -206,7 +195,6 @@ static BOOL other_bg_check(daE_SB_c* a_this, fopAc_ac_c* i_other) {
     return FALSE;
 }
 
-/* 80781C2C-80781D34 0006CC 0108+00 2/2 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* arg0, void* arg1) {
     if (fopAcM_IsActor(arg0) && dBomb_c::checkBombActor((fopAc_ac_c*) arg0)) {
         if (!fopAcM_checkCarryNow((fopAc_ac_c*) arg0) && !((dBomb_c*)arg0)->checkStateExplode()) {
@@ -240,7 +228,6 @@ static void* s_obj_sub(void* arg0, void* arg1) {
     return NULL;
 }
 
-/* 80781D34-80781DD4 0007D4 00A0+00 1/1 0/0 0/0 .text            s_bomb_sub__FPvPv */
 static void* s_bomb_sub(void* arg0, void* arg1) {
     if (fopAcM_GetName(arg0) == PROC_E_BG) {
         // bomb fish:
@@ -267,7 +254,6 @@ static void* s_bomb_sub(void* arg0, void* arg1) {
 
 static u8 l_HIOInit;
 
-/* 80784F84-80784FC4 000054 0040+00 14/16 0/0 0/0 .bss             l_HIO */
 static daE_SB_HIO_c l_HIO;
 
 namespace {
@@ -279,7 +265,6 @@ namespace {
     static cXyz* s_LinkPos;
 }
 
-/* 80781DD4-80781F30 000874 015C+00 1/1 0/0 0/0 .text            Shield_Motion__8daE_SB_cFv */
 void daE_SB_c::Shield_Motion() {
     mpMorf->setAnm((J3DAnmTransform*) dComIfG_getObjectRes("E_SB", 0xB), 0, 5.0f, l_HIO.shield_atk_anm_speed, 0.0f, -1.0f);
     field_0x602 = 1;
@@ -292,7 +277,6 @@ void daE_SB_c::Shield_Motion() {
     dComIfGp_particle_set(0x8478, &current.pos, &tevStr, &shape_angle, NULL);
 }
 
-/* 80781F30-80781F80 0009D0 0050+00 1/1 0/0 0/0 .text            AttackStop__8daE_SB_cFv */
 void daE_SB_c::AttackStop() {
     s_Bomb = (fopAc_ac_c*) fpcM_Search(s_obj_sub, this);
     if (s_Bomb == NULL) {
@@ -300,7 +284,6 @@ void daE_SB_c::AttackStop() {
     }
 }
 
-/* 80781F80-80782180 000A20 0200+00 1/1 0/0 0/0 .text            AttackSetSP__8daE_SB_cFv */
 void daE_SB_c::AttackSetSP() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dBgS_LinChk line_chk;
@@ -337,7 +320,6 @@ void daE_SB_c::AttackSetSP() {
     speedF = l_HIO.atk_jump_xz_axis_speed;
 }
 
-/* 80782180-80782264 000C20 00E4+00 1/1 0/0 0/0 .text            AttackAngle__8daE_SB_cFv */
 void daE_SB_c::AttackAngle() {
     s16 var_r29 = 0x300;
     s16 var_r30 = (field_0x5c0 == 2) ? cLib_targetAngleY(&current.pos, field_0x5ec)
@@ -353,13 +335,11 @@ void daE_SB_c::AttackAngle() {
     cLib_chaseAngleS(&current.angle.y, var_r30, field_0x612);
 }
 
-/* 80782264-807822B8 000D04 0054+00 1/1 0/0 0/0 .text            AttackSpeedMotion__8daE_SB_cFv */
 void daE_SB_c::AttackSpeedMotion() {
     cLib_addCalc2(&speedF, 5.0f, 0.2f, 30.0f);
     gravity = -1.0f;
 }
 
-/* 807822B8-80782650 000D58 0398+00 1/1 0/0 0/0 .text            Attack_Motion__8daE_SB_cFv */
 void daE_SB_c::Attack_Motion() {
     switch (field_0x5ac) {
         case 0: {
@@ -449,7 +429,6 @@ void daE_SB_c::Attack_Motion() {
     }
 }
 
-/* 80782650-80782714 0010F0 00C4+00 1/1 0/0 0/0 .text            Bomb_Death_Motion__8daE_SB_cFv */
 void daE_SB_c::Bomb_Death_Motion() {
     if (field_0x5c8 == 0) {
         dBomb_c::createNormalBombExplode(&current.pos);
@@ -462,13 +441,11 @@ void daE_SB_c::Bomb_Death_Motion() {
     }
 }
 
-/* 80782714-8078273C 0011B4 0028+00 1/1 0/0 0/0 .text            BombJumpSet__8daE_SB_cFv */
 void daE_SB_c::BombJumpSet() {
     speed.y = 0.5f * l_HIO.jump_y_axis_speed;
     speedF = l_HIO.jump_xz_axis_speed;
 }
 
-/* 8078273C-8078294C 0011DC 0210+00 1/1 0/0 0/0 .text            GetHomeSet__8daE_SB_cFv */
 void daE_SB_c::GetHomeSet() {
     if (field_0x5f4.absXZ(current.pos) < 300.0f) {
         speedF = 0.0f;
@@ -491,7 +468,6 @@ void daE_SB_c::GetHomeSet() {
     }
 }
 
-/* 8078294C-807829E8 0013EC 009C+00 1/1 0/0 0/0 .text            HomeJumpMotion__8daE_SB_cFv */
 void daE_SB_c::HomeJumpMotion() {
     if (field_0x604 == 1) {
         speedF = 0.0f;
@@ -505,7 +481,6 @@ void daE_SB_c::HomeJumpMotion() {
     cLib_chaseAngleS(&current.angle.y, temp_r3, 0x200);
 }
 
-/* 807829E8-80782B7C 001488 0194+00 1/1 0/0 0/0 .text            Jump_Normal_Set__8daE_SB_cFv */
 void daE_SB_c::Jump_Normal_Set() {
     f32 my_speed = l_HIO.jump_xz_axis_speed;
     cLib_chaseAngleS(&shape_angle.y, s_TargetAngle, 0x1000);
@@ -530,7 +505,6 @@ void daE_SB_c::Jump_Normal_Set() {
     speedF = my_speed;
 }
 
-/* 80782B7C-80782BD4 00161C 0058+00 1/1 0/0 0/0 .text            Jump_Set__8daE_SB_cFv */
 void daE_SB_c::Jump_Set() {
     switch (field_0x5c0) {
         case 0:
@@ -545,7 +519,6 @@ void daE_SB_c::Jump_Set() {
     }
 }
 
-/* 80782BD4-80782CC8 001674 00F4+00 1/1 0/0 0/0 .text            JumpMiddleMotion__8daE_SB_cFv */
 void daE_SB_c::JumpMiddleMotion() {
     cLib_addCalc2(&speedF, 5.0f, 0.2f, 30.0f);
     gravity = -1.0f;
@@ -564,7 +537,6 @@ void daE_SB_c::JumpMiddleMotion() {
     }
 }
 
-/* 80782CC8-80782E90 001768 01C8+00 1/1 0/0 0/0 .text            Jump_Motion__8daE_SB_cFv */
 void daE_SB_c::Jump_Motion() {
     switch (field_0x5bc) {
         case 0: {
@@ -608,13 +580,11 @@ void daE_SB_c::Jump_Motion() {
     }
 }
 
-/* 80782E90-80782ED4 001930 0044+00 1/1 0/0 0/0 .text            Death_Motion__8daE_SB_cFv */
 void daE_SB_c::Death_Motion() {
     fopAcM_createDisappear(this, &current.pos, 10, 0, 15);
     fopAcM_delete(this);
 }
 
-/* 80782ED4-80782EF4 001974 0020+00 1/1 0/0 0/0 .text            Hanekaeri__8daE_SB_cFv */
 void daE_SB_c::Hanekaeri() {
     // Japanese for "Bounce"
     mCyl.OnTgShield();
@@ -622,14 +592,12 @@ void daE_SB_c::Hanekaeri() {
     field_0x5d0 = 1;
 }
 
-/* 80782EF4-80782F10 001994 001C+00 1/1 0/0 0/0 .text            Hit__8daE_SB_cFv */
 void daE_SB_c::Hit() {
     mCyl.OffTgShield();
     mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_0);
     field_0x5d0 = 0;
 }
 
-/* 80782F10-80783010 0019B0 0100+00 5/5 0/0 0/0 .text            ActionCheck__8daE_SB_cFv */
 void daE_SB_c::ActionCheck() {
     if (field_0x5b0 == 0 || field_0x602 == 1) {
         u8 temp_r27 = daPy_getPlayerActorClass()->getCutCount();
@@ -655,7 +623,6 @@ void daE_SB_c::ActionCheck() {
     Hanekaeri();
 }
 
-/* 80783010-80783404 001AB0 03F4+00 1/1 0/0 0/0 .text            Search__8daE_SB_cFv */
 void daE_SB_c::Search() {
     f32 temp_f31 = current.pos.absXZ(*s_LinkPos);
     f32 temp_f30 = field_0x5f4.absXZ(current.pos);
@@ -694,7 +661,6 @@ void daE_SB_c::Search() {
     }
 }
 
-/* 80783404-807834FC 001EA4 00F8+00 1/1 0/0 0/0 .text            Wait_Motion__8daE_SB_cFv */
 void daE_SB_c::Wait_Motion() {
     switch (field_0x5b4) {
         case 0:
@@ -715,7 +681,6 @@ void daE_SB_c::Wait_Motion() {
     Obj_Damage();
 }
 
-/* 807834FC-807835A0 001F9C 00A4+00 1/1 0/0 0/0 .text            Attack__8daE_SB_cFv */
 void daE_SB_c::Attack() {
     field_0x5cc = dComIfGp_particle_set(field_0x5cc, 0x8473, &current.pos, &tevStr, &shape_angle,
                                         NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -724,7 +689,6 @@ void daE_SB_c::Attack() {
     Attack_Motion();
 }
 
-/* 807835A0-80783678 002040 00D8+00 1/1 0/0 0/0 .text            Shield__8daE_SB_cFv */
 void daE_SB_c::Shield() {
     switch (field_0x5b8) {
         case 0:
@@ -747,7 +711,6 @@ void daE_SB_c::Shield() {
     Obj_Damage();
 }
 
-/* 80783678-80783854 002118 01DC+00 2/1 0/0 0/0 .text            Anm_Motion__8daE_SB_cFv */
 void daE_SB_c::Anm_Motion() {
     switch (field_0x5b0) {
         case 1:
@@ -798,7 +761,6 @@ void daE_SB_c::Anm_Motion() {
     }
 }
 
-/* 80783854-80783914 0022F4 00C0+00 1/1 0/0 0/0 .text            Search_Bomb__8daE_SB_cFv */
 void daE_SB_c::Search_Bomb() {
     s_Bomb = (fopAc_ac_c*) fpcM_Search(s_obj_sub, this);
     if (s_Bomb != NULL) {
@@ -819,7 +781,6 @@ void daE_SB_c::Search_Bomb() {
     }
 }
 
-/* 80783914-80783A9C 0023B4 0188+00 1/1 0/0 0/0 .text            ChanceMotion__8daE_SB_cFv */
 void daE_SB_c::ChanceMotion() {
     if (field_0x5e6 <= 0) {
         mSound.startCreatureSound(Z2SE_EN_SB_DEATH, 0, -1);
@@ -847,7 +808,6 @@ void daE_SB_c::ChanceMotion() {
     Shield_Motion();
 }
 
-/* 80783A9C-80783B4C 00253C 00B0+00 1/1 0/0 0/0 .text            NoChanceMotion__8daE_SB_cFv */
 void daE_SB_c::NoChanceMotion() {
     if (mAcch.ChkGroundHit()) {
         if (speed.y <= 0.0f) {
@@ -862,7 +822,6 @@ void daE_SB_c::NoChanceMotion() {
     }
 }
 
-/* 80783B4C-80783FBC 0025EC 0470+00 5/5 0/0 0/0 .text            Obj_Damage__8daE_SB_cFv */
 void daE_SB_c::Obj_Damage() {
     if (field_0x60c > 0) {
         mCyl.OffTgSetBit();
@@ -990,7 +949,6 @@ void daE_SB_c::Obj_Damage() {
     }
 }
 
-/* 80783FBC-80784144 002A5C 0188+00 1/1 0/0 0/0 .text            HashiraVib__8daE_SB_cFv */
 void daE_SB_c::HashiraVib() {
     // "Hashira" means pillar.
     field_0x5d4 += 6000.0f;
@@ -1001,7 +959,6 @@ void daE_SB_c::HashiraVib() {
     field_0x5de.y = field_0x5d2 * cM_ssin(field_0x5d4 - 8192.0f);
 }
 
-/* 80784144-807841CC 002BE4 0088+00 1/1 0/0 0/0 .text            Yazirushi__8daE_SB_cFv */
 void daE_SB_c::Yazirushi() {
     eyePos.x = current.pos.x;
     eyePos.z = current.pos.z;
@@ -1014,7 +971,6 @@ void daE_SB_c::Yazirushi() {
     s_TargetAngle = cLib_targetAngleY(&current.pos, s_LinkPos);
 }
 
-/* 807841CC-80784390 002C6C 01C4+00 1/1 0/0 0/0 .text            setGroundAngle__8daE_SB_cFv */
 void daE_SB_c::setGroundAngle() {
     cXyz vec_0x44;
     cXyz vec_0x38;
@@ -1044,7 +1000,6 @@ void daE_SB_c::setGroundAngle() {
     }
 }
 
-/* 80784390-807844BC 002E30 012C+00 1/1 0/0 0/0 .text            Execute__8daE_SB_cFv */
 int daE_SB_c::Execute() {
     s_LinkPos = &fopAcM_GetPosition(daPy_getPlayerActorClass());
     field_0x5c8 -= 1;
@@ -1078,7 +1033,6 @@ int daE_SB_c::Execute() {
     return 1;
 }
 
-/* 807844BC-807845D8 002F5C 011C+00 1/1 0/0 0/0 .text            Draw__8daE_SB_cFv */
 int daE_SB_c::Draw() {
     J3DModel* model = mpMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -1102,7 +1056,6 @@ int daE_SB_c::Draw() {
     return 1;
 }
 
-/* 807845D8-80784640 003078 0068+00 1/1 0/0 0/0 .text            Delete__8daE_SB_cFv */
 int daE_SB_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "E_SB");
     if (field_0xbbc) {
@@ -1116,7 +1069,6 @@ int daE_SB_c::Delete() {
     return 1;
 }
 
-/* 80784640-807846B8 0030E0 0078+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_SB_cFv */
 void daE_SB_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x614);
@@ -1127,27 +1079,22 @@ void daE_SB_c::setBaseMtx() {
     mpMorf->modelCalc();
 }
 
-/* 807846B8-807846D8 003158 0020+00 1/0 0/0 0/0 .text            daE_SB_Draw__FP8daE_SB_c */
 static int daE_SB_Draw(daE_SB_c* i_this) {
     return i_this->Draw();
 }
 
-/* 807846D8-807846F8 003178 0020+00 2/1 0/0 0/0 .text            daE_SB_Execute__FP8daE_SB_c */
 static int daE_SB_Execute(daE_SB_c* i_this) {
     return i_this->Execute();
 }
 
-/* 807846F8-80784700 003198 0008+00 1/0 0/0 0/0 .text            daE_SB_IsDelete__FP8daE_SB_c */
 static int daE_SB_IsDelete(daE_SB_c*) {
     return 1;
 }
 
-/* 80784700-80784720 0031A0 0020+00 1/0 0/0 0/0 .text            daE_SB_Delete__FP8daE_SB_c */
 static int daE_SB_Delete(daE_SB_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80784720-80784B58 0031C0 0438+00 1/1 0/0 0/0 .text            Create__8daE_SB_cFv */
 cPhs__Step daE_SB_c::Create() {
     fopAcM_ct(this, daE_SB_c);
     cPhs__Step phase = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "E_SB");
@@ -1210,12 +1157,10 @@ cPhs__Step daE_SB_c::Create() {
     return phase;
 }
 
-/* 80784CA0-80784CC0 003740 0020+00 1/0 0/0 0/0 .text            daE_SB_Create__FP10fopAc_ac_c */
 static int daE_SB_Create(fopAc_ac_c* i_this) {
     return static_cast<daE_SB_c*>(i_this)->Create();
 }
 
-/* 80784E88-80784EA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SB_Method */
 static actor_method_class l_daE_SB_Method = {
     (process_method_func)daE_SB_Create,
     (process_method_func)daE_SB_Delete,
@@ -1224,7 +1169,6 @@ static actor_method_class l_daE_SB_Method = {
     (process_method_func)daE_SB_Draw,
 };
 
-/* 80784EA8-80784ED8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SB */
 extern actor_process_profile_definition g_profile_E_SB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp
index a493f946ce..cc6380feb7 100644
--- a/src/d/actor/d_a_e_sf.cpp
+++ b/src/d/actor/d_a_e_sf.cpp
@@ -130,8 +130,8 @@ enum Action_Phase {
 
 class daE_SF_HIO_c {
 public:
-    /* 8078512C */ daE_SF_HIO_c();
-    /* 8078977C */ virtual ~daE_SF_HIO_c() {}
+    daE_SF_HIO_c();
+    virtual ~daE_SF_HIO_c() {}
 
     /* スタルフォス - Stalfos */
     /* 0x04 */ s8 id;
@@ -145,7 +145,6 @@ public:
     /* 0x24 */ u8 invulnerable;             // 不死身 - Invulnerable
 };
 
-/* 8078512C-80785188 0000EC 005C+00 1/1 0/0 0/0 .text            __ct__12daE_SF_HIO_cFv */
 daE_SF_HIO_c::daE_SF_HIO_c() {
     id = -1;
     basic_size = 1.2f;
@@ -158,13 +157,11 @@ daE_SF_HIO_c::daE_SF_HIO_c() {
     invulnerable = false;
 }
 
-/* 80785188-80785234 000148 00AC+00 11/11 0/0 0/0 .text            anm_init__FP10e_sf_classifUcf */
 static void anm_init(e_sf_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_sf", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 80785234-8078545C 0001F4 0228+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -206,7 +203,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8078545C-80785654 00041C 01F8+00 1/0 0/0 0/0 .text            daE_SF_Draw__FP10e_sf_class */
 static int daE_SF_Draw(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -254,7 +250,6 @@ static int daE_SF_Draw(e_sf_class* i_this) {
     return 1;
 }
 
-/* 80785654-8078572C 000614 00D8+00 1/1 0/0 0/0 .text            other_bg_check__FP10e_sf_classP10fopAc_ac_c */
 static BOOL other_bg_check(e_sf_class* i_this, fopAc_ac_c* i_actor) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -274,7 +269,6 @@ static BOOL other_bg_check(e_sf_class* i_this, fopAc_ac_c* i_actor) {
     return FALSE;
 }
 
-/* 8078572C-80785770 0006EC 0044+00 2/2 0/0 0/0 .text            player_way_check__FP10e_sf_class */
 static BOOL player_way_check(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -291,7 +285,6 @@ static BOOL player_way_check(e_sf_class* i_this) {
     return TRUE;
 }
 
-/* 80785770-80785880 000730 0110+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_sf_classff */
 static BOOL way_bg_check(e_sf_class* i_this, f32 param_2, f32 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -314,7 +307,6 @@ static BOOL way_bg_check(e_sf_class* i_this, f32 param_2, f32 param_3) {
     return FALSE;
 }
 
-/* 80785880-80785944 000840 00C4+00 2/2 0/0 0/0 .text            pl_check__FP10e_sf_classfs */
 static int pl_check(e_sf_class* i_this, f32 i_distance, s16 param_3) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -337,10 +329,8 @@ static int pl_check(e_sf_class* i_this, f32 i_distance, s16 param_3) {
 
 static bool l_initHIO;
 
-/* 8078A07C-8078A0A4 000054 0028+00 8/9 0/0 0/0 .bss             l_HIO */
 static daE_SF_HIO_c l_HIO;
 
-/* 80785944-80785BF8 000904 02B4+00 1/1 0/0 0/0 .text            e_sf_normal__FP10e_sf_class */
 static void e_sf_normal(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz angle_delta, sp54;
@@ -406,7 +396,6 @@ static void e_sf_normal(e_sf_class* i_this) {
     }
 }
 
-/* 80785BF8-80785D30 000BB8 0138+00 1/1 0/0 0/0 .text            e_sf_drawback__FP10e_sf_class */
 static void e_sf_drawback(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -434,7 +423,6 @@ static void e_sf_drawback(e_sf_class* i_this) {
     }
 }
 
-/* 80785D30-807860F4 000CF0 03C4+00 2/1 0/0 0/0 .text            e_sf_fight_run__FP10e_sf_class */
 static void e_sf_fight_run(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp44, sp50;
@@ -537,7 +525,6 @@ static void e_sf_fight_run(e_sf_class* i_this) {
     }
 }
 
-/* 807860F4-80786154 0010B4 0060+00 2/2 0/0 0/0 .text            at_hit_check__FP10e_sf_class */
 static fopAc_ac_c* at_hit_check(e_sf_class* i_this) {
     dComIfGp_getPlayer(0);
 
@@ -556,7 +543,6 @@ static f32 dummy() {
     return 40.0f;
 }
 
-/* 80786154-8078632C 001114 01D8+00 1/1 0/0 0/0 .text            e_sf_attack_0__FP10e_sf_class */
 static void e_sf_attack_0(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -601,7 +587,6 @@ static void e_sf_attack_0(e_sf_class* i_this) {
     }
 }
 
-/* 8078632C-80786524 0012EC 01F8+00 1/1 0/0 0/0 .text            e_sf_attack__FP10e_sf_class */
 static void e_sf_attack(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp34, sp40;
@@ -655,7 +640,6 @@ static void e_sf_attack(e_sf_class* i_this) {
     }
 }
 
-/* 80786524-807866F8 0014E4 01D4+00 1/1 0/0 0/0 .text            e_sf_guard__FP10e_sf_class */
 static int e_sf_guard(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -714,7 +698,6 @@ static int e_sf_guard(e_sf_class* i_this) {
     return rv;
 }
 
-/* 807866F8-80786844 0016B8 014C+00 1/1 0/0 0/0 .text            e_sf_s_damage__FP10e_sf_class */
 static void e_sf_s_damage(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -745,16 +728,12 @@ static void e_sf_s_damage(e_sf_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 8078A0A4-8078A0CC 00007C 0028+00 0/0 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[10];
 
-/* 8078A0CC-8078A0D0 0000A4 0004+00 0/0 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 8078A0D0-8078A0D4 0000A8 0004+00 1/2 0/0 0/0 .bss             ret_ct */
 static int ret_ct;
 
-/* 80786844-80786B70 001804 032C+00 1/1 0/0 0/0 .text            e_sf_crash__FP10e_sf_class */
 static void e_sf_crash(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -818,7 +797,6 @@ static void e_sf_crash(e_sf_class* i_this) {
     }
 }
 
-/* 80786B70-80786C50 001B30 00E0+00 1/1 0/0 0/0 .text            e_sf_crashwait__FP10e_sf_class */
 static void e_sf_crashwait(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -842,7 +820,6 @@ static void e_sf_crashwait(e_sf_class* i_this) {
     }
 }
 
-/* 80786C50-80786DC0 001C10 0170+00 1/1 0/0 0/0 .text            e_sf_sitwait__FP10e_sf_class */
 static s16 e_sf_sitwait(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dComIfGp_getPlayer(0);
@@ -883,7 +860,6 @@ static s16 e_sf_sitwait(e_sf_class* i_this) {
     return rv;
 }
 
-/* 80786DC0-80787018 001D80 0258+00 1/1 0/0 0/0 .text            e_sf_getup__FP10e_sf_class */
 static s16 e_sf_getup(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -945,7 +921,6 @@ static s16 e_sf_getup(e_sf_class* i_this) {
     return rv;
 }
 
-/* 80787018-807870D0 001FD8 00B8+00 1/1 0/0 0/0 .text            crash_eff__FP10e_sf_class */
 static void crash_eff(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz scale(1.5f, 1.5f, 1.5f);
@@ -961,7 +936,6 @@ static void crash_eff(e_sf_class* i_this) {
     }
 }
 
-/* 807870D0-807873C0 002090 02F0+00 1/1 0/0 0/0 .text            damage_check__FP10e_sf_class */
 static void damage_check(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1060,7 +1034,6 @@ static void damage_check(e_sf_class* i_this) {
     }
 }
 
-/* 807873C0-80787DD8 002380 0A18+00 2/1 0/0 0/0 .text            action__FP10e_sf_class */
 static void action(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1353,7 +1326,6 @@ static void action(e_sf_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &i_effSize);
 }
 
-/* 80787DD8-80787FE0 002D98 0208+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_sf_class */
 static void anm_se_set(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     s8 play_footnote = 0;
@@ -1388,7 +1360,6 @@ static void anm_se_set(e_sf_class* i_this) {
     }
 }
 
-/* 80787FE0-80788568 002FA0 0588+00 1/1 0/0 0/0 .text            demo_camera__FP10e_sf_class */
 static void demo_camera(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1523,7 +1494,6 @@ static void demo_camera(e_sf_class* i_this) {
     }
 }
 
-/* 80788568-80788D38 003528 07D0+00 2/1 0/0 0/0 .text            daE_SF_Execute__FP10e_sf_class */
 static int daE_SF_Execute(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp2c, sp38, sp44;
@@ -1703,12 +1673,10 @@ static int daE_SF_Execute(e_sf_class* i_this) {
     return 1;
 }
 
-/* 80788D38-80788D40 003CF8 0008+00 1/0 0/0 0/0 .text            daE_SF_IsDelete__FP10e_sf_class */
 static int daE_SF_IsDelete(e_sf_class* i_this) {
     return 1;
 }
 
-/* 80788D40-80788DA8 003D00 0068+00 1/0 0/0 0/0 .text            daE_SF_Delete__FP10e_sf_class */
 static int daE_SF_Delete(e_sf_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1726,7 +1694,6 @@ static int daE_SF_Delete(e_sf_class* i_this) {
     return 1;
 }
 
-/* 80788DA8-80788F88 003D68 01E0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_sf_class* i_this = (e_sf_class*)a_this;
 
@@ -1772,7 +1739,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80788F88-80789418 003F48 0490+00 1/0 0/0 0/0 .text            daE_SF_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_SF_Create(fopAc_ac_c* a_this) {
     e_sf_class* i_this = (e_sf_class*)a_this;
     fopAcM_ct(a_this, e_sf_class);
@@ -1909,7 +1875,6 @@ static cPhs__Step daE_SF_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 80789F6C-80789F8C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SF_Method */
 static actor_method_class l_daE_SF_Method = {
     (process_method_func)daE_SF_Create,
     (process_method_func)daE_SF_Delete,
@@ -1918,7 +1883,6 @@ static actor_method_class l_daE_SF_Method = {
     (process_method_func)daE_SF_Draw,
 };
 
-/* 80789F8C-80789FBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SF */
 extern actor_process_profile_definition g_profile_E_SF = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp
index dc8f4f7067..01df06d016 100644
--- a/src/d/actor/d_a_e_sg.cpp
+++ b/src/d/actor/d_a_e_sg.cpp
@@ -29,13 +29,11 @@ enum Mode {
     /* 0xB */ MODE_TARGET = 0xB,
 };
 
-/* 8078DEB4-8078DF34 000000 0080+00 4/4 0/0 0/0 .data            stick_bit */
 static int stick_bit[32] = {1 << 0,  1 << 1,  1 << 2,  1 << 3,  1 << 4,  1 << 5,  1 << 6,  1 << 7,
                             1 << 8,  1 << 9,  1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15,
                             1 << 16, 1 << 17, 1 << 18, 1 << 19, 1 << 20, 1 << 21, 1 << 22, 1 << 23,
                             1 << 24, 1 << 25, 1 << 26, 1 << 27, 1 << 28, 1 << 29, 1 << 30, 1 << 31};
 
-/* 8078DF34-8078DF70 000080 0039+03 2/2 0/0 0/0 .data            stick_d */
 typedef struct {
     s8 joint_no;
     s8 y;
@@ -48,7 +46,6 @@ static stick_info stick_d[19] = {
     {0x19, 0, 10},  {0x0E, 0, 10}, {0x20, 0, 0},  {0x14, 0, 10},
 };
 
-/* 8078A22C-8078A26C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daE_SG_HIO_cFv */
 daE_SG_HIO_c::daE_SG_HIO_c() {
     mUnk0 = -1;
     mScaleFactor = 1.2f;
@@ -57,7 +54,6 @@ daE_SG_HIO_c::daE_SG_HIO_c() {
     mPlayerHeightThreshold = 500.0f;
 }
 
-/* 8078A26C-8078A400 00012C 0194+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int i_callbackCondition) {
     if (i_callbackCondition == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -88,7 +84,6 @@ static int nodeCallBack(J3DJoint* i_joint, int i_callbackCondition) {
     return 1;
 }
 
-/* 8078A400-8078A4DC 0002C0 00DC+00 1/0 0/0 0/0 .text            daE_SG_Draw__FP10e_sg_class */
 static int daE_SG_Draw(e_sg_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -109,16 +104,12 @@ static int daE_SG_Draw(e_sg_class* i_this) {
     return 1;
 }
 
-/* 8078E0DC-8078E0E0 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hio_init;
 
-/* 8078E0EC-8078E104 000054 0018+00 8/10 0/0 0/0 .bss             l_HIO */
 static daE_SG_HIO_c l_HIO;
 
-/* 8078E104-8078E108 00006C 0004+00 4/4 0/0 0/0 .bss             stick_pt */
 static int stick_pt;
 
-/* 8078A518-8078A588 0003D8 0070+00 1/1 0/0 0/0 .text            pl_joint_search__FP10e_sg_class */
 static void pl_joint_search(e_sg_class* i_this) {
     if (stick_pt != 0x7ffff) {
         for (int i = 0; i < 19; i++) {
@@ -135,7 +126,6 @@ static void pl_joint_search(e_sg_class* i_this) {
     }
 }
 
-/* 8078A588-8078A67C 000448 00F4+00 3/3 0/0 0/0 .text otherBgCheck__FP10fopAc_ac_cP4cXyzP4cXyz */
 static int otherBgCheck(fopAc_ac_c* i_this, cXyz* i_end_pos, cXyz* o_cross_pos) {
     dBgS_LinChk line_check;
     cXyz start_pos;
@@ -157,19 +147,14 @@ static int otherBgCheck(fopAc_ac_c* i_this, cXyz* i_end_pos, cXyz* o_cross_pos)
     return 0;
 }
 
-/* 8078E108-8078E130 000070 0028+00 1/2 0/0 0/0 .bss             target_info */
 static obj_kbox_class* target_info[10];
 
-/* 8078E130-8078E13C 000098 000A+02 0/1 0/0 0/0 .bss             bg_on */
 static s8 bg_on[10];
 
-/* 8078E148-8078E1C0 0000B0 0078+00 1/3 0/0 0/0 .bss             bg_cross */
 static cXyz bg_cross[10];
 
-/* 8078E1C0-8078E1C4 000128 0004+00 1/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 8078A67C-8078A6EC 00053C 0070+00 1/1 0/0 0/0 .text            s_box_sub__FPvPv */
 static void* s_box_sub(void* i_ac, void*) {
     if (fopAcM_IsActor(i_ac) && fopAcM_GetName(i_ac) == PROC_OBJ_KBOX && target_info_count < 10) {
         target_info[target_info_count] = (obj_kbox_class*)i_ac;
@@ -179,7 +164,6 @@ static void* s_box_sub(void* i_ac, void*) {
     return NULL;
 }
 
-/* 8078A6EC-8078A9B8 0005AC 02CC+00 1/1 0/0 0/0 .text            search_box__FP10e_sg_class */
 static obj_kbox_class* search_box(e_sg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     target_info_count = 0;
@@ -228,7 +212,6 @@ static obj_kbox_class* search_box(e_sg_class* i_this) {
     return NULL;
 }
 
-/* 8078A9B8-8078AA3C 000878 0084+00 1/1 0/0 0/0 .text            search_esa__FP10e_sg_class */
 static dmg_rod_class* search_esa(e_sg_class* i_this) {
     dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD);
 
@@ -241,7 +224,6 @@ static dmg_rod_class* search_esa(e_sg_class* i_this) {
     return NULL;
 }
 
-/* 8078AA3C-8078B114 0008FC 06D8+00 1/1 0/0 0/0 .text            e_sg_move__FP10e_sg_class */
 static void e_sg_move(e_sg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -377,7 +359,6 @@ static void e_sg_move(e_sg_class* i_this) {
     i_this->mRotationTarget = 0;
 }
 
-/* 8078B114-8078B618 000FD4 0504+00 1/1 0/0 0/0 .text            e_sg_search__FP10e_sg_class */
 static void e_sg_search(e_sg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -454,8 +435,6 @@ static void e_sg_search(e_sg_class* i_this) {
     i_this->mAttackCollistion = true;
 }
 
-/* 8078B618-8078BC24 0014D8 060C+00 1/1 0/0 0/0 .text            e_sg_b_search__FP10e_sg_class
- */
 static void e_sg_b_search(e_sg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     obj_kbox_class* kbox_ac = (obj_kbox_class*)fopAcM_SearchByID(i_this->mTargetActorID);
@@ -546,8 +525,6 @@ static void e_sg_b_search(e_sg_class* i_this) {
     }
 }
 
-/* 8078BC24-8078C068 001AE4 0444+00 1/1 0/0 0/0 .text            e_sg_esa_search__FP10e_sg_class
- */
 static void e_sg_esa_search(e_sg_class* i_this) {
     fopAc_ac_c* target = fopAcM_SearchByID(i_this->mTargetActorID);
 
@@ -622,7 +599,6 @@ static void e_sg_esa_search(e_sg_class* i_this) {
     }
 }
 
-/* 8078C068-8078C470 001F28 0408+00 1/1 0/0 0/0 .text            e_sg_kamu__FP10e_sg_class */
 static void e_sg_kamu(e_sg_class* i_this) {
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
 
@@ -698,7 +674,6 @@ static void e_sg_kamu(e_sg_class* i_this) {
                         cM_ssin(i_this->mRandomSeed * 0x1500) * 2000.0f + 3000.0f, 1, 0x2000);
 }
 
-/* 8078C470-8078C77C 002330 030C+00 1/1 0/0 0/0 .text            e_sg_drop__FP10e_sg_class */
 static void e_sg_drop(e_sg_class* i_this) {
     cXyz local_3c;
     cXyz local_48;
@@ -767,7 +742,6 @@ static void e_sg_drop(e_sg_class* i_this) {
     }
 }
 
-/* 8078C77C-8078CA1C 00263C 02A0+00 1/1 0/0 0/0 .text            e_sg_damage__FP10e_sg_class */
 static void e_sg_damage(e_sg_class* i_this) {
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
 
@@ -833,7 +807,6 @@ static void e_sg_damage(e_sg_class* i_this) {
     }
 }
 
-/* 8078CA1C-8078CB14 0028DC 00F8+00 1/1 0/0 0/0 .text            damage_check__FP10e_sg_class */
 static void damage_check(e_sg_class* i_this) {
     if (i_this->mInvincibilityTimer == 0) {
         i_this->mStts.Move();
@@ -863,7 +836,6 @@ static void damage_check(e_sg_class* i_this) {
     }
 }
 
-/* 8078CB14-8078CF34 0029D4 0420+00 2/1 0/0 0/0 .text            action__FP10e_sg_class */
 static void action(e_sg_class* i_this) {
     s8 move_flag = false;
     s8 att_flag = true;
@@ -990,8 +962,6 @@ static void action(e_sg_class* i_this) {
     }
 }
 
-/* 8078CF34-8078D5F4 002DF4 06C0+00 2/1 0/0 0/0 .text            daE_SG_Execute__FP10e_sg_class
- */
 static int daE_SG_Execute(e_sg_class* i_this) {
     if (i_this->mInactive) {
         return 1;
@@ -1127,14 +1097,10 @@ static int daE_SG_Execute(e_sg_class* i_this) {
     return 1;
 }
 
-/* 8078D5F4-8078D5FC 0034B4 0008+00 1/0 0/0 0/0 .text            daE_SG_IsDelete__FP10e_sg_class
- */
 static int daE_SG_IsDelete(e_sg_class* i_this) {
     return 1;
 }
 
-/* 8078D5FC-8078D6B0 0034BC 00B4+00 1/0 0/0 0/0 .text            daE_SG_Delete__FP10e_sg_class
- */
 static int daE_SG_Delete(e_sg_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "E_sg");
 
@@ -1154,15 +1120,12 @@ static int daE_SG_Delete(e_sg_class* i_this) {
     return 1;
 }
 
-/* 8078DFA4-8078DFB0 0000F0 000C+00 1/0 0/0 0/0 .data            jv_offset */
 static Vec jv_offset = {0.0f, 0.0f, 0.0f};
 
-/* 8078DFB0-8078DFBC -00001 000C+00 1/1 0/0 0/0 .data            jc_data */
 static dJntColData_c jc_data = {
     0x00, 0x01, 0x0001, 10.0f, &jv_offset,
 };
 
-/* 8078D6B0-8078D780 003570 00D0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_sg_class* a_this = static_cast<e_sg_class*>(i_this);
 
@@ -1184,8 +1147,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8078D780-8078DB84 003640 0404+00 1/0 0/0 0/0 .text            daE_SG_Create__FP10fopAc_ac_c
- */
 static int daE_SG_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1283,18 +1244,14 @@ static int daE_SG_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 8078E1E0-8078E244 000148 0004+00 0/0 0/0 0/0 .bss
- * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */
 AUDIO_INSTANCES;
 
-/* 8078DFFC-8078E01C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SG_Method */
 static actor_method_class l_daE_SG_Method = {
     (process_method_func)daE_SG_Create,  (process_method_func)daE_SG_Delete,
     (process_method_func)daE_SG_Execute, (process_method_func)daE_SG_IsDelete,
     (process_method_func)daE_SG_Draw,
 };
 
-/* 8078E01C-8078E04C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SG */
 extern actor_process_profile_definition g_profile_E_SG = {
     fpcLy_CURRENT_e,       // mLayerID
     7,                     // mListID
diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp
index 952f8316b4..f091d35a82 100644
--- a/src/d/actor/d_a_e_sh.cpp
+++ b/src/d/actor/d_a_e_sh.cpp
@@ -7,14 +7,13 @@
 
 #include "d/actor/d_a_e_sh.h"
 #include "d/d_cc_d.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor_enemy.h"
 #include "f_op/f_op_camera_mng.h"
 
 class daE_SH_HIO_c : public JORReflexible {
 public:
-    /* 8078E34C */ daE_SH_HIO_c();
-    /* 807918B4 */ virtual ~daE_SH_HIO_c() {}
+    daE_SH_HIO_c();
+    virtual ~daE_SH_HIO_c() {}
 #if DEBUG
     void genMessage(JORMContext*);
 #endif
@@ -31,7 +30,6 @@ public:
     /* 0x28 */ u8 mIgnoreTime;
 };
 
-/* 8078E34C-8078E3B4 0000EC 0068+00 1/1 0/0 0/0 .text            __ct__12daE_SH_HIO_cFv */
 daE_SH_HIO_c::daE_SH_HIO_c() {
     mChild = -1;
     mBaseSize = 1.15f;
@@ -61,14 +59,12 @@ void daE_SH_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 8078E3B4-8078E460 000154 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_sh_classifUcf */
 static void anm_init(e_sh_class* i_this, int i_resIndex, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mAnm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_sh", i_resIndex), i_attr,
                            i_morf, i_rate, 0.0f, -1.0f);
     i_this->mCurAnm = i_resIndex;
 }
 
-/* 8078E460-8078E6B8 000200 0258+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DJoint* joint = i_joint;
@@ -117,7 +113,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8078E6B8-8078E868 000458 01B0+00 1/0 0/0 0/0 .text            daE_SH_Draw__FP10e_sh_class */
 static int daE_SH_Draw(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
     J3DModel* model = i_this->mAnm_p->getModel();
@@ -154,7 +149,6 @@ static int daE_SH_Draw(e_sh_class* i_this) {
     return 1;
 }
 
-/* 8078E868-8078EA58 000608 01F0+00 1/1 0/0 0/0 .text            damage_check__FP10e_sh_class */
 static void damage_check(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
     fopAc_ac_c* unusedPlayer = dComIfGp_getPlayer(0);
@@ -208,13 +202,10 @@ static void damage_check(e_sh_class* i_this) {
     }
 }
 
-/* 807920F8-807920FC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80792108-80792134 000018 002C+00 8/8 0/0 0/0 .bss             l_HIO */
 static daE_SH_HIO_c l_HIO;
 
-/* 8078EA58-8078EC04 0007F8 01AC+00 1/1 0/0 0/0 .text            e_sh_stop__FP10e_sh_class */
 static void e_sh_stop(e_sh_class* i_this) {
     static u16 ap_name[3] = {
         dPa_RM(ID_ZI_S_SH_APPEAR_A),
@@ -258,7 +249,6 @@ static void e_sh_stop(e_sh_class* i_this) {
     }
 }
 
-/* 8078EC04-8078ECCC 0009A4 00C8+00 1/1 0/0 0/0 .text            e_sh_appear__FP10e_sh_class */
 static void e_sh_appear(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 
@@ -279,7 +269,6 @@ static void e_sh_appear(e_sh_class* i_this) {
     }
 }
 
-/* 8078ECCC-8078F728 000A6C 0A5C+00 1/1 0/0 0/0 .text            e_sh_move__FP10e_sh_class */
 static void e_sh_move(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 
@@ -529,7 +518,6 @@ lbl_4a8:
     }
 }
 
-/* 8078F728-8078FA38 0014C8 0310+00 1/1 0/0 0/0 .text            e_sh_attack__FP10e_sh_class */
 static void e_sh_attack(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 
@@ -615,7 +603,6 @@ static void e_sh_attack(e_sh_class* i_this) {
     }
 }
 
-/* 8078FA38-8078FBC8 0017D8 0190+00 1/1 0/0 0/0 .text            e_sh_disappear__FP10e_sh_class */
 static void e_sh_disappear(e_sh_class* i_this) {
     static u16 dp_name[3] = {
         dPa_RM(ID_ZI_S_SH_DISAPPEAR_A),
@@ -654,7 +641,6 @@ static void e_sh_disappear(e_sh_class* i_this) {
     cLib_addCalc0(&actor->speedF, 1.0f, TREG_F(10) + 4.0f);
 }
 
-/* 8078FBC8-8078FCC0 001968 00F8+00 1/1 0/0 0/0 .text            e_sh_damage__FP10e_sh_class */
 static void e_sh_damage(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 
@@ -684,7 +670,6 @@ static void e_sh_damage(e_sh_class* i_this) {
     }
 }
 
-/* 8078FCC0-8078FDB0 001A60 00F0+00 1/1 0/0 0/0 .text            e_sh_dead__FP10e_sh_class */
 static void e_sh_dead(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
 
@@ -715,7 +700,6 @@ static void e_sh_dead(e_sh_class* i_this) {
     }
 }
 
-/* 8078FDB0-80790278 001B50 04C8+00 2/1 0/0 0/0 .text            action__FP10e_sh_class */
 static void action(e_sh_class* i_this) {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->enemy;
 
@@ -863,7 +847,6 @@ static void action(e_sh_class* i_this) {
     setMidnaBindEffect(enemy, &i_this->mSound, &enemy->eyePos, &effSize);
 }
 
-/* 80790278-80790498 002018 0220+00 1/1 0/0 0/0 .text            eff_set__FP10e_sh_class */
 static void eff_set(e_sh_class* i_this) {
     static u16 p_name[2] = {
         dPa_RM(ID_ZI_S_SH_YODAPOTA_A),
@@ -910,7 +893,6 @@ static void eff_set(e_sh_class* i_this) {
     }
 }
 
-/* 80790498-80790950 002238 04B8+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_sh_class */
 static void anm_se_set(e_sh_class* i_this) {
     s8 playSound = FALSE;
     if (i_this->mCurAnm == 4) {
@@ -977,7 +959,6 @@ static void anm_se_set(e_sh_class* i_this) {
     }
 }
 
-/* 80790950-80790FC0 0026F0 0670+00 2/1 0/0 0/0 .text            daE_SH_Execute__FP10e_sh_class */
 static int daE_SH_Execute(e_sh_class* i_this) {
     static f32 time_scale[25] = {
         1.0f, 1.0f, 1.0f, 1.0f, 0.8f, 0.6f, 0.4f, 0.2f,
@@ -1122,12 +1103,10 @@ static int daE_SH_Execute(e_sh_class* i_this) {
     return 1;
 }
 
-/* 80790FC0-80790FC8 002D60 0008+00 1/0 0/0 0/0 .text            daE_SH_IsDelete__FP10e_sh_class */
 static int daE_SH_IsDelete(e_sh_class* i_this) {
     return TRUE;
 }
 
-/* 80790FC8-80791030 002D68 0068+00 1/0 0/0 0/0 .text            daE_SH_Delete__FP10e_sh_class */
 static int daE_SH_Delete(e_sh_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->enemy;
     fpc_ProcID unusedId = fopAcM_GetID(i_this);
@@ -1146,7 +1125,6 @@ static int daE_SH_Delete(e_sh_class* i_this) {
     return 1;
 }
 
-/* 80791030-807911D8 002DD0 01A8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     u16 i1, i2;
 
@@ -1179,7 +1157,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 807911D8-80791550 002F78 0378+00 1/0 0/0 0/0 .text            daE_SH_Create__FP10fopAc_ac_c */
 static int daE_SH_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1277,7 +1254,6 @@ static int daE_SH_Create(fopAc_ac_c* i_this) {
     return resLoadResult;
 }
 
-/* 80792030-80792050 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SH_Method */
 static actor_method_class l_daE_SH_Method = {
     (process_method_func)daE_SH_Create,
     (process_method_func)daE_SH_Delete,
@@ -1286,7 +1262,6 @@ static actor_method_class l_daE_SH_Method = {
     (process_method_func)daE_SH_Draw,
 };
 
-/* 80792050-80792080 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SH */
 extern actor_process_profile_definition g_profile_E_SH = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp
index 18125a1db4..bc63ac103d 100644
--- a/src/d/actor/d_a_e_sm.cpp
+++ b/src/d/actor/d_a_e_sm.cpp
@@ -68,8 +68,8 @@ enum Core_Action {
 
 class daE_Sm_HIO_c : public JORReflexible {
 public:
-    /* 8079222C */ daE_Sm_HIO_c();
-    /* 807980E8 */ virtual ~daE_Sm_HIO_c() {}
+    daE_Sm_HIO_c();
+    virtual ~daE_Sm_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -80,7 +80,6 @@ public:
     /* 0x10 */ f32 core_size;       // コア大きさ - Core Size
 };
 
-/* 8079222C-80792260 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__12daE_Sm_HIO_cFv */
 daE_Sm_HIO_c::daE_Sm_HIO_c() {
     field_0x4 = -1;
     basic_size = 1.0f;
@@ -88,13 +87,11 @@ daE_Sm_HIO_c::daE_Sm_HIO_c() {
     core_size = 1.0f;
 }
 
-/* 80792260-8079230C 000120 00AC+00 13/13 0/0 0/0 .text            SetAnm__8daE_SM_cFiiff */
 void daE_SM_c::SetAnm(int i_index, int i_attr, f32 i_rate, f32 i_morf) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_SM", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     mAnm = i_index;
 }
 
-/* 8079230C-80792604 0001CC 02F8+00 1/1 0/0 0/0 .text            Draw__8daE_SM_cFv */
 int daE_SM_c::Draw() {
     J3DModel* model = mpModelMorf->getModel();
 
@@ -137,7 +134,6 @@ int daE_SM_c::Draw() {
     return 1;
 }
 
-/* 80792604-80792720 0004C4 011C+00 3/3 0/0 0/0 .text            way_bg_check__FP8daE_SM_cf4cXyzs */
 static BOOL way_bg_check(daE_SM_c* i_this, f32 param_2, cXyz param_3, s16 param_4) {
     dBgS_LinChk lin_chk;
     cXyz sp94, i_start, i_end;
@@ -159,7 +155,6 @@ static BOOL way_bg_check(daE_SM_c* i_this, f32 param_2, cXyz param_3, s16 param_
     return FALSE;
 }
 
-/* 80792720-807927F8 0005E0 00D8+00 1/1 0/0 0/0 .text            other_bg_check__FP8daE_SM_cP10fopAc_ac_c */
 static BOOL other_bg_check(daE_SM_c* i_this, fopAc_ac_c* param_2) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -178,7 +173,6 @@ static BOOL other_bg_check(daE_SM_c* i_this, fopAc_ac_c* param_2) {
     return FALSE;
 }
 
-/* 807927F8-8079285C 0006B8 0064+00 1/1 0/0 0/0 .text            pl_check__FP8daE_SM_cf */
 static BOOL pl_check(daE_SM_c* i_this, f32 param_2) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -189,7 +183,6 @@ static BOOL pl_check(daE_SM_c* i_this, f32 param_2) {
     return FALSE;
 }
 
-/* 8079285C-807928A4 00071C 0048+00 2/2 0/0 0/0 .text            move_check__FP8daE_SM_cPi */
 static BOOL move_check(daE_SM_c* i_this, int* param_2) {
     *param_2 = -1;
     
@@ -198,12 +191,10 @@ static BOOL move_check(daE_SM_c* i_this, int* param_2) {
     }
 }
 
-/* 807928A4-80792914 000764 0070+00 1/1 0/0 0/0 .text            Particle_Set__8daE_SM_cFUs4cXyz4cXyz5csXyz */
 void daE_SM_c::Particle_Set(u16 i_resID, cXyz i_scale, cXyz i_pos, csXyz i_rotation) {
     dComIfGp_particle_set(i_resID, &i_pos, &tevStr, &i_rotation, &i_scale);
 }
 
-/* 80792914-80792C20 0007D4 030C+00 1/1 0/0 0/0 .text            ArrowCheck__8daE_SM_cFv */
 void daE_SM_c::ArrowCheck() {
     cXyz* tgHitPosP = mCoSm.GetTgHitPosP();
     field_0x6d4 = 10;
@@ -250,7 +241,6 @@ void daE_SM_c::ArrowCheck() {
     field_0x980 = XREG_F(14) + 2500.0f;
 }
 
-/* 80792C20-80792E70 000AE0 0250+00 3/3 0/0 0/0 .text            E_SM_Damage__8daE_SM_cFv */
 void daE_SM_c::E_SM_Damage() {
     field_0x6bc += (s16)((field_0x980 + 1000.0f) / field_0x6f0);
     mCoSm.OffAtSetBit();
@@ -296,7 +286,6 @@ void daE_SM_c::E_SM_Damage() {
     }
 }
 
-/* 80792E70-807936B4 000D30 0844+00 1/1 0/0 0/0 .text            SmDamageCheck__8daE_SM_cFv */
 void daE_SM_c::SmDamageCheck() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& pos = fopAcM_GetPosition(player);
@@ -467,10 +456,8 @@ void daE_SM_c::SmDamageCheck() {
     cLib_addCalc2(&field_0x69c, 0.0f, 0.05f, 100.0f);
 }
 
-/* 807989C0-807989CC 000048 000C+00 1/1 0/0 0/0 .bss             @3936 */
 static u8 l_initHIO;
 
-/* 807989CC-807989E0 000054 0014+00 4/5 0/0 0/0 .bss             l_HIO */
 static daE_Sm_HIO_c l_HIO;
 
 namespace {
@@ -481,7 +468,6 @@ namespace {
     static s16 s_TargetAngle;
 };
 
-/* 807936B4-80793B64 001574 04B0+00 1/1 0/0 0/0 .text            E_SM_Normal__8daE_SM_cFv */
 void daE_SM_c::E_SM_Normal() {
     f32 fVar1 = 0.0f;
     f32 fVar2 = 0.0f;
@@ -583,7 +569,6 @@ void daE_SM_c::E_SM_Normal() {
     }
 }
 
-/* 80793B64-80793E18 001A24 02B4+00 1/1 0/0 0/0 .text            E_SM_Move__8daE_SM_cFv */
 void daE_SM_c::E_SM_Move() {
     field_0x6bc += (int)((field_0x980 + 1500.0f) / field_0x6f0);
 
@@ -637,7 +622,6 @@ void daE_SM_c::E_SM_Move() {
     }
 }
 
-/* 80793E18-80794100 001CD8 02E8+00 1/1 0/0 0/0 .text            E_SM_Attack__8daE_SM_cFv */
 void daE_SM_c::E_SM_Attack() {
     if (field_0x6c0[0] == 0) {
         field_0x6bc += (int)((field_0x980 + 2000.0f) / field_0x6f0);
@@ -706,7 +690,6 @@ void daE_SM_c::E_SM_Attack() {
     cLib_addCalc2(&field_0x6e0, fVar1 + 1.0f, 0.3f, 1.0f);
 }
 
-/* 80794100-80794338 001FC0 0238+00 1/1 0/0 0/0 .text            Action__8daE_SM_cFv */
 void daE_SM_c::Action() {
     cXyz sp2c, sp38;
 
@@ -768,7 +751,6 @@ void daE_SM_c::Action() {
     field_0xc78.CrrPos(dComIfG_Bgsp());
 }
 
-/* 80794338-807943C4 0021F8 008C+00 1/1 0/0 0/0 .text            E_SM_C_Normal__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Normal() {
     cLib_addCalcAngleS2(&current.angle.y, field_0x9b0.y, 8, 0x400);
 
@@ -777,7 +759,6 @@ void daE_SM_c::E_SM_C_Normal() {
     }
 }
 
-/* 807943C4-80794458 002284 0094+00 1/1 0/0 0/0 .text            E_SM_C_Fight__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Fight() {
     cLib_addCalcAngleS2(&current.angle.y, s_TargetAngle, 8, 0x800);
 
@@ -786,7 +767,6 @@ void daE_SM_c::E_SM_C_Fight() {
     }
 }
 
-/* 80794458-8079473C 002318 02E4+00 1/1 0/0 0/0 .text            E_SM_C_Near_Escape__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Near_Escape() {
     fopAcM_GetPosition(daPy_getPlayerActorClass());
 
@@ -849,7 +829,6 @@ void daE_SM_c::E_SM_C_Near_Escape() {
     }
 }
 
-/* 8079473C-807949CC 0025FC 0290+00 1/1 0/0 0/0 .text            E_SM_C_Far_Escape__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Far_Escape() {
     fopAcM_GetPosition(daPy_getPlayerActorClass());
 
@@ -910,7 +889,6 @@ void daE_SM_c::E_SM_C_Far_Escape() {
     cLib_chaseAngleS(&current.angle.y, field_0x6d8, 0x400);
 }
 
-/* 807949CC-807951EC 00288C 0820+00 2/1 0/0 0/0 .text            E_SM_C_Home_Escape__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Home_Escape() {
     switch (field_0x6b6) {
         case 4:
@@ -1072,7 +1050,6 @@ void daE_SM_c::E_SM_C_Home_Escape() {
     cLib_chaseAngleS(&current.angle.y, field_0x6d8, 0x400);
 }
 
-/* 807951EC-80795244 0030AC 0058+00 1/1 0/0 0/0 .text            E_SM_C_Escape__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Escape() {
     switch (field_0x6b4) {
         case 0:
@@ -1089,7 +1066,6 @@ void daE_SM_c::E_SM_C_Escape() {
     }
 }
 
-/* 80795244-80795530 003104 02EC+00 3/3 0/0 0/0 .text            E_SM_C_Free__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Free() {
     fopAcM_GetPosition(daPy_getPlayerActorClass());
 
@@ -1140,7 +1116,6 @@ void daE_SM_c::E_SM_C_Free() {
     }
 }
 
-/* 80795530-807958A0 0033F0 0370+00 1/1 0/0 0/0 .text            E_SM_C_Death__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Death() {
     field_0xe50.ClrCcMove();
 
@@ -1238,7 +1213,6 @@ void daE_SM_c::E_SM_C_Death() {
     }
 }
 
-/* 807958A0-80795E64 003760 05C4+00 1/1 0/0 0/0 .text            C_DamageCheck__8daE_SM_cFv */
 void daE_SM_c::C_DamageCheck() {
     cXyz& pos = fopAcM_GetPosition(daPy_getPlayerActorClass());
 
@@ -1352,7 +1326,6 @@ void daE_SM_c::C_DamageCheck() {
     }
 }
 
-/* 80795E64-80796060 003D24 01FC+00 1/1 0/0 0/0 .text            E_SM_C_Hook__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Hook() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_GetPosition(player);
@@ -1388,7 +1361,6 @@ void daE_SM_c::E_SM_C_Hook() {
 
 }
 
-/* 80796060-807960E4 003F20 0084+00 1/1 0/0 0/0 .text            CheckViewArea__8daE_SM_cFv */
 bool daE_SM_c::CheckViewArea() {
     Vec vec;
     mDoLib_project(&current.pos, &vec);
@@ -1401,7 +1373,6 @@ bool daE_SM_c::CheckViewArea() {
     return rv;
 }
 
-/* 807960E4-80796204 003FA4 0120+00 1/1 0/0 0/0 .text            CameraSet__8daE_SM_cFv */
 bool daE_SM_c::CameraSet() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* camBody = dCam_getBody();
@@ -1425,7 +1396,6 @@ bool daE_SM_c::CameraSet() {
     return rv;
 }
 
-/* 80796204-80796324 0040C4 0120+00 2/2 0/0 0/0 .text            SetStopCam__8daE_SM_cF4cXyzffs */
 void daE_SM_c::SetStopCam(cXyz param_1, f32 param_2, f32 param_3, s16 param_4) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp28(0.0f, param_3, param_2);
@@ -1439,19 +1409,16 @@ void daE_SM_c::SetStopCam(cXyz param_1, f32 param_2, f32 param_3, s16 param_4) {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mFovy, 0);
 }
 
-/* 80796324-80796368 0041E4 0044+00 1/1 0/0 0/0 .text            SetCMoveCam__8daE_SM_cF4cXyzff */
 void daE_SM_c::SetCMoveCam(cXyz param_1, f32 i_scale, f32 i_maxStep) {
     field_0x9e0 = param_1;
     cLib_addCalcPos2(&mDemoCamCenter, field_0x9e0, i_scale, i_maxStep);
 }
 
-/* 80796368-807963EC 004228 0084+00 1/1 0/0 0/0 .text            SetStopingCam__8daE_SM_cFv */
 void daE_SM_c::SetStopingCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mFovy, 0);
 }
 
-/* 807963EC-80796490 0042AC 00A4+00 1/1 0/0 0/0 .text            SetReleaseCam__8daE_SM_cFv */
 void daE_SM_c::SetReleaseCam() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -1461,7 +1428,6 @@ void daE_SM_c::SetReleaseCam() {
     dComIfGp_event_reset();
 }
 
-/* 80796490-80796628 004350 0198+00 1/1 0/0 0/0 .text            DemoStart__8daE_SM_cFv */
 void daE_SM_c::DemoStart() {
     cXyz sp18;
 
@@ -1502,7 +1468,6 @@ void daE_SM_c::DemoStart() {
     }
 }
 
-/* 80796628-807968A0 0044E8 0278+00 1/1 0/0 0/0 .text            DemoMid__8daE_SM_cFv */
 void daE_SM_c::DemoMid() {
     cXyz sp1c;
     bool bVar1 = true;
@@ -1561,7 +1526,6 @@ void daE_SM_c::DemoMid() {
     field_0x9b0.y = s_TargetAngle;
 }
 
-/* 807968A0-807968E4 004760 0044+00 1/1 0/0 0/0 .text            E_SM_C_Demo__8daE_SM_cFv */
 void daE_SM_c::E_SM_C_Demo() {
     switch (mCDemoMode) {
         case 0:
@@ -1574,7 +1538,6 @@ void daE_SM_c::E_SM_C_Demo() {
     }
 }
 
-/* 807968E4-80796AEC 0047A4 0208+00 2/1 0/0 0/0 .text            CoreAction__8daE_SM_cFv */
 void daE_SM_c::CoreAction() {
     cXyz sp1c, sp28;
     s8 sVar1 = 0;
@@ -1648,7 +1611,6 @@ void daE_SM_c::CoreAction() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 5, 0x1000);
 }
 
-/* 80796AEC-80796D80 0049AC 0294+00 1/1 0/0 0/0 .text            ArrowOn__8daE_SM_cFv */
 void daE_SM_c::ArrowOn() {
     cXyz sp68, sp74;
     f32 fVar1 = 1.0f - field_0x6e4 * 0.2f;
@@ -1689,7 +1651,6 @@ void daE_SM_c::ArrowOn() {
     }
 }
 
-/* 80796D80-80796FC4 004C40 0244+00 1/1 0/0 0/0 .text            Execute__8daE_SM_cFv */
 int daE_SM_c::Execute() {
     field_0x99c = field_0x990;
     s_TargetAngle = fopAcM_searchPlayerAngleY(this);
@@ -1745,7 +1706,6 @@ int daE_SM_c::Execute() {
     return 1;
 }
 
-/* 80796FC4-80797274 004E84 02B0+00 1/1 0/0 0/0 .text            setSmBaseMtx__8daE_SM_cFv */
 void daE_SM_c::setSmBaseMtx() {
     mDoMtx_stack_c::transS(field_0x990);
     mDoMtx_stack_c::YrotM(field_0x9b0.y);
@@ -1787,7 +1747,6 @@ void daE_SM_c::setSmBaseMtx() {
     mpBubbleModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80797274-8079730C 005134 0098+00 1/1 0/0 0/0 .text            setBaseMtx__8daE_SM_cFv */
 void daE_SM_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -1798,7 +1757,6 @@ void daE_SM_c::setBaseMtx() {
     mpModelMorf->modelCalc();
 }
 
-/* 8079730C-80797444 0051CC 0138+00 1/1 0/0 0/0 .text            CoCoreSet__8daE_SM_cFv */
 void daE_SM_c::CoCoreSet() {
     cXyz sp18;
     sp18 = current.pos;
@@ -1823,7 +1781,6 @@ void daE_SM_c::CoCoreSet() {
     }
 }
 
-/* 80797444-807974E8 005304 00A4+00 1/1 0/0 0/0 .text            CoSmSet__8daE_SM_cFv */
 void daE_SM_c::CoSmSet() {
     cXyz sp18(0.0f, field_0x6f0 * 80.0f, 0.0f);
     sp18 += field_0x990;
@@ -1835,32 +1792,26 @@ void daE_SM_c::CoSmSet() {
     }
 }
 
-/* 807974E8-807974F0 0053A8 0008+00 1/0 0/0 0/0 .text            daE_SM_IsDelete__FP8daE_SM_c */
 static int daE_SM_IsDelete(daE_SM_c* i_this) {
     return 1;
 }
 
-/* 807974F0-80797510 0053B0 0020+00 1/0 0/0 0/0 .text            daE_SM_Delete__FP8daE_SM_c */
 static int daE_SM_Delete(daE_SM_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80797510-80797530 0053D0 0020+00 1/0 0/0 0/0 .text            daE_SM_Draw__FP8daE_SM_c */
 static int daE_SM_Draw(daE_SM_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80797530-80797550 0053F0 0020+00 2/1 0/0 0/0 .text            daE_SM_Execute__FP8daE_SM_c */
 static int daE_SM_Execute(daE_SM_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80797550-80797570 005410 0020+00 1/0 0/0 0/0 .text            daE_SM_Create__FP10fopAc_ac_c */
 static int daE_SM_Create(fopAc_ac_c* a_this) {
     return static_cast<daE_SM_c*>(a_this)->Create();
 }
 
-/* 80797570-8079762C 005430 00BC+00 1/1 0/0 0/0 .text            Delete__8daE_SM_cFv */
 int daE_SM_c::Delete() {
     dComIfG_resDelete(&mPhase, "E_SM");
 
@@ -1884,12 +1835,10 @@ int daE_SM_c::Delete() {
     return 1;
 }
 
-/* 8079762C-8079764C 0054EC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     return static_cast<daE_SM_c*>(a_this)->CreateHeap();
 }
 
-/* 8079764C-80797784 00550C 0138+00 1/1 0/0 0/0 .text            CreateHeap__8daE_SM_cFv */
 int daE_SM_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_SM", BMDE_SM);
 
@@ -1909,7 +1858,6 @@ int daE_SM_c::CreateHeap() {
     return 1;
 }
 
-/* 80797784-80797858 005644 00D4+00 1/1 0/0 0/0 .text            initCoSph__8daE_SM_cFv */
 void daE_SM_c::initCoSph() {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -1949,7 +1897,6 @@ void daE_SM_c::initCoSph() {
     mCoCore.OnTgNoHitMark();
 }
 
-/* 80797858-80797CE0 005718 0488+00 1/1 0/0 0/0 .text            Create__8daE_SM_cFv */
 cPhs__Step daE_SM_c::Create() {
     fopAcM_ct(this, daE_SM_c);
 
@@ -2059,12 +2006,10 @@ cPhs__Step daE_SM_c::Create() {
     return phase;
 }
 
-/* 80797CE0-80797ED0 005BA0 01F0+00 1/1 0/0 0/0 .text            __ct__8daE_SM_cFv */
 daE_SM_c::daE_SM_c() {}
 
 AUDIO_INSTANCES;
 
-/* 807988B8-807988D8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SM_Method */
 static actor_method_class l_daE_SM_Method = {
     (process_method_func)daE_SM_Create,
     (process_method_func)daE_SM_Delete,
@@ -2073,7 +2018,6 @@ static actor_method_class l_daE_SM_Method = {
     (process_method_func)daE_SM_Draw,
 };
 
-/* 807988D8-80798908 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SM */
 extern actor_process_profile_definition g_profile_E_SM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp
index dab6159c33..eabf8fa573 100644
--- a/src/d/actor/d_a_e_sm2.cpp
+++ b/src/d/actor/d_a_e_sm2.cpp
@@ -15,8 +15,8 @@
 
 class daE_SM2_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80798B4C */ daE_SM2_HIO_c();
-    /* 8079CE94 */ virtual ~daE_SM2_HIO_c() {}
+    daE_SM2_HIO_c();
+    virtual ~daE_SM2_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -29,7 +29,6 @@ public:
     /* 0x0E */ s16 color_debug_B;
 };
 
-/* 80798B4C-80798BA4 0000EC 0058+00 1/1 0/0 0/0 .text            __ct__13daE_SM2_HIO_cFv */
 daE_SM2_HIO_c::daE_SM2_HIO_c() {
     unk_0x4 = 4;
     unk_0x7 = 0;
@@ -41,7 +40,6 @@ daE_SM2_HIO_c::daE_SM2_HIO_c() {
     color_debug_B = 91;
 }
 
-/* 80798C48-80798D90 0001E8 0148+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -66,7 +64,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80798D90-80799070 000330 02E0+00 1/0 0/0 0/0 .text            daE_SM2_Draw__FP11e_sm2_class */
 static int daE_SM2_Draw(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
@@ -111,7 +108,6 @@ static int daE_SM2_Draw(e_sm2_class* i_this) {
     return 1;
 }
 
-/* 80799070-80799084 000610 0014+00 4/4 0/0 0/0 .text            size_get__FUc */
 static f32 size_get(u8 i_sizetype) {
     static f32 sc_d[] = {
         0.25f,
@@ -124,7 +120,6 @@ static f32 size_get(u8 i_sizetype) {
     return sc_d[i_sizetype];
 }
 
-/* 80799084-80799160 000624 00DC+00 5/5 0/0 0/0 .text            sm2_delete__FP11e_sm2_class */
 static void sm2_delete(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -148,7 +143,6 @@ static void sm2_delete(e_sm2_class* i_this) {
     }
 }
 
-/* 80799160-807991D4 000700 0074+00 2/2 0/0 0/0 .text            cc_stts_init__FP11e_sm2_class */
 static void cc_stts_init(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -181,7 +175,6 @@ static void cc_stts_init(e_sm2_class* i_this) {
     i_this->acchcir.SetWall(bg_h[i_this->sizetype], bg_r[i_this->sizetype]);
 }
 
-/* 807991D4-80799394 000774 01C0+00 1/1 0/0 0/0 .text            s_s_sub__FPvPv */
 static void* s_s_sub(void* i_actor, void* i_data) {
     cXyz sp18;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SM2) {
@@ -200,7 +193,6 @@ static void* s_s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80799394-807993F4 000934 0060+00 1/1 0/0 0/0 .text            pl_check__FP11e_sm2_classf */
 static BOOL pl_check(e_sm2_class* i_this, f32 i_range) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -212,10 +204,8 @@ static BOOL pl_check(e_sm2_class* i_this, f32 i_range) {
     }
 }
 
-/* 8079DBD4-8079DBE4 000054 0010+00 3/4 0/0 0/0 .bss             l_HIO */
 static daE_SM2_HIO_c l_HIO;
 
-/* 807993F4-80799784 000994 0390+00 1/1 0/0 0/0 .text            normal_move__FP11e_sm2_class */
 static void normal_move(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -300,7 +290,6 @@ static void normal_move(e_sm2_class* i_this) {
     }
 }
 
-/* 80799784-80799A50 000D24 02CC+00 2/2 0/0 0/0 .text            attack__FP11e_sm2_class */
 static void attack(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -379,7 +368,6 @@ static void attack(e_sm2_class* i_this) {
     cLib_addCalc2(&i_this->field_0x830, 1.0f + TREG_F(17), 0.5f, 0.1f + TREG_F(18));
 }
 
-/* 80799A50-80799DAC 000FF0 035C+00 1/1 0/0 0/0 .text            combine__FP11e_sm2_class */
 static s8 combine(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -467,7 +455,6 @@ static s8 combine(e_sm2_class* i_this) {
     return cc_co_ON;
 }
 
-/* 80799DAC-8079A1CC 00134C 0420+00 1/2 0/0 0/0 .text            roof__FP11e_sm2_class */
 static s8 roof(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -571,7 +558,6 @@ static s8 roof(e_sm2_class* i_this) {
     return do_pos_crr;
 }
 
-/* 8079A1CC-8079A28C 00176C 00C0+00 1/1 0/0 0/0 .text            water__FP11e_sm2_class */
 static void water(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -590,7 +576,6 @@ static void water(e_sm2_class* i_this) {
     }
 }
 
-/* 8079A28C-8079A3AC 00182C 0120+00 2/2 0/0 0/0 .text            eff_set__FP11e_sm2_classP4cXyzf */
 static void eff_set(e_sm2_class* i_this, cXyz* i_pos, f32 i_size) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -641,7 +626,6 @@ static void eff_set(e_sm2_class* i_this, cXyz* i_pos, f32 i_size) {
     dComIfGp_particle_set(0x85BF, i_pos, &actor->tevStr, &actor->shape_angle, &effsize, 0xFF, NULL, fopAcM_GetRoomNo(actor), &e_prim_B[i_this->type], &e_env_B[i_this->type], NULL);
 }
 
-/* 8079A3AC-8079A560 00194C 01B4+00 1/1 0/0 0/0 .text            fail__FP11e_sm2_class */
 static void fail(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp14;
@@ -695,7 +679,6 @@ static void fail(e_sm2_class* i_this) {
     }
 }
 
-/* 8079A560-8079A9B4 001B00 0454+00 1/1 0/0 0/0 .text            dmcalc__FP11e_sm2_class */
 static void dmcalc(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     int i;
@@ -810,7 +793,6 @@ static void dmcalc(e_sm2_class* i_this) {
     }
 }
 
-/* 8079D888-8079D8BC 000154 0031+03 0/1 0/0 0/0 .data            new_col_d */
 // Lookup table for color combinations. Rows correspond to one chu and columns the other chu
 // Ex. RED + BLUE = [1][2] = TYPE_PURPLE
 static u8 new_col_d[] = {
@@ -823,7 +805,6 @@ static u8 new_col_d[] = {
     TYPE_RARE,   TYPE_RARE,   TYPE_RARE,   TYPE_RARE,   TYPE_RARE,   TYPE_RARE,   TYPE_BLACK,
 };
 
-/* 8079A9B4-8079AF94 001F54 05E0+00 1/1 0/0 0/0 .text            damage_check__FP11e_sm2_class */
 static void damage_check(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -963,7 +944,6 @@ static void damage_check(e_sm2_class* i_this) {
     }
 }
 
-/* 8079AF94-8079BC9C 002534 0D08+00 2/1 0/0 0/0 .text            action__FP11e_sm2_class */
 static void action(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp58;
@@ -1296,11 +1276,9 @@ static void action(e_sm2_class* i_this) {
     }
 }
 
-/* 8079DBE4-8079DBE8 000064 0004+00 0/0 0/0 0/0 .bss             boss */
 // unused, unknown type
 static void* boss;
 
-/* 8079DC3C-8079DC90 0000BC 0054+00 1/2 0/0 0/0 .bss             col_d */
 static cXyz col_d[] = {
     /* Green  */ cXyz(117, 170, 90),
     /* Red    */ cXyz(140, 50, 0),
@@ -1311,7 +1289,6 @@ static cXyz col_d[] = {
     /* Black  */ cXyz(25, 25, 25),
 };
 
-/* 8079BD14-8079BEF0 0032B4 01DC+00 2/2 0/0 0/0 .text            col_set__FP11e_sm2_classSc */
 static void col_set(e_sm2_class* i_this, s8 i_immediate) {
     if (i_immediate) {
         i_this->color_R = col_d[i_this->type].x;
@@ -1328,7 +1305,6 @@ static void col_set(e_sm2_class* i_this, s8 i_immediate) {
     }
 }
 
-/* 8079BEF0-8079C120 003490 0230+00 2/1 0/0 0/0 .text            daE_SM2_Execute__FP11e_sm2_class */
 static int daE_SM2_Execute(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -1397,13 +1373,10 @@ static int daE_SM2_Execute(e_sm2_class* i_this) {
     return 1;
 }
 
-/* 8079C120-8079C128 0036C0 0008+00 1/0 0/0 0/0 .text            daE_SM2_IsDelete__FP11e_sm2_class
- */
 static int daE_SM2_IsDelete(e_sm2_class* i_this) {
     return 1;
 }
 
-/* 8079C128-8079C184 0036C8 005C+00 1/0 0/0 0/0 .text            daE_SM2_Delete__FP11e_sm2_class */
 static int daE_SM2_Delete(e_sm2_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -1417,7 +1390,6 @@ static int daE_SM2_Delete(e_sm2_class* i_this) {
     return 1;
 }
 
-/* 8079C184-8079C438 003724 02B4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_sm2_class* a_this = (e_sm2_class*)i_this;
 
@@ -1459,7 +1431,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8079C480-8079CB28 003A20 06A8+00 1/0 0/0 0/0 .text            daE_SM2_Create__FP10fopAc_ac_c */
 static int daE_SM2_Create(fopAc_ac_c* i_this) {
     e_sm2_class* a_this = (e_sm2_class*)i_this;
     fopAcM_ct(i_this, e_sm2_class);
@@ -1628,7 +1599,6 @@ static int daE_SM2_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8079DA6C-8079DA8C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SM2_Method */
 static actor_method_class l_daE_SM2_Method = {
     (process_method_func)daE_SM2_Create,
     (process_method_func)daE_SM2_Delete,
@@ -1637,7 +1607,6 @@ static actor_method_class l_daE_SM2_Method = {
     (process_method_func)daE_SM2_Draw,
 };
 
-/* 8079DA8C-8079DABC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SM2 */
 extern actor_process_profile_definition g_profile_E_SM2 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp
index 2839e5322a..3ee5f70271 100644
--- a/src/d/actor/d_a_e_st.cpp
+++ b/src/d/actor/d_a_e_st.cpp
@@ -211,8 +211,8 @@ enum Action_Phase {
 
 class daE_ST_HIO_c : public JORReflexible {
 public:
-    /* 8079DDEC */ daE_ST_HIO_c();
-    /* 807A61FC */ virtual ~daE_ST_HIO_c() {}
+    daE_ST_HIO_c();
+    virtual ~daE_ST_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -229,7 +229,6 @@ public:
     /* 0x20 */ f32 field_0x20;
 };
 
-/* 8079DDEC-8079DE4C 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__12daE_ST_HIO_cFv */
 daE_ST_HIO_c::daE_ST_HIO_c() {
     id = -1;
     basic_size = 1.7f;
@@ -242,13 +241,11 @@ daE_ST_HIO_c::daE_ST_HIO_c() {
     field_0x20 = -1.0f;
 }
 
-/* 8079DE4C-8079DEF8 00014C 00AC+00 22/22 0/0 0/0 .text            anm_init__FP10e_st_classifUcf */
 static void anm_init(e_st_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_st", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 8079DEF8-8079E1A4 0001F8 02AC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -294,16 +291,12 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 807A6DE0-807A6DE4 000048 0004+00 9/10 0/0 0/0 .bss             small */
 static BOOL small;
 
-/* 807A6DE4-807A6DE8 00004C 0004+00 1/2 0/0 0/0 .bss             None */
 static bool l_initHIO;
 
-/* 807A6DF4-807A6E18 00005C 0024+00 13/15 0/0 0/0 .bss             l_HIO */
 static daE_ST_HIO_c l_HIO;
 
-/* 8079E1A4-8079E43C 0004A4 0298+00 1/0 0/0 0/0 .text            daE_ST_Draw__FP10e_st_class */
 static int daE_ST_Draw(e_st_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -347,7 +340,6 @@ static int daE_ST_Draw(e_st_class* i_this) {
     return 1;
 }
 
-/* 8079E43C-8079E550 00073C 0114+00 1/1 0/0 0/0 .text            other_bg_check__FP10e_st_classP10fopAc_ac_c */
 static BOOL other_bg_check(e_st_class* i_this, fopAc_ac_c* actor_p) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -371,7 +363,6 @@ static BOOL other_bg_check(e_st_class* i_this, fopAc_ac_c* actor_p) {
     return FALSE;
 }
 
-/* 8079E550-8079E684 000850 0134+00 5/5 0/0 0/0 .text            pl_check__FP10e_st_classf */
 static BOOL pl_check(e_st_class* i_this, f32 i_distance) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -397,7 +388,6 @@ static BOOL pl_check(e_st_class* i_this, f32 i_distance) {
     return FALSE;
 }
 
-/* 8079E684-8079EAA8 000984 0424+00 1/1 0/0 0/0 .text            damage_check__FP10e_st_class */
 static void damage_check(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -505,7 +495,6 @@ static void damage_check(e_st_class* i_this) {
     }
 }
 
-/* 8079EAA8-8079EC90 000DA8 01E8+00 3/3 0/0 0/0 .text            move_bg_check__FP10e_st_class */
 static int move_bg_check(e_st_class* i_this) {
     dBgS_LinChk lin_chk;
     cXyz spa0, spac;
@@ -544,7 +533,6 @@ static int move_bg_check(e_st_class* i_this) {
     return rv;
 }
 
-/* 8079EC90-8079EF3C 000F90 02AC+00 1/1 0/0 0/0 .text            bg_angle_set__FP10e_st_classs */
 static void bg_angle_set(e_st_class* i_this, s16 i_maxStep) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -591,7 +579,6 @@ static void bg_angle_set(e_st_class* i_this, s16 i_maxStep) {
     }
 }
 
-/* 8079EF3C-8079F08C 00123C 0150+00 3/3 0/0 0/0 .text            bg_pos_get__FP10e_st_class */
 static BOOL bg_pos_get(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -619,7 +606,6 @@ static BOOL bg_pos_get(e_st_class* i_this) {
     return TRUE;
 }
 
-/* 8079F08C-8079F12C 00138C 00A0+00 1/1 0/0 0/0 .text            next_angle_get__FP10e_st_class */
 static s16 next_angle_get(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp20, sp2c;
@@ -631,7 +617,6 @@ static s16 next_angle_get(e_st_class* i_this) {
     return cM_atan2s(sp2c.x, sp2c.z);
 }
 
-/* 8079F12C-8079F210 00142C 00E4+00 3/3 0/0 0/0 .text            move_calc__FP10e_st_class */
 static void move_calc(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp1c, sp28;
@@ -654,7 +639,6 @@ static void move_calc(e_st_class* i_this) {
     }
 }
 
-/* 8079F210-8079F42C 001510 021C+00 1/1 0/0 0/0 .text            e_st_wait__FP10e_st_class */
 static void e_st_wait(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -705,7 +689,6 @@ static void e_st_wait(e_st_class* i_this) {
     move_calc(i_this);
 }
 
-/* 8079F42C-8079F4D8 00172C 00AC+00 2/2 0/0 0/0 .text            pl_angle_get__FP10e_st_class */
 static s16 pl_angle_get(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz pos_delta, pos;
@@ -718,7 +701,6 @@ static s16 pl_angle_get(e_st_class* i_this) {
     return cM_atan2s(pos.x, pos.z);
 }
 
-/* 8079F4D8-8079F6A0 0017D8 01C8+00 1/1 0/0 0/0 .text            e_st_move__FP10e_st_class */
 static void e_st_move(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp2c, sp38;
@@ -771,7 +753,6 @@ static void e_st_move(e_st_class* i_this) {
     }
 }
 
-/* 8079F6A0-8079FA18 0019A0 0378+00 1/1 0/0 0/0 .text            e_st_pl_search__FP10e_st_class */
 static void e_st_pl_search(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz pos_delta, sp48;
@@ -851,7 +832,6 @@ static void e_st_pl_search(e_st_class* i_this) {
     move_calc(i_this);
 }
 
-/* 8079FA18-8079FC4C 001D18 0234+00 1/1 0/0 0/0 .text            e_st_shoot__FP10e_st_class */
 static void e_st_shoot(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp40, sp4c;
@@ -905,7 +885,6 @@ static void e_st_shoot(e_st_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mAngleFromPlayer, 4, 0x1000);
 }
 
-/* 8079FC4C-807A08BC 001F4C 0C70+00 2/1 0/0 0/0 .text            e_st_jump_attack__FP10e_st_class */
 static void e_st_jump_attack(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1040,7 +1019,6 @@ static void e_st_jump_attack(e_st_class* i_this) {
     }
 }
 
-/* 807A08BC-807A0B44 002BBC 0288+00 1/1 0/0 0/0 .text            roof_line_calc__FP10e_st_class */
 static void roof_line_calc(e_st_class* i_this) {
     cXyz sp40, sp4c;
 
@@ -1083,7 +1061,6 @@ static void roof_line_calc(e_st_class* i_this) {
     }
 }
 
-/* 807A0B44-807A0D20 002E44 01DC+00 1/1 0/0 0/0 .text            roof_line_calc2__FP10e_st_class */
 static void roof_line_calc2(e_st_class* i_this) {
     cXyz sp50, sp5c;
 
@@ -1104,7 +1081,6 @@ static void roof_line_calc2(e_st_class* i_this) {
     cLib_addCalc0(&i_this->field_0x724, 1.0f, 0.005f);
 }
 
-/* 807A0D20-807A0F64 003020 0244+00 1/1 0/0 0/0 .text            tail_line_calc__FP10e_st_class */
 static void tail_line_calc(e_st_class* i_this) {
     f32 fVar2, fVar5;
     int i;
@@ -1152,7 +1128,6 @@ static void tail_line_calc(e_st_class* i_this) {
     }
 }
 
-/* 807A0F64-807A11EC 003264 0288+00 1/1 0/0 0/0 .text            e_st_hang__FP10e_st_class */
 static void e_st_hang(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1207,7 +1182,6 @@ static void e_st_hang(e_st_class* i_this) {
     }
 }
 
-/* 807A11EC-807A1568 0034EC 037C+00 1/1 0/0 0/0 .text            e_st_hang_shoot__FP10e_st_class */
 static void e_st_hang_shoot(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1289,7 +1263,6 @@ static void e_st_hang_shoot(e_st_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, fopAcM_searchPlayerAngleY(a_this), 4, 0x1000);
 }
 
-/* 807A1568-807A17DC 003868 0274+00 1/1 0/0 0/0 .text            e_st_hang_drop__FP10e_st_class */
 static void e_st_hang_drop(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp28;
@@ -1350,7 +1323,6 @@ static void e_st_hang_drop(e_st_class* i_this) {
     i_this->mBgc.CrrPos(dComIfG_Bgsp());
 }
 
-/* 807A17DC-807A1DB8 003ADC 05DC+00 1/1 0/0 0/0 .text            e_st_hang_2__FP10e_st_class */
 static s8 e_st_hang_2(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -1477,7 +1449,6 @@ static s8 e_st_hang_2(e_st_class* i_this) {
     return rv;
 }
 
-/* 807A1DB8-807A1FA4 0040B8 01EC+00 1/1 0/0 0/0 .text            e_st_hang_2_shoot__FP10e_st_class */
 static void e_st_hang_2_shoot(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1522,7 +1493,6 @@ static void e_st_hang_2_shoot(e_st_class* i_this) {
     cLib_addCalcAngleS2(&a_this->current.angle.y, fopAcM_searchPlayerAngleY(a_this), 4, 0x1000);
 }
 
-/* 807A1FA4-807A2110 0042A4 016C+00 1/1 0/0 0/0 .text            e_st_s_damage__FP10e_st_class */
 static void e_st_s_damage(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1559,7 +1529,6 @@ static void e_st_s_damage(e_st_class* i_this) {
     }
 }
 
-/* 807A2110-807A266C 004410 055C+00 1/1 0/0 0/0 .text            e_st_damage__FP10e_st_class */
 static void e_st_damage(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp54, sp60;
@@ -1698,7 +1667,6 @@ static void e_st_damage(e_st_class* i_this) {
     a_this->old.pos.y += 30.0f;
 }
 
-/* 807A266C-807A28A0 00496C 0234+00 1/1 0/0 0/0 .text            e_st_water__FP10e_st_class */
 static void e_st_water(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz pos_delta, sp58;
@@ -1753,7 +1721,6 @@ static void e_st_water(e_st_class* i_this) {
     }
 }
 
-/* 807A28A0-807A2970 004BA0 00D0+00 1/1 0/0 0/0 .text            water_check__FP10e_st_class */
 static BOOL water_check(e_st_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     
@@ -1772,7 +1739,6 @@ static BOOL water_check(e_st_class* i_this) {
     return i_this->mGroundCross > a_this->current.pos.y + 10.0f + WREG_F(11) ? TRUE : FALSE;
 }
 
-/* 807A2970-807A2A88 004C70 0118+00 1/1 0/0 0/0 .text            gr_check__FP10e_st_class */
 static BOOL gr_check(e_st_class* i_this) {
     fopEn_enemy_c* a_this = &i_this->actor;
     dBgS_ObjGndChk gnd_chk;
@@ -1789,7 +1755,6 @@ static BOOL gr_check(e_st_class* i_this) {
     return FALSE;
 }
 
-/* 807A2B00-807A2D28 004E00 0228+00 1/1 0/0 0/0 .text            e_st_g_normal__FP10e_st_class */
 static void e_st_g_normal(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz pos, sp58;
@@ -1845,7 +1810,6 @@ static void e_st_g_normal(e_st_class* i_this) {
     }
 }
 
-/* 807A2D28-807A3148 005028 0420+00 1/1 0/0 0/0 .text            e_st_g_fight__FP10e_st_class */
 static s8 e_st_g_fight(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp64, sp70;
@@ -1944,7 +1908,6 @@ static s8 e_st_g_fight(e_st_class* i_this) {
     return rv;
 }
 
-/* 807A3148-807A3240 005448 00F8+00 1/1 0/0 0/0 .text            e_st_g_def__FP10e_st_class */
 static s8 e_st_g_def(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp48, sp54;
@@ -1970,7 +1933,6 @@ static s8 e_st_g_def(e_st_class* i_this) {
     return 1;
 }
 
-/* 807A3240-807A3360 005540 0120+00 1/1 0/0 0/0 .text            e_st_g_damage__FP10e_st_class */
 static void e_st_g_damage(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1998,7 +1960,6 @@ static void e_st_g_damage(e_st_class* i_this) {
     cLib_addCalc2(&a_this->speedF, 0.0f, 1.0f, 2.0f);
 }
 
-/* 807A3360-807A3450 005660 00F0+00 1/1 0/0 0/0 .text            e_st_g_s_damage__FP10e_st_class */
 static void e_st_g_s_damage(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2020,7 +1981,6 @@ static void e_st_g_s_damage(e_st_class* i_this) {
     cLib_addCalc2(&a_this->speedF, 0.0f, 1.0f, 2.0f);
 }
 
-/* 807A3450-807A3548 005750 00F8+00 1/1 0/0 0/0 .text            e_st_g_wind__FP10e_st_class */
 static void e_st_g_wind(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2043,7 +2003,6 @@ static void e_st_g_wind(e_st_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 3.0f);
 }
 
-/* 807A3548-807A3858 005848 0310+00 1/1 0/0 0/0 .text            e_st_g_chance__FP10e_st_class */
 static void e_st_g_chance(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp3c, sp48;
@@ -2105,7 +2064,6 @@ static void e_st_g_chance(e_st_class* i_this) {
     }
 }
 
-/* 807A3858-807A3B38 005B58 02E0+00 1/1 0/0 0/0 .text            e_st_g_end__FP10e_st_class */
 static s8 e_st_g_end(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp58, sp64;
@@ -2168,7 +2126,6 @@ static s8 e_st_g_end(e_st_class* i_this) {
     return rv;
 }
 
-/* 807A3B38-807A3E44 005E38 030C+00 1/1 0/0 0/0 .text            damage_check_g__FP10e_st_class */
 static void damage_check_g(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -2256,7 +2213,6 @@ static void damage_check_g(e_st_class* i_this) {
     }
 }
 
-/* 807A3E44-807A4004 006144 01C0+00 1/1 0/0 0/0 .text            ground_angle_set__FP10e_st_class */
 static void ground_angle_set(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dComIfGp_getPlayer(0);
@@ -2299,7 +2255,6 @@ static void ground_angle_set(e_st_class* i_this) {
     }
 }
 
-/* 807A4004-807A4148 006304 0144+00 1/1 0/0 0/0 .text foot_control__FP10e_st_classP7st_foot */
 static BOOL foot_control(e_st_class* i_this, st_foot* foot_p) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     BOOL rv = FALSE;
@@ -2331,7 +2286,6 @@ static BOOL foot_control(e_st_class* i_this, st_foot* foot_p) {
     return rv;
 }
 
-/* 807A6E48-807A6E78 0000B0 0030+00 1/2 0/0 0/0 .bss             top_pos_data */
 static cXyz top_pos_data[4] = {
     cXyz(40.0f, 2.0f, 0.0f),
     cXyz(58.0f, 2.0f, 0.0f),
@@ -2339,7 +2293,6 @@ static cXyz top_pos_data[4] = {
     cXyz(78.0f, 0.0f, 0.0f),
 };
 
-/* 807A6A40-807A6A60 000054 0020+00 0/0 0/0 0/0 .data            base_j */
 static int base_j[8] = {
     JNT_LLEGA_1,
     JNT_LLEGB_1,
@@ -2351,7 +2304,6 @@ static int base_j[8] = {
     JNT_RLEGD_1,
 };
 
-/* 807A6A60-807A6A80 000074 0020+00 1/1 0/0 0/0 .data            top_j */
 static int top_j[8] = {
     JNT_LLEGA_3,
     JNT_LLEGB_3,
@@ -2363,7 +2315,6 @@ static int top_j[8] = {
     JNT_RLEGD_3,
 };
 
-/* 807A4148-807A421C 006448 00D4+00 1/1 0/0 0/0 .text            foot_control_main__FP10e_st_class */
 static void foot_control_main(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp38;
@@ -2385,7 +2336,6 @@ static void foot_control_main(e_st_class* i_this) {
     }
 }
 
-/* 807A421C-807A4A40 00651C 0824+00 2/1 0/0 0/0 .text            action__FP10e_st_class */
 static void action(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -2689,7 +2639,6 @@ static void action(e_st_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &i_effSize);
 }
 
-/* 807A4A40-807A53BC 006D40 097C+00 2/1 0/0 0/0 .text            daE_ST_Execute__FP10e_st_class */
 static int daE_ST_Execute(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz pos, sph_center;
@@ -2888,12 +2837,10 @@ static int daE_ST_Execute(e_st_class* i_this) {
     return 1;
 }
 
-/* 807A53BC-807A53C4 0076BC 0008+00 1/0 0/0 0/0 .text            daE_ST_IsDelete__FP10e_st_class */
 static int daE_ST_IsDelete(e_st_class* i_this) {
     return 1;
 }
 
-/* 807A53C4-807A542C 0076C4 0068+00 1/0 0/0 0/0 .text            daE_ST_Delete__FP10e_st_class */
 static int daE_ST_Delete(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -2910,7 +2857,6 @@ static int daE_ST_Delete(e_st_class* i_this) {
     return 1;
 }
 
-/* 807A542C-807A5618 00772C 01EC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_st_class* i_this = (e_st_class*)a_this;
 
@@ -2958,17 +2904,14 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807A6B6C-807A6B78 000180 000C+00 1/1 0/0 0/0 .data            ya */
 static s16 ya[6] = {
     -0x4000, 0x4000, 0x0000, 0x8000, 0x0000, 0x0000,
 };
 
-/* 807A6B78-807A6B84 00018C 000C+00 1/1 0/0 0/0 .data            xa */
 static s16 xa[6] = {
     -0x4000, -0x4000, -0x4000, -0x4000, 0x0000, 0x8000,
 };
 
-/* 807A5618-807A578C 007918 0174+00 1/1 0/0 0/0 .text kabe_initial_pos_set__FP10e_st_class */
 static int kabe_initial_pos_set(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -2999,7 +2942,6 @@ static int kabe_initial_pos_set(e_st_class* i_this) {
     return 0;
 }
 
-/* 807A578C-807A586C 007A8C 00E0+00 1/1 0/0 0/0 .text roof_initial_pos_set__FP10e_st_class */
 static BOOL roof_initial_pos_set(e_st_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -3020,7 +2962,6 @@ static BOOL roof_initial_pos_set(e_st_class* i_this) {
     return FALSE;
 }
 
-/* 807A586C-807A5CF4 007B6C 0488+00 1/0 0/0 0/0 .text            daE_ST_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) {
     e_st_class* i_this = (e_st_class*)a_this;
     fopAcM_ct(a_this, e_st_class);
@@ -3213,7 +3154,6 @@ static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 807A6C88-807A6CA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ST_Method */
 static actor_method_class l_daE_ST_Method = {
     (process_method_func)daE_ST_Create,
     (process_method_func)daE_ST_Delete,
@@ -3222,7 +3162,6 @@ static actor_method_class l_daE_ST_Method = {
     (process_method_func)daE_ST_Draw,
 };
 
-/* 807A6CA8-807A6CD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ST */
 extern actor_process_profile_definition g_profile_E_ST = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp
index f451f4d81d..873e70cca0 100644
--- a/src/d/actor/d_a_e_st_line.cpp
+++ b/src/d/actor/d_a_e_st_line.cpp
@@ -10,23 +10,19 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 807A6F58-807A6F60 000078 0008+00 1/0 0/0 0/0 .text daE_ST_LINE_Draw__FP15e_st_line_class */
 static int daE_ST_LINE_Draw(e_st_line_class* i_this) {
     cXyz unused;  // necessary to generate weak cXyz dtor
     return 1;
 }
 
-/* 807A6F9C-807A6FA4 0000BC 0008+00 2/1 0/0 0/0 .text daE_ST_LINE_Execute__FP15e_st_line_class */
 static int daE_ST_LINE_Execute(e_st_line_class* i_this) {
     return 1;
 }
 
-/* 807A6FA4-807A6FAC 0000C4 0008+00 1/0 0/0 0/0 .text daE_ST_LINE_IsDelete__FP15e_st_line_class */
 static int daE_ST_LINE_IsDelete(e_st_line_class* i_this) {
     return 1;
 }
 
-/* 807A6FAC-807A7008 0000CC 005C+00 1/0 0/0 0/0 .text daE_ST_LINE_Delete__FP15e_st_line_class */
 static int daE_ST_LINE_Delete(e_st_line_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_st");
     if (i_this->field_0xcc4 == 0 && i_this->heap != NULL) {
@@ -74,7 +70,6 @@ f32 dummyLiteralOrder3() {
     return dummy;
 }
 
-/* 807A7008-807A707C 000128 0074+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_st_line_class* a_this = (e_st_line_class*)i_this;
 
@@ -91,8 +86,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 807A707C-807A7220 00019C 01A4+00 1/0 0/0 0/0 .text            daE_ST_LINE_Create__FP10fopAc_ac_c
- */
 static int daE_ST_LINE_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_st_line_class);
     e_st_line_class* a_this = (e_st_line_class*)i_this;
@@ -123,14 +116,12 @@ static int daE_ST_LINE_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 807A72A4-807A72C4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ST_LINE_Method */
 static actor_method_class l_daE_ST_LINE_Method = {
     (process_method_func)daE_ST_LINE_Create,  (process_method_func)daE_ST_LINE_Delete,
     (process_method_func)daE_ST_LINE_Execute, (process_method_func)daE_ST_LINE_IsDelete,
     (process_method_func)daE_ST_LINE_Draw,
 };
 
-/* 807A72C4-807A72F4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ST_LINE */
 extern actor_process_profile_definition g_profile_E_ST_LINE = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp
index 4834421399..8e8867f1a8 100644
--- a/src/d/actor/d_a_e_sw.cpp
+++ b/src/d/actor/d_a_e_sw.cpp
@@ -15,8 +15,8 @@
 class daE_SW_HIO_c {
 public:
     /* サンドワーム (Sandworm) */
-    /* 807A740C */ daE_SW_HIO_c();
-    /* 807AF870 */ virtual ~daE_SW_HIO_c() {}
+    daE_SW_HIO_c();
+    virtual ~daE_SW_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 basic_size;                  // 基本サイズ (Basic Size)
@@ -80,7 +80,6 @@ enum Particle {
     /* 0x8378 */ ZLM_SAND00_IA_6,
 };
 
-/* 807AFEB4-807AFEF4 000038 0040+00 1/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_e_sw_cpp@ */
 namespace {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -95,7 +94,6 @@ namespace {
     };
 }
 
-/* 807A740C-807A7460 0000EC 0054+00 1/1 0/0 0/0 .text            __ct__12daE_SW_HIO_cFv */
 daE_SW_HIO_c::daE_SW_HIO_c() {
     field_0x4 = -1;
     basic_size = 1.0f;
@@ -107,12 +105,10 @@ daE_SW_HIO_c::daE_SW_HIO_c() {
     movement_range_debug_display = 0;
 }
 
-/* 807A7460-807A7504 000140 00A4+00 22/22 0/0 0/0 .text            bckSet__8daE_SW_cFifUcf */
 void daE_SW_c::bckSet(int i_resID, f32 i_morf, u8 i_attr, f32 i_rate) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_SW", i_resID), i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 807A7504-807A76C4 0001E4 01C0+00 1/1 0/0 0/0 .text            draw__8daE_SW_cFv */
 int daE_SW_c::draw() {
     if (field_0x694 == 1) {
         return 1;
@@ -148,24 +144,20 @@ int daE_SW_c::draw() {
     return 1;
 }
 
-/* 807A76C4-807A76E4 0003A4 0020+00 1/0 0/0 0/0 .text            daE_SW_Draw__FP8daE_SW_c */
 static int daE_SW_Draw(daE_SW_c* i_this) {
     return i_this->draw();
 }
 
-/* 807A76E4-807A77CC 0003C4 00E8+00 5/5 0/0 0/0 .text            setBeforeJumpEffect__8daE_SW_cFv */
 void daE_SW_c::setBeforeJumpEffect() {
     field_0xae8 = dComIfGp_particle_set(field_0xae8, ZL2_ROCK_1, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
     field_0xaec = dComIfGp_particle_set(field_0xaec, ZLM_SAND00_IA_1, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 807A77CC-807A78B4 0004AC 00E8+00 2/2 0/0 0/0 .text            setJumpEffect__8daE_SW_cFv */
 void daE_SW_c::setJumpEffect() {
     field_0xae8 = dComIfGp_particle_set(field_0xae8, ZL2_TSUBU_IA01_1, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
     field_0xaec = dComIfGp_particle_set(field_0xaec, ZL2_TSUBU_IA01_2, &field_0x674, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 807A78B4-807A7A08 000594 0154+00 9/9 0/0 0/0 .text            setSmokeEffect__8daE_SW_cFv */
 void daE_SW_c::setSmokeEffect() {
     if (field_0x6e4 != 0 && speedF) {
         cXyz sp14(field_0x674);
@@ -176,7 +168,6 @@ void daE_SW_c::setSmokeEffect() {
     }
 }
 
-/* 807A7A08-807A7AC0 0006E8 00B8+00 2/2 0/0 0/0 .text            setDiveEffect__8daE_SW_cFv */
 void daE_SW_c::setDiveEffect() {
     csXyz acStack_18(0, shape_angle.y, 0);
     static u16 l_SW_DIVE_EFFECT_ID[4] = {DKM_REALSMOKE01_IA, ZL2_ROCK_2, ZLM_SAND00_IA_2, ZL2_SMOKE00_1};
@@ -185,7 +176,6 @@ void daE_SW_c::setDiveEffect() {
     }
 }
 
-/* 807A7AC0-807A7B64 0007A0 00A4+00 2/2 0/0 0/0 .text            setHideEffect__8daE_SW_cFv */
 void daE_SW_c::setHideEffect() {
     static u16 l_SW_HIDE_EFFECT_ID[3] = {ZL2_ROCK_3, ZLM_SAND00_IA_3, ZL2_SMOKE00_2};
     for (int i = 0; i < 3; i++) {
@@ -213,7 +203,6 @@ static u8 data_807B0202;
 /* 807B0203 0001+00 data_807B0203 None */
 static u8 l_initHIO;
 
-/* 807A7B64-807A7B9C 000844 0038+00 17/17 0/0 0/0 .text            setActionMode__8daE_SW_cFss */
 void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) {
     if (field_0x6e6 != 0) {
         data_807B0200 = 0;
@@ -226,7 +215,6 @@ void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) {
     mMoveMode = i_moveMode;
 }
 
-/* 807A7B9C-807A7C50 00087C 00B4+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NBOMB && 
         !fopAcM_checkCarryNow((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) {
@@ -240,10 +228,8 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807B0210-807B0234 000060 0024+00 12/13 0/0 0/0 .bss             l_HIO */
 static daE_SW_HIO_c l_HIO;
 
-/* 807A7C50-807A7CD0 000930 0080+00 2/2 0/0 0/0 .text            search_bomb__8daE_SW_cFv */
 fopAc_ac_c* daE_SW_c::search_bomb() {
     target_info = NULL;
     target_dist = l_HIO.bomb_notice_dist;
@@ -257,7 +243,6 @@ fopAc_ac_c* daE_SW_c::search_bomb() {
     return target_info;
 }
 
-/* 807A7CD0-807A7D48 0009B0 0078+00 4/4 0/0 0/0 .text            bomb_check__8daE_SW_cFv */
 BOOL daE_SW_c::bomb_check() {
     if (field_0x68c == 0) {
         fopAc_ac_c* bomb = search_bomb();
@@ -270,7 +255,6 @@ BOOL daE_SW_c::bomb_check() {
     return FALSE;
 }
 
-/* 807A7D48-807A7DAC 000A28 0064+00 2/2 0/0 0/0 .text            setModeBack__8daE_SW_cFv */
 bool daE_SW_c::setModeBack() {
     if ((field_0x6bc & 3) == 0) {
         setActionMode(0, 0);
@@ -281,7 +265,6 @@ bool daE_SW_c::setModeBack() {
     return false;
 }
 
-/* 807A7DAC-807A7EFC 000A8C 0150+00 1/1 0/0 0/0 .text            checkFall__8daE_SW_cFv */
 void daE_SW_c::checkFall() {
     if (mActionMode == 11 || mActionMode == 5 || mActionMode == 13 || mActionMode == 3) {
         return;
@@ -305,7 +288,6 @@ void daE_SW_c::checkFall() {
     }
 }
 
-/* 807A7EFC-807A7F88 000BDC 008C+00 1/1 0/0 0/0 .text            checkBeforeWall__8daE_SW_cFv */
 bool daE_SW_c::checkBeforeWall() {
     if (field_0x6f8[0].ChkWallHit()) {
         if (abs((s16)(field_0x6f8[0].GetWallAngleY() - current.angle.y)) > 0x7000) {
@@ -322,7 +304,6 @@ bool daE_SW_c::checkBeforeWall() {
     return false;
 }
 
-/* 807A7F88-807A8290 000C68 0308+00 1/1 0/0 0/0 .text            executeWait__8daE_SW_cFv */
 void daE_SW_c::executeWait() {
     if (speedF > 2.0f) {
         setSmokeEffect();
@@ -381,7 +362,6 @@ void daE_SW_c::executeWait() {
     }
 }
 
-/* 807A8290-807A831C 000F70 008C+00 2/2 0/0 0/0 .text            checkRunChase__8daE_SW_cFv */
 int daE_SW_c::checkRunChase() {
     if (field_0x6ee == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -402,7 +382,6 @@ int daE_SW_c::checkRunChase() {
     return 0;
 }
 
-/* 807A831C-807A8B98 000FFC 087C+00 1/1 0/0 0/0 .text            executeChaseSlow__8daE_SW_cFv */
 void daE_SW_c::executeChaseSlow() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp3c(player->current.pos);
@@ -553,7 +532,6 @@ void daE_SW_c::executeChaseSlow() {
     }
 }
 
-/* 807A8B98-807A9580 001878 09E8+00 1/1 0/0 0/0 .text            executeChaseFast__8daE_SW_cFv */
 void daE_SW_c::executeChaseFast() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp50(player->current.pos);
@@ -662,7 +640,6 @@ void daE_SW_c::executeChaseFast() {
     }
 }
 
-/* 807A9580-807A9768 002260 01E8+00 1/1 0/0 0/0 .text            executeBomb__8daE_SW_cFv */
 void daE_SW_c::executeBomb() {
     setSmokeEffect();
 
@@ -719,7 +696,6 @@ void daE_SW_c::executeBomb() {
     shape_angle.y = current.angle.y;
 }
 
-/* 807A9768-807A9E58 002448 06F0+00 1/1 0/0 0/0 .text            executeAttack__8daE_SW_cFv */
 void daE_SW_c::executeAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar1;
@@ -875,7 +851,6 @@ void daE_SW_c::executeAttack() {
     shape_angle.y = current.angle.y;
 }
 
-/* 807A9E58-807AA050 002B38 01F8+00 2/2 0/0 0/0 .text            executeHook__8daE_SW_cFv */
 void daE_SW_c::executeHook() {
     cXyz sp24;
 
@@ -927,7 +902,6 @@ void daE_SW_c::executeHook() {
     }
 }
 
-/* 807AA050-807AA44C 002D30 03FC+00 1/1 0/0 0/0 .text            executeMoveOut__8daE_SW_cFv */
 void daE_SW_c::executeMoveOut() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp3c(player->current.pos);
@@ -966,7 +940,6 @@ void daE_SW_c::executeMoveOut() {
     }
 }
 
-/* 807AA44C-807AA784 00312C 0338+00 2/1 0/0 0/0 .text            executeChance__8daE_SW_cFv */
 void daE_SW_c::executeChance() {
     s16 sVar1;
 
@@ -1039,7 +1012,6 @@ void daE_SW_c::executeChance() {
     }
 }
 
-/* 807AA784-807AA91C 003464 0198+00 1/1 0/0 0/0 .text            executeDive__8daE_SW_cFv */
 void daE_SW_c::executeDive() {
     s16 sVar1 = 0x800;
     f32 fVar1 = 14.0f;
@@ -1078,7 +1050,6 @@ void daE_SW_c::executeDive() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 8, 0x400);
 }
 
-/* 807AA91C-807AAB7C 0035FC 0260+00 1/1 0/0 0/0 .text            executeDamage__8daE_SW_cFv */
 void daE_SW_c::executeDamage() {
     s16 sVar1;
 
@@ -1138,7 +1109,6 @@ void daE_SW_c::executeDamage() {
     }
 }
 
-/* 807AAB7C-807AAD28 00385C 01AC+00 1/1 0/0 0/0 .text            executeDie__8daE_SW_cFv */
 void daE_SW_c::executeDie() {
     switch (mMoveMode) {
         case 0:
@@ -1183,7 +1153,6 @@ void daE_SW_c::executeDie() {
     }
 }
 
-/* 807AAD28-807AADCC 003A08 00A4+00 1/1 0/0 0/0 .text            s_child_sub__FPvPv */
 static void* s_child_sub(void* i_actor, void* i_data) {
     if (!fpcM_IsCreating(fopAcM_GetID(i_actor)) && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SW) {
         if (fopAcM_GetLinkId((fopAc_ac_c*)i_actor) == fopAcM_GetID(i_data)) {
@@ -1194,7 +1163,6 @@ static void* s_child_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807AADCC-807AAF70 003AAC 01A4+00 1/1 0/0 0/0 .text            executeMaster__8daE_SW_cFv */
 void daE_SW_c::executeMaster() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -1230,7 +1198,6 @@ void daE_SW_c::executeMaster() {
     }
 }
 
-/* 807AAF70-807AB310 003C50 03A0+00 3/3 0/0 0/0 .text            checkSuddenAttack__8daE_SW_cFi */
 bool daE_SW_c::checkSuddenAttack(int param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 fVar1 = current.pos.absXZ(player->current.pos);
@@ -1264,7 +1231,6 @@ bool daE_SW_c::checkSuddenAttack(int param_1) {
     return false;
 }
 
-/* 807AB310-807AB5C4 003FF0 02B4+00 1/1 0/0 0/0 .text            executeSuddenAttack__8daE_SW_cFv */
 void daE_SW_c::executeSuddenAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp1c(player->current.pos);
@@ -1313,7 +1279,6 @@ void daE_SW_c::executeSuddenAttack() {
     shape_angle.y = current.angle.y;
 }
 
-/* 807AB5C4-807AB6C4 0042A4 0100+00 1/1 0/0 0/0 .text            executeFall__8daE_SW_cFv */
 void daE_SW_c::executeFall() {
     switch (mMoveMode) {
         case 0:
@@ -1341,7 +1306,6 @@ void daE_SW_c::executeFall() {
     shape_angle.x = cM_atan2s(speedF, speed.y) - 0x4000;
 }
 
-/* 807AB6C4-807AB884 0043A4 01C0+00 2/1 0/0 0/0 .text            action__8daE_SW_cFv */
 void daE_SW_c::action() {
     field_0x98c.OffAtSetBit();
     damage_check();
@@ -1425,7 +1389,6 @@ void daE_SW_c::action() {
     }
 }
 
-/* 807AB884-807AB930 004564 00AC+00 2/2 0/0 0/0 .text            mtx_set__8daE_SW_cFv */
 void daE_SW_c::mtx_set() {
     if (mpModelMorf != NULL) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x6d8, current.pos.z);
@@ -1443,7 +1406,6 @@ void daE_SW_c::mtx_set() {
     }
 }
 
-/* 807AB930-807ABAB0 004610 0180+00 2/2 0/0 0/0 .text            cc_set__8daE_SW_cFv */
 void daE_SW_c::cc_set() {
     if (mpModelMorf != NULL) {
         J3DModel* model = mpModelMorf->getModel();
@@ -1486,7 +1448,6 @@ void daE_SW_c::cc_set() {
     }
 }
 
-/* 807ABAB0-807ABD28 004790 0278+00 1/1 0/0 0/0 .text            damage_check__8daE_SW_cFv */
 void daE_SW_c::damage_check() {
     mStts.Move();
 
@@ -1555,7 +1516,6 @@ void daE_SW_c::damage_check() {
     }
 }
 
-/* 807ABD28-807ABE50 004A08 0128+00 2/2 0/0 0/0 .text            checkGroundSand__8daE_SW_cFv */
 void daE_SW_c::checkGroundSand() {
     field_0x6bc = 0;
     cXyz sp1c(0.0f, 200.0f, 0.0f);
@@ -1579,7 +1539,6 @@ void daE_SW_c::checkGroundSand() {
     }
 }
 
-/* 807ABE50-807AC148 004B30 02F8+00 1/1 0/0 0/0 .text            execute__8daE_SW_cFv */
 int daE_SW_c::execute() {
     if (field_0x694 == 0) {
         return d_execute();
@@ -1644,17 +1603,14 @@ int daE_SW_c::execute() {
     return 1;
 }
 
-/* 807AC148-807AC168 004E28 0020+00 2/1 0/0 0/0 .text            daE_SW_Execute__FP8daE_SW_c */
 static int daE_SW_Execute(daE_SW_c* i_this) {
     return i_this->execute();
 }
 
-/* 807AC168-807AC170 004E48 0008+00 1/0 0/0 0/0 .text            daE_SW_IsDelete__FP8daE_SW_c */
 static int daE_SW_IsDelete(daE_SW_c* i_this) {
     return 1;
 }
 
-/* 807AC170-807AC1E4 004E50 0074+00 1/1 0/0 0/0 .text            _delete__8daE_SW_cFv */
 int daE_SW_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_SW");
 
@@ -1669,12 +1625,10 @@ int daE_SW_c::_delete() {
     return 1;
 }
 
-/* 807AC1E4-807AC204 004EC4 0020+00 1/0 0/0 0/0 .text            daE_SW_Delete__FP8daE_SW_c */
 static int daE_SW_Delete(daE_SW_c* i_this) {
     return i_this->_delete();
 }
 
-/* 807AC204-807AC2FC 004EE4 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_SW_cFv */
 int daE_SW_c::CreateHeap() {
     mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_SW", BMDR_SW), NULL, NULL,
                                        (J3DAnmTransform*)dComIfG_getObjectRes("E_SW", BCK_SW_WAIT), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
@@ -1685,13 +1639,11 @@ int daE_SW_c::CreateHeap() {
     return 1;
 }
 
-/* 807AC2FC-807AC31C 004FDC 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daE_SW_c* i_this = (daE_SW_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 807AC31C-807AC854 004FFC 0538+00 1/1 0/0 0/0 .text            create__8daE_SW_cFv */
 cPhs__Step daE_SW_c::create() {
     fopAcM_ct(this, daE_SW_c);
 
@@ -1832,12 +1784,10 @@ cPhs__Step daE_SW_c::create() {
     return phase;
 }
 
-/* 807ACA20-807ACA40 005700 0020+00 1/0 0/0 0/0 .text            daE_SW_Create__FP8daE_SW_c */
 static int daE_SW_Create(daE_SW_c* i_this) {
     return i_this->create();
 }
 
-/* 807ACA40-807ACAE4 005720 00A4+00 12/12 0/0 0/0 .text d_setAction__8daE_SW_cFM8daE_SW_cFPCvPv_v */
 void daE_SW_c::d_setAction(void (daE_SW_c::*action)()) {
     if (field_0xafc) {
         mMoveMode = -1;
@@ -1850,7 +1800,6 @@ void daE_SW_c::d_setAction(void (daE_SW_c::*action)()) {
     (this->*field_0xafc)();
 }
 
-/* 807AFF74-807AFF94 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_SW_Method */
 static actor_method_class l_daE_SW_Method = {
     (process_method_func)daE_SW_Create,
     (process_method_func)daE_SW_Delete,
@@ -1859,7 +1808,6 @@ static actor_method_class l_daE_SW_Method = {
     (process_method_func)daE_SW_Draw,
 };
 
-/* 807AFF94-807AFFC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_SW */
 extern actor_process_profile_definition g_profile_E_SW = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
@@ -1877,7 +1825,6 @@ extern actor_process_profile_definition g_profile_E_SW = {
     fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
-/* 807ACAE4-807ACCB0 0057C4 01CC+00 1/1 0/0 0/0 .text            d_checkFall__8daE_SW_cFv */
 void daE_SW_c::d_checkFall() {
     if (d_checkAction(daE_SW_c::d_hook) || d_checkAction(daE_SW_c::d_fall) || d_checkAction(daE_SW_c::d_attk)) {
         return;
@@ -1901,7 +1848,6 @@ void daE_SW_c::d_checkFall() {
     }
 }
 
-/* 807ACCB0-807ACFF8 005990 0348+00 1/1 0/0 0/0 .text            d_damage_check__8daE_SW_cFv */
 void daE_SW_c::d_damage_check() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1973,7 +1919,6 @@ void daE_SW_c::d_damage_check() {
     }
 }
 
-/* 807ACFF8-807AD10C 005CD8 0114+00 1/1 0/0 0/0 .text            d_action__8daE_SW_cFv */
 void daE_SW_c::d_action() {
     field_0x98c.OffAtSetBit();
     d_damage_check();
@@ -1998,7 +1943,6 @@ void daE_SW_c::d_action() {
     }
 }
 
-/* 807AD10C-807AD17C 005DEC 0070+00 1/1 0/0 0/0 .text            d_bomb_check__8daE_SW_cFv */
 bool daE_SW_c::d_bomb_check() {
     if (field_0x68c != 0) {
         return false;
@@ -2012,7 +1956,6 @@ bool daE_SW_c::d_bomb_check() {
     return false;
 }
 
-/* 807AD17C-807AD4A8 005E5C 032C+00 2/0 0/0 0/0 .text            d_bm_chase__8daE_SW_cFv */
 void daE_SW_c::d_bm_chase() {
     if (mMoveMode != -1) {
         dBomb_c* bomb = NULL;
@@ -2068,7 +2011,6 @@ void daE_SW_c::d_bm_chase() {
     }
 }
 
-/* 807AD4A8-807AD7C0 006188 0318+00 7/0 0/0 0/0 .text            d_wait__8daE_SW_cFv */
 void daE_SW_c::d_wait() {
     switch (mMoveMode) {
         case 0:
@@ -2155,7 +2097,6 @@ void daE_SW_c::d_wait() {
     }
 }
 
-/* 807AD7C0-807ADA08 0064A0 0248+00 1/1 0/0 0/0 .text            d_chaseCheck__8daE_SW_cFv */
 bool daE_SW_c::d_chaseCheck() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 fVar1 = current.pos.absXZ(player->current.pos);
@@ -2182,7 +2123,6 @@ bool daE_SW_c::d_chaseCheck() {
     return false;
 }
 
-/* 807ADA08-807ADE50 0066E8 0448+00 1/0 0/0 0/0 .text            d_chase__8daE_SW_cFv */
 void daE_SW_c::d_chase() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar1;
@@ -2246,7 +2186,6 @@ void daE_SW_c::d_chase() {
     }
 }
 
-/* 807ADE50-807AE4B4 006B30 0664+00 3/0 0/0 0/0 .text            d_attk__8daE_SW_cFv */
 void daE_SW_c::d_attk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar1;
@@ -2371,7 +2310,6 @@ void daE_SW_c::d_attk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 807AE4B4-807AE7F4 007194 0340+00 5/0 0/0 0/0 .text            d_chance__8daE_SW_cFv */
 void daE_SW_c::d_chance() {
     s16 sVar1;
 
@@ -2434,7 +2372,6 @@ void daE_SW_c::d_chance() {
     }
 }
 
-/* 807AE7F4-807AE968 0074D4 0174+00 2/0 0/0 0/0 .text            d_chance2__8daE_SW_cFv */
 void daE_SW_c::d_chance2() {
     switch (mMoveMode) {
         case 0:
@@ -2459,7 +2396,6 @@ void daE_SW_c::d_chance2() {
     }
 }
 
-/* 807AE968-807AEB08 007648 01A0+00 1/0 0/0 0/0 .text            d_dive__8daE_SW_cFv */
 void daE_SW_c::d_dive() {
     switch (mMoveMode) {
         case 0:
@@ -2497,7 +2433,6 @@ void daE_SW_c::d_dive() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y, 8, 0x400);
 }
 
-/* 807AEB08-807AEE44 0077E8 033C+00 4/0 0/0 0/0 .text            d_damage__8daE_SW_cFv */
 void daE_SW_c::d_damage() {
     s16 sVar1;
 
@@ -2576,7 +2511,6 @@ void daE_SW_c::d_damage() {
     }
 }
 
-/* 807AEE44-807AF01C 007B24 01D8+00 2/0 0/0 0/0 .text            d_die__8daE_SW_cFv */
 void daE_SW_c::d_die() {
     switch (mMoveMode) {
         case 0:
@@ -2625,7 +2559,6 @@ void daE_SW_c::d_die() {
     }
 }
 
-/* 807AF01C-807AF46C 007CFC 0450+00 3/0 0/0 0/0 .text            d_hook__8daE_SW_cFv */
 void daE_SW_c::d_hook() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz spb4;
@@ -2704,7 +2637,6 @@ void daE_SW_c::d_hook() {
     }
 }
 
-/* 807AF4B4-807AF57C 008194 00C8+00 2/0 0/0 0/0 .text            d_fall__8daE_SW_cFv */
 void daE_SW_c::d_fall() {
     switch (mMoveMode) {
         case 0:
@@ -2728,7 +2660,6 @@ void daE_SW_c::d_fall() {
     }
 }
 
-/* 807AF57C-807AF828 00825C 02AC+00 1/1 0/0 0/0 .text            d_execute__8daE_SW_cFv */
 int daE_SW_c::d_execute() {
     if (field_0x6ea != 0) {
         field_0x6ea--;
diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp
index a0c9040dc6..9d1c8eac45 100644
--- a/src/d/actor/d_a_e_th.cpp
+++ b/src/d/actor/d_a_e_th.cpp
@@ -15,8 +15,8 @@
 
 class daE_TH_HIO_c : public JORReflexible {
 public:
-    /* 807B038C */ daE_TH_HIO_c();
-    /* 807B3FA4 */ virtual ~daE_TH_HIO_c() {}
+    daE_TH_HIO_c();
+    virtual ~daE_TH_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -38,7 +38,6 @@ enum daE_TH_ACTION {
     ACTION_END = 25,
 };
 
-/* 807B038C-807B03C4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__12daE_TH_HIO_cFv */
 daE_TH_HIO_c::daE_TH_HIO_c() {
     no = -1;
     base_size = 1.0f;
@@ -46,7 +45,6 @@ daE_TH_HIO_c::daE_TH_HIO_c() {
     middle_move_range = 700.0f;
 }
 
-/* 807B03C4-807B0434 000124 0070+00 1/1 0/0 0/0 .text            s_md_sub1__FPvPv */
 static void* s_md_sub1(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) == 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == 560.0f) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -55,7 +53,6 @@ static void* s_md_sub1(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807B0434-807B04A4 000194 0070+00 1/1 0/0 0/0 .text            s_md_sub2__FPvPv */
 static void* s_md_sub2(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_MD && (fopAcM_GetParam(i_actor) & 0xFF00) != 0xFF00 && ((fopAc_ac_c*)i_actor)->current.pos.z == -950.0f) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -64,13 +61,11 @@ static void* s_md_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807B04A4-807B0550 000204 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_th_classifUcf */
 static void anm_init(e_th_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_th", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
     i_this->mAnm = i_anm;
 }
 
-/* 807B0550-807B0630 0002B0 00E0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -89,7 +84,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 807B0630-807B09A4 000390 0374+00 1/1 0/0 0/0 .text ke_control__FP10e_th_classP7th_ke_si */
 static void ke_control(e_th_class* i_this, th_ke_s* i_ke_s, int i_no) {
     cXyz sp4C;
     cXyz sp40;
@@ -144,7 +138,6 @@ static void ke_control(e_th_class* i_this, th_ke_s* i_ke_s, int i_no) {
     }
 }
 
-/* 807B09A4-807B09E8 000704 0044+00 1/1 0/0 0/0 .text ke_pos_set__FP10e_th_classP7th_ke_si */
 static void ke_pos_set(e_th_class* i_this, th_ke_s* i_ke_s, int param_2) {
     cXyz* pos_p = i_this->mKeLineMat.getPos(param_2);
     for (int i = 0; i < 15; i++, pos_p++) {
@@ -152,14 +145,12 @@ static void ke_pos_set(e_th_class* i_this, th_ke_s* i_ke_s, int param_2) {
     }
 }
 
-/* 807B09E8-807B0A6C 000748 0084+00 1/1 0/0 0/0 .text            ke_disp__FP10e_th_class */
 static void ke_disp(e_th_class* i_this) {
     static GXColor l_color = {0x50, 0x0A, 0x0A, 0xFF};
     i_this->mKeLineMat.update(15, 3.5f + TREG_F(11), l_color, 1, &i_this->tevStr);
     dComIfGd_set3DlineMat(&i_this->mKeLineMat);
 }
 
-/* 807B0A6C-807B0BD0 0007CC 0164+00 1/1 0/0 0/0 .text            ke_move__FP10e_th_class */
 static void ke_move(e_th_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp28;
@@ -196,7 +187,6 @@ static void ke_move(e_th_class* i_this) {
     }
 }
 
-/* 807B0BD0-807B0D7C 000930 01AC+00 1/0 0/0 0/0 .text            daE_TH_Draw__FP10e_th_class */
 static int daE_TH_Draw(e_th_class* i_this) {
     J3DModel* model_p = i_this->mpModelMorf->getModel();
     if (i_this->mNoDraw) {
@@ -226,7 +216,6 @@ static int daE_TH_Draw(e_th_class* i_this) {
     return 1;
 }
 
-/* 807B0D7C-807B0EFC 000ADC 0180+00 1/1 0/0 0/0 .text            e_th_wait__FP10e_th_class */
 static void e_th_wait(e_th_class* i_this) {
     i_this->field_0x6a4 = 5;
 
@@ -260,7 +249,6 @@ static void e_th_wait(e_th_class* i_this) {
     }
 }
 
-/* 807B0EFC-807B0F20 000C5C 0024+00 1/1 0/0 0/0 .text            e_th_spin__FP10e_th_class */
 static void e_th_spin(e_th_class* i_this) {
     cXyz sp14;
     cXyz sp8;
@@ -271,7 +259,6 @@ static void e_th_spin(e_th_class* i_this) {
     i_this->mMode = 0;
 }
 
-/* 807B0F20-807B12B0 000C80 0390+00 2/1 0/0 0/0 .text            e_th_spin_B__FP10e_th_class */
 static void e_th_spin_B(e_th_class* i_this) {
     cXyz sp18;
     cXyz spC;
@@ -367,7 +354,6 @@ static void e_th_spin_B(e_th_class* i_this) {
     cLib_addCalc2(&i_this->speedF, speed_target, 1.0f, 0.1f);
 }
 
-/* 807B12B0-807B141C 001010 016C+00 1/1 0/0 0/0 .text            e_th_shot__FP10e_th_class */
 static s16 e_th_shot(e_th_class* i_this) {
     s16 angle_chase_step = 0;
     int anm_frame = i_this->mpModelMorf->getFrame();
@@ -410,7 +396,6 @@ static s16 e_th_shot(e_th_class* i_this) {
     return angle_chase_step;
 }
 
-/* 807B141C-807B1670 00117C 0254+00 1/1 0/0 0/0 .text            e_th_return__FP10e_th_class */
 static void e_th_return(e_th_class* i_this) {
     e_th_ball_class* ball_p = (e_th_ball_class*)fopAcM_SearchByID(i_this->mBallID);
     cXyz ball_vec;
@@ -460,7 +445,6 @@ static void e_th_return(e_th_class* i_this) {
     }
 }
 
-/* 807B1670-807B176C 0013D0 00FC+00 1/1 0/0 0/0 .text            e_th_damage__FP10e_th_class */
 static void e_th_damage(e_th_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -481,7 +465,6 @@ static void e_th_damage(e_th_class* i_this) {
     }
 }
 
-/* 807B176C-807B18C0 0014CC 0154+00 1/1 0/0 0/0 .text            e_th_start__FP10e_th_class */
 static void e_th_start(e_th_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     i_this->field_0x6a4 = 5;
@@ -510,7 +493,6 @@ static void e_th_start(e_th_class* i_this) {
     }
 }
 
-/* 807B18C0-807B19AC 001620 00EC+00 1/1 0/0 0/0 .text            e_th_end__FP10e_th_class */
 static void e_th_end(e_th_class* i_this) {
     i_this->field_0x6a4 = 5;
     dComIfGp_getPlayer(0);
@@ -535,7 +517,6 @@ static void e_th_end(e_th_class* i_this) {
     }
 }
 
-/* 807B19AC-807B1B78 00170C 01CC+00 1/1 0/0 0/0 .text            damage_check__FP10e_th_class */
 static void damage_check(e_th_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     i_this->mCcStts.Move();
@@ -589,7 +570,6 @@ static void damage_check(e_th_class* i_this) {
     }
 }
 
-/* 807B1B78-807B1EB4 0018D8 033C+00 2/1 0/0 0/0 .text            action__FP10e_th_class */
 static void action(e_th_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -691,7 +671,6 @@ static void action(e_th_class* i_this) {
     }
 }
 
-/* 807B1EB4-807B1F98 001C14 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_th_classf */
 static void cam_3d_morf(e_th_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamCenter.x, i_this->mDemoCamCenterTarget.x, param_1, i_this->mDemoCamCenterSpd.x * i_this->field_0xd88);
     cLib_addCalc2(&i_this->mDemoCamCenter.y, i_this->mDemoCamCenterTarget.y, param_1, i_this->mDemoCamCenterSpd.y * i_this->field_0xd88);
@@ -702,7 +681,6 @@ static void cam_3d_morf(e_th_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->mDemoCamEye.z, i_this->mDemoCamEyeTarget.z, param_1, i_this->mDemoCamEyeSpd.z * i_this->field_0xd88);
 }
 
-/* 807B1F98-807B2DEC 001CF8 0E54+00 2/1 0/0 0/0 .text            demo_camera__FP10e_th_class */
 static void demo_camera(e_th_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1022,7 +1000,6 @@ static void demo_camera(e_th_class* i_this) {
     }
 }
 
-/* 807B2DEC-807B300C 002B4C 0220+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_th_class */
 static void anm_se_set(e_th_class* i_this) {
     u32 sound_id = 0;
     u32 voice_id = 0;
@@ -1056,13 +1033,10 @@ static void anm_se_set(e_th_class* i_this) {
     }
 }
 
-/* 807B4870-807B4874 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 807B4880-807B4898 000018 0018+00 3/3 0/0 0/0 .bss             l_HIO */
 static daE_TH_HIO_c l_HIO;
 
-/* 807B300C-807B3514 002D6C 0508+00 2/1 0/0 0/0 .text            daE_TH_Execute__FP10e_th_class */
 static int daE_TH_Execute(e_th_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp2C;
@@ -1177,12 +1151,10 @@ static int daE_TH_Execute(e_th_class* i_this) {
     return 1;
 }
 
-/* 807B3514-807B351C 003274 0008+00 1/0 0/0 0/0 .text            daE_TH_IsDelete__FP10e_th_class */
 static int daE_TH_IsDelete(e_th_class* i_this) {
     return 1;
 }
 
-/* 807B351C-807B3584 00327C 0068+00 1/0 0/0 0/0 .text            daE_TH_Delete__FP10e_th_class */
 static int daE_TH_Delete(e_th_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "E_th");
@@ -1199,7 +1171,6 @@ static int daE_TH_Delete(e_th_class* i_this) {
     return 1;
 }
 
-/* 807B3584-807B36D0 0032E4 014C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_th_class* i_this = (e_th_class*)a_this;
 
@@ -1222,7 +1193,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807B36D0-807B3B58 003430 0488+00 1/0 0/0 0/0 .text            daE_TH_Create__FP10fopAc_ac_c */
 static int daE_TH_Create(fopAc_ac_c* a_this) {
     e_th_class* i_this = (e_th_class*)a_this;
     fopAcM_ct(i_this, e_th_class);
@@ -1328,7 +1298,6 @@ static int daE_TH_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 807B4794-807B47B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TH_Method */
 static actor_method_class l_daE_TH_Method = {
     (process_method_func)daE_TH_Create,
     (process_method_func)daE_TH_Delete,
@@ -1337,7 +1306,6 @@ static actor_method_class l_daE_TH_Method = {
     (process_method_func)daE_TH_Draw,
 };
 
-/* 807B47B4-807B47E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TH */
 extern actor_process_profile_definition g_profile_E_TH = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp
index a8c9456a1e..b53ba952ce 100644
--- a/src/d/actor/d_a_e_th_ball.cpp
+++ b/src/d/actor/d_a_e_th_ball.cpp
@@ -19,10 +19,8 @@ enum daE_TH_ACTION {
     ACTION_END = 10,
 };
 
-/* 807B80E0-807B80E4 000000 0004+00 12/12 0/0 0/0 .bss             master */
 static e_th_class* master;
 
-/* 807B4918-807B4C40 000078 0328+00 1/1 0/0 0/0 .text            chain_draw__FP15e_th_ball_class */
 static void chain_draw(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 size = 1.0f + XREG_F(0);
@@ -95,7 +93,6 @@ static void chain_draw(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B4C40-807B4CEC 0003A0 00AC+00 1/0 0/0 0/0 .text daE_TH_BALL_Draw__FP15e_th_ball_class */
 static int daE_TH_BALL_Draw(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     if (i_this->mPlayerGet) {
@@ -110,7 +107,6 @@ static int daE_TH_BALL_Draw(e_th_ball_class* i_this) {
     return 1;
 }
 
-/* 807B4CEC-807B5074 00044C 0388+00 1/1 0/0 0/0 .text chain_control_01__FP15e_th_ball_class */
 static void chain_control_01(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz mae;
@@ -179,7 +175,6 @@ static void chain_control_01(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B50B0-807B54B4 000810 0404+00 1/1 0/0 0/0 .text chain_control_02__FP15e_th_ball_class */
 static void chain_control_02(e_th_ball_class* i_this) {
     cXyz sp6C;
     cXyz sp60;
@@ -249,7 +244,6 @@ static void chain_control_02(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B54B4-807B56A4 000C14 01F0+00 1/1 0/0 0/0 .text chain_control_03__FP15e_th_ball_class */
 static void chain_control_03(e_th_ball_class* i_this) {
     th_chain_s* chain_s = &i_this->field_0x65c;
     cXyz sp2C;
@@ -265,7 +259,6 @@ static void chain_control_03(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B56A4-807B5980 000E04 02DC+00 1/1 0/0 0/0 .text chain_control_11__FP15e_th_ball_class */
 static void chain_control_11(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp48;
@@ -332,7 +325,6 @@ static void chain_control_11(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B5980-807B5B38 0010E0 01B8+00 1/1 0/0 0/0 .text chain_control_12__FP15e_th_ball_class */
 static void chain_control_12(e_th_ball_class* i_this) {
     cXyz sp20;
     cXyz sp14;
@@ -372,7 +364,6 @@ static void chain_control_12(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B5B38-807B5C34 001298 00FC+00 1/1 0/0 0/0 .text chain_control_13__FP15e_th_ball_class */
 static void chain_control_13(e_th_ball_class* i_this) {
     th_chain_2s* chain_s = &i_this->field_0xdec;
     cXyz sp2C;
@@ -387,7 +378,6 @@ static void chain_control_13(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B5C34-807B5F2C 001394 02F8+00 1/1 0/0 0/0 .text chain_control_21__FP15e_th_ball_class */
 static void chain_control_21(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     int i;
@@ -457,8 +447,6 @@ static void chain_control_21(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B5F2C-807B60CC 00168C 01A0+00 4/4 0/0 0/0 .text            normal_move__FP15e_th_ball_classSc
- */
 static void normal_move(e_th_ball_class* i_this, s8 param_1) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -501,8 +489,6 @@ static void normal_move(e_th_ball_class* i_this, s8 param_1) {
     }
 }
 
-/* 807B60CC-807B615C 00182C 0090+00 1/1 0/0 0/0 .text            e_th_ball_stop__FP15e_th_ball_class
- */
 static void e_th_ball_stop(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp14;
@@ -524,8 +510,6 @@ static void e_th_ball_stop(e_th_ball_class* i_this) {
     normal_move(i_this, 1);
 }
 
-/* 807B615C-807B6594 0018BC 0438+00 1/1 0/0 0/0 .text            e_th_ball_spin__FP15e_th_ball_class
- */
 static void e_th_ball_spin(e_th_ball_class* i_this) {
     cXyz sp34;
     cXyz sp28;
@@ -613,8 +597,6 @@ static void e_th_ball_spin(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B6594-807B6734 001CF4 01A0+00 1/1 0/0 0/0 .text            wall_angle_get__FP15e_th_ball_class
- */
 static s16 wall_angle_get(e_th_ball_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_LinChk linchk;
@@ -650,8 +632,6 @@ static s16 wall_angle_get(e_th_ball_class* i_this) {
     return cM_atan2s(sp28.x, sp28.z) + 0x4000;
 }
 
-/* 807B6734-807B69A4 001E94 0270+00 1/1 0/0 0/0 .text            e_th_ball_shot__FP15e_th_ball_class
- */
 static void e_th_ball_shot(e_th_ball_class* i_this) {
     cXyz sp28;
     cXyz sp1C;
@@ -711,7 +691,6 @@ static void e_th_ball_shot(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B69A4-807B6D00 002104 035C+00 1/1 0/0 0/0 .text e_th_ball_return__FP15e_th_ball_class */
 static void e_th_ball_return(e_th_ball_class* i_this) {
     cXyz sp18;
     cXyz spC;
@@ -775,8 +754,6 @@ static void e_th_ball_return(e_th_ball_class* i_this) {
     normal_move(i_this, sp8);
 }
 
-/* 807B6D00-807B6DC8 002460 00C8+00 1/1 0/0 0/0 .text            e_th_ball_end__FP15e_th_ball_class
- */
 static void e_th_ball_end(e_th_ball_class* i_this) {
     cLib_addCalc0(&i_this->speedF, 1.0f, 1.0f + TREG_F(17));
     normal_move(i_this, 1);
@@ -791,7 +768,6 @@ static void e_th_ball_end(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B6DC8-807B7454 002528 068C+00 1/1 0/0 0/0 .text            action__FP15e_th_ball_class */
 static void action(e_th_ball_class* i_this) {
     f32 var_f31 = 0.0f;
     f32 var_f30 = 1.0f;
@@ -945,10 +921,8 @@ static void action(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B80E4-807B80E8 000004 0004+00 1/1 0/0 0/0 .bss             demo_id */
 static fpc_ProcID demo_id;
 
-/* 807B7454-807B753C 002BB4 00E8+00 1/1 0/0 0/0 .text            get_demo__FP15e_th_ball_class */
 static void get_demo(e_th_ball_class* i_this) {
     cXyz sp14;
     cXyz sp8;
@@ -976,7 +950,6 @@ static void get_demo(e_th_ball_class* i_this) {
     }
 }
 
-/* 807B753C-807B7744 002C9C 0208+00 2/1 0/0 0/0 .text daE_TH_BALL_Execute__FP15e_th_ball_class */
 static int daE_TH_BALL_Execute(e_th_ball_class* i_this) {
     cXyz sp14;
     cXyz sp8;
@@ -1029,12 +1002,10 @@ static int daE_TH_BALL_Execute(e_th_ball_class* i_this) {
     return 1;
 }
 
-/* 807B7744-807B774C 002EA4 0008+00 1/0 0/0 0/0 .text daE_TH_BALL_IsDelete__FP15e_th_ball_class */
 static int daE_TH_BALL_IsDelete(e_th_ball_class* i_this) {
     return 1;
 }
 
-/* 807B774C-807B77AC 002EAC 0060+00 1/0 0/0 0/0 .text daE_TH_BALL_Delete__FP15e_th_ball_class */
 static int daE_TH_BALL_Delete(e_th_ball_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "E_th_ball");
@@ -1046,7 +1017,6 @@ static int daE_TH_BALL_Delete(e_th_ball_class* i_this) {
     return 1;
 }
 
-/* 807B77AC-807B792C 002F0C 0180+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_th_ball_class* i_this = (e_th_ball_class*)a_this;
 
@@ -1083,8 +1053,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807B792C-807B7AA8 00308C 017C+00 1/0 0/0 0/0 .text            daE_TH_BALL_Create__FP10fopAc_ac_c
- */
 static int daE_TH_BALL_Create(fopAc_ac_c* a_this) {
     e_th_ball_class* i_this = (e_th_ball_class*)a_this;
     fopAcM_ct(i_this, e_th_ball_class);
@@ -1147,7 +1115,6 @@ static int daE_TH_BALL_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 807B8050-807B8070 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TH_BALL_Method */
 static actor_method_class l_daE_TH_BALL_Method = {
     (process_method_func)daE_TH_BALL_Create,
     (process_method_func)daE_TH_BALL_Delete,
@@ -1156,7 +1123,6 @@ static actor_method_class l_daE_TH_BALL_Method = {
     (process_method_func)daE_TH_BALL_Draw,
 };
 
-/* 807B8070-807B80A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TH_BALL */
 extern actor_process_profile_definition g_profile_E_TH_BALL = {
   fpcLy_CURRENT_e,         // mLayerID
   8,                       // mListID
diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp
index 639b5a91ce..1723f19804 100644
--- a/src/d/actor/d_a_e_tk.cpp
+++ b/src/d/actor/d_a_e_tk.cpp
@@ -40,13 +40,10 @@ enum Mode {  // Not sure if these are correct...
     /* 0xC */ MODE_TK_WAIT01,
 };
 
-/* 807BA438-807BA43C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 807BA448-807BA464 000018 001C+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_TK_HIO_c l_HIO;
 
-/* 807B81EC-807B8234 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_TK_HIO_cFv */
 daE_TK_HIO_c::daE_TK_HIO_c() {
     field_0x04 = -1;
     mRadiusScale = 1.9f;
@@ -56,7 +53,6 @@ daE_TK_HIO_c::daE_TK_HIO_c() {
     mSpeedModifier2 = 25.0f;
 }
 
-/* 807B8234-807B82E0 000134 00AC+00 6/6 0/0 0/0 .text            anm_init__FP10e_tk_classifUcf */
 static void anm_init(e_tk_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_tk", i_index);
 
@@ -64,7 +60,6 @@ static void anm_init(e_tk_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32
     i_this->mAnim = i_index;
 }
 
-/* 807B82E0-807B8350 0001E0 0070+00 1/0 0/0 0/0 .text            daE_TK_Draw__FP10e_tk_class */
 static int daE_TK_Draw(e_tk_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
 
@@ -74,8 +69,6 @@ static int daE_TK_Draw(e_tk_class* i_this) {
     return 1;
 }
 
-/* 807B8350-807B8428 000250 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_tk_classP10fopAc_ac_c
- */
 static int other_bg_check(e_tk_class* i_this, fopAc_ac_c* i_ac) {
     fopAc_ac_c* actor = i_this;
     dBgS_LinChk line_check;
@@ -96,7 +89,6 @@ static int other_bg_check(e_tk_class* i_this, fopAc_ac_c* i_ac) {
     }
 }
 
-/* 807B8428-807B8460 000328 0038+00 3/3 0/0 0/0 .text            pl_y_check__FP10e_tk_class */
 static int pl_y_check(e_tk_class* i_this) {
     if (i_this->current.pos.y - dComIfGp_getPlayer(0)->current.pos.y > 130.0f) {
         return 0;
@@ -105,7 +97,6 @@ static int pl_y_check(e_tk_class* i_this) {
     }
 }
 
-/* 807B8460-807B84DC 000360 007C+00 4/4 0/0 0/0 .text            pl_check__FP10e_tk_classfs */
 static int pl_check(e_tk_class* i_this, f32 i_limit, s16 i_max_diff) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -119,7 +110,6 @@ static int pl_check(e_tk_class* i_this, f32 i_limit, s16 i_max_diff) {
     return 0;
 }
 
-/* 807B84DC-807B85DC 0003DC 0100+00 1/1 0/0 0/0 .text            damage_check__FP10e_tk_class */
 static void damage_check(e_tk_class* i_this) {
     if (i_this->mInvincibilityTimer == 0) {
         i_this->mStts.Move();
@@ -156,7 +146,6 @@ static void damage_check(e_tk_class* i_this) {
     }
 }
 
-/* 807B85DC-807B86EC 0004DC 0110+00 1/1 0/0 0/0 .text            way_bg_check__FP10e_tk_classf */
 static int way_bg_check(e_tk_class* i_this, f32 i_limit) {
     fopAc_ac_c* actor = i_this;
     dBgS_LinChk line_check;
@@ -184,7 +173,6 @@ static int way_bg_check(e_tk_class* i_this, f32 i_limit) {
     }
 }
 
-/* 807B86EC-807B8980 0005EC 0294+00 1/1 0/0 0/0 .text            e_tk_wait_0__FP10e_tk_class */
 static void e_tk_wait_0(e_tk_class* i_this) {
     cXyz src_pos;
     f32 speed_mul = 1.0f;
@@ -236,7 +224,6 @@ static void e_tk_wait_0(e_tk_class* i_this) {
     i_this->current.pos += i_this->speed;
 }
 
-/* 807B8980-807B8D78 000880 03F8+00 2/1 0/0 0/0 .text            e_tk_find__FP10e_tk_class */
 static void e_tk_find(e_tk_class* i_this) {
     f32 speed_target = 0.0f;
     f32 speed_step = 3.0f;
@@ -338,7 +325,6 @@ static void e_tk_find(e_tk_class* i_this) {
     cLib_addCalcAngleS2(&i_this->shape_angle.x, 0, 4, 0x400);
 }
 
-/* 807B8D78-807B8F68 000C78 01F0+00 1/1 0/0 0/0 .text            e_tk_attack__FP10e_tk_class */
 static void e_tk_attack(e_tk_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK_NONE:
@@ -379,7 +365,6 @@ static void e_tk_attack(e_tk_class* i_this) {
     cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->mPlayerAngleY, 4, 0x800);
 }
 
-/* 807B8F68-807B92C4 000E68 035C+00 1/1 0/0 0/0 .text            e_tk_pathswim__FP10e_tk_class */
 static void e_tk_pathswim(e_tk_class* i_this) {
     cXyz local_50;
 
@@ -458,7 +443,6 @@ static void e_tk_pathswim(e_tk_class* i_this) {
     i_this->current.pos += i_this->speed;
 }
 
-/* 807B92C4-807B9354 0011C4 0090+00 1/1 0/0 0/0 .text            e_tk_s_damage__FP10e_tk_class */
 static void e_tk_s_damage(e_tk_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK_NONE:
@@ -475,7 +459,6 @@ static void e_tk_s_damage(e_tk_class* i_this) {
     }
 }
 
-/* 807B9354-807B941C 001254 00C8+00 1/1 0/0 0/0 .text            e_tk_damage__FP10e_tk_class */
 static void e_tk_damage(e_tk_class* i_this) {
     i_this->mInvincibilityTimer = 6;
     i_this->mAttentionOFF = true;
@@ -495,7 +478,6 @@ static void e_tk_damage(e_tk_class* i_this) {
     }
 }
 
-/* 807B941C-807B9554 00131C 0138+00 2/1 0/0 0/0 .text            action__FP10e_tk_class */
 static void action(e_tk_class* i_this) {
     i_this->mPlayerAngleY = fopAcM_searchPlayerAngleY(i_this);
     i_this->mPlayerDistanceLimit = fopAcM_searchPlayerDistance(i_this);
@@ -537,7 +519,6 @@ static void action(e_tk_class* i_this) {
     }
 }
 
-/* 807B9554-807B9C50 001454 06FC+00 2/1 0/0 0/0 .text            daE_TK_Execute__FP10e_tk_class */
 static int daE_TK_Execute(e_tk_class* i_this) {
     cXyz cStack_94;
     cXyz cStack_a0;
@@ -662,12 +643,10 @@ static int daE_TK_Execute(e_tk_class* i_this) {
     return 1;
 }
 
-/* 807B9C50-807B9C58 001B50 0008+00 1/0 0/0 0/0 .text            daE_TK_IsDelete__FP10e_tk_class */
 static int daE_TK_IsDelete(e_tk_class* i_this) {
     return 1;
 }
 
-/* 807B9C58-807B9CC0 001B58 0068+00 1/0 0/0 0/0 .text            daE_TK_Delete__FP10e_tk_class */
 static int daE_TK_Delete(e_tk_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "E_tk");
     if (i_this->mInitHIO) {
@@ -679,7 +658,6 @@ static int daE_TK_Delete(e_tk_class* i_this) {
     return 1;
 }
 
-/* 807B9CC0-807B9DB8 001BC0 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_tk_class* i_this = static_cast<e_tk_class*>(a_this);
 
@@ -695,7 +673,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807BA358-807BA398 000060 0040+00 1/1 0/0 0/0 .data            cc_sph_src$4408 */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}},  // mObj
@@ -708,7 +685,6 @@ static dCcD_SrcSph cc_sph_src = {
     }  // mSphAttr
 };
 
-/* 807B9DB8-807BA0C4 001CB8 030C+00 1/0 0/0 0/0 .text            daE_TK_Create__FP10fopAc_ac_c */
 static int daE_TK_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_tk_class);
     e_tk_class* const a_this = static_cast<e_tk_class*>(i_this);
@@ -765,14 +741,12 @@ static int daE_TK_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 807BA398-807BA3B8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TK_Method */
 static actor_method_class l_daE_TK_Method = {
     (process_method_func)daE_TK_Create,  (process_method_func)daE_TK_Delete,
     (process_method_func)daE_TK_Execute, (process_method_func)daE_TK_IsDelete,
     (process_method_func)daE_TK_Draw,
 };
 
-/* 807BA3B8-807BA3E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TK */
 extern actor_process_profile_definition g_profile_E_TK = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp
index c277d90ef1..d879c92183 100644
--- a/src/d/actor/d_a_e_tk2.cpp
+++ b/src/d/actor/d_a_e_tk2.cpp
@@ -38,13 +38,10 @@ enum Mode {  // Not sure if these are correct...
     /* 0xC */ MODE_TK2_WAIT01,
 };
 
-/* 807BBF40-807BBF44 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 807BBF50-807BBF6C 000018 001C+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_TK2_HIO_c l_HIO;
 
-/* 807BA56C-807BA5B4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__13daE_TK2_HIO_cFv */
 daE_TK2_HIO_c::daE_TK2_HIO_c() {
     field_0x04 = -1;
     mRadiusScale = 2.3f;
@@ -54,7 +51,6 @@ daE_TK2_HIO_c::daE_TK2_HIO_c() {
     mSpeedModifier2 = 25.0f;
 }
 
-/* 807BA5B4-807BA660 000134 00AC+00 4/4 0/0 0/0 .text            anm_init__FP11e_tk2_classifUcf */
 static void anm_init(e_tk2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("E_tk2", i_index);
 
@@ -62,7 +58,6 @@ static void anm_init(e_tk2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f3
     i_this->mAnim = i_index;
 }
 
-/* 807BA660-807BA6D0 0001E0 0070+00 1/0 0/0 0/0 .text            daE_TK2_Draw__FP11e_tk2_class */
 static int daE_TK2_Draw(e_tk2_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
 
@@ -72,8 +67,6 @@ static int daE_TK2_Draw(e_tk2_class* i_this) {
     return 1;
 }
 
-/* 807BA6D0-807BA7A8 000250 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP11e_tk2_classP10fopAc_ac_c
- */
 static int other_bg_check(e_tk2_class* i_this, fopAc_ac_c* i_ac) {
     fopAc_ac_c* actor = i_this;
     dBgS_LinChk line_check;
@@ -94,7 +87,6 @@ static int other_bg_check(e_tk2_class* i_this, fopAc_ac_c* i_ac) {
     }
 }
 
-/* 807BA7A8-807BA824 000328 007C+00 2/2 0/0 0/0 .text            pl_check__FP11e_tk2_classfs */
 static int pl_check(e_tk2_class* i_this, f32 i_limit, s16 i_max_diff) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -108,7 +100,6 @@ static int pl_check(e_tk2_class* i_this, f32 i_limit, s16 i_max_diff) {
     return 0;
 }
 
-/* 807BA824-807BA940 0003A4 011C+00 1/1 0/0 0/0 .text            damage_check__FP11e_tk2_class */
 static void damage_check(e_tk2_class* i_this) {
     if (i_this->mInvincibilityTimer == 0) {
         i_this->mStts.Move();
@@ -149,7 +140,6 @@ static void damage_check(e_tk2_class* i_this) {
     }
 }
 
-/* 807BA940-807BA9E8 0004C0 00A8+00 1/1 0/0 0/0 .text            e_tk2_wait_0__FP11e_tk2_class */
 static void e_tk2_wait_0(e_tk2_class* i_this) {
     i_this->mAttentionOFF = true;
 
@@ -170,7 +160,6 @@ static void e_tk2_wait_0(e_tk2_class* i_this) {
     cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->mSomeAngle, 0x10, 0x400);
 }
 
-/* 807BA9E8-807BACF8 000568 0310+00 2/1 0/0 0/0 .text            e_tk2_find__FP11e_tk2_class */
 static void e_tk2_find(e_tk2_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK2_NONE:
@@ -246,7 +235,6 @@ static void e_tk2_find(e_tk2_class* i_this) {
     cLib_addCalcAngleS2(&(i_this)->shape_angle.y, i_this->mPlayerAngleY, 4, 0x800);
 }
 
-/* 807BACF8-807BAED0 000878 01D8+00 1/1 0/0 0/0 .text            e_tk2_attack__FP11e_tk2_class */
 static void e_tk2_attack(e_tk2_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK2_NONE:
@@ -283,7 +271,6 @@ static void e_tk2_attack(e_tk2_class* i_this) {
     cLib_addCalcAngleS2(&i_this->shape_angle.y, i_this->mPlayerAngleY, 4, 0x800);
 }
 
-/* 807BAED0-807BAF60 000A50 0090+00 1/1 0/0 0/0 .text            e_tk2_s_damage__FP11e_tk2_class */
 static void e_tk2_s_damage(e_tk2_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK2_NONE:
@@ -300,7 +287,6 @@ static void e_tk2_s_damage(e_tk2_class* i_this) {
     }
 }
 
-/* 807BAF60-807BB028 000AE0 00C8+00 1/1 0/0 0/0 .text            e_tk2_damage__FP11e_tk2_class */
 static void e_tk2_damage(e_tk2_class* i_this) {
     i_this->mInvincibilityTimer = 6;
     i_this->mAttentionOFF = true;
@@ -320,7 +306,6 @@ static void e_tk2_damage(e_tk2_class* i_this) {
     }
 }
 
-/* 807BB028-807BB128 000BA8 0100+00 1/1 0/0 0/0 .text            action__FP11e_tk2_class */
 static void action(e_tk2_class* i_this) {
     fopAc_ac_c* actor = i_this;
     i_this->mPlayerAngleY = fopAcM_searchPlayerAngleY(actor);
@@ -355,7 +340,6 @@ static void action(e_tk2_class* i_this) {
     }
 }
 
-/* 807BB128-807BB7E4 000CA8 06BC+00 2/1 0/0 0/0 .text            daE_TK2_Execute__FP11e_tk2_class */
 static int daE_TK2_Execute(e_tk2_class* i_this) {
     cXyz cStack_94;
     cXyz cStack_a0;
@@ -472,13 +456,10 @@ static int daE_TK2_Execute(e_tk2_class* i_this) {
     return 1;
 }
 
-/* 807BB7E4-807BB7EC 001364 0008+00 1/0 0/0 0/0 .text            daE_TK2_IsDelete__FP11e_tk2_class
- */
 static int daE_TK2_IsDelete(e_tk2_class* i_this) {
     return 1;
 }
 
-/* 807BB7EC-807BB854 00136C 0068+00 1/0 0/0 0/0 .text            daE_TK2_Delete__FP11e_tk2_class */
 static int daE_TK2_Delete(e_tk2_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "E_tk2");
     if (i_this->mInitHIO) {
@@ -490,7 +471,6 @@ static int daE_TK2_Delete(e_tk2_class* i_this) {
     return 1;
 }
 
-/* 807BB854-807BB94C 0013D4 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_tk2_class* i_this = static_cast<e_tk2_class*>(a_this);
 
@@ -506,7 +486,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807BBE5C-807BBE9C 000034 0040+00 1/1 0/0 0/0 .data            cc_sph_src$4256 */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}},  // mObj
@@ -519,7 +498,6 @@ static dCcD_SrcSph cc_sph_src = {
     }  // mSphAttr
 };
 
-/* 807BB94C-807BBC00 0014CC 02B4+00 1/0 0/0 0/0 .text            daE_TK2_Create__FP10fopAc_ac_c */
 static int daE_TK2_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_tk2_class);
     e_tk2_class* a_this = static_cast<e_tk2_class*>(i_this);
@@ -567,14 +545,12 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 807BBE9C-807BBEBC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TK2_Method */
 static actor_method_class l_daE_TK2_Method = {
     (process_method_func)daE_TK2_Create,  (process_method_func)daE_TK2_Delete,
     (process_method_func)daE_TK2_Execute, (process_method_func)daE_TK2_IsDelete,
     (process_method_func)daE_TK2_Draw,
 };
 
-/* 807BBEBC-807BBEEC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TK2 */
 extern actor_process_profile_definition g_profile_E_TK2 = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp
index 6a51dfe6b3..804c86c977 100644
--- a/src/d/actor/d_a_e_tk_ball.cpp
+++ b/src/d/actor/d_a_e_tk_ball.cpp
@@ -25,7 +25,6 @@ enum Type {
     /* 0xFF */ TYPE_TK_BALL_UNK = 0xFF,
 };
 
-/* 807BBFF8-807BC070 000078 0078+00 1/0 0/0 0/0 .text daE_TK_BALL_Draw__FP15e_tk_ball_class */
 static int daE_TK_BALL_Draw(e_tk_ball_class* i_this) {
     if (i_this->mSuspended) {
         return 1;
@@ -37,7 +36,6 @@ static int daE_TK_BALL_Draw(e_tk_ball_class* i_this) {
     return 1;
 }
 
-/* 807BC070-807BC1CC 0000F0 015C+00 3/3 0/0 0/0 .text simple_bg_check__FP15e_tk_ball_class */
 static int simple_bg_check(e_tk_ball_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -67,8 +65,6 @@ static int simple_bg_check(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BC1CC-807BC3F8 00024C 022C+00 3/3 0/0 0/0 .text            impact_eff_set__FP15e_tk_ball_class
- */
 static void impact_eff_set(e_tk_ball_class* i_this) {
     cXyz pos = i_this->current.pos;
     pos.y += i_this->mArcHeight;
@@ -89,8 +85,6 @@ static void impact_eff_set(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BC3F8-807BCA18 000478 0620+00 1/1 0/0 0/0 .text            e_tk_ball_move__FP15e_tk_ball_class
- */
 static void e_tk_ball_move(e_tk_ball_class* i_this) {
     fopAc_ac_c* actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -192,7 +186,6 @@ static void e_tk_ball_move(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BCA18-807BCAF4 000A98 00DC+00 1/1 0/0 0/0 .text e_tk_ball_return__FP15e_tk_ball_class */
 static void e_tk_ball_return(e_tk_ball_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK_BALL_INIT:
@@ -214,8 +207,6 @@ static void e_tk_ball_return(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BCAF4-807BCB94 000B74 00A0+00 1/1 0/0 0/0 .text            e_tk_ball_drop__FP15e_tk_ball_class
- */
 static void e_tk_ball_drop(e_tk_ball_class* i_this) {
     switch (i_this->mMode) {
     case MODE_TK_BALL_INIT:
@@ -233,7 +224,6 @@ static void e_tk_ball_drop(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BCB94-807BCF84 000C14 03F0+00 1/1 0/0 0/0 .text            action__FP15e_tk_ball_class */
 static void action(e_tk_ball_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -299,7 +289,6 @@ static void action(e_tk_ball_class* i_this) {
     }
 }
 
-/* 807BCF84-807BD0C0 001004 013C+00 2/1 0/0 0/0 .text daE_TK_BALL_Execute__FP15e_tk_ball_class */
 static int daE_TK_BALL_Execute(e_tk_ball_class* i_this) {
     if (i_this->mSuspended) {
         return 1;
@@ -331,12 +320,10 @@ static int daE_TK_BALL_Execute(e_tk_ball_class* i_this) {
     return 1;
 }
 
-/* 807BD0C0-807BD0C8 001140 0008+00 1/0 0/0 0/0 .text daE_TK_BALL_IsDelete__FP15e_tk_ball_class */
 static int daE_TK_BALL_IsDelete(e_tk_ball_class* i_this) {
     return 1;
 }
 
-/* 807BD0C8-807BD13C 001148 0074+00 1/0 0/0 0/0 .text daE_TK_BALL_Delete__FP15e_tk_ball_class */
 static int daE_TK_BALL_Delete(e_tk_ball_class* i_this) {
     if (i_this->mType == TYPE_TK_BALL_WATER) {
         dComIfG_resDelete(&i_this->mPhaseReq, "E_tk");
@@ -349,7 +336,6 @@ static int daE_TK_BALL_Delete(e_tk_ball_class* i_this) {
     return 1;
 }
 
-/* 807BD13C-807BD1EC 0011BC 00B0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_tk_ball_class* a_this = static_cast<e_tk_ball_class*>(i_this);
     J3DModelData* ball_model;
@@ -368,8 +354,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 }
 
-/* 807BD1EC-807BD4D4 00126C 02E8+00 1/0 0/0 0/0 .text            daE_TK_BALL_Create__FP10fopAc_ac_c
- */
 static int daE_TK_BALL_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph at_sph_src = {
         {
@@ -446,14 +430,12 @@ static int daE_TK_BALL_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 807BD658-807BD678 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TK_BALL_Method */
 static actor_method_class l_daE_TK_BALL_Method = {
     (process_method_func)daE_TK_BALL_Create,  (process_method_func)daE_TK_BALL_Delete,
     (process_method_func)daE_TK_BALL_Execute, (process_method_func)daE_TK_BALL_IsDelete,
     (process_method_func)daE_TK_BALL_Draw,
 };
 
-/* 807BD678-807BD6A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TK_BALL */
 extern actor_process_profile_definition g_profile_E_TK_BALL = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp
index 29ef4d811d..df6a964e5e 100644
--- a/src/d/actor/d_a_e_tt.cpp
+++ b/src/d/actor/d_a_e_tt.cpp
@@ -13,8 +13,8 @@
 
 class daE_TT_HIO_c : public JORReflexible {
 public:
-    /* 807BD7AC */ daE_TT_HIO_c();
-    /* 807C1AA8 */ virtual ~daE_TT_HIO_c() {}
+    daE_TT_HIO_c();
+    virtual ~daE_TT_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -36,8 +36,6 @@ enum daE_TT_Action {
 };
 
 namespace {
-/* 807C2100-807C2140 000038 0040+00 1/1 0/0 0/0 .data            cc_tt_src__22@unnamed@d_a_e_tt_cpp@
- */
 static dCcD_SrcSph cc_tt_src = {
     {
         {0x0, {{0x400, 0x1, 0xD}, {0xD8FBFDFF, 0x43}, 0x75}},
@@ -48,7 +46,6 @@ static dCcD_SrcSph cc_tt_src = {
     {{{0.0f, 0.0f, 0.0f}, 40.0f}},
 
 };
-/* 807C2140-807C2180 000078 0040+00 0/0 0/0 0/0 .data cc_tt_eye_src__22@unnamed@d_a_e_tt_cpp@ */
 static dCcD_SrcSph cc_tt_eye_src = {
     {
         {0x0, {{0x0, 0x1, 0x0}, {0x2000, 0x43}, 0x0}},
@@ -60,7 +57,6 @@ static dCcD_SrcSph cc_tt_eye_src = {
 };
 }  // namespace
 
-/* 807BD7AC-807BD7EC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__12daE_TT_HIO_cFv */
 daE_TT_HIO_c::daE_TT_HIO_c() {
     id = -1;
     model_size = 0.6f;
@@ -69,7 +65,6 @@ daE_TT_HIO_c::daE_TT_HIO_c() {
     attack_angle = 8192.0f;
 }
 
-/* 807BD7EC-807BD8E0 00012C 00F4+00 2/1 0/0 0/0 .text ctrlJoint__8daE_TT_cFP8J3DJointP8J3DModel */
 int daE_TT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     s32 jntNo = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jntNo));
@@ -98,7 +93,6 @@ int daE_TT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 807BD8E0-807BD92C 000220 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_TT_cFP8J3DJointi */
 int daE_TT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -111,7 +105,6 @@ int daE_TT_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 807BD92C-807BDAC0 00026C 0194+00 1/1 0/0 0/0 .text            draw__8daE_TT_cFv */
 int daE_TT_c::draw() {
     J3DModel* model = mpMorfSO->getModel();
 
@@ -137,18 +130,15 @@ int daE_TT_c::draw() {
     return 1;
 }
 
-/* 807BDAC0-807BDAE0 000400 0020+00 1/0 0/0 0/0 .text            daE_TT_Draw__FP8daE_TT_c */
 static int daE_TT_Draw(daE_TT_c* i_this) {
     return i_this->draw();
 }
 
-/* 807BDAE0-807BDB84 000420 00A4+00 7/7 0/0 0/0 .text            setBck__8daE_TT_cFiUcff */
 void daE_TT_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* animation = (J3DAnmTransform*)dComIfG_getObjectRes("E_TT", i_index);
     mpMorfSO->setAnm(animation, i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 807BDB84-807BDBE4 0004C4 0060+00 4/4 0/0 0/0 .text            calcHitGroundSpeed__8daE_TT_cFv */
 void daE_TT_c::calcHitGroundSpeed() {
     if (!mTektiteOnWater) {
         speedF = 0.0f;
@@ -162,13 +152,10 @@ void daE_TT_c::calcHitGroundSpeed() {
 
 static u8 l_HIOInit;
 
-/* 807C23EC-807C2404 000054 0018+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_TT_HIO_c l_HIO;
 
-/* 807C2404-807C2408 00006C 0004+00 4/4 0/0 0/0 .bss             m_attack_tt */
 static daE_TT_c* m_attack_tt;
 
-/* 807BDBE4-807BDC10 000524 002C+00 8/8 0/0 0/0 .text            setActionMode__8daE_TT_cFii */
 void daE_TT_c::setActionMode(int i_action, int i_mode) {
     if (m_attack_tt == this) {
         m_attack_tt = NULL;
@@ -179,7 +166,6 @@ void daE_TT_c::setActionMode(int i_action, int i_mode) {
     field_0x6fb = 0;
 }
 
-/* 807BDC10-807BDC50 000550 0040+00 1/1 0/0 0/0 .text            getCutType__8daE_TT_cFv */
 int daE_TT_c::getCutType() {
     switch (daPy_getPlayerActorClass()->getCutType()) {
     case daPy_py_c::CUT_TYPE_NM_VERTICAL:
@@ -193,7 +179,6 @@ int daE_TT_c::getCutType() {
     }
 }
 
-/* 807BDC50-807BDE5C 000590 020C+00 1/1 0/0 0/0 .text            damage_check__8daE_TT_cFv */
 void daE_TT_c::damage_check() {
     if (mDamageCooldownTimer == 0) {
         mStts.Move();
@@ -265,7 +250,6 @@ void daE_TT_c::damage_check() {
     }
 }
 
-/* 807BDE5C-807BDF60 00079C 0104+00 1/1 0/0 0/0 .text            checkWaterSurface__8daE_TT_cFv */
 void daE_TT_c::checkWaterSurface() {
     mTektiteOnWater = 0;
 
@@ -287,7 +271,6 @@ void daE_TT_c::checkWaterSurface() {
     }
 }
 
-/* 807BDF60-807BE2A8 0008A0 0348+00 1/1 0/0 0/0 .text            checkFootGround__8daE_TT_cFv */
 void daE_TT_c::checkFootGround() {
     static int foot_jnt_no[4] = {
         0x4,
@@ -360,7 +343,6 @@ void daE_TT_c::checkFootGround() {
     }
 }
 
-/* 807BE2A8-807BE438 000BE8 0190+00 1/1 0/0 0/0 .text            setBodyLandEffect__8daE_TT_cFv */
 void daE_TT_c::setBodyLandEffect() {
     static u16 w_eff_id[4] = {ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C,
                               ID_ZI_J_DOWNWTRA_D};
@@ -382,7 +364,6 @@ void daE_TT_c::setBodyLandEffect() {
     }
 }
 
-/* 807BE438-807BE708 000D78 02D0+00 4/4 0/0 0/0 .text            setWaterEffect__8daE_TT_cFv */
 void daE_TT_c::setWaterEffect() {
     static u16 w_eff_id[3] = {
         ID_ZI_J_DOWNWTRA_B,
@@ -435,7 +416,6 @@ void daE_TT_c::setWaterEffect() {
     }
 }
 
-/* 807BE708-807BE99C 001048 0294+00 1/1 0/0 0/0 .text            setDeathEyeEffect__8daE_TT_cFv */
 void daE_TT_c::setDeathEyeEffect() {
     static cXyz sc(0.6f, 0.6f, 0.6f);
 
@@ -466,7 +446,6 @@ void daE_TT_c::setDeathEyeEffect() {
     }
 }
 
-/* 807BE99C-807BEBAC 0012DC 0210+00 1/1 0/0 0/0 .text            setDeathFootEffect__8daE_TT_cFv */
 void daE_TT_c::setDeathFootEffect() {
     static cXyz sc(0.6f, 0.6f, 0.6f);
 
@@ -495,7 +474,6 @@ void daE_TT_c::setDeathFootEffect() {
     }
 }
 
-/* 807BEBAC-807BED70 0014EC 01C4+00 5/5 0/0 0/0 .text            checkPlayerSearch__8daE_TT_cFv */
 bool daE_TT_c::checkPlayerSearch() {
     if (field_0x6d4 && current.pos.absXZ(home.pos) > field_0x6d4 + 300.0f ||
         fopAcM_searchPlayerDistance(this) > l_HIO.player_detection_range + 300.0f ||
@@ -506,7 +484,6 @@ bool daE_TT_c::checkPlayerSearch() {
     return true;
 }
 
-/* 807BED70-807BF358 0016B0 05E8+00 2/1 0/0 0/0 .text            executeWait__8daE_TT_cFv */
 void daE_TT_c::executeWait() {
     switch (mMode) {
     case 0:
@@ -597,7 +574,6 @@ void daE_TT_c::executeWait() {
     }
 }
 
-/* 807BF358-807BF914 001C98 05BC+00 2/1 0/0 0/0 .text            executeChase__8daE_TT_cFv */
 void daE_TT_c::executeChase() {
     f32 playerDist = fopAcM_searchPlayerDistance(this);
 
@@ -699,7 +675,6 @@ void daE_TT_c::executeChase() {
     }
 }
 
-/* 807BF914-807BFD38 002254 0424+00 1/1 0/0 0/0 .text            executeAttack__8daE_TT_cFv */
 void daE_TT_c::executeAttack() {
     cXyz playerPos(daPy_getPlayerActorClass()->current.pos);
 
@@ -770,14 +745,12 @@ void daE_TT_c::executeAttack() {
     }
 }
 
-/* 807BFD38-807BFD60 002678 0028+00 1/1 0/0 0/0 .text            setDamageInit__8daE_TT_cFv */
 void daE_TT_c::setDamageInit() {
     mMode = 5;
     current.angle.y = mAtInfo.mHitDirection.y + 0x8000;
     speedF = 15.0f;
 }
 
-/* 807BFD60-807BFFF4 0026A0 0294+00 2/1 0/0 0/0 .text            executeDamage__8daE_TT_cFv */
 void daE_TT_c::executeDamage() {
     switch (mMode) {
     case 0:
@@ -836,7 +809,6 @@ void daE_TT_c::executeDamage() {
     }
 }
 
-/* 807BFFF4-807C033C 002934 0348+00 1/1 0/0 0/0 .text            executeDeath__8daE_TT_cFv */
 void daE_TT_c::executeDeath() {
     switch (mMode) {
     case 0:
@@ -921,7 +893,6 @@ void daE_TT_c::executeDeath() {
     }
 }
 
-/* 807C033C-807C0530 002C7C 01F4+00 1/1 0/0 0/0 .text            executeOutRange__8daE_TT_cFv */
 void daE_TT_c::executeOutRange() {
     switch (mMode) {
     case 0:
@@ -957,7 +928,6 @@ void daE_TT_c::executeOutRange() {
     }
 }
 
-/* 807C0530-807C0C28 002E70 06F8+00 2/1 0/0 0/0 .text            executeFirstAttack__8daE_TT_cFv */
 void daE_TT_c::executeFirstAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz playerPos(player->current.pos);
@@ -1063,7 +1033,6 @@ void daE_TT_c::executeFirstAttack() {
     }
 }
 
-/* 807C0C28-807C0E10 003568 01E8+00 2/1 0/0 0/0 .text            action__8daE_TT_cFv */
 void daE_TT_c::action() {
     checkWaterSurface();
     if (!field_0x6f7) {
@@ -1126,7 +1095,6 @@ void daE_TT_c::action() {
     mpMorfSO->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 807C0E10-807C0EE8 003750 00D8+00 2/2 0/0 0/0 .text            mtx_set__8daE_TT_cFi */
 void daE_TT_c::mtx_set(int param_0) {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mTransOffset, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -1139,7 +1107,6 @@ void daE_TT_c::mtx_set(int param_0) {
     }
 }
 
-/* 807C0EE8-807C1024 003828 013C+00 1/1 0/0 0/0 .text            cc_set__8daE_TT_cFv */
 void daE_TT_c::cc_set() {
     cXyz sphereC;
     J3DModel* model = mpMorfSO->getModel();
@@ -1164,7 +1131,6 @@ void daE_TT_c::cc_set() {
     }
 }
 
-/* 807C1024-807C113C 003964 0118+00 1/1 0/0 0/0 .text            execute__8daE_TT_cFv */
 int daE_TT_c::execute() {
     if (mGenericTimer != 0) {
         mGenericTimer--;
@@ -1196,17 +1162,14 @@ int daE_TT_c::execute() {
     return 1;
 }
 
-/* 807C113C-807C115C 003A7C 0020+00 1/0 0/0 0/0 .text            daE_TT_Execute__FP8daE_TT_c */
 static int daE_TT_Execute(daE_TT_c* i_this) {
     return i_this->execute();
 }
 
-/* 807C115C-807C1164 003A9C 0008+00 1/0 0/0 0/0 .text            daE_TT_IsDelete__FP8daE_TT_c */
 static int daE_TT_IsDelete(daE_TT_c* i_this) {
     return 1;
 }
 
-/* 807C1164-807C11FC 003AA4 0098+00 1/1 0/0 0/0 .text            _delete__8daE_TT_cFv */
 int daE_TT_c::_delete() {
     if (m_attack_tt == this) {
         m_attack_tt = NULL;
@@ -1227,12 +1190,10 @@ int daE_TT_c::_delete() {
     return 1;
 }
 
-/* 807C11FC-807C121C 003B3C 0020+00 1/0 0/0 0/0 .text            daE_TT_Delete__FP8daE_TT_c */
 static int daE_TT_Delete(daE_TT_c* i_this) {
     return i_this->_delete();
 }
 
-/* 807C121C-807C1394 003B5C 0178+00 1/1 0/0 0/0 .text            CreateHeap__8daE_TT_cFv */
 int daE_TT_c::CreateHeap() {
     J3DModelData* modelData;
 
@@ -1261,12 +1222,10 @@ int daE_TT_c::CreateHeap() {
     return 1;
 }
 
-/* 807C1394-807C13B4 003CD4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_TT_c*>(i_this)->CreateHeap();
 }
 
-/* 807C13B4-807C17FC 003CF4 0448+00 1/1 0/0 0/0 .text            create__8daE_TT_cFv */
 int daE_TT_c::create() {
     fopAcM_ct(this, daE_TT_c);
 
@@ -1349,19 +1308,16 @@ int daE_TT_c::create() {
     return phase;
 }
 
-/* 807C1A40-807C1A60 004380 0020+00 1/0 0/0 0/0 .text            daE_TT_Create__FP8daE_TT_c */
 static int daE_TT_Create(daE_TT_c* i_this) {
     return i_this->create();
 }
 
-/* 807C22AC-807C22CC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_TT_Method */
 static actor_method_class l_daE_TT_Method = {
     (process_method_func)daE_TT_Create,  (process_method_func)daE_TT_Delete,
     (process_method_func)daE_TT_Execute, (process_method_func)daE_TT_IsDelete,
     (process_method_func)daE_TT_Draw,
 };
 
-/* 807C22CC-807C22FC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_TT */
 extern actor_process_profile_definition g_profile_E_TT = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp
index 4abf254242..5fcaa4c3b0 100644
--- a/src/d/actor/d_a_e_vt.cpp
+++ b/src/d/actor/d_a_e_vt.cpp
@@ -24,8 +24,8 @@
 
 class daE_VA_HIO_c {
 public:
-    /* 807C25EC */ daE_VA_HIO_c();
-    /* 807CE2AC */ virtual ~daE_VA_HIO_c() {}
+    daE_VA_HIO_c();
+    virtual ~daE_VA_HIO_c() {}
 
     /* 0x04 */ s8 field_0x04;
     /* 0x08 */ f32 mModelSize;
@@ -103,7 +103,6 @@ enum daE_VA_JOINT {
 namespace
 {
 
-/* 807CEF40-807CEF80 000038 0040+00 0/1 0/0 0/0 .data cc_vt_neck_src__22@unnamed@d_a_e_vt_cpp@ */
 static dCcD_SrcSph cc_vt_neck_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x80000000, 0x3}, 0x0}},  // mObj
@@ -116,7 +115,6 @@ static dCcD_SrcSph cc_vt_neck_src = {
     }  // mSphAttr
 };
 
-/* 807CEF80-807CEFC4 000078 0044+00 0/1 0/0 0/0 .data cc_vt_body_src__22@unnamed@d_a_e_vt_cpp@ */
 static dCcD_SrcCyl cc_vt_body_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x43}, 0x75}},  // mObj
@@ -131,8 +129,6 @@ static dCcD_SrcCyl cc_vt_body_src = {
     }  // mCyl
 };
 
-/* 807CEFC4-807CF004 0000BC 0040+00 0/1 0/0 0/0 .data cc_vt_attack_src__22@unnamed@d_a_e_vt_cpp@
- */
 static dCcD_SrcSph cc_vt_attack_src = {
     {
         {0x0, {{0x100000, 0x2, 0xD}, {0xD8FBFDFF, 0x43}, 0x75}},  // mObj
@@ -145,7 +141,6 @@ static dCcD_SrcSph cc_vt_attack_src = {
     }  // mSphAttr
 };
 
-/* 807CF004-807CF044 0000FC 0040+00 0/1 0/0 0/0 .data cc_vt_line_src__22@unnamed@d_a_e_vt_cpp@ */
 static dCcD_SrcSph cc_vt_line_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x43}, 0x75}},  // mObj
@@ -158,7 +153,6 @@ static dCcD_SrcSph cc_vt_line_src = {
     }  // mSphAttr
 };
 
-/* 807CF044-807CF084 00013C 0040+00 0/1 0/0 0/0 .data cc_vt_magic_src__22@unnamed@d_a_e_vt_cpp@ */
 static dCcD_SrcSph cc_vt_magic_src = {
     {
         {0x0, {{0x400, 0x2, 0xD}, {0xD8FBFDFF, 0x0}, 0x0}},  // mObj
@@ -171,21 +165,18 @@ static dCcD_SrcSph cc_vt_magic_src = {
     }  // mSphAttr
 };
 
-/* 807CF084-807CF0AC 00017C 0027+01 1/1 0/0 0/0 .data va_tag_set_size__22@unnamed@d_a_e_vt_cpp@ */
 static u8 va_tag_set_size[39] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
     0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
     0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02,
 };
 
-/* 807CF0AC-807CF0D4 0001A4 0027+01 3/4 0/0 0/0 .data va_tag_set_num__22@unnamed@d_a_e_vt_cpp@ */
 static u8 va_tag_set_num[39] = {
     0x01, 0x0C, 0x16, 0x1F, 0x21, 0x2A, 0x2B, 0x02, 0x04, 0x0D, 0x0F, 0x15, 0x18,
     0x20, 0x2C, 0x03, 0x05, 0x06, 0x0B, 0x10, 0x17, 0x19, 0x1A, 0x22, 0x24, 0x29,
     0x2D, 0x34, 0x49, 0x52, 0x36, 0x3E, 0x54, 0x5C, 0x39, 0x41, 0x4C, 0x56, 0x5E,
 };
 
-/* 807CF0D4-807CF170 0001CC 009C+00 1/1 0/0 0/0 .data va_tag_offset__22@unnamed@d_a_e_vt_cpp@ */
 static f32 va_tag_offset[39] = {
     20.0f, 20.0f, 20.0f, 20.0f, 20.0f, 0.0f,  40.0f, 0.0f, 30.0f, 10.0f, 0.0f,  0.0f,  20.0f,
     0.0f,  10.0f, 20.0f, 40.0f, 0.0f,  20.0f, 0.0f,  0.0f, 20.0f, 0.0f,  10.0f, 0.0f,  0.0f,
@@ -194,7 +185,6 @@ static f32 va_tag_offset[39] = {
 
 }  // namespace
 
-/* 807C25EC-807C267C 0000EC 0090+00 1/1 0/0 0/0 .text            __ct__12daE_VA_HIO_cFv */
 daE_VA_HIO_c::daE_VA_HIO_c() {
     field_0x04 = -1;
     mModelSize = 1.2f;
@@ -214,17 +204,14 @@ daE_VA_HIO_c::daE_VA_HIO_c() {
     mKRegLightA = 210.0f;
 }
 
-/* 807CF4B4-807CF4B8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 807CF4B5 0003+00 data_807CF4B5 None */
 #pragma push
 #pragma force_active on
 static u8 init_hio;
 #pragma pop
 
-/* 807CF4C4-807CF504 000054 0040+00 17/18 0/0 0/0 .bss             l_HIO */
 static daE_VA_HIO_c l_HIO;
 
-/* 807C267C-807C284C 00017C 01D0+00 1/1 0/0 0/0 .text ctrlJoint__8daE_VA_cFP8J3DJointP8J3DModel */
 int daE_VA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int joint_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(joint_no));
@@ -268,7 +255,6 @@ int daE_VA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 807C284C-807C2898 00034C 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_VA_cFP8J3DJointi */
 int daE_VA_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -282,7 +268,6 @@ int daE_VA_c::JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 807C2898-807C2A4C 000398 01B4+00 1/1 0/0 0/0 .text            calcJointNeck__8daE_VA_cFv */
 void daE_VA_c::calcJointNeck() {
     csXyz sp18;
 
@@ -322,7 +307,6 @@ void daE_VA_c::calcJointNeck() {
     }
 }
 
-/* 807C2A4C-807C3264 00054C 0818+00 1/1 0/0 0/0 .text            calcJointSleeve__8daE_VA_cFv */
 void daE_VA_c::calcJointSleeve() {
     csXyz sp128;
     cXyz sp90(field_0x13b8);
@@ -458,7 +442,6 @@ void daE_VA_c::calcJointSleeve() {
     }
 }
 
-/* 807C3264-807C37F8 000D64 0594+00 1/1 0/0 0/0 .text            draw__8daE_VA_cFv */
 int daE_VA_c::draw() {
     J3DModel* model = mpMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -569,24 +552,20 @@ int daE_VA_c::draw() {
     return 1;
 }
 
-/* 807C37F8-807C3818 0012F8 0020+00 1/0 0/0 0/0 .text            daE_VA_Draw__FP8daE_VA_c */
 static int daE_VA_Draw(daE_VA_c* i_this) {
     return i_this->draw();
 }
 
-/* 807C3818-807C38BC 001318 00A4+00 19/19 0/0 0/0 .text            setBck__8daE_VA_cFiUcff */
 void daE_VA_c::setBck(int i_anmID, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_VA", i_anmID), i_attr, i_morf, i_rate,
                    0.0f, -1.0f);
 }
 
-/* 807C38BC-807C3918 0013BC 005C+00 8/8 0/0 0/0 .text            checkBck__8daE_VA_cFi */
 bool daE_VA_c::checkBck(int i_anmID) {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", i_anmID);
     return mpMorf->getAnm() == pbck ? TRUE : FALSE;
 }
 
-/* 807C3918-807C39C4 001418 00AC+00 21/21 0/0 0/0 .text            setActionMode__8daE_VA_cFii */
 void daE_VA_c::setActionMode(int i_action, int i_mode) {
     if (dComIfGs_isOneZoneSwitch(6, fopAcM_GetRoomNo(this)) && i_action != ACTION_OPACI_DOWN_e &&
         i_action != ACTION_OPACI_DOWN_DAMAGE_e)
@@ -604,7 +583,6 @@ void daE_VA_c::setActionMode(int i_action, int i_mode) {
     mGlowBody = 0;
 }
 
-/* 807C39C4-807C3A1C 0014C4 0058+00 1/1 0/0 0/0 .text            getWolfCutType__8daE_VA_cFv */
 int daE_VA_c::getWolfCutType() {
     switch (daPy_getPlayerActorClass()->getCutType()) {
     case daPy_py_c::CUT_TYPE_WOLF_B_LEFT:
@@ -627,7 +605,6 @@ int daE_VA_c::getWolfCutType() {
     return 0;
 }
 
-/* 807C3A1C-807C3A50 00151C 0034+00 3/3 0/0 0/0 .text            onSwordAtBit__8daE_VA_cFv */
 void daE_VA_c::onSwordAtBit() {
     mAttackSphs[0].OnAtSetBit();
     mAttackSphs[1].OnAtSetBit();
@@ -635,7 +612,6 @@ void daE_VA_c::onSwordAtBit() {
     mAttackSphs[3].OnAtSetBit();
 }
 
-/* 807C3A50-807C3AB0 001550 0060+00 3/3 0/0 0/0 .text            offSwordShield__8daE_VA_cFv */
 void daE_VA_c::offSwordShield() {
     if (daPy_getPlayerActorClass()->getCutType() == daPy_py_c::CUT_TYPE_WOLF_JUMP) {
         mOffTgTimer = 3;
@@ -648,7 +624,6 @@ void daE_VA_c::offSwordShield() {
     }
 }
 
-/* 807C3AB0-807C3B58 0015B0 00A8+00 1/1 0/0 0/0 .text            setTransDamage__8daE_VA_cFP4cXyz */
 void daE_VA_c::setTransDamage(cXyz* param_0) {
     u16 hitmark;
     if (field_0x138f >= 4)
@@ -661,7 +636,6 @@ void daE_VA_c::setTransDamage(cXyz* param_0) {
     setActionMode(ACTION_TRANS_DAMAGE_e, 0);
 }
 
-/* 807C3B58-807C440C 001658 08B4+00 1/1 0/0 0/0 .text            damage_check__8daE_VA_cFv */
 void daE_VA_c::damage_check() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int cut_type = getWolfCutType();
@@ -886,7 +860,6 @@ void daE_VA_c::damage_check() {
     }
 }
 
-/* 807C4844-807C49B4 002344 0170+00 1/1 0/0 0/0 .text            setFireEffect__8daE_VA_cFi */
 void daE_VA_c::setFireEffect(int param_0) {
     cXyz scale(1.0f, 1.0f, 1.0f);
     int idx = param_0 * 3;
@@ -903,7 +876,6 @@ f32 dummy() {
     return 3.2f;
 }
 
-/* 807C49B4-807C4B54 0024B4 01A0+00 1/1 0/0 0/0 .text            setFootEffect__8daE_VA_cFv */
 void daE_VA_c::setFootEffect() {
     if (!field_0x1388) {
         int var_r6 = 0;
@@ -934,21 +906,18 @@ void daE_VA_c::setFootEffect() {
     }
 }
 
-/* 807CF17C-807CF184 000274 0006+02 1/1 0/0 0/0 .data            va_wepon_eff_id1 */
 static u16 va_wepon_eff_id1[] = {
     0x85D8,
     0x85D9,
     0x85DA,
 };
 
-/* 807CF184-807CF18C 00027C 0006+02 1/1 0/0 0/0 .data            va_wepon_eff_id2 */
 static u16 va_wepon_eff_id2[] = {
     0x85C6,
     0x85C7,
     0x85C8,
 };
 
-/* 807C4B54-807C4DFC 002654 02A8+00 1/1 0/0 0/0 .text            setWeponEffect__8daE_VA_cFv */
 void daE_VA_c::setWeponEffect() {
     cXyz pos;
     cXyz scale(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize);
@@ -986,17 +955,14 @@ void daE_VA_c::setWeponEffect() {
     }
 }
 
-/* 807CF18C-807CF1A4 000284 0018+00 1/1 0/0 0/0 .data            va_bugs_eff_jnt */
 static u16 va_bugs_eff_jnt[] = {
     0x01, 0x02, 0x22, 0x04, 0x05, 0x07, 0x10, 0x11, 0x13, 0x2C, 0x2F, 0x32,
 };
 
-/* 807CF1A4-807CF1BC 00029C 0018+00 1/1 0/0 0/0 .data            va_bugs_eff_id */
 static u16 va_bugs_eff_id[] = {
     0x85E1, 0x85E2, 0x85E3, 0x85DB, 0x85DC, 0x85DD, 0x85DE, 0x85DF, 0x85E0, 0x85E4, 0x85E5, 0x85E6,
 };
 
-/* 807C4DFC-807C4F10 0028FC 0114+00 1/1 0/0 0/0 .text            setBugsEffect__8daE_VA_cFv */
 void daE_VA_c::setBugsEffect() {
     J3DModel* model = mpMorf->getModel();
     JGeometry::TVec3<f32> scale(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize);
@@ -1011,14 +977,12 @@ void daE_VA_c::setBugsEffect() {
     }
 }
 
-/* 807CF1BC-807CF1C4 0002B4 0006+02 1/1 0/0 0/0 .data            va_weapon_land_eff_id */
 static u16 va_weapon_land_eff_id[] = {
     0x85C9,
     0x85CA,
     0x85CB,
 };
 
-/* 807C4F10-807C4FCC 002A10 00BC+00 4/4 0/0 0/0 .text            setWeponLandEffect__8daE_VA_cFv */
 void daE_VA_c::setWeponLandEffect() {
     cXyz scale(l_HIO.mModelSize, l_HIO.mModelSize, l_HIO.mModelSize);
 
@@ -1028,7 +992,6 @@ void daE_VA_c::setWeponLandEffect() {
     }
 }
 
-/* 807C4FCC-807C50A4 002ACC 00D8+00 1/1 0/0 0/0 .text            setWeponGlow__8daE_VA_cFv */
 void daE_VA_c::setWeponGlow() {
     mWeponEffEmtrIDs[0] = dComIfGp_particle_set(mWeponEffEmtrIDs[0], 0x8600, &current.pos, &tevStr);
 
@@ -1038,21 +1001,18 @@ void daE_VA_c::setWeponGlow() {
     }
 }
 
-/* 807C50A4-807C5188 002BA4 00E4+00 1/1 0/0 0/0 .text            setWeponFlashScreen__8daE_VA_cFv */
 void daE_VA_c::setWeponFlashScreen() {
     cXyz pos(0.0f, 0.0f, 0.0f);
     dComIfGp_particle_set(0x85FE, &pos, &tevStr, NULL, NULL);
     dComIfGp_particle_set(0x85FF, &pos, &tevStr, NULL, NULL);
 }
 
-/* 807CF1C4-807CF1CC 0002BC 0006+02 1/1 0/0 0/0 .data            va_magic_eff_id */
 static u16 va_magic_eff_id[] = {
     0x8848,
     0x8849,
     0x884A,
 };
 
-/* 807C5188-807C5258 002C88 00D0+00 1/1 0/0 0/0 .text            setMagicEffect__8daE_VA_cFi */
 void daE_VA_c::setMagicEffect(int param_0) {
     int idx = param_0 * 3;
 
@@ -1062,20 +1022,17 @@ void daE_VA_c::setMagicEffect(int param_0) {
     }
 }
 
-/* 807C5258-807C5338 002D58 00E0+00 1/1 0/0 0/0 .text            setMagicHitEffect__8daE_VA_cFi */
 void daE_VA_c::setMagicHitEffect(int param_0) {
     dComIfGp_particle_set(0x8846, &mMagicPos[param_0], NULL, NULL);
     dComIfGp_particle_set(0x8847, &mMagicPos[param_0], NULL, NULL);
 }
 
-/* 807C5338-807C53A8 002E38 0070+00 1/1 0/0 0/0 .text            demo_skip__8daE_VA_cFi */
 void daE_VA_c::demo_skip(int param_0) {
     Z2GetAudioMgr()->bgmStreamStop(30);
     cDmr_SkipInfo = 1;
     dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 807C53A8-807C53DC 002EA8 0034+00 1/1 0/0 0/0 .text            DemoSkipCallBack__8daE_VA_cFPvi */
 int daE_VA_c::DemoSkipCallBack(void* i_this, int param_1) {
     if (i_this != NULL) {
         ((daE_VA_c*)i_this)->demo_skip(param_1);
@@ -1085,7 +1042,6 @@ int daE_VA_c::DemoSkipCallBack(void* i_this, int param_1) {
     return 0;
 }
 
-/* 807C53DC-807C53FC 002EDC 0020+00 2/2 0/0 0/0 .text            getRopeLength__8daE_VA_cFi */
 f32 daE_VA_c::getRopeLength(int param_0) {
     if (param_0 < 5) {
         return nREG_F(18) + 115.0f;
@@ -1094,12 +1050,10 @@ f32 daE_VA_c::getRopeLength(int param_0) {
     }
 }
 
-/* 807CF1CC-807CF1F8 0002C4 002C+00 1/1 0/0 0/0 .data            line_pull_power */
 static f32 line_pull_power[] = {
     0.0f, 0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f, 0.9f, 1.0f,
 };
 
-/* 807CF57C-807CF5F4 00010C 0078+00 1/2 0/0 0/0 .bss             line_end_pos */
 static cXyz line_end_pos[] = {
     cXyz(0.0f, 5.0f, 990.0f),     cXyz(971.0f, 5.0f, 326.0f),  cXyz(582.0f, 5.0f, -801.0f),
     cXyz(-582.0f, 5.0f, -801.0f), cXyz(-942.0f, 5.0f, 306.0f), cXyz(202.0f, 5.0f, 501.0f),
@@ -1107,7 +1061,6 @@ static cXyz line_end_pos[] = {
     cXyz(-414.0f, 5.0f, 347.0f),
 };
 
-/* 807CF66C-807CF6E4 0001FC 0078+00 1/2 0/0 0/0 .bss             line_start_pos */
 static cXyz line_start_pos[] = {
     cXyz(-5.0f, -10.0f, -15.0f), cXyz(0.0f, 0.0f, -10.0f), cXyz(0.0f, -10.0f, -10.0f),
     cXyz(0.0f, 0.0f, -5.0f),     cXyz(0.0f, -5.0f, -5.0f), cXyz(0.0f, 25.0f, -15.0f),
@@ -1115,7 +1068,6 @@ static cXyz line_start_pos[] = {
     cXyz(-8.0f, 23.0f, 8.0f),
 };
 
-/* 807C53FC-807C5CF0 002EFC 08F4+00 2/2 0/0 0/0 .text            calcOpRopePos__8daE_VA_cFv */
 void daE_VA_c::calcOpRopePos() {
     cXyz sp60;
     cXyz sp6C;
@@ -1289,7 +1241,6 @@ void daE_VA_c::calcOpRopePos() {
     }
 }
 
-/* 807C5CF0-807C5DF4 0037F0 0104+00 1/1 0/0 0/0 .text            onRopeCutStatus__8daE_VA_cFiii */
 void daE_VA_c::onRopeCutStatus(int param_0, int param_1, int param_2) {
     int var_r31 = param_0 * 10;
 
@@ -1318,14 +1269,12 @@ void daE_VA_c::onRopeCutStatus(int param_0, int param_1, int param_2) {
     }
 }
 
-/* 807C5DF4-807C5EAC 0038F4 00B8+00 1/1 0/0 0/0 .text            setVibRope__8daE_VA_cFff */
 void daE_VA_c::setVibRope(f32 param_0, f32 param_1) {
     field_0x1336 += (s16)(param_1 * 7168.0f);
     field_0x122c.y += (s16)(param_0 * cM_ssin(field_0x1336));
     field_0x123e += (s16)(param_0 * 50.0f * cM_ssin(field_0x1336));
 }
 
-/* 807CF1F8-807CF200 0002F0 0008+00 1/2 0/0 0/0 .data            TAG_VIB_ANGLE */
 static s16 TAG_VIB_ANGLE[] = {
     -0x800,
     0x800,
@@ -1333,12 +1282,10 @@ static s16 TAG_VIB_ANGLE[] = {
     0x1000,
 };
 
-/* 807CF200-807CF210 0002F8 0010+00 0/1 0/0 0/0 .data            TAG_VIB_WIDTH */
 static s16 TAG_VIB_WIDTH[] = {
     0x1C0, 0x280, 0x180, 0x240, 0x380, 0x500, 0x300, 0x480,
 };
 
-/* 807C5EAC-807C6164 0039AC 02B8+00 2/2 0/0 0/0 .text            setVibTag__8daE_VA_cFii */
 void daE_VA_c::setVibTag(int param_0, int param_1) {
     for (int i = 0; i < 40; i++) {
         if (param_1 == -1 || param_1 == va_tag_set_num[i] / 10) {
@@ -1373,7 +1320,6 @@ void daE_VA_c::setVibTag(int param_0, int param_1) {
     }
 }
 
-/* 807C6164-807C638C 003C64 0228+00 2/2 0/0 0/0 .text            calcTagAngle__8daE_VA_cFv */
 void daE_VA_c::calcTagAngle() {
     for (int i = 0; i < 40; i++) {
         if (mCardFlags[i] & 8) {
@@ -1421,7 +1367,6 @@ void daE_VA_c::calcTagAngle() {
     }
 }
 
-/* 807C638C-807C6564 003E8C 01D8+00 1/1 0/0 0/0 .text            calcRopeFirePos__8daE_VA_cFv */
 void daE_VA_c::calcRopeFirePos() {
     int temp_r28;
     int var_r24;
@@ -1451,7 +1396,6 @@ void daE_VA_c::calcRopeFirePos() {
     }
 }
 
-/* 807C6564-807C67A4 004064 0240+00 1/1 0/0 0/0 .text            executeDemoOpWait__8daE_VA_cFv */
 void daE_VA_c::executeDemoOpWait() {
     cXyz sp34;
 
@@ -1495,7 +1439,6 @@ void daE_VA_c::executeDemoOpWait() {
     calcTagAngle();
 }
 
-/* 807C67A4-807C7534 0042A4 0D90+00 2/1 0/0 0/0 .text            executeDemoOp__8daE_VA_cFv */
 void daE_VA_c::executeDemoOp() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp2C;
@@ -1789,7 +1732,6 @@ void daE_VA_c::executeDemoOp() {
     dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
 }
 
-/* 807C7534-807C7640 005034 010C+00 1/1 0/0 0/0 .text            executeClearWait__8daE_VA_cFv */
 void daE_VA_c::executeClearWait() {
     switch (mMode) {
     case 1:
@@ -1815,7 +1757,6 @@ void daE_VA_c::executeClearWait() {
     }
 }
 
-/* 807C7640-807C783C 005140 01FC+00 1/1 0/0 0/0 .text            executeClearChase__8daE_VA_cFv */
 void daE_VA_c::executeClearChase() {
     cLib_addCalc(&current.pos.y, 0.0f, 0.1f, 10.0f, 1.0f);
 
@@ -1857,7 +1798,6 @@ void daE_VA_c::executeClearChase() {
     }
 }
 
-/* 807C783C-807C7A8C 00533C 0250+00 1/1 0/0 0/0 .text            executeClearAttack__8daE_VA_cFv */
 void daE_VA_c::executeClearAttack() {
     f32 anm_frame = mpMorf->getFrame();
     cLib_addCalc(&current.pos.y, 0.0f, 0.1f, 10.0f, 1.0f);
@@ -1897,7 +1837,6 @@ void daE_VA_c::executeClearAttack() {
     }
 }
 
-/* 807C7A8C-807C7C74 00558C 01E8+00 1/1 0/0 0/0 .text            executeTransWait__8daE_VA_cFv */
 void daE_VA_c::executeTransWait() {
     switch (mMode) {
     case 0:
@@ -1937,7 +1876,6 @@ void daE_VA_c::executeTransWait() {
     }
 }
 
-/* 807C7C74-807C7ED4 005774 0260+00 1/1 0/0 0/0 .text            executeTransChase__8daE_VA_cFv */
 void daE_VA_c::executeTransChase() {
     f32 dist_to_player = fopAcM_searchPlayerDistanceXZ(this);
     s16 angleY_to_player = fopAcM_searchPlayerAngleY(this);
@@ -1990,7 +1928,6 @@ void daE_VA_c::executeTransChase() {
     }
 }
 
-/* 807C7ED4-807C839C 0059D4 04C8+00 1/1 0/0 0/0 .text            executeTransAttack__8daE_VA_cFv */
 void daE_VA_c::executeTransAttack() {
     f32 anm_frame = mpMorf->getFrame();
 
@@ -2074,8 +2011,6 @@ void daE_VA_c::executeTransAttack() {
     }
 }
 
-/* 807C839C-807C8860 005E9C 04C4+00 1/1 0/0 0/0 .text            executeTransBiteDamage__8daE_VA_cFv
- */
 void daE_VA_c::executeTransBiteDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp38;
@@ -2167,7 +2102,6 @@ void daE_VA_c::executeTransBiteDamage() {
     }
 }
 
-/* 807C8860-807C8A84 006360 0224+00 1/1 0/0 0/0 .text            executeTransDamage__8daE_VA_cFv */
 void daE_VA_c::executeTransDamage() {
     if (checkWolfBiteDamage()) {
         offWolfBiteDamage();
@@ -2215,7 +2149,6 @@ void daE_VA_c::executeTransDamage() {
     }
 }
 
-/* 807C8A84-807C8B78 006584 00F4+00 1/1 0/0 0/0 .text            executeTransThrough__8daE_VA_cFv */
 void daE_VA_c::executeTransThrough() {
     switch (mMode) {
     case 0:
@@ -2236,7 +2169,6 @@ void daE_VA_c::executeTransThrough() {
     }
 }
 
-/* 807C8B78-807C915C 006678 05E4+00 2/1 0/0 0/0 .text            executeOpaciWait__8daE_VA_cFv */
 void daE_VA_c::executeOpaciWait() {
     dCamera_c* camera = dCam_getBody();
     cXyz sp24;
@@ -2359,7 +2291,6 @@ void daE_VA_c::executeOpaciWait() {
     }
 }
 
-/* 807C915C-807C9A40 006C5C 08E4+00 2/1 0/0 0/0 .text            executeOpaciFly__8daE_VA_cFv */
 void daE_VA_c::executeOpaciFly() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 var_r31 = cM_atan2s(current.pos.x, current.pos.z);
@@ -2516,7 +2447,6 @@ void daE_VA_c::executeOpaciFly() {
     }
 }
 
-/* 807C9A40-807C9C8C 007540 024C+00 1/1 0/0 0/0 .text            executeOpaciDamage__8daE_VA_cFv */
 void daE_VA_c::executeOpaciDamage() {
     switch (mMode) {
     case 0:
@@ -2559,7 +2489,6 @@ void daE_VA_c::executeOpaciDamage() {
     }
 }
 
-/* 807C9C8C-807CA364 00778C 06D8+00 1/1 0/0 0/0 .text            executeOpaciChase__8daE_VA_cFv */
 void daE_VA_c::executeOpaciChase() {
     cXyz sp44;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2697,7 +2626,6 @@ void daE_VA_c::executeOpaciChase() {
     }
 }
 
-/* 807CA364-807CA73C 007E64 03D8+00 1/1 0/0 0/0 .text            executeOpaciAttack__8daE_VA_cFv */
 void daE_VA_c::executeOpaciAttack() {
     f32 anm_frame = mpMorf->getFrame();
 
@@ -2765,7 +2693,6 @@ void daE_VA_c::executeOpaciAttack() {
     }
 }
 
-/* 807CA73C-807CAA80 00823C 0344+00 1/1 0/0 0/0 .text            executeOpaciDown__8daE_VA_cFv */
 void daE_VA_c::executeOpaciDown() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     mBodyCyls[1].OnTgSetBit();
@@ -2839,8 +2766,6 @@ void daE_VA_c::executeOpaciDown() {
     }
 }
 
-/* 807CAA80-807CACE0 008580 0260+00 1/1 0/0 0/0 .text            executeOpaciDownDamage__8daE_VA_cFv
- */
 void daE_VA_c::executeOpaciDownDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2892,7 +2817,6 @@ void daE_VA_c::executeOpaciDownDamage() {
     }
 }
 
-/* 807CACE0-807CADB8 0087E0 00D8+00 1/1 0/0 0/0 .text            executeOpaciFlip__8daE_VA_cFv */
 void daE_VA_c::executeOpaciFlip() {
     switch (mMode) {
     case 0:
@@ -2907,8 +2831,6 @@ void daE_VA_c::executeOpaciFlip() {
     }
 }
 
-/* 807CADB8-807CB1C4 0088B8 040C+00 2/1 0/0 0/0 .text            executeOpaciFadeAway__8daE_VA_cFv
- */
 void daE_VA_c::executeOpaciFadeAway() {
     attention_info.flags = 0;
     mBodyCylIFrameTimer = 3;
@@ -2990,7 +2912,6 @@ void daE_VA_c::executeOpaciFadeAway() {
     }
 }
 
-/* 807CB1C4-807CB8CC 008CC4 0708+00 2/1 0/0 0/0 .text            executeOpaciDeath__8daE_VA_cFv */
 void daE_VA_c::executeOpaciDeath() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3136,7 +3057,6 @@ void daE_VA_c::executeOpaciDeath() {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
 }
 
-/* 807CB8CC-807CBC00 0093CC 0334+00 1/1 0/0 0/0 .text            calcMagicMove__8daE_VA_cFv */
 void daE_VA_c::calcMagicMove() {
     for (int i = 0; i < 2; i++) {
         switch (field_0x1228[i]) {
@@ -3191,7 +3111,6 @@ void daE_VA_c::calcMagicMove() {
     }
 }
 
-/* 807CBC00-807CC004 009700 0404+00 1/1 0/0 0/0 .text            setAlphaType__8daE_VA_cFv */
 void daE_VA_c::setAlphaType() {
     switch (mAlphaType) {
     case 0:
@@ -3269,7 +3188,6 @@ void daE_VA_c::setAlphaType() {
     }
 }
 
-/* 807CC004-807CC4D0 009B04 04CC+00 2/1 0/0 0/0 .text            action__8daE_VA_cFv */
 void daE_VA_c::action() {
     field_0x1391 = 0;
     setAlphaType();
@@ -3441,7 +3359,6 @@ void daE_VA_c::action() {
     mpEndEfBrk->play();
 }
 
-/* 807CC4D0-807CC864 009FD0 0394+00 1/1 0/0 0/0 .text            mtx_set__8daE_VA_cFv */
 void daE_VA_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -3521,7 +3438,6 @@ void daE_VA_c::mtx_set() {
     }
 }
 
-/* 807CC864-807CCD24 00A364 04C0+00 1/1 0/0 0/0 .text            cc_set__8daE_VA_cFv */
 void daE_VA_c::cc_set() {
     cXyz sp24;
 
@@ -3621,7 +3537,6 @@ void daE_VA_c::cc_set() {
     }
 }
 
-/* 807CCD24-807CCF3C 00A824 0218+00 1/1 0/0 0/0 .text            execute__8daE_VA_cFv */
 int daE_VA_c::execute() {
     if (mDemoModeTimer != 0) {
         mDemoModeTimer--;
@@ -3694,17 +3609,14 @@ int daE_VA_c::execute() {
     return 1;
 }
 
-/* 807CCF3C-807CCF5C 00AA3C 0020+00 2/1 0/0 0/0 .text            daE_VA_Execute__FP8daE_VA_c */
 static int daE_VA_Execute(daE_VA_c* i_this) {
     return i_this->execute();
 }
 
-/* 807CCF5C-807CCF64 00AA5C 0008+00 1/0 0/0 0/0 .text            daE_VA_IsDelete__FP8daE_VA_c */
 static int daE_VA_IsDelete(daE_VA_c* i_this) {
     return 1;
 }
 
-/* 807CCF64-807CD028 00AA64 00C4+00 1/1 0/0 0/0 .text            _delete__8daE_VA_cFv */
 int daE_VA_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_VA");
 
@@ -3726,12 +3638,10 @@ int daE_VA_c::_delete() {
     return 1;
 }
 
-/* 807CD028-807CD048 00AB28 0020+00 1/0 0/0 0/0 .text            daE_VA_Delete__FP8daE_VA_c */
 static int daE_VA_Delete(daE_VA_c* i_this) {
     return i_this->_delete();
 }
 
-/* 807CD048-807CD600 00AB48 05B8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_VA_cFv */
 int daE_VA_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33);
     JUT_ASSERT(0, modelData != NULL);
@@ -3851,12 +3761,10 @@ int daE_VA_c::CreateHeap() {
     return 1;
 }
 
-/* 807CD648-807CD668 00B148 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daE_VA_c*)i_this)->CreateHeap();
 }
 
-/* 807CD668-807CDAD8 00B168 0470+00 1/1 0/0 0/0 .text            create__8daE_VA_cFv */
 int daE_VA_c::create() {
     fopAcM_ct(this, daE_VA_c);
 
@@ -3973,17 +3881,14 @@ int daE_VA_c::create() {
 }
 
 
-/* 807CDAD8-807CDE90 00B5D8 03B8+00 1/1 0/0 0/0 .text            __ct__8daE_VA_cFv */
 daE_VA_c::daE_VA_c() {
     /* empty function */
 }
 
-/* 807CE244-807CE264 00BD44 0020+00 1/0 0/0 0/0 .text            daE_VA_Create__FP8daE_VA_c */
 static int daE_VA_Create(daE_VA_c* i_this) {
     return i_this->create();
 }
 
-/* 807CF384-807CF3A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_VA_Method */
 static actor_method_class l_daE_VA_Method = {
     (process_method_func)daE_VA_Create,
     (process_method_func)daE_VA_Delete,
@@ -3992,7 +3897,6 @@ static actor_method_class l_daE_VA_Method = {
     (process_method_func)daE_VA_Draw,
 };
 
-/* 807CF3A4-807CF3D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_VT */
 extern actor_process_profile_definition g_profile_E_VT = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp
index 72440680e7..9b466bc1d2 100644
--- a/src/d/actor/d_a_e_warpappear.cpp
+++ b/src/d/actor/d_a_e_warpappear.cpp
@@ -11,7 +11,6 @@
 #include "d/actor/d_a_obj_ihasi.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 807CF7D8-807CF8BC 000078 00E4+00 1/0 0/0 0/0 .text daE_Warpappear_Draw__FP18e_warpappear_class */
 static int daE_Warpappear_Draw(e_warpappear_class* i_this) {
     int i_no = (fopAcM_GetParam(i_this) >> 8) & 0xFF;
     if (i_no != 0xff) {
@@ -28,10 +27,8 @@ static int daE_Warpappear_Draw(e_warpappear_class* i_this) {
     return 1;
 }
 
-/* 807D2378-807D2384 000000 000C+00 3/3 0/0 0/0 .bss             master_ns */
 static e_s1_class* master_ns[3];
 
-/* 807CF8BC-807CF9D0 00015C 0114+00 1/1 0/0 0/0 .text            s_s1_sub__FPvPv */
 static void* s_s1_sub(void* i_actor, void* i_data) {
     e_s1_class* shadowBeast = (e_s1_class*)i_actor;
 
@@ -67,7 +64,6 @@ static void* s_s1_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CF9D0-807CFA74 000270 00A4+00 1/1 0/0 0/0 .text            s_s1drop_sub__FPvPv */
 static void* s_s1drop_sub(void* i_actor, void* i_data) {
     e_s1_class* shadowBeast = (e_s1_class*)i_actor;
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
@@ -84,7 +80,6 @@ static void* s_s1drop_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CFA74-807CFB78 000314 0104+00 1/1 0/0 0/0 .text            s_s1riv_sub__FPvPv */
 static void* s_s1riv_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) {
         e_s1_class* shadowBeast = (e_s1_class*)i_actor;
@@ -106,7 +101,6 @@ static void* s_s1riv_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CFB78-807CFBC4 000418 004C+00 1/1 0/0 0/0 .text            s_s1fight_sub__FPvPv */
 static void* s_s1fight_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) {
         e_s1_class* shadowBeast = (e_s1_class*)i_actor;
@@ -116,10 +110,8 @@ static void* s_s1fight_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807D2384-807D2388 00000C 0004+00 2/2 0/0 0/0 .bss             entry_no */
 static int entry_no;
 
-/* 807CFBC4-807CFC8C 000464 00C8+00 1/1 0/0 0/0 .text            s_s1entry_sub__FPvPv */
 static void* s_s1entry_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) {
         e_s1_class* shadowBeast = (e_s1_class*)i_actor;
@@ -141,7 +133,6 @@ static void* s_s1entry_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CFC8C-807CFD34 00052C 00A8+00 1/1 0/0 0/0 .text            s_s1drop2_sub__FPvPv */
 static void* s_s1drop2_sub(void* i_actor, void* i_data) {
     e_s1_class* shadowBeast = (e_s1_class*)i_actor;
     e_warpappear_class* data = (e_warpappear_class*)i_data;
@@ -162,10 +153,8 @@ static void* s_s1drop2_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807D2388-807D238A 000010 0002+00 2/2 0/0 0/0 .bss             ew_s1angy */
 static s16 ew_s1angy;
 
-/* 807CFD34-807CFDAC 0005D4 0078+00 1/1 0/0 0/0 .text            s_s1Yangset_sub__FPvPv */
 static void* s_s1Yangset_sub(void* i_actor, void* i_data) {
     e_s1_class* shadowBeast = (e_s1_class*)i_actor;
     e_warpappear_class* data = (e_warpappear_class*)i_data;
@@ -181,7 +170,6 @@ static void* s_s1Yangset_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CFDAC-807CFFD4 00064C 0228+00 1/1 0/0 0/0 .text            s_s1start_sub__FPvPv */
 static void* s_s1start_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_S1) {
         e_s1_class* shadowBeast = (e_s1_class*)i_actor;
@@ -202,7 +190,6 @@ static void* s_s1start_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807CFFD4-807D032C 000874 0358+00 1/1 0/0 0/0 .text            action__FP18e_warpappear_class */
 static void action(e_warpappear_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -279,8 +266,6 @@ static void action(e_warpappear_class* i_this) {
     }
 }
 
-/* 807D032C-807D1A54 000BCC 1728+00 2/1 0/0 0/0 .text            demo_camera__FP18e_warpappear_class
- */
 static void demo_camera(e_warpappear_class* i_this) {
     static u16 w_id[20] = {
         0x850D, 0x850E, 0x850F, 0x8510, 0x8511, 0x8512, 0x8513, 0x8514, 0x8515, 0x8516,
@@ -792,15 +777,12 @@ static void demo_camera(e_warpappear_class* i_this) {
     }
 }
 
-/* 807D1B48-807D1BAC 0023E8 0064+00 2/2 0/0 0/0 .text            mtx_set__FP18e_warpappear_class */
 static void mtx_set(e_warpappear_class* i_this) {
     mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
     mDoMtx_stack_c::scaleM(i_this->scale.x, i_this->scale.x, i_this->scale.x);
     i_this->mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 807D1BAC-807D1C50 00244C 00A4+00 1/0 0/0 0/0 .text daE_Warpappear_Execute__FP18e_warpappear_class
- */
 static int daE_Warpappear_Execute(e_warpappear_class* i_this) {
     i_this->field_0x594++;
     i_this->scale.x = 20.0f;
@@ -818,20 +800,15 @@ static int daE_Warpappear_Execute(e_warpappear_class* i_this) {
     return 1;
 }
 
-/* 807D1C50-807D1C58 0024F0 0008+00 1/0 0/0 0/0 .text
- * daE_Warpappear_IsDelete__FP18e_warpappear_class */
 static int daE_Warpappear_IsDelete(e_warpappear_class* i_this) {
     return 1;
 }
 
-/* 807D1C58-807D1C8C 0024F8 0034+00 1/0 0/0 0/0 .text daE_Warpappear_Delete__FP18e_warpappear_class
- */
 static int daE_Warpappear_Delete(e_warpappear_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Kytag04");
     return 1;
 }
 
-/* 807D1C8C-807D1EF8 00252C 026C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     e_warpappear_class* i_this = (e_warpappear_class*)actor;
 
@@ -874,7 +851,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 807D1F40-807D206C 0027E0 012C+00 1/0 0/0 0/0 .text daE_Warpappear_Create__FP10fopAc_ac_c */
 static int daE_Warpappear_Create(fopAc_ac_c* actor) {
     fopAcM_ct(actor, e_warpappear_class);
     e_warpappear_class* i_this = (e_warpappear_class*)actor;
@@ -913,14 +889,12 @@ static int daE_Warpappear_Create(fopAc_ac_c* actor) {
     return phase;
 }
 
-/* 807D2318-807D2338 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Warpappear_Method */
 static actor_method_class l_daE_Warpappear_Method = {
     (process_method_func)daE_Warpappear_Create,  (process_method_func)daE_Warpappear_Delete,
     (process_method_func)daE_Warpappear_Execute, (process_method_func)daE_Warpappear_IsDelete,
     (process_method_func)daE_Warpappear_Draw,
 };
 
-/* 807D2338-807D2368 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_WAP */
 extern actor_process_profile_definition g_profile_E_WAP = {
     fpcLy_CURRENT_e,             // mLayerID
     7,                           // mListID
diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp
index 67f06e1f9b..78d3e7d45a 100644
--- a/src/d/actor/d_a_e_wb.cpp
+++ b/src/d/actor/d_a_e_wb.cpp
@@ -21,8 +21,8 @@
 
 class daE_WB_HIO_c : public JORReflexible {
 public:
-    /* 807D248C */ daE_WB_HIO_c();
-    /* 807E20DC */ virtual ~daE_WB_HIO_c() {};
+    daE_WB_HIO_c();
+    virtual ~daE_WB_HIO_c() {};
     void genMessage(JORMContext*);
 
     /* イノシシ - Wild Boar */
@@ -56,7 +56,6 @@ STATIC_ASSERT(sizeof(daE_WB_HIO_c) == 0x5C);
 
 static u8 const lit_3882[12] = {0};
 
-/* 807D248C-807D2548 0000EC 00BC+00 1/1 0/0 0/0 .text            __ct__12daE_WB_HIO_cFv */
 daE_WB_HIO_c::daE_WB_HIO_c() {
     mId = -1;
     base_size = 1.2f;
@@ -129,7 +128,6 @@ void daE_WB_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 807D2548-807D2610 0001A8 00C8+00 26/26 0/0 0/0 .text            anm_init__FP10e_wb_classifUcf */
 static void anm_init(e_wb_class* i_actor, int i_anmId, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_actor->mAnmID = i_anmId;
 
@@ -141,7 +139,6 @@ static void anm_init(e_wb_class* i_actor, int i_anmId, f32 i_morf, u8 i_attr, f3
                                  i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 807D2610-807D27D4 000270 01C4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -178,7 +175,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 807E35B4-807E35B8 -00001 0004+00 3/7 0/0 0/0 .bss             None */
 /* 807E35B4 0001+00 data_807E35B4 @1009 */
 /* 807E35B5 0001+00 data_807E35B5 None */
 /* 807E35B6 0001+00 data_807E35B6 None */
@@ -188,16 +184,13 @@ static s8 lbl_244_bss_46;
 static s8 lbl_244_bss_47;
 static bool l_HIOInit;
 
-/* 807E35B8-807E35BC 000048 0004+00 1/2 0/0 0/0 .bss             None */
 // static u8 lbl_244_bss_48;
 // static u8 lbl_244_bss_49;
 // static u8 lbl_244_bss_4a;
 // static u8 lbl_244_bss_4b;
 
-/* 807E35C8-807E3624 000058 005C+00 9/14 0/0 0/0 .bss             l_HIO */
 static daE_WB_HIO_c l_HIO;
 
-/* 807D27D4-807D2B48 000434 0374+00 1/1 0/0 0/0 .text himo_control1__FP10e_wb_classP4cXyziSc */
 static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mEnemy;
     cXyz sp60;
@@ -284,7 +277,6 @@ static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3
     }
 }
 
-/* 807D2B84-807D2D90 0007E4 020C+00 1/1 0/0 0/0 .text himo_control2__FP10e_wb_classP4cXyziSc */
 static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp30;
@@ -334,8 +326,6 @@ static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3
     var_r29[i_idx] = i_this->field_0x1450[i_idx].field_0x0[15];
 }
 
-/* 807D2D90-807D2F18 0009F0 0188+00 1/1 0/0 0/0 .text            e_wb_lr_wall_check__FP10e_wb_class
- */
 static int e_wb_lr_wall_check(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -375,7 +365,6 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) {
     return 0;
 }
 
-/* 807D2F18-807D366C 000B78 0754+00 1/0 0/0 0/0 .text            daE_WB_Draw__FP10e_wb_class */
 static int daE_WB_Draw(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     static _GXColor l_color = {
@@ -526,7 +515,6 @@ static int daE_WB_Draw(e_wb_class* i_this) {
     return 1;
 }
 
-/* 807D366C-807D387C 0012CC 0210+00 1/1 0/0 0/0 .text            e_wb_wall_check__FP10e_wb_class */
 static s16 e_wb_wall_check(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_LinChk linChk;
@@ -570,7 +558,6 @@ static s16 e_wb_wall_check(e_wb_class* i_this) {
     return 0;
 }
 
-/* 807D387C-807D3B94 0014DC 0318+00 1/1 0/0 0/0 .text            gake_check__FP10e_wb_class */
 static s8 gake_check(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_GndChk dStack_70;
@@ -643,7 +630,6 @@ static s8 gake_check(e_wb_class* i_this) {
     }
 }
 
-/* 807D3B94-807D3D94 0017F4 0200+00 1/1 0/0 0/0 .text e_wb_saku_jump_check__FP10e_wb_class */
 static BOOL e_wb_saku_jump_check(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_LinChk dStack_98;
@@ -687,7 +673,6 @@ static BOOL e_wb_saku_jump_check(e_wb_class* i_this) {
     return 0;
 }
 
-/* 807D3D94-807D3F2C 0019F4 0198+00 1/1 0/0 0/0 .text e_wb_saku_check_sub__FP10e_wb_classs */
 static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_GndChk dStack_90;
@@ -722,7 +707,6 @@ static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) {
     return 0;
 }
 
-/* 807D3F2C-807D3FB0 001B8C 0084+00 1/1 0/0 0/0 .text            e_wb_saku_check__FP10e_wb_class */
 static int e_wb_saku_check(e_wb_class* i_this) {
     int uVar2 = false;
     static s16 yaa[3] = {0, -4096, 4096};
@@ -737,7 +721,6 @@ static int e_wb_saku_check(e_wb_class* i_this) {
     return uVar2;
 }
 
-/* 807D3FB0-807D40A8 001C10 00F8+00 1/1 0/0 0/0 .text            e_wb_wait__FP10e_wb_class */
 static void e_wb_wait(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     switch (i_this->mActionMode) {
@@ -759,7 +742,6 @@ static void e_wb_wait(e_wb_class* i_this) {
     }
 }
 
-/* 807D40A8-807D4110 001D08 0068+00 1/1 0/0 0/0 .text            e_wb_ride__FP10e_wb_class */
 static void e_wb_ride(e_wb_class* i_this) {
     switch (i_this->mActionMode) {
     case 0:
@@ -771,14 +753,12 @@ static void e_wb_ride(e_wb_class* i_this) {
     }
 }
 
-/* 807D4110-807D4154 001D70 0044+00 1/1 0/0 0/0 .text            e_wb_pl_ride_now__FP10e_wb_class */
 static void e_wb_pl_ride_now(e_wb_class* i_this) {
     if (i_this->mAnmID != 0x2a) {
         anm_init(i_this, 0x2a, 10.0f, 2, 1.0f);
     }
 }
 
-/* 807D4154-807D48C0 001DB4 076C+00 1/1 0/0 0/0 .text            e_wb_pl_ride__FP10e_wb_class */
 static void e_wb_pl_ride(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 fVar11;
@@ -1003,7 +983,6 @@ static void e_wb_pl_ride(e_wb_class* i_this) {
     }
 }
 
-/* 807D48C0-807D4BDC 002520 031C+00 1/1 0/0 0/0 .text            e_wb_f_wait__FP10e_wb_class */
 static void e_wb_f_wait(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     s16 new_angle = fopAcM_searchPlayerAngleY(a_this);
@@ -1094,7 +1073,6 @@ static void e_wb_f_wait(e_wb_class* i_this) {
     }
 }
 
-/* 807D4BDC-807D4C84 00283C 00A8+00 1/1 0/0 0/0 .text            pl_pass_check__FP10e_wb_classf */
 static int pl_pass_check(e_wb_class* i_this, f32 param_1) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1110,7 +1088,6 @@ static int pl_pass_check(e_wb_class* i_this, f32 param_1) {
     return cStack_24.z > param_1;
 }
 
-/* 807D4C84-807D53AC 0028E4 0728+00 1/1 0/0 0/0 .text            e_wb_f_run__FP10e_wb_class */
 static void e_wb_f_run(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* local_8c = dComIfGp_getPlayer(0);
@@ -1291,7 +1268,6 @@ static void e_wb_f_run(e_wb_class* i_this) {
     }
 }
 
-/* 807D53AC-807D5408 00300C 005C+00 2/2 0/0 0/0 .text            s_wbstart_sub__FPvPv */
 static void* s_wbstart_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB &&
         static_cast<e_wb_class*>(i_actor)->field_0x79d == 0)
@@ -1303,7 +1279,6 @@ static void* s_wbstart_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807D5408-807D5634 003068 022C+00 1/1 0/0 0/0 .text            e_wb_b_wait__FP10e_wb_class */
 static void e_wb_b_wait(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 dVar7 = fopAcM_searchPlayerDistanceXZ(a_this);
@@ -1352,13 +1327,10 @@ static void e_wb_b_wait(e_wb_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 2.0f);
 }
 
-/* 807E3630-807E3690 0000C0 0060+00 1/4 0/0 0/0 .bss             b_path */
 static cXyz b_path[8];
 
-/* 807E369C-807E36FC 00012C 0060+00 2/3 0/0 0/0 .bss             b_path2 */
 static cXyz b_path2[8];
 
-/* 807D5634-807D5EBC 003294 0888+00 1/1 0/0 0/0 .text            e_wb_b_run2__FP10e_wb_class */
 static void e_wb_b_run2(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
@@ -1493,7 +1465,6 @@ static void e_wb_b_run2(e_wb_class* i_this) {
     }
 }
 
-/* 807D5EBC-807D6058 003B1C 019C+00 1/1 0/0 0/0 .text            e_wb_b_wait2__FP10e_wb_class */
 static void e_wb_b_wait2(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
@@ -1533,7 +1504,6 @@ static void e_wb_b_wait2(e_wb_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f);
 }
 
-/* 807D6058-807D6C2C 003CB8 0BD4+00 2/1 0/0 0/0 .text            e_wb_b_run__FP10e_wb_class */
 /**
  * @brief Handles the running action state for the Bullbo enemy.
  *
@@ -1802,7 +1772,6 @@ static void e_wb_b_run(e_wb_class* i_this) {
     return;
 }
 
-/* 807D6C2C-807D6CE0 00488C 00B4+00 1/1 0/0 0/0 .text            arrow_rd_set__FP10e_wb_class */
 static void arrow_rd_set(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     static cXyz arrow_rd_pos[1] = {cXyz(36460.0f, 1040.0f, -17020.0f)};
@@ -1811,13 +1780,10 @@ static void arrow_rd_set(e_wb_class* i_this) {
     }
 }
 
-/* 807E3724-807E3730 0001B4 000C+00 0/2 0/0 0/0 .bss             saku_p */
 static cXyz saku_p(34800.0f, 0.0f, -14900.0f);
 
-/* 807E373C-807E3748 0001CC 000C+00 0/2 0/0 0/0 .bss             saku_p2 */
 static cXyz saku_p2(34800.0f, 0.0f, -37200.0f);
 
-/* 807D6CE0-807D79B0 004940 0CD0+00 1/1 0/0 0/0 .text            e_wb_b_ikki__FP10e_wb_class */
 static void e_wb_b_ikki(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     static cXyz ikki_pos[2] = {cXyz(34789.0f, -290.0f, -36200.0f),
@@ -2058,7 +2024,6 @@ static void e_wb_b_ikki(e_wb_class* i_this) {
     }
 }
 
-/* 807D79EC-807D7AD4 00564C 00E8+00 1/1 0/0 0/0 .text            e_wb_b_ikki_end__FP10e_wb_class */
 static void e_wb_b_ikki_end(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -2084,7 +2049,6 @@ static void e_wb_b_ikki_end(e_wb_class* i_this) {
     }
 }
 
-/* 807D7AD4-807D8490 005734 09BC+00 1/1 0/0 0/0 .text            e_wb_b_ikki2__FP10e_wb_class */
 static void e_wb_b_ikki2(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     static cXyz ikki2_pos[2] = {cXyz(-93620.0f, -5750.0f, 48944.0f),
@@ -2289,7 +2253,6 @@ static void e_wb_b_ikki2(e_wb_class* i_this) {
     }
 }
 
-/* 807D8490-807D8648 0060F0 01B8+00 1/1 0/0 0/0 .text            e_wb_b_ikki2_end__FP10e_wb_class */
 static void e_wb_b_ikki2_end(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -2331,7 +2294,6 @@ static void e_wb_b_ikki2_end(e_wb_class* i_this) {
                         0x800);
 }
 
-/* 807D8648-807D88D8 0062A8 0290+00 2/1 0/0 0/0 .text            e_wb_b_lv9_end__FP10e_wb_class */
 static void e_wb_b_lv9_end(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_44;
@@ -2402,7 +2364,6 @@ static void e_wb_b_lv9_end(e_wb_class* i_this) {
                         (NREG_S(0) + -8) * (a_this->current.angle.y - curr_angle), 8, 0x200);
 }
 
-/* 807D88D8-807D8A78 006538 01A0+00 1/1 0/0 0/0 .text            e_wb_a_run__FP10e_wb_class */
 static void e_wb_a_run(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     s16 curr_angle_y = a_this->current.angle.y;
@@ -2436,7 +2397,6 @@ static void e_wb_a_run(e_wb_class* i_this) {
     }
 }
 
-/* 807D8A78-807D8C3C 0066D8 01C4+00 1/1 0/0 0/0 .text            e_wb_s_damage__FP10e_wb_class */
 static void e_wb_s_damage(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz cStack_1c;
@@ -2489,7 +2449,6 @@ static void e_wb_s_damage(e_wb_class* i_this) {
     cLib_addCalc0(&a_this->speedF, 1.0f, 1.0f);
 }
 
-/* 807D8C3C-807D901C 00689C 03E0+00 1/1 0/0 0/0 .text            e_wb_damage__FP10e_wb_class */
 static int e_wb_damage(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_2c;
@@ -2582,7 +2541,6 @@ static int e_wb_damage(e_wb_class* i_this) {
     return local_48;
 }
 
-/* 807D901C-807D91EC 006C7C 01D0+00 1/1 0/0 0/0 .text            e_wb_bg_damage__FP10e_wb_class */
 static int e_wb_bg_damage(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_30;
@@ -2627,7 +2585,6 @@ static int e_wb_bg_damage(e_wb_class* i_this) {
     return return_value;
 }
 
-/* 807D91EC-807D9608 006E4C 041C+00 1/1 0/0 0/0 .text            e_wb_lr_damage__FP10e_wb_class */
 static int e_wb_lr_damage(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_2c;
@@ -2743,7 +2700,6 @@ static int e_wb_lr_damage(e_wb_class* i_this) {
     return return_value;
 }
 
-/* 807D9608-807D9698 007268 0090+00 1/1 0/0 0/0 .text            e_wb_kiba_start__FP10e_wb_class */
 static void e_wb_kiba_start(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     
@@ -2762,7 +2718,6 @@ static void e_wb_kiba_start(e_wb_class* i_this) {
     cLib_addCalc2(&a_this->speedF, 0.0f, 1.0f, 5.0f);
 }
 
-/* 807D9698-807D98D4 0072F8 023C+00 1/1 0/0 0/0 .text            e_wb_kiba_end__FP10e_wb_class */
 static void e_wb_kiba_end(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     
@@ -2820,7 +2775,6 @@ static void e_wb_kiba_end(e_wb_class* i_this) {
     cLib_addCalc2(&a_this->speedF, 40.0f, 1.0f, 5.0f);
 }
 
-/* 807D98D4-807D9D44 007534 0470+00 1/1 0/0 0/0 .text            damage_check__FP10e_wb_class */
 static void damage_check(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -2941,7 +2895,6 @@ static void damage_check(e_wb_class* i_this) {
     }
 }
 
-/* 807D9D44-807DA5D8 0079A4 0894+00 1/1 0/0 0/0 .text            effect_set__FP10e_wb_class */
 static void effect_set(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz pos;
@@ -3133,7 +3086,6 @@ static void effect_set(e_wb_class* i_this) {
     i_this->mLandingFlag = 0;
 }
 
-/* 807DA5D8-807DA6EC 008238 0114+00 1/1 0/0 0/0 .text            wb_rd_reset__FP10e_wb_class */
 static void wb_rd_reset(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3148,7 +3100,6 @@ static void wb_rd_reset(e_wb_class* i_this) {
     }
 }
 
-/* 807DA6EC-807DA798 00834C 00AC+00 1/1 0/0 0/0 .text            wb_c_rd_reset__FP10e_wb_class */
 static void wb_c_rd_reset(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dComIfGp_getPlayer(0);
@@ -3161,7 +3112,6 @@ static void wb_c_rd_reset(e_wb_class* i_this) {
     fopAcM_create(PROC_E_RD, param | 2, &pos, fopAcM_GetRoomNo(a_this), 0, 0, -1);
 }
 
-/* 807DA798-807DA7F0 0083F8 0058+00 1/1 0/0 0/0 .text            s_rddel_sub__FPvPv */
 static void* s_rddel_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) {
         e_rd_class* rd = (e_rd_class*)param_0;
@@ -3172,11 +3122,8 @@ static void* s_rddel_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* ############################################################################################## */
-/* 807E3800-807E3804 000290 0004+00 1/1 0/0 0/0 .bss             rd_count */
 static int rd_count;
 
-/* 807DA7F0-807DA868 008450 0078+00 1/1 0/0 0/0 .text            s_rdcount_sub__FPvPv */
 static void* s_rdcount_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) {
         e_rd_class* rd = (e_rd_class*)i_actor;
@@ -3187,7 +3134,6 @@ static void* s_rdcount_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DA868-807DA8E0 0084C8 0078+00 1/1 0/0 0/0 .text            s_rddel2_sub__FPvPv */
 static void* s_rddel2_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) {
         e_rd_class* rd = (e_rd_class*)i_actor;
@@ -3198,7 +3144,6 @@ static void* s_rddel2_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DA8E0-807DAA00 008540 0120+00 1/1 0/0 0/0 .text            e_wb_crv_wait__FP10e_wb_class */
 static void e_wb_crv_wait(e_wb_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* king_bulblin = fopAcM_SearchByName(PROC_E_RDB);
@@ -3228,7 +3173,6 @@ static void e_wb_crv_wait(e_wb_class* i_this) {
     }
 }
 
-/* 807DAA00-807DB7E4 008660 0DE4+00 2/1 0/0 0/0 .text            e_wb_c_run__FP10e_wb_class */
 static s8 e_wb_c_run(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3476,7 +3420,6 @@ static s8 e_wb_c_run(e_wb_class* i_this) {
     return return_value;
 }
 
-/* 807DB7E4-807DBEE8 009444 0704+00 2/1 0/0 0/0 .text            action__FP10e_wb_class */
 // NONMATCHING - regalloc / conditional pathing
 static void action(e_wb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
@@ -3712,7 +3655,6 @@ static void action(e_wb_class* i_this) {
     }
 }
 
-/* 807DBEE8-807DBF50 009B48 0068+00 1/1 0/0 0/0 .text            s_wbZrevise_sub__FPvPv */
 static void* s_wbZrevise_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB &&
         static_cast<e_wb_class*>(i_actor)->field_0x79d == 0)
@@ -3724,7 +3666,6 @@ static void* s_wbZrevise_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DBF50-807DBFAC 009BB0 005C+00 1/1 0/0 0/0 .text            s_spd0_sub__FPvPv */
 static void* s_spd0_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB &&
         static_cast<e_wb_class*>(i_actor)->field_0x79d == 0)
@@ -3735,7 +3676,6 @@ static void* s_spd0_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DBFAC-807DC004 009C0C 0058+00 1/1 0/0 0/0 .text            s_wbdel_sub__FPvPv */
 static void* s_wbdel_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB &&
         static_cast<e_wb_class*>(i_actor)->field_0x79d == 0)
@@ -3746,7 +3686,6 @@ static void* s_wbdel_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DC004-807DC084 009C64 0080+00 1/1 0/0 0/0 .text            s_rdArrowWait_sub__FPvPv */
 static void* s_rdArrowWait_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD &&
         (static_cast<e_rd_class*>(i_actor)->field_0x5bc == 2 ||
@@ -3758,7 +3697,6 @@ static void* s_rdArrowWait_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807DC084-807DC168 009CE4 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP10e_wb_classf */
 static void cam_3d_morf(e_wb_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->field_0x16bc.x, i_this->field_0x16e0.x, i_scale,
                   i_this->field_0x16f8.x * i_this->field_0x1710);
@@ -3774,7 +3712,6 @@ static void cam_3d_morf(e_wb_class* i_this, f32 i_scale) {
                   i_this->field_0x16ec.z * i_this->field_0x1710);
 }
 
-/* 807DC168-807DFAB4 009DC8 394C+00 2/1 0/0 0/0 .text            demo_camera__FP10e_wb_class */
 static void demo_camera(e_wb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     camera_class* local_184 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -5073,7 +5010,6 @@ static void demo_camera(e_wb_class* i_this) {
     }
 }
 
-/* 807DFB18-807E0388 00D778 0870+00 1/1 0/0 0/0 .text            anm_se_eff_set__FP10e_wb_class */
 static void anm_se_eff_set(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -5191,10 +5127,8 @@ static void anm_se_eff_set(e_wb_class* i_this) {
     }
 }
 
-/* 807E389C-807E38A0 00032C 0004+00 0/2 0/0 0/0 .bss             c_start */
 static int c_start;
 
-/* 807E0388-807E1020 00DFE8 0C98+00 2/1 0/0 0/0 .text            daE_WB_Execute__FP10e_wb_class */
 static int daE_WB_Execute(e_wb_class* i_this) {    
     if (c_start == 0) {
         if (dComIfGp_event_runCheck()) {
@@ -5532,12 +5466,10 @@ static int daE_WB_Execute(e_wb_class* i_this) {
     return 1;
 }
 
-/* 807E1020-807E1028 00EC80 0008+00 1/0 0/0 0/0 .text            daE_WB_IsDelete__FP10e_wb_class */
 static int daE_WB_IsDelete(e_wb_class* i_this) {
     return 1;
 }
 
-/* 807E1028-807E108C 00EC88 0064+00 1/0 0/0 0/0 .text            daE_WB_Delete__FP10e_wb_class */
 static int daE_WB_Delete(e_wb_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAcM_GetID(i_this);
@@ -5554,7 +5486,6 @@ static int daE_WB_Delete(e_wb_class* i_this) {
     return 1;
 }
 
-/* 807E108C-807E13A8 00ECEC 031C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_wb_class* i_this = (e_wb_class*)a_this;
 
@@ -5631,7 +5562,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807E13A8-807E1CB0 00F008 0908+00 1/0 0/0 0/0 .text            daE_WB_Create__FP10fopAc_ac_c */
 static int daE_WB_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, e_wb_class);
     e_wb_class* i_this = (e_wb_class*)a_this;
@@ -5894,14 +5824,12 @@ static int daE_WB_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 807E349C-807E34BC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_WB_Method */
 static actor_method_class l_daE_WB_Method = {
     (process_method_func)daE_WB_Create,  (process_method_func)daE_WB_Delete,
     (process_method_func)daE_WB_Execute, (process_method_func)daE_WB_IsDelete,
     (process_method_func)daE_WB_Draw,
 };
 
-/* 807E34BC-807E34EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_WB */
 extern actor_process_profile_definition g_profile_E_WB = {
     fpcLy_CURRENT_e,         // mLayerID
     4,                       // mListID
diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp
index e10320ab41..3a80bc3951 100644
--- a/src/d/actor/d_a_e_ws.cpp
+++ b/src/d/actor/d_a_e_ws.cpp
@@ -12,8 +12,8 @@
 
 class daE_WS_HIO_c : public JORReflexible {
 public:
-    /* 807E3A0C */ daE_WS_HIO_c();
-    /* 807E6E44 */ virtual ~daE_WS_HIO_c() {}
+    daE_WS_HIO_c();
+    virtual ~daE_WS_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -29,8 +29,6 @@ public:
 };
 
 namespace {
-/* 807E7448-807E7488 000038 0040+00 1/1 0/0 0/0 .data            cc_ws_src__22@unnamed@d_a_e_ws_cpp@
- */
 static dCcD_SrcSph cc_ws_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xD}, {0xD8F9FDF5, 0x3}, 0x75}}, // mObj
@@ -43,7 +41,6 @@ static dCcD_SrcSph cc_ws_src = {
     } // mSphAttr
 };
 
-/* 807E7488-807E74C8 000078 0040+00 1/1 0/0 0/0 .data cc_bokkuri_src__22@unnamed@d_a_e_ws_cpp@ */
 static dCcD_SrcSph cc_bokkuri_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x0}, {0x20008, 0x3}, 0x0}}, // mObj
@@ -57,7 +54,6 @@ static dCcD_SrcSph cc_bokkuri_src = {
 };
 }
 
-/* 807E3A0C-807E3A6C 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__12daE_WS_HIO_cFv */
 daE_WS_HIO_c::daE_WS_HIO_c() {
     id = -1;
     base_size = 0.8f;
@@ -70,7 +66,6 @@ daE_WS_HIO_c::daE_WS_HIO_c() {
     attack_speed = 10.0f;
 }
 
-/* 807E3A6C-807E3C00 00014C 0194+00 1/1 0/0 0/0 .text            draw__8daE_WS_cFv */
 int daE_WS_c::draw() {
     J3DModel* model_p = mpModelMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -94,17 +89,14 @@ int daE_WS_c::draw() {
     return 1;
 }
 
-/* 807E3C00-807E3C20 0002E0 0020+00 1/0 0/0 0/0 .text            daE_WS_Draw__FP8daE_WS_c */
 static int daE_WS_Draw(daE_WS_c* a_this) {
     return a_this->draw();
 }
 
-/* 807E3C20-807E3CC4 000300 00A4+00 4/4 0/0 0/0 .text            setBck__8daE_WS_cFiUcff */
 void daE_WS_c::setBck(int i_anm, u8 i_mode, f32 i_morf, f32 i_speed) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_WS", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 807E3CC4-807E3F90 0003A4 02CC+00 2/2 0/0 0/0 .text            setFootSound__8daE_WS_cFv */
 void daE_WS_c::setFootSound() {
     if (mpModelMorf->getAnm() == dComIfG_getObjectRes("E_WS", 7)) {
         if (mpModelMorf->checkFrame(0.0f)  ||
@@ -137,7 +129,6 @@ void daE_WS_c::setFootSound() {
     }
 }
 
-/* 807E3F90-807E3FAC 000670 001C+00 5/5 0/0 0/0 .text            setActionMode__8daE_WS_cFi */
 void daE_WS_c::setActionMode(int i_action) {
     if (mAction != i_action) {
         mAction = i_action;
@@ -145,12 +136,10 @@ void daE_WS_c::setActionMode(int i_action) {
     }
 }
 
-/* 807E3FAC-807E40C8 00068C 011C+00 4/4 0/0 0/0 .text calcTargetDist__8daE_WS_cF4cXyz4cXyz */
 f32 daE_WS_c::calcTargetDist(cXyz i_basePos, cXyz i_targetPos) {
     return i_basePos.abs(i_targetPos);
 }
 
-/* 807E40C8-807E416C 0007A8 00A4+00 3/3 0/0 0/0 .text calcTargetAngle__8daE_WS_cF4cXyz4cXyz */
 s16 daE_WS_c::calcTargetAngle(cXyz i_basePos, cXyz i_targetPos) {
     cXyz sp1C;
     cXyz sp10 = i_targetPos - i_basePos;
@@ -161,13 +150,10 @@ s16 daE_WS_c::calcTargetAngle(cXyz i_basePos, cXyz i_targetPos) {
     return cM_atan2s(sp1C.x, sp1C.z);
 }
 
-/* 807E75B8-807E75BC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 807E75C8-807E75F0 000018 0028+00 7/7 0/0 0/0 .bss             l_HIO */
 static daE_WS_HIO_c l_HIO;
 
-/* 807E416C-807E4224 00084C 00B8+00 3/3 0/0 0/0 .text checkInSearchRange__8daE_WS_cF4cXyz4cXyz */
 bool daE_WS_c::checkInSearchRange(cXyz i_basePos, cXyz i_targetPos) {
     if (calcTargetDist(i_basePos, i_targetPos) < l_HIO.search_range && std::abs(i_basePos.y - i_targetPos.y) < l_HIO.search_y_range) {
         return true;
@@ -176,7 +162,6 @@ bool daE_WS_c::checkInSearchRange(cXyz i_basePos, cXyz i_targetPos) {
     return false;
 }
 
-/* 807E4224-807E4568 000904 0344+00 1/1 0/0 0/0 .text            checkPlayerPos__8daE_WS_cFv */
 int daE_WS_c::checkPlayerPos() {
     cXyz player_pos;
     mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0));
@@ -215,7 +200,6 @@ int daE_WS_c::checkPlayerPos() {
     return 0;
 }
 
-/* 807E4568-807E470C 000C48 01A4+00 1/1 0/0 0/0 .text            checkAttackEnd__8daE_WS_cFv */
 bool daE_WS_c::checkAttackEnd() {
     cXyz player_pos;
     mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0));
@@ -243,7 +227,6 @@ bool daE_WS_c::checkAttackEnd() {
     return false;
 }
 
-/* 807E470C-807E4AB8 000DEC 03AC+00 2/1 0/0 0/0 .text            executeWait__8daE_WS_cFv */
 void daE_WS_c::executeWait() {
     int temp_r3 = checkPlayerPos();
     if (temp_r3 == 1) {
@@ -328,7 +311,6 @@ void daE_WS_c::executeWait() {
     current.angle.y = shape_angle.y;
 }
 
-/* 807E4AB8-807E4E68 001198 03B0+00 1/1 0/0 0/0 .text            executeAttack__8daE_WS_cFv */
 void daE_WS_c::executeAttack() {
     cXyz player_pos;
     mDoMtx_stack_c::copy(daPy_getLinkPlayerActorClass()->getModelJointMtx(0));
@@ -409,7 +391,6 @@ void daE_WS_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 807E4E68-807E5294 001548 042C+00 1/1 0/0 0/0 .text            executeDown__8daE_WS_cFv */
 void daE_WS_c::executeDown() {
     mInvulnerabilityTimer = 10;
 
@@ -507,7 +488,6 @@ void daE_WS_c::executeDown() {
     }
 }
 
-/* 807E5294-807E56D0 001974 043C+00 1/1 0/0 0/0 .text            executeWindDown__8daE_WS_cFv */
 void daE_WS_c::executeWindDown() {
     mInvulnerabilityTimer = 10;
 
@@ -599,7 +579,6 @@ void daE_WS_c::executeWindDown() {
     }
 }
 
-/* 807E56D0-807E58AC 001DB0 01DC+00 1/1 0/0 0/0 .text            damage_check__8daE_WS_cFv */
 void daE_WS_c::damage_check() {
     if (mInvulnerabilityTimer == 0) {
         if (mAction == ACTION_DOWN_e || mAction == ACTION_WIND_DOWN_e) {
@@ -650,7 +629,6 @@ void daE_WS_c::damage_check() {
     }
 }
 
-/* 807E58AC-807E5A3C 001F8C 0190+00 1/1 0/0 0/0 .text            action__8daE_WS_cFv */
 void daE_WS_c::action() {
     attention_info.distances[fopAc_attn_BATTLE_e] = 46;
     damage_check();
@@ -692,7 +670,6 @@ void daE_WS_c::action() {
     mpModelMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 807E5A3C-807E5AAC 00211C 0070+00 2/2 0/0 0/0 .text            mtx_set__8daE_WS_cFv */
 void daE_WS_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x66e);
@@ -704,7 +681,6 @@ void daE_WS_c::mtx_set() {
     mpModelMorf->modelCalc();
 }
 
-/* 807E5AAC-807E5C0C 00218C 0160+00 1/1 0/0 0/0 .text            cc_set__8daE_WS_cFv */
 void daE_WS_c::cc_set() {
     cXyz mae;
     cXyz ato;
@@ -730,7 +706,6 @@ void daE_WS_c::cc_set() {
     dComIfG_Ccsp()->Set(&mCcBokkuriSph);
 }
 
-/* 807E5C0C-807E5CB8 0022EC 00AC+00 1/1 0/0 0/0 .text            execute__8daE_WS_cFv */
 int daE_WS_c::execute() {
     if (mMoveWaitTimer != 0) {
         mMoveWaitTimer--;
@@ -750,12 +725,10 @@ int daE_WS_c::execute() {
     return 1;
 }
 
-/* 807E5CB8-807E5CD8 002398 0020+00 1/0 0/0 0/0 .text            daE_WS_Execute__FP8daE_WS_c */
 static int daE_WS_Execute(daE_WS_c* a_this) {
     return a_this->execute();
 }
 
-/* 807E5CD8-807E5F70 0023B8 0298+00 1/1 0/0 0/0 .text            checkInitialWall__8daE_WS_cFv */
 void daE_WS_c::checkInitialWall() {
     cXyz endpos;
     cXyz offset(0.0f, 0.0f, 200.0f);
@@ -784,7 +757,6 @@ void daE_WS_c::checkInitialWall() {
     }
 }
 
-/* 807E5FB8-807E63F8 002698 0440+00 3/3 0/0 0/0 .text            checkBeforeBg__8daE_WS_cFs */
 bool daE_WS_c::checkBeforeBg(s16 i_angle) {
     dBgS_LinChk linchk;
     cXyz sp68;
@@ -858,7 +830,6 @@ bool daE_WS_c::checkBeforeBg(s16 i_angle) {
     return false;
 }
 
-/* 807E63F8-807E66AC 002AD8 02B4+00 1/1 0/0 0/0 .text            checkWall__8daE_WS_cFv */
 bool daE_WS_c::checkWall() {
     cXyz startpos;
     cXyz endpos;
@@ -893,12 +864,10 @@ bool daE_WS_c::checkWall() {
     return false;
 }
 
-/* 807E66AC-807E66B4 002D8C 0008+00 1/0 0/0 0/0 .text            daE_WS_IsDelete__FP8daE_WS_c */
 static int daE_WS_IsDelete(daE_WS_c* a_this) {
     return 1;
 }
 
-/* 807E66B4-807E6728 002D94 0074+00 1/1 0/0 0/0 .text            _delete__8daE_WS_cFv */
 int daE_WS_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_WS");
 
@@ -914,12 +883,10 @@ int daE_WS_c::_delete() {
     return 1;
 }
 
-/* 807E6728-807E6748 002E08 0020+00 1/0 0/0 0/0 .text            daE_WS_Delete__FP8daE_WS_c */
 static int daE_WS_Delete(daE_WS_c* a_this) {
     return a_this->_delete();
 }
 
-/* 807E6748-807E6840 002E28 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_WS_cFv */
 int daE_WS_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_WS", 0xD);
     JUT_ASSERT(1401, modelData != NULL);
@@ -932,12 +899,10 @@ int daE_WS_c::CreateHeap() {
     return 1;
 }
 
-/* 807E6840-807E6860 002F20 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daE_WS_c*)i_this)->CreateHeap();
 }
 
-/* 807E6860-807E6C10 002F40 03B0+00 1/1 0/0 0/0 .text            create__8daE_WS_cFv */
 int daE_WS_c::create() {
     fopAcM_ct(this, daE_WS_c);
 
@@ -1007,12 +972,10 @@ int daE_WS_c::create() {
     return phase_state;
 }
 
-/* 807E6DDC-807E6DFC 0034BC 0020+00 1/0 0/0 0/0 .text            daE_WS_Create__FP8daE_WS_c */
 static int daE_WS_Create(daE_WS_c* a_this) {
     return a_this->create();
 }
 
-/* 807E74E4-807E7504 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_WS_Method */
 static actor_method_class l_daE_WS_Method = {
     (process_method_func)daE_WS_Create,
     (process_method_func)daE_WS_Delete,
@@ -1021,7 +984,6 @@ static actor_method_class l_daE_WS_Method = {
     (process_method_func)daE_WS_Draw,
 };
 
-/* 807E7504-807E7534 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_WS */
 extern actor_process_profile_definition g_profile_E_WS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp
index f58bf09765..107fcb863f 100644
--- a/src/d/actor/d_a_e_ww.cpp
+++ b/src/d/actor/d_a_e_ww.cpp
@@ -100,8 +100,8 @@ enum Action_Mode {
 
 class daE_WW_HIO_c : public JORReflexible {
 public:
-    /* 807E76EC */ daE_WW_HIO_c();
-    /* 807EEEBC */ virtual ~daE_WW_HIO_c() {}
+    daE_WW_HIO_c();
+    virtual ~daE_WW_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -145,15 +145,12 @@ namespace {
     };
 } // namespace
 
-/* 807EFBF4-807EFBF8 00007C 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 807EFBCC-807EFBF4 000054 0028+00 7/8 0/0 0/0 .bss             l_HIO */
 static daE_WW_HIO_c l_HIO;
 
 static u8 lbl_237_bss_30; // What name for this variable ?
 
-/* 807E76EC-807E7748 0000EC 005C+00 1/1 0/0 0/0 .text            __ct__12daE_WW_HIO_cFv */
 daE_WW_HIO_c::daE_WW_HIO_c() {
     field_0x04 = -1;
     model_size = 1.0f;
@@ -180,7 +177,6 @@ void daE_WW_HIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 807E7748-807E7800 000148 00B8+00 1/1 0/0 0/0 .text ctrlJoint__8daE_WW_cFP8J3DJointP8J3DModel */
 int daE_WW_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* _joint = i_joint;
 
@@ -200,7 +196,6 @@ int daE_WW_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 807E7800-807E784C 000200 004C+00 1/1 0/0 0/0 .text JointCallBack__8daE_WW_cFP8J3DJointi */
 int daE_WW_c::JointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -213,7 +208,6 @@ int daE_WW_c::JointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 807E784C-807E79D4 00024C 0188+00 1/1 0/0 0/0 .text            setHeadAngle__8daE_WW_cFv */
 void daE_WW_c::setHeadAngle() {
     cXyz player_eye_pos = daPy_getPlayerActorClass()->eyePos;
     cXyz temp_r1; // Zero position ? effpos effective pos ?
@@ -249,7 +243,6 @@ void daE_WW_c::setHeadAngle() {
     }
 }
 
-/* 807E79D4-807E7ABC 0003D4 00E8+00 1/1 0/0 0/0 .text            draw__8daE_WW_cFv */
 int daE_WW_c::draw() {
     if (mAction == ACTION_MASTER) {
         #ifdef DEBUG
@@ -279,17 +272,14 @@ int daE_WW_c::draw() {
     return 1;
 }
 
-/* 807E7ABC-807E7ADC 0004BC 0020+00 1/0 0/0 0/0 .text            daE_WW_Draw__FP8daE_WW_c */
 static int daE_WW_Draw(daE_WW_c* i_this) {
     return static_cast<daE_WW_c*>(i_this)->draw();
 }
 
-/* 807E7ADC-807E7B80 0004DC 00A4+00 6/6 0/0 0/0 .text            setBck__8daE_WW_cFiUcff */
 void daE_WW_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_WW", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 807E7B80-807E7BDC 000580 005C+00 1/1 0/0 0/0 .text            checkBck__8daE_WW_cFi */
 bool daE_WW_c::checkBck(int i_index) {
     if (mpModelMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes("E_WW", i_index)) {
         return 1;
@@ -298,7 +288,6 @@ bool daE_WW_c::checkBck(int i_index) {
     return 0;
 }
 
-/* 807E7BDC-807E7C20 0005DC 0044+00 11/11 0/0 0/0 .text            setActionMode__8daE_WW_cFii */
 void daE_WW_c::setActionMode(int i_action_id, int i_attack_action_id) {
     gravity = -5.0f;
     mAction = i_action_id;
@@ -309,7 +298,6 @@ void daE_WW_c::setActionMode(int i_action_id, int i_attack_action_id) {
     mObjAcch.OffLineCheckNone();
 }
 
-/* 807E7C20-807E7E74 000620 0254+00 1/1 0/0 0/0 .text            damage_check__8daE_WW_cFv */
 void daE_WW_c::damage_check() {
     if (field_0x724 == 0) {
         mCcStts.Move();
@@ -371,7 +359,6 @@ void daE_WW_c::damage_check() {
     }
 }
 
-/* 807E7E74-807E7FCC 000874 0158+00 1/1 0/0 0/0 .text            setRandamNumber__8daE_WW_cFv */
 void daE_WW_c::setRandamNumber() {
     int var_r27 = 0;
     int var_r26 = field_0x6b6;
@@ -399,7 +386,6 @@ void daE_WW_c::setRandamNumber() {
     }
 }
 
-/* 807E7FCC-807E804C 0009CC 0080+00 2/2 0/0 0/0 .text            getNearPlayerAngle__8daE_WW_cFv */
 s16 daE_WW_c::getNearPlayerAngle() {
     s16 player_angle = fopAcM_searchPlayerAngleY(this);
     s16 angle_y = player_angle - shape_angle.y;
@@ -413,7 +399,6 @@ s16 daE_WW_c::getNearPlayerAngle() {
     return shape_angle.y;
 }
 
-/* 807E804C-807E830C 000A4C 02C0+00 1/1 0/0 0/0 .text            setGroundAngle__8daE_WW_cFv */
 void daE_WW_c::setGroundAngle() {
     if (field_0x75b != 0 && !mObjAcch.ChkGroundHit()) {
         cLib_addCalcAngleS(&field_0x674.x, 0, 4, 0x1000, 0x200);
@@ -471,7 +456,6 @@ void daE_WW_c::setGroundAngle() {
     }
 }
 
-/* 807E830C-807E8518 000D0C 020C+00 3/3 0/0 0/0 .text            checkCreateBg__8daE_WW_cF4cXyz */
 f32 daE_WW_c::checkCreateBg(cXyz i_vector) {
     cXyz sp14 = i_vector; // gnd_check_pos ?
     sp14.y += field_0x6ac;
@@ -503,7 +487,6 @@ f32 daE_WW_c::checkCreateBg(cXyz i_vector) {
     return -G_CM3D_F_INF;
 }
 
-/* 807E8560-807E8624 000F60 00C4+00 3/3 0/0 0/0 .text            checkAttackWall__8daE_WW_cFv */
 bool daE_WW_c::checkAttackWall() {
     cXyz curr_pos = current.pos;
     curr_pos.y += 100.0f;
@@ -517,7 +500,6 @@ bool daE_WW_c::checkAttackWall() {
     return true;
 }
 
-/* 807E8624-807E8700 001024 00DC+00 1/1 0/0 0/0 .text            setBlurEffect__8daE_WW_cFv */
 void daE_WW_c::setBlurEffect() {
     mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8602, &current.pos, &tevStr);
     JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKey);
@@ -526,7 +508,6 @@ void daE_WW_c::setBlurEffect() {
     }
 }
 
-/* 807E8700-807E8A08 001100 0308+00 2/2 0/0 0/0 .text            setAppearEffect__8daE_WW_cFv */
 void daE_WW_c::setAppearEffect() {
     dBgS_ObjGndChk_All gnd_chk;
     cXyz gnd_pos;
@@ -546,7 +527,6 @@ void daE_WW_c::setAppearEffect() {
     }
 }
 
-/* 807E8A80-807E8B2C 001480 00AC+00 1/1 0/0 0/0 .text            s_child_ww__FPvPv */
 static void* s_child_ww(void* i_actor, void* i_data) {
     if (i_actor != i_data && fopAcM_IsActor(i_actor)
     && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor))) {
@@ -557,7 +537,6 @@ static void* s_child_ww(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807E8B2C-807E8C54 00152C 0128+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_proc, void* i_data) {
     if (fopAcM_IsActor(i_proc) && !fpcM_IsCreating(fopAcM_GetID(i_proc)) && fopAcM_checkCarryNow((fopAc_ac_c *) i_proc) == 0) {
         f32 dist = fopAcM_searchActorDistance((fopAc_ac_c *) i_proc, (fopAc_ac_c *) i_data);
@@ -594,7 +573,6 @@ static void* s_obj_sub(void* i_proc, void* i_data) {
     return NULL;
 }
 
-/* 807E8C54-807E8E6C 001654 0218+00 4/4 0/0 0/0 .text            checkSideStep__8daE_WW_cFv */
 bool daE_WW_c::checkSideStep() {
     cXyz* temp_r3;
 
@@ -625,7 +603,6 @@ bool daE_WW_c::checkSideStep() {
     return false;
 }
 
-/* 807E8E6C-807E8EEC 00186C 0080+00 1/1 0/0 0/0 .text            s_attack_ww__FPvPv */
 static void* s_attack_ww(void* i_actor, void* i_data) {
     if (i_actor != i_data && fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WW && !fpcM_IsCreating(fopAcM_GetID(i_actor)) && ((daE_WW_c*)i_actor)->isAttack() != 0) {
         return i_actor;
@@ -634,7 +611,6 @@ static void* s_attack_ww(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807E8EEC-807E905C 0018EC 0170+00 2/2 0/0 0/0 .text            createWolf__8daE_WW_cF4cXyzUc */
 void daE_WW_c::createWolf(cXyz param_0, u8 param_1) {
     fpc_ProcID var_r30;
     u8 var_r29;
@@ -656,7 +632,6 @@ void daE_WW_c::createWolf(cXyz param_0, u8 param_1) {
     mChildID[var_r29] = fopAcM_createChild(PROC_E_WW, var_r30, (var_r28 << 24) | (field_0x6b4 | (0xF0FF0000 | 0xF000) | (temp_r27 * 0x10)), &param_0, fopAcM_GetRoomNo(this), &sp14, NULL, -1, NULL);
 }
 
-/* 807EFCAC-807EFD60 000134 00B4+00 1/2 0/0 0/0 .bss             create_pos */
 static cXyz create_pos[15] = {
     cXyz(1000.0f, 0.0f, 200.0f),
     cXyz(-700.0f, 0.0f, 100.0f),
@@ -675,7 +650,6 @@ static cXyz create_pos[15] = {
     cXyz(-250.0f, 0.0f, -250.0f),
 };
 
-/* 807E905C-807E972C 001A5C 06D0+00 1/1 0/0 0/0 .text            executeMaster__8daE_WW_cFv */
 void daE_WW_c::executeMaster() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp48 = daPy_getPlayerActorClass()->current.pos;
@@ -810,7 +784,6 @@ void daE_WW_c::executeMaster() {
     }
 }
 
-/* 807E972C-807E99B8 00212C 028C+00 1/1 0/0 0/0 .text            executeWait__8daE_WW_cFv */
 void daE_WW_c::executeWait() {
     switch (mActionMode) {
     case ACTION_MODE_0:
@@ -868,7 +841,6 @@ void daE_WW_c::executeWait() {
     }
 }
 
-/* 807E99B8-807E9C1C 0023B8 0264+00 1/1 0/0 0/0 .text            calcJumpSpeed__8daE_WW_cFv */
 int daE_WW_c::calcJumpSpeed() {
     f32 var_f31 = field_0x65c.y - current.pos.y;
     int var_r28 = 0;
@@ -898,7 +870,6 @@ int daE_WW_c::calcJumpSpeed() {
     return var_r29; // Jump speed ?
 }
 
-/* 807E9C1C-807EA474 00261C 0858+00 2/1 0/0 0/0 .text            executeAttack__8daE_WW_cFv */
 void daE_WW_c::executeAttack() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     
@@ -1083,7 +1054,6 @@ void daE_WW_c::executeAttack() {
     cLib_addCalcAngleS(&shape_angle.x, cM_atan2s(speedF, speed.y) - 0x4000, 4, 0x800, 0x200);
 }
 
-/* 807EA474-807EA870 002E74 03FC+00 2/2 0/0 0/0 .text            checkAttackStart__8daE_WW_cFv */
 bool daE_WW_c::checkAttackStart() {
     if (field_0x734 == 0) {
         camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -1117,7 +1087,6 @@ bool daE_WW_c::checkAttackStart() {
     return 0;
 }
 
-/* 807EA870-807EB650 003270 0DE0+00 1/1 0/0 0/0 .text            executeChase__8daE_WW_cFv */
 void daE_WW_c::executeChase() {
     s16 sp8;
     cXyz sp28 = daPy_getPlayerActorClass()->current.pos;
@@ -1394,7 +1363,6 @@ void daE_WW_c::executeChase() {
     cLib_addCalcAngleS(&shape_angle.x, 0, 8, 0x400, 0x100);
 }
 
-/* 807EB650-807EB964 004050 0314+00 1/1 0/0 0/0 .text            executeDamage__8daE_WW_cFv */
 void daE_WW_c::executeDamage() {
     if (health <= 0) {
         field_0x724 = 5;
@@ -1480,7 +1448,6 @@ void daE_WW_c::executeDamage() {
     }
 }
 
-/* 807EB964-807EBAE0 004364 017C+00 3/3 0/0 0/0 .text            checkMoveOut__8daE_WW_cFv */
 bool daE_WW_c::checkMoveOut() {
     if (field_0x668.absXZ(current.pos) > field_0x6a8) {
         setActionMode(ACTION_MOVE_OUT, ACTION_MODE_0);
@@ -1490,7 +1457,6 @@ bool daE_WW_c::checkMoveOut() {
     return false;
 }
 
-/* 807EBAE0-807EC940 0044E0 0E60+00 2/1 0/0 0/0 .text            executeMoveOut__8daE_WW_cFv */
 void daE_WW_c::executeMoveOut() {
     cXyz sp3c = daPy_getPlayerActorClass()->current.pos;
 
@@ -1635,7 +1601,6 @@ void daE_WW_c::executeMoveOut() {
     }
 }
 
-/* 807EC940-807ECE58 005340 0518+00 2/2 0/0 0/0 .text            checkWalkStart__8daE_WW_cFv */
 bool daE_WW_c::checkWalkStart() {
     if (field_0x6b4 != 0) {
         return false;
@@ -1730,7 +1695,6 @@ bool daE_WW_c::checkWalkStart() {
     return false;
 }
 
-/* 807ECE58-807ED674 005858 081C+00 1/1 0/0 0/0 .text            executeWalk__8daE_WW_cFv */
 void daE_WW_c::executeWalk() {
     f32 fVar1 = daPy_getPlayerActorClass()->current.pos.absXZ(current.pos);
 
@@ -1829,7 +1793,6 @@ void daE_WW_c::executeWalk() {
     }
 }
 
-/* 807ED674-807ED78C 006074 0118+00 1/1 0/0 0/0 .text            eWW_posMoveF__8daE_WW_cFv */
 void daE_WW_c::eWW_posMoveF() {
     if (field_0x75b != 0 && speed.y < 0.0f && mObjAcch.ChkGroundHit()) {
         field_0x75b = 0;
@@ -1860,7 +1823,6 @@ void daE_WW_c::eWW_posMoveF() {
     speedF = temp_f31;
 }
 
-/* 807ED78C-807EDA78 00618C 02EC+00 2/1 0/0 0/0 .text            action__8daE_WW_cFv */
 void daE_WW_c::action() {
     field_0x75a = 0;
     setGroundAngle();
@@ -1941,7 +1903,6 @@ void daE_WW_c::action() {
     }
 }
 
-/* 807EDA78-807EDB00 006478 0088+00 1/1 0/0 0/0 .text            mtx_set__8daE_WW_cFv */
 void daE_WW_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x674);
@@ -1953,7 +1914,6 @@ void daE_WW_c::mtx_set() {
     mpModelMorf->modelCalc();
 }
 
-/* 807EDB00-807EDCC4 006500 01C4+00 1/1 0/0 0/0 .text            cc_set__8daE_WW_cFv */
 void daE_WW_c::cc_set() {
     cXyz sp8;
     if (mAction != ACTION_MASTER) {
@@ -1983,7 +1943,6 @@ void daE_WW_c::cc_set() {
     }
 }
 
-/* 807EDCC4-807EDE6C 0066C4 01A8+00 1/1 0/0 0/0 .text            execute__8daE_WW_cFv */
 int daE_WW_c::execute() {
     if (field_0x728 != 0) {
         field_0x728--;
@@ -2038,12 +1997,10 @@ int daE_WW_c::execute() {
     return 1;
 }
 
-/* 807EDE6C-807EDE8C 00686C 0020+00 2/1 0/0 0/0 .text            daE_WW_Execute__FP8daE_WW_c */
 static int daE_WW_Execute(daE_WW_c* i_this) {
     return i_this->execute();
 }
 
-/* 807EDE8C-807EE438 00688C 05AC+00 2/2 0/0 0/0 .text            calcMoveDir__8daE_WW_cFPss */
 bool daE_WW_c::calcMoveDir(s16* param_1, s16 param_2) {
     dBgS_LinChk lin_chk;
     cM3dGPla plane;
@@ -2168,12 +2125,10 @@ bool daE_WW_c::calcMoveDir(s16* param_1, s16 param_2) {
     return false;
 }
 
-/* 807EE438-807EE440 006E38 0008+00 1/0 0/0 0/0 .text            daE_WW_IsDelete__FP8daE_WW_c */
 static int daE_WW_IsDelete(daE_WW_c* i_this) {
     return 1;
 }
 
-/* 807EE440-807EE4B4 006E40 0074+00 1/1 0/0 0/0 .text            _delete__8daE_WW_cFv */
 int daE_WW_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_WW");
     if (field_0xec4 != 0) {
@@ -2188,13 +2143,11 @@ int daE_WW_c::_delete() {
     return 1;
 }
 
-/* 807EE4B4-807EE4D4 006EB4 0020+00 1/0 0/0 0/0 .text            daE_WW_Delete__FP8daE_WW_c */
 static int daE_WW_Delete(daE_WW_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "E_WW");
     return static_cast<daE_WW_c*>(i_this)->_delete();
 }
 
-/* 807EE4D4-807EE61C 006ED4 0148+00 1/1 0/0 0/0 .text            CreateHeap__8daE_WW_cFv */
 int daE_WW_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_WW", BMDR_WW);
 
@@ -2216,13 +2169,11 @@ int daE_WW_c::CreateHeap() {
     return 1;
 }
 
-/* 807EE61C-807EE63C 00701C 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daE_WW_c* a_this = (daE_WW_c*) i_this;
     return a_this->CreateHeap();
 }
 
-/* 807EE63C-807EEB38 00703C 04FC+00 1/1 0/0 0/0 .text            create__8daE_WW_cFv */
 int daE_WW_c::create() {
     fopAcM_ct(this, daE_WW_c);
 
@@ -2343,12 +2294,10 @@ int daE_WW_c::create() {
     return phase_state;
 }
 
-/* 807EEE54-807EEE74 007854 0020+00 1/0 0/0 0/0 .text            daE_WW_Create__FP8daE_WW_c */
 static int daE_WW_Create(daE_WW_c* i_this) {
     return static_cast<daE_WW_c*>(i_this)->create();
 }
 
-/* 807EFA80-807EFAA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_WW_Method */
 static actor_method_class l_daE_WW_Method = {
     (process_method_func)daE_WW_Create,
     (process_method_func)daE_WW_Delete,
@@ -2357,7 +2306,6 @@ static actor_method_class l_daE_WW_Method = {
     (process_method_func)daE_WW_Draw,
 };
 
-/* 807EFAA0-807EFAD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_WW */
 extern actor_process_profile_definition g_profile_E_WW = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp
index 7e9ea8fd3b..2c99c9f10f 100644
--- a/src/d/actor/d_a_e_yc.cpp
+++ b/src/d/actor/d_a_e_yc.cpp
@@ -15,29 +15,23 @@
 #include "d/d_procname.h"
 #include "d/actor/d_a_e_rdy.h"
 
-/* 807F2B08-807F2B0C 000008 0004+00 4/4 0/0 0/0 .bss             S_area_dis */
 static f32 S_area_dis;
 
-/* 807F2B0C-807F2B10 00000C 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 807F2B1C-807F2B28 00001C 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daE_YC_HIO_c l_HIO;
 
-/* 807EFECC-807EFEF0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__12daE_YC_HIO_cFv */
 daE_YC_HIO_c::daE_YC_HIO_c() {
     field_0x4 = -1;
     mScale = 1.0f;
 }
 
-/* 807EFEF0-807EFF9C 000110 00AC+00 5/5 0/0 0/0 .text            anm_init__FP10e_yc_classifUcf */
 static void anm_init(e_yc_class* i_this, int i_anmID, f32 i_morf, u8 i_attr, f32 i_rate) {
     J3DAnmTransform* anm = static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("E_yc", i_anmID));
     i_this->mpMorf->setAnm(anm, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_anmID;
 }
 
-/* 807EFF9C-807F00BC 0001BC 0120+00 1/0 0/0 0/0 .text            daE_YC_Draw__FP10e_yc_class */
 static int daE_YC_Draw(e_yc_class* i_this) {
     if (i_this->mNoDrawFlag) {
         return 1;
@@ -60,7 +54,6 @@ static int daE_YC_Draw(e_yc_class* i_this) {
     return 1;
 }
 
-/* 807F00BC-807F01AC 0002DC 00F0+00 1/1 0/0 0/0 .text            damage_check__FP10e_yc_class */
 static void damage_check(e_yc_class* i_this) {
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
     i_this->mCcStts.Move();
@@ -79,7 +72,6 @@ static void damage_check(e_yc_class* i_this) {
     }
 }
 
-/* 807F01AC-807F06AC 0003CC 0500+00 2/1 0/0 0/0 .text            e_yc_fly__FP10e_yc_class */
 static void e_yc_fly(e_yc_class* i_this) {
     fopAc_ac_c* base_rdy = fopAcM_SearchByID(i_this->mRiderID);
     e_rdy_class* rider = (e_rdy_class*) base_rdy;
@@ -196,7 +188,6 @@ static void e_yc_fly(e_yc_class* i_this) {
     cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, accel);
 }
 
-/* 807F06AC-807F0AA0 0008CC 03F4+00 1/1 0/0 0/0 .text            e_yc_f_fly__FP10e_yc_class */
 static void e_yc_f_fly(e_yc_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     int frame = i_this->mpMorf->getFrame();
@@ -278,7 +269,6 @@ static void e_yc_f_fly(e_yc_class* i_this) {
     cLib_addCalc2(&i_this->speedF, 25.0f, 1.0f, 1.0f);
 }
 
-/* 807F0AA0-807F0C40 000CC0 01A0+00 1/1 0/0 0/0 .text            e_yc_hovering__FP10e_yc_class */
 static void e_yc_hovering(e_yc_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     f32 target_speed = 0.0f;
@@ -317,7 +307,6 @@ static void e_yc_hovering(e_yc_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.z, 0, 4, 0x800);
 }
 
-/* 807F0C40-807F1218 000E60 05D8+00 2/1 0/0 0/0 .text            e_yc_attack__FP10e_yc_class */
 static void e_yc_attack(e_yc_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz delta;
@@ -437,7 +426,6 @@ static void e_yc_attack(e_yc_class* i_this) {
     }
 }
 
-/* 807F1218-807F165C 001438 0444+00 1/1 0/0 0/0 .text            e_yc_wolfbite__FP10e_yc_class */
 static void e_yc_wolfbite(e_yc_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -529,7 +517,6 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
     cLib_addCalcAngleS2(&_this->current.angle.y, player->shape_angle.y + 0x8000, 2, 0x1000);
 }
 
-/* 807F165C-807F1AD4 00187C 0478+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_yc_class */
 static void anm_se_set(e_yc_class* i_this) {
     if ((i_this->mAnm == e_yc_class::ANM_FLY && i_this->mpMorf->checkFrame(28.0f))
         || (i_this->mAnm == e_yc_class::ANM_CATCH_START && i_this->mpMorf->checkFrame(27.0f))
@@ -568,7 +555,6 @@ static void anm_se_set(e_yc_class* i_this) {
     }
 }
 
-/* 807F1AD4-807F1CE4 001CF4 0210+00 2/1 0/0 0/0 .text            action__FP10e_yc_class */
 static void action(e_yc_class* i_this) {
     cXyz vec1, vec2;
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
@@ -626,7 +612,6 @@ static void action(e_yc_class* i_this) {
     _this->old.pos.y += 200.0f;
 }
 
-/* 807F1CE4-807F2234 001F04 0550+00 2/1 0/0 0/0 .text            daE_YC_Execute__FP10e_yc_class */
 static int daE_YC_Execute(e_yc_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz vec1, vec2;
@@ -735,12 +720,10 @@ static int daE_YC_Execute(e_yc_class* i_this) {
     return 1;
 }
 
-/* 807F2234-807F223C 002454 0008+00 1/0 0/0 0/0 .text            daE_YC_IsDelete__FP10e_yc_class */
 static int daE_YC_IsDelete(e_yc_class* i_this) {
     return 1;
 }
 
-/* 807F223C-807F22A4 00245C 0068+00 1/0 0/0 0/0 .text            daE_YC_Delete__FP10e_yc_class */
 static int daE_YC_Delete(e_yc_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_yc");
 
@@ -755,7 +738,6 @@ static int daE_YC_Delete(e_yc_class* i_this) {
     return 1;
 }
 
-/* 807F22A4-807F239C 0024C4 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_yc_class* _this = static_cast<e_yc_class*>(i_this);
 
@@ -770,7 +752,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 807F239C-807F26BC 0025BC 0320+00 1/0 0/0 0/0 .text            daE_YC_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) {
     e_yc_class* _this = static_cast<e_yc_class*>(i_this);
     fopAcM_ct(i_this, e_yc_class);
@@ -845,7 +826,6 @@ static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 807F2A68-807F2A88 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YC_Method */
 static actor_method_class l_daE_YC_Method = {
     (process_method_func)daE_YC_Create,
     (process_method_func)daE_YC_Delete,
@@ -854,7 +834,6 @@ static actor_method_class l_daE_YC_Method = {
     (process_method_func)daE_YC_Draw,
 };
 
-/* 807F2A88-807F2AB8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YC */
 extern actor_process_profile_definition g_profile_E_YC = {
     fpcLy_CURRENT_e,
     4,
diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp
index 3486cdab30..8915a350eb 100644
--- a/src/d/actor/d_a_e_yd.cpp
+++ b/src/d/actor/d_a_e_yd.cpp
@@ -28,7 +28,6 @@ public:
 
 STATIC_ASSERT(sizeof(daE_YD_HIO_c) == 0x1c);
 
-/* 807F2C2C-807F2C78 0000EC 004C+00 1/1 0/0 0/0 .text __ct__12daE_YD_HIO_cFv */
 daE_YD_HIO_c::daE_YD_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.0f;
@@ -39,7 +38,6 @@ daE_YD_HIO_c::daE_YD_HIO_c() {
     field_0x18 = 1;
 }
 
-/* 807F2C78-807F2E20 000138 01A8+00 1/1 0/0 0/0 .text            yd_disappear__FP10e_yd_class */
 static void yd_disappear(e_yd_class* i_this) {
     cXyz particleScale(1.5f, 1.5f, 1.5f);
     dComIfGp_particle_set(0x826c, &i_this->actor.current.pos, NULL, &particleScale);
@@ -58,15 +56,12 @@ static void yd_disappear(e_yd_class* i_this) {
     }
 }
 
-/* 807F2E20-807F2ECC 0002E0 00AC+00 8/8 0/0 0/0 .text            anm_init__FP10e_yd_classifUcf */
 static void anm_init(e_yd_class* i_this, int param_1, f32 param_2, u8 param_3, f32 param_4) {
     J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("E_yd", param_1);
     i_this->mpMorf->setAnm(anmTransform, param_3, param_2, param_4, 0.0f, -1.0f);
     i_this->field_0x664 = param_1;
 }
 
-/* 807F2ECC-807F2FA4 00038C 00D8+00 8/8 0/0 0/0 .text            leaf_anm_init__FP10e_yd_classifUcf
- */
 static s32 leaf_anm_init(e_yd_class* i_this, int param_1, f32 param_2, u8 param_3, f32 param_4) {
     e_yd_leaf_class* leaf = (e_yd_leaf_class*)fopAcM_SearchByID(i_this->mLeafId);
     if (leaf != NULL) {
@@ -78,7 +73,6 @@ static s32 leaf_anm_init(e_yd_class* i_this, int param_1, f32 param_2, u8 param_
     return false;
 }
 
-/* 807F2FA4-807F3168 000464 01C4+00 1/0 0/0 0/0 .text            daE_YD_Draw__FP10e_yd_class */
 static s32 daE_YD_Draw(e_yd_class* i_this) {
     static GXColor l_color = { 0x14, 0x0F, 0x00, 0xFF };
 
@@ -111,7 +105,6 @@ static s32 daE_YD_Draw(e_yd_class* i_this) {
     return 1;
 }
 
-/* 807F3168-807F31C0 000628 0058+00 2/2 0/0 0/0 .text            pl_check__FP10e_yd_classf */
 static s32 pl_check(e_yd_class* i_this, f32 param_2) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (i_this->mHomeDistFromPlayer < param_2 &&
@@ -122,7 +115,6 @@ static s32 pl_check(e_yd_class* i_this, f32 param_2) {
     return false;
 }
 
-/* 807F31C0-807F342C 000680 026C+00 1/1 0/0 0/0 .text            damage_check__FP10e_yd_class */
 static void damage_check(e_yd_class* i_this) {
     fopAc_ac_c* pfVar1 = dComIfGp_getPlayer(0);
     if (i_this->field_0x69c[3] == 0) {
@@ -197,13 +189,10 @@ static void damage_check(e_yd_class* i_this) {
     }
 }
 
-/* 807F7D68-807F7D6C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_807F7D68;
 
-/* 807F7D78-807F7D94 000018 001C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_YD_HIO_c l_HIO;
 
-/* 807F342C-807F3784 0008EC 0358+00 1/1 0/0 0/0 .text            e_yd_stay__FP10e_yd_class */
 static void e_yd_stay(e_yd_class* i_this) {
     i_this->field_0x69c[3] = 0xf;
 
@@ -261,7 +250,6 @@ static void e_yd_stay(e_yd_class* i_this) {
     }
 }
 
-/* 807F3784-807F3A44 000C44 02C0+00 1/1 0/0 0/0 .text            e_yd_appear__FP10e_yd_class */
 static void e_yd_appear(e_yd_class* i_this) {
     s32 frame = i_this->mpMorf->getFrame();
     switch (i_this->field_0x670) {
@@ -306,7 +294,6 @@ static void e_yd_appear(e_yd_class* i_this) {
     cLib_addCalc2(&i_this->field_0x698, l_HIO.field_0x10, 1.0f, 0.1f);
 }
 
-/* 807F3A44-807F3C10 000F04 01CC+00 1/1 0/0 0/0 .text            e_yd_appear_v__FP10e_yd_class */
 static void e_yd_appear_v(e_yd_class* i_this) {
     cXyz local_34;
 
@@ -346,7 +333,6 @@ static void e_yd_appear_v(e_yd_class* i_this) {
     }
 }
 
-/* 807F3C10-807F4158 0010D0 0548+00 1/1 0/0 0/0 .text            e_yd_wait__FP10e_yd_class */
 static void e_yd_wait(e_yd_class* i_this) {
     f32 fVar6 = TREG_F(12) + 30.0f;
     if ((i_this->field_0x66c & 0xf) == 0 && cM_rndF(1.0f) < 0.75f) {
@@ -433,7 +419,6 @@ static void e_yd_wait(e_yd_class* i_this) {
     }
 }
 
-/* 807F4158-807F4BB8 001618 0A60+00 1/1 0/0 0/0 .text            e_yd_attack__FP10e_yd_class */
 static void e_yd_attack(e_yd_class* i_this) {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->actor;
 
@@ -629,7 +614,6 @@ static void e_yd_attack(e_yd_class* i_this) {
     }
 }
 
-/* 807F4BB8-807F4EB8 002078 0300+00 1/1 0/0 0/0 .text            e_yd_chance__FP10e_yd_class */
 static void e_yd_chance(e_yd_class* i_this) {
     switch (i_this->field_0x670) {
     case 0:
@@ -689,7 +673,6 @@ static void e_yd_chance(e_yd_class* i_this) {
     cLib_addCalc2(&i_this->field_0x84c, 0.5f + JREG_F(4), 1.0f, 0.05f);
 }
 
-/* 807F4EB8-807F5110 002378 0258+00 1/1 0/0 0/0 .text            e_yd_s_damage__FP10e_yd_class */
 static void e_yd_s_damage(e_yd_class* i_this) {
     cXyz unkXyz1;
     switch (i_this->field_0x670) {
@@ -739,7 +722,6 @@ static void e_yd_s_damage(e_yd_class* i_this) {
     }
 }
 
-/* 807F5110-807F54F0 0025D0 03E0+00 1/1 0/0 0/0 .text            e_yd_damage__FP10e_yd_class */
 static void e_yd_damage(e_yd_class* i_this) {
     cXyz unkXyz1;
     switch (i_this->field_0x670) {
@@ -802,7 +784,6 @@ static void e_yd_damage(e_yd_class* i_this) {
     }
 }
 
-/* 807F54F0-807F5820 0029B0 0330+00 1/1 0/0 0/0 .text            kuki_control1__FP10e_yd_class */
 static void kuki_control1(e_yd_class* i_this) {
     fopEn_enemy_c* enemy = &i_this->actor;
     cXyz stack_38;
@@ -887,7 +868,6 @@ static void kuki_control1(e_yd_class* i_this) {
     }
 }
 
-/* 807F5820-807F5994 002CE0 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10e_yd_class */
 static void kuki_control2(e_yd_class* i_this) {
     i_this->mJointPositions[11] = i_this->actor.current.pos;
 
@@ -928,7 +908,6 @@ static f32 dummy_4710() {
     return -200.0f;
 }
 
-/* 807F5994-807F5A70 002E54 00DC+00 1/1 0/0 0/0 .text            kuki_control3__FP10e_yd_class */
 static void kuki_control3(e_yd_class* i_this) {
     cXyz base = i_this->mJointPositions[0] - i_this->actor.home.pos;
     cXyz* vec = &i_this->mJointPositions[0];
@@ -954,7 +933,6 @@ static f32 dummy_4864() {
     return -5.0f;
 }
 
-/* 807F5A70-807F5B5C 002F30 00EC+00 1/1 0/0 0/0 .text            kuki_ha_set__FP10e_yd_class */
 static void kuki_ha_set(e_yd_class* i_this) {
     cXyz* pos = &i_this->mJointPositions[0];
     csXyz* rot = &i_this->mJointRotations[0];
@@ -983,7 +961,6 @@ static void kuki_ha_set(e_yd_class* i_this) {
     }
 }
 
-/* 807F5B5C-807F613C 00301C 05E0+00 2/1 0/0 0/0 .text            action__FP10e_yd_class */
 static void action(e_yd_class* i_this) {
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)&i_this->actor;
 
@@ -1133,7 +1110,6 @@ static void action(e_yd_class* i_this) {
     setMidnaBindEffect(enemy, &i_this->mCreatureSound, &enemy->eyePos, &xyz);
 }
 
-/* 807F613C-807F64E0 0035FC 03A4+00 1/1 0/0 0/0 .text            eff_set__FP10e_yd_class */
 static void eff_set(e_yd_class* i_this) {
     static u16 p_name[3] = {
         0x8811,
@@ -1211,7 +1187,6 @@ static void eff_set(e_yd_class* i_this) {
     }
 }
 
-/* 807F64E0-807F6648 0039A0 0168+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_yd_class */
 static void anm_se_set(e_yd_class* i_this) {
     if (i_this->field_0x664 == 6) {
         if (i_this->mpMorf->checkFrame(22.0f) != 0) {
@@ -1232,7 +1207,6 @@ static void anm_se_set(e_yd_class* i_this) {
     }
 }
 
-/* 807F6648-807F694C 003B08 0304+00 2/1 0/0 0/0 .text            daE_YD_Execute__FP10e_yd_class */
 static int daE_YD_Execute(e_yd_class* i_this) {
     i_this->field_0x66c++;
 
@@ -1319,12 +1293,10 @@ static int daE_YD_Execute(e_yd_class* i_this) {
     return 1;
 }
 
-/* 807F694C-807F6954 003E0C 0008+00 1/0 0/0 0/0 .text            daE_YD_IsDelete__FP10e_yd_class */
 static int daE_YD_IsDelete(e_yd_class* i_this) {
     return 1;
 }
 
-/* 807F6954-807F69BC 003E14 0068+00 1/0 0/0 0/0 .text            daE_YD_Delete__FP10e_yd_class */
 static int daE_YD_Delete(e_yd_class* i_this) {
     dComIfG_resDelete(&i_this->field_0x5ac, "E_yd");
     if (i_this->field_0x1268 != 0) {
@@ -1336,7 +1308,6 @@ static int daE_YD_Delete(e_yd_class* i_this) {
     return 1;
 }
 
-/* 807F69BC-807F6C48 003E7C 028C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     f32 fVar10;
 
@@ -1387,7 +1358,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 807F6C90-807F7160 004150 04D0+00 1/0 0/0 0/0 .text            daE_YD_Create__FP10fopAc_ac_c */
 static int daE_YD_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp
index f3e017b1e8..31e26716a1 100644
--- a/src/d/actor/d_a_e_yd_leaf.cpp
+++ b/src/d/actor/d_a_e_yd_leaf.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_e_yd_leaf.h"
 #include "d/d_com_inf_game.h"
 
-/* 807F7E18-807F7EC0 000078 00A8+00 1/0 0/0 0/0 .text daE_YD_LEAF_Draw__FP15e_yd_leaf_class */
 static int daE_YD_LEAF_Draw(e_yd_leaf_class* i_this) {
     g_env_light.settingTevStruct(2, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpMorf->getModel(), &i_this->tevStr);
@@ -19,7 +18,6 @@ static int daE_YD_LEAF_Draw(e_yd_leaf_class* i_this) {
     return 1;
 }
 
-/* 807F7EC0-807F7FEC 000120 012C+00 2/1 0/0 0/0 .text daE_YD_LEAF_Execute__FP15e_yd_leaf_class */
 static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) {
     if (i_this->field_0x5ba == 0) {
         stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
@@ -45,18 +43,15 @@ static int daE_YD_LEAF_Execute(e_yd_leaf_class* i_this) {
     return 1;
 }
 
-/* 807F7FEC-807F7FF4 00024C 0008+00 1/0 0/0 0/0 .text daE_YD_LEAF_IsDelete__FP15e_yd_leaf_class */
 static int daE_YD_LEAF_IsDelete(e_yd_leaf_class* i_this) {
     return 1;
 }
 
-/* 807F7FF4-807F8024 000254 0030+00 1/0 0/0 0/0 .text daE_YD_LEAF_Delete__FP15e_yd_leaf_class */
 static int daE_YD_LEAF_Delete(e_yd_leaf_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "E_YD");
     return 1;
 }
 
-/* 807F8024-807F8124 000284 0100+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_yd_leaf_class* a_this = static_cast<e_yd_leaf_class*>(i_this);
 
@@ -70,8 +65,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 807F8124-807F81E0 000384 00BC+00 1/0 0/0 0/0 .text            daE_YD_LEAF_Create__FP10fopAc_ac_c
- */
 static int daE_YD_LEAF_Create(fopAc_ac_c* i_this) {
     e_yd_leaf_class* a_this = static_cast<e_yd_leaf_class*>(i_this);
     fopAcM_ct(a_this, e_yd_leaf_class);
@@ -95,14 +88,12 @@ static int daE_YD_LEAF_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 807F81FC-807F821C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YD_LEAF_Method */
 static actor_method_class l_daE_YD_LEAF_Method = {
     (process_method_func)daE_YD_LEAF_Create,  (process_method_func)daE_YD_LEAF_Delete,
     (process_method_func)daE_YD_LEAF_Execute, (process_method_func)daE_YD_LEAF_IsDelete,
     (process_method_func)daE_YD_LEAF_Draw,
 };
 
-/* 807F821C-807F824C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YD_LEAF */
 extern actor_process_profile_definition g_profile_E_YD_LEAF = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp
index 11ff0d52c4..e6303395b6 100644
--- a/src/d/actor/d_a_e_yg.cpp
+++ b/src/d/actor/d_a_e_yg.cpp
@@ -86,8 +86,8 @@ enum Action_Mode {
 
 class daE_YG_HIO_c : public JORReflexible {
 public:
-    /* 807F834C */ daE_YG_HIO_c();
-    /* 807FC168 */ virtual ~daE_YG_HIO_c() {}
+    daE_YG_HIO_c();
+    virtual ~daE_YG_HIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x04 */ s8 id;
@@ -98,7 +98,6 @@ public:
     /* 0x18 */ f32 pl_recognition_dist;
 };
 
-/* 807F834C-807F8394 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_YG_HIO_cFv */
 daE_YG_HIO_c::daE_YG_HIO_c() {
     id = -1;
     basic_size = 1.0f;
@@ -119,13 +118,11 @@ void daE_YG_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 807F8394-807F8440 000134 00AC+00 7/7 0/0 0/0 .text            anm_init__FP10e_yg_classifUcf */
 static void anm_init(e_yg_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_YG", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->mAnm = i_index;
 }
 
-/* 807F8440-807F848C 0001E0 004C+00 3/3 0/0 0/0 .text            pl_check__FP10e_yg_classf */
 static BOOL pl_check(e_yg_class* i_this, f32 i_dist) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -137,7 +134,6 @@ static BOOL pl_check(e_yg_class* i_this, f32 i_dist) {
     return FALSE;
 }
 
-/* 807F848C-807F8610 00022C 0184+00 1/0 0/0 0/0 .text            daE_YG_Draw__FP10e_yg_class */
 static int daE_YG_Draw(e_yg_class* i_this) {    
     if (i_this->mDispFlag) {
         return 1;
@@ -169,7 +165,6 @@ static int daE_YG_Draw(e_yg_class* i_this) {
     return 1;
 }
 
-/* 807F8610-807F86F8 0003B0 00E8+00 2/2 0/0 0/0 .text            sibuki_set__FP10e_yg_class */
 static void sibuki_set(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -191,10 +186,8 @@ static void sibuki_set(e_yg_class* i_this) {
 
 static bool l_initHIO;
 
-/* 807FD06C-807FD088 000054 001C+00 6/8 0/0 0/0 .bss             l_HIO */
 static daE_YG_HIO_c l_HIO;
 
-/* 807F86F8-807F8A68 000498 0370+00 1/1 0/0 0/0 .text            ms_disappear__FP10e_yg_class */
 static void ms_disappear(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz unused, prtcl_pos;
@@ -246,13 +239,10 @@ static void ms_disappear(e_yg_class* i_this) {
     }
 }
 
-/* 807FD0D4-807FD124 0000BC 0050+00 2/2 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[20];
 
-/* 807FD124-807FD128 00010C 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 807F8A68-807F8AE4 000808 007C+00 1/1 0/0 0/0 .text            s_d_sub__FPvPv */
 static void* s_d_sub(void* i_actor, void* i_data) {
     daObjCarry_c* actor = (daObjCarry_c*)i_actor;
     
@@ -264,7 +254,6 @@ static void* s_d_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 807F8AE4-807F8C60 000884 017C+00 1/1 0/0 0/0 .text            search_dokuro__FP10e_yg_class */
 static fopAc_ac_c* search_dokuro(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -304,7 +293,6 @@ static fopAc_ac_c* search_dokuro(e_yg_class* i_this) {
     return NULL;
 }
 
-/* 807F8C60-807F8DD8 000A00 0178+00 1/1 0/0 0/0 .text            way_set__FP10e_yg_class */
 static BOOL way_set(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz start, end, work;
@@ -339,7 +327,6 @@ static BOOL way_set(e_yg_class* i_this) {
     return FALSE;
 }
 
-/* 807F8DD8-807F9154 000B78 037C+00 1/1 0/0 0/0 .text            e_yg_normal__FP10e_yg_class */
 static s8 e_yg_normal(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     f32 target = 0.0f;
@@ -424,7 +411,6 @@ static s8 e_yg_normal(e_yg_class* i_this) {
     return rv;
 }
 
-/* 807F9154-807F94E8 000EF4 0394+00 2/1 0/0 0/0 .text            e_yg_attack__FP10e_yg_class */
 static s8 e_yg_attack(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     f32 target = 0.0f;
@@ -535,7 +521,6 @@ static s8 e_yg_attack(e_yg_class* i_this) {
     return rv;
 }
 
-/* 807F94E8-807F99CC 001288 04E4+00 1/1 0/0 0/0 .text            search_ground_1__FP10e_yg_class */
 static void search_ground_1(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -594,7 +579,6 @@ static void search_ground_1(e_yg_class* i_this) {
     }
 }
 
-/* 807F99D0-807F9BB8 001770 01E8+00 1/1 0/0 0/0 .text            e_yg_swim__FP10e_yg_class */
 static void e_yg_swim(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -646,7 +630,6 @@ static void e_yg_swim(e_yg_class* i_this) {
     }
 }
 
-/* 807F9BB8-807F9EF8 001958 0340+00 1/1 0/0 0/0 .text            e_yg_dokuro__FP10e_yg_class */
 static void e_yg_dokuro(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* skull_p = fopAcM_SearchByID(i_this->mSkullActorID);
@@ -702,7 +685,6 @@ static void e_yg_dokuro(e_yg_class* i_this) {
     }
 }
 
-/* 807F9EF8-807FA14C 001C98 0254+00 1/1 0/0 0/0 .text            e_yg_damage__FP10e_yg_class */
 static void e_yg_damage(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -757,7 +739,6 @@ static void e_yg_damage(e_yg_class* i_this) {
     }
 }
 
-/* 807FA14C-807FA284 001EEC 0138+00 1/1 0/0 0/0 .text            e_yg_wolfbite__FP10e_yg_class */
 static void e_yg_wolfbite(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -787,7 +768,6 @@ static void e_yg_wolfbite(e_yg_class* i_this) {
     }
 }
 
-/* 807FA284-807FA2E4 002024 0060+00 1/1 0/0 0/0 .text            e_yg_standby__FP10e_yg_class */
 static void e_yg_standby(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -800,7 +780,6 @@ static void e_yg_standby(e_yg_class* i_this) {
     }
 }
 
-/* 807FA2E4-807FA478 002084 0194+00 1/1 0/0 0/0 .text            damage_check__FP10e_yg_class */
 static void damage_check(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -851,7 +830,6 @@ static void damage_check(e_yg_class* i_this) {
     }
 }
 
-/* 807FA478-807FA7B0 002218 0338+00 1/1 0/0 0/0 .text ke_control__FP10e_yg_classP7yg_ke_sif */
 static void ke_control(e_yg_class* i_this, yg_ke_s* yg_p, int param_3, f32 i_posZ) {
     cXyz work, pos_offset;
     int i;
@@ -919,7 +897,6 @@ static void ke_control(e_yg_class* i_this, yg_ke_s* yg_p, int param_3, f32 i_pos
     }
 }
 
-/* 807FA7B0-807FA888 002550 00D8+00 1/1 0/0 0/0 .text ke_move__FP10e_yg_classP19mDoExt_3DlineMat0_cP7yg_ke_sif     */
 static void ke_move(e_yg_class* i_this, mDoExt_3DlineMat0_c* i_lineMat, yg_ke_s* yg_p, int i_idx, f32 i_posZ) {
     ke_control(i_this, yg_p, i_idx, i_posZ);
     cXyz* pos_p = i_lineMat->getPos(i_idx);
@@ -938,7 +915,6 @@ static void ke_move(e_yg_class* i_this, mDoExt_3DlineMat0_c* i_lineMat, yg_ke_s*
     }
 }
 
-/* 807FD1C4-807FD260 0001AC 009C+00 1/2 0/0 0/0 .bss             ke_p */
 static cXyz ke_p[13] = {
     cXyz(8.0f, 5.0f, 0.0f),
     cXyz(30.0f, 13.0f, 0.0f),
@@ -955,7 +931,6 @@ static cXyz ke_p[13] = {
     cXyz(40.0f, -2.0f, -10.0f),
 };
 
-/* 807FD2FC-807FD34C 0002E4 004E+02 1/2 0/0 0/0 .bss             ke_a */
 static csXyz ke_a[13] = {
     csXyz(0, 0, 5000),
     csXyz(0, 0, 3000),
@@ -972,7 +947,6 @@ static csXyz ke_a[13] = {
     csXyz(0, -20000, -5000),
 };
 
-/* 807FA888-807FAA34 002628 01AC+00 1/1 0/0 0/0 .text            ke_set__FP10e_yg_class */
 static void ke_set(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz work, unused;
@@ -1004,7 +978,6 @@ static void ke_set(e_yg_class* i_this) {
     }
 }
 
-/* 807FAA34-807FB034 0027D4 0600+00 2/1 0/0 0/0 .text            action__FP10e_yg_class */
 static void action(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1165,7 +1138,6 @@ static void action(e_yg_class* i_this) {
     cLib_addCalc2(&i_this->mCurrentPosYOffset, target, 0.4f, 5.0f);
 }
 
-/* 807FB034-807FB3FC 002DD4 03C8+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_yg_class */
 static void anm_se_set(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     s8 footnote_flag = false;
@@ -1220,7 +1192,6 @@ static void anm_se_set(e_yg_class* i_this) {
     }
 }
 
-/* 807FB3FC-807FB908 00319C 050C+00 2/1 0/0 0/0 .text            daE_YG_Execute__FP10e_yg_class */
 static int daE_YG_Execute(e_yg_class* i_this) {
     fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor;
     cXyz work, center, unused;
@@ -1322,12 +1293,10 @@ static int daE_YG_Execute(e_yg_class* i_this) {
     return 1;
 }
 
-/* 807FB908-807FB910 0036A8 0008+00 1/0 0/0 0/0 .text            daE_YG_IsDelete__FP10e_yg_class */
 static int daE_YG_IsDelete(e_yg_class* i_this) {
     return 1;
 }
 
-/* 807FB910-807FB978 0036B0 0068+00 1/0 0/0 0/0 .text            daE_YG_Delete__FP10e_yg_class */
 static int daE_YG_Delete(e_yg_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -1346,7 +1315,6 @@ static int daE_YG_Delete(e_yg_class* i_this) {
     return 1;
 }
 
-/* 807FB978-807FBA88 003718 0110+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_yg_class* i_this = (e_yg_class*)a_this;
 
@@ -1364,7 +1332,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 807FBA88-807FBE70 003828 03E8+00 1/0 0/0 0/0 .text            daE_YG_Create__FP10fopAc_ac_c */
 static cPhs__Step daE_YG_Create(fopAc_ac_c* actor) {
     e_yg_class* i_this = (e_yg_class*)actor;
 
@@ -1471,7 +1438,6 @@ static cPhs__Step daE_YG_Create(fopAc_ac_c* actor) {
 
 AUDIO_INSTANCES;
 
-/* 807FCF48-807FCF68 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YG_Method */
 static actor_method_class l_daE_YG_Method = {
     (process_method_func)daE_YG_Create,
     (process_method_func)daE_YG_Delete,
@@ -1480,7 +1446,6 @@ static actor_method_class l_daE_YG_Method = {
     (process_method_func)daE_YG_Draw,
 };
 
-/* 807FCF68-807FCF98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YG */
 extern actor_process_profile_definition g_profile_E_YG = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp
index 4b62175f17..8587424bf7 100644
--- a/src/d/actor/d_a_e_yh.cpp
+++ b/src/d/actor/d_a_e_yh.cpp
@@ -14,8 +14,8 @@
 
 class daE_YH_HIO_c : public JORReflexible {
 public:
-    /* 807FD4CC */ daE_YH_HIO_c();
-    /* 80803D48 */ virtual ~daE_YH_HIO_c() {}
+    daE_YH_HIO_c();
+    virtual ~daE_YH_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -27,7 +27,6 @@ public:
     /* 0x16 */ s16 mAttackFreq;
 };
 
-/* 807FD4CC-807FD514 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__12daE_YH_HIO_cFv */
 daE_YH_HIO_c::daE_YH_HIO_c() {
     mId = -1;
     mBasicSize = 1.0f;
@@ -53,7 +52,6 @@ void daE_YH_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 807FD514-807FD6BC 000134 01A8+00 2/2 0/0 0/0 .text            yh_disappear__FP10e_yh_class */
 static void yh_disappear(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz acStack_30;
@@ -75,14 +73,12 @@ static void yh_disappear(e_yh_class* i_this) {
     }
 }
 
-/* 807FD6BC-807FD768 0002DC 00AC+00 12/12 0/0 0/0 .text            anm_init__FP10e_yh_classifUcf */
 static void anm_init(e_yh_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_yd", param_2), param_4,
                            param_3, param_5, 0.0f, -1.0f);
     i_this->field_0x664 = param_2;
 }
 
-/* 807FD768-807FD840 000388 00D8+00 11/11 0/0 0/0 .text leaf_anm_init__FP10e_yh_classifUcf */
 static BOOL leaf_anm_init(e_yh_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
     e_yd_leaf_class* leaf = (e_yd_leaf_class*)fopAcM_SearchByID(i_this->mChildID);
     if (leaf != NULL) {
@@ -94,7 +90,6 @@ static BOOL leaf_anm_init(e_yh_class* i_this, int param_2, f32 param_3, u8 param
     return FALSE;
 }
 
-/* 807FD840-807FD9D8 000460 0198+00 1/0 0/0 0/0 .text            daE_YH_Draw__FP10e_yh_class */
 static int daE_YH_Draw(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -135,7 +130,6 @@ static int daE_YH_Draw(e_yh_class* i_this) {
     return 1;
 }
 
-/* 807FD9D8-807FDA24 0005F8 004C+00 2/2 0/0 0/0 .text            pl_check__FP10e_yh_classf */
 static BOOL pl_check(e_yh_class* i_this, f32 param_2) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -145,7 +139,6 @@ static BOOL pl_check(e_yh_class* i_this, f32 param_2) {
     return 0;
 }
 
-/* 807FDA24-807FDE6C 000644 0448+00 1/1 0/0 0/0 .text            damage_check__FP10e_yh_class */
 static void damage_check(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -284,13 +277,10 @@ static void damage_check(e_yh_class* i_this) {
     }
 }
 
-/* 80804718-8080471C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80804728-80804740 000018 0018+00 11/11 0/0 0/0 .bss             l_HIO */
 static daE_YH_HIO_c l_HIO;
 
-/* 807FDE6C-807FE1C4 000A8C 0358+00 1/1 0/0 0/0 .text            e_yh_stay__FP10e_yh_class */
 static void e_yh_stay(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz cStack_1c;
@@ -350,7 +340,6 @@ static void e_yh_stay(e_yh_class* i_this) {
     }
 }
 
-/* 807FE1C4-807FE484 000DE4 02C0+00 1/1 0/0 0/0 .text            e_yh_appear__FP10e_yh_class */
 static void e_yh_appear(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     f32 frame = i_this->mpMorf->getFrame();
@@ -405,7 +394,6 @@ static void e_yh_appear(e_yh_class* i_this) {
     cLib_addCalc2(&i_this->field_0x694, l_HIO.mDisplaySize, 1.0f, 0.1f);
 }
 
-/* 807FE484-807FE650 0010A4 01CC+00 1/1 0/0 0/0 .text            e_yh_appear_v__FP10e_yh_class */
 static void e_yh_appear_v(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -446,7 +434,6 @@ static void e_yh_appear_v(e_yh_class* i_this) {
     i_this->field_0xb18 = 1;
 }
 
-/* 807FE650-807FEBB0 001270 0560+00 1/1 0/0 0/0 .text            e_yh_wait__FP10e_yh_class */
 static void e_yh_wait(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_48;
@@ -541,7 +528,6 @@ static void e_yh_wait(e_yh_class* i_this) {
     }
 }
 
-/* 807FEBB0-807FEE0C 0017D0 025C+00 1/1 0/0 0/0 .text            e_yh_mk_roof__FP10e_yh_class */
 static void e_yh_mk_roof(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_34;
@@ -590,7 +576,6 @@ static void e_yh_mk_roof(e_yh_class* i_this) {
     a_this->shape_angle.z = 0;
 }
 
-/* 807FEE0C-807FF8DC 001A2C 0AD0+00 1/1 0/0 0/0 .text            e_yh_attack__FP10e_yh_class */
 static void e_yh_attack(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -811,7 +796,6 @@ static void e_yh_attack(e_yh_class* i_this) {
     }
 }
 
-/* 807FF8DC-807FFC38 0024FC 035C+00 1/1 0/0 0/0 .text            e_yh_attack_s__FP10e_yh_class */
 static void e_yh_attack_s(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -853,7 +837,6 @@ static void e_yh_attack_s(e_yh_class* i_this) {
     i_this->field_0xb18 = 1;
 }
 
-/* 807FFC38-807FFF38 002858 0300+00 1/1 0/0 0/0 .text            e_yh_chance__FP10e_yh_class */
 static void e_yh_chance(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -919,7 +902,6 @@ static void e_yh_chance(e_yh_class* i_this) {
     cLib_addCalc2(&i_this->field_0x848, 0.5f, 1.0f, 0.05f);
 }
 
-/* 807FFF38-80800174 002B58 023C+00 1/1 0/0 0/0 .text            e_yh_s_damage__FP10e_yh_class */
 static void e_yh_s_damage(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_20;
@@ -973,7 +955,6 @@ static void e_yh_s_damage(e_yh_class* i_this) {
     }
 }
 
-/* 80800174-8080056C 002D94 03F8+00 1/1 0/0 0/0 .text            e_yh_damage__FP10e_yh_class */
 static void e_yh_damage(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_34;
@@ -1050,7 +1031,6 @@ static void e_yh_damage(e_yh_class* i_this) {
     }
 }
 
-/* 8080056C-808008C8 00318C 035C+00 1/1 0/0 0/0 .text            kuki_control1__FP10e_yh_class */
 static void kuki_control1(e_yh_class* i_this) {
     static s16 pow_xa[11] = {
         0x0000,
@@ -1147,7 +1127,6 @@ static void kuki_control1(e_yh_class* i_this) {
     }
 }
 
-/* 808008C8-80800A3C 0034E8 0174+00 1/1 0/0 0/0 .text            kuki_control2__FP10e_yh_class */
 static void kuki_control2(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_58;
@@ -1190,7 +1169,6 @@ static void kuki_control2(e_yh_class* i_this) {
     }
 }
 
-/* 80800A3C-80800B18 00365C 00DC+00 1/1 0/0 0/0 .text            kuki_control3__FP10e_yh_class */
 static void kuki_control3(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz cStack_40;
@@ -1205,7 +1183,6 @@ static void kuki_control3(e_yh_class* i_this) {
     }
 }
 
-/* 80800B18-80800C40 003738 0128+00 1/1 0/0 0/0 .text            kuki_ha_set__FP10e_yh_class */
 static void kuki_ha_set(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz* pPos = i_this->field_0x6a0;
@@ -1229,7 +1206,6 @@ static void kuki_ha_set(e_yh_class* i_this) {
     }
 }
 
-/* 80800C40-80800F44 003860 0304+00 1/1 0/0 0/0 .text            kuki_control1_e__FP10e_yh_class */
 static void kuki_control1_e(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_c8;
@@ -1306,7 +1282,6 @@ static void kuki_control1_e(e_yh_class* i_this) {
     }
 }
 
-/* 80800F44-80801D10 003B64 0DCC+00 2/1 0/0 0/0 .text            e_yh_escape__FP10e_yh_class */
 static s8 e_yh_escape(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1596,7 +1571,6 @@ static s8 e_yh_escape(e_yh_class* i_this) {
     return local_115;
 }
 
-/* 80801D10-808021D8 004930 04C8+00 1/1 0/0 0/0 .text            e_yh_e_dead__FP10e_yh_class */
 static void e_yh_e_dead(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz local_a0;
@@ -1712,7 +1686,6 @@ static void e_yh_e_dead(e_yh_class* i_this) {
     }
 }
 
-/* 808021D8-8080285C 004DF8 0684+00 2/1 0/0 0/0 .text            action__FP10e_yh_class */
 static void action(e_yh_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1886,7 +1859,6 @@ static void action(e_yh_class* i_this) {
     setMidnaBindEffect(a_this, &i_this->mSound, &a_this->eyePos, &scale);
 }
 
-/* 8080285C-80802C30 00547C 03D4+00 1/1 0/0 0/0 .text            eff_set__FP10e_yh_class */
 static void eff_set(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     
@@ -1971,7 +1943,6 @@ static void eff_set(e_yh_class* i_this) {
     }
 }
 
-/* 80802C30-80802D98 005850 0168+00 1/1 0/0 0/0 .text            anm_se_set__FP10e_yh_class */
 static void anm_se_set(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     
@@ -1994,7 +1965,6 @@ static void anm_se_set(e_yh_class* i_this) {
     }
 }
 
-/* 80802D98-80803178 0059B8 03E0+00 2/1 0/0 0/0 .text            daE_YH_Execute__FP10e_yh_class */
 static int daE_YH_Execute(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz cStack_34;
@@ -2081,12 +2051,10 @@ static int daE_YH_Execute(e_yh_class* i_this) {
     return 1;
 }
 
-/* 80803178-80803180 005D98 0008+00 1/0 0/0 0/0 .text            daE_YH_IsDelete__FP10e_yh_class */
 static int daE_YH_IsDelete(e_yh_class* i_this) {
     return 1;
 }
 
-/* 80803180-808031E8 005DA0 0068+00 1/0 0/0 0/0 .text            daE_YH_Delete__FP10e_yh_class */
 static int daE_YH_Delete(e_yh_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAcM_RegisterDeleteID(a_this, "E_YH");
@@ -2103,7 +2071,6 @@ static int daE_YH_Delete(e_yh_class* i_this) {
     return 1;
 }
 
-/* 808031E8-80803474 005E08 028C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     e_yh_class* i_this = (e_yh_class*)a_this;
     i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_yd", 0x18), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_yd", 0x13), 2, 1.0, 0, -1, &i_this->mSound,
@@ -2148,7 +2115,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 808034BC-808039DC 0060DC 0520+00 1/0 0/0 0/0 .text            daE_YH_Create__FP10fopAc_ac_c */
 static int daE_YH_Create(fopAc_ac_c* a_this) {
     e_yh_class* i_this = (e_yh_class*)a_this;
     fopAcM_ct(a_this, e_yh_class);
@@ -2279,7 +2245,6 @@ static int daE_YH_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 80804634-80804654 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YH_Method */
 static actor_method_class l_daE_YH_Method = {
     (process_method_func)daE_YH_Create,
     (process_method_func)daE_YH_Delete,
@@ -2288,7 +2253,6 @@ static actor_method_class l_daE_YH_Method = {
     (process_method_func)daE_YH_Draw,
 };
 
-/* 80804654-80804684 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YH */
 extern actor_process_profile_definition g_profile_E_YH = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp
index 4111f56537..afab19879f 100644
--- a/src/d/actor/d_a_e_yk.cpp
+++ b/src/d/actor/d_a_e_yk.cpp
@@ -22,8 +22,8 @@
  */
 class daE_YK_HIO_c : public JORReflexible {
 public:
-    /* 8080482C */ daE_YK_HIO_c();
-    /* 808077E0 */ virtual ~daE_YK_HIO_c() {}
+    daE_YK_HIO_c();
+    virtual ~daE_YK_HIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x00 */ // vtable
@@ -44,7 +44,6 @@ public:
  * - Attack range threshold
  * 
  */
-/* 8080482C-80804870 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__12daE_YK_HIO_cFv */
 daE_YK_HIO_c::daE_YK_HIO_c() {
     field_0x04 = -1;
     mModelScale = 1.0f;
@@ -54,10 +53,8 @@ daE_YK_HIO_c::daE_YK_HIO_c() {
     mChargeSpeed = 40.0f;   
 }
 
-/* 80807EF8-80807EFC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80807EF8;
 
-/* 80807F08-80807F24 000018 001C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daE_YK_HIO_c l_HIO;
 
 #ifdef DEBUG
@@ -80,7 +77,6 @@ void daE_YK_HIO_c::genMessage(JORMContext* ctx) {
  * Plays particle effects and sound when the Shadow Keese disappears.
  * Creates an item drop and handles switch activation if specified in parameters.
  */
-/* 80804870-808049E4 000130 0174+00 2/2 0/0 0/0 .text            yk_disappear__FP10e_yk_class */
 static void yk_disappear(e_yk_class* i_this) {
     cXyz pos(0.65f,0.65f,0.65f);
 
@@ -109,7 +105,6 @@ static void yk_disappear(e_yk_class* i_this) {
  * Sets up a new animation on the Shadow Keese's morph model using the specified parameters.
  * Updates the current resource index to track which animation is playing.
  */
-/* 808049E4-80804A90 0002A4 00AC+00 10/10 0/0 0/0 .text            anm_init__FP10e_yk_classifUcf */
 static void anm_init(e_yk_class* i_this, int i_resIdx, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_YK",i_resIdx), i_attr, i_morf, i_rate, 0.0f,-1.0f);
     i_this->mResIdx = i_resIdx;
@@ -133,7 +128,6 @@ static void anm_init(e_yk_class* i_this, int i_resIdx, f32 i_morf, u8 i_attr, f3
  * 4. Renders the model
  * 5. Restores normal rendering state
  */
-/* 80804A90-80804B38 000350 00A8+00 1/0 0/0 0/0 .text            daE_YK_Draw__FP10e_yk_class */
 static int daE_YK_Draw(e_yk_class* i_this) {
     J3DModel* model = i_this->mpMorfSO->getModel();
 
@@ -192,7 +186,6 @@ static void* shot_b_sub(void* i_actor, void* param_1) {
  * the Shadow Keese's view of potential targets. This affects targeting and
  * behavior decisions.
  */
-/* 80804BB0-80804C88 000470 00D8+00 1/1 0/0 0/0 .text other_bg_check__FP10e_yk_classP10fopAc_ac_c */
 static int other_bg_check(e_yk_class* i_this, fopAc_ac_c* i_actorP) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -230,7 +223,6 @@ static int other_bg_check(e_yk_class* i_this, fopAc_ac_c* i_actorP) {
  * 
  * Used by various states to determine when to transition to combat behaviors.
  */
-/* 80804C88-80804D38 000548 00B0+00 5/5 0/0 0/0 .text            pl_check__FP10e_yk_classfs */
 static int pl_check(e_yk_class* i_this, f32 i_distance, s16 i_angle) {
     if (i_distance >= 50000.0f) {
         return 1;
@@ -267,7 +259,6 @@ static int pl_check(e_yk_class* i_this, f32 i_distance, s16 i_angle) {
  * - Handles death state when health reaches 0
  * - Manages collision flags and status
  */
-/* 80804D38-80804F68 0005F8 0230+00 1/1 0/0 0/0 .text            damage_check__FP10e_yk_class */
 static void damage_check(e_yk_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -336,7 +327,6 @@ static void damage_check(e_yk_class* i_this) {
     }
 }
 
-/* 80807F24-80808023 000034 00FF+00 1/1 0/0 0/0 .bss             check_index$4191 */
 static u8 check_index[255];
 
 /**
@@ -358,7 +348,6 @@ static u8 check_index[255];
  * Used for path-following behavior to ensure keese can navigate around obstacles
  * and maintain valid flight paths.
  */
-/* 80804F68-808051D0 000828 0268+00 2/3 0/0 0/0 .text            path_check__FP10e_yk_class */
 static int path_check(e_yk_class* i_this) {
     if (i_this->mpPath) {
         dBgS_LinChk lin_chk;
@@ -446,7 +435,6 @@ static int path_check(e_yk_class* i_this) {
  * - Movement speed controlled by speedF member
  * - Uses matrix transformations for final velocity calculation
  */
-/* 808051D0-80805360 000A90 0190+00 5/5 0/0 0/0 .text            fly_move__FP10e_yk_class */
 static void fly_move(e_yk_class* i_this) {
     cXyz pos;
 
@@ -494,7 +482,6 @@ static void fly_move(e_yk_class* i_this) {
  * Will transition to FIGHT_FLY state if player comes within trigger range.
  * Uses smooth interpolation to maintain position and prevent jittering.
  */
-/* 80805360-808054A8 000C20 0148+00 1/1 0/0 0/0 .text            e_yk_roof__FP10e_yk_class */
 static void e_yk_roof(e_yk_class* i_this) {
     switch (i_this->mActionPhase) {
     case 0:
@@ -534,7 +521,6 @@ static void e_yk_roof(e_yk_class* i_this) {
  * - Phase 0: Initializes flying animation
  * - Phase 1: Maintains flight and plays random vocalizations
  */
-/* 808054A8-80805660 000D68 01B8+00 1/1 0/0 0/0 .text            e_yk_fight_fly__FP10e_yk_class */
 static void e_yk_fight_fly(e_yk_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -596,7 +582,6 @@ static void e_yk_fight_fly(e_yk_class* i_this) {
  * Movement is smoothly interpolated using cLib_addCalc2 for position and angle updates.
  * Random factors are used to create unpredictable but controlled movement patterns.
  */
-/* 80805660-808059BC 000F20 035C+00 1/1 0/0 0/0 .text            e_yk_fight__FP10e_yk_class */
 static void e_yk_fight(e_yk_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     s16 player_shape_angle_y = player->shape_angle.y;
@@ -688,7 +673,6 @@ static void e_yk_fight(e_yk_class* i_this) {
  * 
  * Uses HIO-configured charge speed and interpolated movement.
  */
-/* 808059BC-80805BB4 00127C 01F8+00 1/1 0/0 0/0 .text            e_yk_attack__FP10e_yk_class */
 static void e_yk_attack(e_yk_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     
@@ -759,7 +743,6 @@ static void e_yk_attack(e_yk_class* i_this) {
  * Transitions to FIGHT_FLY if player comes within trigger range.
  * Uses HIO-configured fly speed and cruise speed.
  */
-/* 80805BB4-80805DE0 001474 022C+00 1/1 0/0 0/0 .text            e_yk_fly__FP10e_yk_class */
 static void e_yk_fly(e_yk_class* i_this) {
     switch (i_this->mActionPhase) {
     case 0:
@@ -817,7 +800,6 @@ static void e_yk_fly(e_yk_class* i_this) {
  * 
  * Uses HIO-configured fly speed and smooth movement interpolation.
  */
-/* 80805DE0-80805FF0 0016A0 0210+00 1/1 0/0 0/0 .text            e_yk_return__FP10e_yk_class */
 static void e_yk_return(e_yk_class* i_this) {
     switch (i_this->mActionPhase) {
     case 0:
@@ -868,7 +850,6 @@ static void e_yk_return(e_yk_class* i_this) {
  * 
  * Uses HIO-configured fly speed and handles multi-room paths.
  */
-/* 80805FF0-80806308 0018B0 0318+00 1/1 0/0 0/0 .text            e_yk_path_fly__FP10e_yk_class */
 static void e_yk_path_fly(e_yk_class* i_this) {
     switch (i_this->mActionPhase) {
     case 0:
@@ -948,7 +929,6 @@ static void e_yk_path_fly(e_yk_class* i_this) {
  * 
  * Applies gravity and smooth rotation interpolation while stunned.
  */
-/* 80806308-80806500 001BC8 01F8+00 1/1 0/0 0/0 .text            e_yk_chance__FP10e_yk_class */
 static void e_yk_chance(e_yk_class* i_this) {
     switch (i_this->mActionPhase) {
     case 0:
@@ -1022,7 +1002,6 @@ static void e_yk_chance(e_yk_class* i_this) {
  * 
  * Maintains constant forward speed when bouncing on ground.
  */
-/* 80806500-80806740 001DC0 0240+00 1/1 0/0 0/0 .text            e_yk_wolfbite__FP10e_yk_class */
 static void e_yk_wolfbite(e_yk_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     switch(i_this->mActionPhase) {
@@ -1103,7 +1082,6 @@ static void e_yk_wolfbite(e_yk_class* i_this) {
  * 
  * Continuously applies rotation around Y axis while in wind state.
  */
-/* 80806740-808068E4 002000 01A4+00 1/1 0/0 0/0 .text            e_yk_wind__FP10e_yk_class */
 static void e_yk_wind(e_yk_class* i_this) {
     e_yk_class* yk = (e_yk_class*)fpcM_Search(shot_b_sub,i_this);
     i_this->speedF = 0.0f;
@@ -1167,7 +1145,6 @@ static void e_yk_wind(e_yk_class* i_this) {
  * - Smooth angle interpolation
  * - Ground collision offset adjustments
  */
-/* 808068E4-80806B78 0021A4 0294+00 2/1 0/0 0/0 .text            action__FP10e_yk_class */
 static void action(e_yk_class* i_this) {
     cXyz pos;
     cXyz pos2;
@@ -1278,7 +1255,6 @@ static void action(e_yk_class* i_this) {
  * - Manages shadow and wing particle effects
  * - Updates collision sphere position and radius
  */
-/* 80806B78-8080708C 002438 0514+00 2/1 0/0 0/0 .text            daE_YK_Execute__FP10e_yk_class */
 static int daE_YK_Execute(e_yk_class* i_this) {
     fopEn_enemy_c* _this = static_cast<fopEn_enemy_c*>(i_this);
     cXyz pos, pos2;
@@ -1392,7 +1368,6 @@ static int daE_YK_Execute(e_yk_class* i_this) {
  * @param param_0 Pointer to the Shadow Keese actor instance
  * @return Always returns 1 to indicate deletion is allowed
  */
-/* 8080708C-80807094 00294C 0008+00 1/0 0/0 0/0 .text            daE_YK_IsDelete__FP10e_yk_class */
 static int daE_YK_IsDelete(e_yk_class* param_0) {
     return 1;
 }
@@ -1408,7 +1383,6 @@ static int daE_YK_IsDelete(e_yk_class* param_0) {
  * - Resets first spawn flag if this was the first instance
  * - Stops animation if heap exists
  */
-/* 80807094-808070FC 002954 0068+00 1/0 0/0 0/0 .text            daE_YK_Delete__FP10e_yk_class */
 static int daE_YK_Delete(e_yk_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase,"E_YK");
 
@@ -1434,7 +1408,6 @@ static int daE_YK_Delete(e_yk_class* i_this) {
  * - Sets up transform animations
  * - Configures creature parameters
  */
-/* 808070FC-808071F4 0029BC 00F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_yk_class* yk = (e_yk_class*)i_this;
 
@@ -1473,7 +1446,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
  * - Adjusts trigger distance for Phantom Zant fights
  * - Handles first spawn initialization
  */
-/* 808071F4-808075CC 002AB4 03D8+00 1/0 0/0 0/0 .text            daE_YK_Create__FP10fopAc_ac_c */
 static int daE_YK_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, e_yk_class);
     e_yk_class* yk = (e_yk_class*)i_this;
@@ -1577,7 +1549,6 @@ static int daE_YK_Create(fopAc_ac_c* i_this) {
     return phase_step;
 }
 
-/* 80807E30-80807E50 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YK_Method */
 static actor_method_class l_daE_YK_Method = {
     (process_method_func)daE_YK_Create,
     (process_method_func)daE_YK_Delete,
@@ -1586,7 +1557,6 @@ static actor_method_class l_daE_YK_Method = {
     (process_method_func)daE_YK_Draw,
 };
 
-/* 80807E50-80807E80 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YK */
 extern actor_process_profile_definition g_profile_E_YK = {
     fpcLy_CURRENT_e,         // mLayerID  
     7,                       // mListID
diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp
index be48a338fa..4ac0bf2da6 100644
--- a/src/d/actor/d_a_e_ym.cpp
+++ b/src/d/actor/d_a_e_ym.cpp
@@ -17,9 +17,9 @@
 
 class daE_YM_HIO_c {
 public:
-    /* 8080812C */ daE_YM_HIO_c();
+    daE_YM_HIO_c();
 
-    /* 80815458 */ virtual ~daE_YM_HIO_c() {}
+    virtual ~daE_YM_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mModelSize;
@@ -31,12 +31,6 @@ public:
     /* 0x20 */ f32 mMoveRange;
 };
 
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80815B3C-80815B7C 000038 0040+00 1/1 0/0 0/0 .data            cc_sph_src__6E_YM_n */
 dCcD_SrcSph E_YM_n::cc_sph_src = {
     {
         {0, {{0x400, 1, 13}, {0xD8FBFDFF, 3}, 0x75}},
@@ -52,10 +46,8 @@ dCcD_SrcSph E_YM_n::cc_sph_src = {
     }
 };
 
-/* 80815B7C-80815B84 000078 0008+00 0/0 0/0 0/0 .data            w_eff_id$5427 */
 static u16 w_eff_id[] = {0x01B8, 0x01B9, 0x01BA, 0x01BB}; // unused
 
-/* 8080812C-80808184 0000EC 0058+00 1/1 0/0 0/0 .text            __ct__12daE_YM_HIO_cFv */
 daE_YM_HIO_c::daE_YM_HIO_c() {
     field_0x4 = -1;
     mFlyMoveSpeed = 20.0f;
@@ -68,12 +60,10 @@ daE_YM_HIO_c::daE_YM_HIO_c() {
 }
 
 
-/* 80808184-808081E0 000144 005C+00 3/3 0/0 0/0 .text            checkBck__8daE_YM_cFPCci */
 u8 daE_YM_c::checkBck(char const* i_arcName, int i_resNo) {
     return mpMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resNo);
 }
 
-/* 808081E0-80808328 0001A0 0148+00 18/18 0/0 0/0 .text            bckSet__8daE_YM_cFiUcff */
 void daE_YM_c::bckSet(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) {
     int tm_res_id;
 
@@ -104,13 +94,11 @@ void daE_YM_c::bckSet(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) {
     }
 }
 
-/* 80808328-808083CC 0002E8 00A4+00 4/4 0/0 0/0 .text            bckSetFly__8daE_YM_cFiUcff */
 void daE_YM_c::bckSetFly(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) {
     mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_TM", i_resID), i_attribute,
                         i_morf, i_speed, 0.0f, -1.0f);
 }
 
-/* 808083CC-80808678 00038C 02AC+00 1/1 0/0 0/0 .text            draw__8daE_YM_cFv */
 int daE_YM_c::draw() {
     if (field_0x71d) {
         return 1;
@@ -179,25 +167,18 @@ int daE_YM_c::draw() {
     return 1;
 }
 
-/* 80808678-80808698 000638 0020+00 1/0 0/0 0/0 .text            daE_YM_Draw__FP8daE_YM_c */
 static int daE_YM_Draw(daE_YM_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80815D28-80815D2C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 lbl_253_bss_8;
 
-/* 80815D38-80815D5C 000018 0024+00 18/18 0/0 0/0 .bss             l_HIO */
 static daE_YM_HIO_c l_HIO;
 
-/* 80815D5C-80815D60 00003C 0004+00 3/3 0/0 0/0 .bss             m_near_obj */
 static fopAc_ac_c* m_near_obj;
 
-/* 80815D60-80815D64 000040 0004+00 3/3 0/0 0/0 .bss             m_obj_dist */
 static f32 m_obj_dist;
 
-/* 80808698-80808768 000658 00D0+00 2/2 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* param_0, void* param_1) {
     fopAc_ac_c* e_ym;
     fopAc_ac_c* near_obj;
@@ -221,7 +202,6 @@ static void* s_obj_sub(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80808768-80808884 000728 011C+00 1/1 0/0 0/0 .text            setDigEffect__8daE_YM_cFv */
 void daE_YM_c::setDigEffect() {
     cXyz sp1C(field_0x68c, field_0x68c, field_0x68c);
     cXyz sp28(current.pos);
@@ -231,7 +211,6 @@ void daE_YM_c::setDigEffect() {
     field_0xadc = dComIfGp_particle_set(field_0xadc, 0x83A9, &sp28, &shape_angle, &sp1C);
 }
 
-/* 80808884-808089DC 000844 0158+00 8/8 0/0 0/0 .text            setElecEffect1__8daE_YM_cFv */
 void daE_YM_c::setElecEffect1() {
     f32 fVar3 = (field_0x68c * 10.0f) / 6.0f;
     cXyz cStack_2c(fVar3, fVar3, fVar3);
@@ -250,7 +229,6 @@ void daE_YM_c::setElecEffect1() {
 }
 
 
-/* 808089DC-80808B3C 00099C 0160+00 9/9 0/0 0/0 .text            setElecEffect2__8daE_YM_cFv */
 void daE_YM_c::setElecEffect2() {
     f32 fVar3 = (field_0x68c * 10.0f) / 6.0f;
     cXyz cStack_2c(fVar3, fVar3, fVar3);
@@ -271,7 +249,6 @@ void daE_YM_c::setElecEffect2() {
 }
 
 
-/* 80808B3C-80808E34 000AFC 02F8+00 1/1 0/0 0/0 .text            setFireEffect__8daE_YM_cFv */
 void daE_YM_c::setFireEffect() {
     cXyz my_vec_0(1.0f, 1.0f, 1.0f);
     mParticleKeys[0] = dComIfGp_particle_set(mParticleKeys[0], 0x3ad, &current.pos, NULL,
@@ -302,7 +279,6 @@ void daE_YM_c::setFireEffect() {
     }
 }
 
-/* 80808E34-80809000 000DF4 01CC+00 3/3 0/0 0/0 .text            checkWallCrash__8daE_YM_cFv */
 bool daE_YM_c::checkWallCrash() {
     if (mType == 1 && (daPy_getPlayerActorClass()->checkFrontRollCrash() ||
                        daPy_getPlayerActorClass()->checkWolfAttackReverse()))
@@ -322,7 +298,6 @@ bool daE_YM_c::checkWallCrash() {
     return false;
 }
 
-/* 80809000-80809228 000FC0 0228+00 3/3 0/0 0/0 .text            checkWolfBark__8daE_YM_cFv */
 u8 daE_YM_c::checkWolfBark() {
     if (mType == 2) {
         return 0;
@@ -348,7 +323,6 @@ u8 daE_YM_c::checkWolfBark() {
     }
 }
 
-/* 80809228-8080963C 0011E8 0414+00 1/1 0/0 0/0 .text            checkSurpriseLock__8daE_YM_cFv */
 u8 daE_YM_c::checkSurpriseLock() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (mType == 2) {
@@ -408,7 +382,6 @@ u8 daE_YM_c::checkSurpriseLock() {
     return 0;
 }
 
-/* 8080963C-808096EC 0015FC 00B0+00 2/2 0/0 0/0 .text            checkRailSurprise__8daE_YM_cFv */
 u8 daE_YM_c::checkRailSurprise() {
     if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) {
         if (mDistToPlayer > 200.0f || (s16)cLib_distanceAngleS(mAngleToPlayer, shape_angle.y) > 0x2000) {
@@ -426,7 +399,6 @@ u8 daE_YM_c::checkRailSurprise() {
     return 1;
 }
 
-/* 808096EC-80809D6C 0016AC 0680+00 3/3 0/0 0/0 .text            checkSurpriseNear__8daE_YM_cFv */
 u8 daE_YM_c::checkSurpriseNear() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz my_vec_0;
@@ -524,13 +496,11 @@ u8 daE_YM_c::checkSurpriseNear() {
     return 0;
 }
 
-/* 80809D6C-80809D84 001D2C 0018+00 6/6 0/0 0/0 .text            setNormalCc__8daE_YM_cFv */
 void daE_YM_c::setNormalCc() {
     mSphCc.SetCoSPrm(0x75);
     mSphCc.SetTgType(0xD8FBFDFF);
 }
 
-/* 80809D84-80809DA8 001D44 0024+00 7/7 0/0 0/0 .text            setAppear__8daE_YM_cFv */
 void daE_YM_c::setAppear() {
     mIsHide = false;
 
@@ -541,7 +511,6 @@ void daE_YM_c::setAppear() {
     field_0x714 = 4;
 }
 
-/* 80809DA8-80809EF0 001D68 0148+00 8/8 0/0 0/0 .text            setMoveSound__8daE_YM_cFi */
 void daE_YM_c::setMoveSound(int param_0) {
     if (mFlyType == 1) {
         if (checkBck("E_TM", 10) == 0) {
@@ -560,14 +529,12 @@ void daE_YM_c::setMoveSound(int param_0) {
     }
 }
 
-/* 80809EF0-80809F9C 001EB0 00AC+00 3/3 0/0 0/0 .text            setTurnSound__8daE_YM_cFv */
 void daE_YM_c::setTurnSound() {
     if (mpMorf->checkFrame(1.0f) || mpMorf->checkFrame(5.0f) || mpMorf->checkFrame(9.0f)) {
         mSound.startCreatureSound(Z2SE_EN_YM_FOOTNOTE, 0, -1);
     }
 }
 
-/* 80809F9C-80809FC4 001F5C 0028+00 26/26 0/0 0/0 .text            setActionMode__8daE_YM_cFi */
 void daE_YM_c::setActionMode(int i_action) {
     mLastAction = mAction;
     mAction = i_action;
@@ -577,7 +544,6 @@ void daE_YM_c::setActionMode(int i_action) {
     current.angle.y = shape_angle.y;
 }
 
-/* 80809FC4-8080A57C 001F84 05B8+00 1/1 0/0 0/0 .text            executeWait__8daE_YM_cFv */
 void daE_YM_c::executeWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz my_vec_0;
@@ -708,7 +674,6 @@ void daE_YM_c::executeWait() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8080A57C-8080ACB4 00253C 0738+00 1/1 0/0 0/0 .text            executeMove__8daE_YM_cFv */
 void daE_YM_c::executeMove() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     (void) player; // acquired, but not used.
@@ -804,7 +769,6 @@ void daE_YM_c::executeMove() {
     }
 }
 
-/* 8080ACB4-8080B444 002C74 0790+00 1/1 0/0 0/0 .text            executeEscape__8daE_YM_cFv */
 void daE_YM_c::executeEscape() {
     cLib_chaseF(&speed.y, -60.0f, 5.0f);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -951,7 +915,6 @@ void daE_YM_c::executeEscape() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8080B444-8080BB34 003404 06F0+00 2/2 0/0 0/0 .text            executeDown__8daE_YM_cFv */
 void daE_YM_c::executeDown() {
     field_0x6f4 = 10;
     field_0x6dc = 0.0f;
@@ -1080,7 +1043,6 @@ void daE_YM_c::executeDown() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8080BB7C-8080BCFC 003B3C 0180+00 1/1 0/0 0/0 .text            damage_check__8daE_YM_cFv */
 void daE_YM_c::damage_check() {
     if (field_0x6f4 != 0 || mAction == ACT_RIVER || mAction == ACT_DOWN) {
         return;
@@ -1114,7 +1076,6 @@ void daE_YM_c::damage_check() {
     }
 }
 
-/* 8080BCFC-8080C05C 003CBC 0360+00 1/1 0/0 0/0 .text            executeWind__8daE_YM_cFv */
 void daE_YM_c::executeWind() {
     cLib_chaseF(&speed.y, -60.0f, 5.0f);
     switch (mMode) {
@@ -1189,7 +1150,6 @@ void daE_YM_c::executeWind() {
     shape_angle.y += field_0x6e6;
 }
 
-/* 8080C05C-8080C1FC 00401C 01A0+00 1/1 0/0 0/0 .text            getSurpriseType__8daE_YM_cFv */
 int daE_YM_c::getSurpriseType() {
     cXyz my_vec_0 = mPrevPos - current.pos;
     int ret;
@@ -1205,14 +1165,12 @@ int daE_YM_c::getSurpriseType() {
     return ret;
 }
 
-/* 8080C1FC-8080C24C 0041BC 0050+00 2/2 0/0 0/0 .text            setSurpriseAway__8daE_YM_cFv */
 void daE_YM_c::setSurpriseAway() {
     field_0x6f0 = 0x1e;
     mMode = 1;
     bckSet(0x10, 2, 3.0f, speedF / 12.0f);
 }
 
-/* 8080C24C-8080C374 00420C 0128+00 1/1 0/0 0/0 .text            setGoHomeType__8daE_YM_cFv */
 void daE_YM_c::setGoHomeType() {
     s16 tgt_ang = cLib_targetAngleY(&current.pos, &mPrevPos);
     f32 rand_val = cM_rnd();
@@ -1237,7 +1195,6 @@ void daE_YM_c::setGoHomeType() {
     }
 }
 
-/* 8080C374-8080CEE0 004334 0B6C+00 2/1 0/0 0/0 .text            executeSurprise__8daE_YM_cFv */
 void daE_YM_c::executeSurprise() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (mType != 1) {
@@ -1412,7 +1369,6 @@ void daE_YM_c::executeSurprise() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8080CEE0-8080CFC8 004EA0 00E8+00 1/1 0/0 0/0 .text            executeBack__8daE_YM_cFv */
 void daE_YM_c::executeBack() {
     if (mType != 1) {
         cLib_chaseF(&speed.y, -60.0f, 5.0f);
@@ -1438,7 +1394,6 @@ void daE_YM_c::executeBack() {
     }
 }
 
-/* 8080CFC8-8080D2C8 004F88 0300+00 1/1 0/0 0/0 .text            executeFall__8daE_YM_cFv */
 void daE_YM_c::executeFall() {
     cLib_chaseF(&speed.y, -90.0f, 10.0f);
     switch (mMode) {
@@ -1496,7 +1451,6 @@ void daE_YM_c::executeFall() {
     }
 }
 
-/* 8080D2C8-8080D990 005288 06C8+00 1/1 0/0 0/0 .text            executeAttack__8daE_YM_cFv */
 void daE_YM_c::executeAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz my_vec_0 = player->current.pos - mPrevPos;
@@ -1583,7 +1537,6 @@ void daE_YM_c::executeAttack() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8080D990-8080DB58 005950 01C8+00 1/1 0/0 0/0 .text            checkAttackEnd__8daE_YM_cFv */
 u8 daE_YM_c::checkAttackEnd() {
     if (daPy_getPlayerActorClass()->checkClimbMove() == 0) {
         setActionMode(ACT_MOVE);
@@ -1601,7 +1554,6 @@ u8 daE_YM_c::checkAttackEnd() {
     }
 }
 
-/* 8080DB58-8080DC5C 005B18 0104+00 2/2 0/0 0/0 .text            setAttackMotion__8daE_YM_cFv */
 u8 daE_YM_c::setAttackMotion() {
     if (mType != 1) {
         return 0;
@@ -1624,7 +1576,6 @@ u8 daE_YM_c::setAttackMotion() {
     return 0;
 }
 
-/* 8080DC5C-8080E26C 005C1C 0610+00 1/1 0/0 0/0 .text            executeAttackWall__8daE_YM_cFv */
 void daE_YM_c::executeAttackWall() {
     field_0x6fa = 0x1e;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1714,7 +1665,6 @@ void daE_YM_c::executeAttackWall() {
     }
 }
 
-/* 8080E26C-8080E49C 00622C 0230+00 1/1 0/0 0/0 .text            executeDefense__8daE_YM_cFv */
 void daE_YM_c::executeDefense() {
     switch (mMode) {
         case 0:
@@ -1765,7 +1715,6 @@ void daE_YM_c::executeDefense() {
     }
 }
 
-/* 8080E49C-8080E630 00645C 0194+00 1/1 0/0 0/0 .text            checkFlyTerritory__8daE_YM_cFv */
 u8 daE_YM_c::checkFlyTerritory() {
     if (mPrevPos.absXZ(current.pos) > 300.0f) {
         return 0;
@@ -1777,7 +1726,6 @@ u8 daE_YM_c::checkFlyTerritory() {
     }
 }
 
-/* 8080E630-8080E6A0 0065F0 0070+00 1/1 0/0 0/0 .text            initFly__8daE_YM_cFv */
 void daE_YM_c::initFly() {
     attention_info.distances[fopAc_attn_BATTLE_e] = 46;
     gravity = 0.0f;
@@ -1791,7 +1739,6 @@ void daE_YM_c::initFly() {
     shape_angle.x = 0;
 }
 
-/* 8080E6A0-8080F8C8 006660 1228+00 2/1 0/0 0/0 .text            executeFly__8daE_YM_cFv */
 void daE_YM_c::executeFly() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz player_pos(player->current.pos);
@@ -2012,7 +1959,6 @@ void daE_YM_c::executeFly() {
     current.pos.y += cM_ssin(field_0x6e4) * 3.0f;
 }
 
-/* 8080F8C8-8080F92C 007888 0064+00 1/1 0/0 0/0 .text            setInclination__8daE_YM_cFv */
 void daE_YM_c::setInclination() {
     s16 tan = cM_atan2s(speedF, speed.y) - 0x4000;
     if (tan < -6000) {
@@ -2024,7 +1970,6 @@ void daE_YM_c::setInclination() {
     cLib_chaseAngleS(&shape_angle.x, tan, 0x0180);
 }
 
-/* 8080F92C-80810084 0078EC 0758+00 1/1 0/0 0/0 .text            executeFlyAttack__8daE_YM_cFv */
 void daE_YM_c::executeFlyAttack() {
     cXyz my_vec_0;
     mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1);
@@ -2130,7 +2075,6 @@ void daE_YM_c::executeFlyAttack() {
     }
 }
 
-/* 80810084-8081013C 008044 00B8+00 1/1 0/0 0/0 .text            setNextPathPoint__8daE_YM_cFv */
 void daE_YM_c::setNextPathPoint() {
     cXyz my_vec_0;
     ++mCurrentPntNo;
@@ -2143,7 +2087,6 @@ void daE_YM_c::setNextPathPoint() {
     bckSet(0x10, 2, 5.0f, 1.0f);
 }
 
-/* 8081013C-8081030C 0080FC 01D0+00 1/1 0/0 0/0 .text            checkRailDig__8daE_YM_cFv */
 u8 daE_YM_c::checkRailDig() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz my_vec_0;
@@ -2161,7 +2104,6 @@ u8 daE_YM_c::checkRailDig() {
     return 0;
 }
 
-/* 8081030C-80810690 0082CC 0384+00 1/1 0/0 0/0 .text            executeRail__8daE_YM_cFv */
 void daE_YM_c::executeRail() {
     daPy_py_c* player = daPy_getPlayerActorClass();;
     cXyz my_vec_0;
@@ -2216,10 +2158,8 @@ void daE_YM_c::executeRail() {
     }
 }
 
-/* 80815BD0-80815BDC 0000CC 000C+00 1/1 0/0 0/0 .data            YM_DIG_POS_Y$7355 */
 static f32 YM_DIG_POS_Y[] = {-15.0f, -30.0f, -70.0f};
 
-/* 80810690-80810DF8 008650 0768+00 1/1 0/0 0/0 .text            executeBackRail__8daE_YM_cFv */
 void daE_YM_c::executeBackRail() {
     cXyz my_vec_0 = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position;
     switch (mMode) {
@@ -2313,7 +2253,6 @@ void daE_YM_c::executeBackRail() {
     }
 }
 
-/* 80810DF8-80810E64 008DB8 006C+00 1/1 0/0 0/0 .text            checkElectricStart__8daE_YM_cFv */
 void daE_YM_c::checkElectricStart() {
     if (field_0x6a1 == 1) {
         if (mAction != ACT_WAIT && mAction != ACT_SURPRISE) {
@@ -2332,7 +2271,6 @@ void daE_YM_c::checkElectricStart() {
     }
 }
 
-/* 80810E64-8081105C 008E24 01F8+00 1/1 0/0 0/0 .text            executeElectric__8daE_YM_cFv */
 void daE_YM_c::executeElectric() {
     switch (mMode) {
         case 0:
@@ -2373,7 +2311,6 @@ void daE_YM_c::executeElectric() {
     }
 }
 
-/* 8081105C-80811740 00901C 06E4+00 1/1 0/0 0/0 .text            executeSwitch__8daE_YM_cFv */
 void daE_YM_c::executeSwitch() {
     cXyz my_vec_0;
     switch (mMode) {
@@ -2485,7 +2422,6 @@ void daE_YM_c::executeSwitch() {
     current.angle.y = shape_angle.y;
 }
 
-/* 80811740-80811838 009700 00F8+00 1/1 0/0 0/0 .text            initFireFly__8daE_YM_cFi */
 void daE_YM_c::initFireFly(int param_0) {
     field_0x6e6 = cM_rndFX(512.0f);
     if (param_0 && mAcch.ChkWallHit()) {
@@ -2498,7 +2434,6 @@ void daE_YM_c::initFireFly(int param_0) {
     field_0x6f0 = 10;
 }
 
-/* 80811838-808120B0 0097F8 0878+00 1/1 0/0 0/0 .text            executeFire__8daE_YM_cFv */
 void daE_YM_c::executeFire() {
     if (current.pos.y >= 550.0f) {
         current.pos.y = 550.0f;
@@ -2638,7 +2573,6 @@ void daE_YM_c::executeFire() {
     }
 }
 
-/* 808120B0-808123C4 00A070 0314+00 1/1 0/0 0/0 .text            setRiverAttention__8daE_YM_cFv */
 void daE_YM_c::setRiverAttention() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz player_pos = player->current.pos;
@@ -2659,12 +2593,10 @@ void daE_YM_c::setRiverAttention() {
     }
 }
 
-/* 808123C4-808123D0 00A384 000C+00 0/0 0/0 1/1 .text            setLockByCargo__8daE_YM_cFv */
 void daE_YM_c::setLockByCargo() {
     field_0x6f2 = 90;
 }
 
-/* 808123D0-80812F0C 00A390 0B3C+00 1/1 0/0 0/0 .text            executeRiver__8daE_YM_cFv */
 void daE_YM_c::executeRiver() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz player_pos = player->current.pos;
@@ -2857,7 +2789,6 @@ void daE_YM_c::executeRiver() {
     }
 }
 
-/* 80812F0C-80812FCC 00AECC 00C0+00 1/1 0/0 0/0 .text            s_ym_sub__FPvPv */
 static void* s_ym_sub(void* param_0, void* param_1) {
     daE_YM_c* actor_a = (daE_YM_c*)param_0;
     daE_YM_c* actor_b = (daE_YM_c*)param_1;
@@ -2879,7 +2810,6 @@ static void* s_ym_sub(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80812FCC-8081300C 00AF8C 0040+00 1/1 0/0 0/0 .text            checkFrinedSamePos__8daE_YM_cFv */
 void daE_YM_c::checkFrinedSamePos() {
     if (mFriendFlag == 0) {
         setFriendFlag(0x80);
@@ -2887,7 +2817,6 @@ void daE_YM_c::checkFrinedSamePos() {
     }
 }
 
-/* 8081300C-80813528 00AFCC 051C+00 2/1 0/0 0/0 .text            action__8daE_YM_cFv */
 void daE_YM_c::action() {
     if (daPy_getPlayerActorClass()->getCutType() == 0x36) {
         field_0x700 = 0;
@@ -3033,7 +2962,6 @@ void daE_YM_c::action() {
     mpBrk->play();
 }
 
-/* 80813528-808135B0 00B4E8 0088+00 1/1 0/0 0/0 .text            mtx_set__8daE_YM_cFv */
 void daE_YM_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x6dc, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(field_0x668);
@@ -3044,7 +2972,6 @@ void daE_YM_c::mtx_set() {
     mpMorf->modelCalc();
 }
 
-/* 808135B0-808138AC 00B570 02FC+00 1/1 0/0 0/0 .text            cc_set__8daE_YM_cFv */
 void daE_YM_c::cc_set() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -3095,7 +3022,6 @@ void daE_YM_c::cc_set() {
     dComIfG_Ccsp()->Set(&mSphCc);
 }
 
-/* 808138AC-80813A10 00B86C 0164+00 1/1 0/0 0/0 .text            execute__8daE_YM_cFv */
 int daE_YM_c::execute() {
     if (field_0x71d) {
         return 1;
@@ -3160,17 +3086,14 @@ int daE_YM_c::execute() {
     return 1;
 }
 
-/* 80813A10-80813A30 00B9D0 0020+00 2/1 0/0 0/0 .text            daE_YM_Execute__FP8daE_YM_c */
 static int daE_YM_Execute(daE_YM_c* i_this) {
     return i_this->execute();
 }
 
-/* 80813A30-80813A38 00B9F0 0008+00 1/0 0/0 0/0 .text            daE_YM_IsDelete__FP8daE_YM_c */
 static int daE_YM_IsDelete(daE_YM_c* i_this) {
     return 1;
 }
 
-/* 80813A38-80813AD0 00B9F8 0098+00 1/1 0/0 0/0 .text            _delete__8daE_YM_cFv */
 int daE_YM_c::_delete() {
     if (mFlyType == true) {
         dComIfG_resDelete(&mPhase, "E_TM");
@@ -3189,12 +3112,10 @@ int daE_YM_c::_delete() {
     return 1;
 }
 
-/* 80813AD0-80813AF0 00BA90 0020+00 1/0 0/0 0/0 .text            daE_YM_Delete__FP8daE_YM_c */
 static int daE_YM_Delete(daE_YM_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80813AF0-80813E38 00BAB0 0348+00 1/1 0/0 0/0 .text            CreateHeap__8daE_YM_cFv */
 int daE_YM_c::CreateHeap() {
     if (mFlyType == 1) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_TM", 0x11);
@@ -3237,12 +3158,10 @@ int daE_YM_c::CreateHeap() {
     return 1;
 }
 
-/* 80813E84-80813EA4 00BE44 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daE_YM_c*>(i_this)->CreateHeap();
 }
 
-/* 80813EA4-808143A0 00BE64 04FC+00 2/2 0/0 0/0 .text            checkBeforeBg__8daE_YM_cFs */
 u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) {
     dBgS_LinChk lin_chk;
     cXyz my_vec_0;
@@ -3309,7 +3228,6 @@ u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) {
     return 0;
 }
 
-/* 808143A0-808144D8 00C360 0138+00 1/1 0/0 0/0 .text            checkBeforeGround__8daE_YM_cFv */
 u8 daE_YM_c::checkBeforeGround() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -3332,7 +3250,6 @@ u8 daE_YM_c::checkBeforeGround() {
     }
 }
 
-/* 808144D8-80814758 00C498 0280+00 1/1 0/0 0/0 .text            checkInitialWall__8daE_YM_cFv */
 void daE_YM_c::checkInitialWall() {
     cXyz my_vec_0;
     cXyz my_vec_1(0.0f, 0.0f, 200.0f);
@@ -3358,7 +3275,6 @@ void daE_YM_c::checkInitialWall() {
     mType = 0;
 }
 
-/* 80814758-80814AF0 00C718 0398+00 3/3 0/0 0/0 .text            checkWall__8daE_YM_cFv */
 u8 daE_YM_c::checkWall() {
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -3386,7 +3302,6 @@ u8 daE_YM_c::checkWall() {
     return 0;
 }
 
-/* 80814AF0-80814BA4 00CAB0 00B4+00 1/1 0/0 0/0 .text            setHideType__8daE_YM_cFv */
 void daE_YM_c::setHideType() {
     mIsHide = true;
     mSphCc.SetCoSPrm(0x145);
@@ -3408,7 +3323,6 @@ void daE_YM_c::setHideType() {
     }
 }
 
-/* 80814BA4-80815224 00CB64 0680+00 2/1 0/0 0/0 .text            create__8daE_YM_cFv */
 int daE_YM_c::create() {
     fopAcM_ct(this, daE_YM_c);
 
@@ -3581,12 +3495,10 @@ int daE_YM_c::create() {
     return phase;
 }
 
-/* 808153F0-80815410 00D3B0 0020+00 1/0 0/0 0/0 .text            daE_YM_Create__FP8daE_YM_c */
 static int daE_YM_Create(daE_YM_c* i_this) {
     return i_this->create();
 }
 
-/* 80815C48-80815C68 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YM_Method */
 static actor_method_class l_daE_YM_Method = {
     (process_method_func)daE_YM_Create,
     (process_method_func)daE_YM_Delete,
@@ -3595,7 +3507,6 @@ static actor_method_class l_daE_YM_Method = {
     (process_method_func)daE_YM_Draw,
 };
 
-/* 80815C68-80815C98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YM */
 extern actor_process_profile_definition g_profile_E_YM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp
index 67e961ccce..0674464aa7 100644
--- a/src/d/actor/d_a_e_ym_tag.cpp
+++ b/src/d/actor/d_a_e_ym_tag.cpp
@@ -8,13 +8,10 @@
 #include "d/actor/d_a_e_ym_tag.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80815DF8-80815E00 000078 0008+00 1/0 0/0 0/0 .text            daE_YM_TAG_Draw__FP12daE_YM_TAG_c
- */
 static int daE_YM_TAG_Draw(daE_YM_TAG_c* i_this) {
     return 1;
 }
 
-/* 80815E00-80815E8C 000080 008C+00 1/1 0/0 0/0 .text            s_e_ym__FPvPv */
 static void* s_e_ym(void* i_actorP1, void* i_actorP2) {
     if (fopAcM_IsActor(i_actorP1) && fopAcM_GetName(i_actorP1) == PROC_E_YM) {
         if (fpcM_IsCreating(fopAcM_GetID(i_actorP1)) == 0) {
@@ -27,7 +24,6 @@ static void* s_e_ym(void* i_actorP1, void* i_actorP2) {
     return 0;
 }
 
-/* 80815E8C-80815EF8 00010C 006C+00 1/1 0/0 0/0 .text            execute__12daE_YM_TAG_cFv */
 int daE_YM_TAG_c::execute() {
     daE_YM_c* shadow_insectP = (daE_YM_c*)fpcM_Search(s_e_ym,this);
 
@@ -40,23 +36,18 @@ int daE_YM_TAG_c::execute() {
     return 1;
 }
 
-/* 80815EF8-80815F18 000178 0020+00 1/0 0/0 0/0 .text daE_YM_TAG_Execute__FP12daE_YM_TAG_c */
 static int daE_YM_TAG_Execute(daE_YM_TAG_c* i_this) {
     return i_this->execute();
 }
 
-/* 80815F18-80815F20 000198 0008+00 1/0 0/0 0/0 .text daE_YM_TAG_IsDelete__FP12daE_YM_TAG_c */
 static int daE_YM_TAG_IsDelete(daE_YM_TAG_c* i_this) {
     return 1;
 }
 
-/* 80815F20-80815F28 0001A0 0008+00 1/0 0/0 0/0 .text            daE_YM_TAG_Delete__FP12daE_YM_TAG_c
- */
 static int daE_YM_TAG_Delete(daE_YM_TAG_c* i_this) {
     return 1;
 }
 
-/* 80815F28-80815F90 0001A8 0068+00 1/1 0/0 0/0 .text            create__12daE_YM_TAG_cFv */
 int daE_YM_TAG_c::create() {
     fopAcM_ct(this, daE_YM_TAG_c);
     if ((u8)fopAcM_GetParam(this) == 0xFF) {
@@ -65,14 +56,10 @@ int daE_YM_TAG_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80815F90-80815FB0 000210 0020+00 1/0 0/0 0/0 .text            daE_YM_TAG_Create__FP12daE_YM_TAG_c
- */
 static int daE_YM_TAG_Create(daE_YM_TAG_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80815FB8-80815FD8 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YM_TAG_Method */
 static actor_method_class l_daE_YM_TAG_Method = {
     (process_method_func)daE_YM_TAG_Create,
     (process_method_func)daE_YM_TAG_Delete,
@@ -81,7 +68,6 @@ static actor_method_class l_daE_YM_TAG_Method = {
     (process_method_func)daE_YM_TAG_Draw
 };
 
-/* 80815FD8-80816008 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YM_TAG */
 extern actor_process_profile_definition g_profile_E_YM_TAG = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp
index 990a21b42e..9a36615219 100644
--- a/src/d/actor/d_a_e_ymb.cpp
+++ b/src/d/actor/d_a_e_ymb.cpp
@@ -16,8 +16,8 @@
 
 struct daE_YMB_HIO_c {
 public:
-    /* 8081610C */ daE_YMB_HIO_c();
-    /* 80821460 */ virtual ~daE_YMB_HIO_c() {}
+    daE_YMB_HIO_c();
+    virtual ~daE_YMB_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 model_size;                  // モデルサイズ (Model Size)
@@ -228,7 +228,6 @@ namespace {
     };
 }
 
-/* 8081610C-8081615C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__13daE_YMB_HIO_cFv */
 daE_YMB_HIO_c::daE_YMB_HIO_c() {
     field_0x4 = -1;
     model_size = 1.0f;
@@ -239,7 +238,6 @@ daE_YMB_HIO_c::daE_YMB_HIO_c() {
     fly_height_adjust = 400.0f;
 }
 
-/* 8081615C-808164B4 00013C 0358+00 1/1 0/0 0/0 .text ctrlJoint__9daE_YMB_cFP8J3DJointP8J3DModel */
 int daE_YMB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     cXyz sp54, sp60;
@@ -296,7 +294,6 @@ int daE_YMB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 808164F0-8081653C 0004D0 004C+00 1/1 0/0 0/0 .text            JointCallBack__9daE_YMB_cFP8J3DJointi */
 int daE_YMB_c::JointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -309,14 +306,12 @@ int daE_YMB_c::JointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8081653C-80816554 00051C 0018+00 1/1 0/0 0/0 .text            rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* aActor_p, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_ALINK) {
         ((daE_YMB_c*)aActor_p)->field_0x724 = 20;
     }
 }
 
-/* 80816554-8081695C 000534 0408+00 1/1 0/0 0/0 .text            draw__9daE_YMB_cFv */
 int daE_YMB_c::draw() {
     g_env_light.settingTevStruct(6, &current.pos, &tevStr);
 
@@ -380,17 +375,14 @@ int daE_YMB_c::draw() {
     return 1;
 }
 
-/* 8081695C-8081697C 00093C 0020+00 1/0 0/0 0/0 .text            daE_YMB_Draw__FP9daE_YMB_c */
 static int daE_YMB_Draw(daE_YMB_c* i_this) {
     return i_this->draw();
 }
 
-/* 8081697C-80816A20 00095C 00A4+00 14/14 0/0 0/0 .text            setBck__9daE_YMB_cFiUcff */
 void daE_YMB_c::setBck(int i_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_YB", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
 }
 
-/* 80816A20-80816A7C 000A00 005C+00 5/5 0/0 0/0 .text            checkBck__9daE_YMB_cFi */
 bool daE_YMB_c::checkBck(int i_index) {
     if (mpModelMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes("E_YB", i_index)) {
         return true;
@@ -399,13 +391,11 @@ bool daE_YMB_c::checkBck(int i_index) {
     }
 }
 
-/* 80816A7C-80816A88 000A5C 000C+00 15/15 0/0 0/0 .text            setActionMode__9daE_YMB_cFii */
 void daE_YMB_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* 80816A88-80816B7C 000A68 00F4+00 1/1 0/0 0/0 .text            setLastDamage__9daE_YMB_cFv */
 void daE_YMB_c::setLastDamage() {
     setRockDamageEffect();
 
@@ -421,7 +411,6 @@ void daE_YMB_c::setLastDamage() {
     dComIfGp_getVibration().StartShock(3, 31, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80816B7C-80816E78 000B5C 02FC+00 1/1 0/0 0/0 .text            damage_check__9daE_YMB_cFv */
 void daE_YMB_c::damage_check() {
     cCcD_Obj* tgHitObj;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -497,7 +486,6 @@ void daE_YMB_c::damage_check() {
     }
 }
 
-/* 80816E78-80817064 000E58 01EC+00 1/1 0/0 0/0 .text            setCameraSwitch__9daE_YMB_cFv */
 void daE_YMB_c::setCameraSwitch() {
     field_0x713 = 0;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -519,13 +507,10 @@ void daE_YMB_c::setCameraSwitch() {
     }
 }
 
-/* 80821E54-80821E58 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80821E64-80821E84 000054 0020+00 12/20 0/0 0/0 .bss             l_HIO */
 static daE_YMB_HIO_c l_HIO;
 
-/* 80817064-80817164 001044 0100+00 1/1 0/0 0/0 .text            checkWaterPos__9daE_YMB_cFv */
 void daE_YMB_c::checkWaterPos() {
     Vec pos = current.pos;
     pos.y += 1000.0f;
@@ -550,7 +535,6 @@ void daE_YMB_c::checkWaterPos() {
     }
 }
 
-/* 80817164-80817200 001144 009C+00 1/1 0/0 0/0 .text            checkGroundPos__9daE_YMB_cFv */
 void daE_YMB_c::checkGroundPos() {
     cXyz pos(current.pos);
     pos.y += 500.0f;
@@ -563,21 +547,18 @@ void daE_YMB_c::checkGroundPos() {
     }
 }
 
-/* 80817200-8081727C 0011E0 007C+00 6/6 0/0 0/0 .text            setFlyWaitVoice__9daE_YMB_cFv */
 void daE_YMB_c::setFlyWaitVoice() {
     if ((u8)checkBck(BCK_YB_FLY_WAIT) && mpModelMorf->checkFrame(0.0f)) {
         mSound.startCreatureVoice(Z2SE_EN_YB_V_FLY_WAIT, -1);
     }
 }
 
-/* 8081727C-808172F8 00125C 007C+00 1/1 0/0 0/0 .text            setDownWaitVoice__9daE_YMB_cFv */
 void daE_YMB_c::setDownWaitVoice() {
     if ((u8)checkBck(BCK_YB_DAWN_WAIT) && mpModelMorf->checkFrame(0.0f)) {
         mSound.startCreatureVoice(Z2SE_EN_YB_V_DOWN_WAIT, -1);
     }
 }
 
-/* 808172F8-808173B0 0012D8 00B8+00 0/0 0/0 1/1 .text            setHitBoardSe__9daE_YMB_cFv */
 void daE_YMB_c::setHitBoardSe() {
     if (field_0x722 == 0 && mAction == 5 && mMode >= 3 && mMode <= 7) {
         if (current.pos.y > field_0x6cc - 150.0f - 200.0f) {
@@ -588,7 +569,6 @@ void daE_YMB_c::setHitBoardSe() {
     }
 }
 
-/* 808173B0-8081756C 001390 01BC+00 4/4 0/0 0/0 .text            setElecEffect1__9daE_YMB_cFv */
 void daE_YMB_c::setElecEffect1() {
     MtxP mtx = mpModelMorf->getModel()->getAnmMtx(15);
     cXyz sp28(mtx[0][3], mtx[1][3], mtx[2][3]);
@@ -611,7 +591,6 @@ void daE_YMB_c::setElecEffect1() {
     mSound.startCreatureSoundLevel(Z2SE_EN_YB_ELECTRIC, 0, -1);
 }
 
-/* 8081756C-80817744 00154C 01D8+00 6/6 0/0 0/0 .text            setElecEffect2__9daE_YMB_cFv */
 void daE_YMB_c::setElecEffect2() {
     static u16 w_eff_id[4] = {
         ZL2_ELEC_1, ZL2_ELECY_1, ZL2_ELECY_2, ZL2_GLOW02,
@@ -666,7 +645,6 @@ namespace {
     };
 }
 
-/* 80817744-8081785C 001724 0118+00 4/4 0/0 0/0 .text            setWaterEffect1__9daE_YMB_cFv */
 void daE_YMB_c::setWaterEffect1() {
     cXyz sp28(current.pos.x, field_0x6cc, current.pos.z);
     static cXyz sc(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -679,7 +657,6 @@ void daE_YMB_c::setWaterEffect1() {
     }
 }
 
-/* 8081785C-80817974 00183C 0118+00 2/2 0/0 0/0 .text            setWaterEffect2__9daE_YMB_cFv */
 void daE_YMB_c::setWaterEffect2() {
     cXyz sp28(current.pos.x, field_0x6cc, current.pos.z);
     static cXyz sc(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -692,7 +669,6 @@ void daE_YMB_c::setWaterEffect2() {
     }
 }
 
-/* 80817974-80817AEC 001954 0178+00 1/1 0/0 0/0 .text            setBoilEffect__9daE_YMB_cFi */
 void daE_YMB_c::setBoilEffect(int param_1) {
     cXyz sp30(current.pos.x, field_0x6cc, current.pos.z);
     static cXyz sc(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -708,7 +684,6 @@ void daE_YMB_c::setBoilEffect(int param_1) {
     Z2GetAudioMgr()->seStartLevel(Z2SE_EN_YB_ABUKU, &sp30, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 80817AEC-80817BD8 001ACC 00EC+00 1/1 0/0 0/0 .text            setDamageEffect__9daE_YMB_cFi */
 void daE_YMB_c::setDamageEffect(int param_1) {
     static cXyz sc(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     static u16 w_eff_id[2] = {
@@ -719,7 +694,6 @@ void daE_YMB_c::setDamageEffect(int param_1) {
     mDamageParticle = dComIfGp_particle_set(mDamageParticle, w_eff_id[param_1], &pos, &tevStr, &shape_angle, &sc, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 80817BD8-80817CF0 001BB8 0118+00 2/2 0/0 0/0 .text            setDownHamonEffect__9daE_YMB_cFv */
 void daE_YMB_c::setDownHamonEffect() {
     cXyz pos(current.pos.x, field_0x6cc, current.pos.z);
     static cXyz sc(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -731,7 +705,6 @@ void daE_YMB_c::setDownHamonEffect() {
     }
 }
 
-/* 80817CF0-80817E7C 001CD0 018C+00 1/1 0/0 0/0 .text            setFlyBlurEffect__9daE_YMB_cFv */
 void daE_YMB_c::setFlyBlurEffect() {
     static u16 w_eff_id[2] = {
         ZL2_HANEBLUR64I4_1, ZL2_HANEBLUR64I4_2,
@@ -762,7 +735,6 @@ void daE_YMB_c::setFlyBlurEffect() {
     }
 }
 
-/* 80817E7C-80817FDC 001E5C 0160+00 1/1 0/0 0/0 .text            setRockDamageEffect__9daE_YMB_cFv */
 void daE_YMB_c::setRockDamageEffect() {
     cXyz pos;
     int iVar1 = field_0x6f4 - 1;
@@ -782,7 +754,6 @@ void daE_YMB_c::setRockDamageEffect() {
     mSound.startCreatureVoice(Z2SE_EN_YB_V_DOWN_DAMAGE, -1);
 }
 
-/* 80817FDC-80818158 001FBC 017C+00 1/1 0/0 0/0 .text            setDeathEffect__9daE_YMB_cFv */
 void daE_YMB_c::setDeathEffect() {
     cXyz pos;
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(15));
@@ -797,7 +768,6 @@ void daE_YMB_c::setDeathEffect() {
     fopAcM_seStart(this, Z2SE_DARK_VANISH, 0);
 }
 
-/* 80818158-808181F4 002138 009C+00 1/1 0/0 0/0 .text            search_drop__FPvPv */
 static void* search_drop(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Drop) {
         if (!fpcM_IsCreating(fopAcM_GetID(i_actor))) {
@@ -815,7 +785,6 @@ static void* search_drop(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 808181F4-80818328 0021D4 0134+00 1/1 0/0 0/0 .text            executeWait__9daE_YMB_cFv */
 void daE_YMB_c::executeWait() {
     switch (mMode) {
         case 0:
@@ -849,14 +818,12 @@ void daE_YMB_c::executeWait() {
     }
 }
 
-/* 80818328-80818370 002308 0048+00 1/1 0/0 0/0 .text            setBitePos__9daE_YMB_cFi */
 void daE_YMB_c::setBitePos(int param_1) {
     cXyz pos;
     getBellyBitePos(&pos);
     mDownPos = pos;
 }
 
-/* 80818370-80818518 002350 01A8+00 1/1 0/0 0/0 .text            setInclination__9daE_YMB_cFv */
 void daE_YMB_c::setInclination() {
     s16 sVar1 = cM_atan2s(speedF, speed.y) - 0x4000;
     f32 fVar1 = speed.abs();
@@ -876,7 +843,6 @@ void daE_YMB_c::setInclination() {
     cLib_chaseAngleS(&field_0x6ea, sVar2, 0x180);
 }
 
-/* 80818518-80818930 0024F8 0418+00 3/3 0/0 0/0 .text            setBodyAngle__9daE_YMB_cFv */
 void daE_YMB_c::setBodyAngle() {
     s16 sVar1 = current.angle.y - shape_angle.y;
     cLib_chaseAngleS(&shape_angle.z, std::abs(cM_scos(current.angle.x)) * (speed.abs() * -32.0f * cM_ssin(sVar1)), 0x100);
@@ -890,7 +856,6 @@ void daE_YMB_c::setBodyAngle() {
     }
 }
 
-/* 80818930-80818AE8 002910 01B8+00 3/3 0/0 0/0 .text            checkWolfLockIn__9daE_YMB_cFv */
 bool daE_YMB_c::checkWolfLockIn() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (field_0x764 != 0 && dComIfGp_checkPlayerStatus1(0, 0x800000)) {
@@ -903,7 +868,6 @@ bool daE_YMB_c::checkWolfLockIn() {
     return false;
 }
 
-/* 80818AE8-80819610 002AC8 0B28+00 1/1 0/0 0/0 .text            executeFly__9daE_YMB_cFv */
 void daE_YMB_c::executeFly() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp44(player->current.pos);
@@ -1048,7 +1012,6 @@ void daE_YMB_c::executeFly() {
     }
 }
 
-/* 80819610-80819FD0 0035F0 09C0+00 2/1 0/0 0/0 .text            executeFlyAttack__9daE_YMB_cFv */
 void daE_YMB_c::executeFlyAttack() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp28;
@@ -1246,7 +1209,6 @@ void daE_YMB_c::executeFlyAttack() {
     }
 }
 
-/* 80819FD0-8081A718 003FB0 0748+00 1/1 0/0 0/0 .text            executeRunAway__9daE_YMB_cFv */
 void daE_YMB_c::executeRunAway() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp34(player->current.pos);
@@ -1336,7 +1298,6 @@ void daE_YMB_c::executeRunAway() {
     }
 }
 
-/* 8081A718-8081A88C 0046F8 0174+00 1/1 0/0 0/0 .text            executeGuard__9daE_YMB_cFv */
 void daE_YMB_c::executeGuard() {
     mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1);
 
@@ -1361,7 +1322,6 @@ void daE_YMB_c::executeGuard() {
     }
 }
 
-/* 8081A88C-8081B78C 00486C 0F00+00 2/1 0/0 0/0 .text            executeSwim__9daE_YMB_cFv */
 void daE_YMB_c::executeSwim() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     s16 camAngleY = (s16) fopCamM_GetAngleY(camera);
@@ -1565,7 +1525,6 @@ void daE_YMB_c::executeSwim() {
     }
 }
 
-/* 8081B78C-8081BC10 00576C 0484+00 1/1 0/0 0/0 .text            executeWaterJump__9daE_YMB_cFv */
 void daE_YMB_c::executeWaterJump() {
     switch (mMode) {
         case 0:
@@ -1651,7 +1610,6 @@ void daE_YMB_c::executeWaterJump() {
     }
 }
 
-/* 8081BC10-8081BEE8 005BF0 02D8+00 1/1 0/0 0/0 .text            getNearDownPos__9daE_YMB_cFv */
 void daE_YMB_c::getNearDownPos() {
     s16 sVar2;
     int iVar2;
@@ -1711,7 +1669,6 @@ void daE_YMB_c::getNearDownPos() {
     }
 }
 
-/* 8081BEE8-8081C4EC 005EC8 0604+00 1/2 0/0 0/0 .text            executeDamage__9daE_YMB_cFv */
 void daE_YMB_c::executeDamage() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     setFlyWaitVoice();
@@ -1839,7 +1796,6 @@ void daE_YMB_c::executeDamage() {
     }
 }
 
-/* 8081C4EC-8081C7D0 0064CC 02E4+00 1/1 0/0 0/0 .text            setMidnaBindInit__9daE_YMB_cFP4cXyz */
 void daE_YMB_c::setMidnaBindInit(cXyz* i_pos) {
     cXyz i_scale(1.0f, 1.0f, 1.0f);
     csXyz angle;
@@ -1866,7 +1822,6 @@ void daE_YMB_c::setMidnaBindInit(cXyz* i_pos) {
     mSound.startCreatureSound(Z2SE_MIDNA_BIND_LOCK_ON, 0, -1);
 }
 
-/* 8081C7D0-8081C908 0067B0 0138+00 1/1 0/0 0/0 .text            setMidnaBindLevel__9daE_YMB_cFi */
 void daE_YMB_c::setMidnaBindLevel(int i_index) {
     cXyz i_scale(1.0f, 1.0f, 1.0f);
     cXyz i_pos;
@@ -1884,7 +1839,6 @@ void daE_YMB_c::setMidnaBindLevel(int i_index) {
     }
 }
 
-/* 8081C908-8081CC14 0068E8 030C+00 1/1 0/0 0/0 .text            setWolfLockEffect__9daE_YMB_cFv */
 void daE_YMB_c::setWolfLockEffect() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz i_pos;
@@ -1932,7 +1886,6 @@ void daE_YMB_c::setWolfLockEffect() {
     }
 }
 
-/* 8081CC14-8081CD00 006BF4 00EC+00 2/2 0/0 0/0 .text            initDownToWater__9daE_YMB_cFv */
 void daE_YMB_c::initDownToWater() {
     speed.y = 40.0f;
     speedF = 40.0f;
@@ -1943,7 +1896,6 @@ void daE_YMB_c::initDownToWater() {
     field_0x6fc = (s16)((current.pos.y - field_0x6cc) / 50.0f + 16.0f);
 }
 
-/* 8081CD00-8081CE6C 006CE0 016C+00 2/2 0/0 0/0 .text            calcDownToWater__9daE_YMB_cFv */
 void daE_YMB_c::calcDownToWater() {
     if (mpModelMorf->isStop()) {
         setBck(BCK_YB_DROP, 2, 3.0f, 1.0f);
@@ -1962,7 +1914,6 @@ void daE_YMB_c::calcDownToWater() {
     cLib_chaseF(&speed.y, -60.0f, 5.0f);
 }
 
-/* 8081CE6C-8081D4D8 006E4C 066C+00 1/1 0/0 0/0 .text            executeDown__9daE_YMB_cFv */
 void daE_YMB_c::executeDown() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2103,7 +2054,6 @@ void daE_YMB_c::executeDown() {
     }
 }
 
-/* 8081D4D8-8081D594 0074B8 00BC+00 1/1 0/0 0/0 .text            setCreateDrop__9daE_YMB_cFv */
 void daE_YMB_c::setCreateDrop() {
     daObjDrop_c* drop = (daObjDrop_c*)fpcM_Search(search_drop, this);
     if (drop != NULL) {
@@ -2118,7 +2068,6 @@ void daE_YMB_c::setCreateDrop() {
     field_0x721 = 1;
 }
 
-/* 8081D594-8081DBD0 007574 063C+00 1/1 0/0 0/0 .text            executeDeath__9daE_YMB_cFv */
 void daE_YMB_c::executeDeath() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2233,7 +2182,6 @@ void daE_YMB_c::executeDeath() {
     }
 }
 
-/* 8081DBD0-8081DDE0 007BB0 0210+00 1/1 0/0 0/0 .text            demo_skip__9daE_YMB_cFi */
 void daE_YMB_c::demo_skip(int param_1) {
     switch (param_1) {
         case 0:
@@ -2273,7 +2221,6 @@ void daE_YMB_c::demo_skip(int param_1) {
     dComIfGp_event_reset();
 }
 
-/* 8081DDE0-8081DE14 007DC0 0034+00 3/3 0/0 0/0 .text            DemoSkipCallBack__9daE_YMB_cFPvi */
 int daE_YMB_c::DemoSkipCallBack(void* i_this, int param_2) {
     if (i_this) {
         static_cast<daE_YMB_c*>(i_this)->demo_skip(param_2);
@@ -2283,14 +2230,12 @@ int daE_YMB_c::DemoSkipCallBack(void* i_this, int param_2) {
     return 0;
 }
 
-/* 8081DE14-8081DE84 007DF4 0070+00 1/1 0/0 0/0 .text            calcLakeDemoPlayerPos__9daE_YMB_cFv */
 void daE_YMB_c::calcLakeDemoPlayerPos() {
     cXyz sp1c(field_0x69c.x, 0.0f, field_0x69c.z);
     cXyz sp28(0.0f, field_0x6cc + field_0x75c, 2000.0f);
     cLib_offsetPos(&current.pos, &sp1c, field_0x6e4, &sp28);
 }
 
-/* 8081DE84-8081E5B4 007E64 0730+00 1/1 0/0 0/0 .text            executeLakeDemo__9daE_YMB_cFv */
 void daE_YMB_c::executeLakeDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2452,7 +2397,6 @@ void daE_YMB_c::executeLakeDemo() {
     }
 }
 
-/* 8081E5B4-8081F140 008594 0B8C+00 2/1 0/0 0/0 .text            executeStartDemo__9daE_YMB_cFv */
 void daE_YMB_c::executeStartDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2642,7 +2586,6 @@ void daE_YMB_c::executeStartDemo() {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0);
 }
 
-/* 8081F140-8081F2E0 009120 01A0+00 1/1 0/0 0/0 .text            checkStartBattleDemo__9daE_YMB_cFv */
 bool daE_YMB_c::checkStartBattleDemo() {
     if (field_0x764 == 0 && daPy_getPlayerActorClass()->checkNowWolfEyeUp()) {
         if (daPy_getPlayerActorClass()->current.pos.absXZ(field_0x69c) < 2500.0f) {
@@ -2654,7 +2597,6 @@ bool daE_YMB_c::checkStartBattleDemo() {
     return false;
 }
 
-/* 8081F2E0-8081FAC8 0092C0 07E8+00 1/1 0/0 0/0 .text            executeBattleDemo__9daE_YMB_cFv */
 void daE_YMB_c::executeBattleDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2782,7 +2724,6 @@ void daE_YMB_c::executeBattleDemo() {
     camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0);
 }
 
-/* 8081FAC8-8081FF88 009AA8 04C0+00 2/1 0/0 0/0 .text            action__9daE_YMB_cFv */
 void daE_YMB_c::action() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -2918,7 +2859,6 @@ void daE_YMB_c::action() {
     mpBrkAnm->play();
 }
 
-/* 8081FF88-808200A0 009F68 0118+00 1/1 0/0 0/0 .text            mtx_set__9daE_YMB_cFv */
 void daE_YMB_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -2937,14 +2877,12 @@ void daE_YMB_c::mtx_set() {
     }
 }
 
-/* 808200A0-80820128 00A080 0088+00 3/3 0/0 0/0 .text            getBellyBitePos__9daE_YMB_cFP4cXyz */
 void daE_YMB_c::getBellyBitePos(cXyz* i_pos) {
     mDoMtx_stack_c::copy(mpModelMorf->getModel()->getAnmMtx(16));
     mDoMtx_stack_c::transM(80.0f, -120.0f, 0.0f);
     mDoMtx_stack_c::multVecZero(i_pos);
 }
 
-/* 80820128-808203D8 00A108 02B0+00 2/2 0/0 0/0 .text            getDownLockPoint__9daE_YMB_cFv */
 int daE_YMB_c::getDownLockPoint() {
     if (field_0x6f4 >= 7) {
         return 1;
@@ -2998,7 +2936,6 @@ int daE_YMB_c::getDownLockPoint() {
     return YMB_DOWN_ATT_JNT[uVar1];
 }
 
-/* 808203D8-80820668 00A3B8 0290+00 1/1 0/0 0/0 .text            setAttentionPos__9daE_YMB_cFv */
 void daE_YMB_c::setAttentionPos() {
     cXyz sp2c;
     cXyz sp38(daPy_getPlayerActorClass()->current.pos);
@@ -3048,7 +2985,6 @@ void daE_YMB_c::setAttentionPos() {
     setBitePos(16);
 }
 
-/* 80820668-808207AC 00A648 0144+00 1/1 0/0 0/0 .text            cc_set__9daE_YMB_cFv */
 void daE_YMB_c::cc_set() {
     cXyz sp28;
     J3DModel* model = mpModelMorf->getModel();
@@ -3071,7 +3007,6 @@ void daE_YMB_c::cc_set() {
     dComIfG_Ccsp()->Set(&field_0x1324);
 }
 
-/* 808207AC-80820A18 00A78C 026C+00 1/1 0/0 0/0 .text            execute__9daE_YMB_cFv */
 int daE_YMB_c::execute() {
     BOOL bVar1 = FALSE;
     if (mAction == 9 || ((mAction == 8 && mMode >= 3) || daPy_py_c::checkNowWolfEyeUp())) {
@@ -3151,17 +3086,14 @@ int daE_YMB_c::execute() {
     return 1;
 }
 
-/* 80820A18-80820A38 00A9F8 0020+00 2/1 0/0 0/0 .text            daE_YMB_Execute__FP9daE_YMB_c */
 static int daE_YMB_Execute(daE_YMB_c* i_this) {
     return i_this->execute();
 }
 
-/* 80820A38-80820A40 00AA18 0008+00 1/0 0/0 0/0 .text            daE_YMB_IsDelete__FP9daE_YMB_c */
 static int daE_YMB_IsDelete(daE_YMB_c* i_this) {
     return 1;
 }
 
-/* 80820A40-80820AD0 00AA20 0090+00 1/1 0/0 0/0 .text            _delete__9daE_YMB_cFv */
 int daE_YMB_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_YB");
 
@@ -3180,12 +3112,10 @@ int daE_YMB_c::_delete() {
     return 1;
 }
 
-/* 80820AD0-80820AF0 00AAB0 0020+00 1/0 0/0 0/0 .text            daE_YMB_Delete__FP9daE_YMB_c */
 static int daE_YMB_Delete(daE_YMB_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80820AF0-80820D68 00AAD0 0278+00 1/1 0/0 0/0 .text            CreateHeap__9daE_YMB_cFv */
 int daE_YMB_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_YB", BMDR_YB_TW);
     JUT_ASSERT(4196, modelData != NULL);
@@ -3228,13 +3158,11 @@ int daE_YMB_c::CreateHeap() {
     return 1;
 }
 
-/* 80820DB0-80820DD0 00AD90 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daE_YMB_c* i_this = (daE_YMB_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80820DD0-808211BC 00ADB0 03EC+00 1/1 0/0 0/0 .text            create__9daE_YMB_cFv */
 cPhs__Step daE_YMB_c::create() {
     fopAcM_ct(this, daE_YMB_c);
 
@@ -3310,14 +3238,12 @@ cPhs__Step daE_YMB_c::create() {
     return phase;
 }
 
-/* 808213F8-80821418 00B3D8 0020+00 1/0 0/0 0/0 .text            daE_YMB_Create__FP9daE_YMB_c */
 static int daE_YMB_Create(daE_YMB_c* i_this) {
     return i_this->create();
 }
 
 AUDIO_INSTANCES;
 
-/* 80821D74-80821D94 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_YMB_Method */
 static actor_method_class l_daE_YMB_Method = {
     (process_method_func)daE_YMB_Create,
     (process_method_func)daE_YMB_Delete,
@@ -3326,7 +3252,6 @@ static actor_method_class l_daE_YMB_Method = {
     (process_method_func)daE_YMB_Draw,
 };
 
-/* 80821D94-80821DC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YMB */
 extern actor_process_profile_definition g_profile_E_YMB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp
index 0f525f7b9f..54c33fcded 100644
--- a/src/d/actor/d_a_e_yr.cpp
+++ b/src/d/actor/d_a_e_yr.cpp
@@ -48,7 +48,7 @@ public:
         mDetectAngleGround = 20000;
     }
 
-    /* 808282CC */ virtual ~e_yrHIO_c() {}
+    virtual ~e_yrHIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -140,7 +140,6 @@ void e_yrHIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 8082220C-808225C0 0000EC 03B4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DJoint* joint = i_joint;
@@ -212,7 +211,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 808225C0-80822790 0004A0 01D0+00 1/1 0/0 0/0 .text            yr_disappear__FP10e_yr_class */
 static void yr_disappear(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -242,7 +240,6 @@ static void yr_disappear(e_yr_class* i_this) {
     }
 }
 
-/* 80822790-80822848 000670 00B8+00 8/8 0/0 0/0 .text            anm_init__FP10e_yr_classifUcf */
 static void anm_init(e_yr_class* i_this, int param_1, f32 param_2, u8 param_3, f32 param_4) {
     if (i_this->field_0x66b < 3) {
         i_this->mpMorfSO->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_Yr", param_1), param_3,
@@ -251,7 +248,6 @@ static void anm_init(e_yr_class* i_this, int param_1, f32 param_2, u8 param_3, f
     }
 }
 
-/* 80822848-80822874 000728 002C+00 3/3 0/0 0/0 .text            kuti_open__FP10e_yr_classsUl */
 static void kuti_open(e_yr_class* i_this, s16 param_1, u32 param_2) {
     if (i_this->field_0xe8a == 0) {
         i_this->field_0xe8a = param_1;
@@ -260,7 +256,6 @@ static void kuti_open(e_yr_class* i_this, s16 param_1, u32 param_2) {
     }
 }
 
-/* 80822874-80822954 000754 00E0+00 1/1 0/0 0/0 .text e_yr_player_bg_check__FP10e_yr_class */
 static int e_yr_player_bg_check(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -284,10 +279,8 @@ static int e_yr_player_bg_check(e_yr_class* i_this) {
     }
 }
 
-/* 80828DBC-80828E34 000014 0078+00 10/10 0/0 0/0 .bss             l_e_yrHIO */
 static e_yrHIO_c l_e_yrHIO;
 
-/* 80822954-80822AFC 000834 01A8+00 4/4 0/0 0/0 .text e_yr_player_view_check__FP10e_yr_class */
 static int e_yr_player_view_check(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -332,7 +325,6 @@ static int e_yr_player_view_check(e_yr_class* i_this) {
     return 0;
 }
 
-/* 80822AFC-80822D4C 0009DC 0250+00 1/1 0/0 0/0 .text            path_check__FP10e_yr_class */
 static void path_check(e_yr_class* i_this) {
     static u8 check_index[255];
 
@@ -405,7 +397,6 @@ static void path_check(e_yr_class* i_this) {
     }
 }
 
-/* 80822D4C-80822DB8 000C2C 006C+00 2/2 0/0 0/0 .text            pl_horse_check__FP10e_yr_class */
 static int pl_horse_check(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     if (daPy_getPlayerActorClass()->checkHorseRide() && dComIfGp_getHorseActor()->speedF > 20.0f) {
@@ -415,8 +406,6 @@ static int pl_horse_check(e_yr_class* i_this) {
     }
 }
 
-/* 80822DB8-80822E48 000C98 0090+00 1/1 0/0 0/0 .text            daE_Yr_shadowDraw__FP10e_yr_class
- */
 static void daE_Yr_shadowDraw(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -430,7 +419,6 @@ static void daE_Yr_shadowDraw(e_yr_class* i_this) {
                                    0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
 }
 
-/* 80822E48-80822F0C 000D28 00C4+00 1/0 0/0 0/0 .text            daE_Yr_Draw__FP10e_yr_class */
 static int daE_Yr_Draw(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -454,7 +442,6 @@ static int daE_Yr_Draw(e_yr_class* i_this) {
     return 1;
 }
 
-/* 80822F0C-80823148 000DEC 023C+00 6/6 0/0 0/0 .text            e_yr_pos_move__FP10e_yr_class */
 static void e_yr_pos_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -500,7 +487,6 @@ static void e_yr_pos_move(e_yr_class* i_this) {
     }
 }
 
-/* 80823148-80823284 001028 013C+00 1/1 0/0 0/0 .text e_yr_ground_pos_move__FP10e_yr_class */
 static void e_yr_ground_pos_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -530,7 +516,6 @@ static void e_yr_ground_pos_move(e_yr_class* i_this) {
     }
 }
 
-/* 80823284-808239F8 001164 0774+00 2/1 0/0 0/0 .text            e_yr_path_move__FP10e_yr_class */
 static void e_yr_path_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -787,7 +772,6 @@ static void e_yr_path_move(e_yr_class* i_this) {
     }
 }
 
-/* 808239F8-80823D3C 0018D8 0344+00 1/1 0/0 0/0 .text            e_yr_auto_move__FP10e_yr_class */
 static void e_yr_auto_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
@@ -870,7 +854,6 @@ static void e_yr_auto_move(e_yr_class* i_this) {
     e_yr_pos_move(i_this);
 }
 
-/* 80823D3C-80824BBC 001C1C 0E80+00 2/1 0/0 0/0 .text            e_yr_atack_move__FP10e_yr_class */
 static void e_yr_atack_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -1184,7 +1167,6 @@ static void e_yr_atack_move(e_yr_class* i_this) {
     }
 }
 
-/* 80824BBC-80825484 002A9C 08C8+00 1/1 0/0 0/0 .text            e_yr_horse_move__FP10e_yr_class */
 static void e_yr_horse_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     fopAc_ac_c* playerActor = dComIfGp_getPlayer(0);
@@ -1361,7 +1343,6 @@ static void e_yr_horse_move(e_yr_class* i_this) {
     }
 }
 
-/* 80825484-80825ADC 003364 0658+00 2/1 0/0 0/0 .text            e_yr_wait_move__FP10e_yr_class */
 static void e_yr_wait_move(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -1561,8 +1542,6 @@ static void e_yr_wait_move(e_yr_class* i_this) {
     }
 }
 
-/* 80825ADC-808260E8 0039BC 060C+00 2/1 0/0 0/0 .text            e_yr_su_wait_move__FP10e_yr_class
- */
 static void e_yr_su_wait_move(e_yr_class* i_this) {
     s32 old_0x6e0;
 
@@ -1758,7 +1737,6 @@ f32 dummy() {
     return -50.0f;
 }
 
-/* 808260E8-808264F4 003FC8 040C+00 1/1 0/0 0/0 .text            e_yr_damage__FP10e_yr_class */
 static s8 e_yr_damage(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
     fopEn_enemy_c* enemy = (fopEn_enemy_c*)actor;
@@ -1870,7 +1848,6 @@ static s8 e_yr_damage(e_yr_class* i_this) {
     return unkFlag1;
 }
 
-/* 808264F4-808267C0 0043D4 02CC+00 1/1 0/0 0/0 .text            damage_check__FP10e_yr_class */
 static void damage_check(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -1952,7 +1929,6 @@ static void damage_check(e_yr_class* i_this) {
     }
 }
 
-/* 808267C0-80826AFC 0046A0 033C+00 1/1 0/0 0/0 .text            ground_angle_set__FP10e_yr_class */
 static void ground_angle_set(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -2050,7 +2026,6 @@ static void ground_angle_set(e_yr_class* i_this) {
     cLib_addCalcAngleS2(&i_this->field_0x6f8.z, unkShort1, 1, 0x400);
 }
 
-/* 80826AFC-8082789C 0049DC 0DA0+00 2/1 0/0 0/0 .text            daE_Yr_Execute__FP10e_yr_class */
 static int daE_Yr_Execute(e_yr_class* i_this) {
     static s32 wing_j[4] = {12, 13, 17, 18};
 
@@ -2399,12 +2374,10 @@ static int daE_Yr_Execute(e_yr_class* i_this) {
     return 1;
 }
 
-/* 8082789C-808278A4 00577C 0008+00 1/0 0/0 0/0 .text            daE_Yr_IsDelete__FP10e_yr_class */
 static int daE_Yr_IsDelete(e_yr_class* i_this) {
     return 1;
 }
 
-/* 808278A4-808278F4 005784 0050+00 1/0 0/0 0/0 .text            daE_Yr_Delete__FP10e_yr_class */
 static int daE_Yr_Delete(e_yr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->mEnemy;
 
@@ -2420,7 +2393,6 @@ static int daE_Yr_Delete(e_yr_class* i_this) {
     return 1;
 }
 
-/* 808278F4-80827A30 0057D4 013C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     e_yr_class* yr = (e_yr_class*)i_this;
 
@@ -2446,7 +2418,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80827A30-80827D64 005910 0334+00 1/0 0/0 0/0 .text            daE_Yr_Create__FP10fopAc_ac_c */
 static int daE_Yr_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph at_sph_src = {
         {
@@ -2590,8 +2561,6 @@ static int daE_Yr_Create(fopAc_ac_c* i_this) {
     return loadResult;
 }
 
-/* ############################################################################################## */
-/* 80828CD0-80828CF0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_Yr_Method */
 static actor_method_class l_daE_Yr_Method = {
     (process_method_func)daE_Yr_Create,
     (process_method_func)daE_Yr_Delete,
@@ -2600,7 +2569,6 @@ static actor_method_class l_daE_Yr_Method = {
     (process_method_func)daE_Yr_Draw,
 };
 
-/* 80828CF0-80828D20 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_YR */
 extern actor_process_profile_definition g_profile_E_YR = {
     (u32)fpcLy_CURRENT_e,   // mLayerID
     7,                      // mListID
@@ -2618,6 +2586,5 @@ extern actor_process_profile_definition g_profile_E_YR = {
     fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
-/* 80827D64-80827F80 005C44 021C+00 1/1 0/0 0/0 .text            __ct__10e_yr_classFv */
 e_yr_class::e_yr_class() {
 }
diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp
index 7e981e629c..997517f4be 100644
--- a/src/d/actor/d_a_e_zh.cpp
+++ b/src/d/actor/d_a_e_zh.cpp
@@ -71,7 +71,6 @@ enum Particle {
     /* 0x8A70 */ ZL2_SMOKE00_7,
 };
 
-/* 8082F440-8082F480 000020 0040+00 0/1 0/0 0/0 .data cc_zhSph_src__22@unnamed@d_a_e_zh_cpp@ */
 namespace {
     static dCcD_SrcSph cc_zhSph_src = {
         {
@@ -112,7 +111,6 @@ namespace {
     };
 }
 
-/* 8082902C-8082907C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__12daE_ZH_HIO_cFv */
 daE_ZH_HIO_c::daE_ZH_HIO_c() {
     field_0x4 = -1;
     model_size = 1.0f;
@@ -126,13 +124,10 @@ daE_ZH_HIO_c::daE_ZH_HIO_c() {
 /* 8082F725 0003+00 data_8082F725 None */
 static u8 l_initHIO;
 
-/* 8082F734-8082F750 000054 001C+00 8/9 0/0 0/0 .bss             l_HIO */
 static daE_ZH_HIO_c l_HIO;
 
-/* 8082F750-8082F754 000070 0004+00 4/5 0/0 0/0 .bss             mStartFlag */
 static int mStartFlag;
 
-/* 8082907C-8082934C 00013C 02D0+00 1/1 0/0 0/0 .text            draw__8daE_ZH_cFv */
 int daE_ZH_c::draw() {
     GXColor i_color, i_color2;
     if (WREG_S(0) != 0) {
@@ -284,25 +279,21 @@ int daE_ZH_c::draw() {
     return 1;
 }
 
-/* 80829388-808293A8 000448 0020+00 1/0 0/0 0/0 .text            daE_ZH_Draw__FP8daE_ZH_c */
 static int daE_ZH_Draw(daE_ZH_c* i_this) {
     return i_this->draw();
 }
 
-/* 808293A8-80829454 000468 00AC+00 10/10 0/0 0/0 .text            setBck__8daE_ZH_cFiUcff */
 void daE_ZH_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", i_anm), i_attr, i_morf, 
                         i_rate, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 80829454-80829460 000514 000C+00 14/14 0/0 0/0 .text            setActionMode__8daE_ZH_cFii */
 void daE_ZH_c::setActionMode(int i_action, int i_mode) {
     mActionMode = i_action;
     mMoveMode = i_mode;
 }
 
-/* 80829460-80829500 000520 00A0+00 3/3 0/0 0/0 .text            s_BallSearch__FPvPv */
 static void* s_BallSearch(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball() &&
         ((((daE_ZH_c*)i_data)->bitSw == 16 && ((daObjCarry_c*)i_actor)->getType() == 8) || (((daE_ZH_c*)i_data)->bitSw == 17 && ((daObjCarry_c*)i_actor)->getType() == 9))) {
@@ -312,7 +303,6 @@ static void* s_BallSearch(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80829500-80829570 0005C0 0070+00 2/2 0/0 0/0 .text            s_BallSearch_Tag__FPvPv */
 static void* s_BallSearch_Tag(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->prm_chk_type_lightball()) {
         return i_actor;
@@ -321,7 +311,6 @@ static void* s_BallSearch_Tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80829570-80829658 000630 00E8+00 4/4 0/0 0/0 .text            startDemoCheck__8daE_ZH_cFv */
 bool daE_ZH_c::startDemoCheck() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera_class* camera2 = dComIfGp_getCamera(0);
@@ -340,7 +329,6 @@ bool daE_ZH_c::startDemoCheck() {
     return true;
 }
 
-/* 80829658-808298BC 000718 0264+00 2/2 0/0 0/0 .text            mBallBGCheck__8daE_ZH_cFv */
 void daE_ZH_c::mBallBGCheck() {
     mBallHosei.zero();
 
@@ -394,7 +382,6 @@ void daE_ZH_c::mBallBGCheck() {
     }
 }
 
-/* 808298BC-808299F8 00097C 013C+00 3/3 0/0 0/0 .text            mGateOpen__8daE_ZH_cFv */
 void daE_ZH_c::mGateOpen() {
     f32 reg_f31 = 0.0f;
     switch (field_0x794[2]) {
@@ -420,7 +407,6 @@ void daE_ZH_c::mGateOpen() {
     }
 }
 
-/* 808299F8-80829AD8 000AB8 00E0+00 4/4 0/0 0/0 .text            mColorSet__8daE_ZH_cFbff */
 bool daE_ZH_c::mColorSet(bool param_1, f32 param_2, f32 param_3) {
     bool rv;
 
@@ -443,7 +429,6 @@ bool daE_ZH_c::mColorSet(bool param_1, f32 param_2, f32 param_3) {
     return false;
 }
 
-/* 80829AD8-80829E44 000B98 036C+00 2/2 0/0 0/0 .text            mReturnLineMove__8daE_ZH_cFv */
 bool daE_ZH_c::mReturnLineMove() {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -507,7 +492,6 @@ bool daE_ZH_c::mReturnLineMove() {
     return false;
 }
 
-/* 80829E44-8082A01C 000F04 01D8+00 2/2 0/0 0/0 .text            mBallBgLineCheck__8daE_ZH_cFv */
 bool daE_ZH_c::mBallBgLineCheck() {
     dBgS_LinChk lin_chk;
     cXyz sp9c, end;
@@ -551,7 +535,6 @@ bool daE_ZH_c::mBallBgLineCheck() {
     return false;
 }
 
-/* 8082A01C-8082A390 0010DC 0374+00 2/2 0/0 0/0 .text            mSearchMove__8daE_ZH_cFUc */
 bool daE_ZH_c::mSearchMove(u8 param_1) {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -648,7 +631,6 @@ struct eff_dt {
     /* 0x4 */ int field_0x4;
 };
 
-/* 8082A390-8082A4C8 001450 0138+00 1/1 0/0 0/0 .text            mStartParticleSet__8daE_ZH_cFv */
 void daE_ZH_c::mStartParticleSet() {
     static eff_dt const START_EFF_DT[11] = {
         {ZL2_HAHEN_1, 0, 7}, {ZL2_SMOKE00_1, 0, 7}, {ZL2_HAHEN_2, 0, 9}, {ZL2_SMOKE00_2, 0, 9},
@@ -669,7 +651,6 @@ void daE_ZH_c::mStartParticleSet() {
     setBck(BCK_ZH_START, 0, 3.0f, 1.0f);
 }
 
-/* 8082A4C8-8082A534 001588 006C+00 1/1 0/0 0/0 .text            mCutTypeCheck__8daE_ZH_cFv */
 bool daE_ZH_c::mCutTypeCheck() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -686,7 +667,6 @@ bool daE_ZH_c::mCutTypeCheck() {
     return false;
 }
 
-/* 8082A534-8082A88C 0015F4 0358+00 1/1 0/0 0/0 .text            damage_check__8daE_ZH_cFv */
 void daE_ZH_c::damage_check() {
     if (field_0x7a8 != 0 || mActionMode == ACTION_EXECUTE_BALL_WAIT || mActionMode == ACTION_EXECUTE_RETURN_DEMO) {
         return;
@@ -760,7 +740,6 @@ void daE_ZH_c::damage_check() {
     mStts.Move();
 }
 
-/* 8082A88C-8082ABDC 00194C 0350+00 1/1 0/0 0/0 .text            executeStartDemo__8daE_ZH_cFv */
 void daE_ZH_c::executeStartDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp48;
@@ -825,7 +804,6 @@ void daE_ZH_c::executeStartDemo() {
     }
 }
 
-/* 8082ABDC-8082ACA8 001C9C 00CC+00 1/1 0/0 0/0 .text            executeWait__8daE_ZH_cFv */
 void daE_ZH_c::executeWait() {
     if (mS_Ball != NULL) {
         mS_Ball->current.pos.set(field_0x668);
@@ -848,7 +826,6 @@ void daE_ZH_c::executeWait() {
     cLib_addCalcPos(&current.pos, home.pos, 0.7f, 5.0f, 1.0f);
 }
 
-/* 8082ACA8-8082B284 001D68 05DC+00 2/1 0/0 0/0 .text            executeBallWait__8daE_ZH_cFv */
 void daE_ZH_c::executeBallWait() {
     dBgS_LinChk lin_chk;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -981,7 +958,6 @@ void daE_ZH_c::executeBallWait() {
     }
 }
 
-/* 8082B284-8082B820 002344 059C+00 2/1 0/0 0/0 .text            executeOpenStart__8daE_ZH_cFv */
 void daE_ZH_c::executeOpenStart() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp28, sp34;
@@ -1134,7 +1110,6 @@ void daE_ZH_c::executeOpenStart() {
     }
 }
 
-/* 8082B820-8082BA18 0028E0 01F8+00 1/1 0/0 0/0 .text            executeSearchMove__8daE_ZH_cFv */
 void daE_ZH_c::executeSearchMove() {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -1190,7 +1165,6 @@ void daE_ZH_c::executeSearchMove() {
     }
 }
 
-/* 8082BA18-8082BE20 002AD8 0408+00 1/1 0/0 0/0 .text            executeBgHitSHMove__8daE_ZH_cFv */
 void daE_ZH_c::executeBgHitSHMove() {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -1267,7 +1241,6 @@ void daE_ZH_c::executeBgHitSHMove() {
     }
 }
 
-/* 8082BE20-8082C670 002EE0 0850+00 1/1 0/0 0/0 .text            executeCatchMove__8daE_ZH_cFv */
 void daE_ZH_c::executeCatchMove() {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -1403,7 +1376,6 @@ void daE_ZH_c::executeCatchMove() {
     }
 }
 
-/* 8082C670-8082CD34 003730 06C4+00 2/1 0/0 0/0 .text            executeCatchFlyMove__8daE_ZH_cFv */
 void daE_ZH_c::executeCatchFlyMove() {
     if (mS_Ball == NULL) {
         setActionMode(ACTION_EXECUTE_FLY_DELETE, 0);
@@ -1586,7 +1558,6 @@ void daE_ZH_c::executeCatchFlyMove() {
     mS_Ball->current.pos.set(field_0x668);
 }
 
-/* 8082CD34-8082D154 003DF4 0420+00 1/1 0/0 0/0 .text            executeReturnDemo__8daE_ZH_cFv */
 void daE_ZH_c::executeReturnDemo() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz sp1c, sp28;
@@ -1660,7 +1631,6 @@ void daE_ZH_c::executeReturnDemo() {
     }
 }
 
-/* 8082D154-8082D2F0 004214 019C+00 1/1 0/0 0/0 .text            executeFlyDelete__8daE_ZH_cFv */
 void daE_ZH_c::executeFlyDelete() {
     switch (mMoveMode) {
         case 0:
@@ -1702,7 +1672,6 @@ void daE_ZH_c::executeFlyDelete() {
     }
 }
 
-/* 8082D2F0-8082D97C 0043B0 068C+00 1/1 0/0 0/0 .text            executeDamage__8daE_ZH_cFv */
 void daE_ZH_c::executeDamage() {
     cXyz sp2c, sp38;
 
@@ -1855,7 +1824,6 @@ void daE_ZH_c::executeDamage() {
     }
 }
 
-/* 8082D97C-8082D9B0 004A3C 0034+00 1/1 0/0 0/0 .text            executeDeadStop__8daE_ZH_cFv */
 void daE_ZH_c::executeDeadStop() {
     switch (mMoveMode) {
         case 0:
@@ -1870,7 +1838,6 @@ void daE_ZH_c::executeDeadStop() {
     }
 }
 
-/* 8082D9B0-8082DB64 004A70 01B4+00 1/1 0/0 0/0 .text            executeEntryCheck__8daE_ZH_cFv */
 void daE_ZH_c::executeEntryCheck() {
     daObjCarry_c* s_Ball = (daObjCarry_c *)fpcM_Search(s_BallSearch_Tag, this);
     if (s_Ball != NULL) {
@@ -1892,12 +1859,10 @@ void daE_ZH_c::executeEntryCheck() {
     }
 }
 
-/* 8082DB64-8082DB84 004C24 0020+00 1/1 0/0 0/0 .text            tagAction__8daE_ZH_cFv */
 void daE_ZH_c::tagAction() {
     executeEntryCheck();
 }
 
-/* 8082DB84-8082DE18 004C44 0294+00 2/1 0/0 0/0 .text            action__8daE_ZH_cFv */
 void daE_ZH_c::action() {
     mS_Ball = (daObjCarry_c*)fpcM_Search(s_BallSearch, this);
     damage_check();
@@ -1995,7 +1960,6 @@ void daE_ZH_c::action() {
     }
 }
 
-/* 8082DE18-8082DF44 004ED8 012C+00 1/1 0/0 0/0 .text            mtx_set__8daE_ZH_cFv */
 void daE_ZH_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -2017,7 +1981,6 @@ void daE_ZH_c::mtx_set() {
     }
 }
 
-/* 8082DF44-8082E2FC 005004 03B8+00 1/1 0/0 0/0 .text            cc_set__8daE_ZH_cFv */
 void daE_ZH_c::cc_set() {
     cXyz sp24, sp30;
     J3DModel* model = mpModelMorf->getModel();
@@ -2093,7 +2056,6 @@ void daE_ZH_c::cc_set() {
     }
 }
 
-/* 8082E2FC-8082E3C0 0053BC 00C4+00 1/1 0/0 0/0 .text            execute__8daE_ZH_cFv */
 int daE_ZH_c::execute() {
     if (field_0x7ae != 0) {
         return 1;
@@ -2124,17 +2086,14 @@ int daE_ZH_c::execute() {
     return 1;
 }
 
-/* 8082E3C0-8082E3E0 005480 0020+00 2/1 0/0 0/0 .text            daE_ZH_Execute__FP8daE_ZH_c */
 static int daE_ZH_Execute(daE_ZH_c* i_this) {
     return i_this->execute();
 }
 
-/* 8082E3E0-8082E3E8 0054A0 0008+00 1/0 0/0 0/0 .text            daE_ZH_IsDelete__FP8daE_ZH_c */
 static int daE_ZH_IsDelete(daE_ZH_c* i_this) {
     return 1;
 }
 
-/* 8082E3E8-8082E4C4 0054A8 00DC+00 1/1 0/0 0/0 .text            _delete__8daE_ZH_cFv */
 int daE_ZH_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_ZH");
 
@@ -2160,12 +2119,10 @@ int daE_ZH_c::_delete() {
     return 1;
 }
 
-/* 8082E4C4-8082E4E4 005584 0020+00 1/0 0/0 0/0 .text            daE_ZH_Delete__FP8daE_ZH_c */
 static int daE_ZH_Delete(daE_ZH_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8082E4E4-8082E6C8 0055A4 01E4+00 1/1 0/0 0/0 .text            CreateHeap__8daE_ZH_cFv */
 int daE_ZH_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZH", BMDV_ZH);
     JUT_ASSERT(3305, modelData != NULL);
@@ -2200,13 +2157,11 @@ int daE_ZH_c::CreateHeap() {
     return 1;
 }
 
-/* 8082E710-8082E730 0057D0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daE_ZH_c* i_this = (daE_ZH_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 8082E730-8082ECEC 0057F0 05BC+00 1/1 0/0 0/0 .text            create__8daE_ZH_cFv */
 cPhs__Step daE_ZH_c::create() {
     fopAcM_ct(this, daE_ZH_c);
 
@@ -2362,14 +2317,12 @@ cPhs__Step daE_ZH_c::create() {
 
 daE_ZH_c::daE_ZH_c() {}
 
-/* 8082F0F8-8082F118 0061B8 0020+00 1/0 0/0 0/0 .text            daE_ZH_Create__FP8daE_ZH_c */
 static int daE_ZH_Create(daE_ZH_c* i_this) {
     return i_this->create();
 }
 
 AUDIO_INSTANCES;
 
-/* 8082F60C-8082F62C -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ZH_Method */
 static actor_method_class l_daE_ZH_Method = {
     (process_method_func)daE_ZH_Create,
     (process_method_func)daE_ZH_Delete,
@@ -2378,7 +2331,6 @@ static actor_method_class l_daE_ZH_Method = {
     (process_method_func)daE_ZH_Draw,
 };
 
-/* 8082F62C-8082F65C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ZH */
 extern actor_process_profile_definition g_profile_E_ZH = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp
index 4eb53ab116..8c62cfbeea 100644
--- a/src/d/actor/d_a_e_zm.cpp
+++ b/src/d/actor/d_a_e_zm.cpp
@@ -49,8 +49,8 @@ enum Mode {
 
 class daE_ZM_HIO_c : public JORReflexible {
 public:
-    /* 8082F94C */ daE_ZM_HIO_c();
-    /* 80832800 */ virtual ~daE_ZM_HIO_c() {}
+    daE_ZM_HIO_c();
+    virtual ~daE_ZM_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -65,10 +65,8 @@ public:
     /* 0x1A */ s16 stun_time;                           // 麻痺時間 - Stun Time
 };
 
-/* 80832F80-80832F84 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80832F90-80832FAC 000018 001C+00 11/11 0/0 0/0 .bss             l_HIO */
 static daE_ZM_HIO_c l_HIO;
 
 namespace {
@@ -99,7 +97,6 @@ namespace {
     };
 } // namespace
 
-/* 8082F94C-8082F9A0 0000EC 0054+00 1/1 0/0 0/0 .text            __ct__12daE_ZM_HIO_cFv */
 daE_ZM_HIO_c::daE_ZM_HIO_c() {
     id = -1;
     model_size = 2.0f;
@@ -111,7 +108,6 @@ daE_ZM_HIO_c::daE_ZM_HIO_c() {
     wait_time_to_appear_after_attack = 100;
 }
 
-/* 8082F9A0-8082FBB4 000140 0214+00 1/1 0/0 0/0 .text            draw__8daE_ZM_cFv */
 int daE_ZM_c::draw() {
     if (arg0 == 10) {
         return 1;
@@ -158,24 +154,20 @@ int daE_ZM_c::draw() {
     return 1;
 }
 
-/* 8082FBB4-8082FBD4 000354 0020+00 1/0 0/0 0/0 .text            daE_ZM_Draw__FP8daE_ZM_c */
 static int daE_ZM_Draw(daE_ZM_c* i_this) {
     return i_this->draw();
 }
 
-/* 8082FBD4-8082FC80 000374 00AC+00 6/6 0/0 0/0 .text            setBck__8daE_ZM_cFiUcff */
 void daE_ZM_c::setBck(int i_anm, u8 i_attr, f32 i_morf, f32 i_rate) {
     mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_ZM", i_anm), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     mAnm = i_anm;
 }
 
-/* 8082FC80-8082FC8C 000420 000C+00 7/7 0/0 0/0 .text            setActionMode__8daE_ZM_cFii */
 void daE_ZM_c::setActionMode(int i_action, int i_actionMode) {
     mAction = i_action;
     mMode = i_actionMode;
 }
 
-/* 8082FC8C-808301E0 00042C 0554+00 1/1 0/0 0/0 .text            damage_check__8daE_ZM_cFv */
 void daE_ZM_c::damage_check() {
     if (field_0x723 != 0) {
         return;
@@ -276,7 +268,6 @@ void daE_ZM_c::damage_check() {
     mStts.Move();
 }
 
-/* 808301E0-80830288 000980 00A8+00 1/1 0/0 0/0 .text            mCutTypeCheck__8daE_ZM_cFv */
 bool daE_ZM_c::mCutTypeCheck() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -302,7 +293,6 @@ bool daE_ZM_c::mCutTypeCheck() {
     return false;
 }
 
-/* 80830288-8083033C 000A28 00B4+00 1/1 0/0 0/0 .text            s_PointSearch__FPvPv */
 static void* s_PointSearch(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_ZM && ((daE_ZM_c*)i_actor)->arg0 == 10 &&
         ((daE_ZM_c*)i_data)->arg2 == ((daE_ZM_c*)i_actor)->arg2) {
@@ -317,7 +307,6 @@ static void* s_PointSearch(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8083033C-80830398 000ADC 005C+00 1/1 0/0 0/0 .text            executeSearchPoint__8daE_ZM_cFv */
 void daE_ZM_c::executeSearchPoint() {
     if (mTimer == 0) {
         field_0x6e5 = 0;
@@ -326,7 +315,6 @@ void daE_ZM_c::executeSearchPoint() {
     }
 }
 
-/* 80830398-808309DC 000B38 0644+00 1/1 0/0 0/0 .text            executeWait__8daE_ZM_cFv */
 void daE_ZM_c::executeWait() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz i_scale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
@@ -437,7 +425,6 @@ void daE_ZM_c::executeWait() {
     }
 }
 
-/* 808309DC-80830AB8 00117C 00DC+00 1/1 0/0 0/0 .text            executeMove__8daE_ZM_cFv */
 void daE_ZM_c::executeMove() {
     switch (mMode) {
         case MODE_0:
@@ -456,7 +443,6 @@ void daE_ZM_c::executeMove() {
     }
 }
 
-/* 80830AB8-80830E28 001258 0370+00 1/1 0/0 0/0 .text            executeAttack__8daE_ZM_cFv */
 void daE_ZM_c::executeAttack() {
     cXyz i_scale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     J3DModel* model = mpModelMorf->getModel();
@@ -507,7 +493,6 @@ void daE_ZM_c::executeAttack() {
     }
 }
 
-/* 80830E28-808310C4 0015C8 029C+00 1/1 0/0 0/0 .text            executeDamage__8daE_ZM_cFv */
 void daE_ZM_c::executeDamage() {
     switch (mMode) {
         case MODE_0:
@@ -570,7 +555,6 @@ void daE_ZM_c::executeDamage() {
     }
 }
 
-/* 808310C4-80831474 001864 03B0+00 1/1 0/0 0/0 .text            executeDead__8daE_ZM_cFv */
 void daE_ZM_c::executeDead() {
     cXyz sp4c, sp58;
     csXyz angle;
@@ -647,7 +631,6 @@ void daE_ZM_c::executeDead() {
     }
 }
 
-/* 80831474-80831930 001C14 04BC+00 1/1 0/0 0/0 .text            executeBullet__8daE_ZM_cFv */
 void daE_ZM_c::executeBullet() {
     cXyz i_scale(l_HIO.model_size, l_HIO.model_size, l_HIO.model_size);
     cXyz sp38, sp44;
@@ -744,7 +727,6 @@ void daE_ZM_c::executeBullet() {
     }
 }
 
-/* 80831930-80831B08 0020D0 01D8+00 2/1 0/0 0/0 .text            action__8daE_ZM_cFv */
 void daE_ZM_c::action() {
     damage_check();
 
@@ -798,7 +780,6 @@ void daE_ZM_c::action() {
     }
 }
 
-/* 80831B08-80831B9C 0022A8 0094+00 2/2 0/0 0/0 .text            mtx_set__8daE_ZM_cFv */
 void daE_ZM_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::transM(0.0f, field_0x71c, 0.0f);
@@ -809,7 +790,6 @@ void daE_ZM_c::mtx_set() {
     mpModelMorf->modelCalc();
 }
 
-/* 80831B9C-80831D64 00233C 01C8+00 1/1 0/0 0/0 .text            cc_set__8daE_ZM_cFv */
 void daE_ZM_c::cc_set() {
     cXyz sp30, sp3c;
     J3DModel* model = mpModelMorf->getModel();
@@ -837,7 +817,6 @@ void daE_ZM_c::cc_set() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80831D64-80831E74 002504 0110+00 1/1 0/0 0/0 .text            execute__8daE_ZM_cFv */
 int daE_ZM_c::execute() {
     if (arg0 == 10) {
         return 1;
@@ -877,17 +856,14 @@ int daE_ZM_c::execute() {
     return 1;
 }
 
-/* 80831E74-80831E94 002614 0020+00 1/0 0/0 0/0 .text            daE_ZM_Execute__FP8daE_ZM_c */
 static int daE_ZM_Execute(daE_ZM_c* i_this) {
     return i_this->execute();
 }
 
-/* 80831E94-80831E9C 002634 0008+00 1/0 0/0 0/0 .text            daE_ZM_IsDelete__FP8daE_ZM_c */
 static int daE_ZM_IsDelete(daE_ZM_c* i_this) {
     return 1;
 }
 
-/* 80831E9C-80831F2C 00263C 0090+00 1/1 0/0 0/0 .text            _delete__8daE_ZM_cFv */
 int daE_ZM_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_ZM");
 
@@ -907,12 +883,10 @@ int daE_ZM_c::_delete() {
     return 1;
 }
 
-/* 80831F2C-80831F4C 0026CC 0020+00 1/0 0/0 0/0 .text            daE_ZM_Delete__FP8daE_ZM_c */
 static int daE_ZM_Delete(daE_ZM_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80831F4C-80832044 0026EC 00F8+00 1/1 0/0 0/0 .text            CreateHeap__8daE_ZM_cFv */
 int daE_ZM_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZM", BMDR_ZM);
 
@@ -926,12 +900,10 @@ int daE_ZM_c::CreateHeap() {
     return 1;
 }
 
-/* 80832044-80832064 0027E4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     return static_cast<daE_ZM_c*>(a_this)->CreateHeap();
 }
 
-/* 80832064-80832580 002804 051C+00 1/1 0/0 0/0 .text            create__8daE_ZM_cFv */
 cPhs__Step daE_ZM_c::create() {
     fopAcM_ct(this, daE_ZM_c);
 
@@ -1050,12 +1022,10 @@ cPhs__Step daE_ZM_c::create() {
     return phase;
 }
 
-/* 80832798-808327B8 002F38 0020+00 1/0 0/0 0/0 .text            daE_ZM_Create__FP8daE_ZM_c */
 static int daE_ZM_Create(daE_ZM_c* i_this) {
     return i_this->create();
 }
 
-/* 80832EB0-80832ED0 -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ZM_Method */
 static actor_method_class l_daE_ZM_Method = {
     (process_method_func)daE_ZM_Create,
     (process_method_func)daE_ZM_Delete,
@@ -1064,7 +1034,6 @@ static actor_method_class l_daE_ZM_Method = {
     (process_method_func)daE_ZM_Draw,
 };
 
-/* 80832ED0-80832F00 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ZM */
 extern actor_process_profile_definition g_profile_E_ZM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp
index 343feda135..ad7d54b790 100644
--- a/src/d/actor/d_a_e_zs.cpp
+++ b/src/d/actor/d_a_e_zs.cpp
@@ -11,21 +11,15 @@
 
 class daE_ZS_HIO_c {
 public:
-    /* 808330AC */ daE_ZS_HIO_c();
-    /* 80834DDC */ virtual ~daE_ZS_HIO_c() {}
+    daE_ZS_HIO_c();
+    virtual ~daE_ZS_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
     /* 0xc */ f32 field_0xc;
 };
 
-//
-// Declarations:
-//
-
 namespace {
-/* 80835384-808353C8 000038 0044+00 1/1 0/0 0/0 .data            cc_zs_src__22@unnamed@d_a_e_zs_cpp@
- */
 static dCcD_SrcCyl cc_zs_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x43}, 0x75}},  // mObj
@@ -41,14 +35,12 @@ static dCcD_SrcCyl cc_zs_src = {
 };
 }
 
-/* 808330AC-808330DC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__12daE_ZS_HIO_cFv */
 daE_ZS_HIO_c::daE_ZS_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.4;
     field_0xc = 1200.0f;
 }
 
-/* 808330DC-808331C4 00011C 00E8+00 1/1 0/0 0/0 .text            draw__8daE_ZS_cFv */
 int daE_ZS_c::draw() {
     if (field_0x673 == 0) {
         return 1;
@@ -66,32 +58,25 @@ int daE_ZS_c::draw() {
     return 1;
 }
 
-/* 808331C4-808331E4 000204 0020+00 1/0 0/0 0/0 .text            daE_ZS_Draw__FP8daE_ZS_c */
 static int daE_ZS_Draw(daE_ZS_c* i_this) {
     return i_this->draw();
 }
 
-/* 808331E4-80833290 000224 00AC+00 4/4 0/0 0/0 .text            setBck__8daE_ZS_cFiUcff */
 void daE_ZS_c::setBck(int i_res_index, u8 i_attr, f32 i_morf, f32 i_rate) {
     J3DAnmTransform* anmTransform = (J3DAnmTransform*)dComIfG_getObjectRes("E_ZS", i_res_index);
     mpMorf->setAnm(anmTransform, i_attr, i_morf, i_rate, 0.0f, -1.0f);
     mResIndex = i_res_index;
 }
 
-/* 80833290-8083329C 0002D0 000C+00 7/7 0/0 0/0 .text            setActionMode__8daE_ZS_cFii */
 void daE_ZS_c::setActionMode(int i_action, int i_mode) {
     mAction = i_action;
     mMode = i_mode;
 }
 
-/* ############################################################################################## */
-/* 808354A0-808354A4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 lbl_259_bss_8;
 
-/* 808354B0-808354C0 000018 0010+00 6/6 0/0 0/0 .bss             l_HIO */
 static daE_ZS_HIO_c l_HIO;
 
-/* 8083329C-8083364C 0002DC 03B0+00 1/1 0/0 0/0 .text            damage_check__8daE_ZS_cFv */
 void daE_ZS_c::damage_check() {
     static u16 eff_Damage_id[] = {0x8BE9, 0x8BEA, 0x8BEB};
 
@@ -148,7 +133,6 @@ void daE_ZS_c::damage_check() {
     }
 }
 
-/* 8083364C-80833698 00068C 004C+00 4/4 0/0 0/0 .text            s_BossSearch__FPvPv */
 static void* s_BossSearch(void* i_lhs, void* i_rhs) {
     if (fopAcM_IsActor(i_lhs) && fopAcM_GetName(i_lhs) == 0xf6) {
         return i_lhs;
@@ -156,7 +140,6 @@ static void* s_BossSearch(void* i_lhs, void* i_rhs) {
     return NULL;
 }
 
-/* 80833698-80833964 0006D8 02CC+00 2/2 0/0 0/0 .text            mBossHandCheck__8daE_ZS_cFv */
 u8 daE_ZS_c::mBossHandCheck() {
     daB_DS_c* stallord_boss = (daB_DS_c*) fpcM_Search(s_BossSearch, this);
     if (stallord_boss == NULL) {
@@ -179,11 +162,9 @@ u8 daE_ZS_c::mBossHandCheck() {
     return 0;
 }
 
-/* 808354C0-808354C4 -00001 0004+00 3/3 0/0 0/0 .bss             None */
 static u8 lbl_259_bss_28;
 static u8 lbl_259_bss_29;
 
-/* 80833964-80833D30 0009A4 03CC+00 1/1 0/0 0/0 .text            executeAppear__8daE_ZS_cFv */
 void daE_ZS_c::executeAppear() {
     static u16 eff_Appear_id[] = {0x8BE7, 0x8BE8};
 
@@ -275,7 +256,6 @@ void daE_ZS_c::executeAppear() {
     }
 }
 
-/* 80833D30-80833F1C 000D70 01EC+00 1/2 0/0 0/0 .text            executeWait__8daE_ZS_cFv */
 void daE_ZS_c::executeWait() {
     switch (mMode) {
         case 0:
@@ -315,7 +295,6 @@ void daE_ZS_c::executeWait() {
     }
 }
 
-/* 80833F1C-80834108 000F5C 01EC+00 1/1 0/0 0/0 .text            executeDamage__8daE_ZS_cFv */
 void daE_ZS_c::executeDamage() {
     static u16 w_eff_id[] = {0x854C, 0x854D, 0x854E, 0x854F};
 
@@ -352,7 +331,6 @@ void daE_ZS_c::executeDamage() {
     }
 }
 
-/* 80834108-808342C8 001148 01C0+00 1/1 0/0 0/0 .text            executeDrive__8daE_ZS_cFv */
 void daE_ZS_c::executeDrive() {
     switch (mMode) {
         case 0:
@@ -389,7 +367,6 @@ void daE_ZS_c::executeDrive() {
     }
 }
 
-/* 808342C8-80834478 001308 01B0+00 1/1 0/0 0/0 .text            action__8daE_ZS_cFv */
 void daE_ZS_c::action() {
     damage_check();
     switch (mAction) {
@@ -434,7 +411,6 @@ void daE_ZS_c::action() {
     }
 }
 
-/* 80834478-80834518 0014B8 00A0+00 1/1 0/0 0/0 .text            mtx_set__8daE_ZS_cFv */
 void daE_ZS_c::mtx_set() {
     if (field_0x673) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -446,7 +422,6 @@ void daE_ZS_c::mtx_set() {
     }
 }
 
-/* 80834518-80834650 001558 0138+00 1/1 0/0 0/0 .text            cc_set__8daE_ZS_cFv */
 void daE_ZS_c::cc_set() {
     if (field_0x673) {
         cXyz my_vec_0;
@@ -467,7 +442,6 @@ void daE_ZS_c::cc_set() {
     }
 }
 
-/* 80834650-808346BC 001690 006C+00 1/1 0/0 0/0 .text            execute__8daE_ZS_cFv */
 int daE_ZS_c::execute() {
     if (field_0x670 != 0) {
         --field_0x670;
@@ -483,17 +457,14 @@ int daE_ZS_c::execute() {
     return 1;
 }
 
-/* 808346BC-808346DC 0016FC 0020+00 2/1 0/0 0/0 .text            daE_ZS_Execute__FP8daE_ZS_c */
 static int daE_ZS_Execute(daE_ZS_c* i_this) {
     return i_this->execute();
 }
 
-/* 808346DC-808346E4 00171C 0008+00 1/0 0/0 0/0 .text            daE_ZS_IsDelete__FP8daE_ZS_c */
 static int daE_ZS_IsDelete(daE_ZS_c* i_this) {
     return true;
 }
 
-/* 808346E4-80834758 001724 0074+00 1/1 0/0 0/0 .text            _delete__8daE_ZS_cFv */
 int daE_ZS_c::_delete() {
     dComIfG_resDelete(&mPhase, "E_ZS");
     if (field_0xa28) {
@@ -507,12 +478,10 @@ int daE_ZS_c::_delete() {
     return 1;
 }
 
-/* 80834758-80834778 001798 0020+00 1/0 0/0 0/0 .text            daE_ZS_Delete__FP8daE_ZS_c */
 static int daE_ZS_Delete(daE_ZS_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80834778-80834864 0017B8 00EC+00 1/1 0/0 0/0 .text            CreateHeap__8daE_ZS_cFv */
 int daE_ZS_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_ZS", 0xC);
     JUT_ASSERT(0x3e9, modelData != NULL);
@@ -524,12 +493,10 @@ int daE_ZS_c::CreateHeap() {
     return 1;
 }
 
-/* 80834864-80834884 0018A4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static void useHeapInit(fopAc_ac_c* i_this) {
     static_cast<daE_ZS_c*>(i_this)->CreateHeap();
 }
 
-/* 80834884-80834BA8 0018C4 0324+00 1/1 0/0 0/0 .text            create__8daE_ZS_cFv */
 int daE_ZS_c::create() {
     fopAcM_ct(this, daE_ZS_c);
     int phase = dComIfG_resLoad(&mPhase, "E_ZS");
@@ -588,12 +555,10 @@ int daE_ZS_c::create() {
     return phase;
 }
 
-/* 80834D74-80834D94 001DB4 0020+00 1/0 0/0 0/0 .text            daE_ZS_Create__FP8daE_ZS_c */
 static int daE_ZS_Create(daE_ZS_c* i_this) {
     return i_this->create();
 }
 
-/* 808353DC-808353FC -00001 0020+00 1/0 0/0 0/0 .data            l_daE_ZS_Method */
 static actor_method_class l_daE_ZS_Method = {
     (process_method_func)daE_ZS_Create,
     (process_method_func)daE_ZS_Delete,
@@ -602,7 +567,6 @@ static actor_method_class l_daE_ZS_Method = {
     (process_method_func)daE_ZS_Draw,
 };
 
-/* 808353FC-8083542C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_E_ZS */
 extern actor_process_profile_definition g_profile_E_ZS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp
index 8044b25c1f..1d2fd1c680 100644
--- a/src/d/actor/d_a_econt.cpp
+++ b/src/d/actor/d_a_econt.cpp
@@ -12,12 +12,10 @@
 
 u8 data_805197E0[4];
 
-/* 80519518-80519520 000078 0008+00 1/0 0/0 0/0 .text            daEcont_Draw__FP11econt_class */
 static int daEcont_Draw(econt_class* i_this) {
     return 1;
 }
 
-/* 80519520-80519578 000080 0058+00 1/1 0/0 0/0 .text            s_rd_sub__FPvPv */
 static void* s_rd_sub(void* i_this, void* param_1) {
     if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_RD) {
         data_805197E0[0]++;
@@ -25,7 +23,6 @@ static void* s_rd_sub(void* i_this, void* param_1) {
     return 0;
 }
 
-/* 80519578-80519664 0000D8 00EC+00 1/1 0/0 0/0 .text            rider_game__FP11econt_class */
 static void rider_game(econt_class* i_this) {
     if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && dComIfGp_event_runCheck() == 0) {
         data_805197E0[0] = 0;
@@ -46,7 +43,6 @@ static void rider_game(econt_class* i_this) {
     }
 }
 
-/* 80519664-805196B4 0001C4 0050+00 1/0 0/0 0/0 .text            daEcont_Execute__FP11econt_class */
 static int daEcont_Execute(econt_class* i_this) {
     for (int i = 0; i < 3; i++) {
         if (i_this->field_0x5b8[i] != 0) {
@@ -57,19 +53,15 @@ static int daEcont_Execute(econt_class* i_this) {
     return 1;
 }
 
-/* 805196B4-805196BC 000214 0008+00 1/0 0/0 0/0 .text            daEcont_IsDelete__FP11econt_class
- */
 static int daEcont_IsDelete(econt_class* i_this) {
     return 1;
 }
 
-/* 805196BC-805196E4 00021C 0028+00 1/0 0/0 0/0 .text            daEcont_Delete__FP11econt_class */
 static int daEcont_Delete(econt_class* i_this) {
     dComIfG_TimerDeleteRequest(8);
     return 1;
 }
 
-/* 805196E4-80519774 000244 0090+00 1/0 0/0 0/0 .text            daEcont_Create__FP10fopAc_ac_c */
 static int daEcont_Create(fopAc_ac_c* i_this) {
     econt_class* encounter = (econt_class*)i_this;
     fopAcM_ct(i_this, econt_class);
@@ -79,8 +71,6 @@ static int daEcont_Create(fopAc_ac_c* i_this) {
     
 }
 
-/* ############################################################################################## */
-/* 8051978C-805197AC -00001 0020+00 1/0 0/0 0/0 .data            l_daEcont_Method */
 static actor_method_class l_daEcont_Method = {
     (process_method_func)daEcont_Create,
     (process_method_func)daEcont_Delete,
@@ -89,7 +79,6 @@ static actor_method_class l_daEcont_Method = {
     (process_method_func)daEcont_Draw
 };
 
-/* 805197AC-805197DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ECONT */
 extern actor_process_profile_definition g_profile_ECONT = {
     fpcLy_CURRENT_e,        // mLayerID   
     8,                      // mListID 
diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp
index 898dd82e92..926304e509 100644
--- a/src/d/actor/d_a_ep.cpp
+++ b/src/d/actor/d_a_ep.cpp
@@ -11,7 +11,6 @@
 #include "d/d_s_play.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 804681F8-804682F8 000078 0100+00 1/1 0/0 0/0 .text            hahen_draw__FP8ep_class */
 static void hahen_draw(ep_class* i_this) {
     fopAc_ac_c* a_this = i_this;
     ep_hahen_s* epHahenS = i_this->mHahen;
@@ -34,7 +33,6 @@ static void hahen_draw(ep_class* i_this) {
     }
 }
 
-/* 804682F8-80468A70 000178 0778+00 2/2 0/0 0/0 .text            move_calc__FP8ep_classP10ep_hahen_s */
 static int move_calc(ep_class* i_this, ep_hahen_s* hahen_s) {
     fopAc_ac_c* a_this = i_this;
     static u16 w_eff_id[4] = {
@@ -153,12 +151,10 @@ static int move_calc(ep_class* i_this, ep_hahen_s* hahen_s) {
     return rv;
 }
 
-/* 80468A70-80468A90 0008F0 0020+00 1/1 0/0 0/0 .text hahen_normal__FP8ep_classP10ep_hahen_s */
 static void hahen_normal(ep_class* i_this, ep_hahen_s* hahen_s) {
     move_calc(i_this, hahen_s);
 }
 
-/* 80468A90-80468E50 000910 03C0+00 1/1 0/0 0/0 .text hahen_water__FP8ep_classP10ep_hahen_s */
 static void hahen_water(ep_class* i_this, ep_hahen_s* hahen_s) {
     fopAc_ac_c* a_this = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -214,7 +210,6 @@ static void hahen_water(ep_class* i_this, ep_hahen_s* hahen_s) {
     fopAcM_effHamonSet(&hahen_s->field_0xa0, &hahen_s->field_0x4, 1.0f, 0.05f);
 }
 
-/* 80468E50-80469034 000CD0 01E4+00 1/1 0/0 0/0 .text hahen_carry__FP8ep_classP10ep_hahen_s */
 static void hahen_carry(ep_class* i_this, ep_hahen_s* hahen_s) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -257,7 +252,6 @@ static void hahen_carry(ep_class* i_this, ep_hahen_s* hahen_s) {
     }
 }
 
-/* 80469034-804690F8 000EB4 00C4+00 1/1 0/0 0/0 .text hahen_cast__FP8ep_classP10ep_hahen_s */
 static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {
     cXyz local_1c, local_28;
 
@@ -279,7 +273,6 @@ static void hahen_cast(ep_class* i_this, ep_hahen_s* hahen_s) {
     dComIfG_Ccsp()->Set(&i_this->mSph2);
 }
 
-/* 804690F8-80469568 000F78 0470+00 1/1 0/0 0/0 .text            hahen_move__FP8ep_class */
 static void hahen_move(ep_class* i_this) {
     fopAc_ac_c* a_this = i_this;
     ep_hahen_s* epHahenS;
@@ -355,7 +348,6 @@ static void hahen_move(ep_class* i_this) {
     }
 }
 
-/* 80469568-804695F8 0013E8 0090+00 1/0 0/0 0/0 .text            daEp_Draw__FP8ep_class */
 static int daEp_Draw(ep_class* i_this) {
     if (i_this->mpModel) {
         if (i_this->field_0x602 != 1) {
@@ -372,7 +364,6 @@ static int daEp_Draw(ep_class* i_this) {
     return 1;
 }
 
-/* 804695F8-80469658 001478 0060+00 2/2 0/0 0/0 .text            ep_switch_event_end__FP8ep_class */
 static BOOL ep_switch_event_end(ep_class* i_this) {
     int rv = FALSE;
     if (dComIfGp_evmng_endCheck("SHOKUDAI_SWITCH") != 0) {
@@ -382,7 +373,6 @@ static BOOL ep_switch_event_end(ep_class* i_this) {
     return rv;
 }
 
-/* 80469658-80469700 0014D8 00A8+00 1/1 0/0 0/0 .text            ep_switch_event_begin__FP8ep_class */
 static BOOL ep_switch_event_begin(ep_class* i_this) {
     BOOL rv = 0;
 
@@ -399,7 +389,6 @@ static BOOL ep_switch_event_begin(ep_class* i_this) {
     return rv;
 }
 
-/* 80469700-804697F4 001580 00F4+00 1/1 0/0 0/0 .text            ep_switch_event_move__FP8ep_class */
 static int ep_switch_event_move(ep_class* i_this) {
     static char* actions[2] = {
         "WAIT",
@@ -430,7 +419,6 @@ static int ep_switch_event_move(ep_class* i_this) {
     return rv;
 }
 
-/* 804697F4-80469EDC 001674 06E8+00 1/1 0/0 0/0 .text            ep_move__FP8ep_class */
 static void ep_move(ep_class* i_this) {
     static u16 l_particle_fire_A[2] = {
         0x0100, 0x8110,
@@ -616,7 +604,6 @@ static void ep_move(ep_class* i_this) {
     return;
 }
 
-/* 80469EDC-8046A0A8 001D5C 01CC+00 1/1 0/0 0/0 .text            daEp_set_mtx__FP8ep_class */
 static void daEp_set_mtx(ep_class* i_this) {
     if (i_this->mpModel) {
         f32 fVar1 = 70.0f;
@@ -656,7 +643,6 @@ static void daEp_set_mtx(ep_class* i_this) {
     }
 }
 
-/* 8046A0A8-8046A6D4 001F28 062C+00 1/0 0/0 0/0 .text            daEp_Execute__FP8ep_class */
 static int daEp_Execute(ep_class* i_this) {
     static u16 eff_name[3] = {
         0x8340, 0x8341, 0x8342,
@@ -797,24 +783,20 @@ static int daEp_Execute(ep_class* i_this) {
     return 1;
 }
 
-/* 8046A6D4-8046A6DC 002554 0008+00 1/0 0/0 0/0 .text            daEp_IsDelete__FP8ep_class */
 static int daEp_IsDelete(ep_class* i_this) {
     return 1;
 }
 
-/* 8046A6DC-8046A724 00255C 0048+00 1/0 0/0 0/0 .text            daEp_Delete__FP8ep_class */
 static int daEp_Delete(ep_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Ep");
     dKy_plight_cut(&i_this->mLightInf);
     return 1;
 }
 
-/* 8046B13C-8046B15C 000044 0020+00 1/1 0/0 0/0 .data            model_d */
 static int model_d[8] = {
     3,4, 5, 6, 6, 6, 6, 6,
 };
 
-/* 8046A724-8046A858 0025A4 0134+00 1/1 0/0 0/0 .text            daEp_CreateHeap__FP10fopAc_ac_c */
 static int daEp_CreateHeap(fopAc_ac_c* a_this) {
     ep_class* i_this = (ep_class*)a_this;
 
@@ -843,7 +825,6 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
     
 }
 
-/* 8046A858-8046A8D4 0026D8 007C+00 1/1 0/0 0/0 .text            daEp_CreateInit__FP10fopAc_ac_c */
 static void daEp_CreateInit(fopAc_ac_c* a_this) {
     ep_class* i_this = (ep_class*)a_this;
 
@@ -857,7 +838,6 @@ static void daEp_CreateInit(fopAc_ac_c* a_this) {
     i_this->field_0x602 = 0;
 }
 
-/* 8046A8D4-8046AB2C 002754 0258+00 1/0 0/0 0/0 .text            daEp_Create__FP10fopAc_ac_c */
 static int daEp_Create(fopAc_ac_c* a_this) {
     static dCcD_SrcSph sph_src = {
         {
@@ -966,7 +946,6 @@ static int daEp_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 8046B220-8046B240 -00001 0020+00 1/0 0/0 0/0 .data            l_daEp_Method */
 static actor_method_class l_daEp_Method = {
     (process_method_func)daEp_Create,
     (process_method_func)daEp_Delete,
@@ -975,7 +954,6 @@ static actor_method_class l_daEp_Method = {
     (process_method_func)daEp_Draw,
 };
 
-/* 8046B240-8046B270 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_EP */
 extern actor_process_profile_definition g_profile_EP = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp
index b17bf3e819..cd9cf50107 100644
--- a/src/d/actor/d_a_formation_mng.cpp
+++ b/src/d/actor/d_a_formation_mng.cpp
@@ -9,13 +9,11 @@
 #include "d/d_save.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 808378A8-808378C0 000000 0018+00 12/12 0/0 0/0 .rodata          M_attr__10daFmtMng_c */
 FmtMngAttributes const daFmtMng_c::M_attr = {
     0x14, 6.0f, 0.5f,
     120.0f, 150.0f, 10, 0x4000,
 };
 
-/* 80835558-80835624 000078 00CC+00 1/0 0/0 0/0 .text            initWait__10daFmtMng_cFv */
 void daFmtMng_c::initWait() {
     FmtMember_c* member = mMember;
     fopAc_ac_c* npcFgd = NULL;
@@ -28,7 +26,6 @@ void daFmtMng_c::initWait() {
     initMemberPos();
 }
 
-/* 80835624-80835B24 000144 0500+00 2/2 0/0 0/0 .text            initMemberPos__10daFmtMng_cFv */
 void daFmtMng_c::initMemberPos() {
     int i;
     int j;
@@ -65,7 +62,6 @@ void daFmtMng_c::initMemberPos() {
     }
 }
 
-/* 808379C4-80837A3C 000098 0078+00 6/7 0/0 0/0 .data            ActionTable__10daFmtMng_c */
 daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = {
     &daFmtMng_c::initWait, &daFmtMng_c::executeWait,
     &daFmtMng_c::initWalk, &daFmtMng_c::executeWalk,
@@ -75,7 +71,6 @@ daFmtMng_c::ActionFunc daFmtMng_c::ActionTable[10] = {
 
 };
 
-/* 80835B24-80835D28 000644 0204+00 1/0 0/0 0/0 .text            executeWait__10daFmtMng_cFv */
 void daFmtMng_c::executeWait() {
     int time = getTime();
     if (time >= mStartTime && time < mEndTime) {
@@ -105,7 +100,6 @@ void daFmtMng_c::executeWait() {
     }
 }
 
-/* 80835D28-80835DEC 000848 00C4+00 1/0 0/0 0/0 .text            initWalk__10daFmtMng_cFv */
 void daFmtMng_c::initWalk() {
     FmtMember_c* member = mMember;
     fopAc_ac_c* npcFgd = NULL;
@@ -117,7 +111,6 @@ void daFmtMng_c::initWalk() {
     }
 }
 
-/* 80835DEC-8083622C 00090C 0440+00 1/0 0/0 0/0 .text            executeWalk__10daFmtMng_cFv */
 void daFmtMng_c::executeWalk() {
     setMoveSpeed();
     FmtPos_c* member = mPos;
@@ -131,7 +124,6 @@ void daFmtMng_c::executeWalk() {
     setMemberPos();
 }
 
-/* 8083622C-808365B0 000D4C 0384+00 1/1 0/0 0/0 .text setMovePath__10daFmtMng_cFP8FmtPos_ci */
 void daFmtMng_c::setMovePath(FmtPos_c* i_pos, int param_2) {
     if (i_pos->checkPoint(i_pos->field_0x10, speedF)) {
         if (param_2 == 0) {
@@ -157,7 +149,6 @@ void daFmtMng_c::setMovePath(FmtPos_c* i_pos, int param_2) {
     }
 }
 
-/* 808365B0-8083665C 0010D0 00AC+00 1/1 0/0 0/0 .text checkPathEnd__15daFmtMng_Path_cF4cXyzf */
 bool daFmtMng_Path_c::checkPathEnd(cXyz param_1, f32 param_2) {
     if (isPathClose()) {
         return false;
@@ -174,7 +165,6 @@ bool daFmtMng_Path_c::checkPathEnd(cXyz param_1, f32 param_2) {
     return false;
 }
 
-/* 8083665C-80836810 00117C 01B4+00 2/2 0/0 0/0 .text checkPoint__15daFmtMng_Path_cF4cXyzf */
 bool daFmtMng_Path_c::checkPoint(cXyz i_point, f32 param_2) {
     f32 dVar8 = i_point.absXZ(dPath_GetPnt(mPath, field_0x4)->m_position);
     field_0x8 -= param_2;
@@ -184,7 +174,6 @@ bool daFmtMng_Path_c::checkPoint(cXyz i_point, f32 param_2) {
     return false;
 }
 
-/* 80836810-808368A4 001330 0094+00 1/0 0/0 0/0 .text            initReverse__10daFmtMng_cFv */
 void daFmtMng_c::initReverse() {
     speedF = 0.0f;
     FmtMember_c* member = mMember;
@@ -197,7 +186,6 @@ void daFmtMng_c::initReverse() {
     }
 }
 
-/* 808368A4-80836C24 0013C4 0380+00 1/0 0/0 0/0 .text            executeReverse__10daFmtMng_cFv */
 void daFmtMng_c::executeReverse() {
     FmtMember_c* member;
     bool bVar1;
@@ -243,7 +231,6 @@ void daFmtMng_c::executeReverse() {
     }
 }
 
-/* 80836C64-80836E20 001784 01BC+00 1/0 0/0 0/0 .text            initMotion__10daFmtMng_cFv */
 void daFmtMng_c::initMotion() {
     speedF = 0.0f;
     u32 arg0 = mPos->getArg0();
@@ -279,7 +266,6 @@ void daFmtMng_c::initMotion() {
     }
 }
 
-/* 80836E20-80836F78 001940 0158+00 1/0 0/0 0/0 .text            executeMotion__10daFmtMng_cFv */
 void daFmtMng_c::executeMotion() {
     if (mDayOfWeek == dKy_get_dayofweek() && field_0x59c < getTime()) {
         FmtMember_c* member = mMember;
@@ -297,7 +283,6 @@ void daFmtMng_c::executeMotion() {
     }
 }
 
-/* 80836F78-80837078 001A98 0100+00 1/0 0/0 0/0 .text            initFight__10daFmtMng_cFv */
 void daFmtMng_c::initFight() {
     speedF = 0.0f;
     FmtMember_c* member = mMember;
@@ -313,7 +298,6 @@ void daFmtMng_c::initFight() {
     dComIfGs_onSaveDunSwitch(60);
 }
 
-/* 80837078-80837250 001B98 01D8+00 1/0 0/0 0/0 .text            executeFight__10daFmtMng_cFv */
 void daFmtMng_c::executeFight() {
     FmtMember_c* member = mMember;
     fopAc_ac_c* npcFgd = NULL;
@@ -336,41 +320,33 @@ void daFmtMng_c::executeFight() {
     }
 }
 
-/* 80837250-80837258 001D70 0008+00 1/0 0/0 0/0 .text            daFmtMng_Draw__FP10daFmtMng_c */
 static bool daFmtMng_Draw(daFmtMng_c* param_0) {
     return true;
 }
 
-/* 80837258-808373BC 001D78 0164+00 1/0 0/0 0/0 .text            daFmtMng_Execute__FP10daFmtMng_c */
 static int daFmtMng_Execute(daFmtMng_c* param_0) {
     return param_0->execute();
 }
 
-/* 808373BC-808373C4 001EDC 0008+00 1/0 0/0 0/0 .text            daFmtMng_IsDelete__FP10daFmtMng_c
- */
 static int daFmtMng_IsDelete(daFmtMng_c* param_0) {
     return 1;
 }
 
-/* 808373C4-80837458 001EE4 0094+00 1/0 0/0 0/0 .text            daFmtMng_Delete__FP10daFmtMng_c */
 static int daFmtMng_Delete(daFmtMng_c* param_1) {
     param_1->~daFmtMng_c();
     return 1;
 }
 
-/* 80837494-808374B4 001FB4 0020+00 1/0 0/0 0/0 .text            daFmtMng_Create__FP10fopAc_ac_c */
 static int daFmtMng_Create(fopAc_ac_c* param_0) {
     return static_cast<daFmtMng_c*>(param_0)->create();
 }
 
-/* 808374B4-8083750C 001FD4 0058+00 1/1 0/0 0/0 .text            create__10daFmtMng_cFv */
 int daFmtMng_c::create() {
     fopAcM_ct(this, daFmtMng_c);
     create_init();
     return 4;
 }
 
-/* 8083750C-80837798 00202C 028C+00 1/1 0/0 0/0 .text            create_init__10daFmtMng_cFv */
 void daFmtMng_c::create_init() {
     fopAcM_setCullSizeBox(this, -1.0f, -1.0f, -1.0f, 1.0f, 1.0f, 1.0f);
     mRoomPath = dPath_GetRoomPath(getPathID(), fopAcM_GetRoomNo(this));
@@ -410,8 +386,6 @@ void daFmtMng_c::create_init() {
     }
 }
 
-/* ############################################################################################## */
-/* 80837A3C-80837A5C -00001 0020+00 1/0 0/0 0/0 .data            l_daFmtMng_Method */
 static actor_method_class l_daFmtMng_Method = {
     (process_method_func)daFmtMng_Create,
     (process_method_func)daFmtMng_Delete,
@@ -420,7 +394,6 @@ static actor_method_class l_daFmtMng_Method = {
     (process_method_func)daFmtMng_Draw,
 };
 
-/* 80837A5C-80837A8C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_FORMATION_MNG */
 extern actor_process_profile_definition g_profile_FORMATION_MNG = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp
index 6b66c4c1c8..c0e29474a9 100644
--- a/src/d/actor/d_a_fr.cpp
+++ b/src/d/actor/d_a_fr.cpp
@@ -13,13 +13,12 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 #include "f_op/f_op_kankyo_mng.h"
 
 class daFr_HIO_c : public JORReflexible {
 public:
-    /* 805198EC */ daFr_HIO_c();
-    /* 8051B920 */ virtual ~daFr_HIO_c() {}
+    daFr_HIO_c();
+    virtual ~daFr_HIO_c() {}
 
 #if DEBUG
     void genMessage(JORMContext*);
@@ -37,7 +36,6 @@ public:
     /* 0x28 */ f32 field_0x28;
 };
 
-/* 805198EC-8051994C 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__10daFr_HIO_cFv */
 daFr_HIO_c::daFr_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 10.0f;
@@ -51,13 +49,11 @@ daFr_HIO_c::daFr_HIO_c() {
     field_0x28 = 6.0f;
 }
 
-/* 8051994C-805199F4 00014C 00A8+00 7/7 0/0 0/0 .text            anm_init__FP8fr_classifUcf */
 static void anm_init(fr_class* i_this, int i_index, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Fr", i_index),
     i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
 }
 
-/* 805199F4-80519AB8 0001F4 00C4+00 1/0 0/0 0/0 .text            daFr_Draw__FP8fr_class */
 static int daFr_Draw(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -78,7 +74,6 @@ static int daFr_Draw(fr_class* i_this) {
     return 1;
 }
 
-/* 80519AB8-80519B14 0002B8 005C+00 1/1 0/0 0/0 .text            sibuki_set__FP8fr_class */
 static void sibuki_set(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -87,7 +82,6 @@ static void sibuki_set(fr_class* i_this) {
     fopKyM_createWpillar(&sp18, actor->scale.x * 0.3f, 0);
 }
 
-/* 80519B14-80519B60 000314 004C+00 1/1 0/0 0/0 .text            s_wd_sub__FPvPv */
 static void* s_wd_sub(void* param_1, void* param_2) {
     (void)param_2;
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_LP) {
@@ -97,7 +91,6 @@ static void* s_wd_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80519B60-80519D28 000360 01C8+00 1/1 0/0 0/0 .text            wd_check__FP8fr_class */
 static wd_ss* wd_check(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
 
@@ -116,7 +109,6 @@ static wd_ss* wd_check(fr_class* i_this) {
     return NULL;
 }
 
-/* 80519D28-80519E24 000528 00FC+00 4/4 0/0 0/0 .text            way_bg_check__FP8fr_class */
 static BOOL way_bg_check(fr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     cXyz sp24;
@@ -144,13 +136,10 @@ static BOOL way_bg_check(fr_class* i_this) {
     }
 }
 
-/* 8051BC10-8051BC14 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_initHIO;
 
-/* 8051BC20-8051BC4C 000018 002C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daFr_HIO_c l_HIO;
 
-/* 80519E24-8051A0D8 000624 02B4+00 1/2 0/0 0/0 .text            fr_normal__FP8fr_class */
 static void fr_normal(fr_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -203,7 +192,6 @@ static void fr_normal(fr_class* i_this) {
     }
 }
 
-/* 8051A0D8-8051A318 0008D8 0240+00 1/2 0/0 0/0 .text            fr_away__FP8fr_class */
 static void fr_away(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -250,7 +238,6 @@ static void fr_away(fr_class* i_this) {
     }
 }
 
-/* 8051A318-8051A558 000B18 0240+00 1/1 0/0 0/0 .text            fr_s_normal__FP8fr_class */
 static void fr_s_normal(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -303,7 +290,6 @@ static void fr_s_normal(fr_class* i_this) {
     }
 }
 
-/* 8051A558-8051A620 000D58 00C8+00 1/1 0/0 0/0 .text            fr_s_wait__FP8fr_class */
 static void fr_s_wait(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -326,7 +312,6 @@ static void fr_s_wait(fr_class* i_this) {
 
 }
 
-/* 8051A620-8051A820 000E20 0200+00 1/1 0/0 0/0 .text            fr_s_away__FP8fr_class */
 static void fr_s_away(fr_class* i_this) {
     fopAc_ac_c* actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -375,7 +360,6 @@ static void fr_s_away(fr_class* i_this) {
     }
 }
 
-/* 8051A820-8051A904 001020 00E4+00 1/1 0/0 0/0 .text            fr_eat__FP8fr_class */
 static void fr_eat(fr_class* i_this) {
     fopAc_ac_c* this_actor = i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -403,7 +387,6 @@ static void fr_eat(fr_class* i_this) {
     }
 }
 
-/* 8051A904-8051AA9C 001104 0198+00 2/2 0/0 0/0 .text            swim_on__FP8fr_class */
 static void swim_on(fr_class* i_this) {
     if (i_this->field_0x5ec == 0) {
         i_this->field_0x5d2 = 0;
@@ -436,7 +419,6 @@ static void swim_on(fr_class* i_this) {
     }
 }
 
-/* 8051AA9C-8051AC2C 00129C 0190+00 1/1 0/0 0/0 .text            swim_off__FP8fr_class */
 static void swim_off(fr_class* i_this) {
     fopAc_ac_c* this_actor = i_this;
 
@@ -467,7 +449,6 @@ static void swim_off(fr_class* i_this) {
     }
 }
 
-/* 8051AC2C-8051AD04 00142C 00D8+00 1/1 0/0 0/0 .text            fr_message__FP8fr_class */
 static void fr_message(fr_class* i_this) {
     fopAc_ac_c* this_actor = i_this;
 
@@ -487,7 +468,6 @@ static void fr_message(fr_class* i_this) {
     }
 }
 
-/* 8051AD04-8051B04C 001504 0348+00 2/1 0/0 0/0 .text            action__FP8fr_class */
 static void action(fr_class* i_this) {
     fopAc_ac_c* this_actor = (fopAc_ac_c*)i_this;
 
@@ -589,7 +569,6 @@ static void action(fr_class* i_this) {
     }
 }
 
-/* 8051B04C-8051B170 00184C 0124+00 1/1 0/0 0/0 .text            message__FP8fr_class */
 static int message(fr_class* i_this) {
     if (i_this->field_0x992) {
         i_this->field_0x5e4 = 10;
@@ -618,7 +597,6 @@ static int message(fr_class* i_this) {
     return 0;
 }
 
-/* 8051B170-8051B354 001970 01E4+00 2/1 0/0 0/0 .text            daFr_Execute__FP8fr_class */
 static int daFr_Execute(fr_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -660,12 +638,10 @@ static int daFr_Execute(fr_class* i_this) {
     return 1;
 }
 
-/* 8051B354-8051B35C 001B54 0008+00 1/0 0/0 0/0 .text            daFr_IsDelete__FP8fr_class */
 static int daFr_IsDelete(fr_class* i_this) {
     return true;
 }
 
-/* 8051B35C-8051B3B0 001B5C 0054+00 1/0 0/0 0/0 .text            daFr_Delete__FP8fr_class */
 static int daFr_Delete(fr_class* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
 
@@ -679,7 +655,6 @@ static int daFr_Delete(fr_class* i_this) {
     return 1;
 }
 
-/* 8051B3B0-8051B550 001BB0 01A0+00 1/1 0/0 0/0 .text            useHeapIfrt__FP10fopAc_ac_c */
 static BOOL useHeapIfrt(fopAc_ac_c* a_this) {
     fr_class* i_this = (fr_class*)a_this;
 
@@ -701,7 +676,6 @@ static BOOL useHeapIfrt(fopAc_ac_c* a_this) {
                               -1) != 0 ? 1 : 0;
 }
 
-/* 8051B598-8051B820 001D98 0288+00 1/0 0/0 0/0 .text            daFr_Create__FP10fopAc_ac_c */
 static int daFr_Create(fopAc_ac_c* a_this) {
     fopAc_ac_c* actor = a_this;
     fr_class* i_this = (fr_class*)actor;
@@ -757,7 +731,6 @@ static int daFr_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 8051BB60-8051BB80 -00001 0020+00 1/0 0/0 0/0 .data            l_daFr_Method */
 static actor_method_class l_daFr_Method = {
     (process_method_func)daFr_Create,
     (process_method_func)daFr_Delete,
@@ -766,7 +739,6 @@ static actor_method_class l_daFr_Method = {
     (process_method_func)daFr_Draw,
 };
 
-/* 8051BB80-8051BBB0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_FR */
 extern actor_process_profile_definition g_profile_FR = {
   fpcLy_CURRENT_e,       // mLayerID
   8,                     // mListID
diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp
index 24ce3d15ab..937522c05c 100644
--- a/src/d/actor/d_a_grass.cpp
+++ b/src/d/actor/d_a_grass.cpp
@@ -15,7 +15,6 @@
 #include "d/actor/d_grass.inc" // IWYU pragma: keep
 #include "d/actor/d_flower.inc"
 
-/* 8051BD4C-8051BEFC 0000EC 01B0+00 1/1 0/0 0/0 .text            randam_addcol_set__FPs */
 static void randam_addcol_set(s16* param_0) {
     s16 temp_r4 = *param_0;
     s16 var_r30 = temp_r4 & 0x1F;
@@ -61,7 +60,6 @@ static void randam_addcol_set(s16* param_0) {
     *param_0 = ((x) << 5) | (var_r30 & 0x1F);
 }
 
-/* 8051BEFC-8051BF68 00029C 006C+00 1/1 0/0 0/0 .text            createGrass__9daGrass_cFv */
 bool daGrass_c::createGrass() {
     if (m_grass != NULL) {
         return 1;
@@ -75,7 +73,6 @@ bool daGrass_c::createGrass() {
     return 1;
 }
 
-/* 8051BF68-8051BFBC 000308 0054+00 1/1 0/0 0/0 .text            deleteGrass__9daGrass_cFv */
 void daGrass_c::deleteGrass() {
     if (m_grass != NULL) {
         delete m_grass;
@@ -86,27 +83,23 @@ void daGrass_c::deleteGrass() {
 dGrass_packet_c::~dGrass_packet_c() {
 }
 
-/* 8051C040-8051C074 0003E0 0034+00 1/1 0/0 0/0 .text            executeGrass__9daGrass_cFv */
 void daGrass_c::executeGrass() {
     if (m_grass != NULL) {
         m_grass->calc();
     }
 }
 
-/* 8051C074-8051C0A8 000414 0034+00 1/1 0/0 0/0 .text            drawGrass__9daGrass_cFv */
 void daGrass_c::drawGrass() {
     if (m_grass != NULL) {
         m_grass->update();
     }
 }
 
-/* 8051C0A8-8051C0D4 000448 002C+00 1/1 0/0 0/0 .text newGrassData__9daGrass_cFR4cXyziUcUcsUc */
 void daGrass_c::newGrassData(cXyz& i_pos, int i_roomNo, u8 i_itemNo, u8 i_itemBitNo, s16 i_addCol,
                              u8 param_5) {
     m_grass->newData(i_pos, i_roomNo, i_itemNo, i_itemBitNo, i_addCol, param_5);
 }
 
-/* 8051C0D4-8051C140 000474 006C+00 1/1 0/0 0/0 .text            createFlower__9daGrass_cFv */
 bool daGrass_c::createFlower() {
     if (m_flower != NULL) {
         return 1;
@@ -120,7 +113,6 @@ bool daGrass_c::createFlower() {
     return 1;
 }
 
-/* 8051C140-8051C194 0004E0 0054+00 1/1 0/0 0/0 .text            deleteFlower__9daGrass_cFv */
 void daGrass_c::deleteFlower() {
     if (m_flower != NULL) {
         delete m_flower;
@@ -128,38 +120,31 @@ void daGrass_c::deleteFlower() {
     }
 }
 
-/* 8051C194-8051C218 000534 0084+00 1/0 0/0 0/0 .text            __dt__16dFlower_packet_cFv */
 dFlower_packet_c::~dFlower_packet_c() {}
 
-/* 8051C218-8051C24C 0005B8 0034+00 1/1 0/0 0/0 .text            executeFlower__9daGrass_cFv */
 void daGrass_c::executeFlower() {
     if (m_flower != NULL) {
         m_flower->calc();
     }
 }
 
-/* 8051C24C-8051C280 0005EC 0034+00 1/1 0/0 0/0 .text            drawFlower__9daGrass_cFv */
 void daGrass_c::drawFlower() {
     if (m_flower != NULL) {
         m_flower->update();
     }
 }
 
-/* 8051C280-8051C2AC 000620 002C+00 1/1 0/0 0/0 .text newFlowerData__9daGrass_cFScR4cXyziScs */
 void daGrass_c::newFlowerData(s8 param_0, cXyz& i_pos, int i_roomNo, s8 i_tableNo, s16 i_addCol) {
     m_flower->newData(param_0, i_pos, i_roomNo, i_tableNo, i_addCol);
 }
 
-/* 8051C2AC-8051C2B0 00064C 0004+00 1/1 0/0 0/0 .text            dGrass_Tex_Change__Fv */
 static void dGrass_Tex_Change() {}
 
-/* 8051C2B0-8051C304 000650 0054+00 1/0 0/0 0/0 .text            daGrass_create__FP9daGrass_c */
 static int daGrass_create(daGrass_c* i_this) {
     fopAcM_ct(i_this, daGrass_c);
     return i_this->create();
 }
 
-/* 8051C304-8051D6CC 0006A4 13C8+00 1/1 0/0 0/0 .text            create__9daGrass_cFv */
 int daGrass_c::create() {
     static csXyz l_setType0[] = {
         csXyz(0, 0, 0),
@@ -379,7 +364,6 @@ int daGrass_c::Delete() {
     return 1;
 }
 
-/* 8051D6CC-8051D720 001A6C 0054+00 1/0 0/0 0/0 .text            daGrass_Delete__FP9daGrass_c */
 static int daGrass_Delete(daGrass_c* i_this) {
     return i_this->Delete();
 }
@@ -394,7 +378,6 @@ int daGrass_c::execute() {
     return 1;
 }
 
-/* 8051D720-8051D77C 001AC0 005C+00 1/0 0/0 0/0 .text            daGrass_execute__FP9daGrass_c */
 static int daGrass_execute(daGrass_c* i_this) {
     return i_this->execute();
 }
@@ -405,12 +388,10 @@ int daGrass_c::draw() {
     return 1;
 }
 
-/* 8051D77C-8051D7B4 001B1C 0038+00 1/0 0/0 0/0 .text            daGrass_draw__FP9daGrass_c */
 static int daGrass_draw(daGrass_c* i_this) {
     return i_this->draw();
 }
 
-/* 80527840-80527860 -00001 0020+00 1/0 0/0 0/0 .data            daGrass_METHODS */
 static actor_method_class daGrass_METHODS = {
     (process_method_func)daGrass_create,
     (process_method_func)daGrass_Delete,
@@ -419,7 +400,6 @@ static actor_method_class daGrass_METHODS = {
     (process_method_func)daGrass_draw,
 };
 
-/* 80527860-80527890 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_GRASS */
 extern actor_process_profile_definition g_profile_GRASS = {
   fpcLy_CURRENT_e,       // mLayerID
   11,                    // mListID
diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp
index 3c7a4ff5b3..c104f603ce 100644
--- a/src/d/actor/d_a_guard_mng.cpp
+++ b/src/d/actor/d_a_guard_mng.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_guard_mng.h"
 #include "f_pc/f_pc_executor.h"
 
-/* 80837B18-80837B9C 000078 0084+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actorP, void* i_this) {
     if (fopAcM_IsActor(i_actorP)) {
         if (fopAcM_GetName(i_actorP) == PROC_NPC_CD3 || fopAcM_GetName(i_actorP) == PROC_NPC_PASSER || fopAcM_GetName(i_actorP) == PROC_NPC_FGUARD) {
@@ -23,8 +22,6 @@ static void* s_sub(void* i_actorP, void* i_this) {
     return 0;
 }
 
-/* 80837B9C-80837BEC 0000FC 0050+00 1/1 0/0 0/0 .text            checkMerchantNum__12daGuardMng_cFv
- */
 u8 daGuardMng_c::checkMerchantNum() {
     field_0x56c = G_CM3D_F_INF;
     mMerchantNum = 0;
@@ -32,8 +29,6 @@ u8 daGuardMng_c::checkMerchantNum() {
     return mMerchantNum;
 }
 
-/* 80837BEC-80837C6C 00014C 0080+00 1/1 0/0 0/0 .text
- * checkAppearTag__12daGuardMng_cFP12daTagGuard_c               */
 void daGuardMng_c::checkAppearTag(daTagGuard_c* i_this) {
     cXyz pos;
     if ((u8)i_this->getAppearPoint(&pos) != 0) {
@@ -47,31 +42,23 @@ void daGuardMng_c::checkAppearTag(daTagGuard_c* i_this) {
     }
 }
 
-/* 80837C6C-80837D44 0001CC 00D8+00 1/0 0/0 0/0 .text daGuardMng_Execute__FP12daGuardMng_c */
 static int daGuardMng_Execute(daGuardMng_c* i_this) {
     return i_this->execute();
 }
 
-/* 80837D44-80837D4C 0002A4 0008+00 1/0 0/0 0/0 .text daGuardMng_IsDelete__FP12daGuardMng_c */
 static int daGuardMng_IsDelete(daGuardMng_c* param_0) {
     return 1;
 }
 
-/* 80837D4C-80837D7C 0002AC 0030+00 1/0 0/0 0/0 .text            daGuardMng_Delete__FP12daGuardMng_c
- */
 static int daGuardMng_Delete(daGuardMng_c* i_this) {
     i_this->~daGuardMng_c();
     return 1;
 }
 
-/* 80837D7C-80837DDC 0002DC 0060+00 1/0 0/0 0/0 .text            daGuardMng_Create__FP10fopAc_ac_c
- */
 static int daGuardMng_Create(fopAc_ac_c* i_this) {
     return static_cast<daGuardMng_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80837DF0-80837E10 -00001 0020+00 1/0 0/0 0/0 .data            l_daGuardMng_Method */
 static actor_method_class l_daGuardMng_Method = {
     (process_method_func)daGuardMng_Create,
     (process_method_func)daGuardMng_Delete,
@@ -79,7 +66,6 @@ static actor_method_class l_daGuardMng_Method = {
     (process_method_func)daGuardMng_IsDelete
 };
 
-/* 80837E10-80837E40 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_GUARD_MNG */
 extern actor_process_profile_definition g_profile_GUARD_MNG = {
     fpcLy_CURRENT_e,        // mLayerID      
     7,                      // mListID    
diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp
index a33609f94e..ef4f89a986 100644
--- a/src/d/actor/d_a_hitobj.cpp
+++ b/src/d/actor/d_a_hitobj.cpp
@@ -8,13 +8,10 @@
 #include "d/actor/d_a_hitobj.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 8046B358-8046B360 000078 0008+00 1/0 0/0 0/0 .text            daHitobj_Draw__FP12hitobj_class */
 static int daHitobj_Draw(hitobj_class* i_this) {
     return 1;
 }
 
-/* 8046B360-8046B3C8 000080 0068+00 1/0 0/0 0/0 .text            daHitobj_Execute__FP12hitobj_class
- */
 static int daHitobj_Execute(hitobj_class* i_this) {
     if (i_this->field_0x572 != 0) {
         i_this->field_0x572--;
@@ -27,21 +24,15 @@ static int daHitobj_Execute(hitobj_class* i_this) {
     return 1;
 }
 
-/* 8046B3C8-8046B3D0 0000E8 0008+00 1/0 0/0 0/0 .text            daHitobj_IsDelete__FP12hitobj_class
- */
 static int daHitobj_IsDelete(hitobj_class* i_this) {
     return 1;
 }
 
-/* 8046B3D0-8046B400 0000F0 0030+00 1/0 0/0 0/0 .text            daHitobj_Delete__FP12hitobj_class
- */
 static int daHitobj_Delete(hitobj_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase,"Hitobj");
     return 1;
 }
 
-/* ############################################################################################## */
-/* 8046B5DC-8046B61C 000000 0040+00 1/1 0/0 0/0 .data            cc_sph_src$3657 */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0, {{0, 0, 0x13}, {0, 3}, 0}},
@@ -57,7 +48,6 @@ static dCcD_SrcSph cc_sph_src = {
     }
 };
 
-/* 8046B400-8046B53C 000120 013C+00 1/0 0/0 0/0 .text            daHitobj_Create__FP10fopAc_ac_c */
 static int daHitobj_Create(fopAc_ac_c* i_this) {
     hitobj_class* hitobj = (hitobj_class*)i_this;
     fopAcM_ct(i_this, hitobj_class);
@@ -75,7 +65,6 @@ static int daHitobj_Create(fopAc_ac_c* i_this) {
     return ret;
 }
 
-/* 8046B61C-8046B63C -00001 0020+00 1/0 0/0 0/0 .data            l_daHitobj_Method */
 static actor_method_class l_daHitobj_Method = {
     (process_method_func)daHitobj_Create,
     (process_method_func)daHitobj_Delete,
@@ -84,7 +73,6 @@ static actor_method_class l_daHitobj_Method = {
     (process_method_func)daHitobj_Draw
 };
 
-/* 8046B63C-8046B66C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_HITOBJ */
 extern actor_process_profile_definition g_profile_HITOBJ = {
     fpcLy_CURRENT_e,        // mLayerID   
     7,                      // mListID  
diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp
index f52779fbb9..0c23d7fb6d 100644
--- a/src/d/actor/d_a_horse.cpp
+++ b/src/d/actor/d_a_horse.cpp
@@ -63,18 +63,14 @@ static void strippedFunc()
     F(v);
 }
 
-/* 808454B8-808454C0 00000C 0006+02 2/6 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[] = "Horse";
 
-/* 808454C0-808454C8 000014 0008+00 2/5 0/0 0/0 .rodata          m_footJointTable__9daHorse_c */
 const u16 daHorse_c::m_footJointTable[] = {
     3, 7, 27, 31,
 };
 
-/* 808454C8-808454CC 00001C 0004+00 0/0 0/0 0/0 .rodata          m_callLimitDistance2__9daHorse_c */
 const f32 daHorse_c::m_callLimitDistance2 = 640000.0f;
 
-/* 808454CC-808455F0 000020 0124+00 1/20 0/0 0/0 .rodata          m__14daHorse_hio_c0 */
 const daHorse_hio_c1 daHorse_hio_c0::m = {
     600,
     50,
@@ -158,7 +154,6 @@ const daHorse_hio_c1 daHorse_hio_c0::m = {
     15.0f,
 };
 
-/* 80837F2C-8083836C 0000EC 0440+00 1/1 0/0 0/0 .text            setReinPos__13daHorseRein_cFi */
 void daHorseRein_c::setReinPos(int param_0) {
     cXyz* var_r27 = &field_0x0[0][param_0] + 1;
 
@@ -203,8 +198,6 @@ void daHorseRein_c::setReinPos(int param_0) {
     *var_r25 = (*var_r28 - spD4) * 0.2f;
 }
 
-/* 808383A8-80838498 000568 00F0+00 2/2 0/0 0/0 .text            setReinPosPart__13daHorseRein_cFi
- */
 void daHorseRein_c::setReinPosPart(int param_0) {
     field_0x8[0] = param_0 + 1;
     field_0x0[1][param_0] = cXyz::Zero;
@@ -225,10 +218,8 @@ void daHorseRein_c::setReinPosPart(int param_0) {
     }
 }
 
-/* 808458F4-808458F8 000020 0004+00 1/2 0/0 0/0 .data            l_autoUpHeight */
 static f32 l_autoUpHeight = 50.0f;
 
-/* 808458F8-8084593C 000024 0044+00 0/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0x0, {{AT_TYPE_HORSE, 0x1, 0x12}, {0xd8fbfdff, 0x9}, 0x79}}, // mObj
@@ -243,7 +234,6 @@ static dCcD_SrcCyl l_cylSrc = {
     } // mCyl
 };
 
-/* 8084593C-8084597C 000068 0040+00 0/1 0/0 0/0 .data            l_sphSrc */
 static dCcD_SrcSph l_sphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x9}, 0x79}}, // mObj
@@ -256,8 +246,6 @@ static dCcD_SrcSph l_sphSrc = {
     } // mSphAttr
 };
 
-/* 80838498-80838750 000658 02B8+00 2/2 0/0 0/0 .text
- * coHitCallbackBoarJump__9daHorse_cFP10fopAc_ac_c              */
 void daHorse_c::coHitCallbackBoarJump(fopAc_ac_c* i_hitActor) {
     if (!dComIfGp_event_runCheck() && 
         !checkEndResetStateFlg0(daHorse_ERFLG0(ERFLG0_UNK_4 | ERFLG0_UNK_2 | ERFLG0_UNK_1)) &&
@@ -314,8 +302,6 @@ void daHorse_c::coHitCallbackBoarJump(fopAc_ac_c* i_hitActor) {
     }
 }
 
-/* 80838798-80838904 000958 016C+00 1/1 0/0 0/0 .text
- * coHitCallbackBoarHit__9daHorse_cFP10fopAc_ac_cP12dCcD_GObjInf */
 void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hitGObj) {
     if (!dComIfGp_event_runCheck() &&
         ((m_procID == PROC_MOVE_e && speedF > 5.0f) || checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000))) &&
@@ -348,8 +334,6 @@ void daHorse_c::coHitCallbackBoarHit(fopAc_ac_c* i_hitActor, dCcD_GObjInf* i_hit
     }
 }
 
-/* 80838904-80838A20 000AC4 011C+00 2/2 0/0 0/0 .text
- * coHitCallbackCowHit__9daHorse_cFP10fopAc_ac_c                */
 void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) {
     if ((fopAcM_GetName(i_hitActor) == PROC_COW) && ((daCow_c*)i_hitActor)->isAngry()) {
         ((daCow_c*)i_hitActor)->setAngryHit();
@@ -371,8 +355,6 @@ void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) {
     }
 }
 
-/* 80838A20-80838A44 000BE0 0024+00 1/1 0/0 0/0 .text
- * daHorse_coHitCallbackBoarJump__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daHorse_coHitCallbackBoarJump(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                                           fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     (void)i_coObjInfA;
@@ -380,8 +362,6 @@ static void daHorse_coHitCallbackBoarJump(fopAc_ac_c* i_coActorA, dCcD_GObjInf*
     ((daHorse_c*)i_coActorA)->coHitCallbackBoarJump(i_coActorB);
 }
 
-/* 80838A44-80838A68 000C04 0024+00 1/1 0/0 0/0 .text
- * daHorse_coHitCallbackCowHit__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daHorse_coHitCallbackCowHit(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                                         fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     (void)i_coObjInfA;
@@ -389,8 +369,6 @@ static void daHorse_coHitCallbackCowHit(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_
     ((daHorse_c*)i_coActorA)->coHitCallbackCowHit(i_coActorB);
 }
 
-/* 80838A68-80838AC4 000C28 005C+00 1/1 0/0 0/0 .text
- * daHorse_coHitCallbackAll__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daHorse_coHitCallbackAll(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                                      fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     (void)i_coObjInfA;
@@ -401,7 +379,6 @@ static void daHorse_coHitCallbackAll(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coO
     a_this->coHitCallbackCowHit(i_coActorB);
 }
 
-/* 80838AC4-80838B78 000C84 00B4+00 1/1 0/0 0/0 .text daHorse_searchEnemy__FP10fopAc_ac_cPv */
 static void* daHorse_searchEnemy(fopAc_ac_c* i_actor, void* i_data) {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
     f32 search_dist = *(f32*)i_data;
@@ -413,7 +390,6 @@ static void* daHorse_searchEnemy(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80838B78-80838F3C 000D38 03C4+00 1/1 0/0 0/0 .text            modelCallBack__9daHorse_cFi */
 int daHorse_c::modelCallBack(int i_jntNo) {
     if (i_jntNo == 0) {
         if (m_procID == PROC_TOOL_DEMO_e) {
@@ -493,8 +469,6 @@ int daHorse_c::modelCallBack(int i_jntNo) {
     return 1;
 }
 
-/* 80838F3C-80838F80 0010FC 0044+00 1/1 0/0 0/0 .text            daHorse_modelCallBack__FP8J3DJointi
- */
 static int daHorse_modelCallBack(J3DJoint* i_joint, int param_1) {
     J3DJoint* joint = i_joint;
     int jnt_no = joint->getJntNo();
@@ -507,8 +481,6 @@ static int daHorse_modelCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80838F80-80838F98 001140 0018+00 1/1 0/0 0/0 .text daHorse_searchSingleBoar__FP10fopAc_ac_cPv
- */
 static void* daHorse_searchSingleBoar(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetName(i_actor) == PROC_E_WB) {
         fopAc_ac_c** ppActor = (fopAc_ac_c**)i_data;
@@ -518,7 +490,6 @@ static void* daHorse_searchSingleBoar(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80838F98-808392D8 001158 0340+00 1/1 0/0 0/0 .text            createHeap__9daHorse_cFv */
 int daHorse_c::createHeap() {
     m_modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x26);
     JUT_ASSERT(0x487, m_modelData != NULL);
@@ -585,13 +556,10 @@ int daHorse_c::createHeap() {
     return 1;
 }
 
-/* 808393EC-8083940C 0015AC 0020+00 1/1 0/0 0/0 .text            daHorse_createHeap__FP10fopAc_ac_c
- */
 static int daHorse_createHeap(fopAc_ac_c* i_this) {
     return ((daHorse_c*)i_this)->createHeap();
 }
 
-/* 8083940C-80839498 0015CC 008C+00 1/1 0/0 0/0 .text            checkEnding__9daHorse_cFv */
 BOOL daHorse_c::checkEnding() {
     return (daAlink_c::checkStageName("F_SP108") && dComIfG_play_c::getLayerNo(0) == 4) ||
            (daAlink_c::checkStageName("F_SP104") && dComIfG_play_c::getLayerNo(0) == 12 && dComIfGp_roomControl_getStayNo() == 1);
@@ -602,7 +570,6 @@ int l_debugMode;
 #endif
 extern int g_horsePosInit;
 
-/* 80839498-80839CFC 001658 0864+00 1/1 0/0 0/0 .text            create__9daHorse_cFv */
 int daHorse_c::create() {
     fopAcM_ct(this, daHorse_c);
 
@@ -828,14 +795,12 @@ int daHorse_c::create() {
     return phase_state;
 }
 
-/* 80839CFC-80839D1C 001EBC 0020+00 1/0 0/0 0/0 .text            daHorse_Create__FP10fopAc_ac_c */
 static int daHorse_Create(fopAc_ac_c* i_this) {
     daHorse_c* this_horse = (daHorse_c*)i_this;
     fpc_ProcID unused = fopAcM_GetID(i_this);
     return this_horse->create();
 }
 
-/* 80839D1C-80839EBC 001EDC 01A0+00 2/2 0/0 0/0 .text            setBasAnime__9daHorse_cFi */
 void daHorse_c::setBasAnime(int param_0) {
     daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[param_0];
 
@@ -868,14 +833,11 @@ void daHorse_c::setBasAnime(int param_0) {
     }
 }
 
-/* 80839EBC-80839ED4 00207C 0018+00 2/2 0/0 0/0 .text            resetBasAnime__9daHorse_cFv */
 void daHorse_c::resetBasAnime() {
     field_0x16f6 = 0xFFFF;
     field_0x1144 = NULL;
 }
 
-/* 80839ED4-8083A20C 002094 0338+00 1/1 0/0 0/0 .text            setDoubleAnime__9daHorse_cFfffUsUsf
- */
 int daHorse_c::setDoubleAnime(f32 i_ratio, f32 i_anmSpeedA, f32 i_anmSpeedB, u16 i_anmIdxA, u16 i_anmIdxB,
                               f32 i_morf) {
     J3DAnmTransform* temp_r26 = m_anmRatio[0].getAnmTransform();
@@ -938,7 +900,6 @@ int daHorse_c::setDoubleAnime(f32 i_ratio, f32 i_anmSpeedA, f32 i_anmSpeedB, u16
     return 1;
 }
 
-/* 8083A20C-8083A3C4 0023CC 01B8+00 10/10 0/0 0/0 .text setSingleAnime__9daHorse_cFUsffsfi */
 int daHorse_c::setSingleAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_endF, f32 i_morf,
                               BOOL i_isDemoAnm) {
     J3DAnmTransform* bck;
@@ -991,7 +952,6 @@ int daHorse_c::setSingleAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_end
     return 1;
 }
 
-/* 8083A3C4-8083A5AC 002584 01E8+00 1/1 0/0 0/0 .text            animePlay__9daHorse_cFv */
 void daHorse_c::animePlay() {
     if (m_frameCtrl[2].getRate() < 0.1f) {
         resetNeckAnime();
@@ -1034,7 +994,6 @@ void daHorse_c::animePlay() {
     }
 }
 
-/* 8083A5AC-8083A890 00276C 02E4+00 1/1 0/0 0/0 .text            checkDemoAction__9daHorse_cFv */
 int daHorse_c::checkDemoAction() {
     if (checkStateFlg0(FLG0_CALL_HORSE)) {
         setStickCallMove();
@@ -1130,7 +1089,6 @@ int daHorse_c::checkDemoAction() {
     return 0;
 }
 
-/* 8083A890-8083AC7C 002A50 03EC+00 1/1 0/0 0/0 .text            setStickRodeoMove__9daHorse_cFv */
 void daHorse_c::setStickRodeoMove() {
     if (m_rodeoPath != NULL) {
         Vec* path_pnt_pos = &m_rodeoPath->m_points[m_rodeoPoint].m_position;
@@ -1197,7 +1155,6 @@ void daHorse_c::setStickRodeoMove() {
     }
 }
 
-/* 8083AC7C-8083ACEC 002E3C 0070+00 2/2 0/0 0/0 .text            setStickCallMove__9daHorse_cFv */
 void daHorse_c::setStickCallMove() {
     m_padStickValue = 1.0f;
 
@@ -1210,7 +1167,6 @@ void daHorse_c::setStickCallMove() {
     }
 }
 
-/* 8083ACEC-8083AEC0 002EAC 01D4+00 2/2 0/0 0/0 .text setDemoMoveData__9daHorse_cFPUlPC4cXyz */
 void daHorse_c::setDemoMoveData(u32* i_mode, cXyz const* i_pos) {
     cXyz pos_vec;
     pos_vec = *i_pos - current.pos;
@@ -1246,7 +1202,6 @@ void daHorse_c::setDemoMoveData(u32* i_mode, cXyz const* i_pos) {
     m_demoMoveAngle = s;
 }
 
-/* 8083AEC0-8083B578 003080 06B8+00 1/1 0/0 0/0 .text            setDemoData__9daHorse_cFv */
 void daHorse_c::setDemoData() {
     if (!dComIfGp_event_runCheck()) {
         offStateFlg0(FLG0_UNK_2000000);
@@ -1438,7 +1393,6 @@ void daHorse_c::setDemoData() {
     }
 }
 
-/* 8083B578-8083B600 003738 0088+00 4/4 0/0 0/0 .text            acceptPlayerRide__9daHorse_cFv */
 void daHorse_c::acceptPlayerRide() {
     if (!checkStateFlg0(FLG0_UNK_1) && !daPy_py_c::checkNowWolf()) {
         int angle = fopAcM_seenPlayerAngleY(this);
@@ -1448,7 +1402,6 @@ void daHorse_c::acceptPlayerRide() {
     }
 }
 
-/* 8083B600-8083B828 0037C0 0228+00 1/1 0/0 0/0 .text            setStickData__9daHorse_cFv */
 void daHorse_c::setStickData() {
     s16 stick_angle;
     if (checkStateFlg0(daHorse_FLG0(FLG0_RODEO_MODE | FLG0_UNK_10000000))) {
@@ -1507,14 +1460,10 @@ void daHorse_c::setStickData() {
     }
 }
 
-/* 8083B828-8083B82C 0039E8 0004+00 1/1 0/0 0/0 .text            setTurnStartVibration__9daHorse_cFv
- */
 void daHorse_c::setTurnStartVibration() {}
 
-/* 8083B82C-8083B830 0039EC 0004+00 1/1 0/0 0/0 .text            setTurnVibration__9daHorse_cFv */
 void daHorse_c::setTurnVibration() {}
 
-/* 8083B830-8083BF48 0039F0 0718+00 6/6 0/0 0/0 .text            setMoveAnime__9daHorse_cFf */
 void daHorse_c::setMoveAnime(f32 i_morf) {
     daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[0];
 
@@ -1686,7 +1635,6 @@ void daHorse_c::setMoveAnime(f32 i_morf) {
     }
 }
 
-/* 8083BF48-8083CA80 004108 0B38+00 6/6 0/0 0/0 .text            checkHorseNoMove__9daHorse_cFi */
 // NONMATCHING - instruction order, some float regalloc, equivalent
 int daHorse_c::checkHorseNoMove(int param_0) {
     cXyz sp50;
@@ -1872,14 +1820,11 @@ int daHorse_c::checkHorseNoMove(int param_0) {
     return rt;    
 }
 
-/* 8083CA80-8083CB38 004C40 00B8+00 1/1 0/0 0/0 .text            checkTurnPlayerState__9daHorse_cFv
- */
 BOOL daHorse_c::checkTurnPlayerState() {
     daAlink_c* player = daAlink_getAlinkActorClass();
     return player->checkHorseBackInput() && !player->checkHorseWaitLashAnime() && (!player->checkHorseWalkStartAnm() || player->getBaseAnimeFrame() < 1.0f);
 }
 
-/* 8083CB38-8083D748 004CF8 0C10+00 2/2 0/0 0/0 .text            setSpeedAndAngle__9daHorse_cFv */
 int daHorse_c::setSpeedAndAngle() {
     int var_r28 = checkHorseNoMove(1);
     if (var_r28 == 3) {
@@ -2151,12 +2096,10 @@ int daHorse_c::setSpeedAndAngle() {
     return 0;
 }
 
-/* 8083D748-8083D774 005908 002C+00 1/1 0/0 0/0 .text            checkWaitTurn__9daHorse_cCFv */
 BOOL daHorse_c::checkWaitTurn() const {
     return m_procID == PROC_WAIT_e && shape_angle.y != field_0x16e8;
 }
 
-/* 8083D774-8083D918 005934 01A4+00 2/2 0/0 0/0 .text            setRoomInfo__9daHorse_cFi */
 void daHorse_c::setRoomInfo(int param_0) {
     int room_no;
     if (-G_CM3D_F_INF != m_acch.GetGroundH() && (checkStateFlg0(FLG0_UNK_1) || m_procID == PROC_LARGE_DAMAGE_e || m_procID == PROC_JUMP_e || current.pos.y - m_acch.GetGroundH() < 500.0f)) {
@@ -2195,13 +2138,10 @@ void daHorse_c::setRoomInfo(int param_0) {
     }
 }
 
-/* 80845C04-80845C10 000054 000C+00 1/2 0/0 0/0 .bss             l_frontFootOffset */
 static cXyz l_frontFootOffset(23.5f, -20.0f, 0.0f);
 
-/* 80845C1C-80845C28 00006C 000C+00 1/2 0/0 0/0 .bss             l_backFootOffset */
 static cXyz l_backFootOffset(25.5f, 12.0f, 0.0f);
 
-/* 8083D918-8083D9D8 005AD8 00C0+00 2/2 0/0 0/0 .text            setBodyPart__9daHorse_cFv */
 void daHorse_c::setBodyPart() {
     static cXyz localEyePos(25.0f, -15.0f, 0.0f);
 
@@ -2209,7 +2149,6 @@ void daHorse_c::setBodyPart() {
     mDoMtx_multVecZero(m_model->getAnmMtx(0), &m_bodyEyePos);
 }
 
-/* 8083D9D8-8083DC58 005B98 0280+00 2/2 0/0 0/0 .text            setMatrix__9daHorse_cFv */
 void daHorse_c::setMatrix() {
     s16 var_r29 = 0;
     s16 var_r27 = 0;
@@ -2261,7 +2200,6 @@ void daHorse_c::setMatrix() {
     }    
 }
 
-/* 8083DC58-8083DEEC 005E18 0294+00 1/1 0/0 0/0 .text            setDashEffect__9daHorse_cFPUl */
 void daHorse_c::setDashEffect(u32* i_emitterID) {
     camera_class* camera_p = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz* eye_p = fopCamM_GetEye_p(camera_p);
@@ -2289,7 +2227,6 @@ void daHorse_c::setDashEffect(u32* i_emitterID) {
                                          NULL, 0xFF, NULL, -1, 0, 0, 0);
 }
 
-/* 8083DEEC-8083E4D8 0060AC 05EC+00 1/1 0/0 0/0 .text            setEffect__9daHorse_cFv */
 // NONMATCHING - regalloc
 void daHorse_c::setEffect() {
     JPABaseEmitter* sp50;
@@ -2425,7 +2362,6 @@ void daHorse_c::setEffect() {
     }
 }
 
-/* 8083E4D8-8083E6E8 006698 0210+00 1/1 0/0 0/0 .text            setCollision__9daHorse_cFv */
 void daHorse_c::setCollision() {
     m_cc_stts.Move();
     f32 sin_y = cM_ssin(shape_angle.y);
@@ -2468,7 +2404,6 @@ void daHorse_c::setCollision() {
     }
 }
 
-/* 8083E6E8-8083E760 0068A8 0078+00 1/1 0/0 0/0 .text            autoGroundHit__9daHorse_cFv */
 void daHorse_c::autoGroundHit() {
     if (checkStateFlg0(FLG0_UNK_10) && m_procID != PROC_LARGE_DAMAGE_e && m_procID != PROC_JUMP_e) {
         f32 dist_to_ground = m_acch.GetGroundH() - current.pos.y;
@@ -2480,7 +2415,6 @@ void daHorse_c::autoGroundHit() {
     }
 }
 
-/* 8083E760-8083E8A4 006920 0144+00 1/1 0/0 0/0 .text            setTailAngle__9daHorse_cFv */
 void daHorse_c::setTailAngle() {
     s16* var_r30 = field_0x16d4;
     s16* var_r29 = field_0x16e0;
@@ -2512,7 +2446,6 @@ void daHorse_c::setTailAngle() {
     }
 }
 
-/* 8083E8A4-8083EA78 006A64 01D4+00 1/1 0/0 0/0 .text            setNeckAngle__9daHorse_cFv */
 void daHorse_c::setNeckAngle() {
     int var_r27 = 0;
     if (eventInfo.checkCommandTalk()) {
@@ -2558,7 +2491,6 @@ void daHorse_c::setNeckAngle() {
     cLib_addCalcAngleS(&field_0x16f0, m_aimNeckAngleY, 3, var_r29, var_r28);
 }
 
-/* 8083EA78-8083EB10 006C38 0098+00 1/1 0/0 0/0 .text            copyFootMatrix__9daHorse_cFv */
 void daHorse_c::copyFootMatrix() {
     daHorseFootData_c* footdata_p = m_footData;
     for (int i = 0; i < 4; i++, footdata_p++) {
@@ -2568,7 +2500,6 @@ void daHorse_c::copyFootMatrix() {
     }
 }
 
-/* 8083EB10-8083ED88 006CD0 0278+00 1/1 0/0 0/0 .text            setFootMatrix__9daHorse_cFv */
 int daHorse_c::setFootMatrix() {
     daHorseFootData_c* footdata_p = m_footData;
     copyFootMatrix();
@@ -2632,7 +2563,6 @@ int daHorse_c::setFootMatrix() {
     return 1;
 }
 
-/* 8083ED88-8083F3B0 006F48 0628+00 1/1 0/0 0/0 .text            setLegAngle__9daHorse_cFfiiPs */
 int daHorse_c::setLegAngle(f32 param_0, int param_1, int param_2, s16* param_3) {
     if (fabsf(param_0) < 0.1f || ((param_1 == 0 || param_1 == 1) && param_2 == 0)) {
         return 0;
@@ -2752,7 +2682,6 @@ int daHorse_c::setLegAngle(f32 param_0, int param_1, int param_2, s16* param_3)
     return 1;
 }
 
-/* 8083F3B0-8083F9AC 007570 05FC+00 1/1 0/0 0/0 .text            footBgCheck__9daHorse_cFv */
 void daHorse_c::footBgCheck() {
     int i;
     daHorseFootData_c* footdata_p;
@@ -2883,7 +2812,6 @@ void daHorse_c::footBgCheck() {
     }
 }
 
-/* 8083F9AC-8083FDAC 007B6C 0400+00 2/2 0/0 0/0 .text            setReinPosMoveInit__9daHorse_cFi */
 void daHorse_c::setReinPosMoveInit(int param_0) {
     static cXyz reinLeftStart(63.0f, 17.0f, 11.0f);
     static cXyz reinRightStart(63.0f, 17.0f, -11.0f);
@@ -2949,7 +2877,6 @@ void daHorse_c::setReinPosMoveInit(int param_0) {
     }
 }
 
-/* 8083FDAC-8083FEB4 007F6C 0108+00 2/2 0/0 0/0 .text            copyReinPos__9daHorse_cFv */
 void daHorse_c::copyReinPos() {
     int i;
     cXyz* pos_p = m_reinLine.getPos(0);
@@ -2975,7 +2902,6 @@ void daHorse_c::copyReinPos() {
     }
 }
 
-/* 8083FEB4-8084010C 008074 0258+00 1/0 0/0 0/0 .text setReinPosHandSubstance__9daHorse_cFi */
 void daHorse_c::setReinPosHandSubstance(int param_0) {
     static const Vec zeldaLocalLeft = {3.0f, -0.5f, -5.0f};
     static const Vec zeldaLocalRight = {3.0f, -0.5f, 5.0f};
@@ -3047,7 +2973,6 @@ void daHorse_c::setReinPosHandSubstance(int param_0) {
     copyReinPos();
 }
 
-/* 8084010C-808402F8 0082CC 01EC+00 1/0 0/0 0/0 .text setReinPosNormalSubstance__9daHorse_cFv */
 void daHorse_c::setReinPosNormalSubstance() {
     static cXyz saddleLeft(29.0f, -2.0f, 30.0f);
     static cXyz saddleRight(29.0f, 2.0f, 30.0f);
@@ -3082,7 +3007,6 @@ void daHorse_c::setReinPosNormalSubstance() {
     copyReinPos();
 }
 
-/* 808402F8-80840714 0084B8 041C+00 1/1 0/0 0/0 .text            bgCheck__9daHorse_cFv */
 void daHorse_c::bgCheck() {
     if (m_procID != PROC_LARGE_DAMAGE_e) {
         static cXyz localCenterPos(0.0f, 100.0f, 0.0f);
@@ -3134,8 +3058,6 @@ void daHorse_c::bgCheck() {
     }
 }
 
-/* 80840714-808407B0 0088D4 009C+00 1/0 0/0 0/0 .text
- * checkSpecialWallHitSubstance__9daHorse_cCFRC4cXyz            */
 bool daHorse_c::checkSpecialWallHitSubstance(const cXyz& param_0) const {
     if (m_procID == PROC_JUMP_e) {
         return 0;
@@ -3156,14 +3078,10 @@ bool daHorse_c::checkSpecialWallHitSubstance(const cXyz& param_0) const {
     return 1;
 }
 
-/* 808407B0-80840800 008970 0050+00 3/3 0/0 0/0 .text            setServiceWaitTimer__9daHorse_cFv
- */
 void daHorse_c::setServiceWaitTimer() {
     m_serviceWaitTimer = cM_rndF(80.0f) + 150.0f;
 }
 
-/* 80840800-80840844 0089C0 0044+00 2/2 0/0 0/0 .text            checkServiceWaitAnime__9daHorse_cFv
- */
 BOOL daHorse_c::checkServiceWaitAnime() {
     return m_anmIdx[0] == ANM_HS_WAIT_03 ||
            m_anmIdx[0] == ANM_HS_WAIT_04 ||
@@ -3173,12 +3091,10 @@ BOOL daHorse_c::checkServiceWaitAnime() {
            m_anmIdx[0] == ANM_HS_WAIT_02;
 }
 
-/* 80840844-808408F0 008A04 00AC+00 2/2 0/0 0/0 .text            checkTurnInput__9daHorse_cFv */
 BOOL daHorse_c::checkTurnInput() {
     return m_padStickValue > 0.9f && (!dComIfGp_getAttention()->Lockon() || daAlink_getAlinkActorClass()->getAtnActor() != NULL);
 }
 
-/* 808408F0-808409C0 008AB0 00D0+00 2/2 0/0 0/0 .text            checkTgHitTurn__9daHorse_cFv */
 BOOL daHorse_c::checkTgHitTurn() {
     if (!dComIfGp_event_runCheck() && !checkStateFlg0(FLG0_UNK_1)) {
         if (!daAlink_getAlinkActorClass()->checkHorseRideReady() &&
@@ -3195,7 +3111,6 @@ BOOL daHorse_c::checkTgHitTurn() {
     return 0;
 }
 
-/* 808409C0-80840B28 008B80 0168+00 3/3 0/0 0/0 .text checkTurnAfterFastMove__9daHorse_cFf */
 BOOL daHorse_c::checkTurnAfterFastMove(f32 param_0) {
     if (param_0 > field_0x177C) {
         if (checkTgHitTurn()) {
@@ -3234,7 +3149,6 @@ BOOL daHorse_c::checkTurnAfterFastMove(f32 param_0) {
     return 0;
 }
 
-/* 80840B28-80840B88 008CE8 0060+00 2/2 0/0 0/0 .text            setNeckAnimeMorf__9daHorse_cFv */
 void daHorse_c::setNeckAnimeMorf() {
     u16 start_jnt_no;
     u16 end_jnt_no;
@@ -3249,7 +3163,6 @@ void daHorse_c::setNeckAnimeMorf() {
     m_oldFrame->initOldFrameMorf(3.0f, start_jnt_no, end_jnt_no);
 }
 
-/* 80840B88-80840CA4 008D48 011C+00 4/4 0/0 0/0 .text            setNeckAnime__9daHorse_cFUsffs */
 void daHorse_c::setNeckAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_endF) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, i_anmIdx);
     
@@ -3274,7 +3187,6 @@ void daHorse_c::setNeckAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_endF
     setNeckAnimeMorf();
 }
 
-/* 80840CA4-80840CE4 008E64 0040+00 9/9 0/0 0/0 .text            resetNeckAnime__9daHorse_cFv */
 void daHorse_c::resetNeckAnime() {
     if (m_anmRatio[2].getAnmTransform() != NULL) {
         m_anmRatio[2].setAnmTransform(NULL);
@@ -3283,7 +3195,6 @@ void daHorse_c::resetNeckAnime() {
     }
 }
 
-/* 80840CE4-80840FE0 008EA4 02FC+00 1/1 0/0 0/0 .text            setLashCnt__9daHorse_cFv */
 void daHorse_c::setLashCnt() {
     if (checkEndResetStateFlg0(ERFLG0_UNK_8) && checkStateFlg0(FLG0_UNK_1)) {
         dComIfGp_getVibration().StartShock(VIBMODE_S_POWER4, 1, cXyz(0.0f, 1.0f, 0.0f));
@@ -3346,7 +3257,6 @@ void daHorse_c::setLashCnt() {
     }
 }
 
-/* 80840FE0-80841084 0091A0 00A4+00 1/1 0/0 0/0 .text            setTalkModeWolf__9daHorse_cFv */
 void daHorse_c::setTalkModeWolf() {
     if (eventInfo.checkCommandTalk()) {
         if (!checkStateFlg0(FLG0_UNK_20000)) {
@@ -3362,7 +3272,6 @@ void daHorse_c::setTalkModeWolf() {
     }
 }
 
-/* 80841084-8084116C 009244 00E8+00 2/2 0/0 0/0 .text setBoarHit__9daHorse_cFP10fopAc_ac_ci */
 void daHorse_c::setBoarHit(fopAc_ac_c* param_0, int param_1) {
     int vibmode;
     s16 var_r30;
@@ -3386,14 +3295,12 @@ void daHorse_c::setBoarHit(fopAc_ac_c* param_0, int param_1) {
     }
 }
 
-/* 8084116C-808411D0 00932C 0064+00 1/1 0/0 0/0 .text            savePos__9daHorse_cFv */
 void daHorse_c::savePos() {
     if (this->model != NULL && !checkStateFlg0(FLG0_UNK_8000) && !checkStateFlg0(FLG0_NO_DRAW_WAIT)) {
         dComIfGs_setHorseRestart(dComIfGp_getStartStageName(), current.pos, shape_angle.y, fopAcM_GetRoomNo(this));
     }
 }
 
-/* 808411D0-80841468 009390 0298+00 1/0 0/0 0/0 .text callHorseSubstance__9daHorse_cFPC4cXyz */
 int daHorse_c::callHorseSubstance(cXyz const* i_pos) {
     int room_no = dComIfGp_roomControl_getStayNo();
     if (checkStateFlg0(FLG0_RODEO_MODE) ||
@@ -3448,8 +3355,6 @@ int daHorse_c::callHorseSubstance(cXyz const* i_pos) {
     return rt;
 }
 
-/* 80841468-808415B4 009628 014C+00 1/0 0/0 0/0 .text
- * setHorsePosAndAngleSubstance__9daHorse_cFPC4cXyzs            */
 void daHorse_c::setHorsePosAndAngleSubstance(cXyz const* param_0, s16 param_1) {
     int i, j;
 
@@ -3481,12 +3386,10 @@ void daHorse_c::setHorsePosAndAngleSubstance(cXyz const* param_0, s16 param_1) {
     }
 }
 
-/* 808415B4-80841628 009774 0074+00 2/2 0/0 0/0 .text            checkPlayerHeavy__9daHorse_cFv */
 BOOL daHorse_c::checkPlayerHeavy() {
     return !dComIfGp_event_runCheck() && checkStateFlg0(FLG0_UNK_1) && !checkStateFlg0(daHorse_FLG0(FLG0_UNK_200000 | FLG0_UNK_100000)) && daAlink_getAlinkActorClass()->checkBootsOrArmorHeavy();
 }
 
-/* 80841628-80841698 0097E8 0070+00 2/2 0/0 0/0 .text            setTgCoGrp__9daHorse_cFUlUl */
 void daHorse_c::setTgCoGrp(u32 i_tgGrp, u32 i_coGrp) {
     m_head_sph.SetTgGrp(i_tgGrp);
 
@@ -3497,21 +3400,17 @@ void daHorse_c::setTgCoGrp(u32 i_tgGrp, u32 i_coGrp) {
     }
 }
 
-/* 80841698-808416D4 009858 003C+00 1/0 0/0 0/0 .text            onRideFlgSubstance__9daHorse_cFv */
 void daHorse_c::onRideFlgSubstance() {
     onStateFlg0(FLG0_UNK_1);
     m_rodeoPointCnt = 0;
     setTgCoGrp(4, 0x60);
 }
 
-/* 808416D4-80841708 009894 0034+00 1/0 0/0 0/0 .text            offRideFlgSubstance__9daHorse_cFv
- */
 void daHorse_c::offRideFlgSubstance() {
     offStateFlg0(FLG0_UNK_1);
     setTgCoGrp(8, 0x70);
 }
 
-/* 80841708-808417B8 0098C8 00B0+00 8/8 0/0 0/0 .text            procWaitInit__9daHorse_cFv */
 int daHorse_c::procWaitInit() {
     if (m_procID == PROC_WAIT_e) {
         return 0;
@@ -3531,7 +3430,6 @@ int daHorse_c::procWaitInit() {
     return 1;
 }
 
-/* 808417B8-80841F04 009978 074C+00 1/0 0/0 0/0 .text            procWait__9daHorse_cFv */
 int daHorse_c::procWait() {
     if ((!dComIfGp_event_runCheck() && checkStateFlg0(FLG0_UNK_4000000)) || checkPlayerHeavy()) {
         return procTurnInit(0);
@@ -3673,7 +3571,6 @@ int daHorse_c::procWait() {
     return 1;
 }
 
-/* 80841F04-80841F80 00A0C4 007C+00 6/6 0/0 0/0 .text            procMoveInit__9daHorse_cFv */
 int daHorse_c::procMoveInit() {
     m_proc = &daHorse_c::procMove;
     m_procID = PROC_MOVE_e;
@@ -3683,7 +3580,6 @@ int daHorse_c::procMoveInit() {
     return 1;
 }
 
-/* 80841F80-808423DC 00A140 045C+00 1/0 0/0 0/0 .text            procMove__9daHorse_cFv */
 int daHorse_c::procMove() {
     int var_r30 = setSpeedAndAngle();
     if (var_r30 != 0) {
@@ -3754,7 +3650,6 @@ int daHorse_c::procMove() {
     return 1;
 }
 
-/* 808423DC-808425BC 00A59C 01E0+00 3/3 0/0 0/0 .text            procStopInit__9daHorse_cFv */
 int daHorse_c::procStopInit() {
     m_proc = &daHorse_c::procStop;
     m_procID = PROC_STOP_e;
@@ -3795,7 +3690,6 @@ int daHorse_c::procStopInit() {
     return 1;
 }
 
-/* 808425BC-80842878 00A77C 02BC+00 1/0 0/0 0/0 .text            procStop__9daHorse_cFv */
 int daHorse_c::procStop() {
     struct unk_foot_eff_t {
         f32 _0;
@@ -3895,7 +3789,6 @@ int daHorse_c::procStop() {
     return 1;
 }
 
-/* 80842878-80842AB0 00AA38 0238+00 6/6 0/0 0/0 .text            procTurnInit__9daHorse_cFi */
 int daHorse_c::procTurnInit(int param_0) {
     if (checkEndResetStateFlg0(ERFLG0_RIDE_RUN_FLG)) {
         speedF = 0.0f;
@@ -3958,7 +3851,6 @@ int daHorse_c::procTurnInit(int param_0) {
     return 1;
 }
 
-/* 80842AB0-80843008 00AC70 0558+00 1/0 0/0 0/0 .text            procTurn__9daHorse_cFv */
 int daHorse_c::procTurn() {
     daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[0];
 
@@ -4088,7 +3980,6 @@ int daHorse_c::procTurn() {
     return 1;
 }
 
-/* 80843008-808432E0 00B1C8 02D8+00 2/2 0/0 0/0 .text            procJumpInit__9daHorse_cFi */
 int daHorse_c::procJumpInit(int param_0) {
     if (checkEndResetStateFlg0(ERFLG0_RIDE_RUN_FLG)) {
         return 0;
@@ -4144,7 +4035,6 @@ int daHorse_c::procJumpInit(int param_0) {
     return 1;
 }
 
-/* 808432E0-80843604 00B4A0 0324+00 1/0 0/0 0/0 .text            procJump__9daHorse_cFv */
 int daHorse_c::procJump() {
     if (field_0x1722 != 0) {
         field_0x1722--;
@@ -4184,7 +4074,6 @@ int daHorse_c::procJump() {
     return 1;
 }
 
-/* 80843604-80843770 00B7C4 016C+00 1/1 0/0 0/0 .text            procLandInit__9daHorse_cFfi */
 int daHorse_c::procLandInit(f32 i_speedF, BOOL param_1) {
     m_proc = &daHorse_c::procLand;
     m_procID = PROC_LAND_e;
@@ -4213,7 +4102,6 @@ int daHorse_c::procLandInit(f32 i_speedF, BOOL param_1) {
     return 1;
 }
 
-/* 80843770-808438AC 00B930 013C+00 1/0 0/0 0/0 .text            procLand__9daHorse_cFv */
 int daHorse_c::procLand() {
     daPy_frameCtrl_c* frame_ctrl = &m_frameCtrl[0];
     int temp_r3 = checkHorseNoMove(1);
@@ -4244,8 +4132,6 @@ int daHorse_c::procLand() {
     return 1;
 }
 
-/* 808438AC-8084396C 00BA6C 00C0+00 1/1 0/0 0/0 .text            procLargeDamageInit__9daHorse_cFv
- */
 int daHorse_c::procLargeDamageInit() {
     m_proc = &daHorse_c::procLargeDamage;
     m_procID = PROC_LARGE_DAMAGE_e;
@@ -4261,7 +4147,6 @@ int daHorse_c::procLargeDamageInit() {
     return 1;
 }
 
-/* 8084396C-808439C8 00BB2C 005C+00 1/0 0/0 0/0 .text            procLargeDamage__9daHorse_cFv */
 int daHorse_c::procLargeDamage() {
     cLib_addCalcAngleS(&shape_angle.y, current.angle.y, 5, 0x2000, 0x1000);
     if (m_acch.ChkWallHit()) {
@@ -4271,7 +4156,6 @@ int daHorse_c::procLargeDamage() {
     return 1;
 }
 
-/* 808439C8-80843A44 00BB88 007C+00 1/1 0/0 0/0 .text            procToolDemoInit__9daHorse_cFv */
 int daHorse_c::procToolDemoInit() {
     m_proc = &daHorse_c::procToolDemo;
     m_procID = PROC_TOOL_DEMO_e;
@@ -4283,7 +4167,6 @@ int daHorse_c::procToolDemoInit() {
     return 1;
 }
 
-/* 80843A44-80843BFC 00BC04 01B8+00 1/0 0/0 0/0 .text            procToolDemo__9daHorse_cFv */
 int daHorse_c::procToolDemo() {
     dDemo_actor_c* demo_actor_p = dDemo_c::getActor(demoActorID);
     field_0x1730 = 0;
@@ -4327,8 +4210,6 @@ int daHorse_c::procToolDemo() {
     return 1;
 }
 
-/* 80843BFC-80843C40 00BDBC 0044+00 1/1 0/0 0/0 .text
- * searchSceneChangeArea__9daHorse_cFP10fopAc_ac_c              */
 void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) {
     if (fopAcM_GetName(i_scnChg) == PROC_SCENE_EXIT) {
         if (m_scnChg_num == 50) {
@@ -4344,15 +4225,12 @@ void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) {
     }
 }
 
-/* 80843C40-80843C74 00BE00 0034+00 1/1 0/0 0/0 .text
- * daHorse_searchSceneChangeArea__FP10fopAc_ac_cPv              */
 static void* daHorse_searchSceneChangeArea(fopAc_ac_c* i_actor, void* i_data) {
     (void)i_data;
     dComIfGp_getHorseActor()->searchSceneChangeArea(i_actor);
     return NULL;
 }
 
-/* 80843C74-80844570 00BE34 08FC+00 1/1 0/0 0/0 .text            execute__9daHorse_cFv */
 int daHorse_c::execute() {
     m_scnChg_num = 0;
     fopAcIt_Executor((fopAcIt_ExecutorFunc)daHorse_searchSceneChangeArea, NULL);
@@ -4614,12 +4492,10 @@ int daHorse_c::execute() {
     return 1;
 }
 
-/* 80844570-80844590 00C730 0020+00 1/0 0/0 0/0 .text            daHorse_Execute__FP9daHorse_c */
 static int daHorse_Execute(daHorse_c* i_this) {
     return i_this->execute();
 }
 
-/* 80844590-8084476C 00C750 01DC+00 1/1 0/0 0/0 .text            draw__9daHorse_cFv */
 int daHorse_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     if (checkStateFlg0(FLG0_NO_DRAW_WAIT) || checkResetStateFlg0(RFLG0_UNK_80)) {
@@ -4649,12 +4525,10 @@ int daHorse_c::draw() {
     return 1;
 }
 
-/* 8084476C-8084478C 00C92C 0020+00 1/0 0/0 0/0 .text            daHorse_Draw__FP9daHorse_c */
 static int daHorse_Draw(daHorse_c* i_this) {
     return i_this->draw();
 }
 
-/* 8084478C-80844B1C 00C94C 0390+00 1/1 0/0 0/0 .text            __dt__9daHorse_cFv */
 daHorse_c::~daHorse_c() {
 #if DEBUG
     if (m_hio) {
@@ -4669,14 +4543,12 @@ daHorse_c::~daHorse_c() {
     }
 }
 
-/* 80844B1C-80844B44 00CCDC 0028+00 1/0 0/0 0/0 .text            daHorse_Delete__FP9daHorse_c */
 static int daHorse_Delete(daHorse_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->~daHorse_c();
     return 1;
 }
 
-/* 80845A34-80845A54 -00001 0020+00 1/0 0/0 0/0 .data            l_daHorse_Method */
 static actor_method_class l_daHorse_Method = {
     (process_method_func)daHorse_Create,
     (process_method_func)daHorse_Delete,
@@ -4685,7 +4557,6 @@ static actor_method_class l_daHorse_Method = {
     (process_method_func)daHorse_Draw,
 };
 
-/* 80845A54-80845A84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_HORSE */
 extern actor_process_profile_definition g_profile_HORSE = {
   fpcLy_CURRENT_e,        // mLayerID
   4,                      // mListID
diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp
index e40b63c26d..9a9a706d05 100644
--- a/src/d/actor/d_a_hozelda.cpp
+++ b/src/d/actor/d_a_hozelda.cpp
@@ -17,7 +17,6 @@
 #define HIO daHoZelda_hio_c0::m
 #endif
 
-/* 80848E3C-80848E44 000000 0008+00 15/15 0/0 0/0 .rodata          l_arcName */
 static const char l_arcName[] = "HoZelda";
 
 #if DEBUG
@@ -30,7 +29,6 @@ void daHoZelda_hio_c::genMessage(JORMContext* context) {
 }
 #endif
 
-/* 80845E98-80845EAC 000078 0014+00 1/1 0/0 0/0 .text daHoZelda_searchGanon__FP10fopAc_ac_cPv */
 static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) {
     (void)i_data;
     if (fopAcM_GetName(i_actor) == PROC_B_GND) {
@@ -40,7 +38,6 @@ static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80848E44-80848E54 000008 0010+00 0/5 0/0 0/0 .rodata          m__16daHoZelda_hio_c0 */
 const daHoZelda_hio_c1 daHoZelda_hio_c0::m = {
     0x38E,
     0x2AAA,
@@ -55,7 +52,6 @@ u8 daHoZelda_matAnm_c::mEyeMoveFlg;
 u8 daHoZelda_matAnm_c::mMorfFrame;
 #endif
 
-/* 80845EAC-80845EDC 00008C 0030+00 2/2 0/0 0/0 .text            init__18daHoZelda_matAnm_cFv */
 void daHoZelda_matAnm_c::init() {
     field_0xf4 = 0.0f;
     field_0xf8 = 0.0f;
@@ -66,8 +62,6 @@ void daHoZelda_matAnm_c::init() {
     mMorfFrame = 0;
 }
 
-/* 80845EDC-80846000 0000BC 0124+00 1/0 0/0 0/0 .text calc__18daHoZelda_matAnm_cCFP11J3DMaterial
- */
 void daHoZelda_matAnm_c::calc(J3DMaterial* i_material) const {
     J3DMaterialAnm::calc(i_material);
 
@@ -90,7 +84,6 @@ void daHoZelda_matAnm_c::calc(J3DMaterial* i_material) const {
     }
 }
 
-/* 80846000-8084642C 0001E0 042C+00 1/1 0/0 0/0 .text            createHeap__11daHoZelda_cFv */
 BOOL daHoZelda_c::createHeap() {
     mpZeldaModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x23), 0, 0x11020284);
     if (mpZeldaModel == NULL) {
@@ -149,12 +142,10 @@ BOOL daHoZelda_c::createHeap() {
     return TRUE;
 }
 
-/* 808466F8-80846718 0008D8 0020+00 1/1 0/0 0/0 .text daHoZelda_createHeap__FP10fopAc_ac_c */
 static int daHoZelda_createHeap(fopAc_ac_c* i_this) {
     return ((daHoZelda_c*)i_this)->createHeap();
 }
 
-/* 80846718-8084696C 0008F8 0254+00 1/1 0/0 0/0 .text            modelCallBack__11daHoZelda_cFUs */
 void daHoZelda_c::modelCallBack(u16 i_jntNo) {
     if (i_jntNo == 0) {
         J3DTransformInfo sp24 = *field_0x5c4->getOldFrameTransInfo(0);
@@ -201,7 +192,6 @@ void daHoZelda_c::modelCallBack(u16 i_jntNo) {
     }
 }
 
-/* 8084696C-808469B0 000B4C 0044+00 1/1 0/0 0/0 .text daHoZelda_modelCallBack__FP8J3DJointi */
 static int daHoZelda_modelCallBack(J3DJoint* i_joint2, int param_1) {
     J3DJoint* i_joint = i_joint2;
     u16 jnt_no = i_joint->getJntNo();
@@ -214,7 +204,6 @@ static int daHoZelda_modelCallBack(J3DJoint* i_joint2, int param_1) {
     return 1;
 }
 
-/* 808469B0-80846C4C 000B90 029C+00 1/1 0/0 0/0 .text            create__11daHoZelda_cFv */
 int daHoZelda_c::create() {
     fopAcM_ct(this, daHoZelda_c);
 
@@ -261,14 +250,12 @@ int daHoZelda_c::create() {
     return phase_state;
 }
 
-/* 80846D90-80846DB0 000F70 0020+00 1/0 0/0 0/0 .text            daHoZelda_Create__FP10fopAc_ac_c */
 static int daHoZelda_Create(fopAc_ac_c* i_this) {
     daHoZelda_c* a_this = (daHoZelda_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
-/* 80846DB0-80846F24 000F90 0174+00 1/1 0/0 0/0 .text            __dt__11daHoZelda_cFv */
 daHoZelda_c::~daHoZelda_c() {
     #if DEBUG
     if (mpHIO) {
@@ -290,15 +277,12 @@ daHoZelda_c::~daHoZelda_c() {
     mSound.deleteObject();
 }
 
-/* 80846F24-80846F4C 001104 0028+00 1/0 0/0 0/0 .text            daHoZelda_Delete__FP11daHoZelda_c
- */
 static int daHoZelda_Delete(daHoZelda_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->~daHoZelda_c();
     return 1;
 }
 
-/* 80846F4C-8084718C 00112C 0240+00 1/1 0/0 0/0 .text setDoubleAnime__11daHoZelda_cFfffUsUsf */
 int daHoZelda_c::setDoubleAnime(f32 i_ratio, f32 i_anmSpeedA, f32 i_anmSpeedB, u16 i_anmIdxA, u16 i_anmIdxB,
                                 f32 i_morf) {
     J3DAnmTransform* var_r27 = mAnmRatioPack[0].getAnmTransform();
@@ -339,7 +323,6 @@ int daHoZelda_c::setDoubleAnime(f32 i_ratio, f32 i_anmSpeedA, f32 i_anmSpeedB, u
     return 1;
 }
 
-/* 8084718C-80847234 00136C 00A8+00 1/1 0/0 0/0 .text            setUpperAnime__11daHoZelda_cFUs */
 int daHoZelda_c::setUpperAnime(u16 i_anmNo) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, i_anmNo);
     mUpperAnmID = i_anmNo;
@@ -351,7 +334,6 @@ int daHoZelda_c::setUpperAnime(u16 i_anmNo) {
     return 1;
 }
 
-/* 80847234-808472C0 001414 008C+00 3/3 0/0 0/0 .text            resetUpperAnime__11daHoZelda_cFv */
 void daHoZelda_c::resetUpperAnime() {
     if (mUpperAnmID != 0xFFFF) {
         mUpperAnmID = 0xFFFF;
@@ -368,7 +350,6 @@ void daHoZelda_c::resetUpperAnime() {
     }
 }
 
-/* 808472C0-80847430 0014A0 0170+00 2/2 0/0 0/0 .text setSingleAnime__11daHoZelda_cFUsffsf */
 int daHoZelda_c::setSingleAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_endF, f32 i_morf) {
     J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, i_anmIdx);
 
@@ -404,7 +385,6 @@ int daHoZelda_c::setSingleAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_e
     return 1;
 }
 
-/* 80847430-80847574 001610 0144+00 1/1 0/0 0/0 .text            animePlay__11daHoZelda_cFv */
 void daHoZelda_c::animePlay() {
     mFrameCtrl[0].updateFrame();
     mAnmRatioPack[0].getAnmTransform()->setFrame(mFrameCtrl[0].getFrame());
@@ -437,26 +417,22 @@ void daHoZelda_c::animePlay() {
     mBowBck.play();
 }
 
-/* 80847574-808475F0 001754 007C+00 2/2 0/0 0/0 .text            setEyeBtp__11daHoZelda_cFUs */
 void daHoZelda_c::setEyeBtp(u16 i_resNo) {
     mEyeBtp.init(mpZeldaModel->getModelData(),
                  (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, i_resNo), 1, -1, 1.0f, 0, -1);
 }
 
-/* 808475F0-80847670 0017D0 0080+00 2/2 0/0 0/0 .text            setEyeBtk__11daHoZelda_cFUsUc */
 void daHoZelda_c::setEyeBtk(u16 i_resNo, u8 param_1) {
     field_0x6de = param_1;
     void* btk = dComIfG_getObjectRes(l_arcName, i_resNo);
     mEyeBtk.init(mpZeldaModel->getModelData(), (J3DAnmTextureSRTKey*)btk, 1, -1, 1.0f, 0, -1);
 }
 
-/* 80847670-808476B0 001850 0040+00 2/2 0/0 0/0 .text            setNormalFace__11daHoZelda_cFv */
 void daHoZelda_c::setNormalFace() {
     setEyeBtp(0x2F);
     setEyeBtk(0x26, 0);
 }
 
-/* 808476B0-80847E44 001890 0794+00 1/1 0/0 0/0 .text            setAnm__11daHoZelda_cFv */
 void daHoZelda_c::setAnm() {
     u16 anm_idx[3];
     daHorse_c* horse = (daHorse_c*)dComIfGp_getHorseActor();
@@ -650,7 +626,6 @@ void daHoZelda_c::setAnm() {
     }
 }
 
-/* 80847E44-80847F54 002024 0110+00 2/2 0/0 0/0 .text            setBowModel__11daHoZelda_cFv */
 void daHoZelda_c::setBowModel() {
     static const Vec localEyePos = {8.0f, -12.0f, 0.0f};
     static const Vec localHeadCenterPos = {8.0f, 0.0f, 0.0f};
@@ -668,7 +643,6 @@ void daHoZelda_c::setBowModel() {
     mpBowModel->calc();
 }
 
-/* 80847F54-80848058 002134 0104+00 2/2 0/0 0/0 .text            setMatrix__11daHoZelda_cFv */
 void daHoZelda_c::setMatrix() {
     static const Vec localHorseRidePos = {-5.894f, 52.61f, 4.079f};
     static const Vec localFrontHorseRidePos = {-75.893997f, 57.61f, 4.079f};
@@ -695,7 +669,6 @@ void daHoZelda_c::setMatrix() {
     mpZeldaModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80848058-80848090 002238 0038+00 1/1 0/0 0/0 .text            shootArrow__11daHoZelda_cFv */
 void daHoZelda_c::shootArrow() {
     daArrow_c* arrow = (daArrow_c*)mArrowAcKeep.getActor();
     if (arrow != NULL) {
@@ -704,7 +677,6 @@ void daHoZelda_c::shootArrow() {
     }
 }
 
-/* 80848090-80848118 002270 0088+00 1/1 0/0 0/0 .text            deleteArrow__11daHoZelda_cFv */
 void daHoZelda_c::deleteArrow() {
     daArrow_c* arrow = (daArrow_c*)mArrowAcKeep.getActor();
     if (arrow != NULL) {
@@ -721,13 +693,11 @@ void daHoZelda_c::deleteArrow() {
     }
 }
 
-/* 80848118-8084819C 0022F8 0084+00 2/2 0/0 0/0 .text            setBowBck__11daHoZelda_cFUs */
 void daHoZelda_c::setBowBck(u16 i_anmNo) {
     mBowBck.init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, i_anmNo), 1, -1, 1.0f, 0, -1, 1);
     mBowAnmID = i_anmNo;
 }
 
-/* 8084819C-80848204 00237C 0068+00 2/2 0/0 0/0 .text            setRideOffset__11daHoZelda_cFv */
 void daHoZelda_c::setRideOffset() {
     static const Vec baseRidePos = {0.1f, 236.7f, -63.554f};
     static const Vec frontRidePos = {0.1f, 241.7f, 6.445999f};
@@ -739,7 +709,6 @@ void daHoZelda_c::setRideOffset() {
     }
 }
 
-/* 80848204-80848254 0023E4 0050+00 2/2 0/0 0/0 .text            clearEyeMove__11daHoZelda_cFv */
 void daHoZelda_c::clearEyeMove() {
     mpMatAnm[0]->setNowOffsetX(0.0f);
     mpMatAnm[1]->setNowOffsetX(0.0f);
@@ -752,8 +721,6 @@ void daHoZelda_c::clearEyeMove() {
     }
 }
 
-/* 80848254-808484B8 002434 0264+00 1/1 0/0 0/0 .text            setEyeMove__11daHoZelda_cFPC4cXyzss
- */
 void daHoZelda_c::setEyeMove(cXyz const* param_0, s16 param_1, s16 param_2) {
     f32 var_f30;
     f32 var_f31;
@@ -818,7 +785,6 @@ void daHoZelda_c::setEyeMove(cXyz const* param_0, s16 param_1, s16 param_2) {
     }
 }
 
-/* 808484B8-80848774 002698 02BC+00 1/1 0/0 0/0 .text            setNeckAngle__11daHoZelda_cFv */
 void daHoZelda_c::setNeckAngle() {
     daPy_py_c* player = daPy_getLinkPlayerActorClass();
     cXyz* var_r28 = NULL;
@@ -882,7 +848,6 @@ void daHoZelda_c::setNeckAngle() {
     }
 }
 
-/* 80848774-808489CC 002954 0258+00 1/1 0/0 0/0 .text            searchBodyAngle__11daHoZelda_cFv */
 // NONMATCHING - load order with cLib_minMaxLimit
 void daHoZelda_c::searchBodyAngle() {
     fopAc_ac_c* gnd_actor = mGndAcKeep.getActor();
@@ -915,7 +880,6 @@ void daHoZelda_c::searchBodyAngle() {
     cLib_addCalcAngleS(&mBodyAngle.y, angle_y_target, 4, 0xC00, 0x180);
 }
 
-/* 808489CC-80848B44 002BAC 0178+00 1/1 0/0 0/0 .text            execute__11daHoZelda_cFv */
 int daHoZelda_c::execute() {
     mReverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
 
@@ -956,13 +920,10 @@ int daHoZelda_c::execute() {
     return 1;
 }
 
-/* 80848B44-80848B64 002D24 0020+00 1/0 0/0 0/0 .text            daHoZelda_Execute__FP11daHoZelda_c
- */
 static int daHoZelda_Execute(daHoZelda_c* i_this) {
     return i_this->execute();
 }
 
-/* 80848B64-80848C68 002D44 0104+00 1/1 0/0 0/0 .text            draw__11daHoZelda_cFv */
 int daHoZelda_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpZeldaModel, &tevStr);
@@ -982,12 +943,10 @@ int daHoZelda_c::draw() {
     return 1;
 }
 
-/* 80848C68-80848C88 002E48 0020+00 1/0 0/0 0/0 .text            daHoZelda_Draw__FP11daHoZelda_c */
 static int daHoZelda_Draw(daHoZelda_c* i_this) {
     return i_this->draw();
 }
 
-/* 80848F04-80848F24 -00001 0020+00 1/0 0/0 0/0 .data            l_daHoZelda_Method */
 static actor_method_class l_daHoZelda_Method = {
     (process_method_func)daHoZelda_Create,
     (process_method_func)daHoZelda_Delete,
@@ -996,7 +955,6 @@ static actor_method_class l_daHoZelda_Method = {
     (process_method_func)daHoZelda_Draw,
 };
 
-/* 80848F24-80848F54 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_HOZELDA */
 extern actor_process_profile_definition g_profile_HOZELDA = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index ff89baad25..680f5bb6c7 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -10,23 +10,19 @@
 #include "d/d_item_data.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80144724-8014474C 13F064 0028+00 0/0 1/1 8/8 .text            DeleteBase__12daItemBase_cFPCc */
 int daItemBase_c::DeleteBase(const char* i_resName) {
     dComIfG_resDelete(&mPhase, i_resName);
     return 1;
 }
 
-/* 8014474C-80144754 13F08C 0008+00 1/0 1/0 9/0 .text            clothCreate__12daItemBase_cFv */
 int daItemBase_c::clothCreate() {
     return 1;
 }
 
-/* 80144754-8014475C 13F094 0008+00 1/0 1/0 3/0 .text            __CreateHeap__12daItemBase_cFv */
 int daItemBase_c::__CreateHeap() {
     return 1;
 }
 
-/* 8014475C-80144B94 13F09C 0438+00 0/0 3/3 0/0 .text CreateItemHeap__12daItemBase_cFPCcsssssss */
 int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btkName, s16 i_bpkName,
                                  s16 i_bckName, s16 i_bxaName, s16 i_brkName, s16 i_btpName) {
     JUT_ASSERT(0, 0 <= m_itemNo && m_itemNo <= 255);
@@ -127,7 +123,6 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk
     return __CreateHeap() ? TRUE : FALSE;
 }
 
-/* 80144B94-80144C30 13F4D4 009C+00 1/0 1/0 9/0 .text            DrawBase__12daItemBase_cFv */
 int daItemBase_c::DrawBase() {
     setTevStr();
     animEntry();
@@ -139,36 +134,29 @@ int daItemBase_c::DrawBase() {
     return 1;
 }
 
-/* 80144C30-80144C7C 13F570 004C+00 1/0 1/0 9/0 .text            RotateYBase__12daItemBase_cFv */
 void daItemBase_c::RotateYBase() {
     shape_angle.y += (s16)(0xFFFF / getData().mRotateYSpeed);
 }
 
-/* 80144C7C-80144CA0 13F5BC 0024+00 1/0 1/0 5/0 .text            setListStart__12daItemBase_cFv */
 void daItemBase_c::setListStart() {
     dComIfGd_setListDark();
 }
 
-/* 80144CA0-80144CC4 13F5E0 0024+00 1/1 0/0 0/0 .text            setListEnd__12daItemBase_cFv */
 void daItemBase_c::setListEnd() {
     dComIfGd_setList();
 }
 
-/* 80144CC4-80144D18 13F604 0054+00 1/0 1/0 9/0 .text            settingBeforeDraw__12daItemBase_cFv
- */
 void daItemBase_c::settingBeforeDraw() {
     if (chkFlag(4)) {
         fopAcM_setEffectMtx(this, mpModel->getModelData());
     }
 }
 
-/* 80144D18-80144D70 13F658 0058+00 1/0 0/0 8/0 .text            setTevStr__12daItemBase_cFv */
 void daItemBase_c::setTevStr() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
 }
 
-/* 80144D70-80144EDC 13F6B0 016C+00 1/0 1/0 9/1 .text            setShadow__12daItemBase_cFv */
 void daItemBase_c::setShadow() {
     f32 size = scale.x * getShadowSize();
 
@@ -189,7 +177,6 @@ void daItemBase_c::setShadow() {
     }
 }
 
-/* 80144EDC-8014503C 13F81C 0160+00 1/0 1/0 9/0 .text            animEntry__12daItemBase_cFv */
 void daItemBase_c::animEntry() {
     if (mpBrkAnm != NULL) {
         s8 tevFrm = getTevFrm();
@@ -222,7 +209,6 @@ void daItemBase_c::animEntry() {
     }
 }
 
-/* 8014503C-80145144 13F97C 0108+00 0/0 2/2 4/4 .text            animPlay__12daItemBase_cFffffff */
 void daItemBase_c::animPlay(f32 i_btkSpeed, f32 i_bpkSpeed, f32 i_bckSpeed, f32 param_3, f32 i_brkSpeed,
                             f32 i_btpSpeed) {
     if (mpBrkAnm != NULL && getTevFrm() == -1) {
@@ -251,32 +237,26 @@ void daItemBase_c::animPlay(f32 i_btkSpeed, f32 i_bpkSpeed, f32 i_bckSpeed, f32
     }
 }
 
-/* 80145144-80145164 13FA84 0020+00 1/0 1/0 8/0 .text            chkFlag__12daItemBase_cFi */
 BOOL daItemBase_c::chkFlag(int i_flag) {
     return dItem_data::chkFlag(m_itemNo, i_flag);
 }
 
-/* 80145164-80145180 13FAA4 001C+00 1/0 1/0 8/0 .text            getTevFrm__12daItemBase_cFv */
 s8 daItemBase_c::getTevFrm() {
     return dItem_data::getTevFrm(m_itemNo);
 }
 
-/* 80145180-8014519C 13FAC0 001C+00 1/0 1/0 8/0 .text            getBtpFrm__12daItemBase_cFv */
 s8 daItemBase_c::getBtpFrm() {
     return dItem_data::getBtpFrm(m_itemNo);
 }
 
-/* 8014519C-801451B4 13FADC 0018+00 1/0 1/0 8/0 .text            getShadowSize__12daItemBase_cFv */
 u8 daItemBase_c::getShadowSize() {
     return dItem_data::getShadowSize(m_itemNo);
 }
 
-/* 801451B4-801451D0 13FAF4 001C+00 1/0 1/0 8/0 .text            getCollisionH__12daItemBase_cFv */
 u8 daItemBase_c::getCollisionH() {
     return dItem_data::getH(m_itemNo);
 }
 
-/* 801451D0-801451EC 13FB10 001C+00 1/0 1/0 8/0 .text            getCollisionR__12daItemBase_cFv */
 u8 daItemBase_c::getCollisionR() {
     return dItem_data::getR(m_itemNo);
 }
diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp
index 3bf461af28..56fb335851 100644
--- a/src/d/actor/d_a_izumi_gate.cpp
+++ b/src/d/actor/d_a_izumi_gate.cpp
@@ -8,45 +8,35 @@
 #include "d/actor/d_a_izumi_gate.h"
 #include "d/d_procname.h"
 
-/* 80849098-808490B8 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__13daIzumiGate_cFv */
 void daIzumiGate_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 808490B8-8084910C 000098 0054+00 2/2 0/0 0/0 .text            setBaseMtx__13daIzumiGate_cFv */
 void daIzumiGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     MTXCopy(mDoMtx_stack_c::now, mBgMtx);
     MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
 }
 
-/* 8084910C-80849138 0000EC 002C+00 1/0 0/0 0/0 .text            daIzumiGate_Draw__FP13daIzumiGate_c
- */
 static int daIzumiGate_Draw(daIzumiGate_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDraw();
 }
 
-/* 80849138-80849158 000118 0020+00 1/0 0/0 0/0 .text daIzumiGate_Execute__FP13daIzumiGate_c */
 static int daIzumiGate_Execute(daIzumiGate_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80849158-80849160 000138 0008+00 1/0 0/0 0/0 .text daIzumiGate_IsDelete__FP13daIzumiGate_c */
 static int daIzumiGate_IsDelete(daIzumiGate_c* i_this) {
     return 1;
 }
 
-/* 80849160-80849184 000140 0024+00 1/0 0/0 0/0 .text daIzumiGate_Delete__FP13daIzumiGate_c */
 static int daIzumiGate_Delete(daIzumiGate_c* i_this) {
     static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
     return 1;
 }
 
-/* 80849438-8084943C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_IzmGate";
 
-/* 80849184-80849260 000164 00DC+00 1/0 0/0 0/0 .text            daIzumiGate_Create__FP10fopAc_ac_c
- */
 int daIzumiGate_c::create() {
     fopAcM_ct(this, daIzumiGate_c);
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -65,28 +55,23 @@ static int daIzumiGate_Create(fopAc_ac_c* i_this) {
     return static_cast<daIzumiGate_c*>(i_this)->create();
 }
 
-/* 80849260-808492D8 000240 0078+00 1/0 0/0 0/0 .text            CreateHeap__13daIzumiGate_cFv */
 int daIzumiGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_IzumiGate_b.bmd");
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 808492D8-808492FC 0002B8 0024+00 1/0 0/0 0/0 .text            Create__13daIzumiGate_cFv */
 int daIzumiGate_c::Create() {
     initBaseMtx();
     return cPhs_COMPLEATE_e;
 }
 
-/* 808492FC-80849328 0002DC 002C+00 1/0 0/0 0/0 .text            Execute__13daIzumiGate_cFPPA3_A4_f
- */
 int daIzumiGate_c::Execute(Mtx** i_mtx) {
     *i_mtx = &mBgMtx;
     setBaseMtx();
     return 1;
 }
 
-/* 80849328-808493CC 000308 00A4+00 1/0 0/0 0/0 .text            Draw__13daIzumiGate_cFv */
 int daIzumiGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -96,20 +81,17 @@ int daIzumiGate_c::Draw() {
     return 1;
 }
 
-/* 808493CC-80849400 0003AC 0034+00 1/0 0/0 0/0 .text            Delete__13daIzumiGate_cFv */
 int daIzumiGate_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 8084943C-8084945C -00001 0020+00 1/0 0/0 0/0 .data            l_daIzumiGate_Method */
 static actor_method_class l_daIzumiGate_Method = {
     (process_method_func)daIzumiGate_Create,  (process_method_func)daIzumiGate_Delete,
     (process_method_func)daIzumiGate_Execute, (process_method_func)daIzumiGate_IsDelete,
     (process_method_func)daIzumiGate_Draw,
 };
 
-/* 8084945C-8084948C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Izumi_Gate */
 extern actor_process_profile_definition g_profile_Izumi_Gate = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp
index ced730f1a7..ad726a2ef5 100644
--- a/src/d/actor/d_a_kago.cpp
+++ b/src/d/actor/d_a_kago.cpp
@@ -23,7 +23,6 @@
 #include "f_op/f_op_overlap_mng.h"
 
 namespace {
-/* 80854D4C-80854D8C 000000 0040+00 1/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_kago_cpp@ */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x8, 0x0, 0x12}, {0x0, 0x0}, 0x0}}, // mObj
@@ -39,8 +38,8 @@ static dCcD_SrcSph cc_sph_src = {
 
 class daKago_HIO_c : public JORReflexible {
 public:
-    /* 808495AC */ daKago_HIO_c();
-    /* 80854A4C */ virtual ~daKago_HIO_c() {}
+    daKago_HIO_c();
+    virtual ~daKago_HIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -68,7 +67,6 @@ public:
     /* 0x58 */ f32 mSplashGenTimeDuringDash;
 };
 
-/* 808495AC-80849660 0000EC 00B4+00 1/1 0/0 0/0 .text            __ct__12daKago_HIO_cFv */
 daKago_HIO_c::daKago_HIO_c() {
     mChild = -1;
     mRevoconUpDown = 1024.0f;
@@ -144,7 +142,6 @@ void daKago_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80849660-808496F0 0001A0 0090+00 4/3 0/0 0/0 .text            getBckName__8daKago_cFi */
 int daKago_c::getBckName(int param_0) {
     if (field_0x6e7 == 0) {
         return param_0;
@@ -176,13 +173,11 @@ int daKago_c::getBckName(int param_0) {
     }
 }
 
-/* 808496F0-80849798 000230 00A8+00 13/13 0/0 0/0 .text            setBck__8daKago_cFiUcff */
 void daKago_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) {
     mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(param_0)),
                    param_1, param_2, param_3, 0.0f, -1.0f);
 }
 
-/* 80849798-808497F8 0002D8 0060+00 6/6 0/0 0/0 .text            checkBck__8daKago_cFi */
 bool daKago_c::checkBck(int param_0) {
     if (mpMorf->getAnm() == dComIfG_getObjectRes(field_0x75c, getBckName(param_0))) {
         return true;
@@ -191,7 +186,6 @@ bool daKago_c::checkBck(int param_0) {
     }
 }
 
-/* 808497F8-80849924 000338 012C+00 1/1 0/0 0/0 .text            draw__8daKago_cFv */
 int daKago_c::draw() {
     if (field_0x6de == NULL) {
         return 1;
@@ -214,12 +208,10 @@ int daKago_c::draw() {
     return 1;
 }
 
-/* 80849960-80849980 0004A0 0020+00 1/0 0/0 0/0 .text            daKago_Draw__FP8daKago_c */
 static int daKago_Draw(daKago_c* i_this) {
     return i_this->draw();
 }
 
-/* 80849980-80849BA8 0004C0 0228+00 1/1 0/0 0/0 .text            executeBalloonMenu__8daKago_cFv */
 int daKago_c::executeBalloonMenu() {
     dCamera_c* camera = dCam_getBody();
 
@@ -281,7 +273,6 @@ int daKago_c::executeBalloonMenu() {
 static u8 l_HIOInit;
 static daKago_HIO_c l_HIO;
 
-/* 80849BA8-8084A070 0006E8 04C8+00 4/4 0/0 0/0 .text checkGroundHeight__8daKago_cF4cXyzPf */
 f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) {
     f32 retVal;
 
@@ -397,7 +388,6 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) {
     return retVal;
 }
 
-/* 8084A070-8084A210 000BB0 01A0+00 4/4 0/0 0/0 .text            checkRoofHeight__8daKago_cF4cXyz */
 f32 daKago_c::checkRoofHeight(cXyz param_0) {
     f32 roofChkYVal = mRoofHeight;
     BOOL unkFlag1 = FALSE;
@@ -444,7 +434,6 @@ f32 daKago_c::checkRoofHeight(cXyz param_0) {
     return roofChkYVal;
 }
 
-/* 8084A210-8084A2A8 000D50 0098+00 1/1 0/0 0/0 .text            checkMoveHeight__8daKago_cFv */
 void daKago_c::checkMoveHeight() {
     f32 step = 100.0f;
     f32 target = checkGroundHeight(current.pos, &step);
@@ -452,7 +441,6 @@ void daKago_c::checkMoveHeight() {
     cLib_chaseF(&mRoofHeight, checkRoofHeight(current.pos), 30.0f);
 }
 
-/* 8084A2A8-8084A694 000DE8 03EC+00 1/1 0/0 0/0 .text            checkSizeBg__8daKago_cFv */
 void daKago_c::checkSizeBg() {
     dBgS_LinChk linChk;
     cXyz unkXyz1;
@@ -512,13 +500,10 @@ void daKago_c::checkSizeBg() {
     }
 }
 
-/* 8084A6DC-8084A6E4 00121C 0008+00 1/1 0/0 0/0 .text            getBeforeGroundHeight__8daKago_cFUc
- */
 s16 daKago_c::getBeforeGroundHeight(u8 param_0) {
     return 0;
 }
 
-/* 8084A6E4-8084AA64 001224 0380+00 2/1 0/0 0/0 .text            demo_skip__8daKago_cFi */
 void daKago_c::demo_skip(int param_0) {
     dCamera_c* camera = dCam_getBody();
 
@@ -593,7 +578,6 @@ void daKago_c::demo_skip(int param_0) {
     }
 }
 
-/* 8084AA64-8084AA98 0015A4 0034+00 4/4 0/0 0/0 .text            DemoSkipCallBack__8daKago_cFPvi */
 int daKago_c::DemoSkipCallBack(void* param_0, int param_1) {
     if (param_0 != NULL) {
         ((daKago_c*)param_0)->demo_skip(param_1);
@@ -602,14 +586,12 @@ int daKago_c::DemoSkipCallBack(void* param_0, int param_1) {
     return 0;
 }
 
-/* 8084AA98-8084AAAC 0015D8 0014+00 17/17 0/0 0/0 .text            setActionMode__8daKago_cFii */
 void daKago_c::setActionMode(int param_0, int param_1) {
     mIsFlying = false;
     mCurrentAction = param_0;
     field_0x744 = param_1;
 }
 
-/* 8084AAAC-8084AB40 0015EC 0094+00 2/2 0/0 0/0 .text            setMidnaTagPos__8daKago_cFv */
 void daKago_c::setMidnaTagPos() {
     cXyz unkXyz1;
     daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor();
@@ -620,7 +602,6 @@ void daKago_c::setMidnaTagPos() {
     }
 }
 
-/* 8084AB40-8084AB8C 001680 004C+00 5/5 0/0 0/0 .text            setMidnaRideOn__8daKago_cFv */
 void daKago_c::setMidnaRideOn() {
     daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor();
     if (midna != NULL) {
@@ -629,12 +610,10 @@ void daKago_c::setMidnaRideOn() {
     }
 }
 
-/* 8084AB8C-8084ABC8 0016CC 003C+00 7/7 0/0 0/0 .text            setPlayerRideOn__8daKago_cFv */
 void daKago_c::setPlayerRideOn() {
     daPy_getPlayerActorClass()->setCargoCarry(this);
 }
 
-/* 8084ABC8-8084AC2C 001708 0064+00 5/5 0/0 0/0 .text            setRideOff__8daKago_cFv */
 void daKago_c::setRideOff() {
     daMidna_c* midna = daPy_getPlayerActorClass()->getMidnaActor();
     if (midna != NULL) {
@@ -644,7 +623,6 @@ void daKago_c::setRideOff() {
     daPy_getPlayerActorClass()->offCargoCarry();
 }
 
-/* 8084AC2C-8084AE78 00176C 024C+00 1/1 0/0 0/0 .text            searchNearPassPoint__8daKago_cFv */
 s8 daKago_c::searchNearPassPoint() {
     cXyz pointPos;
 
@@ -675,7 +653,6 @@ s8 daKago_c::searchNearPassPoint() {
     return pointIdx2;
 }
 
-/* 8084AE78-8084AF40 0019B8 00C8+00 4/4 0/0 0/0 .text            setSceneChange__8daKago_cFi */
 int daKago_c::setSceneChange(int param_0) {
     int unkInt1 = 0;
     switch (param_0) {
@@ -712,7 +689,6 @@ int daKago_c::setSceneChange(int param_0) {
     return dStage_changeScene(unkInt1, 0.0f, 10, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 8084AF40-8084AFB0 001A80 0070+00 1/1 0/0 0/0 .text            createBalloonScore__8daKago_cFv */
 void daKago_c::createBalloonScore() {
     if (field_0x6e7 != 0 && mBalloon2DId == fpcM_ERROR_PROCESS_ID_e) {
         mBalloon2DId = fopAcM_create(PROC_BALLOON2D, 0, 0, 0xffffffff, 0, 0, 0xffffffff);
@@ -720,7 +696,6 @@ void daKago_c::createBalloonScore() {
     }
 }
 
-/* 8084AFB0-8084B024 001AF0 0074+00 1/1 0/0 0/0 .text            startBalloonScore__8daKago_cFv */
 void daKago_c::startBalloonScore() {
     fopAc_ac_c* balloon_actor;
     if (field_0x6e7 != 0 && field_0x6e9 == 1) {
@@ -733,7 +708,6 @@ void daKago_c::startBalloonScore() {
     }
 }
 
-/* 8084B024-8084B088 001B64 0064+00 1/1 0/0 0/0 .text            endBalloonScore__8daKago_cFv */
 void daKago_c::endBalloonScore() {
     fopAc_ac_c* balloon2D;
     fopAc_ac_c *balloonObj;
@@ -751,7 +725,6 @@ void daKago_c::endBalloonScore() {
     }
 }
 
-/* 8084B088-8084B108 001BC8 0080+00 3/3 0/0 1/1 .text            checkNextPath__8daKago_cF4cXyz */
 f32 daKago_c::checkNextPath(cXyz param_0) {
     cXyz cStack_14;
     mDoMtx_stack_c::YrotS(-field_0x714);
@@ -760,7 +733,6 @@ f32 daKago_c::checkNextPath(cXyz param_0) {
     return cStack_14.z;
 }
 
-/* 8084B108-8084B134 001C48 002C+00 4/4 0/0 0/0 .text            checkHeight__8daKago_cFv */
 void daKago_c::checkHeight() {
     if (current.pos.y > mRoofHeight) {
         current.pos.y = mRoofHeight;
@@ -769,7 +741,6 @@ void daKago_c::checkHeight() {
     }
 }
 
-/* 8084B134-8084B1E0 001C74 00AC+00 2/2 0/0 0/0 .text            checkYaguraPos__8daKago_cF4cXyz */
 bool daKago_c::checkYaguraPos(cXyz param_0) {
     cXyz local_18(-22984.0f, 0.0f, 7455.0f);
     cXyz cStack_24;
@@ -784,7 +755,6 @@ bool daKago_c::checkYaguraPos(cXyz param_0) {
     }
 }
 
-/* 8084B1E0-8084B56C 001D20 038C+00 3/3 0/0 0/0 .text            checkWallHitFall__8daKago_cFi */
 bool daKago_c::checkWallHitFall(int param_0) {
     if (field_0x6e5 != 0) {
         cXyz unkXyz1;
@@ -840,7 +810,6 @@ bool daKago_c::checkWallHitFall(int param_0) {
     return false;
 }
 
-/* 8084B56C-8084B5DC 0020AC 0070+00 1/1 0/0 0/0 .text            checkAttackStart__8daKago_cFv */
 bool daKago_c::checkAttackStart() {
     if (mDashCooldownTime != 0) {
         return false;
@@ -858,7 +827,6 @@ bool daKago_c::checkAttackStart() {
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
-/* 8084B5DC-8084B6F4 00211C 0118+00 1/1 0/0 0/0 .text            getValueY__8daKago_cFf */
 s16 daKago_c::getValueY(f32 param_0) {
     s16 valueY = field_0x6f4 * param_0;
     f32 var_f31;
@@ -883,17 +851,14 @@ s16 daKago_c::getValueY(f32 param_0) {
     return valueY;
 }
 
-/* 8084B6F4-8084B718 002234 0024+00 1/1 0/0 0/0 .text            getValueX__8daKago_cFf */
 s16 daKago_c::getValueX(f32 param_0) {
     return -field_0x6f0 * param_0;
 }
 
-/* 8084B718-8084B744 002258 002C+00 1/1 0/0 0/0 .text            getValueAbsX__8daKago_cFf */
 s16 daKago_c::getValueAbsX(f32 param_0) {
     return std::abs(-field_0x6f0 * param_0);
 }
 
-/* 8084B744-8084B96C 002284 0228+00 1/1 0/0 0/0 .text            flySpeedCalcLockOn__8daKago_cFv */
 void daKago_c::flySpeedCalcLockOn() {
     s16 angleX;
     s16 angleY;
@@ -921,7 +886,6 @@ void daKago_c::flySpeedCalcLockOn() {
     }
 }
 
-/* 8084B96C-8084C078 0024AC 070C+00 2/2 0/0 0/0 .text            flySpeedCalc__8daKago_cFsi */
 void daKago_c::flySpeedCalc(s16 param_0, int param_1) {
     s16 var_r29;
     s16 var_r28;
@@ -1083,7 +1047,6 @@ void daKago_c::flySpeedCalc(s16 param_0, int param_1) {
     }
 }
 
-/* 8084C078-8084C178 002BB8 0100+00 3/3 0/0 0/0 .text            checkFlySceneChange__8daKago_cFv */
 bool daKago_c::checkFlySceneChange() {
     if ((mPathIdxOffset > 0 && mPathIdx >= mpPath1->m_num - 1 ||
          mPathIdxOffset < 0 && mPathIdx < 1) &&
@@ -1108,7 +1071,6 @@ bool daKago_c::checkFlySceneChange() {
     }
 }
 
-/* 8084C178-8084C204 002CB8 008C+00 1/1 0/0 0/0 .text            setFlyAway__8daKago_cFv */
 void daKago_c::setFlyAway() {
     current.angle.y = shape_angle.y;
     setActionMode(0, 3);
@@ -1119,7 +1081,6 @@ void daKago_c::setFlyAway() {
     dComIfGp_getVibration().StopQuake(0x1f);
 }
 
-/* 8084C204-8084C2CC 002D44 00C8+00 3/3 0/0 0/0 .text            setFlyAnime__8daKago_cFv */
 void daKago_c::setFlyAnime() {
     if (cM_rnd() < 0.5) {
         if (checkBck(15) == 0) {
@@ -1136,7 +1097,6 @@ void daKago_c::setFlyAnime() {
     field_0x728 = 150;
 }
 
-/* 8084C2CC-8084C8FC 002E0C 0630+00 1/1 0/0 0/0 .text            executeFly__8daKago_cFv */
 void daKago_c::executeFly() {
     s16 unkInt1;
     s16 unkInt2;
@@ -1265,7 +1225,6 @@ void daKago_c::executeFly() {
     }
 }
 
-/* 8084C8FC-8084D108 00343C 080C+00 1/1 0/0 0/0 .text            executeStagger__8daKago_cFv */
 void daKago_c::executeStagger() {
     dCamera_c* camera = dCam_getBody();
 
@@ -1448,7 +1407,6 @@ void daKago_c::executeStagger() {
     }
 }
 
-/* 8084D108-8084D354 003C48 024C+00 1/1 0/0 0/0 .text            executeWait__8daKago_cFv */
 void daKago_c::executeWait() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass()->getMidnaActor();
     if (field_0x728 == 0) {
@@ -1530,7 +1488,6 @@ void daKago_c::executeWait() {
 #endif
 }
 
-/* 8084D354-8084D50C 003E94 01B8+00 1/1 0/0 0/0 .text            calcAttackMove__8daKago_cFi */
 bool daKago_c::calcAttackMove(int param_0) {
     cXyz acStack_20;
     cXyz cStack_2c;
@@ -1567,7 +1524,6 @@ bool daKago_c::calcAttackMove(int param_0) {
     return false;
 }
 
-/* 8084D50C-8084DA18 00404C 050C+00 1/1 0/0 0/0 .text            executeAttack__8daKago_cFv */
 void daKago_c::executeAttack() {
     field_0x6dd = 1;
 
@@ -1697,7 +1653,6 @@ void daKago_c::executeAttack() {
     }
 }
 
-/* 8084DA18-8084DBFC 004558 01E4+00 2/2 0/0 0/0 .text            calcCircleCamera__8daKago_cFi */
 void daKago_c::calcCircleCamera(int param_0) {
     cXyz cStack_20;
 
@@ -1732,7 +1687,6 @@ void daKago_c::calcCircleCamera(int param_0) {
     dCam_getBody()->Set(field_0x68c, field_0x698, field_0x6d4, 0);
 }
 
-/* 8084DBFC-8084DD18 00473C 011C+00 1/1 0/0 0/0 .text            executeEvent__8daKago_cFv */
 void daKago_c::executeEvent() {
     dCamera_c* camera = dCam_getBody();
     daPy_py_c* unusedPlayer = daPy_getPlayerActorClass();
@@ -1757,7 +1711,6 @@ void daKago_c::executeEvent() {
     }
 }
 
-/* 8084DD18-8084E2D4 004858 05BC+00 1/1 0/0 0/0 .text            initPerchDemo__8daKago_cFv */
 void daKago_c::initPerchDemo() {
     s16 angleY = daPy_getPlayerActorClass()->shape_angle.y;
     cXyz playerPos = daPy_getPlayerActorClass()->current.pos;
@@ -1904,7 +1857,6 @@ void daKago_c::initPerchDemo() {
     field_0x744 = 0;
 }
 
-/* 8084E2D4-8084F09C 004E14 0DC8+00 2/1 0/0 0/0 .text            executePerchDemo__8daKago_cFv */
 bool daKago_c::executePerchDemo() {
     cXyz playerPos = daPy_getPlayerActorClass()->current.pos;
     s16 playerYaw = daPy_getPlayerActorClass()->shape_angle.y;
@@ -2134,8 +2086,6 @@ bool daKago_c::executePerchDemo() {
     return false;
 }
 
-/* 8084F09C-8084FA58 005BDC 09BC+00 1/1 0/0 0/0 .text            PerchDemoAwayForward__8daKago_cFv
- */
 bool daKago_c::PerchDemoAwayForward() {
 
     cXyz playerPos = daPy_getPlayerActorClass()->current.pos;
@@ -2342,7 +2292,6 @@ bool daKago_c::PerchDemoAwayForward() {
     return false;
 }
 
-/* 8084FA58-8084FAA8 006598 0050+00 1/1 0/0 0/0 .text            executePerch__8daKago_cFv */
 void daKago_c::executePerch() {
     if (field_0x74c == 0) {
         initPerchDemo();
@@ -2353,7 +2302,6 @@ void daKago_c::executePerch() {
     }
 }
 
-/* 8084FAA8-8084FB50 0065E8 00A8+00 1/1 0/0 0/0 .text            executeEvent2__8daKago_cFv */
 void daKago_c::executeEvent2() {
     dCamera_c* camera = dCam_getBody();
     if (!eventInfo.checkCommandDemoAccrpt()) {
@@ -2370,7 +2318,6 @@ void daKago_c::executeEvent2() {
     }
 }
 
-/* 8084FB50-80850384 006690 0834+00 2/1 0/0 0/0 .text            initFirstDemo__8daKago_cFv */
 void daKago_c::initFirstDemo() {
     dCamera_c* camera = dCam_getBody();
     cXyz acStack_28;
@@ -2525,7 +2472,6 @@ void daKago_c::initFirstDemo() {
     field_0x744 = 0;
 }
 
-/* 80850384-808513E4 006EC4 1060+00 2/1 0/0 0/0 .text            executeFirstDemo__8daKago_cFv */
 bool daKago_c::executeFirstDemo() {
     dCamera_c* camera = dCam_getBody();
 
@@ -2836,7 +2782,6 @@ bool daKago_c::executeFirstDemo() {
     return false;
 }
 
-/* 808513E4-80851434 007F24 0050+00 1/1 0/0 0/0 .text            executePerch2__8daKago_cFv */
 void daKago_c::executePerch2() {
     if (field_0x74c == 0) {
         initFirstDemo();
@@ -2847,7 +2792,6 @@ void daKago_c::executePerch2() {
     }
 }
 
-/* 80851434-80851DEC 007F74 09B8+00 2/1 0/0 0/0 .text executeLandingLakeHairia__8daKago_cFv */
 void daKago_c::executeLandingLakeHairia() {
     dCamera_c* camera = dCam_getBody();
     cXyz unkXyz1;
@@ -3026,7 +2970,6 @@ void daKago_c::executeLandingLakeHairia() {
     camera->Set(field_0x68c, field_0x698, field_0x6d4, 0);
 }
 
-/* 80851DEC-808525B0 00892C 07C4+00 1/1 0/0 0/0 .text executeLandingBoartHouse__8daKago_cFv */
 void daKago_c::executeLandingBoartHouse() {
     dCamera_c* camera = dCam_getBody();
     cXyz unkXyz1;
@@ -3168,7 +3111,6 @@ void daKago_c::executeLandingBoartHouse() {
     camera->Set(field_0x68c, field_0x698, field_0x6d4, 0);
 }
 
-/* 808525B0-80852610 0090F0 0060+00 2/2 0/0 0/0 .text            executeLanding__8daKago_cFv */
 void daKago_c::executeLanding() {
     if (this->field_0x73c == 0) {
         executeLandingLakeHairia();
@@ -3180,7 +3122,6 @@ void daKago_c::executeLanding() {
     }
 }
 
-/* 80852610-80852D90 009150 0780+00 2/2 0/0 0/0 .text            moveDemoFly__8daKago_cFv */
 void daKago_c::moveDemoFly() {
     if (field_0x744 == 0) {
         cLib_chaseF(&field_0x6f8, l_HIO.mFlightSpeed, 2.0f);
@@ -3352,7 +3293,6 @@ void daKago_c::moveDemoFly() {
     }
 }
 
-/* 80852D90-80852F14 0098D0 0184+00 1/1 0/0 0/0 .text            setFlyEffect__8daKago_cFv */
 void daKago_c::setFlyEffect() {
     if (field_0x6e7 == 1) {
         return;
@@ -3374,7 +3314,6 @@ void daKago_c::setFlyEffect() {
     }
 }
 
-/* 80852F14-808530A4 009A54 0190+00 2/2 0/0 0/0 .text            setDashEffect__8daKago_cFv */
 void daKago_c::setDashEffect() {
     J3DModel* model = mpMorf->getModel();
     JPABaseEmitter* emitter;
@@ -3396,7 +3335,6 @@ void daKago_c::setDashEffect() {
     setDashBlurEffect(1);
 }
 
-/* 808530A4-80853228 009BE4 0184+00 1/1 0/0 0/0 .text            setDamageEffect__8daKago_cFv */
 void daKago_c::setDamageEffect() {
     J3DModel* model = mpMorf->getModel();
     JPABaseEmitter* emitter;
@@ -3416,7 +3354,6 @@ void daKago_c::setDamageEffect() {
     }
 }
 
-/* 80853228-80853460 009D68 0238+00 3/3 0/0 0/0 .text            setDashBlurEffect__8daKago_cFi */
 void daKago_c::setDashBlurEffect(int param_0) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz cameraEye = dCam_getBody()->Eye();
@@ -3448,8 +3385,6 @@ void daKago_c::setDashBlurEffect(int param_0) {
     field_0xb40 = dComIfGp_particle_set(field_0xb40, 0x860f, &cameraEyeOffset, &tevStr, &field_0x6be, 0, 0xff, 0, 0xffffffff, 0, 0, 0);
 }
 
-/* 80853460-8085350C 009FA0 00AC+00 1/1 0/0 0/0 .text            setWallHitEffect__8daKago_cF4cXyzi
- */
 void daKago_c::setWallHitEffect(cXyz param_0, int param_1) {
     // might be a 2D array?
     static u16 kago_wall_hit_id[6] = {
@@ -3466,7 +3401,6 @@ void daKago_c::setWallHitEffect(cXyz param_0, int param_1) {
     }
 }
 
-/* 8085350C-8085366C 00A04C 0160+00 2/2 0/0 0/0 .text            setSibukiEffect__8daKago_cFv */
 void daKago_c::setSibukiEffect() {
     static u16 kago_wave_id[3] = {
         0x865A,
@@ -3489,7 +3423,6 @@ void daKago_c::setSibukiEffect() {
     }
 }
 
-/* 8085366C-80853730 00A1AC 00C4+00 1/1 0/0 0/0 .text            setDashSibukiEffect__8daKago_cFv */
 void daKago_c::setDashSibukiEffect() {
     cXyz acStack_20(current.pos.x, field_0x70c + l_HIO.mYOffsetFromWaterSurface, current.pos.z);
     csXyz cStack_28(0, shape_angle.y, 0);
@@ -3497,7 +3430,6 @@ void daKago_c::setDashSibukiEffect() {
                                         0xff, 0, 0xffffffff, 0, 0, 0);
 }
 
-/* 80853730-80853880 00A270 0150+00 1/1 0/0 0/0 .text            setWaterFallEffect__8daKago_cFv */
 void daKago_c::setWaterFallEffect() {
     static u16 kago_wave_id[2] = {
         0x865B,
@@ -3518,7 +3450,6 @@ void daKago_c::setWaterFallEffect() {
     }
 }
 
-/* 80853880-8085392C 00A3C0 00AC+00 1/1 0/0 0/0 .text            s_waterfall__FPvPv */
 static void* s_waterfall(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Tag_WaterFall) {
         if (!fpcM_IsCreating(fopAcM_GetID(param_0))) {
@@ -3534,7 +3465,6 @@ static void* s_waterfall(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 8085392C-80853BCC 00A46C 02A0+00 1/1 0/0 0/0 .text            setFlySound__8daKago_cFv */
 void daKago_c::setFlySound() {
     if (field_0x6de != 0) {
         BOOL unkFlag1 = FALSE;
@@ -3582,7 +3512,6 @@ void daKago_c::setFlySound() {
     }
 }
 
-/* 80853BCC-80853EF0 00A70C 0324+00 2/1 0/0 0/0 .text            action__8daKago_cFv */
 void daKago_c::action() {
     checkMoveHeight();
     checkSizeBg();
@@ -3685,7 +3614,6 @@ void daKago_c::action() {
     field_0x6ca = field_0x6c4 * cM_ssin(field_0x6c8);
 }
 
-/* 80853EF0-80853FB0 00AA30 00C0+00 2/2 0/0 0/0 .text            mtx_set__8daKago_cFv */
 void daKago_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos.x,current.pos.y,current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -3700,7 +3628,6 @@ void daKago_c::mtx_set() {
     cMtx_copy(mDoMtx_stack_c::get(), mLegR3Mtx);
 }
 
-/* 80853FB0-80854058 00AAF0 00A8+00 1/1 0/0 0/0 .text            cc_set__8daKago_cFv */
 void daKago_c::cc_set() {
     if (field_0x6de != 0) {
         eyePos = current.pos;
@@ -3715,7 +3642,6 @@ void daKago_c::cc_set() {
     }
 }
 
-/* 80854058-80854168 00AB98 0110+00 1/1 0/0 0/0 .text            execute__8daKago_cFv */
 int daKago_c::execute() {
     if (executeBalloonMenu()) {
 #if VERSION != VERSION_SHIELD_DEBUG
@@ -3754,17 +3680,14 @@ int daKago_c::execute() {
     return 1;
 }
 
-/* 80854168-80854188 00ACA8 0020+00 2/1 0/0 0/0 .text            daKago_Execute__FP8daKago_c */
 static int daKago_Execute(daKago_c* i_this) {
     return i_this->execute();
 }
 
-/* 80854188-80854190 00ACC8 0008+00 1/0 0/0 0/0 .text            daKago_IsDelete__FP8daKago_c */
 static int daKago_IsDelete(daKago_c* i_this) {
     return 1;
 }
 
-/* 80854190-80854200 00ACD0 0070+00 1/1 0/0 0/0 .text            _delete__8daKago_cFv */
 int daKago_c::_delete() {
     dComIfG_resDelete(&mPhase, field_0x75c);
 
@@ -3780,13 +3703,11 @@ int daKago_c::_delete() {
     return 1;
 }
 
-/* 80854200-80854220 00AD40 0020+00 1/0 0/0 0/0 .text            daKago_Delete__FP8daKago_c */
 static int daKago_Delete(daKago_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80854220-808542DC 00AD60 00BC+00 1/1 0/0 0/0 .text ctrlJoint__8daKago_cFP8J3DJointP8J3DModel */
 int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
     J3DJoint* joint = param_0;
     int jointNo = joint->getJntNo();
@@ -3803,7 +3724,6 @@ int daKago_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
     return 1;
 }
 
-/* 808542DC-80854328 00AE1C 004C+00 1/1 0/0 0/0 .text JointCallBack__8daKago_cFP8J3DJointi */
 int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -3815,7 +3735,6 @@ int daKago_c::JointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80854328-808544B8 00AE68 0190+00 1/1 0/0 0/0 .text            CreateHeap__8daKago_cFv */
 int daKago_c::CreateHeap() {
     J3DModelData* modelData;
 
@@ -3845,13 +3764,11 @@ int daKago_c::CreateHeap() {
     return 1;
 }
 
-/* 808544B8-808544D8 00AFF8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* param_0) {
     daKago_c* kago = (daKago_c*)param_0;
     return kago->CreateHeap();
 }
 
-/* 808544D8-80854928 00B018 0450+00 1/1 0/0 0/0 .text            create__8daKago_cFv */
 int daKago_c::create() {
     fopAcM_ct(this, daKago_c);
 
@@ -3959,12 +3876,10 @@ int daKago_c::create() {
     return phase_state;
 }
 
-/* 80854A2C-80854A4C 00B56C 0020+00 1/0 0/0 0/0 .text            daKago_Create__FP8daKago_c */
 static int daKago_Create(daKago_c* param_0) {
     return param_0->create();
 }
 
-/* 80854EBC-80854EDC -00001 0020+00 1/0 0/0 0/0 .data            l_daKago_Method */
 static actor_method_class l_daKago_Method = {
     (process_method_func)daKago_Create,
     (process_method_func)daKago_Delete,
@@ -3973,7 +3888,6 @@ static actor_method_class l_daKago_Method = {
     (process_method_func)daKago_Draw,
 };
 
-/* 80854EDC-80854F0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KAGO */
 extern actor_process_profile_definition g_profile_KAGO = {
     fpcLy_CURRENT_e,        // mLayerID
     4,                      // mListID
diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp
index a60f4d3250..d47ff1d337 100644
--- a/src/d/actor/d_a_kytag00.cpp
+++ b/src/d/actor/d_a_kytag00.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 8046B718-8046B9DC 000078 02C4+00 2/2 0/0 0/0 .text            get_check_pos__FP13kytag00_class */
 static cXyz get_check_pos(kytag00_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0);
@@ -31,8 +30,6 @@ static cXyz get_check_pos(kytag00_class* i_this) {
     return pos;
 }
 
-/* 8046B9DC-8046BA10 00033C 0034+00 2/2 0/0 0/0 .text            wether_tag_reset__FP13kytag00_class
- */
 static void wether_tag_reset(kytag00_class* i_this) {
     i_this->field_0x56d = 0;
 
@@ -42,8 +39,6 @@ static void wether_tag_reset(kytag00_class* i_this) {
     g_env_light.mColPatModeGather = 1;
 }
 
-/* 8046BA10-8046BD60 000370 0350+00 1/1 0/0 0/0 .text            wether_tag_move__FP13kytag00_class
- */
 static void wether_tag_move(kytag00_class* i_this) {
     cXyz spC;
     cXyz check_pos = get_check_pos(i_this);
@@ -140,7 +135,6 @@ static void wether_tag_move(kytag00_class* i_this) {
     }
 }
 
-/* 8046BD60-8046BDA4 0006C0 0044+00 1/1 0/0 0/0 .text            raincnt_set__Ff */
 static void raincnt_set(f32 param_0) {
     int cnt = param_0 * param_0 * param_0 * 250.0f;
     if (cnt > g_env_light.base_raincnt) {
@@ -148,12 +142,10 @@ static void raincnt_set(f32 param_0) {
     }
 }
 
-/* 8046BDA4-8046BDB8 000704 0014+00 1/1 0/0 0/0 .text            raincnt_cut__Fv */
 static void raincnt_cut() {
     g_env_light.raincnt = g_env_light.base_raincnt;
 }
 
-/* 8046BDB8-8046BEB8 000718 0100+00 3/2 0/0 0/0 .text wether_tag_efect_reset__FP13kytag00_class */
 static void wether_tag_efect_reset(kytag00_class* i_this) {
     i_this->field_0x56c = 0;
 
@@ -203,7 +195,6 @@ static void wether_tag_efect_reset(kytag00_class* i_this) {
     }
 }
 
-/* 8046BEB8-8046C660 000818 07A8+00 3/2 0/0 0/0 .text wether_tag_efect_move__FP13kytag00_class */
 static void wether_tag_efect_move(kytag00_class* i_this) {
     cXyz spC;
     cXyz check_pos = get_check_pos(i_this);
@@ -389,14 +380,11 @@ static void wether_tag_efect_move(kytag00_class* i_this) {
     }
 }
 
-/* 8046C660-8046C684 000FC0 0024+00 1/0 0/0 0/0 .text            daKytag00_Draw__FP13kytag00_class
- */
 static int daKytag00_Draw(kytag00_class* i_this) {
     wether_tag_efect_move(i_this);
     return 1;
 }
 
-/* 8046C684-8046C76C 000FE4 00E8+00 1/0 0/0 0/0 .text daKytag00_Execute__FP13kytag00_class */
 static int daKytag00_Execute(kytag00_class* i_this) {
     BOOL var_r30 = TRUE;
 
@@ -416,13 +404,10 @@ static int daKytag00_Execute(kytag00_class* i_this) {
     return 1;
 }
 
-/* 8046C76C-8046C774 0010CC 0008+00 1/0 0/0 0/0 .text daKytag00_IsDelete__FP13kytag00_class */
 static int daKytag00_IsDelete(kytag00_class* i_this) {
     return 1;
 }
 
-/* 8046C774-8046C7BC 0010D4 0048+00 1/0 0/0 0/0 .text            daKytag00_Delete__FP13kytag00_class
- */
 static int daKytag00_Delete(kytag00_class* i_this) {
     wether_tag_reset(i_this);
     wether_tag_efect_reset(i_this);
@@ -430,7 +415,6 @@ static int daKytag00_Delete(kytag00_class* i_this) {
     return 1;
 }
 
-/* 8046C7BC-8046C978 00111C 01BC+00 1/0 0/0 0/0 .text            daKytag00_Create__FP10fopAc_ac_c */
 static int daKytag00_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, kytag00_class);
     kytag00_class* a_this = (kytag00_class*)i_this;
@@ -475,14 +459,12 @@ static int daKytag00_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8046CA78-8046CA98 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag00_Method */
 static actor_method_class l_daKytag00_Method = {
     (process_method_func)daKytag00_Create,  (process_method_func)daKytag00_Delete,
     (process_method_func)daKytag00_Execute, (process_method_func)daKytag00_IsDelete,
     (process_method_func)daKytag00_Draw,
 };
 
-/* 8046CA98-8046CAC8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG00 */
 extern actor_process_profile_definition g_profile_KYTAG00 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp
index 18952c86bf..cf4a87022c 100644
--- a/src/d/actor/d_a_kytag01.cpp
+++ b/src/d/actor/d_a_kytag01.cpp
@@ -12,7 +12,6 @@
 #include "d/d_kankyo_rain.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80855058-80855320 000078 02C8+00 1/1 0/0 0/0 .text            get_check_pos__FP13kytag01_class */
 static cXyz get_check_pos(kytag01_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -35,7 +34,6 @@ static cXyz get_check_pos(kytag01_class* i_this) {
     return pos;
 }
 
-/* 80855320-80855638 000340 0318+00 1/1 0/0 0/0 .text            mist_tag_move__FP13kytag01_class */
 static void mist_tag_move(kytag01_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -107,13 +105,10 @@ static void mist_tag_move(kytag01_class* i_this) {
     }
 }
 
-/* 80855638-80855640 000658 0008+00 1/0 0/0 0/0 .text            daKytag01_Draw__FP13kytag01_class
- */
 static int daKytag01_Draw(kytag01_class* i_this) {
     return 1;
 }
 
-/* 80855640-808557DC 000660 019C+00 1/0 0/0 0/0 .text daKytag01_Execute__FP13kytag01_class */
 static int daKytag01_Execute(kytag01_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = dComIfGp_getCamera(0);
@@ -162,18 +157,14 @@ static int daKytag01_Execute(kytag01_class* i_this) {
     return 1;
 }
 
-/* 808557DC-808557E4 0007FC 0008+00 1/0 0/0 0/0 .text daKytag01_IsDelete__FP13kytag01_class */
 static int daKytag01_IsDelete(kytag01_class* i_this) {
     return 1;
 }
 
-/* 808557E4-808557EC 000804 0008+00 1/0 0/0 0/0 .text            daKytag01_Delete__FP13kytag01_class
- */
 static int daKytag01_Delete(kytag01_class* i_this) {
     return 1;
 }
 
-/* 808557EC-80855984 00080C 0198+00 1/0 0/0 0/0 .text            daKytag01_Create__FP10fopAc_ac_c */
 static int daKytag01_Create(fopAc_ac_c* i_this) {
     kytag01_class* a_this = (kytag01_class*)i_this;
     fopAcM_ct(i_this, kytag01_class);
@@ -224,14 +215,12 @@ static int daKytag01_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 808559E8-80855A08 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag01_Method */
 static actor_method_class l_daKytag01_Method = {
     (process_method_func)daKytag01_Create,  (process_method_func)daKytag01_Delete,
     (process_method_func)daKytag01_Execute, (process_method_func)daKytag01_IsDelete,
     (process_method_func)daKytag01_Draw,
 };
 
-/* 80855A08-80855A38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG01 */
 extern actor_process_profile_definition g_profile_KYTAG01 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp
index c5c458c2f1..76e9bd75f1 100644
--- a/src/d/actor/d_a_kytag02.cpp
+++ b/src/d/actor/d_a_kytag02.cpp
@@ -14,7 +14,6 @@ static int daKytag02_Draw(kytag02_class* i_this) {
     return 1;
 }
 
-/* 80855AC0-80855CC4 000080 0204+00 1/0 0/0 0/0 .text daKytag02_Execute__FP13kytag02_class */
 static int daKytag02_Execute(kytag02_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     cXyz* wind_vec = dKyw_get_wind_vec();
@@ -83,13 +82,10 @@ static int daKytag02_Execute(kytag02_class* i_this) {
     return 1;
 }
 
-/* 80855CC4-80855CCC 000284 0008+00 1/0 0/0 0/0 .text daKytag02_IsDelete__FP13kytag02_class */
 static int daKytag02_IsDelete(kytag02_class* i_this) {
     return 1;
 }
 
-/* 80855CCC-80855CEC 00028C 0020+00 1/0 0/0 0/0 .text            daKytag02_Delete__FP13kytag02_class
- */
 static int daKytag02_Delete(kytag02_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -99,7 +95,6 @@ static int daKytag02_Delete(kytag02_class* i_this) {
     return 1;
 }
 
-/* 80855CEC-80855DF4 0002AC 0108+00 1/0 0/0 0/0 .text            daKytag02_Create__FP10fopAc_ac_c */
 static int daKytag02_Create(fopAc_ac_c* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     dKyw_get_wind_vec();
@@ -135,14 +130,12 @@ static int daKytag02_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80855E0C-80855E2C -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag02_Method */
 static actor_method_class l_daKytag02_Method = {
     (process_method_func)daKytag02_Create,  (process_method_func)daKytag02_Delete,
     (process_method_func)daKytag02_Execute, (process_method_func)daKytag02_IsDelete,
     (process_method_func)daKytag02_Draw,
 };
 
-/* 80855E2C-80855E5C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG02 */
 extern actor_process_profile_definition g_profile_KYTAG02 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp
index 018c74b7a9..b56751e054 100644
--- a/src/d/actor/d_a_kytag03.cpp
+++ b/src/d/actor/d_a_kytag03.cpp
@@ -14,8 +14,6 @@
 #include "d/d_kankyo_rain.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80855ED8-808560DC 000078 0204+00 1/1 0/0 0/0 .text dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath
- */
 static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
     int var_r31 = 0;
     BOOL sp10[2] = {0, 0};
@@ -67,8 +65,6 @@ static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
     }
 }
 
-/* 80856124-80856238 0002C4 0114+00 1/1 0/0 0/0 .text            get_rail_ratio_pos__FP5dPathifPsPs
- */
 static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16* param_3,
                                s16* param_4) {
     cXyz point_a;
@@ -97,7 +93,6 @@ static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16*
     return ret;
 }
 
-/* 80856238-80856280 0003D8 0048+00 1/1 0/0 0/0 .text            set_path_info__FP10fopAc_ac_c */
 static dPath* set_path_info(fopAc_ac_c* i_actor) {
     dPath* path_p = NULL;
     u8 path_id = fopAcM_GetParam(i_actor) >> 0x10;
@@ -109,7 +104,6 @@ static dPath* set_path_info(fopAc_ac_c* i_actor) {
     return path_p;
 }
 
-/* 80856280-80856354 000420 00D4+00 1/1 0/0 0/0 .text            getSound_pos__FP10fopAc_ac_c */
 static void getSound_pos(fopAc_ac_c* i_actor) {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     cXyz eye = camera->mCamera.Eye();
@@ -126,23 +120,18 @@ static void getSound_pos(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80856354-80856364 0004F4 0010+00 1/1 0/0 0/0 .text
- * get_Extent_pos_start_get__FP13kytag03_classP5dPathP4cXyzfPi  */
 static dPath* get_Extent_pos_start_get(kytag03_class* i_this, dPath* i_path, cXyz*, f32,
                                        int* param_4) {
     *param_4 = 0;
     return i_path;
 }
 
-/* 80856364-80856378 000504 0014+00 1/1 0/0 0/0 .text
- * get_Extent_pos_end_get__FP13kytag03_classP5dPathP4cXyzfPi    */
 static dPath* get_Extent_pos_end_get(kytag03_class* i_this, dPath* i_path, cXyz*, f32,
                                      int* param_4) {
     *param_4 = i_path->m_num - 1;
     return i_path;
 }
 
-/* 80856378-80856E24 000518 0AAC+00 1/1 0/0 0/0 .text            odour_move__FP13kytag03_class */
 static void odour_move(kytag03_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -289,13 +278,10 @@ static void odour_move(kytag03_class* i_this) {
     }
 }
 
-/* 80856E24-80856E2C 000FC4 0008+00 1/0 0/0 0/0 .text            daKytag03_Draw__FP13kytag03_class
- */
 static int daKytag03_Draw(kytag03_class* i_this) {
     return 1;
 }
 
-/* 80856E2C-808573F4 000FCC 05C8+00 1/0 0/0 0/0 .text daKytag03_Execute__FP13kytag03_class */
 static int daKytag03_Execute(kytag03_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -407,13 +393,10 @@ static int daKytag03_Execute(kytag03_class* i_this) {
     return 1;
 }
 
-/* 808573F4-808573FC 001594 0008+00 1/0 0/0 0/0 .text daKytag03_IsDelete__FP13kytag03_class */
 static int daKytag03_IsDelete(kytag03_class* i_this) {
     return 1;
 }
 
-/* 808573FC-80857470 00159C 0074+00 1/0 0/0 0/0 .text            daKytag03_Delete__FP13kytag03_class
- */
 static int daKytag03_Delete(kytag03_class* i_this) {
     if (i_this->mpEmitter != NULL) {
         i_this->mpEmitter->deleteAllParticle();
@@ -425,7 +408,6 @@ static int daKytag03_Delete(kytag03_class* i_this) {
     return 1;
 }
 
-/* 80857470-80857648 001610 01D8+00 1/0 0/0 0/0 .text            daKytag03_Create__FP10fopAc_ac_c */
 static int daKytag03_Create(fopAc_ac_c* i_this) {
     kytag03_class* a_this = (kytag03_class*)i_this;
     fopAcM_ct(i_this, kytag03_class);
@@ -468,14 +450,12 @@ static int daKytag03_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80857708-80857728 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag03_Method */
 static actor_method_class l_daKytag03_Method = {
     (process_method_func)daKytag03_Create,  (process_method_func)daKytag03_Delete,
     (process_method_func)daKytag03_Execute, (process_method_func)daKytag03_IsDelete,
     (process_method_func)daKytag03_Draw,
 };
 
-/* 80857728-80857758 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG03 */
 extern actor_process_profile_definition g_profile_KYTAG03 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 6e17668fa9..093ba53aa7 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -10,8 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 
-/* 8046CB58-8046CFE8 000078 0490+00 1/0 0/0 0/0 .text            daKytag04_Draw__FP13kytag04_class
- */
 static int daKytag04_Draw(kytag04_class* i_this) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = dComIfGp_getCamera(0);
@@ -106,7 +104,6 @@ static int daKytag04_Draw(kytag04_class* i_this) {
     return 1;
 }
 
-/* 8046CFE8-8046D354 000508 036C+00 1/0 0/0 0/0 .text daKytag04_Execute__FP13kytag04_class */
 static int daKytag04_Execute(kytag04_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -196,13 +193,10 @@ static int daKytag04_Execute(kytag04_class* i_this) {
     return 1;
 }
 
-/* 8046D354-8046D35C 000874 0008+00 1/0 0/0 0/0 .text daKytag04_IsDelete__FP13kytag04_class */
 static int daKytag04_IsDelete(kytag04_class* i_this) {
     return 1;
 }
 
-/* 8046D35C-8046D474 00087C 0118+00 1/0 0/0 0/0 .text            daKytag04_Delete__FP13kytag04_class
- */
 static int daKytag04_Delete(kytag04_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Kytag04");
 
@@ -233,7 +227,6 @@ static int daKytag04_Delete(kytag04_class* i_this) {
     return 1;
 }
 
-/* 8046D474-8046D59C 000994 0128+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     kytag04_class* a_this = (kytag04_class*)i_this;
 
@@ -260,7 +253,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8046D59C-8046D9C8 000ABC 042C+00 1/0 0/0 0/0 .text            daKytag04_Create__FP10fopAc_ac_c */
 static int daKytag04_Create(fopAc_ac_c* i_this) {
     kytag04_class* a_this = (kytag04_class*)i_this;
     fopAcM_ct(i_this, kytag04_class);
@@ -361,14 +353,12 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 8046DA78-8046DA98 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag04_Method */
 static actor_method_class l_daKytag04_Method = {
     (process_method_func)daKytag04_Create,  (process_method_func)daKytag04_Delete,
     (process_method_func)daKytag04_Execute, (process_method_func)daKytag04_IsDelete,
     (process_method_func)daKytag04_Draw,
 };
 
-/* 8046DA98-8046DAC8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG04 */
 extern actor_process_profile_definition g_profile_KYTAG04 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index e8f1bad2c5..52ec6d912a 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -8,29 +8,22 @@
 #include "d/actor/d_a_kytag05.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80528A58-80528A60 000078 0008+00 1/0 0/0 0/0 .text            daKytag05_Draw__FP13kytag05_class
- */
 static int daKytag05_Draw(kytag05_class* i_this) {
     return 1;
 }
 
-/* 80528A60-80528A68 000080 0008+00 1/0 0/0 0/0 .text daKytag05_Execute__FP13kytag05_class */
 static int daKytag05_Execute(kytag05_class* i_this) {
     return 1;
 }
 
-/* 80528A68-80528A70 000088 0008+00 1/0 0/0 0/0 .text daKytag05_IsDelete__FP13kytag05_class */
 static int daKytag05_IsDelete(kytag05_class* i_this) {
     return 1;
 }
 
-/* 80528A70-80528A78 000090 0008+00 1/0 0/0 0/0 .text            daKytag05_Delete__FP13kytag05_class
- */
 static int daKytag05_Delete(kytag05_class* i_this) {
     return 1;
 }
 
-/* 80528A78-80528B10 000098 0098+00 1/0 0/0 0/0 .text            daKytag05_Create__FP10fopAc_ac_c */
 static int daKytag05_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, kytag05_class);
     kytag05_class* a_this = static_cast<kytag05_class*>(i_this);
@@ -47,14 +40,12 @@ static int daKytag05_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80528B1C-80528B3C -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag05_Method */
 static actor_method_class l_daKytag05_Method = {
     (process_method_func)daKytag05_Create,  (process_method_func)daKytag05_Delete,
     (process_method_func)daKytag05_Execute, (process_method_func)daKytag05_IsDelete,
     (process_method_func)daKytag05_Draw,
 };
 
-/* 80528B3C-80528B6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG05 */
 extern actor_process_profile_definition g_profile_KYTAG05 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index d7508b0928..4e1deb7275 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -13,7 +13,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8085786C-80857918 0000EC 00AC+00 1/1 0/0 0/0 .text            dice_wether_init__FUcff */
 static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -26,7 +25,6 @@ static void dice_wether_init(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentT
     }
 }
 
-/* 80857918-808579EC 000198 00D4+00 1/1 0/0 0/0 .text            dice_wether_execute__FUcff */
 static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_currentTime) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     env_light->dice_wether_mode = i_weatherMode;
@@ -46,7 +44,6 @@ static void dice_wether_execute(u8 i_weatherMode, f32 i_weatherTime, f32 i_curre
     }
 }
 
-/* 808579EC-80857A50 00026C 0064+00 3/3 0/0 0/0 .text            dice_rain_minus__Fv */
 static void dice_rain_minus() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -62,7 +59,6 @@ static void dice_rain_minus() {
     }
 }
 
-/* 80857A50-80857F28 0002D0 04D8+00 2/1 0/0 0/0 .text            dKy_event_proc__Fv */
 static void dKy_event_proc() {
     static f32 S_time_table[8] = {45.0f, 75.0f, 120.0f, 150.0f, 180.0f, 240.0f, 270.0f, 360.0f};
     static u8 S_wether_table[8] = {0, 1, 2, 3, 4, 0, 1, 2};
@@ -257,13 +253,10 @@ static void dKy_event_proc() {
     }
 }
 
-/* 80857F28-80857F48 0007A8 0020+00 1/1 0/0 0/0 .text daKytag06_type_04_Execute__FP13kytag06_class
- */
 static void daKytag06_type_04_Execute(kytag06_class*) {
     dKy_event_proc();
 }
 
-/* 80857F48-80857F8C 0007C8 0044+00 1/1 0/0 0/0 .text            set_path_info__FP10fopAc_ac_c */
 static dPath* set_path_info(fopAc_ac_c* i_this) {
     kytag06_class* a_this = (kytag06_class*)i_this;
     dPath* room_path = NULL;
@@ -275,7 +268,6 @@ static dPath* set_path_info(fopAc_ac_c* i_this) {
     return room_path;
 }
 
-/* 80857F8C-8085811C 00080C 0190+00 1/1 0/0 0/0 .text near_rail_get__FP13kytag06_classP4cXyz */
 static dPnt* near_rail_get(kytag06_class* i_this, cXyz* i_pos) {
     f32 nearest_dist = 100000000.0f;
     dPath* path = i_this->mpPath;
@@ -293,8 +285,6 @@ static dPnt* near_rail_get(kytag06_class* i_this, cXyz* i_pos) {
     return pnt;
 }
 
-/* 8085811C-8085814C 00099C 0030+00 1/0 0/0 0/0 .text            daKytag06_Draw__FP13kytag06_class
- */
 static int daKytag06_Draw(kytag06_class* i_this) {
     if (i_this->mType == 4) {
         daKytag06_type_04_Execute(i_this);
@@ -303,8 +293,6 @@ static int daKytag06_Draw(kytag06_class* i_this) {
     return 1;
 }
 
-/* 8085814C-8085824C 0009CC 0100+00 1/1 0/0 0/0 .text
- * daKytag06_lv7_boss_wether_proc__FP13kytag06_classUc          */
 static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     g_env_light.mThunderEff.mMode = 0;
@@ -341,8 +329,6 @@ static void daKytag06_lv7_boss_wether_proc(kytag06_class* i_this, u8 param_1) {
     }
 }
 
-/* 8085824C-808584B4 000ACC 0268+00 1/1 0/0 0/0 .text
- * daKytag06_Ganon_wether_proc__FP13kytag06_classUc             */
 static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -414,8 +400,6 @@ static void daKytag06_Ganon_wether_proc(kytag06_class* i_this, u8 param_1) {
     }
 }
 
-/* 808584B4-808586C4 000D34 0210+00 3/2 0/0 0/0 .text daKytag06_wether_proc__FP13kytag06_classUc
- */
 static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     g_env_light.mThunderEff.mMode = 0;
@@ -518,15 +502,11 @@ static void daKytag06_wether_proc(kytag06_class* i_this, u8 param_1) {
     }
 }
 
-/* 808586C4-808586F0 000F44 002C+00 1/1 0/0 0/0 .text
- * daKytag06_type_07_wether_Execute__FP13kytag06_class          */
 static void daKytag06_type_07_wether_Execute(kytag06_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     daKytag06_wether_proc(i_this, env_light->wether);
 }
 
-/* 808586F0-808589A4 000F70 02B4+00 1/1 0/0 0/0 .text daKytag06_type_07_Execute__FP13kytag06_class
- */
 static void daKytag06_type_07_Execute(kytag06_class* i_this) {
     cXyz spX;
     f32 current_time = dComIfGs_getTime();
@@ -605,8 +585,6 @@ static void daKytag06_type_07_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 808589E0-80858CD4 001260 02F4+00 1/1 0/0 0/0 .text daKytag06_type_06_Execute__FP13kytag06_class
- */
 static void daKytag06_type_06_Execute(kytag06_class* i_this) {
     static u16 w_eff_name[4] = {
         0x8753,
@@ -679,20 +657,16 @@ static void daKytag06_type_06_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 80858CD4-80858D00 001554 002C+00 1/1 0/0 0/0 .text daKytag06_type_08_Execute__FP13kytag06_class
- */
 static void daKytag06_type_08_Execute(kytag06_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     daKytag06_lv7_boss_wether_proc(i_this, env_light->wether);
 }
 
-/* 80858D00-80858D2C 001580 002C+00 1/1 0/0 0/0 .text            daKytag06_type_09_Execute__FP13kytag06_class */
 static void daKytag06_type_09_Execute(kytag06_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     daKytag06_Ganon_wether_proc(i_this, env_light->wether);
 }
 
-/* 80858D2C-8085912C 0015AC 0400+00 1/1 0/0 0/0 .text            daKytag06_type_10_Execute__FP13kytag06_class */
 static void daKytag06_type_10_Execute(kytag06_class* i_this) {
     u8 tmp = 0;
     if (dComIfGs_isEventBit(dSv_event_flag_c::F_0266)) {
@@ -793,8 +767,6 @@ static void daKytag06_type_10_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 8085912C-808591A4 0019AC 0078+00 1/1 0/0 0/0 .text daKytag06_type_11_Execute__FP13kytag06_class
- */
 static void daKytag06_type_11_Execute(kytag06_class* i_this) {
     if (dKy_darkworld_check() && dComIfG_play_c::getLayerNo(0) == 14) {
         switch (dComIfGp_roomControl_getStayNo()) {
@@ -812,8 +784,6 @@ static void daKytag06_type_11_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 808591A4-8085931C 001A24 0178+00 1/1 0/0 0/0 .text daKytag06_type_05_Execute__FP13kytag06_class
- */
 static void daKytag06_type_05_Execute(kytag06_class* i_this) {
     cXyz spX;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -829,8 +799,6 @@ static void daKytag06_type_05_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 8085931C-80859528 001B9C 020C+00 1/1 0/0 0/0 .text daKytag06_type_03_Execute__FP13kytag06_class
- */
 static void daKytag06_type_03_Execute(kytag06_class* i_this) {
     if (i_this->field_0x597 == 0) {
         switch (i_this->mMode) {
@@ -889,7 +857,6 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) {
     }
 }
 
-/* 80859528-80859A88 001DA8 0560+00 2/0 0/0 0/0 .text daKytag06_Execute__FP13kytag06_class */
 static int daKytag06_Execute(kytag06_class* i_this) {
     dComIfGs_getTime();
 
@@ -1079,13 +1046,10 @@ static int daKytag06_Execute(kytag06_class* i_this) {
     return 1;
 }
 
-/* 80859A88-80859A90 002308 0008+00 1/0 0/0 0/0 .text daKytag06_IsDelete__FP13kytag06_class */
 static int daKytag06_IsDelete(kytag06_class* i_this) {
     return 1;
 }
 
-/* 80859A90-80859AD0 002310 0040+00 1/0 0/0 0/0 .text            daKytag06_Delete__FP13kytag06_class
- */
 static int daKytag06_Delete(kytag06_class* i_this) {
     if (i_this->mType == 0 && i_this->mMode != 0 && i_this->field_0x591 >= 4) {
         dComIfGs_setTime(270.0f);
@@ -1094,7 +1058,6 @@ static int daKytag06_Delete(kytag06_class* i_this) {
     return 1;
 }
 
-/* 80859AD0-80859AF0 002350 0020+00 1/1 0/0 0/0 .text daKytag06_type04_init__FP10fopAc_ac_c */
 static void daKytag06_type04_init(fopAc_ac_c* i_this) {
     kytag06_class* a_this = (kytag06_class*)i_this;
 
@@ -1103,7 +1066,6 @@ static void daKytag06_type04_init(fopAc_ac_c* i_this) {
     a_this->mMode = 0;
 }
 
-/* 80859AF0-80859B14 002370 0024+00 1/1 0/0 0/0 .text daKytag06_type06_init__FP10fopAc_ac_c */
 static void daKytag06_type06_init(fopAc_ac_c* i_this) {
     kytag06_class* a_this = (kytag06_class*)i_this;
 
@@ -1113,7 +1075,6 @@ static void daKytag06_type06_init(fopAc_ac_c* i_this) {
     a_this->field_0x598 = 0;
 }
 
-/* 80859B14-80859B34 002394 0020+00 1/1 0/0 0/0 .text daKytag06_type02_init__FP10fopAc_ac_c */
 static void daKytag06_type02_init(fopAc_ac_c* i_this) {
     kytag06_class* a_this = (kytag06_class*)i_this;
 
@@ -1122,7 +1083,6 @@ static void daKytag06_type02_init(fopAc_ac_c* i_this) {
     a_this->mMode = 0;
 }
 
-/* 80859B34-80859C88 0023B4 0154+00 1/1 0/0 0/0 .text daKytag06_type03_init__FP10fopAc_ac_c */
 static void daKytag06_type03_init(fopAc_ac_c* i_this) {
     kytag06_class* a_this = (kytag06_class*)i_this;
 
@@ -1152,7 +1112,6 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) {
     }
 }
 
-/* 80859C88-80859E68 002508 01E0+00 2/0 0/0 0/0 .text            daKytag06_Create__FP10fopAc_ac_c */
 static int daKytag06_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, kytag06_class);
     kytag06_class* a_this = static_cast<kytag06_class*>(i_this);
@@ -1224,15 +1183,12 @@ static int daKytag06_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 8085A0D4-8085A0F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag06_Method */
 static actor_method_class l_daKytag06_Method = {
     (process_method_func)daKytag06_Create,  (process_method_func)daKytag06_Delete,
     (process_method_func)daKytag06_Execute, (process_method_func)daKytag06_IsDelete,
     (process_method_func)daKytag06_Draw,
 };
 
-/* 8085A0F4-8085A124 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG06 */
 extern actor_process_profile_definition g_profile_KYTAG06 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp
index 3414583a3a..1ad9c00095 100644
--- a/src/d/actor/d_a_kytag07.cpp
+++ b/src/d/actor/d_a_kytag07.cpp
@@ -9,13 +9,10 @@
 #include "d/d_stage.h"
 #include "f_op/f_op_overlap_mng.h"
 
-/* 8085A278-8085A280 000078 0008+00 1/0 0/0 0/0 .text            daKytag07_Draw__FP13kytag07_class
- */
 static int daKytag07_Draw(kytag07_class* i_this) {
     return 1;
 }
 
-/* 8085A280-8085A334 000080 00B4+00 1/0 0/0 0/0 .text daKytag07_Execute__FP13kytag07_class */
 static int daKytag07_Execute(kytag07_class* i_this) {
     if (i_this->field_0x58c != 99) {
         cLib_addCalc(&i_this->mLightInfluence.mPow, i_this->field_0x588, 0.1f, 1000.0f, 0.001f);
@@ -32,7 +29,6 @@ static int daKytag07_Execute(kytag07_class* i_this) {
     return 1;
 }
 
-/* 8085A334-8085A388 000134 0054+00 1/0 0/0 0/0 .text daKytag07_IsDelete__FP13kytag07_class */
 static int daKytag07_IsDelete(kytag07_class* i_this) {
     i_this->field_0x58c = 99;
 
@@ -43,14 +39,11 @@ static int daKytag07_IsDelete(kytag07_class* i_this) {
     }
 }
 
-/* 8085A388-8085A3B0 000188 0028+00 1/0 0/0 0/0 .text            daKytag07_Delete__FP13kytag07_class
- */
 static int daKytag07_Delete(kytag07_class* i_this) {
     dKy_plight_cut(&i_this->mLightInfluence);
     return 1;
 }
 
-/* 8085A3B0-8085A47C 0001B0 00CC+00 1/0 0/0 0/0 .text            daKytag07_Create__FP10fopAc_ac_c */
 static int daKytag07_Create(fopAc_ac_c* i_this) {
     kytag07_class* a_this = (kytag07_class*)i_this;
 
@@ -69,13 +62,11 @@ static int daKytag07_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8085A4A8-8085A4C8 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag07_Method */
 static actor_method_class l_daKytag07_Method = {
     (process_method_func)daKytag07_Create, (process_method_func)daKytag07_Delete,
     (process_method_func)daKytag07_Execute, (process_method_func)daKytag07_IsDelete,
     (process_method_func)daKytag07_Draw};
 
-/* 8085A4C8-8085A4F8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG07 */
 extern actor_process_profile_definition g_profile_KYTAG07 = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp
index a7ff80bff6..a72b3480ce 100644
--- a/src/d/actor/d_a_kytag08.cpp
+++ b/src/d/actor/d_a_kytag08.cpp
@@ -10,13 +10,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_spinner.h"
 
-/* 8085A578-8085A580 000078 0008+00 1/0 0/0 0/0 .text            daKytag08_Draw__FP13kytag08_class
- */
 static int daKytag08_Draw(kytag08_class* i_this) {
     return 1;
 }
 
-/* 8085A580-8085AEA0 000080 0920+00 1/0 0/0 0/0 .text daKytag08_Execute__FP13kytag08_class */
 static int daKytag08_Execute(kytag08_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -192,13 +189,10 @@ static int daKytag08_Execute(kytag08_class* i_this) {
     return 1;
 }
 
-/* 8085AEA0-8085AEA8 0009A0 0008+00 1/0 0/0 0/0 .text daKytag08_IsDelete__FP13kytag08_class */
 static int daKytag08_IsDelete(kytag08_class* i_this) {
     return 1;
 }
 
-/* 8085AEA8-8085AF74 0009A8 00CC+00 1/0 0/0 0/0 .text            daKytag08_Delete__FP13kytag08_class
- */
 static int daKytag08_Delete(kytag08_class* i_this) {
     if (i_this->mpEmitter1 != NULL) {
         i_this->mpEmitter1->deleteAllParticle();
@@ -220,7 +214,6 @@ static int daKytag08_Delete(kytag08_class* i_this) {
     return 1;
 }
 
-/* 8085AF74-8085AFEC 000A74 0078+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     kytag08_class* a_this = (kytag08_class*)i_this;
 
@@ -238,7 +231,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8085AFEC-8085B23C 000AEC 0250+00 1/0 0/0 0/0 .text            daKytag08_Create__FP10fopAc_ac_c */
 static int daKytag08_Create(fopAc_ac_c* i_this) {
     kytag08_class* a_this = (kytag08_class*)i_this;
     cXyz scale(1.0f, 1.0f, 1.0f);
@@ -275,14 +267,12 @@ static int daKytag08_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 8085B318-8085B338 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag08_Method */
 static actor_method_class l_daKytag08_Method = {
     (process_method_func)daKytag08_Create,  (process_method_func)daKytag08_Delete,
     (process_method_func)daKytag08_Execute, (process_method_func)daKytag08_IsDelete,
     (process_method_func)daKytag08_Draw,
 };
 
-/* 8085B338-8085B368 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG08 */
 extern actor_process_profile_definition g_profile_KYTAG08 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp
index 16c8c9991c..c94700f27c 100644
--- a/src/d/actor/d_a_kytag09.cpp
+++ b/src/d/actor/d_a_kytag09.cpp
@@ -9,8 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 8085B3F8-8085B5F4 000078 01FC+00 1/0 0/0 0/0 .text            daKytag09_Draw__FP13kytag09_class
- */
 static int daKytag09_Draw(kytag09_class* i_this) {
     J3DModelData* modelData = i_this->mpModel->getModelData();
     g_env_light.settingTevStruct(0x10, NULL, &i_this->tevStr);
@@ -54,18 +52,14 @@ static int daKytag09_Draw(kytag09_class* i_this) {
     return 1;
 }
 
-/* 8085B5F4-8085B5FC 000274 0008+00 1/0 0/0 0/0 .text daKytag09_Execute__FP13kytag09_class */
 static int daKytag09_Execute(kytag09_class* i_this) {
     return 1;
 }
 
-/* 8085B5FC-8085B604 00027C 0008+00 1/0 0/0 0/0 .text daKytag09_IsDelete__FP13kytag09_class */
 static int daKytag09_IsDelete(kytag09_class* i_this) {
     return 1;
 }
 
-/* 8085B604-8085B658 000284 0054+00 1/0 0/0 0/0 .text            daKytag09_Delete__FP13kytag09_class
- */
 static int daKytag09_Delete(kytag09_class* i_this) {
     if (i_this->mType != 1) {
         dComIfG_resDelete(&i_this->mPhase, "Kytag09");
@@ -76,7 +70,6 @@ static int daKytag09_Delete(kytag09_class* i_this) {
     return 1;
 }
 
-/* 8085B658-8085B7C0 0002D8 0168+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     kytag09_class* a_this = (kytag09_class*)i_this;
 
@@ -106,7 +99,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8085B7C0-8085B894 000440 00D4+00 1/1 0/0 0/0 .text            useHeapInit2__FP10fopAc_ac_c */
 static int useHeapInit2(fopAc_ac_c* i_this) {
     kytag09_class* a_this = (kytag09_class*)i_this;
 
@@ -124,7 +116,6 @@ static int useHeapInit2(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8085B894-8085B9F4 000514 0160+00 1/0 0/0 0/0 .text            daKytag09_Create__FP10fopAc_ac_c */
 static int daKytag09_Create(fopAc_ac_c* i_this) {
     kytag09_class* a_this = (kytag09_class*)i_this;
     a_this->mType = fopAcM_GetParam(i_this) & 0xFF;
@@ -147,14 +138,12 @@ static int daKytag09_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 8085BA60-8085BA80 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag09_Method */
 static actor_method_class l_daKytag09_Method = {
     (process_method_func)daKytag09_Create,  (process_method_func)daKytag09_Delete,
     (process_method_func)daKytag09_Execute, (process_method_func)daKytag09_IsDelete,
     (process_method_func)daKytag09_Draw,
 };
 
-/* 8085BA80-8085BAB0 -00001 0030+00 0/2 0/0 1/0 .data            g_profile_KYTAG09 */
 extern actor_process_profile_definition g_profile_KYTAG09 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp
index 274906c223..003443f6dd 100644
--- a/src/d/actor/d_a_kytag10.cpp
+++ b/src/d/actor/d_a_kytag10.cpp
@@ -12,8 +12,6 @@
 #include "d/d_kankyo_rain.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80528BF8-80528D0C 000078 0114+00 1/1 0/0 0/0 .text            get_rail_ratio_pos__FP5dPathifPsPs
- */
 static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16* param_3,
                                s16* param_4) {
     cXyz point_a;
@@ -42,7 +40,6 @@ static cXyz get_rail_ratio_pos(dPath* i_path, int i_pointIdx, f32 param_2, s16*
     return ret;
 }
 
-/* 80528D0C-80528D54 00018C 0048+00 1/1 0/0 0/0 .text            set_path_info__FP10fopAc_ac_c */
 static dPath* set_path_info(fopAc_ac_c* i_actor) {
     dPath* path_p = NULL;
     u8 path_id = fopAcM_GetParam(i_actor) >> 0x10;
@@ -54,23 +51,18 @@ static dPath* set_path_info(fopAc_ac_c* i_actor) {
     return path_p;
 }
 
-/* 80528D54-80528D64 0001D4 0010+00 1/1 0/0 0/0 .text
- * get_Extent_pos_start_get__FP13kytag10_classP5dPathP4cXyzfPi  */
 static dPath* get_Extent_pos_start_get(kytag10_class* i_this, dPath* i_path, cXyz*, f32,
                                        int* param_4) {
     *param_4 = 0;
     return i_path;
 }
 
-/* 80528D64-80528D78 0001E4 0014+00 1/1 0/0 0/0 .text
- * get_Extent_pos_end_get__FP13kytag10_classP5dPathP4cXyzfPi    */
 static dPath* get_Extent_pos_end_get(kytag10_class* i_this, dPath* i_path, cXyz*, f32,
                                      int* param_4) {
     *param_4 = i_path->m_num - 1;
     return i_path;
 }
 
-/* 80528D78-80529148 0001F8 03D0+00 1/1 0/0 0/0 .text            sparks_move__FP13kytag10_class */
 static void sparks_move(kytag10_class* i_this) {
     camera_class* camera_p = dComIfGp_getCamera(0);
 
@@ -135,26 +127,20 @@ static void sparks_move(kytag10_class* i_this) {
     }
 }
 
-/* 80529148-80529150 0005C8 0008+00 1/0 0/0 0/0 .text            daKytag10_Draw__FP13kytag10_class
- */
 static int daKytag10_Draw(kytag10_class* i_this) {
     GXColor sphere_color = {0xFF, 0xFF, 0xFF, 0xFF};
     return 1;
 }
 
-/* 80529150-80529174 0005D0 0024+00 1/0 0/0 0/0 .text daKytag10_Execute__FP13kytag10_class */
 static int daKytag10_Execute(kytag10_class* i_this) {
     sparks_move(i_this);
     return 1;
 }
 
-/* 80529174-8052917C 0005F4 0008+00 1/0 0/0 0/0 .text daKytag10_IsDelete__FP13kytag10_class */
 static int daKytag10_IsDelete(kytag10_class* i_this) {
     return 1;
 }
 
-/* 8052917C-80529248 0005FC 00CC+00 1/0 0/0 0/0 .text            daKytag10_Delete__FP13kytag10_class
- */
 static int daKytag10_Delete(kytag10_class* i_this) {
     g_env_light.mOdourData.field_0xf21 = 0;
 
@@ -177,7 +163,6 @@ static int daKytag10_Delete(kytag10_class* i_this) {
     return 1;
 }
 
-/* 80529248-805293F8 0006C8 01B0+00 1/0 0/0 0/0 .text            daKytag10_Create__FP10fopAc_ac_c */
 static int daKytag10_Create(fopAc_ac_c* i_this) {
     kytag10_class* a_this = (kytag10_class*)i_this;
     fopAcM_ct(i_this, kytag10_class);
@@ -215,14 +200,12 @@ static int daKytag10_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80529448-80529468 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag10_Method */
 static actor_method_class l_daKytag10_Method = {
     (process_method_func)daKytag10_Create,  (process_method_func)daKytag10_Delete,
     (process_method_func)daKytag10_Execute, (process_method_func)daKytag10_IsDelete,
     (process_method_func)daKytag10_Draw,
 };
 
-/* 80529468-80529498 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG10 */
 extern actor_process_profile_definition g_profile_KYTAG10 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp
index 517c6d3b80..65b1b1ee68 100644
--- a/src/d/actor/d_a_kytag11.cpp
+++ b/src/d/actor/d_a_kytag11.cpp
@@ -9,13 +9,10 @@
 #include "d/d_procname.h"
 #include "d/d_kankyo_static.h"
 
-/* 80529518-80529520 000078 0008+00 1/0 0/0 0/0 .text            daKytag11_Draw__FP13kytag11_class
- */
 static int daKytag11_Draw(kytag11_class* i_this) {
     return 1;
 }
 
-/* 80529520-80529798 000080 0278+00 1/0 0/0 0/0 .text daKytag11_Execute__FP13kytag11_class */
 static int daKytag11_Execute(kytag11_class* i_this) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -85,18 +82,14 @@ static int daKytag11_Execute(kytag11_class* i_this) {
     return 1;
 }
 
-/* 80529798-805297A0 0002F8 0008+00 1/0 0/0 0/0 .text daKytag11_IsDelete__FP13kytag11_class */
 static int daKytag11_IsDelete(kytag11_class* i_this) {
     return 1;
 }
 
-/* 805297A0-805297A8 000300 0008+00 1/0 0/0 0/0 .text            daKytag11_Delete__FP13kytag11_class
- */
 static int daKytag11_Delete(kytag11_class* i_this) {
     return 1;
 }
 
-/* 805297A8-80529854 000308 00AC+00 1/0 0/0 0/0 .text            daKytag11_Create__FP10fopAc_ac_c */
 static int daKytag11_Create(fopAc_ac_c* i_this) {
     kytag11_class* a_this = (kytag11_class*)i_this;
     fopAcM_ct(i_this, kytag11_class);
@@ -114,14 +107,12 @@ static int daKytag11_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805298B4-805298D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag11_Method */
 static actor_method_class l_daKytag11_Method = {
     (process_method_func)daKytag11_Create,  (process_method_func)daKytag11_Delete,
     (process_method_func)daKytag11_Execute, (process_method_func)daKytag11_IsDelete,
     (process_method_func)daKytag11_Draw,
 };
 
-/* 805298D4-80529904 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG11 */
 extern actor_process_profile_definition g_profile_KYTAG11 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp
index 0b76c9c6eb..3b46a25c20 100644
--- a/src/d/actor/d_a_kytag12.cpp
+++ b/src/d/actor/d_a_kytag12.cpp
@@ -12,7 +12,6 @@
 #include "d/d_kankyo_rain.h"
 #include "d/d_kankyo_wether.h"
 
-/* 8085BB38-8085BB80 000078 0048+00 2/2 0/0 0/0 .text            d_kytag12_cut_turn_check__Fv */
 static BOOL d_kytag12_cut_turn_check() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     BOOL var_r3 = false;
@@ -27,7 +26,6 @@ static BOOL d_kytag12_cut_turn_check() {
     return var_r3;
 }
 
-/* 8085BB80-8085BBB8 0000C0 0038+00 1/1 0/0 0/0 .text            d_kytag12_cut_normal_check__Fv */
 static BOOL d_kytag12_cut_normal_check() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     BOOL var_r3 = true;
@@ -40,14 +38,10 @@ static BOOL d_kytag12_cut_normal_check() {
     return var_r3;
 }
 
-/* 8085BBB8-8085BBC0 0000F8 0008+00 1/0 0/0 0/0 .text            daKytag12_Draw__FP13kytag12_class
- */
 static int daKytag12_Draw(kytag12_class* param_0) {
     return 1;
 }
 
-/* 8085BBC0-8085BCD0 000100 0110+00 3/3 0/0 0/0 .text
- * daKytag12_light_swprd_proc__FP13kytag12_class                */
 static void daKytag12_light_swprd_proc(kytag12_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -75,8 +69,6 @@ static void daKytag12_light_swprd_proc(kytag12_class* i_this) {
     }
 }
 
-/* 8085BD0C-8085D1DC 00024C 14D0+00 2/1 0/0 0/0 .text
- * daKytag12_Execute_standard__FP13kytag12_class                */
 static int daKytag12_Execute_standard(kytag12_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -464,8 +456,6 @@ static int daKytag12_Execute_standard(kytag12_class* i_this) {
     return 1;
 }
 
-/* 8085D1DC-8085DFF0 00171C 0E14+00 1/1 0/0 0/0 .text daKytag12_Execute_arrival__FP13kytag12_class
- */
 static int daKytag12_Execute_arrival(kytag12_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -704,7 +694,6 @@ static int daKytag12_Execute_arrival(kytag12_class* i_this) {
     return 1;
 }
 
-/* 8085DFF0-8085ED48 002530 0D58+00 1/1 0/0 0/0 .text daKytag12_Execute_R00__FP13kytag12_class */
 static int daKytag12_Execute_R00(kytag12_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -969,7 +958,6 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) {
     return 1;
 }
 
-/* 8085ED48-8085EE28 003288 00E0+00 1/0 0/0 0/0 .text daKytag12_Execute__FP13kytag12_class */
 static int daKytag12_Execute(kytag12_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1006,19 +994,15 @@ static int daKytag12_Execute(kytag12_class* i_this) {
     return 1;
 }
 
-/* 8085EE28-8085EE30 003368 0008+00 1/0 0/0 0/0 .text daKytag12_IsDelete__FP13kytag12_class */
 static int daKytag12_IsDelete(kytag12_class* i_this) {
     return 1;
 }
 
-/* 8085EE30-8085EE48 003370 0018+00 1/0 0/0 0/0 .text            daKytag12_Delete__FP13kytag12_class
- */
 static int daKytag12_Delete(kytag12_class* i_this) {
     g_env_light.field_0x1054 = 0;
     return 1;
 }
 
-/* 8085EE48-8085EEF4 003388 00AC+00 1/0 0/0 0/0 .text            daKytag12_Create__FP10fopAc_ac_c */
 static int daKytag12_Create(fopAc_ac_c* i_this) {
     kytag12_class* a_this = (kytag12_class*)i_this;
     fopAcM_ct(a_this, kytag12_class);
@@ -1034,7 +1018,6 @@ static int daKytag12_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8085F118-8085F138 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag12_Method */
 static actor_method_class l_daKytag12_Method = {
     (process_method_func)daKytag12_Create,
     (process_method_func)daKytag12_Delete,
@@ -1043,7 +1026,6 @@ static actor_method_class l_daKytag12_Method = {
     (process_method_func)daKytag12_Draw,
 };
 
-/* 8085F138-8085F168 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG12 */
 extern actor_process_profile_definition g_profile_KYTAG12 = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp
index 4f1ea77a0a..82b840b6f0 100644
--- a/src/d/actor/d_a_kytag13.cpp
+++ b/src/d/actor/d_a_kytag13.cpp
@@ -11,14 +11,10 @@
 #include "d/d_kankyo_rain.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 8085F1F8-8085F200 000078 0008+00 1/0 0/0 0/0 .text            daKytag13_Draw__FP13kytag13_class
- */
 static int daKytag13_Draw(kytag13_class* i_this) {
     return 1;
 }
 
-/* 8085F200-8085F2B0 000080 00B0+00 1/1 0/0 0/0 .text            vectle_calc__FP10DOUBLE_POSP4cXyz
- */
 static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
     f64 len = sqrt(pos->x * pos->x + pos->y * pos->y + pos->z * pos->z);
     if (0.0 != len) {
@@ -32,7 +28,6 @@ static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
     }
 }
 
-/* 8085F2B0-80860148 000130 0E98+00 1/1 0/0 0/0 .text            daKytag13_Execute_standard__FP13kytag13_class */
 static int daKytag13_Execute_standard(kytag13_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket;
@@ -301,7 +296,6 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
     return 1;
 }
 
-/* 808601C0-80860200 001040 0040+00 1/0 0/0 0/0 .text daKytag13_Execute__FP13kytag13_class */
 static int daKytag13_Execute(kytag13_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     if (a_this->home.roomNo == dComIfGp_roomControl_getStayNo()) {
@@ -311,18 +305,14 @@ static int daKytag13_Execute(kytag13_class* i_this) {
     return 1;
 }
 
-/* 80860200-80860208 001080 0008+00 1/0 0/0 0/0 .text daKytag13_IsDelete__FP13kytag13_class */
 static int daKytag13_IsDelete(kytag13_class* i_this) {
     return 1;
 }
 
-/* 80860208-80860210 001088 0008+00 1/0 0/0 0/0 .text            daKytag13_Delete__FP13kytag13_class
- */
 static int daKytag13_Delete(kytag13_class* i_this) {
     return 1;
 }
 
-/* 80860210-80860450 001090 0240+00 1/0 0/0 0/0 .text            daKytag13_Create__FP10fopAc_ac_c */
 static int daKytag13_Create(fopAc_ac_c* i_this) {
     kytag13_class* a_this = (kytag13_class*)i_this;
     fopAcM_ct(i_this, kytag13_class);
@@ -389,7 +379,6 @@ static int daKytag13_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag13_Method */
 static actor_method_class l_daKytag13_Method = {
     (process_method_func)daKytag13_Create,
     (process_method_func)daKytag13_Delete,
@@ -398,7 +387,6 @@ static actor_method_class l_daKytag13_Method = {
     (process_method_func)daKytag13_Draw,
 };
 
-/* 80860560-80860590 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG13 */
 extern actor_process_profile_definition g_profile_KYTAG13 = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp
index be78e30df7..8ac983ac5a 100644
--- a/src/d/actor/d_a_kytag14.cpp
+++ b/src/d/actor/d_a_kytag14.cpp
@@ -11,13 +11,10 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_debug_viewer.h"
 
-/* 80529998-805299A0 000078 0008+00 1/0 0/0 0/0 .text            daKytag14_Draw__FP13kytag14_class
- */
 static int daKytag14_Draw(kytag14_class*) {
     return 1;
 }
 
-/* 805299A0-80529B34 000080 0194+00 1/0 0/0 0/0 .text daKytag14_Execute__FP13kytag14_class */
 static int daKytag14_Execute(kytag14_class* i_this) {
     fopAc_ac_c* actor = i_this;
     BOOL event1_set = true;
@@ -79,18 +76,14 @@ static int daKytag14_Execute(kytag14_class* i_this) {
     return 1;
 }
 
-/* 80529B34-80529B3C 000214 0008+00 1/0 0/0 0/0 .text daKytag14_IsDelete__FP13kytag14_class */
 static int daKytag14_IsDelete(kytag14_class*) {
     return 1;
 }
 
-/* 80529B3C-80529B44 00021C 0008+00 1/0 0/0 0/0 .text            daKytag14_Delete__FP13kytag14_class
- */
 static int daKytag14_Delete(kytag14_class*) {
     return 1;
 }
 
-/* 80529B44-80529BE0 000224 009C+00 1/0 0/0 0/0 .text            daKytag14_Create__FP10fopAc_ac_c */
 static int daKytag14_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, kytag14_class);
     kytag14_class* a_this = static_cast<kytag14_class*>(i_this);
@@ -109,14 +102,12 @@ static int daKytag14_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80529BE8-80529C08 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag14_Method */
 static actor_method_class l_daKytag14_Method = {
     (process_method_func)daKytag14_Create,  (process_method_func)daKytag14_Delete,
     (process_method_func)daKytag14_Execute, (process_method_func)daKytag14_IsDelete,
     (process_method_func)daKytag14_Draw,
 };
 
-/* 80529C08-80529C38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG14 */
 extern actor_process_profile_definition g_profile_KYTAG14 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp
index 97da6664c2..acef46bd3d 100644
--- a/src/d/actor/d_a_kytag15.cpp
+++ b/src/d/actor/d_a_kytag15.cpp
@@ -10,8 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80860638-808607F8 000078 01C0+00 1/0 0/0 0/0 .text            daKytag15_Draw__FP13kytag15_class
- */
 static int daKytag15_Draw(kytag15_class* i_this) {
     cXyz scale;
     mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f);
@@ -53,7 +51,6 @@ static int daKytag15_Draw(kytag15_class* i_this) {
     return 1;
 }
 
-/* 808607F8-808608B0 000238 00B8+00 1/0 0/0 0/0 .text daKytag15_Execute__FP13kytag15_class */
 static int daKytag15_Execute(kytag15_class* i_this) {
     if (!i_this->field_0x58c) {
         if (!dKy_daynight_check()) {
@@ -68,19 +65,15 @@ static int daKytag15_Execute(kytag15_class* i_this) {
     return 1;
 }
 
-/* 808608B0-808608B8 0002F0 0008+00 1/0 0/0 0/0 .text daKytag15_IsDelete__FP13kytag15_class */
 static int daKytag15_IsDelete(kytag15_class* i_this) {
     return 1;
 }
 
-/* 808608B8-808608E8 0002F8 0030+00 1/0 0/0 0/0 .text            daKytag15_Delete__FP13kytag15_class
- */
 static int daKytag15_Delete(kytag15_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Kytag15");
     return 1;
 }
 
-/* 808608E8-808609B4 000328 00CC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     kytag15_class* a_this = (kytag15_class*)i_this;
 
@@ -98,7 +91,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 808609B4-80860AF0 0003F4 013C+00 1/0 0/0 0/0 .text            daKytag15_Create__FP10fopAc_ac_c */
 static int daKytag15_Create(fopAc_ac_c* i_this) {
     kytag15_class* a_this = (kytag15_class*)i_this;
 
@@ -130,14 +122,12 @@ static int daKytag15_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80860B78-80860B98 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag15_Method */
 static actor_method_class l_daKytag15_Method = {
     (process_method_func)daKytag15_Create,  (process_method_func)daKytag15_Delete,
     (process_method_func)daKytag15_Execute, (process_method_func)daKytag15_IsDelete,
     (process_method_func)daKytag15_Draw,
 };
 
-/* 80860B98-80860BC8 -00001 0030+00 0/1 0/0 1/0 .data            g_profile_KYTAG15 */
 extern actor_process_profile_definition g_profile_KYTAG15 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp
index 9cb243a88b..ad150e18e9 100644
--- a/src/d/actor/d_a_kytag16.cpp
+++ b/src/d/actor/d_a_kytag16.cpp
@@ -11,13 +11,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80860C58-80860C60 000078 0008+00 1/0 0/0 0/0 .text            daKytag16_Draw__FP13kytag16_class
- */
 static int daKytag16_Draw(kytag16_class* i_this) {
     return 1;
 }
 
-/* 80860C60-80860E9C 000080 023C+00 1/0 0/0 0/0 .text daKytag16_Execute__FP13kytag16_class */
 static int daKytag16_Execute(kytag16_class* i_this) {
     bool var_r29 = false;
     f32 var_f31 = 0.0f;
@@ -79,18 +76,14 @@ static int daKytag16_Execute(kytag16_class* i_this) {
     return 1;
 }
 
-/* 80860E9C-80860EA4 0002BC 0008+00 1/0 0/0 0/0 .text daKytag16_IsDelete__FP13kytag16_class */
 static int daKytag16_IsDelete(kytag16_class* i_this) {
     return 1;
 }
 
-/* 80860EA4-80860EAC 0002C4 0008+00 1/0 0/0 0/0 .text            daKytag16_Delete__FP13kytag16_class
- */
 static int daKytag16_Delete(kytag16_class* i_this) {
     return 1;
 }
 
-/* 80860EAC-8086112C 0002CC 0280+00 2/0 0/0 0/0 .text            daKytag16_Create__FP10fopAc_ac_c */
 static int daKytag16_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, kytag16_class);
     kytag16_class* a_this = (kytag16_class*)i_this;
@@ -166,14 +159,12 @@ static int daKytag16_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 808611BC-808611DC -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag16_Method */
 static actor_method_class l_daKytag16_Method = {
     (process_method_func)daKytag16_Create,  (process_method_func)daKytag16_Delete,
     (process_method_func)daKytag16_Execute, (process_method_func)daKytag16_IsDelete,
     (process_method_func)daKytag16_Draw,
 };
 
-/* 808611DC-8086120C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG16 */
 extern actor_process_profile_definition g_profile_KYTAG16 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp
index 987c076d8f..ac5f775c7c 100644
--- a/src/d/actor/d_a_kytag17.cpp
+++ b/src/d/actor/d_a_kytag17.cpp
@@ -8,29 +8,22 @@
 #include "d/actor/d_a_kytag17.h"
 #include "d/d_procname.h"
 
-/* 8046DB58-8046DB60 000078 0008+00 1/0 0/0 0/0 .text            daKytag17_Draw__FP13kytag17_class
- */
 static int daKytag17_Draw(kytag17_class* i_this) {
     return 1;
 }
 
-/* 8046DB60-8046DB68 000080 0008+00 1/0 0/0 0/0 .text daKytag17_Execute__FP13kytag17_class */
 static int daKytag17_Execute(kytag17_class* i_this) {
     return 1;
 }
 
-/* 8046DB68-8046DB70 000088 0008+00 1/0 0/0 0/0 .text daKytag17_IsDelete__FP13kytag17_class */
 static int daKytag17_IsDelete(kytag17_class* i_this) {
     return 1;
 }
 
-/* 8046DB70-8046DB78 000090 0008+00 1/0 0/0 0/0 .text            daKytag17_Delete__FP13kytag17_class
- */
 static int daKytag17_Delete(kytag17_class* i_this) {
     return 1;
 }
 
-/* 8046DB78-8046DBE0 000098 0068+00 1/0 0/0 0/0 .text            daKytag17_Create__FP10fopAc_ac_c */
 static int daKytag17_Create(fopAc_ac_c* i_this) {
     kytag17_class* a_this = (kytag17_class*)i_this;
 
@@ -41,13 +34,11 @@ static int daKytag17_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8046DBE8-8046DC08 -00001 0020+00 1/0 0/0 0/0 .data            l_daKytag17_Method */
 static actor_method_class l_daKytag17_Method = {
     (process_method_func)daKytag17_Create, (process_method_func)daKytag17_Delete,
     (process_method_func)daKytag17_Execute, (process_method_func)daKytag17_IsDelete,
     (process_method_func)daKytag17_Draw};
 
-/* 8046DC08-8046DC38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KYTAG17 */
 extern actor_process_profile_definition g_profile_KYTAG17 = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp
index 97203523ef..302a110843 100644
--- a/src/d/actor/d_a_mant.cpp
+++ b/src/d/actor/d_a_mant.cpp
@@ -9,19 +9,14 @@
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "d/actor/d_a_b_gnd.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80862D40-80866D40 000020 4000+00 2/1 0/0 0/0 .data            l_Egnd_mantTEX */
 #include "assets/l_Egnd_mantTEX.h"
 
-/* 80866D40-8086AD40 004020 4000+00 3/3 0/0 0/0 .data            l_Egnd_mantTEX_U */
 #include "assets/l_Egnd_mantTEX_U.h"
 
-/* 8086AD40-8086ADA0 008020 0060+00 1/0 0/0 0/0 .data            l_Egnd_mantPAL */
 #include "assets/l_Egnd_mantPAL.h"
 #include "d/d_s_play.h"
 
-/* 8086ADA0-8086B58C 008080 07EC+00 0/0 0/0 0/0 .data            l_pos */
 static u32 l_pos[507] = {
     0x42480000, 0x3F5CFC93, 0xC365BD9C, 0x4226AAAA,
     0x3F5CFC93, 0xC365BD9C, 0x42055556, 0x3F5CFC93,
@@ -152,7 +147,6 @@ static u32 l_pos[507] = {
     0xC2480000, 0x3F5CFC93, 0x3E84C964,
 };
 
-/* 8086B5EC-8086B5F7 .data          l_normal */
 static u32 l_normal[3] = {
     0x00000000, 0x3F800000, 0x00000000,
 };
@@ -160,7 +154,6 @@ static u32 l_normal[3] = {
 // /* 8086BF70-8086BF74 000000 0004+00 3/3 0/0 0/0 .bss             None */
 // static u8 data_8086BF70[4];
 
-/* 8086B598-8086BAE0 008878 0548+00 0/0 0/0 0/0 .data            l_texCoord */
 static u32 l_texCoord[338] = {
     0x00000000, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F6AAAB0,
     0x3DAAAA7E, 0x3F800000, 0x00000000, 0x3F800000,
@@ -249,13 +242,10 @@ static u32 l_texCoord[338] = {
     0x3F800000, 0x00000000,
 };
 
-/* 8086BAE0-8086BECC 008DC0 03EC+00 0/0 0/0 0/0 .data            l_Egnd_mantDL */
 #include "assets/l_Egnd_mantDL.h"
 
-/* 8086BECC-8086BED0 -00001 0004+00 0/0 0/0 0/0 .data            pal_d */
 static void* pal_d = (void*)&l_Egnd_mantPAL;
 
-/* 8086BED0-8086BED8 -00001 0008+00 0/0 0/0 0/0 .data            tex_d */
 static void* tex_d[2] = {
     (void*)&l_Egnd_mantTEX,
     (void*)&l_Egnd_mantTEX_U,
@@ -263,7 +253,6 @@ static void* tex_d[2] = {
 
 static char lbl_277_bss_0;
 
-/* 80861298-808616B8 000078 0420+00 1/0 0/0 0/0 .text            draw__15daMant_packet_cFv */
 void daMant_packet_c::draw() {
     void* image = tex_d[0];
     void* lut = pal_d;
@@ -346,7 +335,6 @@ void daMant_packet_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 808616B8-8086176C 000498 00B4+00 1/0 0/0 0/0 .text            daMant_Draw__FP10mant_class */
 static int daMant_Draw(mant_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
 
@@ -363,7 +351,6 @@ static int daMant_Draw(mant_class* i_this) {
     return 1;
 }
 
-/* 8086176C-80861F60 00054C 07F4+00 1/1 0/0 0/0 .text joint_control__FP10mant_classP8mant_j_siff */
 static void joint_control(mant_class* i_this, mant_j_s* param_2, int param_3, f32 param_4, f32 param_5) {
     static f32 d_p[12] = {
         1.4000001f, 0.6f, 0.35f, 0.3f, 0.3f, 0.3f, 0.25f, 0.2f, 0.2f, 0.2f, 0.15f, 0.1f
@@ -554,7 +541,6 @@ static void joint_control(mant_class* i_this, mant_j_s* param_2, int param_3, f3
     }
 }
 
-/* 80861F9C-80862424 000D7C 0488+00 1/1 0/0 0/0 .text            mant_v_calc__FP10mant_class */
 static void mant_v_calc(mant_class* i_this) {
     cXyz local_e4, cStack_f0, local_fc, local_108;
     f32 dVar16, dVar15, dVar14, uVar15;
@@ -626,7 +612,6 @@ static void mant_v_calc(mant_class* i_this) {
     }
 }
 
-/* 80862424-808624E8 001204 00C4+00 1/1 0/0 0/0 .text            mant_move__FP10mant_class */
 static void mant_move(mant_class* i_this) {
     u8 uVar1 = i_this->field_0x0570.field_0x74;
     cXyz* pcVar5 = i_this->field_0x0570.getPos();
@@ -640,10 +625,8 @@ static void mant_move(mant_class* i_this) {
     DCStoreRangeNoSync(i_this->field_0x0570.getPos(), 0x7ec);
 }
 
-/* 8086BF74-8086BF78 000004 0004+00 1/1 0/0 0/0 .bss             mant_cut_type */
 static int mant_cut_type;
 
-/* 808624E8-80862908 0012C8 0420+00 2/1 0/0 0/0 .text            daMant_Execute__FP10mant_class */
 static int daMant_Execute(mant_class* i_this) {
     f32 var_f31, var_f30;
     int iVar8;
@@ -774,17 +757,14 @@ static int daMant_Execute(mant_class* i_this) {
     return 1;
 }
 
-/* 80862908-80862910 0016E8 0008+00 1/0 0/0 0/0 .text            daMant_IsDelete__FP10mant_class */
 static bool daMant_IsDelete(mant_class* i_this) {
     return true;
 }
 
-/* 80862910-80862918 0016F0 0008+00 1/0 0/0 0/0 .text            daMant_Delete__FP10mant_class */
 static int daMant_Delete(mant_class* i_this) {
     return 1;
 }
 
-/* 80862918-80862AC0 0016F8 01A8+00 1/0 0/0 0/0 .text            daMant_Create__FP10fopAc_ac_c */
 static int daMant_Create(fopAc_ac_c* i_this) {
     mant_class* m_this = (mant_class*)i_this;
 
@@ -812,22 +792,17 @@ static int daMant_Create(fopAc_ac_c* i_this) {
     return 4;
 }
 
-/* 80862AC0-80862B3C 0018A0 007C+00 1/1 0/0 0/0 .text            __dt__8mant_j_sFv */
 mant_j_s::~mant_j_s() {}
 
-/* 80862B3C-80862BA4 00191C 0068+00 1/1 0/0 0/0 .text            __ct__8mant_j_sFv */
 mant_j_s::mant_j_s() {}
 
-/* 80862BA4-80862C40 001984 009C+00 1/0 0/0 0/0 .text            __dt__15daMant_packet_cFv */
 daMant_packet_c::~daMant_packet_c() {}
 
-/* 80862C40-80862C44 001A20 0004+00 2/2 0/0 0/0 .text            __ct__4cXyzFv */
 // cXyz::cXyz() {
 extern "C" void __ct__4cXyzFv() {
     /* empty function */
 }
 
-/* 8086BF08-8086BF28 -00001 0020+00 1/0 0/0 0/0 .data            l_daMant_Method */
 static actor_method_class l_daMant_Method = {
     (process_method_func)daMant_Create,
     (process_method_func)daMant_Delete,
@@ -836,7 +811,6 @@ static actor_method_class l_daMant_Method = {
     (process_method_func)daMant_Draw,
 };
 
-/* 8086BF28-8086BF58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MANT */
 extern actor_process_profile_definition g_profile_MANT = {
   fpcLy_CURRENT_e,         // mLayerID
   8,                       // mListID
diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp
index 405511ddd8..c5ed70b740 100644
--- a/src/d/actor/d_a_mg_fish.cpp
+++ b/src/d/actor/d_a_mg_fish.cpp
@@ -21,7 +21,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 #include "d/d_vibration.h"
-#include "dol2asm.h"
 #include "f_op/f_op_kankyo_mng.h"
 
 #define ANM_MG_FISH_MOUTH_CLOSE     4
@@ -65,7 +64,6 @@
 #define GEDOU_KIND_ED 26
 #define GEDOU_KIND_SY 27
 
-/* 805364C4-805364CC 000020 0008+00 0/1 0/0 0/0 .data            check_kind */
 static u16 check_kind[4] = {
     0xF57F,
     0xF47F,
@@ -78,7 +76,6 @@ struct PathNode {
     Vec pos;
 };
 
-/* 80529D2C-80529D7C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__15daMg_Fish_HIO_cFv */
 daMg_Fish_HIO_c::daMg_Fish_HIO_c() {
     this->field_0x4 = -1;
     this->field_0x8 = 1.0f;
@@ -90,7 +87,6 @@ daMg_Fish_HIO_c::daMg_Fish_HIO_c() {
     this->field_0x1a = 0x0;
 }
 
-/* 80529D7C-80529E4C 00013C 00D0+00 3/3 0/0 0/0 .text            hit_vib_set__FP13mg_fish_class */
 static void hit_vib_set(mg_fish_class* i_this) {
     static s32 vib_p[4] = { 1, 2, 3, 4 };
 
@@ -107,8 +103,6 @@ static void hit_vib_set(mg_fish_class* i_this) {
     }
 }
 
-/* 80529E88-80529F10 000248 0088+00 6/6 0/0 0/0 .text            sibuki_set__FP13mg_fish_classf4cXyz
- */
 static void sibuki_set(mg_fish_class* i_this, f32 scale, cXyz i_pos) {
     double newScale = 0.4f * scale * i_this->mJointScale;
     i_pos.y = i_this->mSurfaceY;
@@ -121,7 +115,6 @@ static f32 dummy_3759() {
     return 30.0f;
 }
 
-/* 80529F10-80529F68 0002D0 0058+00 1/1 0/0 0/0 .text            s_hitfish_sub__FPvPv */
 static void* s_hitfish_sub(void* a, void* b) {
     if (fopAc_IsActor(a)) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -132,7 +125,6 @@ static void* s_hitfish_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 80529F68-8052A114 000328 01AC+00 2/2 0/0 0/0 .text            pl_check__FP13mg_fish_classf */
 static s32 pl_check(mg_fish_class* i_this, f32 speed) {
     if (i_this->mDistToPlayer < fabsf(dComIfGp_getPlayer(0)->speedF) * 10.0f + speed) {
         return 1;
@@ -148,7 +140,6 @@ static s32 pl_check(mg_fish_class* i_this, f32 speed) {
     return 0;
 }
 
-/* 8052A114-8052A1C0 0004D4 00AC+00 2/2 0/0 0/0 .text            anm_init__FP13mg_fish_classifUcf */
 static void anm_init(mg_fish_class* i_this, int i_resIndex, f32 i_morf, u8 i_mode, f32 i_speed) {
     J3DAnmTransform* anmTransform =
         (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, i_resIndex);
@@ -157,7 +148,6 @@ static void anm_init(mg_fish_class* i_this, int i_resIndex, f32 i_morf, u8 i_mod
     i_this->mAnmID = i_resIndex;
 }
 
-/* 8052A1C0-8052A21C 000580 005C+00 3/3 0/0 0/0 .text            mouth_open__FP13mg_fish_class */
 static void mouth_open(mg_fish_class* i_this) {
     if (i_this->mAnmTransform != NULL) {
         anm_init(i_this, ANM_MG_FISH_MOUTH_OPEN, 2.0f, 0, 1.0f);
@@ -168,7 +158,6 @@ static void mouth_open(mg_fish_class* i_this) {
     }
 }
 
-/* 8052A21C-8052A278 0005DC 005C+00 6/6 0/0 0/0 .text            mouth_close__FP13mg_fish_class */
 static void mouth_close(mg_fish_class* i_this) {
     if (i_this->mAnmTransform != NULL) {
         anm_init(i_this, ANM_MG_FISH_MOUTH_CLOSE, 2.0f, 0, 1.0f);
@@ -179,7 +168,6 @@ static void mouth_close(mg_fish_class* i_this) {
     }
 }
 
-/* 8052A278-8052A2F4 000638 007C+00 1/1 0/0 0/0 .text            s_lure_sub__FPvPv */
 static void* s_lure_sub(void* a, void* b) {
     if (fopAc_IsActor(a)) {
         if (fopAcM_GetName(a) == PROC_MG_ROD) {
@@ -195,7 +183,6 @@ static void* s_lure_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052A2F4-8052A380 0006B4 008C+00 1/1 0/0 0/0 .text            s_esa_sub__FPvPv */
 static void* s_esa_sub(void* a, void* b) {
     if (fopAc_IsActor(a)) {
         if (fopAcM_GetName(a) == PROC_MG_ROD) {
@@ -211,7 +198,6 @@ static void* s_esa_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052A380-8052A3EC 000740 006C+00 1/1 0/0 0/0 .text            s_bait_sub__FPvPv */
 static void* s_bait_sub(void* a, void* b) {
     if (fopAc_IsActor(a)) {
         if (fopAcM_GetName(a) == PROC_FR) {
@@ -227,13 +213,10 @@ static void* s_bait_sub(void* a, void* b) {
 static u8 lit_1008;
 static u8 lit_1007;
 
-/* 80536BCC-80536BE8 000054 001C+00 4/5 0/0 0/0 .bss             l_HIO */
 static daMg_Fish_HIO_c l_HIO;
 
-/* 80536BE8-80536BEC 000070 0004+00 2/2 0/0 0/0 .bss             s_fish_ct */
 static s32 s_fish_ct;
 
-/* 8052A3EC-8052A464 0007AC 0078+00 1/1 0/0 0/0 .text            s_other_search_sub__FPvPv */
 static void* s_other_search_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -244,7 +227,6 @@ static void* s_other_search_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052A464-8052A7BC 000824 0358+00 1/1 0/0 0/0 .text            search_lure__FP13mg_fish_classi */
 static s32 search_lure(mg_fish_class* i_this, int param_2) {
     static u8 learn_d[5] = {
         0x01, 0x02, 0x04, 0x08, 0x10,
@@ -311,7 +293,6 @@ static s32 search_lure(mg_fish_class* i_this, int param_2) {
 
 
 
-/* 805364E4-80536794 000040 02B0+00 2/2 0/0 0/0 .data            swim_path127 */
 static PathNode swim_path[43] = {
     { 0,  { -1394.0f, -80.0f, 559.0f } },
     { 1,  { -2327.0f, -80.0f, 1240.0f } },
@@ -358,7 +339,6 @@ static PathNode swim_path[43] = {
     { -1, { 0.0f, 0.0f, 0.0f } },
 };
 
-/* 8052A7BC-8052A838 000B7C 007C+00 1/2 0/0 0/0 .text            s_other_bait_sub__FPvPv */
 static void* s_other_bait_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && b != a && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -370,7 +350,6 @@ static void* s_other_bait_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052A838-8052A9F0 000BF8 01B8+00 1/1 0/0 0/0 .text            search_bait__FP13mg_fish_class */
 static s32 search_bait(mg_fish_class* i_this) {
     void* searchRes = fpcM_Search(s_bait_sub, i_this);
     if (searchRes != NULL) {
@@ -387,7 +366,6 @@ static s32 search_bait(mg_fish_class* i_this) {
     return -1;
 }
 
-/* 8052A9F0-8052ADBC 000DB0 03CC+00 2/2 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* joint, int param_1) {
     if (param_1 == 0) {
         s32 jointNo = joint->getJntNo();
@@ -448,7 +426,6 @@ static int nodeCallBack(J3DJoint* joint, int param_1) {
     return 1;
 }
 
-/* 8052ADBC-8052AFA0 00117C 01E4+00 2/2 0/0 0/0 .text            nodeCallBack2__FP8J3DJointi */
 static int nodeCallBack2(J3DJoint* joint, int param_1) {
     if (param_1 == 0) {
         s32 jointNo = joint->getJntNo();
@@ -484,7 +461,6 @@ static int nodeCallBack2(J3DJoint* joint, int param_1) {
     return 1;
 }
 
-/* 8052AFA0-8052B070 001360 00D0+00 1/1 0/0 0/0 .text            nodeCallBackLH__FP8J3DJointi */
 static int nodeCallBackLH(J3DJoint* joint, int param_1) {
     if (param_1 == 0) {
         s32 jointNo = joint->getJntNo();
@@ -501,7 +477,6 @@ static int nodeCallBackLH(J3DJoint* joint, int param_1) {
     return 1;
 }
 
-/* 8052B070-8052B148 001430 00D8+00 1/1 0/0 0/0 .text            nodeCallBackBB__FP8J3DJointi */
 static int nodeCallBackBB(J3DJoint* joint, int param_1) {
     if (param_1 == 0) {
         s32 jointNo = joint->getJntNo();
@@ -517,7 +492,6 @@ static int nodeCallBackBB(J3DJoint* joint, int param_1) {
     return 1;
 }
 
-/* 8052B148-8052B1A0 001508 0058+00 3/3 0/0 0/0 .text            s_bt_sub__FPvPv */
 static void* s_bt_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -528,7 +502,6 @@ static void* s_bt_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B1A0-8052B1F8 001560 0058+00 2/2 0/0 0/0 .text            s_sp_sub__FPvPv */
 static void* s_sp_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -539,7 +512,6 @@ static void* s_sp_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B1F8-8052B264 0015B8 006C+00 2/2 0/0 0/0 .text            s_lh_sub__FPvPv */
 static void* s_lh_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -551,7 +523,6 @@ static void* s_lh_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B264-8052B2BC 001624 0058+00 2/2 0/0 0/0 .text            s_bin_sub__FPvPv */
 static void* s_bin_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -562,7 +533,6 @@ static void* s_bin_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B2BC-8052B314 00167C 0058+00 2/2 0/0 0/0 .text            s_kn_sub__FPvPv */
 static void* s_kn_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -573,7 +543,6 @@ static void* s_kn_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B314-8052B36C 0016D4 0058+00 2/3 0/0 0/0 .text            s_ed_sub__FPvPv */
 static void* s_ed_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -584,7 +553,6 @@ static void* s_ed_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B36C-8052B3C4 00172C 0058+00 2/2 0/0 0/0 .text            s_sy_sub__FPvPv */
 static void* s_sy_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -595,7 +563,6 @@ static void* s_sy_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B3C4-8052B41C 001784 0058+00 3/3 0/0 0/0 .text            s_bb_sub__FPvPv */
 static void* s_bb_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_MG_FISH) {
         mg_fish_class* fish = (mg_fish_class*)a;
@@ -606,7 +573,6 @@ static void* s_bb_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B41C-8052B468 0017DC 004C+00 1/1 0/0 0/0 .text            s_bb2_sub__FPvPv */
 static void* s_bb2_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_BG) {
         return a;
@@ -614,7 +580,6 @@ static void* s_bb2_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B468-8052B4B4 001828 004C+00 1/1 0/0 0/0 .text            s_sg_sub__FPvPv */
 static void* s_sg_sub(void* a, void* b) {
     if (fopAc_IsActor(a) && fopAcM_GetName(a) == PROC_E_SG) {
         return a;
@@ -622,8 +587,6 @@ static void* s_sg_sub(void* a, void* b) {
     return NULL;
 }
 
-/* 8052B4B4-8052B928 001874 0474+00 1/1 0/0 0/0 .text            daMg_Fish_Draw__FP13mg_fish_class
- */
 s32 daMg_Fish_Draw(mg_fish_class* i_this) {
     if (i_this->mGedouKind == GEDOU_KIND_BT ||
         i_this->mGedouKind == GEDOU_KIND_SP ||
@@ -726,7 +689,6 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) {
     return 1;
 }
 
-/* 8052B928-8052B9CC 001CE8 00A4+00 1/1 0/0 0/0 .text get_surface_y__FP13mg_fish_classP4cXyz */
 static void get_surface_y(mg_fish_class* i_this, cXyz* param_2) {
     dBgS_ObjGndChk_Spl gndChk;
     cXyz pos = *param_2;
@@ -739,7 +701,6 @@ static void get_surface_y(mg_fish_class* i_this, cXyz* param_2) {
     }
 }
 
-/* 8052B9CC-8052BAB8 001D8C 00EC+00 7/7 0/0 0/0 .text get_ground_y__FP13mg_fish_classP4cXyz */
 static f32 get_ground_y(mg_fish_class* i_this, cXyz* param_2) {
     dBgS_ObjGndChk gndChk;
     cXyz pos = *param_2;
@@ -748,7 +709,6 @@ static f32 get_ground_y(mg_fish_class* i_this, cXyz* param_2) {
     return dComIfG_Bgsp().GroundCross(&gndChk);
 }
 
-/* 8052BB30-8052BF68 001EF0 0438+00 1/1 0/0 0/0 .text            mf_swim__FP13mg_fish_class */
 static void mf_swim(mg_fish_class* i_this) {
     cXyz delta;
     switch (i_this->mActionPhase) {
@@ -811,7 +771,6 @@ static void mf_swim(mg_fish_class* i_this) {
     cLib_addCalcAngleS2(&i_this->actor.current.angle.x, i_this->mMovementPitch, 2, i_this->mMaxStep);
 }
 
-/* 8052BF68-8052BFF8 002328 0090+00 1/1 0/0 0/0 .text            pos_bg_check__FP4cXyzP4cXyz */
 static s32 pos_bg_check(cXyz* param_1, cXyz* param_2) {
     dBgS_LinChk dStack_80;
     dStack_80.Set(param_1, param_2, NULL);
@@ -824,7 +783,6 @@ static s32 pos_bg_check(cXyz* param_1, cXyz* param_2) {
     }
 }
 
-/* 8052BFF8-8052C230 0023B8 0238+00 1/1 0/0 0/0 .text            path_search__FP13mg_fish_class */
 static s16 path_search(mg_fish_class* i_this) {
     f32 maxSpeed = 500.0f;
 
@@ -857,7 +815,6 @@ static s16 path_search(mg_fish_class* i_this) {
     return -1;
 }
 
-/* 8052C230-8052C574 0025F0 0344+00 1/1 0/0 0/0 .text            mf_swim_p__FP13mg_fish_class */
 static void mf_swim_p(mg_fish_class* i_this) {
     f32 targetSpeed = 1.0f;
     switch (i_this->mActionPhase) {
@@ -906,7 +863,6 @@ static void mf_swim_p(mg_fish_class* i_this) {
     cLib_addCalcAngleS2(&i_this->actor.current.angle.x, i_this->mMovementPitch, 2, i_this->mMaxStep);
 }
 
-/* 8052C574-8052CAA0 002934 052C+00 1/1 0/0 0/0 .text            mf_swim_s__FP13mg_fish_class */
 static void mf_swim_s(mg_fish_class* i_this) {
     cXyz delta;
 
@@ -988,7 +944,6 @@ static void mf_swim_s(mg_fish_class* i_this) {
     }
 }
 
-/* 8052CAA0-8052CD68 002E60 02C8+00 1/1 0/0 0/0 .text            mf_stay__FP13mg_fish_class */
 static void mf_stay(mg_fish_class* i_this) {
     f32 f31 = 0.0f;
     f32 f30 = 0.01f;
@@ -1027,7 +982,6 @@ static void mf_stay(mg_fish_class* i_this) {
     cLib_addCalcAngleS2(&i_this->mMaxStep, 0x300, 1, 0x20);
 }
 
-/* 8052CD68-8052D3BC 003128 0654+00 1/1 0/0 0/0 .text            mf_away__FP13mg_fish_class */
 static void mf_away(mg_fish_class* i_this) {
     cXyz offsetToNext;
 
@@ -1114,7 +1068,6 @@ static void mf_away(mg_fish_class* i_this) {
     cLib_addCalcAngleS2(&i_this->actor.current.angle.x, i_this->mMovementPitch, 2,i_this-> mMaxStep);
 }
 
-/* 8052D3BC-8052DAE4 00377C 0728+00 1/1 0/0 0/0 .text            ri_swim__FP13mg_fish_class */
 static void ri_swim(mg_fish_class* i_this) {
     cXyz offsetToNext;
 
@@ -1234,7 +1187,6 @@ struct JointOffsets {
     f32 * const offsets[11];
 };
 
-/* 8052DAE4-8052DEB8 003EA4 03D4+00 1/1 0/0 0/0 .text            dmcalc__FP13mg_fish_class */
 static void dmcalc(mg_fish_class* i_this) {
     static f32 joint_offset_LM[3] = { 20.0f, 20.0f, 20.0f };
     static f32 joint_offset_BG[2] = { 20.0f, 20.0f };
@@ -1370,8 +1322,6 @@ static void dmcalc(mg_fish_class* i_this) {
     }
 }
 
-/* 8052DEB8-8052EAA0 004278 0BE8+00 1/1 0/0 0/0 .text            mf_lure_search__FP13mg_fish_class
- */
 static void mf_lure_search(mg_fish_class* i_this) {
     s32 foundLure = false;
 
@@ -1633,8 +1583,6 @@ static void mf_lure_search(mg_fish_class* i_this) {
     }
 }
 
-/* 8052EAA0-8052F120 004E60 0680+00 1/1 0/0 0/0 .text            mf_bait_search__FP13mg_fish_class
- */
 static void mf_bait_search(mg_fish_class* i_this) {
     s32 foundBait = false;
     fr_class* rod = (fr_class*)fopAcM_SearchByID(i_this->mBaitId);
@@ -1738,7 +1686,6 @@ static void mf_bait_search(mg_fish_class* i_this) {
     }
 }
 
-/* 8052F120-8052FA4C 0054E0 092C+00 1/1 0/0 0/0 .text            mf_hit__FP13mg_fish_class */
 static void mf_hit(mg_fish_class* i_this) {
     dmg_rod_class* pvVar5 = (dmg_rod_class*)fopAcM_SearchByID(i_this->mRodId);
     if (pvVar5 == NULL) {
@@ -1929,7 +1876,6 @@ static void mf_hit(mg_fish_class* i_this) {
     }
 }
 
-/* 8052FA4C-8053036C 005E0C 0920+00 1/1 0/0 0/0 .text            mf_jump__FP13mg_fish_class */
 static void mf_jump(mg_fish_class* i_this) {
     cXyz commonXyz1;
     cXyz commonXyz2;
@@ -2126,7 +2072,6 @@ static void mf_jump(mg_fish_class* i_this) {
     }
 }
 
-/* 8053036C-8053055C 00672C 01F0+00 2/2 0/0 0/0 .text            pota_set__FP13mg_fish_class */
 static void pota_set(mg_fish_class* i_this) {
     static u16 b_id[3] = {
         0x873A,
@@ -2184,7 +2129,6 @@ static void pota_set(mg_fish_class* i_this) {
     }
 }
 
-/* 8053055C-80530924 00691C 03C8+00 1/1 0/0 0/0 .text            mf_catch__FP13mg_fish_class */
 static void mf_catch(mg_fish_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (i_this->actor.health == 2) {
@@ -2281,7 +2225,6 @@ static void mf_catch(mg_fish_class* i_this) {
     }
 }
 
-/* 80530924-8053109C 006CE4 0778+00 1/1 0/0 0/0 .text            mf_esa_search__FP13mg_fish_class */
 static void mf_esa_search(mg_fish_class* i_this) {
     s32 flag1 = 0;
     s32 flag2 = 0;
@@ -2414,7 +2357,6 @@ static void mf_esa_search(mg_fish_class* i_this) {
     }
 }
 
-/* 8053109C-805313D8 00745C 033C+00 1/1 0/0 0/0 .text            mf_esa_hit__FP13mg_fish_class */
 static void mf_esa_hit(mg_fish_class* i_this) {
     dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByID(i_this->mRodId);
     if (rod == NULL || (rod != NULL && rod->action != 5)) {
@@ -2478,7 +2420,6 @@ static void mf_esa_hit(mg_fish_class* i_this) {
     cLib_addCalcAngleS2(&i_this->actor.current.angle.x, i_this->mMovementPitch, 2, i_this->mMaxStep);
 }
 
-/* 805313D8-8053198C 007798 05B4+00 1/1 0/0 0/0 .text            mf_esa_catch__FP13mg_fish_class */
 static s32 mf_esa_catch(mg_fish_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByID(i_this->mRodId);
@@ -2604,7 +2545,6 @@ static s32 mf_esa_catch(mg_fish_class* i_this) {
     return flag;
 }
 
-/* 8053198C-80531CD4 007D4C 0348+00 1/1 0/0 0/0 .text            mf_aqua__FP13mg_fish_class */
 static void mf_aqua(mg_fish_class* i_this) {
     f32 targetSpeed = 0.0f;
     switch (i_this->mActionPhase) {
@@ -2650,7 +2590,6 @@ static void mf_aqua(mg_fish_class* i_this) {
 }
 
 
-/* 80531CD4-805322E0 008094 060C+00 1/1 0/0 0/0 .text            ri_aqua__FP13mg_fish_class */
 static void ri_aqua(mg_fish_class* i_this) {
     // Two different vectors in Debug, but this messes up the stack for GZ2E01.
     // cXyz commonXyz2;
@@ -2763,7 +2702,6 @@ static void ri_aqua(mg_fish_class* i_this) {
     }
 }
 
-/* 805322E0-805324D8 0086A0 01F8+00 1/1 0/0 0/0 .text            mf_aqua_tilt__FP13mg_fish_class */
 static void mf_aqua_tilt(mg_fish_class* i_this) {
     float targetSpeed = 0.0f;
 
@@ -2814,7 +2752,6 @@ static void mf_aqua_tilt(mg_fish_class* i_this) {
     }
 }
 
-/* 805324D8-80533268 008898 0D90+00 2/1 0/0 0/0 .text            action__FP13mg_fish_class */
 static void action(mg_fish_class* i_this) {
     i_this->mDistToPlayer = fopAcM_searchPlayerDistanceXZ(&i_this->actor);
     const char* stageName = dComIfGp_getStartStageName();
@@ -3227,7 +3164,6 @@ static void action(mg_fish_class* i_this) {
     }
 }
 
-/* 80533268-80533484 009628 021C+00 1/1 0/0 0/0 .text ke_control__FP13mg_fish_classP7mf_ke_s */
 static void ke_control(mg_fish_class* i_this, mf_ke_s* rope) {
     s32 i;
     s16 pitch;
@@ -3265,7 +3201,6 @@ static void ke_control(mg_fish_class* i_this, mf_ke_s* rope) {
     }
 }
 
-/* 80533484-80533540 009844 00BC+00 1/1 0/0 0/0 .text ke_move__FP13mg_fish_classP7mf_ke_si */
 static void ke_move(mg_fish_class* i_this, mf_ke_s* param_1, int param_2) {
     ke_control(i_this, param_1);
     cXyz* pos = i_this->mLineMat.getPos(param_2);
@@ -3280,7 +3215,6 @@ static void ke_move(mg_fish_class* i_this, mf_ke_s* param_1, int param_2) {
     }
 }
 
-/* 80533540-80534964 009900 1424+00 2/1 0/0 0/0 .text daMg_Fish_Execute__FP13mg_fish_class */
 static int daMg_Fish_Execute(mg_fish_class* i_this) {
     static s32 mouth_idx[11] = { 7, 0, 9, 7, 9, 4, 7, 0, 9, 7, 9 };
 
@@ -3669,13 +3603,10 @@ static int daMg_Fish_Execute(mg_fish_class* i_this) {
     return 1;
 }
 
-/* 80534964-8053496C 00AD24 0008+00 1/0 0/0 0/0 .text daMg_Fish_IsDelete__FP13mg_fish_class */
 static int daMg_Fish_IsDelete(mg_fish_class* i_this) {
     return 1;
 }
 
-/* 8053496C-805349DC 00AD2C 0070+00 1/0 0/0 0/0 .text            daMg_Fish_Delete__FP13mg_fish_class
- */
 static int daMg_Fish_Delete(mg_fish_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhaseReq, i_this->mResName);
@@ -3688,7 +3619,6 @@ static int daMg_Fish_Delete(mg_fish_class* i_this) {
     return 1;
 }
 
-/* 805349DC-80534E90 00AD9C 04B4+00 1/1 0/0 0/0 .text            useHeapInit2__FP10fopAc_ac_c */
 static int useHeapInit2(fopAc_ac_c* i_actor) {
     mg_fish_class* i_this = (mg_fish_class*)i_actor;
 
@@ -3777,7 +3707,6 @@ static int useHeapInit2(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80534ED8-80535138 00B298 0260+00 1/1 0/0 0/0 .text            useHeapImg_fisht__FP10fopAc_ac_c */
 static int useHeapImg_fisht(fopAc_ac_c* i_actor) {
     static u32 fish_bmd[11] = {
         8, 3, 3, 3, 4, 3, 8, 3,
@@ -3830,7 +3759,6 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80535138-80535DA8 00B4F8 0C70+00 1/0 0/0 0/0 .text            daMg_Fish_Create__FP10fopAc_ac_c */
 static int daMg_Fish_Create(fopAc_ac_c* i_this) {
     /* 805369FC-80536A40 000558 0044+00 0/1 0/0 0/0 .data            cc_cyl_src$8395 */
     static dCcD_SrcCyl cc_cyl_src = {
@@ -4123,7 +4051,6 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
     return retval;
 }
 
-/* 80536A6C-80536A8C -00001 0020+00 1/0 0/0 0/0 .data            l_daMg_Fish_Method */
 static actor_method_class l_daMg_Fish_Method = {
     (process_method_func)daMg_Fish_Create,
     (process_method_func)daMg_Fish_Delete,
@@ -4132,7 +4059,6 @@ static actor_method_class l_daMg_Fish_Method = {
     (process_method_func)daMg_Fish_Draw,
 };
 
-/* 80536A8C-80536ABC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MG_FISH */
 extern actor_process_profile_definition g_profile_MG_FISH = {
     (uint)fpcLy_CURRENT_e,  // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp
index 8c15501248..99af4761d4 100644
--- a/src/d/actor/d_a_mg_fshop.cpp
+++ b/src/d/actor/d_a_mg_fshop.cpp
@@ -32,8 +32,6 @@ enum koro2_parts {
     KORO2_PART_SLOPE_R,
 };
 
-/* 8086C06C-8086C08C 0000EC 0020+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     if (i_rideActor->field_0x567 == 0) {
         i_rideActor->field_0x567 = 1;
@@ -41,7 +39,6 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid
     }
 }
 
-/* 8086C08C-8086C140 00010C 00B4+00 1/1 0/0 0/0 .text            Reel_CallBack__FP8J3DJointi */
 static int Reel_CallBack(J3DJoint* i_joint, int param_1) {
     J3DJoint* var_r27;
 
@@ -59,7 +56,6 @@ static int Reel_CallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8086C140-8086C214 0001C0 00D4+00 1/1 0/0 0/0 .text            frog_CallBack__FP8J3DJointi */
 static int frog_CallBack(J3DJoint* i_joint, int param_1) {
     fs_lure_s* lure;
     J3DJoint* var_r27;
@@ -82,16 +78,12 @@ static int frog_CallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 808709A4-808709B0 000054 000C+00 2/3 0/0 0/0 .bss             BallStartPos */
 static cXyz BallStartPos;
 
-/* 808709BC-808709C8 00006C 000C+00 2/3 0/0 0/0 .bss             BallEndPos */
 static cXyz BallEndPos;
 
-/* 808709C8-808709CC 000078 0004+00 2/3 0/0 0/0 .bss             ArcIX_A_crwaku_model */
 static J3DModel* ArcIX_A_crwaku_model[1];
 
-/* 8086C214-8086C310 000294 00FC+00 1/1 0/0 0/0 .text            koro2_draw__FP11fshop_class */
 static void koro2_draw(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -126,7 +118,6 @@ static void koro2_draw(fshop_class* i_this) {
  * Slope: 8
  */
 
-/* 808702A4-8087032C 000020 0087+01 1/1 0/0 0/0 .data            koro2_map_LV1 */
 static s8 koro2_map_LV1[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
@@ -145,7 +136,6 @@ static s8 koro2_map_LV1[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8087032C-808703B4 0000A8 0087+01 1/0 0/0 0/0 .data            koro2_map_LV2 */
 static s8 koro2_map_LV2[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
@@ -164,7 +154,6 @@ static s8 koro2_map_LV2[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 808703B4-8087043C 000130 0087+01 1/0 0/0 0/0 .data            koro2_map_LV3 */
 static s8 koro2_map_LV3[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
@@ -183,7 +172,6 @@ static s8 koro2_map_LV3[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8087043C-808704C4 0001B8 0087+01 1/0 0/0 0/0 .data            koro2_map_LV4 */
 static s8 koro2_map_LV4[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -202,7 +190,6 @@ static s8 koro2_map_LV4[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 808704C4-8087054C 000240 0087+01 1/0 0/0 0/0 .data            koro2_map_LV5 */
 static s8 koro2_map_LV5[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -221,7 +208,6 @@ static s8 koro2_map_LV5[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8087054C-808705D4 0002C8 0087+01 1/0 0/0 0/0 .data            koro2_map_LV7 */
 static s8 koro2_map_LV7[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -240,7 +226,6 @@ static s8 koro2_map_LV7[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 808705D4-8087065C 000350 0087+01 1/0 0/0 0/0 .data            koro2_map_LV6 */
 static s8 koro2_map_LV6[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00,
@@ -259,7 +244,6 @@ static s8 koro2_map_LV6[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8087065C-808706E4 0003D8 0087+01 1/0 0/0 0/0 .data            koro2_map_LV8 */
 static s8 koro2_map_LV8[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -278,37 +262,28 @@ static s8 koro2_map_LV8[135] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 808706E4-80870704 -00001 0020+00 0/1 0/0 0/0 .data            koro2_map_d */
 static s8* koro2_map_d[8] = {
     koro2_map_LV1, koro2_map_LV2, koro2_map_LV3, koro2_map_LV4,
     koro2_map_LV5, koro2_map_LV6, koro2_map_LV7, koro2_map_LV8,
 };
 
-/* 808709CC-808709D0 00007C 0004+00 1/1 0/0 0/0 .bss             ArcIX_A_crstart_model */
 static J3DModel* ArcIX_A_crstart_model[1];
 
-/* 808709D0-808709D4 000080 0004+00 1/1 0/0 0/0 .bss             ArcIX_A_crgoal_model */
 static J3DModel* ArcIX_A_crgoal_model[1];
 
-/* 808709D4-80870A50 000084 007C+00 1/1 0/0 0/0 .bss             ArcIX_A_crbox_model */
 static J3DModel* ArcIX_A_crbox_model[31];
 
-/* 80870A50-80870A90 000100 0040+00 1/1 0/0 0/0 .bss             ArcIX_A_crcurve_a_model */
 static J3DModel* ArcIX_A_crcurve_a_model[16];
 
-/* 80870A90-80870AA0 000140 0010+00 1/1 0/0 0/0 .bss             ArcIX_A_crcurve_b_model */
 static J3DModel* ArcIX_A_crcurve_b_model[4];
 
-/* 80870AA0-80870AC0 000150 0020+00 1/1 0/0 0/0 .bss             ArcIX_A_crsaka_model */
 static J3DModel* ArcIX_A_crsaka_model[8];
 
-/* 80870704-8087071C -00001 0018+00 0/1 0/0 0/0 .data            koro2_union_model */
 static J3DModel** koro2_union_model[6] = {
     ArcIX_A_crstart_model,   ArcIX_A_crgoal_model,    ArcIX_A_crbox_model,
     ArcIX_A_crcurve_a_model, ArcIX_A_crcurve_b_model, ArcIX_A_crsaka_model,
 };
 
-/* 8086C310-8086C6E4 000390 03D4+00 1/0 0/0 0/0 .text            daFshop_Draw__FP11fshop_class */
 static int daFshop_Draw(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     g_env_light.settingTevStruct(0x10, &actor->current.pos, &actor->tevStr);
@@ -394,32 +369,26 @@ static int daFshop_Draw(fshop_class* i_this) {
     return 1;
 }
 
-/* 8087072C-80870738 0004A8 000C+00 0/0 0/0 0/0 .data            lure_scale */
 static f32 lure_scale[3] = {
     0.75f, 0.75f, 0.6f,
 };
 
-/* 80870738-80870744 0004B4 000C+00 0/0 0/0 0/0 .data            lure_eye_off */
 static f32 lure_eye_off[3] = {
     17.0f, 11.0f, 16.5f,
 };
 
-/* 80870744-80870750 0004C0 000C+00 0/1 0/0 0/0 .data            hook_1_offy */
 static f32 hook_1_offy[3] = {
     -3.5f, -3.5f, -5.0f,
 };
 
-/* 80870750-8087075C 0004CC 000C+00 0/1 0/0 0/0 .data            hook_2_offz */
 static f32 hook_2_offz[3] = {
     -19.0f, -16.0f, -21.0f,
 };
 
-/* 8087075C-80870768 0004D8 000C+00 0/1 0/0 0/0 .data            hook_2_offy */
 static f32 hook_2_offy[3] = {
     -1.0f, 0.0f, 0.0f,
 };
 
-/* 8086C6E4-8086C9D0 000764 02EC+00 1/1 0/0 0/0 .text            lure_set__FP11fshop_class */
 static void lure_set(fshop_class* i_this) {
     static f32 lure_ofy[3] = {-12.0f, -10.0f, -14.0f};
     fs_lure_s* pLure = i_this->mLure;
@@ -478,7 +447,6 @@ static void lure_set(fshop_class* i_this) {
     }
 }
 
-/* 8086C9D0-8086CC30 000A50 0260+00 1/1 0/0 0/0 .text            rod_set__FP11fshop_class */
 static void rod_set(fshop_class* i_this) {
     fs_rod_s* pRod = i_this->mRod;
 
@@ -529,7 +497,6 @@ static void rod_set(fshop_class* i_this) {
     }
 }
 
-/* 8086CC6C-8086CD70 000CEC 0104+00 1/1 0/0 0/0 .text            s_fish_sub__FPvPv */
 static void* s_fish_sub(void* i_actor, void* i_data) {
     mg_fish_class* fish = (mg_fish_class*)i_actor;
     fs_weed_s* weed = (fs_weed_s*)i_data;
@@ -553,7 +520,6 @@ static void* s_fish_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8086CD70-8086CF8C 000DF0 021C+00 1/1 0/0 0/0 .text            tsubo_set__FP11fshop_class */
 static void tsubo_set(fshop_class* i_this) {
     fopAc_ac_c* pfVar5 = dComIfGp_getPlayer(0);
     fs_tsubo_s* pTsubo = i_this->mTsubo;
@@ -597,7 +563,6 @@ static void tsubo_set(fshop_class* i_this) {
     }
 }
 
-/* 8086CF8C-8086D1A0 00100C 0214+00 1/1 0/0 0/0 .text weed_control__FP11fshop_classP9fs_weed_s */
 static void weed_control(fshop_class* i_this, fs_weed_s* i_weed) {
     int i;
     cXyz local_84;
@@ -628,14 +593,12 @@ static void weed_control(fshop_class* i_this, fs_weed_s* i_weed) {
     }
 }
 
-/* 8086D1A0-8086D1EC 001220 004C+00 1/1 0/0 0/0 .text stage_copy__FP11fshop_classP11fshop_class */
 static void stage_copy(fshop_class* i_dst, fshop_class* i_src) {
     i_dst->field_0x4014 = i_src->field_0x4014;
     i_dst->field_0x4020 = i_src->field_0x4020;
     i_dst->actor.scale = i_src->actor.scale;
 }
 
-/* 8086D1EC-8086D48C 00126C 02A0+00 1/1 0/0 0/0 .text            koro2_mtx_set__FP11fshop_class */
 static void koro2_mtx_set(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -702,7 +665,6 @@ static void koro2_mtx_set(fshop_class* i_this) {
     }
 }
 
-/* 8086D48C-8086D500 00150C 0074+00 1/1 0/0 0/0 .text            s_sel_sub__FPvPv */
 static void* s_sel_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP) {
         if (((fshop_class*)i_actor)->field_0x400e == (u8)((((fshop_class*)i_data)->field_0x400c & 7) + 1)) {
@@ -713,7 +675,6 @@ static void* s_sel_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8086D500-8086D55C 001580 005C+00 1/1 0/0 0/0 .text            s_ball_sub__FPvPv */
 static void* s_ball_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_FSHOP && (fopAcM_GetParam(i_actor) & 0xFF) == 0x23) {
         return i_actor;
@@ -722,7 +683,6 @@ static void* s_ball_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8086D55C-8086D854 0015DC 02F8+00 1/1 0/0 0/0 .text            koro2_game__FP11fshop_class */
 static void koro2_game(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -808,7 +768,6 @@ static void koro2_game(fshop_class* i_this) {
     }
 }
 
-/* 8086D854-8086DA00 0018D4 01AC+00 1/1 0/0 0/0 .text            ball_wall_check__FP11fshop_class */
 static int ball_wall_check(fshop_class* i_this) {
     if (!i_this->ballAcch.ChkWallHit()) {
         return 0;
@@ -850,7 +809,6 @@ static int ball_wall_check(fshop_class* i_this) {
     return 0;
 }
 
-/* 8086DA00-8086E6C4 001A80 0CC4+00 2/1 0/0 0/0 .text            daFshop_Execute__FP11fshop_class */
 static int daFshop_Execute(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* pPlayer = dComIfGp_getPlayer(0);
@@ -1123,13 +1081,10 @@ static int daFshop_Execute(fshop_class* i_this) {
     return 1;
 }
 
-/* 8086E6C4-8086E6CC 002744 0008+00 1/0 0/0 0/0 .text            daFshop_IsDelete__FP11fshop_class
- */
 static int daFshop_IsDelete(fshop_class* i_this) {
     return 1;
 }
 
-/* 8086E6CC-8086E7F0 00274C 0124+00 1/0 0/0 0/0 .text            daFshop_Delete__FP11fshop_class */
 static int daFshop_Delete(fshop_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAcM_GetID(i_this);
@@ -1156,7 +1111,6 @@ static int daFshop_Delete(fshop_class* i_this) {
     return 1;
 }
 
-/* 8086E7F0-8086ECC8 002870 04D8+00 1/1 0/0 0/0 .text            koro2_heapinit__FP10fopAc_ac_c */
 static int koro2_heapinit(fopAc_ac_c* actor) {
     static int koro2_bmd[15] = {
         0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0F, 0x0D, 0x0C,
@@ -1295,7 +1249,6 @@ static int koro2_heapinit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 8086ECC8-8086F5C8 002D48 0900+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     fshop_class* i_this = (fshop_class*)actor;
     cM_initRnd2(JREG_S(8) + 37, 123, 70);
@@ -1539,7 +1492,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 8086F5C8-8086F634 003648 006C+00 1/1 0/0 0/0 .text            BalluseHeapInit__FP10fopAc_ac_c */
 static int BalluseHeapInit(fopAc_ac_c* actor) {
     fshop_class* i_this = (fshop_class*)actor;
 
@@ -1553,7 +1505,6 @@ static int BalluseHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 8086F634-8086FD78 0036B4 0744+00 1/0 0/0 0/0 .text            daFshop_Create__FP10fopAc_ac_c */
 static int daFshop_Create(fopAc_ac_c* actor) {
     fshop_class* i_this = (fshop_class*)actor;
     fopAcM_ct(actor, fshop_class);
@@ -1721,7 +1672,6 @@ static int daFshop_Create(fopAc_ac_c* actor) {
     return phase_state;
 }
 
-/* 808708BC-808708DC -00001 0020+00 1/0 0/0 0/0 .data            l_daFshop_Method */
 static actor_method_class l_daFshop_Method = {
     (process_method_func)daFshop_Create,
     (process_method_func)daFshop_Delete,
@@ -1730,7 +1680,6 @@ static actor_method_class l_daFshop_Method = {
     (process_method_func)daFshop_Draw,
 };
 
-/* 808708DC-8087090C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_FSHOP */
 extern actor_process_profile_definition g_profile_FSHOP = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp
index ef87d5d49c..601c833c87 100644
--- a/src/d/actor/d_a_mg_rod.cpp
+++ b/src/d/actor/d_a_mg_rod.cpp
@@ -26,8 +26,8 @@
 
 class dmg_rod_HIO_c : public JORReflexible {
 public:
-    /* 804A95EC */ dmg_rod_HIO_c();
-    /* 804BB070 */ virtual ~dmg_rod_HIO_c() {}
+    dmg_rod_HIO_c();
+    virtual ~dmg_rod_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -42,17 +42,14 @@ public:
     /* 0x24 */ u8 force_fish_msg_output;
 };
 
-/* 804BB534-804BB540 000000 000C+00 45/45 0/0 0/0 .rodata          @3879 */
 static u8 const lit_3879[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804BB870-804BB878 000020 0008+00 1/2 0/0 0/0 .data            check_kind */
 static u16 check_kind[] = {
     0xF57F, 0xF47F, 0xF37F, 0xF27F,
 };
 
-/* 804A95EC-804A964C 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__13dmg_rod_HIO_cFv */
 dmg_rod_HIO_c::dmg_rod_HIO_c() {
     id = -1;
     field_0x8 = 1.0f;
@@ -86,7 +83,6 @@ void dmg_rod_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 804A964C-804A9734 00014C 00E8+00 1/1 0/0 0/0 .text            frog_nodeCallBack__FP8J3DJointi */
 static int frog_nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -107,7 +103,6 @@ static int frog_nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 804A9734-804A97F8 000234 00C4+00 1/1 0/0 0/0 .text            ws_nodeCallBack__FP8J3DJointi */
 static int ws_nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -125,7 +120,6 @@ static int ws_nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 804A97F8-804A98F4 0002F8 00FC+00 1/1 0/0 0/0 .text            Reel_CallBack__FP8J3DJointi */
 static int Reel_CallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -151,7 +145,6 @@ static int Reel_CallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 804A98F4-804A99E0 0003F4 00EC+00 1/1 0/0 0/0 .text            Worm_nodeCallBack__FP8J3DJointi */
 static int Worm_nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -172,7 +165,6 @@ static int Worm_nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 804A99E0-804A9EAC 0004E0 04CC+00 1/0 0/0 0/0 .text            dmg_rod_Draw__FP13dmg_rod_class */
 static int dmg_rod_Draw(dmg_rod_class* i_this) {
     int unused;
     fopAc_ac_c* actor = &i_this->actor;
@@ -274,7 +266,6 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) {
     return 1;
 }
 
-/* 804A9EAC-804AAB78 0009AC 0CCC+00 1/1 0/0 0/0 .text            rod_control__FP13dmg_rod_class */
 static void rod_control(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -521,26 +512,21 @@ static void rod_control(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AAB78-804AAB98 001678 0020+00 1/1 0/0 0/0 .text            rod_main__FP13dmg_rod_class */
 static void rod_main(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     rod_control(i_this);
 }
 
-/* 804BBBD0-804BBBD4 000048 0004+00 6/9 0/0 0/0 .bss             henna */
 static npc_henna_class* henna;
 
 /* 804BBBD4 0001+00 data_804BBBD4 None */
 static u8 data_804BBBD4;
 static u8 l_HIOInit;
 
-/* 804BBBE4-804BBC0C 00005C 0028+00 1/6 0/0 0/0 .bss             l_HIO */
 static dmg_rod_HIO_c l_HIO;
 
-/* 804BBC18-804BC0C8 000090 04B0+00 3/4 0/0 0/0 .bss             old_line_pos */
 static cXyz old_line_pos[100];
 
-/* 804AAB98-804AB01C 001698 0484+00 1/1 0/0 0/0 .text            line_control1__FP13dmg_rod_class */
 static void line_control1(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     int i;
@@ -653,7 +639,6 @@ static void line_control1(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AB064-804AB588 001B64 0524+00 1/1 0/0 0/0 .text            line_control2__FP13dmg_rod_class */
 static void line_control2(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     int i;
@@ -767,7 +752,6 @@ static void line_control2(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AB588-804ABCE0 002088 0758+00 1/1 0/0 0/0 .text            line_control1_u__FP13dmg_rod_class */
 static void line_control1_u(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -929,7 +913,6 @@ static void line_control1_u(dmg_rod_class* i_this) {
     }
 }
 
-/* 804ABCE0-804ABED8 0027E0 01F8+00 2/2 0/0 0/0 .text            line_control2_u__FP13dmg_rod_class */
 static void line_control2_u(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     int i;
@@ -979,7 +962,6 @@ static void line_control2_u(dmg_rod_class* i_this) {
     }
 }
 
-/* 804ABED8-804ABFA4 0029D8 00CC+00 1/1 0/0 0/0 .text            line_main__FP13dmg_rod_class */
 static void line_main(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -998,7 +980,6 @@ static void line_main(dmg_rod_class* i_this) {
     }
 }
 
-/* 804ABFA4-804AC04C 002AA4 00A8+00 2/2 0/0 0/0 .text            depth_check__FP13dmg_rod_classP4cXyz */
 static f32 depth_check(dmg_rod_class* i_this, cXyz* param_1) {
     dBgS_GndChk gnd_chk;
     Vec pos;
@@ -1011,7 +992,6 @@ static f32 depth_check(dmg_rod_class* i_this, cXyz* param_1) {
     return i_this->field_0x590 - dComIfG_Bgsp().GroundCross(&gnd_chk);
 }
 
-/* 804AC04C-804AC1C0 002B4C 0174+00 1/1 0/0 0/0 .text sibuki_set__FP13dmg_rod_classfP4cXyzi */
 static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL param_3) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -1028,7 +1008,6 @@ static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL para
     }
 }
 
-/* 804AC1C0-804AC228 002CC0 0068+00 1/1 0/0 0/0 .text            s_boat_sub__FPvPv */
 static void* s_boat_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) {
         cXyz spC = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos;
@@ -1038,7 +1017,6 @@ static void* s_boat_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804AC228-804AC41C 002D28 01F4+00 1/1 0/0 0/0 .text            lure_onboat__FP13dmg_rod_class */
 static void lure_onboat(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1090,7 +1068,6 @@ static void lure_onboat(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AC41C-804ACB94 002F1C 0778+00 1/1 0/0 0/0 .text            lure_standby__FP13dmg_rod_class */
 static int lure_standby(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1277,7 +1254,6 @@ static int lure_standby(dmg_rod_class* i_this) {
     return sp14;
 }
 
-/* 804ACB94-804ACC1C 003694 0088+00 2/2 0/0 0/0 .text            lure_bound_se_set__FP13dmg_rod_class */
 static void lure_bound_se_set(dmg_rod_class* i_this) {
     if (i_this->lure_type != MG_LURE_FR) {
         if (i_this->lure_type == MG_LURE_SP) {
@@ -1288,7 +1264,6 @@ static void lure_bound_se_set(dmg_rod_class* i_this) {
     }
 }
 
-/* 804ACC1C-804AD46C 00371C 0850+00 1/1 0/0 0/0 .text            lure_cast__FP13dmg_rod_class */
 static void lure_cast(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -1455,7 +1430,6 @@ static void lure_cast(dmg_rod_class* i_this) {
     i_this->sound.startCreatureSoundLevel(Z2SE_AL_ROD_CASTING_LOOP, 0, -1);
 }
 
-/* 804AD46C-804AD5AC 003F6C 0140+00 1/1 0/0 0/0 .text            simple_bg_check__FP13dmg_rod_classf */
 static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz sp24;
@@ -1488,7 +1462,6 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) {
     return 0;
 }
 
-/* 804AD5AC-804AD5F8 0040AC 004C+00 1/1 0/0 0/0 .text            s_wd_sub__FPvPv */
 static void* s_wd_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_LP) {
         return i_actor;
@@ -1497,7 +1470,6 @@ static void* s_wd_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804AD5F8-804AD7C0 0040F8 01C8+00 1/1 0/0 0/0 .text            wd_check__FP13dmg_rod_class */
 static wd_ss* wd_check(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     obj_lp_class* obj_lp = (obj_lp_class*)fpcM_Search(s_wd_sub, i_this);
@@ -1517,7 +1489,6 @@ static wd_ss* wd_check(dmg_rod_class* i_this) {
     return NULL;
 }
 
-/* 804AD7C0-804AD918 0042C0 0158+00 1/1 0/0 0/0 .text            fr_action__FP13dmg_rod_classf */
 static void fr_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp14;
@@ -1558,7 +1529,6 @@ static void fr_action(dmg_rod_class* i_this, f32 param_1) {
     i_this->field_0xff0 = 0;
 }
 
-/* 804AD918-804ADB58 004418 0240+00 1/2 0/0 0/0 .text            pe_action__FP13dmg_rod_classf */
 static void pe_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp18;
@@ -1621,7 +1591,6 @@ static void pe_action(dmg_rod_class* i_this, f32 param_1) {
     }
 }
 
-/* 804ADB58-804ADDD4 004658 027C+00 1/2 0/0 0/0 .text            po_action__FP13dmg_rod_classf */
 static void po_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp18;
@@ -1695,7 +1664,6 @@ static void po_action(dmg_rod_class* i_this, f32 param_1) {
     cLib_addCalcAngleS2(&i_this->field_0x1000, i_this->field_0x1002, 8, (YREG_S(2) + 1000));
 }
 
-/* 804ADDD4-804AE06C 0048D4 0298+00 1/1 0/0 0/0 .text            ws_action__FP13dmg_rod_classf */
 static void ws_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp1C;
@@ -1755,7 +1723,6 @@ static void ws_action(dmg_rod_class* i_this, f32 param_1) {
     }
 }
 
-/* 804AE06C-804AE250 004B6C 01E4+00 1/1 0/0 0/0 .text            sp_action__FP13dmg_rod_classf */
 static void sp_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp18;
@@ -1795,7 +1762,6 @@ static void sp_action(dmg_rod_class* i_this, f32 param_1) {
     i_this->field_0x1009 = 10;
 }
 
-/* 804AE250-804AE778 004D50 0528+00 1/1 0/0 0/0 .text            ground_action__FP13dmg_rod_class */
 static void ground_action(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp3C;
@@ -1903,7 +1869,6 @@ static void ground_action(dmg_rod_class* i_this) {
     cLib_addCalc2(&actor->speedF, var_f31, 1.0f, 5.0f + BREG_F(12));
 }
 
-/* 804AE778-804AEA80 005278 0308+00 1/1 0/0 0/0 .text            wd_action__FP13dmg_rod_classfP5wd_ss */
 static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp28;
@@ -1990,7 +1955,6 @@ static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) {
     cLib_addCalc2(&i_this->field_0x59c, 4.0f + KREG_F(15), 1.0f, 1.0f);
 }
 
-/* 804AEA80-804AEBF0 005580 0170+00 1/1 0/0 0/0 .text            heart_action__FP13dmg_rod_classf */
 static void heart_action(dmg_rod_class* i_this, f32 param_1) {
     fopAc_ac_c* actor = &i_this->actor;
     cLib_addCalc0(&actor->speedF, 1.0f, 5.0f + BREG_F(12));
@@ -2019,7 +1983,6 @@ static void heart_action(dmg_rod_class* i_this, f32 param_1) {
     }
 }
 
-/* 804AEBF0-804AEE18 0056F0 0228+00 1/1 0/0 0/0 .text            action_eff_set__FP13dmg_rod_class */
 static void action_eff_set(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     if (!((i_this->field_0x590 - actor->current.pos.y) > 15.0f)) {
@@ -2064,7 +2027,6 @@ static void action_eff_set(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AEE18-804AFA70 005918 0C58+00 1/1 0/0 0/0 .text            lure_action__FP13dmg_rod_class */
 static void lure_action(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp54;
@@ -2326,7 +2288,6 @@ static void lure_action(dmg_rod_class* i_this) {
     }
 }
 
-/* 804AFA70-804B02C4 006570 0854+00 1/1 0/0 0/0 .text            lure_hit__FP13dmg_rod_classP13mg_fish_class */
 static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) {
     fopAc_ac_c* sp1C = &i_this->actor;
     fopAc_ac_c* sp18 = dComIfGp_getPlayer(0);
@@ -2524,7 +2485,6 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) {
     }
 }
 
-/* 804B02C4-804B0A90 006DC4 07CC+00 1/1 0/0 0/0 .text            lure_catch__FP13dmg_rod_class */
 static void lure_catch(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fopAc_ac_c* mgfish_a = fopAcM_SearchByID(i_this->mg_fish_id);
@@ -2742,7 +2702,6 @@ static void lure_catch(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B0A90-804B0E74 007590 03E4+00 1/1 0/0 0/0 .text            lure_bare__FP13dmg_rod_class */
 static void lure_bare(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* mgfish = fopAcM_SearchByID(i_this->mg_fish_id);
@@ -2831,7 +2790,6 @@ static void lure_bare(dmg_rod_class* i_this) {
     actor->speed.y = 0.0f;
 }
 
-/* 804B0E74-804B11CC 007974 0358+00 1/1 0/0 0/0 .text            lure_heart__FP13dmg_rod_class */
 static void lure_heart(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -2921,8 +2879,6 @@ static void lure_heart(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B11CC-804B16B8 007CCC 04EC+00 1/1 0/0 0/0 .text            hook_set__FP13dmg_rod_classP4cXyzi
- */
 static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz sp38;
@@ -3017,28 +2973,20 @@ static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) {
     i_this->hook_model[param_2]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 804BB940-804BB954 0000F0 0014+00 0/1 0/0 0/0 .data            lure_scale */
 static f32 lure_scale[] = {1.0f, 0.75f, 0.75f, 0.6f, 0.375f};
 
-/* 804BB954-804BB968 000104 0014+00 0/1 0/0 0/0 .data            lure_eye_off */
 static f32 lure_eye_off[] = {4.0f, 17.0f, 11.0f, 16.5f, 4.0f};
 
-/* 804BB968-804BB97C 000118 0014+00 0/1 0/0 0/0 .data            hook_1_offy */
 static f32 hook_1_offy[] = {-3.5f, -3.5f, -3.5f, -5.0f, -3.5f};
 
-/* 804BB97C-804BB990 00012C 0014+00 0/1 0/0 0/0 .data            hook_2_offz */
 static f32 hook_2_offz[] = {-16.0f, -19.0f, -16.0f, -23.0f, -43.5f};
 
-/* 804BB990-804BB9A4 000140 0014+00 0/1 0/0 0/0 .data            hook_2_offy */
 static f32 hook_2_offy[] = {0.0f, -1.0f, 0.0f, 0.0f, 0.0f};
 
-/* 804BB9A4-804BB9B8 000154 0014+00 0/1 0/0 0/0 .data            lure_nose_off */
 static f32 lure_nose_off[] = {-4.6f, -16.6f, -11.6f, -17.6f, -2.6f};
 
-/* 804BB9B8-804BB9CC 000168 0014+00 0/1 0/0 0/0 .data            hiton_off */
 static f32 hiton_off[] = {4.3f, 16.3f, 11.3f, 17.3f, 2.3000002f};
 
-/* 804B16B8-804B1D14 0081B8 065C+00 1/1 0/0 0/0 .text            lure_disp__FP13dmg_rod_class */
 static void lure_disp(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp28;
@@ -3161,7 +3109,6 @@ static void lure_disp(dmg_rod_class* i_this) {
     cLib_addCalc2(&i_this->field_0xff8, 500.0f, 1.0f, 200.0f);
 }
 
-/* 804B1D14-804B265C 008814 0948+00 2/1 0/0 0/0 .text            lure_main__FP13dmg_rod_class */
 static void lure_main(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz sp68;
@@ -3381,7 +3328,6 @@ static void lure_main(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B265C-804B2C54 00915C 05F8+00 4/4 0/0 0/0 .text            uki_calc__FP13dmg_rod_class */
 static int uki_calc(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3518,7 +3464,6 @@ static int uki_calc(dmg_rod_class* i_this) {
     return var_r28;
 }
 
-/* 804B2C54-804B30E8 009754 0494+00 1/1 0/0 0/0 .text            uki_ready__FP13dmg_rod_class */
 static void uki_ready(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -3600,8 +3545,6 @@ static void uki_ready(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B30E8-804B31D8 009BE8 00F0+00 1/1 0/0 0/0 .text            uki_rod_bg_check__FP13dmg_rod_class
- */
 static BOOL uki_rod_bg_check(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3624,8 +3567,6 @@ static BOOL uki_rod_bg_check(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B31D8-804B345C 009CD8 0284+00 3/3 0/0 0/0 .text            uki_pl_arm_calc__FP13dmg_rod_class
- */
 static void uki_pl_arm_calc(dmg_rod_class* i_this) {
     fopAc_ac_c* temp_r28 = dComIfGp_getPlayer(0);
     csXyz sp10;
@@ -3677,7 +3618,6 @@ static void uki_pl_arm_calc(dmg_rod_class* i_this) {
     daAlink_getAlinkActorClass()->setFishingArm2Angle(sp10);
 }
 
-/* 804B345C-804B3B7C 009F5C 0720+00 1/1 0/0 0/0 .text            uki_standby__FP13dmg_rod_class */
 static void uki_standby(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3800,7 +3740,6 @@ static void uki_standby(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B3B7C-804B40B8 00A67C 053C+00 1/1 0/0 0/0 .text            uki_hit__FP13dmg_rod_class */
 static void uki_hit(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3936,7 +3875,6 @@ static void uki_hit(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B40B8-804B41A0 00ABB8 00E8+00 1/1 0/0 0/0 .text            bb_get__FP13dmg_rod_class */
 static int bb_get(dmg_rod_class* i_this) {
     for (int i = 0; i < 3; i++) {
         u8 itemno =  dComIfGs_getItem(i + 15, false);
@@ -3956,7 +3894,6 @@ static int bb_get(dmg_rod_class* i_this) {
     return 0;
 }
 
-/* 804B41A0-804B4A94 00ACA0 08F4+00 1/1 0/0 0/0 .text            uki_catch__FP13dmg_rod_class */
 static void uki_catch(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -4151,7 +4088,6 @@ static void uki_catch(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B4A94-804B4B08 00B594 0074+00 1/1 0/0 0/0 .text            s_sg_sub__FPvPv */
 static void* s_sg_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->field_0x590 - 50.0f) {
         return i_actor;
@@ -4160,7 +4096,6 @@ static void* s_sg_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804B4B08-804B4B7C 00B608 0074+00 1/1 0/0 0/0 .text            s_bb_sub__FPvPv */
 static void* s_bb_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->field_0x590 - 50.0f) {
         return i_actor;
@@ -4169,7 +4104,6 @@ static void* s_bb_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804B4B7C-804B4CF0 00B67C 0174+00 1/1 0/0 0/0 .text            s_lh_sub__FPvPv */
 static void* s_lh_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH && ((mg_fish_class*)i_actor)->mGedouKind == 21) {
         if ((((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < ((mg_fish_class*)i_actor)->mJointScale) {
@@ -4180,7 +4114,6 @@ static void* s_lh_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804B4CF0-804B4E64 00B7F0 0174+00 1/1 0/0 0/0 .text            s_bt_sub__FPvPv */
 static void* s_bt_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH && ((mg_fish_class*)i_actor)->mGedouKind == 20) {
         if ((((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < ((mg_fish_class*)i_actor)->mJointScale) {
@@ -4191,7 +4124,6 @@ static void* s_bt_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804B4E64-804B5E60 00B964 0FFC+00 1/1 0/0 0/0 .text            uki_main__FP13dmg_rod_class */
 static void uki_main(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -4480,7 +4412,6 @@ static void uki_main(dmg_rod_class* i_this) {
     dComIfG_Ccsp()->Set(&i_this->ccSph);
 }
 
-/* 804B5E60-804B5F44 00C960 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP13dmg_rod_classf */
 static void cam_3d_morf(dmg_rod_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->play_cam_center.x, i_this->play_cam_center_target.x, i_scale, i_this->play_cam_center_speed.x * i_this->field_0x1410);
     cLib_addCalc2(&i_this->play_cam_center.y, i_this->play_cam_center_target.y, i_scale, i_this->play_cam_center_speed.y * i_this->field_0x1410);
@@ -4491,7 +4422,6 @@ static void cam_3d_morf(dmg_rod_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->play_cam_eye.z, i_this->play_cam_eye_target.z, i_scale, i_this->play_cam_eye_speed.z * i_this->field_0x1410);
 }
 
-/* 804B5F44-804B805C 00CA44 2118+00 1/1 0/0 0/0 .text            play_camera__FP13dmg_rod_class */
 // NONMATCHING - JMAFastSqrt needs to not be inlined
 // tricks like FORCE_DONT_INLINE can stop inlining for most of the inlines in this function, but it's unclear how to stop just one inline
 static void play_camera(dmg_rod_class* i_this) {
@@ -5319,7 +5249,6 @@ static void play_camera(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B805C-804B9318 00EB5C 12BC+00 1/1 0/0 0/0 .text            play_camera_u__FP13dmg_rod_class */
 static void play_camera_u(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -5748,7 +5677,6 @@ static void play_camera_u(dmg_rod_class* i_this) {
     }
 }
 
-/* 804B9318-804BA098 00FE18 0D80+00 2/1 0/0 0/0 .text            dmg_rod_Execute__FP13dmg_rod_class */
 static int dmg_rod_Execute(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -6064,7 +5992,6 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) {
     return 1;
 }
 
-/* 804BA098-804BA14C 010B98 00B4+00 1/0 0/0 0/0 .text            dmg_rod_IsDelete__FP13dmg_rod_class */
 static int dmg_rod_IsDelete(dmg_rod_class* i_this) {
     if (i_this->play_cam_mode != 0) {
         camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -6077,7 +6004,6 @@ static int dmg_rod_IsDelete(dmg_rod_class* i_this) {
     return 1;
 }
 
-/* 804BA14C-804BA1F4 010C4C 00A8+00 1/0 0/0 0/0 .text            dmg_rod_Delete__FP13dmg_rod_class */
 static int dmg_rod_Delete(dmg_rod_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -6098,7 +6024,6 @@ static int dmg_rod_Delete(dmg_rod_class* i_this) {
     return 1;
 }
 
-/* 804BA1F4-804BA83C 010CF4 0648+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     dmg_rod_class* a_this = (dmg_rod_class*)i_this;
     int bmd_idx;
@@ -6274,7 +6199,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 804BA83C-804BAC0C 01133C 03D0+00 1/0 0/0 0/0 .text            dmg_rod_Create__FP10fopAc_ac_c */
 static int dmg_rod_Create(fopAc_ac_c* i_this) {
     dmg_rod_class* a_this = (dmg_rod_class*)i_this;
     fopAcM_ct(i_this, dmg_rod_class);
@@ -6420,7 +6344,6 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 804BBAAC-804BBACC -00001 0020+00 1/0 0/0 0/0 .data            l_dmg_rod_Method */
 static actor_method_class l_dmg_rod_Method = {
     (process_method_func)dmg_rod_Create,
     (process_method_func)dmg_rod_Delete,
@@ -6429,7 +6352,6 @@ static actor_method_class l_dmg_rod_Method = {
     (process_method_func)dmg_rod_Draw,
 };
 
-/* 804BBACC-804BBAFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MG_ROD */
 extern actor_process_profile_definition g_profile_MG_ROD = {
   fpcLy_CURRENT_e,            // mLayerID
   8,                          // mListID
diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp
index 52065e22f8..b1850215f5 100644
--- a/src/d/actor/d_a_midna.cpp
+++ b/src/d/actor/d_a_midna.cpp
@@ -24,43 +24,30 @@ static f32 dummy_lit_3777(int idx, u8 foo) {
     }
 }
 
-/* 804C64D4-804C64DC 00000C 0006+02 5/6 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[6] = "Midna";
 
-/* 804C64DC-804C64E8 000014 000C+00 0/1 0/0 0/0 .rodata          l_eyeOffset */
 static Vec const l_eyeOffset = { 16.0f, -10.400001f, 0.0f };
 
-/* 804C64E8-804C64F4 000020 000C+00 0/1 0/0 0/0 .rodata          l_headCenterOffset */
 static Vec const l_headCenterOffset = { 0.0f, -10.400001f, 0.0f };
 
-/* 804C64F4-804C64FC 00002C 0008+00 0/2 0/0 0/0 .rodata          l_normalColor */
 static GXColorS10 const l_normalColor = { 0x50, 0x00, 0x00, 0x00 };
 
-/* 804C64FC-804C6500 000034 0004+00 0/3 0/0 0/0 .rodata          l_normalKColor */
 static GXColor const l_normalKColor = { 0xB4, 0x87, 0x00, 0x00 };
 
-/* 804C6500-804C6504 000038 0004+00 0/3 0/0 0/0 .rodata          l_normalKColor2 */
 static GXColor const l_normalKColor2 = { 0x00, 0xC3, 0xC3, 0x00 };
 
-/* 804C6504-804C650C 00003C 0008+00 0/1 0/0 0/0 .rodata          l_bigColor */
 static GXColorS10 const l_bigColor = { 0xFF, 0x64, 0x78, 0x00 };
 
-/* 804C650C-804C6510 000044 0004+00 0/1 0/0 0/0 .rodata          l_bigKColor */
 static GXColor const l_bigKColor = { 0x1E, 0x00, 0x00, 0x00 };
 
-/* 804C6510-804C6514 000048 0004+00 0/3 0/0 0/0 .rodata          l_lNormalKColor */
 static GXColor const l_lNormalKColor = { 0xFF, 0xDC, 0x00, 0x00 };
 
-/* 804C6514-804C6518 00004C 0004+00 0/3 0/0 0/0 .rodata          l_lNormalKColor2 */
 static GXColor const l_lNormalKColor2 = { 0x00, 0xC3, 0xEB, 0x00 };
 
-/* 804C6518-804C6520 000050 0008+00 0/1 0/0 0/0 .rodata          l_lBigColor */
 static GXColorS10 const l_lBigColor = { 0xFF, 0x78, 0x00, 0x00 };
 
-/* 804C6520-804C6524 000058 0004+00 0/1 0/0 0/0 .rodata          l_lBigKColor2 */
 static GXColor const l_lBigKColor2 = { 0xAA, 0xFF, 0xC3, 0x00 };
 
-/* 804C6524-804C6560 00005C 003C+00 0/2 0/0 0/0 .rodata          l_hairScale */
 static Vec const l_hairScale[5] = {
     {0.3f, 0.8f, 0.7f},
     {0.2f, 0.8f, 0.4f},
@@ -121,7 +108,6 @@ void daMidna_hio_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 804C6560-804C6580 000098 0020+00 1/3 0/0 0/0 .rodata          m__14daMidna_hio_c0 */
 daMidna_hio_c1 const daMidna_hio_c0::m = {
     0,
     0,
@@ -144,7 +130,6 @@ bool daMidna_matAnm_c::sEyeMoveFlg;
 u8 daMidna_matAnm_c::sMorfFrame;
 #endif
 
-/* 804BC218-804BC248 000078 0030+00 2/2 0/0 0/0 .text            init__16daMidna_matAnm_cFv */
 void daMidna_matAnm_c::init() {
     mOldTransX = 0.0f;
     mOldTransY = 0.0f;
@@ -154,7 +139,6 @@ void daMidna_matAnm_c::init() {
     sMorfFrame = 0;
 }
 
-/* 804BC248-804BC36C 0000A8 0124+00 1/0 0/0 0/0 .text calc__16daMidna_matAnm_cCFP11J3DMaterial */
 void daMidna_matAnm_c::calc(J3DMaterial* i_material) const {
     J3DMaterialAnm::calc(i_material);
     for (u32 i = 0; i < 8; i++) {
@@ -177,7 +161,6 @@ void daMidna_matAnm_c::calc(J3DMaterial* i_material) const {
     }
 }
 
-/* 804BC36C-804BC3E0 0001CC 0074+00 1/0 0/0 0/0 .text            execute__20daMidna_McaMorfCB1_cFUsP16J3DTransformInfo */
 int daMidna_McaMorfCB1_c::execute(u16 i_jointNo, J3DTransformInfo* transform) {
     if (!daPy_py_c::getMidnaActor()->checkNoHairScale()) {
         if (i_jointNo >= JNT_HAIR_1 && i_jointNo <= JNT_HAIR_5) {
@@ -191,7 +174,6 @@ int daMidna_McaMorfCB1_c::execute(u16 i_jointNo, J3DTransformInfo* transform) {
     return 1;
 }
 
-/* 804C6590-804C65E4 0000C8 0054+00 0/1 0/0 0/0 .rodata          m_texDataTable__9daMidna_c */
 daMidna_texData_s const daMidna_c::m_texDataTable[21] = {
     0x0405, 0x03A4,
     0x03F5, 0x0399,
@@ -216,7 +198,6 @@ daMidna_texData_s const daMidna_c::m_texDataTable[21] = {
     0x03FD, 0x0399,
 };
 
-/* 804C65E4-804C6860 00011C 027C+00 3/12 0/0 0/0 .rodata          m_anmDataTable__9daMidna_c */
 daMidna_anmData_s const daMidna_c::m_anmDataTable[53] = {
     0x01DC, 0x00, -1.0f, 0,
     0x01B7, 0x01, -1.0f, 0,
@@ -273,7 +254,6 @@ daMidna_anmData_s const daMidna_c::m_anmDataTable[53] = {
     0x01C4, 0x00, -1.0f, 0,
 };
 
-/* 804BC3E0-804BC5C4 000240 01E4+00 1/1 0/0 0/0 .text            modelCallBack__9daMidna_cFi */
 int daMidna_c::modelCallBack(int i_jointNo) {
     mDoMtx_stack_c::copy(J3DSys::mCurrentMtx);
     if ((i_jointNo == JNT_BACKBONE1 || i_jointNo == JNT_WAIST) && mDemoMode == 0x200) {
@@ -310,7 +290,6 @@ int daMidna_c::modelCallBack(int i_jointNo) {
     return 1;
 }
 
-/* 804BC5C4-804BC614 000424 0050+00 1/1 0/0 0/0 .text            changeUpperBck__9daMidna_cFv */
 int daMidna_c::changeUpperBck() {
     J3DAnmTransform* anm = mUpperBck.getBckAnm();
     mUpperBck.changeBckOnly(mpMorf->getAnm());
@@ -318,7 +297,6 @@ int daMidna_c::changeUpperBck() {
     return 1;
 }
 
-/* 804BC614-804BC670 000474 005C+00 1/1 0/0 0/0 .text            changeFaceBck__9daMidna_cFv */
 int daMidna_c::changeFaceBck() {
     if (checkStateFlg0(FLG0_UNK_800000)) {
         J3DAnmTransform* anm = mFaceBck.getBckAnm();
@@ -329,7 +307,6 @@ int daMidna_c::changeFaceBck() {
     return 1;
 }
 
-/* 804BC670-804BC6FC 0004D0 008C+00 1/1 0/0 0/0 .text            baseModelCallBack__9daMidna_cFi */
 int daMidna_c::baseModelCallBack(int i_jointNo) {
     if (i_jointNo == mJntNo) {
         changeFaceBck();
@@ -346,7 +323,6 @@ int daMidna_c::baseModelCallBack(int i_jointNo) {
     return 1;
 }
 
-/* 804BC6FC-804BC740 00055C 0044+00 1/1 0/0 0/0 .text            daMidna_modelCallBack__FP8J3DJointi */
 static int daMidna_modelCallBack(J3DJoint* i_joint, int param_2) {
     int jnt_no = i_joint->getJntNo();
     daMidna_c* _this = (daMidna_c*)j3dSys.getModel()->getUserArea();
@@ -356,7 +332,6 @@ static int daMidna_modelCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 804BC740-804BC7D4 0005A0 0094+00 1/1 0/0 0/0 .text            initInvModel__9daMidna_cFUsPP8J3DModelP21mDoExt_invisibleModelUl */
 int daMidna_c::initInvModel(u16 i_resNo, J3DModel** i_modelP, mDoExt_invisibleModel* i_invModel, u32 flag) {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, i_resNo);
     JUT_ASSERT(664, modelData);
@@ -372,7 +347,6 @@ int daMidna_c::initInvModel(u16 i_resNo, J3DModel** i_modelP, mDoExt_invisibleMo
     return 1;
 }
 
-/* 804BC7D4-804BC868 000634 0094+00 1/1 0/0 0/0 .text            initDemoModel__9daMidna_cFPP8J3DModelPCcUl */
 int daMidna_c::initDemoModel(J3DModel** i_modelP, char const* i_bmdName, u32 flag) {
     *i_modelP = NULL;
     J3DModelData* model_data =
@@ -386,7 +360,6 @@ int daMidna_c::initDemoModel(J3DModel** i_modelP, char const* i_bmdName, u32 fla
     return 1;
 }
 
-/* 804BC868-804BD050 0006C8 07E8+00 1/1 0/0 0/0 .text            createHeap__9daMidna_cFv */
 int daMidna_c::createHeap() {
     J3DModelData* modelData;
     
@@ -560,7 +533,6 @@ int daMidna_c::createHeap() {
     return 1;
 }
 
-/* 804BD254-804BD274 0010B4 0020+00 1/1 0/0 0/0 .text            daMidna_createHeap__FP10fopAc_ac_c */
 static int daMidna_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daMidna_c*>(i_this)->createHeap();
 }
@@ -571,7 +543,6 @@ daMidna_hio_c::daMidna_hio_c() {
 }
 #endif
 
-/* 804BD274-804BD8B8 0010D4 0644+00 1/1 0/0 0/0 .text            create__9daMidna_cFv */
 cPhs__Step daMidna_c::create() {
     fopAcM_ct(this, daMidna_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
@@ -694,14 +665,12 @@ cPhs__Step daMidna_c::create() {
     return step;
 }
 
-/* 804BD91C-804BD93C 00177C 0020+00 1/0 0/0 0/0 .text            daMidna_Create__FP10fopAc_ac_c */
 static cPhs__Step daMidna_Create(fopAc_ac_c* i_this) {
     daMidna_c* actor = (daMidna_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return actor->create();
 }
 
-/* 804BD93C-804BDE04 00179C 04C8+00 2/2 0/0 0/0 .text            allAnimePlay__9daMidna_cFv */
 void daMidna_c::allAnimePlay() {
     daAlink_c::simpleAnmPlay(mpMoyaBtk);
     daAlink_c::simpleAnmPlay(mpHandsMoyaBtk);
@@ -825,7 +794,6 @@ void daMidna_c::allAnimePlay() {
     }
 }
 
-/* 804BDE04-804BE470 001C64 066C+00 2/2 0/0 0/0 .text            setMatrix__9daMidna_cFv */
 void daMidna_c::setMatrix() {
     Vec vec1 = {0.0f, mpHIO->m.y_pos, mpHIO->m.z_pos};
     Vec scale = {mpHIO->m.scale, mpHIO->m.scale, mpHIO->m.scale};
@@ -949,7 +917,6 @@ void daMidna_c::setMatrix() {
     }
 }
 
-/* 804BE470-804BED1C 0022D0 08AC+00 2/2 0/0 0/0 .text            setBodyPartMatrix__9daMidna_cFv */
 void daMidna_c::setBodyPartMatrix() {
     if (mpHandsBmd != NULL) {
         mpHandsBmd->setBaseTRMtx(mpShadowModel->getBaseTRMtx());
@@ -1143,7 +1110,6 @@ void daMidna_c::setBodyPartMatrix() {
     }
 }
 
-/* 804BED1C-804BEDB8 002B7C 009C+00 2/2 0/0 0/0 .text            setRoomInfo__9daMidna_cFv */
 void daMidna_c::setRoomInfo() {
     int room_no;
     if (fopAcM_gc_c::gndCheck(&current.pos)) {
@@ -1157,7 +1123,6 @@ void daMidna_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, room_no);
 }
 
-/* 804BEDB8-804BEFA0 002C18 01E8+00 1/1 0/0 0/0 .text            setBodyPartPos__9daMidna_cFv */
 void daMidna_c::setBodyPartPos() {
     if (!(checkSetAnime(0, ANM_S_RETURN) && mpMorf->getFrame() > 14.0f)) {
         mDoMtx_multVec(mpShadowModel->getAnmMtx(JNT_HEAD), &l_eyeOffset, &eyePos);
@@ -1187,7 +1152,6 @@ void daMidna_c::setBodyPartPos() {
     }
 }
 
-/* 804BEFA0-804BF070 002E00 00D0+00 1/1 0/0 0/0 .text            checkAppear__9daMidna_cFv */
 BOOL daMidna_c::checkAppear() {
     if (
         daPy_py_c::checkNowWolf() && daPy_py_c::checkFirstMidnaDemo() &&
@@ -1202,7 +1166,6 @@ BOOL daMidna_c::checkAppear() {
     return FALSE;
 }
 
-/* 804BF070-804BFF80 002ED0 0F10+00 1/1 0/0 0/0 .text            checkMidnaPosState__9daMidna_cFv */
 void daMidna_c::checkMidnaPosState() {
     daAlink_c* link = daAlink_getAlinkActorClass();
 
@@ -1457,7 +1420,6 @@ void daMidna_c::checkMidnaPosState() {
     }
 }
 
-/* 804BFF80-804C0020 003DE0 00A0+00 3/3 0/0 0/0 .text            setUpperAnime__9daMidna_cFUsUs */
 BOOL daMidna_c::setUpperAnime(u16 i_resID, u16 param_1) {
     J3DAnmTransform* bck;
     if (param_1 == 0xffff) {
@@ -1476,7 +1438,6 @@ BOOL daMidna_c::setUpperAnime(u16 i_resID, u16 param_1) {
     return TRUE;
 }
 
-/* 804C0020-804C0094 003E80 0074+00 1/1 0/0 0/0 .text            setUpperAnimeAndSe__9daMidna_cFQ29daMidna_c11daMidna_ANM */
 BOOL daMidna_c::setUpperAnimeAndSe(daMidna_c::daMidna_ANM i_anm) {
     const daMidna_anmData_s* anm_data = &m_anmDataTable[i_anm];
     if (setUpperAnime(anm_data->mResID, 0xffff)) {
@@ -1488,7 +1449,6 @@ BOOL daMidna_c::setUpperAnimeAndSe(daMidna_c::daMidna_ANM i_anm) {
     return FALSE;
 }
 
-/* 804C0094-804C0134 003EF4 00A0+00 1/1 0/0 0/0 .text            setFaceAnime__9daMidna_cFUsUs */
 BOOL daMidna_c::setFaceAnime(u16 i_resID, u16 param_1) {
     J3DAnmTransform* bck;
     if (param_1 == 0xFFFF) {
@@ -1508,7 +1468,6 @@ BOOL daMidna_c::setFaceAnime(u16 i_resID, u16 param_1) {
     return TRUE;
 }
 
-/* 804C0134-804C0238 003F94 0104+00 2/2 0/0 0/0 .text            endHighModel__9daMidna_cFv */
 void daMidna_c::endHighModel() {
     if (mpDemoFCTongueBtk != NULL) {
         mpDemoFCTongueBmd->getModelData()->removeTexMtxAnimator(mpDemoFCTongueBtk);
@@ -1527,7 +1486,6 @@ void daMidna_c::endHighModel() {
     }
 }
 
-/* 804C0238-804C0BAC 004098 0974+00 1/1 0/0 0/0 .text            setDemoAnm__9daMidna_cFv */
 BOOL daMidna_c::setDemoAnm() {
     dDemo_actor_c* demo_actor = dDemo_c::getActor(demoActorID);
     if (demo_actor == NULL) {
@@ -1775,7 +1733,6 @@ BOOL daMidna_c::setDemoAnm() {
     return ret;
 }
 
-/* 804C0BAC-804C0C6C 004A0C 00C0+00 2/2 0/0 0/0 .text            setFaceBtp__9daMidna_cFUsi */
 void daMidna_c::setFaceBtp(u16 i_index, BOOL i_isDemo) {
     J3DAnmTexPattern* btp;
     if (i_isDemo) {
@@ -1794,7 +1751,6 @@ void daMidna_c::setFaceBtp(u16 i_index, BOOL i_isDemo) {
     }
 }
 
-/* 804C0C6C-804C0D2C 004ACC 00C0+00 2/2 0/0 0/0 .text            setFaceBtk__9daMidna_cFUsi */
 void daMidna_c::setFaceBtk(u16 i_index, BOOL i_isDemo) {
     J3DAnmTextureSRTKey* btk;
     if (i_isDemo) {
@@ -1813,7 +1769,6 @@ void daMidna_c::setFaceBtk(u16 i_index, BOOL i_isDemo) {
     }
 }
 
-/* 804C0D2C-804C0E18 004B8C 00EC+00 2/2 0/0 0/0 .text            setLeftHandShape__9daMidna_cFUs */
 void daMidna_c::setLeftHandShape(u16 i_idx) {
     mLeftHandShapeIdx = i_idx;
     if (mpLeftHandShape != NULL) {
@@ -1839,7 +1794,6 @@ void daMidna_c::setLeftHandShape(u16 i_idx) {
     }
 }
 
-/* 804C0E18-804C0F04 004C78 00EC+00 3/3 0/0 0/0 .text            setRightHandShape__9daMidna_cFUs */
 void daMidna_c::setRightHandShape(u16 i_idx) {
     mRightHandShapeIdx = i_idx;
     if (mpRightHandShape != NULL) {
@@ -1865,12 +1819,10 @@ void daMidna_c::setRightHandShape(u16 i_idx) {
     }
 }
 
-/* 804C0F04-804C0F24 004D64 0020+00 1/1 0/0 0/0 .text            checkHairOnlyAnime__9daMidna_cCFi */
 BOOL daMidna_c::checkHairOnlyAnime(int i_anm) const {
     return i_anm >= ANM_HAIR && i_anm < ANM_MAX;
 }
 
-/* 804C0F24-804C103C 004D84 0118+00 2/2 0/0 0/0 .text setBckAnime__9daMidna_cFP15J3DAnmTransformif */
 void daMidna_c::setBckAnime(J3DAnmTransform* i_bck, int i_attr, f32 i_morf) {
     mpMorf->setAnm(i_bck, i_attr, i_morf, 1.0f, 0.0f, -1.0f);
     void* bas;
@@ -1898,7 +1850,6 @@ void daMidna_c::setBckAnime(J3DAnmTransform* i_bck, int i_attr, f32 i_morf) {
     }
 }
 
-/* 804C103C-804C287C 004E9C 1840+00 2/2 0/0 0/0 .text            setAnm__9daMidna_cFv */
 void daMidna_c::setAnm() {
     u16 sVar4, res_id;
     offStateFlg0((daMidna_FLG0)(FLG0_NO_HAIR_SCALE | FLG0_UNK_200000));
@@ -2448,7 +2399,6 @@ void daMidna_c::setAnm() {
     }
 }
 
-/* 804C287C-804C2A68 0066DC 01EC+00 1/1 0/0 0/0 .text            getNeckAimAngle__9daMidna_cFPC4cXyzPsPsPsPs */
 s16 daMidna_c::getNeckAimAngle(cXyz const* i_atnPos, s16* o_neckX, s16* o_neckY, s16* o_eyeX, s16* o_eyeY) {
     cXyz eye_vec;
     s16 offset_y = mPrevShapeAngleY;
@@ -2481,7 +2431,6 @@ s16 daMidna_c::getNeckAimAngle(cXyz const* i_atnPos, s16* o_neckX, s16* o_neckY,
     return sVar2;
 }
 
-/* 804C2A68-804C2AB8 0068C8 0050+00 2/2 0/0 0/0 .text            clearEyeMove__9daMidna_cFv */
 void daMidna_c::clearEyeMove() {
     mpEyeMatAnm[0]->setNowOffsetX(0.0f);
     mpEyeMatAnm[1]->setNowOffsetX(0.0f);
@@ -2494,7 +2443,6 @@ void daMidna_c::clearEyeMove() {
     }
 }
 
-/* 804C2AB8-804C2EBC 006918 0404+00 1/1 0/0 0/0 .text            setEyeMove__9daMidna_cFPC4cXyzss */
 void daMidna_c::setEyeMove(cXyz const* i_atnPos, s16 i_angleX, s16 i_angleY) {
     daAlink_c* link = daAlink_getAlinkActorClass();
     u8 timer = mEyeMoveTimer;
@@ -2590,7 +2538,6 @@ void daMidna_c::setEyeMove(cXyz const* i_atnPos, s16 i_angleX, s16 i_angleY) {
     }
 }
 
-/* 804C2EBC-804C3168 006D1C 02AC+00 1/1 0/0 0/0 .text            setNeckAngle__9daMidna_cFv */
 void daMidna_c::setNeckAngle() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     BOOL clear_eye_move = mBtkHeap.getIdx() != 0x3A4 && !mBtkHeap.checkNoSetIdx() && mBtkHeap.getIdx() != 0x399;
@@ -2641,7 +2588,6 @@ void daMidna_c::setNeckAngle() {
     }
 }
 
-/* 804C3168-804C3298 006FC8 0130+00 1/1 0/0 0/0 .text            initHairAngle__9daMidna_cFv */
 void daMidna_c::initHairAngle() {
     static Vec const localOffset = {0.0f, 136.0f, -2.4f};
     MTXMultVec(mpShadowModel->getBaseTRMtx(), &localOffset, &mHairPos[0]);
@@ -2661,7 +2607,6 @@ void daMidna_c::initHairAngle() {
     onStateFlg0(FLG0_UNK_8);
 }
 
-/* 804C3298-804C3F04 0070F8 0C6C+00 2/2 0/0 0/0 .text            setHairAngle__9daMidna_cFv */
 void daMidna_c::setHairAngle() {
     if (!checkStateFlg0(FLG0_UNK_8)) {
         initHairAngle();
@@ -2828,7 +2773,6 @@ void daMidna_c::setHairAngle() {
     }
 }
 
-/* 804C3F04-804C4394 007D64 0490+00 1/1 0/0 0/0 .text            setDemoData__9daMidna_cFv */
 void daMidna_c::setDemoData() {
     if (!dComIfGp_event_runCheck()) {
         mStaffID = -1;
@@ -2953,7 +2897,6 @@ void daMidna_c::setDemoData() {
     }
 }
 
-/* 804C4394-804C4444 0081F4 00B0+00 1/1 0/0 0/0 .text            setSimpleBrk__9daMidna_cFP12J3DModelDataUs */
 J3DAnmTevRegKey* daMidna_c::setSimpleBrk(J3DModelData* i_modelData, u16 i_idx) {
     J3DAnmTevRegKey* brk = static_cast<J3DAnmTevRegKey*>(dComIfG_getObjectRes(l_arcName, i_idx));
     if (brk == NULL) {
@@ -2966,7 +2909,6 @@ J3DAnmTevRegKey* daMidna_c::setSimpleBrk(J3DModelData* i_modelData, u16 i_idx) {
     return brk;
 }
 
-/* 804C4444-804C44CC 0082A4 0088+00 1/1 0/0 0/0 .text            setSimpleBtk__9daMidna_cFP12J3DModelDataUs */
 J3DAnmTextureSRTKey* daMidna_c::setSimpleBtk(J3DModelData* i_modelData, u16 i_idx) {
     J3DAnmTextureSRTKey* btk = static_cast<J3DAnmTextureSRTKey*>(dComIfG_getObjectRes(l_arcName, i_idx));
     if (btk == NULL) {
@@ -2979,7 +2921,6 @@ J3DAnmTextureSRTKey* daMidna_c::setSimpleBtk(J3DModelData* i_modelData, u16 i_id
     return btk;
 }
 
-/* 804C44CC-804C4750 00832C 0284+00 1/1 0/0 0/0 .text            initMidnaModel__9daMidna_cFv */
 void daMidna_c::initMidnaModel() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     if (checkStateFlg1(FLG1_UNK_1)) {
@@ -3052,7 +2993,6 @@ void daMidna_c::initMidnaModel() {
     }
 }
 
-/* 804C4750-804C49B8 0085B0 0268+00 2/2 0/0 0/0 .text            daMidna_searchNpc__FP10fopAc_ac_cPv */
 static void* daMidna_searchNpc(fopAc_ac_c* i_actor, void* o_far) {
     daAlink_c* link = daAlink_getAlinkActorClass();
     cXyz link_pos = link->current.pos;
@@ -3081,7 +3021,6 @@ static void* daMidna_searchNpc(fopAc_ac_c* i_actor, void* o_far) {
     return NULL;
 }
 
-/* 804C49B8-804C4AE8 008818 0130+00 2/2 0/0 0/0 .text            setMidnaNoDrawFlg__9daMidna_cFv */
 void daMidna_c::setMidnaNoDrawFlg() {
     if (
         (!checkStateFlg1((daMidna_FLG1)(FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE | FLG1_UNK_1)) &&
@@ -3107,7 +3046,6 @@ void daMidna_c::setMidnaNoDrawFlg() {
     }
 }
 
-/* 804C4AE8-804C4B68 008948 0080+00 1/0 0/0 0/0 .text checkMetamorphoseEnableBase__9daMidna_cFv */
 BOOL daMidna_c::checkMetamorphoseEnableBase() {
     BOOL tmp;
     if (
@@ -3121,13 +3059,11 @@ BOOL daMidna_c::checkMetamorphoseEnableBase() {
     return TRUE;
 }
 
-/* 804C4B68-804C4BC0 0089C8 0058+00 1/1 0/0 0/0 .text            checkNoDrawState__9daMidna_cFv */
 BOOL daMidna_c::checkNoDrawState() {
     return mDemoMode == 0xB || checkStateFlg0(FLG0_UNK_400000) ||
            checkStateFlg1(FLG1_UNK_20) || (checkStateFlg0(FLG0_NO_DRAW) && !checkShadowModelDrawSmode());
 }
 
-/* 804C4BC0-804C4FDC 008A20 041C+00 1/1 0/0 0/0 .text            setSound__9daMidna_cFv */
 void daMidna_c::setSound() {
     static u32 const anmSoundLabel[4][2] = {
         Z2SE_MDN_HIP, Z2SE_MDN_HIP_WTR,
@@ -3203,7 +3139,6 @@ void daMidna_c::setSound() {
     }
 }
 
-/* 804C4FDC-804C59E8 008E3C 0A0C+00 1/1 0/0 0/0 .text            execute__9daMidna_cFv */
 int daMidna_c::execute() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     if (!link->checkMetamorphose()) {
@@ -3409,12 +3344,10 @@ int daMidna_c::execute() {
     return 1;
 }
 
-/* 804C59E8-804C5A08 009848 0020+00 1/0 0/0 0/0 .text            daMidna_Execute__FP9daMidna_c */
 static int daMidna_Execute(daMidna_c* i_this) {
     return i_this->execute();
 }
 
-/* 804C5A08-804C6184 009868 077C+00 1/1 0/0 0/0 .text            draw__9daMidna_cFv */
 int daMidna_c::draw() {
     daAlink_c* link = daAlink_getAlinkActorClass();
 
@@ -3630,12 +3563,10 @@ int daMidna_c::draw() {
     return 1;
 }
 
-/* 804C6184-804C61A4 009FE4 0020+00 1/0 0/0 0/0 .text            daMidna_Draw__FP9daMidna_c */
 static int daMidna_Draw(daMidna_c* i_this) {
     return i_this->draw();
 }
 
-/* 804C61A4-804C6324 00A004 0180+00 1/1 0/0 0/0 .text            __dt__9daMidna_cFv */
 daMidna_c::~daMidna_c() {
     #if DEBUG
     if (mpHIO != NULL) {
@@ -3648,7 +3579,6 @@ daMidna_c::~daMidna_c() {
     mSound.deleteObject();
 }
 
-/* 804C6324-804C634C 00A184 0028+00 1/0 0/0 0/0 .text            daMidna_Delete__FP9daMidna_c */
 static int daMidna_Delete(daMidna_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->~daMidna_c();
@@ -3661,7 +3591,6 @@ static void dummy() {
 }
 template unsigned char cLib_calcTimer<unsigned char>(unsigned char*);
 
-/* 804C6C40-804C6C60 -00001 0020+00 1/0 0/0 0/0 .data            l_daMidna_Method */
 static actor_method_class l_daMidna_Method = {
     (process_method_func)daMidna_Create,
     (process_method_func)daMidna_Delete,
@@ -3670,7 +3599,6 @@ static actor_method_class l_daMidna_Method = {
     (process_method_func)daMidna_Draw,
 };
 
-/* 804C6C60-804C6C90 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MIDNA */
 extern actor_process_profile_definition g_profile_MIDNA = {
     fpcLy_CURRENT_e,
     6,
diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp
index 792f1e7fe9..18011da632 100644
--- a/src/d/actor/d_a_mirror.cpp
+++ b/src/d/actor/d_a_mirror.cpp
@@ -14,28 +14,22 @@
 #include "dolphin/gf/GFLight.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 80870BB8-80870BD8 000078 0020+00 1/1 0/0 0/0 .text daMirror_c_createHeap__FP10fopAc_ac_c */
 static BOOL daMirror_c_createHeap(fopAc_ac_c* i_this) {
     return ((daMirror_c*)i_this)->createHeap();
 }
 
-/* 80872660-80872664 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Mirror";
 
-/* 80872664-80872668 -00001 0004+00 2/2 0/0 0/0 .data            l_arcName2 */
 static char* l_arcName2 = "MR-Table";
 
-/* 80870BD8-80870C54 000098 007C+00 1/1 0/0 0/0 .text            __ct__16dMirror_packet_cFv */
 dMirror_packet_c::dMirror_packet_c() {
     reset();
 }
 
-/* 80870C94-80870CA0 000154 000C+00 2/2 0/0 0/0 .text            reset__16dMirror_packet_cFv */
 void dMirror_packet_c::reset() {
     mModelCount = 0;
 }
 
-/* 80870CA0-80870D58 000160 00B8+00 1/1 0/0 0/0 .text            calcMinMax__16dMirror_packet_cFv */
 void dMirror_packet_c::calcMinMax() {
     mMinVal.set(FLT_MAX, FLT_MAX, FLT_MAX);
     mMaxVal.set(-FLT_MAX, -FLT_MAX, -FLT_MAX);
@@ -74,7 +68,6 @@ void dMirror_packet_c::calcMinMax() {
     }
 }
 
-/* 80870D58-80870D88 000218 0030+00 1/1 0/0 0/0 .text entryModel__16dMirror_packet_cFP8J3DModel */
 int dMirror_packet_c::entryModel(J3DModel* i_model) {
     if (mModelCount >= 0x40) {
         return 0;
@@ -84,8 +77,6 @@ int dMirror_packet_c::entryModel(J3DModel* i_model) {
     return 1;
 }
 
-/* 80870D88-80871268 000248 04E0+00 1/1 0/0 0/0 .text mirrorZdraw__16dMirror_packet_cFPfPfffffff
- */
 void dMirror_packet_c::mirrorZdraw(f32* param_0, f32* param_1, f32 param_2, f32 param_3,
                                    f32 param_4, f32 param_5, f32 param_6, f32 param_7) {
     GXSetNumChans(1);
@@ -189,8 +180,6 @@ void dMirror_packet_c::mirrorZdraw(f32* param_0, f32* param_1, f32 param_2, f32
     GXSetAlphaUpdate(GX_DISABLE);
 }
 
-/* 80871268-8087146C 000728 0204+00 1/1 0/0 0/0 .text
- * modelDraw__16dMirror_packet_cFP8J3DModelPA4_f                */
 void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
     Mtx& model_mtx = i_model->getBaseTRMtx();
     cXyz sp28(model_mtx[0][3], model_mtx[1][3], model_mtx[2][3]);
@@ -246,7 +235,6 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) {
     }
 }
 
-/* 8087146C-80871D84 00092C 0918+00 1/1 0/0 0/1 .text            mainDraw__16dMirror_packet_cFv */
 void dMirror_packet_c::mainDraw() {
     j3dSys.reinitGX();
 
@@ -439,7 +427,6 @@ void dMirror_packet_c::mainDraw() {
     }
 }
 
-/* 80871D84-80871E24 001244 00A0+00 1/0 0/0 0/0 .text            draw__16dMirror_packet_cFv */
 void dMirror_packet_c::draw() {
     mDoLib_clipper::changeFar(dComIfGd_getView()->far);
     if (!mDoLib_clipper::clip(j3dSys.getViewMtx(), &mMaxVal, &mMinVal)) {
@@ -450,15 +437,12 @@ void dMirror_packet_c::draw() {
     reset();
 }
 
-/* 80871E24-80871E84 0012E4 0060+00 1/1 0/0 0/0 .text            __ct__10daMirror_cFv */
 daMirror_c::daMirror_c() {
     m_entryModel = &daMirror_c::entryModel;
 }
 
-/* 80871E84-80871F08 001344 0084+00 1/0 0/0 0/0 .text            __dt__16dMirror_packet_cFv */
 dMirror_packet_c::~dMirror_packet_c() {}
 
-/* 80871F08-80871F78 0013C8 0070+00 1/1 0/0 0/0 .text            createHeap__10daMirror_cFv */
 BOOL daMirror_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -469,7 +453,6 @@ BOOL daMirror_c::createHeap() {
     return true;
 }
 
-/* 80871F78-80872018 001438 00A0+00 1/1 0/0 0/0 .text            setModelMtx__10daMirror_cFv */
 void daMirror_c::setModelMtx() {
     mpModel->setBaseScale(scale);
 
@@ -480,13 +463,11 @@ void daMirror_c::setModelMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80872018-8087206C 0014D8 0054+00 1/0 0/0 0/0 .text            daMirror_create__FP10daMirror_c */
 static int daMirror_create(daMirror_c* i_this) {
     fopAcM_ct(i_this, daMirror_c);
     return i_this->daMirror_c::create();
 }
 
-/* 8087206C-80872344 00152C 02D8+00 2/2 0/0 0/0 .text            create__10daMirror_cFv */
 int daMirror_c::create() {
     if (getSw() != 0xFF && !fopAcM_isSwitch(this, getSw())) {
         return cPhs_COMPLEATE_e;
@@ -574,17 +555,14 @@ int daMirror_c::Delete() {
     return 1;
 }
 
-/* 80872344-808723C4 001804 0080+00 1/0 0/0 0/0 .text            daMirror_Delete__FP10daMirror_c */
 static int daMirror_Delete(daMirror_c* i_this) {
     return i_this->Delete();
 }
 
-/* 808723C4-808723E4 001884 0020+00 1/0 0/0 0/0 .text            daMirror_execute__FP10daMirror_c */
 static int daMirror_execute(daMirror_c* i_this) {
     return i_this->execute();
 }
 
-/* 808723E4-808724C0 0018A4 00DC+00 1/1 0/0 0/0 .text            execute__10daMirror_cFv */
 int daMirror_c::execute() {
     if (this != m_myObj) {
         if (m_myObj == NULL) {
@@ -625,25 +603,20 @@ int daMirror_c::draw() {
     return 1;
 }
 
-/* 808724C0-80872560 001980 00A0+00 1/0 0/0 0/0 .text            daMirror_draw__FP10daMirror_c */
 static int daMirror_draw(daMirror_c* i_this) {
     return i_this->draw();
 }
 
-/* 80872560-80872584 001A20 0024+00 1/0 0/0 0/0 .text            entryModel__10daMirror_cFP8J3DModel
- */
 int daMirror_c::entryModel(J3DModel* i_model) {
     return mPacket.entryModel(i_model);
 }
 
-/* 80872674-80872694 -00001 0020+00 1/0 0/0 0/0 .data            daMirror_METHODS */
 static actor_method_class daMirror_METHODS = {
     (process_method_func)daMirror_create,  (process_method_func)daMirror_Delete,
     (process_method_func)daMirror_execute, (process_method_func)NULL,
     (process_method_func)daMirror_draw,
 };
 
-/* 80872694-808726C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MIRROR */
 extern actor_process_profile_definition g_profile_MIRROR = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp
index c00c91b638..518ab1fa56 100644
--- a/src/d/actor/d_a_movie_player.cpp
+++ b/src/d/actor/d_a_movie_player.cpp
@@ -25,7 +25,6 @@
 extern "C" {
 #endif
 
-/* 80872758-80872BF0 000078 0498+00 1/1 0/0 0/0 .text            THPAudioDecode */
 // NONMATCHING
 static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag) {
     THPAudioRecordHeader* header;
@@ -166,7 +165,6 @@ static u32 THPAudioDecode(s16* audioBuffer, u8* audioFrame, s32 flag) {
     return header->sampleSize;
 }
 
-/* 80872BF0-80872C80 000510 0090+00 1/1 0/0 0/0 .text            __THPAudioGetNewSample */
 static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info) {
     s32 sample;
 
@@ -188,7 +186,6 @@ static s32 __THPAudioGetNewSample(THPAudioDecodeInfo* info) {
     return sample;
 }
 
-/* 80872C80-80872CBC 0005A0 003C+00 1/1 0/0 0/0 .text            __THPAudioInitialize */
 static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr) {
     info->encodeData = ptr;
     info->offsetNibbles = 2;
@@ -197,73 +194,50 @@ static void __THPAudioInitialize(THPAudioDecodeInfo* info, u8* ptr) {
     info->encodeData++;
 }
 
-/* 808795E0-80879A40 000040 0460+00 0/0 0/0 0/0 .bss             THPStatistics */
-static u8 THPStatistics[1120] ALIGN_DECL(32);
+static u8 THPStatistics[1120] ATTRIBUTE_ALIGN(32);
 
-/* 80879A40-80879A44 0004A0 0004+00 1/2 0/0 0/0 .bss             Ydchuff */
-static THPHuffmanTab* Ydchuff ALIGN_DECL(32);
+static THPHuffmanTab* Ydchuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A44-80879A48 0004A4 0004+00 1/2 0/0 0/0 .bss             Udchuff */
-static THPHuffmanTab* Udchuff ALIGN_DECL(32);
+static THPHuffmanTab* Udchuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A48-80879A4C 0004A8 0004+00 1/2 0/0 0/0 .bss             Vdchuff */
-static THPHuffmanTab* Vdchuff ALIGN_DECL(32);
+static THPHuffmanTab* Vdchuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A4C-80879A50 0004AC 0004+00 1/2 0/0 0/0 .bss             Yachuff */
-static THPHuffmanTab* Yachuff ALIGN_DECL(32);
+static THPHuffmanTab* Yachuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A50-80879A54 0004B0 0004+00 1/2 0/0 0/0 .bss             Uachuff */
-static THPHuffmanTab* Uachuff ALIGN_DECL(32);
+static THPHuffmanTab* Uachuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A54-80879A60 0004B4 0004+08 1/2 0/0 0/0 .bss             Vachuff */
-static THPHuffmanTab* Vachuff ALIGN_DECL(32);
+static THPHuffmanTab* Vachuff ATTRIBUTE_ALIGN(32);
 
-/* 80879A60-80879B60 0004C0 0100+00 0/2 0/0 0/0 .bss             __THPIDCTWorkspace */
-static f32 __THPIDCTWorkspace[64] ALIGN_DECL(32);
+static f32 __THPIDCTWorkspace[64] ATTRIBUTE_ALIGN(32);
 
-/* 80879B60-80879B64 0005C0 0004+00 1/3 0/0 0/0 .bss             __THPHuffmanBits */
 static u8* __THPHuffmanBits;
 
-/* 80879B64-80879B68 0005C4 0004+00 2/3 0/0 0/0 .bss             __THPHuffmanSizeTab */
 static u8* __THPHuffmanSizeTab;
 
-/* 80879B68-80879B6C 0005C8 0004+00 1/3 0/0 0/0 .bss             __THPHuffmanCodeTab */
 static u16* __THPHuffmanCodeTab;
 
-/* 80879B6C-80879B80 0005CC 0004+10 0/5 0/0 0/0 .bss             Gbase */
-static THPSample* Gbase ALIGN_DECL(32);
+static THPSample* Gbase ATTRIBUTE_ALIGN(32);
 
-/* 80879B80-80879B84 0005E0 0004+00 0/5 0/0 0/0 .bss             Gwid */
-static u32 Gwid ALIGN_DECL(32);
+static u32 Gwid ATTRIBUTE_ALIGN(32);
 
-/* 80879B84-80879B88 0005E4 0004+00 0/5 0/0 0/0 .bss             Gq */
-static f32* Gq ALIGN_DECL(32);
+static f32* Gq ATTRIBUTE_ALIGN(32);
 
-/* 80879B88-80879B94 0005E8 000C+00 0/2 0/0 0/0 .bss             __THPLCWork512 */
 static u8* __THPLCWork512[3];
 
-/* 80879B94-80879BA0 0005F4 000C+00 0/3 0/0 0/0 .bss             __THPLCWork640 */
 static u8* __THPLCWork640[3];
 
-/* 80879BA0-80879BA4 000600 0004+00 2/2 0/0 0/0 .bss             __THPOldGQR5 */
 static u32 __THPOldGQR5;
 
-/* 80879BA4-80879BA8 000604 0004+00 2/2 0/0 0/0 .bss             __THPOldGQR6 */
 static u32 __THPOldGQR6;
 
-/* 80879BA8-80879BAC 000608 0004+00 1/3 0/0 0/0 .bss             __THPWorkArea */
 static u8* __THPWorkArea;
 
-/* 80879BAC-80879BC4 00060C 0018+00 1/4 0/0 0/0 .bss             __THPMCUBuffer */
 static THPCoeff* __THPMCUBuffer[6];
 
-/* 80879BC4-80879BC8 000624 0004+00 5/12 0/0 0/0 .bss             __THPInfo */
 static THPFileInfo* __THPInfo;
 
-/* 80879BC8-80879BD0 000628 0004+04 0/2 0/0 0/0 .bss             __THPInitFlag */
 static BOOL __THPInitFlag;
 
-/* 80872CBC-80872F00 0005DC 0244+00 1/1 0/0 0/0 .text            THPVideoDecode */
 static s32 THPVideoDecode(void* file, void* tileY, void* tileU, void* tileV, void* work) {
     u8 all_done, status;
     s32 errorCode;
@@ -415,7 +389,6 @@ _err_exit:
     return errorCode;
 }
 
-/* 80872F00-80872F48 000820 0048+00 1/1 0/0 0/0 .text            __THPSetupBuffers */
 static void __THPSetupBuffers() {
     u8 i;
     THPCoeff* buffer;
@@ -427,7 +400,6 @@ static void __THPSetupBuffers() {
     }
 }
 
-/* 80872F48-80873088 000868 0140+00 1/1 0/0 0/0 .text            __THPReadFrameHeader */
 static u8 __THPReadFrameHeader() {
     u8 i, utmp8;
 
@@ -464,7 +436,6 @@ static u8 __THPReadFrameHeader() {
 
 #define THPROUNDUP(a, b) ((((s32)(a)) + ((s32)(b)-1L)) / ((s32)(b)))
 
-/* 80873088-808731B4 0009A8 012C+00 1/1 0/0 0/0 .text            __THPReadScaneHeader */
 static u8 __THPReadScaneHeader() {
     u8 i, utmp8;
     __THPInfo->c += 2;
@@ -499,7 +470,6 @@ static u8 __THPReadScaneHeader() {
     return 0;
 }
 
-/* 80879034-80879084 000000 0050+00 8/8 0/0 0/0 .rodata          __THPJpegNaturalOrder */
 static const u8 __THPJpegNaturalOrder[80] = {
     0,  1,  8,  16, 9,  2,  3,  10, 17, 24, 32, 25, 18, 11, 4,  5,  12, 19, 26, 33,
     40, 48, 41, 34, 27, 20, 13, 6,  7,  14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36,
@@ -507,12 +477,10 @@ static const u8 __THPJpegNaturalOrder[80] = {
     47, 55, 62, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63,
 };
 
-/* 80879084-808790C4 000050 0040+00 1/1 0/0 0/0 .rodata          __THPAANScaleFactor */
 static const f64 __THPAANScaleFactor[8] = {
     1.0f, 1.387039845f, 1.306562965f, 1.175875602f, 1.0f, 0.785694958f, 0.541196100f, 0.275899379f,
 };
 
-/* 808731B4-80873574 000AD4 03C0+00 1/1 0/0 0/0 .text            __THPReadQuantizationTable */
 static u8 __THPReadQuantizationTable() {
     int length;
     u16 id, i, row, col;
@@ -548,8 +516,6 @@ static u8 __THPReadQuantizationTable() {
 	return 0;
 }
 
-/* 80873574-8087375C 000E94 01E8+00 1/1 0/0 0/0 .text            __THPReadHuffmanTableSpecification
- */
 static u8 __THPReadHuffmanTableSpecification() {
     u8 t_class, id, i, tab_index;
     u16 length, num_Vij;
@@ -588,7 +554,6 @@ static u8 __THPReadHuffmanTableSpecification() {
     return 0;
 }
 
-/* 8087375C-8087383C 00107C 00E0+00 1/1 0/0 0/0 .text            __THPHuffGenerateSizeTable */
 static void __THPHuffGenerateSizeTable() {
     s32 p, l, i;
     p = 0;
@@ -603,7 +568,6 @@ static void __THPHuffGenerateSizeTable() {
     __THPHuffmanSizeTab[p] = 0;
 }
 
-/* 8087383C-808738B0 00115C 0074+00 1/1 0/0 0/0 .text            __THPHuffGenerateCodeTable */
 static void __THPHuffGenerateCodeTable() {
     u8 si;
     u16 p, code;
@@ -623,7 +587,6 @@ static void __THPHuffGenerateCodeTable() {
     }
 }
 
-/* 808738B0-808739A8 0011D0 00F8+00 1/1 0/0 0/0 .text            __THPHuffGenerateDecoderTables */
 static void __THPHuffGenerateDecoderTables(u8 tabIndex) {
     s32 p, l;
     THPHuffmanTab* h;
@@ -644,7 +607,6 @@ static void __THPHuffGenerateDecoderTables(u8 tabIndex) {
     h->maxCode[17] = 0xfffffL;
 }
 
-/* 808739A8-80873A04 0012C8 005C+00 1/1 0/0 0/0 .text            __THPRestartDefinition */
 static void __THPRestartDefinition() {
     __THPInfo->RST = TRUE;
     __THPInfo->c += 2;
@@ -653,7 +615,6 @@ static void __THPRestartDefinition() {
     __THPInfo->currMCU = __THPInfo->nMCU;
 }
 
-/* 80873A04-80873C44 001324 0240+00 1/1 0/0 0/0 .text            __THPPrepBitStream */
 static void __THPPrepBitStream() {
     u32* ptr;
     u32 offset, i, j, k;
@@ -714,7 +675,6 @@ static void __THPPrepBitStream() {
     }
 }
 
-/* 80873C44-80873D28 001564 00E4+00 1/1 0/0 0/0 .text            __THPDecompressYUV */
 static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV) {
     u16 currentY, targetY;
     __THPInfo->dLC[0] = (u8*)tileY;
@@ -747,14 +707,13 @@ static void __THPDecompressYUV(void* tileY, void* tileU, void* tileV) {
     __THPGQRRestore();
 }
 
-/* 80873D28-80873D48 001648 0020+00 1/1 0/0 0/0 .text            __THPGQRRestore */
 static void __THPGQRRestore() {
+#ifdef __MWERKS__
     register u32 tmp1, tmp2;
     tmp1 = __THPOldGQR5;
     tmp2 = __THPOldGQR6;
 
     // clang-format off
-#ifdef __MWERKS__
     asm {
         mtspr   GQR5, tmp1;
         mtspr   GQR6, tmp2;
@@ -763,24 +722,19 @@ static void __THPGQRRestore() {
     // clang-format on
 }
 
-/* 80873D48-80873D7C 001668 0034+00 1/1 0/0 0/0 .text            __THPGQRSetup */
 static void __THPGQRSetup() {
+#ifdef __MWERKS__
     register u32 tmp1, tmp2;
 
     // clang-format off
-#ifdef __MWERKS__
     asm {
         mfspr   tmp1, GQR5;
         mfspr   tmp2, GQR6;
     }
-#endif
-    // clang-format on
 
     __THPOldGQR5 = tmp1;
     __THPOldGQR6 = tmp2;
 
-    // clang-format off
-#ifdef __MWERKS__
     asm {
         li      r3, 0x0007
         oris    r3, r3, 0x0007
@@ -793,7 +747,6 @@ static void __THPGQRSetup() {
     // clang-format on
 }
 
-/* 80873D7C-80873FBC 00169C 0240+00 1/1 0/0 0/0 .text            __THPDecompressiMCURow512x448 */
 static void __THPDecompressiMCURow512x448() {
     u8 cl_num;
     u32 x_pos;
@@ -855,8 +808,8 @@ static void __THPDecompressiMCURow512x448() {
     __THPInfo->dLC[2] += 0x800;
 }
 
-/* 80873FBC-8087445C 0018DC 04A0+00 3/3 0/0 0/0 .text            __THPInverseDCTY8 */
 static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) {
+#ifdef __MWERKS__
     register f32 *q, *ws;
     register f32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8, tmp9;
     register f32 tmp10, tmp11, tmp12, tmp13;
@@ -874,7 +827,6 @@ static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) {
         register u32 itmp0, itmp1, itmp2, itmp3;
 
         // clang-format off
-#ifdef __MWERKS__
         asm {
             li          itmp2, 8
             mtctr       itmp2
@@ -1033,7 +985,6 @@ static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) {
         _loopEnd:
 
         }
-#endif
         // clang-format on
     }
 
@@ -1047,7 +998,6 @@ static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) {
         register THPSample *out0, *out1;
 
         // clang-format off
-#ifdef __MWERKS__
         asm {
             psq_l       tmp10, 8*0*sizeof(f32)(ws), 0, 0
             slwi off0, wid, 3;
@@ -1165,13 +1115,13 @@ static void __THPInverseDCTY8(register THPCoeff* in, register u32 xPos) {
             psq_st      tmp21, 8(out1), 0, 6
 
         }
-#endif
         // clang-format on
     }
+#endif
 }
 
-/* 8087445C-808748F4 001D7C 0498+00 3/3 0/0 0/0 .text            __THPInverseDCTNoYPos */
 static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) {
+#ifdef __MWERKS__
     register f32 *q, *ws;
     register f32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8, tmp9;
     register f32 tmp10, tmp11, tmp12, tmp13;
@@ -1187,7 +1137,6 @@ static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) {
     {
         register u32 itmp0, itmp1, itmp2, itmp3;
         // clang-format off
-#ifdef __MWERKS__
         asm {
             li          itmp2, 8
             mtctr       itmp2
@@ -1346,7 +1295,6 @@ static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) {
         _loopEnd:
 
         }
-#endif
         // clang-format on
     }
 
@@ -1360,7 +1308,6 @@ static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) {
         register THPSample *out0, *out1;
 
         // clang-format off
-#ifdef __MWERKS__
         asm {
             psq_l       tmp10, 8*0*sizeof(f32)(ws), 0, 0
             slwi        xPos, xPos, 2
@@ -1475,12 +1422,11 @@ static void __THPInverseDCTNoYPos(register THPCoeff* in, register u32 xPos) {
             psq_st      tmp20, 0(out1), 0, 6
             psq_st      tmp21, 8(out1), 0, 6
         }
-#endif
         // clang-format on
     }
+#endif
 }
 
-/* 808748F4-80874B38 002214 0244+00 1/1 0/0 0/0 .text            __THPDecompressiMCURow640x480 */
 static void __THPDecompressiMCURow640x480() {
     u8 cl_num;
     u32 x_pos;
@@ -1548,7 +1494,6 @@ static void __THPDecompressiMCURow640x480() {
     __THPInfo->dLC[2] += 0xA00;
 }
 
-/* 80874B38-80874D8C 002458 0254+00 1/1 0/0 0/0 .text            __THPDecompressiMCURowNxN */
 static void __THPDecompressiMCURowNxN() {
     u8 cl_num;
     u32 x_pos, x;
@@ -1613,7 +1558,6 @@ static void __THPDecompressiMCURowNxN() {
     __THPInfo->dLC[2] += ((sizeof(u8) * 64) * (x / 16));
 }
 
-/* 80874D8C-80875198 0026AC 040C+00 3/3 0/0 0/0 .text            __THPHuffDecodeDCTCompY */
 static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block) {
     {
         register s32 t;
@@ -2048,7 +1992,6 @@ static void __THPHuffDecodeDCTCompY(register THPFileInfo* info, THPCoeff* block)
     }
 }
 
-/* 80875198-80875410 002AB8 0278+00 3/3 0/0 0/0 .text            __THPHuffDecodeTab */
 static s32 __THPHuffDecodeTab(register THPFileInfo* info, register THPHuffmanTab* h) {
     register s32 code;
     register u32 cnt;
@@ -2319,7 +2262,6 @@ _FailedCheckNoBits1:
     return (h->Vij[(s32)(code + h->valPtr[cnt])]);
 }
 
-/* 80875410-808755F8 002D30 01E8+00 3/3 0/0 0/0 .text            __THPHuffDecodeDCTCompU */
 static void __THPHuffDecodeDCTCompU(register THPFileInfo* info, THPCoeff* block) {
     register s32 t;
     register THPCoeff diff;
@@ -2464,7 +2406,6 @@ static void __THPHuffDecodeDCTCompU(register THPFileInfo* info, THPCoeff* block)
     }
 }
 
-/* 808755F8-808757E0 002F18 01E8+00 3/3 0/0 0/0 .text            __THPHuffDecodeDCTCompV */
 static void __THPHuffDecodeDCTCompV(register THPFileInfo* info, THPCoeff* block) {
     register s32 t;
     register THPCoeff diff;
@@ -2612,7 +2553,6 @@ static void __THPHuffDecodeDCTCompV(register THPFileInfo* info, THPCoeff* block)
     }
 }
 
-/* 808757E0-8087584C 003100 006C+00 1/1 0/0 0/0 .text            THPInit */
 static BOOL THPInit() {
     u8* base;
     base = (u8*)(0xE000 << 16);
@@ -2642,77 +2582,60 @@ static BOOL THPInit() {
 }
 #endif
 
-/* 80879BD0-80879DA0 000630 01D0+00 28/29 0/0 0/0 .bss             daMP_ActivePlayer */
 static daMP_THPPlayer daMP_ActivePlayer;
 
-/* 80879DA0-80879DA4 000800 0004+00 2/3 0/0 0/0 .bss             daMP_ReadThreadCreated */
 static BOOL daMP_ReadThreadCreated;
 
-/* 80879DA4-80879DC4 000804 0020+00 2/3 0/0 0/0 .bss             daMP_FreeReadBufferQueue */
 static OSMessageQueue daMP_FreeReadBufferQueue;
 
-/* 80879DC4-80879DE4 000824 0020+00 2/3 0/0 0/0 .bss             daMP_ReadedBufferQueue */
 static OSMessageQueue daMP_ReadedBufferQueue;
 
-/* 80875880-808758B4 0031A0 0034+00 2/2 0/0 0/0 .text            daMP_PopReadedBuffer__Fv */
 void* daMP_PopReadedBuffer() {
     OSMessage buffer;
     OSReceiveMessage(&daMP_ReadedBufferQueue, &buffer, 1);
     return buffer;
 }
 
-/* 808758B4-808758E4 0031D4 0030+00 1/1 0/0 0/0 .text            daMP_PushReadedBuffer__FPv */
 void daMP_PushReadedBuffer(void* buffer) {
     OSSendMessage(&daMP_ReadedBufferQueue, buffer, 1);
 }
 
-/* 808758E4-80875918 003204 0034+00 1/1 0/0 0/0 .text            daMP_PopFreeReadBuffer__Fv */
 void* daMP_PopFreeReadBuffer() {
     OSMessage buffer;
     OSReceiveMessage(&daMP_FreeReadBufferQueue, &buffer, 1);
     return buffer;
 }
 
-/* 80875918-80875948 003238 0030+00 2/2 0/0 0/0 .text            daMP_PushFreeReadBuffer__FPv */
 void daMP_PushFreeReadBuffer(void* buffer) {
     OSSendMessage(&daMP_FreeReadBufferQueue, buffer, 1);
 }
 
-/* 80879DE4-80879E04 000844 0020+00 2/3 0/0 0/0 .bss             daMP_ReadedBufferQueue2 */
 static OSMessageQueue daMP_ReadedBufferQueue2;
 
-/* 80875948-8087597C 003268 0034+00 1/1 0/0 0/0 .text            daMP_PopReadedBuffer2__Fv */
 void* daMP_PopReadedBuffer2() {
     OSMessage buffer;
     OSReceiveMessage(&daMP_ReadedBufferQueue2, &buffer, 1);
     return buffer;
 }
 
-/* 8087597C-808759AC 00329C 0030+00 1/1 0/0 0/0 .text            daMP_PushReadedBuffer2__FPv */
 void daMP_PushReadedBuffer2(void* buffer) {
     OSSendMessage(&daMP_ReadedBufferQueue2, buffer, 1);
 }
 
-/* 80879E04-80879E2C 000864 0028+00 0/1 0/0 0/0 .bss             daMP_FreeReadBufferMessage */
 static OSMessage daMP_FreeReadBufferMessage[10];
 
-/* 80879E2C-80879E54 00088C 0028+00 0/1 0/0 0/0 .bss             daMP_ReadedBufferMessage */
 static OSMessage daMP_ReadedBufferMessage[10];
 
-/* 80879E54-80879E80 0008B4 0028+04 0/1 0/0 0/0 .bss             daMP_ReadedBufferMessage2 */
 static OSMessage daMP_ReadedBufferMessage2[10];
 
-/* 80879E80-8087A198 0008E0 0318+00 3/4 0/0 0/0 .bss             daMP_ReadThread */
 static OSThread daMP_ReadThread;
 
-/* 808759AC-808759E4 0032CC 0038+00 1/1 0/0 0/0 .text            daMP_ReadThreadStart__Fv */
 void daMP_ReadThreadStart() {
     if (daMP_ReadThreadCreated) {
         OSResumeThread(&daMP_ReadThread);
     }
 }
 
-/* 808759E4-80875A28 003304 0044+00 1/1 0/0 0/0 .text            daMP_ReadThreadCancel__Fv */
 void daMP_ReadThreadCancel() {
     if (daMP_ReadThreadCreated) {
         OSCancelThread(&daMP_ReadThread);
@@ -2720,7 +2643,6 @@ void daMP_ReadThreadCancel() {
     }
 }
 
-/* 80875A28-80875B0C 003348 00E4+00 1/1 0/0 0/0 .text            daMP_Reader__FPv */
 void* daMP_Reader(void*) {
     daMP_THPReadBuffer* buf;
 	s32 curFrame;
@@ -2762,13 +2684,10 @@ void* daMP_Reader(void*) {
 	}
 }
 
-/* 8087A198-8087C198 000BF8 2000+00 0/1 0/0 0/0 .bss             daMP_ReadThreadStack */
 static u8 daMP_ReadThreadStack[0x2000];
 
-/* 8087C198-8087C1A0 002BF8 0004+04 2/4 0/0 0/0 .bss             daMP_VideoDecodeThreadCreated */
 static BOOL daMP_VideoDecodeThreadCreated;
 
-/* 80875B18-80875BC8 003438 00B0+00 1/1 0/0 0/0 .text            daMP_CreateReadThread__Fl */
 static BOOL daMP_CreateReadThread(s32 param_0) {
     if (!OSCreateThread(&daMP_ReadThread, daMP_Reader, 0, daMP_ReadThreadStack + sizeof(daMP_ReadThreadStack), sizeof(daMP_ReadThreadStack), param_0, 1)) {
         OSReport("Can't create read thread\n");
@@ -2782,31 +2701,24 @@ static BOOL daMP_CreateReadThread(s32 param_0) {
     return TRUE;
 }
 
-/* 8087C1A0-8087C4B8 002C00 0318+00 4/5 0/0 0/0 .bss             daMP_VideoDecodeThread */
 static OSThread daMP_VideoDecodeThread;
 
-/* 8087C4B8-808E04B8 002F18 64000+00 1/1 0/0 0/0 .bss             daMP_VideoDecodeThreadStack */
 static u8 daMP_VideoDecodeThreadStack[0x64000];
 
-/* 808E04B8-808E04D8 066F18 0020+00 2/2 0/0 0/0 .bss             daMP_FreeTextureSetQueue */
 static OSMessageQueue daMP_FreeTextureSetQueue;
 
-/* 80875BC8-80875BFC 0034E8 0034+00 1/1 0/0 0/0 .text            daMP_PopFreeTextureSet__Fv */
 void* daMP_PopFreeTextureSet() {
     OSMessage tex;
     OSReceiveMessage(&daMP_FreeTextureSetQueue, &tex, 1);
     return tex;
 }
 
-/* 80875BFC-80875C2C 00351C 0030+00 2/2 0/0 0/0 .text            daMP_PushFreeTextureSet__FPv */
 void daMP_PushFreeTextureSet(void* tex) {
     OSSendMessage(&daMP_FreeTextureSetQueue, tex, 0);
 }
 
-/* 808E04D8-808E04F8 066F38 0020+00 2/2 0/0 0/0 .bss             daMP_DecodedTextureSetQueue */
 static OSMessageQueue daMP_DecodedTextureSetQueue;
 
-/* 80875C2C-80875C70 00354C 0044+00 1/1 0/0 0/0 .text            daMP_PopDecodedTextureSet__Fl */
 void* daMP_PopDecodedTextureSet(s32 flags) {
     OSMessage tex;
     if (OSReceiveMessage(&daMP_DecodedTextureSetQueue, &tex, flags) == TRUE) {
@@ -2816,21 +2728,16 @@ void* daMP_PopDecodedTextureSet(s32 flags) {
     }
 }
 
-/* 80875C70-80875CA0 003590 0030+00 1/1 0/0 0/0 .text            daMP_PushDecodedTextureSet__FPv */
 void daMP_PushDecodedTextureSet(void* tex) {
     OSSendMessage(&daMP_DecodedTextureSetQueue, tex, 1);
 }
 
-/* 808E04F8-808E0504 066F58 000C+00 0/0 0/0 0/0 .bss             daMP_FreeTextureSetMessage */
 static OSMessage daMP_FreeTextureSetMessage[3];
 
-/* 808E0504-808E0510 066F64 000C+00 0/0 0/0 0/0 .bss             daMP_DecodedTextureSetMessage */
 static OSMessage daMP_DecodedTextureSetMessage[3];
 
-/* 808E0510-808E0514 066F70 0004+00 1/1 0/0 0/0 .bss             daMP_First */
 static BOOL daMP_First;
 
-/* 80875CA0-80875DD8 0035C0 0138+00 2/2 0/0 0/0 .text daMP_VideoDecode__FP18daMP_THPReadBuffer */
 static void daMP_VideoDecode(daMP_THPReadBuffer* readBuffer) {
     THPTextureSet* textureSet;
 	s32 i;
@@ -2871,7 +2778,6 @@ static void daMP_VideoDecode(daMP_THPReadBuffer* readBuffer) {
     }
 }
 
-/* 80875DD8-80875EA0 0036F8 00C8+00 1/1 0/0 0/0 .text            daMP_VideoDecoder__FPv */
 static void* daMP_VideoDecoder(void* param_0) {
     daMP_THPReadBuffer* thpBuffer;
 
@@ -2903,8 +2809,6 @@ static void* daMP_VideoDecoder(void* param_0) {
 	}
 }
 
-/* 80875EA0-80875FD4 0037C0 0134+00 1/1 0/0 0/0 .text            daMP_VideoDecoderForOnMemory__FPv
- */
 static void* daMP_VideoDecoderForOnMemory(void* param_0) {
     daMP_THPReadBuffer readBuffer;
 	s32 readSize;
@@ -2961,8 +2865,6 @@ static void* daMP_VideoDecoderForOnMemory(void* param_0) {
 	}
 }
 
-/* 80875FD4-808760EC 0038F4 0118+00 1/1 0/0 0/0 .text            daMP_CreateVideoDecodeThread__FlPUc
- */
 static BOOL daMP_CreateVideoDecodeThread(OSPriority prio, u8* param_1) {
     if (param_1 != NULL) {
         if (!OSCreateThread(&daMP_VideoDecodeThread, daMP_VideoDecoderForOnMemory, param_1, daMP_VideoDecodeThreadStack + sizeof(daMP_VideoDecodeThreadStack), sizeof(daMP_VideoDecodeThreadStack), prio, 1)) {
@@ -2983,14 +2885,12 @@ static BOOL daMP_CreateVideoDecodeThread(OSPriority prio, u8* param_1) {
     return TRUE;
 }
 
-/* 808760EC-80876124 003A0C 0038+00 1/1 0/0 0/0 .text            daMP_VideoDecodeThreadStart__Fv */
 static void daMP_VideoDecodeThreadStart() {
     if (daMP_VideoDecodeThreadCreated) {
         OSResumeThread(&daMP_VideoDecodeThread);
     }
 }
 
-/* 80876124-80876168 003A44 0044+00 1/1 0/0 0/0 .text            daMP_VideoDecodeThreadCancel__Fv */
 void daMP_VideoDecodeThreadCancel() {
     if (daMP_VideoDecodeThreadCreated) {
         OSCancelThread(&daMP_VideoDecodeThread);
@@ -2998,34 +2898,26 @@ void daMP_VideoDecodeThreadCancel() {
     }
 }
 
-/* 808E0514-808E0518 066F74 0004+00 2/2 0/0 0/0 .bss             daMP_AudioDecodeThreadCreated */
 static BOOL daMP_AudioDecodeThreadCreated;
 
-/* 808E0518-808E0830 066F78 0318+00 3/3 0/0 0/0 .bss             daMP_AudioDecodeThread */
 static OSThread daMP_AudioDecodeThread;
 
-/* 808E0830-80944830 067290 64000+00 0/0 0/0 0/0 .bss             daMP_AudioDecodeThreadStack */
 static u8 daMP_AudioDecodeThreadStack[0x64000];
 
-/* 80944830-80944850 0CB290 0020+00 2/2 0/0 0/0 .bss             daMP_FreeAudioBufferQueue */
 static OSMessageQueue daMP_FreeAudioBufferQueue;
 
-/* 80876168-8087619C 003A88 0034+00 1/1 0/0 0/0 .text            daMP_PopFreeAudioBuffer__Fv */
 static void* daMP_PopFreeAudioBuffer() {
     OSMessage buffer;
     OSReceiveMessage(&daMP_FreeAudioBufferQueue, &buffer, OS_MESSAGE_BLOCK);
     return buffer;
 }
 
-/* 8087619C-808761CC 003ABC 0030+00 2/2 0/0 0/0 .text            daMP_PushFreeAudioBuffer__FPv */
 static void daMP_PushFreeAudioBuffer(void* buffer) {
     OSSendMessage(&daMP_FreeAudioBufferQueue, buffer, OS_MESSAGE_NOBLOCK);
 }
 
-/* 80944850-80944870 0CB2B0 0020+00 2/2 0/0 0/0 .bss             daMP_DecodedAudioBufferQueue */
 static OSMessageQueue daMP_DecodedAudioBufferQueue;
 
-/* 808761CC-80876210 003AEC 0044+00 1/1 0/0 0/0 .text            daMP_PopDecodedAudioBuffer__Fl */
 static void* daMP_PopDecodedAudioBuffer(s32 flags) {
     OSMessage buffer;
     if (OSReceiveMessage(&daMP_DecodedAudioBufferQueue, &buffer, flags) == 1) {
@@ -3035,12 +2927,10 @@ static void* daMP_PopDecodedAudioBuffer(s32 flags) {
     return NULL;
 }
 
-/* 80876210-80876240 003B30 0030+00 1/1 0/0 0/0 .text            daMP_PushDecodedAudioBuffer__FPv */
 static void daMP_PushDecodedAudioBuffer(void* buffer) {
     OSSendMessage(&daMP_DecodedAudioBufferQueue, buffer, OS_MESSAGE_BLOCK);
 }
 
-/* 80876240-8087631C 003B60 00DC+00 2/2 0/0 0/0 .text daMP_AudioDecode__FP18daMP_THPReadBuffer */
 static void daMP_AudioDecode(daMP_THPReadBuffer* readBuffer) {
     THPAudioBuffer* audioBuf;
 	s32 i;
@@ -3068,7 +2958,6 @@ static void daMP_AudioDecode(daMP_THPReadBuffer* readBuffer) {
 	}
 }
 
-/* 8087631C-80876344 003C3C 0028+00 1/1 0/0 0/0 .text            daMP_AudioDecoder__FPv */
 static void* daMP_AudioDecoder(void* param_0) {
     daMP_THPReadBuffer* buf;
 
@@ -3079,8 +2968,6 @@ static void* daMP_AudioDecoder(void* param_0) {
     }
 }
 
-/* 80876344-808763EC 003C64 00A8+00 1/1 0/0 0/0 .text            daMP_AudioDecoderForOnMemory__FPv
- */
 static void* daMP_AudioDecoderForOnMemory(void* param_0) {
     s32 size;
 	s32 readSize;
@@ -3113,14 +3000,10 @@ static void* daMP_AudioDecoderForOnMemory(void* param_0) {
 	}
 }
 
-/* 80944870-8094487C 0CB2D0 000C+00 0/0 0/0 0/0 .bss             daMP_FreeAudioBufferMessage */
 static OSMessage daMP_FreeAudioBufferMessage[3];
 
-/* 8094487C-80944888 0CB2DC 000C+00 0/0 0/0 0/0 .bss             daMP_DecodedAudioBufferMessage */
 static OSMessage daMP_DecodedAudioBufferMessage[3];
 
-/* 808763EC-808764E8 003D0C 00FC+00 1/1 0/0 0/0 .text            daMP_CreateAudioDecodeThread__FlPUc
- */
 static BOOL daMP_CreateAudioDecodeThread(OSPriority prio, u8* param_1) {
     if (param_1 != NULL) {
         if (!OSCreateThread(&daMP_AudioDecodeThread, daMP_AudioDecoderForOnMemory, param_1, daMP_AudioDecodeThreadStack + sizeof(daMP_AudioDecodeThreadStack), sizeof(daMP_AudioDecodeThreadStack), prio, 1)) {
@@ -3141,14 +3024,12 @@ static BOOL daMP_CreateAudioDecodeThread(OSPriority prio, u8* param_1) {
     return TRUE;
 }
 
-/* 808764E8-80876520 003E08 0038+00 1/1 0/0 0/0 .text            daMP_AudioDecodeThreadStart__Fv */
 void daMP_AudioDecodeThreadStart() {
     if (daMP_AudioDecodeThreadCreated) {
         OSResumeThread(&daMP_AudioDecodeThread);
     }
 }
 
-/* 80876520-80876564 003E40 0044+00 1/1 0/0 0/0 .text            daMP_AudioDecodeThreadCancel__Fv */
 void daMP_AudioDecodeThreadCancel() {
     if (daMP_AudioDecodeThreadCreated) {
         OSCancelThread(&daMP_AudioDecodeThread);
@@ -3156,7 +3037,6 @@ void daMP_AudioDecodeThreadCancel() {
     }
 }
 
-/* 80876564-8087667C 003E84 0118+00 1/1 0/0 0/0 .text            daMP_THPGXRestore__Fv */
 static void daMP_THPGXRestore() {
     GXSetZMode(GX_ENABLE, GX_ALWAYS, GX_DISABLE);
     GXSetBlendMode(GX_BM_NONE, GX_BL_ONE, GX_BL_ZERO, GX_LO_SET);
@@ -3181,8 +3061,6 @@ static f32 dummyLiteral() {
     return temp;
 }
 
-/* 8087667C-80876BA8 003F9C 052C+00 1/1 0/0 0/0 .text
- * daMP_THPGXYuv2RgbSetup__FPC16_GXRenderModeObj                */
 static void daMP_THPGXYuv2RgbSetup(const GXRenderModeObj* rmode) {
     s32 w, h;
     f32 var_f31;
@@ -3274,7 +3152,6 @@ static void daMP_THPGXYuv2RgbSetup(const GXRenderModeObj* rmode) {
     GXSetTevSwapModeTable(GX_TEV_SWAP0, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
 }
 
-/* 80876BD0-80876DE4 0044F0 0214+00 1/1 0/0 0/0 .text daMP_THPGXYuv2RgbDraw__FPUcPUcPUcssssss */
 static void daMP_THPGXYuv2RgbDraw(u8* y_data, u8* u_data, u8* v_data, s16 x,
                                   s16 y, s16 textureWidth, s16 textureHeight, s16 polygonWidth,
                                   s16 polygonHeight) {
@@ -3306,7 +3183,6 @@ static void daMP_THPGXYuv2RgbDraw(u8* y_data, u8* u_data, u8* v_data, s16 x,
     GXEnd();
 }
 
-/* 80879434-80879534 000000 0100+00 1/1 0/0 0/0 .data            daMP_VolumeTable */
 static u16 daMP_VolumeTable[] = {
     0x0000, 0x0002, 0x0008, 0x0012, 0x0020, 0x0032, 0x0049, 0x0063,
     0x0082, 0x00A4, 0x00CB, 0x00F5, 0x0124, 0x0157, 0x018E, 0x01C9,
@@ -3326,7 +3202,6 @@ static u16 daMP_VolumeTable[] = {
     0x7247, 0x7430, 0x761E, 0x7810, 0x7A06, 0x7C00, 0x7DFE, 0x8000,
 };
 
-/* 80876E0C-80877074 00472C 0268+00 1/1 0/0 0/0 .text            daMP_MixAudio__FPsPsUl */
 // NONMATCHING - missing extsh
 #pragma push
 #pragma optimization_level 3
@@ -3414,46 +3289,32 @@ static void daMP_MixAudio(s16* destination, s16*, u32 sample) {
 }
 #pragma pop
 
-/* 80944888-809448A0 0CB2E8 0004+14 3/3 0/0 0/0 .bss             daMP_Initialized */
 static BOOL daMP_Initialized;
 
-/* 809448A0-809448E0 0CB300 0040+00 2/2 0/0 0/0 .bss             daMP_WorkBuffer */
-static u32 daMP_WorkBuffer[16] ALIGN_DECL(32);
+static u32 daMP_WorkBuffer[16] ATTRIBUTE_ALIGN(32);
 
-/* 809448E0-80944900 0CB340 0020+00 3/3 0/0 0/0 .bss             daMP_PrepareReadyQueue */
 static OSMessageQueue daMP_PrepareReadyQueue;
 
-/* 80944900-80944920 0CB360 0020+00 2/2 0/0 0/0 .bss             daMP_UsedTextureSetQueue */
 static OSMessageQueue daMP_UsedTextureSetQueue;
 
-/* 80944920-80944924 0CB380 0004+00 1/1 0/0 0/0 .bss             daMP_PrepareReadyMessage */
 static OSMessage daMP_PrepareReadyMessage;
 
-/* 80944924-80944930 0CB384 000C+00 0/0 0/0 0/0 .bss             daMP_UsedTextureSetMessage */
 static OSMessage daMP_UsedTextureSetMessage[3];
 
-/* 80944930-80944934 0CB390 0004+00 3/3 0/0 0/0 .bss             daMP_OldVIPostCallback */
 static VIRetraceCallback daMP_OldVIPostCallback;
 
-/* 80944934-80944938 0CB394 0004+00 1/1 0/0 0/0 .bss             daMP_SoundBufferIndex */
 static u32 daMP_SoundBufferIndex;
 
-/* 80944938-8094493C 0CB398 0004+00 0/0 0/0 0/0 .bss             daMP_OldAIDCallback */
 static u32 daMP_OldAIDCallback;
 
-/* 8094493C-80944940 0CB39C 0004+00 0/0 0/0 0/0 .bss             daMP_LastAudioBuffer */
 static void* daMP_LastAudioBuffer;
 
-/* 80944940-80944944 0CB3A0 0004+00 0/0 0/0 0/0 .bss             daMP_CurAudioBuffer */
 static void* daMP_CurAudioBuffer;
 
-/* 80944944-80944960 0CB3A4 0004+18 0/0 0/0 0/0 .bss             daMP_AudioSystem */
 static s32 daMP_AudioSystem;
 
-/* 80944960-80945AE0 0CB3C0 1180+00 1/1 0/0 0/0 .bss             daMP_SoundBuffer */
-static u8 daMP_SoundBuffer[2][0x8C0] ALIGN_DECL(32);
+static u8 daMP_SoundBuffer[2][0x8C0] ATTRIBUTE_ALIGN(32);
 
-/* 80877074-8087712C 004994 00B8+00 1/1 0/0 0/0 .text            daMP_audioCallbackWithMSound__Fl */
 static s16* daMP_audioCallbackWithMSound(s32 sample) {
     if (daMP_ActivePlayer.open == 0 || daMP_ActivePlayer.internalState != 2 || daMP_ActivePlayer.audioExist == 0) {
         return NULL;
@@ -3466,22 +3327,18 @@ static s16* daMP_audioCallbackWithMSound(s32 sample) {
     return (s16*)daMP_SoundBuffer[daMP_SoundBufferIndex];
 }
 
-/* 8087712C-80877158 004A4C 002C+00 1/1 0/0 0/0 .text            daMP_audioInitWithMSound__Fv */
 static void daMP_audioInitWithMSound() {
     JASDriver::registerMixCallback(daMP_audioCallbackWithMSound, MIX_MODE_INTERLEAVE);
 }
 
-/* 80877158-80877180 004A78 0028+00 2/2 0/0 0/0 .text            daMP_audioQuitWithMSound__Fv */
 static void daMP_audioQuitWithMSound() {
     JASDriver::registerMixCallback(NULL, MIX_MODE_MONO);
 }
 
-/* 80877180-808771B0 004AA0 0030+00 1/1 0/0 0/0 .text            daMP_PushUsedTextureSet__FPv */
 static void daMP_PushUsedTextureSet(void* tex) {
     OSSendMessage(&daMP_UsedTextureSetQueue, tex, OS_MESSAGE_NOBLOCK);
 }
 
-/* 808771B0-808771F4 004AD0 0044+00 2/2 0/0 0/0 .text            daMP_PopUsedTextureSet__Fv */
 static void* daMP_PopUsedTextureSet() {
     OSMessage tex;
     if (OSReceiveMessage(&daMP_UsedTextureSetQueue, &tex, OS_MESSAGE_NOBLOCK) == 1) {
@@ -3491,7 +3348,6 @@ static void* daMP_PopUsedTextureSet() {
     return NULL;
 }
 
-/* 808771F4-808772CC 004B14 00D8+00 1/1 0/0 0/0 .text            daMP_THPPlayerInit__Fl */
 static int daMP_THPPlayerInit(s32 param_0) {
     BOOL enable;
 
@@ -3523,7 +3379,6 @@ static int daMP_THPPlayerInit(s32 param_0) {
     return 1;
 }
 
-/* 808772CC-8087730C 004BEC 0040+00 1/1 0/0 0/0 .text            daMP_THPPlayerQuit__Fv */
 static void daMP_THPPlayerQuit() {
     LCDisable();
     daMP_audioQuitWithMSound();
@@ -3532,7 +3387,6 @@ static void daMP_THPPlayerQuit() {
     daMP_ActivePlayer.videoError = 0;
 }
 
-/* 8087730C-808776EC 004C2C 03E0+00 1/1 0/0 0/0 .text            daMP_THPPlayerOpen__FPCci */
 static BOOL daMP_THPPlayerOpen(char const* filename, BOOL onMemory) {
     s32 offset;
 	s32 i;
@@ -3628,7 +3482,6 @@ static BOOL daMP_THPPlayerOpen(char const* filename, BOOL onMemory) {
     return 1;
 }
 
-/* 808776EC-80877740 00500C 0054+00 2/2 0/0 0/0 .text            daMP_THPPlayerClose__Fv */
 static BOOL daMP_THPPlayerClose() {
     if (daMP_ActivePlayer.open && daMP_ActivePlayer.state == 0) {
         daMP_ActivePlayer.open = 0;
@@ -3639,7 +3492,6 @@ static BOOL daMP_THPPlayerClose() {
     return FALSE;
 }
 
-/* 80877740-808777F0 005060 00B0+00 1/1 0/0 0/0 .text            daMP_THPPlayerCalcNeedMemory__Fv */
 static u32 daMP_THPPlayerCalcNeedMemory() {
     if (daMP_ActivePlayer.open) {
 		u32 size = daMP_ActivePlayer.onMemory
@@ -3660,7 +3512,6 @@ static u32 daMP_THPPlayerCalcNeedMemory() {
 	return 0;
 }
 
-/* 808777F0-80877A08 005110 0218+00 1/1 0/0 0/0 .text            daMP_THPPlayerSetBuffer__FPUc */
 static BOOL daMP_THPPlayerSetBuffer(u8* buffer) {
     u32 i;
 	u8* ptr;
@@ -3715,7 +3566,6 @@ static BOOL daMP_THPPlayerSetBuffer(u8* buffer) {
 	return FALSE;
 }
 
-/* 80877A08-80877ADC 005328 00D4+00 1/1 0/0 0/0 .text            daMP_InitAllMessageQueue__Fv */
 static void daMP_InitAllMessageQueue() {
     int i;
 	if (daMP_ActivePlayer.onMemory == FALSE) {
@@ -3737,7 +3587,6 @@ static void daMP_InitAllMessageQueue() {
 	OSInitMessageQueue(&daMP_PrepareReadyQueue, &daMP_PrepareReadyMessage, 1);
 }
 
-/* 80877ADC-80877B48 0053FC 006C+00 1/1 0/0 0/0 .text            daMP_ProperTimingForStart__Fv */
 static BOOL daMP_ProperTimingForStart() {
     if (daMP_ActivePlayer.videoInfo.videoType & 1) {
 		if (VIGetNextField() == 0)
@@ -3751,7 +3600,6 @@ static BOOL daMP_ProperTimingForStart() {
 	return FALSE;
 }
 
-/* 80877B48-80877C8C 005468 0144+00 1/1 0/0 0/0 .text daMP_ProperTimingForGettingNextFrame__Fv */
 static BOOL daMP_ProperTimingForGettingNextFrame() {
     if ((daMP_ActivePlayer.videoInfo.videoType & 1)) {
 		if (VIGetNextField() == 0) {
@@ -3778,7 +3626,6 @@ static BOOL daMP_ProperTimingForGettingNextFrame() {
 	return FALSE;
 }
 
-/* 80877C8C-80877F48 0055AC 02BC+00 1/1 0/0 0/0 .text            daMP_PlayControl__FUl */
 static void daMP_PlayControl(u32 retraceCnt) {
     THPTextureSet* decodedTexture;
 
@@ -3858,7 +3705,6 @@ static void daMP_PlayControl(u32 retraceCnt) {
 	}
 }
 
-/* 80877F48-80877F88 005868 0040+00 1/1 0/0 0/0 .text            daMP_WaitUntilPrepare__Fv */
 BOOL daMP_WaitUntilPrepare() {
     OSMessage msg;
     OSReceiveMessage(&daMP_PrepareReadyQueue, &msg, 1);
@@ -3870,12 +3716,10 @@ BOOL daMP_WaitUntilPrepare() {
 	}
 }
 
-/* 80877F88-80877FB8 0058A8 0030+00 2/2 0/0 0/0 .text            daMP_PrepareReady__Fi */
 void daMP_PrepareReady(BOOL msg) {
     OSSendMessage(&daMP_PrepareReadyQueue, (OSMessage)msg, 1);
 }
 
-/* 80877FB8-808782A0 0058D8 02E8+00 1/1 0/0 0/0 .text            daMP_THPPlayerPrepare__Flll */
 static BOOL daMP_THPPlayerPrepare(s32 frame, s32 flag, s32 audioTrack) {
     u8* threadData;
 	if (daMP_ActivePlayer.open && daMP_ActivePlayer.state == 0) {
@@ -3961,7 +3805,6 @@ static BOOL daMP_THPPlayerPrepare(s32 frame, s32 flag, s32 audioTrack) {
 	return FALSE;
 }
 
-/* 808782A0-808782E4 005BC0 0044+00 1/1 0/0 0/0 .text            daMP_THPPlayerDrawDone__Fv */
 static void daMP_THPPlayerDrawDone() {
     GXDrawDone();
 
@@ -3976,7 +3819,6 @@ static void daMP_THPPlayerDrawDone() {
     }
 }
 
-/* 808782E4-80878344 005C04 0060+00 1/1 0/0 0/0 .text            daMP_THPPlayerPlay__Fv */
 static BOOL daMP_THPPlayerPlay() {
     if (daMP_ActivePlayer.open != 0 && (daMP_ActivePlayer.state == 1 || daMP_ActivePlayer.state == 4)) {
         daMP_ActivePlayer.state = 2;
@@ -3989,7 +3831,6 @@ static BOOL daMP_THPPlayerPlay() {
     return FALSE;
 }
 
-/* 80878344-808783FC 005C64 00B8+00 3/3 0/0 0/0 .text            daMP_THPPlayerStop__Fv */
 static void daMP_THPPlayerStop() {
     if (daMP_ActivePlayer.open != 0 && daMP_ActivePlayer.state != 0) {
         daMP_ActivePlayer.internalState = 0;
@@ -4016,7 +3857,6 @@ static void daMP_THPPlayerStop() {
     }
 }
 
-/* 808783FC-80878438 005D1C 003C+00 1/1 0/0 0/0 .text            daMP_THPPlayerPause__Fv */
 static int daMP_THPPlayerPause() {
     if (daMP_ActivePlayer.open != 0 && daMP_ActivePlayer.state == 2) {
         daMP_ActivePlayer.internalState = 4;
@@ -4027,8 +3867,6 @@ static int daMP_THPPlayerPause() {
     return 0;
 }
 
-/* 80878438-80878534 005D58 00FC+00 1/1 0/0 0/0 .text
- * daMP_THPPlayerDrawCurrentFrame__FPC16_GXRenderModeObjUlUlUlUl */
 static int daMP_THPPlayerDrawCurrentFrame(const GXRenderModeObj* rmode, u32 x,
                                           u32 y, u32 polygonW, u32 polygonH) {
     s32 frame;
@@ -4052,8 +3890,6 @@ static int daMP_THPPlayerDrawCurrentFrame(const GXRenderModeObj* rmode, u32 x,
 	return -1;
 }
 
-/* 80878568-808785B0 005E88 0048+00 1/1 0/0 0/0 .text daMP_THPPlayerGetVideoInfo__FP12THPVideoInfo
- */
 static int daMP_THPPlayerGetVideoInfo(THPVideoInfo* info) {
     if (daMP_ActivePlayer.open != 0) {
         memcpy(info, &daMP_ActivePlayer.videoInfo, sizeof(THPVideoInfo));
@@ -4063,8 +3899,6 @@ static int daMP_THPPlayerGetVideoInfo(THPVideoInfo* info) {
     return 0;
 }
 
-/* 808785B0-808785F8 005ED0 0048+00 1/1 0/0 0/0 .text daMP_THPPlayerGetAudioInfo__FP12THPAudioInfo
- */
 static int daMP_THPPlayerGetAudioInfo(THPAudioInfo* info) {
     if (daMP_ActivePlayer.open != 0) {
         memcpy(info, &daMP_ActivePlayer.audioInfo, sizeof(THPAudioInfo));
@@ -4074,7 +3908,6 @@ static int daMP_THPPlayerGetAudioInfo(THPAudioInfo* info) {
     return 0;
 }
 
-/* 808785F8-8087861C 005F18 0024+00 2/2 0/0 0/0 .text            daMP_THPPlayerGetTotalFrame__Fv */
 static u32 daMP_THPPlayerGetTotalFrame() {
     if (daMP_ActivePlayer.open != 0) {
         return daMP_ActivePlayer.header.numFrames;
@@ -4083,12 +3916,10 @@ static u32 daMP_THPPlayerGetTotalFrame() {
     return 0;
 }
 
-/* 8087861C-8087862C 005F3C 0010+00 2/2 0/0 0/0 .text            daMP_THPPlayerGetState__Fv */
 static int daMP_THPPlayerGetState() {
     return daMP_ActivePlayer.state;
 }
 
-/* 8087862C-80878758 005F4C 012C+00 1/1 0/0 0/0 .text            daMP_THPPlayerSetVolume__Fll */
 static BOOL daMP_THPPlayerSetVolume(s32 vol, s32 duration) {
     u32 numSamples;
 	BOOL interrupt;
@@ -4126,22 +3957,16 @@ static BOOL daMP_THPPlayerSetVolume(s32 vol, s32 duration) {
 	return FALSE;
 }
 
-/* 80945AE0-80945AEC 0CC540 000C+00 1/1 0/0 0/0 .bss             daMP_videoInfo */
 static THPVideoInfo daMP_videoInfo;
 
-/* 80945AEC-80945AFC 0CC54C 0010+00 0/0 0/0 0/0 .bss             daMP_audioInfo */
 static THPAudioInfo daMP_audioInfo;
 
-/* 80945AFC-80945B00 0CC55C 0004+00 1/1 0/0 0/0 .bss             daMP_DrawPosX */
 static u32 daMP_DrawPosX;
 
-/* 80945B00-80945B04 0CC560 0004+00 1/1 0/0 0/0 .bss             daMP_DrawPosY */
 static u32 daMP_DrawPosY;
 
-/* 80945B04-80945B08 0CC564 0004+00 2/2 0/0 0/0 .bss             daMP_buffer */
 static void* daMP_buffer;
 
-/* 80878758-808788BC 006078 0164+00 1/1 0/0 0/0 .text            daMP_ActivePlayer_Init__FPCc */
 static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
     daMP_THPPlayerInit(0);
     
@@ -4190,7 +4015,6 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) {
     return 1;
 }
 
-/* 808788D4-80878914 0061F4 0040+00 1/1 0/0 0/0 .text            daMP_ActivePlayer_Finish__Fv */
 static void daMP_ActivePlayer_Finish() {
     daMP_THPPlayerStop();
     daMP_THPPlayerClose();
@@ -4201,7 +4025,6 @@ static void daMP_ActivePlayer_Finish() {
     }
 }
 
-/* 80878938-80878994 006258 005C+00 1/1 0/0 0/0 .text            daMP_ActivePlayer_Main__Fv */
 static void daMP_ActivePlayer_Main() {
     if (daMP_THPPlayerGetState() == 5) {
         daMP_THPPlayerStop();
@@ -4215,7 +4038,6 @@ static void daMP_ActivePlayer_Main() {
     }
 }
 
-/* 80878994-80878A34 0062B4 00A0+00 1/1 0/0 0/0 .text            daMP_ActivePlayer_Draw__Fv */
 static void daMP_ActivePlayer_Draw() {
     int frame = daMP_THPPlayerDrawCurrentFrame(JUTVideo::getManager()->getRenderMode(), daMP_DrawPosX, daMP_DrawPosY, daMP_videoInfo.xSize, daMP_videoInfo.ySize);
     daMP_THPPlayerDrawDone();
@@ -4226,10 +4048,8 @@ static void daMP_ActivePlayer_Draw() {
     }
 }
 
-/* 80945B08-80945B0C 0CC568 0004+00 5/5 0/0 0/0 .bss             daMP_Fail_alloc */
 static BOOL daMP_Fail_alloc;
 
-/* 80878A6C-80878B38 00638C 00CC+00 1/1 0/0 0/0 .text            daMP_Get_MovieRestFrame__Fv */
 static u32 daMP_Get_MovieRestFrame() {
     int temp_r31;
     if (daMP_Fail_alloc != 0 || daMP_THPPlayerGetState() == 5) {
@@ -4258,7 +4078,6 @@ static u32 daMP_Get_MovieRestFrame() {
     return (temp_r3 - 1) - temp_r31;
 }
 
-/* 80878B38-80878BB8 006458 0080+00 1/1 0/0 0/0 .text            daMP_Set_PercentMovieVolume__Ff */
 static void daMP_Set_PercentMovieVolume(f32 volume) {
     if (!daMP_Fail_alloc) {
         s32 player_vol;
@@ -4274,18 +4093,14 @@ static void daMP_Set_PercentMovieVolume(f32 volume) {
     }
 }
 
-/* 80878BB8-80878BDC 0064D8 0024+00 1/1 0/0 0/0 .text            daMP_c_Get_arg_demoNo__6daMP_cFv */
 int daMP_c::daMP_c_Get_arg_demoNo() {
     return ((u32)(fopAcM_GetParam(this) >> 7)) & 0x7F;
 }
 
-/* 80878C04-80878C28 006524 0024+00 1/1 0/0 0/0 .text            daMP_c_Get_arg_movieNo__6daMP_cFv
- */
 int daMP_c::daMP_c_Get_arg_movieNo() {
     return fopAcM_GetParam(this) & 0x7F;
 }
 
-/* 80878C28-80878D10 006548 00E8+00 1/1 0/0 0/0 .text            daMP_c_Init__6daMP_cFv */
 int daMP_c::daMP_c_Init() {
     JUT_ASSERT(9469, m_myObj == NULL);
 
@@ -4316,46 +4131,37 @@ int daMP_c::daMP_c_Init() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80878D64-80878D94 006684 0030+00 1/1 0/0 0/0 .text            daMP_c_Finish__6daMP_cFv */
 int daMP_c::daMP_c_Finish() {
     daMP_ActivePlayer_Finish();
     m_myObj = NULL;
     return 1;
 }
 
-/* 80878D94-80878DB8 0066B4 0024+00 1/1 0/0 0/0 .text            daMP_c_Main__6daMP_cFv */
 int daMP_c::daMP_c_Main() {
     daMP_ActivePlayer_Main();
     return 1;
 }
 
-/* 80878DB8-80878DD8 0066D8 0020+00 1/0 0/0 0/0 .text            draw__16daMP_Dlst_base_cFv */
 void daMP_Dlst_base_c::draw() {
     daMP_ActivePlayer_Draw();
 }
 
-/* 80945B0C-80945B10 0CC56C 0004+00 2/2 0/0 0/0 .bss             daMP_c_Dlst_base */
 static daMP_Dlst_base_c daMP_c_Dlst_base;
 
-/* 80878DD8-80878E04 0066F8 002C+00 1/1 0/0 0/0 .text            daMP_c_Draw__6daMP_cFv */
 int daMP_c::daMP_c_Draw() {
     dComIfGd_set2DOpa(&daMP_c_Dlst_base);
     return 1;
 }
 
-/* 80878E60-80878EC4 006780 0064+00 1/0 0/0 0/0 .text daMP_c_Callback_Init__6daMP_cFP10fopAc_ac_c
- */
 int daMP_c::daMP_c_Callback_Init(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, daMP_c);
     return ((daMP_c*)i_this)->daMP_c_Init();
 }
 
-/* 80878F18-80878F38 006838 0020+00 1/0 0/0 0/0 .text daMP_c_Callback_Finish__6daMP_cFP6daMP_c */
 int daMP_c::daMP_c_Callback_Finish(daMP_c* i_this) {
     return i_this->daMP_c_Finish();
 }
 
-/* 80878F38-80878F70 006858 0038+00 1/0 0/0 0/0 .text daMP_c_Callback_Main__6daMP_cFP6daMP_c */
 int daMP_c::daMP_c_Callback_Main(daMP_c* i_this) {
     #if PLATFORM_WII || PLATFORM_SHIELD
     mDoGph_gInf_c::resetDimming();
@@ -4368,7 +4174,6 @@ int daMP_c::daMP_c_Callback_Main(daMP_c* i_this) {
     return i_this->daMP_c_Main();
 }
 
-/* 80878F70-80878FA8 006890 0038+00 1/0 0/0 0/0 .text daMP_c_Callback_Draw__6daMP_cFP6daMP_c */
 int daMP_c::daMP_c_Callback_Draw(daMP_c* i_this) {
     if (daMP_Fail_alloc) {
         return 1;
@@ -4377,12 +4182,10 @@ int daMP_c::daMP_c_Callback_Draw(daMP_c* i_this) {
     return i_this->daMP_c_Draw();
 }
 
-/* 80878FA8-80878FB0 0068C8 0008+00 1/0 0/0 0/0 .text            daMP_Callback_Dummy__FP6daMP_c */
 static int daMP_Callback_Dummy(daMP_c* i_this) {
     return 1;
 }
 
-/* 80879534-80879554 -00001 0020+00 1/0 0/0 0/0 .data            daMP_METHODS */
 static actor_method_class daMP_METHODS = {
     (process_method_func)daMP_c::daMP_c_Callback_Init,
     (process_method_func)daMP_c::daMP_c_Callback_Finish,
@@ -4391,7 +4194,6 @@ static actor_method_class daMP_METHODS = {
     (process_method_func)daMP_c::daMP_c_Callback_Draw,
 };
 
-/* 80879554-80879584 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MOVIE_PLAYER */
 extern actor_process_profile_definition g_profile_MOVIE_PLAYER = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp
index 1c293e5efe..d698b5b92d 100644
--- a/src/d/actor/d_a_myna.cpp
+++ b/src/d/actor/d_a_myna.cpp
@@ -14,7 +14,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/d_s_play.h"
 
-/* 8094B488-8094B590 000128 0108+00 2/3 0/0 0/0 .data            init_proc */
 static daMyna_c::ProcFunc init_proc[] = {
     &daMyna_c::attack_wait_init,
     &daMyna_c::attack_before_talk_init,
@@ -40,7 +39,6 @@ static daMyna_c::ProcFunc init_proc[] = {
     &daMyna_c::attack2_talk_init,
 };
 
-/* 8094B698-8094B7A0 000338 0108+00 2/3 0/0 0/0 .data            move_proc */
 static daMyna_c::ProcFunc move_proc[] = {
     &daMyna_c::attack_wait_move,
     &daMyna_c::attack_before_talk_move,
@@ -66,7 +64,6 @@ static daMyna_c::ProcFunc move_proc[] = {
     &daMyna_c::attack2_talk_move,
 };
 
-/* 8094B7A0-8094B7DC -00001 003C+00 2/2 0/0 0/0 .data            l_bckFileNameTBL */
 static char* l_bckFileNameTBL[] = {
     "MYNA_hovering.bck", "MYNA_wait_a.bck",    "MYNA_pick_a.bck",    "MYNA_pick_b.bck",
     "MYNA_jump.bck",     "MYNA_sidestepL.bck", "MYNA_sidestepR.bck", "MYNA_lightup.bck",
@@ -74,17 +71,13 @@ static char* l_bckFileNameTBL[] = {
     "MYNA_wait_c.bck",   "MYNA_talk_c.bck",    "MYNA_wait_d.bck",
 };
 
-/* 8094B7DC-8094B7E0 -00001 0004+00 2/2 0/0 0/0 .data            l_btpFileNameTBL */
 static char* l_btpFileNameTBL[] = {"MYNA.btp"};
 
-/* 80945C6C-80945C8C 0000EC 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c
- */
 static void createHeapCallBack(fopAc_ac_c* i_this) {
     daMyna_c* a_this = static_cast<daMyna_c*>(i_this);
     a_this->createHeap();
 }
 
-/* 80945C8C-80945CD8 00010C 004C+00 1/1 0/0 0/0 .text            jntNodeCallBack__FP8J3DJointi */
 static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
     if (param_1 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -98,7 +91,7 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
 
 class daMyna_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8094A960 */ virtual ~daMyna_HIO_c() {}
+    virtual ~daMyna_HIO_c() {}
 
     daMyna_HIO_c() {
         static struct {
@@ -195,22 +188,16 @@ public:
 
 STATIC_ASSERT(sizeof(daMyna_HIO_c) == 0x34);
 
-/* 8094BA3C-8094BA70 000054 0034+00 15/15 0/0 0/0 .bss             l_HOSTIO */
 static daMyna_HIO_c l_HOSTIO;
 
-/* 8094BA70-8094BA98 000088 0028+00 0/2 0/0 0/0 .bss             daMyna_targetActor */
 static fopAc_ac_c* daMyna_targetActor[10];
 
-/* 8094BA98-8094BAC0 0000B0 0028+00 0/2 0/0 0/0 .bss             daMyna_subActor */
 static fopAc_ac_c* daMyna_subActor[10];
 
-/* 8094BAC0-8094BAC4 0000D8 0004+00 7/7 0/0 0/0 .bss             daMyna_LightActor */
 static daTag_MynaLight_c* daMyna_LightActor;
 
-/* 8094BAC4-8094BAC8 0000DC 0004+00 0/2 0/0 0/0 .bss             daMyna_actor_count */
 static int daMyna_actor_count;
 
-/* 80945CD8-80945D9C 000158 00C4+00 1/1 0/0 0/0 .text            daMyna_searchSSItem__FPvPv */
 static void* daMyna_searchSSItem(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && (fopAcM_GetName(param_0) == PROC_OBJ_SSITEM ||
                                     fopAcM_GetName(param_0) == PROC_OBJ_SSDRINK ||
@@ -233,7 +220,6 @@ static void* daMyna_searchSSItem(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80945D9C-80945E0C 00021C 0070+00 1/1 0/0 0/0 .text            daMyna_searchLight__FPvPv */
 static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) {
     if (fopAcM_IsActor(i_mynaLightTagActor) &&
         fopAcM_GetName(i_mynaLightTagActor) == PROC_TAG_MNLIGHT)
@@ -247,13 +233,10 @@ static void* daMyna_searchLight(void* i_mynaLightTagActor, void* param_1) {
     return 0;
 }
 
-/* 8094BAC8-8094BACC 0000E0 0004+00 8/9 0/0 0/0 .bss             daMyna_evtTagActor0 */
 static fopAc_ac_c* daMyna_evtTagActor0;
 
-/* 8094BACC-8094BAD0 0000E4 0004+00 2/2 0/0 0/0 .bss             daMyna_evtTagActor1 */
 static fopAc_ac_c* daMyna_evtTagActor1;
 
-/* 80945E0C-80945E80 00028C 0074+00 1/1 0/0 0/0 .text            daMyna_searchEvtTag__FPvPv */
 static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) {
     if (fopAcM_IsActor(i_evtTagActor) && fopAcM_GetName(i_evtTagActor) == PROC_TAG_EVT) {
         if (((fopAcM_GetParam(i_evtTagActor) & 0xF000000) >> 24) == 0) {
@@ -270,12 +253,10 @@ static void* daMyna_searchEvtTag(void* i_evtTagActor, void* param_1) {
     return 0;
 }
 
-/* 8094B1B0-8094B1F0 000000 0040+00 7/7 0/0 0/0 .rodata          mCcDSph__8daMyna_c */
 dCcD_SrcSph const daMyna_c::mCcDSph = {
     0, 0x400, 1, 0x1F, 0, 0, 0x79, 0xA, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 15.0f,
 };
 
-/* 80945E80-80945EC0 000300 0040+00 1/0 0/0 0/0 .text            baseMotion00__8daMyna_cFi */
 int daMyna_c::baseMotion00(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 0;
@@ -284,7 +265,6 @@ int daMyna_c::baseMotion00(int param_0) {
     return 1;
 }
 
-/* 80945EC0-80945F00 000340 0040+00 1/0 0/0 0/0 .text            baseMotion01__8daMyna_cFi */
 int daMyna_c::baseMotion01(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 1;
@@ -293,7 +273,6 @@ int daMyna_c::baseMotion01(int param_0) {
     return 1;
 }
 
-/* 80945F00-80945F40 000380 0040+00 1/0 0/0 0/0 .text            baseMotion02__8daMyna_cFi */
 int daMyna_c::baseMotion02(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 2;
@@ -302,7 +281,6 @@ int daMyna_c::baseMotion02(int param_0) {
     return 1;
 }
 
-/* 80945F40-80945FA0 0003C0 0060+00 1/0 0/0 0/0 .text            baseMotion03__8daMyna_cFi */
 int daMyna_c::baseMotion03(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 3;
@@ -315,7 +293,6 @@ int daMyna_c::baseMotion03(int param_0) {
     return 1;
 }
 
-/* 80945FA0-80946000 000420 0060+00 1/0 0/0 0/0 .text            baseMotion04__8daMyna_cFi */
 int daMyna_c::baseMotion04(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 4;
@@ -328,7 +305,6 @@ int daMyna_c::baseMotion04(int param_0) {
     return 1;
 }
 
-/* 80946000-80946060 000480 0060+00 1/0 0/0 0/0 .text            baseMotion05__8daMyna_cFi */
 int daMyna_c::baseMotion05(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 5;
@@ -341,7 +317,6 @@ int daMyna_c::baseMotion05(int param_0) {
     return 1;
 }
 
-/* 80946060-809460A0 0004E0 0040+00 1/0 0/0 0/0 .text            baseMotion06__8daMyna_cFi */
 int daMyna_c::baseMotion06(int param_0) {
     if (param_0 != 0) {
         field_0x916 = 6;
@@ -350,14 +325,12 @@ int daMyna_c::baseMotion06(int param_0) {
     return 1;
 }
 
-/* 8094B864-8094B8B8 000504 0054+00 1/2 0/0 0/0 .data            mBaseMotionTBL__8daMyna_c */
 daMyna_c::BaseMotionFunc daMyna_c::mBaseMotionTBL[] = {
     &daMyna_c::baseMotion00, &daMyna_c::baseMotion01, &daMyna_c::baseMotion02,
     &daMyna_c::baseMotion03, &daMyna_c::baseMotion04, &daMyna_c::baseMotion05,
     &daMyna_c::baseMotion06,
 };
 
-/* 809460A0-80946284 000520 01E4+00 1/1 0/0 0/0 .text            create__8daMyna_cFv */
 int daMyna_c::create() {
     fopAcM_ct(this, daMyna_c);
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, "Npc_myna");
@@ -383,7 +356,6 @@ int daMyna_c::create() {
     return phase;
 }
 
-/* 809463B8-8094640C 000838 0054+00 1/1 0/0 0/0 .text            destroy__8daMyna_cFv */
 int daMyna_c::destroy() {
     dComIfG_resDelete(&mPhase, "Npc_myna");
     if (heap != NULL) {
@@ -396,7 +368,6 @@ int daMyna_c::destroy() {
     return 1;
 }
 
-/* 8094640C-809464CC 00088C 00C0+00 1/1 0/0 0/0 .text            draw__8daMyna_cFv */
 int daMyna_c::draw() {
     J3DModel* model = mpMorf->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -413,7 +384,6 @@ int daMyna_c::draw() {
     return 1;
 }
 
-/* 809464CC-809466D8 00094C 020C+00 2/2 0/0 0/0 .text            execute__8daMyna_cFv */
 int daMyna_c::execute() {
     u8 uVar1 = field_0x92C;
     u8 uVar2 = field_0x935;
@@ -468,7 +438,6 @@ int daMyna_c::execute() {
     return 1;
 }
 
-/* 809466D8-8094686C 000B58 0194+00 1/1 0/0 0/0 .text            createHeap__8daMyna_cFv */
 int daMyna_c::createHeap() {
     J3DModelData* aMdlData_p = NULL;
     aMdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes("Npc_myna", "MYNA.bmd"));
@@ -504,7 +473,6 @@ int daMyna_c::createHeap() {
     return 1;
 }
 
-/* 8094686C-809468EC 000CEC 0080+00 1/1 0/0 0/0 .text jntNodeCB__8daMyna_cFP8J3DJointP8J3DModel */
 int daMyna_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
     J3DJoint* my_joint = i_jnt;
     int jntNo = my_joint->getJntNo();
@@ -515,13 +483,11 @@ int daMyna_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
     return 1;
 }
 
-/* 809468EC-8094692C 000D6C 0040+00 1/0 0/0 0/0 .text            attack_wait_init__8daMyna_cFv */
 void daMyna_c::attack_wait_init() {
     setAnimeType(1, 0.0f);
     field_0x92A = 0;
 }
 
-/* 8094692C-80946AEC 000DAC 01C0+00 1/0 0/0 0/0 .text            attack_wait_move__8daMyna_cFv */
 void daMyna_c::attack_wait_move() {
     if (current.angle.y != home.angle.y) {
         cLib_addCalcAngleS(&current.angle.y, home.angle.y, 4, 32767, 1500);
@@ -556,13 +522,11 @@ void daMyna_c::attack_wait_move() {
     }
 }
 
-/* 80946AEC-80946B40 000F6C 0054+00 1/0 0/0 0/0 .text attack_before_talk_init__8daMyna_cFv */
 void daMyna_c::attack_before_talk_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
     setAnimeType(10, 0.0f);
 }
 
-/* 80946B40-80946BB4 000FC0 0074+00 1/0 0/0 0/0 .text attack_before_talk_move__8daMyna_cFv */
 void daMyna_c::attack_before_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -571,13 +535,11 @@ void daMyna_c::attack_before_talk_move() {
     }
 }
 
-/* 80946BB4-80946BF4 001034 0040+00 1/0 0/0 0/0 .text            attack_fly_init__8daMyna_cFv */
 void daMyna_c::attack_fly_init() {
     setAnimeType(0, 0.0f);
     field_0x91A = 0;
 }
 
-/* 80946BF4-80946D20 001074 012C+00 1/0 0/0 0/0 .text            attack_fly_move__8daMyna_cFv */
 void daMyna_c::attack_fly_move() {
     if (daMyna_evtTagActor0 != NULL) {
         cXyz var1(1.0f, 1.0f, 1.0f);
@@ -598,13 +560,11 @@ void daMyna_c::attack_fly_move() {
     }
 }
 
-/* 80946D20-80946D64 0011A0 0044+00 1/0 0/0 0/0 .text            attack_init__8daMyna_cFv */
 void daMyna_c::attack_init() {
     setAnimeType(8, 0.0f);
     mSph.OnAtVsPlayerBit();
 }
 
-/* 80946D64-80946DD4 0011E4 0070+00 1/0 0/0 0/0 .text            attack_move__8daMyna_cFv */
 void daMyna_c::attack_move() {
     mStatus.Move();
     if (field_0x91E != 0) {
@@ -616,14 +576,10 @@ void daMyna_c::attack_move() {
     }
 }
 
-/* 80946DD4-80946E08 001254 0034+00 1/0 0/0 0/0 .text            attack_after_talk_init__8daMyna_cFv
- */
 void daMyna_c::attack_after_talk_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 80946E08-80946E84 001288 007C+00 1/0 0/0 0/0 .text            attack_after_talk_move__8daMyna_cFv
- */
 void daMyna_c::attack_after_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -633,12 +589,10 @@ void daMyna_c::attack_after_talk_move() {
     }
 }
 
-/* 80946E84-80946EB0 001304 002C+00 1/0 0/0 0/0 .text            greet_wait_init__8daMyna_cFv */
 void daMyna_c::greet_wait_init() {
     setAnimeType(1, 0.0f);
 }
 
-/* 80946EB0-80947030 001330 0180+00 1/0 0/0 0/0 .text            greet_wait_move__8daMyna_cFv */
 void daMyna_c::greet_wait_move() {
     if (!daPy_py_c::checkNowWolf()) {
         if (daMyna_evtTagActor0 != NULL) {
@@ -678,7 +632,6 @@ void daMyna_c::greet_wait_move() {
     }
 }
 
-/* 80947030-8094711C 0014B0 00EC+00 1/0 0/0 0/0 .text            greet_talk_init__8daMyna_cFv */
 void daMyna_c::greet_talk_init() {
     dMsgObject_setTotalPayment(0);
     dMsgObject_setTotalPrice(0);
@@ -703,7 +656,6 @@ void daMyna_c::greet_talk_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 8094711C-809471BC 00159C 00A0+00 1/0 0/0 0/0 .text            greet_talk_move__8daMyna_cFv */
 void daMyna_c::greet_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -717,12 +669,10 @@ void daMyna_c::greet_talk_move() {
     }
 }
 
-/* 809471BC-809471E8 00163C 002C+00 1/0 0/0 0/0 .text            shopping_wait_init__8daMyna_cFv */
 void daMyna_c::shopping_wait_init() {
     setAnimeType(1, 0.0f);
 }
 
-/* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text            shopping_wait_move__8daMyna_cFv */
 void daMyna_c::shopping_wait_move() {
     if (!daPy_py_c::checkNowWolf()) {
         /* dSv_event_flag_c::F_0802 - Faron Woods - Trill attacks when stealing */
@@ -823,14 +773,12 @@ void daMyna_c::shopping_wait_move() {
     }
 }
 
-/* 809475B4-80947630 001A34 007C+00 1/0 0/0 0/0 .text            shopping_talk_init__8daMyna_cFv */
 void daMyna_c::shopping_talk_init() {
     field_0x828 = fopAcM_SearchByID(mShopItems[field_0x931].mTargetActorID);
     field_0x91C = mShopItems[field_0x931].mFlowNodeNum;
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 80947630-809476A0 001AB0 0070+00 1/0 0/0 0/0 .text            shopping_talk_move__8daMyna_cFv */
 void daMyna_c::shopping_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -839,7 +787,6 @@ void daMyna_c::shopping_talk_move() {
     }
 }
 
-/* 809476A0-8094772C 001B20 008C+00 1/0 0/0 0/0 .text            thanks_talk_init__8daMyna_cFv */
 void daMyna_c::thanks_talk_init() {
     s16 nowTotalPayment = dMsgObject_getMsgObjectClass()->getNowTotalPayment();
     s16 nowTotalPrice = dMsgObject_getMsgObjectClass()->getNowTotalPrice();
@@ -853,7 +800,6 @@ void daMyna_c::thanks_talk_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 8094772C-80947794 001BAC 0068+00 1/0 0/0 0/0 .text            thanks_talk_move__8daMyna_cFv */
 void daMyna_c::thanks_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -861,7 +807,6 @@ void daMyna_c::thanks_talk_move() {
     }
 }
 
-/* 80947794-809478D0 001C14 013C+00 1/0 0/0 0/0 .text            byebye_talk_init__8daMyna_cFv */
 void daMyna_c::byebye_talk_init() {
     int payment_diff = dMsgObject_getTotalPayment() - field_0x922;
     int price_diff = dMsgObject_getTotalPrice() - field_0x920;
@@ -898,7 +843,6 @@ void daMyna_c::byebye_talk_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 809478D0-80947A00 001D50 0130+00 1/0 0/0 0/0 .text            byebye_talk_move__8daMyna_cFv */
 void daMyna_c::byebye_talk_move() {
     bool bVar1 = true;
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
@@ -930,7 +874,6 @@ void daMyna_c::byebye_talk_move() {
     }
 }
 
-/* 80947A00-80947AA4 001E80 00A4+00 1/0 0/0 0/0 .text            turn_on_start_init__8daMyna_cFv */
 void daMyna_c::turn_on_start_init() {
     setAnimeType(4, 0.0f);
     if (daMyna_LightActor->getTurnOnFlag()) {
@@ -940,7 +883,6 @@ void daMyna_c::turn_on_start_init() {
     }
 }
 
-/* 80947AA4-80947CD0 001F24 022C+00 1/0 0/0 0/0 .text            turn_on_start_move__8daMyna_cFv */
 void daMyna_c::turn_on_start_move() {
     cXyz stack_28;
     cXyz local_34;
@@ -968,12 +910,10 @@ void daMyna_c::turn_on_start_move() {
     }
 }
 
-/* 80947CD0-80947CFC 002150 002C+00 1/0 0/0 0/0 .text            turn_on_init__8daMyna_cFv */
 void daMyna_c::turn_on_init() {
     setAnimeType(7, 0.0f);
 }
 
-/* 80947CFC-80947D48 00217C 004C+00 1/0 0/0 0/0 .text            turn_on_move__8daMyna_cFv */
 void daMyna_c::turn_on_move() {
     if (field_0x91E != 0) {
         daMyna_LightActor->setTurnOnOffChange();
@@ -981,12 +921,10 @@ void daMyna_c::turn_on_move() {
     }
 }
 
-/* 80947D48-80947D74 0021C8 002C+00 1/0 0/0 0/0 .text            turn_on_end1_init__8daMyna_cFv */
 void daMyna_c::turn_on_end1_init() {
     setAnimeType(4, 0.0f);
 }
 
-/* 80947D74-80947E18 0021F4 00A4+00 1/0 0/0 0/0 .text            turn_on_end1_move__8daMyna_cFv */
 void daMyna_c::turn_on_end1_move() {
     cXyz local_18 = home.pos - current.pos;
     s16 sVar2 = cM_atan2s(local_18.x, local_18.z);
@@ -999,14 +937,12 @@ void daMyna_c::turn_on_end1_move() {
     }
 }
 
-/* 80947E18-80947E50 002298 0038+00 1/0 0/0 0/0 .text            turn_on_end2_init__8daMyna_cFv */
 void daMyna_c::turn_on_end2_init() {
     if (field_0x935 != 4) {
         setAnimeType(4, 0.0f);
     }
 }
 
-/* 80947E50-80948070 0022D0 0220+00 1/0 0/0 0/0 .text            turn_on_end2_move__8daMyna_cFv */
 void daMyna_c::turn_on_end2_move() {
     cXyz stack_24;
     cXyz local_30;
@@ -1029,12 +965,10 @@ void daMyna_c::turn_on_end2_move() {
     }
 }
 
-/* 80948070-80948074 0024F0 0004+00 1/0 0/0 0/0 .text            turn_on_end3_init__8daMyna_cFv */
 void daMyna_c::turn_on_end3_init() {
     /* empty function */
 }
 
-/* 80948074-809480E4 0024F4 0070+00 1/0 0/0 0/0 .text            turn_on_end3_move__8daMyna_cFv */
 void daMyna_c::turn_on_end3_move() {
     cLib_addCalcAngleS(&current.angle.y, home.angle.y, l_HOSTIO.turn_angle_add_val, l_HOSTIO.max_vibration_angle,
                        l_HOSTIO.min_vibration_angle);
@@ -1045,12 +979,10 @@ void daMyna_c::turn_on_end3_move() {
     }
 }
 
-/* 809480E4-80948118 002564 0034+00 1/0 0/0 0/0 .text            wolf_talk_init__8daMyna_cFv */
 void daMyna_c::wolf_talk_init() {
     mMsgFlow.init(this, 0xC9, 0, NULL);
 }
 
-/* 80948118-80948174 002598 005C+00 1/0 0/0 0/0 .text            wolf_talk_move__8daMyna_cFv */
 void daMyna_c::wolf_talk_move() {
     if (mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -1058,14 +990,12 @@ void daMyna_c::wolf_talk_move() {
     }
 }
 
-/* 80948174-809481B4 0025F4 0040+00 1/0 0/0 0/0 .text            attack_wait2_init__8daMyna_cFv */
 void daMyna_c::attack_wait2_init() {
     setAnimeType(1, 0.0f);
     field_0x92A = 0;
 }
 
 
-/* 809481B4-80948388 002634 01D4+00 1/0 0/0 0/0 .text            attack_wait2_move__8daMyna_cFv */
 void daMyna_c::attack_wait2_move() {
     if (daPy_py_c::checkNowWolf()) {
         field_0x92C = 7;
@@ -1105,13 +1035,11 @@ void daMyna_c::attack_wait2_move() {
 }
 
 
-/* 80948388-809483DC 002808 0054+00 1/0 0/0 0/0 .text attack_before_talk2_init__8daMyna_cFv */
 void daMyna_c::attack_before_talk2_init() {
     mMsgFlow.init(this, field_0x91C, 0, NULL);
     setAnimeType(10, 0.0f);
 }
 
-/* 809483DC-80948444 00285C 0068+00 1/0 0/0 0/0 .text attack_before_talk2_move__8daMyna_cFv */
 void daMyna_c::attack_before_talk2_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -1119,13 +1047,11 @@ void daMyna_c::attack_before_talk2_move() {
     }
 }
 
-/* 80948444-80948484 0028C4 0040+00 1/0 0/0 0/0 .text            attack_fly2_init__8daMyna_cFv */
 void daMyna_c::attack_fly2_init() {
     setAnimeType(0, 0.0f);
     field_0x91A = 0;
 }
 
-/* 80948484-80948600 002904 017C+00 1/0 0/0 0/0 .text            attack_fly2_move__8daMyna_cFv */
 void daMyna_c::attack_fly2_move() {
     if (daMyna_evtTagActor0 != NULL) {
         cXyz stack_2c(1.0f, 1.0f, 1.0f);
@@ -1159,13 +1085,11 @@ void daMyna_c::attack_fly2_move() {
     }
 }
 
-/* 80948600-80948644 002A80 0044+00 1/0 0/0 0/0 .text            attack2_init__8daMyna_cFv */
 void daMyna_c::attack2_init() {
     setAnimeType(8, 0.0f);
     mSph.OnAtVsPlayerBit();
 }
 
-/* 80948644-809486F8 002AC4 00B4+00 1/0 0/0 0/0 .text            attack2_move__8daMyna_cFv */
 void daMyna_c::attack2_move() {
     mStatus.Move();
     if (field_0x91E != 0) {
@@ -1186,13 +1110,11 @@ void daMyna_c::attack2_move() {
     }
 }
 
-/* 809486F8-80948734 002B78 003C+00 1/0 0/0 0/0 .text            attack2_talk_init__8daMyna_cFv */
 void daMyna_c::attack2_talk_init() {
     field_0x91C = 214;
     mMsgFlow.init(this, field_0x91C, 0, NULL);
 }
 
-/* 80948734-809487EC 002BB4 00B8+00 1/0 0/0 0/0 .text            attack2_talk_move__8daMyna_cFv */
 void daMyna_c::attack2_talk_move() {
     if (eventInfo.checkCommandTalk() && mMsgFlow.doFlow(this, NULL, 0) != 0) {
         dComIfGp_event_reset();
@@ -1209,7 +1131,6 @@ void daMyna_c::attack2_talk_move() {
     }
 }
 
-/* 809487EC-80948828 002C6C 003C+00 0/0 0/0 2/2 .text            soldoutItem__8daMyna_cFUi */
 void daMyna_c::soldoutItem(fpc_ProcID i_itemId) {
     for (int i = 0; i < mNumShopItems; i++) {
         if (i_itemId == mShopItems[i].mTargetActorID) {
@@ -1218,7 +1139,6 @@ void daMyna_c::soldoutItem(fpc_ProcID i_itemId) {
     }
 }
 
-/* 80948828-80948ADC 002CA8 02B4+00 2/2 0/0 0/0 .text            fly_attack_move__8daMyna_cFv */
 bool daMyna_c::fly_attack_move() {
     daPy_py_c* playerActorClass = daPy_getPlayerActorClass();
     cXyz vec_0x68;
@@ -1246,7 +1166,6 @@ bool daMyna_c::fly_attack_move() {
     }
 }
 
-/* 80948ADC-80948DFC 002F5C 0320+00 2/2 0/0 0/0 .text            fly_return_move__8daMyna_cFv */
 bool daMyna_c::fly_return_move() {
     cXyz local_30;
     if (mDamageTimer > 0) {
@@ -1281,7 +1200,6 @@ bool daMyna_c::fly_return_move() {
     return false;
 }
 
-/* 80948DFC-80948E84 00327C 0088+00 2/2 0/0 0/0 .text            fly_body_wave__8daMyna_cFv */
 void daMyna_c::fly_body_wave() {
     if (field_0x935 == 0) {
         field_0x91A += l_HOSTIO.heaving_speed;
@@ -1291,7 +1209,6 @@ void daMyna_c::fly_body_wave() {
     }
 }
 
-/* 80948E84-80948FAC 003304 0128+00 1/1 0/0 0/0 .text            talkAnime__8daMyna_cFP9msg_class */
 void daMyna_c::talkAnime(msg_class* param_0) {
     u32 uVar4 = 0;
     if (param_0 != NULL && this == dComIfGp_event_getTalkPartner()) {
@@ -1320,7 +1237,6 @@ void daMyna_c::talkAnime(msg_class* param_0) {
     }
 }
 
-/* 80948FAC-809490B8 00342C 010C+00 1/1 0/0 0/0 .text            chkEvent__8daMyna_cFv */
 int daMyna_c::chkEvent() {
     int retVal = 1;
     if (daPy_py_c::checkNowWolf()) {
@@ -1344,7 +1260,6 @@ int daMyna_c::chkEvent() {
     return retVal;
 }
 
-/* 809490B8-80949128 003538 0070+00 2/1 0/0 0/0 .text            orderEvent__8daMyna_cFv */
 int daMyna_c::orderEvent() {
     if (daPy_py_c::checkNowWolf()) {
         switch (field_0x92C) {
@@ -1367,7 +1282,6 @@ int daMyna_c::orderEvent() {
     return 1;
 }
 
-/* 80949128-80949144 0035A8 001C+00 1/1 0/0 0/0 .text            deleteItem__8daMyna_cFi */
 void daMyna_c::deleteItem(int i_itemIndex) {
     mShopItems[i_itemIndex].mTargetActorID = -1;
     mShopItems[i_itemIndex].mItemStatus = 4;
@@ -1377,7 +1291,6 @@ void daMyna_c::deleteItem(int i_itemIndex) {
 #pragma push
 #pragma force_active on
 
-/* 80949144-80949190 0035C4 004C+00 0/0 0/0 0/0 .text            deleteItem__8daMyna_cFUi */
 void daMyna_c::deleteItem(fpc_ProcID i_itemId) {
     for (int i = 0; i < mNumShopItems; i++) {
         if (i_itemId == mShopItems[i].mTargetActorID) {
@@ -1389,7 +1302,6 @@ void daMyna_c::deleteItem(fpc_ProcID i_itemId) {
 
 #pragma pop
 
-/* 80949190-80949408 003610 0278+00 1/1 0/0 0/0 .text            initiate__8daMyna_cFv */
 void daMyna_c::initiate() {
     for (int i = 0; i < 10; i++) {
         mShopItems[i].mTargetActorID = -1;
@@ -1453,7 +1365,6 @@ void daMyna_c::initiate() {
     setMcaMorfAnm(key_anm, 1.0f, 0.0f, 2, 0, -1);
 }
 
-/* 80949408-80949544 003888 013C+00 1/1 0/0 0/0 .text            setItemInfo__8daMyna_cFv */
 void daMyna_c::setItemInfo() {
     if (daMyna_actor_count != -1 && mNumShopItems > daMyna_actor_count) {
         daMyna_actor_count = 0;
@@ -1477,21 +1388,18 @@ void daMyna_c::setItemInfo() {
     }
 }
 
-/* 80949544-80949588 0039C4 0044+00 2/2 0/0 0/0 .text            setRoomNo__8daMyna_cFv */
 void daMyna_c::setRoomNo() {
     s8 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStatus.SetRoomId(roomId);
 }
 
-/* 80949588-809495E0 003A08 0058+00 1/1 0/0 0/0 .text            setCollision__8daMyna_cFv */
 void daMyna_c::setCollision() {
     mSph.SetC(field_0x85C);
     mSph.SetR(15.0f);
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 809495E0-80949744 003A60 0164+00 1/1 0/0 0/0 .text            set_mtx__8daMyna_cFv */
 void daMyna_c::set_mtx() {
     J3DModel* model = mpMorf->getModel();
     cXyz local_18(current.pos);
@@ -1511,7 +1419,6 @@ void daMyna_c::set_mtx() {
     field_0x838 -= current.pos;
 }
 
-/* 80949744-8094983C 003BC4 00F8+00 1/1 0/0 0/0 .text            animePlay__8daMyna_cFv */
 void daMyna_c::animePlay() {
     int reg_r29 = 15;
     f32 speed = mpMorf->getPlaySpeed();
@@ -1540,8 +1447,6 @@ void daMyna_c::animePlay() {
     cLib_offBit<u16>(field_0x914, reg_r29);
 }
 
-/* 8094983C-809498B8 003CBC 007C+00 2/2 0/0 0/0 .text
- * setMcaMorfAnm__8daMyna_cFP18J3DAnmTransformKeyffiii          */
 int daMyna_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr,
                             int i_start, int i_end) {
     f32 f_start = i_start;
@@ -1552,14 +1457,11 @@ int daMyna_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, i
 }
 
 
-/* 809498B8-809498F8 003D38 0040+00 2/2 0/0 0/0 .text
- * setBtpAnm__8daMyna_cFP16J3DAnmTexPatternP12J3DModelDatafi    */
 void daMyna_c::setBtpAnm(J3DAnmTexPattern* i_btk, J3DModelData* param_1, f32 i_rate,
                          int i_attribute) {
     mBtpAnm.init(param_1, i_btk, 1, i_attribute, i_rate, 0, -1);
 }
 
-/* 809498F8-80949948 003D78 0050+00 2/2 0/0 0/0 .text            getTrnsfrmKeyAnm__8daMyna_cFPc */
 J3DAnmTransformKey* daMyna_c::getTrnsfrmKeyAnm(char* i_resName) {
     if (i_resName != NULL) {
         return static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Npc_myna", i_resName));
@@ -1568,7 +1470,6 @@ J3DAnmTransformKey* daMyna_c::getTrnsfrmKeyAnm(char* i_resName) {
     }
 }
 
-/* 80949948-80949998 003DC8 0050+00 2/2 0/0 0/0 .text            getTexPtrnAnm__8daMyna_cFPc */
 J3DAnmTexPattern* daMyna_c::getTexPtrnAnm(char* i_resName) {
     if (i_resName != NULL) {
         return static_cast<J3DAnmTexPattern*>(dComIfG_getObjectRes("Npc_myna", i_resName));
@@ -1577,7 +1478,6 @@ J3DAnmTexPattern* daMyna_c::getTexPtrnAnm(char* i_resName) {
     }
 }
 
-/* 80949998-80949A70 003E18 00D8+00 1/1 0/0 0/0 .text            checkEndAnm__8daMyna_cFf */
 int daMyna_c::checkEndAnm(f32 param_0) {
     bool retVal;
     switch ((u8)mpMorf->getPlayMode()) {
@@ -1594,7 +1494,6 @@ int daMyna_c::checkEndAnm(f32 param_0) {
     }
 }
 
-/* 80949A70-80949AD4 003EF0 0064+00 1/1 0/0 0/0 .text checkEndAnm__8daMyna_cFP12J3DFrameCtrl */
 int daMyna_c::checkEndAnm(J3DFrameCtrl* param_0) {
     switch (param_0->getAttribute()) {
     case 2:
@@ -1610,13 +1509,11 @@ int daMyna_c::checkEndAnm(J3DFrameCtrl* param_0) {
     }
 }
 
-/* 80949AD4-80949AE0 003F54 000C+00 1/1 0/0 0/0 .text            getItemNumMax__8daMyna_cFv */
 u8 daMyna_c::getItemNumMax() {
     u8 param_val = (fopAcM_GetParam(this) & 0xF000000) >> 24;
     return param_val;
 }
 
-/* 80949AE0-80949C0C 003F60 012C+00 1/1 0/0 0/0 .text            getItemType__8daMyna_cFPv */
 u8 daMyna_c::getItemType(void* param_0) {
     u8 itemType = 0xF;
     u8 uVar1 = fopAcM_GetParam(param_0) & 0xFF;
@@ -1680,13 +1577,11 @@ u8 daMyna_c::getItemType(void* param_0) {
     return itemType;
 }
 
-/* 80949C0C-80949C44 00408C 0038+00 3/3 0/0 0/0 .text            getFlowNodeNum__8daMyna_cFv */
 u16 daMyna_c::getFlowNodeNum() {
     u16 num = home.angle.x;
     return (num == 0xFFFF || num == 0) ? -1 : num;
 }
 
-/* 80949C44-80949D54 0040C4 0110+00 1/1 0/0 0/0 .text            checkDead__8daMyna_cFv */
 void daMyna_c::checkDead() {
     for (int i = 0; i < 10; i++) {
         if (mShopItems[i].mItemStatus == 2 && !fopAcM_IsExecuting(mShopItems[i].mTargetActorID)) {
@@ -1710,8 +1605,6 @@ void daMyna_c::checkDead() {
     }
 }
 
-/* 80949D54-80949EE8 0041D4 0194+00 7/7 0/0 0/0 .text
- * chkPlayerInEvtArea__8daMyna_cFP10fopAc_ac_c4cXyz             */
 int daMyna_c::chkPlayerInEvtArea(fopAc_ac_c* param_0, cXyz param_1) {
     cXyz local_60;
     cXyz local_6c;
@@ -1739,7 +1632,6 @@ int daMyna_c::chkPlayerInEvtArea(fopAc_ac_c* param_0, cXyz param_1) {
     return retVal;
 }
 
-/* 80949EE8-8094A054 004368 016C+00 2/1 0/0 0/0 .text            animeControl__8daMyna_cFv */
 void daMyna_c::animeControl() {
     f32 rate = 1.0f;
     int attr = J3DFrameCtrl::EMode_LOOP;
@@ -1785,7 +1677,6 @@ void daMyna_c::animeControl() {
     }
 }
 
-/* 8094A054-8094A098 0044D4 0044+00 24/24 0/0 0/0 .text            setAnimeType__8daMyna_cFUcf */
 void daMyna_c::setAnimeType(u8 param_0, f32 param_1) {
     if (param_0 == 13 || param_0 == 1 || (param_0 == 14 && field_0x935 != 13)) {
         param_1 = 6.0f;
@@ -1796,8 +1687,6 @@ void daMyna_c::setAnimeType(u8 param_0, f32 param_1) {
 }
 
 
-/* 8094A098-8094A608 004518 0570+00 1/1 0/0 0/0 .text            playDefaultWaitAnime__8daMyna_cFv
- */
 void daMyna_c::playDefaultWaitAnime() {
     switch (field_0x935) {
     case 2:
@@ -1863,8 +1752,6 @@ char* dummy_lit_121495() {
 }
 #endif
 
-/* 8094A608-8094A890 004A88 0288+00 1/1 0/0 0/0 .text            setDefaultWaitAnime__8daMyna_cFUc
- */
 void daMyna_c::setDefaultWaitAnime(u8 param_0) {
     if (daMyna_LightActor != NULL && field_0x935 == 1 &&
         (field_0x92C == 0 || field_0x92C == 5 || field_0x92C == 7) &&
@@ -1900,39 +1787,32 @@ void daMyna_c::setDefaultWaitAnime(u8 param_0) {
     }
 }
 
-/* 8094A890-8094A8B0 004D10 0020+00 1/0 0/0 0/0 .text            daMyna_Create__FPv */
 static int daMyna_Create(void* i_this) {
     return static_cast<daMyna_c*>(i_this)->create();
 }
 
-/* 8094A8B0-8094A8D0 004D30 0020+00 1/0 0/0 0/0 .text            daMyna_Delete__FPv */
 static int daMyna_Delete(void* i_this) {
     return static_cast<daMyna_c*>(i_this)->destroy();
 }
 
-/* 8094A8D0-8094A8F0 004D50 0020+00 1/0 0/0 0/0 .text            daMyna_Execute__FPv */
 static int daMyna_Execute(void* i_this) {
     return static_cast<daMyna_c*>(i_this)->execute();
 }
 
-/* 8094A8F0-8094A910 004D70 0020+00 1/0 0/0 0/0 .text            daMyna_Draw__FPv */
 static int daMyna_Draw(void* i_this) {
     return static_cast<daMyna_c*>(i_this)->draw();
 }
 
-/* 8094A910-8094A918 004D90 0008+00 1/0 0/0 0/0 .text            daMyna_IsDelete__FPv */
 static int daMyna_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8094B934-8094B954 -00001 0020+00 1/0 0/0 0/0 .data            daMyna_MethodTable */
 static actor_method_class daMyna_MethodTable = {
     (process_method_func)daMyna_Create,  (process_method_func)daMyna_Delete,
     (process_method_func)daMyna_Execute, (process_method_func)daMyna_IsDelete,
     (process_method_func)daMyna_Draw,
 };
 
-/* 8094B954-8094B984 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MYNA */
 extern actor_process_profile_definition g_profile_MYNA = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp
index 96aa10addf..5b4b734f88 100644
--- a/src/d/actor/d_a_nbomb.cpp
+++ b/src/d/actor/d_a_nbomb.cpp
@@ -14,7 +14,6 @@
 #include "f_op/f_op_kankyo_mng.h"
 #include "d/actor/d_a_mirror.h"
 
-/* 804C6DCC-804C6E10 0000EC 0044+00 1/1 0/0 0/0 .text coHitCallback__9daNbomb_cFP10fopAc_ac_c */
 void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) {
     if (fopAcM_GetGroup(i_hitActor) == fopAc_ENEMY_e ||
         (checkStateFlg0(FLG0_INSECT_BOMB) &&
@@ -24,31 +23,23 @@ void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) {
     }
 }
 
-/* 804C6E10-804C6E34 000130 0024+00 2/2 0/0 0/0 .text
- * daNbomb_coHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daNbomb_coHitCallback(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                                   fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     ((daNbomb_c*)i_coActorA)->coHitCallback(i_coActorB);
 }
 
-/* 804CC340-804CC34C 000000 000C+00 12/12 0/0 0/0 .rodata          @3767 */
 static u8 const lit_3767[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804CC34C-804CC358 00000C 000C+00 0/1 0/0 0/0 .rodata          l_localCenterOffset */
 static Vec const l_localCenterOffset = {0.0f, 30.0f, 0.0f};
 
-/* 804CC358-804CC360 000018 0006+02 1/0 0/0 0/0 .rodata          l_arcNameBombF */
 static char const l_arcNameBombF[] = "Bombf";
 
-/* 804CC360-804CC368 000020 0005+03 1/1 0/0 0/0 .rodata          l_arcNameBombE */
 static char const l_arcNameBombE[] = "E_BI";
 
-/* 804CC368-804CC370 000028 0005+03 1/1 0/0 0/0 .rodata          l_arcNameBombEW */
 static char const l_arcNameBombEW[] = "E_BG";
 
-/* 804C6E34-804C6F78 000154 0144+00 1/1 0/0 0/0 .text tgHitCallback__9daNbomb_cFP12dCcD_GObjInf */
 void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) {
     if (i_hitObj->ChkAtType(AT_TYPE_BOOMERANG)) {
         if (!fopAcM_checkCarryNow(this) && !fopAcM_checkHookCarryNow(this) &&
@@ -80,14 +71,11 @@ void daNbomb_c::tgHitCallback(dCcD_GObjInf* i_hitObj) {
     }
 }
 
-/* 804C6FB4-804C6FD8 0002D4 0024+00 1/1 0/0 0/0 .text
- * daNbomb_tgHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void daNbomb_tgHitCallback(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                                   fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     ((daNbomb_c*)i_tgActor)->tgHitCallback(i_atObjInf);
 }
 
-/* 804C6FD8-804C70C0 0002F8 00E8+00 1/1 0/0 0/0 .text searchEnemy__9daNbomb_cFP10fopAc_ac_c */
 int daNbomb_c::searchEnemy(fopAc_ac_c* i_enemy) {
     mDoMtx_multVec(field_0xa70, &i_enemy->current.pos, &field_0xc14);
 
@@ -105,7 +93,6 @@ int daNbomb_c::searchEnemy(fopAc_ac_c* i_enemy) {
     return 0;
 }
 
-/* 804C70C0-804C7114 0003E0 0054+00 1/1 0/0 0/0 .text daNbomb_searchEnemy__FP10fopAc_ac_cPv */
 static void* daNbomb_searchEnemy(fopAc_ac_c* i_actor, void* i_data) {
     if (fopAcM_GetGroup(i_actor) == fopAc_ENEMY_e &&
         ((daNbomb_c*)i_data)->searchEnemy(i_actor) != NULL)
@@ -116,7 +103,6 @@ static void* daNbomb_searchEnemy(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 804CC4D8-804CC518 000000 0040+00 1/1 0/0 0/0 .data            l_sphSrc */
 static dCcD_SrcSph l_sphSrc = {
     {
         {0x0, {{AT_TYPE_BOMB, 0x4, 0x1e}, {0xd8fbffef, 0x11}, 0x79}},  // mObj
@@ -129,13 +115,11 @@ static dCcD_SrcSph l_sphSrc = {
     }  // mSphAttr
 };
 
-/* 804CC518-804CC530 -00001 0018+00 4/4 0/0 0/0 .data            m_arcNameList__9daNbomb_c */
 const char* daNbomb_c::m_arcNameList[6] = {
     daAlink_c::getAlinkArcName(), daAlink_c::getAlinkArcName(), daAlink_c::getAlinkArcName(),
     l_arcNameBombF, l_arcNameBombE, l_arcNameBombEW,
 };
 
-/* 804C7114-804C72BC 000434 01A8+00 1/1 0/0 0/0 .text            createHeap__9daNbomb_cFv */
 int daNbomb_c::createHeap() {
     static u16 const bmdIdx[6] = {0x001E, 0x0027, 0x0026, 0x0003, 0x000E, 0x000A};
 
@@ -174,13 +158,10 @@ int daNbomb_c::createHeap() {
     return 1;
 }
 
-/* 804C7304-804C7324 000624 0020+00 1/1 0/0 0/0 .text            daNbomb_createHeap__FP10fopAc_ac_c
- */
 static int daNbomb_createHeap(fopAc_ac_c* i_this) {
     return ((daNbomb_c*)i_this)->createHeap();
 }
 
-/* 804C7324-804C7B44 000644 0820+00 1/1 0/0 0/0 .text            create__9daNbomb_cFv */
 int daNbomb_c::create() {
     fopAcM_GetID(this);
     fopAcM_ct(this, daNbomb_c);
@@ -385,12 +366,10 @@ int daNbomb_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804C7E94-804C7EB4 0011B4 0020+00 1/0 0/0 0/0 .text            daNbomb_Create__FP10fopAc_ac_c */
 static int daNbomb_Create(fopAc_ac_c* i_this) {
     return ((daNbomb_c*)i_this)->create();
 }
 
-/* 804C7EB4-804C826C 0011D4 03B8+00 1/1 0/0 0/0 .text            __dt__9daNbomb_cFv */
 daNbomb_c::~daNbomb_c() {
     if (mExplodeMode < 2) {
         dKy_actor_addcol_set(0, 0, 0, 0.0f);
@@ -431,13 +410,11 @@ daNbomb_c::~daNbomb_c() {
     }
 }
 
-/* 804C826C-804C8294 00158C 0028+00 1/0 0/0 0/0 .text            daNbomb_Delete__FP9daNbomb_c */
 static int daNbomb_Delete(daNbomb_c* i_this) {
     i_this->~daNbomb_c();
     return 1;
 }
 
-/* 804C8294-804C82D8 0015B4 0044+00 2/2 0/0 0/0 .text            checkTimerStop__9daNbomb_cFv */
 bool daNbomb_c::checkTimerStop() {
     return fopAcM_GetParam(this) == PRM_FLOWER_BOMB ||
            checkStateFlg0(daNbomb_FLG0(FLG0_UNK_800 | FLG0_FROZEN)) ||
@@ -445,7 +422,6 @@ bool daNbomb_c::checkTimerStop() {
             fopAcM_GetParam(this) == PRM_ENEMY_BOMB_BOOMERANG_MOVE);
 }
 
-/* 804C82D8-804C8430 0015F8 0158+00 5/5 0/0 0/0 .text            checkExplode__9daNbomb_cFv */
 BOOL daNbomb_c::checkExplode() {
     if (checkStateFlg0(daNbomb_FLG0(FLG0_UNK_800 | FLG0_FROZEN))) {
         return false;
@@ -476,7 +452,6 @@ BOOL daNbomb_c::checkExplode() {
     return false;
 }
 
-/* 804C8430-804C84D8 001750 00A8+00 5/5 0/0 0/0 .text            setRoomInfo__9daNbomb_cFv */
 void daNbomb_c::setRoomInfo() {
     int room_no;
     if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
@@ -493,7 +468,6 @@ void daNbomb_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, room_no);
 }
 
-/* 804C84D8-804C8588 0017F8 00B0+00 2/2 0/0 0/0 .text            setSmokePos__9daNbomb_cFv */
 void daNbomb_c::setSmokePos() {
     if (mType == TYPE_INSECT_ENEMY || mType == TYPE_WATER_ENEMY) {
         mDoMtx_multVecZero(mpModel->getBaseTRMtx(), &mEffectPosition);
@@ -505,7 +479,6 @@ void daNbomb_c::setSmokePos() {
     field_0xbe4 = (mEffectPosition - mEffectLastPosition) * 0.5f;
 }
 
-/* 804C8588-804C87F0 0018A8 0268+00 1/1 0/0 0/0 .text            setEffect__9daNbomb_cFv */
 void daNbomb_c::setEffect() {
     static cXyz effectScale(1.8f, 1.8f, 1.8f);
 
@@ -544,7 +517,6 @@ void daNbomb_c::setEffect() {
     }
 }
 
-/* 804C87F0-804C88CC 001B10 00DC+00 2/2 0/0 0/0 .text            setHookshotOffset__9daNbomb_cFv */
 void daNbomb_c::setHookshotOffset() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -558,7 +530,6 @@ void daNbomb_c::setHookshotOffset() {
     offStateFlg0(FLG0_SET_HOOKSHOT_OFFSET);
 }
 
-/* 804C88CC-804C88F0 001BEC 0024+00 2/2 0/0 0/0 .text            setFreeze__9daNbomb_cFv */
 void daNbomb_c::setFreeze() {
     if (!checkStateFlg0(FLG0_FROZEN)) {
         onStateFlg0(FLG0_FROZEN);
@@ -566,12 +537,10 @@ void daNbomb_c::setFreeze() {
     }
 }
 
-/* 804C88F0-804C8928 001C10 0038+00 3/3 0/0 0/0 .text            checkWaterIn__9daNbomb_cFv */
 BOOL daNbomb_c::checkWaterIn() {
     return mAcch.ChkWaterHit() && current.pos.y + 30.0f < mAcch.m_wtr.GetHeight();
 }
 
-/* 804C8928-804C8A40 001C48 0118+00 3/3 0/0 0/0 .text            insectLineCheck__9daNbomb_cFv */
 int daNbomb_c::insectLineCheck() {
     if (dComIfG_Bgsp().LineCross(&mLineChk)) {
         cM3dGPla chk_poly;
@@ -591,7 +560,6 @@ int daNbomb_c::insectLineCheck() {
     return 0;
 }
 
-/* 804C8A88-804C8CF8 001DA8 0270+00 2/2 0/0 0/0 .text            setHitPolygon__9daNbomb_cFi */
 void daNbomb_c::setHitPolygon(BOOL param_0) {
     if (!param_0) {
         mInsectHitPolyInfo.SetPolyInfo(mLineChk);
@@ -636,7 +604,6 @@ void daNbomb_c::setHitPolygon(BOOL param_0) {
     mDoMtx_inverse(mpModel->getBaseTRMtx(), field_0xa70);
 }
 
-/* 804C8CF8-804C9118 002018 0420+00 5/5 0/0 0/0 .text            procExplodeInit__9daNbomb_cFv */
 BOOL daNbomb_c::procExplodeInit() {
     fopAcM_OnStatus(this, 0x20000);
     daAlink_c* player = daAlink_getAlinkActorClass();
@@ -738,7 +705,6 @@ BOOL daNbomb_c::procExplodeInit() {
     return true;
 }
 
-/* 804C9118-804C93E0 002438 02C8+00 1/0 0/0 0/0 .text            procExplode__9daNbomb_cFv */
 BOOL daNbomb_c::procExplode() {
     camera_class* camera = dComIfGp_getCamera(0);
     f32 dist_scale = 0.0f;
@@ -790,7 +756,6 @@ BOOL daNbomb_c::procExplode() {
     return true;
 }
 
-/* 804C93E0-804C955C 002700 017C+00 6/6 0/0 0/0 .text            procCarryInit__9daNbomb_cFv */
 BOOL daNbomb_c::procCarryInit() {
     mProcFunc = &daNbomb_c::procCarry;
 
@@ -818,7 +783,6 @@ BOOL daNbomb_c::procCarryInit() {
     return true;
 }
 
-/* 804C955C-804C9930 00287C 03D4+00 1/0 0/0 0/0 .text            procCarry__9daNbomb_cFv */
 BOOL daNbomb_c::procCarry() {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -892,7 +856,6 @@ BOOL daNbomb_c::procCarry() {
     return true;
 }
 
-/* 804C9930-804C9984 002C50 0054+00 4/4 0/0 0/0 .text            procWaitInit__9daNbomb_cFv */
 BOOL daNbomb_c::procWaitInit() {
     if (fopAcM_GetParam(this) == PRM_BOMB_CARRY) {
         onStateFlg0(FLG0_UNK_20000);
@@ -904,7 +867,6 @@ BOOL daNbomb_c::procWaitInit() {
     return true;
 }
 
-/* 804C9984-804CA268 002CA4 08E4+00 2/1 0/0 0/0 .text            procWait__9daNbomb_cFv */
 BOOL daNbomb_c::procWait() {
     if (checkExplode()) {
         return true;
@@ -1095,7 +1057,6 @@ BOOL daNbomb_c::procWait() {
     return true;
 }
 
-/* 804CA268-804CA2EC 003588 0084+00 1/1 0/0 0/0 .text            procFlowerWaitInit__9daNbomb_cFv */
 BOOL daNbomb_c::procFlowerWaitInit() {
     mProcFunc = &daNbomb_c::procFlowerWait;
 
@@ -1108,7 +1069,6 @@ BOOL daNbomb_c::procFlowerWaitInit() {
     return true;
 }
 
-/* 804CA2EC-804CA3B8 00360C 00CC+00 1/0 0/0 0/0 .text            procFlowerWait__9daNbomb_cFv */
 BOOL daNbomb_c::procFlowerWait() {
     if (scale.x < 1.0f) {
         cLib_chaseF(&scale.x, 1.0f, 0.1f);
@@ -1132,8 +1092,6 @@ BOOL daNbomb_c::procFlowerWait() {
     return true;
 }
 
-/* 804CA3B8-804CA4E0 0036D8 0128+00 2/2 0/0 0/0 .text
- * procBoomerangMoveInit__9daNbomb_cFP12dCcD_GObjInf            */
 BOOL daNbomb_c::procBoomerangMoveInit(dCcD_GObjInf* unused) {
     if (mProcFunc == &daNbomb_c::procBoomerangMove) {
         return false;
@@ -1160,7 +1118,6 @@ BOOL daNbomb_c::procBoomerangMoveInit(dCcD_GObjInf* unused) {
     return true;
 }
 
-/* 804CA4E0-804CA688 003800 01A8+00 2/0 0/0 0/0 .text            procBoomerangMove__9daNbomb_cFv */
 BOOL daNbomb_c::procBoomerangMove() {
     if (checkExplode()) {
         return true;
@@ -1209,7 +1166,6 @@ BOOL daNbomb_c::procBoomerangMove() {
     return true;
 }
 
-/* 804CA688-804CA780 0039A8 00F8+00 2/2 0/0 0/0 .text            procInsectMoveInit__9daNbomb_cFv */
 BOOL daNbomb_c::procInsectMoveInit() {
     mProcFunc = &daNbomb_c::procInsectMove;
 
@@ -1228,7 +1184,6 @@ BOOL daNbomb_c::procInsectMoveInit() {
     return true;
 }
 
-/* 804CA780-804CAEE8 003AA0 0768+00 2/1 0/0 0/0 .text            procInsectMove__9daNbomb_cFv */
 BOOL daNbomb_c::procInsectMove() {
     if (mNoHitPlayerTimer != 0) {
         mNoHitPlayerTimer--;
@@ -1362,7 +1317,6 @@ BOOL daNbomb_c::procInsectMove() {
     return true;
 }
 
-/* 804CAEE8-804CBC40 004208 0D58+00 1/1 0/0 0/0 .text            execute__9daNbomb_cFv */
 int daNbomb_c::execute() {
     if (!checkStateFlg0(FLG0_UNK_2000)) {
         field_0xb51 = 0;
@@ -1605,12 +1559,10 @@ int daNbomb_c::execute() {
 }
 
 
-/* 804CBC40-804CBC60 004F60 0020+00 1/0 0/0 0/0 .text            daNbomb_Execute__FP9daNbomb_c */
 static int daNbomb_Execute(daNbomb_c* i_this) {
     return i_this->execute();
 }
 
-/* 804CBC60-804CC200 004F80 05A0+00 1/1 0/0 0/0 .text            draw__9daNbomb_cFv */
 int daNbomb_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
 
@@ -1714,14 +1666,12 @@ int daNbomb_c::draw() {
 }
 
 
-/* 804CC200-804CC220 005520 0020+00 1/0 0/0 0/0 .text            daNbomb_Draw__FP9daNbomb_c */
 static int daNbomb_Draw(daNbomb_c* i_this) {
     return i_this->draw();
 }
 
 AUDIO_INSTANCES;
 
-/* 804CC590-804CC5B0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNbombMethod */
 static actor_method_class l_daNbombMethod = {
     (process_method_func)daNbomb_Create,
     (process_method_func)daNbomb_Delete,
@@ -1730,7 +1680,6 @@ static actor_method_class l_daNbombMethod = {
     (process_method_func)daNbomb_Draw,
 };
 
-/* 804CC5B0-804CC5E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NBOMB */
 extern actor_process_profile_definition g_profile_NBOMB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp
index 5126ab8833..b06b8964ed 100644
--- a/src/d/actor/d_a_ni.cpp
+++ b/src/d/actor/d_a_ni.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_ni
-//
-
 
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
@@ -31,7 +26,6 @@ enum Joint {
     /* 0x8 */ JNT_WINGR,
 };
 
-/* 8094BC2C-8094BCA8 0000EC 007C+00 1/1 0/0 0/0 .text            __ct__10daNi_HIO_cFv */
 daNi_HIO_c::daNi_HIO_c() {
     field_0x04 = -1;
     mBaseSize = 1.2f;
@@ -49,7 +43,6 @@ daNi_HIO_c::daNi_HIO_c() {
     field_0x39 = 1;
 }
 
-/* 8094BCA8-8094BD68 000168 00C0+00 13/13 0/0 0/0 .text            anm_init__FP8ni_classifUcf */
 static void anm_init(ni_class* i_this, int i_resID, f32 i_morf, u8 i_mode, f32 i_speed) {
     if (!(i_this->field_0x610 > 1.0f)) {
         J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes("Ni", i_resID);
@@ -58,7 +51,6 @@ static void anm_init(ni_class* i_this, int i_resID, f32 i_morf, u8 i_mode, f32 i
     }
 }
 
-/* 8094BD68-8094BE60 000228 00F8+00 10/10 0/0 0/0 .text            hane_set__FP8ni_classff */
 static void hane_set(ni_class* i_this, f32 i_rate, f32 i_speed) {
     static u16 hane_id[] = {0x82C2, 0x82C0, 0x82C1, 0x82C3};
 
@@ -73,7 +65,6 @@ static void hane_set(ni_class* i_this, f32 i_rate, f32 i_speed) {
     }
 }
 
-/* 8094BE60-8094C110 000320 02B0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int joint_no = i_joint->getJntNo();
@@ -124,7 +115,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8094C110-8094C204 0005D0 00F4+00 1/0 0/0 0/0 .text            daNi_Draw__FP8ni_class */
 static int daNi_Draw(ni_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -146,7 +136,6 @@ static int daNi_Draw(ni_class* i_this) {
     return 1;
 }
 
-/* 8094C240-8094C298 000700 0058+00 1/1 0/0 0/0 .text            s_play_sub__FPvPv */
 static void* s_play_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NI) {
         ni_class* a_actor = (ni_class*)i_actor;
@@ -159,7 +148,6 @@ static void* s_play_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8094C298-8094C4B0 000758 0218+00 1/1 0/0 0/0 .text            damage_check__FP8ni_class */
 static void damage_check(ni_class* i_this) {
     dComIfGp_getPlayer(0);
 
@@ -216,16 +204,12 @@ static void damage_check(ni_class* i_this) {
 
 static u8 data_8095158d;
 
-/* 8095159C-809515D8 000054 003C+00 9/9 0/0 0/0 .bss             l_HIO */
 static daNi_HIO_c l_HIO;
 
-/* 809515D8-80951600 000090 0028+00 2/2 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[10];
 
-/* 80951600-80951604 0000B8 0004+00 2/2 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 8094C4B0-8094C520 000970 0070+00 1/1 0/0 0/0 .text            s_t_sub__FPvPv */
 static void* s_t_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_NE && target_info_count < 10)
     {
@@ -236,7 +220,6 @@ static void* s_t_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8094C520-8094C688 0009E0 0168+00 1/1 0/0 0/0 .text            search_test__FP8ni_class */
 static fopAc_ac_c* search_test(ni_class* i_this) {
     target_info_count = 0;
 
@@ -278,7 +261,6 @@ static fopAc_ac_c* search_test(ni_class* i_this) {
     return NULL;
 }
 
-/* 8094C688-8094C6C4 000B48 003C+00 1/1 0/0 0/0 .text            ni_carry_check__FP8ni_class */
 static void ni_carry_check(ni_class* i_this) {
     dComIfGp_getPlayer(0);
 
@@ -293,7 +275,6 @@ static void ni_carry_check(ni_class* i_this) {
     }
 }
 
-/* 8094C6C4-8094C7B4 000B84 00F0+00 1/1 0/0 0/0 .text            move_gake_check__FP8ni_classf */
 static BOOL move_gake_check(ni_class* i_this, f32 param_1) {
     dBgS_GndChk gnd_chk;
     cXyz sp74;
@@ -316,7 +297,6 @@ static BOOL move_gake_check(ni_class* i_this, f32 param_1) {
     return false;
 }
 
-/* 8094C7B4-8094CE7C 000C74 06C8+00 1/1 0/0 0/0 .text            ni_normal__FP8ni_class */
 static void ni_normal(ni_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -424,7 +404,6 @@ static void ni_normal(ni_class* i_this) {
     }
 }
 
-/* 8094CE7C-8094D2A4 00133C 0428+00 1/1 0/0 0/0 .text            ni_away__FP8ni_class */
 static void ni_away(ni_class* i_this) {
     ni_class* a_this = (ni_class*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -503,7 +482,6 @@ static void ni_away(ni_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.y, a_this->mMoveAngle, 2, angle_max_step);
 }
 
-/* 8094D2A4-8094D60C 001764 0368+00 1/1 0/0 0/0 .text            ni_swim__FP8ni_class */
 static void ni_swim(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp48;
@@ -581,7 +559,6 @@ static void ni_swim(ni_class* i_this) {
     }
 }
 
-/* 8094D60C-8094D7BC 001ACC 01B0+00 1/1 0/0 0/0 .text            ni_carry__FP8ni_class */
 static int ni_carry(ni_class* i_this) {
     ni_class* a_this = (ni_class*)i_this;
     cXyz sp40;
@@ -639,7 +616,6 @@ static int ni_carry(ni_class* i_this) {
     return update_position;
 }
 
-/* 8094D7BC-8094D8EC 001C7C 0130+00 1/1 0/0 0/0 .text            ni_fly__FP8ni_class */
 static void ni_fly(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -671,7 +647,6 @@ static void ni_fly(ni_class* i_this) {
     }
 }
 
-/* 8094D8EC-8094DA0C 001DAC 0120+00 1/1 0/0 0/0 .text            ni_drop__FP8ni_class */
 static void ni_drop(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -700,7 +675,6 @@ static void ni_drop(ni_class* i_this) {
     }
 }
 
-/* 8094DA0C-8094DB98 001ECC 018C+00 1/1 0/0 0/0 .text            ni_return__FP8ni_class */
 static void ni_return(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp38;
@@ -742,7 +716,6 @@ static void ni_return(ni_class* i_this) {
     }
 }
 
-/* 8094DB98-8094DD10 002058 0178+00 1/1 0/0 0/0 .text            ni_damage__FP8ni_class */
 static void ni_damage(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -778,7 +751,6 @@ static void ni_damage(ni_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mMoveAngle, 2, 0x2000);
 }
 
-/* 8094DD10-8094DD74 0021D0 0064+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -791,7 +763,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8094DD74-8094DED0 002234 015C+00 1/1 0/0 0/0 .text            ni_windspin__FP8ni_class */
 static void ni_windspin(ni_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* boomerang = (fopAc_ac_c*)fpcM_Search(s_b_sub, i_this);
@@ -832,7 +803,6 @@ static void ni_windspin(ni_class* i_this) {
     i_this->speed.y = 0.0f;
 }
 
-/* 8094DED0-8094E2B0 002390 03E0+00 1/2 0/0 0/0 .text            ni_demo0__FP8ni_class */
 static int ni_demo0(ni_class* i_this) {
     cXyz sp28;
     cXyz sp34;
@@ -907,7 +877,6 @@ static int ni_demo0(ni_class* i_this) {
     return var_r30;
 }
 
-/* 8094E2B0-8094E378 002770 00C8+00 1/1 0/0 0/0 .text            ni_message__FP8ni_class */
 static void ni_message(ni_class* i_this) {
     switch (i_this->mMode) {
     case 1:
@@ -927,7 +896,6 @@ static void ni_message(ni_class* i_this) {
     }
 }
 
-/* 8094E378-8094E4FC 002838 0184+00 1/1 0/0 0/0 .text            playwallcheck__FP8ni_class */
 static BOOL playwallcheck(ni_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     dBgS_LinChk lin_chk;
@@ -965,7 +933,6 @@ static BOOL playwallcheck(ni_class* i_this) {
     return false;
 }
 
-/* 8094E4FC-8094ED90 0029BC 0894+00 2/1 0/0 0/0 .text            ni_play__FP8ni_class */
 static int ni_play(ni_class* i_this) {
     cXyz sp78;
     cXyz sp84;
@@ -1188,7 +1155,6 @@ static int ni_play(ni_class* i_this) {
     return var_r30;
 }
 
-/* 8094ED90-8094F5D8 003250 0848+00 1/1 0/0 0/0 .text            play_camera__FP8ni_class */
 static void play_camera(ni_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -1421,7 +1387,6 @@ static void play_camera(ni_class* i_this) {
     }
 }
 
-/* 8094F5D8-809502B4 003A98 0CDC+00 2/1 0/0 0/0 .text            action__FP8ni_class */
 static void action(ni_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp148;
@@ -1740,7 +1705,6 @@ static void action(ni_class* i_this) {
     }
 }
 
-/* 809502B4-809503D8 004774 0124+00 1/1 0/0 0/0 .text            message__FP8ni_class */
 static int message(ni_class* i_this) {
     if (i_this->field_0xa52) {
         i_this->field_0x60c = 10;
@@ -1770,7 +1734,6 @@ static int message(ni_class* i_this) {
     return 0;
 }
 
-/* 809503D8-80950870 004898 0498+00 2/1 0/0 0/0 .text            daNi_Execute__FP8ni_class */
 static int daNi_Execute(ni_class* i_this) {
     if (cDmrNowMidnaTalk() && !fopAcM_checkCarryNow(i_this)) {
         return 1;
@@ -1867,12 +1830,10 @@ static int daNi_Execute(ni_class* i_this) {
     return 1;
 }
 
-/* 80950870-80950878 004D30 0008+00 1/0 0/0 0/0 .text            daNi_IsDelete__FP8ni_class */
 static int daNi_IsDelete(ni_class* i_this) {
     return 1;
 }
 
-/* 80950878-809508E0 004D38 0068+00 1/0 0/0 0/0 .text            daNi_Delete__FP8ni_class */
 static int daNi_Delete(ni_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Ni");
 
@@ -1887,7 +1848,6 @@ static int daNi_Delete(ni_class* i_this) {
     return 1;
 }
 
-/* 809508E0-80950AE8 004DA0 0208+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static BOOL useHeapInit(fopAc_ac_c* i_this) {
     ni_class* a_this = (ni_class*)i_this;
 
@@ -1923,7 +1883,6 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) {
     return true;
 }
 
-/* 80950B30-80950F04 004FF0 03D4+00 1/0 0/0 0/0 .text            daNi_Create__FP10fopAc_ac_c */
 static int daNi_Create(fopAc_ac_c* i_this) {
     ni_class* a_this = (ni_class*)i_this;
     fopAcM_ct(a_this, ni_class);
@@ -2029,7 +1988,6 @@ static int daNi_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 80951480-809514A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNi_Method */
 static actor_method_class l_daNi_Method = {
     (process_method_func)daNi_Create,
     (process_method_func)daNi_Delete,
@@ -2038,7 +1996,6 @@ static actor_method_class l_daNi_Method = {
     (process_method_func)daNi_Draw,
 };
 
-/* 80AD5464-80AD5494 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SERA2 */
 extern actor_process_profile_definition g_profile_NI = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp
index bfb33fb9a1..1ae276a6a2 100644
--- a/src/d/actor/d_a_no_chg_room.cpp
+++ b/src/d/actor/d_a_no_chg_room.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_horse.h"
 #include "d/actor/d_a_spinner.h"
 
-/* 801451EC-801452DC 13FB2C 00F0+00 1/1 0/0 0/0 .text            isLoadRoom__Fi */
 static bool isLoadRoom(int i_roomNo) {
     roomRead_class* room = dComIfGp_getStageRoom();
 
@@ -47,7 +46,6 @@ static bool isLoadRoom(int i_roomNo) {
     return true;
 }
 
-/* 801452DC-80145508 13FC1C 022C+00 1/1 0/0 0/0 .text            execute__9daNocrm_cFv */
 int daNocrm_c::execute() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     cXyz cur_player_pos(player_p->current.pos);
@@ -97,7 +95,6 @@ int daNocrm_c::execute() {
     return 1;
 }
 
-/* 80145508-801455A8 13FE48 00A0+00 1/1 0/0 0/0 .text            getRoomNo__9daNocrm_cFi */
 int daNocrm_c::getRoomNo(int param_0) {
     if (mRoomNo[param_0] < 0) {
         f32 z_offset = param_0 ? -scale.z : scale.z;
@@ -136,35 +133,29 @@ int daNocrm_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 801455A8-801456A4 13FEE8 00FC+00 1/0 0/0 0/0 .text            daNocrm_create__FP9daNocrm_c */
 static int daNocrm_create(daNocrm_c* i_this) {
     fopAcM_ct(i_this, daNocrm_c);
     return i_this->create();
 }
 
-/* 801456A4-801456AC 13FFE4 0008+00 1/0 0/0 0/0 .text            daNocrm_Delete__FP9daNocrm_c */
 static int daNocrm_Delete(daNocrm_c* i_this) {
     return 1;
 }
 
-/* 801456AC-801456CC 13FFEC 0020+00 1/0 0/0 0/0 .text            daNocrm_execute__FP9daNocrm_c */
 static int daNocrm_execute(daNocrm_c* i_this) {
     return i_this->execute();
 }
 
-/* 801456CC-801456D4 14000C 0008+00 1/0 0/0 0/0 .text            daNocrm_draw__FP9daNocrm_c */
 static int daNocrm_draw(daNocrm_c* i_this) {
     return 1;
 }
 
-/* 803B3658-803B3678 -00001 0020+00 1/0 0/0 0/0 .data            daNocrm_METHODS */
 static actor_method_class daNocrm_METHODS = {
     (process_method_func)daNocrm_create,  (process_method_func)daNocrm_Delete,
     (process_method_func)daNocrm_execute, (process_method_func)NULL,
     (process_method_func)daNocrm_draw,
 };
 
-/* 803B3678-803B36A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NO_CHG_ROOM */
 extern actor_process_profile_definition g_profile_NO_CHG_ROOM = {
     fpcLy_CURRENT_e,
     2,
diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp
index 1536034daf..97cc372903 100644
--- a/src/d/actor/d_a_npc.cpp
+++ b/src/d/actor/d_a_npc.cpp
@@ -283,24 +283,18 @@ void daNpcT_cmnGenMessage(JORMContext* ctx, daNpcT_HIOParam* i_hioParam) {
 }
 #endif
 
-/* 801456D4-801456E0 140014 000C+00 1/1 0/0 159/159 .text initialize__18daNpcT_ActorMngr_cFv */
 void daNpcT_ActorMngr_c::initialize() {
     mActorID = fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 801456E0-801456FC 140020 001C+00 1/1 0/0 160/160 .text
- * entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c                    */
 void daNpcT_ActorMngr_c::entry(fopAc_ac_c* i_actor) {
     mActorID = fopAcM_GetID(i_actor);
 }
 
-/* 801456FC-80145708 14003C 000C+00 1/1 0/0 382/382 .text            remove__18daNpcT_ActorMngr_cFv
- */
 void daNpcT_ActorMngr_c::remove() {
     mActorID = fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 80145708-80145764 140048 005C+00 2/2 1/1 233/233 .text getActorP__18daNpcT_ActorMngr_cFv */
 fopAc_ac_c* daNpcT_ActorMngr_c::getActorP() {
     fopAc_ac_c* actor = NULL;
 
@@ -312,8 +306,6 @@ fopAc_ac_c* daNpcT_ActorMngr_c::getActorP() {
     return NULL;
 }
 
-/* 80145764-80145788 1400A4 0024+00 0/0 0/0 103/103 .text            initialize__15daNpcT_MatAnm_cFv
- */
 void daNpcT_MatAnm_c::initialize() {
     field_0xF4 = 0.0f;
     field_0xF8 = 0.0f;
@@ -323,7 +315,6 @@ void daNpcT_MatAnm_c::initialize() {
     mMorfFrm = 0;
 }
 
-/* 80145788-80145898 1400C8 0110+00 1/0 0/0 0/0 .text calc__15daNpcT_MatAnm_cCFP11J3DMaterial */
 void daNpcT_MatAnm_c::calc(J3DMaterial* i_material) const {
     J3DMaterialAnm::calc(i_material);
 
@@ -352,8 +343,6 @@ void daNpcT_MatAnm_c::calc(J3DMaterial* i_material) const {
     }
 }
 
-/* 80145898-801458C0 1401D8 0028+00 4/4 0/0 533/533 .text initialize__22daNpcT_MotionSeqMngr_cFv
- */
 void daNpcT_MotionSeqMngr_c::initialize() {
     mNo = 0;
     mOffset = 0;
@@ -363,7 +352,6 @@ void daNpcT_MotionSeqMngr_c::initialize() {
     mEndSequence = false;
 }
 
-/* 801458C0-80145A24 140200 0164+00 2/2 0/0 2/2 .text play__22daNpcT_MotionSeqMngr_cFUsPiPf */
 int daNpcT_MotionSeqMngr_c::play(u16 i_loopNo, int* o_motionNo_p, f32* o_morfFrm_p) {
     int ret = 0;
     JUT_ASSERT(471, NULL != o_motionNo_p);
@@ -399,13 +387,10 @@ int daNpcT_MotionSeqMngr_c::play(u16 i_loopNo, int* o_motionNo_p, f32* o_morfFrm
     return ret;
 }
 
-/* 80145A24-80145A38 140364 0014+00 0/0 0/0 43/43 .text
- * checkEndSequence__22daNpcT_MotionSeqMngr_cFv                 */
 s32 daNpcT_MotionSeqMngr_c::checkEndSequence() {
     return (u8)mEndSequence == true;
 }
 
-/* 80145A38-80145A78 140378 0040+00 2/2 0/0 0/0 .text            daNpcT_addIdx__FiiRUsi */
 static BOOL daNpcT_addIdx(int i_step, int i_num, u16& i_idx, BOOL i_closed) {
     BOOL rt = FALSE;
     int new_idx = i_idx;
@@ -424,7 +409,6 @@ static BOOL daNpcT_addIdx(int i_step, int i_num, u16& i_idx, BOOL i_closed) {
     return rt;
 }
 
-/* 80145A78-80145AC4 1403B8 004C+00 2/2 0/0 0/0 .text            daNpcT_subIdx__FiiRUsi */
 static BOOL daNpcT_subIdx(int i_step, int i_num, u16& i_idx, BOOL i_closed) {
     BOOL rt = FALSE;
     int new_idx = i_idx;
@@ -443,7 +427,6 @@ static BOOL daNpcT_subIdx(int i_step, int i_num, u16& i_idx, BOOL i_closed) {
     return rt;
 }
 
-/* 80145AC4-80145B20 140404 005C+00 5/5 0/0 0/0 .text            daNpcT_incIdx__FiRUsii */
 static int daNpcT_incIdx(int i_num, u16& i_idx, BOOL i_closed, int i_direction) {
     int result = 0;
     if (i_direction) {
@@ -454,7 +437,6 @@ static int daNpcT_incIdx(int i_num, u16& i_idx, BOOL i_closed, int i_direction)
     return result;
 }
 
-/* 80145B20-80145B7C 140460 005C+00 3/3 0/0 0/0 .text            daNpcT_decIdx__FiRUsii */
 static int daNpcT_decIdx(int i_num, u16& i_idx, BOOL i_closed, int i_direction) {
     int result = 0;
     if (i_direction) {
@@ -465,8 +447,6 @@ static int daNpcT_decIdx(int i_num, u16& i_idx, BOOL i_closed, int i_direction)
     return result;
 }
 
-/* 80145B7C-80145C40 1404BC 00C4+00 1/1 0/0 0/0 .text
- * hermite__13daNpcT_Path_cFR4cXyzR4cXyzR4cXyzR4cXyzR16daNpcT_Hermite_cR4cXyz */
 void daNpcT_Path_c::hermite(cXyz& i_start, cXyz& i_startTan, cXyz& i_end, cXyz& i_endTan,
                             daNpcT_Hermite_c& i_hermite, cXyz& o_result) {
     o_result.x = i_start.x * i_hermite.GetH00() + i_end.x * i_hermite.GetH01() +
@@ -479,7 +459,6 @@ void daNpcT_Path_c::hermite(cXyz& i_start, cXyz& i_startTan, cXyz& i_end, cXyz&
                  i_startTan.z * i_hermite.GetH10() + i_endTan.z * i_hermite.GetH11();
 }
 
-/* 80145C40-80145C74 140580 0034+00 0/0 0/0 44/44 .text            initialize__13daNpcT_Path_cFv */
 void daNpcT_Path_c::initialize() {
     mPathInfo = NULL;
 
@@ -493,7 +472,6 @@ void daNpcT_Path_c::initialize() {
     mIsClosed = FALSE;
 }
 
-/* 80145C74-80145D2C 1405B4 00B8+00 0/0 0/0 18/18 .text setPathInfo__13daNpcT_Path_cFUcScUc */
 int daNpcT_Path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, u8 i_direction) {
     mPathInfo = NULL;
     mIdx = 0;
@@ -512,7 +490,6 @@ int daNpcT_Path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, u8 i_direction) {
     return 1;
 }
 
-/* 80145D2C-80145DA0 14066C 0074+00 0/0 0/0 1/1 .text setNextPathInfo__13daNpcT_Path_cFScUc */
 int daNpcT_Path_c::setNextPathInfo(s8 i_roomNo, u8 i_direction) {
     mIdx = 0;
     mDirection = i_direction;
@@ -529,7 +506,6 @@ int daNpcT_Path_c::setNextPathInfo(s8 i_roomNo, u8 i_direction) {
     return 1;
 }
 
-/* 80145DA0-80145DD0 1406E0 0030+00 0/0 0/0 1/1 .text            reverse__13daNpcT_Path_cFv */
 void daNpcT_Path_c::reverse() {
     if (chkReverse()) {
         offReverse();
@@ -538,7 +514,6 @@ void daNpcT_Path_c::reverse() {
     }
 }
 
-/* 80145DD0-80145E38 140710 0068+00 2/2 0/0 8/8 .text            setNextIdx__13daNpcT_Path_cFi */
 int daNpcT_Path_c::setNextIdx(int i_idx) {
     int numPnts = getNumPnts();
 
@@ -549,7 +524,6 @@ int daNpcT_Path_c::setNextIdx(int i_idx) {
     }
 }
 
-/* 80145E38-80145FB4 140778 017C+00 0/0 0/0 1/1 .text getDstPos__13daNpcT_Path_cF4cXyzP4cXyzi */
 int daNpcT_Path_c::getDstPos(cXyz i_pnt, cXyz* o_pos_p, int i_idx) {
     int passed1;
 
@@ -578,8 +552,6 @@ int daNpcT_Path_c::getDstPos(cXyz i_pnt, cXyz* o_pos_p, int i_idx) {
     return 0;
 }
 
-/* 80145FB4-80146188 1408F4 01D4+00 0/0 0/0 10/10 .text getDstPosH__13daNpcT_Path_cF4cXyzP4cXyzii
- */
 int daNpcT_Path_c::getDstPosH(cXyz i_pnt, cXyz* o_pos_p, int i_idx, int param_3) {
     int passed1;
 
@@ -617,8 +589,6 @@ int daNpcT_Path_c::getDstPosH(cXyz i_pnt, cXyz* o_pos_p, int i_idx, int param_3)
     }
 }
 
-/* 80146188-801464D8 140AC8 0350+00 2/2 0/0 2/2 .text            chkPassed1__13daNpcT_Path_cF4cXyzi
- */
 int daNpcT_Path_c::chkPassed1(cXyz i_pnt, int i_num) {
     cXyz prev_pos;
     cXyz cur_pos;
@@ -693,7 +663,6 @@ int daNpcT_Path_c::chkPassed1(cXyz i_pnt, int i_num) {
     return 0;
 }
 
-/* 801464D8-8014698C 140E18 04B4+00 1/1 0/0 0/0 .text chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii */
 int daNpcT_Path_c::chkPassed2(cXyz i_pnt, cXyz* param_2, int i_num, int param_4) {
     cXyz cStack_80;
     cXyz prev_pos;
@@ -819,8 +788,6 @@ int daNpcT_Path_c::drawDbgInfo(f32 param_0, int param_1) {
 }
 #endif
 
-/* 8014698C-80146C98 1412CC 030C+00 1/1 0/0 0/0 .text
- * daNpcT_chkPassed__F4cXyzP4dPntUsUsiiP4cXyzPiPi               */
 static BOOL daNpcT_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_closed,
                              int param_5, cXyz* o_proj, int* o_prevIdx, int* o_nextIdx) {
     u16 idx = i_idx;
@@ -891,15 +858,11 @@ static f32 dummy_literal() {
     return vec.abs();
 }
 
-/* 80146C98-80146CD8 1415D8 0040+00 0/0 0/0 121/121 .text            initialize__15daNpcT_JntAnm_cFv
- */
 void daNpcT_JntAnm_c::initialize() {
     mActrMngr.initialize();
     memset(&mAttnPos, 0, (uintptr_t)&field_0x158 - (uintptr_t)&mAttnPos);
 }
 
-/* 80146CD8-80147858 141618 0B80+00 1/0 0/0 52/52 .text
- * setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz */
 void daNpcT_JntAnm_c::setParam(fopAc_ac_c* i_actor, J3DModel* i_model, cXyz* i_eyeOffset_p,
                                int i_backboneJointNo, int i_neckJointNo, int i_headJointNo,
                                f32 i_bodyUpAngle, f32 i_bodyDownAngle, f32 i_bodyLeftAngle,
@@ -1098,7 +1061,6 @@ void daNpcT_JntAnm_c::setParam(fopAc_ac_c* i_actor, J3DModel* i_model, cXyz* i_e
     field_0x148 = param_14;
 }
 
-/* 80147858-80147C38 142198 03E0+00 1/1 0/0 0/0 .text            calc__15daNpcT_JntAnm_cFf */
 void daNpcT_JntAnm_c::calc(f32 param_0) {
     cXyz vec1, vec2;
     cXyz vec3 = field_0x24;
@@ -1179,8 +1141,6 @@ void daNpcT_JntAnm_c::calc(f32 param_0) {
     }
 }
 
-/* 80147C38-80147DCC 142578 0194+00 0/0 0/0 52/52 .text            calcJntRad__15daNpcT_JntAnm_cFfff
- */
 void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) {
     if (mMode == 0) {
         clrRad();
@@ -1232,8 +1192,6 @@ void daNpcT_JntAnm_c::drawDbgInfo() {
 }
 #endif
 
-/* 80147DCC-80147E3C 14270C 0070+00 0/0 0/0 28/28 .text
- * setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs  */
 void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s16 i_angle) {
     if (i_actor2 && i_actor1) {
         mPower[0] = cM_deg2s(60.0f);
@@ -1243,7 +1201,6 @@ void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, s
     }
 }
 
-/* 80147E3C-80147FA4 14277C 0168+00 0/0 0/0 47/47 .text            calc__19daNpcT_DmgStagger_cFi */
 void daNpcT_DmgStagger_c::calc(BOOL param_0) {
     cXyz vec1, vec2;
     mDoMtx_stack_c::YrotS(field_0x16);
@@ -1271,7 +1228,6 @@ void daNpcT_DmgStagger_c::calc(BOOL param_0) {
     }
 }
 
-/* 803B36D8-803B371C 0107F8 0044+00 0/0 0/0 54/54 .data            mCcDCyl__8daNpcT_c */
 dCcD_SrcCyl daNpcT_c::mCcDCyl = {
     daNpcT_c::mCcDObjData,
     {
@@ -1281,7 +1237,6 @@ dCcD_SrcCyl daNpcT_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 803B371C-803B375C 01083C 0040+00 0/0 0/0 3/3 .data            mCcDSph__8daNpcT_c */
 dCcD_SrcSph daNpcT_c::mCcDSph = {
     daNpcT_c::mCcDObjData,
     {
@@ -1289,8 +1244,6 @@ dCcD_SrcSph daNpcT_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 80147FA4-80147FD4 1428E4 0030+00 0/0 0/0 53/53 .text
- * tgHitCallBack__8daNpcT_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_ac_c* i_actor2,
                              dCcD_GObjInf* i_obj2) {
     fopAc_ac_c* actor1 = i_actor1;
@@ -1306,18 +1259,14 @@ void daNpcT_c::tgHitCallBack(fopAc_ac_c* i_actor1, dCcD_GObjInf* i_obj1, fopAc_a
     static_cast<daNpcT_c*>(actor1)->setCutType(cut_type);
 }
 
-/* 80425708-804257D0 052428 00C8+00 4/4 0/0 40/40 .bss             mFindActorPtrs__8daNpcT_c */
 fopAc_ac_c* daNpcT_c::mFindActorPtrs[50];
 
 char l_fileNameBuf[0x15];
 
-/* 80450FD8-80450FDC 0004D8 0002+02 4/4 0/0 2/2 .sbss            mSrchName__8daNpcT_c */
 s16 daNpcT_c::mSrchName;
 
-/* 80450FDC-80450FE0 0004DC 0004+00 4/4 0/0 42/42 .sbss            mFindCount__8daNpcT_c */
 int daNpcT_c::mFindCount;
 
-/* 80147FD4-80148058 142914 0084+00 3/3 0/0 2/2 .text            srchActor__8daNpcT_cFPvPv */
 void* daNpcT_c::srchActor(void* i_actor1, void* i_actor2) {
     fopAc_ac_c* actor2 = (fopAc_ac_c*)i_actor2;
     void* foundActor = NULL;
@@ -1332,39 +1281,30 @@ void* daNpcT_c::srchActor(void* i_actor1, void* i_actor2) {
     return NULL;
 }
 
-/* 80148058-80148094 142998 003C+00 1/1 0/0 7/7 .text            getTrnsfrmAnmP__8daNpcT_cFPCci */
 J3DAnmTransform* daNpcT_c::getTrnsfrmAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80148094-801480D0 1429D4 003C+00 1/1 0/0 11/11 .text            getTrnsfrmKeyAnmP__8daNpcT_cFPCci
- */
 J3DAnmTransformKey* daNpcT_c::getTrnsfrmKeyAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTransformKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 801480D0-8014810C 142A10 003C+00 1/1 0/0 1/1 .text            getTexPtrnAnmP__8daNpcT_cFPCci */
 J3DAnmTexPattern* daNpcT_c::getTexPtrnAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 8014810C-80148148 142A4C 003C+00 1/1 0/0 7/7 .text            getTexSRTKeyAnmP__8daNpcT_cFPCci */
 J3DAnmTextureSRTKey* daNpcT_c::getTexSRTKeyAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80148148-80148184 142A88 003C+00 0/0 0/0 9/9 .text            getTevRegKeyAnmP__8daNpcT_cFPCci */
 J3DAnmTevRegKey* daNpcT_c::getTevRegKeyAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80148184-801481C0 142AC4 003C+00 0/0 0/0 2/2 .text            getColorAnmP__8daNpcT_cFPCci */
 J3DAnmColor* daNpcT_c::getColorAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmColor*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 801481C0-80148204 142B00 0044+00 1/1 0/0 0/0 .text setBckAnm__8daNpcT_cFP15J3DAnmTransformfiiib
- */
 int daNpcT_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int i_start, int i_end,
                         bool i_modify) {
     s16 start = i_start;
@@ -1372,8 +1312,6 @@ int daNpcT_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int i_s
     return mBckAnm.init(i_bck, TRUE, i_mode, i_speed, start, end, i_modify);
 }
 
-/* 80148204-801482F8 142B44 00F4+00 1/1 0/0 1/1 .text
- * setMcaMorfAnm__8daNpcT_cFP18J3DAnmTransformKeyffiii          */
 int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* i_bck, f32 i_speed, f32 i_morf, int i_mode, int i_start,
                             int i_end) {
     f32 start = i_start;
@@ -1388,31 +1326,22 @@ int daNpcT_c::setMcaMorfAnm(J3DAnmTransformKey* i_bck, f32 i_speed, f32 i_morf,
     return 1;
 }
 
-/* 801482F8-80148338 142C38 0040+00 1/1 0/0 1/1 .text
- * setBtpAnm__8daNpcT_cFP16J3DAnmTexPatternP12J3DModelDatafi    */
 int daNpcT_c::setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_speed, int i_mode) {
     return mBtpAnm.init(i_modelData, i_btp, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 80148338-80148378 142C78 0040+00 1/1 0/0 6/6 .text
- * setBtkAnm__8daNpcT_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */
 int daNpcT_c::setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_speed, int i_mode) {
     return mBtkAnm.init(i_modelData, i_btk, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 80148378-801483B8 142CB8 0040+00 0/0 0/0 9/9 .text
- * setBrkAnm__8daNpcT_cFP15J3DAnmTevRegKeyP12J3DModelDatafi     */
 int daNpcT_c::setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_speed, int i_mode) {
     return mBrkAnm.init(i_modelData, i_brk, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 801483B8-801483F8 142CF8 0040+00 0/0 0/0 2/2 .text
- * setBpkAnm__8daNpcT_cFP11J3DAnmColorP12J3DModelDatafi         */
 int daNpcT_c::setBpkAnm(J3DAnmColor* i_bpk, J3DModelData* i_modelData, f32 i_speed, int i_mode) {
     return mBpkAnm.init(i_modelData, i_bpk, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 801483F8-801484AC 142D38 00B4+00 0/0 0/0 58/58 .text            loadRes__8daNpcT_cFPCScPPCc */
 int daNpcT_c::loadRes(s8 const* i_resNoList, char const** i_resNameList) {
     int phase_state;
     int resLoad_cnt = 0;
@@ -1437,14 +1366,12 @@ int daNpcT_c::loadRes(s8 const* i_resNoList, char const** i_resNameList) {
     return cPhs_INIT_e;
 }
 
-/* 801484AC-8014852C 142DEC 0080+00 0/0 0/0 58/58 .text            deleteRes__8daNpcT_cFPCScPPCc */
 void daNpcT_c::deleteRes(s8 const* i_resNoList, char const** i_resNameList) {
     for (int i = 0; i < 10 && i_resNoList[i] != -1; i++) {
         dComIfG_resDelete(&mPhase[i], i_resNameList[i_resNoList[i]]);
     }
 }
 
-/* 8014852C-8014886C 142E6C 0340+00 0/0 0/0 59/59 .text            execute__8daNpcT_cFv */
 int daNpcT_c::execute() {
     BOOL procResult = FALSE;
 
@@ -1509,7 +1436,6 @@ int daNpcT_c::execute() {
     return 1;
 }
 
-/* 8014886C-80148C70 1431AC 0404+00 0/0 0/0 58/58 .text draw__8daNpcT_cFiifP11_GXColorS10fiii */
 int daNpcT_c::draw(BOOL param_0, BOOL i_setEffMtx, f32 param_2, GXColorS10* i_color, f32 param_4,
                    BOOL i_drawGhost, BOOL i_noShadow, BOOL i_simpleShadow) {
     J3DModel* model = mpMorf[0]->getModel();
@@ -1607,13 +1533,11 @@ int daNpcT_c::draw(BOOL param_0, BOOL i_setEffMtx, f32 param_2, GXColorS10* i_co
     return 1;
 }
 
-/* 80148C70-80148CCC 1435B0 005C+00 1/1 0/0 58/58 .text            setEnvTevColor__8daNpcT_cFv */
 void daNpcT_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80148CCC-80148D10 14360C 0044+00 1/1 0/0 58/58 .text            setRoomNo__8daNpcT_cFv */
 void daNpcT_c::setRoomNo() {
     s8 roomId = (s8)dComIfG_Bgsp().GetRoomId(mGndChk);
 
@@ -1621,7 +1545,6 @@ void daNpcT_c::setRoomNo() {
     mCcStts.SetRoomId(roomId);
 }
 
-/* 80148D10-80148DD0 143650 00C0+00 1/1 0/0 0/0 .text            checkEndAnm__8daNpcT_cFf */
 int daNpcT_c::checkEndAnm(f32 i_speed) {
     switch ((u8)mpMorf[0]->getPlayMode()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -1637,7 +1560,6 @@ int daNpcT_c::checkEndAnm(f32 i_speed) {
     return 0;
 }
 
-/* 80148DD0-80148E4C 143710 007C+00 1/1 0/0 0/0 .text checkEndAnm__8daNpcT_cFP12J3DFrameCtrlf */
 int daNpcT_c::checkEndAnm(J3DFrameCtrl* i_anm, f32 i_speed) {
     switch (i_anm->getAttribute()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -1653,7 +1575,6 @@ int daNpcT_c::checkEndAnm(J3DFrameCtrl* i_anm, f32 i_speed) {
     return 0;
 }
 
-/* 80148E4C-801490D4 14378C 0288+00 1/1 0/0 0/0 .text            playAllAnm__8daNpcT_cFv */
 void daNpcT_c::playAllAnm() {
     f32 speed;
     if (!(mAnmFlags & ANM_FLAG_4000)) {
@@ -1760,7 +1681,6 @@ void daNpcT_c::playAllAnm() {
                     | ANM_PAUSE_BTP | ANM_FLAG_4000);
 }
 
-/* 801490D4-80149190 143A14 00BC+00 1/0 1/0 55/0 .text            ctrlBtk__8daNpcT_cFv */
 BOOL daNpcT_c::ctrlBtk() {
     if (mpMatAnm[0] != NULL) {
         if (field_0xe29 != 0) {
@@ -1790,7 +1710,6 @@ BOOL daNpcT_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80149190-8014924C 143AD0 00BC+00 0/0 0/0 57/57 .text            setMtx__8daNpcT_cFv */
 void daNpcT_c::setMtx() {
     J3DModel* model = mpMorf[0]->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -1814,7 +1733,6 @@ void daNpcT_c::setMtx() {
     mpMorf[0]->modelCalc();
 }
 
-/* 8014924C-80149300 143B8C 00B4+00 1/1 0/0 0/0 .text            ctrlFaceMotion__8daNpcT_cFv */
 void daNpcT_c::ctrlFaceMotion() {
     int motionNo;
     f32 morfFrm;
@@ -1840,7 +1758,6 @@ void daNpcT_c::ctrlFaceMotion() {
     }
 }
 
-/* 80149300-801493B8 143C40 00B8+00 1/1 0/0 0/0 .text            ctrlMotion__8daNpcT_cFv */
 void daNpcT_c::ctrlMotion() {
     int motionNo;
     f32 morfFrm;
@@ -1868,7 +1785,6 @@ void daNpcT_c::ctrlMotion() {
     }
 }
 
-/* 801493B8-8014951C 143CF8 0164+00 1/1 0/0 2/2 .text ctrlMsgAnm__8daNpcT_cFPiPiP10fopAc_ac_ci */
 int daNpcT_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i_talkPartner_p, int param_3) {
     *o_faceAnmAttr_p = -1;
     *o_anmAttr_p = -1;
@@ -1915,8 +1831,6 @@ int daNpcT_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i_t
     return field_0xdb4;
 }
 
-/* 8014951C-8014997C 143E5C 0460+00 1/0 1/0 59/0 .text ctrlJoint__8daNpcT_cFP8J3DJointP8J3DModel
- */
 int daNpcT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int joint_no = joint->getJntNo();
@@ -1983,7 +1897,6 @@ int daNpcT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8014997C-80149BB4 1442BC 0238+00 1/0 1/0 58/0 .text            evtProc__8daNpcT_cFv */
 BOOL daNpcT_c::evtProc() {
     BOOL ret = FALSE;
 
@@ -2044,7 +1957,6 @@ BOOL daNpcT_c::evtProc() {
     return ret;
 }
 
-/* 80149BB4-80149D7C 1444F4 01C8+00 1/0 1/0 60/0 .text            setFootPos__8daNpcT_cFv */
 void daNpcT_c::setFootPos() {
     if (getFootLJointNo() >= 0) {
         mOldFootLOffset = mFootLOffset;
@@ -2066,8 +1978,6 @@ void daNpcT_c::setFootPos() {
     }
 }
 
-/* 80149D7C-8014A05C 1446BC 02E0+00 1/0 1/0 60/0 .text            setFootPrtcl__8daNpcT_cFP4cXyzff
- */
 void daNpcT_c::setFootPrtcl(cXyz* param_0, f32 param_1, f32 param_2) {
     cXyz foot_l_pos = mFootLPos;
     cXyz foot_r_pos = mFootRPos;
@@ -2132,13 +2042,11 @@ void daNpcT_c::setFootPrtcl(cXyz* param_0, f32 param_1, f32 param_2) {
     mFootROnGround = cross2;
 }
 
-/* 8014A05C-8014A064 14499C 0008+00 1/0 1/0 60/0 .text            checkCullDraw__8daNpcT_cFv */
 bool daNpcT_c::checkCullDraw() {
     bool result = false;
     return result;
 }
 
-/* 8014A064-8014A0B0 1449A4 004C+00 1/0 1/0 60/0 .text            twilight__8daNpcT_cFv */
 void daNpcT_c::twilight() {
     if (mTwilight) {
         attention_info.flags |= fopAc_AttnFlag_UNK_0x400000;
@@ -2148,7 +2056,6 @@ void daNpcT_c::twilight() {
     }
 }
 
-/* 8014A0B0-8014A224 1449F0 0174+00 1/0 1/0 59/0 .text            evtOrder__8daNpcT_cFv */
 void daNpcT_c::evtOrder() {
     if (strlen(mpEvtData[mEvtNo].eventName) != 0) {
         if (strlen(mpArcNames[mpEvtData[mEvtNo].num]) != 0) {
@@ -2173,7 +2080,6 @@ void daNpcT_c::evtOrder() {
     }
 }
 
-/* 8014A224-8014A324 144B64 0100+00 0/0 2/2 81/81 .text            evtChange__8daNpcT_cFv */
 void daNpcT_c::evtChange() {
     if (strlen(mpEvtData[mEvtNo].eventName) != 0) {
         if (strlen(mpArcNames[mpEvtData[mEvtNo].num]) != 0) {
@@ -2187,7 +2093,6 @@ void daNpcT_c::evtChange() {
     }
 }
 
-/* 8014A324-8014A388 144C64 0064+00 1/0 1/0 60/0 .text            clrParam__8daNpcT_cFv */
 void daNpcT_c::clrParam() {
     field_0xd7e = mCurAngle;
     mCutType = 0;
@@ -2195,7 +2100,6 @@ void daNpcT_c::clrParam() {
     mJntAnm.clrDirectFlag();
 }
 
-/* 8014A388-8014A628 144CC8 02A0+00 1/1 0/0 57/57 .text            setFaceMotionAnm__8daNpcT_cFib */
 bool daNpcT_c::setFaceMotionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* bck = NULL;
     J3DAnmTexPattern* btp = NULL;
@@ -2252,7 +2156,6 @@ bool daNpcT_c::setFaceMotionAnm(int i_idx, bool i_modify) {
     return afterSetFaceMotionAnm(i_idx, anm_data.mBckAttr, 0.0f, anm_data.mBtpAttr);
 }
 
-/* 8014A628-8014A908 144F68 02E0+00 1/0 1/0 59/0 .text            setMotionAnm__8daNpcT_cFifi */
 bool daNpcT_c::setMotionAnm(int i_idx, f32 i_morf, BOOL i_restart) {
     J3DAnmTransformKey* bck = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -2316,7 +2219,6 @@ bool daNpcT_c::setMotionAnm(int i_idx, f32 i_morf, BOOL i_restart) {
     return afterSetMotionAnm(i_idx, anm_data.mBckAttr, i_morf, anm_data.mBtkAttr);
 }
 
-/* 8014A908-8014A99C 145248 0094+00 0/0 0/0 40/40 .text            setPos__8daNpcT_cF4cXyz */
 void daNpcT_c::setPos(cXyz i_pos) {
     i_pos.y += 300.0f;
     mGndChk.SetPos(&i_pos);
@@ -2328,7 +2230,6 @@ void daNpcT_c::setPos(cXyz i_pos) {
     old.pos = current.pos;
 }
 
-/* 8014A99C-8014AA18 1452DC 007C+00 0/0 0/0 29/29 .text            setAngle__8daNpcT_cF5csXyz */
 void daNpcT_c::setAngle(csXyz i_angle) {
     current.angle = i_angle;
     shape_angle = current.angle;
@@ -2337,7 +2238,6 @@ void daNpcT_c::setAngle(csXyz i_angle) {
     old.angle = current.angle;
 }
 
-/* 8014AA18-8014AA40 145358 0028+00 0/0 0/0 138/138 .text            setAngle__8daNpcT_cFs */
 void daNpcT_c::setAngle(s16 i_angle) {
     current.angle.y = i_angle;
     shape_angle.y = current.angle.y;
@@ -2346,7 +2246,6 @@ void daNpcT_c::setAngle(s16 i_angle) {
     old.angle.y = current.angle.y;
 }
 
-/* 8014AA40-8014AAD0 145380 0090+00 0/0 0/0 33/33 .text hitChk__8daNpcT_cFP12dCcD_GObjInfUl */
 fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) {
     fopAc_ac_c* hit_actor_p = NULL;
 
@@ -2366,7 +2265,6 @@ fopAc_ac_c* daNpcT_c::hitChk(dCcD_GObjInf* i_objInf, u32 param_1) {
     return NULL;
 }
 
-/* 8014AAD0-8014ABD0 145410 0100+00 0/0 0/0 27/27 .text            setDamage__8daNpcT_cFiii */
 void daNpcT_c::setDamage(int param_0, int i_faceMotion, int i_motion) {
     mDamageTimerStart = 8;
     if (mCutType == daPy_py_c::CUT_TYPE_TURN_RIGHT      ||
@@ -2391,8 +2289,6 @@ void daNpcT_c::setDamage(int param_0, int i_faceMotion, int i_motion) {
     speedF = 0.0f;
 }
 
-/* 8014ABD0-8014ACF0 145510 0120+00 2/2 0/0 53/53 .text chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs
- */
 BOOL daNpcT_c::chkActorInSight(fopAc_ac_c* i_actor, f32 i_fovY, s16 i_angleY) {
     if (cM3d_IsZero(i_fovY)) {
         return FALSE;
@@ -2413,8 +2309,6 @@ BOOL daNpcT_c::chkActorInSight(fopAc_ac_c* i_actor, f32 i_fovY, s16 i_angleY) {
     return TRUE;
 }
 
-/* 8014ACF0-8014ADA0 145630 00B0+00 2/2 0/0 12/12 .text chkPointInArea__8daNpcT_cF4cXyz4cXyzfffs
- */
 BOOL daNpcT_c::chkPointInArea(cXyz i_pos, cXyz i_center, f32 i_boundXZ, f32 i_boundY1,
                               f32 i_boundY2, s16 i_angle) {
     cXyz bounds, center;
@@ -2431,13 +2325,10 @@ BOOL daNpcT_c::chkPointInArea(cXyz i_pos, cXyz i_center, f32 i_boundXZ, f32 i_bo
     return chkPointInArea(i_pos, center, bounds, i_angle);
 }
 
-/* 8014ADA0-8014AE1C 1456E0 007C+00 1/1 0/0 1/1 .text chkPointInArea__8daNpcT_cF4cXyz4cXyz4cXyzs
- */
 BOOL daNpcT_c::chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle) {
     return daNpcT_chkPointInArea(i_pos, i_center, i_bounds, i_angle, TRUE);
 }
 
-/* 8014AE1C-8014B010 14575C 01F4+00 1/1 0/0 0/0 .text chkFindActor__8daNpcT_cFP10fopAc_ac_cis */
 BOOL daNpcT_c::chkFindActor(fopAc_ac_c* i_actor, BOOL i_release, s16 i_angleY) {
     cXyz attn_pos = getAttnPos(i_actor);
     
@@ -2474,7 +2365,6 @@ BOOL daNpcT_c::chkFindActor(fopAc_ac_c* i_actor, BOOL i_release, s16 i_angleY) {
     return FALSE;
 }
 
-/* 8014B024-8014B0C8 145964 00A4+00 1/1 0/0 0/0 .text            chkWolfAction__8daNpcT_cFv */
 BOOL daNpcT_c::chkWolfAction() {
     if (daPy_py_c::checkNowWolf()) {
         return (!daPy_getPlayerActorClass()->checkWolfWait() && !dComIfGp_checkPlayerStatus0(0, 0x8000000)) &&
@@ -2484,7 +2374,6 @@ BOOL daNpcT_c::chkWolfAction() {
     return FALSE;
 }
 
-/* 8014B0C8-8014B338 145A08 0270+00 0/0 0/0 2/2 .text            chkFindWolf__8daNpcT_cFsiiffffi */
 BOOL daNpcT_c::chkFindWolf(s16 i_angleY, int i_distIndex, int param_2, f32 i_boundXZ, f32 i_fovY,
                            f32 i_boundY1, f32 i_boundY2, BOOL param_7) {
     cXyz attn_pos = getAttnPos(daPy_getPlayerActorClass());
@@ -2517,7 +2406,6 @@ BOOL daNpcT_c::chkFindWolf(s16 i_angleY, int i_distIndex, int param_2, f32 i_bou
     return FALSE;
 }
 
-/* 8014B338-8014B3EC 145C78 00B4+00 0/0 0/0 75/75 .text            srchPlayerActor__8daNpcT_cFv */
 BOOL daNpcT_c::srchPlayerActor() {
     if (mPlayerActorMngr.getActorP() != NULL) {
         if (!chkFindPlayer(TRUE, mCurAngle.y)) {
@@ -2532,8 +2420,6 @@ BOOL daNpcT_c::srchPlayerActor() {
     return NULL != mPlayerActorMngr.getActorP();
 }
 
-/* 8014B3EC-8014B4A4 145D2C 00B8+00 3/3 0/0 5/5 .text            getAttnPos__8daNpcT_cFP10fopAc_ac_c
- */
 cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) {
     cXyz attn_pos = i_actor->attention_info.position;
     if (fopAcM_GetName(i_actor) == PROC_ALINK) {
@@ -2547,7 +2433,6 @@ cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) {
     return attn_pos;
 }
 
-/* 8014B4A4-8014B648 145DE4 01A4+00 1/1 0/0 1/1 .text            turn__8daNpcT_cFsii */
 BOOL daNpcT_c::turn(s16 i_angle, int i_count, int i_direction) {
     if (mTurnAmount == 0) {
         mTurnCount = fabsf(cM_sht2d((s16)(i_angle - mStartAngle)));
@@ -2582,7 +2467,6 @@ BOOL daNpcT_c::turn(s16 i_angle, int i_count, int i_direction) {
     return i_angle == mCurAngle.y;
 }
 
-/* 8014B648-8014B808 145F88 01C0+00 0/0 0/0 177/177 .text            step__8daNpcT_cFsiiii */
 BOOL daNpcT_c::step(s16 i_angle, int i_faceMotion, int i_motion, int i_turnCount,
                    int i_turnDirection) {
     if (mStepMode >= 2 && i_angle != mCurAngle.y) {
@@ -2620,7 +2504,6 @@ BOOL daNpcT_c::step(s16 i_angle, int i_faceMotion, int i_motion, int i_turnCount
     return mStepMode > 1;
 }
 
-/* 8014B808-8014BB00 146148 02F8+00 0/0 0/0 11/11 .text calcSpeedAndAngle__8daNpcT_cF4cXyziss */
 void daNpcT_c::calcSpeedAndAngle(cXyz i_target, BOOL i_stop, s16 i_angleScale, s16 i_angleStep) {
     if (i_stop) {
         speedF = 0.0f;
@@ -2643,8 +2526,6 @@ void daNpcT_c::calcSpeedAndAngle(cXyz i_target, BOOL i_stop, s16 i_angleScale, s
     }
 }
 
-/* 8014BB00-8014BBF0 146440 00F0+00 0/0 0/0 2/2 .text getActorDistance__8daNpcT_cFP10fopAc_ac_cii
- */
 int daNpcT_c::getActorDistance(fopAc_ac_c* i_actor, int i_distIndex1, int i_distIndex2) {
     int ret = 0;
     f32 dist1 = dComIfGp_getAttention()->getDistTable(i_distIndex1).mDistMax;
@@ -2667,7 +2548,6 @@ int daNpcT_c::getActorDistance(fopAc_ac_c* i_actor, int i_distIndex1, int i_dist
     return ret;
 }
 
-/* 8014BBF0-8014BC78 146530 0088+00 0/0 1/1 180/180 .text initTalk__8daNpcT_cFiPP10fopAc_ac_c */
 BOOL daNpcT_c::initTalk(int i_flowID, fopAc_ac_c** i_partnerList_p) {
     mFlow.init(this, i_flowID, 0, i_partnerList_p);
     mPlayerAngle = fopAcM_searchPlayerAngleY(this);
@@ -2681,8 +2561,6 @@ BOOL daNpcT_c::initTalk(int i_flowID, fopAc_ac_c** i_partnerList_p) {
     return TRUE;
 }
 
-/* 8014BC78-8014BE2C 1465B8 01B4+00 0/0 0/0 169/169 .text talkProc__8daNpcT_cFPiiPP10fopAc_ac_ci
- */
 BOOL daNpcT_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_partnerList_p, BOOL param_3) {
     BOOL ret = FALSE;
 
@@ -2728,7 +2606,6 @@ BOOL daNpcT_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_partnerList_p
     return ret;
 }
 
-/* 8014BE2C-8014BEE4 14676C 00B8+00 0/0 0/0 25/25 .text            getNearestActorP__8daNpcT_cFs */
 fopAc_ac_c* daNpcT_c::getNearestActorP(s16 i_srchActorName) {
     fopAc_ac_c* actor = NULL;
     f32 minDistance = G_CM3D_F_INF;
@@ -2747,7 +2624,6 @@ fopAc_ac_c* daNpcT_c::getNearestActorP(s16 i_srchActorName) {
     return actor;
 }
 
-/* 8014BEE4-8014BFB0 146824 00CC+00 0/0 0/0 12/12 .text            getEvtAreaTagP__8daNpcT_cFii */
 fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) {
     int var_r29 = 0;
     f32 var_f31 = G_CM3D_F_INF;
@@ -2765,7 +2641,6 @@ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) {
     return NULL;
 }
 
-/* 8014BFB0-8014C030 1468F0 0080+00 0/0 0/0 5/5 .text            getShopItemTagP__8daNpcT_cFv */
 fopAc_ac_c* daNpcT_c::getShopItemTagP() {
     int unusedInt1 = 0;
     mFindCount = 0;
@@ -2782,7 +2657,6 @@ fopAc_ac_c* daNpcT_c::getShopItemTagP() {
     return NULL;
 }
 
-/* 8014C030-8014C200 146970 01D0+00 1/1 0/0 0/0 .text            setHitodamaPrtcl__8daNpcT_cFv */
 void daNpcT_c::setHitodamaPrtcl() {
     JPABaseEmitter* emitter = NULL;
     cXyz pos;
@@ -2811,8 +2685,6 @@ void daNpcT_c::setHitodamaPrtcl() {
     }
 }
 
-/* 8014C200-8014C384 146B40 0184+00 0/0 0/0 2/2 .text
- * daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi              */
 BOOL daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32 param_3,
                              f32 param_4, f32 param_5, f32 param_6, f32 param_7, int param_8) {
     if (fopAcM_GetMtx(i_ActorP)) {
@@ -2853,7 +2725,6 @@ BOOL daNpcT_chkActorInScreen(fopAc_ac_c* i_ActorP, f32 param_1, f32 param_2, f32
     return false;
 }
 
-/* 8014C384-8014C500 146CC4 017C+00 1/1 0/0 3/3 .text daNpcT_chkPointInArea__F4cXyz4cXyz4cXyzsi */
 BOOL daNpcT_chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle,
                            BOOL i_checkHeight) {
     cXyz l_pos;
@@ -2881,8 +2752,6 @@ BOOL daNpcT_chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle
     }
 }
 
-/* 8014C500-8014C5E0 146E40 00E0+00 0/0 0/0 29/29 .text
- * daNpcT_getPlayerInfoFromPlayerList__FiiP4cXyzP5csXyz         */
 BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawnPos,
                                         csXyz* o_angle) {
     BOOL ret = FALSE;
@@ -2903,7 +2772,6 @@ BOOL daNpcT_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz* o_spawn
     return ret;
 }
 
-/* 8014C5E0-8014C700 146F20 0120+00 0/0 0/0 5/5 .text daNpcT_chkDoBtnIsSpeak__FP10fopAc_ac_c */
 BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) {
     BOOL ret = FALSE;
 
@@ -2934,8 +2802,6 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) {
     return ret;
 }
 
-/* 8014C700-8014CA18 147040 0318+00 0/0 0/0 2/2 .text
- * daNpcT_judgeRace__FP5dPathPP10fopAc_ac_cP16daNpcT_pntData_ciPi */
 int daNpcT_judgeRace(dPath* i_path, fopAc_ac_c** param_1, daNpcT_pntData_c* i_pntData,
                       int param_3, int* param_4) {
     cXyz proj;
@@ -3026,42 +2892,34 @@ int daNpcT_judgeRace(dPath* i_path, fopAc_ac_c** param_1, daNpcT_pntData_c* i_pn
     return 1;
 }
 
-/* 8014CA18-8014CA2C 147358 0014+00 0/0 0/0 61/61 .text            daNpcT_getDistTableIdx__Fii */
 u8 daNpcT_getDistTableIdx(int param_0, int param_1) {
     return param_0 + param_1 * 0x14 + 0x5e;
 }
 
-/* 8014CA2C-8014CA6C 14736C 0040+00 0/0 0/0 25/25 .text            daNpcT_onEvtBit__FUl */
 void daNpcT_onEvtBit(u32 i_no) {
     dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
-/* 8014CA6C-8014CAAC 1473AC 0040+00 0/0 0/0 1/1 .text            daNpcT_offEvtBit__FUl */
 void daNpcT_offEvtBit(u32 i_no) {
     dComIfGs_offEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
-/* 8014CAAC-8014CAEC 1473EC 0040+00 0/0 0/0 155/155 .text            daNpcT_chkEvtBit__FUl */
 BOOL daNpcT_chkEvtBit(u32 i_no) {
     return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
-/* 8014CAEC-8014CB2C 14742C 0040+00 0/0 0/0 26/26 .text            daNpcT_onTmpBit__FUl */
 void daNpcT_onTmpBit(u32 i_no) {
     dComIfGs_onTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 8014CB2C-8014CB6C 14746C 0040+00 0/0 0/0 78/78 .text            daNpcT_offTmpBit__FUl */
 void daNpcT_offTmpBit(u32 i_no) {
     dComIfGs_offTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 8014CB6C-8014CBAC 1474AC 0040+00 0/0 0/0 38/38 .text            daNpcT_chkTmpBit__FUl */
 BOOL daNpcT_chkTmpBit(u32 i_no) {
     return dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 80392680-803926B0 01ECE0 0030+00 1/1 0/0 4/4 .rodata          mCcDObjData__8daNpcT_c */
 const dCcD_SrcGObjInf daNpcT_c::mCcDObjData = {
     {0, {{0, 0, 0}, {0, 0x00}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp
index 0f783b52df..2b919fae8d 100644
--- a/src/d/actor/d_a_npc2.cpp
+++ b/src/d/actor/d_a_npc2.cpp
@@ -5,7 +5,6 @@ static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_
 static u16 daBaseNpc_putNurbs(dPnt* i_CPnts, int i_CPntNum, int i_maxPntNum, dPnt* o_curve_p, BOOL i_isClosed);
 static s16 daBaseNpc_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1);
 
-/* 803B375C-803B37A0 01087C 0044+00 0/0 0/0 1/1 .data            mCcDCyl__11daBaseNpc_c */
 dCcD_SrcCyl daBaseNpc_c::mCcDCyl = {
     daBaseNpc_c::mCcDObj,
     {
@@ -15,7 +14,6 @@ dCcD_SrcCyl daBaseNpc_c::mCcDCyl = {
         }  // mCyl
 };
 
-/* 803B37A0-803B37E0 0108C0 0040+00 0/0 0/0 1/1 .data            mCcDSph__11daBaseNpc_c */
 dCcD_SrcSph daBaseNpc_c::mCcDSph = {
     daBaseNpc_c::mCcDObj,
     {
@@ -23,7 +21,6 @@ dCcD_SrcSph daBaseNpc_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 8014D538-8014D584 147E78 004C+00 2/2 0/0 0/0 .text            daBaseNpc_addIdx__FiiPUsi */
 static int daBaseNpc_addIdx(int i_step, int i_num, u16* i_idx, BOOL i_closed) {
     BOOL new_idx = *i_idx;
     BOOL ret;
@@ -48,7 +45,6 @@ static int daBaseNpc_addIdx(int i_step, int i_num, u16* i_idx, BOOL i_closed) {
     return ret;
 }
 
-/* 8014D584-8014D5C4 147EC4 0040+00 2/2 0/0 0/0 .text            daBaseNpc_subIdx__FiiPUsi */
 static BOOL daBaseNpc_subIdx(int i_step, int i_num, u16* i_idx, BOOL i_closed) {
     int new_idx = *i_idx;
     BOOL ret;
@@ -69,7 +65,6 @@ static BOOL daBaseNpc_subIdx(int i_step, int i_num, u16* i_idx, BOOL i_closed) {
     return ret;
 }
 
-/* 8014D5C4-8014D620 147F04 005C+00 2/2 0/0 0/0 .text            daBaseNpc_incIdx__FiPUsii */
 static BOOL daBaseNpc_incIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, int i_pathDirection) {
     BOOL result = FALSE;
     if (i_pathDirection < 0) {
@@ -80,7 +75,6 @@ static BOOL daBaseNpc_incIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, in
     return result;
 }
 
-/* 8014D620-8014D67C 147F60 005C+00 1/1 0/0 0/0 .text            daBaseNpc_decIdx__FiPUsii */
 static BOOL daBaseNpc_decIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, int i_pathDirection) {
     BOOL result = FALSE;
     if (i_pathDirection < 0) {
@@ -91,7 +85,6 @@ static BOOL daBaseNpc_decIdx(int i_pathNo, u16* i_pathIdx, BOOL i_pathClosed, in
     return result;
 }
 
-/* 8014D67C-8014D804 147FBC 0188+00 1/1 0/0 0/0 .text            daNpcBase_BBasis__FiiiPi */
 static f32 daNpcBase_BBasis(int i_deg, int i_pntNo, int i_knotNo, int* i_knotVector_p) {
     f32 basis;
     f32 var_f31;
@@ -118,17 +111,14 @@ static f32 daNpcBase_BBasis(int i_deg, int i_pntNo, int i_knotNo, int* i_knotVec
     return basis;
 }
 
-/* 8014D804-8014D81C 148144 0018+00 0/0 0/0 1/1 .text            __ct__18daBaseNpc_acMngr_cFv */
 daBaseNpc_acMngr_c::daBaseNpc_acMngr_c() {
     mActorId = fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 8014D81C-8014D838 14815C 001C+00 0/0 0/0 9/9 .text entry__18daBaseNpc_acMngr_cFP10fopAc_ac_c */
 void daBaseNpc_acMngr_c::entry(fopAc_ac_c* i_ActorP) {
     mActorId = fopAcM_GetID(i_ActorP);
 }
 
-/* 8014D838-8014D884 148178 004C+00 0/0 0/0 6/6 .text            getActor__18daBaseNpc_acMngr_cFv */
 fopAc_ac_c* daBaseNpc_acMngr_c::getActor() {
     fopAc_ac_c* ret = NULL;
     BOOL foundActor = fopAcM_SearchByID(mActorId, &ret);
@@ -139,8 +129,6 @@ fopAc_ac_c* daBaseNpc_acMngr_c::getActor() {
     return NULL;
 }
 
-/* 8014D884-8014D998 1481C4 0114+00 1/0 0/0 0/0 .text calc__18daBaseNpc_matAnm_cCFP11J3DMaterial
- */
 void daBaseNpc_matAnm_c::calc(J3DMaterial* i_material) const {
     J3DMaterialAnm::calc(i_material);
 
@@ -164,15 +152,12 @@ void daBaseNpc_matAnm_c::calc(J3DMaterial* i_material) const {
     }
 }
 
-/* 8014D998-8014D9A8 1482D8 0010+00 0/0 0/0 1/1 .text            __ct__16daBaseNpc_path_cFv */
 daBaseNpc_path_c::daBaseNpc_path_c() {}
 
-/* 8014D9A8-8014D9BC 1482E8 0014+00 1/1 0/0 4/4 .text            isPath__16daBaseNpc_path_cFv */
 BOOL daBaseNpc_path_c::isPath() {
     return NULL != mPathInfo;
 }
 
-/* 8014D9BC-8014DA48 1482FC 008C+00 0/0 0/0 1/1 .text setPathInfo__16daBaseNpc_path_cFUcScSc */
 int daBaseNpc_path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, s8 i_direction) {
     mPathInfo = NULL;
     mIdx = 0;
@@ -191,7 +176,6 @@ int daBaseNpc_path_c::setPathInfo(u8 i_pathIdx, s8 i_roomNo, s8 i_direction) {
     return isPath();
 }
 
-/* 8014DA48-8014DA64 148388 001C+00 0/0 0/0 1/1 .text            reverseDir__16daBaseNpc_path_cFv */
 void daBaseNpc_path_c::reverseDir() {
     s8 direction;
     if (mDirection > 0) {
@@ -203,28 +187,23 @@ void daBaseNpc_path_c::reverseDir() {
     mDirection = (int)direction;
 }
 
-/* 8014DA64-8014DAC4 1483A4 0060+00 0/0 0/0 3/3 .text            chkPnt__16daBaseNpc_path_cF4cXyz */
 s32 daBaseNpc_path_c::chkPnt(cXyz i_pos) {
     return daBaseNpc_chkPnt(i_pos, mPathInfo->m_points, mIdx, mPathInfo->m_num,
                             dPath_ChkClose(mPathInfo), mDirection);
 }
 
-/* 8014DAC4-8014DB04 148404 0040+00 0/0 0/0 3/3 .text            setNextPnt__16daBaseNpc_path_cFv */
 BOOL daBaseNpc_path_c::setNextPnt() {
     return daBaseNpc_incIdx(mPathInfo->m_num, &mIdx, dPath_ChkClose(mPathInfo), mDirection);
 }
 
-/* 8014DB04-8014DB0C 148444 0008+00 0/0 0/0 3/3 .text            getIdx__16daBaseNpc_path_cFv */
 u16 daBaseNpc_path_c::getIdx() {
     return mIdx;
 }
 
-/* 8014DB0C-8014DB14 -00001 0008+00 0/0 0/0 0/0 .text            setIdx__16daBaseNpc_path_cFUs */
 void daBaseNpc_path_c::setIdx(u16 i_idx) {
     mIdx = i_idx;
 }
 
-/* 8014DB14-8014DB40 148454 002C+00 0/0 0/0 4/4 .text            getPntPos__16daBaseNpc_path_cFUs */
 Vec daBaseNpc_path_c::getPntPos(u16 iIdx) {
     JUT_ASSERT(676, 0 <= iIdx && iIdx < mPathInfo->m_num);
     return mPathInfo->m_points[iIdx].m_position;
@@ -263,7 +242,6 @@ void daBaseNpc_path_c::dbgDraw(f32 param_0) {
     }
 }
 
-/* 8014DB40-8014DBB4 148480 0074+00 1/1 0/0 0/0 .text limitter__18daBaseNpc_lookat_cFsPsss */
 void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_min) {
     int tmp = 0;
     tmp = (int)i_value + *o_value_p;
@@ -295,8 +273,6 @@ void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_
     *o_value_p = 0;
 }
 
-/* 8014DBB4-8014E634 1484F4 0A80+00 0/0 0/0 1/1 .text
- * calc__18daBaseNpc_lookat_cFP10fopAc_ac_cPA4_fs               */
 // NONMATCHING - regalloc, equivalent ? (matches debug)
 void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) {
     if (mpAttnPos == NULL) {
@@ -419,41 +395,31 @@ void daBaseNpc_lookat_c::calc(fopAc_ac_c* param_0, Mtx param_1, s16 param_2) {
     }
 }
 
-/* 8014E634-8014E658 148F74 0024+00 0/0 0/0 1/1 .text setMaxJntLmt__18daBaseNpc_lookat_cF5csXyzi
- */
 void daBaseNpc_lookat_c::setMaxJntLmt(csXyz i_max, int i_no) {
     mMaxJntLmt[i_no] = i_max;
 }
 
-/* 8014E658-8014E67C 148F98 0024+00 0/0 0/0 1/1 .text setMinJntLmt__18daBaseNpc_lookat_cF5csXyzi
- */
 void daBaseNpc_lookat_c::setMinJntLmt(csXyz i_min, int i_no) {
     mMinJntLmt[i_no] = i_min;
 }
 
-/* 8014E67C-8014E6A0 148FBC 0024+00 0/0 0/0 1/1 .text setJntPos__18daBaseNpc_lookat_cF4cXyzi */
 void daBaseNpc_lookat_c::setJntPos(cXyz i_pos, int i_no) {
     mJntPos[i_no] = i_pos;
 }
 
-/* 8014E6A0-8014E6AC 148FE0 000C+00 0/0 0/0 1/1 .text setAttnPos__18daBaseNpc_lookat_cFP4cXyz */
 int daBaseNpc_lookat_c::setAttnPos(cXyz* i_pos) {
     mpAttnPos = i_pos;
     return 1;
 }
 
-/* 8014E6AC-8014E6C8 148FEC 001C+00 0/0 0/0 1/1 .text            getRot__18daBaseNpc_lookat_cFi */
 csXyz daBaseNpc_lookat_c::getRot(int i_no) {
     return mRot[i_no];
 }
 
-/* 8014E6C8-8014E89C 149008 01D4+00 1/1 0/0 0/0 .text            __ct__11daBaseNpc_cFv */
 daBaseNpc_c::daBaseNpc_c() {}
 
-/* 8014E89C-8014EAD0 1491DC 0234+00 2/1 0/0 2/2 .text            __dt__11daBaseNpc_cFv */
 daBaseNpc_c::~daBaseNpc_c() {}
 
-/* 8014EAD0-8014EC50 149410 0180+00 2/0 0/0 2/0 .text            execute__11daBaseNpc_cFv */
 int daBaseNpc_c::execute() {
     setParam();
     mainProc();
@@ -477,7 +443,6 @@ int daBaseNpc_c::execute() {
     return 1;
 }
 
-/* 8014EC50-8014EE3C 149590 01EC+00 2/0 0/0 2/0 .text            draw__11daBaseNpc_cFf */
 int daBaseNpc_c::draw(f32 param_0) {
     J3DModel* model_p = mpModelMorf->getModel();
     J3DModelData* modelData_p = model_p->getModelData();
@@ -523,19 +488,15 @@ int daBaseNpc_c::draw(f32 param_0) {
     return 1;
 }
 
-/* 8014EE3C-8014EE44 14977C 0008+00 2/0 0/0 1/0 .text            getResName__11daBaseNpc_cFv */
 const char* daBaseNpc_c::getResName() {
     return NULL;
 }
 
-/* 8014EE44-8014EE80 149784 003C+00 0/0 0/0 2/2 .text getTrnsfrmKeyAnmP__11daBaseNpc_cFPci */
 J3DAnmTransform* daBaseNpc_c::getTrnsfrmKeyAnmP(char* i_arcName, int i_resIdx) {
     void* objectRes = dComIfG_getObjectRes(i_arcName, i_resIdx);
     return (J3DAnmTransform*)objectRes;
 }
 
-/* 8014EE80-8014EEE4 1497C0 0064+00 0/0 0/0 1/1 .text
- * setMcaMorfAnm__11daBaseNpc_cFP18J3DAnmTransformKeyffiii      */
 int daBaseNpc_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf,
                                 int i_mode, int i_start, int i_end) {
     f32 start = i_start;
@@ -544,8 +505,6 @@ int daBaseNpc_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_mor
     return 1;
 }
 
-/* 8014EEE4-8014EF28 149824 0044+00 0/0 0/0 1/1 .text
- * setBckAnm__11daBaseNpc_cFP15J3DAnmTransformfiiib             */
 int daBaseNpc_c::setBckAnm(J3DAnmTransform* i_anm, f32 i_speed, int i_mode, int i_start,
                             int i_end, bool i_modify) {
     s16 start = i_start;
@@ -553,21 +512,16 @@ int daBaseNpc_c::setBckAnm(J3DAnmTransform* i_anm, f32 i_speed, int i_mode, int
     return mBck.init(i_anm, TRUE, i_mode, i_speed, start, end, i_modify);
 }
 
-/* 8014EF28-8014EF64 149868 003C+00 0/0 0/0 1/1 .text            getTexPtrnAnmP__11daBaseNpc_cFPci
- */
 J3DAnmTransform* daBaseNpc_c::getTexPtrnAnmP(char* i_arcName, int i_resIdx) {
     void* objectRes = dComIfG_getObjectRes(i_arcName, i_resIdx);
     return (J3DAnmTransform*)objectRes;
 }
 
-/* 8014EF64-8014EFA4 1498A4 0040+00 0/0 0/0 1/1 .text
- * setBtpAnm__11daBaseNpc_cFP16J3DAnmTexPatternP12J3DModelDatafi */
 int daBaseNpc_c::setBtpAnm(J3DAnmTexPattern* i_anm, J3DModelData* i_modelData, f32 i_speed,
                             int i_mode) {
     return mBtp.init(i_modelData, i_anm, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 8014EFA4-8014EFF0 1498E4 004C+00 2/0 0/0 2/0 .text            attnSttsOn__11daBaseNpc_cFii */
 void daBaseNpc_c::attnSttsOn(int param_0, int param_1) {
     u32 attn_flags = 0;
 
@@ -586,10 +540,8 @@ void daBaseNpc_c::attnSttsOn(int param_0, int param_1) {
     attention_info.flags = attn_flags;
 }
 
-/* 8014EFF0-8014EFF4 149930 0004+00 2/0 0/0 1/0 .text            setParam__11daBaseNpc_cFv */
 void daBaseNpc_c::setParam() {}
 
-/* 8014EFF4-8014F09C 149934 00A8+00 0/0 0/0 1/1 .text            orderEvent__11daBaseNpc_cFiPc */
 void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) {
     if (i_evtName != NULL) {
         mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, -1);
@@ -602,28 +554,23 @@ void daBaseNpc_c::orderEvent(int param_0, char* i_evtName) {
     }
 }
 
-/* 8014F09C-8014F0A0 1499DC 0004+00 2/0 0/0 1/0 .text            mainProc__11daBaseNpc_cFv */
 void daBaseNpc_c::mainProc() {}
 
-/* 8014F0A0-8014F0FC 1499E0 005C+00 1/1 0/0 2/2 .text            setEnvTevColor__11daBaseNpc_cFv */
 void daBaseNpc_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(field_0x9d4);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(field_0x9d4);
 }
 
-/* 8014F0FC-8014F140 149A3C 0044+00 1/1 0/0 2/2 .text            setRoomNo__11daBaseNpc_cFv */
 void daBaseNpc_c::setRoomNo() {
     s8 room_id = dComIfG_Bgsp().GetRoomId(field_0x9d4);
     fopAcM_SetRoomNo(this, room_id);
     mCcStts.SetRoomId(room_id);
 }
 
-/* 8014F140-8014F148 149A80 0008+00 2/0 0/0 2/0 .text            btkCtrl__11daBaseNpc_cFv */
 BOOL daBaseNpc_c::btkCtrl() {
     return false;
 }
 
-/* 8014F148-8014F1C8 149A88 0080+00 1/1 0/0 0/0 .text            checkEndAnm__11daBaseNpc_cFf */
 int daBaseNpc_c::checkEndAnm(f32 param_0) {
     switch ((u8)mpModelMorf->getPlayMode()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -639,8 +586,6 @@ int daBaseNpc_c::checkEndAnm(f32 param_0) {
     return 0;
 }
 
-/* 8014F1C8-8014F228 149B08 0060+00 1/1 0/0 0/0 .text checkEndAnm__11daBaseNpc_cFP12J3DFrameCtrl
- */
 int daBaseNpc_c::checkEndAnm(J3DFrameCtrl* i_framectrl) {
     switch (i_framectrl->getAttribute()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -656,7 +601,6 @@ int daBaseNpc_c::checkEndAnm(J3DFrameCtrl* i_framectrl) {
     return 0;
 }
 
-/* 8014F228-8014F38C 149B68 0164+00 2/0 0/0 2/0 .text            allAnmPlay__11daBaseNpc_cFv */
 void daBaseNpc_c::allAnmPlay() {
     u32 offMask = 0x10F;
     if (cLib_checkBit<u16>((u16)field_0x840, 0x10) &&
@@ -703,11 +647,8 @@ void daBaseNpc_c::allAnmPlay() {
     cLib_offBit<u16>(field_0x840, offMask);
 }
 
-/* 8014F38C-8014F390 149CCC 0004+00 2/0 0/0 1/0 .text            adjustShapeAngle__11daBaseNpc_cFv
- */
 void daBaseNpc_c::adjustShapeAngle() {}
 
-/* 8014F390-8014F4A0 149CD0 0110+00 2/0 0/0 1/0 .text            setMtx__11daBaseNpc_cFi */
 void daBaseNpc_c::setMtx(int param_0) {
     J3DModel* model = mpModelMorf->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -743,45 +684,31 @@ void daBaseNpc_c::setMtx(int param_0) {
     }
 }
 
-/* 8014F4A0-8014F4A4 149DE0 0004+00 2/0 0/0 1/0 .text            setCollisions__11daBaseNpc_cFv */
 void daBaseNpc_c::setCollisions() {}
 
-/* 8014F4A4-8014F4A8 149DE4 0004+00 2/0 0/0 1/0 .text            setAttnPos__11daBaseNpc_cFv */
 void daBaseNpc_c::setAttnPos() {}
 
-/* 8014F4A8-8014F4AC 149DE8 0004+00 2/0 0/0 1/0 .text            drawOtherMdls__11daBaseNpc_cFv */
 void daBaseNpc_c::drawOtherMdls() {}
 
-/* 8014F4AC-8014F4B4 149DEC 0008+00 2/0 0/0 1/0 .text            dbgDraw__11daBaseNpc_cFv */
 bool daBaseNpc_c::dbgDraw() {
     return true;
 }
 
-/* 8014F4B4-8014F4F8 149DF4 0044+00 0/0 0/0 1/1 .text            __ct__23daBaseNpc_moveBgActor_cFv
- */
 daBaseNpc_moveBgActor_c::daBaseNpc_moveBgActor_c() {
     mpBgw = 0;
 }
 
-/* 8014F4F8-8014F518 149E38 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     daBaseNpc_moveBgActor_c* moveBgActor = (daBaseNpc_moveBgActor_c*)i_this;
     return moveBgActor->MoveBGCreateHeap();
 }
 
-/* 80450FE0-80450FE4 0004E0 0004+00 2/2 0/0 0/0 .sbss            m_name__23daBaseNpc_moveBgActor_c
- */
 const char* daBaseNpc_moveBgActor_c::m_name;
 
-/* 80450FE4-80450FE8 0004E4 0004+00 2/2 0/0 0/0 .sbss            m_dzb_id__23daBaseNpc_moveBgActor_c
- */
 int daBaseNpc_moveBgActor_c::m_dzb_id;
 
-/* 80450FE8-80450FEC 0004E8 0004+00 2/2 0/0 0/0 .sbss m_set_func__23daBaseNpc_moveBgActor_c */
 MoveBGActor_SetFunc daBaseNpc_moveBgActor_c::m_set_func;
 
-/* 8014F518-8014F60C 149E58 00F4+00 1/1 0/0 0/0 .text
- * MoveBGCreateHeap__23daBaseNpc_moveBgActor_cFv                */
 int daBaseNpc_moveBgActor_c::MoveBGCreateHeap() {
     if (!CreateHeap()) {
         return 0;
@@ -852,7 +779,6 @@ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, Mo
 #endif
 }
 
-/* 8014F6FC-8014F770 14A03C 0074+00 0/0 0/0 1/1 .text MoveBGDelete__23daBaseNpc_moveBgActor_cFv */
 int daBaseNpc_moveBgActor_c::MoveBGDelete() {
     int rt = Delete();
     if (mpBgw != NULL && mpBgw->ChkUsed()) {
@@ -865,8 +791,6 @@ int daBaseNpc_moveBgActor_c::MoveBGDelete() {
     return rt;
 }
 
-/* 8014F770-8014F81C 14A0B0 00AC+00 0/0 0/0 2/2 .text MoveBGExecute__23daBaseNpc_moveBgActor_cFv
- */
 int daBaseNpc_moveBgActor_c::MoveBGExecute() {
     Mtx* sp8 = NULL;
     int rt = Execute(&sp8);
@@ -887,8 +811,6 @@ int daBaseNpc_moveBgActor_c::MoveBGExecute() {
     return rt;
 }
 
-/* 8014F81C-8014F8C4 14A15C 00A8+00 1/1 0/0 0/0 .text
- * daBaseNpc_PntVsLineSegmentLengthSquare2D__FffffffPfPfPf      */
 static int daBaseNpc_PntVsLineSegmentLengthSquare2D(f32 param_0, f32 param_1, f32 param_2,
                                                     f32 param_3, f32 param_4, f32 param_5,
                                                     f32* param_6, f32* param_7, f32* param_8) {
@@ -913,7 +835,6 @@ static int daBaseNpc_PntVsLineSegmentLengthSquare2D(f32 param_0, f32 param_1, f3
     return var_r31;
 }
 
-/* 8014F8C4-8014FB28 14A204 0264+00 1/1 0/0 0/0 .text daBaseNpc_putNurbs__FP4dPntiiP4dPnti */
 static u16 daBaseNpc_putNurbs(dPnt* i_CPnts, int i_CPntNum, int i_maxPntNum, dPnt* o_curve_p, BOOL i_isClosed) {
     int knotVector[daBaseNpc_path_c::MAXNUMCONTROLPNT_e + 4];
     int weights[daBaseNpc_path_c::MAXNUMCONTROLPNT_e];
@@ -986,7 +907,6 @@ static u16 daBaseNpc_putNurbs(dPnt* i_CPnts, int i_CPntNum, int i_maxPntNum, dPn
     return out_pnt_no;
 }
 
-/* 8014FB28-80150230 14A468 0708+00 1/1 0/0 0/0 .text daBaseNpc_chkPnt__F4cXyzP4dPntUsUsii */
 static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_3, int param_4,
                             int param_5) {
     u16 var_r29 = param_2;
@@ -1059,8 +979,6 @@ static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_
     return (u16)abs(var_r31) > 0x4000;
 }
 
-/* 80150230-801502EC 14AB70 00BC+00 1/1 0/0 0/0 .text daBaseNpc_getGroundAngle__FP13cBgS_PolyInfos
- */
 static s16 daBaseNpc_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) {
     if (dComIfG_Bgsp().ChkPolySafe(*param_0)) {
         cM3dGPla spC;
diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp
index 0a0a3307a3..c79971e55e 100644
--- a/src/d/actor/d_a_npc4.cpp
+++ b/src/d/actor/d_a_npc4.cpp
@@ -4,12 +4,10 @@
 #include "d/d_debug_viewer.h"
 #include "d/d_msg_object.h"
 #include "d/actor/d_a_tag_evtarea.h"
-#include "dol2asm.h"
 
 static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4);
 u8 daNpcF_getDistTableIdx(int param_0, int param_1);
 
-/* 8015056C-801505AC 14AEAC 0040+00 2/2 0/0 0/0 .text            daNpcF_addIdx__FiiRUsi */
 static BOOL daNpcF_addIdx(int i_step, int i_num, u16& i_idx, BOOL i_isClosed) {
     int ret = false;
     int new_idx = i_idx;
@@ -28,7 +26,6 @@ static BOOL daNpcF_addIdx(int i_step, int i_num, u16& i_idx, BOOL i_isClosed) {
     return ret;
 }
 
-/* 801505AC-801505F8 14AEEC 004C+00 2/2 0/0 0/0 .text            daNpcF_subIdx__FiiRUsi */
 static BOOL daNpcF_subIdx(int i_step, int i_num, u16& i_idx, BOOL i_isClosed) {
     BOOL ret = false;
     int new_idx = i_idx;
@@ -47,7 +44,6 @@ static BOOL daNpcF_subIdx(int i_step, int i_num, u16& i_idx, BOOL i_isClosed) {
     return ret;
 }
 
-/* 801505F8-80150654 14AF38 005C+00 4/4 0/0 0/0 .text            daNpcF_incIdx__FiRUsii */
 static BOOL daNpcF_incIdx(int i_num, u16& i_idx, BOOL i_isClosed, int i_reverse) {
     BOOL result = FALSE;
     if (i_reverse) {
@@ -58,7 +54,6 @@ static BOOL daNpcF_incIdx(int i_num, u16& i_idx, BOOL i_isClosed, int i_reverse)
     return result;
 }
 
-/* 80150654-801506B0 14AF94 005C+00 3/3 0/0 0/0 .text            daNpcF_decIdx__FiRUsii */
 static BOOL daNpcF_decIdx(int i_num, u16& i_idx, BOOL i_isClosed, int i_reverse) {
     BOOL result = FALSE;
     if (i_reverse) {
@@ -69,28 +64,22 @@ static BOOL daNpcF_decIdx(int i_num, u16& i_idx, BOOL i_isClosed, int i_reverse)
     return result;
 }
 
-/* 801506B0-801506BC 14AFF0 000C+00 0/0 0/0 130/130 .text initialize__18daNpcF_ActorMngr_cFv */
 void daNpcF_ActorMngr_c::initialize() {
     mActorID = fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 801506BC-801506D8 14AFFC 001C+00 1/1 0/0 130/130 .text
- * entry__18daNpcF_ActorMngr_cFP10fopAc_ac_c                    */
 void daNpcF_ActorMngr_c::entry(fopAc_ac_c* i_actor) {
     mActorID = fopAcM_GetID(i_actor);
 }
 
-/* 801506D8-801506E0 -00001 0008+00 0/0 0/0 0/0 .text            entry__18daNpcF_ActorMngr_cFUi */
 void daNpcF_ActorMngr_c::entry(fpc_ProcID i_actorID) {
     mActorID = i_actorID;
 }
 
-/* 801506E0-801506EC 14B020 000C+00 2/2 0/0 55/55 .text            remove__18daNpcF_ActorMngr_cFv */
 void daNpcF_ActorMngr_c::remove() {
     mActorID = fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 801506EC-80150738 14B02C 004C+00 1/1 0/0 135/135 .text getActorP__18daNpcF_ActorMngr_cFv */
 fopAc_ac_c* daNpcF_ActorMngr_c::getActorP() {
     fopAc_ac_c* actor = NULL;
 
@@ -102,8 +91,6 @@ fopAc_ac_c* daNpcF_ActorMngr_c::getActorP() {
     return NULL;
 }
 
-/* 80150738-8015075C 14B078 0024+00 0/0 0/0 48/48 .text            initialize__15daNpcF_MatAnm_cFv
- */
 void daNpcF_MatAnm_c::initialize() {
     field_0xF4 = 0.0f;
     field_0xF8 = 0.0f;
@@ -113,7 +100,6 @@ void daNpcF_MatAnm_c::initialize() {
     mMorfFrm = 0;
 }
 
-/* 8015075C-80150870 14B09C 0114+00 1/0 0/0 0/0 .text calc__15daNpcF_MatAnm_cCFP11J3DMaterial */
 void daNpcF_MatAnm_c::calc(J3DMaterial* i_material) const {
     J3DMaterialAnm::calc(i_material);
 
@@ -143,7 +129,6 @@ void daNpcF_MatAnm_c::calc(J3DMaterial* i_material) const {
     }
 }
 
-/* 80150870-80150900 14B1B0 0090+00 2/2 0/0 8/8 .text initialize__16daNpcF_SPCurve_cFP5dPathi */
 void daNpcF_SPCurve_c::initialize(dPath* i_path, int i_isReversed) {
     mNurbs = 0;
     field_0x02 = 0;
@@ -162,7 +147,6 @@ void daNpcF_SPCurve_c::initialize(dPath* i_path, int i_isReversed) {
     }
 }
 
-/* 80150900-8015095C 14B240 005C+00 0/0 0/0 20/20 .text            initialize__13daNpcF_Path_cFv */
 void daNpcF_Path_c::initialize() {
     mIdx = 0;
     mIsReversed = false;
@@ -208,7 +192,6 @@ void daNpcF_Path_c::drawDbgInfoXyz() {
 }
 #endif
 
-/* 8015095C-80150A24 14B29C 00C8+00 0/0 0/0 12/12 .text setPathInfo__13daNpcF_Path_cFUcScUc */
 int daNpcF_Path_c::setPathInfo(u8 i_pathNo, s8 i_roomNo, u8 i_isReversed) {
     mPathInfo = NULL;
     mIdx = 0;
@@ -228,19 +211,15 @@ int daNpcF_Path_c::setPathInfo(u8 i_pathNo, s8 i_roomNo, u8 i_isReversed) {
     return 1;
 }
 
-/* 80150A24-80150A7C 14B364 0058+00 1/1 0/0 1/1 .text            chkPassed__13daNpcF_Path_cF4cXyz */
 BOOL daNpcF_Path_c::chkPassed(cXyz i_pos) {
     return daNpcF_chkPassed(i_pos, (dPnt*)mPathInfo->m_points, mIdx, mPathInfo->m_num,
                             mIsClosed, mIsReversed);
 }
 
-/* 80150A7C-80150BBC 14B3BC 0140+00 0/0 0/0 4/4 .text            chkPassedDst__13daNpcF_Path_cF4cXyz
- */
 BOOL daNpcF_Path_c::chkPassedDst(cXyz i_pos) {
     return mPosDst + field_0x10 <= (mPosition - i_pos).abs();
 }
 
-/* 80150BBC-80150BE0 14B4FC 0024+00 0/0 0/0 8/8 .text            reverse__13daNpcF_Path_cFv */
 void daNpcF_Path_c::reverse() {
     if (chkReverse()) {
         offReverse();
@@ -249,26 +228,22 @@ void daNpcF_Path_c::reverse() {
     }
 }
 
-/* 80150BE0-80150C18 14B520 0038+00 2/2 0/0 6/6 .text            setNextIdx__13daNpcF_Path_cFv */
 BOOL daNpcF_Path_c::setNextIdx() {
     return daNpcF_incIdx(mPathInfo->m_num, mIdx, chkClose(), mIsReversed);
 }
 
-/* 80150C18-80150C60 14B558 0048+00 0/0 0/0 9/9 .text            getNextIdx__13daNpcF_Path_cFv */
 int daNpcF_Path_c::getNextIdx() {
     u16 ret = mIdx;
     daNpcF_incIdx(mPathInfo->m_num, ret, chkClose(), mIsReversed);
     return ret;
 }
 
-/* 80150C60-80150CA8 14B5A0 0048+00 0/0 0/0 3/3 .text            getBeforeIdx__13daNpcF_Path_cFv */
 int daNpcF_Path_c::getBeforeIdx() {
     u16 ret = mIdx;
     daNpcF_decIdx(mPathInfo->m_num, ret, chkClose(), mIsReversed);
     return ret;
 }
 
-/* 80150CA8-80150D44 14B5E8 009C+00 0/0 0/0 1/1 .text getBeforePos__13daNpcF_Path_cFR4cXyz */
 BOOL daNpcF_Path_c::getBeforePos(cXyz& o_pos) {
     BOOL ret = FALSE;
     u16 idx = mIdx;
@@ -278,8 +253,6 @@ BOOL daNpcF_Path_c::getBeforePos(cXyz& o_pos) {
     return ret;
 }
 
-/* 80150D44-80150DE0 14B684 009C+00 0/0 0/0 1/1 .text            getNextPos__13daNpcF_Path_cFR4cXyz
- */
 BOOL daNpcF_Path_c::getNextPos(cXyz& o_pos) {
     BOOL ret = FALSE;
     u16 idx = mIdx;
@@ -290,7 +263,6 @@ BOOL daNpcF_Path_c::getNextPos(cXyz& o_pos) {
     return ret;
 }
 
-/* 80150DE0-80150EB4 14B720 00D4+00 0/0 0/0 16/16 .text getDstPos__13daNpcF_Path_cF4cXyzR4cXyz */
 int daNpcF_Path_c::getDstPos(cXyz i_pos1, cXyz& o_pos2) {
     BOOL ret = FALSE;
 
@@ -309,7 +281,6 @@ int daNpcF_Path_c::getDstPos(cXyz i_pos1, cXyz& o_pos2) {
     return ret;
 }
 
-/* 80150EB4-80151038 14B7F4 0184+00 0/0 0/0 2/2 .text setNextIdxDst__13daNpcF_Path_cF4cXyz */
 void daNpcF_Path_c::setNextIdxDst(cXyz i_pos) {
     if (!setNextIdx()) {
         mPosDst = (i_pos - getPntPos(getIdx())).abs();
@@ -317,8 +288,6 @@ void daNpcF_Path_c::setNextIdxDst(cXyz i_pos) {
     }
 }
 
-/* 80151038-801510B8 14B978 0080+00 0/0 0/0 72/72 .text            initialize__15daNpcF_Lookat_cFv
- */
 void daNpcF_Lookat_c::initialize() {
     for (int i = 0; i < 4; i++) {
         mJointPos[i].setall(0.0f);
@@ -332,8 +301,6 @@ void daNpcF_Lookat_c::initialize() {
     mAttnPos_p = NULL;
 }
 
-/* 801510B8-80151350 14B9F8 0298+00 0/0 0/0 34/34 .text
- * setParam__15daNpcF_Lookat_cFffffffffffffsP4cXyz              */
 void daNpcF_Lookat_c::setParam(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                                f32 param_5, f32 param_6, f32 param_7, f32 param_8, f32 param_9,
                                f32 param_10, f32 param_11, s16 i_rotAngle, cXyz* i_jointPos) {
@@ -367,8 +334,6 @@ void daNpcF_Lookat_c::setParam(f32 param_0, f32 param_1, f32 param_2, f32 param_
     mMaxAngle[3].set(0, 0, 0);
 }
 
-/* 80151350-801515D4 14BC90 0284+00 0/0 0/0 34/34 .text
- * calc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fPP5csXyziii        */
 void daNpcF_Lookat_c::calc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, csXyz** o_lookatAngle,
                            BOOL i_snap, int i_axis, BOOL i_debug) {
     cXyz sp68[4];
@@ -429,8 +394,6 @@ void daNpcF_Lookat_c::calc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, csXyz**
     }
 }
 
-/* 801515D4-80151648 14BF14 0074+00 1/1 0/0 0/0 .text adjustMoveDisAngle__15daNpcF_Lookat_cFRssss
- */
 // NONMATCHING - regalloc, matches debug
 void daNpcF_Lookat_c::adjustMoveDisAngle(s16& delta, s16 angle, s16 min, s16 max) {
     int newAngle = 0;
@@ -454,8 +417,6 @@ void daNpcF_Lookat_c::adjustMoveDisAngle(s16& delta, s16 angle, s16 min, s16 max
     }
 }
 
-/* 80151648-80151A54 14BF88 040C+00 1/1 0/0 0/0 .text
- * initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi */
 void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz* param_2,
                                csXyz* param_3, f32* param_4, cXyz& param_5, int i_debug) {
     Mtx mtx;
@@ -502,7 +463,6 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz
     }
 }
 
-/* 80151A54-80151B68 14C394 0114+00 1/1 0/0 0/0 .text update__15daNpcF_Lookat_cFP4cXyzP5csXyzPf */
 void daNpcF_Lookat_c::update(cXyz* param_0, csXyz* param_1, f32* param_2) {
     csXyz ang = csXyz::Zero;
     cXyz vec;
@@ -524,8 +484,6 @@ void daNpcF_Lookat_c::update(cXyz* param_0, csXyz* param_1, f32* param_2) {
     }
 }
 
-/* 80151B68-80151F54 14C4A8 03EC+00 1/1 0/0 0/0 .text
- * calcMoveDisAngle__15daNpcF_Lookat_cFiP4cXyzP5csXyz4cXyzii    */
 void daNpcF_Lookat_c::calcMoveDisAngle(int i_no, cXyz* param_1, csXyz* param_2, cXyz param_3,
                                        int i_axis, int i_debug) {
     cXyz vec1;
@@ -578,7 +536,6 @@ void daNpcF_Lookat_c::calcMoveDisAngle(int i_no, cXyz* param_1, csXyz* param_2,
     }
 }
 
-/* 80151F54-80151FE0 14C894 008C+00 1/1 0/0 0/0 .text            setRotAngle__15daNpcF_Lookat_cFv */
 void daNpcF_Lookat_c::setRotAngle() {
     int ang_x = 0;
     int ang_y = 0;
@@ -594,7 +551,6 @@ void daNpcF_Lookat_c::setRotAngle() {
     }
 }
 
-/* 80151FE0-80152014 14C920 0034+00 1/1 0/0 0/0 .text            clrRotAngle__15daNpcF_Lookat_cFv */
 void daNpcF_Lookat_c::clrRotAngle() {
     for (int i = 0; i < 4; i++) {
         mRotAngle[i].x = 0;
@@ -603,7 +559,6 @@ void daNpcF_Lookat_c::clrRotAngle() {
     }
 }
 
-/* 80152014-801522AC 14C954 0298+00 0/0 0/0 38/38 .text            execute__8daNpcF_cFv */
 BOOL daNpcF_c::execute() {
     setParam();
 
@@ -660,7 +615,6 @@ BOOL daNpcF_c::execute() {
     return true;
 }
 
-/* 801522AC-80152614 14CBEC 0368+00 0/0 0/0 33/33 .text draw__8daNpcF_cFiifP11_GXColorS10i */
 int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
                    BOOL i_hideDamage) {
     f32 damage_ratio, frame;
@@ -742,8 +696,6 @@ int daNpcF_c::draw(BOOL i_isTest, BOOL param_1, f32 i_shadowDepth, _GXColorS10*
     return 1;
 }
 
-/* 80152614-80152654 14CF54 0040+00 0/0 0/0 13/13 .text
- * tgHitCallBack__8daNpcF_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac_c* i_actor,
                              dCcD_GObjInf* param_3) {
     if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_ALINK) {
@@ -756,7 +708,6 @@ void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac
     }
 }
 
-/* 803B37E0-803B3824 010900 0044+00 0/0 0/0 36/36 .data            mCcDCyl__8daNpcF_c */
 dCcD_SrcCyl daNpcF_c::mCcDCyl = {
     daNpcF_c::mCcDObjInfo,
     {
@@ -766,7 +717,6 @@ dCcD_SrcCyl daNpcF_c::mCcDCyl = {
             }  // mCyl
 };
 
-/* 803B3824-803B3864 010944 0040+00 0/0 0/0 2/2 .data            mCcDSph__8daNpcF_c */
 dCcD_SrcSph daNpcF_c::mCcDSph = {
     daNpcF_c::mCcDObjInfo,
     {
@@ -776,13 +726,10 @@ dCcD_SrcSph daNpcF_c::mCcDSph = {
 
 char daNpcF_c::mFileNameBuf[0x15];
 
-/* 804257E8-80425978 052508 0190+00 4/4 0/0 0/0 .bss             mFindActorPList__8daNpcF_c */
 fopAc_ac_c* daNpcF_c::mFindActorPList[100];
 
-/* 80450FF0-80450FF4 0004F0 0004+00 4/4 0/0 0/0 .sbss            mFindCount__8daNpcF_c */
 s32 daNpcF_c::mFindCount;
 
-/* 80152654-801526E8 14CF94 0094+00 0/0 0/0 12/12 .text            srchAttnActor1__8daNpcF_cFPvPv */
 void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) {
     void* param_1_copy = param_1;
     fopAc_ac_c* actor = NULL;
@@ -798,10 +745,8 @@ void* daNpcF_c::srchAttnActor1(void* i_proc, void* param_1) {
     return NULL;
 }
 
-/* 80450FF4-80450FF8 0004F4 0002+02 2/2 0/0 0/0 .sbss            mSrchActorName__8daNpcF_c */
 s16 daNpcF_c::mSrchActorName;
 
-/* 801526E8-8015276C 14D028 0084+00 1/1 0/0 0/0 .text            srchActor__8daNpcF_cFPvPv */
 void* daNpcF_c::srchActor(void* i_proc, void* i_this) {
     void* i_this_copy = i_this;
     fopAc_ac_c* actor = NULL;
@@ -816,7 +761,6 @@ void* daNpcF_c::srchActor(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 8015276C-801527FC 14D0AC 0090+00 2/0 0/0 40/9 .text            setMtx__8daNpcF_cFv */
 void daNpcF_c::setMtx() {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -834,7 +778,6 @@ void daNpcF_c::setMtx() {
     }
 }
 
-/* 801527FC-801528C8 14D13C 00CC+00 2/0 0/0 38/0 .text            setMtx2__8daNpcF_cFv */
 void daNpcF_c::setMtx2() {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -858,7 +801,6 @@ void daNpcF_c::setMtx2() {
     }
 }
 
-/* 801528C8-80152B2C 14D208 0264+00 0/0 0/0 76/76 .text            initialize__8daNpcF_cFv */
 void daNpcF_c::initialize() {
     field_0x824.remove();
 
@@ -948,34 +890,26 @@ void daNpcF_c::initialize() {
     field_0x9d2 = cM_rndF(0x10000);
 }
 
-/* 80152B2C-80152B68 14D46C 003C+00 0/0 0/0 69/69 .text            getTrnsfrmKeyAnmP__8daNpcF_cFPci
- */
 J3DAnmTransformKey* daNpcF_c::getTrnsfrmKeyAnmP(char* i_arcName, int i_resIdx) {
     J3DAnmTransformKey* key = (J3DAnmTransformKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
     return key;
 }
 
-/* 80152B68-80152BA4 14D4A8 003C+00 0/0 0/0 31/31 .text            getTexPtrnAnmP__8daNpcF_cFPci */
 J3DAnmTexPattern* daNpcF_c::getTexPtrnAnmP(char* i_arcName, int i_resIdx) {
     J3DAnmTexPattern* pattern = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_resIdx);
     return pattern;
 }
 
-/* 80152BA4-80152BE0 14D4E4 003C+00 0/0 0/0 50/50 .text            getTexSRTKeyAnmP__8daNpcF_cFPci
- */
 J3DAnmTextureSRTKey* daNpcF_c::getTexSRTKeyAnmP(char* i_arcName, int i_resIdx) {
     J3DAnmTextureSRTKey* key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
     return key;
 }
 
-/* 80152BE0-80152C1C 14D520 003C+00 0/0 0/0 2/2 .text            getTevRegKeyAnmP__8daNpcF_cFPci */
 J3DAnmTevRegKey* daNpcF_c::getTevRegKeyAnmP(char* i_arcName, int i_resIdx) {
     J3DAnmTevRegKey* key = (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
     return key;
 }
 
-/* 80152C1C-80152C80 14D55C 0064+00 0/0 0/0 38/38 .text
- * setMcaMorfAnm__8daNpcF_cFP18J3DAnmTransformKeyffiii          */
 BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf, int i_mode,
                              int i_start, int i_end) {
     f32 start = i_start;
@@ -984,8 +918,6 @@ BOOL daNpcF_c::setMcaMorfAnm(J3DAnmTransformKey* i_anm, f32 i_speed, f32 i_morf,
     return true;
 }
 
-/* 80152C80-80152CC4 14D5C0 0044+00 0/0 0/0 25/25 .text
- * setBckAnm__8daNpcF_cFP15J3DAnmTransformfiiib                 */
 BOOL daNpcF_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int i_start, int i_end,
                          bool i_modify) {
     s16 start = i_start;
@@ -993,41 +925,32 @@ BOOL daNpcF_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int i_
     return mBckAnm.init(i_bck, true, i_mode, i_speed, start, end, i_modify);
 }
 
-/* 80152CC4-80152D04 14D604 0040+00 0/0 0/0 32/32 .text
- * setBtpAnm__8daNpcF_cFP16J3DAnmTexPatternP12J3DModelDatafi    */
 BOOL daNpcF_c::setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_speed,
                          int i_mode) {
     return mBtpAnm.init(i_modelData, i_btp, true, i_mode, i_speed, 0, -1);
 }
 
-/* 80152D04-80152D44 14D644 0040+00 0/0 0/0 26/26 .text
- * setBtkAnm__8daNpcF_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */
 BOOL daNpcF_c::setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_speed,
                          int i_mode) {
     return mBtkAnm.init(i_modelData, i_btk, true, i_mode, i_speed, 0, -1);
 }
 
-/* 80152D44-80152D84 14D684 0040+00 0/0 0/0 2/2 .text
- * setBrkAnm__8daNpcF_cFP15J3DAnmTevRegKeyP12J3DModelDatafi     */
 BOOL daNpcF_c::setBrkAnm(J3DAnmTevRegKey* i_brk, J3DModelData* i_modelData, f32 i_speed,
                          int i_mode) {
     return mBrkAnm.init(i_modelData, i_brk, true, i_mode, i_speed, 0, -1);
 }
 
-/* 80152D84-80152DE0 14D6C4 005C+00 1/1 0/0 40/40 .text            setEnvTevColor__8daNpcF_cFv */
 void daNpcF_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80152DE0-80152E24 14D720 0044+00 1/1 0/0 40/40 .text            setRoomNo__8daNpcF_cFv */
 void daNpcF_c::setRoomNo() {
     s8 room_id = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_id);
     mCcStts.SetRoomId(room_id);
 }
 
-/* 80152E24-80152EC4 14D764 00A0+00 1/1 0/0 0/0 .text            chkEndAnm__8daNpcF_cFf */
 BOOL daNpcF_c::chkEndAnm(f32 param_0) {
     switch ((u8)mAnm_p->getPlayMode()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -1042,7 +965,6 @@ BOOL daNpcF_c::chkEndAnm(f32 param_0) {
     }
 }
 
-/* 80152EC4-80152F40 14D804 007C+00 1/1 0/0 0/0 .text chkEndAnm__8daNpcF_cFP12J3DFrameCtrlf */
 /**
  * Check whether an animation has ended or looped.
  * @param frameCtrl The frame controller for the animation.
@@ -1064,7 +986,6 @@ BOOL daNpcF_c::chkEndAnm(J3DFrameCtrl* frameCtrl, f32 prevRate) {
     }
 }
 
-/* 80152F40-80153150 14D880 0210+00 1/1 0/0 2/2 .text            playAllAnm__8daNpcF_cFv */
 BOOL daNpcF_c::playAllAnm() {
     f32 rate;
     if (!(mAnmFlags & ANM_PAUSE_EXPRESSION)) {
@@ -1145,8 +1066,6 @@ BOOL daNpcF_c::playAllAnm() {
     return true;
 }
 
-/* 80153150-80153264 14DA90 0114+00 0/0 0/0 25/25 .text
- * playExpressionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 /**
  * Set the expression animation.
  * @param anm The animation data, a two-dimensional array of data pointers, indexed first by
@@ -1184,8 +1103,6 @@ void daNpcF_c::playExpressionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) {
     mExpressionPrevPhase = mExpressionPhase;
 }
 
-/* 80153264-8015337C 14DBA4 0118+00 0/0 0/0 37/37 .text
- * playMotionAnm__8daNpcF_cFPPPQ28daNpcF_c18daNpcF_anmPlayData  */
 /**
  * Set the motion animation.
  * @param anm The animation data, a two-dimensional array of data pointers, indexed first by
@@ -1223,7 +1140,6 @@ void daNpcF_c::playMotionAnm(daNpcF_c::daNpcF_anmPlayData*** anm) {
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 8015337C-80153578 14DCBC 01FC+00 0/0 0/0 34/34 .text            setLookatMtx__8daNpcF_cFiPif */
 /**
  * Compute the animation matrix for the backbone, neck, or head joint.
  * This matrix is applied to the matrix in `mDoMtx_stack_c::now`.
@@ -1269,8 +1185,6 @@ void daNpcF_c::setLookatMtx(int i_jointNo, int* i_jointList, f32 i_neckHeadAngle
     }
 }
 
-/* 80153578-80153658 14DEB8 00E0+00 0/0 0/0 13/13 .text            hitChk2__8daNpcF_cFP8dCcD_Cylii
- */
 BOOL daNpcF_c::hitChk2(dCcD_Cyl* i_ccCyl, BOOL param_1, BOOL param_2) {
     fopAc_ac_c* hit_actor = NULL;
     s16 actorAngleY;
@@ -1302,7 +1216,6 @@ BOOL daNpcF_c::hitChk2(dCcD_Cyl* i_ccCyl, BOOL param_1, BOOL param_2) {
     return false;
 }
 
-/* 80153658-80153718 14DF98 00C0+00 0/0 0/0 12/12 .text            setDamage__8daNpcF_cFiii */
 void daNpcF_c::setDamage(int i_timer, int i_expression, int i_motion) {
     if (i_expression >= 0) {
         setExpression(i_expression, 0.0f);
@@ -1321,8 +1234,6 @@ void daNpcF_c::setDamage(int i_timer, int i_expression, int i_motion) {
     mIsDamaged = true;
 }
 
-/* 80153718-8015387C 14E058 0164+00 0/0 0/0 81/81 .text ctrlMsgAnm__8daNpcF_cFRiRiP10fopAc_ac_ci
- */
 int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2, BOOL param_3) {
     o_expression = -1;
     o_motion = -1;
@@ -1368,8 +1279,6 @@ int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2,
     return mMsgTimer;
 }
 
-/* 8015387C-80153954 14E1BC 00D8+00 0/0 0/0 45/45 .text            orderEvent__8daNpcF_cFiPcUsUsUcUs
- */
 void daNpcF_c::orderEvent(int i_speak, char* i_evtName, u16 param_2, u16 i_priority, u8 i_mapToolID,
                           u16 i_flag) {
     if (i_evtName != NULL) {
@@ -1391,8 +1300,6 @@ void daNpcF_c::orderEvent(int i_speak, char* i_evtName, u16 param_2, u16 i_prior
     }
 }
 
-/* 80153954-801539F0 14E294 009C+00 0/0 0/0 31/31 .text            changeEvent__8daNpcF_cFPcPcUsUs
- */
 void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 param_3) {
     if (i_arcName != NULL) {
         eventInfo.setArchiveName(i_arcName);
@@ -1406,8 +1313,6 @@ void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 pa
     fopAcM_orderChangeEventId(this, mEventIdx, param_2, param_3);
 }
 
-/* 801539F0-80153A78 14E330 0088+00 0/0 0/0 21/21 .text chkActorInSight__8daNpcF_cFP10fopAc_ac_cf
- */
 BOOL daNpcF_c::chkActorInSight(fopAc_ac_c* i_actor, f32 i_fovY) {
     s16 angle = mHeadAngle.y;
     angle = fopAcM_searchActorAngleY(this, i_actor) - angle;
@@ -1415,8 +1320,6 @@ BOOL daNpcF_c::chkActorInSight(fopAc_ac_c* i_actor, f32 i_fovY) {
     return i_fovY == 180.0f || angle < cM_deg2s(i_fovY);
 }
 
-/* 80153A78-80153BDC 14E3B8 0164+00 1/1 0/0 0/0 .text
- * chkActorInArea__8daNpcF_cFP10fopAc_ac_c4cXyz4cXyzs           */
 /**
  * Check whether an actor is in an elliptic cylinder region.
  * @param i_actor The actor to check.
@@ -1447,8 +1350,6 @@ BOOL daNpcF_c::chkActorInArea(fopAc_ac_c* i_actor, cXyz i_center, cXyz i_bounds,
     return ret;
 }
 
-/* 80153BDC-80153D1C 14E51C 0140+00 0/0 0/0 25/25 .text
- * chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci    */
 /**
  * Check whether an actor lies within another actor's region of attention.
  * @param i_actorCheck The actor to check.
@@ -1476,7 +1377,6 @@ BOOL daNpcF_c::chkActorInAttnArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorA
     return ret;
 }
 
-/* 80153D1C-80153D84 14E65C 0068+00 0/0 0/0 118/118 .text initTalk__8daNpcF_cFiPP10fopAc_ac_c */
 BOOL daNpcF_c::initTalk(int i_flowID, fopAc_ac_c** param_1) {
     mFlow.init(this, i_flowID, 0, param_1);
     speedF = 0.0f;
@@ -1486,7 +1386,6 @@ BOOL daNpcF_c::initTalk(int i_flowID, fopAc_ac_c** param_1) {
     return true;
 }
 
-/* 80153D84-80153EF4 14E6C4 0170+00 0/0 0/0 119/119 .text talkProc__8daNpcF_cFPiiPP10fopAc_ac_c */
 BOOL daNpcF_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_talkPartners_p) {
     BOOL ret = false;
     int i1, motion, expression, i2;
@@ -1522,7 +1421,6 @@ BOOL daNpcF_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_talkPartners_
     return ret;
 }
 
-/* 80153EF4-801540A4 14E834 01B0+00 1/1 0/0 55/55 .text            turn__8daNpcF_cFsfi */
 BOOL daNpcF_c::turn(s16 i_targetAngle, f32 i_rate, int i_direction) {
     int target_angle = i_targetAngle;
     if (mTurnAmount == 0) {
@@ -1557,7 +1455,6 @@ BOOL daNpcF_c::turn(s16 i_targetAngle, f32 i_rate, int i_direction) {
     return current.angle.y - (s16)i_targetAngle == 0;
 }
 
-/* 801540A4-80154250 14E9E4 01AC+00 0/0 0/0 58/58 .text            step__8daNpcF_cFsiii */
 BOOL daNpcF_c::step(s16 i_targetAngle, int i_expression, int i_motion, int i_rate) {
     if (mTurnMode == 0) {
         s16 angleDiff = i_targetAngle - mCurAngle.y;
@@ -1594,7 +1491,6 @@ BOOL daNpcF_c::step(s16 i_targetAngle, int i_expression, int i_motion, int i_rat
     return mTurnMode > 1;
 }
 
-/* 80154250-80154278 14EB90 0028+00 0/0 0/0 81/81 .text            setAngle__8daNpcF_cFs */
 void daNpcF_c::setAngle(s16 i_angle) {
     current.angle.y = i_angle;
     shape_angle.y = current.angle.y;
@@ -1603,12 +1499,10 @@ void daNpcF_c::setAngle(s16 i_angle) {
     old.angle.y = current.angle.y;
 }
 
-/* 80154278-801542A0 14EBB8 0028+00 0/0 0/0 36/36 .text            getDistTableIdx__8daNpcF_cFii */
 u8 daNpcF_c::getDistTableIdx(int param_0, int param_1) {
     return daNpcF_getDistTableIdx(param_0, param_1);
 }
 
-/* 801542A0-8015436C 14EBE0 00CC+00 0/0 0/0 6/6 .text            getEvtAreaTagP__8daNpcF_cFii */
 fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int i_type, int i_no) {
     int r29 = 0;
     f32 f31 = G_CM3D_F_INF;
@@ -1625,8 +1519,6 @@ fopAc_ac_c* daNpcF_c::getEvtAreaTagP(int i_type, int i_no) {
     return NULL;
 }
 
-/* 8015436C-80154730 14ECAC 03C4+00 0/0 0/0 12/12 .text getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii
- */
 fopAc_ac_c* daNpcF_c::getAttnActorP(BOOL i_playerAttn, fpcLyIt_JudgeFunc i_searchFunc, f32 i_radius,
                                     f32 i_offsetY1, f32 i_offsetY2, f32 i_fovY, s16 i_sightAngle,
                                     int param_7, BOOL param_8) {
@@ -1720,8 +1612,6 @@ fopAc_ac_c* daNpcF_c::getAttnActorP(BOOL i_playerAttn, fpcLyIt_JudgeFunc i_searc
     return actor;
 }
 
-/* 80154730-80154834 14F070 0104+00 2/2 0/0 0/0 .text chkActorInSight2__8daNpcF_cFP10fopAc_ac_cfs
- */
 BOOL daNpcF_c::chkActorInSight2(fopAc_ac_c* i_actor, f32 i_fovY, s16 i_sightAngle) {
     if (i_fovY < 180.0f) {
         s16 fov_y = cM_deg2s(i_fovY);
@@ -1738,7 +1628,6 @@ BOOL daNpcF_c::chkActorInSight2(fopAc_ac_c* i_actor, f32 i_fovY, s16 i_sightAngl
     return true;
 }
 
-/* 80154834-801548F4 14F174 00C0+00 2/2 0/0 0/0 .text chkPointInArea__8daNpcF_cF4cXyz4cXyzfffs */
 BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz param_1, f32 i_radius, f32 i_offsetY1,
                               f32 i_offsetY2, s16 i_angleY) {
     cXyz bounds, center;
@@ -1760,13 +1649,10 @@ BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz param_1, f32 i_radius, f32 i_of
     return chkPointInArea(i_point, center, bounds, i_angleY);
 }
 
-/* 801548F4-8015496C 14F234 0078+00 1/1 0/0 0/0 .text chkPointInArea__8daNpcF_cF4cXyz4cXyz4cXyzs
- */
 BOOL daNpcF_c::chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_angleY) {
     return daNpcF_chkPointInArea(i_point, i_center, i_bounds, i_angleY);
 }
 
-/* 8015496C-801549E0 14F2AC 0074+00 3/3 0/0 0/0 .text getAttentionPos__8daNpcF_cFP10fopAc_ac_c */
 cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_actor_p) {
     cXyz pos = i_actor_p->attention_info.position;
 
@@ -1777,7 +1663,6 @@ cXyz daNpcF_c::getAttentionPos(fopAc_ac_c* i_actor_p) {
     return pos;
 }
 
-/* 801549E0-80154BD8 14F320 01F8+00 0/0 0/0 18/18 .text            chkFindPlayer2__8daNpcF_cFis */
 BOOL daNpcF_c::chkFindPlayer2(BOOL i_hasAttn, s16 i_angle) {
     BOOL sp20;
 
@@ -1814,7 +1699,6 @@ BOOL daNpcF_c::chkFindPlayer2(BOOL i_hasAttn, s16 i_angle) {
     return false;
 }
 
-/* 80154BD8-80154DA8 14F518 01D0+00 1/1 0/0 0/0 .text            setHitodamaPrtcl__8daNpcF_cFv */
 void daNpcF_c::setHitodamaPrtcl() {
     JPABaseEmitter* emitter = NULL;
     cXyz pos;
@@ -1844,8 +1728,6 @@ void daNpcF_c::setHitodamaPrtcl() {
     }
 }
 
-/* 80154DA8-80154E54 14F6E8 00AC+00 1/1 0/0 1/1 .text
- * daNpcF_pntVsLineSegmentLengthSquare2D__FffffffPfPfPf         */
 BOOL daNpcF_pntVsLineSegmentLengthSquare2D(f32 i_pntX, f32 i_pntZ, f32 i_startX, f32 i_startZ,
                                            f32 i_endX, f32 i_endZ, f32* o_projX, f32* o_projZ,
                                            f32* o_dist2) {
@@ -1875,13 +1757,10 @@ BOOL daNpcF_pntVsLineSegmentLengthSquare2D(f32 i_pntX, f32 i_pntZ, f32 i_startX,
     return ret;
 }
 
-/* 80154E54-80154E5C 14F794 0008+00 1/1 0/0 0/0 .text            daNpcF_putNurbs__FP4dPntiiP4dPnti
- */
 static u16 daNpcF_putNurbs(dPnt* param_0, int param_1, int param_2, dPnt* param_3, int param_4) {
     return 0;
 }
 
-/* 80154E5C-8015556C 14F79C 0710+00 1/1 0/0 1/1 .text daNpcF_chkPassed__F4cXyzP4dPntUsUsii */
 BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_isClosed,
                       BOOL i_isReversed) {
     cXyz prev_pos, cur_pos, next_pos, pos;
@@ -1954,7 +1833,6 @@ BOOL daNpcF_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, BOOL i_i
     return false;
 }
 
-/* 8015556C-80155634 14FEAC 00C8+00 1/1 0/0 8/8 .text daNpcF_getGroundAngle__FP13cBgS_PolyInfos */
 s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) {
     cM3dGPla plane;
 
@@ -1970,32 +1848,26 @@ s16 daNpcF_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1) {
     return 0;
 }
 
-/* 80155634-80155674 14FF74 0040+00 0/0 0/0 69/69 .text            daNpcF_chkEvtBit__FUl */
 BOOL daNpcF_chkEvtBit(u32 i_no) {
     return dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
-/* 80155674-801556B4 14FFB4 0040+00 0/0 0/0 13/13 .text            daNpcF_onEvtBit__FUl */
 void daNpcF_onEvtBit(u32 i_no) {
     dComIfGs_onEventBit((u16)dSv_event_flag_c::saveBitLabels[i_no]);
 }
 
-/* 801556B4-801556F4 14FFF4 0040+00 0/0 0/0 6/6 .text            daNpcF_chkTmpBit__FUl */
 BOOL daNpcF_chkTmpBit(u32 i_no) {
     return dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 801556F4-80155734 150034 0040+00 0/0 0/0 6/6 .text            daNpcF_onTmpBit__FUl */
 void daNpcF_onTmpBit(u32 i_no) {
     dComIfGs_onTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 80155734-80155774 150074 0040+00 1/1 0/0 36/36 .text            daNpcF_offTmpBit__FUl */
 void daNpcF_offTmpBit(u32 i_no) {
     dComIfGs_offTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[i_no]);
 }
 
-/* 80155774-80155854 1500B4 00E0+00 0/0 2/2 5/5 .text            daNpcF_getPlayerInfoFromPlayerList__FiiR4cXyzR5csXyz */
 int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2, csXyz& param_3) {
     int rv = 0;
 
@@ -2015,7 +1887,6 @@ int daNpcF_getPlayerInfoFromPlayerList(int param_0, int i_roomNo, cXyz& param_2,
     return rv;
 }
 
-/* 80155854-80155968 150194 0114+00 0/0 0/0 1/1 .text daNpcF_chkDoBtnEqSpeak__FP10fopAc_ac_c */
 BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) {
     BOOL ret = FALSE;
 
@@ -2048,7 +1919,6 @@ BOOL daNpcF_chkDoBtnEqSpeak(fopAc_ac_c* i_actor_p) {
     return ret;
 }
 
-/* 80155968-80155AD4 1502A8 016C+00 1/1 0/0 2/2 .text daNpcF_chkPointInArea__F4cXyz4cXyz4cXyzs */
 BOOL daNpcF_chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_angleY) {
     cXyz delta_aligned;
 
@@ -2078,7 +1948,6 @@ BOOL daNpcF_chkPointInArea(cXyz i_point, cXyz i_center, cXyz i_bounds, s16 i_ang
     return FALSE;
 }
 
-/* 80155AD4-80155AE8 150414 0014+00 1/1 0/0 1/1 .text            daNpcF_getDistTableIdx__Fii */
 u8 daNpcF_getDistTableIdx(int param_0, int param_1) {
     return param_0 + param_1 * 0x14 + 0x5e;
 }
@@ -2249,7 +2118,6 @@ void daNpcF_commonGenMessage(JORMContext* i_ctx, daNpcF_HIOParam* i_hio) {
 }
 #endif
 
-/* 80155AE8-80155B54 150428 006C+00 0/0 0/0 6/6 .text            daNpcF_clearMessageTmpBit__Fv */
 void daNpcF_clearMessageTmpBit() {
     daNpcF_offTmpBit(0xb);
     daNpcF_offTmpBit(0xc);
@@ -2276,7 +2144,6 @@ static void dummyVirtual(daNpcF_MoveBgActor_c* dummy) {
     dummy->ToBack();
 }
 
-/* 803926B0-803926E0 01ED10 0030+00 0/0 0/0 0/0 .rodata          mCcDObj__11daBaseNpc_c */
 dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
     {0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
@@ -2284,7 +2151,6 @@ dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = {
     {0}
 };
 
-/* 803926E0-80392710 01ED40 0030+00 0/0 0/0 0/0 .rodata          mCcDObjInfo__8daNpcF_c */
 dCcD_SrcGObjInf const daNpcF_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp
index a8ea18adca..14b3341b8f 100644
--- a/src/d/actor/d_a_npc_aru.cpp
+++ b/src/d/actor/d_a_npc_aru.cpp
@@ -136,12 +136,10 @@ enum Type {
     /* 0x4 */ TYPE_4,
 };
 
-/* 80957908-80957910 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_ARU, ARU},
 };
 
-/* 80957910-80957970 -00001 0060+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[12] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -157,30 +155,25 @@ static daNpcT_evtData_c l_evtList[12] = {
     {"NO_ENTRANCE", 2},
 };
 
-/* 80957970-8095797C -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Aru",
     "Aru1",
 };
 
-/* 8095797C-80957980 000094 0002+02 0/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     ARU, -1
 };
 
-/* 80957980-80957984 000098 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[3] = {
     ARU, ARU1, -1,
 };
 
-/* 80957984-8095799C -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9,
     l_loadResPtrn9, l_loadResPtrn9, l_loadResPtrn9,
 };
 
-/* 8095799C-80957B08 0000B4 016C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[13] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_ARU, J3DFrameCtrl::EMode_LOOP, ARU, 1},
     {BCK_ARU_F_NORMAL, J3DFrameCtrl::EMode_NONE, ARU, BTP_ARU, J3DFrameCtrl::EMode_LOOP, ARU, 1},
@@ -197,7 +190,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[13] = {
     {BCK_ARU_FH_NORMAL, J3DFrameCtrl::EMode_LOOP, ARU, BTP_ARU_FH_NORMAL, J3DFrameCtrl::EMode_LOOP, ARU, 0},
 };
 
-/* 80957B08-80957C74 000220 016C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[13] = {
     {BCK_ARU_WAIT_A, J3DFrameCtrl::EMode_LOOP, ARU, BTK_ARU,J3DFrameCtrl::EMode_NONE, ARU, 1, 0},
     {BCK_ARU_WAIT_C, J3DFrameCtrl::EMode_LOOP, ARU1, BTK_ARU, J3DFrameCtrl::EMode_NONE, ARU, 1, 0},
@@ -214,7 +206,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[13] = {
     {BCK_ARU_RUN, J3DFrameCtrl::EMode_LOOP, ARU1, BTK_ARU, J3DFrameCtrl::EMode_NONE, ARU, 1, 0},
 };
 
-/* 80957C74-80957D44 00038C 00D0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[52] = {
     {1, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -231,7 +222,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[52] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80957D44-80957E04 00045C 00C0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[48] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -247,7 +237,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[48] = {
     {11, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80957E04-80957E20 -00001 001C+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Aru_c */
 char* daNpc_Aru_c::mCutNameList[7] = {
     "",
     "RIDEON_HORSE",
@@ -258,7 +247,6 @@ char* daNpc_Aru_c::mCutNameList[7] = {
     "NO_ENTRANCE",
 };
 
-/* 80957E68-80957EBC 000580 0054+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Aru_c */
 daNpc_Aru_c::cutFunc daNpc_Aru_c::mCutList[7] = {
     NULL,
     &daNpc_Aru_c::cutRideOnHorse,
@@ -269,7 +257,6 @@ daNpc_Aru_c::cutFunc daNpc_Aru_c::mCutList[7] = {
     &daNpc_Aru_c::cutNoEntrance,
 };
 
-/* 8095178C-809518C4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__11daNpc_Aru_cFv */
 daNpc_Aru_c::~daNpc_Aru_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -278,7 +265,6 @@ daNpc_Aru_c::~daNpc_Aru_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809576D0-80957770 000000 00A0+00 12/12 0/0 0/0 .rodata          m__17daNpc_Aru_Param_c */
 const daNpc_Aru_HIOParam daNpc_Aru_Param_c::m = {
     220.0f,
     -3.0f,
@@ -329,7 +315,6 @@ const daNpc_Aru_HIOParam daNpc_Aru_Param_c::m = {
     45.0f,
 };
 
-/* 809518C4-80951BB0 000224 02EC+00 1/1 0/0 0/0 .text            create__11daNpc_Aru_cFv */
 cPhs__Step daNpc_Aru_c::create() {
     daNpcT_ct(this, daNpc_Aru_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -393,7 +378,6 @@ cPhs__Step daNpc_Aru_c::create() {
     return phase;
 }
 
-/* 80951BB0-80951E20 000510 0270+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Aru_cFv */
 int daNpc_Aru_c::CreateHeap() {
     J3DModelData* mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
     if (mdlData_p == NULL) {
@@ -423,18 +407,15 @@ int daNpc_Aru_c::CreateHeap() {
     return 0;
 }
 
-/* 80951FDC-80952010 00093C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Aru_cFv */
 int daNpc_Aru_c::Delete() {
     this->~daNpc_Aru_c();
     return 1;
 }
 
-/* 80952010-80952030 000970 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Aru_cFv */
 int daNpc_Aru_c::Execute() {
     return execute();
 }
 
-/* 80952030-809520C4 000990 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Aru_cFv */
 int daNpc_Aru_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -451,12 +432,10 @@ int daNpc_Aru_c::Draw() {
     );
 }
 
-/* 809520C4-809520E4 000A24 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_Aru_cFP10fopAc_ac_c */
 int daNpc_Aru_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_Aru_c*>(a_this)->CreateHeap();
 }
 
-/* 809520E4-8095213C 000A44 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_Aru_cFP8J3DJointi */
 int daNpc_Aru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         daNpc_Aru_c* i_this = (daNpc_Aru_c*)j3dSys.getModel()->getUserArea();
@@ -468,7 +447,6 @@ int daNpc_Aru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8095213C-809521E4 000A9C 00A8+00 1/1 0/0 0/0 .text            srchCow__11daNpc_Aru_cFPvPv */
 void* daNpc_Aru_c::srchCow(void* i_actor, void* i_data) {
     if (mFindCount < 50) {
         fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
@@ -483,7 +461,6 @@ void* daNpc_Aru_c::srchCow(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809521E4-80952280 000B44 009C+00 2/2 0/0 0/0 .text            srchUDoor__11daNpc_Aru_cFPvPv */
 void* daNpc_Aru_c::srchUDoor(void* i_actor, void* i_data) {
     if (mFindCount < 50 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_UDOOR) {
@@ -495,7 +472,6 @@ void* daNpc_Aru_c::srchUDoor(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80952280-80952400 000BE0 0180+00 1/1 0/0 0/0 .text chkThrust__11daNpc_Aru_cFP10fopAc_ac_c */
 BOOL daNpc_Aru_c::chkThrust(fopAc_ac_c* actor_p) {
     cM_atan2s(actor_p->speed.x, actor_p->speed.z);
     fopAcM_searchActorAngleY(actor_p, this);
@@ -521,7 +497,6 @@ BOOL daNpc_Aru_c::chkThrust(fopAc_ac_c* actor_p) {
     return FALSE;
 }
 
-/* 80952400-8095253C 000D60 013C+00 1/1 0/0 0/0 .text            getCowP__11daNpc_Aru_cFi */
 fopAc_ac_c* daNpc_Aru_c::getCowP(int param_1) {
     mFindCount = 0;
 
@@ -557,7 +532,6 @@ fopAc_ac_c* daNpc_Aru_c::getCowP(int param_1) {
     return NULL;
 }
 
-/* 8095253C-8095260C 000E9C 00D0+00 1/1 0/0 0/0 .text            getUDoor_l_P__11daNpc_Aru_cFv */
 fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() {
     fopAc_ac_c* rv = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -575,7 +549,6 @@ fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() {
     return rv;
 }
 
-/* 8095260C-809526DC 000F6C 00D0+00 1/1 0/0 0/0 .text            getUDoor_r_P__11daNpc_Aru_cFv */
 fopAc_ac_c* daNpc_Aru_c::getUDoor_r_P() {
     fopAc_ac_c* rv = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -593,7 +566,6 @@ fopAc_ac_c* daNpc_Aru_c::getUDoor_r_P() {
     return rv;
 }
 
-/* 809526DC-80952740 00103C 0064+00 1/1 0/0 0/0 .text            getType__11daNpc_Aru_cFv */
 u8 daNpc_Aru_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -616,7 +588,6 @@ u8 daNpc_Aru_c::getType() {
     }
 }
 
-/* 80952740-809527CC 0010A0 008C+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -642,7 +613,6 @@ BOOL daNpc_Aru_c::isDelete() {
     }
 }
 
-/* 809527CC-80952B00 00112C 0334+00 1/1 0/0 0/0 .text            reset__11daNpc_Aru_cFv */
 void daNpc_Aru_c::reset() {
     csXyz angle;
     int iVar1 = (u8*)&field_0xfd4 - (u8*)&mNextAction;
@@ -717,7 +687,6 @@ void daNpc_Aru_c::reset() {
     setAngle(angle);
 }
 
-/* 80952B00-80952B84 001460 0084+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Aru_cFi */
 void daNpc_Aru_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -728,7 +697,6 @@ void daNpc_Aru_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80952B84-80952CE8 0014E4 0164+00 1/0 0/0 0/0 .text            setParam__11daNpc_Aru_cFv */
 void daNpc_Aru_c::setParam() {
     selectAction();
     srchActors();
@@ -771,7 +739,6 @@ void daNpc_Aru_c::setParam() {
     gravity = daNpc_Aru_Param_c::m.common.gravity;
 }
 
-/* 80952CE8-80952D9C 001648 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Aru_c::talk)) {
         mPreItemNo = 0;
@@ -789,7 +756,6 @@ BOOL daNpc_Aru_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80952D9C-80952E64 0016FC 00C8+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Aru_cFv */
 void daNpc_Aru_c::setAfterTalkMotion() {
     int i_index = FACE_NONE;
 
@@ -822,7 +788,6 @@ void daNpc_Aru_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 80952E64-809530DC 0017C4 0278+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Aru_cFv */
 void daNpc_Aru_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -879,7 +844,6 @@ void daNpc_Aru_c::srchActors() {
     }
 }
 
-/* 809530DC-8095317C 001A3C 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::evtTalk() {
     if (chkAction(&daNpc_Aru_c::talk)) {
         (this->*mAction)(NULL);
@@ -890,7 +854,6 @@ BOOL daNpc_Aru_c::evtTalk() {
     return TRUE;
 }
 
-/* 8095317C-80953244 001ADC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Aru", this, -1);
 
@@ -908,7 +871,6 @@ BOOL daNpc_Aru_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80953244-809533D8 001BA4 0194+00 1/0 0/0 0/0 .text            action__11daNpc_Aru_cFv */
 void daNpc_Aru_c::action() {
     fopAc_ac_c* actor_p = hitChk(&mCyl, 0xFFFFFFFF);
 
@@ -934,7 +896,6 @@ void daNpc_Aru_c::action() {
     }
 }
 
-/* 809533D8-8095349C 001D38 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Aru_cFv */
 void daNpc_Aru_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -947,10 +908,8 @@ void daNpc_Aru_c::beforeMove() {
     }
 }
 
-/* 8095816C-80958170 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Aru_Param_c l_HIO;
 
-/* 8095349C-80953798 001DFC 02FC+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Aru_cFv */
 void daNpc_Aru_c::setAttnPos() {
     cXyz sp40(-30.0f, 10.0f, 0.0f);
     cXyz sp4c(0.0f, 10.0f, 0.0f);
@@ -983,7 +942,6 @@ void daNpc_Aru_c::setAttnPos() {
     setFootPrtcl(&prtclScl, 0.0f, 0.0f);
 }
 
-/* 80953798-809538F0 0020F8 0158+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Aru_cFv */
 void daNpc_Aru_c::setCollision() {
     cXyz pos;
 
@@ -1021,12 +979,10 @@ void daNpc_Aru_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 809538F0-809538F8 002250 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Aru_cFv */
 int daNpc_Aru_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809538F8-80953AB8 002258 01C0+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::selectAction() {
     mNextAction = NULL;
 
@@ -1075,12 +1031,10 @@ BOOL daNpc_Aru_c::selectAction() {
     return TRUE;
 }
 
-/* 80953AB8-80953AE4 002418 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_Aru_cFM11daNpc_Aru_cFPCvPvPv_i */
 BOOL daNpc_Aru_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80953AE4-80953B8C 002444 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_Aru_cFM11daNpc_Aru_cFPCvPvPv_i */
 BOOL daNpc_Aru_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1098,7 +1052,6 @@ BOOL daNpc_Aru_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80953B8C-80953C08 0024EC 007C+00 4/4 0/0 0/0 .text            chkBullRunningStage__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::chkBullRunningStage() {
     BOOL rv;
 
@@ -1111,7 +1064,6 @@ BOOL daNpc_Aru_c::chkBullRunningStage() {
     return rv;
 }
 
-/* 80953C08-80953C84 002568 007C+00 2/2 0/0 0/0 .text            chkSkipFenceStage__11daNpc_Aru_cFv */
 BOOL daNpc_Aru_c::chkSkipFenceStage() {
     BOOL rv;
 
@@ -1124,7 +1076,6 @@ BOOL daNpc_Aru_c::chkSkipFenceStage() {
     return rv;
 }
 
-/* 80953C84-80953D58 0025E4 00D4+00 1/1 0/0 0/0 .text            srchActorDirection__11daNpc_Aru_cFP10fopAc_ac_c */
 s16 daNpc_Aru_c::srchActorDirection(fopAc_ac_c* actor_p) {
     s16 rv;
     s16 sVar1 = fopAcM_searchActorAngleY(this, actor_p) - mCurAngle.y;
@@ -1152,7 +1103,6 @@ s16 daNpc_Aru_c::srchActorDirection(fopAc_ac_c* actor_p) {
     return (s16)rv;
 }
 
-/* 80953D58-809543B0 0026B8 0658+00 1/1 0/0 0/0 .text            adjustMoveDir__11daNpc_Aru_cFv */
 void daNpc_Aru_c::adjustMoveDir() {
     cM3dGPla planes[3];
     cXyz sp84, sp90, sp9c;
@@ -1308,7 +1258,6 @@ void daNpc_Aru_c::adjustMoveDir() {
     }
 }
 
-/* 809543F8-80954744 002D58 034C+00 2/2 0/0 0/0 .text            duck__11daNpc_Aru_cFi */
 int daNpc_Aru_c::duck(int param_1) {
     fopAc_ac_c* cow_p;
     int iVar1 = daNpc_Aru_Param_c::m.avoid_time;
@@ -1377,7 +1326,6 @@ int daNpc_Aru_c::duck(int param_1) {
     return 0;
 }
 
-/* 80954744-80954894 0030A4 0150+00 3/3 0/0 0/0 .text            lookround__11daNpc_Aru_cFs */
 int daNpc_Aru_c::lookround(s16 param_1) {
     if (field_0xfd1) {
         cLib_addCalcAngleS2(&current.angle.y, param_1, MREG_S(0) + 4, MREG_S(1) + 0x800);
@@ -1401,7 +1349,6 @@ int daNpc_Aru_c::lookround(s16 param_1) {
     return 1;
 }
 
-/* 80954894-80954A5C 0031F4 01C8+00 1/0 0/0 0/0 .text            cutRideOnHorse__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutRideOnHorse(int i_staffID) {
     int rv = 0;
     int prm = -1;
@@ -1444,7 +1391,6 @@ int daNpc_Aru_c::cutRideOnHorse(int i_staffID) {
     return rv;
 }
 
-/* 80954A5C-80954C0C 0033BC 01B0+00 1/0 0/0 0/0 .text            cutGotoBullRunningStage__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutGotoBullRunningStage(int i_staffID) {
     int rv = 0;
     int prm = -1;
@@ -1488,7 +1434,6 @@ int daNpc_Aru_c::cutGotoBullRunningStage(int i_staffID) {
     return rv;
 }
 
-/* 80954C0C-80954F4C 00356C 0340+00 1/0 0/0 0/0 .text            cutEndBullRunning__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutEndBullRunning(int i_staffID) {
     int rv = 0;
     int prm = -1;
@@ -1579,7 +1524,6 @@ int daNpc_Aru_c::cutEndBullRunning(int i_staffID) {
     return rv;
 }
 
-/* 80954F4C-80955080 0038AC 0134+00 1/0 0/0 0/0 .text            cutGotoSkipFenceStage__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutGotoSkipFenceStage(int i_staffID) {
     int rv = 0;
     int prm = -1;
@@ -1621,7 +1565,6 @@ int daNpc_Aru_c::cutGotoSkipFenceStage(int i_staffID) {
     return rv;
 }
 
-/* 80955080-8095533C 0039E0 02BC+00 1/0 0/0 0/0 .text            cutSpeakTo__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutSpeakTo(int i_staffID) {
     int rv = 0;
     int prm = -1;
@@ -1698,7 +1641,6 @@ int daNpc_Aru_c::cutSpeakTo(int i_staffID) {
     return rv;
 }
 
-/* 8095533C-80955608 003C9C 02CC+00 1/0 0/0 0/0 .text            cutNoEntrance__11daNpc_Aru_cFi */
 int daNpc_Aru_c::cutNoEntrance(int i_staffID) {
     cXyz work;
     csXyz angle;
@@ -1765,7 +1707,6 @@ int daNpc_Aru_c::cutNoEntrance(int i_staffID) {
     return rv;
 }
 
-/* 80955608-80955B48 003F68 0540+00 4/0 0/0 0/0 .text            wait__11daNpc_Aru_cFPv */
 int daNpc_Aru_c::wait(void* param_1) {
     fopAc_ac_c* actor_p;
 
@@ -1897,7 +1838,6 @@ int daNpc_Aru_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80955B48-80955DE8 0044A8 02A0+00 3/0 0/0 0/0 .text            bullRunning__11daNpc_Aru_cFPv */
 int daNpc_Aru_c::bullRunning(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1959,7 +1899,6 @@ int daNpc_Aru_c::bullRunning(void* param_1) {
     return 1;
 }
 
-/* 80955DE8-80955F98 004748 01B0+00 2/0 0/0 0/0 .text            skipFence__11daNpc_Aru_cFPv */
 int daNpc_Aru_c::skipFence(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -2003,7 +1942,6 @@ int daNpc_Aru_c::skipFence(void* param_1) {
     return 1;
 }
 
-/* 80955F98-809562C0 0048F8 0328+00 3/0 0/0 0/0 .text            talk__11daNpc_Aru_cFPv */
 int daNpc_Aru_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -2086,34 +2024,28 @@ int daNpc_Aru_c::test(void* param_1) {
 }
 #endif
 
-/* 809562C0-809562E0 004C20 0020+00 1/0 0/0 0/0 .text            daNpc_Aru_Create__FPv */
 static int daNpc_Aru_Create(void* a_this) {
     return static_cast<daNpc_Aru_c*>(a_this)->create();
 }
 
-/* 809562E0-80956300 004C40 0020+00 1/0 0/0 0/0 .text            daNpc_Aru_Delete__FPv */
 static int daNpc_Aru_Delete(void* a_this) {
     return static_cast<daNpc_Aru_c*>(a_this)->Delete();
 }
 
-/* 80956300-80956320 004C60 0020+00 1/0 0/0 0/0 .text            daNpc_Aru_Execute__FPv */
 static int daNpc_Aru_Execute(void* a_this) {
     return static_cast<daNpc_Aru_c*>(a_this)->Execute();
 }
 
-/* 80956320-80956340 004C80 0020+00 1/0 0/0 0/0 .text            daNpc_Aru_Draw__FPv */
 static int daNpc_Aru_Draw(void* a_this) {
     return static_cast<daNpc_Aru_c*>(a_this)->Draw();
 }
 
-/* 80956340-80956348 004CA0 0008+00 1/0 0/0 0/0 .text            daNpc_Aru_IsDelete__FPv */
 static int daNpc_Aru_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80957F4C-80957F6C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Aru_MethodTable */
 static actor_method_class daNpc_Aru_MethodTable = {
     (process_method_func)daNpc_Aru_Create,
     (process_method_func)daNpc_Aru_Delete,
@@ -2122,7 +2054,6 @@ static actor_method_class daNpc_Aru_MethodTable = {
     (process_method_func)daNpc_Aru_Draw,
 };
 
-/* 80957F6C-80957F9C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ARU */
 extern actor_process_profile_definition g_profile_NPC_ARU = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp
index c391dacd0d..60f2f00468 100644
--- a/src/d/actor/d_a_npc_ash.cpp
+++ b/src/d/actor/d_a_npc_ash.cpp
@@ -11,7 +11,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 8095D640-8095D6AC 000000 006C+00 14/14 0/0 0/0 .rodata          m__16daNpcAsh_Param_c */
 const daNpcAsh_HIOParam daNpcAsh_Param_c::m = {
     35.0f,    // attention_offset
     -3.0f,    // gravity
@@ -58,7 +57,6 @@ void daNpcAsh_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 8095DD4C-8095DD50 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_ASH_HIO_CLASS l_HIO;
 
 void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) {
@@ -136,7 +134,6 @@ bool daNpcAsh_c::step(s16 i_angY, bool i_animate) {
     return mTurnMode > 1;
 }
 
-/* 8095D9B0-8095DA88 000020 00D8+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[18] = {
     {-1, 2, 0},  // <none>
     {7, 0, 0},   // ash_f_talk_a
@@ -158,44 +155,37 @@ static daNpc_GetParam2 l_bckGetParamList[18] = {
     {4, 2, 2},   // ash_bowrun
 };
 
-/* 8095DA88-8095DA94 0000F8 000C+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {17, 2, 0},  // ash
 };
 
-/* 8095DA94-8095DAA0 000104 000C+00 0/1 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[1] = {
     {14, 2, 0},  // ash
 };
 
-/* 8095DAA0-8095DAAC 000110 000C+00 1/0 0/0 0/0 .data            l_loadRes_ASH0 */
 static int l_loadRes_ASH0[3] = {
     0,
     1,
     -1,
 };
 
-/* 8095DAAC-8095DAB8 00011C 000C+00 1/0 0/0 0/0 .data            l_loadRes_ASH1 */
 static int l_loadRes_ASH1[3] = {
     0,
     2,
     -1,
 };
 
-/* 8095DAB8-8095DAC0 -00001 0008+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[2] = {
     l_loadRes_ASH0,
     l_loadRes_ASH1,
 };
 
-/* 8095DAC0-8095DACC -00001 000C+00 5/7 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "Ash",
     "Ash1",
     "Ash2",
 };
 
-/* 8095DACC-8095DAE4 -00001 0018+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[6] = {
     "",
     "THE_INTRODUCTION",
@@ -205,7 +195,6 @@ static char* l_evtNames[6] = {
     "RESIST_WIRETAP_RAFREL",
 };
 
-/* 8095DAE4-8095DAE8 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Ash";
 
 daNpcAsh_c::EventFn daNpcAsh_c::mEvtSeqList[6] = {
@@ -217,10 +206,8 @@ daNpcAsh_c::EventFn daNpcAsh_c::mEvtSeqList[6] = {
     &daNpcAsh_c::EvCut_WiretapEntrant,
 };
 
-/* 809582EC-80958430 0000EC 0144+00 1/1 0/0 0/0 .text            __ct__10daNpcAsh_cFv */
 daNpcAsh_c::daNpcAsh_c() {}
 
-/* 80958610-809587A0 000410 0190+00 1/0 0/0 0/0 .text            __dt__10daNpcAsh_cFv */
 daNpcAsh_c::~daNpcAsh_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[l_loadRes_list[mType][i]]);
@@ -231,7 +218,6 @@ daNpcAsh_c::~daNpcAsh_c() {
     }
 }
 
-/* 809587A0-80958B68 0005A0 03C8+00 1/1 0/0 0/0 .text            Create__10daNpcAsh_cFv */
 cPhs__Step daNpcAsh_c::Create() {
     cPhs__Step step;
 
@@ -318,7 +304,6 @@ cPhs__Step daNpcAsh_c::Create() {
     return step;
 }
 
-/* 80958B68-80958F08 000968 03A0+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcAsh_cFv */
 BOOL daNpcAsh_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 11));
     mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound,
@@ -378,19 +363,16 @@ BOOL daNpcAsh_c::CreateHeap() {
     return true;
 }
 
-/* 809590C4-809590F8 000EC4 0034+00 1/1 0/0 0/0 .text            Delete__10daNpcAsh_cFv */
 int daNpcAsh_c::Delete() {
     this->~daNpcAsh_c();
     return 1;
 }
 
-/* 809590F8-8095911C 000EF8 0024+00 2/2 0/0 0/0 .text            Execute__10daNpcAsh_cFv */
 int daNpcAsh_c::Execute() {
     execute();
     return 1;
 }
 
-/* 8095911C-80959238 000F1C 011C+00 1/1 0/0 0/0 .text            Draw__10daNpcAsh_cFv */
 int daNpcAsh_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
     draw(false, false, mpHIO->m.common.real_shadow_size, NULL, false);
@@ -410,8 +392,6 @@ int daNpcAsh_c::Draw() {
     return 1;
 }
 
-/* 80959238-80959458 001038 0220+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcAsh_cFP8J3DJointP8J3DModel
- */
 bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jointNo = i_joint->getJntNo();
     int lookatJoints[3] = {1, 3, 4};
@@ -453,14 +433,10 @@ bool daNpcAsh_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return true;
 }
 
-/* 80959458-80959478 001258 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daNpcAsh_cFP10fopAc_ac_c               */
 BOOL daNpcAsh_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpcAsh_c*>(i_this)->CreateHeap();
 }
 
-/* 80959478-809594C4 001278 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpcAsh_cFP8J3DJointi
- */
 BOOL daNpcAsh_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -472,8 +448,6 @@ BOOL daNpcAsh_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return true;
 }
 
-/* 809594C4-809596E0 0012C4 021C+00 2/0 0/0 0/0 .text            setExpressionAnm__10daNpcAsh_cFib
- */
 bool daNpcAsh_c::setExpressionAnm(int i_idx, bool i_modify) {
     if (i_idx < 0 || i_idx > 7) {
         return false;
@@ -537,7 +511,6 @@ bool daNpcAsh_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 809596E0-809597C0 0014E0 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__10daNpcAsh_cFi */
 bool daNpcAsh_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx],
                                               l_btpGetParamList[i_idx].fileIdx);
@@ -556,7 +529,6 @@ bool daNpcAsh_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809597C0-80959910 0015C0 0150+00 1/0 0/0 0/0 .text            setMotionAnm__10daNpcAsh_cFif */
 void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) {
     if (i_idx < 8 || i_idx >= 18) {
         return;
@@ -584,7 +556,6 @@ void daNpcAsh_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80959910-80959B28 001710 0218+00 1/1 0/0 0/0 .text            reset__10daNpcAsh_cFv */
 void daNpcAsh_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -630,8 +601,6 @@ void daNpcAsh_c::reset() {
     }
 }
 
-/* 80959B28-80959BD0 001928 00A8+00 1/1 0/0 0/0 .text
- * setAction__10daNpcAsh_cFM10daNpcAsh_cFPCvPvPv_b              */
 bool daNpcAsh_c::setAction(daNpcAsh_c::ActionFn i_actionFn) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -645,7 +614,6 @@ bool daNpcAsh_c::setAction(daNpcAsh_c::ActionFn i_actionFn) {
     return true;
 }
 
-/* 80959BD0-80959C40 0019D0 0070+00 1/1 0/0 0/0 .text            isSneaking__10daNpcAsh_cFv */
 bool daNpcAsh_c::isSneaking() {
     if (!strcmp(dComIfGp_getStartStageName(), "R_SP116") && dComIfGp_getStartStageRoomNo() == 5 &&
         dComIfG_play_c::getLayerNo(0) == 2)
@@ -681,7 +649,6 @@ void daNpcAsh_c::playExpression() {
     }
 }
 
-/* 8095C200-8095C520 004000 0320+00 1/1 0/0 0/0 .text            playMotion__10daNpcAsh_cFv */
 void daNpcAsh_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -715,7 +682,6 @@ void daNpcAsh_c::playMotion() {
     }
 }
 
-/* 8095C9BC-8095CC8C 0047BC 02D0+00 1/1 0/0 0/0 .text            lookat__10daNpcAsh_cFv */
 void daNpcAsh_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -768,7 +734,6 @@ void daNpcAsh_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80959C40-8095A67C 001A40 0A3C+00 4/0 0/0 0/0 .text            wait_type0__10daNpcAsh_cFPv */
 bool daNpcAsh_c::wait_type0(void* param_0) {
     switch (mMode) {
     case 0:
@@ -870,7 +835,6 @@ bool daNpcAsh_c::wait_type0(void* param_0) {
     return true;
 }
 
-/* 8095A67C-8095A6C0 00247C 0044+00 1/0 0/0 0/0 .text            setMotion__10daNpcAsh_cFifi */
 void daNpcAsh_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = (s16)i_motion;
     if (i_restart || mMotion != motion) {
@@ -883,7 +847,6 @@ void daNpcAsh_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 8095A6C0-8095A6EC 0024C0 002C+00 1/0 0/0 0/0 .text            setExpression__10daNpcAsh_cFif */
 void daNpcAsh_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 8) {
         mExpression = i_expression;
@@ -893,7 +856,6 @@ void daNpcAsh_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 8095A6EC-8095A8EC 0024EC 0200+00 3/0 0/0 0/0 .text            wait_type1__10daNpcAsh_cFPv */
 bool daNpcAsh_c::wait_type1(void* param_0) {
     switch (mMode) {
     case 0:
@@ -933,7 +895,6 @@ bool daNpcAsh_c::wait_type1(void* param_0) {
     return true;
 }
 
-/* 8095A8EC-8095AD28 0026EC 043C+00 1/0 0/0 0/0 .text            talk__10daNpcAsh_cFPv */
 bool daNpcAsh_c::talk(void* param_0) {
     bool ret = false;
 
@@ -989,7 +950,6 @@ bool daNpcAsh_c::talk(void* param_0) {
     return ret;
 }
 
-/* 8095AD28-8095B164 002B28 043C+00 1/0 0/0 0/0 .text            demo__10daNpcAsh_cFPv */
 bool daNpcAsh_c::demo(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1048,7 +1008,6 @@ bool daNpcAsh_c::demo(void* param_0) {
     return true;
 }
 
-/* 8095B164-8095B48C 002F64 0328+00 1/0 0/0 0/0 .text            leave__10daNpcAsh_cFPv */
 bool daNpcAsh_c::leave(void* param_0) {
     cXyz target;
     target.set(-6253.387, 0.0, 6251.7603);
@@ -1077,8 +1036,6 @@ bool daNpcAsh_c::leave(void* param_0) {
     return true;
 }
 
-/* 8095B48C-8095B58C 00328C 0100+00 1/0 0/0 0/0 .text            EvCut_Introduction__10daNpcAsh_cFi
- */
 BOOL daNpcAsh_c::EvCut_Introduction(int i_staffID) {
     int* prm = dComIfGp_evmng_getMyIntegerP(i_staffID, "prm");
     if (prm == NULL) {
@@ -1100,7 +1057,6 @@ BOOL daNpcAsh_c::EvCut_Introduction(int i_staffID) {
     return false;
 }
 
-/* 8095B58C-8095B83C 00338C 02B0+00 1/0 0/0 0/0 .text            EvCut_Meeting__10daNpcAsh_cFi */
 BOOL daNpcAsh_c::EvCut_Meeting(int i_staffID) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     fopAc_ac_c* actors[4] = {
@@ -1156,7 +1112,6 @@ BOOL daNpcAsh_c::EvCut_Meeting(int i_staffID) {
     return false;
 }
 
-/* 8095B83C-8095BA80 00363C 0244+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__10daNpcAsh_cFi */
 BOOL daNpcAsh_c::EvCut_WiretapSponsor(int i_staffID) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     fopAc_ac_c* actors[4] = {
@@ -1205,7 +1160,6 @@ BOOL daNpcAsh_c::EvCut_WiretapSponsor(int i_staffID) {
     return false;
 }
 
-/* 8095BA80-8095BC38 003880 01B8+00 2/0 0/0 0/0 .text EvCut_WiretapEntrant__10daNpcAsh_cFi */
 BOOL daNpcAsh_c::EvCut_WiretapEntrant(int i_staffID) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_staffID, "prm");
@@ -1241,32 +1195,26 @@ BOOL daNpcAsh_c::EvCut_WiretapEntrant(int i_staffID) {
     return true;
 }
 
-/* 8095BC38-8095BC58 003A38 0020+00 1/0 0/0 0/0 .text            daNpcAsh_Create__FPv */
 static cPhs__Step daNpcAsh_Create(void* i_this) {
     return static_cast<daNpcAsh_c*>(i_this)->Create();
 }
 
-/* 8095BC58-8095BC78 003A58 0020+00 1/0 0/0 0/0 .text            daNpcAsh_Delete__FPv */
 static int daNpcAsh_Delete(void* i_this) {
     return static_cast<daNpcAsh_c*>(i_this)->Delete();
 }
 
-/* 8095BC78-8095BC98 003A78 0020+00 1/0 0/0 0/0 .text            daNpcAsh_Execute__FPv */
 static int daNpcAsh_Execute(void* i_this) {
     return static_cast<daNpcAsh_c*>(i_this)->Execute();
 }
 
-/* 8095BC98-8095BCB8 003A98 0020+00 1/0 0/0 0/0 .text            daNpcAsh_Draw__FPv */
 static int daNpcAsh_Draw(void* i_this) {
     return static_cast<daNpcAsh_c*>(i_this)->Draw();
 }
 
-/* 8095BCB8-8095BCC0 003AB8 0008+00 1/0 0/0 0/0 .text            daNpcAsh_IsDelete__FPv */
 static int daNpcAsh_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8095BCF0-8095BF6C 003AF0 027C+00 1/0 0/0 0/0 .text            setParam__10daNpcAsh_cFv */
 void daNpcAsh_c::setParam() {
     searchActors();
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -1292,7 +1240,6 @@ void daNpcAsh_c::setParam() {
     }
 }
 
-/* 8095BF6C-8095C200 003D6C 0294+00 1/0 0/0 0/0 .text            main__10daNpcAsh_cFv */
 BOOL daNpcAsh_c::main() {
     if (mpActionFn != NULL) {
         (this->*mpActionFn)(NULL);
@@ -1306,7 +1253,6 @@ BOOL daNpcAsh_c::main() {
     return true;
 }
 
-/* 8095C520-8095C5C4 004320 00A4+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpcAsh_cFv */
 BOOL daNpcAsh_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         mpMatAnm->setNowOffsetX(cM_ssin(mEyeAngle.y) * 0.2f * -1.0f);
@@ -1317,7 +1263,6 @@ BOOL daNpcAsh_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 8095C5C4-8095C9BC 0043C4 03F8+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcAsh_cFv */
 void daNpcAsh_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -1379,19 +1324,16 @@ void daNpcAsh_c::setAttnPos() {
     }
 }
 
-/* 8095CC8C-8095CC94 004A8C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcAsh_cFv */
 BOOL daNpcAsh_c::drawDbgInfo() {
     return false;
 }
 
-/* 8095DC04-8095DC24 -00001 0020+00 1/0 0/0 0/0 .data            daNpcAsh_MethodTable */
 static actor_method_class daNpcAsh_MethodTable = {
     (process_method_func)daNpcAsh_Create,  (process_method_func)daNpcAsh_Delete,
     (process_method_func)daNpcAsh_Execute, (process_method_func)daNpcAsh_IsDelete,
     (process_method_func)daNpcAsh_Draw,
 };
 
-/* 8095DC24-8095DC54 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ASH */
 extern actor_process_profile_definition g_profile_NPC_ASH = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp
index 68e687bec4..173543ff2f 100644
--- a/src/d/actor/d_a_npc_ashB.cpp
+++ b/src/d/actor/d_a_npc_ashB.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_npc.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 
-/* 809620E4-80962154 000000 0070+00 11/11 0/0 0/0 .rodata          m__17daNpcAshB_Param_c */
 const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
     205.0f,   // attention_offset
     -3.0f,    // gravity
@@ -49,14 +48,12 @@ const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
 
 NPC_ASHB_HIO_CLASS l_HIO;
 
-/* 80962438-80962534 000020 00FC+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[21] = {
     {-1, 2, 0}, {13, 0, 0}, {14, 0, 0}, {11, 0, 0}, {10, 0, 0}, {9, 0, 0},  {12, 0, 0},
     {24, 2, 0}, {25, 2, 0}, {24, 2, 0}, {21, 0, 0}, {22, 0, 0}, {20, 0, 0}, {23, 0, 0},
     {7, 0, 0},  {8, 0, 0},  {18, 0, 0}, {15, 0, 0}, {16, 0, 0}, {17, 2, 0}, {19, 0, 0},
 };
 
-/* 80962534-80962564 00011C 0030+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[4] = {
     {38, 2, 0},
     {41, 0, 0},
@@ -64,7 +61,6 @@ static daNpc_GetParam2 l_btpGetParamList[4] = {
     {39, 0, 0},
 };
 
-/* 80962564-80962594 00014C 0030+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[4] = {
     {32, 2, 0},
     {34, 0, 0},
@@ -73,18 +69,15 @@ static daNpc_GetParam2 l_btkGetParamList[4] = {
 
 };
 
-/* 80962594-80962598 -00001 0004+00 6/8 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[1] = {
     "AshB",
 };
 
-/* 80962598-809625A0 -00001 0008+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "ASHB_APPEAR",
 };
 
-/* 809625A0-809625A4 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "AshB";
 
 #if DEBUG
@@ -99,16 +92,13 @@ void daNpcAshB_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 809625B0-809625C8 000198 0018+00 1/2 0/0 0/0 .data            mEvtSeqList__11daNpcAshB_c */
 daNpcAshB_c::EventFn daNpcAshB_c::mEvtSeqList[2] = {
     NULL,
     &daNpcAshB_c::EvCut_Appear,
 };
 
-/* 8095DE4C-8095DFD0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcAshB_cFv */
 daNpcAshB_c::daNpcAshB_c() {}
 
-/* 8095E060-8095E224 000300 01C4+00 1/0 0/0 0/0 .text            __dt__11daNpcAshB_cFv */
 daNpcAshB_c::~daNpcAshB_c() {
     for (int i = 0; i < 1; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[i]);
@@ -125,7 +115,6 @@ daNpcAshB_c::~daNpcAshB_c() {
 #endif
 }
 
-/* 8095E224-8095E4A0 0004C4 027C+00 1/1 0/0 0/0 .text            Create__11daNpcAshB_cFv */
 cPhs__Step daNpcAshB_c::Create() {
     cPhs__Step step;
 
@@ -188,7 +177,6 @@ cPhs__Step daNpcAshB_c::Create() {
     return step;
 }
 
-/* 8095E4A0-8095E758 000740 02B8+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcAshB_cFv */
 BOOL daNpcAshB_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -231,20 +219,17 @@ BOOL daNpcAshB_c::CreateHeap() {
     return true;
 }
 
-/* 8095E914-8095E948 000BB4 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcAshB_cFv */
 int daNpcAshB_c::Delete() {
     fopAcM_RegisterDeleteID(this, "NPC_ASHB");
     this->~daNpcAshB_c();
     return 1;
 }
 
-/* 8095E948-8095E96C 000BE8 0024+00 2/2 0/0 0/0 .text            Execute__11daNpcAshB_cFv */
 int daNpcAshB_c::Execute() {
     execute();
     return 1;
 }
 
-/* 8095E96C-8095E9C8 000C0C 005C+00 1/1 0/0 0/0 .text            Draw__11daNpcAshB_cFv */
 int daNpcAshB_c::Draw() {
     J3DModelData* model_data = mAnm_p->getModel()->getModelData();
     model_data->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
@@ -252,8 +237,6 @@ int daNpcAshB_c::Draw() {
     return 1;
 }
 
-/* 8095E9C8-8095EB94 000C68 01CC+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpcAshB_cFP8J3DJointP8J3DModel                */
 bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int jointNo = my_joint->getJntNo();
@@ -289,15 +272,11 @@ bool daNpcAshB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return true;
 }
 
-/* 8095EB94-8095EBB4 000E34 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpcAshB_cFP10fopAc_ac_c              */
 BOOL daNpcAshB_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcAshB_c* a_this = static_cast<daNpcAshB_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 8095EBB4-8095EC00 000E54 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcAshB_cFP8J3DJointi
- */
 BOOL daNpcAshB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -398,7 +377,6 @@ inline void daNpcAshB_c::playExpression() {
     }
 }
 
-/* 80960D64-80961188 003004 0424+00 1/1 0/0 0/0 .text            playMotion__11daNpcAshB_cFv */
 void daNpcAshB_c::playMotion() {
     daNpcF_anmPlayData dat0 = {7, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -451,7 +429,6 @@ void daNpcAshB_c::playMotion() {
     }
 }
 
-/* 80961574-80961770 003814 01FC+00 1/1 0/0 0/0 .text            lookat__11daNpcAshB_cFv */
 void daNpcAshB_c::lookat() {
     fopAc_ac_c* actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -509,8 +486,6 @@ void daNpcAshB_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 8095EC00-8095EE00 000EA0 0200+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcAshB_cFib
- */
 bool daNpcAshB_c::setExpressionAnm(int i_idx, bool i_modify) {
     if (i_idx < 0 || i_idx > 6) {
         return false;
@@ -569,8 +544,6 @@ bool daNpcAshB_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 8095EE00-8095EEE0 0010A0 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcAshB_cFi
- */
 bool daNpcAshB_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx],
                                               l_btpGetParamList[i_idx].fileIdx);
@@ -591,7 +564,6 @@ bool daNpcAshB_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 8095EEE0-8095F0A4 001180 01C4+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcAshB_cFif */
 void daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) {
     if (i_idx < 7 || i_idx >= 21) {
         return;
@@ -633,7 +605,6 @@ void daNpcAshB_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 8095F0A4-8095F21C 001344 0178+00 1/1 0/0 0/0 .text            reset__11daNpcAshB_cFv */
 void daNpcAshB_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -668,8 +639,6 @@ void daNpcAshB_c::reset() {
     setAction(&daNpcAshB_c::wait);
 }
 
-/* 8095F21C-8095F2C4 0014BC 00A8+00 1/1 0/0 0/0 .text
- * setAction__11daNpcAshB_cFM11daNpcAshB_cFPCvPvPv_b            */
 bool daNpcAshB_c::setAction(daNpcAshB_c::ActionFn i_actionFn) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -718,7 +687,6 @@ bool daNpcAshB_c::step(s16 i_targetAngle, int param_2, f32 i_rate) {
     return mTurnMode > 1;
 }
 
-/* 8095F2C4-8095FC70 001564 09AC+00 4/0 0/0 0/0 .text            wait__11daNpcAshB_cFPv */
 bool daNpcAshB_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -833,7 +801,6 @@ bool daNpcAshB_c::wait(void* param_0) {
     return true;
 }
 
-/* 8095FC70-8095FD34 001F10 00C4+00 1/0 0/0 0/0 .text            setMotion__11daNpcAshB_cFifi */
 void daNpcAshB_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = (s16)i_motion;
 
@@ -866,7 +833,6 @@ void daNpcAshB_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 8095FD34-8095FD9C 001FD4 0068+00 1/0 0/0 0/0 .text            setExpression__11daNpcAshB_cFif */
 void daNpcAshB_c::setExpression(int i_expression, f32 i_morf) {
     switch (i_expression) {
     case 0:
@@ -887,7 +853,6 @@ void daNpcAshB_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 8095FD9C-809602E0 00203C 0544+00 2/0 0/0 0/0 .text            talk__11daNpcAshB_cFPv */
 bool daNpcAshB_c::talk(void* param_0) {
     bool ret = false;
 
@@ -961,7 +926,6 @@ bool daNpcAshB_c::talk(void* param_0) {
     return ret;
 }
 
-/* 809602E0-809604C8 002580 01E8+00 1/0 0/0 0/0 .text            demo__11daNpcAshB_cFPv */
 bool daNpcAshB_c::demo(void* param_0) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     BOOL r26 = FALSE;
@@ -1017,7 +981,6 @@ bool daNpcAshB_c::demo(void* param_0) {
     return true;
 }
 
-/* 809604C8-809609A8 002768 04E0+00 3/0 0/0 0/0 .text            EvCut_Appear__11daNpcAshB_cFi */
 BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) {
     int local_30[2];
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
@@ -1114,32 +1077,26 @@ BOOL daNpcAshB_c::EvCut_Appear(int i_staffID) {
     return FALSE;
 }
 
-/* 809609A8-809609C8 002C48 0020+00 1/0 0/0 0/0 .text            daNpcAshB_Create__FPv */
 static cPhs__Step daNpcAshB_Create(void* i_this) {
     return static_cast<daNpcAshB_c*>(i_this)->Create();
 }
 
-/* 809609C8-809609E8 002C68 0020+00 1/0 0/0 0/0 .text            daNpcAshB_Delete__FPv */
 static int daNpcAshB_Delete(void* i_this) {
     return static_cast<daNpcAshB_c*>(i_this)->Delete();
 }
 
-/* 809609E8-80960A08 002C88 0020+00 1/0 0/0 0/0 .text            daNpcAshB_Execute__FPv */
 static int daNpcAshB_Execute(void* i_this) {
     return static_cast<daNpcAshB_c*>(i_this)->Execute();
 }
 
-/* 80960A08-80960A28 002CA8 0020+00 1/0 0/0 0/0 .text            daNpcAshB_Draw__FPv */
 static int daNpcAshB_Draw(void* i_this) {
     return static_cast<daNpcAshB_c*>(i_this)->Draw();
 }
 
-/* 80960A28-80960A30 002CC8 0008+00 1/0 0/0 0/0 .text            daNpcAshB_IsDelete__FPv */
 static bool daNpcAshB_IsDelete(void* param_0) {
     return true;
 }
 
-/* 80960A60-80960AE8 002D00 0088+00 1/0 0/0 0/0 .text            setParam__11daNpcAshB_cFv */
 void daNpcAshB_c::setParam() {
     attention_info.flags =
         daPy_py_c::checkNowWolf() ? 0 : (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
@@ -1150,7 +1107,6 @@ void daNpcAshB_c::setParam() {
         getDistTableIdx(mpHIO->m.common.talk_distance, mpHIO->m.common.talk_angle);
 }
 
-/* 80960AE8-80960D64 002D88 027C+00 1/0 0/0 0/0 .text            main__11daNpcAshB_cFv */
 BOOL daNpcAshB_c::main() {
     if (mpActionFn != NULL) {
         (this->*mpActionFn)(NULL);
@@ -1168,7 +1124,6 @@ BOOL daNpcAshB_c::main() {
     return true;
 }
 
-/* 80961188-80961264 003428 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcAshB_cFv */
 BOOL daNpcAshB_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btkAnm = NULL;
@@ -1186,7 +1141,6 @@ BOOL daNpcAshB_c::ctrlBtk() {
     return false;
 }
 
-/* 80961264-80961574 003504 0310+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcAshB_cFv */
 void daNpcAshB_c::setAttnPos() {
     if (mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -1228,7 +1182,6 @@ void daNpcAshB_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80961770-809617F8 003A10 0088+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpcAshB_cFv */
 void daNpcAshB_c::drawOtherMdls() {
     if (field_0xded != 0) {
         J3DModel* model = mAnm_p->getModel();
@@ -1240,19 +1193,16 @@ void daNpcAshB_c::drawOtherMdls() {
     }
 }
 
-/* 809617F8-80961800 003A98 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcAshB_cFv */
 BOOL daNpcAshB_c::drawDbgInfo() {
     return false;
 }
 
-/* 80962680-809626A0 -00001 0020+00 1/0 0/0 0/0 .data            daNpcAshB_MethodTable */
 static actor_method_class daNpcAshB_MethodTable = {
     (process_method_func)daNpcAshB_Create,  (process_method_func)daNpcAshB_Delete,
     (process_method_func)daNpcAshB_Execute, (process_method_func)daNpcAshB_IsDelete,
     (process_method_func)daNpcAshB_Draw,
 };
 
-/* 809626A0-809626D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ASHB */
 extern actor_process_profile_definition g_profile_NPC_ASHB = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp
index ba3e17d464..ab60ad1c00 100644
--- a/src/d/actor/d_a_npc_bans.cpp
+++ b/src/d/actor/d_a_npc_bans.cpp
@@ -173,7 +173,6 @@ void daNpc_Bans_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80968020-80968040 000020 0020+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[4][2] = {
     {BMDE_BANS, BANS},
     {BMDR_BANS_TW, BANS_TW},
@@ -181,7 +180,6 @@ static int l_bmdData[4][2] = {
     {BMDR_BANS_TUB, BANS2},
 };
 
-/* 80968040-80968088 -00001 0048+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[9] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -194,7 +192,6 @@ static daNpcT_evtData_c l_evtList[9] = {
     {"GOBACK", 3},
 };
 
-/* 80968088-809680A0 -00001 0018+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[6] = {
     "",
     "Bans",
@@ -204,38 +201,31 @@ static char* l_resNameList[6] = {
     "Len1",
 };
 
-/* 809680A0-809680A4 0000A0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     BANS, BANS1, -1,
 };
 
-/* 809680A4-809680A8 0000A4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     BANS, BANS2, -1,
 };
 
-/* 809680A8-809680AC 0000A8 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[2] = {
     BANS_TW, -1,
 };
 
-/* 809680AC-809680B0 0000AC 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[4] = {
     BANS, BANS1, BANS2, -1,
 };
 
-/* 809680B0-809680B8 0000B0 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[5] = {
     BANS, BANS_TW, BANS1, BANS2, -1,
 };
 
-/* 809680B8-809680D0 -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn3, l_loadResPtrn2, l_loadResPtrn1,
     l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn4,
 };
 
-/* 809680D0-8096815C 0000D0 008C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_BANS, J3DFrameCtrl::EMode_LOOP, BANS, TRUE},
     {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, FALSE},
@@ -244,7 +234,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
     {BCK_BANS_FH_TALK_B, J3DFrameCtrl::EMode_LOOP, BANS, BTP_BANS, J3DFrameCtrl::EMode_LOOP, BANS, TRUE},
 };
 
-/* 8096815C-8096838C 00015C 0230+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[20] = {
     {BCK_BANS_WAIT_A, J3DFrameCtrl::EMode_LOOP, BANS, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 1, 0},
     {BCK_BANS_WAIT_B, J3DFrameCtrl::EMode_LOOP, BANS1, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 1, 0},
@@ -268,7 +257,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[20] = {
     {BCK_BANS_FAINT, J3DFrameCtrl::EMode_LOOP, BANS2, BTK_BANS, J3DFrameCtrl::EMode_NONE, BANS, 0, 0},
 };
 
-/* 8096838C-809683DC 00038C 0050+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {
     {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -277,7 +265,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] =
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809683DC-8096852C 0003DC 0150+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = {
     {0, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -302,7 +289,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = {
     {9, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 8096852C-8096853C -00001 0010+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Bans_c */
 char* daNpc_Bans_c::mCutNameList[4] = {
     "",
     "ANGER",
@@ -310,7 +296,6 @@ char* daNpc_Bans_c::mCutNameList[4] = {
     "GO_BACK",
 };
 
-/* 80968560-80968590 000560 0030+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Bans_c */
 daNpc_Bans_c::cutFunc daNpc_Bans_c::mCutList[4] = {
     NULL,
     &daNpc_Bans_c::cutAnger,
@@ -318,7 +303,6 @@ daNpc_Bans_c::cutFunc daNpc_Bans_c::mCutList[4] = {
     &daNpc_Bans_c::cutPurchase,
 };
 
-/* 809628CC-80962AA0 0000EC 01D4+00 1/0 0/0 0/0 .text            __dt__12daNpc_Bans_cFv */
 daNpc_Bans_c::~daNpc_Bans_c() {
     OS_REPORT("|%06d:%x|daNpc_Bans_c(%d) -> デストラクト\n", g_Counter.mCounter0, this, mType);
 
@@ -341,7 +325,6 @@ daNpc_Bans_c::~daNpc_Bans_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80967E20-80967EB0 000000 0090+00 12/12 0/0 0/0 .rodata          m__18daNpc_Bans_Param_c */
 daNpc_Bans_HIOParam const daNpc_Bans_Param_c::m = {
     200.0f,
     -3.0f,
@@ -387,10 +370,8 @@ daNpc_Bans_HIOParam const daNpc_Bans_Param_c::m = {
     10.0f,
 };
 
-/* 80968864-80968868 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_BANS_HIO_CLASS l_HIO;
 
-/* 80962AA0-80962D6C 0002C0 02CC+00 1/1 0/0 0/0 .text            create__12daNpc_Bans_cFv */
 cPhs__Step daNpc_Bans_c::create() {
     daNpcT_ct(this, daNpc_Bans_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -457,7 +438,6 @@ cPhs__Step daNpc_Bans_c::create() {
     return phase;
 }
 
-/* 80962D6C-8096317C 00058C 0410+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Bans_cFv */
 int daNpc_Bans_c::CreateHeap() {
     J3DModelData* modelData;
     int bmdIdx;
@@ -535,7 +515,6 @@ int daNpc_Bans_c::CreateHeap() {
     return 0;
 }
 
-/* 80963338-8096336C 000B58 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Bans_cFv */
 int daNpc_Bans_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Bans_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -543,7 +522,6 @@ int daNpc_Bans_c::Delete() {
     return 1;
 }
 
-/* 8096336C-80963444 000B8C 00D8+00 2/2 0/0 0/0 .text            Execute__12daNpc_Bans_cFv */
 int daNpc_Bans_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == TYPE_SHOP && mShopFlag == 0) {
         initShopSystem();
@@ -563,7 +541,6 @@ int daNpc_Bans_c::Execute() {
     return 1;
 }
 
-/* 80963444-809634E0 000C64 009C+00 1/1 0/0 0/0 .text            Draw__12daNpc_Bans_cFv */
 int daNpc_Bans_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -577,13 +554,11 @@ int daNpc_Bans_c::Draw() {
     #endif
 }
 
-/* 809634E0-80963500 000D00 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_Bans_cFP10fopAc_ac_c */
 int daNpc_Bans_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_Bans_c* i_this = (daNpc_Bans_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80963500-80963558 000D20 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_Bans_cFP8J3DJointi */
 int daNpc_Bans_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -596,7 +571,6 @@ int daNpc_Bans_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80963558-809635BC 000D78 0064+00 1/1 0/0 0/0 .text            getType__12daNpc_Bans_cFv */
 u8 daNpc_Bans_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -620,7 +594,6 @@ u8 daNpc_Bans_c::getType() {
     }
 }
 
-/* 809635BC-809636C0 000DDC 0104+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::isDelete() {
     switch (mType) {
         case TYPE_POST_TWILIGHT:
@@ -665,7 +638,6 @@ BOOL daNpc_Bans_c::isDelete() {
     }
 }
 
-/* 809636C0-80963840 000EE0 0180+00 1/1 0/0 0/0 .text            reset__12daNpc_Bans_cFv */
 void daNpc_Bans_c::reset() {
     csXyz angle;
     int size = (u8*)&field_0x126c - (u8*)&mNextAction;
@@ -696,7 +668,6 @@ void daNpc_Bans_c::reset() {
     }
 }
 
-/* 80963840-809638CC 001060 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Bans_cFi */
 void daNpc_Bans_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -707,7 +678,6 @@ void daNpc_Bans_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 809638CC-80963A7C 0010EC 01B0+00 1/0 0/0 0/0 .text            setParam__12daNpc_Bans_cFv */
 void daNpc_Bans_c::setParam() {
     if (mSetParamFlag) {
         if (mShopProcess == 2) {
@@ -774,7 +744,6 @@ void daNpc_Bans_c::setParam() {
     gravity = mHIO->m.common.gravity;
 }
 
-/* 80963A7C-80963B30 00129C 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Bans_c::talk)) {
         mPreItemNo = 0;
@@ -797,7 +766,6 @@ BOOL daNpc_Bans_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80963B30-80963BA8 001350 0078+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Bans_cFv */
 void daNpc_Bans_c::setAfterTalkMotion() {
     int motion = MOT_MASKUP;
 
@@ -810,7 +778,6 @@ void daNpc_Bans_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(motion, -1.0f, FALSE, 0);
 }
 
-/* 80963BA8-80963DB0 0013C8 0208+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Bans_cFv */
 void daNpc_Bans_c::srchActors() {
     switch (mType) {
         case TYPE_POST_TWILIGHT:
@@ -860,7 +827,6 @@ void daNpc_Bans_c::srchActors() {
     }
 }
 
-/* 80963DB0-80963EDC 0015D0 012C+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::evtTalk() {
     if (mShopFlag) {
         if (chkAction(&daNpc_Bans_c::shop)) {
@@ -881,7 +847,6 @@ BOOL daNpc_Bans_c::evtTalk() {
     return TRUE;
 }
 
-/* 80963EDC-80963FA4 0016FC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::evtCutProc() {
     s32 staffId = dComIfGp_getEventManager().getMyStaffId("Bans", this, -1);
     if (staffId != -1) {
@@ -897,7 +862,6 @@ BOOL daNpc_Bans_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80963FA4-80964148 0017C4 01A4+00 1/0 0/0 0/0 .text            action__12daNpc_Bans_cFv */
 void daNpc_Bans_c::action() {
     fopAc_ac_c* actor = NULL;
     if (!mTwilight) {
@@ -927,7 +891,6 @@ void daNpc_Bans_c::action() {
     }
 }
 
-/* 80964148-80964228 001968 00E0+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Bans_cFv */
 void daNpc_Bans_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -942,7 +905,6 @@ void daNpc_Bans_c::beforeMove() {
     }
 }
 
-/* 80964228-809646E0 001A48 04B8+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Bans_cFv */
 void daNpc_Bans_c::setAttnPos() {
     cXyz sp70(15.0f, 30.0f, 0.0f);
     cXyz sp7c(15.0f, 0.0f, 0.0f);
@@ -1013,7 +975,6 @@ void daNpc_Bans_c::setAttnPos() {
     attention_info.position = sp70 + current.pos;
 }
 
-/* 809646E0-80964994 001F00 02B4+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Bans_cFv */
 void daNpc_Bans_c::setCollision() {
     cXyz pos;
 
@@ -1088,7 +1049,6 @@ void daNpc_Bans_c::setCollision() {
     mCyl2.ClrTgHit();
 }
 
-/* 80964994-8096499C 0021B4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Bans_cFv */
 int daNpc_Bans_c::drawDbgInfo() {
     #if DEBUG
     if (mHIO->m.common.debug_info_ON) {
@@ -1104,7 +1064,6 @@ int daNpc_Bans_c::drawDbgInfo() {
     return 0;
 }
 
-/* 8096499C-80964AD8 0021BC 013C+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Bans_cFv */
 void daNpc_Bans_c::drawOtherMdl() {
     for (int i = 0; i < 1; i++) {
         if (mTubModel[i] != NULL && i == 0 && mType == TYPE_MAKING_BOMBS) {
@@ -1132,7 +1091,6 @@ void daNpc_Bans_c::drawOtherMdl() {
     }
 }
 
-/* 80964AD8-80964B9C 0022F8 00C4+00 1/1 0/0 0/0 .text            setScoopAnm__12daNpc_Bans_cFiif */
 bool daNpc_Bans_c::setScoopAnm(int i_idx, int i_attr, f32 i_morf) {
     static int scoopAnmData[20][2] = {
         {-1, 0},
@@ -1172,7 +1130,6 @@ bool daNpc_Bans_c::setScoopAnm(int i_idx, int i_attr, f32 i_morf) {
     return 1;
 }
 
-/* 80964B9C-80964BD0 0023BC 0034+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_Bans_cFiifi */
 bool daNpc_Bans_c::afterSetMotionAnm(int i_idx, int i_attr, f32 i_morf, int param_4) {
     if (mCreating == true) {
         i_morf = 0.0f;
@@ -1181,7 +1138,6 @@ bool daNpc_Bans_c::afterSetMotionAnm(int i_idx, int i_attr, f32 i_morf, int para
     return setScoopAnm(i_idx, i_attr, i_morf);
 }
 
-/* 80964BD0-80964C4C 0023F0 007C+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::selectAction() {
     mNextAction = NULL;
 
@@ -1205,12 +1161,10 @@ BOOL daNpc_Bans_c::selectAction() {
     return TRUE;
 }
 
-/* 80964C4C-80964C78 00246C 002C+00 2/2 0/0 0/0 .text            chkAction__12daNpc_Bans_cFM12daNpc_Bans_cFPCvPvPv_i */
 BOOL daNpc_Bans_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80964C78-80964D20 002498 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_Bans_cFM12daNpc_Bans_cFPCvPvPv_i */
 BOOL daNpc_Bans_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -1226,7 +1180,6 @@ BOOL daNpc_Bans_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80964D20-80964DD0 002540 00B0+00 1/1 0/0 0/0 .text            checkPlayerIn2ndFloorOfBombShop__12daNpc_Bans_cFv */
 BOOL daNpc_Bans_c::checkPlayerIn2ndFloorOfBombShop() {
     bool rv = false;
 
@@ -1234,7 +1187,6 @@ BOOL daNpc_Bans_c::checkPlayerIn2ndFloorOfBombShop() {
            300.0f < fabsf(daPy_getPlayerActorClass()->current.pos.y - current.pos.y);
 }
 
-/* 80964DD0-80964EB0 0025F0 00E0+00 2/2 0/0 0/0 .text            orderAngerEvt__12daNpc_Bans_cFv */
 void daNpc_Bans_c::orderAngerEvt() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1258,7 +1210,6 @@ void daNpc_Bans_c::orderAngerEvt() {
     }
 }
 
-/* 80964EB0-80964F48 0026D0 0098+00 1/1 0/0 0/0 .text            getKMsgTagP__12daNpc_Bans_cFv */
 fopAc_ac_c* daNpc_Bans_c::getKMsgTagP() {
     f32 fVar1 = 1000000000.0f;
     mFindCount = 0;
@@ -1275,7 +1226,6 @@ fopAc_ac_c* daNpc_Bans_c::getKMsgTagP() {
     return NULL;
 }
 
-/* 80964F48-80964FEC 002768 00A4+00 1/1 0/0 0/0 .text            setPrtcls__12daNpc_Bans_cFv */
 void daNpc_Bans_c::setPrtcls() {
     static u16 const id[4] = {
         dPa_RM(ID_ZF_S_K_LAMPWATER00_FALL), dPa_RM(ID_ZF_S_K_LAMPWATER00_FALL1), dPa_RM(ID_ZF_S_K_LAMPWATER01_SPLASH), dPa_RM(ID_ZF_S_K_LAMPWATER02_SPLASH),
@@ -1286,7 +1236,6 @@ void daNpc_Bans_c::setPrtcls() {
     }
 }
 
-/* 80964FEC-809658F8 00280C 090C+00 1/0 0/0 0/0 .text            cutAnger__12daNpc_Bans_cFi */
 int daNpc_Bans_c::cutAnger(int i_staffId) {
     int rv = 0;
     int* piVar1 = NULL;
@@ -1445,7 +1394,6 @@ int daNpc_Bans_c::cutAnger(int i_staffId) {
     return rv;
 }
 
-/* 809658F8-80965CCC 003118 03D4+00 2/0 0/0 0/0 .text            cutPurchase__12daNpc_Bans_cFi */
 int daNpc_Bans_c::cutPurchase(int i_staffId) {
     fopAc_ac_c* actor_p = NULL;
     int rv = 0;
@@ -1534,7 +1482,6 @@ int daNpc_Bans_c::cutPurchase(int i_staffId) {
     return rv;
 }
 
-/* 80965CCC-809661F0 0034EC 0524+00 1/0 0/0 0/0 .text            wait__12daNpc_Bans_cFPv */
 int daNpc_Bans_c::wait(void* param_1) {
     daNpc_Len_c* actor_p = NULL;
 
@@ -1649,7 +1596,6 @@ int daNpc_Bans_c::wait(void* param_1) {
     return 1;
 }
 
-/* 809661F0-80966874 003A10 0684+00 1/0 0/0 0/0 .text            tend__12daNpc_Bans_cFPv */
 int daNpc_Bans_c::tend(void* param_1) {
     fopAc_ac_c* actor_p = NULL;
 
@@ -1782,7 +1728,6 @@ int daNpc_Bans_c::tend(void* param_1) {
     return 1;
 }
 
-/* 80966888-80966B24 0040A8 029C+00 3/0 0/0 0/0 .text            talk__12daNpc_Bans_cFPv */
 int daNpc_Bans_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1831,7 +1776,6 @@ int daNpc_Bans_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80966B24-80966C88 004344 0164+00 2/0 0/0 0/0 .text            shop__12daNpc_Bans_cFPv */
 int daNpc_Bans_c::shop(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1899,32 +1843,26 @@ int daNpc_Bans_c::test(void* param_1) {
 }
 #endif
 
-/* 80966C88-80966CA8 0044A8 0020+00 1/0 0/0 0/0 .text            daNpc_Bans_Create__FPv */
 static int daNpc_Bans_Create(void* i_this) {
     return static_cast<daNpc_Bans_c*>(i_this)->create();
 }
 
-/* 80966CA8-80966CC8 0044C8 0020+00 1/0 0/0 0/0 .text            daNpc_Bans_Delete__FPv */
 static int daNpc_Bans_Delete(void* i_this) {
     return static_cast<daNpc_Bans_c*>(i_this)->Delete();
 }
 
-/* 80966CC8-80966CE8 0044E8 0020+00 1/0 0/0 0/0 .text            daNpc_Bans_Execute__FPv */
 static int daNpc_Bans_Execute(void* i_this) {
     return static_cast<daNpc_Bans_c*>(i_this)->Execute();
 }
 
-/* 80966CE8-80966D08 004508 0020+00 1/0 0/0 0/0 .text            daNpc_Bans_Draw__FPv */
 static int daNpc_Bans_Draw(void* i_this) {
     return static_cast<daNpc_Bans_c*>(i_this)->Draw();
 }
 
-/* 80966D08-80966D10 004528 0008+00 1/0 0/0 0/0 .text            daNpc_Bans_IsDelete__FPv */
 static int daNpc_Bans_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80968684-809686A4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Bans_MethodTable */
 static actor_method_class daNpc_Bans_MethodTable = {
     (process_method_func)daNpc_Bans_Create,
     (process_method_func)daNpc_Bans_Delete,
@@ -1933,7 +1871,6 @@ static actor_method_class daNpc_Bans_MethodTable = {
     (process_method_func)daNpc_Bans_Draw,
 };
 
-/* 809686A4-809686D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_BANS */
 extern actor_process_profile_definition g_profile_NPC_BANS = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp
index 75f09f0059..2e84caf79c 100644
--- a/src/d/actor/d_a_npc_besu.cpp
+++ b/src/d/actor/d_a_npc_besu.cpp
@@ -283,7 +283,6 @@ enum Event {
 #endif
 
 
-/* 8053EB7C-8053EBAC 000020 0030+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[6][2] = {
     {3, 1},
     {11, 2},
@@ -293,7 +292,6 @@ static int l_bmdData[6][2] = {
     {38, 5},
 };
 
-/* 8053EBAC-8053EC14 -00001 0068+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[13] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -310,7 +308,6 @@ static daNpcT_evtData_c l_evtList[13] = {
     {"CONVERSATION_ABOUT_ZORA", 5},
 };
 
-/* 8053EC14-8053EC44 -00001 0030+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[12] = {
     "",
     "Besu",
@@ -326,40 +323,32 @@ static char* l_resNameList[12] = {
     "Sera",
 };
 
-/* 8053EC44-8053EC48 0000E8 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {
     1, 3, 4, -1
 };
 
-/* 8053EC48-8053EC4C 0000EC 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     3, 2, -1,
 };
 
-/* 8053EC4C-8053EC50 0000F0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {
     3, 5, -1,
 };
 
-/* 8053EC50-8053EC54 0000F4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[3] = {
     3, 6, -1,
 };
 
-/* 8053EC54-8053EC58 0000F8 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[4] = {3, 4, 6, -1};
 
-/* 8053EC58-8053EC5C 0000FC 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn5 */
 static s8 l_loadResPtrn5[3] = {
     1, 7, -1,
 };
 
-/* 8053EC5C-8053EC64 000100 0007+01 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[7] = {
     1, 2, 3, 4, 5, 6, -1,
 };
 
-/* 8053EC64-8053ECB0 -00001 004C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[19] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn4,
     l_loadResPtrn0, l_loadResPtrn3, l_loadResPtrn2, l_loadResPtrn2,
@@ -368,7 +357,6 @@ static s8* l_loadResPtrnList[19] = {
     l_loadResPtrn0, l_loadResPtrn5, l_loadResPtrn9,
 };
 
-/* 8053ECB0-8053EFF8 000154 0348+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_BESU, J3DFrameCtrl::EMode_LOOP, BESU0, 1},
     {BCK_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, 0},
@@ -402,7 +390,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {BCK_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, BTP_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, 0},
 };
 
-/* 8053EFF8-8053F394 00049C 039C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[33] = {
     {BCK_BESU_WAIT_A, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
     {BCK_BESU_WAIT_B, J3DFrameCtrl::EMode_LOOP, BESU1, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
@@ -439,7 +426,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[33] = {
     {BCK_BESU_BODY_WAIT, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
 };
 
-/* 8053F394-8053F564 000838 01D0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = {
     {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, 
     {1, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -472,7 +458,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116]
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 8053F564-8053F744 000A08 01E0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -506,7 +491,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 8053F744-8053F780 -00001 003C+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Besu_c */
 char* daNpc_Besu_c::mCutNameList[15] = {
     "",
     "CONVERSATION_ABOUT_SARU",
@@ -525,7 +509,6 @@ char* daNpc_Besu_c::mCutNameList[15] = {
     "THANK_YOU",
 };
 
-/* 8053F828-8053F8DC 000CCC 00B4+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Besu_c */
 daNpc_Besu_c::cutFunc daNpc_Besu_c::mCutList[15] = {
     NULL,
     &daNpc_Besu_c::cutConversationAboutSaru,
@@ -544,7 +527,6 @@ daNpc_Besu_c::cutFunc daNpc_Besu_c::mCutList[15] = {
     &daNpc_Besu_c::cutThankYou,
 };
 
-/* 80536E4C-8053701C 0000EC 01D0+00 1/0 0/0 0/0 .text            __dt__12daNpc_Besu_cFv */
 daNpc_Besu_c::~daNpc_Besu_c() {
     // "Destruct":
     OS_REPORT("|%06d:%x|daNpc_Besu_c -> デストラクト\n", g_Counter.mCounter0, this);
@@ -565,7 +547,6 @@ daNpc_Besu_c::~daNpc_Besu_c() {
     deleteRes((l_loadResPtrnList)[mType], (const char**)l_resNameList);
 }
 
-/* 8053E754-8053E7E4 000000 0090+00 13/13 0/0 0/0 .rodata          m__18daNpc_Besu_Param_c */
 const daNpc_Besu_HIOParam daNpc_Besu_Param_c::m = {
     160.0f,
     -3.0f,
@@ -611,7 +592,6 @@ const daNpc_Besu_HIOParam daNpc_Besu_Param_c::m = {
     1.0f,
 };
 
-/* 8053701C-805372FC 0002BC 02E0+00 1/1 0/0 0/0 .text            create__12daNpc_Besu_cFv */
 int daNpc_Besu_c::create() {
     static int const heapSize[19] = {
         0x35C0, 0x35C0, 0x3510, 0x35D0,
@@ -681,7 +661,6 @@ int daNpc_Besu_c::create() {
     return rv;
 }
 
-/* 805372FC-80537758 00059C 045C+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Besu_cFv */
 int daNpc_Besu_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     J3DModel* model = NULL;
@@ -772,7 +751,6 @@ int daNpc_Besu_c::CreateHeap() {
     }
 }
 
-/* 80537914-80537948 000BB4 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Besu_cFv */
 int daNpc_Besu_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Besu_c -> Delete\n", g_Counter, this);
     fopAcM_GetID(this);
@@ -780,12 +758,10 @@ int daNpc_Besu_c::Delete() {
     return 1;
 }
 
-/* 80537948-80537968 000BE8 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Besu_cFv */
 int daNpc_Besu_c::Execute() {
     return execute();
 }
 
-/* 80537968-805379FC 000C08 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Besu_cFv */
 int daNpc_Besu_c::Draw() {
     daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
     if (matAnm != NULL) {
@@ -797,12 +773,10 @@ int daNpc_Besu_c::Draw() {
     return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 805379FC-80537A1C 000C9C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_Besu_cFP10fopAc_ac_c */
 int daNpc_Besu_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Besu_c*>(i_this)->CreateHeap();
 }
 
-/* 80537A1C-80537A74 000CBC 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_Besu_cFP8J3DJointi */
 int daNpc_Besu_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -815,7 +789,6 @@ int daNpc_Besu_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80537A74-80537B34 000D14 00C0+00 2/1 0/0 0/0 .text            getType__12daNpc_Besu_cFv */
 u8 daNpc_Besu_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -859,7 +832,6 @@ u8 daNpc_Besu_c::getType() {
     }
 }
 
-/* 80537B34-80537DE4 000DD4 02B0+00 2/1 0/0 0/0 .text            isDelete__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::isDelete() {
     switch (mType) {
         case 0:
@@ -957,7 +929,6 @@ BOOL daNpc_Besu_c::isDelete() {
     }
 }
 
-/* 80537DE4-80537FD0 001084 01EC+00 2/1 0/0 0/0 .text            reset__12daNpc_Besu_cFv */
 void daNpc_Besu_c::reset() {
     csXyz acStack_20;
     int size = (u8*)&field_0x1134 - (u8*)&mNextAction;
@@ -999,17 +970,14 @@ void daNpc_Besu_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 80537FD0-80537FFC 001270 002C+00 6/6 0/0 0/0 .text            chkNurse__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::chkNurse() {
     return mType == 6 || mType == 7 || mType == 8;
 }
 
-/* 80537FFC-80538028 00129C 002C+00 7/7 0/0 0/0 .text            chkBesu3__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::chkBesu3() {
     return mType == 3 || mType == 5 || mType == 15;
 }
 
-/* 80538028-805380A4 0012C8 007C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Besu_cFi */
 void daNpc_Besu_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleX(1));
@@ -1020,7 +988,6 @@ void daNpc_Besu_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 805380A4-805382D0 001344 022C+00 1/0 0/0 0/0 .text            setParam__12daNpc_Besu_cFv */
 void daNpc_Besu_c::setParam() {
     selectAction();
     srchActors();
@@ -1100,7 +1067,6 @@ void daNpc_Besu_c::setParam() {
     gravity = daNpc_Besu_Param_c::m.common.gravity;
 }
 
-/* 805382D0-80538490 001570 01C0+00 2/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::checkChangeEvt() {
     if (chkAction(&daNpc_Besu_c::talk) == 0) {
         mPreItemNo = 0;
@@ -1159,7 +1125,6 @@ BOOL daNpc_Besu_c::checkChangeEvt() {
     return 0;
 }
 
-/* 80538490-8053853C 001730 00AC+00 2/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Besu_cFv */
 void daNpc_Besu_c::setAfterTalkMotion() {
     int idx = FACE_NONE;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -1183,7 +1148,6 @@ void daNpc_Besu_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, 0, 0);
 }
 
-/* 8053853C-805387D0 0017DC 0294+00 2/1 0/0 0/0 .text            srchActors__12daNpc_Besu_cFv */
 void daNpc_Besu_c::srchActors() {
     switch (mType) {
         case 0:
@@ -1252,7 +1216,6 @@ void daNpc_Besu_c::srchActors() {
     }
 }
 
-/* 805387D0-80538870 001A70 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::evtTalk() {
     if (chkAction(&daNpc_Besu_c::talk)) {
         (this->*(mAction))(NULL);
@@ -1263,7 +1226,6 @@ BOOL daNpc_Besu_c::evtTalk() {
     return 1;
 }
 
-/* 80538870-80538938 001B10 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Besu_cFv */
 BOOL daNpc_Besu_c::evtCutProc() {
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Besu", this, -1);
     if (staff_id != -1) {
@@ -1279,7 +1241,6 @@ BOOL daNpc_Besu_c::evtCutProc() {
     return 0;
 }
 
-/* 80538938-80538B54 001BD8 021C+00 1/0 0/0 0/0 .text            action__12daNpc_Besu_cFv */
 void daNpc_Besu_c::action() {
     fopAc_ac_c* actor_p = NULL;
     if (mTwilight == 0) {
@@ -1342,7 +1303,6 @@ void daNpc_Besu_c::action() {
     cLib_calcTimer(&field_0x1124);
 }
 
-/* 80538B54-80538C18 001DF4 00C4+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Besu_cFv */
 void daNpc_Besu_c::beforeMove() {
     fopAcM_OffStatus(this, 0x08000000U);
     if (checkHide()) {
@@ -1354,7 +1314,6 @@ void daNpc_Besu_c::beforeMove() {
     }
 }
 
-/* 80538C18-805391B8 001EB8 05A0+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Besu_cFv */
 void daNpc_Besu_c::setAttnPos() {
     cXyz eyeOffset(10.0f, 30.0f, 0.0f);
     if (field_0x112f) {
@@ -1427,7 +1386,6 @@ void daNpc_Besu_c::setAttnPos() {
     }
 }
 
-/* 805391B8-80539494 002458 02DC+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Besu_cFv */
 void daNpc_Besu_c::setCollision() {
     cXyz cStack_48;
     if (!mHide) {
@@ -1496,12 +1454,10 @@ void daNpc_Besu_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80539494-8053949C 002734 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Besu_cFv */
 int daNpc_Besu_c::drawDbgInfo() {
     return false;
 }
 
-/* 8053949C-805395F4 00273C 0158+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Besu_cFv */
 void daNpc_Besu_c::drawOtherMdl() {
     J3DModel* model_p = mpMorf[0]->getModel();
     if (mpCupModelMorf != NULL) {
@@ -1532,7 +1488,6 @@ void daNpc_Besu_c::drawOtherMdl() {
     }
 }
 
-/* 805395F4-805396C4 002894 00D0+00 1/1 0/0 0/0 .text            setCupAnm__12daNpc_Besu_cFiif */
 int daNpc_Besu_c::setCupAnm(int arg0, int i_attr, f32 i_morf) {
     static int cupAnmData[33][2] = {
         {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0}, {-1, 0},
@@ -1556,14 +1511,11 @@ int daNpc_Besu_c::setCupAnm(int arg0, int i_attr, f32 i_morf) {
     return 1;
 }
 
-/* 805396C4-805396F8 002964 0034+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_Besu_cFiifi */
 bool daNpc_Besu_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int param_3) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
     setCupAnm(arg0, arg1, var_f30);
 }
 
-/* 805396F8-805397B0 002998 00B8+00 1/0 0/0 0/0 .text
- * getFaceMotionAnm__12daNpc_Besu_cF26daNpcT_faceMotionAnmData_c */
 daNpcT_faceMotionAnmData_c daNpc_Besu_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c arg0) {
     daNpcT_faceMotionAnmData_c rv = arg0;
     if (chkBesu3() && rv.mBtpFileIdx == 25 && rv.mBtpArcIdx == 3) {
@@ -1574,7 +1526,6 @@ daNpcT_faceMotionAnmData_c daNpc_Besu_c::getFaceMotionAnm(daNpcT_faceMotionAnmDa
     return rv;
 }
 
-/* 805397B0-80539840 002A50 0090+00 1/0 0/0 0/0 .text            changeAnm__12daNpc_Besu_cFPiPi */
 void daNpc_Besu_c::changeAnm(int* arg0, int* arg1) {
     if (mType == 0x11) {
         switch (*arg0) {
@@ -1598,7 +1549,6 @@ void daNpc_Besu_c::changeAnm(int* arg0, int* arg1) {
     }
 }
 
-/* 80539840-805398DC 002AE0 009C+00 1/0 0/0 0/0 .text            changeBck__12daNpc_Besu_cFPiPi */
 void daNpc_Besu_c::changeBck(int* arg0, int* arg1) {
     if (mType == 0x11) {
         switch (*arg0) {
@@ -1626,7 +1576,6 @@ void daNpc_Besu_c::changeBck(int* arg0, int* arg1) {
     }
 }
 
-/* 805398DC-80539968 002B7C 008C+00 1/0 0/0 0/0 .text            changeBtp__12daNpc_Besu_cFPiPi */
 void daNpc_Besu_c::changeBtp(int* arg0, int* arg1) {
     if (mType == 0x11) {
         switch (*arg0) {
@@ -1650,7 +1599,6 @@ void daNpc_Besu_c::changeBtp(int* arg0, int* arg1) {
     }
 }
 
-/* 80539968-80539994 002C08 002C+00 1/0 0/0 0/0 .text            changeBtk__12daNpc_Besu_cFPiPi */
 void daNpc_Besu_c::changeBtk(int* arg0, int* arg1) {
     if (mType == 0x11) {
         if (*arg0 != 0x16) {
@@ -1662,7 +1610,6 @@ void daNpc_Besu_c::changeBtk(int* arg0, int* arg1) {
     }
 }
 
-/* 80539994-80539ACC 002C34 0138+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Besu_cFv */
 int daNpc_Besu_c::selectAction() {
     mNextAction = NULL;
     switch (mType) {
@@ -1691,14 +1638,10 @@ int daNpc_Besu_c::selectAction() {
     return 1;
 }
 
-/* 80539ACC-80539AF8 002D6C 002C+00 2/2 0/0 0/0 .text
- * chkAction__12daNpc_Besu_cFM12daNpc_Besu_cFPCvPvPv_i          */
 int daNpc_Besu_c::chkAction(actionFunc arg0) {
     return mAction == arg0;
 }
 
-/* 80539AF8-80539BA0 002D98 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_Besu_cFM12daNpc_Besu_cFPCvPvPv_i          */
 int daNpc_Besu_c::setAction(actionFunc arg0) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -1714,7 +1657,6 @@ int daNpc_Besu_c::setAction(actionFunc arg0) {
     return 1;
 }
 
-/* 80539BA0-80539CF4 002E40 0154+00 1/1 0/0 0/0 .text            mop__12daNpc_Besu_cFii */
 void daNpc_Besu_c::mop(int arg0, int arg1) {
     if (field_0x1120) {
         action();
@@ -1733,8 +1675,6 @@ void daNpc_Besu_c::mop(int arg0, int arg1) {
     }
 }
 
-/* 80539CF4-80539E48 002F94 0154+00 1/0 0/0 0/0 .text cutConversationAboutSaru__12daNpc_Besu_cFi
- */
 int daNpc_Besu_c::cutConversationAboutSaru(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1780,8 +1720,6 @@ int daNpc_Besu_c::cutConversationAboutSaru(int arg0) {
     return retval;
 }
 
-/* 80539E48-8053A45C 0030E8 0614+00 3/0 0/0 0/0 .text
- * cutConversationAboutPachinko__12daNpc_Besu_cFi               */
 int daNpc_Besu_c::cutConversationAboutPachinko(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1943,8 +1881,6 @@ int daNpc_Besu_c::cutConversationAboutPachinko(int arg0) {
     return retval;
 }
 
-/* 8053A45C-8053A7A0 0036FC 0344+00 1/0 0/0 0/0 .text
- * cutConversationAboutWoodSwd__12daNpc_Besu_cFi                */
 int daNpc_Besu_c::cutConversationAboutWoodSwd(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2026,7 +1962,6 @@ int daNpc_Besu_c::cutConversationAboutWoodSwd(int arg0) {
     return retval;
 }
 
-/* 8053A7A0-8053AA6C 003A40 02CC+00 1/0 0/0 0/0 .text            cutSwdTutorial__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutSwdTutorial(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -2091,7 +2026,6 @@ int daNpc_Besu_c::cutSwdTutorial(int arg0) {
     return retval;
 }
 
-/* 8053AA6C-8053AF5C 003D0C 04F0+00 1/0 0/0 0/0 .text            cutFindMonkey__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutFindMonkey(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -2193,7 +2127,6 @@ int daNpc_Besu_c::cutFindMonkey(int arg0) {
     return retval;
 }
 
-/* 8053AF5C-8053B058 0041FC 00FC+00 1/0 0/0 0/0 .text            cutGetWoodSwd__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutGetWoodSwd(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2238,7 +2171,6 @@ int daNpc_Besu_c::cutGetWoodSwd(int arg0) {
     return retval;
 }
 
-/* 8053B058-8053B250 0042F8 01F8+00 1/0 0/0 0/0 .text cutCacaricoConversation__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutCacaricoConversation(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2292,7 +2224,6 @@ int daNpc_Besu_c::cutCacaricoConversation(int arg0) {
     return retval;
 }
 
-/* 8053B250-8053B530 0044F0 02E0+00 1/0 0/0 0/0 .text            cutSurprise__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutSurprise(int arg0) {
     daTag_Push_c* tagpush_p = (daTag_Push_c*) field_0xba0.getActorP();
     int retval = 0;
@@ -2336,7 +2267,6 @@ int daNpc_Besu_c::cutSurprise(int arg0) {
     return retval;
 }
 
-/* 8053B530-8053B820 0047D0 02F0+00 1/0 0/0 0/0 .text cutConversationInHotel__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutConversationInHotel(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2413,8 +2343,6 @@ int daNpc_Besu_c::cutConversationInHotel(int arg0) {
     return retval;
 }
 
-/* 8053B820-8053BA60 004AC0 0240+00 1/0 0/0 0/0 .text
- * cutConversationAboutDeathMt__12daNpc_Besu_cFi                */
 int daNpc_Besu_c::cutConversationAboutDeathMt(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2464,8 +2392,6 @@ int daNpc_Besu_c::cutConversationAboutDeathMt(int arg0) {
     return retval;
 }
 
-/* 8053BA60-8053BD18 004D00 02B8+00 1/0 0/0 0/0 .text cutConversationAboutGoron__12daNpc_Besu_cFi
- */
 int daNpc_Besu_c::cutConversationAboutGoron(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2522,7 +2448,6 @@ int daNpc_Besu_c::cutConversationAboutGoron(int arg0) {
     return retval;
 }
 
-/* 8053BD18-8053BE84 004FB8 016C+00 1/0 0/0 0/0 .text            cutNurse__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutNurse(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2560,7 +2485,6 @@ int daNpc_Besu_c::cutNurse(int arg0) {
     return retval;
 }
 
-/* 8053BE84-8053BF60 005124 00DC+00 1/0 0/0 0/0 .text            cutClothTry__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutClothTry(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2593,7 +2517,6 @@ int daNpc_Besu_c::cutClothTry(int arg0) {
     return retval;
 }
 
-/* 8053BF60-8053C08C 005200 012C+00 1/0 0/0 0/0 .text            cutThankYou__12daNpc_Besu_cFi */
 int daNpc_Besu_c::cutThankYou(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2630,7 +2553,6 @@ int daNpc_Besu_c::cutThankYou(int arg0) {
     return retval;
 }
 
-/* 8053C08C-8053CAA0 00532C 0A14+00 2/0 0/0 0/0 .text            wait__12daNpc_Besu_cFPv */
 int daNpc_Besu_c::wait(void* param_0) {
     fopAc_ac_c* actor_p = NULL;
     switch (mMode) {
@@ -2880,7 +2802,6 @@ int daNpc_Besu_c::wait(void* param_0) {
     return 1;
 }
 
-/* 8053CAA0-8053CBB8 005D40 0118+00 1/0 0/0 0/0 .text            swdTutorial__12daNpc_Besu_cFPv */
 int daNpc_Besu_c::swdTutorial(void* param_0) {
     switch (mMode) {
         case 0:
@@ -2909,7 +2830,6 @@ int daNpc_Besu_c::swdTutorial(void* param_0) {
     return 1;
 }
 
-/* 8053CBB8-8053CF78 005E58 03C0+00 3/0 0/0 0/0 .text            nurse__12daNpc_Besu_cFPv */
 int daNpc_Besu_c::nurse(void* param_0) {
     switch (mMode) {
         case 0:
@@ -2988,7 +2908,6 @@ int daNpc_Besu_c::nurse(void* param_0) {
     return 1;
 }
 
-/* 8053CF78-8053D078 006218 0100+00 2/0 0/0 0/0 .text            giveHotWater__12daNpc_Besu_cFPv */
 int daNpc_Besu_c::giveHotWater(void* param_0) {
     switch (mMode) {
         case 0:
@@ -3012,7 +2931,6 @@ int daNpc_Besu_c::giveHotWater(void* param_0) {
     return 1;
 }
 
-/* 8053D078-8053D29C 006318 0224+00 3/0 0/0 0/0 .text            talk__12daNpc_Besu_cFPv */
 int daNpc_Besu_c::talk(void* param_0) {
     switch (mMode) {
         case 0:
@@ -3057,36 +2975,29 @@ int daNpc_Besu_c::talk(void* param_0) {
     return 0;
 }
 
-/* 8053D29C-8053D2BC 00653C 0020+00 1/0 0/0 0/0 .text            daNpc_Besu_Create__FPv */
 static int daNpc_Besu_Create(void* i_this) {
     return static_cast<daNpc_Besu_c*>(i_this)->create();
 }
 
-/* 8053D2BC-8053D2DC 00655C 0020+00 1/0 0/0 0/0 .text            daNpc_Besu_Delete__FPv */
 static int daNpc_Besu_Delete(void* i_this) {
     return static_cast<daNpc_Besu_c*>(i_this)->Delete();
 }
 
-/* 8053D2DC-8053D2FC 00657C 0020+00 1/0 0/0 0/0 .text            daNpc_Besu_Execute__FPv */
 static int daNpc_Besu_Execute(void* i_this) {
     return static_cast<daNpc_Besu_c*>(i_this)->Execute();
 }
 
-/* 8053D2FC-8053D31C 00659C 0020+00 1/0 0/0 0/0 .text            daNpc_Besu_Draw__FPv */
 static int daNpc_Besu_Draw(void* i_this) {
     return static_cast<daNpc_Besu_c*>(i_this)->Draw();
 }
 
-/* 8053D31C-8053D324 0065BC 0008+00 1/0 0/0 0/0 .text            daNpc_Besu_IsDelete__FPv */
 static int daNpc_Besu_IsDelete(void*) {
     return true;
 }
 
-/* 8053FE7C-8053FE80 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Besu_Param_c l_HIO;
 
 
-/* 8053FCAC-8053FCCC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Besu_MethodTable */
 static actor_method_class daNpc_Besu_MethodTable = {
     (process_method_func)daNpc_Besu_Create,
     (process_method_func)daNpc_Besu_Delete,
@@ -3095,7 +3006,6 @@ static actor_method_class daNpc_Besu_MethodTable = {
     (process_method_func)daNpc_Besu_Draw,
 };
 
-/* 8053FCCC-8053FCFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_BESU */
 extern actor_process_profile_definition g_profile_NPC_BESU = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp
index 005b947e17..31a2848ca1 100644
--- a/src/d/actor/d_a_npc_blue_ns.cpp
+++ b/src/d/actor/d_a_npc_blue_ns.cpp
@@ -11,7 +11,6 @@
 #include "d/actor/d_a_npc_yamid.h"
 #include "d/actor/d_a_npc_yamit.h"
 
-/* 8096CBC0-8096CC2C 000020 006C+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[9] = {
     {11, 2, 0},
     {12, 2, 0},
@@ -24,10 +23,8 @@ static daNpc_GetParam2 l_bckGetParamList[9] = {
     {7, 0, 0},
 };
 
-/* 8096CC2C-8096CC30 -00001 0004+00 4/5 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[1] = {"Blue_NS"};
 
-/* 8096CC30-8096CC4C -00001 001C+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[7] = {
     NULL,
     "CHG_YAMI_CHIBI",
@@ -38,13 +35,10 @@ static char* l_evtNames[7] = {
     "CHG_YAMI_NOPPO_STOPPER",
 };
 
-/* 8096CC4C-8096CC50 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Blue_NS";
 
-/* 8096CE94-8096CE98 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcBlueNS_Param_c l_HIO;
 
-/* 8096CC98-8096CCEC 0000F8 0054+00 0/2 0/0 0/0 .data            mEvtSeqList__13daNpcBlueNS_c */
 daNpcBlueNS_c::EventFn daNpcBlueNS_c::mEvtSeqList[] = {
     NULL,
     &daNpcBlueNS_c::_Evt_ChgYami_Chibi,
@@ -55,10 +49,8 @@ daNpcBlueNS_c::EventFn daNpcBlueNS_c::mEvtSeqList[] = {
     &daNpcBlueNS_c::_Evt_ChgYami_STNoppo,
 };
 
-/* 8096896C-80968AF0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__13daNpcBlueNS_cFv */
 daNpcBlueNS_c::daNpcBlueNS_c() {}
 
-/* 80968B80-80968D44 000300 01C4+00 1/0 0/0 0/0 .text            __dt__13daNpcBlueNS_cFv */
 daNpcBlueNS_c::~daNpcBlueNS_c() {
     for (int i = 0; i < ARRAY_SIZE(l_arcNames); i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[i]);
@@ -69,7 +61,6 @@ daNpcBlueNS_c::~daNpcBlueNS_c() {
     }
 }
 
-/* 8096C920-8096C964 000000 0044+00 8/8 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj
@@ -84,7 +75,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 8096C964-8096C9D4 000044 0070+00 3/9 0/0 0/0 .rodata          m__19daNpcBlueNS_Param_c */
 const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = {
     55.0f,
     -3.0f,
@@ -122,7 +112,6 @@ const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = {
     300.0f,
 };
 
-/* 80968D44-80968FE4 0004C4 02A0+00 1/1 0/0 0/0 .text            Create__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::Create() {
     fopAcM_ct(this, daNpcBlueNS_c);
 
@@ -183,7 +172,6 @@ int daNpcBlueNS_c::Create() {
     return phase_state;
 }
 
-/* 80968FE4-80969138 000764 0154+00 1/1 0/0 0/0 .text            CreateHeap__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 0x10);
     JUT_ASSERT(406, NULL != mdlData_p);
@@ -208,7 +196,6 @@ int daNpcBlueNS_c::CreateHeap() {
     return 1;
 }
 
-/* 80969138-809691A8 0008B8 0070+00 1/1 0/0 0/0 .text            isDelete__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::isDelete() {
     BOOL rt = FALSE;
     if (daNpcT_chkEvtBit(0x23A) || fopAcM_isSwitch(this, getSwitchBitNo())) {
@@ -218,20 +205,17 @@ int daNpcBlueNS_c::isDelete() {
     return rt;
 }
 
-/* 809691A8-809691DC 000928 0034+00 1/1 0/0 0/0 .text            Delete__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcBlueNS_c();
     return 1;
 }
 
-/* 809691DC-80969200 00095C 0024+00 2/2 0/0 0/0 .text            Execute__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::Execute() {
     _Execute();
     return 1;
 }
 
-/* 80969200-80969468 000980 0268+00 1/1 0/0 0/0 .text            _Execute__13daNpcBlueNS_cFv */
 // NONMATCHING - small regalloc
 int daNpcBlueNS_c::_Execute() {
     setParam();
@@ -281,7 +265,6 @@ int daNpcBlueNS_c::_Execute() {
     }
 }
 
-/* 80969468-80969504 000BE8 009C+00 1/1 0/0 0/0 .text callEvt_changeYami__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::callEvt_changeYami() {
     static const u16 sCallEvtName[] = {
         1, 2, 3, 4, 5, 6,
@@ -295,8 +278,6 @@ void daNpcBlueNS_c::callEvt_changeYami() {
     setAction(&daNpcBlueNS_c::wait);
 }
 
-/* 80969504-809695F0 000C84 00EC+00 5/5 0/0 0/0 .text            create_Yamijin__13daNpcBlueNS_cFi
- */
 fpc_ProcID daNpcBlueNS_c::create_Yamijin(int param_0) {
     static const s16 sNameYami[] = {
         PROC_NPC_YAMIS,
@@ -326,7 +307,6 @@ fpc_ProcID daNpcBlueNS_c::create_Yamijin(int param_0) {
     return fopAcM_create(sNameYami[type], parameters, &pos, fopAcM_GetRoomNo(this), &angle, &size, -1);
 }
 
-/* 809695F0-80969698 000D70 00A8+00 1/1 0/0 0/0 .text            col_check__13daNpcBlueNS_cFv */
 BOOL daNpcBlueNS_c::col_check() {
     if (mCyl.ChkTgHit()) {
         cCcD_Obj* tg_hit_obj = mCyl.GetTgHitObj();
@@ -342,8 +322,6 @@ BOOL daNpcBlueNS_c::col_check() {
     return FALSE;
 }
 
-/* 80969698-80969870 000E18 01D8+00 1/1 0/0 0/0 .text
- * holyball_check_main__13daNpcBlueNS_cFP10fopAc_ac_c           */
 BOOL daNpcBlueNS_c::holyball_check_main(fopAc_ac_c* i_actor) {
     if (i_actor == NULL) {
         return FALSE;
@@ -377,7 +355,6 @@ BOOL daNpcBlueNS_c::holyball_check_main(fopAc_ac_c* i_actor) {
     return dist <= range;
 }
 
-/* 80969870-809699D0 000FF0 0160+00 1/1 0/0 0/0 .text            Draw__13daNpcBlueNS_cFv */
 int daNpcBlueNS_c::Draw() {
     if (field_0xe10 == 0) {
         return 1;
@@ -407,8 +384,6 @@ int daNpcBlueNS_c::Draw() {
     return 1;
 }
 
-/* 809699D0-80969B68 001150 0198+00 1/1 0/0 0/0 .text
- * ctrlJoint__13daNpcBlueNS_cFP8J3DJointP8J3DModel              */
 int daNpcBlueNS_c::ctrlJoint(J3DJoint* param_0, J3DModel* i_model) {
     int jnt_no = param_0->getJntNo();
     int spC[] = {1, 3, 4};
@@ -438,14 +413,10 @@ int daNpcBlueNS_c::ctrlJoint(J3DJoint* param_0, J3DModel* i_model) {
     return 1;
 }
 
-/* 80969B68-80969B88 0012E8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpcBlueNS_cFP10fopAc_ac_c            */
 int daNpcBlueNS_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpcBlueNS_c*)i_this)->CreateHeap();
 }
 
-/* 80969B88-80969BD4 001308 004C+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpcBlueNS_cFP8J3DJointi               */
 int daNpcBlueNS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -458,7 +429,6 @@ int daNpcBlueNS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80969BD4-80969C48 001354 0074+00 1/0 0/0 0/0 .text            setParam__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::setParam() {
     srchActor();
 
@@ -475,7 +445,6 @@ void daNpcBlueNS_c::setParam() {
     #endif
 }
 
-/* 80969C48-80969C90 0013C8 0048+00 1/1 0/0 0/0 .text            srchActor__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::srchActor() {
     srchHollyBall();
 
@@ -491,7 +460,6 @@ void daNpcBlueNS_c::srchActor() {
     }
 }
 
-/* 80969C90-80969CF8 001410 0068+00 1/1 0/0 0/0 .text            srchHollyBall__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::srchHollyBall() {
     if (mpHolyBallY == NULL) {
         mpHolyBallY = (daObjCarry_c*)fpcM_Search(_search_HollyBall_Y, this);
@@ -502,7 +470,6 @@ void daNpcBlueNS_c::srchHollyBall() {
     }
 }
 
-/* 80969CF8-80969D60 001478 0068+00 1/1 0/0 0/0 .text            srchTagYami__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::srchTagYami() {
     if (mpTagYami == NULL) {
         mpTagYami = (daTagYami_c*)fpcM_Search(_search_Tag, this);
@@ -512,8 +479,6 @@ void daNpcBlueNS_c::srchTagYami() {
     }
 }
 
-/* 80969D60-80969DE4 0014E0 0084+00 1/1 0/0 0/0 .text            _search_Tag__13daNpcBlueNS_cFPvPv
- */
 void* daNpcBlueNS_c::_search_Tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -526,7 +491,6 @@ void* daNpcBlueNS_c::_search_Tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80969DE4-80969E9C 001564 00B8+00 1/1 0/0 0/0 .text _search_HollyBall_Y__13daNpcBlueNS_cFPvPv */
 void* daNpcBlueNS_c::_search_HollyBall_Y(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -551,7 +515,6 @@ void* daNpcBlueNS_c::_search_HollyBall_Y(void* i_actor, void* i_data) {
     return i_actor;
 }
 
-/* 80969E9C-80969F54 00161C 00B8+00 1/1 0/0 0/0 .text _search_HollyBall_G__13daNpcBlueNS_cFPvPv */
 void* daNpcBlueNS_c::_search_HollyBall_G(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -576,7 +539,6 @@ void* daNpcBlueNS_c::_search_HollyBall_G(void* i_actor, void* i_data) {
     return i_actor;
 }
 
-/* 80969F54-8096A090 0016D4 013C+00 1/0 0/0 0/0 .text            main__13daNpcBlueNS_cFv */
 BOOL daNpcBlueNS_c::main() {
     if (fopAcM_isSwitch(this, 88)) {
         mYamijinId = create_Yamijin(1);
@@ -603,7 +565,6 @@ BOOL daNpcBlueNS_c::main() {
     return 0;
 }
 
-/* 8096A090-8096A238 001810 01A8+00 1/0 0/0 0/0 .text            setAttnPos__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -636,7 +597,6 @@ void daNpcBlueNS_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 8096A238-8096A308 0019B8 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__13daNpcBlueNS_cFif */
 void daNpcBlueNS_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* morfAnm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx],
                                                     l_bckGetParamList[i_idx].fileIdx);
@@ -652,7 +612,6 @@ void daNpcBlueNS_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 8096A308-8096A350 001A88 0048+00 1/0 0/0 0/0 .text            setMotion__13daNpcBlueNS_cFifi */
 void daNpcBlueNS_c::setMotion(int param_0, f32 param_1, int param_2) {
     s16 var_r31 = param_0;
     if ((param_2 != 0 || mMotion != var_r31) && param_0 >= 0 && param_0 < 9) {
@@ -664,12 +623,10 @@ void daNpcBlueNS_c::setMotion(int param_0, f32 param_1, int param_2) {
     }
 }
 
-/* 8096A350-8096A358 001AD0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpcBlueNS_cFv */
 BOOL daNpcBlueNS_c::drawDbgInfo() {
     return false;
 }
 
-/* 8096A358-8096A518 001AD8 01C0+00 1/1 0/0 0/0 .text            reset__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::reset() {
     int type = mType % 3;
     if ((mType / 3) != 0) {
@@ -711,7 +668,6 @@ void daNpcBlueNS_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 8096A518-8096A750 001C98 0238+00 1/1 0/0 0/0 .text            playMotion__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::playMotion() {
     daNpcF_anmPlayData anm0_phase1 = {0, 0.0f, 0};
     daNpcF_anmPlayData* anm0[] = {&anm0_phase1};
@@ -752,8 +708,6 @@ void daNpcBlueNS_c::playMotion() {
     }
 }
 
-/* 8096A750-8096A7F8 001ED0 00A8+00 7/7 0/0 0/0 .text
- * setAction__13daNpcBlueNS_cFM13daNpcBlueNS_cFPCvPvi_i         */
 int daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*i_action)(int)) {
     field_0xdc0 = 3;
     if (mAction != NULL) {
@@ -770,7 +724,6 @@ int daNpcBlueNS_c::setAction(int (daNpcBlueNS_c::*i_action)(int)) {
     return 1;
 }
 
-/* 8096A7F8-8096A81C 001F78 0024+00 1/1 0/0 0/0 .text            setLookMode__13daNpcBlueNS_cFi */
 void daNpcBlueNS_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= LOOK_NONE && i_lookMode < LOOK_ACTOR) {
         if (i_lookMode != mLookMode) {
@@ -779,7 +732,6 @@ void daNpcBlueNS_c::setLookMode(int i_lookMode) {
     }
 }
 
-/* 8096A81C-8096A9FC 001F9C 01E0+00 1/1 0/0 0/0 .text            lookat__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model_p = mAnm_p->getModel();
@@ -832,7 +784,6 @@ void daNpcBlueNS_c::lookat() {
     mLookat.calc(this, model_p->getBaseTRMtx(), sp24, var_r28, temp_r26, 0);
 }
 
-/* 8096A9FC-8096AAF0 00217C 00F4+00 1/1 0/0 0/0 .text            step__13daNpcBlueNS_cFsi */
 BOOL daNpcBlueNS_c::step(s16 i_angY, int param_1) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_angY;
@@ -858,7 +809,6 @@ BOOL daNpcBlueNS_c::step(s16 i_angY, int param_1) {
     return mTurnMode > 1;
 }
 
-/* 8096AAF0-8096ABD4 002270 00E4+00 1/1 0/0 0/0 .text            chkFindPlayer__13daNpcBlueNS_cFv */
 BOOL daNpcBlueNS_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcBlueNS_Param_c::m.common.fov)) {
         mActorMngr[0].remove();
@@ -881,7 +831,6 @@ BOOL daNpcBlueNS_c::chkFindPlayer() {
     return ret;
 }
 
-/* 8096ABD4-8096AD70 002354 019C+00 6/0 0/0 0/0 .text            wait__13daNpcBlueNS_cFi */
 int daNpcBlueNS_c::wait(int param_0) {
     switch (field_0xdc0) {
     case 0:
@@ -915,7 +864,6 @@ int daNpcBlueNS_c::wait(int param_0) {
     return 1;
 }
 
-/* 8096AD70-8096AE5C 0024F0 00EC+00 1/0 0/0 0/0 .text            down__13daNpcBlueNS_cFi */
 int daNpcBlueNS_c::down(int param_0) {
     switch (field_0xdc0) {
     case 0:
@@ -942,7 +890,6 @@ int daNpcBlueNS_c::down(int param_0) {
     return 1;
 }
 
-/* 8096AE5C-8096AFC8 0025DC 016C+00 1/0 0/0 0/0 .text            talk__13daNpcBlueNS_cFi */
 int daNpcBlueNS_c::talk(int param_0) {
     int var_r27 = 0;
     bool var_r28 = 0;
@@ -981,7 +928,6 @@ int daNpcBlueNS_c::talk(int param_0) {
     return var_r28;
 }
 
-/* 8096AFC8-8096B204 002748 023C+00 1/0 0/0 0/0 .text            demo__13daNpcBlueNS_cFi */
 int daNpcBlueNS_c::demo(int param_0) {
     dEvent_manager_c* evtmgr = &dComIfGp_getEventManager();
 
@@ -1055,7 +1001,6 @@ int daNpcBlueNS_c::demo(int param_0) {
     return 1;
 }
 
-/* 8096B204-8096B320 002984 011C+00 4/4 0/0 0/0 .text            ChgPtclDisp__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::ChgPtclDisp() {
     int type = mType % 3;
     if (mType / 3 != 0) {
@@ -1070,7 +1015,6 @@ void daNpcBlueNS_c::ChgPtclDisp() {
     dComIfGp_particle_set(dPa_RM(ID_ZI_S_NS_CHANGE_B), &sp8, &tevStr, &shape_angle, NULL);
 }
 
-/* 8096B320-8096B3D8 002AA0 00B8+00 1/1 0/0 0/0 .text            downSE__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::downSE() {
     switch (mType) {
     case 0:
@@ -1088,7 +1032,6 @@ void daNpcBlueNS_c::downSE() {
     }
 }
 
-/* 8096B3D8-8096B490 002B58 00B8+00 1/1 0/0 0/0 .text            lightsowrdSE__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::lightsowrdSE() {
     switch (mType) {
     case 0:
@@ -1106,7 +1049,6 @@ void daNpcBlueNS_c::lightsowrdSE() {
     }
 }
 
-/* 8096B490-8096B548 002C10 00B8+00 4/4 0/0 0/0 .text            appearSE__13daNpcBlueNS_cFv */
 void daNpcBlueNS_c::appearSE() {
     switch (mType) {
     case 0:
@@ -1124,7 +1066,6 @@ void daNpcBlueNS_c::appearSE() {
     }
 }
 
-/* 8096B548-8096B5F0 002CC8 00A8+00 1/0 0/0 0/0 .text _Evt_ChgYami_Chibi__13daNpcBlueNS_cFi */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi(int i_staffId) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     int cutId = -1;
@@ -1144,8 +1085,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi(int i_staffId) {
     return _Evt_ChgYami_Chibi_CutMain(cutId);
 }
 
-/* 8096B5F0-8096B688 002D70 0098+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Chibi_CutInit__13daNpcBlueNS_cFRCi              */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutInit(const int& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -1167,8 +1106,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutInit(const int& i_cutId) {
     return 1;
 }
 
-/* 8096B688-8096B7B8 002E08 0130+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Chibi_CutMain__13daNpcBlueNS_cFRCi              */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutMain(const int& i_cutId) {
     BOOL rt = 0;
 
@@ -1206,7 +1143,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Chibi_CutMain(const int& i_cutId) {
     return rt;
 }
 
-/* 8096B7B8-8096B860 002F38 00A8+00 1/0 0/0 0/0 .text _Evt_ChgYami_Debu__13daNpcBlueNS_cFi */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu(int i_staffId) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     int cutId = -1;
@@ -1226,8 +1162,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu(int i_staffId) {
     return _Evt_ChgYami_Debu_CutMain(cutId);
 }
 
-/* 8096B860-8096B8F8 002FE0 0098+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Debu_CutInit__13daNpcBlueNS_cFRCi               */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutInit(const int& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -1249,8 +1183,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutInit(const int& i_cutId) {
     return 1;
 }
 
-/* 8096B8F8-8096BA28 003078 0130+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Debu_CutMain__13daNpcBlueNS_cFRCi               */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutMain(const int& i_cutId) {
     BOOL rt = 0;
 
@@ -1288,7 +1220,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Debu_CutMain(const int& i_cutId) {
     return rt;
 }
 
-/* 8096BA28-8096BAD0 0031A8 00A8+00 1/0 0/0 0/0 .text _Evt_ChgYami_Noppo__13daNpcBlueNS_cFi */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo(int i_staffId) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     int cutId = -1;
@@ -1308,8 +1239,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo(int i_staffId) {
     return _Evt_ChgYami_Noppo_CutMain(cutId);
 }
 
-/* 8096BAD0-8096BB68 003250 0098+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Noppo_CutInit__13daNpcBlueNS_cFRCi              */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutInit(const int& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -1331,8 +1260,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutInit(const int& i_cutId) {
     return 1;
 }
 
-/* 8096BB68-8096BC98 0032E8 0130+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_Noppo_CutMain__13daNpcBlueNS_cFRCi              */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutMain(const int& i_cutId) {
     BOOL rt = 0;
 
@@ -1370,7 +1297,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_Noppo_CutMain(const int& i_cutId) {
     return rt;
 }
 
-/* 8096BC98-8096BD40 003418 00A8+00 3/0 0/0 0/0 .text _Evt_ChgYami_STNoppo__13daNpcBlueNS_cFi */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo(int i_staffId) {
     dEvent_manager_c& evtMgr = dComIfGp_getEventManager();
     int cutId = -1;
@@ -1390,8 +1316,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo(int i_staffId) {
     return _Evt_ChgYami_STNoppo_CutMain(cutId);
 }
 
-/* 8096BD40-8096BDD8 0034C0 0098+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_STNoppo_CutInit__13daNpcBlueNS_cFRCi            */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutInit(const int& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -1413,8 +1337,6 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutInit(const int& i_cutId) {
     return 1;
 }
 
-/* 8096BDD8-8096BF08 003558 0130+00 1/1 0/0 0/0 .text
- * _Evt_ChgYami_STNoppo_CutMain__13daNpcBlueNS_cFRCi            */
 BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutMain(const int& i_cutId) {
     BOOL rt = 0;
 
@@ -1452,32 +1374,26 @@ BOOL daNpcBlueNS_c::_Evt_ChgYami_STNoppo_CutMain(const int& i_cutId) {
     return rt;
 }
 
-/* 8096BF08-8096BF28 003688 0020+00 1/0 0/0 0/0 .text            daNpcBlueNS_Create__FPv */
 static int daNpcBlueNS_Create(void* i_this) {
     return ((daNpcBlueNS_c*)i_this)->Create();
 }
 
-/* 8096BF28-8096BF48 0036A8 0020+00 1/0 0/0 0/0 .text            daNpcBlueNS_Delete__FPv */
 static int daNpcBlueNS_Delete(void* i_this) {
     return ((daNpcBlueNS_c*)i_this)->Delete();
 }
 
-/* 8096BF48-8096BF68 0036C8 0020+00 1/0 0/0 0/0 .text            daNpcBlueNS_Execute__FPv */
 static int daNpcBlueNS_Execute(void* i_this) {
     return ((daNpcBlueNS_c*)i_this)->Execute();
 }
 
-/* 8096BF68-8096BF88 0036E8 0020+00 1/0 0/0 0/0 .text            daNpcBlueNS_Draw__FPv */
 static int daNpcBlueNS_Draw(void* i_this) {
     return ((daNpcBlueNS_c*)i_this)->Draw();
 }
 
-/* 8096BF88-8096BF90 003708 0008+00 1/0 0/0 0/0 .text            daNpcBlueNS_IsDelete__FPv */
 static int daNpcBlueNS_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8096CD58-8096CD78 -00001 0020+00 1/0 0/0 0/0 .data            daNpcBlueNS_MethodTable */
 static actor_method_class daNpcBlueNS_MethodTable = {
     (process_method_func)daNpcBlueNS_Create,
     (process_method_func)daNpcBlueNS_Delete,
@@ -1486,7 +1402,6 @@ static actor_method_class daNpcBlueNS_MethodTable = {
     (process_method_func)daNpcBlueNS_Draw,
 };
 
-/* 8096CD78-8096CDA8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_BLUENS */
 extern actor_process_profile_definition g_profile_NPC_BLUENS = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp
index 4312f6ffe1..2486ba8547 100644
--- a/src/d/actor/d_a_npc_bou.cpp
+++ b/src/d/actor/d_a_npc_bou.cpp
@@ -11,18 +11,11 @@
 #include "d/actor/d_a_npc_jagar.h"
 #include "d/actor/d_a_tag_push.h"
 #include "d/d_meter2_info.h"
-#include "dol2asm.h"
 
-//
-// Declarations:
-//
-
-/* 80972AB0-80972AB8 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {11, 1},
 };
 
-/* 80972AB8-80972B10 -00001 0058+00 0/1 0/0 0/0 .data            l_evtList */
 daNpcT_evtData_c l_evtList[11] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -37,7 +30,6 @@ daNpcT_evtData_c l_evtList[11] = {
     {"MEETING_AGAIN_NEAR", 4},
 };
 
-/* 80972B10-80972B2C -00001 001C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[7] = {
     "",
     "Bou",
@@ -48,28 +40,21 @@ static char* l_resNameList[7] = {
     "Jagar2"
 };
 
-/* 80972B2C-80972B30 00009C 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {1, 2, 4, -1};
 
-/* 80972B30-80972B34 0000A0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {1, 3, -1};
 
-/* 80972B34-80972B38 0000A4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {1, 4, -1};
 
-/* 80972B38-80972B3C 0000A8 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[3] = {1, 5, -1};
 
-/* 80972B3C-80972B44 0000AC 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {1, 2, 3, 4, -1};
 
-/* 80972B44-80972B5C -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn2,
     l_loadResPtrn3, l_loadResPtrn0, l_loadResPtrn9,
 };
 
-/* 80972B5C-80972C90 0000CC 0134+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[11] = {
     {-1, 0, 0, 17, 2, 1, 1},
     {6, 0, 1, 17, 2, 1, 1},
@@ -84,7 +69,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[11] = {
     {10, 0, 4, 27, 0, 4, 1},
 };
 
-/* 80972C90-80972F14 000200 0284+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[23] = {
     {8, 2, 1, 14, 0, 1, 1, 0},
     {5, 0, 2, 14, 0, 1, 1, 0},
@@ -111,7 +95,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[23] = {
     {18, 2, 4, 14, 0, 1, 1, 0}
 };
 
-/* 80972F14-80972FC4 000484 00B0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[44] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, 0, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {9, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -121,7 +104,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[44] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80972FC4-80973124 000534 0160+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[88] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {6, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, 0, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -136,7 +118,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[88] = {
     {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80973124-80973148 -00001 0024+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Bou_c */
 char* daNpc_Bou_c::mCutNameList[9] = {
     "",
     "WILDGOAT",
@@ -149,7 +130,6 @@ char* daNpc_Bou_c::mCutNameList[9] = {
     "MEETING_AGAIN"
 };
 
-/* 809731A8-80973214 000718 006C+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Bou_c */
 daNpc_Bou_c::cutFunc daNpc_Bou_c::mCutList[9] = {
     NULL,
     &daNpc_Bou_c::cutWildGoat,
@@ -162,7 +142,6 @@ daNpc_Bou_c::cutFunc daNpc_Bou_c::mCutList[9] = {
     &daNpc_Bou_c::cutMeetingAgain
 };
 
-/* 8096CF8C-8096D0D8 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__11daNpc_Bou_cFv */
 daNpc_Bou_c::~daNpc_Bou_c() {
     if (mpMorf[0] != 0) {
         mpMorf[0]->stopZelAnime();
@@ -170,8 +149,6 @@ daNpc_Bou_c::~daNpc_Bou_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80972860-809728FC 000000 009C+00 13/13 0/0 1/1 .rodata          m__17daNpc_Bou_Param_c */
 daNpc_Bou_Param_c::Data const daNpc_Bou_Param_c::m= {
     210.0f, -3.0f, 1.0f, 600.0f, 255.0f, 200.0f, 35.0f, 40.0f,
     0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
@@ -180,7 +157,6 @@ daNpc_Bou_Param_c::Data const daNpc_Bou_Param_c::m= {
     0.0f, 0.0f, 16.0f, 1000.0f, 500.0f, -500.0f,
 };
 
-/* 8096D0D8-8096D38C 000238 02B4+00 1/1 0/0 0/0 .text            create__11daNpc_Bou_cFv */
 int daNpc_Bou_c::create() {
     static int const heapSize[6] = {15696, 15696, 15696, 15696, 15696, 0};
     daNpcT_ct(this, daNpc_Bou_c, l_faceMotionAnmData, l_motionAnmData,
@@ -238,7 +214,6 @@ static f32 dummy(u8 i_dummy) {
     }
 }
 
-/* 8096D38C-8096D5FC 0004EC 0270+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Bou_cFv */
 int daNpc_Bou_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(
         l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
@@ -270,19 +245,16 @@ int daNpc_Bou_c::CreateHeap() {
     return 0;
 }
 
-/* 8096D7B8-8096D7EC 000918 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Bou_cFv */
 int daNpc_Bou_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Bou_c();
     return 1;
 }
 
-/* 8096D7EC-8096D80C 00094C 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Bou_cFv */
 int daNpc_Bou_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 8096D80C-8096D8A0 00096C 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Bou_cFv */
 int daNpc_Bou_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -291,14 +263,10 @@ int daNpc_Bou_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 8096D8A0-8096D8C0 000A00 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Bou_cFP10fopAc_ac_c              */
 int daNpc_Bou_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Bou_c*>(i_this)->CreateHeap();
 }
 
-/* 8096D8C0-8096D918 000A20 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Bou_cFP8J3DJointi
- */
 int daNpc_Bou_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -311,7 +279,6 @@ int daNpc_Bou_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 8096D918-8096D9B4 000A78 009C+00 1/1 0/0 0/0 .text            srchCow__11daNpc_Bou_cFPvPv */
 void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) {
     if (mFindCount < 50 && arg0 != NULL && arg0 != arg1) {
         if (fopAcM_IsExecuting(fopAcM_GetID(arg0)) && fopAcM_GetName(arg0) == PROC_COW) {
@@ -322,7 +289,6 @@ void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) {
     return NULL;
 }
 
-/* 8096D9B4-8096DA78 000B14 00C4+00 1/1 0/0 0/0 .text            getCowP__11daNpc_Bou_cFv */
 fopAc_ac_c* daNpc_Bou_c::getCowP() {
     fopAc_ac_c* pActor = NULL;
     f32 minDist = G_CM3D_F_INF;
@@ -339,7 +305,6 @@ fopAc_ac_c* daNpc_Bou_c::getCowP() {
     return pActor;
 }
 
-/* 8096DA78-8096DADC 000BD8 0064+00 1/1 0/0 2/2 .text            getType__11daNpc_Bou_cFv */
 u8 daNpc_Bou_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
         case 0:
@@ -357,7 +322,6 @@ u8 daNpc_Bou_c::getType() {
     }
 }
 
-/* 8096DADC-8096DBBC 000C3C 00E0+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Bou_cFv */
 int daNpc_Bou_c::isDelete() {
     switch (mType) {
         case TYPE_0: {
@@ -396,7 +360,6 @@ int daNpc_Bou_c::isDelete() {
     }
 }
 
-/* 8096DBBC-8096DD44 000D1C 0188+00 1/1 0/0 0/0 .text            reset__11daNpc_Bou_cFv */
 void daNpc_Bou_c::reset() {
     csXyz acStack_20;
     int iVar1 = (u8*)&field_0xff8 - (u8*)&field_0xfc4;
@@ -417,7 +380,6 @@ void daNpc_Bou_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 8096DD44-8096DDC8 000EA4 0084+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Bou_cFi */
 void daNpc_Bou_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -428,7 +390,6 @@ void daNpc_Bou_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 8096DDC8-8096DF9C 000F28 01D4+00 1/0 0/0 0/0 .text            setParam__11daNpc_Bou_cFv */
 void daNpc_Bou_c::setParam() {
     selectAction();
     srchActors();
@@ -486,7 +447,6 @@ void daNpc_Bou_c::setParam() {
     gravity = daNpc_Bou_Param_c::m.field_0x04;
 }
 
-/* 8096DF9C-8096E0EC 0010FC 0150+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Bou_cFv */
 BOOL daNpc_Bou_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Bou_c::talk)) {
         mPreItemNo = 0;
@@ -535,8 +495,6 @@ BOOL daNpc_Bou_c::checkChangeEvt() {
     return false;
 }
 
-/* 8096E0EC-8096E18C 00124C 00A0+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Bou_cFv
- */
 void daNpc_Bou_c::setAfterTalkMotion() {
     int iVar2 = 10;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -553,7 +511,6 @@ void daNpc_Bou_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 8096E18C-8096E27C 0012EC 00F0+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Bou_cFv */
 void daNpc_Bou_c::srchActors() {
     switch (mType) {
         case TYPE_0: {
@@ -585,7 +542,6 @@ void daNpc_Bou_c::srchActors() {
     }
 }
 
-/* 8096E27C-8096E31C 0013DC 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Bou_cFv */
 BOOL daNpc_Bou_c::evtTalk() {
     if (chkAction(&daNpc_Bou_c::talk)) {
         (this->*field_0xfd0)(NULL);
@@ -596,12 +552,10 @@ BOOL daNpc_Bou_c::evtTalk() {
     return 1;
 }
 
-/* 8096E31C-8096E324 00147C 0008+00 1/0 0/0 0/0 .text            evtEndProc__11daNpc_Bou_cFv */
 BOOL daNpc_Bou_c::evtEndProc() {
     return true;
 }
 
-/* 8096E324-8096E3EC 001484 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Bou_cFv */
 BOOL daNpc_Bou_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Bou", this, -1);
     if (staffId != -1) {
@@ -617,7 +571,6 @@ BOOL daNpc_Bou_c::evtCutProc() {
     return false;
 }
 
-/* 8096E3EC-8096E7E0 00154C 03F4+00 1/0 0/0 0/0 .text            action__11daNpc_Bou_cFv */
 void daNpc_Bou_c::action() {
     fopAc_ac_c* hit_actor = hitChk(&mCyl1, 0xffffffff);
     if (hit_actor != NULL && mCyl1.GetTgHitObj()->ChkAtType(AT_TYPE_THROW_OBJ)) {
@@ -665,7 +618,6 @@ void daNpc_Bou_c::action() {
     }
 }
 
-/* 8096E7E0-8096E8A4 001940 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Bou_cFv */
 void daNpc_Bou_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -677,7 +629,6 @@ void daNpc_Bou_c::beforeMove() {
     }
 }
 
-/* 8096E8A4-8096EB14 001A04 0270+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Bou_cFv */
 void daNpc_Bou_c::setAttnPos() {
     cXyz cStack_3c(-30.0f, 10.0f, 0.0f);
     mStagger.calc(0);
@@ -702,7 +653,6 @@ void daNpc_Bou_c::setAttnPos() {
     attention_info.position = current.pos + cStack_3c;
 }
 
-/* 8096EB14-8096EC6C 001C74 0158+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Bou_cFv */
 void daNpc_Bou_c::setCollision() {
     cXyz cStack_48;
     if (mHide == 0) {
@@ -738,12 +688,10 @@ void daNpc_Bou_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 8096EC6C-8096EC74 001DCC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Bou_cFv */
 int daNpc_Bou_c::drawDbgInfo() {
     return false;
 }
 
-/* 8096EC74-8096ECC0 001DD4 004C+00 1/0 0/0 0/0 .text            changeAnm__11daNpc_Bou_cFPiPi */
 void daNpc_Bou_c::changeAnm(int* param_0, int* param_1) {
     if (mType == 3) {
         switch (*param_0) {
@@ -762,7 +710,6 @@ void daNpc_Bou_c::changeAnm(int* param_0, int* param_1) {
     }
 }
 
-/* 8096ECC0-8096ED3C 001E20 007C+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Bou_cFv */
 int daNpc_Bou_c::selectAction() {
     field_0xfc4 = NULL;
     switch (mType) {
@@ -780,14 +727,10 @@ int daNpc_Bou_c::selectAction() {
     return 1;
 }
 
-/* 8096ED3C-8096ED68 001E9C 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Bou_cFM11daNpc_Bou_cFPCvPvPv_i            */
 int daNpc_Bou_c::chkAction(actionFunc param_0) {
     return field_0xfd0 == param_0;
 }
 
-/* 8096ED68-8096EE10 001EC8 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Bou_cFM11daNpc_Bou_cFPCvPvPv_i            */
 int daNpc_Bou_c::setAction(actionFunc param_0) {
     mMode = 3;
     if (field_0xfd0 != NULL) {
@@ -803,7 +746,6 @@ int daNpc_Bou_c::setAction(actionFunc param_0) {
     return 1;
 }
 
-/* 8096EE10-8096F2E4 001F70 04D4+00 2/0 0/0 0/0 .text            cutWildGoat__11daNpc_Bou_cFi */
 int daNpc_Bou_c::cutWildGoat(int arg) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -941,8 +883,6 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
     return ret_val;
 }
 
-/* 8096F2E4-8096F510 002444 022C+00 1/0 0/0 0/0 .text            cutWildGoatSuccess__11daNpc_Bou_cFi
- */
 int daNpc_Bou_c::cutWildGoatSuccess(int arg) {
     int ret_val = 0;
     int prm_val = -1;
@@ -993,8 +933,6 @@ int daNpc_Bou_c::cutWildGoatSuccess(int arg) {
     return ret_val;
 }
 
-/* 8096F510-8096F758 002670 0248+00 1/0 0/0 0/0 .text            cutWildGoatFailure__11daNpc_Bou_cFi
- */
 int daNpc_Bou_c::cutWildGoatFailure(int arg) {
     int ret_val = 0;
     int prm_val = -1;
@@ -1054,7 +992,6 @@ int daNpc_Bou_c::cutWildGoatFailure(int arg) {
     return ret_val;
 }
 
-/* 8096F758-8096F9A4 0028B8 024C+00 1/0 0/0 0/0 .text            cutSpeakTo__11daNpc_Bou_cFi */
 int daNpc_Bou_c::cutSpeakTo(int arg) {
     int ret_val = 0;
     int* pVal = NULL;
@@ -1111,7 +1048,6 @@ int daNpc_Bou_c::cutSpeakTo(int arg) {
     return ret_val;
 }
 
-/* 8096F9A4-8096FB78 002B04 01D4+00 1/0 0/0 0/0 .text cutConversationWithBou__11daNpc_Bou_cFi */
 int daNpc_Bou_c::cutConversationWithBou(int arg) {
     fopAc_ac_c* actor = NULL;
     int ret_val = 0;
@@ -1149,8 +1085,6 @@ int daNpc_Bou_c::cutConversationWithBou(int arg) {
     return ret_val;
 }
 
-/* 8096FB78-8096FE40 002CD8 02C8+00 1/0 0/0 0/0 .text cutConfidentialConversation__11daNpc_Bou_cFi
- */
 int daNpc_Bou_c::cutConfidentialConversation(int arg) {
     fopAc_ac_c* actor = NULL;
     int ret_val = 0;
@@ -1206,7 +1140,6 @@ int daNpc_Bou_c::cutConfidentialConversation(int arg) {
     return ret_val;
 }
 
-/* 8096FE40-80970278 002FA0 0438+00 1/0 0/0 0/0 .text            cutFindWolf__11daNpc_Bou_cFi */
 int daNpc_Bou_c::cutFindWolf(int arg) {
     int ret_val = 0;
     int* pVal = NULL;
@@ -1299,7 +1232,6 @@ int daNpc_Bou_c::cutFindWolf(int arg) {
     return ret_val;
 }
 
-/* 80970278-809709EC 0033D8 0774+00 1/0 0/0 0/0 .text            cutMeetingAgain__11daNpc_Bou_cFi */
 int daNpc_Bou_c::cutMeetingAgain(int arg) {
     fopAc_ac_c* actor_p = field_0xba0.getActorP();
     cXyz work;
@@ -1466,7 +1398,6 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) {
     return ret_val;
 }
 
-/* 809709EC-80970DFC 003B4C 0410+00 1/0 0/0 0/0 .text            wait__11daNpc_Bou_cFPv */
 int daNpc_Bou_c::wait(void* param_0) {
     fopAc_ac_c* actor_p = NULL;
     switch (mMode) {
@@ -1562,7 +1493,6 @@ int daNpc_Bou_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80970DFC-80970F9C 003F5C 01A0+00 1/0 0/0 0/0 .text            talkwithJagar__11daNpc_Bou_cFPv */
 int daNpc_Bou_c::talkwithJagar(void* param_0) {
     daNpc_Jagar_c* jagar = (daNpc_Jagar_c*) mActorMngr[1].getActorP();
     switch (mMode) {
@@ -1591,7 +1521,6 @@ int daNpc_Bou_c::talkwithJagar(void* param_0) {
     return 1;
 }
 
-/* 80970F9C-8097146C 0040FC 04D0+00 3/0 0/0 0/0 .text            talk__11daNpc_Bou_cFPv */
 int daNpc_Bou_c::talk(void* param_0) {
     daNpc_Jagar_c* jagar_p = NULL;
     switch (mMode) {
@@ -1682,32 +1611,26 @@ int daNpc_Bou_c::talk(void* param_0) {
     return 0;
 }
 
-/* 8097146C-8097148C 0045CC 0020+00 1/0 0/0 0/0 .text            daNpc_Bou_Create__FPv */
 static int daNpc_Bou_Create(void* i_this) {
     return static_cast<daNpc_Bou_c*>(i_this)->create();
 }
 
-/* 8097148C-809714AC 0045EC 0020+00 1/0 0/0 0/0 .text            daNpc_Bou_Delete__FPv */
 static int daNpc_Bou_Delete(void* i_this) {
     return static_cast<daNpc_Bou_c*>(i_this)->Delete();
 }
 
-/* 809714AC-809714CC 00460C 0020+00 1/0 0/0 0/0 .text            daNpc_Bou_Execute__FPv */
 static int daNpc_Bou_Execute(void* i_this) {
     return static_cast<daNpc_Bou_c*>(i_this)->Execute();
 }
 
-/* 809714CC-809714EC 00462C 0020+00 1/0 0/0 0/0 .text            daNpc_Bou_Draw__FPv */
 static int daNpc_Bou_Draw(void* i_this) {
     return static_cast<daNpc_Bou_c*>(i_this)->Draw();
 }
 
-/* 809714EC-809714F4 00464C 0008+00 1/0 0/0 0/0 .text            daNpc_Bou_IsDelete__FPv */
 static int daNpc_Bou_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80973274-80973294 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Bou_MethodTable */
 static actor_method_class daNpc_Bou_MethodTable = {
     (process_method_func)daNpc_Bou_Create,
     (process_method_func)daNpc_Bou_Delete,
@@ -1716,7 +1639,6 @@ static actor_method_class daNpc_Bou_MethodTable = {
     (process_method_func)daNpc_Bou_Draw,
 };
 
-/* 80973294-809732C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_BOU */
 extern actor_process_profile_definition g_profile_NPC_BOU = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
@@ -1734,5 +1656,4 @@ extern actor_process_profile_definition g_profile_NPC_BOU = {
   fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
-/* 80973454-80973458 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Bou_Param_c l_HIO;
diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp
index fcbb0a12f7..75dd6c94ab 100644
--- a/src/d/actor/d_a_npc_bouS.cpp
+++ b/src/d/actor/d_a_npc_bouS.cpp
@@ -164,7 +164,6 @@ enum Event {
     /* 0x3 */ EVENT_INTRO_SUMO3,
 };
 
-/* 809787C4-809788D8 000020 0114+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[23] = {
     {-1, J3DFrameCtrl::EMode_LOOP, BOU},
     {BCK_BOU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BOU},
@@ -191,7 +190,6 @@ static daNpc_GetParam2 l_bckGetParamList[23] = {
     {BCK_BOU4_THINKING_B, J3DFrameCtrl::EMode_LOOP, BOU4},
 };
 
-/* 809788D8-80978914 000134 003C+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[5] = {
     {BTP_BOU, J3DFrameCtrl::EMode_LOOP, BOU},
     {BTP_BOU4_F_CONSIDER, J3DFrameCtrl::EMode_NONE, BOU4},
@@ -200,18 +198,15 @@ static daNpc_GetParam2 l_btpGetParamList[5] = {
     {BTP_BOU4_FH_TALK_B, J3DFrameCtrl::EMode_LOOP, BOU4},
 };
 
-/* 80978914-80978920 000170 000C+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[1] = {
     {BTK_BOU, J3DFrameCtrl::EMode_LOOP, BOU},
 };
 
-/* 80978920-80978928 -00001 0008+00 6/7 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[2] = {
     "Bou",
     "Bou4",
 };
 
-/* 80978928-80978938 -00001 0010+00 3/4 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     NULL,
     "BOUS_INTRO_SUMO1",
@@ -219,13 +214,10 @@ static char* l_evtNames[4] = {
     "BOUS_INTRO_SUMO3",
 };
 
-/* 80978938-8097893C -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "BouS";
 
-/* 80978BC4-80978BD0 000054 000C+00 3/4 0/0 0/0 .bss             l_createPos */
 static cXyz l_createPos(1000000000.0f, 1000000000.0f, 1000000000.0f);
 
-/* 80978BDC-80978BE0 00006C 0004+00 0/1 0/0 0/0 .bss             l_HIO */
 static NPC_BOUS_HIO_CLASS l_HIO;
 
 #if DEBUG
@@ -268,7 +260,6 @@ void daNpcBouS_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80978960-80978990 0001BC 0030+00 0/2 0/0 0/0 .data            mEvtSeqList__11daNpcBouS_c */
 daNpcBouS_c::eventFunc daNpcBouS_c::mEvtSeqList[4] = {
     NULL,
     &daNpcBouS_c::EvCut_BousIntroSumo1,
@@ -276,10 +267,8 @@ daNpcBouS_c::eventFunc daNpcBouS_c::mEvtSeqList[4] = {
     &daNpcBouS_c::EvCut_BousIntroSumo3,
 };
 
-/* 8097354C-809736D0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcBouS_cFv */
 daNpcBouS_c::daNpcBouS_c() {}
 
-/* 80973760-80973948 000300 01E8+00 1/0 0/0 0/0 .text            __dt__11daNpcBouS_cFv */
 daNpcBouS_c::~daNpcBouS_c() {
     for (int i = 0; i < 2; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -296,7 +285,6 @@ daNpcBouS_c::~daNpcBouS_c() {
     #endif
 }
 
-/* 80978410-8097849C 000000 008C+00 13/13 0/0 0/0 .rodata          m__17daNpcBouS_Param_c */
 daNpcBouS_HIOParam const daNpcBouS_Param_c::m = {
     220.0f,
     -3.0f,
@@ -342,7 +330,6 @@ daNpcBouS_HIOParam const daNpcBouS_Param_c::m = {
     0,
 };
 
-/* 80973948-80973B9C 0004E8 0254+00 1/1 0/0 0/0 .text            Create__11daNpcBouS_cFv */
 cPhs__Step daNpcBouS_c::Create() {
     fopAcM_ct(this, daNpcBouS_c);
 
@@ -391,7 +378,6 @@ cPhs__Step daNpcBouS_c::Create() {
     return phase;
 }
 
-/* 80973B9C-80973E0C 00073C 0270+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcBouS_cFv */
 int daNpcBouS_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -429,20 +415,17 @@ int daNpcBouS_c::CreateHeap() {
     return 1;
 }
 
-/* 80973FC8-80973FFC 000B68 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcBouS_cFv */
 int daNpcBouS_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcBouS_c();
     return 1;
 }
 
-/* 80973FFC-80974020 000B9C 0024+00 2/2 0/0 0/0 .text            Execute__11daNpcBouS_cFv */
 int daNpcBouS_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80974020-80974090 000BC0 0070+00 1/1 0/0 0/0 .text            Draw__11daNpcBouS_cFv */
 int daNpcBouS_c::Draw() {
     if (!mDispFlag) {
         return 1;
@@ -454,7 +437,6 @@ int daNpcBouS_c::Draw() {
     return 1;
 }
 
-/* 80974090-809742BC 000C30 022C+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpcBouS_cFP8J3DJointP8J3DModel */
 int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -503,13 +485,11 @@ int daNpcBouS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809742BC-809742DC 000E5C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpcBouS_cFP10fopAc_ac_c */
 int daNpcBouS_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcBouS_c* actor = (daNpcBouS_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 809742DC-80974328 000E7C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpcBouS_cFP8J3DJointi */
 int daNpcBouS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -522,7 +502,6 @@ int daNpcBouS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80974328-80974514 000EC8 01EC+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcBouS_cFib */
 bool daNpcBouS_c::setExpressionAnm(int i_idx, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -589,7 +568,6 @@ bool daNpcBouS_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80974514-809745F4 0010B4 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcBouS_cFi */
 bool daNpcBouS_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btp = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx], l_btpGetParamList[i_idx].fileIdx);
     s32 i_attr = l_btpGetParamList[i_idx].attr;
@@ -614,7 +592,6 @@ bool daNpcBouS_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809745F4-80974730 001194 013C+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcBouS_cFif */
 void daNpcBouS_c::setMotionAnm(int i_idx, f32 i_morf) {
     int btk_idx;
     switch (i_idx) {
@@ -640,7 +617,6 @@ void daNpcBouS_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80974730-809748F0 0012D0 01C0+00 1/1 0/0 0/0 .text            reset__11daNpcBouS_cFv */
 void daNpcBouS_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -677,7 +653,6 @@ void daNpcBouS_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 809748F0-80974998 001490 00A8+00 1/1 0/0 0/0 .text            setAction__11daNpcBouS_cFM11daNpcBouS_cFPCvPvPv_b */
 BOOL daNpcBouS_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -695,7 +670,6 @@ BOOL daNpcBouS_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80974998-80974A04 001538 006C+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (
         fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Instruction &&
@@ -707,7 +681,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80974A04-80974A28 0015A4 0024+00 1/1 0/0 0/0 .text            checkInstructionTag__11daNpcBouS_cFP10fopAc_ac_c */
 bool daNpcBouS_c::checkInstructionTag(fopAc_ac_c* i_this) {
     daTagInst_c* actor = (daTagInst_c*)i_this;
     if (getArenaNo() == actor->getInstructionNo()) {
@@ -717,7 +690,6 @@ bool daNpcBouS_c::checkInstructionTag(fopAc_ac_c* i_this) {
     return false;
 }
 
-/* 80976C00-80976C9C 0037A0 009C+00 1/0 0/0 0/0 .text            setParam__11daNpcBouS_cFv */
 void daNpcBouS_c::setParam() {
     s16 attention_distance = 5;
     s16 attention_angle = 6;
@@ -737,7 +709,6 @@ void daNpcBouS_c::setParam() {
     gravity = mHIO->m.common.gravity;
 }
 
-/* 80976C9C-80976EEC 00383C 0250+00 1/0 0/0 0/0 .text            main__11daNpcBouS_cFv */
 BOOL daNpcBouS_c::main() {
     if (mAction) {
         (this->*mAction)(NULL);
@@ -781,7 +752,6 @@ void daNpcBouS_c::playExpression() {
     }
 }
 
-/* 80976EEC-80977368 003A8C 047C+00 1/1 0/0 0/0 .text            playMotion__11daNpcBouS_cFv */
 void daNpcBouS_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -848,7 +818,6 @@ void daNpcBouS_c::playMotion() {
     }
 }
 
-/* 80977368-80977444 003F08 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcBouS_cFv */
 BOOL daNpcBouS_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk = NULL;
@@ -866,7 +835,6 @@ BOOL daNpcBouS_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80977444-809778D8 003FE4 0494+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcBouS_cFv */
 void daNpcBouS_c::setAttnPos() {
     static cXyz eyeOffset(-10.0f, 10.0f, 0.0f);
 
@@ -930,7 +898,6 @@ void daNpcBouS_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 809778D8-80977AB8 004478 01E0+00 1/1 0/0 0/0 .text            lookat__11daNpcBouS_cFv */
 void daNpcBouS_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* mdl_p = mAnm_p->getModel();
@@ -1020,7 +987,6 @@ BOOL daNpcBouS_c::step(s16 i_turnTargetAngle, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 80974A28-809750BC 0015C8 0694+00 6/0 0/0 0/0 .text            wait__11daNpcBouS_cFPv */
 bool daNpcBouS_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1092,7 +1058,6 @@ bool daNpcBouS_c::wait(void* param_1) {
     return true;
 }
 
-/* 809750BC-80975104 001C5C 0048+00 1/0 0/0 0/0 .text            setMotion__11daNpcBouS_cFifi */
 void daNpcBouS_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 20) {
@@ -1104,7 +1069,6 @@ void daNpcBouS_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80975104-80975130 001CA4 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpcBouS_cFif */
 void daNpcBouS_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 6) {
         mExpression = i_expression;
@@ -1130,7 +1094,6 @@ void daNpcBouS_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80975130-80975748 001CD0 0618+00 1/0 0/0 0/0 .text            talk__11daNpcBouS_cFPv */
 bool daNpcBouS_c::talk(void* param_1) {
     int itemNo;
     bool rv = false;
@@ -1209,7 +1172,6 @@ bool daNpcBouS_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80975748-80975930 0022E8 01E8+00 3/0 0/0 0/0 .text            demo__11daNpcBouS_cFPv */
 bool daNpcBouS_c::demo(void* param_1) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     s32 staffId = 0;
@@ -1258,7 +1220,6 @@ fopAc_ac_c* daNpcBouS_c::searchInstructionTag() {
     return instructionTag;
 }
 
-/* 80975930-80975ED8 0024D0 05A8+00 2/0 0/0 0/0 .text            instruction__11daNpcBouS_cFPv */
 bool daNpcBouS_c::instruction(void* param_1) {
     dCamera_c* camBody = dCam_getBody();
 
@@ -1357,7 +1318,6 @@ bool daNpcBouS_c::instruction(void* param_1) {
     return true;
 }
 
-/* 80975ED8-80975FDC 002A78 0104+00 1/1 0/0 0/0 .text checkIntroDemoStart__11daNpcBouS_cFv */
 bool daNpcBouS_c::checkIntroDemoStart() {
     if (strcmp(dComIfGp_getStartStageName(), "R_SP01") != 0 || dComIfGs_getStartPoint() != 2) {
         return FALSE;
@@ -1377,7 +1337,6 @@ bool daNpcBouS_c::checkIntroDemoStart() {
     return TRUE;
 }
 
-/* 80975FDC-80976284 002B7C 02A8+00 1/0 0/0 0/0 .text EvCut_BousIntroSumo1__11daNpcBouS_cFi */
 int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1452,7 +1411,6 @@ int daNpcBouS_c::EvCut_BousIntroSumo1(int i_staffId) {
     return 0;
 }
 
-/* 80976284-80976654 002E24 03D0+00 1/0 0/0 0/0 .text EvCut_BousIntroSumo2__11daNpcBouS_cFi */
 int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1508,7 +1466,6 @@ int daNpcBouS_c::EvCut_BousIntroSumo2(int i_staffId) {
     return 0;
 }
 
-/* 80976654-80976B48 0031F4 04F4+00 1/0 0/0 0/0 .text EvCut_BousIntroSumo3__11daNpcBouS_cFi */
 int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1606,32 +1563,26 @@ int daNpcBouS_c::EvCut_BousIntroSumo3(int i_staffId) {
     return 0;
 }
 
-/* 80976B48-80976B68 0036E8 0020+00 1/0 0/0 0/0 .text            daNpcBouS_Create__FPv */
 static int daNpcBouS_Create(void* i_this) {
     return static_cast<daNpcBouS_c*>(i_this)->Create();
 }
 
-/* 80976B68-80976B88 003708 0020+00 1/0 0/0 0/0 .text            daNpcBouS_Delete__FPv */
 static int daNpcBouS_Delete(void* i_this) {
     return static_cast<daNpcBouS_c*>(i_this)->Delete();
 }
 
-/* 80976B88-80976BA8 003728 0020+00 1/0 0/0 0/0 .text            daNpcBouS_Execute__FPv */
 static int daNpcBouS_Execute(void* i_this) {
     return static_cast<daNpcBouS_c*>(i_this)->Execute();
 }
 
-/* 80976BA8-80976BC8 003748 0020+00 1/0 0/0 0/0 .text            daNpcBouS_Draw__FPv */
 static int daNpcBouS_Draw(void* i_this) {
     return static_cast<daNpcBouS_c*>(i_this)->Draw();
 }
 
-/* 80976BC8-80976BD0 003768 0008+00 1/0 0/0 0/0 .text            daNpcBouS_IsDelete__FPv */
 static int daNpcBouS_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80977AB8-80977AC0 004658 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcBouS_cFv */
 int daNpcBouS_c::drawDbgInfo() {
     #if DEBUG
     if (mHIO->m.common.debug_info_ON) {
@@ -1643,12 +1594,10 @@ int daNpcBouS_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80977AC0-80977AC4 004660 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpcBouS_cFv */
 void daNpcBouS_c::drawOtherMdls() {}
 
 AUDIO_INSTANCES;
 
-/* 80978A3C-80978A5C -00001 0020+00 1/0 0/0 0/0 .data            daNpcBouS_MethodTable */
 static actor_method_class daNpcBouS_MethodTable = {
     (process_method_func)daNpcBouS_Create,
     (process_method_func)daNpcBouS_Delete,
@@ -1657,7 +1606,6 @@ static actor_method_class daNpcBouS_MethodTable = {
     (process_method_func)daNpcBouS_Draw,
 };
 
-/* 80978A5C-80978A8C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_BOU_S */
 extern actor_process_profile_definition g_profile_NPC_BOU_S = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp
index 45418dfe1d..33ec805406 100644
--- a/src/d/actor/d_a_npc_cd.cpp
+++ b/src/d/actor/d_a_npc_cd.cpp
@@ -1,14 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: a/npc/d_a_npc_cd
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_cd.h"
 #include "d/actor/d_a_player.h"
 
-/* 80156010-8015605C 150950 004C+00 1/1 0/0 0/0 .text            jntNodeCallBack__FP8J3DJointi */
 static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -20,152 +14,122 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
     return 1;
 }
 
-/* 80392A18-80392A30 -00001 0018+00 2/1 0/0 0/0 .rodata          l_resMANa */
 static char* const l_resMANa[6] = {
     "MAN_a_L", "MAN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392A30-80392A48 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa */
 static char* const l_resMADa[6] = {
     "MAD_a_L", "MAD_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392A48-80392A60 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa */
 static char* const l_resMCNa[6] = {
     "MCN_a_L", "MCN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392A60-80392A78 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa */
 static char* const l_resMONa[6] = {
     "MON_a_L", "MON_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392A78-80392A90 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb */
 static char* const l_resMANb[6] = {
     "MAN_b_L", "MAN_b_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392A90-80392AA8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc */
 static char* const l_resMANc[6] = {
     "MAN_c_L", "MAN_c_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392AA8-80392AC0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa */
 static char* const l_resMASa[6] = {
     "MAS_a_L", "MAS_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392AC0-80392AD8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa */
 static char* const l_resMBNa[6] = {
     "MBN_a_L", "MBN_a_LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392AD8-80392AF0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANa2 */
 static char* const l_resMANa2[6] = {
     "MAN_a2_L", "MAN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392AF0-80392B08 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa2 */
 static char* const l_resMADa2[6] = {
     "MAD_a2_L", "MAD_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B08-80392B20 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa2 */
 static char* const l_resMCNa2[6] = {
     "MCN_a2_L", "MCN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B20-80392B38 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa2 */
 static char* const l_resMONa2[6] = {
     "MON_a2_L", "MON_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B38-80392B50 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb2 */
 static char* const l_resMANb2[6] = {
     "MAN_b2_L", "MAN_b2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B50-80392B68 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc2 */
 static char* const l_resMANc2[6] = {
     "MAN_c2_L", "MAN_c2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B68-80392B80 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa2 */
 static char* const l_resMASa2[6] = {
     "MAS_a2_L", "MAS_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B80-80392B98 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa2 */
 static char* const l_resMBNa2[6] = {
     "MBN_a2_L", "MBN_a2LTW", "Mgenral_l", "Mspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392B98-80392BB0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa */
 static char* const l_resWANa[6] = {
     "WAN_a_L", "WAN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392BB0-80392BC8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa */
 static char* const l_resWADa[6] = {
     "WAD_a_L", "WAD_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392BC8-80392BE0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa */
 static char* const l_resMATa[6] = {
     "MAT_a_L", "MAT_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392BE0-80392BF8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa */
 static char* const l_resWCNa[6] = {
     "WCN_a_L", "WCN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392BF8-80392C10 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa */
 static char* const l_resWONa[6] = {
     "WON_a_L", "WON_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C10-80392C28 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa */
 static char* const l_resWGNa[6] = {
     "WGN_a_L", "WGN_a_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C28-80392C40 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb */
 static char* const l_resWANb[6] = {
     "WAN_b_L", "WAN_b_LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C40-80392C58 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa2 */
 static char* const l_resWANa2[6] = {
     "WAN_a2_L", "WAN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C58-80392C70 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa2 */
 static char* const l_resWADa2[6] = {
     "WAD_a2_L", "WAD_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C70-80392C88 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa2 */
 static char* const l_resMATa2[6] = {
     "MAT_a2_L", "MAT_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392C88-80392CA0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa2 */
 static char* const l_resWCNa2[6] = {
     "WCN_a2_L", "WCN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392CA0-80392CB8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa2 */
 static char* const l_resWONa2[6] = {
     "WON_a2_L", "WON_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392CB8-80392CD0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa2 */
 static char* const l_resWGNa2[6] = {
     "WGN_a2_L", "WGN_a2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
 
-/* 80392CD0-80392CE8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb2 */
 static char* const l_resWANb2[6] = {
     "WAN_b2_L", "WAN_b2LTW", "Wgenral_l", "Wspcial_l", "object_l", "objectLTW",
 };
@@ -175,31 +139,26 @@ struct anmTblPrm {
     int resource_index;
 };
 
-/* 80392CE8-80392D30 -00001 0048+00 1/1 0/0 0/0 .rodata          l_objTbl */
 static anmTblPrm const l_objTbl[9] = {
     {"object_l", 6}, {"object_l", 6},  {"object_l", 5},  {"object_l", 3}, {"object_l", 7},
     {"object_l", 8}, {"object_l", -1}, {"object_l", -1}, {"object_l", 4},
 };
 
-/* 80392D30-80392D78 -00001 0048+00 1/1 0/0 0/0 .rodata          l_objTWTbl */
 static anmTblPrm const l_objTWTbl[9] = {
     {"objectLTW", 6}, {"objectLTW", 6},  {"objectLTW", 5},  {"objectLTW", 3}, {"objectLTW", 7},
     {"objectLTW", 8}, {"objectLTW", -1}, {"objectLTW", -1}, {"objectLTW", 4},
 };
 
-/* 80392D78-80392DC8 -00001 0050+00 1/1 0/0 0/0 .rodata          l_bckTbl_M */
 static anmTblPrm const l_bckTbl_M[10] = {
     {"Mgenral_l", 5}, {"Mgenral_l", 6}, {"Mgenral_l", 3}, {"Mgenral_l", 4}, {"Mspcial_l", 6},
     {"Mspcial_l", 7}, {"Mspcial_l", 8}, {"Mspcial_l", 3}, {"Mspcial_l", 4}, {"Mspcial_l", 5},
 };
 
-/* 80392DC8-80392E18 -00001 0050+00 1/1 0/0 0/0 .rodata          l_bckTbl_W */
 static anmTblPrm const l_bckTbl_W[10] = {
     {"Wgenral_l", 5}, {"Wgenral_l", 6}, {"Wgenral_l", 3}, {"Wgenral_l", 4}, {"Wspcial_l", 6},
     {"Wspcial_l", 7}, {"Wspcial_l", 8}, {"Wspcial_l", 3}, {"Wspcial_l", 4}, {"Wspcial_l", 5},
 };
 
-/* 80392E18-80392E5C 01F478 0044+00 0/0 0/0 1/1 .rodata          m_cylDat__9daNpcCd_c */
 dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}},  // mObj
@@ -214,7 +173,6 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = {
     }  // mCyl
 };
 
-/* 8015605C-801561E8 15099C 018C+00 0/0 0/0 1/1 .text            NpcCreate__9daNpcCd_cFi */
 int daNpcCd_c::NpcCreate(int param_1) {
     J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
 
@@ -267,7 +225,6 @@ int daNpcCd_c::NpcCreate(int param_1) {
     return 1;
 }
 
-/* 801561E8-80156228 150B28 0040+00 0/0 0/0 1/1 .text   ObjCreate__9daNpcCd_cFi */
 J3DModel* daNpcCd_c::ObjCreate(int param_0) {
     J3DModelData* modelData = getObjMdlDataP(param_0);
     if (modelData) {
@@ -276,14 +233,12 @@ J3DModel* daNpcCd_c::ObjCreate(int param_0) {
     return NULL;
 }
 
-/* 80156228-80156248 150B68 0020+00 1/1 0/0 0/0 .text   isM___9daNpcCd_cFv */
 BOOL daNpcCd_c::isM_() {
     // JUT_ASSERT(574, m_type < MdlNUM_e); // Not yet configured in DEBUG
 
     return m_type < 16;
 }
 
-/* 80156248-801563C8 150B88 0180+00 0/0 0/0 1/1 .text            getAnmP__9daNpcCd_cFii */
 J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) {
     int a_anmNum = param_1;
     switch (a_anmNum) {
@@ -359,7 +314,6 @@ J3DAnmTransform* daNpcCd_c::getAnmP(int param_1, int param_2) {
     return (J3DAnmTransform*)dComIfG_getObjectRes(anmTbl.arc_name, anmTbl.resource_index);
 }
 
-/* 803B3B8C-803B3C04 -00001 0078+00 2/2 0/0 0/0 .data            l_resNameTbl */
 static char* const* l_resNameTbl[30] = {
     l_resMANa,  l_resMADa,  l_resMCNa,  l_resMONa,  l_resMANb,  l_resMANc,  l_resMASa,  l_resMBNa,
     l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2,
@@ -367,7 +321,6 @@ static char* const* l_resNameTbl[30] = {
     l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
 };
 
-/* 803B3C04-803B3CF4 010D24 00F0+00 2/2 0/0 0/0 .data            l_bmdTbl */
 static anmTblPrm const l_bmdTbl[30] = {
     {l_resMANa[0], 3},  {l_resMADa[0], 3},  {l_resMCNa[0], 3},  {l_resMONa[0], 3},
     {l_resMANb[0], 3},  {l_resMANc[0], 3},  {l_resMASa[0], 3},  {l_resMBNa[0], 3},
@@ -379,7 +332,6 @@ static anmTblPrm const l_bmdTbl[30] = {
     {l_resWGNa2[0], 3}, {l_resWANb2[0], 3},
 };
 
-/* 803B3CF4-803B3DE4 010E14 00F0+00 2/2 0/0 0/0 .data            l_bmdTWTbl */
 static anmTblPrm const l_bmdTWTbl[30] = {
     {l_resMANa[1], 3},  {l_resMADa[1], 3},  {l_resMCNa[1], 3},  {l_resMONa[1], 3},
     {l_resMANb[1], 3},  {l_resMANc[1], 3},  {l_resMASa[1], 3},  {l_resMBNa[1], 3},
@@ -391,10 +343,8 @@ static anmTblPrm const l_bmdTWTbl[30] = {
     {l_resWGNa2[1], 3}, {l_resWANb2[1], 3},
 };
 
-/* 80425984-80428340 0526A4 29BC+00 2/3 0/0 4/4 .bss             l_Cd_HIO */
 daNpcCd_HIO_c l_Cd_HIO;
 
-/* 801563C8-80156B4C 150D08 0784+00 0/0 0/0 2/2 .text            setAttention__9daNpcCd_cFi */
 int daNpcCd_c::setAttention(int i_idx) {
     static cXyz const a_eyeOfsTbl[30] = {
         cXyz(0.0f, 10.0f, 0.0f), cXyz(0.0f, 10.0f, 0.0f), cXyz(0.0f, 10.0f, 0.0f),
@@ -415,7 +365,6 @@ int daNpcCd_c::setAttention(int i_idx) {
     return 1;
 }
 
-/* 80156B4C-80156C50 15148C 0104+00 0/0 0/0 1/1 .text            loadResrc__9daNpcCd_cFii */
 int daNpcCd_c::loadResrc(int param_0, int param_1) {
     int result = cPhs_COMPLEATE_e;
 
@@ -450,7 +399,6 @@ int daNpcCd_c::loadResrc(int param_0, int param_1) {
     return result;
 }
 
-/* 80156C50-80156D1C 151590 00CC+00 0/0 0/0 1/1 .text            removeResrc__9daNpcCd_cFii */
 int daNpcCd_c::removeResrc(int idx, int param_1) {
     if (mIsDarkWorld) {
         dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]);
@@ -464,20 +412,17 @@ int daNpcCd_c::removeResrc(int idx, int param_1) {
     return 1;
 }
 
-/* 80156D1C-80156D78 15165C 005C+00 0/0 0/0 1/1 .text            setEnvTevCol__9daNpcCd_cFv */
 void daNpcCd_c::setEnvTevCol() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
 }
 
-/* 80156D78-80156DBC 1516B8 0044+00 0/0 0/0 1/1 .text            setRoomNo__9daNpcCd_cFv */
 void daNpcCd_c::setRoomNo() {
     s8 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
     fopAcM_SetRoomNo(this, id);
     mStts.SetRoomId(id);
 }
 
-/* 80156DBC-80156E20 1516FC 0064+00 0/0 0/0 1/1 .text            animation__9daNpcCd_cFv */
 void daNpcCd_c::animation() {
     f32 lastframe = mpMorf->getFrame();
     mpMorf->play(0, 0);
@@ -486,8 +431,6 @@ void daNpcCd_c::animation() {
     }
 }
 
-/* 80156E20-80156E8C 151760 006C+00 0/0 0/0 1/1 .text setAnm__9daNpcCd_cFP18J3DAnmTransformKeyffiii
- */
 void daNpcCd_c::setAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_attr, int i_start,
                        int i_end) {
     if (i_anm != (J3DAnmTransformKey*)mpMorf->getAnm()) {
@@ -495,7 +438,6 @@ void daNpcCd_c::setAnm(J3DAnmTransformKey* i_anm, f32 i_rate, f32 i_morf, int i_
     }
 }
 
-/* 80156E8C-80156F74 1517CC 00E8+00 0/0 0/0 1/1 .text            drawObj__9daNpcCd_cFiP8J3DModelf */
 int daNpcCd_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
     static s32 const a_jntNumTbl[9] = {
         -1, 3, 5, 5, 3, 5, 3, 0, 0,
@@ -517,7 +459,6 @@ int daNpcCd_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
     return 1;
 }
 
-/* 80156F74-80157084 1518B4 0110+00 0/0 0/0 1/1 .text            drawNpc__9daNpcCd_cFv */
 int daNpcCd_c::drawNpc() {
     if (mIsDarkWorld && !daPy_py_c::checkNowWolfEyeUp()) {
         setHitodamaParticle();
@@ -544,7 +485,6 @@ int daNpcCd_c::drawNpc() {
     return 1;
 }
 
-/* 80157084-8015736C 1519C4 02E8+00 1/1 0/0 0/0 .text jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel */
 int daNpcCd_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
     J3DJoint* i_jnt_ = i_jnt;
     int jntNo = i_jnt_->getJntNo();
@@ -561,8 +501,6 @@ int daNpcCd_c::jntNodeCB(J3DJoint* i_jnt, J3DModel* i_model) {
     return 1;
 }
 
-/* 8015736C-80157524 151CAC 01B8+00 1/1 0/0 0/0 .text            setHitodamaParticle__9daNpcCd_cFv
- */
 void daNpcCd_c::setHitodamaParticle() {
     static const u16 id[2] = {
         0x8497,
@@ -597,7 +535,6 @@ void daNpcCd_c::setHitodamaParticle() {
     }
 }
 
-/* 80157524-80157588 151E64 0064+00 1/1 0/0 0/0 .text            getNpcMdlDataP__9daNpcCd_cFi */
 J3DModelData* daNpcCd_c::getNpcMdlDataP(int param_1) {
     const anmTblPrm* l_bmd;
     if (mIsDarkWorld) {
@@ -609,7 +546,6 @@ J3DModelData* daNpcCd_c::getNpcMdlDataP(int param_1) {
     return (J3DModelData*)dComIfG_getObjectRes(l_bmd->arc_name, l_bmd->resource_index);
 }
 
-/* 80157588-80157600 151EC8 0078+00 1/1 0/0 0/0 .text            getObjMdlDataP__9daNpcCd_cFi */
 J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) {
     J3DModelData* model_data = NULL;
     const anmTblPrm* def;
@@ -624,7 +560,6 @@ J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) {
     return model_data;
 }
 
-/* 80157600-801577A0 151F40 01A0+00 1/1 0/0 0/0 .text            __ct__13daNpcCd_HIO_cFv */
 daNpcCd_HIO_c::daNpcCd_HIO_c() {
     /* 803B3DE4-803B4CE4 010F04 0F00+00 0/1 0/0 0/0 .data            a_jntTbl_M$3905 */
     static u8 a_jntTbl_M[16][12][20] = {
diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp
index 6c4ec73ca9..6c09fb705d 100644
--- a/src/d/actor/d_a_npc_cd2.cpp
+++ b/src/d/actor/d_a_npc_cd2.cpp
@@ -1,17 +1,10 @@
-//
-// Generated By: dol2asm
-// Translation Unit: a/npc/d_a_npc_cd2
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_cd2.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_path.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80157CB4-80157D00 1525F4 004C+00 1/1 0/0 0/0 .text            jntNodeCallBack__FP8J3DJointi */
 static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
     if (param_1 == 0) {
         if (j3dSys.getModel()->getUserArea() != 0) {
@@ -21,152 +14,122 @@ static int jntNodeCallBack(J3DJoint* i_jnt, int param_1) {
     return 1;
 }
 
-/* 80393250-80393268 -00001 0018+00 2/1 0/0 0/0 .rodata          l_resMANa */
 static char* const l_resMANa[6] = {
     "MAN_a", "MAN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393268-80393280 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa */
 static char* const l_resMADa[6] = {
     "MAD_a", "MAD_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393280-80393298 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa */
 static char* const l_resMCNa[6] = {
     "MCN_a", "MCN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393298-803932B0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa */
 static char* const l_resMONa[6] = {
     "MON_a", "MON_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803932B0-803932C8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb */
 static char* const l_resMANb[6] = {
     "MAN_b", "MAN_b_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803932C8-803932E0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc */
 static char* const l_resMANc[6] = {
     "MAN_c", "MAN_c_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803932E0-803932F8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa */
 static char* const l_resMASa[6] = {
     "MAS_a", "MAS_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803932F8-80393310 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa */
 static char* const l_resMBNa[6] = {
     "MBN_a", "MBN_a_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393310-80393328 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANa2 */
 static char* const l_resMANa2[6] = {
     "MAN_a2", "MAN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393328-80393340 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa2 */
 static char* const l_resMADa2[6] = {
     "MAD_a2", "MAD_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393340-80393358 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa2 */
 static char* const l_resMCNa2[6] = {
     "MCN_a2", "MCN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393358-80393370 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa2 */
 static char* const l_resMONa2[6] = {
     "MON_a2", "MON_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393370-80393388 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb2 */
 static char* const l_resMANb2[6] = {
     "MAN_b2", "MAN_b2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 80393388-803933A0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc2 */
 static char* const l_resMANc2[6] = {
     "MAN_c2", "MAN_c2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803933A0-803933B8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa2 */
 static char* const l_resMASa2[6] = {
     "MAS_a2", "MAS_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803933B8-803933D0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa2 */
 static char* const l_resMBNa2[6] = {
     "MBN_a2", "MBN_a2_TW", "Mgeneral", "Mspecial", "object", "objectTW",
 };
 
-/* 803933D0-803933E8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa */
 static char* const l_resWANa[6] = {
     "WAN_a", "WAN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 803933E8-80393400 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa */
 static char* const l_resWADa[6] = {
     "WAD_a", "WAD_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393400-80393418 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa */
 static char* const l_resMATa[6] = {
     "MAT_a", "MAT_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393418-80393430 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa */
 static char* const l_resWCNa[6] = {
     "WCN_a", "WCN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393430-80393448 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa */
 static char* const l_resWONa[6] = {
     "WON_a", "WON_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393448-80393460 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa */
 static char* const l_resWGNa[6] = {
     "WGN_a", "WGN_a_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393460-80393478 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb */
 static char* const l_resWANb[6] = {
     "WAN_b", "WAN_b_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393478-80393490 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa2 */
 static char* const l_resWANa2[6] = {
     "WAN_a2", "WAN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393490-803934A8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa2 */
 static char* const l_resWADa2[6] = {
     "WAD_a2", "WAD_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 803934A8-803934C0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa2 */
 static char* const l_resMATa2[6] = {
     "MAT_a2", "MAT_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 803934C0-803934D8 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa2 */
 static char* const l_resWCNa2[6] = {
     "WCN_a2", "WCN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 803934D8-803934F0 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa2 */
 static char* const l_resWONa2[6] = {
     "WON_a2", "WON_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 803934F0-80393508 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa2 */
 static char* const l_resWGNa2[6] = {
     "WGN_a2", "WGN_a2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
 
-/* 80393508-80393520 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb2 */
 static char* const l_resWANb2[6] = {
     "WAN_b2", "WAN_b2_TW", "Wgeneral", "Wspecial", "object", "objectTW",
 };
@@ -176,21 +139,18 @@ struct anmTblPrm {
     int index;
 };
 
-/* 80393520-80393588 -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTbl */
-SECTION_RODATA static anmTblPrm const l_objTbl[13] = {
+static anmTblPrm const l_objTbl[13] = {
     {"object", 9},  {"object", 9},  {"object", 8},  {"object", 3}, {"object", 13},
     {"object", 14}, {"object", 12}, {"object", 6},  {"object", 7}, {"object", 10},
     {"object", 11}, {"object", 15}, {"object", 16},
 };
 
-/* 80393588-803935F0 -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTWTbl */
 static anmTblPrm const l_objTWTbl[13] = {
     {"objectTW", 9},  {"objectTW", 9},  {"objectTW", 8},  {"objectTW", 3}, {"objectTW", 13},
     {"objectTW", 14}, {"objectTW", 12}, {"objectTW", 6},  {"objectTW", 7}, {"objectTW", 10},
     {"objectTW", 11}, {"objectTW", -1}, {"objectTW", -1},
 };
 
-/* 803935F0-803937A0 -00001 01B0+00 1/1 0/0 0/0 .rodata          l_bckTbl_M */
 static anmTblPrm const l_bckTbl_M[54] = {
     {"Mgeneral", 26}, {"Mgeneral", 27}, {"Mgeneral", 29}, {"Mgeneral", 30}, {"Mgeneral", 8},
     {"Mgeneral", 9},  {"Mgeneral", 20}, {"Mgeneral", 21}, {"Mgeneral", 23}, {"Mgeneral", 5},
@@ -205,8 +165,7 @@ static anmTblPrm const l_bckTbl_M[54] = {
     {"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", -1}, {"Mgeneral", 10},
 };
 
-/* 803937A0-80393950 -00001 01B0+00 1/1 0/0 0/0 .rodata          l_bckTbl_W */
-SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = {
+static anmTblPrm const l_bckTbl_W[54] = {
     {"Wgeneral", 31}, {"Wgeneral", 32}, {"Wgeneral", 34}, {"Wgeneral", 35}, {"Wgeneral", 13},
     {"Wgeneral", 14}, {"Wgeneral", 25}, {"Wgeneral", 26}, {"Wgeneral", 28}, {"Wgeneral", 10},
     {"Wgeneral", 11}, {"Wgeneral", 33}, {"Wgeneral", 29}, {"Wgeneral", 27}, {"Wgeneral", 22},
@@ -220,7 +179,6 @@ SECTION_RODATA static anmTblPrm const l_bckTbl_W[54] = {
     {"Wgeneral", 5},  {"Wgeneral", 6},  {"Wgeneral", 9},  {"Wgeneral", 15},
 };
 
-/* 80393950-80393994 01FFB0 0044+00 0/0 0/0 4/4 .rodata          m_cylDat__10daNpcCd2_c */
 dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0, 0}, 0x79}}, // mObj
@@ -235,7 +193,6 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = {
     } // mCyl
 };
 
-/* 80393994-80393AFC 01FFF4 0168+00 1/1 0/0 0/0 .rodata          a_transScaleTbl$3998 */
 static Vec const a_transScaleTbl[30] = {
     {1.0f, 1.0f, 1.0f},        {1.0f, 1.1983438f, 2.173357f},
     {1.0f, 0.5581154f, 1.0f},  {1.0f, 0.95, 1.0f},
@@ -254,7 +211,6 @@ static Vec const a_transScaleTbl[30] = {
     {1.0f, 0.8630768f, 1.0f},  {1.0f, 1.0529536f, 1.0f},
 };
 
-/* 80157D00-80157F28 152640 0228+00 0/0 0/0 4/4 .text            NpcCreate__10daNpcCd2_cFi */
 int daNpcCd2_c::NpcCreate(int param_1) {
     J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1);
     JUT_ASSERT(590, NULL != a_mdlData_p);
@@ -295,7 +251,6 @@ int daNpcCd2_c::NpcCreate(int param_1) {
     return 1;
 }
 
-/* 80157F28-80157F68 152868 0040+00 0/0 0/0 4/4 .text            ObjCreate__10daNpcCd2_cFi */
 J3DModel* daNpcCd2_c::ObjCreate(int param_0) {
     J3DModel* model;
     J3DModelData* modelData = getObjMdlDataP(param_0);
@@ -307,7 +262,6 @@ J3DModel* daNpcCd2_c::ObjCreate(int param_0) {
     return model;
 }
 
-/* 80157F68-801580A8 1528A8 0140+00 0/0 0/0 1/1 .text            ChairCreate__10daNpcCd2_cFf */
 J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) {
     const char* resName = (mIsDarkWorld) ?  "objectTW" :  "object";
     int resIndex = isM_() ? ((mIsDarkWorld != 0) ? 4 : 4) : ((mIsDarkWorld != 0) ? 5 : 5);
@@ -328,7 +282,6 @@ J3DModel* daNpcCd2_c::ChairCreate(f32 param_1) {
     return NULL;
 }
 
-/* 801580A8-801580F0 1529E8 0048+00 4/4 0/0 5/5 .text            isM___10daNpcCd2_cFv */
 bool daNpcCd2_c::isM_() {
     if (mpMorf == NULL) {
         return m_type < 16;
@@ -338,7 +291,6 @@ bool daNpcCd2_c::isM_() {
     return a_jntNum == JntM_NUM_e;
 }
 
-/* 803B61CC-803B6244 -00001 0078+00 2/2 0/0 0/0 .data            l_resNameTbl */
 static char* const* l_resNameTbl[30] = {
     l_resMANa,  l_resMADa,  l_resMCNa,  l_resMONa,  l_resMANb,  l_resMANc,  l_resMASa,  l_resMBNa,
     l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2,
@@ -346,7 +298,6 @@ static char* const* l_resNameTbl[30] = {
     l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2,
 };
 
-/* 803B6244-803B6334 013364 00F0+00 1/2 0/0 0/0 .data            l_bmdTbl */
 static anmTblPrm const l_bmdTbl[30] = {
     l_resMANa[0],  3, l_resMADa[0],  3, l_resMCNa[0],  4, l_resMONa[0],  4, l_resMANb[0],  3,
     l_resMANc[0],  4, l_resMASa[0],  4, l_resMBNa[0],  4, l_resMANa2[0], 4, l_resMADa2[0], 4,
@@ -356,7 +307,6 @@ static anmTblPrm const l_bmdTbl[30] = {
     l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4,
 };
 
-/* 803B6334-803B6424 013454 00F0+00 1/2 0/0 0/0 .data            l_bmdTWTbl */
 static anmTblPrm const l_bmdTWTbl[30] = {
     l_resMANa[1],  3, l_resMADa[1],  3, l_resMCNa[1],  4, l_resMONa[1],  4, l_resMANb[1],  3,
     l_resMANc[1],  4, l_resMASa[1],  4, l_resMBNa[1],  4, l_resMANa2[1], 4, l_resMADa2[1], 3,
@@ -366,7 +316,6 @@ static anmTblPrm const l_bmdTWTbl[30] = {
     l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4,
 };
 
-/* 803B6424-803B6514 013544 00F0+00 1/2 0/0 0/0 .data            l_btpTbl */
 static anmTblPrm const l_btpTbl[30] = {
     l_resMANa[0],  -1, l_resMADa[0],  -1, l_resMCNa[0],  7, l_resMONa[0],  7, l_resMANb[0],  -1,
     l_resMANc[0],  7, l_resMASa[0],  7, l_resMBNa[0],  7, l_resMANa2[0], 7, l_resMADa2[0], 7,
@@ -376,7 +325,6 @@ static anmTblPrm const l_btpTbl[30] = {
     l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7,
 };
 
-/* 803B6514-803B6604 013634 00F0+00 1/2 0/0 0/0 .data            l_btpTWTbl */
 static anmTblPrm const l_btpTWTbl[30] = {
     l_resMANa[1],  -1, l_resMADa[1],  -1, l_resMCNa[1],  7, l_resMONa[1],  7, l_resMANb[1],  -1,
     l_resMANc[1],  7, l_resMASa[1],  7, l_resMBNa[1],  7, l_resMANa2[1], 7, l_resMADa2[1], -1,
@@ -388,7 +336,6 @@ static anmTblPrm const l_btpTWTbl[30] = {
 
 // TODO: these four tables should be converted into proper structs instead of byte arrays
 
-/* 803B6604-803B7DC4 013724 17C0+00 0/1 0/0 0/0 .data            a_jntTbl_M$3910 */
 #pragma push
 #pragma force_active on
 static u8 a_jntTbl_M[16][19][20] = {
@@ -775,7 +722,6 @@ static u8 a_jntTbl_M[16][19][20] = {
 };
 #pragma pop
 
-/* 803B7DC4-803B81C4 014EE4 0400+00 0/1 0/0 0/0 .data            a_prmTbl_M$3911 */
 #pragma push
 #pragma force_active on
 static u8 a_prmTbl_M[1024] = {
@@ -846,7 +792,6 @@ static u8 a_prmTbl_M[1024] = {
 };
 #pragma pop
 
-/* 803B81C4-803B98BC 0152E4 16F8+00 0/1 0/0 0/0 .data            a_jntTbl_W$3912 */
 #pragma push
 #pragma force_active on
 static u8 a_jntTbl_W[14][21][20] = {
@@ -1221,7 +1166,6 @@ static u8 a_jntTbl_W[14][21][20] = {
 };
 #pragma pop
 
-/* 803B98BC-803B9C3C 0169DC 0380+00 0/1 0/0 0/0 .data            a_prmTbl_W$3913 */
 #pragma push
 #pragma force_active on
 static u8 a_prmTbl_W[896] = {
@@ -1284,7 +1228,6 @@ static u8 a_prmTbl_W[896] = {
 };
 #pragma pop
 
-/* 801580F0-80158420 152A30 0330+00 2/0 0/0 93/93 .text            getAnmP__10daNpcCd2_cFii */
 J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
     int a_anmNum = param_1;
     switch (a_anmNum) {
@@ -1545,14 +1488,10 @@ J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) {
     return (J3DAnmTransform*)dComIfG_getObjectRes(name, index);
 }
 
-/* ############################################################################################## */
-/* 80428610-8042861C 055330 000C+00 2/2 0/0 0/0 .bss             @3982 */
 //static u8 lit_3982[12];
 
-/* 8042861C-8042C628 05533C 400C+00 2/3 0/0 20/20 .bss             l_Cd2_HIO */
 daNpcCd2_HIO_c l_Cd2_HIO;
 
-/* 80158420-80158BB8 152D60 0798+00 0/0 0/0 5/5 .text   setAttention__10daNpcCd2_cFi */
 int daNpcCd2_c::setAttention(int param_1) {
     static cXyz a_eyeOfsTbl[30] = {
         cXyz(0.0f, 10.0f, 0.0f),
@@ -1594,7 +1533,6 @@ int daNpcCd2_c::setAttention(int param_1) {
     return 1;
 }
 
-/* 80158BB8-80158CBC 1534F8 0104+00 0/0 0/0 4/4 .text   loadResrc__10daNpcCd2_cFii */
 int daNpcCd2_c::loadResrc(int idx, int param_1) {
     int result;
     if (mIsDarkWorld) {
@@ -1627,7 +1565,6 @@ int daNpcCd2_c::loadResrc(int idx, int param_1) {
     return result;
 }
 
-/* 80158CBC-80158D88 1535FC 00CC+00 0/0 0/0 4/4 .text   removeResrc__10daNpcCd2_cFii */
 int daNpcCd2_c::removeResrc(int idx, int param_1) {
     if (mIsDarkWorld) {
         dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]);
@@ -1641,20 +1578,17 @@ int daNpcCd2_c::removeResrc(int idx, int param_1) {
     return 1;
 }
 
-/* 80158D88-80158DE4 1536C8 005C+00 0/0 0/0 4/4 .text   setEnvTevCol__10daNpcCd2_cFv */
 void daNpcCd2_c::setEnvTevCol() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
 }
 
-/* 80158DE4-80158E28 153724 0044+00 0/0 0/0 4/4 .text   setRoomNo__10daNpcCd2_cFv */
 void daNpcCd2_c::setRoomNo() {
     s32 id = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd);
     fopAcM_SetRoomNo(this, id);
     mStts.SetRoomId(id);
 }
 
-/* 80158E28-80158F00 153768 00D8+00 0/0 0/0 3/3 .text            animation__10daNpcCd2_cFi */
 void daNpcCd2_c::animation(int param_1) {
     if (mpBtpAnm != NULL && cLib_calcTimer(&field_0xaa4) == 0) {
         field_0xac4++;
@@ -1670,8 +1604,6 @@ void daNpcCd2_c::animation(int param_1) {
     }
 }
 
-/* 80158F00-80158F6C 153840 006C+00 0/0 0/0 92/92 .text
- * setAnm__10daNpcCd2_cFP18J3DAnmTransformKeyffiii              */
 void daNpcCd2_c::setAnm(J3DAnmTransformKey* param_1, f32 param_2, f32 param_3, int param_4,
                         int param_5, int param_6) {
     if (param_1 != mpMorf->getAnm()) {
@@ -1679,7 +1611,6 @@ void daNpcCd2_c::setAnm(J3DAnmTransformKey* param_1, f32 param_2, f32 param_3, i
     }
 }
 
-/* 80158F6C-80158FF0 1538AC 0084+00 0/0 0/0 4/4 .text            drawShadow__10daNpcCd2_cFf */
 int daNpcCd2_c::drawShadow(f32 param_0) {
     if (mIsDarkWorld && !daPy_py_c::checkNowWolfEyeUp()) {
         return 1;
@@ -1690,14 +1621,11 @@ int daNpcCd2_c::drawShadow(f32 param_0) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80393B08-80393B70 020168 0068+00 1/1 0/0 0/0 .rodata          a_jntNumTbl$4692 */
 static s32 const a_jntNumTbl[13][2] = {
     {-1, -1}, {7, -1}, {11, -1}, {-1, 11}, {7, -1},  {-1, 11}, {1, -1},
     {-1, 11}, {-1, 7}, {10, -1}, {-1, 11}, {10, -1}, {-1, 11},
 };
 
-/* 80158FF0-801590FC 153930 010C+00 0/0 0/0 4/4 .text   drawObj__10daNpcCd2_cFiP8J3DModelf */
 int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
     if (i_model == NULL) {
         return 0;
@@ -1717,7 +1645,6 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) {
     return 1;
 }
 
-/* 801590FC-80159258 153A3C 015C+00 0/0 0/0 4/4 .text            drawNpc__10daNpcCd2_cFv */
 int daNpcCd2_c::drawNpc() {
     if (mIsDarkWorld) {
         g_env_light.settingTevStruct(4, &current.pos, &tevStr);
@@ -1805,8 +1732,6 @@ static inline s16 Cd2_HIO_jntRX(int param_1, int param_2) {
     return 182.04444885253906f * rv;
 }
 
-/* 80159258-80159550 153B98 02F8+00 1/1 0/0 0/0 .text jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel
- */
 int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) {
     int jntNo = param_1->getJntNo();
     cXyz cStack_3c(Cd2_HIO_jntTX(m_type, jntNo), Cd2_HIO_jntTY(m_type, jntNo), Cd2_HIO_jntTZ(m_type, jntNo));
@@ -1822,8 +1747,6 @@ int daNpcCd2_c::jntNodeCB(J3DJoint* param_1, J3DModel* param_2) {
     return 1;
 }
 
-/* 80159550-80159708 153E90 01B8+00 1/1 0/0 0/0 .text            setHitodamaParticle__10daNpcCd2_cFv
- */
 void daNpcCd2_c::setHitodamaParticle() {
     static const u16 id[2] = {
         0x8497,
@@ -1854,17 +1777,12 @@ void daNpcCd2_c::setHitodamaParticle() {
     }
 }
 
-/* ############################################################################################## */
-/* 80451004-80451008 000504 0004+00 2/2 0/0 0/0 .sbss            target */
 static void* target;
 
-/* 80451008-8045100C 000508 0004+00 1/1 0/0 0/0 .sbss            targetWay */
 static f32 targetWay;
 
-/* 8045100C-80451010 00050C 0002+02 2/2 0/0 0/0 .sbss            wolfAngle */
 static s16 wolfAngle;
 
-/* 80159708-801597C0 154048 00B8+00 1/1 0/0 0/0 .text            s_sub1__FPvPv */
 static void* s_sub1(void* param_0, void* param_1) {
     if (fopAc_IsActor(param_0) && fopAcM_GetName(param_0) == 0x28A) {
         s16 angle = fopAcM_searchActorAngleY((fopAc_ac_c*)param_1, (fopAc_ac_c*)param_0);
@@ -1884,7 +1802,6 @@ static void* s_sub1(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 801597C0-80159818 154100 0058+00 0/0 0/0 2/2 .text            getEscapeTag__10daNpcCd2_cFv */
 daTagEscape_c* daNpcCd2_c::getEscapeTag() {
     target = NULL;
     wolfAngle = fopAcM_searchPlayerAngleY(this);
@@ -1892,8 +1809,6 @@ daTagEscape_c* daNpcCd2_c::getEscapeTag() {
     return (daTagEscape_c*)target;
 }
 
-/* 80159818-801598E8 154158 00D0+00 0/0 0/0 5/5 .text            checkFearSituation__10daNpcCd2_cFv
- */
 bool daNpcCd2_c::checkFearSituation() {
     f32 dVar10 =
         fopAcM_GetPosition_p(this)->y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y;
@@ -1903,7 +1818,6 @@ bool daNpcCd2_c::checkFearSituation() {
         fopAcM_searchPlayerDistanceXZ2(this) < std::pow(500.0f, 2.0f);
 }
 
-/* 801598E8-8015994C 154228 0064+00 1/1 0/0 0/0 .text            getNpcMdlDataP__10daNpcCd2_cFi */
 J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
     const anmTblPrm* def;
     if (mIsDarkWorld) {
@@ -1914,7 +1828,6 @@ J3DModelData* daNpcCd2_c::getNpcMdlDataP(int param_1) {
     return (J3DModelData*)dComIfG_getObjectRes(def->name, def->index);
 }
 
-/* 8015994C-801599C4 15428C 0078+00 1/1 0/0 0/0 .text            getObjMdlDataP__10daNpcCd2_cFi */
 J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
     J3DModelData* model_data = NULL;
     const anmTblPrm* def;
@@ -1929,7 +1842,6 @@ J3DModelData* daNpcCd2_c::getObjMdlDataP(int param_1) {
      return model_data;
 }
 
-/* 801599C4-80159A38 154304 0074+00 1/1 0/0 0/0 .text            getTexAnmP__10daNpcCd2_cFi */
 J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) {
     const anmTblPrm* def;
     if (mIsDarkWorld) {
@@ -1943,8 +1855,6 @@ J3DAnmTexPattern* daNpcCd2_c::getTexAnmP(int param_1) {
      return NULL;
 }
 
-/* 80159A38-80159C14 154378 01DC+00 0/0 0/0 9/9 .text            setPath__11PathTrace_cFiiiP4cXyzb
- */
 bool PathTrace_c::setPath(int param_1, int param_2, int param_3, cXyz* param_4, bool param_5) {
     mPath = NULL;
     mPath = dPath_GetRoomPath(param_1, param_2);
@@ -1970,7 +1880,6 @@ bool PathTrace_c::setPath(int param_1, int param_2, int param_3, cXyz* param_4,
     return TRUE;
 }
 
-/* 80159C14-80159DC0 154554 01AC+00 1/1 0/0 6/6 .text            checkPoint__11PathTrace_cF4cXyzf */
 bool PathTrace_c::checkPoint(cXyz param_1, f32 param_2) {
     dPnt* pnt = dPath_GetPnt(mPath, field_0x20);
     f32 dist = param_1.absXZ(pnt->m_position);
@@ -1982,8 +1891,6 @@ bool PathTrace_c::checkPoint(cXyz param_1, f32 param_2) {
     return mNextPoint < 0.0f;
 }
 
-/* 80159DC0-80159E54 154700 0094+00 0/0 0/0 6/6 .text            checkPathEnd__11PathTrace_cF4cXyzf
- */
 bool PathTrace_c::checkPathEnd(cXyz param_1, f32 param_2) {
     if (checkPoint(param_1, param_2)) {
         if (field_0x24 > 0) {
@@ -1997,7 +1904,6 @@ bool PathTrace_c::checkPathEnd(cXyz param_1, f32 param_2) {
     return false;
 }
 
-/* 80159E54-80159ECC 154794 0078+00 0/0 0/0 10/10 .text getTargetPoint__11PathTrace_cFP3Vec */
 void PathTrace_c::getTargetPoint(Vec* targetPoint) {
     if (mObstacle == NULL) {
         dPnt* pnt = dPath_GetPnt(mPath, field_0x20);
@@ -2007,7 +1913,6 @@ void PathTrace_c::getTargetPoint(Vec* targetPoint) {
     }
 }
 
-/* 80159ECC-80159F98 15480C 00CC+00 1/1 0/0 0/0 .text            setAvoidPoint__11PathTrace_cFv */
 void PathTrace_c::setAvoidPoint() {
     JUT_ASSERT(1602, mPath != NULL);
     JUT_ASSERT(1603, mMyself != NULL);
@@ -2029,14 +1934,11 @@ void PathTrace_c::setAvoidPoint() {
     mDoMtx_stack_c::multVec(&mAvoidPoint, &mAvoidPoint);
 }
 
-/* 80159F98-8015A0D0 1548D8 0138+00 0/0 0/0 8/8 .text            setNextPoint__11PathTrace_cFR4cXyz
- */
 void PathTrace_c::setNextPoint(cXyz& param_1) {
     setNextPoint();
     mNextPoint = param_1.abs(dPath_GetPnt(mPath, field_0x20)->m_position);
 }
 
-/* 8015A0D0-8015A264 154A10 0194+00 1/1 0/0 0/0 .text            setNextPoint__11PathTrace_cFv */
 void PathTrace_c::setNextPoint() {
     dPnt* pnt1 = dPath_GetPnt(mPath, field_0x20);
     if (field_0x24 > 0) {
@@ -2050,7 +1952,6 @@ void PathTrace_c::setNextPoint() {
     mNextPoint = G_CM3D_F_INF;
 }
 
-/* 8015A264-8015A294 154BA4 0030+00 1/1 0/0 0/0 .text            incIndex__11PathTrace_cFi */
 int PathTrace_c::incIndex(int param_1) {
     if (++param_1 < mPath->m_num) {
         return param_1;
@@ -2062,7 +1963,6 @@ int PathTrace_c::incIndex(int param_1) {
     }
 }
 
-/* 8015A294-8015A2C4 154BD4 0030+00 1/1 0/0 0/0 .text            decIndex__11PathTrace_cFi */
 int PathTrace_c::decIndex(int param_1) {
     int rv = param_1 - 1;
     if (rv < 0) {
@@ -2075,7 +1975,6 @@ int PathTrace_c::decIndex(int param_1) {
     return rv;
 }
 
-/* 8015A2C4-8015A370 154C04 00AC+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) &&
         ((fopAcM_GetName(param_1) == PROC_ALINK && !dKy_darkworld_check()) ||
@@ -2090,7 +1989,6 @@ static void* s_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 8015A370-8015A3E4 154CB0 0074+00 0/0 0/0 4/4 .text checkObstacle__11PathTrace_cFP10fopAc_ac_c */
 fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
     mMyself = param_0;
     mObstacle = NULL;
@@ -2104,8 +2002,6 @@ fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) {
     return mObstacle;
 }
 
-/* 8015A3E4-8015A4D8 154D24 00F4+00 1/1 0/0 0/0 .text
- * checkObstacleSub__11PathTrace_cFP10fopAc_ac_c                */
 void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) {
     if (mMyself != pObstacle) {
         JUT_ASSERT(1816, mPath != NULL);
@@ -2133,7 +2029,6 @@ void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) {
     }
 }
 
-/* 8015A4D8-8015A678 154E18 01A0+00 1/1 0/0 0/0 .text            __ct__14daNpcCd2_HIO_cFv */
 daNpcCd2_HIO_c::daNpcCd2_HIO_c() {
     for (int i = 0; i < 16; i++) {
         for (int j = 0; j < 19; j++) {
diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp
index 5bc4306d42..a2c13ef36e 100644
--- a/src/d/actor/d_a_npc_cdn3.cpp
+++ b/src/d/actor/d_a_npc_cdn3.cpp
@@ -9,11 +9,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_s_play.h"
 
-//
-// Declarations:
-//
-
-/* 8097F788-8097F848 0000E0 00C0+00 1/2 0/0 0/0 .data            ActionTable__11daNpcCdn3_c */
 const daNpcCdn3_c::ActionPair daNpcCdn3_c::ActionTable[8] = {
     {&daNpcCdn3_c::initWait, &daNpcCdn3_c::executeWait},
     {&daNpcCdn3_c::initPath, &daNpcCdn3_c::executePath},
@@ -50,15 +45,11 @@ int daNpcCdn3_c::createHeap() {
     return rv;
 }
 
-/* 80978CD8-80978DD4 000078 00FC+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c
- */
 static int createHeapCallBack(fopAc_ac_c* param_0) {
     daNpcCdn3_c* npc = (daNpcCdn3_c*)param_0;
     return npc->createHeap();
 }
 
-/* 80978DD4-80978E18 000174 0044+00 9/9 0/0 0/0 .text
- * setAction__11daNpcCdn3_cFQ211daNpcCdn3_c6Mode_e              */
 void daNpcCdn3_c::setAction(daNpcCdn3_c::Mode_e i_action) {
     JUT_ASSERT(366, i_action < MODE_MAX_e);
     mPrevMode = mMode;
@@ -67,19 +58,16 @@ void daNpcCdn3_c::setAction(daNpcCdn3_c::Mode_e i_action) {
     callInit();
 }
 
-/* 80978E18-80978E40 0001B8 0028+00 1/1 0/0 0/0 .text            callInit__11daNpcCdn3_cFv */
 void daNpcCdn3_c::callInit() {
     JUT_ASSERT(408, mAction != NULL);
     (this->*(mAction[0]))();
 }
 
-/* 80978E40-80978E6C 0001E0 002C+00 1/1 0/0 0/0 .text            callExecute__11daNpcCdn3_cFv */
 void daNpcCdn3_c::callExecute() {
     JUT_ASSERT(421, mAction != NULL);
     (this->*(mAction[1]))();
 }
 
-/* 80978E6C-80978ED0 00020C 0064+00 1/0 0/0 0/0 .text            initWait__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initWait() {
     speedF = 0.0f;
     m_seqStep = 0;
@@ -87,7 +75,6 @@ void daNpcCdn3_c::initWait() {
     (this->*(m_funcTbl[m_seqNum][m_seqStep]))(NULL);
 }
 
-/* 80978ED0-80979080 000270 01B0+00 1/0 0/0 0/0 .text            executeWait__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeWait() {
     if ((this->*(m_funcTbl[m_seqNum][m_seqStep]))(NULL) != 0) {
         m_seqStep = (m_funcTbl[m_seqNum][m_seqStep + 1] == NULL) ? 0 : m_seqStep + 1;
@@ -110,7 +97,6 @@ void daNpcCdn3_c::executeWait() {
     }
 }
 
-/* 80979080-80979144 000420 00C4+00 1/0 0/0 0/0 .text            initPath__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initPath() {
     setAnm((J3DAnmTransformKey*) getAnmP(2, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xb68 = 2;
@@ -125,7 +111,6 @@ void daNpcCdn3_c::initPath() {
     }
 }
 
-/* 80979144-809799B0 0004E4 086C+00 1/0 0/0 0/0 .text            executePath__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executePath() {
     if (m_path.isPath()) {
         switch (field_0xb98) {
@@ -270,7 +255,6 @@ void daNpcCdn3_c::executePath() {
     }
 }
 
-/* 80979A34-80979B2C 000DD4 00F8+00 1/0 0/0 0/0 .text            initTalk__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initTalk() {
     field_0xb68 = 0;
     m_targetAct.entry(dComIfGp_getLinkPlayer());
@@ -287,7 +271,6 @@ void daNpcCdn3_c::initTalk() {
     field_0xb98 = 0;
 }
 
-/* 80979B2C-80979F08 000ECC 03DC+00 1/0 0/0 0/0 .text            executeTalk__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeTalk() {
     if (mpMorf->getAnm() == getAnmP(47,mObjNum)) {
         if (m_type == 17) {
@@ -364,7 +347,6 @@ void daNpcCdn3_c::executeTalk() {
     }
 }
 
-/* 80979F08-8097A028 0012A8 0120+00 1/0 0/0 0/0 .text            initEscape__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initEscape() {
     mEscapeTag = getEscapeTag();
     JUT_ASSERT(816, mEscapeTag != NULL);
@@ -385,7 +367,6 @@ void daNpcCdn3_c::initEscape() {
     dComIfGs_onSaveDunSwitch(0x3c);
 }
 
-/* 8097F848-8097F8F8 -00001 00B0+00 5/5 0/0 0/0 .data            m_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = {
     m_seq00_funcTbl, m_seq01_funcTbl,
     m_seq02_funcTbl, m_seq03_funcTbl,
@@ -411,33 +392,24 @@ daNpcCdn3_c::seqFunc* daNpcCdn3_c::m_funcTbl[44] = {
     m_seq42_funcTbl, m_seq43_funcTbl,
 };
 
-/* 8097F904-8097F91C 00025C 0018+00 1/1 0/0 0/0 .data            m_seq00_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq00_funcTbl[2] = {&daNpcCdn3_c::walka, NULL};
 
-/* 8097F928-8097F940 000280 0018+00 1/1 0/0 0/0 .data            m_seq01_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq01_funcTbl[2] = {&daNpcCdn3_c::runa, NULL};
 
-/* 8097F94C-8097F964 0002A4 0018+00 1/1 0/0 0/0 .data            m_seq02_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq02_funcTbl[2] = {&daNpcCdn3_c::waita, NULL};
 
-/* 8097F970-8097F988 0002C8 0018+00 1/1 0/0 0/0 .data            m_seq03_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq03_funcTbl[2] = {&daNpcCdn3_c::talka, NULL};
 
-/* 8097F994-8097F9AC 0002EC 0018+00 1/1 0/0 0/0 .data            m_seq04_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq04_funcTbl[2] = {&daNpcCdn3_c::runb, NULL};
 
-/* 8097F9D0-8097FA00 000328 0030+00 1/1 0/0 0/0 .data            m_seq05_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq05_funcTbl[4] = {&daNpcCdn3_c::turnr, &daNpcCdn3_c::waita,
                                                         &daNpcCdn3_c::talka, NULL};
 
-/* 8097FA24-8097FA54 00037C 0030+00 1/1 0/0 0/0 .data            m_seq06_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq06_funcTbl[4] = {&daNpcCdn3_c::turnl, &daNpcCdn3_c::waita,
                                                         &daNpcCdn3_c::talka, NULL};
 
-/* 8097FA60-8097FA78 0003B8 0018+00 1/1 0/0 0/0 .data            m_seq07_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq07_funcTbl[2] = {&daNpcCdn3_c::waitwall, NULL};
 
-/* 8097FAC0-8097FB14 000418 0054+00 1/1 0/0 0/0 .data            m_seq08_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = {
     &daNpcCdn3_c::talkwall,
     &daNpcCdn3_c::waitwall,
@@ -448,32 +420,24 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq08_funcTbl[7] = {
     NULL,
 };
 
-/* 8097FB20-8097FB38 000478 0018+00 1/1 0/0 0/0 .data            m_seq09_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq09_funcTbl[2] = {&daNpcCdn3_c::talkb, NULL};
 
-/* 8097FB44-8097FB5C 00049C 0018+00 1/1 0/0 0/0 .data            m_seq10_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq10_funcTbl[2] = {&daNpcCdn3_c::talkc, NULL};
 
-/* 8097FB98-8097FBE0 0004F0 0048+00 1/1 0/0 0/0 .data            m_seq11_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq11_funcTbl[6] = {&daNpcCdn3_c::talka, &daNpcCdn3_c::waita,
                                                         &daNpcCdn3_c::talkb, &daNpcCdn3_c::waitb,
                                                         &daNpcCdn3_c::talkc, NULL};
 
-/* 8097FBEC-8097FC04 000544 0018+00 1/1 0/0 0/0 .data            m_seq12_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq12_funcTbl[2] = {&daNpcCdn3_c::waitb, NULL};
 
-/* 8097FC40-8097FC88 000598 0048+00 1/1 0/0 0/0 .data            m_seq13_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq13_funcTbl[6] = {
     &daNpcCdn3_c::browsea, &daNpcCdn3_c::browseb, &daNpcCdn3_c::talka,
     &daNpcCdn3_c::talkb,   &daNpcCdn3_c::waita,   NULL};
 
-/* 8097FC94-8097FCAC 0005EC 0018+00 1/1 0/0 0/0 .data            m_seq14_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq14_funcTbl[2] = {&daNpcCdn3_c::walkb, NULL};
 
-/* 8097FCB8-8097FCD0 000610 0018+00 1/1 0/0 0/0 .data            m_seq15_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq15_funcTbl[2] = {&daNpcCdn3_c::sitwaita, NULL};
 
-/* 8097FD18-8097FD6C 000670 0054+00 1/1 0/0 0/0 .data            m_seq16_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = {
     &daNpcCdn3_c::sittalka,
     &daNpcCdn3_c::sitwaita,
@@ -484,16 +448,13 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq16_funcTbl[7] = {
     NULL,
 };
 
-/* 8097FD78-8097FD90 0006D0 0018+00 1/1 0/0 0/0 .data            m_seq17_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq17_funcTbl[2] = {
     &daNpcCdn3_c::playm,
     NULL,
 };
 
-/* 8097FD9C-8097FDB4 0006F4 0018+00 1/1 0/0 0/0 .data            m_seq18_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq18_funcTbl[2] = {&daNpcCdn3_c::sitwaitb, NULL};
 
-/* 8097FDFC-8097FE50 000754 0054+00 1/1 0/0 0/0 .data            m_seq19_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = {
     &daNpcCdn3_c::sittalkb,
     &daNpcCdn3_c::sitwaitb,
@@ -504,17 +465,13 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq19_funcTbl[7] = {
     NULL,
 };
 
-/* 8097FE5C-8097FE74 0007B4 0018+00 1/1 0/0 0/0 .data            m_seq20_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq20_funcTbl[2] = {&daNpcCdn3_c::looka, NULL};
 
-/* 8097FE80-8097FE98 0007D8 0018+00 1/1 0/0 0/0 .data            m_seq21_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq21_funcTbl[2] = {&daNpcCdn3_c::lookb, NULL};
 
-/* 8097FEBC-8097FEEC 000814 0030+00 1/1 0/0 0/0 .data            m_seq22_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq22_funcTbl[4] = {&daNpcCdn3_c::looka, &daNpcCdn3_c::lookb,
                                                         &daNpcCdn3_c::waita, NULL};
 
-/* 8097FF34-8097FF88 00088C 0054+00 1/1 0/0 0/0 .data            m_seq23_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = {
     &daNpcCdn3_c::talka,
     &daNpcCdn3_c::waita,
@@ -525,12 +482,10 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq23_funcTbl[7] = {
     NULL,
 };
 
-/* 8097FFB8-8097FFF4 000910 003C+00 1/1 0/0 0/0 .data            m_seq24_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq24_funcTbl[5] = {
     &daNpcCdn3_c::talkb, &daNpcCdn3_c::talka, &daNpcCdn3_c::talkc, &daNpcCdn3_c::waita, NULL,
 };
 
-/* 8098003C-80980090 000994 0054+00 1/1 0/0 0/0 .data            m_seq25_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = {
     &daNpcCdn3_c::browsea,
     &daNpcCdn3_c::browseb,
@@ -541,43 +496,36 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq25_funcTbl[7] = {
     NULL,
 };
 
-/* 809800A8-809800CC 000A00 0024+00 1/1 0/0 0/0 .data            m_seq26_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq26_funcTbl[3] = {
     &daNpcCdn3_c::browsea,
     &daNpcCdn3_c::browseb,
     NULL,
 };
 
-/* 809800D8-809800F0 000A30 0018+00 1/1 0/0 0/0 .data            m_seq27_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq27_funcTbl[2] = {&daNpcCdn3_c::dance, NULL};
 
-/* 80980108-8098012C 000A60 0024+00 1/1 0/0 0/0 .data            m_seq28_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq28_funcTbl[3] = {
     &daNpcCdn3_c::ladytalka,
     &daNpcCdn3_c::normtalka,
     NULL,
 };
 
-/* 80980144-80980168 000A9C 0024+00 1/1 0/0 0/0 .data            m_seq29_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq29_funcTbl[3] = {
     &daNpcCdn3_c::ladytalkb,
     &daNpcCdn3_c::normtalkb,
     NULL,
 };
 
-/* 809801A4-809801EC 000AFC 0048+00 1/1 0/0 0/0 .data            m_seq30_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq30_funcTbl[6] = {
     &daNpcCdn3_c::talka, &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::waita,
     &daNpcCdn3_c::talkb, &daNpcCdn3_c::waita,     NULL,
 };
 
-/* 80980228-80980270 000B80 0048+00 1/1 0/0 0/0 .data            m_seq31_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq31_funcTbl[6] = {
     &daNpcCdn3_c::waita, &daNpcCdn3_c::ladytalkb, &daNpcCdn3_c::talka,
     &daNpcCdn3_c::waita, &daNpcCdn3_c::talkb,     NULL,
 };
 
-/* 809802B8-8098030C 000C10 0054+00 1/1 0/0 0/0 .data            m_seq32_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = {
     &daNpcCdn3_c::talka,
     &daNpcCdn3_c::ladytalka,
@@ -588,7 +536,6 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq32_funcTbl[7] = {
     NULL,
 };
 
-/* 80980354-809803A8 000CAC 0054+00 1/1 0/0 0/0 .data            m_seq33_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = {
     &daNpcCdn3_c::waita,
     &daNpcCdn3_c::ladytalkb,
@@ -599,20 +546,17 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq33_funcTbl[7] = {
     NULL,
 };
 
-/* 80980408-80980474 000D60 006C+00 1/1 0/0 0/0 .data            m_seq34_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq34_funcTbl[9] = {
     &daNpcCdn3_c::talka,     &daNpcCdn3_c::ladytalka, &daNpcCdn3_c::ladytalkb,
     &daNpcCdn3_c::waita,     &daNpcCdn3_c::talkb,     &daNpcCdn3_c::waita,
     &daNpcCdn3_c::normtalka, &daNpcCdn3_c::normtalkb, NULL,
 };
 
-/* 80980480-80980498 000DD8 0018+00 1/1 0/0 0/0 .data            m_seq35_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq35_funcTbl[2] = {
     &daNpcCdn3_c::sellme,
     NULL,
 };
 
-/* 809804BC-809804EC 000E14 0030+00 1/1 0/0 0/0 .data            m_seq36_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = {
     &daNpcCdn3_c::ladytalkb,
     &daNpcCdn3_c::talka,
@@ -620,43 +564,35 @@ daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq36_funcTbl[4] = {
     NULL,
 };
 
-/* 809804F8-80980510 000E50 0018+00 1/1 0/0 0/0 .data            m_seq37_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq37_funcTbl[2] = {
     &daNpcCdn3_c::sing, NULL,
 };
 
-/* 8098051C-80980534 000E74 0018+00 1/1 0/0 0/0 .data            m_seq38_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq38_funcTbl[2] = {
     &daNpcCdn3_c::sittalka, NULL,
 };
 
-/* 80980540-80980558 000E98 0018+00 1/1 0/0 0/0 .data            m_seq39_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq39_funcTbl[2] = {
     &daNpcCdn3_c::sittalkab, NULL,
 };
 
-/* 80980570-80980594 000EC8 0024+00 1/1 0/0 0/0 .data            m_seq40_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq40_funcTbl[3] = {
     &daNpcCdn3_c::sittalka, &daNpcCdn3_c::sittalkab, NULL,
 };
 
-/* 809805A0-809805B8 000EF8 0018+00 1/1 0/0 0/0 .data            m_seq41_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq41_funcTbl[2] = {
     &daNpcCdn3_c::sittalkb, NULL,
 };
 
-/* 809805C4-809805DC 000F1C 0018+00 1/1 0/0 0/0 .data            m_seq42_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq42_funcTbl[2] = {
     &daNpcCdn3_c::sittalkbb, NULL,
 
 };
 
-/* 809805F4-80980618 000F4C 0024+00 1/1 0/0 0/0 .data            m_seq43_funcTbl__11daNpcCdn3_c */
 daNpcCdn3_c::seqFunc daNpcCdn3_c::m_seq43_funcTbl[3] = {
     &daNpcCdn3_c::sittalkb, &daNpcCdn3_c::sittalkbb, NULL,
 };
 
-/* 8097A028-8097A398 0013C8 0370+00 1/0 0/0 0/0 .text            executeEscape__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeEscape() {
     if (field_0xb68 == 0) {
         if (mpMorf->isStop()) {
@@ -705,7 +641,6 @@ void daNpcCdn3_c::executeEscape() {
     }
 }
 
-/* 8097A398-8097A518 001738 0180+00 1/0 0/0 0/0 .text            initFear__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initFear() {
     int a_anmNum = 0x26;
     if (mpMorf->getAnm() == getAnmP(14, mObjNum) ||
@@ -729,7 +664,6 @@ void daNpcCdn3_c::initFear() {
     field_0xb68 = 0;
 }
 
-/* 8097A518-8097A60C 0018B8 00F4+00 1/0 0/0 0/0 .text            executeFear__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeFear() {
     if (mpMorf->checkFrame(1.0f)) {
         mCitizen.playVoice(2);
@@ -742,7 +676,6 @@ void daNpcCdn3_c::executeFear() {
     cLib_addCalcAngleS2(&shape_angle.y, field_0xb92, 3, 0x600);
 }
 
-/* 8097A60C-8097A6AC 0019AC 00A0+00 1/0 0/0 0/0 .text            initFear2__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initFear2() {
     mObjNum = 0;
     setAnm((J3DAnmTransformKey*)getAnmP(38, mObjNum), 1.0f, 12.0f, 2, 0, -1);
@@ -752,7 +685,6 @@ void daNpcCdn3_c::initFear2() {
     field_0xb68 = 2;
 }
 
-/* 8097A6AC-8097A724 001A4C 0078+00 1/0 0/0 0/0 .text            executeFear2__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeFear2() {
     if (mpMorf->checkFrame(1.0f)) {
         mCitizen.playVoice(2);
@@ -763,7 +695,6 @@ void daNpcCdn3_c::executeFear2() {
     cLib_addCalcAngleS2(&shape_angle.y, field_0xb92, 3, 0x600);
 }
 
-/* 8097A724-8097A7E0 001AC4 00BC+00 1/0 0/0 0/0 .text            initFight__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initFight() {
     setAnm((J3DAnmTransformKey*)getAnmP(41, mObjNum), 1.0f, 0.0f, 0, 0, -1);
     mCitizen.playVoice(1);
@@ -774,7 +705,6 @@ void daNpcCdn3_c::initFight() {
     field_0xb68 = 0;
 }
 
-/* 8097A7E0-8097A960 001B80 0180+00 1/0 0/0 0/0 .text            executeFight__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeFight() {
     if (mpMorf->isStop()) {
         setAnm((J3DAnmTransformKey*)getAnmP(42, mObjNum), 1.0f, 12.0f, 2, 0, -1);
@@ -793,7 +723,6 @@ void daNpcCdn3_c::executeFight() {
     cLib_addCalcAngleS2(&shape_angle.y, field_0xb92, 3, 0x600);
 }
 
-/* 8097A960-8097A9E4 001D00 0084+00 1/0 0/0 0/0 .text            initRelief__11daNpcCdn3_cFv */
 void daNpcCdn3_c::initRelief() {
     setAnm((J3DAnmTransformKey*)getAnmP(0, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     speedF = 0.0f;
@@ -801,7 +730,6 @@ void daNpcCdn3_c::initRelief() {
     field_0xb68 = 2;
 }
 
-/* 8097A9E4-8097ABDC 001D84 01F8+00 1/0 0/0 0/0 .text            executeRelief__11daNpcCdn3_cFv */
 void daNpcCdn3_c::executeRelief() {
     if (getGroupID() == 0xff && fopAcM_CheckCondition(this, 4)) {
         int time = getTime();
@@ -827,12 +755,10 @@ void daNpcCdn3_c::executeRelief() {
     cLib_addCalcAngleS2(&shape_angle.y, field_0xb92, 3 + MREG_S(0), 0x600 + MREG_S(1));
 }
 
-/* 8097ABDC-8097ABE8 001F7C 000C+00 3/3 0/0 0/0 .text            setAngle__11daNpcCdn3_cFv */
 void daNpcCdn3_c::setAngle() {
     current.angle.y = shape_angle.y;
 }
 
-/* 8097ABE8-8097AF14 001F88 032C+00 2/2 0/0 0/0 .text            pathMoveF__11daNpcCdn3_cFv */
 void daNpcCdn3_c::pathMoveF() {
     f32 walkSpeed = 0.0f;
     f32 anmSpeed = 0.0f;
@@ -882,7 +808,6 @@ void daNpcCdn3_c::pathMoveF() {
     }
 }
 
-/* 8097AF14-8097AFE0 0022B4 00CC+00 1/1 0/0 0/0 .text            ctrlMsgAnm__11daNpcCdn3_cFv */
 int daNpcCdn3_c::ctrlMsgAnm() {
     int rv = -1;
     if (!eventInfo.checkCommandTalk()) {
@@ -907,7 +832,6 @@ int daNpcCdn3_c::ctrlMsgAnm() {
     return rv;
 }
 
-/* 8097AFE0-8097B04C 002380 006C+00 1/1 0/0 0/0 .text            s_sub1__FPvPv */
 static void* s_sub1(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule &&
         static_cast<daNpcCdn3_c*>(param_2)->searchNextScheduleTagSub(
@@ -918,8 +842,6 @@ static void* s_sub1(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 8097B04C-8097B128 0023EC 00DC+00 1/1 0/0 0/0 .text
- * searchNextScheduleTagSub__11daNpcCdn3_cFP10fopAc_ac_c        */
 bool daNpcCdn3_c::searchNextScheduleTagSub(fopAc_ac_c* param_1) {
     daTagSchedule_c* schedule = (daTagSchedule_c*)param_1;
     if (getGroupID() == schedule->getGroupID()) {
@@ -948,7 +870,6 @@ bool daNpcCdn3_c::searchNextScheduleTagSub(fopAc_ac_c* param_1) {
     return 0;
 }
 
-/* 8097B128-8097B194 0024C8 006C+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Tag_Schedule &&
         static_cast<daNpcCdn3_c*>(param_2)->searchFirstScheduleTagSub(
@@ -959,8 +880,6 @@ static void* s_sub2(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 8097B194-8097B288 002534 00F4+00 1/1 0/0 0/0 .text
- * searchFirstScheduleTagSub__11daNpcCdn3_cFP10fopAc_ac_c       */
 bool daNpcCdn3_c::searchFirstScheduleTagSub(fopAc_ac_c* param_1) {
     daTagSchedule_c* schedule = (daTagSchedule_c*)param_1;
     if (getGroupID() == schedule->getGroupID()) {
@@ -984,7 +903,6 @@ bool daNpcCdn3_c::searchFirstScheduleTagSub(fopAc_ac_c* param_1) {
     return 0;
 }
 
-/* 8097B288-8097B38C 002628 0104+00 2/2 0/0 0/0 .text            checkSchedule__11daNpcCdn3_cFv */
 void daNpcCdn3_c::checkSchedule() {
     if (getGroupID() != 0xff && field_0xb88 != NULL) {
         u8 rawStartTime = field_0xb88->getStartTime();
@@ -1004,8 +922,6 @@ void daNpcCdn3_c::checkSchedule() {
     }
 }
 
-/* 8097B38C-8097B5A8 00272C 021C+00 3/3 0/0 0/0 .text
- * setSchedule__11daNpcCdn3_cFP15daTagSchedule_c                */
 void daNpcCdn3_c::setSchedule(daTagSchedule_c* param_1) {
     mTagSched = param_1;
     if (mTagSched->getPathID() != 0xff) {
@@ -1086,7 +1002,6 @@ void daNpcCdn3_c::setSchedule(daTagSchedule_c* param_1) {
     OS_REPORT("メッセージID: %d\n", mFlowNodeNum);
 }
 
-/* 8097B5A8-8097B60C 002948 0064+00 2/2 0/0 0/0 .text            isInShop__11daNpcCdn3_cFv */
 inline bool daNpcCdn3_c::isInShop() {
     u8 rv = FALSE;
     if (strcmp(dComIfGp_getStartStageName(), "R_SP160") == 0 && dComIfG_play_c::getLayerNo(0) <= 1) {
@@ -1095,7 +1010,6 @@ inline bool daNpcCdn3_c::isInShop() {
     return rv;
 }
 
-/* 8097B60C-8097B684 0029AC 0078+00 3/3 0/0 0/0 .text            isChairStyle__11daNpcCdn3_cFv */
 bool daNpcCdn3_c::isChairStyle() {
     if (m_seqNum == 15 || m_seqNum == 16 || (m_seqNum == 17 && isM_()) ||
         m_seqNum == 38 || m_seqNum == 39 || m_seqNum == 40)
@@ -1105,7 +1019,6 @@ bool daNpcCdn3_c::isChairStyle() {
     return false;
 }
 
-/* 8097B684-8097B6D0 002A24 004C+00 2/2 0/0 0/0 .text            isNoTurnTalk__11daNpcCdn3_cFv */
 bool daNpcCdn3_c::isNoTurnTalk() {
     if (m_seqNum == 7 || m_seqNum == 8 || m_seqNum == 18 || m_seqNum == 19 ||
         m_seqNum == 41 || m_seqNum == 42 || m_seqNum == 43)
@@ -1115,7 +1028,6 @@ bool daNpcCdn3_c::isNoTurnTalk() {
     return false;
 }
 
-/* 8097B6D0-8097B754 002A70 0084+00 21/0 0/0 0/0 .text            waita__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::waita(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1129,7 +1041,6 @@ int daNpcCdn3_c::waita(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B754-8097B7D8 002AF4 0084+00 15/0 0/0 0/0 .text            talka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::talka(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1143,7 +1054,6 @@ int daNpcCdn3_c::talka(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B7D8-8097B85C 002B78 0084+00 3/0 0/0 0/0 .text            waitwall__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::waitwall(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1157,7 +1067,6 @@ int daNpcCdn3_c::waitwall(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B85C-8097B8E0 002BFC 0084+00 2/0 0/0 0/0 .text            talkwall__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::talkwall(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1171,7 +1080,6 @@ int daNpcCdn3_c::talkwall(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B8E0-8097B964 002C80 0084+00 2/0 0/0 0/0 .text            talkbwall__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::talkbwall(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1185,7 +1093,6 @@ int daNpcCdn3_c::talkbwall(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B964-8097B9E8 002D04 0084+00 12/0 0/0 0/0 .text            talkb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::talkb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1199,7 +1106,6 @@ int daNpcCdn3_c::talkb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097B9E8-8097BA6C 002D88 0084+00 4/0 0/0 0/0 .text            talkc__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::talkc(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1213,7 +1119,6 @@ int daNpcCdn3_c::talkc(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BA6C-8097BAF0 002E0C 0084+00 2/0 0/0 0/0 .text            waitb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::waitb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1227,7 +1132,6 @@ int daNpcCdn3_c::waitb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BAF0-8097BB74 002E90 0084+00 3/0 0/0 0/0 .text            sitwaita__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sitwaita(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1241,7 +1145,6 @@ int daNpcCdn3_c::sitwaita(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BB74-8097BBF8 002F14 0084+00 4/0 0/0 0/0 .text            sittalka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sittalka(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1255,7 +1158,6 @@ int daNpcCdn3_c::sittalka(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BBF8-8097BC7C 002F98 0084+00 4/0 0/0 0/0 .text            sittalkab__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sittalkab(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1269,7 +1171,6 @@ int daNpcCdn3_c::sittalkab(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BC7C-8097BD00 00301C 0084+00 3/0 0/0 0/0 .text            sitwaitb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sitwaitb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1283,7 +1184,6 @@ int daNpcCdn3_c::sitwaitb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BD00-8097BD84 0030A0 0084+00 4/0 0/0 0/0 .text            sittalkb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sittalkb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1297,7 +1197,6 @@ int daNpcCdn3_c::sittalkb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BD84-8097BE08 003124 0084+00 4/0 0/0 0/0 .text            sittalkbb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sittalkbb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1311,7 +1210,6 @@ int daNpcCdn3_c::sittalkbb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BE08-8097BE8C 0031A8 0084+00 2/0 0/0 0/0 .text            looka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::looka(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1325,7 +1223,6 @@ int daNpcCdn3_c::looka(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BE8C-8097BF10 00322C 0084+00 2/0 0/0 0/0 .text            lookb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::lookb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1339,7 +1236,6 @@ int daNpcCdn3_c::lookb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097BF10-8097C070 0032B0 0160+00 1/0 0/0 0/0 .text            playm__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::playm(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1369,7 +1265,6 @@ int daNpcCdn3_c::playm(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C070-8097C12C 003410 00BC+00 1/0 0/0 0/0 .text            turnr__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::turnr(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1388,7 +1283,6 @@ int daNpcCdn3_c::turnr(void* param_0) {
     return 0;
 }
 
-/* 8097C12C-8097C1E8 0034CC 00BC+00 1/0 0/0 0/0 .text            turnl__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::turnl(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1407,35 +1301,30 @@ int daNpcCdn3_c::turnl(void* param_0) {
     return 0;
 }
 
-/* 8097C1E8-8097C250 003588 0068+00 1/0 0/0 0/0 .text            walka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::walka(void* param_0) {
     setAnm((J3DAnmTransformKey*)getAnmP(2, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xb68 = 2;
     return 1;
 }
 
-/* 8097C250-8097C2B8 0035F0 0068+00 1/0 0/0 0/0 .text            walkb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::walkb(void* param_0) {
     setAnm((J3DAnmTransformKey*)getAnmP(3, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xb68 = 2;
     return 1;
 }
 
-/* 8097C2B8-8097C320 003658 0068+00 1/0 0/0 0/0 .text            runa__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::runa(void* param_0) {
     setAnm((J3DAnmTransformKey*)getAnmP(4, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xb68 = 1;
     return 1;
 }
 
-/* 8097C320-8097C388 0036C0 0068+00 1/0 0/0 0/0 .text            runb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::runb(void* param_0) {
     setAnm((J3DAnmTransformKey*)getAnmP(5, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xb68 = 1;
     return 1;
 }
 
-/* 8097C388-8097C40C 003728 0084+00 3/0 0/0 0/0 .text            browsea__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::browsea(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1449,7 +1338,6 @@ int daNpcCdn3_c::browsea(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C40C-8097C490 0037AC 0084+00 3/0 0/0 0/0 .text            browseb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::browseb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1463,7 +1351,6 @@ int daNpcCdn3_c::browseb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C490-8097C5B0 003830 0120+00 1/0 0/0 0/0 .text            dance__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::dance(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1488,7 +1375,6 @@ int daNpcCdn3_c::dance(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C5B0-8097C634 003950 0084+00 4/0 0/0 0/0 .text            ladytalka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::ladytalka(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1502,7 +1388,6 @@ int daNpcCdn3_c::ladytalka(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C634-8097C6B8 0039D4 0084+00 5/0 0/0 0/0 .text            ladytalkb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::ladytalkb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1516,7 +1401,6 @@ int daNpcCdn3_c::ladytalkb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C6B8-8097C73C 003A58 0084+00 3/0 0/0 0/0 .text            normtalka__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::normtalka(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1530,7 +1414,6 @@ int daNpcCdn3_c::normtalka(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C73C-8097C7C0 003ADC 0084+00 3/0 0/0 0/0 .text            normtalkb__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::normtalkb(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1544,7 +1427,6 @@ int daNpcCdn3_c::normtalkb(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C7C0-8097C844 003B60 0084+00 1/0 0/0 0/0 .text            sellme__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sellme(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1558,7 +1440,6 @@ int daNpcCdn3_c::sellme(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C844-8097C8F0 003BE4 00AC+00 1/0 0/0 0/0 .text            sing__11daNpcCdn3_cFPv */
 int daNpcCdn3_c::sing(void* param_0) {
     if (!isStop()) {
         return 0;
@@ -1573,12 +1454,10 @@ int daNpcCdn3_c::sing(void* param_0) {
     return field_0xaa0 == 0;
 }
 
-/* 8097C8F0-8097C910 003C90 0020+00 1/0 0/0 0/0 .text            daNpcCdn3_Create__FPv */
 static int daNpcCdn3_Create(void* i_this) {
     return static_cast<daNpcCdn3_c*>(i_this)->create();
 }
 
-/* 8097C910-8097CC58 003CB0 0348+00 3/1 0/0 0/0 .text            create__11daNpcCdn3_cFv */
 int daNpcCdn3_c::create() {
     fopAcM_ct(this, daNpcCdn3_c);
     mIsDarkWorld = dKy_darkworld_check();
@@ -1604,7 +1483,6 @@ int daNpcCdn3_c::create() {
     return rv;
 }
 
-/* 8097CC58-8097D078 003FF8 0420+00 1/1 0/0 0/0 .text            create_init__11daNpcCdn3_cFv */
 void daNpcCdn3_c::create_init() {
 #if DEBUG
     l_Cd2_HIO.entryHIO("NPC(C級,D級)HighPoly");
@@ -1648,7 +1526,6 @@ void daNpcCdn3_c::create_init() {
     setMtx();
 }
 
-/* 8097D078-8097D120 004418 00A8+00 2/2 0/0 0/0 .text            setMtx__11daNpcCdn3_cFv */
 void daNpcCdn3_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, field_0xb64, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -1662,7 +1539,6 @@ void daNpcCdn3_c::setMtx() {
     setAttention(m_type);
 }
 
-/* 8097D120-8097D614 0044C0 04F4+00 1/1 0/0 0/0 .text            lookat__11daNpcCdn3_cFv */
 void daNpcCdn3_c::lookat() {
     csXyz vecs1[3] = {
         csXyz(Cd2_HIO_maxLmtX_BACKBONE(m_type), Cd2_HIO_maxLmtY_BACKBONE(m_type), 0),
@@ -1699,13 +1575,11 @@ void daNpcCdn3_c::lookat() {
     mLookat.action(cStack_80, eyePos, this, afStack_38, NULL != m_targetAct.getActorP());
 }
 
-/* 8097D650-8097D684 0049F0 0034+00 1/0 0/0 0/0 .text            daNpcCdn3_Delete__FPv */
 static int daNpcCdn3_Delete(void* i_this) {
     static_cast<daNpcCdn3_c*>(i_this)->~daNpcCdn3_c();
     return 1;
 }
 
-/* 8097D684-8097D728 004A24 00A4+00 1/0 0/0 0/0 .text            __dt__11daNpcCdn3_cFv */
 daNpcCdn3_c::~daNpcCdn3_c() {
     removeResrc(m_type, mObjNum);
     if (heap != NULL) {
@@ -1717,12 +1591,10 @@ daNpcCdn3_c::~daNpcCdn3_c() {
 #endif
 }
 
-/* 8097D728-8097D748 004AC8 0020+00 1/0 0/0 0/0 .text            daNpcCdn3_Execute__FPv */
 static int daNpcCdn3_Execute(void* i_this) {
     return static_cast<daNpcCdn3_c*>(i_this)->execute();
 }
 
-/* 8097D748-8097DABC 004AE8 0374+00 1/1 0/0 0/0 .text            execute__11daNpcCdn3_cFv */
 int daNpcCdn3_c::execute() {
     mAcchCir.SetWallH(Cd2_HIO_chkWallH(m_type));
     mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type));
@@ -1780,8 +1652,6 @@ inline bool daNpcCdn3_c::searchNextScheduleTag() {
     return field_0xb88 != NULL;
 }
 
-/* 8097DABC-8097DEF4 004E5C 0438+00 1/1 0/0 0/0 .text            checkTimeSchedule__11daNpcCdn3_cFv
- */
 void daNpcCdn3_c::checkTimeSchedule() {
     int iVar2 = getTime();
     if (getGroupID() == 0xff) {
@@ -1851,17 +1721,14 @@ inline int daNpcCdn3_c::draw() {
     return 1;
 }
 
-/* 8097DEF4-8097E000 005294 010C+00 1/0 0/0 0/0 .text            daNpcCdn3_Draw__FPv */
 static int daNpcCdn3_Draw(void* i_this) {
     return static_cast<daNpcCdn3_c*>(i_this)->draw();
 }
 
-/* 8097E000-8097E008 0053A0 0008+00 1/0 0/0 0/0 .text            daNpcCdn3_IsDelete__FPv */
 static int daNpcCdn3_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80980658-80980678 -00001 0020+00 1/0 0/0 0/0 .data            daNpcCdn3_METHODS */
 static actor_method_class daNpcCdn3_METHODS = {
     (process_method_func)daNpcCdn3_Create,
     (process_method_func)daNpcCdn3_Delete,
@@ -1870,7 +1737,6 @@ static actor_method_class daNpcCdn3_METHODS = {
     (process_method_func)daNpcCdn3_Draw,
 };
 
-/* 80980678-809806A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CD3 */
 extern actor_process_profile_definition g_profile_NPC_CD3 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp
index 6f43f38a2d..5271a16fc1 100644
--- a/src/d/actor/d_a_npc_chat.cpp
+++ b/src/d/actor/d_a_npc_chat.cpp
@@ -795,7 +795,6 @@ enum Type {
     /* 0x1D */ MdlWANb2_e,
 };
 
-/* 8098699C-809869B4 -00001 0018+00 8/7 0/0 0/0 .rodata          l_resMANa */
 static char* const l_resMANa[6] = {
     "MAN_a",
     "MAN_a_TW",
@@ -805,7 +804,6 @@ static char* const l_resMANa[6] = {
     "objectTW",
 };
 
-/* 809869B4-809869CC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa */
 static char* const l_resMADa[6] = {
     "MAD_a",
     "MAD_a_TW",
@@ -815,7 +813,6 @@ static char* const l_resMADa[6] = {
     "objectTW",
 };
 
-/* 809869CC-809869E4 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa */
 static char* const l_resMCNa[6] = {
     "MCN_a",
     "MCN_a_TW",
@@ -825,7 +822,6 @@ static char* const l_resMCNa[6] = {
     "objectTW",
 };
 
-/* 809869E4-809869FC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa */
 static char* const l_resMONa[6] = {
     "MON_a",
     "MON_a_TW",
@@ -835,7 +831,6 @@ static char* const l_resMONa[6] = {
     "objectTW",
 };
 
-/* 809869FC-80986A14 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb */
 static char* const l_resMANb[6] = {
     "MAN_b",
     "MAN_b_TW",
@@ -845,7 +840,6 @@ static char* const l_resMANb[6] = {
     "objectTW",
 };
 
-/* 80986A14-80986A2C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc */
 static char* const l_resMANc[6] = {
     "MAN_c",
     "MAN_c_TW",
@@ -855,7 +849,6 @@ static char* const l_resMANc[6] = {
     "objectTW",
 };
 
-/* 80986A2C-80986A44 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa */
 static char* const l_resMASa[6] = {
     "MAS_a",
     "MAS_a_TW",
@@ -865,7 +858,6 @@ static char* const l_resMASa[6] = {
     "objectTW",
 };
 
-/* 80986A44-80986A5C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa */
 static char* const l_resMBNa[6] = {
     "MBN_a",
     "MBN_a_TW",
@@ -875,7 +867,6 @@ static char* const l_resMBNa[6] = {
     "objectTW",
 };
 
-/* 80986A5C-80986A74 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANa2 */
 static char* const l_resMANa2[6] = {
     "MAN_a2",
     "MAN_a2_TW",
@@ -885,7 +876,6 @@ static char* const l_resMANa2[6] = {
     "objectTW",
 };
 
-/* 80986A74-80986A8C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMADa2 */
 static char* const l_resMADa2[6] = {
     "MAD_a2",
     "MAD_a2_TW",
@@ -895,7 +885,6 @@ static char* const l_resMADa2[6] = {
     "objectTW",
 };
 
-/* 80986A8C-80986AA4 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMCNa2 */
 static char* const l_resMCNa2[6] = {
     "MCN_a2",
     "MCN_a2_TW",
@@ -905,7 +894,6 @@ static char* const l_resMCNa2[6] = {
     "objectTW",
 };
 
-/* 80986AA4-80986ABC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMONa2 */
 static char* const l_resMONa2[6] = {
     "MON_a2",
     "MON_a2_TW",
@@ -915,7 +903,6 @@ static char* const l_resMONa2[6] = {
     "objectTW",
 };
 
-/* 80986ABC-80986AD4 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANb2 */
 static char* const l_resMANb2[6] = {
     "MAN_b2",
     "MAN_b2_TW",
@@ -925,7 +912,6 @@ static char* const l_resMANb2[6] = {
     "objectTW",
 };
 
-/* 80986AD4-80986AEC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMANc2 */
 static char* const l_resMANc2[6] = {
     "MAN_c2",
     "MAN_c2_TW",
@@ -935,7 +921,6 @@ static char* const l_resMANc2[6] = {
     "objectTW",
 };
 
-/* 80986AEC-80986B04 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMASa2 */
 static char* const l_resMASa2[6] = {
     "MAS_a2",
     "MAS_a2_TW",
@@ -945,7 +930,6 @@ static char* const l_resMASa2[6] = {
     "objectTW",
 };
 
-/* 80986B04-80986B1C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMBNa2 */
 static char* const l_resMBNa2[6] = {
     "MBN_a2",
     "MBN_a2_TW",
@@ -955,7 +939,6 @@ static char* const l_resMBNa2[6] = {
     "objectTW",
 };
 
-/* 80986B1C-80986B34 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa */
 static char* const l_resWANa[6] = {
     "WAN_a",
     "WAN_a_TW",
@@ -965,7 +948,6 @@ static char* const l_resWANa[6] = {
     "objectTW",
 };
 
-/* 80986B34-80986B4C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa */
 static char* const l_resWADa[6] = {
     "WAD_a",
     "WAD_a_TW",
@@ -975,7 +957,6 @@ static char* const l_resWADa[6] = {
     "objectTW",
 };
 
-/* 80986B4C-80986B64 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa */
 static char* const l_resMATa[6] = {
     "MAT_a",
     "MAT_a_TW",
@@ -985,7 +966,6 @@ static char* const l_resMATa[6] = {
     "objectTW",
 };
 
-/* 80986B64-80986B7C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa */
 static char* const l_resWCNa[6] = {
     "WCN_a",
     "WCN_a_TW",
@@ -995,7 +975,6 @@ static char* const l_resWCNa[6] = {
     "objectTW",
 };
 
-/* 80986B7C-80986B94 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa */
 static char* const l_resWONa[6] = {
     "WON_a",
     "WON_a_TW",
@@ -1005,7 +984,6 @@ static char* const l_resWONa[6] = {
     "objectTW",
 };
 
-/* 80986B94-80986BAC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa */
 static char* const l_resWGNa[6] = {
     "WGN_a",
     "WGN_a_TW",
@@ -1015,7 +993,6 @@ static char* const l_resWGNa[6] = {
     "objectTW",
 };
 
-/* 80986BAC-80986BC4 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb */
 static char* const l_resWANb[6] = {
     "WAN_b",
     "WAN_b_TW",
@@ -1025,7 +1002,6 @@ static char* const l_resWANb[6] = {
     "objectTW",
 };
 
-/* 80986BC4-80986BDC -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANa2 */
 static char* const l_resWANa2[6] = {
     "WAN_a2",
     "WAN_a2_TW",
@@ -1035,7 +1011,6 @@ static char* const l_resWANa2[6] = {
     "objectTW",
 };
 
-/* 80986BDC-80986BF4 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWADa2 */
 static char* const l_resWADa2[6] = {
     "WAD_a2",
     "WAD_a2_TW",
@@ -1045,7 +1020,6 @@ static char* const l_resWADa2[6] = {
     "objectTW",
 };
 
-/* 80986BF4-80986C0C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resMATa2 */
 static char* const l_resMATa2[6] = {
     "MAT_a2",
     "MAT_a2_TW",
@@ -1055,7 +1029,6 @@ static char* const l_resMATa2[6] = {
     "objectTW",
 };
 
-/* 80986C0C-80986C24 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWCNa2 */
 static char* const l_resWCNa2[6] = {
     "WCN_a2",
     "WCN_a2_TW",
@@ -1065,7 +1038,6 @@ static char* const l_resWCNa2[6] = {
     "objectTW",
 };
 
-/* 80986C24-80986C3C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWONa2 */
 static char* const l_resWONa2[6] = {
     "WON_a2",
     "WON_a2_TW",
@@ -1075,7 +1047,6 @@ static char* const l_resWONa2[6] = {
     "objectTW",
 };
 
-/* 80986C3C-80986C54 -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWGNa2 */
 static char* const l_resWGNa2[6] = {
     "WGN_a2",
     "WGN_a2_TW",
@@ -1085,7 +1056,6 @@ static char* const l_resWGNa2[6] = {
     "objectTW",
 };
 
-/* 80986C54-80986C6C -00001 0018+00 1/1 0/0 0/0 .rodata          l_resWANb2 */
 static char* const l_resWANb2[6] = {
     "WAN_b2",
     "WAN_b2_TW",
@@ -1095,7 +1065,6 @@ static char* const l_resWANb2[6] = {
     "objectTW",
 };
 
-/* 8098797C-809879F4 -00001 0078+00 2/2 0/0 0/0 .data            l_resNameTbl */
 static char* const* l_resNameTbl[30] = {
     l_resMANa,  l_resMADa,  l_resMCNa,  l_resMONa,
     l_resMANb,  l_resMANc,  l_resMASa,  l_resMBNa,
@@ -1112,7 +1081,6 @@ struct anmTblPrm {
     int resource_index;
 };
 
-/* 809879F4-80987AE4 000098 00F0+00 1/2 0/0 0/0 .data            l_bmdTbl */
  static anmTblPrm l_bmdTbl[30] = {
     l_resMANa[0], BMDR_MAN_A,
     l_resMADa[0], BMDR_MAD_A,
@@ -1146,7 +1114,6 @@ struct anmTblPrm {
     l_resWANb2[0], BMDR_WAN_B2,
 };
 
-/* 80987AE4-80987BD4 000188 00F0+00 1/2 0/0 0/0 .data            l_bmdTWTbl */
 static anmTblPrm l_bmdTWTbl[30] = {
     l_resMANa[1], BMDR_MAN_A_TW,
     l_resMADa[1], BMDR_MAD_A_TW,
@@ -1180,7 +1147,6 @@ static anmTblPrm l_bmdTWTbl[30] = {
     l_resWANb2[1], BMDR_WAN_B2_TW,
 };
 
-/* 80987BD4-80987CC4 000278 00F0+00 1/2 0/0 0/0 .data            l_btpTbl */
 static anmTblPrm l_btpTbl[30] = {
     l_resMANa[0], -1,
     l_resMADa[0], -1,
@@ -1214,7 +1180,6 @@ static anmTblPrm l_btpTbl[30] = {
     l_resWANb2[0], BTP_WAN_B2,
 };
 
-/* 80987CC4-80987DB4 000368 00F0+00 1/2 0/0 0/0 .data            l_btpTWTbl */
 static anmTblPrm l_btpTWTbl[30] = {
     l_resMANa[1], -1,
     l_resMADa[1], -1,
@@ -1248,7 +1213,6 @@ static anmTblPrm l_btpTWTbl[30] = {
     l_resWANb2[1], BTP_WAN_B2_TW,
 };
 
-/* 80987DB4-80987F64 -00001 01B0+00 1/1 0/0 0/0 .data            l_bckTbl_M */
 static anmTblPrm l_bckTbl_M[54] = {
     {"Mgeneral",  BCK_M_WAIT_A},
     {"Mgeneral",  BCK_M_WAIT_B},
@@ -1306,7 +1270,6 @@ static anmTblPrm l_bckTbl_M[54] = {
     {"Mgeneral",  BCK_M_SING},
 };
 
-/* 80987F64-80988114 -00001 01B0+00 1/1 0/0 0/0 .data            l_bckTbl_W */
 static anmTblPrm l_bckTbl_W[54] = {
     {"Wgeneral", BCK_W_WAIT_A},
     {"Wgeneral", BCK_W_WAIT_B},
@@ -1379,7 +1342,6 @@ struct jntTblWPrm {
     /* 0x0 */ jnt jntPrm[21];
 };
 
-/* 80988114-809898D4 0007B8 17C0+00 1/1 0/0 0/0 .data            a_jntTbl_M */
 static jntTblMPrm a_jntTbl_M[16] = {
     {
     0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0,
@@ -1734,7 +1696,6 @@ static jntTblMPrm a_jntTbl_M[16] = {
     },
 };
 
-/* 809898D4-80989CD4 001F78 0400+00 3/4 0/0 0/0 .data            a_prmTbl_M */
 struct prmTbl {
     /* 0x00 */ f32 field_0x0;
     /* 0x04 */ u8 field_0x4[0x18 - 0x4];
@@ -1817,7 +1778,6 @@ static prmTbl a_prmTbl_M[16] = {
     1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.1f, 35.0f,
 };
 
-/* 80989CD4-8098B3CC 002378 16F8+00 1/1 0/0 0/0 .data            a_jntTbl_W */
 static jntTblWPrm a_jntTbl_W[14] = {
     {
     0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0,
@@ -2156,7 +2116,6 @@ static jntTblWPrm a_jntTbl_W[14] = {
     },
 };
 
-/* 8098B3CC-8098B74C 003A70 0380+00 3/4 0/0 0/0 .data            a_prmTbl_W */
 static prmTbl a_prmTbl_W[14] = {
     -852593.0f, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 1.0f, 0xC8, 0x00, 0x00,
@@ -2215,26 +2174,20 @@ static prmTbl a_prmTbl_W[14] = {
     1.5f, 1.6f, 10.0f, 4.4f, 180.0f, 30.0f, 50.1f, 35.0f,
 };
 
-/* 8098B74C-8098B750 003DF0 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL,
 };
 
-/* 8098B750-8098B754 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Chat";
 
-/* 8098BACC-8098BAD0 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcChat_Param_c l_HIO;
 
-/* 8098B754-8098B760 003DF8 000C+00 0/2 0/0 0/0 .data            mEvtSeqList__11daNpcChat_c */
 daNpcChat_c::eventFunc daNpcChat_c::mEvtSeqList[1] = {
     NULL,
 };
 
-/* 8098084C-809809D0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcChat_cFv */
 daNpcChat_c::daNpcChat_c() {}
 
-/* 80980A60-80980C1C 000300 01BC+00 1/0 0/0 0/0 .text            __dt__11daNpcChat_cFv */
 daNpcChat_c::~daNpcChat_c() {
     removeResrc(mType, mObjNum);
 
@@ -2243,7 +2196,6 @@ daNpcChat_c::~daNpcChat_c() {
     }
 }
 
-/* 80986C6C-80986CD4 -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTbl */
 static anmTblPrm const l_objTbl[13] = {
     {"object", BMDR_B_TUBO},
     {"object", BMDR_B_TUBO},
@@ -2260,7 +2212,6 @@ static anmTblPrm const l_objTbl[13] = {
     {"object", BMDR_MARO_BAG_W},
 };
 
-/* 80986CD4-80986D3C -00001 0068+00 1/1 0/0 0/0 .rodata          l_objTWTbl */
 static anmTblPrm const l_objTWTbl[13] = {
     {"objectTW", BMDR_B_TUBO_TW},
     {"objectTW", BMDR_B_TUBO_TW},
@@ -2277,7 +2228,6 @@ static anmTblPrm const l_objTWTbl[13] = {
     {"objectTW", -1},
 };
 
-/* 80986D3C-80986DA8 0003A0 006C+00 1/3 0/0 0/0 .rodata          m__17daNpcChat_Param_c */
 daNpcChat_HIOParam const daNpcChat_Param_c::m = {
     55.0f,
     -3.0f,
@@ -2314,7 +2264,6 @@ daNpcChat_HIOParam const daNpcChat_Param_c::m = {
     false,
 };
 
-/* 80980C1C-80980E20 0004BC 0204+00 1/1 0/0 0/0 .text            NpcCreate__11daNpcChat_cFi */
 BOOL daNpcChat_c::NpcCreate(int type) {
     J3DModelData* a_mdlData_p = getNpcMdlDataP(type);
 
@@ -2390,7 +2339,6 @@ BOOL daNpcChat_c::NpcCreate(int type) {
     return TRUE;
 }
 
-/* 80980E20-80980F88 0006C0 0168+00 3/1 0/0 0/0 .text            getObjNum__11daNpcChat_cFv */
 int daNpcChat_c::getObjNum() {
     int objNum;
     u32 param = (fopAcM_GetParam(this) >> 8) & 0xF;
@@ -2488,7 +2436,6 @@ int daNpcChat_c::getObjNum() {
     return objNum;
 }
 
-/* 80980F88-80980FC8 000828 0040+00 1/1 0/0 0/0 .text            ObjCreate__11daNpcChat_cFi */
 J3DModel* daNpcChat_c::ObjCreate(int param_1) {
     J3DModelData* a_mdlData_p = getObjMdlDataP(param_1);
     if (a_mdlData_p != NULL) {
@@ -2498,7 +2445,6 @@ J3DModel* daNpcChat_c::ObjCreate(int param_1) {
     return NULL;
 }
 
-/* 80980FC8-80981108 000868 0140+00 1/1 0/0 0/0 .text            ChairCreate__11daNpcChat_cFf */
 J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) {
     const char* i_arcName = mTwilight ? "objectTW" : "object";
     int i_index = isM_() ? ((mTwilight != 0) ? 4 : 4) : ((mTwilight != 0) ? 5 : 5);
@@ -2522,7 +2468,6 @@ J3DModel* daNpcChat_c::ChairCreate(f32 i_scale) {
     return NULL;
 }
 
-/* 80981108-80981140 0009A8 0038+00 5/5 0/0 0/0 .text            isM___11daNpcChat_cFv */
 bool daNpcChat_c::isM_() {
     if (mAnm_p == NULL) {
         return mType < 16;
@@ -2533,7 +2478,6 @@ bool daNpcChat_c::isM_() {
     return a_jntNum == JntM_NUM_e;
 }
 
-/* 80981140-80981280 0009E0 0140+00 1/1 0/0 0/0 .text            loadResrc__11daNpcChat_cFii */
 cPhs__Step daNpcChat_c::loadResrc(int idx, int param_2) {
     cPhs__Step rv = cPhs_COMPLEATE_e;
     if (mTwilight) {
@@ -2575,7 +2519,6 @@ cPhs__Step daNpcChat_c::loadResrc(int idx, int param_2) {
     return rv;
 }
 
-/* 80981280-809812FC 000B20 007C+00 1/1 0/0 0/0 .text            getNpcMdlDataP__11daNpcChat_cFi */
 J3DModelData* daNpcChat_c::getNpcMdlDataP(int i_index) {
     if (i_index < 0 || i_index >= 30) {
         return NULL;
@@ -2587,7 +2530,6 @@ J3DModelData* daNpcChat_c::getNpcMdlDataP(int i_index) {
     return model_data;
 }
 
-/* 809812FC-80981374 000B9C 0078+00 1/1 0/0 0/0 .text            getObjMdlDataP__11daNpcChat_cFi */
 J3DModelData* daNpcChat_c::getObjMdlDataP(int i_index) {
     J3DModelData* model_data = NULL;
     const anmTblPrm* def = mTwilight ? &l_objTWTbl[i_index] : &l_objTbl[i_index];
@@ -2599,7 +2541,6 @@ J3DModelData* daNpcChat_c::getObjMdlDataP(int i_index) {
     return model_data;
 }
 
-/* 80981374-809813E8 000C14 0074+00 2/2 0/0 0/0 .text            getTexAnmP__11daNpcChat_cFi */
 J3DAnmTexPattern* daNpcChat_c::getTexAnmP(int i_index) {
     const anmTblPrm* def;
     if (mTwilight) {
@@ -2613,7 +2554,6 @@ J3DAnmTexPattern* daNpcChat_c::getTexAnmP(int i_index) {
     return NULL;
 }
 
-/* 809813E8-809814DC 000C88 00F4+00 1/1 0/0 0/0 .text            removeResrc__11daNpcChat_cFii */
 BOOL daNpcChat_c::removeResrc(int idx, int param_2) {
     if (mTwilight) {
         dComIfG_resDelete(&mPhase1, l_resNameTbl[idx][1]);
@@ -2638,7 +2578,6 @@ BOOL daNpcChat_c::removeResrc(int idx, int param_2) {
 
 inline f32 AtnOfs(int param_1) { return param_1 < 16 ? a_prmTbl_M[param_1].field_0x1c : a_prmTbl_W[param_1 - 16].field_0x1c; }
 
-/* 809814DC-80981E90 000D7C 09B4+00 1/1 0/0 0/0 .text            setAttention__11daNpcChat_cFi */
 BOOL daNpcChat_c::setAttention(int param_1) {
     static cXyz a_eyeOfsTbl[30] = {
         cXyz(0.0f, 10.0f, 0.0f),
@@ -2720,7 +2659,6 @@ inline f32 CylH(int type) {
     return (f32)(type < 16 ? a_prmTbl_M[type].field_0x30 : a_prmTbl_W[type - 16].field_0x30);
 }
 
-/* 80981E90-809822A0 001730 0410+00 1/1 0/0 0/0 .text            Create__11daNpcChat_cFv */
 cPhs__Step daNpcChat_c::Create() {
     if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) {
         new (this) daNpcChat_c();
@@ -2797,7 +2735,6 @@ inline f32 ObjScale(int type) {
     return (f32)(type < 16 ? a_prmTbl_M[type].field_0x18 : a_prmTbl_W[type - 16].field_0x18);
 }
 
-/* 809822A0-809823B4 001B40 0114+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcChat_cFv */
 BOOL daNpcChat_c::CreateHeap() {
     J3DModel* model;
     BOOL rv = NpcCreate(mType);
@@ -2826,14 +2763,12 @@ BOOL daNpcChat_c::CreateHeap() {
     return rv;
 }
 
-/* 809823B4-809823E8 001C54 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcChat_cFv */
 int daNpcChat_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcChat_c();
     return 1;
 }
 
-/* 809823E8-809824CC 001C88 00E4+00 2/2 0/0 0/0 .text            Execute__11daNpcChat_cFv */
 int daNpcChat_c::Execute() {
     if (!appearCheck()) {
         return 1;
@@ -2856,13 +2791,11 @@ int daNpcChat_c::Execute() {
     return 1;
 }
 
-/* 809824CC-8098250C 001D6C 0040+00 1/1 0/0 0/0 .text            Draw__11daNpcChat_cFv */
 int daNpcChat_c::Draw() {
     draw(0, 0, daNpcChat_Param_c::m.common.real_shadow_size, NULL, 0);
     return 1;
 }
 
-/* 8098250C-80982780 001DAC 0274+00 1/1 0/0 0/0 .text            draw__11daNpcChat_cFiifP11_GXColorS10i */
 int daNpcChat_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* a_mdlData_p = model->getModelData();
@@ -2953,7 +2886,6 @@ inline s16 JntRZ(int type, int jnt_no) {
     return (type < 16 ? a_jntTbl_M[type].jntPrm[jnt_no].jntR[2] : a_jntTbl_W[type - 16].jntPrm[jnt_no].jntR[2]) * 182.04445f;
 }
 
-/* 80982780-80982A98 002020 0318+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpcChat_cFP8J3DJointP8J3DModel */
 int daNpcChat_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     cXyz jntT(JntTX(mType, jntNo), JntTY(mType, jntNo), JntTZ(mType, jntNo));
@@ -2966,13 +2898,11 @@ int daNpcChat_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80982A98-80982AB8 002338 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpcChat_cFP10fopAc_ac_c */
 int daNpcChat_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcChat_c* i_this = (daNpcChat_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80982AB8-80982B04 002358 004C+00 2/2 0/0 0/0 .text            ctrlJointCallBack__11daNpcChat_cFP8J3DJointi */
 int daNpcChat_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -2985,7 +2915,6 @@ int daNpcChat_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80982B04-80982B60 0023A4 005C+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_CHAT) {
         ((daNpcChat_c*)i_data)->setTalkMember((daNpcChat_c*)i_actor);
@@ -2994,7 +2923,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80982B60-80982C10 002400 00B0+00 1/1 0/0 0/0 .text            searchGroup__11daNpcChat_cFv */
 BOOL daNpcChat_c::searchGroup() {
     switch (field_0xe38) {
         case 0:
@@ -3021,7 +2949,6 @@ BOOL daNpcChat_c::searchGroup() {
     return TRUE;
 }
 
-/* 80982C10-80982D20 0024B0 0110+00 3/2 0/0 0/0 .text            appearTimeCheck__11daNpcChat_cFv */
 BOOL daNpcChat_c::appearTimeCheck() {
     int time = dKy_darkworld_check() ? dKy_getDarktime_hour() : dKy_getdaytime_hour();
     BOOL rv = FALSE;
@@ -3079,7 +3006,6 @@ BOOL daNpcChat_c::appearTimeCheck() {
     return rv;
 }
 
-/* 80982D20-80982EB4 0025C0 0194+00 1/1 0/0 0/0 .text            appearCheck__11daNpcChat_cFv */
 BOOL daNpcChat_c::appearCheck() {
     if (searchGroup()) {
         if (mTalkNo == 0) {
@@ -3128,7 +3054,6 @@ BOOL daNpcChat_c::appearCheck() {
     return TRUE;
 }
 
-/* 80982EB4-80982F4C 002754 0098+00 1/0 0/0 0/0 .text            setParam__11daNpcChat_cFv */
 void daNpcChat_c::setParam() {
     if (checkHide()) {
         attention_info.flags = 0;
@@ -3148,7 +3073,6 @@ void daNpcChat_c::setParam() {
     #endif
 }
 
-/* 80982F4C-80982FA4 0027EC 0058+00 1/0 0/0 0/0 .text            main__11daNpcChat_cFv */
 BOOL daNpcChat_c::main() {
     if (mAction) {
         (this->*mAction)(NULL);
@@ -3158,7 +3082,6 @@ BOOL daNpcChat_c::main() {
     return TRUE;
 }
 
-/* 80982FA4-809830EC 002844 0148+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcChat_cFv */
 void daNpcChat_c::setAttnPos() {
     if (field_0xe1c == 1) {
         for (int i = 0; i < 3; i++) {
@@ -3180,7 +3103,6 @@ void daNpcChat_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 809830EC-80983168 00298C 007C+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcChat_cFi */
 bool daNpcChat_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* i_btp = getTexAnmP(i_index);
     if (i_btp == NULL) {
@@ -3197,7 +3119,6 @@ bool daNpcChat_c::setExpressionBtp(int i_index) {
     return false;
 }
 
-/* 80983168-80983584 002A08 041C+00 3/0 0/0 0/0 .text            setMotionAnm__11daNpcChat_cFif */
 void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* anm;
     int i_attr = J3DFrameCtrl::EMode_LOOP;
@@ -3533,7 +3454,6 @@ void daNpcChat_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80983584-809835C8 002E24 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpcChat_cFifi */
 void daNpcChat_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
 
@@ -3545,12 +3465,10 @@ void daNpcChat_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809835C8-809835D0 002E68 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcChat_cFv */
 int daNpcChat_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809835D0-809837A4 002E70 01D4+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpcChat_cFv */
 void daNpcChat_c::drawOtherMdls() {
     static int const a_jntNumTbl[13][2] = {
         -1, -1,
@@ -3592,7 +3510,6 @@ void daNpcChat_c::drawOtherMdls() {
     }
 }
 
-/* 809837A4-809837C0 003044 001C+00 1/1 0/0 0/0 .text            getTalkMotionNo__11daNpcChat_cFv */
 u8 daNpcChat_c::getTalkMotionNo() {
     u8 talkNo = home.angle.z & 0xFF;
     if (talkNo >= 35) {
@@ -3602,7 +3519,6 @@ u8 daNpcChat_c::getTalkMotionNo() {
     return talkNo;
 }
 
-/* 809837C0-809837EC 003060 002C+00 1/1 0/0 0/0 .text            getLookPlayerCheck__11daNpcChat_cFv */
 bool daNpcChat_c::getLookPlayerCheck() {
     u8 uVar1 = (home.angle.z >> 8) & 0xFF;
     if ((u32)uVar1 == 1 && !mTwilight) {
@@ -3612,7 +3528,6 @@ bool daNpcChat_c::getLookPlayerCheck() {
     return false;
 }
 
-/* 809837EC-809839E0 00308C 01F4+00 1/1 0/0 0/0 .text            reset__11daNpcChat_cFv */
 void daNpcChat_c::reset() {
     initialize();
     mLookat.initialize();
@@ -3664,7 +3579,6 @@ void daNpcChat_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 809839E0-80984DD0 003280 13F0+00 1/1 0/0 0/0 .text            playMotion__11daNpcChat_cFv */
 void daNpcChat_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_TALK_A, daNpcChat_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -3833,7 +3747,6 @@ void daNpcChat_c::playMotion() {
     }
 }
 
-/* 80984DD0-80984F34 004670 0164+00 1/1 0/0 0/0 .text            playMotionAnmLoop__11daNpcChat_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 void daNpcChat_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     daNpcF_anmPlayData* playData = NULL;
 
@@ -3869,7 +3782,6 @@ void daNpcChat_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 80984F34-80984FDC 0047D4 00A8+00 4/4 0/0 0/0 .text            setAction__11daNpcChat_cFM11daNpcChat_cFPCvPvPv_b */
 BOOL daNpcChat_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -3887,7 +3799,6 @@ BOOL daNpcChat_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80984FDC-809850D0 00487C 00F4+00 2/2 0/0 0/0 .text            step__11daNpcChat_cFsi */
 bool daNpcChat_c::step(s16 i_targetAngle, int param_2) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_targetAngle;
@@ -3915,7 +3826,6 @@ bool daNpcChat_c::step(s16 i_targetAngle, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 809850D0-80985104 004970 0034+00 1/1 0/0 0/0 .text            setTalkMember__11daNpcChat_cFP11daNpcChat_c */
 void daNpcChat_c::setTalkMember(daNpcChat_c* actor_p) {
     if (mTalkGroupNo == actor_p->getTalkGroupNo()) {
         int talkNo = actor_p->getTalkNo();
@@ -3929,7 +3839,6 @@ void daNpcChat_c::setTalkMember(daNpcChat_c* actor_p) {
     }
 }
 
-/* 80985104-8098552C 0049A4 0428+00 4/0 0/0 0/0 .text            wait__11daNpcChat_cFPv */
 bool daNpcChat_c::wait(void* param_1) {
     int staffId;
     int i_expression, i_motion;
@@ -4020,7 +3929,6 @@ bool daNpcChat_c::wait(void* param_1) {
     return true;
 }
 
-/* 8098552C-809856C8 004DCC 019C+00 2/0 0/0 0/0 .text            fear__11daNpcChat_cFPv */
 bool daNpcChat_c::fear(void* param_1) {
     switch (mMode) {
         case 0:
@@ -4060,7 +3968,6 @@ bool daNpcChat_c::fear(void* param_1) {
     return 1;
 }
 
-/* 809856C8-80985A84 004F68 03BC+00 1/0 0/0 0/0 .text            talk__11daNpcChat_cFPv */
 bool daNpcChat_c::talk(void* param_1) {
     bool rv = false;
 
@@ -4147,7 +4054,6 @@ bool daNpcChat_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80985A84-80985BCC 005324 0148+00 1/0 0/0 0/0 .text            demo__11daNpcChat_cFPv */
 bool daNpcChat_c::demo(void* param_1) {
     dComIfGp_getEventManager();
 
@@ -4192,34 +4098,28 @@ bool daNpcChat_c::demo(void* param_1) {
     return true;
 }
 
-/* 80985BCC-80985BEC 00546C 0020+00 1/0 0/0 0/0 .text            daNpcChat_Create__FPv */
 static int daNpcChat_Create(void* a_this) {
     return static_cast<daNpcChat_c*>(a_this)->Create();
 }
 
-/* 80985BEC-80985C0C 00548C 0020+00 1/0 0/0 0/0 .text            daNpcChat_Delete__FPv */
 static int daNpcChat_Delete(void* a_this) {
     return static_cast<daNpcChat_c*>(a_this)->Delete();
 }
 
-/* 80985C0C-80985C2C 0054AC 0020+00 1/0 0/0 0/0 .text            daNpcChat_Execute__FPv */
 static int daNpcChat_Execute(void* a_this) {
     return static_cast<daNpcChat_c*>(a_this)->Execute();
 }
 
-/* 80985C2C-80985C4C 0054CC 0020+00 1/0 0/0 0/0 .text            daNpcChat_Draw__FPv */
 static int daNpcChat_Draw(void* a_this) {
     return static_cast<daNpcChat_c*>(a_this)->Draw();
 }
 
-/* 80985C4C-80985C54 0054EC 0008+00 1/0 0/0 0/0 .text            daNpcChat_IsDelete__FPv */
 static int daNpcChat_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 8098B94C-8098B96C -00001 0020+00 1/0 0/0 0/0 .data            daNpcChat_MethodTable */
 static actor_method_class daNpcChat_MethodTable = {
     (process_method_func)daNpcChat_Create,
     (process_method_func)daNpcChat_Delete,
@@ -4228,7 +4128,6 @@ static actor_method_class daNpcChat_MethodTable = {
     (process_method_func)daNpcChat_Draw,
 };
 
-/* 8098B96C-8098B99C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CHAT */
 extern actor_process_profile_definition g_profile_NPC_CHAT = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp
index d7c277b391..ad1c90cf8b 100644
--- a/src/d/actor/d_a_npc_chin.cpp
+++ b/src/d/actor/d_a_npc_chin.cpp
@@ -11,10 +11,6 @@
 #include "d/d_meter2_info.h"
 #include "d/d_timer.h"
 
-//
-// Declarations:
-//
-
 enum Event {
     EVT_NONE,
     EVT_GAME_START,
@@ -26,14 +22,10 @@ enum Event {
     EVT_SPOTLIGHT_OFF,
 };
 
-/* ############################################################################################## */
-/* 809918F8-80991904 000000 000C+00 8/7 0/0 0/0 .rodata          sLoadResPat_Normal */
 static s16 const sLoadResPat_Normal[6] = {0, 1, 2, 4, 5, -1};
 
-/* 80991904-8099190C 00000C 0006+02 1/0 0/0 0/0 .rodata          sLoadResPat_Tw */
 static s16 const sLoadResPat_Tw[3] = {0, 3, -1};
 
-/* 8099190C-80991978 000014 006C+00 4/9 0/0 0/0 .rodata          m__17daNpcChin_Param_c */
 daNpcChin_HIOParam const daNpcChin_Param_c::m = {
     40.0f, -3.0f, 1.0f, 400.0f, 255.0f, 130.0f, 35.0f, 30.0f,
     0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
@@ -45,7 +37,6 @@ daNpcChin_HIOParam const daNpcChin_Param_c::m = {
     FALSE, FALSE,
 };
 
-/* 80991DFC-80991F88 000020 018C+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[33] = {
     {-1, 2, 0},
     {8, 0, 0},
@@ -82,7 +73,6 @@ static daNpc_GetParam2 l_bckGetParamList[33] = {
     {29, 2, 1},
 };
 
-/* 80991F88-8099203C 0001AC 00B4+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[15] = {
     {18, 2, 0},
     {20, 0, 0},
@@ -101,7 +91,6 @@ static daNpc_GetParam2 l_btpGetParamList[15] = {
     {50, 2, 1},
 };
 
-/* 8099203C-809920A8 000260 006C+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[9] = {
     {13, 2, 0},
     {14, 0, 0},
@@ -114,7 +103,6 @@ static daNpc_GetParam2 l_btkGetParamList[9] = {
     {7, 2, 5},
 };
 
-/* 809920A8-809920C0 -00001 0018+00 7/11 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[6] = {
     "Chin",
     "chin1",
@@ -124,13 +112,11 @@ static char* l_arcNames[6] = {
     "SpotLight",
 };
 
-/* 809920C0-809920C8 -00001 0008+00 2/2 0/0 0/0 .data            sLoadResInfo */
 static s16* sLoadResInfo[2] = {
     (s16*)sLoadResPat_Normal,
     (s16*)sLoadResPat_Tw,
 };
 
-/* 809920C8-809920E8 -00001 0020+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[8] = {
     NULL,
     "GAME_START",
@@ -142,10 +128,8 @@ static char* l_evtNames[8] = {
     "SPOTLIGHT_OFF",
 };
 
-/* 80992418-80992424 000008 000C+00 1/1 0/0 0/0 .bss             @3861 */
 static u8 lit_3861[12];
 
-/* 8099213C-8099219C 000360 0060+00 1/2 0/0 0/0 .data            mEvtSeqList__11daNpcChin_c */
 daNpcChin_c::eventFunc daNpcChin_c::mEvtSeqList[8] = {
     NULL,
     &daNpcChin_c::_Evt_GameStart,
@@ -157,10 +141,8 @@ daNpcChin_c::eventFunc daNpcChin_c::mEvtSeqList[8] = {
     &daNpcChin_c::_Evt_SpotLight_Off,
 };
 
-/* 80992424-80992428 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_CHIN_HIO_CLASS l_HIO;
 
-/* 8099219C-809921A0 -00001 0004+00 1/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "chin";
 
 #if DEBUG
@@ -173,8 +155,6 @@ void daNpcChin_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 8098BF0C-8098C000 0000EC 00F4+00 1/1 0/0 0/0 .text loadModel__Q211daNpcChin_c12_SpotLight_cFv
- */
 int daNpcChin_c::_SpotLight_c::loadModel() {
     void* modelData = NULL;
     void* anmTexSRTKey = NULL;
@@ -197,7 +177,6 @@ int daNpcChin_c::_SpotLight_c::loadModel() {
     return 1;
 }
 
-/* 8098C000-8098C060 0001E0 0060+00 1/1 0/0 0/0 .text setMtx__Q211daNpcChin_c12_SpotLight_cFv */
 void daNpcChin_c::_SpotLight_c::setMtx() {
     if (is_switch_on()) {
         mDoMtx_stack_c::transS(mPos);
@@ -207,8 +186,6 @@ void daNpcChin_c::_SpotLight_c::setMtx() {
     }
 }
 
-/* 8098C060-8098C104 000240 00A4+00 1/1 0/0 0/0 .text
- * draw__Q211daNpcChin_c12_SpotLight_cFP12dKy_tevstr_c          */
 void daNpcChin_c::_SpotLight_c::draw(dKy_tevstr_c* i_tevStr) {
     if (is_switch_on()) {
         g_env_light.settingTevStruct(0, &mPos, i_tevStr);
@@ -220,12 +197,10 @@ void daNpcChin_c::_SpotLight_c::draw(dKy_tevstr_c* i_tevStr) {
     }
 }
 
-/* 8098C104-8098C2D8 0002E4 01D4+00 1/1 0/0 0/0 .text            __ct__11daNpcChin_cFv */
 daNpcChin_c::daNpcChin_c() {
     mpSphMng = NULL;
 }
 
-/* 8098C2D8-8098C510 0004B8 0238+00 1/0 0/0 0/0 .text            __dt__11daNpcChin_cFv */
 daNpcChin_c::~daNpcChin_c() {
     if (!mTwilight) {
         dComIfG_TimerDeleteRequest(6);
@@ -254,7 +229,6 @@ daNpcChin_c::~daNpcChin_c() {
 #endif
 }
 
-/* 8098C510-8098C858 0006F0 0348+00 1/1 0/0 0/0 .text            Create__11daNpcChin_cFv */
 int daNpcChin_c::Create() {
     fopAcM_ct(this, daNpcChin_c);
 
@@ -345,7 +319,6 @@ int daNpcChin_c::Create() {
     return phase_state;
 }
 
-/* 8098C858-8098CB28 000A38 02D0+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcChin_cFv */
 int daNpcChin_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -400,7 +373,6 @@ static void dummy() {
     OS_REPORT("Delete -> NPC_CHIN(id=%d)\n");
 }
 
-/* 8098CCE4-8098CD18 000EC4 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcChin_cFv */
 int daNpcChin_c::Delete() {
     fpc_ProcID unusedId = fopAcM_GetID(this);
     OS_REPORT("----------------------daNpcChin_c::Delete!!\n");
@@ -408,7 +380,6 @@ int daNpcChin_c::Delete() {
     return 1;
 }
 
-/* 8098CD18-8098CD74 000EF8 005C+00 2/2 0/0 0/0 .text            Execute__11daNpcChin_cFv */
 int daNpcChin_c::Execute() {
     execute();
 
@@ -420,7 +391,6 @@ int daNpcChin_c::Execute() {
     return 1;
 }
 
-/* 8098CD74-8098CDE8 000F54 0074+00 1/1 0/0 0/0 .text            Draw__11daNpcChin_cFv */
 int daNpcChin_c::Draw() {
     J3DModelData* modelData = mAnm_p->getModel()->getModelData();
     modelData->getMaterialNodePointer(3)->setMaterialAnm(mpMatAnm);
@@ -431,8 +401,6 @@ int daNpcChin_c::Draw() {
     return 1;
 }
 
-/* 8098CDE8-8098CFB8 000FC8 01D0+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpcChin_cFP8J3DJointP8J3DModel                */
 int daNpcChin_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int jointNo = joint->getJntNo();
@@ -469,15 +437,11 @@ int daNpcChin_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8098CFB8-8098CFD8 001198 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpcChin_cFP10fopAc_ac_c              */
 int daNpcChin_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcChin_c* chin = (daNpcChin_c*)i_this;
     chin->CreateHeap();
 }
 
-/* 8098CFD8-8098D024 0011B8 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcChin_cFP8J3DJointi
- */
 int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -490,7 +454,6 @@ int daNpcChin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8098D024-8098D0F8 001204 00D4+00 1/0 0/0 0/0 .text            setParam__11daNpcChin_cFv */
 void daNpcChin_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] =
         getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle);
@@ -519,7 +482,6 @@ void daNpcChin_c::setParam() {
 #endif
 }
 
-/* 8098D0F8-8098D198 0012D8 00A0+00 1/0 0/0 0/0 .text            main__11daNpcChin_cFv */
 int daNpcChin_c::main() {
     Action();
 
@@ -536,7 +498,6 @@ int daNpcChin_c::main() {
     return 1;
 }
 
-/* 8098D198-8098D26C 001378 00D4+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcChin_cFv */
 int daNpcChin_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* var_r29 = 0;
@@ -553,7 +514,6 @@ int daNpcChin_c::ctrlBtk() {
     return 0;
 }
 
-/* 8098D26C-8098D58C 00144C 0320+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcChin_cFv */
 void daNpcChin_c::setAttnPos() {
     if (mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -596,8 +556,6 @@ void daNpcChin_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mObjInf);
 }
 
-/* 8098D58C-8098D848 00176C 02BC+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcChin_cFib
- */
 bool daNpcChin_c::setExpressionAnm(int param_0, bool param_1) {
     mAnmFlags = mAnmFlags & ~0x1fc0;
 
@@ -676,8 +634,6 @@ bool daNpcChin_c::setExpressionAnm(int param_0, bool param_1) {
     }
 }
 
-/* 8098D848-8098D938 001A28 00F0+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcChin_cFi
- */
 bool daNpcChin_c::setExpressionBtp(int param_0) {
     J3DAnmTexPattern* anmTexPattern = NULL;
     if (l_btpGetParamList[param_0].fileIdx >= 0) {
@@ -706,7 +662,6 @@ bool daNpcChin_c::setExpressionBtp(int param_0) {
     }
 }
 
-/* 8098D938-8098DB44 001B18 020C+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpcChin_cFif */
 void daNpcChin_c::setMotionAnm(int param_0, f32 param_1) {
     int iVar5;
     switch (param_0) {
@@ -787,7 +742,6 @@ void daNpcChin_c::setMotionAnm(int param_0, f32 param_1) {
     }
 }
 
-/* 8098DB44-8098DB70 001D24 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpcChin_cFif */
 void daNpcChin_c::setExpression(int i_index, f32 i_morf) {
     if (i_index >= 0 && i_index < 15) {
         mExpression = i_index;
@@ -797,7 +751,6 @@ void daNpcChin_c::setExpression(int i_index, f32 i_morf) {
     }
 }
 
-/* 8098DB70-8098DBB4 001D50 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpcChin_cFifi */
 void daNpcChin_c::setMotion(int i_index, f32 i_morf, int param_2) {
     s16 param_0_copy = i_index;
     if ((param_2 != 0 || mMotion != param_0_copy) && i_index >= 0 && i_index < 18) {
@@ -808,7 +761,6 @@ void daNpcChin_c::setMotion(int i_index, f32 i_morf, int param_2) {
     }
 }
 
-/* 8098DBB4-8098DBBC 001D94 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcChin_cFv */
 int daNpcChin_c::drawDbgInfo() {
 #if DEBUG
     if (mpHIO->m.common.debug_info_ON == 0) {
@@ -857,7 +809,6 @@ int daNpcChin_c::drawDbgInfo() {
     return 0;
 }
 
-/* 8098DBBC-8098DCD0 001D9C 0114+00 1/1 0/0 0/0 .text            reset__11daNpcChin_cFv */
 void daNpcChin_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -890,7 +841,6 @@ void daNpcChin_c::reset() {
     setAction(&daNpcChin_c::wait);
 }
 
-/* 8098DCD0-8098E04C 001EB0 037C+00 1/1 0/0 0/0 .text            playExpression__11daNpcChin_cFv */
 void daNpcChin_c::playExpression() {
     daNpcF_anmPlayData dat0 = {1, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -946,7 +896,6 @@ void daNpcChin_c::playExpression() {
     }
 }
 
-/* 8098E04C-8098E5C4 00222C 0578+00 1/1 0/0 0/0 .text            playMotion__11daNpcChin_cFv */
 void daNpcChin_c::playMotion() {
 
     daNpcF_anmPlayData dat0a = {15, mpHIO->m.common.morf_frame, 0};
@@ -1021,8 +970,6 @@ void daNpcChin_c::playMotion() {
     }
 }
 
-/* 8098E5C4-8098E66C 0027A4 00A8+00 5/5 0/0 0/0 .text
- * setAction__11daNpcChin_cFM11daNpcChin_cFPCvPvPv_b            */
 int daNpcChin_c::setAction(actionFunc i_func) {
     mActionMode = -1;
 
@@ -1040,14 +987,12 @@ int daNpcChin_c::setAction(actionFunc i_func) {
     return 1;
 }
 
-/* 8098E66C-8098E690 00284C 0024+00 8/8 0/0 0/0 .text            setLookMode__11daNpcChin_cFi */
 void daNpcChin_c::setLookMode(int i_mode) {
     if (i_mode >= 0 && i_mode < 4 && i_mode != mLookMode) {
         mLookMode = i_mode;
     }
 }
 
-/* 8098E690-8098E870 002870 01E0+00 1/1 0/0 0/0 .text            lookat__11daNpcChin_cFv */
 void daNpcChin_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1101,7 +1046,6 @@ void daNpcChin_c::lookat() {
     mLookat1.calc(this, model->getBaseTRMtx(), lookatAngles, snap, angleDiff, 0);
 }
 
-/* 8098E870-8098EA00 002A50 0190+00 2/2 0/0 0/0 .text            step__11daNpcChin_cFsii */
 bool daNpcChin_c::step(s16 param_0, int param_1, int param_2) {
     if (mTurnMode == 0) {
         s16 angleDiff = param_0 - mCurAngle.y;
@@ -1138,7 +1082,6 @@ bool daNpcChin_c::step(s16 param_0, int param_1, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 8098EA00-8098EACC 002BE0 00CC+00 1/1 0/0 0/0 .text            chkFindPlayer__11daNpcChin_cFv */
 BOOL daNpcChin_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), mpHIO->m.common.fov)) {
         mActorMngrs[0].remove();
@@ -1161,7 +1104,6 @@ BOOL daNpcChin_c::chkFindPlayer() {
     return inTalkArea;
 }
 
-/* 8098EACC-8098EBE8 002CAC 011C+00 2/1 0/0 0/0 .text setExpressionTalkAfter__11daNpcChin_cFv */
 void daNpcChin_c::setExpressionTalkAfter() {
     switch (mExpression) {
     case 1:
@@ -1188,7 +1130,6 @@ void daNpcChin_c::setExpressionTalkAfter() {
     }
 }
 
-/* 8098EBE8-8098EFE4 002DC8 03FC+00 9/0 0/0 0/0 .text            wait__11daNpcChin_cFPv */
 bool daNpcChin_c::wait(void* param_0) {
     switch (mActionMode) {
     case 0:
@@ -1302,7 +1243,6 @@ bool daNpcChin_c::wait(void* param_0) {
     return true;
 }
 
-/* 8098EFE4-8098F208 0031C4 0224+00 1/0 0/0 0/0 .text            talk__11daNpcChin_cFPv */
 bool daNpcChin_c::talk(void* param_0) {
     int unusedInt1 = 0;
     bool result = false;
@@ -1368,7 +1308,6 @@ bool daNpcChin_c::talk(void* param_0) {
     return result;
 }
 
-/* 8098F208-8098F2BC 0033E8 00B4+00 6/6 0/0 0/0 .text            _talk_motion__11daNpcChin_cFv */
 void daNpcChin_c::_talk_motion() {
     int exprIdx;
     int motionIdx;
@@ -1382,7 +1321,6 @@ void daNpcChin_c::_talk_motion() {
     }
 }
 
-/* 8098F2BC-8098F414 00349C 0158+00 2/0 0/0 0/0 .text            demo__11daNpcChin_cFPv */
 bool daNpcChin_c::demo(void* param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int unusedInt1 = 0;
@@ -1436,7 +1374,6 @@ bool daNpcChin_c::demo(void* param_0) {
     return true;
 }
 
-/* 8098F414-8098F758 0035F4 0344+00 2/0 0/0 0/0 .text            watch_game__11daNpcChin_cFPv */
 bool daNpcChin_c::watch_game(void* param_0) {
     switch (mActionMode) {
     case 0: {
@@ -1511,7 +1448,6 @@ bool daNpcChin_c::watch_game(void* param_0) {
     return true;
 }
 
-/* 8098F758-8098FB3C 003938 03E4+00 1/1 0/0 0/0 .text            Event_DT__11daNpcChin_cFv */
 void daNpcChin_c::Event_DT() {
     int local_60 = 0;
 
@@ -1591,7 +1527,6 @@ void daNpcChin_c::Event_DT() {
     }
 }
 
-/* 8098FB3C-8098FD38 003D1C 01FC+00 1/1 0/0 0/0 .text            isGameEnd__11daNpcChin_cFRi */
 BOOL daNpcChin_c::isGameEnd(int& param_0) {
     param_0 = -1;
 
@@ -1632,17 +1567,14 @@ BOOL daNpcChin_c::isGameEnd(int& param_0) {
     return 0;
 }
 
-/* 8098FD38-8098FD5C 003F18 0024+00 1/1 0/0 0/0 .text            _chkGameClear__11daNpcChin_cFv */
 BOOL daNpcChin_c::_chkGameClear() {
     return mpSphMng->isAllGet();
 }
 
-/* 8098FD5C-8098FD80 003F3C 0024+00 1/1 0/0 0/0 .text            SphereReset__11daNpcChin_cFv */
 void daNpcChin_c::SphereReset() {
     mpSphMng->setting();
 }
 
-/* 8098FD80-8098FE28 003F60 00A8+00 1/0 0/0 0/0 .text            _Evt_GameStart__11daNpcChin_cFi */
 int daNpcChin_c::_Evt_GameStart(int param_0) {
     dEvent_manager_c* this_00 = &dComIfGp_getEventManager();
 
@@ -1666,7 +1598,6 @@ int daNpcChin_c::_Evt_GameStart(int param_0) {
     return _Evt_GameStart_CutMain(a_nowCut);
 }
 
-/* 8098FE28-8098FF30 004008 0108+00 1/1 0/0 0/0 .text _Evt_GameStart_CutInit__11daNpcChin_cFRCi */
 int daNpcChin_c::_Evt_GameStart_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -1703,7 +1634,6 @@ int daNpcChin_c::_Evt_GameStart_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 8098FF30-8098FFD0 004110 00A0+00 1/1 0/0 0/0 .text _Evt_GameStart_CutMain__11daNpcChin_cFRCi */
 int daNpcChin_c::_Evt_GameStart_CutMain(const int& param_0) {
     int result = 0;
     switch (param_0) {
@@ -1728,7 +1658,6 @@ int daNpcChin_c::_Evt_GameStart_CutMain(const int& param_0) {
     return result;
 }
 
-/* 8098FFD0-80990078 0041B0 00A8+00 1/0 0/0 0/0 .text            _Evt_GameFailed__11daNpcChin_cFi */
 int daNpcChin_c::_Evt_GameFailed(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* piVar1 = NULL;
@@ -1748,8 +1677,6 @@ int daNpcChin_c::_Evt_GameFailed(int param_0) {
     return _Evt_GameFailed_CutMain(local_18);
 }
 
-/* 80990078-80990174 004258 00FC+00 1/1 0/0 0/0 .text _Evt_GameFailed_CutInit__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameFailed_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -1775,8 +1702,6 @@ int daNpcChin_c::_Evt_GameFailed_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 80990174-80990218 004354 00A4+00 1/1 0/0 0/0 .text _Evt_GameFailed_CutMain__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameFailed_CutMain(const int& param_0) {
     int result = 0;
 
@@ -1796,8 +1721,6 @@ int daNpcChin_c::_Evt_GameFailed_CutMain(const int& param_0) {
     return result;
 }
 
-/* 80990218-809902C0 0043F8 00A8+00 1/0 0/0 0/0 .text            _Evt_GameSucceed__11daNpcChin_cFi
- */
 int daNpcChin_c::_Evt_GameSucceed(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
 
@@ -1817,8 +1740,6 @@ int daNpcChin_c::_Evt_GameSucceed(int param_0) {
     return _Evt_GameSucceed_CutMain(cutId);
 }
 
-/* 809902C0-8099041C 0044A0 015C+00 1/1 0/0 0/0 .text _Evt_GameSucceed_CutInit__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameSucceed_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -1861,8 +1782,6 @@ int daNpcChin_c::_Evt_GameSucceed_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 8099041C-809905C4 0045FC 01A8+00 1/1 0/0 0/0 .text _Evt_GameSucceed_CutMain__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameSucceed_CutMain(const int& param_0) {
     int itemId1;
 
@@ -1912,8 +1831,6 @@ int daNpcChin_c::_Evt_GameSucceed_CutMain(const int& param_0) {
     return result;
 }
 
-/* 809905C4-8099066C 0047A4 00A8+00 1/0 0/0 0/0 .text            _Evt_SelectGiveUp__11daNpcChin_cFi
- */
 int daNpcChin_c::_Evt_SelectGiveUp(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutId_p = NULL;
@@ -1933,8 +1850,6 @@ int daNpcChin_c::_Evt_SelectGiveUp(int param_0) {
     return _Evt_SelectGiveUp_CutMain(cutId);
 }
 
-/* 8099066C-8099071C 00484C 00B0+00 1/1 0/0 0/0 .text _Evt_SelectGiveUp_CutInit__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_SelectGiveUp_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -1956,8 +1871,6 @@ int daNpcChin_c::_Evt_SelectGiveUp_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 8099071C-809907AC 0048FC 0090+00 1/1 0/0 0/0 .text _Evt_SelectGiveUp_CutMain__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_SelectGiveUp_CutMain(const int& param_0) {
     int result = 0;
 
@@ -1981,7 +1894,6 @@ int daNpcChin_c::_Evt_SelectGiveUp_CutMain(const int& param_0) {
     return result;
 }
 
-/* 809907AC-80990854 00498C 00A8+00 1/0 0/0 0/0 .text            _Evt_GameGiveUp__11daNpcChin_cFi */
 int daNpcChin_c::_Evt_GameGiveUp(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
 
@@ -2002,8 +1914,6 @@ int daNpcChin_c::_Evt_GameGiveUp(int param_0) {
     return _Evt_GameGiveUp_CutMain(cutId);
 }
 
-/* 80990854-80990950 004A34 00FC+00 1/1 0/0 0/0 .text _Evt_GameGiveUp_CutInit__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameGiveUp_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -2027,8 +1937,6 @@ int daNpcChin_c::_Evt_GameGiveUp_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 80990950-809909F4 004B30 00A4+00 1/1 0/0 0/0 .text _Evt_GameGiveUp_CutMain__11daNpcChin_cFRCi
- */
 int daNpcChin_c::_Evt_GameGiveUp_CutMain(const int& param_0) {
     int result = 0;
 
@@ -2049,7 +1957,6 @@ int daNpcChin_c::_Evt_GameGiveUp_CutMain(const int& param_0) {
     return result;
 }
 
-/* 809909F4-80990A9C 004BD4 00A8+00 1/0 0/0 0/0 .text            _Evt_Appear__11daNpcChin_cFi */
 int daNpcChin_c::_Evt_Appear(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutId_p = NULL;
@@ -2069,7 +1976,6 @@ int daNpcChin_c::_Evt_Appear(int param_0) {
     return _Evt_Appear_CutMain(cutId);
 }
 
-/* 80990A9C-80990BD8 004C7C 013C+00 1/1 0/0 0/0 .text _Evt_Appear_CutInit__11daNpcChin_cFRCi */
 int daNpcChin_c::_Evt_Appear_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -2100,7 +2006,6 @@ int daNpcChin_c::_Evt_Appear_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 80990BD8-80990C9C 004DB8 00C4+00 1/1 0/0 0/0 .text _Evt_Appear_CutMain__11daNpcChin_cFRCi */
 int daNpcChin_c::_Evt_Appear_CutMain(const int& param_0) {
     int result = 0;
 
@@ -2132,8 +2037,6 @@ int daNpcChin_c::_Evt_Appear_CutMain(const int& param_0) {
     return result;
 }
 
-/* 80990C9C-80990D44 004E7C 00A8+00 1/0 0/0 0/0 .text            _Evt_SpotLight_Off__11daNpcChin_cFi
- */
 int daNpcChin_c::_Evt_SpotLight_Off(int param_0) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int *cutId_p = NULL;
@@ -2153,8 +2056,6 @@ int daNpcChin_c::_Evt_SpotLight_Off(int param_0) {
     return _Evt_SpotLight_Off_CutMain(cutId);
 }
 
-/* 80990D44-80990DDC 004F24 0098+00 1/1 0/0 0/0 .text
- * _Evt_SpotLight_Off_CutInit__11daNpcChin_cFRCi                */
 int daNpcChin_c::_Evt_SpotLight_Off_CutInit(const int& param_0) {
     switch (param_0) {
     case 10:
@@ -2171,8 +2072,6 @@ int daNpcChin_c::_Evt_SpotLight_Off_CutInit(const int& param_0) {
     return 1;
 }
 
-/* 80990DDC-80990E14 004FBC 0038+00 1/1 0/0 0/0 .text
- * _Evt_SpotLight_Off_CutMain__11daNpcChin_cFRCi                */
 int daNpcChin_c::_Evt_SpotLight_Off_CutMain(const int& param_0) {
     int result = 0;
 
@@ -2192,32 +2091,26 @@ int daNpcChin_c::_Evt_SpotLight_Off_CutMain(const int& param_0) {
     return result;
 }
 
-/* 80990E14-80990E34 004FF4 0020+00 1/0 0/0 0/0 .text            daNpcChin_Create__FPv */
 static int daNpcChin_Create(void* i_this) {
     return ((daNpcChin_c*)i_this)->Create();
 }
 
-/* 80990E34-80990E54 005014 0020+00 1/0 0/0 0/0 .text            daNpcChin_Delete__FPv */
 static int daNpcChin_Delete(void* i_this) {
     return ((daNpcChin_c*)i_this)->Delete();
 }
 
-/* 80990E54-80990E74 005034 0020+00 1/0 0/0 0/0 .text            daNpcChin_Execute__FPv */
 static int daNpcChin_Execute(void* i_this) {
     return ((daNpcChin_c*)i_this)->Execute();
 }
 
-/* 80990E74-80990E94 005054 0020+00 1/0 0/0 0/0 .text            daNpcChin_Draw__FPv */
 static int daNpcChin_Draw(void* i_this) {
     return ((daNpcChin_c*)i_this)->Draw();
 }
 
-/* 80990E94-80990E9C 005074 0008+00 1/0 0/0 0/0 .text            daNpcChin_IsDelete__FPv */
 static int daNpcChin_IsDelete(void* param_0) {
     return TRUE;
 }
 
-/* 809922DC-809922FC -00001 0020+00 1/0 0/0 0/0 .data            daNpcChin_MethodTable */
 static actor_method_class daNpcChin_MethodTable = {
     (process_method_func)daNpcChin_Create,
     (process_method_func)daNpcChin_Delete,
@@ -2226,7 +2119,6 @@ static actor_method_class daNpcChin_MethodTable = {
     (process_method_func)daNpcChin_Draw,
 };
 
-/* 809922FC-8099232C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CHIN */
 extern actor_process_profile_definition g_profile_NPC_CHIN = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp
index 80df8559ce..020fc6bc0c 100644
--- a/src/d/actor/d_a_npc_clerka.cpp
+++ b/src/d/actor/d_a_npc_clerka.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_clerka.h"
 #include "d/d_msg_object.h"
 
-/* 80995870-80995900 000000 0090+00 9/9 0/0 0/0 .rodata          m__20daNpc_clerkA_Param_c */
 const daNpc_clerkA_HIOParam daNpc_clerkA_Param_c::m = {
     220.0f,  // attention_offset
     -3.0f,   // gravity
@@ -69,54 +68,45 @@ void daNpc_clerkA_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 809959B4-809959BC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {19, 1},
 };
 
-/* 809959BC-809959D4 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 809959D4-809959DC -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "clerkA",
 };
 
-/* 809959DC-809959E0 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 809959E0-809959E8 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 809959E8-80995A74 000054 008C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
     {-1, 0, 0, 25, 2, 1, 1}, {6, 0, 1, 26, 0, 1, 0}, {7, 0, 1, 27, 0, 1, 0},
     {8, 0, 1, 28, 0, 1, 0},  {9, 2, 1, 29, 2, 1, 0},
 };
 
-/* 80995A74-80995B38 0000E0 00C4+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[7] = {
     {15, 2, 1, 22, 0, 1, 1, 0}, {16, 2, 1, 22, 0, 1, 1, 0}, {10, 0, 1, 22, 0, 1, 1, 0},
     {11, 0, 1, 22, 0, 1, 1, 0}, {12, 0, 1, 22, 0, 1, 1, 0}, {13, 0, 1, 22, 0, 1, 1, 0},
     {14, 0, 1, 22, 0, 1, 1, 0},
 };
 
-/* 80995B38-80995B88 0001A4 0050+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0},
     {-1, 0, 0}, {3, -1, 1}, {4, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0},
     {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80995B88-80995BF8 0001F4 0070+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[28] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, 0, 0},  {-1, 0, 0},
     {-1, 0, 0}, {4, -1, 1}, {0, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {1, 0, 0},
@@ -124,13 +114,10 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[28] = {
     {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -9, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80995BF8-80995BFC -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__14daNpc_clerkA_c */
 char* daNpc_clerkA_c::mCutNameList[1] = {""};
 
-/* 80995BFC-80995C08 000268 000C+00 2/2 0/0 0/0 .data            mCutList__14daNpc_clerkA_c */
 daNpc_clerkA_c::cutFunc daNpc_clerkA_c::mCutList[1] = {NULL};
 
-/* 8099252C-8099266C 0000EC 0140+00 1/0 0/0 0/0 .text            __dt__14daNpc_clerkA_cFv */
 daNpc_clerkA_c::~daNpc_clerkA_c() {
     deleteObject();
 
@@ -141,7 +128,6 @@ daNpc_clerkA_c::~daNpc_clerkA_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 8099266C-80992914 00022C 02A8+00 1/1 0/0 0/0 .text            create__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::create() {
     daNpcT_ct(this, daNpc_clerkA_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -188,7 +174,6 @@ int daNpc_clerkA_c::create() {
     return phase;
 }
 
-/* 80992914-80992B94 0004D4 0280+00 1/1 0/0 0/0 .text            CreateHeap__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::CreateHeap() {
     int res_idx = l_bmdData[0][1];
     int bmd_idx = l_bmdData[0][0];
@@ -222,14 +207,12 @@ int daNpc_clerkA_c::CreateHeap() {
     return 0;
 }
 
-/* 80992D50-80992D84 000910 0034+00 1/1 0/0 0/0 .text            Delete__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_clerkA_c();
     return 1;
 }
 
-/* 80992D84-80992E5C 000944 00D8+00 2/2 0/0 0/0 .text            Execute__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == TYPE_SHOP && mShopFlag == 0) {
         initShopSystem();
@@ -248,7 +231,6 @@ int daNpc_clerkA_c::Execute() {
     return 1;
 }
 
-/* 80992E5C-80992EF0 000A1C 0094+00 1/1 0/0 0/0 .text            Draw__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -257,14 +239,10 @@ int daNpc_clerkA_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80992EF0-80992F10 000AB0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daNpc_clerkA_cFP10fopAc_ac_c           */
 int daNpc_clerkA_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_clerkA_c*)i_this)->CreateHeap();
 }
 
-/* 80992F10-80992F68 000AD0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__14daNpc_clerkA_cFP8J3DJointi              */
 int daNpc_clerkA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -277,7 +255,6 @@ int daNpc_clerkA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80992F68-80992F88 000B28 0020+00 1/1 0/0 0/0 .text            getType__14daNpc_clerkA_cFv */
 u8 daNpc_clerkA_c::getType() {
     switch ((fopAcM_GetParam(this) & 0xFF)) {
     case 0:
@@ -286,7 +263,6 @@ u8 daNpc_clerkA_c::getType() {
     return TYPE_1;
 }
 
-/* 80992F88-80992FB8 000B48 0030+00 1/1 0/0 0/0 .text            isDelete__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::isDelete() {
     if (mType == TYPE_1) {
         return 0;
@@ -298,7 +274,6 @@ int daNpc_clerkA_c::isDelete() {
     return 1;
 }
 
-/* 80992FB8-809930EC 000B78 0134+00 1/1 0/0 0/0 .text            reset__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::reset() {
     initialize();
 
@@ -317,7 +292,6 @@ void daNpc_clerkA_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 809930EC-80993170 000CAC 0084+00 1/0 0/0 0/0 .text            afterJntAnm__14daNpc_clerkA_cFi */
 void daNpc_clerkA_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -328,7 +302,6 @@ void daNpc_clerkA_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80993170-809932A4 000D30 0134+00 1/0 0/0 0/0 .text            setParam__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::setParam() {
     if (field_0x10ee != 0) {
         if (mShopProcess == 2) {
@@ -368,7 +341,6 @@ void daNpc_clerkA_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 809932A4-80993330 000E64 008C+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::setAfterTalkMotion() {
     int idx;
 
@@ -386,7 +358,6 @@ void daNpc_clerkA_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80993330-8099338C 000EF0 005C+00 1/1 0/0 0/0 .text            srchActors__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::srchActors() {
     switch (mType) {
     case TYPE_SHOP:
@@ -397,7 +368,6 @@ void daNpc_clerkA_c::srchActors() {
     }
 }
 
-/* 8099338C-80993568 000F4C 01DC+00 1/0 0/0 0/0 .text            evtTalk__14daNpc_clerkA_cFv */
 BOOL daNpc_clerkA_c::evtTalk() {
     if (mShopFlag) {
         if (chkAction(&daNpc_clerkA_c::shop)) {
@@ -435,7 +405,6 @@ BOOL daNpc_clerkA_c::evtTalk() {
     return TRUE;
 }
 
-/* 80993568-80993630 001128 00C8+00 1/0 0/0 0/0 .text            evtCutProc__14daNpc_clerkA_cFv */
 BOOL daNpc_clerkA_c::evtCutProc() {
     BOOL rv = FALSE;
 
@@ -454,7 +423,6 @@ BOOL daNpc_clerkA_c::evtCutProc() {
     return rv;
 }
 
-/* 80993630-8099371C 0011F0 00EC+00 1/0 0/0 0/0 .text            action__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -470,14 +438,12 @@ void daNpc_clerkA_c::action() {
     }
 }
 
-/* 8099371C-80993794 0012DC 0078+00 1/0 0/0 0/0 .text            beforeMove__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80993794-80993A40 001354 02AC+00 1/0 0/0 0/0 .text            setAttnPos__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::setAttnPos() {
     cXyz cStack_3c(-30.0f, 15.0f, 0.0f);
     cXyz cStack_48(0.0f, 15.0f, 0.0f);
@@ -508,7 +474,6 @@ void daNpc_clerkA_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80993A40-80993B74 001600 0134+00 1/0 0/0 0/0 .text            setCollision__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::setCollision() {
     cXyz pos;
     u32 tgType = 0xD8FBFDFF;
@@ -545,12 +510,10 @@ void daNpc_clerkA_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80993B74-80993B7C 001734 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80993B7C-80993BDC 00173C 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__14daNpc_clerkA_cFv */
 void daNpc_clerkA_c::drawOtherMdl() {
     if (mShopFlag) {
         cXyz pos;
@@ -561,7 +524,6 @@ void daNpc_clerkA_c::drawOtherMdl() {
     }
 }
 
-/* 80993BDC-80993C58 00179C 007C+00 1/1 0/0 0/0 .text            selectAction__14daNpc_clerkA_cFv */
 int daNpc_clerkA_c::selectAction() {
     mNextAction = NULL;
 
@@ -577,14 +539,10 @@ int daNpc_clerkA_c::selectAction() {
     return TRUE;
 }
 
-/* 80993C58-80993C84 001818 002C+00 1/1 0/0 0/0 .text
- * chkAction__14daNpc_clerkA_cFM14daNpc_clerkA_cFPCvPvPv_i      */
 int daNpc_clerkA_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80993C84-80993D2C 001844 00A8+00 2/2 0/0 0/0 .text
- * setAction__14daNpc_clerkA_cFM14daNpc_clerkA_cFPCvPvPv_i      */
 int daNpc_clerkA_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -600,7 +558,6 @@ int daNpc_clerkA_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80993D2C-80993F84 0018EC 0258+00 1/0 0/0 0/0 .text            wait__14daNpc_clerkA_cFPv */
 int daNpc_clerkA_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -643,7 +600,6 @@ int daNpc_clerkA_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80993F84-809941B8 001B44 0234+00 1/0 0/0 0/0 .text            tend__14daNpc_clerkA_cFPv */
 int daNpc_clerkA_c::tend(void* param_0) {
     int sVar1 = mpHIO->m.field_0x8c;
 
@@ -692,7 +648,6 @@ int daNpc_clerkA_c::tend(void* param_0) {
     return 1;
 }
 
-/* 809941B8-809943B0 001D78 01F8+00 2/0 0/0 0/0 .text            talk__14daNpc_clerkA_cFPv */
 int daNpc_clerkA_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -729,7 +684,6 @@ int daNpc_clerkA_c::talk(void* param_0) {
     return 0;
 }
 
-/* 809943B0-809947E4 001F70 0434+00 2/0 0/0 0/0 .text            shop__14daNpc_clerkA_cFPv */
 int daNpc_clerkA_c::shop(void* param_0) {
     cXyz cam_ctr_pos;
     cXyz cStack_3c;
@@ -806,42 +760,34 @@ int daNpc_clerkA_c::shop(void* param_0) {
     return 0;
 }
 
-/* 809947E4-80994804 0023A4 0020+00 1/0 0/0 0/0 .text            daNpc_clerkA_Create__FPv */
 static int daNpc_clerkA_Create(void* i_this) {
     return static_cast<daNpc_clerkA_c*>(i_this)->create();
 }
 
-/* 80994804-80994824 0023C4 0020+00 1/0 0/0 0/0 .text            daNpc_clerkA_Delete__FPv */
 static int daNpc_clerkA_Delete(void* i_this) {
     return static_cast<daNpc_clerkA_c*>(i_this)->Delete();
 }
 
-/* 80994824-80994844 0023E4 0020+00 1/0 0/0 0/0 .text            daNpc_clerkA_Execute__FPv */
 static int daNpc_clerkA_Execute(void* i_this) {
     return static_cast<daNpc_clerkA_c*>(i_this)->Execute();
 }
 
-/* 80994844-80994864 002404 0020+00 1/0 0/0 0/0 .text            daNpc_clerkA_Draw__FPv */
 static int daNpc_clerkA_Draw(void* i_this) {
     return static_cast<daNpc_clerkA_c*>(i_this)->Draw();
 }
 
-/* 80994864-8099486C 002424 0008+00 1/0 0/0 0/0 .text            daNpc_clerkA_IsDelete__FPv */
 static int daNpc_clerkA_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80995E2C-80995E30 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_CLERKA_HIO_CLASS l_HIO;
 
-/* 80995C50-80995C70 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_clerkA_MethodTable */
 static actor_method_class daNpc_clerkA_MethodTable = {
     (process_method_func)daNpc_clerkA_Create,  (process_method_func)daNpc_clerkA_Delete,
     (process_method_func)daNpc_clerkA_Execute, (process_method_func)daNpc_clerkA_IsDelete,
     (process_method_func)daNpc_clerkA_Draw,
 };
 
-/* 80995C70-80995CA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CLERKA */
 extern actor_process_profile_definition g_profile_NPC_CLERKA = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp
index 30bf44cbe4..1f21f35fa0 100644
--- a/src/d/actor/d_a_npc_clerkb.cpp
+++ b/src/d/actor/d_a_npc_clerkb.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_clerkb.h"
 #include "d/d_msg_object.h"
 
-/* 80999978-80999A0C 000000 0094+00 10/10 0/0 0/0 .rodata          m__20daNpc_clerkB_Param_c */
 const daNpc_clerkB_HIOParam daNpc_clerkB_Param_c::m = {
     220.0f,  // attention_offset
     -3.0f,   // gravity
@@ -70,48 +69,40 @@ void daNpc_clerkB_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80999AD0-80999AD8 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {26, 1},
 };
 
-/* 80999AD8-80999AF0 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80999AF0-80999AF8 -00001 0008+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "clerkB",
 };
 
-/* 80999AF8-80999AFC 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80999AFC-80999B04 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80999B04-80999C00 000054 00FC+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = {
     {-1, 0, 0, 35, 2, 1, 1}, {12, 0, 1, 40, 0, 1, 0}, {8, 0, 1, 36, 0, 1, 0},
     {10, 0, 1, 38, 0, 1, 0}, {11, 0, 1, 39, 0, 1, 0}, {9, 0, 1, 37, 0, 1, 0},
     {14, 2, 1, 42, 2, 1, 0}, {15, 2, 1, 43, 2, 1, 0}, {13, 2, 1, 35, 2, 1, 1},
 };
 
-/* 80999C00-80999CFC 000150 00FC+00 1/2 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[9] = {
     {23, 2, 1, 32, 0, 1, 1, 0}, {22, 2, 1, 32, 0, 1, 1, 0}, {20, 2, 1, 32, 0, 1, 1, 0},
     {7, 0, 1, 32, 0, 1, 1, 0},  {21, 0, 1, 32, 0, 1, 1, 0}, {17, 2, 1, 32, 0, 1, 1, 0},
     {16, 2, 1, 32, 0, 1, 1, 0}, {19, 0, 1, 32, 0, 1, 1, 0}, {18, 0, 1, 32, 0, 1, 1, 0},
 };
 
-/* 80999CFC-80999D8C 00024C 0090+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {6, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {7, 0, 0},  {-1, 0, 0}, {-1, 0, 0},
@@ -120,7 +111,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80999D8C-80999E1C 0002DC 0090+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, 0, 1},  {1, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {4, 0, 1},  {2, 0, 0},  {-1, 0, 0}, {-1, 0, 0},
@@ -129,13 +119,10 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {8, -1, 1}, {2, 0, 0},  {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80999E1C-80999E20 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__14daNpc_clerkB_c */
 char* daNpc_clerkB_c::mCutNameList[1] = {""};
 
-/* 80999E20-80999E2C 000370 000C+00 2/2 0/0 0/0 .data            mCutList__14daNpc_clerkB_c */
 daNpc_clerkB_c::cutFunc daNpc_clerkB_c::mCutList[1] = {NULL};
 
-/* 80995F2C-80996090 0000EC 0164+00 1/0 0/0 0/0 .text            __dt__14daNpc_clerkB_cFv */
 daNpc_clerkB_c::~daNpc_clerkB_c() {
     deleteObject();
 
@@ -146,7 +133,6 @@ daNpc_clerkB_c::~daNpc_clerkB_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80996090-80996338 000250 02A8+00 1/1 0/0 0/0 .text            create__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::create() {
     daNpcT_ct(this, daNpc_clerkB_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -193,7 +179,6 @@ int daNpc_clerkB_c::create() {
     return phase;
 }
 
-/* 80996338-80996608 0004F8 02D0+00 1/1 0/0 0/0 .text            CreateHeap__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::CreateHeap() {
     int res_idx = l_bmdData[0][1];
     int bmd_idx = l_bmdData[0][0];
@@ -233,14 +218,12 @@ int daNpc_clerkB_c::CreateHeap() {
     return 0;
 }
 
-/* 809967C4-809967F8 000984 0034+00 1/1 0/0 0/0 .text            Delete__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_clerkB_c();
     return 1;
 }
 
-/* 809967F8-809968D0 0009B8 00D8+00 2/2 0/0 0/0 .text            Execute__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == TYPE_SHOP && mShopFlag == 0) {
         initShopSystem();
@@ -259,7 +242,6 @@ int daNpc_clerkB_c::Execute() {
     return 1;
 }
 
-/* 809968D0-80996964 000A90 0094+00 1/1 0/0 0/0 .text            Draw__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -268,14 +250,10 @@ int daNpc_clerkB_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80996964-80996984 000B24 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daNpc_clerkB_cFP10fopAc_ac_c           */
 int daNpc_clerkB_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_clerkB_c*)i_this)->CreateHeap();
 }
 
-/* 80996984-809969DC 000B44 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__14daNpc_clerkB_cFP8J3DJointi              */
 int daNpc_clerkB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -288,7 +266,6 @@ int daNpc_clerkB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809969DC-809969FC 000B9C 0020+00 1/1 0/0 0/0 .text            getType__14daNpc_clerkB_cFv */
 u8 daNpc_clerkB_c::getType() {
     switch ((fopAcM_GetParam(this) & 0xFF)) {
     case 0:
@@ -297,8 +274,6 @@ u8 daNpc_clerkB_c::getType() {
     return TYPE_1;
 }
 
-/* 809969FC-80996CCC 000BBC 02D0+00 1/0 0/0 0/0 .text
- * beforeStartSeqAction__14daNpc_clerkB_cFP10dMsgFlow_ci        */
 int daNpc_clerkB_c::beforeStartSeqAction(dMsgFlow_c* param_0, int param_1) {
     BOOL bVar2 = FALSE;
     BOOL rv = FALSE;
@@ -360,8 +335,6 @@ int daNpc_clerkB_c::beforeStartSeqAction(dMsgFlow_c* param_0, int param_1) {
     return rv;
 }
 
-/* 80996CCC-80996F7C 000E8C 02B0+00 1/0 0/0 0/0 .text
- * beforeSelectSeqAction__14daNpc_clerkB_cFP10dMsgFlow_ci       */
 int daNpc_clerkB_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) {
     BOOL bVar2 = FALSE;
     BOOL rv = FALSE;
@@ -423,7 +396,6 @@ int daNpc_clerkB_c::beforeSelectSeqAction(dMsgFlow_c* param_0, int param_1) {
     return rv;
 }
 
-/* 80996F7C-80996FAC 00113C 0030+00 1/1 0/0 0/0 .text            isDelete__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::isDelete() {
     if (mType == TYPE_1) {
         return 0;
@@ -435,7 +407,6 @@ int daNpc_clerkB_c::isDelete() {
     return 1;
 }
 
-/* 80996FAC-809970E0 00116C 0134+00 1/1 0/0 0/0 .text            reset__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::reset() {
     initialize();
 
@@ -454,7 +425,6 @@ void daNpc_clerkB_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 809970E0-80997188 0012A0 00A8+00 1/0 0/0 0/0 .text            afterJntAnm__14daNpc_clerkB_cFi */
 void daNpc_clerkB_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -468,7 +438,6 @@ void daNpc_clerkB_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80997188-809972BC 001348 0134+00 1/0 0/0 0/0 .text            setParam__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::setParam() {
     if (field_0x1110 != 0) {
         if (mShopProcess == 2) {
@@ -508,7 +477,6 @@ void daNpc_clerkB_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 809972BC-80997360 00147C 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::setAfterTalkMotion() {
     int idx;
 
@@ -530,7 +498,6 @@ void daNpc_clerkB_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80997360-809973BC 001520 005C+00 1/1 0/0 0/0 .text            srchActors__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::srchActors() {
     switch (mType) {
     case TYPE_SHOP:
@@ -541,7 +508,6 @@ void daNpc_clerkB_c::srchActors() {
     }
 }
 
-/* 809973BC-80997598 00157C 01DC+00 1/0 0/0 0/0 .text            evtTalk__14daNpc_clerkB_cFv */
 BOOL daNpc_clerkB_c::evtTalk() {
     if (mShopFlag) {
         if (chkAction(&daNpc_clerkB_c::shop)) {
@@ -579,7 +545,6 @@ BOOL daNpc_clerkB_c::evtTalk() {
     return TRUE;
 }
 
-/* 80997598-80997660 001758 00C8+00 1/0 0/0 0/0 .text            evtCutProc__14daNpc_clerkB_cFv */
 BOOL daNpc_clerkB_c::evtCutProc() {
     BOOL rv = FALSE;
 
@@ -598,7 +563,6 @@ BOOL daNpc_clerkB_c::evtCutProc() {
     return rv;
 }
 
-/* 80997660-8099774C 001820 00EC+00 1/0 0/0 0/0 .text            action__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -614,14 +578,12 @@ void daNpc_clerkB_c::action() {
     }
 }
 
-/* 8099774C-809977C4 00190C 0078+00 1/0 0/0 0/0 .text            beforeMove__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 809977C4-80997A1C 001984 0258+00 1/0 0/0 0/0 .text            setAttnPos__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::setAttnPos() {
     cXyz cStack_3c(-30.0f, 15.0f, 0.0f);
     cXyz cStack_48(0.0f, 15.0f, 0.0f);
@@ -650,7 +612,6 @@ void daNpc_clerkB_c::setAttnPos() {
     setSe();
 }
 
-/* 80997A1C-80997B50 001BDC 0134+00 1/0 0/0 0/0 .text            setCollision__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::setCollision() {
     cXyz pos;
     u32 tgType = 0xD8FBFDFF;
@@ -687,12 +648,10 @@ void daNpc_clerkB_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80997B50-80997B58 001D10 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80997B58-80997BB8 001D18 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::drawOtherMdl() {
     if (mShopFlag) {
         cXyz pos;
@@ -703,7 +662,6 @@ void daNpc_clerkB_c::drawOtherMdl() {
     }
 }
 
-/* 80997BB8-80997C44 001D78 008C+00 1/0 0/0 0/0 .text            drawGhost__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -714,7 +672,6 @@ void daNpc_clerkB_c::drawGhost() {
     mBpkAnm2.remove(modelData);
 }
 
-/* 80997C44-80997CC0 001E04 007C+00 1/1 0/0 0/0 .text            selectAction__14daNpc_clerkB_cFv */
 int daNpc_clerkB_c::selectAction() {
     mNextAction = NULL;
 
@@ -730,14 +687,10 @@ int daNpc_clerkB_c::selectAction() {
     return TRUE;
 }
 
-/* 80997CC0-80997CEC 001E80 002C+00 1/1 0/0 0/0 .text
- * chkAction__14daNpc_clerkB_cFM14daNpc_clerkB_cFPCvPvPv_i      */
 int daNpc_clerkB_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80997CEC-80997D94 001EAC 00A8+00 2/2 0/0 0/0 .text
- * setAction__14daNpc_clerkB_cFM14daNpc_clerkB_cFPCvPvPv_i      */
 int daNpc_clerkB_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -753,7 +706,6 @@ int daNpc_clerkB_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80997D94-80997E54 001F54 00C0+00 1/1 0/0 0/0 .text            setSe__14daNpc_clerkB_cFv */
 void daNpc_clerkB_c::setSe() {
     if (cM3d_IsZero(mpMorf[0]->getPlaySpeed()) == 0) {
         J3DAnmTransform* anm_transform = (J3DAnmTransform*)dComIfG_getObjectRes(
@@ -764,7 +716,6 @@ void daNpc_clerkB_c::setSe() {
     }
 }
 
-/* 80997E54-809980AC 002014 0258+00 1/0 0/0 0/0 .text            wait__14daNpc_clerkB_cFPv */
 int daNpc_clerkB_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -807,7 +758,6 @@ int daNpc_clerkB_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809980AC-80998328 00226C 027C+00 1/0 0/0 0/0 .text            tend__14daNpc_clerkB_cFPv */
 int daNpc_clerkB_c::tend(void* param_0) {
     int sVar1 = mpHIO->m.field_0x8c;
 
@@ -856,7 +806,6 @@ int daNpc_clerkB_c::tend(void* param_0) {
     return 1;
 }
 
-/* 80998328-80998520 0024E8 01F8+00 2/0 0/0 0/0 .text            talk__14daNpc_clerkB_cFPv */
 int daNpc_clerkB_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -893,7 +842,6 @@ int daNpc_clerkB_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80998520-809988DC 0026E0 03BC+00 2/0 0/0 0/0 .text            shop__14daNpc_clerkB_cFPv */
 int daNpc_clerkB_c::shop(void* param_0) {
     cXyz cam_ctr_pos;
     cXyz cStack_3c;
@@ -964,42 +912,34 @@ int daNpc_clerkB_c::shop(void* param_0) {
     return 0;
 }
 
-/* 809988DC-809988FC 002A9C 0020+00 1/0 0/0 0/0 .text            daNpc_clerkB_Create__FPv */
 static int daNpc_clerkB_Create(void* i_this) {
     return static_cast<daNpc_clerkB_c*>(i_this)->create();
 }
 
-/* 809988FC-8099891C 002ABC 0020+00 1/0 0/0 0/0 .text            daNpc_clerkB_Delete__FPv */
 static int daNpc_clerkB_Delete(void* i_this) {
     return static_cast<daNpc_clerkB_c*>(i_this)->Delete();
 }
 
-/* 8099891C-8099893C 002ADC 0020+00 1/0 0/0 0/0 .text            daNpc_clerkB_Execute__FPv */
 static int daNpc_clerkB_Execute(void* i_this) {
     return static_cast<daNpc_clerkB_c*>(i_this)->Execute();
 }
 
-/* 8099893C-8099895C 002AFC 0020+00 1/0 0/0 0/0 .text            daNpc_clerkB_Draw__FPv */
 static int daNpc_clerkB_Draw(void* i_this) {
     return static_cast<daNpc_clerkB_c*>(i_this)->Draw();
 }
 
-/* 8099895C-80998964 002B1C 0008+00 1/0 0/0 0/0 .text            daNpc_clerkB_IsDelete__FPv */
 static int daNpc_clerkB_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8099A054-8099A058 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_CLERKB_HIO_CLASS l_HIO;
 
-/* 80999E74-80999E94 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_clerkB_MethodTable */
 static actor_method_class daNpc_clerkB_MethodTable = {
     (process_method_func)daNpc_clerkB_Create,  (process_method_func)daNpc_clerkB_Delete,
     (process_method_func)daNpc_clerkB_Execute, (process_method_func)daNpc_clerkB_IsDelete,
     (process_method_func)daNpc_clerkB_Draw,
 };
 
-/* 80999E94-80999EC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CLERKB */
 extern actor_process_profile_definition g_profile_NPC_CLERKB = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp
index 8b7e10fc78..3add3daa81 100644
--- a/src/d/actor/d_a_npc_clerkt.cpp
+++ b/src/d/actor/d_a_npc_clerkt.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_clerkt.h"
 #include "d/d_msg_object.h"
 
-/* 8099D244-8099D2D0 000000 008C+00 8/8 0/0 0/0 .rodata          m__19daNpcClerkt_Param_c */
 const daNpcClerkt_HIOParam daNpcClerkt_Param_c::m = {
     120.0f,  // attention_offset
     -3.0f,   // gravity
@@ -67,49 +66,40 @@ void daNpcClerkt_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 8099D378-8099D380 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {12, 1},
 };
 
-/* 8099D380-8099D390 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
 };
 
-/* 8099D390-8099D398 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Tkj",
 };
 
-/* 8099D398-8099D39C 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 8099D39C-8099D3A4 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 8099D3A4-8099D3DC 00004C 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 18, 2, 1, 1},
     {6, 0, 1, 18, 2, 1, 1},
 };
 
-/* 8099D3DC-8099D3F8 000084 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {9, 2, 1, 15, 0, 1, 1, 0},
 };
 
-/* 8099D3F8-8099D418 0000A0 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 8099D418-8099D428 0000C0 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -117,13 +107,10 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
 };
 
-/* 8099D428-8099D42C -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__13daNpcClerkT_c */
 char* daNpcClerkT_c::mCutNameList[1] = {""};
 
-/* 8099D42C-8099D438 0000D4 000C+00 2/2 0/0 0/0 .data            mCutList__13daNpcClerkT_c */
 daNpcClerkT_c::cutFunc daNpcClerkT_c::mCutList[1] = {NULL};
 
-/* 8099A14C-8099A28C 0000EC 0140+00 1/0 0/0 0/0 .text            __dt__13daNpcClerkT_cFv */
 daNpcClerkT_c::~daNpcClerkT_c() {
     deleteObject();
 
@@ -134,7 +121,6 @@ daNpcClerkT_c::~daNpcClerkT_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 8099A28C-8099A530 00022C 02A4+00 1/1 0/0 0/0 .text            create__13daNpcClerkT_cFv */
 int daNpcClerkT_c::create() {
     daNpcT_ct(this, daNpcClerkT_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -181,7 +167,6 @@ int daNpcClerkT_c::create() {
     return phase;
 }
 
-/* 8099A530-8099A7B0 0004D0 0280+00 1/1 0/0 0/0 .text            CreateHeap__13daNpcClerkT_cFv */
 int daNpcClerkT_c::CreateHeap() {
     int res_idx = l_bmdData[0][1];
     int bmd_idx = l_bmdData[0][0];
@@ -215,14 +200,12 @@ int daNpcClerkT_c::CreateHeap() {
     return 0;
 }
 
-/* 8099A96C-8099A9A0 00090C 0034+00 1/1 0/0 0/0 .text            Delete__13daNpcClerkT_cFv */
 int daNpcClerkT_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcClerkT_c();
     return 1;
 }
 
-/* 8099A9A0-8099AA80 000940 00E0+00 2/2 0/0 0/0 .text            Execute__13daNpcClerkT_cFv */
 int daNpcClerkT_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == TYPE_SHOP && mShopFlag == 0) {
         initShopSystem();
@@ -242,7 +225,6 @@ int daNpcClerkT_c::Execute() {
     return 1;
 }
 
-/* 8099AA80-8099AB14 000A20 0094+00 1/1 0/0 0/0 .text            Draw__13daNpcClerkT_cFv */
 int daNpcClerkT_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -251,14 +233,10 @@ int daNpcClerkT_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 8099AB14-8099AB34 000AB4 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpcClerkT_cFP10fopAc_ac_c            */
 int daNpcClerkT_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpcClerkT_c*)i_this)->CreateHeap();
 }
 
-/* 8099AB34-8099AB8C 000AD4 0058+00 2/2 0/0 0/0 .text
- * ctrlJointCallBack__13daNpcClerkT_cFP8J3DJointi               */
 int daNpcClerkT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -271,7 +249,6 @@ int daNpcClerkT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8099AB8C-8099ABBC 000B2C 0030+00 1/1 0/0 0/0 .text            isDelete__13daNpcClerkT_cFv */
 int daNpcClerkT_c::isDelete() {
     if (mType == TYPE_1) {
         return 0;
@@ -283,7 +260,6 @@ int daNpcClerkT_c::isDelete() {
     return 1;
 }
 
-/* 8099ABBC-8099ACF0 000B5C 0134+00 1/1 0/0 0/0 .text            reset__13daNpcClerkT_cFv */
 void daNpcClerkT_c::reset() {
     initialize();
 
@@ -302,7 +278,6 @@ void daNpcClerkT_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 8099ACF0-8099AD74 000C90 0084+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpcClerkT_cFi */
 void daNpcClerkT_c::afterJntAnm(int param_1) {
     if (param_1 == 15) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -313,7 +288,6 @@ void daNpcClerkT_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 8099AD74-8099AF18 000D14 01A4+00 1/0 0/0 0/0 .text            evtTalk__13daNpcClerkT_cFv */
 BOOL daNpcClerkT_c::evtTalk() {
     if (mShopFlag) {
         if (chkAction(&daNpcClerkT_c::shop)) {
@@ -331,7 +305,6 @@ BOOL daNpcClerkT_c::evtTalk() {
     return TRUE;
 }
 
-/* 8099AF18-8099AFE0 000EB8 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpcClerkT_cFv */
 BOOL daNpcClerkT_c::evtCutProc() {
     BOOL rv = FALSE;
 
@@ -350,7 +323,6 @@ BOOL daNpcClerkT_c::evtCutProc() {
     return rv;
 }
 
-/* 8099AFE0-8099B0CC 000F80 00EC+00 1/0 0/0 0/0 .text            action__13daNpcClerkT_cFv */
 void daNpcClerkT_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -366,12 +338,10 @@ void daNpcClerkT_c::action() {
     }
 }
 
-/* 8099B0CC-8099B0D4 00106C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpcClerkT_cFv */
 int daNpcClerkT_c::drawDbgInfo() {
     return 0;
 }
 
-/* 8099B0D4-8099B134 001074 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpcClerkT_cFv */
 void daNpcClerkT_c::drawOtherMdl() {
     if (mShopFlag) {
         cXyz pos;
@@ -382,7 +352,6 @@ void daNpcClerkT_c::drawOtherMdl() {
     }
 }
 
-/* 8099B134-8099B1B0 0010D4 007C+00 1/1 0/0 0/0 .text            selectAction__13daNpcClerkT_cFv */
 int daNpcClerkT_c::selectAction() {
     mNextAction = NULL;
 
@@ -398,14 +367,10 @@ int daNpcClerkT_c::selectAction() {
     return TRUE;
 }
 
-/* 8099B1B0-8099B1DC 001150 002C+00 1/1 0/0 0/0 .text
- * chkAction__13daNpcClerkT_cFM13daNpcClerkT_cFPCvPvPv_i        */
 int daNpcClerkT_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 8099B1DC-8099B284 00117C 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpcClerkT_cFM13daNpcClerkT_cFPCvPvPv_i        */
 int daNpcClerkT_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -421,7 +386,6 @@ int daNpcClerkT_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 8099B284-8099B4DC 001224 0258+00 1/0 0/0 0/0 .text            wait__13daNpcClerkT_cFPv */
 int daNpcClerkT_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -464,7 +428,6 @@ int daNpcClerkT_c::wait(void* param_0) {
     return 1;
 }
 
-/* 8099B4DC-8099B60C 00147C 0130+00 1/0 0/0 0/0 .text            tend__13daNpcClerkT_cFPv */
 int daNpcClerkT_c::tend(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -490,7 +453,6 @@ int daNpcClerkT_c::tend(void* param_0) {
     return 1;
 }
 
-/* 8099B60C-8099B804 0015AC 01F8+00 2/0 0/0 0/0 .text            talk__13daNpcClerkT_cFPv */
 int daNpcClerkT_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -527,7 +489,6 @@ int daNpcClerkT_c::talk(void* param_0) {
     return 0;
 }
 
-/* 8099B804-8099BBE8 0017A4 03E4+00 2/0 0/0 0/0 .text            shop__13daNpcClerkT_cFPv */
 int daNpcClerkT_c::shop(void* param_0) {
     cXyz cam_ctr_pos;
     cXyz cStack_3c;
@@ -601,32 +562,26 @@ int daNpcClerkT_c::shop(void* param_0) {
     return 0;
 }
 
-/* 8099BBE8-8099BC08 001B88 0020+00 1/0 0/0 0/0 .text            daNpcClerkt_Create__FPv */
 static int daNpcClerkt_Create(void* i_this) {
     return static_cast<daNpcClerkT_c*>(i_this)->create();
 }
 
-/* 8099BC08-8099BC28 001BA8 0020+00 1/0 0/0 0/0 .text            daNpcClerkt_Delete__FPv */
 static int daNpcClerkt_Delete(void* i_this) {
     return static_cast<daNpcClerkT_c*>(i_this)->Delete();
 }
 
-/* 8099BC28-8099BC48 001BC8 0020+00 1/0 0/0 0/0 .text            daNpcClerkt_Execute__FPv */
 static int daNpcClerkt_Execute(void* i_this) {
     return static_cast<daNpcClerkT_c*>(i_this)->Execute();
 }
 
-/* 8099BC48-8099BC68 001BE8 0020+00 1/0 0/0 0/0 .text            daNpcClerkt_Draw__FPv */
 static int daNpcClerkt_Draw(void* i_this) {
     return static_cast<daNpcClerkT_c*>(i_this)->Draw();
 }
 
-/* 8099BC68-8099BC70 001C08 0008+00 1/0 0/0 0/0 .text            daNpcClerkt_IsDelete__FPv */
 static int daNpcClerkt_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8099BCE8-8099BE48 001C88 0160+00 1/0 0/0 0/0 .text            setParam__13daNpcClerkT_cFv */
 void daNpcClerkT_c::setParam() {
     if (field_0x10e9 != 0) {
         if (mShopProcess == 2) {
@@ -665,19 +620,16 @@ void daNpcClerkT_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 8099BE48-8099BEA8 001DE8 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpcClerkT_cFv */
 void daNpcClerkT_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(FACE_MOT_UNK_1, -1.0f, FALSE, 0);
 }
 
-/* 8099BEA8-8099BF20 001E48 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpcClerkT_cFv */
 void daNpcClerkT_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 8099BF20-8099C1A0 001EC0 0280+00 1/0 0/0 0/0 .text            setAttnPos__13daNpcClerkT_cFv */
 void daNpcClerkT_c::setAttnPos() {
     cXyz cStack_3c(10.0f, -15.0f, 0.0f);
     cXyz cStack_48(0.0f, 15.0f, 0.0f);
@@ -705,7 +657,6 @@ void daNpcClerkT_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 8099C1A0-8099C2D4 002140 0134+00 1/0 0/0 0/0 .text            setCollision__13daNpcClerkT_cFv */
 void daNpcClerkT_c::setCollision() {
     cXyz pos;
     u32 tgType = 0xD8FBFDFF;
@@ -742,17 +693,14 @@ void daNpcClerkT_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 8099D65C-8099D660 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_CLERKT_HIO_CLASS l_HIO;
 
-/* 8099D480-8099D4A0 -00001 0020+00 1/0 0/0 0/0 .data            daNpcClerkt_MethodTable */
 static actor_method_class daNpcClerkt_MethodTable = {
     (process_method_func)daNpcClerkt_Create,  (process_method_func)daNpcClerkt_Delete,
     (process_method_func)daNpcClerkt_Execute, (process_method_func)daNpcClerkt_IsDelete,
     (process_method_func)daNpcClerkt_Draw,
 };
 
-/* 8099D4A0-8099D4D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_CLERKT */
 extern actor_process_profile_definition g_profile_NPC_CLERKT = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp
index 56f6eb453e..f246849bc8 100644
--- a/src/d/actor/d_a_npc_coach.cpp
+++ b/src/d/actor/d_a_npc_coach.cpp
@@ -146,7 +146,6 @@ enum Ilia_Joint {
     /* 0x4 */ JNT_ILIA_HEAD,
 };
 
-/* 8099D6D8-8099D72C 000078 0054+00 1/1 0/0 0/0 .text            jointHorseCallBack__FP8J3DJointi */
 static int jointHorseCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -160,7 +159,6 @@ static int jointHorseCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8099D72C-8099D80C 0000CC 00E0+00 1/1 0/0 0/0 .text jointFrontWheelCallBack__FP8J3DJointi */
 static int jointFrontWheelCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -181,7 +179,6 @@ static int jointFrontWheelCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8099D80C-8099D8EC 0001AC 00E0+00 1/1 0/0 0/0 .text jointRearWheelCallBack__FP8J3DJointi */
 static int jointRearWheelCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -202,7 +199,6 @@ static int jointRearWheelCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809A4ED0-809A4F70 000000 00A0+00 19/19 0/0 0/0 .rodata          M_attr__12daNpcCoach_c */
 daNpcCoach_Attr_c const daNpcCoach_c::M_attr = {
     -3.0f,
     -200.0f,
@@ -260,7 +256,6 @@ daNpcCoach_Attr_c const daNpcCoach_c::M_attr = {
     0x19,
 };
 
-/* 8099D8EC-8099D9AC 00028C 00C0+00 1/1 0/0 0/0 .text            jointCoachCallBack__FP8J3DJointi */
 static int jointCoachCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -278,7 +273,6 @@ static int jointCoachCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 8099D9AC-8099DA24 00034C 0078+00 1/1 0/0 0/0 .text            arrowStickCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_cR4cXyz */
 static void arrowStickCallBack(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* i_actor, cXyz& i_pos) {
     if (fopAcM_GetName(i_actor) == PROC_E_ARROW) {
         if (!daPy_getPlayerActorClass()->checkBoarSingleBattleSecond()) {
@@ -288,7 +282,6 @@ static void arrowStickCallBack(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* i_ac
     }
 }
 
-/* 8099DA60-8099DBA4 000400 0144+00 1/1 0/0 0/0 .text            hitFireArrow__12daNpcCoach_cF4cXyz */
 void daNpcCoach_c::hitFireArrow(cXyz i_pos) {
     if (field_0x24c0 == 0) {
         mChYelia.mSound.startCreatureVoice(Z2SE_YELIA_V_KYAAA_TRIG, -1);
@@ -311,7 +304,6 @@ void daNpcCoach_c::hitFireArrow(cXyz i_pos) {
     }
 }
 
-/* 8099DBA4-8099DCE8 000544 0144+00 0/0 0/0 1/1 .text            deleteFireArrow__12daNpcCoach_cFUi */
 void daNpcCoach_c::deleteFireArrow(fpc_ProcID param_1) {
     for (int i = 0; i < 5; i++) {
         if (field_0x247c[i] != param_1) {
@@ -348,7 +340,6 @@ void daNpcCoach_c::deleteFireArrow(fpc_ProcID param_1) {
     }
 }
 
-/* 8099DCE8-8099DD28 000688 0040+00 0/0 0/0 1/1 .text            deleteFireArrowFromList__12daNpcCoach_cFUi */
 bool daNpcCoach_c::deleteFireArrowFromList(unsigned int i_actorID) {
     for (int i = 0; i < 5; i++) {
         if (field_0x247c[i] == i_actorID) {
@@ -359,13 +350,11 @@ bool daNpcCoach_c::deleteFireArrowFromList(unsigned int i_actorID) {
     return false;
 }
 
-/* 8099DD28-8099DD7C 0006C8 0054+00 0/0 0/0 3/3 .text            setPosAngle__12daNpcCoach_cFR4cXyzR5csXyz */
 void daNpcCoach_c::setPosAngle(cXyz& param_1, csXyz& param_2) {
     initCoachPosition(param_1, param_2);
     changeAtherPath(getRailID(), param_1, param_2);
 }
 
-/* 8099DD7C-8099DE18 00071C 009C+00 1/1 0/0 0/0 .text            ctrlJointHorse__12daNpcCoach_cFP8J3DJointP8J3DModel */
 int daNpcCoach_c::ctrlJointHorse(J3DJoint* i_joint, J3DModel* i_model) {
     int jointNo = i_joint->getJntNo();
 
@@ -382,7 +371,6 @@ int daNpcCoach_c::ctrlJointHorse(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8099DE18-8099E0E0 0007B8 02C8+00 2/2 0/0 0/0 .text            initCoachPosition__12daNpcCoach_cFR3VecR4SVec */
 void daNpcCoach_c::initCoachPosition(Vec& i_pos, SVec& i_angle) {
     current.pos = i_pos;
     shape_angle.set(i_angle.x, i_angle.y, i_angle.z);
@@ -425,7 +413,6 @@ void daNpcCoach_c::initCoachPosition(Vec& i_pos, SVec& i_angle) {
     }
 }
 
-/* 8099E0E0-8099E138 000A80 0058+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_KR && ((e_kr_class*)i_actor)->getId() >= 0) {
         return i_actor;
@@ -434,7 +421,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809A4078-809A43A0 006A18 0328+00 1/1 0/0 0/0 .text            initCollision__12daNpcCoach_cFv */
 void daNpcCoach_c::initCollision() {
     static dCcD_SrcCyl const ccCylSrc = {
         {
@@ -556,7 +542,6 @@ BOOL daNpcChPath_c::setPath(int path_index, int room_no, cXyz& i_vec, bool param
     return TRUE;
 }
 
-/* 8099E138-8099E4A0 000AD8 0368+00 2/2 0/0 0/0 .text            changeAtherPath__12daNpcCoach_cFScR4cXyzR5csXyz */
 void daNpcCoach_c::changeAtherPath(s8 path_index, cXyz& param_2, csXyz& param_3) {
     mChPath.setPath(path_index, fopAcM_GetRoomNo(this), param_2, true);
 
@@ -579,16 +564,13 @@ void daNpcCoach_c::changeAtherPath(s8 path_index, cXyz& param_2, csXyz& param_3)
     }
 }
 
-/* 8099E4A0-8099E4C0 000E40 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* a_this) {
     daNpcCoach_c* i_this = (daNpcCoach_c*)a_this;
     return i_this->createHeap();
 }
 
-/* 809A5130-809A5134 -00001 0004+00 7/7 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Coach";
 
-/* 809A5134-809A51AC 000004 0078+00 2/2 0/0 0/0 .data            l_horseAnmParam */
 static struct {
     int field_0x0;
     f32 field_0x4;
@@ -604,7 +586,6 @@ static struct {
     {BCK_HU_RUN_FAST, 40.0f, 2.8f, -1, 40.0f, 2.8f},
 };
 
-/* 8099F1B8-8099F4BC 001B58 0304+00 1/1 0/0 0/0 .text            setCoachBlazing__12daNpcCoach_cFUc */
 void daNpcCoach_c::setCoachBlazing(u8 damage) {
     static u16 const ParticleName[10] = {
         0x85F0, 0x85EF, 0x85E7, 0x85E8, 0x85E9,
@@ -717,7 +698,6 @@ void daNpcCoach_c::setCoachBlazing(u8 damage) {
     mChCoach.field_0x5f8[1]->setUserWork((uintptr_t)&mChCoach.field_0x5d4);
 }
 
-/* 8099E4C0-8099EAD8 000E60 0618+00 1/1 0/0 0/0 .text            createHeap__12daNpcCoach_cFv */
 int daNpcCoach_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_HORSE);
 
@@ -841,7 +821,6 @@ int daNpcCoach_c::createHeap() {
     return 1;
 }
 
-/* 8099EB20-8099EB40 0014C0 0020+00 1/0 0/0 0/0 .text daNpcCoach_Execute__FP12daNpcCoach_c */
 static int daNpcCoach_Execute(daNpcCoach_c* i_this) {
     return i_this->execute();
 }
@@ -873,7 +852,6 @@ void daNpcCoach_c::calcYeliaMotion() {
     mChYelia.mpModelMorf->modelCalc();
 }
 
-/* 8099EB40-8099EEA0 0014E0 0360+00 1/1 0/0 0/0 .text            execute__12daNpcCoach_cFv */
 int daNpcCoach_c::execute() {
     calcHorseMotion();
     calcHarnessMotion();
@@ -927,7 +905,6 @@ int daNpcCoach_c::execute() {
     return 1;
 }
 
-/* 8099EEA0-8099F1B8 001840 0318+00 1/2 0/0 0/0 .text            checkCoachDamage__12daNpcCoach_cFv */
 void daNpcCoach_c::checkCoachDamage() {
     if (field_0x24c0 > 0) {
         if (!dComIfGp_event_runCheck() && getRailID() != 8) {
@@ -1005,7 +982,6 @@ void daNpcCoach_c::checkCoachDamage() {
     }
 }
 
-/* 8099F4BC-8099F988 001E5C 04CC+00 1/1 0/0 0/0 .text            reinsExecute__12daNpcCoach_cFv */
 void daNpcCoach_c::reinsExecute() {
     daNpcChReins_c* reins = &mChHorse.mChReins;
     if (reins->field_0x16c <= 1) {
@@ -1090,7 +1066,6 @@ void daNpcCoach_c::reinsExecute() {
     }
 }
 
-/* 8099F988-8099FCF4 002328 036C+00 1/1 0/0 0/0 .text            reinsInit__12daNpcCoach_cFv */
 void daNpcCoach_c::reinsInit() {
     daNpcChReins_c* reins = &mChHorse.mChReins;
     daNpcTheB_c* telmaB_p = (daNpcTheB_c*)fpcM_SearchByID(parentActorID);
@@ -1243,7 +1218,6 @@ void daNpcCoach_c::setWheelSmoke(daNpcChWheel_c* i_wheel, dBgS_ObjAcch* i_bgc, d
     }
 }
 
-/* 809A0728-809A0DB8 0030C8 0690+00 1/1 0/0 0/0 .text calcRearWheelRotate__12daNpcCoach_cFv */
 void daNpcCoach_c::calcRearWheelRotate() {
     if (speedF != 0.0f) {
         f32 fVar1 = mChCoach.field_0x5ec.absXZ(mChCoach.field_0x5e0);
@@ -1308,7 +1282,6 @@ s16 daNpcCoach_c::getGroundSlope(dBgS_ObjAcch* i_bgc, s16 param_2) {
     return shape_angle.x;
 }
 
-/* 8099FCF4-809A0728 002694 0A34+00 1/1 0/0 0/0 .text            calcCoachMotion__12daNpcCoach_cFv */
 void daNpcCoach_c::calcCoachMotion() {
     cXyz sp44 = mChCoach.field_0x5e0 - mChCoach.field_0x5ec;
     mChCoach.field_0x5ec = mChCoach.field_0x5e0;
@@ -1442,7 +1415,6 @@ void daNpcCoach_c::setHarnessCollision() {
     mChHarness.field_0x6a0->SetRoomId(dComIfG_Bgsp().GetRoomId(mChHarness.mBgc.m_gnd));
 }
 
-/* 809A0E00-809A1180 0037A0 0380+00 1/1 0/0 0/0 .text            calcHarnessMotion__12daNpcCoach_cFv */
 void daNpcCoach_c::calcHarnessMotion() {
     cXyz sp1c = mChHarness.field_0x6e0 - mChHarness.field_0x6ec;
     mChHarness.field_0x6ec = mChHarness.field_0x6e0;
@@ -1494,7 +1466,6 @@ void daNpcCoach_c::calcHarnessMotion() {
     calcFrontWheelRotate();
 }
 
-/* 809A1180-809A1810 003B20 0690+00 1/1 0/0 0/0 .text calcFrontWheelRotate__12daNpcCoach_cFv */
 void daNpcCoach_c::calcFrontWheelRotate() {
     if (speedF != 0.0f) {
         f32 fVar1 = mChHarness.field_0x6ec.absXZ(mChHarness.field_0x6e0);
@@ -1601,7 +1572,6 @@ void daNpcCoach_c::setHorseMtx() {
     mDoMtx_stack_c::multVecZero(&mChHorse.field_0x770);
 }
 
-/* 809A1810-809A1BE0 0041B0 03D0+00 1/1 0/0 0/0 .text            calcHorseMotion__12daNpcCoach_cFv */
 void daNpcCoach_c::calcHorseMotion() {
     f32 fVar1 = calcMaxSpeed();
     if (mChHorse.field_0x784 < fVar1) {
@@ -1661,7 +1631,6 @@ void daNpcCoach_c::eyeWink() {
     }
 }
 
-/* 809A1BE0-809A2740 004580 0B60+00 1/1 0/0 0/0 .text            calcHorseAnm__12daNpcCoach_cFv */
 void daNpcCoach_c::calcHorseAnm() {
     bool reg_r29 = 0;
     if (mChPath.isPath()) {
@@ -1869,7 +1838,6 @@ void daNpcCoach_c::resetOverAngle() {
     }
 }
 
-/* 809A2740-809A2E98 0050E0 0758+00 1/1 0/0 0/0 .text            calcHorsePath__12daNpcCoach_cFv */
 void daNpcCoach_c::calcHorsePath() {
     if (!mChPath.isPath() || mTotalDmgRecv >= attr().damage_durability) {
         return;
@@ -1932,7 +1900,6 @@ void daNpcCoach_c::calcHorsePath() {
     }
 }
 
-/* 809A2E98-809A2EB8 005838 0020+00 1/0 0/0 0/0 .text            daNpcCoach_Draw__FP12daNpcCoach_c */
 static int daNpcCoach_Draw(daNpcCoach_c* i_this) {
     return i_this->draw();
 }
@@ -1954,7 +1921,6 @@ void daNpcCoach_c::reinsDraw() {
     }
 }
 
-/* 809A2EB8-809A3300 005858 0448+00 1/1 0/0 0/0 .text            draw__12daNpcCoach_cFv */
 int daNpcCoach_c::draw() {
     cXyz sp48;
 
@@ -2012,18 +1978,15 @@ int daNpcCoach_c::draw() {
     return 1;
 }
 
-/* 809A3300-809A3308 005CA0 0008+00 1/0 0/0 0/0 .text daNpcCoach_IsDelete__FP12daNpcCoach_c */
 static int daNpcCoach_IsDelete(daNpcCoach_c* i_this) {
     return 1;
 }
 
-/* 809A3308-809A3330 005CA8 0028+00 1/0 0/0 0/0 .text            daNpcCoach_Delete__FP12daNpcCoach_c */
 static int daNpcCoach_Delete(daNpcCoach_c* i_this) {
     i_this->~daNpcCoach_c();
     return 1;
 }
 
-/* 809A3330-809A3570 005CD0 0240+00 1/1 0/0 0/0 .text            __dt__12daNpcCoach_cFv */
 daNpcCoach_c::~daNpcCoach_c() {
     if (mChHarness.field_0x6a0 != NULL && mChHarness.field_0x6a0->ChkUsed()) {
         dComIfG_Bgsp().Release(mChHarness.field_0x6a0);
@@ -2039,13 +2002,11 @@ daNpcCoach_c::~daNpcCoach_c() {
     dComIfGs_offTbox(1);
 }
 
-/* 809A3864-809A3884 006204 0020+00 1/0 0/0 0/0 .text            daNpcCoach_Create__FP10fopAc_ac_c */
 static int daNpcCoach_Create(fopAc_ac_c* a_this) {
     daNpcCoach_c* i_this = (daNpcCoach_c*)a_this;
     return i_this->create();
 }
 
-/* 809A3884-809A3928 006224 00A4+00 1/1 0/0 0/0 .text            create__12daNpcCoach_cFv */
 cPhs__Step daNpcCoach_c::create() {
     fopAcM_ct(this, daNpcCoach_c);
 
@@ -2061,7 +2022,6 @@ cPhs__Step daNpcCoach_c::create() {
     return phase;
 }
 
-/* 809A3928-809A4078 0062C8 0750+00 1/1 0/0 0/0 .text            create_init__12daNpcCoach_cFv */
 void daNpcCoach_c::create_init() {
     if (strcmp(dComIfGp_getStartStageName(), "F_SP123") == 0) {
         fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x4000);
@@ -2150,7 +2110,6 @@ void daNpcCoach_c::create_init() {
     }
 }
 
-/* 809A43A0-809A43DC 006D40 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daNpcCoach_cFv */
 void daNpcCoach_c::initBaseMtx() {
     setBaseMtx();
     fopAcM_SetMtx(this, mChHorse.mpModelMorf->getModel()->getBaseTRMtx());
@@ -2167,7 +2126,6 @@ void daNpcCoach_c::setHarnessMtx() {
     mChHarness.mHarnessModel->calc();
 }
 
-/* 809A43DC-809A46C4 006D7C 02E8+00 1/1 0/0 0/0 .text            setBaseMtx__12daNpcCoach_cFv */
 void daNpcCoach_c::setBaseMtx() {
     setHorseMtx();
     setHarnessMtx();
@@ -2176,7 +2134,6 @@ void daNpcCoach_c::setBaseMtx() {
     setYeliaMtx();
 }
 
-/* 809A46C4-809A48A8 007064 01E4+00 1/1 0/0 0/0 .text            initCoachBlazing__12daNpcCoach_cFv */
 void daNpcCoach_c::initCoachBlazing() {
     cXyz sp28;
 
@@ -2206,10 +2163,8 @@ void daNpcCoach_c::initCoachBlazing() {
     mCoachBlazing = false;
 }
 
-/* 809A48A8-809A4B9C 007248 02F4+00 1/1 0/0 0/0 .text            __ct__12daNpcCoach_cFv */
 daNpcCoach_c::daNpcCoach_c() {}
 
-/* 809A51B0-809A51D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpcCoach_Method */
 static actor_method_class l_daNpcCoach_Method = {
     (process_method_func)daNpcCoach_Create,
     (process_method_func)daNpcCoach_Delete,
@@ -2218,7 +2173,6 @@ static actor_method_class l_daNpcCoach_Method = {
     (process_method_func)daNpcCoach_Draw,
 };
 
-/* 809A51D0-809A5200 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_COACH */
 extern actor_process_profile_definition g_profile_NPC_COACH = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp
index dbf4298225..01d043abc6 100644
--- a/src/d/actor/d_a_npc_df.cpp
+++ b/src/d/actor/d_a_npc_df.cpp
@@ -11,7 +11,6 @@
 #include "d/actor/d_a_npc_henna.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 809A538C-809A5424 0000EC 0098+00 1/0 0/0 0/0 .text            daNpc_Df_Draw__FP12npc_df_class */
 static int daNpc_Df_Draw(npc_df_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     df_s* df_p = i_this->mDfs;
@@ -27,16 +26,12 @@ static int daNpc_Df_Draw(npc_df_class* i_this) {
     return 1;
 }
 
-/* 809A6A50-809A6A54 000048 0004+00 3/4 0/0 0/0 .bss             lrl */
 static dmg_rod_class* lrl;
 
-/* 809A6A60-809A6AD0 000058 0070+00 0/2 0/0 0/0 .bss             line_check */
 static dBgS_LinChk line_check;
 
-/* 809A6ADC-809A6B30 0000D4 0054+00 0/2 0/0 0/0 .bss             gc_work */
 static dBgS_ObjGndChk gc_work;
 
-/* 809A5424-809A59DC 000184 05B8+00 1/1 0/0 0/0 .text            df_fly__FP12npc_df_classP4df_s */
 static void df_fly(npc_df_class* i_this, df_s* df_p) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -147,7 +142,6 @@ static void df_fly(npc_df_class* i_this, df_s* df_p) {
     df_p->field_0x5c = YREG_F(6) + 0.2f + ((df_p->field_0x6c & 1) - 0.5f) * (YREG_F(7) + 0.2f);
 }
 
-/* 809A59DC-809A6100 00073C 0724+00 1/1 0/0 0/0 .text            df_rod__FP12npc_df_classP4df_s */
 static void df_rod(npc_df_class* i_this, df_s* df_p) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -261,7 +255,6 @@ static void df_rod(npc_df_class* i_this, df_s* df_p) {
     }
 }
 
-/* 809A6100-809A6314 000E60 0214+00 1/1 0/0 0/0 .text            df_control__FP12npc_df_class */
 static void df_control(npc_df_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz sp34;
@@ -305,7 +298,6 @@ static void df_control(npc_df_class* i_this) {
     }
 }
 
-/* 809A6314-809A6360 001074 004C+00 1/1 0/0 0/0 .text            s_rod_sub__FPvPv */
 static void* s_rod_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_ROD) {
         return i_actor;
@@ -314,19 +306,16 @@ static void* s_rod_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809A6360-809A63AC 0010C0 004C+00 2/1 0/0 0/0 .text            daNpc_Df_Execute__FP12npc_df_class */
 static int daNpc_Df_Execute(npc_df_class* i_this) {
     lrl = (dmg_rod_class*)fpcM_Search(s_rod_sub, i_this);
     df_control(i_this);
     return 1;
 }
 
-/* 809A63AC-809A63B4 00110C 0008+00 1/0 0/0 0/0 .text            daNpc_Df_IsDelete__FP12npc_df_class */
 static int daNpc_Df_IsDelete(npc_df_class* i_this) {
     return 1;
 }
 
-/* 809A63B4-809A6478 001114 00C4+00 1/0 0/0 0/0 .text            daNpc_Df_Delete__FP12npc_df_class */
 static int daNpc_Df_Delete(npc_df_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -343,7 +332,6 @@ static int daNpc_Df_Delete(npc_df_class* i_this) {
     return 1;
 }
 
-/* 809A6478-809A6564 0011D8 00EC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     npc_df_class* actor = (npc_df_class*)i_this;
 
@@ -365,7 +353,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 809A6564-809A6728 0012C4 01C4+00 1/0 0/0 0/0 .text            daNpc_Df_Create__FP10fopAc_ac_c */
 static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, npc_df_class);
     npc_df_class* actor = (npc_df_class*)i_this;
@@ -426,7 +413,6 @@ static cPhs__Step daNpc_Df_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 809A6984-809A69A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Df_Method */
 static actor_method_class l_daNpc_Df_Method = {
     (process_method_func)daNpc_Df_Create,
     (process_method_func)daNpc_Df_Delete,
@@ -435,7 +421,6 @@ static actor_method_class l_daNpc_Df_Method = {
     (process_method_func)daNpc_Df_Draw,
 };
 
-/* 809A69A4-809A69D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_DF */
 extern actor_process_profile_definition g_profile_NPC_DF = {
   fpcLy_CURRENT_e,        // mLayerID
   9,                      // mListID
diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp
index a35eb050fb..063d741c84 100644
--- a/src/d/actor/d_a_npc_doc.cpp
+++ b/src/d/actor/d_a_npc_doc.cpp
@@ -8,39 +8,33 @@
 #include "d/actor/d_a_npc_doc.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 809AA460-809AA468 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {14, 1},
 };
 
-/* 809AA468-809AA478 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 809AA478-809AA484 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Doc",
     "Doc1",
 };
 
-/* 809AA484-809AA488 000044 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[] = {
     1,
     2,
     -1,
 };
 
-/* 809AA488-809AA494 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 809AA494-809AA5AC 000054 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, 0, 0, 20, 2, 1, 1},
     {6, 0, 1, 20, 2, 1, 1},
@@ -54,7 +48,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {8, 2, 2, 20, 2, 1, 1},
 };
 
-/* 809AA5AC-809AA734 00016C 0188+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[14] = {
     {11, 2, 1, 17, 0, 1, 1, 0},
     {8, 0, 1, 17, 0, 1, 1, 0},
@@ -72,7 +65,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[14] = {
     {6, 2, 2, 25, 2, 2, 0, 0},
 };
 
-/* 809AA734-809AA7D4 0002F4 00A0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -81,7 +73,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] =
     {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809AA7D4-809AA8A4 000394 00D0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -92,15 +83,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = {
     {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809AA8A4-809AA8A8 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Doc_c */
 char* daNpc_Doc_c::mCutNameList[1] = {""};
 
-/* 809AA8A8-809AA8B4 000468 000C+00 2/2 0/0 0/0 .data            mCutList__11daNpc_Doc_c */
 daNpc_Doc_c::cutFunc daNpc_Doc_c::mCutList[1] = {
     NULL,
 };
 
-/* 809AA31C-809AA3AC 000000 0090+00 8/8 0/0 0/0 .rodata          m__17daNpc_Doc_Param_c */
 const daNpc_Doc_HIOParam daNpc_Doc_Param_c::m = {
     140.0f,
     -3.0f,
@@ -146,10 +134,8 @@ const daNpc_Doc_HIOParam daNpc_Doc_Param_c::m = {
     3.0f,
 };
 
-/* 809AAB1C-809AAB20 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_DOC_HIO_CLASS l_HIO;
 
-/* 809A6C8C-809A6DC0 0000EC 0134+00 1/0 0/0 0/0 .text            __dt__11daNpc_Doc_cFv */
 daNpc_Doc_c::~daNpc_Doc_c() {
     OS_REPORT("|%06d:%x|daNpc_Doc_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -166,7 +152,6 @@ daNpc_Doc_c::~daNpc_Doc_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809A6DC0-809A7088 000220 02C8+00 1/1 0/0 0/0 .text            create__11daNpc_Doc_cFv */
 int daNpc_Doc_c::create() {
     daNpcT_ct(this, daNpc_Doc_c, l_faceMotionAnmData, l_motionAnmData,
               l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -232,7 +217,6 @@ int daNpc_Doc_c::create() {
     return phase_state;
 }
 
-/* 809A7088-809A730C 0004E8 0284+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Doc_cFv */
 int daNpc_Doc_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -273,7 +257,6 @@ int daNpc_Doc_c::CreateHeap() {
     return 0;
 }
 
-/* 809A74C8-809A74FC 000928 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Doc_cFv */
 int daNpc_Doc_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Doc_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -281,12 +264,10 @@ int daNpc_Doc_c::Delete() {
     return 1;
 }
 
-/* 809A74FC-809A751C 00095C 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Doc_cFv */
 int daNpc_Doc_c::Execute() {
     return execute();
 }
 
-/* 809A751C-809A75B0 00097C 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Doc_cFv */
 int daNpc_Doc_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -300,14 +281,10 @@ int daNpc_Doc_c::Draw() {
     #endif
 }
 
-/* 809A75B0-809A75D0 000A10 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Doc_cFP10fopAc_ac_c              */
 int daNpc_Doc_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_Doc_c*)i_this)->CreateHeap();
 }
 
-/* 809A75D0-809A7628 000A30 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Doc_cFP8J3DJointi
- */
 int daNpc_Doc_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -320,7 +297,6 @@ int daNpc_Doc_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 809A7628-809A7660 000A88 0038+00 1/1 0/0 0/0 .text            getType__11daNpc_Doc_cFv */
 int daNpc_Doc_c::getType() {
     u8 r31 = fopAcM_GetParam(this) & 0xFF;
     switch (r31) {
@@ -333,7 +309,6 @@ int daNpc_Doc_c::getType() {
     }
 }
 
-/* 809A7660-809A7694 000AC0 0034+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Doc_cFv */
 int daNpc_Doc_c::isDelete() {
     switch (mType) {
     case 0:
@@ -345,7 +320,6 @@ int daNpc_Doc_c::isDelete() {
     }
 }
 
-/* 809A7694-809A7918 000AF4 0284+00 1/1 0/0 0/0 .text            reset__11daNpc_Doc_cFv */
 void daNpc_Doc_c::reset() {
     csXyz sp10;
     u32 var_r29 = (uintptr_t)&field_0xfc8 - (uintptr_t)&field_0xfac;
@@ -386,7 +360,6 @@ void daNpc_Doc_c::reset() {
     setAngle(sp10);
 }
 
-/* 809A7918-809A79A4 000D78 008C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Doc_cFi */
 void daNpc_Doc_c::afterJntAnm(int i_joint) {
     if (i_joint == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -397,7 +370,6 @@ void daNpc_Doc_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 809A79A4-809A7ABC 000E04 0118+00 1/0 0/0 0/0 .text            setParam__11daNpc_Doc_cFv */
 void daNpc_Doc_c::setParam() {
     selectAction();
     srchActors();
@@ -433,7 +405,6 @@ void daNpc_Doc_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 809A7ABC-809A7BC4 000F1C 0108+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Doc_cFv */
 BOOL daNpc_Doc_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Doc_c::talk)) {
         mPreItemNo = 0;
@@ -461,8 +432,6 @@ BOOL daNpc_Doc_c::checkChangeEvt() {
     return false;
 }
 
-/* 809A7BC4-809A7C3C 001024 0078+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Doc_cFv
- */
 void daNpc_Doc_c::setAfterTalkMotion() {
     int idx = 9;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -474,10 +443,8 @@ void daNpc_Doc_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 809A7C3C-809A7C40 00109C 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Doc_cFv */
 void daNpc_Doc_c::srchActors() {}
 
-/* 809A7C40-809A7CE0 0010A0 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Doc_cFv */
 BOOL daNpc_Doc_c::evtTalk() {
     if (chkAction(&daNpc_Doc_c::talk)) {
         (this->*mAction)(NULL);
@@ -488,7 +455,6 @@ BOOL daNpc_Doc_c::evtTalk() {
     return TRUE;
 }
 
-/* 809A7CE0-809A7DA8 001140 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Doc_cFv */
 BOOL daNpc_Doc_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Doc", this, -1);
     if (staffId != -1) {
@@ -505,7 +471,6 @@ BOOL daNpc_Doc_c::evtCutProc() {
     return FALSE;
 }
 
-/* 809A7DA8-809A7F3C 001208 0194+00 1/0 0/0 0/0 .text            action__11daNpc_Doc_cFv */
 void daNpc_Doc_c::action() {
     fopAc_ac_c* actor_p = hitChk(&mCyl, 0xFFFFFFFF);
 
@@ -531,7 +496,6 @@ void daNpc_Doc_c::action() {
     }
 }
 
-/* 809A7F3C-809A80B8 00139C 017C+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Doc_cFv */
 void daNpc_Doc_c::beforeMove() {
     if (mType == 0 && field_0xe34 == 0) {
         int hour = 0;
@@ -558,7 +522,6 @@ void daNpc_Doc_c::beforeMove() {
     }
 }
 
-/* 809A80B8-809A83A8 001518 02F0+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Doc_cFv */
 void daNpc_Doc_c::setAttnPos() {
     cXyz pos(30.0f, 0.0f, 0.0f);
 
@@ -592,7 +555,6 @@ void daNpc_Doc_c::setAttnPos() {
     }
 }
 
-/* 809A83A8-809A8530 001808 0188+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Doc_cFv */
 void daNpc_Doc_c::setCollision() {
     cXyz pos;
 
@@ -638,12 +600,10 @@ void daNpc_Doc_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 809A8530-809A8538 001990 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Doc_cFv */
 BOOL daNpc_Doc_c::drawDbgInfo() {
     return false;
 }
 
-/* 809A8538-809A8620 001998 00E8+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Doc_cFv */
 BOOL daNpc_Doc_c::selectAction() {
     field_0xfac = NULL;
 
@@ -663,14 +623,10 @@ BOOL daNpc_Doc_c::selectAction() {
     return TRUE;
 }
 
-/* 809A8620-809A864C 001A80 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Doc_cFM11daNpc_Doc_cFPCvPvPv_i            */
 int daNpc_Doc_c::chkAction(int (daNpc_Doc_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 809A864C-809A86F4 001AAC 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Doc_cFM11daNpc_Doc_cFPCvPvPv_i            */
 int daNpc_Doc_c::setAction(int (daNpc_Doc_c::*i_action)(void*)) {
     mMode = MODE_EXIT;
 
@@ -688,7 +644,6 @@ int daNpc_Doc_c::setAction(int (daNpc_Doc_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 809A86F4-809A8A9C 001B54 03A8+00 2/0 0/0 0/0 .text            wait__11daNpc_Doc_cFPv */
 int daNpc_Doc_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -764,7 +719,6 @@ int daNpc_Doc_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809A8A9C-809A8C78 001EFC 01DC+00 1/0 0/0 0/0 .text            walk__11daNpc_Doc_cFPv */
 int daNpc_Doc_c::walk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -800,7 +754,6 @@ int daNpc_Doc_c::walk(void* param_0) {
     return 1;
 }
 
-/* 809A8C78-809A904C 0020D8 03D4+00 3/0 0/0 0/0 .text            talk__11daNpc_Doc_cFPv */
 int daNpc_Doc_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -874,32 +827,26 @@ int daNpc_Doc_c::talk(void* param_0) {
     return 0;
 }
 
-/* 809A904C-809A906C 0024AC 0020+00 1/0 0/0 0/0 .text            daNpc_Doc_Create__FPv */
 static int daNpc_Doc_Create(void* i_this) {
     return ((daNpc_Doc_c*)i_this)->create();
 }
 
-/* 809A906C-809A908C 0024CC 0020+00 1/0 0/0 0/0 .text            daNpc_Doc_Delete__FPv */
 static int daNpc_Doc_Delete(void* i_this) {
     return ((daNpc_Doc_c*)i_this)->Delete();
 }
 
-/* 809A908C-809A90AC 0024EC 0020+00 1/0 0/0 0/0 .text            daNpc_Doc_Execute__FPv */
 static int daNpc_Doc_Execute(void* i_this) {
     return ((daNpc_Doc_c*)i_this)->Execute();
 }
 
-/* 809A90AC-809A90CC 00250C 0020+00 1/0 0/0 0/0 .text            daNpc_Doc_Draw__FPv */
 static int daNpc_Doc_Draw(void* i_this) {
     return ((daNpc_Doc_c*)i_this)->Draw();
 }
 
-/* 809A90CC-809A90D4 00252C 0008+00 1/0 0/0 0/0 .text            daNpc_Doc_IsDelete__FPv */
 static int daNpc_Doc_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 809AA8FC-809AA91C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Doc_MethodTable */
 static actor_method_class daNpc_Doc_MethodTable = {
     (process_method_func)daNpc_Doc_Create,
     (process_method_func)daNpc_Doc_Delete,
@@ -908,7 +855,6 @@ static actor_method_class daNpc_Doc_MethodTable = {
     (process_method_func)daNpc_Doc_Draw,
 };
 
-/* 809AA91C-809AA94C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_DOC */
 extern actor_process_profile_definition g_profile_NPC_DOC = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp
index 7c2ca4aad8..aeb2a1c8c8 100644
--- a/src/d/actor/d_a_npc_doorboy.cpp
+++ b/src/d/actor/d_a_npc_doorboy.cpp
@@ -93,7 +93,6 @@ enum Motion {
     /* 0xB */ MOT_SIT_TO_WOLF_A,
 };
 
-/* 809ADB48-809ADB90 000020 0048+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[6] = {
     {BCK_M_WAIT_A, J3DFrameCtrl::EMode_LOOP, MGENERAL},
     {BCK_M_TALK_A, J3DFrameCtrl::EMode_LOOP, MGENERAL},
@@ -103,35 +102,27 @@ static daNpc_GetParam2 l_bckGetParamList[6] = {
     {BCK_M_SIT_TO_WOLF_A, J3DFrameCtrl::EMode_LOOP, MGENERAL},
 };
 
-/* 809ADB90-809ADB9C 000068 000C+00 0/0 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {BTP_DOORBOY, J3DFrameCtrl::EMode_LOOP, DOORBOY},
 };
 
-/* 809ADB9C-809ADBA4 -00001 0008+00 5/6 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[2] = {
     "DoorBoy",
     "Mgeneral",
 };
 
-/* 809ADBA4-809ADBA8 00007C 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {NULL};
 
-/* 809ADBA8-809ADBAC -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "DoorBoy";
 
-/* 809ADD64-809ADD68 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcDoorBoy_Param_c l_HIO;
 
-/* 809ADBAC-809ADBB8 000084 000C+00 1/2 0/0 0/0 .data            mEvtSeqList__14daNpcDoorBoy_c */
 daNpcDoorBoy_c::EventFn daNpcDoorBoy_c::mEvtSeqList[1] = {
     NULL
 };
 
-/* 809AAC8C-809AAE10 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__14daNpcDoorBoy_cFv */
 daNpcDoorBoy_c::daNpcDoorBoy_c() {}
 
-/* 809AAEA0-809AB088 000300 01E8+00 1/0 0/0 0/0 .text            __dt__14daNpcDoorBoy_cFv */
 daNpcDoorBoy_c::~daNpcDoorBoy_c() {
     for (int i = 0; i < 2; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -142,7 +133,6 @@ daNpcDoorBoy_c::~daNpcDoorBoy_c() {
     }
 }
 
-/* 809AD9A8-809ADA14 000000 006C+00 10/10 0/0 0/0 .rodata          m__20daNpcDoorBoy_Param_c */
 daNpcDoorBoy_HIOParam const daNpcDoorBoy_Param_c::m = {
     55.0f,
     0.0f,
@@ -179,7 +169,6 @@ daNpcDoorBoy_HIOParam const daNpcDoorBoy_Param_c::m = {
     false,
 };
 
-/* 809AB088-809AB320 0004E8 0298+00 1/1 0/0 0/0 .text            Create__14daNpcDoorBoy_cFv */
 cPhs__Step daNpcDoorBoy_c::Create() {
     fopAcM_ct(this, daNpcDoorBoy_c);
 
@@ -228,7 +217,6 @@ cPhs__Step daNpcDoorBoy_c::Create() {
     return phase;
 }
 
-/* 809AB320-809AB4A4 000780 0184+00 1/1 0/0 0/0 .text            CreateHeap__14daNpcDoorBoy_cFv */
 int daNpcDoorBoy_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_DOORBOY);
 
@@ -258,26 +246,22 @@ int daNpcDoorBoy_c::CreateHeap() {
     return 1;
 }
 
-/* 809AB4A4-809AB4D8 000904 0034+00 1/1 0/0 0/0 .text            Delete__14daNpcDoorBoy_cFv */
 int daNpcDoorBoy_c::Delete() {
     this->~daNpcDoorBoy_c();
     return 1;
 }
 
-/* 809AB4D8-809AB4FC 000938 0024+00 2/2 0/0 0/0 .text            Execute__14daNpcDoorBoy_cFv */
 int daNpcDoorBoy_c::Execute() {
     execute();
     return 1;
 }
 
-/* 809AB4FC-809AB578 00095C 007C+00 1/1 0/0 0/0 .text            Draw__14daNpcDoorBoy_cFv */
 int daNpcDoorBoy_c::Draw() {
     draw(FALSE, FALSE, daNpcDoorBoy_Param_c::m.common.real_shadow_size, NULL, FALSE);
     dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), 50.0f, mAcch.m_gnd, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
     return 1;
 }
 
-/* 809AB578-809AB704 0009D8 018C+00 1/1 0/0 0/0 .text            ctrlJoint__14daNpcDoorBoy_cFP8J3DJointP8J3DModel */
 int daNpcDoorBoy_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jointNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD};
@@ -306,13 +290,11 @@ int daNpcDoorBoy_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809AB704-809AB724 000B64 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__14daNpcDoorBoy_cFP10fopAc_ac_c */
 int daNpcDoorBoy_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcDoorBoy_c* i_this = (daNpcDoorBoy_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 809AB724-809AB770 000B84 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__14daNpcDoorBoy_cFP8J3DJointi */
 int daNpcDoorBoy_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -326,7 +308,6 @@ int daNpcDoorBoy_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809AB770-809AB7B8 000BD0 0048+00 1/0 0/0 0/0 .text            setMotion__14daNpcDoorBoy_cFifi */
 void daNpcDoorBoy_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
 
@@ -339,7 +320,6 @@ void daNpcDoorBoy_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809AB7B8-809AB984 000C18 01CC+00 1/1 0/0 0/0 .text            reset__14daNpcDoorBoy_cFv */
 void daNpcDoorBoy_c::reset() {
     initialize();
     mLookat.initialize();
@@ -376,7 +356,6 @@ void daNpcDoorBoy_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 809AB984-809ABA2C 000DE4 00A8+00 1/1 0/0 0/0 .text            setAction__14daNpcDoorBoy_cFM14daNpcDoorBoy_cFPCvPvPv_b */
 BOOL daNpcDoorBoy_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -428,7 +407,6 @@ inline void daNpcDoorBoy_c::playMotion() {
     }
 }
 
-/* 809ACE18-809ACFF8 002278 01E0+00 1/1 0/0 0/0 .text            lookat__14daNpcDoorBoy_cFv */
 inline void daNpcDoorBoy_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model_p = mAnm_p->getModel();
@@ -561,7 +539,6 @@ inline bool daNpcDoorBoy_c::isDummyTalk() {
     return true;
 }
 
-/* 809ABA2C-809AC064 000E8C 0638+00 5/0 0/0 0/0 .text            wait__14daNpcDoorBoy_cFPv */
 bool daNpcDoorBoy_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -630,7 +607,6 @@ bool daNpcDoorBoy_c::wait(void* param_1) {
     return true;
 }
 
-/* 809AC064-809AC114 0014C4 00B0+00 1/0 0/0 0/0 .text            fear__14daNpcDoorBoy_cFPv */
 bool daNpcDoorBoy_c::fear(void* param_1) {
     switch (mMode) {
         case 0:
@@ -656,7 +632,6 @@ bool daNpcDoorBoy_c::fear(void* param_1) {
     return true;
 }
 
-/* 809AC114-809AC528 001574 0414+00 1/0 0/0 0/0 .text            talk__14daNpcDoorBoy_cFPv */
 bool daNpcDoorBoy_c::talk(void* param_1) {
     int itemNo;
     int iVar1, i_motion;
@@ -716,7 +691,6 @@ bool daNpcDoorBoy_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809AC528-809AC6F4 001988 01CC+00 1/0 0/0 0/0 .text            demo__14daNpcDoorBoy_cFPv */
 bool daNpcDoorBoy_c::demo(void* param_1) {
     switch (mMode) {
         case 0:
@@ -758,7 +732,6 @@ bool daNpcDoorBoy_c::demo(void* param_1) {
     return true;
 }
 
-/* 809AC6F4-809AC90C 001B54 0218+00 1/0 0/0 0/0 .text            dummyTalk__14daNpcDoorBoy_cFPv */
 bool daNpcDoorBoy_c::dummyTalk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -788,36 +761,30 @@ bool daNpcDoorBoy_c::dummyTalk(void* param_1) {
     return true;
 }
 
-/* 809AC90C-809AC92C 001D6C 0020+00 1/0 0/0 0/0 .text            daNpcDoorBoy_Create__FPv */
 static int daNpcDoorBoy_Create(void* a_this) {
     daNpcDoorBoy_c* i_this = (daNpcDoorBoy_c*)a_this;
     return i_this->Create();
 }
 
-/* 809AC92C-809AC94C 001D8C 0020+00 1/0 0/0 0/0 .text            daNpcDoorBoy_Delete__FPv */
 static int daNpcDoorBoy_Delete(void* a_this) {
     daNpcDoorBoy_c* i_this = (daNpcDoorBoy_c*)a_this;
     return i_this->Delete();
 }
 
-/* 809AC94C-809AC96C 001DAC 0020+00 1/0 0/0 0/0 .text            daNpcDoorBoy_Execute__FPv */
 static int daNpcDoorBoy_Execute(void* a_this) {
     daNpcDoorBoy_c* i_this = (daNpcDoorBoy_c*)a_this;
     return i_this->Execute();
 }
 
-/* 809AC96C-809AC98C 001DCC 0020+00 1/0 0/0 0/0 .text            daNpcDoorBoy_Draw__FPv */
 static int daNpcDoorBoy_Draw(void* a_this) {
     daNpcDoorBoy_c* i_this = (daNpcDoorBoy_c*)a_this;
     return i_this->Draw();
 }
 
-/* 809AC98C-809AC994 001DEC 0008+00 1/0 0/0 0/0 .text            daNpcDoorBoy_IsDelete__FPv */
 static int daNpcDoorBoy_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 809AC994-809ACA58 001DF4 00C4+00 1/0 0/0 0/0 .text            setParam__14daNpcDoorBoy_cFv */
 void daNpcDoorBoy_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcDoorBoy_Param_c::m.common.attention_distance,
                                                                   daNpcDoorBoy_Param_c::m.common.attention_angle);
@@ -831,7 +798,6 @@ void daNpcDoorBoy_c::setParam() {
     gravity = daNpcDoorBoy_Param_c::m.common.gravity;
 }
 
-/* 809ACA58-809ACC5C 001EB8 0204+00 1/0 0/0 0/0 .text            main__14daNpcDoorBoy_cFv */
 BOOL daNpcDoorBoy_c::main() {
     if (mAction) {
         (this->*mAction)(NULL);
@@ -841,7 +807,6 @@ BOOL daNpcDoorBoy_c::main() {
     return FALSE;
 }
 
-/* 809ACC5C-809ACE18 0020BC 01BC+00 1/0 0/0 0/0 .text            setAttnPos__14daNpcDoorBoy_cFv */
 void daNpcDoorBoy_c::setAttnPos() {
     if (mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -876,7 +841,6 @@ void daNpcDoorBoy_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&field_0xc98);
 }
 
-/* 809ACFF8-809AD0C8 002458 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__14daNpcDoorBoy_cFif */
 void daNpcDoorBoy_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* anm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_index].arcIdx], l_bckGetParamList[i_index].fileIdx);
     int i_attr = l_bckGetParamList[i_index].attr;
@@ -888,12 +852,10 @@ void daNpcDoorBoy_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 809AD0C8-809AD0D0 002528 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpcDoorBoy_cFv */
 BOOL daNpcDoorBoy_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 809ADC24-809ADC44 -00001 0020+00 1/0 0/0 0/0 .data            daNpcDoorBoy_MethodTable */
 static actor_method_class daNpcDoorBoy_MethodTable = {
     (process_method_func)daNpcDoorBoy_Create,
     (process_method_func)daNpcDoorBoy_Delete,
@@ -902,7 +864,6 @@ static actor_method_class daNpcDoorBoy_MethodTable = {
     (process_method_func)daNpcDoorBoy_Draw,
 };
 
-/* 809ADC44-809ADC74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_DOORBOY */
 extern actor_process_profile_definition g_profile_NPC_DOORBOY = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp
index 16df698d2e..ba66a02084 100644
--- a/src/d/actor/d_a_npc_drainSol.cpp
+++ b/src/d/actor/d_a_npc_drainSol.cpp
@@ -8,28 +8,23 @@
 #include "d/actor/d_a_npc_drainSol.h"
 #include "d/actor/d_a_npc.h"
 
-/* 809AFACC-809AFAD4 000000 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[] = {
     9, 7
 };
 
-/* 809AFAD4-809AFAEC 000008 0018+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam3 l_bckGetParamList[] = {
     {5, 2},
     {4, 2},
     {4, 0},
 };
 
-/* 809AFAEC-809AFAF4 -00001 0008+00 4/4 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[2] = {
     "DrainSol1",
     "DrainSol2",
 };
 
-/* 809ADE6C-809ADF18 0000EC 00AC+00 1/1 0/0 0/0 .text            __ct__12daNpcDrSol_cFv */
 daNpcDrSol_c::daNpcDrSol_c() {}
 
-/* 809ADFE4-809AE10C 000264 0128+00 1/0 0/0 0/0 .text            __dt__12daNpcDrSol_cFv */
 daNpcDrSol_c::~daNpcDrSol_c() {
     dComIfG_resDelete(&mPhase, l_arcNames[mType]);
 
@@ -38,7 +33,6 @@ daNpcDrSol_c::~daNpcDrSol_c() {
     }
 }
 
-/* 809AF9A4-809AFA10 000000 006C+00 5/5 0/0 0/0 .rodata          m__18daNpcDrSol_Param_c */
 const daNpcDrSol_HIOParam daNpcDrSol_Param_c::m = {
     40.0f,
     0.0f,
@@ -75,7 +69,6 @@ const daNpcDrSol_HIOParam daNpcDrSol_Param_c::m = {
     0,
 };
 
-/* 809AE10C-809AE354 00038C 0248+00 1/1 0/0 0/0 .text            Create__12daNpcDrSol_cFv */
 int daNpcDrSol_c::Create() {
     fopAcM_ct(this, daNpcDrSol_c);
 
@@ -122,7 +115,6 @@ int daNpcDrSol_c::Create() {
     return phase_state;
 }
 
-/* 809AE354-809AE51C 0005D4 01C8+00 1/1 0/0 0/0 .text            CreateHeap__12daNpcDrSol_cFv */
 int daNpcDrSol_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[mType], l_bmdGetParamList[mType]);
     JUT_ASSERT(268, NULL != mdlData_p);
@@ -158,14 +150,12 @@ int daNpcDrSol_c::CreateHeap() {
     return 1;
 }
 
-/* 809AE51C-809AE550 00079C 0034+00 1/1 0/0 0/0 .text            Delete__12daNpcDrSol_cFv */
 int daNpcDrSol_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcDrSol_c();
     return 1;
 }
 
-/* 809AE550-809AE5CC 0007D0 007C+00 2/2 0/0 0/0 .text            Execute__12daNpcDrSol_cFv */
 int daNpcDrSol_c::Execute() {
     execute();
 
@@ -176,13 +166,11 @@ int daNpcDrSol_c::Execute() {
     return 1;
 }
 
-/* 809AE5CC-809AE60C 00084C 0040+00 1/1 0/0 0/0 .text            Draw__12daNpcDrSol_cFv */
 int daNpcDrSol_c::Draw() {
     draw(FALSE, FALSE, daNpcDrSol_Param_c::m.common.real_shadow_size, NULL, 0);
     return 1;
 }
 
-/* 809AE60C-809AE69C 00088C 0090+00 1/0 0/0 0/0 .text            drawOtherMdls__12daNpcDrSol_cFv */
 void daNpcDrSol_c::drawOtherMdls() {
     if (daPy_py_c::checkNowWolfEyeUp() && field_0xbd8 != NULL) {
         g_env_light.setLightTevColorType_MAJI(field_0xbd8, &tevStr);
@@ -192,8 +180,6 @@ void daNpcDrSol_c::drawOtherMdls() {
     }
 }
 
-/* 809AE69C-809AE6BC 00091C 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpcDrSol_cFP10fopAc_ac_c             */
 int daNpcDrSol_c::createHeapCallBack(fopAc_ac_c* actor) {
     return ((daNpcDrSol_c*)actor)->CreateHeap();
 }
@@ -226,7 +212,6 @@ void daNpcDrSol_c::playMotion() {
     }
 }
 
-/* 809AE6BC-809AE844 00093C 0188+00 1/1 0/0 0/0 .text            reset__12daNpcDrSol_cFv */
 void daNpcDrSol_c::reset() {
     initialize();
 
@@ -258,8 +243,6 @@ void daNpcDrSol_c::reset() {
     setAction(&daNpcDrSol_c::wait);
 }
 
-/* 809AE844-809AE8EC 000AC4 00A8+00 1/1 0/0 0/0 .text
- * setAction__12daNpcDrSol_cFM12daNpcDrSol_cFPCvPvPv_b          */
 int daNpcDrSol_c::setAction(bool (daNpcDrSol_c::*i_action)(void*)) {
     mMode = 3;
 
@@ -277,7 +260,6 @@ int daNpcDrSol_c::setAction(bool (daNpcDrSol_c::*i_action)(void*)) {
     return TRUE;
 }
 
-/* 809AE8EC-809AE994 000B6C 00A8+00 1/1 0/0 0/0 .text            chkFindPlayer__12daNpcDrSol_cFv */
 bool daNpcDrSol_c::chkFindPlayer() {
     dBgS_LinChk linechk;
     cXyz end(fopAcM_GetPosition_p(daPy_getPlayerActorClass())->x, eyePos.y, fopAcM_GetPosition_p(daPy_getPlayerActorClass())->z);
@@ -290,7 +272,6 @@ bool daNpcDrSol_c::chkFindPlayer() {
     return true;
 }
 
-/* 809AE994-809AEB18 000C14 0184+00 2/0 0/0 0/0 .text            wait__12daNpcDrSol_cFPv */
 bool daNpcDrSol_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -314,7 +295,6 @@ bool daNpcDrSol_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809AEB18-809AEB94 000D98 007C+00 1/0 0/0 0/0 .text            setMotion__12daNpcDrSol_cFifi */
 void daNpcDrSol_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     s16 motion = i_motion;
 
@@ -333,7 +313,6 @@ void daNpcDrSol_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     }
 }
 
-/* 809AEB94-809AED20 000E14 018C+00 1/0 0/0 0/0 .text            talk__12daNpcDrSol_cFPv */
 bool daNpcDrSol_c::talk(void* param_0) {
     bool rt = false;
     
@@ -366,32 +345,26 @@ bool daNpcDrSol_c::talk(void* param_0) {
     return rt;
 }
 
-/* 809AED20-809AED40 000FA0 0020+00 1/0 0/0 0/0 .text            daNpcDrSol_Create__FPv */
 static int daNpcDrSol_Create(void* i_this) {
     return ((daNpcDrSol_c*)i_this)->Create();
 }
 
-/* 809AED40-809AED60 000FC0 0020+00 1/0 0/0 0/0 .text            daNpcDrSol_Delete__FPv */
 static int daNpcDrSol_Delete(void* i_this) {
     return ((daNpcDrSol_c*)i_this)->Delete();
 }
 
-/* 809AED60-809AED80 000FE0 0020+00 1/0 0/0 0/0 .text            daNpcDrSol_Execute__FPv */
 static int daNpcDrSol_Execute(void* i_this) {
     return ((daNpcDrSol_c*)i_this)->Execute();
 }
 
-/* 809AED80-809AEDA0 001000 0020+00 1/0 0/0 0/0 .text            daNpcDrSol_Draw__FPv */
 static int daNpcDrSol_Draw(void* i_this) {
     return ((daNpcDrSol_c*)i_this)->Draw();
 }
 
-/* 809AEDA0-809AEDA8 001020 0008+00 1/0 0/0 0/0 .text            daNpcDrSol_IsDelete__FPv */
 static int daNpcDrSol_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 809AEDA8-809AEE24 001028 007C+00 1/0 0/0 0/0 .text            setParam__12daNpcDrSol_cFv */
 void daNpcDrSol_c::setParam() {
     if (checkHide()) {
         attention_info.flags = 0;
@@ -409,7 +382,6 @@ void daNpcDrSol_c::setParam() {
     #endif
 }
 
-/* 809AEE24-809AEFDC 0010A4 01B8+00 1/0 0/0 0/0 .text            main__12daNpcDrSol_cFv */
 BOOL daNpcDrSol_c::main() {
     if (mAction != NULL) {
         (this->*mAction)(NULL);
@@ -419,7 +391,6 @@ BOOL daNpcDrSol_c::main() {
     return 0;
 }
 
-/* 809AEFDC-809AF12C 00125C 0150+00 1/0 0/0 0/0 .text            setAttnPos__12daNpcDrSol_cFv */
 void daNpcDrSol_c::setAttnPos() {
     setMtx();
 
@@ -442,7 +413,6 @@ void daNpcDrSol_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 809AF12C-809AF1FC 0013AC 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__12daNpcDrSol_cFif */
 void daNpcDrSol_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* bck_p = NULL;
 
@@ -456,19 +426,16 @@ void daNpcDrSol_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 809AF1FC-809AF204 00147C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpcDrSol_cFv */
 BOOL daNpcDrSol_c::drawDbgInfo() {
     return false;
 }
 
-/* 809AFC4C-809AFC50 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcDrSol_Param_c l_HIO;
 
 static char* dummyString() {
     return "Shoe";
 };
 
-/* 809AFB18-809AFB38 -00001 0020+00 1/0 0/0 0/0 .data            daNpcDrSol_MethodTable */
 static actor_method_class daNpcDrSol_MethodTable = {
     (process_method_func)daNpcDrSol_Create,
     (process_method_func)daNpcDrSol_Delete,
@@ -477,7 +444,6 @@ static actor_method_class daNpcDrSol_MethodTable = {
     (process_method_func)daNpcDrSol_Draw,
 };
 
-/* 809AFB38-809AFB68 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_DRSOL */
 extern actor_process_profile_definition g_profile_NPC_DRSOL = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp
index e837bd4678..decd32629d 100644
--- a/src/d/actor/d_a_npc_du.cpp
+++ b/src/d/actor/d_a_npc_du.cpp
@@ -71,15 +71,14 @@ enum Action_Mode {
 
 class daNpc_Du_HIO_c : public JORReflexible {
 public:
-    /* 809AFD4C */ daNpc_Du_HIO_c();
-    /* 809B17A0 */ virtual ~daNpc_Du_HIO_c() {}
+    daNpc_Du_HIO_c();
+    virtual ~daNpc_Du_HIO_c() {}
     void genMessage(JORMContext*);
 
     /* 0x4 */ s8 id;
     /* 0x8 */ f32 base_size;
 };
 
-/* 809AFD4C-809AFD70 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daNpc_Du_HIO_cFv */
 daNpc_Du_HIO_c::daNpc_Du_HIO_c() {
     id = -1;
     base_size = 1.0f;
@@ -92,13 +91,11 @@ void daNpc_Du_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 809AFD70-809AFE20 000110 00B0+00 4/4 0/0 0/0 .text            anm_init__FP12npc_du_classifUcf */
 static void anm_init(npc_du_class* i_this, int i_index, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_du", i_index), i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->mAnm = i_index;
 }
 
-/* 809AFE20-809B0014 0001C0 01F4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -141,7 +138,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809B0014-809B0114 0003B4 0100+00 1/0 0/0 0/0 .text            daNpc_Du_Draw__FP12npc_du_class */
 static int daNpc_Du_Draw(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     J3DModel* model = i_this->mpMorf->getModel();
@@ -162,7 +158,6 @@ static int daNpc_Du_Draw(npc_du_class* i_this) {
     return 1;
 }
 
-/* 809B0114-809B0360 0004B4 024C+00 1/1 0/0 0/0 .text            npc_du_normal__FP12npc_du_class */
 static void npc_du_normal(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -212,7 +207,6 @@ static void npc_du_normal(npc_du_class* i_this) {
     }
 }
 
-/* 809B0360-809B04E0 000700 0180+00 1/1 0/0 0/0 .text            npc_du_away__FP12npc_du_class */
 static void npc_du_away(npc_du_class* i_this) {
     // Fakematch???
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
@@ -259,7 +253,6 @@ static void npc_du_away(npc_du_class* i_this) {
     cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mCurrentAngleYTarget, 2, maxStepS);
 }
 
-/* 809B04E0-809B0774 000880 0294+00 1/1 0/0 0/0 .text            npc_du_swim__FP12npc_du_class */
 static void npc_du_swim(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -319,7 +312,6 @@ static void npc_du_swim(npc_du_class* i_this) {
     }
 }
 
-/* 809B0774-809B08E0 000B14 016C+00 1/1 0/0 0/0 .text            npc_du_message__FP12npc_du_class */
 static void npc_du_message(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -366,7 +358,6 @@ static void npc_du_message(npc_du_class* i_this) {
     }
 }
 
-/* 809B08E0-809B0CBC 000C80 03DC+00 1/1 0/0 0/0 .text            action__FP12npc_du_class */
 static void action(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     cXyz sp9c, spa8;
@@ -467,7 +458,6 @@ static void action(npc_du_class* i_this) {
     cLib_addCalcAngleS2(&i_this->mNeck2XRot, i_this->mNeck2XRotTarget, 2, 0x1000);
 }
 
-/* 809B0CBC-809B0DE0 00105C 0124+00 1/1 0/0 0/0 .text            message__FP12npc_du_class */
 static BOOL message(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -512,16 +502,12 @@ static BOOL message(npc_du_class* i_this) {
     return FALSE;
 }
 
-/* 809B19E8-809B19EC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_initHIO;
 
-/* 809B19EC-809B19F8 00000C 000C+00 1/1 0/0 0/0 .bss             @3757 */
 static u8 lit_3757[12];
 
-/* 809B19F8-809B1A04 000018 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daNpc_Du_HIO_c l_HIO;
 
-/* 809B0DE0-809B116C 001180 038C+00 2/1 0/0 0/0 .text            daNpc_Du_Execute__FP12npc_du_class */
 static int daNpc_Du_Execute(npc_du_class* i_this) {
     if (cDmrNowMidnaTalk()) {
         return 1;
@@ -594,12 +580,10 @@ static int daNpc_Du_Execute(npc_du_class* i_this) {
     return 1;
 }
 
-/* 809B116C-809B1174 00150C 0008+00 1/0 0/0 0/0 .text            daNpc_Du_IsDelete__FP12npc_du_class */
 static int daNpc_Du_IsDelete(npc_du_class* i_this) {
     return 1;
 }
 
-/* 809B1174-809B11E0 001514 006C+00 1/0 0/0 0/0 .text            daNpc_Du_Delete__FP12npc_du_class */
 static int daNpc_Du_Delete(npc_du_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -618,7 +602,6 @@ static int daNpc_Du_Delete(npc_du_class* i_this) {
     return 1;
 }
 
-/* 809B11E0-809B13C8 001580 01E8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     npc_du_class* i_this = (npc_du_class*)actor;
 
@@ -651,7 +634,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 809B1410-809B16A0 0017B0 0290+00 1/0 0/0 0/0 .text            daNpc_Du_Create__FP10fopAc_ac_c */
 static cPhs__Step daNpc_Du_Create(fopAc_ac_c* a_this) {
     npc_du_class* i_this = (npc_du_class*)a_this;
     fopAcM_ct(a_this, npc_du_class);
@@ -714,7 +696,6 @@ static cPhs__Step daNpc_Du_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 809B193C-809B195C -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Du_Method */
 static actor_method_class l_daNpc_Du_Method = {
     (process_method_func)daNpc_Du_Create,
     (process_method_func)daNpc_Du_Delete,
@@ -723,7 +704,6 @@ static actor_method_class l_daNpc_Du_Method = {
     (process_method_func)daNpc_Du_Draw,
 };
 
-/* 809B195C-809B198C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_DU */
 extern actor_process_profile_definition g_profile_NPC_DU = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp
index 00f358412d..93f40b34e0 100644
--- a/src/d/actor/d_a_npc_fairy.cpp
+++ b/src/d/actor/d_a_npc_fairy.cpp
@@ -144,7 +144,6 @@ enum Type {
     /* 0x4 */ TYPE_50F,
 };
 
-/* 809B92E4-809B9378 000000 0094+00 21/21 0/0 0/0 .rodata          m__19daNpc_Fairy_Param_c */
 const daNpc_Fairy_HIOParam daNpc_Fairy_Param_c::m = {
     190.0f,
     -3.0f,
@@ -226,7 +225,6 @@ void daNpc_Fairy_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 809B1B0C-809B1BC0 0000EC 00B4+00 1/1 0/0 0/0 .text            create__16_Fairy_Feather_cFv */
 BOOL _Fairy_Feather_c::create() {
     if (!loadModel()) {
         return FALSE;
@@ -252,29 +250,24 @@ BOOL _Fairy_Feather_c::create() {
     return TRUE;
 }
 
-/* 809B95F8-809B9600 -00001 0008+00 7/8 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "fairy",
 };
 
-/* 809B9600-809B9604 000028 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1,
 };
 
-/* 809B9604-809B9618 -00001 0014+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[5] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn0, l_loadResPtrn0,
 };
 
-/* 809B9618-809B9620 000040 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDV_FAIRY, FAIRY},
 };
 
-/* 809B9620-809B96AC 000048 008C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE,BTP_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1},
     {BCK_FAIRY_F_SAD, J3DFrameCtrl::EMode_LOOP, FAIRY, BTP_FAIRY_F_SAD, J3DFrameCtrl::EMode_LOOP, FAIRY, 1},
@@ -283,7 +276,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[5] = {
     {BCK_FAIRY_FH_SMILE, J3DFrameCtrl::EMode_LOOP, FAIRY, BTP_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1},
 };
 
-/* 809B96AC-809B97FC 0000D4 0150+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[12] = {
     {BCK_FAIRY_WAIT, J3DFrameCtrl::EMode_LOOP, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0},
     {BCK_FAIRY_GO, J3DFrameCtrl::EMode_NONE, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0},
@@ -299,7 +291,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[12] = {
     {BCK_FAIRY_HOPPE_WAIT, J3DFrameCtrl::EMode_LOOP, FAIRY, BTK_FAIRY, J3DFrameCtrl::EMode_LOOP, FAIRY, 1, 0},
 };
 
-/* 809B97FC-809B984C 000224 0050+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -308,7 +299,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809B984C-809B98FC 000274 00B0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {7, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -323,7 +313,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809B1BC0-809B1CE4 0001A0 0124+00 1/1 0/0 0/0 .text            loadModel__16_Fairy_Feather_cFv */
 BOOL _Fairy_Feather_c::loadModel() {
     // ----------------Loading wing model.\n
     OS_REPORT("---------------- 羽モデルを読み込みます。\n");
@@ -356,7 +345,6 @@ BOOL _Fairy_Feather_c::loadModel() {
     return 1;
 }
 
-/* 809B1CE4-809B1DEC 0002C4 0108+00 4/4 0/0 0/0 .text            setAnm__16_Fairy_Feather_cFi */
 BOOL _Fairy_Feather_c::setAnm(int i_idx) {
     if (i_idx == mPrevAnm) {
         return TRUE;
@@ -393,7 +381,6 @@ BOOL _Fairy_Feather_c::setAnm(int i_idx) {
     return TRUE;
 }
 
-/* 809B1DEC-809B1EA8 0003CC 00BC+00 1/1 0/0 0/0 .text            setBrk__16_Fairy_Feather_cFi */
 BOOL _Fairy_Feather_c::setBrk(int i_idx) {
     static daNpc_GetParam2 const sBrkPrm[1] = {
         {BRK_FAIRY_FEATHER_GT, J3DFrameCtrl::EMode_LOOP, FAIRY},
@@ -408,7 +395,6 @@ BOOL _Fairy_Feather_c::setBrk(int i_idx) {
     return mBrkAnm.init(mpMorf->getModel()->getModelData(), brk, 1, sBrkPrm[i_idx].attr, 1.0f, 0, -1);
 }
 
-/* 809B1EA8-809B1F64 000488 00BC+00 1/1 0/0 0/0 .text            setBtk__16_Fairy_Feather_cFi */
 BOOL _Fairy_Feather_c::setBtk(int i_idx) {
     static daNpc_GetParam2 const sBtkPrm[1] = {
         {BTK_FAIRY_FEATHER_GT, J3DFrameCtrl::EMode_LOOP, FAIRY},
@@ -423,12 +409,10 @@ BOOL _Fairy_Feather_c::setBtk(int i_idx) {
     return mBtkAnm.init(mpMorf->getModel()->getModelData(), btk, 1, sBtkPrm[i_idx].attr, 1.0f, 0, -1);
 }
 
-/* 809B1F64-809B1F6C 000544 0008+00 1/1 0/0 0/0 .text            ctrlJointCallBack__16_Fairy_Feather_cFP8J3DJointi */
 int _Fairy_Feather_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809B1F6C-809B1FD4 00054C 0068+00 1/1 0/0 0/0 .text            connect__16_Fairy_Feather_cFP13daNpc_Fairy_c */
 void _Fairy_Feather_c::connect(daNpc_Fairy_c* i_this) {
     J3DModel* mdl_p = i_this->mpMorf[0]->getModel();
     mDoMtx_stack_c::copy(mdl_p->getAnmMtx(JNT_FEATHER1AL1));
@@ -436,7 +420,6 @@ void _Fairy_Feather_c::connect(daNpc_Fairy_c* i_this) {
     mpMorf->modelCalc();
 }
 
-/* 809B1FD4-809B2250 0005B4 027C+00 1/1 0/0 0/0 .text draw__16_Fairy_Feather_cFP13daNpc_Fairy_c */
 void _Fairy_Feather_c::draw(daNpc_Fairy_c* i_this) {
     cXyz pos(fopAcM_GetPosition(i_this));
     dKy_tevstr_c tevStr = i_this->tevStr;
@@ -454,7 +437,6 @@ void _Fairy_Feather_c::draw(daNpc_Fairy_c* i_this) {
     mBtkAnm.remove(mdlData_p);
 }
 
-/* 809B98FC-809B998C -00001 0090+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[18] = {
     {"", 0},
     {"APPEAR_10F_01", 1},
@@ -476,7 +458,6 @@ static daNpcT_evtData_c l_evtList[18] = {
     {"RETURN_CANCEL", 1},
 };
 
-/* 809B998C-809B99D4 -00001 0048+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Fairy_c */
 char* daNpc_Fairy_c::mCutNameList[18] = {
     "",
     "APPEAR_10F_01",
@@ -498,7 +479,6 @@ char* daNpc_Fairy_c::mCutNameList[18] = {
     "RETURN_CANCEL",
 };
 
-/* 809B9AA0-809B9B78 0004C8 00D8+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Fairy_c */
 daNpc_Fairy_c::cutFunc daNpc_Fairy_c::mCutList[18] = {
     NULL,
     &daNpc_Fairy_c::cutAppear_10F_01,
@@ -520,7 +500,6 @@ daNpc_Fairy_c::cutFunc daNpc_Fairy_c::mCutList[18] = {
     &daNpc_Fairy_c::cutReturnCancel,
 };
 
-/* 809B228C-809B2430 00086C 01A4+00 1/0 0/0 0/0 .text            __dt__13daNpc_Fairy_cFv */
 daNpc_Fairy_c::~daNpc_Fairy_c() {
     OS_REPORT("|%06d:%x|daNpc_Fairy_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -537,10 +516,8 @@ daNpc_Fairy_c::~daNpc_Fairy_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809BA424-809BA428 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_FAIRY_HIO_CLASS l_HIO;
 
-/* 809B2430-809B26E8 000A10 02B8+00 1/1 0/0 0/0 .text            Create__13daNpc_Fairy_cFv */
 cPhs__Step daNpc_Fairy_c::Create() {
     daNpcT_ct(this, daNpc_Fairy_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -598,7 +575,6 @@ cPhs__Step daNpc_Fairy_c::Create() {
     return phase;
 }
 
-/* 809B26E8-809B2988 000CC8 02A0+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::CreateHeap() {
     int arc_idx = 0;
     int file_idx = 0;
@@ -645,7 +621,6 @@ int daNpc_Fairy_c::CreateHeap() {
     return 1;
 }
 
-/* 809B2B44-809B2C20 001124 00DC+00 1/1 0/0 0/0 .text            setAnmData__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::setAnmData() {
     J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
     J3DAnmColor* bpk = getColorAnmP(l_resNameList[1], BPK_FAIRY);
@@ -666,7 +641,6 @@ void daNpc_Fairy_c::setAnmData() {
     mAnmFlags |= ANM_PLAY_BPK | ANM_PLAY_BRK | ANM_PLAY_BTK;
 }
 
-/* 809B2C20-809B2E78 001200 0258+00 1/0 0/0 0/0 .text            setMotionAnm__13daNpc_Fairy_cFifi */
 bool daNpc_Fairy_c::setMotionAnm(int i_idx, f32 i_morf, int param_3) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -717,7 +691,6 @@ bool daNpc_Fairy_c::setMotionAnm(int i_idx, f32 i_morf, int param_3) {
     return daNpc_Fairy_c::afterSetMotionAnm(i_idx, anmData.mBckAttr, i_morf, anmData.mBtkAttr);
 }
 
-/* 809B2E78-809B2EFC 001458 0084+00 2/1 0/0 0/0 .text afterSetMotionAnm__13daNpc_Fairy_cFiifi */
 bool daNpc_Fairy_c::afterSetMotionAnm(int i_idx, int i_bck_attr, f32 i_morf, int i_btk_attr) {
     int feather_bck;
 
@@ -751,7 +724,6 @@ bool daNpc_Fairy_c::afterSetMotionAnm(int i_idx, int i_bck_attr, f32 i_morf, int
     return mFairyFeather.setAnm(feather_bck);
 }
 
-/* 809B2EFC-809B2F30 0014DC 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Fairy_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -759,7 +731,6 @@ int daNpc_Fairy_c::Delete() {
     return 1;
 }
 
-/* 809B2F30-809B2F8C 001510 005C+00 2/2 0/0 0/0 .text            Execute__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::Execute() {
     int rv = execute();
     mFairyFeather.playAnm();
@@ -767,7 +738,6 @@ int daNpc_Fairy_c::Execute() {
     return rv;
 }
 
-/* 809B2F8C-809B3034 00156C 00A8+00 1/1 0/0 0/0 .text            Draw__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::Draw() {
     if (mStatus == 1) {
         return 1;
@@ -785,19 +755,16 @@ int daNpc_Fairy_c::Draw() {
     #endif
 }
 
-/* 809B3034-809B3074 001614 0040+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::drawOtherMdl() {
     mFairyFeather.connect(this);
     mFairyFeather.draw(this);
 }
 
-/* 809B3074-809B3094 001654 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_Fairy_cFP10fopAc_ac_c */
 int daNpc_Fairy_c::createHeapCallBack(fopAc_ac_c* actor) {
     daNpc_Fairy_c* i_this = (daNpc_Fairy_c*)actor;
     return i_this->CreateHeap();
 }
 
-/* 809B3094-809B30EC 001674 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_Fairy_cFP8J3DJointi */
 int daNpc_Fairy_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -810,12 +777,10 @@ int daNpc_Fairy_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809B30EC-809B30F4 0016CC 0008+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Fairy_cFv */
 BOOL daNpc_Fairy_c::isDelete() {
     return FALSE;
 }
 
-/* 809B30F4-809B32C4 0016D4 01D0+00 1/1 0/0 0/0 .text            reset__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::reset() {
     initialize();
 
@@ -844,12 +809,10 @@ void daNpc_Fairy_c::reset() {
     setAction(&daNpc_Fairy_c::wait, 0);
 }
 
-/* 809B32C4-809B32D0 0018A4 000C+00 1/1 0/0 0/0 .text            initStatus__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::initStatus() {
     mStatus = 1;
 }
 
-/* 809B32D0-809B335C 0018B0 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Fairy_cFi */
 void daNpc_Fairy_c::afterJntAnm(int i_joint) {
     if (i_joint == JNT_BACKBONE1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -860,7 +823,6 @@ void daNpc_Fairy_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 809B335C-809B349C 00193C 0140+00 1/0 0/0 0/0 .text            setParam__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::setParam() {
     srchActors();
     s16 talk_distance = mHIO->m.common.talk_distance;
@@ -898,12 +860,10 @@ void daNpc_Fairy_c::setParam() {
     mMorfFrames = mHIO->m.common.morf_frame;
 }
 
-/* 809B349C-809B34A4 001A7C 0008+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Fairy_cFv */
 BOOL daNpc_Fairy_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 809B34A4-809B3520 001A84 007C+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::setAfterTalkMotion() {
     int idx;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -920,12 +880,10 @@ void daNpc_Fairy_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 809B3520-809B3524 001B00 0004+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::srchActors() {
     /* empty function */
 }
 
-/* 809B3524-809B3630 001B04 010C+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Fairy_cFv */
 BOOL daNpc_Fairy_c::evtTalk() {
     if (chkAction(&daNpc_Fairy_c::talk)) {
         (this->*mAction)(NULL);
@@ -947,7 +905,6 @@ BOOL daNpc_Fairy_c::evtTalk() {
     return TRUE;
 }
 
-/* 809B3630-809B36F8 001C10 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Fairy_cFv */
 BOOL daNpc_Fairy_c::evtCutProc() {
     BOOL rv = FALSE;
     s32 staffId = dComIfGp_getEventManager().getMyStaffId("Fairy", this, -1);
@@ -965,7 +922,6 @@ BOOL daNpc_Fairy_c::evtCutProc() {
     return rv;
 }
 
-/* 809B36F8-809B379C 001CD8 00A4+00 1/0 0/0 0/0 .text            evtEndProc__13daNpc_Fairy_cFv */
 BOOL daNpc_Fairy_c::evtEndProc() {
     OS_REPORT("------------------evt end proc!!\n");
 
@@ -992,7 +948,6 @@ BOOL daNpc_Fairy_c::evtEndProc() {
     return TRUE;
 }
 
-/* 809B379C-809B384C 001D7C 00B0+00 1/0 0/0 0/0 .text            action__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -1004,7 +959,6 @@ void daNpc_Fairy_c::action() {
     }
 }
 
-/* 809B384C-809B38E8 001E2C 009C+00 1/1 0/0 0/0 .text            ptcl_water__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::ptcl_water() {
     u32 uVar1 = 0x40002;
     cXyz scale(1.1f, 1.1f, 1.1f);
@@ -1019,7 +973,6 @@ void daNpc_Fairy_c::ptcl_water() {
     mPaPo.setEffectCenter(&tevStr, &current.pos, 1, uVar1, NULL, NULL, &scale, fopAcM_GetRoomNo(this), 1.0f, speedF);
 }
 
-/* 809B38E8-809B39FC 001EC8 0114+00 1/1 0/0 0/0 .text            ptcl_sprit__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::ptcl_sprit() {
     cXyz pos;
     cXyz scale(1.0f, 1.0f, 1.0f);
@@ -1040,7 +993,6 @@ void daNpc_Fairy_c::ptcl_sprit() {
     }
 }
 
-/* 809B39FC-809B3AB0 001FDC 00B4+00 1/1 0/0 0/0 .text            _to_FairyField__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::_to_FairyField() {
     int iVar1 = 4;
     if (mTempBit < 0 || mTempBit >= iVar1) {
@@ -1059,7 +1011,6 @@ void daNpc_Fairy_c::_to_FairyField() {
     dStage_changeScene(sFairyField[mTempBit], 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 809B3AB0-809B3B20 002090 0070+00 1/1 0/0 0/0 .text            chk_tempbit__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::chk_tempbit() {
     static u32 const sTempBit[4] = {
         121,   // dSv_event_tmp_flag_c::T_0121 - Program use - Fairy use 1
@@ -1081,14 +1032,12 @@ int daNpc_Fairy_c::chk_tempbit() {
     return -1;
 }
 
-/* 809B3B20-809B3B98 002100 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 809B3B98-809B3C64 002178 00CC+00 1/0 0/0 0/0 .text            afterMoved__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::afterMoved() {
     ptcl_water();
 
@@ -1109,7 +1058,6 @@ void daNpc_Fairy_c::afterMoved() {
     }
 }
 
-/* 809B3C64-809B3EA0 002244 023C+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::setAttnPos() {
     cXyz pos(0.0f, -30.0f, 0.0f);
 
@@ -1134,7 +1082,6 @@ void daNpc_Fairy_c::setAttnPos() {
     attention_info.position.y += mHIO->m.common.attention_offset;
 }
 
-/* 809B3EA0-809B3FD8 002480 0138+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::setCollision() {
     cXyz pos;
     u32 co_s_prm = 0x79;
@@ -1172,12 +1119,10 @@ void daNpc_Fairy_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 809B3FD8-809B3FE0 0025B8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Fairy_cFv */
 int daNpc_Fairy_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809B3FE0-809B4090 0025C0 00B0+00 2/2 0/0 0/0 .text            setAction__13daNpc_Fairy_cFM13daNpc_Fairy_cFPCvPvi_ii */
 BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) {
     mMode = 0xFFFF;
 
@@ -1195,7 +1140,6 @@ BOOL daNpc_Fairy_c::setAction(actionFunc action, int param_2) {
     return TRUE;
 }
 
-/* 809B4090-809B4360 002670 02D0+00 1/0 0/0 0/0 .text            wait__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::wait(int param_1) {
     switch (mMode) {
         case -1:
@@ -1256,7 +1200,6 @@ int daNpc_Fairy_c::wait(int param_1) {
     return 1;
 }
 
-/* 809B4360-809B4450 002940 00F0+00 2/0 0/0 0/0 .text            talk__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::talk(int param_1) {
     switch (mMode) {
         case -1:
@@ -1322,7 +1265,6 @@ int daNpc_Fairy_c::test(int param_1) {
 }
 #endif
 
-/* 809B4450-809B4588 002A30 0138+00 1/1 0/0 0/0 .text            AppearDemoCall__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::AppearDemoCall() {
     if (mType == TYPE_50F) {
         // dSv_event_flag_c::F_0505 - sub-dungeon - Cave of Ordeals - B50 first arrival (clear)
@@ -1379,7 +1321,6 @@ void daNpc_Fairy_c::AppearDemoCall() {
     field_0xff4 = mEvtNo;
 }
 
-/* 809B4588-809B45BC 002B68 0034+00 1/1 0/0 0/0 .text            ReturnDemoCall__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::ReturnDemoCall() {
     if (mType == TYPE_10F) {
         mEvtNo = EVT_SELECT_RETURN1;
@@ -1391,7 +1332,6 @@ void daNpc_Fairy_c::ReturnDemoCall() {
     mUnkFlag = 1;
 }
 
-/* 809B45BC-809B464C 002B9C 0090+00 3/3 0/0 0/0 .text            PresentDemoCall__13daNpc_Fairy_cFv */
 void daNpc_Fairy_c::PresentDemoCall() {
     int item_no = 0;
     if (mFlow.getEventId(&item_no) != 1) {
@@ -1404,7 +1344,6 @@ void daNpc_Fairy_c::PresentDemoCall() {
     }
 }
 
-/* 809B464C-809B46E0 002C2C 0094+00 1/0 0/0 0/0 .text            cutAppear_10F_01__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_10F_01(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1469,7 +1408,6 @@ int daNpc_Fairy_c::_cutAppear_10F_01_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B48C4-809B4A44 002EA4 0180+00 1/1 0/0 0/0 .text            _cutAppear_10F_01_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_10F_01_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1525,7 +1463,6 @@ int daNpc_Fairy_c::_cutAppear_10F_01_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B4A44-809B4AD8 003024 0094+00 1/0 0/0 0/0 .text            cutAppear_10F_02__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_10F_02(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1542,7 +1479,6 @@ int daNpc_Fairy_c::cutAppear_10F_02(int i_staffId) {
     return _cutAppear_10F_02_Main(*cutId);
 }
 
-/* 809B4AD8-809B4BF8 0030B8 0120+00 1/1 0/0 0/0 .text            _cutAppear_10F_02_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_10F_02_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1573,7 +1509,6 @@ int daNpc_Fairy_c::_cutAppear_10F_02_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B4BF8-809B4CC0 0031D8 00C8+00 1/1 0/0 0/0 .text            _cutAppear_10F_02_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_10F_02_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1605,7 +1540,6 @@ int daNpc_Fairy_c::_cutAppear_10F_02_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B4CC0-809B4D54 0032A0 0094+00 1/0 0/0 0/0 .text            cutAppear_20F_01__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_20F_01(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1622,7 +1556,6 @@ int daNpc_Fairy_c::cutAppear_20F_01(int i_staffId) {
     return _cutAppear_20F_01_Main(*cutId);
 }
 
-/* 809B4D54-809B4EB4 003334 0160+00 1/1 0/0 0/0 .text            _cutAppear_20F_01_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_20F_01_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1657,7 +1590,6 @@ int daNpc_Fairy_c::_cutAppear_20F_01_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B4EB4-809B5000 003494 014C+00 1/1 0/0 0/0 .text            _cutAppear_20F_01_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_20F_01_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1696,7 +1628,6 @@ int daNpc_Fairy_c::_cutAppear_20F_01_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5000-809B5094 0035E0 0094+00 1/0 0/0 0/0 .text            cutAppear_20F_02__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_20F_02(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1713,7 +1644,6 @@ int daNpc_Fairy_c::cutAppear_20F_02(int i_staffId) {
     return _cutAppear_20F_02_Main(*cutId);
 }
 
-/* 809B5094-809B51F4 003674 0160+00 1/1 0/0 0/0 .text            _cutAppear_20F_02_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_20F_02_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1748,7 +1678,6 @@ int daNpc_Fairy_c::_cutAppear_20F_02_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B51F4-809B5340 0037D4 014C+00 1/1 0/0 0/0 .text            _cutAppear_20F_02_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_20F_02_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1787,7 +1716,6 @@ int daNpc_Fairy_c::_cutAppear_20F_02_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5340-809B53D4 003920 0094+00 1/0 0/0 0/0 .text            cutAppear_30F_01__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_30F_01(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1804,7 +1732,6 @@ int daNpc_Fairy_c::cutAppear_30F_01(int i_staffId) {
     return _cutAppear_30F_01_Main(*cutId);
 }
 
-/* 809B53D4-809B54F4 0039B4 0120+00 1/1 0/0 0/0 .text            _cutAppear_30F_01_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_30F_01_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1835,7 +1762,6 @@ int daNpc_Fairy_c::_cutAppear_30F_01_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B54F4-809B55BC 003AD4 00C8+00 1/1 0/0 0/0 .text            _cutAppear_30F_01_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_30F_01_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1867,7 +1793,6 @@ int daNpc_Fairy_c::_cutAppear_30F_01_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B55BC-809B5650 003B9C 0094+00 1/0 0/0 0/0 .text            cutAppear_30F_02__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_30F_02(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1884,7 +1809,6 @@ int daNpc_Fairy_c::cutAppear_30F_02(int i_staffId) {
     return _cutAppear_30F_02_Main(*cutId);
 }
 
-/* 809B5650-809B5770 003C30 0120+00 1/1 0/0 0/0 .text            _cutAppear_30F_02_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_30F_02_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1915,7 +1839,6 @@ int daNpc_Fairy_c::_cutAppear_30F_02_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5770-809B5838 003D50 00C8+00 1/1 0/0 0/0 .text            _cutAppear_30F_02_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_30F_02_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -1947,7 +1870,6 @@ int daNpc_Fairy_c::_cutAppear_30F_02_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5838-809B58CC 003E18 0094+00 1/0 0/0 0/0 .text            cutAppear_40F_01__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_40F_01(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1964,7 +1886,6 @@ int daNpc_Fairy_c::cutAppear_40F_01(int i_staffId) {
     return _cutAppear_40F_01_Main(*cutId);
 }
 
-/* 809B58CC-809B59EC 003EAC 0120+00 1/1 0/0 0/0 .text            _cutAppear_40F_01_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_40F_01_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -1995,7 +1916,6 @@ int daNpc_Fairy_c::_cutAppear_40F_01_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B59EC-809B5AB4 003FCC 00C8+00 1/1 0/0 0/0 .text            _cutAppear_40F_01_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_40F_01_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -2027,7 +1947,6 @@ int daNpc_Fairy_c::_cutAppear_40F_01_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5AB4-809B5B48 004094 0094+00 1/0 0/0 0/0 .text            cutAppear_40F_02__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_40F_02(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2044,7 +1963,6 @@ int daNpc_Fairy_c::cutAppear_40F_02(int i_staffId) {
     return _cutAppear_40F_02_Main(*cutId);
 }
 
-/* 809B5B48-809B5C68 004128 0120+00 1/1 0/0 0/0 .text            _cutAppear_40F_02_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_40F_02_Init(int const& i_cutId) {
     int rv = 0;
     
@@ -2075,7 +1993,6 @@ int daNpc_Fairy_c::_cutAppear_40F_02_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5C68-809B5D30 004248 00C8+00 1/1 0/0 0/0 .text            _cutAppear_40F_02_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutAppear_40F_02_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -2107,7 +2024,6 @@ int daNpc_Fairy_c::_cutAppear_40F_02_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B5D30-809B5E00 004310 00D0+00 1/0 0/0 0/0 .text            cutAppear_50F_01__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_50F_01(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2131,7 +2047,6 @@ int daNpc_Fairy_c::cutAppear_50F_01(int i_staffId) {
     return _cutAppear_50F_01_Main(*cutId, msgNo);
 }
 
-/* 809B5E00-809B6084 0043E0 0284+00 2/1 0/0 0/0 .text            _cutAppear_50F_01_Init__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_01_Init(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     
@@ -2195,7 +2110,6 @@ int daNpc_Fairy_c::_cutAppear_50F_01_Init(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B6084-809B631C 004664 0298+00 2/1 0/0 0/0 .text            _cutAppear_50F_01_Main__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_01_Main(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     int msgNos[2] = {-1, -1};
@@ -2286,7 +2200,6 @@ int daNpc_Fairy_c::_cutAppear_50F_01_Main(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B631C-809B63EC 0048FC 00D0+00 1/0 0/0 0/0 .text            cutAppear_50F_02__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_50F_02(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2310,7 +2223,6 @@ int daNpc_Fairy_c::cutAppear_50F_02(int i_staffId) {
     return _cutAppear_50F_02_Main(*cutId, msgNo);
 }
 
-/* 809B63EC-809B662C 0049CC 0240+00 2/1 0/0 0/0 .text           _cutAppear_50F_02_Init__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_02_Init(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     
@@ -2364,7 +2276,6 @@ int daNpc_Fairy_c::_cutAppear_50F_02_Init(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B662C-809B6830 004C0C 0204+00 2/1 0/0 0/0 .text            _cutAppear_50F_02_Main__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_02_Main(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     int msgNos[2] = {-1, -1};
@@ -2434,7 +2345,6 @@ int daNpc_Fairy_c::_cutAppear_50F_02_Main(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B6830-809B6900 004E10 00D0+00 1/0 0/0 0/0 .text            cutAppear_50F_03__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_50F_03(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2458,7 +2368,6 @@ int daNpc_Fairy_c::cutAppear_50F_03(int i_staffId) {
     return _cutAppear_50F_03_Main(*cutId, msgNo);
 }
 
-/* 809B6900-809B6ADC 004EE0 01DC+00 2/1 0/0 0/0 .text            _cutAppear_50F_03_Init__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_03_Init(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     
@@ -2504,7 +2413,6 @@ int daNpc_Fairy_c::_cutAppear_50F_03_Init(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B6ADC-809B6C30 0050BC 0154+00 2/1 0/0 0/0 .text            _cutAppear_50F_03_Main__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_03_Main(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     int msgNos[2] = {-1, -1};
@@ -2559,7 +2467,6 @@ int daNpc_Fairy_c::_cutAppear_50F_03_Main(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B6C30-809B6D00 005210 00D0+00 1/0 0/0 0/0 .text            cutAppear_50F_04__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_50F_04(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2583,7 +2490,6 @@ int daNpc_Fairy_c::cutAppear_50F_04(int i_staffId) {
     return _cutAppear_50F_04_Main(*cutId, msgNo);
 }
 
-/* 809B6D00-809B6F40 0052E0 0240+00 2/1 0/0 0/0 .text            _cutAppear_50F_04_Init__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_04_Init(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     
@@ -2637,7 +2543,6 @@ int daNpc_Fairy_c::_cutAppear_50F_04_Init(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B6F40-809B7168 005520 0228+00 2/1 0/0 0/0 .text            _cutAppear_50F_04_Main__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_04_Main(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     int msgNos[2] = {-1, -1};
@@ -2713,7 +2618,6 @@ int daNpc_Fairy_c::_cutAppear_50F_04_Main(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B7168-809B7238 005748 00D0+00 1/0 0/0 0/0 .text            cutAppear_50F_05__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutAppear_50F_05(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2737,7 +2641,6 @@ int daNpc_Fairy_c::cutAppear_50F_05(int i_staffId) {
     return _cutAppear_50F_05_Main(*cutId, msgNo);
 }
 
-/* 809B7238-809B74AC 005818 0274+00 2/1 0/0 0/0 .text            _cutAppear_50F_05_Init__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_05_Init(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     
@@ -2800,7 +2703,6 @@ int daNpc_Fairy_c::_cutAppear_50F_05_Init(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B74AC-809B7718 005A8C 026C+00 2/1 0/0 0/0 .text            _cutAppear_50F_05_Main__13daNpc_Fairy_cFRCiRCi */
 int daNpc_Fairy_c::_cutAppear_50F_05_Main(int const& i_cutId, int const& i_msgNo) {
     int rv = 0;
     int msgNos[2] = {-1, -1};
@@ -2883,7 +2785,6 @@ int daNpc_Fairy_c::_cutAppear_50F_05_Main(int const& i_cutId, int const& i_msgNo
     return rv;
 }
 
-/* 809B7718-809B77AC 005CF8 0094+00 1/0 0/0 0/0 .text cutSelect_Return1__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutSelect_Return1(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2900,7 +2801,6 @@ int daNpc_Fairy_c::cutSelect_Return1(int i_staffId) {
     return _cutSelect_Return1_Main(*cutId);
 }
 
-/* 809B77AC-809B78F0 005D8C 0144+00 1/1 0/0 0/0 .text            _cutSelect_Return1_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return1_Init(int const& i_cutId) {
     int rv = 0;
 
@@ -2933,7 +2833,6 @@ int daNpc_Fairy_c::_cutSelect_Return1_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B78F0-809B79A4 005ED0 00B4+00 1/1 0/0 0/0 .text            _cutSelect_Return1_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return1_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -2961,7 +2860,6 @@ int daNpc_Fairy_c::_cutSelect_Return1_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B79A4-809B7A38 005F84 0094+00 1/0 0/0 0/0 .text            cutSelect_Return2__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutSelect_Return2(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2978,7 +2876,6 @@ int daNpc_Fairy_c::cutSelect_Return2(int i_staffId) {
     return _cutSelect_Return2_Main(*cutId);
 }
 
-/* 809B7A38-809B7A9C 006018 0064+00 1/1 0/0 0/0 .text            _cutSelect_Return2_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return2_Init(int const& i_cutId) {
     int rv = 0;
 
@@ -2995,7 +2892,6 @@ int daNpc_Fairy_c::_cutSelect_Return2_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7A9C-809B7BA4 00607C 0108+00 1/1 0/0 0/0 .text            _cutSelect_Return2_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return2_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -3022,7 +2918,6 @@ int daNpc_Fairy_c::_cutSelect_Return2_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7BA4-809B7C38 006184 0094+00 1/0 0/0 0/0 .text cutSelect_Return3__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutSelect_Return3(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -3039,7 +2934,6 @@ int daNpc_Fairy_c::cutSelect_Return3(int i_staffId) {
     return _cutSelect_Return3_Main(*cutId);
 }
 
-/* 809B7C38-809B7D7C 006218 0144+00 1/1 0/0 0/0 .text            _cutSelect_Return3_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return3_Init(int const& i_cutId) {
     int rv = 0;
 
@@ -3072,7 +2966,6 @@ int daNpc_Fairy_c::_cutSelect_Return3_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7D7C-809B7E30 00635C 00B4+00 1/1 0/0 0/0 .text            _cutSelect_Return3_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutSelect_Return3_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -3100,7 +2993,6 @@ int daNpc_Fairy_c::_cutSelect_Return3_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7E30-809B7EC4 006410 0094+00 1/0 0/0 0/0 .text            cutReturnCancel__13daNpc_Fairy_cFi */
 int daNpc_Fairy_c::cutReturnCancel(int i_staffId) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -3117,7 +3009,6 @@ int daNpc_Fairy_c::cutReturnCancel(int i_staffId) {
     return _cutReturnCancel_Main(*cutId);
 }
 
-/* 809B7EC4-809B7ECC 0064A4 0008+00 1/1 0/0 0/0 .text            _cutReturnCancel_Init__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutReturnCancel_Init(int const& i_cutId) {
     int rv = 0;
 
@@ -3132,7 +3023,6 @@ int daNpc_Fairy_c::_cutReturnCancel_Init(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7ECC-809B7ED4 0064AC 0008+00 1/1 0/0 0/0 .text            _cutReturnCancel_Main__13daNpc_Fairy_cFRCi */
 int daNpc_Fairy_c::_cutReturnCancel_Main(int const& i_cutId) {
     int rv = 0;
 
@@ -3147,32 +3037,26 @@ int daNpc_Fairy_c::_cutReturnCancel_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 809B7ED4-809B7EF4 0064B4 0020+00 1/0 0/0 0/0 .text            daNpc_Fairy_Create__FPv */
 static int daNpc_Fairy_Create(void* i_this) {
     return static_cast<daNpc_Fairy_c*>(i_this)->Create();
 }
 
-/* 809B7EF4-809B7F14 0064D4 0020+00 1/0 0/0 0/0 .text            daNpc_Fairy_Delete__FPv */
 static int daNpc_Fairy_Delete(void* i_this) {
     return static_cast<daNpc_Fairy_c*>(i_this)->Delete();
 }
 
-/* 809B7F14-809B7F34 0064F4 0020+00 1/0 0/0 0/0 .text            daNpc_Fairy_Execute__FPv */
 static int daNpc_Fairy_Execute(void* i_this) {
     return static_cast<daNpc_Fairy_c*>(i_this)->Execute();
 }
 
-/* 809B7F34-809B7F54 006514 0020+00 1/0 0/0 0/0 .text            daNpc_Fairy_Draw__FPv */
 static int daNpc_Fairy_Draw(void* i_this) {
     return static_cast<daNpc_Fairy_c*>(i_this)->Draw();
 }
 
-/* 809B7F54-809B7F5C 006534 0008+00 1/0 0/0 0/0 .text            daNpc_Fairy_IsDelete__FPv */
 static int daNpc_Fairy_IsDelete(void* i_this) {
     return true;
 }
 
-/* 809BA254-809BA274 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Fairy_MethodTable */
 static actor_method_class daNpc_Fairy_MethodTable = {
     (process_method_func)daNpc_Fairy_Create,
     (process_method_func)daNpc_Fairy_Delete,
@@ -3181,7 +3065,6 @@ static actor_method_class daNpc_Fairy_MethodTable = {
     (process_method_func)daNpc_Fairy_Draw,
 };
 
-/* 809BA274-809BA2A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_FAIRY */
 extern actor_process_profile_definition g_profile_NPC_FAIRY = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp
index 93f24604f0..062db6fe34 100644
--- a/src/d/actor/d_a_npc_fairy_seirei.cpp
+++ b/src/d/actor/d_a_npc_fairy_seirei.cpp
@@ -8,26 +8,21 @@
 #include "d/actor/d_a_npc_fairy_seirei.h"
 #include "d/actor/d_a_npc4.h"
 
-/* ############################################################################################## */
 
-/* 80541E80-80541E88 -00001 0008+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[1] = {
     {"", 0},
 };
 
-/* 80541E88-80541E90 -00001 0008+00 0/1 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     NULL,
 };
 
-/* 80541E90-80541E94 000030 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1,
     -1,
 };
 
-/* 80541E94-80541EA4 -00001 0010+00 0/0 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
@@ -35,17 +30,14 @@ static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
 };
 
-/* 80541EA4-80541EC0 000044 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {
     -1, 0, 0, -1, 0, 0, 0,
 };
 
-/* 80541EC0-80541EDC 000060 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {-1, 0, 0, -1, 0, 0, 0},
 };
 
-/* 80541EDC-80541EEC 00007C 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -53,7 +45,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 80541EEC-80541EFC 00008C 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -61,25 +52,20 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
 };
 
-/* 80541EFC-80541F00 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__19daNpc_FairySeirei_c
- */
 char* daNpc_FairySeirei_c::mCutNameList[1] = {
     "",
 };
 
-/* 80541F00-80541F0C 0000A0 000C+00 2/2 0/0 0/0 .data            mCutList__19daNpc_FairySeirei_c */
 daNpc_FairySeirei_c::cutFunc daNpc_FairySeirei_c::mCutList[1] = {
     NULL,
 };
 
-/* 8053FF6C-8054006C 0000EC 0100+00 1/0 0/0 0/0 .text            __dt__19daNpc_FairySeirei_cFv */
 daNpc_FairySeirei_c::~daNpc_FairySeirei_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
     }
 }
 
-/* ############################################################################################## */
 
 const f32 daNpc_FairySeirei_Param_c::m[37] = {
     600.0f, 0.0f, 1.0f, 4000.0f, 255.0f, 200.0f, 0.0f, 60.0f, 0.0f, 0.0f, 0.0f,   0.0f, 0.0f,
@@ -87,7 +73,6 @@ const f32 daNpc_FairySeirei_Param_c::m[37] = {
     0.0f,   0.0f, 0.0f, 0.0f,    0.0f,   0.0f,   0.0f, 0.0f,  0.0f, 0.0f, 600.0f,
 };
 
-/* 8054006C-80540298 0001EC 022C+00 1/1 0/0 0/0 .text            create__19daNpc_FairySeirei_cFv */
 int daNpc_FairySeirei_c::create() {
     daNpcT_ct(this, daNpc_FairySeirei_c, &l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList,
@@ -119,24 +104,19 @@ int daNpc_FairySeirei_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80540298-805402CC 000418 0034+00 1/1 0/0 0/0 .text            Delete__19daNpc_FairySeirei_cFv */
 int daNpc_FairySeirei_c::Delete() {
     this->~daNpc_FairySeirei_c();
     return 1;
 }
 
-/* 805402CC-805402EC 00044C 0020+00 2/2 0/0 0/0 .text            Execute__19daNpc_FairySeirei_cFv */
 int daNpc_FairySeirei_c::Execute() {
     return execute();
 }
 
-/* 805402EC-805402F4 00046C 0008+00 1/1 0/0 0/0 .text            Draw__19daNpc_FairySeirei_cFv */
 int daNpc_FairySeirei_c::Draw() {
     return 1;
 }
 
-/* 805402F4-80540334 000474 0040+00 1/1 0/0 0/0 .text            isDelete__19daNpc_FairySeirei_cFv
- */
 int daNpc_FairySeirei_c::isDelete() {
     int ret = 0;
     if (daNpcT_chkEvtBit(0x1F9) == false) {
@@ -145,9 +125,7 @@ int daNpc_FairySeirei_c::isDelete() {
     return ret;
 }
 
-/* ############################################################################################## */
 
-/* 80540334-8054048C 0004B4 0158+00 1/1 0/0 0/0 .text            reset__19daNpc_FairySeirei_cFv */
 void daNpc_FairySeirei_c::reset() {
     int iVar1 = (u8*)&field_0xFAC - (u8*)&mInitFunc;
     if (mpMatAnm[0] != NULL) {
@@ -159,8 +137,6 @@ void daNpc_FairySeirei_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 8054048C-8054059C 00060C 0110+00 1/0 0/0 0/0 .text            setParam__19daNpc_FairySeirei_cFv
- */
 void daNpc_FairySeirei_c::setParam() {
     selectAction();
     srchActors();
@@ -184,13 +160,10 @@ void daNpc_FairySeirei_c::setParam() {
     gravity = daNpc_FairySeirei_Param_c::m[1];
 }
 
-/* 805405B0-805405B4 000730 0004+00 1/1 0/0 0/0 .text            srchActors__19daNpc_FairySeirei_cFv
- */
 void daNpc_FairySeirei_c::srchActors() {
     /* empty function */
 }
 
-/* 805405B4-805406BC 000734 0108+00 1/0 0/0 0/0 .text            evtTalk__19daNpc_FairySeirei_cFv */
 BOOL daNpc_FairySeirei_c::evtTalk() {
     if (chkAction(&daNpc_FairySeirei_c::talk)) {
         (this->*(mExecuteFunc))(0);
@@ -208,10 +181,7 @@ BOOL daNpc_FairySeirei_c::evtTalk() {
     return true;
 }
 
-/* ############################################################################################## */
 
-/* 805406BC-80540784 00083C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__19daNpc_FairySeirei_cFv
- */
 BOOL daNpc_FairySeirei_c::evtCutProc() {
     dEvent_manager_c* temp_r31;
     s32 temp_r3;
@@ -228,7 +198,6 @@ BOOL daNpc_FairySeirei_c::evtCutProc() {
     return false;
 }
 
-/* 80540784-8054080C 000904 0088+00 1/0 0/0 0/0 .text            action__19daNpc_FairySeirei_cFv */
 void daNpc_FairySeirei_c::action() {
     if (mInitFunc != NULL) {
         if (mExecuteFunc == mInitFunc) {
@@ -239,15 +208,12 @@ void daNpc_FairySeirei_c::action() {
     }
 }
 
-/* 8054080C-80540884 00098C 0078+00 1/0 0/0 0/0 .text            beforeMove__19daNpc_FairySeirei_cFv
- */
 void daNpc_FairySeirei_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80540884-80540988 000A04 0104+00 1/0 0/0 0/0 .text setCollision__19daNpc_FairySeirei_cFv */
 void daNpc_FairySeirei_c::setCollision() {
     u32 var_r5;
     u32 var_r4;
@@ -276,10 +242,7 @@ void daNpc_FairySeirei_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* ############################################################################################## */
 
-/* 80540988-80540A30 000B08 00A8+00 1/0 0/0 0/0 .text            setAttnPos__19daNpc_FairySeirei_cFv
- */
 void daNpc_FairySeirei_c::setAttnPos() {
     attention_info.position = current.pos;
     attention_info.position.y += daNpc_FairySeirei_Param_c::m[0] - 350.0f;
@@ -288,20 +251,16 @@ void daNpc_FairySeirei_c::setAttnPos() {
     ptcl_se();
 }
 
-/* 80540A30-80540A38 000BB0 0008+00 1/0 0/0 0/0 .text drawDbgInfo__19daNpc_FairySeirei_cFv */
 BOOL daNpc_FairySeirei_c::drawDbgInfo() {
     return false;
 }
 
-/* 80540A38-80540A80 000BB8 0048+00 1/1 0/0 0/0 .text selectAction__19daNpc_FairySeirei_cFv */
 bool daNpc_FairySeirei_c::selectAction() {
     mInitFunc = NULL;
     mInitFunc = &daNpc_FairySeirei_c::wait;
     return true;
 }
 
-/* 80540A80-80540B28 000C00 00A8+00 2/2 0/0 0/0 .text
- * setAction__19daNpc_FairySeirei_cFM19daNpc_FairySeirei_cFPCvPvi_i */
 bool daNpc_FairySeirei_c::setAction(actionFunc i_action) {
     mMode = 3;
     if (mExecuteFunc != NULL) {
@@ -315,10 +274,7 @@ bool daNpc_FairySeirei_c::setAction(actionFunc i_action) {
     return true;
 }
 
-/* ############################################################################################## */
 
-/* 80540B28-80540C54 000CA8 012C+00 1/1 0/0 0/0 .text            setPrtcls__19daNpc_FairySeirei_cFv
- */
 void daNpc_FairySeirei_c::setPrtcls() {
     static u16 const id[3] = {
         0x8AA3,
@@ -339,7 +295,6 @@ void daNpc_FairySeirei_c::setPrtcls() {
     }
 }
 
-/* 80540C54-80540CC0 000DD4 006C+00 1/0 0/0 0/0 .text            wait__19daNpc_FairySeirei_cFi */
 int daNpc_FairySeirei_c::wait(int param_0) {
     switch (mMode) {
     case 0:
@@ -356,7 +311,6 @@ int daNpc_FairySeirei_c::wait(int param_0) {
     return 1;
 }
 
-/* 80540CC0-80540E10 000E40 0150+00 2/0 0/0 0/0 .text            talk__19daNpc_FairySeirei_cFi */
 int daNpc_FairySeirei_c::talk(int param_0) {
     switch (mMode) {
     case 0:
@@ -399,9 +353,7 @@ int daNpc_FairySeirei_c::talk(int param_0) {
     return 0;
 }
 
-/* ############################################################################################## */
 
-/* 80540E10-80540E78 000F90 0068+00 1/1 0/0 0/0 .text _to_FairyCave__19daNpc_FairySeirei_cFv */
 void daNpc_FairySeirei_c::_to_FairyCave() {
     static const int sTempBit[4] = {
         0x79,
@@ -414,37 +366,29 @@ void daNpc_FairySeirei_c::_to_FairyCave() {
     dStage_changeScene(getSeneNo(), 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 80540E78-80540E98 000FF8 0020+00 1/0 0/0 0/0 .text            daNpc_FairySeirei_Create__FPv */
 static int daNpc_FairySeirei_Create(void* i_this) {
     return static_cast<daNpc_FairySeirei_c*>(i_this)->create();
 }
 
-/* 80540E98-80540EB8 001018 0020+00 1/0 0/0 0/0 .text            daNpc_FairySeirei_Delete__FPv */
 static int daNpc_FairySeirei_Delete(void* i_this) {
     return static_cast<daNpc_FairySeirei_c*>(i_this)->Delete();
 }
 
-/* 80540EB8-80540ED8 001038 0020+00 1/0 0/0 0/0 .text            daNpc_FairySeirei_Execute__FPv */
 static int daNpc_FairySeirei_Execute(void* i_this) {
     return static_cast<daNpc_FairySeirei_c*>(i_this)->Execute();
 }
 
-/* 80540ED8-80540EF8 001058 0020+00 1/0 0/0 0/0 .text            daNpc_FairySeirei_Draw__FPv */
 static int daNpc_FairySeirei_Draw(void* i_this) {
     return static_cast<daNpc_FairySeirei_c*>(i_this)->Draw();
 }
 
-/* 80540EF8-80540F00 001078 0008+00 1/0 0/0 0/0 .text            daNpc_FairySeirei_IsDelete__FPv */
 static int daNpc_FairySeirei_IsDelete(void* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 805420F4-805420F8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_FairySeirei_Param_c l_HIO;
 
-/* 80541F30-80541F50 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_FairySeirei_MethodTable */
 static actor_method_class daNpc_FairySeirei_MethodTable = {
     daNpc_FairySeirei_Create,   daNpc_FairySeirei_Delete, daNpc_FairySeirei_Execute,
     daNpc_FairySeirei_IsDelete, daNpc_FairySeirei_Draw,
diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp
index 8afb2e3ed2..3c3805dc17 100644
--- a/src/d/actor/d_a_npc_fguard.cpp
+++ b/src/d/actor/d_a_npc_fguard.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_npc_fguard
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_fguard.h"
@@ -25,25 +20,21 @@ int daNpcFgd_c::createHeap() {
     return rv;
 }
 
-/* 809BA4B8-809BA53C 000078 0084+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c */
 static int createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcFgd_c* i_this = (daNpcFgd_c*)a_this;
     return i_this->createHeap();
 }
 
-/* 809BA53C-809BA564 0000FC 0028+00 0/0 0/0 1/1 .text            initPosAngle__10daNpcFgd_cFR3Vecs */
 void daNpcFgd_c::initPosAngle(Vec& i_pos, s16 param_2) {
     current.pos.set(i_pos);
     field_0xad4 = current.pos.y;
     shape_angle.y = param_2;
 }
 
-/* 809BA564-809BA584 000124 0020+00 1/0 0/0 0/0 .text            daNpcFgd_Create__FPv */
 static int daNpcFgd_Create(void* a_this) {
     return static_cast<daNpcFgd_c*>(a_this)->create();
 }
 
-/* 809BA584-809BA730 000144 01AC+00 1/1 0/0 0/0 .text            create__10daNpcFgd_cFv */
 cPhs__Step daNpcFgd_c::create() {
     fopAcM_ct(this, daNpcFgd_c);
 
@@ -82,7 +73,6 @@ void daNpcFgd_c::setBaseMtx() {
     setAttention(m_type);
 }
 
-/* 809BA730-809BAA4C 0002F0 031C+00 1/1 0/0 0/0 .text            create_init__10daNpcFgd_cFv */
 void daNpcFgd_c::create_init() {
     gravity = -3.0f;
     maxFallSpeed = -21.0f;
@@ -119,13 +109,11 @@ void daNpcFgd_c::create_init() {
     setBaseMtx();
 }
 
-/* 809BAA4C-809BAA80 00060C 0034+00 1/0 0/0 0/0 .text            daNpcFgd_Delete__FPv */
 static int daNpcFgd_Delete(void* a_this) {
     static_cast<daNpcFgd_c*>(a_this)->~daNpcFgd_c();
     return 1;
 }
 
-/* 809BAA80-809BAB04 000640 0084+00 1/0 0/0 0/0 .text            __dt__10daNpcFgd_cFv */
 daNpcFgd_c::~daNpcFgd_c() {
     removeResrc(m_type, mObjNum);
 
@@ -188,7 +176,6 @@ int daNpcFgd_c::execute() {
     return 1;
 }
 
-/* 809BAB04-809BAD3C 0006C4 0238+00 1/0 0/0 0/0 .text            daNpcFgd_Execute__FPv */
 static int daNpcFgd_Execute(void* a_this) {
     return static_cast<daNpcFgd_c*>(a_this)->execute();
 }
@@ -205,17 +192,14 @@ int daNpcFgd_c::draw() {
     return 1;
 }
 
-/* 809BAD84-809BAE20 000944 009C+00 1/0 0/0 0/0 .text            daNpcFgd_Draw__FPv */
 static int daNpcFgd_Draw(void* a_this) {
     return static_cast<daNpcFgd_c*>(a_this)->draw();
 }
 
-/* 809BAE20-809BAE28 0009E0 0008+00 1/0 0/0 0/0 .text            daNpcFgd_IsDelete__FPv */
 static int daNpcFgd_IsDelete(void* pa_this) {
     return 1;
 }
 
-/* 809BB440-809BB460 -00001 0020+00 1/0 0/0 0/0 .data            daNpcFgd_METHODS */
 static actor_method_class daNpcFgd_METHODS = {
     (process_method_func)daNpcFgd_Create,
     (process_method_func)daNpcFgd_Delete,
@@ -224,7 +208,6 @@ static actor_method_class daNpcFgd_METHODS = {
     (process_method_func)daNpcFgd_Draw,
 };
 
-/* 809BB460-809BB490 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_FGUARD */
 extern actor_process_profile_definition g_profile_NPC_FGUARD = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp
index 88d0851c1e..82101de714 100644
--- a/src/d/actor/d_a_npc_fish.cpp
+++ b/src/d/actor/d_a_npc_fish.cpp
@@ -5,29 +5,23 @@
 #include "d/actor/d_a_npc_fish.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80542178-80542180 000078 0008+00 1/0 0/0 0/0 .text daNpc_Fish_Draw__FP14npc_fish_class */
 static int daNpc_Fish_Draw(npc_fish_class* i_this) {
     return 1;
 }
 
-/* 80542180-80542188 000080 0008+00 1/0 0/0 0/0 .text daNpc_Fish_Execute__FP14npc_fish_class */
 static int daNpc_Fish_Execute(npc_fish_class* i_this) {
     return 1;
 }
 
-/* 80542188-80542190 000088 0008+00 1/0 0/0 0/0 .text daNpc_Fish_IsDelete__FP14npc_fish_class */
 static int daNpc_Fish_IsDelete(npc_fish_class* i_this) {
     return 1;
 }
 
-/* 80542190-80542198 000090 0008+00 1/0 0/0 0/0 .text daNpc_Fish_Delete__FP14npc_fish_class */
 static int daNpc_Fish_Delete(npc_fish_class* i_this) {
     return 1;
 }
 
-/* 80542198-80542254 000098 00BC+00 1/1 0/0 0/0 .text fish_set__FP10fopAc_ac_cP11fish_data_s */
 static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) {
     dScnKy_env_light_c* envLight = dKy_getEnvlight();
     cXyz pos;
@@ -45,7 +39,6 @@ static void fish_set(fopAc_ac_c* i_this, fish_data_s* data) {
     }
 }
 
-/* 80542504-805428D8 000020 03D4+00 0/1 0/0 0/0 .data            fish_d127_S */
 static fish_data_s fish_d127_S[49] = {
     {20, {0.f, 0.f, 0.f}, 0},         {22, {0.f, 0.f, 0.f}, 0},
     {21, {0.f, 0.f, 0.f}, 0},         {24, {0.f, 0.f, 0.f}, 0},
@@ -74,7 +67,6 @@ static fish_data_s fish_d127_S[49] = {
     {-1, {0.f, 0.f, 0.f}, 0},
 };
 
-/* 805428D8-80542D38 0003F4 0460+00 0/1 0/0 0/0 .data            fish_d127 */
 static fish_data_s fish_d127[56] = {
     {0, {-4605.0f, -80.f, 3526.f}, 45},     {0, {-5300.0f, -80.0f, 2875.0f}, 46},
     {0, {-7163.0f, -80.0f, 4140.0f}, 47},   {0, {-8161.0f, -80.0f, 4235.0f}, 44},
@@ -106,14 +98,12 @@ static fish_data_s fish_d127[56] = {
     {0, {-2689.0f, -901.0f, -126.0f}, 53},  {-1, {0.0f, 0.0f, 0.0f}, 0}};
 
 
-/* 80542D38-80542DC8 000854 0090+00 0/1 0/0 0/0 .data            lf_pos */
 static fish_pos lf_pos[12] = {
     {10, -2602.f, 5000.f}, {10, -863.f, 5095.f},   {10, 566.f, 5015.f},   {10, 3594.f, 4732.f},
     {10, 6020.f, 426.f},   {10, 2825.f, 77.f},     {10, 3396.f, 5024.f},  {10, 1962.f, -5789.f},
     {16, -1500.f, 665.f},  {16, -5952.f, -2760.f}, {16, -7265.f, -700.f}, {16, -8929.f, -630.f},
 };
 
-/* 80542254-805424B8 000154 0264+00 1/0 0/0 0/0 .text daNpc_Fish_Create__FP10fopAc_ac_c */
 static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
     cXyz pos;
     fopAcM_ct(i_this, npc_fish_class);
@@ -155,15 +145,12 @@ static int daNpc_Fish_Create(fopAc_ac_c* i_this) {
     return 5;
 }
 
-/* ############################################################################################## */
-/* 80542DC8-80542DE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Fish_Method */
 static actor_method_class l_daNpc_Fish_Method = {
     (process_method_func)daNpc_Fish_Create,  (process_method_func)daNpc_Fish_Delete,
     (process_method_func)daNpc_Fish_Execute, (process_method_func)daNpc_Fish_IsDelete,
     (process_method_func)daNpc_Fish_Draw,
 };
 
-/* 80542DE8-80542E18 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_FISH */
 extern actor_process_profile_definition g_profile_NPC_FISH = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp
index 93846af3c8..eb5f96293a 100644
--- a/src/d/actor/d_a_npc_gnd.cpp
+++ b/src/d/actor/d_a_npc_gnd.cpp
@@ -7,44 +7,36 @@
 
 #include "d/actor/d_a_npc_gnd.h"
 
-/* 809BE5BC-809BE5C4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {11, 1},
 };
 
-/* 809BE5C4-809BE5D4 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 809BE5D4-809BE5DC -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Gnd",
 };
 
-/* 809BE5DC-809BE5E0 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 809BE5E0-809BE5E8 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0, l_loadResPtrn0
 };
 
-/* 809BE5E8-809BE604 00004C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, 0, 0, 23, 2, 1, 1}
 };
 
-/* 809BE604-809BE620 000068 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {8, 2, 1, 20, 0, 1, 1, 0},
 };
 
-/* 809BE620-809BE630 000084 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0}, 
     {-1, 0, 0}, 
@@ -52,18 +44,14 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 809BE630-809BE640 000094 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 809BE640-809BE644 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Gnd_c */
 char* daNpc_Gnd_c::mCutNameList[1] = {""};
 
-/* 809BE644-809BE650 0000A8 000C+00 2/2 0/0 0/0 .data            mCutList__11daNpc_Gnd_c */
 daNpc_Gnd_c::cutFunc daNpc_Gnd_c::mCutList[1] = {NULL};
 
-/* 809BE4A0-809BE52C 000000 008C+00 6/6 0/0 0/0 .rodata          m__17daNpc_Gnd_Param_c */
 const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
     280.0f,
     -3.0f,
@@ -110,7 +98,6 @@ const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
 
 NPC_GND_HIO_CLASS l_HIO;
 
-/* 809BB60C-809BB730 0000EC 0124+00 1/0 0/0 0/0 .text            __dt__11daNpc_Gnd_cFv */
 daNpc_Gnd_c::~daNpc_Gnd_c() {
     OS_REPORT("|%06d:%x|daNpc_Gnd_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (heap != NULL) {
@@ -126,7 +113,6 @@ daNpc_Gnd_c::~daNpc_Gnd_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809BB730-809BB9D4 000210 02A4+00 1/1 0/0 0/0 .text            create__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::create() {
     daNpcT_ct(this, daNpc_Gnd_c, l_faceMotionAnmData,
                        l_motionAnmData, l_faceMotionSequenceData, 4,
@@ -183,7 +169,6 @@ int daNpc_Gnd_c::create() {
     return phase_state;
 }
 
-/* 809BB9D4-809BBC70 0004B4 029C+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -224,19 +209,16 @@ int daNpc_Gnd_c::CreateHeap() {
     return 0;
 }
 
-/* 809BBE2C-809BBE60 00090C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Gnd_c();
     return 1;
 }
 
-/* 809BBE60-809BBE80 000940 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 809BBE80-809BBF44 000960 00C4+00 1/1 0/0 0/0 .text            Draw__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::Draw() {
     J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
     if (mpMatAnm[0] != NULL) {
@@ -250,14 +232,10 @@ int daNpc_Gnd_c::Draw() {
     return daNpcT_c::draw(0, 1, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 809BBF44-809BBF64 000A24 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Gnd_cFP10fopAc_ac_c              */
 int daNpc_Gnd_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_Gnd_c*)i_this)->CreateHeap();
 }
 
-/* 809BBF64-809BBFBC 000A44 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Gnd_cFP8J3DJointi
- */
 int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {
     if (arg1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -270,7 +248,6 @@ int daNpc_Gnd_c::ctrlJointCallBack(J3DJoint* i_joint, int arg1) {
     return 1;
 }
 
-/* 809BBFBC-809BBFDC 000A9C 0020+00 1/1 0/0 0/0 .text            getType__11daNpc_Gnd_cFv */
 u8 daNpc_Gnd_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -280,7 +257,6 @@ u8 daNpc_Gnd_c::getType() {
     }
 }
 
-/* 809BBFDC-809BBFF8 000ABC 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -289,7 +265,6 @@ int daNpc_Gnd_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 809BBFF8-809BC028 000AD8 0030+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::isDelete() {
     if (mType == TYPE_1) {
         return 0;
@@ -303,7 +278,6 @@ int daNpc_Gnd_c::isDelete() {
     }
 }
 
-/* 809BC028-809BC168 000B08 0140+00 1/1 0/0 0/0 .text            reset__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::reset() {
     initialize();
     memset(&mNextAction, 0, (u8*)&field_0xF9C - (u8*)&mNextAction);
@@ -317,7 +291,6 @@ void daNpc_Gnd_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 809BC168-809BC1F4 000C48 008C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Gnd_cFi */
 void daNpc_Gnd_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -328,7 +301,6 @@ void daNpc_Gnd_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 809BC1F4-809BC328 000CD4 0134+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::ctrlBtk() {
     if (mpMatAnm[0] != NULL && mpMatAnm[1] != NULL) {
         if (field_0xe29 != 0 && mBtkAnm.getBtkAnm()) {
@@ -361,7 +333,6 @@ BOOL daNpc_Gnd_c::ctrlBtk() {
     return 0;
 }
 
-/* 809BC328-809BC448 000E08 0120+00 1/0 0/0 0/0 .text            setParam__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setParam() {
     u32 attn_flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 
@@ -395,17 +366,13 @@ void daNpc_Gnd_c::setParam() {
     gravity = 0.0f;
 }
 
-/* 809BC448-809BC4A8 000F28 0060+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Gnd_cFv
- */
 void daNpc_Gnd_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }
 
-/* 809BC4A8-809BC4AC 000F88 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::srchActors() {}
 
-/* 809BC4AC-809BC5AC 000F8C 0100+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::evtTalk() {
     if (chkAction(&daNpc_Gnd_c::talk)) {
         (this->*mAction)(NULL);
@@ -426,7 +393,6 @@ BOOL daNpc_Gnd_c::evtTalk() {
     return TRUE;
 }
 
-/* 809BC5AC-809BC674 00108C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Gnd_cFv */
 BOOL daNpc_Gnd_c::evtCutProc() {
     BOOL rt = FALSE;
 
@@ -444,7 +410,6 @@ BOOL daNpc_Gnd_c::evtCutProc() {
     return rt;
 }
 
-/* 809BC674-809BC760 001154 00EC+00 1/0 0/0 0/0 .text            action__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -460,14 +425,12 @@ void daNpc_Gnd_c::action() {
     }
 }
 
-/* 809BC760-809BC7D8 001240 0078+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 809BC7D8-809BCA14 0012B8 023C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setAttnPos() {
     cXyz cStack_3c(10.0f, 30.0f, 0.0f);
     cXyz cStack_48(10.0f, 0.0f, 0.0f);
@@ -496,7 +459,6 @@ void daNpc_Gnd_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 809BCA14-809BCB48 0014F4 0134+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Gnd_cFv */
 void daNpc_Gnd_c::setCollision() {
     cXyz pos;
     u32 tgType = 0xD8FBFDFF;
@@ -533,12 +495,10 @@ void daNpc_Gnd_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 809BCB48-809BCB50 001628 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809BCB50-809BCCE8 001630 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Gnd_cFiifi */
 bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) {
     static struct {
         int _0;
@@ -592,21 +552,16 @@ bool daNpc_Gnd_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int p
     return 1;
 }
 
-/* 809BCCE8-809BCD30 0017C8 0048+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Gnd_cFv */
 int daNpc_Gnd_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_Gnd_c::wait;
     return 1;
 }
 
-/* 809BCD30-809BCD5C 001810 002C+00 1/1 0/0 0/0 .text
- * chkAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i            */
 int daNpc_Gnd_c::chkAction(int (daNpc_Gnd_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 809BCD5C-809BCE04 00183C 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Gnd_cFM11daNpc_Gnd_cFPCvPvPv_i            */
 int daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*i_action)(void*)) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -622,7 +577,6 @@ int daNpc_Gnd_c::setAction(int (daNpc_Gnd_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 809BCE04-809BD050 0018E4 024C+00 1/0 0/0 0/0 .text            wait__11daNpc_Gnd_cFPv */
 int daNpc_Gnd_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -665,7 +619,6 @@ int daNpc_Gnd_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809BD050-809BD248 001B30 01F8+00 2/0 0/0 0/0 .text            talk__11daNpc_Gnd_cFPv */
 int daNpc_Gnd_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -702,32 +655,26 @@ int daNpc_Gnd_c::talk(void* param_0) {
     return 0;
 }
 
-/* 809BD248-809BD268 001D28 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Create__FPv */
 static int daNpc_Gnd_Create(void* i_this) {
     return ((daNpc_Gnd_c*)i_this)->create();
 }
 
-/* 809BD268-809BD288 001D48 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Delete__FPv */
 static int daNpc_Gnd_Delete(void* i_this) {
     return ((daNpc_Gnd_c*)i_this)->Delete();
 }
 
-/* 809BD288-809BD2A8 001D68 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Execute__FPv */
 static int daNpc_Gnd_Execute(void* i_this) {
     return ((daNpc_Gnd_c*)i_this)->Execute();
 }
 
-/* 809BD2A8-809BD2C8 001D88 0020+00 1/0 0/0 0/0 .text            daNpc_Gnd_Draw__FPv */
 static int daNpc_Gnd_Draw(void* i_this) {
     return ((daNpc_Gnd_c*)i_this)->Draw();
 }
 
-/* 809BD2C8-809BD2D0 001DA8 0008+00 1/0 0/0 0/0 .text            daNpc_Gnd_IsDelete__FPv */
 static int daNpc_Gnd_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 809BE684-809BE6A4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Gnd_MethodTable */
 static actor_method_class daNpc_Gnd_MethodTable = {
     (process_method_func)daNpc_Gnd_Create,
     (process_method_func)daNpc_Gnd_Delete,
@@ -736,7 +683,6 @@ static actor_method_class daNpc_Gnd_MethodTable = {
     (process_method_func)daNpc_Gnd_Draw,
 };
 
-/* 809BE6A4-809BE6D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GND */
 extern actor_process_profile_definition g_profile_NPC_GND = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp
index 480de8b6b8..11b84dfd41 100644
--- a/src/d/actor/d_a_npc_gra.cpp
+++ b/src/d/actor/d_a_npc_gra.cpp
@@ -13,12 +13,6 @@
 #include "d/actor/d_a_tag_gra.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 809C9D98-809C9E1C 000000 0084+00 27/27 0/0 0/0 .rodata          m__17daNpc_grA_Param_c */
 const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
     {90.0f,  -4.0f,  1.0f,   850.0f,  255.0f, 280.0f, 40.0f, 100.0f, 0.0f, 0.0f, 20.0f,
      -20.0f, 40.0f,  -30.0f, 40.0f,   -40.0f, 0.4f,   12.0f, 4,      6,    6,    6,
@@ -38,7 +32,6 @@ const daNpc_grA_HIOParam daNpc_grA_Param_c::m = {
 #define GET_HIO(x) daNpc_grA_Param_c::m.x
 #endif
 
-/* 809CA634-809CA65C 000020 0028+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[][2] = {
     3, 1,
     3, 2,
@@ -47,7 +40,6 @@ static int l_bmdGetParamList[][2] = {
     11, 15,
 };
 
-/* 809CA65C-809CA7F4 000048 0198+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static int l_bckGetParamList[][2] = {
     0x0E, 0x00,
     0x0C, 0x00,
@@ -125,10 +117,8 @@ static int l_btpGetParamList[][2] = {
     0x1D, 0x00,
 };
 
-/* 809CA874-809CA87C 000260 0008+00 0/1 0/0 0/0 .data            l_btkGetParamList */
 static int l_btkGetParamList[][2] = {-1, 0};
 
-/* 809CA87C-809CA8D4 000268 0058+00 0/3 0/0 0/0 .data            l_evtGetParamList */
 static int l_evtGetParamList[][2] = {
     0x00, 0x00,
     0x01, 0x03,
@@ -151,7 +141,6 @@ daNpc_grA_HIO_c::daNpc_grA_HIO_c() {
 
 NPC_GRA_HIO_CLASS l_HIO;
 
-/* 809CA8D4-809CA900 -00001 002C+00 0/3 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[11] = {
     NULL,
     "TALK_SPA",
@@ -166,72 +155,58 @@ static char* l_evtNames[11] = {
     "ROLL_ROCK_CRASH",
 };
 
-/* 809CA900-809CA920 0002EC 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRAa */
 static int l_loadRes_GRAa[] = {
     0, 1, -1, -1, -1, -1, -1, -1,
 };
 
-/* 809CA920-809CA940 00030C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_Tw */
 static int l_loadRes_GRA_Tw[] = {
     0, 2, -1, -1, -1, -1, -1, -1,
 };
 
-/* 809CA940-809CA960 00032C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_Spa */
 static int l_loadRes_GRA_Spa[] = {
     0, 1, 3, -1, -1, -1, -1, -1,
 };
 
-/* 809CA960-809CA980 00034C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_SDEMO */
 static int l_loadRes_GRA_SDEMO[] = {
     0, 1, 4, -1, -1, -1, -1, -1,
 };
 
-/* 809CA980-809CA9A0 00036C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_GATE */
 static int l_loadRes_GRA_GATE[] = {
     0, 1, 4, 5, -1, -1, -1, -1,
 };
 
-/* 809CA9A0-809CA9C0 00038C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_KICKOUT */
 static int l_loadRes_GRA_KICKOUT[] = {
     0, 1, 6, 10, -1, -1, -1, -1,
 };
 
-/* 809CA9C0-809CA9E0 0003AC 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_ROCK */
 static int l_loadRes_GRA_ROCK[] = {
     0, 1, 7, 8, -1, -1, -1, -1,
 };
 
-/* 809CA9E0-809CAA00 0003CC 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_SPAWATER */
 static int l_loadRes_GRA_SPAWATER[] = {
     0, 1, 3, 9, 10, 11, 12, -1,
 };
 
-/* 809CAA00-809CAA20 0003EC 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_SPABUYER */
 static int l_loadRes_GRA_SPABUYER[] = {
     0, 1, 15, -1, -1, -1, -1, -1,
 };
 
-/* 809CAA20-809CAA40 00040C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_SPABUYER_TW */
 static int l_loadRes_GRA_SPABUYER_TW[] = {
     0, 2, 15, -1, -1, -1, -1, -1,
 };
 
-/* 809CAA40-809CAA60 00042C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_ROCKCRASHER */
 static int l_loadRes_GRA_ROCKCRASHER[] = {
     0, 1, 13, 11, 14, -1, -1, -1,
 };
 
-/* 809CAA60-809CAA80 00044C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA_BUYER */
 static int l_loadRes_GRA_BUYER[] = {
     0, 1, 4, -1, -1, -1, -1, -1,
 };
 
-/* 809CAA80-809CAAA0 00046C 0020+00 1/0 0/0 0/0 .data            l_loadRes_GRA0 */
 static int l_loadRes_GRA0[] = {
     0, 1, -1, -1, -1, -1, -1, -1,
 };
 
-/* 809CAAA0-809CAAD4 -00001 0034+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[13] = {
     l_loadRes_GRAa,
     l_loadRes_GRA_Tw,
@@ -248,7 +223,6 @@ static int* l_loadRes_list[13] = {
     l_loadRes_GRA0,
 };
 
-/* 809CAAD4-809CAB14 -00001 0040+00 5/9 0/0 0/0 .data            l_resNames */
 static char* l_resNames[16] = {
     "grA_base",
     "grA_mdl",
@@ -268,7 +242,6 @@ static char* l_resNames[16] = {
     "grA_town",
 };
 
-/* 809CAB14-809CAB20 -00001 000C+00 1/1 0/0 0/0 .data            l_myName */
 static char* l_myName[3] = {
     "grA",
     "grA_spa",
@@ -324,7 +297,6 @@ void daNpc_grA_HIO_c::genMessage(JORMContext* context) {
 }
 #endif
 
-/* 809CAB20-809CAB50 -00001 0030+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_grA_c */
 char* daNpc_grA_c::mEvtCutNameList[12] = {
     "",
     "TALK_SPA",
@@ -340,7 +312,6 @@ char* daNpc_grA_c::mEvtCutNameList[12] = {
     "ROLL_ROCK_CRASH",
 };
 
-/* 809CABD4-809CAC64 0005C0 0090+00 0/2 0/0 0/0 .data            mEvtCutList__11daNpc_grA_c */
 daNpc_grA_c::cut_type daNpc_grA_c::mEvtCutList[] = {
     NULL, 
     &daNpc_grA_c::ECut_talkSpa,
@@ -356,11 +327,9 @@ daNpc_grA_c::cut_type daNpc_grA_c::mEvtCutList[] = {
     &daNpc_grA_c::ECut_rollRockCrash,
 };
 
-/* 809BE94C-809BEB24 0000EC 01D8+00 1/1 0/0 0/0 .text            __ct__11daNpc_grA_cFv */
 daNpc_grA_c::daNpc_grA_c() : daNpcF_c() {
 }
 
-/* 809BEB64-809BEDA4 000304 0240+00 1/0 0/0 0/0 .text            __dt__11daNpc_grA_cFv */
 daNpc_grA_c::~daNpc_grA_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -377,7 +346,6 @@ daNpc_grA_c::~daNpc_grA_c() {
 #endif
 }
 
-/* 809BEDA4-809BF0A8 000544 0304+00 1/1 0/0 0/0 .text            create__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::create() {
     fopAcM_ct(this, daNpc_grA_c);
     mTwilight = dKy_darkworld_check();
@@ -447,7 +415,6 @@ BOOL daNpc_grA_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809BF0A8-809BF418 000848 0370+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* mdlData2_p = NULL;
@@ -527,27 +494,22 @@ BOOL daNpc_grA_c::CreateHeap() {
     return TRUE;
 }
 
-/* 809BF418-809BF44C 000BB8 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::Delete() {
     fopAcM_RegisterDeleteID(this, "NPC_GRA");
     this->~daNpc_grA_c();
     return TRUE;
 }
 
-/* 809BF44C-809BF490 000BEC 0044+00 2/2 0/0 0/0 .text            Execute__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::Execute() {
     int ret = execute();
     setPrtcl();
     return ret;
 }
 
-/* 809BF490-809BF504 000C30 0074+00 1/1 0/0 0/0 .text            Draw__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::Draw() {
     return draw(chkAction(&daNpc_grA_c::test), 0, GET_HIO(mNpcFParams.real_shadow_size), NULL, 0);
 }
 
-/* 809BF504-809BF738 000CA4 0234+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_grA_cFP8J3DJointP8J3DModel                */
 BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int jntNo = joint->getJntNo();
@@ -591,14 +553,11 @@ BOOL daNpc_grA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return TRUE;
 }
 
-/* 809BF738-809BF758 000ED8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_grA_cFP10fopAc_ac_c              */
 BOOL daNpc_grA_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_grA_c* this_gra = (daNpc_grA_c*)i_this;
     return this_gra->CreateHeap();
 }
 
-/* 809BF758-809BF7A4 000EF8 004C+00 2/2 0/0 0/0 .text ctrlJointCallBack__11daNpc_grA_cFP8J3DJointi */
 BOOL daNpc_grA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0)
     {
@@ -612,7 +571,6 @@ BOOL daNpc_grA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return TRUE;
 }
 
-/* 809BF7A4-809BF8A0 000F44 00FC+00 1/1 0/0 1/1 .text            setTagJump__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::setTagJump() {
     if (field_0x1489) {
         current.pos = old.pos = home.pos = field_0x148C;
@@ -623,7 +581,6 @@ BOOL daNpc_grA_c::setTagJump() {
     return FALSE;
 }
 
-/* 809BF8A0-809BF99C 001040 00FC+00 2/2 0/0 0/0 .text            setTagJump2__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::setTagJump2() {
     if (field_0x149E) {
         current.pos = old.pos = home.pos = field_0x14A0;
@@ -634,7 +591,6 @@ BOOL daNpc_grA_c::setTagJump2() {
     return FALSE;
 }
 
-/* 809BF99C-809BFA88 00113C 00EC+00 1/1 0/0 1/1 .text            setHomeJump__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::setHomeJump() {
     current.pos = old.pos = home.pos = field_0x14BC;
     shape_angle = mCurAngle = mOldAngle = current.angle = old.angle = home.angle = field_0x14C8;
@@ -643,7 +599,6 @@ BOOL daNpc_grA_c::setHomeJump() {
     return TRUE;
 }
 
-/* 809BFA88-809BFAF4 001228 006C+00 2/2 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_this) {
     // a bit ugly, but the debug version can't have any local variables
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) {
@@ -654,8 +609,6 @@ static void* s_sub(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFAF4-809BFB54 001294 0060+00 1/1 0/0 0/0 .text checkTagGraSub__11daNpc_grA_cFP10fopAc_ac_c
- */
 bool daNpc_grA_c::checkTagGraSub(fopAc_ac_c* i_this) {
     daTagGra_c* this_gra = (daTagGra_c*)i_this;
     if ((mType == 3 && this_gra->getMode() == 3) || (mType == 4 && this_gra->getMode() == 4)) {
@@ -667,7 +620,6 @@ bool daNpc_grA_c::checkTagGraSub(fopAc_ac_c* i_this) {
     return FALSE;
 }
 
-/* 809BFB54-809BFBC0 0012F4 006C+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* i_actor, void* i_this) {
     // a bit ugly, but the debug version can't have any local variables
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA) {
@@ -678,8 +630,6 @@ static void* s_sub2(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFBC0-809BFC00 001360 0040+00 1/1 0/0 0/0 .text checkTagGraSub2__11daNpc_grA_cFP10fopAc_ac_c
- */
 bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) {
     daTagGra_c* this_gra = (daTagGra_c*)i_this;
     if ((mType == 3 && this_gra->getMode() == 5)) {
@@ -691,7 +641,6 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) {
     return FALSE;
 }
 
-/* 809BFC00-809BFC4C 0013A0 004C+00 1/1 0/0 0/0 .text            s_subShop__FPvPv */
 static void* s_subShop(void* i_actor, void* i_this) {
     (void)i_this;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) {
@@ -700,7 +649,6 @@ static void* s_subShop(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFC4C-809BFC98 0013EC 004C+00 1/1 0/0 0/0 .text            s_subGRD__FPvPv */
 static void* s_subGRD(void* i_actor, void* i_this) {
     (void)i_this;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) {
@@ -709,7 +657,6 @@ static void* s_subGRD(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFC98-809BFD04 001438 006C+00 1/1 0/0 0/0 .text            s_subOnsenTaru__FPvPv */
 static void *s_subOnsenTaru(void* i_actor, void* i_this) {
     (void)i_this;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru &&
@@ -720,7 +667,6 @@ static void *s_subOnsenTaru(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFD04-809BFD60 0014A4 005C+00 2/2 0/0 0/0 .text            s_subCarry__FPvPv */
 static void *s_subCarry(void* i_actor, void* i_this) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry) {
         ((daNpc_grA_c*)i_this)->addCarryNum();
@@ -728,7 +674,6 @@ static void *s_subCarry(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFD60-809BFDCC 001500 006C+00 2/2 0/0 0/0 .text            s_subCrashed__FPvPv */
 static void *s_subCrashed(void* i_actor, void* i_this) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA &&
         ((daNpc_grA_c*)i_this)->checkTagGraSubCrashed((fopAc_ac_c*)i_actor))
@@ -738,8 +683,6 @@ static void *s_subCrashed(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 809BFDCC-809BFDFC 00156C 0030+00 1/1 0/0 0/0 .text
- * checkTagGraSubCrashed__11daNpc_grA_cFP10fopAc_ac_c           */
 bool daNpc_grA_c::checkTagGraSubCrashed(fopAc_ac_c* i_this) {
     daTagGra_c* this_gra = (daTagGra_c*)i_this;
     if (mType == 10 && this_gra->getMode() == 6) {
@@ -748,7 +691,6 @@ bool daNpc_grA_c::checkTagGraSubCrashed(fopAc_ac_c* i_this) {
     return FALSE;
 }
 
-/* 809BFDFC-809C0038 00159C 023C+00 1/0 0/0 0/0 .text            setParam__11daNpc_grA_cFv */
 void daNpc_grA_c::setParam() {
     daNpc_grA_c_Action act = mAction2;
     s16 attnDistance, attnAngle, talkDistance, talkAngle;
@@ -821,7 +763,6 @@ void daNpc_grA_c::setParam() {
     }
 }
 
-/* 809C0038-809C0298 0017D8 0260+00 1/0 0/0 0/0 .text            main__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::main() {
     int a = 0xffff;
     JUT_ASSERT(1367, mAnm_p != NULL); // TODO: update "mAnm_p" to "mAnm_p"
@@ -872,12 +813,10 @@ BOOL daNpc_grA_c::main() {
     return TRUE;
 }
 
-/* 809C0298-809C02A0 001A38 0008+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::ctrlBtk() {
     return false;
 }
 
-/* 809C02A0-809C0948 001A40 06A8+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grA_cFv */
 void daNpc_grA_c::setAttnPos() {
     static cXyz eyeOffset(15.0f, 25.0f, 0.0f);
     cXyz* attentionPos = NULL;
@@ -986,8 +925,6 @@ void daNpc_grA_c::setAttnPos() {
     field_0xC98.ClrCoHit();
 }
 
-/* 809C0948-809C0CE4 0020E8 039C+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_grA_cFib
- */
 bool daNpc_grA_c::setExpressionAnm(int i_expression, bool i_modify) {
     J3DAnmTransformKey *bck = NULL;
     int attr = 0;
@@ -1089,8 +1026,6 @@ bool daNpc_grA_c::setExpressionAnm(int i_expression, bool i_modify) {
     return false;
 }
 
-/* 809C0CE4-809C0E18 002484 0134+00 2/0 0/0 0/0 .text            setExpressionBtp__11daNpc_grA_cFi
- */
 bool daNpc_grA_c::setExpressionBtp(int i_expression) {
     J3DAnmTexPattern* bck = NULL;
     int attr = 0;
@@ -1145,7 +1080,6 @@ bool daNpc_grA_c::setExpressionBtp(int i_expression) {
 
 }
 
-/* 809C0E18-809C0E44 0025B8 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_grA_cFif */
 void daNpc_grA_c::setExpression(int i_expression, f32 i_morfOverride) {
     if (i_expression >= 0 && i_expression < 0x18) {
         mExpression = i_expression;
@@ -1155,7 +1089,6 @@ void daNpc_grA_c::setExpression(int i_expression, f32 i_morfOverride) {
     }
 }
 
-/* 809C0E44-809C1018 0025E4 01D4+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_grA_cFif */
 void daNpc_grA_c::setMotionAnm(int i_motion, f32 i_morf) {
     J3DAnmTransformKey* bck = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -1238,7 +1171,6 @@ void daNpc_grA_c::setMotionAnm(int i_motion, f32 i_morf) {
     }
 }
 
-/* 809C1018-809C105C 0027B8 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_grA_cFifi */
 void daNpc_grA_c::setMotion(int i_motion, f32 i_MorfOverride, int param_2) {
     s16 motion = i_motion;
     if ((param_2 != 0 || mMotion != motion) && (i_motion >= 0 && i_motion < 0x1d)) {
@@ -1249,7 +1181,6 @@ void daNpc_grA_c::setMotion(int i_motion, f32 i_MorfOverride, int param_2) {
     }
 }
 
-/* 809C105C-809C1064 0027FC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::drawDbgInfo() {
 #if DEBUG
     if (GET_HIO(mNpcFParams.debug_info_ON) != 0) {
@@ -1301,7 +1232,6 @@ BOOL daNpc_grA_c::drawDbgInfo() {
     return false;
 }
 
-/* 809C1064-809C1154 002804 00F0+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_grA_cFv */
 void daNpc_grA_c::drawOtherMdls() {
     if (field_0x150C && mpModel) {
         g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -1324,18 +1254,14 @@ void daNpc_grA_c::drawOtherMdls() {
     }
 }
 
-/* 809C1154-809C1160 0028F4 000C+00 4/4 0/0 0/0 .text            getMode__11daNpc_grA_cFv */
 u8 daNpc_grA_c::getMode() {
     return fopAcM_GetParam(this);
 }
 
-/* 809C1160-809C116C 002900 000C+00 4/4 0/0 1/1 .text            getMode1__11daNpc_grA_cFv */
 u8 daNpc_grA_c::getMode1() {
     return (fopAcM_GetParam(this) & 0xFF00) >> 8;
 }
 
-/* 809C116C-809C1238 00290C 00CC+00 2/1 0/0 0/0 .text            getTypeFromParam__11daNpc_grA_cFv
- */
 u8 daNpc_grA_c::getTypeFromParam() {
     u8 v = (fopAcM_GetParam(this) & 0xF0000000) >> 28;
     switch (v) {
@@ -1374,12 +1300,10 @@ u8 daNpc_grA_c::getTypeFromParam() {
     }
 }
 
-/* 809C1238-809C1244 0029D8 000C+00 1/1 0/0 0/0 .text            getSwBit__11daNpc_grA_cFv */
 u8 daNpc_grA_c::getSwBit() {
     return (fopAcM_GetParam(this) & 0xff0000) >> 16;
 }
 
-/* 809C1244-809C13D8 0029E4 0194+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::isDelete() {
     if (mType == 0xc || mType == 0 || mType == 1 || mType == 3 || mType == 4 || mType == 5 ||
         (mType == 6 && daNpcF_chkEvtBit(0x150)) || (mType == 8 && daNpcF_chkEvtBit(0x179)) ||
@@ -1411,7 +1335,6 @@ BOOL daNpc_grA_c::isDelete() {
     return TRUE;
 }
 
-/* 809C13D8-809C1990 002B78 05B8+00 1/1 0/0 0/0 .text            reset__11daNpc_grA_cFv */
 void daNpc_grA_c::reset() {
     initialize();
     field_0xDD4.initialize();
@@ -1536,7 +1459,6 @@ void daNpc_grA_c::reset() {
     field_0x9ee = 1;
 }
 
-/* 809C1990-809C2080 003130 06F0+00 1/1 0/0 0/0 .text            playExpression__11daNpc_grA_cFv */
 void daNpc_grA_c::playExpression() {
     daNpcF_anmPlayData dat0 = {1, GET_HIO(mNpcFParams.morf_frame), 1};
     daNpcF_anmPlayData dat0_ = {0, GET_HIO(mNpcFParams.morf_frame), 0};
@@ -1648,7 +1570,6 @@ void daNpc_grA_c::playExpression() {
     }
 }
 
-/* 809C2080-809C28BC 003820 083C+00 1/1 0/0 0/0 .text            playMotion__11daNpc_grA_cFv */
 void daNpc_grA_c::playMotion() {
     daNpcF_anmPlayData dat0 = {0x16, GET_HIO(mNpcFParams.morf_frame), 0};
     daNpcF_anmPlayData* pDat0[] = {&dat0};
@@ -1786,14 +1707,10 @@ void daNpc_grA_c::playMotion() {
     }
 }
 
-/* 809C28BC-809C28E8 00405C 002C+00 4/4 0/0 0/0 .text
- * chkAction__11daNpc_grA_cFM11daNpc_grA_cFPCvPvPv_i            */
 BOOL daNpc_grA_c::chkAction(daNpc_grA_c_Action i_action) {
     return mAction == i_action;
 }
 
-/* 809C28E8-809C2990 004088 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_grA_cFM11daNpc_grA_cFPCvPvPv_i            */
 BOOL daNpc_grA_c::setAction(daNpc_grA_c_Action i_action) {
     field_0x1472 = 3;
     if (mAction) {
@@ -1807,7 +1724,6 @@ BOOL daNpc_grA_c::setAction(daNpc_grA_c_Action i_action) {
     return TRUE;
 }
 
-/* 809C2990-809C2C3C 004130 02AC+00 2/1 0/0 0/0 .text            selectAction__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::selectAction() {
     mAction2 = NULL;
     if (GET_HIO(mNpcFParams.debug_mode_ON)) {
@@ -1880,7 +1796,6 @@ enum Event_Cut_Nums {
     /* 0x2 */ NUM_EVT_CUTS_e = 0xc,
 };
 
-/* 809C2C3C-809C3070 0043DC 0434+00 1/1 0/0 0/0 .text            doEvent__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::doEvent() {
     dEvent_manager_c* manager = NULL;
     BOOL ret = FALSE;
@@ -1985,14 +1900,12 @@ BOOL daNpc_grA_c::doEvent() {
     return ret;
 }
 
-/* 809C3070-809C3094 004810 0024+00 29/29 0/0 0/0 .text            setLookMode__11daNpc_grA_cFi */
 void daNpc_grA_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 9 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809C3094-809C3424 004834 0390+00 1/1 0/0 0/0 .text            lookat__11daNpc_grA_cFv */
 void daNpc_grA_c::lookat() {
     fopAc_ac_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -2067,7 +1980,6 @@ void daNpc_grA_c::lookat() {
     mNpcfLookAt.calc(this, model->getBaseTRMtx(), pLookAngles, r27, diffInAngle, FALSE);
 }
 
-/* 809C3424-809C35D0 004BC4 01AC+00 9/9 0/0 0/0 .text            chkFindPlayer__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::chkFindPlayer() {
     BOOL ret = FALSE;
     s16 searchAngle = fopAcM_searchPlayerAngleY(this) - current.angle.y;
@@ -2101,7 +2013,6 @@ BOOL daNpc_grA_c::chkFindPlayer() {
     return ret;
 }
 
-/* 809C35D0-809C36AC 004D70 00DC+00 2/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_grA_cFv */
 void daNpc_grA_c::setExpressionTalkAfter() {
     switch (mExpression) {
     case 5:
@@ -2124,7 +2035,6 @@ void daNpc_grA_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809C36AC-809C389C 004E4C 01F0+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_grA_cFv */
 BOOL daNpc_grA_c::setPrtcl() {
     JPABaseEmitter* particleEmitter = NULL;
     int sp20 = 0;
@@ -2171,10 +2081,7 @@ BOOL daNpc_grA_c::setPrtcl() {
     return TRUE;
 }
 
-/* ############################################################################################## */
-/* 809CA42C-809CA434 000694 0006+02 0/1 0/0 0/0 .rodata          l_prticles_id$6368 */
 
-/* 809C389C-809C3A54 00503C 01B8+00 5/5 0/0 0/0 .text setRollPrtcl__11daNpc_grA_cFRC4cXyzf */
 void daNpc_grA_c::setRollPrtcl(cXyz const& i_pos, f32 i_scale) {
     static u16 const l_prticles_id[] = {
         0x83B5,
@@ -2209,13 +2116,11 @@ void daNpc_grA_c::setRollPrtcl(cXyz const& i_pos, f32 i_scale) {
     }
 }
 
-/* 809CAF08-809CAF28 0008F4 0020+00 1/1 0/0 0/0 .data            l_offsetHeight */
 static u8 l_offsetHeight[32] = {
     0xB6, 0xB6, 0xBA, 0xBE, 0xC6, 0xCE, 0xCE, 0xCE, 0xCA, 0xCA, 0xC6, 0xC2, 0xBE, 0xBA, 0xB6, 0xB6,
     0xBA, 0xBA, 0xBE, 0xC6, 0xCA, 0xCE, 0xD1, 0xCE, 0xC6, 0xBA, 0xCA, 0xCE, 0xCA, 0xBE, 0xB6, 0xB6,
 };
 
-/* 809C3A54-809C3B28 0051F4 00D4+00 1/1 0/0 0/0 .text            setOtherObjMtx__11daNpc_grA_cFv */
 void daNpc_grA_c::setOtherObjMtx() {
     if (field_0x150C != 0) {
         switch (mType) {
@@ -2230,7 +2135,6 @@ void daNpc_grA_c::setOtherObjMtx() {
     }
 }
 
-/* 809C3B28-809C3D78 0052C8 0250+00 1/0 0/0 0/0 .text            ECut_talkSpa__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_talkSpa(int i_staffID) {
     dEvent_manager_c& manager = dComIfGp_getEventManager();
     int unusedr26 = 0;
@@ -2285,7 +2189,6 @@ BOOL daNpc_grA_c::ECut_talkSpa(int i_staffID) {
     return r30;
 }
 
-/* 809C3D78-809C45B0 005518 0838+00 1/0 0/0 0/0 .text            ECut_grDSRoll__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
     dEvent_manager_c& sp34 = dComIfGp_getEventManager();
     int sp30 = 0;
@@ -2467,7 +2370,6 @@ BOOL daNpc_grA_c::ECut_grDSRoll(int i_staffID) {
     return r28;
 }
 
-/* 809C45B0-809C47EC 005D50 023C+00 1/0 0/0 0/0 .text            ECut_grDSGate__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_grDSGate(int i_staffID) {
     dEvent_manager_c& manager = dComIfGp_getEventManager();
     int sp10 = 0;
@@ -2529,8 +2431,6 @@ BOOL daNpc_grA_c::ECut_grDSGate(int i_staffID) {
     return r30;
 }
 
-/* 809C47EC-809C4BE4 005F8C 03F8+00 1/0 0/0 0/0 .text            ECut_teachElevator__11daNpc_grA_cFi
- */
 BOOL daNpc_grA_c::ECut_teachElevator(int i_staffID) {
     dEvent_manager_c& manager = dComIfGp_getEventManager();
     int sp10 = 0;
@@ -2626,7 +2526,6 @@ BOOL daNpc_grA_c::ECut_teachElevator(int i_staffID) {
     return r30;
 }
 
-/* 809C4BE4-809C4EB4 006384 02D0+00 1/0 0/0 0/0 .text            ECut_kickOut__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) {
     dEvent_manager_c& sp40 = dComIfGp_getEventManager();
     int sp3C = 0;
@@ -2694,7 +2593,6 @@ BOOL daNpc_grA_c::ECut_kickOut(int i_staffID) {
     return r28;
 }
 
-/* 809C4EB4-809C5088 006654 01D4+00 1/0 0/0 0/0 .text            ECut_noneLook__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_noneLook(int i_staffID) {
     dEvent_manager_c& manager = dComIfGp_getEventManager();
     int r26 = 0;
@@ -2753,7 +2651,6 @@ BOOL daNpc_grA_c::ECut_noneLook(int i_staffID) {
     return r30;
 }
 
-/* 809C5088-809C5430 006828 03A8+00 1/0 0/0 0/0 .text            ECut_rescueRock__11daNpc_grA_cFi */
 BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) {
     dEvent_manager_c& sp40 = dComIfGp_getEventManager();
     int sp3C = 0;
@@ -2841,8 +2738,6 @@ BOOL daNpc_grA_c::ECut_rescueRock(int i_staffID) {
     return r28;
 }
 
-/* 809C5430-809C5D44 006BD0 0914+00 3/0 0/0 0/0 .text            ECut_carrySpaWater__11daNpc_grA_cFi
- */
 BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
     dEvent_manager_c& sp40 = dComIfGp_getEventManager();
     int sp3C = 0;
@@ -3043,8 +2938,6 @@ BOOL daNpc_grA_c::ECut_carrySpaWater(int i_staffID) {
     
 }
 
-/* 809C5D44-809C5F90 0074E4 024C+00 1/0 0/0 0/0 .text ECut_carrySpaWaterFailure__11daNpc_grA_cFi
- */
 BOOL daNpc_grA_c::ECut_carrySpaWaterFailure(int i_staffID) {
     dEvent_manager_c& sp34 = dComIfGp_getEventManager();
     int sp30 = 0;
@@ -3107,8 +3000,6 @@ BOOL daNpc_grA_c::ECut_carrySpaWaterFailure(int i_staffID) {
     return r28;
 }
 
-/* 809C5F90-809C6608 007730 0678+00 1/0 0/0 0/0 .text            ECut_rollRockCrash__11daNpc_grA_cFi
- */
 BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
     dEvent_manager_c& sp34 = dComIfGp_getEventManager();
     int sp30 = 0;
@@ -3251,8 +3142,6 @@ BOOL daNpc_grA_c::ECut_rollRockCrash(int i_staffID) {
     return r28;
 }
 
-/* 809C6608-809C681C 007DA8 0214+00 1/0 0/0 0/0 .text            ECut_talkSpaWater__11daNpc_grA_cFi
- */
 BOOL daNpc_grA_c::ECut_talkSpaWater(int i_staffID) {
     dEvent_manager_c& manager = dComIfGp_getEventManager();
     int r26 = 0;
@@ -3305,7 +3194,6 @@ BOOL daNpc_grA_c::ECut_talkSpaWater(int i_staffID) {
     return r30;
 }
 
-/* 809C681C-809C69B8 007FBC 019C+00 3/0 0/0 0/0 .text            wait__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::wait(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3343,7 +3231,6 @@ BOOL daNpc_grA_c::wait(void*) {
     return TRUE;
 }
 
-/* 809C69B8-809C6AAC 008158 00F4+00 1/0 0/0 0/0 .text            waitTW__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitTW(void*) {
         switch (field_0x1472) {
     case 0:
@@ -3367,7 +3254,6 @@ BOOL daNpc_grA_c::waitTW(void*) {
     return TRUE;
 }
 
-/* 809C6AAC-809C6D48 00824C 029C+00 1/0 0/0 0/0 .text            waitCheer__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitCheer(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3427,7 +3313,6 @@ BOOL daNpc_grA_c::waitCheer(void*) {
     return TRUE;
 }
 
-/* 809C6D48-809C73FC 0084E8 06B4+00 1/0 0/0 0/0 .text            waitGate__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitGate(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3548,7 +3433,6 @@ BOOL daNpc_grA_c::waitGate(void*) {
     return TRUE;
 }
 
-/* 809C73FC-809C770C 008B9C 0310+00 1/0 0/0 0/0 .text            waitKickOut__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitKickOut(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3613,7 +3497,6 @@ BOOL daNpc_grA_c::waitKickOut(void*) {
     return TRUE;
 }
 
-/* 809C770C-809C77E0 008EAC 00D4+00 2/0 0/0 0/0 .text            moveRock__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::moveRock(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3635,7 +3518,6 @@ BOOL daNpc_grA_c::moveRock(void*) {
     return TRUE;
 }
 
-/* 809C77E0-809C7ACC 008F80 02EC+00 1/0 0/0 0/0 .text            spaWarm__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::spaWarm(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3703,7 +3585,6 @@ BOOL daNpc_grA_c::spaWarm(void*) {
     return TRUE;
 }
 
-/* 809C7ACC-809C7F24 00926C 0458+00 3/0 0/0 0/0 .text            waitSpaWater__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitSpaWater(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3795,7 +3676,6 @@ BOOL daNpc_grA_c::waitSpaWater(void*) {
     return TRUE;
 }
 
-/* 809C7F24-809C8138 0096C4 0214+00 1/0 0/0 0/0 .text            waitSpaBuyer__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitSpaBuyer(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3847,7 +3727,6 @@ BOOL daNpc_grA_c::waitSpaBuyer(void*) {
     return TRUE;
 }
 
-/* 809C8138-809C82A8 0098D8 0170+00 1/0 0/0 0/0 .text            waitSpaBuyerTW__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitSpaBuyerTW(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3879,8 +3758,6 @@ BOOL daNpc_grA_c::waitSpaBuyerTW(void*) {
     return TRUE;
 }
 
-/* 809C82A8-809C8514 009A48 026C+00 1/0 0/0 0/0 .text            beforeCrashWait__11daNpc_grA_cFPv
- */
 BOOL daNpc_grA_c::beforeCrashWait(void*) {
     switch (field_0x1472) {
     case 0:
@@ -3935,7 +3812,6 @@ BOOL daNpc_grA_c::beforeCrashWait(void*) {
     return TRUE;
 }
 
-/* 809C8514-809C8694 009CB4 0180+00 1/0 0/0 0/0 .text            crashRoll__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::crashRoll(void*) {
    switch (field_0x1472) {
     case 0:
@@ -3968,7 +3844,6 @@ BOOL daNpc_grA_c::crashRoll(void*) {
     return TRUE;
 }
 
-/* 809C8694-809C884C 009E34 01B8+00 1/0 0/0 0/0 .text            crashRollWait__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::crashRollWait(void*) {
     switch (field_0x1472) {
     case 0:
@@ -4002,7 +3877,6 @@ BOOL daNpc_grA_c::crashRollWait(void*) {
     return TRUE;
 }
 
-/* 809C884C-809C8A2C 009FEC 01E0+00 1/0 0/0 0/0 .text            crashedWait__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::crashedWait(void*) {
     switch (field_0x1472) {
     case 0:
@@ -4046,7 +3920,6 @@ BOOL daNpc_grA_c::crashedWait(void*) {
     return TRUE;
 }
 
-/* 809C8A2C-809C8BD4 00A1CC 01A8+00 1/0 0/0 0/0 .text            waitBuyer__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::waitBuyer(void*) {
     switch (field_0x1472) {
     case 0:
@@ -4084,7 +3957,6 @@ BOOL daNpc_grA_c::waitBuyer(void*) {
     return TRUE;
 }
 
-/* 809C8BD4-809C9044 00A374 0470+00 2/0 0/0 0/0 .text            talk__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::talk(void*) {
     int spc = 0;
     BOOL r29 = 0;
@@ -4192,7 +4064,6 @@ BOOL daNpc_grA_c::talk(void*) {
     return r29;
 }
 
-/* 809C9044-809C9128 00A7E4 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_grA_cFPv */
 BOOL daNpc_grA_c::test(void*) {
     switch (field_0x1472) {
     case 0:
@@ -4216,32 +4087,26 @@ BOOL daNpc_grA_c::test(void*) {
     return TRUE;
 }
 
-/* 809C9128-809C9148 00A8C8 0020+00 1/0 0/0 0/0 .text            daNpc_grA_Create__FPv */
 static BOOL daNpc_grA_Create(void* i_this) {
     return ((daNpc_grA_c*)i_this)->create();
 }
 
-/* 809C9148-809C9168 00A8E8 0020+00 1/0 0/0 0/0 .text            daNpc_grA_Delete__FPv */
 static BOOL daNpc_grA_Delete(void* i_this) {
     return ((daNpc_grA_c*)i_this)->Delete();
 }
 
-/* 809C9168-809C9188 00A908 0020+00 1/0 0/0 0/0 .text            daNpc_grA_Execute__FPv */
 static BOOL daNpc_grA_Execute(void* i_this) {
     return ((daNpc_grA_c*)i_this)->Execute();
 }
 
-/* 809C9188-809C91A8 00A928 0020+00 1/0 0/0 0/0 .text            daNpc_grA_Draw__FPv */
 static BOOL daNpc_grA_Draw(void* i_this) {
     return ((daNpc_grA_c*)i_this)->Draw();
 }
 
-/* 809C91A8-809C91B0 00A948 0008+00 1/0 0/0 0/0 .text            daNpc_grA_IsDelete__FPv */
 static BOOL daNpc_grA_IsDelete(void* i_this) {
     return true;
 }
 
-/* 809CB1B0-809CB1D0 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grA_MethodTable */
 static actor_method_class daNpc_grA_MethodTable = {
     (process_method_func)daNpc_grA_Create,
     (process_method_func)daNpc_grA_Delete,
@@ -4250,7 +4115,6 @@ static actor_method_class daNpc_grA_MethodTable = {
     (process_method_func)daNpc_grA_Draw,
 };
 
-/* 809CB1D0-809CB200 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRA */
 extern actor_process_profile_definition g_profile_NPC_GRA = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp
index 97dd460284..5a507f7764 100644
--- a/src/d/actor/d_a_npc_grc.cpp
+++ b/src/d/actor/d_a_npc_grc.cpp
@@ -153,16 +153,13 @@ enum Event_Cut_Nums {
     /* 0x1 */ NUM_EVT_CUTS_e = 0x1,
 };
 
-/* 809CFBB4-809CFBB8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_grC_Param_c l_HIO;
 
-/* 809CF83C-809CF84C 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {BMDR_GRC_A, GRC_MDL},
     {BMDR_GRC_TW, GRC_TW},
 };
 
-/* 809CF84C-809CF8E4 000030 0098+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[19] = {
     {-1, GRC},
     {BCK_GRC_F_WAIT_A, 0},
@@ -185,7 +182,6 @@ static daNpc_GetParam1 l_bckGetParamList[19] = {
     {BCK_GRC_STEP, GRC},
 };
 
-/* 809CF8E4-809CF914 0000C8 0030+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRC_A, GRC}, 
     {BTP_GRC_F_CHEERFUL_T, GRC},
@@ -195,63 +191,50 @@ static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRC_FH_CLOSEEYE, GRC},
 };
 
-/* 809CF914-809CF91C 0000F8 0008+00 0/1 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {-1, GRC},
 };
 
-/* 809CF91C-809CF924 000100 0008+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[1] = {
     {0, GRC},
 };
 
-/* 809CF924-809CF930 000108 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRCa */
 static int l_loadRes_GRCa[3] = {
     GRC, GRC_MDL, -1,
 };
 
-/* 809CF930-809CF93C 000114 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRCa_TW */
 static int l_loadRes_GRCa_TW[3] = {
     GRC, GRC_TW, -1,
 };
 
-/* 809CF93C-809CF948 000120 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRC0 */
 static int l_loadRes_GRC0[3] = {
     GRC, GRC_MDL, -1,
 };
 
-/* 809CF948-809CF964 -00001 001C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[7] = {
     l_loadRes_GRCa, l_loadRes_GRCa_TW, l_loadRes_GRCa,
     l_loadRes_GRCa, l_loadRes_GRCa,    l_loadRes_GRCa,
     l_loadRes_GRC0,
 };
 
-/* 809CF964-809CF970 -00001 000C+00 5/7 0/0 0/0 .data            l_resNames */
 static char* l_resNames[3] = {
     "grC",
     "grC_Mdl",
     "grC_TW",
 };
 
-/* 809CF970-809CF974 000154 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL
 };
 
-/* 809CF974-809CF978 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grC";
 
-/* 809CF978-809CF97C -00001 0004+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_grC_c */
 char* daNpc_grC_c::mEvtCutNameList = "";
 
-/* 809CF97C-809CF988 000160 000C+00 1/2 0/0 0/0 .data            mEvtCutList__11daNpc_grC_c */
 daNpc_grC_c::EventFn daNpc_grC_c::mEvtCutList[1] = {NULL};
 
-/* 809CB4CC-809CB650 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_grC_cFv */
 daNpc_grC_c::daNpc_grC_c() {}
 
-/* 809CB6E0-809CB8E0 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpc_grC_cFv */
 daNpc_grC_c::~daNpc_grC_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -262,7 +245,6 @@ daNpc_grC_c::~daNpc_grC_c() {
     }
 }
 
-/* 809CF51C-809CF588 000000 006C+00 13/13 0/0 0/0 .rodata          m__17daNpc_grC_Param_c */
 daNpc_grC_HIOParam const daNpc_grC_Param_c::m = {
     40.0f,
     -3.0f,
@@ -299,7 +281,6 @@ daNpc_grC_HIOParam const daNpc_grC_Param_c::m = {
     false,
 };
 
-/* 809CB8E0-809CBBD4 000500 02F4+00 1/1 0/0 0/0 .text            create__11daNpc_grC_cFv */
 cPhs__Step daNpc_grC_c::create() {
     fopAcM_ct(this, daNpc_grC_c);
 
@@ -364,7 +345,6 @@ cPhs__Step daNpc_grC_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809CBBD4-809CBDC4 0007F4 01F0+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grC_cFv */
 int daNpc_grC_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -405,23 +385,19 @@ int daNpc_grC_c::CreateHeap() {
     return 1;
 }
 
-/* 809CBDC4-809CBDF8 0009E4 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grC_cFv */
 int daNpc_grC_c::Delete() {
     this->~daNpc_grC_c();
     return 1;
 }
 
-/* 809CBDF8-809CBE18 000A18 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_grC_cFv */
 int daNpc_grC_c::Execute() {
     return execute();
 }
 
-/* 809CBE18-809CBE8C 000A38 0074+00 1/1 0/0 0/0 .text            Draw__11daNpc_grC_cFv */
 int daNpc_grC_c::Draw() {
     return draw(chkAction(&daNpc_grC_c::test), FALSE, daNpc_grC_Param_c::m.common.real_shadow_size, NULL, FALSE);
 }
 
-/* 809CBE8C-809CC0C0 000AAC 0234+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpc_grC_cFP8J3DJointP8J3DModel */
 int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -465,13 +441,11 @@ int daNpc_grC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809CC0C0-809CC0E0 000CE0 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_grC_cFP10fopAc_ac_c */
 int daNpc_grC_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_grC_c* i_this = (daNpc_grC_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 809CC0E0-809CC12C 000D00 004C+00 2/2 0/0 0/0 .text ctrlJointCallBack__11daNpc_grC_cFP8J3DJointi */
 int daNpc_grC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -485,7 +459,6 @@ int daNpc_grC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809CC12C-809CC26C 000D4C 0140+00 1/0 0/0 0/0 .text            setParam__11daNpc_grC_cFv */
 void daNpc_grC_c::setParam() {
     ActionFn action = mNextAction;
     u32 uVar1 = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
@@ -518,7 +491,6 @@ void daNpc_grC_c::setParam() {
     gravity = daNpc_grC_Param_c::m.common.gravity;
 }
 
-/* 809CC26C-809CC3EC 000E8C 0180+00 1/0 0/0 0/0 .text            main__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -548,12 +520,10 @@ BOOL daNpc_grC_c::main() {
     return TRUE;
 }
 
-/* 809CC3EC-809CC3F4 00100C 0008+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809CC3F4-809CC930 001014 053C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grC_cFv */
 void daNpc_grC_c::setAttnPos() {
     static cXyz const eyeOffset(16.0f, 60.0f, 0.0f);
 
@@ -636,7 +606,6 @@ void daNpc_grC_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809CC930-809CCB78 001550 0248+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_grC_cFib */
 bool daNpc_grC_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -719,7 +688,6 @@ bool daNpc_grC_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 809CCB78-809CCCA4 001798 012C+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_grC_cFi */
 bool daNpc_grC_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -770,7 +738,6 @@ bool daNpc_grC_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809CCCA4-809CCCD0 0018C4 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_grC_cFif */
 void daNpc_grC_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 0xF) {
         mExpression = i_expression;
@@ -780,7 +747,6 @@ void daNpc_grC_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 809CCCD0-809CCE70 0018F0 01A0+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_grC_cFif */
 void daNpc_grC_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* i_btk = NULL;
@@ -839,7 +805,6 @@ void daNpc_grC_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 809CCE70-809CCEB4 001A90 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_grC_cFifi */
 void daNpc_grC_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 9) {
@@ -850,17 +815,14 @@ void daNpc_grC_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809CCEB4-809CCEBC 001AD4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grC_cFv */
 int daNpc_grC_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809CCEBC-809CCEC0 001ADC 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_grC_cFv */
 void daNpc_grC_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 809CCEC0-809CCF38 001AE0 0078+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_grC_cFv */
 u8 daNpc_grC_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -885,7 +847,6 @@ u8 daNpc_grC_c::getTypeFromParam() {
     }
 }
 
-/* 809CCF38-809CCFBC 001B58 0084+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::isDelete() {
     if (mType == TYPE_6 || mType == TYPE_0 || mType == TYPE_TWILIGHT || mType == TYPE_SPA &&
         /* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
@@ -897,7 +858,6 @@ BOOL daNpc_grC_c::isDelete() {
     return TRUE;
 }
 
-/* 809CCFBC-809CD1B4 001BDC 01F8+00 1/1 0/0 0/0 .text            reset__11daNpc_grC_cFv */
 void daNpc_grC_c::reset() {
     initialize();
     mLookat.initialize();
@@ -939,7 +899,6 @@ void daNpc_grC_c::reset() {
     }
 }
 
-/* 809CD1B4-809CD4AC 001DD4 02F8+00 1/1 0/0 0/0 .text            playExpression__11daNpc_grC_cFv */
 void daNpc_grC_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_A, daNpc_grC_Param_c::m.common.morf_frame, 1};
     daNpcF_anmPlayData dat0b = {ANM_F_WAIT_A, daNpc_grC_Param_c::m.common.morf_frame, 0};
@@ -987,7 +946,6 @@ void daNpc_grC_c::playExpression() {
     }
 }
 
-/* 809CD4AC-809CD794 0020CC 02E8+00 1/1 0/0 0/0 .text            playMotion__11daNpc_grC_cFv */
 void daNpc_grC_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpc_grC_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1029,12 +987,10 @@ void daNpc_grC_c::playMotion() {
     }
 }
 
-/* 809CD794-809CD7C0 0023B4 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_grC_cFM11daNpc_grC_cFPCvPvPv_i */
 BOOL daNpc_grC_c::chkAction(ActionFn action) {
     return mAction == action;
 }
 
-/* 809CD7C0-809CD868 0023E0 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_grC_cFM11daNpc_grC_cFPCvPvPv_i */
 BOOL daNpc_grC_c::setAction(ActionFn action) {
     mMode = 3;
 
@@ -1052,7 +1008,6 @@ BOOL daNpc_grC_c::setAction(ActionFn action) {
     return TRUE;
 }
 
-/* 809CD868-809CD960 002488 00F8+00 1/1 0/0 0/0 .text            selectAction__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::selectAction() {
     mNextAction = NULL;
 
@@ -1081,7 +1036,6 @@ BOOL daNpc_grC_c::selectAction() {
     return TRUE;
 }
 
-/* 809CD960-809CDA74 002580 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_grC_cFi */
 void daNpc_grC_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int i_timer;
@@ -1109,7 +1063,6 @@ void daNpc_grC_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809CDA74-809CDD50 002694 02DC+00 1/1 0/0 0/0 .text            doEvent__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -1181,14 +1134,12 @@ BOOL daNpc_grC_c::doEvent() {
     return rv;
 }
 
-/* 809CDD50-809CDD74 002970 0024+00 7/7 0/0 0/0 .text            setLookMode__11daNpc_grC_cFi */
 void daNpc_grC_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809CDD74-809CDFFC 002994 0288+00 1/1 0/0 0/0 .text            lookat__11daNpc_grC_cFv */
 void daNpc_grC_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1248,7 +1199,6 @@ void daNpc_grC_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 809CDFFC-809CE12C 002C1C 0130+00 3/3 0/0 0/0 .text            chkFindPlayer__11daNpc_grC_cFv */
 BOOL daNpc_grC_c::chkFindPlayer() {
     BOOL rv;
 
@@ -1275,7 +1225,6 @@ BOOL daNpc_grC_c::chkFindPlayer() {
     return rv;
 }
 
-/* 809CE12C-809CE1F8 002D4C 00CC+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_grC_cFv */
 void daNpc_grC_c::setExpressionTalkAfter() {
     switch (mExpression) {
         case EXPR_GRUMPY_T:
@@ -1299,7 +1248,6 @@ void daNpc_grC_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809CE1F8-809CE3A8 002E18 01B0+00 1/0 0/0 0/0 .text            wait__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1345,7 +1293,6 @@ BOOL daNpc_grC_c::wait(void* param_1) {
     return TRUE;
 }
 
-/* 809CE3A8-809CE490 002FC8 00E8+00 1/0 0/0 0/0 .text            waitTW__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::waitTW(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1368,7 +1315,6 @@ BOOL daNpc_grC_c::waitTW(void* param_1) {
     return TRUE;
 }
 
-/* 809CE490-809CE688 0030B0 01F8+00 1/0 0/0 0/0 .text            waitSpa__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::waitSpa(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1421,7 +1367,6 @@ BOOL daNpc_grC_c::waitSpa(void* param_1) {
     return TRUE;
 }
 
-/* 809CE688-809CE7C4 0032A8 013C+00 1/0 0/0 0/0 .text            waitBuyer__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::waitBuyer(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1460,7 +1405,6 @@ BOOL daNpc_grC_c::waitBuyer(void* param_1) {
     return TRUE;
 }
 
-/* 809CE7C4-809CEA6C 0033E4 02A8+00 2/0 0/0 0/0 .text            talk__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::talk(void* param_1) {
     BOOL rv = FALSE;
     BOOL bVar1 = FALSE;
@@ -1535,7 +1479,6 @@ BOOL daNpc_grC_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809CEA6C-809CEB50 00368C 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_grC_cFPv */
 BOOL daNpc_grC_c::test(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1561,7 +1504,6 @@ BOOL daNpc_grC_c::test(void* param_1) {
     return TRUE;
 }
 
-/* 809CEB50-809CEBDC 003770 008C+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_grC_cFv */
 void daNpc_grC_c::setPrtcl() {
     cXyz sp34(1.0f, 1.0f, 1.0f);
     f32 fVar1 = 1.0f;
@@ -1571,38 +1513,32 @@ void daNpc_grC_c::setPrtcl() {
     mPaPo.setEffectCenter(&tevStr, &sp40, 1, 0x40002, NULL, NULL, &sp34, fopAcM_GetRoomNo(this), fVar1, speedF);
 }
 
-/* 809CEBDC-809CEBFC 0037FC 0020+00 1/0 0/0 0/0 .text            daNpc_grC_Create__FPv */
 static int daNpc_grC_Create(void* a_this) {
     daNpc_grC_c* i_this = (daNpc_grC_c*)a_this;
     return i_this->create();
 }
 
-/* 809CEBFC-809CEC1C 00381C 0020+00 1/0 0/0 0/0 .text            daNpc_grC_Delete__FPv */
 static int daNpc_grC_Delete(void* a_this) {
     daNpc_grC_c* i_this = (daNpc_grC_c*)a_this;
     return i_this->Delete();
 }
 
-/* 809CEC1C-809CEC3C 00383C 0020+00 1/0 0/0 0/0 .text            daNpc_grC_Execute__FPv */
 static int daNpc_grC_Execute(void* a_this) {
     daNpc_grC_c* i_this = (daNpc_grC_c*)a_this;
     return i_this->Execute();
 }
 
-/* 809CEC3C-809CEC5C 00385C 0020+00 1/0 0/0 0/0 .text            daNpc_grC_Draw__FPv */
 static int daNpc_grC_Draw(void* a_this) {
     daNpc_grC_c* i_this = (daNpc_grC_c*)a_this;
     return i_this->Draw();
 }
 
-/* 809CEC5C-809CEC64 00387C 0008+00 1/0 0/0 0/0 .text            daNpc_grC_IsDelete__FPv */
 static int daNpc_grC_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 809CFA34-809CFA54 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grC_MethodTable */
 static actor_method_class daNpc_grC_MethodTable = {
     (process_method_func)daNpc_grC_Create,
     (process_method_func)daNpc_grC_Delete,
@@ -1611,7 +1547,6 @@ static actor_method_class daNpc_grC_MethodTable = {
     (process_method_func)daNpc_grC_Draw,
 };
 
-/* 809CFA54-809CFA84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRC */
 extern actor_process_profile_definition g_profile_NPC_GRC = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp
index 0dbff8170d..5e4cb8a474 100644
--- a/src/d/actor/d_a_npc_grd.cpp
+++ b/src/d/actor/d_a_npc_grd.cpp
@@ -48,21 +48,17 @@ enum Type {
     /* 0x2 */ TYPE_2,
 };
 
-/* 809D3EFC-809D3F00 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_GRD_HIO_CLASS l_HIO;
 
-/* 809D3C34-809D3C3C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[1] = {
     {11, 0},
 };
 
-/* 809D3C3C-809D3C9C 000028 0060+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[12] = {
     {-1, 0}, {6, 0},  {5, 1},  {6, 1}, {4, 1}, {8, 0},
     {7, 0},  {10, 1}, {11, 1}, {8, 1}, {7, 1}, {9, 1},
 };
 
-/* 809D3C9C-809D3CBC 000088 0020+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[4] = {
     {17, 0},
     {15, 1},
@@ -70,74 +66,61 @@ static daNpc_GetParam1 l_btpGetParamList[4] = {
     {14, 1},
 };
 
-/* 809D3CBC-809D3CC4 0000A8 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {14, 0},
 };
 
-/* 809D3CC4-809D3CCC 0000B0 0008+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[1] = {
     {0, 0},
 };
 
-/* 809D3CCC-809D3CD8 0000B8 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRD_YELIA */
 static int l_loadRes_GRD_YELIA[3] = {
     0,
     1,
     -1,
 };
 
-/* 809D3CD8-809D3CE4 0000C4 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRDa */
 static int l_loadRes_GRDa[3] = {
     0,
     1,
     -1,
 };
 
-/* 809D3CE4-809D3CF0 0000D0 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRD0 */
 static int l_loadRes_GRD0[3] = {
     0,
     -1,
     -1,
 };
 
-/* 809D3CF0-809D3CFC -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_GRD_YELIA,
     l_loadRes_GRDa,
     l_loadRes_GRD0,
 };
 
-/* 809D3CFC-809D3D04 -00001 0008+00 6/8 0/0 0/0 .data            l_resNames */
 static char* l_resNames[2] = {
     "grD",
     "grD1",
 };
 
-/* 809D3D04-809D3D08 0000F0 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL,
 };
 
-/* 809D3D08-809D3D0C -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grD";
 
-/* 809D3D0C-809D3D14 -00001 0008+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_Grd_c */
 char* daNpc_Grd_c::mEvtCutNameList[2] = {
     "",
     "NOD_TO_GRZ",
 };
 
-/* 809D3D20-809D3D38 00010C 0018+00 1/2 0/0 0/0 .data            mEvtCutList__11daNpc_Grd_c */
 daNpc_Grd_c::cutFunc daNpc_Grd_c::mEvtCutList[2] = {
     NULL,
     &daNpc_Grd_c::ECut_nodToGrz,
 };
 
-/* 809CFD2C-809CFEB0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_Grd_cFv */
 daNpc_Grd_c::daNpc_Grd_c() {}
 
-/* 809CFF40-809D0140 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpc_Grd_cFv */
 daNpc_Grd_c::~daNpc_Grd_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -148,7 +131,6 @@ daNpc_Grd_c::~daNpc_Grd_c() {
     }
 }
 
-/* 809D3A04-809D3A70 000000 006C+00 13/13 0/0 0/0 .rodata          m__17daNpc_Grd_Param_c */
 const daNpc_Grd_HIOParam daNpc_Grd_Param_c::m = {
     230.0f,   // attention_offset
     -3.0f,    // gravity
@@ -185,7 +167,6 @@ const daNpc_Grd_HIOParam daNpc_Grd_Param_c::m = {
     0,        // debug_info_ON
 };
 
-/* 809D0140-809D0414 000500 02D4+00 1/1 0/0 0/0 .text            create__11daNpc_Grd_cFv */
 int daNpc_Grd_c::create() {
     fopAcM_ct(this, daNpc_Grd_c);
 
@@ -244,7 +225,6 @@ int daNpc_Grd_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809D0414-809D069C 0007D4 0288+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Grd_cFv */
 int daNpc_Grd_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -284,26 +264,21 @@ int daNpc_Grd_c::CreateHeap() {
     return 1;
 }
 
-/* 809D0858-809D088C 000C18 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Grd_cFv */
 int daNpc_Grd_c::Delete() {
     this->~daNpc_Grd_c();
     return 1;
 }
 
-/* 809D088C-809D08AC 000C4C 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Grd_cFv */
 int daNpc_Grd_c::Execute() {
     return execute();
 }
 
-/* 809D08AC-809D093C 000C6C 0090+00 1/1 0/0 0/0 .text            Draw__11daNpc_Grd_cFv */
 int daNpc_Grd_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     return draw(chkAction(&daNpc_Grd_c::test), FALSE, mpHIO->m.common.real_shadow_size, NULL,
                 FALSE);
 }
 
-/* 809D093C-809D0B70 000CFC 0234+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_Grd_cFP8J3DJointP8J3DModel                */
 int daNpc_Grd_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int joint_no = i_joint->getJntNo();
     int lookat_joints[3] = {1, 3, 4};
@@ -346,15 +321,11 @@ int daNpc_Grd_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809D0B70-809D0B90 000F30 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Grd_cFP10fopAc_ac_c              */
 int daNpc_Grd_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_Grd_c* i_this = (daNpc_Grd_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 809D0B90-809D0BDC 000F50 004C+00 2/2 0/0 0/0 .text ctrlJointCallBack__11daNpc_Grd_cFP8J3DJointi
- */
 int daNpc_Grd_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -368,7 +339,6 @@ int daNpc_Grd_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809D0BDC-809D0D1C 000F9C 0140+00 1/0 0/0 0/0 .text            setParam__11daNpc_Grd_cFv */
 void daNpc_Grd_c::setParam() {
     actionFunc action = mNextAction;
     u32 uVar1 = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
@@ -402,7 +372,6 @@ void daNpc_Grd_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 809D0D1C-809D0E9C 0010DC 0180+00 1/0 0/0 0/0 .text            main__11daNpc_Grd_cFv */
 BOOL daNpc_Grd_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -435,7 +404,6 @@ BOOL daNpc_Grd_c::main() {
     return TRUE;
 }
 
-/* 809D0E9C-809D0F7C 00125C 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_Grd_cFv */
 BOOL daNpc_Grd_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk = NULL;
@@ -459,7 +427,6 @@ BOOL daNpc_Grd_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809D0F7C-809D14BC 00133C 0540+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Grd_cFv */
 void daNpc_Grd_c::setAttnPos() {
     static cXyz eyeOffset(20.0f, 30.0f, 0.0f);
 
@@ -542,8 +509,6 @@ void daNpc_Grd_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809D14BC-809D1670 00187C 01B4+00 1/0 0/0 0/0 .text            setExpressionAnm__11daNpc_Grd_cFib
- */
 bool daNpc_Grd_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -595,8 +560,6 @@ bool daNpc_Grd_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 809D1670-809D1794 001A30 0124+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_Grd_cFi
- */
 bool daNpc_Grd_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -641,7 +604,6 @@ bool daNpc_Grd_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809D1794-809D17C0 001B54 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_Grd_cFif */
 void daNpc_Grd_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 4) {
         mExpression = i_expression;
@@ -651,7 +613,6 @@ void daNpc_Grd_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 809D17C0-809D1940 001B80 0180+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpc_Grd_cFif */
 void daNpc_Grd_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -698,7 +659,6 @@ void daNpc_Grd_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 809D1940-809D1984 001D00 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_Grd_cFifi */
 void daNpc_Grd_c::setMotion(int param_0, f32 param_1, int param_2) {
     s16 var_r31 = param_0;
     if ((param_2 != 0 || mMotion != var_r31) && param_0 >= 0 && param_0 < 6) {
@@ -709,18 +669,14 @@ void daNpc_Grd_c::setMotion(int param_0, f32 param_1, int param_2) {
     }
 }
 
-/* 809D1984-809D198C 001D44 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Grd_cFv */
 BOOL daNpc_Grd_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 809D198C-809D1990 001D4C 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_Grd_cFv */
 void daNpc_Grd_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 809D1990-809D19B0 001D50 0020+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_Grd_cFv
- */
 u8 daNpc_Grd_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -729,7 +685,6 @@ u8 daNpc_Grd_c::getTypeFromParam() {
     return TYPE_1;
 }
 
-/* 809D19B0-809D1A1C 001D70 006C+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Grd_cFv */
 int daNpc_Grd_c::isDelete() {
     if (mType == TYPE_2 || mType == TYPE_1) {
         return FALSE;
@@ -746,7 +701,6 @@ int daNpc_Grd_c::isDelete() {
     return TRUE;
 }
 
-/* 809D1A1C-809D1B9C 001DDC 0180+00 1/1 0/0 0/0 .text            reset__11daNpc_Grd_cFv */
 void daNpc_Grd_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -776,7 +730,6 @@ void daNpc_Grd_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809D1B9C-809D1D00 001F5C 0164+00 1/1 0/0 0/0 .text            playExpression__11daNpc_Grd_cFv */
 void daNpc_Grd_c::playExpression() {
     daNpcF_anmPlayData dat0 = {ANM_UNK_1, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -800,7 +753,6 @@ void daNpc_Grd_c::playExpression() {
     }
 }
 
-/* 809D1D00-809D1F50 0020C0 0250+00 1/1 0/0 0/0 .text            playMotion__11daNpc_Grd_cFv */
 void daNpc_Grd_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_UNK_5, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -828,14 +780,10 @@ void daNpc_Grd_c::playMotion() {
     }
 }
 
-/* 809D1F50-809D1F7C 002310 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Grd_cFM11daNpc_Grd_cFPCvPvPv_i            */
 int daNpc_Grd_c::chkAction(actionFunc i_action) {
     return mAction == i_action;
 }
 
-/* 809D1F7C-809D2024 00233C 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Grd_cFM11daNpc_Grd_cFPCvPvPv_i            */
 int daNpc_Grd_c::setAction(actionFunc i_action) {
     mMode = 3;
 
@@ -853,7 +801,6 @@ int daNpc_Grd_c::setAction(actionFunc i_action) {
     return TRUE;
 }
 
-/* 809D2024-809D20A4 0023E4 0080+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Grd_cFv */
 int daNpc_Grd_c::selectAction() {
     mNextAction = NULL;
 
@@ -866,7 +813,6 @@ int daNpc_Grd_c::selectAction() {
     return TRUE;
 }
 
-/* 809D20A4-809D21B8 002464 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_Grd_cFi */
 void daNpc_Grd_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int timer;
@@ -894,7 +840,6 @@ void daNpc_Grd_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809D21B8-809D2470 002578 02B8+00 1/1 0/0 0/0 .text            doEvent__11daNpc_Grd_cFv */
 BOOL daNpc_Grd_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -959,14 +904,12 @@ BOOL daNpc_Grd_c::doEvent() {
     return rv;
 }
 
-/* 809D2470-809D2494 002830 0024+00 5/5 0/0 0/0 .text            setLookMode__11daNpc_Grd_cFi */
 void daNpc_Grd_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809D2494-809D2730 002854 029C+00 1/1 0/0 0/0 .text            lookat__11daNpc_Grd_cFv */
 void daNpc_Grd_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1027,12 +970,10 @@ void daNpc_Grd_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, snap, angle_delta, FALSE);
 }
 
-/* 809D2730-809D2768 002AF0 0038+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_Grd_cFv */
 void daNpc_Grd_c::setExpressionTalkAfter() {
     setExpression(EXPR_UNK_3, -1.0f);
 }
 
-/* 809D2768-809D2970 002B28 0208+00 1/0 0/0 0/0 .text            wait__11daNpc_Grd_cFPv */
 int daNpc_Grd_c::wait(void* param_1) {
     switch (mMode) {
     case 0:
@@ -1088,7 +1029,6 @@ int daNpc_Grd_c::wait(void* param_1) {
     return TRUE;
 }
 
-/* 809D2970-809D2B20 002D30 01B0+00 2/0 0/0 0/0 .text            talk__11daNpc_Grd_cFPv */
 int daNpc_Grd_c::talk(void* param_1) {
     BOOL rv = FALSE;
     BOOL bVar1 = FALSE;
@@ -1141,7 +1081,6 @@ int daNpc_Grd_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809D2B20-809D2C04 002EE0 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_Grd_cFPv */
 int daNpc_Grd_c::test(void* param_1) {
     switch (mMode) {
     case 0:
@@ -1166,7 +1105,6 @@ int daNpc_Grd_c::test(void* param_1) {
     return TRUE;
 }
 
-/* 809D2C04-809D2C50 002FC4 004C+00 1/1 0/0 0/0 .text            s_sub1__FPvPv */
 static void* s_sub1(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRZ) {
         return i_actor;
@@ -1175,7 +1113,6 @@ static void* s_sub1(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809D2C50-809D2C9C 003010 004C+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) {
         return i_actor;
@@ -1184,7 +1121,6 @@ static void* s_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809D2C9C-809D3058 00305C 03BC+00 1/0 0/0 0/0 .text            ECut_nodToGrz__11daNpc_Grd_cFi */
 BOOL daNpc_Grd_c::ECut_nodToGrz(int i_staffId) {
     fopAc_ac_c* actor_p;
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
@@ -1286,39 +1222,32 @@ BOOL daNpc_Grd_c::ECut_nodToGrz(int i_staffId) {
     return rv;
 }
 
-/* 809D3058-809D3078 003418 0020+00 1/0 0/0 0/0 .text            daNpc_Grd_Create__FPv */
 static int daNpc_Grd_Create(void* i_this) {
     return ((daNpc_Grd_c*)i_this)->create();
 }
 
-/* 809D3078-809D3098 003438 0020+00 1/0 0/0 0/0 .text            daNpc_Grd_Delete__FPv */
 static int daNpc_Grd_Delete(void* i_this) {
     return ((daNpc_Grd_c*)i_this)->Delete();
 }
 
-/* 809D3098-809D30B8 003458 0020+00 1/0 0/0 0/0 .text            daNpc_Grd_Execute__FPv */
 static int daNpc_Grd_Execute(void* i_this) {
     return ((daNpc_Grd_c*)i_this)->Execute();
 }
 
-/* 809D30B8-809D30D8 003478 0020+00 1/0 0/0 0/0 .text            daNpc_Grd_Draw__FPv */
 static int daNpc_Grd_Draw(void* i_this) {
     return ((daNpc_Grd_c*)i_this)->Draw();
 }
 
-/* 809D30D8-809D30E0 003498 0008+00 1/0 0/0 0/0 .text            daNpc_Grd_IsDelete__FPv */
 static int daNpc_Grd_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 809D3D74-809D3D94 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Grd_MethodTable */
 static actor_method_class daNpc_Grd_MethodTable = {
     (process_method_func)daNpc_Grd_Create,  (process_method_func)daNpc_Grd_Delete,
     (process_method_func)daNpc_Grd_Execute, (process_method_func)daNpc_Grd_IsDelete,
     (process_method_func)daNpc_Grd_Draw,
 };
 
-/* 809D3D94-809D3DC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRD */
 extern actor_process_profile_definition g_profile_NPC_GRD = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp
index 7f44d15009..cb9635f0d2 100644
--- a/src/d/actor/d_a_npc_grm.cpp
+++ b/src/d/actor/d_a_npc_grm.cpp
@@ -50,32 +50,26 @@ enum RES_Name {
     /* 0x2 */ GRA_MDL,
 };
 
-/* 809D6EB4-809D6EBC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_GRA_A, GRA_MDL},
 };
 
-/* 809D6EBC-809D6ED4 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {NULL, 0},
 };
 
-/* 809D6ED4-809D6EE0 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "grA_base",
     "grA_mdl",
 };
 
-/* 809D6EE0-809D6EE4 00004C 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {2, 1, -1};
 
-/* 809D6EE4-809D6EE8 -00001 0004+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[1] = {l_loadResPtrn0};
 
-/* 809D6EE8-809D6FC8 000054 00E0+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_GRA_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, TRUE},
     {BCK_GRA_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRA_BASE, BTP_GRA_A, J3DFrameCtrl::EMode_LOOP,
@@ -115,21 +109,18 @@ static daNpcT_motionAnmData_c l_motionAnmData[3] = {
      GRA_BASE, 0, 0},
 };
 
-/* 809D701C-809D706C 000188 0050+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = {
     {2, -1, 1}, {1, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {1, 0, 0},  {-1, 0, 0},
     {-1, 0, 0}, {7, -1, 1}, {6, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {4, -1, 0},
     {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 
 };
-/* 809D706C-809D70BC 0001D8 0050+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[20] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, 0, 0},
     {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, 0, 0},  {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809D70BC-809D70C4 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_grM_c */
 char* daNpc_grM_c::mCutNameList[2] = {
     "",
     "TALK_SPA",
@@ -140,7 +131,6 @@ daNpc_grM_c::cutFunc daNpc_grM_c::mCutList[2] = {
     &daNpc_grM_c::cutTalkSpa,
 };
 
-/* 809D406C-809D4194 0000EC 0128+00 1/0 0/0 0/0 .text            __dt__11daNpc_grM_cFv */
 daNpc_grM_c::~daNpc_grM_c() {
     deleteObject();
 
@@ -151,14 +141,12 @@ daNpc_grM_c::~daNpc_grM_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809D6D70-809D6DFC 000000 008C+00 7/7 0/0 0/0 .rodata          m__17daNpc_grM_Param_c */
 daNpc_grM_HIOParam const daNpc_grM_Param_c::m = {
     300.0f, -3.0f,  1.0f,   600.0f, 255.0f, 260.0f, 35.0f, 70.0f, 0.0f, 0.0f,  30.0f,
     -30.0f, 30.0f,  -10.0f, 20.0f,  -20.0f, 0.6f,   12.0f, 8,     6,    8,     6,
     0.0f,   0.0f,   0.0f,   0.0f,   60,     8,      0,     0,     0,    false, false,
     4.0f,   -20.0f, 0.0f,   -20.0f, 20.0f,  40.0f,  20.0f, 110.0f};
 
-/* 809D4194-809D441C 000214 0288+00 1/1 0/0 0/0 .text            create__11daNpc_grM_cFv */
 cPhs__Step daNpc_grM_c::create() {
     daNpcT_ct(this, daNpc_grM_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
               l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -210,7 +198,6 @@ cPhs__Step daNpc_grM_c::create() {
     return phase;
 }
 
-/* 809D441C-809D45C4 00049C 01A8+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grM_cFv */
 int daNpc_grM_c::CreateHeap() {
     int bmdIdx = mTwilight == true ? NONE : NONE;
 
@@ -245,13 +232,11 @@ int daNpc_grM_c::CreateHeap() {
     return 0;
 }
 
-/* 809D45C4-809D45F8 000644 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grM_cFv */
 int daNpc_grM_c::Delete() {
     this->~daNpc_grM_c();
     return 1;
 }
 
-/* 809D45F8-809D46D4 000678 00DC+00 2/2 0/0 0/0 .text            Execute__11daNpc_grM_cFv */
 int daNpc_grM_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == 0 && field_0x10dd == 0) {
         initShopSystem();
@@ -271,7 +256,6 @@ int daNpc_grM_c::Execute() {
     return 1;
 }
 
-/* 809D46D4-809D4768 000754 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_grM_cFv */
 int daNpc_grM_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -280,15 +264,11 @@ int daNpc_grM_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 809D4768-809D4788 0007E8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_grM_cFP10fopAc_ac_c              */
 int daNpc_grM_c::createHeapCallBack(fopAc_ac_c* param_0) {
     daNpc_grM_c* i_this = (daNpc_grM_c*)param_0;
     return i_this->CreateHeap();
 }
 
-/* 809D4788-809D47E0 000808 0058+00 2/2 0/0 0/0 .text ctrlJointCallBack__11daNpc_grM_cFP8J3DJointi
- */
 int daNpc_grM_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -302,12 +282,10 @@ int daNpc_grM_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809D47E0-809D47E8 000860 0008+00 1/1 0/0 0/0 .text            getType__11daNpc_grM_cFv */
 bool daNpc_grM_c::getType() {
     return false;
 }
 
-/* 809D47E8-809D4804 000868 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__11daNpc_grM_cFv */
 int daNpc_grM_c::getFlowNodeNo() {
     u16 rv = home.angle.x;
 
@@ -318,17 +296,14 @@ int daNpc_grM_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 809D4804-809D4810 000884 000C+00 1/1 0/0 0/0 .text            getMaxNumItem__11daNpc_grM_cFv */
 u8 daNpc_grM_c::getMaxNumItem() {
     return (fopAcM_GetParam(this) & 0xF000000) >> 24;
 }
 
-/* 809D4810-809D4820 000890 0010+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grM_cFv */
 BOOL daNpc_grM_c::isDelete() {
     return mType ? 1 : 0;
 }
 
-/* 809D4820-809D4944 0008A0 0124+00 1/1 0/0 0/0 .text            reset__11daNpc_grM_cFv */
 void daNpc_grM_c::reset() {
     initialize();
     int size = (u8*)&field_0x10e0 - (u8*)&mNextAction;
@@ -339,7 +314,6 @@ void daNpc_grM_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 809D4944-809D49D0 0009C4 008C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_grM_cFi */
 void daNpc_grM_c::afterJntAnm(int param_0) {
     if (param_0 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -350,7 +324,6 @@ void daNpc_grM_c::afterJntAnm(int param_0) {
     }
 }
 
-/* 809D49D0-809D4B24 000A50 0154+00 1/0 0/0 0/0 .text            setParam__11daNpc_grM_cFv */
 void daNpc_grM_c::setParam() {
     u32 uVar1 = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 
@@ -396,8 +369,6 @@ void daNpc_grM_c::setParam() {
     mMorfFrames = daNpc_grM_Param_c::m.common.morf_frame;
 }
 
-/* 809D4B24-809D4BB8 000BA4 0094+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_grM_cFv
- */
 void daNpc_grM_c::setAfterTalkMotion() {
     int i_index;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -415,12 +386,10 @@ void daNpc_grM_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 809D4BB8-809D4BBC 000C38 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_grM_cFv */
 void daNpc_grM_c::srchActors() {
     /* empty function */
 }
 
-/* 809D4BBC-809D4E2C 000C3C 0270+00 1/0 0/0 0/0 .text            evtProc__11daNpc_grM_cFv */
 BOOL daNpc_grM_c::evtProc() {
     BOOL ret = FALSE;
 #if VERSION != VERSION_SHIELD_DEBUG
@@ -491,7 +460,6 @@ BOOL daNpc_grM_c::evtProc() {
 
     return ret;
 }
-/* 809D4E2C-809D4FD0 000EAC 01A4+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_grM_cFv */
 BOOL daNpc_grM_c::evtTalk() {
     if (field_0x10dd != 0) {
         if (chkAction(&daNpc_grM_c::shop)) {
@@ -509,7 +477,6 @@ BOOL daNpc_grM_c::evtTalk() {
     return TRUE;
 }
 
-/* 809D4FD0-809D5098 001050 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_grM_cFv */
 BOOL daNpc_grM_c::evtCutProc() {
     BOOL rv = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("grM", this, -1);
@@ -527,7 +494,6 @@ BOOL daNpc_grM_c::evtCutProc() {
     return rv;
 }
 
-/* 809D5098-809D51F4 001118 015C+00 1/0 0/0 0/0 .text            action__11daNpc_grM_cFv */
 void daNpc_grM_c::action() {
     if (field_0x10dd == 0) {
         fopAc_ac_c* actor_p = hitChk(&mCyl, -1);
@@ -553,14 +519,12 @@ void daNpc_grM_c::action() {
     }
 }
 
-/* 809D51F4-809D526C 001274 0078+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_grM_cFv */
 void daNpc_grM_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 809D526C-809D54C8 0012EC 025C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grM_cFv */
 void daNpc_grM_c::setAttnPos() {
     cXyz sp48(0.0f, 30.0f, 0.0f);
 
@@ -589,7 +553,6 @@ void daNpc_grM_c::setAttnPos() {
     attention_info.position.y += daNpc_grM_Param_c::m.common.attention_offset;
 }
 
-/* 809D54C8-809D55F8 001548 0130+00 1/0 0/0 0/0 .text            setCollision__11daNpc_grM_cFv */
 void daNpc_grM_c::setCollision() {
     cXyz pos;
     if (!mHide) {
@@ -621,12 +584,10 @@ void daNpc_grM_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 809D55F8-809D5600 001678 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grM_cFv */
 int daNpc_grM_c::drawDbgInfo() {
     return false;
 }
 
-/* 809D5600-809D5660 001680 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__11daNpc_grM_cFv */
 void daNpc_grM_c::drawOtherMdl() {
     if (field_0x10dd != 0) {
         cXyz sp18;
@@ -637,21 +598,16 @@ void daNpc_grM_c::drawOtherMdl() {
     }
 }
 
-/* 809D5660-809D56A8 0016E0 0048+00 1/1 0/0 0/0 .text            selectAction__11daNpc_grM_cFv */
 BOOL daNpc_grM_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_grM_c::tend;
     return TRUE;
 }
 
-/* 809D56A8-809D56D4 001728 002C+00 1/1 0/0 0/0 .text
- * chkAction__11daNpc_grM_cFM11daNpc_grM_cFPCvPvPv_i            */
 BOOL daNpc_grM_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809D56D4-809D577C 001754 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_grM_cFM11daNpc_grM_cFPCvPvPv_i            */
 BOOL daNpc_grM_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -669,7 +625,6 @@ BOOL daNpc_grM_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809D577C-809D58F4 0017FC 0178+00 1/0 0/0 0/0 .text            cutTalkSpa__11daNpc_grM_cFi */
 int daNpc_grM_c::cutTalkSpa(int param_1) {
     int uVar4 = 0;
     int iVar3 = -1;
@@ -711,7 +666,6 @@ int daNpc_grM_c::cutTalkSpa(int param_1) {
     return uVar4;
 }
 
-/* 809D58F4-809D5AAC 001974 01B8+00 2/0 0/0 0/0 .text            tend__11daNpc_grM_cFPv */
 int daNpc_grM_c::tend(void* param_0) {
     BOOL bVar1;
 
@@ -749,7 +703,6 @@ int daNpc_grM_c::tend(void* param_0) {
     return 1;
 }
 
-/* 809D5AAC-809D5C30 001B2C 0184+00 2/0 0/0 0/0 .text            talk__11daNpc_grM_cFPv */
 int daNpc_grM_c::talk(void* param_0) {
     BOOL bVar1 = FALSE;
 
@@ -788,7 +741,6 @@ int daNpc_grM_c::talk(void* param_0) {
     return 0;
 }
 
-/* 809D5C30-809D5D50 001CB0 0120+00 2/0 0/0 0/0 .text            shop__11daNpc_grM_cFPv */
 int daNpc_grM_c::shop(void* param_0) {
     switch (mMode) {
     case 0:
@@ -822,42 +774,34 @@ int daNpc_grM_c::shop(void* param_0) {
     return 0;
 }
 
-/* 809D5D50-809D5D70 001DD0 0020+00 1/0 0/0 0/0 .text            daNpc_grM_Create__FPv */
 static cPhs__Step daNpc_grM_Create(void* param_0) {
     return static_cast<daNpc_grM_c*>(param_0)->create();
 }
 
-/* 809D5D70-809D5D90 001DF0 0020+00 1/0 0/0 0/0 .text            daNpc_grM_Delete__FPv */
 static int daNpc_grM_Delete(void* param_0) {
     return static_cast<daNpc_grM_c*>(param_0)->Delete();
 }
 
-/* 809D5D90-809D5DB0 001E10 0020+00 1/0 0/0 0/0 .text            daNpc_grM_Execute__FPv */
 static int daNpc_grM_Execute(void* param_0) {
     return static_cast<daNpc_grM_c*>(param_0)->Execute();
 }
 
-/* 809D5DB0-809D5DD0 001E30 0020+00 1/0 0/0 0/0 .text            daNpc_grM_Draw__FPv */
 static int daNpc_grM_Draw(void* param_0) {
     return static_cast<daNpc_grM_c*>(param_0)->Draw();
 }
 
-/* 809D5DD0-809D5DD8 001E50 0008+00 1/0 0/0 0/0 .text            daNpc_grM_IsDelete__FPv */
 static BOOL daNpc_grM_IsDelete(void* param_0) {
     return TRUE;
 }
 
-/* 809D7304-809D7308 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_grM_Param_c l_HIO;
 
-/* 809D7130-809D7150 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grM_MethodTable */
 static actor_method_class daNpc_grM_MethodTable = {
     (process_method_func)daNpc_grM_Create,  (process_method_func)daNpc_grM_Delete,
     (process_method_func)daNpc_grM_Execute, (process_method_func)daNpc_grM_IsDelete,
     (process_method_func)daNpc_grM_Draw,
 };
 
-/* 809D7150-809D7180 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRM */
 extern actor_process_profile_definition g_profile_NPC_GRM = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp
index c675c2d428..4b43840afe 100644
--- a/src/d/actor/d_a_npc_grmc.cpp
+++ b/src/d/actor/d_a_npc_grmc.cpp
@@ -74,33 +74,27 @@ enum Motion {
     /* 0x8 */ MOT_SAD_WAIT = 0x8,
 };
 
-/* 809D9EAC-809D9EB4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_GRC_A, GRC_MDL},
 };  
 
-/* 809D9EB4-809D9EC4 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
 };
 
-/* 809D9EC4-809D9ED0 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "grC",
     "grC_Mdl",
 };
 
-/* 809D9ED0-809D9ED4 000044 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     1, 2, -1,
 };
 
-/* 809D9ED4-809D9ED8 -00001 0004+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[1] = {l_loadResPtrn0};
 
-/* 809D9ED8-809D9FD4 00004C 00FC+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = {
     {-1, 0, J3DFrameCtrl::EMode_NONE, BTP_GRC_A, J3DFrameCtrl::EMode_LOOP, GRC, 1},
     {BCK_GRC_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRC, BTP_GRC_A, J3DFrameCtrl::EMode_LOOP, GRC, 1},
@@ -113,7 +107,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[9] = {
     {BCK_GRC_F_SAD_TALK, J3DFrameCtrl::EMode_NONE, GRC, BTP_GRC_F_SAD_TALK, J3DFrameCtrl::EMode_NONE, GRC, 1},
 };
 
-/* 809D9FD4-809DA0D0 000148 00FC+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[9] = {
     {BCK_GRC_WAIT_A, J3DFrameCtrl::EMode_LOOP, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0},
     {BCK_GRC_TALK_A, J3DFrameCtrl::EMode_LOOP, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0},
@@ -126,7 +119,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[9] = {
     {BCK_GRC_STEP, J3DFrameCtrl::EMode_NONE, GRC, BTK_GRC_A, J3DFrameCtrl::EMode_NONE, GRC, 0, 0},
 };
 
-/* 809DA0D0-809DA1B0 000244 00E0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {
     {5, -1, 1}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {6, -1, 1}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -144,7 +136,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] =
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809DA1B0-809DA240 000324 0090+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {6, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -157,15 +148,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 809DA240-809DA244 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_grMC_c */
 char* daNpc_grMC_c::mCutNameList = "";
 
-/* 809DA244-809DA250 0003B8 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_grMC_c */
 daNpc_grMC_c::cutFunc daNpc_grMC_c::mCutList[1] = {
     NULL,
 };
 
-/* 809D740C-809D7534 0000EC 0128+00 1/0 0/0 0/0 .text            __dt__12daNpc_grMC_cFv */
 daNpc_grMC_c::~daNpc_grMC_c() {
     deleteObject();
 
@@ -176,7 +164,6 @@ daNpc_grMC_c::~daNpc_grMC_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 809D9D70-809D9DFC 000000 008C+00 8/8 0/0 0/0 .rodata          m__18daNpc_grMC_Param_c */
 daNpc_grMC_HIOParam const daNpc_grMC_Param_c::m = {
     140.0f,
     -3.0f,
@@ -221,7 +208,6 @@ daNpc_grMC_HIOParam const daNpc_grMC_Param_c::m = {
     110.0f
 };
 
-/* 809D7534-809D77BC 000214 0288+00 1/1 0/0 0/0 .text            create__12daNpc_grMC_cFv */
 cPhs__Step daNpc_grMC_c::create() {
     daNpcT_ct(this, daNpc_grMC_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
                        l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -273,7 +259,6 @@ cPhs__Step daNpc_grMC_c::create() {
     return phase;
 }
 
-/* 809D77BC-809D79BC 00049C 0200+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_grMC_cFv */
 int daNpc_grMC_c::CreateHeap() {
     int bmdIdx = mTwilight == true ? NONE : NONE;
     
@@ -308,13 +293,11 @@ int daNpc_grMC_c::CreateHeap() {
     return 0;
 }
 
-/* 809D79BC-809D79F0 00069C 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_grMC_cFv */
 int daNpc_grMC_c::Delete() {
     this->~daNpc_grMC_c();
     return 1;
 }
 
-/* 809D79F0-809D7AD4 0006D0 00E4+00 2/2 0/0 0/0 .text            Execute__12daNpc_grMC_cFv */
 int daNpc_grMC_c::Execute() {
     if (!mCreating && !checkShopOpen() && mType == 0 && field_0x10dd == 0) {
         initShopSystem();
@@ -335,7 +318,6 @@ int daNpc_grMC_c::Execute() {
     return 1;
 }
 
-/* 809D7AD4-809D7B18 0007B4 0044+00 1/1 0/0 0/0 .text            Draw__12daNpc_grMC_cFv */
 int daNpc_grMC_c::Draw() {
     return draw(
         #ifdef DEBUG
@@ -347,13 +329,11 @@ int daNpc_grMC_c::Draw() {
     );
 }
 
-/* 809D7B18-809D7B38 0007F8 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_grMC_cFP10fopAc_ac_c */
 int daNpc_grMC_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_grMC_c* i_this = (daNpc_grMC_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 809D7B38-809D7B90 000818 0058+00 2/2 0/0 0/0 .text            ctrlJointCallBack__12daNpc_grMC_cFP8J3DJointi */
 int daNpc_grMC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -367,12 +347,10 @@ int daNpc_grMC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809D7B90-809D7B98 000870 0008+00 1/1 0/0 0/0 .text            getType__12daNpc_grMC_cFv */
 u8 daNpc_grMC_c::getType() {
     return 0;
 }
 
-/* 809D7B98-809D7BB4 000878 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_grMC_cFv */
 int daNpc_grMC_c::getFlowNodeNo() {
     u16 rv = home.angle.x;
 
@@ -383,12 +361,10 @@ int daNpc_grMC_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 809D7BB4-809D7BC0 000894 000C+00 1/1 0/0 0/0 .text            getMaxNumItem__12daNpc_grMC_cFv */
 u8 daNpc_grMC_c::getMaxNumItem() {
     return (fopAcM_GetParam(this) & 0xF000000) >> 24;
 }
 
-/* 809D7BC0-809D7C34 0008A0 0074+00 1/1 0/0 0/0 .text            isDelete__12daNpc_grMC_cFv */
 BOOL daNpc_grMC_c::isDelete() {
     if (mType == 0 && 
         /* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
@@ -400,7 +376,6 @@ BOOL daNpc_grMC_c::isDelete() {
     return TRUE;
 }
 
-/* 809D7C34-809D7D48 000914 0114+00 1/1 0/0 0/0 .text            reset__12daNpc_grMC_cFv */
 void daNpc_grMC_c::reset() {
     initialize();
     int size = (u8*)&field_0x10e0 - (u8*)&mNextAction;
@@ -408,7 +383,6 @@ void daNpc_grMC_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 809D7D48-809D7DD4 000A28 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_grMC_cFi */
 void daNpc_grMC_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -419,7 +393,6 @@ void daNpc_grMC_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 809D7DD4-809D7F28 000AB4 0154+00 1/0 0/0 0/0 .text            setParam__12daNpc_grMC_cFv */
 void daNpc_grMC_c::setParam() {
     u32 uVar1 = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 
@@ -462,7 +435,6 @@ void daNpc_grMC_c::setParam() {
     mMorfFrames = daNpc_grMC_Param_c::m.common.morf_frame;
 }
 
-/* 809D7F28-809D7FCC 000C08 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_grMC_cFv */
 void daNpc_grMC_c::setAfterTalkMotion() {
     int i_index;
 
@@ -487,12 +459,10 @@ void daNpc_grMC_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 809D7FCC-809D7FD0 000CAC 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_grMC_cFv */
 void daNpc_grMC_c::srchActors() {
     /* empty function */
 }
 
-/* 809D7FD0-809D8174 000CB0 01A4+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_grMC_cFv */
 BOOL daNpc_grMC_c::evtTalk() {
     if (field_0x10dd != 0) {
         if (chkAction(&daNpc_grMC_c::shop)) {
@@ -510,7 +480,6 @@ BOOL daNpc_grMC_c::evtTalk() {
     return TRUE;
 }
 
-/* 809D8174-809D823C 000E54 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_grMC_cFv */
 BOOL daNpc_grMC_c::evtCutProc() {
     BOOL rv = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("grMC", this, -1);
@@ -528,7 +497,6 @@ BOOL daNpc_grMC_c::evtCutProc() {
     return rv;
 }
 
-/* 809D823C-809D8398 000F1C 015C+00 1/0 0/0 0/0 .text            action__12daNpc_grMC_cFv */
 void daNpc_grMC_c::action() {
     if (field_0x10dd == 0) {
         fopAc_ac_c* actor_p = hitChk(&mCyl, -1);
@@ -554,14 +522,12 @@ void daNpc_grMC_c::action() {
     }
 }
 
-/* 809D8398-809D8410 001078 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_grMC_cFv */
 void daNpc_grMC_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 809D8410-809D8670 0010F0 0260+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_grMC_cFv */
 void daNpc_grMC_c::setAttnPos() {
     cXyz sp48(18.0f, 30.0f, 0.0f);
     
@@ -588,7 +554,6 @@ void daNpc_grMC_c::setAttnPos() {
     attention_info.position.y += daNpc_grMC_Param_c::m.common.attention_offset;
 }
 
-/* 809D8670-809D87A0 001350 0130+00 1/0 0/0 0/0 .text            setCollision__12daNpc_grMC_cFv */
 void daNpc_grMC_c::setCollision() {
     cXyz pos;
 
@@ -621,12 +586,10 @@ void daNpc_grMC_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 809D87A0-809D87A8 001480 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_grMC_cFv */
 int daNpc_grMC_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809D87A8-809D8808 001488 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_grMC_cFv */
 void daNpc_grMC_c::drawOtherMdl() {
     if (field_0x10dd != 0) {
         cXyz sp18;
@@ -637,19 +600,16 @@ void daNpc_grMC_c::drawOtherMdl() {
     }
 }
 
-/* 809D8808-809D8850 0014E8 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_grMC_cFv */
 BOOL daNpc_grMC_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_grMC_c::tend;
     return TRUE;
 }
 
-/* 809D8850-809D887C 001530 002C+00 1/1 0/0 0/0 .text            chkAction__12daNpc_grMC_cFM12daNpc_grMC_cFPCvPvPv_i */
 BOOL daNpc_grMC_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809D887C-809D8924 00155C 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_grMC_cFM12daNpc_grMC_cFPCvPvPv_i */
 BOOL daNpc_grMC_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -667,7 +627,6 @@ BOOL daNpc_grMC_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809D8924-809D8AE8 001604 01C4+00 2/0 0/0 0/0 .text            tend__12daNpc_grMC_cFPv */
 int daNpc_grMC_c::tend(void* param_1) {
     BOOL bVar1;
 
@@ -707,7 +666,6 @@ int daNpc_grMC_c::tend(void* param_1) {
     return 1;
 }
 
-/* 809D8AE8-809D8C6C 0017C8 0184+00 2/0 0/0 0/0 .text            talk__12daNpc_grMC_cFPv */
 int daNpc_grMC_c::talk(void* param_1) {
     BOOL bVar1 = FALSE;
 
@@ -746,7 +704,6 @@ int daNpc_grMC_c::talk(void* param_1) {
     return 0;
 }
 
-/* 809D8C6C-809D8D8C 00194C 0120+00 2/0 0/0 0/0 .text            shop__12daNpc_grMC_cFPv */
 int daNpc_grMC_c::shop(void* param_1) {
     switch (mMode) {
         case 0:
@@ -806,35 +763,28 @@ int daNpc_grMC_c::test(void* param_1) {
 }
 #endif
 
-/* 809D8D8C-809D8DAC 001A6C 0020+00 1/0 0/0 0/0 .text            daNpc_grMC_Create__FPv */
 static int daNpc_grMC_Create(void* a_this) {
     return static_cast<daNpc_grMC_c*>(a_this)->create();
 }
 
-/* 809D8DAC-809D8DCC 001A8C 0020+00 1/0 0/0 0/0 .text            daNpc_grMC_Delete__FPv */
 static int daNpc_grMC_Delete(void* a_this) {
     return static_cast<daNpc_grMC_c*>(a_this)->Delete();
 }
 
-/* 809D8DCC-809D8DEC 001AAC 0020+00 1/0 0/0 0/0 .text            daNpc_grMC_Execute__FPv */
 static int daNpc_grMC_Execute(void* a_this) {
     return static_cast<daNpc_grMC_c*>(a_this)->Execute();
 }
 
-/* 809D8DEC-809D8E0C 001ACC 0020+00 1/0 0/0 0/0 .text            daNpc_grMC_Draw__FPv */
 static int daNpc_grMC_Draw(void* a_this) {
     return static_cast<daNpc_grMC_c*>(a_this)->Draw();
 }
 
-/* 809D8E0C-809D8E14 001AEC 0008+00 1/0 0/0 0/0 .text            daNpc_grMC_IsDelete__FPv */
 static int daNpc_grMC_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 809DA46C-809DA470 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_grMC_Param_c l_HIO;
 
-/* 809DA298-809DA2B8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grMC_MethodTable */
 static actor_method_class daNpc_grMC_MethodTable = {
     (process_method_func)daNpc_grMC_Create,
     (process_method_func)daNpc_grMC_Delete,
@@ -843,7 +793,6 @@ static actor_method_class daNpc_grMC_MethodTable = {
     (process_method_func)daNpc_grMC_Draw,
 };
 
-/* 809DA2B8-809DA2E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRMC */
 extern actor_process_profile_definition g_profile_NPC_GRMC = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp
index 72fc20bdf4..e7a9d12317 100644
--- a/src/d/actor/d_a_npc_gro.cpp
+++ b/src/d/actor/d_a_npc_gro.cpp
@@ -190,21 +190,18 @@ enum Mode {
     /* 0x3 */ MODE_EXIT,
 };
 
-/* 809DF74C-809DF750 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_GRO_HIO_CLASS l_HIO;
 
 daNpc_Maro_c::actionFunc dummy_lit_3931() {
     return &daNpc_Maro_c::choccai;
 }
 
-/* 809DF324-809DF33C 00002C 0018+00 0/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[3] = {
     {BMDR_GRO_A, GRO},
     {BMDR_GRO_PIPE, GRO},
     {BMDR_MARO_BOKIN, GRO1},
 };
 
-/* 809DF33C-809DF3F4 000044 00B8+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[23] = {
     {-1, GRO},
     {BCK_GRO_F_WAIT_A, GRO},
@@ -231,7 +228,6 @@ static daNpc_GetParam1 l_bckGetParamList[23] = {
     {BCK_GRO_SWING, GRO1},
 };
 
-/* 809DF3F4-809DF424 0000FC 0030+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRO_A, GRO},
     {BTP_GRO_F_TALK_B, GRO},
@@ -241,39 +237,32 @@ static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRO_F_BOW, GRO1},
 };
 
-/* 809DF424-809DF42C 00012C 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {BTK_GRO_A, GRO},
 };
 
-/* 809DF42C-809DF444 000134 0018+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[3] = {
     {0, GRO},
     {1, GRO1D},
     {2, GRO},
 };
 
-/* 809DF444-809DF454 00014C 0010+00 1/0 0/0 0/0 .data            l_loadRes_GROa */
 static int l_loadRes_GROa[4] = {
     GRO, -1, -1, -1,
 };
 
-/* 809DF454-809DF464 00015C 0010+00 1/0 0/0 0/0 .data            l_loadRes_GRO_BOKIN */
 static int l_loadRes_GRO_BOKIN[4] = {
     GRO, GRO1, GRO1D, -1,
 };
 
-/* 809DF464-809DF474 00016C 0010+00 1/0 0/0 0/0 .data            l_loadRes_GRO_MARO */
 static int l_loadRes_GRO_MARO[4] = {
     GRO, GRO1, -1, -1,
 };
 
-/* 809DF474-809DF484 00017C 0010+00 1/0 0/0 0/0 .data            l_loadRes_GRO0 */
 static int l_loadRes_GRO0[4] = {
     GRO, -1, -1, -1,
 };
 
-/* 809DF484-809DF494 -00001 0010+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[4] = {
     l_loadRes_GROa,
     l_loadRes_GRO_BOKIN,
@@ -281,27 +270,23 @@ static int* l_loadRes_list[4] = {
     l_loadRes_GRO0,
 };
 
-/* 809DF494-809DF4A4 00019C 0010+00 0/1 0/0 0/0 .data            l_loadObj_list */
 static int l_loadObj_list[2][2] = {
     {1, 2},
     {-1, 1},
 };
 
-/* 809DF4A4-809DF4B0 -00001 000C+00 5/9 0/0 0/0 .data            l_resNames */
 static char* l_resNames[3] = {
     "grO",
     "grO1",
     "grO1D",
 };
 
-/* 809DF4B0-809DF4BC -00001 000C+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[3] = {
     NULL,
     "BOKIN_FINISH",
     "PUSHOUT",
 };
 
-/* 809DF4BC-809DF4C0 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grO";
 
 #if DEBUG
@@ -339,24 +324,20 @@ void daNpc_grO_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 809DF4C0-809DF4CC -00001 000C+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_grO_c */
 char* daNpc_grO_c::mEvtCutNameList[3] = {
     "",
     "BOKIN_FINISH",
     "PUSHOUT",
 };
 
-/* 809DF4E4-809DF508 0001EC 0024+00 0/2 0/0 0/0 .data            mEvtCutList__11daNpc_grO_c */
 daNpc_grO_c::cutFunc daNpc_grO_c::mEvtCutList[3] = {
     NULL,
     &daNpc_grO_c::ECut_bokinFinish,
     &daNpc_grO_c::cutPushOut,
 };
 
-/* 809DA56C-809DA6F0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_grO_cFv */
 daNpc_grO_c::daNpc_grO_c() {}
 
-/* 809DA780-809DA980 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpc_grO_cFv */
 daNpc_grO_c::~daNpc_grO_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -373,7 +354,6 @@ daNpc_grO_c::~daNpc_grO_c() {
     #endif
 }
 
-/* 809DEF7C-809DEFE8 000000 006C+00 14/14 0/0 0/0 .rodata          m__17daNpc_grO_Param_c */
 daNpc_grO_HIOParam const daNpc_grO_Param_c::m = {
     160.0f,
     -3.0f,
@@ -410,7 +390,6 @@ daNpc_grO_HIOParam const daNpc_grO_Param_c::m = {
     false,
 };
 
-/* 809DA980-809DAC58 000500 02D8+00 1/1 0/0 0/0 .text            create__11daNpc_grO_cFv */
 cPhs__Step daNpc_grO_c::create() {
     fopAcM_ct(this, daNpc_grO_c);
 
@@ -481,7 +460,6 @@ cPhs__Step daNpc_grO_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809DAC58-809DAF74 0007D8 031C+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grO_cFv */
 int daNpc_grO_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -539,26 +517,22 @@ int daNpc_grO_c::CreateHeap() {
     return 1;
 }
 
-/* 809DB130-809DB164 000CB0 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grO_cFv */
 int daNpc_grO_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_grO_c();
     return 1;
 }
 
-/* 809DB164-809DB184 000CE4 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_grO_cFv */
 int daNpc_grO_c::Execute() {
     return execute();
 }
 
-/* 809DB184-809DB214 000D04 0090+00 1/1 0/0 0/0 .text            Draw__11daNpc_grO_cFv */
 int daNpc_grO_c::Draw() {
     J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
     mdlData_p->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     return draw(chkAction(&daNpc_grO_c::test), FALSE, mpHIO->m.common.real_shadow_size, NULL, FALSE);
 }
 
-/* 809DB214-809DB448 000D94 0234+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpc_grO_cFP8J3DJointP8J3DModel */
 int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -602,13 +576,11 @@ int daNpc_grO_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809DB448-809DB468 000FC8 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_grO_cFP10fopAc_ac_c */
 int daNpc_grO_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_grO_c* actor = (daNpc_grO_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 809DB468-809DB4B4 000FE8 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_grO_cFP8J3DJointi */
 int daNpc_grO_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -622,7 +594,6 @@ int daNpc_grO_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809DB4B4-809DB5F4 001034 0140+00 1/0 0/0 0/0 .text            setParam__11daNpc_grO_cFv */
 void daNpc_grO_c::setParam() {
     actionFunc action = mNextAction;
     u32 flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
@@ -659,7 +630,6 @@ void daNpc_grO_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 809DB5F4-809DB774 001174 0180+00 1/0 0/0 0/0 .text            main__11daNpc_grO_cFv */
 BOOL daNpc_grO_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -689,7 +659,6 @@ BOOL daNpc_grO_c::main() {
     return TRUE;
 }
 
-/* 809DB774-809DB854 0012F4 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_grO_cFv */
 BOOL daNpc_grO_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk = NULL;
@@ -712,7 +681,6 @@ BOOL daNpc_grO_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809DB854-809DBD58 0013D4 0504+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grO_cFv */
 void daNpc_grO_c::setAttnPos() {
     static cXyz eyeOffset(30.0f, 10.0f, 0.0f);
 
@@ -796,7 +764,6 @@ void daNpc_grO_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809DBD58-809DBFF4 0018D8 029C+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_grO_cFib */
 bool daNpc_grO_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -891,7 +858,6 @@ bool daNpc_grO_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 809DBFF4-809DC118 001B74 0124+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_grO_cFi */
 bool daNpc_grO_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -943,7 +909,6 @@ bool daNpc_grO_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809DC118-809DC144 001C98 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_grO_cFif */
 void daNpc_grO_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 13) {
         mExpression = i_expression;
@@ -953,7 +918,6 @@ void daNpc_grO_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 809DC144-809DC2E4 001CC4 01A0+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_grO_cFif */
 void daNpc_grO_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* i_btk = NULL;
@@ -1015,7 +979,6 @@ void daNpc_grO_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 809DC2E4-809DC328 001E64 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_grO_cFifi */
 void daNpc_grO_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 9) {
@@ -1026,7 +989,6 @@ void daNpc_grO_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809DC328-809DC330 001EA8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grO_cFv */
 int daNpc_grO_c::drawDbgInfo() {
     #if DEBUG
     if (mpHIO->m.common.debug_info_ON) {
@@ -1065,7 +1027,6 @@ int daNpc_grO_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809DC330-809DC3DC 001EB0 00AC+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_grO_cFv */
 void daNpc_grO_c::drawOtherMdls() {
     for (int i = 0; i < 1; i++) {
         J3DModel* mdl_p = mpOtherModel[i];
@@ -1080,7 +1041,6 @@ void daNpc_grO_c::drawOtherMdls() {
     }
 }
 
-/* 809DC3DC-809DC43C 001F5C 0060+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_grO_cFv */
 u8 daNpc_grO_c::getTypeFromParam() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -1100,7 +1060,6 @@ u8 daNpc_grO_c::getTypeFromParam() {
     }
 }
 
-/* 809DC43C-809DC4F4 001FBC 00B8+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grO_cFv */
 BOOL daNpc_grO_c::isDelete() {
     /* 
         Delete actor if:
@@ -1127,7 +1086,6 @@ BOOL daNpc_grO_c::isDelete() {
     return TRUE;
 }
 
-/* 809DC4F4-809DC67C 002074 0188+00 1/1 0/0 0/0 .text            reset__11daNpc_grO_cFv */
 void daNpc_grO_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -1158,7 +1116,6 @@ void daNpc_grO_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809DC67C-809DCA68 0021FC 03EC+00 1/1 0/0 0/0 .text            playExpression__11daNpc_grO_cFv */
 void daNpc_grO_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_A, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData dat0b = {ANM_F_WAIT_A, mpHIO->m.common.morf_frame, 0};
@@ -1212,7 +1169,6 @@ void daNpc_grO_c::playExpression() {
     }
 }
 
-/* 809DCA68-809DCDA4 0025E8 033C+00 1/1 0/0 0/0 .text            playMotion__11daNpc_grO_cFv */
 void daNpc_grO_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1258,12 +1214,10 @@ void daNpc_grO_c::playMotion() {
     }
 }
 
-/* 809DCDA4-809DCDD0 002924 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_grO_cFM11daNpc_grO_cFPCvPvPv_i */
 BOOL daNpc_grO_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809DCDD0-809DCE78 002950 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_grO_cFM11daNpc_grO_cFPCvPvPv_i */
 BOOL daNpc_grO_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1281,7 +1235,6 @@ BOOL daNpc_grO_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809DCE78-809DCF44 0029F8 00CC+00 1/1 0/0 0/0 .text            selectAction__11daNpc_grO_cFv */
 BOOL daNpc_grO_c::selectAction() {
     mNextAction = NULL;
 
@@ -1307,7 +1260,6 @@ BOOL daNpc_grO_c::selectAction() {
     return TRUE;
 }
 
-/* 809DCF44-809DD070 002AC4 012C+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_grO_cFi */
 void daNpc_grO_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int timer = mCutType == daPy_py_c::CUT_TYPE_TURN_RIGHT ? 20 : mpHIO->m.common.damage_time;
@@ -1333,7 +1285,6 @@ void daNpc_grO_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809DD070-809DD3D8 002BF0 0368+00 1/1 0/0 0/0 .text            doEvent__11daNpc_grO_cFv */
 BOOL daNpc_grO_c::doEvent() {
     int evtCutNo = 0;
     BOOL rv = FALSE;
@@ -1422,14 +1373,12 @@ BOOL daNpc_grO_c::doEvent() {
     return rv;
 }
 
-/* 809DD3D8-809DD3FC 002F58 0024+00 9/9 0/0 0/0 .text            setLookMode__11daNpc_grO_cFi */
 void daNpc_grO_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809DD3FC-809DD684 002F7C 0288+00 1/1 0/0 0/0 .text            lookat__11daNpc_grO_cFv */
 void daNpc_grO_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1489,7 +1438,6 @@ void daNpc_grO_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 809DD684-809DD758 003204 00D4+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_grO_cFv */
 void daNpc_grO_c::setExpressionTalkAfter() {
     switch (mExpression) {
         case EXPR_TALK_A:
@@ -1517,7 +1465,6 @@ void daNpc_grO_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809DD758-809DD960 0032D8 0208+00 1/0 0/0 0/0 .text            wait__11daNpc_grO_cFPv */
 int daNpc_grO_c::wait(void* param_1) {
     switch (mMode) {
         case MODE_INIT:
@@ -1571,7 +1518,6 @@ int daNpc_grO_c::wait(void* param_1) {
     return 1;
 }
 
-/* 809DD960-809DDB68 0034E0 0208+00 1/0 0/0 0/0 .text            bokinWait__11daNpc_grO_cFPv */
 int daNpc_grO_c::bokinWait(void* param_1) {
     switch (mMode) {
         case MODE_INIT:
@@ -1625,7 +1571,6 @@ int daNpc_grO_c::bokinWait(void* param_1) {
     return 1;
 }
 
-/* 809DDB68-809DDCF8 0036E8 0190+00 1/0 0/0 0/0 .text            waitMaro__11daNpc_grO_cFPv */
 int daNpc_grO_c::waitMaro(void* param_1) {
     switch (mMode) {
         case MODE_INIT:
@@ -1669,7 +1614,6 @@ int daNpc_grO_c::waitMaro(void* param_1) {
     return 1;
 }
 
-/* 809DDCF8-809DE084 003878 038C+00 3/0 0/0 0/0 .text            talk__11daNpc_grO_cFPv */
 int daNpc_grO_c::talk(void* param_1) {
     int unused = 0;
     int rv = 0;
@@ -1768,7 +1712,6 @@ int daNpc_grO_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809DE084-809DE0D0 003C04 004C+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_MARO) {
         return i_actor;
@@ -1777,7 +1720,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809DE0D0-809DE30C 003C50 023C+00 1/0 0/0 0/0 .text            ECut_bokinFinish__11daNpc_grO_cFi */
 int daNpc_grO_c::ECut_bokinFinish(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int unused = 0;
@@ -1861,7 +1803,6 @@ int daNpc_grO_c::ECut_bokinFinish(int i_staffId) {
     return rv;
 }
 
-/* 809DE30C-809DE4EC 003E8C 01E0+00 1/0 0/0 0/0 .text            cutPushOut__11daNpc_grO_cFi */
 int daNpc_grO_c::cutPushOut(int i_staffId) {
     daTag_Push_c* actor_p = NULL;
     int rv = 0;
@@ -1907,7 +1848,6 @@ int daNpc_grO_c::cutPushOut(int i_staffId) {
     return rv;
 }
 
-/* 809DE4EC-809DE5D0 00406C 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_grO_cFPv */
 int daNpc_grO_c::test(void* param_1) {
     switch (mMode) {
         case MODE_INIT:
@@ -1933,34 +1873,28 @@ int daNpc_grO_c::test(void* param_1) {
     return 1;
 }
 
-/* 809DE5D0-809DE5F0 004150 0020+00 1/0 0/0 0/0 .text            daNpc_grO_Create__FPv */
 static int daNpc_grO_Create(void* i_this) {
     return static_cast<daNpc_grO_c*>(i_this)->create();
 }
 
-/* 809DE5F0-809DE610 004170 0020+00 1/0 0/0 0/0 .text            daNpc_grO_Delete__FPv */
 static int daNpc_grO_Delete(void* i_this) {
     return static_cast<daNpc_grO_c*>(i_this)->Delete();
 }
 
-/* 809DE610-809DE630 004190 0020+00 1/0 0/0 0/0 .text            daNpc_grO_Execute__FPv */
 static int daNpc_grO_Execute(void* i_this) {
     return static_cast<daNpc_grO_c*>(i_this)->Execute();
 }
 
-/* 809DE630-809DE650 0041B0 0020+00 1/0 0/0 0/0 .text            daNpc_grO_Draw__FPv */
 static int daNpc_grO_Draw(void* i_this) {
     return static_cast<daNpc_grO_c*>(i_this)->Draw();
 }
 
-/* 809DE650-809DE658 0041D0 0008+00 1/0 0/0 0/0 .text            daNpc_grO_IsDelete__FPv */
 static int daNpc_grO_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 809DF5C4-809DF5E4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grO_MethodTable */
 static actor_method_class daNpc_grO_MethodTable = {
     (process_method_func)daNpc_grO_Create,
     (process_method_func)daNpc_grO_Delete,
@@ -1969,7 +1903,6 @@ static actor_method_class daNpc_grO_MethodTable = {
     (process_method_func)daNpc_grO_Draw,
 };
 
-/* 809DF5E4-809DF614 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRO */
 extern actor_process_profile_definition g_profile_NPC_GRO = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp
index a72f080ae6..1e203b485f 100644
--- a/src/d/actor/d_a_npc_grr.cpp
+++ b/src/d/actor/d_a_npc_grr.cpp
@@ -121,15 +121,12 @@ enum Event_Cut_Nums {
     /* 0x1 */ NUM_EVT_CUTS_e = 0x1,
 };
 
-/* 809E3F44-809E3F48 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_grR_Param_c l_HIO;
 
-/* 809E3C10-809E3C18 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[1][2] = {
     {BMDR_GRR, GRR},
 };
 
-/* 809E3C18-809E3CB0 000028 0098+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[19] = {
     {-1, GRR},
     {BCK_GRR_F_TALK_A, GRR},
@@ -152,7 +149,6 @@ static daNpc_GetParam1 l_bckGetParamList[19] = {
     {BCK_GRR_SWING, GRR1},
 };
 
-/* 809E3CB0-809E3CE0 0000C0 0030+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRR, GRR},
     {BTP_GRR_F_LAUGH, GRR},
@@ -162,37 +158,30 @@ static daNpc_GetParam1 l_btpGetParamList[6] = {
     {BTP_GRR_FH_LAUGH, GRR},
 };
 
-/* 809E3CE0-809E3CE8 0000F0 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {BTK_GRR, GRR},
 };
 
-/* 809E3CE8-809E3CF0 0000F8 0008+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[1] = {
     {0, GRR},
 };
 
-/* 809E3CF0-809E3CFC 000100 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRRa */
 static int l_loadRes_GRRa[3] = {
     GRR, -1, -1,
 };
 
-/* 809E3CFC-809E3D08 00010C 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRR_SPAWATER */
 static int l_loadRes_GRR_SPAWATER[3] = {
     GRR, GRR1, -1,
 };
 
-/* 809E3D08-809E3D14 000118 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRR_MARO */
 static int l_loadRes_GRR_MARO[3] = {
     GRR, GRR1, -1,
 };
 
-/* 809E3D14-809E3D20 000124 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRR0 */
 static int l_loadRes_GRR0[3] = {
     GRR, -1, -1,
 };
 
-/* 809E3D20-809E3D30 -00001 0010+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[4] = {
     l_loadRes_GRRa,
     l_loadRes_GRR_SPAWATER,
@@ -200,30 +189,23 @@ static int* l_loadRes_list[4] = {
     l_loadRes_GRR0,
 };
 
-/* 809E3D30-809E3D38 -00001 0008+00 6/8 0/0 0/0 .data            l_resNames */
 static char* l_resNames[2] = {
     "grR",
     "grR1",
 };
 
-/* 809E3D38-809E3D3C 000148 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {NULL};
 
-/* 809E3D3C-809E3D40 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grR";
 
-/* 809E3D40-809E3D44 -00001 0004+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_grR_c */
 char* daNpc_grR_c::mEvtCutNameList = "";
 
-/* 809E3D44-809E3D50 000154 000C+00 1/2 0/0 0/0 .data            mEvtCutList__11daNpc_grR_c */
 daNpc_grR_c::cutFunc daNpc_grR_c::mEvtCutList[1] = {
     NULL,
 };
 
-/* 809DF8CC-809DFA50 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_grR_cFv */
 daNpc_grR_c::daNpc_grR_c() {}
 
-/* 809DFAE0-809DFCE0 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpc_grR_cFv */
 daNpc_grR_c::~daNpc_grR_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -240,7 +222,6 @@ daNpc_grR_c::~daNpc_grR_c() {
     #endif
 }
 
-/* 809E38D8-809E3944 000000 006C+00 12/12 0/0 0/0 .rodata          m__17daNpc_grR_Param_c */
 daNpc_grR_HIOParam const daNpc_grR_Param_c::m = {
     60.0f,
     -3.0f,
@@ -277,7 +258,6 @@ daNpc_grR_HIOParam const daNpc_grR_Param_c::m = {
     false
 };
 
-/* 809DFCE0-809DFFB8 000500 02D8+00 1/1 0/0 0/0 .text            create__11daNpc_grR_cFv */
 cPhs__Step daNpc_grR_c::create() {
     fopAcM_ct(this, daNpc_grR_c);
 
@@ -342,7 +322,6 @@ cPhs__Step daNpc_grR_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809DFFB8-809E0240 0007D8 0288+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grR_cFv */
 int daNpc_grR_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -382,24 +361,20 @@ int daNpc_grR_c::CreateHeap() {
     return 1;
 }
 
-/* 809E03FC-809E0430 000C1C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grR_cFv */
 int daNpc_grR_c::Delete() {
     this->~daNpc_grR_c();
     return 1;
 }
 
-/* 809E0430-809E0450 000C50 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_grR_cFv */
 int daNpc_grR_c::Execute() {
     return execute();
 }
 
-/* 809E0450-809E04E0 000C70 0090+00 1/1 0/0 0/0 .text            Draw__11daNpc_grR_cFv */
 int daNpc_grR_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     return draw(chkAction(&daNpc_grR_c::test), FALSE, daNpc_grR_Param_c::m.common.real_shadow_size, NULL, FALSE);
 }
 
-/* 809E04E0-809E0714 000D00 0234+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpc_grR_cFP8J3DJointP8J3DModel */
 int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {1, 3, 4};
@@ -443,12 +418,10 @@ int daNpc_grR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809E0714-809E0734 000F34 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_grR_cFP10fopAc_ac_c */
 int daNpc_grR_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_grR_c*>(a_this)->CreateHeap();
 }
 
-/* 809E0734-809E0780 000F54 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_grR_cFP8J3DJointi */
 int daNpc_grR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -462,7 +435,6 @@ int daNpc_grR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809E0780-809E08FC 000FA0 017C+00 1/0 0/0 0/0 .text            setParam__11daNpc_grR_cFv */
 void daNpc_grR_c::setParam() {
     actionFunc action = mNextAction;
     u32 uVar1 = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
@@ -508,7 +480,6 @@ void daNpc_grR_c::setParam() {
     gravity = daNpc_grR_Param_c::m.common.gravity;
 }
 
-/* 809E08FC-809E0A7C 00111C 0180+00 1/0 0/0 0/0 .text            main__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -538,7 +509,6 @@ BOOL daNpc_grR_c::main() {
     return TRUE;
 }
 
-/* 809E0A7C-809E0B5C 00129C 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* i_btk = NULL;
@@ -561,7 +531,6 @@ BOOL daNpc_grR_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809E0B5C-809E105C 00137C 0500+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grR_cFv */
 void daNpc_grR_c::setAttnPos() {
     static cXyz eyeOffset(24.0f, 30.0f, 0.0f);
 
@@ -639,7 +608,6 @@ void daNpc_grR_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809E105C-809E1260 00187C 0204+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_grR_cFib */
 bool daNpc_grR_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -711,7 +679,6 @@ bool daNpc_grR_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 809E1260-809E138C 001A80 012C+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_grR_cFi */
 bool daNpc_grR_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -764,7 +731,6 @@ bool daNpc_grR_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 809E138C-809E13B8 001BAC 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_grR_cFif */
 void daNpc_grR_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 8) {
         mExpression = i_expression;
@@ -774,7 +740,6 @@ void daNpc_grR_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 809E13B8-809E1548 001BD8 0190+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpc_grR_cFif */
 void daNpc_grR_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* i_btk = NULL;
@@ -826,7 +791,6 @@ void daNpc_grR_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 809E1548-809E158C 001D68 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_grR_cFifi */
 void daNpc_grR_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0xB) {
@@ -837,17 +801,14 @@ void daNpc_grR_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809E158C-809E1594 001DAC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 809E1594-809E1598 001DB4 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_grR_cFv */
 void daNpc_grR_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 809E1598-809E15E4 001DB8 004C+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_grR_cFv */
 u8 daNpc_grR_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case TYPE_0:
@@ -864,7 +825,6 @@ u8 daNpc_grR_c::getTypeFromParam() {
     }
 }
 
-/* 809E15E4-809E16CC 001E04 00E8+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::isDelete() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN04") == 0 &&
         /* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
@@ -889,7 +849,6 @@ BOOL daNpc_grR_c::isDelete() {
     return TRUE;
 }
 
-/* 809E16CC-809E18A4 001EEC 01D8+00 1/1 0/0 0/0 .text            reset__11daNpc_grR_cFv */
 void daNpc_grR_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -927,7 +886,6 @@ void daNpc_grR_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809E18A4-809E1B28 0020C4 0284+00 1/1 0/0 0/0 .text            playExpression__11daNpc_grR_cFv */
 void daNpc_grR_c::playExpression() {
     daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, daNpc_grR_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -965,7 +923,6 @@ void daNpc_grR_c::playExpression() {
     }
 }
 
-/* 809E1B28-809E1F10 002348 03E8+00 1/1 0/0 0/0 .text            playMotion__11daNpc_grR_cFv */
 void daNpc_grR_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpc_grR_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1019,12 +976,10 @@ void daNpc_grR_c::playMotion() {
     }
 }
 
-/* 809E1F10-809E1F3C 002730 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_grR_cFM11daNpc_grR_cFPCvPvPv_i */
 BOOL daNpc_grR_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809E1F3C-809E1FE4 00275C 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_grR_cFM11daNpc_grR_cFPCvPvPv_i */
 BOOL daNpc_grR_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -1042,7 +997,6 @@ BOOL daNpc_grR_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809E1FE4-809E2088 002804 00A4+00 1/1 0/0 0/0 .text            selectAction__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::selectAction() {
     mNextAction = NULL;
 
@@ -1064,7 +1018,6 @@ BOOL daNpc_grR_c::selectAction() {
     return TRUE;
 }
 
-/* 809E2088-809E219C 0028A8 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_grR_cFi */
 void daNpc_grR_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int i_timer;
@@ -1092,7 +1045,6 @@ void daNpc_grR_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809E219C-809E2480 0029BC 02E4+00 1/1 0/0 0/0 .text            doEvent__11daNpc_grR_cFv */
 BOOL daNpc_grR_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -1162,14 +1114,12 @@ BOOL daNpc_grR_c::doEvent() {
     return rv;
 }
 
-/* 809E2480-809E24A4 002CA0 0024+00 5/5 0/0 0/0 .text            setLookMode__11daNpc_grR_cFi */
 void daNpc_grR_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809E24A4-809E272C 002CC4 0288+00 1/1 0/0 0/0 .text            lookat__11daNpc_grR_cFv */
 void daNpc_grR_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1229,7 +1179,6 @@ void daNpc_grR_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 809E272C-809E27CC 002F4C 00A0+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_grR_cFv */
 void daNpc_grR_c::setExpressionTalkAfter() {
     switch (mExpression) {
         case EXPR_F_LAUGH:
@@ -1249,7 +1198,6 @@ void daNpc_grR_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809E27CC-809E29B8 002FEC 01EC+00 1/0 0/0 0/0 .text            wait__11daNpc_grR_cFPv */
 int daNpc_grR_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1295,7 +1243,6 @@ int daNpc_grR_c::wait(void* param_1) {
     return 1;
 }
 
-/* 809E29B8-809E2B48 0031D8 0190+00 1/0 0/0 0/0 .text            waitMaro__11daNpc_grR_cFPv */
 int daNpc_grR_c::waitMaro(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1339,7 +1286,6 @@ int daNpc_grR_c::waitMaro(void* param_1) {
     return 1;
 }
 
-/* 809E2B48-809E2E84 003368 033C+00 2/0 0/0 0/0 .text            talk__11daNpc_grR_cFPv */
 int daNpc_grR_c::talk(void* param_1) {
     BOOL rv = FALSE;
     BOOL bVar1 = FALSE;
@@ -1432,7 +1378,6 @@ int daNpc_grR_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809E2E84-809E2F68 0036A4 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_grR_cFPv */
 int daNpc_grR_c::test(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1458,34 +1403,28 @@ int daNpc_grR_c::test(void* param_1) {
     return 1;
 }
 
-/* 809E2F68-809E2F88 003788 0020+00 1/0 0/0 0/0 .text            daNpc_grR_Create__FPv */
 static int daNpc_grR_Create(void* a_this) {
     return static_cast<daNpc_grR_c*>(a_this)->create();
 }
 
-/* 809E2F88-809E2FA8 0037A8 0020+00 1/0 0/0 0/0 .text            daNpc_grR_Delete__FPv */
 static int daNpc_grR_Delete(void* a_this) {
     return static_cast<daNpc_grR_c*>(a_this)->Delete();
 }
 
-/* 809E2FA8-809E2FC8 0037C8 0020+00 1/0 0/0 0/0 .text            daNpc_grR_Execute__FPv */
 static int daNpc_grR_Execute(void* a_this) {
     return static_cast<daNpc_grR_c*>(a_this)->Execute();
 }
 
-/* 809E2FC8-809E2FE8 0037E8 0020+00 1/0 0/0 0/0 .text            daNpc_grR_Draw__FPv */
 static int daNpc_grR_Draw(void* a_this) {
     return static_cast<daNpc_grR_c*>(a_this)->Draw();
 }
 
-/* 809E2FE8-809E2FF0 003808 0008+00 1/0 0/0 0/0 .text            daNpc_grR_IsDelete__FPv */
 static int daNpc_grR_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 809E3DB8-809E3DD8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grR_MethodTable */
 static actor_method_class daNpc_grR_MethodTable = {
     (process_method_func)daNpc_grR_Create,
     (process_method_func)daNpc_grR_Delete,
@@ -1494,7 +1433,6 @@ static actor_method_class daNpc_grR_MethodTable = {
     (process_method_func)daNpc_grR_Draw,
 };
 
-/* 809E3DD8-809E3E08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRR */
 extern actor_process_profile_definition g_profile_NPC_GRR = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp
index 1e8db418b7..fbc4aea70a 100644
--- a/src/d/actor/d_a_npc_grs.cpp
+++ b/src/d/actor/d_a_npc_grs.cpp
@@ -34,13 +34,11 @@ enum LookMode {
     /* 0x04 */ LOOK_MODE_UNK_4,
 };
 
-/* 809E7FE4-809E7FF4 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {16, 0},
     {17, 0},
 };
 
-/* 809E7FF4-809E8034 000030 0040+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[8] = {
     {-1, 0},
     {8, 0},
@@ -52,54 +50,43 @@ static daNpc_GetParam1 l_bckGetParamList[8] = {
     {10, 0},
 };
 
-/* 809E8034-809E804C 000070 0018+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[3] = {
     {23, 0},
     {24, 0},
     {25, 0},
 };
 
-/* 809E804C-809E8054 000088 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {20, 0},
 };
 
-/* 809E8054-809E8064 000090 0010+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[2] = {
     {0, 0},
     {1, 0},
 };
 
-/* 809E8064-809E8070 0000A0 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRSa */
 static int l_loadRes_GRSa[3] = {0, -1, -1};
 
-/* 809E8070-809E807C 0000AC 000C+00 1/0 0/0 0/0 .data            l_loadRes_GRS0 */
 static int l_loadRes_GRS0[3] = {0, -1, -1};
 
-/* 809E807C-809E8084 -00001 0008+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[2] = {
     (int*)&l_loadRes_GRSa,
     (int*)&l_loadRes_GRS0,
 };
 
-/* 809E8084-809E8088 -00001 0004+00 6/8 0/0 0/0 .data            l_resNames */
 static char* l_resNames[1] = {
     "grS",
 };
 
-/* 809E8088-809E8090 -00001 0008+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "PUSHOUT",
 };
 
-/* 809E8090-809E8094 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grS";
 
-/* 809E8284-809E8288 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_GRS_HIO_CLASS l_HIO;
 
-/* 809E8094-809E809C -00001 0008+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_grS_c */
 char* daNpc_grS_c::mEvtCutNameList[2] = {
     "",
     "PUSHOUT",
@@ -110,11 +97,9 @@ daNpc_grS_c::cutFunc daNpc_grS_c::mEvtCutList[2] = {
     &daNpc_grS_c::cutPushOut,
 };
 
-/* 809E40CC-809E4250 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_grS_cFv */
 daNpc_grS_c::daNpc_grS_c() {
 }
 
-/* 809E42E0-809E44E0 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpc_grS_cFv */
 daNpc_grS_c::~daNpc_grS_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -131,8 +116,6 @@ daNpc_grS_c::~daNpc_grS_c() {
 #endif
 }
 
-/* ############################################################################################## */
-/* 809E7DCC-809E7E38 000000 006C+00 14/14 0/0 0/0 .rodata          m__17daNpc_grS_Param_c */
 const daNpc_grS_HIOParam daNpc_grS_Param_c::m = {
     120.0f, -3.0f, 1.0f, 600.0f, 255.0f, 120.0f, 35.0f, 60.0f,
     0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -30.0f, 45.0f, -45.0f,
@@ -143,7 +126,6 @@ const daNpc_grS_HIOParam daNpc_grS_Param_c::m = {
     FALSE, FALSE,
 };
 
-/* 809E44E0-809E47B4 000500 02D4+00 1/1 0/0 0/0 .text            create__11daNpc_grS_cFv */
 int daNpc_grS_c::create() {
     J3DModelData* modelData;
     int loadResult;
@@ -227,7 +209,6 @@ int daNpc_grS_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809E47B4-809E4A9C 0007D4 02E8+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_grS_cFv */
 int daNpc_grS_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -277,27 +258,22 @@ int daNpc_grS_c::CreateHeap() {
     return 1;
 }
 
-/* 809E4C58-809E4C8C 000C78 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_grS_cFv */
 int daNpc_grS_c::Delete() {
     fpc_ProcID unusedId = fopAcM_GetID(this);
     this->~daNpc_grS_c();
     return 1;
 }
 
-/* 809E4C8C-809E4CAC 000CAC 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_grS_cFv */
 int daNpc_grS_c::Execute() {
     execute();
 }
 
-/* 809E4CAC-809E4D3C 000CCC 0090+00 1/1 0/0 0/0 .text            Draw__11daNpc_grS_cFv */
 int daNpc_grS_c::Draw() {
     J3DModelData* modelData = mAnm_p->getModel()->getModelData();
     modelData->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
     draw(chkAction(&daNpc_grS_c::test),0, mpHIO->m.common.real_shadow_size,NULL,0);
 }
 
-/* 809E4D3C-809E4F70 000D5C 0234+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_grS_cFP8J3DJointP8J3DModel                */
 int daNpc_grS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int mtxIdx = joint->getJntNo();
@@ -340,15 +316,11 @@ int daNpc_grS_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809E4F70-809E4F90 000F90 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_grS_cFP10fopAc_ac_c              */
 int daNpc_grS_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_grS_c* grS = (daNpc_grS_c*)i_this;
     grS->CreateHeap();
 }
 
-/* 809E4F90-809E4FDC 000FB0 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_grS_cFP8J3DJointi
- */
 int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -361,7 +333,6 @@ int daNpc_grS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 809E4FDC-809E510C 000FFC 0130+00 1/0 0/0 0/0 .text            setParam__11daNpc_grS_cFv */
 void daNpc_grS_c::setParam() {
     actionFunc oldAction = mpNextActionFn;
 #if DEBUG
@@ -406,7 +377,6 @@ void daNpc_grS_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 809E510C-809E528C 00112C 0180+00 1/0 0/0 0/0 .text            main__11daNpc_grS_cFv */
 int daNpc_grS_c::main() {
     u16 temp = 0xffff;
 
@@ -441,7 +411,6 @@ int daNpc_grS_c::main() {
     return 1;
 }
 
-/* 809E528C-809E536C 0012AC 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_grS_cFv */
 int daNpc_grS_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* iVar2 = 0;
@@ -462,7 +431,6 @@ int daNpc_grS_c::ctrlBtk() {
     return 0;
 }
 
-/* 809E536C-809E5874 00138C 0508+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_grS_cFv */
 void daNpc_grS_c::setAttnPos() {
     static cXyz eyeOffset(16.0f, 20.0f, 0.0f);
 
@@ -548,8 +516,6 @@ void daNpc_grS_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809E5874-809E5A08 001894 0194+00 1/0 0/0 0/0 .text            setExpressionAnm__11daNpc_grS_cFib
- */
 bool daNpc_grS_c::setExpressionAnm(int param_0, bool param_1) {
     J3DAnmTransform* bck = NULL;
     s32 iVar2 = 0;
@@ -598,8 +564,6 @@ bool daNpc_grS_c::setExpressionAnm(int param_0, bool param_1) {
     return false;
 }
 
-/* 809E5A08-809E5B1C 001A28 0114+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_grS_cFi
- */
 bool daNpc_grS_c::setExpressionBtp(int param_0) {
     J3DAnmTexPattern* anmTexPattern = NULL;
     s32 btpAnmAttr = 0;
@@ -641,7 +605,6 @@ bool daNpc_grS_c::setExpressionBtp(int param_0) {
     return false;
 }
 
-/* 809E5B1C-809E5B48 001B3C 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_grS_cFif */
 void daNpc_grS_c::setExpression(int param_0, f32 param_1) {
     if (param_0 >= 0 && param_0 < 4) {
         mExpression = param_0;
@@ -651,7 +614,6 @@ void daNpc_grS_c::setExpression(int param_0, f32 param_1) {
     }
 }
 
-/* 809E5B48-809E5CB8 001B68 0170+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpc_grS_cFif */
 void daNpc_grS_c::setMotionAnm(int param_0, f32 param_1) {
     J3DAnmTransformKey* anmTransformKey = NULL;
     J3DAnmTextureSRTKey* anmTexSRTKey = NULL;
@@ -695,7 +657,6 @@ void daNpc_grS_c::setMotionAnm(int param_0, f32 param_1) {
     }
 }
 
-/* 809E5CB8-809E5CFC 001CD8 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_grS_cFifi */
 void daNpc_grS_c::setMotion(int param_0, f32 param_1, int param_2) {
     s16 param_0_copy = param_0;
     if ((param_2 != 0 || mMotion != param_0_copy) && param_0 >= 0 && param_0 < 4) {
@@ -706,7 +667,6 @@ void daNpc_grS_c::setMotion(int param_0, f32 param_1, int param_2) {
     }
 }
 
-/* 809E5CFC-809E5D04 001D1C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_grS_cFv */
 int daNpc_grS_c::drawDbgInfo() {
 #if DEBUG
     if (mpHIO->m.common.debug_info_ON) {
@@ -757,7 +717,6 @@ int daNpc_grS_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809E5D04-809E5DB4 001D24 00B0+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_grS_cFv */
 void daNpc_grS_c::drawOtherMdls() {
     Mtx mtx;
 
@@ -773,8 +732,6 @@ void daNpc_grS_c::drawOtherMdls() {
     }
 }
 
-/* 809E5DB4-809E5DD4 001DD4 0020+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_grS_cFv
- */
 u8 daNpc_grS_c::getTypeFromParam() {
     int temp = (u8)fopAcM_GetParam(this);
     switch ((u8)temp) {
@@ -785,7 +742,6 @@ u8 daNpc_grS_c::getTypeFromParam() {
     }
 }
 
-/* 809E5DD4-809E5E58 001DF4 0084+00 1/1 0/0 0/0 .text            isDelete__11daNpc_grS_cFv */
 int daNpc_grS_c::isDelete() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN04") == 0 && daNpcF_chkEvtBit(0x40)) {
         return 1;
@@ -798,7 +754,6 @@ int daNpc_grS_c::isDelete() {
     return 1;
 }
 
-/* 809E5E58-809E6000 001E78 01A8+00 1/1 0/0 0/0 .text            reset__11daNpc_grS_cFv */
 void daNpc_grS_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -838,7 +793,6 @@ void daNpc_grS_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809E6000-809E6164 002020 0164+00 1/1 0/0 0/0 .text            playExpression__11daNpc_grS_cFv */
 void daNpc_grS_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_UNK_1, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0a};
@@ -858,7 +812,6 @@ void daNpc_grS_c::playExpression() {
     }
 }
 
-/* 809E6164-809E62F0 002184 018C+00 1/1 0/0 0/0 .text            playMotion__11daNpc_grS_cFv */
 void daNpc_grS_c::playMotion() {
     daNpcF_anmPlayData dat0a = {ANM_UNK_4, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0a};
@@ -883,14 +836,10 @@ void daNpc_grS_c::playMotion() {
     }
 }
 
-/* 809E62F0-809E631C 002310 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_grS_cFM11daNpc_grS_cFPCvPvPv_i            */
 int daNpc_grS_c::chkAction(actionFunc i_func) {
     return mpActionFn == i_func;
 }
 
-/* 809E631C-809E63C4 00233C 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_grS_cFM11daNpc_grS_cFPCvPvPv_i            */
 int daNpc_grS_c::setAction(actionFunc i_func) {
     mActionState = 3;
     if (mpActionFn != NULL) {
@@ -904,7 +853,6 @@ int daNpc_grS_c::setAction(actionFunc i_func) {
     return 1;
 }
 
-/* 809E63C4-809E6444 0023E4 0080+00 1/1 0/0 0/0 .text            selectAction__11daNpc_grS_cFv */
 int daNpc_grS_c::selectAction() {
     mpNextActionFn = NULL;
     if (mpHIO->m.common.debug_mode_ON) {
@@ -918,7 +866,6 @@ int daNpc_grS_c::selectAction() {
     return 1;
 }
 
-/* 809E6444-809E6570 002464 012C+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_grS_cFi */
 void daNpc_grS_c::doNormalAction(int param_0) {
     if (param_0 != 0 && hitChk2(&mCyl, 1, 0)) {
         int damageTime = mCutType == 8 ? 20 : mpHIO->m.common.damage_time;
@@ -947,7 +894,6 @@ void daNpc_grS_c::doNormalAction(int param_0) {
     }
 }
 
-/* 809E6570-809E6854 002590 02E4+00 1/1 0/0 0/0 .text            doEvent__11daNpc_grS_cFv */
 int daNpc_grS_c::doEvent() {
     dEvent_manager_c* eventManager = NULL;
     int result = 0;
@@ -1023,14 +969,12 @@ int daNpc_grS_c::doEvent() {
     return result;
 }
 
-/* 809E6854-809E6878 002874 0024+00 5/5 0/0 0/0 .text            setLookMode__11daNpc_grS_cFi */
 void daNpc_grS_c::setLookMode(int i_mode) {
     if (i_mode >= 0 && i_mode < 5 && i_mode != mLookMode) {
         mLookMode = i_mode;
     }
 }
 
-/* 809E6878-809E6B00 002898 0288+00 1/1 0/0 0/0 .text            lookat__11daNpc_grS_cFv */
 void daNpc_grS_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1088,7 +1032,6 @@ void daNpc_grS_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngles, snap, yawDiff, 0);
 }
 
-/* 809E6B00-809E6B74 002B20 0074+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_grS_cFv */
 void daNpc_grS_c::setExpressionTalkAfter() {
     // possible bug? first case always falls through to default
     switch (mExpression) {
@@ -1099,7 +1042,6 @@ void daNpc_grS_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809E6B74-809E6D54 002B94 01E0+00 1/0 0/0 0/0 .text            cutPushOut__11daNpc_grS_cFi */
 int daNpc_grS_c::cutPushOut(int param_0) {
     daTag_Push_c *actor_p = NULL;
     int result = 0;
@@ -1142,7 +1084,6 @@ int daNpc_grS_c::cutPushOut(int param_0) {
     return result;
 }
 
-/* 809E6D54-809E6F5C 002D74 0208+00 1/0 0/0 0/0 .text            wait__11daNpc_grS_cFPv */
 int daNpc_grS_c::wait(void* param_0) {
     switch (mActionState) {
     case 0:
@@ -1202,7 +1143,6 @@ int daNpc_grS_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809E6F5C-809E721C 002F7C 02C0+00 2/0 0/0 0/0 .text            talk__11daNpc_grS_cFPv */
 int daNpc_grS_c::talk(void* param_0) {
     int unusedInt1 = 0;
     BOOL result = 0;
@@ -1283,7 +1223,6 @@ int daNpc_grS_c::talk(void* param_0) {
     return result;
 }
 
-/* 809E721C-809E7300 00323C 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_grS_cFPv */
 int daNpc_grS_c::test(void* param_0) {
     switch (mActionState) {
     case 0:
@@ -1308,7 +1247,6 @@ int daNpc_grS_c::test(void* param_0) {
     return 1;
 }
 
-/* 809E7300-809E743C 003320 013C+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_grS_cFv */
 void daNpc_grS_c::setPrtcl() {
     static const u16 id[6] = {
         dPa_RM(ID_ZI_S_GRS_SMOKE_A),
@@ -1336,32 +1274,26 @@ void daNpc_grS_c::setPrtcl() {
     }
 }
 
-/* 809E743C-809E745C 00345C 0020+00 1/0 0/0 0/0 .text            daNpc_grS_Create__FPv */
 static int daNpc_grS_Create(void* i_this) {
     return ((daNpc_grS_c*)i_this)->create();
 }
 
-/* 809E745C-809E747C 00347C 0020+00 1/0 0/0 0/0 .text            daNpc_grS_Delete__FPv */
 static int daNpc_grS_Delete(void* i_this) {
     return ((daNpc_grS_c*)i_this)->Delete();
 }
 
-/* 809E747C-809E749C 00349C 0020+00 1/0 0/0 0/0 .text            daNpc_grS_Execute__FPv */
 static int daNpc_grS_Execute(void* i_this) {
     return ((daNpc_grS_c*)i_this)->Execute();
 }
 
-/* 809E749C-809E74BC 0034BC 0020+00 1/0 0/0 0/0 .text            daNpc_grS_Draw__FPv */
 static int daNpc_grS_Draw(void* i_this) {
     return ((daNpc_grS_c*)i_this)->Draw();
 }
 
-/* 809E74BC-809E74C4 0034DC 0008+00 1/0 0/0 0/0 .text            daNpc_grS_IsDelete__FPv */
 static int daNpc_grS_IsDelete(void* i_this) {
     return TRUE;
 }
 
-/* 809E80FC-809E811C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_grS_MethodTable */
 static actor_method_class daNpc_grS_MethodTable = {
     (process_method_func)daNpc_grS_Create,
     (process_method_func)daNpc_grS_Delete,
@@ -1370,7 +1302,6 @@ static actor_method_class daNpc_grS_MethodTable = {
     (process_method_func)daNpc_grS_Draw,
 };
 
-/* 809E811C-809E814C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRS */
 extern actor_process_profile_definition g_profile_NPC_GRS = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp
index 5db112e1c5..345d8e6237 100644
--- a/src/d/actor/d_a_npc_grz.cpp
+++ b/src/d/actor/d_a_npc_grz.cpp
@@ -241,15 +241,12 @@ enum Event_Cut_Nums {
     /* 0x7 */ NUM_EVT_CUTS_e = 0x7,
 };
 
-/* 809EFC54-809EFC58 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Grz_Param_c l_HIO;
 
-/* 809EF6C0-809EF6C8 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[1][2] = {
     {BMDR_GRZ, GRZ},
 };
 
-/* 809EF6C8-809EF7D8 000028 0110+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[34] = {
     {-1, GRZ},
     {BCK_GRZ_F_MUKIDASHI, GRZ},
@@ -287,7 +284,6 @@ static daNpc_GetParam1 l_bckGetParamList[34] = {
     {BCK_GRZ_PUNCH, GRZ3},
 };
 
-/* 809EF7D8-809EF828 000138 0050+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[10] = {
     {BTP_GRZ, GRZ},
     {BTP_GRZ_F_LIEDOWN, GRZ1},
@@ -301,14 +297,12 @@ static daNpc_GetParam1 l_btpGetParamList[10] = {
     {BTP_GRZ_F_RECOVER, GRZ3}, 
 };
 
-/* 809EF828-809EF840 000188 0018+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[3] = {
     {BTK_GRZ, GRZ},
     {BTK_GRZ_GETUP, GRZ1},
     {BTK_GRZ_SNIFF, GRZ2},
 };
 
-/* 809EF840-809EF860 0001A0 0020+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[4] = {
     {0, GRZ},
     {1, GRZD1},
@@ -316,7 +310,6 @@ static daNpc_GetParam1 l_evtGetParamList[4] = {
     {3, GRZD3},
 };
 
-/* 809EF860-809EF870 -00001 0010+00 1/3 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     NULL,
     "TALK_STAND",
@@ -324,38 +317,31 @@ static char* l_evtNames[4] = {
     "STONE_SMASH_SKIP",
 };
 
-/* 809EF870-809EF884 0001D0 0014+00 1/0 0/0 0/0 .data            l_loadRes_YELIA */
 static int l_loadRes_YELIA[5] = {
     GRZ, GRZ2, -1, -1, -1,
 };
 
-/* 809EF884-809EF898 0001E4 0014+00 1/0 0/0 0/0 .data            l_loadRes_LieDown */
 static int l_loadRes_LieDown[5] = {
     GRZ, GRZ1, GRZD1, -1, -1,
 };
 
-/* 809EF898-809EF8AC 0001F8 0014+00 1/0 0/0 0/0 .data            l_loadRes_Smash */
 static int l_loadRes_Smash[5] = {
     GRZ, GRZ2, GRZ3, GRZD3, -1,
 };
 
-/* 809EF8AC-809EF8C0 00020C 0014+00 1/0 0/0 0/0 .data            l_loadRes_GRZa */
 static int l_loadRes_GRZa[5] = {
     GRZ, GRZ2, -1, -1, -1,
 };
 
-/* 809EF8C0-809EF8D4 000220 0014+00 1/0 0/0 0/0 .data            l_loadRes_GRZ0 */
 static int l_loadRes_GRZ0[5] = {
     GRZ, -1, -1, -1, -1,
 };
 
-/* 809EF8D4-809EF8E8 -00001 0014+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[5] = {
     l_loadRes_YELIA, l_loadRes_LieDown, l_loadRes_Smash,
     l_loadRes_GRZa,  l_loadRes_GRZ0,
 };
 
-/* 809EF8E8-809EF900 -00001 0018+00 6/9 0/0 0/0 .data            l_resNames */
 static char* l_resNames[6] = {
     "grZ",
     "grZ1",
@@ -365,10 +351,8 @@ static char* l_resNames[6] = {
     "grZD3",
 };
 
-/* 809EF900-809EF904 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "grZ";
 
-/* 809EF904-809EF920 -00001 001C+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_Grz_c */
 char* daNpc_Grz_c::mEvtCutNameList[7] = {
     "",
     "WAIT",
@@ -379,7 +363,6 @@ char* daNpc_Grz_c::mEvtCutNameList[7] = {
     "STONE_SMASH_SKIP",
 };
 
-/* 809EF968-809EF9BC 0002C8 0054+00 0/2 0/0 0/0 .data            mEvtCutList__11daNpc_Grz_c */
 daNpc_Grz_c::cutFunc daNpc_Grz_c::mEvtCutList[7] = {
     NULL,
     &daNpc_Grz_c::doWaitCut,
@@ -390,10 +373,8 @@ daNpc_Grz_c::cutFunc daNpc_Grz_c::mEvtCutList[7] = {
     &daNpc_Grz_c::doStoneSmashSkipCut,
 };
 
-/* 809E840C-809E8658 0000EC 024C+00 1/1 0/0 0/0 .text            __ct__11daNpc_Grz_cFv */
 daNpc_Grz_c::daNpc_Grz_c() {}
 
-/* 809E88C0-809E8BA0 0005A0 02E0+00 1/0 0/0 0/0 .text            __dt__11daNpc_Grz_cFv */
 daNpc_Grz_c::~daNpc_Grz_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -404,7 +385,6 @@ daNpc_Grz_c::~daNpc_Grz_c() {
     }
 }
 
-/* 809EF1F4-809EF274 000000 0080+00 19/19 0/0 0/0 .rodata          m__17daNpc_Grz_Param_c */
 daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = {
     130.0f,
     -3.0f,
@@ -448,7 +428,6 @@ daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = {
     500.0f,
 };
 
-/* 809E8BA0-809E8E68 000880 02C8+00 1/1 0/0 0/0 .text            create__11daNpc_Grz_cFv */
 cPhs__Step daNpc_Grz_c::create() {
     fopAcM_ct(this, daNpc_Grz_c);
 
@@ -512,7 +491,6 @@ cPhs__Step daNpc_Grz_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809E8E68-809E90F0 000B48 0288+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Grz_cFv */
 int daNpc_Grz_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -551,20 +529,17 @@ int daNpc_Grz_c::CreateHeap() {
     return 1;
 }
 
-/* 809E92AC-809E92E0 000F8C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Grz_cFv */
 int daNpc_Grz_c::Delete() {
     this->~daNpc_Grz_c();
     return 1;
 }
 
-/* 809E92E0-809E9324 000FC0 0044+00 2/2 0/0 0/0 .text            Execute__11daNpc_Grz_cFv */
 int daNpc_Grz_c::Execute() {
     int rv = execute();
     setPrtcl();
     return rv;
 }
 
-/* 809E9324-809E9568 001004 0244+00 1/1 0/0 0/0 .text            Draw__11daNpc_Grz_cFv */
 int daNpc_Grz_c::Draw() {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
@@ -625,7 +600,6 @@ int daNpc_Grz_c::Draw() {
     return 1;
 }
 
-/* 809E9568-809E979C 001248 0234+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpc_Grz_cFP8J3DJointP8J3DModel */
 int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -669,12 +643,10 @@ int daNpc_Grz_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809E979C-809E97BC 00147C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_Grz_cFP10fopAc_ac_c */
 int daNpc_Grz_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_Grz_c*>(a_this)->CreateHeap();
 }
 
-/* 809E97BC-809E9808 00149C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_Grz_cFP8J3DJointi */
 int daNpc_Grz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -688,7 +660,6 @@ int daNpc_Grz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809E9808-809E9954 0014E8 014C+00 1/0 0/0 0/0 .text            setParam__11daNpc_Grz_cFv */
 void daNpc_Grz_c::setParam() {
     actionFunc action = mNextAction;
     u32 flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -730,7 +701,6 @@ void daNpc_Grz_c::setParam() {
     gravity = daNpc_Grz_Param_c::m.common.gravity;
 }
 
-/* 809E9954-809E9AD4 001634 0180+00 1/0 0/0 0/0 .text            main__11daNpc_Grz_cFv */
 BOOL daNpc_Grz_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -761,7 +731,6 @@ BOOL daNpc_Grz_c::main() {
     return TRUE;
 }
 
-/* 809E9AD4-809E9BB4 0017B4 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_Grz_cFv */
 BOOL daNpc_Grz_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk = NULL;
@@ -784,7 +753,6 @@ BOOL daNpc_Grz_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809E9BB4-809EA1DC 001894 0628+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Grz_cFv */
 void daNpc_Grz_c::setAttnPos() {
     static cXyz eyeOffset(20.0f, 40.0f, 0.0f);
 
@@ -882,7 +850,6 @@ void daNpc_Grz_c::setAttnPos() {
     setCollisionPunch();
 }
 
-/* 809EA1DC-809EA734 001EBC 0558+00 1/1 0/0 0/0 .text            setCollisionPunch__11daNpc_Grz_cFv */
 void daNpc_Grz_c::setCollisionPunch() {
     if (mType == TYPE_SMASH) {
         f32 frame = mAnm_p->getFrame();
@@ -950,7 +917,6 @@ void daNpc_Grz_c::setCollisionPunch() {
     }
 }
 
-/* 809EA734-809EAA08 002414 02D4+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_Grz_cFib */
 bool daNpc_Grz_c::setExpressionAnm(int i_index, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -1052,7 +1018,6 @@ bool daNpc_Grz_c::setExpressionAnm(int i_index, bool i_modify) {
     return false;
 }
 
-/* 809EAA08-809EAB34 0026E8 012C+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_Grz_cFi */
 bool daNpc_Grz_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* btp = NULL;
     int i_attr = J3DFrameCtrl::EMode_NONE;
@@ -1104,7 +1069,6 @@ bool daNpc_Grz_c::setExpressionBtp(int i_index) {
     return false;
 }
 
-/* 809EAB34-809EAB60 002814 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_Grz_cFif */
 void daNpc_Grz_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 0xB) {
         mExpression = i_expression;
@@ -1114,7 +1078,6 @@ void daNpc_Grz_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 809EAB60-809EAD4C 002840 01EC+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_Grz_cFif */
 void daNpc_Grz_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -1208,7 +1171,6 @@ void daNpc_Grz_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 809EAD4C-809EAD90 002A2C 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_Grz_cFifi */
 void daNpc_Grz_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0xF) {
@@ -1219,17 +1181,14 @@ void daNpc_Grz_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809EAD90-809EAD98 002A70 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Grz_cFv */
 int daNpc_Grz_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809EAD98-809EAD9C 002A78 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_Grz_cFv */
 void daNpc_Grz_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 809EAD9C-809EADE8 002A7C 004C+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_Grz_cFv */
 int daNpc_Grz_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -1246,7 +1205,6 @@ int daNpc_Grz_c::getTypeFromParam() {
     }
 }
 
-/* 809EADE8-809EAE88 002AC8 00A0+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Grz_cFv */
 BOOL daNpc_Grz_c::isDelete() {
     if (mType == TYPE_3 || mType == TYPE_LIEDOWN) {
         return FALSE;
@@ -1266,7 +1224,6 @@ BOOL daNpc_Grz_c::isDelete() {
     return TRUE;
 }
 
-/* 809EAE88-809EB154 002B68 02CC+00 1/1 0/0 0/0 .text            reset__11daNpc_Grz_cFv */
 void daNpc_Grz_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -1334,7 +1291,6 @@ void daNpc_Grz_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809EB154-809EB234 002E34 00E0+00 1/1 0/0 0/0 .text            resetCol__11daNpc_Grz_cFv */
 void daNpc_Grz_c::resetCol() {
     mCyl1.Set(mCcDCyl);
     mCyl1.SetStts(&mCcStts);
@@ -1355,7 +1311,6 @@ void daNpc_Grz_c::resetCol() {
     }
 }
 
-/* 809EB234-809EB5C0 002F14 038C+00 1/1 0/0 0/0 .text            playExpression__11daNpc_Grz_cFv */
 void daNpc_Grz_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_A, daNpc_Grz_Param_c::m.common.morf_frame, 1};
     daNpcF_anmPlayData dat0b= {ANM_FH_TALK_A, daNpc_Grz_Param_c::m.common.morf_frame, 0};
@@ -1404,7 +1359,6 @@ void daNpc_Grz_c::playExpression() {
     }
 }
 
-/* 809EB5C0-809EBA3C 0032A0 047C+00 1/1 0/0 0/0 .text            playMotion__11daNpc_Grz_cFv */
 void daNpc_Grz_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpc_Grz_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1466,12 +1420,10 @@ void daNpc_Grz_c::playMotion() {
     }
 }
 
-/* 809EBA3C-809EBA68 00371C 002C+00 1/1 0/0 0/0 .text            chkAction__11daNpc_Grz_cFM11daNpc_Grz_cFPCvPvPv_i */
 BOOL daNpc_Grz_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809EBA68-809EBB10 003748 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_Grz_cFM11daNpc_Grz_cFPCvPvPv_i */
 BOOL daNpc_Grz_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -1489,7 +1441,6 @@ BOOL daNpc_Grz_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809EBB10-809EBC04 0037F0 00F4+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Grz_cFv */
 BOOL daNpc_Grz_c::selectAction() {
     mNextAction = NULL;
 
@@ -1518,7 +1469,6 @@ BOOL daNpc_Grz_c::selectAction() {
     return TRUE;
 }
 
-/* 809EBC04-809EBD18 0038E4 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_Grz_cFi */
 void daNpc_Grz_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl1, TRUE, FALSE)) {
         int damage_time;
@@ -1547,7 +1497,6 @@ void daNpc_Grz_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809EBD18-809EC0CC 0039F8 03B4+00 1/1 0/0 0/0 .text            doEvent__11daNpc_Grz_cFv */
 BOOL daNpc_Grz_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -1648,7 +1597,6 @@ BOOL daNpc_Grz_c::doEvent() {
     return rv;
 }
 
-/* 809EC0CC-809EC164 003DAC 0098+00 1/1 0/0 0/0 .text            setSkipZev__11daNpc_Grz_cFii */
 bool daNpc_Grz_c::setSkipZev(int param_1, int param_2) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
 
@@ -1661,14 +1609,12 @@ bool daNpc_Grz_c::setSkipZev(int param_1, int param_2) {
     return false;
 }
 
-/* 809EC164-809EC188 003E44 0024+00 10/10 0/0 0/0 .text            setLookMode__11daNpc_Grz_cFi */
 void daNpc_Grz_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809EC188-809EC424 003E68 029C+00 1/1 0/0 0/0 .text            lookat__11daNpc_Grz_cFv */
 void daNpc_Grz_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1729,7 +1675,6 @@ void daNpc_Grz_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, bVar1, angle_delta, FALSE);
 }
 
-/* 809EC424-809EC4C4 004104 00A0+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_Grz_cFv */
 void daNpc_Grz_c::setExpressionTalkAfter() {
     switch (mExpression) {
         case EXPR_TALK_A:
@@ -1749,7 +1694,6 @@ void daNpc_Grz_c::setExpressionTalkAfter() {
     }
 }
 
-/* 809EC4C4-809EC770 0041A4 02AC+00 1/0 0/0 0/0 .text            wait__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1820,7 +1764,6 @@ int daNpc_Grz_c::wait(void* param_1) {
     return 1;
 }
 
-/* 809EC770-809EC7BC 004450 004C+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_GrzRock) {
         return i_actor;
@@ -1829,7 +1772,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809EC7BC-809EC808 00449C 004C+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_YELIA) {
         return i_actor;
@@ -1838,7 +1780,6 @@ static void* s_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809EC808-809EC854 0044E8 004C+00 1/1 0/0 0/0 .text            s_sub3__FPvPv */
 static void* s_sub3(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRD) {
         return i_actor;
@@ -1847,7 +1788,6 @@ static void* s_sub3(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 809EC854-809ECBF0 004534 039C+00 1/0 0/0 0/0 .text            waitSmash__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::waitSmash(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1903,7 +1843,6 @@ int daNpc_Grz_c::waitSmash(void* param_1) {
     return 1;
 }
 
-/* 809ECBF0-809ECCA0 0048D0 00B0+00 1/0 0/0 0/0 .text            lieDown__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::lieDown(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1922,7 +1861,6 @@ int daNpc_Grz_c::lieDown(void* param_1) {
     return 1;
 }
 
-/* 809ECCA0-809ECD50 004980 00B0+00 1/0 0/0 0/0 .text            waitWeak__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::waitWeak(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1941,7 +1879,6 @@ int daNpc_Grz_c::waitWeak(void* param_1) {
     return 1;
 }
 
-/* 809ECD50-809ECF88 004A30 0238+00 2/0 0/0 0/0 .text            talk__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::talk(void* param_1) {
     int rv = 0;
     BOOL bVar1 = FALSE;
@@ -2000,7 +1937,6 @@ int daNpc_Grz_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809ECF88-809ED06C 004C68 00E4+00 1/0 0/0 0/0 .text            test__11daNpc_Grz_cFPv */
 int daNpc_Grz_c::test(void* param_1) {
     switch (mMode) {
         case 0:
@@ -2026,7 +1962,6 @@ int daNpc_Grz_c::test(void* param_1) {
     return 1;
 }
 
-/* 809ED06C-809ED18C 004D4C 0120+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_Grz_cFv */
 int daNpc_Grz_c::setPrtcl() {
     for (int i = 0; i < 1; i++) {
         BOOL bVar1 = i == 0 ? TRUE : FALSE;
@@ -2054,7 +1989,6 @@ int daNpc_Grz_c::setPrtcl() {
     return 1;
 }
 
-/* 809ED18C-809ED228 004E6C 009C+00 1/0 0/0 0/0 .text            doWaitCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doWaitCut(int i_staffId) {
     int rv = 0;
     int timer = 0;
@@ -2074,7 +2008,6 @@ int daNpc_Grz_c::doWaitCut(int i_staffId) {
     return rv;
 }
 
-/* 809ED228-809ED3D4 004F08 01AC+00 1/0 0/0 0/0 .text            doRebirthCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doRebirthCut(int i_staffId) {
     int rv = 0;
 
@@ -2096,7 +2029,6 @@ int daNpc_Grz_c::doRebirthCut(int i_staffId) {
     return rv;
 }
 
-/* 809ED3D4-809ED5EC 0050B4 0218+00 1/0 0/0 0/0 .text            doTalkStandCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doTalkStandCut(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int rv = 0;
@@ -2157,7 +2089,6 @@ int daNpc_Grz_c::doTalkStandCut(int i_staffId) {
     return rv;
 }
 
-/* 809ED5EC-809EDBA4 0052CC 05B8+00 1/0 0/0 0/0 .text            doGoOutCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doGoOutCut(int i_staffId) {
     cXyz sp30(150.0f, 0.0f, 1020.0f);
     dEvent_manager_c* eventManager = (dEvent_manager_c*)&dComIfGp_getEventManager();
@@ -2291,7 +2222,6 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) {
     return rv;
 }
 
-/* 809EDBA4-809EE5F0 005884 0A4C+00 1/0 0/0 0/0 .text            doStoneSmashCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int iVar1 = 0;
@@ -2509,7 +2439,6 @@ int daNpc_Grz_c::doStoneSmashCut(int i_staffId) {
     return rv;
 }
 
-/* 809EE5F0-809EE724 0062D0 0134+00 1/0 0/0 0/0 .text doStoneSmashSkipCut__11daNpc_Grz_cFi */
 int daNpc_Grz_c::doStoneSmashSkipCut(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int prm = -1;
@@ -2549,34 +2478,28 @@ int daNpc_Grz_c::doStoneSmashSkipCut(int i_staffId) {
     return rv;
 }
 
-/* 809EE724-809EE744 006404 0020+00 1/0 0/0 0/0 .text            daNpc_Grz_Create__FPv */
 static int daNpc_Grz_Create(void* a_this) {
     return static_cast<daNpc_Grz_c*>(a_this)->create();
 }
 
-/* 809EE744-809EE764 006424 0020+00 1/0 0/0 0/0 .text            daNpc_Grz_Delete__FPv */
 static int daNpc_Grz_Delete(void* a_this) {
     return static_cast<daNpc_Grz_c*>(a_this)->Delete();
 }
 
-/* 809EE764-809EE784 006444 0020+00 1/0 0/0 0/0 .text            daNpc_Grz_Execute__FPv */
 static int daNpc_Grz_Execute(void* a_this) {
     return static_cast<daNpc_Grz_c*>(a_this)->Execute();
 }
 
-/* 809EE784-809EE7A4 006464 0020+00 1/0 0/0 0/0 .text            daNpc_Grz_Draw__FPv */
 static int daNpc_Grz_Draw(void* a_this) {
     return static_cast<daNpc_Grz_c*>(a_this)->Draw();
 }
 
-/* 809EE7A4-809EE7AC 006484 0008+00 1/0 0/0 0/0 .text            daNpc_Grz_IsDelete__FPv */
 static int daNpc_Grz_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 809EFAA8-809EFAC8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Grz_MethodTable */
 static actor_method_class daNpc_Grz_MethodTable = {
     (process_method_func)daNpc_Grz_Create,
     (process_method_func)daNpc_Grz_Delete,
@@ -2585,7 +2508,6 @@ static actor_method_class daNpc_Grz_MethodTable = {
     (process_method_func)daNpc_Grz_Draw,
 };
 
-/* 809EFAC8-809EFAF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GRZ */
 extern actor_process_profile_definition g_profile_NPC_GRZ = {
   fpcLy_CURRENT_e,               // mLayerID
   7,                             // mListID
diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp
index dc5ff601c7..1a282ca486 100644
--- a/src/d/actor/d_a_npc_guard.cpp
+++ b/src/d/actor/d_a_npc_guard.cpp
@@ -31,13 +31,10 @@ int daNpcGuard_c::createHeap() {
     return rv;
 }
 
-/* 809EFD58-809EFE20 000078 00C8+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c
- */
 static int createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpcGuard_c*>(i_this)->createHeap();
 }
 
-/* 809F2E18-809F2EC0 0000C8 00A8+00 1/2 0/0 0/0 .data            ActionTable__12daNpcGuard_c */
 daNpcGuard_c::actionFunc daNpcGuard_c::ActionTable[7][2] = {
     {&daNpcGuard_c::initPath, &daNpcGuard_c::executePath},
     {&daNpcGuard_c::initRun, &daNpcGuard_c::executeRun},
@@ -48,8 +45,6 @@ daNpcGuard_c::actionFunc daNpcGuard_c::ActionTable[7][2] = {
     {&daNpcGuard_c::initEscape, &daNpcGuard_c::executeEscape},
 };
 
-/* 809EFE20-809EFE64 000140 0044+00 8/8 0/0 0/0 .text
- * setAction__12daNpcGuard_cFQ212daNpcGuard_c6Mode_e            */
 void daNpcGuard_c::setAction(daNpcGuard_c::Mode_e i_action) {
     JUT_ASSERT(286, i_action < MODE_MAX_e);
 
@@ -59,25 +54,21 @@ void daNpcGuard_c::setAction(daNpcGuard_c::Mode_e i_action) {
     callInit();
 }
 
-/* 809EFE64-809EFE8C 000184 0028+00 1/1 0/0 0/0 .text            callInit__12daNpcGuard_cFv */
 void daNpcGuard_c::callInit() {
     JUT_ASSERT(328, mAction != NULL);
     (this->*mAction[0])();
 }
 
-/* 809EFE8C-809EFEB8 0001AC 002C+00 1/1 0/0 0/0 .text            callExecute__12daNpcGuard_cFv */
 void daNpcGuard_c::callExecute() {
     JUT_ASSERT(341, mAction != NULL);
     (this->*mAction[1])();
 }
 
-/* 809EFEB8-809EFF1C 0001D8 0064+00 1/0 0/0 0/0 .text            initPath__12daNpcGuard_cFv */
 void daNpcGuard_c::initPath() {
     setAnm((J3DAnmTransformKey*)getAnmP(4, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xd9c = 1;
 }
 
-/* 809EFF1C-809F0100 00023C 01E4+00 1/0 0/0 0/0 .text            executePath__12daNpcGuard_cFv */
 void daNpcGuard_c::executePath() {
     if (m_path.isPath()) {
         if (m_path.checkPoint(current.pos, speedF)) {
@@ -116,13 +107,11 @@ void daNpcGuard_c::executePath() {
     }
 }
 
-/* 809F0184-809F01E8 0004A4 0064+00 1/0 0/0 0/0 .text            initRun__12daNpcGuard_cFv */
 void daNpcGuard_c::initRun() {
     setAnm((J3DAnmTransformKey*)getAnmP(4, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     field_0xd9c = 1;
 }
 
-/* 809F01E8-809F03FC 000508 0214+00 1/0 0/0 0/0 .text            executeRun__12daNpcGuard_cFv */
 void daNpcGuard_c::executeRun() {
     field_0xda0 = fopAcM_searchPlayerAngleY(this);
     cLib_addCalcAngleS2(&shape_angle.y, field_0xda0, 0xD, 0x600);
@@ -160,7 +149,6 @@ void daNpcGuard_c::executeRun() {
     }
 }
 
-/* 809F03FC-809F04B4 00071C 00B8+00 1/0 0/0 0/0 .text            initFightWait__12daNpcGuard_cFv */
 void daNpcGuard_c::initFightWait() {
     setAnm((J3DAnmTransformKey*)getAnmP(42, mObjNum), 1.0f, 12.0f, 2, 0, -1);
     speedF = 0.0f;
@@ -171,8 +159,6 @@ void daNpcGuard_c::initFightWait() {
     field_0xd9c = 0;
 }
 
-/* 809F04B4-809F06F4 0007D4 0240+00 1/0 0/0 0/0 .text            executeFightWait__12daNpcGuard_cFv
- */
 void daNpcGuard_c::executeFightWait() {
     f32 playerDist = fopAcM_searchPlayerDistanceXZ(this);
     f32 dist = playerDist - field_0xd98;
@@ -210,21 +196,16 @@ void daNpcGuard_c::executeFightWait() {
     }
 }
 
-/* 809F06F4-809F0700 000A14 000C+00 1/0 0/0 0/0 .text            initFightStep__12daNpcGuard_cFv */
 void daNpcGuard_c::initFightStep() {
     field_0xd9c = 0;
 }
 
-/* 809F0700-809F0778 000A20 0078+00 1/0 0/0 0/0 .text            executeFightStep__12daNpcGuard_cFv
- */
 void daNpcGuard_c::executeFightStep() {
     if (fopAcM_searchPlayerDistanceXZ2(this) > std::pow(500.0f, 2.0f)) {
         setAction(MODE_RUN_e);
     }
 }
 
-/* 809F0778-809F07F8 000A98 0080+00 1/0 0/0 0/0 .text            initFightMenace__12daNpcGuard_cFv
- */
 void daNpcGuard_c::initFightMenace() {
     setAnm((J3DAnmTransformKey*)getAnmP(43, mObjNum), 1.0f, 12.0f, 0, 0, -1);
     mCitizen.playVoice(2);
@@ -232,7 +213,6 @@ void daNpcGuard_c::initFightMenace() {
     field_0xd9c = 0;
 }
 
-/* 809F07F8-809F08DC 000B18 00E4+00 1/0 0/0 0/0 .text executeFightMenace__12daNpcGuard_cFv */
 void daNpcGuard_c::executeFightMenace() {
     field_0xda0 = fopAcM_searchPlayerAngleY(this);
     cLib_addCalcAngleS2(&shape_angle.y, field_0xda0, 0x3, 0x600);
@@ -245,7 +225,6 @@ void daNpcGuard_c::executeFightMenace() {
     }
 }
 
-/* 809F08DC-809F0960 000BFC 0084+00 1/0 0/0 0/0 .text            initFear__12daNpcGuard_cFv */
 void daNpcGuard_c::initFear() {
     setAnm((J3DAnmTransformKey*)getAnmP(46, 0), 1.0f, 4.0f, 2, 0, -1);
     field_0xd88 = cLib_getRndValue(0x96, 0x3C);
@@ -253,7 +232,6 @@ void daNpcGuard_c::initFear() {
     field_0xd9c = 0;
 }
 
-/* 809F0960-809F0A50 000C80 00F0+00 1/0 0/0 0/0 .text            executeFear__12daNpcGuard_cFv */
 void daNpcGuard_c::executeFear() {
     if (mpMorf->checkFrame(1.0f)) {
         mCitizen.playVoice(2);
@@ -279,7 +257,6 @@ void daNpcGuard_c::executeFear() {
     }
 }
 
-/* 809F0A50-809F0B20 000D70 00D0+00 1/0 0/0 0/0 .text            initEscape__12daNpcGuard_cFv */
 void daNpcGuard_c::initEscape() {
     setAnm((J3DAnmTransformKey*)getAnmP(4, 3), 2.0f, 8.0f, 2, 0, -1);
     mCitizen.playVoice(0);
@@ -289,7 +266,6 @@ void daNpcGuard_c::initEscape() {
     field_0xd9c = 1;
 }
 
-/* 809F0B20-809F0DD4 000E40 02B4+00 1/0 0/0 0/0 .text            executeEscape__12daNpcGuard_cFv */
 void daNpcGuard_c::executeEscape() {
     if (field_0xd9c != 0) {
         speedF = 20.0f;
@@ -330,12 +306,10 @@ void daNpcGuard_c::executeEscape() {
     }
 }
 
-/* 809F0DD4-809F0DE0 0010F4 000C+00 5/5 0/0 0/0 .text            setAngle__12daNpcGuard_cFv */
 void daNpcGuard_c::setAngle() {
     current.angle.y = shape_angle.y;
 }
 
-/* 809F0DE0-809F0ED4 001100 00F4+00 1/1 0/0 0/0 .text            setSpeed__12daNpcGuard_cFffPfi */
 void daNpcGuard_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4) {
     f32 target = field_0xd8c * (param_2 * field_0xd8c);
     f32 step = field_0xd8c * (param_1 * field_0xd8c);
@@ -354,7 +328,6 @@ void daNpcGuard_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4)
     cLib_chaseF(i_speed, target, step);
 }
 
-/* 809F0ED4-809F12D0 0011F4 03FC+00 1/1 0/0 0/0 .text            pathMoveF__12daNpcGuard_cFv */
 void daNpcGuard_c::pathMoveF() {
     f32 walkSpeed = 0.0f;
     f32 anmSpeed = 0.0f;
@@ -405,7 +378,6 @@ void daNpcGuard_c::pathMoveF() {
     }
 }
 
-/* 809F12D0-809F12F0 0015F0 0020+00 1/0 0/0 0/0 .text            daNpcGuard_Create__FPv */
 static int daNpcGuard_Create(void* i_this) {
     return static_cast<daNpcGuard_c*>(i_this)->create();
 }
@@ -444,7 +416,6 @@ void daNpcGuard_c::initCollision() {
     }
 }
 
-/* 809F14CC-809F17D0 0017EC 0304+00 1/1 0/0 0/0 .text            create_init__12daNpcGuard_cFv */
 void daNpcGuard_c::create_init() {
     gravity = -3.0f;
     fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
@@ -473,7 +444,6 @@ void daNpcGuard_c::create_init() {
     setMtx();
 }
 
-/* 809F17D0-809F1878 001AF0 00A8+00 2/2 0/0 0/0 .text            setMtx__12daNpcGuard_cFv */
 void daNpcGuard_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, field_0xd94, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -487,7 +457,6 @@ void daNpcGuard_c::setMtx() {
     setAttention(m_type);
 }
 
-/* 809F1878-809F1D6C 001B98 04F4+00 1/1 0/0 0/0 .text            lookat__12daNpcGuard_cFv */
 void daNpcGuard_c::lookat() {
     csXyz vecs1[3] = {
         csXyz(Cd2_HIO_maxLmtX_BACKBONE(m_type), Cd2_HIO_maxLmtY_BACKBONE(m_type), 0),
@@ -524,7 +493,6 @@ void daNpcGuard_c::lookat() {
     mLookat.action(cStack_80, eyePos, this, afStack_38, NULL != mActorMngr.getActorP());
 }
 
-/* 809F12F0-809F14CC 001610 01DC+00 1/1 0/0 0/0 .text            create__12daNpcGuard_cFv */
 int daNpcGuard_c::create() {
     fopAcM_ct(this, daNpcGuard_c);
 
@@ -543,13 +511,11 @@ int daNpcGuard_c::create() {
     return phase;
 }
 
-/* 809F1F40-809F1F74 002260 0034+00 1/0 0/0 0/0 .text            daNpcGuard_Delete__FPv */
 static int daNpcGuard_Delete(void* i_this) {
     static_cast<daNpcGuard_c*>(i_this)->~daNpcGuard_c();
     return 1;
 }
 
-/* 809F1F74-809F2024 002294 00B0+00 1/0 0/0 0/0 .text            __dt__12daNpcGuard_cFv */
 daNpcGuard_c::~daNpcGuard_c() {
     removeResrc(m_type, mObjNum);
     if (heap != NULL) {
@@ -557,7 +523,6 @@ daNpcGuard_c::~daNpcGuard_c() {
     }
 }
 
-/* 809F2024-809F2044 002344 0020+00 1/0 0/0 0/0 .text            daNpcGuard_Execute__FPv */
 static int daNpcGuard_Execute(void* i_this) {
     return static_cast<daNpcGuard_c*>(i_this)->execute();
 }
@@ -588,7 +553,6 @@ void daNpcGuard_c::setCollision() {
     }
 }
 
-/* 809F2044-809F2374 002364 0330+00 1/1 0/0 0/0 .text            execute__12daNpcGuard_cFv */
 int daNpcGuard_c::execute() {
     mAcchCir.SetWallH(Cd2_HIO_chkWallH(m_type));
     mAcchCir.SetWallR(m_type != 0 ? 90.0f : 45.0f);
@@ -631,24 +595,20 @@ int daNpcGuard_c::draw() {
     return 1;
 }
 
-/* 809F2374-809F2464 002694 00F0+00 1/0 0/0 0/0 .text            daNpcGuard_Draw__FPv */
 static int daNpcGuard_Draw(void* i_this) {
     return static_cast<daNpcGuard_c*>(i_this)->draw();
 }
 
-/* 809F2464-809F246C 002784 0008+00 1/0 0/0 0/0 .text            daNpcGuard_IsDelete__FPv */
 static int daNpcGuard_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 809F2EC0-809F2EE0 -00001 0020+00 1/0 0/0 0/0 .data            daNpcGuard_METHODS */
 static actor_method_class daNpcGuard_METHODS = {
     (process_method_func)daNpcGuard_Create,  (process_method_func)daNpcGuard_Delete,
     (process_method_func)daNpcGuard_Execute, (process_method_func)daNpcGuard_IsDelete,
     (process_method_func)daNpcGuard_Draw,
 };
 
-/* 809F2EE0-809F2F10 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GUARD */
 extern actor_process_profile_definition g_profile_NPC_GUARD = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp
index 7cd4e10aaa..6013dcf907 100644
--- a/src/d/actor/d_a_npc_gwolf.cpp
+++ b/src/d/actor/d_a_npc_gwolf.cpp
@@ -87,15 +87,12 @@ enum Motion {
     /* 0x8 */ MOT_DASHA,
 };
 
-/* 809F8F14-809F8F18 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_GWolf_Param_c l_HIO;
 
-/* 809F8814-809F881C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[1] = {
     {BMDR_GW, GWOLF},
 };
 
-/* 809F881C-809F887C 000028 0060+00 0/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[12] = {
     {-1, GWOLF},
     {-1, GWOLF},
@@ -111,17 +108,14 @@ static daNpc_GetParam1 l_bckGetParamList[12] = {
     {BCK_WL_DASHA, GWOLF},
 };
 
-/* 809F887C-809F8884 000088 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {BTK_GW, GWOLF},
 };
 
-/* 809F8884-809F888C 000090 0008+00 0/0 0/0 0/0 .data            l_brkGetParamList */
 static daNpc_GetParam1 l_brkGetParamList[1] = {
     {BRK_GW, GWOLF},
 };
 
-/* 809F888C-809F8904 000098 0078+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[15] = {
     {EVT_NONE, GWOLF},
     {EVT_ATTACK_WARP, GWOLF},
@@ -140,7 +134,6 @@ static daNpc_GetParam1 l_evtGetParamList[15] = {
     {EVT_MEET_GWOLFF, GWOLF},
 };
 
-/* 809F8904-809F8940 -00001 003C+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[15] = {
     NULL,
     "ATTACK_WARP",
@@ -159,17 +152,14 @@ static char* l_evtNames[15] = {
     "MEET_GWOLFF",
 };
 
-/* 809F8940-809F894C 00014C 000C+00 1/0 0/0 0/0 .data            l_loadRes_GWOLFa */
 static int l_loadRes_GWOLFa[3] = {
     GWOLF, -1, -1,
 };
 
-/* 809F894C-809F8958 000158 000C+00 1/0 0/0 0/0 .data            l_loadRes_GWOLF0 */
 static int l_loadRes_GWOLF0[3] = {
     GWOLF, -1, -1,
 };
 
-/* 809F8958-809F8968 -00001 0010+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[4] = {
     l_loadRes_GWOLFa,
     l_loadRes_GWOLFa,
@@ -177,13 +167,10 @@ static int* l_loadRes_list[4] = {
     l_loadRes_GWOLF0,
 };
 
-/* 809F8968-809F896C -00001 0004+00 4/7 0/0 0/0 .data            l_resNames */
 static char* l_resNames[1] = {"GWolf"};
 
-/* 809F896C-809F8970 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "GWolf";
 
-/* 809F8970-809F8980 00017C 000E+02 3/3 0/0 0/0 .data            l_appearTmpFlag */
 static s16 l_appearTmpFlag[7] = {
     -1,
     0x005C, // dSv_event_tmp_flag_c::T_0092 - Hero's spirit - Gold wolf identification 2
@@ -194,7 +181,6 @@ static s16 l_appearTmpFlag[7] = {
     0x0061, // dSv_event_tmp_flag_c::T_0097 - Hero's spirit - Gold wolf identification 7
 };
 
-/* 809F8980-809F8990 00018C 000E+02 2/2 0/0 0/0 .data            l_warpAppearFlag */
 static s16 l_warpAppearFlag[7] = {
     -1,
     0x01D8, // dSv_event_flag_c::F_0472 - Secret techniques - Distant howling complete (for secret technique 2)
@@ -205,7 +191,6 @@ static s16 l_warpAppearFlag[7] = {
     0x01DD, // dSv_event_flag_c::F_0477 - Secret techniques - Distant howling complete (for secret technique 7)
 };
 
-/* 809F8990-809F89A4 -00001 0014+00 0/1 0/0 0/0 .data            mEvtCutNameList__13daNpc_GWolf_c */
 char* daNpc_GWolf_c::mEvtCutNameList[5] = {
     "",
     "ATTACK_WARP",
@@ -214,7 +199,6 @@ char* daNpc_GWolf_c::mEvtCutNameList[5] = {
     "MEET_GWOLFA",
 };
 
-/* 809F89D4-809F8A10 0001E0 003C+00 0/2 0/0 0/0 .data            mEvtCutList__13daNpc_GWolf_c */
 daNpc_GWolf_c::cutFunc daNpc_GWolf_c::mEvtCutList[5] = {
     NULL,
     &daNpc_GWolf_c::ECut_attackWarp,
@@ -223,10 +207,8 @@ daNpc_GWolf_c::cutFunc daNpc_GWolf_c::mEvtCutList[5] = {
     &daNpc_GWolf_c::ECut_meetGWolf,
 };
 
-/* 809F30AC-809F3230 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__13daNpc_GWolf_cFv */
 daNpc_GWolf_c::daNpc_GWolf_c() {}
 
-/* 809F32C0-809F34C0 000300 0200+00 1/0 0/0 0/0 .text            __dt__13daNpc_GWolf_cFv */
 daNpc_GWolf_c::~daNpc_GWolf_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -237,8 +219,6 @@ daNpc_GWolf_c::~daNpc_GWolf_c() {
     }
 }
 
-/* ############################################################################################## */
-/* 809F84F4-809F8580 000000 008C+00 17/17 0/0 0/0 .rodata          m__19daNpc_GWolf_Param_c */
 daNpc_GWolf_HIOParam const daNpc_GWolf_Param_c::m = {
     30.0f,
     -4.0f,
@@ -283,7 +263,6 @@ daNpc_GWolf_HIOParam const daNpc_GWolf_Param_c::m = {
     120.0f,
 };
 
-/* 809F34C0-809F37C0 000500 0300+00 1/1 0/0 0/0 .text            create__13daNpc_GWolf_cFv */
 cPhs__Step daNpc_GWolf_c::create() {
     fopAcM_ct(this, daNpc_GWolf_c);
 
@@ -351,7 +330,6 @@ cPhs__Step daNpc_GWolf_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 809F37C0-809F3A1C 000800 025C+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_GWolf_cFv */
 int daNpc_GWolf_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -386,19 +364,16 @@ int daNpc_GWolf_c::CreateHeap() {
     return 1;
 }
 
-/* 809F3BD8-809F3C0C 000C18 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_GWolf_cFv */
 int daNpc_GWolf_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_GWolf_c();
     return 1;
 }
 
-/* 809F3C0C-809F3C2C 000C4C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_GWolf_cFv */
 int daNpc_GWolf_c::Execute() {
     return execute();
 }
 
-/* 809F3C2C-809F3CBC 000C6C 0090+00 1/1 0/0 0/0 .text            Draw__13daNpc_GWolf_cFv */
 int daNpc_GWolf_c::Draw() {
     J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
     mdlData_p->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
@@ -408,7 +383,6 @@ int daNpc_GWolf_c::Draw() {
     );
 }
 
-/* 809F3CBC-809F3FB8 000CFC 02FC+00 1/1 0/0 0/0 .text draw__13daNpc_GWolf_cFiifP11_GXColorS10i */
 int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_color, int param_5) {
     J3DModel* model = mAnm_p->getModel();
     J3DModelData* mdlData_p = model->getModelData();
@@ -482,7 +456,6 @@ int daNpc_GWolf_c::draw(int param_1, int param_2, f32 param_3, _GXColorS10* i_co
     return 1;
 }
 
-/* 809F3FB8-809F41EC 000FF8 0234+00 1/1 0/0 0/0 .text            ctrlJoint__13daNpc_GWolf_cFP8J3DJointP8J3DModel */
 int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {1, 3, 4};
@@ -526,12 +499,10 @@ int daNpc_GWolf_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 809F41EC-809F420C 00122C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_GWolf_cFP10fopAc_ac_c */
 int daNpc_GWolf_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_GWolf_c*>(a_this)->CreateHeap();
 }
 
-/* 809F420C-809F4258 00124C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_GWolf_cFP8J3DJointi */
 int daNpc_GWolf_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -545,7 +516,6 @@ int daNpc_GWolf_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 809F4258-809F4390 001298 0138+00 1/0 0/0 0/0 .text            setParam__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::setParam() {
     actionFunc action = mNextAction;
     u32 flag = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -579,7 +549,6 @@ void daNpc_GWolf_c::setParam() {
     }
 }
 
-/* 809F4390-809F4558 0013D0 01C8+00 1/0 0/0 0/0 .text            main__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -620,7 +589,6 @@ BOOL daNpc_GWolf_c::main() {
     return TRUE;
 }
 
-/* 809F4558-809F4638 001598 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* i_btk = NULL;
@@ -642,7 +610,6 @@ BOOL daNpc_GWolf_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 809F4638-809F4698 001678 0060+00 1/0 0/0 0/0 .text            adjustShapeAngle__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::adjustShapeAngle() {
     s16 target = 0;
 
@@ -654,7 +621,6 @@ void daNpc_GWolf_c::adjustShapeAngle() {
     mCurAngle.x = shape_angle.x;
 }
 
-/* 809F4698-809F4BB0 0016D8 0518+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::setAttnPos() {
     static cXyz eyeOffset(35.0f, 0.0f, 0.0f);
 
@@ -733,17 +699,14 @@ void daNpc_GWolf_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 809F4BB0-809F4BB8 001BF0 0008+00 1/0 0/0 0/0 .text setExpressionAnm__13daNpc_GWolf_cFib */
 bool daNpc_GWolf_c::setExpressionAnm(int i_index, bool i_modify) {
     return true;
 }
 
-/* 809F4BB8-809F4BBC 001BF8 0004+00 1/0 0/0 0/0 .text            setExpression__13daNpc_GWolf_cFif */
 void daNpc_GWolf_c::setExpression(int i_index, f32 i_morf) {
     /* empty function */
 }
 
-/* 809F4BBC-809F4DE8 001BFC 022C+00 2/0 0/0 0/0 .text            setMotionAnm__13daNpc_GWolf_cFif */
 void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* i_bck = NULL;
     J3DAnmTextureSRTKey* i_btk = NULL;
@@ -819,7 +782,6 @@ void daNpc_GWolf_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 809F4DE8-809F4E2C 001E28 0044+00 1/0 0/0 0/0 .text            setMotion__13daNpc_GWolf_cFifi */
 void daNpc_GWolf_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
 
@@ -831,17 +793,14 @@ void daNpc_GWolf_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 809F4E2C-809F4E34 001E6C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 809F4E34-809F4E38 001E74 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 809F4E38-809F4E84 001E78 004C+00 1/1 0/0 0/0 .text            getTypeFromParam__13daNpc_GWolf_cFv */
 u8 daNpc_GWolf_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0 :
@@ -857,7 +816,6 @@ u8 daNpc_GWolf_c::getTypeFromParam() {
     }
 }
 
-/* 809F4E84-809F4F00 001EC4 007C+00 2/1 0/0 0/0 .text            getModeFromParam__13daNpc_GWolf_cFv */
 int daNpc_GWolf_c::getModeFromParam() {
     u8 uVar1 = (fopAcM_GetParam(this) & 0xFF00) >> 8;
 
@@ -889,7 +847,6 @@ int daNpc_GWolf_c::getModeFromParam() {
     return -1;
 }
 
-/* 809F4F00-809F4FF4 001F40 00F4+00 1/1 0/0 0/0 .text            isDelete__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::isDelete() {
     static s16 l_delFlag[7] = {
         0x0153, 0x01EC, 0x01ED, 0x01EE, 0x01EF, 0x01F0, 0x01F1,
@@ -923,7 +880,6 @@ BOOL daNpc_GWolf_c::isDelete() {
     return TRUE;
 }
 
-/* 809F4FF4-809F520C 002034 0218+00 1/1 0/0 0/0 .text            reset__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -965,7 +921,6 @@ void daNpc_GWolf_c::reset() {
     field_0x9ee = true;
 }
 
-/* 809F520C-809F55D0 00224C 03C4+00 1/1 0/0 0/0 .text            playMotion__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAITSIT, daNpc_GWolf_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1027,12 +982,10 @@ void daNpc_GWolf_c::playMotion() {
     }
 }
 
-/* 809F55D0-809F55FC 002610 002C+00 2/2 0/0 0/0 .text            chkAction__13daNpc_GWolf_cFM13daNpc_GWolf_cFPCvPvPv_i */
 BOOL daNpc_GWolf_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 809F55FC-809F56A4 00263C 00A8+00 2/2 0/0 0/0 .text            setAction__13daNpc_GWolf_cFM13daNpc_GWolf_cFPCvPvPv_i */
 BOOL daNpc_GWolf_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -1050,7 +1003,6 @@ BOOL daNpc_GWolf_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 809F56A4-809F5770 0026E4 00CC+00 1/1 0/0 0/0 .text            selectAction__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::selectAction() {
     mNextAction = NULL;
 
@@ -1075,7 +1027,6 @@ BOOL daNpc_GWolf_c::selectAction() {
     return TRUE;
 }
 
-/* 809F5770-809F5884 0027B0 0114+00 1/1 0/0 0/0 .text            doNormalAction__13daNpc_GWolf_cFi */
 void daNpc_GWolf_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int damage_time;
@@ -1103,7 +1054,6 @@ void daNpc_GWolf_c::doNormalAction(int param_1) {
     }
 }
 
-/* 809F5884-809F5B60 0028C4 02DC+00 1/1 0/0 0/0 .text            doEvent__13daNpc_GWolf_cFv */
 BOOL daNpc_GWolf_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -1190,14 +1140,12 @@ BOOL daNpc_GWolf_c::doEvent() {
     return rv;
 }
 
-/* 809F5B60-809F5B84 002BA0 0024+00 10/10 0/0 0/0 .text            setLookMode__13daNpc_GWolf_cFi */
 void daNpc_GWolf_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 809F5B84-809F5E0C 002BC4 0288+00 1/1 0/0 0/0 .text            lookat__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1257,7 +1205,6 @@ void daNpc_GWolf_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 809F5E0C-809F6548 002E4C 073C+00 3/0 0/0 0/0 .text            ECut_attackWarp__13daNpc_GWolf_cFi */
 BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int iVar1 = 0;
@@ -1396,7 +1343,6 @@ BOOL daNpc_GWolf_c::ECut_attackWarp(int i_staffId) {
     return rv;
 }
 
-/* 809F6548-809F6BFC 003588 06B4+00 3/0 0/0 0/0 .text ECut_attackWarpHorse__13daNpc_GWolf_cFi */
 BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int iVar1 = 0;
@@ -1527,7 +1473,6 @@ BOOL daNpc_GWolf_c::ECut_attackWarpHorse(int i_staffId) {
     return rv;
 }
 
-/* 809F6BFC-809F7084 003C3C 0488+00 1/0 0/0 0/0 .text            ECut_howlingSessionA__13daNpc_GWolf_cFi */
 BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     daPy_getPlayerActorClass();
@@ -1665,13 +1610,11 @@ BOOL daNpc_GWolf_c::ECut_howlingSessionA(int i_staffId) {
     return rv;
 }
 
-/* 809F7084-809F70A8 0040C4 0024+00 1/1 0/0 0/0 .text            callback_proc__FPvi */
 static BOOL callback_proc(void* i_actor, int i_data) {
     static_cast<daNpc_GWolf_c*>(i_actor)->meetGWolfSkip();
     return TRUE;
 }
 
-/* 809F70A8-809F70EC 0040E8 0044+00 1/1 0/0 0/0 .text            meetGWolfSkip__13daNpc_GWolf_cFv */
 void daNpc_GWolf_c::meetGWolfSkip() {
     mOrderEvtNo = EVT_NONE;
     mEventIdx = -1;
@@ -1679,7 +1622,6 @@ void daNpc_GWolf_c::meetGWolfSkip() {
     dComIfGp_event_reset();
 }
 
-/* 809F70EC-809F71E0 00412C 00F4+00 1/0 0/0 0/0 .text            ECut_meetGWolf__13daNpc_GWolf_cFi */
 BOOL daNpc_GWolf_c::ECut_meetGWolf(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     daPy_getPlayerActorClass();
@@ -1708,7 +1650,6 @@ BOOL daNpc_GWolf_c::ECut_meetGWolf(int i_staffId) {
     return TRUE;
 }
 
-/* 809F71E0-809F75C0 004220 03E0+00 1/0 0/0 0/0 .text            wait__13daNpc_GWolf_cFPv */
 BOOL daNpc_GWolf_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1787,7 +1728,6 @@ BOOL daNpc_GWolf_c::wait(void* param_1) {
     return TRUE;
 }
 
-/* 809F75C0-809F775C 004600 019C+00 1/0 0/0 0/0 .text            waitHowling__13daNpc_GWolf_cFPv */
 BOOL daNpc_GWolf_c::waitHowling(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1827,7 +1767,6 @@ BOOL daNpc_GWolf_c::waitHowling(void* param_1) {
     return TRUE;
 }
 
-/* 809F775C-809F77E4 00479C 0088+00 1/0 0/0 0/0 .text            waitBrave__13daNpc_GWolf_cFPv */
 BOOL daNpc_GWolf_c::waitBrave(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1843,7 +1782,6 @@ BOOL daNpc_GWolf_c::waitBrave(void* param_1) {
     return TRUE;
 }
 
-/* 809F77E4-809F797C 004824 0198+00 2/0 0/0 0/0 .text            talk__13daNpc_GWolf_cFPv */
 BOOL daNpc_GWolf_c::talk(void* param_1) {
     BOOL rv = FALSE;
     BOOL bVar1 = FALSE;
@@ -1898,7 +1836,6 @@ BOOL daNpc_GWolf_c::talk(void* param_1) {
     return rv;
 }
 
-/* 809F797C-809F7A30 0049BC 00B4+00 2/0 0/0 0/0 .text            test__13daNpc_GWolf_cFPv */
 BOOL daNpc_GWolf_c::test(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1920,7 +1857,6 @@ BOOL daNpc_GWolf_c::test(void* param_1) {
     return TRUE;
 }
 
-/* 809F7A30-809F7AB0 004A70 0080+00 1/1 0/0 0/0 .text            getGroundSlope__13daNpc_GWolf_cFR12dBgS_ObjAcchs */
 s16 daNpc_GWolf_c::getGroundSlope(dBgS_ObjAcch& i_acch, s16 param_2) {
     cM3dGPla plane;
     if (dComIfG_Bgsp().GetTriPla(i_acch.m_gnd, &plane)) {
@@ -1930,34 +1866,28 @@ s16 daNpc_GWolf_c::getGroundSlope(dBgS_ObjAcch& i_acch, s16 param_2) {
     return 0;
 }
 
-/* 809F7AF8-809F7B18 004B38 0020+00 1/0 0/0 0/0 .text            daNpc_GWolf_Create__FPv */
 static int daNpc_GWolf_Create(void* a_this) {
     return static_cast<daNpc_GWolf_c*>(a_this)->create();
 }
 
-/* 809F7B18-809F7B38 004B58 0020+00 1/0 0/0 0/0 .text            daNpc_GWolf_Delete__FPv */
 static int daNpc_GWolf_Delete(void* a_this) {
     return static_cast<daNpc_GWolf_c*>(a_this)->Delete();
 }
 
-/* 809F7B38-809F7B58 004B78 0020+00 1/0 0/0 0/0 .text            daNpc_GWolf_Execute__FPv */
 static int daNpc_GWolf_Execute(void* a_this) {
     return static_cast<daNpc_GWolf_c*>(a_this)->Execute();
 }
 
-/* 809F7B58-809F7B78 004B98 0020+00 1/0 0/0 0/0 .text            daNpc_GWolf_Draw__FPv */
 static int daNpc_GWolf_Draw(void* a_this) {
     return static_cast<daNpc_GWolf_c*>(a_this)->Draw();
 }
 
-/* 809F7B78-809F7B80 004BB8 0008+00 1/0 0/0 0/0 .text            daNpc_GWolf_IsDelete__FPv */
 static int daNpc_GWolf_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 809F8D7C-809F8D9C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_GWolf_MethodTable */
 static actor_method_class daNpc_GWolf_MethodTable = {
     (process_method_func)daNpc_GWolf_Create,
     (process_method_func)daNpc_GWolf_Delete,
@@ -1966,7 +1896,6 @@ static actor_method_class daNpc_GWolf_MethodTable = {
     (process_method_func)daNpc_GWolf_Draw,
 };
 
-/* 809F8D9C-809F8DCC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_GWOLF */
 extern actor_process_profile_definition g_profile_NPC_GWOLF = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp
index 09eee36126..3d37511191 100644
--- a/src/d/actor/d_a_npc_hanjo.cpp
+++ b/src/d/actor/d_a_npc_hanjo.cpp
@@ -13,21 +13,13 @@
 #include "d/actor/d_a_tag_evtarea.h"
 #include "d/d_cc_uty.h"
 #include "Z2AudioLib/Z2Instances.h"
-#include "dol2asm.h"
 
-
-//
-// Declarations:
-//
-
-/* 80A00960-80A00980 000020 0020+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[4][2] = {
     {14, 1}, {26, 2},
     {25, 2}, {3, 4},
 };
 
-/* 80A00980-80A009D8 -00001 0058+00 1/2 0/0 0/0 .data            l_evtList */
-SECTION_DATA static daNpcT_evtData_c l_evtList[11] = {
+static daNpcT_evtData_c l_evtList[11] = {
     {"", 0},
     {"NO_RESPONSE", 0},
     {"CONVERSATION_ABOUT_SARU01", 5},
@@ -43,7 +35,6 @@ SECTION_DATA static daNpcT_evtData_c l_evtList[11] = {
 
 
 
-/* 80A009D8-80A009F0 -00001 0018+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[6] = {
     "",
     "Hanjo",
@@ -53,14 +44,12 @@ static char* l_resNameList[6] = {
     "Sera",
 };
 
-/* 80A009F0-80A009F4 0000B0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     1,
     2,
     -1,
 };
 
-/* 80A009F4-80A009FC 0000B4 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[5] = {
     1,
     2,
@@ -69,12 +58,10 @@ static s8 l_loadResPtrn1[5] = {
     -1,
 };
 
-/* 80A009FC-80A00A00 0000BC 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[2] = {
     1, -1
 };
 
-/* 80A00A00-80A00A08 0000C0 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {
     1,
     2,
@@ -83,14 +70,12 @@ static s8 l_loadResPtrn9[5] = {
     -1,
 };
 
-/* 80A00A08-80A00A1C -00001 0014+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[5] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1,
     l_loadResPtrn2, l_loadResPtrn9,
 };
 
-/* 80A00A1C-80A00B34 0000DC 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
-SECTION_DATA static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
+static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, 0, 0, 20, 2, 1, 1}, 
     {7, 0, 1, 20, 2, 1, 1}, 
     {7, 0, 2, 34, 0, 2, 0},
@@ -103,8 +88,7 @@ SECTION_DATA static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
      { 11, 2, 2, 38, 2, 2, 0},
 };
 
-/* 80A00B34-80A00DB8 0001F4 0284+00 1/2 0/0 0/0 .data            l_motionAnmData */
-    SECTION_DATA static int l_motionAnmData[161] = {
+static int l_motionAnmData[161] = {
     11, 2, 1, 17, 0, 1, 65536, 22, 2, 2, 17, 0, 1, 65536, 16, 2, 2, 17, 0, 1, 65536,
     13, 2, 2, 17, 0, 1, 65536, 21, 2, 2, 31, 2, 2, 0,     20, 0, 2, 30, 0, 2, 0,
     14, 0, 2, 29, 0, 2, 0,     8,  2, 1, 17, 0, 1, 65536, 6,  0, 1, 17, 0, 1, 65536,
@@ -114,14 +98,12 @@ SECTION_DATA static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     10, 0, 3, 17, 0, 1, 65536, 9,  0, 1, 17, 0, 1, 65536, 11, 0, 3, 17, 0, 1, 65536,
     10, 0, 1, 17, 0, 1, 65536, -1, 0, 0, 17, 0, 1, 65536};
 
-/* 80A00DB8-80A00E38 000478 0080+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {4, 0, 0},  {-1, 0, 0}, {-1, 0, 0},
     {8, -1, 1}, {9, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {6, -1, 1}, {7, 0, 0},  {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}};
 
-/* 80A00E38-80A00F78 0004F8 0140+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {21, -1, 1}, {0, 0, 0},   {-1, 0, 0},
     {-1, 0, 0},  {4, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {11, -1, 1}, {9, 0, 0},
@@ -136,8 +118,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = {
     {-1, 0, 0},  {-1, 0, 0},  {8, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {9, -1, 0},
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}};
 
-/* 80A00F78-80A00F90 -00001 0018+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Hanjo_c */
-SECTION_DATA char* daNpc_Hanjo_c::mCutNameList[6] = {
+char* daNpc_Hanjo_c::mCutNameList[6] = {
     "",
     "CONVERSATION_ABOUT_SARU",
     "CONVERSATION",
@@ -146,7 +127,6 @@ SECTION_DATA char* daNpc_Hanjo_c::mCutNameList[6] = {
     "DIVE",
 };
 
-/* 80A00FCC-80A01014 00068C 0048+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Hanjo_c */
 daNpc_Hanjo_c::cutFunc daNpc_Hanjo_c::mCutList[6] = {
     NULL,
     &daNpc_Hanjo_c::cutConversationAboutSaru,
@@ -156,13 +136,11 @@ daNpc_Hanjo_c::cutFunc daNpc_Hanjo_c::mCutList[6] = {
     &daNpc_Hanjo_c::cutDive,
 };
 
-/* 80A01014-80A01054 0006D4 0040+00 0/1 0/0 0/0 .data            mStoneCcDSph__13daNpc_Hanjo_c */
 dCcD_SrcSph daNpc_Hanjo_c::mStoneCcDSph = {
     daNpc_Hanjo_c::mStoneCcDObjInfo, {}
 };
 
 
-/* 809F908C-809F9278 0000EC 01EC+00 1/0 0/0 0/0 .text            __dt__13daNpc_Hanjo_cFv */
 daNpc_Hanjo_c::~daNpc_Hanjo_c() {
     OS_REPORT("|%06d:%x|daNpc_Hanjo_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (mpMorf[0] != 0) {
@@ -171,8 +149,6 @@ daNpc_Hanjo_c::~daNpc_Hanjo_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80A00600-80A006B4 000000 00B4+00 19/19 0/0 0/0 .rodata          m__19daNpc_Hanjo_Param_c */
 daNpc_Hanjo_Param_c::Data const daNpc_Hanjo_Param_c::m = {
     160.0f, -3.0f, 1.0f, 400.0f, 
     255.0f, 160.0f, 35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f,
@@ -182,8 +158,6 @@ daNpc_Hanjo_Param_c::Data const daNpc_Hanjo_Param_c::m = {
      80.0f, 65.0f, 4.0f, 600.0f, 136.0f, 0x500, 90, 90, 2,
 };
 
-/* 80A006B4-80A006E4 0000B4 0030+00 1/1 0/0 0/0 .rodata          mStoneCcDObjInfo__13daNpc_Hanjo_c
- */
 dCcD_SrcGObjInf const daNpc_Hanjo_c::mStoneCcDObjInfo = {
     {0, {{0, 0, 0}, {0, 0}, {0x79}}},
     {0, 0, 0, 0, {0}},
@@ -191,7 +165,6 @@ dCcD_SrcGObjInf const daNpc_Hanjo_c::mStoneCcDObjInfo = {
     {{0}},
 };
 
-/* 809F9278-809F9578 0002D8 0300+00 1/1 0/0 0/0 .text            create__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::create() {
     static int const heapSize[5] = {0x61B0, 0x41D0, 0x39D0, 0x39C0, 0};
     daNpcT_ct(this, daNpc_Hanjo_c, l_faceMotionAnmData,
@@ -246,7 +219,6 @@ int daNpc_Hanjo_c::create() {
     return rv;
 }
 
-/* 809F9578-809F997C 0005D8 0404+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::CreateHeap() {
     static int const bmdTypeList[2] = {2, 3};
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(
@@ -321,7 +293,6 @@ int daNpc_Hanjo_c::CreateHeap() {
     return 0;
 }
 
-/* 809F9B38-809F9B6C 000B98 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Hanjo_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -329,12 +300,10 @@ int daNpc_Hanjo_c::Delete() {
     return 1;
 }
 
-/* 809F9B6C-809F9B8C 000BCC 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 809F9B8C-809F9C20 000BEC 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -343,14 +312,10 @@ int daNpc_Hanjo_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 809F9C20-809F9C40 000C80 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Hanjo_cFP10fopAc_ac_c            */
 int daNpc_Hanjo_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Hanjo_c*>(i_this)->CreateHeap();
 }
 
-/* 809F9C40-809F9C98 000CA0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Hanjo_cFP8J3DJointi               */
 int daNpc_Hanjo_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -362,7 +327,6 @@ int daNpc_Hanjo_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     return 1;
 }
 
-/* 809F9C98-809F9CF0 000CF8 0058+00 1/1 0/0 2/2 .text            getType__13daNpc_Hanjo_cFv */
 u8 daNpc_Hanjo_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
     case 0:
@@ -378,7 +342,6 @@ u8 daNpc_Hanjo_c::getType() {
     }
 }
 
-/* 809F9CF0-809F9D9C 000D50 00AC+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -399,7 +362,6 @@ int daNpc_Hanjo_c::isDelete() {
     }
 }
 
-/* 809F9D9C-809F9FCC 000DFC 0230+00 1/1 0/0 0/0 .text            reset__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::reset() {
     csXyz acStack_20;
     int iVar1 = (u8*)&field_0x1728 - (u8*)&field_0x16e0;
@@ -439,7 +401,6 @@ void daNpc_Hanjo_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 809F9FCC-809FA050 00102C 0084+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Hanjo_cFi */
 void daNpc_Hanjo_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -450,7 +411,6 @@ void daNpc_Hanjo_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 809FA050-809FA1C4 0010B0 0174+00 1/0 0/0 0/0 .text            setParam__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::setParam() {
     selectAction();
     srchActors();
@@ -492,8 +452,6 @@ void daNpc_Hanjo_c::setParam() {
     gravity = daNpc_Hanjo_Param_c::m.field_0x04;
 }
 
-/* 809FA1C4-809FA3B8 001224 01F4+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Hanjo_cFv
- */
 BOOL daNpc_Hanjo_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Hanjo_c::talk)) {
         mPreItemNo = 0;
@@ -552,7 +510,6 @@ BOOL daNpc_Hanjo_c::checkChangeEvt() {
 }
 
 
-/* 809FA3B8-809FA45C 001418 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::setAfterTalkMotion() {
     int iVar2 = 7;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -571,7 +528,6 @@ void daNpc_Hanjo_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 809FA45C-809FA55C 0014BC 0100+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::srchActors() {
     switch(mType) {
     case TYPE_0:
@@ -597,7 +553,6 @@ void daNpc_Hanjo_c::srchActors() {
     }
 }
 
-/* 809FA55C-809FA5FC 0015BC 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Hanjo_cFv */
 BOOL daNpc_Hanjo_c::evtTalk() {
     if (chkAction(&daNpc_Hanjo_c::talk)) {
         (this->*field_0x16ec)(NULL);
@@ -607,7 +562,6 @@ BOOL daNpc_Hanjo_c::evtTalk() {
     return 1;
 }
 
-/* 809FA5FC-809FA6C4 00165C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Hanjo_cFv */
 BOOL daNpc_Hanjo_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Hanjo", this, -1);
     if (staffId != -1) {
@@ -622,7 +576,6 @@ BOOL daNpc_Hanjo_c::evtCutProc() {
     return false;
 }
 
-/* 809FA6C4-809FA88C 001724 01C8+00 1/0 0/0 0/0 .text            action__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::action() {
     fopAc_ac_c* hitActor = hitChk(&mCyl1, 0xffffffff);
     if (hitActor != NULL) {
@@ -652,7 +605,6 @@ void daNpc_Hanjo_c::action() {
     }
 }
 
-/* 809FA88C-809FAABC 0018EC 0230+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::beforeMove() {
     cXyz oldPos;
     cXyz pos;
@@ -684,7 +636,6 @@ void daNpc_Hanjo_c::beforeMove() {
     }
 }
 
-/* 809FAABC-809FABB8 001B1C 00FC+00 1/0 0/0 0/0 .text            afterMoved__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::afterMoved() {
     cXyz cStack_1c;
     for (int i = 0; i < 4; i++) {
@@ -700,10 +651,8 @@ void daNpc_Hanjo_c::afterMoved() {
     }
 }
 
-/* 80A012D4-80A012D8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Hanjo_Param_c l_HIO;
 
-/* 809FABB8-809FAF90 001C18 03D8+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::setAttnPos() {
     cXyz cStack_38(-10.0f, 10.0f, 0.0f);
     cXyz cStack_44;
@@ -746,7 +695,6 @@ void daNpc_Hanjo_c::setAttnPos() {
     }
 }
 
-/* 809FAF90-809FB2C4 001FF0 0334+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::setCollision() {
     cXyz cStack_4c;
     if (mHide == 0) {
@@ -816,12 +764,10 @@ void daNpc_Hanjo_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 809FB2C4-809FB2CC 002324 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::drawDbgInfo() {
     return 0;
 }
 
-/* 809FB2CC-809FB59C 00232C 02D0+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::drawOtherMdl() {
     Mtx mtx;
     J3DModel* model = mpMorf[0]->getModel();
@@ -860,7 +806,6 @@ void daNpc_Hanjo_c::drawOtherMdl() {
     }
 }
 
-/* 809FB59C-809FB6CC 0025FC 0130+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::selectAction() {
     field_0x16e0 = NULL;
     switch(mType) {
@@ -883,14 +828,10 @@ int daNpc_Hanjo_c::selectAction() {
     return 1;
 }
 
-/* 809FB6CC-809FB6F8 00272C 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Hanjo_cFM13daNpc_Hanjo_cFPCvPvPv_i        */
 int daNpc_Hanjo_c::chkAction(int (daNpc_Hanjo_c::*action)(void*)) {
     return field_0x16ec == action;
 }
 
-/* 809FB6F8-809FB7A0 002758 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Hanjo_cFM13daNpc_Hanjo_cFPCvPvPv_i        */
 int daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*action)(void*)) {
     mMode = 3;
     if (field_0x16ec != NULL) {
@@ -904,7 +845,6 @@ int daNpc_Hanjo_c::setAction(int (daNpc_Hanjo_c::*action)(void*)) {
     return 1;
 }
 
-/* 809FB7A0-809FB90C 002800 016C+00 2/2 0/0 0/0 .text            initShoot__13daNpc_Hanjo_cFi */
 void daNpc_Hanjo_c::initShoot(int param_1) {
     if (param_1 != 0) {
         mFaceMotionSeqMngr.setNo( 7, -1.0f, 0, 0);
@@ -917,7 +857,6 @@ void daNpc_Hanjo_c::initShoot(int param_1) {
     }
 }
 
-/* 809FB90C-809FBB94 00296C 0288+00 2/2 0/0 0/0 .text            shoot__13daNpc_Hanjo_cFi */
 int daNpc_Hanjo_c::shoot(int param_1) {
     csXyz cStack_60;
     f32 dVar13 = daNpc_Hanjo_Param_c::m.field_0x98;
@@ -965,7 +904,6 @@ int daNpc_Hanjo_c::shoot(int param_1) {
     return 0;
 }
 
-/* 809FBB94-809FBC3C 002BF4 00A8+00 2/2 0/0 0/0 .text            initDive__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::initDive() {
     mFaceMotionSeqMngr.setNo(6, -1.0f, 0, 0);
     mMotionSeqMngr.setNo(18, -1.0f, 0, 0);
@@ -973,7 +911,6 @@ void daNpc_Hanjo_c::initDive() {
     field_0x1721 = 1;
 }
 
-/* 809FBC3C-809FC06C 002C9C 0430+00 1/1 0/0 0/0 .text            dive__13daNpc_Hanjo_cFv */
 void daNpc_Hanjo_c::dive() {
     f32 local_34;
     if (fopAcM_getWaterY(&current.pos, &local_34) != 0) {
@@ -1036,7 +973,6 @@ void daNpc_Hanjo_c::dive() {
     }
 }
 
-/* 809FC06C-809FC1BC 0030CC 0150+00 1/1 0/0 0/0 .text            lookround__13daNpc_Hanjo_cFs */
 int daNpc_Hanjo_c::lookround(s16 param_1) {
     if (field_0x171e != 0) {
         cLib_addCalcAngleS2(&current.angle.y, param_1, 4, 0x800);
@@ -1066,7 +1002,6 @@ int daNpc_Hanjo_c::lookround(s16 param_1) {
     return 1;
 }
 
-/* 809FC1BC-809FC2E4 00321C 0128+00 1/1 0/0 0/0 .text            commandToHawk__13daNpc_Hanjo_cFv */
 int daNpc_Hanjo_c::commandToHawk() {
     daNPC_TK_c* pTkNpc = (daNPC_TK_c*)field_0x10c8[2].getActorP();
     int rv = 0;
@@ -1098,8 +1033,6 @@ int daNpc_Hanjo_c::commandToHawk() {
     return rv == 1;
 }
 
-/* 809FC2E4-809FC438 003344 0154+00 1/0 0/0 0/0 .text cutConversationAboutSaru__13daNpc_Hanjo_cFi
- */
 int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) {
     int rv = 0;
     int iVar4 = -1;
@@ -1135,8 +1068,6 @@ int daNpc_Hanjo_c::cutConversationAboutSaru(int staffIdx) {
     return rv;
 }
 
-/* 809FC438-809FC80C 003498 03D4+00 1/0 0/0 0/0 .text            cutConversation__13daNpc_Hanjo_cFi
- */
 int daNpc_Hanjo_c::cutConversation(int param_1) {
     int rv = 0;
     int iVar9 = -1;
@@ -1216,7 +1147,6 @@ int daNpc_Hanjo_c::cutConversation(int param_1) {
     return rv;
 }
 
-/* 809FC80C-809FCDC4 00386C 05B8+00 1/0 0/0 0/0 .text            cutPursuitBee__13daNpc_Hanjo_cFi */
 int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
     cXyz cStack_6c;
     int rv = 0;
@@ -1352,8 +1282,6 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
     return rv;
 }
 
-/* 809FCDC4-809FD3C0 003E24 05FC+00 1/0 0/0 0/0 .text            cutAppearHawker__13daNpc_Hanjo_cFi
- */
 int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
     cXyz cStack_a4;
     int rv = 0;
@@ -1491,7 +1419,6 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
     return rv;
 }
 
-/* 809FD3C0-809FD86C 004420 04AC+00 1/0 0/0 0/0 .text            cutDive__13daNpc_Hanjo_cFi */
 int daNpc_Hanjo_c::cutDive(int param_1) {
     cXyz cStack_2c;
     csXyz cStack_34;
@@ -1595,7 +1522,6 @@ int daNpc_Hanjo_c::cutDive(int param_1) {
     return rv;
 }
 
-/* 809FD86C-809FDEFC 0048CC 0690+00 2/0 0/0 0/0 .text            wait__13daNpc_Hanjo_cFPv */
 int daNpc_Hanjo_c::wait(void* param_0) {
     switch(mMode) {
     case 0:
@@ -1719,7 +1645,6 @@ int daNpc_Hanjo_c::wait(void* param_0) {
     return 1;
 }
 
-/* 809FDEFC-809FE2E0 004F5C 03E4+00 1/0 0/0 0/0 .text            throwStone__13daNpc_Hanjo_cFPv */
 int daNpc_Hanjo_c::throwStone(void* param_0) {
     int sVar4 = daNpc_Hanjo_Param_c::m.field_0xae;
     switch(mMode) {
@@ -1791,7 +1716,6 @@ int daNpc_Hanjo_c::throwStone(void* param_0) {
     return 1;
 }
 
-/* 809FE2E0-809FEAEC 005340 080C+00 1/0 0/0 0/0 .text            takayose__13daNpc_Hanjo_cFPv */
 int daNpc_Hanjo_c::takayose(void* param_0) {
     f32 dVar8 = daNpc_Hanjo_Param_c::m.field_0xae;
     cXyz cStack_50;
@@ -1933,7 +1857,6 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
     return 1;
 }
 
-/* 809FEAEC-809FED58 005B4C 026C+00 3/0 0/0 0/0 .text            talk__13daNpc_Hanjo_cFPv */
 int daNpc_Hanjo_c::talk(void* param_0) {
     switch(mMode) {
     case 0:
@@ -1979,34 +1902,28 @@ int daNpc_Hanjo_c::talk(void* param_0) {
     return 0;
 }
 
-/* 809FED58-809FED78 005DB8 0020+00 1/0 0/0 0/0 .text            daNpc_Hanjo_Create__FPv */
 static int daNpc_Hanjo_Create(void* i_this) {
     return static_cast<daNpc_Hanjo_c*>(i_this)->create();
 }
 
-/* 809FED78-809FED98 005DD8 0020+00 1/0 0/0 0/0 .text            daNpc_Hanjo_Delete__FPv */
 static int daNpc_Hanjo_Delete(void* i_this) {
     return static_cast<daNpc_Hanjo_c*>(i_this)->Delete();
 }
 
-/* 809FED98-809FEDB8 005DF8 0020+00 1/0 0/0 0/0 .text            daNpc_Hanjo_Execute__FPv */
 static int daNpc_Hanjo_Execute(void* i_this) {
     return static_cast<daNpc_Hanjo_c*>(i_this)->Execute();
 }
 
-/* 809FEDB8-809FEDD8 005E18 0020+00 1/0 0/0 0/0 .text            daNpc_Hanjo_Draw__FPv */
 static int daNpc_Hanjo_Draw(void* i_this) {
     return static_cast<daNpc_Hanjo_c*>(i_this)->Draw();
 }
 
-/* 809FEDD8-809FEDE0 005E38 0008+00 1/0 0/0 0/0 .text            daNpc_Hanjo_IsDelete__FPv */
 static int daNpc_Hanjo_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80A010A8-80A010C8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Hanjo_MethodTable */
 static actor_method_class daNpc_Hanjo_MethodTable = {
     (process_method_func)daNpc_Hanjo_Create,
     (process_method_func)daNpc_Hanjo_Delete,
@@ -2015,7 +1932,6 @@ static actor_method_class daNpc_Hanjo_MethodTable = {
     (process_method_func)daNpc_Hanjo_Draw,
 };
 
-/* 80A010C8-80A010F8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_HANJO */
 extern actor_process_profile_definition g_profile_NPC_HANJO = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp
index f5d4a38586..deb5410878 100644
--- a/src/d/actor/d_a_npc_henna.cpp
+++ b/src/d/actor/d_a_npc_henna.cpp
@@ -29,8 +29,8 @@ class dmg_rod_class;
 
 class daNpc_Henna_HIO_c : public JORReflexible {
 public:
-    /* 80542F0C */ daNpc_Henna_HIO_c();
-    /* 80549E40 */ virtual ~daNpc_Henna_HIO_c() {}
+    daNpc_Henna_HIO_c();
+    virtual ~daNpc_Henna_HIO_c() {}
     void genMessage(JORMContext*);
 
     s8 id;
@@ -53,7 +53,6 @@ public:
     s16 mSeason3LightAngle;
 };
 
-/* 8054ACA8-8054ACB0 000020 0008+00 1/1 0/0 0/0 .data            check_kind */
 static u16 check_kind[4] = {
     0xF57F,
     0xF47F,
@@ -61,7 +60,6 @@ static u16 check_kind[4] = {
     0xF27F,
 };
 
-/* 80542F0C-80542F98 0000EC 008C+00 1/1 0/0 0/0 .text            __ct__17daNpc_Henna_HIO_cFv */
 daNpc_Henna_HIO_c::daNpc_Henna_HIO_c() {
     id = -1;
     field_0x8 = 1.0f;
@@ -83,15 +81,12 @@ daNpc_Henna_HIO_c::daNpc_Henna_HIO_c() {
     mSeason3LightAngle = -45;
 }
 
-/* 80542F98-80543048 000178 00B0+00 4/4 0/0 0/0 .text            anm_init__FP15npc_henna_classifUcf
- */
 static void anm_init(npc_henna_class* i_this, int i_resIndex, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Henna", i_resIndex), i_mode,
                            i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->mAnmResIndex = i_resIndex;
 }
 
-/* 80543048-80543350 000228 0308+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DJoint* joint = (J3DJoint*)i_joint;  // debug match
@@ -139,7 +134,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80543350-805434C0 000530 0170+00 1/0 0/0 0/0 .text daNpc_Henna_Draw__FP15npc_henna_class */
 static int daNpc_Henna_Draw(npc_henna_class* i_this) {
     if (i_this->field_0x734 != 0) {
         return 1;
@@ -213,7 +207,6 @@ static void dummy_dt_cm3dgpla() {
     delete (cM3dGPla*)NULL;
 }
 
-/* 80543544-805436CC 000724 0188+00 1/1 0/0 0/0 .text            s_npc_sub__FPvPv */
 static void* s_npc_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) &&
         (fopAcM_GetName(param_0) == PROC_NPC_NE || fopAcM_GetName(param_0) == PROC_NPC_DU))
@@ -227,7 +220,6 @@ static void* s_npc_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 805436CC-80543718 0008AC 004C+00 1/1 0/0 0/0 .text            s_piro_sub__FPvPv */
 static void* s_piro_sub(void* param_0, void* param_1) {
     (void)param_1;  // debug match
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) {
@@ -236,7 +228,6 @@ static void* s_piro_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80543718-8054378C 0008F8 0074+00 1/1 0/0 0/0 .text            s_du_sub__FPvPv */
 static void* s_du_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_DU &&
         ((npc_du_class*)param_0)->mPlayerDist < 300.0f)
@@ -247,7 +238,6 @@ static void* s_du_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 8054378C-805437E8 00096C 005C+00 2/2 0/0 0/0 .text            s_shop_sub__FPvPv */
 static void* s_shop_sub(void* param_0, void* param_1) {
     (void)param_1;  // debug match
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP &&
@@ -258,7 +248,6 @@ static void* s_shop_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 805437E8-80543844 0009C8 005C+00 1/1 0/0 0/0 .text            s_koro2ball_sub__FPvPv */
 static void* s_koro2ball_sub(void* param_0, void* param_1) {
     (void)param_1;  // debug match
     if (fopAcM_IsActor(param_0)) {
@@ -269,8 +258,6 @@ static void* s_koro2ball_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80543844-8054395C 000A24 0118+00 1/1 0/0 0/0 .text            message_shop__FP15npc_henna_class
- */
 static void message_shop(npc_henna_class* i_this) {
     s16 angle = i_this->field_0x620 - dComIfGp_getPlayer(0)->shape_angle.y + 0x8000;
     if (angle > 0x1800 || angle < -0x1800 || (u16)i_this->field_0x620 < 0x2e00 ||
@@ -296,7 +283,6 @@ static void message_shop(npc_henna_class* i_this) {
     }
 }
 
-/* 8054395C-80543E68 000B3C 050C+00 2/2 0/0 0/0 .text            henna_shop__FP15npc_henna_class */
 static void henna_shop(npc_henna_class* i_this) {
     s16 unkInt1 = 0x800;
 
@@ -415,7 +401,6 @@ static void henna_shop(npc_henna_class* i_this) {
     }
 }
 
-/* 80543E68-80543EB4 001048 004C+00 1/1 0/0 0/0 .text            s_rod_sub__FPvPv */
 static void* s_rod_sub(void* param_0, void* param_1) {
     (void)param_1;  // debug match
     if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) {
@@ -424,7 +409,6 @@ static void* s_rod_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80543EB4-8054403C 001094 0188+00 1/1 0/0 0/0 .text            s_fish_sub__FPvPv */
 static void* s_fish_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) != 0) {
         fopAc_ac_c* a_param_1 = (fopAc_ac_c*)param_0;
@@ -441,16 +425,13 @@ static void* s_fish_sub(void* param_0, void* param_1) {
 
 static u8 l_HIOInit;
 
-/* 8054AFCC-8054B004 000054 0038+00 1/4 0/0 0/0 .bss             l_HIO */
 static daNpc_Henna_HIO_c l_HIO;
 
-/* 8054B004-8054B008 00008C 0004+00 3/4 0/0 0/0 .bss             lrl */
 static dmg_rod_class* lrl;
 
 static u8 lbl_82_bss_90;
 static u8 lbl_82_bss_91;
 
-/* 8054403C-80544A4C 00121C 0A10+00 2/1 0/0 0/0 .text            henna_ride__FP15npc_henna_class */
 static void henna_ride(npc_henna_class* i_this) {
     daPy_py_c* player;
     f32 stickX;
@@ -689,7 +670,6 @@ static void henna_ride(npc_henna_class* i_this) {
     }
 }
 
-/* 80544A4C-805450A8 001C2C 065C+00 1/1 0/0 0/0 .text            action__FP15npc_henna_class */
 static void action(npc_henna_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -838,8 +818,6 @@ static void action(npc_henna_class* i_this) {
     i_this->field_0x6b6 += (s16)((0.15f + TREG_F(13)) * fabsf(i_this->field_0x6ac));
 }
 
-/* 805450A8-8054518C 002288 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP15npc_henna_classf
- */
 static void cam_3d_morf(npc_henna_class* i_this, f32 param_1) {
     cLib_addCalc2(&i_this->field_0x76c.x, i_this->field_0x784.x, param_1,
                   i_this->field_0x79c.x * i_this->field_0x7c0);
@@ -855,7 +833,6 @@ static void cam_3d_morf(npc_henna_class* i_this, f32 param_1) {
                   i_this->field_0x790.z * i_this->field_0x7c0);
 }
 
-/* 8054518C-8054549C 00236C 0310+00 1/1 0/0 0/0 .text            demo_camera__FP15npc_henna_class */
 static void demo_camera(npc_henna_class* i_this) {
     camera_class* camera;
     daCanoe_c* boat;
@@ -930,7 +907,6 @@ static void demo_camera(npc_henna_class* i_this) {
     }
 }
 
-/* 8054549C-80545638 00267C 019C+00 1/1 0/0 0/0 .text zoom_check__FP15npc_henna_classP4cXyzs */
 static int zoom_check(npc_henna_class* i_this, cXyz* target, s16 tolerance) {
     // unused assignments are needed for debug match
     fopAc_ac_c* a_this = &i_this->actor;
@@ -980,7 +956,6 @@ static cXyz zoom_check_pos[20] = {
 
 static s32 koro2_reset;
 
-/* 80545638-805483F4 002818 2DBC+00 3/1 0/0 0/0 .text demo_camera_shop__FP15npc_henna_class */
 static void demo_camera_shop(npc_henna_class* i_this) {
     static u16 check_size[4] = {
         0x002B,
@@ -2196,8 +2171,6 @@ static void demo_camera_shop(npc_henna_class* i_this) {
 
 static u8 lbl_82_bss_289;
 
-/* 805483F4-80548640 0055D4 024C+00 1/1 0/0 0/0 .text            message_guide__FP15npc_henna_class
- */
 static void message_guide(npc_henna_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     daPy_py_c* unusedPlayer = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -2276,7 +2249,6 @@ static void message_guide(npc_henna_class* i_this) {
     }
 }
 
-/* 80548640-8054868C 005820 004C+00 1/1 0/0 0/0 .text            s_boat_sub__FPvPv */
 static void* s_boat_sub(void* param_0, void* param_1) {
     if (fopAc_IsActor(param_0)) {
         if (fopAcM_GetName(param_0) == PROC_CANOE) {
@@ -2286,7 +2258,6 @@ static void* s_boat_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 8054868C-805488B8 00586C 022C+00 1/1 0/0 0/0 .text            env_control__FP15npc_henna_class */
 static void env_control(npc_henna_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* a_this = &i_this->actor;
@@ -2350,7 +2321,6 @@ static void env_control(npc_henna_class* i_this) {
     }
 }
 
-/* 805488B8-805492A4 005A98 09EC+00 2/1 0/0 0/0 .text daNpc_Henna_Execute__FP15npc_henna_class */
 static int daNpc_Henna_Execute(npc_henna_class* i_this) {
     fopAc_ac_c* unusedPlayer = dComIfGp_getPlayer(0);
 
@@ -2610,12 +2580,10 @@ static int daNpc_Henna_Execute(npc_henna_class* i_this) {
     return 1;
 }
 
-/* 805492A4-805492AC 006484 0008+00 1/0 0/0 0/0 .text daNpc_Henna_IsDelete__FP15npc_henna_class */
 static bool daNpc_Henna_IsDelete(npc_henna_class* param_0) {
     return true;
 }
 
-/* 805492AC-80549300 00648C 0054+00 1/0 0/0 0/0 .text daNpc_Henna_Delete__FP15npc_henna_class */
 static int daNpc_Henna_Delete(npc_henna_class* i_this) {
     dComIfG_resDelete(&i_this->phase, "Henna");
     if (i_this->hio_init != 0) {
@@ -2624,7 +2592,6 @@ static int daNpc_Henna_Delete(npc_henna_class* i_this) {
     return 1;
 }
 
-/* 80549300-805496DC 0064E0 03DC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     static u32 btk_d[3] = {
         0x29,
@@ -2707,8 +2674,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     }
 }
 
-/* 80549724-80549E40 006904 071C+00 1/0 0/0 0/0 .text            daNpc_Henna_Create__FP10fopAc_ac_c
- */
 static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, npc_henna_class);
     npc_henna_class* a_this = (npc_henna_class*)i_this;
@@ -2857,14 +2822,12 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) {
     return loadResult;
 }
 
-/* 8054AF00-8054AF20 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Henna_Method */
 static actor_method_class l_daNpc_Henna_Method = {
     (process_method_func)daNpc_Henna_Create,  (process_method_func)daNpc_Henna_Delete,
     (process_method_func)daNpc_Henna_Execute, (process_method_func)daNpc_Henna_IsDelete,
     (process_method_func)daNpc_Henna_Draw,
 };
 
-/* 8054AF20-8054AF50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_HENNA */
 extern actor_process_profile_definition g_profile_NPC_HENNA = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp
index bbb0fdc69d..54885d8c41 100644
--- a/src/d/actor/d_a_npc_henna0.cpp
+++ b/src/d/actor/d_a_npc_henna0.cpp
@@ -6,13 +6,6 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_henna0.h"
-#include "dol2asm.h"
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80A013E0-80A01410 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_HENNA0 */
 extern actor_process_profile_definition g_profile_NPC_HENNA0 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp
index 8326a036c2..d8f10a0d5b 100644
--- a/src/d/actor/d_a_npc_hoz.cpp
+++ b/src/d/actor/d_a_npc_hoz.cpp
@@ -10,13 +10,11 @@
 #include "d/actor/d_a_canoe.h"
 #include "d/d_meter2_info.h"
 
-/* 80A06824-80A06834 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {13, 1},
     {3, 2},
 };
 
-/* 80A06834-80A0687C -00001 0048+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[9] = {
     {"", 0},
     {"BOAT_RACE", 1},
@@ -29,7 +27,6 @@ static daNpcT_evtData_c l_evtList[9] = {
     {"TALK_BREAK", 1},
 };
 
-/* 80A0687C-80A06898 -00001 001C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[7] = {
     "",
     "Hoz",
@@ -40,20 +37,16 @@ static char* l_resNameList[7] = {
     "Hoz2_3",
 };
 
-/* 80A06898-80A0689C 000094 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[] = {
     1,
     2,
     -1,
 };
 
-/* 80A0689C-80A068A0 000098 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTW */
 static s8 l_loadResPtrnTW[] = {1, 2, 3, -1};
 
-/* 80A068A0-80A068A4 00009C 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[] = {1, 4, 6, -1};
 
-/* 80A068A4-80A068AC 0000A0 0005+03 1/0 0/0 0/0 .data            l_loadResPtrnBattle */
 static s8 l_loadResPtrnBattle[] = {
     1,
     4,
@@ -62,14 +55,12 @@ static s8 l_loadResPtrnBattle[] = {
     -1,
 };
 
-/* 80A068AC-80A068C8 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {
     l_loadResPtrn0,      l_loadResPtrn1,  l_loadResPtrn1,
     l_loadResPtrnBattle, l_loadResPtrnTW, l_loadResPtrn1,
     l_loadResPtrnTW,
 };
 
-/* 80A068C8-80A06D0C 0000C4 0444+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[39] = {
     {-1, 0, 0, 19, 2, 1, 1},
     {8, 0, 1, 19, 2, 1, 1},
@@ -112,7 +103,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[39] = {
     {22, 2, 4, 19, 2, 1, 1},
 };
 
-/* 80A06D0C-80A07150 000508 0444+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[39] = {
     {10, 2, 1, 16, 0, 1, 1, 0},
     {9, 0, 1, 16, 0, 1, 1, 0},
@@ -155,7 +145,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[39] = {
     {7, 2, 4, 16, 0, 1, 1, 0},
 };
 
-/* 80A07150-80A07380 00094C 0230+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[140] = {
     {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -177,7 +166,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[140]
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A07380-80A075C0 000B7C 0240+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[144] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {2, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -199,7 +187,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[144] = {
     {29, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A075C0-80A075E0 -00001 0020+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Hoz_c */
 char* daNpc_Hoz_c::mCutNameList[8] = {
     "",
     "BOAT_RACE",
@@ -211,7 +198,6 @@ char* daNpc_Hoz_c::mCutNameList[8] = {
     "TALK_BREAK",
 };
 
-/* 80A07634-80A07694 000E30 0060+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Hoz_c */
 daNpc_Hoz_c::cutFunc daNpc_Hoz_c::mCutList[] = {
     NULL,
     &daNpc_Hoz_c::ECut_boatRace,
@@ -223,7 +209,6 @@ daNpc_Hoz_c::cutFunc daNpc_Hoz_c::mCutList[] = {
     &daNpc_Hoz_c::ECut_talkBreak,
 };
 
-/* 80A06650-80A066E0 000000 0090+00 10/10 0/0 0/0 .rodata          m__17daNpc_Hoz_Param_c */
 const daNpc_Hoz_HIOParam daNpc_Hoz_Param_c::m = {
     60.0f,
     -3.0f,
@@ -269,7 +254,6 @@ const daNpc_Hoz_HIOParam daNpc_Hoz_Param_c::m = {
     600.0f,
 };
 
-/* 80A0150C-80A01658 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__11daNpc_Hoz_cFv */
 daNpc_Hoz_c::~daNpc_Hoz_c() {
     if (mType == 1) {
         daNpcT_offTmpBit(0x46);
@@ -282,7 +266,6 @@ daNpc_Hoz_c::~daNpc_Hoz_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A01658-80A01904 000238 02AC+00 1/1 0/0 0/0 .text            create__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::create() {
     daNpcT_ct(this, daNpc_Hoz_c,
               l_faceMotionAnmData,
@@ -354,7 +337,6 @@ static f32 dummyFloat(int _) {
     }
 }
 
-/* 80A01904-80A01B98 0004E4 0294+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::CreateHeap() {
     J3DModelData* mdlData_p;
     int bmdIdx;
@@ -397,7 +379,6 @@ int daNpc_Hoz_c::CreateHeap() {
     return 0;
 }
 
-/* 80A01D54-80A01D88 000934 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Hoz_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -405,12 +386,10 @@ int daNpc_Hoz_c::Delete() {
     return 1;
 }
 
-/* 80A01D88-80A01DA8 000968 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::Execute() {
     return execute();
 }
 
-/* 80A01DA8-80A01E44 000988 009C+00 1/1 0/0 0/0 .text            Draw__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -424,15 +403,11 @@ int daNpc_Hoz_c::Draw() {
     #endif
 }
 
-/* 80A01E44-80A01E64 000A24 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Hoz_cFP10fopAc_ac_c              */
 int daNpc_Hoz_c::createHeapCallBack(fopAc_ac_c* actor) {
     daNpc_Hoz_c* i_this = (daNpc_Hoz_c*)actor;
     return i_this->CreateHeap();
 }
 
-/* 80A01E64-80A01EBC 000A44 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Hoz_cFP8J3DJointi
- */
 int daNpc_Hoz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -445,7 +420,6 @@ int daNpc_Hoz_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A01EBC-80A01F08 000A9C 004C+00 4/4 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_START_AND_GOAL) {
         return i_actor;
@@ -454,7 +428,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A01F08-80A01F54 000AE8 004C+00 4/4 0/0 0/0 .text            s_subCanoe__FPvPv */
 static void* s_subCanoe(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_CANOE) {
         return i_actor;
@@ -463,7 +436,6 @@ static void* s_subCanoe(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A01F54-80A01FC8 000B34 0074+00 1/1 0/0 1/1 .text            getType__11daNpc_Hoz_cFv */
 u8 daNpc_Hoz_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 1:
@@ -483,7 +455,6 @@ u8 daNpc_Hoz_c::getType() {
     }
 }
 
-/* 80A01FC8-80A01FE4 000BA8 001C+00 2/2 0/0 0/0 .text            getFlowNodeNo__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
 
@@ -497,12 +468,10 @@ int daNpc_Hoz_c::getFlowNodeNo() {
     return rt;
 }
 
-/* 80A01FE4-80A01FEC 000BC4 0008+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::isDelete() {
     return 0;
 }
 
-/* 80A01FEC-80A02184 000BCC 0198+00 1/1 0/0 0/0 .text            reset__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::reset() {
     initialize();
     memset(&field_0xfac, 0, (u32)&field_0xfc4 - (u32)&field_0xfac);
@@ -529,7 +498,6 @@ void daNpc_Hoz_c::reset() {
     }
 }
 
-/* 80A02184-80A021DC 000D64 0058+00 1/1 0/0 0/0 .text            s_subBomb__FPvPv */
 static void* s_subBomb(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_ARROW && ((daArrow_c*)i_actor)->checkBombArrow()) {
         return i_actor;
@@ -538,7 +506,6 @@ static void* s_subBomb(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A021DC-80A0236C 000DBC 0190+00 1/0 0/0 0/0 .text            setParam__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::setParam() {
     u32 attn_flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
 
@@ -589,14 +556,10 @@ void daNpc_Hoz_c::setParam() {
     mMorfFrames = daNpc_Hoz_Param_c::m.common.morf_frame;
 }
 
-/* 80A0236C-80A02370 000F4C 0004+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Hoz_cFv
- */
 void daNpc_Hoz_c::setAfterTalkMotion() {}
 
-/* 80A02370-80A02374 000F50 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::srchActors() {}
 
-/* 80A02374-80A023EC 000F54 0078+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Hoz_cFv */
 BOOL daNpc_Hoz_c::checkChangeEvt() {
     switch (mType) {
     case 4:
@@ -611,7 +574,6 @@ BOOL daNpc_Hoz_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A023EC-80A024D0 000FCC 00E4+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Hoz_cFv */
 BOOL daNpc_Hoz_c::evtTalk() {
     if (chkAction(&daNpc_Hoz_c::talk)) {
         (this->*mAction)(NULL);
@@ -622,7 +584,6 @@ BOOL daNpc_Hoz_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A024D0-80A0260C 0010B0 013C+00 2/0 0/0 0/0 .text            evtEndProc__11daNpc_Hoz_cFv */
 BOOL daNpc_Hoz_c::evtEndProc() {
     switch (field_0xf8c) {
     case 3:
@@ -674,7 +635,6 @@ BOOL daNpc_Hoz_c::evtEndProc() {
     return 1;
 }
 
-/* 80A0260C-80A026D4 0011EC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Hoz_cFv */
 BOOL daNpc_Hoz_c::evtCutProc() {
     BOOL var_r30 = FALSE;
 
@@ -693,7 +653,6 @@ BOOL daNpc_Hoz_c::evtCutProc() {
     return var_r30;
 }
 
-/* 80A026D4-80A02918 0012B4 0244+00 1/0 0/0 0/0 .text            evtProc__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::evtProc() {
     BOOL ret = FALSE;
 
@@ -756,7 +715,6 @@ int daNpc_Hoz_c::evtProc() {
     return ret;
 }
 
-/* 80A02918-80A029A0 0014F8 0088+00 1/0 0/0 0/0 .text            action__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::action() {
     if (field_0xfac != NULL) {
         if (mAction == field_0xfac) {
@@ -767,14 +725,12 @@ void daNpc_Hoz_c::action() {
     }
 }
 
-/* 80A029A0-80A02A18 001580 0078+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A02A18-80A02C50 0015F8 0238+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::setAttnPos() {
     cXyz sp34(0.0f, -30.0f, 0.0f);
 
@@ -802,7 +758,6 @@ void daNpc_Hoz_c::setAttnPos() {
     attention_info.position.set(sp28.x, sp28.y + daNpc_Hoz_Param_c::m.common.attention_offset, sp28.z);
 }
 
-/* 80A02C50-80A02DD4 001830 0184+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::setCollision() {
     cXyz pos;
 
@@ -840,7 +795,6 @@ void daNpc_Hoz_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A02DD4-80A02F78 0019B4 01A4+00 1/0 0/0 0/0 .text            evtOrder__11daNpc_Hoz_cFv */
 void daNpc_Hoz_c::evtOrder() {
     if (strlen(mpEvtData[mEvtNo].eventName) != 0) {
         if (strlen(mpArcNames[mpEvtData[mEvtNo].num]) != 0) {
@@ -865,12 +819,10 @@ void daNpc_Hoz_c::evtOrder() {
     }
 }
 
-/* 80A02F78-80A02F80 001B58 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Hoz_cFv */
 BOOL daNpc_Hoz_c::drawDbgInfo() {
     return false;
 }
 
-/* 80A02F80-80A030A8 001B60 0128+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Hoz_cFv */
 int daNpc_Hoz_c::selectAction() {
     field_0xfac = NULL;
 
@@ -901,14 +853,10 @@ int daNpc_Hoz_c::selectAction() {
     return 1;
 }
 
-/* 80A030A8-80A030D4 001C88 002C+00 1/1 0/0 0/0 .text
- * chkAction__11daNpc_Hoz_cFM11daNpc_Hoz_cFPCvPvPv_i            */
 int daNpc_Hoz_c::chkAction(int (daNpc_Hoz_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 80A030D4-80A0317C 001CB4 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Hoz_cFM11daNpc_Hoz_cFPCvPvPv_i            */
 int daNpc_Hoz_c::setAction(int (daNpc_Hoz_c::*i_action)(void*)) {
     mMode = 3;
     if (mAction != NULL) {
@@ -924,7 +872,6 @@ int daNpc_Hoz_c::setAction(int (daNpc_Hoz_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 80A0317C-80A03304 001D5C 0188+00 1/0 0/0 0/0 .text            wait__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -952,7 +899,6 @@ int daNpc_Hoz_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A03304-80A03578 001EE4 0274+00 1/0 0/0 0/0 .text            waitBattle__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitBattle(void* param_0) {
     switch (mMode) {
     case 0:
@@ -990,7 +936,6 @@ int daNpc_Hoz_c::waitBattle(void* param_0) {
     return 1;
 }
 
-/* 80A03578-80A037E4 002158 026C+00 1/0 0/0 0/0 .text waitTwilightBattle__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitTwilightBattle(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1032,7 +977,6 @@ int daNpc_Hoz_c::waitTwilightBattle(void* param_0) {
     return 1;
 }
 
-/* 80A037E4-80A03BDC 0023C4 03F8+00 1/0 0/0 0/0 .text            waitBoat__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitBoat(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1110,7 +1054,6 @@ int daNpc_Hoz_c::waitBoat(void* param_0) {
     return 1;
 }
 
-/* 80A03BDC-80A03F8C 0027BC 03B0+00 1/0 0/0 0/0 .text            waitBoat2__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitBoat2(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1187,7 +1130,6 @@ int daNpc_Hoz_c::waitBoat2(void* param_0) {
     return 1;
 }
 
-/* 80A03F8C-80A04400 002B6C 0474+00 1/0 0/0 0/0 .text            waitBoat1_5__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitBoat1_5(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1254,7 +1196,6 @@ int daNpc_Hoz_c::waitBoat1_5(void* param_0) {
     return 1;
 }
 
-/* 80A04400-80A045FC 002FE0 01FC+00 1/0 0/0 0/0 .text            waitTw__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::waitTw(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1287,7 +1228,6 @@ int daNpc_Hoz_c::waitTw(void* param_0) {
     return 1;
 }
 
-/* 80A045FC-80A0487C 0031DC 0280+00 2/0 0/0 0/0 .text            talk__11daNpc_Hoz_cFPv */
 int daNpc_Hoz_c::talk(void* param_0) {
     BOOL var_r29 = FALSE;
 
@@ -1363,7 +1303,6 @@ int daNpc_Hoz_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A0487C-80A04BE4 00345C 0368+00 1/0 0/0 0/0 .text            ECut_boatRace__11daNpc_Hoz_cFi */
 int daNpc_Hoz_c::ECut_boatRace(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1457,8 +1396,6 @@ int daNpc_Hoz_c::ECut_boatRace(int i_staffId) {
     return rt;
 }
 
-/* 80A04BE4-80A04CDC 0037C4 00F8+00 1/0 0/0 0/0 .text            ECut_beforeBattle__11daNpc_Hoz_cFi
- */
 int daNpc_Hoz_c::ECut_beforeBattle(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1495,8 +1432,6 @@ int daNpc_Hoz_c::ECut_beforeBattle(int i_staffId) {
     return rt;
 }
 
-/* 80A04CDC-80A04E24 0038BC 0148+00 1/0 0/0 0/0 .text            ECut_afterBattle__11daNpc_Hoz_cFi
- */
 int daNpc_Hoz_c::ECut_afterBattle(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1537,8 +1472,6 @@ int daNpc_Hoz_c::ECut_afterBattle(int i_staffId) {
     return rt;
 }
 
-/* 80A04E24-80A04F6C 003A04 0148+00 1/0 0/0 0/0 .text            ECut_beforeBlast__11daNpc_Hoz_cFi
- */
 int daNpc_Hoz_c::ECut_beforeBlast(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1579,7 +1512,6 @@ int daNpc_Hoz_c::ECut_beforeBlast(int i_staffId) {
     return rt;
 }
 
-/* 80A04F6C-80A050B4 003B4C 0148+00 1/0 0/0 0/0 .text            ECut_afterBlast__11daNpc_Hoz_cFi */
 int daNpc_Hoz_c::ECut_afterBlast(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1620,7 +1552,6 @@ int daNpc_Hoz_c::ECut_afterBlast(int i_staffId) {
     return rt;
 }
 
-/* 80A050B4-80A051C8 003C94 0114+00 1/0 0/0 0/0 .text            ECut_yMushi__11daNpc_Hoz_cFi */
 int daNpc_Hoz_c::ECut_yMushi(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1658,7 +1589,6 @@ int daNpc_Hoz_c::ECut_yMushi(int i_staffId) {
     return rt;
 }
 
-/* 80A051C8-80A05310 003DA8 0148+00 1/0 0/0 0/0 .text            ECut_talkBreak__11daNpc_Hoz_cFi */
 int daNpc_Hoz_c::ECut_talkBreak(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int rt = 0;
@@ -1699,35 +1629,28 @@ int daNpc_Hoz_c::ECut_talkBreak(int i_staffId) {
     return rt;
 }
 
-/* 80A05310-80A05330 003EF0 0020+00 1/0 0/0 0/0 .text            daNpc_Hoz_Create__FPv */
 static int daNpc_Hoz_Create(void* i_this) {
     return ((daNpc_Hoz_c*)i_this)->create();
 }
 
-/* 80A05330-80A05350 003F10 0020+00 1/0 0/0 0/0 .text            daNpc_Hoz_Delete__FPv */
 static int daNpc_Hoz_Delete(void* i_this) {
     return ((daNpc_Hoz_c*)i_this)->Delete();
 }
 
-/* 80A05350-80A05370 003F30 0020+00 1/0 0/0 0/0 .text            daNpc_Hoz_Execute__FPv */
 static int daNpc_Hoz_Execute(void* i_this) {
     return ((daNpc_Hoz_c*)i_this)->Execute();
 }
 
-/* 80A05370-80A05390 003F50 0020+00 1/0 0/0 0/0 .text            daNpc_Hoz_Draw__FPv */
 static int daNpc_Hoz_Draw(void* i_this) {
     return ((daNpc_Hoz_c*)i_this)->Draw();
 }
 
-/* 80A05390-80A05398 003F70 0008+00 1/0 0/0 0/0 .text            daNpc_Hoz_IsDelete__FPv */
 static int daNpc_Hoz_IsDelete(void* i_this) {
     return true;
 }
 
-/* 80A078F4-80A078F8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Hoz_Param_c l_HIO;
 
-/* 80A07724-80A07744 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Hoz_MethodTable */
 static actor_method_class daNpc_Hoz_MethodTable = {
     (process_method_func)daNpc_Hoz_Create,
     (process_method_func)daNpc_Hoz_Delete,
@@ -1736,7 +1659,6 @@ static actor_method_class daNpc_Hoz_MethodTable = {
     (process_method_func)daNpc_Hoz_Draw,
 };
 
-/* 80A07744-80A07774 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_HOZ */
 extern actor_process_profile_definition g_profile_NPC_HOZ = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp
index 1959437996..25838fe112 100644
--- a/src/d/actor/d_a_npc_impal.cpp
+++ b/src/d/actor/d_a_npc_impal.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_impal.h"
 #include "d/actor/d_a_npc.h"
 
-/* 80A0C270-80A0C2E0 000000 0070+00 12/12 0/0 0/0 .rodata          m__18daNpcImpal_Param_c */
 daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
     135.0f,        // attention_offset
     -3.0f,         // gravity
@@ -48,20 +47,17 @@ daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
 
 NPC_IMPAL_HIO_CLASS l_HIO;
 
-/* 80A0C544-80A0C61C 000020 00D8+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[18] = {
     {-1, 2, 0}, {14, 0, 0}, {8, 0, 0},  {7, 2, 0},  {11, 0, 0}, {13, 0, 0},
     {12, 0, 0}, {15, 2, 0}, {17, 2, 0}, {16, 2, 0}, {22, 2, 0}, {19, 2, 0},
     {23, 2, 0}, {18, 0, 0}, {21, 0, 0}, {20, 0, 0}, {10, 0, 0}, {9, 2, 0},
 };
 
-/* 80A0C61C-80A0C694 0000F8 0078+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[10] = {
     {35, 2, 0}, {41, 2, 0}, {37, 0, 0}, {36, 2, 0}, {38, 2, 0},
     {40, 2, 0}, {39, 0, 0}, {42, 2, 0}, {44, 2, 0}, {43, 2, 0},
 };
 
-/* 80A0C694-80A0C6C4 000170 0030+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[4] = {
     {29, 2, 0},
     {32, 2, 0},
@@ -69,10 +65,8 @@ static daNpc_GetParam2 l_btkGetParamList[4] = {
     {30, 2, 0},
 };
 
-/* 80A0C6C4-80A0C6C8 -00001 0004+00 6/7 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[1] = {"impal"};
 
-/* 80A0C6C8-80A0C6D8 -00001 0010+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     NULL,
     "IMPAL_APPEAR1",
@@ -80,10 +74,8 @@ static char* l_evtNames[4] = {
     "IMPAL_COPYROD",
 };
 
-/* 80A0C6D8-80A0C6E4 0001B4 000C+00 2/2 0/0 0/0 .data            l_resetPos */
 static Vec l_resetPos = {2536.763671875f, 99.99166107177734f, -1154.2318115234375f};
 
-/* 80A0C6E4-80A0C6E8 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "impal";
 
 #if DEBUG
@@ -98,7 +90,6 @@ void daNpcImpal_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A0C70C-80A0C73C 0001E8 0030+00 0/2 0/0 0/0 .data            mEvtSeqList__12daNpcImpal_c */
 daNpcImpal_c::EventFn daNpcImpal_c::mEvtSeqList[4] = {
     NULL,
     &daNpcImpal_c::EvCut_ImpalAppear1,
@@ -106,10 +97,8 @@ daNpcImpal_c::EventFn daNpcImpal_c::mEvtSeqList[4] = {
     &daNpcImpal_c::EvCut_CopyRod,
 };
 
-/* 80A079EC-80A07B70 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__12daNpcImpal_cFv */
 daNpcImpal_c::daNpcImpal_c() {}
 
-/* 80A07C00-80A07DC4 000300 01C4+00 1/0 0/0 0/0 .text            __dt__12daNpcImpal_cFv */
 daNpcImpal_c::~daNpcImpal_c() {
     for (int i = 0; i < 1; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[i]);
@@ -126,7 +115,6 @@ daNpcImpal_c::~daNpcImpal_c() {
 #endif
 }
 
-/* 80A07DC4-80A080F8 0004C4 0334+00 1/1 0/0 0/0 .text            Create__12daNpcImpal_cFv */
 int daNpcImpal_c::Create() {
 
     fopAcM_ct(this, daNpcImpal_c);
@@ -194,7 +182,6 @@ int daNpcImpal_c::Create() {
     return phase;
 }
 
-/* 80A080F8-80A08368 0007F8 0270+00 1/1 0/0 0/0 .text            CreateHeap__12daNpcImpal_cFv */
 BOOL daNpcImpal_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -231,20 +218,17 @@ BOOL daNpcImpal_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80A08524-80A08558 000C24 0034+00 1/1 0/0 0/0 .text            Delete__12daNpcImpal_cFv */
 int daNpcImpal_c::Delete() {
     fopAcM_RegisterDeleteID(this, "NPC_IMPAL");
     this->~daNpcImpal_c();
     return 1;
 }
 
-/* 80A08558-80A0857C 000C58 0024+00 2/2 0/0 0/0 .text            Execute__12daNpcImpal_cFv */
 int daNpcImpal_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80A0857C-80A085EC 000C7C 0070+00 1/1 0/0 0/0 .text            Draw__12daNpcImpal_cFv */
 int daNpcImpal_c::Draw() {
     if (field_0xde9 == 0) {
         return 1;
@@ -257,8 +241,6 @@ int daNpcImpal_c::Draw() {
     return 1;
 }
 
-/* 80A085EC-80A087BC 000CEC 01D0+00 1/1 0/0 0/0 .text
- * ctrlJoint__12daNpcImpal_cFP8J3DJointP8J3DModel               */
 bool daNpcImpal_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int jointNo = my_joint->getJntNo();
@@ -403,15 +385,11 @@ void daNpcImpal_c::playMotion() {
     }
 }
 
-/* 80A087BC-80A087DC 000EBC 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpcImpal_cFP10fopAc_ac_c             */
 int daNpcImpal_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcImpal_c* a_this = static_cast<daNpcImpal_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 80A087DC-80A08828 000EDC 004C+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpcImpal_cFP8J3DJointi                */
 int daNpcImpal_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -423,8 +401,6 @@ int daNpcImpal_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A08828-80A08A68 000F28 0240+00 2/0 0/0 0/0 .text            setExpressionAnm__12daNpcImpal_cFib
- */
 bool daNpcImpal_c::setExpressionAnm(int i_idx, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -490,8 +466,6 @@ bool daNpcImpal_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80A08A68-80A08B48 001168 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__12daNpcImpal_cFi
- */
 bool daNpcImpal_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx],
                                               l_btpGetParamList[i_idx].fileIdx);
@@ -516,7 +490,6 @@ bool daNpcImpal_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80A08B48-80A08CBC 001248 0174+00 1/0 0/0 0/0 .text            setMotionAnm__12daNpcImpal_cFif */
 void daNpcImpal_c::setMotionAnm(int i_idx, f32 i_morf) {
     int iVar5 = 0;
 
@@ -560,7 +533,6 @@ void daNpcImpal_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80A08CBC-80A08EB8 0013BC 01FC+00 1/1 0/0 0/0 .text            reset__12daNpcImpal_cFv */
 void daNpcImpal_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -599,8 +571,6 @@ void daNpcImpal_c::reset() {
     setAction(&daNpcImpal_c::wait);
 }
 
-/* 80A08EB8-80A08F60 0015B8 00A8+00 1/1 0/0 0/0 .text
- * setAction__12daNpcImpal_cFM12daNpcImpal_cFPCvPvPv_b          */
 bool daNpcImpal_c::setAction(daNpcImpal_c::actionFunc i_actionFn) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -614,7 +584,6 @@ bool daNpcImpal_c::setAction(daNpcImpal_c::actionFunc i_actionFn) {
     return true;
 }
 
-/* 80A0B76C-80A0B94C 003E6C 01E0+00 1/1 0/0 0/0 .text            lookat__12daNpcImpal_cFv */
 void daNpcImpal_c::lookat() {
     fopAc_ac_c* actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -666,7 +635,6 @@ void daNpcImpal_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80A08F60-80A090E8 001660 0188+00 1/1 0/0 0/0 .text            s_sub1__FPvPv */
 static void* s_sub1(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry &&
         ((fopAc_ac_c*)i_actor)->current.pos.absXZ(((fopAc_ac_c*)i_data)->current.pos) < 1000.0f)
@@ -710,7 +678,6 @@ void daNpcImpal_c::deleteObstacle() {
     fpcM_Search(s_sub1, this);
 }
 
-/* 80A090E8-80A099B4 0017E8 08CC+00 4/0 0/0 0/0 .text            wait__12daNpcImpal_cFPv */
 bool daNpcImpal_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -804,7 +771,6 @@ bool daNpcImpal_c::wait(void* param_0) {
     return true;
 }
 
-/* 80A099B4-80A099F8 0020B4 0044+00 1/0 0/0 0/0 .text            setMotion__12daNpcImpal_cFifi */
 void daNpcImpal_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = (s16)i_motion;
     if ((i_restart || mMotion != motion) && i_motion >= 0 && i_motion < 7) {
@@ -815,7 +781,6 @@ void daNpcImpal_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80A099F8-80A09A24 0020F8 002C+00 1/0 0/0 0/0 .text            setExpression__12daNpcImpal_cFif */
 void daNpcImpal_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 8) {
         mExpression = (s16)i_expression;
@@ -825,7 +790,6 @@ void daNpcImpal_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80A09A24-80A09F4C 002124 0528+00 2/0 0/0 0/0 .text            talk__12daNpcImpal_cFPv */
 bool daNpcImpal_c::talk(void* param_0) {
     bool ret = false;
 
@@ -888,7 +852,6 @@ bool daNpcImpal_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80A09F4C-80A0A1E0 00264C 0294+00 1/0 0/0 0/0 .text            demo__12daNpcImpal_cFPv */
 bool daNpcImpal_c::demo(void* param_0) {
     // FIXME: Create proper enum list for impal events:
     enum Impal_Enums_are_magic {
@@ -937,7 +900,6 @@ bool daNpcImpal_c::demo(void* param_0) {
     return true;
 }
 
-/* 80A0A1E0-80A0A680 0028E0 04A0+00 1/0 0/0 0/0 .text EvCut_ImpalAppear1__12daNpcImpal_cFi */
 BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) {
     int* cut_name = (int*)dComIfGp_getEventManager().getMyNowCutName(i_cut_index);
 
@@ -1032,7 +994,6 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) {
     return FALSE;
 }
 
-/* 80A0A680-80A0A950 002D80 02D0+00 1/0 0/0 0/0 .text EvCut_ImpalAppear2__12daNpcImpal_cFi */
 BOOL daNpcImpal_c::EvCut_ImpalAppear2(int i_cut_index) {
     int* cut_name = (int*)dComIfGp_getEventManager().getMyNowCutName(i_cut_index);
 
@@ -1077,7 +1038,6 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear2(int i_cut_index) {
     return FALSE;
 }
 
-/* 80A0A950-80A0AD40 003050 03F0+00 1/0 0/0 0/0 .text            EvCut_CopyRod__12daNpcImpal_cFi */
 BOOL daNpcImpal_c::EvCut_CopyRod(int i_cut_index) {
     int* cut_name = (int*)dComIfGp_getEventManager().getMyNowCutName(i_cut_index);
 
@@ -1149,32 +1109,26 @@ BOOL daNpcImpal_c::EvCut_CopyRod(int i_cut_index) {
     return FALSE;
 }
 
-/* 80A0AD40-80A0AD60 003440 0020+00 1/0 0/0 0/0 .text            daNpcImpal_Create__FPv */
 static int daNpcImpal_Create(void* i_this) {
     return static_cast<daNpcImpal_c*>(i_this)->Create();
 }
 
-/* 80A0AD60-80A0AD80 003460 0020+00 1/0 0/0 0/0 .text            daNpcImpal_Delete__FPv */
 static int daNpcImpal_Delete(void* i_this) {
     return static_cast<daNpcImpal_c*>(i_this)->Delete();
 }
 
-/* 80A0AD80-80A0ADA0 003480 0020+00 1/0 0/0 0/0 .text            daNpcImpal_Execute__FPv */
 static int daNpcImpal_Execute(void* i_this) {
     return static_cast<daNpcImpal_c*>(i_this)->Execute();
 }
 
-/* 80A0ADA0-80A0ADC0 0034A0 0020+00 1/0 0/0 0/0 .text            daNpcImpal_Draw__FPv */
 static int daNpcImpal_Draw(void* i_this) {
     return static_cast<daNpcImpal_c*>(i_this)->Draw();
 }
 
-/* 80A0ADC0-80A0ADC8 0034C0 0008+00 1/0 0/0 0/0 .text            daNpcImpal_IsDelete__FPv */
 static int daNpcImpal_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A0ADF8-80A0AEA8 0034F8 00B0+00 1/0 0/0 0/0 .text            setParam__12daNpcImpal_cFv */
 void daNpcImpal_c::setParam() {
     attention_info.distances[0] =
         getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle);
@@ -1194,7 +1148,6 @@ void daNpcImpal_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A0AEA8-80A0B380 0035A8 04D8+00 1/0 0/0 0/0 .text            main__12daNpcImpal_cFv */
 BOOL daNpcImpal_c::main() {
     if (mpActionFn != NULL) {
         (this->*mpActionFn)(NULL);
@@ -1213,7 +1166,6 @@ BOOL daNpcImpal_c::main() {
     return TRUE;
 }
 
-/* 80A0B380-80A0B45C 003A80 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__12daNpcImpal_cFv */
 BOOL daNpcImpal_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btkAnm = NULL;
@@ -1232,7 +1184,6 @@ BOOL daNpcImpal_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80A0B45C-80A0B76C 003B5C 0310+00 1/0 0/0 0/0 .text            setAttnPos__12daNpcImpal_cFv */
 void daNpcImpal_c::setAttnPos() {
     if (mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -1275,19 +1226,16 @@ void daNpcImpal_c::setAttnPos() {
     }
 }
 
-/* 80A0B94C-80A0B954 00404C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpcImpal_cFv */
 BOOL daNpcImpal_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A0C7B8-80A0C7D8 -00001 0020+00 1/0 0/0 0/0 .data            daNpcImpal_MethodTable */
 static actor_method_class daNpcImpal_MethodTable = {
     (process_method_func)daNpcImpal_Create,  (process_method_func)daNpcImpal_Delete,
     (process_method_func)daNpcImpal_Execute, (process_method_func)daNpcImpal_IsDelete,
     (process_method_func)daNpcImpal_Draw,
 };
 
-/* 80A0C7D8-80A0C808 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_IMPAL */
 extern actor_process_profile_definition g_profile_NPC_IMPAL = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp
index 73e098e4bf..a69dcc8f8f 100644
--- a/src/d/actor/d_a_npc_inko.cpp
+++ b/src/d/actor/d_a_npc_inko.cpp
@@ -12,7 +12,6 @@
 #include "d/d_s_play.h"
 #include "c/c_damagereaction.h"
 
-/* 80A0C998-80A0CBB0 000078 0218+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -52,8 +51,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A0CBB0-80A0CC18 000290 0068+00 1/0 0/0 0/0 .text            daNpc_Inko_Draw__FP14npc_inko_class
- */
 static int daNpc_Inko_Draw(npc_inko_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr);
@@ -62,14 +59,11 @@ static int daNpc_Inko_Draw(npc_inko_class* i_this) {
     return 1;
 }
 
-/* 80A0CC18-80A0CCC8 0002F8 00B0+00 1/1 0/0 0/0 .text            anm_init__FP14npc_inko_classifUcf
- */
 static void anm_init(npc_inko_class* i_this, int i_anmId, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->anm_p->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_inko", i_anmId), i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->anmId = i_anmId;
 }
 
-/* 80A0CCC8-80A0DD70 0003A8 10A8+00 2/1 0/0 0/0 .text daNpc_Inko_Execute__FP14npc_inko_class */
 static int daNpc_Inko_Execute(npc_inko_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     cXyz sp78;
@@ -407,12 +401,10 @@ static int daNpc_Inko_Execute(npc_inko_class* i_this) {
     return 1;
 }
 
-/* 80A0DD70-80A0DD78 001450 0008+00 1/0 0/0 0/0 .text daNpc_Inko_IsDelete__FP14npc_inko_class */
 static int daNpc_Inko_IsDelete(npc_inko_class* i_this) {
     return 1;
 }
 
-/* 80A0DD78-80A0DDC8 001458 0050+00 1/0 0/0 0/0 .text daNpc_Inko_Delete__FP14npc_inko_class */
 static int daNpc_Inko_Delete(npc_inko_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -425,7 +417,6 @@ static int daNpc_Inko_Delete(npc_inko_class* i_this) {
     return 1;
 }
 
-/* 80A0DDC8-80A0DF08 0014A8 0140+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     npc_inko_class* i_this = (npc_inko_class*)actor;
     i_this->anm_p = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_inko", 8), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084);
@@ -445,8 +436,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80A0DF08-80A0E00C 0015E8 0104+00 1/0 0/0 0/0 .text            daNpc_Inko_Create__FP10fopAc_ac_c
- */
 static int daNpc_Inko_Create(fopAc_ac_c* actor) {
     npc_inko_class* i_this = (npc_inko_class*)actor;
     fopAcM_ct(actor, npc_inko_class);
@@ -474,7 +463,6 @@ static int daNpc_Inko_Create(fopAc_ac_c* actor) {
     return phase_state;
 }
 
-/* 80A0E0F8-80A0E118 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Inko_Method */
 static actor_method_class l_daNpc_Inko_Method = {
     (process_method_func)daNpc_Inko_Create,
     (process_method_func)daNpc_Inko_Delete,
@@ -483,7 +471,6 @@ static actor_method_class l_daNpc_Inko_Method = {
     (process_method_func)daNpc_Inko_Draw,
 };
 
-/* 80A0E118-80A0E148 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_INKO */
 extern actor_process_profile_definition g_profile_NPC_INKO = {
   fpcLy_CURRENT_e,        // mLayerID
   8,                      // mListID
diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp
index cef93417fd..1e8cc049bf 100644
--- a/src/d/actor/d_a_npc_ins.cpp
+++ b/src/d/actor/d_a_npc_ins.cpp
@@ -212,10 +212,8 @@ enum Type {
     /* 0x2 */ TYPE_2,
 };
 
-/* 80A14604-80A14608 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcIns_Param_c l_HIO;
 
-/* 80A141BC-80A142DC 000020 0120+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[24] = {
     {-1, J3DFrameCtrl::EMode_LOOP, INS},
     {BCK_INS_F_TALK_A, J3DFrameCtrl::EMode_NONE, INS},
@@ -243,7 +241,6 @@ static daNpc_GetParam2 l_bckGetParamList[24] = {
     {BCK_INS_K_STEP, J3DFrameCtrl::EMode_NONE, INS2},
 };
 
-/* 80A142DC-80A1433C 000140 0060+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[8] = {
     {BTP_INS, J3DFrameCtrl::EMode_LOOP, INS},
     {BTP_INS_F_SNIFF, J3DFrameCtrl::EMode_NONE, INS},
@@ -255,58 +252,47 @@ static daNpc_GetParam2 l_btpGetParamList[8] = {
     {BTP_INS_FH_MAD, J3DFrameCtrl::EMode_LOOP, INS},
 };
 
-/* 80A1433C-80A14354 0001A0 0018+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[2] = {
     {BTK_INS, J3DFrameCtrl::EMode_LOOP, INS},
     {BTK_INS_SNIFF, J3DFrameCtrl::EMode_NONE, INS1},
 };
 
-/* 80A14354-80A14360 0001B8 000C+00 1/0 0/0 0/0 .data            l_loadRes_INS0 */
 static int l_loadRes_INS0[3] = {
     INS, INS1, -1,
 };
 
-/* 80A14360-80A1436C 0001C4 000C+00 1/0 0/0 0/0 .data            l_loadRes_INS1 */
 static int l_loadRes_INS1[3] = {
     INS, INS2, -1,
 };
 
-/* 80A1436C-80A14378 0001D0 000C+00 1/0 0/0 0/0 .data            l_loadRes_INS2 */
 static int l_loadRes_INS2[3] = {
     INS, INS2, -1,
 };
 
-/* 80A14378-80A14384 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_INS0,
     l_loadRes_INS1,
     l_loadRes_INS2,
 };
 
-/* 80A14384-80A14390 -00001 000C+00 6/7 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "Ins",
     "Ins1",
     "Ins2",
 };
 
-/* 80A14390-80A14394 0001F4 0004+00 0/4 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL,
 };
 
-/* 80A14394-80A14398 -00001 0004+00 1/5 0/0 0/0 .data            l_myName */
 static char* l_myName = "ins";
 
-/* 80A14398-80A143A4 0001FC 000C+00 2/2 0/0 0/0 .data            mEvtSeqList__10daNpcIns_c */
 daNpcIns_c::eventFunc daNpcIns_c::mEvtSeqList[1] = {
     NULL,
 };
 
-/* 80A0E24C-80A0E3D0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__10daNpcIns_cFv */
 daNpcIns_c::daNpcIns_c() {}
 
-/* 80A0E460-80A0E660 000300 0200+00 1/0 0/0 0/0 .text            __dt__10daNpcIns_cFv */
 daNpcIns_c::~daNpcIns_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[l_loadRes_list[mType][i]]);
@@ -317,7 +303,6 @@ daNpcIns_c::~daNpcIns_c() {
     }
 }
 
-/* 80A13DAC-80A13E6C 000000 00C0+00 15/15 0/0 0/0 .rodata          l_insectParams */
 static insect_param_data const l_insectParams[24] = {
     {0x0191, 0x709, 0, 0},
     {0x0192, 0x709, 0, 0},
@@ -345,7 +330,6 @@ static insect_param_data const l_insectParams[24] = {
     {0x01A8, 0x714, 0, 0},
 };
 
-/* 80A13E6C-80A13EDC 0000C0 0070+00 3/11 0/0 0/0 .rodata          m__16daNpcIns_Param_c */
 daNpcIns_HIOParam const daNpcIns_Param_c::m = {
     35.0f,
     -3.0f,
@@ -383,7 +367,6 @@ daNpcIns_HIOParam const daNpcIns_Param_c::m = {
     1.5f,
 };
 
-/* 80A0E660-80A0EA30 000500 03D0+00 1/1 0/0 0/0 .text            Create__10daNpcIns_cFv */
 cPhs__Step daNpcIns_c::Create() {
     fopAcM_ct(this, daNpcIns_c);
 
@@ -458,7 +441,6 @@ cPhs__Step daNpcIns_c::Create() {
     return phase;
 }
 
-/* 80A0EA30-80A0ED80 0008D0 0350+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcIns_cFv */
 int daNpcIns_c::CreateHeap() {
     J3DModelData* mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], BMDR_INS));
 
@@ -528,19 +510,16 @@ int daNpcIns_c::CreateHeap() {
     return 1;
 }
 
-/* 80A0EF3C-80A0EF70 000DDC 0034+00 1/1 0/0 0/0 .text            Delete__10daNpcIns_cFv */
 int daNpcIns_c::Delete() {
     this->~daNpcIns_c();
     return 1;
 }
 
-/* 80A0EF70-80A0EF94 000E10 0024+00 2/2 0/0 0/0 .text            Execute__10daNpcIns_cFv */
 int daNpcIns_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80A0EF94-80A0F0BC 000E34 0128+00 1/1 0/0 0/0 .text            Draw__10daNpcIns_cFv */
 int daNpcIns_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     draw(FALSE, FALSE, daNpcIns_Param_c::m.common.real_shadow_size, NULL, FALSE);
@@ -562,7 +541,6 @@ int daNpcIns_c::Draw() {
     return 1;
 }
 
-/* 80A0F0BC-80A0F28C 000F5C 01D0+00 1/1 0/0 0/0 .text            ctrlJoint__10daNpcIns_cFP8J3DJointP8J3DModel */
 int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -598,12 +576,10 @@ int daNpcIns_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A0F28C-80A0F2AC 00112C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__10daNpcIns_cFP10fopAc_ac_c */
 int daNpcIns_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpcIns_c*>(a_this)->CreateHeap();
 }
 
-/* 80A0F2AC-80A0F2F8 00114C 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpcIns_cFP8J3DJointi */
 int daNpcIns_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -657,7 +633,6 @@ void daNpcIns_c::playExpression() {
     }
 }
 
-/* 80A12A10-80A12DC8 0048B0 03B8+00 1/1 0/0 0/0 .text            playMotion__10daNpcIns_cFv */
 void daNpcIns_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpcIns_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -711,7 +686,6 @@ void daNpcIns_c::playMotion() {
     }
 }
 
-/* 80A12618-80A126D4 0044B8 00BC+00 1/0 0/0 0/0 .text            setParam__10daNpcIns_cFv */
 void daNpcIns_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcIns_Param_c::m.common.attention_distance, daNpcIns_Param_c::m.common.attention_angle);
     attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
@@ -727,12 +701,10 @@ void daNpcIns_c::setParam() {
     gravity = daNpcIns_Param_c::m.common.gravity;
 }
 
-/* 80A13460-80A13468 005300 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcIns_cFv */
 int daNpcIns_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A126D4-80A12A10 004574 033C+00 1/0 0/0 0/0 .text            main__10daNpcIns_cFv */
 BOOL daNpcIns_c::main() {
     if (mAction) {
         (this->*mAction)(NULL);
@@ -750,7 +722,6 @@ BOOL daNpcIns_c::main() {
     return chkAction(&daNpcIns_c::goHome);
 }
 
-/* 80A0F2F8-80A0F538 001198 0240+00 2/0 0/0 0/0 .text            setExpressionAnm__10daNpcIns_cFib */
 bool daNpcIns_c::setExpressionAnm(int i_index, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
     J3DAnmTransform* i_bck;
@@ -828,7 +799,6 @@ bool daNpcIns_c::setExpressionAnm(int i_index, bool i_modify) {
     return false;
 }
 
-/* 80A0F538-80A0F618 0013D8 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__10daNpcIns_cFi */
 bool daNpcIns_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_index].arcIdx], l_btpGetParamList[i_index].fileIdx);
     int i_attr = l_btpGetParamList[i_index].attr;
@@ -853,7 +823,6 @@ bool daNpcIns_c::setExpressionBtp(int i_index) {
     return false;
 }
 
-/* 80A0F618-80A0F78C 0014B8 0174+00 1/0 0/0 0/0 .text            setMotionAnm__10daNpcIns_cFif */
 void daNpcIns_c::setMotionAnm(int i_index, f32 i_morf) {
     if (i_index < 0xA || i_index >= 0x18) {
         return;
@@ -882,7 +851,6 @@ void daNpcIns_c::setMotionAnm(int i_index, f32 i_morf) {
     }   
 }
 
-/* 80A0F78C-80A0F984 00162C 01F8+00 1/1 0/0 0/0 .text            reset__10daNpcIns_cFv */
 void daNpcIns_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -933,7 +901,6 @@ void daNpcIns_c::reset() {
     setWaitAction();
 }
 
-/* 80A12DC8-80A12EA4 004C68 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpcIns_cFv */
 BOOL daNpcIns_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* i_btk = getTexSRTKeyAnmP(l_arcNames[l_btkGetParamList[0].arcIdx], l_btkGetParamList[0].fileIdx);
@@ -951,7 +918,6 @@ BOOL daNpcIns_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80A12EA4-80A131AC 004D44 0308+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcIns_cFv */
 void daNpcIns_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -988,7 +954,6 @@ void daNpcIns_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80A131AC-80A1339C 00504C 01F0+00 1/1 0/0 0/0 .text            lookat__10daNpcIns_cFv */
 void daNpcIns_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1048,7 +1013,6 @@ void daNpcIns_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80A1339C-80A13460 00523C 00C4+00 1/0 0/0 0/0 .text            setMtx__10daNpcIns_cFv */
 void daNpcIns_c::setMtx() {
     J3DModel* model = mAnm_p->getModel();
 
@@ -1171,7 +1135,6 @@ void daNpcIns_c::checkPlayerSearch() {
     }
 }
 
-/* 80A0F984-80A0FF40 001824 05BC+00 2/0 0/0 0/0 .text            waitShop__10daNpcIns_cFPv */
 int daNpcIns_c::waitShop(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1211,7 +1174,6 @@ int daNpcIns_c::waitShop(void* param_1) {
     return 1;
 }
 
-/* 80A0FF40-80A0FFC4 001DE0 0084+00 1/0 0/0 0/0 .text            setMotion__10daNpcIns_cFifi */
 void daNpcIns_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
 
@@ -1237,7 +1199,6 @@ void daNpcIns_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80A0FFC4-80A0FFF0 001E64 002C+00 1/0 0/0 0/0 .text            setExpression__10daNpcIns_cFif */
 void daNpcIns_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 10) {
         mExpression = i_expression;
@@ -1247,7 +1208,6 @@ void daNpcIns_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80A0FFF0-80A103A0 001E90 03B0+00 1/0 0/0 0/0 .text            waitPresent__10daNpcIns_cFPv */
 int daNpcIns_c::waitPresent(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1304,7 +1264,6 @@ int daNpcIns_c::waitPresent(void* param_1) {
     return 1;
 }
 
-/* 80A103A0-80A10950 002240 05B0+00 1/0 0/0 0/0 .text            waitOutSide1__10daNpcIns_cFPv */
 int daNpcIns_c::waitOutSide1(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1354,7 +1313,6 @@ int daNpcIns_c::waitOutSide1(void* param_1) {
     return 1;
 }
 
-/* 80A10950-80A10CD8 0027F0 0388+00 1/0 0/0 0/0 .text            waitOutSide2__10daNpcIns_cFPv */
 int daNpcIns_c::waitOutSide2(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1386,7 +1344,6 @@ int daNpcIns_c::waitOutSide2(void* param_1) {
     return 1;
 }
 
-/* 80A10CD8-80A11330 002B78 0658+00 3/0 0/0 0/0 .text            goHome__10daNpcIns_cFPv */
 int daNpcIns_c::goHome(void* param_1) {
     switch (mMode) {
         case 0: {
@@ -1476,7 +1433,6 @@ void daNpcIns_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80A11378-80A11A7C 003218 0704+00 2/0 0/0 0/0 .text            talk__10daNpcIns_cFPv */
 int daNpcIns_c::talk(void* param_1) {
     int rv = 0;
     int itemNo;
@@ -1566,7 +1522,6 @@ int daNpcIns_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80A11A7C-80A11BE8 00391C 016C+00 1/0 0/0 0/0 .text            demo__10daNpcIns_cFPv */
 int daNpcIns_c::demo(void* param_1) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int iVar1 = 0;
@@ -1613,7 +1568,6 @@ int daNpcIns_c::demo(void* param_1) {
     return 1;
 }
 
-/* 80A11BE8-80A11C50 003A88 0068+00 1/1 0/0 0/0 .text            isInsectComplete__10daNpcIns_cFv */
 bool daNpcIns_c::isInsectComplete() {
     const insect_param_data* data_p = l_insectParams;
 
@@ -1626,7 +1580,6 @@ bool daNpcIns_c::isInsectComplete() {
     return true;
 }
 
-/* 80A11C50-80A11D44 003AF0 00F4+00 2/1 0/0 0/0 .text            getInsectParamData__10daNpcIns_cFi */
 const insect_param_data& daNpcIns_c::getInsectParamData(int i_index) {
     switch (i_index) {
         case fpcNm_ITEM_M_BEETLE:
@@ -1733,7 +1686,6 @@ const insect_param_data& daNpcIns_c::getInsectParamData(int i_index) {
     return l_insectParams[i_index];
 }
 
-/* 80A11D44-80A11F84 003BE4 0240+00 2/2 0/0 0/0 .text            setWaitAction__10daNpcIns_cFv */
 void daNpcIns_c::setWaitAction() {
     switch (mType) {
         case TYPE_0:
@@ -1750,7 +1702,6 @@ void daNpcIns_c::setWaitAction() {
     }
 }
 
-/* 80A11F84-80A1211C 003E24 0198+00 1/1 0/0 0/0 .text            setPath__10daNpcIns_cFi */
 bool daNpcIns_c::setPath(int path_index) {
     mPath = dPath_GetRoomPath(path_index, fopAcM_GetRoomNo(this));
 
@@ -1763,7 +1714,6 @@ bool daNpcIns_c::setPath(int path_index) {
     return true;
 }
 
-/* 80A1211C-80A122D0 003FBC 01B4+00 1/1 0/0 0/0 .text            checkPoint__10daNpcIns_cFR4cXyzf */
 bool daNpcIns_c::checkPoint(cXyz& param_1, f32 param_2) {
     f32 fVar1 = param_1.absXZ(dPath_GetPnt(mPath, mPntIndex)->m_position);
     if (fVar1 < param_2 || fVar1 < 10.0f) {
@@ -1779,7 +1729,6 @@ bool daNpcIns_c::checkPoint(cXyz& param_1, f32 param_2) {
     return false;
 }
 
-/* 80A122D0-80A12480 004170 01B0+00 1/1 0/0 0/0 .text            setNextPoint__10daNpcIns_cFv */
 bool daNpcIns_c::setNextPoint() {
     dPath_GetPnt(mPath, mPntIndex);
     mPntIndex++;
@@ -1795,14 +1744,12 @@ bool daNpcIns_c::setNextPoint() {
     return false;
 }
 
-/* 80A12480-80A124D0 004320 0050+00 2/2 0/0 0/0 .text            getTargetPoint__10daNpcIns_cFiP3Vec */
 void daNpcIns_c::getTargetPoint(int pnt_index, Vec* param_2) {
     if (mPath != NULL) {
         *param_2 = dPath_GetPnt(mPath, pnt_index)->m_position;
     }
 }
 
-/* 80A124D0-80A12560 004370 0090+00 1/1 0/0 0/0 .text            pathMoveF__10daNpcIns_cFv */
 void daNpcIns_c::pathMoveF() {
     if (mPath != NULL) {
         cXyz sp18;
@@ -1813,32 +1760,26 @@ void daNpcIns_c::pathMoveF() {
     }
 }
 
-/* 80A12560-80A12580 004400 0020+00 1/0 0/0 0/0 .text            daNpcIns_Create__FPv */
 static int daNpcIns_Create(void* a_this) {
     return static_cast<daNpcIns_c*>(a_this)->Create();
 }
 
-/* 80A12580-80A125A0 004420 0020+00 1/0 0/0 0/0 .text            daNpcIns_Delete__FPv */
 static int daNpcIns_Delete(void* a_this) {
     return static_cast<daNpcIns_c*>(a_this)->Delete();
 }
 
-/* 80A125A0-80A125C0 004440 0020+00 1/0 0/0 0/0 .text            daNpcIns_Execute__FPv */
 static int daNpcIns_Execute(void* a_this) {
     return static_cast<daNpcIns_c*>(a_this)->Execute();
 }
 
-/* 80A125C0-80A125E0 004460 0020+00 1/0 0/0 0/0 .text            daNpcIns_Draw__FPv */
 static int daNpcIns_Draw(void* a_this) {
     return static_cast<daNpcIns_c*>(a_this)->Draw();
 }
 
-/* 80A125E0-80A125E8 004480 0008+00 1/0 0/0 0/0 .text            daNpcIns_IsDelete__FPv */
 static int daNpcIns_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80A144B0-80A144D0 -00001 0020+00 1/0 0/0 0/0 .data            daNpcIns_MethodTable */
 static actor_method_class daNpcIns_MethodTable = {
     (process_method_func)daNpcIns_Create,
     (process_method_func)daNpcIns_Delete,
@@ -1847,7 +1788,6 @@ static actor_method_class daNpcIns_MethodTable = {
     (process_method_func)daNpcIns_Draw,
 };
 
-/* 80A144D0-80A14500 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_INS */
 extern actor_process_profile_definition g_profile_NPC_INS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp
index fc97654c34..41c4b032a7 100644
--- a/src/d/actor/d_a_npc_jagar.cpp
+++ b/src/d/actor/d_a_npc_jagar.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_jagar.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/actor/d_a_npc_bou.h"
-#include "dol2asm.h"
 #include "d/d_meter2_info.h"
 #include "d/actor/d_a_tag_push.h"
 
@@ -138,7 +137,6 @@ enum Event {
     /* 0x8 */ EVENT_FIND_WOLF_VER2,
 };
 
-/* 80A1A330-80A1A3D0 000000 00A0+00 13/13 0/0 1/1 .rodata          m__19daNpc_Jagar_Param_c */
 daNpc_Jagar_HIOParam const daNpc_Jagar_Param_c::m = {
     170.0f, -3.0f, 1.0f, 400.0f, 255.0f, 160.0f,
     35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f,
@@ -177,13 +175,11 @@ void daNpc_Jagar_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A1A568-80A1A570 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_JAGAR, 1},
 };
 
-/* 80A1A570-80A1A5B8 -00001 0048+00 0/1 0/0 0/0 .data            l_evtList */
-SECTION_DATA static daNpcT_evtData_c l_evtList[9] = {
+static daNpcT_evtData_c l_evtList[9] = {
     {"", 0},
     {"NO_RESPONSE", 0},
     {"CLIMBUP", 2},
@@ -195,7 +191,6 @@ SECTION_DATA static daNpcT_evtData_c l_evtList[9] = {
     {"FIND_WOLF_VER2", 3},
 };
 
-/* 80A1A5B8-80A1A5CC -00001 0014+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[5] = {
     "",
     "Jagar",
@@ -204,22 +199,18 @@ static char* l_resNameList[5] = {
     "Jagar3",
 };
 
-/* 80A1A5CC-80A1A5D0 000084 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {
     1, 2, 4, -1,
 };
 
-/* 80A1A5D0-80A1A5D4 000088 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     1, 3, -1
 };
 
-/* 80A1A5D4-80A1A5DC 00008C 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {
     1, 2, 3, 4, -1
 };
 
-/* 80A1A5DC-80A1A5EC -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
     l_loadResPtrn1,
@@ -227,7 +218,6 @@ static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn9,
 };
 
-/* 80A1A5EC-80A1A704 0000A4 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0,
         BTP_JAGA, J3DFrameCtrl::EMode_LOOP, Jagar, 1},
@@ -251,7 +241,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
         BTP_JAGA_F_SURPRISE_WAIT, J3DFrameCtrl::EMode_LOOP, Jagar2, 0},
 };
 
-/* 80A1A704-80A1A8FC 0001BC 01F8+00 0/1 0/0 0/0 .data            l_motionAnmData */
 daNpcT_motionAnmData_c l_motionAnmData[18] = {
     {BCK_JAGAR_WAIT_A, J3DFrameCtrl::EMode_LOOP, Jagar,
         BTK_JAGA, J3DFrameCtrl::EMode_NONE, Jagar, 1, 0},
@@ -291,7 +280,6 @@ daNpcT_motionAnmData_c l_motionAnmData[18] = {
         BTK_JAGA, J3DFrameCtrl::EMode_NONE, Jagar, 1, 0},
 };
 
-/* 80A1A8FC-80A1A98C 0003B4 0090+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {
     {1, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {8, -1, 1}, {9, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -304,7 +292,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A1A98C-80A1AABC 000444 0130+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, 
     {8, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -327,8 +314,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {13, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A1AABC-80A1AAD8 -00001 001C+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Jagar_c */
-SECTION_DATA char* daNpc_Jagar_c::mCutNameList[7] = {
+char* daNpc_Jagar_c::mCutNameList[7] = {
     "",
     "CLIMBUP",
     "NEED_YOUR_HELP",
@@ -338,7 +324,6 @@ SECTION_DATA char* daNpc_Jagar_c::mCutNameList[7] = {
     "FIND_WOLF",
 };
 
-/* 80A1AB20-80A1AB74 0005D8 0054+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Jagar_c */
 daNpc_Jagar_c::cutFunc daNpc_Jagar_c::mCutList[7] = {
     NULL,
     &daNpc_Jagar_c::cutClimbUp,
@@ -349,10 +334,8 @@ daNpc_Jagar_c::cutFunc daNpc_Jagar_c::mCutList[7] = {
     &daNpc_Jagar_c::cutFindWolf,
 };
 
-/* 80A1AE2C-80A1AE30 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_JAGAR_HIO_CLASS l_HIO;
 
-/* 80A1470C-80A14858 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daNpc_Jagar_cFv */
 daNpc_Jagar_c::~daNpc_Jagar_c() {
     if (mpMorf[0] != 0) {
         mpMorf[0]->stopZelAnime();
@@ -360,7 +343,6 @@ daNpc_Jagar_c::~daNpc_Jagar_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80A14858-80A14B20 000238 02C8+00 1/1 0/0 0/0 .text            create__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::create() {
     static int const heapSize[4] = {14416, 14448, 14448, 0};
     daNpcT_ct(this, daNpc_Jagar_c, l_faceMotionAnmData,
@@ -409,7 +391,6 @@ int daNpc_Jagar_c::create() {
     return rv;
 }
 
-/* 80A14B20-80A14D90 000500 0270+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(
         l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
@@ -439,19 +420,16 @@ int daNpc_Jagar_c::CreateHeap() {
     return 0;
 }
 
-/* 80A14F4C-80A14F80 00092C 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Jagar_c();
     return 1;
 }
 
-/* 80A14F80-80A14FA0 000960 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A14FA0-80A15034 000980 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -460,12 +438,10 @@ int daNpc_Jagar_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80A15034-80A15054 000A14 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_Jagar_cFP10fopAc_ac_c */
 int daNpc_Jagar_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Jagar_c*>(i_this)->CreateHeap();
 }
 
-/* 80A15054-80A150AC 000A34 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_Jagar_cFP8J3DJointi */
 int daNpc_Jagar_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -477,7 +453,6 @@ int daNpc_Jagar_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A150AC-80A150F8 000A8C 004C+00 1/1 0/0 2/2 .text            getType__13daNpc_Jagar_cFv */
 u8 daNpc_Jagar_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
         case 0:
@@ -494,7 +469,6 @@ u8 daNpc_Jagar_c::getType() {
     }
 }
 
-/* 80A150F8-80A15198 000AD8 00A0+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -517,7 +491,6 @@ int daNpc_Jagar_c::isDelete() {
     }
 }
 
-/* 80A15198-80A15364 000B78 01CC+00 1/1 0/0 0/0 .text            reset__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::reset() {
     csXyz acStack_20;
     int iVar1 = (u8*)&field_0x1008 - (u8*)&field_0xfd4;
@@ -551,7 +524,6 @@ void daNpc_Jagar_c::reset() {
     }
 }
 
-/* 80A15364-80A153E8 000D44 0084+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Jagar_cFi */
 void daNpc_Jagar_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -562,7 +534,6 @@ void daNpc_Jagar_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A153E8-80A155E4 000DC8 01FC+00 1/0 0/0 0/0 .text            setParam__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::setParam() {
     selectAction();
     srchActors();
@@ -631,7 +602,6 @@ void daNpc_Jagar_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A155E4-80A15714 000FC4 0130+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Jagar_c::talk)) {
         mPreItemNo = 0;
@@ -668,7 +638,6 @@ int daNpc_Jagar_c::checkChangeEvt() {
     return false;
 }
 
-/* 80A15714-80A157B4 0010F4 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::setAfterTalkMotion() {
     int iVar2 = 8;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -691,7 +660,6 @@ void daNpc_Jagar_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80A157B4-80A158A0 001194 00EC+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::srchActors() {
     switch(mType) {
         case TYPE_0:
@@ -719,7 +687,6 @@ void daNpc_Jagar_c::srchActors() {
     }
 }
 
-/* 80A158A0-80A15940 001280 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Jagar_cFv */
 BOOL daNpc_Jagar_c::evtTalk() {
     if (chkAction(&daNpc_Jagar_c::talk)) {
         (this->*field_0xfe0)(NULL);
@@ -729,7 +696,6 @@ BOOL daNpc_Jagar_c::evtTalk() {
     return 1;
 }
 
-/* 80A15940-80A15A08 001320 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Jagar_cFv */
 BOOL daNpc_Jagar_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Jagar", this, -1);
     if (staffId != -1) {
@@ -743,7 +709,6 @@ BOOL daNpc_Jagar_c::evtCutProc() {
     return false;
 }
 
-/* 80A15A08-80A15CA4 0013E8 029C+00 1/0 0/0 0/0 .text            action__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::action() {
     fopAc_ac_c* hitActor = hitChk(&mCyl1, 0xffffffff);
     if (hitActor && mCyl1.GetTgHitObj()->ChkAtType(AT_TYPE_THROW_OBJ)) {
@@ -794,7 +759,6 @@ void daNpc_Jagar_c::action() {
     }
 }
 
-/* 80A15CA4-80A15D68 001684 00C4+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -806,7 +770,6 @@ void daNpc_Jagar_c::beforeMove() {
     }
 }
 
-/* 80A15D68-80A1607C 001748 0314+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::setAttnPos() {
     cXyz cStack_3c(-10.0f, 10.0f, 0.0f);
     mStagger.calc(0);
@@ -840,7 +803,6 @@ void daNpc_Jagar_c::setAttnPos() {
     }
 }
 
-/* 80A1607C-80A161EC 001A5C 0170+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Jagar_cFv */
 void daNpc_Jagar_c::setCollision() {
     cXyz cStack_48;
     if (mHide == 0) {
@@ -879,12 +841,10 @@ void daNpc_Jagar_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80A161EC-80A161F4 001BCC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A161F4-80A16234 001BD4 0040+00 1/0 0/0 0/0 .text            changeBtp__13daNpc_Jagar_cFPiPi */
 void daNpc_Jagar_c::changeBtp(int* param_0, int* param_1) {
     if (((mType == TYPE_1 || mType == TYPE_2) && *param_0 == 19) && *param_1 == 1) {
         *param_0 = 17;
@@ -893,7 +853,6 @@ void daNpc_Jagar_c::changeBtp(int* param_0, int* param_1) {
     return;
 }
 
-/* 80A16234-80A162B0 001C14 007C+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::selectAction() {
     field_0xfd4 = NULL;
     switch (mType) {
@@ -908,12 +867,10 @@ int daNpc_Jagar_c::selectAction() {
     return 1;
 }
 
-/* 80A162B0-80A162DC 001C90 002C+00 2/2 0/0 0/0 .text            chkAction__13daNpc_Jagar_cFM13daNpc_Jagar_cFPCvPvPv_i */
 int daNpc_Jagar_c::chkAction(int (daNpc_Jagar_c::*action)(void*)) {
     return field_0xfe0 == action;
 }
 
-/* 80A162DC-80A16384 001CBC 00A8+00 2/2 0/0 0/0 .text            setAction__13daNpc_Jagar_cFM13daNpc_Jagar_cFPCvPvPv_i */
 int daNpc_Jagar_c::setAction(int (daNpc_Jagar_c::*action)(void*)) {
     mMode = 3;
     if (field_0xfe0 != NULL) {
@@ -929,7 +886,6 @@ int daNpc_Jagar_c::setAction(int (daNpc_Jagar_c::*action)(void*)) {
     return 1;
 }
 
-/* 80A16384-80A16544 001D64 01C0+00 1/0 0/0 0/0 .text            cutClimbUp__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutClimbUp(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -968,7 +924,6 @@ int daNpc_Jagar_c::cutClimbUp(int i_cutIndex) {
     return rv;
 }
 
-/* 80A16544-80A16CD8 001F24 0794+00 1/0 0/0 0/0 .text            cutNeedYourHelp__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1111,7 +1066,6 @@ int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) {
     return rv;
 }
 
-/* 80A16CD8-80A16EFC 0026B8 0224+00 1/0 0/0 0/0 .text            cutAnger__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutAnger(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1161,7 +1115,6 @@ int daNpc_Jagar_c::cutAnger(int i_cutIndex) {
     return rv;
 }
 
-/* 80A16EFC-80A1705C 0028DC 0160+00 1/0 0/0 0/0 .text cutConversationWithBou__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutConversationWithBou(int i_cutIndex) {
     daTag_Push_c* this_00 = (daTag_Push_c*)field_0xba0.getActorP();
     int rv = 0;
@@ -1192,7 +1145,6 @@ int daNpc_Jagar_c::cutConversationWithBou(int i_cutIndex) {
     return rv;
 }
 
-/* 80A1705C-80A173D8 002A3C 037C+00 1/0 0/0 0/0 .text            cutConfidentialConversation__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutConfidentialConversation(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1261,7 +1213,6 @@ int daNpc_Jagar_c::cutConfidentialConversation(int i_cutIndex) {
     return rv;
 }
 
-/* 80A173D8-80A17898 002DB8 04C0+00 3/0 0/0 0/0 .text            cutFindWolf__13daNpc_Jagar_cFi */
 int daNpc_Jagar_c::cutFindWolf(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1379,7 +1330,6 @@ int daNpc_Jagar_c::cutFindWolf(int i_cutIndex) {
     return rv;
 }
 
-/* 80A17898-80A17924 003278 008C+00 1/1 0/0 0/0 .text            chkSitMotion__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::chkSitMotion() {
     if (daNpcT_chkEvtBit(0x235) /* dSv_event_flag_c::F_0565 - N/A - 2nd Day Complete */) {
         if (field_0x1002) {
@@ -1396,7 +1346,6 @@ int daNpc_Jagar_c::chkSitMotion() {
     return 1;
 }
 
-/* 80A17924-80A17984 003304 0060+00 1/1 0/0 0/0 .text            chkSitMotion2__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::chkSitMotion2() {
     if (daNpcT_chkEvtBit(0x235) /* dSv_event_flag_c::F_0565 - N/A - 2nd Day Complete */) {
         if (daNpcT_chkEvtBit(0x224) /* dSv_event_flag_c::F_0548 - Ordon Village - Opening 3rd day - spoke with Jaggle */) {
@@ -1409,7 +1358,6 @@ int daNpc_Jagar_c::chkSitMotion2() {
     return 0;
 }
 
-/* 80A17984-80A179F8 003364 0074+00 3/3 0/0 0/0 .text            chkChuMotion__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::chkChuMotion() {
     if (!daNpcT_chkEvtBit(0x235) /* dSv_event_flag_c::F_0565 - N/A - 2nd Day Complete */
         && daNpcT_chkEvtBit(0x1C) /* dSv_event_flag_c::F_0023 - Ordon Village - Called by Jaggle from below hill */) {
@@ -1423,13 +1371,11 @@ int daNpc_Jagar_c::chkChuMotion() {
     return 0;
 }
 
-/* 80A179F8-80A17A2C 0033D8 0034+00 1/1 0/0 0/0 .text            chkToMotion__13daNpc_Jagar_cFv */
 int daNpc_Jagar_c::chkToMotion() {
     return mMotionSeqMngr.getNo() == MOT_SIT_TO_WAIT || mMotionSeqMngr.getNo() == MOT_TO_CHU ||
            mMotionSeqMngr.getNo() == MOT_CHU_TO_SIT || mMotionSeqMngr.getNo() == MOT_WAIT_TO_SIT;
 }
 
-/* 80A17A2C-80A1856C 00340C 0B40+00 1/0 0/0 0/0 .text            wait__13daNpc_Jagar_cFPv */
 int daNpc_Jagar_c::wait(void* param_1) {
     cXyz cStack_24;
 
@@ -1663,7 +1609,6 @@ int daNpc_Jagar_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80A1856C-80A18B74 003F4C 0608+00 1/0 0/0 0/0 .text            talkwithBou__13daNpc_Jagar_cFPv */
 int daNpc_Jagar_c::talkwithBou(void* param_0) {
     daNpc_Bou_c* bo = (daNpc_Bou_c *)mActorMngr[2].getActorP();
 
@@ -1753,7 +1698,6 @@ int daNpc_Jagar_c::talkwithBou(void* param_0) {
     return 1;
 }
 
-/* 80A18B74-80A18F28 004554 03B4+00 3/0 0/0 0/0 .text            talk__13daNpc_Jagar_cFPv */
 int daNpc_Jagar_c::talk(void* param_0) {
     switch(mMode) {
         case 0:
@@ -1818,32 +1762,26 @@ int daNpc_Jagar_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A18F28-80A18F48 004908 0020+00 1/0 0/0 0/0 .text            daNpc_Jagar_Create__FPv */
 static int daNpc_Jagar_Create(void* i_this) {
     return static_cast<daNpc_Jagar_c*>(i_this)->create();
 }
 
-/* 80A18F48-80A18F68 004928 0020+00 1/0 0/0 0/0 .text            daNpc_Jagar_Delete__FPv */
 static int daNpc_Jagar_Delete(void* i_this) {
     return static_cast<daNpc_Jagar_c*>(i_this)->Delete();
 }
 
-/* 80A18F68-80A18F88 004948 0020+00 1/0 0/0 0/0 .text            daNpc_Jagar_Execute__FPv */
 static int daNpc_Jagar_Execute(void* i_this) {
     return static_cast<daNpc_Jagar_c*>(i_this)->Execute();
 }
 
-/* 80A18F88-80A18FA8 004968 0020+00 1/0 0/0 0/0 .text            daNpc_Jagar_Draw__FPv */
 static int daNpc_Jagar_Draw(void* i_this) {
     return static_cast<daNpc_Jagar_c*>(i_this)->Draw();
 }
 
-/* 80A18FA8-80A18FB0 004988 0008+00 1/0 0/0 0/0 .text            daNpc_Jagar_IsDelete__FPv */
 static int daNpc_Jagar_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A1AC10-80A1AC30 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Jagar_MethodTable */
 static actor_method_class daNpc_Jagar_MethodTable = {
     (process_method_func)daNpc_Jagar_Create,
     (process_method_func)daNpc_Jagar_Delete,
@@ -1852,7 +1790,6 @@ static actor_method_class daNpc_Jagar_MethodTable = {
     (process_method_func)daNpc_Jagar_Draw,
 };
 
-/* 80A1AC30-80A1AC60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_JAGAR */
 extern actor_process_profile_definition g_profile_NPC_JAGAR = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp
index 5b1f1c1f54..134f68b1d0 100644
--- a/src/d/actor/d_a_npc_kakashi.cpp
+++ b/src/d/actor/d_a_npc_kakashi.cpp
@@ -10,14 +10,12 @@
 #include "d/d_s_play.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8054EDBC-8054EDD4 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {10, 1},
     {8, 1},
     {9, 1},
 };
 
-/* 8054EDD4-8054EE7C -00001 00A8+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[21] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -42,32 +40,26 @@ static daNpcT_evtData_c l_evtList[21] = {
     {"SWDTUTORIAL_JUMPGIRI_CLEAR2", 1},
 };
 
-/* 8054EE7C-8054EE84 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Kakashi",
 };
 
-/* 8054EE84-8054EE88 0000E8 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[] = {1, -1};
 
-/* 8054EE88-8054EEA0 -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn0, l_loadResPtrn0, NULL,
 };
 
-/* 8054EEA0-8054EEBC 000104 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, 0, 0, -1, 0, 0, 0},
 };
 
-/* 8054EEBC-8054EED8 000120 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {-1, 0, 0, -1, 0, 0, 0, 0},
 };
 
-/* 8054EED8-8054EEE8 00013C 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -75,7 +67,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 8054EEE8-8054EEF8 00014C 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -83,7 +74,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
 };
 
-/* 8054EEF8-8054EF08 -00001 0010+00 1/1 0/0 0/0 .data            mCutNameList__15daNpc_Kakashi_c */
 char* daNpc_Kakashi_c::mCutNameList[4] = {
     "",
     "SWDTUTORIAL",
@@ -91,7 +81,6 @@ char* daNpc_Kakashi_c::mCutNameList[4] = {
     "MAROS_WHISPER",
 };
 
-/* 8054EF2C-8054EF5C 000190 0030+00 1/2 0/0 0/0 .data            mCutList__15daNpc_Kakashi_c */
 int (daNpc_Kakashi_c::*daNpc_Kakashi_c::mCutList[])(int) = {
     NULL,
     &daNpc_Kakashi_c::cutSwdTutorial,
@@ -99,7 +88,6 @@ int (daNpc_Kakashi_c::*daNpc_Kakashi_c::mCutList[])(int) = {
     &daNpc_Kakashi_c::cutMarosWhisper,
 };
 
-/* 8054B36C-8054B4E8 0000EC 017C+00 1/0 0/0 0/0 .text            __dt__15daNpc_Kakashi_cFv */
 daNpc_Kakashi_c::~daNpc_Kakashi_c() {
     OS_REPORT("|%06d:%x|daNpc_Kakashi_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -111,7 +99,6 @@ daNpc_Kakashi_c::~daNpc_Kakashi_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 8054EAC4-8054EB5C 000000 0098+00 7/7 0/0 0/0 .rodata          m__21daNpc_Kakashi_Param_c */
 const daNpc_Kakashi_HIOParam daNpc_Kakashi_Param_c::m = {
     190.0f,
     -6.0f,
@@ -159,7 +146,6 @@ const daNpc_Kakashi_HIOParam daNpc_Kakashi_Param_c::m = {
     27.0f,
 };
 
-/* 8054B4E8-8054B7D8 000268 02F0+00 1/1 0/0 0/0 .text            create__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::create() {
     daNpcT_ct(this, daNpc_Kakashi_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -231,7 +217,6 @@ static f32 dummyFloat(int _) {
     }
 }
 
-/* 8054B7D8-8054B908 000558 0130+00 1/1 0/0 0/0 .text            CreateHeap__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -259,7 +244,6 @@ int daNpc_Kakashi_c::CreateHeap() {
     return 1;
 }
 
-/* 8054B908-8054B93C 000688 0034+00 1/1 0/0 0/0 .text            Delete__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Kakashi_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -267,20 +251,16 @@ int daNpc_Kakashi_c::Delete() {
     return 1;
 }
 
-/* 8054B93C-8054B994 0006BC 0058+00 2/2 0/0 0/0 .text            Execute__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::Execute() {
     execute();
     mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     return 1;
 }
 
-/* 8054B994-8054B9D8 000714 0044+00 1/1 0/0 0/0 .text            Draw__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 8054B9D8-8054BB34 000758 015C+00 2/0 0/0 0/0 .text
- * ctrlJoint__15daNpc_Kakashi_cFP8J3DJointP8J3DModel            */
 int daNpc_Kakashi_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     u16 jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -316,14 +296,10 @@ int daNpc_Kakashi_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 8054BB34-8054BB54 0008B4 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daNpc_Kakashi_cFP10fopAc_ac_c          */
 int daNpc_Kakashi_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_Kakashi_c*)i_this)->CreateHeap();
 }
 
-/* 8054BB54-8054BBAC 0008D4 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__15daNpc_Kakashi_cFP8J3DJointi             */
 int daNpc_Kakashi_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -336,7 +312,6 @@ int daNpc_Kakashi_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8054BBAC-8054BC10 00092C 0064+00 1/1 0/0 0/0 .text            getType__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -354,7 +329,6 @@ int daNpc_Kakashi_c::getType() {
     }
 }
 
-/* 8054BC10-8054BC98 000990 0088+00 1/1 0/0 0/0 .text            isDelete__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::isDelete() {
     switch (mType) {
     case 0:
@@ -372,7 +346,6 @@ int daNpc_Kakashi_c::isDelete() {
     }
 }
 
-/* 8054BC98-8054BEA8 000A18 0210+00 1/1 0/0 0/0 .text            reset__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::reset() {
     csXyz angle;
     u32 var_r30 = (uintptr_t)&field_0x1394 - (uintptr_t)&mSelectAction;
@@ -418,7 +391,6 @@ void daNpc_Kakashi_c::reset() {
     setAngle(angle);
 }
 
-/* 8054BEA8-8054BF88 000C28 00E0+00 1/0 0/0 0/0 .text            setParam__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::setParam() {
     selectAction();
     srchActors();
@@ -446,11 +418,8 @@ void daNpc_Kakashi_c::setParam() {
     gravity = daNpc_Kakashi_Param_c::m.common.gravity;
 }
 
-/* 8054BF88-8054BF8C 000D08 0004+00 1/1 0/0 0/0 .text            srchActors__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::srchActors() {}
 
-/* 8054BF8C-8054C034 000D0C 00A8+00 1/0 0/0 0/0 .text            checkChangeEvt__15daNpc_Kakashi_cFv
- */
 BOOL daNpc_Kakashi_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Kakashi_c::talk)) {
         switch (mType) {
@@ -472,7 +441,6 @@ BOOL daNpc_Kakashi_c::checkChangeEvt() {
     return 0;
 }
 
-/* 8054C034-8054C0D4 000DB4 00A0+00 1/0 0/0 0/0 .text            evtTalk__15daNpc_Kakashi_cFv */
 BOOL daNpc_Kakashi_c::evtTalk() {
     if (chkAction(&daNpc_Kakashi_c::talk)) {
         (this->*mAction)(NULL);
@@ -483,14 +451,12 @@ BOOL daNpc_Kakashi_c::evtTalk() {
     return TRUE;
 }
 
-/* 8054C0D4-8054C0E8 000E54 0014+00 1/0 0/0 0/0 .text            evtEndProc__15daNpc_Kakashi_cFv */
 BOOL daNpc_Kakashi_c::evtEndProc() {
     field_0x138e = 0;
     field_0x138f = 0;
     return TRUE;
 }
 
-/* 8054C0E8-8054C1B0 000E68 00C8+00 1/0 0/0 0/0 .text            evtCutProc__15daNpc_Kakashi_cFv */
 BOOL daNpc_Kakashi_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Kakashi", this, -1);
     if (staffId != -1) {
@@ -507,7 +473,6 @@ BOOL daNpc_Kakashi_c::evtCutProc() {
     return FALSE;
 }
 
-/* 8054C1B0-8054C268 000F30 00B8+00 1/0 0/0 0/0 .text            action__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::action() {
     fopAc_ac_c* hit_actor = hitChk();
     if (hit_actor != NULL) {
@@ -525,14 +490,12 @@ void daNpc_Kakashi_c::action() {
     }
 }
 
-/* 8054C268-8054C2E0 000FE8 0078+00 1/0 0/0 0/0 .text            beforeMove__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 8054C2E0-8054C584 001060 02A4+00 1/0 0/0 0/0 .text            setAttnPos__15daNpc_Kakashi_cFv */
 void daNpc_Kakashi_c::setAttnPos() {
     cXyz sp20(0.0f, 0.0f, 0.0f);
     cXyz sp14;
@@ -591,11 +554,8 @@ void daNpc_Kakashi_c::setAttnPos() {
     }
 }
 
-/* 8054F1EC-8054F1F0 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Kakashi_Param_c l_HIO;
 
-/* 8054C584-8054C924 001304 03A0+00 1/0 0/0 0/0 .text            setCollision__15daNpc_Kakashi_cFv
- */
 void daNpc_Kakashi_c::setCollision() {
     if (!mHide) {
         static cXyz armROfst(80.0f, 0.0f, 0.0f);
@@ -665,13 +625,10 @@ void daNpc_Kakashi_c::setCollision() {
     mCcCyl.ClrTgHit();
 }
 
-/* 8054C924-8054C92C 0016A4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::drawDbgInfo() {
     return 0;
 }
 
-/* 8054C92C-8054CA1C 0016AC 00F0+00 1/1 0/0 0/0 .text            selectAction__15daNpc_Kakashi_cFv
- */
 int daNpc_Kakashi_c::selectAction() {
     mSelectAction = NULL;
 
@@ -697,14 +654,10 @@ int daNpc_Kakashi_c::selectAction() {
     return 1;
 }
 
-/* 8054CA1C-8054CA48 00179C 002C+00 2/2 0/0 0/0 .text
- * chkAction__15daNpc_Kakashi_cFM15daNpc_Kakashi_cFPCvPvPv_i    */
 int daNpc_Kakashi_c::chkAction(int (daNpc_Kakashi_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 8054CA48-8054CAF0 0017C8 00A8+00 2/2 0/0 0/0 .text
- * setAction__15daNpc_Kakashi_cFM15daNpc_Kakashi_cFPCvPvPv_i    */
 int daNpc_Kakashi_c::setAction(int (daNpc_Kakashi_c::*i_action)(void*)) {
     mMode = 3;
     if (mAction != NULL) {
@@ -720,7 +673,6 @@ int daNpc_Kakashi_c::setAction(int (daNpc_Kakashi_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 8054CAF0-8054CEA0 001870 03B0+00 1/1 0/0 0/0 .text            hitChk__15daNpc_Kakashi_cFv */
 fopAc_ac_c* daNpc_Kakashi_c::hitChk() {
     dCcD_GObjInf* hit_obj = NULL;
     fopAc_ac_c* hit_actor = NULL;
@@ -822,8 +774,6 @@ fopAc_ac_c* daNpc_Kakashi_c::hitChk() {
     return hit_actor;
 }
 
-/* 8054CEA0-8054D26C 001C20 03CC+00 1/1 0/0 0/0 .text
- * setStaggerParam__15daNpc_Kakashi_cFP10fopAc_ac_c             */
 void daNpc_Kakashi_c::setStaggerParam(fopAc_ac_c* i_hitActor) {
     csXyz sp14;
     f32 var_f31 = 1.0f;
@@ -909,7 +859,6 @@ void daNpc_Kakashi_c::setStaggerParam(fopAc_ac_c* i_hitActor) {
     mSound.startSound(Z2SE_OBJ_KAKASHI_SHAKE, 0, -1);
 }
 
-/* 8054D26C-8054D374 001FEC 0108+00 1/1 0/0 0/0 .text            setPrtcls__15daNpc_Kakashi_cFi */
 void daNpc_Kakashi_c::setPrtcls(int i_type) {
     cXyz pos;
     if (i_type == 0 || i_type == 1) {
@@ -928,7 +877,6 @@ void daNpc_Kakashi_c::setPrtcls(int i_type) {
     }
 }
 
-/* 8054D374-8054D490 0020F4 011C+00 1/1 0/0 0/0 .text judgeSwdTutorial__15daNpc_Kakashi_cFv */
 int daNpc_Kakashi_c::judgeSwdTutorial() {
     switch (daNpcKakashi_getSwdTutorialStep()) {
     case 2:
@@ -975,8 +923,6 @@ int daNpc_Kakashi_c::judgeSwdTutorial() {
     return FALSE;
 }
 
-/* 8054D490-8054D57C 002210 00EC+00 1/0 0/0 0/0 .text            cutSwdTutorial__15daNpc_Kakashi_cFi
- */
 int daNpc_Kakashi_c::cutSwdTutorial(int i_staffId) {
     int rt = 0;
     int prm = -1;
@@ -1007,8 +953,6 @@ int daNpc_Kakashi_c::cutSwdTutorial(int i_staffId) {
     return rt;
 }
 
-/* 8054D57C-8054D604 0022FC 0088+00 1/0 0/0 0/0 .text            cutGetWoodSwd__15daNpc_Kakashi_cFi
- */
 int daNpc_Kakashi_c::cutGetWoodSwd(int i_staffId) {
     int rt = 0;
     int prm = -1;
@@ -1030,7 +974,6 @@ int daNpc_Kakashi_c::cutGetWoodSwd(int i_staffId) {
     return rt;
 }
 
-/* 8054D604-8054D668 002384 0064+00 1/0 0/0 0/0 .text cutMarosWhisper__15daNpc_Kakashi_cFi */
 int daNpc_Kakashi_c::cutMarosWhisper(int i_staffId) {
     int rt = 0;
     int prm = -1;
@@ -1047,7 +990,6 @@ int daNpc_Kakashi_c::cutMarosWhisper(int i_staffId) {
     return rt;
 }
 
-/* 8054D668-8054D694 0023E8 002C+00 3/0 0/0 0/0 .text            wait__15daNpc_Kakashi_cFPv */
 int daNpc_Kakashi_c::wait(void*) {
     switch (mMode) {
     case 0:
@@ -1062,8 +1004,6 @@ int daNpc_Kakashi_c::wait(void*) {
     return 1;
 }
 
-/* 8054D694-8054D8BC 002414 0228+00 2/0 0/0 0/0 .text            swdTutorial__15daNpc_Kakashi_cFPv
- */
 int daNpc_Kakashi_c::swdTutorial(void*) {
     switch (mMode) {
     case 0:
@@ -1156,7 +1096,6 @@ int daNpc_Kakashi_c::swdTutorial(void*) {
     return 1;
 }
 
-/* 8054D8BC-8054D978 00263C 00BC+00 3/0 0/0 0/0 .text            talk__15daNpc_Kakashi_cFPv */
 int daNpc_Kakashi_c::talk(void*) {
     switch (mMode) {
     case 0:
@@ -1178,32 +1117,26 @@ int daNpc_Kakashi_c::talk(void*) {
     return 0;
 }
 
-/* 8054D978-8054D998 0026F8 0020+00 1/0 0/0 0/0 .text            daNpc_Kakashi_Create__FPv */
 static int daNpc_Kakashi_Create(void* i_this) {
     return ((daNpc_Kakashi_c*)i_this)->create();
 }
 
-/* 8054D998-8054D9B8 002718 0020+00 1/0 0/0 0/0 .text            daNpc_Kakashi_Delete__FPv */
 static int daNpc_Kakashi_Delete(void* i_this) {
     return ((daNpc_Kakashi_c*)i_this)->Delete();
 }
 
-/* 8054D9B8-8054D9D8 002738 0020+00 1/0 0/0 0/0 .text            daNpc_Kakashi_Execute__FPv */
 static int daNpc_Kakashi_Execute(void* i_this) {
     return ((daNpc_Kakashi_c*)i_this)->Execute();
 }
 
-/* 8054D9D8-8054D9F8 002758 0020+00 1/0 0/0 0/0 .text            daNpc_Kakashi_Draw__FPv */
 static int daNpc_Kakashi_Draw(void* i_this) {
     return ((daNpc_Kakashi_c*)i_this)->Draw();
 }
 
-/* 8054D9F8-8054DA00 002778 0008+00 1/0 0/0 0/0 .text            daNpc_Kakashi_IsDelete__FPv */
 static int daNpc_Kakashi_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8054EFDC-8054EFFC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kakashi_MethodTable */
 static actor_method_class daNpc_Kakashi_MethodTable = {
     (process_method_func)daNpc_Kakashi_Create,
     (process_method_func)daNpc_Kakashi_Delete,
@@ -1212,7 +1145,6 @@ static actor_method_class daNpc_Kakashi_MethodTable = {
     (process_method_func)daNpc_Kakashi_Draw,
 };
 
-/* 8054EFFC-8054F02C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KAKASHI */
 extern actor_process_profile_definition g_profile_NPC_KAKASHI = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp
index 121283e19c..0757b6cdb9 100644
--- a/src/d/actor/d_a_npc_kasi_hana.cpp
+++ b/src/d/actor/d_a_npc_kasi_hana.cpp
@@ -146,10 +146,8 @@ enum Type {
     /* 0x1 */ TYPE_CHEER,
 };
 
-/* 80A21854-80A21858 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_KASI_HANA_HIO_CLASS l_HIO;
 
-/* 80A1AFAC-80A1B09C 0000EC 00F0+00 1/1 0/0 0/0 .text            calcEscapeForm__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::calcEscapeForm() {
     fopAc_ac_c* hana_p = mHanaActorMngr.getActorP();
     if (hana_p != NULL){
@@ -164,7 +162,6 @@ void daNpcKasi_Mng_c::calcEscapeForm() {
     }
 }
 
-/* 80A1B0D8-80A1B1C8 000218 00F0+00 2/2 0/0 0/0 .text            calcCenterPos__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::calcCenterPos() {
     fopAc_ac_c* hana_p = mHanaActorMngr.getActorP();
     fopAc_ac_c* kyu_p = mKyuActorMngr.getActorP();
@@ -185,7 +182,6 @@ BOOL daNpcKasi_Mng_c::calcCenterPos() {
     return TRUE;
 }
 
-/* 80A1B1C8-80A1B35C 000308 0194+00 1/1 0/0 0/0 .text getDistFromCenter__15daNpcKasi_Mng_cFv */
 f32 daNpcKasi_Mng_c::getDistFromCenter() {
     f32 rv;
 
@@ -198,7 +194,6 @@ f32 daNpcKasi_Mng_c::getDistFromCenter() {
     return sp28.absXZ();
 }
 
-/* 80A1B35C-80A1B3D4 00049C 0078+00 1/1 0/0 0/0 .text            getOffsetFromLeader__15daNpcKasi_Mng_cFRC4cXyzR4cXyz */
 void daNpcKasi_Mng_c::getOffsetFromLeader(cXyz const& param_1, cXyz& param_2) {
     param_2 = param_1;
 
@@ -210,7 +205,6 @@ void daNpcKasi_Mng_c::getOffsetFromLeader(cXyz const& param_1, cXyz& param_2) {
     }
 }
 
-/* 80A1B410-80A1B48C 000550 007C+00 1/1 0/0 0/0 .text            initPath__15daNpcKasi_Mng_cFUcUs */
 void daNpcKasi_Mng_c::initPath(u8 i_pathNo, u16 i_idx) {
     if (!mIsPathInit) {
         fopAc_ac_c* hana_p = mHanaActorMngr.getActorP();
@@ -226,7 +220,6 @@ void daNpcKasi_Mng_c::initPath(u8 i_pathNo, u16 i_idx) {
     }
 }
 
-/* 80A1B48C-80A1B5F0 0005CC 0164+00 1/1 0/0 0/0 .text            getPlNearPoint__15daNpcKasi_Mng_cFv */
 int daNpcKasi_Mng_c::getPlNearPoint() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp58(*fopAcM_GetPosition_p(player));
@@ -255,7 +248,6 @@ int daNpcKasi_Mng_c::getPlNearPoint() {
     return rv;
 }
 
-/* 80A1B5F0-80A1B628 000730 0038+00 1/1 0/0 0/0 .text            getSygnalInfo__15daNpcKasi_Mng_cFv */
 int daNpcKasi_Mng_c::getSygnalInfo() {
     int iVar1 = 1;
     for (int i = 0; i < 20; i++) {
@@ -269,7 +261,6 @@ int daNpcKasi_Mng_c::getSygnalInfo() {
     return -1;
 }
 
-/* 80A1B628-80A1B6F8 000768 00D0+00 1/1 0/0 0/0 .text            sendInfo__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::sendInfo() {
     int sygnalInfo = getSygnalInfo();
     daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
@@ -289,7 +280,6 @@ void daNpcKasi_Mng_c::sendInfo() {
     }
 }
 
-/* 80A1B6F8-80A1B774 000838 007C+00 1/1 0/0 0/0 .text            offTalk__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::offTalk() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
@@ -308,7 +298,6 @@ void daNpcKasi_Mng_c::offTalk() {
     }
 }
 
-/* 80A1B774-80A1B810 0008B4 009C+00 1/1 0/0 0/0 .text            chkTalk__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::chkTalk() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
@@ -334,7 +323,6 @@ BOOL daNpcKasi_Mng_c::chkTalk() {
     return rv;
 }
 
-/* 80A1B810-80A1B884 000950 0074+00 1/1 0/0 0/0 .text            chkFear__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::chkFear() {
     daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
     if (kyu_p != NULL && kyu_p->is_fear()) {
@@ -349,7 +337,6 @@ BOOL daNpcKasi_Mng_c::chkFear() {
     return FALSE;
 }
 
-/* 80A1B884-80A1B920 0009C4 009C+00 1/1 0/0 0/0 .text            chkEscape__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::chkEscape() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     daNpcKasiKyu_c* kyu_p = (daNpcKasiKyu_c*)mKyuActorMngr.getActorP();
@@ -375,7 +362,6 @@ BOOL daNpcKasi_Mng_c::chkEscape() {
     return rv;
 }
 
-/* 80A1B920-80A1BAAC 000A60 018C+00 1/1 0/0 0/0 .text            createHearts__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::createHearts() {
     fopAc_ac_c* actors[3] = {NULL, NULL, NULL};
     actors[0] = mHanaActorMngr.getActorP();
@@ -404,7 +390,6 @@ BOOL daNpcKasi_Mng_c::createHearts() {
     return TRUE;
 }
 
-/* 80A1BAAC-80A1BB24 000BEC 0078+00 1/1 0/0 0/0 .text            allDemoMove__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::allDemoMove() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     if (hana_p != NULL) {
@@ -422,7 +407,6 @@ void daNpcKasi_Mng_c::allDemoMove() {
     }
 }
 
-/* 80A1BB24-80A1BB9C 000C64 0078+00 1/1 0/0 0/0 .text            allDemoNotMove__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::allDemoNotMove() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     if (hana_p != NULL) {
@@ -440,7 +424,6 @@ void daNpcKasi_Mng_c::allDemoNotMove() {
     }
 }
 
-/* 80A1BB9C-80A1BBE0 000CDC 0044+00 2/2 0/0 0/0 .text isMiniGamePlaying__15daNpcKasi_Mng_cFv */
 BOOL daNpcKasi_Mng_c::isMiniGamePlaying() {
     BOOL rv = FALSE;
     daNpcChin_c* dancho_p = (daNpcChin_c*)mDanchoActorMngr.getActorP();
@@ -452,7 +435,6 @@ BOOL daNpcKasi_Mng_c::isMiniGamePlaying() {
     return rv;
 }
 
-/* 80A1BBE0-80A1BC88 000D20 00A8+00 1/1 0/0 0/0 .text            schMemberActor__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::schMemberActor() {
     if (mKyuActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* kyu_p = NULL;
@@ -470,7 +452,6 @@ void daNpcKasi_Mng_c::schMemberActor() {
     }
 }
 
-/* 80A1BC88-80A1BCF0 000DC8 0068+00 1/1 0/0 0/0 .text            schDanchoActor__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::schDanchoActor() {
     if (mDanchoActorMngr.getPId() == fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* dancho_p = NULL;
@@ -481,7 +462,6 @@ void daNpcKasi_Mng_c::schDanchoActor() {
     }
 }
 
-/* 80A1BCF0-80A1BD6C 000E30 007C+00 2/2 0/0 0/0 .text deleteAllMember__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::deleteAllMember() {
     fopAc_ac_c* kyu_p = mKyuActorMngr.getActorP();
     if (kyu_p != NULL) {
@@ -504,7 +484,6 @@ void daNpcKasi_Mng_c::deleteAllMember() {
     OS_REPORT("------------- three girl all delete!!\n");
 }
 
-/* 80A1BD6C-80A1BDD8 000EAC 006C+00 1/1 0/0 0/0 .text            chgWeightHeavy__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::chgWeightHeavy() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     if (hana_p != NULL) {
@@ -522,7 +501,6 @@ void daNpcKasi_Mng_c::chgWeightHeavy() {
     }
 }
 
-/* 80A1BDD8-80A1BE44 000F18 006C+00 1/1 0/0 0/0 .text            chgWeightLight__15daNpcKasi_Mng_cFv */
 void daNpcKasi_Mng_c::chgWeightLight() {
     daNpcKasiHana_c* hana_p = (daNpcKasiHana_c*)mHanaActorMngr.getActorP();
     if (hana_p != NULL) {
@@ -540,7 +518,6 @@ void daNpcKasi_Mng_c::chgWeightLight() {
     }
 }
 
-/* 80A213F4-80A214A8 000020 00B4+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[15] = {
     {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS}, 
     {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS},
@@ -559,19 +536,16 @@ static daNpc_GetParam2 l_bckGetParamList[15] = {
     {BCK_W_2NORMALTALK_B, J3DFrameCtrl::EMode_NONE, WGENERAL},
 };
 
-/* 80A214A8-80A214B4 0000D4 000C+00 0/0 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {BTP_HANA, J3DFrameCtrl::EMode_LOOP, KASI_HANA},
 };
 
-/* 80A214B4-80A214C0 -00001 000C+00 5/7 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "kasi_hana",
     "girls",
     "Wgeneral",
 };
 
-/* 80A214C0-80A214D8 -00001 0018+00 0/3 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[6] = {
     NULL,
     "KASIMASI_APPEAR",
@@ -581,10 +555,8 @@ static char* l_evtNames[6] = {
     "KASIMASI_CHEER2",
 };
 
-/* 80A214D8-80A214DC -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "kasi_hana";
 
-/* 80A210C8-80A21144 000048 007C+00 5/12 0/0 0/0 .rodata          m__21daNpcKasiHana_Param_c */
 daNpcKasiHana_HIOParam const daNpcKasiHana_Param_c::m = {
     55.0f,
     -3.0f,
@@ -639,7 +611,6 @@ void daNpcKasiHana_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A21518-80A21560 000144 0048+00 0/2 0/0 0/0 .data            mEvtSeqList__15daNpcKasiHana_c */
 daNpcKasiHana_c::EventFn daNpcKasiHana_c::mEvtSeqList[6] = {
     NULL,
     &daNpcKasiHana_c::_Evt_Kasi_Appear,
@@ -649,10 +620,8 @@ daNpcKasiHana_c::EventFn daNpcKasiHana_c::mEvtSeqList[6] = {
     &daNpcKasiHana_c::_Evt_Kasi_Cheer2,
 };
 
-/* 80A1BE44-80A1C0A4 000F84 0260+00 1/1 0/0 0/0 .text            __ct__15daNpcKasiHana_cFv */
 daNpcKasiHana_c::daNpcKasiHana_c() {}
 
-/* 80A1C0A4-80A1C334 0011E4 0290+00 1/0 0/0 0/0 .text            __dt__15daNpcKasiHana_cFv */
 daNpcKasiHana_c::~daNpcKasiHana_c() {
     for (int i = 0; i < 3; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -669,7 +638,6 @@ daNpcKasiHana_c::~daNpcKasiHana_c() {
 #endif
 }
 
-/* 80A1C334-80A1C5B0 001474 027C+00 1/1 0/0 0/0 .text            Create__15daNpcKasiHana_cFv */
 cPhs__Step daNpcKasiHana_c::Create() {
     fopAcM_ct(this, daNpcKasiHana_c);
 
@@ -723,7 +691,6 @@ cPhs__Step daNpcKasiHana_c::Create() {
     return phase;
 }
 
-/* 80A1C5B0-80A1C734 0016F0 0184+00 1/1 0/0 0/0 .text            CreateHeap__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 5);
 
@@ -755,19 +722,16 @@ int daNpcKasiHana_c::CreateHeap() {
     return 1;
 }
 
-/* 80A1C734-80A1C768 001874 0034+00 1/1 0/0 0/0 .text            Delete__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::Delete() {
     this->~daNpcKasiHana_c();
     return 1;
 }
 
-/* 80A1C768-80A1C78C 0018A8 0024+00 2/2 0/0 0/0 .text            Execute__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80A1C78C-80A1C7D8 0018CC 004C+00 1/1 0/0 0/0 .text            Draw__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::Draw() {
     if (!mEscape) {
         draw(FALSE, FALSE, mHIO->m.common.real_shadow_size, NULL, FALSE);
@@ -776,7 +740,6 @@ int daNpcKasiHana_c::Draw() {
     return 1;
 }
 
-/* 80A1C7D8-80A1C964 001918 018C+00 1/1 0/0 0/0 .text            ctrlJoint__15daNpcKasiHana_cFP8J3DJointP8J3DModel */
 int daNpcKasiHana_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE, JNT_NECK, JNT_HEAD};
@@ -806,13 +769,11 @@ int daNpcKasiHana_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A1C964-80A1C984 001AA4 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__15daNpcKasiHana_cFP10fopAc_ac_c */
 int daNpcKasiHana_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcKasiHana_c* i_this = (daNpcKasiHana_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A1C984-80A1C9D0 001AC4 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__15daNpcKasiHana_cFP8J3DJointi */
 int daNpcKasiHana_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -826,7 +787,6 @@ int daNpcKasiHana_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A1C9D0-80A1CA60 001B10 0090+00 1/0 0/0 0/0 .text            setParam__15daNpcKasiHana_cFv */
 void daNpcKasiHana_c::setParam() {
     if (mType == TYPE_WAIT) {
         mKasiMng.initPath(getRailNo(), 6);
@@ -845,7 +805,6 @@ void daNpcKasiHana_c::setParam() {
 #endif
 }
 
-/* 80A1CA60-80A1CD28 001BA0 02C8+00 1/0 0/0 0/0 .text            main__15daNpcKasiHana_cFv */
 BOOL daNpcKasiHana_c::main() {
     mKasiMng.SygnalClear();
     mKasiMng.schMemberActor();
@@ -903,7 +862,6 @@ BOOL daNpcKasiHana_c::main() {
     return TRUE;
 }
 
-/* 80A1CD28-80A1CED0 001E68 01A8+00 1/0 0/0 0/0 .text            setAttnPos__15daNpcKasiHana_cFv */
 void daNpcKasiHana_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -939,7 +897,6 @@ void daNpcKasiHana_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80A1CED0-80A1CFA0 002010 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__15daNpcKasiHana_cFif */
 void daNpcKasiHana_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* i_anm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_index].arcIdx], l_bckGetParamList[i_index].fileIdx);
     int i_attr = l_bckGetParamList[i_index].attr;
@@ -951,7 +908,6 @@ void daNpcKasiHana_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80A1CFA0-80A1CFE8 0020E0 0048+00 1/0 0/0 0/0 .text            setMotion__15daNpcKasiHana_cFifi */
 void daNpcKasiHana_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0xC) {
@@ -963,12 +919,10 @@ void daNpcKasiHana_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80A1CFE8-80A1CFF0 002128 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A1CFF0-80A1D238 002130 0248+00 1/1 0/0 0/0 .text            reset__15daNpcKasiHana_cFv */
 void daNpcKasiHana_c::reset() {
     initialize();
     mLookat.initialize();
@@ -1019,7 +973,6 @@ void daNpcKasiHana_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 80A1D238-80A1D604 002378 03CC+00 1/1 0/0 0/0 .text            playMotion__15daNpcKasiHana_cFv */
 void daNpcKasiHana_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_MICH_KYA_TALK, mHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1077,7 +1030,6 @@ void daNpcKasiHana_c::playMotion() {
     }
 }
 
-/* 80A1D604-80A1D77C 002744 0178+00 1/1 0/0 0/0 .text            playMotionAnmLoop__15daNpcKasiHana_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 void daNpcKasiHana_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     daNpcF_anmPlayData* playData = NULL;
 
@@ -1116,7 +1068,6 @@ void daNpcKasiHana_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data)
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 80A1D77C-80A1D824 0028BC 00A8+00 9/9 0/0 0/0 .text            setAction__15daNpcKasiHana_cFM15daNpcKasiHana_cFPCvPvi_i */
 BOOL daNpcKasiHana_c::setAction(actionFunc action) {
     mMode = -1;
 
@@ -1134,14 +1085,12 @@ BOOL daNpcKasiHana_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A1D824-80A1D848 002964 0024+00 8/8 0/0 0/0 .text            setLookMode__15daNpcKasiHana_cFi */
 void daNpcKasiHana_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 4 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80A1D848-80A1DA28 002988 01E0+00 1/1 0/0 0/0 .text            lookat__15daNpcKasiHana_cFv */
 void daNpcKasiHana_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1197,7 +1146,6 @@ void daNpcKasiHana_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80A1DA28-80A1DB1C 002B68 00F4+00 1/1 0/0 0/0 .text            step__15daNpcKasiHana_cFsi */
 BOOL daNpcKasiHana_c::step(s16 i_targetAngle, int param_2) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_targetAngle;
@@ -1225,7 +1173,6 @@ BOOL daNpcKasiHana_c::step(s16 i_targetAngle, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 80A1DB1C-80A1DC00 002C5C 00E4+00 1/1 0/0 0/0 .text            chkFindPlayer__15daNpcKasiHana_cFv */
 BOOL daNpcKasiHana_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), mHIO->m.common.fov)) {
         mActorMngr[0].remove();
@@ -1248,7 +1195,6 @@ BOOL daNpcKasiHana_c::chkFindPlayer() {
     return rv;
 }
 
-/* 80A1DC00-80A1E184 002D40 0584+00 10/0 0/0 0/0 .text            wait__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::wait(int param_1) {
     switch (mMode) {
         case -1:
@@ -1360,7 +1306,6 @@ int daNpcKasiHana_c::wait(int param_1) {
     return 1;
 }
 
-/* 80A1E184-80A1E228 0032C4 00A4+00 3/0 0/0 0/0 .text            chace_st__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::chace_st(int param_1) {
     switch (mMode) {
         case -1:
@@ -1382,7 +1327,6 @@ int daNpcKasiHana_c::chace_st(int param_1) {
     return 1;
 }
 
-/* 80A1E228-80A1E3AC 003368 0184+00 2/0 0/0 0/0 .text            chace__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::chace(int param_1) {
     switch (mMode) {
         case -1:
@@ -1415,7 +1359,6 @@ int daNpcKasiHana_c::chace(int param_1) {
     return 1;
 }
 
-/* 80A1E3AC-80A1E4AC 0034EC 0100+00 1/1 0/0 0/0 .text            getChacePos__15daNpcKasiHana_cFv */
 cXyz daNpcKasiHana_c::getChacePos() {
     cXyz rv(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
 
@@ -1443,7 +1386,6 @@ cXyz daNpcKasiHana_c::getChacePos() {
     return sp3c;
 }
 
-/* 80A1E4AC-80A1E578 0035EC 00CC+00 1/0 0/0 0/0 .text            turn__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::turn(int param_1) {
     switch (mMode) {
         case -1:
@@ -1469,7 +1411,6 @@ int daNpcKasiHana_c::turn(int param_1) {
     return 1;
 }
 
-/* 80A1E578-80A1E78C 0036B8 0214+00 3/0 0/0 0/0 .text            fear__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::fear(int param_1) {
     switch (mMode) {
         case -1:
@@ -1528,16 +1469,12 @@ int daNpcKasiHana_c::fear(int param_1) {
     return 1;
 }
 
-/* 80A21858-80A2185C 000058 0004+00 1/2 0/0 0/0 .bss             mTargetTag__15daNpcKasiHana_c */
 daTagEscape_c* daNpcKasiHana_c::mTargetTag;
 
-/* 80A2185C-80A21860 00005C 0004+00 0/1 0/0 0/0 .bss             mTargetTagDist__15daNpcKasiHana_c */
 f32 daNpcKasiHana_c::mTargetTagDist;
 
-/* 80A21860-80A21864 000060 0002+02 1/2 0/0 0/0 .bss             mWolfAngle__15daNpcKasiHana_c */
 s16 daNpcKasiHana_c::mWolfAngle;
 
-/* 80A1E78C-80A1E7F4 0038CC 0068+00 1/1 0/0 0/0 .text            srchWolfTag__15daNpcKasiHana_cFv */
 daTagEscape_c* daNpcKasiHana_c::srchWolfTag() {
     mTargetTag = NULL;
     mWolfAngle = fopAcM_searchPlayerAngleY(this);
@@ -1545,7 +1482,6 @@ daTagEscape_c* daNpcKasiHana_c::srchWolfTag() {
     return mTargetTag;
 }
 
-/* 80A1E7F4-80A1E8C4 003934 00D0+00 1/1 0/0 0/0 .text _srch_escape_tag__15daNpcKasiHana_cFPvPv */
 void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -1574,7 +1510,6 @@ void* daNpcKasiHana_c::_srch_escape_tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A1E8C4-80A1E9F8 003A04 0134+00 1/1 0/0 0/0 .text getWolfPathNearIdx__15daNpcKasiHana_cFv */
 int daNpcKasiHana_c::getWolfPathNearIdx() {
     int iVar1 = 0;
     f32 fVar1 = 0.0f;
@@ -1605,7 +1540,6 @@ int daNpcKasiHana_c::getWolfPathNearIdx() {
     return rv;
 }
 
-/* 80A1E9F8-80A1EB5C 003B38 0164+00 1/0 0/0 0/0 .text            talk__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::talk(int param_1) {
     bool rv = false;
 
@@ -1646,7 +1580,6 @@ int daNpcKasiHana_c::talk(int param_1) {
     return rv;
 }
 
-/* 80A1EB5C-80A1EE38 003C9C 02DC+00 4/0 0/0 0/0 .text            demo__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::demo(int param_1) {
     switch (mMode) {
         case -1:
@@ -1725,7 +1658,6 @@ int daNpcKasiHana_c::demo(int param_1) {
     return 1;
 }
 
-/* 80A1EE38-80A1EF90 003F78 0158+00 1/0 0/0 0/0 .text            escape__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::escape(int param_1) {
     switch (mMode) {
         case -1:
@@ -1756,7 +1688,6 @@ int daNpcKasiHana_c::escape(int param_1) {
     return 1;
 }
 
-/* 80A1EF90-80A1F198 0040D0 0208+00 3/0 0/0 0/0 .text            cheer__15daNpcKasiHana_cFi */
 int daNpcKasiHana_c::cheer(int param_1) {
     switch (mMode) {
         case -1:
@@ -1821,13 +1752,11 @@ int daNpcKasiHana_c::cheer(int param_1) {
     return 1;
 }
 
-/* 80A1F198-80A1F1E4 0042D8 004C+00 5/5 0/0 0/0 .text            _turn_to_link__15daNpcKasiHana_cFs */
 BOOL daNpcKasiHana_c::_turn_to_link(s16 param_1) {
     cXyz sp20(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
     return _turn_pos(sp20, param_1);
 }
 
-/* 80A1F1E4-80A1F240 004324 005C+00 5/5 0/0 0/0 .text _turn_pos__15daNpcKasiHana_cFRC4cXyzs */
 BOOL daNpcKasiHana_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     BOOL rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(&current.pos, &param_1), param_2);
     current.angle.y = mCurAngle.y;
@@ -1835,7 +1764,6 @@ BOOL daNpcKasiHana_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     return rv;
 }
 
-/* 80A1F240-80A1F318 004380 00D8+00 3/3 0/0 0/0 .text            actor_front_check__15daNpcKasiHana_cFP10fopAc_ac_c */
 BOOL daNpcKasiHana_c::actor_front_check(fopAc_ac_c* actor_p) {
     if (actor_p == NULL) {
         return TRUE;
@@ -1850,7 +1778,6 @@ BOOL daNpcKasiHana_c::actor_front_check(fopAc_ac_c* actor_p) {
     return (sp30.x * sp48.x + sp30.z * sp48.z) >= 0.0f;
 }
 
-/* 80A1F318-80A1F384 004458 006C+00 1/1 0/0 0/0 .text            _getOffset__15daNpcKasiHana_cFRC4cXyzR4cXyz */
 void daNpcKasiHana_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     param_2 = param_1;
     csXyz angle(*fopAcM_GetShapeAngle_p(this));
@@ -1858,7 +1785,6 @@ void daNpcKasiHana_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     mDoMtx_stack_c::multVec(&param_2, &param_2);
 }
 
-/* 80A1F384-80A1F42C 0044C4 00A8+00 1/0 0/0 0/0 .text            _Evt_Kasi_Appear__15daNpcKasiHana_cFi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Appear(int i_index) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int i_cutIndex = -1;
@@ -1878,7 +1804,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear(int i_index) {
     
 }
 
-/* 80A1F42C-80A1F50C 00456C 00E0+00 1/1 0/0 0/0 .text            _Evt_Kasi_Appear_CutInit__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) {
     switch (i_cutIndex) {
         case 10:
@@ -1902,7 +1827,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutInit(int const& i_cutIndex) {
     return TRUE;
 }
 
-/* 80A1F50C-80A1F638 00464C 012C+00 1/1 0/0 0/0 .text            _Evt_Kasi_Appear_CutMain__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) {
     BOOL rv = FALSE;
 
@@ -1941,7 +1865,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Appear_CutMain(int const& i_cutIndex) {
     return rv;
 }
 
-/* 80A1F638-80A1F740 004778 0108+00 1/0 0/0 0/0 .text            _Evt_Kasi_Talk__15daNpcKasiHana_cFi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Talk(int i_index) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int i_cutIndex = -1;
@@ -1974,7 +1897,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk(int i_index) {
     return _Evt_Kasi_Talk_CutMain(i_cutIndex, iVar2);
 }
 
-/* 80A1F740-80A1F860 004880 0120+00 1/1 0/0 0/0 .text            _Evt_Kasi_Talk_CutInit__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
 
@@ -2001,7 +1923,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutInit(int const& i_cutIndex) {
     return TRUE;
 }
 
-/* 80A1F860-80A1F9F4 0049A0 0194+00 1/1 0/0 0/0 .text            _Evt_Kasi_Talk_CutMain__15daNpcKasiHana_cFRCii */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
     BOOL rv = FALSE;
@@ -2046,7 +1967,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Talk_CutMain(int const& i_cutIndex, int param_2)
     return rv;
 }
 
-/* 80A1F9F4-80A1FA9C 004B34 00A8+00 1/0 0/0 0/0 .text            _Evt_Kasi__15daNpcKasiHana_cFi */
 BOOL daNpcKasiHana_c::_Evt_Kasi(int i_index) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int i_cutIndex = -1;
@@ -2065,7 +1985,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi(int i_index) {
     return _Evt_Kasi_CutMain(i_cutIndex);
 }
 
-/* 80A1FA9C-80A1FBC4 004BDC 0128+00 1/1 0/0 0/0 .text _Evt_Kasi_CutInit__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_CutInit(int const& i_cutIndex) {
     switch (i_cutIndex) {
         case 10:
@@ -2099,7 +2018,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutInit(int const& i_cutIndex) {
     return TRUE;
 }
 
-/* 80A1FBC4-80A1FD64 004D04 01A0+00 1/1 0/0 0/0 .text _Evt_Kasi_CutMain__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) {
     BOOL rv = FALSE;
 
@@ -2152,7 +2070,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_CutMain(int const& i_cutIndex) {
     return rv;
 }
 
-/* 80A1FD64-80A1FE6C 004EA4 0108+00 1/0 0/0 0/0 .text _Evt_Kasi_Cheer__15daNpcKasiHana_cFi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer(int i_index) {
     OS_REPORT("-------------------daNpcKasiHana_c::_Evt_Kasi_Cheer\n");
 
@@ -2187,7 +2104,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer(int i_index) {
     return _Evt_Kasi_Cheer_CutMain(i_cutIndex, iVar2);
 }
 
-/* 80A1FE6C-80A1FF78 004FAC 010C+00 1/1 0/0 0/0 .text            _Evt_Kasi_Cheer_CutInit__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutInit(int const& i_cutIndex) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
 
@@ -2211,7 +2127,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutInit(int const& i_cutIndex) {
     return TRUE;
 }
 
-/* 80A1FF78-80A2016C 0050B8 01F4+00 1/1 0/0 0/0 .text            _Evt_Kasi_Cheer_CutMain__15daNpcKasiHana_cFRCii */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutMain(int const& i_cutIndex, int param_2) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
     int iVar1[2] = {-1, -1};
@@ -2268,7 +2183,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer_CutMain(int const& i_cutIndex, int param_2
     return rv;
 }
 
-/* 80A2016C-80A20244 0052AC 00D8+00 1/0 0/0 0/0 .text _Evt_Kasi_Cheer2__15daNpcKasiHana_cFi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2(int i_index) {
     OS_REPORT("-------------------daNpcKasiHana_c::_Evt_Kasi_Cheer2\n");
 
@@ -2297,7 +2211,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2(int i_index) {
     return _Evt_Kasi_Cheer2_CutMain(i_cutIndex, iVar2);
 }
 
-/* 80A20244-80A20350 005384 010C+00 1/1 0/0 0/0 .text            _Evt_Kasi_Cheer2_CutInit__15daNpcKasiHana_cFRCi */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutInit(int const& i_cutIndex) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
 
@@ -2321,7 +2234,6 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutInit(int const& i_cutIndex) {
     return TRUE;
 }
 
-/* 80A20350-80A20544 005490 01F4+00 1/1 0/0 0/0 .text            _Evt_Kasi_Cheer2_CutMain__15daNpcKasiHana_cFRCii */
 BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutMain(int const& i_cutIndex, int param_2) {
     fopAc_ac_c* actors[3] = {mKasiMng.getHanaActor(), mKasiMng.getKyuActor(), mKasiMng.getMichActor()};
     int iVar1[2] = {-1, -1};
@@ -2378,34 +2290,28 @@ BOOL daNpcKasiHana_c::_Evt_Kasi_Cheer2_CutMain(int const& i_cutIndex, int param_
     return rv;
 }
 
-/* 80A20544-80A20564 005684 0020+00 1/0 0/0 0/0 .text            daNpcKasiHana_Create__FPv */
 static int daNpcKasiHana_Create(void* a_this) {
     return static_cast<daNpcKasiHana_c*>(a_this)->Create();
 }
 
-/* 80A20564-80A20584 0056A4 0020+00 1/0 0/0 0/0 .text            daNpcKasiHana_Delete__FPv */
 static int daNpcKasiHana_Delete(void* a_this) {
     return static_cast<daNpcKasiHana_c*>(a_this)->Delete();
 }
 
-/* 80A20584-80A205A4 0056C4 0020+00 1/0 0/0 0/0 .text            daNpcKasiHana_Execute__FPv */
 static int daNpcKasiHana_Execute(void* a_this) {
     return static_cast<daNpcKasiHana_c*>(a_this)->Execute();
 }
 
-/* 80A205A4-80A205C4 0056E4 0020+00 1/0 0/0 0/0 .text            daNpcKasiHana_Draw__FPv */
 static int daNpcKasiHana_Draw(void* a_this) {
     return static_cast<daNpcKasiHana_c*>(a_this)->Draw();
 }
 
-/* 80A205C4-80A205CC 005704 0008+00 1/0 0/0 0/0 .text            daNpcKasiHana_IsDelete__FPv */
 static int daNpcKasiHana_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80A216C0-80A216E0 -00001 0020+00 1/0 0/0 0/0 .data            daNpcKasiHana_MethodTable */
 static actor_method_class daNpcKasiHana_MethodTable = {
     (process_method_func)daNpcKasiHana_Create,
     (process_method_func)daNpcKasiHana_Delete,
@@ -2414,7 +2320,6 @@ static actor_method_class daNpcKasiHana_MethodTable = {
     (process_method_func)daNpcKasiHana_Draw,
 };
 
-/* 80A216E0-80A21710 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KASIHANA */
 extern actor_process_profile_definition g_profile_NPC_KASIHANA = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp
index 8c9f4cf4b9..47e87fa936 100644
--- a/src/d/actor/d_a_npc_kasi_kyu.cpp
+++ b/src/d/actor/d_a_npc_kasi_kyu.cpp
@@ -103,10 +103,8 @@ enum Motion {
     /* 0xC */ MOT_W_2NORMALTALK_A,
 };
 
-/* 80A2605C-80A26060 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcKasiKyu_Param_c l_HIO;
 
-/* 80A25B44-80A25C04 000020 00C0+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[16] = {
     {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS},
     {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS},
@@ -126,35 +124,28 @@ static daNpc_GetParam2 l_bckGetParamList[16] = {
     {BCK_W_2NORMALTALK_A, J3DFrameCtrl::EMode_NONE, WGENERAL},
 };
 
-/* 80A25C04-80A25C10 0000E0 000C+00 0/0 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {BTP_KYU, J3DFrameCtrl::EMode_LOOP, KASI_KYU},
 };
 
-/* 80A25C10-80A25C1C -00001 000C+00 5/6 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "kasi_kyu",
     "girls",
     "Wgeneral",
 };
 
-/* 80A25C1C-80A25C20 0000F8 0004+00 1/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL,
 };
 
-/* 80A25C20-80A25C24 -00001 0004+00 0/0 0/0 0/0 .data            l_myName */
 static char* l_myName = "kasi_kyu";
 
-/* 80A25C24-80A25C30 000100 000C+00 1/1 0/0 0/0 .data            mEvtSeqList__14daNpcKasiKyu_c */
 daNpcKasiKyu_c::EventFn daNpcKasiKyu_c::mEvtSeqList[1] = {
     NULL
 };
 
-/* 80A219CC-80A21B84 0000EC 01B8+00 1/1 0/0 0/0 .text            __ct__14daNpcKasiKyu_cFv */
 daNpcKasiKyu_c::daNpcKasiKyu_c() {}
 
-/* 80A21C14-80A21E24 000334 0210+00 1/0 0/0 0/0 .text            __dt__14daNpcKasiKyu_cFv */
 daNpcKasiKyu_c::~daNpcKasiKyu_c() {
     for (int i = 0; i < 3; i ++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -165,7 +156,6 @@ daNpcKasiKyu_c::~daNpcKasiKyu_c() {
     }
 }
 
-/* 80A258B8-80A2592C 000000 0074+00 18/18 0/0 0/0 .rodata          m__20daNpcKasiKyu_Param_c */
 daNpcKasiKyu_HIOParam const daNpcKasiKyu_Param_c::m = {
     55.0f,
     -3.0f,
@@ -204,7 +194,6 @@ daNpcKasiKyu_HIOParam const daNpcKasiKyu_Param_c::m = {
     16.0f,
 };
 
-/* 80A21E24-80A220A0 000544 027C+00 1/1 0/0 0/0 .text            Create__14daNpcKasiKyu_cFv */
 cPhs__Step daNpcKasiKyu_c::Create() {
     fopAcM_ct(this, daNpcKasiKyu_c);
 
@@ -253,7 +242,6 @@ cPhs__Step daNpcKasiKyu_c::Create() {
     return phase;
 }
 
-/* 80A220A0-80A22224 0007C0 0184+00 1/1 0/0 0/0 .text            CreateHeap__14daNpcKasiKyu_cFv */
 int daNpcKasiKyu_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_KYU);
 
@@ -284,20 +272,17 @@ int daNpcKasiKyu_c::CreateHeap() {
     return 1;
 }
 
-/* 80A22224-80A22258 000944 0034+00 1/1 0/0 0/0 .text            Delete__14daNpcKasiKyu_cFv */
 int daNpcKasiKyu_c::Delete() {
     this->~daNpcKasiKyu_c();
     return 1;
 }
 
-/* 80A22258-80A22284 000978 002C+00 2/2 0/0 0/0 .text            Execute__14daNpcKasiKyu_cFv */
 int daNpcKasiKyu_c::Execute() {
     mFear = false;
     execute();
     return 1;
 }
 
-/* 80A22284-80A222D0 0009A4 004C+00 1/1 0/0 0/0 .text            Draw__14daNpcKasiKyu_cFv */
 int daNpcKasiKyu_c::Draw() {
     if (!mEscape) {
         draw(FALSE, FALSE, daNpcKasiKyu_Param_c::m.common.real_shadow_size, NULL, FALSE);
@@ -306,7 +291,6 @@ int daNpcKasiKyu_c::Draw() {
     return 1;
 }
 
-/* 80A222D0-80A2245C 0009F0 018C+00 1/1 0/0 0/0 .text            ctrlJoint__14daNpcKasiKyu_cFP8J3DJointP8J3DModel */
 int daNpcKasiKyu_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {1, 2, 3};
@@ -336,13 +320,11 @@ int daNpcKasiKyu_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A2245C-80A2247C 000B7C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__14daNpcKasiKyu_cFP10fopAc_ac_ */
 int daNpcKasiKyu_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcKasiKyu_c* i_this = (daNpcKasiKyu_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A2247C-80A224C8 000B9C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__14daNpcKasiKyu_cFP8J3DJointi */
 int daNpcKasiKyu_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -356,7 +338,6 @@ int daNpcKasiKyu_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A224C8-80A22534 000BE8 006C+00 1/0 0/0 0/0 .text            setParam__14daNpcKasiKyu_cFv */
 void daNpcKasiKyu_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcKasiKyu_Param_c::m.common.attention_distance, daNpcKasiKyu_Param_c::m.common.attention_angle);
     attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
@@ -364,18 +345,14 @@ void daNpcKasiKyu_c::setParam() {
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
 }
 
-/* 80A26060-80A26064 000058 0004+00 1/2 0/0 0/0 .bss             mTargetTag__14daNpcKasiKyu_c */
 daTagEscape_c* daNpcKasiKyu_c::mTargetTag;
 
-/* 80A26064-80A26068 00005C 0004+00 0/1 0/0 0/0 .bss             mTargetTagDist__14daNpcKasiKyu_c */
 f32 daNpcKasiKyu_c::mTargetTagDist;
 
-/* 80A26068-80A2606C -00001 0004+00 2/3 0/0 0/0 .bss             None */
 /* 80A26068 0002+00 data_80A26068 mWolfAngle__14daNpcKasiKyu_c */
 /* 80A2606A 0002+00 data_80A2606A None */
 s16 daNpcKasiKyu_c::mWolfAngle;
 
-/* 80A22534-80A227DC 000C54 02A8+00 1/0 0/0 0/0 .text            main__14daNpcKasiKyu_cFv */
 BOOL daNpcKasiKyu_c::main() {
     if (mSygnal >= 0) {
         static daNpcKasiKyu_c::actionFunc sSygnalAct[20] = {
@@ -412,7 +389,6 @@ BOOL daNpcKasiKyu_c::main() {
     return TRUE;
 }
 
-/* 80A227DC-80A22984 000EFC 01A8+00 1/0 0/0 0/0 .text            setAttnPos__14daNpcKasiKyu_cFv */
 void daNpcKasiKyu_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -448,7 +424,6 @@ void daNpcKasiKyu_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80A22984-80A22A54 0010A4 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__14daNpcKasiKyu_cFif */
 void daNpcKasiKyu_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* i_anm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_index].arcIdx], l_bckGetParamList[i_index].fileIdx);
     int i_attr = l_bckGetParamList[i_index].attr;
@@ -460,7 +435,6 @@ void daNpcKasiKyu_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80A22A54-80A22A9C 001174 0048+00 1/0 0/0 0/0 .text            setMotion__14daNpcKasiKyu_cFifi */
 void daNpcKasiKyu_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0xD) {
@@ -472,12 +446,10 @@ void daNpcKasiKyu_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80A22A9C-80A22AA4 0011BC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpcKasiKyu_cFv */
 BOOL daNpcKasiKyu_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A22AA4-80A22CD8 0011C4 0234+00 1/1 0/0 0/0 .text            reset__14daNpcKasiKyu_cFv */
 void daNpcKasiKyu_c::reset() {
     initialize();
     mLookat.initialize();
@@ -527,7 +499,6 @@ void daNpcKasiKyu_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 80A22CD8-80A2310C 0013F8 0434+00 1/1 0/0 0/0 .text            playMotion__14daNpcKasiKyu_cFv */
 void daNpcKasiKyu_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_MICH_KYA_TALK, daNpcKasiKyu_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -589,7 +560,6 @@ void daNpcKasiKyu_c::playMotion() {
     }
 }
 
-/* 80A2310C-80A23284 00182C 0178+00 1/1 0/0 0/0 .text            playMotionAnmLoop__14daNpcKasiKyu_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 void daNpcKasiKyu_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     daNpcF_anmPlayData* playData = NULL;
 
@@ -628,7 +598,6 @@ void daNpcKasiKyu_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 80A23284-80A2332C 0019A4 00A8+00 10/10 0/0 0/0 .text          setAction__14daNpcKasiKyu_cFM14daNpcKasiKyu_cFPCvPvi_i */
 BOOL daNpcKasiKyu_c::setAction(actionFunc action) {
     mMode = -1;
 
@@ -646,14 +615,12 @@ BOOL daNpcKasiKyu_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A2332C-80A23350 001A4C 0024+00 8/8 0/0 0/0 .text            setLookMode__14daNpcKasiKyu_cFi */
 void daNpcKasiKyu_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 4 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80A23350-80A23530 001A70 01E0+00 1/1 0/0 0/0 .text            lookat__14daNpcKasiKyu_cFv */
 void daNpcKasiKyu_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -709,7 +676,6 @@ void daNpcKasiKyu_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80A23530-80A23624 001C50 00F4+00 1/1 0/0 0/0 .text            step__14daNpcKasiKyu_cFsi */
 BOOL daNpcKasiKyu_c::step(s16 i_targetAngle, int param_2) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_targetAngle;
@@ -737,7 +703,6 @@ BOOL daNpcKasiKyu_c::step(s16 i_targetAngle, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 80A23624-80A23708 001D44 00E4+00 1/1 0/0 0/0 .text            chkFindPlayer__14daNpcKasiKyu_cFv */
 BOOL daNpcKasiKyu_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcKasiKyu_Param_c::m.common.fov)) {
         mActorMngr[0].remove();
@@ -760,7 +725,6 @@ BOOL daNpcKasiKyu_c::chkFindPlayer() {
     return rv;
 }
 
-/* 80A23708-80A23AB4 001E28 03AC+00 8/0 0/0 0/0 .text            wait__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::wait(int param_1) {
     switch (mMode) {
         case -1:
@@ -855,7 +819,6 @@ int daNpcKasiKyu_c::wait(int param_1) {
     return 1;
 }
 
-/* 80A23AB4-80A23C90 0021D4 01DC+00 1/0 0/0 0/0 .text            fear__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::fear(int param_1) {
     switch (mMode) {
         case -1:
@@ -905,7 +868,6 @@ int daNpcKasiKyu_c::fear(int param_1) {
     return 1;
 }
 
-/* 80A23C90-80A23CF8 0023B0 0068+00 1/1 0/0 0/0 .text            srchWolfTag__14daNpcKasiKyu_cFv */
 daTagEscape_c* daNpcKasiKyu_c::srchWolfTag() {
     mTargetTag = NULL;
     mWolfAngle = fopAcM_searchPlayerAngleY(this);
@@ -913,7 +875,6 @@ daTagEscape_c* daNpcKasiKyu_c::srchWolfTag() {
     return mTargetTag;
 }
 
-/* 80A23CF8-80A23DC8 002418 00D0+00 1/1 0/0 0/0 .text _srch_escape_tag__14daNpcKasiKyu_cFPvPv */
 void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -942,7 +903,6 @@ void* daNpcKasiKyu_c::_srch_escape_tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A23DC8-80A23EFC 0024E8 0134+00 1/1 0/0 0/0 .text getWolfPathNearIdx__14daNpcKasiKyu_cFv */
 int daNpcKasiKyu_c::getWolfPathNearIdx() {
     int iVar1 = 0;
     f32 fVar1 = 0.0f;
@@ -985,7 +945,6 @@ daNpcKasiKyu_c::actionFunc dummy_lit_5003() {
     return &daNpcKasiKyu_c::wait;
 }
 
-/* 80A23EFC-80A23FA0 00261C 00A4+00 2/0 0/0 0/0 .text            chace_st__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::chace_st(int param_1) {
     switch (mMode) {
         case -1:
@@ -1007,7 +966,6 @@ int daNpcKasiKyu_c::chace_st(int param_1) {
     return 1;
 }
 
-/* 80A23FA0-80A24110 0026C0 0170+00 4/0 0/0 0/0 .text            chace__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::chace(int param_1) {
     switch (mMode) {
         case -1:
@@ -1043,7 +1001,6 @@ daNpcKasiKyu_c::actionFunc dummy_lit_5106() {
     return &daNpcKasiKyu_c::chace;
 }
 
-/* 80A24110-80A241CC 002830 00BC+00 1/1 0/0 0/0 .text            getChacePos__14daNpcKasiKyu_cFv */
 cXyz daNpcKasiKyu_c::getChacePos() {
     int plPoint = mPlPoint;
     int idx = mPath.getIdx();
@@ -1064,7 +1021,6 @@ cXyz daNpcKasiKyu_c::getChacePos() {
     return chacePos;
 }
 
-/* 80A241CC-80A2428C 0028EC 00C0+00 2/0 0/0 0/0 .text            turn_link__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::turn_link(int param_1) {
     switch (mMode) {
         case -1:
@@ -1086,7 +1042,6 @@ int daNpcKasiKyu_c::turn_link(int param_1) {
     return 1;
 }
 
-/* 80A2428C-80A24370 0029AC 00E4+00 1/0 0/0 0/0 .text            turn_home__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::turn_home(int param_1) {
     switch (mMode) {
         case -1:
@@ -1113,7 +1068,6 @@ int daNpcKasiKyu_c::turn_home(int param_1) {
     return 1;
 }
 
-/* 80A24370-80A24440 002A90 00D0+00 1/0 0/0 0/0 .text            turn_center__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::turn_center(int param_1) {
     switch (mMode) {
         case -1:
@@ -1136,7 +1090,6 @@ int daNpcKasiKyu_c::turn_center(int param_1) {
     return 1;
 }
 
-/* 80A24440-80A244B8 002B60 0078+00 1/0 0/0 0/0 .text            talk_dummy__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::talk_dummy(int param_1) {
     switch (mMode) {
         case -1:
@@ -1155,7 +1108,6 @@ int daNpcKasiKyu_c::talk_dummy(int param_1) {
     return 1;
 }
 
-/* 80A244B8-80A24590 002BD8 00D8+00 1/0 0/0 0/0 .text            kya__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::kya(int param_1) {
     switch (mMode) {
         case -1:
@@ -1185,7 +1137,6 @@ int daNpcKasiKyu_c::kya(int param_1) {
     return 1;
 }
 
-/* 80A24590-80A24628 002CB0 0098+00 1/0 0/0 0/0 .text            kya2__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::kya2(int param_1) {
     switch (mMode) {
         case -1:
@@ -1206,7 +1157,6 @@ int daNpcKasiKyu_c::kya2(int param_1) {
     return 1;
 }
 
-/* 80A24628-80A246FC 002D48 00D4+00 2/0 0/0 0/0 .text            kya_stop__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::kya_stop(int param_1) {
     switch (mMode) {
         case -1:
@@ -1230,7 +1180,6 @@ int daNpcKasiKyu_c::kya_stop(int param_1) {
     return 1;
 }
 
-/* 80A246FC-80A24774 002E1C 0078+00 1/0 0/0 0/0 .text            iyan__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::iyan(int param_1) {
     switch (mMode) {
         case -1:
@@ -1249,7 +1198,6 @@ int daNpcKasiKyu_c::iyan(int param_1) {
     return 1;
 }
 
-/* 80A24774-80A2484C 002E94 00D8+00 1/0 0/0 0/0 .text            iyan_look__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::iyan_look(int param_1) {
     switch (mMode) {
         case -1:
@@ -1274,7 +1222,6 @@ int daNpcKasiKyu_c::iyan_look(int param_1) {
     return 1;
 }
 
-/* 80A2484C-80A2493C 002F6C 00F0+00 1/0 0/0 0/0 .text            turn_hana__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::turn_hana(int param_1) {
     switch (mMode) {
         case -1:
@@ -1303,7 +1250,6 @@ int daNpcKasiKyu_c::turn_hana(int param_1) {
     return 1;
 }
 
-/* 80A2493C-80A24A54 00305C 0118+00 1/0 0/0 0/0 .text            escape__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::escape(int param_1) {
     switch (mMode) {
         case -1:
@@ -1334,7 +1280,6 @@ int daNpcKasiKyu_c::escape(int param_1) {
     return 1;
 }
 
-/* 80A24A54-80A24AD8 003174 0084+00 6/0 0/0 0/0 .text            wait_dummy__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::wait_dummy(int param_1) {
     switch (mMode) {
         case -1:
@@ -1354,7 +1299,6 @@ int daNpcKasiKyu_c::wait_dummy(int param_1) {
     return 1;
 }
 
-/* 80A24AD8-80A24CC4 0031F8 01EC+00 1/0 0/0 0/0 .text            cheer__14daNpcKasiKyu_cFi */
 int daNpcKasiKyu_c::cheer(int param_1) {
     switch (mMode) {
         case -1:
@@ -1419,13 +1363,11 @@ int daNpcKasiKyu_c::cheer(int param_1) {
     return 1;
 }
 
-/* 80A24CC4-80A24D10 0033E4 004C+00 3/3 0/0 0/0 .text            _turn_to_link__14daNpcKasiKyu_cFs */
 BOOL daNpcKasiKyu_c::_turn_to_link(s16 param_1) {
     cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
     return _turn_pos(pos, param_1);
 }
 
-/* 80A24D10-80A24D6C 003430 005C+00 6/6 0/0 0/0 .text            _turn_pos__14daNpcKasiKyu_cFRC4cXyzs */
 BOOL daNpcKasiKyu_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     BOOL rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(&current.pos, &param_1), param_2);
     current.angle.y = mCurAngle.y;
@@ -1433,7 +1375,6 @@ BOOL daNpcKasiKyu_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     return rv;
 }
 
-/* 80A24D6C-80A24E44 00348C 00D8+00 2/2 0/0 0/0 .text            actor_front_check__14daNpcKasiKyu_cFP10fopAc_ac_c */
 BOOL daNpcKasiKyu_c::actor_front_check(fopAc_ac_c* actor_p) {
     if (actor_p == NULL) {
         return TRUE;
@@ -1448,7 +1389,6 @@ BOOL daNpcKasiKyu_c::actor_front_check(fopAc_ac_c* actor_p) {
     return (sp30.x * sp48.x + sp30.z * sp48.z) >= 0.0f;
 }
 
-/* 80A24E44-80A24EB0 003564 006C+00 1/1 0/0 0/0 .text            _getOffset__14daNpcKasiKyu_cFRC4cXyzR4cXyz */
 void daNpcKasiKyu_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     param_2 = param_1;
     csXyz angle(*fopAcM_GetShapeAngle_p(this));
@@ -1456,34 +1396,28 @@ void daNpcKasiKyu_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     mDoMtx_stack_c::multVec(&param_2, &param_2);
 }
 
-/* 80A24EB0-80A24ED0 0035D0 0020+00 1/0 0/0 0/0 .text            daNpcKasiKyu_Create__FPv */
 static int daNpcKasiKyu_Create(void* a_this) {
     return static_cast<daNpcKasiKyu_c*>(a_this)->Create();
 }
 
-/* 80A24ED0-80A24EF0 0035F0 0020+00 1/0 0/0 0/0 .text            daNpcKasiKyu_Delete__FPv */
 static int daNpcKasiKyu_Delete(void* a_this) {
     return static_cast<daNpcKasiKyu_c*>(a_this)->Delete();
 }
 
-/* 80A24EF0-80A24F10 003610 0020+00 1/0 0/0 0/0 .text            daNpcKasiKyu_Execute__FPv */
 static int daNpcKasiKyu_Execute(void* a_this) {
     return static_cast<daNpcKasiKyu_c*>(a_this)->Execute();
 }
 
-/* 80A24F10-80A24F30 003630 0020+00 1/0 0/0 0/0 .text            daNpcKasiKyu_Draw__FPv */
 static int daNpcKasiKyu_Draw(void* a_this) {
     return static_cast<daNpcKasiKyu_c*>(a_this)->Draw();
 }
 
-/* 80A24F30-80A24F38 003650 0008+00 1/0 0/0 0/0 .text            daNpcKasiKyu_IsDelete__FPv */
 static int daNpcKasiKyu_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80A25EC4-80A25EE4 -00001 0020+00 1/0 0/0 0/0 .data            daNpcKasiKyu_MethodTable */
 static actor_method_class daNpcKasiKyu_MethodTable = {
     (process_method_func)daNpcKasiKyu_Create,
     (process_method_func)daNpcKasiKyu_Delete,
@@ -1492,7 +1426,6 @@ static actor_method_class daNpcKasiKyu_MethodTable = {
     (process_method_func)daNpcKasiKyu_Draw,
 };
 
-/* 80A25EE4-80A25F14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KASIKYU */
 extern actor_process_profile_definition g_profile_NPC_KASIKYU = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp
index 8baff31d44..365dcc81cb 100644
--- a/src/d/actor/d_a_npc_kasi_mich.cpp
+++ b/src/d/actor/d_a_npc_kasi_mich.cpp
@@ -103,10 +103,8 @@ enum Motion {
     /* 0xC */ MOT_W_2NORMALTALK_B
 };
 
-/* 80A2A7EC-80A2A7F0 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcKasiMich_Param_c l_HIO;
 
-/* 80A2A2D4-80A2A394 000020 00C0+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[16] = {
     {BCK_MICH_IYAN_WAIT, J3DFrameCtrl::EMode_LOOP, GIRLS},
     {BCK_MICH_KYA_TALK, J3DFrameCtrl::EMode_LOOP, GIRLS},
@@ -126,35 +124,28 @@ static daNpc_GetParam2 l_bckGetParamList[16] = {
     {BCK_W_2NORMALTALK_B, J3DFrameCtrl::EMode_NONE, WGENERAL},
 };
 
-/* 80A2A394-80A2A3A0 0000E0 000C+00 0/0 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {BTP_MICH, J3DFrameCtrl::EMode_LOOP, KASI_MICH},
 };
 
-/* 80A2A3A0-80A2A3AC -00001 000C+00 5/6 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "kasi_mich",
     "girls",
     "Wgeneral",
 };
 
-/* 80A2A3AC-80A2A3B0 0000F8 0004+00 1/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL
 };
 
-/* 80A2A3B0-80A2A3B4 -00001 0004+00 0/0 0/0 0/0 .data            l_myName */
 static char* l_myName = "kasi_mich";
 
-/* 80A2A3B4-80A2A3C0 000100 000C+00 1/1 0/0 0/0 .data            mEvtSeqList__15daNpcKasiMich_c */
 daNpcKasiMich_c::EventFn daNpcKasiMich_c::mEvtSeqList[1] = {
     NULL
 };
 
-/* 80A261CC-80A26384 0000EC 01B8+00 1/1 0/0 0/0 .text            __ct__15daNpcKasiMich_cFv */
 daNpcKasiMich_c::daNpcKasiMich_c() {}
 
-/* 80A26414-80A26624 000334 0210+00 1/0 0/0 0/0 .text            __dt__15daNpcKasiMich_cFv */
 daNpcKasiMich_c::~daNpcKasiMich_c() {
     for (int i = 0; i < 3; i ++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -165,7 +156,6 @@ daNpcKasiMich_c::~daNpcKasiMich_c() {
     }
 }
 
-/* 80A2A04C-80A2A0C0 000000 0074+00 17/17 0/0 0/0 .rodata          m__21daNpcKasiMich_Param_c */
 daNpcKasiMich_HIOParam const daNpcKasiMich_Param_c::m = {
     55.0f,
     -3.0f,
@@ -204,7 +194,6 @@ daNpcKasiMich_HIOParam const daNpcKasiMich_Param_c::m = {
     16.0f,
 };
 
-/* 80A26624-80A268A0 000544 027C+00 1/1 0/0 0/0 .text            Create__15daNpcKasiMich_cFv */
 cPhs__Step daNpcKasiMich_c::Create() {
     fopAcM_ct(this, daNpcKasiMich_c);
 
@@ -253,7 +242,6 @@ cPhs__Step daNpcKasiMich_c::Create() {
     return phase;
 }
 
-/* 80A268A0-80A26A24 0007C0 0184+00 1/1 0/0 0/0 .text            CreateHeap__15daNpcKasiMich_cFv */
 int daNpcKasiMich_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_MICH);
 
@@ -284,20 +272,17 @@ int daNpcKasiMich_c::CreateHeap() {
     return 1;
 }
 
-/* 80A26A24-80A26A58 000944 0034+00 1/1 0/0 0/0 .text            Delete__15daNpcKasiMich_cFv */
 int daNpcKasiMich_c::Delete() {
     this->~daNpcKasiMich_c();
     return 1;
 }
 
-/* 80A26A58-80A26A84 000978 002C+00 2/2 0/0 0/0 .text            Execute__15daNpcKasiMich_cFv */
 int daNpcKasiMich_c::Execute() {
     mFear = false;
     execute();
     return 1;
 }
 
-/* 80A26A84-80A26AD0 0009A4 004C+00 1/1 0/0 0/0 .text            Draw__15daNpcKasiMich_cFv */
 int daNpcKasiMich_c::Draw() {
     if (!mEscape) {
         draw(FALSE, FALSE, daNpcKasiMich_Param_c::m.common.real_shadow_size, NULL, FALSE);
@@ -306,7 +291,6 @@ int daNpcKasiMich_c::Draw() {
     return 1;
 }
 
-/* 80A26AD0-80A26C5C 0009F0 018C+00 1/1 0/0 0/0 .text            ctrlJoint__15daNpcKasiMich_cFP8J3DJointP8J3DModel */
 int daNpcKasiMich_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {1, 2, 3};
@@ -336,13 +320,11 @@ int daNpcKasiMich_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A26C5C-80A26C7C 000B7C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__15daNpcKasiMich_cFP10fopAc_ac_c */
 int daNpcKasiMich_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcKasiMich_c* i_this = (daNpcKasiMich_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A26C7C-80A26CC8 000B9C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__15daNpcKasiMich_cFP8J3DJointi */
 int daNpcKasiMich_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -356,7 +338,6 @@ int daNpcKasiMich_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A26CC8-80A26D34 000BE8 006C+00 1/0 0/0 0/0 .text            setParam__15daNpcKasiMich_cFv */
 void daNpcKasiMich_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcKasiMich_Param_c::m.common.attention_distance, daNpcKasiMich_Param_c::m.common.attention_angle);
     attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
@@ -364,18 +345,14 @@ void daNpcKasiMich_c::setParam() {
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
 }
 
-/* 80A2A7F0-80A2A7F4 000058 0004+00 1/2 0/0 0/0 .bss             mTargetTag__15daNpcKasiMich_c */
 daTagEscape_c* daNpcKasiMich_c::mTargetTag;
 
-/* 80A2A7F4-80A2A7F8 00005C 0004+00 0/1 0/0 0/0 .bss             mTargetTagDist__15daNpcKasiMich_c */
 f32 daNpcKasiMich_c::mTargetTagDist;
 
-/* 80A2A7F8-80A2A7FC -00001 0004+00 2/3 0/0 0/0 .bss             None */
 /* 80A2A7F8 0002+00 data_80A2A7F8 mWolfAngle__15daNpcKasiMich_c */
 /* 80A2A7FA 0002+00 data_80A2A7FA None */
 s16 daNpcKasiMich_c::mWolfAngle;
 
-/* 80A26D34-80A26FDC 000C54 02A8+00 1/0 0/0 0/0 .text            main__15daNpcKasiMich_cFv */
 BOOL daNpcKasiMich_c::main() {
     if (mSygnal >= 0) {
         static daNpcKasiMich_c::actionFunc sSygnalAct[20] = {
@@ -412,7 +389,6 @@ BOOL daNpcKasiMich_c::main() {
     return TRUE;
 }
 
-/* 80A26FDC-80A27184 000EFC 01A8+00 1/0 0/0 0/0 .text            setAttnPos__15daNpcKasiMich_cFv */
 void daNpcKasiMich_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -448,7 +424,6 @@ void daNpcKasiMich_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80A27184-80A27254 0010A4 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__15daNpcKasiMich_cFif */
 void daNpcKasiMich_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* i_anm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_index].arcIdx], l_bckGetParamList[i_index].fileIdx);
     int i_attr = l_bckGetParamList[i_index].attr;
@@ -460,7 +435,6 @@ void daNpcKasiMich_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80A27254-80A2729C 001174 0048+00 1/0 0/0 0/0 .text            setMotion__15daNpcKasiMich_cFifi */
 void daNpcKasiMich_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0xD) {
@@ -472,12 +446,10 @@ void daNpcKasiMich_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80A2729C-80A272A4 0011BC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__15daNpcKasiMich_cFv */
 BOOL daNpcKasiMich_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A272A4-80A274D8 0011C4 0234+00 1/1 0/0 0/0 .text            reset__15daNpcKasiMich_cFv */
 void daNpcKasiMich_c::reset() {
     initialize();
     mLookat.initialize();
@@ -527,7 +499,6 @@ void daNpcKasiMich_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 80A274D8-80A2790C 0013F8 0434+00 1/1 0/0 0/0 .text            playMotion__15daNpcKasiMich_cFv */
 void daNpcKasiMich_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_MICH_KYA_TALK, daNpcKasiMich_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -589,7 +560,6 @@ void daNpcKasiMich_c::playMotion() {
     }
 }
 
-/* 80A2790C-80A27A84 00182C 0178+00 1/1 0/0 0/0 .text            playMotionAnmLoop__15daNpcKasiMich_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 void daNpcKasiMich_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     daNpcF_anmPlayData* playData = NULL;
 
@@ -628,7 +598,6 @@ void daNpcKasiMich_c::playMotionAnmLoop(daNpcF_c::daNpcF_anmPlayData*** i_data)
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 80A27A84-80A27B2C 0019A4 00A8+00 10/10 0/0 0/0 .text          setAction__15daNpcKasiMich_cFM15daNpcKasiMich_cFPCvPvi_i */
 BOOL daNpcKasiMich_c::setAction(actionFunc action) {
     mMode = -1;
 
@@ -646,14 +615,12 @@ BOOL daNpcKasiMich_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A27B2C-80A27B50 001A4C 0024+00 8/8 0/0 0/0 .text            setLookMode__15daNpcKasiMich_cFi */
 void daNpcKasiMich_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 4 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80A27B50-80A27D30 001A70 01E0+00 1/1 0/0 0/0 .text            lookat__15daNpcKasiMich_cFv */
 void daNpcKasiMich_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -709,7 +676,6 @@ void daNpcKasiMich_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80A27D30-80A27E24 001C50 00F4+00 1/1 0/0 0/0 .text            step__15daNpcKasiMich_cFsi */
 BOOL daNpcKasiMich_c::step(s16 i_targetAngle, int param_2) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_targetAngle;
@@ -737,7 +703,6 @@ BOOL daNpcKasiMich_c::step(s16 i_targetAngle, int param_2) {
     return mTurnMode > 1;
 }
 
-/* 80A27E24-80A27F08 001D44 00E4+00 1/1 0/0 0/0 .text            chkFindPlayer__15daNpcKasiMich_cFv */
 BOOL daNpcKasiMich_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcKasiMich_Param_c::m.common.fov)) {
         mActorMngr[0].remove();
@@ -760,7 +725,6 @@ BOOL daNpcKasiMich_c::chkFindPlayer() {
     return rv;
 }
 
-/* 80A27F08-80A282B4 001E28 03AC+00 8/0 0/0 0/0 .text            wait__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::wait(int param_1) {
     switch (mMode) {
         case -1:
@@ -855,7 +819,6 @@ int daNpcKasiMich_c::wait(int param_1) {
     return 1;
 }
 
-/* 80A282B4-80A28490 0021D4 01DC+00 1/0 0/0 0/0 .text            fear__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::fear(int param_1) {
     switch (mMode) {
         case -1:
@@ -905,7 +868,6 @@ int daNpcKasiMich_c::fear(int param_1) {
     return 1;
 }
 
-/* 80A28490-80A284F8 0023B0 0068+00 1/1 0/0 0/0 .text            srchWolfTag__15daNpcKasiMich_cFv */
 daTagEscape_c* daNpcKasiMich_c::srchWolfTag() {
     mTargetTag = NULL;
     mWolfAngle = fopAcM_searchPlayerAngleY(this);
@@ -913,7 +875,6 @@ daTagEscape_c* daNpcKasiMich_c::srchWolfTag() {
     return mTargetTag;
 }
 
-/* 80A284F8-80A285C8 002418 00D0+00 1/1 0/0 0/0 .text _srch_escape_tag__15daNpcKasiMich_cFPvPv */
 void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -942,7 +903,6 @@ void* daNpcKasiMich_c::_srch_escape_tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A285C8-80A286FC 0024E8 0134+00 1/1 0/0 0/0 .text getWolfPathNearIdx__15daNpcKasiMich_cFv */
 int daNpcKasiMich_c::getWolfPathNearIdx() {
     int iVar1 = 0;
     f32 fVar1 = 0.0f;
@@ -980,7 +940,6 @@ void dummy() {
     temp = &daNpcKasiMich_c::wait;
 }
 
-/* 80A286FC-80A287A0 00261C 00A4+00 2/0 0/0 0/0 .text            chace_st__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::chace_st(int param_1) {
     switch (mMode) {
         case -1:
@@ -1002,7 +961,6 @@ int daNpcKasiMich_c::chace_st(int param_1) {
     return 1;
 }
 
-/* 80A287A0-80A28910 0026C0 0170+00 4/0 0/0 0/0 .text            chace__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::chace(int param_1) {
     switch (mMode) {
         case -1:
@@ -1039,7 +997,6 @@ void dummy2() {
     temp = &daNpcKasiMich_c::chace;
 }
 
-/* 80A28910-80A289CC 002830 00BC+00 1/1 0/0 0/0 .text            getChacePos__15daNpcKasiMich_cFv */
 cXyz daNpcKasiMich_c::getChacePos() {
     int plPoint = mPlPoint;
     int idx = mPath.getIdx();
@@ -1060,7 +1017,6 @@ cXyz daNpcKasiMich_c::getChacePos() {
     return chacePos;
 }
 
-/* 80A289CC-80A28A8C 0028EC 00C0+00 2/0 0/0 0/0 .text            turn_link__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::turn_link(int param_1) {
     switch (mMode) {
         case -1:
@@ -1082,7 +1038,6 @@ int daNpcKasiMich_c::turn_link(int param_1) {
     return 1;
 }
 
-/* 80A28A8C-80A28B70 0029AC 00E4+00 1/0 0/0 0/0 .text            turn_home__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::turn_home(int param_1) {
     switch (mMode) {
         case -1:
@@ -1109,7 +1064,6 @@ int daNpcKasiMich_c::turn_home(int param_1) {
     return 1;
 }
 
-/* 80A28B70-80A28C40 002A90 00D0+00 1/0 0/0 0/0 .text            turn_center__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::turn_center(int param_1) {
     switch (mMode) {
         case -1:
@@ -1132,7 +1086,6 @@ int daNpcKasiMich_c::turn_center(int param_1) {
     return 1;
 }
 
-/* 80A28C40-80A28CB8 002B60 0078+00 1/0 0/0 0/0 .text            talk_dummy__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::talk_dummy(int param_1) {
     switch (mMode) {
         case -1:
@@ -1151,7 +1104,6 @@ int daNpcKasiMich_c::talk_dummy(int param_1) {
     return 1;
 }
 
-/* 80A28CB8-80A28D90 002BD8 00D8+00 1/0 0/0 0/0 .text            kya__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::kya(int param_1) {
     switch (mMode) {
         case -1:
@@ -1181,7 +1133,6 @@ int daNpcKasiMich_c::kya(int param_1) {
     return 1;
 }
 
-/* 80A28D90-80A28E28 002CB0 0098+00 1/0 0/0 0/0 .text            kya2__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::kya2(int param_1) {
     switch (mMode) {
         case -1:
@@ -1202,7 +1153,6 @@ int daNpcKasiMich_c::kya2(int param_1) {
     return 1;
 }
 
-/* 80A28E28-80A28EFC 002D48 00D4+00 1/0 0/0 0/0 .text            kya_stop__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::kya_stop(int param_1) {
     switch (mMode) {
         case -1:
@@ -1226,7 +1176,6 @@ int daNpcKasiMich_c::kya_stop(int param_1) {
     return 1;
 }
 
-/* 80A28EFC-80A28F74 002E1C 0078+00 1/0 0/0 0/0 .text            iyan__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::iyan(int param_1) {
     switch (mMode) {
         case -1:
@@ -1245,7 +1194,6 @@ int daNpcKasiMich_c::iyan(int param_1) {
     return 1;
 }
 
-/* 80A28F74-80A2908C 002E94 0118+00 1/0 0/0 0/0 .text            escape__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::escape(int param_1) {
     switch (mMode) {
         case -1:
@@ -1276,7 +1224,6 @@ int daNpcKasiMich_c::escape(int param_1) {
     return 1;
 }
 
-/* 80A2908C-80A29164 002FAC 00D8+00 1/0 0/0 0/0 .text            iyan_look__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::iyan_look(int param_1) {
     switch (mMode) {
         case -1:
@@ -1301,7 +1248,6 @@ int daNpcKasiMich_c::iyan_look(int param_1) {
     return 1;
 }
 
-/* 80A29164-80A291E8 003084 0084+00 1/0 0/0 0/0 .text            turn_hana__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::turn_hana(int param_1) {
     switch (mMode) {
         case -1:
@@ -1321,7 +1267,6 @@ int daNpcKasiMich_c::turn_hana(int param_1) {
     return 1;
 }
 
-/* 80A291E8-80A2926C 003108 0084+00 7/0 0/0 0/0 .text            wait_dummy__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::wait_dummy(int param_1) {
     switch (mMode) {
         case -1:
@@ -1341,7 +1286,6 @@ int daNpcKasiMich_c::wait_dummy(int param_1) {
     return 1;
 }
 
-/* 80A2926C-80A29458 00318C 01EC+00 1/0 0/0 0/0 .text            cheer__15daNpcKasiMich_cFi */
 int daNpcKasiMich_c::cheer(int param_1) {
     switch (mMode) {
         case -1:
@@ -1406,14 +1350,12 @@ int daNpcKasiMich_c::cheer(int param_1) {
     return 1;
 }
 
-/* 80A29458-80A294A4 003378 004C+00 3/3 0/0 0/0 .text            _turn_to_link__15daNpcKasiMich_cFs */
 BOOL daNpcKasiMich_c::_turn_to_link(s16 param_1) {
     cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
     return _turn_pos(pos, param_1);
     
 }
 
-/* 80A294A4-80A29500 0033C4 005C+00 5/5 0/0 0/0 .text            _turn_pos__15daNpcKasiMich_cFRC4cXyzs */
 BOOL daNpcKasiMich_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     BOOL rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(&current.pos, &param_1), param_2);
     current.angle.y = mCurAngle.y;
@@ -1421,7 +1363,6 @@ BOOL daNpcKasiMich_c::_turn_pos(cXyz const& param_1, s16 param_2) {
     return rv;
 }
 
-/* 80A29500-80A295D8 003420 00D8+00 2/2 0/0 0/0 .text            actor_front_check__15daNpcKasiMich_cFP10fopAc_ac_c */
 BOOL daNpcKasiMich_c::actor_front_check(fopAc_ac_c* actor_p) {
     if (actor_p == NULL) {
         return TRUE;
@@ -1436,7 +1377,6 @@ BOOL daNpcKasiMich_c::actor_front_check(fopAc_ac_c* actor_p) {
     return (sp30.x * sp48.x + sp30.z * sp48.z) >= 0.0f;
 }
 
-/* 80A295D8-80A29644 0034F8 006C+00 1/1 0/0 0/0 .text            _getOffset__15daNpcKasiMich_cFRC4cXyzR4cXyz */
 void daNpcKasiMich_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     param_2 = param_1;
     csXyz angle(*fopAcM_GetShapeAngle_p(this));
@@ -1444,34 +1384,28 @@ void daNpcKasiMich_c::_getOffset(cXyz const& param_1, cXyz& param_2) {
     mDoMtx_stack_c::multVec(&param_2, &param_2);
 }
 
-/* 80A29644-80A29664 003564 0020+00 1/0 0/0 0/0 .text            daNpcKasiMich_Create__FPv */
 static int daNpcKasiMich_Create(void* a_this) {
     return static_cast<daNpcKasiMich_c*>(a_this)->Create();
 }
 
-/* 80A29664-80A29684 003584 0020+00 1/0 0/0 0/0 .text            daNpcKasiMich_Delete__FPv */
 static int daNpcKasiMich_Delete(void* a_this) {
     return static_cast<daNpcKasiMich_c*>(a_this)->Delete();
 }
 
-/* 80A29684-80A296A4 0035A4 0020+00 1/0 0/0 0/0 .text            daNpcKasiMich_Execute__FPv */
 static int daNpcKasiMich_Execute(void* a_this) {
     return static_cast<daNpcKasiMich_c*>(a_this)->Execute();
 }
 
-/* 80A296A4-80A296C4 0035C4 0020+00 1/0 0/0 0/0 .text            daNpcKasiMich_Draw__FPv */
 static int daNpcKasiMich_Draw(void* a_this) {
     return static_cast<daNpcKasiMich_c*>(a_this)->Draw();
 }
 
-/* 80A296C4-80A296CC 0035E4 0008+00 1/0 0/0 0/0 .text            daNpcKasiMich_IsDelete__FPv */
 static int daNpcKasiMich_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80A2A654-80A2A674 -00001 0020+00 1/0 0/0 0/0 .data            daNpcKasiMich_MethodTable */
 static actor_method_class daNpcKasiMich_MethodTable = {
     (process_method_func)daNpcKasiMich_Create,
     (process_method_func)daNpcKasiMich_Delete,
@@ -1480,7 +1414,6 @@ static actor_method_class daNpcKasiMich_MethodTable = {
     (process_method_func)daNpcKasiMich_Draw,
 };
 
-/* 80A2A674-80A2A6A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KASIMICH */
 extern actor_process_profile_definition g_profile_NPC_KASIMICH = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp
index fb6e696df1..9496798711 100644
--- a/src/d/actor/d_a_npc_kdk.cpp
+++ b/src/d/actor/d_a_npc_kdk.cpp
@@ -6,10 +6,7 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_kdk.h"
-#include "dol2asm.h"
 
-/* ############################################################################################## */
-/* 80A2A8E0-80A2A910 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KDK */
 extern actor_process_profile_definition g_profile_NPC_KDK = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp
index 169418be27..1003ab7053 100644
--- a/src/d/actor/d_a_npc_kkri.cpp
+++ b/src/d/actor/d_a_npc_kkri.cpp
@@ -8,13 +8,11 @@
 #include "d/actor/d_a_npc_kkri.h"
 #include "d/actor/d_a_e_ym.h"
 
-/* 80553618-80553628 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {35, 1},
     {18, 2},
 };
 
-/* 80553628-80553650 -00001 0028+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[5] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -23,27 +21,22 @@ static daNpcT_evtData_c l_evtList[5] = {
     {"YM_LOOK", 2},
 };
 
-/* 80553650-8055365C -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Kkri",
     "Kkri_TW",
 };
 
-/* 8055365C-80553660 000064 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[] = {1, -1};
 
-/* 80553660-80553664 000068 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[] = {1, 2, -1};
 
-/* 80553664-80553670 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn1,
     l_loadResPtrn1,
 };
 
-/* 80553670-80553814 000078 01A4+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = {
     {-1, 0, 0, 44, 2, 1, 1},
     {13, 0, 1, 44, 2, 1, 1},
@@ -62,7 +55,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = {
     {8, 0, 2, 26, 0, 2, 0},
 };
 
-/* 80553814-80553A60 00021C 024C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {30, 2, 1, 38, 0, 1, 1, 0},
     {31, 2, 1, 38, 0, 1, 1, 0},
@@ -87,7 +79,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {13, 0, 2, 38, 0, 1, 1, 0},
 };
 
-/* 80553A60-80553B50 000468 00F0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = {
     {1, -1, 1},
     {-1, 0, 0},
@@ -151,7 +142,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] =
     {-1, 0, 0},
 };
 
-/* 80553B50-80553C80 000558 0130+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {1, -1, 0},
     {-1, 0, 0},
@@ -231,21 +221,18 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {-1, 0, 0},
 };
 
-/* 80553C80-80553C8C -00001 000C+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Kkri_c */
 char* daNpc_Kkri_c::mCutNameList[3] = {
     "",
     "CONVERSATION_ABOUT_SOUP",
     "YM_LOOK",
 };
 
-/* 80553CA4-80553CC8 0006AC 0024+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Kkri_c */
 int (daNpc_Kkri_c::*daNpc_Kkri_c::mCutList[])(int) = {
     NULL,
     &daNpc_Kkri_c::cutConversationAboutSoup,
     &daNpc_Kkri_c::cutYmLook,
 };
 
-/* 8054F3AC-8054F4F8 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__12daNpc_Kkri_cFv */
 daNpc_Kkri_c::~daNpc_Kkri_c() {
     OS_REPORT("|%06d:%x|daNpc_Kkri_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -256,7 +243,6 @@ daNpc_Kkri_c::~daNpc_Kkri_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80553490-8055351C 000000 008C+00 10/10 0/0 0/0 .rodata          m__18daNpc_Kkri_Param_c */
 const daNpc_Kkri_HIOParam daNpc_Kkri_Param_c::m = {
     180.0f,
     -3.0f,
@@ -301,7 +287,6 @@ const daNpc_Kkri_HIOParam daNpc_Kkri_Param_c::m = {
     0.0f,
 };
 
-/* 8054F4F8-8054F7D0 000238 02D8+00 1/1 0/0 0/0 .text            create__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::create() {
     daNpcT_ct(this, daNpc_Kkri_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -379,7 +364,6 @@ static f32 dummyFloat(int _) {
     }
 }
 
-/* 8054F7D0-8054FA54 000510 0284+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -417,7 +401,6 @@ int daNpc_Kkri_c::CreateHeap() {
     return 0;
 }
 
-/* 8054FC10-8054FC44 000950 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Kkri_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -425,12 +408,10 @@ int daNpc_Kkri_c::Delete() {
     return 1;
 }
 
-/* 8054FC44-8054FC64 000984 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::Execute() {
     return execute();
 }
 
-/* 8054FC64-8054FD00 0009A4 009C+00 1/1 0/0 0/0 .text            Draw__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -440,14 +421,10 @@ int daNpc_Kkri_c::Draw() {
     return draw(FALSE, FALSE, daNpc_Kkri_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 8054FD00-8054FD20 000A40 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_Kkri_cFP10fopAc_ac_c             */
 int daNpc_Kkri_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpc_Kkri_c*)i_this)->CreateHeap();
 }
 
-/* 8054FD20-8054FD78 000A60 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpc_Kkri_cFP8J3DJointi                */
 int daNpc_Kkri_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -460,7 +437,6 @@ int daNpc_Kkri_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8054FD78-8054FE20 000AB8 00A8+00 2/2 0/0 0/0 .text            srchYm__12daNpc_Kkri_cFPvPv */
 void* daNpc_Kkri_c::srchYm(void* i_actor, void* i_data) {
     if (mFindCount < 50) {
         daE_YM_c* ym_p = (daE_YM_c*)i_actor;
@@ -473,7 +449,6 @@ void* daNpc_Kkri_c::srchYm(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8054FE20-8054FE58 000B60 0038+00 1/1 0/0 0/0 .text            getType__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -485,7 +460,6 @@ int daNpc_Kkri_c::getType() {
     }
 }
 
-/* 8054FE58-8054FE8C 000B98 0034+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::isDelete() {
     switch (mType) {
     case 0:
@@ -497,7 +471,6 @@ int daNpc_Kkri_c::isDelete() {
     }
 }
 
-/* 8054FE8C-8054FFEC 000BCC 0160+00 1/1 0/0 0/0 .text            reset__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::reset() {
     csXyz angle;
     u32 var_r30 = (uintptr_t)&field_0xfd8 - (uintptr_t)&mSelectAction;
@@ -520,7 +493,6 @@ void daNpc_Kkri_c::reset() {
     setAngle(angle);
 }
 
-/* 8054FFEC-805500A0 000D2C 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Kkri_cFv */
 BOOL daNpc_Kkri_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Kkri_c::talk)) {
         mPreItemNo = 0;
@@ -536,7 +508,6 @@ BOOL daNpc_Kkri_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 805500A0-80550270 000DE0 01D0+00 1/0 0/0 0/0 .text            setParam__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::setParam() {
     selectAction();
     srchActors();
@@ -600,7 +571,6 @@ void daNpc_Kkri_c::setParam() {
     }
 }
 
-/* 80550270-8055032C 000FB0 00BC+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::setAfterTalkMotion() {
     int var_r31 = 14;
 
@@ -624,7 +594,6 @@ void daNpc_Kkri_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(var_r31, -1.0f, 0, 0);
 }
 
-/* 8055032C-80550398 00106C 006C+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::srchActors() {
     switch (mType) {
     case 0:
@@ -637,7 +606,6 @@ void daNpc_Kkri_c::srchActors() {
     }
 }
 
-/* 80550398-80550438 0010D8 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Kkri_cFv */
 BOOL daNpc_Kkri_c::evtTalk() {
     if (chkAction(&daNpc_Kkri_c::talk)) {
         (this->*mAction)(NULL);
@@ -648,7 +616,6 @@ BOOL daNpc_Kkri_c::evtTalk() {
     return TRUE;
 }
 
-/* 80550438-80550500 001178 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Kkri_cFv */
 BOOL daNpc_Kkri_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Kkri", this, -1);
     if (staffId != -1) {
@@ -665,7 +632,6 @@ BOOL daNpc_Kkri_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80550500-805505F8 001240 00F8+00 1/0 0/0 0/0 .text            action__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::action() {
     fopAc_ac_c* hit_actor = hitChk(&mCcCyl, -1);
     if (mStagger.checkRebirth()) {
@@ -682,7 +648,6 @@ void daNpc_Kkri_c::action() {
     }
 }
 
-/* 805505F8-805506BC 001338 00C4+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -695,7 +660,6 @@ void daNpc_Kkri_c::beforeMove() {
     }
 }
 
-/* 805506BC-80550ADC 0013FC 0420+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::setAttnPos() {
     cXyz sp34(-30.0f, 0.0f, 0.0f);
 
@@ -752,7 +716,6 @@ void daNpc_Kkri_c::setAttnPos() {
     attention_info.position = sp34 + current.pos;
 }
 
-/* 80550ADC-80550CA0 00181C 01C4+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Kkri_cFv */
 void daNpc_Kkri_c::setCollision() {
     cXyz pos;
 
@@ -803,12 +766,10 @@ void daNpc_Kkri_c::setCollision() {
     mCcCyl.ClrTgHit();
 }
 
-/* 80550CA0-80550CA8 0019E0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80550CA8-80550D44 0019E8 009C+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::selectAction() {
     mSelectAction = NULL;
 
@@ -827,14 +788,10 @@ int daNpc_Kkri_c::selectAction() {
     return 1;
 }
 
-/* 80550D44-80550D70 001A84 002C+00 2/2 0/0 0/0 .text
- * chkAction__12daNpc_Kkri_cFM12daNpc_Kkri_cFPCvPvPv_i          */
 BOOL daNpc_Kkri_c::chkAction(int (daNpc_Kkri_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 80550D70-80550E18 001AB0 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_Kkri_cFM12daNpc_Kkri_cFPCvPvPv_i          */
 BOOL daNpc_Kkri_c::setAction(int (daNpc_Kkri_c::*i_action)(void*)) {
     mMode = 3;
     if (mAction != NULL) {
@@ -850,8 +807,6 @@ BOOL daNpc_Kkri_c::setAction(int (daNpc_Kkri_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 80550E18-80550F70 001B58 0158+00 1/0 0/0 0/0 .text cutConversationAboutSoup__12daNpc_Kkri_cFi
- */
 int daNpc_Kkri_c::cutConversationAboutSoup(int i_staffId) {
     int rt = 0;
     int prm = -1;
@@ -886,7 +841,6 @@ int daNpc_Kkri_c::cutConversationAboutSoup(int i_staffId) {
     return rt;
 }
 
-/* 80550F70-80551084 001CB0 0114+00 1/0 0/0 0/0 .text            cutYmLook__12daNpc_Kkri_cFi */
 int daNpc_Kkri_c::cutYmLook(int i_staffId) {
     int rt = 0;
     int prm = -1;
@@ -922,7 +876,6 @@ int daNpc_Kkri_c::cutYmLook(int i_staffId) {
     return rt;
 }
 
-/* 80551084-805512E0 001DC4 025C+00 1/1 0/0 0/0 .text            sleep__12daNpc_Kkri_cFv */
 int daNpc_Kkri_c::sleep() {
     int time_hour = dKy_getdaytime_hour();
     int rnd_value = cLib_getRndValue<int>(150, 100);
@@ -953,7 +906,6 @@ int daNpc_Kkri_c::sleep() {
     return field_0xfd6;
 }
 
-/* 805512E0-80551538 002020 0258+00 1/0 0/0 0/0 .text            wait__12daNpc_Kkri_cFPv */
 int daNpc_Kkri_c::wait(void*) {
     switch (mMode) {
     case 0:
@@ -1006,7 +958,6 @@ int daNpc_Kkri_c::wait(void*) {
     return 1;
 }
 
-/* 80551538-80551A4C 002278 0514+00 1/0 0/0 0/0 .text            sitWait1__12daNpc_Kkri_cFPv */
 int daNpc_Kkri_c::sitWait1(void*) {
     BOOL var_r29 = FALSE;
 
@@ -1106,7 +1057,6 @@ int daNpc_Kkri_c::sitWait1(void*) {
     return 1;
 }
 
-/* 80551A4C-80551DA4 00278C 0358+00 1/0 0/0 0/0 .text            fearWait__12daNpc_Kkri_cFPv */
 int daNpc_Kkri_c::fearWait(void*) {
     fopAc_ac_c* nearest_actor = NULL;
     f32 nearest_dist = G_CM3D_F_INF;
@@ -1166,7 +1116,6 @@ int daNpc_Kkri_c::fearWait(void*) {
     return 1;
 }
 
-/* 80551DA4-805520A0 002AE4 02FC+00 3/0 0/0 0/0 .text            talk__12daNpc_Kkri_cFPv */
 int daNpc_Kkri_c::talk(void*) {
     switch (mMode) {
     case 0:
@@ -1240,35 +1189,28 @@ int daNpc_Kkri_c::talk(void*) {
     return 0;
 }
 
-/* 805520A0-805520C0 002DE0 0020+00 1/0 0/0 0/0 .text            daNpc_Kkri_Create__FPv */
 static int daNpc_Kkri_Create(void* i_this) {
     return ((daNpc_Kkri_c*)i_this)->create();
 }
 
-/* 805520C0-805520E0 002E00 0020+00 1/0 0/0 0/0 .text            daNpc_Kkri_Delete__FPv */
 static int daNpc_Kkri_Delete(void* i_this) {
     return ((daNpc_Kkri_c*)i_this)->Delete();
 }
 
-/* 805520E0-80552100 002E20 0020+00 1/0 0/0 0/0 .text            daNpc_Kkri_Execute__FPv */
 static int daNpc_Kkri_Execute(void* i_this) {
     return ((daNpc_Kkri_c*)i_this)->Execute();
 }
 
-/* 80552100-80552120 002E40 0020+00 1/0 0/0 0/0 .text            daNpc_Kkri_Draw__FPv */
 static int daNpc_Kkri_Draw(void* i_this) {
     return ((daNpc_Kkri_c*)i_this)->Draw();
 }
 
-/* 80552120-80552128 002E60 0008+00 1/0 0/0 0/0 .text            daNpc_Kkri_IsDelete__FPv */
 static int daNpc_Kkri_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80553EEC-80553EF0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Kkri_Param_c l_HIO;
 
-/* 80553D10-80553D30 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kkri_MethodTable */
 static actor_method_class daNpc_Kkri_MethodTable = {
     (process_method_func)daNpc_Kkri_Create,
     (process_method_func)daNpc_Kkri_Delete,
@@ -1277,7 +1219,6 @@ static actor_method_class daNpc_Kkri_MethodTable = {
     (process_method_func)daNpc_Kkri_Draw,
 };
 
-/* 80553D30-80553D60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KKRI */
 extern actor_process_profile_definition g_profile_NPC_KKRI = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp
index 7776d9e57c..5e653ea208 100644
--- a/src/d/actor/d_a_npc_kn.cpp
+++ b/src/d/actor/d_a_npc_kn.cpp
@@ -16,7 +16,6 @@
 #include "d/d_debug_viewer.h"
 #endif
 
-/* 80A408C8-80A408F8 000000 0030+00 50/50 0/0 0/0 .rodata          mCcDObjData__10daNpc_Kn_c */
 const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
     {0, {{0, 0, 0}, {0, 0}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
@@ -26,7 +25,6 @@ const dCcD_SrcGObjInf daNpc_Kn_c::mCcDObjData = {
 
 #include "d/actor/d_a_npc_kn_base.inc"
 
-/* 80A40970-80A40A24 0000A8 00B4+00 8/29 0/0 0/0 .rodata          m__16daNpc_Kn_Param_c */
 const daNpc_Kn_HIOParam daNpc_Kn_Param_c::m = {
     50.0f,
     -5.0f,
@@ -159,13 +157,11 @@ void daNpc_Kn_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A40D54-80A40D98 000020 0044+00 1/1 0/0 0/0 .data            mCcDCyl__10daNpc_Kn_c */
 dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = {
     mCcDObjData,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f},
 };
 
-/* 80A40D98-80A40DD8 000064 0040+00 1/1 0/0 0/0 .data            mCcDSph__10daNpc_Kn_c */
 dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
     mCcDObjData,
     {
@@ -173,14 +169,12 @@ dCcD_SrcSph daNpc_Kn_c::mCcDSph = {
     },
 };
 
-/* 80A40DD8-80A40DF0 0000A4 0018+00 0/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {47, 1},
     {48, 1},
     {49, 1},
 };
 
-/* 80A40DF0-80A40EC0 -00001 00D0+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[26] = {
     {"", 0},
     {"NONE_EQUIP_CHANGE_TALK", 1},
@@ -210,20 +204,17 @@ static daNpcT_evtData_c l_evtList[26] = {
     {"SEVENTH_SKILL_GET_STAND", 8},
 };
 
-/* 80A40EC0-80A40EE4 -00001 0024+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[9] = {
     "",          "KN_a",      "KN_tch01D", "KN_tch02D", "KN_tch03D",
     "KN_tch04D", "KN_tch05D", "KN_tch06D", "KN_tch07D",
 };
 
-/* 80A40EE4-80A40EE8 0001B0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrnTeach01 */
 static s8 l_loadResPtrnTeach01[3] = {
     1,
     2,
     -1,
 };
 
-/* 80A40EE8-80A40EEC 0001B4 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTeach02 */
 static s8 l_loadResPtrnTeach02[4] = {
     1,
     2,
@@ -231,7 +222,6 @@ static s8 l_loadResPtrnTeach02[4] = {
     -1,
 };
 
-/* 80A40EEC-80A40EF0 0001B8 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTeach03 */
 static s8 l_loadResPtrnTeach03[4] = {
     1,
     3,
@@ -239,7 +229,6 @@ static s8 l_loadResPtrnTeach03[4] = {
     -1,
 };
 
-/* 80A40EF0-80A40EF4 0001BC 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTeach04 */
 static s8 l_loadResPtrnTeach04[4] = {
     1,
     4,
@@ -247,7 +236,6 @@ static s8 l_loadResPtrnTeach04[4] = {
     -1,
 };
 
-/* 80A40EF4-80A40EF8 0001C0 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTeach05 */
 static s8 l_loadResPtrnTeach05[4] = {
     1,
     5,
@@ -255,7 +243,6 @@ static s8 l_loadResPtrnTeach05[4] = {
     -1,
 };
 
-/* 80A40EF8-80A40EFC 0001C4 0004+00 1/0 0/0 0/0 .data            l_loadResPtrnTeach06 */
 static s8 l_loadResPtrnTeach06[4] = {
     1,
     6,
@@ -263,32 +250,27 @@ static s8 l_loadResPtrnTeach06[4] = {
     -1,
 };
 
-/* 80A40EFC-80A40F00 0001C8 0003+01 1/0 0/0 0/0 .data            l_loadResPtrnTeach07 */
 static s8 l_loadResPtrnTeach07[3] = {
     1,
     8,
     -1,
 };
 
-/* 80A40F00-80A40F04 0001CC 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1,
     -1,
 };
 
-/* 80A40F04-80A40F24 -00001 0020+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[8] = {
     l_loadResPtrnTeach01, l_loadResPtrnTeach02, l_loadResPtrnTeach03, l_loadResPtrnTeach04,
     l_loadResPtrnTeach05, l_loadResPtrnTeach06, l_loadResPtrnTeach07, l_loadResPtrn0,
 };
 
-/* 80A40F24-80A40F5C 0001F0 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, -1, 0, 0, 0},
     {21, 0, 1, -1, 0, 0, 0},
 };
 
-/* 80A40F5C-80A41330 000228 03D4+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static int l_motionAnmData[245] = {
     43, 2, 1, -1, 0, 0, 0, 38, 2, 1, -1, 0, 0, 0, 39, 2, 1, -1, 0, 0, 0, 41, 0, 1, -1, 0, 0, 0,
     16, 0, 1, -1, 0, 0, 0, 11, 0, 1, -1, 0, 0, 0, 7,  0, 1, -1, 0, 0, 0, 8,  0, 1, -1, 0, 0, 0,
@@ -301,7 +283,6 @@ static int l_motionAnmData[245] = {
     22, 0, 1, -1, 0, 0, 0, 23, 2, 1, -1, 0, 0, 0, 6,  0, 1, -1, 0, 0, 0,
 };
 
-/* 80A41330-80A41358 0005FC 0028+00 1/2 0/0 0/0 .data            l_podBckData */
 static int l_podBckData[5][2] = {
     {-1, 1},
     {34, 1},
@@ -310,7 +291,6 @@ static int l_podBckData[5][2] = {
     {32, 1},
 };
 
-/* 80A41358-80A41378 000624 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 0},
     {-1, 0, 0},
@@ -322,7 +302,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] =
     {-1, 0, 0},
 };
 
-/* 80A41378-80A41588 000644 0210+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -458,7 +437,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[132] = {
     {-1, 0, 0},
 };
 
-/* 80A41588-80A415DC -00001 0054+00 1/1 0/0 0/0 .data            mCutNameList__10daNpc_Kn_c */
 char* daNpc_Kn_c::mCutNameList[21] = {
     "",
     "NONE_EQUIP_CHANGE_TALK",
@@ -483,7 +461,6 @@ char* daNpc_Kn_c::mCutNameList[21] = {
     "SEVENTH_SKILL_GET",
 };
 
-/* 80A416CC-80A417C8 000998 00FC+00 1/2 0/0 0/0 .data            mCutList__10daNpc_Kn_c */
 daNpc_Kn_c::cutFunc daNpc_Kn_c::mCutList[21] = {
     NULL,
     &daNpc_Kn_c::ECut_noneEquipChangeTalk,
@@ -510,16 +487,12 @@ daNpc_Kn_c::cutFunc daNpc_Kn_c::mCutList[21] = {
 
 s16 daNpc_Kn_c::mSrchName;
 
-/* 80A43300-80A433C8 000048 00C8+00 0/0 0/0 0/0 .bss             mFindActorPtrs__10daNpc_Kn_c */
 fopAc_ac_c* daNpc_Kn_c::mFindActorPtrs[50];
 
-/* 80A433C8-80A433CC 000110 0004+00 0/0 0/0 0/0 .bss             mFindCount__10daNpc_Kn_c */
 u8 daNpc_Kn_c::mFindCount[4];
 
-/* 80A433D8-80A433DC 000120 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_KN_HIO_CLASS l_HIO;
 
-/* 80A2AA0C-80A2AECC 0000EC 04C0+00 1/0 0/0 0/0 .text            __dt__10daNpc_Kn_cFv */
 daNpc_Kn_c::~daNpc_Kn_c() {
     // destruct
     OS_REPORT("|%06d:%x|daNpc_Kn_c -> デストラクト\n", g_Counter.mCounter0, this);
@@ -537,7 +510,6 @@ daNpc_Kn_c::~daNpc_Kn_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A2AFD4-80A2B278 0006B4 02A4+00 1/1 0/0 0/0 .text            create__10daNpc_Kn_cFv */
 int daNpc_Kn_c::create() {
     daNpcT_ct(this, daNpc_Kn_c, l_faceMotionAnmData,
                        (daNpcT_motionAnmData_c*)l_motionAnmData, l_faceMotionSequenceData, 4,
@@ -599,7 +571,6 @@ int daNpc_Kn_c::create() {
     return phase_state;
 }
 
-/* 80A2B278-80A2B620 000958 03A8+00 1/1 0/0 0/0 .text            CreateHeap__10daNpc_Kn_cFv */
 int daNpc_Kn_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model_p = NULL;
@@ -702,7 +673,6 @@ int daNpc_Kn_c::CreateHeap() {
     return 0;
 }
 
-/* 80A2B620-80A2B654 000D00 0034+00 1/1 0/0 0/0 .text            Delete__10daNpc_Kn_cFv */
 int daNpc_Kn_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Kn_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_RegisterDeleteID(this, "NPC_KN");
@@ -710,7 +680,6 @@ int daNpc_Kn_c::Delete() {
     return 1;
 }
 
-/* 80A2B654-80A2B6B0 000D34 005C+00 2/2 0/0 0/0 .text            Execute__10daNpc_Kn_cFv */
 int daNpc_Kn_c::Execute() {
     int rt = execute();
     setPrtcl();
@@ -720,7 +689,6 @@ int daNpc_Kn_c::Execute() {
     return rt;
 }
 
-/* 80A2B6B0-80A2B764 000D90 00B4+00 1/1 0/0 0/0 .text            Draw__10daNpc_Kn_cFv */
 int daNpc_Kn_c::Draw() {
     if (mpMatAnm) {
         J3DModelData* modelData = mpModelMorf[0]->getModel()->getModelData();
@@ -741,15 +709,11 @@ int daNpc_Kn_c::Draw() {
         FALSE, mpHIO->m.common.real_shadow_size, &tevcolor, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80A2B764-80A2B784 000E44 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daNpc_Kn_cFP10fopAc_ac_c               */
 int daNpc_Kn_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Kn_c* a_this = ((daNpc_Kn_c*)i_this);
     return a_this->CreateHeap();
 }
 
-/* 80A2B784-80A2B7DC 000E64 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpc_Kn_cFP8J3DJointi
- */
 int daNpc_Kn_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -763,7 +727,6 @@ int daNpc_Kn_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A2B7DC-80A2B844 000EBC 0068+00 2/1 0/0 0/0 .text            getType__10daNpc_Kn_cFv */
 u8 daNpc_Kn_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -786,24 +749,20 @@ u8 daNpc_Kn_c::getType() {
     };
 }
 
-/* 80A2B844-80A2B850 000F24 000C+00 1/1 0/0 0/0 .text            getDivideNo__10daNpc_Kn_cFv */
 u8 daNpc_Kn_c::getDivideNo() {
     u8 prm = (fopAcM_GetParam(this) & 0xFF00) >> 8;
     return prm;
 }
 
-/* 80A2B850-80A2B86C 000F30 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::getFlowNodeNo() {
     u16 node_no = home.angle.x;
     return (node_no == 0xFFFF) ? 0xFFFFFFFF : node_no;
 }
 
-/* 80A2B86C-80A2B878 000F4C 000C+00 1/1 0/0 0/0 .text            getPath__10daNpc_Kn_cFv */
 u8 daNpc_Kn_c::getPath() {
     return (fopAcM_GetParam(this) & 0xFF00) >> 8;
 }
 
-/* 80A2B878-80A2B91C 000F58 00A4+00 1/1 0/0 0/0 .text            isDelete__10daNpc_Kn_cFv */
 BOOL daNpc_Kn_c::isDelete() {
     static s16 l_appearFlag[7] = {
         0xFFFF, 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157,
@@ -832,7 +791,6 @@ BOOL daNpc_Kn_c::isDelete() {
     return 1;
 }
 
-/* 80A2B91C-80A2B9E0 000FFC 00C4+00 1/1 0/0 0/0 .text            resetCol__10daNpc_Kn_cFv */
 void daNpc_Kn_c::resetCol() {
     mCylCc.Set(mCcDCyl);
     mCylCc.SetStts(&mCcStts);
@@ -850,7 +808,6 @@ void daNpc_Kn_c::resetCol() {
     }
 }
 
-/* 80A2B9E0-80A2BC5C 0010C0 027C+00 1/1 0/0 0/0 .text            reset__10daNpc_Kn_cFv */
 void daNpc_Kn_c::reset() {
     initialize();
     memset(&mpTeachAction, 0, (int)&field_0x1754 - (int)&mpTeachAction);
@@ -900,7 +857,6 @@ void daNpc_Kn_c::reset() {
     resetType();
 }
 
-/* 80A2BC5C-80A2BD30 00133C 00D4+00 2/1 0/0 0/0 .text            resetType__10daNpc_Kn_cFv */
 void daNpc_Kn_c::resetType() {
     switch (mType) {
     case 0:
@@ -939,7 +895,6 @@ void daNpc_Kn_c::resetType() {
     }
 }
 
-/* 80A2BD30-80A2BFB0 001410 0280+00 2/1 0/0 0/0 .text            setParam__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setParam() {
     u32 new_flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
     selectAction();
@@ -1015,7 +970,6 @@ void daNpc_Kn_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 };
 
-/* 80A2BFB0-80A2C044 001690 0094+00 1/1 0/0 0/0 .text            setParamTeach03__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach03() {
     s16 talk_distance = mpHIO->m.common.talk_distance;
     s16 talk_angle = mpHIO->m.common.talk_angle;
@@ -1032,7 +986,6 @@ u32 daNpc_Kn_c::setParamTeach03() {
     return fopAc_AttnFlag_BATTLE_e;
 }
 
-/* 80A2C044-80A2C0FC 001724 00B8+00 1/1 0/0 0/0 .text            setParamTeach04__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach04() {
     s16 talk_distance = mpHIO->m.common.talk_distance;
     s16 talk_angle = mpHIO->m.common.talk_angle;
@@ -1053,7 +1006,6 @@ u32 daNpc_Kn_c::setParamTeach04() {
     return (fopAc_AttnFlag_UNK_0x200000 | fopAc_AttnFlag_BATTLE_e);
 }
 
-/* 80A2C0FC-80A2C190 0017DC 0094+00 3/3 0/0 0/0 .text            setParamTeach05__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach05() {
     s16 talk_distance = mpHIO->m.common.talk_distance;
     s16 talk_angle = mpHIO->m.common.talk_angle;
@@ -1070,18 +1022,14 @@ u32 daNpc_Kn_c::setParamTeach05() {
     return fopAc_AttnFlag_BATTLE_e;
 }
 
-/* 80A2C190-80A2C1B0 001870 0020+00 1/1 0/0 0/0 .text            setParamTeach06__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach06() {
     setParamTeach05();
 }
 
-/* 80A2C1B0-80A2C1D0 001890 0020+00 1/1 0/0 0/0 .text            setParamTeach07__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach07() {
     setParamTeach05();
 }
 
-/* 80A2C1D0-80A2C230 0018B0 0060+00 1/1 0/0 0/0 .text            setAfterTalkMotion__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setAfterTalkMotion() {
     int index = 0;
     mFaceMotionSeqMngr.getNo();
@@ -1089,14 +1037,12 @@ void daNpc_Kn_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(index, -1.0, 0, 0);
 }
 
-/* 80A2C230-80A2C234 001910 0004+00 1/1 0/0 0/0 .text            srchActors__10daNpc_Kn_cFv */
 void daNpc_Kn_c::srchActors() {
     switch (mType) {
         break;
     }
 }
 
-/* 80A2C234-80A2C318 001914 00E4+00 1/1 0/0 0/0 .text            evtTalk__10daNpc_Kn_cFv */
 bool daNpc_Kn_c::evtTalk() {
     if (chkAction(&daNpc_Kn_c::talk)) {
         (this->*mpActionFunc)(NULL);
@@ -1109,7 +1055,6 @@ bool daNpc_Kn_c::evtTalk() {
     return true;
 }
 
-/* 80A2C318-80A2C3FC 0019F8 00E4+00 1/1 0/0 0/0 .text            evtCutProc__10daNpc_Kn_cFv */
 BOOL daNpc_Kn_c::evtCutProc() {
     if (mDivideNo != 0 && mDivideNo <= 2) {
         return false;
@@ -1132,7 +1077,6 @@ BOOL daNpc_Kn_c::evtCutProc() {
     return rt;
 }
 
-/* 80A2C3FC-80A2C484 001ADC 0088+00 1/1 0/0 0/0 .text            action__10daNpc_Kn_cFv */
 void daNpc_Kn_c::action() {
     if (mpTeachAction != NULL) {
         if (mpActionFunc == mpTeachAction) {
@@ -1143,14 +1087,12 @@ void daNpc_Kn_c::action() {
     }
 }
 
-/* 80A2C484-80A2C4FC 001B64 0078+00 1/1 0/0 0/0 .text            beforeMove__10daNpc_Kn_cFv */
 void daNpc_Kn_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A2C4FC-80A2C56C 001BDC 0070+00 1/1 0/0 0/0 .text            afterMoved__10daNpc_Kn_cFv */
 void daNpc_Kn_c::afterMoved() {
     if (mGroundHeight != -G_CM3D_F_INF) {
         mTevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
@@ -1158,7 +1100,6 @@ void daNpc_Kn_c::afterMoved() {
     }
 }
 
-/* 80A2C56C-80A2C77C 001C4C 0210+00 1/1 0/0 0/0 .text            setAttnPos__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setAttnPos() {
     cXyz pos(30.0f, 0.0f, 0.0f);
 
@@ -1199,7 +1140,6 @@ void daNpc_Kn_c::setAttnPos() {
     }
 }
 
-/* 80A2C77C-80A2C984 001E5C 0208+00 2/1 0/0 0/0 .text            setCollision__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setCollision() {
     cXyz centerPos;
 
@@ -1264,8 +1204,6 @@ void daNpc_Kn_c::setCollision() {
     setCollisionSword();
 }
 
-/* 80A2C984-80A2CB30 002064 01AC+00 1/1 0/0 0/0 .text            setCollisionSword__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionSword() {
     static f32 l_swordOffset[2] = {60.0f, 120.0f};
 
@@ -1299,8 +1237,6 @@ void daNpc_Kn_c::setCollisionSword() {
     }
 }
 
-/* 80A2CB30-80A2CBEC 002210 00BC+00 9/9 0/0 0/0 .text            checkCollisionSword__10daNpc_Kn_cFv
- */
 BOOL daNpc_Kn_c::checkCollisionSword() {
     int hit_type = false;
 
@@ -1325,8 +1261,6 @@ BOOL daNpc_Kn_c::checkCollisionSword() {
     return hit_type == 2;
 }
 
-/* 80A2CBEC-80A2CC24 0022CC 0038+00 1/1 0/0 0/0 .text            setCollisionTeach03__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach03() {
     mCylCc.SetTgType(0xFFFFFFFF);
     mCylCc.SetTgSPrm(0x13);
@@ -1335,8 +1269,6 @@ void daNpc_Kn_c::setCollisionTeach03() {
     mCylCc.OnCoSetBit();
 }
 
-/* 80A2CC24-80A2CD00 002304 00DC+00 1/1 0/0 0/0 .text            setCollisionTeach04__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach04() {
     switch (mActionMode) {
     case 9:
@@ -1363,8 +1295,6 @@ void daNpc_Kn_c::setCollisionTeach04() {
     }
 }
 
-/* 80A2CD00-80A2CD38 0023E0 0038+00 3/3 0/0 0/0 .text            setCollisionTeach05__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach05() {
     mCylCc.SetTgType(0xFFFFFFFF);
     mCylCc.SetTgSPrm(0x13);
@@ -1373,19 +1303,14 @@ void daNpc_Kn_c::setCollisionTeach05() {
     mCylCc.OnCoSetBit();
 }
 
-/* 80A2CD38-80A2CD58 002418 0020+00 1/1 0/0 0/0 .text            setCollisionTeach06__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach06() {
     setCollisionTeach05();
 }
 
-/* 80A2CD58-80A2CD78 002438 0020+00 1/1 0/0 0/0 .text            setCollisionTeach07__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach07() {
     setCollisionTeach05();
 }
 
-/* 80A2CD78-80A2CD80 002458 0008+00 1/1 0/0 0/0 .text            drawDbgInfo__10daNpc_Kn_cFv */
 int daNpc_Kn_c::drawDbgInfo() {
 #if DEBUG
     if (mpHIO->m.common.debug_info_ON) {
@@ -1399,7 +1324,6 @@ int daNpc_Kn_c::drawDbgInfo() {
     return false;
 }
 
-/* 80A2CD80-80A2CF9C 002460 021C+00 1/1 0/0 0/0 .text            drawOtherMdl__10daNpc_Kn_cFv */
 void daNpc_Kn_c::drawOtherMdl() {
     J3DModel* model = mpModelMorf[1]->getModel();
     J3DModelData* model_data = model->getModelData();
@@ -1453,7 +1377,6 @@ void daNpc_Kn_c::drawOtherMdl() {
     }
 }
 
-/* 80A2CF9C-80A2D060 00267C 00C4+00 1/1 0/0 0/0 .text            drawGhost__10daNpc_Kn_cFv */
 void daNpc_Kn_c::drawGhost() {
     J3DModel* model = mpModelMorf[0]->getModel();
     g_env_light.settingTevStruct(7, &current.pos, &tevStr);
@@ -1468,7 +1391,6 @@ void daNpc_Kn_c::drawGhost() {
     }
 }
 
-/* 80A2D060-80A2D198 002740 0138+00 1/0 0/0 0/0 .text afterSetMotionAnm__10daNpc_Kn_cFiifi */
 bool daNpc_Kn_c::afterSetMotionAnm(int param_0, int i_mode, f32 param_2, int param_3) {
     (void) param_2;
     (void) param_3;
@@ -1507,7 +1429,6 @@ bool daNpc_Kn_c::afterSetMotionAnm(int param_0, int i_mode, f32 param_2, int par
     return true;
 }
 
-/* 80A2D198-80A2D3A4 002878 020C+00 2/1 0/0 0/0 .text            selectAction__10daNpc_Kn_cFv */
 int daNpc_Kn_c::selectAction() {
     mpTeachAction = NULL;
 
@@ -1576,7 +1497,6 @@ int daNpc_Kn_c::selectAction() {
     return 1;
 }
 
-/* 80A2D3A4-80A2D3FC 002A84 0058+00 1/1 0/0 0/0 .text teach03_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach03_selectAction() {
     switch (mActionMode) {
     case 8:
@@ -1587,7 +1507,6 @@ void daNpc_Kn_c::teach03_selectAction() {
     mpTeachAction = &daNpc_Kn_c::wait;
 }
 
-/* 80A2D3FC-80A2D4A0 002ADC 00A4+00 1/1 0/0 0/0 .text teach04_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach04_selectAction() {
     switch (mActionMode) {
     case 9:
@@ -1604,7 +1523,6 @@ void daNpc_Kn_c::teach04_selectAction() {
     mpTeachAction = &daNpc_Kn_c::wait;
 }
 
-/* 80A2D4A0-80A2D4F8 002B80 0058+00 1/1 0/0 0/0 .text teach05_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach05_selectAction() {
     switch (mActionMode) {
     case 12:
@@ -1615,7 +1533,6 @@ void daNpc_Kn_c::teach05_selectAction() {
     mpTeachAction = &daNpc_Kn_c::wait;
 }
 
-/* 80A2D4F8-80A2D600 002BD8 0108+00 1/1 0/0 0/0 .text teach06_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach06_selectAction() {
     switch (mActionMode) {
     case 13:
@@ -1641,7 +1558,6 @@ void daNpc_Kn_c::teach06_selectAction() {
     mpTeachAction = &daNpc_Kn_c::wait;
 }
 
-/* 80A2D600-80A2D708 002CE0 0108+00 1/1 0/0 0/0 .text teach07_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach07_selectAction() {
     switch (mActionMode) {
     case 19:
@@ -1667,14 +1583,10 @@ void daNpc_Kn_c::teach07_selectAction() {
     mpTeachAction = &daNpc_Kn_c::wait;
 }
 
-/* 80A2D708-80A2D734 002DE8 002C+00 1/1 0/0 0/0 .text
- * chkAction__10daNpc_Kn_cFM10daNpc_Kn_cFPCvPvPv_i              */
 BOOL daNpc_Kn_c::chkAction(daNpc_Kn_c::actionFunc i_action) {
     return mpActionFunc == i_action;
 }
 
-/* 80A2D734-80A2D7DC 002E14 00A8+00 2/2 0/0 0/0 .text
- * setAction__10daNpc_Kn_cFM10daNpc_Kn_cFPCvPvPv_i              */
 BOOL daNpc_Kn_c::setAction(daNpc_Kn_c::actionFunc i_action) {
     mMode = 3;
     if (mpActionFunc) {
@@ -1691,7 +1603,6 @@ BOOL daNpc_Kn_c::setAction(daNpc_Kn_c::actionFunc i_action) {
     return TRUE;
 }
 
-/* 80A2D7DC-80A2D9C4 002EBC 01E8+00 8/0 0/0 0/0 .text            wait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1716,7 +1627,6 @@ int daNpc_Kn_c::wait(void* param_0) {
     }
 }
 
-/* 80A2D9C4-80A2DB94 0030A4 01D0+00 2/0 0/0 0/0 .text            talk__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::talk(void* param_0) {
     int rt = 0;
     BOOL var_r30 = FALSE;
@@ -1757,7 +1667,6 @@ int daNpc_Kn_c::talk(void* param_0) {
     return rt;
 }
 
-/* 80A2DB94-80A2DCB4 003274 0120+00 1/0 0/0 0/0 .text            test__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::test(void* param_0) {
     int rt = 0;
 
@@ -1781,7 +1690,6 @@ int daNpc_Kn_c::test(void* param_0) {
     return rt;
 }
 
-/* 80A2DCB4-80A2DD70 003394 00BC+00 7/7 0/0 0/0 .text            setSceneChange__10daNpc_Kn_cFi */
 void daNpc_Kn_c::setSceneChange(int param_0) {
     for (int i = 2; i <= 7; i++) {
         if (daNpcT_chkTmpBit(i + 90)) {
@@ -1799,7 +1707,6 @@ void daNpc_Kn_c::setSceneChange(int param_0) {
     dStage_changeScene(1, 0.0, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 80A2DD70-80A2DF84 003450 0214+00 1/0 0/0 0/0 .text ECut_noneEquipChangeTalk__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_noneEquipChangeTalk(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int reg_r26 = 0;
@@ -1851,8 +1758,6 @@ int daNpc_Kn_c::ECut_noneEquipChangeTalk(int i_idx) {
     return rt;
 }
 
-/* 80A2DF84-80A2E26C 003664 02E8+00 1/0 0/0 0/0 .text
- * ECut_noneEquipChangeTalkStand__10daNpc_Kn_cFi                */
 int daNpc_Kn_c::ECut_noneEquipChangeTalkStand(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int reg_r26 = 0;
@@ -1918,7 +1823,6 @@ int daNpc_Kn_c::ECut_noneEquipChangeTalkStand(int i_idx) {
     return rt;
 }
 
-/* 80A2E26C-80A2E528 00394C 02BC+00 1/0 0/0 0/0 .text ECut_largeDamageTalk__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_largeDamageTalk(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int reg_r26 = 0;
@@ -1985,7 +1889,6 @@ int daNpc_Kn_c::ECut_largeDamageTalk(int i_idx) {
     return rt;
 }
 
-/* 80A2E528-80A2E664 003C08 013C+00 5/0 0/0 0/0 .text            teach02_start__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach02_start(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2008,8 +1911,6 @@ int daNpc_Kn_c::teach02_start(void* param_0) {
     return 1;
 }
 
-/* 80A2E664-80A2EC04 003D44 05A0+00 1/0 0/0 0/0 .text            teach03_attackWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach03_attackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2126,8 +2027,6 @@ int daNpc_Kn_c::teach03_attackWait(void* param_0) {
     return 1;
 }
 
-/* 80A2EC04-80A2EF8C 0042E4 0388+00 1/0 0/0 0/0 .text            teach04_attackWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach04_attackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2208,7 +2107,6 @@ int daNpc_Kn_c::teach04_attackWait(void* param_0) {
     return 1;
 }
 
-/* 80A2EF8C-80A2F24C 00466C 02C0+00 1/0 0/0 0/0 .text teach04_headBreakWait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach04_headBreakWait(void* param_0) {
     s16 angle;
     switch (mMode) {
@@ -2265,8 +2163,6 @@ int daNpc_Kn_c::teach04_headBreakWait(void* param_0) {
     return 1;
 }
 
-/* 80A2F24C-80A2F600 00492C 03B4+00 1/0 0/0 0/0 .text            teach04_finishWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach04_finishWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2328,8 +2224,6 @@ int daNpc_Kn_c::teach04_finishWait(void* param_0) {
     return 1;
 }
 
-/* 80A2F600-80A2FBB4 004CE0 05B4+00 1/0 0/0 0/0 .text teach05_surpriseAttackWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach05_surpriseAttackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2451,7 +2345,6 @@ int daNpc_Kn_c::teach05_surpriseAttackWait(void* param_0) {
     return 1;
 }
 
-/* 80A2FBB4-80A2FC14 005294 0060+00 1/1 0/0 0/0 .text            s_sub6__FPvPv */
 static void* s_sub6(void* i_actor, void* i_other) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) {
         ((daNpc_Kn_c*)i_actor)->setActionMode(18);
@@ -2460,7 +2353,6 @@ static void* s_sub6(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80A2FC14-80A2FC80 0052F4 006C+00 2/2 0/0 0/0 .text            s_subEnd6__FPvPv */
 static void* s_subEnd6(void* i_actor, void* i_other) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other &&
         ((daNpc_Kn_c*)i_actor)->getActionMode() != 17)
@@ -2471,7 +2363,6 @@ static void* s_subEnd6(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80A2FC80-80A30398 005360 0718+00 1/0 0/0 0/0 .text teach06_superJumpWait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach06_superJumpWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2613,8 +2504,6 @@ int daNpc_Kn_c::teach06_superJumpWait(void* param_0) {
     return 1;
 }
 
-/* 80A30398-80A305A8 005A78 0210+00 1/0 0/0 0/0 .text            teach06_divideMove__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach06_divideMove(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2658,8 +2547,6 @@ int daNpc_Kn_c::teach06_divideMove(void* param_0) {
     return 1;
 }
 
-/* 80A305A8-80A30708 005C88 0160+00 1/0 0/0 0/0 .text            teach06_waitDivide__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach06_waitDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2686,8 +2573,6 @@ int daNpc_Kn_c::teach06_waitDivide(void* param_0) {
     return 1;
 }
 
-/* 80A30708-80A30D44 005DE8 063C+00 1/0 0/0 0/0 .text teach06_superJumpWaitDivide__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2814,8 +2699,6 @@ int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) {
     return 1;
 }
 
-/* 80A30D44-80A30EDC 006424 0198+00 1/0 0/0 0/0 .text teach06_superJumpedDivide__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach06_superJumpedDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2854,8 +2737,6 @@ int daNpc_Kn_c::teach06_superJumpedDivide(void* param_0) {
     return 1;
 }
 
-/* 80A30EDC-80A30F5C 0065BC 0080+00 1/0 0/0 0/0 .text            teach06_warpDelete__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach06_warpDelete(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2877,7 +2758,6 @@ int daNpc_Kn_c::teach06_warpDelete(void* param_0) {
     return 1;
 }
 
-/* 80A30F5C-80A30FBC 00663C 0060+00 1/1 0/0 0/0 .text            s_sub7__FPvPv */
 static void* s_sub7(void* i_actor, void* i_other) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) {
         ((daNpc_Kn_c*)i_actor)->setActionMode(24);
@@ -2886,7 +2766,6 @@ static void* s_sub7(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80A30FBC-80A31028 00669C 006C+00 2/2 0/0 0/0 .text            s_subEnd7__FPvPv */
 static void* s_subEnd7(void* i_actor, void* i_other) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other &&
         ((daNpc_Kn_c*)i_actor)->getActionMode() != 23)
@@ -2897,8 +2776,6 @@ static void* s_subEnd7(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80A31028-80A315D0 006708 05A8+00 1/0 0/0 0/0 .text teach07_superTurnAttackWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach07_superTurnAttackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3010,8 +2887,6 @@ int daNpc_Kn_c::teach07_superTurnAttackWait(void* param_0) {
     return 1;
 }
 
-/* 80A315D0-80A317F8 006CB0 0228+00 1/0 0/0 0/0 .text            teach07_divideMove__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach07_divideMove(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3058,8 +2933,6 @@ int daNpc_Kn_c::teach07_divideMove(void* param_0) {
     return 1;
 }
 
-/* 80A317F8-80A31958 006ED8 0160+00 1/0 0/0 0/0 .text            teach07_waitDivide__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach07_waitDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3086,8 +2959,6 @@ int daNpc_Kn_c::teach07_waitDivide(void* param_0) {
     return 1;
 }
 
-/* 80A31958-80A31E24 007038 04CC+00 1/0 0/0 0/0 .text
- * teach07_superTurnAttackWaitDivide__10daNpc_Kn_cFPv           */
 int daNpc_Kn_c::teach07_superTurnAttackWaitDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3186,8 +3057,6 @@ int daNpc_Kn_c::teach07_superTurnAttackWaitDivide(void* param_0) {
     return 1;
 }
 
-/* 80A31E24-80A31FBC 007504 0198+00 1/0 0/0 0/0 .text
- * teach07_superTurnAttackedDivide__10daNpc_Kn_cFPv             */
 int daNpc_Kn_c::teach07_superTurnAttackedDivide(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3226,8 +3095,6 @@ int daNpc_Kn_c::teach07_superTurnAttackedDivide(void* param_0) {
     return 1;
 }
 
-/* 80A31FBC-80A3203C 00769C 0080+00 1/0 0/0 0/0 .text            teach07_warpDelete__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach07_warpDelete(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3248,8 +3115,6 @@ int daNpc_Kn_c::teach07_warpDelete(void* param_0) {
     return 1;
 }
 
-/* 80A3203C-80A324C4 00771C 0488+00 3/0 0/0 0/0 .text            ECut_secondEncount__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_secondEncount(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int rt = 0;
@@ -3405,7 +3270,6 @@ int daNpc_Kn_c::ECut_secondEncount(int i_idx) {
     return rt;
 }
 
-/* 80A324C4-80A32D30 007BA4 086C+00 3/0 0/0 0/0 .text ECut_thirdSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_thirdSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
 
@@ -3590,8 +3454,6 @@ int daNpc_Kn_c::ECut_thirdSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A32D30-80A33358 008410 0628+00 3/0 0/0 0/0 .text            ECut_thirdSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -3727,7 +3589,6 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
     return rt;
 }
 
-/* 80A33358-80A33D80 008A38 0A28+00 3/0 0/0 0/0 .text ECut_fourthSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -3926,8 +3787,6 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A33D80-80A343A8 009460 0628+00 3/0 0/0 0/0 .text            ECut_fourthSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_fourthSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -4064,7 +3923,6 @@ int daNpc_Kn_c::ECut_fourthSkillGet(int i_idx) {
     return rt;
 }
 
-/* 80A343A8-80A34DB8 009A88 0A10+00 3/0 0/0 0/0 .text ECut_fifthSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -4261,8 +4119,6 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A34DB8-80A353E0 00A498 0628+00 3/0 0/0 0/0 .text            ECut_fifthSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_fifthSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -4399,7 +4255,6 @@ int daNpc_Kn_c::ECut_fifthSkillGet(int i_idx) {
     return rt;
 }
 
-/* 80A353E0-80A35D88 00AAC0 09A8+00 3/0 0/0 0/0 .text ECut_sixthSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -4596,8 +4451,6 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A35D88-80A363C0 00B468 0638+00 3/0 0/0 0/0 .text            ECut_sixthSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_sixthSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
 
@@ -4739,7 +4592,6 @@ int daNpc_Kn_c::ECut_sixthSkillGet(int i_idx) {
     return rt;
 }
 
-/* 80A363C0-80A36C20 00BAA0 0860+00 3/0 0/0 0/0 .text ECut_seventhSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -4931,7 +4783,6 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A36C20-80A372D0 00C300 06B0+00 3/0 0/0 0/0 .text ECut_seventhSkillGet__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_seventhSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp_0x8 = 0;
@@ -5084,7 +4935,6 @@ int daNpc_Kn_c::ECut_seventhSkillGet(int i_idx) {
     return rt;
 }
 
-/* 80A372D0-80A37430 00C9B0 0160+00 1/1 0/0 0/0 .text            setPrtcl__10daNpc_Kn_cFv */
 int daNpc_Kn_c::setPrtcl() {
     JPABaseEmitter* emitter = NULL;
     BOOL check = FALSE;
@@ -5129,7 +4979,6 @@ int daNpc_Kn_c::setPrtcl() {
     return 1;
 }
 
-/* 80A37430-80A37558 00CB10 0128+00 1/1 0/0 0/0 .text            setSlipPrtcl__10daNpc_Kn_cFv */
 int daNpc_Kn_c::setSlipPrtcl() {
     mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(0x1f));
     mDoMtx_stack_c::multVecZero(&mParticleMngr[0].mPos);
@@ -5147,8 +4996,6 @@ int daNpc_Kn_c::setSlipPrtcl() {
     return 1;
 }
 
-/* 80A37558-80A37598 00CC38 0040+00 12/12 0/0 0/0 .text            setLandingPrtcl__10daNpc_Kn_cFv
- */
 int daNpc_Kn_c::setLandingPrtcl() {
     mParticleMngr[2].mPos = current.pos;
     mParticleMngr[2].mAngle = mCurAngle;
@@ -5156,7 +5003,6 @@ int daNpc_Kn_c::setLandingPrtcl() {
     return 1;
 }
 
-/* 80A37598-80A37670 00CC78 00D8+00 1/1 0/0 0/0 .text            calcMagicBallPos__10daNpc_Kn_cFv */
 void daNpc_Kn_c::calcMagicBallPos() {
     fopAc_ac_c* actor;
 
@@ -5170,8 +5016,6 @@ void daNpc_Kn_c::calcMagicBallPos() {
     }
 }
 
-/* 80A37670-80A37B08 00CD50 0498+00 1/1 0/0 0/0 .text            setSwordChargePtcl__10daNpc_Kn_cFv
- */
 // NONMATCHING - reg alloc
 void daNpc_Kn_c::setSwordChargePtcl() {
     JPABaseEmitter* emitter;
@@ -5241,7 +5085,6 @@ void daNpc_Kn_c::setSwordChargePtcl() {
     }
 }
 
-/* 80A37B08-80A37D20 00D1E8 0218+00 13/13 0/0 0/0 .text            calcSlip__10daNpc_Kn_cFv */
 void daNpc_Kn_c::calcSlip() {
     if (field_0x15bc) {
         if (mAcch.ChkWallHit()) {
@@ -5269,8 +5112,6 @@ void daNpc_Kn_c::calcSlip() {
     }
 }
 
-/* 80A37D20-80A3805C 00D400 033C+00 9/9 0/0 0/0 .text            calcSwordAttackMove__10daNpc_Kn_cFi
- */
 void daNpc_Kn_c::calcSwordAttackMove(int param_0) {
     f32 temp_f31 = (daPy_getPlayerActorClass()->current.pos - current.pos).absXZ();
     if (cLib_calcTimer<s16>(&field_0x15d0) == 1 && field_0x15bc == 0) {
@@ -5305,7 +5146,6 @@ void daNpc_Kn_c::calcSwordAttackMove(int param_0) {
     }
 }
 
-/* 80A3805C-80A38450 00D73C 03F4+00 2/1 0/0 0/0 .text            setSe__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setSe() {
     if (field_0xe2c == 0) {
         switch (field_0x15A8) {
@@ -5384,27 +5224,22 @@ void daNpc_Kn_c::setSe() {
     }
 }
 
-/* 80A38450-80A38470 00DB30 0020+00 1/0 0/0 0/0 .text            daNpc_Kn_Create__FPv */
 static int daNpc_Kn_Create(void* i_this) {
     return ((daNpc_Kn_c*)i_this)->create();
 }
 
-/* 80A38470-80A38490 00DB50 0020+00 1/0 0/0 0/0 .text            daNpc_Kn_Delete__FPv */
 static int daNpc_Kn_Delete(void* i_this) {
     return ((daNpc_Kn_c*)i_this)->Delete();
 }
 
-/* 80A38490-80A384B0 00DB70 0020+00 1/0 0/0 0/0 .text            daNpc_Kn_Execute__FPv */
 static int daNpc_Kn_Execute(void* i_this) {
     return ((daNpc_Kn_c*)i_this)->Execute();
 }
 
-/* 80A384B0-80A384D0 00DB90 0020+00 1/0 0/0 0/0 .text            daNpc_Kn_Draw__FPv */
 static int daNpc_Kn_Draw(void* i_this) {
     return ((daNpc_Kn_c*)i_this)->Draw();
 }
 
-/* 80A384D0-80A384D8 00DBB0 0008+00 1/0 0/0 0/0 .text            daNpc_Kn_IsDelete__FPv */
 static int daNpc_Kn_IsDelete(void* i_this) {
     return 1;
 }
@@ -5413,14 +5248,12 @@ static int daNpc_Kn_IsDelete(void* i_this) {
 
 #include "d/actor/d_a_npc_kn_teach02.inc"
 
-/* 80A43148-80A43168 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kn_MethodTable */
 static actor_method_class daNpc_Kn_MethodTable = {
     (process_method_func)daNpc_Kn_Create,  (process_method_func)daNpc_Kn_Delete,
     (process_method_func)daNpc_Kn_Execute, (process_method_func)daNpc_Kn_IsDelete,
     (process_method_func)daNpc_Kn_Draw,
 };
 
-/* 80A43168-80A43198 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KN */
 extern actor_process_profile_definition g_profile_NPC_KN = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc
index e9b8d9e540..392b65fa26 100644
--- a/src/d/actor/d_a_npc_kn_base.inc
+++ b/src/d/actor/d_a_npc_kn_base.inc
@@ -2,8 +2,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_k_wmark.h"
 
-/* 80A38520-80A38550 00DC00 0030+00 1/1 0/0 0/0 .text
- * tgHitCallBack__10daNpc_Kn_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                                fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     daNpc_Kn_c* kn_actor = (daNpc_Kn_c*)i_tgActor;
@@ -19,31 +17,22 @@ void daNpc_Kn_c::tgHitCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
     kn_actor->setCutType(cut_type);
 }
 
-/* 80A38550-80A3858C 00DC30 003C+00 1/1 0/0 0/0 .text            getTrnsfrmAnmP__10daNpc_Kn_cFPCci
- */
 J3DAnmTransform* daNpc_Kn_c::getTrnsfrmAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80A3858C-80A385C8 00DC6C 003C+00 3/3 0/0 0/0 .text getTrnsfrmKeyAnmP__10daNpc_Kn_cFPCci */
 J3DAnmTransformKey* daNpc_Kn_c::getTrnsfrmKeyAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTransformKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80A385C8-80A38604 00DCA8 003C+00 1/1 0/0 0/0 .text            getTexPtrnAnmP__10daNpc_Kn_cFPCci
- */
 J3DAnmTexPattern* daNpc_Kn_c::getTexPtrnAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80A38604-80A38640 00DCE4 003C+00 1/1 0/0 0/0 .text            getTexSRTKeyAnmP__10daNpc_Kn_cFPCci
- */
 J3DAnmTextureSRTKey* daNpc_Kn_c::getTexSRTKeyAnmP(char const* i_arcName, int i_resIdx) {
     return (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_resIdx);
 }
 
-/* 80A38640-80A38684 00DD20 0044+00 1/1 0/0 0/0 .text
- * setBckAnm__10daNpc_Kn_cFP15J3DAnmTransformfiiib              */
 BOOL daNpc_Kn_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int i_startF,
                            int i_endF, bool i_modify) {
     s16 start_f = i_startF;
@@ -51,8 +40,6 @@ BOOL daNpc_Kn_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_speed, int i_mode, int
     return mBckAnm.init(i_bck, TRUE, i_mode, i_speed, start_f, end_f, i_modify);
 }
 
-/* 80A38684-80A3877C 00DD64 00F8+00 1/1 0/0 0/0 .text
- * setMcaMorfAnm__10daNpc_Kn_cFP18J3DAnmTransformKeyffiii       */
 int daNpc_Kn_c::setMcaMorfAnm(J3DAnmTransformKey* i_bck, f32 i_speed, f32 i_morf, int i_mode,
                               int i_start, int i_end) {
     f32 f_start = i_start;
@@ -67,21 +54,16 @@ int daNpc_Kn_c::setMcaMorfAnm(J3DAnmTransformKey* i_bck, f32 i_speed, f32 i_morf
     return 1;
 }
 
-/* 80A3877C-80A387BC 00DE5C 0040+00 1/1 0/0 0/0 .text
- * setBtpAnm__10daNpc_Kn_cFP16J3DAnmTexPatternP12J3DModelDatafi */
 BOOL daNpc_Kn_c::setBtpAnm(J3DAnmTexPattern* i_btp, J3DModelData* i_modelData, f32 i_speed,
                            int i_mode) {
     return mBtpAnm.init(i_modelData, i_btp, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 80A387BC-80A387FC 00DE9C 0040+00 1/1 0/0 0/0 .text
- * setBtkAnm__10daNpc_Kn_cFP19J3DAnmTextureSRTKeyP12J3DModelDatafi */
 BOOL daNpc_Kn_c::setBtkAnm(J3DAnmTextureSRTKey* i_btk, J3DModelData* i_modelData, f32 i_speed,
                            int i_mode) {
     return mBtkAnm.init(i_modelData, i_btk, TRUE, i_mode, i_speed, 0, -1);
 }
 
-/* 80A387FC-80A388B0 00DEDC 00B4+00 1/1 0/0 0/0 .text            loadRes__10daNpc_Kn_cFPCScPPCc */
 int daNpc_Kn_c::loadRes(const s8* i_ptrn_list, const char** i_arcname_list) {
     int phase;
     int resLoad_cnt = 0;
@@ -108,14 +90,12 @@ int daNpc_Kn_c::loadRes(const s8* i_ptrn_list, const char** i_arcname_list) {
     return cPhs_INIT_e;
 }
 
-/* 80A388B0-80A38930 00DF90 0080+00 1/1 0/0 0/0 .text            deleteRes__10daNpc_Kn_cFPCScPPCc */
 void daNpc_Kn_c::deleteRes(const s8* i_ptrn_list, const char** i_arcname_list) {
     for (int i = 0; i < 8 && i_ptrn_list[i] != -1; i++) {
         dComIfG_resDelete(&mPhase[i], i_arcname_list[i_ptrn_list[i]]);
     }
 }
 
-/* 80A38930-80A38BB8 00E010 0288+00 1/1 0/0 0/0 .text            execute__10daNpc_Kn_cFv */
 int daNpc_Kn_c::execute() {
     BOOL evt_proc = FALSE;
     setParam();
@@ -171,7 +151,6 @@ int daNpc_Kn_c::execute() {
     return 1;
 }
 
-/* 80A38BB8-80A38FAC 00E298 03F4+00 1/1 0/0 0/0 .text draw__10daNpc_Kn_cFiifP11_GXColorS10fiii */
 int daNpc_Kn_c::draw(BOOL param_0, BOOL i_setEffMtx, f32 param_2, GXColorS10* i_tevcolor, f32 param_4,
                      BOOL i_isDrawGhost, BOOL i_noShadow, BOOL i_simpleShadow) {
     J3DModel* model_p = mpModelMorf[0]->getModel();
@@ -268,20 +247,17 @@ int daNpc_Kn_c::draw(BOOL param_0, BOOL i_setEffMtx, f32 param_2, GXColorS10* i_
     return 1;
 }
 
-/* 80A38FAC-80A39008 00E68C 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80A39008-80A3904C 00E6E8 0044+00 2/2 0/0 0/0 .text            setRoomNo__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setRoomNo() {
     s8 room_id = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_id);
     mCcStts.SetRoomId(room_id);
 }
 
-/* 80A3904C-80A390F8 00E72C 00AC+00 1/1 0/0 0/0 .text            checkEndAnm__10daNpc_Kn_cFf */
 BOOL daNpc_Kn_c::checkEndAnm(f32 i_speed) {
     switch ((u8)mpModelMorf[0]->getPlayMode()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -296,7 +272,6 @@ BOOL daNpc_Kn_c::checkEndAnm(f32 i_speed) {
     }
 }
 
-/* 80A390F8-80A3917C 00E7D8 0084+00 1/1 0/0 0/0 .text checkEndAnm__10daNpc_Kn_cFP12J3DFrameCtrlf */
 BOOL daNpc_Kn_c::checkEndAnm(J3DFrameCtrl* i_frameCtrl, f32 i_speed) {
     switch (i_frameCtrl->getAttribute()) {
     case J3DFrameCtrl::EMode_LOOP:
@@ -311,7 +286,6 @@ BOOL daNpc_Kn_c::checkEndAnm(J3DFrameCtrl* i_frameCtrl, f32 i_speed) {
     }
 }
 
-/* 80A3917C-80A3949C 00E85C 0320+00 1/1 0/0 0/0 .text            playAllAnm__10daNpc_Kn_cFv */
 void daNpc_Kn_c::playAllAnm() {
     f32 play_speed;
     if (!(mAnmFlags & ANM_FLAG_4000)) {
@@ -427,7 +401,6 @@ void daNpc_Kn_c::playAllAnm() {
                         | ANM_PAUSE_BTP | ANM_FLAG_4000);
 }
 
-/* 80A3949C-80A39558 00EB7C 00BC+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpc_Kn_cFv */
 int daNpc_Kn_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         if (field_0xe30 != 0) {
@@ -457,7 +430,6 @@ int daNpc_Kn_c::ctrlBtk() {
     return 0;
 }
 
-/* 80A39558-80A395DC 00EC38 0084+00 1/1 0/0 0/0 .text            setMtx__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setMtx() {
     J3DModel* model_p = mpModelMorf[0]->getModel();
     J3DModelData* mdlData_p = model_p->getModelData();
@@ -475,7 +447,6 @@ void daNpc_Kn_c::setMtx() {
     mpModelMorf[0]->modelCalc();
 }
 
-/* 80A395DC-80A39684 00ECBC 00A8+00 1/1 0/0 0/0 .text            ctrlFaceMotion__10daNpc_Kn_cFv */
 void daNpc_Kn_c::ctrlFaceMotion() {
     int motionNo;
     f32 morfFrm;
@@ -497,7 +468,6 @@ void daNpc_Kn_c::ctrlFaceMotion() {
     }
 }
 
-/* 80A39684-80A39738 00ED64 00B4+00 1/1 0/0 0/0 .text            ctrlMotion__10daNpc_Kn_cFv */
 void daNpc_Kn_c::ctrlMotion() {
     int motionNo;
     f32 morfFrm;
@@ -520,8 +490,6 @@ void daNpc_Kn_c::ctrlMotion() {
     }
 }
 
-/* 80A39738-80A3989C 00EE18 0164+00 1/1 0/0 0/0 .text ctrlMsgAnm__10daNpc_Kn_cFPiPiP10fopAc_ac_ci
- */
 int daNpc_Kn_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i_talkPartner_p, int param_3) {
     *o_faceAnmAttr_p = -1;
     *o_anmAttr_p = -1;
@@ -569,8 +537,6 @@ int daNpc_Kn_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i
     return field_0xddc;
 }
 
-/* 80A3989C-80A39BBC 00EF7C 0320+00 1/0 0/0 0/0 .text ctrlJoint__10daNpc_Kn_cFP8J3DJointP8J3DModel
- */
 int daNpc_Kn_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int joint_no = my_joint->getJntNo();
@@ -634,7 +600,6 @@ int daNpc_Kn_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A39BBC-80A39DBC 00F29C 0200+00 1/0 0/0 0/0 .text            evtProc__10daNpc_Kn_cFv */
 int daNpc_Kn_c::evtProc() {
     BOOL ret = FALSE;
 
@@ -691,7 +656,6 @@ int daNpc_Kn_c::evtProc() {
     return ret;
 }
 
-/* 80A39DBC-80A39F84 00F49C 01C8+00 1/0 0/0 0/0 .text            setFootPos__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setFootPos() {
     if (getFootLJointNo() >= 0) {
         mOldFootLOffset = mFootLOffset;
@@ -713,8 +677,6 @@ void daNpc_Kn_c::setFootPos() {
     }
 }
 
-/* 80A39F84-80A3A254 00F664 02D0+00 1/0 0/0 0/0 .text            setFootPrtcl__10daNpc_Kn_cFP4cXyzf
- */
 void daNpc_Kn_c::setFootPrtcl(cXyz* param_0, f32 param_1) {
     cXyz foot_l_pos(mFootLPos);
     cXyz foot_r_pos(mFootRPos);
@@ -780,13 +742,11 @@ void daNpc_Kn_c::setFootPrtcl(cXyz* param_0, f32 param_1) {
     mFootROnGround = cross_r;
 }
 
-/* 80A3A254-80A3A25C 00F934 0008+00 1/0 0/0 0/0 .text            checkCullDraw__10daNpc_Kn_cFv */
 bool daNpc_Kn_c::checkCullDraw() {
     bool ret = false;
     return ret;
 }
 
-/* 80A3A25C-80A3A2A8 00F93C 004C+00 1/0 0/0 0/0 .text            twilight__10daNpc_Kn_cFv */
 void daNpc_Kn_c::twilight() {
     if (mTwilight) {
         attention_info.flags |= fopAc_AttnFlag_UNK_0x400000;
@@ -796,7 +756,6 @@ void daNpc_Kn_c::twilight() {
     }
 }
 
-/* 80A3A2A8-80A3A404 00F988 015C+00 1/0 0/0 0/0 .text            evtOrder__10daNpc_Kn_cFv */
 void daNpc_Kn_c::evtOrder() {
     if (strlen(mpEventData[mEvtNo].eventName) != 0) {
         if (strlen(mpArcNames[mpEventData[mEvtNo].num])) {
@@ -822,7 +781,6 @@ void daNpc_Kn_c::evtOrder() {
     }
 }
 
-/* 80A3A404-80A3A504 00FAE4 0100+00 1/1 0/0 0/0 .text            evtChange__10daNpc_Kn_cFv */
 void daNpc_Kn_c::evtChange() {
     if (strlen(mpEventData[mEvtNo].eventName) != 0) {
         if (strlen(mpArcNames[mpEventData[mEvtNo].num])) {
@@ -836,7 +794,6 @@ void daNpc_Kn_c::evtChange() {
     }
 }
 
-/* 80A3A504-80A3A568 00FBE4 0064+00 1/0 0/0 0/0 .text            clrParam__10daNpc_Kn_cFv */
 void daNpc_Kn_c::clrParam() {
     field_0xDB2 = mCurAngle;
     mCutType = 0;
@@ -844,8 +801,6 @@ void daNpc_Kn_c::clrParam() {
     mJntAnm.clrDirectFlag();
 }
 
-/* 80A3A568-80A3A7C0 00FC48 0258+00 2/2 0/0 0/0 .text            setFaceMotionAnm__10daNpc_Kn_cFib
- */
 bool daNpc_Kn_c::setFaceMotionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* bck = NULL;
     J3DAnmTexPattern* btp = NULL;
@@ -894,7 +849,6 @@ bool daNpc_Kn_c::setFaceMotionAnm(int i_idx, bool i_modify) {
     return afterSetFaceMotionAnm(i_idx, anm_data.mBckAttr, 0.0f, anm_data.mBtpAttr);
 }
 
-/* 80A3A7C0-80A3AA58 00FEA0 0298+00 2/2 0/0 0/0 .text            setMotionAnm__10daNpc_Kn_cFifi */
 bool daNpc_Kn_c::setMotionAnm(int i_idx, f32 i_morf, BOOL i_restart) {
     J3DAnmTransformKey* bck = NULL;
     J3DAnmTextureSRTKey* btk = NULL;
@@ -953,7 +907,6 @@ bool daNpc_Kn_c::setMotionAnm(int i_idx, f32 i_morf, BOOL i_restart) {
     return afterSetMotionAnm(i_idx, anm_data.mBckAttr, i_morf, anm_data.mBtkAttr);
 }
 
-/* 80A3AA58-80A3AAF0 010138 0098+00 10/10 0/0 0/0 .text            setPos__10daNpc_Kn_cF4cXyz */
 void daNpc_Kn_c::setPos(cXyz i_pos) {
     i_pos.y += 500.0f;
     mGndChk.SetPos(&i_pos);
@@ -964,7 +917,6 @@ void daNpc_Kn_c::setPos(cXyz i_pos) {
     old.pos = current.pos;
 }
 
-/* 80A3AAF0-80A3AB18 0101D0 0028+00 35/35 0/0 0/0 .text            setAngle__10daNpc_Kn_cFs */
 void daNpc_Kn_c::setAngle(s16 i_angle) {
     current.angle.y = i_angle;
     shape_angle.y = current.angle.y;
@@ -973,8 +925,6 @@ void daNpc_Kn_c::setAngle(s16 i_angle) {
     old.angle.y = current.angle.y;
 }
 
-/* 80A3AB18-80A3AC24 0101F8 010C+00 1/1 0/0 0/0 .text
- * chkActorInSight__10daNpc_Kn_cFP10fopAc_ac_cfs                */
 BOOL daNpc_Kn_c::chkActorInSight(fopAc_ac_c* actor, f32 i_fovY, s16 i_angleY) {
     if (i_fovY < 180.0f) {
         s16 fov_s = cM_deg2s(i_fovY);
@@ -992,8 +942,6 @@ BOOL daNpc_Kn_c::chkActorInSight(fopAc_ac_c* actor, f32 i_fovY, s16 i_angleY) {
     return TRUE;
 }
 
-/* 80A3AC24-80A3ACD4 010304 00B0+00 1/1 0/0 0/0 .text chkPointInArea__10daNpc_Kn_cF4cXyz4cXyzfffs
- */
 BOOL daNpc_Kn_c::chkPointInArea(cXyz i_pos, cXyz i_center, f32 i_boundXZ, f32 i_boundY1, f32 i_boundY2,
                                 s16 i_angle) {
     cXyz bounds, center;
@@ -1010,13 +958,10 @@ BOOL daNpc_Kn_c::chkPointInArea(cXyz i_pos, cXyz i_center, f32 i_boundXZ, f32 i_
     return chkPointInArea(i_pos, center, bounds, i_angle);
 }
 
-/* 80A3ACD4-80A3AD50 0103B4 007C+00 1/1 0/0 0/0 .text
- * chkPointInArea__10daNpc_Kn_cF4cXyz4cXyz4cXyzs                */
 BOOL daNpc_Kn_c::chkPointInArea(cXyz i_pos, cXyz i_center, cXyz i_bounds, s16 i_angle) {
     return daNpcT_chkPointInArea(i_pos, i_center, i_bounds, i_angle, TRUE);
 }
 
-/* 80A3AD50-80A3AF50 010430 0200+00 1/1 0/0 0/0 .text            chkFindPlayer__10daNpc_Kn_cFis */
 int daNpc_Kn_c::chkFindPlayer(BOOL i_release, s16 i_angleY) {
     cXyz attn_pos = getAttnPos(daPy_getPlayerActorClass());
 
@@ -1053,7 +998,6 @@ int daNpc_Kn_c::chkFindPlayer(BOOL i_release, s16 i_angleY) {
     return FALSE;
 }
 
-/* 80A3AF64-80A3B000 010644 009C+00 1/1 0/0 0/0 .text            srchPlayerActor__10daNpc_Kn_cFv */
 BOOL daNpc_Kn_c::srchPlayerActor() {
     if (mActorMngr1.getActorP() != NULL) {
         if (!chkFindPlayer(TRUE, mCurAngle.y)) {
@@ -1068,7 +1012,6 @@ BOOL daNpc_Kn_c::srchPlayerActor() {
     return mActorMngr1.getActorP() != NULL;
 }
 
-/* 80A3B000-80A3B074 0106E0 0074+00 2/2 0/0 0/0 .text getAttnPos__10daNpc_Kn_cFP10fopAc_ac_c */
 cXyz daNpc_Kn_c::getAttnPos(fopAc_ac_c* i_actor) {
     cXyz attn_pos(i_actor->attention_info.position);
 
@@ -1079,7 +1022,6 @@ cXyz daNpc_Kn_c::getAttnPos(fopAc_ac_c* i_actor) {
     return attn_pos;
 }
 
-/* 80A3B074-80A3B220 010754 01AC+00 1/1 0/0 0/0 .text            turn__10daNpc_Kn_cFsii */
 BOOL daNpc_Kn_c::turn(s16 i_angle, int i_count, int i_direction) {
     if (mTurnAmount == 0) {
         mTurnCount = fabsf(cM_sht2d((s16)(i_angle - mStartAngle)));
@@ -1114,7 +1056,6 @@ BOOL daNpc_Kn_c::turn(s16 i_angle, int i_count, int i_direction) {
     return i_angle == mCurAngle.y;
 }
 
-/* 80A3B220-80A3B3E8 010900 01C8+00 19/19 0/0 0/0 .text            step__10daNpc_Kn_cFsiiii */
 int daNpc_Kn_c::step(s16 i_angle, int i_faceMotion, int i_motion, int i_turnCount,
                      int i_turnDirection) {
     if (mStepMode >= 2 && i_angle != mCurAngle.y) {
@@ -1152,7 +1093,6 @@ int daNpc_Kn_c::step(s16 i_angle, int i_faceMotion, int i_motion, int i_turnCoun
     return mStepMode > 1;
 }
 
-/* 80A3B3E8-80A3B448 010AC8 0060+00 20/20 0/0 0/0 .text initTalk__10daNpc_Kn_cFiPP10fopAc_ac_c */
 int daNpc_Kn_c::initTalk(int i_flowID, fopAc_ac_c** i_partnerList_p) {
     mFlow.init(this, i_flowID, 0, i_partnerList_p);
     speedF = 0.0f;
@@ -1160,8 +1100,6 @@ int daNpc_Kn_c::initTalk(int i_flowID, fopAc_ac_c** i_partnerList_p) {
     return 1;
 }
 
-/* 80A3B448-80A3B5EC 010B28 01A4+00 20/20 0/0 0/0 .text talkProc__10daNpc_Kn_cFPiiPP10fopAc_ac_ci
- */
 BOOL daNpc_Kn_c::talkProc(int* param_0, int param_1, fopAc_ac_c** i_partnerList_p, int param_3) {
     BOOL ret = FALSE;
 
@@ -1228,7 +1166,6 @@ static f32 dummy_lits_01(int sel) {
     }
 }
 
-/* 80A3B5EC-80A3B708 010CCC 011C+00 1/1 0/0 0/0 .text            setHitodamaPrtcl__10daNpc_Kn_cFv */
 void daNpc_Kn_c::setHitodamaPrtcl() {
     JPABaseEmitter* emitter = NULL;
     cXyz pos(eyePos);
@@ -1246,7 +1183,6 @@ void daNpc_Kn_c::setHitodamaPrtcl() {
     }
 }
 
-/* 80A3B708-80A3B720 010DE8 0018+00 1/0 0/0 0/0 .text            decTmr__10daNpc_Kn_cFv */
 void daNpc_Kn_c::decTmr() {
     if (mTimer != 0) {
         mTimer--;
diff --git a/src/d/actor/d_a_npc_kn_teach01.inc b/src/d/actor/d_a_npc_kn_teach01.inc
index dc17d2fc7e..711d011846 100644
--- a/src/d/actor/d_a_npc_kn_teach01.inc
+++ b/src/d/actor/d_a_npc_kn_teach01.inc
@@ -1,6 +1,5 @@
 #include "d/actor/d_a_npc_kn.h"
 
-/* 80A3C998-80A3CB14 012078 017C+00 1/1 0/0 0/0 .text            setParamTeach01__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach01() {
     s16 talk_distance = mpHIO->m.common.talk_distance;
     s16 talk_angle = mpHIO->m.common.talk_angle;
@@ -39,8 +38,6 @@ u32 daNpc_Kn_c::setParamTeach01() {
     return (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 }
 
-/* 80A3CB14-80A3CBFC 0121F4 00E8+00 1/1 0/0 0/0 .text            setCollisionTeach01__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach01() {
     switch (mActionMode) {
     case 0:
@@ -73,7 +70,6 @@ void daNpc_Kn_c::setCollisionTeach01() {
     }
 }
 
-/* 80A3CBFC-80A3CCC0 0122DC 00C4+00 1/1 0/0 0/0 .text teach01_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach01_selectAction() {
     switch (mActionMode) {
     case 0:
@@ -94,7 +90,6 @@ void daNpc_Kn_c::teach01_selectAction() {
     return;
 }
 
-/* 80A3CCC0-80A3CDFC 0123A0 013C+00 1/0 0/0 0/0 .text            teach01_start__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach01_start(void* param_0) {
     switch (mMode) {
     case 0:
@@ -114,8 +109,6 @@ int daNpc_Kn_c::teach01_start(void* param_0) {
     }
 }
 
-/* 80A3CDFC-80A3CF78 0124DC 017C+00 1/0 0/0 0/0 .text            teach01_attackWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach01_attackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -142,7 +135,6 @@ int daNpc_Kn_c::teach01_attackWait(void* param_0) {
     }
 }
 
-/* 80A3CF78-80A3D32C 012658 03B4+00 1/0 0/0 0/0 .text teach01_swordAttackWait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach01_swordAttackWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -228,7 +220,6 @@ int daNpc_Kn_c::teach01_swordAttackWait(void* param_0) {
     return 1;
 }
 
-/* 80A3D32C-80A3D6D8 012A0C 03AC+00 1/0 0/0 0/0 .text teach01_swordFinishWait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach01_swordFinishWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -299,7 +290,6 @@ int daNpc_Kn_c::teach01_swordFinishWait(void* param_0) {
     return 1;
 }
 
-/* 80A3D6D8-80A3DCEC 012DB8 0614+00 3/3 0/0 0/0 .text            ctrlWarp__10daNpc_Kn_cFv */
 int daNpc_Kn_c::ctrlWarp() {
     int sp28 = 0;
 
@@ -421,8 +411,6 @@ int daNpc_Kn_c::ctrlWarp() {
     return sp28;
 }
 
-/* 80A3DCEC-80A3DEC4 0133CC 01D8+00 1/0 0/0 0/0 .text            ECut_firstEncount__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_firstEncount(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
 
@@ -482,8 +470,6 @@ int daNpc_Kn_c::ECut_firstEncount(int i_idx) {
     return rt;
 }
 
-/* 80A3DEC4-80A3E550 0135A4 068C+00 1/0 0/0 0/0 .text            ECut_attackFailed__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_attackFailed(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -619,8 +605,6 @@ int daNpc_Kn_c::ECut_attackFailed(int i_idx) {
     return rt;
 }
 
-/* 80A3E550-80A3EB84 013C30 0634+00 3/0 0/0 0/0 .text            ECut_firstSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_firstSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
diff --git a/src/d/actor/d_a_npc_kn_teach02.inc b/src/d/actor/d_a_npc_kn_teach02.inc
index 41e93df929..e5cd876767 100644
--- a/src/d/actor/d_a_npc_kn_teach02.inc
+++ b/src/d/actor/d_a_npc_kn_teach02.inc
@@ -1,7 +1,6 @@
 #include "d/actor/d_a_npc_kn.h"
 #include "d/actor/d_a_obj_knBullet.h"
 
-/* 80A3EB84-80A3EE38 014264 02B4+00 1/1 0/0 0/0 .text            setParamTeach02__10daNpc_Kn_cFv */
 u32 daNpc_Kn_c::setParamTeach02() {
     s16 talk_distance = mpHIO->m.common.talk_distance;
     s16 talk_angle = mpHIO->m.common.talk_angle;
@@ -44,8 +43,6 @@ u32 daNpc_Kn_c::setParamTeach02() {
     return (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
 }
 
-/* 80A3EE38-80A3EF1C 014518 00E4+00 1/1 0/0 0/0 .text            setCollisionTeach02__10daNpc_Kn_cFv
- */
 void daNpc_Kn_c::setCollisionTeach02() {
     switch (mActionMode) {
     case 4:
@@ -76,7 +73,6 @@ void daNpc_Kn_c::setCollisionTeach02() {
     }
 }
 
-/* 80A3EF1C-80A3EFE0 0145FC 00C4+00 1/1 0/0 0/0 .text teach02_selectAction__10daNpc_Kn_cFv */
 void daNpc_Kn_c::teach02_selectAction() {
     switch (mActionMode) {
     case 4:
@@ -97,7 +93,6 @@ void daNpc_Kn_c::teach02_selectAction() {
     return;
 }
 
-/* 80A3EFE0-80A3F358 0146C0 0378+00 1/0 0/0 0/0 .text teach02_shieldBashWait__10daNpc_Kn_cFPv */
 int daNpc_Kn_c::teach02_shieldBashWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -176,8 +171,6 @@ int daNpc_Kn_c::teach02_shieldBashWait(void* param_0) {
     return 1;
 }
 
-/* 80A3F358-80A3F5A4 014A38 024C+00 1/0 0/0 0/0 .text            teach02_finishWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach02_finishWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -227,8 +220,6 @@ int daNpc_Kn_c::teach02_finishWait(void* param_0) {
     return 1;
 }
 
-/* 80A3F5A4-80A3F99C 014C84 03F8+00 1/0 0/0 0/0 .text teach02_shieldReflectWait__10daNpc_Kn_cFPv
- */
 int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) {
 
     switch (mMode) {
@@ -303,7 +294,6 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) {
     return 1;
 }
 
-/* 80A3F99C-80A3FFB4 01507C 0618+00 3/0 0/0 0/0 .text ECut_secondSkillExplain__10daNpc_Kn_cFi */
 int daNpc_Kn_c::ECut_secondSkillExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -441,8 +431,6 @@ int daNpc_Kn_c::ECut_secondSkillExplain(int i_idx) {
     return rt;
 }
 
-/* 80A3FFB4-80A403B8 015694 0404+00 1/0 0/0 0/0 .text            ECut_reflectExplain__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_reflectExplain(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
@@ -533,8 +521,6 @@ int daNpc_Kn_c::ECut_reflectExplain(int i_idx) {
     return rt;
 }
 
-/* 80A403B8-80A408B4 015A98 04FC+00 2/0 0/0 0/0 .text            ECut_secondSkillGet__10daNpc_Kn_cFi
- */
 int daNpc_Kn_c::ECut_secondSkillGet(int i_idx) {
     dEvent_manager_c* event_manager = &dComIfGp_getEventManager();
     int sp8 = 0;
diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp
index 1588a962fa..2f8f8c77d1 100644
--- a/src/d/actor/d_a_npc_knj.cpp
+++ b/src/d/actor/d_a_npc_knj.cpp
@@ -82,42 +82,34 @@ enum Motion {
     /* 0x00 */ MOT_UNK_0 = 0,
 };
 
-/* 80A455F0-80A455F8 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {9, 1},
 };
 
-/* 80A455F8-80A45608 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80A45608-80A45610 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Knj",
 };
 
-/* 80A45610-80A45614 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80A45614-80A4562C -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
 };
 
-/* 80A4562C-80A45648 00005C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, 0, 0, -1, 0, 0, 0},
 };
 
-/* 80A45648-80A45664 000078 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {6, 2, 1, -1, 0, 0, 0, 0},
 };
 
-/* 80A45664-80A45674 000094 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -125,7 +117,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 80A45674-80A45684 0000A4 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, 0, 0},
     {-1, 0, 0},
@@ -133,18 +124,14 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
 };
 
-/* 80A45684-80A45688 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Knj_c */
 char* daNpc_Knj_c::mCutNameList[1] = {""};
 
-/* 80A45688-80A45694 0000B8 000C+00 2/2 0/0 0/0 .data            mCutList__11daNpc_Knj_c */
 daNpc_Knj_c::cutFunc daNpc_Knj_c::mCutList[1] = {
     NULL,
 };
 
-/* 80A4589C-80A458A0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_KNJ_HIO_CLASS l_HIO;
 
-/* 80A4356C-80A43608 0000EC 009C+00 1/0 0/0 0/0 .text            __dt__11daNpc_Knj_cFv */
 daNpc_Knj_c::~daNpc_Knj_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -152,7 +139,6 @@ daNpc_Knj_c::~daNpc_Knj_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A43608-80A43848 000188 0240+00 1/1 0/0 0/0 .text            create__11daNpc_Knj_cFv */
 int daNpc_Knj_c::create() {
     daNpcT_ct(this, daNpc_Knj_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
               l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -191,7 +177,6 @@ int daNpc_Knj_c::create() {
     return rv;
 }
 
-/* 80A43848-80A439A0 0003C8 0158+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Knj_cFv */
 int daNpc_Knj_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(
         dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
@@ -217,19 +202,16 @@ int daNpc_Knj_c::CreateHeap() {
     return 0;
 }
 
-/* 80A439A0-80A439D4 000520 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Knj_cFv */
 int daNpc_Knj_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Knj_c();
     return 1;
 }
 
-/* 80A439D4-80A439F4 000554 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Knj_cFv */
 int daNpc_Knj_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A439F4-80A43A88 000574 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Knj_cFv */
 int daNpc_Knj_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -238,13 +220,10 @@ int daNpc_Knj_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
 }
 
-/* 80A43A88-80A43AA8 000608 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Knj_cFP10fopAc_ac_c              */
 int daNpc_Knj_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Knj_c*>(i_this)->CreateHeap();
 }
 
-/* 80A43AA8-80A43B1C 000628 0074+00 1/1 0/0 0/0 .text            getType__11daNpc_Knj_cFv */
 u8 daNpc_Knj_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -263,7 +242,6 @@ u8 daNpc_Knj_c::getType() {
     return TYPE_0;
 }
 
-/* 80A43B1C-80A43B38 00069C 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__11daNpc_Knj_cFv */
 int daNpc_Knj_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -272,12 +250,10 @@ int daNpc_Knj_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80A43B38-80A43B40 0006B8 0008+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Knj_cFv */
 BOOL daNpc_Knj_c::isDelete() {
     return FALSE;
 }
 
-/* 80A43B40-80A43C64 0006C0 0124+00 1/1 0/0 0/0 .text            reset__11daNpc_Knj_cFv */
 void daNpc_Knj_c::reset() {
     initialize();
 
@@ -290,7 +266,6 @@ void daNpc_Knj_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A43C64-80A43D58 0007E4 00F4+00 1/0 0/0 0/0 .text            setParam__11daNpc_Knj_cFv */
 void daNpc_Knj_c::setParam() {
     selectAction();
     srchActors();
@@ -319,10 +294,8 @@ void daNpc_Knj_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 80A43D58-80A43D5C 0008D8 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Knj_cFv */
 void daNpc_Knj_c::srchActors() {}
 
-/* 80A43D5C-80A43E5C 0008DC 0100+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Knj_cFv */
 BOOL daNpc_Knj_c::evtTalk() {
     if (chkAction(&daNpc_Knj_c::talk)) {
         (this->*mAction)(NULL);
@@ -341,7 +314,6 @@ BOOL daNpc_Knj_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A43E5C-80A43F24 0009DC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Knj_cFv */
 BOOL daNpc_Knj_c::evtCutProc() {
     BOOL rv = FALSE;
 
@@ -359,7 +331,6 @@ BOOL daNpc_Knj_c::evtCutProc() {
     return rv;
 }
 
-/* 80A43F24-80A43FAC 000AA4 0088+00 1/0 0/0 0/0 .text            action__11daNpc_Knj_cFv */
 void daNpc_Knj_c::action() {
     if (mNextAction != NULL) {
         if (mAction == mNextAction) {
@@ -370,26 +341,22 @@ void daNpc_Knj_c::action() {
     }
 }
 
-/* 80A43FAC-80A44024 000B2C 0078+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Knj_cFv */
 void daNpc_Knj_c::beforeMove() {
     if (checkHide() || mNoDraw != 0) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A44024-80A44080 000BA4 005C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Knj_cFv */
 void daNpc_Knj_c::setAttnPos() {
     setMtx();
     eyePos = current.pos;
     attention_info.position = current.pos;
 }
 
-/* 80A44080-80A44088 000C00 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Knj_cFv */
 BOOL daNpc_Knj_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A44088-80A44264 000C08 01DC+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Knj_cFiifi */
 bool daNpc_Knj_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     static struct {
         int field_0x0;
@@ -445,7 +412,6 @@ bool daNpc_Knj_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int p
     return 1;
 }
 
-/* 80A44264-80A442D0 000DE4 006C+00 1/0 0/0 0/0 .text            drawGhost__11daNpc_Knj_cFv */
 void daNpc_Knj_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(5, &current.pos, &tevStr);
@@ -453,21 +419,16 @@ void daNpc_Knj_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80A442D0-80A44318 000E50 0048+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Knj_cFv */
 int daNpc_Knj_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_Knj_c::wait;
     return 1;
 }
 
-/* 80A44318-80A44344 000E98 002C+00 1/1 0/0 0/0 .text
- * chkAction__11daNpc_Knj_cFM11daNpc_Knj_cFPCvPvPv_i            */
 BOOL daNpc_Knj_c::chkAction(actionFunc param_0) {
     return mAction == param_0;
 }
 
-/* 80A44344-80A443EC 000EC4 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Knj_cFM11daNpc_Knj_cFPCvPvPv_i            */
 int daNpc_Knj_c::setAction(actionFunc param_0) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -483,7 +444,6 @@ int daNpc_Knj_c::setAction(actionFunc param_0) {
     return 1;
 }
 
-/* 80A443EC-80A44598 000F6C 01AC+00 1/0 0/0 0/0 .text            wait__11daNpc_Knj_cFPv */
 int daNpc_Knj_c::wait(void* param_0) {
     BOOL uVar2;
 
@@ -514,7 +474,6 @@ int daNpc_Knj_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A44598-80A446FC 001118 0164+00 2/0 0/0 0/0 .text            talk__11daNpc_Knj_cFPv */
 int daNpc_Knj_c::talk(void* param_0) {
     BOOL bVar1 = FALSE;
 
@@ -547,39 +506,32 @@ int daNpc_Knj_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A446FC-80A4471C 00127C 0020+00 1/0 0/0 0/0 .text            daNpc_Knj_Create__FPv */
 static int daNpc_Knj_Create(void* i_this) {
     return static_cast<daNpc_Knj_c*>(i_this)->create();
 }
 
-/* 80A4471C-80A4473C 00129C 0020+00 1/0 0/0 0/0 .text            daNpc_Knj_Delete__FPv */
 static int daNpc_Knj_Delete(void* i_this) {
     return static_cast<daNpc_Knj_c*>(i_this)->Delete();
 }
 
-/* 80A4473C-80A4475C 0012BC 0020+00 1/0 0/0 0/0 .text            daNpc_Knj_Execute__FPv */
 static int daNpc_Knj_Execute(void* i_this) {
     return static_cast<daNpc_Knj_c*>(i_this)->Execute();
 }
 
-/* 80A4475C-80A4477C 0012DC 0020+00 1/0 0/0 0/0 .text            daNpc_Knj_Draw__FPv */
 static int daNpc_Knj_Draw(void* i_this) {
     return static_cast<daNpc_Knj_c*>(i_this)->Draw();
 }
 
-/* 80A4477C-80A44784 0012FC 0008+00 1/0 0/0 0/0 .text            daNpc_Knj_IsDelete__FPv */
 static int daNpc_Knj_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A456F0-80A45710 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Knj_MethodTable */
 static actor_method_class daNpc_Knj_MethodTable = {
     (process_method_func)daNpc_Knj_Create,  (process_method_func)daNpc_Knj_Delete,
     (process_method_func)daNpc_Knj_Execute, (process_method_func)daNpc_Knj_IsDelete,
     (process_method_func)daNpc_Knj_Draw,
 };
 
-/* 80A45710-80A45740 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KNJ */
 extern actor_process_profile_definition g_profile_NPC_KNJ = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp
index 8cd2621a24..b25da3e05c 100644
--- a/src/d/actor/d_a_npc_kolin.cpp
+++ b/src/d/actor/d_a_npc_kolin.cpp
@@ -166,14 +166,12 @@ enum Event {
     /* 0x8 */ EVENT_CLOTH_TRY,
 };
 
-/* 8055A8E8-8055A900 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {BMDR_KOLIN, KOLIN},
     {BMDR_KOLIN_TW, KOLIN_TW},
     {BMDR_KOLIN_CLOTH, KOLIN2},
 };
 
-/* 8055A900-8055A948 -00001 0048+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[9] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -186,7 +184,6 @@ static daNpcT_evtData_c l_evtList[9] = {
     {"CLOTH_TRY", 3},
 };
 
-/* 8055A948-8055A968 -00001 0020+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[8] = {
     "",
     "Kolin",
@@ -198,37 +195,30 @@ static char* l_resNameList[8] = {
     "Taro1",
 };
 
-/* 8055A968-8055A96C 0000A0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     KOLIN, KOLIN1, -1,
 };
 
-/* 8055A96C-8055A970 0000A4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     KOLIN, KOLIN_TW, -1,
 };
 
-/* 8055A970-8055A974 0000A8 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {
     KOLIN, KOLIN2, -1,
 };
 
-/* 8055A974-8055A97C 0000AC 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[5] = {
     KOLIN, KOLIN1, KOLIN2, KOLIN_TW, -1,
 };
 
-/* 8055A97C-8055A980 0000B4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[3] = {
     KOLIN, KOLIN_P1, -1,
 };
 
-/* 8055A980-8055A988 0000B8 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {
     KOLIN, KOLIN1, KOLIN2, KOLIN_TW, -1,
 };
 
-/* 8055A988-8055A9C4 -00001 003C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[15] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
@@ -236,7 +226,6 @@ static s8* l_loadResPtrnList[15] = {
     l_loadResPtrn0, l_loadResPtrn4, l_loadResPtrn9,
 };
 
-/* 8055A9C4-8055AB4C 0000FC 0188+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_KOLIN, J3DFrameCtrl::EMode_LOOP, KOLIN, 1},
     {BCK_KOLIN_F_WALK_A, J3DFrameCtrl::EMode_LOOP, KOLIN1, BTP_KOLIN_F_WALK_A, J3DFrameCtrl::EMode_LOOP, KOLIN1, 0},
@@ -254,7 +243,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {BCK_KOLIN_F_CLUP, J3DFrameCtrl::EMode_NONE, KOLIN1, BTP_KOLIN_F_CLUP, J3DFrameCtrl::EMode_NONE, KOLIN1, 0},
 };
 
-/* 8055AB4C-8055AD98 000284 024C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {BCK_KOLIN_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLIN, BTK_KOLIN, J3DFrameCtrl::EMode_NONE, KOLIN, 1, 0},
     {BCK_KOLIN_WAIT_B, J3DFrameCtrl::EMode_LOOP, KOLIN1, BTK_KOLIN, J3DFrameCtrl::EMode_NONE, KOLIN, 1, 0},
@@ -279,7 +267,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {BCK_KOLIN_CLOTH_TRY, J3DFrameCtrl::EMode_NONE, KOLIN2, BTK_KOLIN_CLOTH_TRY, J3DFrameCtrl::EMode_NONE, KOLIN2, 0, 0},
 };
 
-/* 8055AD98-8055AE78 0004D0 00E0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {
     {10, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -297,7 +284,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 8055AE78-8055AFB8 0005B0 0140+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -335,7 +321,6 @@ char* daNpc_Kolin_c::mCutNameList[11] = {
     "THANK_YOU",
 };
 
-/* 8055B05C-8055B0E0 000794 0084+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Kolin_c */
 daNpc_Kolin_c::cutFunc daNpc_Kolin_c::mCutList[11] = {
     NULL,
     &daNpc_Kolin_c::cutNoRide,
@@ -350,7 +335,6 @@ daNpc_Kolin_c::cutFunc daNpc_Kolin_c::mCutList[11] = {
     &daNpc_Kolin_c::cutThankYou
 };
 
-/* 80553FEC-80554138 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daNpc_Kolin_cFv */
 daNpc_Kolin_c::~daNpc_Kolin_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -359,7 +343,6 @@ daNpc_Kolin_c::~daNpc_Kolin_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 8055A5B4-8055A654 000000 00A0+00 17/17 0/0 0/0 .rodata          m__19daNpc_Kolin_Param_c */
 daNpc_Kolin_HIOParam const daNpc_Kolin_Param_c::m = {
     140.0f,
     -3.0f,
@@ -410,7 +393,6 @@ daNpc_Kolin_HIOParam const daNpc_Kolin_Param_c::m = {
     2.0f,
 };
 
-/* 80554138-80554414 000238 02DC+00 1/1 0/0 0/0 .text            create__13daNpc_Kolin_cFv */
 cPhs__Step daNpc_Kolin_c::create() {
     daNpcT_ct(this, daNpc_Kolin_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
 
@@ -476,7 +458,6 @@ cPhs__Step daNpc_Kolin_c::create() {
     return phase;
 }
 
-/* 80554414-80554774 000514 0360+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::CreateHeap() {
     int bmdIdx;
 
@@ -538,18 +519,15 @@ int daNpc_Kolin_c::CreateHeap() {
     return 0;
 }
 
-/* 80554930-80554964 000A30 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::Delete() {
     this->~daNpc_Kolin_c();
     return 1;
 }
 
-/* 80554964-80554984 000A64 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::Execute() {
     return execute();
 }
 
-/* 80554984-80554A18 000A84 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -559,13 +537,11 @@ int daNpc_Kolin_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80554A18-80554A38 000B18 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_Kolin_cFP10fopAc_ac_c */
 int daNpc_Kolin_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80554A38-80554A90 000B38 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_Kolin_cFP8J3DJointi */
 int daNpc_Kolin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)j3dSys.getModel()->getUserArea();
@@ -577,7 +553,6 @@ int daNpc_Kolin_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80554A90-80554B30 000B90 00A0+00 2/1 0/0 0/0 .text            getType__13daNpc_Kolin_cFv */
 u8 daNpc_Kolin_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -627,7 +602,6 @@ u8 daNpc_Kolin_c::getType() {
     }
 }
 
-/* 80554B30-80554CB0 000C30 0180+00 2/1 0/0 0/0 .text            isDelete__13daNpc_Kolin_cFv */
 BOOL daNpc_Kolin_c::isDelete() {
     switch (mType) {
         case 0:
@@ -695,7 +669,6 @@ BOOL daNpc_Kolin_c::isDelete() {
     }
 }
 
-/* 80554CB0-80554EBC 000DB0 020C+00 1/1 0/0 0/0 .text            reset__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::reset() {
     csXyz angle;
     int iVar1 = (u8*)&field_0x101c - (u8*)&mNextAction;
@@ -745,7 +718,6 @@ void daNpc_Kolin_c::reset() {
     field_0x1010 = cM_rnd();
 }
 
-/* 80554EBC-80554F48 000FBC 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Kolin_cFi */
 void daNpc_Kolin_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -756,7 +728,6 @@ void daNpc_Kolin_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80554F48-80555118 001048 01D0+00 1/0 0/0 0/0 .text            setParam__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::setParam() {
     selectAction();
     srchActors();
@@ -817,7 +788,6 @@ void daNpc_Kolin_c::setParam() {
     gravity = daNpc_Kolin_Param_c::m.common.gravity;
 }
 
-/* 80555118-8055523C 001218 0124+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Kolin_cFv */
 BOOL daNpc_Kolin_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Kolin_c::talk)) {
         mPreItemNo = 0;
@@ -859,7 +829,6 @@ BOOL daNpc_Kolin_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 8055523C-805552DC 00133C 00A0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::setAfterTalkMotion() {
     int i_index = FACE_NONE;
     
@@ -879,7 +848,6 @@ void daNpc_Kolin_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 805552DC-80555448 0013DC 016C+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::srchActors() {
     switch (mType) {
         case 0:
@@ -926,7 +894,6 @@ void daNpc_Kolin_c::srchActors() {
     }
 }
 
-/* 80555448-805554E8 001548 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Kolin_cFv */
 BOOL daNpc_Kolin_c::evtTalk() {
     if (chkAction(&daNpc_Kolin_c::talk)) {
         (this->*mAction)(NULL);
@@ -937,7 +904,6 @@ BOOL daNpc_Kolin_c::evtTalk() {
     return TRUE;
 }
 
-/* 805554E8-805555B0 0015E8 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Kolin_cFv */
 BOOL daNpc_Kolin_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Kolin", this, -1);
     if (staffId != -1) {
@@ -953,7 +919,6 @@ BOOL daNpc_Kolin_c::evtCutProc() {
     return FALSE;
 }
 
-/* 805555B0-8055574C 0016B0 019C+00 1/0 0/0 0/0 .text            action__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::action() {
     fopAc_ac_c* actor_p = hitChk(&field_0xe48, -1);
     if (actor_p) {
@@ -979,7 +944,6 @@ void daNpc_Kolin_c::action() {
     }
 }
 
-/* 8055574C-80555810 00184C 00C4+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -992,10 +956,8 @@ void daNpc_Kolin_c::beforeMove() {
     }
 }
 
-/* 8055B41C-8055B420 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Kolin_Param_c l_HIO;
 
-/* 80555810-80555B48 001910 0338+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::setAttnPos() {
     cXyz sp3c(5.0f, 30.0f, 0.0f);
 
@@ -1037,7 +999,6 @@ void daNpc_Kolin_c::setAttnPos() {
     }
 }
 
-/* 80555B48-80555CE4 001C48 019C+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::setCollision() {
     cXyz pos;
 
@@ -1082,12 +1043,10 @@ void daNpc_Kolin_c::setCollision() {
     field_0xe48.ClrTgHit();
 }
 
-/* 80555CE4-80555CEC 001DE4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::drawDbgInfo() {
     return false;
 }
 
-/* 80555CEC-80555DC4 001DEC 00D8+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Kolin_cFv */
 void daNpc_Kolin_c::drawOtherMdl() {
     J3DModel* model = mpMorf[0]->getModel();
 
@@ -1105,7 +1064,6 @@ void daNpc_Kolin_c::drawOtherMdl() {
     }
 }
 
-/* 80555DC4-80555DEC 001EC4 0028+00 1/0 0/0 0/0 .text            changeAnm__13daNpc_Kolin_cFPiPi */
 void daNpc_Kolin_c::changeAnm(int* param_1, int* param_2) {
     if (mType == 13 && *param_1 == 19) {
         *param_1 = 5;
@@ -1113,7 +1071,6 @@ void daNpc_Kolin_c::changeAnm(int* param_1, int* param_2) {
     }
 }
 
-/* 80555DEC-80555E38 001EEC 004C+00 1/0 0/0 0/0 .text            changeBck__13daNpc_Kolin_cFPiPi */
 void daNpc_Kolin_c::changeBck(int* param_1, int* param_2) {
     if (mType == 13) {
         switch (*param_1) {
@@ -1130,7 +1087,6 @@ void daNpc_Kolin_c::changeBck(int* param_1, int* param_2) {
     }
 }
 
-/* 80555E38-80555F28 001F38 00F0+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Kolin_cFv */
 int daNpc_Kolin_c::selectAction() {
     mNextAction = NULL;
 
@@ -1162,12 +1118,10 @@ int daNpc_Kolin_c::selectAction() {
     return 1;
 }
 
-/* 80555F28-80555F54 002028 002C+00 2/2 0/0 0/0 .text            chkAction__13daNpc_Kolin_cFM13daNpc_Kolin_cFPCvPvPv_i */
 BOOL daNpc_Kolin_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80555F54-80555FFC 002054 00A8+00 2/2 0/0 0/0 .text            setAction__13daNpc_Kolin_cFM13daNpc_Kolin_cFPCvPvPv_i */
 int daNpc_Kolin_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -1185,7 +1139,6 @@ int daNpc_Kolin_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80555FFC-805563BC 0020FC 03C0+00 1/1 0/0 0/0 .text            calcFollowSpeedAndAngle__13daNpc_Kolin_cFP10fopAc_ac_cii */
 void daNpc_Kolin_c::calcFollowSpeedAndAngle(fopAc_ac_c* actor, int param_2, int param_3) {
     cXyz sp4c, sp58;
     f32 actor_distance = fopAcM_searchActorDistanceXZ(this, actor);
@@ -1224,7 +1177,6 @@ void daNpc_Kolin_c::calcFollowSpeedAndAngle(fopAc_ac_c* actor, int param_2, int
     }
 }
 
-/* 805563BC-80556798 0024BC 03DC+00 1/1 0/0 0/0 .text            followPlayer__13daNpc_Kolin_cFi */
 void daNpc_Kolin_c::followPlayer(int param_1) {
     cXyz attnPos = getAttnPos(daPy_getPlayerActorClass());
     BOOL bVar1 = mPlayerActorMngr.getActorP() != NULL;
@@ -1296,7 +1248,6 @@ void daNpc_Kolin_c::followPlayer(int param_1) {
     mJntAnm.lookPlayer(0);
 }
 
-/* 805567AC-805568AC 0028AC 0100+00 1/1 0/0 0/0 .text            lookup__13daNpc_Kolin_cFUc */
 void daNpc_Kolin_c::lookup(u8 i_direct) {
     cXyz pos;
     pos.set(0.0f, 30.0f, 200.0f);
@@ -1306,7 +1257,6 @@ void daNpc_Kolin_c::lookup(u8 i_direct) {
     mJntAnm.lookPos(&field_0xd6c, i_direct);
 }
 
-/* 805568AC-80556A04 0029AC 0158+00 1/0 0/0 0/0 .text            cutNoRide__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutNoRide(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1346,7 +1296,6 @@ int daNpc_Kolin_c::cutNoRide(int i_cutIndex) {
     return rv;
 }
 
-/* 80556A04-80556DB4 002B04 03B0+00 1/0 0/0 0/0 .text            cutHail__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutHail(int i_cutIndex) {
     cXyz work;
     int rv = 0;
@@ -1429,7 +1378,6 @@ int daNpc_Kolin_c::cutHail(int i_cutIndex) {
     return rv;
 }
 
-/* 80556DB4-80557054 002EB4 02A0+00 1/0 0/0 0/0 .text            cutGiveMeWoodSwd__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutGiveMeWoodSwd(int i_cutIndex) {
     cXyz work;
     csXyz angle;
@@ -1483,7 +1431,6 @@ int daNpc_Kolin_c::cutGiveMeWoodSwd(int i_cutIndex) {
     return rv;
 }
 
-/* 80557054-805576C4 003154 0670+00 3/0 0/0 0/0 .text            cutGetWoodSwd__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutGetWoodSwd(int i_cutIndex) {
     cXyz work;
     csXyz angle;
@@ -1629,7 +1576,6 @@ int daNpc_Kolin_c::cutGetWoodSwd(int i_cutIndex) {
     return rv;
 }
 
-/* 805576C4-805579DC 0037C4 0318+00 1/0 0/0 0/0 .text            cutConversationAboutLoopHole__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutConversationAboutLoopHole(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1718,7 +1664,6 @@ int daNpc_Kolin_c::cutConversationAboutLoopHole(int i_cutIndex) {
     return rv;
 }
 
-/* 805579DC-80557BD4 003ADC 01F8+00 1/0 0/0 0/0 .text            cutCacaricoConversation__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutCacaricoConversation(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1766,7 +1711,6 @@ int daNpc_Kolin_c::cutCacaricoConversation(int i_cutIndex) {
     return rv;
 }
 
-/* 80557BD4-80557C6C 003CD4 0098+00 1/0 0/0 0/0 .text            cutConversationAboutDeathMt__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutConversationAboutDeathMt(int i_cutIndex) {
     int prm = -1;
 
@@ -1786,7 +1730,6 @@ int daNpc_Kolin_c::cutConversationAboutDeathMt(int i_cutIndex) {
     return 0;
 }
 
-/* 80557C6C-80557D04 003D6C 0098+00 1/0 0/0 0/0 .text            cutConversationAboutGoron__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutConversationAboutGoron(int i_cutIndex) {
     int prm = -1;
 
@@ -1806,7 +1749,6 @@ int daNpc_Kolin_c::cutConversationAboutGoron(int i_cutIndex) {
     return 0;
 }
 
-/* 80557D04-80557E38 003E04 0134+00 1/0 0/0 0/0 .text            cutClothTry__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutClothTry(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -1844,7 +1786,6 @@ int daNpc_Kolin_c::cutClothTry(int i_cutIndex) {
     return rv;
 }
 
-/* 80557E38-80557ED8 003F38 00A0+00 1/0 0/0 0/0 .text            cutThankYou__13daNpc_Kolin_cFi */
 int daNpc_Kolin_c::cutThankYou(int i_cutIndex) {
     int prm = -1;
 
@@ -1866,7 +1807,6 @@ int daNpc_Kolin_c::cutThankYou(int i_cutIndex) {
 
 static int const padding[2] = {-1, -1};
 
-/* 80557ED8-80558698 003FD8 07C0+00 1/0 0/0 0/0 .text            wait__13daNpc_Kolin_cFPv */
 int daNpc_Kolin_c::wait(void* param_1) {
     fopAc_ac_c* actor_p;
 
@@ -2037,7 +1977,6 @@ int daNpc_Kolin_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80558698-80558AF8 004798 0460+00 1/0 0/0 0/0 .text            timidWalk__13daNpc_Kolin_cFPv */
 int daNpc_Kolin_c::timidWalk(void* param_1) {
     fopAc_ac_c* actor_p;
     cXyz work;
@@ -2133,7 +2072,6 @@ int daNpc_Kolin_c::timidWalk(void* param_1) {
     return 1;
 }
 
-/* 80558AF8-80558C4C 004BF8 0154+00 3/0 0/0 0/0 .text            follow__13daNpc_Kolin_cFPv */
 int daNpc_Kolin_c::follow(void* param_1) {
     cXyz work;
 
@@ -2168,7 +2106,6 @@ int daNpc_Kolin_c::follow(void* param_1) {
     return 1;
 }
 
-/* 80558C4C-80558E90 004D4C 0244+00 1/0 0/0 0/0 .text            clothWait__13daNpc_Kolin_cFPv */
 int daNpc_Kolin_c::clothWait(void* param_1) {
     int sulk_time = daNpc_Kolin_Param_c::m.sulk_time;
 
@@ -2213,7 +2150,6 @@ int daNpc_Kolin_c::clothWait(void* param_1) {
     return 1;
 }
 
-/* 80558E90-805590B4 004F90 0224+00 3/0 0/0 0/0 .text            talk__13daNpc_Kolin_cFPv */
 int daNpc_Kolin_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -2255,38 +2191,32 @@ int daNpc_Kolin_c::talk(void* param_1) {
     return 0;
 }
 
-/* 805590B4-805590D4 0051B4 0020+00 1/0 0/0 0/0 .text            daNpc_Kolin_Create__FPv */
 static int daNpc_Kolin_Create(void* a_this) {
     daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)a_this;
     return i_this->create();
 }
 
-/* 805590D4-805590F4 0051D4 0020+00 1/0 0/0 0/0 .text            daNpc_Kolin_Delete__FPv */
 static int daNpc_Kolin_Delete(void* a_this) {
     daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)a_this;
     return i_this->Delete();
 }
 
-/* 805590F4-80559114 0051F4 0020+00 1/0 0/0 0/0 .text            daNpc_Kolin_Execute__FPv */
 static int daNpc_Kolin_Execute(void* a_this) {
     daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)a_this;
     return i_this->Execute();
 }
 
-/* 80559114-80559134 005214 0020+00 1/0 0/0 0/0 .text            daNpc_Kolin_Draw__FPv */
 static int daNpc_Kolin_Draw(void* a_this) {
     daNpc_Kolin_c* i_this = (daNpc_Kolin_c*)a_this;
     return i_this->Draw();
 }
 
-/* 80559134-8055913C 005234 0008+00 1/0 0/0 0/0 .text            daNpc_Kolin_IsDelete__FPv */
 static int daNpc_Kolin_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 8055B1FC-8055B21C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kolin_MethodTable */
 static actor_method_class daNpc_Kolin_MethodTable = {
     (process_method_func)daNpc_Kolin_Create,
     (process_method_func)daNpc_Kolin_Delete,
@@ -2295,7 +2225,6 @@ static actor_method_class daNpc_Kolin_MethodTable = {
     (process_method_func)daNpc_Kolin_Draw,
 };
 
-/* 8055B21C-8055B24C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KOLIN */
 extern actor_process_profile_definition g_profile_NPC_KOLIN = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp
index 4f5aaaaaea..488a1bad91 100644
--- a/src/d/actor/d_a_npc_kolinb.cpp
+++ b/src/d/actor/d_a_npc_kolinb.cpp
@@ -97,36 +97,30 @@ enum TYPE {
     /* 0x3 */ TYPE_3,
 };
 
-/* 80A48874-80A48884 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {BMDR_KOLINB, KOLINB},
     {BMDR_SRCB, ZRCB},
 };
 
-/* 80A48884-80A48894 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"", 0},
 };
 
-/* 80A48894-80A488A0 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Kolinb",
     "zrCb",
 };
 
-/* 80A488A0-80A488A4 00004C 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     KOLINB, -1
 };
 
-/* 80A488A4-80A488A8 000050 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     KOLINB, ZRCB, -1,
 };
 
-/* 80A488A8-80A488B8 -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
@@ -134,7 +128,6 @@ static s8* l_loadResPtrnList[4] = {
     NULL,
 };
 
-/* 80A488B8-80A489D0 000064 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_KOLINB, J3DFrameCtrl::EMode_LOOP, KOLINB, 1},
     {BCK_KOLINB_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTP_KOLINB_F_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, 0},
@@ -148,7 +141,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {BCK_ZRCB_F_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, BTP_ZRCB_F_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, 0},
 };
 
-/* 80A489D0-80A48ACC 00017C 00FC+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[9] = {
     {BCK_KOLINB_WAIT_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTK_KOLINB, J3DFrameCtrl::EMode_NONE, KOLINB, 0, 0},
     {BCK_KOLINB_SUFFER_A, J3DFrameCtrl::EMode_LOOP, KOLINB, BTK_KOLINB, J3DFrameCtrl::EMode_NONE, KOLINB, 0, 0},
@@ -161,7 +153,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[9] = {
     {BCK_ZRCB_SUFFER_B, J3DFrameCtrl::EMode_LOOP, ZRCB, -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0},
 };
 
-/* 80A48ACC-80A48B5C 000278 0090+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -174,7 +165,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[36] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A48B5C-80A48BDC 000308 0080+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -196,7 +186,6 @@ char* daNpc_Kolinb_c::mCutNameList[7] = {
     "THANK_YOU",
 };
 
-/* 80A48C40-80A48C94 0003EC 0054+00 1/2 0/0 0/0 .data            mCutList__14daNpc_Kolinb_c */
 daNpc_Kolinb_c::cutFunc daNpc_Kolinb_c::mCutList[7] = {
     NULL,
     &daNpc_Kolinb_c::cutConversationInHotel,
@@ -207,7 +196,6 @@ daNpc_Kolinb_c::cutFunc daNpc_Kolinb_c::mCutList[7] = {
     &daNpc_Kolinb_c::cutThankYou
 };
 
-/* 80A4598C-80A45ADC 0000EC 0150+00 1/0 0/0 0/0 .text            __dt__14daNpc_Kolinb_cFv */
 daNpc_Kolinb_c::~daNpc_Kolinb_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -220,7 +208,6 @@ daNpc_Kolinb_c::~daNpc_Kolinb_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A48710-80A4879C 000000 008C+00 5/5 0/0 0/0 .rodata          m__20daNpc_Kolinb_Param_c */
 daNpc_Kolinb_HIOParam const daNpc_Kolinb_Param_c::m = {
     100.0f,
     -3.0f,
@@ -265,7 +252,6 @@ daNpc_Kolinb_HIOParam const daNpc_Kolinb_Param_c::m = {
     0.0f,
 };
 
-/* 80A45ADC-80A45DC4 00023C 02E8+00 1/1 0/0 0/0 .text            create__14daNpc_Kolinb_cFv */
 cPhs__Step daNpc_Kolinb_c::create() {
     daNpcT_ct(this, daNpc_Kolinb_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
 
@@ -330,7 +316,6 @@ cPhs__Step daNpc_Kolinb_c::create() {
     return phase;
 }
 
-/* 80A45DC4-80A4603C 000524 0278+00 1/1 0/0 0/0 .text            CreateHeap__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::CreateHeap() {
     int bmdIdx;
     if (mType == TYPE_ZRCB) {
@@ -381,18 +366,15 @@ int daNpc_Kolinb_c::CreateHeap() {
     }
 }
 
-/* 80A4603C-80A46070 00079C 0034+00 1/1 0/0 0/0 .text            Delete__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::Delete() {
     this->~daNpc_Kolinb_c();
     return 1;
 }
 
-/* 80A46070-80A46090 0007D0 0020+00 2/2 0/0 0/0 .text            Execute__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::Execute() {
     return execute();
 }
 
-/* 80A46090-80A46124 0007F0 0094+00 1/1 0/0 0/0 .text            Draw__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -402,13 +384,11 @@ int daNpc_Kolinb_c::Draw() {
     draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80A46124-80A46144 000884 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__14daNpc_Kolinb_cFP10fopAc_ac_c */
 int daNpc_Kolinb_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A46144-80A4619C 0008A4 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__14daNpc_Kolinb_cFP8J3DJointi */
 int daNpc_Kolinb_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)j3dSys.getModel()->getUserArea();
@@ -420,7 +400,6 @@ int daNpc_Kolinb_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A4619C-80A461E8 0008FC 004C+00 1/1 0/0 0/0 .text            getType__14daNpc_Kolinb_cFv */
 u8 daNpc_Kolinb_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -437,7 +416,6 @@ u8 daNpc_Kolinb_c::getType() {
     }
 }
 
-/* 80A461E8-80A462C8 000948 00E0+00 1/1 0/0 0/0 .text            isDelete__14daNpc_Kolinb_cFv */
 BOOL daNpc_Kolinb_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -462,7 +440,6 @@ BOOL daNpc_Kolinb_c::isDelete() {
     }
 }
 
-/* 80A462C8-80A46420 000A28 0158+00 1/1 0/0 0/0 .text            reset__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::reset() {
     csXyz angle;
     int iVar1 = (u8*)&field_0xff8 - (u8*)&mNextAction;
@@ -480,7 +457,6 @@ void daNpc_Kolinb_c::reset() {
     setAngle(angle);
 }
 
-/* 80A46420-80A4651C 000B80 00FC+00 1/0 0/0 0/0 .text            setParam__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::setParam() {
     selectAction();
     srchActors();
@@ -508,7 +484,6 @@ void daNpc_Kolinb_c::setParam() {
     gravity = daNpc_Kolinb_Param_c::m.common.gravity;
 }
 
-/* 80A4651C-80A465D0 000C7C 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__14daNpc_Kolinb_cFv */
 BOOL daNpc_Kolinb_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Kolinb_c::talk)) {
         mPreItemNo = 0;
@@ -525,18 +500,15 @@ BOOL daNpc_Kolinb_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A465D0-80A46630 000D30 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0);
 }
 
-/* 80A46630-80A46634 000D90 0004+00 1/1 0/0 0/0 .text            srchActors__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::srchActors() {
     /* empty function */
 }
 
-/* 80A46634-80A466D4 000D94 00A0+00 1/0 0/0 0/0 .text            evtTalk__14daNpc_Kolinb_cFv */
 BOOL daNpc_Kolinb_c::evtTalk() {
     if (chkAction(&daNpc_Kolinb_c::talk)) {
         (this->*mAction)(NULL);
@@ -547,7 +519,6 @@ BOOL daNpc_Kolinb_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A466D4-80A4679C 000E34 00C8+00 1/0 0/0 0/0 .text            evtCutProc__14daNpc_Kolinb_cFv */
 BOOL daNpc_Kolinb_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Kolinb", this, -1);
     if (staffId != -1) {
@@ -563,7 +534,6 @@ BOOL daNpc_Kolinb_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80A4679C-80A46824 000EFC 0088+00 1/0 0/0 0/0 .text            action__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::action() {
     if (mNextAction) {
         if (mAction == mNextAction) {
@@ -574,7 +544,6 @@ void daNpc_Kolinb_c::action() {
     }
 }
 
-/* 80A46824-80A468E8 000F84 00C4+00 1/0 0/0 0/0 .text            beforeMove__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -587,7 +556,6 @@ void daNpc_Kolinb_c::beforeMove() {
     }
 }
 
-/* 80A468E8-80A46A4C 001048 0164+00 1/0 0/0 0/0 .text            setAttnPos__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::setAttnPos() {
     cXyz work(10.0f, 30.0f, 0.0f);
     setMtx();
@@ -610,18 +578,15 @@ void daNpc_Kolinb_c::setAttnPos() {
     }
 }
 
-/* 80A46A4C-80A46A9C 0011AC 0050+00 1/0 0/0 0/0 .text            setCollision__14daNpc_Kolinb_cFv */
 void daNpc_Kolinb_c::setCollision() {
     field_0xe44.ClrCoHit();
     field_0xe44.ClrTgHit();
 }
 
-/* 80A46A9C-80A46AA4 0011FC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A46AA4-80A46AEC 001204 0048+00 1/1 0/0 0/0 .text            selectAction__14daNpc_Kolinb_cFv */
 int daNpc_Kolinb_c::selectAction() {
     mNextAction = NULL;
 
@@ -637,12 +602,10 @@ int daNpc_Kolinb_c::selectAction() {
     return 1;
 }
 
-/* 80A46AEC-80A46B18 00124C 002C+00 2/2 0/0 0/0 .text            chkAction__14daNpc_Kolinb_cFM14daNpc_Kolinb_cFPCvPvPv_i */
 BOOL daNpc_Kolinb_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80A46B18-80A46BC0 001278 00A8+00 2/2 0/0 0/0 .text            setAction__14daNpc_Kolinb_cFM14daNpc_Kolinb_cFPCvPvPv_i */
 int daNpc_Kolinb_c::setAction(actionFunc action) {
     mMode = 3;
     
@@ -660,7 +623,6 @@ int daNpc_Kolinb_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80A46BC0-80A46C48 001320 0088+00 1/0 0/0 0/0 .text cutConversationInHotel__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutConversationInHotel(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -681,7 +643,6 @@ int daNpc_Kolinb_c::cutConversationInHotel(int i_cutIndex) {
     return rv;
 }
 
-/* 80A46C48-80A46EE4 0013A8 029C+00 1/0 0/0 0/0 .text            cutConversationAboutDeathMt__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutConversationAboutDeathMt(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -734,7 +695,6 @@ int daNpc_Kolinb_c::cutConversationAboutDeathMt(int i_cutIndex) {
     return rv;
 }
 
-/* 80A46EE4-80A47180 001644 029C+00 1/0 0/0 0/0 .text            cutConversationAboutGoron__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutConversationAboutGoron(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -787,7 +747,6 @@ int daNpc_Kolinb_c::cutConversationAboutGoron(int i_cutIndex) {
     return rv;
 }
 
-/* 80A47180-80A472EC 0018E0 016C+00 1/0 0/0 0/0 .text            cutNurse__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutNurse(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -826,7 +785,6 @@ int daNpc_Kolinb_c::cutNurse(int i_cutIndex) {
     return rv;
 }
 
-/* 80A472EC-80A4738C 001A4C 00A0+00 1/0 0/0 0/0 .text            cutClothTry__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutClothTry(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -848,7 +806,6 @@ int daNpc_Kolinb_c::cutClothTry(int i_cutIndex) {
     return rv;
 }
 
-/* 80A4738C-80A4742C 001AEC 00A0+00 1/0 0/0 0/0 .text            cutThankYou__14daNpc_Kolinb_cFi */
 int daNpc_Kolinb_c::cutThankYou(int i_cutIndex) {
     int rv = 0;
     int prm = -1;
@@ -870,7 +827,6 @@ int daNpc_Kolinb_c::cutThankYou(int i_cutIndex) {
     return rv;
 }
 
-/* 80A4742C-80A475D4 001B8C 01A8+00 1/0 0/0 0/0 .text            wait__14daNpc_Kolinb_cFPv */
 int daNpc_Kolinb_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -905,7 +861,6 @@ int daNpc_Kolinb_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80A475D4-80A4768C 001D34 00B8+00 3/0 0/0 0/0 .text            talk__14daNpc_Kolinb_cFPv */
 int daNpc_Kolinb_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -928,39 +883,32 @@ int daNpc_Kolinb_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80A4768C-80A476AC 001DEC 0020+00 1/0 0/0 0/0 .text            daNpc_Kolinb_Create__FPv */
 static int daNpc_Kolinb_Create(void* a_this) {
     daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)a_this;
     return i_this->create();
 }
 
-/* 80A476AC-80A476CC 001E0C 0020+00 1/0 0/0 0/0 .text            daNpc_Kolinb_Delete__FPv */
 static int daNpc_Kolinb_Delete(void* a_this) {
     daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)a_this;
     return i_this->Delete();
 }
 
-/* 80A476CC-80A476EC 001E2C 0020+00 1/0 0/0 0/0 .text            daNpc_Kolinb_Execute__FPv */
 static int daNpc_Kolinb_Execute(void* a_this) {
     daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)a_this;
     return i_this->Execute();
 }
 
-/* 80A476EC-80A4770C 001E4C 0020+00 1/0 0/0 0/0 .text            daNpc_Kolinb_Draw__FPv */
 static int daNpc_Kolinb_Draw(void* a_this) {
     daNpc_Kolinb_c* i_this = (daNpc_Kolinb_c*)a_this;
     return i_this->Draw();
 }
 
-/* 80A4770C-80A47714 001E6C 0008+00 1/0 0/0 0/0 .text            daNpc_Kolinb_IsDelete__FPv */
 static int daNpc_Kolinb_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80A48E94-80A48E98 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Kolinb_Param_c l_HIO;
 
-/* 80A48CC4-80A48CE4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kolinb_MethodTable */
 static actor_method_class daNpc_Kolinb_MethodTable = {
     (process_method_func)daNpc_Kolinb_Create,
     (process_method_func)daNpc_Kolinb_Delete,
@@ -969,7 +917,6 @@ static actor_method_class daNpc_Kolinb_MethodTable = {
     (process_method_func)daNpc_Kolinb_Draw,
 };
 
-/* 80A48CE4-80A48D14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KOLINB */
 extern actor_process_profile_definition g_profile_NPC_KOLINB = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp
index afefc43866..86a15fe481 100644
--- a/src/d/actor/d_a_npc_ks.cpp
+++ b/src/d/actor/d_a_npc_ks.cpp
@@ -24,8 +24,8 @@
 
 class daNpc_Ks_HIO_c : public JORReflexible {
 public:
-    /* 80A48F8C */ daNpc_Ks_HIO_c();
-    /* 80A5DA90 */ virtual ~daNpc_Ks_HIO_c() {};
+    daNpc_Ks_HIO_c();
+    virtual ~daNpc_Ks_HIO_c() {};
 
     void genMessage(JORMContext*);
 
@@ -60,7 +60,6 @@ struct path {
     u32 field_0x30;
 };
 
-/* 80A48F8C-80A49000 0000EC 0074+00 1/1 0/0 0/0 .text            __ct__14daNpc_Ks_HIO_cFv */
 daNpc_Ks_HIO_c::daNpc_Ks_HIO_c() {
     field_0x4 = -1;
     basic_size = 0.8f;
@@ -115,14 +114,12 @@ void daNpc_Ks_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A49000-80A49054 000160 0054+00 2/2 0/0 0/0 .text            setPlayerPosAndAngle__FP4cXyzs */
 static void setPlayerPosAndAngle(cXyz* i_pos, s16 i_angle) {
     if (dComIfGp_checkPlayerStatus0(0, 0x100) == 0) {
         daPy_getPlayerActorClass()->setPlayerPosAndAngle(i_pos, i_angle, 0);
     }
 }
 
-/* 80A49054-80A49088 0001B4 0034+00 14/14 0/0 0/0 .text            checkDoorDemo__Fv */
 static BOOL checkDoorDemo() {
     if (daPy_getPlayerActorClass()->eventInfo.checkCommandDoor() && dComIfGp_event_chkEventFlag(4) == 0) {
         return TRUE;
@@ -131,7 +128,6 @@ static BOOL checkDoorDemo() {
     return FALSE;
 }
 
-/* 80A49088-80A49168 0001E8 00E0+00 1/1 0/0 0/0 .text otherBgCheck__FP10fopAc_ac_cP10fopAc_ac_c */
 static BOOL otherBgCheck(fopAc_ac_c* p_actor, fopAc_ac_c* p_actor2) {
     dBgS_LinChk p_line;
     cXyz unused_cxyz, pi_start, pi_end;
@@ -150,7 +146,6 @@ static BOOL otherBgCheck(fopAc_ac_c* p_actor, fopAc_ac_c* p_actor2) {
     return FALSE;
 }
 
-/* 80A491A4-80A4932C 000304 0188+00 29/29 0/0 0/0 .text            anm_init__FP12npc_ks_classifUcf */
 static void anm_init(npc_ks_class* i_this, int param_2, f32 i_morf, u8 i_attr, f32 i_rate) {
     if (i_this->field_0x94c != 0 && (param_2 == 51 || param_2 == 53)) {
         if (cM_rndF(1.0f) < 0.5f) {
@@ -191,7 +186,6 @@ static void anm_init(npc_ks_class* i_this, int param_2, f32 i_morf, u8 i_attr, f
     i_this->field_0x5d0 = i_index;
 }
 
-/* 80A4932C-80A49660 00048C 0334+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DJoint* my_joint = i_joint;
@@ -247,7 +241,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A49660-80A49848 0007C0 01E8+00 1/0 0/0 0/0 .text            daNpc_Ks_Draw__FP12npc_ks_class */
 static int daNpc_Ks_Draw(npc_ks_class* npc_ks) {
     if (npc_ks->field_0xbd7 != 0) {
         npc_ks->field_0xbd7 = 0;
@@ -293,7 +286,6 @@ static int daNpc_Ks_Draw(npc_ks_class* npc_ks) {
     return 1;
 }
 
-/* 80A49848-80A498B4 0009A8 006C+00 2/2 0/0 0/0 .text            s_resq_sub__FPvPv */
 static void* s_resq_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
@@ -302,34 +294,25 @@ static void* s_resq_sub(void* i_actor, void* i_data) {
     return NULL;
 };
 
-/* 80A5FE94-80A5FEA0 000054 000C+00 1/5 0/0 0/0 .bss             obj_pos */
 static cXyz obj_pos;
 
-/* 80A5FEA0-80A5FEA4 000060 0004+00 4/9 0/0 0/0 .bss             leader */
 static npc_ks_class* leader;
 
-/* 80A5FEA4-80A5FEA8 000064 0004+00 7/9 0/0 0/0 .bss             call_pt */
 static u32 call_pt;
 
-/* 80A5FEA8-80A5FEAC 000068 0004+00 1/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80A5FEB8-80A5FEF0 000078 0038+00 16/22 0/0 0/0 .bss             l_HIO */
 static daNpc_Ks_HIO_c l_HIO;
 
 // Note that this is .bss in dbg asm, thus it must come here.
-/* 80A5E478-80A5E498 000020 0020+00 13/13 0/0 0/0 .data            saru_p */
 static npc_ks_class* saru_p[8] = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
-/* 80A5FEF0-80A5FF18 0000B0 0028+00 4/6 0/0 0/0 .bss             target_info */
 static void* target_info[10];
 
-/* 80A5FF18-80A5FF1C 0000D8 0004+00 4/6 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80A498B4-80A49930 000A14 007C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && 
@@ -341,7 +324,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A5FF1C-80A5FF44 0000DC 0028+00 0/2 0/0 0/0 .bss             target_bgc */
 static int target_bgc[10];
 
 #if DEBUG
@@ -369,7 +351,6 @@ static int target_bgc[10];
 
 #endif
 
-/* 80A49930-80A49B48 000A90 0218+00 2/2 0/0 0/0 .text            search_bomb__FP12npc_ks_classi */
 static fopAc_ac_c* search_bomb(npc_ks_class* i_this, int param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* actor_p;
@@ -427,19 +408,16 @@ static fopAc_ac_c* search_bomb(npc_ks_class* i_this, int param_2) {
     return NULL;
 }
 
-/* 80A49B48-80A49B6C 000CA8 0024+00 1/1 0/0 0/0 .text            bomb_view_check__FP12npc_ks_class */
 static fopAc_ac_c* bomb_view_check(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     return search_bomb(i_this, 1);
 }
 
-/* 80A49B6C-80A49B90 000CCC 0024+00 1/1 0/0 0/0 .text            bomb_check__FP12npc_ks_class */
 static fopAc_ac_c* bomb_check(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     return search_bomb(i_this, 0);
 }
 
-/* 80A49B90-80A49C00 000CF0 0070+00 1/1 0/0 0/0 .text            s_e_sub__FPvPv */
 static void* s_e_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && ((npc_ks_class*)i_actor)->actor.field_0x566 != 0 && target_info_count < 10) {
@@ -449,7 +427,6 @@ static void* s_e_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A49C00-80A49E78 000D60 0278+00 2/2 0/0 0/0 .text            search_enemy__FP12npc_ks_classif */
 static fopAc_ac_c* search_enemy(npc_ks_class* i_this, int param_2, f32 param_3) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* enemy_p;
@@ -517,19 +494,16 @@ static fopAc_ac_c* search_enemy(npc_ks_class* i_this, int param_2, f32 param_3)
     return NULL;
 }
 
-/* 80A49E78-80A49E9C 000FD8 0024+00 7/7 0/0 0/0 .text            enemy_view_check__FP12npc_ks_classf */
 static fopAc_ac_c* enemy_view_check(npc_ks_class* i_this, f32 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     return search_enemy(i_this, 1, param_2);
 }
 
-/* 80A49E9C-80A49EC0 000FFC 0024+00 8/8 0/0 0/0 .text            enemy_check__FP12npc_ks_classf */
 static fopAc_ac_c* enemy_check(npc_ks_class* i_this, f32 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     return search_enemy(i_this, 0, param_2);
 }
 
-/* 80A49EC0-80A49F30 001020 0070+00 1/1 0/0 0/0 .text            s_en_sub__FPvPv */
 static void* s_en_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && ((npc_ks_class*)i_actor)->actor.field_0x560 != 0 && target_info_count < 10) {
@@ -539,7 +513,6 @@ static void* s_en_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A49F30-80A4A164 001090 0234+00 1/1 0/0 0/0 .text            en_search_test__FP12npc_ks_class */
 static fopAc_ac_c* en_search_test(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     target_info_count = 0;
@@ -577,7 +550,6 @@ static fopAc_ac_c* en_search_test(npc_ks_class* i_this) {
     return NULL;
 }
 
-/* 80A4A164-80A4A1B0 0012C4 004C+00 2/2 0/0 0/0 .text            s_ori_sub__FPvPv */
 static void* s_ori_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) {
@@ -586,7 +558,6 @@ static void* s_ori_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4A1B0-80A4A544 001310 0394+00 1/1 0/0 0/0 .text            npc_ks_pole_ori__FP12npc_ks_class */
 static void npc_ks_pole_ori(npc_ks_class* i_this) {
     obj_so_class* monkeycage_p;
     if (leader != NULL) {
@@ -653,7 +624,6 @@ static void npc_ks_pole_ori(npc_ks_class* i_this) {
     }
 }
 
-/* 80A4A544-80A4AAC8 0016A4 0584+00 2/1 0/0 0/0 .text            npc_ks_ori__FP12npc_ks_class */
 static int npc_ks_ori(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp30, sp3c;
@@ -792,7 +762,6 @@ static int npc_ks_ori(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A4AAC8-80A4AC68 001C28 01A0+00 1/1 0/0 0/0 .text            shot_bo_sub__FPvPv */
 static void* shot_bo_sub(void* i_actor, void* i_data) {
     (void) i_data;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -807,7 +776,6 @@ static void* shot_bo_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A5E4D0-80A5E63C 000078 016C+00 1/1 0/0 0/0 .data            guide_path_04 */
 static path guide_path_04[7] = {
     { 0, -4554.0f, 3893.0f, -2377.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 1, -3379.0f, 3944.0f, -2314.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -818,7 +786,6 @@ static path guide_path_04[7] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-/* 80A4AC68-80A4B7BC 001DC8 0B54+00 2/1 0/0 0/0 .text            npc_ks_ori2__FP12npc_ks_class */
 static int npc_ks_ori2(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     obj_so_class* cage_p;
@@ -1059,7 +1026,6 @@ static int npc_ks_ori2(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A4B7BC-80A4BA14 00291C 0258+00 1/1 0/0 0/0 .text            npc_ks_home__FP12npc_ks_class */
 static void npc_ks_home(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     cXyz sp2c, sp38;
@@ -1110,7 +1076,6 @@ static void npc_ks_home(npc_ks_class* i_this) {
     }
 }
 
-/* 80A4BA14-80A4BA90 002B74 007C+00 3/3 0/0 0/0 .text            s_sw_sub__FPvPv */
 static void* s_sw_sub(void* i_actor, void* i_data) {
     if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SW)) {
         if (fopAcM_GetRoomNo((fopAc_ac_c*)i_data) == 0) {
@@ -1124,7 +1089,6 @@ static void* s_sw_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4BA90-80A4BADC 002BF0 004C+00 1/1 0/0 0/0 .text            s_ha_sub__FPvPv */
 static void* s_ha_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) {
@@ -1133,7 +1097,6 @@ static void* s_ha_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4BADC-80A4BB34 002C3C 0058+00 1/1 0/0 0/0 .text            s_01_sub__FPvPv */
 static void* s_01_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS && ((npc_ks_class*)i_actor)->mActionID == 4) {
@@ -1142,7 +1105,6 @@ static void* s_01_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A5E67C-80A5E780 000224 0104+00 1/1 0/0 0/0 .data            move_path_02 */
 static path move_path_02[5] = {
     { 0, 10910.0f, 3748.0f, 4630.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
     { 0, 11002.0f, 3748.0f, 4085.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
@@ -1151,7 +1113,6 @@ static path move_path_02[5] = {
     { 0, 12103.0f, 3148.0f, 4760.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A4BB34-80A4CA70 002C94 0F3C+00 2/1 0/0 0/0 .text            npc_ks_demo_02__FP12npc_ks_class */
 static int npc_ks_demo_02(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* unused_p = dComIfGp_getPlayer(0);
@@ -1448,7 +1409,6 @@ static int npc_ks_demo_02(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A4CA70-80A4CABC 003BD0 004C+00 1/1 0/0 0/0 .text            s_dn_sub__FPvPv */
 static void* s_dn_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_OC) {
@@ -1457,7 +1417,6 @@ static void* s_dn_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4CABC-80A4CF40 003C1C 0484+00 2/1 0/0 0/0 .text            npc_ks_demo_022__FP12npc_ks_class */
 static int npc_ks_demo_022(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz unused_cxyz_0, unused_cxyz_1;
@@ -1570,7 +1529,6 @@ static int npc_ks_demo_022(npc_ks_class* i_this) {
     return retval;
 }
 
-/* 80A4CF40-80A4D438 0040A0 04F8+00 2/1 0/0 0/0 .text            npc_ks_demo_04__FP12npc_ks_class */
 static void npc_ks_demo_04(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz unused_cxyz_0, unused_cxyz_1;
@@ -1708,7 +1666,6 @@ static void npc_ks_demo_04(npc_ks_class* i_this) {
     cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, fVar2);
 }
 
-/* 80A4D438-80A4DBF8 004598 07C0+00 1/1 0/0 0/0 .text            npc_ks_to_hang__FP12npc_ks_class */
 static void npc_ks_to_hang(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp24, sp30;
@@ -1805,7 +1762,6 @@ static void npc_ks_to_hang(npc_ks_class* i_this) {
     }
 }
 
-/* 80A4DBF8-80A4DC80 004D58 0088+00 1/1 0/0 0/0 .text            s_next_do_sub__FPvPv */
 static void* s_next_do_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
         npc_ks_class* mon_data = (npc_ks_class*) i_data;
@@ -1819,7 +1775,6 @@ static void* s_next_do_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4DC80-80A4DD70 004DE0 00F0+00 1/1 0/0 0/0 .text            s_next_get_sub__FPvPv */
 static void* s_next_get_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
         npc_ks_class* mon_data = (npc_ks_class*) i_data;
@@ -1839,7 +1794,6 @@ static void* s_next_get_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A4DD70-80A4DDF8 004ED0 0088+00 1/1 0/0 0/0 .text            order_set__Fi */
 static void order_set(int param_1) {
     if (saru_p[0]->field_0x5c4 < saru_p[param_1 - 1]->field_0x5c4) {
         for (int i = 0; i < param_1; i++) {
@@ -1852,7 +1806,6 @@ static void order_set(int param_1) {
     }
 }
 
-/* 80A4DDF8-80A4DE34 004F58 003C+00 2/2 0/0 0/0 .text            all_carry_finish__Fi */
 static void all_carry_finish(int param_1) {
     for (int i = 0; i < param_1; i++) {
         saru_p[i]->mActionID = 10;
@@ -1860,7 +1813,6 @@ static void all_carry_finish(int param_1) {
     }
 }
 
-/* 80A4DE34-80A4E000 004F94 01CC+00 2/2 0/0 0/0 .text            hang_end_check__FP12npc_ks_class */
 static void hang_end_check(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -1897,7 +1849,6 @@ static void hang_end_check(npc_ks_class* i_this) {
     }
 }
 
-/* 80A4E000-80A4E800 005160 0800+00 2/1 0/0 0/0 .text            npc_ks_hang__FP12npc_ks_class */
 static void npc_ks_hang(npc_ks_class* i_this) {
     if (leader == NULL) {
         return;
@@ -2106,7 +2057,6 @@ static void npc_ks_hang(npc_ks_class* i_this) {
     }
 }
 
-/* 80A4E800-80A4EE18 005960 0618+00 1/1 0/0 0/0 .text            npc_ks_hang_s__FP12npc_ks_class */
 static void npc_ks_hang_s(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* base_sw_p;
@@ -2246,7 +2196,6 @@ static void npc_ks_hang_s(npc_ks_class* i_this) {
     hang_end_check(i_this);
 }
 
-/* 80A4EE18-80A4F170 005F78 0358+00 1/1 0/0 0/0 .text            npc_ks_e_hang__FP12npc_ks_class */
 static void npc_ks_e_hang(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* base_sw_p = fopAcM_SearchByID(a_this->parentActorID);
@@ -2322,7 +2271,6 @@ static void npc_ks_e_hang(npc_ks_class* i_this) {
     cLib_addCalc0(&i_this->field_0x60c, 0.5f, 100.0f + TREG_F(3));
 }
 
-/* 80A4F170-80A4F1D8 0062D0 0068+00 1/1 0/0 0/0 .text            all_move_check__Fii */
 static int all_move_check(int param_1, int param_2) {
     int iVar1 = 0;
     while (iVar1 < param_2) {
@@ -2340,7 +2288,6 @@ static int all_move_check(int param_1, int param_2) {
     return 1;
 }
 
-/* 80A4F1D8-80A4F228 006338 0050+00 1/1 0/0 0/0 .text            go_jump_check__Fi */
 static int go_jump_check(int param_1) {
     int reg_r30 = param_1 - 1;
     while (reg_r30 >= 0) {
@@ -2356,7 +2303,6 @@ static int go_jump_check(int param_1) {
     return 1;
 }
 
-/* 80A4F228-80A4FD7C 006388 0B54+00 2/1 0/0 0/0 .text            npc_ks_e_jump__FP12npc_ks_class */
 static int npc_ks_e_jump(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp28, unused_cxyz;
@@ -2542,7 +2488,6 @@ static int npc_ks_e_jump(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A4FD7C-80A4FE4C 006EDC 00D0+00 1/1 0/0 0/0 .text            get_move_saru__FP12npc_ks_classi */
 static npc_ks_class* get_move_saru(npc_ks_class* i_this, int param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (fopAcM_GetRoomNo(a_this) == 0) {
@@ -2562,7 +2507,6 @@ static npc_ks_class* get_move_saru(npc_ks_class* i_this, int param_2) {
     return NULL;
 }
 
-/* 80A4FE4C-80A4FEF0 006FAC 00A4+00 1/1 0/0 0/0 .text            all_hang_check__FP12npc_ks_classi */
 static int all_hang_check(npc_ks_class* i_this, int param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     if (fopAcM_GetRoomNo(a_this) == 0) {
@@ -2584,7 +2528,6 @@ static int all_hang_check(npc_ks_class* i_this, int param_2) {
     return 1;
 }
 
-/* 80A4FEF0-80A4FFD4 007050 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP12npc_ks_classf */
 static void cam_3d_morf(npc_ks_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->field_0xb60.x, i_this->field_0xb6c.x, param_2, i_this->field_0xb84.x * i_this->field_0xbc4);
     cLib_addCalc2(&i_this->field_0xb60.y, i_this->field_0xb6c.y, param_2, i_this->field_0xb84.y * i_this->field_0xbc4);
@@ -2594,7 +2537,6 @@ static void cam_3d_morf(npc_ks_class* i_this, f32 param_2) {
     cLib_addCalc2(&i_this->field_0xb48.z, i_this->field_0xb54.z, param_2, i_this->field_0xb78.z * i_this->field_0xbc4);
 }
 
-/* 80A4FFD4-80A50028 007134 0054+00 1/1 0/0 0/0 .text            s_fs_sub__FPvPv */
 static void* s_fs_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) {
@@ -2604,7 +2546,6 @@ static void* s_fs_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A50028-80A50094 007188 006C+00 1/1 0/0 0/0 .text            s_fsdown_sub__FPvPv */
 static void* s_fsdown_sub(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_FS) {
@@ -2614,7 +2555,6 @@ static void* s_fsdown_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A50094-80A5280C 0071F4 2778+00 1/1 0/0 0/0 .text            demo_camera__FP12npc_ks_class */
 static void demo_camera(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -3539,7 +3479,6 @@ static void demo_camera(npc_ks_class* i_this) {
     }
 }
 
-/* 80A5280C-80A52898 00996C 008C+00 3/3 0/0 0/0 .text            saru_count_check__FP12npc_ks_class */
 static int saru_count_check(npc_ks_class* i_this) {
     i_this->field_0x934 = (obj_sw_class*)fpcM_Search(s_sw_sub, i_this);
     if (i_this->field_0x934 == NULL) {
@@ -3555,7 +3494,6 @@ static int saru_count_check(npc_ks_class* i_this) {
     }
 }
 
-/* 80A52898-80A533B4 0099F8 0B1C+00 2/1 0/0 0/0 .text            action_check__FP12npc_ks_class */
 static void action_check(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -3724,7 +3662,6 @@ static void action_check(npc_ks_class* i_this) {
     }
 }
 
-/* 80A533B4-80A5352C 00A514 0178+00 1/1 0/0 0/0 .text            water_check__FP12npc_ks_class4cXyzf */
 static BOOL water_check(npc_ks_class* i_this, cXyz param_2, f32 param_3) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp154;
@@ -3752,10 +3689,8 @@ static BOOL water_check(npc_ks_class* i_this, cXyz param_2, f32 param_3) {
     return FALSE;
 }
 
-/* 80A5E948-80A5E94C 0004F0 0004+00 1/1 0/0 0/0 .data            yuka_jump_x */
 static f32 yuka_jump_x = 80.0f;
 
-/* 80A5352C-80A548E4 00A68C 13B8+00 2/1 0/0 0/0 .text            npc_ks_option__FP12npc_ks_class */
 static int npc_ks_option(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
@@ -4219,7 +4154,6 @@ static int npc_ks_option(npc_ks_class* i_this) {
     return retval;
 }
 
-/* 80A548E4-80A54A14 00BA44 0130+00 1/1 0/0 0/0 .text            npc_ks_awaydoor__FP12npc_ks_class */
 static void npc_ks_awaydoor(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -4250,7 +4184,6 @@ static void npc_ks_awaydoor(npc_ks_class* i_this) {
     cLib_addCalc2(&a_this->speedF, l_HIO.holding_speed_h, 1.0f, 4.0f);
 }
 
-/* 80A5EA24-80A5EC2C 0005CC 0208+00 1/1 0/0 0/0 .data            guide_path_00 */
 static path guide_path_00[10] = {
     { 0, 54.0f, 3300.0f, 5328.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 39.0f, 3300.0f, 5592.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -4264,7 +4197,6 @@ static path guide_path_00[10] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A5EC2C-80A5ED98 0007D4 016C+00 1/1 0/0 0/0 .data            guide_path_00_2 */
 static path guide_path_00_2[7] =  {
     { 0, 0.0f, 3150.0f, 6775.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
     { 0, 9.0f, 3195.0f, 6449.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
@@ -4275,7 +4207,6 @@ static path guide_path_00_2[7] =  {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 };
 
-/* 80A5ED98-80A5EED0 000940 0138+00 1/1 0/0 0/0 .data            guide_path_00_3 */
 static path guide_path_00_3[6] = {
     { 0, -81.0f, 3150.0f, 6492.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 87.0f, 3200.0f, 6191.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -4285,7 +4216,6 @@ static path guide_path_00_3[6] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A5EED0-80A5F140 000A78 0270+00 1/1 0/0 0/0 .data            guide_path_01 */
 static path guide_path_01[12] = {
     { 0, 5262.0f, 3213.0f, 7710.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 5968.0f, 3250.0f, 7167.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -4301,7 +4231,6 @@ static path guide_path_01[12] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A54A14-80A55174 00BB74 0760+00 1/1 0/0 0/0 .text            npc_ks_guide_00__FP12npc_ks_class */
 static int npc_ks_guide_00(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -4458,7 +4387,6 @@ static int npc_ks_guide_00(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A55174-80A5546C 00C2D4 02F8+00 1/1 0/0 0/0 .text            npc_ks_guide_00_2__FP12npc_ks_class */
 static int npc_ks_guide_00_2(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp34, sp40;
@@ -4537,7 +4465,6 @@ static int npc_ks_guide_00_2(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5546C-80A559B4 00C5CC 0548+00 1/1 0/0 0/0 .text            npc_ks_guide_00_3__FP12npc_ks_class */
 static int npc_ks_guide_00_3(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp2c, sp38;
@@ -4669,7 +4596,6 @@ static int npc_ks_guide_00_3(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A559B4-80A562EC 00CB14 0938+00 1/1 0/0 0/0 .text            npc_ks_guide_01__FP12npc_ks_class */
 static int npc_ks_guide_01(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp3c, sp48;
@@ -4851,7 +4777,6 @@ static int npc_ks_guide_01(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5F140-80A5F584 000CE8 0444+00 1/1 0/0 0/0 .data            guide_path_02 */
 static path guide_path_02[21] = {
     { 0, 12307.0f, 3152.0f, 5237.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 12929.0f, 3152.0f, 5512.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -4876,7 +4801,6 @@ static path guide_path_02[21] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A562EC-80A56A1C 00D44C 0730+00 1/1 0/0 0/0 .text            npc_ks_guide_02__FP12npc_ks_class */
 static int npc_ks_guide_02(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -5001,7 +4925,6 @@ static int npc_ks_guide_02(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5F584-80A5F6BC 00112C 0138+00 1/1 0/0 0/0 .data            guide_path_22 */
 static path guide_path_22[6] = {
     { 0, 0.0f, 2354.0f, 12941.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 1, 0.0f, 3000.0f, 12879.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -5011,7 +4934,6 @@ static path guide_path_22[6] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A56A1C-80A57124 00DB7C 0708+00 1/1 0/0 0/0 .text            npc_ks_guide_22__FP12npc_ks_class */
 static int npc_ks_guide_22(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->field_0x5c4 = fopAcM_searchPlayerDistance(a_this);
@@ -5180,7 +5102,6 @@ static int npc_ks_guide_22(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5F6BC-80A5F890 001264 01D4+00 1/1 0/0 0/0 .data            guide_path_09 */
 static path guide_path_09[9] = {
     { 0, 7395.0f, 3273.0f, -4866.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 7404.0f, 3273.0f, -5527.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -5193,7 +5114,6 @@ static path guide_path_09[9] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A57124-80A57998 00E284 0874+00 1/1 0/0 0/0 .text            npc_ks_guide_09__FP12npc_ks_class */
 static int npc_ks_guide_09(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -5364,7 +5284,6 @@ static int npc_ks_guide_09(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5F890-80A5F994 001438 0104+00 1/1 0/0 0/0 .data            guide_path_12 */
 static path guide_path_12[5] = {
     { 0, 7370.0f, 3600.0f, -9473.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 7500.0f, 3698.0f, -9867.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -5373,7 +5292,6 @@ static path guide_path_12[5] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A57998-80A57ED4 00EAF8 053C+00 1/1 0/0 0/0 .text            npc_ks_demo_12__FP12npc_ks_class */
 static int npc_ks_demo_12(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -5469,7 +5387,6 @@ static int npc_ks_demo_12(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5F994-80A5FA98 00153C 0104+00 1/1 0/0 0/0 .data            guide_path_0409 */
 static path guide_path_0409[5] = {
     { 0, 6939.0f, 3462.0f, -230.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { 0, 7077.0f, 3518.0f, -866.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -5478,7 +5395,6 @@ static path guide_path_0409[5] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A57ED4-80A58274 00F034 03A0+00 1/1 0/0 0/0 .text            npc_ks_guide_0409__FP12npc_ks_class */
 static int npc_ks_guide_0409(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -5569,7 +5485,6 @@ static int npc_ks_guide_0409(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A58274-80A58410 00F3D4 019C+00 1/1 0/0 0/0 .text            path_search__FP12npc_ks_class */
 static int path_search(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     int path_index = 0;
@@ -5591,7 +5506,6 @@ static int path_search(npc_ks_class* i_this) {
     return 0;
 }
 
-/* 80A58410-80A58FE0 00F570 0BD0+00 1/1 0/0 0/0 .text            npc_ks_mori__FP12npc_ks_class */
 static int npc_ks_mori(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -5878,7 +5792,6 @@ static int npc_ks_mori(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5FA98-80A5FC04 001640 016C+00 1/1 0/0 0/0 .data            guide_path_fs */
 static path guide_path_fs[7] = {
     { 1, -38786.0f, 1140.0f, -23321.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
     { 1, -38195.0f, 750.0f, -22650.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 
@@ -5889,7 +5802,6 @@ static path guide_path_fs[7] = {
     { -1, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
 };
 
-/* 80A58FE0-80A599D8 010140 09F8+00 2/1 0/0 0/0 .text            npc_ks_fsdemo__FP12npc_ks_class */
 static int npc_ks_fsdemo(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
@@ -6113,7 +6025,6 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A599D8-80A59A90 010B38 00B8+00 1/1 0/0 0/0 .text            npc_ks_kago__FP12npc_ks_class */
 static void npc_ks_kago(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -6137,7 +6048,6 @@ static void npc_ks_kago(npc_ks_class* i_this) {
     }
 }
 
-/* 80A59A90-80A5A7D8 010BF0 0D48+00 1/1 0/0 0/0 .text            anm_se_set__FP12npc_ks_class */
 static void anm_se_set(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -6289,7 +6199,6 @@ static void anm_se_set(npc_ks_class* i_this) {
     }
 }
 
-/* 80A5A7D8-80A5B544 011938 0D6C+00 1/1 0/0 0/0 .text            action__FP12npc_ks_class */
 static void action(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -6691,7 +6600,6 @@ static void action(npc_ks_class* i_this) {
     }
 }
 
-/* 80A5B544-80A5B614 0126A4 00D0+00 1/1 0/0 0/0 .text            s_kago_sub__FPvPv */
 static void* s_kago_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KAGO) {
         if (((daObj_Kago_c*)i_actor)->getType() == 0) {
@@ -6702,7 +6610,6 @@ static void* s_kago_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A5B614-80A5B8FC 012774 02E8+00 1/1 0/0 0/0 .text            kantera_sub__FP12npc_ks_class */
 static void kantera_sub(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(14), mDoMtx_stack_c::get());
@@ -6758,10 +6665,8 @@ static void kantera_sub(npc_ks_class* i_this) {
     }
 }
 
-/* 80A5FF64-80A5FF68 000124 0004+00 0/2 0/0 0/0 .bss             c_start */
 static int c_start;
 
-/* 80A5B8FC-80A5C3E4 012A5C 0AE8+00 2/1 0/0 0/0 .text            daNpc_Ks_Execute__FP12npc_ks_class */
 static int daNpc_Ks_Execute(npc_ks_class* i_this) {
     if (i_this->mActionID == 300) {
         if (c_start == 0 && i_this->field_0xb42 == 0 && dComIfGp_event_runCheck()) {
@@ -6962,12 +6867,10 @@ static int daNpc_Ks_Execute(npc_ks_class* i_this) {
     return 1;
 }
 
-/* 80A5C3E4-80A5C3EC 013544 0008+00 1/0 0/0 0/0 .text            daNpc_Ks_IsDelete__FP12npc_ks_class */
 static int daNpc_Ks_IsDelete(npc_ks_class* i_this) {
     return 1;
 }
 
-/* 80A5C3EC-80A5C450 01354C 0064+00 1/0 0/0 0/0 .text            daNpc_Ks_Delete__FP12npc_ks_class */
 static int daNpc_Ks_Delete(npc_ks_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAcM_RegisterDeleteID(i_this, "Npc_Ks");
@@ -6985,7 +6888,6 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) {
     return 1;
 }
 
-/* 80A5C450-80A5C768 0135B0 0318+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     npc_ks_class* i_this = (npc_ks_class*)a_this;
 
@@ -7039,7 +6941,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80A5C7B0-80A5D2BC 013910 0B0C+00 2/1 0/0 0/0 .text            start_check__FP12npc_ks_class */
 static BOOL start_check(npc_ks_class* i_this) {
     static f32 dx[3] = {
         7268.0f, 5166.0f, 9233.0f,
@@ -7406,7 +7307,6 @@ static BOOL start_check(npc_ks_class* i_this) {
     return rv;
 }
 
-/* 80A5D2BC-80A5D354 01441C 0098+00 1/1 0/0 0/0 .text            s_check_sub__FPvPv */
 static void* s_check_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
         if (fopAcM_GetID(i_actor) != fopAcM_GetID(i_data) && ((npc_ks_class*)i_actor)->field_0x5b6 == ((npc_ks_class*)i_data)->field_0x5b6) {
@@ -7417,7 +7317,6 @@ static void* s_check_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A5D354-80A5D87C 0144B4 0528+00 1/0 0/0 0/0 .text            daNpc_Ks_Create__FP10fopAc_ac_c */
 static int daNpc_Ks_Create(fopAc_ac_c* a_this) {
     static dCcD_SrcCyl cc_cyl_src = {
         {
@@ -7557,7 +7456,6 @@ static int daNpc_Ks_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 80A5FD74-80A5FD94 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Ks_Method */
 static actor_method_class l_daNpc_Ks_Method = {
     (process_method_func)daNpc_Ks_Create,
     (process_method_func)daNpc_Ks_Delete,
@@ -7566,7 +7464,6 @@ static actor_method_class l_daNpc_Ks_Method = {
     (process_method_func)daNpc_Ks_Draw,
 };
 
-/* 80A5FD94-80A5FDC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KS */
 extern actor_process_profile_definition g_profile_NPC_KS = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp
index dfaaaebd94..055cd56d9a 100644
--- a/src/d/actor/d_a_npc_kyury.cpp
+++ b/src/d/actor/d_a_npc_kyury.cpp
@@ -7,7 +7,6 @@
 
 #include "d/actor/d_a_npc_kyury.h"
 
-/* 80A638AC-80A63938 000000 008C+00 9/9 0/0 0/0 .rodata          m__19daNpc_Kyury_Param_c */
 const daNpc_Kyury_HIOParam daNpc_Kyury_Param_c::m = {
     200.0f,  // attention_offset
     -3.0f,   // gravity
@@ -66,38 +65,32 @@ void daNpc_Kyury_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A63A34-80A63A4C 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {41, 1},
     {42, 1},
     {43, 1},
 };
 
-/* 80A63A4C-80A63A64 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"NO_RESPONSE", 0},
     {"FIRST_CONVERSATION", 2},
 };
 
-/* 80A63A64-80A63A70 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Kyury",
     "Kyury1",
 };
 
-/* 80A63A70-80A63A74 00005C 0002+02 0/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80A63A74-80A63A78 000060 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[3] = {
     1,
     2,
     -1,
 };
 
-/* 80A63A78-80A63A88 -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn9,
     l_loadResPtrn9,
@@ -105,7 +98,6 @@ static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn9,
 };
 
-/* 80A63A88-80A63C64 000074 01DC+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[17] = {
     {-1, 0, 0, 50, 2, 1, 1}, {22, 0, 1, 50, 2, 1, 1}, {23, 0, 1, 56, 0, 1, 0},
     {24, 0, 1, 57, 0, 1, 0}, {19, 0, 1, 53, 0, 1, 0}, {21, 0, 1, 55, 0, 1, 0},
@@ -115,7 +107,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[17] = {
     {20, 0, 1, 54, 0, 1, 0}, {26, 2, 1, 58, 2, 1, 0},
 };
 
-/* 80A63C64-80A63E24 000250 01C0+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[16] = {
     {36, 2, 1, 46, 0, 1, 1, 0}, {37, 2, 1, 46, 0, 1, 1, 0}, {33, 0, 1, 46, 0, 1, 1, 0},
     {34, 0, 1, 46, 0, 1, 1, 0}, {35, 0, 1, 46, 0, 1, 1, 0}, {38, 2, 1, 46, 0, 1, 1, 0},
@@ -125,7 +116,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[16] = {
     {31, 0, 1, 46, 0, 1, 1, 0},
 };
 
-/* 80A63E24-80A63F24 000410 0100+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = {
     {1, -1, 1},  {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},  {2, -1, 1},  {7, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {4, -1, 1}, {-1, 0, 0}, {-1, 0, 0},  {-1, 0, 0},  {5, -1, 1}, {-1, 0, 0},
@@ -139,7 +129,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] =
     {-1, 0, 0},
 };
 
-/* 80A63F24-80A63FF4 000510 00D0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0}, {-1, 0, 0},  {2, -1, 1},  {0, 0, 0},   {-1, 0, 0},
     {-1, 0, 0},  {1, -1, 0},  {-1, 0, 0}, {-1, 0, 0},  {-1, 0, 0},  {3, -1, 1},  {0, 0, 0},
@@ -151,19 +140,16 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[52] = {
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A63FF4-80A63FFC -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Kyury_c */
 char* daNpc_Kyury_c::mCutNameList[2] = {
     "",
     "CONVERSATION",
 };
 
-/* 80A64008-80A64020 0005F4 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_Kyury_c */
 daNpc_Kyury_c::cutFunc daNpc_Kyury_c::mCutList[2] = {
     NULL,
     &daNpc_Kyury_c::cutConversation,
 };
 
-/* 80A600CC-80A60218 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daNpc_Kyury_cFv */
 daNpc_Kyury_c::~daNpc_Kyury_c() {
     if (mpMorf[0] != 0) {
         mpMorf[0]->stopZelAnime();
@@ -171,7 +157,6 @@ daNpc_Kyury_c::~daNpc_Kyury_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80A60218-80A604E4 000238 02CC+00 1/1 0/0 0/0 .text            create__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::create() {
     daNpcT_ct(this, daNpc_Kyury_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -218,7 +203,6 @@ int daNpc_Kyury_c::create() {
     return phase;
 }
 
-/* 80A604E4-80A607EC 000504 0308+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::CreateHeap() {
     static int const bmdTypeList[2] = {1, 2};
 
@@ -268,19 +252,16 @@ int daNpc_Kyury_c::CreateHeap() {
     return 0;
 }
 
-/* 80A609A8-80A609DC 0009C8 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Kyury_c();
     return 1;
 }
 
-/* 80A609DC-80A609FC 0009FC 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A609FC-80A60A90 000A1C 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -290,14 +271,10 @@ int daNpc_Kyury_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80A60A90-80A60AB0 000AB0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Kyury_cFP10fopAc_ac_c            */
 int daNpc_Kyury_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Kyury_c*>(i_this)->CreateHeap();
 }
 
-/* 80A60AB0-80A60B08 000AD0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Kyury_cFP8J3DJointi               */
 int daNpc_Kyury_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -311,7 +288,6 @@ int daNpc_Kyury_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80A60B08-80A60B54 000B28 004C+00 1/1 0/0 0/0 .text            getType__13daNpc_Kyury_cFv */
 u8 daNpc_Kyury_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -324,7 +300,6 @@ u8 daNpc_Kyury_c::getType() {
     return TYPE_3;
 }
 
-/* 80A60B54-80A60B9C 000B74 0048+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -338,7 +313,6 @@ int daNpc_Kyury_c::isDelete() {
     }
 }
 
-/* 80A60B9C-80A60CF8 000BBC 015C+00 1/1 0/0 0/0 .text            reset__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::reset() {
     int iVar1 = (u8*)&field_0xfd8 - (u8*)&field_0xfbc[0];
 
@@ -366,7 +340,6 @@ void daNpc_Kyury_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A60CF8-80A60D84 000D18 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Kyury_cFi */
 void daNpc_Kyury_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -377,7 +350,6 @@ void daNpc_Kyury_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A60D84-80A60EB0 000DA4 012C+00 1/0 0/0 0/0 .text            setParam__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::setParam() {
     selectAction();
     srchActors();
@@ -411,8 +383,6 @@ void daNpc_Kyury_c::setParam() {
     }
 }
 
-/* 80A60EB0-80A60FB0 000ED0 0100+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Kyury_cFv
- */
 BOOL daNpc_Kyury_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Kyury_c::talk)) {
         mPreItemNo = 0;
@@ -442,7 +412,6 @@ BOOL daNpc_Kyury_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A60FB0-80A61060 000FD0 00B0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::setAfterTalkMotion() {
     int iVar2 = FACE_MOT_UNK_12;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -463,7 +432,6 @@ void daNpc_Kyury_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80A61060-80A610C4 001080 0064+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::srchActors() {
     switch (mType) {
     case TYPE_0:
@@ -478,7 +446,6 @@ void daNpc_Kyury_c::srchActors() {
     }
 }
 
-/* 80A610C4-80A61164 0010E4 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Kyury_cFv */
 BOOL daNpc_Kyury_c::evtTalk() {
     if (chkAction(&daNpc_Kyury_c::talk)) {
         (this->*field_0xfbc[1])(NULL);
@@ -488,7 +455,6 @@ BOOL daNpc_Kyury_c::evtTalk() {
     return 1;
 }
 
-/* 80A61164-80A6122C 001184 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Kyury_cFv */
 BOOL daNpc_Kyury_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Kyury", this, -1);
     if (staffId != -1) {
@@ -503,7 +469,6 @@ BOOL daNpc_Kyury_c::evtCutProc() {
     return false;
 }
 
-/* 80A6122C-80A61324 00124C 00F8+00 1/0 0/0 0/0 .text            action__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::action() {
     fopAc_ac_c* hit_actor = hitChk(&mCyl, 0xFFFFFFFF);
 
@@ -521,7 +486,6 @@ void daNpc_Kyury_c::action() {
     }
 }
 
-/* 80A61324-80A613E8 001344 00C4+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -533,7 +497,6 @@ void daNpc_Kyury_c::beforeMove() {
     }
 }
 
-/* 80A613E8-80A61730 001408 0348+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::setAttnPos() {
     cXyz acStack_40(10.0f, 30.0f, 0.0f);
     cXyz cStack_4c(10.0f, 0.0f, 0.0f);
@@ -578,7 +541,6 @@ void daNpc_Kyury_c::setAttnPos() {
     attention_info.position = current.pos + acStack_40;
 }
 
-/* 80A61730-80A618A8 001750 0178+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::setCollision() {
     cXyz cStack_48;
 
@@ -619,12 +581,10 @@ void daNpc_Kyury_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A618A8-80A618B0 0018C8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A618B0-80A619B8 0018D0 0108+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Kyury_cFv */
 void daNpc_Kyury_c::drawOtherMdl() {
     static int const jointNo[2] = {19, 14};
 
@@ -643,7 +603,6 @@ void daNpc_Kyury_c::drawOtherMdl() {
     }
 }
 
-/* 80A619B8-80A61A00 0019D8 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Kyury_cFv */
 int daNpc_Kyury_c::selectAction() {
     field_0xfbc[0] = NULL;
 
@@ -655,14 +614,10 @@ int daNpc_Kyury_c::selectAction() {
     return 1;
 }
 
-/* 80A61A00-80A61A2C 001A20 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Kyury_cFM13daNpc_Kyury_cFPCvPvPv_i        */
 int daNpc_Kyury_c::chkAction(int (daNpc_Kyury_c::*action)(void*)) {
     return field_0xfbc[1] == action;
 }
 
-/* 80A61A2C-80A61AD4 001A4C 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Kyury_cFM13daNpc_Kyury_cFPCvPvPv_i        */
 int daNpc_Kyury_c::setAction(int (daNpc_Kyury_c::*action)(void*)) {
     mMode = MODE_EXIT;
     if (field_0xfbc[1] != NULL) {
@@ -677,8 +632,6 @@ int daNpc_Kyury_c::setAction(int (daNpc_Kyury_c::*action)(void*)) {
     return 1;
 }
 
-/* 80A61AD4-80A61ED0 001AF4 03FC+00 1/0 0/0 0/0 .text            cutConversation__13daNpc_Kyury_cFi
- */
 int daNpc_Kyury_c::cutConversation(int param_0) {
     fopAc_ac_c* actor_p;
     cXyz acStack_48;
@@ -779,7 +732,6 @@ int daNpc_Kyury_c::cutConversation(int param_0) {
     return rv;
 }
 
-/* 80A61ED0-80A62370 001EF0 04A0+00 1/0 0/0 0/0 .text            wait__13daNpc_Kyury_cFPv */
 int daNpc_Kyury_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -858,7 +810,6 @@ int daNpc_Kyury_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A62370-80A62570 002390 0200+00 3/0 0/0 0/0 .text            talk__13daNpc_Kyury_cFPv */
 int daNpc_Kyury_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -897,42 +848,34 @@ int daNpc_Kyury_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A62570-80A62590 002590 0020+00 1/0 0/0 0/0 .text            daNpc_Kyury_Create__FPv */
 static int daNpc_Kyury_Create(void* i_this) {
     return static_cast<daNpc_Kyury_c*>(i_this)->create();
 }
 
-/* 80A62590-80A625B0 0025B0 0020+00 1/0 0/0 0/0 .text            daNpc_Kyury_Delete__FPv */
 static int daNpc_Kyury_Delete(void* i_this) {
     return static_cast<daNpc_Kyury_c*>(i_this)->Delete();
 }
 
-/* 80A625B0-80A625D0 0025D0 0020+00 1/0 0/0 0/0 .text            daNpc_Kyury_Execute__FPv */
 static int daNpc_Kyury_Execute(void* i_this) {
     return static_cast<daNpc_Kyury_c*>(i_this)->Execute();
 }
 
-/* 80A625D0-80A625F0 0025F0 0020+00 1/0 0/0 0/0 .text            daNpc_Kyury_Draw__FPv */
 static int daNpc_Kyury_Draw(void* i_this) {
     return static_cast<daNpc_Kyury_c*>(i_this)->Draw();
 }
 
-/* 80A625F0-80A625F8 002610 0008+00 1/0 0/0 0/0 .text            daNpc_Kyury_IsDelete__FPv */
 static int daNpc_Kyury_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A6422C-80A64230 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_KYURY_HIO_CLASS l_HIO;
 
-/* 80A64050-80A64070 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Kyury_MethodTable */
 static actor_method_class daNpc_Kyury_MethodTable = {
     (process_method_func)daNpc_Kyury_Create,  (process_method_func)daNpc_Kyury_Delete,
     (process_method_func)daNpc_Kyury_Execute, (process_method_func)daNpc_Kyury_IsDelete,
     (process_method_func)daNpc_Kyury_Draw,
 };
 
-/* 80A64070-80A640A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_KYURY */
 extern actor_process_profile_definition g_profile_NPC_KYURY = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp
index 3f99ac6efb..7f5f79a424 100644
--- a/src/d/actor/d_a_npc_len.cpp
+++ b/src/d/actor/d_a_npc_len.cpp
@@ -43,7 +43,6 @@ enum Motion {
     /* 0x11 */ MOT_UNK_17 = 17,
 };
 
-/* 80A68EA4-80A68F38 000000 0094+00 9/9 0/0 0/0 .rodata          m__17daNpc_Len_Param_c */
 const daNpc_Len_HIOParam daNpc_Len_Param_c::m = {
     230.0f, -3.0f,  1.0f,   450.0f, 255.0f, 210.0f, 35.0f, 40.0f,  0.0f,  0.0f, 15.0f,
     -15.0f, 30.0f,  -10.0f, 30.0f,  -30.0f, 0.6f,   12.0f, 3,      6,     5,    6,
@@ -65,13 +64,11 @@ void daNpc_Len_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A690A8-80A690B8 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {11, 1},
     {13, 2},
 };
 
-/* 80A690B8-80A690F0 -00001 0038+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[7] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -82,7 +79,6 @@ static daNpcT_evtData_c l_evtList[7] = {
     {"CONVERSATION_IN_HOTEL2", 3},
 };
 
-/* 80A690F0-80A69100 -00001 0010+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[4] = {
     "",
     "Len",
@@ -90,23 +86,19 @@ static char* l_resNameList[4] = {
     "Len1",
 };
 
-/* 80A69100-80A69104 000078 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     1,
     3,
     -1,
 };
 
-/* 80A69104-80A69108 00007C 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[4] = {1, 2, 3, -1};
 
-/* 80A69108-80A69130 -00001 0028+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[10] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1,
 };
 
-/* 80A69130-80A6937C 0000A8 024C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[21] = {
     {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1},  {16, 0, 3, 46, 0, 3, 0},
     {24, 2, 3, 49, 2, 3, 0}, {18, 0, 3, 47, 0, 3, 0}, {25, 2, 3, 50, 2, 3, 0},
@@ -117,7 +109,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[21] = {
     {9, 2, 2, 21, 2, 2, 0},  {8, 0, 2, 20, 0, 2, 0},  {10, 2, 2, 22, 2, 2, 0},
 };
 
-/* 80A6937C-80A69574 0002F4 01F8+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[18] = {
     {8, 2, 1, 14, 0, 1, 1, 0},  {27, 0, 3, 14, 0, 1, 1, 0}, {34, 2, 3, 14, 0, 1, 1, 0},
     {29, 2, 3, 14, 0, 1, 1, 0}, {31, 2, 3, 14, 0, 1, 1, 0}, {30, 0, 3, 14, 0, 1, 1, 0},
@@ -127,7 +118,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[18] = {
     {7, 2, 2, 17, 2, 2, 0, 0},  {6, 2, 2, 16, 2, 2, 0, 0},  {7, 0, 1, 14, 0, 1, 1, 0},
 };
 
-/* 80A69574-80A69694 0004EC 0120+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {
     {1, -1, 1},  {-1, 0, 0}, {-1, 0, 0},  {-1, 0, 0},  {4, -1, 1},  {5, 0, 0},   {-1, 0, 0},
     {-1, 0, 0},  {8, -1, 1}, {9, 0, 0},   {-1, 0, 0},  {-1, 0, 0},  {11, -1, 1}, {12, 0, 0},
@@ -142,7 +132,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] =
     {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A69694-80A69774 00060C 00E0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[56] = {
     {0, -1, 0},  {-1, 0, 0}, {-1, 0, 0},  {-1, 0, 0},  {1, -1, 1}, {0, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {4, -1, 0}, {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}, {8, -1, 1}, {0, -1, 0},
@@ -154,7 +143,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[56] = {
     {-1, 0, 0},  {-1, 0, 0}, {-1, 0, 0},  {17, 4, 1},  {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A69774-80A69784 -00001 0010+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Len_c */
 char* daNpc_Len_c::mCutNameList[4] = {
     "",
     "HURRY",
@@ -162,7 +150,6 @@ char* daNpc_Len_c::mCutNameList[4] = {
     "TAKE_WOODSTATUE",
 };
 
-/* 80A697A8-80A697D8 000720 0030+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Len_c */
 daNpc_Len_c::cutFunc daNpc_Len_c::mCutList[4] = {
     NULL,
     &daNpc_Len_c::cutHurry,
@@ -170,7 +157,6 @@ daNpc_Len_c::cutFunc daNpc_Len_c::mCutList[4] = {
     &daNpc_Len_c::cutTakeWoodStatue,
 };
 
-/* 80A6432C-80A64478 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__11daNpc_Len_cFv */
 daNpc_Len_c::~daNpc_Len_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -179,7 +165,6 @@ daNpc_Len_c::~daNpc_Len_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A64478-80A64740 000238 02C8+00 1/1 0/0 0/0 .text            create__11daNpc_Len_cFv */
 int daNpc_Len_c::create() {
     static const int heapSize[10] = {
         0x4380, 0x4380, 0x4380, 0x4380, 0x4380, 0x4380, 0x4380, 0x4380, 0x4380, 0x0,
@@ -230,7 +215,6 @@ int daNpc_Len_c::create() {
     return phase;
 }
 
-/* 80A64740-80A64A24 000500 02E4+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Len_cFv */
 int daNpc_Len_c::CreateHeap() {
     u32 bmd_idx = mTwilight == 1 ? 1 : 0;
     int arc_idx = l_bmdData[bmd_idx][1];
@@ -273,19 +257,16 @@ int daNpc_Len_c::CreateHeap() {
     return 0;
 }
 
-/* 80A64BE0-80A64C14 0009A0 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Len_cFv */
 int daNpc_Len_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Len_c();
     return 1;
 }
 
-/* 80A64C14-80A64C34 0009D4 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Len_cFv */
 int daNpc_Len_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A64C34-80A64CC8 0009F4 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Len_cFv */
 int daNpc_Len_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -294,14 +275,10 @@ int daNpc_Len_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80A64CC8-80A64CE8 000A88 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Len_cFP10fopAc_ac_c              */
 int daNpc_Len_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Len_c*>(i_this)->CreateHeap();
 }
 
-/* 80A64CE8-80A64D40 000AA8 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Len_cFP8J3DJointi
- */
 int daNpc_Len_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -315,7 +292,6 @@ int daNpc_Len_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80A64D40-80A64DB8 000B00 0078+00 2/1 0/0 0/0 .text            getType__11daNpc_Len_cFv */
 u8 daNpc_Len_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -340,7 +316,6 @@ u8 daNpc_Len_c::getType() {
     return TYPE_9;
 }
 
-/* 80A64DB8-80A64FBC 000B78 0204+00 2/1 0/0 0/0 .text            isDelete__11daNpc_Len_cFv */
 BOOL daNpc_Len_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -402,7 +377,6 @@ BOOL daNpc_Len_c::isDelete() {
     return false;
 }
 
-/* 80A64FBC-80A6516C 000D7C 01B0+00 1/1 0/0 0/0 .text            reset__11daNpc_Len_cFv */
 void daNpc_Len_c::reset() {
     int iVar1 = (u8*)&field_0xff0 - (u8*)&field_0xfcc;
     if (mpMatAnm[0] != NULL) {
@@ -423,7 +397,6 @@ void daNpc_Len_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 80A6516C-80A65278 000F2C 010C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Len_cFi */
 void daNpc_Len_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -437,7 +410,6 @@ void daNpc_Len_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A65278-80A6546C 001038 01F4+00 1/0 0/0 0/0 .text            setParam__11daNpc_Len_cFv */
 void daNpc_Len_c::setParam() {
     selectAction();
     srchActors();
@@ -507,7 +479,6 @@ void daNpc_Len_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A6546C-80A6556C 00122C 0100+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Len_cFv */
 BOOL daNpc_Len_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Len_c::talk)) {
         mPreItemNo = 0;
@@ -545,8 +516,6 @@ BOOL daNpc_Len_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A6556C-80A65624 00132C 00B8+00 2/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Len_cFv
- */
 void daNpc_Len_c::setAfterTalkMotion() {
     int iVar2 = MOT_UNK_17;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -574,7 +543,6 @@ void daNpc_Len_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80A65624-80A65710 0013E4 00EC+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Len_cFv */
 void daNpc_Len_c::srchActors() {
     switch (mType) {
     case TYPE_3:
@@ -598,7 +566,6 @@ void daNpc_Len_c::srchActors() {
     }
 }
 
-/* 80A65710-80A657B0 0014D0 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Len_cFv */
 BOOL daNpc_Len_c::evtTalk() {
     if (chkAction(&daNpc_Len_c::talk)) {
         (this->*mAction)(NULL);
@@ -608,7 +575,6 @@ BOOL daNpc_Len_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A657B0-80A65878 001570 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Len_cFv */
 BOOL daNpc_Len_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Len", this, -1);
     if (staffId != -1) {
@@ -623,7 +589,6 @@ BOOL daNpc_Len_c::evtCutProc() {
     return false;
 }
 
-/* 80A65878-80A65A60 001638 01E8+00 1/0 0/0 0/0 .text            action__11daNpc_Len_cFv */
 void daNpc_Len_c::action() {
     fopAc_ac_c* hit_actor = NULL;
 
@@ -676,7 +641,6 @@ void daNpc_Len_c::action() {
     }
 }
 
-/* 80A65A60-80A65B24 001820 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Len_cFv */
 void daNpc_Len_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -688,10 +652,8 @@ void daNpc_Len_c::beforeMove() {
     }
 }
 
-/* 80A69A64-80A69A68 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_LEN_HIO_CLASS l_HIO;
 
-/* 80A65B24-80A65E28 0018E4 0304+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Len_cFv */
 void daNpc_Len_c::setAttnPos() {
     cXyz acStack_40(-30.0f, 15.0f, 0.0f);
     cXyz cStack_4c(0.0f, 15.0f, 0.0f);
@@ -740,7 +702,6 @@ void daNpc_Len_c::setAttnPos() {
     setFootPos();
 }
 
-/* 80A65E28-80A65F80 001BE8 0158+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Len_cFv */
 void daNpc_Len_c::setCollision() {
     cXyz cStack_48;
 
@@ -779,12 +740,10 @@ void daNpc_Len_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A65F80-80A65F88 001D40 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Len_cFv */
 int daNpc_Len_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A65F88-80A66004 001D48 007C+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Len_cFv */
 int daNpc_Len_c::selectAction() {
     field_0xfcc = NULL;
 
@@ -799,14 +758,10 @@ int daNpc_Len_c::selectAction() {
     return 1;
 }
 
-/* 80A66004-80A66030 001DC4 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Len_cFM11daNpc_Len_cFPCvPvPv_i            */
 BOOL daNpc_Len_c::chkAction(actionFunc param_0) {
     return mAction == param_0;
 }
 
-/* 80A66030-80A660D8 001DF0 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Len_cFM11daNpc_Len_cFPCvPvPv_i            */
 int daNpc_Len_c::setAction(actionFunc param_0) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -822,8 +777,6 @@ int daNpc_Len_c::setAction(actionFunc param_0) {
     return 1;
 }
 
-/* 80A660D8-80A661B4 001E98 00DC+00 1/1 0/0 6/6 .text
- * checkStartDemo13StbEvt__11daNpc_Len_cFP10fopAc_ac_cfffffff   */
 BOOL daNpc_Len_c::checkStartDemo13StbEvt(fopAc_ac_c* i_npc_p, f32 i_box_min_x, f32 i_box_min_y,
                                          f32 i_box_min_z, f32 i_box_max_x, f32 i_box_max_y,
                                          f32 i_box_max_z, f32 i_box_offset) {
@@ -839,7 +792,6 @@ BOOL daNpc_Len_c::checkStartDemo13StbEvt(fopAc_ac_c* i_npc_p, f32 i_box_min_x, f
     return FALSE;
 }
 
-/* 80A661B4-80A66664 001F74 04B0+00 1/0 0/0 0/0 .text cutConversationInHotel__11daNpc_Len_cFi */
 int daNpc_Len_c::cutConversationInHotel(int param_0) {
     fopAc_ac_c* actor_p;
     int rv = 0;
@@ -936,7 +888,6 @@ int daNpc_Len_c::cutConversationInHotel(int param_0) {
     return rv;
 }
 
-/* 80A66664-80A668B8 002424 0254+00 1/0 0/0 0/0 .text            cutHurry__11daNpc_Len_cFi */
 int daNpc_Len_c::cutHurry(int param_0) {
     int rv = 0;
     int iVar5 = -1;
@@ -980,8 +931,6 @@ int daNpc_Len_c::cutHurry(int param_0) {
     return rv;
 }
 
-/* 80A668B8-80A66C74 002678 03BC+00 1/0 0/0 0/0 .text            cutTakeWoodStatue__11daNpc_Len_cFi
- */
 int daNpc_Len_c::cutTakeWoodStatue(int param_0) {
     fopAc_ac_c* actor_p;
     int iVar7 = -1;
@@ -1047,7 +996,6 @@ int daNpc_Len_c::cutTakeWoodStatue(int param_0) {
     return 1;
 }
 
-/* 80A66C74-80A6736C 002A34 06F8+00 1/0 0/0 0/0 .text            wait__11daNpc_Len_cFPv */
 int daNpc_Len_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1170,7 +1118,6 @@ int daNpc_Len_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A6736C-80A67794 00312C 0428+00 1/0 0/0 0/0 .text            patrol__11daNpc_Len_cFPv */
 int daNpc_Len_c::patrol(void* param_0) {
     cXyz cStack_48;
 
@@ -1255,7 +1202,6 @@ int daNpc_Len_c::patrol(void* param_0) {
     return 1;
 }
 
-/* 80A67794-80A67AA0 003554 030C+00 3/0 0/0 0/0 .text            talk__11daNpc_Len_cFPv */
 int daNpc_Len_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1323,39 +1269,32 @@ int daNpc_Len_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A67AA0-80A67AC0 003860 0020+00 1/0 0/0 0/0 .text            daNpc_Len_Create__FPv */
 static int daNpc_Len_Create(void* i_this) {
     return static_cast<daNpc_Len_c*>(i_this)->create();
 }
 
-/* 80A67AC0-80A67AE0 003880 0020+00 1/0 0/0 0/0 .text            daNpc_Len_Delete__FPv */
 static int daNpc_Len_Delete(void* i_this) {
     return static_cast<daNpc_Len_c*>(i_this)->Delete();
 }
 
-/* 80A67AE0-80A67B00 0038A0 0020+00 1/0 0/0 0/0 .text            daNpc_Len_Execute__FPv */
 static int daNpc_Len_Execute(void* i_this) {
     return static_cast<daNpc_Len_c*>(i_this)->Execute();
 }
 
-/* 80A67B00-80A67B20 0038C0 0020+00 1/0 0/0 0/0 .text            daNpc_Len_Draw__FPv */
 static int daNpc_Len_Draw(void* i_this) {
     return static_cast<daNpc_Len_c*>(i_this)->Draw();
 }
 
-/* 80A67B20-80A67B28 0038E0 0008+00 1/0 0/0 0/0 .text            daNpc_Len_IsDelete__FPv */
 static int daNpc_Len_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A69884-80A698A4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Len_MethodTable */
 static actor_method_class daNpc_Len_MethodTable = {
     (process_method_func)daNpc_Len_Create,  (process_method_func)daNpc_Len_Delete,
     (process_method_func)daNpc_Len_Execute, (process_method_func)daNpc_Len_IsDelete,
     (process_method_func)daNpc_Len_Draw,
 };
 
-/* 80A698A4-80A698D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_LEN */
 extern actor_process_profile_definition g_profile_NPC_LEN = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp
index 38368688d0..128ab10a68 100644
--- a/src/d/actor/d_a_npc_lf.cpp
+++ b/src/d/actor/d_a_npc_lf.cpp
@@ -11,14 +11,12 @@
 #include "d/actor/d_a_npc_lf.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80A6AA1C-80A6AA28 000000 000C+00 1/1 0/0 0/0 .data            wp$3976 */
 static f32 wp[3] = {
     0.5f,
     1.0f,
     2.5f
 };
 
-/* 80A69B6C-80A69BB4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__14daNPC_LF_HIO_cFv */
 daNPC_LF_HIO_c::daNPC_LF_HIO_c() {
     field_0x04 = -1;
     field_0x08 = 1.0f;
@@ -28,7 +26,6 @@ daNPC_LF_HIO_c::daNPC_LF_HIO_c() {
     field_0x18 = 250.0f;
 }
 
-/* 80A69BB4-80A69CD8 000134 0124+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -50,7 +47,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A69CD8-80A69D90 000258 00B8+00 1/0 0/0 0/0 .text            daNPC_LF_Draw__FP12npc_lf_class */
 static int daNPC_LF_Draw(npc_lf_class* i_this) {
     lf_s* fish = i_this->mFish;
     s8 j = 0;
@@ -74,17 +70,13 @@ static int daNPC_LF_Draw(npc_lf_class* i_this) {
     return 1;
 }
 
-/* 80A6AA90-80A6AA94 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80A6AA90;
 
-/* 80A6AAA0-80A6AABC 000018 001C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daNPC_LF_HIO_c l_HIO;
 
 f32 dummyLiteral1() { return 50.0f; }
 f32 dummyLiteral2() { return 0.0f; }
 
-/* 80A69D90-80A6A1B8 000310 0428+00 1/1 0/0 0/0 .text            npc_lf_move__FP10fopAc_ac_cP4lf_s
- */
 static void npc_lf_move(fopAc_ac_c* param_0, lf_s* pFish) {
     cXyz pos;
     s16 maxStepAngle;
@@ -162,7 +154,6 @@ static void npc_lf_move(fopAc_ac_c* param_0, lf_s* pFish) {
     cLib_addCalc2(&pFish->field_0x44, (pFish->field_0x3c * l_HIO.field_0x10), 1.0f, maxStep);
 }
 
-/* 80A6A1B8-80A6A420 000738 0268+00 1/1 0/0 0/0 .text            action__FP10fopAc_ac_cP4lf_s */
 static void action(fopAc_ac_c* param_0, lf_s* pFish) {
     cXyz pos;
     pFish->field_0x18++;
@@ -209,8 +200,6 @@ static void action(fopAc_ac_c* param_0, lf_s* pFish) {
     pFish->mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80A6A420-80A6A514 0009A0 00F4+00 2/1 0/0 0/0 .text            daNPC_LF_Execute__FP12npc_lf_class
- */
 static int daNPC_LF_Execute(npc_lf_class* i_this2) {
     npc_lf_class* i_this = (npc_lf_class*) i_this2;
     view_class* camera;
@@ -234,14 +223,10 @@ static int daNPC_LF_Execute(npc_lf_class* i_this2) {
     return 1;
 }
 
-/* 80A6A514-80A6A51C 000A94 0008+00 1/0 0/0 0/0 .text            daNPC_LF_IsDelete__FP12npc_lf_class
- */
 static bool daNPC_LF_IsDelete(npc_lf_class* param_0) {
     return true;
 }
 
-/* 80A6A51C-80A6A570 000A9C 0054+00 1/0 0/0 0/0 .text            daNPC_LF_Delete__FP12npc_lf_class
- */
 static int daNPC_LF_Delete(npc_lf_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "NPC_LF");
 
@@ -252,7 +237,6 @@ static int daNPC_LF_Delete(npc_lf_class* i_this) {
     return 1;
 }
 
-/* 80A6A570-80A6A650 000AF0 00E0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     u16 jnt_no;
     npc_lf_class* a_this = static_cast<npc_lf_class*>(i_this);
@@ -277,7 +261,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80A6A650-80A6A8A4 000BD0 0254+00 1/0 0/0 0/0 .text            daNPC_LF_Create__FP10fopAc_ac_c */
 static cPhs__Step daNPC_LF_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, npc_lf_class);
     npc_lf_class* a_this = static_cast<npc_lf_class*>(i_this);
@@ -335,16 +318,12 @@ static cPhs__Step daNPC_LF_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80A6A8A4-80A6A8E0 000E24 003C+00 1/1 0/0 0/0 .text            __dt__4lf_sFv */
 lf_s::~lf_s() {}
 
-/* 80A6A8E0-80A6A8E4 000E60 0004+00 1/1 0/0 0/0 .text            __ct__4lf_sFv */
 lf_s::lf_s() {}
 
-/* 80A6A8E4-80A6A92C 000E64 0048+00 2/1 0/0 0/0 .text            __dt__14daNPC_LF_HIO_cFv */
 daNPC_LF_HIO_c::~daNPC_LF_HIO_c() {}
 
-/* 80A6AA28-80A6AA48 -00001 0020+00 1/1 0/0 0/0 .data            l_daNPC_LF_Method */
 static actor_method_class l_daNPC_LF_Method = {
     (process_method_func)daNPC_LF_Create,
     (process_method_func)daNPC_LF_Delete,
@@ -353,7 +332,6 @@ static actor_method_class l_daNPC_LF_Method = {
     (process_method_func)daNPC_LF_Draw,
 };
 
-/* 80A6AA48-80A6AA78 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_LF */
 extern actor_process_profile_definition g_profile_NPC_LF = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp
index 39943afa7b..2aba09429e 100644
--- a/src/d/actor/d_a_npc_lud.cpp
+++ b/src/d/actor/d_a_npc_lud.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_len.h"
 #include "d/actor/d_a_npc_lud.h"
 
-/* 80A6FD7C-80A6FE0C 000000 0090+00 10/10 0/0 0/0 .rodata          m__17daNpc_Lud_Param_c */
 const daNpc_Lud_HIOParam daNpc_Lud_Param_c::m = {
     160.0f,  // attention_offset
     -3.0f,   // gravity
@@ -123,55 +122,46 @@ enum Motion {
     /* 0x13 */ MOT_UNK_19 = 19,
 };
 
-/* 80A6FFEC-80A70014 000020 0028+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[5][2] = {
     {11, 1}, {11, 2}, {39, 4}, {40, 4}, {38, 4},
 };
 
-/* 80A70014-80A70044 -00001 0030+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[6] = {
     {"", 0},      {"NO_RESPONSE", 0}, {"DEMO13_STB", 0}, {"CONVERSATION_ABOUT_GORON", 4},
     {"NURSE", 4}, {"GO_AHEAD", 4},
 };
 
-/* 80A70044-80A7005C -00001 0018+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[6] = {
     "", "Lud", "Lud_TW", "Lud1", "Lud2", "Len1",
 };
 
-/* 80A7005C-80A70060 000090 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     1,
     3,
     -1,
 };
 
-/* 80A70060-80A70064 000094 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     1,
     2,
     -1,
 };
 
-/* 80A70064-80A70068 000098 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {
     1,
     4,
     -1,
 };
 
-/* 80A70068-80A70070 00009C 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 s8 l_loadResPtrn9[5] = {
     1, 2, 3, 4, -1,
 };
 
-/* 80A70070-80A70094 -00001 0024+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[9] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2,
     l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn9,
 };
 
-/* 80A70094-80A702C4 0000C8 0230+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = {
     {-1, 0, 0, 17, 2, 1, 1}, {6, 0, 1, 17, 2, 1, 1},  {18, 2, 4, 51, 2, 4, 0},
     {15, 0, 4, 48, 0, 4, 0}, {16, 2, 4, 49, 2, 4, 0}, {17, 0, 4, 50, 0, 4, 0},
@@ -182,7 +172,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = {
     {8, 2, 2, 15, 2, 2, 0},  {7, 2, 2, 14, 2, 2, 0},
 };
 
-/* 80A702C4-80A70510 0002F8 024C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {8, 2, 1, 14, 0, 1, 1, 0},  {6, 0, 3, 14, 0, 1, 1, 0},  {7, 0, 3, 14, 0, 1, 1, 0},
     {7, 0, 1, 14, 0, 1, 1, 0},  {30, 2, 4, 14, 0, 1, 1, 0}, {33, 0, 4, 14, 0, 1, 1, 0},
@@ -193,7 +182,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[21] = {
     {5, 2, 3, 14, 0, 1, 0, 0},  {6, 2, 2, -1, 0, 0, 0, 0},  {5, 2, 2, -1, 0, 0, 0, 0},
 };
 
-/* 80A70510-80A70640 000544 0130+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[76] = {
     {1, -1, 1},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {7, -1, 1},  {8, -1, 0},  {-1, 0, 0},
     {-1, 0, 0},  {15, -1, 0}, {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {2, -1, 0},  {-1, 0, 0},
@@ -208,7 +196,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[76] =
     {-1, 0, 0},  {-1, 0, 0},  {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A70640-80A70780 000674 0140+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {1, -1, 1},  {0, -1, 0},  {-1, 0, 0},
     {-1, 0, 0},  {4, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {6, -1, 0},  {-1, 0, 0},
@@ -224,7 +211,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[80] = {
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A70780-80A707A0 -00001 0020+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Lud_c */
 char* daNpc_Lud_c::mCutNameList[8] = {
     "",
     "HURRY",
@@ -236,7 +222,6 @@ char* daNpc_Lud_c::mCutNameList[8] = {
     "THANK_YOU",
 };
 
-/* 80A707F4-80A70854 000828 0060+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Lud_c */
 daNpc_Lud_c::cutFunc daNpc_Lud_c::mCutList[8] = {
     NULL,
     &daNpc_Lud_c::cutHurry,
@@ -248,7 +233,6 @@ daNpc_Lud_c::cutFunc daNpc_Lud_c::mCutList[8] = {
     &daNpc_Lud_c::cutThankYou,
 };
 
-/* 80A6ABAC-80A6ACF4 0000EC 0148+00 1/0 0/0 0/0 .text            __dt__11daNpc_Lud_cFv */
 daNpc_Lud_c::~daNpc_Lud_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -261,7 +245,6 @@ daNpc_Lud_c::~daNpc_Lud_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A6ACF4-80A6AFA8 000234 02B4+00 1/1 0/0 0/0 .text            create__11daNpc_Lud_cFv */
 int daNpc_Lud_c::create() {
     static int const heapSize[9] = {
         0x3EF0, 0x3EF0, 0x3EF0, 0x3EF0, 0x46D0, 0x5000, 0x46E0, 0x3EF0, 0x0,
@@ -311,7 +294,6 @@ int daNpc_Lud_c::create() {
     return phase;
 }
 
-/* 80A6AFA8-80A6B440 0004E8 0498+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Lud_cFv */
 int daNpc_Lud_c::CreateHeap() {
     u32 bmd_idx = mTwilight == 1 ? 1 : 0;
     int arc_idx = l_bmdData[bmd_idx][1];
@@ -396,19 +378,16 @@ int daNpc_Lud_c::CreateHeap() {
     return 0;
 }
 
-/* 80A6B5FC-80A6B630 000B3C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Lud_cFv */
 int daNpc_Lud_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Lud_c();
     return 1;
 }
 
-/* 80A6B630-80A6B650 000B70 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Lud_cFv */
 int daNpc_Lud_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A6B650-80A6B6E4 000B90 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Lud_cFv */
 int daNpc_Lud_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -417,14 +396,10 @@ int daNpc_Lud_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80A6B6E4-80A6B704 000C24 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Lud_cFP10fopAc_ac_c              */
 int daNpc_Lud_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Lud_c*>(i_this)->CreateHeap();
 }
 
-/* 80A6B704-80A6B75C 000C44 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Lud_cFP8J3DJointi
- */
 int daNpc_Lud_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -438,7 +413,6 @@ int daNpc_Lud_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80A6B75C-80A6B7CC 000C9C 0070+00 2/1 0/0 0/0 .text            getType__11daNpc_Lud_cFv */
 u8 daNpc_Lud_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -461,7 +435,6 @@ u8 daNpc_Lud_c::getType() {
     return TYPE_8;
 }
 
-/* 80A6B7CC-80A6B954 000D0C 0188+00 2/1 0/0 0/0 .text            isDelete__11daNpc_Lud_cFv */
 BOOL daNpc_Lud_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -484,7 +457,6 @@ BOOL daNpc_Lud_c::isDelete() {
     return false;
 }
 
-/* 80A6B954-80A6BB1C 000E94 01C8+00 1/1 0/0 0/0 .text            reset__11daNpc_Lud_cFv */
 void daNpc_Lud_c::reset() {
     csXyz acStack_20;
 
@@ -522,7 +494,6 @@ void daNpc_Lud_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 80A6BB1C-80A6BBA8 00105C 008C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Lud_cFi */
 void daNpc_Lud_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -533,7 +504,6 @@ void daNpc_Lud_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A6BBA8-80A6BD44 0010E8 019C+00 1/0 0/0 0/0 .text            setParam__11daNpc_Lud_cFv */
 void daNpc_Lud_c::setParam() {
     selectAction();
     srchActors();
@@ -590,7 +560,6 @@ void daNpc_Lud_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A6BD44-80A6BE6C 001284 0128+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Lud_cFv */
 BOOL daNpc_Lud_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Lud_c::talk)) {
         mPreItemNo = 0;
@@ -627,8 +596,6 @@ BOOL daNpc_Lud_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A6BE6C-80A6BEE4 0013AC 0078+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Lud_cFv
- */
 void daNpc_Lud_c::setAfterTalkMotion() {
     int iVar2 = FACE_MOT_UNK_18;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -639,7 +606,6 @@ void daNpc_Lud_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80A6BEE4-80A6BFA4 001424 00C0+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Lud_cFv */
 void daNpc_Lud_c::srchActors() {
     switch (mType) {
     case TYPE_1:
@@ -658,7 +624,6 @@ void daNpc_Lud_c::srchActors() {
     }
 }
 
-/* 80A6BFA4-80A6C044 0014E4 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Lud_cFv */
 BOOL daNpc_Lud_c::evtTalk() {
     if (chkAction(&daNpc_Lud_c::talk)) {
         (this->*mAction)(NULL);
@@ -668,7 +633,6 @@ BOOL daNpc_Lud_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A6C044-80A6C10C 001584 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Lud_cFv */
 BOOL daNpc_Lud_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Lud", this, -1);
     if (staffId != -1) {
@@ -683,7 +647,6 @@ BOOL daNpc_Lud_c::evtCutProc() {
     return false;
 }
 
-/* 80A6C10C-80A6C2E4 00164C 01D8+00 1/0 0/0 0/0 .text            action__11daNpc_Lud_cFv */
 void daNpc_Lud_c::action() {
     fopAc_ac_c* hitActor = NULL;
     if (!mTwilight) {
@@ -719,7 +682,6 @@ void daNpc_Lud_c::action() {
     cLib_calcTimer(&field_0xfcc);
 }
 
-/* 80A6C2E4-80A6C3A8 001824 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Lud_cFv */
 void daNpc_Lud_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -731,10 +693,8 @@ void daNpc_Lud_c::beforeMove() {
     }
 }
 
-/* 80A70B64-80A70B68 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_LUD_HIO_CLASS l_HIO;
 
-/* 80A6C3A8-80A6C8EC 0018E8 0544+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Lud_cFv */
 void daNpc_Lud_c::setAttnPos() {
     cXyz cStack_70(5.0f, 30.0f, 0.0f);
     Mtx mtx;
@@ -809,7 +769,6 @@ void daNpc_Lud_c::setAttnPos() {
     }
 }
 
-/* 80A6C8EC-80A6CA9C 001E2C 01B0+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Lud_cFv */
 void daNpc_Lud_c::setCollision() {
     cXyz cStack_48;
 
@@ -854,12 +813,10 @@ void daNpc_Lud_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A6CA9C-80A6CAA4 001FDC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Lud_cFv */
 int daNpc_Lud_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A6CAA4-80A6CC2C 001FE4 0188+00 1/0 0/0 0/0 .text            drawOtherMdl__11daNpc_Lud_cFv */
 void daNpc_Lud_c::drawOtherMdl() {
     static int const jointNo[2] = {20, 20};
 
@@ -892,7 +849,6 @@ void daNpc_Lud_c::drawOtherMdl() {
     }
 }
 
-/* 80A6CC2C-80A6CCFC 00216C 00D0+00 1/1 0/0 0/0 .text            setBowlAnm__11daNpc_Lud_cFiif */
 bool daNpc_Lud_c::setBowlAnm(int i_index, int i_attr, f32 i_morf) {
     static struct {
         int resIdx;
@@ -919,7 +875,6 @@ bool daNpc_Lud_c::setBowlAnm(int i_index, int i_attr, f32 i_morf) {
     return true;
 }
 
-/* 80A6CCFC-80A6CD30 00223C 0034+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Lud_cFiifi */
 bool daNpc_Lud_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) {
     if (mCreating == true) {
         param_2 = 0.0f;
@@ -927,7 +882,6 @@ bool daNpc_Lud_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int p
     setBowlAnm(param_0, param_1, param_2);
 }
 
-/* 80A6CD30-80A6CDF4 002270 00C4+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Lud_cFv */
 int daNpc_Lud_c::selectAction() {
     field_0xfa8 = NULL;
 
@@ -948,14 +902,10 @@ int daNpc_Lud_c::selectAction() {
     return 1;
 }
 
-/* 80A6CDF4-80A6CE20 002334 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Lud_cFM11daNpc_Lud_cFPCvPvPv_i            */
 BOOL daNpc_Lud_c::chkAction(actionFunc param_0) {
     return mAction == param_0;
 }
 
-/* 80A6CE20-80A6CEC8 002360 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Lud_cFM11daNpc_Lud_cFPCvPvPv_i            */
 int daNpc_Lud_c::setAction(actionFunc param_0) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -971,7 +921,6 @@ int daNpc_Lud_c::setAction(actionFunc param_0) {
     return 1;
 }
 
-/* 80A6CEC8-80A6D01C 002408 0154+00 1/1 0/0 0/0 .text            mop__11daNpc_Lud_cFii */
 void daNpc_Lud_c::mop(int param_0, int param_1) {
     if (field_0xfc8 != 0) {
         action();
@@ -990,7 +939,6 @@ void daNpc_Lud_c::mop(int param_0, int param_1) {
     }
 }
 
-/* 80A6D01C-80A6D160 00255C 0144+00 1/0 0/0 0/0 .text            cutHurry__11daNpc_Lud_cFi */
 int daNpc_Lud_c::cutHurry(int param_0) {
     int rv = 0;
     int iVar3 = -1;
@@ -1020,7 +968,6 @@ int daNpc_Lud_c::cutHurry(int param_0) {
     return rv;
 }
 
-/* 80A6D160-80A6D450 0026A0 02F0+00 1/0 0/0 0/0 .text cutConversationInHotel__11daNpc_Lud_cFi */
 int daNpc_Lud_c::cutConversationInHotel(int param_0) {
     int rv = 0;
     int iVar7 = -1;
@@ -1097,8 +1044,6 @@ int daNpc_Lud_c::cutConversationInHotel(int param_0) {
     return rv;
 }
 
-/* 80A6D450-80A6D708 002990 02B8+00 1/0 0/0 0/0 .text cutConversationAboutDeathMt__11daNpc_Lud_cFi
- */
 int daNpc_Lud_c::cutConversationAboutDeathMt(int param_0) {
     int rv = 0;
     int iVar3 = -1;
@@ -1155,8 +1100,6 @@ int daNpc_Lud_c::cutConversationAboutDeathMt(int param_0) {
     return rv;
 }
 
-/* 80A6D708-80A6D998 002C48 0290+00 1/0 0/0 0/0 .text cutConversationAboutGoron__11daNpc_Lud_cFi
- */
 int daNpc_Lud_c::cutConversationAboutGoron(int param_0) {
     int rv = 0;
     int iVar4 = -1;
@@ -1212,7 +1155,6 @@ int daNpc_Lud_c::cutConversationAboutGoron(int param_0) {
     return rv;
 }
 
-/* 80A6D998-80A6DC48 002ED8 02B0+00 1/0 0/0 0/0 .text            cutNurse__11daNpc_Lud_cFi */
 int daNpc_Lud_c::cutNurse(int param_0) {
     int rv = 0;
     int iVar3 = -1;
@@ -1270,7 +1212,6 @@ int daNpc_Lud_c::cutNurse(int param_0) {
     return rv;
 }
 
-/* 80A6DC48-80A6DCE8 003188 00A0+00 1/0 0/0 0/0 .text            cutClothTry__11daNpc_Lud_cFi */
 int daNpc_Lud_c::cutClothTry(int param_0) {
     int rv = 0;
     int iVar2 = -1;
@@ -1291,7 +1232,6 @@ int daNpc_Lud_c::cutClothTry(int param_0) {
     return rv;
 }
 
-/* 80A6DCE8-80A6DE14 003228 012C+00 1/0 0/0 0/0 .text            cutThankYou__11daNpc_Lud_cFi */
 int daNpc_Lud_c::cutThankYou(int param_0) {
     int rv = 0;
     int iVar3 = -1;
@@ -1325,7 +1265,6 @@ int daNpc_Lud_c::cutThankYou(int param_0) {
     return rv;
 }
 
-/* 80A6DE14-80A6E32C 003354 0518+00 1/0 0/0 0/0 .text            wait__11daNpc_Lud_cFPv */
 int daNpc_Lud_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1427,7 +1366,6 @@ int daNpc_Lud_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A6E32C-80A6E6EC 00386C 03C0+00 2/0 0/0 0/0 .text            nurse__11daNpc_Lud_cFPv */
 int daNpc_Lud_c::nurse(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1495,7 +1433,6 @@ int daNpc_Lud_c::nurse(void* param_0) {
     return 1;
 }
 
-/* 80A6E6EC-80A6E7EC 003C2C 0100+00 1/0 0/0 0/0 .text            giveSoup__11daNpc_Lud_cFPv */
 int daNpc_Lud_c::giveSoup(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1513,7 +1450,6 @@ int daNpc_Lud_c::giveSoup(void* param_0) {
     return 1;
 }
 
-/* 80A6E7EC-80A6E9FC 003D2C 0210+00 3/0 0/0 0/0 .text            talk__11daNpc_Lud_cFPv */
 int daNpc_Lud_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1549,39 +1485,32 @@ int daNpc_Lud_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80A6E9FC-80A6EA1C 003F3C 0020+00 1/0 0/0 0/0 .text            daNpc_Lud_Create__FPv */
 static int daNpc_Lud_Create(void* i_this) {
     return static_cast<daNpc_Lud_c*>(i_this)->create();
 }
 
-/* 80A6EA1C-80A6EA3C 003F5C 0020+00 1/0 0/0 0/0 .text            daNpc_Lud_Delete__FPv */
 static int daNpc_Lud_Delete(void* i_this) {
     return static_cast<daNpc_Lud_c*>(i_this)->Delete();
 }
 
-/* 80A6EA3C-80A6EA5C 003F7C 0020+00 1/0 0/0 0/0 .text            daNpc_Lud_Execute__FPv */
 static int daNpc_Lud_Execute(void* i_this) {
     return static_cast<daNpc_Lud_c*>(i_this)->Execute();
 }
 
-/* 80A6EA5C-80A6EA7C 003F9C 0020+00 1/0 0/0 0/0 .text            daNpc_Lud_Draw__FPv */
 static int daNpc_Lud_Draw(void* i_this) {
     return static_cast<daNpc_Lud_c*>(i_this)->Draw();
 }
 
-/* 80A6EA7C-80A6EA84 003FBC 0008+00 1/0 0/0 0/0 .text            daNpc_Lud_IsDelete__FPv */
 static int daNpc_Lud_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A70990-80A709B0 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Lud_MethodTable */
 static actor_method_class daNpc_Lud_MethodTable = {
     (process_method_func)daNpc_Lud_Create,  (process_method_func)daNpc_Lud_Delete,
     (process_method_func)daNpc_Lud_Execute, (process_method_func)daNpc_Lud_IsDelete,
     (process_method_func)daNpc_Lud_Draw,
 };
 
-/* 80A709B0-80A709E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_LUD */
 extern actor_process_profile_definition g_profile_NPC_LUD = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp
index 4b9bed6917..086e5eb6ce 100644
--- a/src/d/actor/d_a_npc_maro.cpp
+++ b/src/d/actor/d_a_npc_maro.cpp
@@ -18,20 +18,14 @@
 #include "d/d_item.h"
 #include "d/d_timer.h"
 
-//
-// Declarations:
-//
-
 daNpc_Maro_c::actionFunc dummy_lit_4085() {
     return &daNpc_Maro_c::choccai;
 }
 
-/* 80564FBC-80564FCC 00002C 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {11, 1}, {5, 2},
 };
 
-/* 80564FCC-80565044 -00001 0078+00 0/1 0/0 0/0 .data            l_evtList */
 daNpcT_evtData_c l_evtList[15] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -50,7 +44,6 @@ daNpcT_evtData_c l_evtList[15] = {
     {"TALK_TO_KAKASHI", 3},
 };
 
-/* 80565044-8056506C -00001 0028+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[10] = {
     "",
     "Maro",
@@ -64,19 +57,14 @@ static char* l_resNameList[10] = {
     "Besu1",
 };
 
-/* 8056506C-80565070 0000DC 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {1, 3, -1};
 
-/* 80565070-80565074 0000E0 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {1, 2, -1};
 
-/* 80565074-80565078 0000E4 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[4] = {1, 3, 4, -1};
 
-/* 80565078-80565080 0000E8 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[5] = {1, 2, 3, 4, -1};
 
-/* 80565080-805650C4 -00001 0044+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[17] = {
     l_loadResPtrn2, l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn1,
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2,
@@ -85,7 +73,6 @@ static s8* l_loadResPtrnList[17] = {
     l_loadResPtrn3,
 };
 
-/* 805650C4-805651DC 000134 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, 0, 0, 17, 2, 1, 1},
     {6, 0, 1, 18, 0, 1, 0},
@@ -99,7 +86,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {7, 2, 5, 11, 2, 5, 0},
 };
 
-/* 805651DC-805652F4 00024C 0118+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {8, 2, 1, 14, 0, 1, 1, 0},
     {5, 2, 4, 14, 0, 1, 1, 0},
@@ -113,7 +99,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {10, 2, 3, 14, 0, 1, 1, 0},
 };
 
-/* 805652F4-80565394 000364 00A0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -122,7 +107,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] =
     {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80565394-80565424 000404 0090+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -131,7 +115,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80565424-80565468 -00001 0044+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Maro_c */
 char* daNpc_Maro_c::mCutNameList[17] = {
     "",
     "CONVERSATION_ABOUT_PACHINKO",
@@ -152,7 +135,6 @@ char* daNpc_Maro_c::mCutNameList[17] = {
     "TALK_TO_KAKASHI",
 };
 
-/* 80565528-805655F4 000598 00CC+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Maro_c */
 daNpc_Maro_c::cutFunc daNpc_Maro_c::mCutList[17] = {
     NULL,
     &daNpc_Maro_c::cutConversationAboutPachinko,
@@ -173,7 +155,6 @@ daNpc_Maro_c::cutFunc daNpc_Maro_c::mCutList[17] = {
     &daNpc_Maro_c::cutTalkToKakashi,
 };
 
-/* 8055B58C-8055B6E0 0000EC 0154+00 1/0 0/0 0/0 .text            __dt__12daNpc_Maro_cFv */
 daNpc_Maro_c::~daNpc_Maro_c() {
     deleteObject();
     if (field_0x10bc != 0xFFFFFFFF) {
@@ -187,8 +168,6 @@ daNpc_Maro_c::~daNpc_Maro_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80564BAC-80564C3C 000000 0090+00 15/15 0/0 0/0 .rodata          m__18daNpc_Maro_Param_c */
 const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = {
     100.0f,
     -3.0f,
@@ -234,7 +213,6 @@ const daNpc_Maro_HIOParam daNpc_Maro_Param_c::m = {
     0x00780000,
 };
 
-/* 8055B6E0-8055B9A8 000240 02C8+00 1/1 0/0 0/0 .text            create__12daNpc_Maro_cFv */
 int daNpc_Maro_c::create() {
     static int const heapSize[17] = {
         0x3310, 0x3310,      0, 0x3260,
@@ -292,7 +270,6 @@ int daNpc_Maro_c::create() {
     return rv;
 }
 
-/* 8055B9A8-8055BC2C 000508 0284+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Maro_cFv */
 int daNpc_Maro_c::CreateHeap() {
     int bmd_get_idx;
     if (mTwilight == 1) {
@@ -331,14 +308,12 @@ int daNpc_Maro_c::CreateHeap() {
     return 0;
 }
 
-/* 8055BDE8-8055BE1C 000948 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Maro_cFv */
 int daNpc_Maro_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Maro_c();
     return 1;
 }
 
-/* 8055BE1C-8055BF0C 00097C 00F0+00 2/2 0/0 0/0 .text            Execute__12daNpc_Maro_cFv */
 int daNpc_Maro_c::Execute() {
     if (!mCreating && !checkShopOpen() && mActorMngr[5].getActorP() != NULL && mType == 7 && !field_0x1131) {
         initShopSystem();
@@ -358,7 +333,6 @@ int daNpc_Maro_c::Execute() {
     return 1;
 }
 
-/* 8055BF0C-8055BFA0 000A6C 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Maro_cFv */
 int daNpc_Maro_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -367,14 +341,10 @@ int daNpc_Maro_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 8055BFA0-8055BFC0 000B00 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_Maro_cFP10fopAc_ac_c             */
 int daNpc_Maro_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Maro_c*>(i_this)->CreateHeap();
 }
 
-/* 8055BFC0-8055C018 000B20 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpc_Maro_cFP8J3DJointi                */
 int daNpc_Maro_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -387,7 +357,6 @@ int daNpc_Maro_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 8055C018-8055C0B4 000B78 009C+00 1/1 0/0 0/0 .text            srchArrow__12daNpc_Maro_cFPvPv */
 void* daNpc_Maro_c::srchArrow(void* param_1, void* param_2) {
     if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) {
         if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW) {
@@ -398,7 +367,6 @@ void* daNpc_Maro_c::srchArrow(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 8055C0B4-8055C1AC 000C14 00F8+00 1/1 0/0 0/0 .text            getArrowP__12daNpc_Maro_cFv */
 fopAc_ac_c* daNpc_Maro_c::getArrowP() {
     fopAc_ac_c* pActor = NULL;
     f32 minDist = G_CM3D_F_INF;
@@ -415,7 +383,6 @@ fopAc_ac_c* daNpc_Maro_c::getArrowP() {
     return pActor;
 }
 
-/* 8055C1AC-8055C248 000D0C 009C+00 1/1 0/0 0/0 .text            srchItaMato__12daNpc_Maro_cFPvPv */
 void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) {
     fopAc_ac_c* fop1 = (fopAc_ac_c*) arg1;
     if (mFindCount < 50 && arg0 != NULL && arg0 != fop1) {
@@ -427,7 +394,6 @@ void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) {
     return NULL;
 }
 
-/* 8055C248-8055C330 000DA8 00E8+00 1/1 0/0 0/0 .text            getItaMatoP__12daNpc_Maro_cFi */
 fopAc_ac_c* daNpc_Maro_c::getItaMatoP(int param_0) {
     fopAc_ac_c* pActor = NULL;
     f32 minDist = G_CM3D_F_INF;
@@ -448,7 +414,6 @@ fopAc_ac_c* daNpc_Maro_c::getItaMatoP(int param_0) {
     return pActor;
 }
 
-/* 8055C330-8055C3E0 000E90 00B0+00 2/1 0/0 0/0 .text            getType__12daNpc_Maro_cFv */
 u8 daNpc_Maro_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -489,7 +454,6 @@ u8 daNpc_Maro_c::getType() {
     }
 }
 
-/* 8055C3E0-8055C614 000F40 0234+00 2/1 0/0 0/0 .text            isDelete__12daNpc_Maro_cFv */
 int daNpc_Maro_c::isDelete() {
     switch (mType) {
         case 0: {
@@ -562,7 +526,6 @@ int daNpc_Maro_c::isDelete() {
     }
 }
 
-/* 8055C614-8055C834 001174 0220+00 1/1 0/0 0/0 .text            reset__12daNpc_Maro_cFv */
 void daNpc_Maro_c::reset() {
     csXyz acStack_20;
     int iVar1 = (u8*)&field_0x113C - (u8*)&field_0x110c;
@@ -612,7 +575,6 @@ void daNpc_Maro_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 8055C834-8055C8B0 001394 007C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Maro_cFi */
 void daNpc_Maro_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleX(1));
@@ -623,7 +585,6 @@ void daNpc_Maro_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 8055C8B0-8055CB14 001410 0264+00 1/0 0/0 0/0 .text            setParam__12daNpc_Maro_cFv */
 void daNpc_Maro_c::setParam() {
     if (field_0x1130) {
         if (field_0x112c == 2) {
@@ -699,7 +660,6 @@ void daNpc_Maro_c::setParam() {
     gravity = daNpc_Maro_Param_c::m.common.gravity;
 }
 
-/* 8055CB14-8055CC9C 001674 0188+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Maro_cFv */
 BOOL daNpc_Maro_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Maro_c::talk)) {
         mPreItemNo = 0;
@@ -762,7 +722,6 @@ BOOL daNpc_Maro_c::checkChangeEvt() {
     return false;
 }
 
-/* 8055CC9C-8055CCD8 0017FC 003C+00 1/0 0/0 0/0 .text            evtEndProc__12daNpc_Maro_cFv */
 BOOL daNpc_Maro_c::evtEndProc() {
     if (field_0x1138) {
         dCam_getBody()->CorrectCenter();
@@ -771,7 +730,6 @@ BOOL daNpc_Maro_c::evtEndProc() {
     return 1;
 }
 
-/* 8055CCD8-8055CD74 001838 009C+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Maro_cFv */
 void daNpc_Maro_c::setAfterTalkMotion() {
     int iVar2 = 9;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -788,7 +746,6 @@ void daNpc_Maro_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 8055CD74-8055D0D8 0018D4 0364+00 2/1 0/0 0/0 .text            srchActors__12daNpc_Maro_cFv */
 void daNpc_Maro_c::srchActors() {
     switch (mType) {
         case TYPE_0: {
@@ -903,7 +860,6 @@ void daNpc_Maro_c::srchActors() {
     }
 }
 
-/* 8055D0D8-8055D1F4 001C38 011C+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Maro_cFv */
 BOOL daNpc_Maro_c::evtTalk() {
     if (field_0x1131) {
         if (chkAction(&daNpc_Maro_c::shop)) {
@@ -922,7 +878,6 @@ BOOL daNpc_Maro_c::evtTalk() {
     return 1;
 }
 
-/* 8055D1F4-8055D368 001D54 0174+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Maro_cFv */
 BOOL daNpc_Maro_c::evtCutProc() {
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Maro", this, -1);
     if (staff_id != -1) {
@@ -950,7 +905,6 @@ BOOL daNpc_Maro_c::evtCutProc() {
     return 0;
 }
 
-/* 8055D368-8055D5C4 001EC8 025C+00 1/0 0/0 0/0 .text            action__12daNpc_Maro_cFv */
 void daNpc_Maro_c::action() {
     fopAc_ac_c* actor_p = NULL;
     if (!mTwilight) {
@@ -1001,7 +955,6 @@ void daNpc_Maro_c::action() {
     }
 }
 
-/* 8055D5C4-8055D688 002124 00C4+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Maro_cFv */
 void daNpc_Maro_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -1012,7 +965,6 @@ void daNpc_Maro_c::beforeMove() {
     }
 }
 
-/* 8055D688-8055D918 0021E8 0290+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Maro_cFv */
 void daNpc_Maro_c::setAttnPos() {
     cXyz eyeOffset(0.0f, 0.0f, -30.0f);
     if (field_0x1133) {
@@ -1041,7 +993,6 @@ void daNpc_Maro_c::setAttnPos() {
     attention_info.position = current.pos + eyeOffset;
 }
 
-/* 8055D918-8055DA70 002478 0158+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Maro_cFv */
 void daNpc_Maro_c::setCollision() {
     cXyz cStack_48;
     if (!mHide) {
@@ -1074,12 +1025,10 @@ void daNpc_Maro_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 8055DA70-8055DA78 0025D0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Maro_cFv */
 BOOL daNpc_Maro_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 8055DA78-8055DAD8 0025D8 0060+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Maro_cFv */
 void daNpc_Maro_c::drawOtherMdl() {
     if (field_0x1131) {
         cXyz my_vec;
@@ -1090,8 +1039,6 @@ void daNpc_Maro_c::drawOtherMdl() {
     }
 }
 
-/* 8055DAD8-8055DB64 002638 008C+00 1/0 0/0 0/0 .text
- * getFaceMotionAnm__12daNpc_Maro_cF26daNpcT_faceMotionAnmData_c */
  daNpcT_faceMotionAnmData_c daNpc_Maro_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
     daNpcT_faceMotionAnmData_c rv = param_0;
     if (mTwilight != TYPE_0 && rv.mBtpFileIdx == 17) {
@@ -1101,8 +1048,6 @@ void daNpc_Maro_c::drawOtherMdl() {
     return rv;
 }
 
-/* 8055DB64-8055DBF0 0026C4 008C+00 1/0 0/0 0/0 .text
- * getMotionAnm__12daNpc_Maro_cF22daNpcT_motionAnmData_c        */
  daNpcT_motionAnmData_c daNpc_Maro_c::getMotionAnm(daNpcT_motionAnmData_c param_0) {
     daNpcT_motionAnmData_c rv = param_0;
     if (mTwilight && rv.mBtkFileIdx == 14) {
@@ -1112,7 +1057,6 @@ void daNpc_Maro_c::drawOtherMdl() {
     return rv;
 }
 
-/* 8055DBF0-8055DD08 002750 0118+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Maro_cFv */
 int daNpc_Maro_c::selectAction() {
     field_0x110c = NULL;
     switch (mType) {
@@ -1145,14 +1089,10 @@ int daNpc_Maro_c::selectAction() {
     return 1;
 }
 
-/* 8055DD08-8055DD34 002868 002C+00 2/2 0/0 0/0 .text
- * chkAction__12daNpc_Maro_cFM12daNpc_Maro_cFPCvPvPv_i          */
 int daNpc_Maro_c::chkAction(int (daNpc_Maro_c::*param_0)(void*)) {
     return field_0x1118 == param_0;
 }
 
-/* 8055DD34-8055DDDC 002894 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_Maro_cFM12daNpc_Maro_cFPCvPvPv_i          */
 int daNpc_Maro_c::setAction(int (daNpc_Maro_c::*action)(void*)) {
     mMode = MODE_EXIT;
     if (field_0x1118 != NULL) {
@@ -1166,8 +1106,6 @@ int daNpc_Maro_c::setAction(int (daNpc_Maro_c::*action)(void*)) {
     return 1;
 }
 
-/* 8055DDDC-8055DF7C 00293C 01A0+00 1/0 0/0 0/0 .text
- * cutConversationAboutPachinko__12daNpc_Maro_cFi               */
 int daNpc_Maro_c::cutConversationAboutPachinko(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1209,8 +1147,6 @@ int daNpc_Maro_c::cutConversationAboutPachinko(int arg0) {
     return retval;
 }
 
-/* 8055DF7C-8055E124 002ADC 01A8+00 1/0 0/0 0/0 .text
- * cutConversationAboutWoodSwd__12daNpc_Maro_cFi                */
 int daNpc_Maro_c::cutConversationAboutWoodSwd(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1257,7 +1193,6 @@ int daNpc_Maro_c::cutConversationAboutWoodSwd(int arg0) {
     return retval;
 }
 
-/* 8055E124-8055E414 002C84 02F0+00 1/0 0/0 0/0 .text            cutSwdTutorial__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutSwdTutorial(int arg0) {
     cXyz my_vec_0;
     int retval = 0;
@@ -1316,7 +1251,6 @@ int daNpc_Maro_c::cutSwdTutorial(int arg0) {
     return retval;
 }
 
-/* 8055E414-8055E578 002F74 0164+00 1/0 0/0 0/0 .text            cutHail__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutHail(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1356,7 +1290,6 @@ int daNpc_Maro_c::cutHail(int arg0) {
     return retval;
 }
 
-/* 8055E578-8055E968 0030D8 03F0+00 1/0 0/0 0/0 .text            cutFindMonkey__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutFindMonkey(int arg0) {
     daHorse_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -1449,8 +1382,6 @@ int daNpc_Maro_c::cutFindMonkey(int arg0) {
     return retval;
 }
 
-/* 8055E968-8055ECF4 0034C8 038C+00 1/0 0/0 0/0 .text            cutGiveMeWoodSwd__12daNpc_Maro_cFi
- */
 int daNpc_Maro_c::cutGiveMeWoodSwd(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -1522,7 +1453,6 @@ int daNpc_Maro_c::cutGiveMeWoodSwd(int arg0) {
     return retval;
 }
 
-/* 8055ECF4-8055F508 003854 0814+00 3/0 0/0 0/0 .text            cutGetWoodSwd__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutGetWoodSwd(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -1668,7 +1598,6 @@ int daNpc_Maro_c::cutGetWoodSwd(int arg0) {
     return retval;
 }
 
-/* 8055F508-8055F634 004068 012C+00 1/0 0/0 0/0 .text cutConversationWithMaro__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutConversationWithMaro(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -1694,7 +1623,6 @@ int daNpc_Maro_c::cutConversationWithMaro(int arg0) {
     return retval;
 }
 
-/* 8055F634-8055F82C 004194 01F8+00 1/0 0/0 0/0 .text cutCacaricoConversation__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutCacaricoConversation(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1744,7 +1672,6 @@ int daNpc_Maro_c::cutCacaricoConversation(int arg0) {
     return retval;
 }
 
-/* 8055F82C-8055FAF0 00438C 02C4+00 1/0 0/0 0/0 .text            cutSurprise__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutSurprise(int arg0) {
     daTag_Push_c* push_p = (daTag_Push_c*) field_0xba0.getActorP();
     int retval = 0;
@@ -1798,8 +1725,6 @@ int dummy_lit_6272(int arg) {
     return dummy_vals[arg];
 }
 
-/* 8055FAF0-805611E0 004650 16F0+00 3/0 0/0 0/0 .text            cutArrowTutorial__12daNpc_Maro_cFi
- */
 int daNpc_Maro_c::cutArrowTutorial(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0, temp, my_vec_2;
@@ -2552,7 +2477,6 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
     return retval;
 }
 
-/* 805611E0-80561328 005D40 0148+00 1/0 0/0 0/0 .text            cutBokinTalk__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutBokinTalk(int arg0) {
     daTag_Push_c* push_p = (daTag_Push_c*) field_0xba0.getActorP();
     (void) push_p;
@@ -2585,8 +2509,6 @@ int daNpc_Maro_c::cutBokinTalk(int arg0) {
     return retval;
 }
 
-/* 80561328-80561614 005E88 02EC+00 1/0 0/0 0/0 .text            cutMarosWhisper__12daNpc_Maro_cFi
- */
 int daNpc_Maro_c::cutMarosWhisper(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -2671,7 +2593,6 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) {
     return retval;
 }
 
-/* 80561614-8056178C 006174 0178+00 1/0 0/0 0/0 .text            cutTagPush1__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutTagPush1(int arg0) {
     int* param_p = NULL;
     int prm_val = -1;
@@ -2710,7 +2631,6 @@ int daNpc_Maro_c::cutTagPush1(int arg0) {
     return 1;
 }
 
-/* 8056178C-80561E70 0062EC 06E4+00 3/0 0/0 0/0 .text            cutNotGonnaLet__12daNpc_Maro_cFi */
 int daNpc_Maro_c::cutNotGonnaLet(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -2845,8 +2765,6 @@ int daNpc_Maro_c::cutNotGonnaLet(int arg0) {
     return retval;
 }
 
-/* 80561E70-80562174 0069D0 0304+00 1/0 0/0 0/0 .text            cutTalkToKakashi__12daNpc_Maro_cFi
- */
 int daNpc_Maro_c::cutTalkToKakashi(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz my_vec_0;
@@ -2916,7 +2834,6 @@ int daNpc_Maro_c::cutTalkToKakashi(int arg0) {
     return retval;
 }
 
-/* 80562174-805629A4 006CD4 0830+00 2/0 0/0 0/0 .text            wait__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::wait(void* param_0) {
     fopAc_ac_c* actor_p = NULL;
     switch (mMode) {
@@ -3121,7 +3038,6 @@ int daNpc_Maro_c::wait(void* param_0) {
     return 1;
 }
 
-/* 805629A4-80562B14 007504 0170+00 2/0 0/0 0/0 .text            swdTutorial__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::swdTutorial(void* ) {
     switch (mMode) {
         case 0:
@@ -3160,7 +3076,6 @@ int daNpc_Maro_c::swdTutorial(void* ) {
     return 1;
 }
 
-/* 80562B14-80562CA4 007674 0190+00 1/0 0/0 0/0 .text            talk_withTaro__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::talk_withTaro(void* ) {
     switch (mMode) {
         case 0:
@@ -3195,7 +3110,6 @@ int daNpc_Maro_c::talk_withTaro(void* ) {
     return 1;
 }
 
-/* 80562CA4-80562EC8 007804 0224+00 1/0 0/0 2/0 .text            choccai__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::choccai(void* ) {
     fopAc_ac_c* actor_p = NULL;
     switch (mMode) {
@@ -3238,7 +3152,6 @@ int daNpc_Maro_c::choccai(void* ) {
     return 1;
 }
 
-/* 80562EC8-8056319C 007A28 02D4+00 2/0 0/0 0/0 .text            tend__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::tend(void* ) {
     daTag_ShopItem_c* actor_p = (daTag_ShopItem_c*) mActorMngr[5].getActorP();
     int do_step = 0;
@@ -3295,7 +3208,6 @@ int daNpc_Maro_c::tend(void* ) {
     return 1;
 }
 
-/* 8056319C-8056342C 007CFC 0290+00 3/0 0/0 0/0 .text            arrowTutorial__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::arrowTutorial(void* ) {
     daTag_EvtArea_c* actor_p = NULL;
     int unused = 0;
@@ -3362,7 +3274,6 @@ int daNpc_Maro_c::arrowTutorial(void* ) {
     return 1;
 }
 
-/* 8056342C-80563660 007F8C 0234+00 3/0 0/0 0/0 .text            talk__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::talk(void* param_0) {
     switch (mMode) {
         case 0:
@@ -3413,7 +3324,6 @@ int daNpc_Maro_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80563660-80563780 0081C0 0120+00 2/0 0/0 0/0 .text            shop__12daNpc_Maro_cFPv */
 int daNpc_Maro_c::shop(void* param_0) {
     int retval = 0;
     switch (mMode) {
@@ -3451,35 +3361,28 @@ int daNpc_Maro_c::shop(void* param_0) {
     return retval;
 }
 
-/* 80563780-805637A0 0082E0 0020+00 1/0 0/0 0/0 .text            daNpc_Maro_Create__FPv */
 static int daNpc_Maro_Create(void* i_this) {
     return static_cast<daNpc_Maro_c*>(i_this)->create();
 }
 
-/* 805637A0-805637C0 008300 0020+00 1/0 0/0 0/0 .text            daNpc_Maro_Delete__FPv */
 static int daNpc_Maro_Delete(void* i_this) {
     return static_cast<daNpc_Maro_c*>(i_this)->Delete();
 }
 
-/* 805637C0-805637E0 008320 0020+00 1/0 0/0 0/0 .text            daNpc_Maro_Execute__FPv */
 static int daNpc_Maro_Execute(void* i_this) {
     return static_cast<daNpc_Maro_c*>(i_this)->Execute();
 }
 
-/* 805637E0-80563800 008340 0020+00 1/0 0/0 0/0 .text            daNpc_Maro_Draw__FPv */
 static int daNpc_Maro_Draw(void* i_this) {
     return static_cast<daNpc_Maro_c*>(i_this)->Draw();
 }
 
-/* 80563800-80563808 008360 0008+00 1/0 0/0 0/0 .text            daNpc_Maro_IsDelete__FPv */
 static int daNpc_Maro_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80565D94-80565D98 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Maro_Param_c l_HIO;
 
-/* 80565BB8-80565BD8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Maro_MethodTable */
 static actor_method_class daNpc_Maro_MethodTable = {
     (process_method_func)daNpc_Maro_Create,
     (process_method_func)daNpc_Maro_Delete,
@@ -3488,7 +3391,6 @@ static actor_method_class daNpc_Maro_MethodTable = {
     (process_method_func)daNpc_Maro_Draw,
 };
 
-/* 80565BD8-80565C08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_MARO */
 extern actor_process_profile_definition g_profile_NPC_MARO = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp
index dc6468a7b1..caa6462764 100644
--- a/src/d/actor/d_a_npc_midp.cpp
+++ b/src/d/actor/d_a_npc_midp.cpp
@@ -21,62 +21,50 @@ enum midP_RES_File_ID {
     /* 0xF */ BTP_MIDP = 0xF,
 };
 
-/* 80A73AD4-80A73ADC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_MIDP, 1},
 };
 
-/* 80A73ADC-80A73AEC -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80A73AEC-80A73AF4 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "midP"
 };
 
-/* 80A73AF4-80A73AF8 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[1 + 1 /* padding */] = {
     1,
     -1
 };
 
-/* 80A73AF8-80A73B00 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80A73B00-80A73B1C 00004C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {
     -1, 0, 0, 15, 2, 1, 1
 };
 
-/* 80A73B1C-80A73B38 000068 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData = {
     6, 2, 1, 12, 0, 1, 1, 0
 };
 
-/* 80A73B38-80A73B48 000084 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80A73B48-80A73B58 000094 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80A73B58-80A73B5C -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_midP_c */
 char* daNpc_midP_c::mCutNameList = "";
 
-/* 80A73B5C-80A73B68 0000A8 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_midP_c */
 daNpc_midP_c::cutFunc daNpc_midP_c::mCutList[1] = { 0 };
 
-/* 80A70C6C-80A70D90 0000EC 0124+00 1/0 0/0 0/0 .text            __dt__12daNpc_midP_cFv */
 daNpc_midP_c::~daNpc_midP_c() {
     OS_REPORT("|%06d:%x|daNpc_midP_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (heap != 0) {
@@ -85,7 +73,6 @@ daNpc_midP_c::~daNpc_midP_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80A739C0-80A73A4C 000000 008C+00 6/6 0/0 0/0 .rodata          m__18daNpc_midP_Param_c */
 daNpc_midP_HIOParam const daNpc_midP_Param_c::m = {
     210.0f, 
     -3.0f,
@@ -130,7 +117,6 @@ daNpc_midP_HIOParam const daNpc_midP_Param_c::m = {
     0.0f,
 };
 
-/* 80A70D90-80A71074 000210 02E4+00 1/1 0/0 0/0 .text            create__12daNpc_midP_cFv */
 int daNpc_midP_c::create() {
     daNpcT_ct(this, daNpc_midP_c, &l_faceMotionAnmData, &l_motionAnmData, l_faceMotionSequenceData, 4,
         l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -187,7 +173,6 @@ int daNpc_midP_c::create() {
     return rv;
 }
 
-/* 80A71074-80A71300 0004F4 028C+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_midP_cFv */
 int daNpc_midP_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(
         l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
@@ -222,7 +207,6 @@ int daNpc_midP_c::CreateHeap() {
     }
 }
 
-/* 80A714BC-80A714F0 00093C 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_midP_cFv */
 int daNpc_midP_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_midP_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -230,12 +214,10 @@ int daNpc_midP_c::Delete() {
     return 1;
 }
 
-/* 80A714F0-80A71510 000970 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_midP_cFv */
 int daNpc_midP_c::Execute() {
     return execute();
 }
 
-/* 80A71510-80A715D4 000990 00C4+00 1/1 0/0 0/0 .text            Draw__12daNpc_midP_cFv */
 int daNpc_midP_c::Draw() {
     J3DModel* model = mpMorf[0]->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -249,13 +231,11 @@ int daNpc_midP_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
 }
 
-/* 80A715D4-80A715F4 000A54 0020+00 1/1 0/0 0/0 .text   createHeapCallBack__12daNpc_midP_cFP10fopAc_ac_c */
 int daNpc_midP_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_midP_c* i_this = (daNpc_midP_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A715F4-80A7164C 000A74 0058+00 1/1 0/0 0/0 .text   ctrlJointCallBack__12daNpc_midP_cFP8J3DJointi */
 int daNpc_midP_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -268,7 +248,6 @@ int daNpc_midP_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     return 1;
 }
 
-/* 80A7164C-80A7166C 000ACC 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_midP_cFv */
 u8 daNpc_midP_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
         case 0:
@@ -278,7 +257,6 @@ u8 daNpc_midP_c::getType() {
     }
 }
 
-/* 80A7166C-80A7168C 000AEC 0020+00 1/1 0/0 0/0 .text            isDelete__12daNpc_midP_cFv */
 int daNpc_midP_c::isDelete() {
     switch (mType) {
         case 0:
@@ -288,7 +266,6 @@ int daNpc_midP_c::isDelete() {
     }
 }
 
-/* 80A7168C-80A717D4 000B0C 0148+00 1/1 0/0 0/0 .text            reset__12daNpc_midP_cFv */
 void daNpc_midP_c::reset() {
     int iVar1 = (u8*)&field_0xf9c - (u8*)&field_0xf84;
     for (int i = 0; i < 2; i++) {
@@ -302,7 +279,6 @@ void daNpc_midP_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A717D4-80A71860 000C54 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_midP_cFi */
 void daNpc_midP_c::afterJntAnm(int param_1) {
     if (param_1 == 2) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -313,7 +289,6 @@ void daNpc_midP_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A71860-80A7199C 000CE0 013C+00 1/0 0/0 0/0 .text            ctrlBtk__12daNpc_midP_cFv */
 BOOL daNpc_midP_c::ctrlBtk() {
     if (mpMatAnm[0] && mpMatAnm[1]) {
         if (field_0xe29 && mBtkAnm.getBtkAnm()) {
@@ -346,7 +321,6 @@ BOOL daNpc_midP_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80A7199C-80A71A98 000E1C 00FC+00 1/0 0/0 0/0 .text            setParam__12daNpc_midP_cFv */
 void daNpc_midP_c::setParam() {
     selectAction();
     srchActors();
@@ -374,17 +348,14 @@ void daNpc_midP_c::setParam() {
     gravity = daNpc_midP_Param_c::m.common.gravity;
 }
 
-/* 80A71A98-80A71AF8 000F18 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_midP_cFv */
 void daNpc_midP_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }
 
-/* 80A71AF8-80A71AFC 000F78 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_midP_cFv */
 void daNpc_midP_c::srchActors() {
     /* empty function */
 }
 
-/* 80A71AFC-80A71BFC 000F7C 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_midP_cFv */
 BOOL daNpc_midP_c::evtTalk() {
     if (chkAction(&daNpc_midP_c::talk)) {
         (this->*field_0xf90)(NULL);
@@ -406,7 +377,6 @@ BOOL daNpc_midP_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A71BFC-80A71CC4 00107C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_midP_cFv */
 BOOL daNpc_midP_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("midP", this, -1);
     if (staffId != -1) {
@@ -421,7 +391,6 @@ BOOL daNpc_midP_c::evtCutProc() {
     }
 }
 
-/* 80A71CC4-80A71DB0 001144 00EC+00 1/0 0/0 0/0 .text            action__12daNpc_midP_cFv */
 void daNpc_midP_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -437,14 +406,12 @@ void daNpc_midP_c::action() {
     }
 }
 
-/* 80A71DB0-80A71E28 001230 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_midP_cFv */
 void daNpc_midP_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A71E28-80A72064 0012A8 023C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_midP_cFv */
 void daNpc_midP_c::setAttnPos() {
     cXyz sp3c(10.0f, -30.0f, 0.0f);
     cXyz sp48(10.0f, 0.0f, 0.0f);
@@ -470,7 +437,6 @@ void daNpc_midP_c::setAttnPos() {
     attention_info.position.y += daNpc_midP_Param_c::m.common.attention_offset;
 }
 
-/* 80A72064-80A7216C 0014E4 0108+00 1/0 0/0 0/0 .text            setCollision__12daNpc_midP_cFv */
 void daNpc_midP_c::setCollision() {
     if (!mHide) {
         u32 tgType = 0xd8fbfdff;
@@ -504,12 +470,10 @@ void daNpc_midP_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A7216C-80A72174 0015EC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_midP_cFv */
 int daNpc_midP_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A72174-80A721E0 0015F4 006C+00 1/0 0/0 0/0 .text            drawGhost__12daNpc_midP_cFv */
 void daNpc_midP_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -517,19 +481,16 @@ void daNpc_midP_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80A721E0-80A72228 001660 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_midP_cFv */
 int daNpc_midP_c::selectAction() {
     field_0xf84 = NULL;
     field_0xf84 = &daNpc_midP_c::wait;
     return 1;
 }
 
-/* 80A72228-80A72254 0016A8 002C+00 1/1 0/0 0/0 .text       chkAction__12daNpc_midP_cFM12daNpc_midP_cFPCvPvPv_i */
 int daNpc_midP_c::chkAction(int (daNpc_midP_c::*action)(void*)) {
     return field_0xf90 == action;
 }
 
-/* 80A72254-80A722FC 0016D4 00A8+00 2/2 0/0 0/0 .text       setAction__12daNpc_midP_cFM12daNpc_midP_cFPCvPvPv_i */
 int daNpc_midP_c::setAction(int (daNpc_midP_c::*action)(void*)) {
     mMode = 3;
     if (field_0xf90) {
@@ -545,7 +506,6 @@ int daNpc_midP_c::setAction(int (daNpc_midP_c::*action)(void*)) {
     return 1;
 }
 
-/* 80A722FC-80A72548 00177C 024C+00 1/0 0/0 0/0 .text            wait__12daNpc_midP_cFPv */
 int daNpc_midP_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -590,7 +550,6 @@ int daNpc_midP_c::wait(void* param_1) {
     }
 }
 
-/* 80A72548-80A72754 0019C8 020C+00 2/0 0/0 0/0 .text            talk__12daNpc_midP_cFPv */
 int daNpc_midP_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -630,35 +589,28 @@ int daNpc_midP_c::talk(void* param_1) {
     }
 }
 
-/* 80A72754-80A72774 001BD4 0020+00 1/0 0/0 0/0 .text            daNpc_midP_Create__FPv */
 static int daNpc_midP_Create(void* i_this) {
     return static_cast<daNpc_midP_c*>(i_this)->create();
 }
 
-/* 80A72774-80A72794 001BF4 0020+00 1/0 0/0 0/0 .text            daNpc_midP_Delete__FPv */
 static int daNpc_midP_Delete(void* i_this) {
     return static_cast<daNpc_midP_c*>(i_this)->Delete();
 }
 
-/* 80A72794-80A727B4 001C14 0020+00 1/0 0/0 0/0 .text            daNpc_midP_Execute__FPv */
 static int daNpc_midP_Execute(void* i_this) {
     return static_cast<daNpc_midP_c*>(i_this)->Execute();
 }
 
-/* 80A727B4-80A727D4 001C34 0020+00 1/0 0/0 0/0 .text            daNpc_midP_Draw__FPv */
 static int daNpc_midP_Draw(void* i_this) {
     return static_cast<daNpc_midP_c*>(i_this)->Draw();
 }
 
-/* 80A727D4-80A727DC 001C54 0008+00 1/0 0/0 0/0 .text            daNpc_midP_IsDelete__FPv */
 static int daNpc_midP_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A73D5C-80A73D60 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_midP_Param_c l_HIO;
 
-/* 80A73B8C-80A73BAC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_midP_MethodTable */
 static actor_method_class daNpc_midP_MethodTable = {
     (process_method_func)daNpc_midP_Create,
     (process_method_func)daNpc_midP_Delete,
@@ -667,7 +619,6 @@ static actor_method_class daNpc_midP_MethodTable = {
     (process_method_func)daNpc_midP_Draw,
 };
 
-/* 80A73BAC-80A73BDC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_MIDP */
 extern actor_process_profile_definition g_profile_NPC_MIDP = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp
index 8bef4c26b2..c279c03664 100644
--- a/src/d/actor/d_a_npc_mk.cpp
+++ b/src/d/actor/d_a_npc_mk.cpp
@@ -6,35 +6,27 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_mk.h"
-#include "dol2asm.h"
 
-/* 80A73DD8-80A73DE0 000078 0008+00 1/0 0/0 0/0 .text            daNpc_Mk_Create__FPv */
 static bool daNpc_Mk_Create(void* param_0) {
     return true;
 }
 
-/* 80A73DE0-80A73DE8 000080 0008+00 1/0 0/0 0/0 .text            daNpc_Mk_Delete__FPv */
 static bool daNpc_Mk_Delete(void* param_0) {
     return true;
 }
 
-/* 80A73DE8-80A73DF0 000088 0008+00 1/0 0/0 0/0 .text            daNpc_Mk_Execute__FPv */
 static bool daNpc_Mk_Execute(void* param_0) {
     return true;
 }
 
-/* 80A73DF0-80A73DF8 000090 0008+00 1/0 0/0 0/0 .text            daNpc_Mk_Draw__FPv */
 static bool daNpc_Mk_Draw(void* param_0) {
     return true;
 }
 
-/* 80A73DF8-80A73E00 000098 0008+00 1/0 0/0 0/0 .text            daNpc_Mk_IsDelete__FPv */
 static bool daNpc_Mk_IsDelete(void* param_0) {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80A73E08-80A73E28 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Mk_MethodTable */
 static actor_method_class daNpc_Mk_MethodTable = {
     (process_method_func)daNpc_Mk_Create,
     (process_method_func)daNpc_Mk_Delete,
@@ -43,7 +35,6 @@ static actor_method_class daNpc_Mk_MethodTable = {
     (process_method_func)daNpc_Mk_Draw,
 };
 
-/* 80A73E28-80A73E58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_MK */
 extern actor_process_profile_definition g_profile_NPC_MK = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp
index 44cee8a988..cacf6e2368 100644
--- a/src/d/actor/d_a_npc_moi.cpp
+++ b/src/d/actor/d_a_npc_moi.cpp
@@ -12,7 +12,6 @@
 #include "d/actor/d_a_npc_moi.h"
 #include "d/actor/d_a_npc_uri.h"
 
-/* 80A7AEF0-80A7AFAC 000000 00BC+00 19/19 0/0 0/0 .rodata          m__17daNpc_Moi_Param_c */
 const daNpc_Moi_HIOParam daNpc_Moi_Param_c::m = {
     200.0f,   // attention_offset
     -3.0f,    // gravity
@@ -86,12 +85,10 @@ void daNpc_Moi_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A7B17C-80A7B1BC 000020 0040+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[8][2] = {
     {11, 1}, {29, 3}, {30, 3}, {31, 3}, {13, 1}, {33, 3}, {12, 1}, {32, 3},
 };
 
-/* 80A7B1BC-80A7B1DC -00001 0020+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[4] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -99,26 +96,22 @@ static daNpcT_evtData_c l_evtList[4] = {
     {"DELIVERED_SW", 2},
 };
 
-/* 80A7B1DC-80A7B1F4 -00001 0018+00 5/6 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[6] = {
     "", "Moi", "Moi1", "Moi2", "Moi3", "Moi_p1",
 };
 
-/* 80A7B1F4-80A7B1F8 000098 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     1,
     2,
     -1,
 };
 
-/* 80A7B1F8-80A7B1FC 00009C 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     1,
     3,
     -1,
 };
 
-/* 80A7B1FC-80A7B200 0000A0 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[4] = {
     1,
     3,
@@ -126,25 +119,21 @@ static s8 l_loadResPtrn3[4] = {
     -1,
 };
 
-/* 80A7B200-80A7B204 0000A4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[3] = {
     1,
     5,
     -1,
 };
 
-/* 80A7B204-80A7B20C 0000A8 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {
     1, 2, 3, 4, -1,
 };
 
-/* 80A7B20C-80A7B228 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {
     l_loadResPtrn0, l_loadResPtrn4, l_loadResPtrn1, l_loadResPtrn3,
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn9,
 };
 
-/* 80A7B228-80A7B458 0000CC 0230+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = {
     {-1, 0, 0, 19, 2, 1, TRUE},  {6, 0, 1, 19, 2, 1, TRUE},   {9, 0, 2, 41, 0, 2, FALSE},
     {10, 0, 2, 42, 0, 2, FALSE}, {8, 0, 2, 40, 0, 2, FALSE},  {7, 0, 2, 39, 0, 2, FALSE},
@@ -155,7 +144,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[20] = {
     {6, 2, 3, 39, 2, 3, FALSE},  {18, 0, 2, 49, 0, 2, FALSE},
 };
 
-/* 80A7B458-80A7B82C 0002FC 03D4+00 3/4 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[35] = {
     {8, 2, 1, 16, 0, 1, 1, 0},  {29, 2, 2, 16, 0, 1, 1, 0}, {30, 2, 2, 16, 0, 1, 1, 0},
     {6, 0, 2, 16, 0, 1, 1, 0},  {17, 2, 2, 35, 2, 2, 0, 0}, {31, 2, 2, 16, 0, 1, 1, 0},
@@ -171,7 +159,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[35] = {
     {3, 2, 4, 16, 0, 1, 1, 0},  {21, 2, 3, 16, 0, 1, 1, 0},
 };
 
-/* 80A7B82C-80A7B98C 0006D0 0160+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[88] = {
     {1, -1, 1},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {2, -1, 1},  {12, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {3, -1, 1},  {13, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {4, -1, 1},  {14, 0, 0},
@@ -188,7 +175,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[88] =
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A7B98C-80A7BC9C 000830 0310+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[196] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {8, -1, 1},  {2, 0, 0},   {-1, 0, 0},
     {-1, 0, 0},  {1, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {9, -1, 1},  {1, 0, 0},
@@ -220,12 +206,10 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[196] = {
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {18, 4, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80A7BC9C-80A7BCB0 -00001 0014+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Moi_c */
 char* daNpc_Moi_c::mCutNameList[5] = {
     "", "DELIVERED_SW", "APPEARANCE_MOI", "CONVERSATION_WITH_URI", "FIND_WOLF",
 };
 
-/* 80A7BCE0-80A7BD1C 000B84 003C+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Moi_c */
 daNpc_Moi_c::cutFunc daNpc_Moi_c::mCutList[5] = {
     NULL,
     &daNpc_Moi_c::cutDeliveredSw,
@@ -260,7 +244,6 @@ enum Motion {
     /* 0x2F */ MOT_UNK_47 = 47,
 };
 
-/* 80A73F4C-80A74150 0000EC 0204+00 1/0 0/0 0/0 .text            __dt__11daNpc_Moi_cFv */
 daNpc_Moi_c::~daNpc_Moi_c() {
     if (mpMorf[0] != 0) {
         mpMorf[0]->stopZelAnime();
@@ -268,7 +251,6 @@ daNpc_Moi_c::~daNpc_Moi_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80A74150-80A74474 0002F0 0324+00 1/1 0/0 0/0 .text            create__11daNpc_Moi_cFv */
 int daNpc_Moi_c::create() {
     static const int heapSize[] = {0, 0x5C70, 0x7CB0, 0x7CA0, 0x5C70, 0x5C80, 0};
 
@@ -325,7 +307,6 @@ int daNpc_Moi_c::create() {
     return phase;
 }
 
-/* 80A74474-80A7483C 000614 03C8+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Moi_cFv */
 int daNpc_Moi_c::CreateHeap() {
     static int const bmdTypeList[6] = {6, 4, 1, 2, 3, 5};
 
@@ -396,19 +377,16 @@ int daNpc_Moi_c::CreateHeap() {
     return 0;
 }
 
-/* 80A749F8-80A74A2C 000B98 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Moi_cFv */
 int daNpc_Moi_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Moi_c();
     return 1;
 }
 
-/* 80A74A2C-80A74A4C 000BCC 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Moi_cFv */
 int daNpc_Moi_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80A74A4C-80A74B80 000BEC 0134+00 1/1 0/0 0/0 .text            Draw__11daNpc_Moi_cFv */
 int daNpc_Moi_c::Draw() {
     J3DModelData* modelData;
     if (mpMatAnm[0] != NULL) {
@@ -433,14 +411,10 @@ int daNpc_Moi_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80A74B80-80A74BA0 000D20 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Moi_cFP10fopAc_ac_c              */
 int daNpc_Moi_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Moi_c*>(i_this)->CreateHeap();
 }
 
-/* 80A74BA0-80A74BF8 000D40 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Moi_cFP8J3DJointi
- */
 int daNpc_Moi_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -454,7 +428,6 @@ int daNpc_Moi_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80A74BF8-80A74C6C 000D98 0074+00 1/1 0/0 0/0 .text            getType__11daNpc_Moi_cFv */
 u8 daNpc_Moi_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -478,7 +451,6 @@ u8 daNpc_Moi_c::getType() {
     return TYPE_6;
 }
 
-/* 80A74C6C-80A74D8C 000E0C 0120+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::isDelete() {
     bool ret;
     switch (mType) {
@@ -515,7 +487,6 @@ BOOL daNpc_Moi_c::isDelete() {
     }
 }
 
-/* 80A74D8C-80A7513C 000F2C 03B0+00 1/1 0/0 0/0 .text            reset__11daNpc_Moi_cFv */
 void daNpc_Moi_c::reset() {
     int iVar8;
     cXyz cStack_30;
@@ -577,12 +548,10 @@ void daNpc_Moi_c::reset() {
     setAngle(cStack_80);
 }
 
-/* 80A7513C-80A75160 0012DC 0024+00 4/4 0/0 0/0 .text            chkMoiN__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::chkMoiN() {
     return (mType == TYPE_2 || mType == TYPE_3);
 }
 
-/* 80A75160-80A751E4 001300 0084+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Moi_cFi */
 void daNpc_Moi_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -593,7 +562,6 @@ void daNpc_Moi_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A751E4-80A75460 001384 027C+00 1/0 0/0 0/0 .text            setParam__11daNpc_Moi_cFv */
 void daNpc_Moi_c::setParam() {
     selectAction();
     srchActors();
@@ -681,7 +649,6 @@ void daNpc_Moi_c::setParam() {
     setSwAT();
 }
 
-/* 80A75460-80A75514 001600 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Moi_c::talk)) {
         mPreItemNo = 0;
@@ -696,8 +663,6 @@ BOOL daNpc_Moi_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A75514-80A755C8 0016B4 00B4+00 2/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Moi_cFv
- */
 void daNpc_Moi_c::setAfterTalkMotion() {
     int iVar2 = MOT_UNK_21;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -722,7 +687,6 @@ void daNpc_Moi_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80A755C8-80A75664 001768 009C+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Moi_cFv */
 void daNpc_Moi_c::srchActors() {
     switch (mType) {
     case TYPE_1:
@@ -739,7 +703,6 @@ void daNpc_Moi_c::srchActors() {
     }
 }
 
-/* 80A75664-80A75704 001804 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::evtTalk() {
     if (chkAction(&daNpc_Moi_c::talk)) {
         (this->*field_0x161c)(NULL);
@@ -749,7 +712,6 @@ BOOL daNpc_Moi_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A75704-80A757CC 0018A4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Moi", this, -1);
     if (staffId != -1) {
@@ -764,7 +726,6 @@ BOOL daNpc_Moi_c::evtCutProc() {
     return false;
 }
 
-/* 80A757CC-80A759F4 00196C 0228+00 1/0 0/0 0/0 .text            action__11daNpc_Moi_cFv */
 void daNpc_Moi_c::action() {
     fopAc_ac_c* hitActor = NULL;
     int i;
@@ -812,7 +773,6 @@ void daNpc_Moi_c::action() {
     }
 }
 
-/* 80A759F4-80A75AB8 001B94 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Moi_cFv */
 void daNpc_Moi_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -824,10 +784,8 @@ void daNpc_Moi_c::beforeMove() {
     }
 }
 
-/* 80A7BFF4-80A7BFF8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_MOI_HIO_CLASS l_HIO;
 
-/* 80A75AB8-80A75E68 001C58 03B0+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Moi_cFv */
 void daNpc_Moi_c::setAttnPos() {
     cXyz acStack_3c(-30.0f, 10.0f, 0.0f);
 
@@ -882,7 +840,6 @@ void daNpc_Moi_c::setAttnPos() {
     setFootPos();
 }
 
-/* 80A75E68-80A760E0 002008 0278+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Moi_cFv */
 void daNpc_Moi_c::setCollision() {
     cXyz cStack_50;
     cXyz cStack_5c;
@@ -947,12 +904,10 @@ void daNpc_Moi_c::setCollision() {
     mCyl2.ClrCoHit();
 }
 
-/* 80A760E0-80A760E8 002280 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Moi_cFv */
 int daNpc_Moi_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A760E8-80A762A8 002288 01C0+00 1/0 0/0 0/0 .text            drawOtherMdl__11daNpc_Moi_cFv */
 void daNpc_Moi_c::drawOtherMdl() {
     static int const jointNo[6] = {2, 17, 23, 24, 25, 12};
 
@@ -982,7 +937,6 @@ void daNpc_Moi_c::drawOtherMdl() {
     }
 }
 
-/* 80A762A8-80A762CC 002448 0024+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Moi_cFiifi */
 bool daNpc_Moi_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     switch (param_1) {
     case 0x22:
@@ -991,7 +945,6 @@ bool daNpc_Moi_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int p
     return true;
 }
 
-/* 80A762CC-80A7633C 00246C 0070+00 1/0 0/0 0/0 .text            changeAnm__11daNpc_Moi_cFPiPi */
 void daNpc_Moi_c::changeAnm(int* param_1, int* param_2) {
     if (mType == TYPE_1) {
         switch (*param_1) {
@@ -1010,7 +963,6 @@ void daNpc_Moi_c::changeAnm(int* param_1, int* param_2) {
     }
 }
 
-/* 80A7633C-80A76384 0024DC 0048+00 1/0 0/0 0/0 .text            changeBck__11daNpc_Moi_cFPiPi */
 void daNpc_Moi_c::changeBck(int* param_1, int* param_2) {
     if (mType == TYPE_1) {
         switch (*param_1) {
@@ -1025,7 +977,6 @@ void daNpc_Moi_c::changeBck(int* param_1, int* param_2) {
     }
 }
 
-/* 80A76384-80A7643C 002524 00B8+00 1/0 0/0 0/0 .text            changeBtp__11daNpc_Moi_cFPiPi */
 void daNpc_Moi_c::changeBtp(int* param_1, int* param_2) {
     if (mType == TYPE_1) {
         switch (*param_1) {
@@ -1043,7 +994,6 @@ void daNpc_Moi_c::changeBtp(int* param_1, int* param_2) {
     }
 }
 
-/* 80A7643C-80A764B0 0025DC 0074+00 1/0 0/0 0/0 .text            changeBtk__11daNpc_Moi_cFPiPi */
 void daNpc_Moi_c::changeBtk(int* param_1, int* param_2) {
     if (mType != TYPE_1 && chkMoiN() && *param_1 == 16 && *param_2 == 3) {
         *param_1 = 36;
@@ -1051,7 +1001,6 @@ void daNpc_Moi_c::changeBtk(int* param_1, int* param_2) {
     }
 }
 
-/* 80A764B0-80A765CC 002650 011C+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Moi_cFv */
 int daNpc_Moi_c::selectAction() {
     field_0x1610 = NULL;
 
@@ -1076,14 +1025,10 @@ int daNpc_Moi_c::selectAction() {
     return 1;
 }
 
-/* 80A765CC-80A765F8 00276C 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Moi_cFM11daNpc_Moi_cFPCvPvPv_i            */
 BOOL daNpc_Moi_c::chkAction(actionFunc param_1) {
     return field_0x161c == param_1;
 }
 
-/* 80A765F8-80A766A0 002798 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Moi_cFM11daNpc_Moi_cFPCvPvPv_i            */
 int daNpc_Moi_c::setAction(int (daNpc_Moi_c::*param_0)(void*)) {
     mMode = MODE_EXIT;
     if (field_0x161c != NULL) {
@@ -1099,12 +1044,10 @@ int daNpc_Moi_c::setAction(int (daNpc_Moi_c::*param_0)(void*)) {
     return 1;
 }
 
-/* 80A766A0-80A766DC 002840 003C+00 1/1 0/0 0/0 .text chkPlayerGetWoodShield__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::chkPlayerGetWoodShield() {
     return (u8)(dComIfGs_isItemFirstBit(fpcNm_ITEM_WOOD_SHIELD) ? 1 : 0);
 }
 
-/* 80A766DC-80A76888 00287C 01AC+00 2/2 0/0 0/0 .text            setSSlash__11daNpc_Moi_cFi */
 void daNpc_Moi_c::setSSlash(int param_1) {
     mMotionSeqMngr.setNo(MOT_UNK_43, 0.0f, 1, 0);
     /* dSv_event_tmp_flag_c::GUARD_URI - Ordon Village - Rusl is guarding Uli, Ordon village night
@@ -1131,7 +1074,6 @@ void daNpc_Moi_c::setSSlash(int param_1) {
     daNpcT_onTmpBit(0x47);
 }
 
-/* 80A76888-80A768FC 002A28 0074+00 1/1 0/0 0/0 .text            chkPullOutSw__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::chkPullOutSw() {
     if (mType == TYPE_2) {
         J3DAnmTransform* anmTransform = getTrnsfrmAnmP(
@@ -1141,14 +1083,12 @@ BOOL daNpc_Moi_c::chkPullOutSw() {
     return FALSE;
 }
 
-/* 80A768FC-80A76954 002A9C 0058+00 1/1 0/0 0/0 .text            pullOutSw__11daNpc_Moi_cFv */
 void daNpc_Moi_c::pullOutSw() {
     if (chkPullOutSw() && mpMorf[0]->checkFrame(4.0f)) {
         field_0x166b = 1;
     }
 }
 
-/* 80A76954-80A769C8 002AF4 0074+00 1/1 0/0 0/0 .text            chkSetInSw__11daNpc_Moi_cFv */
 BOOL daNpc_Moi_c::chkSetInSw() {
     if (mType == TYPE_2) {
         J3DAnmTransform* anmTransform = getTrnsfrmAnmP(
@@ -1158,14 +1098,12 @@ BOOL daNpc_Moi_c::chkSetInSw() {
     return FALSE;
 }
 
-/* 80A769C8-80A76A20 002B68 0058+00 1/1 0/0 0/0 .text            setInSw__11daNpc_Moi_cFv */
 void daNpc_Moi_c::setInSw() {
     if (chkSetInSw() && mpMorf[0]->checkFrame(6.0f)) {
         field_0x166b = 0;
     }
 }
 
-/* 80A76A20-80A76AFC 002BC0 00DC+00 1/1 0/0 0/0 .text            setSwAT__11daNpc_Moi_cFv */
 void daNpc_Moi_c::setSwAT() {
     field_0x166a = 0;
 
@@ -1183,7 +1121,6 @@ void daNpc_Moi_c::setSwAT() {
     }
 }
 
-/* 80A76AFC-80A76C7C 002C9C 0180+00 1/1 0/0 0/0 .text            torch__11daNpc_Moi_cFv */
 void daNpc_Moi_c::torch() {
     fopAc_ac_c* actor = NULL;
     static cXyz lightOffset(10.0f, 0.0f, 40.0f);
@@ -1206,7 +1143,6 @@ void daNpc_Moi_c::torch() {
     }
 }
 
-/* 80A76C7C-80A76E10 002E1C 0194+00 1/1 0/0 0/0 .text            injuryCheck__11daNpc_Moi_cFv */
 int daNpc_Moi_c::injuryCheck() {
     BOOL bVar1 = TRUE;
     int timer = field_0x1658;
@@ -1246,7 +1182,6 @@ int daNpc_Moi_c::injuryCheck() {
     return timer;
 }
 
-/* 80A76E10-80A76F3C 002FB0 012C+00 1/1 0/0 0/0 .text            injuryTurn__11daNpc_Moi_cF4cXyz */
 int daNpc_Moi_c::injuryTurn(cXyz param_1) {
     BOOL bVar1 = FALSE;
 
@@ -1284,7 +1219,6 @@ int daNpc_Moi_c::injuryTurn(cXyz param_1) {
     return bVar1;
 }
 
-/* 80A76F3C-80A770FC 0030DC 01C0+00 1/1 0/0 0/0 .text            injuryWalk__11daNpc_Moi_cFv */
 int daNpc_Moi_c::injuryWalk() {
     /* dSv_event_tmp_flag_c::GUARD_URI - Ordon Village - Rusl is guarding Uli, Ordon village night
      */
@@ -1324,7 +1258,6 @@ int daNpc_Moi_c::injuryWalk() {
     return 1;
 }
 
-/* 80A770FC-80A7772C 00329C 0630+00 2/2 0/0 0/0 .text            poise__11daNpc_Moi_cFv */
 int daNpc_Moi_c::poise() {
     int iVar13 = daNpc_Moi_Param_c::m.field_0x98;
 
@@ -1418,7 +1351,6 @@ int daNpc_Moi_c::poise() {
     return 1;
 }
 
-/* 80A77740-80A77BA0 0038E0 0460+00 1/0 0/0 0/0 .text            cutDeliveredSw__11daNpc_Moi_cFi */
 int daNpc_Moi_c::cutDeliveredSw(int param_1) {
     int rv = 0;
     int iVar6 = -1;
@@ -1509,8 +1441,6 @@ int daNpc_Moi_c::cutDeliveredSw(int param_1) {
     return rv;
 }
 
-/* 80A77BA0-80A7838C 003D40 07EC+00 2/0 0/0 0/0 .text            cutAppearanceMoi__11daNpc_Moi_cFi
- */
 int daNpc_Moi_c::cutAppearanceMoi(int param_1) {
     s16 sVar5;
     cXyz cStack_30;
@@ -1621,7 +1551,6 @@ int daNpc_Moi_c::cutAppearanceMoi(int param_1) {
     return rv;
 }
 
-/* 80A7838C-80A785FC 00452C 0270+00 1/0 0/0 0/0 .text cutConversationWithUri__11daNpc_Moi_cFi */
 int daNpc_Moi_c::cutConversationWithUri(int param_1) {
     cXyz cStack_34;
     int rv = 0;
@@ -1668,7 +1597,6 @@ int daNpc_Moi_c::cutConversationWithUri(int param_1) {
     return rv;
 }
 
-/* 80A785FC-80A789D8 00479C 03DC+00 1/0 0/0 0/0 .text            cutFindWolf__11daNpc_Moi_cFi */
 int daNpc_Moi_c::cutFindWolf(int param_1) {
     cXyz cStack_30;
     int rv = 0;
@@ -1742,7 +1670,6 @@ int daNpc_Moi_c::cutFindWolf(int param_1) {
     return rv;
 }
 
-/* 80A789D8-80A78E0C 004B78 0434+00 2/0 0/0 0/0 .text            wait__11daNpc_Moi_cFPv */
 int daNpc_Moi_c::wait(void* param_1) {
     int iVar4 = mpHIO->m.field_0x98;
 
@@ -1815,7 +1742,6 @@ int daNpc_Moi_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80A78E0C-80A78FF4 004FAC 01E8+00 1/0 0/0 0/0 .text            walk__11daNpc_Moi_cFPv */
 int daNpc_Moi_c::walk(void* param_1) {
     cXyz cStack_1c;
 
@@ -1856,7 +1782,6 @@ int daNpc_Moi_c::walk(void* param_1) {
     return 1;
 }
 
-/* 80A78FF4-80A794C0 005194 04CC+00 1/0 0/0 0/0 .text            walkOnEggshell__11daNpc_Moi_cFPv */
 int daNpc_Moi_c::walkOnEggshell(void* param_1) {
     int sVar1 = mpHIO->m.field_0x9a;
 
@@ -1945,7 +1870,6 @@ int daNpc_Moi_c::walkOnEggshell(void* param_1) {
     return 1;
 }
 
-/* 80A794C0-80A79608 005660 0148+00 2/0 0/0 0/0 .text            rest__11daNpc_Moi_cFPv */
 int daNpc_Moi_c::rest(void* param_1) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1970,7 +1894,6 @@ int daNpc_Moi_c::rest(void* param_1) {
     return 1;
 }
 
-/* 80A79608-80A798D0 0057A8 02C8+00 3/0 0/0 0/0 .text            talk__11daNpc_Moi_cFPv */
 int daNpc_Moi_c::talk(void* param_1) {
     switch (mMode) {
     case MODE_ENTER:
@@ -2027,39 +1950,32 @@ int daNpc_Moi_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80A798D0-80A798F0 005A70 0020+00 1/0 0/0 0/0 .text            daNpc_Moi_Create__FPv */
 static int daNpc_Moi_Create(void* i_this) {
     return static_cast<daNpc_Moi_c*>(i_this)->create();
 }
 
-/* 80A798F0-80A79910 005A90 0020+00 1/0 0/0 0/0 .text            daNpc_Moi_Delete__FPv */
 static int daNpc_Moi_Delete(void* i_this) {
     return static_cast<daNpc_Moi_c*>(i_this)->Delete();
 }
 
-/* 80A79910-80A79930 005AB0 0020+00 1/0 0/0 0/0 .text            daNpc_Moi_Execute__FPv */
 static int daNpc_Moi_Execute(void* i_this) {
     return static_cast<daNpc_Moi_c*>(i_this)->Execute();
 }
 
-/* 80A79930-80A79950 005AD0 0020+00 1/0 0/0 0/0 .text            daNpc_Moi_Draw__FPv */
 static int daNpc_Moi_Draw(void* i_this) {
     return static_cast<daNpc_Moi_c*>(i_this)->Draw();
 }
 
-/* 80A79950-80A79958 005AF0 0008+00 1/0 0/0 0/0 .text            daNpc_Moi_IsDelete__FPv */
 static int daNpc_Moi_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A7BDCC-80A7BDEC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Moi_MethodTable */
 static actor_method_class daNpc_Moi_MethodTable = {
     (process_method_func)daNpc_Moi_Create,  (process_method_func)daNpc_Moi_Delete,
     (process_method_func)daNpc_Moi_Execute, (process_method_func)daNpc_Moi_IsDelete,
     (process_method_func)daNpc_Moi_Draw,
 };
 
-/* 80A7BDEC-80A7BE1C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_MOI */
 extern actor_process_profile_definition g_profile_NPC_MOI = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp
index 77a4a5f507..ddd7e999e8 100644
--- a/src/d/actor/d_a_npc_moir.cpp
+++ b/src/d/actor/d_a_npc_moir.cpp
@@ -121,7 +121,6 @@ enum Joint {
     /* 0x19 */ JNT_FOOTR
 };
 
-/* 80A838D0-80A83AA4 000020 01D4+00 3/4 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[39] = {
     {-1, J3DFrameCtrl::EMode_NONE, MoiR},
     {BCK_MOIR_F_TALK_A, J3DFrameCtrl::EMode_NONE, MoiR},
@@ -164,40 +163,33 @@ static daNpc_GetParam2 l_bckGetParamList[39] = {
     {BCK_MOIR_RUN, J3DFrameCtrl::EMode_LOOP, MoiR3},
 };
 
-/* 80A83AA4-80A83ABC 0001F4 0018+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[2] = {
     {BTP_MOIR, J3DFrameCtrl::EMode_LOOP, MoiR},
     {BTP_MOIR_FH_SERIOUS, J3DFrameCtrl::EMode_LOOP, MoiR},
 };
 
-/* 80A83ABC-80A83AC8 00020C 000C+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[1] = {
     {BTK_MOIR, J3DFrameCtrl::EMode_LOOP, MoiR},
 };
 
-/* 80A83AC8-80A83AD4 000218 000C+00 1/0 0/0 0/0 .data            l_loadRes_MOIR0 */
 static int l_loadRes_MOIR0[3] = {
     0, 1, -1,
 };
 
-/* 80A83AD4-80A83AE0 000224 000C+00 1/0 0/0 0/0 .data            l_loadRes_MOIR1 */
 static int l_loadRes_MOIR1[3] = {
     0, 2, -1,
 };
 
-/* 80A83AE0-80A83AEC 000230 000C+00 1/0 0/0 0/0 .data            l_loadRes_MOIR2 */
 static int l_loadRes_MOIR2[3] = {
     0, 3, -1,
 };
 
-/* 80A83AEC-80A83AF8 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_MOIR0,
     l_loadRes_MOIR1,
     l_loadRes_MOIR2,
 };
 
-/* 80A83AF8-80A83B08 -00001 0010+00 8/13 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[4] = {
     "MoiR",
     "MoiR1",
@@ -205,7 +197,6 @@ static char* l_arcNames[4] = {
     "MoiR3",
 };
 
-/* 80A83B08-80A83B18 -00001 0010+00 0/5 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     "",
     "THE_INTRODUCTION",
@@ -213,10 +204,8 @@ static char* l_evtNames[4] = {
     "MOIR_APPEAR2",
 };
 
-/* 80A83B18-80A83B1C -00001 0004+00 0/3 0/0 0/0 .data            l_myName */
 static char* l_myName = "MoiR";
 
-/* 80A832AC-80A83320 000000 0074+00 17/17 0/0 0/0 .rodata          m__17daNpcMoiR_Param_c */
 daNpcMoiR_HIOParam const daNpcMoiR_Param_c::m = {
     35.0f,
     -3.0f,
@@ -269,10 +258,8 @@ void daNpcMoiR_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80A83D84-80A83D88 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_MOIR_HIO_CLASS l_HIO;
 
-/* 80A83B40-80A83B70 000290 0030+00 0/2 0/0 0/0 .data            mEvtSeqList__11daNpcMoiR_c */
 daNpcMoiR_c::EventFn daNpcMoiR_c::mEvtSeqList[4] = {
     NULL,
     &daNpcMoiR_c::EvCut_Introduction,
@@ -280,10 +267,8 @@ daNpcMoiR_c::EventFn daNpcMoiR_c::mEvtSeqList[4] = {
     &daNpcMoiR_c::EvCut_Appear2,
 };
 
-/* 80A7C16C-80A7C2F0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcMoiR_cFv */
 daNpcMoiR_c::daNpcMoiR_c() {}
 
-/* 80A7C380-80A7C580 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpcMoiR_cFv */
 daNpcMoiR_c::~daNpcMoiR_c() {
     for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[l_loadRes_list[mMode][i]]);
@@ -299,7 +284,6 @@ daNpcMoiR_c::~daNpcMoiR_c() {
 #endif
 }
 
-/* 80A7C580-80A7C978 000500 03F8+00 1/1 0/0 0/0 .text            Create__11daNpcMoiR_cFv */
 cPhs__Step daNpcMoiR_c::Create() {
     fopAcM_ct(this, daNpcMoiR_c);
 
@@ -399,7 +383,6 @@ cPhs__Step daNpcMoiR_c::Create() {
     return phase;
 }
 
-/* 80A7C978-80A7CC8C 0008F8 0314+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcMoiR_cFv */
 int daNpcMoiR_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -460,20 +443,17 @@ int daNpcMoiR_c::CreateHeap() {
     return 1;
 }
 
-/* 80A7CE48-80A7CE7C 000DC8 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcMoiR_cFv */
 int daNpcMoiR_c::Delete() {
     fopAcM_RegisterDeleteID(this, "NPC_MOIR");
     this->~daNpcMoiR_c();
     return 1;
 }
 
-/* 80A7CE7C-80A7CEA0 000DFC 0024+00 2/2 0/0 0/0 .text            Execute__11daNpcMoiR_cFv */
 int daNpcMoiR_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80A7CEA0-80A7CEFC 000E20 005C+00 1/1 0/0 0/0 .text            Draw__11daNpcMoiR_cFv */
 int daNpcMoiR_c::Draw() {
     J3DModelData* model_data = mAnm_p->getModel()->getModelData();
     model_data->getMaterialNodePointer(MAT_MOIR_EYEBALL_M)->setMaterialAnm(mpMatAnm);
@@ -481,7 +461,6 @@ int daNpcMoiR_c::Draw() {
     return 1;
 }
 
-/* 80A7CEFC-80A7D0CC 000E7C 01D0+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpcMoiR_cFP8J3DJointP8J3DModel */
 int daNpcMoiR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int jntNo = my_joint->getJntNo();
@@ -521,13 +500,11 @@ int daNpcMoiR_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80A7D0CC-80A7D0EC 00104C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpcMoiR_cFP10fopAc_ac_c */
 int daNpcMoiR_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcMoiR_c* i_this = (daNpcMoiR_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80A7D0EC-80A7D138 00106C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpcMoiR_cFP8J3DJointi */
 int daNpcMoiR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -592,7 +569,6 @@ static s16 dummy_lit_120650(int sel) {
 }
 #endif
 
-/* 80A7D138-80A7D394 0010B8 025C+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcMoiR_cFib */
 bool daNpcMoiR_c::setExpressionAnm(int i_index, bool i_modify) {
     mAnmFlags &= 0xFFFFE03F;
 
@@ -670,7 +646,6 @@ bool daNpcMoiR_c::setExpressionAnm(int i_index, bool i_modify) {
     return false;
 }
 
-/* 80A7D394-80A7D474 001314 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcMoiR_cFi */
 bool daNpcMoiR_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* anmTexPattern = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_index].arcIdx], l_btpGetParamList[i_index].fileIdx);
     int i_attr = l_btpGetParamList[i_index].attr;
@@ -695,7 +670,6 @@ bool daNpcMoiR_c::setExpressionBtp(int i_index) {
     return false;
 }
 
-/* 80A7D474-80A7D5C4 0013F4 0150+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcMoiR_cFif */
 void daNpcMoiR_c::setMotionAnm(int i_index, f32 i_morf) {
     if (i_index < 11 || i_index >= 0x27) {
         return;
@@ -721,7 +695,6 @@ void daNpcMoiR_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80A7D5C4-80A7D73C 001544 0178+00 1/1 0/0 0/0 .text            reset__11daNpcMoiR_cFv */
 void daNpcMoiR_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -753,7 +726,6 @@ void daNpcMoiR_c::reset() {
     setWaitAction();
 }
 
-/* 80A7D73C-80A7D934 0016BC 01F8+00 1/1 0/0 0/0 .text            setWaitAction__11daNpcMoiR_cFv */
 void daNpcMoiR_c::setWaitAction() {
     switch (mMode) {
         case MODE_SIT:
@@ -826,7 +798,6 @@ void daNpcMoiR_c::playExpression() {
     }
 }
 
-/* 80A818B4-80A8210C 005834 0858+00 1/1 0/0 0/0 .text            playMotion__11daNpcMoiR_cFv */
 void daNpcMoiR_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -949,7 +920,6 @@ void daNpcMoiR_c::playMotion() {
     }
 }
 
-/* 80A825A0-80A82878 006520 02D8+00 1/1 0/0 0/0 .text            lookat__11daNpcMoiR_cFv */
 void daNpcMoiR_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1094,7 +1064,6 @@ static daNpcMoiR_c::Action2Fn dummy_4854() {
 }
 #endif
 
-/* 80A7D934-80A7DD94 0018B4 0460+00 1/0 0/0 0/0 .text            wait_type0__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type0(void* param_1) {
     switch (field_0xe08) {
         case 0:
@@ -1151,7 +1120,6 @@ bool daNpcMoiR_c::wait_type0(void* param_1) {
     return true;
 }
 
-/* 80A7DD94-80A7DDD8 001D14 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpcMoiR_cFifi */
 void daNpcMoiR_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 0x2B) {
@@ -1162,7 +1130,6 @@ void daNpcMoiR_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80A7DDD8-80A7DE04 001D58 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpcMoiR_cFif */
 void daNpcMoiR_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 0x13) {
         mExpression = i_expression;
@@ -1172,7 +1139,6 @@ void daNpcMoiR_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80A7DE04-80A7E668 001D84 0864+00 2/0 0/0 0/0 .text            wait_type1__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type1(void* param_1) {
     f32 fVar1;
 
@@ -1271,7 +1237,6 @@ bool daNpcMoiR_c::wait_type1(void* param_1) {
     return true;
 }
 
-/* 80A7E668-80A7E8C0 0025E8 0258+00 1/0 0/0 0/0 .text            wait_type2__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::wait_type2(void* param_1) {
     switch (field_0xe08) {
         case 0:
@@ -1342,7 +1307,6 @@ void daNpcMoiR_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80A7E8C0-80A7EFBC 002840 06FC+00 2/0 0/0 0/0 .text            talk__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::talk(void* param_1) {
     int sp_0x14 = 0;
     int itemNo, i_expression, i_actionID;
@@ -1416,7 +1380,6 @@ bool daNpcMoiR_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80A7EFBC-80A7F40C 002F3C 0450+00 2/0 0/0 0/0 .text            multiTalk__11daNpcMoiR_cFPv */
 BOOL daNpcMoiR_c::multiTalk(void* param_1) {
     BOOL rv = FALSE;
     fopAc_ac_c* speakers[4] = {this, mActorMngr[1].getActorP(), mActorMngr[2].getActorP(), mActorMngr[3].getActorP()};
@@ -1473,7 +1436,6 @@ BOOL daNpcMoiR_c::multiTalk(void* param_1) {
     return rv;
 }
 
-/* 80A7F40C-80A7F9AC 00338C 05A0+00 2/0 0/0 0/0 .text            fight__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::fight(void* param_1) {
     f32 fVar1;
     int iVar1 = 1;
@@ -1540,7 +1502,6 @@ bool daNpcMoiR_c::fight(void* param_1) {
     return false;
 }
 
-/* 80A7F9AC-80A7FEE8 00392C 053C+00 2/0 0/0 0/0 .text            demo__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::demo(void* param_1) {
     dEvent_manager_c* evt_mng = &dComIfGp_getEventManager();
     bool rv = false;
@@ -1595,7 +1556,6 @@ bool daNpcMoiR_c::demo(void* param_1) {
     return rv;
 }
 
-/* 80A7FEE8-80A802C4 003E68 03DC+00 1/0 0/0 0/0 .text            leave__11daNpcMoiR_cFPv */
 bool daNpcMoiR_c::leave(void* param_1) {
     cXyz sp24(-6253.387, 0.0f, 6251.7603f);
     daNPC_TK_c* actor_p = NULL;
@@ -1635,7 +1595,6 @@ bool daNpcMoiR_c::leave(void* param_1) {
     return true;
 }
 
-/* 80A802C4-80A803A0 004244 00DC+00 1/0 0/0 0/0 .text            EvCut_Introduction__11daNpcMoiR_cFi */
 BOOL daNpcMoiR_c::EvCut_Introduction(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm");
@@ -1663,7 +1622,6 @@ BOOL daNpcMoiR_c::EvCut_Introduction(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80A803A0-80A8081C 004320 047C+00 1/0 0/0 0/0 .text            EvCut_Appear__11daNpcMoiR_cFi */
 BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -1736,7 +1694,6 @@ BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80A8081C-80A81044 00479C 0828+00 1/0 0/0 0/0 .text            EvCut_Appear2__11daNpcMoiR_cFi */
 BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -1851,32 +1808,26 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80A81044-80A81064 004FC4 0020+00 1/0 0/0 0/0 .text            daNpcMoiR_Create__FPv */
 static int daNpcMoiR_Create(void* a_this) {
     return static_cast<daNpcMoiR_c*>(a_this)->Create();
 }
 
-/* 80A81064-80A81084 004FE4 0020+00 1/0 0/0 0/0 .text            daNpcMoiR_Delete__FPv */
 static int daNpcMoiR_Delete(void* a_this) {
     return static_cast<daNpcMoiR_c*>(a_this)->Delete();
 }
 
-/* 80A81084-80A810A4 005004 0020+00 1/0 0/0 0/0 .text            daNpcMoiR_Execute__FPv */
 static int daNpcMoiR_Execute(void* a_this) {
     return static_cast<daNpcMoiR_c*>(a_this)->Execute();
 }
 
-/* 80A810A4-80A810C4 005024 0020+00 1/0 0/0 0/0 .text            daNpcMoiR_Draw__FPv */
 static int daNpcMoiR_Draw(void* a_this) {
     return static_cast<daNpcMoiR_c*>(a_this)->Draw();
 }
 
-/* 80A810C4-80A810CC 005044 0008+00 1/0 0/0 0/0 .text            daNpcMoiR_IsDelete__FPv */
 static int daNpcMoiR_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80A810FC-80A81274 00507C 0178+00 1/0 0/0 0/0 .text            setParam__11daNpcMoiR_cFv */
 void daNpcMoiR_c::setParam() {
     searchActors();
 
@@ -1904,7 +1855,6 @@ void daNpcMoiR_c::setParam() {
     #endif
 }
 
-/* 80A81274-80A815D4 0051F4 0360+00 1/0 0/0 0/0 .text            main__11daNpcMoiR_cFv */
 BOOL daNpcMoiR_c::main() {
     if (mAction) {
         (this->*mAction)(NULL);
@@ -1922,7 +1872,6 @@ BOOL daNpcMoiR_c::main() {
     return TRUE;
 }
 
-/* 80A815D4-80A818B4 005554 02E0+00 1/1 0/0 0/0 .text            checkHeadGear__11daNpcMoiR_cFv */
 void daNpcMoiR_c::checkHeadGear() {
     J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
     J3DAnmTransform* anm = mAnm_p->getAnm();
@@ -1969,7 +1918,6 @@ static void dummy() {
     cM_ssin(0);
 }
 
-/* 80A8210C-80A821E0 00608C 00D4+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcMoiR_cFv */
 BOOL daNpcMoiR_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* anm = NULL;
@@ -1988,7 +1936,6 @@ BOOL daNpcMoiR_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80A821E0-80A825A0 006160 03C0+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcMoiR_cFv */
 void daNpcMoiR_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -2050,7 +1997,6 @@ void daNpcMoiR_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&field_0xca0);
 }
 
-/* 80A82878-80A82900 0067F8 0088+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpcMoiR_cFv */
 void daNpcMoiR_c::drawOtherMdls() {
     if (!mWearHelmet) {
         g_env_light.setLightTevColorType_MAJI(mpHeadgearModel, &tevStr);
@@ -2060,12 +2006,10 @@ void daNpcMoiR_c::drawOtherMdls() {
     }
 }
 
-/* 80A82900-80A82908 006880 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcMoiR_cFv */
 BOOL daNpcMoiR_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A83C38-80A83C58 -00001 0020+00 1/0 0/0 0/0 .data            daNpcMoiR_MethodTable */
 static actor_method_class daNpcMoiR_MethodTable = {
     (process_method_func)daNpcMoiR_Create,
     (process_method_func)daNpcMoiR_Delete,
@@ -2074,7 +2018,6 @@ static actor_method_class daNpcMoiR_MethodTable = {
     (process_method_func)daNpcMoiR_Draw,
 };
 
-/* 80A83C58-80A83C88 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_MOIR */
 extern actor_process_profile_definition g_profile_NPC_MOIR = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp
index 4bf5a07f70..2ac5933d2f 100644
--- a/src/d/actor/d_a_npc_myna2.cpp
+++ b/src/d/actor/d_a_npc_myna2.cpp
@@ -14,15 +14,12 @@ enum {
     NUM_EVT_CUTS_e = 5,
 };
 
-/* 80A88B44-80A88B48 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_myna2_Param_c l_HIO;
 
-/* 80A886D4-80A886DC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[] = {
     {0x17, 0},
 };
 
-/* 80A886DC-80A88754 000028 0078+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[] = {
     {17, 0},
     {10, 0},
@@ -41,12 +38,10 @@ static daNpc_GetParam1 l_bckGetParamList[] = {
     {20, 0},
 };
 
-/* 80A88754-80A8875C 0000A0 0008+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[] = {
     {26, 0},
 };
 
-/* 80A8875C-80A88784 0000A8 0028+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[] = {
     {0, 0},
     {1, 0},
@@ -55,7 +50,6 @@ static daNpc_GetParam1 l_evtGetParamList[] = {
     {4, 2},
 };
 
-/* 80A88784-80A88798 -00001 0014+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[5] = {
     NULL,
     "FIRST_TALK",
@@ -64,27 +58,22 @@ static char* l_evtNames[5] = {
     "GAME_GOAL_SUCCESS",
 };
 
-/* 80A88798-80A887A4 0000E4 000C+00 1/0 0/0 0/0 .data            l_loadRes_MYNA2a */
 static int l_loadRes_MYNA2a[] = {
     0, -1, -1,
 };
 
-/* 80A887A4-80A887B0 0000F0 000C+00 1/0 0/0 0/0 .data            l_loadRes_MYNA2_GAME_FAILURE */
 static int l_loadRes_MYNA2_GAME_FAILURE[] = {
     0, 1, -1,
 };
 
-/* 80A887B0-80A887BC 0000FC 000C+00 1/0 0/0 0/0 .data            l_loadRes_MYNA2_GAME_GOAL */
 static int l_loadRes_MYNA2_GAME_GOAL[] = {
     0, 2, -1,
 };
 
-/* 80A887BC-80A887C8 000108 000C+00 1/0 0/0 0/0 .data            l_loadRes_MYNA20 */
 static int l_loadRes_MYNA20[] = {
     0, -1, -1,
 };
 
-/* 80A887C8-80A887DC -00001 0014+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[5] = {
     l_loadRes_MYNA2a,
     l_loadRes_MYNA2a,
@@ -93,17 +82,14 @@ static int* l_loadRes_list[5] = {
     l_loadRes_MYNA20,
 };
 
-/* 80A887DC-80A887E8 -00001 000C+00 5/6 0/0 0/0 .data            l_resNames */
 static char* l_resNames[3] = {
     "MYNA_b",
     "MYNA_b_f",
     "MYNA_b_g",
 };
 
-/* 80A887E8-80A887EC -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "myna2";
 
-/* 80A887EC-80A88800 -00001 0014+00 0/1 0/0 0/0 .data            mEvtCutNameList__13daNpc_myna2_c */
 char* daNpc_myna2_c::mEvtCutNameList[5] = {
     "",
     "FIRST_TALK",
@@ -112,7 +98,6 @@ char* daNpc_myna2_c::mEvtCutNameList[5] = {
     "GAME_GOAL_SUCCESS",
 };
 
-/* 80A88830-80A8886C 00017C 003C+00 0/2 0/0 0/0 .data            mEvtCutList__13daNpc_myna2_c */
 daNpc_myna2_c::EventFn daNpc_myna2_c::mEvtCutList[] = {
     NULL,
     &daNpc_myna2_c::ECut_firstTalk,
@@ -121,10 +106,8 @@ daNpc_myna2_c::EventFn daNpc_myna2_c::mEvtCutList[] = {
     &daNpc_myna2_c::ECut_gameGoalSuccess,
 };
 
-/* 80A83E8C-80A84010 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__13daNpc_myna2_cFv */
 daNpc_myna2_c::daNpc_myna2_c() {}
 
-/* 80A840A0-80A842C8 000300 0228+00 1/0 0/0 0/0 .text            __dt__13daNpc_myna2_cFv */
 daNpc_myna2_c::~daNpc_myna2_c() {
     OS_REPORT("|%06d:%x|daNpc_myna2_c -> デストラクト%d\n", g_Counter.mCounter0, mType);
 
@@ -141,7 +124,6 @@ daNpc_myna2_c::~daNpc_myna2_c() {
     }
 }
 
-/* 80A88434-80A884A8 000000 0074+00 14/14 0/0 0/0 .rodata          m__19daNpc_myna2_Param_c */
 const daNpc_myna2_HIOParam daNpc_myna2_Param_c::m = {
     60.0f,
     0.0f,
@@ -180,7 +162,6 @@ const daNpc_myna2_HIOParam daNpc_myna2_Param_c::m = {
     2500.0f,
 };
 
-/* 80A842C8-80A845AC 000528 02E4+00 1/1 0/0 0/0 .text            create__13daNpc_myna2_cFv */
 int daNpc_myna2_c::create() {
     fopAcM_ct(this, daNpc_myna2_c);
 
@@ -249,7 +230,6 @@ int daNpc_myna2_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80A845AC-80A846E0 00080C 0134+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_myna2_cFv */
 int daNpc_myna2_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
 
@@ -275,30 +255,24 @@ int daNpc_myna2_c::CreateHeap() {
     return 1;
 }
 
-/* 80A846E0-80A84714 000940 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_myna2_cFv */
 int daNpc_myna2_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_myna2_c();
     return 1;
 }
 
-/* 80A84714-80A84734 000974 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_myna2_cFv */
 int daNpc_myna2_c::Execute() {
     return execute();
 }
 
-/* 80A84734-80A847A8 000994 0074+00 1/1 0/0 0/0 .text            Draw__13daNpc_myna2_cFv */
 int daNpc_myna2_c::Draw() {
     return draw(chkAction(&daNpc_myna2_c::test), FALSE, daNpc_myna2_Param_c::m.common.real_shadow_size, NULL, 0);
 }
 
-/* 80A847A8-80A847C8 000A08 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_myna2_cFP10fopAc_ac_c            */
 int daNpc_myna2_c::createHeapCallBack(fopAc_ac_c* actor) {
     return ((daNpc_myna2_c*)actor)->CreateHeap();
 }
 
-/* 80A847C8-80A848B4 000A28 00EC+00 1/0 0/0 0/0 .text            setParam__13daNpc_myna2_cFv */
 void daNpc_myna2_c::setParam() {
     ActionFn action = mNextAction;
 
@@ -324,7 +298,6 @@ void daNpc_myna2_c::setParam() {
     gravity = daNpc_myna2_Param_c::m.common.gravity;
 }
 
-/* 80A848B4-80A84B64 000B14 02B0+00 1/0 0/0 0/0 .text            main__13daNpc_myna2_cFv */
 BOOL daNpc_myna2_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -378,7 +351,6 @@ BOOL daNpc_myna2_c::main() {
     return 0;
 }
 
-/* 80A84B64-80A84DAC 000DC4 0248+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_myna2_cFv */
 void daNpc_myna2_c::setAttnPos() {
     static cXyz eyeOffset(30.0f, 10.0f, 0.0f);
 
@@ -425,8 +397,6 @@ void daNpc_myna2_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 80A84DAC-80A84EAC 00100C 0100+00 1/0 0/0 0/0 .text            setExpressionBtp__13daNpc_myna2_cFi
- */
 bool daNpc_myna2_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* btp_p = NULL;
     int mode = 0;
@@ -460,7 +430,6 @@ bool daNpc_myna2_c::setExpressionBtp(int i_index) {
     return 0;
 }
 
-/* 80A84EAC-80A84FEC 00110C 0140+00 1/0 0/0 0/0 .text            setMotionAnm__13daNpc_myna2_cFif */
 void daNpc_myna2_c::setMotionAnm(int i_index, f32 i_morf) {
     J3DAnmTransformKey* bck_p = NULL;
     int i_attr = J3DFrameCtrl::EMode_LOOP;
@@ -498,7 +467,6 @@ void daNpc_myna2_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80A84FEC-80A85030 00124C 0044+00 1/0 0/0 0/0 .text            setMotion__13daNpc_myna2_cFifi */
 void daNpc_myna2_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     s16 motion = i_motion;
 
@@ -510,16 +478,12 @@ void daNpc_myna2_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     }
 }
 
-/* 80A85030-80A85038 001290 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_myna2_cFv */
 BOOL daNpc_myna2_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80A85038-80A8503C 001298 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__13daNpc_myna2_cFv */
 void daNpc_myna2_c::drawOtherMdls() {}
 
-/* 80A8503C-80A85094 00129C 0058+00 1/1 0/0 0/0 .text            getTypeFromParam__13daNpc_myna2_cFv
- */
 u8 daNpc_myna2_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -535,7 +499,6 @@ u8 daNpc_myna2_c::getTypeFromParam() {
     }
 }
 
-/* 80A85094-80A85160 0012F4 00CC+00 1/1 0/0 0/0 .text            isDelete__13daNpc_myna2_cFv */
 int daNpc_myna2_c::isDelete() {
     if (mType == 4 || mType == 0 || mType == 1) {
         return FALSE;
@@ -554,7 +517,6 @@ int daNpc_myna2_c::isDelete() {
     return TRUE;
 }
 
-/* 80A85160-80A85358 0013C0 01F8+00 1/1 0/0 0/0 .text            reset__13daNpc_myna2_cFv */
 void daNpc_myna2_c::reset() {
     initialize();
     mLookat.initialize();
@@ -606,7 +568,6 @@ void daNpc_myna2_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80A85358-80A855E8 0015B8 0290+00 1/1 0/0 0/0 .text            playMotion__13daNpc_myna2_cFv */
 void daNpc_myna2_c::playMotion() {
     daNpcF_anmPlayData dat0 = {0, daNpc_myna2_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[] = {&dat0};
@@ -651,14 +612,10 @@ void daNpc_myna2_c::playMotion() {
     }
 }
 
-/* 80A855E8-80A85614 001848 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_myna2_cFM13daNpc_myna2_cFPCvPvPv_i        */
 int daNpc_myna2_c::chkAction(int (daNpc_myna2_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 80A85614-80A856BC 001874 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_myna2_cFM13daNpc_myna2_cFPCvPvPv_i        */
 int daNpc_myna2_c::setAction(int (daNpc_myna2_c::*i_action)(void*)) {
     mMode = 3;
 
@@ -676,7 +633,6 @@ int daNpc_myna2_c::setAction(int (daNpc_myna2_c::*i_action)(void*)) {
     return TRUE;
 }
 
-/* 80A856BC-80A857B0 00191C 00F4+00 1/1 0/0 0/0 .text            selectAction__13daNpc_myna2_cFv */
 int daNpc_myna2_c::selectAction() {
     mNextAction = NULL;
 
@@ -702,8 +658,6 @@ int daNpc_myna2_c::selectAction() {
     return TRUE;
 }
 
-/* 80A857B0-80A85894 001A10 00E4+00 1/1 0/0 0/0 .text            doNormalAction__13daNpc_myna2_cFi
- */
 void daNpc_myna2_c::doNormalAction(int param_0) {
     if (param_0 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int damage_time;
@@ -730,7 +684,6 @@ void daNpc_myna2_c::doNormalAction(int param_0) {
     }
 }
 
-/* 80A85894-80A85BA4 001AF4 0310+00 1/1 0/0 0/0 .text            doEvent__13daNpc_myna2_cFv */
 BOOL daNpc_myna2_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -812,14 +765,12 @@ BOOL daNpc_myna2_c::doEvent() {
     return rv;
 }
 
-/* 80A85BA4-80A85BC8 001E04 0024+00 7/7 0/0 0/0 .text            setLookMode__13daNpc_myna2_cFi */
 void daNpc_myna2_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 4 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80A85BC8-80A85C60 001E28 0098+00 1/0 0/0 0/0 .text            wait__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -838,7 +789,6 @@ int daNpc_myna2_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80A85C60-80A8613C 001EC0 04DC+00 1/0 0/0 0/0 .text            waitHovering__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::waitHovering(void* param_0) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp2C(player->current.pos);
@@ -876,7 +826,6 @@ int daNpc_myna2_c::waitHovering(void* param_0) {
     return 1;
 }
 
-/* 80A8613C-80A86194 00239C 0058+00 1/1 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MYNA2 && ((daNpc_myna2_c*)i_actor)->getType() == 1) {
         return i_actor;
@@ -885,7 +834,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80A86194-80A862BC 0023F4 0128+00 1/0 0/0 0/0 .text            waitFailure__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::waitFailure(void* param_0) {
     switch (mMode) {
     case 0:
@@ -919,7 +867,6 @@ int daNpc_myna2_c::waitFailure(void* param_0) {
     return 1;
 }
 
-/* 80A862BC-80A86400 00251C 0144+00 1/0 0/0 0/0 .text            waitGoal__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::waitGoal(void* param_0) {
     switch (mMode) {
     case 0:
@@ -948,7 +895,6 @@ int daNpc_myna2_c::waitGoal(void* param_0) {
     return 1;
 }
 
-/* 80A86400-80A865FC 002660 01FC+00 2/0 0/0 0/0 .text            talk__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::talk(void* param_0) {
     int var_r30 = 0;
     int var_r29 = 0;
@@ -1002,7 +948,6 @@ int daNpc_myna2_c::talk(void* param_0) {
     return var_r30;
 }
 
-/* 80A865FC-80A866B0 00285C 00B4+00 2/0 0/0 0/0 .text            test__13daNpc_myna2_cFPv */
 int daNpc_myna2_c::test(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1023,8 +968,6 @@ int daNpc_myna2_c::test(void* param_0) {
     return 1;
 }
 
-/* 80A866B0-80A8684C 002910 019C+00 1/0 0/0 0/0 .text            ECut_firstTalk__13daNpc_myna2_cFi
- */
 int daNpc_myna2_c::ECut_firstTalk(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int rt = 0;
@@ -1076,8 +1019,6 @@ int daNpc_myna2_c::ECut_firstTalk(int i_staffId) {
     return rt;
 }
 
-/* 80A8684C-80A86A0C 002AAC 01C0+00 1/0 0/0 0/0 .text            ECut_gameFailure__13daNpc_myna2_cFi
- */
 int daNpc_myna2_c::ECut_gameFailure(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int rt = 0;
@@ -1134,7 +1075,6 @@ int daNpc_myna2_c::ECut_gameFailure(int i_staffId) {
     return rt;
 }
 
-/* 80A86A0C-80A86BEC 002C6C 01E0+00 1/0 0/0 0/0 .text            ECut_gameGoal__13daNpc_myna2_cFi */
 int daNpc_myna2_c::ECut_gameGoal(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int rt = 0;
@@ -1195,7 +1135,6 @@ int daNpc_myna2_c::ECut_gameGoal(int i_staffId) {
     return rt;
 }
 
-/* 80A86BEC-80A86E8C 002E4C 02A0+00 3/0 0/0 0/0 .text ECut_gameGoalSuccess__13daNpc_myna2_cFi */
 int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int rt = 0;
@@ -1282,7 +1221,6 @@ int daNpc_myna2_c::ECut_gameGoalSuccess(int i_staffId) {
     return rt;
 }
 
-/* 80A86E8C-80A879A0 0030EC 0B14+00 6/6 0/0 0/0 .text            calcHovering__13daNpc_myna2_cFii */
 void daNpc_myna2_c::calcHovering(int param_0, int param_1) {
     if (param_0 != 0) {
         field_0xe1c.set(0.0f, 5.0f, 0.0f);
@@ -1369,32 +1307,26 @@ void daNpc_myna2_c::calcHovering(int param_0, int param_1) {
     shape_angle = mCurAngle = current.angle;
 }
 
-/* 80A879A0-80A879C0 003C00 0020+00 1/0 0/0 0/0 .text            daNpc_myna2_Create__FPv */
 static int daNpc_myna2_Create(void* i_this) {
     return ((daNpc_myna2_c*)i_this)->create();
 }
 
-/* 80A879C0-80A879E0 003C20 0020+00 1/0 0/0 0/0 .text            daNpc_myna2_Delete__FPv */
 static int daNpc_myna2_Delete(void* i_this) {
     return ((daNpc_myna2_c*)i_this)->Delete();
 }
 
-/* 80A879E0-80A87A00 003C40 0020+00 1/0 0/0 0/0 .text            daNpc_myna2_Execute__FPv */
 static int daNpc_myna2_Execute(void* i_this) {
     return ((daNpc_myna2_c*)i_this)->Execute();
 }
 
-/* 80A87A00-80A87A20 003C60 0020+00 1/0 0/0 0/0 .text            daNpc_myna2_Draw__FPv */
 static int daNpc_myna2_Draw(void* i_this) {
     return ((daNpc_myna2_c*)i_this)->Draw();
 }
 
-/* 80A87A20-80A87A28 003C80 0008+00 1/0 0/0 0/0 .text            daNpc_myna2_IsDelete__FPv */
 static int daNpc_myna2_IsDelete(void* i_this) {
     return TRUE;
 }
 
-/* 80A889C4-80A889E4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_myna2_MethodTable */
 static actor_method_class daNpc_myna2_MethodTable = {
     (process_method_func)daNpc_myna2_Create,
     (process_method_func)daNpc_myna2_Delete,
@@ -1403,7 +1335,6 @@ static actor_method_class daNpc_myna2_MethodTable = {
     (process_method_func)daNpc_myna2_Draw,
 };
 
-/* 80A889E4-80A88A14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_MYNA2 */
 extern actor_process_profile_definition g_profile_MYNA2 = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp
index ce02a79663..32bf3edab4 100644
--- a/src/d/actor/d_a_npc_ne.cpp
+++ b/src/d/actor/d_a_npc_ne.cpp
@@ -19,7 +19,6 @@
 #include "c/c_damagereaction.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80A925F0-80A92850 000000 0260+00 3/3 0/0 0/0 .data            home_path */
 static home_path_pnt home_path[38] = {
     {0, {561.0f, 87.0f, -1110.0f}},
     {1, {306.0f, 87.0f, -849.0f}},
@@ -61,7 +60,6 @@ static home_path_pnt home_path[38] = {
     {-1, {0.0f, 0.0f, 0.0f}},
 };
 
-/* 80A88CCC-80A88D14 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__14daNpc_Ne_HIO_cFv */
 daNpc_Ne_HIO_c::daNpc_Ne_HIO_c() :
     field_0x04(-1),
     mScale(1.0f),
@@ -73,8 +71,6 @@ daNpc_Ne_HIO_c::daNpc_Ne_HIO_c() :
     /* empty function */
 }
 
-/* 80A88D14-80A88DC0 000134 00AC+00 19/19 0/0 0/0 .text            anm_init__FP12npc_ne_classifUcf
- */
 static void anm_init(npc_ne_class* i_this, int i_resNo, f32 i_morf, u8 i_attr, f32 i_speed) {
     J3DAnmTransform* anm =
         static_cast<J3DAnmTransform*>(dComIfG_getObjectRes(i_this->mResName, i_resNo));
@@ -83,7 +79,6 @@ static void anm_init(npc_ne_class* i_this, int i_resNo, f32 i_morf, u8 i_attr, f
 }
 
 
-/* 80A88DC0-80A88FC4 0001E0 0204+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -133,7 +128,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80A88FC4-80A89160 0003E4 019C+00 1/0 0/0 0/0 .text            daNpc_Ne_Draw__FP12npc_ne_class */
 static int daNpc_Ne_Draw(npc_ne_class* i_this) {
     if (daPy_py_c::linkGrabSubjectNoDraw(i_this)) {
         return 1;
@@ -171,8 +165,6 @@ static int daNpc_Ne_Draw(npc_ne_class* i_this) {
     return 1;
 }
 
-/* 80A8919C-80A89298 0005BC 00FC+00 3/3 0/0 0/0 .text other_bg_check__FP10fopAc_ac_cP10fopAc_ac_c
- */
 static BOOL other_bg_check(fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
     dBgS_LinChk lin_chk;
     if (i_actor != NULL) {
@@ -192,7 +184,6 @@ static BOOL other_bg_check(fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
 }
 
 
-/* 80A89298-80A892D4 0006B8 003C+00 1/1 0/0 0/0 .text            ne_carry_check__FP12npc_ne_class */
 static BOOL ne_carry_check(npc_ne_class* i_this) {
     if (i_this->mAction != npc_ne_class::ACT_CARRY && fopAcM_checkCarryNow(i_this)) {
         i_this->mAction = npc_ne_class::ACT_CARRY;
@@ -204,7 +195,6 @@ static BOOL ne_carry_check(npc_ne_class* i_this) {
     }
 }
 
-/* 80A892D4-80A895F8 0006F4 0324+00 2/2 0/0 0/0 .text            way_bg_check__FP12npc_ne_classs */
 static int way_bg_check(npc_ne_class* i_this, s16 i_angle) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -253,7 +243,6 @@ static int way_bg_check(npc_ne_class* i_this, s16 i_angle) {
     }
 }
 
-/* 80A89640-80A897C0 000A60 0180+00 1/1 0/0 0/0 .text            water_check__FP12npc_ne_classf */
 static int water_check(npc_ne_class* i_this, f32 param_1) {
     dBgS_ObjGndChk_Spl gnd_chk_spl;
     dBgS_GndChk gnd_chk;
@@ -283,8 +272,6 @@ static f32 dummy(f32 param_0) {
     return param_0 + 5.0f + 60.0f + 25.0f;
 }
 
-/* 80A897C0-80A899C0 000BE0 0200+00 1/1 0/0 0/0 .text            climb_angle_get__FP12npc_ne_class
- */
 static s16 climb_angle_get(npc_ne_class* i_this) {
     dBgS_LinChk lin_chk;
     mDoMtx_YrotS(*calc_mtx, i_this->current.angle.y);
@@ -313,23 +300,17 @@ static s16 climb_angle_get(npc_ne_class* i_this) {
     return 0;
 }
 
-/* 80A92AC4-80A92AC8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 80A92AC5 0003+00 data_80A92AC5 None */
 static bool l_hioInit;
 
-/* 80A92AD4-80A92AF0 000054 001C+00 11/11 0/0 0/0 .bss             l_HIO */
 static daNpc_Ne_HIO_c l_HIO;
 
-/* 80A92AF0-80A92B04 000070 0014+00 2/3 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[5];
 
-/* 80A92B04-80A92B18 000084 0014+00 0/1 0/0 0/0 .bss             target_bgc */
 static BOOL target_bgc[5];
 
-/* 80A92B18-80A92B1C 000098 0004+00 2/3 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80A899C0-80A89A38 000DE0 0078+00 1/1 0/0 0/0 .text            s_bl_sub__FPvPv */
 static void* s_bl_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc)
         && (fopAcM_GetName(i_proc) == PROC_OBJ_FOOD || fopAcM_GetName(i_proc) == PROC_BD)
@@ -341,7 +322,6 @@ static void* s_bl_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80A89A38-80A89AB0 000E58 0078+00 1/1 0/0 0/0 .text            s_ss_sub__FPvPv */
 static void* s_ss_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc)
         && (fopAcM_GetName(i_proc) == PROC_NI || fopAcM_GetName(i_proc) == PROC_BD)
@@ -353,7 +333,6 @@ static void* s_ss_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80A89AB0-80A89D28 000ED0 0278+00 3/3 0/0 0/0 .text            search_bird__FP12npc_ne_class */
 static fopAc_ac_c* search_bird(npc_ne_class* i_this) {
     target_info_count = 0;
     for (int i = 0; i < 5; i++) {
@@ -410,7 +389,6 @@ static fopAc_ac_c* search_bird(npc_ne_class* i_this) {
     return NULL;
 }
 
-/* 80A89D28-80A89EF4 001148 01CC+00 2/2 0/0 0/0 .text            way_check__FP12npc_ne_classs */
 static BOOL way_check(npc_ne_class* i_this, s16 i_angleY) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     f32 fvar1 = 1000.0f;
@@ -443,7 +421,6 @@ static BOOL way_check(npc_ne_class* i_this, s16 i_angleY) {
     return false;
 }
 
-/* 80A89EF4-80A8A234 001314 0340+00 1/1 0/0 0/0 .text            npc_ne_wait__FP12npc_ne_class */
 static void npc_ne_wait(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -530,7 +507,6 @@ static void npc_ne_wait(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8A234-80A8A8F4 001654 06C0+00 1/1 0/0 0/0 .text            npc_ne_away__FP12npc_ne_class */
 static void npc_ne_away(npc_ne_class* i_this) {
     if (!i_this->mNoFollow) {
         i_this->mAction = npc_ne_class::ACT_TAME;
@@ -673,7 +649,6 @@ static void npc_ne_away(npc_ne_class* i_this) {
     i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed);
 }
 
-/* 80A8A8F4-80A8AAE8 001D14 01F4+00 1/1 0/0 0/0 .text            ground_search__FP12npc_ne_class */
 static cXyz ground_search(npc_ne_class* i_this) {
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
     dBgS_ObjGndChk_Spl gnd_chk_spl;
@@ -713,7 +688,6 @@ static cXyz ground_search(npc_ne_class* i_this) {
 }
 
 
-/* 80A8AAE8-80A8AB70 001F08 0088+00 1/1 0/0 0/0 .text            s_fish_sub__FPvPv */
 static void* s_fish_sub(void* i_proc, void* i_this) {
     npc_ne_class* _this = static_cast<npc_ne_class*>(i_this);
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_MG_FISH) {
@@ -726,7 +700,6 @@ static void* s_fish_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80A8AB70-80A8B530 001F90 09C0+00 2/1 0/0 0/0 .text            npc_ne_tame__FP12npc_ne_class */
 static void npc_ne_tame(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     if (i_this->mNoFollow) {
@@ -985,7 +958,6 @@ static void npc_ne_tame(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8B530-80A8B61C 002950 00EC+00 1/1 0/0 0/0 .text            npc_ne_sanbasi__FP12npc_ne_class */
 static void npc_ne_sanbasi(npc_ne_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -1007,7 +979,6 @@ static void npc_ne_sanbasi(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8B61C-80A8BAFC 002A3C 04E0+00 1/1 0/0 0/0 .text            npc_ne_bird__FP12npc_ne_class */
 static void npc_ne_bird(npc_ne_class* i_this) {
     fopAc_ac_c* bird = search_bird(i_this);
     if (bird == NULL) {
@@ -1105,7 +1076,6 @@ static void npc_ne_bird(npc_ne_class* i_this) {
     i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed);
 }
 
-/* 80A8BAFC-80A8C094 002F1C 0598+00 2/1 0/0 0/0 .text            npc_ne_ball__FP12npc_ne_class */
 static void npc_ne_ball(npc_ne_class* i_this) {
     fopAc_ac_c* ball = search_bird(i_this);
     if (ball == NULL) {
@@ -1223,8 +1193,6 @@ static void npc_ne_ball(npc_ne_class* i_this) {
     i_this->mpMorf->setPlaySpeed(i_this->mAnmSpeed);
 }
 
-/* 80A8C094-80A8C508 0034B4 0474+00 1/1 0/0 0/0 .text            npc_ne_pathwalk__FP12npc_ne_class
- */
 static void npc_ne_pathwalk(npc_ne_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -1299,7 +1267,6 @@ static void npc_ne_pathwalk(npc_ne_class* i_this) {
     cLib_addCalc2(&i_this->mAngleYStep, 150.0f, 1.0f, 30.0f);
 }
 
-/* 80A8C508-80A8C748 003928 0240+00 1/1 0/0 0/0 .text            npc_ne_jump__FP12npc_ne_class */
 static void npc_ne_jump(npc_ne_class* i_this) {
     int frame = i_this->mpMorf->getFrame();
     f32 target_speed = 0.0f;
@@ -1352,7 +1319,6 @@ static void npc_ne_jump(npc_ne_class* i_this) {
     cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, max_speed_step);
 }
 
-/* 80A8C748-80A8C8F8 003B68 01B0+00 1/1 0/0 0/0 .text            npc_ne_s_jump__FP12npc_ne_class */
 static void npc_ne_s_jump(npc_ne_class* i_this) {
     int frame = i_this->mpMorf->getFrame();
     f32 target_speed = 0.0f;
@@ -1399,7 +1365,6 @@ static void npc_ne_s_jump(npc_ne_class* i_this) {
     cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, max_speed_step);
 }
 
-/* 80A8C8F8-80A8CA20 003D18 0128+00 1/1 0/0 0/0 .text            npc_ne_roof__FP12npc_ne_class */
 static void npc_ne_roof(npc_ne_class* i_this) {
     i_this->mCcDisableTimer = 5;
     i_this->mLookMode = npc_ne_class::LOOK_PLAYER;
@@ -1428,8 +1393,6 @@ static void npc_ne_roof(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8CA20-80A8CC64 003E40 0244+00 1/1 0/0 0/0 .text            home_path_search__FP12npc_ne_classi
- */
 static int home_path_search(npc_ne_class* i_this, int param_1) {
     f32 max_dist = 100.0f;
     BOOL local_1c0[100];
@@ -1463,7 +1426,6 @@ static int home_path_search(npc_ne_class* i_this, int param_1) {
     return -1;
 }
 
-/* 80A8CC64-80A8D608 004084 09A4+00 2/1 0/0 0/0 .text            npc_ne_home__FP12npc_ne_class */
 static BOOL npc_ne_home(npc_ne_class* i_this) {
     BOOL ret = true;
     i_this->mCcDisableTimer = 10;
@@ -1695,7 +1657,6 @@ static BOOL npc_ne_home(npc_ne_class* i_this) {
     return ret;
 }
 
-/* 80A8D608-80A8D7C4 004A28 01BC+00 2/2 0/0 0/0 .text            wall_angle_get__FP12npc_ne_class */
 static s16 wall_angle_get(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -1721,8 +1682,6 @@ static s16 wall_angle_get(npc_ne_class* i_this) {
     return cM_atan2s(vec1.x, vec1.z) + 0x4000;
 }
 
-/* 80A8D7C4-80A8DD54 004BE4 0590+00 1/1 0/0 0/0 .text            search_ground_1__FP12npc_ne_class
- */
 static void search_ground_1(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -1783,8 +1742,6 @@ static void search_ground_1(npc_ne_class* i_this) {
     i_this->mTargetPos = pos[i];
 }
 
-/* 80A8DD58-80A8DEE0 005178 0188+00 1/1 0/0 0/0 .text            search_ground_2__FP12npc_ne_classs
- */
 static BOOL search_ground_2(npc_ne_class* i_this, s16 i_wallAngle) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -1814,7 +1771,6 @@ static BOOL search_ground_2(npc_ne_class* i_this, s16 i_wallAngle) {
     }
 }
 
-/* 80A8DEE0-80A8E0E4 005300 0204+00 1/1 0/0 0/0 .text            npc_ne_swim__FP12npc_ne_class */
 static void npc_ne_swim(npc_ne_class* i_this) {
     s16 max_angle_step = 0;
 
@@ -1857,7 +1813,6 @@ static void npc_ne_swim(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8E0E4-80A8E428 005504 0344+00 1/1 0/0 0/0 .text            npc_ne_outswim__FP12npc_ne_class */
 static void npc_ne_outswim(npc_ne_class* i_this) {
     cXyz delta;
 
@@ -1913,7 +1868,6 @@ static void npc_ne_outswim(npc_ne_class* i_this) {
     i_this->gravity = 0.0f;
 }
 
-/* 80A8E428-80A8EA78 005848 0650+00 1/1 0/0 0/0 .text            npc_ne_climb__FP12npc_ne_class */
 static BOOL npc_ne_climb(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     BOOL ret = false;
@@ -2019,7 +1973,6 @@ static BOOL npc_ne_climb(npc_ne_class* i_this) {
     return ret;
 }
 
-/* 80A8EA78-80A8EB60 005E98 00E8+00 1/1 0/0 0/0 .text            npc_ne_drop__FP12npc_ne_class */
 static void npc_ne_drop(npc_ne_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -2050,7 +2003,6 @@ static void npc_ne_drop(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8EB60-80A8ED58 005F80 01F8+00 1/1 0/0 0/0 .text            npc_ne_s_drop__FP12npc_ne_class */
 static void npc_ne_s_drop(npc_ne_class* i_this) {
     int frame = i_this->mpMorf->getFrame();
     f32 target_speed = 0.0f;
@@ -2103,7 +2055,6 @@ static void npc_ne_s_drop(npc_ne_class* i_this) {
     cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, max_speed_step);
 }
 
-/* 80A8ED58-80A8F0FC 006178 03A4+00 1/1 0/0 0/0 .text            npc_ne_carry__FP12npc_ne_class */
 static BOOL npc_ne_carry(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     BOOL ret = false;
@@ -2174,7 +2125,6 @@ static BOOL npc_ne_carry(npc_ne_class* i_this) {
     return ret;
 }
 
-/* 80A8F0FC-80A8F1B0 00651C 00B4+00 1/1 0/0 0/0 .text            npc_ne_dish__FP12npc_ne_class */
 static void npc_ne_dish(npc_ne_class* i_this) {
     i_this->mCcDisableTimer = 10;
 
@@ -2196,7 +2146,6 @@ static void npc_ne_dish(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8F1B0-80A8F278 0065D0 00C8+00 1/1 0/0 0/0 .text            npc_ne_message__FP12npc_ne_class */
 static void npc_ne_message(npc_ne_class* i_this) {
     i_this->mLookMode = npc_ne_class::LOOK_PLAYER;
 
@@ -2218,7 +2167,6 @@ static void npc_ne_message(npc_ne_class* i_this) {
     }
 }
 
-/* 80A8F278-80A903E8 006698 1170+00 2/1 0/0 0/0 .text            action__FP12npc_ne_class */
 static void action(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -2652,7 +2600,6 @@ static void action(npc_ne_class* i_this) {
     }
 }
 
-/* 80A903E8-80A90E28 007808 0A40+00 1/1 0/0 0/0 .text            demo_camera__FP12npc_ne_class */
 static void demo_camera(npc_ne_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     daPy_py_c* player = static_cast<daPy_py_c*>(dComIfGp_getPlayer(0));
@@ -2898,7 +2845,6 @@ static void demo_camera(npc_ne_class* i_this) {
     }
 }
 
-/* 80A90E28-80A91004 008248 01DC+00 1/1 0/0 0/0 .text            message__FP12npc_ne_class */
 static int message(npc_ne_class* i_this) {
     if (i_this->mResName == "Npc_net" && !dComIfGs_wolfeye_effect_check()) {
         i_this->mMessageState = 0;
@@ -2939,8 +2885,6 @@ static int message(npc_ne_class* i_this) {
     }
 }
 
-/* 80A91004-80A9172C 008424 0728+00 2/1 0/0 0/0 .text            daNpc_Ne_Execute__FP12npc_ne_class
- */
 static int daNpc_Ne_Execute(npc_ne_class* i_this) {
     if (cDmrNowMidnaTalk() && !fopAcM_checkCarryNow(i_this)) {
         return 1;
@@ -3074,14 +3018,10 @@ static int daNpc_Ne_Execute(npc_ne_class* i_this) {
     return 1;
 }
 
-/* 80A9172C-80A91734 008B4C 0008+00 1/0 0/0 0/0 .text            daNpc_Ne_IsDelete__FP12npc_ne_class
- */
 static int daNpc_Ne_IsDelete(npc_ne_class* i_this) {
     return 1;
 }
 
-/* 80A91734-80A91798 008B54 0064+00 1/0 0/0 0/0 .text            daNpc_Ne_Delete__FP12npc_ne_class
- */
 static int daNpc_Ne_Delete(npc_ne_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, i_this->mResName);
     if (i_this->mHIOInit != 0) {
@@ -3093,7 +3033,6 @@ static int daNpc_Ne_Delete(npc_ne_class* i_this) {
     return 1;
 }
 
-/* 80A91798-80A91B40 008BB8 03A8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     npc_ne_class* _this = static_cast<npc_ne_class*>(i_this);
     _this->mpMorf =
@@ -3157,7 +3096,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80A91B88-80A92118 008FA8 0590+00 1/0 0/0 0/0 .text            daNpc_Ne_Create__FP10fopAc_ac_c */
 static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
     npc_ne_class* _this = static_cast<npc_ne_class*>(i_this);
     fopAcM_ct(i_this, npc_ne_class);
@@ -3307,12 +3245,10 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) {
 }
 
 
-/* 80A92118-80A92274 009538 015C+00 1/1 0/0 0/0 .text            __ct__12npc_ne_classFv */
 npc_ne_class::npc_ne_class() {
     /* empty function */
 }
 
-/* 80A929D0-80A929F0 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Ne_Method */
 static actor_method_class l_daNpc_Ne_Method = {
     (process_method_func)daNpc_Ne_Create,
     (process_method_func)daNpc_Ne_Delete,
@@ -3321,7 +3257,6 @@ static actor_method_class l_daNpc_Ne_Method = {
     (process_method_func)daNpc_Ne_Draw,
 };
 
-/* 80A929F0-80A92A20 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_NE */
 extern actor_process_profile_definition g_profile_NPC_NE = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp
index ace2324b63..4b2edf7db0 100644
--- a/src/d/actor/d_a_npc_p2.cpp
+++ b/src/d/actor/d_a_npc_p2.cpp
@@ -6,35 +6,27 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_p2.h"
-#include "dol2asm.h"
 
-/* 80A92BF8-80A92C00 000078 0008+00 1/0 0/0 0/0 .text            daNpc_P2Create__FPv */
 static bool daNpc_P2Create(void* param_0) {
     return true;
 }
 
-/* 80A92C00-80A92C08 000080 0008+00 1/0 0/0 0/0 .text            daNpc_P2Delete__FPv */
 static bool daNpc_P2Delete(void* param_0) {
     return true;
 }
 
-/* 80A92C08-80A92C10 000088 0008+00 1/0 0/0 0/0 .text            daNpc_P2Execute__FPv */
 static bool daNpc_P2Execute(void* param_0) {
     return true;
 }
 
-/* 80A92C10-80A92C18 000090 0008+00 1/0 0/0 0/0 .text            daNpc_P2Draw__FPv */
 static bool daNpc_P2Draw(void* param_0) {
     return true;
 }
 
-/* 80A92C18-80A92C20 000098 0008+00 1/0 0/0 0/0 .text            daNpc_P2IsDelete__FPv */
 static bool daNpc_P2IsDelete(void* param_0) {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80A92C28-80A92C48 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_P2MethodTable */
 static actor_method_class daNpc_P2MethodTable = {
     (process_method_func)daNpc_P2Create,
     (process_method_func)daNpc_P2Delete,
@@ -43,7 +35,6 @@ static actor_method_class daNpc_P2MethodTable = {
     (process_method_func)daNpc_P2Draw,
 };
 
-/* 80A92C48-80A92C78 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_P2 */
 extern actor_process_profile_definition g_profile_NPC_P2 = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp
index b627d4f82f..385bbdd023 100644
--- a/src/d/actor/d_a_npc_pachi_besu.cpp
+++ b/src/d/actor/d_a_npc_pachi_besu.cpp
@@ -256,7 +256,6 @@ enum Event {
     /* 0x1 */ EVT_TUTRIAL_TALK2,
 };
 
-/* 80A96C60-80A96C90 000020 0030+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[6][2] = {
     {BMDR_BESU, BESU},
     {BMDR_BESU_TW, BESU_TW},
@@ -266,13 +265,11 @@ static int l_bmdData[6][2] = {
     {BMDR_BESU_CUP, BESU2},
 };
 
-/* 80A96C90-80A96CA0 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"TUTRIAL_TALK2", 7},
 };
 
-/* 80A96CA0-80A96CC0 -00001 0020+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[8] = {
     "",
     "Besu",
@@ -284,38 +281,31 @@ static char* l_resNameList[8] = {
     "evt_pachi",
 };
 
-/* 80A96CC0-80A96CC8 000080 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[6] = {
     BESU, BESU0, BESU2, BESU1, EVT_PACHI, -1,
 };
 
-/* 80A96CC8-80A96CCC 000088 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     BESU0, BESU_TW, -1,
 };
 
-/* 80A96CCC-80A96CD0 00008C 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {
     BESU2, BESU0, -1,
 };
 
-/* 80A96CD0-80A96CD4 000090 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[3] = {
     BESU0, BESU3, -1,
 };
 
-/* 80A96CD4-80A96CDC 000094 0007+01 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[7] = {
     BESU, BESU_TW, BESU0, BESU1, BESU2, BESU3, -1,
 };
 
-/* 80A96CDC-80A96CE4 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn4,
 };
 
-/* 80A96CE4-80A9702C 0000A4 0348+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, 25, J3DFrameCtrl::EMode_LOOP, BESU0, 1},
     {BCK_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, BTP_BESU_F_TALK_A, J3DFrameCtrl::EMode_NONE, BESU1, 0},
@@ -349,7 +339,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {BCK_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, BTP_BESU_FH_BIKKURI, J3DFrameCtrl::EMode_LOOP, BESU0, 0},
 };
 
-/* 80A9702C-80A973C8 0003EC 039C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[33] = {
     {BCK_BESU_WAIT_A, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
     {BCK_BESU_WAIT_B, J3DFrameCtrl::EMode_LOOP, BESU1, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
@@ -386,7 +375,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[33] = {
     {BCK_BESU_BODY_WAIT, J3DFrameCtrl::EMode_LOOP, BESU0, BTK_BESU, J3DFrameCtrl::EMode_NONE, BESU0, 1, 0},
 };
 
-/* 80A973C8-80A97598 000788 01D0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116] = {
     {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 1}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -419,7 +407,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[116]
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A97598-80A97778 000958 01E0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -453,7 +440,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A97778-80A977A4 -00001 002C+00 1/1 0/0 0/0 .data            mCutNameList__18daNpc_Pachi_Besu_c */
 char* daNpc_Pachi_Besu_c::mCutNameList[11] = {
     "",
     "TUTRIAL_BEGIN",
@@ -468,7 +454,6 @@ char* daNpc_Pachi_Besu_c::mCutNameList[11] = {
     "TUTRIAL_CAUTION",
 };
 
-/* 80A9781C-80A978A0 000BDC 0084+00 1/2 0/0 0/0 .data            mCutList__18daNpc_Pachi_Besu_c */
 daNpc_Pachi_Besu_c::cutFunc daNpc_Pachi_Besu_c::mCutList[11] = {
     NULL,
     &daNpc_Pachi_Besu_c::cutTutrialBegin,
@@ -483,7 +468,6 @@ daNpc_Pachi_Besu_c::cutFunc daNpc_Pachi_Besu_c::mCutList[11] = {
     &daNpc_Pachi_Besu_c::cutTutrialCaution,
 };
 
-/* 80A92D6C-80A92EA4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__18daNpc_Pachi_Besu_cFv */
 daNpc_Pachi_Besu_c::~daNpc_Pachi_Besu_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -492,7 +476,6 @@ daNpc_Pachi_Besu_c::~daNpc_Pachi_Besu_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A96A6C-80A96AF8 000000 008C+00 9/9 0/0 0/0 .rodata          m__24daNpc_Pachi_Besu_Param_c */
 daNpc_Pachi_Besu_HIOParam const daNpc_Pachi_Besu_Param_c::m = {
     160.0f,
     -3.0f,
@@ -537,7 +520,6 @@ daNpc_Pachi_Besu_HIOParam const daNpc_Pachi_Besu_Param_c::m = {
     70.0f,
 };
 
-/* 80A92EA4-80A9317C 000224 02D8+00 1/1 0/0 0/0 .text            create__18daNpc_Pachi_Besu_cFv */
 cPhs__Step daNpc_Pachi_Besu_c::create() {
     daNpcT_ct(this, daNpc_Pachi_Besu_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -593,7 +575,6 @@ cPhs__Step daNpc_Pachi_Besu_c::create() {
     return phase;
 }
 
-/* 80A9317C-80A9344C 0004FC 02D0+00 1/1 0/0 0/0 .text            CreateHeap__18daNpc_Pachi_Besu_cFv */
 int daNpc_Pachi_Besu_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
     if (modelData == NULL) {
@@ -632,18 +613,15 @@ int daNpc_Pachi_Besu_c::CreateHeap() {
     }
 }
 
-/* 80A93608-80A9363C 000988 0034+00 1/1 0/0 0/0 .text            Delete__18daNpc_Pachi_Besu_cFv */
 int daNpc_Pachi_Besu_c::Delete() {
     this->~daNpc_Pachi_Besu_c();
     return 1;
 }
 
-/* 80A9363C-80A9365C 0009BC 0020+00 2/2 0/0 0/0 .text            Execute__18daNpc_Pachi_Besu_cFv */
 int daNpc_Pachi_Besu_c::Execute() {
     return execute();
 }
 
-/* 80A9365C-80A936F0 0009DC 0094+00 1/1 0/0 0/0 .text            Draw__18daNpc_Pachi_Besu_cFv */
 int daNpc_Pachi_Besu_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -661,12 +639,10 @@ int daNpc_Pachi_Besu_c::Draw() {
     );
 }
 
-/* 80A936F0-80A93710 000A70 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__18daNpc_Pachi_Besu_cFP10fopAc_ac_c */
 int daNpc_Pachi_Besu_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_Pachi_Besu_c*>(a_this)->CreateHeap();
 }
 
-/* 80A93710-80A93768 000A90 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__18daNpc_Pachi_Besu_cFP8J3DJointi */
 int daNpc_Pachi_Besu_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -679,7 +655,6 @@ int daNpc_Pachi_Besu_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A93768-80A93788 000AE8 0020+00 1/1 0/0 0/0 .text            getType__18daNpc_Pachi_Besu_cFv */
 u8 daNpc_Pachi_Besu_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -690,7 +665,6 @@ u8 daNpc_Pachi_Besu_c::getType() {
     }
 }
 
-/* 80A93788-80A937A8 000B08 0020+00 1/1 0/0 0/0 .text            isDelete__18daNpc_Pachi_Besu_cFv */
 BOOL daNpc_Pachi_Besu_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -701,7 +675,6 @@ BOOL daNpc_Pachi_Besu_c::isDelete() {
     }
 }
 
-/* 80A937A8-80A93910 000B28 0168+00 1/1 0/0 0/0 .text            reset__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::reset() {
     int size = (u8*)&field_0xfc8 - (u8*)&mNextAction;
 
@@ -726,7 +699,6 @@ void daNpc_Pachi_Besu_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A93910-80A9398C 000C90 007C+00 1/0 0/0 0/0 .text            afterJntAnm__18daNpc_Pachi_Besu_cFi */
 void daNpc_Pachi_Besu_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleX(1));
@@ -737,7 +709,6 @@ void daNpc_Pachi_Besu_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80A9398C-80A93A88 000D0C 00FC+00 1/0 0/0 0/0 .text            setParam__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::setParam() {
     selectAction();
     srchActors();
@@ -763,10 +734,8 @@ void daNpc_Pachi_Besu_c::setParam() {
     gravity = daNpc_Pachi_Besu_Param_c::m.common.gravity;
 }
 
-/* 80A97B14-80A97B18 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Pachi_Besu_Param_c l_HIO;
 
-/* 80A93A88-80A93D70 000E08 02E8+00 1/0 0/0 0/0 .text            afterMoved__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::afterMoved() {
     fopAc_ac_c* actor_p1 = mActorMngrs[0].getActorP();
     fopAc_ac_c* actor_p2 = mActorMngrs[1].getActorP();
@@ -807,12 +776,10 @@ void daNpc_Pachi_Besu_c::afterMoved() {
     }
 }
 
-/* 80A93D70-80A93D78 0010F0 0008+00 1/0 0/0 0/0 .text checkChangeEvt__18daNpc_Pachi_Besu_cFv */
 BOOL daNpc_Pachi_Besu_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A93D78-80A93E24 0010F8 00AC+00 2/0 0/0 0/0 .text setAfterTalkMotion__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::setAfterTalkMotion() {
     int i_faceMotion = FACE_MOT_NONE;
 
@@ -841,7 +808,6 @@ void daNpc_Pachi_Besu_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_faceMotion, -1.0f, FALSE, 0);
 }
 
-/* 80A93E24-80A93EAC 0011A4 0088+00 1/1 0/0 0/0 .text            srchActors__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -858,7 +824,6 @@ void daNpc_Pachi_Besu_c::srchActors() {
     }
 }
 
-/* 80A93EAC-80A93FB0 00122C 0104+00 1/0 0/0 0/0 .text            evtTalk__18daNpc_Pachi_Besu_cFv */
 BOOL daNpc_Pachi_Besu_c::evtTalk() {
     if (chkAction(&daNpc_Pachi_Besu_c::talk)) {
         (this->*mAction)(NULL);
@@ -880,7 +845,6 @@ BOOL daNpc_Pachi_Besu_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A93FB0-80A94078 001330 00C8+00 1/0 0/0 0/0 .text            evtCutProc__18daNpc_Pachi_Besu_cFv */
 BOOL daNpc_Pachi_Besu_c::evtCutProc() {
     BOOL rv;
     int staffId = dComIfGp_getEventManager().getMyStaffId("PA_Besu", this, -1);
@@ -900,7 +864,6 @@ BOOL daNpc_Pachi_Besu_c::evtCutProc() {
     return rv;
 }
 
-/* 80A94078-80A94220 0013F8 01A8+00 1/0 0/0 0/0 .text            action__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::action() {
     fopAc_ac_c* actor_p = NULL;
 
@@ -930,14 +893,12 @@ void daNpc_Pachi_Besu_c::action() {
     }
 }
 
-/* 80A94220-80A94298 0015A0 0078+00 1/0 0/0 0/0 .text            beforeMove__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A94298-80A944F0 001618 0258+00 1/0 0/0 0/0 .text            setAttnPos__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::setAttnPos() {
     cXyz sp38(10.0f, 30.0f, 0.0f);
 
@@ -968,7 +929,6 @@ void daNpc_Pachi_Besu_c::setAttnPos() {
     attention_info.position.y += daNpc_Pachi_Besu_Param_c::m.common.attention_offset;
 }
 
-/* 80A944F0-80A94620 001870 0130+00 1/0 0/0 0/0 .text            setCollision__18daNpc_Pachi_Besu_cFv */
 void daNpc_Pachi_Besu_c::setCollision() {
     cXyz sp28;
 
@@ -1004,12 +964,10 @@ void daNpc_Pachi_Besu_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A94620-80A94628 0019A0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__18daNpc_Pachi_Besu_cFv */
 int daNpc_Pachi_Besu_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A94628-80A946A4 0019A8 007C+00 1/1 0/0 0/0 .text            selectAction__18daNpc_Pachi_Besu_cFv */
 BOOL daNpc_Pachi_Besu_c::selectAction() {
     mNextAction = NULL;
 
@@ -1026,12 +984,10 @@ BOOL daNpc_Pachi_Besu_c::selectAction() {
     return TRUE;
 }
 
-/* 80A946A4-80A946D0 001A24 002C+00 1/1 0/0 0/0 .text            chkAction__18daNpc_Pachi_Besu_cFM18daNpc_Pachi_Besu_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Besu_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80A946D0-80A94778 001A50 00A8+00 2/2 0/0 0/0 .text            setAction__18daNpc_Pachi_Besu_cFM18daNpc_Pachi_Besu_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Besu_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1049,7 +1005,6 @@ BOOL daNpc_Pachi_Besu_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A94778-80A949EC 001AF8 0274+00 2/0 0/0 0/0 .text            wait__18daNpc_Pachi_Besu_cFPv */
 BOOL daNpc_Pachi_Besu_c::wait(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1107,7 +1062,6 @@ BOOL daNpc_Pachi_Besu_c::wait(void* param_1) {
     return TRUE;
 }
 
-/* 80A949EC-80A94A7C 001D6C 0090+00 2/0 0/0 0/0 .text            talk__18daNpc_Pachi_Besu_cFPv */
 BOOL daNpc_Pachi_Besu_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1140,13 +1094,11 @@ BOOL daNpc_Pachi_Besu_c::test(void* param_1) {
 }
 #endif
 
-/* 80A94A7C-80A94AC8 001DFC 004C+00 3/3 0/0 0/0 .text            _turn_to_link__18daNpc_Pachi_Besu_cFs */
 BOOL daNpc_Pachi_Besu_c::_turn_to_link(s16 param_1) {
     cXyz pos(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
     return _turn_pos(pos, param_1);
 }
 
-/* 80A94AC8-80A94B24 001E48 005C+00 4/4 0/0 0/0 .text            _turn_pos__18daNpc_Pachi_Besu_cFRC4cXyzs */
 BOOL daNpc_Pachi_Besu_c::_turn_pos(cXyz const& i_pos, s16 param_2) {
     int rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(&current.pos, &i_pos), param_2);
     current.angle.y = mCurAngle.y;
@@ -1154,7 +1106,6 @@ BOOL daNpc_Pachi_Besu_c::_turn_pos(cXyz const& i_pos, s16 param_2) {
     return rv;
 }
 
-/* 80A94B24-80A94B64 001EA4 0040+00 1/1 0/0 0/0 .text            _turn_pos__18daNpc_Pachi_Besu_cFRC4cXyz */
 BOOL daNpc_Pachi_Besu_c::_turn_pos(cXyz const& i_pos) {
     s16 sVar1 = cLib_targetAngleY(&current.pos, &i_pos);
     mCurAngle.y = sVar1;
@@ -1164,7 +1115,6 @@ BOOL daNpc_Pachi_Besu_c::_turn_pos(cXyz const& i_pos) {
     return TRUE;
 }
 
-/* 80A94B64-80A94BF8 001EE4 0094+00 1/0 0/0 0/0 .text            cutTutrialBegin__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialBegin(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1181,17 +1131,14 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialBegin(int i_staffId) {
     return _cutTutrialBegin_Main(*cutId);
 }
 
-/* 80A94BF8-80A94C00 001F78 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialBegin_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A94C00-80A94C08 001F80 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialBegin_Main(int const& i_cutId) {
     return FALSE;
 }
 
-/* 80A94C08-80A94C9C 001F88 0094+00 1/0 0/0 0/0 .text            cutTutrialBegin_Skip__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialBegin_Skip(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1208,17 +1155,14 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialBegin_Skip(int i_staffId) {
     return _cutTutrialBegin_Skip_Main(*cutId);
 }
 
-/* 80A94C9C-80A94CA4 00201C 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A94CA4-80A94CAC 002024 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) {
     return FALSE;
 }
 
-/* 80A94CAC-80A94D40 00202C 0094+00 1/0 0/0 0/0 .text            cutTutrialClear__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialClear(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1235,7 +1179,6 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialClear(int i_staffId) {
     return _cutTutrialClear_Main(*cutId);
 }
 
-/* 80A94D40-80A94E38 0020C0 00F8+00 1/1 0/0 0/0 .text            _cutTutrialClear_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialClear_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1254,7 +1197,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialClear_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A94E38-80A94ECC 0021B8 0094+00 1/1 0/0 0/0 .text            _cutTutrialClear_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialClear_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1279,7 +1221,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialClear_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A94ECC-80A94F60 00224C 0094+00 1/0 0/0 0/0 .text            cutTalk__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTalk(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1296,12 +1237,10 @@ BOOL daNpc_Pachi_Besu_c::cutTalk(int i_staffId) {
     return _cutTalk_Main(*cutId);
 }
 
-/* 80A94F60-80A94F68 0022E0 0008+00 1/1 0/0 0/0 .text            _cutTalk_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTalk_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A94F68-80A94FC4 0022E8 005C+00 1/1 0/0 0/0 .text            _cutTalk_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTalk_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1319,7 +1258,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTalk_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A94FC4-80A95058 002344 0094+00 1/0 0/0 0/0 .text            cutTalk2__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTalk2(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1336,12 +1274,10 @@ BOOL daNpc_Pachi_Besu_c::cutTalk2(int i_staffId) {
     return _cutTalk2_Main(*cutId);
 }
 
-/* 80A95058-80A95060 0023D8 0008+00 1/1 0/0 0/0 .text            _cutTalk2_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTalk2_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A95060-80A950BC 0023E0 005C+00 1/1 0/0 0/0 .text            _cutTalk2_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTalk2_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1359,7 +1295,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTalk2_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A950BC-80A95150 00243C 0094+00 1/0 0/0 0/0 .text            cut1stHit_KakasiBody__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cut1stHit_KakasiBody(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1376,7 +1311,6 @@ BOOL daNpc_Pachi_Besu_c::cut1stHit_KakasiBody(int i_staffId) {
     return _cut1stHit_KakasiBody_Main(*cutId);
 }
 
-/* 80A95150-80A951DC 0024D0 008C+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1393,7 +1327,6 @@ BOOL daNpc_Pachi_Besu_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A951DC-80A95270 00255C 0094+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1418,7 +1351,6 @@ BOOL daNpc_Pachi_Besu_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A95270-80A95304 0025F0 0094+00 1/0 0/0 0/0 .text            cutTutrialSelectGiveUp__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialSelectGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1435,12 +1367,10 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialSelectGiveUp(int i_staffId) {
     return _cutTutrialSelectGiveUp_Main(*cutId);
 }
 
-/* 80A95304-80A9530C 002684 0008+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialSelectGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9530C-80A95408 00268C 00FC+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1463,7 +1393,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A95408-80A9549C 002788 0094+00 1/0 0/0 0/0 .text cutTutrialGiveUp__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1480,12 +1409,10 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialGiveUp(int i_staffId) {
     return _cutTutrialGiveUp_Main(*cutId);
 }
 
-/* 80A9549C-80A954A4 00281C 0008+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A954A4-80A954E0 002824 003C+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1505,7 +1432,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A954E0-80A95574 002860 0094+00 1/0 0/0 0/0 .text            cutTutrialContinue__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialContinue(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1522,12 +1448,10 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialContinue(int i_staffId) {
     return _cutTutrialContinue_Main(*cutId);
 }
 
-/* 80A95574-80A9557C 0028F4 0008+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialContinue_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9557C-80A955B8 0028FC 003C+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialContinue_Main(int const& i_cutId) {
     switch (i_cutId) {
         case 10:
@@ -1538,7 +1462,6 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialContinue_Main(int const& i_cutId) {
     return FALSE;
 }
 
-/* 80A955B8-80A9564C 002938 0094+00 1/0 0/0 0/0 .text cutTutrialCaution__18daNpc_Pachi_Besu_cFi */
 BOOL daNpc_Pachi_Besu_c::cutTutrialCaution(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");
@@ -1555,12 +1478,10 @@ BOOL daNpc_Pachi_Besu_c::cutTutrialCaution(int i_staffId) {
     return _cutTutrialCaution_Main(*cutId);
 }
 
-/* 80A9564C-80A95654 0029CC 0008+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Init__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialCaution_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A95654-80A956B8 0029D4 0064+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Main__18daNpc_Pachi_Besu_cFRCi */
 BOOL daNpc_Pachi_Besu_c::_cutTutrialCaution_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1579,34 +1500,28 @@ BOOL daNpc_Pachi_Besu_c::_cutTutrialCaution_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A956B8-80A956D8 002A38 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Besu_Create__FPv */
 static int daNpc_Pachi_Besu_Create(void* a_this) {
     return static_cast<daNpc_Pachi_Besu_c*>(a_this)->create();
 }
 
-/* 80A956D8-80A956F8 002A58 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Besu_Delete__FPv */
 static int daNpc_Pachi_Besu_Delete(void* a_this) {
     return static_cast<daNpc_Pachi_Besu_c*>(a_this)->Delete();
 }
 
-/* 80A956F8-80A95718 002A78 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Besu_Execute__FPv */
 static int daNpc_Pachi_Besu_Execute(void* a_this) {
     return static_cast<daNpc_Pachi_Besu_c*>(a_this)->Execute();
 }
 
-/* 80A95718-80A95738 002A98 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Besu_Draw__FPv */
 static int daNpc_Pachi_Besu_Draw(void* a_this) {
     return static_cast<daNpc_Pachi_Besu_c*>(a_this)->Draw();
 }
 
-/* 80A95738-80A95740 002AB8 0008+00 1/0 0/0 0/0 .text            daNpc_Pachi_Besu_IsDelete__FPv */
 static int daNpc_Pachi_Besu_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80A97900-80A97920 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Pachi_Besu_MethodTable */
 static actor_method_class daNpc_Pachi_Besu_MethodTable = {
     (process_method_func)daNpc_Pachi_Besu_Create,
     (process_method_func)daNpc_Pachi_Besu_Delete,
@@ -1615,7 +1530,6 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = {
     (process_method_func)daNpc_Pachi_Besu_Draw,
 };
 
-/* 80A97920-80A97950 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PACHI_BESU */
 extern actor_process_profile_definition g_profile_NPC_PACHI_BESU = {
   fpcLy_CURRENT_e,               // mLayerID
   7,                             // mListID
diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp
index 435103f5d4..f12acc8ed2 100644
--- a/src/d/actor/d_a_npc_pachi_maro.cpp
+++ b/src/d/actor/d_a_npc_pachi_maro.cpp
@@ -363,19 +363,16 @@ void daNpc_Pachi_Maro_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80A9BA98-80A9BAA8 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {11, 1},
     {5, 2},
 };
 
-/* 80A9BAA8-80A9BAB8 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"TUTRIAL_TALK", 10},
 };
 
-/* 80A9BAB8-80A9BAE4 -00001 002C+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[11] = {
     "",
     "Maro",
@@ -390,33 +387,27 @@ static char* l_resNameList[11] = {
     "evt_pachi",
 };
 
-/* 80A9BAE4-80A9BAE8 00006C 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     MARO, MARO1, -1,
 };
 
-/* 80A9BAE8-80A9BAEC 000070 0003+01 0/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     MARO, MARO_TW, -1,
 };
 
-/* 80A9BAEC-80A9BAF4 000074 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[6] = {
     MARO, MARO1, MARO2, MARO3, EVT_PACHI, -1,
 };
 
-/* 80A9BAF4-80A9BAFC 00007C 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[5] = {
     MARO, MARO_TW, MARO1, MARO2, -1,
 };
 
-/* 80A9BAFC-80A9BB04 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn2,
     l_loadResPtrn3,
 };
 
-/* 80A9BB04-80A9BC1C 00008C 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_MARO, J3DFrameCtrl::EMode_LOOP, MARO, 1},
     {BCK_MARO_F_TALK_A, J3DFrameCtrl::EMode_NONE, MARO, BTP_MARO_F_TALK_A, J3DFrameCtrl::EMode_NONE, MARO, 0},
@@ -430,7 +421,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {BCK_MARO_FH_BESUTALK, J3DFrameCtrl::EMode_LOOP, MARO3, BTP_MARO_FH_BESUTALK, J3DFrameCtrl::EMode_LOOP, MARO3, 0},
 };
 
-/* 80A9BC1C-80A9BD34 0001A4 0118+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {BCK_MARO_WAIT_A, J3DFrameCtrl::EMode_LOOP, MARO, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0},
     {BCK_MARO_CROUCH, J3DFrameCtrl::EMode_LOOP, MARO2, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0},
@@ -444,7 +434,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {BCK_MARO_RUN, J3DFrameCtrl::EMode_LOOP, MARO1, BTK_MARO, J3DFrameCtrl::EMode_NONE, MARO, 1, 0},
 };
 
-/* 80A9BD34-80A9BDD4 0002BC 00A0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {
     {FACE_MOT_ANM_TALK_A, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {FACE_MOT_ANM_SURPRISE, -1, 1}, {FACE_MOT_ANM_H_SURPRISE, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -458,7 +447,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] =
     {FACE_MOT_ANM_NONE, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A9BDD4-80A9BE64 00035C 0090+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {MOT_ANM_TALK_A, -1, 1}, {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -471,7 +459,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {MOT_ANM_RUN, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80A9BE64-80A9BE90 -00001 002C+00 1/1 0/0 0/0 .data            mCutNameList__18daNpc_Pachi_Maro_c */
 char* daNpc_Pachi_Maro_c::mCutNameList[11] = {
     "",
     "TUTRIAL_BEGIN",
@@ -486,7 +473,6 @@ char* daNpc_Pachi_Maro_c::mCutNameList[11] = {
     "TUTRIAL_CAUTION",
 };
 
-/* 80A9BF08-80A9BF8C 000490 0084+00 1/2 0/0 0/0 .data            mCutList__18daNpc_Pachi_Maro_c */
 daNpc_Pachi_Maro_c::cutFunc daNpc_Pachi_Maro_c::mCutList[11] = {
     NULL,
     &daNpc_Pachi_Maro_c::cutTutrialBegin,
@@ -501,10 +487,8 @@ daNpc_Pachi_Maro_c::cutFunc daNpc_Pachi_Maro_c::mCutList[11] = {
     &daNpc_Pachi_Maro_c::cutTutrialCaution,
 };
 
-/* 80A9C18C-80A9C190 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_PACHI_MARO_HIO_CLASS l_HIO;
 
-/* 80A97C8C-80A97DC4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__18daNpc_Pachi_Maro_cFv */
 daNpc_Pachi_Maro_c::~daNpc_Pachi_Maro_c() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Maro_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -521,7 +505,6 @@ daNpc_Pachi_Maro_c::~daNpc_Pachi_Maro_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80A9B88C-80A9B91C 000000 0090+00 8/8 0/0 0/0 .rodata          m__24daNpc_Pachi_Maro_Param_c */
 daNpc_Pachi_Maro_HIOParam const daNpc_Pachi_Maro_Param_c::m = {
     100.0f,
     -3.0f,
@@ -567,7 +550,6 @@ daNpc_Pachi_Maro_HIOParam const daNpc_Pachi_Maro_Param_c::m = {
     0,
 };
 
-/* 80A97DC4-80A9809C 000224 02D8+00 1/1 0/0 0/0 .text            create__18daNpc_Pachi_Maro_cFv */
 cPhs__Step daNpc_Pachi_Maro_c::create() {
     daNpcT_ct(this, daNpc_Pachi_Maro_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -630,7 +612,6 @@ cPhs__Step daNpc_Pachi_Maro_c::create() {
     return phase;
 }
 
-/* 80A9809C-80A98320 0004FC 0284+00 1/1 0/0 0/0 .text            CreateHeap__18daNpc_Pachi_Maro_cFv */
 int daNpc_Pachi_Maro_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     J3DModel* model = NULL;
@@ -668,7 +649,6 @@ int daNpc_Pachi_Maro_c::CreateHeap() {
     return 0;
 }
 
-/* 80A984DC-80A98510 00093C 0034+00 1/1 0/0 0/0 .text            Delete__18daNpc_Pachi_Maro_cFv */
 int daNpc_Pachi_Maro_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Maro_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -676,12 +656,10 @@ int daNpc_Pachi_Maro_c::Delete() {
     return 1;
 }
 
-/* 80A98510-80A98530 000970 0020+00 2/2 0/0 0/0 .text            Execute__18daNpc_Pachi_Maro_cFv */
 int daNpc_Pachi_Maro_c::Execute() {
     return execute();
 }
 
-/* 80A98530-80A985C4 000990 0094+00 1/1 0/0 0/0 .text            Draw__18daNpc_Pachi_Maro_cFv */
 int daNpc_Pachi_Maro_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -699,13 +677,11 @@ int daNpc_Pachi_Maro_c::Draw() {
     );
 }
 
-/* 80A985C4-80A985E4 000A24 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__18daNpc_Pachi_Maro_cFP10fopAc_ac_c */
 int daNpc_Pachi_Maro_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Pachi_Maro_c* actor = (daNpc_Pachi_Maro_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80A985E4-80A9863C 000A44 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__18daNpc_Pachi_Maro_cFP8J3DJointi */
 int daNpc_Pachi_Maro_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -718,7 +694,6 @@ int daNpc_Pachi_Maro_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A9863C-80A9865C 000A9C 0020+00 1/1 0/0 0/0 .text            getType__18daNpc_Pachi_Maro_cFv */
 u8 daNpc_Pachi_Maro_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
 
@@ -731,7 +706,6 @@ u8 daNpc_Pachi_Maro_c::getType() {
     }
 }
 
-/* 80A9865C-80A9867C 000ABC 0020+00 1/1 0/0 0/0 .text            isDelete__18daNpc_Pachi_Maro_cFv */
 BOOL daNpc_Pachi_Maro_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -742,7 +716,6 @@ BOOL daNpc_Pachi_Maro_c::isDelete() {
     }
 }
 
-/* 80A9867C-80A987F4 000ADC 0178+00 1/1 0/0 0/0 .text            reset__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::reset() {
     int size = (u8*)&field_0xfc8 - (u8*)&mNextAction;
 
@@ -769,7 +742,6 @@ void daNpc_Pachi_Maro_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A987F4-80A98870 000C54 007C+00 1/0 0/0 0/0 .text            afterJntAnm__18daNpc_Pachi_Maro_cFi */
 void daNpc_Pachi_Maro_c::afterJntAnm(int i_joint) {
     if (i_joint == JNT_BACKBONE1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleX(1));
@@ -780,7 +752,6 @@ void daNpc_Pachi_Maro_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 80A98870-80A9896C 000CD0 00FC+00 1/0 0/0 0/0 .text            setParam__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::setParam() {
     selectAction();
     srchActors();
@@ -807,7 +778,6 @@ void daNpc_Pachi_Maro_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A9896C-80A98974 000DCC 0008+00 1/0 0/0 0/0 .text checkChangeEvt__18daNpc_Pachi_Maro_cFv */
 BOOL daNpc_Pachi_Maro_c::checkChangeEvt() {
     #if DEBUG
     BOOL rv = FALSE;
@@ -820,7 +790,6 @@ BOOL daNpc_Pachi_Maro_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A98974-80A98A10 000DD4 009C+00 1/0 0/0 0/0 .text            setAfterTalkMotion__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::setAfterTalkMotion() {
     int idx = FACE_MOT_NONE;
 
@@ -840,7 +809,6 @@ void daNpc_Pachi_Maro_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80A98A10-80A98A98 000E70 0088+00 1/1 0/0 0/0 .text            srchActors__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -855,7 +823,6 @@ void daNpc_Pachi_Maro_c::srchActors() {
     }
 }
 
-/* 80A98A98-80A98B9C 000EF8 0104+00 1/0 0/0 0/0 .text            evtTalk__18daNpc_Pachi_Maro_cFv */
 BOOL daNpc_Pachi_Maro_c::evtTalk() {
     if (chkAction(&daNpc_Pachi_Maro_c::talk)) {
         (this->*mAction)(NULL);
@@ -877,7 +844,6 @@ BOOL daNpc_Pachi_Maro_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A98B9C-80A98C64 000FFC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__18daNpc_Pachi_Maro_cFv */
 BOOL daNpc_Pachi_Maro_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("PA_Maro", this, -1);
 
@@ -894,7 +860,6 @@ BOOL daNpc_Pachi_Maro_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80A98C64-80A98DE8 0010C4 0184+00 1/0 0/0 0/0 .text            action__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::action() {
     fopAc_ac_c* actor_p = NULL;
 
@@ -923,14 +888,12 @@ void daNpc_Pachi_Maro_c::action() {
     }
 }
 
-/* 80A98DE8-80A98E60 001248 0078+00 1/0 0/0 0/0 .text            beforeMove__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A98E60-80A98FB4 0012C0 0154+00 1/0 0/0 0/0 .text            afterMoved__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::afterMoved() {
     fopAc_ac_c* besu_p = mActorMngrs[1].getActorP();
     fopAc_ac_c* taro_p = mActorMngrs[0].getActorP();
@@ -953,7 +916,6 @@ void daNpc_Pachi_Maro_c::afterMoved() {
     }
 }
 
-/* 80A98FB4-80A9928C 001414 02D8+00 1/0 0/0 0/0 .text            setAttnPos__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::setAttnPos() {
     cXyz sp38(0.0f, 0.0f, -30.0f);
     
@@ -984,7 +946,6 @@ void daNpc_Pachi_Maro_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80A9928C-80A99394 0016EC 0108+00 1/0 0/0 0/0 .text setCollision__18daNpc_Pachi_Maro_cFv */
 void daNpc_Pachi_Maro_c::setCollision() {
     if (!mHide) {
         u32 coSPrm = 0x79;
@@ -1016,7 +977,6 @@ void daNpc_Pachi_Maro_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A99394-80A9939C 0017F4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__18daNpc_Pachi_Maro_cFv */
 int daNpc_Pachi_Maro_c::drawDbgInfo() {
     #if DEBUG
     if (mpHIO->m.common.debug_info_ON) {
@@ -1032,7 +992,6 @@ int daNpc_Pachi_Maro_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A9939C-80A99428 0017FC 008C+00 1/0 0/0 0/0 .text            getFaceMotionAnm__18daNpc_Pachi_Maro_cF26daNpcT_faceMotionAnmData_c */
 daNpcT_faceMotionAnmData_c daNpc_Pachi_Maro_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_1) {
     daNpcT_faceMotionAnmData_c rv = param_1;
     if (mTwilight != 0 && rv.mBtpFileIdx == 17) {
@@ -1042,7 +1001,6 @@ daNpcT_faceMotionAnmData_c daNpc_Pachi_Maro_c::getFaceMotionAnm(daNpcT_faceMotio
     return rv;
 }
 
-/* 80A99428-80A994B4 001888 008C+00 1/0 0/0 0/0 .text            getMotionAnm__18daNpc_Pachi_Maro_cF22daNpcT_motionAnmData_c */
 daNpcT_motionAnmData_c daNpc_Pachi_Maro_c::getMotionAnm(daNpcT_motionAnmData_c param_1) {
     daNpcT_motionAnmData_c rv = param_1;
     if (mTwilight && rv.mBtkFileIdx == 14) {
@@ -1052,7 +1010,6 @@ daNpcT_motionAnmData_c daNpc_Pachi_Maro_c::getMotionAnm(daNpcT_motionAnmData_c p
     return rv;
 }
 
-/* 80A994B4-80A99530 001914 007C+00 1/1 0/0 0/0 .text            selectAction__18daNpc_Pachi_Maro_cFv */
 BOOL daNpc_Pachi_Maro_c::selectAction() {
     mNextAction = NULL;
 
@@ -1076,12 +1033,10 @@ BOOL daNpc_Pachi_Maro_c::selectAction() {
     return TRUE;
 }
 
-/* 80A99530-80A9955C 001990 002C+00 1/1 0/0 0/0 .text            chkAction__18daNpc_Pachi_Maro_cFM18daNpc_Pachi_Maro_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Maro_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80A9955C-80A99604 0019BC 00A8+00 2/2 0/0 0/0 .text            setAction__18daNpc_Pachi_Maro_cFM18daNpc_Pachi_Maro_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Maro_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1099,7 +1054,6 @@ BOOL daNpc_Pachi_Maro_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A99604-80A9986C 001A64 0268+00 2/0 0/0 0/0 .text            wait__18daNpc_Pachi_Maro_cFPv */
 int daNpc_Pachi_Maro_c::wait(void* param_1) {
     int unused = 0;
     
@@ -1162,7 +1116,6 @@ int daNpc_Pachi_Maro_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80A9986C-80A998FC 001CCC 0090+00 2/0 0/0 0/0 .text            talk__18daNpc_Pachi_Maro_cFPv */
 int daNpc_Pachi_Maro_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1211,14 +1164,12 @@ int daNpc_Pachi_Maro_c::test(void* param_1) {
     return 1;
 }
 
-/* 80A998FC-80A99948 001D5C 004C+00 3/3 0/0 0/0 .text _turn_to_link__18daNpc_Pachi_Maro_cFs */
 BOOL daNpc_Pachi_Maro_c::_turn_to_link(s16 i_step) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz pos(*fopAcM_GetPosition_p(player));
     return _turn_pos(pos, i_step);
 }
 
-/* 80A99948-80A999A4 001DA8 005C+00 4/4 0/0 0/0 .text _turn_pos__18daNpc_Pachi_Maro_cFRC4cXyzs */
 BOOL daNpc_Pachi_Maro_c::_turn_pos(cXyz const& i_pos, s16 i_step) {
     s16 target = cLib_targetAngleY(&current.pos, &i_pos);
     BOOL rv = cLib_chaseAngleS(&mCurAngle.y, target, i_step);
@@ -1227,7 +1178,6 @@ BOOL daNpc_Pachi_Maro_c::_turn_pos(cXyz const& i_pos, s16 i_step) {
     return rv;
 }
 
-/* 80A999A4-80A999E4 001E04 0040+00 1/1 0/0 0/0 .text _turn_pos__18daNpc_Pachi_Maro_cFRC4cXyz */
 BOOL daNpc_Pachi_Maro_c::_turn_pos(cXyz const& i_pos) {
     s16 angleY = cLib_targetAngleY(&current.pos, &i_pos);
     mCurAngle.y = angleY;
@@ -1237,7 +1187,6 @@ BOOL daNpc_Pachi_Maro_c::_turn_pos(cXyz const& i_pos) {
     return TRUE;
 }
 
-/* 80A999E4-80A99A78 001E44 0094+00 1/0 0/0 0/0 .text cutTutrialBegin__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialBegin(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1254,7 +1203,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialBegin(int i_staffId) {
     return _cutTutrialBegin_Main(*cutId);
 }
 
-/* 80A99A78-80A99A80 001ED8 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Init(int const& i_cutId) {
     switch (i_cutId) {
         default:
@@ -1262,7 +1210,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Init(int const& i_cutId) {
     }
 }
 
-/* 80A99A80-80A99A88 001EE0 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1272,7 +1219,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Main(int const& i_cutId) {
     }
 }
 
-/* 80A99A88-80A99B1C 001EE8 0094+00 1/0 0/0 0/0 .text            cutTutrialBegin_Skip__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialBegin_Skip(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1289,7 +1235,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialBegin_Skip(int i_staffId) {
     return _cutTutrialBegin_Skip_Main(*cutId);
 }
 
-/* 80A99B1C-80A99B24 001F7C 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) {
     switch (i_cutId) {
         default:
@@ -1297,7 +1242,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) {
     }
 }
 
-/* 80A99B24-80A99B2C 001F84 0008+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1307,7 +1251,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) {
     }
 }
 
-/* 80A99B2C-80A99BC0 001F8C 0094+00 1/0 0/0 0/0 .text cutTutrialClear__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialClear(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1324,7 +1267,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialClear(int i_staffId) {
     return _cutTutrialClear_Main(*cutId);
 }
 
-/* 80A99BC0-80A99CB8 002020 00F8+00 1/1 0/0 0/0 .text            _cutTutrialClear_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialClear_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1343,7 +1285,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialClear_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A99CB8-80A99D4C 002118 0094+00 1/1 0/0 0/0 .text            _cutTutrialClear_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialClear_Main(int const& i_cutId) {
     BOOL rv = FALSE;
     
@@ -1367,7 +1308,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialClear_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A99D4C-80A99DE0 0021AC 0094+00 1/0 0/0 0/0 .text            cutTalk__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTalk(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1384,7 +1324,6 @@ BOOL daNpc_Pachi_Maro_c::cutTalk(int i_staffId) {
     return _cutTalk_Main(*cutId);
 }
 
-/* 80A99DE0-80A99DE8 002240 0008+00 1/1 0/0 0/0 .text            _cutTalk_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTalk_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1397,7 +1336,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTalk_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A99DE8-80A99E44 002248 005C+00 1/1 0/0 0/0 .text            _cutTalk_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTalk_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1415,7 +1353,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTalk_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A99E44-80A99ED8 0022A4 0094+00 1/0 0/0 0/0 .text            cutTalk2__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTalk2(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1432,7 +1369,6 @@ BOOL daNpc_Pachi_Maro_c::cutTalk2(int i_staffId) {
     return _cutTalk2_Main(*cutId);
 }
 
-/* 80A99ED8-80A99EE0 002338 0008+00 1/1 0/0 0/0 .text            _cutTalk2_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTalk2_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1445,7 +1381,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTalk2_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A99EE0-80A99F3C 002340 005C+00 1/1 0/0 0/0 .text            _cutTalk2_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTalk2_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1463,7 +1398,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTalk2_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A99F3C-80A99FD0 00239C 0094+00 1/0 0/0 0/0 .text            cut1stHit_KakasiBody__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cut1stHit_KakasiBody(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1480,7 +1414,6 @@ BOOL daNpc_Pachi_Maro_c::cut1stHit_KakasiBody(int i_staffId) {
     return _cut1stHit_KakasiBody_Main(*cutId);
 }
 
-/* 80A99FD0-80A9A05C 002430 008C+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1497,7 +1430,6 @@ BOOL daNpc_Pachi_Maro_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9A05C-80A9A0F0 0024BC 0094+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     BOOL rv = FALSE;
     
@@ -1521,7 +1453,6 @@ BOOL daNpc_Pachi_Maro_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9A0F0-80A9A184 002550 0094+00 1/0 0/0 0/0 .text            cutTutrialSelectGiveUp__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialSelectGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1538,7 +1469,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialSelectGiveUp(int i_staffId) {
     return _cutTutrialSelectGiveUp_Main(*cutId);
 }
 
-/* 80A9A184-80A9A18C 0025E4 0008+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialSelectGiveUp_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 10:
@@ -1552,7 +1482,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialSelectGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9A18C-80A9A288 0025EC 00FC+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1575,7 +1504,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9A288-80A9A31C 0026E8 0094+00 1/0 0/0 0/0 .text            cutTutrialGiveUp__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1592,7 +1520,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialGiveUp(int i_staffId) {
     return _cutTutrialGiveUp_Main(*cutId);
 }
 
-/* 80A9A31C-80A9A324 00277C 0008+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialGiveUp_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1608,7 +1535,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9A324-80A9A360 002784 003C+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1628,7 +1554,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9A360-80A9A3F4 0027C0 0094+00 1/0 0/0 0/0 .text            cutTutrialContinue__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialContinue(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1645,7 +1570,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialContinue(int i_staffId) {
     return _cutTutrialContinue_Main(*cutId);
 }
 
-/* 80A9A3F4-80A9A3FC 002854 0008+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Init(int const& i_cutId) {
     switch (i_cutId) {
         default:
@@ -1653,7 +1577,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Init(int const& i_cutId) {
     }
 }
 
-/* 80A9A3FC-80A9A438 00285C 003C+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1666,7 +1589,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialContinue_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9A438-80A9A4CC 002898 0094+00 1/0 0/0 0/0 .text            cutTutrialCaution__18daNpc_Pachi_Maro_cFi */
 BOOL daNpc_Pachi_Maro_c::cutTutrialCaution(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1683,7 +1605,6 @@ BOOL daNpc_Pachi_Maro_c::cutTutrialCaution(int i_staffId) {
     return _cutTutrialCaution_Main(*cutId);
 }
 
-/* 80A9A4CC-80A9A4D4 00292C 0008+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Init__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialCaution_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -1696,7 +1617,6 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialCaution_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9A4D4-80A9A538 002934 0064+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Main__18daNpc_Pachi_Maro_cFRCi */
 BOOL daNpc_Pachi_Maro_c::_cutTutrialCaution_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1715,32 +1635,26 @@ BOOL daNpc_Pachi_Maro_c::_cutTutrialCaution_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9A538-80A9A558 002998 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Maro_Create__FPv */
 static int daNpc_Pachi_Maro_Create(void* i_this) {
     return static_cast<daNpc_Pachi_Maro_c*>(i_this)->create();
 }
 
-/* 80A9A558-80A9A578 0029B8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Maro_Delete__FPv */
 static int daNpc_Pachi_Maro_Delete(void* i_this) {
     return static_cast<daNpc_Pachi_Maro_c*>(i_this)->Delete();
 }
 
-/* 80A9A578-80A9A598 0029D8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Maro_Execute__FPv */
 static int daNpc_Pachi_Maro_Execute(void* i_this) {
     return static_cast<daNpc_Pachi_Maro_c*>(i_this)->Execute();
 }
 
-/* 80A9A598-80A9A5B8 0029F8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Maro_Draw__FPv */
 static int daNpc_Pachi_Maro_Draw(void* i_this) {
     return static_cast<daNpc_Pachi_Maro_c*>(i_this)->Draw();
 }
 
-/* 80A9A5B8-80A9A5C0 002A18 0008+00 1/0 0/0 0/0 .text            daNpc_Pachi_Maro_IsDelete__FPv */
 static int daNpc_Pachi_Maro_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80A9BFBC-80A9BFDC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Pachi_Maro_MethodTable */
 static actor_method_class daNpc_Pachi_Maro_MethodTable = {
     (process_method_func)daNpc_Pachi_Maro_Create,
     (process_method_func)daNpc_Pachi_Maro_Delete,
@@ -1749,7 +1663,6 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = {
     (process_method_func)daNpc_Pachi_Maro_Draw,
 };
 
-/* 80A9BFDC-80A9C00C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PACHI_MARO */
 extern actor_process_profile_definition g_profile_NPC_PACHI_MARO = {
   fpcLy_CURRENT_e,               // mLayerID
   7,                             // mListID
diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp
index 22baee7467..3e5d7c2a16 100644
--- a/src/d/actor/d_a_npc_pachi_taro.cpp
+++ b/src/d/actor/d_a_npc_pachi_taro.cpp
@@ -481,7 +481,6 @@ void daNpc_Pachi_Taro_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80AA194C-80AA1974 000020 0028+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[5][2] = {
     {BMDR_TARO, TARO},
     {BMDR_TARO_STICK_A, TARO1},
@@ -490,7 +489,6 @@ static int l_bmdData[5][2] = {
     {BMDR_GM_TARO, TAROB},
 };
 
-/* 80AA1974-80AA19CC -00001 0058+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[11] = {
     {"", NONE},
     {"TUTRIAL_BEGIN", EVT_PACHI},
@@ -505,7 +503,6 @@ static daNpcT_evtData_c l_evtList[11] = {
     {"TUTRIAL_CAUTION", EVT_PACHI},
 };
 
-/* 80AA19CC-80AA19FC -00001 0030+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[12] = {
     "",
     "Taro",
@@ -521,23 +518,19 @@ static char* l_resNameList[12] = {
     "evt_pachi",
 };
 
-/* 80AA19FC-80AA1A04 0000D0 0007+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[7] = {
     TARO, TARO0, TARO1, TARO2, TARO3, EVT_PACHI, -1,
 };
 
-/* 80AA1A04-80AA1A0C 0000D8 0008+00 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[8] = {
     TARO, TARO_TW, TARO0, TARO1, TARO2, TARO3, TARO4, -1,
 };
 
-/* 80AA1A0C-80AA1A14 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn4,
 };
 
-/* 80AA1A14-80AA1D5C 0000E8 0348+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_TARO_F_NORMAL, J3DFrameCtrl::EMode_LOOP, TARO, 1},
     {BCK_TARO_F_NORMAL, J3DFrameCtrl::EMode_NONE, TARO0,BTP_TARO_F_NORMAL, J3DFrameCtrl::EMode_LOOP, TARO, 1},
@@ -571,7 +564,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {BCK_TARO_F_CRY, J3DFrameCtrl::EMode_LOOP, TARO5, BTP_TARO_F_CRY, J3DFrameCtrl::EMode_LOOP, TARO5, 0},
 };
 
-/* 80AA1D5C-80AA21D8 000430 047C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[41] = {
     {BCK_TARO_WAIT_A, J3DFrameCtrl::EMode_LOOP, TARO0,BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0},
     {BCK_TARO_WAIT_B, J3DFrameCtrl::EMode_LOOP, TARO1, BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0},
@@ -616,7 +608,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[41] = {
     {BCK_TAROB_SAVED, J3DFrameCtrl::EMode_NONE, TARO5, BTK_TARO, J3DFrameCtrl::EMode_NONE, TARO0, 1, 0},
 };
 
-/* 80AA21D8-80AA23D8 0008AC 0200+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = {
     {FACE_MOT_ANM_NORMAL, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {FACE_MOT_ANM_SAD, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -652,7 +643,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128]
     {FACE_MOT_ANM_NONE, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AA23D8-80AA2668 000AAC 0290+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[164] = {
     {MOT_ANM_WAIT_A, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {MOT_ANM_CALL, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -697,7 +687,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[164] = {
     {MOT_ANM_SAVED, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AA2668-80AA2694 -00001 002C+00 1/1 0/0 0/0 .data            mCutNameList__18daNpc_Pachi_Taro_c */
 char* daNpc_Pachi_Taro_c::mCutNameList[11] = {
     "",
     "TUTRIAL_BEGIN",
@@ -712,7 +701,6 @@ char* daNpc_Pachi_Taro_c::mCutNameList[11] = {
     "TUTRIAL_CAUTION",
 };
 
-/* 80AA270C-80AA2790 000DE0 0084+00 1/2 0/0 0/0 .data            mCutList__18daNpc_Pachi_Taro_c */
 daNpc_Pachi_Taro_c::cutFunc daNpc_Pachi_Taro_c::mCutList[11] = {
     NULL,
     &daNpc_Pachi_Taro_c::cutTutrialBegin,
@@ -727,10 +715,8 @@ daNpc_Pachi_Taro_c::cutFunc daNpc_Pachi_Taro_c::mCutList[11] = {
     &daNpc_Pachi_Taro_c::cutTutrialCaution,
 };
 
-/* 80AA2B94-80AA2B98 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_PACHI_TARO_HIO_CLASS l_HIO;
 
-/* 80A9C28C-80A9C3C4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__18daNpc_Pachi_Taro_cFv */
 daNpc_Pachi_Taro_c::~daNpc_Pachi_Taro_c() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Taro_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -747,7 +733,6 @@ daNpc_Pachi_Taro_c::~daNpc_Pachi_Taro_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AA1604-80AA1690 000000 008C+00 11/11 0/0 0/0 .rodata          m__24daNpc_Pachi_Taro_Param_c */
 daNpc_Pachi_Taro_HIOParam const daNpc_Pachi_Taro_Param_c::m = {
     140.0f,
     -3.0f,
@@ -792,7 +777,6 @@ daNpc_Pachi_Taro_HIOParam const daNpc_Pachi_Taro_Param_c::m = {
     55.0f,
 };
 
-/* 80A9C3C4-80A9C69C 000224 02D8+00 1/1 0/0 0/0 .text            create__18daNpc_Pachi_Taro_cFv */
 cPhs__Step daNpc_Pachi_Taro_c::create() {
     daNpcT_ct(this, daNpc_Pachi_Taro_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -854,7 +838,6 @@ cPhs__Step daNpc_Pachi_Taro_c::create() {
     return phase;
 }
 
-/* 80A9C69C-80A9CA1C 0004FC 0380+00 1/1 0/0 0/0 .text            CreateHeap__18daNpc_Pachi_Taro_cFv */
 int daNpc_Pachi_Taro_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     J3DModel* model = NULL;
@@ -916,7 +899,6 @@ int daNpc_Pachi_Taro_c::CreateHeap() {
     return 0;
 }
 
-/* 80A9CBD8-80A9CC0C 000A38 0034+00 1/1 0/0 0/0 .text            Delete__18daNpc_Pachi_Taro_cFv */
 int daNpc_Pachi_Taro_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Pachi_Taro_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -924,12 +906,10 @@ int daNpc_Pachi_Taro_c::Delete() {
     return 1;
 }
 
-/* 80A9CC0C-80A9CC2C 000A6C 0020+00 2/2 0/0 0/0 .text            Execute__18daNpc_Pachi_Taro_cFv */
 int daNpc_Pachi_Taro_c::Execute() {
     return execute();
 }
 
-/* 80A9CC2C-80A9CCC0 000A8C 0094+00 1/1 0/0 0/0 .text            Draw__18daNpc_Pachi_Taro_cFv */
 int daNpc_Pachi_Taro_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -947,13 +927,11 @@ int daNpc_Pachi_Taro_c::Draw() {
     );
 }
 
-/* 80A9CCC0-80A9CCE0 000B20 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__18daNpc_Pachi_Taro_cFP10fopAc_ac_c */
 int daNpc_Pachi_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Pachi_Taro_c* actor = (daNpc_Pachi_Taro_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80A9CCE0-80A9CD38 000B40 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__18daNpc_Pachi_Taro_cFP8J3DJointi */
 int daNpc_Pachi_Taro_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -966,7 +944,6 @@ int daNpc_Pachi_Taro_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80A9CD38-80A9CD40 000B98 0008+00 1/1 0/0 0/0 .text            getType__18daNpc_Pachi_Taro_cFv */
 u8 daNpc_Pachi_Taro_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     param = 0;
@@ -980,7 +957,6 @@ u8 daNpc_Pachi_Taro_c::getType() {
     }
 }
 
-/* 80A9CD40-80A9CD60 000BA0 0020+00 1/1 0/0 0/0 .text            isDelete__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -991,7 +967,6 @@ BOOL daNpc_Pachi_Taro_c::isDelete() {
     }
 }
 
-/* 80A9CD60-80A9CF10 000BC0 01B0+00 1/1 0/0 0/0 .text            reset__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::reset() {
     int size = (u8*)&field_0x1008 - (u8*)&mNextAction;
 
@@ -1025,7 +1000,6 @@ void daNpc_Pachi_Taro_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80A9CF10-80A9CF9C 000D70 008C+00 1/0 0/0 0/0 .text            afterJntAnm__18daNpc_Pachi_Taro_cFi */
 void daNpc_Pachi_Taro_c::afterJntAnm(int i_joint) {
     if (i_joint == JNT_BACKBONE1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -1036,7 +1010,6 @@ void daNpc_Pachi_Taro_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 80A9CF9C-80A9D098 000DFC 00FC+00 1/0 0/0 0/0 .text            setParam__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::setParam() {
     selectAction();
     srchActors();
@@ -1063,7 +1036,6 @@ void daNpc_Pachi_Taro_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80A9D098-80A9D0A0 000EF8 0008+00 1/0 0/0 0/0 .text            checkChangeEvt__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::checkChangeEvt() {
     switch (mType) {
         default:
@@ -1073,7 +1045,6 @@ BOOL daNpc_Pachi_Taro_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80A9D0A0-80A9D164 000F00 00C4+00 2/0 0/0 0/0 .text            setAfterTalkMotion__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::setAfterTalkMotion() {
     int idx = FACE_MOT_NONE;
 
@@ -1114,7 +1085,6 @@ void daNpc_Pachi_Taro_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80A9D164-80A9D27C 000FC4 0118+00 1/1 0/0 0/0 .text            srchActors__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -1145,12 +1115,10 @@ void daNpc_Pachi_Taro_c::srchActors() {
     }
 }
 
-/* 80A9D27C-80A9D2A8 0010DC 002C+00 1/1 0/0 0/0 .text            srchDistTag1__18daNpc_Pachi_Taro_cFv */
 fopAc_ac_c* daNpc_Pachi_Taro_c::srchDistTag1() {
     return (fopAc_ac_c*)fpcM_Search(_srch_DistTag1_main, this);
 }
 
-/* 80A9D2A8-80A9D310 001108 0068+00 1/1 0/0 0/0 .text            _srch_DistTag1_main__18daNpc_Pachi_Taro_cFPvPv */
 void* daNpc_Pachi_Taro_c::_srch_DistTag1_main(void* i_actor, void* i_data) {
     daTagPati_c* actor = (daTagPati_c*)i_actor;
     
@@ -1169,12 +1137,10 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag1_main(void* i_actor, void* i_data) {
     return actor;
 }
 
-/* 80A9D310-80A9D33C 001170 002C+00 1/1 0/0 0/0 .text            srchDistTag2__18daNpc_Pachi_Taro_cFv */
 fopAc_ac_c* daNpc_Pachi_Taro_c::srchDistTag2() {
     return (fopAc_ac_c*)fpcM_Search(_srch_DistTag2_main, this);
 }
 
-/* 80A9D33C-80A9D3A4 00119C 0068+00 1/1 0/0 0/0 .text            _srch_DistTag2_main__18daNpc_Pachi_Taro_cFPvPv */
 void* daNpc_Pachi_Taro_c::_srch_DistTag2_main(void* i_actor, void* i_data) {
     daTagPati_c* actor = (daTagPati_c*)i_actor;
     
@@ -1193,12 +1159,10 @@ void* daNpc_Pachi_Taro_c::_srch_DistTag2_main(void* i_actor, void* i_data) {
     return actor;
 }
 
-/* 80A9D3A4-80A9D3D0 001204 002C+00 1/1 0/0 0/0 .text            srchEscapeTag1__18daNpc_Pachi_Taro_cFv */
 fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag1() {
     return (fopAc_ac_c*)fpcM_Search(_srch_EscapeTag1_main, this);
 }
 
-/* 80A9D3D0-80A9D438 001230 0068+00 1/1 0/0 0/0 .text            _srch_EscapeTag1_main__18daNpc_Pachi_Taro_cFPvPv */
 void* daNpc_Pachi_Taro_c::_srch_EscapeTag1_main(void* i_actor, void* i_data) {
     daTagPati_c* actor = (daTagPati_c*)i_actor;
     
@@ -1217,12 +1181,10 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag1_main(void* i_actor, void* i_data) {
     return actor;
 }
 
-/* 80A9D438-80A9D464 001298 002C+00 1/1 0/0 0/0 .text            srchEscapeTag2__18daNpc_Pachi_Taro_cFv */
 fopAc_ac_c* daNpc_Pachi_Taro_c::srchEscapeTag2() {
     return (fopAc_ac_c*)fpcM_Search(_srch_EscapeTag2_main, this);
 }
 
-/* 80A9D464-80A9D4CC 0012C4 0068+00 1/1 0/0 0/0 .text            _srch_EscapeTag2_main__18daNpc_Pachi_Taro_cFPvPv */
 void* daNpc_Pachi_Taro_c::_srch_EscapeTag2_main(void* i_actor, void* i_data) {
     daTagPati_c* actor = (daTagPati_c*)i_actor;
     
@@ -1241,7 +1203,6 @@ void* daNpc_Pachi_Taro_c::_srch_EscapeTag2_main(void* i_actor, void* i_data) {
     return actor;
 }
 
-/* 80A9D4CC-80A9D5D0 00132C 0104+00 1/0 0/0 0/0 .text            evtTalk__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::evtTalk() {
     if (chkAction(&daNpc_Pachi_Taro_c::talk)) {
         (this->*mAction)(NULL);
@@ -1263,7 +1224,6 @@ BOOL daNpc_Pachi_Taro_c::evtTalk() {
     return TRUE;
 }
 
-/* 80A9D5D0-80A9D698 001430 00C8+00 1/0 0/0 0/0 .text            evtCutProc__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("PA_Taro", this, -1);
 
@@ -1280,7 +1240,6 @@ BOOL daNpc_Pachi_Taro_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80A9D698-80A9D840 0014F8 01A8+00 1/0 0/0 0/0 .text            action__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::action() {
     fopAc_ac_c* actor_p = NULL;
 
@@ -1310,14 +1269,12 @@ void daNpc_Pachi_Taro_c::action() {
     }
 }
 
-/* 80A9D840-80A9D8B8 0016A0 0078+00 1/0 0/0 0/0 .text            beforeMove__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80A9D8B8-80A9DB0C 001718 0254+00 1/0 0/0 0/0 .text            setAttnPos__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::setAttnPos() {
     cXyz sp38(0.0f, 30.0f, 0.0f);
 
@@ -1347,7 +1304,6 @@ void daNpc_Pachi_Taro_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80A9DB0C-80A9DC14 00196C 0108+00 1/0 0/0 0/0 .text setCollision__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::setCollision() {
     if (!mHide) {
         u32 coSPrm = 0x79;
@@ -1379,7 +1335,6 @@ void daNpc_Pachi_Taro_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80A9DC14-80A9DC1C 001A74 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__18daNpc_Pachi_Taro_cFv */
 int daNpc_Pachi_Taro_c::drawDbgInfo() {
     #if DEBUG
     if (mpHIO->m.common.debug_info_ON) {
@@ -1395,7 +1350,6 @@ int daNpc_Pachi_Taro_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80A9DC1C-80A9DD24 001A7C 0108+00 1/0 0/0 0/0 .text            drawOtherMdl__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::drawOtherMdl() {
     J3DModel* model = mpMorf[0]->getModel();
 
@@ -1416,7 +1370,6 @@ void daNpc_Pachi_Taro_c::drawOtherMdl() {
     }
 }
 
-/* 80A9DD24-80A9DDA0 001B84 007C+00 1/1 0/0 0/0 .text            selectAction__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::selectAction() {
     mNextAction = NULL;
 
@@ -1440,12 +1393,10 @@ BOOL daNpc_Pachi_Taro_c::selectAction() {
     return TRUE;
 }
 
-/* 80A9DDA0-80A9DDCC 001C00 002C+00 1/1 0/0 0/0 .text            chkAction__18daNpc_Pachi_Taro_cFM18daNpc_Pachi_Taro_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Taro_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80A9DDCC-80A9DE74 001C2C 00A8+00 2/2 0/0 0/0 .text            setAction__18daNpc_Pachi_Taro_cFM18daNpc_Pachi_Taro_cFPCvPvPv_i */
 BOOL daNpc_Pachi_Taro_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1463,7 +1414,6 @@ BOOL daNpc_Pachi_Taro_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80A9DE74-80A9E154 001CD4 02E0+00 2/0 0/0 0/0 .text            wait__18daNpc_Pachi_Taro_cFPv */
 int daNpc_Pachi_Taro_c::wait(void* param_1) {
     int unused = 0;
     
@@ -1535,7 +1485,6 @@ int daNpc_Pachi_Taro_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80A9E154-80A9E224 001FB4 00D0+00 2/2 0/0 0/0 .text            setMesPat__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::setMesPat() {
     mMesPat = 0;
 
@@ -1560,14 +1509,12 @@ void daNpc_Pachi_Taro_c::setMesPat() {
     }
 }
 
-/* 80A9E224-80A9E270 002084 004C+00 3/3 0/0 0/0 .text _turn_to_link__18daNpc_Pachi_Taro_cFs */
 BOOL daNpc_Pachi_Taro_c::_turn_to_link(s16 i_step) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz pos(*fopAcM_GetPosition_p(player));
     return _turn_pos(pos, i_step);
 }
 
-/* 80A9E270-80A9E2CC 0020D0 005C+00 4/4 0/0 0/0 .text _turn_pos__18daNpc_Pachi_Taro_cFRC4cXyzs */
 BOOL daNpc_Pachi_Taro_c::_turn_pos(cXyz const& i_pos, s16 i_step) {
     BOOL rv = cLib_chaseAngleS(&mCurAngle.y, cLib_targetAngleY(&current.pos, &i_pos), i_step);
     current.angle.y = mCurAngle.y;
@@ -1575,7 +1522,6 @@ BOOL daNpc_Pachi_Taro_c::_turn_pos(cXyz const& i_pos, s16 i_step) {
     return rv;
 }
 
-/* 80A9E2CC-80A9E30C 00212C 0040+00 1/1 0/0 0/0 .text _turn_pos__18daNpc_Pachi_Taro_cFRC4cXyz */
 BOOL daNpc_Pachi_Taro_c::_turn_pos(cXyz const& i_pos) {
     s16 angleY = cLib_targetAngleY(&current.pos, &i_pos);
     mCurAngle.y = angleY;
@@ -1585,7 +1531,6 @@ BOOL daNpc_Pachi_Taro_c::_turn_pos(cXyz const& i_pos) {
     return TRUE;
 }
 
-/* 80A9E30C-80A9E364 00216C 0058+00 1/1 0/0 0/0 .text            talk_cancel__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::talk_cancel() {
     daNpc_Pachi_Maro_c* maro_p = (daNpc_Pachi_Maro_c*)mActorMngrs[0].getActorP();
     if (maro_p != NULL) {
@@ -1598,7 +1543,6 @@ void daNpc_Pachi_Taro_c::talk_cancel() {
     }
 }
 
-/* 80A9E364-80A9E3E4 0021C4 0080+00 1/1 0/0 0/0 .text watch_tutrial__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::watch_tutrial() {
     u16 evtNo = 0;
     evtNo = chkDistTag();
@@ -1621,7 +1565,6 @@ void daNpc_Pachi_Taro_c::watch_tutrial() {
     }
 }
 
-/* 80A9E3E4-80A9E458 002244 0074+00 1/1 0/0 0/0 .text            chkDistTag__18daNpc_Pachi_Taro_cFv */
 u16 daNpc_Pachi_Taro_c::chkDistTag() {
     fopAc_ac_c* actor_p = NULL;
     actor_p = mActorMngrs[2].getActorP();
@@ -1639,7 +1582,6 @@ u16 daNpc_Pachi_Taro_c::chkDistTag() {
     return EVT_NONE;
 }
 
-/* 80A9E458-80A9E56C 0022B8 0114+00 1/1 0/0 0/0 .text chkEscapeTag__18daNpc_Pachi_Taro_cFv */
 u16 daNpc_Pachi_Taro_c::chkEscapeTag() {
     fopAc_ac_c* actor_p = NULL;
     actor_p = mActorMngrs[4].getActorP();
@@ -1663,7 +1605,6 @@ u16 daNpc_Pachi_Taro_c::chkEscapeTag() {
     return EVT_NONE;
 }
 
-/* 80A9E56C-80A9E700 0023CC 0194+00 1/1 0/0 0/0 .text            chkTarget__18daNpc_Pachi_Taro_cFv */
 u16 daNpc_Pachi_Taro_c::chkTarget() {
     s8 sVar1 = -1;
     u8 tmpReg = dComIfGs_getTmpReg(0xF3FF);
@@ -1733,7 +1674,6 @@ u16 daNpc_Pachi_Taro_c::chkTarget() {
     return rv;
 }
 
-/* 80A9E700-80A9E778 002560 0078+00 1/1 0/0 0/0 .text            clr_tagHit__18daNpc_Pachi_Taro_cFv */
 void daNpc_Pachi_Taro_c::clr_tagHit() {
     fopAc_ac_c* actor_p = NULL;
     for (int i = 0; i < 4; i++) {
@@ -1744,7 +1684,6 @@ void daNpc_Pachi_Taro_c::clr_tagHit() {
     }
 }
 
-/* 80A9E778-80A9E80C 0025D8 0094+00 1/1 0/0 0/0 .text            allTagPosSet__18daNpc_Pachi_Taro_cFRC4cXyz */
 void daNpc_Pachi_Taro_c::allTagPosSet(cXyz const& i_pos) {
     fopAc_ac_c* pachiMaroP = mActorMngrs[0].getActorP();
     fopAc_ac_c* pachBesuP = mActorMngrs[1].getActorP();
@@ -1760,7 +1699,6 @@ void daNpc_Pachi_Taro_c::allTagPosSet(cXyz const& i_pos) {
     }
 }
 
-/* 80A9E80C-80A9E8A0 00266C 0094+00 1/1 0/0 0/0 .text            allLookPosSet__18daNpc_Pachi_Taro_cFRC4cXyz */
 void daNpc_Pachi_Taro_c::allLookPosSet(cXyz const& i_pos) {
     fopAc_ac_c* pachiMaroP = mActorMngrs[0].getActorP();
     fopAc_ac_c* pachBesuP = mActorMngrs[1].getActorP();
@@ -1776,7 +1714,6 @@ void daNpc_Pachi_Taro_c::allLookPosSet(cXyz const& i_pos) {
     }
 }
 
-/* 80A9E8A0-80A9E910 002700 0070+00 2/0 0/0 0/0 .text            talk__18daNpc_Pachi_Taro_cFPv */
 int daNpc_Pachi_Taro_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1821,7 +1758,6 @@ int daNpc_Pachi_Taro_c::test(void* param_1) {
     return 1;
 }
 
-/* 80A9E910-80A9E9E8 002770 00D8+00 2/0 0/0 0/0 .text            evtEndProc__18daNpc_Pachi_Taro_cFv */
 BOOL daNpc_Pachi_Taro_c::evtEndProc() {
     BOOL rv = TRUE;
     fopAc_ac_c* actor_p = mActorMngrs[0].getActorP();
@@ -1862,7 +1798,6 @@ BOOL daNpc_Pachi_Taro_c::evtEndProc() {
     return rv;
 }
 
-/* 80A9E9E8-80A9EAA0 002848 00B8+00 1/0 0/0 0/0 .text cutTutrialBegin__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialBegin(int i_staffId) {
     field_0x1004 = 1;
 
@@ -1882,7 +1817,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialBegin(int i_staffId) {
     return _cutTutrialBegin_Main(*cutId);
 }
 
-/* 80A9EAA0-80A9EB3C 002900 009C+00 1/1 0/0 0/0 .text             _cutTutrialBegin_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -1896,7 +1830,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9EB3C-80A9EC5C 00299C 0120+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Main(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     BOOL rv = FALSE;
@@ -1927,7 +1860,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9EC5C-80A9ECF0 002ABC 0094+00 1/0 0/0 0/0 .text            cutTutrialBegin_Skip__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialBegin_Skip(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1944,7 +1876,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialBegin_Skip(int i_staffId) {
     return _cutTutrialBegin_Skip_Main(*cutId);
 }
 
-/* 80A9ECF0-80A9ED28 002B50 0038+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 10:
@@ -1956,7 +1887,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Skip_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9ED28-80A9ED40 002B88 0018+00 1/1 0/0 0/0 .text            _cutTutrialBegin_Skip_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -1969,7 +1899,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialBegin_Skip_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9ED40-80A9EDD4 002BA0 0094+00 1/0 0/0 0/0 .text cutTutrialClear__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialClear(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -1986,7 +1915,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialClear(int i_staffId) {
     return _cutTutrialClear_Main(*cutId);
 }
 
-/* 80A9EDD4-80A9EEBC 002C34 00E8+00 1/1 0/0 0/0 .text            _cutTutrialClear_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialClear_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2006,7 +1934,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialClear_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9EEBC-80A9EFC0 002D1C 0104+00 1/1 0/0 0/0 .text            _cutTutrialClear_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialClear_Main(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     BOOL rv = FALSE;
@@ -2035,7 +1962,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialClear_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9EFC0-80A9F0DC 002E20 011C+00 1/0 0/0 0/0 .text            cutTalk__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTalk(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2069,7 +1995,6 @@ BOOL daNpc_Pachi_Taro_c::cutTalk(int i_staffId) {
     return _cutTalk_Main(*cutId, mesNo);
 }
 
-/* 80A9F0DC-80A9F188 002F3C 00AC+00 2/1 0/0 0/0 .text _cutTalk_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTalk_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2094,7 +2019,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTalk_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9F188-80A9F324 002FE8 019C+00 2/1 0/0 0/0 .text            _cutTalk_Main__18daNpc_Pachi_Taro_cFRCiRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTalk_Main(int const& i_cutId, int const& i_mesNo) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     fopAc_ac_c* actor_p = mActorMngrs[0].getActorP();
@@ -2152,7 +2076,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTalk_Main(int const& i_cutId, int const& i_mesNo) {
     return rv;
 }
 
-/* 80A9F324-80A9F440 003184 011C+00 1/0 0/0 0/0 .text            cutTalk2__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTalk2(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2187,7 +2110,6 @@ BOOL daNpc_Pachi_Taro_c::cutTalk2(int i_staffId) {
     return _cutTalk2_Main(*cutId, mesNo);
 }
 
-/* 80A9F440-80A9F4EC 0032A0 00AC+00 2/1 0/0 0/0 .text _cutTalk2_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTalk2_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2212,7 +2134,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTalk2_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9F4EC-80A9F688 00334C 019C+00 2/1 0/0 0/0 .text            _cutTalk2_Main__18daNpc_Pachi_Taro_cFRCiRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTalk2_Main(int const& i_cutId, int const& i_mesNo) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     fopAc_ac_c* actor_p = mActorMngrs[0].getActorP();
@@ -2270,7 +2191,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTalk2_Main(int const& i_cutId, int const& i_mesNo)
     return rv;
 }
 
-/* 80A9F688-80A9F71C 0034E8 0094+00 1/0 0/0 0/0 .text            cut1stHit_KakasiBody__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cut1stHit_KakasiBody(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2287,7 +2207,6 @@ BOOL daNpc_Pachi_Taro_c::cut1stHit_KakasiBody(int i_staffId) {
     return _cut1stHit_KakasiBody_Main(*cutId);
 }
 
-/* 80A9F71C-80A9F83C 00357C 0120+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2317,7 +2236,6 @@ BOOL daNpc_Pachi_Taro_c::_cut1stHit_KakasiBody_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9F83C-80A9F9C4 00369C 0188+00 1/1 0/0 0/0 .text            _cut1stHit_KakasiBody_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     daNpc_Pachi_Besu_c* besu_p = (daNpc_Pachi_Besu_c*)mActorMngrs[1].getActorP();
@@ -2356,7 +2274,6 @@ BOOL daNpc_Pachi_Taro_c::_cut1stHit_KakasiBody_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9F9C4-80A9FA58 003824 0094+00 1/0 0/0 0/0 .text            cutTutrialSelectGiveUp__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialSelectGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2373,7 +2290,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialSelectGiveUp(int i_staffId) {
     return _cutTutrialSelectGiveUp_Main(*cutId);
 }
 
-/* 80A9FA58-80A9FB08 0038B8 00B0+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialSelectGiveUp_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2393,7 +2309,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialSelectGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9FB08-80A9FCEC 003968 01E4+00 1/1 0/0 0/0 .text            _cutTutrialSelectGiveUp_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     fopAc_ac_c* actor_p = mActorMngrs[1].getActorP();
@@ -2437,7 +2352,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialSelectGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9FCEC-80A9FD80 003B4C 0094+00 1/0 0/0 0/0 .text cutTutrialGiveUp__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialGiveUp(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2454,7 +2368,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialGiveUp(int i_staffId) {
     return _cutTutrialGiveUp_Main(*cutId);
 }
 
-/* 80A9FD80-80A9FE34 003BE0 00B4+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialGiveUp_Init(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
 
@@ -2472,7 +2385,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialGiveUp_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80A9FE34-80A9FFAC 003C94 0178+00 1/1 0/0 0/0 .text            _cutTutrialGiveUp_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     fopAc_ac_c* actors[3] = {this, mActorMngrs[0].getActorP(), mActorMngrs[1].getActorP()};
     fopAc_ac_c* actor_p = mActorMngrs[1].getActorP();
@@ -2513,7 +2425,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialGiveUp_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80A9FFAC-80AA0040 003E0C 0094+00 1/0 0/0 0/0 .text            cutTutrialCaution__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialCaution(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2530,7 +2441,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialCaution(int i_staffId) {
     return _cutTutrialCaution_Main(*cutId);
 }
 
-/* 80AA0040-80AA0088 003EA0 0048+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialCaution_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 5:
@@ -2544,7 +2454,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialCaution_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80AA0088-80AA0108 003EE8 0080+00 1/1 0/0 0/0 .text            _cutTutrialCaution_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialCaution_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -2565,7 +2474,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialCaution_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80AA0108-80AA019C 003F68 0094+00 1/0 0/0 0/0 .text            cutTutrialContinue__18daNpc_Pachi_Taro_cFi */
 BOOL daNpc_Pachi_Taro_c::cutTutrialContinue(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutId = NULL;
@@ -2582,7 +2490,6 @@ BOOL daNpc_Pachi_Taro_c::cutTutrialContinue(int i_staffId) {
     return _cutTutrialContinue_Main(*cutId);
 }
 
-/* 80AA019C-80AA01A4 003FFC 0008+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Init__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialContinue_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 10:
@@ -2595,7 +2502,6 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialContinue_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80AA01A4-80AA0258 004004 00B4+00 1/1 0/0 0/0 .text            _cutTutrialContinue_Main__18daNpc_Pachi_Taro_cFRCi */
 BOOL daNpc_Pachi_Taro_c::_cutTutrialContinue_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -2622,32 +2528,26 @@ BOOL daNpc_Pachi_Taro_c::_cutTutrialContinue_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80AA0258-80AA0278 0040B8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Taro_Create__FPv */
 static int daNpc_Pachi_Taro_Create(void* i_this) {
     return static_cast<daNpc_Pachi_Taro_c*>(i_this)->create();
 }
 
-/* 80AA0278-80AA0298 0040D8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Taro_Delete__FPv */
 static int daNpc_Pachi_Taro_Delete(void* i_this) {
     return static_cast<daNpc_Pachi_Taro_c*>(i_this)->Delete();
 }
 
-/* 80AA0298-80AA02B8 0040F8 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Taro_Execute__FPv */
 static int daNpc_Pachi_Taro_Execute(void* i_this) {
     return static_cast<daNpc_Pachi_Taro_c*>(i_this)->Execute();
 }
 
-/* 80AA02B8-80AA02D8 004118 0020+00 1/0 0/0 0/0 .text            daNpc_Pachi_Taro_Draw__FPv */
 static int daNpc_Pachi_Taro_Draw(void* i_this) {
     return static_cast<daNpc_Pachi_Taro_c*>(i_this)->Draw();
 }
 
-/* 80AA02D8-80AA02E0 004138 0008+00 1/0 0/0 0/0 .text            daNpc_Pachi_Taro_IsDelete__FPv */
 static int daNpc_Pachi_Taro_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AA29C4-80AA29E4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Pachi_Taro_MethodTable */
 static actor_method_class daNpc_Pachi_Taro_MethodTable = {
     (process_method_func)daNpc_Pachi_Taro_Create,
     (process_method_func)daNpc_Pachi_Taro_Delete,
@@ -2656,7 +2556,6 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = {
     (process_method_func)daNpc_Pachi_Taro_Draw,
 };
 
-/* 80AA29E4-80AA2A14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PACHI_TARO */
 extern actor_process_profile_definition g_profile_NPC_PACHI_TARO = {
   fpcLy_CURRENT_e,               // mLayerID
   7,                             // mListID
diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp
index 0360df2e39..f9c4599a4f 100644
--- a/src/d/actor/d_a_npc_passer.cpp
+++ b/src/d/actor/d_a_npc_passer.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_passer.h"
 #include "d/d_s_play.h"
 
-/* 80AA2C18-80AA2C9C 000078 0084+00 1/0 0/0 0/0 .text            __dt__13daNpcPasser_cFv */
 daNpcPasser_c::~daNpcPasser_c() {
     removeResrc(m_type, m_objNum);
 
@@ -21,7 +20,6 @@ daNpcPasser_c::~daNpcPasser_c() {
     #endif
 }
 
-/* 80AA2C9C-80AA2D20 0000FC 0084+00 1/1 0/0 0/0 .text            createHeap__13daNpcPasser_cFv */
 int daNpcPasser_c::createHeap() {
     int rv = NpcCreate(m_type);
     if (rv != 0) {
@@ -39,13 +37,11 @@ int daNpcPasser_c::createHeap() {
     return rv;
 }
 
-/* 80AA2D20-80AA2D40 000180 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c */
 static int createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcPasser_c* actor = (daNpcPasser_c*)i_this;
     return actor->createHeap();
 }
 
-/* 80AA2D40-80AA2FD4 0001A0 0294+00 1/1 0/0 0/0 .text            create__13daNpcPasser_cFv */
 cPhs__Step daNpcPasser_c::create() {
     fopAcM_ct(this, daNpcPasser_c);
 
@@ -98,7 +94,6 @@ cPhs__Step daNpcPasser_c::create() {
     return phase;
 }
 
-/* 80AA2FD4-80AA315C 000434 0188+00 1/1 0/0 0/0 .text            execute__13daNpcPasser_cFv */
 int daNpcPasser_c::execute() {
     mAcchCir.SetWallH(Cd2_HIO_chkWallH(m_type));
     mAcchCir.SetWallR(Cd2_HIO_chkWallR(m_type));
@@ -118,7 +113,6 @@ int daNpcPasser_c::execute() {
     return 1;
 }
 
-/* 80AA315C-80AA31EC 0005BC 0090+00 1/1 0/0 0/0 .text            draw__13daNpcPasser_cFv */
 int daNpcPasser_c::draw() {
     drawNpc();
     drawObj(m_objNum, mpModel, Cd2_HIO_objScale(m_type));
@@ -132,7 +126,6 @@ int daNpcPasser_c::draw() {
     return 1;
 }
 
-/* 80AA31EC-80AA3230 00064C 0044+00 4/4 0/0 0/0 .text            setAction__13daNpcPasser_cFQ213daNpcPasser_c6Mode_e */
 void daNpcPasser_c::setAction(daNpcPasser_c::Mode_e i_action) {
     JUT_ASSERT(328, i_action < MODE_MAX_e);
     mPrevActionIdx = mActionIdx;
@@ -141,13 +134,11 @@ void daNpcPasser_c::setAction(daNpcPasser_c::Mode_e i_action) {
     callInit();
 }
 
-/* 80AA3230-80AA3258 000690 0028+00 1/1 0/0 0/0 .text            callInit__13daNpcPasser_cFv */
 void daNpcPasser_c::callInit() {
     JUT_ASSERT(346, mAction != NULL);
     (this->*mAction[0])();
 }
 
-/* 80AA3258-80AA3284 0006B8 002C+00 1/1 0/0 0/0 .text            callExecute__13daNpcPasser_cFv */
 void daNpcPasser_c::callExecute() {
     JUT_ASSERT(359, mAction != NULL);
     (this->*mAction[1])();
@@ -162,7 +153,6 @@ enum Rnd_Values {
     /* 0x5 */ FIVE,
 };
 
-/* 80AA3284-80AA33F0 0006E4 016C+00 1/0 0/0 0/0 .text            initPath__13daNpcPasser_cFv */
 void daNpcPasser_c::initPath() {
     if (getMoveType() == 1) {
         field_0xb1c = 2;
@@ -197,7 +187,6 @@ void daNpcPasser_c::initPath() {
     mPathMode = 0;
 }
 
-/* 80AA33F0-80AA387C 000850 048C+00 1/0 0/0 0/0 .text            executePath__13daNpcPasser_cFv */
 void daNpcPasser_c::executePath() {
     switch (mPathMode) {
         case 0:
@@ -291,7 +280,6 @@ void daNpcPasser_c::executePath() {
     }
 }
 
-/* 80AA38C4-80AA39DC 000D24 0118+00 1/0 0/0 0/0 .text            initEscape__13daNpcPasser_cFv */
 void daNpcPasser_c::initEscape() {
     mEscapeTag = getEscapeTag();
     JUT_ASSERT(491, mEscapeTag != NULL);
@@ -314,7 +302,6 @@ void daNpcPasser_c::initEscape() {
     dComIfGs_onSaveDunSwitch(60);
 }
 
-/* 80AA39DC-80AA3D4C 000E3C 0370+00 1/0 0/0 0/0 .text            executeEscape__13daNpcPasser_cFv */
 void daNpcPasser_c::executeEscape() {
     if (field_0xb1c == 0) {
         if (mpMorf->isStop()) {
@@ -371,7 +358,6 @@ void daNpcPasser_c::executeEscape() {
     }
 }
 
-/* 80AA3D4C-80AA3DE4 0011AC 0098+00 1/0 0/0 0/0 .text            initFear__13daNpcPasser_cFv */
 void daNpcPasser_c::initFear() {
     m_objNum = 0;
     setAnm((J3DAnmTransformKey*)getAnmP(0x26, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
@@ -380,7 +366,6 @@ void daNpcPasser_c::initFear() {
     field_0xb1c = 0;
 }
 
-/* 80AA3DE4-80AA3E5C 001244 0078+00 1/0 0/0 0/0 .text            executeFear__13daNpcPasser_cFv */
 void daNpcPasser_c::executeFear() {
     if (mpMorf->checkFrame(1.0f)) {
         mCitizen.playVoice(2);
@@ -393,7 +378,6 @@ void daNpcPasser_c::executeFear() {
     cLib_addCalcAngleS2(&shape_angle.y, mTargetAngleY, MREG_S(0) + 3, MREG_S(1) + 0x600);
 }
 
-/* 80AA3E5C-80AA3F10 0012BC 00B4+00 1/0 0/0 0/0 .text            initFight__13daNpcPasser_cFv */
 void daNpcPasser_c::initFight() {
     setAnm((J3DAnmTransformKey*)getAnmP(0x29, m_objNum), 1.0f, 0.0f, J3DFrameCtrl::EMode_NONE, 0, -1);
     mCitizen.playVoice(1);
@@ -403,7 +387,6 @@ void daNpcPasser_c::initFight() {
     field_0xb1c = 0;
 }
 
-/* 80AA3F10-80AA40A4 001370 0194+00 1/0 0/0 0/0 .text            executeFight__13daNpcPasser_cFv */
 void daNpcPasser_c::executeFight() {
     if (mpMorf->isStop()) {
         setAnm((J3DAnmTransformKey*)getAnmP(0x2A, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
@@ -430,7 +413,6 @@ void daNpcPasser_c::executeFight() {
     cLib_addCalcAngleS2(&shape_angle.y, mTargetAngleY, MREG_S(0) + 3, MREG_S(1) + 0x600);
 }
 
-/* 80AA40A4-80AA4128 001504 0084+00 1/0 0/0 0/0 .text            initRelief__13daNpcPasser_cFv */
 void daNpcPasser_c::initRelief() {
     setAnm((J3DAnmTransformKey*)getAnmP(0, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
     speedF = 0.0f;
@@ -438,7 +420,6 @@ void daNpcPasser_c::initRelief() {
     field_0xb1c = 0;
 }
 
-/* 80AA4128-80AA41E4 001588 00BC+00 1/0 0/0 0/0 .text            executeRelief__13daNpcPasser_cFv */
 void daNpcPasser_c::executeRelief() {
     if (fopAcM_CheckCondition(this, fopAcCnd_NODRAW_e)) {
         fopAcM_delete(this);
@@ -460,7 +441,6 @@ void daNpcPasser_c::executeRelief() {
     cLib_addCalcAngleS2(&shape_angle.y, mTargetAngleY, MREG_S(0) + 3, MREG_S(1) + 0x600);
 }
 
-/* 80AA41E4-80AA43A4 001644 01C0+00 1/1 0/0 0/0 .text            create_init__13daNpcPasser_cFv */
 void daNpcPasser_c::create_init() {
     #if DEBUG
     // NPC (C-class, D-class) Pedestrian High
@@ -493,7 +473,6 @@ void daNpcPasser_c::create_init() {
     setBaseMtx();
 }
 
-/* 80AA6A9C-80AA6B14 000098 0078+00 1/2 0/0 0/0 .data            ActionTable__13daNpcPasser_c */
 daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
     {&daNpcPasser_c::initPath, &daNpcPasser_c::executePath},
     {&daNpcPasser_c::initEscape, &daNpcPasser_c::executeEscape},
@@ -502,7 +481,6 @@ daNpcPasser_c::actionFunc daNpcPasser_c::ActionTable[5][2] = {
     {&daNpcPasser_c::initRelief, &daNpcPasser_c::executeRelief},
 };
 
-/* 80AA6B14-80AA6B84 -00001 0070+00 1/1 0/0 0/0 .data            m_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
     daNpcPasser_c::m_seq00_funcTbl, daNpcPasser_c::m_seq01_funcTbl,
     daNpcPasser_c::m_seq02_funcTbl, daNpcPasser_c::m_seq03_funcTbl,
@@ -520,37 +498,31 @@ daNpcPasser_c::seqFunc* daNpcPasser_c::m_funcTbl[28] = {
     daNpcPasser_c::m_seq26_funcTbl, daNpcPasser_c::m_seq27_funcTbl,
 };
 
-/* 80AA6B90-80AA6BA8 00018C 0018+00 1/1 0/0 0/0 .data            m_seq00_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq00_funcTbl[2] = {
     &daNpcPasser_c::walka,
     NULL,
 };
 
-/* 80AA6BB4-80AA6BCC 0001B0 0018+00 1/1 0/0 0/0 .data            m_seq01_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq01_funcTbl[2] = {
     &daNpcPasser_c::runa,
     NULL,
 };
 
-/* 80AA6BD8-80AA6BF0 0001D4 0018+00 1/1 0/0 0/0 .data            m_seq02_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq02_funcTbl[2] = {
     &daNpcPasser_c::waita,
     NULL,
 };
 
-/* 80AA6BFC-80AA6C14 0001F8 0018+00 1/1 0/0 0/0 .data            m_seq03_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq03_funcTbl[2] = {
     &daNpcPasser_c::talka,
     NULL,
 };
 
-/* 80AA6C20-80AA6C38 00021C 0018+00 1/1 0/0 0/0 .data            m_seq04_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq04_funcTbl[2] = {
     &daNpcPasser_c::runb,
     NULL,
 };
 
-/* 80AA6C5C-80AA6C8C 000258 0030+00 1/1 0/0 0/0 .data            m_seq05_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq05_funcTbl[4] = {
     &daNpcPasser_c::turnr,
     &daNpcPasser_c::waita,
@@ -558,7 +530,6 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq05_funcTbl[4] = {
     NULL,
 };
 
-/* 80AA6CB0-80AA6CE0 0002AC 0030+00 1/1 0/0 0/0 .data            m_seq06_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq06_funcTbl[4] = {
     &daNpcPasser_c::turnl,
     &daNpcPasser_c::waita,
@@ -566,13 +537,11 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq06_funcTbl[4] = {
     NULL,
 };
 
-/* 80AA6CEC-80AA6D04 0002E8 0018+00 1/1 0/0 0/0 .data            m_seq07_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq07_funcTbl[2] = {
     &daNpcPasser_c::waitwall,
     NULL,
 };
 
-/* 80AA6D4C-80AA6DA0 000348 0054+00 1/1 0/0 0/0 .data            m_seq08_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq08_funcTbl[7] = {
     &daNpcPasser_c::talkwall,
     &daNpcPasser_c::waitwall,
@@ -583,19 +552,16 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq08_funcTbl[7] = {
     NULL,
 };
 
-/* 80AA6DAC-80AA6DC4 0003A8 0018+00 1/1 0/0 0/0 .data            m_seq09_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq09_funcTbl[2] = {
     &daNpcPasser_c::talkb,
     NULL,
 };
 
-/* 80AA6DD0-80AA6DE8 0003CC 0018+00 1/1 0/0 0/0 .data            m_seq10_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq10_funcTbl[2] = {
     &daNpcPasser_c::talkc,
     NULL,
 };
 
-/* 80AA6E24-80AA6E6C 000420 0048+00 1/1 0/0 0/0 .data            m_seq11_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq11_funcTbl[6] = {
     &daNpcPasser_c::talka,
     &daNpcPasser_c::waita,
@@ -605,13 +571,11 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq11_funcTbl[6] = {
     NULL,
 };
 
-/* 80AA6E78-80AA6E90 000474 0018+00 1/1 0/0 0/0 .data            m_seq12_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq12_funcTbl[2] = {
     &daNpcPasser_c::waitb,
     NULL,
 };
 
-/* 80AA6ECC-80AA6F14 0004C8 0048+00 1/1 0/0 0/0 .data            m_seq13_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq13_funcTbl[6] = {
     &daNpcPasser_c::browsea,
     &daNpcPasser_c::browseb,
@@ -621,19 +585,16 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq13_funcTbl[6] = {
     NULL,
 };
 
-/* 80AA6F20-80AA6F38 00051C 0018+00 1/1 0/0 0/0 .data            m_seq14_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq14_funcTbl[2] = {
     &daNpcPasser_c::walkb,
     NULL,
 };
 
-/* 80AA6F44-80AA6F5C 000540 0018+00 1/1 0/0 0/0 .data            m_seq15_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq15_funcTbl[2] = {
     &daNpcPasser_c::sitwaita,
     NULL,
 };
 
-/* 80AA6FA4-80AA6FF8 0005A0 0054+00 1/1 0/0 0/0 .data            m_seq16_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq16_funcTbl[7] = {
     &daNpcPasser_c::sittalka,
     &daNpcPasser_c::sitwaita,
@@ -644,19 +605,16 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq16_funcTbl[7] = {
     NULL,
 };
 
-/* 80AA7004-80AA701C 000600 0018+00 1/1 0/0 0/0 .data            m_seq17_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq17_funcTbl[2] = {
     &daNpcPasser_c::playm,
     NULL,
 };
 
-/* 80AA7028-80AA7040 000624 0018+00 1/1 0/0 0/0 .data            m_seq18_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq18_funcTbl[2] = {
     &daNpcPasser_c::sitwaitb,
     NULL,
 };
 
-/* 80AA7088-80AA70DC 000684 0054+00 1/1 0/0 0/0 .data            m_seq19_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq19_funcTbl[7] = {
     &daNpcPasser_c::sittalkb,
     &daNpcPasser_c::sitwaitb,
@@ -667,19 +625,16 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq19_funcTbl[7] = {
     NULL,
 };
 
-/* 80AA70E8-80AA7100 0006E4 0018+00 1/1 0/0 0/0 .data            m_seq20_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq20_funcTbl[2] = {
     &daNpcPasser_c::looka,
     NULL,
 };
 
-/* 80AA710C-80AA7124 000708 0018+00 1/1 0/0 0/0 .data            m_seq21_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq21_funcTbl[2] = {
     &daNpcPasser_c::lookb,
     NULL,
 };
 
-/* 80AA7148-80AA7178 000744 0030+00 1/1 0/0 0/0 .data            m_seq22_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq22_funcTbl[4] = {
     &daNpcPasser_c::looka,
     &daNpcPasser_c::lookb,
@@ -687,7 +642,6 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq22_funcTbl[4] = {
     NULL,
 };
 
-/* 80AA71C0-80AA7214 0007BC 0054+00 1/1 0/0 0/0 .data            m_seq23_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq23_funcTbl[7] = {
     &daNpcPasser_c::talka,
     &daNpcPasser_c::waita,
@@ -698,7 +652,6 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq23_funcTbl[7] = {
     NULL,
 };
 
-/* 80AA7244-80AA7280 000840 003C+00 1/1 0/0 0/0 .data            m_seq24_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq24_funcTbl[5] = {
     &daNpcPasser_c::talkb,
     &daNpcPasser_c::talka,
@@ -707,7 +660,6 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq24_funcTbl[5] = {
     NULL,
 };
 
-/* 80AA72C8-80AA731C 0008C4 0054+00 1/1 0/0 0/0 .data            m_seq25_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq25_funcTbl[7] = {
     &daNpcPasser_c::browsea,
     &daNpcPasser_c::browseb,
@@ -718,24 +670,20 @@ daNpcPasser_c::seqFunc daNpcPasser_c::m_seq25_funcTbl[7] = {
     NULL,
 };
 
-/* 80AA7334-80AA7358 000930 0024+00 1/1 0/0 0/0 .data            m_seq26_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq26_funcTbl[3] = {
     &daNpcPasser_c::browsea,
     &daNpcPasser_c::browseb,
     NULL,
 };
 
-/* 80AA7364-80AA7370 000960 000C+00 1/1 0/0 0/0 .data            m_seq27_funcTbl__13daNpcPasser_c */
 daNpcPasser_c::seqFunc daNpcPasser_c::m_seq27_funcTbl[1] = {
     &daNpcPasser_c::waitTime,
 };
 
-/* 80AA43A4-80AA43B0 001804 000C+00 2/2 0/0 0/0 .text            setAngle__13daNpcPasser_cFv */
 void daNpcPasser_c::setAngle() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80AA43B0-80AA44A4 001810 00F4+00 1/1 0/0 0/0 .text            setSpeed__13daNpcPasser_cFffPfi */
 void daNpcPasser_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4) {
     f32 target = field_0xb10 * (param_2 * field_0xb10);
     f32 step = field_0xb10 * (param_1 * field_0xb10);
@@ -754,7 +702,6 @@ void daNpcPasser_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_4
     cLib_chaseF(i_speed, target, step);
 }
 
-/* 80AA44A4-80AA4780 001904 02DC+00 2/2 0/0 0/0 .text            pathMoveF__13daNpcPasser_cFv */
 void daNpcPasser_c::pathMoveF() {
     f32 fVar1 = 0.0f;
     f32 speed = 0.0f;
@@ -812,7 +759,6 @@ void daNpcPasser_c::pathMoveF() {
     }
 }
 
-/* 80AA4780-80AA47FC 001BE0 007C+00 2/2 0/0 0/0 .text            setBaseMtx__13daNpcPasser_cFv */
 void daNpcPasser_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, mPosY, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -821,7 +767,6 @@ void daNpcPasser_c::setBaseMtx() {
     setAttention(m_type);
 }
 
-/* 80AA47FC-80AA48D8 001C5C 00DC+00 1/1 0/0 0/0 .text            initCollision__13daNpcPasser_cFv */
 void daNpcPasser_c::initCollision() {
     mStts.Init(0xD9, 0xFF, this);
     mStts.SetRoomId(fopAcM_GetRoomNo(this));
@@ -831,7 +776,6 @@ void daNpcPasser_c::initCollision() {
     mCyl.SetH(Cd2_HIO_cylH(m_type));
 }
 
-/* 80AA48D8-80AA492C 001D38 0054+00 1/1 0/0 0/0 .text            setCollision__13daNpcPasser_cFv */
 void daNpcPasser_c::setCollision() {
     #if DEBUG
     mCyl.SetR(Cd2_HIO_cylR(m_type));
@@ -846,7 +790,6 @@ void daNpcPasser_c::setCollision() {
 }
 
 
-/* 80AA492C-80AA49D4 001D8C 00A8+00 10/0 0/0 0/0 .text            waita__13daNpcPasser_cFPv */
 BOOL daNpcPasser_c::waita(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -861,7 +804,6 @@ BOOL daNpcPasser_c::waita(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA49D4-80AA4A7C 001E34 00A8+00 9/0 0/0 0/0 .text            talka__13daNpcPasser_cFPv */
 int daNpcPasser_c::talka(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -876,7 +818,6 @@ int daNpcPasser_c::talka(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4A7C-80AA4B24 001EDC 00A8+00 3/0 0/0 0/0 .text            waitwall__13daNpcPasser_cFPv */
 int daNpcPasser_c::waitwall(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -891,7 +832,6 @@ int daNpcPasser_c::waitwall(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4B24-80AA4BCC 001F84 00A8+00 2/0 0/0 0/0 .text            talkwall__13daNpcPasser_cFPv */
 int daNpcPasser_c::talkwall(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -906,7 +846,6 @@ int daNpcPasser_c::talkwall(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4BCC-80AA4C74 00202C 00A8+00 2/0 0/0 0/0 .text            talkbwall__13daNpcPasser_cFPv */
 int daNpcPasser_c::talkbwall(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -921,7 +860,6 @@ int daNpcPasser_c::talkbwall(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4C74-80AA4D1C 0020D4 00A8+00 7/0 0/0 0/0 .text            talkb__13daNpcPasser_cFPv */
 int daNpcPasser_c::talkb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -936,7 +874,6 @@ int daNpcPasser_c::talkb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4D1C-80AA4DC4 00217C 00A8+00 4/0 0/0 0/0 .text            talkc__13daNpcPasser_cFPv */
 int daNpcPasser_c::talkc(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -951,7 +888,6 @@ int daNpcPasser_c::talkc(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4DC4-80AA4E6C 002224 00A8+00 2/0 0/0 0/0 .text            waitb__13daNpcPasser_cFPv */
 int daNpcPasser_c::waitb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -966,7 +902,6 @@ int daNpcPasser_c::waitb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4E6C-80AA4F14 0022CC 00A8+00 3/0 0/0 0/0 .text            sitwaita__13daNpcPasser_cFPv */
 int daNpcPasser_c::sitwaita(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -981,7 +916,6 @@ int daNpcPasser_c::sitwaita(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4F14-80AA4FBC 002374 00A8+00 2/0 0/0 0/0 .text            sittalka__13daNpcPasser_cFPv */
 int daNpcPasser_c::sittalka(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -996,7 +930,6 @@ int daNpcPasser_c::sittalka(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA4FBC-80AA5064 00241C 00A8+00 2/0 0/0 0/0 .text            sittalkab__13daNpcPasser_cFPv */
 int daNpcPasser_c::sittalkab(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1011,7 +944,6 @@ int daNpcPasser_c::sittalkab(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA5064-80AA510C 0024C4 00A8+00 3/0 0/0 0/0 .text            sitwaitb__13daNpcPasser_cFPv */
 int daNpcPasser_c::sitwaitb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1026,7 +958,6 @@ int daNpcPasser_c::sitwaitb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA510C-80AA51B4 00256C 00A8+00 2/0 0/0 0/0 .text            sittalkb__13daNpcPasser_cFPv */
 int daNpcPasser_c::sittalkb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1041,7 +972,6 @@ int daNpcPasser_c::sittalkb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA51B4-80AA525C 002614 00A8+00 2/0 0/0 0/0 .text            sittalkbb__13daNpcPasser_cFPv */
 int daNpcPasser_c::sittalkbb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1056,7 +986,6 @@ int daNpcPasser_c::sittalkbb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA525C-80AA5304 0026BC 00A8+00 2/0 0/0 0/0 .text            looka__13daNpcPasser_cFPv */
 int daNpcPasser_c::looka(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1071,7 +1000,6 @@ int daNpcPasser_c::looka(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA5304-80AA53AC 002764 00A8+00 2/0 0/0 0/0 .text            lookb__13daNpcPasser_cFPv */
 int daNpcPasser_c::lookb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1086,7 +1014,6 @@ int daNpcPasser_c::lookb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA53AC-80AA5454 00280C 00A8+00 1/0 0/0 0/0 .text            playm__13daNpcPasser_cFPv */
 int daNpcPasser_c::playm(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1101,7 +1028,6 @@ int daNpcPasser_c::playm(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA5454-80AA5510 0028B4 00BC+00 1/0 0/0 0/0 .text            turnr__13daNpcPasser_cFPv */
 int daNpcPasser_c::turnr(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1123,7 +1049,6 @@ int daNpcPasser_c::turnr(void* param_1) {
     return FALSE;
 }
 
-/* 80AA5510-80AA55CC 002970 00BC+00 1/0 0/0 0/0 .text            turnl__13daNpcPasser_cFPv */
 int daNpcPasser_c::turnl(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1145,35 +1070,30 @@ int daNpcPasser_c::turnl(void* param_1) {
     return FALSE;
 }
 
-/* 80AA55CC-80AA5634 002A2C 0068+00 1/0 0/0 0/0 .text            walka__13daNpcPasser_cFPv */
 int daNpcPasser_c::walka(void* param_1) {
     setAnm((J3DAnmTransformKey*)getAnmP(2, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
     field_0xb1c = 2;
     return TRUE;
 }
 
-/* 80AA5634-80AA569C 002A94 0068+00 1/0 0/0 0/0 .text            runa__13daNpcPasser_cFPv */
 int daNpcPasser_c::runa(void* param_1) {
     setAnm((J3DAnmTransformKey*)getAnmP(4, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
     field_0xb1c = 1;
     return TRUE;
 }
 
-/* 80AA569C-80AA5704 002AFC 0068+00 1/0 0/0 0/0 .text            runb__13daNpcPasser_cFPv */
 int daNpcPasser_c::runb(void* param_1) {
     setAnm((J3DAnmTransformKey*)getAnmP(5, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
     field_0xb1c = 1;
     return TRUE;
 }
 
-/* 80AA5704-80AA576C 002B64 0068+00 1/0 0/0 0/0 .text            walkb__13daNpcPasser_cFPv */
 int daNpcPasser_c::walkb(void* param_1) {
     setAnm((J3DAnmTransformKey*)getAnmP(3, m_objNum), 1.0f, 12.0f, J3DFrameCtrl::EMode_LOOP, 0, -1);
     field_0xb1c = 2;
     return TRUE;
 }
 
-/* 80AA576C-80AA5814 002BCC 00A8+00 3/0 0/0 0/0 .text            browsea__13daNpcPasser_cFPv */
 int daNpcPasser_c::browsea(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1188,7 +1108,6 @@ int daNpcPasser_c::browsea(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA5814-80AA58BC 002C74 00A8+00 3/0 0/0 0/0 .text            browseb__13daNpcPasser_cFPv */
 int daNpcPasser_c::browseb(void* param_1) {
     if (!isStop()) {
         return FALSE;
@@ -1203,7 +1122,6 @@ int daNpcPasser_c::browseb(void* param_1) {
     return field_0xaa0 == 0;
 }
 
-/* 80AA58BC-80AA58D8 002D1C 001C+00 1/0 0/0 0/0 .text            waitTime__13daNpcPasser_cFPv */
 int daNpcPasser_c::waitTime(void* param_1) {
     if (field_0xb22 != 0) {
         field_0xb22 = 0;
@@ -1212,33 +1130,27 @@ int daNpcPasser_c::waitTime(void* param_1) {
     return FALSE;
 }
 
-/* 80AA58D8-80AA58F8 002D38 0020+00 1/0 0/0 0/0 .text            daNpcPasser_Create__FPv */
 static int daNpcPasser_Create(void* i_this) {
     return static_cast<daNpcPasser_c*>(i_this)->create();
 }
 
-/* 80AA58F8-80AA592C 002D58 0034+00 1/0 0/0 0/0 .text            daNpcPasser_Delete__FPv */
 static int daNpcPasser_Delete(void* i_this) {
     static_cast<daNpcPasser_c*>(i_this)->~daNpcPasser_c();
     return 1;
 }
 
-/* 80AA592C-80AA594C 002D8C 0020+00 1/0 0/0 0/0 .text            daNpcPasser_Execute__FPv */
 static int daNpcPasser_Execute(void* i_this) {
     return static_cast<daNpcPasser_c*>(i_this)->execute();
 }
 
-/* 80AA594C-80AA596C 002DAC 0020+00 1/0 0/0 0/0 .text            daNpcPasser_Draw__FPv */
 static int daNpcPasser_Draw(void* i_this) {
     return static_cast<daNpcPasser_c*>(i_this)->draw();
 }
 
-/* 80AA596C-80AA5974 002DCC 0008+00 1/0 0/0 0/0 .text            daNpcPasser_IsDelete__FPv */
 static int daNpcPasser_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AA7370-80AA7390 -00001 0020+00 1/0 0/0 0/0 .data            daNpcPasser_METHODS */
 static actor_method_class daNpcPasser_METHODS = {
     (process_method_func)daNpcPasser_Create,
     (process_method_func)daNpcPasser_Delete,
@@ -1247,7 +1159,6 @@ static actor_method_class daNpcPasser_METHODS = {
     (process_method_func)daNpcPasser_Draw,
 };
 
-/* 80AA7390-80AA73C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PASSER */
 extern actor_process_profile_definition g_profile_NPC_PASSER = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp
index a83d9a4cb8..848693890f 100644
--- a/src/d/actor/d_a_npc_passer2.cpp
+++ b/src/d/actor/d_a_npc_passer2.cpp
@@ -26,18 +26,15 @@ int daNpcPasser2_c::createHeap() {
     return rv;
 }
 
-/* 80AA74D8-80AA755C 000078 0084+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c */
 static int createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcPasser2_c* actor = (daNpcPasser2_c*)i_this;
     return actor->createHeap();
 }
 
-/* 80AA8AA0-80AA8AB8 000038 0018+00 1/2 0/0 0/0 .data            ActionTable__14daNpcPasser2_c */
 daNpcPasser2_c::actionFunc daNpcPasser2_c::ActionTable[1][2] = {
     {&daNpcPasser2_c::initPath, &daNpcPasser2_c::executePath},
 };
 
-/* 80AA755C-80AA75A0 0000FC 0044+00 1/1 0/0 0/0 .text            setAction__14daNpcPasser2_cFQ214daNpcPasser2_c6Mode_e */
 void daNpcPasser2_c::setAction(daNpcPasser2_c::Mode_e i_action) {
     JUT_ASSERT(302, i_action < MODE_MAX_e);
     mPrevActionIdx = mActionIdx;
@@ -46,13 +43,11 @@ void daNpcPasser2_c::setAction(daNpcPasser2_c::Mode_e i_action) {
     callInit();
 }
 
-/* 80AA75A0-80AA75C8 000140 0028+00 1/1 0/0 0/0 .text            callInit__14daNpcPasser2_cFv */
 void daNpcPasser2_c::callInit() {
     JUT_ASSERT(320, mAction != NULL);
     (this->*mAction[0])();
 }
 
-/* 80AA75C8-80AA75F4 000168 002C+00 1/1 0/0 0/0 .text            callExecute__14daNpcPasser2_cFv */
 void daNpcPasser2_c::callExecute() {
     JUT_ASSERT(333, mAction != NULL);
     (this->*mAction[1])();
@@ -67,7 +62,6 @@ enum Rnd_Values {
     /* 0x5 */ FIVE,
 };
 
-/* 80AA75F4-80AA774C 000194 0158+00 1/0 0/0 0/0 .text            initPath__14daNpcPasser2_cFv */
 void daNpcPasser2_c::initPath() {
     if (getMoveType() == 1) {
         field_0xa3c = 1;
@@ -101,7 +95,6 @@ void daNpcPasser2_c::initPath() {
     field_0xa42 = 1;
 }
 
-/* 80AA774C-80AA78C4 0002EC 0178+00 1/0 0/0 0/0 .text            executePath__14daNpcPasser2_cFv */
 void daNpcPasser2_c::executePath() {
     if (m_path.checkPoint(current.pos, speedF)) {
         if (m_path.checkPathEnd(current.pos, speedF)) {
@@ -136,7 +129,6 @@ void daNpcPasser2_c::executePath() {
     mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 80AA790C-80AA7918 0004AC 000C+00 1/1 0/0 0/0 .text            setAngle__14daNpcPasser2_cFv */
 void daNpcPasser2_c::setAngle() {
     shape_angle.y = current.angle.y;
 }
@@ -159,7 +151,6 @@ void daNpcPasser2_c::setSpeed(f32 param_1, f32 param_2, f32* i_speed, int param_
     cLib_chaseF(i_speed, target, step);
 }
 
-/* 80AA7918-80AA7CB8 0004B8 03A0+00 1/1 0/0 0/0 .text            pathMoveF__14daNpcPasser2_cFv */
 void daNpcPasser2_c::pathMoveF() {
     f32 fVar1 = 0.0f;
     f32 speed = 0.0f;
@@ -206,12 +197,10 @@ void daNpcPasser2_c::pathMoveF() {
     mpMorf->setPlaySpeed(speed);
 }
 
-/* 80AA7CB8-80AA7CD8 000858 0020+00 1/0 0/0 0/0 .text            daNpcPasser2_Create__FPv */
 static int daNpcPasser2_Create(void* i_this) {
     return static_cast<daNpcPasser2_c*>(i_this)->create();
 }
 
-/* 80AA7CD8-80AA7F78 000878 02A0+00 1/1 0/0 0/0 .text            create__14daNpcPasser2_cFv */
 cPhs__Step daNpcPasser2_c::create() {
     fopAcM_ct(this, daNpcPasser2_c);
 
@@ -283,7 +272,6 @@ void daNpcPasser2_c::setBaseMtx() {
     setAttention(m_type);
 }
 
-/* 80AA7F78-80AA823C 000B18 02C4+00 1/1 0/0 0/0 .text            create_init__14daNpcPasser2_cFv */
 void daNpcPasser2_c::create_init() {
     #if DEBUG
     // NPC (C-class, D-class) Pedestrian High
@@ -317,13 +305,11 @@ void daNpcPasser2_c::create_init() {
     setBaseMtx();
 }
 
-/* 80AA823C-80AA8270 000DDC 0034+00 1/0 0/0 0/0 .text            daNpcPasser2_Delete__FPv */
 static int daNpcPasser2_Delete(void* i_this) {
     static_cast<daNpcPasser2_c*>(i_this)->~daNpcPasser2_c();
     return 1;
 }
 
-/* 80AA8270-80AA8304 000E10 0094+00 1/0 0/0 0/0 .text            __dt__14daNpcPasser2_cFv */
 daNpcPasser2_c::~daNpcPasser2_c() {
     if (m_type < 30 && m_objNum < 9) {
         removeResrc(m_type, m_objNum);
@@ -366,7 +352,6 @@ void daNpcPasser2_c::setCollision() {
     }
 }
 
-/* 80AA8304-80AA8500 000EA4 01FC+00 1/0 0/0 0/0 .text            daNpcPasser2_Execute__FPv */
 static int daNpcPasser2_Execute(void* i_this) {
     return static_cast<daNpcPasser2_c*>(i_this)->execute();
 }
@@ -377,17 +362,14 @@ int daNpcPasser2_c::draw() {
     return 1;
 }
 
-/* 80AA8500-80AA8578 0010A0 0078+00 1/0 0/0 0/0 .text            daNpcPasser2_Draw__FPv */
 static int daNpcPasser2_Draw(void* i_this) {
     return static_cast<daNpcPasser2_c*>(i_this)->draw();
 }
 
-/* 80AA8578-80AA8580 001118 0008+00 1/0 0/0 0/0 .text            daNpcPasser2_IsDelete__FPv */
 static int daNpcPasser2_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AA8AB8-80AA8AD8 -00001 0020+00 1/0 0/0 0/0 .data            daNpcPasser2_METHODS */
 static actor_method_class daNpcPasser2_METHODS = {
     (process_method_func)daNpcPasser2_Create,
     (process_method_func)daNpcPasser2_Delete,
@@ -396,7 +378,6 @@ static actor_method_class daNpcPasser2_METHODS = {
     (process_method_func)daNpcPasser2_Draw,
 };
 
-/* 80AA8AD8-80AA8B08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PASSER2 */
 extern actor_process_profile_definition g_profile_NPC_PASSER2 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp
index b4bc0ac875..2041dc4e12 100644
--- a/src/d/actor/d_a_npc_post.cpp
+++ b/src/d/actor/d_a_npc_post.cpp
@@ -200,7 +200,6 @@ void daNpc_Post_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80AAD3CC-80AAD3EC 000020 0020+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[4][2] = {
     {BMDR_POST, POST},
     {BMDR_POST_FLAG, POST},
@@ -208,7 +207,6 @@ static int l_bmdData[4][2] = {
     {BMDR_POST_LETTER_B, POST2},
 };
 
-/* 80AAD3EC-80AAD414 -00001 0028+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[5] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -217,7 +215,6 @@ static daNpcT_evtData_c l_evtList[5] = {
     {"DELIVERTO_WOLF", 2},
 };
 
-/* 80AAD414-80AAD424 -00001 0010+00 5/6 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[4] = {
     "",
     "post",
@@ -225,22 +222,18 @@ static char* l_resNameList[4] = {
     "post2",
 };
 
-/* 80AAD424-80AAD428 000078 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {
     POST, POST1, -1
 };
 
-/* 80AAD428-80AAD42C 00007C 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     POST, POST2, -1,
 };
 
-/* 80AAD42C-80AAD430 000080 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[4] = {
     POST, POST1, POST2, -1,
 };
 
-/* 80AAD430-80AAD440 -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
@@ -248,7 +241,6 @@ static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn9,
 };
 
-/* 80AAD440-80AAD5E4 000094 01A4+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_POST, J3DFrameCtrl::EMode_LOOP, POST, 1},
     {-1, J3DFrameCtrl::EMode_NONE, NONE, BTP_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, 0},
@@ -267,7 +259,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[15] = {
     {BCK_POST_FH_ANGRY, J3DFrameCtrl::EMode_LOOP, POST2, BTP_POST_FH_ANGRY, J3DFrameCtrl::EMode_LOOP, POST2, 0},
 };
 
-/* 80AAD5E4-80AAD750 000238 016C+00 2/3 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[13] = {
     {BCK_POST_WAIT_A, J3DFrameCtrl::EMode_LOOP, POST, BTK_POST, J3DFrameCtrl::EMode_NONE, POST, 1, 0},
     {BCK_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, BTK_POST_RUN, J3DFrameCtrl::EMode_LOOP, POST1, 0, 0},
@@ -284,7 +275,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[13] = {
     {BCK_POST_SIT_NOD, J3DFrameCtrl::EMode_NONE, POST2, BTK_POST_SIT_NOD, J3DFrameCtrl::EMode_NONE, POST2, 0, 0},
 };
 
-/* 80AAD750-80AAD840 0003A4 00F0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] = {
     {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -303,7 +293,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[60] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AAD840-80AAD8F0 000494 00B0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {4, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -318,22 +307,18 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {2, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AAD8F0-80AAD8F8 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Post_c */
 char* daNpc_Post_c::mCutNameList[2] = {
     "",
     "DELIVER",
 };
 
-/* 80AAD904-80AAD91C 000558 0018+00 2/2 0/0 0/0 .data            mCutList__12daNpc_Post_c */
 daNpc_Post_c::cutFunc daNpc_Post_c::mCutList[2] = {
     NULL,
     &daNpc_Post_c::cutDeliver,
 };
 
-/* 80AADC3C-80AADC40 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_POST_HIO_CLASS l_HIO;
 
-/* 80AA8C8C-80AA8DE8 0000EC 015C+00 1/0 0/0 0/0 .text            __dt__12daNpc_Post_cFv */
 daNpc_Post_c::~daNpc_Post_c() {
     OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
 
@@ -354,7 +339,6 @@ daNpc_Post_c::~daNpc_Post_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AAD1EC-80AAD280 000000 0094+00 12/12 0/0 0/0 .rodata          m__18daNpc_Post_Param_c */
 daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
     190.0f,
     -3.0f,
@@ -401,7 +385,6 @@ daNpc_Post_HIOParam const daNpc_Post_Param_c::m = {
     60,
 };
 
-/* 80AA8DE8-80AA90B0 000248 02C8+00 1/1 0/0 0/0 .text            create__12daNpc_Post_cFv */
 cPhs__Step daNpc_Post_c::create() {
     daNpcT_ct(this, daNpc_Post_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -469,7 +452,6 @@ cPhs__Step daNpc_Post_c::create() {
     return phase;
 }
 
-/* 80AA90B0-80AA9478 000510 03C8+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Post_cFv */
 int daNpc_Post_c::CreateHeap() {
     int bmdIdx = 0;
     int resIdx = l_bmdData[bmdIdx][1];
@@ -537,7 +519,6 @@ int daNpc_Post_c::CreateHeap() {
     return 0;
 }
 
-/* 80AA9634-80AA9668 000A94 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Post_cFv */
 int daNpc_Post_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -545,12 +526,10 @@ int daNpc_Post_c::Delete() {
     return 1;
 }
 
-/* 80AA9668-80AA9688 000AC8 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Post_cFv */
 int daNpc_Post_c::Execute() {
     return execute();
 }
 
-/* 80AA9688-80AA971C 000AE8 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Post_cFv */
 int daNpc_Post_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -566,13 +545,11 @@ int daNpc_Post_c::Draw() {
         0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80AA971C-80AA973C 000B7C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_Post_cFP10fopAc_ac_c */
 int daNpc_Post_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Post_c* actor = (daNpc_Post_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80AA973C-80AA9794 000B9C 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_Post_cFP8J3DJointi */
 int daNpc_Post_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -585,7 +562,6 @@ int daNpc_Post_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AA9794-80AA97E0 000BF4 004C+00 1/1 0/0 0/0 .text            getType__12daNpc_Post_cFv */
 u8 daNpc_Post_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -603,7 +579,6 @@ u8 daNpc_Post_c::getType() {
     }
 }
 
-/* 80AA97E0-80AA9828 000C40 0048+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -620,7 +595,6 @@ BOOL daNpc_Post_c::isDelete() {
     }
 }
 
-/* 80AA9828-80AA99F0 000C88 01C8+00 1/1 0/0 0/0 .text            reset__12daNpc_Post_cFv */
 void daNpc_Post_c::reset() {
     csXyz angle;
     int size = (u8*)&field_0x1014 - (u8*)&mNextAction;
@@ -662,7 +636,6 @@ void daNpc_Post_c::reset() {
     setAngle(angle);
 }
 
-/* 80AA99F0-80AA9A7C 000E50 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Post_cFi */
 void daNpc_Post_c::afterJntAnm(int i_joint) {
     if (i_joint == JNT_BACKBONE1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -673,7 +646,6 @@ void daNpc_Post_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 80AA9A7C-80AA9BA4 000EDC 0128+00 1/0 0/0 0/0 .text            setParam__12daNpc_Post_cFv */
 void daNpc_Post_c::setParam() {
     selectAction();
     srchActors();
@@ -709,7 +681,6 @@ void daNpc_Post_c::setParam() {
     pullOutLetter();
 }
 
-/* 80AA9BA4-80AA9C58 001004 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Post_c::talk)) {
         mPreItemNo = 0;
@@ -727,7 +698,6 @@ BOOL daNpc_Post_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80AA9C58-80AA9D04 0010B8 00AC+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Post_cFv */
 void daNpc_Post_c::setAfterTalkMotion() {
     int idx = FACE_MOT_NONE_2;
 
@@ -752,7 +722,6 @@ void daNpc_Post_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80AA9D04-80AA9D98 001164 0094+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Post_cFv */
 void daNpc_Post_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -771,7 +740,6 @@ void daNpc_Post_c::srchActors() {
     }
 }
 
-/* 80AA9D98-80AA9E98 0011F8 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::evtTalk() {
     if (chkAction(&daNpc_Post_c::talk)) {
         (this->*mAction)(NULL);
@@ -795,7 +763,6 @@ BOOL daNpc_Post_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AA9E98-80AA9F60 0012F8 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Post", this, -1);
     if (staffId != -1) {
@@ -812,7 +779,6 @@ BOOL daNpc_Post_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80AA9F60-80AAA058 0013C0 00F8+00 1/0 0/0 0/0 .text            action__12daNpc_Post_cFv */
 void daNpc_Post_c::action() {
     fopAc_ac_c* actor = NULL;
     actor = hitChk(&mCyl, 0xFFFFFFFF);
@@ -841,7 +807,6 @@ void daNpc_Post_c::action() {
     }
 }
 
-/* 80AAA058-80AAA124 0014B8 00CC+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Post_cFv */
 void daNpc_Post_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -856,7 +821,6 @@ void daNpc_Post_c::beforeMove() {
     mPrevPosY = current.pos.y;
 }
 
-/* 80AAA124-80AAA1E4 001584 00C0+00 1/0 0/0 0/0 .text            afterMoved__12daNpc_Post_cFv */
 void daNpc_Post_c::afterMoved() {
     if (mGroundH == -G_CM3D_F_INF) {
         cXyz pos(current.pos);
@@ -875,7 +839,6 @@ void daNpc_Post_c::afterMoved() {
     }
 }
 
-/* 80AAA1E4-80AAA570 001644 038C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Post_cFv */
 void daNpc_Post_c::setAttnPos() {
     cXyz work(-30.0f, 10.0f, 0.0f);
     cXyz sp7c(0.0f, 10.0f, 0.0f);
@@ -924,7 +887,6 @@ void daNpc_Post_c::setAttnPos() {
     }
 }
 
-/* 80AAA570-80AAA714 0019D0 01A4+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Post_cFv */
 void daNpc_Post_c::setCollision() {
     cXyz work;
 
@@ -972,7 +934,6 @@ void daNpc_Post_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80AAA714-80AAA71C 001B74 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Post_cFv */
 int daNpc_Post_c::drawDbgInfo() {
     #if DEBUG
     if (mHIO->m.common.debug_info_ON) {
@@ -988,7 +949,6 @@ int daNpc_Post_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AAA71C-80AAA8A4 001B7C 0188+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Post_cFv */
 void daNpc_Post_c::drawOtherMdl() {
     static int const jointNo[2] = {
         JNT_FINGERR, JNT_HANDR,
@@ -1023,7 +983,6 @@ void daNpc_Post_c::drawOtherMdl() {
     }
 }
 
-/* 80AAA8A4-80AAA968 001D04 00C4+00 1/1 0/0 0/0 .text            setFlagAnm__12daNpc_Post_cFiif */
 BOOL daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
     static daNpc_GetParam1 flagAnmData[13] = {
         {BCK_POST_FLAG_WAIT_A, POST},
@@ -1055,13 +1014,11 @@ BOOL daNpc_Post_c::setFlagAnm(int i_idx, int i_attr, f32 i_morf) {
     return TRUE;
 }
 
-/* 80AAA968-80AAA99C 001DC8 0034+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_Post_cFiifi */
 bool daNpc_Post_c::afterSetMotionAnm(int i_idx, int i_attr, f32 i_morf, int param_4) {
     f32 morf = mCreating == true ? 0.0f : i_morf;
     setFlagAnm(i_idx, i_attr, morf);
 }
 
-/* 80AAA99C-80AAA9E4 001DFC 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::selectAction() {
     mNextAction = NULL;
 
@@ -1081,12 +1038,10 @@ BOOL daNpc_Post_c::selectAction() {
     return TRUE;
 }
 
-/* 80AAA9E4-80AAAA10 001E44 002C+00 2/2 0/0 0/0 .text            chkAction__12daNpc_Post_cFM12daNpc_Post_cFPCvPvPv_i */
 BOOL daNpc_Post_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AAAA10-80AAAAB8 001E70 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_Post_cFM12daNpc_Post_cFPCvPvPv_i */
 BOOL daNpc_Post_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -1104,7 +1059,6 @@ BOOL daNpc_Post_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80AAAAB8-80AAAB2C 001F18 0074+00 1/1 0/0 0/0 .text            chkPullOutLetter1__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::chkPullOutLetter1() {
     if (mType == TYPE_DELIVER) {
         J3DAnmTransform* anm = NULL;
@@ -1115,7 +1069,6 @@ BOOL daNpc_Post_c::chkPullOutLetter1() {
     return false;
 }
 
-/* 80AAAB2C-80AAABA0 001F8C 0074+00 1/1 0/0 0/0 .text            chkPullOutLetter2__12daNpc_Post_cFv */
 BOOL daNpc_Post_c::chkPullOutLetter2() {
     if (mType == TYPE_DELIVER) {
         J3DAnmTransform* anm = NULL;
@@ -1126,7 +1079,6 @@ BOOL daNpc_Post_c::chkPullOutLetter2() {
     return false;
 }
 
-/* 80AAABA0-80AAAC64 002000 00C4+00 1/1 0/0 0/0 .text            pullOutLetter__12daNpc_Post_cFv */
 void daNpc_Post_c::pullOutLetter() {
     u8 uVar1 = mLetterADispFlag;
 
@@ -1146,12 +1098,10 @@ void daNpc_Post_c::pullOutLetter() {
     }
 }
 
-/* 80AAD324-80AAD32C 000138 0008+00 0/0 0/0 0/0 .rodata          @5155 */
 static int const dummy[2] = {
     -1, -1,
 };
 
-/* 80AAAC64-80AAB61C 0020C4 09B8+00 3/0 0/0 0/0 .text            cutDeliver__12daNpc_Post_cFi */
 int daNpc_Post_c::cutDeliver(int i_staffId) {
     cXyz work;
     csXyz angle;
@@ -1414,7 +1364,6 @@ int daNpc_Post_c::cutDeliver(int i_staffId) {
     return rv;
 }
 
-/* 80AAB61C-80AABC24 002A7C 0608+00 1/0 0/0 0/0 .text            wait__12daNpc_Post_cFPv */
 int daNpc_Post_c::wait(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 fVar1 = mHIO->m.nod_interval;
@@ -1523,7 +1472,6 @@ int daNpc_Post_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AABC24-80AABE04 003084 01E0+00 3/0 0/0 0/0 .text            talk__12daNpc_Post_cFPv */
 int daNpc_Post_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -1583,34 +1531,28 @@ int daNpc_Post_c::test(void* param_1) {
     return 1;
 }
 
-/* 80AABE04-80AABE24 003264 0020+00 1/0 0/0 0/0 .text            daNpc_Post_Create__FPv */
 static int daNpc_Post_Create(void* i_this) {
     return static_cast<daNpc_Post_c*>(i_this)->create();
 }
 
-/* 80AABE24-80AABE44 003284 0020+00 1/0 0/0 0/0 .text            daNpc_Post_Delete__FPv */
 static int daNpc_Post_Delete(void* i_this) {
     return static_cast<daNpc_Post_c*>(i_this)->Delete();
 }
 
-/* 80AABE44-80AABE64 0032A4 0020+00 1/0 0/0 0/0 .text            daNpc_Post_Execute__FPv */
 static int daNpc_Post_Execute(void* i_this) {
     return static_cast<daNpc_Post_c*>(i_this)->Execute();
 }
 
-/* 80AABE64-80AABE84 0032C4 0020+00 1/0 0/0 0/0 .text            daNpc_Post_Draw__FPv */
 static int daNpc_Post_Draw(void* i_this) {
     return static_cast<daNpc_Post_c*>(i_this)->Draw();
 }
 
-/* 80AABE84-80AABE8C 0032E4 0008+00 1/0 0/0 0/0 .text            daNpc_Post_IsDelete__FPv */
 static int daNpc_Post_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80AADA1C-80AADA3C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Post_MethodTable */
 static actor_method_class daNpc_Post_MethodTable = {
     (process_method_func)daNpc_Post_Create,
     (process_method_func)daNpc_Post_Delete,
@@ -1619,7 +1561,6 @@ static actor_method_class daNpc_Post_MethodTable = {
     (process_method_func)daNpc_Post_Draw,
 };
 
-/* 80AADA3C-80AADA6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_POST */
 extern actor_process_profile_definition g_profile_NPC_POST = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp
index d1d1e41d80..c031090c8f 100644
--- a/src/d/actor/d_a_npc_pouya.cpp
+++ b/src/d/actor/d_a_npc_pouya.cpp
@@ -7,7 +7,6 @@
 
 #include "d/actor/d_a_npc_pouya.h"
 
-/* 80AB2000-80AB208C 000000 008C+00 8/8 0/0 0/0 .rodata          m__19daNpc_Pouya_Param_c */
 const daNpc_Pouya_HIOParam daNpc_Pouya_Param_c::m = {
     120.0f,  // attention_offset
     -3.0f,   // gravity
@@ -66,14 +65,12 @@ void daNpc_Pouya_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80AB2210-80AB2228 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {26, 1},
     {23, 1},
     {34, 2},
 };
 
-/* 80AB2228-80AB2270 -00001 0048+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[9] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -86,25 +83,20 @@ static daNpcT_evtData_c l_evtList[9] = {
     {"RETURN_FAVOR_2_02", 2},
 };
 
-/* 80AB2270-80AB227C -00001 000C+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "pouyaA",
     "pouyaB",
 };
 
-/* 80AB227C-80AB2280 00008C 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80AB2280-80AB2284 000090 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[2] = {2, -1};
 
-/* 80AB2284-80AB229C -00001 0018+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[6] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn0,
 };
 
-/* 80AB229C-80AB245C 0000AC 01C0+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {-1, 0, 0, -1, 0, 0, 0}, {11, 0, 1, -1, 0, 0, 0}, {8, 2, 1, -1, 0, 0, 0},
     {9, 0, 1, -1, 0, 0, 0},  {10, 0, 1, -1, 0, 0, 0}, {12, 2, 1, -1, 0, 0, 0},
@@ -114,7 +106,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {18, 2, 2, 51, 2, 2, 0},
 };
 
-/* 80AB245C-80AB2734 00026C 02D8+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[26] = {
     {18, 2, 1, 36, 2, 1, 0, 0}, {19, 2, 1, 36, 2, 1, 0, 0}, {20, 2, 1, 36, 2, 1, 0, 0},
     {13, 0, 1, 36, 2, 1, 0, 0}, {16, 0, 1, 36, 2, 1, 0, 0}, {17, 2, 1, 36, 2, 1, 0, 0},
@@ -127,7 +118,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[26] = {
     {26, 0, 2, 37, 0, 2, 1, 0}, {23, 0, 2, 37, 0, 2, 1, 0},
 };
 
-/* 80AB2734-80AB2854 000544 0120+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}, {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}, {-1, 0, 0},  {1, -1, 1},  {-1, 0, 0},
@@ -142,7 +132,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] =
     {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80AB2854-80AB2984 000664 0130+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {1, -1, 0},  {-1, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {3, -1, 1},  {1, 0, 0},   {-1, 0, 0},  {-1, 0, 0},  {4, -1, 1},  {5, 0, 0},
@@ -157,21 +146,18 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[76] = {
     {-1, 0, 0},  {-1, 0, 0},  {25, -1, 1}, {10, 0, 0},  {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80AB2984-80AB2990 -00001 000C+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Pouya_c */
 char* daNpc_Pouya_c::mCutNameList[3] = {
     "",
     "HAVE_FAVORTO_ASK",
     "RETURN_FAVOR",
 };
 
-/* 80AB29A8-80AB29CC 0007B8 0024+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Pouya_c */
 daNpc_Pouya_c::cutFunc daNpc_Pouya_c::mCutList[3] = {
     NULL,
     &daNpc_Pouya_c::cutHaveFavorToAsk,
     &daNpc_Pouya_c::cutHaveFavorToAsk,
 };
 
-/* 80AADDAC-80AADEE0 0000EC 0134+00 1/0 0/0 0/0 .text            __dt__13daNpc_Pouya_cFv */
 daNpc_Pouya_c::~daNpc_Pouya_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -180,7 +166,6 @@ daNpc_Pouya_c::~daNpc_Pouya_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AADEE0-80AAE1AC 000220 02CC+00 1/1 0/0 0/0 .text            create__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::create() {
     static int const heapSize[6] = {
         0x8000, 0x5440, 0x3680, 0x3680, 0x8000, 0x8000,
@@ -229,7 +214,6 @@ int daNpc_Pouya_c::create() {
     return phase;
 }
 
-/* 80AAE1AC-80AAE5CC 0004EC 0420+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::CreateHeap() {
     static int const bmdTypeList[1] = {1};
 
@@ -296,19 +280,16 @@ int daNpc_Pouya_c::CreateHeap() {
     return 0;
 }
 
-/* 80AAE788-80AAE7BC 000AC8 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Pouya_c();
     return 1;
 }
 
-/* 80AAE7BC-80AAE7DC 000AFC 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80AAE7DC-80AAE870 000B1C 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -317,14 +298,10 @@ int daNpc_Pouya_c::Draw() {
     return daNpcT_c::draw(0, 1, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80AAE870-80AAE890 000BB0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Pouya_cFP10fopAc_ac_c            */
 int daNpc_Pouya_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Pouya_c*>(i_this)->CreateHeap();
 }
 
-/* 80AAE890-80AAE8E8 000BD0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Pouya_cFP8J3DJointi               */
 int daNpc_Pouya_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -338,7 +315,6 @@ int daNpc_Pouya_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80AAE8E8-80AAE94C 000C28 0064+00 1/1 0/0 1/1 .text            getType__13daNpc_Pouya_cFv */
 u8 daNpc_Pouya_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -355,7 +331,6 @@ u8 daNpc_Pouya_c::getType() {
     return TYPE_5;
 }
 
-/* 80AAE94C-80AAE9D8 000C8C 008C+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Pouya_cFv */
 BOOL daNpc_Pouya_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -375,7 +350,6 @@ BOOL daNpc_Pouya_c::isDelete() {
     return FALSE;
 }
 
-/* 80AAE9D8-80AAEBCC 000D18 01F4+00 1/1 0/0 0/0 .text            reset__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::reset() {
     csXyz cStack_10;
     int size = (u8*)&field_0xfd0 - (u8*)&field_0xfb0;
@@ -415,7 +389,6 @@ void daNpc_Pouya_c::reset() {
     setAngle(cStack_10);
 }
 
-/* 80AAEBCC-80AAEDB8 000F0C 01EC+00 2/0 0/0 0/0 .text ctrlSubFaceMotion__13daNpc_Pouya_cFi */
 void daNpc_Pouya_c::ctrlSubFaceMotion(int param_1) {
     static int normal[3] = {31, 2, 1};
 
@@ -498,7 +471,6 @@ void daNpc_Pouya_c::ctrlSubFaceMotion(int param_1) {
     }
 }
 
-/* 80AAEDB8-80AAEE44 0010F8 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Pouya_cFi */
 void daNpc_Pouya_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -509,7 +481,6 @@ void daNpc_Pouya_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80AAEE44-80AAEFB4 001184 0170+00 1/0 0/0 0/0 .text            setParam__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::setParam() {
     selectAction();
     srchActors();
@@ -559,8 +530,6 @@ void daNpc_Pouya_c::setParam() {
     gravity = 0.0f;
 }
 
-/* 80AAEFB4-80AAF148 0012F4 0194+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Pouya_cFv
- */
 BOOL daNpc_Pouya_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Pouya_c::talk)) {
         mPreItemNo = 0;
@@ -616,7 +585,6 @@ BOOL daNpc_Pouya_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80AAF148-80AAF1F0 001488 00A8+00 2/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::setAfterTalkMotion() {
     int iVar2 = FACE_MOT_UNK_17;
 
@@ -646,10 +614,8 @@ void daNpc_Pouya_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80AAF1F0-80AAF1F4 001530 0004+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::srchActors() {}
 
-/* 80AAF1F4-80AAF294 001534 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Pouya_cFv */
 BOOL daNpc_Pouya_c::evtTalk() {
     if (chkAction(&daNpc_Pouya_c::talk)) {
         (this->*mAction)(NULL);
@@ -659,7 +625,6 @@ BOOL daNpc_Pouya_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AAF294-80AAF35C 0015D4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Pouya_cFv */
 BOOL daNpc_Pouya_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Pouya", this, -1);
     if (staffId != -1) {
@@ -674,7 +639,6 @@ BOOL daNpc_Pouya_c::evtCutProc() {
     return false;
 }
 
-/* 80AAF35C-80AAF4F8 00169C 019C+00 1/0 0/0 0/0 .text            action__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::action() {
     fopAc_ac_c* hit_actor = hitChk(&mCyl, 0xFFFFFFFF);
 
@@ -702,7 +666,6 @@ void daNpc_Pouya_c::action() {
     }
 }
 
-/* 80AAF4F8-80AAF5BC 001838 00C4+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -713,7 +676,6 @@ void daNpc_Pouya_c::beforeMove() {
     }
 }
 
-/* 80AAF5BC-80AAF8E4 0018FC 0328+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::setAttnPos() {
     cXyz acStack_40(20.0f, 30.0f, 0.0f);
     cXyz cStack_4c(20.0f, 0.0f, 0.0f);
@@ -758,7 +720,6 @@ void daNpc_Pouya_c::setAttnPos() {
     }
 }
 
-/* 80AAF8E4-80AAFA5C 001C24 0178+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::setCollision() {
     cXyz cStack_48;
 
@@ -802,12 +763,10 @@ void daNpc_Pouya_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80AAFA5C-80AAFA64 001D9C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AAFA64-80AAFB4C 001DA4 00E8+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::drawOtherMdl() {
     static int const jointNo[1] = {4};
 
@@ -828,7 +787,6 @@ void daNpc_Pouya_c::drawOtherMdl() {
     }
 }
 
-/* 80AAFB4C-80AAFBDC 001E8C 0090+00 1/0 0/0 0/0 .text afterSetMotionAnm__13daNpc_Pouya_cFiifi */
 bool daNpc_Pouya_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int param_3) {
     switch (param_0) {
     case 8:
@@ -841,7 +799,6 @@ bool daNpc_Pouya_c::afterSetMotionAnm(int param_0, int param_1, f32 param_2, int
     return true;
 }
 
-/* 80AAFBDC-80AAFC24 001F1C 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Pouya_cFv */
 int daNpc_Pouya_c::selectAction() {
     field_0xfb0 = NULL;
 
@@ -853,14 +810,10 @@ int daNpc_Pouya_c::selectAction() {
     return 1;
 }
 
-/* 80AAFC24-80AAFC50 001F64 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Pouya_cFM13daNpc_Pouya_cFPCvPvPv_i        */
 BOOL daNpc_Pouya_c::chkAction(actionFunc param_0) {
     return mAction == param_0;
 }
 
-/* 80AAFC50-80AAFCF8 001F90 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Pouya_cFM13daNpc_Pouya_cFPCvPvPv_i        */
 int daNpc_Pouya_c::setAction(actionFunc param_0) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -876,7 +829,6 @@ int daNpc_Pouya_c::setAction(actionFunc param_0) {
     return 1;
 }
 
-/* 80AAFCF8-80AAFE08 002038 0110+00 1/1 0/0 0/0 .text            setPrtcls__13daNpc_Pouya_cFv */
 void daNpc_Pouya_c::setPrtcls() {
     JGeometry::TVec3<s16> emitter_rot;
     cXyz cStack_14;
@@ -896,7 +848,6 @@ void daNpc_Pouya_c::setPrtcls() {
     }
 }
 
-/* 80AAFE08-80AB04A8 002148 06A0+00 4/0 0/0 0/0 .text cutHaveFavorToAsk__13daNpc_Pouya_cFi */
 int daNpc_Pouya_c::cutHaveFavorToAsk(int param_0) {
     cXyz acStack_48;
     csXyz cStack_50;
@@ -1065,7 +1016,6 @@ int daNpc_Pouya_c::cutHaveFavorToAsk(int param_0) {
     return rv;
 }
 
-/* 80AB04A8-80AB0A7C 0027E8 05D4+00 1/0 0/0 0/0 .text            wait__13daNpc_Pouya_cFPv */
 int daNpc_Pouya_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1163,7 +1113,6 @@ int daNpc_Pouya_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80AB0A7C-80AB0CFC 002DBC 0280+00 3/0 0/0 0/0 .text            talk__13daNpc_Pouya_cFPv */
 int daNpc_Pouya_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1220,42 +1169,34 @@ int daNpc_Pouya_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80AB0CFC-80AB0D1C 00303C 0020+00 1/0 0/0 0/0 .text            daNpc_Pouya_Create__FPv */
 static int daNpc_Pouya_Create(void* i_this) {
     return static_cast<daNpc_Pouya_c*>(i_this)->create();
 }
 
-/* 80AB0D1C-80AB0D3C 00305C 0020+00 1/0 0/0 0/0 .text            daNpc_Pouya_Delete__FPv */
 static int daNpc_Pouya_Delete(void* i_this) {
     return static_cast<daNpc_Pouya_c*>(i_this)->Delete();
 }
 
-/* 80AB0D3C-80AB0D5C 00307C 0020+00 1/0 0/0 0/0 .text            daNpc_Pouya_Execute__FPv */
 static int daNpc_Pouya_Execute(void* i_this) {
     return static_cast<daNpc_Pouya_c*>(i_this)->Execute();
 }
 
-/* 80AB0D5C-80AB0D7C 00309C 0020+00 1/0 0/0 0/0 .text            daNpc_Pouya_Draw__FPv */
 static int daNpc_Pouya_Draw(void* i_this) {
     return static_cast<daNpc_Pouya_c*>(i_this)->Draw();
 }
 
-/* 80AB0D7C-80AB0D84 0030BC 0008+00 1/0 0/0 0/0 .text            daNpc_Pouya_IsDelete__FPv */
 static bool daNpc_Pouya_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AB2CFC-80AB2D00 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_POUYA_HIO_CLASS l_HIO;
 
-/* 80AB2B1C-80AB2B3C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Pouya_MethodTable */
 static actor_method_class daNpc_Pouya_MethodTable = {
     (process_method_func)daNpc_Pouya_Create,  (process_method_func)daNpc_Pouya_Delete,
     (process_method_func)daNpc_Pouya_Execute, (process_method_func)daNpc_Pouya_IsDelete,
     (process_method_func)daNpc_Pouya_Draw,
 };
 
-/* 80AB2B3C-80AB2B6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_POUYA */
 extern actor_process_profile_definition g_profile_NPC_POUYA = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp
index f26bf2ce04..e11f4eb07f 100644
--- a/src/d/actor/d_a_npc_prayer.cpp
+++ b/src/d/actor/d_a_npc_prayer.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_npc_prayer.h"
 #include "d/d_com_inf_game.h"
 
-/* 80AB5BB4-80AB5BB8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcPray_Param_c l_HIO;
 
-/* 80AB59A4-80AB59EC 000020 0048+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static struct {
     int resIdx;
     int anmMode;
@@ -32,31 +30,25 @@ enum daNpcPray_MOTION_e {
     MOTION_WOLF_e,
 };
 
-/* 80AB59EC-80AB59F4 -00001 0008+00 4/5 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[2] = {
     "Prayer",
     "Wgeneral",
 };
 
-/* 80AB59F4-80AB59FC -00001 0008+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "GET_HEART",
 };
 
-/* 80AB59FC-80AB5A00 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Prayer";
 
-/* 80AB5A0C-80AB5A24 000088 0018+00 1/2 0/0 0/0 .data            mEvtSeqList__11daNpcPray_c */
 daNpcPray_c::EvtSeq daNpcPray_c::mEvtSeqList[] = {
     NULL,
     &daNpcPray_c::_Evt_GetHeart,
 };
 
-/* 80AB2DEC-80AB2F70 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcPray_cFv */
 daNpcPray_c::daNpcPray_c() {}
 
-/* 80AB3000-80AB3204 000300 0204+00 1/0 0/0 0/0 .text            __dt__11daNpcPray_cFv */
 daNpcPray_c::~daNpcPray_c() {
     for (int i = 0; i < 2; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[i]);
@@ -73,7 +65,6 @@ daNpcPray_c::~daNpcPray_c() {
     }
 }
 
-/* 80AB5808-80AB5874 000000 006C+00 14/14 0/0 0/0 .rodata          m__17daNpcPray_Param_c */
 const daNpcPray_HIOParam daNpcPray_Param_c::m = {
     55.0f,
     -3.0f,
@@ -110,7 +101,6 @@ const daNpcPray_HIOParam daNpcPray_Param_c::m = {
     false,
 };
 
-/* 80AB3204-80AB348C 000504 0288+00 1/1 0/0 0/0 .text            Create__11daNpcPray_cFv */
 int daNpcPray_c::Create() {
     fopAcM_ct(this, daNpcPray_c);
 
@@ -160,7 +150,6 @@ int daNpcPray_c::Create() {
     return phase_state;
 }
 
-/* 80AB348C-80AB3610 00078C 0184+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcPray_cFv */
 int daNpcPray_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9);
     JUT_ASSERT(313, NULL != mdlData_p);
@@ -189,27 +178,22 @@ int daNpcPray_c::CreateHeap() {
     return 1;
 }
 
-/* 80AB3610-80AB3644 000910 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcPray_cFv */
 int daNpcPray_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpcPray_c();
     return 1;
 }
 
-/* 80AB3644-80AB3668 000944 0024+00 2/2 0/0 0/0 .text            Execute__11daNpcPray_cFv */
 int daNpcPray_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80AB3668-80AB36A8 000968 0040+00 1/1 0/0 0/0 .text            Draw__11daNpcPray_cFv */
 int daNpcPray_c::Draw() {
     draw(FALSE, FALSE, daNpcPray_Param_c::m.common.real_shadow_size, NULL, FALSE);
     return 1;
 }
 
-/* 80AB36A8-80AB3834 0009A8 018C+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpcPray_cFP8J3DJointP8J3DModel                */
 int daNpcPray_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     int spC[] = {1, 2, 3};
@@ -240,14 +224,10 @@ int daNpcPray_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AB3834-80AB3854 000B34 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpcPray_cFP10fopAc_ac_c              */
 int daNpcPray_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpcPray_c*)i_this)->CreateHeap();
 }
 
-/* 80AB3854-80AB38A0 000B54 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcPray_cFP8J3DJointi
- */
 int daNpcPray_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model_p = j3dSys.getModel();
@@ -260,7 +240,6 @@ int daNpcPray_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80AB38A0-80AB390C 000BA0 006C+00 1/0 0/0 0/0 .text            setParam__11daNpcPray_cFv */
 void daNpcPray_c::setParam() {
     attention_info.distances[fopAc_attn_LOCK_e] = getDistTableIdx(daNpcPray_Param_c::m.common.attention_distance, daNpcPray_Param_c::m.common.attention_angle);
     attention_info.distances[fopAc_attn_TALK_e] = attention_info.distances[fopAc_attn_LOCK_e];
@@ -275,7 +254,6 @@ void daNpcPray_c::setParam() {
 #endif
 }
 
-/* 80AB390C-80AB3964 000C0C 0058+00 1/0 0/0 0/0 .text            main__11daNpcPray_cFv */
 BOOL daNpcPray_c::main() {
     if (mAction != NULL) {
         (this->*mAction)(NULL);
@@ -285,7 +263,6 @@ BOOL daNpcPray_c::main() {
     return FALSE;
 }
 
-/* 80AB3964-80AB3B0C 000C64 01A8+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcPray_cFv */
 void daNpcPray_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -321,7 +298,6 @@ void daNpcPray_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80AB3B0C-80AB3BDC 000E0C 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcPray_cFif */
 void daNpcPray_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* bck_p = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcnameIdx], l_bckGetParamList[i_idx].resIdx);
     int anmMode = l_bckGetParamList[i_idx].anmMode;
@@ -333,7 +309,6 @@ void daNpcPray_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AB3BDC-80AB3C24 000EDC 0048+00 1/0 0/0 0/0 .text            setMotion__11daNpcPray_cFifi */
 void daNpcPray_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     s16 var_r31 = i_motion;
     if ((param_2 != 0 || mMotion != var_r31) && i_motion >= 0 && i_motion < 4) {
@@ -345,12 +320,10 @@ void daNpcPray_c::setMotion(int i_motion, f32 i_morf, int param_2) {
     }
 }
 
-/* 80AB3C24-80AB3C2C 000F24 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcPray_cFv */
 BOOL daNpcPray_c::drawDbgInfo() {
     return false;
 }
 
-/* 80AB3C2C-80AB3DBC 000F2C 0190+00 1/1 0/0 0/0 .text            reset__11daNpcPray_cFv */
 void daNpcPray_c::reset() {
     initialize();
     mLookat.initialize();
@@ -383,7 +356,6 @@ void daNpcPray_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 80AB3DBC-80AB3F54 0010BC 0198+00 1/1 0/0 0/0 .text            playMotion__11daNpcPray_cFv */
 void daNpcPray_c::playMotion() {
     daNpcF_anmPlayData wait_phase1 = {2, daNpcPray_Param_c::m.common.morf_frame, 0};
     daNpcF_anmPlayData* wait_m[] = {&wait_phase1};
@@ -407,8 +379,6 @@ void daNpcPray_c::playMotion() {
     }
 }
 
-/* 80AB3F54-80AB3FFC 001254 00A8+00 4/4 0/0 0/0 .text
- * setAction__11daNpcPray_cFM11daNpcPray_cFPCvPvPv_b            */
 int daNpcPray_c::setAction(bool (daNpcPray_c::*i_action)(void*)) {
     mActionMode = 3;
     if (mAction != NULL) {
@@ -425,14 +395,12 @@ int daNpcPray_c::setAction(bool (daNpcPray_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 80AB3FFC-80AB4020 0012FC 0024+00 2/2 0/0 0/0 .text            setLookMode__11daNpcPray_cFi */
 void daNpcPray_c::setLookMode(int i_mode) {
     if (i_mode >= 0 && i_mode < 4 && i_mode != mLookMode) {
         mLookMode = i_mode;
     }
 }
 
-/* 80AB4020-80AB4200 001320 01E0+00 1/1 0/0 0/0 .text            lookat__11daNpcPray_cFv */
 void daNpcPray_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model_p = mAnm_p->getModel();
@@ -485,7 +453,6 @@ void daNpcPray_c::lookat() {
     mLookat.calc(this, model_p->getBaseTRMtx(), sp24, var_r28, temp_r26, 0);
 }
 
-/* 80AB4200-80AB42F4 001500 00F4+00 2/2 0/0 0/0 .text            step__11daNpcPray_cFsi */
 bool daNpcPray_c::step(s16 i_targetAngle, int) {
     if (mTurnMode == 0) {
         mTurnTargetAngle = i_targetAngle;
@@ -512,7 +479,6 @@ bool daNpcPray_c::step(s16 i_targetAngle, int) {
     return mTurnMode > 1;
 }
 
-/* 80AB42F4-80AB43D8 0015F4 00E4+00 1/1 0/0 0/0 .text            chkFindPlayer__11daNpcPray_cFv */
 bool daNpcPray_c::chkFindPlayer() {
     if (!chkActorInSight(daPy_getPlayerActorClass(), daNpcPray_Param_c::m.common.fov)) {
         mActorMngr[0].remove();
@@ -535,7 +501,6 @@ bool daNpcPray_c::chkFindPlayer() {
     return find_player;
 }
 
-/* 80AB43D8-80AB4674 0016D8 029C+00 3/0 0/0 0/0 .text            wait__11daNpcPray_cFPv */
 bool daNpcPray_c::wait(void*) {
     switch (mActionMode) {
     case 0:
@@ -589,7 +554,6 @@ bool daNpcPray_c::wait(void*) {
     return 1;
 }
 
-/* 80AB4674-80AB4740 001974 00CC+00 1/0 0/0 0/0 .text            fear__11daNpcPray_cFPv */
 bool daNpcPray_c::fear(void*) {
     switch (mActionMode) {
     case 0:
@@ -615,7 +579,6 @@ bool daNpcPray_c::fear(void*) {
     return 1;
 }
 
-/* 80AB4740-80AB498C 001A40 024C+00 1/0 0/0 0/0 .text            talk__11daNpcPray_cFPv */
 bool daNpcPray_c::talk(void*) {
     int sp20 = 0;
     bool var_r28 = 0;
@@ -678,7 +641,6 @@ bool daNpcPray_c::talk(void*) {
     return var_r28;
 }
 
-/* 80AB498C-80AB4B20 001C8C 0194+00 2/0 0/0 0/0 .text            demo__11daNpcPray_cFPv */
 bool daNpcPray_c::demo(void*) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int var_r25 = 0;
@@ -728,7 +690,6 @@ bool daNpcPray_c::demo(void*) {
     return 1;
 }
 
-/* 80AB4B20-80AB4BFC 001E20 00DC+00 1/1 0/0 0/0 .text            createHeart__11daNpcPray_cFv */
 fpc_ProcID daNpcPray_c::createHeart() {
     cXyz pos(-4142.7036f, 850.0f, -569.3754f);
     csXyz rot(0, 0, 0);
@@ -741,7 +702,6 @@ fpc_ProcID daNpcPray_c::createHeart() {
     return fopAcM_createItemForBoss(&pos, fpcNm_ITEM_KAKERA_HEART, fopAcM_GetRoomNo(this), &rot, &size, 0.0f, 0.0f, 0);
 }
 
-/* 80AB4BFC-80AB4CA4 001EFC 00A8+00 1/0 0/0 0/0 .text            _Evt_GetHeart__11daNpcPray_cFi */
 BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     int cutId = -1;
@@ -760,7 +720,6 @@ BOOL daNpcPray_c::_Evt_GetHeart(int i_staffID) {
     return _Evt_GetHeart_CutMain(cutId);
 }
 
-/* 80AB4CA4-80AB4D34 001FA4 0090+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutInit__11daNpcPray_cFRCi */
 BOOL daNpcPray_c::_Evt_GetHeart_CutInit(const int& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -784,7 +743,6 @@ BOOL daNpcPray_c::_Evt_GetHeart_CutInit(const int& i_cutId) {
     return 1;
 }
 
-/* 80AB4D34-80AB4E88 002034 0154+00 1/1 0/0 0/0 .text _Evt_GetHeart_CutMain__11daNpcPray_cFRCi */
 BOOL daNpcPray_c::_Evt_GetHeart_CutMain(int const& i_cutId) {
     BOOL var_r28 = 0;
 
@@ -838,32 +796,26 @@ BOOL daNpcPray_c::_Evt_GetHeart_CutMain(int const& i_cutId) {
     return var_r28;
 }
 
-/* 80AB4E88-80AB4EA8 002188 0020+00 1/0 0/0 0/0 .text            daNpcPray_Create__FPv */
 static int daNpcPray_Create(void* i_this) {
     return ((daNpcPray_c*)i_this)->Create();
 }
 
-/* 80AB4EA8-80AB4EC8 0021A8 0020+00 1/0 0/0 0/0 .text            daNpcPray_Delete__FPv */
 static int daNpcPray_Delete(void* i_this) {
     return ((daNpcPray_c*)i_this)->Delete();
 }
 
-/* 80AB4EC8-80AB4EE8 0021C8 0020+00 1/0 0/0 0/0 .text            daNpcPray_Execute__FPv */
 static int daNpcPray_Execute(void* i_this) {
     return ((daNpcPray_c*)i_this)->Execute();
 }
 
-/* 80AB4EE8-80AB4F08 0021E8 0020+00 1/0 0/0 0/0 .text            daNpcPray_Draw__FPv */
 static int daNpcPray_Draw(void* i_this) {
     return ((daNpcPray_c*)i_this)->Draw();
 }
 
-/* 80AB4F08-80AB4F10 002208 0008+00 1/0 0/0 0/0 .text            daNpcPray_IsDelete__FPv */
 static int daNpcPray_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AB5A78-80AB5A98 -00001 0020+00 1/0 0/0 0/0 .data            daNpcPray_MethodTable */
 static actor_method_class daNpcPray_MethodTable = {
     (process_method_func)daNpcPray_Create,
     (process_method_func)daNpcPray_Delete,
@@ -872,7 +824,6 @@ static actor_method_class daNpcPray_MethodTable = {
     (process_method_func)daNpcPray_Draw,
 };
 
-/* 80AB5A98-80AB5AC8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_PRAYER */
 extern actor_process_profile_definition g_profile_NPC_PRAYER = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp
index b753282fef..f6b1269912 100644
--- a/src/d/actor/d_a_npc_raca.cpp
+++ b/src/d/actor/d_a_npc_raca.cpp
@@ -79,35 +79,29 @@ enum Type {
     /* 0x1 */ TYPE_1,
 };
 
-/* 80AB8FDC-80AB8FE4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_RACA, RACA},
 };
 
-/* 80AB8FE4-80AB8FF4 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80AB8FF4-80AB8FFC -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Raca",
 };
 
-/* 80AB8FFC-80AB9000 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1,
 };
 
-/* 80AB9000-80AB9008 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80AB9008-80AB90E8 00004C 00E0+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, 32, J3DFrameCtrl::EMode_LOOP, RACA, 1},
     {BCK_RACA_F_TALK_A, J3DFrameCtrl::EMode_NONE, RACA, BTP_RACA, J3DFrameCtrl::EMode_LOOP, RACA, 1},
@@ -119,7 +113,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[8] = {
     {BCK_RACA_FH_BITTERSMILE, J3DFrameCtrl::EMode_LOOP, RACA, BTP_RACA_FH_BITTERSMILE, J3DFrameCtrl::EMode_LOOP, RACA, 0},
 };
 
-/* 80AB90E8-80AB9200 00012C 0118+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {BCK_RACA_WAIT_A, J3DFrameCtrl::EMode_LOOP, RACA, BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0},
     {BCK_RACA_GIVEME, J3DFrameCtrl::EMode_LOOP, RACA, BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0},
@@ -133,7 +126,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[10] = {
     {BCK_RACA_STEP, J3DFrameCtrl::EMode_NONE, RACA,BTK_RACA, J3DFrameCtrl::EMode_NONE, RACA, 1, 0},
 };
 
-/* 80AB9200-80AB9280 000244 0080+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {5, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -145,7 +137,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[32] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AB9280-80AB9310 0002C4 0090+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -158,15 +149,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[36] = {
     {9, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AB9310-80AB9314 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Raca_c */
 char* daNpc_Raca_c::mCutNameList = "";
 
-/* 80AB9314-80AB9320 000358 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_Raca_c */
 daNpc_Raca_c::cutFunc daNpc_Raca_c::mCutList[1] = {
     NULL,
 };
 
-/* 80AB5CAC-80AB5DFC 0000EC 0150+00 1/0 0/0 0/0 .text            __dt__12daNpc_Raca_cFv */
 daNpc_Raca_c::~daNpc_Raca_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -175,7 +163,6 @@ daNpc_Raca_c::~daNpc_Raca_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AB8EC8-80AB8F54 000000 008C+00 6/6 0/0 0/0 .rodata          m__18daNpc_Raca_Param_c */
 daNpc_Raca_HIOParam const daNpc_Raca_Param_c::m = {
     230.0f,
     -3.0f,
@@ -220,7 +207,6 @@ daNpc_Raca_HIOParam const daNpc_Raca_Param_c::m = {
     0.0f,
 };
 
-/* 80AB5DFC-80AB60B8 00023C 02BC+00 1/1 0/0 0/0 .text            create__12daNpc_Raca_cFv */
 cPhs__Step daNpc_Raca_c::create() {
     daNpcT_ct(this, daNpc_Raca_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
                        l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -274,7 +260,6 @@ cPhs__Step daNpc_Raca_c::create() {
     return phase;
 }
 
-/* 80AB60B8-80AB6358 0004F8 02A0+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Raca_cFv */
 int daNpc_Raca_c::CreateHeap() {
     int bmdIdx = mTwilight == true ? NONE : NONE;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0]);
@@ -310,18 +295,15 @@ int daNpc_Raca_c::CreateHeap() {
     return 0;
 }
 
-/* 80AB6514-80AB6548 000954 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Raca_cFv */
 int daNpc_Raca_c::Delete() {
     this->~daNpc_Raca_c();
     return 1;
 }
 
-/* 80AB6548-80AB6568 000988 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Raca_cFv */
 int daNpc_Raca_c::Execute() {
     return execute();
 }
 
-/* 80AB6568-80AB65FC 0009A8 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Raca_cFv */
 int daNpc_Raca_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -338,12 +320,10 @@ int daNpc_Raca_c::Draw() {
     );
 }
 
-/* 80AB65FC-80AB661C 000A3C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_Raca_cFP10fopAc_ac_c */
 int daNpc_Raca_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_Raca_c*>(a_this)->CreateHeap();
 }
 
-/* 80AB661C-80AB6674 000A5C 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_Raca_cFP8J3DJointi */
 int daNpc_Raca_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -356,7 +336,6 @@ int daNpc_Raca_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AB6674-80AB6700 000AB4 008C+00 1/1 0/0 0/0 .text            srchNi__12daNpc_Raca_cFPvPv */
 void* daNpc_Raca_c::srchNi(void* i_actor, void* i_data) {
     if (mFindCount < 50 && fopAcM_IsActor(i_actor) && i_actor != (daNpc_Raca_c*)i_data && fopAcM_GetName(i_actor) == PROC_NI) {
         mFindActorPtrs[mFindCount] = (fopAc_ac_c*)i_actor;
@@ -366,7 +345,6 @@ void* daNpc_Raca_c::srchNi(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80AB6700-80AB67CC 000B40 00CC+00 1/1 0/0 0/0 .text            getNiP__12daNpc_Raca_cFv */
 fopAc_ac_c* daNpc_Raca_c::getNiP() {
     fopAc_ac_c* actor_p = mActorMngr[0].getActorP();
     mFindCount = 0;
@@ -383,7 +361,6 @@ fopAc_ac_c* daNpc_Raca_c::getNiP() {
     return NULL;
 }
 
-/* 80AB67CC-80AB67EC 000C0C 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_Raca_cFv */
 u8 daNpc_Raca_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -394,7 +371,6 @@ u8 daNpc_Raca_c::getType() {
     }
 }
 
-/* 80AB67EC-80AB681C 000C2C 0030+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Raca_cFv */
 BOOL daNpc_Raca_c::isDelete() {
     if (mType == TYPE_1) {
         return FALSE;
@@ -409,7 +385,6 @@ BOOL daNpc_Raca_c::isDelete() {
     }
 }
 
-/* 80AB681C-80AB6984 000C5C 0168+00 1/1 0/0 0/0 .text            reset__12daNpc_Raca_cFv */
 void daNpc_Raca_c::reset() {
     initialize();
 
@@ -431,7 +406,6 @@ void daNpc_Raca_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80AB6984-80AB6A10 000DC4 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Raca_cFi */
 void daNpc_Raca_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -442,7 +416,6 @@ void daNpc_Raca_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80AB6A10-80AB6B0C 000E50 00FC+00 1/0 0/0 0/0 .text            setParam__12daNpc_Raca_cFv */
 void daNpc_Raca_c::setParam() {
     selectAction();
     srchActors();
@@ -468,7 +441,6 @@ void daNpc_Raca_c::setParam() {
     mMorfFrames = daNpc_Raca_Param_c::m.common.morf_frame;
 }
 
-/* 80AB6B0C-80AB6BB0 000F4C 00A4+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Raca_cFv */
 void daNpc_Raca_c::setAfterTalkMotion() {
     int i_index;
 
@@ -493,7 +465,6 @@ void daNpc_Raca_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 80AB6BB0-80AB6C14 000FF0 0064+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Raca_cFv */
 void daNpc_Raca_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -505,7 +476,6 @@ void daNpc_Raca_c::srchActors() {
     }
 }
 
-/* 80AB6C14-80AB6D14 001054 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Raca_cFv */
 BOOL daNpc_Raca_c::evtTalk() {
     if (chkAction(&daNpc_Raca_c::talk)) {
         (this->*mAction)(NULL);
@@ -528,7 +498,6 @@ BOOL daNpc_Raca_c::evtTalk() {
     return 1;
 }
 
-/* 80AB6D14-80AB6DDC 001154 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Raca_cFv */
 BOOL daNpc_Raca_c::evtCutProc() {
     BOOL rv = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("Raca", this, -1);
@@ -546,7 +515,6 @@ BOOL daNpc_Raca_c::evtCutProc() {
     return rv;
 }
 
-/* 80AB6DDC-80AB6EC8 00121C 00EC+00 1/0 0/0 0/0 .text            action__12daNpc_Raca_cFv */
 void daNpc_Raca_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -562,14 +530,12 @@ void daNpc_Raca_c::action() {
     }
 }
 
-/* 80AB6EC8-80AB6F40 001308 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Raca_cFv */
 void daNpc_Raca_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80AB6F40-80AB7180 001380 0240+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Raca_cFv */
 void daNpc_Raca_c::setAttnPos() {
     cXyz sp38(0.0f, 30.0f, 0.0f);
     
@@ -596,7 +562,6 @@ void daNpc_Raca_c::setAttnPos() {
     setFootPos();
 }
 
-/* 80AB7180-80AB72B4 0015C0 0134+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Raca_cFv */
 void daNpc_Raca_c::setCollision() {
     cXyz sp48;
     u32 tgType = 0xD8FBFDFF;
@@ -631,12 +596,10 @@ void daNpc_Raca_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80AB72B4-80AB72BC 0016F4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Raca_cFv */
 int daNpc_Raca_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AB72BC-80AB73B0 0016FC 00F4+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Raca_cFv */
 BOOL daNpc_Raca_c::selectAction() {
     mPrevAction = NULL;
 
@@ -657,12 +620,10 @@ BOOL daNpc_Raca_c::selectAction() {
     return TRUE;
 }
 
-/* 80AB73B0-80AB73DC 0017F0 002C+00 1/1 0/0 0/0 .text            chkAction__12daNpc_Raca_cFM12daNpc_Raca_cFPCvPvPv_i */
 BOOL daNpc_Raca_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AB73DC-80AB7484 00181C 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_Raca_cFM12daNpc_Raca_cFPCvPvPv_i */
 BOOL daNpc_Raca_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -679,7 +640,6 @@ BOOL daNpc_Raca_c::setAction(actionFunc action) {
 
 }
 
-/* 80AB7484-80AB7710 0018C4 028C+00 2/0 0/0 0/0 .text            wait__12daNpc_Raca_cFPv */
 int daNpc_Raca_c::wait(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -736,7 +696,6 @@ int daNpc_Raca_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AB7710-80AB7918 001B50 0208+00 1/0 0/0 0/0 .text            walk__12daNpc_Raca_cFPv */
 int daNpc_Raca_c::walk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -784,7 +743,6 @@ int daNpc_Raca_c::walk(void* param_1) {
     return 1;
 }
 
-/* 80AB7918-80AB7B40 001D58 0228+00 2/0 0/0 0/0 .text            talk__12daNpc_Raca_cFPv */
 int daNpc_Raca_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -837,35 +795,28 @@ int daNpc_Raca_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80AB7B40-80AB7B60 001F80 0020+00 1/0 0/0 0/0 .text            daNpc_Raca_Create__FPv */
 static int daNpc_Raca_Create(void* a_this) {
     static_cast<daNpc_Raca_c*>(a_this)->create();
 }
 
-/* 80AB7B60-80AB7B80 001FA0 0020+00 1/0 0/0 0/0 .text            daNpc_Raca_Delete__FPv */
 static int daNpc_Raca_Delete(void* a_this) {
     static_cast<daNpc_Raca_c*>(a_this)->Delete();
 }
 
-/* 80AB7B80-80AB7BA0 001FC0 0020+00 1/0 0/0 0/0 .text            daNpc_Raca_Execute__FPv */
 static int daNpc_Raca_Execute(void* a_this) {
     static_cast<daNpc_Raca_c*>(a_this)->Execute();
 }
 
-/* 80AB7BA0-80AB7BC0 001FE0 0020+00 1/0 0/0 0/0 .text            daNpc_Raca_Draw__FPv */
 static int daNpc_Raca_Draw(void* a_this) {
     static_cast<daNpc_Raca_c*>(a_this)->Draw();
 }
 
-/* 80AB7BC0-80AB7BC8 002000 0008+00 1/0 0/0 0/0 .text            daNpc_Raca_IsDelete__FPv */
 static int daNpc_Raca_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80AB953C-80AB9540 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Raca_Param_c l_HIO;
 
-/* 80AB935C-80AB937C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Raca_MethodTable */
 static actor_method_class daNpc_Raca_MethodTable = {
     (process_method_func)daNpc_Raca_Create,
     (process_method_func)daNpc_Raca_Delete,
@@ -874,7 +825,6 @@ static actor_method_class daNpc_Raca_MethodTable = {
     (process_method_func)daNpc_Raca_Draw,
 };
 
-/* 80AB937C-80AB93AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_RACA */
 extern actor_process_profile_definition g_profile_NPC_RACA = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp
index a2d0e25441..3e56d0f3a7 100644
--- a/src/d/actor/d_a_npc_rafrel.cpp
+++ b/src/d/actor/d_a_npc_rafrel.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_npc.h"
 #include "d/d_debug_viewer.h"
 
-/* 80ABFEA0-80ABFFFC 000020 015C+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[29] = {
     {-1, 2, 0},
     {9, 0, 0},
@@ -42,14 +41,12 @@ static daNpc_GetParam2 l_bckGetParamList[29] = {
     {5, 2, 3},
 };
 
-/* 80ABFFFC-80AC002C 00017C 0030+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[4] = {
     {23, 2, 0},
     {24, 0, 0},
     {25, 2, 0},
     {30, 2, 0},
 };
-/* 80AC002C-80AC0068 0001AC 003C+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[5] = {
     {20, 2, 0},
     {24, 0, 1},
@@ -58,35 +55,30 @@ static daNpc_GetParam2 l_btkGetParamList[5] = {
     {27, 2, 1},
 };
 
-/* 80AC0068-80AC0074 0001E8 000C+00 1/0 0/0 0/0 .data            l_loadRes_RAFREL0 */
 static int l_loadRes_RAFREL0[] = {
     0,
     2,
     -1,
 };
 
-/* 80AC0074-80AC0080 0001F4 000C+00 1/0 0/0 0/0 .data            l_loadRes_RAFREL1 */
 static int l_loadRes_RAFREL1[] = {
     0,
     1, 
     -1,
 };
 
-/* 80AC0080-80AC008C 000200 000C+00 1/0 0/0 0/0 .data            l_loadRes_RAFREL2 */
 static int l_loadRes_RAFREL2[] = {
     0,
     3,
     -1,
 };
 
-/* 80AC008C-80AC0098 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_RAFREL0,
     l_loadRes_RAFREL1,
     l_loadRes_RAFREL2,
 };
 
-/* 80AC0098-80AC00A8 -00001 0010+00 6/8 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[4] = {
     "Rafrel",
     "Rafrel1",
@@ -94,7 +86,6 @@ static char* l_arcNames[4] = {
     "Rafrel3",
 };
 
-/* 80AC00A8-80AC00C4 -00001 001C+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[7] = {
     "",
     "THE_INTRODUCTION",
@@ -105,7 +96,6 @@ static char* l_evtNames[7] = {
     "RESIST_WIRETAP_RAFREL",
 };
 
-/* 80ABF9E0-80ABFA54 000000 0074+00 13/13 0/0 0/0 .rodata          m__19daNpcRafrel_Param_c */
 const daNpcRafrel_HIOParam daNpcRafrel_Param_c::m = {
     35.0f,
     -3.0f,
@@ -144,7 +134,6 @@ const daNpcRafrel_HIOParam daNpcRafrel_Param_c::m = {
     0,
 };
 
-/* 80AC00C4-80AC00C8 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Rafrel";
 
 #if DEBUG
@@ -162,10 +151,8 @@ void daNpcRafrel_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80AC0324-80AC0328 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_RAFREL_HIO_CLASS l_HIO;
 
-/* 80AC0110-80AC0164 000290 0054+00 0/2 0/0 0/0 .data            mEvtSeqList__13daNpcRafrel_c */
 typedef BOOL (daNpcRafrel_c::*EventFn)(int);
 EventFn daNpcRafrel_c::mEvtSeqList[] = {
     NULL,
@@ -177,10 +164,8 @@ EventFn daNpcRafrel_c::mEvtSeqList[] = {
     &daNpcRafrel_c::EvCut_WiretapSponsor,
 };
 
-/* 80AB962C-80AB97B0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__13daNpcRafrel_cFv */
 daNpcRafrel_c::daNpcRafrel_c() {}
 
-/* 80AB9840-80AB9A40 000300 0200+00 1/0 0/0 0/0 .text            __dt__13daNpcRafrel_cFv */
 daNpcRafrel_c::~daNpcRafrel_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcNames[l_loadRes_list[mType][i]]);
@@ -197,7 +182,6 @@ daNpcRafrel_c::~daNpcRafrel_c() {
     #endif
 }
 
-/* 80AB9A40-80AB9E3C 000500 03FC+00 1/1 0/0 0/0 .text            Create__13daNpcRafrel_cFv */
 int daNpcRafrel_c::Create() {
     fopAcM_ct(this, daNpcRafrel_c);
 
@@ -294,7 +278,6 @@ int daNpcRafrel_c::Create() {
     return phase_state;
 }
 
-/* 80AB9E3C-80ABA1C4 0008FC 0388+00 1/1 0/0 0/0 .text            CreateHeap__13daNpcRafrel_cFv */
 int daNpcRafrel_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* mdl_p = NULL;
@@ -368,7 +351,6 @@ int daNpcRafrel_c::CreateHeap() {
     return 1;
 }
 
-/* 80ABA380-80ABA3B4 000E40 0034+00 1/1 0/0 0/0 .text            Delete__13daNpcRafrel_cFv */
 int daNpcRafrel_c::Delete() {
     "Delete -> NPC_RAFREL(id=%d)\n";
     
@@ -377,13 +359,11 @@ int daNpcRafrel_c::Delete() {
     return 1;
 }
 
-/* 80ABA3B4-80ABA3D8 000E74 0024+00 2/2 0/0 0/0 .text            Execute__13daNpcRafrel_cFv */
 int daNpcRafrel_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80ABA3D8-80ABA4A8 000E98 00D0+00 1/1 0/0 0/0 .text            Draw__13daNpcRafrel_cFv */
 int daNpcRafrel_c::Draw() {
     J3DModelData* modelData = mAnm_p->getModel()->getModelData();
     modelData->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
@@ -401,7 +381,6 @@ int daNpcRafrel_c::Draw() {
     return 1;
 }
 
-/* 80ABA4A8-80ABA678 000F68 01D0+00 1/1 0/0 0/0 .text            ctrlJoint__13daNpcRafrel_cFP8J3DJointP8J3DModel              */
 int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     u16 jointNo = jnt_no;
@@ -440,13 +419,11 @@ int daNpcRafrel_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80ABA678-80ABA698 001138 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpcRafrel_cFP10fopAc_ac_c */
 int daNpcRafrel_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcRafrel_c* actor = (daNpcRafrel_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80ABA698-80ABA6E4 001158 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpcRafrel_cFP8J3DJointi */
 int daNpcRafrel_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -460,7 +437,6 @@ int daNpcRafrel_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80ABE1D0-80ABE470 004C90 02A0+00 1/0 0/0 0/0 .text            main__13daNpcRafrel_cFv */
 BOOL daNpcRafrel_c::main() {
     if (field_0xde0 != NULL) {
         (this->*field_0xde0)(NULL);
@@ -478,7 +454,6 @@ BOOL daNpcRafrel_c::main() {
     return 1;
 }
 
-/* 80ABA6E4-80ABA8EC 0011A4 0208+00 2/0 0/0 0/0 .text setExpressionAnm__13daNpcRafrel_cFib */
 bool daNpcRafrel_c::setExpressionAnm(int i_idx, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -535,7 +510,6 @@ bool daNpcRafrel_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80ABA8EC-80ABA9CC 0013AC 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__13daNpcRafrel_cFi */
 bool daNpcRafrel_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx],
                                               l_btpGetParamList[i_idx].fileIdx);
@@ -557,7 +531,6 @@ bool daNpcRafrel_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80ABA9CC-80ABAB88 00148C 01BC+00 1/0 0/0 0/0 .text            setMotionAnm__13daNpcRafrel_cFif */
 void daNpcRafrel_c::setMotionAnm(int i_idx, f32 i_morf) {
     int var_r30 = 0;
     switch (i_idx) {
@@ -602,7 +575,6 @@ void daNpcRafrel_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80ABAB88-80ABADC4 001648 023C+00 1/1 0/0 0/0 .text            reset__13daNpcRafrel_cFv */
 void daNpcRafrel_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -655,7 +627,6 @@ void daNpcRafrel_c::reset() {
     setWaitAction();
 }
 
-/* 80ABDE9C-80ABE1D0 00495C 0334+00 1/0 0/0 0/0 .text            setParam__13daNpcRafrel_cFv */
 void daNpcRafrel_c::setParam() {
     searchActors();
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -689,7 +660,6 @@ void daNpcRafrel_c::setParam() {
     #endif
 }
 
-/* 80ABE9FC-80ABEAD8 0054BC 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__13daNpcRafrel_cFv */
 BOOL daNpcRafrel_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* temp_r29 = NULL;
@@ -707,7 +677,6 @@ BOOL daNpcRafrel_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80ABF074-80ABF07C 005B34 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpcRafrel_cFv */
 BOOL daNpcRafrel_c::drawDbgInfo() {
 #if DEBUG
     if (!mpHIO->m.common.debug_info_ON) {
@@ -801,7 +770,6 @@ void daNpcRafrel_c::playExpression() {
     }
 }
 
-/* 80ABE470-80ABE9FC 004F30 058C+00 1/1 0/0 0/0 .text            playMotion__13daNpcRafrel_cFv */
 void daNpcRafrel_c::playMotion() {
     daNpcF_anmPlayData anm0_phase1 = {8, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* anm0[] = {&anm0_phase1};
@@ -881,7 +849,6 @@ void daNpcRafrel_c::playMotion() {
     }
 }
 
-/* 80ABEAD8-80ABEE98 005598 03C0+00 1/0 0/0 0/0 .text            setAttnPos__13daNpcRafrel_cFv */
 void daNpcRafrel_c::setAttnPos() {
     if (field_0xe0e == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -944,7 +911,6 @@ void daNpcRafrel_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80ABEE98-80ABF074 005958 01DC+00 1/1 0/0 0/0 .text            lookat__13daNpcRafrel_cFv */
 void daNpcRafrel_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model_p = mAnm_p->getModel();
@@ -995,7 +961,6 @@ void daNpcRafrel_c::lookat() {
     mLookat.calc(this, model_p->getBaseTRMtx(), sp24, var_r28, temp_r26, 0);
 }
 
-/* 80ABADC4-80ABAFBC 001884 01F8+00 1/1 0/0 0/0 .text            setWaitAction__13daNpcRafrel_cFv */
 void daNpcRafrel_c::setWaitAction() {
     switch (mType) {
     case 0:
@@ -1013,7 +978,6 @@ void daNpcRafrel_c::setWaitAction() {
     }
 }
 
-/* 80ABAFBC-80ABB014 001A7C 0058+00 1/1 0/0 0/0 .text            isSneaking__13daNpcRafrel_cFv */
 bool daNpcRafrel_c::isSneaking() {
     if (mType == 0) {
         if (dComIfGp_getStartStageRoomNo() == 5 && dComIfG_play_c::getLayerNo(0) == 2) {
@@ -1104,7 +1068,6 @@ BOOL daNpcRafrel_c::chkFindPlayer() {
     return ret;
 }
 
-/* 80ABB014-80ABBB10 001AD4 0AFC+00 2/0 0/0 0/0 .text            wait_type01__13daNpcRafrel_cFPv */
 // NONMATCHING - gameinfo event load stuff
 bool daNpcRafrel_c::wait_type01(void* param_0) {
     switch (field_0xe10) {
@@ -1239,7 +1202,6 @@ bool daNpcRafrel_c::wait_type01(void* param_0) {
     return 1;
 }
 
-/* 80ABBB10-80ABBBB0 0025D0 00A0+00 1/0 0/0 0/0 .text            setMotion__13daNpcRafrel_cFifi */
 void daNpcRafrel_c::setMotion(int param_0, f32 param_1, int param_2) {
     s16 var_r31 = param_0;
     switch (var_r31) {
@@ -1267,7 +1229,6 @@ void daNpcRafrel_c::setMotion(int param_0, f32 param_1, int param_2) {
     }
 }
 
-/* 80ABBBB0-80ABBBDC 002670 002C+00 1/0 0/0 0/0 .text            setExpression__13daNpcRafrel_cFif */
 void daNpcRafrel_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 8) {
         mExpression = i_expression;
@@ -1277,7 +1238,6 @@ void daNpcRafrel_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80ABBBDC-80ABBE84 00269C 02A8+00 1/0 0/0 0/0 .text            wait_type2__13daNpcRafrel_cFPv */
 bool daNpcRafrel_c::wait_type2(void* param_0) {
     switch (field_0xe10) {
     case 0:
@@ -1347,7 +1307,6 @@ void daNpcRafrel_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80ABBE84-80ABC50C 002944 0688+00 2/0 0/0 0/0 .text            talk__13daNpcRafrel_cFPv */
 bool daNpcRafrel_c::talk(void* param_0) {
     int sp14 = 0;
     bool var_r27 = 0;
@@ -1415,7 +1374,6 @@ bool daNpcRafrel_c::talk(void* param_0) {
     return var_r27;
 }
 
-/* 80ABC50C-80ABCA40 002FCC 0534+00 1/0 0/0 0/0 .text            demo__13daNpcRafrel_cFPv */
 bool daNpcRafrel_c::demo(void* param_0) {
     dEvent_manager_c* evtmgr = &dComIfGp_getEventManager();
     int unused = 0;
@@ -1477,7 +1435,6 @@ bool daNpcRafrel_c::demo(void* param_0) {
     return 1;
 }
 
-/* 80ABCA40-80ABCD74 003500 0334+00 1/0 0/0 0/0 .text            leave__13daNpcRafrel_cFPv */
 bool daNpcRafrel_c::leave(void* param_0) {
     cXyz sp8(-6253.387f, 0.0f, 6251.7603f);
 
@@ -1512,7 +1469,6 @@ bool daNpcRafrel_c::leave(void* param_0) {
     return 1;
 }
 
-/* 80ABCD74-80ABCE74 003834 0100+00 1/0 0/0 0/0 .text EvCut_Introduction__13daNpcRafrel_cFi */
 int daNpcRafrel_c::EvCut_Introduction(int i_staffId) {
     dEvent_manager_c* evtmgr = &dComIfGp_getEventManager();
     
@@ -1539,7 +1495,6 @@ int daNpcRafrel_c::EvCut_Introduction(int i_staffId) {
     return 0;
 }
 
-/* 80ABCE74-80ABD124 003934 02B0+00 1/0 0/0 0/0 .text            EvCut_Meeting__13daNpcRafrel_cFi */
 int daNpcRafrel_c::EvCut_Meeting(int i_staffId) {
     dEvent_manager_c* evtmgr = &dComIfGp_getEventManager();
     
@@ -1591,7 +1546,6 @@ int daNpcRafrel_c::EvCut_Meeting(int i_staffId) {
     return 0;
 }
 
-/* 80ABD124-80ABD8A0 003BE4 077C+00 1/0 0/0 0/0 .text            EvCut_Appear__13daNpcRafrel_cFi */
 int daNpcRafrel_c::EvCut_Appear(int i_staffId) {
     char* cutname;
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
@@ -1700,7 +1654,6 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) {
     return 0;
 }
 
-/* 80ABD8A0-80ABDB7C 004360 02DC+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__13daNpcRafrel_cFi */
 int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) {
     int* cutname;
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
@@ -1753,7 +1706,6 @@ int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) {
     return 0;
 }
 
-/* 80ABDB7C-80ABDDE4 00463C 0268+00 2/0 0/0 0/0 .text EvCut_WiretapEntrant__13daNpcRafrel_cFi */
 int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) {
     dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
     
@@ -1799,32 +1751,26 @@ int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) {
     return 0;
 }
 
-/* 80ABDDE4-80ABDE04 0048A4 0020+00 1/0 0/0 0/0 .text            daNpcRafrel_Create__FPv */
 static int daNpcRafrel_Create(void* i_this) {
     return ((daNpcRafrel_c*)i_this)->Create();
 }
 
-/* 80ABDE04-80ABDE24 0048C4 0020+00 1/0 0/0 0/0 .text            daNpcRafrel_Delete__FPv */
 static int daNpcRafrel_Delete(void* i_this) {
     return ((daNpcRafrel_c*)i_this)->Delete();
 }
 
-/* 80ABDE24-80ABDE44 0048E4 0020+00 1/0 0/0 0/0 .text            daNpcRafrel_Execute__FPv */
 static int daNpcRafrel_Execute(void* i_this) {
     return ((daNpcRafrel_c*)i_this)->Execute();
 }
 
-/* 80ABDE44-80ABDE64 004904 0020+00 1/0 0/0 0/0 .text            daNpcRafrel_Draw__FPv */
 static int daNpcRafrel_Draw(void* i_this) {
     return ((daNpcRafrel_c*)i_this)->Draw();
 }
 
-/* 80ABDE64-80ABDE6C 004924 0008+00 1/0 0/0 0/0 .text            daNpcRafrel_IsDelete__FPv */
 static int daNpcRafrel_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AC01D8-80AC01F8 -00001 0020+00 1/0 0/0 0/0 .data            daNpcRafrel_MethodTable */
 static actor_method_class daNpcRafrel_MethodTable = {
     (process_method_func)daNpcRafrel_Create,
     (process_method_func)daNpcRafrel_Delete,
@@ -1833,7 +1779,6 @@ static actor_method_class daNpcRafrel_MethodTable = {
     (process_method_func)daNpcRafrel_Draw,
 };
 
-/* 80AC01F8-80AC0228 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_RAFREL */
 extern actor_process_profile_definition g_profile_NPC_RAFREL = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp
index 2aff61598a..49eac2f188 100644
--- a/src/d/actor/d_a_npc_saru.cpp
+++ b/src/d/actor/d_a_npc_saru.cpp
@@ -60,29 +60,24 @@ enum Material {
     /* 0x2 */ MAT_SARU_FACE_M,
 };
 
-/* 80AC46C4-80AC46E4 000020 0020+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[4][2] = {
     { npc_ks_class::BMDR_SARU, 1 }, { BMDR_SARU_TW, 2 }, { npc_ks_class::BMDR_SARU_BARA, 1 }, { BMDR_SARU_BARA_TW, 2 },
 };
 
-/* 80AC46E4-80AC46FC -00001 0018+00 1/2 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"NO_RESPONSE", 0},
     {"YM_LOOK", 2},
 };
 
-/* 80AC46FC-80AC470C -00001 0010+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[4] = {
     "", "Npc_ks", "saru_TW", "saru"
 };
 
-/* 80AC470C-80AC4710 000068 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {
     NPC_KS, SARU_TW, SARU, -1,
 };
 
-/* 80AC4710-80AC4720 -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
@@ -90,13 +85,11 @@ static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn0
 };
 
-/* 80AC4720-80AC473C 00007C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0,
         npc_ks_class::BTP_SARU, J3DFrameCtrl::EMode_LOOP, NPC_KS, 1},
 };
 
-/* 80AC473C-80AC4CD0 000098 0594+00 1/2 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[51] = {
     {npc_ks_class::BCK_SARU_WAIT_A, J3DFrameCtrl::EMode_LOOP, NPC_KS, 
         -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0},
@@ -202,12 +195,10 @@ static daNpcT_motionAnmData_c l_motionAnmData[51] = {
         -1, J3DFrameCtrl::EMode_NONE, 0, 0, 0},
 };
 
-/* 80AC4CD0-80AC4CE0 00062C 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AC4CE0-80AC4D90 00063C 00B0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -222,7 +213,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[44] = {
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AC4D90-80AC4DA0 -00001 0010+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Saru_c */
 char* daNpc_Saru_c::mCutNameList[4] = {
     "",
     "FIND_MONKEY",
@@ -230,7 +220,6 @@ char* daNpc_Saru_c::mCutNameList[4] = {
     "YM_LOOK",
 };
 
-/* 80AC4DC4-80AC4DF4 000720 0030+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Saru_c */
 daNpc_Saru_c::cutFunc daNpc_Saru_c::mCutList[4] = {
     NULL,
     &daNpc_Saru_c::cutFindMonkey,
@@ -238,7 +227,6 @@ daNpc_Saru_c::cutFunc daNpc_Saru_c::mCutList[4] = {
     &daNpc_Saru_c::cutYmLook,
 };
 
-/* 80AC042C-80AC0578 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__12daNpc_Saru_cFv */
 daNpc_Saru_c::~daNpc_Saru_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -247,7 +235,6 @@ daNpc_Saru_c::~daNpc_Saru_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AC44F8-80AC4588 000000 0090+00 9/9 0/0 0/0 .rodata          m__18daNpc_Saru_Param_c */
 daNpc_Saru_HIOParam const daNpc_Saru_Param_c::m = {
     140.0f,
     -3.0f,
@@ -294,7 +281,6 @@ daNpc_Saru_HIOParam const daNpc_Saru_Param_c::m = {
     0,
 };
 
-/* 80AC0578-80AC082C 000238 02B4+00 1/1 0/0 0/0 .text            create__12daNpc_Saru_cFv */
 int daNpc_Saru_c::create() {
     static int const heapSize[4] = {
         14480, 14480, 14464, 0,
@@ -353,7 +339,6 @@ int daNpc_Saru_c::create() {
     return phase;
 }
 
-/* 80AC082C-80AC0A54 0004EC 0228+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Saru_cFv */
 int daNpc_Saru_c::CreateHeap() {
     static int const bmdTypeList[2] = {
         2, 3,
@@ -398,29 +383,24 @@ int daNpc_Saru_c::CreateHeap() {
     return 0;
 }
 
-/* 80AC0A54-80AC0A88 000714 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Saru_cFv */
 int daNpc_Saru_c::Delete() {
     this->~daNpc_Saru_c();
     return 1;
 }
 
-/* 80AC0A88-80AC0AA8 000748 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Saru_cFv */
 int daNpc_Saru_c::Execute() {
     return execute();
 }
 
-/* 80AC0AA8-80AC0AEC 000768 0044+00 1/1 0/0 0/0 .text            Draw__12daNpc_Saru_cFv */
 int daNpc_Saru_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80AC0AEC-80AC0B0C 0007AC 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_Saru_cFP10fopAc_ac_c */
 int daNpc_Saru_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_Saru_c* i_this = (daNpc_Saru_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80AC0B0C-80AC0B64 0007CC 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_Saru_cFP8J3DJointi */
 int daNpc_Saru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         daNpc_Saru_c* _this = (daNpc_Saru_c*)j3dSys.getModel()->getUserArea();
@@ -431,7 +411,6 @@ int daNpc_Saru_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AC0B64-80AC0C0C 000824 00A8+00 2/2 0/0 0/0 .text            srchYm__12daNpc_Saru_cFPvPv */
 void* daNpc_Saru_c::srchYm(void* i_actor, void* i_data) {
     if (mFindCount < 50 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_E_YM && ((daE_YM_c*)i_actor)->isHide() == 0) {
@@ -442,7 +421,6 @@ void* daNpc_Saru_c::srchYm(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80AC0C0C-80AC0C58 0008CC 004C+00 1/1 0/0 0/0 .text            getType__12daNpc_Saru_cFv */
 u8 daNpc_Saru_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -459,7 +437,6 @@ u8 daNpc_Saru_c::getType() {
     }
 }
 
-/* 80AC0C58-80AC0CE8 000918 0090+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Saru_cFv */
 int daNpc_Saru_c::isDelete() {
     u8 rv;
     switch (mType) {
@@ -483,7 +460,6 @@ int daNpc_Saru_c::isDelete() {
     }
 }
 
-/* 80AC0CE8-80AC0EA4 0009A8 01BC+00 1/1 0/0 0/0 .text            reset__12daNpc_Saru_cFv */
 void daNpc_Saru_c::reset() {
     csXyz acStack_20;
     int iVar1 = (u8*)&field_0xfdc - (u8*)&field_0xfbc;
@@ -511,7 +487,6 @@ void daNpc_Saru_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 80AC0EA4-80AC0F28 000B64 0084+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Saru_cFi */
 void daNpc_Saru_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -522,7 +497,6 @@ void daNpc_Saru_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80AC0F28-80AC0FDC 000BE8 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Saru_cFv */
 BOOL daNpc_Saru_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Saru_c::talk)) {
         mPreItemNo = 0;
@@ -539,7 +513,6 @@ BOOL daNpc_Saru_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80AC0FDC-80AC1110 000C9C 0134+00 1/0 0/0 0/0 .text            setParam__12daNpc_Saru_cFv */
 void daNpc_Saru_c::setParam() {
     selectAction();
     srchActors();
@@ -578,7 +551,6 @@ void daNpc_Saru_c::setParam() {
     gravity = daNpc_Saru_Param_c::m.common.gravity;
 }
 
-/* 80AC1110-80AC1170 000DD0 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Saru_cFv */
 void daNpc_Saru_c::setAfterTalkMotion() {
     #ifdef DEBUG
     mFaceMotionSeqMngr.getNo();
@@ -586,7 +558,6 @@ void daNpc_Saru_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, 0, 0);
 }
 
-/* 80AC1170-80AC11D4 000E30 0064+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Saru_cFv */
 void daNpc_Saru_c::srchActors() {
     switch (mType) {
         case 2:
@@ -600,7 +571,6 @@ void daNpc_Saru_c::srchActors() {
     }
 }
 
-/* 80AC11D4-80AC1274 000E94 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Saru_cFv */
 BOOL daNpc_Saru_c::evtTalk() {
     if (chkAction(&daNpc_Saru_c::talk)) {
         (this->*field_0xfc8)(NULL);
@@ -611,7 +581,6 @@ BOOL daNpc_Saru_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AC1274-80AC133C 000F34 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Saru_cFv */
 BOOL daNpc_Saru_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Saru", this, -1);
     if (staffId != -1) {
@@ -626,7 +595,6 @@ BOOL daNpc_Saru_c::evtCutProc() {
     return false;
 }
 
-/* 80AC133C-80AC14E4 000FFC 01A8+00 1/0 0/0 0/0 .text            action__12daNpc_Saru_cFv */
 void daNpc_Saru_c::action() {
     fopAc_ac_c* actor_p = NULL;
     if (mTwilight == false) {
@@ -655,7 +623,6 @@ void daNpc_Saru_c::action() {
     }
 }
 
-/* 80AC14E4-80AC15B4 0011A4 00D0+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Saru_cFv */
 void daNpc_Saru_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
 
@@ -668,7 +635,6 @@ void daNpc_Saru_c::beforeMove() {
     }
 }
 
-/* 80AC15B4-80AC18A0 001274 02EC+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Saru_cFv */
 void daNpc_Saru_c::setAttnPos() {
     cXyz sp3c(30.0f, 0.0f, 0.0f);
 
@@ -704,7 +670,6 @@ void daNpc_Saru_c::setAttnPos() {
     setSe();
 }
 
-/* 80AC18A0-80AC1A20 001560 0180+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Saru_cFv */
 void daNpc_Saru_c::setCollision() {
     cXyz sp48;
     if (mHide == false) {
@@ -743,12 +708,10 @@ void daNpc_Saru_c::setCollision() {
     field_0xe4c.ClrTgHit();
 }
 
-/* 80AC1A20-80AC1A28 0016E0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Saru_cFv */
 int daNpc_Saru_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AC1A28-80AC1B30 0016E8 0108+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Saru_cFv */
 void daNpc_Saru_c::drawOtherMdl() {
     static int const jointNo[2] = {
         4, 4,
@@ -768,19 +731,16 @@ void daNpc_Saru_c::drawOtherMdl() {
     }
 }
 
-/* 80AC1B30-80AC1B78 0017F0 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Saru_cFv */
 int daNpc_Saru_c::selectAction() {
     field_0xfbc = NULL;
     field_0xfbc = &daNpc_Saru_c::wait;
     return 1;
 }
 
-/* 80AC1B78-80AC1BA4 001838 002C+00 2/2 0/0 0/0 .text            chkAction__12daNpc_Saru_cFM12daNpc_Saru_cFPCvPvPv_i */
 BOOL daNpc_Saru_c::chkAction(int (daNpc_Saru_c::*action)(void*)) {
     return field_0xfc8 == action;
 }
 
-/* 80AC1BA4-80AC1C4C 001864 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_Saru_cFM12daNpc_Saru_cFPCvPvPv_i */
 int daNpc_Saru_c::setAction(int (daNpc_Saru_c::*action)(void*)) {
     mMode = 3;
     if (field_0xfc8) {
@@ -796,7 +756,6 @@ int daNpc_Saru_c::setAction(int (daNpc_Saru_c::*action)(void*)) {
     return 1;
 }
 
-/* 80AC1C4C-80AC216C 00190C 0520+00 1/1 0/0 0/0 .text            setSe__12daNpc_Saru_cFv */
 void daNpc_Saru_c::setSe() {
     if (cM3d_IsZero(mpMorf[0]->getPlaySpeed()) <= 0) {
         if ((J3DAnmTransform*)dComIfG_getObjectRes(l_resNameList[l_motionAnmData[25].mBckArcIdx], l_motionAnmData[25].mBckFileIdx) == mpMorf[0]->getAnm()) {
@@ -853,7 +812,6 @@ void daNpc_Saru_c::setSe() {
     }
 }
 
-/* 80AC216C-80AC2368 001E2C 01FC+00 1/0 0/0 0/0 .text            cutFindMonkey__12daNpc_Saru_cFi */
 int daNpc_Saru_c::cutFindMonkey(int param_1) {
     cXyz sp2c;
     int rv = 0;
@@ -914,7 +872,6 @@ int daNpc_Saru_c::cutFindMonkey(int param_1) {
     return rv;
 }
 
-/* 80AC2368-80AC2598 002028 0230+00 1/0 0/0 0/0 .text            cutHelpMe__12daNpc_Saru_cFi */
 int daNpc_Saru_c::cutHelpMe(int param_1) {
     int rv = 0;
     int iVar1 = -1;
@@ -957,7 +914,6 @@ int daNpc_Saru_c::cutHelpMe(int param_1) {
     return rv;
 }
 
-/* 80AC2598-80AC28A4 002258 030C+00 1/0 0/0 0/0 .text            cutYmLook__12daNpc_Saru_cFi */
 int daNpc_Saru_c::cutYmLook(int param_1) {
     char acStack_88[104];
     int rv = 0;
@@ -1055,7 +1011,6 @@ int daNpc_Saru_c::cutYmLook(int param_1) {
     return rv;
 }
 
-/* 80AC28A4-80AC2FD8 002564 0734+00 1/0 0/0 0/0 .text            wait__12daNpc_Saru_cFPv */
 int daNpc_Saru_c::wait(void* param_1) {
     obj_so_class* cage_p;
     switch (mMode) {
@@ -1185,7 +1140,6 @@ int daNpc_Saru_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AC2FD8-80AC31B4 002C98 01DC+00 3/0 0/0 0/0 .text            talk__12daNpc_Saru_cFPv */
 int daNpc_Saru_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1222,39 +1176,32 @@ int daNpc_Saru_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80AC31B4-80AC31D4 002E74 0020+00 1/0 0/0 0/0 .text            daNpc_Saru_Create__FPv */
 static int daNpc_Saru_Create(void* param_1) {
     daNpc_Saru_c* i_this = (daNpc_Saru_c*)param_1;
     return i_this->create();
 }
 
-/* 80AC31D4-80AC31F4 002E94 0020+00 1/0 0/0 0/0 .text            daNpc_Saru_Delete__FPv */
 static int daNpc_Saru_Delete(void* param_1) {
     daNpc_Saru_c* i_this = (daNpc_Saru_c*)param_1;
     return i_this->Delete();
 }
 
-/* 80AC31F4-80AC3214 002EB4 0020+00 1/0 0/0 0/0 .text            daNpc_Saru_Execute__FPv */
 static int daNpc_Saru_Execute(void* param_1) {
     daNpc_Saru_c* i_this = (daNpc_Saru_c*)param_1;
     return i_this->Execute();
 }
 
-/* 80AC3214-80AC3234 002ED4 0020+00 1/0 0/0 0/0 .text            daNpc_Saru_Draw__FPv */
 static int daNpc_Saru_Draw(void* param_1) {
     daNpc_Saru_c* i_this = (daNpc_Saru_c*)param_1;
     return i_this->Draw();
 }
 
-/* 80AC3234-80AC323C 002EF4 0008+00 1/0 0/0 0/0 .text            daNpc_Saru_IsDelete__FPv */
 static int daNpc_Saru_IsDelete(void* param_1) {
     return 1;
 }
 
-/* 80AC4FF4-80AC4FF8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Saru_Param_c l_HIO;
 
-/* 80AC4E24-80AC4E44 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Saru_MethodTable */
 static actor_method_class daNpc_Saru_MethodTable = {
     (process_method_func)daNpc_Saru_Create,
     (process_method_func)daNpc_Saru_Delete,
@@ -1263,7 +1210,6 @@ static actor_method_class daNpc_Saru_MethodTable = {
     (process_method_func)daNpc_Saru_Draw,
 };
 
-/* 80AC4E44-80AC4E74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SARU */
 extern actor_process_profile_definition g_profile_NPC_SARU = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp
index 66b801e2c1..4de76d8f4f 100644
--- a/src/d/actor/d_a_npc_seib.cpp
+++ b/src/d/actor/d_a_npc_seib.cpp
@@ -7,32 +7,25 @@
 
 #include "d/actor/d_a_npc_seib.h"
 
-/* 80AC7118-80AC7120 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][1] = {12, 1};
 
-/* 80AC7120-80AC7138 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80AC7138-80AC7140 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {"", "seiB"};
 
-/* 80AC7140-80AC7144 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, 0xFF};
 
-/* 80AC7144-80AC714C -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80AC714C-80AC7168 000054 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {-1, 0, 0, -1, 0, 0, 0};
 
-/* 80AC7168-80AC71D8 000070 0070+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[4] = {
     {9, 2, 1, -1, 0, 0, 0, 0},
     {7, 0, 1, -1, 0, 0, 0, 0},
@@ -40,7 +33,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[4] = {
     {8, 0, 1, -1, 0, 0, 0, 0},
 };
 
-/* 80AC71D8-80AC71E8 0000E0 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0},
     {-1, 0, 0},
@@ -48,21 +40,17 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 80AC71E8-80AC7228 0000F0 0040+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[16] = {
     {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {3, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AC7228-80AC722C -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_seiB_c */
 char* daNpc_seiB_c::mCutNameList = "";
 
-/* 80AC722C-80AC7238 000134 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_seiB_c */
 daNpc_seiB_c::cutFunc daNpc_seiB_c::mCutList[1] = {
     0,
 };
 
-/* 80AC50EC-80AC5188 0000EC 009C+00 1/0 0/0 0/0 .text            __dt__12daNpc_seiB_cFv */
 daNpc_seiB_c::~daNpc_seiB_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -71,7 +59,6 @@ daNpc_seiB_c::~daNpc_seiB_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AC7024-80AC70B8 000000 0094+00 4/4 0/0 0/0 .rodata          m__18daNpc_seiB_Param_c */
 daNpc_seiB_Param_c::Data const daNpc_seiB_Param_c::m = {
     0.0f,
     0.0f,
@@ -112,7 +99,6 @@ daNpc_seiB_Param_c::Data const daNpc_seiB_Param_c::m = {
     1200.0f,
 };
 
-/* 80AC5188-80AC53C8 000188 0240+00 1/1 0/0 0/0 .text            create__12daNpc_seiB_cFv */
 int daNpc_seiB_c::create() {
     daNpcT_ct(this, daNpc_seiB_c, &l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList,
@@ -156,7 +142,6 @@ int daNpc_seiB_c::create() {
     return rv;
 }
 
-/* 80AC53C8-80AC5520 0003C8 0158+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_seiB_cFv */
 int daNpc_seiB_c::CreateHeap() {
     J3DModelData* mdlData_p =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]);
@@ -181,7 +166,6 @@ int daNpc_seiB_c::CreateHeap() {
     return 0;
 }
 
-/* 80AC5520-80AC5554 000520 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_seiB_cFv */
 int daNpc_seiB_c::Delete() {
     // OS_REPORT("|%06d:%x|daNpc_seiB_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -189,12 +173,10 @@ int daNpc_seiB_c::Delete() {
     return 1;
 }
 
-/* 80AC5554-80AC5574 000554 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_seiB_cFv */
 int daNpc_seiB_c::Execute() {
     return execute();
 }
 
-/* 80AC5574-80AC5608 000574 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_seiB_cFv */
 int daNpc_seiB_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -204,14 +186,11 @@ int daNpc_seiB_c::Draw() {
     return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80AC5608-80AC5628 000608 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_seiB_cFP10fopAc_ac_c */
 int daNpc_seiB_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_seiB_c* i_this = (daNpc_seiB_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80AC5628-80AC5648 000628 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_seiB_cFv */
 u8 daNpc_seiB_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -221,7 +200,6 @@ u8 daNpc_seiB_c::getType() {
     return TYPE_1;
 }
 
-/* 80AC5648-80AC5664 000648 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_seiB_cFv */
 int daNpc_seiB_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -230,12 +208,10 @@ int daNpc_seiB_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80AC5664-80AC566C 000664 0008+00 1/1 0/0 0/0 .text            isDelete__12daNpc_seiB_cFv */
 int daNpc_seiB_c::isDelete() {
     return 0;
 }
 
-/* 80AC566C-80AC57C4 00066C 0158+00 1/1 0/0 0/0 .text            reset__12daNpc_seiB_cFv */
 void daNpc_seiB_c::reset() {
     initialize();
     memset(&mActionFunc1, 0, (u8*)&field_0xe64 - (u8*)&mActionFunc1);
@@ -247,7 +223,6 @@ void daNpc_seiB_c::reset() {
     mAnim = 0;
 }
 
-/* 80AC57C4-80AC58DC 0007C4 0118+00 1/0 0/0 0/0 .text            setParam__12daNpc_seiB_cFv */
 void daNpc_seiB_c::setParam() {
     selectAction();
     srchActors();
@@ -275,12 +250,10 @@ void daNpc_seiB_c::setParam() {
     mMorfFrames = mpParam->m.mMorfFrames;
 }
 
-/* 80AC58F0-80AC58F4 0008F0 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_seiB_cFv */
 void daNpc_seiB_c::srchActors() {
     /* empty function */
 }
 
-/* 80AC58F4-80AC59F4 0008F4 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_seiB_cFv */
 BOOL daNpc_seiB_c::evtTalk() {
     if (chkAction(&daNpc_seiB_c::talk)) {
         (this->*mActionFunc2)(NULL);
@@ -301,7 +274,6 @@ BOOL daNpc_seiB_c::evtTalk() {
     return 1;
 }
 
-/* 80AC59F4-80AC5ABC 0009F4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_seiB_cFv */
 BOOL daNpc_seiB_c::evtCutProc() {
     BOOL rv = 0;
     int staffID = dComIfGp_getEventManager().getMyStaffId("Seib", this, -1);
@@ -317,7 +289,6 @@ BOOL daNpc_seiB_c::evtCutProc() {
     return rv;
 }
 
-/* 80AC5ABC-80AC5B44 000ABC 0088+00 1/0 0/0 0/0 .text            action__12daNpc_seiB_cFv */
 void daNpc_seiB_c::action() {
     if (mActionFunc1) {
         if (mActionFunc2 == mActionFunc1) {
@@ -328,7 +299,6 @@ void daNpc_seiB_c::action() {
     }
 }
 
-/* 80AC5B44-80AC5BC4 000B44 0080+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_seiB_cFv */
 void daNpc_seiB_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
@@ -336,19 +306,16 @@ void daNpc_seiB_c::beforeMove() {
     ctrlWaitAnm();
 }
 
-/* 80AC5BC4-80AC5C20 000BC4 005C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_seiB_cFv */
 void daNpc_seiB_c::setAttnPos() {
     setMtx();
     eyePos = current.pos;
     attention_info.position = current.pos;
 }
 
-/* 80AC5C20-80AC5C28 000C20 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_seiB_cFv */
 int daNpc_seiB_c::drawDbgInfo() {
     return false;
 }
 
-/* 80AC5C28-80AC5DC0 000C28 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_seiB_cFiifi */
 bool daNpc_seiB_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     static struct {
         int field_0x0;
@@ -409,21 +376,16 @@ bool daNpc_seiB_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int
     return 1;
 }
 
-/* 80AC5DC0-80AC5E08 000DC0 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_seiB_cFv */
 int daNpc_seiB_c::selectAction() {
     mActionFunc1 = NULL;
     mActionFunc1 = &daNpc_seiB_c::wait;
     return 1;
 }
 
-/* 80AC5E08-80AC5E34 000E08 002C+00 1/1 0/0 0/0 .text
- * chkAction__12daNpc_seiB_cFM12daNpc_seiB_cFPCvPvPv_i */
 int daNpc_seiB_c::chkAction(int (daNpc_seiB_c::*action)(void*)) {
     return mActionFunc2 == action;
 }
 
-/* 80AC5E34-80AC5EDC 000E34 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_seiB_cFM12daNpc_seiB_cFPCvPvPv_i */
 int daNpc_seiB_c::setAction(int (daNpc_seiB_c::*action)(void*)) {
     mMode = 3;
     if (mActionFunc2) {
@@ -439,7 +401,6 @@ int daNpc_seiB_c::setAction(int (daNpc_seiB_c::*action)(void*)) {
     return 1;
 }
 
-/* 80AC5EDC-80AC6140 000EDC 0264+00 1/1 0/0 0/0 .text            ctrlWaitAnm__12daNpc_seiB_cFv */
 void daNpc_seiB_c::ctrlWaitAnm() {
     switch (mAnim) {
     case 0:
@@ -502,7 +463,6 @@ void daNpc_seiB_c::ctrlWaitAnm() {
     JUT_ASSERT(1068, FALSE);
 }
 
-/* 80AC6140-80AC616C 001140 002C+00 1/0 0/0 0/0 .text            wait__12daNpc_seiB_cFPv */
 int daNpc_seiB_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -518,7 +478,6 @@ int daNpc_seiB_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80AC616C-80AC620C 00116C 00A0+00 2/0 0/0 0/0 .text            talk__12daNpc_seiB_cFPv */
 int daNpc_seiB_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -540,46 +499,38 @@ int daNpc_seiB_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80AC620C-80AC622C 00120C 0020+00 1/0 0/0 0/0 .text            daNpc_seiB_Create__FPv */
 static int daNpc_seiB_Create(void* param_1) {
     daNpc_seiB_c* i_this = (daNpc_seiB_c*)param_1;
     return i_this->create();
 }
 
-/* 80AC622C-80AC624C 00122C 0020+00 1/0 0/0 0/0 .text            daNpc_seiB_Delete__FPv */
 static int daNpc_seiB_Delete(void* param_1) {
     daNpc_seiB_c* i_this = (daNpc_seiB_c*)param_1;
     return i_this->Delete();
 }
 
-/* 80AC624C-80AC626C 00124C 0020+00 1/0 0/0 0/0 .text            daNpc_seiB_Execute__FPv */
 static int daNpc_seiB_Execute(void* param_1) {
     daNpc_seiB_c* i_this = (daNpc_seiB_c*)param_1;
     return i_this->Execute();
 }
 
-/* 80AC626C-80AC628C 00126C 0020+00 1/0 0/0 0/0 .text            daNpc_seiB_Draw__FPv */
 static int daNpc_seiB_Draw(void* param_1) {
     daNpc_seiB_c* i_this = (daNpc_seiB_c*)param_1;
     return i_this->Draw();
 }
 
-/* 80AC628C-80AC6294 00128C 0008+00 1/0 0/0 0/0 .text            daNpc_seiB_IsDelete__FPv */
 static int daNpc_seiB_IsDelete(void* param_1) {
     return 1;
 }
 
-/* 80AC744C-80AC7450 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_seiB_Param_c l_HIO;
 
-/* 80AC729C-80AC72BC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_seiB_MethodTable */
 static actor_method_class daNpc_seiB_MethodTable = {
     (process_method_func)daNpc_seiB_Create,  (process_method_func)daNpc_seiB_Delete,
     (process_method_func)daNpc_seiB_Execute, (process_method_func)daNpc_seiB_IsDelete,
     (process_method_func)daNpc_seiB_Draw,
 };
 
-/* 80AC72BC-80AC72EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SEIB */
 extern actor_process_profile_definition g_profile_NPC_SEIB = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp
index 1cfb261bee..b6f10081f2 100644
--- a/src/d/actor/d_a_npc_seic.cpp
+++ b/src/d/actor/d_a_npc_seic.cpp
@@ -8,64 +8,52 @@
 #include "d/actor/d_a_npc_seic.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80AC9310-80AC9318 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {9, 1}
 };
 
-/* 80AC9318-80AC9330 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {"NO_RESPONSE",0 }
 };
 
-/* 80AC9330-80AC9338 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "seiC"
 };
 
-/* 80AC9338-80AC933C 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 80AC933C-80AC9344 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80AC9344-80AC9360 000054 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {
     -1, 0, 0, -1, 0, 0, 0
 };
 
-/* 80AC9360-80AC937C 000070 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData = {
     6, 2, 1, -1, 0, 0, 0, 0
 };
 
-/* 80AC937C-80AC938C 00008C 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AC938C-80AC939C 00009C 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AC939C-80AC93A0 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_seiC_c */
 char* daNpc_seiC_c::mCutNameList = "";
 
-/* 80AC93A0-80AC93AC 0000B0 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_seiC_c */
 daNpc_seiC_c::cutFunc daNpc_seiC_c::mCutList[1] = {
     0
 };
 
-/* 80AC754C-80AC75E8 0000EC 009C+00 1/0 0/0 0/0 .text            __dt__12daNpc_seiC_cFv */
 daNpc_seiC_c::~daNpc_seiC_c() {
     OS_REPORT("|%06d:%x|daNpc_seiC_c -> デストラクト\n", g_Counter.mCounter0, this);
     
@@ -82,7 +70,6 @@ daNpc_seiC_c::~daNpc_seiC_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AC921C-80AC92B0 000000 0094+00 4/4 0/0 0/0 .rodata          m__18daNpc_seiC_Param_c */
 daNpc_seiC_HIOParam const daNpc_seiC_Param_c::m = {
     0.0f,
     0.0f,
@@ -123,10 +110,8 @@ daNpc_seiC_HIOParam const daNpc_seiC_Param_c::m = {
     1200.0f,
 };
 
-/* 80AC958C-80AC9590 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_seiC_Param_c l_HIO;
 
-/* 80AC75E8-80AC7828 000188 0240+00 1/1 0/0 0/0 .text            create__12daNpc_seiC_cFv */
 int daNpc_seiC_c::create() {
     daNpcT_ct(this, daNpc_seiC_c, &l_faceMotionAnmData, &l_motionAnmData, l_faceMotionSequenceData, 
                        4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -176,7 +161,6 @@ int daNpc_seiC_c::create() {
     return phase;
 }
 
-/* 80AC7828-80AC7980 0003C8 0158+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_seiC_cFv */
 int daNpc_seiC_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]);
     JUT_ASSERT(424, NULL != mdlData_p);
@@ -199,7 +183,6 @@ int daNpc_seiC_c::CreateHeap() {
     return 0;
 }
 
-/* 80AC7980-80AC79B4 000520 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_seiC_cFv */
 int daNpc_seiC_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_seiC_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -207,12 +190,10 @@ int daNpc_seiC_c::Delete() {
     return 1;
 }
 
-/* 80AC79B4-80AC79D4 000554 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_seiC_cFv */
 int daNpc_seiC_c::Execute() {
     return execute();
 }
 
-/* 80AC79D4-80AC7A68 000574 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_seiC_cFv */
 int daNpc_seiC_c::Draw() {
     daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
     if (matAnm != NULL) {
@@ -223,13 +204,11 @@ int daNpc_seiC_c::Draw() {
     return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80AC7A68-80AC7A88 000608 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_seiC_cFP10fopAc_ac_c */
 int daNpc_seiC_c::createHeapCallBack(fopAc_ac_c* actor) {
     daNpc_seiC_c* i_this = (daNpc_seiC_c*)actor;
     return i_this->CreateHeap();
 }
 
-/* 80AC7A88-80AC7AA8 000628 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_seiC_cFv */
 u8 daNpc_seiC_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
         case 0:
@@ -239,7 +218,6 @@ u8 daNpc_seiC_c::getType() {
     return TYPE_1;
 }
 
-/* 80AC7AA8-80AC7AC4 000648 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_seiC_cFv */
 u32 daNpc_seiC_c::getFlowNodeNo() {
     u16 rv = home.angle.x;
     if (rv == 0xffff) {
@@ -248,12 +226,10 @@ u32 daNpc_seiC_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80AC7AC4-80AC7ACC 000664 0008+00 1/1 0/0 0/0 .text            isDelete__12daNpc_seiC_cFv */
 int daNpc_seiC_c::isDelete() {
     return 0;
 }
 
-/* 80AC7ACC-80AC7C1C 00066C 0150+00 1/1 0/0 0/0 .text            reset__12daNpc_seiC_cFv */
 void daNpc_seiC_c::reset() {
     initialize();
     int size = (u8*)&field_0xe60 - (u8*)&mAction;
@@ -267,7 +243,6 @@ void daNpc_seiC_c::reset() {
     mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }
 
-/* 80AC7C1C-80AC7D34 0007BC 0118+00 1/0 0/0 0/0 .text            setParam__12daNpc_seiC_cFv */
 void daNpc_seiC_c::setParam() {
     selectAction();
     srchActors();
@@ -295,12 +270,10 @@ void daNpc_seiC_c::setParam() {
     mMorfFrames = daNpc_seiC_Param_c::m.mMorfFrames;
 }
 
-/* 80AC7D48-80AC7D4C 0008E8 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_seiC_cFv */
 void daNpc_seiC_c::srchActors() {
     /* empty function */
 }
 
-/* 80AC7D4C-80AC7E4C 0008EC 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_seiC_cFv */
 BOOL daNpc_seiC_c::evtTalk() {
     if (chkAction(&daNpc_seiC_c::talk) != 0) {
         (this->*mAction2)(NULL);
@@ -322,7 +295,6 @@ BOOL daNpc_seiC_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AC7E4C-80AC7F14 0009EC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_seiC_cFv */
 BOOL daNpc_seiC_c::evtCutProc() {
     BOOL rv = 0;
     int staffID = dComIfGp_getEventManager().getMyStaffId("Seic", this, -1);
@@ -338,7 +310,6 @@ BOOL daNpc_seiC_c::evtCutProc() {
     return rv;
 }
 
-/* 80AC7F14-80AC7F9C 000AB4 0088+00 1/0 0/0 0/0 .text            action__12daNpc_seiC_cFv */
 void daNpc_seiC_c::action() {
     if (mAction) {
         if (mAction2 == mAction) {
@@ -349,7 +320,6 @@ void daNpc_seiC_c::action() {
     }
 }
 
-/* 80AC7F9C-80AC801C 000B3C 0080+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_seiC_cFv */
 void daNpc_seiC_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
@@ -357,19 +327,16 @@ void daNpc_seiC_c::beforeMove() {
     ctrlWaitAnm();
 }
 
-/* 80AC801C-80AC8078 000BBC 005C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_seiC_cFv */
 void daNpc_seiC_c::setAttnPos() {
     setMtx();
     eyePos = current.pos;
     attention_info.position = current.pos;
 }
 
-/* 80AC8078-80AC8080 000C18 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_seiC_cFv */
 int daNpc_seiC_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AC8080-80AC8218 000C20 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_seiC_cFiifi */
 bool daNpc_seiC_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     static struct {
         int field_0x0;
@@ -422,19 +389,16 @@ bool daNpc_seiC_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int
     return 1;
 }
 
-/* 80AC8218-80AC8260 000DB8 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_seiC_cFv */
 int daNpc_seiC_c::selectAction() {
     mAction = NULL;
     mAction = &daNpc_seiC_c::wait;
     return 1;
 }
 
-/* 80AC8260-80AC828C 000E00 002C+00 1/1 0/0 0/0 .text            chkAction__12daNpc_seiC_cFM12daNpc_seiC_cFPCvPvPv_i */
 int daNpc_seiC_c::chkAction(int (daNpc_seiC_c::*action)(void*)) {
     return mAction2 == action;
 }
 
-/* 80AC828C-80AC8334 000E2C 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_seiC_cFM12daNpc_seiC_cFPCvPvPv_i */
 int daNpc_seiC_c::setAction(int (daNpc_seiC_c::*action)(void*)) {
     mMode = 3;
     if (mAction2) {
@@ -450,12 +414,10 @@ int daNpc_seiC_c::setAction(int (daNpc_seiC_c::*action)(void*)) {
     return 1;
 }
 
-/* 80AC8334-80AC8338 000ED4 0004+00 1/1 0/0 0/0 .text            ctrlWaitAnm__12daNpc_seiC_cFv */
 void daNpc_seiC_c::ctrlWaitAnm() {
     /* empty function */
 }
 
-/* 80AC8338-80AC8364 000ED8 002C+00 1/0 0/0 0/0 .text            wait__12daNpc_seiC_cFPv */
 int daNpc_seiC_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -471,7 +433,6 @@ int daNpc_seiC_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AC8364-80AC8404 000F04 00A0+00 2/0 0/0 0/0 .text            talk__12daNpc_seiC_cFPv */
 int daNpc_seiC_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -493,36 +454,30 @@ int daNpc_seiC_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80AC8404-80AC8424 000FA4 0020+00 1/0 0/0 0/0 .text            daNpc_seiC_Create__FPv */
 static int daNpc_seiC_Create(void* param_1) {
     daNpc_seiC_c* i_this = (daNpc_seiC_c*)param_1;
     return i_this->create();
 }
 
-/* 80AC8424-80AC8444 000FC4 0020+00 1/0 0/0 0/0 .text            daNpc_seiC_Delete__FPv */
 static int daNpc_seiC_Delete(void* param_1) {
     daNpc_seiC_c* i_this = (daNpc_seiC_c*)param_1;
     return i_this->Delete();
 }
 
-/* 80AC8444-80AC8464 000FE4 0020+00 1/0 0/0 0/0 .text            daNpc_seiC_Execute__FPv */
 static int daNpc_seiC_Execute(void* param_1) {
     daNpc_seiC_c* i_this = (daNpc_seiC_c*)param_1;
     return i_this->Execute();
 }
 
-/* 80AC8464-80AC8484 001004 0020+00 1/0 0/0 0/0 .text            daNpc_seiC_Draw__FPv */
 static int daNpc_seiC_Draw(void* param_1) {
     daNpc_seiC_c* i_this = (daNpc_seiC_c*)param_1;
     return i_this->Draw();
 }
 
-/* 80AC8484-80AC848C 001024 0008+00 1/0 0/0 0/0 .text            daNpc_seiC_IsDelete__FPv */
 static int daNpc_seiC_IsDelete(void* param_1) {
     return 1;
 }
 
-/* 80AC93E0-80AC9400 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_seiC_MethodTable */
 static actor_method_class daNpc_seiC_MethodTable = {
     (process_method_func)daNpc_seiC_Create,
     (process_method_func)daNpc_seiC_Delete,
@@ -531,7 +486,6 @@ static actor_method_class daNpc_seiC_MethodTable = {
     (process_method_func)daNpc_seiC_Draw,
 };
 
-/* 80AC9400-80AC9430 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SEIC */
 extern actor_process_profile_definition g_profile_NPC_SEIC = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp
index 3be182d7f5..15cb2ff20e 100644
--- a/src/d/actor/d_a_npc_seid.cpp
+++ b/src/d/actor/d_a_npc_seid.cpp
@@ -8,64 +8,52 @@
 #include "d/actor/d_a_npc_seid.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80ACB450-80ACB458 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {5, 1}
 };
 
-/* 80ACB458-80ACB470 -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
     {"NO_RESPONSE",0 }
 };
 
-/* 80ACB470-80ACB478 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "seiD",
 };
 
-/* 80ACB478-80ACB47C 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 80ACB47C-80ACB484 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80ACB484-80ACB4A0 000054 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, 0, 0, -1, 0, 0, 0},
 };
 
-/* 80ACB4A0-80ACB4BC 000070 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {-1, 2, 0, -1, 0, 0, 0, 0},
 };
 
-/* 80ACB4BC-80ACB4CC 00008C 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80ACB4CC-80ACB4DC 00009C 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80ACB4DC-80ACB4E0 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_seiD_c */
 char* daNpc_seiD_c::mCutNameList = "";
 
-/* 80ACB4E0-80ACB4EC 0000B0 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_seiD_c */
 daNpc_seiD_c::cutFunc daNpc_seiD_c::mCutList[1] = {
     0
 };
 
-/* 80AC968C-80AC9728 0000EC 009C+00 1/0 0/0 0/0 .text            __dt__12daNpc_seiD_cFv */
 daNpc_seiD_c::~daNpc_seiD_c() {
     OS_REPORT("|%06d:%x|daNpc_seiD_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -82,8 +70,6 @@ daNpc_seiD_c::~daNpc_seiD_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80ACB35C-80ACB3F0 000000 0094+00 4/4 0/0 0/0 .rodata          m__18daNpc_seiD_Param_c */
 daNpc_seiD_HIOParam const daNpc_seiD_Param_c::m = {
     0.0f,
     0.0f,
@@ -124,10 +110,8 @@ daNpc_seiD_HIOParam const daNpc_seiD_Param_c::m = {
     1200.0f,
 };
 
-/* 80ACB6CC-80ACB6D0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_seiD_Param_c l_HIO;
 
-/* 80AC9728-80AC9968 000188 0240+00 1/1 0/0 0/0 .text            create__12daNpc_seiD_cFv */
 int daNpc_seiD_c::create() {
     daNpcT_ct(this, daNpc_seiD_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 
         4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -177,7 +161,6 @@ int daNpc_seiD_c::create() {
     return phase;
 }
 
-/* 80AC9968-80AC9AC0 0003C8 0158+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_seiD_cFv */
 int daNpc_seiD_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]);
     JUT_ASSERT(424, NULL != mdlData_p);
@@ -200,7 +183,6 @@ int daNpc_seiD_c::CreateHeap() {
     return 0;
 }
 
-/* 80AC9AC0-80AC9AF4 000520 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_seiD_cFv */
 int daNpc_seiD_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_seiD_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -208,12 +190,10 @@ int daNpc_seiD_c::Delete() {
     return 1;
 }
 
-/* 80AC9AF4-80AC9B14 000554 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_seiD_cFv */
 int daNpc_seiD_c::Execute() {
     return execute();
 }
 
-/* 80AC9B14-80AC9BA8 000574 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_seiD_cFv */
 int daNpc_seiD_c::Draw() {
     daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
     if (matAnm != NULL) {
@@ -224,13 +204,11 @@ int daNpc_seiD_c::Draw() {
     return draw(FALSE, TRUE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80AC9BA8-80AC9BC8 000608 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_seiD_cFP10fopAc_ac_c */
 int daNpc_seiD_c::createHeapCallBack(fopAc_ac_c* actor) {
     daNpc_seiD_c* i_this = (daNpc_seiD_c*)actor;
     return i_this->CreateHeap();
 }
 
-/* 80AC9BC8-80AC9BE8 000628 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_seiD_cFv */
 u8 daNpc_seiD_c::getType() {
     switch ((u8)fopAcM_GetParam(this)) {
         case 0:
@@ -240,7 +218,6 @@ u8 daNpc_seiD_c::getType() {
     return TYPE_1;
 }
 
-/* 80AC9BE8-80AC9C04 000648 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_seiD_cFv */
 u32 daNpc_seiD_c::getFlowNodeNo() {
     u16 rv = home.angle.x;
     if (rv == 0xffff) {
@@ -249,12 +226,10 @@ u32 daNpc_seiD_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80AC9C04-80AC9C0C 000664 0008+00 1/1 0/0 0/0 .text            isDelete__12daNpc_seiD_cFv */
 int daNpc_seiD_c::isDelete() {
     return 0;
 }
 
-/* 80AC9C0C-80AC9D5C 00066C 0150+00 1/1 0/0 0/0 .text            reset__12daNpc_seiD_cFv */
 void daNpc_seiD_c::reset() {
     initialize();
     int size = (u8*)&field_0xe60 - (u8*)&mAction;
@@ -268,7 +243,6 @@ void daNpc_seiD_c::reset() {
     mMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }
 
-/* 80AC9D5C-80AC9E74 0007BC 0118+00 1/0 0/0 0/0 .text            setParam__12daNpc_seiD_cFv */
 void daNpc_seiD_c::setParam() {
     selectAction();
     srchActors();
@@ -295,12 +269,10 @@ void daNpc_seiD_c::setParam() {
     mMorfFrames = daNpc_seiD_Param_c::m.mMorfFrames;
 }
 
-/* 80AC9E88-80AC9E8C 0008E8 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_seiD_cFv */
 void daNpc_seiD_c::srchActors() {
     /* empty function */
 }
 
-/* 80AC9E8C-80AC9F8C 0008EC 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_seiD_cFv */
 BOOL daNpc_seiD_c::evtTalk() {
     if (chkAction(&daNpc_seiD_c::talk) != 0) {
         (this->*mAction2)(NULL);
@@ -321,7 +293,6 @@ BOOL daNpc_seiD_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AC9F8C-80ACA054 0009EC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_seiD_cFv */
 BOOL daNpc_seiD_c::evtCutProc() {
     BOOL rv = 0;
     int staffID = dComIfGp_getEventManager().getMyStaffId("Seid", this, -1);
@@ -337,7 +308,6 @@ BOOL daNpc_seiD_c::evtCutProc() {
     return rv;
 }
 
-/* 80ACA054-80ACA0DC 000AB4 0088+00 1/0 0/0 0/0 .text            action__12daNpc_seiD_cFv */
 void daNpc_seiD_c::action() {
     if (mAction) {
         if (mAction2 == mAction) {
@@ -348,7 +318,6 @@ void daNpc_seiD_c::action() {
     }
 }
 
-/* 80ACA0DC-80ACA15C 000B3C 0080+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_seiD_cFv */
 void daNpc_seiD_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
@@ -356,19 +325,16 @@ void daNpc_seiD_c::beforeMove() {
     ctrlWaitAnm();
 }
 
-/* 80ACA15C-80ACA1B8 000BBC 005C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_seiD_cFv */
 void daNpc_seiD_c::setAttnPos() {
     setMtx();
     eyePos = current.pos;
     attention_info.position = current.pos;
 }
 
-/* 80ACA1B8-80ACA1C0 000C18 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_seiD_cFv */
 int daNpc_seiD_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80ACA1C0-80ACA358 000C20 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_seiD_cFiifi */
 bool daNpc_seiD_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     static struct {
         int field_0x0;
@@ -421,19 +387,16 @@ bool daNpc_seiD_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int
     return 1;
 }
 
-/* 80ACA358-80ACA3A0 000DB8 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_seiD_cFv */
 int daNpc_seiD_c::selectAction() {
     mAction = NULL;
     mAction = &daNpc_seiD_c::wait;
     return 1;
 }
 
-/* 80ACA3A0-80ACA3CC 000E00 002C+00 1/1 0/0 0/0 .text            chkAction__12daNpc_seiD_cFM12daNpc_seiD_cFPCvPvPv_i */
 int daNpc_seiD_c::chkAction(int (daNpc_seiD_c::*action)(void*)) {
     return mAction2 == action;
 }
 
-/* 80ACA3CC-80ACA474 000E2C 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_seiD_cFM12daNpc_seiD_cFPCvPvPv_i */
 int daNpc_seiD_c::setAction(int (daNpc_seiD_c::*action)(void*)) {
     mMode = 3;
     if (mAction2) {
@@ -449,12 +412,10 @@ int daNpc_seiD_c::setAction(int (daNpc_seiD_c::*action)(void*)) {
     return 1;
 }
 
-/* 80ACA474-80ACA478 000ED4 0004+00 1/1 0/0 0/0 .text            ctrlWaitAnm__12daNpc_seiD_cFv */
 void daNpc_seiD_c::ctrlWaitAnm() {
     /* empty function */
 }
 
-/* 80ACA478-80ACA4A4 000ED8 002C+00 1/0 0/0 0/0 .text            wait__12daNpc_seiD_cFPv */
 int daNpc_seiD_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -470,7 +431,6 @@ int daNpc_seiD_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80ACA4A4-80ACA544 000F04 00A0+00 2/0 0/0 0/0 .text            talk__12daNpc_seiD_cFPv */
 int daNpc_seiD_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -492,36 +452,30 @@ int daNpc_seiD_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80ACA544-80ACA564 000FA4 0020+00 1/0 0/0 0/0 .text            daNpc_seiD_Create__FPv */
 static int daNpc_seiD_Create(void* param_1) {
     daNpc_seiD_c* i_this = (daNpc_seiD_c*)param_1;
     return i_this->create();
 }
 
-/* 80ACA564-80ACA584 000FC4 0020+00 1/0 0/0 0/0 .text            daNpc_seiD_Delete__FPv */
 static int daNpc_seiD_Delete(void* param_1) {
     daNpc_seiD_c* i_this = (daNpc_seiD_c*)param_1;
     return i_this->Delete();
 }
 
-/* 80ACA584-80ACA5A4 000FE4 0020+00 1/0 0/0 0/0 .text            daNpc_seiD_Execute__FPv */
 static int daNpc_seiD_Execute(void* param_1) {
     daNpc_seiD_c* i_this = (daNpc_seiD_c*)param_1;
     return i_this->Execute();
 }
 
-/* 80ACA5A4-80ACA5C4 001004 0020+00 1/0 0/0 0/0 .text            daNpc_seiD_Draw__FPv */
 static int daNpc_seiD_Draw(void* param_1) {
     daNpc_seiD_c* i_this = (daNpc_seiD_c*)param_1;
     return i_this->Draw();
 }
 
-/* 80ACA5C4-80ACA5CC 001024 0008+00 1/0 0/0 0/0 .text            daNpc_seiD_IsDelete__FPv */
 static int daNpc_seiD_IsDelete(void* param_1) {
     return 1;
 }
 
-/* 80ACB520-80ACB540 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_seiD_MethodTable */
 static actor_method_class daNpc_seiD_MethodTable = {
     (process_method_func)daNpc_seiD_Create,
     (process_method_func)daNpc_seiD_Delete,
@@ -530,7 +484,6 @@ static actor_method_class daNpc_seiD_MethodTable = {
     (process_method_func)daNpc_seiD_Draw,
 };
 
-/* 80ACB540-80ACB570 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SEID */
 extern actor_process_profile_definition g_profile_NPC_SEID = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp
index cdf9f651f2..784e45eb13 100644
--- a/src/d/actor/d_a_npc_seira.cpp
+++ b/src/d/actor/d_a_npc_seira.cpp
@@ -9,13 +9,11 @@
 #include "d/d_meter_HIO.h"
 
 
-/* 80ACFFB0-80ACFFC0 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {4, 3},
     {17, 2},
 };
 
-/* 80ACFFC0-80ACFFE0 -00001 0020+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[4] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
@@ -23,7 +21,6 @@ static daNpcT_evtData_c l_evtList[4] = {
     {"CONVERSATION_ABOUT_SARU02", 3},
 };
 
-/* 80ACFFE0-80ACFFF4 -00001 0014+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[5] = {
     "",
     "Seira",
@@ -32,19 +29,15 @@ static char* l_resNameList[5] = {
     "Seira_p1",
 };
 
-/* 80ACFFF4-80ACFFF8 000064 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {3, 1, 2, -1};
 
-/* 80ACFFF8-80ACFFFC 000068 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {3, 4, -1};
 
-/* 80ACFFFC-80AD0018 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0,
 };
 
-/* 80AD0018-80AD01A0 000088 0188+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {-1, 0, 0, 67, 2, 1, 1},
     {14, 0, 1, 67, 2, 1, 1},
@@ -62,7 +55,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {18, 2, 1, 81, 2, 1, 0},
 };
 
-/* 80AD01A0-80AD0478 000210 02D8+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[26] = {
     {42, 2, 1, 45, 0, 1, 1, 12},
     {37, 2, 1, 55, 0, 1, 0, 12},
@@ -92,7 +84,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[26] = {
     {38, 0, 1, 45, 0, 1, 1, 12},
 };
 
-/* 80AD0478-80AD0558 0004E8 00E0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -103,7 +94,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] =
     {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD0558-80AD06F8 0005C8 01A0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[104] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -120,22 +110,18 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[104] = {
     {25, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD06F8-80AD0700 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Seira_c */
 char* daNpc_Seira_c::mCutNameList[2] = {
     "",
     "CONVERSATION_ABOUT_SARU",
 };
 
-/* 80AD070C-80AD0724 00077C 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_Seira_c */
 daNpc_Seira_c::cutFunc daNpc_Seira_c::mCutList[2] = {
     NULL,
     &daNpc_Seira_c::cutConversationAboutSaru,
 };
 
-/* 80AD0B04-80AD0B08 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Seira_Param_c l_HIO;
 
-/* 80ACB7CC-80ACB918 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daNpc_Seira_cFv */
 daNpc_Seira_c::~daNpc_Seira_c() {
     deleteObject();
     if (mpMorf[0] != 0) {
@@ -149,8 +135,6 @@ daNpc_Seira_c::~daNpc_Seira_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80ACFDF0-80ACFE7C 000000 008C+00 9/9 0/0 0/0 .rodata          m__19daNpc_Seira_Param_c */
 const daNpc_Seira_HIOParam daNpc_Seira_Param_c::m = {
     210.0f,
     -3.0f,
@@ -195,7 +179,6 @@ const daNpc_Seira_HIOParam daNpc_Seira_Param_c::m = {
     0.0f,
 };
 
-/* 80ACB918-80ACBBD4 000238 02BC+00 1/1 0/0 0/0 .text            create__13daNpc_Seira_cFv */
 int daNpc_Seira_c::create() {
     daNpcT_ct(this, daNpc_Seira_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -244,7 +227,6 @@ int daNpc_Seira_c::create() {
     return rv;
 }
 
-/* 80ACBBD4-80ACBF40 0004F4 036C+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Seira_cFv */
 int daNpc_Seira_c::CreateHeap() {
     enum XXX { x0 = 0, x1=1};
     J3DModelData* modelData = NULL;
@@ -301,14 +283,12 @@ int daNpc_Seira_c::CreateHeap() {
     return 0;
 }
 
-/* 80ACC0FC-80ACC130 000A1C 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Seira_cFv */
 int daNpc_Seira_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Seira_c();
     return 1;
 }
 
-/* 80ACC130-80ACC21C 000A50 00EC+00 2/2 0/0 0/0 .text            Execute__13daNpc_Seira_cFv */
 int daNpc_Seira_c::Execute() {
     if (!mNpcType && !mCreating && !checkShopOpen() && !field_0x10fd
         && checkStageIsSeirasShop() && (mChkBottle || daNpcT_chkEvtBit(0x95))) {
@@ -326,7 +306,6 @@ int daNpc_Seira_c::Execute() {
     return 1;
 }
 
-/* 80ACC21C-80ACC2B0 000B3C 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Seira_cFv */
 int daNpc_Seira_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -335,14 +314,10 @@ int daNpc_Seira_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80ACC2B0-80ACC2D0 000BD0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Seira_cFP10fopAc_ac_c            */
 int daNpc_Seira_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Seira_c*>(i_this)->CreateHeap();
 }
 
-/* 80ACC2D0-80ACC328 000BF0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Seira_cFP8J3DJointi               */
 int daNpc_Seira_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -355,7 +330,6 @@ int daNpc_Seira_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80ACC328-80ACC424 000C48 00FC+00 1/1 0/0 0/0 .text            getType__13daNpc_Seira_cFv */
 u8 daNpc_Seira_c::getType() {
     // Sera can show up in two places:
     //  1. F_SP103-R00	Ordon Village
@@ -396,7 +370,6 @@ u8 daNpc_Seira_c::getType() {
     return 6;
 }
 
-/* 80ACC424-80ACC440 000D44 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__13daNpc_Seira_cFv */
 int daNpc_Seira_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -406,7 +379,6 @@ int daNpc_Seira_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80ACC440-80ACC4A8 000D60 0068+00 1/1 0/0 0/0 .text            checkBottle__13daNpc_Seira_cFv */
 u8 daNpc_Seira_c::checkBottle() {
     u8 prm = fopAcM_GetParam(this);
     if (dComIfGs_isDarkClearLV(0)) {
@@ -421,7 +393,6 @@ u8 daNpc_Seira_c::checkBottle() {
     }
 }
 
-/* 80ACC4A8-80ACC4C8 000DC8 0020+00 1/1 0/0 0/0 .text            getNpcType__13daNpc_Seira_cFv */
 u8 daNpc_Seira_c::getNpcType() {
     u8 prm = (fopAcM_GetParam(this) & 0xF0000) >> 8;
     if (prm == 1) {
@@ -431,12 +402,10 @@ u8 daNpc_Seira_c::getNpcType() {
     return 0;
 }
 
-/* 80ACC4C8-80ACC4D0 000DE8 0008+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Seira_cFv */
 int daNpc_Seira_c::isDelete() {
     return FALSE;
 }
 
-/* 80ACC4D0-80ACC618 000DF0 0148+00 1/1 0/0 0/0 .text            reset__13daNpc_Seira_cFv */
 void daNpc_Seira_c::reset() {
     initialize();
     memset(&mNextAction, 0, (u8*)&field_0x1104 - (u8*)&mNextAction);
@@ -451,7 +420,6 @@ void daNpc_Seira_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80ACC618-80ACC69C 000F38 0084+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Seira_cFi */
 void daNpc_Seira_c::afterJntAnm(int arg0) {
     if (arg0 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -462,7 +430,6 @@ void daNpc_Seira_c::afterJntAnm(int arg0) {
     }
 }
 
-/* 80ACC69C-80ACC818 000FBC 017C+00 1/0 0/0 0/0 .text            setParam__13daNpc_Seira_cFv */
 void daNpc_Seira_c::setParam() {
     if (field_0x10fc == 1) {
         if (mShopProcess == 2) {
@@ -511,8 +478,6 @@ void daNpc_Seira_c::setParam() {
     mMorfFrames = daNpc_Seira_Param_c::m.common.morf_frame;
 }
 
-/* 80ACC818-80ACC8C0 001138 00A8+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Seira_cFv
- */
 BOOL daNpc_Seira_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Seira_c::talk)) {
         switch (mType) {
@@ -537,7 +502,6 @@ BOOL daNpc_Seira_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80ACC8C0-80ACC980 0011E0 00C0+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Seira_cFv */
 void daNpc_Seira_c::setAfterTalkMotion() {
     int iVar2 = 0;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -563,7 +527,6 @@ void daNpc_Seira_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80ACC980-80ACCA48 0012A0 00C8+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Seira_cFv */
 void daNpc_Seira_c::srchActors() {
     switch (mType) {
         case 1:
@@ -595,7 +558,6 @@ void daNpc_Seira_c::srchActors() {
     }
 }
 
-/* 80ACCA48-80ACCBEC 001368 01A4+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Seira_cFv */
 BOOL daNpc_Seira_c::evtTalk() {
     if (field_0x10fd) {
         if (chkAction(&daNpc_Seira_c::shop)) {
@@ -615,7 +577,6 @@ BOOL daNpc_Seira_c::evtTalk() {
     return 1;
 }
 
-/* 80ACCBEC-80ACCCBC 00150C 00D0+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Seira_cFv */
 BOOL daNpc_Seira_c::evtCutProc() {
     BOOL retval = FALSE;
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Seira", this, -1);
@@ -633,7 +594,6 @@ BOOL daNpc_Seira_c::evtCutProc() {
     return retval;
 }
 
-/* 80ACCCBC-80ACCE58 0015DC 019C+00 1/0 0/0 0/0 .text            action__13daNpc_Seira_cFv */
 void daNpc_Seira_c::action() {
     if (field_0x10fd == 0) {
         fopAc_ac_c* hit_chk = hitChk(&mCyl1, -1);
@@ -659,14 +619,12 @@ void daNpc_Seira_c::action() {
     }
 }
 
-/* 80ACCE58-80ACCED0 001778 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Seira_cFv */
 void daNpc_Seira_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80ACCED0-80ACD1D0 0017F0 0300+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Seira_cFv */
 void daNpc_Seira_c::setAttnPos() {
     cXyz eyeOffset(-30.0f, 10.0f, 0.0f);
     mStagger.calc(0);
@@ -708,7 +666,6 @@ void daNpc_Seira_c::setAttnPos() {
     }
 }
 
-/* 80ACD1D0-80ACD378 001AF0 01A8+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Seira_cFv */
 void daNpc_Seira_c::setCollision() {
     cXyz cStack_48;
     f32 cylH, wallR;
@@ -748,12 +705,10 @@ void daNpc_Seira_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80ACD378-80ACD380 001C98 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Seira_cFv */
 BOOL daNpc_Seira_c::drawDbgInfo() {
     return false;
 }
 
-/* 80ACD380-80ACD458 001CA0 00D8+00 1/0 0/0 0/0 .text            drawOtherMdl__13daNpc_Seira_cFv */
 void daNpc_Seira_c::drawOtherMdl() {
     cXyz sp8;
     itemRotate();
@@ -773,8 +728,6 @@ void daNpc_Seira_c::drawOtherMdl() {
     }
 }
 
-/* 80ACD458-80ACD538 001D78 00E0+00 2/2 0/0 0/0 .text            setBottleAnm__13daNpc_Seira_cFiifb
- */
 bool daNpc_Seira_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
     static int bottlAnmData[28][2] = {
         {-1, 2}, {-1, 2}, {-1, 2}, { 6, 2}, {11, 2}, {11, 2}, {10, 2}, { 9, 2},
@@ -802,13 +755,11 @@ bool daNpc_Seira_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
     return true;
 }
 
-/* 80ACD538-80ACD570 001E58 0038+00 1/0 0/0 0/0 .text afterSetMotionAnm__13daNpc_Seira_cFiifi */
 bool daNpc_Seira_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int arg3) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
     setBottleAnm(arg0, arg1, var_f30, 1);
 }
 
-/* 80ACD570-80ACD600 001E90 0090+00 1/0 0/0 0/0 .text            changeAnm__13daNpc_Seira_cFPiPi */
 void daNpc_Seira_c::changeAnm(int* arg0, int* arg1) {
     if (mType == 5) {
         switch (*arg0) {
@@ -832,7 +783,6 @@ void daNpc_Seira_c::changeAnm(int* arg0, int* arg1) {
     }
 }
 
-/* 80ACD600-80ACD6AC 001F20 00AC+00 2/0 0/0 0/0 .text            changeBck__13daNpc_Seira_cFPiPi */
 void daNpc_Seira_c::changeBck(int* arg0, int* arg1) {
     if (mType == 5) {
         switch (*arg0) {
@@ -864,7 +814,6 @@ void daNpc_Seira_c::changeBck(int* arg0, int* arg1) {
     }
 }
 
-/* 80ACD6AC-80ACD744 001FCC 0098+00 2/0 0/0 0/0 .text            changeBtp__13daNpc_Seira_cFPiPi */
 void daNpc_Seira_c::changeBtp(int* arg0, int* arg1) {
     if (mType == 5) {
         switch (*arg0) {
@@ -892,7 +841,6 @@ void daNpc_Seira_c::changeBtp(int* arg0, int* arg1) {
     }
 }
 
-/* 80ACD744-80ACD770 002064 002C+00 1/0 0/0 0/0 .text            changeBtk__13daNpc_Seira_cFPiPi */
 void daNpc_Seira_c::changeBtk(int* arg0, int* arg1) {
     if (mType == 5) {
         if (*arg0 != 0x2D) {
@@ -903,7 +851,6 @@ void daNpc_Seira_c::changeBtk(int* arg0, int* arg1) {
     }
 }
 
-/* 80ACD770-80ACD900 002090 0190+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Seira_cFv */
 int daNpc_Seira_c::selectAction() {
     mNextAction = NULL;
     // TODO: Debug-only set & return.
@@ -945,14 +892,10 @@ int daNpc_Seira_c::selectAction() {
     return 1;
 }
 
-/* 80ACD900-80ACD92C 002220 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Seira_cFM13daNpc_Seira_cFPCvPvPv_i        */
 int daNpc_Seira_c::chkAction(actionFunc i_action) {
     return mActFunc_0 == i_action;
 }
 
-/* 80ACD92C-80ACD9D4 00224C 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Seira_cFM13daNpc_Seira_cFPCvPvPv_i        */
 int daNpc_Seira_c::setAction(actionFunc i_action) {
     mMode = MODE_EXIT;
     if (mActFunc_0 != NULL) {
@@ -968,8 +911,6 @@ int daNpc_Seira_c::setAction(actionFunc i_action) {
     return 1;
 }
 
-/* 80ACD9D4-80ACDC6C 0022F4 0298+00 1/0 0/0 0/0 .text cutConversationAboutSaru__13daNpc_Seira_cFi
- */
 int daNpc_Seira_c::cutConversationAboutSaru(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1042,14 +983,11 @@ int daNpc_Seira_c::cutConversationAboutSaru(int arg0) {
     return retval;
 }
 
-/* 80ACDC6C-80ACDCE4 00258C 0078+00 4/4 0/0 0/0 .text checkStageIsSeirasShop__13daNpc_Seira_cFv */
 BOOL daNpc_Seira_c::checkStageIsSeirasShop() {
     return 0 == strcmp("R_SP01", dComIfGp_getStartStageName())
            && dComIfGp_getStartStageRoomNo() == 1 && !dComIfG_play_c::getLayerNo(0);
 }
 
-/* 80ACDCE4-80ACDD24 002604 0040+00 1/1 0/0 0/0 .text            getShopItemType__13daNpc_Seira_cFv
- */
 int daNpc_Seira_c::getShopItemType() {
     int item_type = 0;
     if (daNpcT_chkEvtBit(0x258)) {
@@ -1059,7 +997,6 @@ int daNpc_Seira_c::getShopItemType() {
     return item_type;
 }
 
-/* 80ACDD24-80ACDE74 002644 0150+00 1/0 0/0 0/0 .text            wait__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::wait(void*) {
     switch (mMode) {
         case 0:
@@ -1090,7 +1027,6 @@ int daNpc_Seira_c::wait(void*) {
     return 1;
 }
 
-/* 80ACDE74-80ACE098 002794 0224+00 2/0 0/0 0/0 .text            sit__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::sit(void*) {
     switch (mMode) {
         case 0:
@@ -1132,7 +1068,6 @@ int daNpc_Seira_c::sit(void*) {
     return 1;
 }
 
-/* 80ACE098-80ACE220 0029B8 0188+00 2/0 0/0 0/0 .text            happy__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::happy(void*) {
     switch (mMode) {
         case 0:
@@ -1167,7 +1102,6 @@ int daNpc_Seira_c::happy(void*) {
     return 1;
 }
 
-/* 80ACE220-80ACE4FC 002B40 02DC+00 2/0 0/0 0/0 .text            worry__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::worry(void*) {
     switch (mMode) {
         case 0:
@@ -1219,7 +1153,6 @@ int daNpc_Seira_c::worry(void*) {
     return 1;
 }
 
-/* 80ACE4FC-80ACE608 002E1C 010C+00 1/0 0/0 0/0 .text            sad__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::sad(void*) {
     switch (mMode) {
         case 0:
@@ -1247,7 +1180,6 @@ int daNpc_Seira_c::sad(void*) {
     return 1;
 }
 
-/* 80ACE608-80ACE714 002F28 010C+00 1/0 0/0 0/0 .text            lookaround__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::lookaround(void*) {
     switch (mMode) {
         case 0:
@@ -1275,8 +1207,6 @@ int daNpc_Seira_c::lookaround(void*) {
     return 1;
 }
 
-/* 80ACE714-80ACE828 003034 0114+00 1/0 0/0 0/0 .text            lookaround_wait__13daNpc_Seira_cFPv
- */
 int daNpc_Seira_c::lookaround_wait(void*) {
     switch (mMode) {
         case 0:
@@ -1303,7 +1233,6 @@ int daNpc_Seira_c::lookaround_wait(void*) {
     return 1;
 }
 
-/* 80ACE828-80ACE934 003148 010C+00 1/0 0/0 0/0 .text            smile__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::smile(void*) {
     switch (mMode) {
         case 0:
@@ -1331,7 +1260,6 @@ int daNpc_Seira_c::smile(void*) {
     return 1;
 }
 
-/* 80ACE934-80ACEAC4 003254 0190+00 3/0 0/0 0/0 .text            talk__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::talk(void* param_0) {
     int reg_r30 = 0;
     switch (mMode) {
@@ -1377,7 +1305,6 @@ int daNpc_Seira_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80ACEAC4-80ACECE8 0033E4 0224+00 2/0 0/0 0/0 .text            shop__13daNpc_Seira_cFPv */
 int daNpc_Seira_c::shop(void* param_0) {
     switch (mMode) {
         case 0:
@@ -1427,32 +1354,26 @@ int daNpc_Seira_c::shop(void* param_0) {
     return 0;
 }
 
-/* 80ACECE8-80ACED08 003608 0020+00 1/0 0/0 0/0 .text            daNpc_Seira_Create__FPv */
 static int daNpc_Seira_Create(void* i_this) {
     return static_cast<daNpc_Seira_c*>(i_this)->create();
 }
 
-/* 80ACED08-80ACED28 003628 0020+00 1/0 0/0 0/0 .text            daNpc_Seira_Delete__FPv */
 static int daNpc_Seira_Delete(void* i_this) {
     return static_cast<daNpc_Seira_c*>(i_this)->Delete();
 }
 
-/* 80ACED28-80ACED48 003648 0020+00 1/0 0/0 0/0 .text            daNpc_Seira_Execute__FPv */
 static int daNpc_Seira_Execute(void* i_this) {
     return static_cast<daNpc_Seira_c*>(i_this)->Execute();
 }
 
-/* 80ACED48-80ACED68 003668 0020+00 1/0 0/0 0/0 .text            daNpc_Seira_Draw__FPv */
 static int daNpc_Seira_Draw(void* i_this) {
     return static_cast<daNpc_Seira_c*>(i_this)->Draw();
 }
 
-/* 80ACED68-80ACED70 003688 0008+00 1/0 0/0 0/0 .text            daNpc_Seira_IsDelete__FPv */
 static int daNpc_Seira_IsDelete(void* param_0) {
     return 1;
 }
 
-/* 80AD0928-80AD0948 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Seira_MethodTable */
 static actor_method_class daNpc_Seira_MethodTable = {
     (process_method_func)daNpc_Seira_Create,
     (process_method_func)daNpc_Seira_Delete,
@@ -1461,7 +1382,6 @@ static actor_method_class daNpc_Seira_MethodTable = {
     (process_method_func)daNpc_Seira_Draw,
 };
 
-/* 80AD0948-80AD0978 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SEIRA */
 extern actor_process_profile_definition g_profile_NPC_SEIRA = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp
index 4a6a9f47d3..8702cce37a 100644
--- a/src/d/actor/d_a_npc_seira2.cpp
+++ b/src/d/actor/d_a_npc_seira2.cpp
@@ -7,19 +7,16 @@
 
 #include "d/actor/d_a_npc_seira2.h"
 
-/* 80AD4BB0-80AD4BC0 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     {4, 3},
     {17, 2},
 };
 
-/* 80AD4BC0-80AD4BD0 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
 };
 
-/* 80AD4BD0-80AD4BE0 -00001 0010+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[4] = {
     "",
     "Seira",
@@ -27,16 +24,13 @@ static char* l_resNameList[4] = {
     "Sera",
 };
 
-/* 80AD4BE0-80AD4BE4 000050 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {3, 1, 2, -1};
 
-/* 80AD4BE4-80AD4C00 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
 };
 
-/* 80AD4C00-80AD4D88 000070 0188+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {-1, 0, 0, 67, 2, 1, 1},
     {14, 0, 1, 67, 2, 1, 1},
@@ -54,7 +48,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[14] = {
     {18, 2, 1, 81, 2, 1, 0},
 };
 
-/* 80AD4D88-80AD5044 0001F8 02BC+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[25] = {
     {42, 2, 1, 45, 0, 1, 1, 12},
     {37, 2, 1, 55, 0, 1, 0, 12},
@@ -83,7 +76,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[25] = {
     {38, 0, 1, 45, 0, 1, 1, 12},
 };
 
-/* 80AD5044-80AD5124 0004B4 00E0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {7, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -94,7 +86,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[56] =
     {13, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD5124-80AD52B4 000594 0190+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -111,16 +102,12 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = {
     {24, 4, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD52B4-80AD52B8 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__14daNpc_Seira2_c */
 char* daNpc_Seira2_c::mCutNameList[1] = {""};
 
-/* 80AD52B8-80AD52C4 000728 000C+00 2/2 0/0 0/0 .data            mCutList__14daNpc_Seira2_c */
 daNpc_Seira2_c::cutFunc daNpc_Seira2_c::mCutList[1] = { NULL };
 
-/* 80AD5624-80AD5628 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Seira2_Param_c l_HIO;
 
-/* 80AD0C0C-80AD0D58 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__14daNpc_Seira2_cFv */
 daNpc_Seira2_c::~daNpc_Seira2_c() {
     deleteObject();
     if (mpMorf[0] != 0) {
@@ -134,8 +121,6 @@ daNpc_Seira2_c::~daNpc_Seira2_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80AD4A60-80AD4AEC 000000 008C+00 9/9 0/0 0/0 .rodata          m__20daNpc_Seira2_Param_c */
 const daNpc_Seira2_HIOParam daNpc_Seira2_Param_c::m = {
     210.0f,
     -3.0f,
@@ -180,7 +165,6 @@ const daNpc_Seira2_HIOParam daNpc_Seira2_Param_c::m = {
     0.0f,
 };
 
-/* 80AD0D58-80AD0FF8 000238 02A0+00 1/1 0/0 0/0 .text            create__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::create() {
     daNpcT_ct(this, daNpc_Seira2_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -228,7 +212,6 @@ int daNpc_Seira2_c::create() {
     return rv;
 }
 
-/* 80AD0FF8-80AD134C 0004D8 0354+00 1/1 0/0 0/0 .text            CreateHeap__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::CreateHeap() {
     enum XXX { x0 = 0, x1=1};
     J3DModelData* modelData = NULL;
@@ -280,14 +263,12 @@ int daNpc_Seira2_c::CreateHeap() {
     return 0;
 }
 
-/* 80AD1508-80AD153C 0009E8 0034+00 1/1 0/0 0/0 .text            Delete__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Seira2_c();
     return 1;
 }
 
-/* 80AD153C-80AD1610 000A1C 00D4+00 2/2 0/0 0/0 .text            Execute__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::Execute() {
     if (!mCreating && !checkShopOpen() && !field_0x10ED) {
         initShopSystem();
@@ -307,7 +288,6 @@ int daNpc_Seira2_c::Execute() {
     return 1;
 }
 
-/* 80AD1610-80AD16A4 000AF0 0094+00 1/1 0/0 0/0 .text            Draw__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -316,14 +296,10 @@ int daNpc_Seira2_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80AD16A4-80AD16C4 000B84 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daNpc_Seira2_cFP10fopAc_ac_c           */
 int daNpc_Seira2_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Seira2_c*>(i_this)->CreateHeap();
 }
 
-/* 80AD16C4-80AD171C 000BA4 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__14daNpc_Seira2_cFP8J3DJointi              */
 int daNpc_Seira2_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -336,7 +312,6 @@ int daNpc_Seira2_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80AD171C-80AD179C 000BFC 0080+00 1/1 0/0 0/0 .text            getType__14daNpc_Seira2_cFv */
 u8 daNpc_Seira2_c::getType() {
     if (dComIfGs_isDarkClearLV(0)) {
         return 3;
@@ -353,8 +328,6 @@ u8 daNpc_Seira2_c::getType() {
     return 0;
 }
 
-/* 80AD179C-80AD17B8 000C7C 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__14daNpc_Seira2_cFv
- */
 int daNpc_Seira2_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -364,13 +337,10 @@ int daNpc_Seira2_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80AD17B8-80AD17C4 000C98 000C+00 1/1 0/0 0/0 .text            getMaxNumItem__14daNpc_Seira2_cFv
- */
 u8 daNpc_Seira2_c::getMaxNumItem() {
     return (fopAcM_GetParam(this) & 0xf000000) >> 0x18;
 }
 
-/* 80AD17C4-80AD182C 000CA4 0068+00 1/1 0/0 0/0 .text            checkBottle__14daNpc_Seira2_cFv */
 u8 daNpc_Seira2_c::checkBottle() {
     u8 prm = fopAcM_GetParam(this);
     if (dComIfGs_isDarkClearLV(0)) {
@@ -385,12 +355,10 @@ u8 daNpc_Seira2_c::checkBottle() {
     }
 }
 
-/* 80AD182C-80AD1834 000D0C 0008+00 1/1 0/0 0/0 .text            isDelete__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::isDelete() {
     return FALSE;
 }
 
-/* 80AD1834-80AD1968 000D14 0134+00 1/1 0/0 0/0 .text            reset__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::reset() {
     initialize();
     memset(&mNextAction, 0, (u8*)&field_0x10F0 - (u8*)&mNextAction);
@@ -405,7 +373,6 @@ void daNpc_Seira2_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80AD1968-80AD19EC 000E48 0084+00 1/0 0/0 0/0 .text            afterJntAnm__14daNpc_Seira2_cFi */
 void daNpc_Seira2_c::afterJntAnm(int arg0) {
     if (arg0 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -416,7 +383,6 @@ void daNpc_Seira2_c::afterJntAnm(int arg0) {
     }
 }
 
-/* 80AD19EC-80AD1B38 000ECC 014C+00 1/0 0/0 0/0 .text            setParam__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::setParam() {
     if (field_0x10EC == 1) {
         if (mShopProcess == 2) {
@@ -462,7 +428,6 @@ void daNpc_Seira2_c::setParam() {
     mMorfFrames = daNpc_Seira2_Param_c::m.common.morf_frame;
 }
 
-/* 80AD1B38-80AD1BF8 001018 00C0+00 1/0 0/0 0/0 .text setAfterTalkMotion__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::setAfterTalkMotion() {
     int iVar2 = 0;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -488,7 +453,6 @@ void daNpc_Seira2_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80AD1BF8-80AD1C60 0010D8 0068+00 1/1 0/0 0/0 .text            srchActors__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::srchActors() {
     switch (mType) {
         case 1:
@@ -503,7 +467,6 @@ void daNpc_Seira2_c::srchActors() {
     }
 }
 
-/* 80AD1C60-80AD1E04 001140 01A4+00 1/0 0/0 0/0 .text            evtTalk__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::evtTalk() {
     if (field_0x10ED) {
         if (chkAction(&daNpc_Seira2_c::shop)) {
@@ -523,7 +486,6 @@ int daNpc_Seira2_c::evtTalk() {
     return 1;
 }
 
-/* 80AD1E04-80AD1ED4 0012E4 00D0+00 1/0 0/0 0/0 .text            evtCutProc__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::evtCutProc() {
     BOOL retval = FALSE;
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Seira2", this, -1);
@@ -541,7 +503,6 @@ int daNpc_Seira2_c::evtCutProc() {
     return retval;
 }
 
-/* 80AD1ED4-80AD2030 0013B4 015C+00 1/0 0/0 0/0 .text            action__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::action() {
     if (field_0x10ED == 0) {
         fopAc_ac_c* hit_chk = hitChk(&mCyl1, -1);
@@ -567,14 +528,12 @@ void daNpc_Seira2_c::action() {
     }
 }
 
-/* 80AD2030-80AD20A8 001510 0078+00 1/0 0/0 0/0 .text            beforeMove__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80AD20A8-80AD23A8 001588 0300+00 1/0 0/0 0/0 .text            setAttnPos__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::setAttnPos() {
     cXyz eyeOffset(-30.0f, 10.0f, 0.0f);
     mStagger.calc(0);
@@ -616,7 +575,6 @@ void daNpc_Seira2_c::setAttnPos() {
     }
 }
 
-/* 80AD23A8-80AD2550 001888 01A8+00 1/0 0/0 0/0 .text            setCollision__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::setCollision() {
     cXyz cStack_48;
     f32 cylH, wallR;
@@ -656,12 +614,10 @@ void daNpc_Seira2_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80AD2550-80AD2558 001A30 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80AD2558-80AD2630 001A38 00D8+00 1/0 0/0 0/0 .text            drawOtherMdl__14daNpc_Seira2_cFv */
 void daNpc_Seira2_c::drawOtherMdl() {
     if (field_0x10ED) {
         cXyz sp8;
@@ -684,8 +640,6 @@ void daNpc_Seira2_c::drawOtherMdl() {
     }
 }
 
-/* 80AD2630-80AD2710 001B10 00E0+00 2/2 0/0 0/0 .text            setBottleAnm__14daNpc_Seira2_cFiifb
- */
 bool daNpc_Seira2_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
     static int bottlAnmData[27][2] = {
         {-1, 2}, {-1, 2}, {-1, 2}, { 6, 2}, {11, 2}, {11, 2}, {10, 2}, { 9, 2},
@@ -713,13 +667,11 @@ bool daNpc_Seira2_c::setBottleAnm(int arg0, int arg1, f32 arg2, bool arg3) {
     return true;
 }
 
-/* 80AD2710-80AD2748 001BF0 0038+00 1/0 0/0 0/0 .text afterSetMotionAnm__14daNpc_Seira2_cFiifi */
 bool daNpc_Seira2_c::afterSetMotionAnm(int arg0, int arg1, f32 arg2, int) {
     f32 var_f30 = (mCreating == 1) ? 0.0f : arg2;
     setBottleAnm(arg0, arg1, var_f30, 1);
 }
 
-/* 80AD2748-80AD2870 001C28 0128+00 1/1 0/0 0/0 .text            selectAction__14daNpc_Seira2_cFv */
 int daNpc_Seira2_c::selectAction() {
     mNextAction = NULL;
     // TODO: Debug-only set & return.
@@ -756,14 +708,10 @@ int daNpc_Seira2_c::selectAction() {
     return 1;
 }
 
-/* 80AD2870-80AD289C 001D50 002C+00 1/1 0/0 0/0 .text
- * chkAction__14daNpc_Seira2_cFM14daNpc_Seira2_cFPCvPvPv_i      */
 int daNpc_Seira2_c::chkAction(actionFunc i_action) {
     return mActFunc_0 == i_action;
 }
 
-/* 80AD289C-80AD2944 001D7C 00A8+00 2/2 0/0 0/0 .text
- * setAction__14daNpc_Seira2_cFM14daNpc_Seira2_cFPCvPvPv_i      */
 int daNpc_Seira2_c::setAction(actionFunc i_action) {
     mMode = MODE_EXIT;
     if (mActFunc_0 != NULL) {
@@ -779,14 +727,11 @@ int daNpc_Seira2_c::setAction(actionFunc i_action) {
     return 1;
 }
 
-/* 80AD2944-80AD29BC 001E24 0078+00 2/2 0/0 0/0 .text checkStageIsSeira2sShop__14daNpc_Seira2_cFv
- */
 BOOL daNpc_Seira2_c::checkStageIsSeira2sShop() {
     return 0 == strcmp("R_SP01", dComIfGp_getStartStageName())
            && dComIfGp_getStartStageRoomNo() == 1 && !dComIfG_play_c::getLayerNo(0);
 }
 
-/* 80AD29BC-80AD2B68 001E9C 01AC+00 1/0 0/0 0/0 .text            wait__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::wait(void*) {
     int var_r30;
     switch (mMode) {
@@ -823,7 +768,6 @@ int daNpc_Seira2_c::wait(void*) {
     return 1;
 }
 
-/* 80AD2B68-80AD2D8C 002048 0224+00 2/0 0/0 0/0 .text            sit__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::sit(void*) {
     switch (mMode) {
         case 0:
@@ -865,7 +809,6 @@ int daNpc_Seira2_c::sit(void*) {
     return 1;
 }
 
-/* 80AD2D8C-80AD2F14 00226C 0188+00 2/0 0/0 0/0 .text            happy__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::happy(void*) {
     switch (mMode) {
         case 0:
@@ -900,7 +843,6 @@ int daNpc_Seira2_c::happy(void*) {
     return 1;
 }
 
-/* 80AD2F14-80AD31F0 0023F4 02DC+00 2/0 0/0 0/0 .text            worry__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::worry(void*) {
     switch (mMode) {
         case 0:
@@ -952,7 +894,6 @@ int daNpc_Seira2_c::worry(void*) {
     return 1;
 }
 
-/* 80AD31F0-80AD3508 0026D0 0318+00 1/0 0/0 0/0 .text            sad__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::sad(void*) {
     switch (mMode) {
         case 0:
@@ -998,7 +939,6 @@ int daNpc_Seira2_c::sad(void*) {
     return 1;
 }
 
-/* 80AD3508-80AD3614 0029E8 010C+00 1/0 0/0 0/0 .text            lookaround__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::lookaround(void*) {
     switch (mMode) {
         case 0:
@@ -1026,7 +966,6 @@ int daNpc_Seira2_c::lookaround(void*) {
     return 1;
 }
 
-/* 80AD3614-80AD3720 002AF4 010C+00 1/0 0/0 0/0 .text            smile__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::smile(void*) {
     switch (mMode) {
         case 0:
@@ -1054,7 +993,6 @@ int daNpc_Seira2_c::smile(void*) {
     return 1;
 }
 
-/* 80AD3720-80AD3890 002C00 0170+00 2/0 0/0 0/0 .text            talk__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::talk(void*) {
     int reg_r30 = 0;
     switch (mMode) {
@@ -1097,7 +1035,6 @@ int daNpc_Seira2_c::talk(void*) {
     return 0;
 }
 
-/* 80AD3890-80AD3960 002D70 00D0+00 2/0 0/0 0/0 .text            shop__14daNpc_Seira2_cFPv */
 int daNpc_Seira2_c::shop(void*) {
     switch (mMode) {
         case 0:
@@ -1132,32 +1069,26 @@ int daNpc_Seira2_c::shop(void*) {
     return 0;
 }
 
-/* 80AD3960-80AD3980 002E40 0020+00 1/0 0/0 0/0 .text            daNpc_Seira2_Create__FPv */
 static int daNpc_Seira2_Create(void* i_this) {
     return static_cast<daNpc_Seira2_c*>(i_this)->create();
 }
 
-/* 80AD3980-80AD39A0 002E60 0020+00 1/0 0/0 0/0 .text            daNpc_Seira2_Delete__FPv */
 static int daNpc_Seira2_Delete(void* i_this) {
     return static_cast<daNpc_Seira2_c*>(i_this)->Delete();
 }
 
-/* 80AD39A0-80AD39C0 002E80 0020+00 1/0 0/0 0/0 .text            daNpc_Seira2_Execute__FPv */
 static int daNpc_Seira2_Execute(void* i_this) {
     return static_cast<daNpc_Seira2_c*>(i_this)->Execute();
 }
 
-/* 80AD39C0-80AD39E0 002EA0 0020+00 1/0 0/0 0/0 .text            daNpc_Seira2_Draw__FPv */
 static int daNpc_Seira2_Draw(void* i_this) {
     return static_cast<daNpc_Seira2_c*>(i_this)->Draw();
 }
 
-/* 80AD39E0-80AD39E8 002EC0 0008+00 1/0 0/0 0/0 .text            daNpc_Seira2_IsDelete__FPv */
 static int daNpc_Seira2_IsDelete(void*) {
     return 1;
 }
 
-/* 80AD5444-80AD5464 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Seira2_MethodTable */
 static actor_method_class daNpc_Seira2_MethodTable = {
     (process_method_func)daNpc_Seira2_Create,
     (process_method_func)daNpc_Seira2_Delete,
@@ -1166,7 +1097,6 @@ static actor_method_class daNpc_Seira2_MethodTable = {
     (process_method_func)daNpc_Seira2_Draw,
 };
 
-/* 80AD5464-80AD5494 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SERA2 */
 extern actor_process_profile_definition g_profile_NPC_SERA2 = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp
index 54ff3e8d6f..6fd3d7152d 100644
--- a/src/d/actor/d_a_npc_seirei.cpp
+++ b/src/d/actor/d_a_npc_seirei.cpp
@@ -89,12 +89,10 @@ enum Type {
     /* 0x3 */ TYPE_3,
 };
 
-/* 80AD7E04-80AD7E0C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDE_SEIA, SEIREI},
 };
 
-/* 80AD7E0C-80AD7E2C -00001 0020+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[4] = {
     {"", 0},
     {"CONVERSATION_ABOUT_YM", 2},
@@ -102,24 +100,20 @@ static daNpcT_evtData_c l_evtList[4] = {
     {"NO_RESPONSE", 0},
 };
 
-/* 80AD7E2C-80AD7E38 -00001 000C+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Seirei",
     "Seirei1",
 };
 
-/* 80AD7E38-80AD7E3C 000054 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     SEIREI, -1,
 };
 
-/* 80AD7E3C-80AD7E40 000058 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[2] = {
     SEIREI1, -1,
 };
 
-/* 80AD7E40-80AD7E50 -00001 0010+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
  static s8* l_loadResPtrnList[4] = {
     l_loadResPtrn1,
     l_loadResPtrn1,
@@ -127,42 +121,35 @@ static s8 l_loadResPtrn1[2] = {
     l_loadResPtrn0,
 };
 
-/* 80AD7E50-80AD7E6C 00006C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, 0},
 };
 
-/* 80AD7E6C-80AD7EA4 000088 0038+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[2] = {
     {BCK_SEIA_WAIT_A, J3DFrameCtrl::EMode_LOOP, SEIREI, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0},
     {BCK_SEIA_WAIT_B, J3DFrameCtrl::EMode_NONE, SEIREI, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0},
 };
 
-/* 80AD7EA4-80AD7EB4 0000C0 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD7EB4-80AD7EE4 0000D0 0030+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = {
     {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AD7EE4-80AD7EEC -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__14daNpc_Seirei_c */
 char* daNpc_Seirei_c::mCutNameList[2] = {
     "",
     "CONVERSATION",
 };
 
-/* 80AD7EF8-80AD7F10 000114 0018+00 2/2 0/0 0/0 .data            mCutList__14daNpc_Seirei_c */
 daNpc_Seirei_c::cutFunc daNpc_Seirei_c::mCutList[2] = {
     NULL,
     &daNpc_Seirei_c::cutConversation,
 };
 
-/* 80AD572C-80AD57C4 0000EC 0098+00 1/0 0/0 0/0 .text            __dt__14daNpc_Seirei_cFv */
 daNpc_Seirei_c::~daNpc_Seirei_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -171,7 +158,6 @@ daNpc_Seirei_c::~daNpc_Seirei_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AD7CA8-80AD7D3C 000000 0094+00 6/6 0/0 0/0 .rodata          m__20daNpc_Seirei_Param_c */
 daNpc_Seirei_HIOParam const daNpc_Seirei_Param_c::m = {
     600.0f,
     0.0f,
@@ -218,7 +204,6 @@ daNpc_Seirei_HIOParam const daNpc_Seirei_Param_c::m = {
     1200.0f,
 };
 
-/* 80AD57C4-80AD5A7C 000184 02B8+00 1/1 0/0 0/0 .text            create__14daNpc_Seirei_cFv */
 cPhs__Step daNpc_Seirei_c::create() {
     daNpcT_ct(this, daNpc_Seirei_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
                        l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -274,7 +259,6 @@ cPhs__Step daNpc_Seirei_c::create() {
     return phase;
 }
 
-/* 80AD5A7C-80AD5BC4 00043C 0148+00 1/1 0/0 0/0 .text            CreateHeap__14daNpc_Seirei_cFv */
 int daNpc_Seirei_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]);
     if (modelData == NULL) {
@@ -295,18 +279,15 @@ int daNpc_Seirei_c::CreateHeap() {
     return 0;
 }
 
-/* 80AD5BC4-80AD5BF8 000584 0034+00 1/1 0/0 0/0 .text            Delete__14daNpc_Seirei_cFv */
 int daNpc_Seirei_c::Delete() {
     this->~daNpc_Seirei_c();
     return 1;
 }
 
-/* 80AD5BF8-80AD5C18 0005B8 0020+00 2/2 0/0 0/0 .text            Execute__14daNpc_Seirei_cFv */
 int daNpc_Seirei_c::Execute() {
     return execute();
 }
 
-/* 80AD5C18-80AD5CC0 0005D8 00A8+00 1/1 0/0 0/0 .text            Draw__14daNpc_Seirei_cFv */
 int daNpc_Seirei_c::Draw() {
     if (arg0 != 0) {
         if (mpMatAnm[0] != NULL) {
@@ -320,12 +301,10 @@ int daNpc_Seirei_c::Draw() {
     return 1;
 }
 
-/* 80AD5CC0-80AD5CE0 000680 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__14daNpc_Seirei_cFP10fopAc_ac_c */
 int daNpc_Seirei_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_Seirei_c*>(a_this)->CreateHeap();
 }
 
-/* 80AD5CE0-80AD5D2C 0006A0 004C+00 1/1 0/0 0/0 .text            getType__14daNpc_Seirei_cFv */
 u8 daNpc_Seirei_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -342,12 +321,10 @@ u8 daNpc_Seirei_c::getType() {
     }
 }
 
-/* 80AD5D2C-80AD5D34 0006EC 0008+00 1/1 0/0 0/0 .text            isDelete__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::isDelete() {
     return FALSE;
 }
 
-/* 80AD5D34-80AD5EEC 0006F4 01B8+00 1/1 0/0 0/0 .text            reset__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::reset() {
     int size = (u8*)&field_0xe84 - (u8*)&mNextAction;
     
@@ -380,7 +357,6 @@ void daNpc_Seirei_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80AD5EEC-80AD6034 0008AC 0148+00 1/0 0/0 0/0 .text            setParam__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::setParam() {
     selectAction();
     srchActors();
@@ -413,17 +389,14 @@ void daNpc_Seirei_c::setParam() {
     gravity = daNpc_Seirei_Param_c::m.common.gravity;
 }
 
-/* 80AD6048-80AD6050 000A08 0008+00 1/0 0/0 0/0 .text            checkChangeEvt__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80AD6050-80AD6054 000A10 0004+00 1/1 0/0 0/0 .text            srchActors__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::srchActors() {
     /* empty function */
 }
 
-/* 80AD6054-80AD6154 000A14 0100+00 1/0 0/0 0/0 .text            evtTalk__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::evtTalk() {
     if (chkAction(&daNpc_Seirei_c::talk)) {
         (this->*mAction)(NULL);
@@ -446,7 +419,6 @@ BOOL daNpc_Seirei_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AD6154-80AD621C 000B14 00C8+00 1/0 0/0 0/0 .text            evtCutProc__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::evtCutProc() {
     s32 staffId = dComIfGp_getEventManager().getMyStaffId("Seirei", this, -1);
 
@@ -464,7 +436,6 @@ BOOL daNpc_Seirei_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80AD621C-80AD62A4 000BDC 0088+00 1/0 0/0 0/0 .text            action__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::action() {
     if (mNextAction) {
         if (mAction == mNextAction) {
@@ -475,7 +446,6 @@ void daNpc_Seirei_c::action() {
     }
 }
 
-/* 80AD62A4-80AD6330 000C64 008C+00 1/0 0/0 0/0 .text            beforeMove__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
@@ -486,7 +456,6 @@ void daNpc_Seirei_c::beforeMove() {
     }
 }
 
-/* 80AD6330-80AD6464 000CF0 0134+00 1/0 0/0 0/0 .text            setAttnPos__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::setAttnPos() {
     cXyz sp18;
 
@@ -508,12 +477,10 @@ void daNpc_Seirei_c::setAttnPos() {
     setPrtcls();
 }
 
-/* 80AD6464-80AD646C 000E24 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__14daNpc_Seirei_cFv */
 int daNpc_Seirei_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AD646C-80AD6604 000E2C 0198+00 1/0 0/0 0/0 .text afterSetMotionAnm__14daNpc_Seirei_cFiifi */
 bool daNpc_Seirei_c::afterSetMotionAnm(int i_index, int i_mode, f32 param_3, int param_4) {
     static struct {
         int fileIdx;
@@ -573,19 +540,16 @@ bool daNpc_Seirei_c::afterSetMotionAnm(int i_index, int i_mode, f32 param_3, int
     return true;
 }
 
-/* 80AD6604-80AD664C 000FC4 0048+00 1/1 0/0 0/0 .text            selectAction__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_Seirei_c::wait;
     return TRUE;
 }
 
-/* 80AD664C-80AD6678 00100C 002C+00 1/1 0/0 0/0 .text            chkAction__14daNpc_Seirei_cFM14daNpc_Seirei_cFPCvPvPv_i */
 BOOL daNpc_Seirei_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AD6678-80AD6720 001038 00A8+00 2/2 0/0 0/0 .text            setAction__14daNpc_Seirei_cFM14daNpc_Seirei_cFPCvPvPv_i */
 BOOL daNpc_Seirei_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -603,7 +567,6 @@ BOOL daNpc_Seirei_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80AD6720-80AD6808 0010E0 00E8+00 1/1 0/0 0/0 .text            ctrlWaitAnm__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::ctrlWaitAnm() {
     if (field_0xe60 != 0 && mMotionSeqMngr.getNo() == MOT_WAIT_A && field_0xe60 <= mMorfLoops) {
         field_0xe60 = 0;
@@ -621,8 +584,6 @@ void daNpc_Seirei_c::ctrlWaitAnm() {
     }
 }
 
-/* ############################################################################################## */
-/* 80AD7D68-80AD7D78 0000C0 000E+02 0/1 0/0 0/0 .rodata          id1$4627 */
 static u16 const id1[7] = {
     dPa_RM(ID_ZI_S_SEIA_SHIZUKU_A),
     dPa_RM(ID_ZI_S_SEIA_SHIZUKU_B),
@@ -633,7 +594,6 @@ static u16 const id1[7] = {
     dPa_RM(ID_ZI_S_SEIA_SHIZUKU_G),
 };
 
-/* 80AD7D78-80AD7D88 0000D0 000E+02 0/1 0/0 0/0 .rodata          id2$4628 */
 static u16 const id2[7] = {
     dPa_RM(ID_ZF_S_SEIREI00_SPRIT),
     dPa_RM(ID_ZF_S_SEIREI01_CIR),
@@ -644,7 +604,6 @@ static u16 const id2[7] = {
     0xFFFF,
 };
 
-/* 80AD6808-80AD6A38 0011C8 0230+00 1/1 0/0 0/0 .text            setPrtcls__14daNpc_Seirei_cFv */
 void daNpc_Seirei_c::setPrtcls() {
     cXyz i_pos;
     cXyz i_scale(1.0f, 1.0f, 1.0f);
@@ -671,7 +630,6 @@ void daNpc_Seirei_c::setPrtcls() {
     }
 }
 
-/* 80AD6A38-80AD6ABC 0013F8 0084+00 1/1 0/0 0/0 .text            chkFirstMeeting__14daNpc_Seirei_cFv */
 BOOL daNpc_Seirei_c::chkFirstMeeting() {
     switch (mType) {
         case TYPE_0:
@@ -687,7 +645,6 @@ BOOL daNpc_Seirei_c::chkFirstMeeting() {
     return FALSE;
 }
 
-/* 80AD6ABC-80AD6C58 00147C 019C+00 1/0 0/0 0/0 .text            cutConversation__14daNpc_Seirei_cFi */
 int daNpc_Seirei_c::cutConversation(int i_staffId) {
     BOOL rv = FALSE;
     int prm = -1;
@@ -744,7 +701,6 @@ int daNpc_Seirei_c::cutConversation(int i_staffId) {
     return rv;
 }
 
-/* 80AD6C58-80AD6D30 001618 00D8+00 1/0 0/0 0/0 .text            wait__14daNpc_Seirei_cFPv */
 int daNpc_Seirei_c::wait(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -774,7 +730,6 @@ int daNpc_Seirei_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AD6D30-80AD6E5C 0016F0 012C+00 2/0 0/0 0/0 .text            talk__14daNpc_Seirei_cFPv */
 int daNpc_Seirei_c::talk(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -812,35 +767,28 @@ int daNpc_Seirei_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80AD6E5C-80AD6E7C 00181C 0020+00 1/0 0/0 0/0 .text            daNpc_Seirei_Create__FPv */
 static int daNpc_Seirei_Create(void* a_this) {
     return static_cast<daNpc_Seirei_c*>(a_this)->create();
 }
 
-/* 80AD6E7C-80AD6E9C 00183C 0020+00 1/0 0/0 0/0 .text            daNpc_Seirei_Delete__FPv */
 static int daNpc_Seirei_Delete(void* a_this) {
     return static_cast<daNpc_Seirei_c*>(a_this)->Delete();
 }
 
-/* 80AD6E9C-80AD6EBC 00185C 0020+00 1/0 0/0 0/0 .text            daNpc_Seirei_Execute__FPv */
 static int daNpc_Seirei_Execute(void* a_this) {
     return static_cast<daNpc_Seirei_c*>(a_this)->Execute();
 }
 
-/* 80AD6EBC-80AD6EDC 00187C 0020+00 1/0 0/0 0/0 .text            daNpc_Seirei_Draw__FPv */
 static int daNpc_Seirei_Draw(void* a_this) {
     return static_cast<daNpc_Seirei_c*>(a_this)->Draw();
 }
 
-/* 80AD6EDC-80AD6EE4 00189C 0008+00 1/0 0/0 0/0 .text            daNpc_Seirei_IsDelete__FPv */
 static int daNpc_Seirei_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80AD8104-80AD8108 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Seirei_Param_c l_HIO;
 
-/* 80AD7F54-80AD7F74 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Seirei_MethodTable */
 static actor_method_class daNpc_Seirei_MethodTable = {
     (process_method_func)daNpc_Seirei_Create,
     (process_method_func)daNpc_Seirei_Delete,
@@ -849,7 +797,6 @@ static actor_method_class daNpc_Seirei_MethodTable = {
     (process_method_func)daNpc_Seirei_Draw,
 };
 
-/* 80AD7F74-80AD7FA4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SEIREI */
 extern actor_process_profile_definition g_profile_NPC_SEIREI = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp
index 94400a1462..4928b13bb2 100644
--- a/src/d/actor/d_a_npc_shad.cpp
+++ b/src/d/actor/d_a_npc_shad.cpp
@@ -11,7 +11,6 @@
 #include "d/actor/d_a_tag_evtarea.h"
 #include "d/d_msg_object.h"
 
-/* 80AE1FDC-80AE204C 000000 0070+00 19/19 0/0 0/0 .rodata          m__17daNpcShad_Param_c */
 const daNpcShad_HIOParam daNpcShad_Param_c::m = {
     35.0f,      // attention_offset 
     -3.0f,      // gravity
@@ -186,7 +185,6 @@ enum Joint {
     /* 0x1E */ JNT_FOOTR,
 };
 
-/* 80AE2640-80AE27F0 000020 01B0+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[36] = {
     {-1, J3DFrameCtrl::EMode_LOOP, SHAD},
     {BCK_SHAD_F_TALK_A, J3DFrameCtrl::EMode_NONE, SHAD},
@@ -226,7 +224,6 @@ static daNpc_GetParam2 l_bckGetParamList[36] = {
     {BCK_SHAD_SURPRISE_WAIT, J3DFrameCtrl::EMode_LOOP, SHAD1},
 };
 
-/* 80AE27F0-80AE2874 0001D0 0084+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[11] = {
     {BTP_SHAD, J3DFrameCtrl::EMode_LOOP, SHAD},
     {BTP_SHAD_F_ANGER, J3DFrameCtrl::EMode_NONE, SHAD1},
@@ -241,7 +238,6 @@ static daNpc_GetParam2 l_btpGetParamList[11] = {
     {BTP_SHAD_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, SHAD},
 };
 
-/* 80AE2874-80AE28B0 000254 003C+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam2 l_btkGetParamList[5] = {
     {BTK_SHAD, J3DFrameCtrl::EMode_LOOP, SHAD},
     {BTK_SHAD_DISCOURAGED, J3DFrameCtrl::EMode_NONE, SHAD1},
@@ -250,29 +246,24 @@ static daNpc_GetParam2 l_btkGetParamList[5] = {
     {BTK_SHAD_READ_KOMON, J3DFrameCtrl::EMode_LOOP, SHAD1},
 };
 
-/* 80AE28B0-80AE28BC 000290 000C+00 1/0 0/0 0/0 .data            l_loadRes_SHAD0 */
 static int l_loadRes_SHAD0[3] = {
     0, 2, -1,
 };
 
-/* 80AE28BC-80AE28C8 00029C 000C+00 1/0 0/0 0/0 .data            l_loadRes_SHAD1 */
 static int l_loadRes_SHAD1[3] = {
     0, 1, -1,
 };
 
-/* 80AE28C8-80AE28D4 0002A8 000C+00 1/0 0/0 0/0 .data            l_loadRes_SHAD2 */
 static int l_loadRes_SHAD2[3] = {
     0, 3, -1,
 };
 
-/* 80AE28D4-80AE28E0 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_SHAD0,
     l_loadRes_SHAD1,
     l_loadRes_SHAD2,
 };
 
-/* 80AE28E0-80AE28F0 -00001 0010+00 6/8 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[4] = {
     "Shad",
     "Shad1",
@@ -280,7 +271,6 @@ static char* l_arcNames[4] = {
     "Shad3",
 };
 
-/* 80AE28F0-80AE2928 -00001 0038+00 3/6 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[14] = {
     "",
     "THE_INTRODUCTION",
@@ -298,7 +288,6 @@ static char* l_evtNames[14] = {
     "RESIST_WIRETAP_RAFREL"
 };
 
-/* 80AE2928-80AE2960 000308 0038+00 3/6 0/0 0/0 .data            l_evtArcs */
 static char* l_evtArcs[14] = {
     NULL,
     NULL,
@@ -316,13 +305,10 @@ static char* l_evtArcs[14] = {
     NULL,
 };
 
-/* 80AE2960-80AE2964 -00001 0004+00 0/3 0/0 0/0 .data            l_myName */
 static char* l_myName = "Shad";
 
-/* 80AE2CC4-80AE2CC8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_SHAD_HIO_CLASS l_HIO;
 
-/* 80AE2A00-80AE2AA8 0003E0 00A8+00 0/2 0/0 0/0 .data            mEvtSeqList__11daNpcShad_c */
 daNpcShad_c::EventFn daNpcShad_c::mEvtSeqList[14] = {
     NULL,
     &daNpcShad_c::EvCut_Introduction,
@@ -344,7 +330,6 @@ daNpcShad_c::daNpcShad_c() {
     // empty function
 }
 
-/* 80AD8420-80AD8620 000300 0200+00 1/0 0/0 0/0 .text            __dt__11daNpcShad_cFv */
 daNpcShad_c::~daNpcShad_c() {
     for (int i = 0; l_loadRes_list[mMode][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[l_loadRes_list[mMode][i]]);
@@ -355,7 +340,6 @@ daNpcShad_c::~daNpcShad_c() {
     }
 }
 
-/* 80AD8620-80AD8B60 000500 0540+00 1/1 0/0 0/0 .text            Create__11daNpcShad_cFv */
 cPhs__Step daNpcShad_c::Create() {
     fopAcM_ct(this, daNpcShad_c);
 
@@ -482,7 +466,6 @@ cPhs__Step daNpcShad_c::Create() {
     return phase;
 }
 
-/* 80AD8B60-80AD8F24 000A40 03C4+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcShad_cFv */
 int daNpcShad_c::CreateHeap() {
     J3DModelData* mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], BMDR_SHAD));
     JUT_ASSERT(483, NULL != mdlData_p);
@@ -558,19 +541,16 @@ int daNpcShad_c::CreateHeap() {
     return 1;
 }
 
-/* 80AD90E0-80AD9114 000FC0 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcShad_cFv */
 int daNpcShad_c::Delete() {
     this->~daNpcShad_c();
     return 1;
 }
 
-/* 80AD9114-80AD9138 000FF4 0024+00 2/2 0/0 0/0 .text            Execute__11daNpcShad_cFv */
 int daNpcShad_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80AD9138-80AD9280 001018 0148+00 1/1 0/0 0/0 .text             Draw__11daNpcShad_cFv */
 int daNpcShad_c::Draw() {
     if (field_0xe1e == 0) {
         return 1;
@@ -596,7 +576,6 @@ int daNpcShad_c::Draw() {
     return 1;
 }
 
-/* 80AD9280-80AD944C 001160 01CC+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpcShad_cFP8J3DJointP8J3DModel                */
 int daNpcShad_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int lookatJoints[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -632,13 +611,11 @@ int daNpcShad_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AD944C-80AD946C 00132C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpcShad_cFP10fopAc_ac_c              */
 int daNpcShad_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcShad_c* i_this = (daNpcShad_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80AD946C-80AD94B8 00134C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpcShad_cFP8J3DJointi */
 int daNpcShad_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -652,7 +629,6 @@ int daNpcShad_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AD94B8-80AD974C 001398 0294+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcShad_cFib */
 bool daNpcShad_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anmTransform;
     mAnmFlags &= 0xFFFFE03F;
@@ -741,7 +717,6 @@ bool daNpcShad_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80AD974C-80AD982C 00162C 00E0+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcShad_cFi */
 bool daNpcShad_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anmTexPattern = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx], l_btpGetParamList[i_idx].fileIdx);
     int i_attr = l_btpGetParamList[i_idx].attr;
@@ -766,7 +741,6 @@ bool daNpcShad_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80AD982C-80AD99B4 00170C 0188+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcShad_cFif */
 void daNpcShad_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anmTransformKey = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx], l_bckGetParamList[i_idx].fileIdx);
     int i_attr = l_bckGetParamList[i_idx].attr;
@@ -807,7 +781,6 @@ void daNpcShad_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AD99B4-80AD9C0C 001894 0258+00 1/1 0/0 0/0 .text            reset__11daNpcShad_cFv */
 void daNpcShad_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -861,7 +834,6 @@ void daNpcShad_c::reset() {
     setWaitAction();
 }
 
-/* 80AD9C0C-80AD9E04 001AEC 01F8+00 1/1 0/0 0/0 .text            setWaitAction__11daNpcShad_cFv */
 inline void daNpcShad_c::setWaitAction() {
     switch (mMode) {
         case 0:
@@ -881,7 +853,6 @@ inline void daNpcShad_c::setWaitAction() {
     }
 }
 
-/* 80AD9E04-80AD9E90 001CE4 008C+00 1/1 0/0 0/0 .text getPathPoint__11daNpcShad_cFUciP3Vec */
 inline bool daNpcShad_c::getPathPoint(u8 i_pathIndex, int i_pntIndex, Vec* param_3) {
     dPath* path = dPath_GetRoomPath(i_pathIndex, fopAcM_GetRoomNo(this));
     if (path == NULL) {
@@ -897,7 +868,6 @@ inline bool daNpcShad_c::getPathPoint(u8 i_pathIndex, int i_pntIndex, Vec* param
     return true;
 }
 
-/* 80AD9E90-80AD9F00 001D70 0070+00 1/1 0/0 0/0 .text            isSneaking__11daNpcShad_cFv */
 inline bool daNpcShad_c::isSneaking() {
     if (strcmp(dComIfGp_getStartStageName(), "R_SP116") == 0 && dComIfGp_getStartStageRoomNo() == 5 && dComIfG_play_c::getLayerNo(0) == 2) {
         return true;
@@ -906,7 +876,6 @@ inline bool daNpcShad_c::isSneaking() {
     return false;
 }
 
-/* 80AE0B58-80AE0ED0 008A38 0378+00 1/1 0/0 0/0 .text            playExpression__11daNpcShad_cFv */
 inline void daNpcShad_c::playExpression() {
     daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -948,7 +917,6 @@ inline void daNpcShad_c::playExpression() {
     }
 }
 
-/* 80AE04D8-80AE0B58 0083B8 0680+00 1/1 0/0 0/0 .text            playMotion__11daNpcShad_cFv */
 inline void daNpcShad_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1018,7 +986,6 @@ inline void daNpcShad_c::playMotion() {
     }
 }
 
-/* 80AE1320-80AE153C 009200 021C+00 1/1 0/0 0/0 .text            lookat__11daNpcShad_cFv */
 inline void daNpcShad_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1174,7 +1141,6 @@ inline BOOL daNpcShad_c::step(s16 i_targetAngle, int i_motion, f32 i_rate) {
     return mTurnMode > 1;
 }
 
-/* 80AD9F00-80ADA630 001DE0 0730+00 1/0 0/0 0/0 .text            wait_type0__11daNpcShad_cFPv */
 bool daNpcShad_c::wait_type0(void* param_1) {
     switch (field_0xe1a) {
         case 0:
@@ -1252,7 +1218,6 @@ bool daNpcShad_c::wait_type0(void* param_1) {
     return true;
 }
 
-/* 80ADA630-80ADA674 002510 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpcShad_cFifi */
 void daNpcShad_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if ((i_restart || mMotion != motion) && i_motion >= 0 && i_motion < 0x17) {
@@ -1263,7 +1228,6 @@ void daNpcShad_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80ADA674-80ADA6A0 002554 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpcShad_cFif */
 void daNpcShad_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 0xD) {
         mExpression = i_expression;
@@ -1273,7 +1237,6 @@ void daNpcShad_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80ADA6A0-80ADB428 002580 0D88+00 1/0 0/0 0/0 .text            wait_type1__11daNpcShad_cFPv */
 bool daNpcShad_c::wait_type1(void* param_1) {
     switch (field_0xe1a) {
         case 0:
@@ -1427,7 +1390,6 @@ bool daNpcShad_c::wait_type1(void* param_1) {
     return true;
 }
 
-/* 80ADB428-80ADB628 003308 0200+00 1/0 0/0 0/0 .text            wait_type2__11daNpcShad_cFPv */
 bool daNpcShad_c::wait_type2(void* param_1) {
     switch (field_0xe1a) {
         case 0:
@@ -1497,7 +1459,6 @@ inline void daNpcShad_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80ADB628-80ADBEA8 003508 0880+00 2/0 0/0 0/0 .text            talk__11daNpcShad_cFPv */
 bool daNpcShad_c::talk(void* param_1) {
     int itemNo, i_expression, i_motion, i_msgTimer;
     u16 eventID;
@@ -1570,7 +1531,6 @@ bool daNpcShad_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80ADBEA8-80ADC3DC 003D88 0534+00 2/0 0/0 0/0 .text            demo__11daNpcShad_cFPv */
 bool daNpcShad_c::demo(void* param_1) {
     int iVar2;
 
@@ -1623,7 +1583,6 @@ bool daNpcShad_c::demo(void* param_1) {
     return true;
 }
 
-/* 80ADC3DC-80ADC700 0042BC 0324+00 1/0 0/0 0/0 .text            leave__11daNpcShad_cFPv */
 bool daNpcShad_c::leave(void* param_1) {
     cXyz sp28(-6253.387f, 0.0f, 6251.7603f);
 
@@ -1655,7 +1614,6 @@ bool daNpcShad_c::leave(void* param_1) {
     return true;
 }
 
-/* 80ADC700-80ADC800 0045E0 0100+00 1/0 0/0 0/0 .text            EvCut_Introduction__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_Introduction(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* piVar1 = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm");
@@ -1683,7 +1641,6 @@ BOOL daNpcShad_c::EvCut_Introduction(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADC800-80ADCAD8 0046E0 02D8+00 1/0 0/0 0/0 .text            EvCut_Meeting__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_Meeting(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm");
@@ -1739,7 +1696,6 @@ BOOL daNpcShad_c::EvCut_Meeting(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADCAD8-80ADD720 0049B8 0C48+00 1/0 0/0 0/0 .text EvCut_ToChantSpell1__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_ToChantSpell1(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -1880,7 +1836,6 @@ BOOL daNpcShad_c::EvCut_ToChantSpell1(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADD720-80ADE47C 005600 0D5C+00 1/0 0/0 0/0 .text EvCut_ToChantSpell2__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
     dEvent_manager_c* eventManager = dComIfGp_getPEvtManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2041,7 +1996,6 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADE47C-80ADE5F8 00635C 017C+00 1/0 0/0 0/0 .text EvCut_ToChantSpell2Skip__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_ToChantSpell2Skip(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2078,7 +2032,6 @@ inline void daNpcShad_c::setLookObliquenessUp() {
     setLookMode(LOOK_ATTN, NULL, &sp18);
 }
 
-/* 80ADE5F8-80ADED68 0064D8 0770+00 3/0 0/0 0/0 .text EvCut_DiscoveryCannon__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2196,7 +2149,6 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADED68-80ADEEE4 006C48 017C+00 1/0 0/0 0/0 .text EvCut_DiscoveryCannonSkip__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_DiscoveryCannonSkip(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2235,7 +2187,6 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannonSkip(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADEEE4-80ADF810 006DC4 092C+00 1/0 0/0 0/0 .text            EvCut_Disappear__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2366,7 +2317,6 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADF810-80ADF8DC 0076F0 00CC+00 1/0 0/0 0/0 .text EvCut_DisappearSkip__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_DisappearSkip(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2394,7 +2344,6 @@ BOOL daNpcShad_c::EvCut_DisappearSkip(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADF8DC-80ADFB70 0077BC 0294+00 1/0 0/0 0/0 .text            EvCut_CallBack__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_CallBack(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* cutName = (int*)eventManager->getMyNowCutName(i_cutIndex);
@@ -2445,7 +2394,6 @@ BOOL daNpcShad_c::EvCut_CallBack(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADFB70-80ADFE74 007A50 0304+00 1/0 0/0 0/0 .text EvCut_WiretapSponsor__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_WiretapSponsor(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     fopAc_ac_c* actors[4] = {mActorMngr[2].getActorP(), mActorMngr[1].getActorP(), this, mActorMngr[3].getActorP()};
@@ -2494,7 +2442,6 @@ BOOL daNpcShad_c::EvCut_WiretapSponsor(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80ADFE74-80AE0104 007D54 0290+00 2/0 0/0 0/0 .text EvCut_WiretapEntrant__11daNpcShad_cFi */
 BOOL daNpcShad_c::EvCut_WiretapEntrant(int i_cutIndex) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "prm");
@@ -2543,31 +2490,26 @@ BOOL daNpcShad_c::EvCut_WiretapEntrant(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80AE0104-80AE0124 007FE4 0020+00 1/0 0/0 0/0 .text            daNpcShad_Create__FPv */
 static int daNpcShad_Create(void* a_this) {
     daNpcShad_c* i_this = (daNpcShad_c*)a_this;
     return i_this->Create();
 }
 
-/* 80AE0124-80AE0144 008004 0020+00 1/0 0/0 0/0 .text            daNpcShad_Delete__FPv */
 static int daNpcShad_Delete(void* a_this) {
     daNpcShad_c* i_this = (daNpcShad_c*)a_this;
     return i_this->Delete();
 }
 
-/* 80AE0144-80AE0164 008024 0020+00 1/0 0/0 0/0 .text            daNpcShad_Execute__FPv */
 static int daNpcShad_Execute(void* a_this) {
     daNpcShad_c* i_this = (daNpcShad_c*)a_this;
     return i_this->Execute();
 }
 
-/* 80AE0164-80AE0184 008044 0020+00 1/0 0/0 0/0 .text            daNpcShad_Draw__FPv */
 static int daNpcShad_Draw(void* a_this) {
     daNpcShad_c* i_this = (daNpcShad_c*)a_this;
     return i_this->Draw();
 }
 
-/* 80AE0184-80AE018C 008064 0008+00 1/0 0/0 0/0 .text            daNpcShad_IsDelete__FPv */
 static int daNpcShad_IsDelete(void* a_this) {
     return 1;
 }
@@ -2577,7 +2519,6 @@ static void dummy() {
     ((J3DTexNoAnm*)NULL)->calc(NULL);
 }
 
-/* 80AE01BC-80AE0438 00809C 027C+00 1/0 0/0 0/0 .text            setParam__11daNpcShad_cFv */
 void daNpcShad_c::setParam() {
     searchActors();
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -2602,7 +2543,6 @@ void daNpcShad_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80AE0438-80AE04D8 008318 00A0+00 1/0 0/0 0/0 .text            main__11daNpcShad_cFv */
 BOOL daNpcShad_c::main() {
     if (mActionFn) {
         (this->*mActionFn)(NULL);
@@ -2618,7 +2558,6 @@ BOOL daNpcShad_c::main() {
     return TRUE;
 }
 
-/* 80AE0ED0-80AE0FAC 008DB0 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcShad_cFv */
 inline BOOL daNpcShad_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btkAnm = NULL;
@@ -2637,7 +2576,6 @@ inline BOOL daNpcShad_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80AE0FAC-80AE1320 008E8C 0374+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcShad_cFv */
 inline void daNpcShad_c::setAttnPos() {
     if (mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -2690,12 +2628,10 @@ inline void daNpcShad_c::setAttnPos() {
     }
 }
 
-/* 80AE153C-80AE1544 00941C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcShad_cFv */
 inline BOOL daNpcShad_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80AE2B7C-80AE2B9C -00001 0020+00 1/0 0/0 0/0 .data            daNpcShad_MethodTable */
 static actor_method_class daNpcShad_MethodTable = {
     (process_method_func)daNpcShad_Create,
     (process_method_func)daNpcShad_Delete,
@@ -2704,7 +2640,6 @@ static actor_method_class daNpcShad_MethodTable = {
     (process_method_func)daNpcShad_Draw,
 };
 
-/* 80AE2B9C-80AE2BCC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SHAD */
 extern actor_process_profile_definition g_profile_NPC_SHAD = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp
index 15bf6e456e..5bf21f7d57 100644
--- a/src/d/actor/d_a_npc_shaman.cpp
+++ b/src/d/actor/d_a_npc_shaman.cpp
@@ -88,12 +88,10 @@ enum RES_Name {
     /* 0x1 */ SHA,
 };
 
-/* 80AE6D38-80AE6D40 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_SHA, SHA},
 };
 
-/* 80AE6D40-80AE6D70 -00001 0030+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[6] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -103,25 +101,21 @@ static daNpcT_evtData_c l_evtList[6] = {
     {"RETURN", 1},
 };
 
-/* 80AE6D70-80AE6D78 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Sha",
 };
 
-/* 80AE6D78-80AE6D7C 000060 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     SHA, -1,
 };
 
-/* 80AE6D7C-80AE6D88 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80AE6D88-80AE6EA0 000070 0118+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, 32, J3DFrameCtrl::EMode_LOOP, SHA, 1},
     {10, J3DFrameCtrl::EMode_NONE, SHA, 32, J3DFrameCtrl::EMode_LOOP, SHA, 1},
@@ -135,7 +129,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[10] = {
     {13, J3DFrameCtrl::EMode_LOOP, SHA, 38, J3DFrameCtrl::EMode_LOOP, SHA, 0},
 };
 
-/* 80AE6EA0-80AE6F80 000188 00E0+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[8] = {
     {23, J3DFrameCtrl::EMode_LOOP, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0},
     {19, J3DFrameCtrl::EMode_NONE, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0},
@@ -147,7 +140,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[8] = {
     {20, J3DFrameCtrl::EMode_NONE, SHA, 29, J3DFrameCtrl::EMode_NONE, SHA, 1, 0},
 };
 
-/* 80AE6F80-80AE7020 000268 00A0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {7, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -161,7 +153,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[40] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AE7020-80AE70A0 000308 0080+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -173,22 +164,18 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[32] = {
     {7, 0, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80AE70A0-80AE70A8 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Sha_c */
 char* daNpc_Sha_c::mCutNameList[2] = {
     "",
     "PERFORM_AUGURY",
 };
 
-/* 80AE70B4-80AE70CC 00039C 0018+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Sha_c */
 daNpc_Sha_c::cutFunc daNpc_Sha_c::mCutList[2] = {
     NULL,
     &daNpc_Sha_c::cutPerformAugury,
 };
 
-/* 80AE7844-80AE7848 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_SHA_HIO_CLASS l_HIO;
 
-/* 80AE2DCC-80AE2EEC 0000EC 0120+00 1/0 0/0 0/0 .text            __dt__11daNpc_Sha_cFv */
 daNpc_Sha_c::~daNpc_Sha_c() {
     OS_REPORT("|%06d:%x|daNpc_Sha_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -205,7 +192,6 @@ daNpc_Sha_c::~daNpc_Sha_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80AE6BC8-80AE6C54 000000 008C+00 6/6 0/0 0/0 .rodata          m__17daNpc_Sha_Param_c */
 daNpc_Sha_HIOParam const daNpc_Sha_Param_c::m = {
     210.0f,
     -3.0f,
@@ -250,7 +236,6 @@ daNpc_Sha_HIOParam const daNpc_Sha_Param_c::m = {
     0.0,
 };
 
-/* 80AE2EEC-80AE31A0 00020C 02B4+00 1/1 0/0 0/0 .text            create__11daNpc_Sha_cFv */
 cPhs__Step daNpc_Sha_c::create() {
     daNpcT_ct(this, daNpc_Sha_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -312,7 +297,6 @@ cPhs__Step daNpc_Sha_c::create() {
     return phase;
 }
 
-/* 80AE31A0-80AE3410 0004C0 0270+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Sha_cFv */
 int daNpc_Sha_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
     if (modelData == NULL) {
@@ -342,7 +326,6 @@ int daNpc_Sha_c::CreateHeap() {
     return 0;
 }
 
-/* 80AE35CC-80AE3600 0008EC 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Sha_cFv */
 int daNpc_Sha_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Sha_c -> コンストラクト\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -350,12 +333,10 @@ int daNpc_Sha_c::Delete() {
     return 1;
 }
 
-/* 80AE3600-80AE3620 000920 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Sha_cFv */
 int daNpc_Sha_c::Execute() {
     return execute();
 }
 
-/* 80AE3620-80AE36B4 000940 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Sha_cFv */
 int daNpc_Sha_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -369,13 +350,11 @@ int daNpc_Sha_c::Draw() {
     #endif
 }
 
-/* 80AE36B4-80AE36D4 0009D4 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_Sha_cFP10fopAc_ac_c */
 int daNpc_Sha_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Sha_c* actor = (daNpc_Sha_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80AE36D4-80AE372C 0009F4 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_Sha_cFP8J3DJointi */
 int daNpc_Sha_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -388,7 +367,6 @@ int daNpc_Sha_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AE372C-80AE3764 000A4C 0038+00 1/1 0/0 0/0 .text            getType__11daNpc_Sha_cFv */
 u8 daNpc_Sha_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -403,7 +381,6 @@ u8 daNpc_Sha_c::getType() {
     }
 }
 
-/* 80AE3764-80AE3798 000A84 0034+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::isDelete() {
     switch (mType) {
         case 0:
@@ -419,7 +396,6 @@ BOOL daNpc_Sha_c::isDelete() {
     return FALSE;
 }
 
-/* 80AE3798-80AE38F0 000AB8 0158+00 1/1 0/0 0/0 .text            reset__11daNpc_Sha_cFv */
 void daNpc_Sha_c::reset() {
     csXyz angle;
     int size = (u8*)&field_0xfa4 - (u8*)&mNextAction;
@@ -442,7 +418,6 @@ void daNpc_Sha_c::reset() {
     setAngle(angle);
 }
 
-/* 80AE38F0-80AE3974 000C10 0084+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Sha_cFi */
 void daNpc_Sha_c::afterJntAnm(int i_joint) {
     if (i_joint == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -453,7 +428,6 @@ void daNpc_Sha_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 80AE3974-80AE3A8C 000C94 0118+00 1/0 0/0 0/0 .text            setParam__11daNpc_Sha_cFv */
 void daNpc_Sha_c::setParam() {
     selectAction();
     srchActors();
@@ -486,7 +460,6 @@ void daNpc_Sha_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80AE3A8C-80AE3B78 000DAC 00EC+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Sha_c::talk)) {
         mPreItemNo = 0;
@@ -520,7 +493,6 @@ BOOL daNpc_Sha_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80AE3B78-80AE3C24 000E98 00AC+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Sha_cFv */
 void daNpc_Sha_c::setAfterTalkMotion() {
     int idx = 9;
 
@@ -545,7 +517,6 @@ void daNpc_Sha_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, FALSE, 0);
 }
 
-/* 80AE3C24-80AE3C28 000F44 0004+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Sha_cFv */
 void daNpc_Sha_c::srchActors() {
     #if DEBUG
     switch (mType) {
@@ -557,7 +528,6 @@ void daNpc_Sha_c::srchActors() {
     #endif
 }
 
-/* 80AE3C28-80AE3D28 000F48 0100+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::evtTalk() {
     if (chkAction(&daNpc_Sha_c::talk)) {
         (this->*mAction)(NULL);
@@ -580,7 +550,6 @@ BOOL daNpc_Sha_c::evtTalk() {
     return TRUE;
 }
 
-/* 80AE3D28-80AE3DF0 001048 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::evtCutProc() {
     s32 staffId = dComIfGp_getEventManager().getMyStaffId("Sha", this, -1);
     if (staffId != -1) {
@@ -597,7 +566,6 @@ BOOL daNpc_Sha_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80AE3DF0-80AE3F80 001110 0190+00 1/0 0/0 0/0 .text            action__11daNpc_Sha_cFv */
 void daNpc_Sha_c::action() {
     fopAc_ac_c* actor_p = NULL;
     actor_p = hitChk(&mCyl, 0xFFFFFFFF);
@@ -624,7 +592,6 @@ void daNpc_Sha_c::action() {
     }
 }
 
-/* 80AE3F80-80AE4044 0012A0 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Sha_cFv */
 void daNpc_Sha_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -637,7 +604,6 @@ void daNpc_Sha_c::beforeMove() {
     }
 }
 
-/* 80AE4044-80AE4360 001364 031C+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Sha_cFv */
 void daNpc_Sha_c::setAttnPos() {
     cXyz pos(-30.0f, 10.0f, 0.0f);
     cXyz sp40(0.0f, 10.0f, 0.0f);
@@ -672,7 +638,6 @@ void daNpc_Sha_c::setAttnPos() {
     mDoAud_seStartLevel(Z2SE_OBJ_CRYSTAL_KRKR, &field_0xd6c, 0, 0);
 }
 
-/* 80AE4360-80AE44B8 001680 0158+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Sha_cFv */
 void daNpc_Sha_c::setCollision() {
     cXyz pos;
 
@@ -712,12 +677,10 @@ void daNpc_Sha_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80AE44B8-80AE44C0 0017D8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Sha_cFv */
 int daNpc_Sha_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AE44C0-80AE4508 0017E0 0048+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::selectAction() {
     mNextAction = NULL;
 
@@ -738,12 +701,10 @@ BOOL daNpc_Sha_c::selectAction() {
     return TRUE;
 }
 
-/* 80AE4508-80AE4534 001828 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_Sha_cFM11daNpc_Sha_cFPCvPvPv_i */
 BOOL daNpc_Sha_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AE4534-80AE45DC 001854 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_Sha_cFM11daNpc_Sha_cFPCvPvPv_i */
 BOOL daNpc_Sha_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -761,7 +722,6 @@ BOOL daNpc_Sha_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80AE45DC-80AE48D0 0018FC 02F4+00 1/1 0/0 0/0 .text            getSceneChangeNoTableIx__11daNpc_Sha_cFv */
 int daNpc_Sha_c::getSceneChangeNoTableIx() {
     int iVar2[48];
     BOOL bool_array[48];
@@ -868,7 +828,6 @@ int daNpc_Sha_c::getSceneChangeNoTableIx() {
     return -1;
 }
 
-/* 80AE48D0-80AE4974 001BF0 00A4+00 1/1 0/0 0/0 .text            setTempBit__11daNpc_Sha_cFi */
 void daNpc_Sha_c::setTempBit(int i_idx) {
     u8 reg_r30 = 0;
     u8 reg_r29 = 0;
@@ -887,7 +846,6 @@ void daNpc_Sha_c::setTempBit(int i_idx) {
     }
 }
 
-/* 80AE4974-80AE4E24 001C94 04B0+00 2/0 0/0 0/0 .text            cutPerformAugury__11daNpc_Sha_cFi */
 int daNpc_Sha_c::cutPerformAugury(int i_staffId) {
     cXyz pos;
     csXyz angle;
@@ -1036,7 +994,6 @@ int daNpc_Sha_c::cutPerformAugury(int i_staffId) {
     return rv;
 }
 
-/* 80AE4E24-80AE50EC 002144 02C8+00 1/0 0/0 0/0 .text            wait__11daNpc_Sha_cFPv */
 int daNpc_Sha_c::wait(void* param_1) {
     int unused = 0;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1112,7 +1069,6 @@ int daNpc_Sha_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AE50EC-80AE52CC 00240C 01E0+00 3/0 0/0 0/0 .text            talk__11daNpc_Sha_cFPv */
 int daNpc_Sha_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1159,17 +1115,14 @@ int daNpc_Sha_c::test(void* param_1) {
 
 }
 
-/* 80AE711C-80AE7128 000404 000C+00 1/1 0/0 0/0 .data            mEvtBitLabels__11daNpc_Sha_c */
 const u16 daNpc_Sha_c::mEvtBitLabels[6] = {
     0xF0FF, 0xEFFF, 0xEEFF, 0xEDFF, 0xECFF, 0xEBFF,
 };
 
-/* 80AE7128-80AE7134 000410 000C+00 2/2 0/0 0/0 .data            mTmpBitLabels__11daNpc_Sha_c */
 const u16 daNpc_Sha_c::mTmpBitLabels[6] = {
     0xFAFF, 0xF9FF, 0xF8FF, 0xF7FF, 0xF6FF, 0xF5FF,
 };
 
-/* 80AE7134-80AE71F4 00041C 00C0+00 1/1 0/0 0/0 .data            mSceneChangeNoTable__11daNpc_Sha_c */
 const int daNpc_Sha_c::mSceneChangeNoTable[48] = {
     1, 2, 3, 4,
     5, 6, 7, 8,
@@ -1185,7 +1138,6 @@ const int daNpc_Sha_c::mSceneChangeNoTable[48] = {
     0x2D, -1, -1, -1,
 };
 
-/* 80AE7434-80AE7674 00071C 0240+00 1/2 0/0 0/0 .data            mQueries__11daNpc_Sha_c */
 daNpc_Sha_c::queryFunc daNpc_Sha_c::mQueries[48] = {
     &daNpc_Sha_c::query000, &daNpc_Sha_c::query265, &daNpc_Sha_c::query000, &daNpc_Sha_c::query267,
     &daNpc_Sha_c::query000, &daNpc_Sha_c::query000, &daNpc_Sha_c::query078, &daNpc_Sha_c::query268,
@@ -1201,96 +1153,79 @@ daNpc_Sha_c::queryFunc daNpc_Sha_c::mQueries[48] = {
     &daNpc_Sha_c::query264, &daNpc_Sha_c::query999, &daNpc_Sha_c::query999, &daNpc_Sha_c::query999,
 };
 
-/* 80AE52CC-80AE52F0 0025EC 0024+00 5/0 0/0 0/0 .text            query265__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query265() {
     // dSv_event_flag_c::F_0265 - Arbiter's Grounds - Arbiter's Grounds clear
     return daNpcT_chkEvtBit(265);
 }
 
-/* 80AE52F0-80AE5314 002610 0024+00 3/0 0/0 0/0 .text            query268__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query268() {
     // dSv_event_flag_c::F_0268 - City in the Sky - City in the Sky clear
     return daNpcT_chkEvtBit(268);
 }
 
-/* 80AE5314-80AE5338 002634 0024+00 6/0 0/0 0/0 .text            query267__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query267() {
     // dSv_event_flag_c::F_0267 - Temple of Time - Temple of Time clear
     return daNpcT_chkEvtBit(267);
 }
 
-/* 80AE5338-80AE535C 002658 0024+00 4/0 0/0 0/0 .text            query078__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query078() {
     // dSv_event_flag_c::M_045 - Lakebed Temple - Lakebed Temple clear
     return daNpcT_chkEvtBit(78);
 }
 
-/* 80AE535C-80AE5380 00267C 0024+00 6/0 0/0 0/0 .text            query264__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query264() {
     // dSv_event_flag_c::F_0264 - Cutscene - Get master sword
     return daNpcT_chkEvtBit(264);
 }
 
-/* 80AE5380-80AE53A4 0026A0 0024+00 4/0 0/0 0/0 .text            query266__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query266() {
     // dSv_event_flag_c::F_0266 - Snowpeak Ruins - Snowpeak Ruins clear
     return daNpcT_chkEvtBit(266);
 }
 
-/* 80AE53A4-80AE53C8 0026C4 0024+00 2/0 0/0 0/0 .text            query542__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query542() {
     // dSv_event_flag_c::F_0542 - Cutscene - [Cutscene] Hyrule Castle barrier disappears (Midna goes crazy)
     return daNpcT_chkEvtBit(542);
 }
 
-/* 80AE53C8-80AE53EC 0026E8 0024+00 1/0 0/0 0/0 .text            query461__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query461() {
     // dSv_event_flag_c::F_0461 - Fishing Pond - First time entered fishing house
     return daNpcT_chkEvtBit(461);
 }
 
-/* 80AE53EC-80AE5410 00270C 0024+00 1/0 0/0 0/0 .text            query288__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query288() {
     // dSv_event_flag_c::F_288 - Cutscene - [cutscene: ] Ilia gets her memories back
     return daNpcT_chkEvtBit(288);
 }
 
-/* 80AE5410-80AE5418 002730 0008+00 13/0 0/0 0/0 .text            query000__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query000() {
     return TRUE;
 }
 
-/* 80AE5418-80AE5420 002738 0008+00 3/0 0/0 0/0 .text            query999__11daNpc_Sha_cFv */
 BOOL daNpc_Sha_c::query999() {
     return FALSE;
 }
 
-/* 80AE5420-80AE5440 002740 0020+00 1/0 0/0 0/0 .text            daNpc_Sha_Create__FPv */
 static int daNpc_Sha_Create(void* i_this) {
     return static_cast<daNpc_Sha_c*>(i_this)->create();
 }
 
-/* 80AE5440-80AE5460 002760 0020+00 1/0 0/0 0/0 .text            daNpc_Sha_Delete__FPv */
 static int daNpc_Sha_Delete(void* i_this) {
     return static_cast<daNpc_Sha_c*>(i_this)->Delete();
 }
 
-/* 80AE5460-80AE5480 002780 0020+00 1/0 0/0 0/0 .text            daNpc_Sha_Execute__FPv */
 static int daNpc_Sha_Execute(void* i_this) {
     return static_cast<daNpc_Sha_c*>(i_this)->Execute();
 }
 
-/* 80AE5480-80AE54A0 0027A0 0020+00 1/0 0/0 0/0 .text            daNpc_Sha_Draw__FPv */
 static int daNpc_Sha_Draw(void* i_this) {
     return static_cast<daNpc_Sha_c*>(i_this)->Draw();
 }
 
-/* 80AE54A0-80AE54A8 0027C0 0008+00 1/0 0/0 0/0 .text            daNpc_Sha_IsDelete__FPv */
 static int daNpc_Sha_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AE7674-80AE7694 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Sha_MethodTable */
 static actor_method_class daNpc_Sha_MethodTable = {
     (process_method_func)daNpc_Sha_Create,
     (process_method_func)daNpc_Sha_Delete,
@@ -1299,7 +1234,6 @@ static actor_method_class daNpc_Sha_MethodTable = {
     (process_method_func)daNpc_Sha_Draw,
 };
 
-/* 80AE7694-80AE76C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SHAMAN */
 extern actor_process_profile_definition g_profile_NPC_SHAMAN = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp
index 30dc1f5453..eb2db6c90b 100644
--- a/src/d/actor/d_a_npc_shoe.cpp
+++ b/src/d/actor/d_a_npc_shoe.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc_shoe.h"
 #include "d/actor/d_a_npc.h"
 
-/* 80AEA3B0-80AEA41C 000000 006C+00 11/11 0/0 0/0 .rodata          m__17daNpcShoe_Param_c */
 const daNpcShoe_HIOParam daNpcShoe_Param_c::m = {
     55.0f,    // attention_offset
     -3.0f,    // gravity
@@ -83,7 +82,6 @@ bool daNpcShoe_c::chkFindPlayer() {
     return ret;
 }
 
-/* 80AEA558-80AEA594 000020 003C+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam2 l_bckGetParamList[5] = {
     {17, 2, 1},  // m_sitwait_a
     {13, 0, 1},  // m_sittalk_a
@@ -92,31 +90,24 @@ static daNpc_GetParam2 l_bckGetParamList[5] = {
     {11, 2, 1}   // m_sit_to_wolf_a
 };
 
-/* 80AEA594-80AEA5A0 00005C 000C+00 0/0 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam2 l_btpGetParamList[1] = {
     {12, 2, 0},  // shoe
 };
 
-/* 80AEA5A0-80AEA5AC -00001 000C+00 5/6 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "shoe",
     "Mgeneral",
     "object",
 };
 
-/* 80AEA5AC-80AEA5B0 000074 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {NULL};
 
-/* 80AEA5B0-80AEA5B4 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Shoe";
 
-/* 80AEA5B4-80AEA5C0 00007C 000C+00 1/2 0/0 0/0 .data            mEvtSeqList__11daNpcShoe_c */
 daNpcShoe_c::EventFn daNpcShoe_c::mEvtSeqList[1] = {NULL};
 
-/* 80AE794C-80AE7AD0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcShoe_cFv */
 daNpcShoe_c::daNpcShoe_c() {}
 
-/* 80AE7B60-80AE7D48 000300 01E8+00 1/0 0/0 0/0 .text            __dt__11daNpcShoe_cFv */
 daNpcShoe_c::~daNpcShoe_c() {
     for (int i = 0; i < 3; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[i]);
@@ -126,7 +117,6 @@ daNpcShoe_c::~daNpcShoe_c() {
     }
 }
 
-/* 80AE7D48-80AE7FD8 0004E8 0290+00 1/1 0/0 0/0 .text            Create__11daNpcShoe_cFv */
 cPhs__Step daNpcShoe_c::Create() {
     cPhs__Step step;
 
@@ -180,7 +170,6 @@ cPhs__Step daNpcShoe_c::Create() {
     return step;
 }
 
-/* 80AE7FD8-80AE81E8 000778 0210+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcShoe_cFv */
 BOOL daNpcShoe_c::CreateHeap() {
     J3DModelData* mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcNames[0], 8));
 
@@ -231,13 +220,11 @@ BOOL daNpcShoe_c::CreateHeap() {
     return true;
 }
 
-/* 80AE81E8-80AE821C 000988 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcShoe_cFv */
 int daNpcShoe_c::Delete() {
     this->~daNpcShoe_c();
     return 1;
 }
 
-/* 80AE821C-80AE8308 0009BC 00EC+00 1/1 0/0 0/0 .text            Execute__11daNpcShoe_cFv */
 int daNpcShoe_c::Execute() {
     if (field_0xe1b != 0) {
         fopAcM_OnStatus(this, 0x8000000);
@@ -261,7 +248,6 @@ int daNpcShoe_c::Execute() {
     return 1;
 }
 
-/* 80AE8308-80AE840C 000AA8 0104+00 1/1 0/0 0/0 .text            Draw__11daNpcShoe_cFv */
 int daNpcShoe_c::Draw() {
     if (!field_0xe1b) {
         return 1;
@@ -280,8 +266,6 @@ int daNpcShoe_c::Draw() {
     return 1;
 }
 
-/* 80AE840C-80AE8598 000BAC 018C+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpcShoe_cFP8J3DJointP8J3DModel                */
 bool daNpcShoe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int joint_no = i_joint->getJntNo();
     int lookat_joints[3] = {1, 2, 3};
@@ -310,14 +294,10 @@ bool daNpcShoe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return true;
 }
 
-/* 80AE8598-80AE85B8 000D38 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpcShoe_cFP10fopAc_ac_c              */
 BOOL daNpcShoe_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpcShoe_c*>(i_this)->CreateHeap();
 }
 
-/* 80AE85B8-80AE8604 000D58 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpcShoe_cFP8J3DJointi
- */
 BOOL daNpcShoe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -329,7 +309,6 @@ BOOL daNpcShoe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return true;
 }
 
-/* 80AE8604-80AE864C 000DA4 0048+00 1/0 0/0 0/0 .text            setMotion__11daNpcShoe_cFifi */
 void daNpcShoe_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = (s16)i_motion;
     if (i_restart || mMotion != motion) {
@@ -343,7 +322,6 @@ void daNpcShoe_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80AE864C-80AE895C 000DEC 0310+00 1/1 0/0 0/0 .text            reset__11daNpcShoe_cFv */
 void daNpcShoe_c::reset() {
     initialize();
     mLookat.initialize();
@@ -434,7 +412,6 @@ void daNpcShoe_c::playMotion() {
     }
 }
 
-/* 80AE9820-80AE9A00 001FC0 01E0+00 1/1 0/0 0/0 .text            lookat__11daNpcShoe_cFv */
 void daNpcShoe_c::lookat() {
     fopAc_ac_c* actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -486,8 +463,6 @@ void daNpcShoe_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80AE895C-80AE8A04 0010FC 00A8+00 1/1 0/0 0/0 .text
- * setAction__11daNpcShoe_cFM11daNpcShoe_cFPCvPvPv_b            */
 int daNpcShoe_c::setAction(bool (daNpcShoe_c::*i_actionFunc)(void*)) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -502,7 +477,6 @@ int daNpcShoe_c::setAction(bool (daNpcShoe_c::*i_actionFunc)(void*)) {
     return 1;
 }
 
-/* 80AE8A04-80AE8E24 0011A4 0420+00 3/0 0/0 0/0 .text            wait__11daNpcShoe_cFPv */
 bool daNpcShoe_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -558,7 +532,6 @@ bool daNpcShoe_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80AE8E24-80AE8ED4 0015C4 00B0+00 1/0 0/0 0/0 .text            fear__11daNpcShoe_cFPv */
 bool daNpcShoe_c::fear(void* param_0) {
     switch (mMode) {
     case 0:
@@ -582,7 +555,6 @@ bool daNpcShoe_c::fear(void* param_0) {
     return 1;
 }
 
-/* 80AE8ED4-80AE9094 001674 01C0+00 1/0 0/0 0/0 .text            talk__11daNpcShoe_cFPv */
 bool daNpcShoe_c::talk(void* param_0) {
     bool ret = 0;
     switch (mMode) {
@@ -621,7 +593,6 @@ bool daNpcShoe_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80AE9094-80AE9260 001834 01CC+00 1/0 0/0 0/0 .text            demo__11daNpcShoe_cFPv */
 bool daNpcShoe_c::demo(void* param_0) {
     switch (mMode) {
     case 0:
@@ -663,32 +634,26 @@ bool daNpcShoe_c::demo(void* param_0) {
     return 1;
 }
 
-/* 80AE9260-80AE9280 001A00 0020+00 1/0 0/0 0/0 .text            daNpcShoe_Create__FPv */
 static cPhs__Step daNpcShoe_Create(void* i_this) {
     return static_cast<daNpcShoe_c*>(i_this)->Create();
 }
 
-/* 80AE9280-80AE92A0 001A20 0020+00 1/0 0/0 0/0 .text            daNpcShoe_Delete__FPv */
 static int daNpcShoe_Delete(void* i_this) {
     return static_cast<daNpcShoe_c*>(i_this)->Delete();
 }
 
-/* 80AE92A0-80AE92C0 001A40 0020+00 1/0 0/0 0/0 .text            daNpcShoe_Execute__FPv */
 static int daNpcShoe_Execute(void* i_this) {
     return static_cast<daNpcShoe_c*>(i_this)->Execute();
 }
 
-/* 80AE92C0-80AE92E0 001A60 0020+00 1/0 0/0 0/0 .text            daNpcShoe_Draw__FPv */
 static int daNpcShoe_Draw(void* i_this) {
     return static_cast<daNpcShoe_c*>(i_this)->Draw();
 }
 
-/* 80AE92E0-80AE92E8 001A80 0008+00 1/0 0/0 0/0 .text            daNpcShoe_IsDelete__FPv */
 static bool daNpcShoe_IsDelete(void* param_0) {
     return true;
 }
 
-/* 80AE92E8-80AE93A0 001A88 00B8+00 1/0 0/0 0/0 .text            setParam__11daNpcShoe_cFv */
 void daNpcShoe_c::setParam() {
     attention_info.distances[0] =
         getDistTableIdx(mpHIO->m.common.attention_distance, mpHIO->m.common.attention_angle);
@@ -705,7 +670,6 @@ void daNpcShoe_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80AE93A0-80AE9624 001B40 0284+00 1/0 0/0 0/0 .text            main__11daNpcShoe_cFv */
 BOOL daNpcShoe_c::main() {
     if (mpActionFn != NULL) {
         (this->*mpActionFn)(0);
@@ -718,7 +682,6 @@ BOOL daNpcShoe_c::main() {
     return 0;
 }
 
-/* 80AE9624-80AE9820 001DC4 01FC+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcShoe_cFv */
 void daNpcShoe_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -753,7 +716,6 @@ void daNpcShoe_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80AE9A00-80AE9AD0 0021A0 00D0+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcShoe_cFif */
 void daNpcShoe_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* morfAnm = getTrnsfrmKeyAnmP(l_arcNames[l_bckGetParamList[i_idx].arcIdx],
                                                     l_bckGetParamList[i_idx].fileIdx);
@@ -770,19 +732,16 @@ void daNpcShoe_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AE9AD0-80AE9AD8 002270 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcShoe_cFv */
 BOOL daNpcShoe_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80AEA608-80AEA628 -00001 0020+00 1/0 0/0 0/0 .data            daNpcShoe_MethodTable */
 static actor_method_class daNpcShoe_MethodTable = {
     (process_method_func)daNpcShoe_Create,  (process_method_func)daNpcShoe_Delete,
     (process_method_func)daNpcShoe_Execute, (process_method_func)daNpcShoe_IsDelete,
     (process_method_func)daNpcShoe_Draw,
 };
 
-/* 80AEA628-80AEA658 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SHOE */
 extern actor_process_profile_definition g_profile_NPC_SHOE = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp
index 8ec7ffeaad..4a17fb849b 100644
--- a/src/d/actor/d_a_npc_shop0.cpp
+++ b/src/d/actor/d_a_npc_shop0.cpp
@@ -7,27 +7,20 @@
 
 #include "d/actor/d_a_npc_shop0.h"
 
-/* 80AEA7D8-80AEA7F8 000078 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c
- */
 static int createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Shop0_c*>(i_this)->createHeap();
 }
 
-/* 80AEBC74-80AEBC78 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "Shop0";
 
-/* 80AEBC78-80AEBC7C -00001 0004+00 1/1 0/0 0/0 .data            l_bmdFileName */
 static char* l_bmdFileName = "grA_a.bmd";
 
-/* 80AEBC7C-80AEBC80 -00001 0004+00 1/1 0/0 0/0 .data            l_bckFileNameTBL */
 static char* l_bckFileNameTBL = "grA_wait_a";
 
-/* 80AEA7F8-80AEAA10 000098 0218+00 1/0 0/0 0/0 .text            __dt__13daNpc_Shop0_cFv */
 daNpc_Shop0_c::~daNpc_Shop0_c() {
     dComIfG_resLoad(&mPhaseReq, getResName());
 }
 
-/* 80AEAA10-80AEAC10 0002B0 0200+00 1/1 0/0 0/0 .text            create__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::create() {
     fopAcM_ct(this, daNpc_Shop0_c);
 
@@ -64,14 +57,12 @@ dCcD_SrcCyl const daNpc_Shop0_c::mCylDat = {
     } // mCyl
 };
 
-/* 80AEBC18-80AEBC24 000044 000C+00 0/0 0/0 0/0 .rodata          mParam__19daNpc_Shop0_Param_c */
 daNpc_Shop0_Param_c::param const daNpc_Shop0_Param_c::mParam = {
     0x44480000, 
     0x44480000,
     0x41F00000,
 };
 
-/* 80AEAE9C-80AEAF8C 00073C 00F0+00 1/1 0/0 0/0 .text            createHeap__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::createHeap() {
     mpModel = mDoExt_J3DModel__create(
         (J3DModelData *) dComIfG_getObjectRes(getResName(), l_bmdFileName),
@@ -91,13 +82,11 @@ int daNpc_Shop0_c::createHeap() {
     return 1;
 }
 
-/* 80AEAF8C-80AEAFC0 00082C 0034+00 1/1 0/0 0/0 .text            destroy__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::destroy() {
     this->~daNpc_Shop0_c();
     return 1;
 }
 
-/* 80AEAFC0-80AEB078 000860 00B8+00 2/2 0/0 0/0 .text            execute__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::execute() {
     int event = checkEvent();
     gravity = -3.0f;
@@ -121,7 +110,6 @@ int daNpc_Shop0_c::execute() {
     return 1;
 }
 
-/* 80AEB078-80AEB148 000918 00D0+00 1/1 0/0 0/0 .text            draw__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::draw() {
     mBckAnm.entry(mpModel->getModelData());
     mDoExt_modelUpdateDL(mpModel);
@@ -142,12 +130,10 @@ int daNpc_Shop0_c::draw() {
     return 1;
 }
 
-/* 80AEB190-80AEB1A0 000A30 0010+00 5/5 0/0 0/0 .text            getResName__13daNpc_Shop0_cFv */
 char* daNpc_Shop0_c::getResName() {
     return l_resName;
 }
 
-/* 80AEB1A0-80AEB1C8 000A40 0028+00 1/1 0/0 0/0 .text            getParam__13daNpc_Shop0_cFv */
 void daNpc_Shop0_c::getParam() {
     mParam = fopAcM_GetParam(this);
     mFlowNodeNum = (fopAcM_GetParam(this) & 0xffff00) >> 8;
@@ -155,13 +141,10 @@ void daNpc_Shop0_c::getParam() {
     field_0x9ea = 0;
 }
 
-/* 80AEB1C8-80AEB1D0 000A68 0008+00 2/2 0/0 0/0 .text            getFlowNodeNum__13daNpc_Shop0_cFv
- */
 int daNpc_Shop0_c::getFlowNodeNum() {
     return mFlowNodeNum;
 }
 
-/* 80AEB1D0-80AEB22C 000A70 005C+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::isDelete() {
     bool ret = 0;
     if (field_0x9ea != 0xff && dComIfGs_isSwitch(field_0x9ea, fopAcM_GetRoomNo(this))) {
@@ -170,7 +153,6 @@ int daNpc_Shop0_c::isDelete() {
     return ret;
 }
 
-/* 80AEB22C-80AEB32C 000ACC 0100+00 1/1 0/0 0/0 .text            init__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::init() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     mAcchCir.SetWall(40.0f, 40.0f);
@@ -196,18 +178,14 @@ int daNpc_Shop0_c::init() {
     return execute();
 }
 
-/* 80AEBDC0-80AEBDD8 000000 0015+03 1/1 0/0 0/0 .bss             l_fileName */
 static char l_fileName[21];
 
-/* 80AEB32C-80AEB3A8 000BCC 007C+00 1/1 0/0 0/0 .text getTrnsfrmAnmP__13daNpc_Shop0_cFiPPc */
 J3DAnmTransform* daNpc_Shop0_c::getTrnsfrmAnmP(int i_fileIndex, char** i_fileName) {
     strcpy(l_fileName, i_fileName[i_fileIndex]);
     strcat(l_fileName, ".bck");
     return (J3DAnmTransform*) dComIfG_getObjectRes(getResName(), l_fileName);
 }
 
-/* 80AEB3A8-80AEB45C 000C48 00B4+00 1/1 0/0 0/0 .text
- * setBckAnm__13daNpc_Shop0_cFP15J3DAnmTransformfiiib           */
 int daNpc_Shop0_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int i_start, int i_end,
         bool i_modify)  {
     int init_status = mBckAnm.init(i_bck, 1, i_attr, 0, i_start, i_end, i_modify);
@@ -218,7 +196,6 @@ int daNpc_Shop0_c::setBckAnm(J3DAnmTransform* i_bck, f32 i_rate, int i_attr, int
     return init_status;
 }
 
-/* 80AEB45C-80AEB4C8 000CFC 006C+00 1/1 0/0 0/0 .text            setCollision__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::setCollision() {
     mCyl.SetR(40.0f);
     mCyl.SetH(40.0f);
@@ -228,7 +205,6 @@ int daNpc_Shop0_c::setCollision() {
     return 1;
 }
 
-/* 80AEB4C8-80AEB5E8 000D68 0120+00 1/1 0/0 0/0 .text            checkEvent__13daNpc_Shop0_cFv */
 int daNpc_Shop0_c::checkEvent() {
     int ret = 1;
     if (dComIfGp_event_runCheck()) {
@@ -245,14 +221,12 @@ int daNpc_Shop0_c::checkEvent() {
     return ret;
 }
 
-/* 80AEB5E8-80AEB634 000E88 004C+00 1/1 0/0 0/0 .text            orderEvent__13daNpc_Shop0_cFv */
 void daNpc_Shop0_c::orderEvent() {
     if (getFlowNodeNum() >= 0 && attention_info.flags == (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e)) {
         eventInfo.onCondition(1);
     }
 }
 
-/* 80AEB634-80AEB6DC 000ED4 00A8+00 1/1 0/0 0/0 .text            setMtx__13daNpc_Shop0_cFv */
 void daNpc_Shop0_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -264,7 +238,6 @@ void daNpc_Shop0_c::setMtx() {
     eyePos = current.pos;
 }
 
-/* 80AEB6DC-80AEB780 000F7C 00A4+00 2/2 0/0 0/0 .text            setRoomInf__13daNpc_Shop0_cFv */
 void daNpc_Shop0_c::setRoomInf() {
     u32 room_no;
     mGndChk.SetPos(&current.pos);
@@ -281,7 +254,6 @@ void daNpc_Shop0_c::setRoomInf() {
     fopAcM_SetRoomNo(this, room_no);
 }
 
-/* 80AEB780-80AEB7F0 001020 0070+00 1/1 0/0 0/0 .text            cut_alert__13daNpc_Shop0_cFii */
 int daNpc_Shop0_c::cut_alert(int, int i_param1) {
     if (i_param1) {
         mMsgFlow.init(this, getFlowNodeNum(), 0, NULL);
@@ -292,15 +264,11 @@ int daNpc_Shop0_c::cut_alert(int, int i_param1) {
     return 1;
 }
 
-/* 80AEB7F0-80AEB824 001090 0034+00 2/2 0/0 0/0 .text
- * chkProcess__13daNpc_Shop0_cFM13daNpc_Shop0_cFPCvPvPv_i       */
 int daNpc_Shop0_c::chkProcess(int (daNpc_Shop0_c::* process)(void*)) {
     return process == mProcess;
 
 }
 
-/* 80AEB824-80AEB920 0010C4 00FC+00 3/3 0/0 0/0 .text
- * setProcess__13daNpc_Shop0_cFM13daNpc_Shop0_cFPCvPvPv_iPvi    */
 int daNpc_Shop0_c::setProcess(int (daNpc_Shop0_c::* process)(void*), void* i_func_param,
                                    int param_2) {
     int ret = 0;    
@@ -323,7 +291,6 @@ int daNpc_Shop0_c::setProcess(int (daNpc_Shop0_c::* process)(void*), void* i_fun
     return ret;
 }
 
-/* 80AEB920-80AEB9BC 0011C0 009C+00 2/0 0/0 0/0 .text            wait__13daNpc_Shop0_cFPv */
 int daNpc_Shop0_c::wait(void* i_stat_loc) {
     switch (mMode) {
         case 0:
@@ -338,7 +305,6 @@ int daNpc_Shop0_c::wait(void* i_stat_loc) {
     return 1;
 }
 
-/* 80AEB9BC-80AEBA8C 00125C 00D0+00 2/0 0/0 0/0 .text            talk__13daNpc_Shop0_cFPv */
 int daNpc_Shop0_c::talk(void* i_stat_loc) {
     int ret = 0;
     switch (mMode) {
@@ -357,37 +323,30 @@ int daNpc_Shop0_c::talk(void* i_stat_loc) {
     return ret;
 }
 
-/* 80AEBA8C-80AEBAAC 00132C 0020+00 1/0 0/0 0/0 .text            daNpc_Shop0_Create__FPv */
 static int daNpc_Shop0_Create(void* i_this) {
     return static_cast<daNpc_Shop0_c*>(i_this)->create();
 }
 
-/* 80AEBAAC-80AEBACC 00134C 0020+00 1/0 0/0 0/0 .text            daNpc_Shop0_Delete__FPv */
 static int daNpc_Shop0_Delete(void* i_this) {
     return static_cast<daNpc_Shop0_c*>(i_this)->destroy();
 }
 
-/* 80AEBACC-80AEBAEC 00136C 0020+00 1/0 0/0 0/0 .text            daNpc_Shop0_Execute__FPv */
 static int daNpc_Shop0_Execute(void* i_this) {
     return static_cast<daNpc_Shop0_c*>(i_this)->execute();
 }
 
-/* 80AEBAEC-80AEBB0C 00138C 0020+00 1/0 0/0 0/0 .text            daNpc_Shop0_Draw__FPv */
 static int daNpc_Shop0_Draw(void* i_this) {
     return static_cast<daNpc_Shop0_c*>(i_this)->draw();
 }
 
-/* 80AEBB0C-80AEBB14 0013AC 0008+00 1/0 0/0 0/0 .text            daNpc_Shop0_IsDelete__FPv */
 static int daNpc_Shop0_IsDelete(void*) {
     return true;
 }
 
-/* 80AEBCB0-80AEBCD0 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Shop0_MethodTable */
 static actor_method_class daNpc_Shop0_MethodTable = {
     daNpc_Shop0_Create, daNpc_Shop0_Delete, daNpc_Shop0_Execute, daNpc_Shop0_IsDelete, daNpc_Shop0_Draw,
 };
 
-/* 80AEBCD0-80AEBD00 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SHOP0 */
 extern actor_process_profile_definition g_profile_NPC_SHOP0 = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp
index 0fa5f9d30f..fb404f1bb5 100644
--- a/src/d/actor/d_a_npc_shop_maro.cpp
+++ b/src/d/actor/d_a_npc_shop_maro.cpp
@@ -7,40 +7,32 @@
 
 #include "d/actor/d_a_npc_shop_maro.h"
 
-/* 80AEBE58-80AEBE78 000078 0020+00 1/0 0/0 0/0 .text            daNpc_shopMaro_Create__FPv */
 static int daNpc_shopMaro_Create(void* i_this) {
     return static_cast<daNpc_shopMaro_c*>(i_this)->create();
 }
 
-/* 80AEBE78-80AEBE9C 000098 0024+00 1/0 0/0 0/0 .text            daNpc_shopMaro_Delete__FPv */
 static int daNpc_shopMaro_Delete(void* i_this) {
     static_cast<daNpc_shopMaro_c*>(i_this)->deleteObject();
     return 1;
 }
 
-/* 80AEBE9C-80AEBEA4 0000BC 0008+00 1/0 0/0 0/0 .text            daNpc_shopMaro_Execute__FPv */
 static bool daNpc_shopMaro_Execute(void* i_this) {
     return false;
 }
 
-/* 80AEBEA4-80AEBEAC 0000C4 0008+00 1/0 0/0 0/0 .text            daNpc_shopMaro_Draw__FPv */
 static bool daNpc_shopMaro_Draw(void* i_this) {
     return false;
 }
 
-/* 80AEBEAC-80AEBEB4 0000CC 0008+00 1/0 0/0 0/0 .text            daNpc_shopMaro_IsDelete__FPv */
 static bool daNpc_shopMaro_IsDelete(void* i_this) {
     return true;
 }
 
-/* 80AEBEB4-80AEBF04 0000D4 0050+00 1/1 0/0 0/0 .text            create__16daNpc_shopMaro_cFv */
 int daNpc_shopMaro_c::create() {
     fopAcM_ct(this, daNpc_shopMaro_c);
     return cPhs_ERROR_e;
 }
 
-/* ############################################################################################## */
-/* 80AEC938-80AEC958 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_shopMaro_MethodTable */
 static actor_method_class daNpc_shopMaro_MethodTable = {
     (process_method_func)daNpc_shopMaro_Create,
     (process_method_func)daNpc_shopMaro_Delete,
@@ -49,7 +41,6 @@ static actor_method_class daNpc_shopMaro_MethodTable = {
     (process_method_func)daNpc_shopMaro_Draw,
 };
 
-/* 80AEC958-80AEC988 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SMARO */
 extern actor_process_profile_definition g_profile_NPC_SMARO = {
     fpcLy_CURRENT_e,             // mLayerID
     7,                           // mListID
diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp
index 0ab4722b88..17a0104acf 100644
--- a/src/d/actor/d_a_npc_sola.cpp
+++ b/src/d/actor/d_a_npc_sola.cpp
@@ -19,40 +19,32 @@ enum RES_Name {
     /* 0x1 */ SOLA,
 };
 
-/* 80AEF214-80AEF21C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_SOLA, SOLA},
 };
 
-/* 80AEF21C-80AEF22C -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80AEF22C-80AEF234 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "solA",
 };
 
-/* 80AEF234-80AEF238 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80AEF238-80AEF23C -00001 0004+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[1] = {l_loadResPtrn0};
 
-/* 80AEF23C-80AEF258 000048 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, NONE, FALSE},
 };
 
-/* 80AEF258-80AEF274 000064 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {BCK_SOLA_WAIT_A, J3DFrameCtrl::EMode_LOOP, SOLA, -1, J3DFrameCtrl::EMode_NONE, NONE, 0, 0},
 };
 
-/* 80AEF274-80AEF284 000080 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -60,7 +52,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 80AEF284-80AEF294 000090 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -68,10 +59,8 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {-1, 0, 0},
 };
 
-/* 80AEF294-80AEF298 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_solA_c */
 char* daNpc_solA_c::mCutNameList[1] = {""};
 
-/* 80AEF298-80AEF2A4 0000A4 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_solA_c */
 daNpc_solA_c::cutFunc daNpc_solA_c::mCutList[1] = {
     NULL,
 };
@@ -84,7 +73,6 @@ daNpc_solA_c::~daNpc_solA_c() {
     deleteRes(l_loadResPtrnList[field_0xf80], (const char**)l_resNameList);
 }
 
-/* 80AEF100-80AEF18C 000000 008C+00 8/8 0/0 0/0 .rodata          m__18daNpc_solA_Param_c */
 daNpc_solA_HIOParam const daNpc_solA_Param_c::m = {
     220.0f, -3.0f, 1.0f,   400.0f, 255.0f, 200.0f, 35.0f, 30.0f, 0.0f, 0.0f,  10.0f,
     -10.0f, 30.0f, -10.0f, 45.0f,  -45.0f, 0.6f,   12.0f, 3,     6,    5,     6,
@@ -92,7 +80,6 @@ daNpc_solA_HIOParam const daNpc_solA_Param_c::m = {
     4.0f,   0.0f,  0.0f,   0.0f,   0.0f,   0.0f,   0.0f,  0.0f,
 };
 
-/* 80AECCD0-80AECF58 000210 0288+00 1/1 0/0 0/0 .text            create__12daNpc_solA_cFv */
 int daNpc_solA_c::create() {
     daNpcT_ct(this, daNpc_solA_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
               l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -135,7 +122,6 @@ int daNpc_solA_c::create() {
     return rv;
 }
 
-/* 80AECF58-80AED0F8 000498 01A0+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_solA_cFv */
 int daNpc_solA_c::CreateHeap() {
     J3DModel* model;
     J3DModelData* mdlData_p;
@@ -169,19 +155,16 @@ int daNpc_solA_c::CreateHeap() {
     return 0;
 }
 
-/* 80AED0F8-80AED12C 000638 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_solA_cFv */
 int daNpc_solA_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_solA_c();
     return 1;
 }
 
-/* 80AED12C-80AED14C 00066C 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_solA_cFv */
 int daNpc_solA_c::Execute() {
     execute();
 }
 
-/* 80AED14C-80AED1E8 00068C 009C+00 1/1 0/0 0/0 .text            Draw__12daNpc_solA_cFv */
 void daNpc_solA_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -192,14 +175,10 @@ void daNpc_solA_c::Draw() {
     return;
 }
 
-/* 80AED1E8-80AED208 000728 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_solA_cFP10fopAc_ac_c             */
 BOOL daNpc_solA_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_solA_c*>(a_this)->CreateHeap();
 }
 
-/* 80AED208-80AED260 000748 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpc_solA_cFP8J3DJointi                */
 BOOL daNpc_solA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     daNpc_solA_c* i_this;
     J3DModel* model;
@@ -213,12 +192,10 @@ BOOL daNpc_solA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return true;
 }
 
-/* 80AED260-80AED268 0007A0 0008+00 1/1 0/0 0/0 .text            getType__12daNpc_solA_cFv */
 bool daNpc_solA_c::getType() {
     return false;
 }
 
-/* 80AED268-80AED284 0007A8 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_solA_cFv */
 int daNpc_solA_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -227,12 +204,10 @@ int daNpc_solA_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80AED284-80AED294 0007C4 0010+00 1/1 0/0 0/0 .text            isDelete__12daNpc_solA_cFv */
 int daNpc_solA_c::isDelete() {
     return field_0xf80 ? 1 : 0;
 }
 
-/* 80AED294-80AED3B8 0007D4 0124+00 1/1 0/0 0/0 .text            reset__12daNpc_solA_cFv */
 void daNpc_solA_c::reset() {
     initialize();
     int size = (u8*)&field_0xf9c - (u8*)&mNextAction;
@@ -245,7 +220,6 @@ void daNpc_solA_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80AED3B8-80AED4A4 0008F8 00EC+00 1/0 0/0 0/0 .text            setParam__12daNpc_solA_cFv */
 void daNpc_solA_c::setParam() {
     selectAction();
     srchActors();
@@ -273,17 +247,14 @@ void daNpc_solA_c::setParam() {
     mMorfFrames = daNpc_solA_Param_c::m.common.morf_frame;
 }
 
-/* 80AED4A4-80AED504 0009E4 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_solA_cFv */
 void daNpc_solA_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(0, -1.0f, 0, 0);
 }
 
-/* 80AED504-80AED508 000A44 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_solA_cFv */
 void daNpc_solA_c::srchActors() {
     /* empty function */
 }
 
-/* 80AED508-80AED608 000A48 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_solA_cFv */
 BOOL daNpc_solA_c::evtTalk() {
     if (chkAction(&daNpc_solA_c::talk)) {
         (this->*(mAction))(NULL);
@@ -302,7 +273,6 @@ BOOL daNpc_solA_c::evtTalk() {
     return 1;
 }
 
-/* 80AED608-80AED6D0 000B48 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_solA_cFv */
 BOOL daNpc_solA_c::evtCutProc() {
     BOOL rv = 0;
     int staffID = dComIfGp_getEventManager().getMyStaffId("solA", this, -1);
@@ -319,7 +289,6 @@ BOOL daNpc_solA_c::evtCutProc() {
     return rv;
 }
 
-/* 80AED6D0-80AED758 000C10 0088+00 1/0 0/0 0/0 .text            action__12daNpc_solA_cFv */
 void daNpc_solA_c::action() {
     if (mNextAction != NULL) {
         if (mAction == mNextAction) {
@@ -330,14 +299,12 @@ void daNpc_solA_c::action() {
     }
 }
 
-/* 80AED758-80AED7D0 000C98 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_solA_cFv */
 void daNpc_solA_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80AED7D0-80AED9DC 000D10 020C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_solA_cFv */
 void daNpc_solA_c::setAttnPos() {
     cXyz local_38(30.0f, 0.0f, 0.0f);
     mJntAnm.setParam(
@@ -361,7 +328,6 @@ void daNpc_solA_c::setAttnPos() {
     attention_info.position.y += daNpc_solA_Param_c::m.common.attention_offset;
 }
 
-/* 80AED9DC-80AEDABC 000F1C 00E0+00 1/0 0/0 0/0 .text            setCollision__12daNpc_solA_cFv */
 void daNpc_solA_c::setCollision() {
     cXyz pos;
     if (!mHide) {
@@ -381,31 +347,24 @@ void daNpc_solA_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80AEDABC-80AEDAC4 000FFC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_solA_cFv */
 int daNpc_solA_c::drawDbgInfo() {
     return false;
 }
 
-/* 80AEDAC4-80AEDAC8 001004 0004+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_solA_cFv */
 void daNpc_solA_c::drawOtherMdl() {
     /* empty function */
 }
 
-/* 80AEDAC8-80AEDB10 001008 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_solA_cFv */
 int daNpc_solA_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_solA_c::wait;
     return 1;
 }
 
-/* 80AEDB10-80AEDB3C 001050 002C+00 1/1 0/0 0/0 .text
- * chkAction__12daNpc_solA_cFM12daNpc_solA_cFPCvPvPv_i          */
 int daNpc_solA_c::chkAction(int (daNpc_solA_c::*param_0)(void*)) {
     return mAction == param_0;
 }
 
-/* 80AEDB3C-80AEDBE4 00107C 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_solA_cFM12daNpc_solA_cFPCvPvPv_i          */
 int daNpc_solA_c::setAction(int (daNpc_solA_c::*param_0)(void*)) {
     mMode = MODE_EXIT;
     if (mAction != NULL) {
@@ -421,7 +380,6 @@ int daNpc_solA_c::setAction(int (daNpc_solA_c::*param_0)(void*)) {
     return 1;
 }
 
-/* 80AEDBE4-80AEDD60 001124 017C+00 1/0 0/0 0/0 .text            wait__12daNpc_solA_cFPv */
 int daNpc_solA_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -447,7 +405,6 @@ int daNpc_solA_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80AEDD60-80AEDED0 0012A0 0170+00 2/0 0/0 0/0 .text            talk__12daNpc_solA_cFPv */
 int daNpc_solA_c::talk(void* param_0) {
     int bVar1 = 0;
     switch (mMode) {
@@ -483,42 +440,34 @@ int daNpc_solA_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80AEDED0-80AEDEF0 001410 0020+00 1/0 0/0 0/0 .text            daNpc_solA_Create__FPv */
 static int daNpc_solA_Create(void* param_0) {
     return static_cast<daNpc_solA_c*>(param_0)->create();
 }
 
-/* 80AEDEF0-80AEDF10 001430 0020+00 1/0 0/0 0/0 .text            daNpc_solA_Delete__FPv */
 static int daNpc_solA_Delete(void* param_0) {
     return static_cast<daNpc_solA_c*>(param_0)->Delete();
 }
 
-/* 80AEDF10-80AEDF30 001450 0020+00 1/0 0/0 0/0 .text            daNpc_solA_Execute__FPv */
 static int daNpc_solA_Execute(void* param_0) {
     static_cast<daNpc_solA_c*>(param_0)->Execute();
 }
 
-/* 80AEDF30-80AEDF50 001470 0020+00 1/0 0/0 0/0 .text            daNpc_solA_Draw__FPv */
 static void daNpc_solA_Draw(void* param_0) {
     return static_cast<daNpc_solA_c*>(param_0)->Draw();
 }
 
-/* 80AEDF50-80AEDF58 001490 0008+00 1/0 0/0 0/0 .text            daNpc_solA_IsDelete__FPv */
 static bool daNpc_solA_IsDelete(void* param_0) {
     return true;
 }
 
-/* 80AEF48C-80AEF490 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_solA_Param_c l_HIO;
 
-/* 80AEF2C8-80AEF2E8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_solA_MethodTable */
 static actor_method_class daNpc_solA_MethodTable = {
     (process_method_func)daNpc_solA_Create,  (process_method_func)daNpc_solA_Delete,
     (process_method_func)daNpc_solA_Execute, (process_method_func)daNpc_solA_IsDelete,
     (process_method_func)daNpc_solA_Draw,
 };
 
-/* 80AEF2E8-80AEF318 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SOLA */
 actor_process_profile_definition g_profile_NPC_SOLA = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp
index dea383a2ca..6379d31539 100644
--- a/src/d/actor/d_a_npc_soldierA.cpp
+++ b/src/d/actor/d_a_npc_soldierA.cpp
@@ -87,16 +87,13 @@ enum Event_Cut_Nums {
     /* 0x3 */ NUM_EVT_CUTS_e = 0x3,
 };
 
-/* 80AF2B3C-80AF2B40 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_SOLDIERA_HIO_CLASS l_HIO;
 
-/* 80AF28A8-80AF28B8 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {BMDR_SOLA_TW, CHTSOLA},
     {BMDR_SOLA_SPEAR, CHTSOLA},
 };
 
-/* 80AF28B8-80AF28F0 000030 0038+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[7] = {
     {-1, CHTSOLA},
     {BCK_SOLA_WAIT_A, CHTSOLA},
@@ -107,29 +104,24 @@ static daNpc_GetParam1 l_bckGetParamList[7] = {
     {BCK_SOLA_TALK_B, CHTSOLA},
 };
 
-/* 80AF28F0-80AF2900 000068 0010+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[2] = {
     {0, CHTSOLA},
     {1, CHTSOLA},
 };
 
-/* 80AF2900-80AF2908 -00001 0008+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "TALK_LAKE",
 };
 
-/* 80AF2908-80AF2914 000080 000C+00 1/0 0/0 0/0 .data            l_loadRes_SOLDIERaa */
 static int l_loadRes_SOLDIERaa[3] = {
     CHTSOLA, -1, -1,
 };
 
-/* 80AF2914-80AF2920 00008C 000C+00 1/0 0/0 0/0 .data            l_loadRes_SOLDIERa0 */
 static int l_loadRes_SOLDIERa0[3] = {
     CHTSOLA, -1, -1,
 };
 
-/* 80AF2920-80AF2930 -00001 0010+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[4] = {
     l_loadRes_SOLDIERaa,
     l_loadRes_SOLDIERaa,
@@ -137,30 +129,24 @@ static int* l_loadRes_list[4] = {
     l_loadRes_SOLDIERa0,
 };
 
-/* 80AF2930-80AF2934 -00001 0004+00 4/6 0/0 0/0 .data            l_resNames */
 static char* l_resNames[1] = {"chtSolA"};
 
-/* 80AF2934-80AF2938 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "chtSolA";
 
-/* 80AF2938-80AF2944 -00001 000C+00 0/1 0/0 0/0 .data            mEvtCutNameList__16daNpc_SoldierA_c */
 char* daNpc_SoldierA_c::mEvtCutNameList[3] = {
     "",
     "TALK_LAKE",
     "LISTEN_LAKE",
 };
 
-/* 80AF295C-80AF2980 0000D4 0024+00 0/2 0/0 0/0 .data            mEvtCutList__16daNpc_SoldierA_c */
 daNpc_SoldierA_c::cutFunc daNpc_SoldierA_c::mEvtCutList[3] = {
     NULL,
     &daNpc_SoldierA_c::ECut_talkLake,
     &daNpc_SoldierA_c::ECut_listenLake,
 };
 
-/* 80AEF58C-80AEF710 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__16daNpc_SoldierA_cFv */
 daNpc_SoldierA_c::daNpc_SoldierA_c() {}
 
-/* 80AEF7A0-80AEF9A0 000300 0200+00 1/0 0/0 0/0 .text            __dt__16daNpc_SoldierA_cFv */
 daNpc_SoldierA_c::~daNpc_SoldierA_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -177,7 +163,6 @@ daNpc_SoldierA_c::~daNpc_SoldierA_c() {
     #endif
 }
 
-/* 80AF26E8-80AF2754 000000 006C+00 12/12 0/0 0/0 .rodata          m__22daNpc_SoldierA_Param_c */
 daNpc_SoldierA_HIOParam const daNpc_SoldierA_Param_c::m = {
     30.0f,
     -4.0f,
@@ -214,7 +199,6 @@ daNpc_SoldierA_HIOParam const daNpc_SoldierA_Param_c::m = {
     false,
 };
 
-/* 80AEF9A0-80AEFC80 000500 02E0+00 1/1 0/0 0/0 .text            create__16daNpc_SoldierA_cFv */
 cPhs__Step daNpc_SoldierA_c::create() {
     mTwilight = dKy_darkworld_check();
 
@@ -282,7 +266,6 @@ cPhs__Step daNpc_SoldierA_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80AEFC80-80AEFE4C 0007E0 01CC+00 1/1 0/0 0/0 .text            CreateHeap__16daNpc_SoldierA_cFv */
 int daNpc_SoldierA_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -327,24 +310,20 @@ int daNpc_SoldierA_c::CreateHeap() {
     return 1;
 }
 
-/* 80AEFE4C-80AEFE80 0009AC 0034+00 1/1 0/0 0/0 .text            Delete__16daNpc_SoldierA_cFv */
 int daNpc_SoldierA_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_SoldierA_c();
     return 1;
 }
 
-/* 80AEFE80-80AEFEA0 0009E0 0020+00 2/2 0/0 0/0 .text            Execute__16daNpc_SoldierA_cFv */
 int daNpc_SoldierA_c::Execute() {
     return execute();
 }
 
-/* 80AEFEA0-80AEFF14 000A00 0074+00 1/1 0/0 0/0 .text            Draw__16daNpc_SoldierA_cFv */
 int daNpc_SoldierA_c::Draw() {
     return draw(chkAction(&daNpc_SoldierA_c::test), FALSE, mHIO->m.common.real_shadow_size, NULL, FALSE);
 }
 
-/* 80AEFF14-80AF0110 000A74 01FC+00 1/1 0/0 0/0 .text            ctrlJoint__16daNpc_SoldierA_cFP8J3DJointP8J3DModel */
 int daNpc_SoldierA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -382,13 +361,11 @@ int daNpc_SoldierA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AF0110-80AF0130 000C70 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__16daNpc_SoldierA_cFP10fopAc_ac_c */
 int daNpc_SoldierA_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_SoldierA_c* actor = (daNpc_SoldierA_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80AF0130-80AF017C 000C90 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__16daNpc_SoldierA_cFP8J3DJointi */
 int daNpc_SoldierA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -401,7 +378,6 @@ int daNpc_SoldierA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AF017C-80AF02B0 000CDC 0134+00 1/0 0/0 0/0 .text            setParam__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::setParam() {
     actionFunc action = mNextAction;
     u32 flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -441,7 +417,6 @@ void daNpc_SoldierA_c::setParam() {
     }
 }
 
-/* 80AF02B0-80AF0428 000E10 0178+00 1/0 0/0 0/0 .text            main__16daNpc_SoldierA_cFv */
 BOOL daNpc_SoldierA_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -472,12 +447,10 @@ BOOL daNpc_SoldierA_c::main() {
     return TRUE;
 }
 
-/* 80AF0428-80AF0430 000F88 0008+00 1/0 0/0 0/0 .text            ctrlBtk__16daNpc_SoldierA_cFv */
 BOOL daNpc_SoldierA_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80AF0430-80AF0928 000F90 04F8+00 1/0 0/0 0/0 .text            setAttnPos__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::setAttnPos() {
     static cXyz eyeOffset(0.0f, 20.0f, 0.0f);
     cXyz sp74, sp80, sp8c, sp98;
@@ -552,7 +525,6 @@ void daNpc_SoldierA_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 80AF0928-80AF0A38 001488 0110+00 1/0 0/0 0/0 .text            setMotionAnm__16daNpc_SoldierA_cFif */
 void daNpc_SoldierA_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     int attr = J3DFrameCtrl::EMode_LOOP;
@@ -590,7 +562,6 @@ void daNpc_SoldierA_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AF0A38-80AF0A7C 001598 0044+00 1/0 0/0 0/0 .text            setMotion__16daNpc_SoldierA_cFifi */
 void daNpc_SoldierA_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 6) {
@@ -601,7 +572,6 @@ void daNpc_SoldierA_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80AF0A7C-80AF0A84 0015DC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__16daNpc_SoldierA_cFv */
 int daNpc_SoldierA_c::drawDbgInfo() {
     #if DEBUG
     if (mHIO->m.common.debug_info_ON) {
@@ -644,7 +614,6 @@ int daNpc_SoldierA_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AF0A84-80AF0B30 0015E4 00AC+00 1/0 0/0 0/0 .text            drawOtherMdls__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::drawOtherMdls() {
     g_env_light.setLightTevColorType_MAJI(mSpearModel, &tevStr);
     mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HANDR));
@@ -656,7 +625,6 @@ void daNpc_SoldierA_c::drawOtherMdls() {
     dComIfGd_addRealShadow(mShadowKey, mSpearModel);
 }
 
-/* 80AF0B30-80AF0B7C 001690 004C+00 1/1 0/0 0/0 .text getTypeFromParam__16daNpc_SoldierA_cFv */
 u8 daNpc_SoldierA_c::getTypeFromParam() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -674,7 +642,6 @@ u8 daNpc_SoldierA_c::getTypeFromParam() {
     }
 }
 
-/* 80AF0B7C-80AF0BB0 0016DC 0034+00 1/1 0/0 0/0 .text            isDelete__16daNpc_SoldierA_cFv */
 BOOL daNpc_SoldierA_c::isDelete() {
     if (mType == 0 || mType == 1 || mType == 2 || mType == 3) {
         return FALSE;
@@ -683,7 +650,6 @@ BOOL daNpc_SoldierA_c::isDelete() {
     return TRUE;
 }
 
-/* 80AF0BB0-80AF0D34 001710 0184+00 1/1 0/0 0/0 .text            reset__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::reset() {
     initialize();
     mLookat.initialize();
@@ -712,7 +678,6 @@ void daNpc_SoldierA_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80AF0D34-80AF0F50 001894 021C+00 1/1 0/0 0/0 .text            playMotion__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT, mHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -744,12 +709,10 @@ void daNpc_SoldierA_c::playMotion() {
     }
 }
 
-/* 80AF0F50-80AF0F7C 001AB0 002C+00 2/2 0/0 0/0 .text            chkAction__16daNpc_SoldierA_cFM16daNpc_SoldierA_cFPCvPvPv_i */
 BOOL daNpc_SoldierA_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AF0F7C-80AF1024 001ADC 00A8+00 2/2 0/0 0/0 .text            setAction__16daNpc_SoldierA_cFM16daNpc_SoldierA_cFPCvPvPv_i */
 BOOL daNpc_SoldierA_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -767,7 +730,6 @@ BOOL daNpc_SoldierA_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80AF1024-80AF10A4 001B84 0080+00 1/1 0/0 0/0 .text            selectAction__16daNpc_SoldierA_cFv */
 BOOL daNpc_SoldierA_c::selectAction() {
     mNextAction = NULL;
 
@@ -780,7 +742,6 @@ BOOL daNpc_SoldierA_c::selectAction() {
     return TRUE;
 }
 
-/* 80AF10A4-80AF11B8 001C04 0114+00 1/1 0/0 0/0 .text            doNormalAction__16daNpc_SoldierA_cFi */
 void daNpc_SoldierA_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int damage_time = mCutType == daPy_py_c::CUT_TYPE_TURN_RIGHT ? 20 : mHIO->m.common.damage_time;
@@ -801,7 +762,6 @@ void daNpc_SoldierA_c::doNormalAction(int param_1) {
     }
 }
 
-/* 80AF11B8-80AF1488 001D18 02D0+00 1/1 0/0 0/0 .text            doEvent__16daNpc_SoldierA_cFv */
 BOOL daNpc_SoldierA_c::doEvent() {
     int unused = 0;
     BOOL rv = FALSE;
@@ -872,14 +832,12 @@ BOOL daNpc_SoldierA_c::doEvent() {
     return rv;
 }
 
-/* 80AF1488-80AF14AC 001FE8 0024+00 4/4 0/0 0/0 .text            setLookMode__16daNpc_SoldierA_cFi */
 void daNpc_SoldierA_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80AF14AC-80AF1734 00200C 0288+00 1/1 0/0 0/0 .text            lookat__16daNpc_SoldierA_cFv */
 void daNpc_SoldierA_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -939,7 +897,6 @@ void daNpc_SoldierA_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80AF1734-80AF18B0 002294 017C+00 1/0 0/0 0/0 .text            wait__16daNpc_SoldierA_cFPv */
 int daNpc_SoldierA_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -982,7 +939,6 @@ int daNpc_SoldierA_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AF18B0-80AF1A48 002410 0198+00 2/0 0/0 0/0 .text            talk__16daNpc_SoldierA_cFPv */
 int daNpc_SoldierA_c::talk(void* param_1) {
     int rv = 0;
     BOOL unkFlag = FALSE;
@@ -1037,7 +993,6 @@ int daNpc_SoldierA_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80AF1A48-80AF1B8C 0025A8 0144+00 1/0 0/0 0/0 .text            ECut_talkLake__16daNpc_SoldierA_cFi */
 int daNpc_SoldierA_c::ECut_talkLake(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int unused = 0;
@@ -1092,7 +1047,6 @@ int daNpc_SoldierA_c::ECut_talkLake(int i_staffId) {
     return rv;
 }
 
-/* 80AF1B8C-80AF1CA4 0026EC 0118+00 1/0 0/0 0/0 .text ECut_listenLake__16daNpc_SoldierA_cFi */
 int daNpc_SoldierA_c::ECut_listenLake(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int unused = 0;
@@ -1144,7 +1098,6 @@ int daNpc_SoldierA_c::ECut_listenLake(int i_staffId) {
     return rv;
 }
 
-/* 80AF1CA4-80AF1D58 002804 00B4+00 2/0 0/0 0/0 .text            test__16daNpc_SoldierA_cFPv */
 int daNpc_SoldierA_c::test(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1166,34 +1119,28 @@ int daNpc_SoldierA_c::test(void* param_1) {
     return 1;
 }
 
-/* 80AF1D58-80AF1D78 0028B8 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierA_Create__FPv */
 static int daNpc_SoldierA_Create(void* i_this) {
     return static_cast<daNpc_SoldierA_c*>(i_this)->create();
 }
 
-/* 80AF1D78-80AF1D98 0028D8 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierA_Delete__FPv */
 static int daNpc_SoldierA_Delete(void* i_this) {
     return static_cast<daNpc_SoldierA_c*>(i_this)->Delete();
 }
 
-/* 80AF1D98-80AF1DB8 0028F8 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierA_Execute__FPv */
 static int daNpc_SoldierA_Execute(void* i_this) {
     return static_cast<daNpc_SoldierA_c*>(i_this)->Execute();
 }
 
-/* 80AF1DB8-80AF1DD8 002918 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierA_Draw__FPv */
 static int daNpc_SoldierA_Draw(void* i_this) {
     return static_cast<daNpc_SoldierA_c*>(i_this)->Draw();
 }
 
-/* 80AF1DD8-80AF1DE0 002938 0008+00 1/0 0/0 0/0 .text            daNpc_SoldierA_IsDelete__FPv */
 static int daNpc_SoldierA_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80AF29BC-80AF29DC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_SoldierA_MethodTable */
 static actor_method_class daNpc_SoldierA_MethodTable = {
     (process_method_func)daNpc_SoldierA_Create,
     (process_method_func)daNpc_SoldierA_Delete,
@@ -1202,7 +1149,6 @@ static actor_method_class daNpc_SoldierA_MethodTable = {
     (process_method_func)daNpc_SoldierA_Draw,
 };
 
-/* 80AF29DC-80AF2A0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SOLDIERa */
 extern actor_process_profile_definition g_profile_NPC_SOLDIERa = {
   fpcLy_CURRENT_e,             // mLayerID
   7,                           // mListID
diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp
index 6feb2be67d..4e86992e73 100644
--- a/src/d/actor/d_a_npc_soldierB.cpp
+++ b/src/d/actor/d_a_npc_soldierB.cpp
@@ -66,13 +66,10 @@ enum Event_Cut_Nums {
     /* 0x3 */ NUM_EVT_CUTS_e = 0x3,
 };
 
-/* 80AF5E7C-80AF5E80 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_SOLDIERB_HIO_CLASS l_HIO;
 
-/* 80AF5C30-80AF5C40 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {{10, 0}, {9, 0}};
 
-/* 80AF5C40-80AF5C60 000030 0020+00 1/1 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[4] = {
     {-1, 0},
     {4, 0},
@@ -80,59 +77,47 @@ static daNpc_GetParam1 l_bckGetParamList[4] = {
     {5, 0},
 };
 
-/* 80AF5C60-80AF5C68 000050 0008+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[1] = {
     {0, 0},
 };
 
-/* 80AF5C68-80AF5C6C 000058 0004+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[1] = {
     NULL,
 };
 
-/* 80AF5C6C-80AF5C78 00005C 000C+00 1/0 0/0 0/0 .data            l_loadRes_SOLDIERba */
 static int l_loadRes_SOLDIERba[3] = {
     0,
     -1,
     -1,
 };
 
-/* 80AF5C78-80AF5C84 000068 000C+00 1/0 0/0 0/0 .data            l_loadRes_SOLDIERb0 */
 static int l_loadRes_SOLDIERb0[3] = {
     0,
     -1,
     -1,
 };
 
-/* 80AF5C84-80AF5C8C -00001 0008+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[2] = {
     l_loadRes_SOLDIERba,
     l_loadRes_SOLDIERb0,
 };
 
-/* 80AF5C8C-80AF5C90 -00001 0004+00 4/5 0/0 0/0 .data            l_resNames */
 static char* l_resNames[1] = {"chtSolB"};
 
-/* 80AF5C90-80AF5C94 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "chtSolB";
 
-/* 80AF5C94-80AF5C9C -00001 0008+00 0/1 0/0 0/0 .data            mEvtCutNameList__16daNpc_SoldierB_c
- */
 char* daNpc_SoldierB_c::mEvtCutNameList[2] = {
     "",
     "LISTEN_LAKE",
 };
 
-/* 80AF5CA8-80AF5CC0 000098 0018+00 1/2 0/0 0/0 .data            mEvtCutList__16daNpc_SoldierB_c */
 daNpc_SoldierB_c::cutFunc daNpc_SoldierB_c::mEvtCutList[2] = {
     NULL,
     &daNpc_SoldierB_c::ECut_listenLake,
 };
 
-/* 80AF2CAC-80AF2E30 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__16daNpc_SoldierB_cFv */
 daNpc_SoldierB_c::daNpc_SoldierB_c() {}
 
-/* 80AF2EC0-80AF30C0 000300 0200+00 1/0 0/0 0/0 .text            __dt__16daNpc_SoldierB_cFv */
 daNpc_SoldierB_c::~daNpc_SoldierB_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -143,7 +128,6 @@ daNpc_SoldierB_c::~daNpc_SoldierB_c() {
     }
 }
 
-/* 80AF5AD4-80AF5B40 000000 006C+00 11/11 0/0 0/0 .rodata          m__22daNpc_SoldierB_Param_c */
 daNpc_SoldierB_HIOParam const daNpc_SoldierB_Param_c::m = {
     30.0f,    // attention_offset
     -4.0f,    // gravity
@@ -180,7 +164,6 @@ daNpc_SoldierB_HIOParam const daNpc_SoldierB_Param_c::m = {
     false,    // debug_info_ON
 };
 
-/* 80AF30C0-80AF33A0 000500 02E0+00 1/1 0/0 0/0 .text            create__16daNpc_SoldierB_cFv */
 cPhs__Step daNpc_SoldierB_c::create() {
     mTwilight = dKy_darkworld_check();
 
@@ -244,7 +227,6 @@ cPhs__Step daNpc_SoldierB_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80AF33A0-80AF356C 0007E0 01CC+00 1/1 0/0 0/0 .text            CreateHeap__16daNpc_SoldierB_cFv */
 int daNpc_SoldierB_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -290,26 +272,21 @@ int daNpc_SoldierB_c::CreateHeap() {
     return 1;
 }
 
-/* 80AF356C-80AF35A0 0009AC 0034+00 1/1 0/0 0/0 .text            Delete__16daNpc_SoldierB_cFv */
 int daNpc_SoldierB_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpc_SoldierB_c();
     return 1;
 }
 
-/* 80AF35A0-80AF35C0 0009E0 0020+00 2/2 0/0 0/0 .text            Execute__16daNpc_SoldierB_cFv */
 int daNpc_SoldierB_c::Execute() {
     return execute();
 }
 
-/* 80AF35C0-80AF3634 000A00 0074+00 1/1 0/0 0/0 .text            Draw__16daNpc_SoldierB_cFv */
 int daNpc_SoldierB_c::Draw() {
     return draw(chkAction(&daNpc_SoldierB_c::test), FALSE, mHIO->m.common.real_shadow_size, NULL,
                 FALSE);
 }
 
-/* 80AF3634-80AF3830 000A74 01FC+00 1/1 0/0 0/0 .text
- * ctrlJoint__16daNpc_SoldierB_cFP8J3DJointP8J3DModel           */
 int daNpc_SoldierB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_BACKBONE1, JNT_NECK, JNT_HEAD};
@@ -347,15 +324,11 @@ int daNpc_SoldierB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AF3830-80AF3850 000C70 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__16daNpc_SoldierB_cFP10fopAc_ac_c         */
 int daNpc_SoldierB_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_SoldierB_c* actor = (daNpc_SoldierB_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80AF3850-80AF389C 000C90 004C+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__16daNpc_SoldierB_cFP8J3DJointi            */
 int daNpc_SoldierB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -368,7 +341,6 @@ int daNpc_SoldierB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AF389C-80AF39B8 000CDC 011C+00 1/0 0/0 0/0 .text            setParam__16daNpc_SoldierB_cFv */
 void daNpc_SoldierB_c::setParam() {
     actionFunc action = mNextAction;
 
@@ -404,7 +376,6 @@ void daNpc_SoldierB_c::setParam() {
     }
 }
 
-/* 80AF39B8-80AF3B30 000DF8 0178+00 1/0 0/0 0/0 .text            main__16daNpc_SoldierB_cFv */
 BOOL daNpc_SoldierB_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -436,12 +407,10 @@ BOOL daNpc_SoldierB_c::main() {
     return TRUE;
 }
 
-/* 80AF3B30-80AF3B38 000F70 0008+00 1/0 0/0 0/0 .text            ctrlBtk__16daNpc_SoldierB_cFv */
 BOOL daNpc_SoldierB_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80AF3B38-80AF4030 000F78 04F8+00 1/0 0/0 0/0 .text            setAttnPos__16daNpc_SoldierB_cFv */
 void daNpc_SoldierB_c::setAttnPos() {
     static cXyz eyeOffset(0.0f, 20.0f, 0.0f);
     cXyz sp74, sp80, sp8c, sp98;
@@ -516,8 +485,6 @@ void daNpc_SoldierB_c::setAttnPos() {
     mCyl.ClrTgHit();
 }
 
-/* 80AF4030-80AF4130 001470 0100+00 1/0 0/0 0/0 .text            setMotionAnm__16daNpc_SoldierB_cFif
- */
 void daNpc_SoldierB_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     int attr = J3DFrameCtrl::EMode_LOOP;
@@ -551,8 +518,6 @@ void daNpc_SoldierB_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AF4130-80AF4174 001570 0044+00 1/0 0/0 0/0 .text            setMotion__16daNpc_SoldierB_cFifi
- */
 void daNpc_SoldierB_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 3) {
@@ -563,14 +528,10 @@ void daNpc_SoldierB_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80AF4174-80AF417C 0015B4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__16daNpc_SoldierB_cFv
- */
 int daNpc_SoldierB_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80AF417C-80AF4228 0015BC 00AC+00 1/0 0/0 0/0 .text            drawOtherMdls__16daNpc_SoldierB_cFv
- */
 void daNpc_SoldierB_c::drawOtherMdls() {
     g_env_light.setLightTevColorType_MAJI(mSpearModel, &tevStr);
     mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(JNT_HANDR));
@@ -582,7 +543,6 @@ void daNpc_SoldierB_c::drawOtherMdls() {
     dComIfGd_addRealShadow(mShadowKey, mSpearModel);
 }
 
-/* 80AF4228-80AF4248 001668 0020+00 1/1 0/0 0/0 .text getTypeFromParam__16daNpc_SoldierB_cFv */
 u8 daNpc_SoldierB_c::getTypeFromParam() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -593,7 +553,6 @@ u8 daNpc_SoldierB_c::getTypeFromParam() {
     }
 }
 
-/* 80AF4248-80AF426C 001688 0024+00 1/1 0/0 0/0 .text            isDelete__16daNpc_SoldierB_cFv */
 BOOL daNpc_SoldierB_c::isDelete() {
     if (mType == 0 || mType == 1) {
         return FALSE;
@@ -602,7 +561,6 @@ BOOL daNpc_SoldierB_c::isDelete() {
     return TRUE;
 }
 
-/* 80AF426C-80AF43E4 0016AC 0178+00 1/1 0/0 0/0 .text            reset__16daNpc_SoldierB_cFv */
 void daNpc_SoldierB_c::reset() {
     initialize();
     mLookat.initialize();
@@ -630,7 +588,6 @@ void daNpc_SoldierB_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80AF43E4-80AF4508 001824 0124+00 1/1 0/0 0/0 .text            playMotion__16daNpc_SoldierB_cFv */
 void daNpc_SoldierB_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_FEAR_WAIT, mHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -647,14 +604,10 @@ void daNpc_SoldierB_c::playMotion() {
     }
 }
 
-/* 80AF4508-80AF4534 001948 002C+00 2/2 0/0 0/0 .text
- * chkAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i  */
 BOOL daNpc_SoldierB_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80AF4534-80AF45DC 001974 00A8+00 2/2 0/0 0/0 .text
- * setAction__16daNpc_SoldierB_cFM16daNpc_SoldierB_cFPCvPvPv_i  */
 BOOL daNpc_SoldierB_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -672,8 +625,6 @@ BOOL daNpc_SoldierB_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80AF45DC-80AF465C 001A1C 0080+00 1/1 0/0 0/0 .text            selectAction__16daNpc_SoldierB_cFv
- */
 BOOL daNpc_SoldierB_c::selectAction() {
     mNextAction = NULL;
 
@@ -686,7 +637,6 @@ BOOL daNpc_SoldierB_c::selectAction() {
     return TRUE;
 }
 
-/* 80AF465C-80AF4770 001A9C 0114+00 1/1 0/0 0/0 .text doNormalAction__16daNpc_SoldierB_cFi */
 void daNpc_SoldierB_c::doNormalAction(int param_1) {
     if (param_1 != 0 && hitChk2(&mCyl, TRUE, FALSE)) {
         int damage_time =
@@ -708,7 +658,6 @@ void daNpc_SoldierB_c::doNormalAction(int param_1) {
     }
 }
 
-/* 80AF4770-80AF49E4 001BB0 0274+00 1/1 0/0 0/0 .text            doEvent__16daNpc_SoldierB_cFv */
 BOOL daNpc_SoldierB_c::doEvent() {
     BOOL rv = FALSE;
 
@@ -768,15 +717,12 @@ BOOL daNpc_SoldierB_c::doEvent() {
     return rv;
 }
 
-/* 80AF49E4-80AF4A08 001E24 0024+00 5/5 0/0 0/0 .text            setLookMode__16daNpc_SoldierB_cFi
- */
 void daNpc_SoldierB_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80AF4A08-80AF4CA4 001E48 029C+00 1/1 0/0 0/0 .text            lookat__16daNpc_SoldierB_cFv */
 void daNpc_SoldierB_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -839,7 +785,6 @@ void daNpc_SoldierB_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookatAngle, i_snap, angle_delta, FALSE);
 }
 
-/* 80AF4CA4-80AF4CFC 0020E4 0058+00 2/2 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_SOLDIERa &&
         ((daNpc_SoldierA_c*)i_actor)->getType() == 0)
@@ -850,7 +795,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80AF4CFC-80AF4DBC 00213C 00C0+00 1/0 0/0 0/0 .text            wait__16daNpc_SoldierB_cFPv */
 int daNpc_SoldierB_c::wait(void* param_1) {
     switch (mMode) {
     case 0:
@@ -876,7 +820,6 @@ int daNpc_SoldierB_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AF4DBC-80AF4F54 0021FC 0198+00 2/0 0/0 0/0 .text            talk__16daNpc_SoldierB_cFPv */
 int daNpc_SoldierB_c::talk(void* param_1) {
     int rv = 0;
     BOOL unkFlag = FALSE;
@@ -931,7 +874,6 @@ int daNpc_SoldierB_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80AF4F54-80AF50AC 002394 0158+00 1/0 0/0 0/0 .text ECut_listenLake__16daNpc_SoldierB_cFi */
 int daNpc_SoldierB_c::ECut_listenLake(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -988,7 +930,6 @@ int daNpc_SoldierB_c::ECut_listenLake(int i_staffId) {
     return rv;
 }
 
-/* 80AF50AC-80AF5160 0024EC 00B4+00 2/0 0/0 0/0 .text            test__16daNpc_SoldierB_cFPv */
 int daNpc_SoldierB_c::test(void* param_1) {
     switch (mMode) {
     case 0:
@@ -1010,39 +951,32 @@ int daNpc_SoldierB_c::test(void* param_1) {
     return 1;
 }
 
-/* 80AF5160-80AF5180 0025A0 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierB_Create__FPv */
 static int daNpc_SoldierB_Create(void* i_this) {
     return static_cast<daNpc_SoldierB_c*>(i_this)->create();
 }
 
-/* 80AF5180-80AF51A0 0025C0 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierB_Delete__FPv */
 static int daNpc_SoldierB_Delete(void* i_this) {
     return static_cast<daNpc_SoldierB_c*>(i_this)->Delete();
 }
 
-/* 80AF51A0-80AF51C0 0025E0 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierB_Execute__FPv */
 static int daNpc_SoldierB_Execute(void* i_this) {
     return static_cast<daNpc_SoldierB_c*>(i_this)->Execute();
 }
 
-/* 80AF51C0-80AF51E0 002600 0020+00 1/0 0/0 0/0 .text            daNpc_SoldierB_Draw__FPv */
 static int daNpc_SoldierB_Draw(void* i_this) {
     return static_cast<daNpc_SoldierB_c*>(i_this)->Draw();
 }
 
-/* 80AF51E0-80AF51E8 002620 0008+00 1/0 0/0 0/0 .text            daNpc_SoldierB_IsDelete__FPv */
 static int daNpc_SoldierB_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AF5CFC-80AF5D1C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_SoldierB_MethodTable */
 static actor_method_class daNpc_SoldierB_MethodTable = {
     (process_method_func)daNpc_SoldierB_Create,  (process_method_func)daNpc_SoldierB_Delete,
     (process_method_func)daNpc_SoldierB_Execute, (process_method_func)daNpc_SoldierB_IsDelete,
     (process_method_func)daNpc_SoldierB_Draw,
 };
 
-/* 80AF5D1C-80AF5D4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SOLDIERb */
 extern actor_process_profile_definition g_profile_NPC_SOLDIERb = {
     fpcLy_CURRENT_e,              // mLayerID
     7,                            // mListID
diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp
index 71ca7f9d2f..d64bf2db59 100644
--- a/src/d/actor/d_a_npc_sq.cpp
+++ b/src/d/actor/d_a_npc_sq.cpp
@@ -14,25 +14,20 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80AF75C0-80AF75C4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80AF75D0-80AF75DC 000018 000C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daNpc_Sq_HIO_c l_HIO;
 
-/* 80AF5FEC-80AF6010 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daNpc_Sq_HIO_cFv */
 daNpc_Sq_HIO_c::daNpc_Sq_HIO_c() {
     field_0x4 = -1;
     mScale = 2.0f;
 }
 
-/* 80AF6010-80AF60B8 000110 00A8+00 2/2 0/0 0/0 .text            anm_init__FP12npc_sq_classifUcf */
 static void anm_init(npc_sq_class* i_this, int i_bck, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpMorf->setAnm(static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("Sq", i_bck)),
                            i_mode, i_morf, i_speed, 0.0f, -1.0f, NULL);
 }
 
-/* 80AF60B8-80AF61B0 0001B8 00F8+00 1/0 0/0 0/0 .text            daNpc_Sq_Draw__FP12npc_sq_class */
 static int daNpc_Sq_Draw(npc_sq_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -48,7 +43,6 @@ static int daNpc_Sq_Draw(npc_sq_class* i_this) {
     return 1;
 }
 
-/* 80AF61B0-80AF63C0 0002B0 0210+00 1/1 0/0 0/0 .text            npc_sq_normal__FP12npc_sq_class */
 static void npc_sq_normal(npc_sq_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -80,7 +74,6 @@ static void npc_sq_normal(npc_sq_class* i_this) {
     }
 }
 
-/* 80AF63C0-80AF6518 0004C0 0158+00 1/1 0/0 0/0 .text            action__FP12npc_sq_class */
 static void action(npc_sq_class* i_this) {
     i_this->mPlayerDist = fopAcM_searchPlayerDistance(i_this);
     
@@ -116,7 +109,6 @@ static void action(npc_sq_class* i_this) {
     i_this->shape_angle.z = i_this->current.angle.z;
 }
 
-/* 80AF6518-80AF65FC 000618 00E4+00 1/1 0/0 0/0 .text            cam_3d_morf__FP12npc_sq_classf */
 static void cam_3d_morf(npc_sq_class* i_this, f32 i_scale) {
     cLib_addCalc2(&i_this->mCameraCenter.x, i_this->mCameraTargetCenter.x, i_scale,
                   i_this->mCameraCenterDist.x * i_this->mCameraSpeed);
@@ -132,7 +124,6 @@ static void cam_3d_morf(npc_sq_class* i_this, f32 i_scale) {
                   i_this->mCameraEyeDist.z * i_this->mCameraSpeed);
 }
 
-/* 80AF65FC-80AF6B74 0006FC 0578+00 2/1 0/0 0/0 .text            demo_camera__FP12npc_sq_class */
 static void demo_camera(npc_sq_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -257,8 +248,6 @@ static void demo_camera(npc_sq_class* i_this) {
     }
 }
 
-/* 80AF6B74-80AF6D54 000C74 01E0+00 2/1 0/0 0/0 .text            daNpc_Sq_Execute__FP12npc_sq_class
- */
 static int daNpc_Sq_Execute(npc_sq_class* i_this) {
     cXyz vec(0.0f, 0.0f, 0.0f);
     i_this->mCounter++;
@@ -295,14 +284,10 @@ static int daNpc_Sq_Execute(npc_sq_class* i_this) {
     return 1;
 }
 
-/* 80AF6D54-80AF6D5C 000E54 0008+00 1/0 0/0 0/0 .text            daNpc_Sq_IsDelete__FP12npc_sq_class
- */
 static int daNpc_Sq_IsDelete(npc_sq_class* i_this) {
     return 1;
 }
 
-/* 80AF6D5C-80AF6DB0 000E5C 0054+00 1/0 0/0 0/0 .text            daNpc_Sq_Delete__FP12npc_sq_class
- */
 static int daNpc_Sq_Delete(npc_sq_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "Sq");
     if (i_this->mHIOInit) {
@@ -311,7 +296,6 @@ static int daNpc_Sq_Delete(npc_sq_class* i_this) {
     return 1;
 }
 
-/* 80AF6DB0-80AF6F50 000EB0 01A0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     npc_sq_class* _this = static_cast<npc_sq_class*>(i_this);
     
@@ -332,7 +316,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                                  1, 0, 1.0f, 0, -1) ? 1 : 0;
 }
 
-/* 80AF6F98-80AF7260 001098 02C8+00 1/0 0/0 0/0 .text            daNpc_Sq_Create__FP10fopAc_ac_c */
 static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, npc_sq_class);
     npc_sq_class* _this = static_cast<npc_sq_class*>(i_this);
@@ -398,7 +381,6 @@ static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80AF7510-80AF7530 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Sq_Method */
 static actor_method_class l_daNpc_Sq_Method = {
     (process_method_func)daNpc_Sq_Create,
     (process_method_func)daNpc_Sq_Delete,
@@ -407,7 +389,6 @@ static actor_method_class l_daNpc_Sq_Method = {
     (process_method_func)daNpc_Sq_Draw,
 };
 
-/* 80AF7530-80AF7560 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_SQ */
 extern actor_process_profile_definition g_profile_NPC_SQ = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp
index aae3b7edf6..3ac9028e85 100644
--- a/src/d/actor/d_a_npc_taro.cpp
+++ b/src/d/actor/d_a_npc_taro.cpp
@@ -16,7 +16,6 @@
 #include "d/d_com_static.h"
 #include "d/d_meter2_info.h"
 #include "d/d_msg_object.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_camera_mng.h"
 #include "types.h"
@@ -31,12 +30,10 @@ enum TaroEvent {
     /* 0x18 */ EVENT_18 = 0x18,
 };
 
-/* 80571BF4-80571C1C 00002C 0028+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[5][2] = {
     4, 1, 31, 4, 32, 4, 10, 2, 4, 9,
 };
 
-/* 80571C1C-80571CF4 -00001 00D8+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[27] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -67,49 +64,39 @@ static daNpcT_evtData_c l_evtList[27] = {
     {"TAG_PUSH4", 4},
 };
 
-/* 80571CF4-80571D20 -00001 002C+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[11] = {
     "", "Taro", "Taro_TW", "Taro0", "Taro1", "Taro2", "Taro3", "Taro4", "Taro5", "TaroB", "Len1",
 };
 
-/* 80571D20-80571D28 000158 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[5] = {
     0x01, 0x03, 0x04, 0x06, -1,
 };
 
-/* 80571D28-80571D2C 000160 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[4] = {0x01, 0x03, 0x02, -1};
 
-/* 80571D2C-80571D34 000164 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[6] = {
     0x01, 0x03, 0x05, 0x06, 0x07, -1,
 };
 
-/* 80571D34-80571D3C 00016C 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[5] = {
     0x01, 0x03, 0x04, 0x07, -1,
 };
 
-/* 80571D3C-80571D40 000174 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[4] = {0x01, 0x03, 0x08, -1};
 
-/* 80571D40-80571D48 000178 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn5 */
 static s8 l_loadResPtrn5[5] = {
     0x09, 0x03, 0x04, 0x08, -1,
 };
 
-/* 80571D48-80571D50 000180 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn6 */
 static s8 l_loadResPtrn6[6] = {
     0x01, 0x03, 0x04, 0x05, 0x06, -1,
 };
 
-/* 80571D50-80571D5C 000188 0009+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[9] = {
     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, -1,
 };
 
-/* 80571D5C-80571DA0 -00001 0044+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
-SECTION_DATA static s8* l_loadResPtrnList[17] = {
+static s8* l_loadResPtrnList[17] = {
     l_loadResPtrn6, l_loadResPtrn6, l_loadResPtrn0, l_loadResPtrn1,
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn3, l_loadResPtrn6,
     l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn6, l_loadResPtrn6,
@@ -117,7 +104,6 @@ SECTION_DATA static s8* l_loadResPtrnList[17] = {
     l_loadResPtrn9,
 };
 
-/* 80571DA0-805720E8 0001D8 0348+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {-1, 0, 0, 7, 2, 1, 1},
     {7, 0, 3, 7, 2, 1, 1},
@@ -151,7 +137,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[30] = {
     {7, 2, 8, 25, 2, 8, 0},
 };
 
-/* 805720E8-80572580 000520 0498+00 1/2 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[42] = {
     9,  2, 3, 12, 0, 3, 1, 0, 25, 2, 4, 12, 0, 3, 1, 0, 10, 2, 6, 12, 0, 3, 1, 0,
     26, 2, 4, 12, 0, 3, 1, 0, 27, 2, 4, 12, 0, 3, 1, 0, 28, 2, 4, 12, 0, 3, 1, 0,
@@ -169,7 +154,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[42] = {
     6,  2, 8, 22, 2, 8, 0, 0, 17, 0, 8, 12, 0, 3, 1, 0, 18, 2, 8, 12, 0, 3, 1, 0,
 };
 
-/* 80572580-80572780 0009B8 0200+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {8, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {3, -1, 1}, {9, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 1}, {10, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -189,7 +173,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[128]
     {29, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80572780-80572A20 000BB8 02A0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {21, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {22, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -214,7 +197,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[168] = {
     {40, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {40, -1, 1}, {41, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80572A20-80572A64 -00001 0044+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Taro_c */
 char* daNpc_Taro_c::mCutNameList[17] = {
     "",
     "CONVERSATION_ABOUT_PACHINKO",
@@ -235,7 +217,6 @@ char* daNpc_Taro_c::mCutNameList[17] = {
     "TAG_PUSH4",
 };
 
-/* 80572B24-80572BF0 000F5C 00CC+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Taro_c */
 daNpc_Taro_c::cutFunc daNpc_Taro_c::mCutList[17] = {
     NULL,
     &daNpc_Taro_c::cutConversationAboutPachinko,
@@ -256,10 +237,8 @@ daNpc_Taro_c::cutFunc daNpc_Taro_c::mCutList[17] = {
     &daNpc_Taro_c::cutTagPush4,
 };
 
-/* 805735AC-805735B0 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Taro_Param_c l_HIO;
 
-/* 80565E8C-8056604C 0000EC 01C0+00 1/0 0/0 0/0 .text            __dt__12daNpc_Taro_cFv */
 daNpc_Taro_c::~daNpc_Taro_c() {
     OS_REPORT("|%06d:%x|daNpc_Taro_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (mpMorf[0] != NULL) {
@@ -275,15 +254,12 @@ daNpc_Taro_c::~daNpc_Taro_c() {
     deleteRes((l_loadResPtrnList)[mType], (const char**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 805716C8-80571758 000000 0090+00 19/19 0/0 0/0 .rodata          m__18daNpc_Taro_Param_c */
 daNpc_Taro_HIOParam const daNpc_Taro_Param_c::m = {
     140.0f, -3.0f,  1.0f,   400.0f, 255.0f, 120.0f, 35.0f, 30.0f, 0.0f, 0.0f,
     10.0f,  -10.0f, 30.0f,  -10.0f, 45.0f,  -45.0f, 0.6f, 12.0f, 3,    6,
     5,      6,      110.0f, 0.0f,   0.0f,   0.0f,   60,    8,     0.0f, 0.0f,
     4.0f,   -15.0f, 0.0f,   -10.0f, 15.0f,  30.0f,  10.0f, 55.0f, 120,  90};
 
-/* 8056604C-80566340 0002AC 02F4+00 1/1 0/0 0/0 .text            create__12daNpc_Taro_cFv */
 int daNpc_Taro_c::create() {
     daNpcT_ct(this, daNpc_Taro_c, l_faceMotionAnmData,
                        l_motionAnmData, l_faceMotionSequenceData,
@@ -353,7 +329,6 @@ int daNpc_Taro_c::create() {
     return rv;
 }
 
-/* 80566340-80566754 0005A0 0414+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Taro_cFv */
 int daNpc_Taro_c::CreateHeap() {
     int bmdIdx = 0;
     if (mTwilight) {
@@ -435,7 +410,6 @@ int daNpc_Taro_c::CreateHeap() {
     }
 }
 
-/* 80566910-80566944 000B70 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Taro_cFv */
 int daNpc_Taro_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Taro_c -> Delete\n", g_Counter, this);
     fopAcM_GetID(this);
@@ -443,12 +417,10 @@ int daNpc_Taro_c::Delete() {
     return 1;
 }
 
-/* 80566944-80566964 000BA4 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Taro_cFv */
 int daNpc_Taro_c::Execute() {
     return execute();
 }
 
-/* 80566964-805669F8 000BC4 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Taro_cFv */
 int daNpc_Taro_c::Draw() {
     daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
     if (matAnm != NULL) {
@@ -460,14 +432,10 @@ int daNpc_Taro_c::Draw() {
     return draw(FALSE, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 805669F8-80566A18 000C58 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_Taro_cFP10fopAc_ac_c             */
 int daNpc_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Taro_c*>(i_this)->CreateHeap();
 }
 
-/* 80566A18-80566A70 000C78 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpc_Taro_cFP8J3DJointi                */
  int daNpc_Taro_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -479,7 +447,6 @@ int daNpc_Taro_c::createHeapCallBack(fopAc_ac_c* i_this) {
       return 1;
 }
 
-/* 80566A70-80566B0C 000CD0 009C+00 1/1 0/0 0/0 .text            srchArrow__12daNpc_Taro_cFPvPv */
 void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) {
     if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) {
         if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW) {
@@ -490,7 +457,6 @@ void* daNpc_Taro_c::srchArrow(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80566B0C-80566BD4 000D6C 00C8+00 1/1 0/0 0/0 .text            srchNpc__12daNpc_Taro_cFPvPv */
 void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) {
     if (mFindCount < 50 && param_1 != NULL && param_1 != param_2) {
         if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && 
@@ -503,7 +469,6 @@ void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80566BD4-80566CCC 000E34 00F8+00 1/1 0/0 0/0 .text            getArrowP__12daNpc_Taro_cFv */
 fopAc_ac_c* daNpc_Taro_c::getArrowP() {
     fopAc_ac_c* pActor = NULL;
     f32 minDist = G_CM3D_F_INF;
@@ -520,7 +485,6 @@ fopAc_ac_c* daNpc_Taro_c::getArrowP() {
     return pActor;
 }
 
-/* 80566CCC-80566D7C 000F2C 00B0+00 2/1 0/0 0/0 .text            getType__12daNpc_Taro_cFv */
 u8 daNpc_Taro_c::getType() {
     u8 val = fopAcM_GetParam(this) & 0xff;
     switch (val) {
@@ -560,7 +524,6 @@ u8 daNpc_Taro_c::getType() {
     return TYPE_16;
 }
 
-/* 80566D7C-80566FA4 000FDC 0228+00 2/1 0/0 0/0 .text            isDelete__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -599,7 +562,6 @@ BOOL daNpc_Taro_c::isDelete() {
     return 0;
 }
 
-/* 80566FA4-805671F4 001204 0250+00 2/1 0/0 0/0 .text            reset__12daNpc_Taro_cFv */
 void daNpc_Taro_c::reset() {
     csXyz acStack_20;
     int size = (u8*)&field_0x11a8 - (u8*)&mAction;
@@ -650,7 +612,6 @@ void daNpc_Taro_c::reset() {
     setAngle(acStack_20);
 }
 
-/* 805671F4-80567280 001454 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Taro_cFi */
 void daNpc_Taro_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -661,7 +622,6 @@ void daNpc_Taro_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80567280-8056747C 0014E0 01FC+00 1/0 0/0 0/0 .text            setParam__12daNpc_Taro_cFv */
 void daNpc_Taro_c::setParam() {
     selectAction();
     srchActors();
@@ -726,7 +686,6 @@ void daNpc_Taro_c::setParam() {
     gravity = daNpc_Taro_Param_c::m.mGravity;
 }
 
-/* 8056747C-8056757C 0016DC 0100+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Taro_c::talk)) {
         mPreItemNo = 0;
@@ -755,7 +714,6 @@ BOOL daNpc_Taro_c::checkChangeEvt() {
     return 0;
 }
 
-/* 8056757C-805675B8 0017DC 003C+00 1/0 0/0 0/0 .text            evtEndProc__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::evtEndProc() {
     if (field_0x11a6 != 0) {
         dCam_getBody()->CorrectCenter();
@@ -763,7 +721,6 @@ BOOL daNpc_Taro_c::evtEndProc() {
     return 1;
 }
 
-/* 805675B8-8056767C 001818 00C4+00 2/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Taro_cFv */
 void daNpc_Taro_c::setAfterTalkMotion() {
     int idx = 31;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -795,7 +752,6 @@ void daNpc_Taro_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(idx, -1.0f, 0, 0);
 }
 
-/* 8056767C-805679F0 0018DC 0374+00 2/1 0/0 0/0 .text            srchActors__12daNpc_Taro_cFv */
 void daNpc_Taro_c::srchActors() {
     switch (mType) {
     case TYPE_0:
@@ -886,7 +842,6 @@ void daNpc_Taro_c::srchActors() {
     }
 }
 
-/* 805679F0-80567A90 001C50 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::evtTalk() {
     if (chkAction(&daNpc_Taro_c::talk)) {
         (this->*(mAction2))(NULL);
@@ -896,7 +851,6 @@ BOOL daNpc_Taro_c::evtTalk() {
     return 1;
 }
 
-/* 80567A90-80567C90 001CF0 0200+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Taro", this, -1);
     if (staffId != -1) {
@@ -930,7 +884,6 @@ BOOL daNpc_Taro_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80567C90-80567EB4 001EF0 0224+00 1/0 0/0 0/0 .text            action__12daNpc_Taro_cFv */
 void daNpc_Taro_c::action() {
     fopAc_ac_c* hitActor = NULL;
     if (!mTwilight) {
@@ -991,7 +944,6 @@ void daNpc_Taro_c::action() {
     }
 }
 
-/* 80567EB4-80567F78 002114 00C4+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Taro_cFv */
 void daNpc_Taro_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -1002,7 +954,6 @@ void daNpc_Taro_c::beforeMove() {
     }
 }
 
-/* 80567F78-805682E8 0021D8 0370+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Taro_cFv */
 void daNpc_Taro_c::setAttnPos() {
     cXyz eyeOffset(0.0f, 30.0f, 0.0f);
     if (field_0x11a1 != 0) {
@@ -1043,7 +994,6 @@ void daNpc_Taro_c::setAttnPos() {
     }
 }
 
-/* 805682E8-80568590 002548 02A8+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Taro_cFv */
 void daNpc_Taro_c::setCollision() {
     cXyz cStack_48;
     if (!mHide) {
@@ -1110,12 +1060,10 @@ void daNpc_Taro_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80568590-80568598 0027F0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Taro_cFv */
 int daNpc_Taro_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80568598-805686A0 0027F8 0108+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Taro_cFv */
 void daNpc_Taro_c::drawOtherMdl() {
     J3DModel* model = mpMorf[0]->getModel();
     for (int i = 0; i < 2; i++) {
@@ -1137,8 +1085,6 @@ void daNpc_Taro_c::drawOtherMdl() {
     }
 }
 
-/* 805686A0-80568738 002900 0098+00 1/0 0/0 0/0 .text
- * getFaceMotionAnm__12daNpc_Taro_cF26daNpcT_faceMotionAnmData_c */
 daNpcT_faceMotionAnmData_c daNpc_Taro_c::getFaceMotionAnm(daNpcT_faceMotionAnmData_c param_0) {
     daNpcT_faceMotionAnmData_c rv = param_0;
     if (mType == TYPE_14 && rv.mBtpFileIdx == 7 && rv.mBtpArcIdx == 1) {
@@ -1148,7 +1094,6 @@ daNpcT_faceMotionAnmData_c daNpc_Taro_c::getFaceMotionAnm(daNpcT_faceMotionAnmDa
    return rv;
 }
 
-/* 80568738-80568828 002998 00F0+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Taro_cFv */
 BOOL daNpc_Taro_c::selectAction() {
     mAction = NULL;
     switch(mType) {
@@ -1171,14 +1116,10 @@ BOOL daNpc_Taro_c::selectAction() {
     return TRUE;
 }
 
-/* 80568828-80568854 002A88 002C+00 2/2 0/0 0/0 .text
- * chkAction__12daNpc_Taro_cFM12daNpc_Taro_cFPCvPvPv_i          */
 BOOL daNpc_Taro_c::chkAction(int (daNpc_Taro_c::*action)(void*)) {
     return mAction2 == action;
 }
 
-/* 80568854-805688FC 002AB4 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_Taro_cFM12daNpc_Taro_cFPCvPvPv_i          */
 BOOL daNpc_Taro_c::setAction(int (daNpc_Taro_c::*action)(void*)) {
     mMode = MODE_EXIT;
     if (mAction2 != NULL) {
@@ -1192,7 +1133,6 @@ BOOL daNpc_Taro_c::setAction(int (daNpc_Taro_c::*action)(void*)) {
     return 1;
 }
 
-/* 805688FC-80568A2C 002B5C 0130+00 1/1 0/0 0/0 .text            setSwingVoice__12daNpc_Taro_cFv */
 void daNpc_Taro_c::setSwingVoice() {
     if (mType != TYPE_3 && mType != TYPE_8 && mType != TYPE_13) {
         J3DAnmTransform* anmTransform = getTrnsfrmAnmP(l_resNameList[l_motionAnmData[19].mBckArcIdx],
@@ -1211,8 +1151,6 @@ void daNpc_Taro_c::setSwingVoice() {
     }
 }
 
-/* 80568A2C-80568C58 002C8C 022C+00 1/0 0/0 0/0 .text
- * cutConversationAboutPachinko__12daNpc_Taro_cFi               */
 int daNpc_Taro_c::cutConversationAboutPachinko(int param_1) {
     fopAc_ac_c* actor_p;
     int rv = 0;
@@ -1260,8 +1198,6 @@ int daNpc_Taro_c::cutConversationAboutPachinko(int param_1) {
     return rv;
 }
 
-/* 80568C58-80568E00 002EB8 01A8+00 1/0 0/0 0/0 .text
- * cutConversationAboutWoodSwd__12daNpc_Taro_cFi                */
 int daNpc_Taro_c::cutConversationAboutWoodSwd(int param_1) {
     fopAc_ac_c* actor_p;
     int rv = 0;
@@ -1299,7 +1235,6 @@ int daNpc_Taro_c::cutConversationAboutWoodSwd(int param_1) {
     return rv;
 }
 
-/* 80568E00-80569880 003060 0A80+00 3/0 0/0 0/0 .text            cutSwdTutorial__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutSwdTutorial(int param_1) {
     fopAc_ac_c* actor_p = NULL;
     cXyz acStack_34;
@@ -1511,7 +1446,6 @@ int daNpc_Taro_c::cutSwdTutorial(int param_1) {
     return uVar12;
 }
 
-/* 80569880-80569AFC 003AE0 027C+00 1/0 0/0 0/0 .text            cutHail__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutHail(int param_1) {
     int rv = FALSE;
     int prm = -1;
@@ -1557,7 +1491,6 @@ int daNpc_Taro_c::cutHail(int param_1) {
     return rv;
 }
 
-/* 80569AFC-8056A120 003D5C 0624+00 3/0 0/0 0/0 .text            cutFindMonkey__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutFindMonkey(int param_1) {
     cXyz horsePos;
     int rv = FALSE;
@@ -1686,7 +1619,6 @@ int daNpc_Taro_c::cutFindMonkey(int param_1) {
     return rv;
 }
 
-/* 8056A120-8056A460 004380 0340+00 1/0 0/0 0/0 .text            cutHelpMe__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutHelpMe(int param_1) {
     int rv = FALSE;
     int prm = -1;
@@ -1749,8 +1681,6 @@ int daNpc_Taro_c::cutHelpMe(int param_1) {
     return rv;
 }
 
-/* 8056A460-8056B000 0046C0 0BA0+00 3/0 0/0 0/0 .text            cutAppearanceMoi__12daNpc_Taro_cFi
- */
 int daNpc_Taro_c::cutAppearanceMoi(int param_1) {
     cXyz work;
     csXyz cStack_68;
@@ -1889,8 +1819,6 @@ int daNpc_Taro_c::cutAppearanceMoi(int param_1) {
     return rv;
 }
 
-/* 8056B000-8056B68C 005260 068C+00 2/0 0/0 0/0 .text            cutGiveMeWoodSwd__12daNpc_Taro_cFi
- */
 int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) {
     cXyz cStack_2c;
     csXyz cStack_58;
@@ -2021,7 +1949,6 @@ int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) {
     return rv;
 }
 
-/* 8056B68C-8056C14C 0058EC 0AC0+00 3/0 0/0 0/0 .text            cutGetWoodSwd__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutGetWoodSwd(int param_1) {
     cXyz acStack_30;
     csXyz cStack_68;
@@ -2205,7 +2132,6 @@ int daNpc_Taro_c::cutGetWoodSwd(int param_1) {
     return rv;
 }
 
-/* 8056C14C-8056C5B4 0063AC 0468+00 1/0 0/0 0/0 .text cutConversationWithMaro__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutConversationWithMaro(int param_1) {
     int rv = FALSE;
     int prm = -1;
@@ -2295,7 +2221,6 @@ int daNpc_Taro_c::cutConversationWithMaro(int param_1) {
     return rv;
 }
 
-/* 8056C5B4-8056C8CC 006814 0318+00 1/0 0/0 0/0 .text cutCacaricoConversation__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutCacaricoConversation(int param_1) {
     int rv = FALSE;
     int prm = -1;
@@ -2363,8 +2288,6 @@ int daNpc_Taro_c::cutCacaricoConversation(int param_1) {
     return rv;
 }
 
-/* 8056C8CC-8056D0B8 006B2C 07EC+00 3/0 0/0 0/0 .text            cutArrowTutorial__12daNpc_Taro_cFi
- */
 int daNpc_Taro_c::cutArrowTutorial(int param_1) {
     cXyz cStack_40;
     csXyz cStack_48;
@@ -2514,7 +2437,6 @@ int daNpc_Taro_c::cutArrowTutorial(int param_1) {
     return rv;
 }
 
-/* 8056D0B8-8056D310 007318 0258+00 1/0 0/0 0/0 .text            cutCaution__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutCaution(int param_1) {
     cXyz cStack_30;
     csXyz cStack_38;
@@ -2579,7 +2501,6 @@ int daNpc_Taro_c::cutCaution(int param_1) {
     return rv;
 }
 
-/* 8056D310-8056D5C0 007570 02B0+00 1/0 0/0 0/0 .text            cutTagPush1__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutTagPush1(int param_1) {
     daTag_Push_c* pushTag = (daTag_Push_c*)field_0xba0.getActorP();
     int rv = 0;
@@ -2629,7 +2550,6 @@ int daNpc_Taro_c::cutTagPush1(int param_1) {
     return rv;
 }
 
-/* 8056D5C0-8056DFAC 007820 09EC+00 3/0 0/0 0/0 .text            cutNotGonnaLet__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutNotGonnaLet(int param_1) {
     cXyz cStack_30;
     csXyz cStack_50;
@@ -2793,7 +2713,6 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) {
     return rv;
 }
 
-/* 8056DFAC-8056E270 00820C 02C4+00 1/0 0/0 0/0 .text            cutTagPush4__12daNpc_Taro_cFi */
 int daNpc_Taro_c::cutTagPush4(int param_1) {
     daTag_Push_c* pushTag = (daTag_Push_c*)field_0xba0.getActorP();
     int rv = FALSE;
@@ -2840,7 +2759,6 @@ int daNpc_Taro_c::cutTagPush4(int param_1) {
     return rv;
 }
 
-/* 8056E270-8056F2A8 0084D0 1038+00 5/0 0/0 0/0 .text            wait__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::wait(void* param_0) {
     fopAc_ac_c* actor_p;
     int iVar10 = daNpc_Taro_Param_c::m.field_0x8e;
@@ -3165,7 +3083,6 @@ int daNpc_Taro_c::wait(void* param_0) {
     return 1;
 }
 
-/* 8056F2A8-8056F418 009508 0170+00 2/0 0/0 0/0 .text            swdTutorial__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::swdTutorial(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -3198,7 +3115,6 @@ int daNpc_Taro_c::swdTutorial(void* param_0) {
     return 1;
 }
 
-/* 8056F418-8056F7E8 009678 03D0+00 1/0 0/0 0/0 .text            talk_withMaro__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::talk_withMaro(void* param_0) {
     daNpc_Maro_c* pMaro = (daNpc_Maro_c*)mActors[0].getActorP();
     fopAc_ac_c* player = daPy_getPlayerActorClass();
@@ -3260,7 +3176,6 @@ int daNpc_Taro_c::talk_withMaro(void* param_0) {
     return 1;
 }
 
-/* 8056F7E8-8056FC20 009A48 0438+00 1/0 0/0 0/0 .text            practice__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::practice(void* param_0) {
     int iVar4 = daNpc_Taro_Param_c::m.field_0x8e;
     int iVar3 = 0;
@@ -3335,7 +3250,6 @@ int daNpc_Taro_c::practice(void* param_0) {
     return 1;
 }
 
-/* 8056FC20-8056FDCC 009E80 01AC+00 1/0 0/0 0/0 .text            nurse__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::nurse(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -3365,7 +3279,6 @@ int daNpc_Taro_c::nurse(void* param_0) {
     return 1;
 }
 
-/* 8056FDCC-80570170 00A02C 03A4+00 3/0 0/0 0/0 .text            talk__12daNpc_Taro_cFPv */
 int daNpc_Taro_c::talk(void* param_1) {
     switch (mMode) {
     case MODE_ENTER:
@@ -3439,34 +3352,28 @@ int daNpc_Taro_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80570170-80570190 00A3D0 0020+00 1/0 0/0 0/0 .text            daNpc_Taro_Create__FPv */
 static int daNpc_Taro_Create(void* i_this) {
     return static_cast<daNpc_Taro_c*>(i_this)->create();
 }
 
-/* 80570190-805701B0 00A3F0 0020+00 1/0 0/0 0/0 .text            daNpc_Taro_Delete__FPv */
 static int daNpc_Taro_Delete(void* i_this) {
     return static_cast<daNpc_Taro_c*>(i_this)->Delete();
 }
 
-/* 805701B0-805701D0 00A410 0020+00 1/0 0/0 0/0 .text            daNpc_Taro_Execute__FPv */
 static int daNpc_Taro_Execute(void* i_this) {
     return static_cast<daNpc_Taro_c*>(i_this)->Execute();
 }
 
-/* 805701D0-805701F0 00A430 0020+00 1/0 0/0 0/0 .text            daNpc_Taro_Draw__FPv */
 static int daNpc_Taro_Draw(void* i_this) {
     return static_cast<daNpc_Taro_c*>(i_this)->Draw();
 }
 
-/* 805701F0-805701F8 00A450 0008+00 1/0 0/0 0/0 .text            daNpc_Taro_IsDelete__FPv */
 static int daNpc_Taro_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES
 
-/* 8057339C-805733BC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Taro_MethodTable */
 static actor_method_class daNpc_Taro_MethodTable = {
     (process_method_func)daNpc_Taro_Create,
     (process_method_func)daNpc_Taro_Delete,
@@ -3475,7 +3382,6 @@ static actor_method_class daNpc_Taro_MethodTable = {
     (process_method_func)daNpc_Taro_Draw,
 };
 
-/* 805733BC-805733EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TARO */
 extern actor_process_profile_definition g_profile_NPC_TARO = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp
index 55e530af22..4033b91e86 100644
--- a/src/d/actor/d_a_npc_the.cpp
+++ b/src/d/actor/d_a_npc_the.cpp
@@ -11,7 +11,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80AFBE0C-80AFBE78 000000 006C+00 11/11 0/0 0/0 .rodata          m__16daNpcThe_Param_c */
 const daNpcThe_HIOParam daNpcThe_Param_c::m = {
     220.0f,   // attention_offset
     -3.0f,    // gravity
@@ -62,16 +61,13 @@ void daNpcThe_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80AFC67C-80AFC680 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_THE_HIO_CLASS l_HIO;
 
-/* 80AFC1F0-80AFC200 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {23, 0},  // the
     {24, 0},  // the_tw
 };
 
-/* 80AFC200-80AFC2D8 000030 00D8+00 2/3 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[27] = {
     {-1, 0},  // <none>
     {10, 0},  // the_f_talk_a
@@ -102,7 +98,6 @@ static daNpc_GetParam1 l_bckGetParamList[27] = {
     {3, 2},   // the_kune_shishi
 };
 
-/* 80AFC2D8-80AFC348 000108 0070+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[14] = {
     {30, 0},  // the
     {34, 0},  // the_f_talk_a
@@ -120,28 +115,22 @@ static daNpc_GetParam1 l_btpGetParamList[14] = {
     {43, 0},  // the_fh_talk_r
 };
 
-/* 80AFC348-80AFC350 000178 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {27, 0},  // the
 };
 
-/* 80AFC350-80AFC35C 000180 000C+00 1/0 0/0 0/0 .data            l_loadRes_THE0 */
 static int l_loadRes_THE0[3] = {0, 1, -1};
 
-/* 80AFC35C-80AFC368 00018C 000C+00 1/0 0/0 0/0 .data            l_loadRes_THE1 */
 static int l_loadRes_THE1[3] = {0, 1, -1};
 
-/* 80AFC368-80AFC374 000198 000C+00 1/0 0/0 0/0 .data            l_loadRes_THE2 */
 static int l_loadRes_THE2[3] = {0, 2, -1};
 
-/* 80AFC374-80AFC380 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_THE0,
     l_loadRes_THE1,
     l_loadRes_THE2,
 };
 
-/* 80AFC380-80AFC390 -00001 0010+00 7/10 0/0 0/0 .data            l_resNames */
 static char* l_resNames[4] = {
     "The",
     "The1",
@@ -149,7 +138,6 @@ static char* l_resNames[4] = {
     "yelB_TW",
 };
 
-/* 80AFC390-80AFC3A0 0001C0 0010+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static int l_evtGetParamList[4] = {
     0,
     3,
@@ -157,7 +145,6 @@ static int l_evtGetParamList[4] = {
     0,
 };
 
-/* 80AFC3A0-80AFC3B0 -00001 0010+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     NULL,
     "TW_RESISTANCE1",
@@ -165,10 +152,8 @@ static char* l_evtNames[4] = {
     "THE_INTRODUCTION",
 };
 
-/* 80AFC3B0-80AFC3B4 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "The";
 
-/* 80AFC3B4-80AFC3C4 -00001 0010+00 0/1 0/0 0/0 .data            mEvtCutNameList__10daNpcThe_c */
 char* daNpcThe_c::mEvtCutNameList[4] = {
     "",
     "TW_RESISTANCE",
@@ -190,10 +175,8 @@ int daNpcThe_c::Draw() {
     return draw(is_test, false, mpHIO->m.common.real_shadow_size, NULL, false);
 }
 
-/* 80AF76CC-80AF7850 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__10daNpcThe_cFv */
 daNpcThe_c::daNpcThe_c() {}
 
-/* 80AF78E0-80AF7AE0 000300 0200+00 1/0 0/0 0/0 .text            __dt__10daNpcThe_cFv */
 daNpcThe_c::~daNpcThe_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -241,8 +224,6 @@ int daNpcThe_c::CreateHeap() {
     return 1;
 }
 
-/* 80AF7AE0-80AF7CB0 000500 01D0+00 1/1 0/0 0/0 .text ctrlJoint__10daNpcThe_cFP8J3DJointP8J3DModel
- */
 int daNpcThe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int joint_no = i_joint->getJntNo();
     int lookat_joints[3] = {1, 3, 4};
@@ -278,14 +259,10 @@ int daNpcThe_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AF7CB0-80AF7F58 0006D0 02A8+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daNpcThe_cFP10fopAc_ac_c               */
 int daNpcThe_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpcThe_c*>(i_this)->CreateHeap();
 }
 
-/* 80AF8114-80AF8160 000B34 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daNpcThe_cFP8J3DJointi
- */
 int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daNpcThe_c* _this = (daNpcThe_c*)j3dSys.getModel()->getUserArea();
@@ -296,8 +273,6 @@ int daNpcThe_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return true;
 }
 
-/* 80AF8160-80AF841C 000B80 02BC+00 2/0 0/0 0/0 .text            setExpressionAnm__10daNpcThe_cFib
- */
 bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -380,7 +355,6 @@ bool daNpcThe_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80AF841C-80AF8564 000E3C 0148+00 2/0 0/0 0/0 .text            setExpressionBtp__10daNpcThe_cFi */
 bool daNpcThe_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = NULL;
     mAnmFlags &= ~(ANM_PAUSE_BTP | ANM_PLAY_BTP | ANM_FLAG_800);
@@ -447,7 +421,6 @@ bool daNpcThe_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80AF8564-80AF8744 000F84 01E0+00 2/0 0/0 0/0 .text            setMotionAnm__10daNpcThe_cFif */
 void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm_trans = NULL;
     J3DAnmTextureSRTKey* anm_tex = NULL;
@@ -523,7 +496,6 @@ void daNpcThe_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AFA338-80AFA6CC 002D58 0394+00 1/1 0/0 0/0 .text            playExpression__10daNpcThe_cFv */
 void daNpcThe_c::playExpression() {
     daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat0[2] = {&dat0, NULL};
@@ -562,7 +534,6 @@ void daNpcThe_c::playExpression() {
     }
 }
 
-/* 80AF9F94-80AFA338 0029B4 03A4+00 1/1 0/0 0/0 .text            playMotion__10daNpcThe_cFv */
 void daNpcThe_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -600,7 +571,6 @@ void daNpcThe_c::playMotion() {
     }
 }
 
-/* 80AFB1C4-80AFB488 003BE4 02C4+00 1/1 0/0 0/0 .text            lookat__10daNpcThe_cFv */
 void daNpcThe_c::lookat() {
     fopAc_ac_c* actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -658,7 +628,6 @@ void daNpcThe_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, 0);
 }
 
-/* 80AF8744-80AF8B0C 001164 03C8+00 1/0 0/0 0/0 .text            wait__10daNpcThe_cFPv */
 BOOL daNpcThe_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -745,7 +714,6 @@ BOOL daNpcThe_c::wait(void* param_0) {
     return true;
 }
 
-/* 80AF8B0C-80AF8B50 00152C 0044+00 1/0 0/0 0/0 .text            setMotion__10daNpcThe_cFifi */
 void daNpcThe_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if (i_restart || mMotion != motion) {
@@ -758,7 +726,6 @@ void daNpcThe_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80AF8B50-80AF8B7C 001570 002C+00 1/0 0/0 0/0 .text            setExpression__10daNpcThe_cFif */
 void daNpcThe_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 14) {
         mExpression = i_expression;
@@ -768,7 +735,6 @@ void daNpcThe_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80AF8B7C-80AF8CC4 00159C 0148+00 1/0 0/0 0/0 .text            waitTW__10daNpcThe_cFPv */
 BOOL daNpcThe_c::waitTW(void* param_0) {
     switch (mMode) {
     case 0:
@@ -801,7 +767,6 @@ BOOL daNpcThe_c::waitTW(void* param_0) {
     return true;
 }
 
-/* 80AF8CC4-80AF912C 0016E4 0468+00 6/0 0/0 0/0 .text            talk__10daNpcThe_cFPv */
 BOOL daNpcThe_c::talk(void* param_0) {
     BOOL ret = false;
     BOOL bvar1 = false;
@@ -896,7 +861,6 @@ BOOL daNpcThe_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80AF912C-80AF923C 001B4C 0110+00 2/0 0/0 0/0 .text            test__10daNpcThe_cFPv */
 BOOL daNpcThe_c::test(void* param_0) {
     switch (mMode) {
     case 0:
@@ -927,14 +891,10 @@ BOOL daNpcThe_c::test(void* param_0) {
     return true;
 }
 
-/* 80AF923C-80AF9244 001C5C 0008+00 2/0 0/0 0/0 .text            EvCut_TwResistance__10daNpcThe_cFi
- */
 BOOL daNpcThe_c::EvCut_TwResistance(int i_staffID) {
     return true;
 }
 
-/* 80AF9244-80AF9338 001C64 00F4+00 1/0 0/0 0/0 .text            EvCut_Introduction__10daNpcThe_cFi
- */
 BOOL daNpcThe_c::EvCut_Introduction(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int* cut_name = (int*)event_manager.getMyNowCutName(i_staffID);
@@ -964,12 +924,10 @@ BOOL daNpcThe_c::EvCut_Introduction(int i_staffID) {
     return false;
 }
 
-/* 80AF9338-80AF9358 001D58 0020+00 1/0 0/0 0/0 .text            daNpcThe_Create__FPv */
 static cPhs__Step daNpcThe_Create(void* i_this) {
     return static_cast<daNpcThe_c*>(i_this)->create();
 }
 
-/* 80AF9358-80AF9748 001D78 03F0+00 1/1 0/0 0/0 .text            create__10daNpcThe_cFv */
 cPhs__Step daNpcThe_c::create() {
     fopAcM_ct(this, daNpcThe_c);
 
@@ -1055,7 +1013,6 @@ cPhs__Step daNpcThe_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80AF9748-80AF98D0 002168 0188+00 1/1 0/0 0/0 .text            reset__10daNpcThe_cFv */
 void daNpcThe_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -1085,28 +1042,23 @@ void daNpcThe_c::reset() {
     field_0x9ee = 1;
 }
 
-/* 80AF98D0-80AF9904 0022F0 0034+00 1/0 0/0 0/0 .text            daNpcThe_Delete__FPv */
 static int daNpcThe_Delete(void* i_this) {
     static_cast<daNpcThe_c*>(i_this)->~daNpcThe_c();
     return 1;
 }
 
-/* 80AF9904-80AF9924 002324 0020+00 1/0 0/0 0/0 .text            daNpcThe_Execute__FPv */
 static int daNpcThe_Execute(void* i_this) {
     return static_cast<daNpcThe_c*>(i_this)->execute();
 }
 
-/* 80AF9924-80AF99BC 002344 0098+00 1/0 0/0 0/0 .text            daNpcThe_Draw__FPv */
 static int daNpcThe_Draw(void* i_this) {
     return static_cast<daNpcThe_c*>(i_this)->Draw();
 }
 
-/* 80AF99BC-80AF99C4 0023DC 0008+00 1/0 0/0 0/0 .text            daNpcThe_IsDelete__FPv */
 static int daNpcThe_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80AF99F4-80AF9CF0 002414 02FC+00 1/0 0/0 0/0 .text            setParam__10daNpcThe_cFv */
 void daNpcThe_c::setParam() {
     if (mActorMngr[2].getActorP() == NULL) {
         mActorMngr[2].entry(getEvtAreaTagP(19, 0));
@@ -1159,7 +1111,6 @@ void daNpcThe_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80AF9CF0-80AF9F94 002710 02A4+00 1/0 0/0 0/0 .text            main__10daNpcThe_cFv */
 // NONMATCHING dComIfG_gameInfo issues
 BOOL daNpcThe_c::main() {
     if (!doEvent()) {
@@ -1224,7 +1175,6 @@ void daNpcThe_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80AFA6CC-80AFADEC 0030EC 0720+00 1/1 0/0 0/0 .text            doEvent__10daNpcThe_cFv */
 BOOL daNpcThe_c::doEvent() {
     BOOL ret = false;
     if (dComIfGp_event_runCheck() != false) {
@@ -1325,7 +1275,6 @@ BOOL daNpcThe_c::doEvent() {
     return ret;
 }
 
-/* 80AFADEC-80AFAEC8 00380C 00DC+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpcThe_cFv */
 BOOL daNpcThe_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* anm = NULL;
@@ -1344,7 +1293,6 @@ BOOL daNpcThe_c::ctrlBtk() {
     return false;
 }
 
-/* 80AFAEC8-80AFB1C4 0038E8 02FC+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcThe_cFv */
 void daNpcThe_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -1384,19 +1332,16 @@ void daNpcThe_c::setAttnPos() {
     }
 }
 
-/* 80AFB488-80AFB490 003EA8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcThe_cFv */
 BOOL daNpcThe_c::drawDbgInfo() {
     return false;
 }
 
-/* 80AFC534-80AFC554 -00001 0020+00 1/0 0/0 0/0 .data            daNpcThe_MethodTable */
 static actor_method_class daNpcThe_MethodTable = {
     (process_method_func)daNpcThe_Create,  (process_method_func)daNpcThe_Delete,
     (process_method_func)daNpcThe_Execute, (process_method_func)daNpcThe_IsDelete,
     (process_method_func)daNpcThe_Draw,
 };
 
-/* 80AFC554-80AFC584 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_THE */
 extern actor_process_profile_definition g_profile_NPC_THE = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp
index 079776fde4..26f68b50fa 100644
--- a/src/d/actor/d_a_npc_theB.cpp
+++ b/src/d/actor/d_a_npc_theB.cpp
@@ -94,15 +94,12 @@ enum Event {
     /* 0x5 */ EVT_COACH_GUARD_GAMEOVER,
 };
 
-/* 80B0131C-80B01320 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_THEB_HIO_CLASS l_HIO;
 
-/* 80B01048-80B0104C 000020 0004+00 0/0 0/0 0/0 .data            l_bmdGetParamList */
 static u16 l_bmdGetParamList[1][2] = {
     {0, BMDR_THEB},
 };
 
-/* 80B0104C-80B010BC 000024 0070+00 2/3 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[14] = {
     {-1, J3DFrameCtrl::EMode_LOOP},
     {BCK_THEB_F_TALK_A, J3DFrameCtrl::EMode_NONE},
@@ -120,17 +117,14 @@ static daNpc_GetParam1 l_bckGetParamList[14] = {
     {BCK_THEB_BEND_TURN, J3DFrameCtrl::EMode_NONE},
 };
 
-/* 80B010BC-80B010C4 000094 0008+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[1] = {
     {BTP_THEB, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B010C4-80B010CC 00009C 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {BTK_THEB, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B010CC-80B010E4 -00001 0018+00 1/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[6] = {
     NULL,
     "PERSONAL_COMBAT_INTRO",
@@ -140,10 +134,8 @@ static char* l_evtNames[6] = {
     "COACH_GUARD_GAMEOVER",
 };
 
-/* 80B010E4-80B010E8 -00001 0004+00 8/9 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Coach";
 
-/* 80B010E8-80B010EC -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "TheB";
 
 #if DEBUG
@@ -181,7 +173,6 @@ void daNpcTheB_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80B01128-80B01170 000100 0048+00 0/2 0/0 0/0 .data            mEvtSeqList__11daNpcTheB_c */
 daNpcTheB_c::cutFunc daNpcTheB_c::mEvtSeqList[6] = {
     NULL,
     &daNpcTheB_c::EvCut_PersonalCombatIntro,
@@ -191,10 +182,8 @@ daNpcTheB_c::cutFunc daNpcTheB_c::mEvtSeqList[6] = {
     &daNpcTheB_c::EvCut_CoachGuardGameOver
 };
 
-/* 80AFC76C-80AFC8F0 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpcTheB_cFv */
 daNpcTheB_c::daNpcTheB_c() {}
 
-/* 80AFC980-80AFCB44 000300 01C4+00 1/0 0/0 0/0 .text            __dt__11daNpcTheB_cFv */
 daNpcTheB_c::~daNpcTheB_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 
@@ -209,7 +198,6 @@ daNpcTheB_c::~daNpcTheB_c() {
     #endif
 }
 
-/* 80B00D6C-80B00DD8 000000 006C+00 10/10 0/0 0/0 .rodata          m__17daNpcTheB_Param_c */
 daNpcTheB_HIOParam const daNpcTheB_Param_c::m = {
     115.0f,
     -3.0f,
@@ -246,7 +234,6 @@ daNpcTheB_HIOParam const daNpcTheB_Param_c::m = {
     false,
 };
 
-/* 80AFCB44-80AFCD98 0004C4 0254+00 1/1 0/0 0/0 .text            create__11daNpcTheB_cFv */
 cPhs__Step daNpcTheB_c::create() {
     fopAcM_ct(this, daNpcTheB_c);
 
@@ -298,7 +285,6 @@ cPhs__Step daNpcTheB_c::create() {
     
 }
 
-/* 80AFCD98-80AFD040 000718 02A8+00 1/1 0/0 0/0 .text            CreateHeap__11daNpcTheB_cFv */
 int daNpcTheB_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     int unused = 0;
@@ -339,26 +325,22 @@ int daNpcTheB_c::CreateHeap() {
     return 1;
 }
 
-/* 80AFD1FC-80AFD230 000B7C 0034+00 1/1 0/0 0/0 .text            Delete__11daNpcTheB_cFv */
 int daNpcTheB_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcTheB_c();
     return 1;
 }
 
-/* 80AFD230-80AFD250 000BB0 0020+00 2/2 0/0 0/0 .text            Execute__11daNpcTheB_cFv */
 int daNpcTheB_c::Execute() {
     return daNpcTheB_c::main();
 }
 
-/* 80AFD250-80AFD2A8 000BD0 0058+00 1/1 0/0 0/0 .text            Draw__11daNpcTheB_cFv */
 int daNpcTheB_c::Draw() {
     J3DModelData* mdlData_p = mAnm_p->getModel()->getModelData();
     mdlData_p->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     return draw(FALSE, FALSE, mpHIO->m.common.real_shadow_size, NULL, FALSE);
 }
 
-/* 80AFD2A8-80AFD49C 000C28 01F4+00 1/1 0/0 0/0 .text            ctrlJoint__11daNpcTheB_cFP8J3DJointP8J3DModel */
 int daNpcTheB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
 
@@ -401,13 +383,11 @@ int daNpcTheB_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80AFD49C-80AFD4BC 000E1C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpcTheB_cFP10fopAc_ac_c */
 int daNpcTheB_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcTheB_c* actor = (daNpcTheB_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80AFD4BC-80AFD508 000E3C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpcTheB_cFP8J3DJointi */
 int daNpcTheB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -420,7 +400,6 @@ int daNpcTheB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80AFD508-80AFD5F0 000E88 00E8+00 0/0 0/0 2/2 .text            getHandPos1__11daNpcTheB_cFi */
 cXyz daNpcTheB_c::getHandPos1(int hand) {
     int jntNo = hand != 0 ? JNT_HANDR : JNT_HANDL;
 
@@ -437,7 +416,6 @@ cXyz daNpcTheB_c::getHandPos1(int hand) {
     return handPos1;
 }
 
-/* 80AFD5F0-80AFD6D8 000F70 00E8+00 0/0 0/0 2/2 .text            getHandPos2__11daNpcTheB_cFi */
 cXyz daNpcTheB_c::getHandPos2(int hand) {
     int jntNo = hand != 0 ? JNT_HANDR : JNT_HANDL;
 
@@ -454,7 +432,6 @@ cXyz daNpcTheB_c::getHandPos2(int hand) {
     return handPos2;
 }
 
-/* 80AFD6D8-80AFD6F0 001058 0018+00 0/0 0/0 1/1 .text            setHintEvent__11daNpcTheB_cFlUsi */
 void daNpcTheB_c::setHintEvent(s32 i_msgNo, u16 param_2, int i_roomNo) {
     mHintEvtFlag = 1;
     mHintMsgNo = i_msgNo;
@@ -462,7 +439,6 @@ void daNpcTheB_c::setHintEvent(s32 i_msgNo, u16 param_2, int i_roomNo) {
     mRoomNo = i_roomNo;
 }
 
-/* 80AFD6F0-80AFD938 001070 0248+00 2/1 0/0 0/0 .text            main__11daNpcTheB_cFv */
 BOOL daNpcTheB_c::main() {
     setParam();
 
@@ -519,7 +495,6 @@ BOOL daNpcTheB_c::main() {
     return TRUE;
 }
 
-/* 80AFD938-80AFDAA4 0012B8 016C+00 1/0 0/0 0/0 .text            setParam__11daNpcTheB_cFv */
 void daNpcTheB_c::setParam() {
     actionFunc action = mNextAction;
     s16 talk_distance = mpHIO->m.common.talk_distance;
@@ -555,7 +530,6 @@ void daNpcTheB_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80AFDAA4-80AFDB70 001424 00CC+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpcTheB_cFv */
 BOOL daNpcTheB_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk = NULL;
@@ -578,7 +552,6 @@ BOOL daNpcTheB_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80AFDB70-80AFDEC0 0014F0 0350+00 1/0 0/0 0/0 .text            setAttnPos__11daNpcTheB_cFv */
 void daNpcTheB_c::setAttnPos() {
     mDoMtx_stack_c::copy(mAnm_p->getModel()->getBaseTRMtx());
     mDoMtx_stack_c::multVecZero(&current.pos);
@@ -628,7 +601,6 @@ void daNpcTheB_c::setAttnPos() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80AFDEC0-80AFE0BC 001840 01FC+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpcTheB_cFib */
 bool daNpcTheB_c::setExpressionAnm(int i_idx, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -699,7 +671,6 @@ bool daNpcTheB_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80AFE0BC-80AFE1BC 001A3C 0100+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpcTheB_cFi */
 bool daNpcTheB_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btp = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -739,7 +710,6 @@ bool daNpcTheB_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80AFE1BC-80AFE398 001B3C 01DC+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpcTheB_cFif */
 void daNpcTheB_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* anm = NULL;
     int attr = J3DFrameCtrl::EMode_LOOP;
@@ -795,12 +765,10 @@ void daNpcTheB_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80AFE398-80AFE3A0 001D18 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpcTheB_cFv */
 BOOL daNpcTheB_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80AFE3A0-80AFE574 001D20 01D4+00 1/1 0/0 0/0 .text            reset__11daNpcTheB_cFv */
 void daNpcTheB_c::reset() {
     initialize();
 
@@ -839,7 +807,6 @@ void daNpcTheB_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80AFE574-80AFE704 001EF4 0190+00 1/1 0/0 0/0 .text            playExpression__11daNpcTheB_cFv */
 void daNpcTheB_c::playExpression() {
     daNpcF_anmPlayData dat0 = {ANM_F_TALK_A, mpHIO->m.common.morf_frame, 1};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -864,7 +831,6 @@ void daNpcTheB_c::playExpression() {
     }
 }
 
-/* 80AFE704-80AFE920 002084 021C+00 1/1 0/0 0/0 .text            playMotion__11daNpcTheB_cFv */
 void daNpcTheB_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_SIT, mpHIO->m.common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -896,7 +862,6 @@ void daNpcTheB_c::playMotion() {
     }
 }
 
-/* 80AFE920-80AFEA14 0022A0 00F4+00 1/1 0/0 0/0 .text            doNormalAction__11daNpcTheB_cFv */
 void daNpcTheB_c::doNormalAction() {
     mOrderEvtNo = EVT_NONE;
 
@@ -909,7 +874,6 @@ void daNpcTheB_c::doNormalAction() {
     }
 }
 
-/* 80AFEA14-80AFED24 002394 0310+00 1/1 0/0 0/0 .text            doEvent__11daNpcTheB_cFv */
 BOOL daNpcTheB_c::doEvent() {
     fopAc_ac_c* actor_p;
     e_wb_class* wb_p;
@@ -985,7 +949,6 @@ BOOL daNpcTheB_c::doEvent() {
     return rv;
 }
 
-/* 80AFED24-80AFEECC 0026A4 01A8+00 1/1 0/0 0/0 .text            lookat__11daNpcTheB_cFv */
 void daNpcTheB_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1080,7 +1043,6 @@ inline void daNpcTheB_c::setWaitAnimation() {
     }
 }
 
-/* 80AFEECC-80AFF45C 00284C 0590+00 1/0 0/0 0/0 .text            wait__11daNpcTheB_cFPv */
 int daNpcTheB_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -1142,7 +1104,6 @@ int daNpcTheB_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80AFF45C-80AFF4A0 002DDC 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpcTheB_cFifi */
 void daNpcTheB_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 6) {
@@ -1153,7 +1114,6 @@ void daNpcTheB_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80AFF4A0-80AFF4CC 002E20 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpcTheB_cFif */
 void daNpcTheB_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 4) {
         mExpression = i_expression;
@@ -1163,7 +1123,6 @@ void daNpcTheB_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80AFF4CC-80AFF6AC 002E4C 01E0+00 2/0 0/0 0/0 .text            talk__11daNpcTheB_cFPv */
 int daNpcTheB_c::talk(void* param_1) {
     int rv = 0;
 
@@ -1212,7 +1171,6 @@ int daNpcTheB_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80AFF6AC-80AFF888 00302C 01DC+00 1/0 0/0 0/0 .text            EvCut_PersonalCombatIntro__11daNpcTheB_cFi */
 int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1266,7 +1224,6 @@ int daNpcTheB_c::EvCut_PersonalCombatIntro(int i_staffId) {
     return 0;
 }
 
-/* 80AFF888-80AFFBB4 003208 032C+00 1/0 0/0 0/0 .text            EvCut_PersonalCombatRevenge__11daNpcTheB_cFi */
 int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1349,7 +1306,6 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) {
     return 0;
 }
 
-/* 80AFFBB4-80AFFEF4 003534 0340+00 2/1 0/0 0/0 .text            EvCut_PersonalCombatAfter__11daNpcTheB_cFv */
 void daNpcTheB_c::EvCut_PersonalCombatAfter() {
     daPy_py_c* player;
     daNpcCoach_c* coach_p = (daNpcCoach_c*)fopAcM_SearchByID(parentActorID);
@@ -1444,7 +1400,6 @@ void daNpcTheB_c::EvCut_PersonalCombatAfter() {
     }
 }
 
-/* 80AFFEF4-80AFFFE0 003874 00EC+00 1/0 0/0 0/0 .text            EvCut_AnnulationFieldRace__11daNpcTheB_cFi */
 int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     daStartAndGoal_c* startAndGoal_p = (daStartAndGoal_c*)fpcM_SearchByName(PROC_START_AND_GOAL);
@@ -1484,7 +1439,6 @@ int daNpcTheB_c::EvCut_AnnulationFieldRace(int i_staffId) {
     return 0;
 }
 
-/* 80AFFFE0-80B00204 003960 0224+00 1/0 0/0 0/0 .text            EvCut_TheBHint__11daNpcTheB_cFi */
 int daNpcTheB_c::EvCut_TheBHint(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1545,7 +1499,6 @@ int daNpcTheB_c::EvCut_TheBHint(int i_staffId) {
     return 0;
 }
 
-/* 80B00204-80B00374 003B84 0170+00 1/0 0/0 0/0 .text            EvCut_CoachGuardGameOver__11daNpcTheB_cFi */
 int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_staffId);
@@ -1594,32 +1547,26 @@ int daNpcTheB_c::EvCut_CoachGuardGameOver(int i_staffId) {
     return 0;
 }
 
-/* 80B00374-80B00394 003CF4 0020+00 1/0 0/0 0/0 .text            daNpcTheB_Create__FPv */
 static int daNpcTheB_Create(void* i_this) {
     return static_cast<daNpcTheB_c*>(i_this)->create();
 }
 
-/* 80B00394-80B003B4 003D14 0020+00 1/0 0/0 0/0 .text            daNpcTheB_Delete__FPv */
 static int daNpcTheB_Delete(void* i_this) {
     return static_cast<daNpcTheB_c*>(i_this)->Delete();
 }
 
-/* 80B003B4-80B003D4 003D34 0020+00 1/0 0/0 0/0 .text            daNpcTheB_Execute__FPv */
 static int daNpcTheB_Execute(void* i_this) {
     return static_cast<daNpcTheB_c*>(i_this)->Execute();
 }
 
-/* 80B003D4-80B003F4 003D54 0020+00 1/0 0/0 0/0 .text            daNpcTheB_Draw__FPv */
 static int daNpcTheB_Draw(void* i_this) {
     return static_cast<daNpcTheB_c*>(i_this)->Draw();
 }
 
-/* 80B003F4-80B003FC 003D74 0008+00 1/0 0/0 0/0 .text            daNpcTheB_IsDelete__FPv */
 static int daNpcTheB_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B011D4-80B011F4 -00001 0020+00 1/0 0/0 0/0 .data            daNpcTheB_MethodTable */
 static actor_method_class daNpcTheB_MethodTable = {
     (process_method_func)daNpcTheB_Create,
     (process_method_func)daNpcTheB_Delete,
@@ -1628,7 +1575,6 @@ static actor_method_class daNpcTheB_MethodTable = {
     (process_method_func)daNpcTheB_Draw,
 };
 
-/* 80B011F4-80B01224 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_THEB */
 extern actor_process_profile_definition g_profile_NPC_THEB = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp
index 36ec8dbdec..804b37fbfe 100644
--- a/src/d/actor/d_a_npc_tk.cpp
+++ b/src/d/actor/d_a_npc_tk.cpp
@@ -41,11 +41,6 @@ public:
     u8 field_0x3c;
 };
 
-//
-// Declarations:
-//
-
-/* 80B0140C-80B01498 0000EC 008C+00 1/1 0/0 0/0 .text            __ct__14daNPC_TK_HIO_cFv */
 daNPC_TK_HIO_c::daNPC_TK_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.0f;
@@ -64,13 +59,11 @@ daNPC_TK_HIO_c::daNPC_TK_HIO_c() {
     field_0x3c = 1;
 }
 
-/* 80B01498-80B0153C 000178 00A4+00 14/14 0/0 0/0 .text            setBck__10daNPC_TK_cFiUcff */
 void daNPC_TK_c::setBck(int param_0, u8 param_1, f32 param_2, f32 param_3) {
     mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_tk", param_0), param_1, param_2,
                    param_3, 0.0f, -1.0f);
 }
 
-/* 80B0153C-80B01598 00021C 005C+00 6/6 0/0 0/0 .text            checkBck__10daNPC_TK_cFi */
 bool daNPC_TK_c::checkBck(int param_0) {
     if (mpMorf->getAnm() == dComIfG_getObjectRes("Npc_tk", param_0)) {
         return true;
@@ -79,7 +72,6 @@ bool daNPC_TK_c::checkBck(int param_0) {
     }
 }
 
-/* 80B01598-80B01678 000278 00E0+00 1/1 0/0 0/0 .text            draw__10daNPC_TK_cFv */
 int daNPC_TK_c::draw() {
     J3DModel* pJVar1 = mpMorf->getModel();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -95,12 +87,10 @@ int daNPC_TK_c::draw() {
     return 1;
 }
 
-/* 80B016B4-80B016D4 000394 0020+00 1/0 0/0 0/0 .text            daNPC_TK_Draw__FP10daNPC_TK_c */
 static int daNPC_TK_Draw(daNPC_TK_c* i_this) {
     return i_this->draw();
 }
 
-/* 80B016D4-80B01878 0003B4 01A4+00 1/1 0/0 0/0 .text            checkBeforeBg__10daNPC_TK_cFv */
 int daNPC_TK_c::checkBeforeBg() {
     s32 rv = 0;
 
@@ -138,7 +128,6 @@ int daNPC_TK_c::checkBeforeBg() {
     return rv;
 }
 
-/* 80B01878-80B018F4 000558 007C+00 15/15 0/0 0/0 .text            setActionMode__10daNPC_TK_cFi */
 void daNPC_TK_c::setActionMode(int param_0) {
     if (mActionType != param_0) {
         mAcch.SetGroundUpY(0.0f);
@@ -151,8 +140,6 @@ void daNPC_TK_c::setActionMode(int param_0) {
     }
 }
 
-/* 80B018F4-80B01C84 0005D4 0390+00 1/1 0/0 0/0 .text
- * setAddCalcSpeedXZ__10daNPC_TK_cFR4cXyzRC4cXyzfff             */
 f32 daNPC_TK_c::setAddCalcSpeedXZ(cXyz& param_0, cXyz const& param_1, f32 param_2, f32 param_3,
                                   f32 param_4) {
     cXyz unkXyz1 = param_1 - param_0;
@@ -176,7 +163,6 @@ f32 daNPC_TK_c::setAddCalcSpeedXZ(cXyz& param_0, cXyz const& param_1, f32 param_
     return result.y;
 }
 
-/* 80B01C84-80B01D84 000964 0100+00 2/2 0/0 0/0 .text chaseTargetPos__10daNPC_TK_cF4cXyzffs */
 cXyz daNPC_TK_c::chaseTargetPos(cXyz param_0, f32 param_1, f32 param_2, s16 param_3) {
     s16 unkInt1 = 0x100;
     if (param_3 < unkInt1) {
@@ -197,7 +183,6 @@ cXyz daNPC_TK_c::chaseTargetPos(cXyz param_0, f32 param_1, f32 param_2, s16 para
     return param_0 - current.pos;
 }
 
-/* 80B01D84-80B01DA0 000A64 001C+00 3/3 0/0 0/0 .text            getMasterPointer__10daNPC_TK_cFv */
 fopAc_ac_c* daNPC_TK_c::getMasterPointer() {
     if (mpMaster != NULL) {
         return mpMaster;
@@ -206,7 +191,6 @@ fopAc_ac_c* daNPC_TK_c::getMasterPointer() {
     }
 }
 
-/* 80B01DA0-80B01E48 000A80 00A8+00 2/2 0/0 0/0 .text setMasterShoulder__10daNPC_TK_cFP4cXyz */
 void daNPC_TK_c::setMasterShoulder(cXyz* o_pos) {
     if (mpMaster != NULL) {
         mIsHanjoHand = 1;
@@ -219,7 +203,6 @@ void daNPC_TK_c::setMasterShoulder(cXyz* o_pos) {
     }
 }
 
-/* 80B01E48-80B01EF4 000B28 00AC+00 3/3 0/0 0/0 .text            setAwayAction__10daNPC_TK_cFi */
 void daNPC_TK_c::setAwayAction(int param_0) {
     if (mActionType == 3 || mActionType == 5) {
         setBck(7, 2, 3.0f, 2.0f);
@@ -238,7 +221,6 @@ void daNPC_TK_c::setAwayAction(int param_0) {
     }
 }
 
-/* 80B01EF4-80B0207C 000BD4 0188+00 1/1 0/0 0/0 .text            setFlySE__10daNPC_TK_cFv */
 void daNPC_TK_c::setFlySE() {
     if (checkBck(6) != 0) {
         if (mpMorf->checkFrame(10.0f) != 0) {
@@ -269,8 +251,6 @@ static u8 g_isHioChildInitted;
 
 static daNPC_TK_HIO_c l_HIO;
 
-/* 80B0207C-80B021A0 000D5C 0124+00 1/1 0/0 0/0 .text
- * checkRangeOfTake__FP10fopAc_ac_cP10fopAc_ac_c                */
 static s32 checkRangeOfTake(fopAc_ac_c* param_0, fopAc_ac_c* param_1) {
     csXyz local_48 = param_0->shape_angle;
     cXyz pos0 = param_0->current.pos;
@@ -294,7 +274,6 @@ static s32 checkRangeOfTake(fopAc_ac_c* param_0, fopAc_ac_c* param_1) {
     return 1;
 }
 
-/* 80B021A0-80B02208 000E80 0068+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) != 0 &&
         (fopAcM_GetName(param_0) == PROC_NI ||
@@ -305,7 +284,6 @@ static void* s_obj_sub(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80B02208-80B02254 000EE8 004C+00 3/3 0/0 0/0 .text            s_hanjo__FPvPv */
 static void* s_hanjo(void* param_0, void* param_1) {
     if (fopAcM_IsActor(param_0) != 0 && fopAcM_GetName(param_0) == PROC_NPC_HANJO) {
         return param_0;
@@ -314,7 +292,6 @@ static void* s_hanjo(void* param_0, void* param_1) {
     }
 }
 
-/* 80B02254-80B026F8 000F34 04A4+00 1/1 0/0 0/0 .text            executeFly__10daNPC_TK_cFv */
 void daNPC_TK_c::executeFly() {
     field_0x6bd = 1;
 
@@ -386,7 +363,6 @@ void daNPC_TK_c::executeFly() {
     }
 }
 
-/* 80B026F8-80B02B5C 0013D8 0464+00 1/1 0/0 0/0 .text            initPerchDemo__10daNPC_TK_cFi */
 void daNPC_TK_c::initPerchDemo(int param_0) {
     s16 masterAngleY2;
     s16 masterAngleY = getMasterPointer()->shape_angle.y;
@@ -508,7 +484,6 @@ void daNPC_TK_c::initPerchDemo(int param_0) {
     }
 }
 
-/* 80B02B5C-80B03658 00183C 0AFC+00 1/1 0/0 0/0 .text            executePerchDemo__10daNPC_TK_cFi */
 bool daNPC_TK_c::executePerchDemo(int param_0) {
     cXyz targetPos;
     cXyz pathPos;
@@ -671,7 +646,6 @@ bool daNPC_TK_c::executePerchDemo(int param_0) {
     return false;
 }
 
-/* 80B03658-80B03754 002338 00FC+00 3/3 0/0 0/0 .text            executePerch__10daNPC_TK_cFv */
 void daNPC_TK_c::executePerch() {
     static char* action_table[4] = {
         "Wait",
@@ -709,7 +683,6 @@ void daNPC_TK_c::executePerch() {
     }
 }
 
-/* 80B03754-80B039A8 002434 0254+00 1/1 0/0 0/0 .text            executeHandOn__10daNPC_TK_cFv */
 void daNPC_TK_c::executeHandOn() {
     if (field_0x698 == 0) {
         field_0x694 = 0;
@@ -761,8 +734,6 @@ void daNPC_TK_c::executeHandOn() {
     setMasterShoulder(&current.pos);
 }
 
-/* 80B039A8-80B03A70 002688 00C8+00 1/1 0/0 0/0 .text            checkWaterSurface__10daNPC_TK_cFf
- */
 bool daNPC_TK_c::checkWaterSurface(f32 param_0) {
     dBgS_ObjGndChk_Spl gndChk;
     cXyz pos = current.pos;
@@ -776,7 +747,6 @@ bool daNPC_TK_c::checkWaterSurface(f32 param_0) {
     }
 }
 
-/* 80B03A70-80B048BC 002750 0E4C+00 1/1 0/0 0/0 .text            executeAttack__10daNPC_TK_cFv */
 void daNPC_TK_c::executeAttack() {
     static f32 taka_attack_dist[4] = {
         5200.0f,
@@ -1035,7 +1005,6 @@ void daNPC_TK_c::executeAttack() {
     }
 }
 
-/* 80B048BC-80B04BF8 00359C 033C+00 1/1 0/0 0/0 .text            executeAway__10daNPC_TK_cFv */
 void daNPC_TK_c::executeAway() {
     field_0x6bd = 1;
 
@@ -1130,7 +1099,6 @@ void daNPC_TK_c::executeAway() {
     }
 }
 
-/* 80B04BF8-80B04F64 0038D8 036C+00 1/1 0/0 0/0 .text            setCarryActorMtx__10daNPC_TK_cFv */
 void daNPC_TK_c::setCarryActorMtx() {
     field_0x6a8 += 0x6bc;
     field_0x6a6 = cM_ssin(field_0x6a8) * 2048.0f + 4096.0f;
@@ -1165,7 +1133,6 @@ void daNPC_TK_c::setCarryActorMtx() {
     }
 }
 
-/* 80B04F64-80B04FA8 003C44 0044+00 2/2 0/0 0/0 .text            getTakePosY__10daNPC_TK_cFv */
 f32 daNPC_TK_c::getTakePosY() {
     cXyz unusedXyz;  // debug match
 
@@ -1180,7 +1147,6 @@ f32 daNPC_TK_c::getTakePosY() {
     }
 }
 
-/* 80B04FA8-80B04FEC 003C88 0044+00 1/1 0/0 0/0 .text            getTakeOffPosY__10daNPC_TK_cFv */
 f32 daNPC_TK_c::getTakeOffPosY() {
     cXyz unusedXyz;  // debug match
 
@@ -1195,7 +1161,6 @@ f32 daNPC_TK_c::getTakeOffPosY() {
     }
 }
 
-/* 80B04FEC-80B05BD0 003CCC 0BE4+00 1/1 0/0 0/0 .text            executeBack__10daNPC_TK_cFv */
 void daNPC_TK_c::executeBack() {
     if (field_0x634 == NULL) {
         setActionMode(4);
@@ -1455,7 +1420,6 @@ void daNPC_TK_c::executeBack() {
     }
 }
 
-/* 80B05BD0-80B05C7C 0048B0 00AC+00 5/5 0/0 0/0 .text            getHanjoHandPos__10daNPC_TK_cFv */
 cXyz daNPC_TK_c::getHanjoHandPos() {
     cXyz handPos(0.0f, 0.0f, 0.0f);
     if (mpMaster != NULL) {
@@ -1466,7 +1430,6 @@ cXyz daNPC_TK_c::getHanjoHandPos() {
     return handPos;
 }
 
-/* 80B05C7C-80B05EC8 00495C 024C+00 1/1 0/0 0/0 .text            executeStayHanjo__10daNPC_TK_cFv */
 void daNPC_TK_c::executeStayHanjo() {
     if (checkAttackDemo()) {
         return;
@@ -1529,8 +1492,6 @@ void daNPC_TK_c::executeStayHanjo() {
     }
 }
 
-/* 80B05EC8-80B0686C 004BA8 09A4+00 1/1 0/0 0/0 .text            executeAttackLink__10daNPC_TK_cFv
- */
 void daNPC_TK_c::executeAttackLink() {
     cXyz playerPos = dComIfGp_getPlayer(0)->current.pos;
 
@@ -1681,7 +1642,6 @@ void daNPC_TK_c::executeAttackLink() {
     }
 }
 
-/* 80B0686C-80B07114 00554C 08A8+00 1/1 0/0 0/0 .text            executeBackHanjo__10daNPC_TK_cFv */
 void daNPC_TK_c::executeBackHanjo() {
     mpMaster = (daNpc_Hanjo_c*)fpcM_Search(s_hanjo, this);
 
@@ -1771,7 +1731,6 @@ void daNPC_TK_c::executeBackHanjo() {
     }
 }
 
-/* 80B07114-80B072CC 005DF4 01B8+00 4/4 0/0 0/0 .text            checkAttackDemo__10daNPC_TK_cFv */
 bool daNPC_TK_c::checkAttackDemo() {
     cXyz cStack_14(2500.0f, 500.0f, 1050.0f);
     if (daPy_getPlayerActorClass()->checkWolfTagLockJump()) {
@@ -1783,8 +1742,6 @@ bool daNPC_TK_c::checkAttackDemo() {
     return false;
 }
 
-/* 80B072CC-80B07610 005FAC 0344+00 1/1 0/0 0/0 .text            executeAttackDemo__10daNPC_TK_cFv
- */
 void daNPC_TK_c::executeAttackDemo() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1838,7 +1795,6 @@ void daNPC_TK_c::executeAttackDemo() {
     }
 }
 
-/* 80B07610-80B08168 0062F0 0B58+00 1/1 0/0 0/0 .text executeBackHanjoDemo__10daNPC_TK_cFv */
 void daNPC_TK_c::executeBackHanjoDemo() {
     s16 angleY;
     s32 pitch;
@@ -1961,7 +1917,6 @@ void daNPC_TK_c::executeBackHanjoDemo() {
     }
 }
 
-/* 80B08168-80B08208 006E48 00A0+00 1/1 0/0 0/0 .text            executeWolfEvent__10daNPC_TK_cFv */
 void daNPC_TK_c::executeWolfEvent() {
     mIsExecutingAction = false;
     if (eventInfo.checkCommandDemoAccrpt() != 0) {
@@ -1974,7 +1929,6 @@ void daNPC_TK_c::executeWolfEvent() {
     return;
 }
 
-/* 80B08208-80B082A4 006EE8 009C+00 1/1 0/0 0/0 .text            calcWolfDemoCam__10daNPC_TK_cFv */
 void daNPC_TK_c::calcWolfDemoCam() {
     cXyz cStack_1c = daPy_getPlayerActorClass()->current.pos;
     s16 angleY = daPy_getPlayerActorClass()->shape_angle.y;
@@ -1987,7 +1941,6 @@ void daNPC_TK_c::calcWolfDemoCam() {
     cLib_addCalcPos2(&field_0x6fc, cStack_34, 0.1f, 3.0f);
 }
 
-/* 80B082A4-80B0839C 006F84 00F8+00 1/1 0/0 0/0 .text            calcWolfDemoCam2__10daNPC_TK_cFv */
 void daNPC_TK_c::calcWolfDemoCam2() {
     cXyz targetPos;
     cXyz curPos = dPath_GetPnt(mWolfPathData, mPathStep2)->m_position;
@@ -2001,7 +1954,6 @@ void daNPC_TK_c::calcWolfDemoCam2() {
     cLib_chaseF(&field_0x714, 10.0f + nREG_F(16), 1.5f + nREG_F(17));
 }
 
-/* 80B0839C-80B09A3C 00707C 16A0+00 2/1 0/0 0/0 .text            executeWolfPerch__10daNPC_TK_cFv */
 void daNPC_TK_c::executeWolfPerch() {
     dCamera_c* camera = dCam_getBody();
     cXyz playerPos = daPy_getPlayerActorClass()->current.pos;
@@ -2473,7 +2425,6 @@ void daNPC_TK_c::executeWolfPerch() {
     camera->Set(field_0x6fc, field_0x6f0, field_0x708, 0);
 }
 
-/* 80B09A3C-80B0A444 00871C 0A08+00 2/1 0/0 0/0 .text executeResistanceDemo__10daNPC_TK_cFv */
 void daNPC_TK_c::executeResistanceDemo() {
     daNpcMoiR_c* npcMoiR;
     if (fopAcM_SearchByName(PROC_NPC_MOIR, (fopAc_ac_c**)&npcMoiR) == NULL || npcMoiR == NULL) {
@@ -2666,7 +2617,6 @@ void daNPC_TK_c::executeResistanceDemo() {
     cLib_addCalcAngleS(&shape_angle.z, local_48, 0x10, 0x200, 0x10);
 }
 
-/* 80B0A444-80B0A500 009124 00BC+00 0/0 0/0 1/1 .text setHawkSideCamera__10daNPC_TK_cF4cXyz */
 void daNPC_TK_c::setHawkSideCamera(cXyz param_0) {
     field_0x710 = 4;
 
@@ -2681,7 +2631,6 @@ void daNPC_TK_c::setHawkSideCamera(cXyz param_0) {
     field_0x70c = 120;
 }
 
-/* 80B0A500-80B0A568 0091E0 0068+00 1/1 0/0 1/1 .text setHawkCamera__10daNPC_TK_cFP10fopAc_ac_c */
 void daNPC_TK_c::setHawkCamera(fopAc_ac_c* param_0) {
     field_0x6ec = param_0;
     field_0x70c = 300;
@@ -2689,7 +2638,6 @@ void daNPC_TK_c::setHawkCamera(fopAc_ac_c* param_0) {
     cLib_offsetPos(&field_0x604, &param_0->current.pos, 0x2000 - shape_angle.y, &acStack_28);
 }
 
-/* 80B0A568-80B0A614 009248 00AC+00 1/1 0/0 2/2 .text            endHawkCamera__10daNPC_TK_cFv */
 void daNPC_TK_c::endHawkCamera() {
     if (field_0x710 == 2 || field_0x710 == 3) {
         field_0x710 = 5;
@@ -2702,7 +2650,6 @@ void daNPC_TK_c::endHawkCamera() {
     }
 }
 
-/* 80B0A614-80B0B004 0092F4 09F0+00 1/1 0/0 0/0 .text            calcDemoCamera__10daNPC_TK_cFv */
 void daNPC_TK_c::calcDemoCamera() {
     dCamera_c* camera;
 
@@ -2863,7 +2810,6 @@ void daNPC_TK_c::calcDemoCamera() {
     }
 }
 
-/* 80B0B004-80B0B284 009CE4 0280+00 1/1 0/0 0/0 .text            checkActionSet__10daNPC_TK_cFv */
 void daNPC_TK_c::checkActionSet() {
     cXyz acStack_24;
 
@@ -2930,7 +2876,6 @@ void daNPC_TK_c::checkActionSet() {
     }
 }
 
-/* 80B0B284-80B0B5CC 009F64 0348+00 2/1 0/0 0/0 .text            action__10daNPC_TK_cFv */
 void daNPC_TK_c::action() {
     s16 origAngleY = shape_angle.y;
     field_0x680 = 0.0f;
@@ -3061,7 +3006,6 @@ void daNPC_TK_c::action() {
     mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80B0B5CC-80B0B6DC 00A2AC 0110+00 1/1 0/0 0/0 .text            mtx_set__10daNPC_TK_cFv */
 void daNPC_TK_c::mtx_set() {
     if (field_0x6c1 != 0) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -3079,7 +3023,6 @@ void daNPC_TK_c::mtx_set() {
     mpMorf->modelCalc();
 }
 
-/* 80B0B6DC-80B0B7CC 00A3BC 00F0+00 1/1 0/0 0/0 .text            cc_set__10daNPC_TK_cFv */
 void daNPC_TK_c::cc_set() {
     MTXCopy(mpMorf->getModel()->getAnmMtx(0), mDoMtx_stack_c::get());
     mDoMtx_stack_c::multVecZero(&eyePos);
@@ -3099,7 +3042,6 @@ void daNPC_TK_c::cc_set() {
     field_0x6ae = 0;
 }
 
-/* 80B0B7CC-80B0B8F0 00A4AC 0124+00 1/1 0/0 0/0 .text            execute__10daNPC_TK_cFv */
 int daNPC_TK_c::execute() {
     if (field_0x6b0 != 0) {
         field_0x6b0--;
@@ -3136,18 +3078,14 @@ int daNPC_TK_c::execute() {
     return 1;
 }
 
-/* 80B0B8F0-80B0B910 00A5D0 0020+00 2/1 0/0 0/0 .text            daNPC_TK_Execute__FP10daNPC_TK_c */
 static int daNPC_TK_Execute(daNPC_TK_c* i_this) {
     return i_this->execute();
 }
 
-/* 80B0B910-80B0B918 00A5F0 0008+00 1/0 0/0 0/0 .text            daNPC_TK_IsDelete__FP10daNPC_TK_c
- */
 static int daNPC_TK_IsDelete(daNPC_TK_c* i_this) {
     return 1;
 }
 
-/* 80B0B918-80B0B98C 00A5F8 0074+00 1/1 0/0 0/0 .text            _delete__10daNPC_TK_cFv */
 int daNPC_TK_c::_delete() {
     dComIfG_resDelete(&mPhase, "Npc_tk");
     if (field_0xb40) {
@@ -3161,13 +3099,10 @@ int daNPC_TK_c::_delete() {
     return 1;
 }
 
-/* 80B0B98C-80B0B9AC 00A66C 0020+00 1/0 0/0 0/0 .text            daNPC_TK_Delete__FP10daNPC_TK_c */
 static int daNPC_TK_Delete(daNPC_TK_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80B0B9AC-80B0BB7C 00A68C 01D0+00 1/1 0/0 0/0 .text ctrlJoint__10daNPC_TK_cFP8J3DJointP8J3DModel
- */
 int daNPC_TK_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
     s32 jntNo = param_0->getJntNo();
     mDoMtx_stack_c::copy(param_1->getAnmMtx(jntNo));
@@ -3218,7 +3153,6 @@ int daNPC_TK_c::ctrlJoint(J3DJoint* param_0, J3DModel* param_1) {
     return 1;
 }
 
-/* 80B0BB7C-80B0BBC8 00A85C 004C+00 1/1 0/0 0/0 .text JointCallBack__10daNPC_TK_cFP8J3DJointi */
 int daNPC_TK_c::JointCallBack(J3DJoint* param_0, int param_1) {
     J3DJoint* joint = param_0;
     if (param_1 == 0) {
@@ -3232,7 +3166,6 @@ int daNPC_TK_c::JointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80B0BBC8-80B0BD04 00A8A8 013C+00 1/1 0/0 0/0 .text            CreateHeap__10daNPC_TK_cFv */
 int daNPC_TK_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Npc_tk", "tk.bmd");
     JUT_ASSERT_MSG(0xf4f, modelData != NULL, "  鷹匠");  // falconer
@@ -3256,12 +3189,10 @@ int daNPC_TK_c::CreateHeap() {
     return 1;
 }
 
-/* 80B0BD04-80B0BD24 00A9E4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daNPC_TK_c*)i_this)->CreateHeap();
 }
 
-/* 80B0BD24-80B0BFE0 00AA04 02BC+00 1/1 0/0 0/0 .text            create__10daNPC_TK_cFv */
 int daNPC_TK_c::create() {
     /* 80B0C4D4-80B0C514 0000E0 0040+00 1/1 0/0 0/0 .data            cc_sph_src$8096 */
     static dCcD_SrcSph cc_sph_src = {
@@ -3323,12 +3254,10 @@ int daNPC_TK_c::create() {
     return loadRes;
 }
 
-/* 80B0C0E4-80B0C104 00ADC4 0020+00 1/0 0/0 0/0 .text            daNPC_TK_Create__FP10daNPC_TK_c */
 static int daNPC_TK_Create(daNPC_TK_c* i_this) {
     return i_this->create();
 }
 
-/* 80B0C514-80B0C534 -00001 0020+00 1/0 0/0 0/0 .data            l_daNPC_TK_Method */
 static actor_method_class l_daNPC_TK_Method = {
     (process_method_func)daNPC_TK_Create,  (process_method_func)daNPC_TK_Delete,
     (process_method_func)daNPC_TK_Execute, (process_method_func)daNPC_TK_IsDelete,
diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp
index 271e1cf1f7..117388c6e1 100644
--- a/src/d/actor/d_a_npc_tkc.cpp
+++ b/src/d/actor/d_a_npc_tkc.cpp
@@ -98,24 +98,20 @@ void daNpcTkc_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80B10A80-80B10A98 000020 0018+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam3 l_bckGetParamList[3] = {
     {-1, J3DFrameCtrl::EMode_LOOP},
     {BCK_TKC_F_TALK_A, J3DFrameCtrl::EMode_NONE},
     {BCK_TKC_FLY, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B10A98-80B10AA0 000038 0008+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam3 l_btpGetParamList[1] = {
     {BTP_TKC, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B10AA0-80B10AA8 000040 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam3 l_btkGetParamList[1] = {
     {BTK_TKC, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B10AA8-80B10AB8 -00001 0010+00 0/1 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[4] = {
     "",
     "TKS_SECRET",
@@ -123,16 +119,12 @@ static char* l_evtNames[4] = {
     "TKC_WARP",
 };
 
-/* 80B10AB8-80B10ABC -00001 0004+00 8/9 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Tkc";
 
-/* 80B10ABC-80B10AC0 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Tkc";
 
-/* 80B10CFC-80B10D00 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_TKC_HIO_CLASS l_HIO;
 
-/* 80B10AE4-80B10B14 000084 0030+00 0/2 0/0 0/0 .data            mEvtSeqList__10daNpcTkc_c */
 daNpcTkc_c::evtFunc daNpcTkc_c::mEvtSeqList[4] = {
     NULL,
     &daNpcTkc_c::EvCut_TksSecretChild,
@@ -140,10 +132,8 @@ daNpcTkc_c::evtFunc daNpcTkc_c::mEvtSeqList[4] = {
     &daNpcTkc_c::EvCut_TksWarpBack,
 };
 
-/* 80B0C7CC-80B0C898 0000EC 00CC+00 1/1 0/0 0/0 .text            __ct__10daNpcTkc_cFv */
 daNpcTkc_c::daNpcTkc_c() {}
 
-/* 80B0C964-80B0CA9C 000284 0138+00 1/0 0/0 0/0 .text            __dt__10daNpcTkc_cFv */
 daNpcTkc_c::~daNpcTkc_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 
@@ -158,7 +148,6 @@ daNpcTkc_c::~daNpcTkc_c() {
     #endif
 }
 
-/* 80B108B4-80B10958 000000 00A4+00 13/13 0/0 0/0 .rodata          m__16daNpcTkc_Param_c */
 daNpcTkc_HIOParam const daNpcTkc_Param_c::m = {
     10.0f,
     0.0f,
@@ -211,7 +200,6 @@ daNpcTkc_HIOParam const daNpcTkc_Param_c::m = {
     0,
 };
 
-/* 80B0CA9C-80B0CD7C 0003BC 02E0+00 1/1 0/0 0/0 .text            Create__10daNpcTkc_cFv */
 cPhs__Step daNpcTkc_c::Create() {
     fopAcM_ct(this, daNpcTkc_c);
 
@@ -275,7 +263,6 @@ cPhs__Step daNpcTkc_c::Create() {
     return phase;
 }
 
-/* 80B0CD7C-80B0CFC4 00069C 0248+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcTkc_cFv */
 int daNpcTkc_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_TKC);
     JUT_ASSERT(330, NULL != mdlData_p);
@@ -309,14 +296,12 @@ int daNpcTkc_c::CreateHeap() {
     return 1;
 }
 
-/* 80B0D180-80B0D1B4 000AA0 0034+00 1/1 0/0 0/0 .text            Delete__10daNpcTkc_cFv */
 int daNpcTkc_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daNpcTkc_c();
     return 1;
 }
 
-/* 80B0D1B4-80B0D1EC 000AD4 0038+00 2/2 0/0 0/0 .text            Execute__10daNpcTkc_cFv */
 int daNpcTkc_c::Execute() {
     if (mStatus == 0) {
         return 1;
@@ -326,7 +311,6 @@ int daNpcTkc_c::Execute() {
     return 1;
 }
 
-/* 80B0D1EC-80B0D25C 000B0C 0070+00 1/1 0/0 0/0 .text            Draw__10daNpcTkc_cFv */
 int daNpcTkc_c::Draw() {
     if (mStatus == 0) {
         return 1;
@@ -338,7 +322,6 @@ int daNpcTkc_c::Draw() {
     return 1;
 }
 
-/* 80B0D25C-80B0D2CC 000B7C 0070+00 1/1 0/0 0/0 .text            ctrlJoint__10daNpcTkc_cFP8J3DJointP8J3DModel */
 int daNpcTkc_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     u16 jointNo = jointNo;
@@ -351,13 +334,11 @@ int daNpcTkc_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B0D2CC-80B0D2EC 000BEC 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__10daNpcTkc_cFP10fopAc_ac_c */
 int daNpcTkc_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpcTkc_c* actor = (daNpcTkc_c*)i_this;
     return actor->CreateHeap();
 }
 
-/* 80B0D2EC-80B0D338 000C0C 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__10daNpcTkc_cFP8J3DJointi */
 int daNpcTkc_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -370,17 +351,14 @@ int daNpcTkc_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B0D338-80B0D37C 000C58 0044+00 0/0 0/0 1/1 .text            setActionWait__10daNpcTkc_cFv */
 void daNpcTkc_c::setActionWait() {
     setAction(&daNpcTkc_c::wait);
 }
 
-/* 80B0D37C-80B0D3C0 000C9C 0044+00 0/0 0/0 2/2 .text            setActionFollow__10daNpcTkc_cFv */
 void daNpcTkc_c::setActionFollow() {
     setAction(&daNpcTkc_c::follow);
 }
 
-/* 80B0D3C0-80B0D458 000CE0 0098+00 1/0 0/0 0/0 .text            setMtx__10daNpcTkc_cFv */
 void daNpcTkc_c::setMtx() {
     J3DModel* mdl_p = mAnm_p->getModel();
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mCurrentPosYOffset, current.pos.z);
@@ -395,7 +373,6 @@ void daNpcTkc_c::setMtx() {
     mAnm_p->modelCalc();
 }
 
-/* 80B0D458-80B0D5A4 000D78 014C+00 1/0 0/0 0/0 .text            setExpressionAnm__10daNpcTkc_cFib */
 bool daNpcTkc_c::setExpressionAnm(int i_idx, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -439,7 +416,6 @@ bool daNpcTkc_c::setExpressionAnm(int i_idx, bool i_modify) {
 
 }
 
-/* 80B0D5A4-80B0D678 000EC4 00D4+00 1/0 0/0 0/0 .text            setExpressionBtp__10daNpcTkc_cFi */
 bool daNpcTkc_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* anm = getTexPtrnAnmP(l_arcName, l_btpGetParamList[i_idx].fileIdx);
     int i_attr = l_btpGetParamList[i_idx].attr;
@@ -469,7 +445,6 @@ bool daNpcTkc_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80B0FAD0-80B0FD18 0033F0 0248+00 1/0 0/0 0/0 .text            main__10daNpcTkc_cFv */
 inline BOOL daNpcTkc_c::main() {
     if (mAction) {
         (this->*mAction)();
@@ -493,7 +468,6 @@ inline BOOL daNpcTkc_c::main() {
     return FALSE;
 }
 
-/* 80B0FD18-80B0FDE4 003638 00CC+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpcTkc_cFv */
 inline BOOL daNpcTkc_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btkAnm = NULL;
@@ -544,7 +518,6 @@ inline void daNpcTkc_c::lookat() {
     cLib_addCalcAngleS2(&mCurAngle.y, target, 5, 0x400);
 }
 
-/* 80B0FDE4-80B0FFD4 003704 01F0+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcTkc_cFv */
 inline void daNpcTkc_c::setAttnPos() {
     setMtx();
     lookat();
@@ -571,12 +544,10 @@ inline void daNpcTkc_c::setAttnPos() {
     }
 }
 
-/* 80B0FFD4-80B0FFDC 0038F4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcTkc_cFv */
 inline int daNpcTkc_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B0D678-80B0DA94 000F98 041C+00 1/1 0/0 0/0 .text            reset__10daNpcTkc_cFv */
 void daNpcTkc_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -664,7 +635,6 @@ void daNpcTkc_c::reset() {
     }
 }
 
-/* 80B0FA5C-80B0FAD0 00337C 0074+00 1/0 0/0 0/0 .text            setParam__10daNpcTkc_cFv */
 inline void daNpcTkc_c::setParam() {
     if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
         cXyz* pos_p = &fopAcM_GetPosition(fopAcM_SearchByID(parentActorID));
@@ -716,7 +686,6 @@ inline void daNpcTkc_c::playMotion() {
     }
 }
 
-/* 80B0DA94-80B0DBC8 0013B4 0134+00 1/0 0/0 0/0 .text            setMotionAnm__10daNpcTkc_cFif */
 void daNpcTkc_c::setMotionAnm(int i_idx, f32 i_morf) {
     if (i_idx < 2 || i_idx >= 3) {
         return;
@@ -743,7 +712,6 @@ void daNpcTkc_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80B0DBC8-80B0DC68 0014E8 00A0+00 3/3 0/0 0/0 .text            setAction__10daNpcTkc_cFM10daNpcTkc_cFPCvPv_v */
 inline BOOL daNpcTkc_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -761,7 +729,6 @@ inline BOOL daNpcTkc_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80B0DC68-80B0DEF8 001588 0290+00 4/0 0/0 0/0 .text            wait__10daNpcTkc_cFv */
 void daNpcTkc_c::wait() {
     switch (mMode) {
         case 0:
@@ -812,7 +779,6 @@ void daNpcTkc_c::wait() {
     }
 }
 
-/* 80B0DEF8-80B0E124 001818 022C+00 4/4 0/0 0/0 .text            calcFly__10daNpcTkc_cFv */
 void daNpcTkc_c::calcFly() {
     mCurrentPosYOffset = mpHIO->m.amplitude * cM_ssin(field_0xd78);
     field_0xd78 += (int)mpHIO->m.interval;
@@ -867,7 +833,6 @@ inline BOOL daNpcTkc_c::checkFindPlayer() {
     return playerInArea;
 }
 
-/* 80B0E124-80B0E304 001A44 01E0+00 2/2 0/0 0/0 .text            searchPlayer__10daNpcTkc_cFv */
 BOOL daNpcTkc_c::searchPlayer() {
     if (mActorMngr[0].getActorP() != NULL) {
         if (!checkFindPlayer()) {
@@ -886,7 +851,6 @@ BOOL daNpcTkc_c::searchPlayer() {
     return FALSE;
 }
 
-/* 80B0E304-80B0E784 001C24 0480+00 2/0 0/0 0/0 .text            follow__10daNpcTkc_cFv */
 void daNpcTkc_c::follow() {
     switch (mMode) {
         case 0:
@@ -945,7 +909,6 @@ void daNpcTkc_c::follow() {
     }
 }
 
-/* 80B0E784-80B0E8EC 0020A4 0168+00 2/0 0/0 0/0 .text            appear__10daNpcTkc_cFv */
 void daNpcTkc_c::appear() {
     switch (mMode) {
         case 0:
@@ -981,7 +944,6 @@ inline void daNpcTkc_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80B0E8EC-80B0EB10 00220C 0224+00 1/0 0/0 0/0 .text            normalTalk__10daNpcTkc_cFv */
 void daNpcTkc_c::normalTalk() {
     switch (mMode) {
         case 0:
@@ -1025,7 +987,6 @@ void daNpcTkc_c::normalTalk() {
     }
 }
 
-/* 80B0EB10-80B0EB54 002430 0044+00 1/0 0/0 0/0 .text            setMotion__10daNpcTkc_cFifi */
 void daNpcTkc_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 2) {
@@ -1036,7 +997,6 @@ void daNpcTkc_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80B0EB54-80B0EB80 002474 002C+00 1/0 0/0 0/0 .text            setExpression__10daNpcTkc_cFif */
 void daNpcTkc_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 2) {
         mExpression = i_expression;
@@ -1046,7 +1006,6 @@ void daNpcTkc_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80B0EB80-80B0EEE8 0024A0 0368+00 1/0 0/0 0/0 .text            warpTalk__10daNpcTkc_cFv */
 void daNpcTkc_c::warpTalk() {
     switch (mMode) {
         case 0: {
@@ -1114,7 +1073,6 @@ void daNpcTkc_c::warpTalk() {
     }
 }
 
-/* 80B0EEE8-80B0F00C 002808 0124+00 4/0 0/0 0/0 .text            demo__10daNpcTkc_cFv */
 void daNpcTkc_c::demo() {
     switch (mMode) {
         case 0:
@@ -1149,7 +1107,6 @@ void daNpcTkc_c::demo() {
     }
 }
 
-/* 80B0F00C-80B0F1F8 00292C 01EC+00 1/0 0/0 0/0 .text EvCut_TksSecretChild__10daNpcTkc_cFi */
 int daNpcTkc_c::EvCut_TksSecretChild(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm");
@@ -1204,7 +1161,6 @@ int daNpcTkc_c::EvCut_TksSecretChild(int i_staffId) {
     return 0;
 }
 
-/* 80B0F1F8-80B0F5D4 002B18 03DC+00 1/0 0/0 0/0 .text            EvCut_TksWarpExit__10daNpcTkc_cFi */
 int daNpcTkc_c::EvCut_TksWarpExit(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm");
@@ -1306,7 +1262,6 @@ int daNpcTkc_c::EvCut_TksWarpExit(int i_staffId) {
     return 0;
 }
 
-/* 80B0F5D4-80B0F9A4 002EF4 03D0+00 1/0 0/0 0/0 .text            EvCut_TksWarpBack__10daNpcTkc_cFi */
 int daNpcTkc_c::EvCut_TksWarpBack(int i_staffId) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* prm = dComIfGp_evmng_getMyIntegerP(i_staffId, "prm");
@@ -1404,32 +1359,26 @@ int daNpcTkc_c::EvCut_TksWarpBack(int i_staffId) {
     return 0;
 }
 
-/* 80B0F9A4-80B0F9C4 0032C4 0020+00 1/0 0/0 0/0 .text            daNpcTkc_Create__FPv */
 static int daNpcTkc_Create(void* i_this) {
     return static_cast<daNpcTkc_c*>(i_this)->Create();
 }
 
-/* 80B0F9C4-80B0F9E4 0032E4 0020+00 1/0 0/0 0/0 .text            daNpcTkc_Delete__FPv */
 static int daNpcTkc_Delete(void* i_this) {
     return static_cast<daNpcTkc_c*>(i_this)->Delete();
 }
 
-/* 80B0F9E4-80B0FA04 003304 0020+00 1/0 0/0 0/0 .text            daNpcTkc_Execute__FPv */
 static int daNpcTkc_Execute(void* i_this) {
     return static_cast<daNpcTkc_c*>(i_this)->Execute();
 }
 
-/* 80B0FA04-80B0FA24 003324 0020+00 1/0 0/0 0/0 .text            daNpcTkc_Draw__FPv */
 static int daNpcTkc_Draw(void* i_this) {
     return static_cast<daNpcTkc_c*>(i_this)->Draw();
 }
 
-/* 80B0FA24-80B0FA2C 003344 0008+00 1/0 0/0 0/0 .text            daNpcTkc_IsDelete__FPv */
 static int daNpcTkc_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B10BBC-80B10BDC -00001 0020+00 1/0 0/0 0/0 .data            daNpcTkc_MethodTable */
 static actor_method_class daNpcTkc_MethodTable = {
     (process_method_func)daNpcTkc_Create,
     (process_method_func)daNpcTkc_Delete,
@@ -1438,7 +1387,6 @@ static actor_method_class daNpcTkc_MethodTable = {
     (process_method_func)daNpcTkc_Draw,
 };
 
-/* 80B10BDC-80B10C0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TKC */
 extern actor_process_profile_definition g_profile_NPC_TKC = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp
index 58e485b881..5ef139a2e9 100644
--- a/src/d/actor/d_a_npc_tkj.cpp
+++ b/src/d/actor/d_a_npc_tkj.cpp
@@ -8,47 +8,39 @@
 #include "d/actor/d_a_npc_tkj.h"
 #include "d/actor/d_a_npc4.h"
 
-/* 805766D4-805766DC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {12, 1},
 };
 
-/* 805766DC-805766EC -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"DEFAULT_GETITEM", 0},
 };
 
-/* 805766EC-805766F4 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Tkj",
 };
 
-/* 805766F4-805766F8 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[] = {
     1, -1,
 };
 
-/* 805766F8-80576700 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80576700-80576738 00004C 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 18, 2, 1, 1},
     {6, 0, 1, 18, 2, 1, 1},
 };
 
-/* 80576738-80576770 000084 0038+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[2] = {
     {9, 2, 1, 15, 0, 1, 0, 0},
     {8, 2, 1, 15, 0, 1, 0, 0},
 };
 
-/* 80576770-80576790 0000BC 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 0},
     {-1, 0, 0},
@@ -60,7 +52,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] =
     {-1, 0, 0},
 };
 
-/* 80576790-805767B0 0000DC 0020+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -72,19 +63,16 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = {
     {-1, 0, 0},
 };
 
-/* 805767B0-805767B8 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__10daNpcTkj_c */
 char* daNpcTkj_c::mCutNameList[2] = {
     "",
     "LV7_FIRST_START",
 };
 
-/* 805767C4-805767DC 000110 0018+00 2/2 0/0 0/0 .data            mCutList__10daNpcTkj_c */
 int (daNpcTkj_c::*daNpcTkj_c::mCutList[])(int) = {
     NULL,
     &daNpcTkj_c::cutLv7Start,
 };
 
-/* 8057372C-80573850 0000EC 0124+00 1/0 0/0 0/0 .text            __dt__10daNpcTkj_cFv */
 daNpcTkj_c::~daNpcTkj_c() {
     OS_REPORT("|%06d:%x|daNpcTkj_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -95,7 +83,6 @@ daNpcTkj_c::~daNpcTkj_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80576598-80576624 000000 008C+00 9/9 0/0 0/0 .rodata          m__17daNpc_Tkj_Param_c */
 const daNpc_Tkj_HIOParam daNpc_Tkj_Param_c::m = {
     120.0f,
     -3.0f,
@@ -140,7 +127,6 @@ const daNpc_Tkj_HIOParam daNpc_Tkj_Param_c::m = {
     110.0f,
 };
 
-/* 80573850-80573B18 000210 02C8+00 1/1 0/0 0/0 .text            create__10daNpcTkj_cFv */
 int daNpcTkj_c::create() {
     daNpcT_ct(this, daNpcTkj_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -197,7 +183,6 @@ int daNpcTkj_c::create() {
     return phase_state;
 }
 
-/* 80573B18-80573DAC 0004D8 0294+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcTkj_cFv */
 int daNpcTkj_c::CreateHeap() {
     enum { IDX0 };
     int temp_r23 = mTwilight == TRUE ? IDX0 : IDX0;  // needs enum to match
@@ -237,7 +222,6 @@ int daNpcTkj_c::CreateHeap() {
     return 0;
 }
 
-/* 80573F68-80573F9C 000928 0034+00 1/1 0/0 0/0 .text            Delete__10daNpcTkj_cFv */
 int daNpcTkj_c::Delete() {
     OS_REPORT("|%06d:%x|daNpcTkj_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -245,12 +229,10 @@ int daNpcTkj_c::Delete() {
     return 1;
 }
 
-/* 80573F9C-80573FBC 00095C 0020+00 2/2 0/0 0/0 .text            Execute__10daNpcTkj_cFv */
 int daNpcTkj_c::Execute() {
     return execute();
 }
 
-/* 80573FBC-80574058 00097C 009C+00 1/1 0/0 0/0 .text            Draw__10daNpcTkj_cFv */
 int daNpcTkj_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -260,14 +242,10 @@ int daNpcTkj_c::Draw() {
     draw(FALSE, 0, daNpc_Tkj_Param_c::m.common.real_shadow_size, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80574058-80574078 000A18 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daNpcTkj_cFP10fopAc_ac_c               */
 int daNpcTkj_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daNpcTkj_c*)i_this)->CreateHeap();
 }
 
-/* 80574078-805740D0 000A38 0058+00 2/2 0/0 0/0 .text ctrlJointCallBack__10daNpcTkj_cFP8J3DJointi
- */
 int daNpcTkj_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -280,7 +258,6 @@ int daNpcTkj_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 805740D0-80574108 000A90 0038+00 1/1 0/0 0/0 .text            getType__10daNpcTkj_cFv */
 int daNpcTkj_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -292,13 +269,11 @@ int daNpcTkj_c::getType() {
     }
 }
 
-/* 80574108-80574124 000AC8 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__10daNpcTkj_cFv */
 int daNpcTkj_c::getFlowNodeNo() {
     u16 prm = home.angle.x;
     return prm == 0xFFFF ? -1 : prm;
 }
 
-/* 80574124-8057413C 000AE4 0018+00 1/1 0/0 0/0 .text            isDelete__10daNpcTkj_cFv */
 int daNpcTkj_c::isDelete() {
     if (mType < 2) {
         return 0;
@@ -307,7 +282,6 @@ int daNpcTkj_c::isDelete() {
     return 1;
 }
 
-/* 8057413C-80574268 000AFC 012C+00 1/1 0/0 0/0 .text            reset__10daNpcTkj_cFv */
 void daNpcTkj_c::reset() {
     initialize();
     memset(&field_0xf84, 0, (uintptr_t)&field_0xf9c - (uintptr_t)&field_0xf84);
@@ -320,14 +294,11 @@ void daNpcTkj_c::reset() {
     mItemNo = -1;
 }
 
-/* 80574268-805742C8 000C28 0060+00 1/0 0/0 0/0 .text            setAfterTalkMotion__10daNpcTkj_cFv
- */
 void daNpcTkj_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
 }
 
-/* 805742C8-805742D4 000C88 000C+00 1/1 0/0 0/0 .text            srchActors__10daNpcTkj_cFv */
 void daNpcTkj_c::srchActors() {
     switch (mType) {
     case 0:
@@ -336,7 +307,6 @@ void daNpcTkj_c::srchActors() {
     }
 }
 
-/* 805742D4-805743B8 000C94 00E4+00 1/0 0/0 0/0 .text            evtTalk__10daNpcTkj_cFv */
 BOOL daNpcTkj_c::evtTalk() {
     if (chkAction(&daNpcTkj_c::talk)) {
         (this->*mAction)(NULL);
@@ -347,7 +317,6 @@ BOOL daNpcTkj_c::evtTalk() {
     return 1;
 }
 
-/* 805743B8-8057449C 000D78 00E4+00 1/0 0/0 0/0 .text            evtCutProc__10daNpcTkj_cFv */
 BOOL daNpcTkj_c::evtCutProc() {
     BOOL rt = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("Tkj", this, -1);
@@ -372,7 +341,6 @@ BOOL daNpcTkj_c::evtCutProc() {
     return rt;
 }
 
-/* 8057449C-80574524 000E5C 0088+00 1/0 0/0 0/0 .text            action__10daNpcTkj_cFv */
 void daNpcTkj_c::action() {
     if (field_0xf84 != NULL) {
         if (mAction == field_0xf84) {
@@ -383,7 +351,6 @@ void daNpcTkj_c::action() {
     }
 }
 
-/* 80574524-80574770 000EE4 024C+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcTkj_cFv */
 void daNpcTkj_c::setAttnPos() {
     cXyz sp28(0.0f, -30.0f, 0.0f);
 
@@ -413,7 +380,6 @@ void daNpcTkj_c::setAttnPos() {
     attention_info.position.y += daNpc_Tkj_Param_c::m.common.attention_offset;
 }
 
-/* 80574770-80574850 001130 00E0+00 1/0 0/0 0/0 .text            setCollision__10daNpcTkj_cFv */
 void daNpcTkj_c::setCollision() {
     cXyz pos;
     if (!mHide) {
@@ -433,12 +399,10 @@ void daNpcTkj_c::setCollision() {
     mCcCyl.ClrTgHit();
 }
 
-/* 80574850-80574858 001210 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcTkj_cFv */
 int daNpcTkj_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80574858-805748A8 001218 0050+00 1/1 0/0 0/0 .text            selectAction__10daNpcTkj_cFv */
 int daNpcTkj_c::selectAction() {
     field_0xf84 = NULL;
 
@@ -452,14 +416,10 @@ int daNpcTkj_c::selectAction() {
     return 1;
 }
 
-/* 805748A8-805748D4 001268 002C+00 1/1 0/0 0/0 .text
- * chkAction__10daNpcTkj_cFM10daNpcTkj_cFPCvPvPv_i              */
 BOOL daNpcTkj_c::chkAction(int (daNpcTkj_c::*i_action)(void*)) {
     return mAction == i_action;
 }
 
-/* 805748D4-8057497C 001294 00A8+00 2/2 0/0 0/0 .text
- * setAction__10daNpcTkj_cFM10daNpcTkj_cFPCvPvPv_i              */
 int daNpcTkj_c::setAction(int (daNpcTkj_c::*i_action)(void*)) {
     mMode = 3;
     if (mAction != NULL) {
@@ -475,7 +435,6 @@ int daNpcTkj_c::setAction(int (daNpcTkj_c::*i_action)(void*)) {
     return 1;
 }
 
-/* 8057497C-80574B30 00133C 01B4+00 1/0 0/0 0/0 .text            wait__10daNpcTkj_cFPv */
 int daNpcTkj_c::wait(void*) {
     switch (mMode) {
     case 0:
@@ -504,7 +463,6 @@ int daNpcTkj_c::wait(void*) {
     return 1;
 }
 
-/* 80574B30-80574D28 0014F0 01F8+00 2/0 0/0 0/0 .text            talk__10daNpcTkj_cFPv */
 int daNpcTkj_c::talk(void*) {
     BOOL var_r29 = FALSE;
 
@@ -554,7 +512,6 @@ int daNpcTkj_c::talk(void*) {
     return 0;
 }
 
-/* 80574D28-80575180 0016E8 0458+00 1/0 0/0 0/0 .text            cutLv7Start__10daNpcTkj_cFi */
 int daNpcTkj_c::cutLv7Start(int i_staffId) {
     dEvent_manager_c* evtmng_p = &dComIfGp_getEventManager();
 
@@ -636,32 +593,26 @@ int daNpcTkj_c::cutLv7Start(int i_staffId) {
     return rt;
 }
 
-/* 80575180-805751A0 001B40 0020+00 1/0 0/0 0/0 .text            daNpc_Tkj_Create__FPv */
 static int daNpc_Tkj_Create(void* i_this) {
     return ((daNpcTkj_c*)i_this)->create();
 }
 
-/* 805751A0-805751C0 001B60 0020+00 1/0 0/0 0/0 .text            daNpc_Tkj_Delete__FPv */
 static int daNpc_Tkj_Delete(void* i_this) {
     return ((daNpcTkj_c*)i_this)->Delete();
 }
 
-/* 805751C0-805751E0 001B80 0020+00 1/0 0/0 0/0 .text            daNpc_Tkj_Execute__FPv */
 static int daNpc_Tkj_Execute(void* i_this) {
     return ((daNpcTkj_c*)i_this)->Execute();
 }
 
-/* 805751E0-80575200 001BA0 0020+00 1/0 0/0 0/0 .text            daNpc_Tkj_Draw__FPv */
 static int daNpc_Tkj_Draw(void* i_this) {
     return ((daNpcTkj_c*)i_this)->Draw();
 }
 
-/* 80575200-80575208 001BC0 0008+00 1/0 0/0 0/0 .text            daNpc_Tkj_IsDelete__FPv */
 static int daNpc_Tkj_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80575280-8057538C 001C40 010C+00 1/0 0/0 0/0 .text            setParam__10daNpcTkj_cFv */
 void daNpcTkj_c::setParam() {
     u32 attn_flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
     selectAction();
@@ -697,17 +648,14 @@ void daNpcTkj_c::setParam() {
     mMorfFrames = daNpc_Tkj_Param_c::m.common.morf_frame;
 }
 
-/* 8057538C-80575404 001D4C 0078+00 1/0 0/0 0/0 .text            beforeMove__10daNpcTkj_cFv */
 void daNpcTkj_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 805769D4-805769D8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Tkj_Param_c l_HIO;
 
-/* 80576800-80576820 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Tkj_MethodTable */
 static actor_method_class daNpc_Tkj_MethodTable = {
     (process_method_func)daNpc_Tkj_Create,
     (process_method_func)daNpc_Tkj_Delete,
@@ -716,7 +664,6 @@ static actor_method_class daNpc_Tkj_MethodTable = {
     (process_method_func)daNpc_Tkj_Draw,
 };
 
-/* 80576820-80576850 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TKJ */
 extern actor_process_profile_definition g_profile_NPC_TKJ = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp
index 3909b8c4e6..1821b6a827 100644
--- a/src/d/actor/d_a_npc_tkj2.cpp
+++ b/src/d/actor/d_a_npc_tkj2.cpp
@@ -60,7 +60,6 @@ enum Action {
     /* 0x6 */ ACTION_DROP_2 = 0x6,
 };
 
-/* 80B10DEC-80B10E20 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__16daNpc_Tkj2_HIO_cFv */
 daNpc_Tkj2_HIO_c::daNpc_Tkj2_HIO_c() {
     field_0x4 = -1;
     basic_size = 1.0f;
@@ -68,13 +67,11 @@ daNpc_Tkj2_HIO_c::daNpc_Tkj2_HIO_c() {
     boots_struggle_sp = 2.0f;
 }
 
-/* 80B10E20-80B10ECC 000120 00AC+00 6/6 0/0 0/0 .text            anm_init__FP14npc_tkj2_classifUcf */
 static void anm_init(npc_tkj2_class* i_this, int i_index, f32 i_morf, u8 i_attr, f32 i_rate) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Tkj2", i_index), i_attr, i_morf, i_rate, 0.0f, -1.0f);
     i_this->field_0x5f4 = i_index;
 }
 
-/* 80B10ECC-80B1101C 0001CC 0150+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -101,7 +98,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B1101C-80B11130 00031C 0114+00 1/0 0/0 0/0 .text            daNpc_Tkj2_Draw__FP14npc_tkj2_class */
 static int daNpc_Tkj2_Draw(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     J3DModel* model = i_this->mpModelMorf->getModel();
@@ -123,7 +119,6 @@ static int daNpc_Tkj2_Draw(npc_tkj2_class* i_this) {
     return 1;
 }
 
-/* 80B11130-80B1119C 000430 006C+00 1/1 0/0 0/0 .text npc_tkj2_carry_check__FP14npc_tkj2_class */
 static void npc_tkj2_carry_check(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -138,7 +133,6 @@ static void npc_tkj2_carry_check(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B1119C-80B111F4 00049C 0058+00 1/1 0/0 0/0 .text mode_init_boomCarry__FP14npc_tkj2_class */
 static void mode_init_boomCarry(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -148,7 +142,6 @@ static void mode_init_boomCarry(npc_tkj2_class* i_this) {
     i_this->field_0x5f2 = 1;
 }
 
-/* 80B111F4-80B1142C 0004F4 0238+00 1/1 0/0 0/0 .text            Wind_effect__FP14npc_tkj2_class */
 static void Wind_effect(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -204,7 +197,6 @@ static void Wind_effect(npc_tkj2_class* i_this) {
     a_this->current.pos += i_this->field_0x5fc;
 }
 
-/* 80B1142C-80B1169C 00072C 0270+00 1/1 0/0 0/0 .text            CheckRoof__FP14npc_tkj2_class */
 static void CheckRoof(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz end;
@@ -233,7 +225,6 @@ static void CheckRoof(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B116E4-80B11AB0 0009E4 03CC+00 1/1 0/0 0/0 .text            CheckWall__FP14npc_tkj2_classs */
 static bool CheckWall(npc_tkj2_class* i_this, s16 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp1b0(0.0f, -100.0f, a_this->speedF);
@@ -280,7 +271,6 @@ static bool CheckWall(npc_tkj2_class* i_this, s16 param_2) {
     return false;
 }
 
-/* 80B11AB0-80B11BD0 000DB0 0120+00 3/3 0/0 0/0 .text            GndCheck2__FP14npc_tkj2_class */
 static bool GndCheck2(npc_tkj2_class* i_this) {
     dBgS_ObjGndChk obj_gnd_chk;
     cXyz sp78(i_this->field_0x5b8.x, i_this->field_0x5b8.y + 100.0f, i_this->field_0x5b8.z);
@@ -294,7 +284,6 @@ static bool GndCheck2(npc_tkj2_class* i_this) {
     return false;
 }
 
-/* 80B11C48-80B11CCC 000F48 0084+00 2/2 0/0 0/0 .text            GndCheck__FP14npc_tkj2_class4cXyz */
 static bool GndCheck(npc_tkj2_class* i_this, cXyz param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp14;
@@ -310,7 +299,6 @@ static bool GndCheck(npc_tkj2_class* i_this, cXyz param_2) {
     return false;
 }
 
-/* 80B11CCC-80B120DC 000FCC 0410+00 1/1 0/0 0/0 .text            npc_tkj2_normal__FP14npc_tkj2_class */
 static void npc_tkj2_normal(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp38, sp44;
@@ -402,7 +390,6 @@ static void npc_tkj2_normal(npc_tkj2_class* i_this) {
     cLib_addCalc2(&a_this->speedF, fVar1, 1.0f, 5.0f);
 }
 
-/* 80B120DC-80B122AC 0013DC 01D0+00 1/1 0/0 0/0 .text            return_pos_get__FP14npc_tkj2_class */
 static cXyz return_pos_get(npc_tkj2_class* i_this) {
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
     dBgS_GndChk gnd_chk;
@@ -433,13 +420,10 @@ static cXyz return_pos_get(npc_tkj2_class* i_this) {
     return player->current.pos;
 }
 
-/* 80B14500-80B14504 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80B14510-80B14524 000018 0014+00 4/4 0/0 0/0 .bss             l_HIO */
 static daNpc_Tkj2_HIO_c l_HIO;
 
-/* 80B122AC-80B125D0 0015AC 0324+00 1/1 0/0 0/0 .text            npc_tkj2_carry__FP14npc_tkj2_class */
 static s8 npc_tkj2_carry(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp30, sp3c, sp48;
@@ -515,7 +499,6 @@ static s8 npc_tkj2_carry(npc_tkj2_class* i_this) {
     return rv;
 }
 
-/* 80B125D0-80B12750 0018D0 0180+00 1/1 0/0 0/0 .text            npc_tkj2_fly__FP14npc_tkj2_class */
 static void npc_tkj2_fly(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -563,7 +546,6 @@ static void npc_tkj2_fly(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B12750-80B12810 001A50 00C0+00 1/1 0/0 0/0 .text            npc_tkj2_drop__FP14npc_tkj2_class */
 static void npc_tkj2_drop(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -587,7 +569,6 @@ static void npc_tkj2_drop(npc_tkj2_class* i_this) {
     
     cLib_addCalc2(&a_this->speedF, 20.0f, 0.5f, 10.0f);
 }
-/* 80B12810-80B12D20 001B10 0510+00 1/1 0/0 0/0 .text            npc_tkj2_return__FP14npc_tkj2_class */
 static void npc_tkj2_return(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -660,7 +641,6 @@ static void npc_tkj2_return(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B12D20-80B12E88 002020 0168+00 1/1 0/0 0/0 .text            ObjHit__FP14npc_tkj2_class */
 static void ObjHit(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     
@@ -695,7 +675,6 @@ static void ObjHit(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B12E88-80B1376C 002188 08E4+00 2/1 0/0 0/0 .text            action__FP14npc_tkj2_class */
 static void action(npc_tkj2_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
@@ -977,7 +956,6 @@ static void action(npc_tkj2_class* i_this) {
     }
 }
 
-/* 80B1376C-80B13B38 002A6C 03CC+00 2/1 0/0 0/0 .text daNpc_Tkj2_Execute__FP14npc_tkj2_class */
 static int daNpc_Tkj2_Execute(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp28(0.0f, 0.0f, 0.0f);
@@ -1041,12 +1019,10 @@ static int daNpc_Tkj2_Execute(npc_tkj2_class* i_this) {
     return 1;
 }
 
-/* 80B13B38-80B13B40 002E38 0008+00 1/0 0/0 0/0 .text daNpc_Tkj2_IsDelete__FP14npc_tkj2_class */
 static int daNpc_Tkj2_IsDelete(npc_tkj2_class* i_this) {
     return 1;
 }
 
-/* 80B13B40-80B13BA8 002E40 0068+00 1/0 0/0 0/0 .text daNpc_Tkj2_Delete__FP14npc_tkj2_class */
 static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -1063,7 +1039,6 @@ static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) {
     return 1;
 }
 
-/* 80B13BA8-80B13E20 002EA8 0278+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     npc_tkj2_class* i_this = (npc_tkj2_class*)a_this;
 
@@ -1101,7 +1076,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80B13E68-80B1411C 003168 02B4+00 1/0 0/0 0/0 .text            daNpc_Tkj2_Create__FP10fopAc_ac_c */
 static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, npc_tkj2_class);
     npc_tkj2_class* i_this = (npc_tkj2_class*)a_this;
@@ -1174,7 +1148,6 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80B14414-80B14434 -00001 0020+00 1/0 0/0 0/0 .data            l_daNpc_Tkj2_Method */
 static actor_method_class l_daNpc_Tkj2_Method = {
     (process_method_func)daNpc_Tkj2_Create,
     (process_method_func)daNpc_Tkj2_Delete,
@@ -1183,7 +1156,6 @@ static actor_method_class l_daNpc_Tkj2_Method = {
     (process_method_func)daNpc_Tkj2_Draw,
 };
 
-/* 80B14434-80B14464 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TKJ2 */
 extern actor_process_profile_definition g_profile_NPC_TKJ2 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp
index 63f8e8e381..9ce3e37e5a 100644
--- a/src/d/actor/d_a_npc_tks.cpp
+++ b/src/d/actor/d_a_npc_tks.cpp
@@ -133,10 +133,8 @@ enum RES_Name {
     /* 0x2 */ K_TUBO02,
 };
 
-/* 80B1E554-80B1E558 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpcTks_Param_c l_HIO;
 
-/* 80B1E104-80B1E1B4 000020 00B0+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam3 l_bckGetParamList[22] = {
     {-1, J3DFrameCtrl::EMode_LOOP},
     {BCK_TKS_F_TALK_A, J3DFrameCtrl::EMode_NONE},
@@ -162,61 +160,49 @@ static daNpc_GetParam3 l_bckGetParamList[22] = {
     {BCK_TKS_SWIM, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B1E1B4-80B1E1BC 0000D0 0008+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam3 l_btpGetParamList[1] = {
     {BTP_TKS, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B1E1BC-80B1E1C4 0000D8 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam3 l_btkGetParamList[1] = {
     {BTK_TKS, J3DFrameCtrl::EMode_LOOP},
 };
 
-/* 80B1E1C4-80B1E1D0 0000E0 000C+00 1/0 0/0 0/0 .data            l_loadRes_TKS0 */
 static int l_loadRes_TKS0[3] = {
     TKS, J_TUBO_00, -1,
 };
 
-/* 80B1E1D0-80B1E1DC 0000EC 000C+00 1/0 0/0 0/0 .data            l_loadRes_TKS1 */
 static int l_loadRes_TKS1[3] = {
     TKS, K_TUBO02, -1,
 };
 
-/* 80B1E1DC-80B1E1E8 0000F8 000C+00 1/0 0/0 0/0 .data            l_loadRes_TKS2 */
 static int l_loadRes_TKS2[3] = {
     TKS, -1, -1,
 };
 
-/* 80B1E1E8-80B1E1F4 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_TKS0,
     l_loadRes_TKS1,
     l_loadRes_TKS2,
 };
 
-/* 80B1E1F4-80B1E200 -00001 000C+00 3/3 0/0 0/0 .data            l_arcNames */
 static char* l_arcNames[3] = {
     "TKS",
     "J_tubo_00",
     "K_tubo02",
 };
 
-/* 80B1E200-80B1E208 -00001 0008+00 0/0 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "TKS_ENCOUNTER",
 };
 
-/* 80B1E208-80B1E20C -00001 0004+00 9/11 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "TKS";
 
-/* 80B1E20C-80B1E210 -00001 0004+00 8/9 0/0 0/0 .data            l_myName */
 static char* l_myName = "Tks";
 
-/* 80B1462C-80B14844 0000EC 0218+00 1/1 0/0 0/0 .text            __ct__10daNpcTks_cFv */
 daNpcTks_c::daNpcTks_c() {}
 
-/* 80B14844-80B14AF8 000304 02B4+00 1/0 0/0 0/0 .text            __dt__10daNpcTks_cFv */
 daNpcTks_c::~daNpcTks_c() {
     for (int i = 0; l_loadRes_list[mTksTsubo.mTsuboType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_arcNames[l_loadRes_list[mTksTsubo.mTsuboType][i]]);
@@ -231,7 +217,6 @@ daNpcTks_c::~daNpcTks_c() {
     }
 }
 
-/* 80B1DD58-80B1DDF0 000000 0098+00 25/25 0/0 0/0 .rodata          m__16daNpcTks_Param_c */
 daNpcTks_HIOParam const daNpcTks_Param_c::m = {
     90.0f,
     -3.0f,
@@ -279,7 +264,6 @@ daNpcTks_HIOParam const daNpcTks_Param_c::m = {
     5.0f,
 };
 
-/* 80B14AF8-80B14ED0 0005B8 03D8+00 1/1 0/0 0/0 .text            Create__10daNpcTks_cFv */
 cPhs__Step daNpcTks_c::Create() {
     fopAcM_ct(this, daNpcTks_c);
 
@@ -356,7 +340,6 @@ cPhs__Step daNpcTks_c::Create() {
     return phase;
 }
 
-/* 80B14ED0-80B1521C 000990 034C+00 1/1 0/0 0/0 .text            CreateHeap__10daNpcTks_cFv */
 int daNpcTks_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_TKS);
 
@@ -405,26 +388,22 @@ int daNpcTks_c::CreateHeap() {
     return 1;
 }
 
-/* 80B153D8-80B1540C 000E98 0034+00 1/1 0/0 0/0 .text            Delete__10daNpcTks_cFv */
 int daNpcTks_c::Delete() {
     this->~daNpcTks_c();
     return 1;
 }
 
-/* 80B1540C-80B15430 000ECC 0024+00 2/2 0/0 0/0 .text            Execute__10daNpcTks_cFv */
 int daNpcTks_c::Execute() {
     execute();
     return 1;
 }
 
-/* 80B15430-80B1548C 000EF0 005C+00 1/1 0/0 0/0 .text            Draw__10daNpcTks_cFv */
 int daNpcTks_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(2)->setMaterialAnm(mpMatAnm);
     draw(FALSE, FALSE, daNpcTks_Param_c::m.common.real_shadow_size, NULL, FALSE);
     return 1;
 }
 
-/* 80B1548C-80B15650 000F4C 01C4+00 1/1 0/0 0/0 .text            ctrlJoint__10daNpcTks_cFP8J3DJointP8J3DModel */
 int daNpcTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jntNo = i_joint->getJntNo();
     int i_jointList[3] = {JNT_NECK1, JNT_NECK2, JNT_HEAD};
@@ -460,12 +439,10 @@ int daNpcTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B15650-80B15670 001110 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__10daNpcTks_cFP10fopAc_ac_c */
 int daNpcTks_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpcTks_c*>(a_this)->CreateHeap();
 }
 
-/* 80B15670-80B156BC 001130 004C+00 2/2 0/0 0/0 .text            ctrlJointCallBack__10daNpcTks_cFP8J3DJointi */
 int daNpcTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -479,7 +456,6 @@ int daNpcTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B156BC-80B157C0 00117C 0104+00 1/0 0/0 0/0 .text            setMtx__10daNpcTks_cFv */
 void daNpcTks_c::setMtx() {
     J3DModel* model = mAnm_p->getModel();
 
@@ -510,7 +486,6 @@ void daNpcTks_c::setMtx() {
     mAnm_p->modelCalc();
 }
 
-/* 80B157C0-80B1590C 001280 014C+00 1/0 0/0 0/0 .text            setExpressionAnm__10daNpcTks_cFib */
 bool daNpcTks_c::setExpressionAnm(int i_index, bool i_modify) {
     mAnmFlags &= 0xFFFFE03F;
 
@@ -552,7 +527,6 @@ bool daNpcTks_c::setExpressionAnm(int i_index, bool i_modify) {
     return false;
 }
 
-/* 80B1590C-80B159E0 0013CC 00D4+00 1/0 0/0 0/0 .text            setExpressionBtp__10daNpcTks_cFi */
 bool daNpcTks_c::setExpressionBtp(int i_index) {
     J3DAnmTexPattern* i_btp = getTexPtrnAnmP(l_arcName, l_btpGetParamList[i_index].fileIdx);
     int i_attr = l_btpGetParamList[i_index].attr;
@@ -578,7 +552,6 @@ bool daNpcTks_c::setExpressionBtp(int i_index) {
     return false;
 }
 
-/* 80B159E0-80B15A24 0014A0 0044+00 1/0 0/0 0/0 .text            setMotion__10daNpcTks_cFifi */
 void daNpcTks_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     s16 motion = i_motion;
     if ((param_3 != 0 || mMotion != motion) && i_motion >= 0 && i_motion < 8) {
@@ -589,7 +562,6 @@ void daNpcTks_c::setMotion(int i_motion, f32 i_morf, int param_3) {
     }
 }
 
-/* 80B1C4F8-80B1CB4C 007FB8 0654+00 1/0 0/0 0/0 .text            main__10daNpcTks_cFv */
 BOOL daNpcTks_c::main() {
     if (field_0x138a && mTksTsubo.mCyl.ChkTgHit()) {
         if (mTksTsubo.mCyl.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
@@ -621,7 +593,6 @@ BOOL daNpcTks_c::main() {
     return TRUE;
 }
 
-/* 80B15A24-80B160A8 0014E4 0684+00 1/1 0/0 0/0 .text            reset__10daNpcTks_cFv */
 void daNpcTks_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -764,7 +735,6 @@ void daNpcTks_c::reset() {
     }
 }
 
-/* 80B160A8-80B16148 001B68 00A0+00 1/1 0/0 0/0 .text            setAction__10daNpcTks_cFM10daNpcTks_cFPCvPv_v */
 BOOL daNpcTks_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -851,7 +821,6 @@ void daNpcTks_c::playMotion() {
     }
 }
 
-/* 80B1CFD0-80B1D1FC 008A90 022C+00 1/1 0/0 0/0 .text            lookat__10daNpcTks_cFv */
 void daNpcTks_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -953,7 +922,6 @@ void daNpcTks_c::setLookMode(int i_lookMode, fopAc_ac_c* actor_p) {
     }
 }
 
-/* 80B16148-80B16344 001C08 01FC+00 3/0 0/0 0/0 .text            wait__10daNpcTks_cFv */
 void daNpcTks_c::wait() {
     switch (mMode) {
         case 0:
@@ -1001,7 +969,6 @@ void daNpcTks_c::setTsuboMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80B16344-80B16634 001E04 02F0+00 1/0 0/0 0/0 .text            setMotionAnm__10daNpcTks_cFif */
 void daNpcTks_c::setMotionAnm(int i_index, f32 i_morf) {
     if (i_index < 2 || i_index >= 0x16) {
         return;
@@ -1053,7 +1020,6 @@ void daNpcTks_c::setMotionAnm(int i_index, f32 i_morf) {
     }
 }
 
-/* 80B16634-80B1682C 0020F4 01F8+00 2/0 0/0 0/0 .text            waitNude__10daNpcTks_cFv */
 void daNpcTks_c::waitNude() {
     switch (mMode) {
         case 0:
@@ -1096,7 +1062,6 @@ void daNpcTks_c::waitNude() {
     }
 }
 
-/* 80B1682C-80B16B74 0022EC 0348+00 1/0 0/0 0/0 .text            waitLv6__10daNpcTks_cFv */
 void daNpcTks_c::waitLv6() {
     switch (mMode) {
         case 0:
@@ -1187,7 +1152,6 @@ BOOL daNpcTks_c::step(s16 i_turnTargetAngle, int param_2) {
     return mTurnMode > 1;
 };
 
-/* 80B16B74-80B16FDC 002634 0468+00 2/0 0/0 0/0 .text            talk__10daNpcTks_cFv */
 void daNpcTks_c::talk() {
     switch (mMode) {
         case 0:
@@ -1246,7 +1210,6 @@ void daNpcTks_c::talk() {
     }
 }
 
-/* 80B16FDC-80B17008 002A9C 002C+00 1/0 0/0 0/0 .text            setExpression__10daNpcTks_cFif */
 void daNpcTks_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 2) {
         mExpression = i_expression;
@@ -1256,7 +1219,6 @@ void daNpcTks_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80B17008-80B17420 002AC8 0418+00 4/0 0/0 0/0 .text            hide__10daNpcTks_cFv */
 void daNpcTks_c::hide() {
     switch (mMode) {
         case 0:
@@ -1302,7 +1264,6 @@ void daNpcTks_c::hide() {
     }
 }
 
-/* 80B17420-80B175F4 002EE0 01D4+00 3/0 0/0 0/0 .text            shake__10daNpcTks_cFv */
 void daNpcTks_c::shake() {
     switch (mMode) {
         case 0:
@@ -1331,7 +1292,6 @@ void daNpcTks_c::shake() {
     }
 }
 
-/* 80B175F4-80B17734 0030B4 0140+00 4/0 0/0 0/0 .text            showUp__10daNpcTks_cFv */
 void daNpcTks_c::showUp() {
     switch (mMode) {
         case 0:
@@ -1356,7 +1316,6 @@ void daNpcTks_c::showUp() {
     }
 }
 
-/* 80B17734-80B17B70 0031F4 043C+00 3/0 0/0 0/0 .text            showUpWait__10daNpcTks_cFv */
 void daNpcTks_c::showUpWait() {
     switch (mMode) {
         case 0:
@@ -1413,7 +1372,6 @@ void daNpcTks_c::showUpWait() {
     }
 }
 
-/* 80B17B70-80B17D44 003630 01D4+00 2/0 0/0 0/0 .text            lookAroundA__10daNpcTks_cFv */
 void daNpcTks_c::lookAroundA() {
     switch (mMode) {
         case 0:
@@ -1442,7 +1400,6 @@ void daNpcTks_c::lookAroundA() {
     }
 }
 
-/* 80B17D44-80B17F18 003804 01D4+00 2/0 0/0 0/0 .text            lookAroundB__10daNpcTks_cFv */
 void daNpcTks_c::lookAroundB() {
     switch (mMode) {
         case 0:
@@ -1471,7 +1428,6 @@ void daNpcTks_c::lookAroundB() {
     }
 }
 
-/* 80B17F18-80B18070 0039D8 0158+00 4/0 0/0 0/0 .text            in__10daNpcTks_cFv */
 void daNpcTks_c::in() {
     switch (mMode) {
         case 0:
@@ -1496,7 +1452,6 @@ void daNpcTks_c::in() {
     }
 }
 
-/* 80B18070-80B181EC 003B30 017C+00 1/0 0/0 0/0 .text            damage__10daNpcTks_cFv */
 void daNpcTks_c::damage() {
     switch (mMode) {
         case 0:
@@ -1527,7 +1482,6 @@ void daNpcTks_c::damage() {
     }
 }
 
-/* 80B181EC-80B183E8 003CAC 01FC+00 1/0 0/0 0/0 .text            broken__10daNpcTks_cFv */
 void daNpcTks_c::broken() {
     switch (mMode) {
         case 0:
@@ -1565,7 +1519,6 @@ void daNpcTks_c::broken() {
     }
 }
 
-/* 80B183E8-80B18D44 003EA8 095C+00 1/0 0/0 0/0 .text            demo_appear__10daNpcTks_cFv */
 void daNpcTks_c::demo_appear() {
     switch (mMode) {
         case 0:
@@ -1731,7 +1684,6 @@ void daNpcTks_c::demo_appear() {
     }
 }
 
-/* 80B18D44-80B1926C 004804 0528+00 1/0 0/0 0/0 .text            demo_scannon__10daNpcTks_cFv */
 void daNpcTks_c::demo_scannon() {
     switch (mMode) {
         case 0:
@@ -1838,7 +1790,6 @@ void daNpcTks_c::demo_scannon() {
     }
 }
 
-/* 80B1926C-80B1946C 004D2C 0200+00 1/0 0/0 0/0 .text            demo_Lv6Gate__10daNpcTks_cFv */
 void daNpcTks_c::demo_Lv6Gate() {
     switch (mMode) {
         case 0:
@@ -1904,7 +1855,6 @@ void daNpcTks_c::demo_Lv6Gate() {
     }
 }
 
-/* 80B1946C-80B19DAC 004F2C 0940+00 1/0 0/0 0/0 .text            demo_farewell__10daNpcTks_cFv */
 void daNpcTks_c::demo_farewell() {
     switch (mMode) {
         case 0:
@@ -2080,7 +2030,6 @@ void daNpcTks_c::demo_farewell() {
     }
 }
 
-/* 80B19DAC-80B1A30C 00586C 0560+00 1/0 0/0 0/0 .text            demo_warpBack__10daNpcTks_cFv */
 void daNpcTks_c::demo_warpBack() {
     switch (mMode){
         case 0:
@@ -2205,7 +2154,6 @@ void daNpcTks_c::demo_warpBack() {
     }
 }
 
-/* 80B1A30C-80B1A888 005DCC 057C+00 1/0 0/0 0/0 .text            demo_walkBack__10daNpcTks_cFv */
 void daNpcTks_c::demo_walkBack() {
     switch (mMode){
         case 0:
@@ -2335,7 +2283,6 @@ void daNpcTks_c::demo_walkBack() {
     }
 }
 
-/* 80B1A888-80B1B6A0 006348 0E18+00 1/0 0/0 0/0 .text            demo_Lv7Start__10daNpcTks_cFv */
 void daNpcTks_c::demo_Lv7Start() {
     switch (mMode) {
         case 0:
@@ -2645,7 +2592,6 @@ void daNpcTks_c::demo_Lv7Start() {
     }
 }
 
-/* 80B1B6A0-80B1BD64 007160 06C4+00 2/0 0/0 0/0 .text            demo_Lv3PickUp__10daNpcTks_cFv */
 void daNpcTks_c::demo_Lv3PickUp() {
     switch (mMode) {
         case 0:
@@ -2785,7 +2731,6 @@ void daNpcTks_c::demo_Lv3PickUp() {
     }
 }
 
-/* 80B1BD64-80B1C3C8 007824 0664+00 1/0 0/0 0/0 .text            demo_Lv6PickUp__10daNpcTks_cFv */
 void daNpcTks_c::demo_Lv6PickUp() {
     switch (mMode) {
         case 0:
@@ -2916,32 +2861,26 @@ void daNpcTks_c::demo_Lv6PickUp() {
     }
 }
 
-/* 80B1C3C8-80B1C3E8 007E88 0020+00 1/0 0/0 0/0 .text            daNpcTks_Create__FPv */
 static int daNpcTks_Create(void* a_this) {
     return static_cast<daNpcTks_c*>(a_this)->Create();
 }
 
-/* 80B1C3E8-80B1C408 007EA8 0020+00 1/0 0/0 0/0 .text            daNpcTks_Delete__FPv */
 static int daNpcTks_Delete(void* a_this) {
     return static_cast<daNpcTks_c*>(a_this)->Delete();
 }
 
-/* 80B1C408-80B1C428 007EC8 0020+00 1/0 0/0 0/0 .text            daNpcTks_Execute__FPv */
 static int daNpcTks_Execute(void* a_this) {
     return static_cast<daNpcTks_c*>(a_this)->Execute();
 }
 
-/* 80B1C428-80B1C448 007EE8 0020+00 1/0 0/0 0/0 .text            daNpcTks_Draw__FPv */
 static int daNpcTks_Draw(void* a_this) {
     return static_cast<daNpcTks_c*>(a_this)->Draw();
 }
 
-/* 80B1C448-80B1C450 007F08 0008+00 1/0 0/0 0/0 .text            daNpcTks_IsDelete__FPv */
 static int daNpcTks_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80B1C480-80B1C4F8 007F40 0078+00 1/0 0/0 0/0 .text            setParam__10daNpcTks_cFv */
 void daNpcTks_c::setParam() {
     mAcchCir.SetWallR(daNpcTks_Param_c::m.common.width);
     mAcchCir.SetWallH(daNpcTks_Param_c::m.common.knee_length);
@@ -2949,7 +2888,6 @@ void daNpcTks_c::setParam() {
     maxFallSpeed = -50.0f;
 }
 
-/* 80B1CB54-80B1CC28 008614 00D4+00 1/0 0/0 0/0 .text            ctrlBtk__10daNpcTks_cFv */
 BOOL daNpcTks_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* i_anm = getTexSRTKeyAnmP(l_arcName, l_btkGetParamList[0].fileIdx);
@@ -2967,7 +2905,6 @@ BOOL daNpcTks_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B1CC28-80B1CFD0 0086E8 03A8+00 1/0 0/0 0/0 .text            setAttnPos__10daNpcTks_cFv */
 void daNpcTks_c::setAttnPos() {
     if(mLookMode == 1) {
         for (int i = 0; i < 3; i++) {
@@ -3027,12 +2964,10 @@ void daNpcTks_c::setAttnPos() {
     }
 }
 
-/* 80B1D1FC-80B1D204 008CBC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daNpcTks_cFv */
 BOOL daNpcTks_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80B1D204-80B1D35C 008CC4 0158+00 1/0 0/0 0/0 .text            drawOtherMdls__10daNpcTks_cFv */
 void daNpcTks_c::drawOtherMdls() {
     if (mTksTsubo.field_0x586 != 0) {
         J3DModel* model = mTksTsubo.mpModelMorf->getModel();
@@ -3076,7 +3011,6 @@ void daNpcTks_c::drawOtherMdls() {
     }
 }
 
-/* 80B1E408-80B1E428 -00001 0020+00 1/0 0/0 0/0 .data            daNpcTks_MethodTable */
 static actor_method_class daNpcTks_MethodTable = {
     (process_method_func)daNpcTks_Create,
     (process_method_func)daNpcTks_Delete,
@@ -3085,7 +3019,6 @@ static actor_method_class daNpcTks_MethodTable = {
     (process_method_func)daNpcTks_Draw,
 };
 
-/* 80B1E428-80B1E458 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TKS */
 extern actor_process_profile_definition g_profile_NPC_TKS = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp
index 40aa78f227..3599d0656e 100644
--- a/src/d/actor/d_a_npc_toby.cpp
+++ b/src/d/actor/d_a_npc_toby.cpp
@@ -14,8 +14,6 @@
 #include "d/d_msg_object.h"
 #include "d/actor/d_a_obj_scannon.h"
 
-/* ############################################################################################## */
-/* 80B249E4-80B24A80 000000 009C+00 15/15 0/0 0/0 .rodata          m__18daNpc_Toby_Param_c */
 const daNpc_Toby_HIOParam daNpc_Toby_Param_c::m = {
     160.0f,
     -3.0f,
@@ -120,14 +118,12 @@ void daNpc_Toby_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B24C68-80B24C80 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[3][2] = {
     {3, 1},
     {3, 2},
     {9, 6},
 };
 
-/* 80B24C80-80B24CB8 -00001 0038+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[7] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -138,7 +134,6 @@ static daNpcT_evtData_c l_evtList[7] = {
     {"CONVERSATION_ABOUT_ZRA", 4},
 };
 
-/* 80B24CB8-80B24CDC -00001 0024+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[9] = {
     "",
     "Toby",
@@ -151,25 +146,19 @@ static char* l_resNameList[9] = {
     "Toby5",
 };
 
-/* 80B24CDC-80B24CE4 000094 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[6] = {1, 3, 4, 7, 8, -1};
 
-/* 80B24CE4-80B24CEC 00009C 0006+02 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[6] = {2, 3, 5, 7, 8, -1};
 
-/* 80B24CEC-80B24CF4 0000A4 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[5] = {1, 3, 6, 7, -1};
 
-/* 80B24CF4-80B24CFC 0000AC 0008+00 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[8] = {1, 2, 3, 4, 5, 7, 8, -1};
 
-/* 80B24CFC-80B24D18 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn2,
     l_loadResPtrn2, l_loadResPtrn0, l_loadResPtrn3,
 };
 
-/* 80B24D18-80B24ED8 0000D0 01C0+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {-1, 0, 0, 13, 2, 3, 1},
     {5, 0, 3, 14, 0, 3, 0},
@@ -189,7 +178,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {8, 2, 5, 22, 2, 5, 0},
 };
 
-/* 80B24ED8-80B25194 000290 02BC+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[25] = {
     {7, 2, 3, 10, 0, 3, 1, 0},
     {15, 2, 4, 10, 0, 3, 1, 0},
@@ -218,7 +206,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[25] = {
     {10, 0, 8, 10, 0, 3, 0, 0},
 };
 
-/* 80B25194-80B252A4 00054C 0110+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[68] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {15, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {9, -1, 1}, {13, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {10, -1, 1}, {12, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -231,7 +218,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[68] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B252A4-80B25434 00065C 0190+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[100] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
     {10, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {11, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -258,7 +244,6 @@ enum NPC_TOBY_CUTS {
     CUT_CONVERSATION_ABOUT_ZRA = 6,
 };
 
-/* 80B25434-80B25450 -00001 001C+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Toby_c */
 char* daNpc_Toby_c::mCutNameList[7] = {
     "",
     "TOBY_HOUSE_FIRE",
@@ -269,7 +254,6 @@ char* daNpc_Toby_c::mCutNameList[7] = {
     "CONVERSATION_ABOUT_ZRA",
 };
 
-/* 80B25498-80B254EC 000850 0054+00 1/2 0/0 0/0 .data            mCutList__12daNpc_Toby_c */
 daNpc_Toby_c::cutFunc daNpc_Toby_c::mCutList[7] = {
     NULL,
     &daNpc_Toby_c::cutTobyHouseFire,
@@ -282,7 +266,6 @@ daNpc_Toby_c::cutFunc daNpc_Toby_c::mCutList[7] = {
 
 NPC_TOBY_HIO_CLASS l_HIO;
 
-/* 80B1E64C-80B1E798 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__12daNpc_Toby_cFv */
 daNpc_Toby_c::~daNpc_Toby_c() {
     OS_REPORT("|%06d:%x|daNpc_Toby_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (mpMorf[0] != NULL) {
@@ -298,7 +281,6 @@ daNpc_Toby_c::~daNpc_Toby_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B1E798-80B1EA60 000238 02C8+00 1/1 0/0 0/0 .text            create__12daNpc_Toby_cFv */
 int daNpc_Toby_c::create() {
     static int const heapSize[7] = {
         0x3BC0, 0x3B10, 0x3B10, 0x43C0,
@@ -361,7 +343,6 @@ int daNpc_Toby_c::create() {
     return rv;
 }
 
-/* 80B1EA60-80B1ED6C 000500 030C+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Toby_cFv */
 int daNpc_Toby_c::CreateHeap() {
     static int const bmdTypeList[1] = {2};
 
@@ -416,7 +397,6 @@ int daNpc_Toby_c::CreateHeap() {
     return 0;
 }
 
-/* 80B1EF28-80B1EF5C 0009C8 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Toby_cFv */
 int daNpc_Toby_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Toby_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_RegisterDeleteID(this, "NPC_TOBY");
@@ -424,12 +404,10 @@ int daNpc_Toby_c::Delete() {
     return 1;
 }
 
-/* 80B1EF5C-80B1EF7C 0009FC 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Toby_cFv */
 int daNpc_Toby_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80B1EF7C-80B1F010 000A1C 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Toby_cFv */
 int daNpc_Toby_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -445,15 +423,11 @@ int daNpc_Toby_c::Draw() {
         0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80B1F010-80B1F030 000AB0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daNpc_Toby_cFP10fopAc_ac_c             */
 int daNpc_Toby_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Toby_c* a_this = static_cast<daNpc_Toby_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 80B1F030-80B1F088 000AD0 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__12daNpc_Toby_cFP8J3DJointi                */
 int daNpc_Toby_c::ctrlJointCallBack(J3DJoint* i_joint, int i_int) {
     if (i_int == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -466,7 +440,6 @@ int daNpc_Toby_c::ctrlJointCallBack(J3DJoint* i_joint, int i_int) {
     return 1;
 }
 
-/* 80B1F088-80B1F124 000B28 009C+00 1/1 0/0 0/0 .text            srchToby__12daNpc_Toby_cFPvPv */
 void* daNpc_Toby_c::srchToby(void* i_actor, void* i_data) {
     if (mFindCount < 50) {
         fopAc_ac_c* actor_p = (fopAc_ac_c*)i_actor;
@@ -481,7 +454,6 @@ void* daNpc_Toby_c::srchToby(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B1F124-80B1F200 000BC4 00DC+00 1/1 0/0 0/0 .text            getOtherTobyP__12daNpc_Toby_cFi */
 fopAc_ac_c* daNpc_Toby_c::getOtherTobyP(int i_int) {
     fopAc_ac_c* actor = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -500,7 +472,6 @@ fopAc_ac_c* daNpc_Toby_c::getOtherTobyP(int i_int) {
     return actor;
 }
 
-/* 80B1F200-80B1F274 000CA0 0074+00 2/2 0/0 0/0 .text            getType__12daNpc_Toby_cFv */
 u8 daNpc_Toby_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -521,7 +492,6 @@ u8 daNpc_Toby_c::getType() {
     }
 }
 
-/* 80B1F274-80B1F384 000D14 0110+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Toby_cFv */
 int daNpc_Toby_c::isDelete() {
     // 0x054 -  M_051 - Fought the Shadow Bulbin riding the Shadow Kargorok (?)
     // 0x136 - F_0310 - Handed Auru's note to Fyer
@@ -547,7 +517,6 @@ int daNpc_Toby_c::isDelete() {
     }
 }
 
-/* 80B1F384-80B1F5AC 000E24 0228+00 1/1 0/0 0/0 .text            reset__12daNpc_Toby_cFv */
 void daNpc_Toby_c::reset() {
     csXyz sp_0x10;
     int num_bytes = (u8*)&field_0x1004 - (u8*)&mActFunc_0;
@@ -594,7 +563,6 @@ void daNpc_Toby_c::reset() {
     setAngle(sp_0x10);
 }
 
-/* 80B1F5AC-80B1F638 00104C 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Toby_cFi */
 void daNpc_Toby_c::afterJntAnm(int arg0) {
     if (arg0 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -605,7 +573,6 @@ void daNpc_Toby_c::afterJntAnm(int arg0) {
     }
 }
 
-/* 80B1F638-80B1F784 0010D8 014C+00 1/0 0/0 0/0 .text            setParam__12daNpc_Toby_cFv */
 void daNpc_Toby_c::setParam() {
     selectAction();
     srchActors();
@@ -645,7 +612,6 @@ void daNpc_Toby_c::setParam() {
     gravity = mpHIO->m.common.gravity;
 }
 
-/* 80B1F784-80B1F950 001224 01CC+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_Toby_cFv */
 int daNpc_Toby_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Toby_c::talk)) {
         mPreItemNo = 0;
@@ -712,7 +678,6 @@ int daNpc_Toby_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80B1F950-80B1FA08 0013F0 00B8+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Toby_cFv */
 void daNpc_Toby_c::setAfterTalkMotion() {
     int iVar2 = 16;
     switch(mFaceMotionSeqMngr.getNo()) {
@@ -736,7 +701,6 @@ void daNpc_Toby_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80B1FA08-80B1FB34 0014A8 012C+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Toby_cFv */
 void daNpc_Toby_c::srchActors() {
     switch (mType) {
     case 0:
@@ -779,7 +743,6 @@ void daNpc_Toby_c::srchActors() {
     }
 }
 
-/* 80B1FB34-80B1FBD4 0015D4 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Toby_cFv */
 int daNpc_Toby_c::evtTalk() {
     if (chkAction(&daNpc_Toby_c::talk)) {
         (this->*mActFunc_1)(NULL);
@@ -790,7 +753,6 @@ int daNpc_Toby_c::evtTalk() {
     return 1;
 }
 
-/* 80B1FBD4-80B1FC9C 001674 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Toby_cFv */
 int daNpc_Toby_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Toby", this, -1);
     if (staffId != -1) {
@@ -806,7 +768,6 @@ int daNpc_Toby_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80B1FC9C-80B1FE68 00173C 01CC+00 1/0 0/0 0/0 .text            action__12daNpc_Toby_cFv */
 void daNpc_Toby_c::action() {
     fopAc_ac_c* actor_p = NULL;
     if (!mTwilight) {
@@ -838,7 +799,6 @@ void daNpc_Toby_c::action() {
     }
 }
 
-/* 80B1FE68-80B1FF2C 001908 00C4+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Toby_cFv */
 void daNpc_Toby_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -850,7 +810,6 @@ void daNpc_Toby_c::beforeMove() {
     }
 }
 
-/* 80B1FF2C-80B20278 0019CC 034C+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Toby_cFv */
 void daNpc_Toby_c::setAttnPos() {
     cXyz cStack_3c(0.0f, 30.0f, 0.0f);
     mStagger.calc(0);
@@ -885,7 +844,6 @@ void daNpc_Toby_c::setAttnPos() {
     }
 }
 
-/* 80B20278-80B2042C 001D18 01B4+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Toby_cFv */
 void daNpc_Toby_c::setCollision() {
     cXyz cyl_center;
     if (mHide == 0) {
@@ -928,7 +886,6 @@ void daNpc_Toby_c::setCollision() {
     mCyl1.ClrTgHit();
 }
 
-/* 80B2042C-80B20434 001ECC 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Toby_cFv */
 int daNpc_Toby_c::drawDbgInfo() {
     return FALSE;
 }
@@ -966,7 +923,6 @@ static s16 dummy_lit_123017(int sel) {
 }
 #endif
 
-/* 80B20434-80B2050C 001ED4 00D8+00 1/0 0/0 0/0 .text            drawOtherMdl__12daNpc_Toby_cFv */
 void daNpc_Toby_c::drawOtherMdl() {
     J3DModel* model = mpMorf[0]->getModel();
     for (int i = 0; i < 1; i++) {
@@ -983,8 +939,6 @@ void daNpc_Toby_c::drawOtherMdl() {
     }
 }
 
-/* 80B2050C-80B20568 001FAC 005C+00 1/0 0/0 0/0 .text afterSetFaceMotionAnm__12daNpc_Toby_cFiifi
- */
 bool daNpc_Toby_c::afterSetFaceMotionAnm(int arg0, int, f32, int) {
     // Amongst all the daNpcTs, seems like this is the only one that creates a
     // non-trivial definition for this func?
@@ -1006,7 +960,6 @@ bool daNpc_Toby_c::afterSetFaceMotionAnm(int arg0, int, f32, int) {
     return true;
 }
 
-/* 80B20568-80B205F4 002008 008C+00 1/0 0/0 0/0 .text afterSetMotionAnm__12daNpc_Toby_cFiifi */
 bool daNpc_Toby_c::afterSetMotionAnm(int arg0, int, f32, int) {
     switch (arg0) {
     case 6:
@@ -1029,7 +982,6 @@ bool daNpc_Toby_c::afterSetMotionAnm(int arg0, int, f32, int) {
     return true;
 }
 
-/* 80B205F4-80B20710 002094 011C+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Toby_cFv */
 int daNpc_Toby_c::selectAction() {
     mActFunc_0 = NULL;
 #if DEBUG
@@ -1060,14 +1012,10 @@ int daNpc_Toby_c::selectAction() {
     return 1;
 }
 
-/* 80B20710-80B2073C 0021B0 002C+00 2/2 0/0 0/0 .text
- * chkAction__12daNpc_Toby_cFM12daNpc_Toby_cFPCvPvPv_i          */
 int daNpc_Toby_c::chkAction(actionFunc i_func) {
     return mActFunc_1 == i_func;
 }
 
-/* 80B2073C-80B207E4 0021DC 00A8+00 2/2 0/0 0/0 .text
- * setAction__12daNpc_Toby_cFM12daNpc_Toby_cFPCvPvPv_i          */
 int daNpc_Toby_c::setAction(actionFunc i_func) {
     mMode = MODE_EXIT;
     if (mActFunc_1 != NULL) {
@@ -1083,8 +1031,6 @@ int daNpc_Toby_c::setAction(actionFunc i_func) {
     return 1;
 }
 
-/* 80B207E4-80B20AB0 002284 02CC+00 1/0 0/0 0/0 .text            cutTobyHouseFire__12daNpc_Toby_cFi
- */
 int daNpc_Toby_c::cutTobyHouseFire(int arg0) {
     fopAc_ac_c* atmt_p = mActorMngr[1].getActorP();
     int retval = 0;
@@ -1180,7 +1126,6 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) {
     return retval;
 }
 
-/* 80B20AB0-80B20FC0 002550 0510+00 3/0 0/0 0/0 .text            cutTalkToOneself__12daNpc_Toby_cFi */
 int daNpc_Toby_c::cutTalkToOneself(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1363,8 +1308,6 @@ int daNpc_Toby_c::cutTalkToOneself(int arg0) {
     return retval;
 }
 
-/* 80B20FC0-80B215B4 002A60 05F4+00 1/0 0/0 0/0 .text            cutRepairSCannon__12daNpc_Toby_cFi
- */
 int daNpc_Toby_c::cutRepairSCannon(int arg0) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     fopAc_ac_c* scannon_p = mActorMngr[2].getActorP();
@@ -1504,7 +1447,6 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) {
     return retval;
 }
 
-/* 80B215B4-80B219F4 003054 0440+00 1/0 0/0 0/0 .text            cutSCannon__12daNpc_Toby_cFi */
 int daNpc_Toby_c::cutSCannon(int arg0) {
     cXyz work;
     csXyz my_svec;
@@ -1618,8 +1560,6 @@ int daNpc_Toby_c::cutSCannon(int arg0) {
     return retval;
 }
 
-/* 80B219F4-80B22434 003494 0A40+00 3/0 0/0 0/0 .text
- * cutConversationAboutSCannon__12daNpc_Toby_cFi                */
 int daNpc_Toby_c::cutConversationAboutSCannon(int arg0) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -1864,7 +1804,6 @@ int daNpc_Toby_c::cutConversationAboutSCannon(int arg0) {
     return retval;
 }
 
-/* 80B22434-80B22614 003ED4 01E0+00 1/0 0/0 0/0 .text cutConversationAboutZra__12daNpc_Toby_cFi */
 int daNpc_Toby_c::cutConversationAboutZra(int arg0) {
     int retval = 0;
     int* param_p = NULL;
@@ -1920,7 +1859,6 @@ int daNpc_Toby_c::cutConversationAboutZra(int arg0) {
     return retval;
 }
 
-/* 80B22614-80B226B0 0040B4 009C+00 5/5 0/0 0/0 .text            chkAttnZra__12daNpc_Toby_cFv */
 int daNpc_Toby_c::chkAttnZra() {
     // In practice, get Bit SW returns 0xEC for all mType == 0, otherwise 0xFF.
     // 0x0A1 - F_0063 - Lake Hylia - Used Fyer's cannon for first time
@@ -1928,7 +1866,6 @@ int daNpc_Toby_c::chkAttnZra() {
             && !dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this)));
 }
 
-/* 80B226B0-80B22D98 004150 06E8+00 2/0 0/0 0/0 .text            wait__12daNpc_Toby_cFPv */
 int daNpc_Toby_c::wait(void*) {
     switch (mMode) {
     case 0:
@@ -2055,7 +1992,6 @@ int daNpc_Toby_c::wait(void*) {
     return 1;
 }
 
-/* 80B22D98-80B22FAC 004838 0214+00 1/0 0/0 0/0 .text            walk__12daNpc_Toby_cFPv */
 int daNpc_Toby_c::walk(void*) {
     switch (mMode) {
     case 0:
@@ -2097,7 +2033,6 @@ int daNpc_Toby_c::walk(void*) {
     return 1;
 }
 
-/* 80B22FAC-80B23344 004A4C 0398+00 3/0 0/0 0/0 .text            play__12daNpc_Toby_cFPv */
 int daNpc_Toby_c::play(void* param_0) {
     daObj_AutoMata_c* actor_p = (daObj_AutoMata_c*) mActorMngr[1].getActorP();
     int reg_r29 = 1;
@@ -2176,7 +2111,6 @@ int daNpc_Toby_c::play(void* param_0) {
     return 1;
 }
 
-/* 80B23344-80B23628 004DE4 02E4+00 3/0 0/0 0/0 .text            talk__12daNpc_Toby_cFPv */
 int daNpc_Toby_c::talk(void*) {
     switch (mMode) {
     case 0:
@@ -2254,32 +2188,26 @@ int daNpc_Toby_c::test(void* param_0) {
 }
 #endif
 
-/* 80B23628-80B23648 0050C8 0020+00 1/0 0/0 0/0 .text            daNpc_Toby_Create__FPv */
 static int daNpc_Toby_Create(void* i_this) {
     return static_cast<daNpc_Toby_c*>(i_this)->create();
 }
 
-/* 80B23648-80B23668 0050E8 0020+00 1/0 0/0 0/0 .text            daNpc_Toby_Delete__FPv */
 static int daNpc_Toby_Delete(void* i_this) {
     return static_cast<daNpc_Toby_c*>(i_this)->Delete();
 }
 
-/* 80B23668-80B23688 005108 0020+00 1/0 0/0 0/0 .text            daNpc_Toby_Execute__FPv */
 static int daNpc_Toby_Execute(void* i_this) {
     return static_cast<daNpc_Toby_c*>(i_this)->Execute();
 }
 
-/* 80B23688-80B236A8 005128 0020+00 1/0 0/0 0/0 .text            daNpc_Toby_Draw__FPv */
 static int daNpc_Toby_Draw(void* i_this) {
     return static_cast<daNpc_Toby_c*>(i_this)->Draw();
 }
 
-/* 80B236A8-80B236B0 005148 0008+00 1/0 0/0 0/0 .text            daNpc_Toby_IsDelete__FPv */
 static int daNpc_Toby_IsDelete(void* i_this) {
     return true;
 }
 
-/* 80B25670-80B25690 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Toby_MethodTable */
 static actor_method_class daNpc_Toby_MethodTable = {
     (process_method_func)daNpc_Toby_Create,
     (process_method_func)daNpc_Toby_Delete,
@@ -2288,7 +2216,6 @@ static actor_method_class daNpc_Toby_MethodTable = {
     (process_method_func)daNpc_Toby_Draw,
 };
 
-/* 80B25690-80B256C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TOBY */
 extern actor_process_profile_definition g_profile_NPC_TOBY = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp
index 97fd3ea6ae..3ee829e5a4 100644
--- a/src/d/actor/d_a_npc_tr.cpp
+++ b/src/d/actor/d_a_npc_tr.cpp
@@ -10,11 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 
-//
-// Declarations:
-//
-
-/* 80B25A0C-80B25A54 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__14daNPC_TR_HIO_cFv */
 daNPC_TR_HIO_c::daNPC_TR_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 0.8f;
@@ -24,7 +19,6 @@ daNPC_TR_HIO_c::daNPC_TR_HIO_c() {
     field_0x18 = 250.0f;
 }
 
-/* 80B25A54-80B25B78 000134 0124+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* p_joint, int param_1) {
     if (param_1 == 0) {
         int jointNo = p_joint->getJntNo();
@@ -45,7 +39,6 @@ static int nodeCallBack(J3DJoint* p_joint, int param_1) {
     return 1;
 }
 
-/* 80B25B78-80B25BDC 000258 0064+00 1/0 0/0 0/0 .text            daNPC_TR_Draw__FP12npc_tr_class */
 static int daNPC_TR_Draw(npc_tr_class* npc_tr) {
     g_env_light.settingTevStruct(0, &npc_tr->current.pos, &npc_tr->tevStr);
     g_env_light.setLightTevColorType_MAJI(npc_tr->field_0x5b8, &npc_tr->tevStr);
@@ -62,13 +55,10 @@ static f32 dummyLiterals() {
     return dummy;
 }
 
-/* 80B26678-80B2667C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80B26678;
 
-/* 80B26688-80B266A4 000018 001C+00 5/5 0/0 0/0 .bss             l_HIO */
 static daNPC_TR_HIO_c l_HIO;
 
-/* 80B25BDC-80B25FE0 0002BC 0404+00 1/1 0/0 0/0 .text            npc_tr_move__FP12npc_tr_class */
 static void npc_tr_move(npc_tr_class* npc_tr) {
     cXyz distance;
     f32 var_f31;
@@ -138,7 +128,6 @@ static void npc_tr_move(npc_tr_class* npc_tr) {
     cLib_addCalc2(&npc_tr->speedF, npc_tr->field_0x5e4 * l_HIO.field_0xc, 1.0f, var_f31);
 }
 
-/* 80B25FE0-80B261D8 0006C0 01F8+00 1/1 0/0 0/0 .text            action__FP12npc_tr_class */
 static void action(npc_tr_class* i_this) {
     switch (i_this->field_0x5be) {
     case 0:
@@ -175,8 +164,6 @@ static void action(npc_tr_class* i_this) {
     i_this->field_0x5f0 = cM_ssin(i_this->field_0x5ec + -7000) * i_this->field_0x5fc * -0.3f;
 }
 
-/* 80B261D8-80B262D0 0008B8 00F8+00 2/1 0/0 0/0 .text            daNPC_TR_Execute__FP12npc_tr_class
- */
 static int daNPC_TR_Execute(npc_tr_class* npc_tr) {
     npc_tr->field_0x5bc++;
     npc_tr->field_0x5d8 = fopAcM_searchActorDistance(npc_tr, (fopAc_ac_c*)dComIfGp_getPlayer(0));
@@ -199,14 +186,10 @@ static int daNPC_TR_Execute(npc_tr_class* npc_tr) {
     return 1;
 }
 
-/* 80B262D0-80B262D8 0009B0 0008+00 1/0 0/0 0/0 .text            daNPC_TR_IsDelete__FP12npc_tr_class
- */
 static bool daNPC_TR_IsDelete(npc_tr_class* param_0) {
     return true;
 }
 
-/* 80B262D8-80B2632C 0009B8 0054+00 1/0 0/0 0/0 .text            daNPC_TR_Delete__FP12npc_tr_class
- */
 static int daNPC_TR_Delete(npc_tr_class* npc_tr) {
     dComIfG_resDelete(&npc_tr->mPhaseReq, "NPC_TR");
 
@@ -217,7 +200,6 @@ static int daNPC_TR_Delete(npc_tr_class* npc_tr) {
     return 1;
 }
 
-/* 80B2632C-80B263E4 000A0C 00B8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     npc_tr_class* npc_tr = (npc_tr_class*)actor;
 
@@ -237,7 +219,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80B263E4-80B264E4 000AC4 0100+00 1/0 0/0 0/0 .text            daNPC_TR_Create__FP10fopAc_ac_c */
 static int daNPC_TR_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, npc_tr_class);
     npc_tr_class* npc_tr = (npc_tr_class*)i_this;
@@ -264,17 +245,14 @@ static int daNPC_TR_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80B264E4-80B2652C 000BC4 0048+00 2/1 0/0 0/0 .text            __dt__14daNPC_TR_HIO_cFv */
 daNPC_TR_HIO_c::~daNPC_TR_HIO_c() {}
 
-/* 80B26610-80B26630 -00001 0020+00 1/0 0/0 0/0 .data            l_daNPC_TR_Method */
 static actor_method_class l_daNPC_TR_Method = {
     (process_method_func)daNPC_TR_Create,  (process_method_func)daNPC_TR_Delete,
     (process_method_func)daNPC_TR_Execute, (process_method_func)daNPC_TR_IsDelete,
     (process_method_func)daNPC_TR_Draw,
 };
 
-/* 80B26630-80B26660 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_TR */
 extern actor_process_profile_definition g_profile_NPC_TR = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp
index 2736691062..6a6ac88058 100644
--- a/src/d/actor/d_a_npc_uri.cpp
+++ b/src/d/actor/d_a_npc_uri.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_npc_uri.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80B2CE14-80B2CEC0 000000 00AC+00 14/14 0/0 0/0 .rodata          m__17daNpc_Uri_Param_c */
 const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = {
     200.0f,   // attention_offset
     -3.0f,    // gravity
@@ -79,10 +78,8 @@ void daNpc_Uri_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B2D068-80B2D078 000020 0010+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {{12, 1}, {33, 2}};
 
-/* 80B2D078-80B2D0D0 -00001 0058+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[11] = {
     {"", 0},
     {"DEFAULT_GETITEM", 2},
@@ -97,50 +94,41 @@ static daNpcT_evtData_c l_evtList[11] = {
     {"MEETING_AGAIN", 4},
 };
 
-/* 80B2D0D0-80B2D0E8 -00001 0018+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[6] = {
     "", "Uri", "Uri1", "Uri2", "Uri3", "Uri_P1",
 };
 
-/* 80B2D0E8-80B2D0EC 0000A0 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80B2D0EC-80B2D0F0 0000A4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     1,
     2,
     -1,
 };
 
-/* 80B2D0F0-80B2D0F4 0000A8 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[3] = {
     1,
     3,
     -1,
 };
 
-/* 80B2D0F4-80B2D0FC 0000AC 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[5] = {
     1, 2, 3, 4, -1,
 };
 
-/* 80B2D0FC-80B2D100 0000B4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[3] = {
     1,
     5,
     -1,
 };
 
-/* 80B2D100-80B2D108 0000B8 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {
     1, 2, 3, 4, -1,
 };
 
-/* 80B2D108-80B2D124 -00001 001C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[7] = {l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn0, l_loadResPtrn2,
                                    l_loadResPtrn3, l_loadResPtrn4, l_loadResPtrn9};
 
-/* 80B2D124-80B2D338 0000DC 0214+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = {
     {-1, 0, 0, 18, 2, 1, TRUE},  {-1, 0, 0, -1, 0, 0, FALSE}, {6, 0, 1, 18, 2, 1, TRUE},
     {10, 0, 2, 43, 0, 2, FALSE}, {11, 0, 2, 44, 0, 2, FALSE}, {9, 0, 2, 42, 0, 2, FALSE},
@@ -151,7 +139,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[19] = {
     {8, 2, 1, 21, 2, 1, FALSE},
 };
 
-/* 80B2D338-80B2D6F0 0002F0 03B8+00 1/2 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[34] = {
     {9, 2, 1, 15, 0, 1, 1, 0},  {-1, 0, 0, -1, 0, 0, 0, 0}, {9, 2, 3, 18, 2, 3, 0, 0},
     {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0}, {-1, 0, 0, -1, 0, 0, 0, 0},
@@ -167,7 +154,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[34] = {
     {19, 0, 2, 15, 0, 1, 1, 0},
 };
 
-/* 80B2D6F0-80B2D810 0006A8 0120+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] = {
     {2, -1, 1},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {7, -1, 1}, {14, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {3, -1, 1},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}, {4, -1, 1},  {-1, 0, 0},
@@ -182,7 +168,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[72] =
     {-1, 0, 0},  {-1, 0, 0},
 };
 
-/* 80B2D810-80B2D9F0 0007C8 01E0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {28, -1, 1}, {29, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {30, -1, 1}, {26, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {31, -1, 0}, {-1, 0, 0},
@@ -204,7 +189,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[120] = {
     {-1, 0, 0},
 };
 
-/* 80B2D9F0-80B2DA0C -00001 001C+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_Uri_c */
 const char* daNpc_Uri_c::mCutNameList[7] = {
     "",
     "CONVERSATION",
@@ -215,7 +199,6 @@ const char* daNpc_Uri_c::mCutNameList[7] = {
     "MEETING_AGAIN",
 };
 
-/* 80B2DA54-80B2DAA8 000A0C 0054+00 1/2 0/0 0/0 .data            mCutList__11daNpc_Uri_c */
 daNpc_Uri_c::cutFunc daNpc_Uri_c::mCutList[7] = {
     NULL,
     &daNpc_Uri_c::cutConversation,
@@ -226,7 +209,6 @@ daNpc_Uri_c::cutFunc daNpc_Uri_c::mCutList[7] = {
     &daNpc_Uri_c::cutMeetingAgain,
 };
 
-/* 80B267AC-80B268F8 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__11daNpc_Uri_cFv */
 daNpc_Uri_c::~daNpc_Uri_c() {
     if (mpMorf[0] != 0) {
         mpMorf[0]->stopZelAnime();
@@ -234,7 +216,6 @@ daNpc_Uri_c::~daNpc_Uri_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80B268F8-80B26BE4 000238 02EC+00 1/1 0/0 0/0 .text            create__11daNpc_Uri_cFv */
 int daNpc_Uri_c::create() {
     static const int heapSize[] = {0, 0x3F20, 0, 0, 0x3740, 0x3740, 0};
 
@@ -287,7 +268,6 @@ int daNpc_Uri_c::create() {
     return phase;
 }
 
-/* 80B26BE4-80B26ED0 000524 02EC+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_Uri_cFv */
 int daNpc_Uri_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(
         dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
@@ -337,19 +317,16 @@ int daNpc_Uri_c::CreateHeap() {
     return 0;
 }
 
-/* 80B2708C-80B270C0 0009CC 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_Uri_cFv */
 int daNpc_Uri_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_Uri_c();
     return 1;
 }
 
-/* 80B270C0-80B270E0 000A00 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_Uri_cFv */
 int daNpc_Uri_c::Execute() {
     return daNpcT_c::execute();
 }
 
-/* 80B270E0-80B27174 000A20 0094+00 1/1 0/0 0/0 .text            Draw__11daNpc_Uri_cFv */
 int daNpc_Uri_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -359,14 +336,10 @@ int daNpc_Uri_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80B27174-80B27194 000AB4 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_Uri_cFP10fopAc_ac_c              */
 int daNpc_Uri_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Uri_c*>(i_this)->CreateHeap();
 }
 
-/* 80B27194-80B271EC 000AD4 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_Uri_cFP8J3DJointi
- */
 int daNpc_Uri_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -380,7 +353,6 @@ int daNpc_Uri_c::ctrlJointCallBack(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80B271EC-80B27260 000B2C 0074+00 1/1 0/0 0/0 .text            getType__11daNpc_Uri_cFv */
 u8 daNpc_Uri_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -404,7 +376,6 @@ u8 daNpc_Uri_c::getType() {
     return TYPE_6;
 }
 
-/* 80B27260-80B272F0 000BA0 0090+00 1/1 0/0 0/0 .text            isDelete__11daNpc_Uri_cFv */
 int daNpc_Uri_c::isDelete() {
     switch (mType) {
     case TYPE_0:
@@ -424,7 +395,6 @@ int daNpc_Uri_c::isDelete() {
     }
 }
 
-/* 80B272F0-80B27750 000C30 0460+00 1/1 0/0 0/0 .text            reset__11daNpc_Uri_cFv */
 void daNpc_Uri_c::reset() {
     csXyz cStack_a0;
     cXyz acStack_38;
@@ -512,7 +482,6 @@ void daNpc_Uri_c::reset() {
     setAngle(cStack_a0);
 }
 
-/* 80B27750-80B27820 001090 00D0+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_Uri_cFi */
 void daNpc_Uri_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -531,7 +500,6 @@ void daNpc_Uri_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B27820-80B27994 001160 0174+00 1/0 0/0 0/0 .text            setParam__11daNpc_Uri_cFv */
 void daNpc_Uri_c::setParam() {
     selectAction();
     srchActors();
@@ -573,7 +541,6 @@ void daNpc_Uri_c::setParam() {
     }
 }
 
-/* 80B27994-80B27B3C 0012D4 01A8+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_Uri_cFv */
 BOOL daNpc_Uri_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Uri_c::talk)) {
         mPreItemNo = 0;
@@ -637,8 +604,6 @@ BOOL daNpc_Uri_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80B27B3C-80B27BF0 00147C 00B4+00 2/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_Uri_cFv
- */
 void daNpc_Uri_c::setAfterTalkMotion() {
     int iVar2 = 17;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -664,7 +629,6 @@ void daNpc_Uri_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(iVar2, -1.0f, 0, 0);
 }
 
-/* 80B27BF0-80B27C8C 001530 009C+00 1/1 0/0 0/0 .text            srchActors__11daNpc_Uri_cFv */
 void daNpc_Uri_c::srchActors() {
     switch (mType) {
     case TYPE_0:
@@ -686,7 +650,6 @@ void daNpc_Uri_c::srchActors() {
     }
 }
 
-/* 80B27C8C-80B27D2C 0015CC 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_Uri_cFv */
 BOOL daNpc_Uri_c::evtTalk() {
     if (chkAction(&daNpc_Uri_c::talk)) {
         (this->*field_0xfc0[1])(NULL);
@@ -696,7 +659,6 @@ BOOL daNpc_Uri_c::evtTalk() {
     return 1;
 }
 
-/* 80B27D2C-80B27DF4 00166C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_Uri_cFv */
 BOOL daNpc_Uri_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("Uri", this, -1);
     if (staffId != -1) {
@@ -711,7 +673,6 @@ BOOL daNpc_Uri_c::evtCutProc() {
     return false;
 }
 
-/* 80B27DF4-80B27F14 001734 0120+00 1/0 0/0 0/0 .text            action__11daNpc_Uri_cFv */
 void daNpc_Uri_c::action() {
     fopAc_ac_c* hitActor = hitChk(&mCyl, 0xffffffff);
 
@@ -733,7 +694,6 @@ void daNpc_Uri_c::action() {
     }
 }
 
-/* 80B27F14-80B27FD8 001854 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_Uri_cFv */
 void daNpc_Uri_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -745,10 +705,8 @@ void daNpc_Uri_c::beforeMove() {
     }
 }
 
-/* 80B2DD64-80B2DD68 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 NPC_URI_HIO_CLASS l_HIO;
 
-/* 80B27FD8-80B28318 001918 0340+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_Uri_cFv */
 void daNpc_Uri_c::setAttnPos() {
     cXyz acStack_3c(-30.0f, 10.0f, 0.0f);
 
@@ -793,7 +751,6 @@ void daNpc_Uri_c::setAttnPos() {
     }
 }
 
-/* 80B28318-80B284D4 001C58 01BC+00 1/0 0/0 0/0 .text            setCollision__11daNpc_Uri_cFv */
 void daNpc_Uri_c::setCollision() {
     cXyz cStack_48;
 
@@ -848,12 +805,10 @@ void daNpc_Uri_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B284D4-80B284DC 001E14 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_Uri_cFv */
 int daNpc_Uri_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B284DC-80B285B4 001E1C 00D8+00 1/0 0/0 0/0 .text            drawOtherMdl__11daNpc_Uri_cFv */
 void daNpc_Uri_c::drawOtherMdl() {
     static int const jointNo[1] = {12};
 
@@ -872,7 +827,6 @@ void daNpc_Uri_c::drawOtherMdl() {
     }
 }
 
-/* 80B285B4-80B285EC 001EF4 0038+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_Uri_cFiifi */
 bool daNpc_Uri_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int param_4) {
     field_0x1008 = 0;
 
@@ -908,7 +862,6 @@ bool daNpc_Uri_c::afterSetMotionAnm(int param_1, int param_2, f32 param_3, int p
     return true;
 }
 
-/* 80B285EC-80B28618 001F2C 002C+00 1/0 0/0 0/0 .text            changeBck__11daNpc_Uri_cFPiPi */
 void daNpc_Uri_c::changeBck(int* param_0, int* param_1) {
     if (mType != TYPE_5) {
         return;
@@ -920,7 +873,6 @@ void daNpc_Uri_c::changeBck(int* param_0, int* param_1) {
     *param_1 = 5;
 }
 
-/* 80B28618-80B28644 001F58 002C+00 1/0 0/0 0/0 .text            changeBtp__11daNpc_Uri_cFPiPi */
 void daNpc_Uri_c::changeBtp(int* param_0, int* param_1) {
     if (mType != TYPE_5) {
         return;
@@ -932,7 +884,6 @@ void daNpc_Uri_c::changeBtp(int* param_0, int* param_1) {
     *param_1 = 5;
 }
 
-/* 80B28644-80B28794 001F84 0150+00 1/1 0/0 0/0 .text            selectAction__11daNpc_Uri_cFv */
 int daNpc_Uri_c::selectAction() {
     field_0xfc0[0] = NULL;
 
@@ -964,14 +915,10 @@ int daNpc_Uri_c::selectAction() {
     return 1;
 }
 
-/* 80B28794-80B287C0 0020D4 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_Uri_cFM11daNpc_Uri_cFPCvPvPv_i            */
 int daNpc_Uri_c::chkAction(int (daNpc_Uri_c::*action)(void*)) {
     return field_0xfc0[1] == action;
 }
 
-/* 80B287C0-80B28868 002100 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_Uri_cFM11daNpc_Uri_cFPCvPvPv_i            */
 int daNpc_Uri_c::setAction(int (daNpc_Uri_c::*action)(void*)) {
     mMode = 3;
     if (field_0xfc0[1] != NULL) {
@@ -986,7 +933,6 @@ int daNpc_Uri_c::setAction(int (daNpc_Uri_c::*action)(void*)) {
     return 1;
 }
 
-/* 80B28868-80B288DC 0021A8 0074+00 2/2 0/0 0/0 .text chkPlayerCarryBasket__11daNpc_Uri_cFv */
 BOOL daNpc_Uri_c::chkPlayerCarryBasket() {
     fopAc_ac_c* actor = NULL;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -998,12 +944,10 @@ BOOL daNpc_Uri_c::chkPlayerCarryBasket() {
     return FALSE;
 }
 
-/* 80B288DC-80B28910 00221C 0034+00 1/1 0/0 0/0 .text chkPlayerGetWoodShield__11daNpc_Uri_cFv */
 BOOL daNpc_Uri_c::chkPlayerGetWoodShield() {
     return dComIfGs_isCollectShield(0);
 }
 
-/* 80B28910-80B28FB8 002250 06A8+00 2/2 0/0 0/0 .text getTutorialCond__11daNpc_Uri_cF4cXyz */
 int daNpc_Uri_c::getTutorialCond(cXyz param_1) {
     cXyz local_44;
     cXyz local_50;
@@ -1057,7 +1001,6 @@ int daNpc_Uri_c::getTutorialCond(cXyz param_1) {
     return 2;
 }
 
-/* 80B28FB8-80B29198 0028F8 01E0+00 1/0 0/0 0/0 .text            cutConversation__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutConversation(int param_1) {
     int rv = 0;
     int iVar4 = -1;
@@ -1110,7 +1053,6 @@ int daNpc_Uri_c::cutConversation(int param_1) {
     return rv;
 }
 
-/* 80B29198-80B293C0 002AD8 0228+00 1/0 0/0 0/0 .text cutStartCarryTutorial__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutStartCarryTutorial(int param_1) {
     cXyz acStack_30;
     csXyz cStack_38;
@@ -1158,7 +1100,6 @@ int daNpc_Uri_c::cutStartCarryTutorial(int param_1) {
     return uVar7;
 }
 
-/* 80B293C0-80B296B8 002D00 02F8+00 1/0 0/0 0/0 .text cutEndCarryTutorial__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutEndCarryTutorial(int param_1) {
     cXyz acStack_30;
     csXyz cStack_44;
@@ -1230,7 +1171,6 @@ int daNpc_Uri_c::cutEndCarryTutorial(int param_1) {
     return uVar8;
 }
 
-/* 80B296B8-80B2985C 002FF8 01A4+00 1/0 0/0 0/0 .text cutConversationWithMoi__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutConversationWithMoi(int param_1) {
     int uVar5 = 0;
     int iVar4 = -1;
@@ -1276,7 +1216,6 @@ int daNpc_Uri_c::cutConversationWithMoi(int param_1) {
     return uVar5;
 }
 
-/* 80B2985C-80B29BA4 00319C 0348+00 1/0 0/0 0/0 .text            cutFindWolf__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutFindWolf(int param_1) {
     cXyz cStack_2c;
     int iVar12 = 0;
@@ -1349,7 +1288,6 @@ int daNpc_Uri_c::cutFindWolf(int param_1) {
     return iVar12;
 }
 
-/* 80B29BA4-80B29EA0 0034E4 02FC+00 1/0 0/0 0/0 .text            cutMeetingAgain__11daNpc_Uri_cFi */
 int daNpc_Uri_c::cutMeetingAgain(int param_1) {
     cXyz acStack_40;
     csXyz cStack_48;
@@ -1429,7 +1367,6 @@ int daNpc_Uri_c::cutMeetingAgain(int param_1) {
     return uVar9;
 }
 
-/* 80B29EA0-80B2A1B4 0037E0 0314+00 1/0 0/0 0/0 .text            krun__11daNpc_Uri_cFPv */
 int daNpc_Uri_c::krun(void* param_0) {
     int iVar7 = mpHIO->m.field_0x8c / 2;
 
@@ -1478,7 +1415,6 @@ int daNpc_Uri_c::krun(void* param_0) {
     return 1;
 }
 
-/* 80B2A1B4-80B2AB60 003AF4 09AC+00 2/0 0/0 0/0 .text            wait__11daNpc_Uri_cFPv */
 int daNpc_Uri_c::wait(void* param_0) {
     s16 sVar10 = home.angle.y;
 
@@ -1666,7 +1602,6 @@ int daNpc_Uri_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80B2AB60-80B2B24C 0044A0 06EC+00 1/0 0/0 0/0 .text            walk__11daNpc_Uri_cFPv */
 int daNpc_Uri_c::walk(void* param_0) {
     BOOL bVar = FALSE;
     int uVar2 = mpHIO->m.field_0x8c;
@@ -1791,7 +1726,6 @@ int daNpc_Uri_c::walk(void* param_0) {
     return 1;
 }
 
-/* 80B2B24C-80B2B7C0 004B8C 0574+00 2/0 0/0 0/0 .text            sitWait__11daNpc_Uri_cFPv */
 int daNpc_Uri_c::sitWait(void* param_0) {
     int sVar2 = mpHIO->m.field_0x92;
 
@@ -1895,7 +1829,6 @@ int daNpc_Uri_c::sitWait(void* param_0) {
     return 1;
 }
 
-/* 80B2B7C0-80B2BA08 005100 0248+00 3/0 0/0 0/0 .text            talk__11daNpc_Uri_cFPv */
 int daNpc_Uri_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1944,39 +1877,32 @@ int daNpc_Uri_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80B2BA08-80B2BA28 005348 0020+00 1/0 0/0 0/0 .text            daNpc_Uri_Create__FPv */
 static int daNpc_Uri_Create(void* i_this) {
     return static_cast<daNpc_Uri_c*>(i_this)->create();
 }
 
-/* 80B2BA28-80B2BA48 005368 0020+00 1/0 0/0 0/0 .text            daNpc_Uri_Delete__FPv */
 static int daNpc_Uri_Delete(void* i_this) {
     return static_cast<daNpc_Uri_c*>(i_this)->Delete();
 }
 
-/* 80B2BA48-80B2BA68 005388 0020+00 1/0 0/0 0/0 .text            daNpc_Uri_Execute__FPv */
 static int daNpc_Uri_Execute(void* i_this) {
     return static_cast<daNpc_Uri_c*>(i_this)->Execute();
 }
 
-/* 80B2BA68-80B2BA88 0053A8 0020+00 1/0 0/0 0/0 .text            daNpc_Uri_Draw__FPv */
 static int daNpc_Uri_Draw(void* i_this) {
     return static_cast<daNpc_Uri_c*>(i_this)->Draw();
 }
 
-/* 80B2BA88-80B2BA90 0053C8 0008+00 1/0 0/0 0/0 .text            daNpc_Uri_IsDelete__FPv */
 static int daNpc_Uri_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B2DB44-80B2DB64 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Uri_MethodTable */
 static actor_method_class daNpc_Uri_MethodTable = {
     (process_method_func)daNpc_Uri_Create,  (process_method_func)daNpc_Uri_Delete,
     (process_method_func)daNpc_Uri_Execute, (process_method_func)daNpc_Uri_IsDelete,
     (process_method_func)daNpc_Uri_Draw,
 };
 
-/* 80B2DB64-80B2DB94 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_URI */
 extern actor_process_profile_definition g_profile_NPC_URI = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp
index 9a74f2b8cf..4c59f1667f 100644
--- a/src/d/actor/d_a_npc_worm.cpp
+++ b/src/d/actor/d_a_npc_worm.cpp
@@ -6,9 +6,7 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_npc_worm.h"
-#include "dol2asm.h"
 
-/* 80B2DE78-80B2DF4C 000078 00D4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = joint->getJntNo();
@@ -24,8 +22,6 @@ static int nodeCallBack(J3DJoint* joint, int param_2) {
     return 1;
 }
 
-/* 80B2DF4C-80B2E044 00014C 00F8+00 1/0 0/0 0/0 .text            daNPC_WORM_Draw__FP14npc_worm_class
- */
 static int daNPC_WORM_Draw(npc_worm_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     if (i_this->field_0x5d4 > 0.01f) {
@@ -47,8 +43,6 @@ static int daNPC_WORM_Draw(npc_worm_class* i_this) {
     return 1;
 }
 
-/* 80B2E044-80B2E2C4 000244 0280+00 1/1 0/0 0/0 .text            npc_worm_ground__FP14npc_worm_class
- */
 static void npc_worm_ground(npc_worm_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     BOOL bVar2 = FALSE;
@@ -83,8 +77,6 @@ static void npc_worm_ground(npc_worm_class* i_this) {
     }
 }
 
-/* 80B2E2C4-80B2E544 0004C4 0280+00 1/1 0/0 0/0 .text            npc_worm_normal__FP14npc_worm_class
- */
 static void npc_worm_normal(npc_worm_class* i_this) {
     fopAc_ac_c* a_this = i_this;
     switch(i_this->field_0x5a8) {
@@ -138,8 +130,6 @@ static void npc_worm_normal(npc_worm_class* i_this) {
     cLib_addCalcAngleS2(&a_this->shape_angle.x, 0, 2, 0x800);
 }
 
-/* 80B2E544-80B2E678 000744 0134+00 1/1 0/0 0/0 .text            npc_worm_dive__FP14npc_worm_class
- */
 static void npc_worm_dive(npc_worm_class* i_this) {
     switch(i_this->field_0x5a8) {
     case 0:
@@ -171,7 +161,6 @@ static void npc_worm_dive(npc_worm_class* i_this) {
     cLib_addCalc2(&i_this->field_0x5d4, 1.0f, 0.1f, 0.02f);
 }
 
-/* 80B2E678-80B2E6C4 000878 004C+00 1/1 0/0 0/0 .text npc_worm_binwait__FP14npc_worm_class */
 static void npc_worm_binwait(npc_worm_class* i_this) {
     dComIfGp_getPlayer(0);
     switch(i_this->field_0x5a8) {
@@ -188,7 +177,6 @@ static void npc_worm_binwait(npc_worm_class* i_this) {
     }
 }
 
-/* 80B2E6C4-80B2EBF4 0008C4 0530+00 1/1 0/0 0/0 .text            action__FP14npc_worm_class */
 static void action(npc_worm_class* i_this) {
     fopAc_ac_c* a_this = i_this;
     cXyz local_124;
@@ -304,7 +292,6 @@ static void action(npc_worm_class* i_this) {
     }
 }
 
-/* 80B2EBF4-80B2EDD0 000DF4 01DC+00 2/1 0/0 0/0 .text daNPC_WORM_Execute__FP14npc_worm_class */
 static int daNPC_WORM_Execute(npc_worm_class* i_this) {
     i_this->field_0x5a4++;
     for (int i = 0; i < 2; i++) {
@@ -340,19 +327,16 @@ static int daNPC_WORM_Execute(npc_worm_class* i_this) {
     return 1;
 }
 
-/* 80B2EDD0-80B2EDD8 000FD0 0008+00 1/0 0/0 0/0 .text daNPC_WORM_IsDelete__FP14npc_worm_class */
 static int daNPC_WORM_IsDelete(npc_worm_class* i_this) {
     return 1;
 }
 
-/* 80B2EDD8-80B2EE08 000FD8 0030+00 1/0 0/0 0/0 .text daNPC_WORM_Delete__FP14npc_worm_class */
 static int daNPC_WORM_Delete(npc_worm_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Alink");
     return 1;
 }
 
-/* 80B2EE08-80B2EEC0 001008 00B8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     npc_worm_class* i_this = (npc_worm_class*)a_this;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x30);
@@ -370,8 +354,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80B2EEC0-80B2F050 0010C0 0190+00 1/0 0/0 0/0 .text            daNPC_WORM_Create__FP10fopAc_ac_c
- */
 static int daNPC_WORM_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, npc_worm_class);
     npc_worm_class* i_this = (npc_worm_class*)a_this;
@@ -410,7 +392,6 @@ static int daNPC_WORM_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 80B2F12C-80B2F14C -00001 0020+00 1/0 0/0 0/0 .data            l_daNPC_WORM_Method */
 static actor_method_class l_daNPC_WORM_Method = {
     (process_method_func)daNPC_WORM_Create,
     (process_method_func)daNPC_WORM_Delete,
@@ -419,7 +400,6 @@ static actor_method_class l_daNPC_WORM_Method = {
     (process_method_func)daNPC_WORM_Draw,
 };
 
-/* 80B2F14C-80B2F17C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_WORM */
 extern actor_process_profile_definition g_profile_NPC_WORM = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp
index d73cbc78f4..236f0f51e6 100644
--- a/src/d/actor/d_a_npc_wrestler.cpp
+++ b/src/d/actor/d_a_npc_wrestler.cpp
@@ -243,10 +243,8 @@ enum Bou3_Joint {
     /* 0x24 */ JNT_OBIR,
 };
 
-/* 80B41E18-80B41E1C -00001 0004+00 1/2 0/0 0/0 .data            l_resALink */
 static char* l_resALink = "alSumou";
 
-/* 80B41E1C-80B41E30 -00001 0014+00 9/13 0/0 0/0 .data            l_resName */
 static char* l_resName[5] = {
     "Bou3",
     "grDS",
@@ -255,12 +253,10 @@ static char* l_resName[5] = {
     NULL,
 };
 
-/* 80B41E30-80B41E44 000038 0014+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[5] = {
     BMDR_BOUS, BMDR_GRD, 0, 0, 0,
 };
 
-/* 80B41E44-80B4203C 00004C 01F8+00 1/0 0/0 0/0 .data            l_BouBckParamList */
 static daNpc_GetParam1 l_BouBckParamList[63] = {
     {-1, 2}, {BCK_BOUS_F_DOWN, 2}, {BCK_BOUS_F_HEAD_UP, 0}, 
     {BCK_BOUS_F_LOSE, 0}, {BCK_BOUS_F_LOSE2, 0}, {BCK_BOUS_F_PULLBACK, 0}, 
@@ -285,7 +281,6 @@ static daNpc_GetParam1 l_BouBckParamList[63] = {
     {-1, 2}, {-1, 2}, {-1, 2},
 };
 
-/* 80B4203C-80B42150 000244 0114+00 1/0 0/0 0/0 .data            l_BouFaceParamList */
 static daNpc_GetParam2 l_BouFaceParamList[23] = {
     {-1, 0x44, 2}, {7, 0x45, 2}, {8, 0x46, 0},
     {9, 0x47, 0}, {10, 0x48, 0}, {11, 0x49, 0}, 
@@ -297,7 +292,6 @@ static daNpc_GetParam2 l_BouFaceParamList[23] = {
     {27, 0x58, 0}, {28, 0x59, 0},
 };
 
-/* 80B42150-80B42208 000358 00B8+00 1/0 0/0 0/0 .data            l_BouBtpParamList */
 static daNpc_GetParam1 l_BouBtpParamList[23] = {
     {BTP_BOUS, 2}, {BTP_BOUS_F_DOWN, 0}, 
     {BTP_BOUS_F_HEAD_UP, 0}, {BTP_BOUS_F_LOSE, 0}, 
@@ -313,12 +307,10 @@ static daNpc_GetParam1 l_BouBtpParamList[23] = {
     {BTP_BOUS_F_WIN_POSE, 0},
 };
 
-/* 80B42208-80B42210 000410 0008+00 1/0 0/0 0/0 .data            l_BouBtkParamList */
 static daNpc_GetParam1 l_BouBtkParamList[1] = {
     {BTK_BOUS, 2},
 };
 
-/* 80B42210-80B42220 -00001 0010+00 1/0 0/0 0/0 .data            l_BouAnmParamList */
 static WrestlerParamList l_BouAnmParamList = {
     l_BouBckParamList,
     l_BouFaceParamList,
@@ -326,7 +318,6 @@ static WrestlerParamList l_BouAnmParamList = {
     l_BouBtkParamList,
 };
 
-/* 80B42220-80B42418 000428 01F8+00 1/0 0/0 0/0 .data            l_GrdBckParamList */
 static daNpc_GetParam1 l_GrdBckParamList[63] = {
     {-1, 2}, {8, 2}, {9, 0}, {10, 0},
     {0x0B, 0}, {0x0D, 0}, {0x0E, 0}, {0x0F, 0},
@@ -346,7 +337,6 @@ static daNpc_GetParam1 l_GrdBckParamList[63] = {
     {0x3C, 0}, {0x3D, 0}, {0x42, 2},
 };
 
-/* 80B42418-80B4252C 000620 0114+00 1/0 0/0 0/0 .data            l_GrdFaceParamList */
 static daNpc_GetParam2 l_GrdFaceParamList[23] = {
     {-1, 0x4D, 2}, {8, 0x4E, 2}, {9, 0x4F, 0},
     {0x0A, 0x50, 0}, {0x0B, 0x51, 0}, {0x0D, 0x52, 0}, 
@@ -358,7 +348,6 @@ static daNpc_GetParam2 l_GrdFaceParamList[23] = {
     {0x1E, 0x5F, 0}, {0x1F, -1, 0},
 };
 
-/* 80B4252C-80B425E4 000734 00B8+00 1/0 0/0 0/0 .data            l_GrdBtpParamList */
 static daNpc_GetParam1 l_GrdBtpParamList[23] = {
     {0x4D, 2}, {0x4E, 2}, {0x4F, 0}, {0x50, 0},
     {0x51, 0}, {0x52, 0}, {-1, 0}, {0x53, 0},
@@ -368,12 +357,10 @@ static daNpc_GetParam1 l_GrdBtpParamList[23] = {
     {0x5E, 2}, {0x5F, 0}, {-1, 0},
 };
 
-/* 80B425E4-80B425EC 0007EC 0008+00 1/0 0/0 0/0 .data            l_GrdBtkParamList */
 static daNpc_GetParam1 l_GrdBtkParamList[1] = {
     {0x4A, 2},
 };
 
-/* 80B425EC-80B425FC -00001 0010+00 1/0 0/0 0/0 .data            l_GrdAnmParamList */
 static WrestlerParamList l_GrdAnmParamList = {
     l_GrdBckParamList,
     l_GrdFaceParamList,
@@ -381,13 +368,11 @@ static WrestlerParamList l_GrdAnmParamList = {
     l_GrdBtkParamList,
 };
 
-/* 80B425FC-80B42604 -00001 0008+00 0/1 0/0 0/0 .data            l_anmList */
 static WrestlerParamList* l_anmList[2] = {
     &l_BouAnmParamList,
     &l_GrdAnmParamList,
 };
 
-/* 80B42604-80B42620 -00001 001C+00 2/5 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[7] = {
     NULL,
     "GRDS_ENTRY",
@@ -398,13 +383,10 @@ static char* l_evtNames[7] = {
     "GRDS_LOSE",
 };
 
-/* 80B42620-80B42624 -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "Wrestler";
 
-/* 80B42E24-80B42E28 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_WRESTLER_HIO_CLASS l_HIO;
 
-/* 80B416DC-80B41870 000000 0194+00 35/35 0/0 0/0 .rodata          m__21daNpcWrestler_Param_c */
 const daNpcWrestler_HIOParam daNpcWrestler_Param_c::m = {
     220.0f,
     -3.0f,
@@ -663,7 +645,6 @@ void daNpcWrestler_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B4266C-80B426C0 000874 0054+00 0/2 0/0 0/0 .data            mEvtSeqList__15daNpcWrestler_c */
 daNpcWrestler_c::EventFn daNpcWrestler_c::mEvtSeqList[7] = {
     NULL,
     &daNpcWrestler_c::EvCut_grDSEntry,
@@ -691,7 +672,6 @@ daNpcWrestler_c::~daNpcWrestler_c() {
 #endif
 }
 
-/* 80B2F688-80B2F974 0004E8 02EC+00 1/1 0/0 0/0 .text            Create__15daNpcWrestler_cFv */
 cPhs__Step daNpcWrestler_c::Create() {
     fopAcM_ct(this, daNpcWrestler_c);
 
@@ -745,7 +725,6 @@ cPhs__Step daNpcWrestler_c::Create() {
     return phase;
 }
 
-/* 80B2F974-80B2FBF4 0007D4 0280+00 1/1 0/0 0/0 .text            CreateHeap__15daNpcWrestler_cFv */
 int daNpcWrestler_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -781,21 +760,18 @@ int daNpcWrestler_c::CreateHeap() {
     return 1;
 }
 
-/* 80B2FDB0-80B2FDE4 000C10 0034+00 1/1 0/0 0/0 .text            Delete__15daNpcWrestler_cFv */
 int daNpcWrestler_c::Delete() {
     fopAcM_RegisterDeleteID(this, "NPC_WRESTLER");
     this->~daNpcWrestler_c();
     return 1;
 }
 
-/* 80B2FDE4-80B2FE1C 000C44 0038+00 2/2 0/0 0/0 .text            Execute__15daNpcWrestler_cFv */
 int daNpcWrestler_c::Execute() {
     checkArenaInfo();
     execute();
     return 1;
 }
 
-/* 80B2FE1C-80B2FE84 000C7C 0068+00 1/1 0/0 0/0 .text            Draw__15daNpcWrestler_cFv */
 int daNpcWrestler_c::Draw() {
     if (mWrestlerNoDraw != 0) {
         return 0;
@@ -806,7 +782,6 @@ int daNpcWrestler_c::Draw() {
     return draw(FALSE, FALSE, field_0xbdc->real_shadow_size, NULL, FALSE);
 }
 
-/* 80B2FE84-80B30150 000CE4 02CC+00 1/1 0/0 0/0 .text            ctrlJoint__15daNpcWrestler_cFP8J3DJointP8J3DModel */
 int daNpcWrestler_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* my_joint = i_joint;
     int jnt_no = my_joint->getJntNo();
@@ -872,13 +847,11 @@ int daNpcWrestler_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B30150-80B30170 000FB0 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__15daNpcWrestler_cFP10fopAc_ac_c */
 int daNpcWrestler_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpcWrestler_c* i_this = (daNpcWrestler_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80B30170-80B301BC 000FD0 004C+00 1/1 0/0 0/0 .text            ctrlJointCallBack__15daNpcWrestler_cFP8J3DJointi */
 int daNpcWrestler_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -890,12 +863,10 @@ int daNpcWrestler_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B301BC-80B3023C 00101C 0080+00 0/0 0/0 1/1 .text            checkStartUp__15daNpcWrestler_cFv */
 bool daNpcWrestler_c::checkStartUp() {
     return chkAction(&daNpcWrestler_c::gotoArena) && field_0xe96 == 2;
 }
 
-/* 80B405E8-80B40B3C 011448 0554+00 1/1 0/0 0/0 .text            setAttnPos__15daNpcWrestler_cFv */
 void daNpcWrestler_c::setAttnPos() {
     static cXyz eyeOffset(-10.0f, 10.0f, 0.0f);
     cXyz* attnPos = NULL;
@@ -967,7 +938,6 @@ void daNpcWrestler_c::setAttnPos() {
     }
 }
 
-/* 80B3023C-80B30654 00109C 0418+00 2/0 0/0 0/0 .text setExpressionAnm__15daNpcWrestler_cFib */
 bool daNpcWrestler_c::setExpressionAnm(int param_1, bool param_2) {
     mAnmFlags &= 0xFFFFE03F;
 
@@ -1109,7 +1079,6 @@ bool daNpcWrestler_c::setExpressionAnm(int param_1, bool param_2) {
     return false;
 }
 
-/* 80B30654-80B3074C 0014B4 00F8+00 1/0 0/0 0/0 .text setExpressionBtp__15daNpcWrestler_cFi */
 bool daNpcWrestler_c::setExpressionBtp(int param_1) {
     J3DAnmTexPattern* anmTexPattern = (field_0xe04->btp_list[param_1].fileIdx >= 0) ?
                     getTexPtrnAnmP(l_resName[mType], field_0xe04->btp_list[param_1].fileIdx) : NULL;
@@ -1169,7 +1138,6 @@ void daNpcWrestler_c::setBackToLiving() {
     field_0xe99 = 1;
 }
 
-/* 80B3074C-80B308B0 0015AC 0164+00 1/0 0/0 0/0 .text            setMotionAnm__15daNpcWrestler_cFif */
 void daNpcWrestler_c::setMotionAnm(int param_1, f32 param_2) {
 #if DEBUG
     const static int btkType = 0;
@@ -1237,7 +1205,6 @@ static s16 dummy_lit_123964(int sel) {
 }
 #endif
 
-/* 80B308B0-80B30AD8 001710 0228+00 1/1 0/0 0/0 .text            reset__15daNpcWrestler_cFv */
 void daNpcWrestler_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -1315,7 +1282,6 @@ void daNpcWrestler_c::setNextSumouEvent(int i_sumouEventNo) {
     }
 }
 
-/* 80B30AD8-80B30B80 001938 00A8+00 1/1 0/0 0/0 .text            setAction__15daNpcWrestler_cFM15daNpcWrestler_cFPCvPvPv_b */
 int daNpcWrestler_c::setAction(actionFunc action) {
     field_0xe96 = 3;
     if (field_0xdcc != NULL) {
@@ -1331,7 +1297,6 @@ int daNpcWrestler_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80B30B80-80B30BEC 0019E0 006C+00 1/1 0/0 0/0 .text            s_sub1__FPvPv */
 static void* s_sub1(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Tag_Arena
         && ((daNpcWrestler_c*)i_data)->checkArenaSub((daNpcWrestler_c*)i_actor)) {
@@ -1341,7 +1306,6 @@ static void* s_sub1(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B30BEC-80B30CA4 001A4C 00B8+00 2/2 0/0 0/0 .text            checkArenaInfo__15daNpcWrestler_cFv */
 void daNpcWrestler_c::checkArenaInfo() {
     if (mArenaInfo.chkFlag == 0) {
         base_process_class* bpc_p = fpcM_Search(s_sub1, this);
@@ -1357,7 +1321,6 @@ void daNpcWrestler_c::checkArenaInfo() {
     }
 }
 
-/* 80B30CA4-80B30CC8 001B04 0024+00 1/1 0/0 0/0 .text            checkArenaSub__15daNpcWrestler_cFP10fopAc_ac_c */
 bool daNpcWrestler_c::checkArenaSub(fopAc_ac_c* actor) {
     daTagArena_c* arena = (daTagArena_c*)actor;
     if (getArenaNo() == arena->getArenaNo()) {
@@ -1367,7 +1330,6 @@ bool daNpcWrestler_c::checkArenaSub(fopAc_ac_c* actor) {
     return false;
 }
 
-/* 80B30CC8-80B30D48 001B28 0080+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* i_actor, void* i_data) {
     (void) i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRA) {
@@ -1382,7 +1344,6 @@ static void* s_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B30D48-80B30F00 001BA8 01B8+00 2/2 0/0 0/0 .text            setOnToArena__15daNpcWrestler_cFf */
 void daNpcWrestler_c::setOnToArena(f32 param_1) {
     if (mType == 0) {
         daNpcBouS_c* bou = (daNpcBouS_c*)fpcM_SearchByID(parentActorID);
@@ -1499,7 +1460,6 @@ void daNpcWrestler_c::playExpression() {
     }
 }
 
-/* 80B3FCE8-80B404FC 010B48 0814+00 1/2 0/0 0/0 .text            playMotion__15daNpcWrestler_cFv */
 void daNpcWrestler_c::playMotion() {
     daNpcF_anmPlayData playData0 = {0x39, field_0xbd8->common.morf_frame, 0};
     daNpcF_anmPlayData* pDat0[1] = {&playData0};
@@ -1609,7 +1569,6 @@ void daNpcWrestler_c::playMotion() {
     }
 }
 
-/* 80B40B3C-80B40D1C 01199C 01E0+00 1/1 0/0 0/0 .text            lookat__15daNpcWrestler_cFv */
 void daNpcWrestler_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1661,7 +1620,6 @@ void daNpcWrestler_c::lookat() {
     mLookAt.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, FALSE);
 }
 
-/* 80B33B3C-80B34654 00499C 0B18+00 1/1 0/0 0/0 .text            setNextAction__15daNpcWrestler_cFv */
 bool daNpcWrestler_c::setNextAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1769,7 +1727,6 @@ bool daNpcWrestler_c::setNextAction() {
     return false;
 }
 
-/* 80B30F00-80B31680 001D60 0780+00 13/1 0/0 0/0 .text            wait__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::wait(void* param_1) {
     switch (field_0xe96) {
         case 0: {
@@ -1855,7 +1812,6 @@ bool daNpcWrestler_c::wait(void* param_1) {
     return true;
 }
 
-/* 80B31680-80B316C8 0024E0 0048+00 1/0 0/0 0/0 .text            setMotion__15daNpcWrestler_cFifi */
 void daNpcWrestler_c::setMotion(int i_motion, f32 i_motionMorfOverride, int param_3) {
     s16 motion = i_motion;
     if (param_3 || mMotion != motion) {
@@ -1869,7 +1825,6 @@ void daNpcWrestler_c::setMotion(int i_motion, f32 i_motionMorfOverride, int para
     }
 }
 
-/* 80B316C8-80B316F4 002528 002C+00 1/0 0/0 0/0 .text            setExpression__15daNpcWrestler_cFif */
 void daNpcWrestler_c::setExpression(int i_expression, f32 i_expressionMorfOvveride) {
     if (i_expression >= 0 && i_expression < 6) {
         mExpression = i_expression;
@@ -1915,7 +1870,6 @@ void daNpcWrestler_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80B316F4-80B31EB0 002554 07BC+00 3/0 0/0 0/0 .text            talk__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::talk(void* param_1) {
     bool rv = false;
     int i_expression, i_motion, iVar3;
@@ -2010,7 +1964,6 @@ bool daNpcWrestler_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80B31EB0-80B32058 002D10 01A8+00 4/0 0/0 0/0 .text            demo__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demo(void* param_1) {
     dEvent_manager_c* eventManager = &dComIfGp_getEventManager();
 
@@ -2053,7 +2006,6 @@ bool daNpcWrestler_c::demo(void* param_1) {
     return true;
 }
 
-/* 80B32058-80B32444 002EB8 03EC+00 7/0 0/0 0/0 .text            gotoArena__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::gotoArena(void* param_1) {
     dCamera_c* camBody = dCam_getBody();
 
@@ -2120,7 +2072,6 @@ bool daNpcWrestler_c::gotoArena(void* param_1) {
     return true;
 }
 
-/* 80B32444-80B32850 0032A4 040C+00 1/0 0/0 0/0 .text            gotoLiving__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::gotoLiving(void* param_1) {
     dCamera_c* camBody = dCam_getBody();
     int iVar1;
@@ -2202,7 +2153,6 @@ void daNpcWrestler_c::initDemoCamera_ArenaSide() {
     mDoMtx_stack_c::multVecZero(&mDemoCam.mDemoCamEye);
 }
 
-/* 80B32850-80B331CC 0036B0 097C+00 2/0 0/0 0/0 .text            sumouReady__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouReady(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -2402,7 +2352,6 @@ void daNpcWrestler_c::correctGraspPosAngle(bool param_1) {
     }
 }
 
-/* 80B339EC-80B33B3C 00484C 0150+00 13/13 0/0 0/0 .text          checkOutOfArenaP__15daNpcWrestler_cFv */
 bool daNpcWrestler_c::checkOutOfArenaP() {
     if (mArenaInfo.chkFlag == 0) {
         return false;
@@ -2415,7 +2364,6 @@ bool daNpcWrestler_c::checkOutOfArenaP() {
     return (left_foot_pos.abs2XZ(mArenaPos) > fVar1) || (right_foot_pos.abs2XZ(mArenaPos) > fVar1);
 }
 
-/* 80B331CC-80B339EC 00402C 0820+00 14/0 0/0 0/0 .text           sumouWait__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouWait(void* param_1) {
     switch (field_0xe96) {
         case 0:
@@ -2495,7 +2443,6 @@ bool daNpcWrestler_c::sumouWait(void* param_1) {
     return true;
 }
 
-/* 80B34654-80B34CD0 0054B4 067C+00 2/0 0/0 0/0 .text            sumouPunchHit__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchHit(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0x12 : 0x11;
@@ -2602,7 +2549,6 @@ bool daNpcWrestler_c::sumouPunchHit(void* param_1) {
     return true;
 }
 
-/* 80B34CD0-80B35364 005B30 0694+00 2/0 0/0 0/0 .text            sumouPunchChaseHit__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) {
     int jointNo = mType == 0 ? 0x12 : 0x11;
     cXyz sp38;
@@ -2707,7 +2653,6 @@ bool daNpcWrestler_c::sumouPunchChaseHit(void* param_1) {
     return true;
 }
 
-/* 80B35780-80B358F0 0065E0 0170+00 8/8 0/0 0/0 .text            checkOutOfArenaW__15daNpcWrestler_cFv */
 bool daNpcWrestler_c::checkOutOfArenaW() {
     if (mArenaInfo.chkFlag == 0) {
         return false;
@@ -2722,7 +2667,6 @@ bool daNpcWrestler_c::checkOutOfArenaW() {
     return field_0x89c.abs2XZ(mArenaPos) > fVar1 || field_0x8a8.abs2XZ(mArenaPos) > fVar1;
 }
 
-/* 80B35364-80B35780 0061C4 041C+00 1/0 0/0 0/0 .text            sumouPunchMiss__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchMiss(void* param_1) {
     // NONMATCHING - regalloc
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2786,7 +2730,6 @@ bool daNpcWrestler_c::sumouPunchMiss(void* param_1) {
     return true;
 }
 
-/* 80B358F0-80B35968 006750 0078+00 4/4 0/0 0/0 .text            getJointPos__15daNpcWrestler_cFi */
 cXyz daNpcWrestler_c::getJointPos(int i_jointNo) {
     cXyz jointPos;
     mDoMtx_stack_c::copy(mAnm_p->getModel()->getAnmMtx(i_jointNo));
@@ -2794,7 +2737,6 @@ cXyz daNpcWrestler_c::getJointPos(int i_jointNo) {
     return jointPos;
 }
 
-/* 80B35968-80B3606C 0067C8 0704+00 2/0 0/0 0/0 .text            sumouPunchDraw__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchDraw(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0x12 : 0x11;
@@ -2897,7 +2839,6 @@ bool daNpcWrestler_c::sumouPunchDraw(void* param_1) {
     return true;
 }
 
-/* 80B3606C-80B36908 006ECC 089C+00 5/0 0/0 0/0 .text            sumouTackleHit__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleHit(void* param_1) {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0 : 0;
@@ -3039,7 +2980,6 @@ bool daNpcWrestler_c::sumouTackleHit(void* param_1) {
     return true;
 }
 
-/* 80B36908-80B36C8C 007768 0384+00 2/0 0/0 0/0 .text            sumouTackleMiss__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleMiss(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3077,7 +3017,6 @@ bool daNpcWrestler_c::sumouTackleMiss(void* param_1) {
     return true;
 }
 
-/* 80B36C8C-80B37270 007AEC 05E4+00 2/0 0/0 0/0 .text            sumouTackleDraw__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleDraw(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0 : 0;
@@ -3195,7 +3134,6 @@ void daNpcWrestler_c::setStepAngle() {
     mStepAngle = stepAngle;
 }
 
-/* 80B37270-80B378F4 0080D0 0684+00 4/0 0/0 0/0 .text            sumouSideStep__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouSideStep(void* param_1) {
     // NONMATCHING - g_dComIfG_gameInfo weirdness
     switch (field_0xe96) {
@@ -3269,7 +3207,6 @@ bool daNpcWrestler_c::sumouSideStep(void* param_1) {
     return true;
 }
 
-/* 80B378F4-80B37C30 008754 033C+00 1/0 0/0 0/0 .text            sumouLostBalance__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouLostBalance(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3307,7 +3244,6 @@ bool daNpcWrestler_c::sumouLostBalance(void* param_1) {
     return true;
 }
 
-/* 80B37C30-80B37FB8 008A90 0388+00 4/0 0/0 0/0 .text            sumouPunchShock__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchShock(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3348,7 +3284,6 @@ bool daNpcWrestler_c::sumouPunchShock(void* param_1) {
     return true;
 }
 
-/* 80B37FB8-80B38518 008E18 0560+00 2/0 0/0 0/0 .text            sumouPunchChaseShock__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) {
     // NONMATCHING - regalloc
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3401,7 +3336,6 @@ bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) {
     return true;
 }
 
-/* 80B38518-80B389A4 009378 048C+00 2/0 0/0 0/0 .text            sumouPunchStagger__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouPunchStagger(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3443,7 +3377,6 @@ bool daNpcWrestler_c::sumouPunchStagger(void* param_1) {
     return true;
 }
 
-/* 80B389A4-80B38C90 009804 02EC+00 4/0 0/0 0/0 .text            sumouTackleShock__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleShock(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3478,7 +3411,6 @@ bool daNpcWrestler_c::sumouTackleShock(void* param_1) {
     return true;
 }
 
-/* 80B38C90-80B39334 009AF0 06A4+00 2/0 0/0 0/0 .text            sumouTackleStagger__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleStagger(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo = mType == 0 ? 0x1A : 0x18;
@@ -3542,7 +3474,6 @@ bool daNpcWrestler_c::sumouTackleStagger(void* param_1) {
     return true;
 }
 
-/* 80B39334-80B39554 00A194 0220+00 1/0 0/0 0/0 .text            sumouTackleStaggerRelease__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleStaggerRelease(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -3575,7 +3506,6 @@ bool daNpcWrestler_c::sumouTackleStaggerRelease(void* param_1) {
     return true;
 }
 
-/* 80B39554-80B39C18 00A3B4 06C4+00 1/0 0/0 0/0 .text            sumouTacklePush__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTacklePush(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int jointNo, jointNo2;
@@ -3644,7 +3574,6 @@ bool daNpcWrestler_c::sumouTacklePush(void* param_1) {
     return true;
 }
 
-/* 80B39C18-80B39F88 00AA78 0370+00 1/0 0/0 0/0 .text sumouTackleRelease__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::sumouTackleRelease(void* param_1) {
     switch (field_0xe96) {
         case 0:
@@ -3725,7 +3654,6 @@ void daNpcWrestler_c::initDemoCamera_ReadyWrestler() {
     mDoMtx_stack_c::multVec(&mDemoCam.mDemoCamCenter, &mDemoCam.mDemoCamCenter);
 }
 
-/* 80B39F88-80B3AE24 00ADE8 0E9C+00 2/0 0/0 0/0 .text demoSumouReady__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouReady(void* param_1) {
     dCamera_c* camBody = dCam_getBody();
 
@@ -3998,7 +3926,6 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) {
     return true;
 }
 
-/* 80B3AE24-80B3B4B4 00BC84 0690+00 2/0 0/0 0/0 .text            demoSumouWin__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouWin(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -4122,7 +4049,6 @@ bool daNpcWrestler_c::demoSumouWin(void* param_1) {
     return true;
 }
 
-/* 80B3B4B4-80B3BC84 00C314 07D0+00 3/0 0/0 0/0 .text            demoSumouLose__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouLose(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -4259,7 +4185,6 @@ bool daNpcWrestler_c::demoSumouLose(void* param_1) {
     return true;
 }
 
-/* 80B3BC84-80B3C278 00CAE4 05F4+00 11/0 0/0 0/0 .text demoSumouWin2__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouWin2(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -4368,7 +4293,6 @@ bool daNpcWrestler_c::demoSumouWin2(void* param_1) {
     return true;
 }
 
-/* 80B3C278-80B3CA2C 00D0D8 07B4+00 5/0 0/0 0/0 .text demoSumouLose2__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouLose2(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -4508,7 +4432,6 @@ bool daNpcWrestler_c::demoSumouLose2(void* param_1) {
     return true;
 }
 
-/* 80B3CA2C-80B3D0C0 00D88C 0694+00 4/0 0/0 0/0 .text demoSumouUnilateralWin__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoSumouUnilateralWin(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camBody = dCam_getBody();
@@ -4630,7 +4553,6 @@ bool daNpcWrestler_c::demoSumouUnilateralWin(void* param_1) {
     return true;
 }
 
-/* 80B3D0C0-80B3D584 00DF20 04C4+00 2/0 0/0 0/0 .text demoTalkAfterLose__15daNpcWrestler_cFPv */
 bool daNpcWrestler_c::demoTalkAfterLose(void* param_1) {
     bool retval = false;
     switch (field_0xe96) {
@@ -4717,7 +4639,6 @@ bool daNpcWrestler_c::demoTalkAfterLose(void* param_1) {
     return retval;
 }
 
-/* 80B3D584-80B3DB50 00E3E4 05CC+00 3/0 0/0 0/0 .text EvCut_grDSEntry__15daNpcWrestler_cFi */
 BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_cutIndex);
@@ -4832,7 +4753,6 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80B3DB50-80B3DCE8 00E9B0 0198+00 1/0 0/0 0/0 .text EvCut_grDSEntry2__15daNpcWrestler_cFi */
 BOOL daNpcWrestler_c::EvCut_grDSEntry2(int i_cutIndex) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_cutIndex);
@@ -4871,7 +4791,6 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry2(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80B3DCE8-80B3E0FC 00EB48 0414+00 2/0 0/0 0/0 .text EvCut_grDSEntry3_4__15daNpcWrestler_cFi */
 BOOL daNpcWrestler_c::EvCut_grDSEntry3_4(int i_cutIndex) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_cutIndex);
@@ -4935,7 +4854,6 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry3_4(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80B3E0FC-80B3E584 00EF5C 0488+00 1/0 0/0 0/0 .text EvCut_grDSEntry5__15daNpcWrestler_cFi */
 BOOL daNpcWrestler_c::EvCut_grDSEntry5(int i_cutIndex) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_cutIndex);
@@ -4990,7 +4908,6 @@ BOOL daNpcWrestler_c::EvCut_grDSEntry5(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80B3E584-80B3EA2C 00F3E4 04A8+00 1/0 0/0 0/0 .text            EvCut_grDSLose__15daNpcWrestler_cFi */
 BOOL daNpcWrestler_c::EvCut_grDSLose(int i_cutIndex) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* cutName = (int*)eventManager.getMyNowCutName(i_cutIndex);
@@ -5062,33 +4979,27 @@ BOOL daNpcWrestler_c::EvCut_grDSLose(int i_cutIndex) {
     return FALSE;
 }
 
-/* 80B3EA2C-80B3EA4C 00F88C 0020+00 1/0 0/0 0/0 .text            daNpcWrestler_Create__FPv */
 static int daNpcWrestler_Create(void* a_this) {
     return ((daNpcWrestler_c*)a_this)->Create();
 
 }
 
-/* 80B3EA4C-80B3EA6C 00F8AC 0020+00 1/0 0/0 0/0 .text            daNpcWrestler_Delete__FPv */
 static int daNpcWrestler_Delete(void* a_this) {
     return ((daNpcWrestler_c*)a_this)->Delete();
 }
 
-/* 80B3EA6C-80B3EA8C 00F8CC 0020+00 1/0 0/0 0/0 .text            daNpcWrestler_Execute__FPv */
 static int daNpcWrestler_Execute(void* a_this) {
     return ((daNpcWrestler_c*)a_this)->Execute();
 }
 
-/* 80B3EA8C-80B3EAAC 00F8EC 0020+00 1/0 0/0 0/0 .text            daNpcWrestler_Draw__FPv */
 static int daNpcWrestler_Draw(void* a_this) {
     return ((daNpcWrestler_c*)a_this)->Draw();
 }
 
-/* 80B3EAAC-80B3EAB4 00F90C 0008+00 1/0 0/0 0/0 .text            daNpcWrestler_IsDelete__FPv */
 static int daNpcWrestler_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80B3EAE4-80B3EB94 00F944 00B0+00 1/0 0/0 0/0 .text            setParam__15daNpcWrestler_cFv */
 void daNpcWrestler_c::setParam() {
     s16 reg_r30 = 5;
     s16 reg_r29 = 6;
@@ -5118,7 +5029,6 @@ bool daNpcWrestler_c::selectAction() {
     return false;
 }
 
-/* 80B3EF10-80B3FCE8 00FD70 0DD8+00 1/1 0/0 0/0 .text setWrestlerVoice__15daNpcWrestler_cFv */
 void daNpcWrestler_c::setWrestlerVoice() {
     J3DAnmTransform* anmTransform = mAnm_p->getAnm();
 
@@ -5261,7 +5171,6 @@ void daNpcWrestler_c::setWrestlerVoice() {
     }
 }
 
-/* 80B3EB94-80B3EF10 00F9F4 037C+00 1/0 0/0 0/0 .text            main__15daNpcWrestler_cFv */
 BOOL daNpcWrestler_c::main() {
     if (!selectAction() && field_0xdcc != NULL) {
         (this->*field_0xdcc)(NULL);
@@ -5278,7 +5187,6 @@ BOOL daNpcWrestler_c::main() {
     return TRUE;
 }
 
-/* 80B404FC-80B405E8 01135C 00EC+00 1/0 0/0 0/0 .text            ctrlBtk__15daNpcWrestler_cFv */
 BOOL daNpcWrestler_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btkAnm = (field_0xe04->btk_list->fileIdx >= 0)
@@ -5298,17 +5206,14 @@ BOOL daNpcWrestler_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B40D1C-80B40D24 011B7C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__15daNpcWrestler_cFv */
 BOOL daNpcWrestler_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80B40D24-80B40D28 011B84 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__15daNpcWrestler_cFv */
 void daNpcWrestler_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 80B42CD8-80B42CF8 -00001 0020+00 1/0 0/0 0/0 .data            daNpcWrestler_MethodTable */
 static actor_method_class daNpcWrestler_MethodTable = {
     (process_method_func)daNpcWrestler_Create,
     (process_method_func)daNpcWrestler_Delete,
@@ -5317,7 +5222,6 @@ static actor_method_class daNpcWrestler_MethodTable = {
     (process_method_func)daNpcWrestler_Draw,
 };
 
-/* 80B42CF8-80B42D28 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_WRESTLER */
 extern actor_process_profile_definition g_profile_NPC_WRESTLER = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp
index f014b0fb03..3018f1415c 100644
--- a/src/d/actor/d_a_npc_yamid.cpp
+++ b/src/d/actor/d_a_npc_yamid.cpp
@@ -76,72 +76,60 @@ void daNpc_yamiD_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B46164-80B4616C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_YAMID, YAMID},
 };
 
-/* 80B4616C-80B4617C -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"STOPPER", 1},
 };
 
-/* 80B4617C-80B46184 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "yamiD",
 };
 
-/* 80B46184-80B46188 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 80B46188-80B46194 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B46194-80B461CC 000050 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_YAMID, J3DFrameCtrl::EMode_LOOP, YAMID, 1},
     {BCK_YAMID_F_TALK_A, J3DFrameCtrl::EMode_NONE, YAMID, BTP_YAMID, J3DFrameCtrl::EMode_LOOP, YAMID, 1},
 };
 
-/* 80B461CC-80B46204 000088 0038+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[2] = {
     {BCK_YAMID_WAIT_A, J3DFrameCtrl::EMode_LOOP, YAMID, BTK_YAMID, J3DFrameCtrl::EMode_NONE, YAMID, 1, 0},
     {BCK_YAMID_STEP, J3DFrameCtrl::EMode_NONE, YAMID, BTK_YAMID, J3DFrameCtrl::EMode_NONE, YAMID, 1, 0},
 };
 
-/* 80B46204-80B46224 0000C0 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B46224-80B46244 0000E0 0020+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B46244-80B4624C -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_yamiD_c */
 char* daNpc_yamiD_c::mCutNameList[2] = {
     "",
     "STOPPER",
 };
 
-/* 80B46258-80B46270 000114 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_yamiD_c */
 daNpc_yamiD_c::cutFunc daNpc_yamiD_c::mCutList[2] = {
     NULL,
     &daNpc_yamiD_c::cutStopper,
 };
 
-/* 80B42F4C-80B43084 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__13daNpc_yamiD_cFv */
 daNpc_yamiD_c::~daNpc_yamiD_c() {
     OS_REPORT("|%06d:%x|daNpc_yamiD_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (heap != NULL) {
@@ -156,7 +144,6 @@ daNpc_yamiD_c::~daNpc_yamiD_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B4604C-80B460D8 000000 008C+00 7/7 0/0 0/0 .rodata          m__19daNpc_yamiD_Param_c */
 daNpc_yamiD_HIOParam const daNpc_yamiD_Param_c::m = {
     180.0f,
     -3.0f,
@@ -201,10 +188,8 @@ daNpc_yamiD_HIOParam const daNpc_yamiD_Param_c::m = {
     0.0f,
 };
 
-/* 80B4647C-80B46480 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_YAMID_HIO_CLASS l_HIO;
 
-/* 80B43084-80B43338 000224 02B4+00 1/1 0/0 0/0 .text            create__13daNpc_yamiD_cFv */
 cPhs__Step daNpc_yamiD_c::create() {
     daNpcT_ct(this, daNpc_yamiD_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4,
@@ -270,7 +255,6 @@ cPhs__Step daNpc_yamiD_c::create() {
     return phase;
 }
 
-/* 80B43338-80B435CC 0004D8 0294+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -311,7 +295,6 @@ int daNpc_yamiD_c::CreateHeap() {
     return 0;
 }
 
-/* 80B43788-80B437BC 000928 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_yamiD_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID reg_r30 = fopAcM_GetID(this);
@@ -319,12 +302,10 @@ int daNpc_yamiD_c::Delete() {
     return 1;
 }
 
-/* 80B437BC-80B437DC 00095C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::Execute() {
     return execute();
 }
 
-/* 80B437DC-80B43884 00097C 00A8+00 1/1 0/0 0/0 .text            Draw__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::Draw() {
     if (is_vanish()) {
         return 0;
@@ -338,13 +319,11 @@ int daNpc_yamiD_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80B43884-80B438A4 000A24 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_yamiD_cFP10fopAc_ac_c */
 int daNpc_yamiD_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_yamiD_c* a_this = (daNpc_yamiD_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 80B438A4-80B438FC 000A44 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_yamiD_cFP8J3DJointi */
 int daNpc_yamiD_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -358,7 +337,6 @@ int daNpc_yamiD_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B438FC-80B43934 000A9C 0038+00 1/1 0/0 0/0 .text            getType__13daNpc_yamiD_cFv */
 u8 daNpc_yamiD_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -373,7 +351,6 @@ u8 daNpc_yamiD_c::getType() {
     }
 }
 
-/* 80B43934-80B43998 000AD4 0064+00 1/1 0/0 0/0 .text            getFlowNodeNo__13daNpc_yamiD_cFv */
 u32 daNpc_yamiD_c::getFlowNodeNo() {
     u32 rv = -1;
 
@@ -390,7 +367,6 @@ u32 daNpc_yamiD_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80B43998-80B43A20 000B38 0088+00 1/1 0/0 0/0 .text            isDelete__13daNpc_yamiD_cFv */
 BOOL daNpc_yamiD_c::isDelete() {
     BOOL rv = FALSE;
 
@@ -409,7 +385,6 @@ BOOL daNpc_yamiD_c::isDelete() {
     return rv;
 }
 
-/* 80B43A20-80B43C34 000BC0 0214+00 1/1 0/0 0/0 .text            reset__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::reset() {
     initialize();
 
@@ -440,7 +415,6 @@ void daNpc_yamiD_c::reset() {
     setAction(&daNpc_yamiD_c::wait);
 }
 
-/* 80B43C34-80B43CC0 000DD4 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_yamiD_cFi */
 void daNpc_yamiD_c::afterJntAnm(int param_1) {
     if (param_1 == 2) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -451,7 +425,6 @@ void daNpc_yamiD_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B43CC0-80B43DBC 000E60 00FC+00 1/0 0/0 0/0 .text            setParam__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::setParam() {
     int reg_r26 = 66;
     selectAction();
@@ -480,7 +453,6 @@ void daNpc_yamiD_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 80B43DBC-80B43E1C 000F5C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::setAfterTalkMotion() {
     int face = FACE_TALKE_A;
     mFaceMotionSeqMngr.getNo();
@@ -488,7 +460,6 @@ void daNpc_yamiD_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(face, -1.0f, FALSE, 0);
 }
 
-/* 80B43E1C-80B43E28 000FBC 000C+00 1/1 0/0 0/0 .text            srchActors__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::srchActors() {
     switch (mType) {
     case 1:
@@ -496,7 +467,6 @@ void daNpc_yamiD_c::srchActors() {
     }
 }
 
-/* 80B43E28-80B43F0C 000FC8 00E4+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_yamiD_cFv */
 BOOL daNpc_yamiD_c::evtTalk() {
     if (chkAction(&daNpc_yamiD_c::talk)) {
         (this->*mAction)(NULL);
@@ -507,7 +477,6 @@ BOOL daNpc_yamiD_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B43F0C-80B43FD4 0010AC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_yamiD_cFv */
 BOOL daNpc_yamiD_c::evtCutProc() {
     int rv = FALSE;
 
@@ -525,7 +494,6 @@ BOOL daNpc_yamiD_c::evtCutProc() {
     return rv;
 }
 
-/* 80B43FD4-80B440C0 001174 00EC+00 1/0 0/0 0/0 .text            action__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -541,14 +509,12 @@ void daNpc_yamiD_c::action() {
     }
 }
 
-/* 80B440C0-80B44138 001260 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B44138-80B44364 0012D8 022C+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::setAttnPos() {
     cXyz work(-30.0f, 0.0f, 0.0f);
 
@@ -571,7 +537,6 @@ void daNpc_yamiD_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80B44364-80B44498 001504 0134+00 1/0 0/0 0/0 .text            setCollision__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::setCollision() {
     cXyz work;
     u32 tgType = 0xD8FBFDFF;
@@ -607,12 +572,10 @@ void daNpc_yamiD_c::setCollision() {
     field_0xe44.ClrTgHit();
 }
 
-/* 80B44498-80B444A0 001638 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B444A0-80B4450C 001640 006C+00 1/0 0/0 0/0 .text            drawGhost__13daNpc_yamiD_cFv */
 void daNpc_yamiD_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -620,19 +583,16 @@ void daNpc_yamiD_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B4450C-80B44554 0016AC 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_yamiD_cFv */
 int daNpc_yamiD_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_yamiD_c::wait;
     return 1;
 }
 
-/* 80B44554-80B44580 0016F4 002C+00 1/1 0/0 0/0 .text            chkAction__13daNpc_yamiD_cFM13daNpc_yamiD_cFPCvPvPv_i */
 BOOL daNpc_yamiD_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B44580-80B44628 001720 00A8+00 3/3 0/0 0/0 .text            setAction__13daNpc_yamiD_cFM13daNpc_yamiD_cFPCvPvPv_i */
 int daNpc_yamiD_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -650,7 +610,6 @@ int daNpc_yamiD_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80B44628-80B44900 0017C8 02D8+00 2/0 0/0 0/0 .text            wait__13daNpc_yamiD_cFPv */
 int daNpc_yamiD_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -711,7 +670,6 @@ int daNpc_yamiD_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B44900-80B44AF8 001AA0 01F8+00 2/0 0/0 0/0 .text            talk__13daNpc_yamiD_cFPv */
 int daNpc_yamiD_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -754,7 +712,6 @@ int daNpc_yamiD_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80B44AF8-80B44B8C 001C98 0094+00 1/0 0/0 0/0 .text            cutStopper__13daNpc_yamiD_cFi */
 BOOL daNpc_yamiD_c::cutStopper(int i_cutIndex) {
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "cutId");
     if (cutId == NULL) {
@@ -769,7 +726,6 @@ BOOL daNpc_yamiD_c::cutStopper(int i_cutIndex) {
     return _cutStopper_Main(*cutId);
 }
 
-/* 80B44B8C-80B44BD4 001D2C 0048+00 1/1 0/0 0/0 .text _cutStopper_Init__13daNpc_yamiD_cFRCi */
 BOOL daNpc_yamiD_c::_cutStopper_Init(int const& i_cutId) {
     switch (i_cutId) {
         case 10:
@@ -782,7 +738,6 @@ BOOL daNpc_yamiD_c::_cutStopper_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80B44BD4-80B44D00 001D74 012C+00 1/1 0/0 0/0 .text _cutStopper_Main__13daNpc_yamiD_cFRCi */
 BOOL daNpc_yamiD_c::_cutStopper_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -811,32 +766,26 @@ BOOL daNpc_yamiD_c::_cutStopper_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80B44D00-80B44D20 001EA0 0020+00 1/0 0/0 0/0 .text            daNpc_yamiD_Create__FPv */
 static int daNpc_yamiD_Create(void* i_this) {
     return ((daNpc_yamiD_c*)i_this)->create();
 }
 
-/* 80B44D20-80B44D40 001EC0 0020+00 1/0 0/0 0/0 .text            daNpc_yamiD_Delete__FPv */
 static int daNpc_yamiD_Delete(void* i_this) {
     return ((daNpc_yamiD_c*)i_this)->Delete();
 }
 
-/* 80B44D40-80B44D60 001EE0 0020+00 1/0 0/0 0/0 .text            daNpc_yamiD_Execute__FPv */
 static int daNpc_yamiD_Execute(void* i_this) {
     return ((daNpc_yamiD_c*)i_this)->Execute();
 }
 
-/* 80B44D60-80B44D80 001F00 0020+00 1/0 0/0 0/0 .text            daNpc_yamiD_Draw__FPv */
 static int daNpc_yamiD_Draw(void* i_this) {
     return ((daNpc_yamiD_c*)i_this)->Draw();
 }
 
-/* 80B44D80-80B44D88 001F20 0008+00 1/0 0/0 0/0 .text            daNpc_yamiD_IsDelete__FPv */
 static int daNpc_yamiD_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B462A0-80B462C0 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_yamiD_MethodTable */
 static actor_method_class daNpc_yamiD_MethodTable = {
     (process_method_func)daNpc_yamiD_Create,
     (process_method_func)daNpc_yamiD_Delete,
@@ -845,7 +794,6 @@ static actor_method_class daNpc_yamiD_MethodTable = {
     (process_method_func)daNpc_yamiD_Draw,
 };
 
-/* 80B462C0-80B462F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YAMID */
 extern actor_process_profile_definition g_profile_NPC_YAMID = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp
index cf979f3aa1..021fef2f9c 100644
--- a/src/d/actor/d_a_npc_yamis.cpp
+++ b/src/d/actor/d_a_npc_yamis.cpp
@@ -36,68 +36,56 @@ void daNpc_yamiS_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B497C8-80B497D0 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {12, 1},
 };
 
-/* 80B497D0-80B497E0 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"STOPPER", 1},
 };
 
-/* 80B497E0-80B497E8 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "yamiS",
 };
 
-/* 80B497E8-80B497EC 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80B497EC-80B497F8 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B497F8-80B49830 000050 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 18, 2, 1, 1},
     {7, 0, 1, 18, 2, 1, 1},
 };
 
-/* 80B49830-80B49868 000088 0038+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[2] = {
     {9, 2, 1, 15, 0, 1, 1, 0},
     {8, 0, 1, 15, 0, 1, 1, 0},
 };
 
-/* 80B49868-80B49888 0000C0 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B49888-80B498A8 0000E0 0020+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B498A8-80B498B0 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_yamiS_c */
 char* daNpc_yamiS_c::mCutNameList[2] = {
     "",
     "STOPPER",
 };
 
-/* 80B498BC-80B498D4 000114 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_yamiS_c */
 daNpc_yamiS_c::cutFunc daNpc_yamiS_c::mCutList[2] = {
     NULL,
     &daNpc_yamiS_c::cutStopper,
 };
 
-/* 80B4656C-80B466A4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__13daNpc_yamiS_cFv */
 daNpc_yamiS_c::~daNpc_yamiS_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -105,7 +93,6 @@ daNpc_yamiS_c::~daNpc_yamiS_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B496B0-80B4973C 000000 008C+00 7/7 0/0 0/0 .rodata          m__19daNpc_yamiS_Param_c */
 const daNpc_yamiS_HIOParam daNpc_yamiS_Param_c::m = {
     140.0f,  // attention_offset
     -3.0f,   // gravity
@@ -150,10 +137,8 @@ const daNpc_yamiS_HIOParam daNpc_yamiS_Param_c::m = {
     0.0f,    // box_offset
 };
 
-/* 80B49AE4-80B49AE8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_YAMIS_HIO_CLASS l_HIO;
 
-/* 80B466A4-80B46958 000224 02B4+00 1/1 0/0 0/0 .text            create__13daNpc_yamiS_cFv */
 cPhs__Step daNpc_yamiS_c::create() {
     daNpcT_ct(this, daNpc_yamiS_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -207,7 +192,6 @@ cPhs__Step daNpc_yamiS_c::create() {
     return phase;
 }
 
-/* 80B46958-80B46BEC 0004D8 0294+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -247,19 +231,16 @@ int daNpc_yamiS_c::CreateHeap() {
     return 0;
 }
 
-/* 80B46DA8-80B46DDC 000928 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::Delete() {
     fpc_ProcID reg_r30 = fopAcM_GetID(this);
     this->~daNpc_yamiS_c();
     return 1;
 }
 
-/* 80B46DDC-80B46DFC 00095C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::Execute() {
     return execute();
 }
 
-/* 80B46DFC-80B46EA4 00097C 00A8+00 1/1 0/0 0/0 .text            Draw__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::Draw() {
     if (is_vanish()) {
         return 0;
@@ -273,15 +254,11 @@ int daNpc_yamiS_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80B46EA4-80B46EC4 000A24 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_yamiS_cFP10fopAc_ac_c            */
 int daNpc_yamiS_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_yamiS_c* a_this = (daNpc_yamiS_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 80B46EC4-80B46F1C 000A44 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_yamiS_cFP8J3DJointi               */
 int daNpc_yamiS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -295,7 +272,6 @@ int daNpc_yamiS_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B46F1C-80B46F54 000A9C 0038+00 1/1 0/0 0/0 .text            getType__13daNpc_yamiS_cFv */
 u8 daNpc_yamiS_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -310,7 +286,6 @@ u8 daNpc_yamiS_c::getType() {
     }
 }
 
-/* 80B46F54-80B46FB8 000AD4 0064+00 2/2 0/0 0/0 .text            getFlowNodeNo__13daNpc_yamiS_cFv */
 u32 daNpc_yamiS_c::getFlowNodeNo() {
     u32 rv = -1;
 
@@ -327,7 +302,6 @@ u32 daNpc_yamiS_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80B46FB8-80B47040 000B38 0088+00 1/1 0/0 0/0 .text            isDelete__13daNpc_yamiS_cFv */
 BOOL daNpc_yamiS_c::isDelete() {
     BOOL rv = FALSE;
 
@@ -346,7 +320,6 @@ BOOL daNpc_yamiS_c::isDelete() {
     return rv;
 }
 
-/* 80B47040-80B47254 000BC0 0214+00 1/1 0/0 0/0 .text            reset__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::reset() {
     initialize();
 
@@ -377,7 +350,6 @@ void daNpc_yamiS_c::reset() {
     setAction(&daNpc_yamiS_c::wait);
 }
 
-/* 80B47254-80B472E0 000DD4 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_yamiS_cFi */
 void daNpc_yamiS_c::afterJntAnm(int param_1) {
     if (param_1 == 2) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -388,7 +360,6 @@ void daNpc_yamiS_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B472E0-80B473DC 000E60 00FC+00 1/0 0/0 0/0 .text            setParam__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::setParam() {
     selectAction();
     srchActors();
@@ -418,7 +389,6 @@ void daNpc_yamiS_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 80B473DC-80B4743C 000F5C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::setAfterTalkMotion() {
     int face = FACE_TALKE_A;
     mFaceMotionSeqMngr.getNo();
@@ -426,10 +396,8 @@ void daNpc_yamiS_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(face, -1.0f, FALSE, 0);
 }
 
-/* 80B4743C-80B47440 000FBC 0004+00 1/1 0/0 0/0 .text            srchActors__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::srchActors() {}
 
-/* 80B47440-80B47524 000FC0 00E4+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_yamiS_cFv */
 BOOL daNpc_yamiS_c::evtTalk() {
     if (chkAction(&daNpc_yamiS_c::talk)) {
         (this->*mAction)(NULL);
@@ -440,7 +408,6 @@ BOOL daNpc_yamiS_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B47524-80B475EC 0010A4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_yamiS_cFv */
 BOOL daNpc_yamiS_c::evtCutProc() {
     int rv = FALSE;
 
@@ -458,7 +425,6 @@ BOOL daNpc_yamiS_c::evtCutProc() {
     return rv;
 }
 
-/* 80B475EC-80B476D8 00116C 00EC+00 1/0 0/0 0/0 .text            action__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -474,14 +440,12 @@ void daNpc_yamiS_c::action() {
     }
 }
 
-/* 80B476D8-80B47750 001258 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B47750-80B4797C 0012D0 022C+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::setAttnPos() {
     cXyz work(-30.0f, 0.0f, 0.0f);
 
@@ -505,7 +469,6 @@ void daNpc_yamiS_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80B4797C-80B47AE8 0014FC 016C+00 1/0 0/0 0/0 .text            setCollision__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::setCollision() {
     cXyz work;
     u32 tgType = 0xD8FBFDFF;
@@ -542,12 +505,10 @@ void daNpc_yamiS_c::setCollision() {
     field_0xe44.ClrTgHit();
 }
 
-/* 80B47AE8-80B47AF0 001668 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B47AF0-80B47B5C 001670 006C+00 1/0 0/0 0/0 .text            drawGhost__13daNpc_yamiS_cFv */
 void daNpc_yamiS_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -555,21 +516,16 @@ void daNpc_yamiS_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B47B5C-80B47BA4 0016DC 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_yamiS_cFv */
 int daNpc_yamiS_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_yamiS_c::wait;
     return 1;
 }
 
-/* 80B47BA4-80B47BD0 001724 002C+00 1/1 0/0 0/0 .text
- * chkAction__13daNpc_yamiS_cFM13daNpc_yamiS_cFPCvPvPv_i        */
 BOOL daNpc_yamiS_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B47BD0-80B47C78 001750 00A8+00 3/3 0/0 0/0 .text
- * setAction__13daNpc_yamiS_cFM13daNpc_yamiS_cFPCvPvPv_i        */
 int daNpc_yamiS_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -587,7 +543,6 @@ int daNpc_yamiS_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80B47C78-80B47F50 0017F8 02D8+00 2/0 0/0 0/0 .text            wait__13daNpc_yamiS_cFPv */
 int daNpc_yamiS_c::wait(void* param_1) {
     switch (mMode) {
     case 0:
@@ -648,7 +603,6 @@ int daNpc_yamiS_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B47F50-80B4815C 001AD0 020C+00 2/0 0/0 0/0 .text            talk__13daNpc_yamiS_cFPv */
 int daNpc_yamiS_c::talk(void* param_1) {
     switch (mMode) {
     case 0:
@@ -691,7 +645,6 @@ int daNpc_yamiS_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80B4815C-80B481F0 001CDC 0094+00 1/0 0/0 0/0 .text            cutStopper__13daNpc_yamiS_cFi */
 BOOL daNpc_yamiS_c::cutStopper(int i_cutIndex) {
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "cutId");
     if (cutId == NULL) {
@@ -705,7 +658,6 @@ BOOL daNpc_yamiS_c::cutStopper(int i_cutIndex) {
     return _cutStopper_Main(*cutId);
 }
 
-/* 80B481F0-80B48238 001D70 0048+00 1/1 0/0 0/0 .text _cutStopper_Init__13daNpc_yamiS_cFRCi */
 BOOL daNpc_yamiS_c::_cutStopper_Init(int const& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -718,7 +670,6 @@ BOOL daNpc_yamiS_c::_cutStopper_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80B48238-80B48364 001DB8 012C+00 1/1 0/0 0/0 .text _cutStopper_Main__13daNpc_yamiS_cFRCi */
 BOOL daNpc_yamiS_c::_cutStopper_Main(int const& i_cutId) {
     BOOL rv = FALSE;
 
@@ -748,39 +699,32 @@ BOOL daNpc_yamiS_c::_cutStopper_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80B48364-80B48384 001EE4 0020+00 1/0 0/0 0/0 .text            daNpc_yamiS_Create__FPv */
 static int daNpc_yamiS_Create(void* i_this) {
     return ((daNpc_yamiS_c*)i_this)->create();
 }
 
-/* 80B48384-80B483A4 001F04 0020+00 1/0 0/0 0/0 .text            daNpc_yamiS_Delete__FPv */
 static int daNpc_yamiS_Delete(void* i_this) {
     return ((daNpc_yamiS_c*)i_this)->Delete();
 }
 
-/* 80B483A4-80B483C4 001F24 0020+00 1/0 0/0 0/0 .text            daNpc_yamiS_Execute__FPv */
 static int daNpc_yamiS_Execute(void* i_this) {
     return ((daNpc_yamiS_c*)i_this)->Execute();
 }
 
-/* 80B483C4-80B483E4 001F44 0020+00 1/0 0/0 0/0 .text            daNpc_yamiS_Draw__FPv */
 static int daNpc_yamiS_Draw(void* i_this) {
     return ((daNpc_yamiS_c*)i_this)->Draw();
 }
 
-/* 80B483E4-80B483EC 001F64 0008+00 1/0 0/0 0/0 .text            daNpc_yamiS_IsDelete__FPv */
 static int daNpc_yamiS_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B49904-80B49924 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_yamiS_MethodTable */
 static actor_method_class daNpc_yamiS_MethodTable = {
     (process_method_func)daNpc_yamiS_Create,  (process_method_func)daNpc_yamiS_Delete,
     (process_method_func)daNpc_yamiS_Execute, (process_method_func)daNpc_yamiS_IsDelete,
     (process_method_func)daNpc_yamiS_Draw,
 };
 
-/* 80B49924-80B49954 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YAMIS */
 extern actor_process_profile_definition g_profile_NPC_YAMIS = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp
index bb4b867004..400752c649 100644
--- a/src/d/actor/d_a_npc_yamit.cpp
+++ b/src/d/actor/d_a_npc_yamit.cpp
@@ -37,70 +37,58 @@ void daNpc_yamiT_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80B4CEBC-80B4CEC4 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {12, 1},
 };
 
-/* 80B4CEC4-80B4CED4 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"STOPPER", 1},
 };
 
-/* 80B4CED4-80B4CEDC -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "yamiT",
 };
 
-/* 80B4CEDC-80B4CEE0 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {1, -1};
 
-/* 80B4CEE0-80B4CEEC -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B4CEEC-80B4CF24 000050 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 15, 2, 1, 1},
     {6, 0, 1, 15, 2, 1, 1},
 };
 
-/* 80B4CF24-80B4CF78 000088 0054+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[3] = {
     {9, 2, 1, -1, 0, 0, 0, 0},
     {8, 0, 1, -1, 0, 0, 0, 0},
     {7, 0, 1, -1, 0, 0, 0, 0},
 };
 
-/* 80B4CF78-80B4CF98 0000DC 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B4CF98-80B4CFC8 0000FC 0030+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[12] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 1}, {0, -1, 0},
     {-1, 0, 0}, {-1, 0, 0}, {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B4CFC8-80B4CFD0 -00001 0008+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_yamiT_c */
 char* daNpc_yamiT_c::mCutNameList[2] = {
     "",
     "STOPPER",
 };
 
-/* 80B4CFDC-80B4CFF4 000140 0018+00 2/2 0/0 0/0 .data            mCutList__13daNpc_yamiT_c */
 daNpc_yamiT_c::cutFunc daNpc_yamiT_c::mCutList[2] = {
     NULL,
     &daNpc_yamiT_c::cutStopper,
 };
 
-/* 80B49BEC-80B49D24 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__13daNpc_yamiT_cFv */
 daNpc_yamiT_c::~daNpc_yamiT_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -108,7 +96,6 @@ daNpc_yamiT_c::~daNpc_yamiT_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B4CDA4-80B4CE30 000000 008C+00 7/7 0/0 0/0 .rodata          m__19daNpc_yamiT_Param_c */
 const daNpc_yamiT_HIOParam daNpc_yamiT_Param_c::m = {
     230.0f,  // attention_offset
     -3.0f,   // gravity
@@ -153,10 +140,8 @@ const daNpc_yamiT_HIOParam daNpc_yamiT_Param_c::m = {
     0.0f,    // box_offset
 };
 
-/* 80B4D204-80B4D208 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_YAMIT_HIO_CLASS l_HIO;
 
-/* 80B49D24-80B49FD8 000224 02B4+00 1/1 0/0 0/0 .text            create__13daNpc_yamiT_cFv */
 cPhs__Step daNpc_yamiT_c::create() {
     daNpcT_ct(this, daNpc_yamiT_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
               4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -210,7 +195,6 @@ cPhs__Step daNpc_yamiT_c::create() {
     return phase;
 }
 
-/* 80B49FD8-80B4A26C 0004D8 0294+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -250,20 +234,16 @@ int daNpc_yamiT_c::CreateHeap() {
     return 0;
 }
 
-/* 80B4A428-80B4A45C 000928 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Delete() {
     fpc_ProcID reg_r30 = fopAcM_GetID(this);
     this->~daNpc_yamiT_c();
     return 1;
 }
 
-/* 80B4A45C-80B4A47C 00095C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Execute() {
     return execute();
 }
 
-/* 80B4A47C-80B4A4E0 00097C 0064+00 1/1 0/0 0/0 .text            _search_Tag__13daNpc_yamiT_cFPvPv
- */
 void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) {
     if (!fopAcM_IsActor(i_actor)) {
         return NULL;
@@ -278,7 +258,6 @@ void* daNpc_yamiT_c::_search_Tag(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B4A4E0-80B4A588 0009E0 00A8+00 1/1 0/0 0/0 .text            Draw__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::Draw() {
     if (is_vanish()) {
         return 0;
@@ -292,15 +271,11 @@ int daNpc_yamiT_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 0.0f, TRUE, FALSE, FALSE);
 }
 
-/* 80B4A588-80B4A5A8 000A88 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_yamiT_cFP10fopAc_ac_c            */
 int daNpc_yamiT_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_yamiT_c* a_this = (daNpc_yamiT_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 80B4A5A8-80B4A600 000AA8 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_yamiT_cFP8J3DJointi               */
 int daNpc_yamiT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -314,7 +289,6 @@ int daNpc_yamiT_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B4A600-80B4A638 000B00 0038+00 1/1 0/0 0/0 .text            getType__13daNpc_yamiT_cFv */
 u8 daNpc_yamiT_c::getType() {
     u8 prm = fopAcM_GetParam(this);
     switch (prm & 0xFF) {
@@ -329,7 +303,6 @@ u8 daNpc_yamiT_c::getType() {
     }
 }
 
-/* 80B4A638-80B4A69C 000B38 0064+00 2/2 0/0 0/0 .text            getFlowNodeNo__13daNpc_yamiT_cFv */
 u32 daNpc_yamiT_c::getFlowNodeNo() {
     u32 rv = -1;
 
@@ -346,7 +319,6 @@ u32 daNpc_yamiT_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80B4A69C-80B4A724 000B9C 0088+00 1/1 0/0 0/0 .text            isDelete__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::isDelete() {
     BOOL rv = FALSE;
 
@@ -365,7 +337,6 @@ BOOL daNpc_yamiT_c::isDelete() {
     return rv;
 }
 
-/* 80B4A724-80B4A914 000C24 01F0+00 1/1 0/0 0/0 .text            reset__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::reset() {
     initialize();
 
@@ -392,7 +363,6 @@ void daNpc_yamiT_c::reset() {
     setAction(&daNpc_yamiT_c::wait);
 }
 
-/* 80B4A914-80B4A9A0 000E14 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_yamiT_cFi */
 void daNpc_yamiT_c::afterJntAnm(int param_1) {
     if (param_1 == 2) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -403,7 +373,6 @@ void daNpc_yamiT_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B4A9A0-80B4AAD0 000EA0 0130+00 1/0 0/0 0/0 .text            setParam__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setParam() {
     selectAction();
     srchActors();
@@ -438,7 +407,6 @@ void daNpc_yamiT_c::setParam() {
     mMorfFrames = mpHIO->m.common.morf_frame;
 }
 
-/* 80B4AAD0-80B4AB30 000FD0 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setAfterTalkMotion() {
     int face = FACE_TALKE_A;
     mFaceMotionSeqMngr.getNo();
@@ -446,7 +414,6 @@ void daNpc_yamiT_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(face, -1.0f, FALSE, 0);
 }
 
-/* 80B4AB30-80B4ABA0 001030 0070+00 1/1 0/0 0/0 .text            srchActors__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::srchActors() {
     switch (mType) {
     case 1:
@@ -461,7 +428,6 @@ void daNpc_yamiT_c::srchActors() {
     }
 }
 
-/* 80B4ABA0-80B4AC84 0010A0 00E4+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtTalk() {
     if (chkAction(&daNpc_yamiT_c::talk)) {
         (this->*mAction)(NULL);
@@ -472,7 +438,6 @@ BOOL daNpc_yamiT_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B4AC84-80B4AD4C 001184 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtCutProc() {
     int rv = FALSE;
 
@@ -490,7 +455,6 @@ BOOL daNpc_yamiT_c::evtCutProc() {
     return rv;
 }
 
-/* 80B4AD4C-80B4AE38 00124C 00EC+00 1/0 0/0 0/0 .text            action__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -506,14 +470,12 @@ void daNpc_yamiT_c::action() {
     }
 }
 
-/* 80B4AE38-80B4AEB0 001338 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B4AEB0-80B4B0DC 0013B0 022C+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setAttnPos() {
     cXyz work(-30.0f, 0.0f, 0.0f);
 
@@ -537,7 +499,6 @@ void daNpc_yamiT_c::setAttnPos() {
     attention_info.position.y += mpHIO->m.common.attention_offset;
 }
 
-/* 80B4B0DC-80B4B210 0015DC 0134+00 1/0 0/0 0/0 .text            setCollision__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::setCollision() {
     cXyz work;
     u32 tgType = 0xD8FBFDFF;
@@ -573,12 +534,10 @@ void daNpc_yamiT_c::setCollision() {
     field_0xe44.ClrTgHit();
 }
 
-/* 80B4B210-80B4B218 001710 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B4B218-80B4B294 001718 007C+00 1/0 0/0 0/0 .text            evtEndProc__13daNpc_yamiT_cFv */
 BOOL daNpc_yamiT_c::evtEndProc() {
     if (mpTagYami) {
         mpTagYami->onMidnaTagSw();
@@ -589,7 +548,6 @@ BOOL daNpc_yamiT_c::evtEndProc() {
     return TRUE;
 }
 
-/* 80B4B294-80B4B300 001794 006C+00 1/0 0/0 0/0 .text            drawGhost__13daNpc_yamiT_cFv */
 void daNpc_yamiT_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -597,21 +555,16 @@ void daNpc_yamiT_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B4B300-80B4B348 001800 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_yamiT_cFv */
 int daNpc_yamiT_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_yamiT_c::wait;
     return 1;
 }
 
-/* 80B4B348-80B4B374 001848 002C+00 1/1 0/0 0/0 .text
- * chkAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i        */
 BOOL daNpc_yamiT_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B4B374-80B4B41C 001874 00A8+00 3/3 0/0 0/0 .text
- * setAction__13daNpc_yamiT_cFM13daNpc_yamiT_cFPCvPvPv_i        */
 int daNpc_yamiT_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -629,7 +582,6 @@ int daNpc_yamiT_c::setAction(actionFunc action) {
     return 1;
 }
 
-/* 80B4B41C-80B4B7D4 00191C 03B8+00 2/0 0/0 0/0 .text            wait__13daNpc_yamiT_cFPv */
 int daNpc_yamiT_c::wait(void* param_1) {
     switch (mMode) {
     case 0:
@@ -704,7 +656,6 @@ int daNpc_yamiT_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B4B7D4-80B4B9E0 001CD4 020C+00 2/0 0/0 0/0 .text            talk__13daNpc_yamiT_cFPv */
 int daNpc_yamiT_c::talk(void* param_1) {
     switch (mMode) {
     case 0:
@@ -747,7 +698,6 @@ int daNpc_yamiT_c::talk(void* param_1) {
     return 0;
 }
 
-/* 80B4B9E0-80B4BA74 001EE0 0094+00 1/0 0/0 0/0 .text            cutStopper__13daNpc_yamiT_cFi */
 BOOL daNpc_yamiT_c::cutStopper(int i_cutIndex) {
     int* cutId = dComIfGp_evmng_getMyIntegerP(i_cutIndex, "cutId");
     if (cutId == NULL) {
@@ -761,7 +711,6 @@ BOOL daNpc_yamiT_c::cutStopper(int i_cutIndex) {
     return _cutStopper_Main(*cutId);
 }
 
-/* 80B4BA74-80B4BAAC 001F74 0038+00 1/1 0/0 0/0 .text _cutStopper_Init__13daNpc_yamiT_cFRCi */
 BOOL daNpc_yamiT_c::_cutStopper_Init(int const& i_cutId) {
     switch (i_cutId) {
     case 10:
@@ -771,7 +720,6 @@ BOOL daNpc_yamiT_c::_cutStopper_Init(int const& i_cutId) {
     return TRUE;
 }
 
-/* 80B4BAAC-80B4BAC4 001FAC 0018+00 1/1 0/0 0/0 .text _cutStopper_Main__13daNpc_yamiT_cFRCi */
 BOOL daNpc_yamiT_c::_cutStopper_Main(int const& i_cutId) {
     BOOL rv = FALSE;
     if (i_cutId == 10) {
@@ -780,39 +728,32 @@ BOOL daNpc_yamiT_c::_cutStopper_Main(int const& i_cutId) {
     return rv;
 }
 
-/* 80B4BAC4-80B4BAE4 001FC4 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Create__FPv */
 static int daNpc_yamiT_Create(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->create();
 }
 
-/* 80B4BAE4-80B4BB04 001FE4 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Delete__FPv */
 static int daNpc_yamiT_Delete(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Delete();
 }
 
-/* 80B4BB04-80B4BB24 002004 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Execute__FPv */
 static int daNpc_yamiT_Execute(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Execute();
 }
 
-/* 80B4BB24-80B4BB44 002024 0020+00 1/0 0/0 0/0 .text            daNpc_yamiT_Draw__FPv */
 static int daNpc_yamiT_Draw(void* i_this) {
     return ((daNpc_yamiT_c*)i_this)->Draw();
 }
 
-/* 80B4BB44-80B4BB4C 002044 0008+00 1/0 0/0 0/0 .text            daNpc_yamiT_IsDelete__FPv */
 static int daNpc_yamiT_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B4D024-80B4D044 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_yamiT_MethodTable */
 static actor_method_class daNpc_yamiT_MethodTable = {
     (process_method_func)daNpc_yamiT_Create,  (process_method_func)daNpc_yamiT_Delete,
     (process_method_func)daNpc_yamiT_Execute, (process_method_func)daNpc_yamiT_IsDelete,
     (process_method_func)daNpc_yamiT_Draw,
 };
 
-/* 80B4D044-80B4D074 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YAMIT */
 extern actor_process_profile_definition g_profile_NPC_YAMIT = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp
index 90906b3a74..0327d88d6b 100644
--- a/src/d/actor/d_a_npc_yelia.cpp
+++ b/src/d/actor/d_a_npc_yelia.cpp
@@ -8,14 +8,12 @@
 #include "d/actor/d_a_npc_yelia.h"
 #include "d/actor/d_a_demo_item.h"
 
-/* 80B524FC-80B52514 000020 0018+00 1/1 0/0 0/0 .data            l_bmdData */
 static daNpc_GetParam1 l_bmdData[3] = {
     {3, 1},
     {3, 4},
     {8, 7},
 };
 
-/* 80B52514-80B52544 -00001 0030+00 1/2 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[6] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -25,7 +23,6 @@ static daNpcT_evtData_c l_evtList[6] = {
     {"THANK_YOU", 6},
 };
 
-/* 80B52544-80B52564 -00001 0020+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[8] = {
     "",
     "Yelia",
@@ -37,34 +34,25 @@ static char* l_resNameList[8] = {
     "yelB_TW",
 };
 
-/* 80B52564-80B52568 000088 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[4] = {1, 2, 3, -1};
 
-/* 80B52568-80B5256C 00008C 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {2, 4, -1};
 
-/* 80B5256C-80B52570 000090 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[4] = {1, 2, 5, -1};
 
-/* 80B52570-80B52574 000094 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn3 */
 static s8 l_loadResPtrn3[4] = {2, 4, 6, -1};
 
-/* 80B52574-80B52578 000098 0004+00 1/0 0/0 0/0 .data            l_loadResPtrn4 */
 static s8 l_loadResPtrn4[4] = {2, 7, 6, -1};
 
-/* 80B52578-80B52580 00009C 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn5 */
 static s8 l_loadResPtrn5[5] = {2, 4, 7, 6, -1};
 
-/* 80B52580-80B52588 0000A4 0008+00 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[8] = {1, 2, 3, 4, 5, 6, 7, -1};
 
-/* 80B52588-80B525B0 -00001 0028+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[10] = {
     l_loadResPtrn0, l_loadResPtrn1, l_loadResPtrn2, l_loadResPtrn3, l_loadResPtrn4,
     l_loadResPtrn5, l_loadResPtrn3, l_loadResPtrn3, l_loadResPtrn9, l_loadResPtrn0,
 };
 
-/* 80B525B0-80B528C0 0000D4 0310+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
     {7, J3DFrameCtrl::EMode_NONE, 2, 19, J3DFrameCtrl::EMode_LOOP, 2, TRUE},
@@ -96,7 +84,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[] = {
     {9, J3DFrameCtrl::EMode_LOOP, 2, 23, J3DFrameCtrl::EMode_LOOP, 2, FALSE},
 };
 
-/* 80B528C0-80B52C94 0003E4 03D4+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[] = {
     {13, J3DFrameCtrl::EMode_LOOP, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
     {-1, J3DFrameCtrl::EMode_NONE, 0, -1, J3DFrameCtrl::EMode_NONE, 0, FALSE},
@@ -135,7 +122,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[] = {
     {11, J3DFrameCtrl::EMode_NONE, 2, 16, J3DFrameCtrl::EMode_NONE, 2, TRUE},
 };
 
-/* 80B52C94-80B52E44 0007B8 01B0+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {3, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -166,7 +152,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B52E44-80B53064 000968 0220+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -204,7 +189,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[] = {
     {32, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B53064-80B5307C -00001 0018+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_Yelia_c */
 char* daNpc_Yelia_c::mCutNameList[6] = {
     "",
     "CONVERSATION_ABOUT_LOOPHOLE",
@@ -214,7 +198,6 @@ char* daNpc_Yelia_c::mCutNameList[6] = {
     "THANK_YOU",
 };
 
-/* 80B530B8-80B53100 000BDC 0048+00 1/2 0/0 0/0 .data            mCutList__13daNpc_Yelia_c */
 BOOL (daNpc_Yelia_c::*daNpc_Yelia_c::mCutList[6])(int) = {
     NULL,
     &daNpc_Yelia_c::cutConversationAboutLoopHole,
@@ -355,10 +338,8 @@ daNpc_Yelia_Param_c::param const daNpc_Yelia_Param_c::m = {
     0.0f,
 };
 
-/* 80B533FC-80B53400 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Yelia_Param_c l_HIO;
 
-/* 80B4D30C-80B4D458 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daNpc_Yelia_cFv */
 daNpc_Yelia_c::~daNpc_Yelia_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -366,7 +347,6 @@ daNpc_Yelia_c::~daNpc_Yelia_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B4D458-80B4D754 000238 02FC+00 1/1 0/0 0/0 .text            create__13daNpc_Yelia_cFv */
 cPhs__Step daNpc_Yelia_c::create() {
     if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) {
         new (this) daNpc_Yelia_c(l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4,
@@ -424,7 +404,6 @@ cPhs__Step daNpc_Yelia_c::create() {
     return step;
 }
 
-/* 80B4D754-80B4DA64 000534 0310+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Yelia_cFv */
 int daNpc_Yelia_c::CreateHeap() {
     int bmd_idx = 1;
     if (mTwilight) {
@@ -471,18 +450,15 @@ int daNpc_Yelia_c::CreateHeap() {
     }
 }
 
-/* 80B4DC20-80B4DC54 000A00 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Yelia_cFv */
 int daNpc_Yelia_c::Delete() {
     this->~daNpc_Yelia_c();
     return 1;
 }
 
-/* 80B4DC54-80B4DC74 000A34 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Yelia_cFv */
 int daNpc_Yelia_c::Execute() {
     return execute();
 }
 
-/* 80B4DC74-80B4DD08 000A54 0094+00 1/1 0/0 0/0 .text            Draw__13daNpc_Yelia_cFv */
 int daNpc_Yelia_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* model_data = mpMorf[0]->getModel()->getModelData();
@@ -491,14 +467,10 @@ int daNpc_Yelia_c::Draw() {
     return draw(FALSE, FALSE, mRealShadowSize, NULL, 100.0f, FALSE, FALSE, FALSE);
 }
 
-/* 80B4DD08-80B4DD28 000AE8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Yelia_cFP10fopAc_ac_c            */
 int daNpc_Yelia_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Yelia_c*>(i_this)->CreateHeap();
 }
 
-/* 80B4DD28-80B4DD80 000B08 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Yelia_cFP8J3DJointi               */
 int daNpc_Yelia_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -510,7 +482,6 @@ int daNpc_Yelia_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B4DD80-80B4DDF8 000B60 0078+00 2/1 0/0 0/0 .text            getType__13daNpc_Yelia_cFv */
 u8 daNpc_Yelia_c::getType() {
     switch (fopAcM_GetParam(this) & 0xff) {
     case 0:
@@ -536,7 +507,6 @@ u8 daNpc_Yelia_c::getType() {
     }
 }
 
-/* 80B4DDF8-80B4DF10 000BD8 0118+00 2/1 0/0 0/0 .text            isDelete__13daNpc_Yelia_cFv */
 BOOL daNpc_Yelia_c::isDelete() {
     switch (mType) {
     case TYPE_HORSE:
@@ -562,7 +532,6 @@ BOOL daNpc_Yelia_c::isDelete() {
     }
 }
 
-/* 80B4DF10-80B4E068 000CF0 0158+00 1/1 0/0 0/0 .text            reset__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::reset() {
     u32 size = (uintptr_t)&field_0xfec - (uintptr_t)&mpNextAction;
     if (mpMatAnm[0] != NULL) {
@@ -577,7 +546,6 @@ void daNpc_Yelia_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80B4E068-80B4E0F4 000E48 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Yelia_cFi */
 void daNpc_Yelia_c::afterJntAnm(int i_jointNo) {
     if (i_jointNo == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -588,7 +556,6 @@ void daNpc_Yelia_c::afterJntAnm(int i_jointNo) {
     }
 }
 
-/* 80B4E0F4-80B4E2C0 000ED4 01CC+00 1/0 0/0 0/0 .text            setParam__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::setParam() {
     selectAction();
     srchActors();
@@ -642,8 +609,6 @@ void daNpc_Yelia_c::setParam() {
     }
 }
 
-/* 80B4E2C0-80B4E5BC 0010A0 02FC+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Yelia_cFv
- */
 BOOL daNpc_Yelia_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Yelia_c::talk)) {
         mPreItemNo = 0;
@@ -711,7 +676,6 @@ BOOL daNpc_Yelia_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80B4E5BC-80B4E6A0 00139C 00E4+00 2/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::setAfterTalkMotion() {
     int no = FACE_NONE;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -755,7 +719,6 @@ void daNpc_Yelia_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(no, -1.0f, FALSE, 0);
 }
 
-/* 80B4E6A0-80B4E7C8 001480 0128+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::srchActors() {
     switch (mType) {
     case TYPE_KAKARIKO:
@@ -789,7 +752,6 @@ void daNpc_Yelia_c::srchActors() {
     }
 }
 
-/* 80B4E7C8-80B4E868 0015A8 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Yelia_cFv */
 BOOL daNpc_Yelia_c::evtTalk() {
     if (chkAction(&daNpc_Yelia_c::talk)) {
         (this->*mpAction)(NULL);
@@ -799,7 +761,6 @@ BOOL daNpc_Yelia_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B4E868-80B4E930 001648 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Yelia_cFv */
 BOOL daNpc_Yelia_c::evtCutProc() {
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Yelia", this, -1);
     if (staff_id != -1) {
@@ -814,7 +775,6 @@ BOOL daNpc_Yelia_c::evtCutProc() {
     }
 }
 
-/* 80B4E930-80B4EA28 001710 00F8+00 1/0 0/0 0/0 .text            action__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::action() {
     hitChk(&mCcCyl, -1);
     if (mStagger.checkRebirth()) {
@@ -830,7 +790,6 @@ void daNpc_Yelia_c::action() {
     }
 }
 
-/* 80B4EA28-80B4EAEC 001808 00C4+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::beforeMove() {
     fopAcM_OffStatus(this, 0x8000000);
     if (checkHide()) {
@@ -841,7 +800,6 @@ void daNpc_Yelia_c::beforeMove() {
     }
 }
 
-/* 80B4EAEC-80B4EE4C 0018CC 0360+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::setAttnPos() {
     cXyz eye_offset(30.0f, -5.0f, 0.0f);
     cXyz vec(0.0f, -5.0f, 0.0f);
@@ -878,7 +836,6 @@ void daNpc_Yelia_c::setAttnPos() {
     attention_info.position = vec + current.pos;
 }
 
-/* 80B4EE4C-80B4EFA4 001C2C 0158+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Yelia_cFv */
 void daNpc_Yelia_c::setCollision() {
     cXyz vec;
 
@@ -913,12 +870,10 @@ void daNpc_Yelia_c::setCollision() {
     mCcCyl.ClrTgHit();
 }
 
-/* 80B4EFA4-80B4EFAC 001D84 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Yelia_cFv */
 BOOL daNpc_Yelia_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80B4EFAC-80B4F054 001D8C 00A8+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Yelia_cFv */
 BOOL daNpc_Yelia_c::selectAction() {
     mpNextAction = NULL;
     switch (mType) {
@@ -935,14 +890,10 @@ BOOL daNpc_Yelia_c::selectAction() {
     return TRUE;
 }
 
-/* 80B4F054-80B4F080 001E34 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Yelia_cFM13daNpc_Yelia_cFPCvPvPv_i        */
 BOOL daNpc_Yelia_c::chkAction(BOOL (daNpc_Yelia_c::*i_action)(void*)) {
     return mpAction == i_action;
 }
 
-/* 80B4F080-80B4F128 001E60 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Yelia_cFM13daNpc_Yelia_cFPCvPvPv_i        */
 BOOL daNpc_Yelia_c::setAction(BOOL (daNpc_Yelia_c::*i_action)(void*)) {
     mMode = MODE_EXIT;
     if (mpAction != NULL) {
@@ -958,8 +909,6 @@ BOOL daNpc_Yelia_c::setAction(BOOL (daNpc_Yelia_c::*i_action)(void*)) {
     return TRUE;
 }
 
-/* 80B4F128-80B4F3E0 001F08 02B8+00 1/0 0/0 0/0 .text
- * cutConversationAboutLoopHole__13daNpc_Yelia_cFi              */
 BOOL daNpc_Yelia_c::cutConversationAboutLoopHole(int i_staffId) {
     BOOL ret = FALSE;
     int prm = -1;
@@ -1017,8 +966,6 @@ BOOL daNpc_Yelia_c::cutConversationAboutLoopHole(int i_staffId) {
     return ret;
 }
 
-/* 80B4F3E0-80B4F534 0021C0 0154+00 1/0 0/0 0/0 .text            cutTWResistance__13daNpc_Yelia_cFi
- */
 BOOL daNpc_Yelia_c::cutTWResistance(int i_staffId) {
     BOOL ret = FALSE;
     int prm = -1;
@@ -1057,7 +1004,6 @@ BOOL daNpc_Yelia_c::cutTWResistance(int i_staffId) {
     return ret;
 }
 
-/* 80B4F534-80B4FDD8 002314 08A4+00 1/0 0/0 0/0 .text cutTakeWoodStatue__13daNpc_Yelia_cFi */
 BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) {
     daDitem_c* item = NULL;
     cXyz pos;
@@ -1252,7 +1198,6 @@ BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) {
     return ret;
 }
 
-/* 80B4FDD8-80B4FE78 002BB8 00A0+00 1/0 0/0 0/0 .text            cutClothTry__13daNpc_Yelia_cFi */
 BOOL daNpc_Yelia_c::cutClothTry(int i_staffId) {
     BOOL ret = 0;
     int prm = -1;
@@ -1273,7 +1218,6 @@ BOOL daNpc_Yelia_c::cutClothTry(int i_staffId) {
     return ret;
 }
 
-/* 80B4FE78-80B50084 002C58 020C+00 1/0 0/0 0/0 .text            cutThankYou__13daNpc_Yelia_cFi */
 BOOL daNpc_Yelia_c::cutThankYou(int i_staffId) {
     BOOL ret = 0;
     int prm = -1;
@@ -1337,7 +1281,6 @@ BOOL daNpc_Yelia_c::cutThankYou(int i_staffId) {
     return ret;
 }
 
-/* 80B50084-80B5080C 002E64 0788+00 1/0 0/0 0/0 .text            wait__13daNpc_Yelia_cFPv */
 BOOL daNpc_Yelia_c::wait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1465,7 +1408,6 @@ BOOL daNpc_Yelia_c::wait(void* param_0) {
     return TRUE;
 }
 
-/* 80B5080C-80B50A0C 0035EC 0200+00 5/0 0/0 0/0 .text            horseWait__13daNpc_Yelia_cFPv */
 BOOL daNpc_Yelia_c::horseWait(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1505,7 +1447,6 @@ BOOL daNpc_Yelia_c::horseWait(void* param_0) {
     return TRUE;
 }
 
-/* 80B50A0C-80B50B60 0037EC 0154+00 1/0 0/0 0/0 .text            reminiscence__13daNpc_Yelia_cFPv */
 BOOL daNpc_Yelia_c::reminiscence(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1535,7 +1476,6 @@ BOOL daNpc_Yelia_c::reminiscence(void* param_0) {
     return TRUE;
 }
 
-/* 80B50B60-80B50EE0 003940 0380+00 3/0 0/0 0/0 .text            talk__13daNpc_Yelia_cFPv */
 BOOL daNpc_Yelia_c::talk(void* param_0) {
     switch (mMode) {
     case MODE_ENTER:
@@ -1591,32 +1531,26 @@ BOOL daNpc_Yelia_c::talk(void* param_0) {
     return FALSE;
 }
 
-/* 80B50EE0-80B50F00 003CC0 0020+00 1/0 0/0 0/0 .text            daNpc_Yelia_Create__FPv */
 static cPhs__Step daNpc_Yelia_Create(void* i_this) {
     return static_cast<daNpc_Yelia_c*>(i_this)->create();
 }
 
-/* 80B50F00-80B50F20 003CE0 0020+00 1/0 0/0 0/0 .text            daNpc_Yelia_Delete__FPv */
 static int daNpc_Yelia_Delete(void* i_this) {
     return static_cast<daNpc_Yelia_c*>(i_this)->Delete();
 }
 
-/* 80B50F20-80B50F40 003D00 0020+00 1/0 0/0 0/0 .text            daNpc_Yelia_Execute__FPv */
 static int daNpc_Yelia_Execute(void* i_this) {
     return static_cast<daNpc_Yelia_c*>(i_this)->Execute();
 }
 
-/* 80B50F40-80B50F60 003D20 0020+00 1/0 0/0 0/0 .text            daNpc_Yelia_Draw__FPv */
 static int daNpc_Yelia_Draw(void* i_this) {
     return static_cast<daNpc_Yelia_c*>(i_this)->Draw();
 }
 
-/* 80B50F60-80B50F68 003D40 0008+00 1/0 0/0 0/0 .text            daNpc_Yelia_IsDelete__FPv */
 static int daNpc_Yelia_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B53220-80B53240 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Yelia_MethodTable */
 static actor_method_class daNpc_Yelia_MethodTable = {
     (process_method_func)daNpc_Yelia_Create,
     (process_method_func)daNpc_Yelia_Delete,
@@ -1625,7 +1559,6 @@ static actor_method_class daNpc_Yelia_MethodTable = {
     (process_method_func)daNpc_Yelia_Draw,
 };
 
-/* 80B53240-80B53270 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YELIA */
 extern actor_process_profile_definition g_profile_NPC_YELIA = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp
index 9dda45a63c..7f78100b8b 100644
--- a/src/d/actor/d_a_npc_ykm.cpp
+++ b/src/d/actor/d_a_npc_ykm.cpp
@@ -174,7 +174,6 @@ enum RES_Name {
     /* 0x4 */ YKM3,
 };
 
-/* 80B5D794-80B5D85C 000000 00C8+00 23/23 0/0 0/0 .rodata          m__17daNpc_ykM_Param_c */
 daNpc_ykM_HIOParam const daNpc_ykM_Param_c::m = {
     500.0f,
     -4.0f,
@@ -317,7 +316,6 @@ void daNpc_ykM_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80B5DB08-80B5DB38 000020 0030+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[6][2] = {
     {BMDR_YKM, YKM},
     {BMDR_YKM_TOMATO, YKM1},
@@ -336,7 +334,6 @@ enum BmdIndex {
     BMD_INDEX_LEAF,
 };
 
-/* 80B5DB38-80B5DB88 -00001 0050+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[10] = {
     {"", 0},
     {"NO_RESPONSE", 0},
@@ -350,7 +347,6 @@ static daNpcT_evtData_c l_evtList[10] = {
     {"HUG", 2},
 };
 
-/* 80B5DB88-80B5DB9C -00001 0014+00 4/5 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[5] = {
     "",
     "ykM",
@@ -359,25 +355,19 @@ static char* l_resNameList[5] = {
     "ykM3",
 };
 
-/* 80B5DB9C-80B5DBA0 0000B4 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[3] = {YKM, YKM1, -1};
 
-/* 80B5DBA0-80B5DBA4 0000B8 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {YKM, YKM2, -1};
 
-/* 80B5DBA4-80B5DBAC 0000BC 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn2 */
 static s8 l_loadResPtrn2[5] = {YKM, YKM1, YKM2, YKM3, -1};
 
-/* 80B5DBAC-80B5DBB4 0000C4 0005+03 1/0 0/0 0/0 .data            l_loadResPtrn9 */
 static s8 l_loadResPtrn9[5] = {YKM, YKM1, YKM2, YKM3, -1};
 
-/* 80B5DBB4-80B5DBD4 -00001 0020+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[8] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn2, l_loadResPtrn0,
     l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn9,
 };
 
-/* 80B5DBD4-80B5DD94 0000EC 01C0+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {-1, J3DFrameCtrl::EMode_NONE, 0, BTP_YKM, J3DFrameCtrl::EMode_LOOP, YKM, TRUE},
     {BCK_YKM_F_TALK_A, J3DFrameCtrl::EMode_NONE, YKM, BTP_YKM, J3DFrameCtrl::EMode_LOOP, YKM, TRUE},
@@ -397,7 +387,6 @@ static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[16] = {
     {BCK_YKM_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, YKM1, BTP_YKM_FH_HAPPY, J3DFrameCtrl::EMode_LOOP, YKM1, FALSE},
 };
 
-/* 80B5DD94-80B5E328 0002AC 0594+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[51] = {
     {BCK_YKM_WAIT_A, J3DFrameCtrl::EMode_LOOP, YKM, BTK_YKM, J3DFrameCtrl::EMode_NONE, YKM, 1, 0},
     {BCK_YKM_WAIT_B, J3DFrameCtrl::EMode_LOOP, YKM1, BTK_YKM_WAIT_B, J3DFrameCtrl::EMode_NONE, YKM1, 0, 0},
@@ -452,7 +441,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[51] = {
     {BCK_YKM_WAITHOLD_B_B, J3DFrameCtrl::EMode_LOOP, YKM1, BTK_YKM, J3DFrameCtrl::EMode_NONE, YKM, 1, 0},
 };
 
-/* 80B5E328-80B5E428 000840 0100+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {2, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -472,7 +460,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] =
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B5E428-80B5E718 000940 02F0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = {
     {0, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
@@ -523,7 +510,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = {
     {0x27, -1, 1}, {0x28, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B5E718-80B5E740 -00001 0028+00 1/1 0/0 0/0 .data            mCutNameList__11daNpc_ykM_c */
 char* daNpc_ykM_c::mCutNameList[10] = {
     "",
     "SLIDEDOWN",
@@ -537,7 +523,6 @@ char* daNpc_ykM_c::mCutNameList[10] = {
     "HUG"
 };
 
-/* 80B5E7AC-80B5E824 000CC4 0078+00 1/2 0/0 0/0 .data            mCutList__11daNpc_ykM_c */
 daNpc_ykM_c::cutFunc daNpc_ykM_c::mCutList[10] = {
     NULL,
     &daNpc_ykM_c::cutSlideDown,
@@ -551,16 +536,12 @@ daNpc_ykM_c::cutFunc daNpc_ykM_c::mCutList[10] = {
     &daNpc_ykM_c::cutHug,
 };
 
-/* 80B5ED74-80B5ED80 000054 000C+00 0/1 0/0 0/0 .bss             l_SBRaceStartPos */
 static cXyz l_SBRaceStartPos;
 
-/* 80B5ED8C-80B5ED94 00006C 0006+02 0/1 0/0 0/0 .bss             l_SBRaceStartAngle */
 static csXyz l_SBRaceStartAngle;
 
-/* 80B5EDA0-80B5EDA4 000080 0004+00 0/1 0/0 0/0 .bss             l_HIO */
 static NPC_YKM_HIO_CLASS l_HIO;
 
-/* 80B534EC-80B53698 0000EC 01AC+00 1/0 0/0 0/0 .text            __dt__11daNpc_ykM_cFv */
 daNpc_ykM_c::~daNpc_ykM_c() {
     OS_REPORT("|%06d:%x|daNpc_ykM_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -591,7 +572,6 @@ daNpc_ykM_c::~daNpc_ykM_c() {
     daNpcT_offTmpBit(0x54); // dSv_event_tmp_flag_c::T_0084 - Snowpeak mountain - Racing with Yeto
 }
 
-/* 80B53698-80B53990 000298 02F8+00 1/1 0/0 0/0 .text            create__11daNpc_ykM_cFv */
 cPhs__Step daNpc_ykM_c::create() {
     daNpcT_ct(this, daNpc_ykM_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData,
                                                   4, l_motionSequenceData, 4, l_evtList, l_resNameList);
@@ -662,7 +642,6 @@ cPhs__Step daNpc_ykM_c::create() {
     return phase;
 }
 
-/* 80B53990-80B53F00 000590 0570+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_ykM_cFv */
 int daNpc_ykM_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -769,7 +748,6 @@ int daNpc_ykM_c::CreateHeap() {
     return 0;
 }
 
-/* 80B540BC-80B540F0 000CBC 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_ykM_cFv */
 int daNpc_ykM_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_ykM_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID unusedId = fopAcM_GetID(this);
@@ -781,12 +759,10 @@ static void dummy_string() {
     OS_REPORT("Delete -> NPC_YKM(id=%d)\n", 0);
 }
 
-/* 80B540F0-80B54110 000CF0 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_ykM_cFv */
 int daNpc_ykM_c::Execute() {
     return execute();
 }
 
-/* 80B54110-80B541F8 000D10 00E8+00 1/1 0/0 0/0 .text            Draw__11daNpc_ykM_cFv */
 int daNpc_ykM_c::Draw() {
     J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
     int rv = 0;
@@ -815,13 +791,11 @@ int daNpc_ykM_c::Draw() {
     return rv;
 }
 
-/* 80B541F8-80B54218 000DF8 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__11daNpc_ykM_cFP10fopAc_ac_c */
 int daNpc_ykM_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_ykM_c* i_this = (daNpc_ykM_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80B54218-80B54270 000E18 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__11daNpc_ykM_cFP8J3DJointi */
 int daNpc_ykM_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -834,7 +808,6 @@ int daNpc_ykM_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B54270-80B5430C 000E70 009C+00 2/2 0/0 0/0 .text            srchGadget__11daNpc_ykM_cFPvPv */
 void* daNpc_ykM_c::srchGadget(void* i_actor, void* i_data) {
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
     if (mFindCount < 50) {
@@ -850,7 +823,6 @@ void* daNpc_ykM_c::srchGadget(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B5430C-80B543DC 000F0C 00D0+00 1/1 0/0 0/0 .text            getTomatoPureeP__11daNpc_ykM_cFv */
 fopAc_ac_c* daNpc_ykM_c::getTomatoPureeP() {
     fopAc_ac_c* actor = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -868,7 +840,6 @@ fopAc_ac_c* daNpc_ykM_c::getTomatoPureeP() {
     return actor;
 }
 
-/* 80B543DC-80B544B0 000FDC 00D4+00 1/1 0/0 0/0 .text            getCheeseP__11daNpc_ykM_cFv */
 fopAc_ac_c* daNpc_ykM_c::getCheeseP() {
     fopAc_ac_c* actor = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -886,7 +857,6 @@ fopAc_ac_c* daNpc_ykM_c::getCheeseP() {
     return actor;
 }
 
-/* 80B544B0-80B5454C 0010B0 009C+00 1/1 0/0 0/0 .text            srchYkm__11daNpc_ykM_cFPvPv */
 void* daNpc_ykM_c::srchYkm(void* i_actor, void* i_data) {
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
     if (mFindCount < 50) {
@@ -902,7 +872,6 @@ void* daNpc_ykM_c::srchYkm(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B5454C-80B54628 00114C 00DC+00 4/4 0/0 0/0 .text            getOtherYkmP__11daNpc_ykM_cFi */
 fopAc_ac_c* daNpc_ykM_c::getOtherYkmP(int param_1) {
     fopAc_ac_c* actor = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -921,7 +890,6 @@ fopAc_ac_c* daNpc_ykM_c::getOtherYkmP(int param_1) {
     return actor;
 }
 
-/* 80B54628-80B546C4 001228 009C+00 1/1 0/0 0/0 .text            srchYkw__11daNpc_ykM_cFPvPv */
 void* daNpc_ykM_c::srchYkw(void* i_actor, void* i_data) {
     fopAc_ac_c* data = (fopAc_ac_c*)i_data;
     if (mFindCount < 50) {
@@ -937,7 +905,6 @@ void* daNpc_ykM_c::srchYkw(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80B546C4-80B547A0 0012C4 00DC+00 1/1 0/0 0/0 .text            getOtherYkwP__11daNpc_ykM_cFi */
 fopAc_ac_c* daNpc_ykM_c::getOtherYkwP(int param_1) {
     fopAc_ac_c* actor = NULL;
     f32 fVar1 = G_CM3D_F_INF;
@@ -955,7 +922,6 @@ fopAc_ac_c* daNpc_ykM_c::getOtherYkwP(int param_1) {
     return actor;
 }
 
-/* 80B547A0-80B54808 0013A0 0068+00 3/2 0/0 1/1 .text            getType__11daNpc_ykM_cFv */
 u8 daNpc_ykM_c::getType() {
     u8 param = fopAcM_GetParam(this) & 0xFF;
     switch (param) {
@@ -985,7 +951,6 @@ u8 daNpc_ykM_c::getType() {
     }
 }
 
-/* 80B54808-80B548A8 001408 00A0+00 2/1 0/0 0/0 .text            isDelete__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::isDelete() {
     switch (mType) {
         case TYPE_0:
@@ -1014,7 +979,6 @@ BOOL daNpc_ykM_c::isDelete() {
     }
 }
 
-/* 80B548A8-80B54B44 0014A8 029C+00 1/1 0/0 0/0 .text            reset__11daNpc_ykM_cFv */
 // NONMATCHING - m_nextID load issue, regalloc
 void daNpc_ykM_c::reset() {
     csXyz angle;
@@ -1084,7 +1048,6 @@ void daNpc_ykM_c::reset() {
     setAngle(angle);
 }
 
-/* 80B54B44-80B54BD0 001744 008C+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_ykM_cFi */
 void daNpc_ykM_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -1095,7 +1058,6 @@ void daNpc_ykM_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B54BD0-80B54E48 0017D0 0278+00 1/0 0/0 0/0 .text            setParam__11daNpc_ykM_cFv */
 void daNpc_ykM_c::setParam() {
     selectAction();
     srchActors();
@@ -1167,7 +1129,6 @@ void daNpc_ykM_c::setParam() {
     field_0xd8a.y = 0;
 }
 
-/* 80B54E5C-80B55004 001A5C 01A8+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::checkChangeEvt() {
     if (!chkAction(&daNpc_ykM_c::talk)) {
         mPreItemNo = 0;
@@ -1226,7 +1187,6 @@ BOOL daNpc_ykM_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80B55004-80B550A4 001C04 00A0+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_ykM_cFv */
 void daNpc_ykM_c::setAfterTalkMotion() {
     int i_index = FACE_NONE;
 
@@ -1247,7 +1207,6 @@ void daNpc_ykM_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(i_index, -1.0f, FALSE, 0);
 }
 
-/* 80B550A4-80B55254 001CA4 01B0+00 1/1 0/0 0/0 .text            srchActors__11daNpc_ykM_cFv */
 void daNpc_ykM_c::srchActors() {
     switch (mType) {
         case TYPE_0:
@@ -1298,7 +1257,6 @@ void daNpc_ykM_c::srchActors() {
     }
 }
 
-/* 80B55254-80B552F4 001E54 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::evtTalk() {
     if (chkAction(&daNpc_ykM_c::talk)) {
         (this->*mpAction)(NULL);
@@ -1309,7 +1267,6 @@ BOOL daNpc_ykM_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B552F4-80B553BC 001EF4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::evtCutProc() {
     s32 staffId = dComIfGp_getEventManager().getMyStaffId("ykM", this, -1);
     if (staffId != -1) {
@@ -1325,7 +1282,6 @@ BOOL daNpc_ykM_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80B553BC-80B55658 001FBC 029C+00 1/0 0/0 0/0 .text            action__11daNpc_ykM_cFv */
 void daNpc_ykM_c::action() {
     fopAc_ac_c* actor = NULL;
 
@@ -1377,7 +1333,6 @@ void daNpc_ykM_c::action() {
     }
 }
 
-/* 80B55658-80B5571C 002258 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_ykM_cFv */
 void daNpc_ykM_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
 
@@ -1390,7 +1345,6 @@ void daNpc_ykM_c::beforeMove() {
     }
 }
 
-/* 80B5571C-80B55A64 00231C 0348+00 1/0 0/0 0/0 .text            afterMoved__11daNpc_ykM_cFv */
 void daNpc_ykM_c::afterMoved() {
     f32 var_f31;
     f32 var_f30;
@@ -1439,7 +1393,6 @@ void daNpc_ykM_c::afterMoved() {
     }
 }
 
-/* 80B55A64-80B560B4 002664 0650+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_ykM_cFv */
 // NONMATCHING - HIO load issue
 void daNpc_ykM_c::setAttnPos() {
     fopAc_ac_c* otherYkmP = NULL;
@@ -1543,7 +1496,6 @@ void daNpc_ykM_c::setAttnPos() {
     attention_info.position = current.pos + sp104;
 }
 
-/* 80B560B4-80B5641C 002CB4 0368+00 1/0 0/0 0/0 .text            setCollision__11daNpc_ykM_cFv */
 void daNpc_ykM_c::setCollision() {
     cXyz sp28;
 
@@ -1627,7 +1579,6 @@ void daNpc_ykM_c::setCollision() {
     field_0xe58.ClrAtHit();
 }
 
-/* 80B5641C-80B56424 00301C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_ykM_cFv */
 int daNpc_ykM_c::drawDbgInfo() {
 #if DEBUG
     if (mpHIO->m.common.debug_info_ON != 0) {
@@ -1645,7 +1596,6 @@ int daNpc_ykM_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B56424-80B56624 003024 0200+00 1/0 0/0 0/0 .text            drawOtherMdl__11daNpc_ykM_cFv */
 void daNpc_ykM_c::drawOtherMdl() {
     J3DModel* model = mpMorf[0]->getModel();
 
@@ -1691,7 +1641,6 @@ void daNpc_ykM_c::drawOtherMdl() {
     }
 }
 
-/* 80B56624-80B566E8 003224 00C4+00 1/1 0/0 0/0 .text            setFishAnm__11daNpc_ykM_cFiif */
 bool daNpc_ykM_c::setFishAnm(int i_index, int i_attr, f32 i_morf) {
     static struct {
         int resIdx;
@@ -1741,7 +1690,6 @@ bool daNpc_ykM_c::setFishAnm(int i_index, int i_attr, f32 i_morf) {
     return true;
 }
 
-/* 80B566E8-80B567B4 0032E8 00CC+00 2/2 0/0 0/0 .text            setLeafAnm__11daNpc_ykM_cFif */
 bool daNpc_ykM_c::setLeafAnm(int i_index, f32 i_morf) {
     static struct {
         int resIdx;
@@ -1769,7 +1717,6 @@ bool daNpc_ykM_c::setLeafAnm(int i_index, f32 i_morf) {
     return true;
 }
 
-/* 80B567B4-80B5680C 0033B4 0058+00 1/0 0/0 0/0 .text afterSetMotionAnm__11daNpc_ykM_cFiifi */
 bool daNpc_ykM_c::afterSetMotionAnm(int i_index, int i_attr, f32 i_morf, int param_3) {
     f32 morf = mCreating == true ? 0.0f : i_morf;
 
@@ -1782,7 +1729,6 @@ bool daNpc_ykM_c::afterSetMotionAnm(int i_index, int i_attr, f32 i_morf, int par
     return setFishAnm(i_index, i_attr, morf);
 }
 
-/* 80B5680C-80B56954 00340C 0148+00 1/1 0/0 0/0 .text            selectAction__11daNpc_ykM_cFv */
 int daNpc_ykM_c::selectAction() {
     mpNextAction = NULL;
 
@@ -1827,12 +1773,10 @@ int daNpc_ykM_c::selectAction() {
     return 1;
 }
 
-/* 80B56954-80B56980 003554 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_ykM_cFM11daNpc_ykM_cFPCvPvPv_i */
 BOOL daNpc_ykM_c::chkAction(ActionFn action) {
     return mpAction == action;
 }
 
-/* 80B56980-80B56A28 003580 00A8+00 2/2 0/0 0/0 .text            setAction__11daNpc_ykM_cFM11daNpc_ykM_cFPCvPvPv_i */
 int daNpc_ykM_c::setAction(ActionFn action) {
     mMode = 3;
 
@@ -1850,7 +1794,6 @@ int daNpc_ykM_c::setAction(ActionFn action) {
     return 1;
 }
 
-/* 80B56A28-80B56AB4 003628 008C+00 2/2 0/0 0/0 .text chkContinueAttnPlayer__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::chkContinueAttnPlayer() {
     if (mType == TYPE_COOK && daNpcT_chkEvtBit(0xB) /* dSv_event_flag_c::F_0007 - Snowpeak Ruins - Spoke to Yeta while holding cheese */) {
         if (daNpcT_chkEvtBit(4) /* dSv_event_flag_c::TEST_004 - Snowpeak Ruins - Handed over secret ingredient */
@@ -1867,7 +1810,6 @@ BOOL daNpc_ykM_c::chkContinueAttnPlayer() {
     return FALSE;
 }
 
-/* 80B56AB4-80B56B84 0036B4 00D0+00 1/1 0/0 0/0 .text            chkTouchPlayer__11daNpc_ykM_cFv */
 BOOL daNpc_ykM_c::chkTouchPlayer() {
     fopAc_ac_c* actor = NULL;
     if (20.0f < speedF) {
@@ -1893,7 +1835,6 @@ BOOL daNpc_ykM_c::chkTouchPlayer() {
     return FALSE;
 }
 
-/* 80B56B84-80B572C8 003784 0744+00 3/0 0/0 0/0 .text            cutSlideDown__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutSlideDown(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -2057,7 +1998,6 @@ int daNpc_ykM_c::cutSlideDown(int i_cutIndex) {
     return rv;
 }
 
-/* 80B572C8-80B57638 003EC8 0370+00 1/0 0/0 0/0 .text            cutMeetingAgain__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutMeetingAgain(int i_cutIndex) {
     cXyz work;
     int rv = 0;
@@ -2146,7 +2086,6 @@ int daNpc_ykM_c::cutMeetingAgain(int i_cutIndex) {
     return rv;
 }
 
-/* 80B57638-80B5806C 004238 0A34+00 3/0 0/0 0/0 .text            cutGetTomatoPuree__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutGetTomatoPuree(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -2376,7 +2315,6 @@ int daNpc_ykM_c::cutGetTomatoPuree(int i_cutIndex) {
     return rv;
 }
 
-/* 80B5806C-80B58A38 004C6C 09CC+00 3/0 0/0 0/0 .text            cutGetTaste__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutGetTaste(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -2583,7 +2521,6 @@ int daNpc_ykM_c::cutGetTaste(int i_cutIndex) {
     return rv;
 }
 
-/* 80B58A38-80B59500 005638 0AC8+00 1/0 0/0 0/0 .text            cutLv5DungeonClear__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
@@ -2835,7 +2772,6 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) {
     return rv;
 }
 
-/* 80B59500-80B59748 006100 0248+00 1/0 0/0 0/0 .text            cutFindWolf__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutFindWolf(int i_cutIndex) {
     int rv = 0;
     int* piVar1 = NULL;
@@ -2886,7 +2822,6 @@ int daNpc_ykM_c::cutFindWolf(int i_cutIndex) {
     return rv;
 }
 
-/* 80B59748-80B59B90 006348 0448+00 1/0 0/0 0/0 .text cutStartSnowboardRace__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutStartSnowboardRace(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -3003,7 +2938,6 @@ int daNpc_ykM_c::cutStartSnowboardRace(int i_cutIndex) {
     return rv;
 }
 
-/* 80B59B90-80B5A0B8 006790 0528+00 1/0 0/0 0/0 .text cutEndSnowboardRace__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutEndSnowboardRace(int i_cutIndex) {
     fopAc_ac_c* actor_p = NULL;
     cXyz work;
@@ -3145,7 +3079,6 @@ int daNpc_ykM_c::cutEndSnowboardRace(int i_cutIndex) {
     return rv;
 }
 
-/* 80B5A0B8-80B5A128 006CB8 0070+00 1/0 0/0 0/0 .text            cutHug__11daNpc_ykM_cFi */
 int daNpc_ykM_c::cutHug(int i_cutIndex) {
     int prm;
     int rv = 0;
@@ -3165,7 +3098,6 @@ int daNpc_ykM_c::cutHug(int i_cutIndex) {
     return rv;
 }
 
-/* 80B5A128-80B5A224 006D28 00FC+00 1/1 0/0 0/0 .text            setDialogueMotion__11daNpc_ykM_cFv */
 void daNpc_ykM_c::setDialogueMotion() {
     int uVar1 = field_0x154c;
     uVar1 >>= 1;
@@ -3195,7 +3127,6 @@ void daNpc_ykM_c::setDialogueMotion() {
     }
 }
 
-/* 80B5A224-80B5A3FC 006E24 01D8+00 1/1 0/0 0/0 .text            dialogue__11daNpc_ykM_cFv */
 int daNpc_ykM_c::dialogue() {
     daNpc_ykW_c* actor_p = NULL;
 
@@ -3256,7 +3187,6 @@ int daNpc_ykM_c::dialogue() {
     return 0;
 }
 
-/* 80B5A3FC-80B5ABA8 006FFC 07AC+00 3/0 0/0 0/0 .text            wait__11daNpc_ykM_cFPv */
 BOOL daNpc_ykM_c::wait(void* param_1) {
     daTag_EvtArea_c* actor_p = NULL;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3411,7 +3341,6 @@ BOOL daNpc_ykM_c::wait(void* param_1) {
     return TRUE;
 }
 
-/* 80B5ABA8-80B5B260 0077A8 06B8+00 1/0 0/0 0/0 .text            cook__11daNpc_ykM_cFPv */
 BOOL daNpc_ykM_c::cook(void* param_1) {
     fopAc_ac_c* actor_p = NULL;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -3521,7 +3450,6 @@ BOOL daNpc_ykM_c::cook(void* param_1) {
     return TRUE;
 }
 
-/* 80B5B260-80B5BE08 007E60 0BA8+00 2/0 0/0 0/0 .text            race__11daNpc_ykM_cFPv */
 BOOL daNpc_ykM_c::race(void* param_1) {
     cXyz work;
     fopAc_ac_c* actors[2] = {this, daPy_getPlayerActorClass()};
@@ -3706,7 +3634,6 @@ BOOL daNpc_ykM_c::race(void* param_1) {
     return TRUE;
 }
 
-/* 80B5BE08-80B5C0C4 008A08 02BC+00 3/0 0/0 0/0 .text            talk__11daNpc_ykM_cFPv */
 BOOL daNpc_ykM_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -3797,34 +3724,28 @@ BOOL daNpc_ykM_c::test(void* param_1) {
 }
 #endif
 
-/* 80B5C0C4-80B5C0E4 008CC4 0020+00 1/0 0/0 0/0 .text            daNpc_ykM_Create__FPv */
 static int daNpc_ykM_Create(void* i_this) {
     return ((daNpc_ykM_c*)i_this)->create();
 }
 
-/* 80B5C0E4-80B5C104 008CE4 0020+00 1/0 0/0 0/0 .text            daNpc_ykM_Delete__FPv */
 static int daNpc_ykM_Delete(void* i_this) {
     return ((daNpc_ykM_c*)i_this)->Delete();
 }
 
-/* 80B5C104-80B5C124 008D04 0020+00 1/0 0/0 0/0 .text            daNpc_ykM_Execute__FPv */
 static int daNpc_ykM_Execute(void* i_this) {
     return ((daNpc_ykM_c*)i_this)->Execute();
 }
 
-/* 80B5C124-80B5C144 008D24 0020+00 1/0 0/0 0/0 .text            daNpc_ykM_Draw__FPv */
 static int daNpc_ykM_Draw(void* i_this) {
     return ((daNpc_ykM_c*)i_this)->Draw();
 }
 
-/* 80B5C144-80B5C14C 008D44 0008+00 1/0 0/0 0/0 .text            daNpc_ykM_IsDelete__FPv */
 static int daNpc_ykM_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80B5EB4C-80B5EB6C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_ykM_MethodTable */
 static actor_method_class daNpc_ykM_MethodTable = {
     (process_method_func)daNpc_ykM_Create,
     (process_method_func)daNpc_ykM_Delete,
@@ -3833,7 +3754,6 @@ static actor_method_class daNpc_ykM_MethodTable = {
     (process_method_func)daNpc_ykM_Draw,
 };
 
-/* 80B5EB6C-80B5EB9C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YKM */
 extern actor_process_profile_definition g_profile_NPC_YKM = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp
index ef49ffc703..b9aab172ae 100644
--- a/src/d/actor/d_a_npc_ykw.cpp
+++ b/src/d/actor/d_a_npc_ykw.cpp
@@ -25,7 +25,7 @@ public:
     daNpc_ykW_HIO_c() {
         m = daNpc_ykW_Param_c::m;
     }
-    /* 80B67B74 */ virtual ~daNpc_ykW_HIO_c() {}
+    virtual ~daNpc_ykW_HIO_c() {}
 
     void listenPropertyEvent(const JORPropertyEvent*);
 
@@ -41,10 +41,6 @@ public:
 #define HIO_PARAM(i_this) (&daNpc_ykW_Param_c::m)
 #endif
 
-//
-// Declarations:
-//
-
 static int l_bmdData[1][2] = {
     {11, 1},
 };
@@ -175,7 +171,6 @@ const char* daNpc_ykW_c::mCutNameList[8] = {
     "HUG",
 };
 
-/* 80B688BC-80B6891C 00097C 0060+00 1/2 0/0 0/0 .data            mCutList__11daNpc_ykW_c */
 daNpc_ykW_c::cutFunc daNpc_ykW_c::mCutList[8] = {
     NULL,
     &daNpc_ykW_c::cutShowDoor,
@@ -187,7 +182,6 @@ daNpc_ykW_c::cutFunc daNpc_ykW_c::mCutList[8] = {
     &daNpc_ykW_c::cutHug,
 };
 
-/* 80B68DB4-80B68DB8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 #if DEBUG
 static daNpc_ykW_HIO_c l_HIO;
 #else
@@ -274,7 +268,6 @@ void daNpc_ykW_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80B5EF0C-80B5F084 0000EC 0178+00 1/0 0/0 0/0 .text            __dt__11daNpc_ykW_cFv */
 daNpc_ykW_c::~daNpc_ykW_c() {
     // "daNpc_ykW_c -> destruct"
     OS_REPORT("|%06d:%x|daNpc_ykW_c -> デストラクト\n", g_Counter.mCounter0, this);
@@ -298,8 +291,6 @@ daNpc_ykW_c::~daNpc_ykW_c() {
     daNpcT_offTmpBit(0x55);
 }
 
-/* ############################################################################################## */
-/* 80B67C38-80B67CEC 000000 00B4+00 19/19 0/0 0/0 .rodata          m__17daNpc_ykW_Param_c */
 const daNpc_ykW_HIOParam daNpc_ykW_Param_c::m = {
     {
         250.0f, -3.0f, 1.0f, 500.0f, 255.0f, 230.0f, 35.0f, 60.0f,
@@ -317,13 +308,11 @@ const daNpc_ykW_HIOParam daNpc_ykW_Param_c::m = {
     360, 0, 30,
 };
 
-/* 80B67CEC-80B67D0C 0000B4 0020+00 0/1 0/0 0/0 .rodata          heapSize$4289 */
 static u32 const heapSize[8] = {
     0x8000, 0x3310, 0x8000, 0x8000,
     0x3310, 0x8000, 0x8000, 0x8000,
 };
 
-/* 80B5F084-80B5F34C 000264 02C8+00 1/1 0/0 0/0 .text            create__11daNpc_ykW_cFv */
 int daNpc_ykW_c::create() {
     daNpcT_ct(this, daNpc_ykW_c, l_faceMotionAnmData, l_motionAnmData,
                        l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList,
@@ -408,7 +397,6 @@ f32 dummy_1f() {
     return 1.0f;
 }
 
-/* 80B5F34C-80B5F5C8 00052C 027C+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_ykW_cFv */
 int daNpc_ykW_c::CreateHeap() {
     void* mdlData_p = NULL;
     J3DModel* model = NULL;
@@ -451,7 +439,6 @@ int daNpc_ykW_c::CreateHeap() {
     return 0;
 }
 
-/* 80B5F784-80B5F7B8 000964 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_ykW_cFv */
 int daNpc_ykW_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_ykW_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -459,12 +446,10 @@ int daNpc_ykW_c::Delete() {
     return 1;
 }
 
-/* 80B5F7B8-80B5F7D8 000998 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_ykW_cFv */
 int daNpc_ykW_c::Execute() {
     return execute();
 }
 
-/* 80B5F7D8-80B5F8AC 0009B8 00D4+00 1/1 0/0 0/0 .text            Draw__11daNpc_ykW_cFv */
 int daNpc_ykW_c::Draw() {
     int result = 0;
 
@@ -489,15 +474,11 @@ int daNpc_ykW_c::Draw() {
     return result;
 }
 
-/* 80B5F8AC-80B5F8CC 000A8C 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_ykW_cFP10fopAc_ac_c              */
 int daNpc_ykW_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_ykW_c* ykw = (daNpc_ykW_c*)i_this;
     return ykw->CreateHeap();
 }
 
-/* 80B5F8CC-80B5F924 000AAC 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_ykW_cFP8J3DJointi
- */
 int daNpc_ykW_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* model = j3dSys.getModel();
@@ -509,8 +490,6 @@ int daNpc_ykW_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B5F924-80B5F9D8 000B04 00B4+00 1/1 0/0 0/0 .text            srchItemHeart__11daNpc_ykW_cFPvPv
- */
 void* daNpc_ykW_c::srchItemHeart(void* param_0, void* param_1) {
     daNpcT_c* npc = (daNpcT_c*)param_1;
 
@@ -529,7 +508,6 @@ void* daNpc_ykW_c::srchItemHeart(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80B5F9D8-80B5FA74 000BB8 009C+00 1/1 0/0 0/0 .text            srchYkw__11daNpc_ykW_cFPvPv */
 void* daNpc_ykW_c::srchYkw(void* param_0, void* param_1) {
     fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0;
     fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1;
@@ -542,7 +520,6 @@ void* daNpc_ykW_c::srchYkw(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80B5FA74-80B5FB50 000C54 00DC+00 2/2 0/0 0/0 .text            getOtherYkwP__11daNpc_ykW_cFi */
 fopAc_ac_c* daNpc_ykW_c::getOtherYkwP(int param_0) {
     fopAc_ac_c* actor = 0;
     f32 unkFloat1 = G_CM3D_F_INF;
@@ -560,7 +537,6 @@ fopAc_ac_c* daNpc_ykW_c::getOtherYkwP(int param_0) {
     return actor;
 }
 
-/* 80B5FB50-80B5FBEC 000D30 009C+00 1/1 0/0 0/0 .text            srchYkm__11daNpc_ykW_cFPvPv */
 void* daNpc_ykW_c::srchYkm(void* param_0, void* param_1) {
     fopAc_ac_c* actor1 = (fopAc_ac_c*)param_0;
     fopAc_ac_c* actor2 = (fopAc_ac_c*)param_1;
@@ -573,7 +549,6 @@ void* daNpc_ykW_c::srchYkm(void* param_0, void* param_1) {
     return 0;
 }
 
-/* 80B5FBEC-80B5FCC8 000DCC 00DC+00 1/1 0/0 0/0 .text            getOtherYkmP__11daNpc_ykW_cFi */
 fopAc_ac_c* daNpc_ykW_c::getOtherYkmP(int param_0) {
     fopAc_ac_c* actor = 0;
     f32 minDist = G_CM3D_F_INF;
@@ -589,7 +564,6 @@ fopAc_ac_c* daNpc_ykW_c::getOtherYkmP(int param_0) {
     return actor;
 }
 
-/* 80B5FCC8-80B5FD30 000EA8 0068+00 3/2 0/0 1/1 .text            getType__11daNpc_ykW_cFv */
 u8 daNpc_ykW_c::getType() {
     u8 param = (u8)(fopAcM_GetParam(this) & 0xf);
     switch (param) {
@@ -612,7 +586,6 @@ u8 daNpc_ykW_c::getType() {
     }
 }
 
-/* 80B5FD30-80B5FE6C 000F10 013C+00 2/1 0/0 0/0 .text            isDelete__11daNpc_ykW_cFv */
 int daNpc_ykW_c::isDelete() {
     switch (field_0xf80) {
     case 0:
@@ -635,7 +608,6 @@ int daNpc_ykW_c::isDelete() {
     }
 }
 
-/* 80B5FE6C-80B601C8 00104C 035C+00 1/1 0/0 0/0 .text            reset__11daNpc_ykW_cFv */
 // NONMATCHING - m_nextID load issue
 void daNpc_ykW_c::reset() {
     cXyz unkXyz1;
@@ -721,7 +693,6 @@ void daNpc_ykW_c::reset() {
     setAngle(unkSxyz1);
 }
 
-/* 80B601C8-80B60290 0013A8 00C8+00 1/0 0/0 0/0 .text            afterJntAnm__11daNpc_ykW_cFi */
 void daNpc_ykW_c::afterJntAnm(int param_0) {
     if (param_0 == 1) {
         mDoMtx_stack_c::YrotM(-mStagger.getAngleZ(1));
@@ -739,7 +710,6 @@ void daNpc_ykW_c::afterJntAnm(int param_0) {
     }
 }
 
-/* 80B60290-80B6042C 001470 019C+00 1/0 0/0 0/0 .text            setParam__11daNpc_ykW_cFv */
 void daNpc_ykW_c::setParam() {
     selectAction();
     srchActors();
@@ -801,7 +771,6 @@ void daNpc_ykW_c::setParam() {
     field_0x1061 = 0;
 }
 
-/* 80B6042C-80B60520 00160C 00F4+00 1/0 0/0 0/0 .text            checkChangeEvt__11daNpc_ykW_cFv */
 int daNpc_ykW_c::checkChangeEvt() {
     if (!chkAction(&daNpc_ykW_c::talk)) {
         mPreItemNo = 0;
@@ -824,8 +793,6 @@ int daNpc_ykW_c::checkChangeEvt() {
     return 0;
 }
 
-/* 80B60520-80B605C0 001700 00A0+00 1/0 0/0 0/0 .text            setAfterTalkMotion__11daNpc_ykW_cFv
- */
 void daNpc_ykW_c::setAfterTalkMotion() {
     int index = 13;
     switch (mFaceMotionSeqMngr.getNo()) {
@@ -842,7 +809,6 @@ void daNpc_ykW_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(index, -1.0f, 0, 0);
 }
 
-/* 80B605C0-80B60744 0017A0 0184+00 1/1 0/0 0/0 .text            srchActors__11daNpc_ykW_cFv */
 void daNpc_ykW_c::srchActors() {
     fopAc_ac_c* actor;
 
@@ -879,7 +845,6 @@ void daNpc_ykW_c::srchActors() {
     }
 }
 
-/* 80B60744-80B607E4 001924 00A0+00 1/0 0/0 0/0 .text            evtTalk__11daNpc_ykW_cFv */
 int daNpc_ykW_c::evtTalk() {
     if (chkAction(&daNpc_ykW_c::talk)) {
         (this->*field_0xfe4)(NULL);
@@ -889,7 +854,6 @@ int daNpc_ykW_c::evtTalk() {
     return 1;
 }
 
-/* 80B607E4-80B608AC 0019C4 00C8+00 1/0 0/0 0/0 .text            evtCutProc__11daNpc_ykW_cFv */
 int daNpc_ykW_c::evtCutProc() {
     int staffId = dComIfGp_getEventManager().getMyStaffId("ykW", this, -1);
     if (staffId != -1) {
@@ -905,7 +869,6 @@ int daNpc_ykW_c::evtCutProc() {
     return 0;
 }
 
-/* 80B608AC-80B60AFC 001A8C 0250+00 1/0 0/0 0/0 .text            action__11daNpc_ykW_cFv */
 void daNpc_ykW_c::action() {
     fopAc_ac_c* unkActor1 = NULL;
     unkActor1 = hitChk(&mCyl, -1);
@@ -937,7 +900,6 @@ void daNpc_ykW_c::action() {
     }
 }
 
-/* 80B60AFC-80B60BC0 001CDC 00C4+00 1/0 0/0 0/0 .text            beforeMove__11daNpc_ykW_cFv */
 void daNpc_ykW_c::beforeMove() {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x8000000);
     if (checkHide()) {
@@ -948,7 +910,6 @@ void daNpc_ykW_c::beforeMove() {
     }
 }
 
-/* 80B60BC0-80B60F08 001DA0 0348+00 1/0 0/0 0/0 .text            afterMoved__11daNpc_ykW_cFv */
 void daNpc_ykW_c::afterMoved() {
     if (field_0x106a != 0 && field_0x106e == 0) {
         int polyAtt = dComIfG_Bgsp().GetPolyAtt0(mAcch.m_gnd);
@@ -991,7 +952,6 @@ void daNpc_ykW_c::afterMoved() {
     }
 }
 
-/* 80B60F08-80B614D0 0020E8 05C8+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_ykW_cFv */
 // NONMATCHING - HIO load issue, regalloc
 void daNpc_ykW_c::setAttnPos() {
     cXyz unkXyz1(0.0f, 50.0f, 0.0f);
@@ -1066,7 +1026,6 @@ void daNpc_ykW_c::setAttnPos() {
     cLib_addCalcAngleS2(&field_0xdd0, mFootRPolyAngle, 5, 0x1000);
 }
 
-/* 80B614D0-80B61708 0026B0 0238+00 1/0 0/0 0/0 .text            setCollision__11daNpc_ykW_cFv */
 void daNpc_ykW_c::setCollision() {
     cXyz unkXyz1;
     if (!mHide && field_0x1068 == 0) {
@@ -1122,7 +1081,6 @@ void daNpc_ykW_c::setCollision() {
     mCyl.ClrAtHit();
 }
 
-/* 80B61708-80B61710 0028E8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_ykW_cFv */
 int daNpc_ykW_c::drawDbgInfo() {
 #if DEBUG
     if (HIO_PARAM(this)->common.debug_info_ON != 0) {
@@ -1156,7 +1114,6 @@ int daNpc_ykW_c::drawDbgInfo() {
 #endif
 }
 
-/* 80B61710-80B61828 0028F0 0118+00 1/1 0/0 0/0 .text            selectAction__11daNpc_ykW_cFv */
 int daNpc_ykW_c::selectAction() {
     field_0xfd8 = NULL;
 
@@ -1194,14 +1151,10 @@ int daNpc_ykW_c::selectAction() {
     return 1;
 }
 
-/* 80B61828-80B61854 002A08 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_ykW_cFM11daNpc_ykW_cFPCvPvPv_i            */
 BOOL daNpc_ykW_c::chkAction(actionFunc i_func) {
     return field_0xfe4 == i_func;
 }
 
-/* 80B61854-80B618FC 002A34 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_ykW_cFM11daNpc_ykW_cFPCvPvPv_i            */
 BOOL daNpc_ykW_c::setAction(actionFunc i_func) {
     mMode = 3;
     if (field_0xfe4 != NULL) {
@@ -1217,7 +1170,6 @@ BOOL daNpc_ykW_c::setAction(actionFunc i_func) {
     return 1;
 }
 
-/* 80B618FC-80B61A0C 002ADC 0110+00 1/1 0/0 0/0 .text            getGoalPos__11daNpc_ykW_cFv */
 cXyz daNpc_ykW_c::getGoalPos() {
     fopAc_ac_c* actor_p = NULL;
     cXyz result;
@@ -1243,7 +1195,6 @@ cXyz daNpc_ykW_c::getGoalPos() {
     return result;
 }
 
-/* 80B61A0C-80B61AA4 002BEC 0098+00 2/2 0/0 0/0 .text orderGoIntoBossRoomEvt__11daNpc_ykW_cFv */
 int daNpc_ykW_c::orderGoIntoBossRoomEvt() {
     if (field_0xf80 == 2 &&
         getBitSW2() != 0xff &&
@@ -1256,8 +1207,6 @@ int daNpc_ykW_c::orderGoIntoBossRoomEvt() {
     return 0;
 }
 
-/* 80B61AA4-80B61C8C 002C84 01E8+00 2/2 0/0 0/0 .text putUtuwaHeart__11daNpc_ykW_cFP4cXyzffsP4cXyz
- */
 fopAc_ac_c* daNpc_ykW_c::putUtuwaHeart(cXyz* i_pos, f32 i_speedF, f32 i_speedY, s16 i_yPos,
                                     cXyz* i_scale) {
     fopAc_ac_c* heartContainer = NULL;
@@ -1299,7 +1248,6 @@ fopAc_ac_c* daNpc_ykW_c::putUtuwaHeart(cXyz* i_pos, f32 i_speedF, f32 i_speedY,
     return heartContainer;
 }
 
-/* 80B61C8C-80B61E74 002E6C 01E8+00 1/0 0/0 0/0 .text            cutShowDoor__11daNpc_ykW_cFi */
 BOOL daNpc_ykW_c::cutShowDoor(int param_0) {
     BOOL retval = FALSE;
     int* param_p = NULL;
@@ -1377,8 +1325,6 @@ BOOL daNpc_ykW_c::cutShowDoor(int param_0) {
     return retval;
 }
 
-/* 80B61E74-80B62AF8 003054 0C84+00 1/0 0/0 0/0 .text            cutGoIntoBossRoom__11daNpc_ykW_cFi
- */
 int daNpc_ykW_c::cutGoIntoBossRoom(int param_0) {
     char unkStrBuf1[100];
 
@@ -1608,8 +1554,6 @@ int daNpc_ykW_c::cutGoIntoBossRoom(int param_0) {
     return retval;
 }
 
-/* 80B62AF8-80B63894 003CD8 0D9C+00 2/0 0/0 0/0 .text            cutLv5DungeonClear__11daNpc_ykW_cFi
- */
 BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
     fopAc_ac_c* unkActor1 = NULL;
     camera_class* camera = NULL;
@@ -1984,7 +1928,6 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) {
     return retval;
 }
 
-/* 80B63894-80B63AA0 004A74 020C+00 1/0 0/0 0/0 .text            cutFindWolf__11daNpc_ykW_cFi */
 int daNpc_ykW_c::cutFindWolf(int param_0) {
     int retval = 0;
     int* param_p = NULL;
@@ -2037,7 +1980,6 @@ int daNpc_ykW_c::cutFindWolf(int param_0) {
     return retval;
 }
 
-/* 80B63AA0-80B63EE0 004C80 0440+00 1/0 0/0 0/0 .text cutStartSnowboardRace__11daNpc_ykW_cFi */
 int daNpc_ykW_c::cutStartSnowboardRace(int param_0) {
     fopAc_ac_c* actor_p = NULL;
 
@@ -2157,7 +2099,6 @@ int daNpc_ykW_c::cutStartSnowboardRace(int param_0) {
     return retval;
 }
 
-/* 80B63EE0-80B6450C 0050C0 062C+00 1/0 0/0 0/0 .text cutEndSnowboardRace__11daNpc_ykW_cFi */
 int daNpc_ykW_c::cutEndSnowboardRace(int param_0) {
     fopAc_ac_c* actor_p = NULL;
 
@@ -2330,7 +2271,6 @@ int daNpc_ykW_c::cutEndSnowboardRace(int param_0) {
     return retval;
 }
 
-/* 80B6450C-80B647E4 0056EC 02D8+00 1/0 0/0 0/0 .text            cutHug__11daNpc_ykW_cFi */
 int daNpc_ykW_c::cutHug(int param_0) {
     fopAc_ac_c* itemActor = NULL;
 
@@ -2406,8 +2346,6 @@ int daNpc_ykW_c::cutHug(int param_0) {
     return retval;
 }
 
-/* 80B647E4-80B6491C 0059C4 0138+00 1/1 0/0 0/0 .text            setDialogueMotion__11daNpc_ykW_cFv
- */
 void daNpc_ykW_c::setDialogueMotion() {
     static u32 const motionTbl1[2] = {31, 6};
     static u32 const motionTbl2[2] = {31, 5};
@@ -2435,7 +2373,6 @@ void daNpc_ykW_c::setDialogueMotion() {
     }
 }
 
-/* 80B6491C-80B649A8 005AFC 008C+00 1/1 0/0 0/0 .text            dialogue__11daNpc_ykW_cFv */
 int daNpc_ykW_c::dialogue() {
     if (field_0x1020 != 0) {
         if (mMotionSeqMngr.getNo() == 31 && mMotionSeqMngr.getStepNo() > 1 ||
@@ -2451,7 +2388,6 @@ int daNpc_ykW_c::dialogue() {
     return 0;
 }
 
-/* 80B649A8-80B65278 005B88 08D0+00 3/0 0/0 0/0 .text            wait__11daNpc_ykW_cFPv */
 int daNpc_ykW_c::wait(void* param_0) {
     fopAc_ac_c* actor_p = NULL;
 
@@ -2638,7 +2574,6 @@ int daNpc_ykW_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80B65278-80B654CC 006458 0254+00 6/0 0/0 0/0 .text            sitWait__11daNpc_ykW_cFPv */
 int daNpc_ykW_c::sitWait(void* param_0) {
     fopAc_ac_c* actor_p = NULL;
 
@@ -2692,7 +2627,6 @@ int daNpc_ykW_c::sitWait(void* param_0) {
     return 1;
 }
 
-/* 80B654CC-80B6591C 0066AC 0450+00 1/0 0/0 0/0 .text            walk__11daNpc_ykW_cFPv */
 int daNpc_ykW_c::walk(void* param_0) {
     f32 speed;
     int dstPos;
@@ -2789,7 +2723,6 @@ int daNpc_ykW_c::walk(void* param_0) {
     return 1;
 }
 
-/* 80B6591C-80B6640C 006AFC 0AF0+00 2/0 0/0 0/0 .text            race__11daNpc_ykW_cFPv */
 int daNpc_ykW_c::race(void* param_0) {
     int unkInt1;
     s16 targetAngleY;
@@ -2964,7 +2897,6 @@ int daNpc_ykW_c::race(void* param_0) {
     return 1;
 }
 
-/* 80B6640C-80B66774 0075EC 0368+00 3/0 0/0 0/0 .text            talk__11daNpc_ykW_cFPv */
 int daNpc_ykW_c::talk(void* param_0) {
     int itemNo;
 
@@ -3091,34 +3023,28 @@ int daNpc_ykW_c::test(void* param_0) {
 #endif
 
 
-/* 80B66774-80B66794 007954 0020+00 1/0 0/0 0/0 .text            daNpc_ykW_Create__FPv */
 static int daNpc_ykW_Create(void* i_this) {
     return ((daNpc_ykW_c*)i_this)->create();
 }
 
-/* 80B66794-80B667B4 007974 0020+00 1/0 0/0 0/0 .text            daNpc_ykW_Delete__FPv */
 static int daNpc_ykW_Delete(void* i_this) {
     return ((daNpc_ykW_c*)i_this)->Delete();
 }
 
-/* 80B667B4-80B667D4 007994 0020+00 1/0 0/0 0/0 .text            daNpc_ykW_Execute__FPv */
 static int daNpc_ykW_Execute(void* i_this) {
     return ((daNpc_ykW_c*)i_this)->Execute();
 }
 
-/* 80B667D4-80B667F4 0079B4 0020+00 1/0 0/0 0/0 .text            daNpc_ykW_Draw__FPv */
 static int daNpc_ykW_Draw(void* i_this) {
     return ((daNpc_ykW_c*)i_this)->Draw();
 }
 
-/* 80B667F4-80B667FC 0079D4 0008+00 1/0 0/0 0/0 .text            daNpc_ykW_IsDelete__FPv */
 static int daNpc_ykW_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES
 
-/* 80B68B98-80B68BB8 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_ykW_MethodTable */
 static actor_method_class daNpc_ykW_MethodTable = {
     (process_method_func)daNpc_ykW_Create,
     (process_method_func)daNpc_ykW_Delete,
@@ -3127,7 +3053,6 @@ static actor_method_class daNpc_ykW_MethodTable = {
     (process_method_func)daNpc_ykW_Draw,
 };
 
-/* 80B68BB8-80B68BE8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_YKW */
 extern actor_process_profile_definition g_profile_NPC_YKW = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp
index 0d91510ee9..cd1834497d 100644
--- a/src/d/actor/d_a_npc_zanb.cpp
+++ b/src/d/actor/d_a_npc_zanb.cpp
@@ -33,61 +33,49 @@ enum Motion {
     /* 0x1 */ MOT_SIT,
 };
 
-/* 80B6BDF0-80B6BDF8 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {9, ZANB},
 };
 
-/* 80B6BDF8-80B6BE08 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80B6BE08-80B6BE10 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "zanB",
 };
 
-/* 80B6BE10-80B6BE14 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1,
 };
 
-/* 80B6BE14-80B6BE1C -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0, l_loadResPtrn0,
 };
 
-/* 80B6BE1C-80B6BE38 00004C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[1] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, -1, J3DFrameCtrl::EMode_NONE, 0, 0},
 };
 
-/* 80B6BE38-80B6BE70 000068 0038+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[2] = {
     {BCK_ZANB_WAIT_A, J3DFrameCtrl::EMode_LOOP, ZANB, BTK_ZANB, J3DFrameCtrl::EMode_NONE, ZANB, 1, 0},
     {BCK_ZANB_SIT, J3DFrameCtrl::EMode_LOOP, ZANB, BTK_ZANB, J3DFrameCtrl::EMode_NONE, ZANB, 1, 0},
 };
 
-/* 80B6BE70-80B6BE80 0000A0 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B6BE80-80B6BEA0 0000B0 0020+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[8] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B6BEA0-80B6BEA4 -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_zanB_c */
 char* daNpc_zanB_c::mCutNameList[1] = {""};
 
-/* 80B6BEA4-80B6BEB0 0000D4 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_zanB_c */
 daNpc_zanB_c::cutFunc daNpc_zanB_c::mCutList[1] = {NULL};
 
-/* 80B68F2C-80B6904C 0000EC 0120+00 1/0 0/0 0/0 .text            __dt__12daNpc_zanB_cFv */
 daNpc_zanB_c::~daNpc_zanB_c() {
     OS_REPORT("|%06d:%x|daNpc_zanB_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -104,7 +92,6 @@ daNpc_zanB_c::~daNpc_zanB_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B6BCC4-80B6BD50 000000 008C+00 7/7 0/0 0/0 .rodata          m__18daNpc_zanB_Param_c */
 daNpc_zanB_HIOParam const daNpc_zanB_Param_c::m = {
     270.0f,
     -3.0f,
@@ -149,10 +136,8 @@ daNpc_zanB_HIOParam const daNpc_zanB_Param_c::m = {
     0.0f,
 };
 
-/* 80B6C0B4-80B6C0B8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static NPC_ZANB_HIO_CLASS l_HIO;
 
-/* 80B6904C-80B69330 00020C 02E4+00 1/1 0/0 0/0 .text            create__12daNpc_zanB_cFv */
 cPhs__Step daNpc_zanB_c::create() {
     daNpcT_ct(this, daNpc_zanB_c, l_faceMotionAnmData,
                        l_motionAnmData, l_faceMotionSequenceData, 4,
@@ -223,7 +208,6 @@ cPhs__Step daNpc_zanB_c::create() {
     return phase;
 }
 
-/* 80B69330-80B695A0 0004F0 0270+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_zanB_cFv */
 int daNpc_zanB_c::CreateHeap() {
     J3DModelData* mdlData_p = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]));
     if (mdlData_p == NULL) {
@@ -253,7 +237,6 @@ int daNpc_zanB_c::CreateHeap() {
     return 0;
 }
 
-/* 80B6975C-80B69790 00091C 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_zanB_cFv */
 int daNpc_zanB_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_zanB_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID id = fopAcM_GetID(this);
@@ -261,12 +244,10 @@ int daNpc_zanB_c::Delete() {
     return 1;
 }
 
-/* 80B69790-80B697B0 000950 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_zanB_cFv */
 int daNpc_zanB_c::Execute() {
     return execute();
 }
 
-/* 80B697B0-80B69844 000970 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_zanB_cFv */
 int daNpc_zanB_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
@@ -280,12 +261,10 @@ int daNpc_zanB_c::Draw() {
     #endif
 }
 
-/* 80B69844-80B69864 000A04 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daNpc_zanB_cFP10fopAc_ac_c */
 int daNpc_zanB_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_zanB_c*>(i_this)->CreateHeap();
 }
 
-/* 80B69864-80B698BC 000A24 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__12daNpc_zanB_cFP8J3DJointi */
 int daNpc_zanB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -298,7 +277,6 @@ int daNpc_zanB_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B698BC-80B698DC 000A7C 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_zanB_cFv */
 u8 daNpc_zanB_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -309,12 +287,10 @@ u8 daNpc_zanB_c::getType() {
     }
 }
 
-/* 80B698DC-80B698E4 000A9C 0008+00 1/1 0/0 0/0 .text            isDelete__12daNpc_zanB_cFv */
 BOOL daNpc_zanB_c::isDelete() {
     return FALSE;
 }
 
-/* 80B698E4-80B69A3C 000AA4 0158+00 1/1 0/0 0/0 .text            reset__12daNpc_zanB_cFv */
 void daNpc_zanB_c::reset() {
     csXyz angle;
     int size = (u8*)&field_0xf9c - (u8*)&mNextAction;
@@ -332,7 +308,6 @@ void daNpc_zanB_c::reset() {
     setAngle(angle);
 }
 
-/* 80B69A3C-80B69AC8 000BFC 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_zanB_cFi */
 void daNpc_zanB_c::afterJntAnm(int i_joint) {
     if (i_joint == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -343,7 +318,6 @@ void daNpc_zanB_c::afterJntAnm(int i_joint) {
     }
 }
 
-/* 80B69AC8-80B69B7C 000C88 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__12daNpc_zanB_cFv */
 BOOL daNpc_zanB_c::checkChangeEvt() {
     if (!chkAction(&daNpc_zanB_c::talk)) {
         mPreItemNo = 0;
@@ -361,7 +335,6 @@ BOOL daNpc_zanB_c::checkChangeEvt() {
     return FALSE;
 }
 
-/* 80B69B7C-80B69CA8 000D3C 012C+00 1/0 0/0 0/0 .text            setParam__12daNpc_zanB_cFv */
 void daNpc_zanB_c::setParam() {
     selectAction();
     srchActors();
@@ -395,18 +368,15 @@ void daNpc_zanB_c::setParam() {
     }
 }
 
-/* 80B69CA8-80B69D08 000E68 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_zanB_cFv */
 void daNpc_zanB_c::setAfterTalkMotion() {
     int face_motion = mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(FACE_MOT_NONE, -1.0f, FALSE, 0);
 }
 
-/* 80B69D08-80B69D0C 000EC8 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_zanB_cFv */
 void daNpc_zanB_c::srchActors() {
     /* empty function */
 }
 
-/* 80B69D0C-80B69DAC 000ECC 00A0+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_zanB_cFv */
 BOOL daNpc_zanB_c::evtTalk() {
     if (chkAction(&daNpc_zanB_c::talk)) {
         (this->*mAction)(NULL);
@@ -417,7 +387,6 @@ BOOL daNpc_zanB_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B69DAC-80B69E74 000F6C 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_zanB_cFv */
 BOOL daNpc_zanB_c::evtCutProc() {
     s32 staff_id = dComIfGp_getEventManager().getMyStaffId("zanB", this, -1);
     if (staff_id != -1) {
@@ -434,7 +403,6 @@ BOOL daNpc_zanB_c::evtCutProc() {
     return FALSE;
 }
 
-/* 80B69E74-80B69F60 001034 00EC+00 1/0 0/0 0/0 .text            action__12daNpc_zanB_cFv */
 void daNpc_zanB_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -450,14 +418,12 @@ void daNpc_zanB_c::action() {
     }
 }
 
-/* 80B69F60-80B69FD8 001120 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_zanB_cFv */
 void daNpc_zanB_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B69FD8-80B6A268 001198 0290+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_zanB_cFv */
 void daNpc_zanB_c::setAttnPos() {
     cXyz pos(20.0f, 30.0f, 0.0f);
 
@@ -492,7 +458,6 @@ void daNpc_zanB_c::setAttnPos() {
     attention_info.position = pos + current.pos;
 }
 
-/* 80B6A268-80B6A408 001428 01A0+00 1/0 0/0 0/0 .text            setCollision__12daNpc_zanB_cFv */
 void daNpc_zanB_c::setCollision() {
     cXyz center;
 
@@ -540,12 +505,10 @@ void daNpc_zanB_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B6A408-80B6A410 0015C8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_zanB_cFv */
 int daNpc_zanB_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B6A410-80B6A47C 0015D0 006C+00 1/0 0/0 0/0 .text            drawGhost__12daNpc_zanB_cFv */
 void daNpc_zanB_c::drawGhost() {
     J3DModel* mdl_p = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -553,7 +516,6 @@ void daNpc_zanB_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B6A47C-80B6A4C4 00163C 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_zanB_cFv */
 BOOL daNpc_zanB_c::selectAction() {
     mNextAction = NULL;
 
@@ -570,12 +532,10 @@ BOOL daNpc_zanB_c::selectAction() {
     return TRUE;
 }
 
-/* 80B6A4C4-80B6A4F0 001684 002C+00 2/2 0/0 0/0 .text            chkAction__12daNpc_zanB_cFM12daNpc_zanB_cFPCvPvPv_i */
 BOOL daNpc_zanB_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B6A4F0-80B6A598 0016B0 00A8+00 2/2 0/0 0/0 .text            setAction__12daNpc_zanB_cFM12daNpc_zanB_cFPCvPvPv_i */
 BOOL daNpc_zanB_c::setAction(actionFunc action) {
     mMode = 3;
 
@@ -593,7 +553,6 @@ BOOL daNpc_zanB_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80B6A598-80B6A874 001758 02DC+00 1/0 0/0 0/0 .text            wait__12daNpc_zanB_cFPv */
 int daNpc_zanB_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -657,7 +616,6 @@ int daNpc_zanB_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B6A874-80B6AA60 001A34 01EC+00 3/0 0/0 0/0 .text            talk__12daNpc_zanB_cFPv */
 int daNpc_zanB_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -722,32 +680,26 @@ int daNpc_zanB_c::test(void* param_1) {
     return 0;
 }
 
-/* 80B6AA60-80B6AA80 001C20 0020+00 1/0 0/0 0/0 .text            daNpc_zanB_Create__FPv */
 static int daNpc_zanB_Create(void* i_this) {
     return static_cast<daNpc_zanB_c*>(i_this)->create();
 }
 
-/* 80B6AA80-80B6AAA0 001C40 0020+00 1/0 0/0 0/0 .text            daNpc_zanB_Delete__FPv */
 static int daNpc_zanB_Delete(void* i_this) {
     return static_cast<daNpc_zanB_c*>(i_this)->Delete();
 }
 
-/* 80B6AAA0-80B6AAC0 001C60 0020+00 1/0 0/0 0/0 .text            daNpc_zanB_Execute__FPv */
 static int daNpc_zanB_Execute(void* i_this) {
     return static_cast<daNpc_zanB_c*>(i_this)->Execute();
 }
 
-/* 80B6AAC0-80B6AAE0 001C80 0020+00 1/0 0/0 0/0 .text            daNpc_zanB_Draw__FPv */
 static int daNpc_zanB_Draw(void* i_this) {
     return static_cast<daNpc_zanB_c*>(i_this)->Draw();
 }
 
-/* 80B6AAE0-80B6AAE8 001CA0 0008+00 1/0 0/0 0/0 .text            daNpc_zanB_IsDelete__FPv */
 static int daNpc_zanB_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B6BEE0-80B6BF00 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_zanB_MethodTable */
 static actor_method_class daNpc_zanB_MethodTable = {
     (process_method_func)daNpc_zanB_Create,
     (process_method_func)daNpc_zanB_Delete,
@@ -756,7 +708,6 @@ static actor_method_class daNpc_zanB_MethodTable = {
     (process_method_func)daNpc_zanB_Draw,
 };
 
-/* 80B6BF00-80B6BF30 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZANB */
 extern actor_process_profile_definition g_profile_NPC_ZANB = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp
index 31f612c458..bab7bd7d70 100644
--- a/src/d/actor/d_a_npc_zant.cpp
+++ b/src/d/actor/d_a_npc_zant.cpp
@@ -10,67 +10,54 @@
 #include "f_op/f_op_actor_mng.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80B6EAB4-80B6EABC 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2] = {
     7, 1
 };
 
-/* 80B6EABC-80B6EACC -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0}
 };
 
-/* 80B6EACC-80B6EAD4 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Zant",
 };
 
-/* 80B6EAD4-80B6EAD8 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 80B6EAD8-80B6EAE0 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0, l_loadResPtrn0,
 };
 
-/* 80B6EAE0-80B6EAFC 00004C 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {
     -1, 0, 0, -1, 0, 0, 0
 };
 
-/* 80B6EAFC-80B6EB18 000068 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData = {
     4, 2, 1, -1, 0, 0, 0
 };
 
-/* 80B6EB18-80B6EB28 000084 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, 
     {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80B6EB28-80B6EB38 000094 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, 
     {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80B6EB38-80B6EB3C -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_Zant_c */
 char* daNpc_Zant_c::mCutNameList = "";
 
-/* 80B6EB3C-80B6EB48 0000A8 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_Zant_c */
 daNpc_Zant_c::cutFunc daNpc_Zant_c::mCutList[1] = {
     NULL
 };
 
-/* 80B6ED34-80B6ED38 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_Zant_Param_c l_HIO;
 
-/* 80B6C1AC-80B6C2D0 0000EC 0124+00 1/0 0/0 0/0 .text            __dt__12daNpc_Zant_cFv */
 daNpc_Zant_c::~daNpc_Zant_c() {
     OS_REPORT("|%06d:%x|daNpc_Zant_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (heap != NULL) {
@@ -80,8 +67,6 @@ daNpc_Zant_c::~daNpc_Zant_c() {
     deleteRes(l_loadResPtrnList[mType], (const char **)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80B6E9A8-80B6EA34 000000 008C+00 6/6 0/0 0/0 .rodata          m__18daNpc_Zant_Param_c */
 daNpc_Zant_Param_c::Data const daNpc_Zant_Param_c::m  = {
     270.0f, -3.0f, 1.0f, 500.0f, 255.0f, 250.0f, 35.0f, 50.0f,
     0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
@@ -89,7 +74,6 @@ daNpc_Zant_Param_c::Data const daNpc_Zant_Param_c::m  = {
     0, 0, 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
 };
 
-/* 80B6C2D0-80B6C574 000210 02A4+00 1/1 0/0 0/0 .text            create__12daNpc_Zant_cFv */
 int daNpc_Zant_c::create() {
     int rv;
 
@@ -137,7 +121,6 @@ int daNpc_Zant_c::create() {
     return rv;
 }
 
-/* 80B6C574-80B6C700 0004B4 018C+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_Zant_cFv */
 int daNpc_Zant_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[1]], l_bmdData[0]);
 
@@ -165,7 +148,6 @@ int daNpc_Zant_c::CreateHeap() {
     return 0;
 }
 
-/* 80B6C700-80B6C734 000640 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_Zant_cFv */
 int daNpc_Zant_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Zant_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -173,12 +155,10 @@ int daNpc_Zant_c::Delete() {
     return 1;
 }
 
-/* 80B6C734-80B6C754 000674 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_Zant_cFv */
 int daNpc_Zant_c::Execute() {
     return execute();
 }
 
-/* 80B6C754-80B6C7E8 000694 0094+00 1/1 0/0 0/0 .text            Draw__12daNpc_Zant_cFv */
 int daNpc_Zant_c::Draw() {
     if (mpMatAnm[0] != NULL) {
         J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
@@ -187,12 +167,10 @@ int daNpc_Zant_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, 1, 0, 0);
 }
 
-/* 80B6C7E8-80B6C808 000728 0020+00 1/1 0/0 0/0 .text createHeapCallBack__12daNpc_Zant_cFP10fopAc_ac_c */
 int daNpc_Zant_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_Zant_c*>(i_this)->CreateHeap();
 }
 
-/* 80B6C808-80B6C860 000748 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__12daNpc_Zant_cFP8J3DJointi */
 int daNpc_Zant_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -204,7 +182,6 @@ int daNpc_Zant_c::ctrlJointCallBack(J3DJoint* param_1, int param_2) {
     return 1;
 }
 
-/* 80B6C860-80B6C880 0007A0 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_Zant_cFv */
 u8 daNpc_Zant_c::getType() {
     switch (fopAcM_GetParam(this) & 0xff) {
         case 0:
@@ -214,7 +191,6 @@ u8 daNpc_Zant_c::getType() {
     }
 }
 
-/* 80B6C880-80B6C89C 0007C0 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_Zant_cFv */
 u32 daNpc_Zant_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -223,7 +199,6 @@ u32 daNpc_Zant_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80B6C89C-80B6C8CC 0007DC 0030+00 1/1 0/0 0/0 .text            isDelete__12daNpc_Zant_cFv */
 int daNpc_Zant_c::isDelete() {
     if (mType == TYPE_1) {
         return FALSE;
@@ -237,7 +212,6 @@ int daNpc_Zant_c::isDelete() {
     }
 }
 
-/* 80B6C8CC-80B6C9F0 00080C 0124+00 1/1 0/0 0/0 .text            reset__12daNpc_Zant_cFv */
 void daNpc_Zant_c::reset() {
     initialize();
 
@@ -251,12 +225,10 @@ void daNpc_Zant_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80B6C9F0-80B6C9F4 000930 0004+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_Zant_cFi */
 void daNpc_Zant_c::afterJntAnm(int param_0) {
     /* empty function */
 }
 
-/* 80B6C9F4-80B6CAF0 000934 00FC+00 1/0 0/0 0/0 .text            setParam__12daNpc_Zant_cFv */
 void daNpc_Zant_c::setParam() {
     selectAction();
     srchActors();
@@ -286,18 +258,15 @@ void daNpc_Zant_c::setParam() {
     mMorfFrames = daNpc_Zant_Param_c::m.field_0x44;
 }
 
-/* 80B6CAF0-80B6CB50 000A30 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_Zant_cFv */
 void daNpc_Zant_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(0, -1.0, 0, 0);
 }
 
-/* 80B6CB50-80B6CB54 000A90 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_Zant_cFv */
 void daNpc_Zant_c::srchActors() {
     /* empty function */
 }
 
-/* 80B6CB54-80B6CC54 000A94 0100+00 1/0 0/0 0/0 .text            evtTalk__12daNpc_Zant_cFv */
 BOOL daNpc_Zant_c::evtTalk() {
     if (chkAction(&daNpc_Zant_c::talk)) {
         (this->*field_0xf90)(NULL);
@@ -319,7 +288,6 @@ BOOL daNpc_Zant_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B6CC54-80B6CD1C 000B94 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_Zant_cFv */
 BOOL daNpc_Zant_c::evtCutProc() {
     int rv = 0;
     int staffId = dComIfGp_getEventManager().getMyStaffId("Zant", this, -1);
@@ -337,7 +305,6 @@ BOOL daNpc_Zant_c::evtCutProc() {
     return rv;
 }
 
-/* 80B6CD1C-80B6CE08 000C5C 00EC+00 1/0 0/0 0/0 .text            action__12daNpc_Zant_cFv */
 void daNpc_Zant_c::action() {
     if (mStagger.checkRebirth()) {
         mStagger.initialize();
@@ -353,14 +320,12 @@ void daNpc_Zant_c::action() {
     }
 }
 
-/* 80B6CE08-80B6CE80 000D48 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_Zant_cFv */
 void daNpc_Zant_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B6CE80-80B6D074 000DC0 01F4+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_Zant_cFv */
 void daNpc_Zant_c::setAttnPos() {
     cXyz cStack1(0.0f, 0.0f, 0.0f);
     mStagger.calc(0);
@@ -385,7 +350,6 @@ void daNpc_Zant_c::setAttnPos() {
     eyePos = attention_info.position;
 }
 
-/* 80B6D074-80B6D1A8 000FB4 0134+00 1/0 0/0 0/0 .text            setCollision__12daNpc_Zant_cFv */
 void daNpc_Zant_c::setCollision() {
     u32 tgType = 0xd8fbfdff;
     u32 tgSPrm = 0x1f;
@@ -425,12 +389,10 @@ void daNpc_Zant_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B6D1A8-80B6D1B0 0010E8 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_Zant_cFv */
 int daNpc_Zant_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B6D1B0-80B6D21C 0010F0 006C+00 1/0 0/0 0/0 .text            drawGhost__12daNpc_Zant_cFv */
 void daNpc_Zant_c::drawGhost() {
     J3DModel* model = mpMorf[0]->getModel();
     g_env_light.settingTevStruct(3, &current.pos, &tevStr);
@@ -438,19 +400,16 @@ void daNpc_Zant_c::drawGhost() {
     mpMorf[0]->entryDL();
 }
 
-/* 80B6D21C-80B6D264 00115C 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_Zant_cFv */
 int daNpc_Zant_c::selectAction() {
     field_0xf84 = NULL;
     field_0xf84 = &daNpc_Zant_c::wait;
     return 1;
 }
 
-/* 80B6D264-80B6D290 0011A4 002C+00 1/1 0/0 0/0 .text chkAction__12daNpc_Zant_cFM12daNpc_Zant_cFPCvPvPv_i */
 int daNpc_Zant_c::chkAction(int (daNpc_Zant_c::*action)(void*)) {
     return field_0xf90 == action;
 }
 
-/* 80B6D290-80B6D338 0011D0 00A8+00 2/2 0/0 0/0 .text setAction__12daNpc_Zant_cFM12daNpc_Zant_cFPCvPvPv_i */
 int daNpc_Zant_c::setAction(int (daNpc_Zant_c::*action)(void*)) {
     mMode = 3;
     if (field_0xf90) {
@@ -466,7 +425,6 @@ int daNpc_Zant_c::setAction(int (daNpc_Zant_c::*action)(void*)) {
     return 1;
 }
 
-/* 80B6D338-80B6D584 001278 024C+00 1/0 0/0 0/0 .text            wait__12daNpc_Zant_cFPv */
 int daNpc_Zant_c::wait(void* param_1) {
     int rv;
     switch (mMode) {
@@ -511,7 +469,6 @@ int daNpc_Zant_c::wait(void* param_1) {
     }
 }
 
-/* 80B6D584-80B6D77C 0014C4 01F8+00 2/0 0/0 0/0 .text            talk__12daNpc_Zant_cFPv */
 int daNpc_Zant_c::talk(void* param_1) {
     switch (mMode) {
         case 0:
@@ -547,32 +504,26 @@ int daNpc_Zant_c::talk(void* param_1) {
     }
 }
 
-/* 80B6D77C-80B6D79C 0016BC 0020+00 1/0 0/0 0/0 .text            daNpc_Zant_Create__FPv */
 static int daNpc_Zant_Create(void* i_this) {
     return static_cast<daNpc_Zant_c*>(i_this)->create();
 }
 
-/* 80B6D79C-80B6D7BC 0016DC 0020+00 1/0 0/0 0/0 .text            daNpc_Zant_Delete__FPv */
 static int daNpc_Zant_Delete(void* i_this) {
     return static_cast<daNpc_Zant_c*>(i_this)->Delete();
 }
 
-/* 80B6D7BC-80B6D7DC 0016FC 0020+00 1/0 0/0 0/0 .text            daNpc_Zant_Execute__FPv */
 static int daNpc_Zant_Execute(void* i_this) {
     return static_cast<daNpc_Zant_c*>(i_this)->Execute();
 }
 
-/* 80B6D7DC-80B6D7FC 00171C 0020+00 1/0 0/0 0/0 .text            daNpc_Zant_Draw__FPv */
 static int daNpc_Zant_Draw(void* i_this) {
     return static_cast<daNpc_Zant_c*>(i_this)->Draw();
 }
 
-/* 80B6D7FC-80B6D804 00173C 0008+00 1/0 0/0 0/0 .text            daNpc_Zant_IsDelete__FPv */
 static int daNpc_Zant_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80B6EB6C-80B6EB8C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Zant_MethodTable */
 static actor_method_class daNpc_Zant_MethodTable = {
     (process_method_func)daNpc_Zant_Create,
     (process_method_func)daNpc_Zant_Delete,
@@ -581,7 +532,6 @@ static actor_method_class daNpc_Zant_MethodTable = {
     (process_method_func)daNpc_Zant_Draw,
 };
 
-/* 80B6EB8C-80B6EBBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZANT */
 extern actor_process_profile_definition g_profile_NPC_ZANT = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp
index f31ab98b57..f409f4774a 100644
--- a/src/d/actor/d_a_npc_zelR.cpp
+++ b/src/d/actor/d_a_npc_zelR.cpp
@@ -12,46 +12,38 @@ enum RES_Name {
     /* 0x1 */ ZELRF,
 };
 
-/* 80B71BF8-80B71C00 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static daNpc_GetParam1 l_bmdData[1] = {
     {10, 1}
 };
 
-/* 80B71C00-80B71C10 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0}
 };
 
-/* 80B71C10-80B71C18 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "zelRf"
 };
 
-/* 80B71C18-80B71C1C 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, 0xFF
 };
 
-/* 80B71C1C-80B71C24 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B71C24-80B71C5C 00004C 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, 0, 0, 16, 2, 1, 1},
     {6, 0, 1, 16, 2, 1, 1}
 };
 
-/* 80B71C5C-80B71C78 000084 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData = {
     7, 2, 1, 13, 0, 1, 1, 0
 };
 
-/* 80B71C78-80B71C98 0000A0 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 1}, {-1, 0, 0}, 
     {-1, 0, 0}, {-1, 0, 0}, 
@@ -59,16 +51,13 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] =
     {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80B71C98-80B71CA8 0000C0 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, 
     {-1, 0, 0}, {-1, 0, 0}
 };
 
-/* 80B71CA8-80B71CAC -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__12daNpc_ZelR_c */
 char* daNpc_ZelR_c::mCutNameList = "";
 
-/* 80B71CAC-80B71CB8 0000D4 000C+00 2/2 0/0 0/0 .data            mCutList__12daNpc_ZelR_c */
 daNpc_ZelR_c::EventFn daNpc_ZelR_c::mCutList[1] = {
     NULL
 };
@@ -81,10 +70,8 @@ daNpc_ZelR_c::~daNpc_ZelR_c() {
     deleteRes(l_loadResPtrnList[mType], (char const**)l_resNameList);
 }
 
-/* 80B71EBC-80B71EC0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_ZelR_Param_c l_HIO;
 
-/* 80B71AE0-80B71B6C 000000 008C+00 6/6 0/0 0/0 .rodata          m__18daNpc_ZelR_Param_c */
 daNpc_ZelR_HIOParam const daNpc_ZelR_Param_c::m = {
     190.0f,
     -3.0f,
@@ -129,7 +116,6 @@ daNpc_ZelR_HIOParam const daNpc_ZelR_Param_c::m = {
     0.0f,
 };
 
-/* 80B6EF64-80B6F1F8 000224 0294+00 1/1 0/0 0/0 .text            create__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::create() {
     daNpcT_ct(this, daNpc_ZelR_c, l_faceMotionAnmData,
         &l_motionAnmData, l_faceMotionSequenceData, 4,
@@ -181,7 +167,6 @@ int daNpc_ZelR_c::create() {
     return phaseState;
 }
 
-/* 80B6F1F8-80B6F4A8 0004B8 02B0+00 1/1 0/0 0/0 .text            CreateHeap__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::CreateHeap() {
     int bmdIdx = mTwilight == true ? NONE : NONE;
     J3DModelData* mdlData_p = (J3DModelData*)(dComIfG_getObjectRes(
@@ -222,19 +207,16 @@ int daNpc_ZelR_c::CreateHeap() {
     return 0;
 }
 
-/* 80B6F664-80B6F698 000924 0034+00 1/1 0/0 0/0 .text            Delete__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::Delete() {
     fopAcM_GetID(this);
     this->~daNpc_ZelR_c();
     return 1;
 }
 
-/* 80B6F698-80B6F6B8 000958 0020+00 2/2 0/0 0/0 .text            Execute__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::Execute() {
     return execute();
 }
 
-/* 80B6F6B8-80B6F77C 000978 00C4+00 1/1 0/0 0/0 .text            Draw__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::Draw() {
     J3DModel* model = mpMorf[0]->getModel();
     J3DModelData* modelData = model->getModelData();
@@ -250,14 +232,12 @@ int daNpc_ZelR_c::Draw() {
     return daNpcT_c::draw(0, 1, mRealShadowSize, NULL, 100.0f, 0, 0, 0);
 }
 
-/* 80B6F77C-80B6F79C 000A3C 0020+00 1/1 0/0 0/0 .text       createHeapCallBack__12daNpc_ZelR_cFP10fopAc_ac_c */
 int daNpc_ZelR_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daNpc_ZelR_c* i_this = (daNpc_ZelR_c*)a_this;
     return i_this->CreateHeap();
 
 }
 
-/* 80B6F79C-80B6F7F4 000A5C 0058+00 1/1 0/0 0/0 .text       ctrlJointCallBack__12daNpc_ZelR_cFP8J3DJointi */
 int daNpc_ZelR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (!param_2) {
         daNpc_ZelR_c* i_this = (daNpc_ZelR_c*)j3dSys.getModel()->getUserArea();
@@ -269,7 +249,6 @@ int daNpc_ZelR_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B6F7F4-80B6F814 000AB4 0020+00 1/1 0/0 0/0 .text            getType__12daNpc_ZelR_cFv */
 u8 daNpc_ZelR_c::getType() {
     switch (fopAcM_GetParam(this) & 0xff) {
         case 0:
@@ -279,7 +258,6 @@ u8 daNpc_ZelR_c::getType() {
     }
 }
 
-/* 80B6F814-80B6F830 000AD4 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__12daNpc_ZelR_cFv */
 u32 daNpc_ZelR_c::getFlowNodeNo() {
     u16 nodeNo = home.angle.x;
     if (nodeNo == 0xffff) {
@@ -288,12 +266,10 @@ u32 daNpc_ZelR_c::getFlowNodeNo() {
     return nodeNo;
 }
 
-/* 80B6F830-80B6F83C 000AF0 000C+00 1/1 0/0 0/0 .text            getPath__12daNpc_ZelR_cFv */
 u8 daNpc_ZelR_c::getPath() {
     return (fopAcM_GetParam(this) & 0xff00) >> 8;
 }
 
-/* 80B6F83C-80B6F894 000AFC 0058+00 1/1 0/0 0/0 .text            isDelete__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::isDelete() {
     if (mType == TYPE_1) {
         return 0;
@@ -307,7 +283,6 @@ int daNpc_ZelR_c::isDelete() {
     }
 }
 
-/* 80B6F894-80B6FA10 000B54 017C+00 1/1 0/0 0/0 .text            reset__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::reset() {
     initialize();
     memset(&field_0xf84, 0, ((u8*)&field_0xfc4 - (u8*)&field_0xf84));
@@ -325,7 +300,6 @@ void daNpc_ZelR_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80B6FA10-80B6FA9C 000CD0 008C+00 1/0 0/0 0/0 .text            afterJntAnm__12daNpc_ZelR_cFi */
 void daNpc_ZelR_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -336,7 +310,6 @@ void daNpc_ZelR_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B6FA9C-80B6FBA8 000D5C 010C+00 1/0 0/0 0/0 .text            ctrlBtk__12daNpc_ZelR_cFv */
 BOOL daNpc_ZelR_c::ctrlBtk() {
     if (mpMatAnm[0] && mpMatAnm[1]) {
         if (field_0xe29 && mBtkAnm.getBtkAnm()) {
@@ -365,7 +338,6 @@ BOOL daNpc_ZelR_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B6FBA8-80B6FC9C 000E68 00F4+00 1/0 0/0 0/0 .text            setParam__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::setParam() {
     selectAction();
     srchActors();
@@ -389,17 +361,14 @@ void daNpc_ZelR_c::setParam() {
     mMorfFrames = l_HIO.m.common.morf_frame;
 }
 
-/* 80B6FC9C-80B6FCFC 000F5C 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
 }
 
-/* 80B6FCFC-80B6FD00 000FBC 0004+00 1/1 0/0 0/0 .text            srchActors__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::srchActors() {
     /* empty function */
 }
 
-/* 80B6FD00-80B6FE00 000FC0 0100+00 1/0 0/0 0/0 .text            __12daNpc_ZelR_cFv */
 BOOL daNpc_ZelR_c::evtTalk() {
     if (chkAction(&daNpc_ZelR_c::talk)) {
         (this->*field_0xf90)(NULL);
@@ -421,7 +390,6 @@ BOOL daNpc_ZelR_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B6FE00-80B6FEC8 0010C0 00C8+00 1/0 0/0 0/0 .text            evtCutProc__12daNpc_ZelR_cFv */
 BOOL daNpc_ZelR_c::evtCutProc() {
     BOOL rv = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("ZelR", this, -1);
@@ -437,7 +405,6 @@ BOOL daNpc_ZelR_c::evtCutProc() {
     return rv;
 }
 
-/* 80B6FEC8-80B70018 001188 0150+00 1/0 0/0 0/0 .text            action__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::action() {
     fopAc_ac_c* hitActor = hitChk(&mCyl, 0xffffffff);
     if (hitActor) {
@@ -461,14 +428,12 @@ void daNpc_ZelR_c::action() {
     }
 }
 
-/* 80B70018-80B70090 0012D8 0078+00 1/0 0/0 0/0 .text            beforeMove__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B70090-80B702B0 001350 0220+00 1/0 0/0 0/0 .text            setAttnPos__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::setAttnPos() {
     cXyz sp38(10.0f, -30.0f, 0.0f);
 
@@ -493,7 +458,6 @@ void daNpc_ZelR_c::setAttnPos() {
     attention_info.position.y += l_HIO.m.common.attention_offset;
 }
 
-/* 80B702B0-80B703E0 001570 0130+00 1/0 0/0 0/0 .text            setCollision__12daNpc_ZelR_cFv */
 void daNpc_ZelR_c::setCollision() {
     if (!mHide) {
         if (mTwilight == 1 && !dComIfGp_event_runCheck()) {
@@ -524,24 +488,20 @@ void daNpc_ZelR_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B703E0-80B703E8 0016A0 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B703E8-80B70430 0016A8 0048+00 1/1 0/0 0/0 .text            selectAction__12daNpc_ZelR_cFv */
 int daNpc_ZelR_c::selectAction() {
     field_0xf84 = NULL;
     field_0xf84 = &daNpc_ZelR_c::wait;
     return 1;
 }
 
-/* 80B70430-80B7045C 0016F0 002C+00 1/1 0/0 0/0 .text       chkAction__12daNpc_ZelR_cFM12daNpc_ZelR_cFPCvPvPv_i */
 int daNpc_ZelR_c::chkAction(int (daNpc_ZelR_c::*param_1)(void*)) {
     return field_0xf90 == param_1;
 }
 
-/* 80B7045C-80B70504 00171C 00A8+00 2/2 0/0 0/0 .text       setAction__12daNpc_ZelR_cFM12daNpc_ZelR_cFPCvPvPv_i */
 int daNpc_ZelR_c::setAction(int (daNpc_ZelR_c::*param_1)(void*)) {
     mMode = 3;
     if (field_0xf90) {
@@ -557,7 +517,6 @@ int daNpc_ZelR_c::setAction(int (daNpc_ZelR_c::*param_1)(void*)) {
     return 1;
 }
 
-/* 80B70504-80B706B0 0017C4 01AC+00 1/0 0/0 0/0 .text            wait__12daNpc_ZelR_cFPv */
 int daNpc_ZelR_c::wait(void* param_1) {
     switch (mMode) {
         case 0:
@@ -586,7 +545,6 @@ int daNpc_ZelR_c::wait(void* param_1) {
     }
 }
 
-/* 80B706B0-80B70814 001970 0164+00 2/0 0/0 0/0 .text            talk__12daNpc_ZelR_cFPv */
 BOOL daNpc_ZelR_c::talk(void* param_1) {
     BOOL bVar2 = FALSE;
     switch (mMode) {
@@ -617,32 +575,26 @@ BOOL daNpc_ZelR_c::talk(void* param_1) {
     }
 }
 
-/* 80B70814-80B70834 001AD4 0020+00 1/0 0/0 0/0 .text            daNpc_ZelR_Create__FPv */
 static int daNpc_ZelR_Create(void* a_this) {
     return static_cast<daNpc_ZelR_c*>(a_this)->create();
 }
 
-/* 80B70834-80B70854 001AF4 0020+00 1/0 0/0 0/0 .text            daNpc_ZelR_Delete__FPv */
 static int daNpc_ZelR_Delete(void* a_this) {
     return static_cast<daNpc_ZelR_c*>(a_this)->Delete();
 }
 
-/* 80B70854-80B70874 001B14 0020+00 1/0 0/0 0/0 .text            daNpc_ZelR_Execute__FPv */
 static int daNpc_ZelR_Execute(void* a_this) {
     return static_cast<daNpc_ZelR_c*>(a_this)->Execute();
 }
 
-/* 80B70874-80B70894 001B34 0020+00 1/0 0/0 0/0 .text            daNpc_ZelR_Draw__FPv */
 static int daNpc_ZelR_Draw(void* a_this) {
     return static_cast<daNpc_ZelR_c*>(a_this)->Draw();
 }
 
-/* 80B70894-80B7089C 001B54 0008+00 1/0 0/0 0/0 .text            daNpc_ZelR_IsDelete__FPv */
 static int daNpc_ZelR_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80B71CDC-80B71CFC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_ZelR_MethodTable */
 static actor_method_class daNpc_ZelR_MethodTable = {
     (process_method_func)daNpc_ZelR_Create,
     (process_method_func)daNpc_ZelR_Delete,
@@ -651,7 +603,6 @@ static actor_method_class daNpc_ZelR_MethodTable = {
     (process_method_func)daNpc_ZelR_Draw,
 };
 
-/* 80B71CFC-80B71D2C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZELR */
 extern actor_process_profile_definition g_profile_NPC_ZELR = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp
index d7b22ed6ce..670958223c 100644
--- a/src/d/actor/d_a_npc_zelRo.cpp
+++ b/src/d/actor/d_a_npc_zelRo.cpp
@@ -41,65 +41,53 @@ enum Type {
     /* 0x1 */ TYPE_1,
 };
 
-/* 80B74D78-80B74D80 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {BMDR_ZELRO, ZELRO},
 };
 
-/* 80B74D80-80B74D90 -00001 0010+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[2] = {
     {"", 0},
     {"NO_RESPONSE", 0},
 };
 
-/* 80B74D90-80B74D98 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "zelRo",
 };
 
-/* 80B74D98-80B74D9C 000040 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1
 };
 
-/* 80B74D9C-80B74DA4 -00001 0008+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[2] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80B74DA4-80B74DDC 00004C 0038+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData[2] = {
     {-1, J3DFrameCtrl::EMode_NONE, NONE, 16, J3DFrameCtrl::EMode_LOOP, ZELRO, 1},
     {BCK_ZELRO_F_TALK_A, J3DFrameCtrl::EMode_NONE, ZELRO, 16, J3DFrameCtrl::EMode_LOOP, ZELRO, 1},
 };
 
-/* 80B74DDC-80B74DF8 000084 001C+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[1] = {
     {BCK_ZELRO_WAIT_A, J3DFrameCtrl::EMode_LOOP, ZELRO, BTK_ZELRO, J3DFrameCtrl::EMode_NONE, ZELRO, 1, 0},
 };
 
-/* 80B74DF8-80B74E18 0000A0 0020+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[8] = {
     {1, -1, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B74E18-80B74E28 0000C0 0010+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[4] = {
     {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0},
 };
 
-/* 80B74E28-80B74E2C -00001 0004+00 1/1 0/0 0/0 .data            mCutNameList__13daNpc_ZelRo_c */
 char* daNpc_ZelRo_c::mCutNameList = "";
 
-/* 80B74E2C-80B74E38 0000D4 000C+00 2/2 0/0 0/0 .data            mCutList__13daNpc_ZelRo_c */
 daNpc_ZelRo_c::cutFunc daNpc_ZelRo_c::mCutList[1] = {
     NULL
 };
 
-/* 80B71FAC-80B720E4 0000EC 0138+00 1/0 0/0 0/0 .text            __dt__13daNpc_ZelRo_cFv */
 daNpc_ZelRo_c::~daNpc_ZelRo_c() {
     if (heap != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -108,7 +96,6 @@ daNpc_ZelRo_c::~daNpc_ZelRo_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* 80B74C5C-80B74CE8 000000 008C+00 6/6 0/0 0/0 .rodata          m__19daNpc_ZelRo_Param_c */
 const daNpc_ZelRo_HIOParam daNpc_ZelRo_Param_c::m = {
     190.0f,
     -3.0f,
@@ -153,7 +140,6 @@ const daNpc_ZelRo_HIOParam daNpc_ZelRo_Param_c::m = {
     0.0f,
 };
 
-/* 80B720E4-80B72378 000224 0294+00 1/1 0/0 0/0 .text            create__13daNpc_ZelRo_cFv */
 cPhs__Step daNpc_ZelRo_c::create() {
     daNpcT_ct(this, daNpc_ZelRo_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, l_motionSequenceData, 4, l_evtList, l_resNameList);
 
@@ -208,7 +194,6 @@ cPhs__Step daNpc_ZelRo_c::create() {
     return phase;
 }
 
-/* 80B72378-80B72628 0004B8 02B0+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::CreateHeap() {
     int bmdIdx = mTwilight == true ? NONE : NONE;
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0]);
@@ -245,18 +230,15 @@ int daNpc_ZelRo_c::CreateHeap() {
     return 0;
 }
 
-/* 80B727E4-80B72818 000924 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::Delete() {
     this->~daNpc_ZelRo_c();
     return 1;
 }
 
-/* 80B72818-80B72838 000958 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::Execute() {
     return execute();
 }
 
-/* 80B72838-80B728FC 000978 00C4+00 1/1 0/0 0/0 .text            Draw__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::Draw() {
     J3DModelData* mdlData_p = mpMorf[0]->getModel()->getModelData();
     
@@ -278,12 +260,10 @@ int daNpc_ZelRo_c::Draw() {
     );
 }
 
-/* 80B728FC-80B7291C 000A3C 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__13daNpc_ZelRo_cFP10fopAc_ac_c */
 int daNpc_ZelRo_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return static_cast<daNpc_ZelRo_c*>(a_this)->CreateHeap();
 }
 
-/* 80B7291C-80B72974 000A5C 0058+00 1/1 0/0 0/0 .text            ctrlJointCallBack__13daNpc_ZelRo_cFP8J3DJointi */
 int daNpc_ZelRo_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -297,7 +277,6 @@ int daNpc_ZelRo_c::ctrlJointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80B72974-80B72994 000AB4 0020+00 1/1 0/0 0/0 .text            getType__13daNpc_ZelRo_cFv */
 u8 daNpc_ZelRo_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
         case 0:
@@ -308,7 +287,6 @@ u8 daNpc_ZelRo_c::getType() {
     }
 }
 
-/* 80B72994-80B729B0 000AD4 001C+00 1/1 0/0 0/0 .text            getFlowNodeNo__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::getFlowNodeNo() {
     u16 rv = home.angle.x;
 
@@ -319,12 +297,10 @@ int daNpc_ZelRo_c::getFlowNodeNo() {
     return rv;
 }
 
-/* 80B729B0-80B729BC 000AF0 000C+00 1/1 0/0 0/0 .text            getPath__13daNpc_ZelRo_cFv */
 u8 daNpc_ZelRo_c::getPath() {
     return (fopAcM_GetParam(this) & 0xFF00) >> 8;
 }
 
-/* 80B729BC-80B72A10 000AFC 0054+00 1/1 0/0 0/0 .text            isDelete__13daNpc_ZelRo_cFv */
 BOOL daNpc_ZelRo_c::isDelete() {
     if (mType == TYPE_1) {
         return FALSE;
@@ -340,7 +316,6 @@ BOOL daNpc_ZelRo_c::isDelete() {
     }
 }
 
-/* 80B72A10-80B72B8C 000B50 017C+00 1/1 0/0 0/0 .text            reset__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::reset() {
     initialize();
 
@@ -360,7 +335,6 @@ void daNpc_ZelRo_c::reset() {
     setAngle(home.angle.y);
 }
 
-/* 80B72B8C-80B72C18 000CCC 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_ZelRo_cFi */
 void daNpc_ZelRo_c::afterJntAnm(int param_1) {
     if (param_1 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -371,7 +345,6 @@ void daNpc_ZelRo_c::afterJntAnm(int param_1) {
     }
 }
 
-/* 80B72C18-80B72D24 000D58 010C+00 1/0 0/0 0/0 .text            ctrlBtk__13daNpc_ZelRo_cFv */
 BOOL daNpc_ZelRo_c::ctrlBtk() {
     if (mpMatAnm[0] != NULL && mpMatAnm[1] != NULL) {
         if (field_0xe29 != 0 && mBtkAnm.getBtkAnm() != NULL) {
@@ -397,7 +370,6 @@ BOOL daNpc_ZelRo_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B72D24-80B72E18 000E64 00F4+00 1/0 0/0 0/0 .text            setParam__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::setParam() {
     selectAction();
     srchActors();
@@ -423,18 +395,15 @@ void daNpc_ZelRo_c::setParam() {
     mMorfFrames = daNpc_ZelRo_Param_c::m.common.morf_frame;
 }
 
-/* 80B72E18-80B72E78 000F58 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(FACE_NONE, -1.0f, FALSE, 0);
 }
 
-/* 80B72E78-80B72E7C 000FB8 0004+00 1/1 0/0 0/0 .text            srchActors__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::srchActors() {
     /* empty function */
 }
 
-/* 80B72E7C-80B72F7C 000FBC 0100+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_ZelRo_cFv */
 BOOL daNpc_ZelRo_c::evtTalk() {
     if (chkAction(&daNpc_ZelRo_c::talk)) {
         (this->*mAction)(NULL);
@@ -458,7 +427,6 @@ BOOL daNpc_ZelRo_c::evtTalk() {
     return TRUE;
 }
 
-/* 80B72F7C-80B73044 0010BC 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_ZelRo_cFv */
 BOOL daNpc_ZelRo_c::evtCutProc() {
     BOOL rv = FALSE;
     int staffId = dComIfGp_getEventManager().getMyStaffId("ZelRo", this, -1);
@@ -476,7 +444,6 @@ BOOL daNpc_ZelRo_c::evtCutProc() {
     return rv;
 }
 
-/* 80B73044-80B73194 001184 0150+00 1/0 0/0 0/0 .text            action__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::action() {
     fopAc_ac_c* actor_p = hitChk(&mCyl, 0xFFFFFFFF);
 
@@ -501,14 +468,12 @@ void daNpc_ZelRo_c::action() {
     }
 }
 
-/* 80B73194-80B7320C 0012D4 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::beforeMove() {
     if (checkHide() || mNoDraw) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B7320C-80B7342C 00134C 0220+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::setAttnPos() {
     cXyz sp48(10.0f, -30.0f, 0.0f);
     
@@ -530,7 +495,6 @@ void daNpc_ZelRo_c::setAttnPos() {
     attention_info.position.y += daNpc_ZelRo_Param_c::m.common.attention_offset;
 }
 
-/* 80B7342C-80B7355C 00156C 0130+00 1/0 0/0 0/0 .text            setCollision__13daNpc_ZelRo_cFv */
 void daNpc_ZelRo_c::setCollision() {
     cXyz pos;
 
@@ -563,24 +527,20 @@ void daNpc_ZelRo_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B7355C-80B73564 00169C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_ZelRo_cFv */
 int daNpc_ZelRo_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B73564-80B735AC 0016A4 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_ZelRo_cFv */
 BOOL daNpc_ZelRo_c::selectAction() {
     mNextAction = NULL;
     mNextAction = &daNpc_ZelRo_c::wait;
     return TRUE;
 }
 
-/* 80B735AC-80B735D8 0016EC 002C+00 1/1 0/0 0/0 .text            chkAction__13daNpc_ZelRo_cFM13daNpc_ZelRo_cFPCvPvPv_i */
 BOOL daNpc_ZelRo_c::chkAction(actionFunc action) {
     return mAction == action;
 }
 
-/* 80B735D8-80B73680 001718 00A8+00 2/2 0/0 0/0 .text            setAction__13daNpc_ZelRo_cFM13daNpc_ZelRo_cFPCvPvPv_i */
 BOOL daNpc_ZelRo_c::setAction(actionFunc action) {
     mMode = MODE_EXIT;
 
@@ -598,7 +558,6 @@ BOOL daNpc_ZelRo_c::setAction(actionFunc action) {
     return TRUE;
 }
 
-/* 80B73680-80B7382C 0017C0 01AC+00 1/0 0/0 0/0 .text            wait__13daNpc_ZelRo_cFPv */
 int daNpc_ZelRo_c::wait(void* param_1) {
     switch (mMode) {
         case MODE_ENTER:
@@ -631,7 +590,6 @@ int daNpc_ZelRo_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80B7382C-80B73990 00196C 0164+00 2/0 0/0 0/0 .text            talk__13daNpc_ZelRo_cFPv */
 int daNpc_ZelRo_c::talk(void* param_1) {
     BOOL bVar1 = false;
 
@@ -674,35 +632,28 @@ int daNpc_ZelRo_c::test(void* param_1) {
 }
 #endif
 
-/* 80B73990-80B739B0 001AD0 0020+00 1/0 0/0 0/0 .text            daNpc_ZelRo_Create__FPv */
 static int daNpc_ZelRo_Create(void* a_this) {
     return static_cast<daNpc_ZelRo_c*>(a_this)->create();
 }
 
-/* 80B739B0-80B739D0 001AF0 0020+00 1/0 0/0 0/0 .text            daNpc_ZelRo_Delete__FPv */
 static int daNpc_ZelRo_Delete(void* a_this) {
     return static_cast<daNpc_ZelRo_c*>(a_this)->Delete();
 }
 
-/* 80B739D0-80B739F0 001B10 0020+00 1/0 0/0 0/0 .text            daNpc_ZelRo_Execute__FPv */
 static int daNpc_ZelRo_Execute(void* a_this) {
     return static_cast<daNpc_ZelRo_c*>(a_this)->Execute();
 }
 
-/* 80B739F0-80B73A10 001B30 0020+00 1/0 0/0 0/0 .text            daNpc_ZelRo_Draw__FPv */
 static int daNpc_ZelRo_Draw(void* a_this) {
     return static_cast<daNpc_ZelRo_c*>(a_this)->Draw();
 }
 
-/* 80B73A10-80B73A18 001B50 0008+00 1/0 0/0 0/0 .text            daNpc_ZelRo_IsDelete__FPv */
 static int daNpc_ZelRo_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80B7503C-80B75040 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_ZelRo_Param_c l_HIO;
 
-/* 80B74E5C-80B74E7C -00001 0020+00 1/0 0/0 0/0 .data            daNpc_ZelRo_MethodTable */
 static actor_method_class daNpc_ZelRo_MethodTable = {
     (process_method_func)daNpc_ZelRo_Create,
     (process_method_func)daNpc_ZelRo_Delete,
@@ -711,7 +662,6 @@ static actor_method_class daNpc_ZelRo_MethodTable = {
     (process_method_func)daNpc_ZelRo_Draw,
 };
 
-/* 80B74E7C-80B74EAC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZELRO */
 extern actor_process_profile_definition g_profile_NPC_ZELRO = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp
index 0423b853b1..a6c2dfad6a 100644
--- a/src/d/actor/d_a_npc_zelda.cpp
+++ b/src/d/actor/d_a_npc_zelda.cpp
@@ -101,7 +101,6 @@ void daNpc_Zelda_HIO_c::listenPropertyEvent(const JORPropertyEvent* event) {
 }
 #endif
 
-/* 80B7512C-80B7524C 0000EC 0120+00 1/0 0/0 0/0 .text            __dt__13daNpc_Zelda_cFv */
 daNpc_Zelda_c::~daNpc_Zelda_c() {
     OS_REPORT("|%06d:%x|daNpc_Zelda_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -118,8 +117,6 @@ daNpc_Zelda_c::~daNpc_Zelda_c() {
     deleteRes(l_loadResPtrnList[field_0xf80], (const char**)l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80B77FC8-80B78054 000000 008C+00 7/7 0/0 0/0 .rodata          m__19daNpc_Zelda_Param_c */
 const daNpc_Zelda_HIOParam daNpc_Zelda_Param_c::m = {{
     190.0f, // attention_offset
     -3.0f, // gravity
@@ -164,7 +161,6 @@ const daNpc_Zelda_HIOParam daNpc_Zelda_Param_c::m = {{
     0.0f, // box_offset
 }};
 
-/* 80B7524C-80B75530 00020C 02E4+00 1/1 0/0 0/0 .text            create__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::create() {
     static u32 const heapSize[2] = {
         0x8FE0,
@@ -254,7 +250,6 @@ static f32 dummy2() {
     return 0.2f;
 }
 
-/* 80B75530-80B757BC 0004F0 028C+00 1/1 0/0 0/0 .text            CreateHeap__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     J3DModel* model = NULL;
@@ -298,7 +293,6 @@ int daNpc_Zelda_c::CreateHeap() {
     }
 }
 
-/* 80B75978-80B759AC 000938 0034+00 1/1 0/0 0/0 .text            Delete__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::Delete() {
     OS_REPORT("|%06d:%x|daNpc_Zelda_c -> Delete\n", g_Counter.mCounter0, this);
     fpc_ProcID unusedId = fopAcM_GetID(this);
@@ -306,12 +300,10 @@ int daNpc_Zelda_c::Delete() {
     return 1;
 }
 
-/* 80B759AC-80B759CC 00096C 0020+00 2/2 0/0 0/0 .text            Execute__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::Execute() {
     return execute();
 }
 
-/* 80B759CC-80B75A90 00098C 00C4+00 1/1 0/0 0/0 .text            Draw__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::Draw() {
     J3DModelData* modelData = mpMorf[0]->getModel()->getModelData();
     if (mpMatAnm[0] != NULL) {
@@ -328,15 +320,11 @@ int daNpc_Zelda_c::Draw() {
 #endif
 }
 
-/* 80B75A90-80B75AB0 000A50 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daNpc_Zelda_cFP10fopAc_ac_c            */
 int daNpc_Zelda_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daNpc_Zelda_c* zelda = ((daNpc_Zelda_c*)i_this);
     return zelda->CreateHeap();
 }
 
-/* 80B75AB0-80B75B08 000A70 0058+00 1/1 0/0 0/0 .text
- * ctrlJointCallBack__13daNpc_Zelda_cFP8J3DJointi               */
 int daNpc_Zelda_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -348,7 +336,6 @@ int daNpc_Zelda_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B75B08-80B75B28 000AC8 0020+00 1/1 0/0 0/0 .text            getType__13daNpc_Zelda_cFv */
 u8 daNpc_Zelda_c::getType() {
     u8 param = fopAcM_GetParam(this);
     switch (param & 0xff) {
@@ -359,12 +346,10 @@ u8 daNpc_Zelda_c::getType() {
     }
 }
 
-/* 80B75B28-80B75B30 000AE8 0008+00 1/1 0/0 0/0 .text            isDelete__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::isDelete() {
     return 0;
 }
 
-/* 80B75B30-80B75C9C 000AF0 016C+00 1/1 0/0 0/0 .text            reset__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::reset() {
     csXyz acStack_20;
     u32 clearSize = (uintptr_t)&field_0xf9c - (uintptr_t)&mAction1;
@@ -389,7 +374,6 @@ void daNpc_Zelda_c::reset() {
     }
 }
 
-/* 80B75C9C-80B75D28 000C5C 008C+00 1/0 0/0 0/0 .text            afterJntAnm__13daNpc_Zelda_cFi */
 void daNpc_Zelda_c::afterJntAnm(int param_0) {
     if (param_0 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -400,7 +384,6 @@ void daNpc_Zelda_c::afterJntAnm(int param_0) {
     }
 }
 
-/* 80B75D28-80B75E34 000CE8 010C+00 1/0 0/0 0/0 .text            ctrlBtk__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::ctrlBtk() {
     if ((mpMatAnm[0] != NULL) && (mpMatAnm[1] != NULL)) {
         if (field_0xe29 != 0) {
@@ -426,8 +409,6 @@ int daNpc_Zelda_c::ctrlBtk() {
     return 0;
 }
 
-/* 80B75E34-80B75EE8 000DF4 00B4+00 1/0 0/0 0/0 .text            checkChangeEvt__13daNpc_Zelda_cFv
- */
 int daNpc_Zelda_c::checkChangeEvt() {
     if (!chkAction(&daNpc_Zelda_c::talk)) {
         mPreItemNo = 0;
@@ -442,7 +423,6 @@ int daNpc_Zelda_c::checkChangeEvt() {
     return 0;
 }
 
-/* 80B75EE8-80B76014 000EA8 012C+00 1/0 0/0 0/0 .text            setParam__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::setParam() {
     selectAction();
     srchActors();
@@ -476,14 +456,12 @@ void daNpc_Zelda_c::setParam() {
     return;
 }
 
-/* 80B76014-80B76074 000FD4 0060+00 1/0 0/0 0/0 .text setAfterTalkMotion__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::setAfterTalkMotion() {
     s32 index = 2;
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(index, -1.0f, 0, 0);
 }
 
-/* 80B76074-80B76078 001034 0004+00 1/1 0/0 0/0 .text            srchActors__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::srchActors() {
 #if DEBUG
     switch (field_0xf80) {
@@ -493,7 +471,6 @@ void daNpc_Zelda_c::srchActors() {
 #endif
 }
 
-/* 80B76078-80B76118 001038 00A0+00 1/0 0/0 0/0 .text            evtTalk__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::evtTalk() {
     if (chkAction(&daNpc_Zelda_c::talk)) {
         (this->*mAction2)(NULL);
@@ -504,7 +481,6 @@ int daNpc_Zelda_c::evtTalk() {
     return 1;
 }
 
-/* 80B76118-80B761E0 0010D8 00C8+00 1/0 0/0 0/0 .text            evtCutProc__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::evtCutProc() {
     s32 staff_id = dComIfGp_getEventManager().getMyStaffId("Zelda", this, -1);
     if (staff_id != -1) {
@@ -520,7 +496,6 @@ int daNpc_Zelda_c::evtCutProc() {
     return 0;
 }
 
-/* 80B761E0-80B762CC 0011A0 00EC+00 1/0 0/0 0/0 .text            action__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::action() {
     if (mStagger.checkRebirth() != 0) {
         mStagger.initialize();
@@ -536,14 +511,12 @@ void daNpc_Zelda_c::action() {
     }
 }
 
-/* 80B762CC-80B76344 00128C 0078+00 1/0 0/0 0/0 .text            beforeMove__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::beforeMove() {
     if (checkHide() != 0 || mNoDraw != 0) {
         attention_info.flags = 0;
     }
 }
 
-/* 80B76344-80B765D4 001304 0290+00 1/0 0/0 0/0 .text            setAttnPos__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::setAttnPos() {
     s32 iVar2;
     s32 iVar3;
@@ -589,7 +562,6 @@ void daNpc_Zelda_c::setAttnPos() {
     attention_info.position = acStack_3c + current.pos;
 }
 
-/* 80B765D4-80B76774 001594 01A0+00 1/0 0/0 0/0 .text            setCollision__13daNpc_Zelda_cFv */
 void daNpc_Zelda_c::setCollision() {
     cXyz newCenter;
     if (!mHide) {
@@ -639,7 +611,6 @@ void daNpc_Zelda_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80B76774-80B7677C 001734 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::drawDbgInfo() {
 #if DEBUG
     const daNpc_Zelda_HIOParam* m = &daNpc_Zelda_Param_c::m;
@@ -661,21 +632,16 @@ int daNpc_Zelda_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80B7677C-80B767C4 00173C 0048+00 1/1 0/0 0/0 .text            selectAction__13daNpc_Zelda_cFv */
 int daNpc_Zelda_c::selectAction() {
     mAction1 = NULL;
     mAction1 = &daNpc_Zelda_c::wait;
     return 1;
 }
 
-/* 80B767C4-80B767F0 001784 002C+00 2/2 0/0 0/0 .text
- * chkAction__13daNpc_Zelda_cFM13daNpc_Zelda_cFPCvPvPv_i        */
 BOOL daNpc_Zelda_c::chkAction(actionFunc action) {
     return mAction2 == action;
 }
 
-/* 80B767F0-80B76898 0017B0 00A8+00 2/2 0/0 0/0 .text
- * setAction__13daNpc_Zelda_cFM13daNpc_Zelda_cFPCvPvPv_i        */
 BOOL daNpc_Zelda_c::setAction(int (daNpc_Zelda_c::*action)(void*)) {
     mMode = 3;
     if (mAction2) {
@@ -691,7 +657,6 @@ BOOL daNpc_Zelda_c::setAction(int (daNpc_Zelda_c::*action)(void*)) {
     return TRUE;
 }
 
-/* 80B76898-80B76B74 001858 02DC+00 1/0 0/0 0/0 .text            wait__13daNpc_Zelda_cFPv */
 int daNpc_Zelda_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -755,7 +720,6 @@ int daNpc_Zelda_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80B76B74-80B76D60 001B34 01EC+00 3/0 0/0 0/0 .text            talk__13daNpc_Zelda_cFPv */
 int daNpc_Zelda_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -796,32 +760,26 @@ int daNpc_Zelda_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80B76D60-80B76D80 001D20 0020+00 1/0 0/0 0/0 .text            daNpc_Zelda_Create__FPv */
 static int daNpc_Zelda_Create(void* param_0) {
     return ((daNpc_Zelda_c*)param_0)->create();
 }
 
-/* 80B76D80-80B76DA0 001D40 0020+00 1/0 0/0 0/0 .text            daNpc_Zelda_Delete__FPv */
 static int daNpc_Zelda_Delete(void* param_0) {
     return ((daNpc_Zelda_c*)param_0)->Delete();
 }
 
-/* 80B76DA0-80B76DC0 001D60 0020+00 1/0 0/0 0/0 .text            daNpc_Zelda_Execute__FPv */
 static int daNpc_Zelda_Execute(void* param_0) {
     return ((daNpc_Zelda_c*)param_0)->Execute();
 }
 
-/* 80B76DC0-80B76DE0 001D80 0020+00 1/0 0/0 0/0 .text            daNpc_Zelda_Draw__FPv */
 static int daNpc_Zelda_Draw(void* param_0) {
     return ((daNpc_Zelda_c*)param_0)->Draw();
 }
 
-/* 80B76DE0-80B76DE8 001DA0 0008+00 1/0 0/0 0/0 .text            daNpc_Zelda_IsDelete__FPv */
 static int daNpc_Zelda_IsDelete(void* param_0) {
     return 1;
 }
 
-/* 80B78240-80B78260 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_Zelda_MethodTable */
 static actor_method_class daNpc_Zelda_MethodTable = {
     (process_method_func)daNpc_Zelda_Create,
     (process_method_func)daNpc_Zelda_Delete,
@@ -830,7 +788,6 @@ static actor_method_class daNpc_Zelda_MethodTable = {
     (process_method_func)daNpc_Zelda_Draw,
 };
 
-/* 80B78260-80B78290 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZELDA */
 extern actor_process_profile_definition g_profile_NPC_ZELDA = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp
index 56b5f8a0c7..75547eef93 100644
--- a/src/d/actor/d_a_npc_zra.cpp
+++ b/src/d/actor/d_a_npc_zra.cpp
@@ -30,14 +30,8 @@ public:
 #define HIO_PARAM(_) (daNpc_zrA_Param_c::m)
 #endif
 
-//
-// Declarations:
-//
-
-/* 80B8DA94-80B8DA98 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_zrA_Param_c l_HIO;
 
-/* 80B8C458-80B8C508 000000 00B0+00 56/56 0/0 0/0 .rodata          m__17daNpc_zrA_Param_c */
 daNpc_zrA_Param_c::param const daNpc_zrA_Param_c::m = {
     230.0f,   // mAttnOffsetY
     -3.0f,    // mGravity
@@ -91,8 +85,6 @@ daNpc_zrA_Param_c::param const daNpc_zrA_Param_c::m = {
     3000.0f,
 };
 
-/* 80B7850C-80B78730 0000EC 0224+00 8/8 0/0 0/0 .text
- * getDstPosDst2__16daNpc_zrA_Path_cF4cXyzR4cXyz                */
 BOOL daNpc_zrA_Path_c::getDstPosDst2(cXyz i_pos, cXyz& o_pnt) {
     BOOL ret = false;
     o_pnt = getPntPos(getIdx());
@@ -107,7 +99,6 @@ BOOL daNpc_zrA_Path_c::getDstPosDst2(cXyz i_pos, cXyz& o_pnt) {
     return ret;
 }
 
-/* 80B7876C-80B788F8 00034C 018C+00 4/4 0/0 0/0 .text setNextIdxDst__16daNpc_zrA_Path_cF4cXyz */
 void daNpc_zrA_Path_c::setNextIdxDst(cXyz param_0) {
     if (!setNextIdx()) {
         mPosDst = (param_0 - getPntPos(getIdx())).abs();
@@ -115,13 +106,10 @@ void daNpc_zrA_Path_c::setNextIdxDst(cXyz param_0) {
     }
 }
 
-/* 80B788F8-80B78A60 0004D8 0168+00 1/1 0/0 0/0 .text chkPassedDstXZ__16daNpc_zrA_Path_cF4cXyz */
 BOOL daNpc_zrA_Path_c::chkPassedDstXZ(cXyz i_pos) {
     return mPosDst + field_0x10 <= (mPosition - i_pos).absXZ();
 }
 
-/* 80B78A60-80B78CA0 000640 0240+00 1/1 0/0 0/0 .text
- * getDstPosDstXZ__16daNpc_zrA_Path_cF4cXyzR4cXyz               */
 BOOL daNpc_zrA_Path_c::getDstPosDstXZ(cXyz i_pos, cXyz& o_pnt) {
     BOOL ret = false;
     o_pnt = getPntPos(getIdx());
@@ -137,15 +125,11 @@ BOOL daNpc_zrA_Path_c::getDstPosDstXZ(cXyz i_pos, cXyz& o_pnt) {
     return ret;
 }
 
-/* 80B78CA0-80B78CFC 000880 005C+00 1/1 0/0 0/0 .text chkPassedChase__16daNpc_zrA_Path_cFUs4cXyz
- */
 BOOL daNpc_zrA_Path_c::chkPassedChase(u16 i_idx, cXyz i_pos) {
     return daNpcF_chkPassed(i_pos, (dPnt*)mPathInfo->m_points, i_idx,
                             mPathInfo->m_num, mIsClosed, mIsReversed);
 }
 
-/* 80B78CFC-80B78E08 0008DC 010C+00 1/1 0/0 0/0 .text
- * getDstPosChase__16daNpc_zrA_Path_cFUs4cXyzR4cXyz             */
 int daNpc_zrA_Path_c::getDstPosChase(u16 i_idx, cXyz i_pos, cXyz& o_pnt) {
     BOOL done = false;
     while (!done) {
@@ -171,7 +155,6 @@ int daNpc_zrA_Path_c::getDstPosChase(u16 i_idx, cXyz i_pos, cXyz& o_pnt) {
     return i_idx;
 }
 
-/* 80B78E08-80B7956C 0009E8 0764+00 1/1 0/0 0/0 .text chkPassDst__16daNpc_zrA_Path_cFUs4cXyz */
 f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) {
     u16 prev_idx, next_idx;
     dPnt* points = mPathInfo->m_points;
@@ -253,7 +236,6 @@ f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) {
     }
 }
 
-/* 80B8CEB4-80B8CEE4 000024 0030+00 0/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[6] = {
     {3, 4},   // zra
     {13, 5},  // zra_tw
@@ -263,7 +245,6 @@ static daNpc_GetParam1 l_bmdGetParamList[6] = {
     {4, 10},  // zra_sp_tw
 };
 
-/* 80B8CEE4-80B8D0DC 000054 01F8+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[63] = {
     {-1, 0},
     {8, 0},   // zra_f_talk_a
@@ -330,7 +311,6 @@ static daNpc_GetParam1 l_bckGetParamList[63] = {
     {12, 3},  // zra_step_sp
 };
 
-/* 80B8D0DC-80B8D11C 00024C 0040+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[8] = {
     {34, 0},  // zra
     {16, 5},  // zra_fh_sadsit_a
@@ -342,7 +322,6 @@ static daNpc_GetParam1 l_btpGetParamList[8] = {
     {18, 9},  // zra_fh_spa_wait_b
 };
 
-/* 80B8D11C-80B8D13C 00028C 0020+00 1/3 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[4] = {
     {28, 0},  // zra
     {31, 0},  // zra_water02
@@ -350,19 +329,16 @@ static daNpc_GetParam1 l_btkGetParamList[4] = {
     {30, 0},  // zra_w_eyeball
 };
 
-/* 80B8D13C-80B8D14C 0002AC 0010+00 0/1 0/0 0/0 .data            l_brkGetParamList */
 static daNpc_GetParam1 l_brkGetParamList[2] = {
     {24, 0},  // zra
     {25, 0},  // zra_water02
 };
 
-/* 80B8D14C-80B8D15C 0002BC 0010+00 0/1 0/0 0/0 .data            l_bpkGetParamList */
 static daNpc_GetParam1 l_bpkGetParamList[2] = {
     {20, 0},  // zra
     {21, 0},  // zra_water02
 };
 
-/* 80B8D15C-80B8D1C4 0002CC 0068+00 0/3 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[13] = {
     {0, 0},
     {1, 0},
@@ -379,7 +355,6 @@ static daNpc_GetParam1 l_evtGetParamList[13] = {
     {12, 0},
 };
 
-/* 80B8D1C4-80B8D1F8 -00001 0034+00 1/4 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[13] = {
     NULL,
     "TALK_SWIM",
@@ -396,42 +371,33 @@ static char* l_evtNames[13] = {
     "TALK_MULTI2",
 };
 
-/* 80B8D1F8-80B8D21C 000368 0024+00 0/1 0/0 0/0 .data            l_loadObj_list */
 static int l_loadObj_list[3][3] = {
     {2, 3, -1},
     {2, -1, -1},
     {-1, -1, -1},
 };
 
-/* 80B8D21C-80B8D240 00038C 0024+00 0/1 0/0 0/0 .data            l_loadObj_listTW */
 static int l_loadObj_listTW[3][3] = {
     {4, 5, -1},
     {4, -1, -1},
     {-1, -1, -1},
 };
 
-/* 80B8D240-80B8D260 0003B0 0020+00 1/0 0/0 0/0 .data            l_loadRes_ZRAa */
 static int l_loadRes_ZRAa[8] = {0, 1, 2, 4, 6, -1, -1, -1};
 
-/* 80B8D260-80B8D280 0003D0 0020+00 1/0 0/0 0/0 .data            l_loadRes_Swim */
 static int l_loadRes_Swim[8] = {0, 1, 2, 4, -1, -1, -1, -1};
 
-/* 80B8D280-80B8D2A0 0003F0 0020+00 1/0 0/0 0/0 .data            l_loadRes_Tobi */
 static int l_loadRes_Tobi[8] = {0, 1, 2, 4, 8, -1, -1, -1};
 
-/* 80B8D2A0-80B8D2C0 000410 0020+00 1/0 0/0 0/0 .data            l_loadRes_Spa */
 static int l_loadRes_Spa[8] = {0, 2, 4, 9, -1, -1, -1, -1};
 
-/* 80B8D2C0-80B8D2E0 000430 0020+00 1/0 0/0 0/0 .data            l_loadRes_ZRA0 */
 static int l_loadRes_ZRA0[8] = {0, 1, 2, 4, -1, -1, -1, -1};
 
-/* 80B8D2E0-80B8D300 -00001 0020+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[8] = {
     l_loadRes_ZRAa, l_loadRes_Swim, l_loadRes_Swim, l_loadRes_Swim,
     l_loadRes_Tobi, l_loadRes_Tobi, l_loadRes_Spa,  l_loadRes_ZRA0,
 };
 
-/* 80B8D300-80B8D32C -00001 002C+00 5/11 0/0 0/0 .data            l_resNames */
 static char* l_resNames[11] = {
     "zrA",
     "zrA_nml",
@@ -446,7 +412,6 @@ static char* l_resNames[11] = {
     "zrA_objTW",
 };
 
-/* 80B8D32C-80B8D33C -00001 0010+00 1/2 0/0 0/0 .data            l_myName */
 static char* l_myName[4] = {
     "zrA",
     "zrA_talk",
@@ -454,7 +419,6 @@ static char* l_myName[4] = {
     "zrWF",
 };
 
-/* 80B8D33C-80B8D368 -00001 002C+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_zrA_c */
 char* daNpc_zrA_c::mEvtCutNameList[11] = {
     "",
     "TALK_SWIM",
@@ -483,10 +447,8 @@ daNpc_zrA_c::EventFn daNpc_zrA_c::mEvtCutList[11] = {
     &daNpc_zrA_c::ECut_talkMulti,
 };
 
-/* 80B7956C-80B79798 00114C 022C+00 1/1 0/0 0/0 .text            __ct__11daNpc_zrA_cFv */
 daNpc_zrA_c::daNpc_zrA_c() {}
 
-/* 80B79828-80B79B58 001408 0330+00 1/0 0/0 0/0 .text            __dt__11daNpc_zrA_cFv */
 daNpc_zrA_c::~daNpc_zrA_c() {
     int i;
     for (i = 0; l_loadRes_list[mType][i] >= 0; i++) {
@@ -516,7 +478,6 @@ daNpc_zrA_c::~daNpc_zrA_c() {
     }
 }
 
-/* 80B79B58-80B79F38 001738 03E0+00 1/1 0/0 0/0 .text            create__11daNpc_zrA_cFv */
 cPhs__Step daNpc_zrA_c::create() {
     fopAcM_ct(this, daNpc_zrA_c);
 
@@ -609,7 +570,6 @@ cPhs__Step daNpc_zrA_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80B79F38-80B7A360 001B18 0428+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_zrA_cFv */
 int daNpc_zrA_c::CreateHeap() {
     J3DModelData* model_data = NULL;
     u32 model_flag;
@@ -697,18 +657,15 @@ int daNpc_zrA_c::CreateHeap() {
     return 1;
 }
 
-/* 80B7A51C-80B7A550 0020FC 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_zrA_cFv */
 int daNpc_zrA_c::Delete() {
     this->~daNpc_zrA_c();
     return 1;
 }
 
-/* 80B7A550-80B7A570 002130 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_zrA_cFv */
 int daNpc_zrA_c::Execute() {
     return execute();
 }
 
-/* 80B7A570-80B7A864 002150 02F4+00 1/1 0/0 0/0 .text            Draw__11daNpc_zrA_cFv */
 int daNpc_zrA_c::Draw() {
     BOOL bvar2 = false;
     J3DModel* model = mAnm_p->getModel();
@@ -788,8 +745,6 @@ int daNpc_zrA_c::Draw() {
     return 1;
 }
 
-/* 80B7A864-80B7AB9C 002444 0338+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_zrA_cFP8J3DJointP8J3DModel                */
 int daNpc_zrA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     Mtx mtx1, mtx2;
@@ -863,14 +818,10 @@ int daNpc_zrA_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B7AB9C-80B7ABBC 00277C 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_zrA_cFP10fopAc_ac_c              */
 int daNpc_zrA_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_zrA_c*>(i_this)->CreateHeap();
 }
 
-/* 80B7ABBC-80B7AC08 00279C 004C+00 2/2 0/0 0/0 .text ctrlJointCallBack__11daNpc_zrA_cFP8J3DJointi
- */
 int daNpc_zrA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -882,7 +833,6 @@ int daNpc_zrA_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B7AC08-80B7ADF0 0027E8 01E8+00 1/0 0/0 0/0 .text            setParam__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setParam() {
     u32 attn_flags = (fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
     BOOL in_water = mAcch.ChkWaterIn();
@@ -943,7 +893,6 @@ void daNpc_zrA_c::setParam() {
     }
 }
 
-/* 80B7ADF0-80B7B0A4 0029D0 02B4+00 1/0 0/0 0/0 .text            main__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::main() {
     if (!doEvent()) {
         mOrderEvtNo = EVT_NONE;
@@ -1011,7 +960,6 @@ BOOL daNpc_zrA_c::main() {
     return true;
 }
 
-/* 80B7B0A4-80B7B1DC 002C84 0138+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -1036,7 +984,6 @@ BOOL daNpc_zrA_c::ctrlBtk() {
     return false;
 }
 
-/* 80B7B1DC-80B7B91C 002DBC 0740+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setAttnPos() {
     static cXyz eyeOffset(-20.0f, 10.0f, 0.0f);
     f32 offset = daNpc_zrA_Param_c::m.mAttnOffsetY;
@@ -1177,7 +1124,6 @@ void daNpc_zrA_c::setAttnPos() {
     mCcCyl.ClrCoHit();
 }
 
-/* 80B7B91C-80B7B9D4 0034FC 00B8+00 1/0 0/0 0/0 .text            setMtx__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setMtx() {
     J3DModel* model = mAnm_p->getModel();
     cXyz pos = current.pos;
@@ -1196,8 +1142,6 @@ void daNpc_zrA_c::setMtx() {
     }
 }
 
-/* 80B7B9D4-80B7BD60 0035B4 038C+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_zrA_cFib
- */
 bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* bck_anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -1305,8 +1249,6 @@ bool daNpc_zrA_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80B7BD60-80B7BE74 003940 0114+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_zrA_cFi
- */
 bool daNpc_zrA_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btp_anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -1349,7 +1291,6 @@ bool daNpc_zrA_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80B7BE74-80B7BEA0 003A54 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_zrA_cFif */
 void daNpc_zrA_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 0x15) {
         mExpression = i_expression;
@@ -1359,7 +1300,6 @@ void daNpc_zrA_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80B7BEA0-80B7C070 003A80 01D0+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_zrA_cFif */
 void daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* bck_anm = NULL;
     J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -1451,8 +1391,6 @@ void daNpc_zrA_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80B7C070-80B7C308 003C50 0298+00 2/2 0/0 0/0 .text            setMotionWaterAnm__11daNpc_zrA_cFi
- */
 void daNpc_zrA_c::setMotionWaterAnm(int i_idx) {
     J3DAnmTevRegKey* brk_anm = NULL;
     J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -1524,7 +1462,6 @@ void daNpc_zrA_c::setMotionWaterAnm(int i_idx) {
     }
 }
 
-/* 80B7C308-80B7C34C 003EE8 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_zrA_cFifi */
 void daNpc_zrA_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if (i_restart || mMotion != motion) {
@@ -1537,12 +1474,10 @@ void daNpc_zrA_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80B7C34C-80B7C354 003F2C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::drawDbgInfo() {
     return false;
 }
 
-/* 80B7C354-80B7C44C 003F34 00F8+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_zrA_cFv */
 void daNpc_zrA_c::drawOtherMdls() {
     static int const l_jntNumTbl[3][3] = {
         {4, 25, -1},
@@ -1566,7 +1501,6 @@ void daNpc_zrA_c::drawOtherMdls() {
     }
 }
 
-/* 80B7C44C-80B7C4B4 00402C 0068+00 2/1 0/0 0/0 .text getTypeFromArgument__11daNpc_zrA_cFv */
 daNpc_zrA_c::Type daNpc_zrA_c::getTypeFromArgument() {
     switch (argument) {
     case 0:
@@ -1588,7 +1522,6 @@ daNpc_zrA_c::Type daNpc_zrA_c::getTypeFromArgument() {
     }
 }
 
-/* 80B7C4B4-80B7C500 004094 004C+00 1/1 0/0 0/0 .text getSoldierTypeFromParam__11daNpc_zrA_cFv */
 daNpc_zrA_c::SoldierType daNpc_zrA_c::getSoldierTypeFromParam() {
     if (mType == TYPE_WATERFALL || mType == TYPE_SEARCH) {
         return SOLDIER_NOSPEAR;
@@ -1606,7 +1539,6 @@ daNpc_zrA_c::SoldierType daNpc_zrA_c::getSoldierTypeFromParam() {
     }
 }
 
-/* 80B7C500-80B7C524 0040E0 0024+00 1/1 0/0 0/0 .text getGameModeFromParam__11daNpc_zrA_cFv */
 daNpc_zrA_c::GameMode daNpc_zrA_c::getGameModeFromParam() {
     switch ((fopAcM_GetParam(this) >> 0x14) & 0xf) {
     case 1:
@@ -1616,7 +1548,6 @@ daNpc_zrA_c::GameMode daNpc_zrA_c::getGameModeFromParam() {
     }
 }
 
-/* 80B7C524-80B7C5E4 004104 00C0+00 1/1 0/0 0/0 .text getActionTypeFromParam__11daNpc_zrA_cFv */
 daNpc_zrA_c::ActionType daNpc_zrA_c::getActionTypeFromParam() {
     u8 param = (fopAcM_GetParam(this) >> 0x10) & 0xf;
     if (mType == TYPE_WAIT) {
@@ -1650,7 +1581,6 @@ daNpc_zrA_c::ActionType daNpc_zrA_c::getActionTypeFromParam() {
     }
 }
 
-/* 80B7C5E4-80B7C614 0041C4 0030+00 3/3 0/0 0/0 .text getMultiModeFromParam__11daNpc_zrA_cFv */
 u8 daNpc_zrA_c::getMultiModeFromParam() {
     u8 param = (fopAcM_GetParam(this) >> 0x14) & 0xf;
     if (mType != 0) {
@@ -1662,7 +1592,6 @@ u8 daNpc_zrA_c::getMultiModeFromParam() {
     return param;
 }
 
-/* 80B7C614-80B7C644 0041F4 0030+00 2/2 0/0 0/0 .text getMultiNoFromParam__11daNpc_zrA_cFv */
 u8 daNpc_zrA_c::getMultiNoFromParam() {
     u8 param = (fopAcM_GetParam(this) >> 0x18) & 0xf;
     if (mType != 0) {
@@ -1671,7 +1600,6 @@ u8 daNpc_zrA_c::getMultiNoFromParam() {
     return param == 0xf ? (u8)0 : param;
 }
 
-/* 80B7C644-80B7C71C 004224 00D8+00 1/1 0/0 0/0 .text            isDelete__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::isDelete() {
     if ((mType == TYPE_SEARCH && dComIfGs_isSwitch(mSwitch1, fopAcM_GetRoomNo(this)))
         || (mType == TYPE_SPA && !daNpcF_chkEvtBit(0x10a))
@@ -1684,7 +1612,6 @@ BOOL daNpc_zrA_c::isDelete() {
     return false;
 }
 
-/* 80B7C71C-80B7CA8C 0042FC 0370+00 1/1 0/0 0/0 .text            reset__11daNpc_zrA_cFv */
 void daNpc_zrA_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -1779,7 +1706,6 @@ void daNpc_zrA_c::reset() {
     field_0x9ee = 1;
 }
 
-/* 80B7CA8C-80B7D0FC 00466C 0670+00 1/1 0/0 0/0 .text            playExpression__11daNpc_zrA_cFv */
 void daNpc_zrA_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_NOMAL, daNpc_zrA_Param_c::m.mMorfFrames, 1};
     daNpcF_anmPlayData dat0b = {ANM_FH_TALK_NOMAL, daNpc_zrA_Param_c::m.mMorfFrames, 0};
@@ -1842,7 +1768,6 @@ void daNpc_zrA_c::playExpression() {
     }
 }
 
-/* 80B7D0FC-80B7DAF4 004CDC 09F8+00 1/1 0/0 0/0 .text            playMotion__11daNpc_zrA_cFv */
 void daNpc_zrA_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpc_zrA_Param_c::m.mMorfFrames, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1940,14 +1865,10 @@ void daNpc_zrA_c::playMotion() {
     }
 }
 
-/* 80B7DAF4-80B7DB20 0056D4 002C+00 1/1 0/0 0/0 .text
- * chkAction__11daNpc_zrA_cFM11daNpc_zrA_cFPCvPvPv_i            */
 BOOL daNpc_zrA_c::chkAction(ActionFn i_action) {
     return mpActionFn == i_action;
 }
 
-/* 80B7DB20-80B7DBC8 005700 00A8+00 15/15 0/0 0/0 .text
- * setAction__11daNpc_zrA_cFM11daNpc_zrA_cFPCvPvPv_i            */
 bool daNpc_zrA_c::setAction(ActionFn i_action) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -1961,7 +1882,6 @@ bool daNpc_zrA_c::setAction(ActionFn i_action) {
     return true;
 }
 
-/* 80B7DBC8-80B7DF40 0057A8 0378+00 4/1 0/0 0/0 .text            selectAction__11daNpc_zrA_cFv */
 bool daNpc_zrA_c::selectAction() {
     mpNextActionFn = NULL;
     if (daNpc_zrA_Param_c::m.mTest) {
@@ -2058,7 +1978,6 @@ bool daNpc_zrA_c::selectAction() {
     return true;
 }
 
-/* 80B7DF40-80B7E668 005B20 0728+00 1/1 0/0 0/0 .text            doEvent__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::doEvent() {
     dEvent_manager_c* event_manager = NULL;
     BOOL ret = false;
@@ -2210,7 +2129,6 @@ BOOL daNpc_zrA_c::doEvent() {
     return ret;
 }
 
-/* 80B7E668-80B7E6F4 006248 008C+00 1/1 0/0 0/0 .text            setSkipZev__11daNpc_zrA_cFii */
 BOOL daNpc_zrA_c::setSkipZev(int i_idx1, int i_idx2) {
     if (!strcmp(dComIfGp_getEventManager().getRunEventName(), l_evtNames[i_idx1])) {
         dComIfGp_getEvent().setSkipZev(this, l_evtNames[i_idx2]);
@@ -2219,14 +2137,12 @@ BOOL daNpc_zrA_c::setSkipZev(int i_idx1, int i_idx2) {
     return false;
 }
 
-/* 80B7E6F4-80B7E718 0062D4 0024+00 27/27 0/0 0/0 .text            setLookMode__11daNpc_zrA_cFi */
 void daNpc_zrA_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80B7E718-80B7E9E0 0062F8 02C8+00 1/1 0/0 0/0 .text            lookat__11daNpc_zrA_cFv */
 void daNpc_zrA_c::lookat() {
     fopAc_ac_c* attn_actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -2285,7 +2201,6 @@ void daNpc_zrA_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80B7E9E0-80B7EA90 0065C0 00B0+00 1/1 0/0 0/0 .text            chkFindPlayer__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::chkFindPlayer() {
     BOOL check;
     if (mActorMngr[0].getActorP() == NULL) {
@@ -2303,7 +2218,6 @@ BOOL daNpc_zrA_c::chkFindPlayer() {
     return check;
 }
 
-/* 80B7EA90-80B7EBA0 006670 0110+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setExpressionTalkAfter() {
     switch (mExpression) {
     case EXPR_TALK_NOMAL:
@@ -2333,7 +2247,6 @@ int dummy_clib_u8(u8* arg) {
     return cLib_calcTimer<u8>(arg);
 }
 
-/* 80B7EBA0-80B7EC54 006780 00B4+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setPrtcl() {
     u32 flags = 0x40002;
     cXyz ptcl_scale(1.5f, 1.5f, 1.5f);
@@ -2349,7 +2262,6 @@ void daNpc_zrA_c::setPrtcl() {
 }
 
 
-/* 80B7EC54-80B7ED38 006834 00E4+00 1/0 0/0 0/0 .text            test__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::test(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2375,27 +2287,22 @@ BOOL daNpc_zrA_c::test(void* param_0) {
     return true;
 }
 
-/* 80B7ED38-80B7ED58 006918 0020+00 1/0 0/0 0/0 .text            daNpc_zrA_Create__FPv */
 static cPhs__Step daNpc_zrA_Create(void* i_this) {
     return static_cast<daNpc_zrA_c*>(i_this)->create();
 }
 
-/* 80B7ED58-80B7ED78 006938 0020+00 1/0 0/0 0/0 .text            daNpc_zrA_Delete__FPv */
 static int daNpc_zrA_Delete(void* i_this) {
     return static_cast<daNpc_zrA_c*>(i_this)->Delete();
 }
 
-/* 80B7ED78-80B7ED98 006958 0020+00 1/0 0/0 0/0 .text            daNpc_zrA_Execute__FPv */
 static int daNpc_zrA_Execute(void* i_this) {
     return static_cast<daNpc_zrA_c*>(i_this)->Execute();
 }
 
-/* 80B7ED98-80B7EDB8 006978 0020+00 1/0 0/0 0/0 .text            daNpc_zrA_Draw__FPv */
 static int daNpc_zrA_Draw(void* i_this) {
     return static_cast<daNpc_zrA_c*>(i_this)->Draw();
 }
 
-/* 80B7EDB8-80B7EDC0 006998 0008+00 1/0 0/0 0/0 .text            daNpc_zrA_IsDelete__FPv */
 static int daNpc_zrA_IsDelete(void* i_this) {
     return 1;
 }
@@ -2404,7 +2311,6 @@ static int daNpc_zrA_IsDelete(void* i_this) {
 
 AUDIO_INSTANCES
 
-/* 80B8D8DC-80B8D8FC -00001 0020+00 1/0 0/0 0/0 .data            daNpc_zrA_MethodTable */
 static actor_method_class daNpc_zrA_MethodTable = {
     (process_method_func)daNpc_zrA_Create,
     (process_method_func)daNpc_zrA_Delete,
@@ -2413,7 +2319,6 @@ static actor_method_class daNpc_zrA_MethodTable = {
     (process_method_func)daNpc_zrA_Draw,
 };
 
-/* 80B8D8FC-80B8D92C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZRA */
 extern actor_process_profile_definition g_profile_NPC_ZRA = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc
index 2f9d19e6d5..05503f3087 100644
--- a/src/d/actor/d_a_npc_zra.inc
+++ b/src/d/actor/d_a_npc_zra.inc
@@ -98,7 +98,6 @@ BOOL daNpc_zrA_c::wait(void* param_0) {
     return true;
 }
 
-/* 80B7FD10-80B7FE18 0078F0 0108+00 1/1 0/0 0/0 .text            walkCalc__11daNpc_zrA_cFv */
 void daNpc_zrA_c::walkCalc() {
     field_0x1550 = false;
     cXyz next_pnt;
@@ -116,7 +115,6 @@ void daNpc_zrA_c::walkCalc() {
     mOldAngle.y = mCurAngle.y;
 }
 
-/* 80B7FE18-80B800A4 0079F8 028C+00 1/1 0/0 0/0 .text            waitCalc__11daNpc_zrA_cFv */
 void daNpc_zrA_c::waitCalc() {
     if (mAcch.ChkWaterIn()) {
         if (mMotion != MOT_WAIT_SWIM) {
@@ -160,7 +158,6 @@ void daNpc_zrA_c::waitCalc() {
     }
 }
 
-/* 80B800A4-80B80228 007C84 0184+00 1/0 0/0 0/0 .text            waitSpa__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::waitSpa(void* param_0) {
     switch (mMode) {
     case 0:
@@ -199,7 +196,6 @@ BOOL daNpc_zrA_c::waitSpa(void* param_0) {
     return true;
 }
 
-/* 80B80228-80B80418 007E08 01F0+00 1/0 0/0 0/0 .text            waitLake__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::waitLake(void* param_0) {
     switch (mMode) {
     case 0:
@@ -246,7 +242,6 @@ BOOL daNpc_zrA_c::waitLake(void* param_0) {
     return true;
 }
 
-/* 80B80418-80B8064C 007FF8 0234+00 3/0 0/0 0/0 .text            talk__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::talk(void* param_0) {
     BOOL ret = false;
     BOOL bvar2 = false;
@@ -308,7 +303,6 @@ BOOL daNpc_zrA_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80B8064C-80B806FC 00822C 00B0+00 1/1 0/0 0/0 .text            s_subMulti__FPvPv */
 static void* s_subMulti(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) {
         daNpc_zrA_c* _this = static_cast<daNpc_zrA_c*>(i_this);
@@ -324,7 +318,6 @@ static void* s_subMulti(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B806FC-80B80860 0082DC 0164+00 1/0 0/0 0/0 .text            ECut_talkMulti__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_talkMulti(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -377,7 +370,6 @@ BOOL daNpc_zrA_c::ECut_talkMulti(int i_staffID) {
     return ret;
 }
 
-/* 80B80860-80B80A94 008440 0234+00 2/0 0/0 0/0 .text            swim__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::swim(void* param_0) {
     switch (mMode) {
     case 0:
@@ -443,7 +435,6 @@ BOOL daNpc_zrA_c::swim(void* param_0) {
     return true;
 }
 
-/* 80B80A94-80B81788 008674 0CF4+00 1/1 0/0 0/0 .text            railSwim__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::railSwim() {
     s16 ang_step = HIO_PARAM(this).mSwimAngleSpeed;
     s16 ang_scale = 8;
@@ -678,7 +669,6 @@ BOOL daNpc_zrA_c::railSwim() {
     return true;
 }
 
-/* 80B81788-80B81918 009368 0190+00 1/1 0/0 0/0 .text            waitSwim__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::waitSwim() {
     calcModulation();
 
@@ -723,7 +713,6 @@ BOOL daNpc_zrA_c::waitSwim() {
     return true;
 }
 
-/* 80B81918-80B81A18 0094F8 0100+00 1/1 0/0 0/0 .text            turnSwimInit__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::turnSwimInit() {
     mPath.reverse();
     mPath.setNextIdxDst(current.pos);
@@ -745,7 +734,6 @@ BOOL daNpc_zrA_c::turnSwimInit() {
     return true;
 }
 
-/* 80B81A18-80B81CC8 0095F8 02B0+00 2/2 0/0 0/0 .text            turnSwim__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::turnSwim() {
     s16 ang_step = HIO_PARAM(this).mSwimAngleSpeed;
     cXyz pos;
@@ -804,7 +792,6 @@ BOOL daNpc_zrA_c::turnSwim() {
     return true;
 }
 
-/* 80B81CC8-80B81D68 0098A8 00A0+00 1/1 0/0 0/0 .text            turnSwimCheck__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::turnSwimCheck() {
     if (mSoldierType != SOLDIER_SPEAR) {
         if (mCheckSwimTurn) {
@@ -823,7 +810,6 @@ BOOL daNpc_zrA_c::turnSwimCheck() {
     return false;
 }
 
-/* 80B81D68-80B81F70 009948 0208+00 1/1 0/0 0/0 .text evasionCalc__11daNpc_zrA_cFR4cXyzR5csXyz */
 BOOL daNpc_zrA_c::evasionCalc(cXyz& param_0, csXyz& param_1) {
     BOOL ret;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -870,7 +856,6 @@ BOOL daNpc_zrA_c::evasionCalc(cXyz& param_0, csXyz& param_1) {
     return ret;
 }
 
-/* 80B81FB8-80B8204C 009B98 0094+00 13/13 0/0 0/0 .text            calcBank__11daNpc_zrA_cFssRsRs */
 void daNpc_zrA_c::calcBank(s16 i_step, s16 i_scale, s16& i_angY, s16& o_angZ) {
     s16 ang_diff_y = i_angY - current.angle.y;
     if (ang_diff_y >= 0x4000) {
@@ -882,7 +867,6 @@ void daNpc_zrA_c::calcBank(s16 i_step, s16 i_scale, s16& i_angY, s16& o_angZ) {
     cLib_addCalcAngleS2(&o_angZ, mSwimAngleCalc.z, (s16)i_scale, i_step);
 }
 
-/* 80B8204C-80B82238 009C2C 01EC+00 1/1 0/0 0/0 .text            calcWaistAngle__11daNpc_zrA_cFv */
 void daNpc_zrA_c::calcWaistAngle() {
     if (mResetWaistAngle) {
         cLib_chaseAngleS(&mWaistAngle.x, 0, HIO_PARAM(this).mSwimAngleSpeed / 2);
@@ -922,8 +906,6 @@ void daNpc_zrA_c::calcWaistAngle() {
     }
 }
 
-/* 80B82238-80B822CC 009E18 0094+00 9/9 0/0 0/0 .text            calcWaistAngleInit__11daNpc_zrA_cFv
- */
 void daNpc_zrA_c::calcWaistAngleInit() {
     cXyz vec(0.0f, 0.0f, -HIO_PARAM(this).field_0x8c);
     mDoMtx_stack_c::ZXYrotS(mCurAngle);
@@ -933,13 +915,10 @@ void daNpc_zrA_c::calcWaistAngleInit() {
     mResetWaistAngle = false;
 }
 
-/* 80B822CC-80B822D8 009EAC 000C+00 8/8 0/0 0/0 .text            calcWaistAngleStop__11daNpc_zrA_cFv
- */
 void daNpc_zrA_c::calcWaistAngleStop() {
     mResetWaistAngle = true;
 }
 
-/* 80B822D8-80B82300 009EB8 0028+00 3/3 0/0 0/0 .text calcWaistAngleCheck__11daNpc_zrA_cFv */
 BOOL daNpc_zrA_c::calcWaistAngleCheck() {
     if (mSwimMode != SWIM_WAIT && !mResetWaistAngle) {
         return true;
@@ -948,7 +927,6 @@ BOOL daNpc_zrA_c::calcWaistAngleCheck() {
     }
 }
 
-/* 80B82300-80B8247C 009EE0 017C+00 6/6 0/0 0/0 .text            calcModulation__11daNpc_zrA_cFv */
 void daNpc_zrA_c::calcModulation() {
     if (mAcch.ChkWaterIn()) {
         if (mAcch.ChkWaterIn() && current.pos.y < mAcch.m_wtr.GetHeight() - 220.0f) {
@@ -971,7 +949,6 @@ void daNpc_zrA_c::calcModulation() {
     }
 }
 
-/* 80B8247C-80B824F4 00A05C 0078+00 2/2 0/0 0/0 .text            resetModulation__11daNpc_zrA_cFv */
 void daNpc_zrA_c::resetModulation() {
     cLib_chaseF(&mModulationOffset.y, 0.0f, 1.0f);
     cLib_chaseF(&mModulationOffset.x, 0.0f, 1.0f);
@@ -979,8 +956,6 @@ void daNpc_zrA_c::resetModulation() {
     mModulationParam = 210;
 }
 
-/* 80B824F4-80B82584 00A0D4 0090+00 17/17 0/0 0/0 .text
- * calcSwimAngle__11daNpc_zrA_cFR5csXyzR5csXyzss                */
 void daNpc_zrA_c::calcSwimAngle(csXyz& i_target, csXyz& i_calc, s16 i_scale, s16 i_step) {
     cLib_addCalcAngleS2(&i_calc.x, i_target.x, i_scale, i_step);
     cLib_addCalcAngleS2(&current.angle.x, i_calc.x, i_scale, i_step);
@@ -988,8 +963,6 @@ void daNpc_zrA_c::calcSwimAngle(csXyz& i_target, csXyz& i_calc, s16 i_scale, s16
     cLib_addCalcAngleS2(&current.angle.y, i_calc.y, i_scale, i_step);
 }
 
-/* 80B82584-80B825FC 00A164 0078+00 15/15 0/0 0/0 .text            calcSwimPos__11daNpc_zrA_cFR4cXyz
- */
 void daNpc_zrA_c::calcSwimPos(cXyz& i_speed) {
     csXyz angle = current.angle;
     angle.z = 0;
@@ -998,7 +971,6 @@ void daNpc_zrA_c::calcSwimPos(cXyz& i_speed) {
     current.pos += i_speed;
 }
 
-/* 80B825FC-80B826F0 00A1DC 00F4+00 8/8 0/0 0/0 .text            calcWaitSwim__11daNpc_zrA_cFi */
 void daNpc_zrA_c::calcWaitSwim(BOOL param_0) {
     cLib_chaseAngleS(&current.angle.x, 0, HIO_PARAM(this).mSwimAngleSpeed);
     cLib_chaseAngleS(&current.angle.z, 0, HIO_PARAM(this).mSwimAngleSpeed);
@@ -1014,7 +986,6 @@ void daNpc_zrA_c::calcWaitSwim(BOOL param_0) {
     }
 }
 
-/* 80B826F0-80B82C54 00A2D0 0564+00 1/0 0/0 0/0 .text            ECut_talkSwim__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_talkSwim(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1140,7 +1111,6 @@ BOOL daNpc_zrA_c::ECut_talkSwim(int i_staffID) {
     return ret;
 }
 
-/* 80B82C54-80B82E88 00A834 0234+00 3/0 0/0 0/0 .text            waitWaterfall__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::waitWaterfall(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1202,7 +1172,6 @@ BOOL daNpc_zrA_c::waitWaterfall(void* param_0) {
     return true;
 }
 
-/* 80B82E88-80B833C8 00AA68 0540+00 2/0 0/0 0/0 .text            swimWaterfall__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::swimWaterfall(void* param_0) {
     s16 angle_step = HIO_PARAM(this).mSwimAngleSpeed * 2;
     s16 angle_scale = 2;
@@ -1324,7 +1293,6 @@ BOOL daNpc_zrA_c::swimWaterfall(void* param_0) {
     return true;
 }
 
-/* 80B833C8-80B83548 00AFA8 0180+00 2/0 0/0 0/0 .text            diveWaterfall__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::diveWaterfall(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1356,7 +1324,6 @@ BOOL daNpc_zrA_c::diveWaterfall(void* param_0) {
     return true;
 }
 
-/* 80B83548-80B837E8 00B128 02A0+00 2/0 0/0 0/0 .text            talkSwim__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::talkSwim(void* param_0) {
     BOOL bvar2 = false;
     int flow_id;
@@ -1428,7 +1395,6 @@ BOOL daNpc_zrA_c::talkSwim(void* param_0) {
     return false;
 }
 
-/* 80B837E8-80B83D08 00B3C8 0520+00 1/0 0/0 0/0 .text ECut_carryWaterfall__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_carryWaterfall(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1562,7 +1528,6 @@ BOOL daNpc_zrA_c::ECut_carryWaterfall(int i_staffID) {
     return ret;
 }
 
-/* 80B83D08-80B83FA4 00B8E8 029C+00 1/0 0/0 0/0 .text ECut_carryWaterfallSkip__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_carryWaterfallSkip(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1634,7 +1599,6 @@ BOOL daNpc_zrA_c::ECut_carryWaterfallSkip(int i_staffID) {
     return ret;
 }
 
-/* 80B83FA4-80B84200 00BB84 025C+00 1/1 0/0 0/0 .text            diveCalc__11daNpc_zrA_cFssi */
 BOOL daNpc_zrA_c::diveCalc(s16 i_angleStep, s16 i_angleScale, BOOL param_2) {
     cLib_chaseF(&mScaleFactor, HIO_PARAM(this).mMaxScaleFactor,
                 (HIO_PARAM(this).mMaxScaleFactor - 1.0f) / 30.0f);
@@ -1679,7 +1643,6 @@ BOOL daNpc_zrA_c::diveCalc(s16 i_angleStep, s16 i_angleScale, BOOL param_2) {
     }
 }
 
-/* 80B84200-80B8424C 00BDE0 004C+00 1/1 0/0 0/0 .text            s_subHoz__FPvPv */
 static void* s_subHoz(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_HOZ) {
         return i_proc;
@@ -1687,7 +1650,6 @@ static void* s_subHoz(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B8424C-80B84298 00BE2C 004C+00 3/3 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CANOE) {
         return i_proc;
@@ -1695,8 +1657,6 @@ static void* s_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B84298-80B84B74 00BE78 08DC+00 4/0 0/0 0/0 .text            waitRiverDescend__11daNpc_zrA_cFPv
- */
 BOOL daNpc_zrA_c::waitRiverDescend(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1815,8 +1775,6 @@ BOOL daNpc_zrA_c::waitRiverDescend(void* param_0) {
     return true;
 }
 
-/* 80B84B74-80B85B14 00C754 0FA0+00 2/2 0/0 0/0 .text            swimRiverDescend__11daNpc_zrA_cFPv
- */
 BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) {
     cXyz pos_sp94;
     cXyz swim_speed_sp88;
@@ -2038,8 +1996,6 @@ BOOL daNpc_zrA_c::swimRiverDescend(void* param_0) {
     return true;
 }
 
-/* 80B85B14-80B8601C 00D6F4 0508+00 2/0 0/0 0/0 .text            swimRiverDescend2__11daNpc_zrA_cFPv
- */
 BOOL daNpc_zrA_c::swimRiverDescend2(void* param_0) {
     cXyz pos, swim_speed;
     s16 angle_step = HIO_PARAM(this).mSwimAngleSpeed;
@@ -2124,8 +2080,6 @@ BOOL daNpc_zrA_c::swimRiverDescend2(void* param_0) {
     return true;
 }
 
-/* 80B8601C-80B86440 00DBFC 0424+00 4/0 0/0 0/0 .text            diveRiverDescend__11daNpc_zrA_cFPv
- */
 BOOL daNpc_zrA_c::diveRiverDescend(void* param_0) {
     s16 angle_step = HIO_PARAM(this).mSwimAngleSpeed * 2;
 
@@ -2206,7 +2160,6 @@ BOOL daNpc_zrA_c::diveRiverDescend(void* param_0) {
     return true;
 }
 
-/* 80B86440-80B86A2C 00E020 05EC+00 2/0 0/0 0/0 .text swimGoalRiverDescend__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::swimGoalRiverDescend(void* param_0) {
     daPy_py_c* player;
     cXyz pos, swim_speed;
@@ -2299,7 +2252,6 @@ BOOL daNpc_zrA_c::swimGoalRiverDescend(void* param_0) {
     return true;
 }
 
-/* 80B86A2C-80B86D9C 00E60C 0370+00 2/0 0/0 0/0 .text returnRiverDescend__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::returnRiverDescend(void* param_0) {
     cXyz pos, swim_speed;
     s16 angle_step = HIO_PARAM(this).mSwimAngleSpeed;
@@ -2387,7 +2339,6 @@ BOOL daNpc_zrA_c::returnRiverDescend(void* param_0) {
     return true;
 }
 
-/* 80B86D9C-80B86E78 00E97C 00DC+00 3/3 0/0 0/0 .text moveRiverPosCalc__11daNpc_zrA_cFR4cXyz */
 void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) {
     cXyz pos;
     mPath.getDstPos(daPy_getPlayerActorClass()->current.pos, pos);
@@ -2400,7 +2351,6 @@ void daNpc_zrA_c::moveRiverPosCalc(cXyz& o_pos) {
     }
 }
 
-/* 80B86E78-80B86FAC 00EA58 0134+00 1/1 0/0 0/0 .text            createRuppi__11daNpc_zrA_cFv */
 void daNpc_zrA_c::createRuppi() {
     int item;
     if (cLib_getRndValue(0, 5) < 4) {
@@ -2424,7 +2374,6 @@ void daNpc_zrA_c::createRuppi() {
                           &angle, &scl, &speed_f, &speed_y, -1, 0, NULL);
 }
 
-/* 80B86FAC-80B872F0 00EB8C 0344+00 3/0 0/0 0/0 .text ECut_beforeBlastzrR__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_beforeBlastzrR(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -2514,8 +2463,6 @@ BOOL daNpc_zrA_c::ECut_beforeBlastzrR(int i_staffID) {
     return ret;
 }
 
-/* 80B872F0-80B87510 00EED0 0220+00 1/0 0/0 0/0 .text            ECut_afterBlastzrR__11daNpc_zrA_cFi
- */
 BOOL daNpc_zrA_c::ECut_afterBlastzrR(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -2576,8 +2523,6 @@ BOOL daNpc_zrA_c::ECut_afterBlastzrR(int i_staffID) {
     return ret;
 }
 
-/* 80B87510-80B88B04 00F0F0 15F4+00 1/0 0/0 0/0 .text            ECut_thanksBlast__11daNpc_zrA_cFi
- */
 BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -2911,7 +2856,6 @@ BOOL daNpc_zrA_c::ECut_thanksBlast(int i_staffID) {
     return ret;
 }
 
-/* 80B88B04-80B8A064 0106E4 1560+00 1/0 0/0 0/0 .text ECut_resultAnnounce__11daNpc_zrA_cFi */
 BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -3223,7 +3167,6 @@ BOOL daNpc_zrA_c::ECut_resultAnnounce(int i_staffID) {
     return ret;
 }
 
-/* 80B8A064-80B8A3CC 011C44 0368+00 3/3 0/0 0/0 .text            calcCanoeMove__11daNpc_zrA_cFi */
 void daNpc_zrA_c::calcCanoeMove(BOOL param_0) {
     csXyz angle;
     cXyz vec;
@@ -3274,7 +3217,6 @@ void daNpc_zrA_c::calcCanoeMove(BOOL param_0) {
         ->setPosAndAngle(&field_0x159c[2], angle.y + 0x8000);
 }
 
-/* 80B8A3CC-80B8A43C 011FAC 0070+00 1/1 0/0 0/0 .text            s_subMark__FPvPv */
 static void* s_subMark(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_ZRA_MARK) {
         daObjZraMark_c* zra_mark = static_cast<daObjZraMark_c*>(i_proc);
@@ -3286,7 +3228,6 @@ static void* s_subMark(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B8A43C-80B8A54C 01201C 0110+00 1/0 0/0 0/0 .text            tobiSearch__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobiSearch(void* param_0) {
     daObjZraMark_c* zra_mark;
     
@@ -3317,7 +3258,6 @@ BOOL daNpc_zrA_c::tobiSearch(void* param_0) {
     return true;
 }
 
-/* 80B8A54C-80B8A648 01212C 00FC+00 2/0 0/0 0/0 .text            tobiWait__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobiWait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3343,7 +3283,6 @@ BOOL daNpc_zrA_c::tobiWait(void* param_0) {
     return true;
 }
 
-/* 80B8A648-80B8A7F8 012228 01B0+00 2/0 0/0 0/0 .text            tobikomi1__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobikomi1(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3382,7 +3321,6 @@ BOOL daNpc_zrA_c::tobikomi1(void* param_0) {
     return true;
 }
 
-/* 80B8A7F8-80B8AA1C 0123D8 0224+00 2/0 0/0 0/0 .text            tobikomi2__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobikomi2(void* param_0) {
     f32 water_y;
 
@@ -3425,7 +3363,6 @@ BOOL daNpc_zrA_c::tobikomi2(void* param_0) {
     return true;
 }
 
-/* 80B8AA1C-80B8AB78 0125FC 015C+00 2/0 0/0 0/0 .text            tobikomi3__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobikomi3(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3457,7 +3394,6 @@ BOOL daNpc_zrA_c::tobikomi3(void* param_0) {
     return true;
 }
 
-/* 80B8AB78-80B8B1FC 012758 0684+00 2/0 0/0 0/0 .text            tobiJump__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobiJump(void* param_0) {
     cXyz swim_speed;
     csXyz angle;
@@ -3556,7 +3492,6 @@ BOOL daNpc_zrA_c::tobiJump(void* param_0) {
     return true;
 }
 
-/* 80B8B1FC-80B8B3A0 012DDC 01A4+00 3/0 0/0 0/0 .text            tobiEnd__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::tobiEnd(void* param_0) {
     cXyz swim_speed;
     s16 angle_step = HIO_PARAM(this).mSwimAngleSpeed;
@@ -3599,7 +3534,6 @@ BOOL daNpc_zrA_c::tobiEnd(void* param_0) {
     return true;
 }
 
-/* 80B8B3A0-80B8B420 012F80 0080+00 1/1 0/0 0/0 .text            s_subSP__FPvPv */
 static void* s_subSP(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_NPC_ZRA) {
         daNpc_zrA_c* other = static_cast<daNpc_zrA_c*>(i_proc);
@@ -3613,7 +3547,6 @@ static void* s_subSP(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B8B420-80B8B530 013000 0110+00 1/0 0/0 0/0 .text            waitSearch__11daNpc_zrA_cFPv */
 BOOL daNpc_zrA_c::waitSearch(void* param_0) {
     switch (mMode) {
     case 0:
@@ -3645,8 +3578,6 @@ BOOL daNpc_zrA_c::waitSearch(void* param_0) {
     return true;
 }
 
-/* 80B8B530-80B8BCE8 013110 07B8+00 1/0 0/0 0/0 .text            ECut_searchPrince1__11daNpc_zrA_cFi
- */
 BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -3789,8 +3720,6 @@ BOOL daNpc_zrA_c::ECut_searchPrince1(int i_staffID) {
     return ret;
 }
 
-/* 80B8BCE8-80B8C3E8 0138C8 0700+00 1/0 0/0 0/0 .text            ECut_searchPrince2__11daNpc_zrA_cFi
- */
 BOOL daNpc_zrA_c::ECut_searchPrince2(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp
index aafaac83b5..52dd101dd5 100644
--- a/src/d/actor/d_a_npc_zrc.cpp
+++ b/src/d/actor/d_a_npc_zrc.cpp
@@ -15,10 +15,8 @@ enum Event_Cut_Nums {
     /* 0x2 */ NUM_EVT_CUTS_e = 0x2,
 };
 
-/* 80B93C5C-80B93C60 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_zrC_Param_c l_HIO;
 
-/* 80B931FC-80B93270 000000 0074+00 15/15 0/0 0/0 .rodata          m__17daNpc_zrC_Param_c */
 daNpc_zrC_Param_c::param const daNpc_zrC_Param_c::m = {
     50.0f,    // mAttnOffsetY
     -3.0f,    // mGravity
@@ -56,13 +54,11 @@ daNpc_zrC_Param_c::param const daNpc_zrC_Param_c::m = {
     2300.0f,
 };
 
-/* 80B93708-80B93718 000020 0010+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {3, 3},   // zrc
     {3, 4},   // zrc_sick_tw
 };
 
-/* 80B93718-80B93818 000030 0100+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[32] = {
     {9, 0},   // zrc_f_wait_a
     {5, 2},   // zrc_f_sit_talk
@@ -98,7 +94,6 @@ static daNpc_GetParam1 l_bckGetParamList[32] = {
     {5, 5},   // zrc_sick_demo_wait
 };
 
-/* 80B93818-80B93890 000130 0078+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[15] = {
     {19, 0},  // zrc
     {10, 2},  // zrc_f_sit_talk
@@ -117,7 +112,6 @@ static daNpc_GetParam1 l_btpGetParamList[15] = {
     {8, 5},   // zrc_f_sick_demo_wait
 };
 
-/* 80B93890-80B938B8 0001A8 0028+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[5] = {
     {16, 0},  // zrc
     {26, 1},  // zrc_sad_talk
@@ -126,44 +120,36 @@ static daNpc_GetParam1 l_btkGetParamList[5] = {
     {25, 1},  // zrc_kizuku_wait
 };
 
-/* 80B938B8-80B938C8 0001D0 0010+00 0/2 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[2] = {
     {0, 0},
     {1, 6},
 };
 
-/* 80B938C8-80B938D0 -00001 0008+00 0/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[2] = {
     NULL,
     "EARRING_GET",
 };
 
-/* 80B938D0-80B938E4 0001E8 0014+00 1/0 0/0 0/0 .data            l_loadRes_ZRCa */
 static int l_loadRes_ZRCa[5] = {
     0, 3, -1, -1, 0,
 };
 
-/* 80B938E4-80B938F8 0001FC 0014+00 1/0 0/0 0/0 .data            l_loadRes_ZRC_SICK */
 static int l_loadRes_ZRC_SICK[5] = {
     3, 5, 0, -1, 0,
 };
 
-/* 80B938F8-80B9390C 000210 0014+00 1/0 0/0 0/0 .data            l_loadRes_ZRC0 */
 static int l_loadRes_ZRC0[5] = {
     0, 3, -1, -1, 0,
 };
 
-/* 80B9390C-80B93920 000224 0014+00 1/0 0/0 0/0 .data            l_loadRes_ZRC_PRAY */
 static int l_loadRes_ZRC_PRAY[5] = {
     0, 3, 1, 6, -1,
 };
 
-/* 80B93920-80B93934 000238 0014+00 1/0 0/0 0/0 .data            l_loadRes_ZRC_SIT */
 static int l_loadRes_ZRC_SIT[5] = {
     0, 2, 3, -1, 0,
 };
 
-/* 80B93934-80B93948 -00001 0014+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[5] = {
     l_loadRes_ZRCa,
     l_loadRes_ZRC_SICK,
@@ -172,7 +158,6 @@ static int* l_loadRes_list[5] = {
     l_loadRes_ZRC0,
 };
 
-/* 80B93948-80B93964 -00001 001C+00 6/9 0/0 0/0 .data            l_resNames */
 static char* l_resNames[7] = {
     "zrC",
     "zrC1",
@@ -183,26 +168,21 @@ static char* l_resNames[7] = {
     "zrC_EGD",
 };
 
-/* 80B93964-80B93968 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "zrC";
 
-/* 80B93968-80B93970 -00001 0008+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_zrC_c */
 char* daNpc_zrC_c::mEvtCutNameList[2] = {
     "",
     "EARRING_GET",
 };
 
-/* 80B9397C-80B93994 000294 0018+00 1/2 0/0 0/0 .data            mEvtCutList__11daNpc_zrC_c */
 daNpc_zrC_c::EventFn daNpc_zrC_c::mEvtCutList[2] = {
     NULL,
     &daNpc_zrC_c::ECut_earringGet,
 };
 
-/* 80B8DC0C-80B8DD90 0000EC 0184+00 1/1 0/0 0/0 .text            __ct__11daNpc_zrC_cFv */
 daNpc_zrC_c::daNpc_zrC_c() {
 }
 
-/* 80B8DE20-80B8E03C 000300 021C+00 1/0 0/0 0/0 .text            __dt__11daNpc_zrC_cFv */
 daNpc_zrC_c::~daNpc_zrC_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         int res = l_loadRes_list[mType][i];
@@ -217,7 +197,6 @@ daNpc_zrC_c::~daNpc_zrC_c() {
     }
 }
 
-/* 80B8E03C-80B8E338 00051C 02FC+00 1/1 0/0 0/0 .text            create__11daNpc_zrC_cFv */
 cPhs__Step daNpc_zrC_c::create() {
     fopAcM_ct(this, daNpc_zrC_c);
 
@@ -280,7 +259,6 @@ cPhs__Step daNpc_zrC_c::create() {
     }
 }
 
-/* 80B8E338-80B8E674 000818 033C+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_zrC_cFv */
 int daNpc_zrC_c::CreateHeap() {
     J3DModelData* model_data = NULL;
     u32 model_flag;
@@ -336,26 +314,21 @@ int daNpc_zrC_c::CreateHeap() {
     return 1;
 }
 
-/* 80B8E830-80B8E864 000D10 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_zrC_cFv */
 int daNpc_zrC_c::Delete() {
     this->~daNpc_zrC_c();
     return 1;
 }
 
-/* 80B8E864-80B8E884 000D44 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_zrC_cFv */
 int daNpc_zrC_c::Execute() {
     return execute();
 }
 
-/* 80B8E884-80B8E914 000D64 0090+00 1/1 0/0 0/0 .text            Draw__11daNpc_zrC_cFv */
 int daNpc_zrC_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     BOOL is_test = chkAction(&daNpc_zrC_c::test);
     return draw(is_test, true, daNpc_zrC_Param_c::m.mShadowDepth, NULL, false);
 }
 
-/* 80B8E914-80B8EB48 000DF4 0234+00 1/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_zrC_cFP8J3DJointP8J3DModel                */
 int daNpc_zrC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     int lookat_joints[3] = {1, 3, 4};
@@ -399,14 +372,10 @@ int daNpc_zrC_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B8EB48-80B8EB68 001028 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_zrC_cFP10fopAc_ac_c              */
 int daNpc_zrC_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_zrC_c*>(i_this)->CreateHeap();
 }
 
-/* 80B8EB68-80B8EBB4 001048 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_zrC_cFP8J3DJointi
- */
 int daNpc_zrC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daNpc_zrC_c* _this = (daNpc_zrC_c*)j3dSys.getModel()->getUserArea();
@@ -417,7 +386,6 @@ int daNpc_zrC_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B8EBB4-80B8ED94 001094 01E0+00 1/0 0/0 0/0 .text            setParam__11daNpc_zrC_cFv */
 void daNpc_zrC_c::setParam() {
     ActionFn action = mpNextActionFn;
     u32 attn_flags = 10;
@@ -473,7 +441,6 @@ void daNpc_zrC_c::setParam() {
     mAcchCir.SetWallH(daNpc_zrC_Param_c::m.mWallH);
 }
 
-/* 80B8ED94-80B8EF2C 001274 0198+00 1/0 0/0 0/0 .text            main__11daNpc_zrC_cFv */
 BOOL daNpc_zrC_c::main() {
     if (!doEvent()) {
         doNormalAction(TRUE);
@@ -508,7 +475,6 @@ BOOL daNpc_zrC_c::main() {
     return TRUE;
 }
 
-/* 80B8EF2C-80B8F00C 00140C 00E0+00 1/0 0/0 0/0 .text            ctrlBtk__11daNpc_zrC_cFv */
 BOOL daNpc_zrC_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -529,7 +495,6 @@ BOOL daNpc_zrC_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B8F00C-80B8F56C 0014EC 0560+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_zrC_cFv */
 void daNpc_zrC_c::setAttnPos() {
     static cXyz eyeOffset(10.0f, 10.0f, 0.0f);
     f32 offset = daNpc_zrC_Param_c::m.mAttnOffsetY;
@@ -611,8 +576,6 @@ void daNpc_zrC_c::setAttnPos() {
     mCcCyl.ClrTgHit();
 }
 
-/* 80B8F56C-80B8F898 001A4C 032C+00 2/0 0/0 0/0 .text            setExpressionAnm__11daNpc_zrC_cFib
- */
 bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* bck_anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -708,8 +671,6 @@ bool daNpc_zrC_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80B8F898-80B8F9CC 001D78 0134+00 2/0 0/0 0/0 .text            setExpressionBtp__11daNpc_zrC_cFi
- */
 bool daNpc_zrC_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btp_anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -767,7 +728,6 @@ bool daNpc_zrC_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80B8F9CC-80B8F9F8 001EAC 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_zrC_cFif */
 void daNpc_zrC_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 18) {
         mExpression = i_expression;
@@ -777,7 +737,6 @@ void daNpc_zrC_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80B8F9F8-80B8FBE4 001ED8 01EC+00 2/0 0/0 0/0 .text            setMotionAnm__11daNpc_zrC_cFif */
 void daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* bck_anm = NULL;
     J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -856,7 +815,6 @@ void daNpc_zrC_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80B8FBE4-80B8FC28 0020C4 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_zrC_cFifi */
 void daNpc_zrC_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if (i_restart || mMotion != motion) {
@@ -869,18 +827,14 @@ void daNpc_zrC_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80B8FC28-80B8FC30 002108 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_zrC_cFv */
 BOOL daNpc_zrC_c::drawDbgInfo() {
     return false;
 }
 
-/* 80B8FC30-80B8FC34 002110 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_zrC_cFv */
 void daNpc_zrC_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 80B8FC34-80B8FC8C 002114 0058+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_zrC_cFv
- */
 u8 daNpc_zrC_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xff) {
     case 0:
@@ -896,7 +850,6 @@ u8 daNpc_zrC_c::getTypeFromParam() {
     }
 }
 
-/* 80B8FC8C-80B8FD10 00216C 0084+00 1/1 0/0 0/0 .text            isDelete__11daNpc_zrC_cFv */
 int daNpc_zrC_c::isDelete() {
     if (mType == 4 || mType == 0 || mType == 1 || (mType == 2 && daNpcF_chkEvtBit(0x108)
         && !daNpcF_chkEvtBit(0x10A)) || mType == 3)
@@ -906,7 +859,6 @@ int daNpc_zrC_c::isDelete() {
     return true;
 }
 
-/* 80B8FD10-80B8FF14 0021F0 0204+00 1/1 0/0 0/0 .text            reset__11daNpc_zrC_cFv */
 void daNpc_zrC_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -944,7 +896,6 @@ void daNpc_zrC_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80B8FF14-80B904DC 0023F4 05C8+00 1/1 0/0 0/0 .text            playExpression__11daNpc_zrC_cFv */
 void daNpc_zrC_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_A, daNpc_zrC_Param_c::m.mMorfFrames, 1};
     daNpcF_anmPlayData dat0b = {ANM_F_WAIT_A, daNpc_zrC_Param_c::m.mMorfFrames, 0};
@@ -1001,7 +952,6 @@ void daNpc_zrC_c::playExpression() {
     }
 }
 
-/* 80B904DC-80B90940 0029BC 0464+00 1/1 0/0 0/0 .text            playMotion__11daNpc_zrC_cFv */
 void daNpc_zrC_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_A, daNpc_zrC_Param_c::m.mMorfFrames, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1047,7 +997,6 @@ void daNpc_zrC_c::playMotion() {
     }
 }
 
-/* 80B90940-80B90A6C 002E20 012C+00 1/1 0/0 0/0 .text            playMotionAnm2__11daNpc_zrC_cFPPPQ28daNpcF_c18daNpcF_anmPlayData */
 void daNpc_zrC_c::playMotionAnm2(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     f32 morf;
     daNpcF_anmPlayData* playData = NULL;
@@ -1080,13 +1029,10 @@ void daNpc_zrC_c::playMotionAnm2(daNpcF_c::daNpcF_anmPlayData*** i_data) {
     mMotionPrevPhase = mMotionPhase;
 }
 
-/* 80B90A6C-80B90A98 002F4C 002C+00 2/2 0/0 0/0 .text            chkAction__11daNpc_zrC_cFM11daNpc_zrC_cFPCvPvPv_i */
 BOOL daNpc_zrC_c::chkAction(ActionFn i_action) {
     return mpActionFn == i_action;
 }
 
-/* 80B90A98-80B90B40 002F78 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_zrC_cFM11daNpc_zrC_cFPCvPvPv_i            */
 BOOL daNpc_zrC_c::setAction(ActionFn i_action) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -1100,7 +1046,6 @@ BOOL daNpc_zrC_c::setAction(ActionFn i_action) {
     return TRUE;
 }
 
-/* 80B90B40-80B90C34 003020 00F4+00 1/1 0/0 0/0 .text            selectAction__11daNpc_zrC_cFv */
 BOOL daNpc_zrC_c::selectAction() {
     mpNextActionFn = NULL;
     if (daNpc_zrC_Param_c::m.mTest) {
@@ -1124,7 +1069,6 @@ BOOL daNpc_zrC_c::selectAction() {
     return TRUE;
 }
 
-/* 80B90C34-80B90D48 003114 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_zrC_cFi */
 void daNpc_zrC_c::doNormalAction(BOOL param_0) {
     if (param_0 && hitChk2(&mCcCyl, TRUE, FALSE)) {
         int damage_timer;
@@ -1150,7 +1094,6 @@ void daNpc_zrC_c::doNormalAction(BOOL param_0) {
     }
 }
 
-/* 80B90D48-80B9113C 003228 03F4+00 1/1 0/0 0/0 .text            doEvent__11daNpc_zrC_cFv */
 BOOL daNpc_zrC_c::doEvent() {
     dEvent_manager_c* event_mgr = NULL;
     BOOL ret = 0;
@@ -1247,14 +1190,12 @@ BOOL daNpc_zrC_c::doEvent() {
     return ret;
 }
 
-/* 80B9113C-80B91160 00361C 0024+00 9/9 0/0 0/0 .text            setLookMode__11daNpc_zrC_cFi */
 void daNpc_zrC_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 6 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80B91160-80B91418 003640 02B8+00 1/1 0/0 0/0 .text            lookat__11daNpc_zrC_cFv */
 void daNpc_zrC_c::lookat() {
     fopAc_ac_c* attn_actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1313,7 +1254,6 @@ void daNpc_zrC_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80B91418-80B914F4 0038F8 00DC+00 2/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_zrC_cFv */
 void daNpc_zrC_c::setExpressionTalkAfter() {
     switch (mExpression) {
     case EXPR_SIT_TALK:
@@ -1338,7 +1278,6 @@ void daNpc_zrC_c::setExpressionTalkAfter() {
     }
 }
 
-/* 80B914F4-80B916FC 0039D4 0208+00 1/0 0/0 0/0 .text            wait__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1399,7 +1338,6 @@ BOOL daNpc_zrC_c::wait(void* param_0) {
     return TRUE;
 }
 
-/* 80B916FC-80B91808 003BDC 010C+00 1/0 0/0 0/0 .text            waitSick__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::waitSick(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1425,7 +1363,6 @@ BOOL daNpc_zrC_c::waitSick(void* param_0) {
     return TRUE;
 }
 
-/* 80B91808-80B91F78 003CE8 0770+00 1/0 0/0 0/0 .text            waitPray__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::waitPray(void* param_0) {
     f32 player_dist = (daPy_getPlayerActorClass()->current.pos - current.pos).absXZ();
 
@@ -1543,7 +1480,6 @@ BOOL daNpc_zrC_c::waitPray(void* param_0) {
     return TRUE;
 }
 
-/* 80B91F78-80B920EC 004458 0174+00 1/0 0/0 0/0 .text            waitThrone__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::waitThrone(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1590,7 +1526,6 @@ BOOL daNpc_zrC_c::waitThrone(void* param_0) {
     return TRUE;
 }
 
-/* 80B920EC-80B922D8 0045CC 01EC+00 2/0 0/0 0/0 .text            talk__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::talk(void* param_0) {
     BOOL ret = FALSE;
     BOOL talk = FALSE;
@@ -1647,7 +1582,6 @@ BOOL daNpc_zrC_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80B922D8-80B923BC 0047B8 00E4+00 2/0 0/0 0/0 .text            test__11daNpc_zrC_cFPv */
 BOOL daNpc_zrC_c::test(void* param_0) {
     switch (mMode) {
     case 0:
@@ -1673,7 +1607,6 @@ BOOL daNpc_zrC_c::test(void* param_0) {
     return TRUE;
 }
 
-/* 80B923BC-80B9286C 00489C 04B0+00 1/0 0/0 0/0 .text            ECut_earringGet__11daNpc_zrC_cFi */
 BOOL daNpc_zrC_c::ECut_earringGet(int i_staffID) {
     dEvent_manager_c& event_mgr = dComIfGp_getEventManager();
     BOOL ret = FALSE;
@@ -1806,34 +1739,28 @@ BOOL daNpc_zrC_c::ECut_earringGet(int i_staffID) {
     return ret;
 }
 
-/* 80B9286C-80B9288C 004D4C 0020+00 1/0 0/0 0/0 .text            daNpc_zrC_Create__FPv */
 static cPhs__Step daNpc_zrC_Create(void* i_this) {
     return static_cast<daNpc_zrC_c*>(i_this)->create();
 }
 
-/* 80B9288C-80B928AC 004D6C 0020+00 1/0 0/0 0/0 .text            daNpc_zrC_Delete__FPv */
 static int daNpc_zrC_Delete(void* i_this) {
     return static_cast<daNpc_zrC_c*>(i_this)->Delete();
 }
 
-/* 80B928AC-80B928CC 004D8C 0020+00 1/0 0/0 0/0 .text            daNpc_zrC_Execute__FPv */
 static int daNpc_zrC_Execute(void* i_this) {
     return static_cast<daNpc_zrC_c*>(i_this)->Execute();
 }
 
-/* 80B928CC-80B928EC 004DAC 0020+00 1/0 0/0 0/0 .text            daNpc_zrC_Draw__FPv */
 static int daNpc_zrC_Draw(void* i_this) {
     return static_cast<daNpc_zrC_c*>(i_this)->Draw();
 }
 
-/* 80B928EC-80B928F4 004DCC 0008+00 1/0 0/0 0/0 .text            daNpc_zrC_IsDelete__FPv */
 static int daNpc_zrC_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES
 
-/* 80B93AD4-80B93AF4 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_zrC_MethodTable */
 static actor_method_class daNpc_zrC_MethodTable = {
     (process_method_func)daNpc_zrC_Create,
     (process_method_func)daNpc_zrC_Delete,
@@ -1842,7 +1769,6 @@ static actor_method_class daNpc_zrC_MethodTable = {
     (process_method_func)daNpc_zrC_Draw,
 };
 
-/* 80B93AF4-80B93B24 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZRC */
 extern actor_process_profile_definition g_profile_NPC_ZRC = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp
index 8902c20186..4efb47ccc3 100644
--- a/src/d/actor/d_a_npc_zrz.cpp
+++ b/src/d/actor/d_a_npc_zrz.cpp
@@ -13,10 +13,8 @@
 #include "d/actor/d_a_obj_zra_rock.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80B9B8B4-80B9B8B8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daNpc_zrZ_Param_c l_HIO;
 
-/* 80B9AFEC-80B9B070 000000 0084+00 22/22 0/0 0/0 .rodata          m__17daNpc_zrZ_Param_c */
 daNpc_zrZ_Param_c::param const daNpc_zrZ_Param_c::m = {
     700.0f,   // mAttnOffsetY
     0.0f,     // mGravity
@@ -58,17 +56,14 @@ daNpc_zrZ_Param_c::param const daNpc_zrZ_Param_c::m = {
     200.0f,
 };
 
-/* 80B9B2A4-80B9B2AC 000020 0008+00 0/1 0/0 0/0 .data            l_bmdGetParamList */
 static daNpc_GetParam1 l_bmdGetParamList[1] = {
     {9, 0},
 };
 
-/* 80B9B2AC-80B9B2B4 000028 0008+00 0/1 0/0 0/0 .data            l_bmdGTGetParamList */
 static daNpc_GetParam1 l_bmdGTGetParamList[1] = {
     {13, 1},  // gt
 };
 
-/* 80B9B2B4-80B9B2DC 000030 0028+00 0/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[5] = {
     {-1, 0},
     {-1, 0},
@@ -77,7 +72,6 @@ static daNpc_GetParam1 l_bckGetParamList[5] = {
     {0, 0},
 };
 
-/* 80B9B2DC-80B9B304 000058 0028+00 0/2 0/0 0/0 .data            l_bckGTGetParamList */
 static daNpc_GetParam1 l_bckGTGetParamList[5] = {
     {-1, 1},
     {8, 1},   // f_talk_a
@@ -86,27 +80,22 @@ static daNpc_GetParam1 l_bckGTGetParamList[5] = {
     {7, 1},   // comeon
 };
 
-/* 80B9B304-80B9B30C 000080 0008+00 0/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[1] = {
     {15, 0},
 };
 
-/* 80B9B30C-80B9B314 000088 0008+00 0/1 0/0 0/0 .data            l_btpGTGetParamList */
 static daNpc_GetParam1 l_btpGTGetParamList[1] = {
     {19, 1},  // gt
 };
 
-/* 80B9B314-80B9B31C 000090 0008+00 0/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[1] = {
     {12, 0},
 };
 
-/* 80B9B31C-80B9B324 000098 0008+00 0/2 0/0 0/0 .data            l_btkGTGetParamList */
 static daNpc_GetParam1 l_btkGTGetParamList[1] = {
     {16, 1},  // gt
 };
 
-/* 80B9B324-80B9B364 0000A0 0040+00 0/1 0/0 0/0 .data            l_evtGetParamList */
 static daNpc_GetParam1 l_evtGetParamList[8] = {
     {0, 0},
     {1, 1},
@@ -118,29 +107,23 @@ static daNpc_GetParam1 l_evtGetParamList[8] = {
     {7, 1},
 };
 
-/* 80B9B364-80B9B370 0000E0 000C+00 1/0 0/0 0/0 .data            l_loadRes_ZRZa */
 static int l_loadRes_ZRZa[3] = {0, -1, -1};
 
-/* 80B9B370-80B9B37C 0000EC 000C+00 1/0 0/0 0/0 .data            l_loadRes_ZRZ_GT */
 static int l_loadRes_ZRZ_GT[3] = {1, -1, -1};
 
-/* 80B9B37C-80B9B388 0000F8 000C+00 1/0 0/0 0/0 .data            l_loadRes_ZRZ0 */
 static int l_loadRes_ZRZ0[3] = {0, -1, -1};
 
-/* 80B9B388-80B9B394 -00001 000C+00 2/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[3] = {
     l_loadRes_ZRZa,
     l_loadRes_ZRZ_GT,
     l_loadRes_ZRZ0,
 };
 
-/* 80B9B394-80B9B39C -00001 0008+00 2/8 0/0 0/0 .data            l_resNames */
 static char* l_resNames[2] = {
     "zrZ",
     "zrZ_GT",
 };
 
-/* 80B9B39C-80B9B3BC -00001 0020+00 1/2 0/0 0/0 .data            l_evtNames */
 static char* l_evtNames[8] = {
     NULL,
     "HELP_PRINCE",
@@ -152,10 +135,8 @@ static char* l_evtNames[8] = {
     "SR_SKIP",
 };
 
-/* 80B9B3BC-80B9B3C0 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "zrZ";
 
-/* 80B9B3C0-80B9B3E0 -00001 0020+00 0/1 0/0 0/0 .data            mEvtCutNameList__11daNpc_zrZ_c */
 char* daNpc_zrZ_c::mEvtCutNameList[8] = {
     "",
     "HELP_PRINCE",
@@ -167,7 +148,6 @@ char* daNpc_zrZ_c::mEvtCutNameList[8] = {
     "SR_SKIP",
 };
 
-/* 80B9B434-80B9B494 0001B0 0060+00 0/2 0/0 0/0 .data            mEvtCutList__11daNpc_zrZ_c */
 daNpc_zrZ_c::EventFn daNpc_zrZ_c::mEvtCutList[8] = {
     NULL,
     &daNpc_zrZ_c::ECut_helpPrince,
@@ -179,12 +159,10 @@ daNpc_zrZ_c::EventFn daNpc_zrZ_c::mEvtCutList[8] = {
     &daNpc_zrZ_c::ECut_srSkip,
 };
 
-/* 80B93DCC-80B93F84 0000EC 01B8+00 1/1 0/0 0/0 .text            __ct__11daNpc_zrZ_cFv */
 daNpc_zrZ_c::daNpc_zrZ_c() {
     /* empty function */
 }
 
-/* 80B94014-80B9423C 000334 0228+00 1/0 0/0 0/0 .text            __dt__11daNpc_zrZ_cFv */
 daNpc_zrZ_c::~daNpc_zrZ_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhase[i], l_resNames[l_loadRes_list[mType][i]]);
@@ -195,7 +173,6 @@ daNpc_zrZ_c::~daNpc_zrZ_c() {
     }
 }
 
-/* 80B9423C-80B9453C 00055C 0300+00 1/1 0/0 0/0 .text            create__11daNpc_zrZ_cFv */
 cPhs__Step daNpc_zrZ_c::create() {
     fopAcM_ct(this, daNpc_zrZ_c);
 
@@ -257,7 +234,6 @@ cPhs__Step daNpc_zrZ_c::create() {
     }
 }
 
-/* 80B9453C-80B94838 00085C 02FC+00 1/1 0/0 0/0 .text            CreateHeap__11daNpc_zrZ_cFv */
 int daNpc_zrZ_c::CreateHeap() {
     J3DModelData* model_data = NULL;
     if (mType == 1) {
@@ -307,18 +283,15 @@ int daNpc_zrZ_c::CreateHeap() {
     return 1;
 }
 
-/* 80B949F4-80B94A28 000D14 0034+00 1/1 0/0 0/0 .text            Delete__11daNpc_zrZ_cFv */
 int daNpc_zrZ_c::Delete() {
     this->~daNpc_zrZ_c();
     return 1;
 }
 
-/* 80B94A28-80B94A48 000D48 0020+00 2/2 0/0 0/0 .text            Execute__11daNpc_zrZ_cFv */
 int daNpc_zrZ_c::Execute() {
     return execute();
 }
 
-/* 80B94A48-80B94B34 000D68 00EC+00 1/1 0/0 0/0 .text            Draw__11daNpc_zrZ_cFv */
 int daNpc_zrZ_c::Draw() {
     mAnm_p->getModel()->getModelData()->getMaterialNodePointer(1)->setMaterialAnm(mpMatAnm);
     if (mType == 1) {
@@ -329,7 +302,6 @@ int daNpc_zrZ_c::Draw() {
     }
 }
 
-/* 80B94B34-80B94E18 000E54 02E4+00 1/1 0/0 0/0 .text draw__11daNpc_zrZ_cFiifP11_GXColorS10i */
 int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10* i_fogColor,
                       int i_hideDamage) {
     f32 damage_ratio, frame;
@@ -408,8 +380,6 @@ int daNpc_zrZ_c::draw(int i_isTest, int param_1, f32 i_shadowDepth, _GXColorS10*
     return 1;
 }
 
-/* 80B94E18-80B950F4 001138 02DC+00 2/1 0/0 0/0 .text
- * ctrlJoint__11daNpc_zrZ_cFP8J3DJointP8J3DModel                */
 int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     int lookat_joints[3] = {1, 3, 4};
@@ -477,14 +447,10 @@ int daNpc_zrZ_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80B950F4-80B95114 001414 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daNpc_zrZ_cFP10fopAc_ac_c              */
 int daNpc_zrZ_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daNpc_zrZ_c*>(i_this)->CreateHeap();
 }
 
-/* 80B95114-80B95160 001434 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__11daNpc_zrZ_cFP8J3DJointi
- */
 int daNpc_zrZ_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         daNpc_zrZ_c* _this = (daNpc_zrZ_c*)j3dSys.getModel()->getUserArea();
@@ -495,7 +461,6 @@ int daNpc_zrZ_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80B95160-80B951AC 001480 004C+00 3/3 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_GraveStone) {
         return i_proc;
@@ -503,7 +468,6 @@ static void* s_sub(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B951AC-80B951F8 0014CC 004C+00 1/1 0/0 0/0 .text            s_subCloth__FPvPv */
 static void* s_subCloth(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZoraCloth) {
         return i_proc;
@@ -511,7 +475,6 @@ static void* s_subCloth(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B951F8-80B95244 001518 004C+00 1/1 0/0 0/0 .text            s_subRock__FPvPv */
 static void* s_subRock(void* i_proc, void* i_this) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_ZraRock) {
         return i_proc;
@@ -519,7 +482,6 @@ static void* s_subRock(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80B95244-80B953CC 001564 0188+00 1/0 0/0 0/0 .text            setParam__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::setParam() {
     ActionFn action = mpNextActionFn;
     u32 attn_flags = 10;
@@ -555,7 +517,6 @@ void daNpc_zrZ_c::setParam() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_ZRZ_MV, uvar4, -1);
 }
 
-/* 80B953CC-80B95598 0016EC 01CC+00 1/0 0/0 0/0 .text            main__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::main() {
     if (!doEvent()) {
         doNormalAction(1);
@@ -598,7 +559,6 @@ BOOL daNpc_zrZ_c::main() {
     return TRUE;
 }
 
-/* 80B95598-80B956B4 0018B8 011C+00 1/1 0/0 0/0 .text            ctrlBtk__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -626,7 +586,6 @@ BOOL daNpc_zrZ_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80B956B4-80B95BB8 0019D4 0504+00 1/0 0/0 0/0 .text            setAttnPos__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::setAttnPos() {
     static cXyz eyeOffset(-10.0f, 10.0f, 0.0f);
     f32 offset = daNpc_zrZ_Param_c::m.mAttnOffsetY;
@@ -702,7 +661,6 @@ void daNpc_zrZ_c::setAttnPos() {
     }
 }
 
-/* 80B95BB8-80B95C6C 001ED8 00B4+00 1/0 0/0 0/0 .text            setMtx__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::setMtx() {
     J3DModel* model = mAnm_p->getModel();
     cXyz pos = current.pos;
@@ -721,8 +679,6 @@ void daNpc_zrZ_c::setMtx() {
     }
 }
 
-/* 80B95C6C-80B95DD0 001F8C 0164+00 1/0 0/0 0/0 .text            setExpressionAnm__11daNpc_zrZ_cFib
- */
 bool daNpc_zrZ_c::setExpressionAnm(int i_idx, bool i_modify) {
     J3DAnmTransform* bck_anm = NULL;
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
@@ -767,8 +723,6 @@ bool daNpc_zrZ_c::setExpressionAnm(int i_idx, bool i_modify) {
     return false;
 }
 
-/* 80B95DD0-80B95F10 0020F0 0140+00 1/0 0/0 0/0 .text            setExpressionBtp__11daNpc_zrZ_cFi
- */
 bool daNpc_zrZ_c::setExpressionBtp(int i_idx) {
     J3DAnmTexPattern* btp_anm = NULL;
     int attr = J3DFrameCtrl::EMode_NONE;
@@ -810,7 +764,6 @@ bool daNpc_zrZ_c::setExpressionBtp(int i_idx) {
     return false;
 }
 
-/* 80B95F10-80B95F3C 002230 002C+00 1/0 0/0 0/0 .text            setExpression__11daNpc_zrZ_cFif */
 void daNpc_zrZ_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 2) {
         mExpression = i_expression;
@@ -820,7 +773,6 @@ void daNpc_zrZ_c::setExpression(int i_expression, f32 i_morf) {
     }
 }
 
-/* 80B95F3C-80B9612C 00225C 01F0+00 1/0 0/0 0/0 .text            setMotionAnm__11daNpc_zrZ_cFif */
 void daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
     J3DAnmTransformKey* bck_anm = NULL;
     J3DAnmTextureSRTKey* btk_anm = NULL;
@@ -874,7 +826,6 @@ void daNpc_zrZ_c::setMotionAnm(int i_idx, f32 i_morf) {
     }
 }
 
-/* 80B9612C-80B96170 00244C 0044+00 1/0 0/0 0/0 .text            setMotion__11daNpc_zrZ_cFifi */
 void daNpc_zrZ_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if (i_restart || mMotion != motion) {
@@ -887,18 +838,14 @@ void daNpc_zrZ_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80B96170-80B96178 002490 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::drawDbgInfo() {
     return false;
 }
 
-/* 80B96178-80B9617C 002498 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 80B9617C-80B961B4 00249C 0038+00 1/1 0/0 0/0 .text            getTypeFromParam__11daNpc_zrZ_cFv
- */
 u8 daNpc_zrZ_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xff) {
     case 0:
@@ -910,7 +857,6 @@ u8 daNpc_zrZ_c::getTypeFromParam() {
     }
 }
 
-/* 80B961B4-80B96268 0024D4 00B4+00 1/1 0/0 0/0 .text            isDelete__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::isDelete() {
     if (((mDemoMode == DEMO_COME_HERE || mDemoMode == DEMO_WAIT)
                     && dComIfGs_isSwitch(mSwitch1, fopAcM_GetRoomNo(this)))
@@ -923,7 +869,6 @@ BOOL daNpc_zrZ_c::isDelete() {
     }
 }
 
-/* 80B96268-80B9652C 002588 02C4+00 1/1 0/0 0/0 .text            reset__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -988,7 +933,6 @@ void daNpc_zrZ_c::reset() {
     field_0x9ee = true;
 }
 
-/* 80B9652C-80B96618 00284C 00EC+00 1/1 0/0 0/0 .text            playExpression__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::playExpression() {
     daNpcF_anmPlayData dat0a = {ANM_F_TALK_A, daNpc_zrZ_Param_c::m.mMorfFrames, 1};
     daNpcF_anmPlayData dat0b = {ANM_NONE, daNpc_zrZ_Param_c::m.mMorfFrames, 0};
@@ -1003,7 +947,6 @@ void daNpc_zrZ_c::playExpression() {
     }
 }
 
-/* 80B96618-80B96740 002938 0128+00 1/1 0/0 0/0 .text            playMotion__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::playMotion() {
     daNpcF_anmPlayData dat0 = {ANM_WAIT_GT_A, daNpc_zrZ_Param_c::m.mMorfFrames, 0};
     daNpcF_anmPlayData* pDat0[1] = {&dat0};
@@ -1020,14 +963,10 @@ void daNpc_zrZ_c::playMotion() {
     }
 }
 
-/* 80B96740-80B9676C 002A60 002C+00 2/2 0/0 0/0 .text
- * chkAction__11daNpc_zrZ_cFM11daNpc_zrZ_cFPCvPvPv_i            */
 BOOL daNpc_zrZ_c::chkAction(ActionFn i_action) {
     return mpActionFn == i_action;
 }
 
-/* 80B9676C-80B96814 002A8C 00A8+00 2/2 0/0 0/0 .text
- * setAction__11daNpc_zrZ_cFM11daNpc_zrZ_cFPCvPvPv_i            */
 BOOL daNpc_zrZ_c::setAction(ActionFn i_action) {
     mMode = 3;
     if (mpActionFn != NULL) {
@@ -1041,7 +980,6 @@ BOOL daNpc_zrZ_c::setAction(ActionFn i_action) {
     return true;
 }
 
-/* 80B96814-80B968E0 002B34 00CC+00 1/1 0/0 0/0 .text            selectAction__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::selectAction() {
     mpNextActionFn = NULL;
     if (daNpc_zrZ_Param_c::m.mTest) {
@@ -1062,7 +1000,6 @@ BOOL daNpc_zrZ_c::selectAction() {
     return true;
 }
 
-/* 80B968E0-80B969F4 002C00 0114+00 1/1 0/0 0/0 .text            doNormalAction__11daNpc_zrZ_cFi */
 void daNpc_zrZ_c::doNormalAction(BOOL param_0) {
     if (param_0 && hitChk2(&mCcCyl, true, false)) {
         int timer;
@@ -1090,7 +1027,6 @@ void daNpc_zrZ_c::doNormalAction(BOOL param_0) {
     }
 }
 
-/* 80B969F4-80B96DF0 002D14 03FC+00 1/1 0/0 0/0 .text            doEvent__11daNpc_zrZ_cFv */
 BOOL daNpc_zrZ_c::doEvent() {
     BOOL ret = false;
 
@@ -1199,7 +1135,6 @@ BOOL daNpc_zrZ_c::doEvent() {
     return ret;
 }
 
-/* 80B96DF0-80B96E7C 003110 008C+00 1/1 0/0 0/0 .text            setSkipZev__11daNpc_zrZ_cFii */
 BOOL daNpc_zrZ_c::setSkipZev(int i_idx1, int i_idx2) {
     if (!strcmp(dComIfGp_getEventManager().getRunEventName(), l_evtNames[i_idx1])) {
         dComIfGp_getEvent().setSkipZev(this, l_evtNames[i_idx2]);
@@ -1208,14 +1143,12 @@ BOOL daNpc_zrZ_c::setSkipZev(int i_idx1, int i_idx2) {
     return false;
 }
 
-/* 80B96E7C-80B96EA0 00319C 0024+00 11/11 0/0 0/0 .text            setLookMode__11daNpc_zrZ_cFi */
 void daNpc_zrZ_c::setLookMode(int i_lookMode) {
     if (i_lookMode >= 0 && i_lookMode < 5 && i_lookMode != mLookMode) {
         mLookMode = i_lookMode;
     }
 }
 
-/* 80B96EA0-80B97128 0031C0 0288+00 1/1 0/0 0/0 .text            lookat__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::lookat() {
     fopAc_ac_c* attn_actor = NULL;
     J3DModel* model = mAnm_p->getModel();
@@ -1268,12 +1201,10 @@ void daNpc_zrZ_c::lookat() {
     mLookat.calc(this, model->getBaseTRMtx(), lookat_angle, snap, angle_delta, false);
 }
 
-/* 80B97128-80B97160 003448 0038+00 1/1 0/0 0/0 .text setExpressionTalkAfter__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::setExpressionTalkAfter() {
     setExpression(EXPR_NONE, -1.0f);
 }
 
-/* 80B97160-80B971BC 003480 005C+00 1/1 0/0 0/0 .text            lightReady__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::lightReady() {
     setLightPos();
     mLight.mColor.r = 0;
@@ -1285,7 +1216,6 @@ void daNpc_zrZ_c::lightReady() {
     mUseLightEffect = false;
 }
 
-/* 80B971BC-80B9723C 0034DC 0080+00 1/1 0/0 0/0 .text            setLightPos__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::setLightPos() {
     fopAc_ac_c* gravestone = (fopAc_ac_c*)fpcM_Search(s_sub, this);
     if (gravestone != NULL) {
@@ -1296,7 +1226,6 @@ void daNpc_zrZ_c::setLightPos() {
     }
 }
 
-/* 80B9723C-80B972EC 00355C 00B0+00 1/1 0/0 0/0 .text            lightPowerCalc__11daNpc_zrZ_cFi */
 void daNpc_zrZ_c::lightPowerCalc(int param_0) {
     if (param_0 == 30) {
         mLight.mPow = (50 - mEventTimer) * 70.0f / 50.0f;
@@ -1307,7 +1236,6 @@ void daNpc_zrZ_c::lightPowerCalc(int param_0) {
     }
 }
 
-/* 80B972EC-80B974BC 00360C 01D0+00 1/1 0/0 0/0 .text            lightColorProc__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::lightColorProc() {
     static int const key_frame[4] = {
         0, 50, 190, 220,
@@ -1349,12 +1277,10 @@ void daNpc_zrZ_c::lightColorProc() {
     cLib_chaseS(&mLight.mColor.b, key_color[next].b, color.b);
 }
 
-/* 80B9B1B8-80B9B1C0 0001CC 0008+00 0/0 0/0 0/0 .rodata          @5782 */
 static u8 const lit_5782[8] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 };
 
-/* 80B974BC-80B97B78 0037DC 06BC+00 2/0 0/0 0/0 .text            ECut_helpPrince__11daNpc_zrZ_cFi */
 BOOL daNpc_zrZ_c::ECut_helpPrince(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1613,7 +1539,6 @@ BOOL daNpc_zrZ_c::ECut_helpPrince(int i_staffID) {
     return ret;
 }
 
-/* 80B97B78-80B97D7C 003E98 0204+00 1/0 0/0 0/0 .text            ECut_comeHere__11daNpc_zrZ_cFi */
 BOOL daNpc_zrZ_c::ECut_comeHere(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1668,8 +1593,6 @@ BOOL daNpc_zrZ_c::ECut_comeHere(int i_staffID) {
     return ret;
 }
 
-/* 80B97D7C-80B97EB4 00409C 0138+00 1/0 0/0 0/0 .text            ECut_restoreLink__11daNpc_zrZ_cFi
- */
 BOOL daNpc_zrZ_c::ECut_restoreLink(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1711,7 +1634,6 @@ BOOL daNpc_zrZ_c::ECut_restoreLink(int i_staffID) {
     return ret;
 }
 
-/* 80B97EB4-80B98540 0041D4 068C+00 1/0 0/0 0/0 .text            ECut_clothesGet__11daNpc_zrZ_cFi */
 BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1918,7 +1840,6 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) {
     return ret;
 }
 
-/* 80B98540-80B9877C 004860 023C+00 1/0 0/0 0/0 .text            ECut_getAfter__11daNpc_zrZ_cFi */
 BOOL daNpc_zrZ_c::ECut_getAfter(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -1990,8 +1911,6 @@ BOOL daNpc_zrZ_c::ECut_getAfter(int i_staffID) {
     return ret;
 }
 
-/* 80B9877C-80B98ACC 004A9C 0350+00 1/0 0/0 0/0 .text            ECut_sealRelease__11daNpc_zrZ_cFi
- */
 BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     BOOL ret = false;
@@ -2075,7 +1994,6 @@ BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) {
     return ret;
 }
 
-/* 80B98ACC-80B98C34 004DEC 0168+00 1/0 0/0 0/0 .text            ECut_srSkip__11daNpc_zrZ_cFi */
 BOOL daNpc_zrZ_c::ECut_srSkip(int i_staffID) {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int prm = -1;
@@ -2106,7 +2024,6 @@ BOOL daNpc_zrZ_c::ECut_srSkip(int i_staffID) {
     return true;
 }
 
-/* 80B98C34-80B98D04 004F54 00D0+00 1/1 0/0 0/0 .text            pullbackPlayer__11daNpc_zrZ_cFf */
 void daNpc_zrZ_c::pullbackPlayer(f32 param_0) {
     cXyz pos = mPath.getPntPos(mPath.getBeforeIdx());
     pos.y += 1000.0f;
@@ -2117,7 +2034,6 @@ void daNpc_zrZ_c::pullbackPlayer(f32 param_0) {
     daPy_getPlayerActorClass()->setPlayerPosAndAngle(&pos, angle_y, 0);
 }
 
-/* 80B98D04-80B98F84 005024 0280+00 2/0 0/0 0/0 .text            wait__11daNpc_zrZ_cFPv */
 BOOL daNpc_zrZ_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2186,7 +2102,6 @@ BOOL daNpc_zrZ_c::wait(void* param_0) {
     return true;
 }
 
-/* 80B98F84-80B998BC 0052A4 0938+00 1/0 0/0 0/0 .text            comeHere__11daNpc_zrZ_cFPv */
 BOOL daNpc_zrZ_c::comeHere(void* param_0) {
     cXyz player_pos = daPy_getPlayerActorClass()->current.pos;
     cXyz pnt_pos = mPath.getPntPos(mPath.getIdx());
@@ -2282,7 +2197,6 @@ BOOL daNpc_zrZ_c::comeHere(void* param_0) {
     return true;
 }
 
-/* 80B998BC-80B9A0EC 005BDC 0830+00 1/0 0/0 0/0 .text            comeHere2__11daNpc_zrZ_cFPv */
 BOOL daNpc_zrZ_c::comeHere2(void* param_0) {
     switch (mMode) {
     case 0: {
@@ -2383,7 +2297,6 @@ BOOL daNpc_zrZ_c::comeHere2(void* param_0) {
     return true;
 }
 
-/* 80B9A0EC-80B9A29C 00640C 01B0+00 2/0 0/0 0/0 .text            talk__11daNpc_zrZ_cFPv */
 BOOL daNpc_zrZ_c::talk(void* param_0) {
     BOOL ret = false;
     BOOL talk = false;
@@ -2434,7 +2347,6 @@ BOOL daNpc_zrZ_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80B9A29C-80B9A380 0065BC 00E4+00 3/0 0/0 0/0 .text            test__11daNpc_zrZ_cFPv */
 BOOL daNpc_zrZ_c::test(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2460,7 +2372,6 @@ BOOL daNpc_zrZ_c::test(void* param_0) {
     return true;
 }
 
-/* 80B9A380-80B9A504 0066A0 0184+00 1/1 0/0 0/0 .text            himoCalc__11daNpc_zrZ_cFv */
 void daNpc_zrZ_c::himoCalc() {
     cXyz vec1 = current.pos;
     vec1.y += 470.0f;
@@ -2482,34 +2393,28 @@ void daNpc_zrZ_c::himoCalc() {
     mLimbAngle.z = cM_atan2s(mLimbCalcRelPos.z, mLimbCalcRelPos.x);
 }
 
-/* 80B9A504-80B9A524 006824 0020+00 1/0 0/0 0/0 .text            daNpc_zrZ_Create__FPv */
 static cPhs__Step daNpc_zrZ_Create(void* i_this) {
     return static_cast<daNpc_zrZ_c*>(i_this)->create();
 }
 
-/* 80B9A524-80B9A544 006844 0020+00 1/0 0/0 0/0 .text            daNpc_zrZ_Delete__FPv */
 static int daNpc_zrZ_Delete(void* i_this) {
     return static_cast<daNpc_zrZ_c*>(i_this)->Delete();
 }
 
-/* 80B9A544-80B9A564 006864 0020+00 1/0 0/0 0/0 .text            daNpc_zrZ_Execute__FPv */
 static int daNpc_zrZ_Execute(void* i_this) {
     return static_cast<daNpc_zrZ_c*>(i_this)->Execute();
 }
 
-/* 80B9A564-80B9A584 006884 0020+00 1/0 0/0 0/0 .text            daNpc_zrZ_Draw__FPv */
 static int daNpc_zrZ_Draw(void* i_this) {
     return static_cast<daNpc_zrZ_c*>(i_this)->Draw();
 }
 
-/* 80B9A584-80B9A58C 0068A4 0008+00 1/0 0/0 0/0 .text            daNpc_zrZ_IsDelete__FPv */
 static int daNpc_zrZ_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80B9B714-80B9B734 -00001 0020+00 1/0 0/0 0/0 .data            daNpc_zrZ_MethodTable */
 static actor_method_class daNpc_zrZ_MethodTable = {
     (process_method_func)daNpc_zrZ_Create,
     (process_method_func)daNpc_zrZ_Delete,
@@ -2518,7 +2423,6 @@ static actor_method_class daNpc_zrZ_MethodTable = {
     (process_method_func)daNpc_zrZ_Draw,
 };
 
-/* 80B9B734-80B9B764 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_NPC_ZRZ */
 extern actor_process_profile_definition g_profile_NPC_ZRZ = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp
index 848cad4551..43845629dd 100644
--- a/src/d/actor/d_a_obj_Lv5Key.cpp
+++ b/src/d/actor/d_a_obj_Lv5Key.cpp
@@ -10,10 +10,8 @@
 
 static int useHeapInit(fopAc_ac_c*);
 
-/* 80B9C9B4-80B9C9B8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Lv5_KEY";
 
-/* 80B9B9B8-80B9BA94 000078 00DC+00 1/1 0/0 0/0 .text            CreateHeap__13daObjLv5Key_cFv */
 int daObjLv5Key_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
@@ -31,7 +29,6 @@ int daObjLv5Key_c::CreateHeap() {
     return 1;
 }
 
-/* 80B9BA94-80B9BB5C 000154 00C8+00 1/1 0/0 0/0 .text            Init__13daObjLv5Key_cFv */
 int daObjLv5Key_c::Init() {
     initCcSph();
     fopAcM_setCullSizeBox(this, -50.0f, 30.0f, -20.0f, 50.0f, -90.0f, 20.0f);
@@ -43,7 +40,6 @@ int daObjLv5Key_c::Init() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80B9BB5C-80B9BBCC 00021C 0070+00 1/1 0/0 0/0 .text            setBgc__13daObjLv5Key_cFv */
 void daObjLv5Key_c::setBgc() {
     OS_REPORT("-------------setBgc!!\n");
     mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
@@ -52,7 +48,6 @@ void daObjLv5Key_c::setBgc() {
     mAcchCir.SetWall(30.0f, 30.0f);
 }
 
-/* 80B9BBCC-80B9BC2C 00028C 0060+00 1/1 0/0 0/0 .text            initCcSph__13daObjLv5Key_cFv */
 void daObjLv5Key_c::initCcSph() {
     static const dCcD_SrcSph ccShpSrc = {
         {
@@ -72,7 +67,6 @@ void daObjLv5Key_c::initCcSph() {
     mCcSph.SetC(current.pos);
 }
 
-/* 80B9BC2C-80B9BCEC 0002EC 00C0+00 1/1 0/0 0/0 .text            setCcSph__13daObjLv5Key_cFv */
 void daObjLv5Key_c::setCcSph() {
     cXyz center(0.0f, -17.5f, 0.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -88,20 +82,15 @@ void daObjLv5Key_c::setCcSph() {
     }
 }
 
-/* 80B9BCEC-80B9BD0C 0003AC 0020+00 1/0 0/0 0/0 .text            daObjLv5Key_Create__FP10fopAc_ac_c
- */
 static int daObjLv5Key_Create(fopAc_ac_c* i_this) {
     return ((daObjLv5Key_c*)i_this)->create_1st();
 }
 
-/* 80B9BD0C-80B9BD30 0003CC 0024+00 1/0 0/0 0/0 .text daObjLv5Key_Delete__FP13daObjLv5Key_c */
 static int daObjLv5Key_Delete(daObjLv5Key_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80B9BD30-80B9BDD8 0003F0 00A8+00 5/5 0/0 0/0 .text
- * setAction__13daObjLv5Key_cFM13daObjLv5Key_cFPCvPvi_vi        */
 void daObjLv5Key_c::setAction(daObjLv5Key_c::actionFunc i_action, int param_1) {
     if (mAction != i_action) {
         if (mAction != NULL) {
@@ -115,7 +104,6 @@ void daObjLv5Key_c::setAction(daObjLv5Key_c::actionFunc i_action, int param_1) {
     }
 }
 
-/* 80B9BDD8-80B9BE24 000498 004C+00 1/1 0/0 0/0 .text            Action__13daObjLv5Key_cFv */
 void daObjLv5Key_c::Action() {
     if (mAction == NULL) {
         OS_REPORT("ACTION NOT SET!!\n");
@@ -124,7 +112,6 @@ void daObjLv5Key_c::Action() {
     }
 }
 
-/* 80B9BE24-80B9BF08 0004E4 00E4+00 2/0 0/0 0/0 .text            Wait__13daObjLv5Key_cFi */
 void daObjLv5Key_c::Wait(int param_0) {
     switch (mMode) {
     case -1:
@@ -144,7 +131,6 @@ void daObjLv5Key_c::Wait(int param_0) {
     }
 }
 
-/* 80B9BF08-80B9BFDC 0005C8 00D4+00 1/0 0/0 0/0 .text            Open__13daObjLv5Key_cFi */
 void daObjLv5Key_c::Open(int param_0) {
     switch (mMode) {
     case -1:
@@ -163,7 +149,6 @@ void daObjLv5Key_c::Open(int param_0) {
     }
 }
 
-/* 80B9BFDC-80B9C17C 00069C 01A0+00 1/0 0/0 0/0 .text            Fall__13daObjLv5Key_cFi */
 void daObjLv5Key_c::Fall(int param_0) {
     switch (mMode) {
     case -1:
@@ -213,7 +198,6 @@ void daObjLv5Key_c::Fall(int param_0) {
     }
 }
 
-/* 80B9C17C-80B9C268 00083C 00EC+00 1/0 0/0 0/0 .text            Land__13daObjLv5Key_cFi */
 void daObjLv5Key_c::Land(int param_0) {
     switch (mMode) {
     case -1:
@@ -240,7 +224,6 @@ void daObjLv5Key_c::Land(int param_0) {
     }
 }
 
-/* 80B9C268-80B9C3B0 000928 0148+00 1/0 0/0 0/0 .text            Shake__13daObjLv5Key_cFi */
 void daObjLv5Key_c::Shake(int param_0) {
     switch (mMode) {
     case -1:
@@ -274,7 +257,6 @@ void daObjLv5Key_c::Shake(int param_0) {
     }
 }
 
-/* 80B9C3B0-80B9C410 000A70 0060+00 1/1 0/0 0/0 .text TranslateByNowDirect__13daObjLv5Key_cFfff */
 void daObjLv5Key_c::TranslateByNowDirect(f32 i_x, f32 i_y, f32 i_z) {
     cXyz trans;
     trans.set(i_x, i_y, i_z);
@@ -284,7 +266,6 @@ void daObjLv5Key_c::TranslateByNowDirect(f32 i_x, f32 i_y, f32 i_z) {
     current.pos += trans;
 }
 
-/* 80B9C410-80B9C450 000AD0 0040+00 1/1 0/0 0/0 .text            Execute__13daObjLv5Key_cFv */
 int daObjLv5Key_c::Execute() {
     Action();
     setBaseMtx();
@@ -292,7 +273,6 @@ int daObjLv5Key_c::Execute() {
     return 1;
 }
 
-/* 80B9C450-80B9C500 000B10 00B0+00 1/1 0/0 0/0 .text            Draw__13daObjLv5Key_cFv */
 int daObjLv5Key_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -304,13 +284,11 @@ int daObjLv5Key_c::Draw() {
     return 1;
 }
 
-/* 80B9C500-80B9C534 000BC0 0034+00 1/1 0/0 0/0 .text            Delete__13daObjLv5Key_cFv */
 int daObjLv5Key_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80B9C534-80B9C5AC 000BF4 0078+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjLv5Key_cFv */
 void daObjLv5Key_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
 
@@ -322,18 +300,14 @@ void daObjLv5Key_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80B9C5AC-80B9C5CC 000C6C 0020+00 1/0 0/0 0/0 .text            daObjLv5Key_Draw__FP13daObjLv5Key_c
- */
 static int daObjLv5Key_Draw(daObjLv5Key_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80B9C5CC-80B9C5EC 000C8C 0020+00 2/1 0/0 0/0 .text daObjLv5Key_Execute__FP13daObjLv5Key_c */
 static int daObjLv5Key_Execute(daObjLv5Key_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80B9C5EC-80B9C798 000CAC 01AC+00 1/1 0/0 0/0 .text            create_1st__13daObjLv5Key_cFv */
 int daObjLv5Key_c::create_1st() {
     fopAcM_ct(this, daObjLv5Key_c);
 
@@ -351,24 +325,20 @@ int daObjLv5Key_c::create_1st() {
     return phase;
 }
 
-/* 80B9C8E0-80B9C900 000FA0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daObjLv5Key_c*)i_this)->CreateHeap();
 }
 
-/* 80B9C900-80B9C908 000FC0 0008+00 1/0 0/0 0/0 .text daObjLv5Key_IsDelete__FP13daObjLv5Key_c */
 static int daObjLv5Key_IsDelete(daObjLv5Key_c* i_this) {
     return 1;
 }
 
-/* 80B9CA00-80B9CA20 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjLv5Key_Method */
 static actor_method_class l_daObjLv5Key_Method = {
     (process_method_func)daObjLv5Key_Create,  (process_method_func)daObjLv5Key_Delete,
     (process_method_func)daObjLv5Key_Execute, (process_method_func)daObjLv5Key_IsDelete,
     (process_method_func)daObjLv5Key_Draw,
 };
 
-/* 80B9CA20-80B9CA50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv5Key */
 extern actor_process_profile_definition g_profile_Obj_Lv5Key = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp
index 559ec37499..60ae5611d0 100644
--- a/src/d/actor/d_a_obj_Turara.cpp
+++ b/src/d/actor/d_a_obj_Turara.cpp
@@ -6,13 +6,12 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_Turara.h"
-#include "dol2asm.h"
 #include "SSystem/SComponent/c_math.h"
 
 class daTurara_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80B9CB8C */ daTurara_HIO_c();
-    /* 80B9E5B4 */ virtual ~daTurara_HIO_c() {}
+    daTurara_HIO_c();
+    virtual ~daTurara_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -28,11 +27,6 @@ public:
 
 STATIC_ASSERT(sizeof(daTurara_HIO_c) == 0x20);
 
-//
-// Declarations:
-//
-
-/* 80B9CB8C-80B9CBF8 0000EC 006C+00 1/1 0/0 0/0 .text            __ct__14daTurara_HIO_cFv */
 daTurara_HIO_c::daTurara_HIO_c() {
     field_0x04 = 450.f;
     mGravity = 10.0f;
@@ -44,7 +38,6 @@ daTurara_HIO_c::daTurara_HIO_c() {
     field_0x1c = 5.0f;
 }
 
-/* 80B9CC9C-80B9CD74 0001FC 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__10daTurara_cFv */
 void daTurara_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, 0);
@@ -55,11 +48,8 @@ void daTurara_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80B9EBA4-80B9EBC4 000014 0020+00 5/5 0/0 0/0 .bss             l_HIO */
 static daTurara_HIO_c l_HIO;
 
-/* ############################################################################################## */
-/* 80B9E908-80B9E938 000014 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__10daTurara_c */
 const dCcD_SrcGObjInf daTurara_c::mCcDObjInfo = {
     {0, // mFlags
         {
@@ -73,7 +63,6 @@ const dCcD_SrcGObjInf daTurara_c::mCcDObjInfo = {
     {0} // mGObjCo
 };
 
-/* 80B9E99C-80B9E9E0 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__10daTurara_c */
 dCcD_SrcCyl daTurara_c::mCcDCyl = {
     daTurara_c::mCcDObjInfo, // mObjInf
     {
@@ -83,10 +72,8 @@ dCcD_SrcCyl daTurara_c::mCcDCyl = {
     } // mCyl
 };
 
-/* 80B9E938-80B9E940 000044 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static u32 const l_bmdIdx[2] = {5, 8};
 
-/* 80B9CD74-80B9CED8 0002D4 0164+00 1/0 0/0 0/0 .text            CreateHeap__10daTurara_cFv */
 int daTurara_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("M_Turara", l_bmdIdx[field_0x98c]);
     JUT_ASSERT(260, modelData != NULL);
@@ -115,7 +102,6 @@ int daTurara_c::CreateHeap() {
     return 1;
 }
 
-/* 80B9CED8-80B9D29C 000438 03C4+00 1/1 0/0 0/0 .text            create__10daTurara_cFv */
 int daTurara_c::create() {
     fopAcM_ct(this, daTurara_c);
     if (fopAcM_isSwitch(this, getSwBit3())) {
@@ -184,7 +170,6 @@ int daTurara_c::create() {
     return phase;
 }
 
-/* 80B9D468-80B9D4CC 0009C8 0064+00 1/1 0/0 0/0 .text            setFallStat__10daTurara_cFv */
 void daTurara_c::setFallStat() {
     mAcch.CrrPos(dComIfG_Bgsp());
     current.pos.y = mAcch.GetGroundH();
@@ -192,7 +177,6 @@ void daTurara_c::setFallStat() {
     mMode = 3;
 }
 
-/* 80B9D4CC-80B9D548 000A2C 007C+00 1/0 0/0 0/0 .text            Execute__10daTurara_cFPPA3_A4_f */
 int daTurara_c::Execute(Mtx** i_mtx) {
     eventUpdate();
     move();
@@ -203,7 +187,6 @@ int daTurara_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80B9D548-80B9D72C 000AA8 01E4+00 1/1 0/0 0/0 .text            move__10daTurara_cFv */
 void daTurara_c::move() {
     typedef void (daTurara_c::*modeFunc)();
     static modeFunc mode_proc[] = {&daTurara_c::modeWait, &daTurara_c::modeDropInit,
@@ -226,12 +209,10 @@ void daTurara_c::move() {
     dComIfG_Ccsp()->Set(&mCylCollider);
 }
 
-/* 80B9D72C-80B9D738 000C8C 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daTurara_cFv */
 void daTurara_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80B9D738-80B9D998 000C98 0260+00 1/0 0/0 0/0 .text            modeWait__10daTurara_cFv */
 void daTurara_c::modeWait() {
     if (field_0x5c9 != 0xff && fopAcM_isSwitch(this, field_0x5c9)) {
         if (getEvetID() != 0xff) {
@@ -259,14 +240,11 @@ void daTurara_c::modeWait() {
     }
 }
 
-/* 80B9D998-80B9D9BC 000EF8 0024+00 2/1 0/0 0/0 .text            eventStart__10daTurara_cFv */
 bool daTurara_c::eventStart() {
     init_modeDropInit();
     return true;
 }
 
-/* 80B9D9BC-80B9DA00 000F1C 0044+00 1/1 0/0 0/0 .text            init_modeDropInit__10daTurara_cFv
- */
 void daTurara_c::init_modeDropInit() {
     if (field_0x98c == 0) {
         mWaitTime = getWaitTime();
@@ -277,7 +255,6 @@ void daTurara_c::init_modeDropInit() {
     mMode = 1;
 }
 
-/* 80B9DA00-80B9DA44 000F60 0044+00 1/0 0/0 0/0 .text            modeDropInit__10daTurara_cFv */
 void daTurara_c::modeDropInit() {
     if (mWaitTime != 0) {
         mWaitTime -= 1;
@@ -287,7 +264,6 @@ void daTurara_c::modeDropInit() {
     }
 }
 
-/* 80B9DA44-80B9DB44 000FA4 0100+00 1/1 0/0 0/0 .text            init_modeDrop__10daTurara_cFv */
 void daTurara_c::init_modeDrop() {
     fopAcM_SetGravity(this, -l_HIO.mGravity);
     fopAcM_SetMaxFallSpeed(this, -l_HIO.mMaxGravity);
@@ -301,14 +277,12 @@ void daTurara_c::init_modeDrop() {
     mMode = 2;
 }
 
-/* 80B9DB44-80B9DB90 0010A4 004C+00 1/0 0/0 0/0 .text            modeDrop__10daTurara_cFv */
 void daTurara_c::modeDrop() {
     fopAcM_posMoveF(this, mColliderStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
     bgCheck();
 }
 
-/* 80B9DB90-80B9DBD0 0010F0 0040+00 1/1 0/0 0/0 .text            bgCheck__10daTurara_cFv */
 void daTurara_c::bgCheck() {
     if (mAcch.ChkGroundHit() & 0xff) {
         if (field_0x98c == 0) {
@@ -319,7 +293,6 @@ void daTurara_c::bgCheck() {
     }
 }
 
-/* 80B9DBD0-80B9DE48 001130 0278+00 1/1 0/0 0/0 .text            init_modeDropEnd__10daTurara_cFv */
 void daTurara_c::init_modeDropEnd() {
     if (mAcch.ChkWaterIn() == 0) {
         dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 0xf, cXyz(0.0f, 1.0f, 0.0f));
@@ -343,7 +316,6 @@ void daTurara_c::init_modeDropEnd() {
     mMode = 3;
 }
 
-/* 80B9DE48-80B9E078 0013A8 0230+00 1/0 0/0 0/0 .text            modeDropEnd__10daTurara_cFv */
 void daTurara_c::modeDropEnd() {
     if (mCylCollider.ChkTgHit()) {
         dCcD_GObjInf* r29 = mCylCollider.GetTgHitGObj();
@@ -366,8 +338,6 @@ void daTurara_c::modeDropEnd() {
     }
 }
 
-/* 80B9E078-80B9E338 0015D8 02C0+00 1/1 0/0 0/0 .text            init_modeDropEnd2__10daTurara_cFv
- */
 void daTurara_c::init_modeDropEnd2() {
     if (mAcch.ChkWaterIn() == 0) {
         dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 0xf, cXyz(0.0f, 1.0f, 0.0f));
@@ -393,14 +363,12 @@ void daTurara_c::init_modeDropEnd2() {
     mMode = 4;
 }
 
-/* 80B9E338-80B9E388 001898 0050+00 1/0 0/0 0/0 .text            modeDropEnd2__10daTurara_cFv */
 void daTurara_c::modeDropEnd2() {
     if (fopAcM_SearchByID(mEmID)) {
         fopAcM_delete(this);
     }
 }
 
-/* 80B9E388-80B9E478 0018E8 00F0+00 1/0 0/0 0/0 .text            Draw__10daTurara_cFv */
 int daTurara_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[field_0x984], &tevStr);
@@ -416,7 +384,6 @@ int daTurara_c::Draw() {
     return 1;
 }
 
-/* 80B9E478-80B9E4E0 0019D8 0068+00 1/0 0/0 0/0 .text            Delete__10daTurara_cFv */
 int daTurara_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "M_Turara");
     if (field_0x980 && field_0x980->ChkUsed()) {
@@ -425,27 +392,22 @@ int daTurara_c::Delete() {
     return 1;
 }
 
-/* 80B9E4E0-80B9E50C 001A40 002C+00 1/0 0/0 0/0 .text            daTurara_Draw__FP10daTurara_c */
 static int daTurara_Draw(daTurara_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80B9E50C-80B9E52C 001A6C 0020+00 1/0 0/0 0/0 .text            daTurara_Execute__FP10daTurara_c */
 static int daTurara_Execute(daTurara_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80B9E52C-80B9E54C 001A8C 0020+00 1/0 0/0 0/0 .text            daTurara_Delete__FP10daTurara_c */
 static int daTurara_Delete(daTurara_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80B9E54C-80B9E56C 001AAC 0020+00 1/0 0/0 0/0 .text            daTurara_Create__FP10fopAc_ac_c */
 static int daTurara_Create(fopAc_ac_c* i_this) {
     return static_cast<daTurara_c*>(i_this)->create();
 }
 
-/* 80B9EA58-80B9EA78 -00001 0020+00 1/0 0/0 0/0 .data            l_daTurara_Method */
 static actor_method_class l_daTurara_Method = {
     (process_method_func)daTurara_Create,
     (process_method_func)daTurara_Delete,
@@ -454,7 +416,6 @@ static actor_method_class l_daTurara_Method = {
     (process_method_func)daTurara_Draw,
 };
 
-/* 80B9EA78-80B9EAA8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Turara */
 extern actor_process_profile_definition g_profile_Obj_Turara = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp
index 60e7e5bd84..751b7126f0 100644
--- a/src/d/actor/d_a_obj_TvCdlst.cpp
+++ b/src/d/actor/d_a_obj_TvCdlst.cpp
@@ -6,18 +6,10 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_TvCdlst.h"
-#include "dol2asm.h"
 #include "include/d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
-/* 80B9F9DC-80B9F9E4 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daTvCdlst_HIO_c l_HIO;
 
-/* ############################################################################################## */
-/* 80B9F900-80B9F944 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daTvCdlst_c */
 dCcD_SrcCyl daTvCdlst_c::mCcDCyl = {
     daTvCdlst_c::mCcDObjInfo, // mObjInf
     {
@@ -27,13 +19,11 @@ dCcD_SrcCyl daTvCdlst_c::mCcDCyl = {
     } // mCyl
 };
 
-/* 80B9ECCC-80B9ECF8 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__15daTvCdlst_HIO_cFv */
 daTvCdlst_HIO_c::daTvCdlst_HIO_c() {
     field_0x4 = 0x3c;
     field_0x5 = 1;
 }
 
-/* 80B9ED40-80B9EDC8 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daTvCdlst_cFv */
 void daTvCdlst_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -41,7 +31,6 @@ void daTvCdlst_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80B9EDC8-80B9EE34 0001E8 006C+00 1/1 0/0 0/0 .text            CreateHeap__11daTvCdlst_cFv */
 int daTvCdlst_c::CreateHeap() {
     J3DModelData* pModelData = (J3DModelData*) dComIfG_getObjectRes("HShokudai", 3);
     JUT_ASSERT(222, pModelData != NULL);
@@ -51,8 +40,6 @@ int daTvCdlst_c::CreateHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80B9F890-80B9F8C0 000000 0030+00 4/4 0/0 0/0 .rodata          mCcDObjInfo__11daTvCdlst_c */
 const dCcD_SrcGObjInf daTvCdlst_c::mCcDObjInfo = {
     {0, // mFlags
         {
@@ -66,7 +53,6 @@ const dCcD_SrcGObjInf daTvCdlst_c::mCcDObjInfo = {
     {0} // mGObjCo
 };
 
-/* 80B9EE34-80B9F0B4 000254 0280+00 1/1 0/0 0/0 .text            create__11daTvCdlst_cFv */
 int daTvCdlst_c::create() {
     fopAcM_ct(this, daTvCdlst_c);
     int phase = dComIfG_resLoad(&mPhaseReq,"HShokudai");
@@ -106,13 +92,10 @@ int daTvCdlst_c::create() {
     return phase;
 }
 
-/* 80B9F144-80B9F164 000564 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daTvCdlst_cFP10fopAc_ac_c              */
 int daTvCdlst_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daTvCdlst_c*>(i_this)->CreateHeap();
 }
 
-/* 80B9F164-80B9F1F0 000584 008C+00 1/1 0/0 0/0 .text            lightInit__11daTvCdlst_cFv */
 void daTvCdlst_c::lightInit() {
     field_0x700 = field_0x6ec;
     field_0x700.y += 10.0f;
@@ -128,21 +111,18 @@ void daTvCdlst_c::lightInit() {
     field_0x710 = 0.0f;
 }
 
-/* 80B9F1F0-80B9F220 000610 0030+00 2/2 0/0 0/0 .text            setLight__11daTvCdlst_cFv */
 void daTvCdlst_c::setLight() {
     if (mLightType) {
         dKy_plight_set(&mLight);
     }
 }
 
-/* 80B9F220-80B9F250 000640 0030+00 1/1 0/0 0/0 .text            cutLight__11daTvCdlst_cFv */
 void daTvCdlst_c::cutLight() {
     if (mLightType) {
         dKy_plight_cut(&mLight);
     }
 }
 
-/* 80B9F250-80B9F300 000670 00B0+00 1/1 0/0 0/0 .text            pointLightProc__11daTvCdlst_cFv */
 void daTvCdlst_c::pointLightProc() {
     if (mLightType == 0) {
         GXColor color = {0xbc, 0x66, 0x42, 0xff};
@@ -157,7 +137,6 @@ void daTvCdlst_c::pointLightProc() {
     }
 }
 
-/* 80B9F300-80B9F634 000720 0334+00 1/1 0/0 0/0 .text            Execute__11daTvCdlst_cFv */
 int daTvCdlst_c::Execute() {
     mIsOn = fopAcM_isSwitch(this, mOnSw);
     mIsOff = fopAcM_isSwitch(this, mOffSw);
@@ -199,7 +178,6 @@ int daTvCdlst_c::Execute() {
     return 1;
 }
 
-/* 80B9F634-80B9F6D8 000A54 00A4+00 1/1 0/0 0/0 .text            Draw__11daTvCdlst_cFv */
 int daTvCdlst_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -209,7 +187,6 @@ int daTvCdlst_c::Draw() {
     return 1;
 }
 
-/* 80B9F6D8-80B9F730 000AF8 0058+00 1/1 0/0 0/0 .text            Delete__11daTvCdlst_cFv */
 int daTvCdlst_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhaseReq, "HShokudai");
@@ -219,29 +196,22 @@ int daTvCdlst_c::Delete() {
     return 1;
 }
 
-/* 80B9F730-80B9F750 000B50 0020+00 1/0 0/0 0/0 .text            daTvCdlst_Draw__FP11daTvCdlst_c */
 static int daTvCdlst_Draw(daTvCdlst_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80B9F750-80B9F770 000B70 0020+00 1/0 0/0 0/0 .text            daTvCdlst_Execute__FP11daTvCdlst_c
- */
 static int daTvCdlst_Execute(daTvCdlst_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80B9F770-80B9F790 000B90 0020+00 1/0 0/0 0/0 .text            daTvCdlst_Delete__FP11daTvCdlst_c
- */
 static int daTvCdlst_Delete(daTvCdlst_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80B9F790-80B9F7B0 000BB0 0020+00 1/0 0/0 0/0 .text            daTvCdlst_Create__FP10fopAc_ac_c */
 static int daTvCdlst_Create(fopAc_ac_c* i_this) {
     return static_cast<daTvCdlst_c*>(i_this)->create();
 }
 
-/* 80B9F944-80B9F964 -00001 0020+00 1/0 0/0 0/0 .data            l_daTvCdlst_Method */
 static actor_method_class l_daTvCdlst_Method = {
     (process_method_func)daTvCdlst_Create,
     (process_method_func)daTvCdlst_Delete,
@@ -250,7 +220,6 @@ static actor_method_class l_daTvCdlst_Method = {
     (process_method_func)daTvCdlst_Draw,
 };
 
-/* 80B9F964-80B9F994 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TvCdlst */
 extern actor_process_profile_definition g_profile_Obj_TvCdlst = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp
index 10011c131e..36b93c75ca 100644
--- a/src/d/actor/d_a_obj_Y_taihou.cpp
+++ b/src/d/actor/d_a_obj_Y_taihou.cpp
@@ -8,19 +8,12 @@
 #include "d/actor/d_a_obj_Y_taihou.h"
 #include "d/d_bg_w.h"
 #include "d/d_cc_d.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_obj_carry.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
 
 
-//
-// Declarations:
-//
-
-/* 80B9FAEC-80B9FC40 0000EC 0154+00 1/1 0/0 0/0 .text
- * ccHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void ccHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* param_2,
                           dCcD_GObjInf* param_3) {
     if (fopAcM_checkCarryNow(param_2) != 0) {
@@ -42,8 +35,6 @@ static void ccHitCallback(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c
     }
 }
 
-/* 80B9FC40-80B9FD20 000240 00E0+00 1/1 0/0 0/0 .text
- * pushPullcallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static fopAc_ac_c* pushPullcallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s16 param_2,
                                     dBgW_Base::PushPullLabel label) {
     if (cLib_checkBit(label, dBgW_Base::PPLABEL_3)) {
@@ -67,7 +58,6 @@ static fopAc_ac_c* pushPullcallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, s1
     return param_0;
 }
 
-/* 80B9FD5C-80B9FDE8 00035C 008C+00 1/1 0/0 0/0 .text            searchIronBallCallback__FPvPv */
 static void* searchIronBallCallback(void* i_actor, void* i_data) {
     daObjYtaihou_c* taihou_rhs = (daObjYtaihou_c*)i_data;
     if (fopAcM_GetProfName(i_actor) == PROC_Obj_Carry) {
@@ -83,10 +73,8 @@ static void* searchIronBallCallback(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80BA11E0-80BA11E4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
-SECTION_DATA static char const* l_arcName[1] = {"Y_taihou"};
+static char const* l_arcName[1] = {"Y_taihou"};
 
-/* 80B9FDE8-80B9FEB0 0003E8 00C8+00 1/1 0/0 0/0 .text            create1st__14daObjYtaihou_cFv */
 int daObjYtaihou_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName[0]);
     if (phase == cPhs_COMPLEATE_e) {
@@ -105,8 +93,6 @@ int daObjYtaihou_c::create1st() {
     return phase;
 }
 
-/* 80B9FEB0-80B9FF08 0004B0 0058+00 3/3 0/0 0/0 .text
- * setIronBall__14daObjYtaihou_cFP12daObjCarry_c                */
 void daObjYtaihou_c::setIronBall(daObjCarry_c* obj) {
     mIronBallId = fopAcM_GetID(obj);
     obj->offDraw();
@@ -115,12 +101,10 @@ void daObjYtaihou_c::setIronBall(daObjCarry_c* obj) {
     obj->old.pos = current.pos;
 }
 
-/* 80B9FF08-80B9FF1C 000508 0014+00 1/1 0/0 0/0 .text            getEvent__14daObjYtaihou_cFUc */
 int daObjYtaihou_c::getEvent(u8 param_0) {
     return fopAcM_GetParamBit(this, (param_0 & 0x1f) << 3, 8);
 }
 
-/* 80B9FF1C-80B9FFAC 00051C 0090+00 1/1 0/0 0/0 .text            loadAngle__14daObjYtaihou_cFv */
 void daObjYtaihou_c::loadAngle() {
     int sw = home.angle.x >> 8 & 0xff;
     field_0x775 = (fopAcM_isSwitch(this, home.angle.x & 0xff)) ? 2 : 0;
@@ -129,7 +113,6 @@ void daObjYtaihou_c::loadAngle() {
     }
 }
 
-/* 80B9FFAC-80BA0060 0005AC 00B4+00 1/1 0/0 0/0 .text            saveAngle__14daObjYtaihou_cFv */
 void daObjYtaihou_c::saveAngle() {
     int sw_1 = home.angle.x & 0xff;
     int sw_2 = home.angle.x >> 8 & 0xff;
@@ -145,8 +128,6 @@ void daObjYtaihou_c::saveAngle() {
     }
 }
 
-/* ############################################################################################## */
-/* 80BA11E4-80BA1228 000004 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x79}}, // mObj
@@ -161,23 +142,18 @@ static dCcD_SrcCyl l_cc_cyl_src = {
     } // mCyl
 };
 
-/* 80BA1228-80BA1230 000048 0008+00 1/1 0/0 0/0 .data            l_offsetAngle$3829 */
 static u16 l_offsetAngle[4] = {
     0x0, 0xC000, 0x8000, 0x4000,
 };
 
-/* 80BA0060-80BA0084 000660 0024+00 2/2 0/0 0/0 .text            setNextAngle__14daObjYtaihou_cFv */
 void daObjYtaihou_c::setNextAngle() {
     current.angle.z = home.angle.y + l_offsetAngle[field_0x775];
 }
 
-/* 80BA1358-80BA135C 000048 0004+00 1/1 0/0 0/0 .bss             l_wheelMinR$3836 */
 static f32 l_wheelMinR;
 
-/* 80BA135C-80BA1360 00004C 0004+00 1/1 0/0 0/0 .bss             None */
 static u8 lbl_396_bss_4C;
 
-/* 80BA0084-80BA0208 000684 0184+00 2/2 0/0 0/0 .text            setMtx__14daObjYtaihou_cFv */
 void daObjYtaihou_c::setMtx() {
     home.angle.z += (s16) ((s16)(shape_angle.y - old.angle.y) * 0.8f);
     if ((s8)lbl_396_bss_4C == 0) {
@@ -195,7 +171,6 @@ void daObjYtaihou_c::setMtx() {
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80BA0208-80BA045C 000808 0254+00 1/1 0/0 0/0 .text            rotateCheck__14daObjYtaihou_cFv */
 void daObjYtaihou_c::rotateCheck() {
     if (shape_angle.y != current.angle.z) {
         cLib_chaseAngleS(&current.angle.x, 0xbe, 5);
@@ -233,17 +208,12 @@ void daObjYtaihou_c::rotateCheck() {
     }
 }
 
-/* ############################################################################################## */
-/* 80BA1190-80BA119C 00003C 000C+00 0/1 0/0 0/0 .rodata          l_hibanaOffset$3954 */
 static const Vec l_hibanaOffset = {0.0f, 150.0f, 50.0f};
 
-/* 80BA119C-80BA11A8 000048 000C+00 0/1 0/0 0/0 .rodata          l_shotOffset$3961 */
 static const Vec l_shotOffset = {0.0f, 130.0f, -100.0f};
 
-/* 80BA11A8-80BA11B4 000054 000C+00 0/1 0/0 0/0 .rodata          l_shotSmokeOffset$3962 */
 static const Vec l_shotSmokeOffset = {0.0f, 0.0f, 0.0f};
 
-/* 80BA045C-80BA0964 000A5C 0508+00 1/1 0/0 0/0 .text            shotCheck__14daObjYtaihou_cFv */
 void daObjYtaihou_c::shotCheck() {
     if (mStartBomb == 0) {
         f32 player_dist = fopAcM_searchPlayerDistanceY(this);
@@ -314,13 +284,11 @@ void daObjYtaihou_c::shotCheck() {
     mCyl.SetCoHitCallback(NULL);
 }
 
-/* 80BA0964-80BA0974 000F64 0010+00 2/1 0/0 0/0 .text            eventStart__14daObjYtaihou_cFv */
 bool daObjYtaihou_c::eventStart() {
     mStartBomb = 0x5a;
     return true;
 }
 
-/* 80BA0974-80BA09E4 000F74 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjYtaihou_cFv */
 int daObjYtaihou_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*) dComIfG_getObjectRes(l_arcName[0], 0x4);
     JUT_ASSERT(0x247, model_data != NULL);
@@ -332,7 +300,6 @@ int daObjYtaihou_c::CreateHeap() {
     }
 }
 
-/* 80BA09E4-80BA0A94 000FE4 00B0+00 1/0 0/0 0/0 .text            Create__14daObjYtaihou_cFv */
 int daObjYtaihou_c::Create() {
     mpModel->setBaseTRMtx(mMtx);
     fopAcM_SetMtx(this, mMtx);
@@ -348,12 +315,8 @@ int daObjYtaihou_c::Create() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BA11C8-80BA11D4 000074 000C+00 1/1 0/0 0/0 .rodata          l_cc_offset$4147 */
 static const Vec l_cc_offset = {0.0f, 0.0f, -50.0f};
 
-/* 80BA0A94-80BA0B4C 001094 00B8+00 1/0 0/0 0/0 .text            Execute__14daObjYtaihou_cFPPA3_A4_f
- */
 int daObjYtaihou_c::Execute(Mtx** i_mtx) {
     old.angle.y = shape_angle.y;
     rotateCheck();
@@ -371,7 +334,6 @@ int daObjYtaihou_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BA0B4C-80BA0C1C 00114C 00D0+00 1/0 0/0 0/0 .text            Draw__14daObjYtaihou_cFv */
 int daObjYtaihou_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -384,7 +346,6 @@ int daObjYtaihou_c::Draw() {
     return 1;
 }
 
-/* 80BA0C1C-80BA0C88 00121C 006C+00 1/0 0/0 0/0 .text            Delete__14daObjYtaihou_cFv */
 int daObjYtaihou_c::Delete() {
     dComIfG_resDelete(this, l_arcName[0]);
     daObjCarry_c* pCarry = (daObjCarry_c*) fopAcM_SearchByID(mIronBallId);
@@ -394,33 +355,23 @@ int daObjYtaihou_c::Delete() {
     return 1;
 }
 
-/* 80BA0C88-80BA0DA4 001288 011C+00 1/0 0/0 0/0 .text daObjYtaihou_create1st__FP14daObjYtaihou_c
- */
 static void daObjYtaihou_create1st(daObjYtaihou_c* i_this) {
     fopAcM_ct(i_this, daObjYtaihou_c);
     i_this->create1st();
 }
 
-/* 80BA0E90-80BA0EB0 001490 0020+00 1/0 0/0 0/0 .text
- * daObjYtaihou_MoveBGDelete__FP14daObjYtaihou_c                */
 static void daObjYtaihou_MoveBGDelete(daObjYtaihou_c* i_this) {
     i_this->MoveBGDelete();
 }
 
-/* 80BA0EB0-80BA0ED0 0014B0 0020+00 1/0 0/0 0/0 .text
- * daObjYtaihou_MoveBGExecute__FP14daObjYtaihou_c               */
 static void daObjYtaihou_MoveBGExecute(daObjYtaihou_c* i_this) {
     i_this->MoveBGExecute();
 }
 
-/* 80BA0ED0-80BA0EFC 0014D0 002C+00 1/0 0/0 0/0 .text daObjYtaihou_MoveBGDraw__FP14daObjYtaihou_c
- */
 static void daObjYtaihou_MoveBGDraw(daObjYtaihou_c* i_this) {
     i_this->Draw();
 }
 
-/* ############################################################################################## */
-/* 80BA1230-80BA1250 -00001 0020+00 1/0 0/0 0/0 .data            daObjYtaihou_METHODS */
 static actor_method_class daObjYtaihou_METHODS = {
     (process_method_func)daObjYtaihou_create1st,
     (process_method_func)daObjYtaihou_MoveBGDelete,
@@ -429,7 +380,6 @@ static actor_method_class daObjYtaihou_METHODS = {
     (process_method_func)daObjYtaihou_MoveBGDraw,
 };
 
-/* 80BA1250-80BA1280 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ytaihou */
 extern actor_process_profile_definition g_profile_Obj_Ytaihou = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp
index 8b970f1d2b..8d81ca3b03 100644
--- a/src/d/actor/d_a_obj_amiShutter.cpp
+++ b/src/d/actor/d_a_obj_amiShutter.cpp
@@ -17,13 +17,12 @@ struct daAmiShutter_HIO_c : public mDoHIO_entry_c {
     /* 0x10 */ u8 mWaitTime;
     /* 0x11 */ u8 field_0x11;
 
-    /* 80BA14CC */ daAmiShutter_HIO_c();
-    /* 80BA21E0 */ ~daAmiShutter_HIO_c() {}
+    daAmiShutter_HIO_c();
+    ~daAmiShutter_HIO_c() {}
 
     void genMessage(JORMContext*);
 };
 
-/* 80BA14CC-80BA1514 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__18daAmiShutter_HIO_cFv */
 daAmiShutter_HIO_c::daAmiShutter_HIO_c() {
     mMaxOpenSpeed = 70.0f;
     mMaxCloseSpeed = 70.0f;
@@ -45,10 +44,8 @@ void daAmiShutter_HIO_c::genMessage(JORMContext* i_ctx) {
 }
 #endif
 
-/* 80BA256C-80BA2580 000014 0014+00 6/6 0/0 0/0 .bss             l_HIO */
 static daAmiShutter_HIO_c l_HIO;
 
-/* 80BA155C-80BA15E4 00017C 0088+00 2/2 0/0 0/0 .text            setBaseMtx__14daAmiShutter_cFv */
 void daAmiShutter_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -56,9 +53,7 @@ void daAmiShutter_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* ############################################################################################## */
 
-/* 80BA15E4-80BA1650 000204 006C+00 1/0 0/0 0/0 .text            CreateHeap__14daAmiShutter_cFv */
 int daAmiShutter_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("S_Zami", 4);
     JUT_ASSERT(167, modelData != NULL); 
@@ -71,9 +66,7 @@ int daAmiShutter_c::CreateHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80BA1650-80BA182C 000270 01DC+00 1/1 0/0 0/0 .text            create__14daAmiShutter_cFv */
 cPhs__Step daAmiShutter_c::create() {
     fopAcM_ct(this, daAmiShutter_c);
     cPhs__Step phaseStep = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, "S_Zami");
@@ -116,8 +109,6 @@ cPhs__Step daAmiShutter_c::create() {
     return phaseStep;
 }
 
-/* 80BA182C-80BA1888 00044C 005C+00 1/0 0/0 0/0 .text            Execute__14daAmiShutter_cFPPA3_A4_f
- */
 int daAmiShutter_c::Execute(Mtx** i_mtx) {
     eventUpdate();
     moveShutter();
@@ -126,9 +117,7 @@ int daAmiShutter_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80BA1888-80BA1974 0004A8 00EC+00 1/1 0/0 0/0 .text            moveShutter__14daAmiShutter_cFv */
 void daAmiShutter_c::moveShutter() {
     static daAmiShutter_c::modeProc const mode_proc[6] = {
         &daAmiShutter_c::modeWait,
@@ -142,10 +131,7 @@ void daAmiShutter_c::moveShutter() {
     (this->*mode_proc[mMode])();
 }
 
-/* ############################################################################################## */
 
-/* 80BA1974-80BA1B4C 000594 01D8+00 1/1 0/0 0/0 .text            playerAreaCheck__14daAmiShutter_cFv
- */
 BOOL daAmiShutter_c::playerAreaCheck() {
     BOOL inArea = FALSE;
     if (mType == 0) {
@@ -163,13 +149,10 @@ BOOL daAmiShutter_c::playerAreaCheck() {
     return inArea;
 }
 
-/* 80BA1B4C-80BA1B58 00076C 000C+00 3/3 0/0 0/0 .text            init_modeWait__14daAmiShutter_cFv
- */
 void daAmiShutter_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80BA1B58-80BA1BCC 000778 0074+00 1/0 0/0 0/0 .text            modeWait__14daAmiShutter_cFv */
 void daAmiShutter_c::modeWait() {
     u8 isSwitch = fopAcM_isSwitch(this, mSwBit);
     if (mSwitch != isSwitch) {
@@ -178,13 +161,10 @@ void daAmiShutter_c::modeWait() {
     }
 }
 
-/* 80BA1BCC-80BA1BD8 0007EC 000C+00 1/1 0/0 0/0 .text init_modeWaitEvent__14daAmiShutter_cFv */
 void daAmiShutter_c::init_modeWaitEvent() {
     mMode = MODE_WAIT_EVENT;
 }
 
-/* 80BA1BD8-80BA1C90 0007F8 00B8+00 1/0 0/0 0/0 .text            modeWaitEvent__14daAmiShutter_cFv
- */
 void daAmiShutter_c::modeWaitEvent() {
     if (playerAreaCheck() == TRUE) {
         if (getEvent() != 0xff) {
@@ -199,16 +179,12 @@ void daAmiShutter_c::modeWaitEvent() {
     }
 }
 
-/* 80BA1C90-80BA1CB4 0008B0 0024+00 2/1 0/0 0/0 .text            eventStart__14daAmiShutter_cFv */
 bool daAmiShutter_c::eventStart() {
     init_modeCloseEvent();
     return true;
 }
 
-/* ############################################################################################## */
 
-/* 80BA1CB4-80BA1D48 0008D4 0094+00 1/1 0/0 0/0 .text            init_modeClose__14daAmiShutter_cFv
- */
 void daAmiShutter_c::init_modeClose() {
     mDoAud_seStart(Z2SE_OBJ_NET_SHTR_CL, &current.pos, 0, 
         dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -216,8 +192,6 @@ void daAmiShutter_c::init_modeClose() {
     mMode = MODE_CLOSE;
 }
 
-/* ############################################################################################## */
-/* 80BA1D48-80BA1DCC 000968 0084+00 1/0 0/0 0/0 .text            modeClose__14daAmiShutter_cFv */
 void daAmiShutter_c::modeClose() {
     f32 distance = cLib_addCalc(&current.pos.z, mPosZ, 0.5f, 
         l_HIO.mMaxCloseSpeed, 1.0f);
@@ -228,7 +202,6 @@ void daAmiShutter_c::modeClose() {
     }
 }
 
-/* 80BA1DCC-80BA1E60 0009EC 0094+00 1/1 0/0 0/0 .text init_modeCloseEvent__14daAmiShutter_cFv */
 void daAmiShutter_c::init_modeCloseEvent() {
     mDoAud_seStart(Z2SE_OBJ_NET_L_SHTR_CL, &current.pos, 0, 
         dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -236,10 +209,7 @@ void daAmiShutter_c::init_modeCloseEvent() {
     mMode = MODE_CLOSE_EVENT;
 }
 
-/* ############################################################################################## */
 
-/* 80BA1E60-80BA1EEC 000A80 008C+00 1/0 0/0 0/0 .text            modeCloseEvent__14daAmiShutter_cFv
- */
 void daAmiShutter_c::modeCloseEvent() {
     if (mWaitTime != 0) {
         mWaitTime -= 1;
@@ -254,7 +224,6 @@ void daAmiShutter_c::modeCloseEvent() {
     }
 }
 
-/* 80BA1EEC-80BA1F7C 000B0C 0090+00 1/1 0/0 0/0 .text init_modeCloseEnd__14daAmiShutter_cFv */
 void daAmiShutter_c::init_modeCloseEnd() {
     if (mType == 0 && fopAcM_isSwitch(this, 4) == 0) {
         daPy_getPlayerActorClass()->changeOriginalDemo();
@@ -264,20 +233,16 @@ void daAmiShutter_c::init_modeCloseEnd() {
     mMode = MODE_CLOSE_END;
 }
 
-/* 80BA1F7C-80BA1F80 000B9C 0004+00 1/0 0/0 0/0 .text            modeCloseEnd__14daAmiShutter_cFv */
 void daAmiShutter_c::modeCloseEnd() {
     // EMPTY METHOD
 }
 
-/* 80BA1F80-80BA2004 000BA0 0084+00 1/1 0/0 0/0 .text            init_modeOpen__14daAmiShutter_cFv
- */
 void daAmiShutter_c::init_modeOpen() {
     mDoAud_seStart(Z2SE_OBJ_NET_SHTR_OP, &current.pos, 0, 
         dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = MODE_OPEN;
 }
 
-/* 80BA2004-80BA2080 000C24 007C+00 1/0 0/0 0/0 .text            modeOpen__14daAmiShutter_cFv */
 void daAmiShutter_c::modeOpen() {
     f32 distance = cLib_addCalc(&current.pos.z, mPosZ - 600.0f, 0.2, 
         l_HIO.mMaxOpenSpeed, 1.0f);
@@ -287,7 +252,6 @@ void daAmiShutter_c::modeOpen() {
     }
 }
 
-/* 80BA2080-80BA2124 000CA0 00A4+00 1/0 0/0 0/0 .text            Draw__14daAmiShutter_cFv */
 int daAmiShutter_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -297,7 +261,6 @@ int daAmiShutter_c::Draw() {
     return 1;
 }
 
-/* 80BA2124-80BA2154 000D44 0030+00 1/0 0/0 0/0 .text            Delete__14daAmiShutter_cFv */
 int daAmiShutter_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "S_Zami");
     #ifdef DEBUG
@@ -307,30 +270,24 @@ int daAmiShutter_c::Delete() {
     return 1;
 }
 
-/* 80BA2154-80BA2180 000D74 002C+00 1/0 0/0 0/0 .text daAmiShutter_Draw__FP14daAmiShutter_c */
 int daAmiShutter_Draw(daAmiShutter_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BA2180-80BA21A0 000DA0 0020+00 1/0 0/0 0/0 .text daAmiShutter_Execute__FP14daAmiShutter_c */
 int daAmiShutter_Execute(daAmiShutter_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BA21A0-80BA21C0 000DC0 0020+00 1/0 0/0 0/0 .text daAmiShutter_Delete__FP14daAmiShutter_c */
 int daAmiShutter_Delete(daAmiShutter_c* i_this) {
     fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80BA21C0-80BA21E0 000DE0 0020+00 1/0 0/0 0/0 .text            daAmiShutter_Create__FP10fopAc_ac_c
- */
 int daAmiShutter_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daAmiShutter_c*>(i_this)->create();
 }
 
-/* 80BA248C-80BA24AC -00001 0020+00 1/0 0/0 0/0 .data            l_daAmiShutter_Method */
 actor_method_class l_daAmiShutter_Method = {
     (process_method_func)daAmiShutter_Create,
     (process_method_func)daAmiShutter_Delete,
@@ -340,7 +297,6 @@ actor_method_class l_daAmiShutter_Method = {
 };
 
 
-/* 80BA24AC-80BA24DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_AmiShutter */
 extern actor_process_profile_definition g_profile_Obj_AmiShutter = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp
index 0a5a9044f7..da17324ba9 100644
--- a/src/d/actor/d_a_obj_ari.cpp
+++ b/src/d/actor/d_a_obj_ari.cpp
@@ -13,23 +13,18 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80BA55E0-80BA55E4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80BA55F0-80BA5600 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_AriHIO_c l_HIO;
 
-/* 80BA268C-80BA26BC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__14daObj_AriHIO_cFv */
 daObj_AriHIO_c::daObj_AriHIO_c() {
     field_0x4 = -1;
     mScaleMale = 1.5f;
     mScaleFemale = 2.0f;
 }
 
-/* 80BA5410-80BA5414 000008 0002+02 1/2 0/0 0/0 .rodata          l_ari_itemno */
 static u8 const l_ari_itemno[2] = {fpcNm_ITEM_M_ANT, fpcNm_ITEM_F_ANT};
 
-/* 80BA26BC-80BA2728 00011C 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjARI_cFv */
 void daObjARI_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -50,15 +45,12 @@ void daObjARI_c::InitCcSph() {
     mCcSph.OnTgNoHitMark();
 }
 
-/* 80BA2728-80BA2780 000188 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjARI_cFv */
 void daObjARI_c::SetCcSph() {
     mCcSph.SetC(current.pos);
     mCcSph.SetR(40.0f);
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80BA2780-80BA2854 0001E0 00D4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjARI_cFP8J3DJointP8J3DModel
- */
 int daObjARI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
     mDoMtx_stack_c::copy(i_model->getAnmMtx(jnt_no));
@@ -70,7 +62,6 @@ int daObjARI_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80BA2854-80BA28A0 0002B4 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -82,12 +73,10 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80BA28A0-80BA28C0 000300 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObjARI_c*>(i_this)->CreateHeap();
 }
 
-/* 80BA28C0-80BA2C18 000320 0358+00 1/1 0/0 0/0 .text            CreateHeap__10daObjARI_cFv */
 int daObjARI_c::CreateHeap() {
     J3DModelData* model_data;
     if (mSex == SEX_FEMALE) {
@@ -140,13 +129,11 @@ int daObjARI_c::CreateHeap() {
     return 1;
 }
 
-/* 80BA2C60-80BA2C80 0006C0 0020+00 1/0 0/0 0/0 .text            daObjARI_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjARI_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjARI_c*>(i_this)->create();
 }
 
-/* 80BA2C80-80BA2CA4 0006E0 0024+00 1/0 0/0 0/0 .text            daObjARI_Delete__FP10daObjARI_c */
 static int daObjARI_Delete(daObjARI_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->Delete();
@@ -159,7 +146,6 @@ static f32 dummy() {
     return vec1.x + vec2.x;
 }
 
-/* 80BA2CA4-80BA3228 000704 0584+00 1/1 0/0 0/0 .text            WallWalk__10daObjARI_cFv */
 void daObjARI_c::WallWalk() {
     cXyz vec1(0.0f, -50.0f, speedF * 2.0f);
     cXyz vec2(0.0f, 0.0f, 0.0f);
@@ -225,7 +211,6 @@ void daObjARI_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80BA3270-80BA337C 000CD0 010C+00 2/2 0/0 0/0 .text            MoveAction__10daObjARI_cFv */
 void daObjARI_c::MoveAction() {
     if (mTimer == 0) {
         cXyz delta = home.pos - current.pos;
@@ -243,7 +228,6 @@ void daObjARI_c::MoveAction() {
     WallWalk();
 }
 
-/* 80BA337C-80BA33F8 000DDC 007C+00 1/1 0/0 0/0 .text            Action__10daObjARI_cFv */
 void daObjARI_c::Action() {
     mTimer--;
     if (mTimer <= 0) {
@@ -257,13 +241,11 @@ void daObjARI_c::Action() {
     Insect_GetDemoMain();
 }
 
-/* 80BA33F8-80BA3408 000E58 0010+00 1/0 0/0 0/0 .text            Insect_Release__10daObjARI_cFv */
 void daObjARI_c::Insect_Release() {
     field_0x56c = 1;
     mAction = 1;
 }
 
-/* 80BA3408-80BA3638 000E68 0230+00 1/1 0/0 0/0 .text            checkGround__10daObjARI_cFv */
 void daObjARI_c::checkGround() {
     dBgS_LinChk lin_chk;
     lin_chk.SetObj();
@@ -284,7 +266,6 @@ void daObjARI_c::checkGround() {
     }
 }
 
-/* 80BA3638-80BA36CC 001098 0094+00 1/1 0/0 0/0 .text            B_MoveAction__10daObjARI_cFv */
 void daObjARI_c::B_MoveAction() {
     switch (mMode) {
     case 0:
@@ -305,7 +286,6 @@ void daObjARI_c::B_MoveAction() {
     }
 }
 
-/* 80BA36CC-80BA3700 00112C 0034+00 1/1 0/0 0/0 .text            FallAction__10daObjARI_cFv */
 void daObjARI_c::FallAction() {
     switch (mAction) {
     case 0:
@@ -317,7 +297,6 @@ void daObjARI_c::FallAction() {
     }
 }
 
-/* 80BA3700-80BA3824 001160 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjARI_cFv */
 void daObjARI_c::ParticleSet() {
     if (mScreenZ > mBufferZ) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -333,7 +312,6 @@ void daObjARI_c::ParticleSet() {
     }
 }
 
-/* 80BA3824-80BA3B38 001284 0314+00 1/1 0/0 0/0 .text            BoomChk__10daObjARI_cFv */
 void daObjARI_c::BoomChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_searchPlayerDistanceXZ(this);
@@ -376,7 +354,6 @@ void daObjARI_c::BoomChk() {
     }
 }
 
-/* 80BA3B38-80BA3C38 001598 0100+00 1/1 0/0 0/0 .text            ObjHit__10daObjARI_cFv */
 void daObjARI_c::ObjHit() {
     if (mCcSph.ChkTgHit()) {
         cCcD_Obj* hit_obj = mCcSph.GetTgHitObj();
@@ -399,7 +376,6 @@ void daObjARI_c::ObjHit() {
     }
 }
 
-/* 80BA3C38-80BA44F0 001698 08B8+00 1/1 0/0 0/0 .text            Execute__10daObjARI_cFv */
 int daObjARI_c::Execute() {
     if (ChkGetDemo()) {
         mScreenZ = mBufferZ + 10000.0f;
@@ -518,7 +494,6 @@ int daObjARI_c::Execute() {
     return 1;
 }
 
-/* 80BA44F0-80BA466C 001F50 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjARI_cFv */
 void daObjARI_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
@@ -545,7 +520,6 @@ void daObjARI_c::Z_BufferChk() {
     mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
 }
 
-/* 80BA466C-80BA46D4 0020CC 0068+00 1/1 0/0 0/0 .text            Delete__10daObjARI_cFv */
 int daObjARI_c::Delete() {
     dComIfG_resDelete(&mPhase, "I_Ari");
     if (mHIOInit) {
@@ -557,7 +531,6 @@ int daObjARI_c::Delete() {
     return 1;
 }
 
-/* 80BA46D4-80BA473C 002134 0068+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjARI_cFv */
 void daObjARI_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(mWallAlignAngle);
@@ -584,24 +557,20 @@ int daObjARI_c::Draw() {
     return 1;
 }
 
-/* 80BA473C-80BA481C 00219C 00E0+00 1/0 0/0 0/0 .text            daObjARI_Draw__FP10daObjARI_c */
 static int daObjARI_Draw(daObjARI_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BA481C-80BA483C 00227C 0020+00 2/1 0/0 0/0 .text            daObjARI_Execute__FP10daObjARI_c */
 static int daObjARI_Execute(daObjARI_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BA54F8-80BA54FC 0000F0 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x01A5, /* dSv_event_flag_c::F_0421 - Misc. - Ant (M) */
     0x01A6, /* dSv_event_flag_c::F_0422 - Misc. - Ant (F) */
 };
 
 
-/* 80BA483C-80BA49E8 00229C 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjARI_cFv */
 bool daObjARI_c::CreateChk() {
     u8 param = (fopAcM_GetParam(this) >> 8) & 0xf;
     if (param == 0xf) {
@@ -636,7 +605,6 @@ bool daObjARI_c::CreateChk() {
     return true;
 }
 
-/* 80BA49E8-80BA5258 002448 0870+00 1/1 0/0 0/0 .text            create__10daObjARI_cFv */
 cPhs__Step daObjARI_c::create() {
     fopAcM_ct(this, daObjARI_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "I_Ari");
@@ -758,13 +726,10 @@ cPhs__Step daObjARI_c::create() {
     return step;
 }
 
-/* 80BA5358-80BA5360 002DB8 0008+00 1/0 0/0 0/0 .text            daObjARI_IsDelete__FP10daObjARI_c
- */
 static int daObjARI_IsDelete(daObjARI_c* i_this) {
     return 1;
 }
 
-/* 80BA551C-80BA553C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjARI_Method */
 static actor_method_class l_daObjARI_Method = {
     (process_method_func)daObjARI_Create,
     (process_method_func)daObjARI_Delete,
@@ -773,7 +738,6 @@ static actor_method_class l_daObjARI_Method = {
     (process_method_func)daObjARI_Draw,
 };
 
-/* 80BA553C-80BA556C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ari */
 extern actor_process_profile_definition g_profile_Obj_Ari = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp
index d1702e892b..a8a9090ede 100644
--- a/src/d/actor/d_a_obj_automata.cpp
+++ b/src/d/actor/d_a_obj_automata.cpp
@@ -10,24 +10,19 @@
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BA6CD0-80BA6CD8 000020 0008+00 4/5 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     9, 1,
 };
 
-/* 80BA6CD8-80BA6CE0 -00001 0008+00 4/6 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "AutoMata",
 };
 
-/* ############################################################################################## */
-/* 80BA6C10-80BA6C1C 000000 000C+00 5/5 0/0 0/0 .rodata          m__22daObj_AutoMata_Param_c */
 f32 const daObj_AutoMata_Param_c::m[3] = {
     220.0f, 80.0f, 40.0f,
 };
 
-/* 80BA6C1C-80BA6C4C 00000C 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 static dCcD_SrcGObjInf const l_ccDObjData = 
 {
         {0x0, {{0x0, 0x0, 0}, {0xD8FBFDFF, 0x1F}, 0x79}}, // mObj
@@ -36,7 +31,6 @@ static dCcD_SrcGObjInf const l_ccDObjData =
         {0x0}, // mGObjCo
 };
 
-/* 80BA6CE0-80BA6D24 000030 0044+00 1/2 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     l_ccDObjData, // mObjInf
     {
@@ -46,7 +40,6 @@ static dCcD_SrcCyl l_ccDCyl = {
     } // mCyl
 };
 
-/* 80BA6D24-80BA6D64 000074 0040+00 1/2 0/0 0/0 .data            l_ccDSph */
 static dCcD_SrcSph l_ccDSph = {
     l_ccDObjData, // mObjInf
     {
@@ -54,7 +47,6 @@ static dCcD_SrcSph l_ccDSph = {
     } // mSphAttr
 };
 
-/* 80BA56EC-80BA5990 0000EC 02A4+00 1/0 0/0 0/0 .text            __dt__16daObj_AutoMata_cFv */
 daObj_AutoMata_c::~daObj_AutoMata_c() {
     OS_REPORT("|%06d:%x|daObj_AutoMata_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (mpMorf != NULL) {
@@ -63,7 +55,6 @@ daObj_AutoMata_c::~daObj_AutoMata_c() {
     dComIfG_resDelete(&mPhase, l_resNameList[l_bmdData[field_0xb30][1]]);
 }
 
-/* 80BA5990-80BA5D2C 000390 039C+00 1/1 0/0 0/0 .text            create__16daObj_AutoMata_cFv */
 int daObj_AutoMata_c::create() {
     fopAcM_ct(this, daObj_AutoMata_c);
     field_0xb30 = 0;
@@ -97,7 +88,6 @@ int daObj_AutoMata_c::create() {
     return rv;
 }
 
-/* 80BA5F88-80BA60A0 000988 0118+00 1/1 0/0 0/0 .text            CreateHeap__16daObj_AutoMata_cFv */
 int daObj_AutoMata_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[field_0xb30][1]],
@@ -113,14 +103,12 @@ int daObj_AutoMata_c::CreateHeap() {
     return setAnm(0, false) ? 1 : 0;
 }
 
-/* 80BA60A0-80BA60D4 000AA0 0034+00 1/1 0/0 0/0 .text            Delete__16daObj_AutoMata_cFv */
 int daObj_AutoMata_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_AutoMata_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_AutoMata_c();
     return 1;
 }
 
-/* 80BA60D4-80BA639C 000AD4 02C8+00 2/2 0/0 0/0 .text            Execute__16daObj_AutoMata_cFv */
 int daObj_AutoMata_c::Execute() {
     if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
         cXyz sphCenter;
@@ -170,7 +158,6 @@ int daObj_AutoMata_c::Execute() {
     return 0;
 }
 
-/* 80BA639C-80BA6480 000D9C 00E4+00 1/1 0/0 0/0 .text            Draw__16daObj_AutoMata_cFv */
 int daObj_AutoMata_c::Draw() {
     J3DModel* morfModel = mpMorf->getModel();
     J3DModelData* modelData = morfModel->getModelData();
@@ -188,14 +175,10 @@ int daObj_AutoMata_c::Draw() {
     return 1;
 }
 
-/* 80BA6480-80BA64A0 000E80 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__16daObj_AutoMata_cFP10fopAc_ac_c         */
 int daObj_AutoMata_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_AutoMata_c*>(i_this)->CreateHeap();
 }
 
-/* 80BA64A0-80BA6500 000EA0 0060+00 1/1 0/0 0/0 .text
- * srchTHouse__16daObj_AutoMata_cFP10fopAc_ac_cPv               */
 void* daObj_AutoMata_c::srchTHouse(fopAc_ac_c* actor, void* param_1) {
     if (fopAcM_GetName(actor) == PROC_Obj_TobyHouse) {
         if (fopAcM_IsExecuting(fopAcM_GetID(actor))) {
@@ -205,23 +188,18 @@ void* daObj_AutoMata_c::srchTHouse(fopAc_ac_c* actor, void* param_1) {
     return NULL;
 }
 
-/* ############################################################################################## */
-/* 80BA6C78-80BA6C80 000068 0008+00 0/1 0/0 0/0 .rodata          bckArcIx$4220 */
 static int const bckArcIx[2] = {
     5, 6,
 };
 
-/* 80BA6C80-80BA6C88 000070 0008+00 0/1 0/0 0/0 .rodata          btkArcIx$4221 */
 static int const btkArcIx[2] = {
     12, 13,
 };
 
-/* 80BA6C88-80BA6C90 000078 0008+00 0/1 0/0 0/0 .rodata          playMode$4222 */
 static int const playMode[2] = {
     0, 2,
 };
 
-/* 80BA6500-80BA6634 000F00 0134+00 1/1 0/0 1/1 .text            setAnm__16daObj_AutoMata_cFib */
 int daObj_AutoMata_c::setAnm(int param_1, bool param_2) {
     J3DModelData* modelData = mpMorf->getModel()->getModelData();
     const char* resName = l_resNameList[l_bmdData[field_0xb30][1]];
@@ -246,20 +224,17 @@ int daObj_AutoMata_c::setAnm(int param_1, bool param_2) {
     return 0;
 }
 
-/* 80BA6634-80BA6690 001034 005C+00 2/2 0/0 0/0 .text setEnvTevColor__16daObj_AutoMata_cFv */
 void daObj_AutoMata_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80BA6690-80BA66D4 001090 0044+00 2/2 0/0 0/0 .text            setRoomNo__16daObj_AutoMata_cFv */
 void daObj_AutoMata_c::setRoomNo() {
     s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStts.SetRoomId(roomId);
 }
 
-/* 80BA66D4-80BA674C 0010D4 0078+00 1/1 0/0 0/0 .text            setMtx__16daObj_AutoMata_cFv */
 void daObj_AutoMata_c::setMtx() {
     J3DModel* morfModel = mpMorf->getModel();
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -269,7 +244,6 @@ void daObj_AutoMata_c::setMtx() {
     mpMorf->modelCalc();
 }
 
-/* 80BA674C-80BA6A10 00114C 02C4+00 1/1 0/0 0/0 .text            setSe__16daObj_AutoMata_cFv */
 void daObj_AutoMata_c::setSe() {
     if (cM3d_IsZero(mpMorf->getPlaySpeed()) == false) {
         const char* resName = l_resNameList[l_bmdData[field_0xb30][1]];
@@ -305,35 +279,28 @@ void daObj_AutoMata_c::setSe() {
     }
 }
 
-/* 80BA6A10-80BA6A30 001410 0020+00 1/0 0/0 0/0 .text            daObj_AutoMata_Create__FPv */
 static int daObj_AutoMata_Create(void* i_this) {
     return static_cast<daObj_AutoMata_c*>(i_this)->create();
 }
 
-/* 80BA6A30-80BA6A50 001430 0020+00 1/0 0/0 0/0 .text            daObj_AutoMata_Delete__FPv */
 static int daObj_AutoMata_Delete(void* i_this) {
     return static_cast<daObj_AutoMata_c*>(i_this)->Delete();
 }
 
-/* 80BA6A50-80BA6A70 001450 0020+00 1/0 0/0 0/0 .text            daObj_AutoMata_Execute__FPv */
 static int daObj_AutoMata_Execute(void* i_this) {
     return static_cast<daObj_AutoMata_c*>(i_this)->Execute();
 }
 
-/* 80BA6A70-80BA6A90 001470 0020+00 1/0 0/0 0/0 .text            daObj_AutoMata_Draw__FPv */
 static int daObj_AutoMata_Draw(void* i_this) {
     return static_cast<daObj_AutoMata_c*>(i_this)->Draw();
 }
 
-/* 80BA6A90-80BA6A98 001490 0008+00 1/0 0/0 0/0 .text            daObj_AutoMata_IsDelete__FPv */
 static int daObj_AutoMata_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80BA6E5C-80BA6E60 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_AutoMata_Param_c l_HIO;
 
-/* 80BA6D64-80BA6D84 -00001 0020+00 1/0 0/0 0/0 .data            daObj_AutoMata_MethodTable */
 static actor_method_class daObj_AutoMata_MethodTable = {
     (process_method_func)daObj_AutoMata_Create,
     (process_method_func)daObj_AutoMata_Delete,
@@ -342,7 +309,6 @@ static actor_method_class daObj_AutoMata_MethodTable = {
     (process_method_func)daObj_AutoMata_Draw,
 };
 
-/* 80BA6D84-80BA6DB4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_AUTOMATA */
 extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = {
   fpcLy_CURRENT_e,             // mLayerID
   8,                           // mListID
diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp
index cb3d556457..bbf615e0dc 100644
--- a/src/d/actor/d_a_obj_avalanche.cpp
+++ b/src/d/actor/d_a_obj_avalanche.cpp
@@ -11,26 +11,20 @@
 #include "d/actor/d_a_player.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80BA6ED8-80BA6F14 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjAvalanche_cFv
- */
 void daObjAvalanche_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* ############################################################################################## */
-/* 80BA7CFC-80BA7D04 000000 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static u32 const l_dzb[2] = {
     13, 12,
 };
 
-/* 80BA7D04-80BA7D1C 000008 0018+00 1/1 0/0 0/0 .rodata          l_check_pos */
 static Vec const l_check_pos[2] = {
     {-300.0f, 0.0f, 0.0f},
     {300.0f, 0.0f, 300.0f},
 };
 
-/* 80BA6F14-80BA6FC8 0000B4 00B4+00 3/3 0/0 0/0 .text            setBaseMtx__16daObjAvalanche_cFv */
 void daObjAvalanche_c::setBaseMtx() {
     mDoMtx_stack_c::transS(0.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::YrotM(0);
@@ -41,22 +35,17 @@ void daObjAvalanche_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx2);
 }
 
-/* 80BA7D90-80BA7D94 -00001 0004+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_Yuki";
 
-/* 80BA7D94-80BA7D98 -00001 0004+00 0/1 0/0 0/0 .data            l_evName */
 static char* l_evName = "SNOW_COLLAPSE";
 
-/* 80BA7D98-80BA7D9C -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "Obj_ava";
 
-/* 80BA7D9C-80BA7DB4 00002C 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static f32 l_cull_box[6] = {
     -500.0f, -500.0f, -700.0f,
     500.0f, 1000.0f, 700.0f,
 };
 
-/* 80BA6FC8-80BA7178 000168 01B0+00 1/0 0/0 0/0 .text            Create__16daObjAvalanche_cFv */
 int daObjAvalanche_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         field_0x5e4 = 0.0f;
@@ -89,7 +78,6 @@ int daObjAvalanche_c::Create() {
     return 1;
 }
 
-/* 80BA7178-80BA7328 000318 01B0+00 1/0 0/0 0/0 .text            CreateHeap__16daObjAvalanche_cFv */
 int daObjAvalanche_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9);
     JUT_ASSERT(233, modelData != NULL);
@@ -115,7 +103,6 @@ int daObjAvalanche_c::CreateHeap() {
     return 1;
 }
 
-/* 80BA7370-80BA73F4 000510 0084+00 1/1 0/0 0/0 .text            create1st__16daObjAvalanche_cFv */
 int daObjAvalanche_c::create1st() {
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -127,7 +114,6 @@ int daObjAvalanche_c::create1st() {
     return rv;
 }
 
-/* 80BA73F4-80BA7440 000594 004C+00 1/0 0/0 0/0 .text Execute__16daObjAvalanche_cFPPA3_A4_f */
 int daObjAvalanche_c::Execute(Mtx** param_1) {
     event_proc_call();
     *param_1 = &mBgMtx;
@@ -135,8 +121,6 @@ int daObjAvalanche_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BA7440-80BA75A4 0005E0 0164+00 1/1 0/0 0/0 .text            checkCollapse__16daObjAvalanche_cFv
- */
 int daObjAvalanche_c::checkCollapse() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (!daPy_py_c::checkNowWolf()) {
@@ -162,7 +146,6 @@ int daObjAvalanche_c::checkCollapse() {
     }
 }
 
-/* 80BA75A4-80BA7618 000744 0074+00 1/1 0/0 0/0 .text            move__16daObjAvalanche_cFv */
 int daObjAvalanche_c::move() {
     int rv = 0;
     if (cLib_chaseF(&field_0x5e4, 0.0f, 40.0f)) {
@@ -175,7 +158,6 @@ int daObjAvalanche_c::move() {
     return rv;
 }
 
-/* 80BA7618-80BA76D4 0007B8 00BC+00 1/1 0/0 0/0 .text event_proc_call__16daObjAvalanche_cFv */
 void daObjAvalanche_c::event_proc_call() {
     typedef void (daObjAvalanche_c::*actionFunc)();
     static actionFunc l_func[4] = {
@@ -187,7 +169,6 @@ void daObjAvalanche_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80BA76D4-80BA773C 000874 0068+00 1/0 0/0 0/0 .text            actionWait__16daObjAvalanche_cFv */
 void daObjAvalanche_c::actionWait() {
     if (checkCollapse()) {
         setAction(ACTION_ORDER_EVENT);
@@ -196,7 +177,6 @@ void daObjAvalanche_c::actionWait() {
     }
 }
 
-/* 80BA773C-80BA7804 0008DC 00C8+00 1/0 0/0 0/0 .text actionOrderEvent__16daObjAvalanche_cFv */
 void daObjAvalanche_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT);
@@ -211,8 +191,6 @@ void daObjAvalanche_c::actionOrderEvent() {
     }
 }
 
-/* 80BA7804-80BA7888 0009A4 0084+00 1/0 0/0 0/0 .text            actionEvent__16daObjAvalanche_cFv
- */
 void daObjAvalanche_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         setAction(ACTION_DEAD);
@@ -223,17 +201,14 @@ void daObjAvalanche_c::actionEvent() {
     }
 }
 
-/* 80BA7888-80BA788C 000A28 0004+00 1/0 0/0 0/0 .text            actionDead__16daObjAvalanche_cFv */
 void daObjAvalanche_c::actionDead() {
 }
 
-/* 80BA7E14-80BA7E1C -00001 0008+00 1/1 0/0 0/0 .data            action_table$3910 */
 static char* action_table[2] = {
     "WAIT",
     "COLLAPSE",
 };
 
-/* 80BA788C-80BA7A50 000A2C 01C4+00 2/2 0/0 0/0 .text            demoProc__16daObjAvalanche_cFv */
 int daObjAvalanche_c::demoProc() {
     daPy_getPlayerActorClass();
     int actIdx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 2, 0, 0);
@@ -273,7 +248,6 @@ int daObjAvalanche_c::demoProc() {
     return 0;
 }
 
-/* 80BA7A50-80BA7AE8 000BF0 0098+00 1/1 0/0 0/0 .text            setEffect__16daObjAvalanche_cFv */
 void daObjAvalanche_c::setEffect() {
     cXyz acStack_18(0.0f, 0.0f, 0.0f);
     csXyz cStack_20(0, 0, 0);
@@ -281,7 +255,6 @@ void daObjAvalanche_c::setEffect() {
                           NULL);
 }
 
-/* 80BA7AE8-80BA7BA0 000C88 00B8+00 1/0 0/0 0/0 .text            Draw__16daObjAvalanche_cFv */
 int daObjAvalanche_c::Draw() {
     g_env_light.settingTevStruct(32, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -292,7 +265,6 @@ int daObjAvalanche_c::Draw() {
     return 1;
 }
 
-/* 80BA7BA0-80BA7C0C 000D40 006C+00 1/0 0/0 0/0 .text            Delete__16daObjAvalanche_cFv */
 int daObjAvalanche_c::Delete() {
     if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW2);
@@ -301,39 +273,29 @@ int daObjAvalanche_c::Delete() {
     return 1;
 }
 
-/* 80BA7C0C-80BA7C6C 000DAC 0060+00 1/0 0/0 0/0 .text
- * daObjAvalanche_create1st__FP16daObjAvalanche_c               */
 static int daObjAvalanche_create1st(daObjAvalanche_c* i_this) {
     fopAcM_ct(i_this, daObjAvalanche_c);
     return i_this->create1st();
 }
 
-/* 80BA7C6C-80BA7C8C 000E0C 0020+00 1/0 0/0 0/0 .text
- * daObjAvalanche_MoveBGDelete__FP16daObjAvalanche_c            */
 static int daObjAvalanche_MoveBGDelete(daObjAvalanche_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BA7C8C-80BA7CAC 000E2C 0020+00 1/0 0/0 0/0 .text
- * daObjAvalanche_MoveBGExecute__FP16daObjAvalanche_c           */
 static int daObjAvalanche_MoveBGExecute(daObjAvalanche_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BA7CAC-80BA7CD8 000E4C 002C+00 1/0 0/0 0/0 .text
- * daObjAvalanche_MoveBGDraw__FP16daObjAvalanche_c              */
 static int daObjAvalanche_MoveBGDraw(daObjAvalanche_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BA7E1C-80BA7E3C -00001 0020+00 1/0 0/0 0/0 .data            daObjAvalanche_METHODS */
 static actor_method_class daObjAvalanche_METHODS = {
     (process_method_func)daObjAvalanche_create1st,  (process_method_func)daObjAvalanche_MoveBGDelete,
     (process_method_func)daObjAvalanche_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjAvalanche_MoveBGDraw,
 };
 
-/* 80BA7E3C-80BA7E6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Avalanche */
 extern actor_process_profile_definition g_profile_Obj_Avalanche = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp
index 4dbfb55574..b36140b816 100644
--- a/src/d/actor/d_a_obj_balloon.cpp
+++ b/src/d/actor/d_a_obj_balloon.cpp
@@ -18,7 +18,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/actor/d_a_balloon_2D.h"
 
-/* 80BA7FAC-80BA7FF4 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__19daObj_Balloon_HIO_cFv */
 daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() {
     field_0x04 = -1;
 
@@ -31,7 +30,6 @@ daObj_Balloon_HIO_c::daObj_Balloon_HIO_c() {
     mScore[daObj_Balloon_c::SIZE_SMALL_e] = 10.0f;
 }
 
-/* 80BA7FF4-80BA80D4 000134 00E0+00 1/1 0/0 0/0 .text            draw__15daObj_Balloon_cFv */
 int daObj_Balloon_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -46,42 +44,28 @@ int daObj_Balloon_c::draw() {
     return 1;
 }
 
-/* 80BA80D4-80BA80F4 000214 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Draw__FP15daObj_Balloon_c */
 static int daObj_Balloon_Draw(daObj_Balloon_c* i_this) {
     return i_this->draw();
 }
 
 namespace {
-/* 80BA8E7C-80BA8E80 000020 0004+00 0/1 0/0 0/0 .data
- * m_combo_type__29@unnamed@d_a_obj_balloon_cpp@                */
 static int m_combo_type = 0xFFFFFFFF;
 
-/* 80BA8FF0-80BA8FF4 000048 0004+00 0/1 0/0 0/0 .bss
- * m_combo_count__29@unnamed@d_a_obj_balloon_cpp@               */
 static int m_combo_count;
 
-/* 80BA8FF4-80BA8FF8 00004C 0004+00 0/1 0/0 0/0 .bss
- * m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@          */
 static int m_combo_next_score;
 
-/* 80BA8FF8-80BA8FFC 000050 0004+00 1/2 0/0 0/0 .bss
- * m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@             */
 static u32 m_balloon_score;
 }  // namespace
 
-/* 80BA80F4-80BA810C 000234 0018+00 0/0 0/0 1/1 .text            saveBestScore__15daObj_Balloon_cFv
- */
 void daObj_Balloon_c::saveBestScore() {
     dComIfGp_setMessageCountNumber(m_balloon_score);
 }
 
-/* 80BA8FFC-80BA9000 000054 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80BA900C-80BA902C 000064 0020+00 4/5 0/0 0/0 .bss             l_HIO */
 static daObj_Balloon_HIO_c l_HIO;
 
-/* 80BA810C-80BA81B8 00024C 00AC+00 1/1 0/0 0/0 .text            cc_set__15daObj_Balloon_cFv */
 void daObj_Balloon_c::cc_set() {
     cXyz cc_center;
     mDoMtx_stack_c::copy(mModel->getBaseTRMtx());
@@ -94,7 +78,6 @@ void daObj_Balloon_c::cc_set() {
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80BA81B8-80BA865C 0002F8 04A4+00 1/1 0/0 0/0 .text            action__15daObj_Balloon_cFv */
 void daObj_Balloon_c::action() {
     static u16 kago_wall_hit_id[2] = {0x8A12, 0x8A13};
     static f32 kago_effect_scale[3] = {4.0f, 1.5f, 0.8f};
@@ -195,7 +178,6 @@ void daObj_Balloon_c::action() {
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
 }
 
-/* 80BA865C-80BA86CC 00079C 0070+00 1/1 0/0 0/0 .text            mtx_set__15daObj_Balloon_cFv */
 void daObj_Balloon_c::mtx_set() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -203,7 +185,6 @@ void daObj_Balloon_c::mtx_set() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BA86CC-80BA870C 00080C 0040+00 1/1 0/0 0/0 .text            execute__15daObj_Balloon_cFv */
 int daObj_Balloon_c::execute() {
     action();
     cc_set();
@@ -211,19 +192,14 @@ int daObj_Balloon_c::execute() {
     return 1;
 }
 
-/* 80BA870C-80BA872C 00084C 0020+00 2/1 0/0 0/0 .text daObj_Balloon_Execute__FP15daObj_Balloon_c
- */
 static int daObj_Balloon_Execute(daObj_Balloon_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BA872C-80BA8734 00086C 0008+00 1/0 0/0 0/0 .text daObj_Balloon_IsDelete__FP15daObj_Balloon_c
- */
 static int daObj_Balloon_IsDelete(daObj_Balloon_c* i_this) {
     return 1;
 }
 
-/* 80BA8734-80BA87AC 000874 0078+00 1/1 0/0 0/0 .text            _delete__15daObj_Balloon_cFv */
 int daObj_Balloon_c::_delete() {
     dComIfG_resDelete(&mPhase, "Obj_bal");
     Z2GetAudioMgr()->seStop(Z2SE_OBJ_WATERMILL_ROUND, 0);
@@ -233,12 +209,10 @@ int daObj_Balloon_c::_delete() {
     return 1;
 }
 
-/* 80BA87AC-80BA87CC 0008EC 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Delete__FP15daObj_Balloon_c */
 static int daObj_Balloon_Delete(daObj_Balloon_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BA87CC-80BA88A4 00090C 00D8+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Balloon_cFv */
 int daObj_Balloon_c::CreateHeap() {
     J3DModelData* modelData;
     if (mType == SIZE_LARGE_e) {
@@ -253,12 +227,10 @@ int daObj_Balloon_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BA88A4-80BA88C4 0009E4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObj_Balloon_c*>(i_this)->CreateHeap();
 }
 
-/* 80BA88C4-80BA8B30 000A04 026C+00 1/1 0/0 0/0 .text            create__15daObj_Balloon_cFv */
 int daObj_Balloon_c::create() {
     fopAcM_ct(this, daObj_Balloon_c);
     mType = fopAcM_GetParam(this);
@@ -313,19 +285,16 @@ int daObj_Balloon_c::create() {
     return phase_state;
 }
 
-/* 80BA8CFC-80BA8D1C 000E3C 0020+00 1/0 0/0 0/0 .text daObj_Balloon_Create__FP15daObj_Balloon_c */
 static int daObj_Balloon_Create(daObj_Balloon_c* i_this) {
     return i_this->create();
 }
 
-/* 80BA8EE8-80BA8F08 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Balloon_Method */
 static actor_method_class l_daObj_Balloon_Method = {
     (process_method_func)daObj_Balloon_Create,  (process_method_func)daObj_Balloon_Delete,
     (process_method_func)daObj_Balloon_Execute, (process_method_func)daObj_Balloon_IsDelete,
     (process_method_func)daObj_Balloon_Draw,
 };
 
-/* 80BA8F08-80BA8F38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_BALLOON */
 extern actor_process_profile_definition g_profile_OBJ_BALLOON = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp
index 9a938e983e..a7e179193b 100644
--- a/src/d/actor/d_a_obj_barDesk.cpp
+++ b/src/d/actor/d_a_obj_barDesk.cpp
@@ -10,13 +10,10 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BA9D24-80BA9D2C 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daBarDesk_HIO_c l_HIO;
 
-/* 80BA9D2C-80BA9D30 00001C 0004+00 1/1 0/0 0/0 .bss             None */
 static u8 data_80BA9D2C[4];
 
-/* 80BA9B70-80BA9BA0 000000 0030+00 2/2 0/0 0/0 .rodata          mCcDObjInfo__11daBarDesk_c */
 dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0xD8FAFDBF, 0x11}, {0}}},
     {1, 0, 0, 0, 0},
@@ -24,18 +21,15 @@ dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = {
     {0}
 };
 
-/* 80BA9BDC-80BA9C20 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daBarDesk_c */
 dCcD_SrcCyl daBarDesk_c::mCcDCyl = {
     mCcDObjInfo,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80BA918C-80BA91B8 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__15daBarDesk_HIO_cFv */
 daBarDesk_HIO_c::daBarDesk_HIO_c() : field_0x4(10), field_0x5(3) {
     /* empty function */
 }
 
-/* 80BA9200-80BA9288 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daBarDesk_cFv */
 void daBarDesk_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -43,7 +37,6 @@ void daBarDesk_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BA9288-80BA92F4 0001E8 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daBarDesk_cFv */
 int daBarDesk_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("KHdesk", 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -53,7 +46,6 @@ int daBarDesk_c::CreateHeap() {
     return 1;
 }
 
-/* 80BA92F4-80BA94B8 000254 01C4+00 1/1 0/0 0/0 .text            create__11daBarDesk_cFv */
 cPhs__Step daBarDesk_c::create() {
     fopAcM_ct(this, daBarDesk_c);
     if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) {
@@ -75,7 +67,6 @@ cPhs__Step daBarDesk_c::create() {
     return step;
 }
 
-/* 80BA95A4-80BA95F4 000504 0050+00 1/0 0/0 0/0 .text            Execute__11daBarDesk_cFPPA3_A4_f */
 int daBarDesk_c::Execute(Mtx** i_mtxP) {
     windowProc();
     *i_mtxP = &mpModel->getBaseTRMtx();
@@ -83,7 +74,6 @@ int daBarDesk_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80BA95F4-80BA9680 000554 008C+00 1/1 0/0 0/0 .text            windowProc__11daBarDesk_cFv */
 void daBarDesk_c::windowProc() {
     typedef void (daBarDesk_c::*daBarDesk_modeFunc)();
     static daBarDesk_modeFunc mode_proc[2] = {
@@ -93,12 +83,10 @@ void daBarDesk_c::windowProc() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80BA9680-80BA968C 0005E0 000C+00 1/1 0/0 0/0 .text            init_modeWait__11daBarDesk_cFv */
 void daBarDesk_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80BA968C-80BA973C 0005EC 00B0+00 1/0 0/0 0/0 .text            modeWait__11daBarDesk_cFv */
 void daBarDesk_c::modeWait() {
     if (mColCyl.ChkTgHit()) {
         if (mpBgW != NULL) {
@@ -113,7 +101,6 @@ void daBarDesk_c::modeWait() {
     mColCyl.ClrTgHit();
 }
 
-/* 80BA973C-80BA9824 00069C 00E8+00 1/1 0/0 0/0 .text            init_modeBreak__11daBarDesk_cFv */
 void daBarDesk_c::init_modeBreak() {
     mDoAud_seStart(Z2SE_OBJ_TABLE_BRAKE, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -123,12 +110,10 @@ void daBarDesk_c::init_modeBreak() {
     mMode = 1;
 }
 
-/* 80BA9824-80BA9844 000784 0020+00 1/0 0/0 0/0 .text            modeBreak__11daBarDesk_cFv */
 void daBarDesk_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80BA9844-80BA98E8 0007A4 00A4+00 1/1 0/0 0/0 .text            setBreakEffect__11daBarDesk_cFv */
 void daBarDesk_c::setBreakEffect() {
     static const u16 particle_id[2] = {0x85F4, 0x85F5};
     for (int i = 0; i < 2; i++) {
@@ -137,7 +122,6 @@ void daBarDesk_c::setBreakEffect() {
     }
 }
 
-/* 80BA98E8-80BA998C 000848 00A4+00 1/0 0/0 0/0 .text            Draw__11daBarDesk_cFv */
 int daBarDesk_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -147,35 +131,27 @@ int daBarDesk_c::Draw() {
     return 1;
 }
 
-/* 80BA998C-80BA99BC 0008EC 0030+00 1/0 0/0 0/0 .text            Delete__11daBarDesk_cFv */
 int daBarDesk_c::Delete() {
     dComIfG_resDelete(&mPhase, "KHdesk");
     return 1;
 }
 
-/* 80BA99BC-80BA99E8 00091C 002C+00 1/0 0/0 0/0 .text            daBarDesk_Draw__FP11daBarDesk_c */
 static int daBarDesk_Draw(daBarDesk_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BA99E8-80BA9A08 000948 0020+00 1/0 0/0 0/0 .text            daBarDesk_Execute__FP11daBarDesk_c
- */
 static int daBarDesk_Execute(daBarDesk_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BA9A08-80BA9A28 000968 0020+00 1/0 0/0 0/0 .text            daBarDesk_Delete__FP11daBarDesk_c
- */
 static int daBarDesk_Delete(daBarDesk_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BA9A28-80BA9A48 000988 0020+00 1/0 0/0 0/0 .text            daBarDesk_Create__FP10fopAc_ac_c */
 static cPhs__Step daBarDesk_Create(fopAc_ac_c* i_this) {
     return static_cast<daBarDesk_c*>(i_this)->create();
 }
 
-/* 80BA9C50-80BA9C70 -00001 0020+00 1/0 0/0 0/0 .data            l_daBarDesk_Method */
 static actor_method_class l_daBarDesk_Method = {
     (process_method_func)daBarDesk_Create,
     (process_method_func)daBarDesk_Delete,
@@ -184,7 +160,6 @@ static actor_method_class l_daBarDesk_Method = {
     (process_method_func)daBarDesk_Draw,
 };
 
-/* 80BA9C70-80BA9CA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BarDesk */
 extern actor_process_profile_definition g_profile_Obj_BarDesk = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp
index 2e8cdcdc54..5ef55edd9d 100644
--- a/src/d/actor/d_a_obj_batta.cpp
+++ b/src/d/actor/d_a_obj_batta.cpp
@@ -15,8 +15,8 @@
 
 class daObj_BattaHIO_c : public JORReflexible {
 public:
-    /* 80BA9E2C */ daObj_BattaHIO_c();
-    /* 80BAC874 */ virtual ~daObj_BattaHIO_c() {}
+    daObj_BattaHIO_c();
+    virtual ~daObj_BattaHIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -25,7 +25,6 @@ public:
     /* 0xC */ f32 mModelScaleMale;
 };
 
-/* 80BACA90-80BACAD0 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__27@unnamed@d_a_obj_batta_cpp@ */
 namespace {
 
 static dCcD_SrcSph cc_sph_src = {
@@ -42,17 +41,14 @@ static dCcD_SrcSph cc_sph_src = {
 
 };
 
-/* 80BA9E2C-80BA9E5C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__16daObj_BattaHIO_cFv */
 daObj_BattaHIO_c::daObj_BattaHIO_c() {
     mId = -1;
     mModelScaleMale = 1.0f;
     mModelScaleFemale = 1.4f;
 }
 
-/* 80BACC88-80BACC8C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80BACC98-80BACCA8 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_BattaHIO_c l_HIO;
 
 #ifdef DEBUG
@@ -70,8 +66,6 @@ void daObj_BattaHIO_c::genMessage(JORMContext* ctx) {
 
 #endif
 
-/* 80BA9E5C-80BA9F00 00011C 00A4+00 10/10 0/0 0/0 .text
- * setAction__12daObjBATTA_cFM12daObjBATTA_cFPCvPv_v            */
 void daObjBATTA_c::setAction(actionFunc i_func) {
     if (mActionFunc != NULL) {
         field_0x9e8 = -1;
@@ -84,13 +78,11 @@ void daObjBATTA_c::setAction(actionFunc i_func) {
     (this->*mActionFunc)();
 }
 
-/* 80BAC978-80BAC980 000008 0008+00 0/1 0/0 0/0 .rodata          l_batta_brk_index */
 static u32 const l_batta_brk_index[2] = {
     15,
     14,
 };
 
-/* 80BAC980-80BAC988 000010 0008+00 0/1 0/0 0/0 .rodata          l_batta_btk_index */
 static u32 const l_batta_btk_index[2] = {
     19, 18,
 };
@@ -128,25 +120,19 @@ inline int daObjBATTA_c::CreateHeap() {
     return 1;
 }
 
-/* 80BA9F00-80BAA13C 0001C0 023C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daObjBATTA_c*)i_this)->CreateHeap();
 }
 
-/* 80BAA184-80BAA1A4 000444 0020+00 1/0 0/0 0/0 .text            daObjBATTA_Create__FP10fopAc_ac_c
- */
 static int daObjBATTA_Create(fopAc_ac_c* i_this) {
     return ((daObjBATTA_c*)i_this)->create();
 }
 
-/* 80BAA1A4-80BAA1C8 000464 0024+00 1/0 0/0 0/0 .text            daObjBATTA_Delete__FP12daObjBATTA_c
- */
 static int daObjBATTA_Delete(daObjBATTA_c* i_this) {
     i_this->_delete();
     return 1;
 }
 
-/* 80BAA1C8-80BAA47C 000488 02B4+00 6/0 0/0 0/0 .text            wait__12daObjBATTA_cFv */
 void daObjBATTA_c::wait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (field_0x9e8 == 0) {
@@ -178,7 +164,6 @@ void daObjBATTA_c::wait() {
     }
 }
 
-/* 80BAA47C-80BAAA18 00073C 059C+00 1/0 0/0 0/0 .text            turn__12daObjBATTA_cFv */
 void daObjBATTA_c::turn() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     cXyz* flamePos = player->getKandelaarFlamePos();
@@ -214,7 +199,6 @@ void daObjBATTA_c::turn() {
     }
 }
 
-/* 80BAAA18-80BAAD30 000CD8 0318+00 3/0 0/0 0/0 .text            jump__12daObjBATTA_cFv */
 void daObjBATTA_c::jump() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* flamePos = player->getKandelaarFlamePos();
@@ -246,7 +230,6 @@ void daObjBATTA_c::jump() {
     }
 }
 
-/* 80BAAD30-80BAB234 000FF0 0504+00 1/0 0/0 0/0 .text            fly_up__12daObjBATTA_cFv */
 void daObjBATTA_c::fly_up() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* flamePos = player->getKandelaarFlamePos();
@@ -300,7 +283,6 @@ void daObjBATTA_c::fly_up() {
     }
 }
 
-/* 80BAB234-80BAB500 0014F4 02CC+00 1/0 0/0 0/0 .text            fly_down__12daObjBATTA_cFv */
 void daObjBATTA_c::fly_down() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* flamePos = player->getKandelaarFlamePos();
@@ -331,7 +313,6 @@ void daObjBATTA_c::fly_down() {
     }
 }
 
-/* 80BAB500-80BAB6C8 0017C0 01C8+00 1/0 0/0 0/0 .text            bin_wait__12daObjBATTA_cFv */
 void daObjBATTA_c::bin_wait() {
     if (field_0x9e8 == 0) {
         J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8);
@@ -361,7 +342,6 @@ void daObjBATTA_c::bin_wait() {
     }
 }
 
-/* 80BAB6C8-80BAB820 001988 0158+00 1/0 0/0 0/0 .text            bin_action__12daObjBATTA_cFv */
 void daObjBATTA_c::bin_action() {
     if (field_0x9e8 == 0) {
         J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 6);
@@ -391,7 +371,6 @@ void daObjBATTA_c::bin_action() {
     }
 }
 
-/* 80BAB820-80BAB934 001AE0 0114+00 1/0 0/0 0/0 .text            hook__12daObjBATTA_cFv */
 void daObjBATTA_c::hook() {
     if (field_0x9e8 == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -414,7 +393,6 @@ void daObjBATTA_c::hook() {
     }
 }
 
-/* 80BAB934-80BABA98 001BF4 0164+00 2/0 0/0 0/0 .text            boomerang__12daObjBATTA_cFv */
 void daObjBATTA_c::boomerang() {
     if (field_0x9e8 == 0) {
         mSph.SetTgType(0);
@@ -444,8 +422,6 @@ void daObjBATTA_c::boomerang() {
     }
 }
 
-/* 80BABA98-80BABCA4 001D58 020C+00 9/9 0/0 0/0 .text            batta_setParticle__12daObjBATTA_cFv
- */
 void daObjBATTA_c::batta_setParticle() {
     if (CheckZ()) {
         cLib_chaseF(&mParticleScale, 0.0f, 1.0f);
@@ -481,7 +457,6 @@ void daObjBATTA_c::batta_setParticle() {
     }
 }
 
-/* 80BABCA4-80BABD6C 001F64 00C8+00 1/1 0/0 0/0 .text            action__12daObjBATTA_cFv */
 void daObjBATTA_c::action() {
     fopAcM_posMoveF(this, 0);
 
@@ -499,7 +474,6 @@ void daObjBATTA_c::action() {
     }
 }
 
-/* 80BABD6C-80BABE20 00202C 00B4+00 1/1 0/0 0/0 .text            hit_check__12daObjBATTA_cFv */
 void daObjBATTA_c::hit_check() {
     dCcU_AtInfo info;
     mStts.Move();
@@ -514,10 +488,8 @@ void daObjBATTA_c::hit_check() {
     }
 }
 
-/* 80BACA40-80BACA44 0000D0 0002+02 0/1 0/0 0/0 .rodata          l_batta_sex */
 static u8 const l_batta_sex[2] = {fpcNm_ITEM_M_GRASSHOPPER, fpcNm_ITEM_F_GRASSHOPPER};
 
-/* 80BABE20-80BABFA4 0020E0 0184+00 1/1 0/0 0/0 .text            execute__12daObjBATTA_cFv */
 int daObjBATTA_c::execute() {
     if ( ChkGetDemo()) {
         field_0x57c = field_0x578 + 10000.0f;
@@ -551,7 +523,6 @@ int daObjBATTA_c::execute() {
     return 1;
 }
 
-/* 80BABFA4-80BAC00C 002264 0068+00 1/1 0/0 0/0 .text            _delete__12daObjBATTA_cFv */
 int daObjBATTA_c::_delete() {
     dComIfG_resDelete(&mPhase, "Bat");
 
@@ -567,7 +538,6 @@ int daObjBATTA_c::_delete() {
     return 1;
 }
 
-/* 80BAC00C-80BAC084 0022CC 0078+00 1/1 0/0 0/0 .text            mtx_set__12daObjBATTA_cFv */
 void daObjBATTA_c::mtx_set() {
     J3DModel* model = mpMorf->getModel();
     mDoMtx_stack_c::transS(current.pos);
@@ -599,25 +569,19 @@ inline int daObjBATTA_c::draw() {
     return 1;
 }
 
-/* 80BAC084-80BAC174 002344 00F0+00 1/0 0/0 0/0 .text            daObjBATTA_Draw__FP12daObjBATTA_c
- */
 static int daObjBATTA_Draw(daObjBATTA_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BAC174-80BAC194 002434 0020+00 2/1 0/0 0/0 .text daObjBATTA_Execute__FP12daObjBATTA_c */
 static int daObjBATTA_Execute(daObjBATTA_c* i_this) {
     return i_this->execute();
 }
 
-/* ############################################################################################## */
-/* 80BACA5C-80BACA60 0000EC 0004+00 0/1 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x197, /* dSv_event_flag_c::F_0407 - Misc. - Grasshopper (M) */
     0x198, /* dSv_event_flag_c::F_0408 - Misc. - Grasshopper (F) */
 };
 
-/* 80BAC194-80BAC6A0 002454 050C+00 1/1 0/0 0/0 .text            create__12daObjBATTA_cFv */
 int daObjBATTA_c::create() {
     u8 uVar9 = (fopAcM_GetParam(this) & 0xf00) >> 8;
 
@@ -719,12 +683,10 @@ int daObjBATTA_c::create() {
     return rv;
 }
 
-/* 80BAC86C-80BAC874 002B2C 0008+00 1/0 0/0 0/0 .text daObjBATTA_IsDelete__FP12daObjBATTA_c */
 static int daObjBATTA_IsDelete(daObjBATTA_c* i_this) {
     return 1;
 }
 
-/* 80BACB9C-80BACBBC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBATTA_Method */
 static actor_method_class l_daObjBATTA_Method = {
     (process_method_func)daObjBATTA_Create,
     (process_method_func)daObjBATTA_Delete,
@@ -733,7 +695,6 @@ static actor_method_class l_daObjBATTA_Method = {
     (process_method_func)daObjBATTA_Draw,
 };
 
-/* 80BACBBC-80BACBEC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Batta */
 extern actor_process_profile_definition g_profile_Obj_Batta = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp
index b5a7def5d3..861209be5b 100644
--- a/src/d/actor/d_a_obj_bbox.cpp
+++ b/src/d/actor/d_a_obj_bbox.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80BAD474-80BAD4B8 000000 0044+00 2/2 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0xd8000000, 0x11}, 0x78}},  // mObj
@@ -24,16 +23,13 @@ const static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80BAD4D4-80BAD4D8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_BBox";
 
-/* 80BACD38-80BACD74 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjBBox_cFv */
 void daObjBBox_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BACD74-80BACDD8 0000B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjBBox_cFv */
 void daObjBBox_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -41,7 +37,6 @@ void daObjBBox_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BACDD8-80BACE50 000118 0078+00 1/0 0/0 0/0 .text            Create__11daObjBBox_cFv */
 int daObjBBox_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->mBaseTransformMtx);
@@ -52,14 +47,12 @@ int daObjBBox_c::Create() {
     return 1;
 }
 
-/* 80BACE50-80BACEC0 000190 0070+00 1/0 0/0 0/0 .text            CreateHeap__11daObjBBox_cFv */
 int daObjBBox_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80BACEC0-80BAD030 000200 0170+00 1/1 0/0 0/0 .text            create1st__11daObjBBox_cFv */
 int daObjBBox_c::create1st() {
     fopAcM_ct(this, daObjBBox_c);
 
@@ -76,7 +69,6 @@ int daObjBBox_c::create1st() {
     return phase;
 }
 
-/* 80BAD0C0-80BAD234 000400 0174+00 1/0 0/0 0/0 .text            Execute__11daObjBBox_cFPPA3_A4_f */
 int daObjBBox_c::Execute(Mtx** i_mtx) {
     static const u16 particle_id[5] = {
         0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4,
@@ -102,7 +94,6 @@ int daObjBBox_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BAD234-80BAD2D8 000574 00A4+00 1/0 0/0 0/0 .text            Draw__11daObjBBox_cFv */
 int daObjBBox_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -112,34 +103,28 @@ int daObjBBox_c::Draw() {
     return 1;
 }
 
-/* 80BAD2D8-80BAD30C 000618 0034+00 1/0 0/0 0/0 .text            Delete__11daObjBBox_cFv */
 int daObjBBox_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80BAD30C-80BAD400 00064C 00F4+00 1/0 0/0 0/0 .text daObjBBox_create1st__FP11daObjBBox_c */
 static int daObjBBox_create1st(daObjBBox_c* i_this) {
     fopAcM_ct(i_this, daObjBBox_c);
     return i_this->create1st();
 }
 
-/* 80BAD400-80BAD420 000740 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDelete__FP11daObjBBox_c */
 static int daObjBBox_MoveBGDelete(daObjBBox_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BAD420-80BAD440 000760 0020+00 1/0 0/0 0/0 .text daObjBBox_MoveBGExecute__FP11daObjBBox_c */
 static int daObjBBox_MoveBGExecute(daObjBBox_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BAD440-80BAD46C 000780 002C+00 1/0 0/0 0/0 .text daObjBBox_MoveBGDraw__FP11daObjBBox_c */
 static int daObjBBox_MoveBGDraw(daObjBBox_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BAD4D8-80BAD4F8 -00001 0020+00 1/0 0/0 0/0 .data            daObjBBox_METHODS */
 static actor_method_class daObjBBox_METHODS = {
     (process_method_func)daObjBBox_create1st,
     (process_method_func)daObjBBox_MoveBGDelete,
@@ -148,7 +133,6 @@ static actor_method_class daObjBBox_METHODS = {
     (process_method_func)daObjBBox_MoveBGDraw,
 };
 
-/* 80BAD4F8-80BAD528 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BBox */
 extern actor_process_profile_definition g_profile_Obj_BBox = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp
index d6712742a5..b5d776f286 100644
--- a/src/d/actor/d_a_obj_bed.cpp
+++ b/src/d/actor/d_a_obj_bed.cpp
@@ -12,13 +12,10 @@
 #include "d/actor/d_a_npc.h"
 #include "d/d_procname.h"
 
-/* 80BAE198-80BAE19C -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "KH_Bed";
 
-/* 80BAE168-80BAE178 000000 0010+00 2/2 0/0 0/0 .rodata          m__17daObj_Bed_Param_c */
 daObj_Bed_Param_c::params const daObj_Bed_Param_c::m = {NULL, -3.0f, 1.0f, 600.0f};
 
-/* 80BAD66C-80BAD790 0000EC 0124+00 1/0 0/0 0/0 .text            __dt__11daObj_Bed_cFv */
 daObj_Bed_c::~daObj_Bed_c() {
     if (mpCollider != NULL) {
         dComIfG_Bgsp().Release(mpCollider);
@@ -26,7 +23,6 @@ daObj_Bed_c::~daObj_Bed_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80BAD790-80BADA00 000210 0270+00 1/1 0/0 0/0 .text            create__11daObj_Bed_cFv */
 cPhs__Step daObj_Bed_c::create() {
     fopAcM_ct(this, daObj_Bed_c);
     mType = getType();
@@ -59,7 +55,6 @@ cPhs__Step daObj_Bed_c::create() {
     return step;
 }
 
-/* 80BADB70-80BADC80 0005F0 0110+00 1/1 0/0 0/0 .text            CreateHeap__11daObj_Bed_cFv */
 int daObj_Bed_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4);
     if (model_data == NULL) {
@@ -81,13 +76,11 @@ int daObj_Bed_c::CreateHeap() {
     return 1;
 }
 
-/* 80BADC80-80BADCB4 000700 0034+00 1/1 0/0 0/0 .text            Delete__11daObj_Bed_cFv */
 int daObj_Bed_c::Delete() {
     this->~daObj_Bed_c();
     return 1;
 }
 
-/* 80BADCB4-80BADDF4 000734 0140+00 2/2 0/0 0/0 .text            Execute__11daObj_Bed_cFv */
 int daObj_Bed_c::Execute() {
     mAcch.CrrPos(dComIfG_Bgsp());
     mGndChk = mAcch.m_gnd;
@@ -106,7 +99,6 @@ int daObj_Bed_c::Execute() {
     return 1;
 }
 
-/* 80BADDF4-80BADEB8 000874 00C4+00 1/1 0/0 0/0 .text            Draw__11daObj_Bed_cFv */
 int daObj_Bed_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -120,23 +112,18 @@ int daObj_Bed_c::Draw() {
     return 1;
 }
 
-/* 80BADEB8-80BADED8 000938 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daObj_Bed_cFP10fopAc_ac_c              */
 int daObj_Bed_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_Bed_c*>(i_this)->CreateHeap();
 }
 
-/* 80BADED8-80BADEE0 000958 0008+00 1/1 0/0 0/0 .text            getType__11daObj_Bed_cFv */
 u8 daObj_Bed_c::getType() {
     return 0;
 }
 
-/* 80BADEE0-80BADEF0 000960 0010+00 3/3 0/0 0/0 .text            getResName__11daObj_Bed_cFv */
 char* daObj_Bed_c::getResName() {
     return l_resName;
 }
 
-/* 80BADEF0-80BADF34 000970 0044+00 1/1 0/0 0/0 .text            isDelete__11daObj_Bed_cFv */
 int daObj_Bed_c::isDelete() {
     switch (mType) {
         case 0:
@@ -146,18 +133,15 @@ int daObj_Bed_c::isDelete() {
     }
 }
 
-/* 80BADF34-80BADF90 0009B4 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__11daObj_Bed_cFv */
 void daObj_Bed_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80BADF90-80BADFD0 000A10 0040+00 2/2 0/0 0/0 .text            setRoomNo__11daObj_Bed_cFv */
 void daObj_Bed_c::setRoomNo() {
     fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
 }
 
-/* 80BADFD0-80BAE034 000A50 0064+00 1/1 0/0 0/0 .text            setMtx__11daObj_Bed_cFv */
 void daObj_Bed_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -165,36 +149,29 @@ void daObj_Bed_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BAE034-80BAE054 000AB4 0020+00 1/0 0/0 0/0 .text            daObj_Bed_Create__FPv */
 
 static cPhs__Step daObj_Bed_Create(void* i_this) {
     return static_cast<daObj_Bed_c*>(i_this)->create();
 }
 
-/* 80BAE054-80BAE074 000AD4 0020+00 1/0 0/0 0/0 .text            daObj_Bed_Delete__FPv */
 static int daObj_Bed_Delete(void* i_this) {
     return static_cast<daObj_Bed_c*>(i_this)->Delete();
 }
 
-/* 80BAE074-80BAE094 000AF4 0020+00 1/0 0/0 0/0 .text            daObj_Bed_Execute__FPv */
 static int daObj_Bed_Execute(void* i_this) {
     return static_cast<daObj_Bed_c*>(i_this)->Execute();
 }
 
-/* 80BAE094-80BAE0B4 000B14 0020+00 1/0 0/0 0/0 .text            daObj_Bed_Draw__FPv */
 static int daObj_Bed_Draw(void* i_this) {
     return static_cast<daObj_Bed_c*>(i_this)->Draw();
 }
 
-/* 80BAE0B4-80BAE0BC 000B34 0008+00 1/0 0/0 0/0 .text            daObj_Bed_IsDelete__FPv */
 static int daObj_Bed_IsDelete(void* param_0) {
     return 1;
 }
 
-/* 80BAE264-80BAE268 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Bed_Param_c l_HIO;
 
-/* 80BAE19C-80BAE1BC -00001 0020+00 1/0 0/0 0/0 .data            daObj_Bed_MethodTable */
 static actor_method_class daObj_Bed_MethodTable = {
     (process_method_func)daObj_Bed_Create,
     (process_method_func)daObj_Bed_Delete,
@@ -203,7 +180,6 @@ static actor_method_class daObj_Bed_MethodTable = {
     (process_method_func)daObj_Bed_Draw,
 };
 
-/* 80BAE1BC-80BAE1EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_BED */
 extern actor_process_profile_definition g_profile_OBJ_BED = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp
index 3d02297a3d..8a391b6739 100644
--- a/src/d/actor/d_a_obj_bemos.cpp
+++ b/src/d/actor/d_a_obj_bemos.cpp
@@ -16,20 +16,14 @@
 #include "d/d_s_play.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* ############################################################################################## */
-/* 80BB37B8-80BB37C4 000000 000C+00 13/13 0/0 0/0 .rodata          l_eye_offset */
 static Vec const l_eye_offset = {0.0f, 330.0f, 75.0f};
 
-/* 80BB37C4-80BB37D0 00000C 000C+00 0/1 0/0 0/0 .rodata          l_high_beam_offset */
 static Vec const l_high_beam_offset = {0.0f, 255.0f, 65.0f};
 
-/* 80BB37D0-80BB37DC 000018 000C+00 0/1 0/0 0/0 .rodata          l_mid_beam_offset */
 static Vec const l_mid_beam_offset = {0.0f, 205.0f, 65.0f};
 
-/* 80BB37DC-80BB37E8 000024 000C+00 0/1 0/0 0/0 .rodata          l_low_beam_offset */
 static Vec const l_low_beam_offset = {0.0f, 160.0f, 65.0f};
 
-/* 80BB37E8-80BB3818 000030 0030+00 1/1 0/0 0/0 .rodata          l_craw_offset */
 static Vec const l_craw_offset[4] = {
     {-95.0f, 0.0f, 0.0f},
     {95.0f, 0.0f, 0.0f},
@@ -37,7 +31,6 @@ static Vec const l_craw_offset[4] = {
     {0.0f, 0.0f, 95.0f},
 };
 
-/* 80BB3818-80BB3820 000060 0008+00 1/2 0/0 0/0 .rodata          M_dir_base__9daObjBm_c */
 s16 const daObjBm_c::M_dir_base[4] = {
     0x0000,
     0x4000,
@@ -122,8 +115,6 @@ void daObjBm_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80BAE36C-80BAE4A8 0000EC 013C+00 1/1 0/0 0/0 .text
- * PPCallBack__9daObjBm_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s16 param_2,
                                   dBgW_Base::PushPullLabel pp_field) {
     dBgW::PushPullLabel pp_label = cLib_checkBit<dBgW::PushPullLabel>(pp_field, dBgW::PPLABEL_3);
@@ -166,7 +157,6 @@ fopAc_ac_c* daObjBm_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_actorP, s
     return i_bgActor;
 }
 
-/* 80BAE4A8-80BAE5FC 000228 0154+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -194,7 +184,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80BAE5FC-80BAE68C 00037C 0090+00 1/1 0/0 0/0 .text            initBaseMtx__9daObjBm_cFv */
 void daObjBm_c::initBaseMtx() {
     field_0x10a0.set(0.5f, 0.5f, 1.0f);
     mpModel->setBaseScale(scale);
@@ -203,7 +192,6 @@ void daObjBm_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BAE68C-80BAE778 00040C 00EC+00 2/2 0/0 0/0 .text            setBaseMtx__9daObjBm_cFv */
 void daObjBm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -225,39 +213,29 @@ void daObjBm_c::setBaseMtx() {
     mpModel3->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BB3A94-80BB3A98 -00001 0004+00 8/9 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "Obj_bm";
 
-/* 80BB3A98-80BB3A9C -00001 0004+00 0/1 0/0 0/0 .data            l_eye_matName */
 static const char* l_eye_matName = "bmEye";
 
-/* 80BB3A9C-80BB3AA0 -00001 0004+00 0/1 0/0 0/0 .data            l_head_joint */
 static char* l_head_joint = "head";
 
-/* 80BB3AA0-80BB3AA4 -00001 0004+00 0/1 0/0 0/0 .data            l_bigGear_joint */
 static char* l_bigGear_joint = "cogRed";
 
-/* 80BB3AA4-80BB3AA8 -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear0_joint */
 static char* l_smallGear0_joint = "cogBlue";
 
-/* 80BB3AA8-80BB3AAC -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear1_joint */
 static char* l_smallGear1_joint = "cogGreen";
 
-/* 80BB3AAC-80BB3AB0 -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear2_joint */
 static char* l_smallGear2_joint = "cogYellow";
 
-/* 80BB3AB0-80BB3AC4 00003C 0014+00 0/2 0/0 0/0 .data            l_joint_table */
 static char* l_joint_table[5] = {
     l_head_joint, l_bigGear_joint, l_smallGear0_joint, l_smallGear1_joint, l_smallGear2_joint,
 };
 
-/* 80BB3AC4-80BB3ADC 000050 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-1200.0f, -100.0f, -1200.0f},
     {1200.0f, 400.0f, 1200.0f},
 };
 
-/* 80BB3ADC-80BB3B1C 000068 0040+00 0/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x402020, 0x11}, 0x58}},  // mObj
@@ -270,7 +248,6 @@ static dCcD_SrcSph l_sph_src = {
     }  // mSphAttr
 };
 
-/* 80BB3B1C-80BB3B68 0000A8 004C+00 0/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}},  // mObj
@@ -283,7 +260,6 @@ static dCcD_SrcCps l_cps_src = {
     }  // mCpsAttr
 };
 
-/* 80BB3B68-80BB3BAC 0000F4 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0x0, 0x0}, 0x79}},  // mObj
@@ -298,7 +274,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }  // mCyl
 };
 
-/* 80BAE778-80BAEADC 0004F8 0364+00 1/0 0/0 0/0 .text            Create__9daObjBm_cFv */
 int daObjBm_c::Create() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     mStts.Init(0xff, 0xff, this);
@@ -372,7 +347,6 @@ int daObjBm_c::Create() {
     return 1;
 }
 
-/* 80BAEADC-80BAEF90 00085C 04B4+00 1/0 0/0 0/0 .text            CreateHeap__9daObjBm_cFv */
 int daObjBm_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xd);
     JUT_ASSERT(767, modelData != NULL);
@@ -454,7 +428,6 @@ int daObjBm_c::CreateHeap() {
     return 1;
 }
 
-/* 80BAEFD8-80BAF09C 000D58 00C4+00 1/1 0/0 0/0 .text            create1st__9daObjBm_cFv */
 int daObjBm_c::create1st() {
     if (field_0x100e == 0) {
         field_0x100a = home.angle.x;
@@ -483,7 +456,6 @@ int daObjBm_c::create1st() {
     return phase_state;
 }
 
-/* 80BAF09C-80BAF29C 000E1C 0200+00 1/0 0/0 0/0 .text            Execute__9daObjBm_cFPPA3_A4_f */
 int daObjBm_c::Execute(Mtx** param_0) {
 #ifdef DEBUG
     scale.setall(l_HIO.mBodyScale);
@@ -529,7 +501,6 @@ int daObjBm_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BAF29C-80BAF328 00101C 008C+00 1/1 0/0 0/0 .text            main_proc_call__9daObjBm_cFv */
 void daObjBm_c::main_proc_call() {
     static daObjBm_c::procFunc l_func[] = {
         &daObjBm_c::actionEnBemos,
@@ -539,7 +510,6 @@ void daObjBm_c::main_proc_call() {
     (this->*l_func[field_0xfeb])();
 }
 
-/* 80BAF328-80BAF37C 0010A8 0054+00 1/1 0/0 0/0 .text            initActionEnBemos__9daObjBm_cFv */
 void daObjBm_c::initActionEnBemos() {
     if (mpBgW && mpBgW->ChkUsed()) {
         mpBgW->OffPushPullOk();
@@ -548,7 +518,6 @@ void daObjBm_c::initActionEnBemos() {
     field_0xfeb = 0;
 }
 
-/* 80BAF37C-80BAF46C 0010FC 00F0+00 2/2 0/0 0/0 .text            initActionObjBemos__9daObjBm_cFv */
 void daObjBm_c::initActionObjBemos() {
     if (mpBgW && mpBgW->ChkUsed()) {
         mpBgW->OnPushPullOk();
@@ -576,7 +545,6 @@ void daObjBm_c::initActionObjBemos() {
     field_0xfeb = 1;
 }
 
-/* 80BAF46C-80BAF750 0011EC 02E4+00 1/0 0/0 0/0 .text            actionEnBemos__9daObjBm_cFv */
 void daObjBm_c::actionEnBemos() {
     static daObjBm_c::procFunc l_func[] = {
         &daObjBm_c::actionSwWait, &daObjBm_c::actionWarning, &daObjBm_c::actionFindPlayer,
@@ -627,7 +595,6 @@ void daObjBm_c::actionEnBemos() {
     }
 }
 
-/* 80BAF750-80BAF80C 0014D0 00BC+00 1/0 0/0 0/0 .text            actionObjBemos__9daObjBm_cFv */
 void daObjBm_c::actionObjBemos() {
     static daObjBm_c::modeFunc mode_proc[] = {
         &daObjBm_c::mode_wait,
@@ -639,7 +606,6 @@ void daObjBm_c::actionObjBemos() {
     (this->*mode_proc[field_0x10ac])();
 }
 
-/* 80BAF80C-80BAF8BC 00158C 00B0+00 1/1 0/0 0/0 .text            setCrawCO__9daObjBm_cFv */
 void daObjBm_c::setCrawCO() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(home.angle.y);
@@ -652,7 +618,6 @@ void daObjBm_c::setCrawCO() {
     }
 }
 
-/* 80BAF8F8-80BAFC08 001678 0310+00 1/1 0/0 0/0 .text            calcBeamPos__9daObjBm_cFv */
 void daObjBm_c::calcBeamPos() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 dist = fopAcM_searchPlayerDistanceXZ(this);
@@ -692,7 +657,6 @@ void daObjBm_c::calcBeamPos() {
     mDoMtx_stack_c::multVec(&cStack_3c, &field_0xfcc);
 }
 
-/* 80BAFC08-80BAFF60 001988 0358+00 1/1 0/0 0/0 .text           calcBeamLenAndAt__9daObjBm_cFv */
 void daObjBm_c::calcBeamLenAndAt() {
     cXyz cStack_50 = field_0xfcc - field_0xfb8;
     cXyz cStack_5c(field_0xfb8);
@@ -731,7 +695,6 @@ void daObjBm_c::calcBeamLenAndAt() {
     }
 }
 
-/* 80BAFFA8-80BB0104 001D28 015C+00 1/1 0/0 0/0 .text            checkFindPlayer__9daObjBm_cFv */
 s8 daObjBm_c::checkFindPlayer() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 searchDistance = getSearchDistance();
@@ -775,7 +738,6 @@ s8 daObjBm_c::checkFindPlayer() {
     return ret;
 }
 
-/* 80BB0104-80BB0260 001E84 015C+00 1/1 0/0 0/0 .text            checkSearchPlayer__9daObjBm_cFv */
 s8 daObjBm_c::checkSearchPlayer() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 searchDistance = getSearchDistance();
@@ -819,7 +781,6 @@ s8 daObjBm_c::checkSearchPlayer() {
     return ret;
 }
 
-/* 80BB0260-80BB02B8 001FE0 0058+00 2/2 0/0 0/0 .text            getSearchDistance__9daObjBm_cFv */
 f32 daObjBm_c::getSearchDistance() {
 #if DEBUG
     f32 ret = l_HIO.mSearchDistance;
@@ -834,8 +795,6 @@ f32 daObjBm_c::getSearchDistance() {
     return ret;
 }
 
-/* 80BB02B8-80BB0310 002038 0058+00 1/1 0/0 0/0 .text            getBeamSearchDistance__9daObjBm_cFv
- */
 f32 daObjBm_c::getBeamSearchDistance() {
 #if DEBUG
     f32 ret = l_HIO.mSearchDistance;
@@ -850,7 +809,6 @@ f32 daObjBm_c::getBeamSearchDistance() {
     return ret;
 }
 
-/* 80BB0310-80BB0580 002090 0270+00 1/1 0/0 0/0 .text            effect_proc__9daObjBm_cFv */
 void daObjBm_c::effect_proc() {
     static daObjBm_c::effectFunc l_eff_func[4] = {
         &daObjBm_c::effectWait,
@@ -890,16 +848,13 @@ void daObjBm_c::effect_proc() {
     }
 }
 
-/* 80BB3D14-80BB3D64 0002A0 0050+00 2/2 0/0 0/0 .data            M_lin5__Q29daObjBm_c5Bgc_c */
 daObjBm_c::BgcSrc_c daObjBm_c::Bgc_c::M_lin5[] = {
     {0.0f, 0.0f, 0.0f, 0.0f}, {-0.5f, -0.5f, -1.0f, -1.0f}, {0.5f, -0.5f, 1.0f, -1.0f},
     {0.5f, 0.5f, 1.0f, 1.0f}, {-0.5f, 0.5f, -1.0f, 1.0f},
 };
 
-/* 80BB0580-80BB0584 002300 0004+00 1/0 0/0 0/0 .text            effectWait__9daObjBm_cFv */
 void daObjBm_c::effectWait() {}
 
-/* 80BB0584-80BB0718 002304 0194+00 1/1 0/0 0/0 .text            initEffectSet0__9daObjBm_cFv */
 void daObjBm_c::initEffectSet0() {
     static u16 const eff_id_f[2] = {
         dPa_RM(ID_ZF_S_BM_BROKENEYE_F_L),
@@ -936,16 +891,12 @@ void daObjBm_c::initEffectSet0() {
     field_0xff6 = 1;
 }
 
-/* 80BB0718-80BB071C 002498 0004+00 1/0 0/0 0/0 .text            effectSet0__9daObjBm_cFv */
 void daObjBm_c::effectSet0() {}
 
-/* 80BB071C-80BB0720 00249C 0004+00 1/0 0/0 0/0 .text            effectSet1__9daObjBm_cFv */
 void daObjBm_c::effectSet1() {}
 
-/* 80BB0720-80BB0724 0024A0 0004+00 1/0 0/0 0/0 .text            effectEnd__9daObjBm_cFv */
 void daObjBm_c::effectEnd() {}
 
-/* 80BB0724-80BB0824 0024A4 0100+00 1/1 0/0 0/0 .text            check_to_walk__9daObjBm_cFv */
 int daObjBm_c::check_to_walk() {
     int ret = -1;
     bool bVar1 = true;
@@ -987,7 +938,6 @@ int daObjBm_c::check_to_walk() {
     return ret;
 }
 
-/* 80BB0824-80BB0888 0025A4 0064+00 1/1 0/0 0/0 .text            mode_wait_init__9daObjBm_cFv */
 void daObjBm_c::mode_wait_init() {
     fopAcM_SetSpeedF(this, 0.0f);
     fopAcM_SetGravity(this, -4.0f);
@@ -997,7 +947,6 @@ void daObjBm_c::mode_wait_init() {
     field_0x10ac = 0;
 }
 
-/* 80BB0888-80BB09C8 002608 0140+00 2/1 0/0 0/0 .text            mode_wait__9daObjBm_cFv */
 void daObjBm_c::mode_wait() {
     f32 tmp1 = l_eye_offset.x;
     f32 tmp2 = l_eye_offset.z;
@@ -1030,16 +979,13 @@ void daObjBm_c::mode_wait() {
     }
 }
 
-/* 80BB09C8-80BB09E0 002748 0018+00 1/1 0/0 0/0 .text            mode_walk_init__9daObjBm_cFv */
 void daObjBm_c::mode_walk_init() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x10ac = 1;
 }
 
-/* 80BB3F60-80BB3F90 000080 0030+00 0/1 0/0 0/0 .bss             dir_vec$4972 */
 // static u8 dir_vec[48];
 
-/* 80BB09E0-80BB0DA8 002760 03C8+00 1/0 0/0 0/0 .text            mode_walk__9daObjBm_cFv */
 void daObjBm_c::mode_walk() {
     static cXyz dir_vec[] = {
         cXyz(0.0f, 0.0f, 1.0f),
@@ -1092,30 +1038,25 @@ void daObjBm_c::mode_walk() {
     }
 }
 
-/* 80BB0DA8-80BB0DC0 002B28 0018+00 1/0 0/0 0/0 .text            mode_afl__9daObjBm_cFv */
 void daObjBm_c::mode_afl() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x10ac = 2;
 }
 
-/* 80BB0DC0-80BB0DE4 002B40 0024+00 2/2 0/0 0/0 .text            mode_dead_init__9daObjBm_cFv */
 void daObjBm_c::mode_dead_init() {
     mpBgW->OffPushPullOk();
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x10ac = 3;
 }
 
-/* 80BB0DE4-80BB0DE8 002B64 0004+00 1/0 0/0 0/0 .text            mode_dead__9daObjBm_cFv */
 void daObjBm_c::mode_dead() {}
 
-/* 80BB0DE8-80BB0E0C 002B68 0024+00 2/2 0/0 0/0 .text            clr_moment_cnt__9daObjBm_cFv */
 void daObjBm_c::clr_moment_cnt() {
     for (int i = 0; i < 4; i++) {
         mMomentCnt[i] = 0;
     }
 }
 
-/* 80BB0E0C-80BB0ED0 002B8C 00C4+00 1/1 0/0 0/0 .text            __ct__Q29daObjBm_c5Bgc_cFv */
 daObjBm_c::Bgc_c::Bgc_c() {
     for (int i = 0; i < 23; i++) {
         field_0x0[i] = 0.0f;
@@ -1129,8 +1070,6 @@ daObjBm_c::Bgc_c::Bgc_c() {
     mState = STATE_0_e;
 }
 
-/* ############################################################################################## */
-/* 80BB3898-80BB3A08 0000E0 0170+00 0/0 0/0 0/0 .rodata          M_lin20__Q29daObjBm_c5Bgc_c */
 const daObjBm_c::BgcSrc_c daObjBm_c::Bgc_c::M_lin20[] = {
     {0.0f, 0.0f, 0.0f, 0.0f},    {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, -1.0f, -1.0f},
     {0.0f, -0.5f, 1.0f, -1.0f},  {0.0f, 0.0f, 1.0f, 1.0f},     {-0.5f, 0.0f, -1.0f, 1.0f},
@@ -1146,13 +1085,10 @@ static f32 dummy_rodata_5157() {
     return -G_CM3D_F_INF;
 }
 
-/* 80BB3F9C-80BB4728 0000BC 078C+00 1/2 0/0 0/0 .bss             M_gnd_work__Q29daObjBm_c5Bgc_c */
 dBgS_ObjGndChk daObjBm_c::Bgc_c::M_gnd_work[23];
 
-/* 80BB4734-80BB4788 000854 0054+00 0/1 0/0 0/0 .bss             M_wrt_work__Q29daObjBm_c5Bgc_c */
 dBgS_WtrChk daObjBm_c::Bgc_c::M_wrt_work;
 
-/* 80BB4794-80BB51A4 0008B4 0A10+00 2/3 0/0 0/0 .bss             M_wall_work__Q29daObjBm_c5Bgc_c */
 dBgS_ObjLinChk daObjBm_c::Bgc_c::M_wall_work[23];
 
 static f32 dummy_rodata_5158() {
@@ -1160,8 +1096,6 @@ static f32 dummy_rodata_5158() {
     return 200.0f;
 }
 
-/* 80BB0ED4-80BB1154 002C54 0280+00 1/1 0/0 0/0 .text
- * wall_pos__Q29daObjBm_c5Bgc_cFPC10fopAc_ac_cPCQ29daObjBm_c8BgcSrc_cisf */
 void daObjBm_c::Bgc_c::wall_pos(fopAc_ac_c const* i_actor, daObjBm_c::BgcSrc_c const* i_bgcSrc,
                                 int i_num, s16 param_3, f32 param_4) {
     const s16 sp8C = i_actor->home.angle.y + param_3;
@@ -1213,15 +1147,12 @@ void daObjBm_c::Bgc_c::wall_pos(fopAc_ac_c const* i_actor, daObjBm_c::BgcSrc_c c
     }
 }
 
-/* 80BB1154-80BB1194 002ED4 0040+00 2/2 0/0 0/0 .text
- * chk_wall_pre__Q29daObjBm_c5Bgc_cFPC10fopAc_ac_cPCQ29daObjBm_c8BgcSrc_cis */
 bool daObjBm_c::Bgc_c::chk_wall_pre(fopAc_ac_c const* i_actor, daObjBm_c::BgcSrc_c const* i_bgcSrc,
                                     int i_num, s16 param_3) {
     wall_pos(i_actor, i_bgcSrc, i_num, param_3, 76.0f);
     return field_0x178 >= 0;
 }
 
-/* 80BB1194-80BB11D4 002F14 0040+00 1/1 0/0 0/0 .text            initActionSwWait__9daObjBm_cFv */
 void daObjBm_c::initActionSwWait() {
     field_0xfaa = 0;
     field_0xfac = 0;
@@ -1233,7 +1164,6 @@ void daObjBm_c::initActionSwWait() {
     field_0xfe4 = 0;
 }
 
-/* 80BB11D4-80BB14C8 002F54 02F4+00 1/0 0/0 0/0 .text            actionSwWait__9daObjBm_cFv */
 void daObjBm_c::actionSwWait() {
     cXyz i_sePos;
     switch (field_0xfea) {
@@ -1277,7 +1207,6 @@ void daObjBm_c::actionSwWait() {
     }
 }
 
-/* 80BB14C8-80BB154C 003248 0084+00 3/3 0/0 0/0 .text            initActionWarning__9daObjBm_cFv */
 void daObjBm_c::initActionWarning() {
     if (field_0x102c) {
         field_0x102c->becomeInvalidEmitter();
@@ -1295,7 +1224,6 @@ void daObjBm_c::initActionWarning() {
     field_0xfe4 = 1;
 }
 
-/* 80BB154C-80BB1654 0032CC 0108+00 1/0 0/0 0/0 .text            actionWarning__9daObjBm_cFv */
 void daObjBm_c::actionWarning() {
 #if DEBUG
     field_0xfac = l_HIO.mPatrolRotationSpeed;
@@ -1331,8 +1259,6 @@ void daObjBm_c::actionWarning() {
     field_0xfa8 = field_0xfa6 + field_0xfae;
 }
 
-/* 80BB1654-80BB1814 0033D4 01C0+00 1/1 0/0 0/0 .text            initActionFindPlayer__9daObjBm_cFv
- */
 void daObjBm_c::initActionFindPlayer() {
     mpBrkAnm->init(mpModel->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x13),
                    1, 0, 1.0f, 0, -1);
@@ -1353,7 +1279,6 @@ void daObjBm_c::initActionFindPlayer() {
     field_0xfe4 = 2;
 }
 
-/* 80BB1814-80BB1960 003594 014C+00 1/0 0/0 0/0 .text            actionFindPlayer__9daObjBm_cFv */
 void daObjBm_c::actionFindPlayer() {
     switch (field_0xfea) {
     case 0:
@@ -1392,7 +1317,6 @@ static f32 dummy_rodata_5299() {
     return 110.0f;
 }
 
-/* 80BB1960-80BB1BD0 0036E0 0270+00 1/1 0/0 0/0 .text            initActionAttack__9daObjBm_cFv */
 void daObjBm_c::initActionAttack() {
     static u16 const l_eff_id[2] = {
         dPa_RM(ID_ZF_S_BM_NESSENSRC00),
@@ -1441,7 +1365,6 @@ void daObjBm_c::initActionAttack() {
     field_0xfe4 = 3;
 }
 
-/* 80BB1BD0-80BB248C 003950 08BC+00 1/0 0/0 0/0 .text            actionAttack__9daObjBm_cFv */
 void daObjBm_c::actionAttack() {
     static u16 const l_eff_id[2] = {
         dPa_RM(ID_ZF_S_BM_NESSENBURN00),
@@ -1629,7 +1552,6 @@ void daObjBm_c::actionAttack() {
     }
 }
 
-/* 80BB248C-80BB2700 00420C 0274+00 1/1 0/0 0/0 .text            initActionDead__9daObjBm_cFv */
 void daObjBm_c::initActionDead() {
     if (field_0xf96 > -0x4000 && field_0xf96 < 0x4000) {
         field_0xf98 = 0;
@@ -1685,7 +1607,6 @@ void daObjBm_c::initActionDead() {
     field_0xfe4 = 4;
 }
 
-/* 80BB2700-80BB2AB0 004480 03B0+00 2/0 0/0 0/0 .text            actionDead__9daObjBm_cFv */
 void daObjBm_c::actionDead() {
     switch (field_0xfea) {
     case 0:
@@ -1769,7 +1690,6 @@ void daObjBm_c::actionDead() {
     field_0xfa8 = field_0xfa6 + field_0xfae;
 }
 
-/* 80BB2AB0-80BB2C8C 004830 01DC+00 1/0 0/0 0/0 .text            Draw__9daObjBm_cFv */
 int daObjBm_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -1903,7 +1823,6 @@ void daObjBm_c::debugDraw() {
 }
 #endif
 
-/* 80BB2C8C-80BB2EB8 004A0C 022C+00 1/0 0/0 0/0 .text            Delete__9daObjBm_cFv */
 int daObjBm_c::Delete() {
     for (int i = 0; i < 2; i++) {
         if (field_0xff8[i]) {
@@ -1963,37 +1882,29 @@ int daObjBm_c::Delete() {
     return 1;
 }
 
-/* 80BB2EB8-80BB3078 004C38 01C0+00 1/0 0/0 0/0 .text            daObjBm_create1st__FP9daObjBm_c */
 static int daObjBm_create1st(daObjBm_c* i_this) {
     fopAcM_ct(i_this, daObjBm_c);
     return i_this->create1st();
 }
 
-/* 80BB33DC-80BB33FC 00515C 0020+00 1/0 0/0 0/0 .text            daObjBm_MoveBGDelete__FP9daObjBm_c
- */
 static int daObjBm_MoveBGDelete(daObjBm_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BB33FC-80BB341C 00517C 0020+00 1/0 0/0 0/0 .text            daObjBm_MoveBGExecute__FP9daObjBm_c
- */
 static int daObjBm_MoveBGExecute(daObjBm_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BB341C-80BB3448 00519C 002C+00 1/0 0/0 0/0 .text            daObjBm_MoveBGDraw__FP9daObjBm_c */
 static int daObjBm_MoveBGDraw(daObjBm_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BB3D84-80BB3DA4 -00001 0020+00 1/0 0/0 0/0 .data            daObjBm_METHODS */
 static actor_method_class daObjBm_METHODS = {
     (process_method_func)daObjBm_create1st,     (process_method_func)daObjBm_MoveBGDelete,
     (process_method_func)daObjBm_MoveBGExecute, 0,
     (process_method_func)daObjBm_MoveBGDraw,
 };
 
-/* 80BB3DA4-80BB3DD4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Bemos */
 extern actor_process_profile_definition g_profile_Obj_Bemos = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp
index 285278aeef..fc436642b1 100644
--- a/src/d/actor/d_a_obj_bhashi.cpp
+++ b/src/d/actor/d_a_obj_bhashi.cpp
@@ -10,8 +10,6 @@
 #include "d/actor/d_a_b_mgn.h"
 #include "d/d_s_play.h"
 
-/* 80576A58-80576AC4 000078 006C+00 1/1 0/0 0/0 .text            initCcCylinder__13daObjBHASHI_cFv
- */
 void daObjBHASHI_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -34,7 +32,6 @@ void daObjBHASHI_c::initCcCylinder() {
     mCcCyl.OnTgShield();
 }
 
-/* 80576AC4-80576B34 0000E4 0070+00 1/1 0/0 0/0 .text            setCcCylinder__13daObjBHASHI_cFv */
 void daObjBHASHI_c::setCcCylinder() {
     cXyz pos;
     pos = current.pos;
@@ -43,19 +40,15 @@ void daObjBHASHI_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80576B34-80576B54 000154 0020+00 1/0 0/0 0/0 .text            daObjBHASHI_Create__FP10fopAc_ac_c
- */
 static int daObjBHASHI_Create(fopAc_ac_c* i_this) {
     return ((daObjBHASHI_c*)i_this)->create();
 }
 
-/* 80576B54-80576B78 000174 0024+00 1/0 0/0 0/0 .text daObjBHASHI_Delete__FP13daObjBHASHI_c */
 static int daObjBHASHI_Delete(daObjBHASHI_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80576B78-80576C50 000198 00D8+00 2/2 0/0 0/0 .text            Set_Hahen__13daObjBHASHI_cFv */
 void daObjBHASHI_c::Set_Hahen() {
     csXyz sp8(0, 0, 0);
 
@@ -72,7 +65,6 @@ void daObjBHASHI_c::Set_Hahen() {
     }
 }
 
-/* 80576C50-805771EC 000270 059C+00 1/1 0/0 0/0 .text            Set_Speed__13daObjBHASHI_cFssff */
 void daObjBHASHI_c::Set_Speed(s16 param_0, s16 i_hahenNum, f32 param_2, f32 param_3) {
     csXyz sp24;
     f32 var_f31;
@@ -153,7 +145,6 @@ void daObjBHASHI_c::Set_Speed(s16 param_0, s16 i_hahenNum, f32 param_2, f32 para
     }
 }
 
-/* 805771EC-80577500 00080C 0314+00 1/1 0/0 0/0 .text            Obj_Damage__13daObjBHASHI_cFv */
 void daObjBHASHI_c::Obj_Damage() {
     if (mDamageTimer == 0) {
         mCcStts.Move();
@@ -196,8 +187,6 @@ void daObjBHASHI_c::Obj_Damage() {
     }
 }
 
-/* 80577500-80577794 000B20 0294+00 0/0 0/0 1/1 .text            Obj_Damage__13daObjBHASHI_cF4cXyz
- */
 void daObjBHASHI_c::Obj_Damage(cXyz param_0) {
     field_0x11dc = cLib_targetAngleY(&param_0, &current.pos);
 
@@ -219,13 +208,11 @@ void daObjBHASHI_c::Obj_Damage(cXyz param_0) {
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x100);
 }
 
-/* 80577794-805777A4 000DB4 0010+00 1/1 0/0 0/0 .text            __ct__7Hahen_cFv */
 Hahen_c::Hahen_c() {
     field_0x31 = 0;
     status = 0;
 }
 
-/* 805777A4-80577868 000DC4 00C4+00 1/1 0/0 0/0 .text            Wall_Check__7Hahen_cFv */
 void Hahen_c::Wall_Check() {
     dBgS_LinChk line_chk;
     cXyz end_pos(pos.x + speed.x, pos.y, pos.z + speed.z);
@@ -238,7 +225,6 @@ void Hahen_c::Wall_Check() {
     }
 }
 
-/* 80577868-80577C1C 000E88 03B4+00 1/1 0/0 0/0 .text            HahenMotion__7Hahen_cFv */
 void Hahen_c::HahenMotion() {
     if (status == 0) {
         f32 temp_f31 = 5.0f + nREG_F(16);
@@ -287,7 +273,6 @@ void Hahen_c::HahenMotion() {
     }
 }
 
-/* 80577C1C-80577DA4 00123C 0188+00 1/1 0/0 0/0 .text            CheckCull__7Hahen_cFv */
 bool Hahen_c::CheckCull() {
     if (pos.absXZ(fopAcM_GetPosition(daPy_getPlayerActorClass())) > 1000.0f && !checkViewArea()) {
         return false;
@@ -296,15 +281,12 @@ bool Hahen_c::CheckCull() {
     return true;
 }
 
-/* 80577DA4-80577E24 0013C4 0080+00 1/1 0/0 0/0 .text            checkViewArea__7Hahen_cFv */
 bool Hahen_c::checkViewArea() {
     Vec proj;
     mDoLib_project(&pos, &proj);
     return (proj.x >= -50.0f && proj.x <= 658.0f) && (proj.y >= -50.0f && proj.y <= 498.0f);
 }
 
-/* 80577E24-80577FE0 001444 01BC+00 1/1 0/0 0/0 .text            Rolling__13daObjBHASHI_cFP4cXyzff
- */
 void daObjBHASHI_c::Rolling(cXyz* i_pos, f32 i_range, f32 param_2) {
     fopAcM_GetPosition(daPy_getPlayerActorClass());
     if (mMode == 2) {
@@ -317,7 +299,6 @@ void daObjBHASHI_c::Rolling(cXyz* i_pos, f32 i_range, f32 param_2) {
     }
 }
 
-/* 80577FE0-805781FC 001600 021C+00 1/1 0/0 0/0 .text            Roll_Set__7Hahen_cFP4cXyzfs */
 void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) {
     f32 temp_f30 = param_1 * (2.0f + nREG_F(10) + cM_rndFX(0.2f));
     s16 angle = cLib_targetAngleY(&pos, i_pos);
@@ -337,7 +318,6 @@ void Hahen_c::Roll_Set(cXyz* i_pos, f32 param_1, s16 i_no) {
     rotation.y += (s16)0x1000;
 }
 
-/* 805781FC-805782E4 00181C 00E8+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjBHASHI_cFv */
 void daObjBHASHI_c::setBaseMtx() {
     if (mMode == 2) {
         for (s16 i = 0; i < 60; i++) {
@@ -356,21 +336,16 @@ void daObjBHASHI_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 805782E4-80578310 001904 002C+00 1/0 0/0 0/0 .text            daObjBHASHI_Draw__FP13daObjBHASHI_c
- */
 static int daObjBHASHI_Draw(daObjBHASHI_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80578310-80578330 001930 0020+00 2/1 0/0 0/0 .text daObjBHASHI_Execute__FP13daObjBHASHI_c */
 static int daObjBHASHI_Execute(daObjBHASHI_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80578BF0-80578BF4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "B_Hashi";
 
-/* 80578330-8057842C 001950 00FC+00 1/0 0/0 0/0 .text            CreateHeap__13daObjBHASHI_cFv */
 int daObjBHASHI_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar.bmd");
     JUT_ASSERT(98, modelData != NULL);
@@ -393,7 +368,6 @@ int daObjBHASHI_c::CreateHeap() {
     return 1;
 }
 
-/* 8057842C-805786B4 001A4C 0288+00 1/1 0/0 0/0 .text            create__13daObjBHASHI_cFv */
 int daObjBHASHI_c::create() {
     fopAcM_ct(this, daObjBHASHI_c);
 
@@ -440,19 +414,15 @@ int daObjBHASHI_c::create() {
     return phase_state;
 }
 
-/* 80578780-80578788 001DA0 0008+00 1/0 0/0 0/0 .text daObjBHASHI_IsDelete__FP13daObjBHASHI_c */
 static int daObjBHASHI_IsDelete(daObjBHASHI_c* i_this) {
     return 1;
 }
 
-/* 80578788-805787CC 001DA8 0044+00 1/0 0/0 0/0 .text            Create__13daObjBHASHI_cFv */
 int daObjBHASHI_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 805787CC-805788EC 001DEC 0120+00 1/0 0/0 0/0 .text            Execute__13daObjBHASHI_cFPPA3_A4_f
- */
 int daObjBHASHI_c::Execute(Mtx** param_0) {
     if (mMode != 2) {
         Obj_Damage();
@@ -490,7 +460,6 @@ int daObjBHASHI_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 805788EC-805789E8 001F0C 00FC+00 1/0 0/0 0/0 .text            Draw__13daObjBHASHI_cFv */
 int daObjBHASHI_c::Draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
 
@@ -513,7 +482,6 @@ int daObjBHASHI_c::Draw() {
     return 1;
 }
 
-/* 805789E8-80578A80 002008 0098+00 1/0 0/0 0/0 .text            Delete__13daObjBHASHI_cFv */
 int daObjBHASHI_c::Delete() {
     if (mIsHahenSimpleEntry) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar_hahen.bmd");
@@ -524,7 +492,6 @@ int daObjBHASHI_c::Delete() {
     return 1;
 }
 
-/* 80578BF4-80578C14 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBHASHI_Method */
 static actor_method_class l_daObjBHASHI_Method = {
     (process_method_func)daObjBHASHI_Create,
     (process_method_func)daObjBHASHI_Delete,
@@ -533,7 +500,6 @@ static actor_method_class l_daObjBHASHI_Method = {
     (process_method_func)daObjBHASHI_Draw,
 };
 
-/* 80578C14-80578C44 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BHASHI */
 extern actor_process_profile_definition g_profile_Obj_BHASHI = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp
index 47db20da01..b6118f3af3 100644
--- a/src/d/actor/d_a_obj_bhbridge.cpp
+++ b/src/d/actor/d_a_obj_bhbridge.cpp
@@ -13,13 +13,10 @@
 #include "d/actor/d_a_player.h"
 #include <cmath.h>
 
-/* 80BB5318-80BB5380 000078 0068+00 1/1 0/0 0/0 .text RideOn_Angle__15daObjBhbridge_cFRsfsf */
 void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) {
     cLib_addCalcAngleS(&param_1, param_3 * (param_2 / param_4), 1, 0x100, 1);
 }
 
-/* 80BB5380-80BB558C 0000E0 020C+00 1/1 0/0 0/0 .text            Check_RideOn__15daObjBhbridge_cFv
- */
 int daObjBhbridge_c::Check_RideOn() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& playerPos = fopAcM_GetPosition(player);
@@ -44,13 +41,11 @@ int daObjBhbridge_c::Check_RideOn() {
     return 0;
 }
 
-/* 80BB558C-80BB55B8 0002EC 002C+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjBhbridge_cFv */
 void daObjBhbridge_c::initBaseMtx() {
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80BB55B8-80BB5614 000318 005C+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjBhbridge_cFv */
 void daObjBhbridge_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -58,8 +53,6 @@ void daObjBhbridge_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BB5614-80BB5678 000374 0064+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* i_this, fopAc_ac_c* param_3) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (!((daObjBhbridge_c*)i_this)->field_0x5de &&
@@ -70,30 +63,23 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* i_this, fopAc_ac_c* param_3)
     ((daObjBhbridge_c*)i_this)->Check_RideOn();
 }
 
-/* 80BB5678-80BB56A4 0003D8 002C+00 1/0 0/0 0/0 .text daObjBhbridge_Draw__FP15daObjBhbridge_c */
 static int daObjBhbridge_Draw(daObjBhbridge_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BB56A4-80BB56C4 000404 0020+00 1/0 0/0 0/0 .text daObjBhbridge_Execute__FP15daObjBhbridge_c
- */
 static int daObjBhbridge_Execute(daObjBhbridge_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BB56C4-80BB56CC 000424 0008+00 1/0 0/0 0/0 .text daObjBhbridge_IsDelete__FP15daObjBhbridge_c
- */
 static int daObjBhbridge_IsDelete(daObjBhbridge_c* i_this) {
     return 1;
 }
 
-/* 80BB56CC-80BB56F0 00042C 0024+00 1/0 0/0 0/0 .text daObjBhbridge_Delete__FP15daObjBhbridge_c */
 static int daObjBhbridge_Delete(daObjBhbridge_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BB5FAC-80BB5FB0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "BHBridge";
 
 inline int daObjBhbridge_c::create() {
@@ -120,7 +106,6 @@ inline int daObjBhbridge_c::create() {
     return rv;
 }
 
-/* 80BB5934-80BB59AC 000694 0078+00 1/0 0/0 0/0 .text            CreateHeap__15daObjBhbridge_cFv */
 inline int daObjBhbridge_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_BHbridge.bmd");
     JUT_ASSERT(83, modelData != NULL);
@@ -128,14 +113,12 @@ inline int daObjBhbridge_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BB56F0-80BB58C4 000450 01D4+00 1/0 0/0 0/0 .text daObjBhbridge_Create__FP10fopAc_ac_c */
 static int daObjBhbridge_Create(fopAc_ac_c* a_this) {
     daObjBhbridge_c* i_this = static_cast<daObjBhbridge_c*>(a_this);
     fpc_ProcID id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80BB59AC-80BB5A14 00070C 0068+00 1/0 0/0 0/0 .text            Create__15daObjBhbridge_cFv */
 inline int daObjBhbridge_c::Create() {
     fopAcM_setCullSizeBox(this, -400.0f, -800.0f, -1000.0f, 400.0f, 300.0f, 1000.0f);
     initBaseMtx();
@@ -143,7 +126,6 @@ inline int daObjBhbridge_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BB5A14-80BB5E10 000774 03FC+00 1/0 0/0 0/0 .text Execute__15daObjBhbridge_cFPPA3_A4_f */
 inline int daObjBhbridge_c::Execute(f32 (**i_mtxP)[3][4]) {
     cXyz cStack_5c(current.pos.x, current.pos.y + HREG_F(0), current.pos.z);
     f32 dVar10 = current.pos.y;
@@ -194,7 +176,6 @@ inline int daObjBhbridge_c::Execute(f32 (**i_mtxP)[3][4]) {
     return 1;
 }
 
-/* 80BB5E10-80BB5EB4 000B70 00A4+00 1/0 0/0 0/0 .text            Draw__15daObjBhbridge_cFv */
 inline int daObjBhbridge_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -204,13 +185,11 @@ inline int daObjBhbridge_c::Draw() {
     return 1;
 }
 
-/* 80BB5EB4-80BB5EE8 000C14 0034+00 1/0 0/0 0/0 .text            Delete__15daObjBhbridge_cFv */
 inline int daObjBhbridge_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BB5FB0-80BB5FD0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBhbridge_Method */
 static actor_method_class l_daObjBhbridge_Method = {
     (process_method_func)daObjBhbridge_Create,
     (process_method_func)daObjBhbridge_Delete,
@@ -219,7 +198,6 @@ static actor_method_class l_daObjBhbridge_Method = {
     (process_method_func)daObjBhbridge_Draw,
 };
 
-/* 80BB5FD0-80BB6000 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Bhbridge */
 extern actor_process_profile_definition g_profile_Obj_Bhbridge = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp
index b20579410e..f864ff5874 100644
--- a/src/d/actor/d_a_obj_bk_leaf.cpp
+++ b/src/d/actor/d_a_obj_bk_leaf.cpp
@@ -9,12 +9,10 @@
 #include "d/actor/d_a_obj_carry.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BB60D8-80BB60F8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daBkLeaf_c*>(i_this)->CreateHeap();
 }
 
-/* 80BB60F8-80BB618C 000098 0094+00 2/2 0/0 0/0 .text            setBokkuri__10daBkLeaf_cFv */
 void daBkLeaf_c::setBokkuri() {
     u32 sp10 = 0;
     csXyz currentAngle(current.angle);
@@ -23,20 +21,17 @@ void daBkLeaf_c::setBokkuri() {
                                      fopAcM_GetRoomNo(this), &currentAngle, &scale, -1, 0);
 }
 
-/* 80BB618C-80BB61C8 00012C 003C+00 1/1 0/0 0/0 .text            initBaseMtx__10daBkLeaf_cFv */
 void daBkLeaf_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BB61C8-80BB621C 000168 0054+00 2/2 0/0 0/0 .text            setBaseMtx__10daBkLeaf_cFv */
 void daBkLeaf_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BB621C-80BB629C 0001BC 0080+00 1/1 0/0 0/0 .text            Create__10daBkLeaf_cFv */
 int daBkLeaf_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -52,16 +47,12 @@ int daBkLeaf_c::Create() {
     return 1;
 }
 
-/* 80BB6758-80BB675C -00001 0004+00 2/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "Obj_bkl";
 
-/* 80BB675C-80BB6760 -00001 0004+00 0/1 0/0 0/0 .data            l_bmdName */
 static const char* l_bmdName = "hl.bmd";
 
-/* 80BB6760-80BB6764 -00001 0004+00 0/1 0/0 0/0 .data            l_bckName */
 static const char* l_bckName = "hl_shake1.bck";
 
-/* 80BB629C-80BB63AC 00023C 0110+00 1/1 0/0 0/0 .text            CreateHeap__10daBkLeaf_cFv */
 int daBkLeaf_c::CreateHeap() {
     int retVal;
     mpModel = mDoExt_J3DModel__create(
@@ -82,7 +73,6 @@ int daBkLeaf_c::CreateHeap() {
     return retVal;
 }
 
-/* 80BB63F4-80BB64A8 000394 00B4+00 1/1 0/0 0/0 .text            create__10daBkLeaf_cFv */
 int daBkLeaf_c::create() {
     fopAcM_ct(this, daBkLeaf_c);
     int retVal = dComIfG_resLoad(&mPhase, l_arcName);
@@ -98,7 +88,6 @@ int daBkLeaf_c::create() {
     return retVal;
 }
 
-/* 80BB64A8-80BB65C4 000448 011C+00 1/1 0/0 0/0 .text            execute__10daBkLeaf_cFv */
 int daBkLeaf_c::execute() {
     switch (field_0x57C) {
     case 0:
@@ -134,7 +123,6 @@ int daBkLeaf_c::execute() {
     return 1;
 }
 
-/* 80BB65C4-80BB6654 000564 0090+00 1/1 0/0 0/0 .text            draw__10daBkLeaf_cFv */
 int daBkLeaf_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -144,40 +132,33 @@ int daBkLeaf_c::draw() {
     return 1;
 }
 
-/* 80BB6654-80BB6688 0005F4 0034+00 1/1 0/0 0/0 .text            _delete__10daBkLeaf_cFv */
 int daBkLeaf_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BB6688-80BB66A8 000628 0020+00 1/0 0/0 0/0 .text            daBkLeaf_Draw__FP10daBkLeaf_c */
 static int daBkLeaf_Draw(daBkLeaf_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BB66A8-80BB66C8 000648 0020+00 1/0 0/0 0/0 .text            daBkLeaf_Execute__FP10daBkLeaf_c */
 static int daBkLeaf_Execute(daBkLeaf_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BB66C8-80BB66E8 000668 0020+00 1/0 0/0 0/0 .text            daBkLeaf_Delete__FP10daBkLeaf_c */
 static int daBkLeaf_Delete(daBkLeaf_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BB66E8-80BB6708 000688 0020+00 1/0 0/0 0/0 .text            daBkLeaf_Create__FP10fopAc_ac_c */
 static int daBkLeaf_Create(fopAc_ac_c* i_this) {
     return static_cast<daBkLeaf_c*>(i_this)->create();
 }
 
-/* 80BB6764-80BB6784 -00001 0020+00 1/0 0/0 0/0 .data            l_daBkLeaf_Method */
 static actor_method_class l_daBkLeaf_Method = {
     (process_method_func)daBkLeaf_Create,  (process_method_func)daBkLeaf_Delete,
     (process_method_func)daBkLeaf_Execute, NULL,
     (process_method_func)daBkLeaf_Draw,
 };
 
-/* 80BB6784-80BB67B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BkLeaf */
 extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e,
                                                                 7,
                                                                 fpcLy_CURRENT_e,
diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp
index 41082386e8..d07d39db5d 100644
--- a/src/d/actor/d_a_obj_bkdoor.cpp
+++ b/src/d/actor/d_a_obj_bkdoor.cpp
@@ -13,11 +13,6 @@
 #include "d/d_lib.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Declarations:
-//
-
-/* 80578D18-80578D4C 000078 0034+00 1/1 0/0 0/0 .text            search_door__FPvPv */
 static void* search_door(void* i_actor, void* i_this) {
     if (i_actor != NULL && fopAcM_GetProfName(i_actor) == PROC_Obj_BkDoor &&
         fopAcM_GetParamBit(i_this, 0, 1) != fopAcM_GetParamBit(i_actor, 0, 1))
@@ -27,13 +22,11 @@ static void* search_door(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80578D4C-80578D88 0000AC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjBkDoor_cFv */
 void daObjBkDoor_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80578D88-80578E14 0000E8 008C+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjBkDoor_cFv */
 void daObjBkDoor_c::setBaseMtx() {
     mDoMtx_trans(mDoMtx_stack_c::get(), current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y);
@@ -67,7 +60,6 @@ static Vec const l_roll_crash_check_areaR[] = {
     {0.0f, 0.0f, 140.0f},
 };
 
-/* 80578E14-80578EA0 000174 008C+00 1/0 0/0 0/0 .text            Create__13daObjBkDoor_cFv */
 int daObjBkDoor_c::Create() {
         /* dSv_event_flag_c::F_0011 - Ordon Ranch - Fence jumping complete */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[15])) {
@@ -82,8 +74,6 @@ int daObjBkDoor_c::Create() {
     return TRUE;
 }
 
-/* ############################################################################################## */
-/* 80578EA0-80578F20 000200 0080+00 1/0 0/0 0/0 .text            CreateHeap__13daObjBkDoor_cFv */
 int daObjBkDoor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mOrientation]);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -94,7 +84,6 @@ int daObjBkDoor_c::CreateHeap() {
     return true;
 }
 
-/* 80578F20-80578FC0 000280 00A0+00 1/1 0/0 0/0 .text            create1st__13daObjBkDoor_cFv */
 int daObjBkDoor_c::create1st() {
     mOrientation = fopAcM_GetParamBit(this, 0, 1);
 
@@ -110,7 +99,6 @@ int daObjBkDoor_c::create1st() {
     return step;
 }
 
-/* 80578FC0-8057902C 000320 006C+00 1/1 0/0 0/0 .text            openCheck__13daObjBkDoor_cFv */
 void daObjBkDoor_c::openCheck() {
     if (!mOpenCheckDone) {
         fopAc_ac_c* actor = fopAcM_Search((fopAcIt_JudgeFunc)search_door, this);
@@ -121,7 +109,6 @@ void daObjBkDoor_c::openCheck() {
     }
 }
 
-/* 8057902C-805792E4 00038C 02B8+00 1/0 0/0 0/0 .text            Execute__13daObjBkDoor_cFPPA3_A4_f */
 int daObjBkDoor_c::Execute(Mtx** i_mtxP) {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
                                   /* dSv_event_flag_c::F_0011 - Ordon Ranch - Fence jumping complete */
@@ -178,7 +165,6 @@ int daObjBkDoor_c::Execute(Mtx** i_mtxP) {
     return TRUE;
 }
 
-/* 805792E4-80579388 000644 00A4+00 1/0 0/0 0/0 .text            Draw__13daObjBkDoor_cFv */
 int daObjBkDoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -190,44 +176,34 @@ int daObjBkDoor_c::Draw() {
     return TRUE;
 }
 
-/* 80579388-805793BC 0006E8 0034+00 1/0 0/0 0/0 .text            Delete__13daObjBkDoor_cFv */
 int daObjBkDoor_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return TRUE;
 }
 
-/* 805793BC-8057941C 00071C 0060+00 1/0 0/0 0/0 .text daObjBkDoor_create1st__FP13daObjBkDoor_c */
 static int daObjBkDoor_create1st(daObjBkDoor_c* i_this) {
     fopAcM_ct(i_this, daObjBkDoor_c);
     return i_this->create1st();
 }
 
-/* 8057941C-8057943C 00077C 0020+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGDelete__FP13daObjBkDoor_c
- */
 static int daObjBkDoor_MoveBGDelete(daObjBkDoor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8057943C-8057945C 00079C 0020+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGExecute__FP13daObjBkDoor_c
- */
 static int daObjBkDoor_MoveBGExecute(daObjBkDoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8057945C-80579488 0007BC 002C+00 1/0 0/0 0/0 .text daObjBkDoor_MoveBGDraw__FP13daObjBkDoor_c */
 static int daObjBkDoor_MoveBGDraw(daObjBkDoor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80579548-80579568 -00001 0020+00 1/0 0/0 0/0 .data            daObjBkDoor_METHODS */
 static actor_method_class daObjBkDoor_METHODS = {
     (process_method_func)daObjBkDoor_create1st,     (process_method_func)daObjBkDoor_MoveBGDelete,
     (process_method_func)daObjBkDoor_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjBkDoor_MoveBGDraw,
 };
 
-/* 80579568-80579598 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BkDoor */
 extern actor_process_profile_definition g_profile_Obj_BkDoor = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp
index 1e77ff84e5..e99526ae5d 100644
--- a/src/d/actor/d_a_obj_bky_rock.cpp
+++ b/src/d/actor/d_a_obj_bky_rock.cpp
@@ -10,36 +10,29 @@
 #include "d/d_bg_w.h"
 #include "d/d_model.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80BB6838-80BB6858 000078 0020+00 1/1 0/0 0/0 .text daBkyRock_c_createHeap__FP10fopAc_ac_c */
 static int daBkyRock_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daBkyRock_c*>(i_this)->createHeap();
 }
 
-/* 80BB803C-80BB8040 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "BYRock";
 
-/* 80BB8064-80BB8088 000048 0024+00 1/2 0/0 0/0 .data            s_exeProc__11daBkyRock_c */
 daBkyRock_c::exeProc daBkyRock_c::s_exeProc[3] = {
     &daBkyRock_c::exeModeNoDamage,
     &daBkyRock_c::exeModeDamage,
     &daBkyRock_c::exeModePiece,
 };
 
-/* 80BB6858-80BB6914 000098 00BC+00 2/2 0/0 0/0 .text            __ct__11daBkyRock_cFv */
 daBkyRock_c::daBkyRock_c() {
     mBgW = NULL;
     mMode = MODE_0;
     memset(mModels, 0, sizeof(mModels));
 }
 
-/* 80BB6B5C-80BB6C4C 00039C 00F0+00 1/0 0/0 0/0 .text            __dt__11daBkyRock_cFv */
 daBkyRock_c::~daBkyRock_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80BB6C4C-80BB6D60 00048C 0114+00 1/1 0/0 0/0 .text            create__11daBkyRock_cFv */
 int daBkyRock_c::create() {
     fopAcM_ct(this, daBkyRock_c);
     u8 swBit0 = getSwBit0();
@@ -62,13 +55,11 @@ int daBkyRock_c::create() {
     return rv;
 }
 
-/* 80BB6D60-80BB6D84 0005A0 0024+00 1/1 0/0 0/0 .text            execute__11daBkyRock_cFv */
 int daBkyRock_c::execute() {
     middleExe();
     return 1;
 }
 
-/* 80BB6D84-80BB6EB8 0005C4 0134+00 1/1 0/0 0/0 .text            draw__11daBkyRock_cFv */
 int daBkyRock_c::draw() {
     g_env_light.settingTevStruct( 0,
                                          &current.pos, &tevStr);
@@ -95,7 +86,6 @@ int daBkyRock_c::draw() {
     return 1;
 }
 
-/* 80BB6EB8-80BB6F64 0006F8 00AC+00 1/1 0/0 0/0 .text            Delete__11daBkyRock_cFv */
 int daBkyRock_c::Delete() {
     if (dComIfGp_getVibration().CheckQuake()) {
         dComIfGp_getVibration().StopQuake(0x1f);
@@ -107,39 +97,32 @@ int daBkyRock_c::Delete() {
     return 1;
 }
 
-/* 80BB6F64-80BB6FD4 0007A4 0070+00 3/3 0/0 0/0 .text            setModelMtx__11daBkyRock_cFv */
 void daBkyRock_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mModels[mMode]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BB7EB0-80BB7EBC 000000 000C+00 8/8 0/0 0/0 .rodata          VIBMODE_POWER */
 static int const VIBMODE_POWER[3] = {
     2, 3, 3,
 };
 
-/* 80BB7EBC-80BB7EC4 00000C 0008+00 0/1 0/0 0/0 .rodata          PARTICLE_SCALE */
 static int const PARTICLE_SCALE[2] = {
     0x6D6, 0x8E3,
 };
 
-/* 80BB7EC4-80BB7ECC 000014 0008+00 0/1 0/0 0/0 .rodata          PARTICLE_OFFSET_POS_Y */
 static int const PARTICLE_OFFSET_POS_Y[2] = {
     0x168, 0x12C,
 };
 
-/* 80BB7ECC-80BB7ED4 00001C 0008+00 0/1 0/0 0/0 .rodata          FIRST_PARTICLE_NAME */
 static u16 const FIRST_PARTICLE_NAME[4] = {
     0x89C4, 0x89C5, 0x89C6, 0x89C7,
 };
 
-/* 80BB7ED4-80BB7EE0 000024 000C+00 0/1 0/0 0/0 .rodata          SECOND_PARTICLE_NAME */
 static u16 const SECOND_PARTICLE_NAME[6] = {
     0x89C2, 0x89C3, 0x89C4, 0x89C5, 0x89C6, 0x89C7,
 };
 
-/* 80BB7EE0-80BB7F24 000030 0044+00 0/1 0/0 0/0 .rodata          s_CcDCyl__11daBkyRock_c */
 dCcD_SrcCyl const daBkyRock_c::s_CcDCyl = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x20a0, 0x11}, 0x0}}, // mObj
@@ -154,13 +137,11 @@ dCcD_SrcCyl const daBkyRock_c::s_CcDCyl = {
     } // mCyl
 };
 
-/* 80BB7F24-80BB7F3C 000074 0018+00 1/1 0/0 0/0 .rodata          BMD_IDX$3845 */
 static int const BMD_IDX[2][3] = {
     {4, 5, 8},
     {6, 7, 8},
 };
 
-/* 80BB6FD4-80BB7144 000814 0170+00 1/1 0/0 0/0 .text            createHeap__11daBkyRock_cFv */
 int daBkyRock_c::createHeap() {
     int nameNo = getNameNo();
     for (int i = 0; i < 3; i++) {
@@ -188,24 +169,19 @@ int daBkyRock_c::createHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BB7F3C-80BB7F6C 00008C 0030+00 0/1 0/0 0/0 .rodata          COL_OFFSET_POS$3888 */
 static Vec const COL_OFFSET_POS[2][2] = {
     {{-100.0f, -250.0f, -100.0f}, {100.0f, -250.0f, 0.0f}},
     {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}},
 };
 
-/* 80BB7F6C-80BB7F7C 0000BC 0010+00 0/1 0/0 0/0 .rodata          COL_INIT_HEIGHT$3889 */
 static int const COL_INIT_HEIGHT[2][2] = {
     {0x190, 0x28A}, {0x384, 0x384},
 };
 
-/* 80BB7F7C-80BB7F8C 0000CC 0010+00 0/1 0/0 0/0 .rodata          COL_INIT_RADIUS$3890 */
 static int const COL_INIT_RADIUS[2][2] = {
     0xFA, 0x226, 0x28A, 0x320,
 };
 
-/* 80BB7144-80BB72FC 000984 01B8+00 1/1 0/0 0/0 .text            init__11daBkyRock_cFv */
 void daBkyRock_c::init() {
     mMode = MODE_0;
     field_0x57a = false;
@@ -230,14 +206,12 @@ void daBkyRock_c::init() {
     fopAcM_setCullSizeBox(this, -800.0f, -500.0f, -800.0f, 800.0f, 1000.0f, 800.0f);
 }
 
-/* 80BB72FC-80BB7364 000B3C 0068+00 1/1 0/0 0/0 .text            middleExe__11daBkyRock_cFv */
 void daBkyRock_c::middleExe() {
     if (s_exeProc[mMode] != NULL) {
         (this->*(s_exeProc[mMode]))();
     }
 }
 
-/* 80BB7364-80BB7458 000BA4 00F4+00 1/0 0/0 0/0 .text            exeModeNoDamage__11daBkyRock_cFv */
 void daBkyRock_c::exeModeNoDamage() {
     if (chkHitBombArrow()) {
         initChangeModeBefore();
@@ -252,7 +226,6 @@ void daBkyRock_c::exeModeNoDamage() {
     }
 }
 
-/* 80BB7458-80BB75D8 000C98 0180+00 1/0 0/0 0/0 .text            exeModeDamage__11daBkyRock_cFv */
 void daBkyRock_c::exeModeDamage() {
     if (mVibrationTimer != 0) {
         mVibrationTimer--;
@@ -282,7 +255,6 @@ void daBkyRock_c::exeModeDamage() {
     }
 }
 
-/* 80BB75D8-80BB7690 000E18 00B8+00 1/0 0/0 0/0 .text            exeModePiece__11daBkyRock_cFv */
 void daBkyRock_c::exeModePiece() {
     pieceMove();
     if (mVibrationTimer != 0) {
@@ -297,7 +269,6 @@ void daBkyRock_c::exeModePiece() {
     }
 }
 
-/* 80BB7690-80BB776C 000ED0 00DC+00 2/2 0/0 0/0 .text            chkHitBombArrow__11daBkyRock_cFv */
 bool daBkyRock_c::chkHitBombArrow() {
     if (getNameNo() == 1) {
         u8 swBit1 = getSwBit1();
@@ -317,25 +288,20 @@ bool daBkyRock_c::chkHitBombArrow() {
     return 0;
 }
 
-/* ############################################################################################## */
-/* 80BB7FB4-80BB7FBC 000104 0008+00 0/1 0/0 0/0 .rodata          VIBMODE_TIMER$4051 */
 static int const VIBMODE_TIMER[2] = {
     30, 40,
 };
 
-/* 80BB776C-80BB77FC 000FAC 0090+00 2/2 0/0 0/0 .text initChangeModeBefore__11daBkyRock_cFv */
 void daBkyRock_c::initChangeModeBefore() {
     dComIfGp_getVibration().StartQuake(VIBMODE_POWER[mMode], 0x1f, cXyz(0.0f, 1.0f, 0.0f));
     mVibrationTimer = VIBMODE_TIMER[mMode];
     pieceMoveInit();
 }
 
-/* 80BB77FC-80BB7818 00103C 001C+00 2/2 0/0 0/0 .text initChangeModeAfter__11daBkyRock_cFv */
 void daBkyRock_c::initChangeModeAfter() {
     fopAcM_SetMtx(this, mModels[mMode]->getBaseTRMtx());
 }
 
-/* 80BB7818-80BB7988 001058 0170+00 2/2 0/0 0/0 .text            pieceMove__11daBkyRock_cFv */
 void daBkyRock_c::pieceMove() {
     if (field_0x57a) {
         f32 dVar5 = current.pos.y;
@@ -365,33 +331,26 @@ void daBkyRock_c::pieceMove() {
     }
 }
 
-/* ############################################################################################## */
-/* 80BB7FD8-80BB7FE0 000128 0008+00 0/1 0/0 0/0 .rodata          DROP_OFFSET_POS$4096 */
 static int const DROP_OFFSET_POS[2] = {
     0x015E, 0x0DAC,
 };
 
-/* 80BB7FE0-80BB7FE8 000130 0008+00 0/1 0/0 0/0 .rodata          INIT_SPEED_Y_BASE$4097 */
 static int const INIT_SPEED_Y_BASE[2] = {
     20, 40,
 };
 
-/* 80BB7FE8-80BB7FF0 000138 0008+00 0/1 0/0 0/0 .rodata          INIT_SPEED_Y_RANGE$4098 */
 static int const INIT_SPEED_Y_RANGE[2] = {
     60, 120,
 };
 
-/* 80BB7FF0-80BB7FF8 000140 0008+00 0/1 0/0 0/0 .rodata          PIECE_SCALE_RANGE$4099 */
 static int const PIECE_SCALE_RANGE[2] = {
     25, 35,
 };
 
-/* 80BB7FF8-80BB8000 000148 0008+00 0/1 0/0 0/0 .rodata          PIECE_SCALE_BASE$4100 */
 static int const PIECE_SCALE_BASE[2] = {
     8, 20,
 };
 
-/* 80BB7988-80BB7C18 0011C8 0290+00 1/1 0/0 0/0 .text            pieceMoveInit__11daBkyRock_cFv */
 void daBkyRock_c::pieceMoveInit() {
     int nameNo = getNameNo();
     field_0x57a = true;
@@ -426,7 +385,6 @@ void daBkyRock_c::pieceMoveInit() {
     }
 }
 
-/* 80BB7C18-80BB7D50 001458 0138+00 2/2 0/0 0/0 .text            callBombEmt__11daBkyRock_cFiPCUs */
 void daBkyRock_c::callBombEmt(int particleNum, u16 const* particleIds) {
     int nameNo = getNameNo();
     cXyz pos(current.pos.x, current.pos.y - PARTICLE_OFFSET_POS_Y[nameNo], current.pos.z);
@@ -438,31 +396,23 @@ void daBkyRock_c::callBombEmt(int particleNum, u16 const* particleIds) {
     }
 }
 
-/* 80BB7D50-80BB7DA4 001590 0054+00 1/0 0/0 0/0 .text            daBkyRock_create__FP11daBkyRock_c
- */
 static int daBkyRock_create(daBkyRock_c* i_this) {
     fopAcM_ct(i_this, daBkyRock_c);
     return i_this->create();
 }
 
-/* 80BB7DA4-80BB7DC4 0015E4 0020+00 1/0 0/0 0/0 .text            daBkyRock_Delete__FP11daBkyRock_c
- */
 static int daBkyRock_Delete(daBkyRock_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80BB7DC4-80BB7DE4 001604 0020+00 1/0 0/0 0/0 .text            daBkyRock_execute__FP11daBkyRock_c
- */
 static int daBkyRock_execute(daBkyRock_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BB7DE4-80BB7E04 001624 0020+00 1/0 0/0 0/0 .text            daBkyRock_draw__FP11daBkyRock_c */
 static int daBkyRock_draw(daBkyRock_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BB8088-80BB80A8 -00001 0020+00 1/0 0/0 0/0 .data            daBkyRock_METHODS */
 static actor_method_class daBkyRock_METHODS = {
     (process_method_func)daBkyRock_create,
     (process_method_func)daBkyRock_Delete,
@@ -471,7 +421,6 @@ static actor_method_class daBkyRock_METHODS = {
     (process_method_func)daBkyRock_draw,
 };
 
-/* 80BB80A8-80BB80D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_BkyRock */
 extern actor_process_profile_definition g_profile_BkyRock = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp
index 7a3d745702..432e7f9bfe 100644
--- a/src/d/actor/d_a_obj_bmWindow.cpp
+++ b/src/d/actor/d_a_obj_bmWindow.cpp
@@ -10,7 +10,6 @@
 #include "d/d_bg_w.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80BB820C-80BB82AC 0000EC 00A0+00 1/1 0/0 0/0 .text            __ct__16daBmWindow_HIO_cFv */
 daBmWindow_HIO_c::daBmWindow_HIO_c() {
     field_0x04 = 10;
     field_0x05 = 3;
@@ -30,7 +29,6 @@ daBmWindow_HIO_c::daBmWindow_HIO_c() {
     field_0x39 = 3;
 }
 
-/* 80BB8350-80BB8400 000230 00B0+00 2/2 0/0 0/0 .text            setBaseMtx__12daBmWindow_cFv */
 void daBmWindow_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -40,7 +38,6 @@ void daBmWindow_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BB8400-80BB846C 0002E0 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daBmWindow_cFv */
 int daBmWindow_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Window", 4);
     JUT_ASSERT(285, modelData != NULL);
@@ -48,8 +45,6 @@ int daBmWindow_c::CreateHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* ############################################################################################## */
-/* 80BB9760-80BB9790 000024 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daBmWindow_c */
 dCcD_SrcGObjInf const daBmWindow_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0xd8fafdbf, 0x11}, {0}}},
     {1, 0, 0, 0, 0},
@@ -57,7 +52,6 @@ dCcD_SrcGObjInf const daBmWindow_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80BB9790-80BB97C0 000054 0030+00 0/1 0/0 0/0 .rodata          l_check_area */
 static Vec const l_check_area[4] = {
     {-100.0f, -50.0f, -200.0f},
     {-100.0f, 290.0f, -200.0f},
@@ -65,7 +59,6 @@ static Vec const l_check_area[4] = {
     {100.0f, -50.0f, 200.0f},
 };
 
-/* 80BB846C-80BB869C 00034C 0230+00 1/1 0/0 0/0 .text            create__12daBmWindow_cFv */
 int daBmWindow_c::create() {
     fopAcM_ct(this, daBmWindow_c);
     if (fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this))) {
@@ -119,8 +112,6 @@ int daBmWindow_c::create() {
     return rv;
 }
 
-/* 80BB88D8-80BB8930 0007B8 0058+00 1/0 0/0 0/0 .text            Execute__12daBmWindow_cFPPA3_A4_f
- */
 int daBmWindow_c::Execute(Mtx** param_1) {
     windowProc();
     *param_1 = &mModel->getBaseTRMtx();
@@ -129,10 +120,8 @@ int daBmWindow_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BB999C-80BB99D8 000014 003C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daBmWindow_HIO_c l_HIO;
 
-/* 80BB982C-80BB9870 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daBmWindow_c */
 dCcD_SrcCyl daBmWindow_c::mCcDCyl = {
     daBmWindow_c::mCcDObjInfo,
     {
@@ -142,7 +131,6 @@ dCcD_SrcCyl daBmWindow_c::mCcDCyl = {
     } // mCyl
 };
 
-/* 80BB8930-80BB8B3C 000810 020C+00 1/1 0/0 0/0 .text            windowProc__12daBmWindow_cFv */
 void daBmWindow_c::windowProc() {
     typedef void (daBmWindow_c::*modeFunc)();
     static modeFunc mode_proc[3] = {&daBmWindow_c::modeWait, &daBmWindow_c::modeBreak,
@@ -157,12 +145,10 @@ void daBmWindow_c::windowProc() {
     field_0xe94++;
 }
 
-/* 80BB8B3C-80BB8B48 000A1C 000C+00 1/1 0/0 0/0 .text            init_modeWait__12daBmWindow_cFv */
 void daBmWindow_c::init_modeWait() {
     mMode = WAIT;
 }
 
-/* 80BB8B48-80BB8FDC 000A28 0494+00 1/0 0/0 0/0 .text            modeWait__12daBmWindow_cFv */
 void daBmWindow_c::modeWait() {
     daPy_py_c* player = (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
     cXyz cStack_2c;
@@ -235,8 +221,6 @@ void daBmWindow_c::modeWait() {
     }
 }
 
-/* 80BB8FDC-80BB90E0 000EBC 0104+00 1/1 0/0 0/0 .text
- * checkActorInRectangle__12daBmWindow_cFP10fopAc_ac_cPC4cXyzPC4cXyz */
 int daBmWindow_c::checkActorInRectangle(fopAc_ac_c* i_actor, cXyz const* i_topLeft,
                                         cXyz const* i_bottomRight) {
     cXyz actorDist = i_actor->current.pos - current.pos;
@@ -252,7 +236,6 @@ int daBmWindow_c::checkActorInRectangle(fopAc_ac_c* i_actor, cXyz const* i_topLe
     }
 }
 
-/* 80BB90E0-80BB920C 000FC0 012C+00 1/1 0/0 0/0 .text            init_modeBreak__12daBmWindow_cFv */
 void daBmWindow_c::init_modeBreak() {
     if (mpBgW != NULL) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -266,13 +249,10 @@ void daBmWindow_c::init_modeBreak() {
     mMode = BREAK;
 }
 
-/* 80BB920C-80BB922C 0010EC 0020+00 1/0 0/0 0/0 .text            modeBreak__12daBmWindow_cFv */
 void daBmWindow_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80BB922C-80BB9304 00110C 00D8+00 1/1 0/0 0/0 .text            init_modeBreakEff__12daBmWindow_cFv
- */
 void daBmWindow_c::init_modeBreakEff() {
     cXyz soundPos(current.pos);
     soundPos.z -= 200.0f;
@@ -282,18 +262,14 @@ void daBmWindow_c::init_modeBreakEff() {
     mMode = BREAK_EFF;
 }
 
-/* 80BB9304-80BB9324 0011E4 0020+00 1/0 0/0 0/0 .text            modeBreakEff__12daBmWindow_cFv */
 void daBmWindow_c::modeBreakEff() {
     fopAcM_delete(this);
 }
 
-/* ############################################################################################## */
-/* 80BB97F4-80BB9800 0000B8 000C+00 0/1 0/0 0/0 .rodata          particle_id$4102 */
 static u16 const particle_id[6] = {
     0x8506, 0x8507, 0x8508, 0x8509, 0x850A, 0x850B,
 };
 
-/* 80BB9324-80BB9494 001204 0170+00 2/2 0/0 0/0 .text            setBreakEffect__12daBmWindow_cFi */
 void daBmWindow_c::setBreakEffect(int param_1) {
     cXyz cStack_2c(current.pos);
     csXyz cStack_40(shape_angle);
@@ -315,7 +291,6 @@ void daBmWindow_c::setBreakEffect(int param_1) {
     }
 }
 
-/* 80BB9494-80BB9548 001374 00B4+00 1/0 0/0 0/0 .text            Draw__12daBmWindow_cFv */
 int daBmWindow_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -326,45 +301,35 @@ int daBmWindow_c::Draw() {
     return 1;
 }
 
-/* 80BB9548-80BB9578 001428 0030+00 1/0 0/0 0/0 .text            Delete__12daBmWindow_cFv */
 int daBmWindow_c::Delete() {
     dComIfG_resDelete(&mPhase, "H_Window");
     return 1;
 }
 
-/* 80BB9578-80BB95A4 001458 002C+00 1/0 0/0 0/0 .text            daBmWindow_Draw__FP12daBmWindow_c
- */
 static int daBmWindow_Draw(daBmWindow_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BB95A4-80BB95C4 001484 0020+00 1/0 0/0 0/0 .text daBmWindow_Execute__FP12daBmWindow_c */
 static int daBmWindow_Execute(daBmWindow_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BB95C4-80BB95E4 0014A4 0020+00 1/0 0/0 0/0 .text            daBmWindow_Delete__FP12daBmWindow_c
- */
 static int daBmWindow_Delete(daBmWindow_c* i_this) {
     fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80BB95E4-80BB9604 0014C4 0020+00 1/0 0/0 0/0 .text            daBmWindow_Create__FP10fopAc_ac_c
- */
 static int daBmWindow_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daBmWindow_c*>(i_this)->create();
 }
 
-/* 80BB98B8-80BB98D8 -00001 0020+00 1/0 0/0 0/0 .data            l_daBmWindow_Method */
 static actor_method_class l_daBmWindow_Method = {
     (process_method_func)daBmWindow_Create,  (process_method_func)daBmWindow_Delete,
     (process_method_func)daBmWindow_Execute, (process_method_func)NULL,
     (process_method_func)daBmWindow_Draw,
 };
 
-/* 80BB98D8-80BB9908 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BmWindow */
 extern actor_process_profile_definition g_profile_Obj_BmWindow = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp
index 1232a8b1c7..fcd126dc53 100644
--- a/src/d/actor/d_a_obj_bmshutter.cpp
+++ b/src/d/actor/d_a_obj_bmshutter.cpp
@@ -20,7 +20,6 @@ static const Vec l_check_area[4] = {
     -250.0, 0.0, 100.0,   // unknown
 };
 
-/* 80BB9A58-80BB9AE4 000078 008C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjBmSh_cFv */
 void daObjBmSh_c::initBaseMtx() {
     mModel->setBaseScale(scale);
 
@@ -33,7 +32,6 @@ void daObjBmSh_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BB9AE4-80BB9B84 000104 00A0+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjBmSh_cFv */
 void daObjBmSh_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -45,7 +43,6 @@ void daObjBmSh_c::setBaseMtx() {
     return;
 }
 
-/* 80BB9B84-80BB9C50 0001A4 00CC+00 1/0 0/0 0/0 .text            Create__11daObjBmSh_cFv */
 int daObjBmSh_c::Create() {
     initBaseMtx();
 
@@ -70,7 +67,6 @@ int daObjBmSh_c::Create() {
     return 1;
 }
 
-/* 80BB9C50-80BB9CC0 000270 0070+00 1/0 0/0 0/0 .text            CreateHeap__11daObjBmSh_cFv */
 int daObjBmSh_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -80,7 +76,6 @@ int daObjBmSh_c::CreateHeap() {
     return true;
 }
 
-/* 80BB9CC0-80BB9DB4 0002E0 00F4+00 1/1 0/0 0/0 .text            create__11daObjBmSh_cFv */
 int daObjBmSh_c::create() {
     fopAcM_ct(this, daObjBmSh_c);
 
@@ -106,7 +101,6 @@ int daObjBmSh_c::create() {
     return ret;
 }
 
-/* 80BB9DB4-80BB9F34 0003D4 0180+00 1/0 0/0 0/0 .text            Execute__11daObjBmSh_cFPPA3_A4_f */
 int daObjBmSh_c::Execute(Mtx** param_0) {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
     if (player->checkFrontRollCrash()) {
@@ -132,7 +126,6 @@ int daObjBmSh_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BB9F34-80BB9FBC 000554 0088+00 2/2 0/0 0/0 .text            checkSw__11daObjBmSh_cFv */
 int daObjBmSh_c::checkSw() {
     u32 swbit2 = getSwbit2();
     u8 nSwitches = getSwNum();
@@ -145,7 +138,6 @@ int daObjBmSh_c::checkSw() {
     return true;
 }
 
-/* 80BB9FBC-80BBA044 0005DC 0088+00 2/2 0/0 0/0 .text            checkAnySw__11daObjBmSh_cFv */
 int daObjBmSh_c::checkAnySw() {
     u32 swbit2 = getSwbit2();
     u8 nSwitches = getSwNum();
@@ -158,12 +150,10 @@ int daObjBmSh_c::checkAnySw() {
     return false;
 }
 
-/* 80BBA044-80BBA080 000664 003C+00 2/2 0/0 0/0 .text            checkMySw__11daObjBmSh_cFv */
 int daObjBmSh_c::checkMySw() {
     return fopAcM_isSwitch(this, getSwbit3());
 }
 
-/* 80BBA080-80BBA13C 0006A0 00BC+00 1/1 0/0 0/0 .text            event_proc_call__11daObjBmSh_cFv */
 void daObjBmSh_c::event_proc_call() {
     typedef void (daObjBmSh_c::*actionFunc)();
     static actionFunc l_func[] = {
@@ -175,7 +165,6 @@ void daObjBmSh_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80BBA13C-80BBA1A4 00075C 0068+00 1/0 0/0 0/0 .text            actionWait__11daObjBmSh_cFv */
 void daObjBmSh_c::actionWait() {
     if (checkSw()) {
         setAction(daObjBmSh_Action_ORDER_EVENT_e);
@@ -184,8 +173,6 @@ void daObjBmSh_c::actionWait() {
     }
 }
 
-/* 80BBA1A4-80BBA20C 0007C4 0068+00 1/0 0/0 0/0 .text            actionOrderEvent__11daObjBmSh_cFv
- */
 void daObjBmSh_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(daObjBmSh_Action_EVENT_e);
@@ -195,7 +182,6 @@ void daObjBmSh_c::actionOrderEvent() {
     }
 }
 
-/* 80BBA20C-80BBA268 00082C 005C+00 1/0 0/0 0/0 .text            actionEvent__11daObjBmSh_cFv */
 void daObjBmSh_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         setAction(daObjBmSh_Action_DEAD_e);
@@ -204,12 +190,10 @@ void daObjBmSh_c::actionEvent() {
     return;
 }
 
-/* 80BBA268-80BBA26C 000888 0004+00 1/0 0/0 0/0 .text            actionDead__11daObjBmSh_cFv */
 void daObjBmSh_c::actionDead() {
     /* empty function */
 }
 
-/* 80BBA26C-80BBA394 00088C 0128+00 1/1 0/0 0/0 .text            mode_proc_call__11daObjBmSh_cFv */
 void daObjBmSh_c::mode_proc_call() {
     typedef void (daObjBmSh_c::*mode_func)();
     static mode_func l_func[] = {
@@ -225,7 +209,6 @@ void daObjBmSh_c::mode_proc_call() {
     cLib_addCalc0(&mShakeIntensity, 1.0f / 20.0f, 10.0f);
 }
 
-/* 80BBA394-80BBA5B4 0009B4 0220+00 1/0 0/0 0/0 .text            modeWait__11daObjBmSh_cFv */
 void daObjBmSh_c::modeWait() {
     checkAnySw();
     int checkedSw = checkSw();
@@ -256,7 +239,6 @@ void daObjBmSh_c::modeWait() {
     }
 }
 
-/* 80BBA5B4-80BBA640 000BD4 008C+00 1/0 0/0 0/0 .text            modeMove__11daObjBmSh_cFv */
 void daObjBmSh_c::modeMove() {
     cLib_addCalcAngleS2(&mRotation.x, 0, 5, 256);
     cLib_addCalcAngleS2(&mRotation.z, 0, 5, 256);
@@ -266,12 +248,10 @@ void daObjBmSh_c::modeMove() {
     return;
 }
 
-/* 80BBA640-80BBA644 000C60 0004+00 1/0 0/0 0/0 .text            modeEnd__11daObjBmSh_cFv */
 void daObjBmSh_c::modeEnd() {
     /* empty function */
 }
 
-/* 80BBA644-80BBA6E8 000C64 00A4+00 1/0 0/0 0/0 .text            Draw__11daObjBmSh_cFv */
 int daObjBmSh_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel->mModelData, &tevStr);
@@ -283,39 +263,31 @@ int daObjBmSh_c::Draw() {
     return 1;
 }
 
-/* 80BBA6E8-80BBA71C 000D08 0034+00 1/0 0/0 0/0 .text            Delete__11daObjBmSh_cFv */
 int daObjBmSh_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BBA71C-80BBA748 000D3C 002C+00 1/0 0/0 0/0 .text            daObjBmSh_Draw__FP11daObjBmSh_c */
 int daObjBmSh_Draw(daObjBmSh_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjBmSh_c*>(i_this)->Draw();
 }
 
-/* 80BBA748-80BBA768 000D68 0020+00 1/0 0/0 0/0 .text            daObjBmSh_Execute__FP11daObjBmSh_c
- */
 int daObjBmSh_Execute(daObjBmSh_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80BBA768-80BBA788 000D88 0020+00 1/0 0/0 0/0 .text            daObjBmSh_Delete__FP11daObjBmSh_c
- */
 int daObjBmSh_Delete(daObjBmSh_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
 }
 
-/* 80BBA788-80BBA7A8 000DA8 0020+00 1/0 0/0 0/0 .text            daObjBmSh_Create__FP10fopAc_ac_c */
 int daObjBmSh_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjBmSh_c*>(i_this)->create();
 }
 
-/* 80BBA8F8-80BBA918 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBmSh_Method */
 static actor_method_class l_daObjBmSh_Method = {
     (process_method_func)daObjBmSh_Create,
     (process_method_func)daObjBmSh_Delete,
@@ -324,7 +296,6 @@ static actor_method_class l_daObjBmSh_Method = {
     (process_method_func)daObjBmSh_Draw,
 };
 
-/* 80BBA918-80BBA948 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BoomShutter */
 extern actor_process_profile_definition g_profile_Obj_BoomShutter = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp
index 66b6b43d1a..0a294e9a52 100644
--- a/src/d/actor/d_a_obj_bombf.cpp
+++ b/src/d/actor/d_a_obj_bombf.cpp
@@ -8,22 +8,18 @@
 #include "d/actor/d_a_obj_bombf.h"
 #include "d/d_procname.h"
 
-/* 80BBAE84-80BBAE8C 000000 0006+02 3/3 0/0 0/0 .rodata          l_arcName */
 static const char l_arcName[] = "Bombf";
 
-/* 80BBA9F8-80BBAA64 000078 006C+00 1/1 0/0 0/0 .text            createHeap__12daObjBombf_cFv */
 bool daObjBombf_c::createHeap() {
     field_0x570 = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 4),
                                           0x80000, 0x11000084);
     return (field_0x570 != NULL);
 }
 
-/* 80BBAA64-80BBAA84 0000E4 0020+00 1/1 0/0 0/0 .text daObjBombf_createHeap__FP10fopAc_ac_c */
 static bool daObjBombf_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjBombf_c*>(i_this)->createHeap();
 }
 
-/* 80BBAA84-80BBAB9C 000104 0118+00 1/1 0/0 0/0 .text            create__12daObjBombf_cFv */
 int daObjBombf_c::create() {
     fopAcM_ct(this, daObjBombf_c);
 
@@ -46,33 +42,27 @@ int daObjBombf_c::create() {
     return phase;
 }
 
-/* 80BBAB9C-80BBABBC 00021C 0020+00 1/0 0/0 0/0 .text            daObjBombf_Create__FP10fopAc_ac_c */
 static int daObjBombf_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjBombf_c*>(i_this)->create();
 }
 
-/* 80BBABBC-80BBAC24 00023C 0068+00 1/1 0/0 0/0 .text            __dt__12daObjBombf_cFv */
 daObjBombf_c::~daObjBombf_c() {
     dComIfG_resDelete(&field_0x568, l_arcName);
 }
 
-/* 80BBAC24-80BBAC4C 0002A4 0028+00 1/0 0/0 0/0 .text            daObjBombf_Delete__FP12daObjBombf_c */
 static int daObjBombf_Delete(daObjBombf_c* i_this) {
     i_this->~daObjBombf_c();
     return 1;
 }
 
-/* 80BBAC4C-80BBACC0 0002CC 0074+00 2/2 0/0 0/0 .text            setMatrix__12daObjBombf_cFv */
 void daObjBombf_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x584, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     MTXCopy(mDoMtx_stack_c::now, field_0x570->mBaseTransformMtx);
 }
 
-/* 80BBAE9C-80BBAEA8 000018 000C+00 1/1 0/0 0/0 .rodata          bombOffset$3727 */
 static const Vec bombOffset = {0.0f, 7.0f, 0.0f};
 
-/* 80BBACC0-80BBADD8 000340 0118+00 1/1 0/0 0/0 .text            execute__12daObjBombf_cFv */
 int daObjBombf_c::execute() {
     u32 uVar;
     cXyz vStack;
@@ -102,12 +92,10 @@ int daObjBombf_c::execute() {
     return 1;
 }
 
-/* 80BBADD8-80BBADF8 000458 0020+00 1/0 0/0 0/0 .text daObjBombf_Execute__FP12daObjBombf_c */
 static int daObjBombf_Execute(daObjBombf_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BBADF8-80BBAE5C 000478 0064+00 1/1 0/0 0/0 .text            draw__12daObjBombf_cFv */
 int daObjBombf_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(field_0x570, &tevStr);
@@ -115,19 +103,16 @@ int daObjBombf_c::draw() {
     return 1;
 }
 
-/* 80BBAE5C-80BBAE7C 0004DC 0020+00 1/0 0/0 0/0 .text            daObjBombf_Draw__FP12daObjBombf_c */
 static int daObjBombf_Draw(daObjBombf_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BBAEA8-80BBAEC8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBombf_Method */
 static actor_method_class l_daObjBombf_Method = {
     (process_method_func)daObjBombf_Create,  (process_method_func)daObjBombf_Delete,
     (process_method_func)daObjBombf_Execute, (process_method_func)NULL,
     (process_method_func)daObjBombf_Draw,
 };
 
-/* 80BBAEC8-80BBAEF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Bombf */
 extern actor_process_profile_definition g_profile_Obj_Bombf = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp
index 89c97ab704..bec7a64cbb 100644
--- a/src/d/actor/d_a_obj_bosswarp.cpp
+++ b/src/d/actor/d_a_obj_bosswarp.cpp
@@ -12,16 +12,9 @@
 #include "d/d_procname.h"
 #include "d/actor/d_a_obj_life_container.h"
 #include "d/actor/d_a_obj_ystone.h"
-#include "dol2asm.h"
 
-//
-// Declarations:
-//
-
-/* 8057B678-8057B67C -00001 0004+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "ef_Portal";
 
-/* 8057B67C-8057B6A0 -00001 0024+00 0/1 0/0 0/0 .data            l_clearEvName */
 static char const* l_clearEvName[9] = {
     "BOSSCLEAR01",
     "BOSSCLEAR02",
@@ -34,13 +27,10 @@ static char const* l_clearEvName[9] = {
     "BOSSCLEAR03",
 };
 
-/* 8057B6A0-8057B6A4 -00001 0004+00 0/1 0/0 0/0 .data            l_warp_check_evName */
 static char const* l_warp_check_evName = "WARP_CHECK";
 
-/* 8057B6A4-8057B6A8 -00001 0004+00 0/1 0/0 0/0 .data            l_warp_cancel_evName */
 static char const* l_warp_cancel_evName = "WARP_CANCEL";
 
-/* 8057B360-8057B3B4 000000 0054+00 5/5 0/0 0/0 .rodata          l_hair_offset */
 static Vec const l_hair_offset[7] = {
     {49.0f, -34.0f, -3.0f},
     {46.0f, -15.0f, 3.0f},
@@ -51,7 +41,6 @@ static Vec const l_hair_offset[7] = {
     {50.0f, 0.0f, 0.0f},
 };
 
-/* 8057B3B4-8057B408 000054 0054+00 0/1 0/0 0/0 .rodata          l_hair_rotate */
 static Vec const l_hair_rotate[7] = {
     {47.0f, 80.0f, 38.0f},
     {-2.0f, 68.0f, 2.0f},
@@ -62,12 +51,10 @@ static Vec const l_hair_rotate[7] = {
     {0.0f, 90.0f, 0.0f},
 };
 
-/* 80579638-80579658 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjBossWarp_c*>(i_this)->CreateHeap();
 }
 
-/* 80579658-80579700 000098 00A8+00 3/3 0/0 0/0 .text            getNowLevel__Fv */
 static int getNowLevel() {
     char const* stages[9] = {
         "D_MN05A",
@@ -89,21 +76,18 @@ static int getNowLevel() {
     return -1;
 }
 
-/* 80579700-80579748 000140 0048+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjBossWarp_cFv */
 void daObjBossWarp_c::initBaseMtx() {
     scale.y = 0.15f;
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80579748-805797B8 000188 0070+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjBossWarp_cFv */
 void daObjBossWarp_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + 2.0f, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805797B8-80579934 0001F8 017C+00 1/1 0/0 0/0 .text            Create__15daObjBossWarp_cFv */
 int daObjBossWarp_c::Create() {
     initBaseMtx();
 
@@ -136,7 +120,6 @@ int daObjBossWarp_c::Create() {
     return 1;
 }
 
-/* 80579934-80579B28 000374 01F4+00 1/1 0/0 0/0 .text            CreateHeap__15daObjBossWarp_cFv */
 int daObjBossWarp_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000284);
@@ -168,7 +151,6 @@ int daObjBossWarp_c::CreateHeap() {
     return 1;
 }
 
-/* 80579B70-80579C30 0005B0 00C0+00 1/1 0/0 0/0 .text            create__15daObjBossWarp_cFv */
 cPhs__Step daObjBossWarp_c::create() {
     fopAcM_ct(this, daObjBossWarp_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -183,7 +165,6 @@ cPhs__Step daObjBossWarp_c::create() {
     return step;
 }
 
-/* 80579C30-80579D98 000670 0168+00 3/3 0/0 0/0 .text            appear__15daObjBossWarp_cFi */
 void daObjBossWarp_c::appear(int param_0) {
     mParticlePos = current.pos;
     mParticlePos.y += 2.0f;
@@ -207,14 +188,12 @@ void daObjBossWarp_c::appear(int param_0) {
     mpBtkAnm[1]->setPlaySpeed(1.0f);
 }
 
-/* 80579D98-80579E08 0007D8 0070+00 1/1 0/0 0/0 .text            set_appear__15daObjBossWarp_cFv */
 void daObjBossWarp_c::set_appear() {
     mpBrkAnm->setFrame(mpBrkAnm->getEndFrame());
     mpBtkAnm[1]->setFrame(mpBtkAnm[1]->getEndFrame());
     appear(0);
 }
 
-/* 80579E08-80579E5C 000848 0054+00 2/2 0/0 0/0 .text            disappear__15daObjBossWarp_cFi */
 void daObjBossWarp_c::disappear(int param_0) {
     for (int i = 0; i < 4; i++) {
         if (mpParticle[i] != NULL) {
@@ -225,8 +204,6 @@ void daObjBossWarp_c::disappear(int param_0) {
     }
 }
 
-/* 80579E5C-80579FF8 00089C 019C+00 2/2 0/0 0/0 .text            checkDistance__15daObjBossWarp_cFv
- */
 BOOL daObjBossWarp_c::checkDistance() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 dist_xz = player->current.pos.absXZ(current.pos);
@@ -238,7 +215,6 @@ BOOL daObjBossWarp_c::checkDistance() {
     }
 }
 
-/* 80579FF8-8057A390 000A38 0398+00 2/2 0/0 0/0 .text            execute__15daObjBossWarp_cFv */
 int daObjBossWarp_c::execute() {
     if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != 3) {
         u8 sw = getSwNo();
@@ -311,7 +287,6 @@ int daObjBossWarp_c::execute() {
     return 1;
 }
 
-/* 8057A390-8057A4F4 000DD0 0164+00 1/1 0/0 0/0 .text event_proc_call__15daObjBossWarp_cFv */
 void daObjBossWarp_c::event_proc_call() {
     typedef void (daObjBossWarp_c::*daObjBossWarp_action)();
     static daObjBossWarp_action l_func[11] = {
@@ -330,14 +305,12 @@ void daObjBossWarp_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 8057A4F4-8057A54C 000F34 0058+00 1/0 0/0 0/0 .text            actionWait__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionWait() {
     setAction(ACT_ORDER_EVENT);
     fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1);
     eventInfo.onCondition(2);
 }
 
-/* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE));
@@ -350,7 +323,6 @@ void daObjBossWarp_c::actionOrderEvent() {
     }
 }
 
-/* 8057A610-8057A678 001050 0068+00 1/0 0/0 0/0 .text            actionEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mBossClearEventId)) {
         setAction(ACT_WAIT_WARP);
@@ -360,8 +332,6 @@ void daObjBossWarp_c::actionEvent() {
     }
 }
 
-/* 8057A678-8057A6E0 0010B8 0068+00 1/0 0/0 0/0 .text            actionWaitWarp__15daObjBossWarp_cFv
- */
 void daObjBossWarp_c::actionWaitWarp() {
     if (checkDistance()) {
         setAction(ACT_ORDER_CHK_EVENT);
@@ -370,7 +340,6 @@ void daObjBossWarp_c::actionWaitWarp() {
     }
 }
 
-/* 8057A6E0-8057A778 001120 0098+00 1/0 0/0 0/0 .text actionOrderWarpEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionOrderWarpEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACT_WARP_EVENT);
@@ -382,19 +351,16 @@ void daObjBossWarp_c::actionOrderWarpEvent() {
     }
 }
 
-/* 8057A778-8057A7C4 0011B8 004C+00 1/0 0/0 0/0 .text actionWarpEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionWarpEvent() {
     if (!dComIfGp_evmng_endCheck(mBossWarpInEventId)) {
         demoProc();
     }
 }
 
-/* 8057A7C4-8057A7C8 001204 0004+00 1/0 0/0 0/0 .text            actionDead__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionDead() {
     /* empty function */
 }
 
-/* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionOrderChkEvent() {
     daMidna_c* midna = daPy_py_c::getMidnaActor();
     if (eventInfo.checkCommandDemoAccrpt()) {
@@ -410,8 +376,6 @@ void daObjBossWarp_c::actionOrderChkEvent() {
     }
 }
 
-/* 8057A8B4-8057A994 0012F4 00E0+00 1/0 0/0 0/0 .text            actionChkEvent__15daObjBossWarp_cFv
- */
 void daObjBossWarp_c::actionChkEvent() {
     if (dComIfGp_evmng_endCheck(mWarpCheckEventId)) {
         dComIfGp_event_reset();
@@ -429,8 +393,6 @@ void daObjBossWarp_c::actionChkEvent() {
     }
 }
 
-/* 8057A994-8057AA2C 0013D4 0098+00 1/0 0/0 0/0 .text actionOrderCancelEvent__15daObjBossWarp_cFv
- */
 void daObjBossWarp_c::actionOrderCancelEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACT_CANCEL_EVENT);
@@ -442,7 +404,6 @@ void daObjBossWarp_c::actionOrderCancelEvent() {
     }
 }
 
-/* 8057AA2C-8057AA94 00146C 0068+00 1/0 0/0 0/0 .text actionCancelEvent__15daObjBossWarp_cFv */
 void daObjBossWarp_c::actionCancelEvent() {
     if (dComIfGp_evmng_endCheck(mWarpCancelEventId)) {
         dComIfGp_event_reset();
@@ -452,7 +413,6 @@ void daObjBossWarp_c::actionCancelEvent() {
     }
 }
 
-/* 8057AA94-8057B0D8 0014D4 0644+00 11/8 0/0 0/0 .text            demoProc__15daObjBossWarp_cFv */
 int daObjBossWarp_c::demoProc() {
     static char* action_table[15] = {
         "WAIT",
@@ -662,7 +622,6 @@ int daObjBossWarp_c::demoProc() {
     return 1;
 }
 
-/* 8057B0D8-8057B190 001B18 00B8+00 1/1 0/0 0/0 .text            setGoal__15daObjBossWarp_cFv */
 void daObjBossWarp_c::setGoal() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz delta = player->current.pos - current.pos;
@@ -670,7 +629,6 @@ void daObjBossWarp_c::setGoal() {
     dComIfGp_evmng_setGoal(&goal);
 }
 
-/* 8057B190-8057B23C 001BD0 00AC+00 1/1 0/0 0/0 .text            draw__15daObjBossWarp_cFv */
 int daObjBossWarp_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -681,35 +639,28 @@ int daObjBossWarp_c::draw() {
     return 1;
 }
 
-/* 8057B23C-8057B284 001C7C 0048+00 1/1 0/0 0/0 .text            _delete__15daObjBossWarp_cFv */
 int daObjBossWarp_c::_delete() {
     disappear(0);
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 8057B284-8057B2A4 001CC4 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Draw__FP15daObjBossWarp_c */
 static int daObjBossWarp_Draw(daObjBossWarp_c* i_this) {
     return i_this->draw();
 }
 
-/* 8057B2A4-8057B2C4 001CE4 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Execute__FP15daObjBossWarp_c
- */
 static int daObjBossWarp_Execute(daObjBossWarp_c* i_this) {
     return i_this->execute();
 }
 
-/* 8057B2C4-8057B2E4 001D04 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Delete__FP15daObjBossWarp_c */
 static int daObjBossWarp_Delete(daObjBossWarp_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8057B2E4-8057B304 001D24 0020+00 1/0 0/0 0/0 .text daObjBossWarp_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjBossWarp_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjBossWarp_c*>(i_this)->create();
 }
 
-/* 8057B870-8057B890 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjBossWarp_Method */
 static actor_method_class l_daObjBossWarp_Method = {
     (process_method_func)daObjBossWarp_Create,
     (process_method_func)daObjBossWarp_Delete,
@@ -718,7 +669,6 @@ static actor_method_class l_daObjBossWarp_Method = {
     (process_method_func)daObjBossWarp_Draw,
 };
 
-/* 8057B890-8057B8C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BossWarp */
 extern actor_process_profile_definition g_profile_Obj_BossWarp = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp
index 3d1c9a5790..9bf33d30e8 100644
--- a/src/d/actor/d_a_obj_boumato.cpp
+++ b/src/d/actor/d_a_obj_boumato.cpp
@@ -14,12 +14,10 @@
 
 static const char* dummyString() { return ""; }
 
-/* 80BBC470-80BBC48C 000000 001C+00 4/4 0/0 0/0 .rodata          m__21daObj_BouMato_Param_c */
 f32 const daObj_BouMato_Param_c::m[7] = {
     0.0f, -3.0f, 1.0f, 400.0f, 300.0f, 4.0f, 20.0f,
 };
 
-/* 80BBC48C-80BBC4BC 00001C 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 static dCcD_SrcGObjInf const l_ccDObjData = 
 {
         {0x0, {{0x0, 0x0, 0}, {0xD8FBFDFF, 0x1F}, 0x79}}, // mObj
@@ -28,7 +26,6 @@ static dCcD_SrcGObjInf const l_ccDObjData =
         {0x0}, // mGObjCo
 };
 
-/* 80BBC52C-80BBC570 000000 0044+00 2/2 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     l_ccDObjData, // mObjInf
     {
@@ -38,10 +35,8 @@ static dCcD_SrcCyl l_ccDCyl = {
     } // mCyl
 };
 
-/* 80BBC570-80BBC574 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "H_BouMato";
 
-/* 80BBC574-80BBC58C 000048 0018+00 1/0 0/0 0/0 .data            jntCoOffset$4044 */
 static Vec jntCoOffset[2] = {
     {0.0f, 0.0f, 0.0f},
     {0.0f, 300.0f, 0.0f},
@@ -52,13 +47,11 @@ static dJntColData_c jntCoData = {
     1, 1, 0, 4.0f, jntCoOffset,
 };
 
-/* 80BBAFEC-80BBB1F4 0000EC 0208+00 1/0 0/0 0/0 .text            __dt__15daObj_BouMato_cFv */
 daObj_BouMato_c::~daObj_BouMato_c() {
     OS_REPORT("|%06d:%x|daObj_BouMato_c -> デストラクト\n", g_Counter.mCounter0, this);
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80BBB230-80BBB558 000330 0328+00 1/1 0/0 0/0 .text            create__15daObj_BouMato_cFv */
 int daObj_BouMato_c::create() {
     fopAcM_ct(this, daObj_BouMato_c);
     field_0xa32 = getType();
@@ -95,7 +88,6 @@ int daObj_BouMato_c::create() {
     return rv;
 }
 
-/* 80BBB770-80BBB800 000870 0090+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_BouMato_cFv */
 int daObj_BouMato_c::CreateHeap() {
     J3DModelData*  mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4);
     JUT_ASSERT(374, NULL != mdlData_p);
@@ -106,14 +98,12 @@ int daObj_BouMato_c::CreateHeap() {
     return mJntCol.init(this, &jntCoData, mModel, 1) ? 1 : 0;
 }
 
-/* 80BBB800-80BBB834 000900 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_BouMato_cFv */
 int daObj_BouMato_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_BouMato_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_BouMato_c();
     return 1;
 }
 
-/* 80BBB834-80BBBD80 000934 054C+00 2/2 0/0 0/0 .text            Execute__15daObj_BouMato_cFv */
 int daObj_BouMato_c::Execute() {
     cXyz cStack_34;
     cXyz local_40;
@@ -200,7 +190,6 @@ int daObj_BouMato_c::Execute() {
     return 1;
 }
 
-/* 80BBBD80-80BBBE50 000E80 00D0+00 1/1 0/0 0/0 .text            Draw__15daObj_BouMato_cFv */
 int daObj_BouMato_c::Draw() {
     if (field_0xa38 == 0) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -216,14 +205,10 @@ int daObj_BouMato_c::Draw() {
     return 1;
 }
 
-/* 80BBBE50-80BBBE70 000F50 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_BouMato_cFP10fopAc_ac_c          */
 int daObj_BouMato_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_BouMato_c*>(i_this)->CreateHeap();
 }
 
-/* 80BBBE70-80BBBEA0 000F70 0030+00 1/1 0/0 0/0 .text
- * tgHitCallBack__15daObj_BouMato_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2,
                                         fopAc_ac_c* param_3, dCcD_GObjInf* param_4) {
     u8 cutType = 0;
@@ -237,15 +222,10 @@ void daObj_BouMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2,
     static_cast<daObj_BouMato_c*>(param_1)->setCutType(cutType);
 }
 
-/* ############################################################################################## */
-/* 80BBC678-80BBC808 000008 0190+00 2/2 0/0 0/0 .bss             l_findActorPtrs */
 static daArrow_c* l_findActorPtrs[100];
 
-/* 80BBC808-80BBC80C 000198 0004+00 2/2 0/0 0/0 .bss             l_findCount */
 static u32 l_findCount;
 
-/* 80BBBEA0-80BBBF4C 000FA0 00AC+00 1/1 0/0 0/0 .text            srchArrow__15daObj_BouMato_cFPvPv
- */
 void* daObj_BouMato_c::srchArrow(void* param_1, void* param_2) {
     if (l_findCount < 100 && param_1 != NULL && param_1 != param_2) {
         if (fopAcM_IsExecuting(fopAcM_GetID(param_1)) && fopAcM_GetName(param_1) == PROC_ARROW &&
@@ -258,7 +238,6 @@ void* daObj_BouMato_c::srchArrow(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80BBBF4C-80BBBFF8 00104C 00AC+00 1/1 0/0 0/0 .text deleteStuckArrow__15daObj_BouMato_cFv */
 void daObj_BouMato_c::deleteStuckArrow() {
     l_findCount = 0;
     fopAcM_Search(srchArrow, this);
@@ -270,13 +249,10 @@ void daObj_BouMato_c::deleteStuckArrow() {
     }
 }
 
-/* 80BBBFF8-80BBC008 0010F8 0010+00 3/3 0/0 0/0 .text            getResName__15daObj_BouMato_cFv */
 char* daObj_BouMato_c::getResName() {
     return l_resName;
 }
 
-/* 80BBC008-80BBC19C 001108 0194+00 1/1 0/0 0/0 .text
- * setSwayParam__15daObj_BouMato_cFP10fopAc_ac_c                */
 void daObj_BouMato_c::setSwayParam(fopAc_ac_c* param_1) {
     f32 dVar7 = 1.0f;
     f32 local_48[3] = {0.0f, 0.0f, daObj_BouMato_Param_c::m[6]};;
@@ -314,21 +290,17 @@ void daObj_BouMato_c::setSwayParam(fopAc_ac_c* param_1) {
     }
 }
 
-/* 80BBC19C-80BBC1F8 00129C 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__15daObj_BouMato_cFv
- */
 void daObj_BouMato_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80BBC1F8-80BBC23C 0012F8 0044+00 2/2 0/0 0/0 .text            setRoomNo__15daObj_BouMato_cFv */
 void daObj_BouMato_c::setRoomNo() {
     s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStts.SetRoomId(roomId);
 }
 
-/* 80BBC23C-80BBC2C0 00133C 0084+00 1/1 0/0 0/0 .text            setMtx__15daObj_BouMato_cFv */
 void daObj_BouMato_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -338,35 +310,28 @@ void daObj_BouMato_c::setMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BBC2C0-80BBC2E0 0013C0 0020+00 1/0 0/0 0/0 .text            daObj_BouMato_Create__FPv */
 static int daObj_BouMato_Create(void* i_this) {
     return static_cast<daObj_BouMato_c*>(i_this)->create();
 }
 
-/* 80BBC2E0-80BBC300 0013E0 0020+00 1/0 0/0 0/0 .text            daObj_BouMato_Delete__FPv */
 static int daObj_BouMato_Delete(void* i_this) {
     return static_cast<daObj_BouMato_c*>(i_this)->Delete();
 }
 
-/* 80BBC300-80BBC320 001400 0020+00 1/0 0/0 0/0 .text            daObj_BouMato_Execute__FPv */
 static int daObj_BouMato_Execute(void* i_this) {
     return static_cast<daObj_BouMato_c*>(i_this)->Execute();
 }
 
-/* 80BBC320-80BBC340 001420 0020+00 1/0 0/0 0/0 .text            daObj_BouMato_Draw__FPv */
 static int daObj_BouMato_Draw(void* i_this) {
     return static_cast<daObj_BouMato_c*>(i_this)->Draw();
 }
 
-/* 80BBC340-80BBC348 001440 0008+00 1/0 0/0 0/0 .text            daObj_BouMato_IsDelete__FPv */
 static int daObj_BouMato_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80BBC818-80BBC81C 0001A8 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_BouMato_Param_c l_HIO;
 
-/* 80BBC598-80BBC5B8 -00001 0020+00 1/0 0/0 0/0 .data            daObj_BouMato_MethodTable */
 static actor_method_class daObj_BouMato_MethodTable = {
     (process_method_func)daObj_BouMato_Create,
     (process_method_func)daObj_BouMato_Delete,
@@ -375,7 +340,6 @@ static actor_method_class daObj_BouMato_MethodTable = {
     (process_method_func)daObj_BouMato_Draw,
 };
 
-/* 80BBC5B8-80BBC5E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_BOUMATO */
 extern actor_process_profile_definition g_profile_OBJ_BOUMATO = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp
index 16002a3185..3599b77683 100644
--- a/src/d/actor/d_a_obj_brakeeff.cpp
+++ b/src/d/actor/d_a_obj_brakeeff.cpp
@@ -6,7 +6,6 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_brakeeff.h"
-#include "dol2asm.h"
 #include "d/d_kankyo.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
@@ -34,8 +33,6 @@ u32 bef_brk[2] = {
     10,
 };
 
-/* 8046DCB8-8046DD38 000078 0080+00 1/0 0/0 0/0 .text daObj_Brakeeff_Draw__FP18obj_brakeeff_class
- */
 int daObj_Brakeeff_Draw(obj_brakeeff_class* i_this) {
     J3DModel* model = i_this->mpModel;
 
@@ -47,7 +44,6 @@ int daObj_Brakeeff_Draw(obj_brakeeff_class* i_this) {
     return 1;
 }
 
-/* 8046DD38-8046DF80 0000F8 0248+00 1/1 0/0 0/0 .text obj_brakeeff_1__FP18obj_brakeeff_class */
 void obj_brakeeff_1(obj_brakeeff_class* i_this) {
     cXyz pos (i_this->current.pos);
     cXyz misc_vector(1.0f, 1.0f, 1.0f);
@@ -97,7 +93,6 @@ void obj_brakeeff_1(obj_brakeeff_class* i_this) {
     }
 }
 
-/* 8046DF80-8046DFB0 000340 0030+00 1/1 0/0 0/0 .text            action__FP18obj_brakeeff_class */
 void action(obj_brakeeff_class* i_this) {
     switch (i_this->mMiscTimer2){
     case 0:
@@ -106,8 +101,6 @@ void action(obj_brakeeff_class* i_this) {
     }
 }
 
-/* 8046DFB0-8046E098 000370 00E8+00 2/1 0/0 0/0 .text
- * daObj_Brakeeff_Execute__FP18obj_brakeeff_class               */
 int daObj_Brakeeff_Execute(obj_brakeeff_class* i_this) {
     i_this->mMiscTimer1++;
 
@@ -132,14 +125,10 @@ int daObj_Brakeeff_Execute(obj_brakeeff_class* i_this) {
     return 1;
 }
 
-/* 8046E098-8046E0A0 000458 0008+00 1/0 0/0 0/0 .text
- * daObj_Brakeeff_IsDelete__FP18obj_brakeeff_class              */
 int daObj_Brakeeff_IsDelete(obj_brakeeff_class* i_this) {
     return 1;
 }
 
-/* 8046E0A0-8046E0F0 000460 0050+00 1/0 0/0 0/0 .text
- * daObj_Brakeeff_Delete__FP18obj_brakeeff_class                */
 int daObj_Brakeeff_Delete(obj_brakeeff_class* i_this) {
     dComIfG_resDelete(&i_this->mRequestOfPhase, "Obj_Bef");
     dComIfG_Bgsp().Release(i_this->mpDBgW);
@@ -147,7 +136,6 @@ int daObj_Brakeeff_Delete(obj_brakeeff_class* i_this) {
     return 1;
 }
 
-/* 8046E0F0-8046E2B0 0004B0 01C0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 int useHeapInit(fopAc_ac_c* i_this) {
     obj_brakeeff_class* a_this = static_cast<obj_brakeeff_class*>(i_this);
 
@@ -188,7 +176,6 @@ int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8046E2F8-8046E490 0006B8 0198+00 1/0 0/0 0/0 .text daObj_Brakeeff_Create__FP10fopAc_ac_c */
 int daObj_Brakeeff_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -229,7 +216,6 @@ int daObj_Brakeeff_Create(fopAc_ac_c* i_this) {
 }
 
 
-/* 8046E59C-8046E5BC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Brakeeff_Method */
 actor_method_class l_daObj_Brakeeff_Method = {
     (process_method_func)daObj_Brakeeff_Create,
     (process_method_func)daObj_Brakeeff_Delete,
@@ -238,7 +224,6 @@ actor_method_class l_daObj_Brakeeff_Method = {
     (process_method_func)daObj_Brakeeff_Draw,
 };
 
-/* 8046E5BC-8046E5EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_BEF */
 extern actor_process_profile_definition g_profile_OBJ_BEF = {
     fpcLy_CURRENT_e,            // mLayerID
     3,                          // mListID
diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp
index e0d80202ab..c9ddbbf5a0 100644
--- a/src/d/actor/d_a_obj_brg.cpp
+++ b/src/d/actor/d_a_obj_brg.cpp
@@ -15,8 +15,6 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80BBC90C-80BBCCFC 0000EC 03F0+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     obj_brg_class* a_this = (obj_brg_class*)i_bgActor;
 
@@ -96,8 +94,6 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rid
     }
 }
 
-/* 80BBCD38-80BBD740 000518 0A08+00 1/0 0/0 0/0 .text            daObj_Brg_Draw__FP13obj_brg_class
- */
 static int daObj_Brg_Draw(obj_brg_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     g_env_light.settingTevStruct(0x10, &a_this->current.pos, &a_this->tevStr);
@@ -360,8 +356,6 @@ static int daObj_Brg_Draw(obj_brg_class* i_this) {
 /* 80BC2526 0002+00 data_80BC2526 wy */
 static s16 wy;
 
-/* 80BBD740-80BBDA64 000F20 0324+00 1/1 0/0 0/0 .text            control1__FP13obj_brg_classP4br_s
- */
 static void control1(obj_brg_class* i_this, br_s* i_part) {
     cXyz sp84;
     cXyz sp90;
@@ -426,8 +420,6 @@ static void control1(obj_brg_class* i_this, br_s* i_part) {
     }
 }
 
-/* 80BBDA64-80BBDC28 001244 01C4+00 1/1 0/0 0/0 .text            control2__FP13obj_brg_classP4br_s
- */
 static void control2(obj_brg_class* i_this, br_s* i_part) {
     cXyz sp68;
     cXyz sp74;
@@ -462,8 +454,6 @@ static void control2(obj_brg_class* i_this, br_s* i_part) {
     }
 }
 
-/* 80BBDC28-80BBDCE8 001408 00C0+00 1/1 0/0 0/0 .text            control3__FP13obj_brg_classP4br_s
- */
 static void control3(obj_brg_class* i_this, br_s* i_part) {
     f32 var_f31 = i_part->field_0x0b0.x - i_part[1].field_0x0b0.x;
     f32 var_f29 = i_part->field_0x0b0.y - i_part[1].field_0x0b0.y;
@@ -473,7 +463,6 @@ static void control3(obj_brg_class* i_this, br_s* i_part) {
     i_part->field_0x0d4.x = -cM_atan2s(var_f29, JMAFastSqrt(var_f31 * var_f31 + var_f30 * var_f30));
 }
 
-/* 80BBDCE8-80BBE008 0014C8 0320+00 1/1 0/0 0/0 .text cut_control1__FP13obj_brg_classP4br_s */
 static void cut_control1(obj_brg_class* i_this, br_s* i_part) {
     fopAc_ac_c* a_this = i_this;
     cXyz sp7C;
@@ -537,7 +526,6 @@ static void cut_control1(obj_brg_class* i_this, br_s* i_part) {
     }
 }
 
-/* 80BBE008-80BBE338 0017E8 0330+00 1/1 0/0 0/0 .text cut_control2__FP13obj_brg_classP4br_s */
 static void cut_control2(obj_brg_class* i_this, br_s* i_part) {
     cXyz sp7C;
     cXyz sp88;
@@ -598,8 +586,6 @@ static void cut_control2(obj_brg_class* i_this, br_s* i_part) {
     }
 }
 
-/* 80BBE338-80BBE578 001B18 0240+00 1/1 0/0 0/0 .text himo_cut_control1__FP13obj_brg_classP4cXyzf
- */
 static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2) {
     cXyz sp74;
     cXyz sp80;
@@ -641,7 +627,6 @@ static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2)
     }
 }
 
-/* 80BC23AC-80BC23D8 000008 002C+00 1/1 0/0 0/0 .data            ita_z_p */
 static f32 ita_z_p[] = {
     0.1f,
     0.3f,
@@ -656,7 +641,6 @@ static f32 ita_z_p[] = {
     0.1f,
 };
 
-/* 80BBE578-80BBF21C 001D58 0CA4+00 1/1 0/0 0/0 .text            obj_brg_move__FP13obj_brg_class */
 static void obj_brg_move(obj_brg_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -926,7 +910,6 @@ static void obj_brg_move(obj_brg_class* i_this) {
     }
 }
 
-/* 80BBF21C-80BC0834 0029FC 1618+00 2/1 0/0 0/0 .text daObj_Brg_Execute__FP13obj_brg_class */
 static int daObj_Brg_Execute(obj_brg_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* ply = dComIfGp_getPlayer(0);
@@ -1414,7 +1397,6 @@ static int daObj_Brg_Execute(obj_brg_class* i_this) {
     return 1;
 }
 
-/* 80BC0834-80BC0854 004014 0020+00 1/0 0/0 0/0 .text daObj_Brg_IsDelete__FP13obj_brg_class */
 static int daObj_Brg_IsDelete(obj_brg_class* i_this) {
     br_s* part = i_this->mBr;
 
@@ -1425,8 +1407,6 @@ static int daObj_Brg_IsDelete(obj_brg_class* i_this) {
     return 1;
 }
 
-/* 80BC0854-80BC08B0 004034 005C+00 1/0 0/0 0/0 .text            daObj_Brg_Delete__FP13obj_brg_class
- */
 static int daObj_Brg_Delete(obj_brg_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_brg");
 
@@ -1437,7 +1417,6 @@ static int daObj_Brg_Delete(obj_brg_class* i_this) {
     return 1;
 }
 
-/* 80BC08B0-80BC0A40 004090 0190+00 1/1 0/0 0/0 .text            CreateInit__FP10fopAc_ac_c */
 static void CreateInit(fopAc_ac_c* i_this) {
     obj_brg_class* a_this = (obj_brg_class*)i_this;
 
@@ -1505,8 +1484,6 @@ static void CreateInit(fopAc_ac_c* i_this) {
     }
 }
 
-/* 80BC0A40-80BC1050 004220 0610+00 1/1 0/0 0/0 .text            CallbackCreateHeap__FP10fopAc_ac_c
- */
 static int CallbackCreateHeap(fopAc_ac_c* i_this) {
     obj_brg_class* a_this = (obj_brg_class*)i_this;
 
@@ -1650,7 +1627,6 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80BC1050-80BC1D74 004830 0D24+00 1/0 0/0 0/0 .text            daObj_Brg_Create__FP10fopAc_ac_c */
 static int daObj_Brg_Create(fopAc_ac_c* i_this) {
     obj_brg_class* a_this = (obj_brg_class*)i_this;
     int phase_state;
@@ -1841,7 +1817,6 @@ static int daObj_Brg_Create(fopAc_ac_c* i_this) {
 
 AUDIO_INSTANCES;
 
-/* 80BC2460-80BC2480 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Brg_Method */
 static actor_method_class l_daObj_Brg_Method = {
     (process_method_func)daObj_Brg_Create,
     (process_method_func)daObj_Brg_Delete,
@@ -1850,7 +1825,6 @@ static actor_method_class l_daObj_Brg_Method = {
     (process_method_func)daObj_Brg_Draw,
 };
 
-/* 80BC2480-80BC24B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_BRG */
 extern actor_process_profile_definition g_profile_OBJ_BRG = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp
index 83952e67cf..a150763be3 100644
--- a/src/d/actor/d_a_obj_bsGate.cpp
+++ b/src/d/actor/d_a_obj_bsGate.cpp
@@ -9,14 +9,12 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80BC288C-80BC28C8 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__14daBsGate_HIO_cFv */
 daBsGate_HIO_c::daBsGate_HIO_c() {
     mOpenSpeed = 2.0f;
     mCloseSpeed = 12.0f;
     mShockStrength = 3;
 }
 
-/* 80BC2910-80BC29AC 000170 009C+00 2/2 0/0 0/0 .text            setBaseMtx__10daBsGate_cFv */
 void daBsGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -25,7 +23,6 @@ void daBsGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BC29AC-80BC2A18 00020C 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daBsGate_cFv */
 int daBsGate_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("S_Zgate", 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -35,7 +32,6 @@ int daBsGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80BC2A18-80BC2B6C 000278 0154+00 1/1 0/0 0/0 .text            create__10daBsGate_cFv */
 cPhs__Step daBsGate_c::create() {
     fopAcM_ct(this, daBsGate_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "S_Zgate");
@@ -61,7 +57,6 @@ cPhs__Step daBsGate_c::create() {
     return step;
 }
 
-/* 80BC2B6C-80BC2BBC 0003CC 0050+00 1/0 0/0 0/0 .text            Execute__10daBsGate_cFPPA3_A4_f */
 int daBsGate_c::Execute(Mtx** i_mtxP) {
     moveGate();
     *i_mtxP = &mpModel->getBaseTRMtx();
@@ -69,10 +64,8 @@ int daBsGate_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80BC32DC-80BC32EC 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daBsGate_HIO_c l_HIO;
 
-/* 80BC2BBC-80BC2CC4 00041C 0108+00 1/1 0/0 0/0 .text            moveGate__10daBsGate_cFv */
 void daBsGate_c::moveGate() {
     typedef void (daBsGate_c::*daBsGate_modeFunc)();
     static daBsGate_modeFunc mode_proc[3] = {
@@ -92,22 +85,18 @@ void daBsGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80BC2CC4-80BC2CD0 000524 000C+00 3/3 0/0 0/0 .text            init_modeWait__10daBsGate_cFv */
 void daBsGate_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80BC2CD0-80BC2CD4 000530 0004+00 1/0 0/0 0/0 .text            modeWait__10daBsGate_cFv */
 void daBsGate_c::modeWait() {
     /* empty function */
 }
 
-/* 80BC2CD4-80BC2CE0 000534 000C+00 1/1 0/0 0/0 .text            init_modeOpen__10daBsGate_cFv */
 void daBsGate_c::init_modeOpen() {
     mMode = MODE_OPEN;
 }
 
-/* 80BC2CE0-80BC2E34 000540 0154+00 1/0 0/0 0/0 .text            modeOpen__10daBsGate_cFv */
 void daBsGate_c::modeOpen() {
     if (mSide == 0) {
         mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_OP, &current.pos, 0,
@@ -123,12 +112,10 @@ void daBsGate_c::modeOpen() {
     }
 }
 
-/* 80BC2E34-80BC2E40 000694 000C+00 1/1 0/0 0/0 .text            init_modeClose__10daBsGate_cFv */
 void daBsGate_c::init_modeClose() {
     mMode = MODE_CLOSE;
 }
 
-/* 80BC2E40-80BC2F94 0006A0 0154+00 1/0 0/0 0/0 .text            modeClose__10daBsGate_cFv */
 void daBsGate_c::modeClose() {
     if (mSide == 0) {
         mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_CL, &current.pos, 0,
@@ -144,7 +131,6 @@ void daBsGate_c::modeClose() {
     }
 }
 
-/* 80BC2F94-80BC3038 0007F4 00A4+00 1/0 0/0 0/0 .text            Draw__10daBsGate_cFv */
 int daBsGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -154,34 +140,28 @@ int daBsGate_c::Draw() {
     return 1;
 }
 
-/* 80BC3038-80BC3068 000898 0030+00 1/0 0/0 0/0 .text            Delete__10daBsGate_cFv */
 int daBsGate_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "S_Zgate");
     return 1;
 }
 
-/* 80BC3068-80BC3094 0008C8 002C+00 1/0 0/0 0/0 .text            daBsGate_Draw__FP10daBsGate_c */
 static int daBsGate_Draw(daBsGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC3094-80BC30B4 0008F4 0020+00 1/0 0/0 0/0 .text            daBsGate_Execute__FP10daBsGate_c */
 
 static int daBsGate_Execute(daBsGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC30B4-80BC30D4 000914 0020+00 1/0 0/0 0/0 .text            daBsGate_Delete__FP10daBsGate_c */
 static int daBsGate_Delete(daBsGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BC30D4-80BC30F4 000934 0020+00 1/0 0/0 0/0 .text            daBsGate_Create__FP10fopAc_ac_c */
 static cPhs__Step daBsGate_Create(fopAc_ac_c* i_this) {
     return static_cast<daBsGate_c*>(i_this)->create();
 }
 
-/* 80BC3234-80BC3254 -00001 0020+00 1/0 0/0 0/0 .data            l_daBsGate_Method */
 static actor_method_class l_daBsGate_Method = {
     (process_method_func)daBsGate_Create,
     (process_method_func)daBsGate_Delete,
@@ -190,7 +170,6 @@ static actor_method_class l_daBsGate_Method = {
     (process_method_func)daBsGate_Draw,
 };
 
-/* 80BC3254-80BC3284 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BsGate */
 extern actor_process_profile_definition g_profile_Obj_BsGate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp
index 08aaf49592..c90a88799c 100644
--- a/src/d/actor/d_a_obj_bubblePilar.cpp
+++ b/src/d/actor/d_a_obj_bubblePilar.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80BC4224-80BC422C 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daBubbPilar_HIO_c l_HIO;
 
-/* 80BC4070-80BC40A0 000000 0030+00 3/3 0/0 0/0 .rodata          mCcDObjInfo__13daBubbPilar_c */
 const dCcD_SrcGObjInf daBubbPilar_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x20, 0x11}, {0}}},
     {dCcD_SE_NONE, 0, 1, 0, 0},
@@ -20,19 +18,16 @@ const dCcD_SrcGObjInf daBubbPilar_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80BC40DC-80BC4120 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__13daBubbPilar_c */
 dCcD_SrcCyl daBubbPilar_c::mCcDCyl = {
     daBubbPilar_c::mCcDObjInfo,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80BC33EC-80BC3418 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__17daBubbPilar_HIO_cFv */
 daBubbPilar_HIO_c::daBubbPilar_HIO_c() {
     field_0x4 = 20;
     field_0x5 = 0;
 }
 
-/* 80BC3460-80BC3518 000160 00B8+00 2/2 0/0 0/0 .text            setBaseMtx__13daBubbPilar_cFv */
 void daBubbPilar_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -42,7 +37,6 @@ void daBubbPilar_c::setBaseMtx() {
     mModels[mModelMode]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BC3518-80BC35D0 000218 00B8+00 1/0 0/0 0/0 .text            CreateHeap__13daBubbPilar_cFv */
 int daBubbPilar_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("M_Crack", 4);
     JUT_ASSERT(226, modelData != NULL);
@@ -59,7 +53,6 @@ int daBubbPilar_c::CreateHeap() {
     return 1;
 }
 
-/* 80BC35D0-80BC3848 0002D0 0278+00 1/1 0/0 0/0 .text            create__13daBubbPilar_cFv */
 int daBubbPilar_c::create() {
     fopAcM_ct(this, daBubbPilar_c);
     int rv = dComIfG_resLoad(&mPhase, "M_Crack");
@@ -104,8 +97,6 @@ int daBubbPilar_c::create() {
     return rv;
 }
 
-/* 80BC3934-80BC3AB8 000634 0184+00 1/0 0/0 0/0 .text            Execute__13daBubbPilar_cFPPA3_A4_f
- */
 int daBubbPilar_c::Execute(Mtx** param_1) {
     static daBubbPilar_c::modeProc const mode_proc[2] = {
         &daBubbPilar_c::modeWait,
@@ -141,12 +132,10 @@ int daBubbPilar_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BC3AB8-80BC3AC4 0007B8 000C+00 2/2 0/0 0/0 .text            initModeWait__13daBubbPilar_cFv */
 void daBubbPilar_c::initModeWait() {
     mMode = 0;
 }
 
-/* 80BC3AC4-80BC3C74 0007C4 01B0+00 1/0 0/0 0/0 .text            modeWait__13daBubbPilar_cFv */
 void daBubbPilar_c::modeWait() {
     if (mArg0 == 0) {
         s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
@@ -168,7 +157,6 @@ void daBubbPilar_c::modeWait() {
     }
 }
 
-/* 80BC3C74-80BC3C98 000974 0024+00 2/2 0/0 0/0 .text            initModeEffOn__13daBubbPilar_cFv */
 void daBubbPilar_c::initModeEffOn() {
     if (mArg0 == 0) {
         mCyl.OffTgSetBit();
@@ -176,14 +164,12 @@ void daBubbPilar_c::initModeEffOn() {
     mMode = 1;
 }
 
-/* 80BC40AC-80BC40B4 00003C 0006+02 0/1 0/0 0/0 .rodata          particle_id$3953 */
 static u16 const particle_id[3] = {
     0x88BE,
     0x88BF,
     0x88C0,
 };
 
-/* 80BC3C98-80BC3DB0 000998 0118+00 1/0 0/0 0/0 .text            modeEffOn__13daBubbPilar_cFv */
 void daBubbPilar_c::modeEffOn() {
     s8 reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this));
     mDoAud_seStartLevel(Z2SE_OBJ_WTR_STREAM, &current.pos, 0, reverb);
@@ -197,7 +183,6 @@ void daBubbPilar_c::modeEffOn() {
     }
 }
 
-/* 80BC3DB0-80BC3E8C 000AB0 00DC+00 1/0 0/0 0/0 .text            Draw__13daBubbPilar_cFv */
 int daBubbPilar_c::Draw() {
     if (mArg0 == 0) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -210,35 +195,27 @@ int daBubbPilar_c::Draw() {
     return 1;
 }
 
-/* 80BC3E8C-80BC3EBC 000B8C 0030+00 1/0 0/0 0/0 .text            Delete__13daBubbPilar_cFv */
 int daBubbPilar_c::Delete() {
     dComIfG_resDelete(&mPhase, "M_Crack");
     return 1;
 }
 
-/* 80BC3EBC-80BC3EE8 000BBC 002C+00 1/0 0/0 0/0 .text            daBubbPilar_Draw__FP13daBubbPilar_c
- */
 static int daBubbPilar_Draw(daBubbPilar_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC3EE8-80BC3F08 000BE8 0020+00 1/0 0/0 0/0 .text daBubbPilar_Execute__FP13daBubbPilar_c */
 static int daBubbPilar_Execute(daBubbPilar_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC3F08-80BC3F28 000C08 0020+00 1/0 0/0 0/0 .text daBubbPilar_Delete__FP13daBubbPilar_c */
 static int daBubbPilar_Delete(daBubbPilar_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BC3F28-80BC3F48 000C28 0020+00 1/0 0/0 0/0 .text            daBubbPilar_Create__FP10fopAc_ac_c
- */
 static int daBubbPilar_Create(fopAc_ac_c* i_this) {
     return static_cast<daBubbPilar_c*>(i_this)->create();
 }
 
-/* 80BC4150-80BC4170 -00001 0020+00 1/0 0/0 0/0 .data            l_daBubbPilar_Method */
 static actor_method_class l_daBubbPilar_Method = {
     (process_method_func)daBubbPilar_Create,
     (process_method_func)daBubbPilar_Delete,
@@ -247,7 +224,6 @@ static actor_method_class l_daBubbPilar_Method = {
     (process_method_func)daBubbPilar_Draw,
 };
 
-/* 80BC4170-80BC41A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_awaPlar */
 extern actor_process_profile_definition g_profile_Obj_awaPlar = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp
index 19106d69d7..8d4c9ac2b5 100644
--- a/src/d/actor/d_a_obj_burnbox.cpp
+++ b/src/d/actor/d_a_obj_burnbox.cpp
@@ -8,17 +8,11 @@
 #include "d/actor/d_a_obj_burnbox.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
-/* 8046E698-8046E6D4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjBurnBox_cFv */
 void daObjBurnBox_c::initBaseMtx() {
     mpBoxModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 8046E6D4-8046E738 0000B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjBurnBox_cFv */
 void daObjBurnBox_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -26,22 +20,18 @@ void daObjBurnBox_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* ############################################################################################## */
-/* 8046EE48-8046EE54 000000 000C+00 2/2 0/0 0/0 .rodata          l_bmd */
 const u32 l_bmd[3] = {
     0x04,
     0x04,
     0x03,
 };
 
-/* 8046EE54-8046EE60 00000C 000C+00 1/1 0/0 0/0 .rodata          l_heap_size */
 const u32 l_heap_size[3] = {
     0x0820,
     0x0C00,
     0x0820,
 };
 
-/* 8046EE60-8046EEA4 000018 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src */
 const dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x1e}, 0x79}}, // mObj
@@ -56,7 +46,6 @@ const dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 8046E738-8046E8BC 000118 0184+00 1/0 0/0 0/0 .text            Create__14daObjBurnBox_cFv */
 int daObjBurnBox_c::Create() {
     static const u16 particle_id[5] = {
         0x8526, 0x8527, 0x8528, 0x8529, 0x8746,
@@ -90,15 +79,12 @@ int daObjBurnBox_c::Create() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 8046EED4-8046EEE0 -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 const char* l_arcName[3] = {
     "Kkiba_00", // crate
     "Kkiba_00",
     "J_taru00", // barrel
 };
 
-/* 8046E8BC-8046E93C 00029C 0080+00 1/0 0/0 0/0 .text            CreateHeap__14daObjBurnBox_cFv */
 int daObjBurnBox_c::CreateHeap() {
     u8 type = getType();
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName[type], l_bmd[type]);
@@ -111,7 +97,6 @@ int daObjBurnBox_c::CreateHeap() {
     return 1;
 }
 
-/* 8046E93C-8046E9EC 00031C 00B0+00 1/1 0/0 0/0 .text            create1st__14daObjBurnBox_cFv */
 cPhs__Step daObjBurnBox_c::create1st() {
     cPhs__Step phaseStep = (cPhs__Step) dComIfG_resLoad(&mPhaseReq, l_arcName[getType()]);
     if (phaseStep == cPhs_COMPLEATE_e) {
@@ -132,8 +117,6 @@ cPhs__Step daObjBurnBox_c::create1st() {
     return phaseStep;
 }
 
-/* 8046E9EC-8046EABC 0003CC 00D0+00 1/0 0/0 0/0 .text            Execute__14daObjBurnBox_cFPPA3_A4_f
- */
 int daObjBurnBox_c::Execute(Mtx** mtx) {
     field_0x724++;
     if (field_0x724 % 3 == 0) {
@@ -156,7 +139,6 @@ int daObjBurnBox_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 8046EABC-8046EC10 00049C 0154+00 1/0 0/0 0/0 .text            Draw__14daObjBurnBox_cFv */
 int daObjBurnBox_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBoxModel, &tevStr);
@@ -180,46 +162,34 @@ int daObjBurnBox_c::Draw() {
     return 1;
 }
 
-/* 8046EC10-8046EC50 0005F0 0040+00 1/0 0/0 0/0 .text            Delete__14daObjBurnBox_cFv */
 int daObjBurnBox_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName[getType()]);
     return 1;
 }
 
-/* 8046EC50-8046ED44 000630 00F4+00 1/0 0/0 0/0 .text daObjBurnBox_create1st__FP14daObjBurnBox_c
- */
 int daObjBurnBox_create1st(daObjBurnBox_c* i_this) {
     fopAcM_ct(i_this, daObjBurnBox_c);
     return i_this->create1st();
 }
 
-/* 8046EDD4-8046EDF4 0007B4 0020+00 1/0 0/0 0/0 .text
- * daObjBurnBox_MoveBGDelete__FP14daObjBurnBox_c                */
 int daObjBurnBox_MoveBGDelete(daObjBurnBox_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8046EDF4-8046EE14 0007D4 0020+00 1/0 0/0 0/0 .text
- * daObjBurnBox_MoveBGExecute__FP14daObjBurnBox_c               */
 int daObjBurnBox_MoveBGExecute(daObjBurnBox_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8046EE14-8046EE40 0007F4 002C+00 1/0 0/0 0/0 .text daObjBurnBox_MoveBGDraw__FP14daObjBurnBox_c
- */
 int daObjBurnBox_MoveBGDraw(daObjBurnBox_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 8046EEE0-8046EF00 -00001 0020+00 1/0 0/0 0/0 .data            daObjBurnBox_METHODS */
 actor_method_class daObjBurnBox_METHODS = {
     (process_method_func) daObjBurnBox_create1st,     (process_method_func)daObjBurnBox_MoveBGDelete,
     (process_method_func) daObjBurnBox_MoveBGExecute, NULL,
     (process_method_func) daObjBurnBox_MoveBGDraw,
 };
 
-/* 8046EF00-8046EF30 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_BurnBox */
 extern actor_process_profile_definition g_profile_Obj_BurnBox = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp
index be2c30c877..520c243bc3 100644
--- a/src/d/actor/d_a_obj_carry.cpp
+++ b/src/d/actor/d_a_obj_carry.cpp
@@ -21,7 +21,6 @@
 #include "d/d_debug_viewer.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 8047990C-80479A24 000000 0118+00 29/29 0/0 0/0 .rodata          l_cyl_info */
 static const cM3dGCylS l_cyl_info[] = {
     { 0.0f, 0.0f, 0.0f, 30.0f, 100.0f },
     { 0.0f, 0.0f, 0.0f, 50.0f, 100.0f },
@@ -39,7 +38,6 @@ static const cM3dGCylS l_cyl_info[] = {
     { 0.0f, 0.0f, 0.0f, 50.0f, 100.0f },
 };
 
-/* 80479A24-8047A23C 000118 0818+00 1/1 0/0 0/0 .rodata          mData__12daObjCarry_c */
 const daObjCarry_dt_t daObjCarry_c::mData[] = {
     // TYPE_TSUBO
     {
@@ -659,7 +657,6 @@ const daObjCarry_dt_t daObjCarry_c::mData[] = {
     },
 };
 
-/* 8047A23C-8047A280 000930 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{AT_TYPE_THROW_OBJ, 0x2, 0x1f}, {0xd8fbfdff, 0x1f}, 0x79}},  // mObj
@@ -674,7 +671,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     }  // mCyl
 };
 
-/* 8047A280-8047A2C0 000974 0040+00 0/1 0/0 0/0 .rodata          l_light_at_sph_src */
 const static dCcD_SrcSph l_light_at_sph_src = {
     {
         {0x0, {{AT_TYPE_LANTERN_SWING, 0x0, 0x11}, {0x0, 0x10}, 0x0}},  // mObj
@@ -687,7 +683,6 @@ const static dCcD_SrcSph l_light_at_sph_src = {
     }  // mSphAttr
 };
 
-/* 8047A2C0-8047A30C 0009B4 004C+00 0/1 0/0 0/0 .rodata          l_atCpsSrc */
 const static dCcD_SrcCps l_atCpsSrc = {
     {
         {0x0, {{AT_TYPE_IRON_BALL, 0x64, 0x1f}, {0x0, 0x10}, 0x0}},  // mObj
@@ -700,7 +695,6 @@ const static dCcD_SrcCps l_atCpsSrc = {
     }  // mCpsAttr
 };
 
-/* 8047A30C-8047A350 000A00 0044+00 0/1 0/0 0/0 .rodata          l_tg_cyl */
 const static dCcD_SrcCyl l_tg_cyl = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x200, 0x11}, 0x0}},  // mObj
@@ -715,16 +709,13 @@ const static dCcD_SrcCyl l_tg_cyl = {
     }  // mCyl
 };
 
-/* 8047A350-8047A354 000A44 0004+00 0/0 0/0 0/0 .rodata          l_light_color */
 static const GXColor l_light_color = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 8047A670-8047A6A8 -00001 0038+00 1/1 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {
     "J_tubo_00", "J_tubo_01", "Kkiba_00",  "Y_ironbal", "J_taru00", "J_doku00", "Obj_bkl",
     "K_tubo02",  "Obj_ballS", "Obj_ballS", "D_aotubo0", "Obj_tama", "O_tuboS",  "O_tuboB",
 };
 
-/* 8047A6A8-8047A6E0 -00001 0038+00 1/1 0/0 0/0 .data            l_bmdName */
 static char* l_bmdName[] = {
     "J_tubo_00.bmd",       "J_tubo_01.bmd",       "J_hako_00.bmd",  "Yironball.bmd",
     "J_taru_00.bmd",       "J_doku_00.bmd",       "K_hb00.bmd",     "K_tubo02.bmd",
@@ -732,26 +723,21 @@ static char* l_bmdName[] = {
     "O_tuboS_LV8.bmd",     "O_tuboB_LV8.bmd",
 };
 
-/* 8047A6E0-8047A6F8 000090 0018+00 1/0 0/0 0/0 .data            kibako_jv_offset */
 static Vec kibako_jv_offset[] = {
     {0.0f, 0.0f, 0.0f},
     {0.0f, 150.0f, 0.0f},
 };
 
-/* 8047A6F8-8047A710 0000A8 0018+00 1/0 0/0 0/0 .data            taru_jv_offset */
 static Vec taru_jv_offset[] = {
     {0.0f, 0.0f, 0.0f},
     {0.0f, 100.0f, 0.0f},
 };
 
-/* 8047A710-8047A71C -00001 000C+00 1/1 0/0 0/0 .data            kibako_jc_data */
 // box joint col data
 static dJntColData_c kibako_jc_data = {1, 1, 0, 45.0f, kibako_jv_offset};
 
-/* 8047A71C-8047A728 -00001 000C+00 1/1 0/0 0/0 .data            taru_jc_data */
 static dJntColData_c taru_jc_data = {1, 1, 0, 45.0f, taru_jv_offset};
 
-/* 8046EFF8-8046F2F4 000078 02FC+00 1/1 0/0 0/0 .text            bound__FP4cXyzRC13cBgS_PolyInfof */
 static f32 bound(cXyz* param_0, const cBgS_PolyInfo& param_1, f32 param_2) {
     cM3dGPla plane;
 
@@ -768,13 +754,9 @@ static f32 bound(cXyz* param_0, const cBgS_PolyInfo& param_1, f32 param_2) {
     }
 }
 
-/* 8046F33C-8046F340 0003BC 0004+00 1/0 0/0 0/0 .text
- * TgHitCallBackBase__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void TgHitCallBackBase(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                               fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {}
 
-/* 8046F340-8046F3E0 0003C0 00A0+00 1/0 0/0 0/0 .text
- * TgHitCallBackBokkuri__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void TgHitCallBackBokkuri(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                                  fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     daObjCarry_c* objCarry = (daObjCarry_c*)i_tgActor;
@@ -787,13 +769,9 @@ static void TgHitCallBackBokkuri(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf
     }
 }
 
-/* 8046F3E0-8046F3E4 000460 0004+00 1/0 0/0 0/0 .text
- * CoHitCallBackBase__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void CoHitCallBackBase(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                               fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {}
 
-/* 8046F3E4-8046F4AC 000464 00C8+00 1/0 0/0 0/0 .text
- * CoHitCallBackBokkuri__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void CoHitCallBackBokkuri(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                                  fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     daObjCarry_c* objCarry = (daObjCarry_c*)i_coActorA;
@@ -814,7 +792,6 @@ static void CoHitCallBackBokkuri(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjIn
     }
 }
 
-/* 8046F4AC-8046F52C 00052C 0080+00 1/1 0/0 0/0 .text            s_swA_sub__FPvPv */
 static void* s_swA_sub(void* i_actor, void* i_data) {
     daObjSwBallA_c* swball = (daObjSwBallA_c*)i_actor;
     daObjCarry_c* objCarry = (daObjCarry_c*)i_data;
@@ -830,10 +807,8 @@ static void* s_swA_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8047B1D8-8047B1DC 000000 0004+00 3/3 0/0 0/0 .bss             l_sw_id */
 static int l_sw_id;
 
-/* 8046F52C-8046F59C 0005AC 0070+00 2/2 0/0 0/0 .text            s_sw_sub__FPvPv */
 static void* s_sw_sub(void* i_actor, void* i_data) {
     daObjSwBallB_c* swball = (daObjSwBallB_c*)i_actor;
 
@@ -846,7 +821,6 @@ static void* s_sw_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8046F59C-8046F610 00061C 0074+00 1/1 0/0 0/0 .text            s_setA_sub__FPvPv */
 static void* s_setA_sub(void* i_actor, void* i_data) {
     daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor;
 
@@ -859,7 +833,6 @@ static void* s_setA_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8046F610-8046F684 000690 0074+00 1/1 0/0 0/0 .text            s_setB_sub__FPvPv */
 static void* s_setB_sub(void* i_actor, void* i_data) {
     daTagSetBall_c* tagball = (daTagSetBall_c*)i_actor;
 
@@ -872,32 +845,26 @@ static void* s_setB_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8046F684-8046F6A4 000704 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return ((daObjCarry_c*)i_this)->CreateHeap();
 }
 
-/* 8046F6A4-8046F6BC 000724 0018+00 40/40 0/0 0/0 .text            data__12daObjCarry_cFv */
 const daObjCarry_dt_t& daObjCarry_c::data() {
     return mData[mType];
 }
 
-/* 8046F6BC-8046F6D4 00073C 0018+00 3/3 0/0 0/0 .text            getArcName__12daObjCarry_cFv */
 char* daObjCarry_c::getArcName() {
     return l_arcName[mType];
 }
 
-/* 8046F6D4-8046F6EC 000754 0018+00 1/1 0/0 0/0 .text            getBmdName__12daObjCarry_cFv */
 char* daObjCarry_c::getBmdName() {
     return l_bmdName[mType];
 }
 
-/* 8046F6EC-8046F724 00076C 0038+00 2/2 0/0 0/0 .text            checkFlag__12daObjCarry_cFUc */
 BOOL daObjCarry_c::checkFlag(u8 i_flag) {
     return cLib_checkBit<u8>(data().m_flags, i_flag);
 }
 
-/* 8046F724-8046F7AC 0007A4 0088+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjCarry_cFv */
 void daObjCarry_c::initBaseMtx() {
     mRotAxis = cXyz::Zero;
     mRotation = 0;
@@ -906,7 +873,6 @@ void daObjCarry_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8046F7AC-8046FACC 00082C 0320+00 3/4 0/0 0/0 .text            setBaseMtx__12daObjCarry_cFv */
 void daObjCarry_c::setBaseMtx() {
     Mtx rot_mtx;
 
@@ -944,7 +910,6 @@ void daObjCarry_c::setBaseMtx() {
     mpModel->setBaseScale(scale);
 }
 
-/* 8046FACC-8046FB78 000B4C 00AC+00 1/1 0/0 0/0 .text            preInit__12daObjCarry_cFv */
 int daObjCarry_c::preInit() {
     fopAcM_ct(this, daObjCarry_c);
 
@@ -965,10 +930,8 @@ int daObjCarry_c::preInit() {
     return 1;
 }
 
-/* 8046FB78-8046FD90 000BF8 0218+00 1/1 0/0 0/0 .text            __ct__12daObjCarry_cFv */
 daObjCarry_c::daObjCarry_c() {}
 
-/* 8046FFA4-8046FFF8 001024 0054+00 1/1 0/0 0/0 .text checkBreakWolfAttack__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkBreakWolfAttack() {
     if (mType == TYPE_TSUBO   ||
         mType == TYPE_TSUBO_2 ||
@@ -985,7 +948,6 @@ BOOL daObjCarry_c::checkBreakWolfAttack() {
     return FALSE;
 }
 
-/* 8046FFF8-80470054 001078 005C+00 1/1 0/0 0/0 .text checkCarryBoomerang__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCarryBoomerang() {
     if (mType == TYPE_TSUBO   ||
         mType == TYPE_TSUBO_2 ||
@@ -1003,7 +965,6 @@ BOOL daObjCarry_c::checkCarryBoomerang() {
     return FALSE;
 }
 
-/* 80470054-80470080 0010D4 002C+00 1/1 0/0 0/0 .text checkCarryHookshot__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCarryHookshot() {
     if (mType == TYPE_BALL_S   ||
         mType == TYPE_BALL_S_2 ||
@@ -1015,7 +976,6 @@ BOOL daObjCarry_c::checkCarryHookshot() {
     return FALSE;
 }
 
-/* 80470080-804700B4 001100 0034+00 1/1 0/0 0/0 .text            checkCarryWolf__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCarryWolf() {
     if (mType == TYPE_TSUBO   ||
         mType == TYPE_DOKURO  ||
@@ -1028,8 +988,6 @@ BOOL daObjCarry_c::checkCarryWolf() {
     return FALSE;
 }
 
-/* 804700B4-804700F0 001134 003C+00 1/1 0/0 0/0 .text            checkCarryOneHand__12daObjCarry_cFv
- */
 BOOL daObjCarry_c::checkCarryOneHand() {
     if (mType == TYPE_TSUBO   ||
         mType == TYPE_DOKURO  ||
@@ -1043,7 +1001,6 @@ BOOL daObjCarry_c::checkCarryOneHand() {
     return FALSE;
 }
 
-/* 804700F0-804705DC 001170 04EC+00 1/1 0/0 0/0 .text            Create__12daObjCarry_cFv */
 int daObjCarry_c::Create() {
     scale.set(data().scale, data().scale, data().scale);
 
@@ -1163,8 +1120,6 @@ int daObjCarry_c::Create() {
     return 1;
 }
 
-/* 804705DC-80470650 00165C 0074+00 3/0 0/0 0/0 .text            CreateInit_tsubo__12daObjCarry_cFv
- */
 int daObjCarry_c::CreateInit_tsubo() {
     if (!checkCrashRoll()) {
         mCanCrashRoll = true;
@@ -1179,15 +1134,11 @@ int daObjCarry_c::CreateInit_tsubo() {
     return 1;
 }
 
-/* 80470650-80470674 0016D0 0024+00 3/0 0/0 0/0 .text            CreateInit_ootubo__12daObjCarry_cFv
- */
 int daObjCarry_c::CreateInit_ootubo() {
     mode_init_wait();
     return 1;
 }
 
-/* 80470674-804706D4 0016F4 0060+00 1/0 0/0 0/0 .text            CreateInit_kibako__12daObjCarry_cFv
- */
 int daObjCarry_c::CreateInit_kibako() {
     if (!mJntCol.init(this, &kibako_jc_data, mpModel, 1)) {
         return 0;
@@ -1197,7 +1148,6 @@ int daObjCarry_c::CreateInit_kibako() {
     return 1;
 }
 
-/* 804706D4-804707E0 001754 010C+00 1/0 0/0 0/0 .text CreateInit_ironball__12daObjCarry_cFv */
 int daObjCarry_c::CreateInit_ironball() {
     if (chkSaveFlag()) {
         u8 l_saveID = getSaveID();
@@ -1225,8 +1175,6 @@ int daObjCarry_c::CreateInit_ironball() {
     return 1;
 }
 
-/* 804707E0-80470840 001860 0060+00 1/0 0/0 0/0 .text            CreateInit_taru__12daObjCarry_cFv
- */
 int daObjCarry_c::CreateInit_taru() {
     if (!mJntCol.init(this, &taru_jc_data, mpModel, 1)) {
         return 0;
@@ -1236,14 +1184,11 @@ int daObjCarry_c::CreateInit_taru() {
     return 1;
 }
 
-/* 80470840-80470890 0018C0 0050+00 1/0 0/0 0/0 .text            CreateInit_dokuro__12daObjCarry_cFv
- */
 int daObjCarry_c::CreateInit_dokuro() {
     mode_init_wait();
     return fopAcM_isSwitch(this, getSwbit()) == FALSE ? TRUE : FALSE;
 }
 
-/* 80470890-804709DC 001910 014C+00 1/0 0/0 0/0 .text CreateInit_bokkuri__12daObjCarry_cFv */
 int daObjCarry_c::CreateInit_bokkuri() {
     mCyl.SetTgHitMark(CcG_Tg_UNK_MARK_0);
     mCyl.OnTgNoHitMark();
@@ -1284,7 +1229,6 @@ int daObjCarry_c::CreateInit_bokkuri() {
     return 1;
 }
 
-/* 804709DC-80470AB4 001A5C 00D8+00 2/0 0/0 0/0 .text CreateInit_LightBall__12daObjCarry_cFv */
 int daObjCarry_c::CreateInit_LightBall() {
     mSound.init(&current.pos, 1);
 
@@ -1309,7 +1253,6 @@ int daObjCarry_c::CreateInit_LightBall() {
     return 1;
 }
 
-/* 80470AB4-80470B5C 001B34 00A8+00 1/0 0/0 0/0 .text CreateInit_Lv8Ball__12daObjCarry_cFv */
 int daObjCarry_c::CreateInit_Lv8Ball() {
     mSound.init(&current.pos, 1);
 
@@ -1327,7 +1270,6 @@ int daObjCarry_c::CreateInit_Lv8Ball() {
     return 1;
 }
 
-/* 80470B5C-80470BF4 001BDC 0098+00 1/1 0/0 0/0 .text            CreateHeap__12daObjCarry_cFv */
 int daObjCarry_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getArcName(), getBmdName());
     JUT_ASSERT(2813, modelData != NULL);
@@ -1341,7 +1283,6 @@ int daObjCarry_c::CreateHeap() {
     return 1;
 }
 
-/* 80470BF4-80470CF0 001C74 00FC+00 1/1 0/0 0/0 .text            create__12daObjCarry_cFv */
 int daObjCarry_c::create() {
     preInit();
 
@@ -1384,7 +1325,6 @@ next:
     return phase_state;
 }
 
-/* 80470CF0-8047114C 001D70 045C+00 1/1 0/0 0/0 .text checkCreate_LightBallA__12daObjCarry_cFv */
 int daObjCarry_c::checkCreate_LightBallA() {
     fopAc_ac_c* var_r29 = NULL;
 
@@ -1528,7 +1468,6 @@ int daObjCarry_c::checkCreate_LightBallA() {
     return cPhs_NEXT_e;
 }
 
-/* 8047114C-804715A8 0021CC 045C+00 1/1 0/0 0/0 .text checkCreate_LightBallB__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCreate_LightBallB() {
     fopAc_ac_c* var_r29 = NULL;
 
@@ -1672,7 +1611,6 @@ BOOL daObjCarry_c::checkCreate_LightBallB() {
     return cPhs_NEXT_e;
 }
 
-/* 804715A8-80471680 002628 00D8+00 1/1 0/0 0/0 .text checkCreate_Lv8Ball__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCreate_Lv8Ball() {
     if (!fopAcM_isSwitch(this, getSwbit())) {
         return cPhs_NEXT_e;
@@ -1690,13 +1628,11 @@ BOOL daObjCarry_c::checkCreate_Lv8Ball() {
     return cPhs_NEXT_e;
 }
 
-/* 80471680-804716D4 002700 0054+00 1/1 0/0 0/0 .text            resetIconPosForLightBallA__12daObjCarry_cFv */
 void daObjCarry_c::resetIconPosForLightBallA() {
     cXyz pos(0.0f, 100.0f, -3930.0f);
     dTres_c::setIconPositionOfCarryLight(getTrboxBit(), &pos, 51);
 }
 
-/* 804716D4-804717B4 002754 00E0+00 1/1 0/0 0/0 .text            setIconPosForLightBallAAtR00__12daObjCarry_cFv */
 void daObjCarry_c::setIconPosForLightBallAAtR00() {
     cXyz pos;
 
@@ -1711,7 +1647,6 @@ void daObjCarry_c::setIconPosForLightBallAAtR00() {
     dTres_c::setIconPositionOfCarryLight(getTrboxBit(), &pos, 0);
 }
 
-/* 804717B4-80471894 002834 00E0+00 1/1 0/0 0/0 .text           setIconPosForLightBallBAtR00__12daObjCarry_cFv */
 void daObjCarry_c::setIconPosForLightBallBAtR00() {
     cXyz pos;
 
@@ -1726,13 +1661,11 @@ void daObjCarry_c::setIconPosForLightBallBAtR00() {
     dTres_c::setIconPositionOfCarryLight(getTrboxBit(), &pos, 0);
 }
 
-/* 80471894-804718E8 002914 0054+00 1/1 0/0 0/0 .text resetIconPosForLightBallB__12daObjCarry_cFv */
 void daObjCarry_c::resetIconPosForLightBallB() {
     cXyz pos(0.0f, 100.0f, -3930.0f);
     dTres_c::setIconPositionOfCarryLight(getTrboxBit(), &pos, 52);
 }
 
-/* 804718E8-8047233C 002968 0A54+00 1/1 0/0 0/0 .text            execute__12daObjCarry_cFv */
 int daObjCarry_c::execute() {
     mRecover = 0;
 
@@ -1941,7 +1874,6 @@ int daObjCarry_c::execute() {
     return 1;
 }
 
-/* 8047233C-80472460 0033BC 0124+00 1/1 0/0 0/0 .text            checkCulling__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkCulling() {
     BOOL is_cull = FALSE;
 
@@ -1975,7 +1907,6 @@ BOOL daObjCarry_c::checkCulling() {
     return is_cull;
 }
 
-/* 80472460-80472730 0034E0 02D0+00 1/1 0/0 0/0 .text            draw__12daObjCarry_cFv */
 int daObjCarry_c::draw() {
     if (checkCulling()) {
         return 1;
@@ -2037,7 +1968,6 @@ int daObjCarry_c::draw() {
     return 1;
 }
 
-/* 80472730-80472734 0037B0 0004+00 1/1 0/0 0/0 .text            debugDraw__12daObjCarry_cFv */
 void daObjCarry_c::debugDraw() {
 #ifdef DEBUG
     if (KREG_S(8) == 10000 && !mRotAxis.isZero()) {
@@ -2100,7 +2030,6 @@ void daObjCarry_c::debugDraw() {
 #endif
 }
 
-/* 80472734-80472B54 0037B4 0420+00 1/1 0/0 0/0 .text            _delete__12daObjCarry_cFv */
 int daObjCarry_c::_delete() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_offActor(this, fopAcM_GetSetId(this));
@@ -2190,7 +2119,6 @@ int daObjCarry_c::_delete() {
     return 1;
 }
 
-/* 80472B54-80472D8C 003BD4 0238+00 1/1 0/0 0/0 .text            crr_pos__12daObjCarry_cFv */
 void daObjCarry_c::crr_pos() {
     if (field_0xd14 != 0) {
         mAcch.ClrRoofHit();
@@ -2251,7 +2179,6 @@ void daObjCarry_c::crr_pos() {
     }
 }
 
-/* 80472D8C-80472E5C 003E0C 00D0+00 1/1 0/0 0/0 .text            check_sink__12daObjCarry_cFPf */
 int daObjCarry_c::check_sink(f32* param_0) {
     int var_r29 = 0;
     f32 temp_f31 = mAcch.m_wtr.GetHeight();
@@ -2271,7 +2198,6 @@ int daObjCarry_c::check_sink(f32* param_0) {
     return var_r29;
 }
 
-/* 80472E5C-80472EF0 003EDC 0094+00 4/4 0/0 0/0 .text            calc_gravity__12daObjCarry_cFv */
 f32 daObjCarry_c::calc_gravity() {
     f32 obj_gravity = fopAcM_GetGravity(this);
 
@@ -2290,7 +2216,6 @@ f32 daObjCarry_c::calc_gravity() {
     return obj_gravity;
 }
 
-/* 80472EF0-80473050 003F70 0160+00 1/1 0/0 0/0 .text            checkRollAngle__12daObjCarry_cFv */
 BOOL daObjCarry_c::checkRollAngle() {
     f32 roll_angle = data().m_rollAngle;
 
@@ -2313,7 +2238,6 @@ BOOL daObjCarry_c::checkRollAngle() {
     return FALSE;
 }
 
-/* 80473050-804733E8 0040D0 0398+00 1/1 0/0 0/0 .text            mode_proc_call__12daObjCarry_cFv */
 void daObjCarry_c::mode_proc_call() {
     typedef int (daObjCarry_c::*mode_func)();
     static mode_func l_mode_func[] = {
@@ -2385,7 +2309,6 @@ void daObjCarry_c::mode_proc_call() {
     }
 }
 
-/* 804733E8-804734B0 004468 00C8+00 15/15 0/0 0/0 .text            mode_init_wait__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_wait() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2409,7 +2332,6 @@ void daObjCarry_c::mode_init_wait() {
     mMode = MODE_WAIT;
 }
 
-/* 804734B0-80473718 004530 0268+00 1/0 0/0 0/0 .text            mode_proc_wait__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_wait() {
     bool do_crash_roll = false;
     bool var_r26 = true;
@@ -2455,7 +2377,6 @@ int daObjCarry_c::mode_proc_wait() {
     return 1;
 }
 
-/* 80473718-804737CC 004798 00B4+00 5/5 0/0 0/0 .text            mode_init_walk__12daObjCarry_cFUc */
 void daObjCarry_c::mode_init_walk(u8 unused) {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2479,7 +2400,6 @@ void daObjCarry_c::mode_init_walk(u8 unused) {
     mMode = MODE_WALK;
 }
 
-/* 804737CC-80473ED8 00484C 070C+00 1/0 0/0 0/0 .text            mode_proc_walk__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_walk() {
     bool gnd_hit = mAcch.ChkGroundHit() != 0;
     bool gnd_landing = mAcch.ChkGroundLanding() != 0;
@@ -2579,7 +2499,6 @@ int daObjCarry_c::mode_proc_walk() {
     return 1;
 }
 
-/* 80473ED8-804741A8 004F58 02D0+00 2/2 0/0 0/0 .text            mode_init_carry__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_carry() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2654,8 +2573,6 @@ void daObjCarry_c::mode_init_carry() {
     mMode = MODE_CARRY;
 }
 
-/* 804741A8-80474448 005228 02A0+00 1/0 0/0 0/0 .text            mode_proc_carry__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_carry() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
 
@@ -2727,7 +2644,6 @@ int daObjCarry_c::mode_proc_carry() {
     return 1;
 }
 
-/* 80474448-80474540 0054C8 00F8+00 3/3 0/0 1/1 .text            mode_init_drop__12daObjCarry_cFUc */
 void daObjCarry_c::mode_init_drop(u8 param_0) {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2759,7 +2675,6 @@ void daObjCarry_c::mode_init_drop(u8 param_0) {
     field_0xdb4 = 0;
 }
 
-/* 80474540-80474618 0055C0 00D8+00 1/0 0/0 0/0 .text            mode_proc_drop__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_drop() {
     if (field_0xdb4 == 0) {
         mAcch.OnLineCheck();
@@ -2780,7 +2695,6 @@ int daObjCarry_c::mode_proc_drop() {
     return 1;
 }
 
-/* 80474618-80474734 005698 011C+00 2/2 0/0 0/0 .text            mode_init_float__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_float() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2814,8 +2728,6 @@ void daObjCarry_c::mode_init_float() {
     mMode = MODE_FLOAT;
 }
 
-/* 80474734-80474A08 0057B4 02D4+00 1/0 0/0 0/0 .text            mode_proc_float__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_float() {
     field_0xdc4++;
     gravity = 0.0f;
@@ -2876,7 +2788,6 @@ int daObjCarry_c::mode_proc_float() {
     return 1;
 }
 
-/* 80474A08-80474B8C 005A88 0184+00 2/2 0/0 0/0 .text            mode_init_sink__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_sink() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2906,7 +2817,6 @@ void daObjCarry_c::mode_init_sink() {
     mMode = MODE_SINK;
 }
 
-/* 80474B8C-80474D64 005C0C 01D8+00 1/0 0/0 0/0 .text            mode_proc_sink__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_sink() {
     cXyz sp24;
     f32 speed_target;
@@ -2952,7 +2862,6 @@ int daObjCarry_c::mode_proc_sink() {
     return 1;
 }
 
-/* 80474D64-80474E08 005DE4 00A4+00 1/1 0/0 0/0 .text            mode_init_yogan__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_yogan() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -2974,8 +2883,6 @@ void daObjCarry_c::mode_init_yogan() {
     mMode = MODE_YOGAN;
 }
 
-/* 80474E08-80474E98 005E88 0090+00 1/0 0/0 0/0 .text            mode_proc_yogan__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_yogan() {
     bool temp_r30 = mAcch.m_wtr.GetHeight() > 200.0f + current.pos.y;
     bool gnd_landing = mAcch.ChkGroundLanding();
@@ -2990,18 +2897,14 @@ int daObjCarry_c::mode_proc_yogan() {
     return 1;
 }
 
-/* 80474E98-80474EA0 005F18 0008+00 1/0 0/0 0/0 .text            mode_proc_magne__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_magne() {
     return 1;
 }
 
-/* 80474EA0-80474EA8 005F20 0008+00 1/0 0/0 0/0 .text mode_proc_magneCarry__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_magneCarry() {
     return 1;
 }
 
-/* 80474EA8-80474FA8 005F28 0100+00 1/1 0/0 0/0 .text mode_init_boomCarry__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_boomCarry() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3034,7 +2937,6 @@ void daObjCarry_c::mode_init_boomCarry() {
     mMode = MODE_BOOM_CARRY;
 }
 
-/* 80474FA8-80475014 006028 006C+00 1/0 0/0 0/0 .text mode_proc_boomCarry__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_boomCarry() {
     if (!mBoomerangMove.posMove(&current.pos, &shape_angle.y, this, 0x1C00)) {
         if (fopAcM_checkCarryNow(this)) {
@@ -3047,7 +2949,6 @@ int daObjCarry_c::mode_proc_boomCarry() {
     return 1;
 }
 
-/* 80475014-804750C8 006094 00B4+00 1/1 0/0 0/0 .text            mode_init_growth__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_growth() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3066,8 +2967,6 @@ void daObjCarry_c::mode_init_growth() {
     mMode = MODE_GROWTH;
 }
 
-/* 804750C8-8047515C 006148 0094+00 1/0 0/0 0/0 .text            mode_proc_growth__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_growth() {
     f32 sp8 = scale.x;
     f32 temp_f31 = cLib_addCalc(&sp8, data().scale, 0.05f, 0.1f, 0.01f);
@@ -3082,12 +2981,10 @@ int daObjCarry_c::mode_proc_growth() {
     return 1;
 }
 
-/* 8047515C-80475164 0061DC 0008+00 1/0 0/0 0/0 .text            mode_proc_end__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_end() {
     return 1;
 }
 
-/* 80475164-80475210 0061E4 00AC+00 1/1 0/0 0/0 .text            mode_init_dbDrop__12daObjCarry_cFUc */
 void daObjCarry_c::mode_init_dbDrop(u8 param_0) {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3107,13 +3004,11 @@ void daObjCarry_c::mode_init_dbDrop(u8 param_0) {
     mMode = MODE_DB_DROP;
 }
 
-/* 80475210-80475238 006290 0028+00 1/0 0/0 0/0 .text            mode_proc_dbDrop__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_dbDrop() {
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
     return 1;
 }
 
-/* 80475238-80475354 0062B8 011C+00 1/1 0/0 0/0 .text            mode_init_hookCarry__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_hookCarry() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3142,7 +3037,6 @@ void daObjCarry_c::mode_init_hookCarry() {
     mMode = MODE_HOOK_CARRY;
 }
 
-/* 80475354-80475384 0063D4 0030+00 1/0 0/0 0/0 .text            mode_proc_hookCarry__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_hookCarry() {
     if (!fopAcM_checkHookCarryNow(this)) {
         mode_init_wait();
@@ -3151,7 +3045,6 @@ int daObjCarry_c::mode_proc_hookCarry() {
     return 1;
 }
 
-/* 80475384-80475450 006404 00CC+00 2/2 0/0 0/0 .text            mode_init_fit__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_fit() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3176,13 +3069,11 @@ void daObjCarry_c::mode_init_fit() {
     mMode = MODE_FIT;
 }
 
-/* 80475450-80475478 0064D0 0028+00 1/0 0/0 0/0 .text            mode_proc_fit__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_fit() {
     fopAcM_posMoveF(this, NULL);
     return 1;
 }
 
-/* 80475478-804754D0 0064F8 0058+00 1/0 0/0 0/0 .text            mode_proc_controled__12daObjCarry_cFv */
 int daObjCarry_c::mode_proc_controled() {
     calc_rot_call();
     setBaseMtx();
@@ -3191,7 +3082,6 @@ int daObjCarry_c::mode_proc_controled() {
     return 1;
 }
 
-/* 804754D0-80475598 006550 00C8+00 1/1 0/0 0/0 .text            mode_init_resetLightBall__12daObjCarry_cFv */
 void daObjCarry_c::mode_init_resetLightBall() {
     mAcch.ClrMoveBGOnly();
     mAcch.ClrGrndNone();
@@ -3215,8 +3105,6 @@ void daObjCarry_c::mode_init_resetLightBall() {
     mMode = MODE_RESET_LIGHTBALL;
 }
 
-/* 80475598-80475618 006618 0080+00 1/0 0/0 0/0 .text mode_proc_resetLightBall__12daObjCarry_cFv
- */
 int daObjCarry_c::mode_proc_resetLightBall() {
     if (cLib_chaseF(&scale.x, 1.0f, 0.05f)) {
         field_0xcf3 = 10;
@@ -3230,22 +3118,18 @@ int daObjCarry_c::mode_proc_resetLightBall() {
     return 1;
 }
 
-/* 80475618-8047567C 006698 0064+00 1/1 0/0 0/0 .text            chkSinkAll__12daObjCarry_cFv */
 BOOL daObjCarry_c::chkSinkAll() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + data().field_0x2c * 2.0f;
 }
 
-/* 8047567C-804756D4 0066FC 0058+00 3/3 0/0 0/0 .text            chkWaterLineIn__12daObjCarry_cFv */
 BOOL daObjCarry_c::chkWaterLineIn() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + data().field_0x24;
 }
 
-/* 804756D4-8047573C 006754 0068+00 2/2 0/0 0/0 .text            chkSinkObj__12daObjCarry_cFv */
 BOOL daObjCarry_c::chkSinkObj() {
     return data().m_gravity + data().m_Buoyancy <= 0.0f;
 }
 
-/* 8047573C-80476618 0067BC 0EDC+00 1/1 0/0 0/0 .text            bg_check__12daObjCarry_cFv */
 void daObjCarry_c::bg_check() {
     bool roof_hit = mAcch.ChkRoofHit();
     bool wall_hit = mAcch.ChkWallHit();
@@ -3477,8 +3361,6 @@ void daObjCarry_c::bg_check() {
     field_0xe0d = wall_hit;
 }
 
-/* 80476618-80476764 007698 014C+00 2/2 0/0 0/0 .text check_bg_damage_proc_base__12daObjCarry_cFv
- */
 bool daObjCarry_c::check_bg_damage_proc_base() {
     bool gnd_landing = mAcch.ChkGroundLanding();
     bool wall_hit = mAcch.ChkWallHit();
@@ -3513,7 +3395,6 @@ bool daObjCarry_c::check_bg_damage_proc_base() {
     return 0;
 }
 
-/* 80476764-804767C4 0077E4 0060+00 7/4 0/0 0/0 .text bg_damage_proc_kotubo__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_kotubo() {
     bool rt = check_bg_damage_proc_base();
     if (rt) {
@@ -3524,32 +3405,26 @@ bool daObjCarry_c::bg_damage_proc_kotubo() {
     return rt;
 }
 
-/* 804767C4-804767E4 007844 0020+00 3/0 0/0 0/0 .text bg_damage_proc_ootubo__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_ootubo() {
     return bg_damage_proc_kotubo();
 }
 
-/* 804767E4-80476804 007864 0020+00 1/0 0/0 0/0 .text bg_damage_proc_kibako__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_kibako() {
     return bg_damage_proc_kotubo();
 }
 
-/* 80476804-8047680C 007884 0008+00 1/0 0/0 0/0 .text bg_damage_proc_ironball__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_ironball() {
     return false;
 }
 
-/* 8047680C-8047682C 00788C 0020+00 1/0 0/0 0/0 .text bg_damage_proc_taru__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_taru() {
     return bg_damage_proc_kotubo();
 }
 
-/* 8047682C-8047684C 0078AC 0020+00 1/0 0/0 0/0 .text bg_damage_proc_dokuro__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_dokuro() {
     return bg_damage_proc_kotubo();
 }
 
-/* 8047684C-80476930 0078CC 00E4+00 1/0 0/0 0/0 .text bg_damage_proc_bokkuri__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_bokkuri() {
     bool rt = check_bg_damage_proc_base();
     if (field_0xd74 != 0) {
@@ -3570,18 +3445,14 @@ bool daObjCarry_c::bg_damage_proc_bokkuri() {
     return rt;
 }
 
-/* 80476930-80476938 0079B0 0008+00 2/0 0/0 0/0 .text            bg_damage_proc_LightBall__12daObjCarry_cFv
- */
 bool daObjCarry_c::bg_damage_proc_LightBall() {
     return false;
 }
 
-/* 80476938-80476940 0079B8 0008+00 1/0 0/0 0/0 .text            bg_damage_proc_Lv8Ball__12daObjCarry_cFv */
 bool daObjCarry_c::bg_damage_proc_Lv8Ball() {
     return false;
 }
 
-/* 80476940-80476A5C 0079C0 011C+00 6/6 0/0 0/0 .text            obj_break__12daObjCarry_cFbbb */
 void daObjCarry_c::obj_break(bool i_createItem, bool i_cancelCarry, bool i_doBreakEff) {
     int item_no = getItemNo();
     int item_bit = getItemBit();
@@ -3607,8 +3478,6 @@ void daObjCarry_c::obj_break(bool i_createItem, bool i_cancelCarry, bool i_doBre
     }
 }
 
-/* 80476A5C-80476B04 007ADC 00A8+00 1/1 0/0 0/0 .text check_cc_damage_proc_base__12daObjCarry_cFb
- */
 bool daObjCarry_c::check_cc_damage_proc_base(bool param_0) {
     bool rt = false;
 
@@ -3626,7 +3495,6 @@ bool daObjCarry_c::check_cc_damage_proc_base(bool param_0) {
     return rt;
 }
 
-/* 80476B04-80476B68 007B84 0064+00 5/2 0/0 0/0 .text cc_damage_proc_kotubo__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_kotubo() {
     bool rt = check_cc_damage_proc_base(false);
     if (rt) {
@@ -3637,12 +3505,10 @@ bool daObjCarry_c::cc_damage_proc_kotubo() {
     return rt;
 }
 
-/* 80476B68-80476B88 007BE8 0020+00 3/0 0/0 0/0 .text cc_damage_proc_ootubo__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_ootubo() {
     return cc_damage_proc_kotubo();
 }
 
-/* 80476B88-80476CE4 007C08 015C+00 1/0 0/0 0/0 .text cc_damage_proc_kibako__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_kibako() {
     bool break_obj = false;
     bool do_break_eff = false;
@@ -3689,7 +3555,6 @@ bool daObjCarry_c::cc_damage_proc_kibako() {
     return break_obj;
 }
 
-/* 80476CE4-80476E04 007D64 0120+00 1/0 0/0 0/0 .text cc_damage_proc_ironball__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_ironball() {
     bool var_r26 = false;
     bool var_r27 = true;
@@ -3716,7 +3581,6 @@ bool daObjCarry_c::cc_damage_proc_ironball() {
     return var_r26;
 }
 
-/* 80476E04-80476F88 007E84 0184+00 1/0 0/0 0/0 .text cc_damage_proc_taru__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_taru() {
     bool break_obj = false;
     bool do_break_eff = false;
@@ -3765,12 +3629,10 @@ bool daObjCarry_c::cc_damage_proc_taru() {
     return break_obj;
 }
 
-/* 80476F88-80476FA8 008008 0020+00 1/0 0/0 0/0 .text cc_damage_proc_dokuro__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_dokuro() {
     return cc_damage_proc_kotubo();
 }
 
-/* 80476FA8-804771B0 008028 0208+00 1/0 0/0 0/0 .text cc_damage_proc_bokkuri__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_bokkuri() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     bool break_obj = false;
@@ -3828,18 +3690,14 @@ bool daObjCarry_c::cc_damage_proc_bokkuri() {
     return break_obj;
 }
 
-/* 804771B0-804771B8 008230 0008+00 2/0 0/0 0/0 .text cc_damage_proc_LightBall__12daObjCarry_cFv
- */
 bool daObjCarry_c::cc_damage_proc_LightBall() {
     return false;
 }
 
-/* 804771B8-804771C0 008238 0008+00 1/0 0/0 0/0 .text cc_damage_proc_Lv8Ball__12daObjCarry_cFv */
 bool daObjCarry_c::cc_damage_proc_Lv8Ball() {
     return false;
 }
 
-/* 804771C0-8047731C 008240 015C+00 7/7 0/0 0/0 .text eff_break_tuboBmd__12daObjCarry_cFUs4cXyz */
 void daObjCarry_c::eff_break_tuboBmd(u16 param_0, cXyz param_1) {
     J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20);
     J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42);
@@ -3854,7 +3712,6 @@ void daObjCarry_c::eff_break_tuboBmd(u16 param_0, cXyz param_1) {
     dComIfGp_particle_set(0x15D, &current.pos, NULL, NULL, 0xFF, dPa_control_c::getTsuboSelectTexEcallBack(param_0), fopAcM_GetRoomNo(this), NULL, NULL, &param_1);
 }
 
-/* 8047731C-8047747C 00839C 0160+00 2/2 0/0 0/0 .text eff_break_kibakoBmd__12daObjCarry_cF4cXyz */
 void daObjCarry_c::eff_break_kibakoBmd(cXyz i_size) {
     cXyz pos(current.pos);
 
@@ -3871,8 +3728,6 @@ void daObjCarry_c::eff_break_kibakoBmd(cXyz i_size) {
     }
 }
 
-/* 8047747C-804774D4 0084FC 0058+00 1/0 0/0 0/0 .text            eff_break_tsubo__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_tsubo() {
     u16 var_r31 = 0;
 
@@ -3880,8 +3735,6 @@ void daObjCarry_c::eff_break_tsubo() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 804774D4-8047752C 008554 0058+00 1/0 0/0 0/0 .text            eff_break_ootubo__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_ootubo() {
     u16 var_r31 = 1;
 
@@ -3889,24 +3742,18 @@ void daObjCarry_c::eff_break_ootubo() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 8047752C-80477574 0085AC 0048+00 1/0 0/0 0/0 .text            eff_break_kibako__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_kibako() {
     cXyz size(scale);
     eff_break_kibakoBmd(size);
 }
 
-/* 80477574-80477578 0085F4 0004+00 1/0 0/0 0/0 .text eff_break_ironball__12daObjCarry_cFv */
 void daObjCarry_c::eff_break_ironball() {}
 
-/* 80477578-804775BC 0085F8 0044+00 1/0 0/0 0/0 .text            eff_break_taru__12daObjCarry_cFv */
 void daObjCarry_c::eff_break_taru() {
     cXyz size(0.75f, 0.75f, 0.75f);
     eff_break_kibakoBmd(size);
 }
 
-/* 804775BC-80477614 00863C 0058+00 1/0 0/0 0/0 .text            eff_break_dokuro__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_dokuro() {
     u16 var_r31 = 2;
 
@@ -3914,8 +3761,6 @@ void daObjCarry_c::eff_break_dokuro() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 80477614-80477798 008694 0184+00 1/0 0/0 0/0 .text            eff_break_bokkuri__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_bokkuri() {
     cXyz pos(current.pos);
     pos.y += 50.0f;
@@ -3936,8 +3781,6 @@ void daObjCarry_c::eff_break_bokkuri() {
     }
 }
 
-/* 80477798-804777F0 008818 0058+00 1/0 0/0 0/0 .text            eff_break_kotubo2__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_kotubo2() {
     u16 var_r31 = 1;
 
@@ -3945,11 +3788,8 @@ void daObjCarry_c::eff_break_kotubo2() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 804777F0-804777F4 008870 0004+00 2/0 0/0 0/0 .text eff_break_LightBall__12daObjCarry_cFv */
 void daObjCarry_c::eff_break_LightBall() {}
 
-/* 804777F4-8047784C 008874 0058+00 1/0 0/0 0/0 .text            eff_break_ootubo2__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_ootubo2() {
     u16 var_r31 = 0;
 
@@ -3957,12 +3797,8 @@ void daObjCarry_c::eff_break_ootubo2() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 8047784C-80477850 0088CC 0004+00 1/0 0/0 0/0 .text            eff_break_Lv8Ball__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_Lv8Ball() {}
 
-/* 80477850-804778A8 0088D0 0058+00 1/0 0/0 0/0 .text            eff_break_tsuboL8__12daObjCarry_cFv
- */
 void daObjCarry_c::eff_break_tsuboL8() {
     u16 var_r31 = 7;
 
@@ -3970,7 +3806,6 @@ void daObjCarry_c::eff_break_tsuboL8() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 804778A8-80477900 008928 0058+00 1/0 0/0 0/0 .text eff_break_ootuboL8__12daObjCarry_cFv */
 void daObjCarry_c::eff_break_ootuboL8() {
     u16 var_r31 = 7;
 
@@ -3978,29 +3813,24 @@ void daObjCarry_c::eff_break_ootuboL8() {
     eff_break_tuboBmd(var_r31, spC);
 }
 
-/* 80477900-80477990 008980 0090+00 1/1 0/0 0/0 .text se_break__12daObjCarry_cFP13cBgS_PolyInfo */
 void daObjCarry_c::se_break(cBgS_PolyInfo*) {
     if (field_0xdb3 == 0) {
         fopAcM_seStart(this, data().m_breakSound, 0);
     }
 }
 
-/* 80477990-80477A14 008A10 0084+00 1/1 0/0 0/0 .text se_put__12daObjCarry_cFP13cBgS_PolyInfo */
 void daObjCarry_c::se_put(cBgS_PolyInfo*) {
     fopAcM_seStart(this, data().m_putSound, 0);
 }
 
-/* 80477A14-80477A98 008A94 0084+00 1/1 0/0 0/0 .text            se_put_water__12daObjCarry_cFv */
 void daObjCarry_c::se_put_water() {
     fopAcM_seStart(this, data().m_putWaterSound, 0);
 }
 
-/* 80477A98-80477B1C 008B18 0084+00 1/1 0/0 0/0 .text            se_fall_water__12daObjCarry_cFv */
 void daObjCarry_c::se_fall_water() {
     fopAcM_seStart(this, data().m_fallWaterSound, 0);
 }
 
-/* 80477B1C-80477FE0 008B9C 04C4+00 7/7 0/0 0/0 .text calc_rot_axis_base__12daObjCarry_cFUc */
 void daObjCarry_c::calc_rot_axis_base(u8 param_0) {
     field_0xd4c = ZeroQuat;
 
@@ -4060,7 +3890,6 @@ void daObjCarry_c::calc_rot_axis_base(u8 param_0) {
     field_0xd7b = param_0;
 }
 
-/* 80477FE0-80478004 009060 0024+00 2/0 0/0 0/0 .text calc_rot_axis_tsubo__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_tsubo() {
     cXyz sp20;
     int var_r30 = 0;
@@ -4104,12 +3933,10 @@ void daObjCarry_c::calc_rot_axis_tsubo() {
     }
 }
 
-/* 80478004-80478028 009084 0024+00 3/0 0/0 0/0 .text calc_rot_axis_ootubo__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_ootubo() {
     calc_rot_axis_base(10);
 }
 
-/* 80478028-8047814C 0090A8 0124+00 2/1 0/0 0/0 .text calc_rot_axis_kibako__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_kibako() {
     if (fopAcM_checkCarryNow(this)) {
         mRotAxis = cXyz::Zero;
@@ -4128,22 +3955,18 @@ void daObjCarry_c::calc_rot_axis_kibako() {
     }
 }
 
-/* 8047814C-80478170 0091CC 0024+00 1/0 0/0 0/0 .text calc_rot_axis_ironball__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_ironball() {
     calc_rot_axis_base(10);
 }
 
-/* 80478170-80478190 0091F0 0020+00 1/0 0/0 0/0 .text calc_rot_axis_taru__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_taru() {
     calc_rot_axis_kibako();
 }
 
-/* 80478190-804781B4 009210 0024+00 1/0 0/0 0/0 .text calc_rot_axis_dokuro__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_dokuro() {
     calc_rot_axis_base(5);
 }
 
-/* 804781B4-804783C0 009234 020C+00 1/0 0/0 0/0 .text calc_rot_axis_bokkuri__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_bokkuri() {
     if (mMode == MODE_DROP || mMode == MODE_DB_DROP) {
         if (fopAcM_checkCarryNow(this)) {
@@ -4174,22 +3997,18 @@ void daObjCarry_c::calc_rot_axis_bokkuri() {
     }
 }
 
-/* 804783C0-804783E4 009440 0024+00 1/0 0/0 0/0 .text calc_rot_axis_kotubo2__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_kotubo2() {
     calc_rot_axis_base(5);
 }
 
-/* 804783E4-80478408 009464 0024+00 2/0 0/0 0/0 .text calc_rot_axis_LightBall__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_LightBall() {
     calc_rot_axis_base(10);
 }
 
-/* 80478408-8047842C 009488 0024+00 1/0 0/0 0/0 .text calc_rot_axis_Lv8Ball__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_axis_Lv8Ball() {
     calc_rot_axis_base(10);
 }
 
-/* 8047842C-80478808 0094AC 03DC+00 2/2 0/0 0/0 .text            set_wind_power__12daObjCarry_cFv */
 void daObjCarry_c::set_wind_power() {
     if (!fopAcM_checkCarryNow(this)) {
         if (mTgCyl.ChkTgHit()) {
@@ -4226,23 +4045,16 @@ void daObjCarry_c::set_wind_power() {
     }
 }
 
-/* 80478808-80478828 009888 0020+00 3/0 0/0 0/0 .text            exec_proc_tsubo__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_tsubo() {
     set_wind_power();
 }
 
-/* 80478828-80478848 0098A8 0020+00 3/0 0/0 0/0 .text            exec_proc_ootubo__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_ootubo() {
     set_wind_power();
 }
 
-/* 80478848-8047884C 0098C8 0004+00 1/0 0/0 0/0 .text            exec_proc_kibako__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_kibako() {}
 
-/* 8047884C-804788C4 0098CC 0078+00 1/0 0/0 0/0 .text exec_proc_ironball__12daObjCarry_cFv */
 void daObjCarry_c::exec_proc_ironball() {
     if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
         savePos(getSaveID(), current.pos);
@@ -4250,15 +4062,10 @@ void daObjCarry_c::exec_proc_ironball() {
     }
 }
 
-/* 804788C4-804788C8 009944 0004+00 1/0 0/0 0/0 .text            exec_proc_taru__12daObjCarry_cFv */
 void daObjCarry_c::exec_proc_taru() {}
 
-/* 804788C8-804788CC 009948 0004+00 1/0 0/0 0/0 .text            exec_proc_dokuro__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_dokuro() {}
 
-/* 804788CC-80478C18 00994C 034C+00 1/0 0/0 0/0 .text            exec_proc_bokkuri__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_bokkuri() {
     switch (field_0xd79) {
     case 0:
@@ -4332,7 +4139,6 @@ void daObjCarry_c::exec_proc_bokkuri() {
     }
 }
 
-/* 80478C18-80478CE4 009C98 00CC+00 2/0 0/0 0/0 .text exec_proc_LightBall__12daObjCarry_cFv */
 void daObjCarry_c::exec_proc_LightBall() {
     mDalkmistInf.mPos = current.pos;
     mLightAtSph.SetC(current.pos);
@@ -4345,8 +4151,6 @@ void daObjCarry_c::exec_proc_LightBall() {
     mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80478CE4-80478D78 009D64 0094+00 1/0 0/0 0/0 .text            exec_proc_Lv8Ball__12daObjCarry_cFv
- */
 void daObjCarry_c::exec_proc_Lv8Ball() {
     if (mCyl.ChkTgHit() && mCyl.GetTgHitObj()) {
         mSound.startCollisionSE(mCyl.GetTgHitObjHitSeID(1), 2, NULL);
@@ -4355,7 +4159,6 @@ void daObjCarry_c::exec_proc_Lv8Ball() {
     mSound.framework(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80478D78-80478F50 009DF8 01D8+00 1/1 0/0 0/0 .text bg_damage_proc_call__12daObjCarry_cFv */
 void daObjCarry_c::bg_damage_proc_call() {
     typedef bool (daObjCarry_c::*type_func)();
     static type_func l_type_func[] = {
@@ -4373,7 +4176,6 @@ void daObjCarry_c::bg_damage_proc_call() {
     }
 }
 
-/* 80478F50-80479128 009FD0 01D8+00 1/1 0/0 0/0 .text cc_damage_proc_call__12daObjCarry_cFv */
 void daObjCarry_c::cc_damage_proc_call() {
     typedef bool (daObjCarry_c::*type_func)();
     static type_func l_type_func[] = {
@@ -4391,7 +4193,6 @@ void daObjCarry_c::cc_damage_proc_call() {
     }
 }
 
-/* 80479128-804792D4 00A1A8 01AC+00 1/1 0/0 0/0 .text            eff_break_call__12daObjCarry_cFv */
 void daObjCarry_c::eff_break_call() {
     typedef void (daObjCarry_c::*type_func)();
     static type_func l_type_func[] = {
@@ -4407,7 +4208,6 @@ void daObjCarry_c::eff_break_call() {
     (this->*l_type_func[mType])();
 }
 
-/* 804792D4-80479480 00A354 01AC+00 2/2 0/0 0/0 .text            calc_rot_call__12daObjCarry_cFv */
 void daObjCarry_c::calc_rot_call() {
     typedef void (daObjCarry_c::*type_func)();
     static type_func l_type_func[] = {
@@ -4423,7 +4223,6 @@ void daObjCarry_c::calc_rot_call() {
     (this->*l_type_func[mType])();
 }
 
-/* 80479480-8047962C 00A500 01AC+00 1/1 0/0 0/0 .text obj_execute_proc_call__12daObjCarry_cFv */
 void daObjCarry_c::obj_execute_proc_call() {
     typedef void (daObjCarry_c::*type_func)();
     static type_func l_type_func[] = {
@@ -4439,8 +4238,6 @@ void daObjCarry_c::obj_execute_proc_call() {
     (this->*l_type_func[mType])();
 }
 
-/* 8047962C-80479648 00A6AC 001C+00 1/1 0/0 0/0 .text            setTgHitCallBack__12daObjCarry_cFv
- */
 void daObjCarry_c::setTgHitCallBack() {
     typedef void (*TgCallBack)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
     static TgCallBack l_callback[] = {
@@ -4454,8 +4251,6 @@ void daObjCarry_c::setTgHitCallBack() {
     mCyl.SetTgHitCallback(l_callback[mType]);
 }
 
-/* 80479648-80479664 00A6C8 001C+00 1/1 0/0 0/0 .text            setCoHitCallBack__12daObjCarry_cFv
- */
 void daObjCarry_c::setCoHitCallBack() {
     typedef void (*CoCallBack)(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*);
     static CoCallBack l_callback[] = {
@@ -4469,7 +4264,6 @@ void daObjCarry_c::setCoHitCallBack() {
     mCyl.SetCoHitCallback(l_callback[mType]);
 }
 
-/* 80479664-80479810 00A6E4 01AC+00 1/1 0/0 0/0 .text            CreateInitCall__12daObjCarry_cFv */
 int daObjCarry_c::CreateInitCall() {
     typedef int (daObjCarry_c::*CreateInitFunc)();
     static CreateInitFunc l_func[] = {
@@ -4485,36 +4279,27 @@ int daObjCarry_c::CreateInitCall() {
     return (this->*l_func[mType])();
 }
 
-/* 80479810-80479830 00A890 0020+00 1/0 0/0 0/0 .text            daObjCarry_Draw__FP12daObjCarry_c
- */
 static int daObjCarry_Draw(daObjCarry_c* i_this) {
     return i_this->draw();
 }
 
-/* 80479830-80479850 00A8B0 0020+00 1/0 0/0 0/0 .text daObjCarry_Execute__FP12daObjCarry_c */
 static int daObjCarry_Execute(daObjCarry_c* i_this) {
     return i_this->execute();
 }
 
-/* 80479850-80479870 00A8D0 0020+00 1/0 0/0 0/0 .text            daObjCarry_Delete__FP12daObjCarry_c
- */
 static int daObjCarry_Delete(daObjCarry_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80479870-80479890 00A8F0 0020+00 1/0 0/0 0/0 .text            daObjCarry_Create__FP10fopAc_ac_c
- */
 static int daObjCarry_Create(fopAc_ac_c* i_this) {
     return ((daObjCarry_c*)i_this)->create();
 }
 
-/* 8047B110-8047B130 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCarry_Method */
 static actor_method_class l_daObjCarry_Method = {
     (process_method_func)daObjCarry_Create, (process_method_func)daObjCarry_Delete,
     (process_method_func)daObjCarry_Execute, (process_method_func)NULL,
     (process_method_func)daObjCarry_Draw};
 
-/* 8047B130-8047B160 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Carry */
 extern actor_process_profile_definition g_profile_Obj_Carry = {
     fpcLy_CURRENT_e,         // mLayerID
     8,                       // mListID
diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp
index 02bcb092d2..2812e19c66 100644
--- a/src/d/actor/d_a_obj_catdoor.cpp
+++ b/src/d/actor/d_a_obj_catdoor.cpp
@@ -8,10 +8,6 @@
 #include "d/actor/d_a_obj_catdoor.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
 static const char* l_arcName = "CatDoor";
 
 u32 const daObjCatDoor_c::M_attr = 0x001E0578;
@@ -74,12 +70,10 @@ int daObjCatDoor_c::execute() {
     return 1;
 }
 
-/* 80BC42B8-80BC42C4 000078 000C+00 1/1 0/0 1/1 .text            attr__14daObjCatDoor_cCFv */
 const s16* daObjCatDoor_c::attr() const {
     return (const s16*)&daObjCatDoor_c::M_attr;
 }
 
-/* 80BC42C4-80BC43F4 000084 0130+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjCatDoor_c*>(i_this)->createHeap();
 }
@@ -115,7 +109,6 @@ void daObjCatDoor_c::create_init() {
     initBaseMtx();
 }
 
-/* 80BC43F4-80BC4454 0001B4 0060+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjCatDoor_cFv */
 void daObjCatDoor_c::initBaseMtx() {
     cullMtx = mMtx;
     mDoMtx_stack_c::transS(current.pos);
@@ -124,7 +117,6 @@ void daObjCatDoor_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BC4454-80BC4560 000214 010C+00 2/2 0/0 1/1 .text            setBaseMtx__14daObjCatDoor_cFv */
 void daObjCatDoor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y);
@@ -142,7 +134,6 @@ void daObjCatDoor_c::setBaseMtx() {
     }
 }
 
-/* 80BC4560-80BC4628 000320 00C8+00 1/1 0/0 0/0 .text            calcOpen__14daObjCatDoor_cFv */
 void daObjCatDoor_c::calcOpen() {
     s16 prev = mRotSpeed;
     int res = cLib_chaseS(&mRotSpeed, 0, *attr());
@@ -160,45 +151,36 @@ void daObjCatDoor_c::calcOpen() {
     }
 }
 
-/* 80BC4628-80BC46EC 0003E8 00C4+00 1/0 0/0 0/0 .text daObjCatDoor_Draw__FP14daObjCatDoor_c */
 static int daObjCatDoor_Draw(daObjCatDoor_c* i_this) {
     return static_cast<daObjCatDoor_c*>(i_this)->draw();
 }
 
-/* 80BC46EC-80BC4760 0004AC 0074+00 1/0 0/0 0/0 .text daObjCatDoor_Execute__FP14daObjCatDoor_c */
 static int daObjCatDoor_Execute(daObjCatDoor_c* i_this) {
     return static_cast<daObjCatDoor_c*>(i_this)->execute();
 }
 
-/* 80BC4760-80BC4768 000520 0008+00 1/0 0/0 0/0 .text daObjCatDoor_IsDelete__FP14daObjCatDoor_c */
 static bool daObjCatDoor_IsDelete(daObjCatDoor_c* i_this) {
     return true;
 }
 
-/* 80BC4768-80BC4848 000528 00E0+00 1/0 0/0 0/0 .text daObjCatDoor_Delete__FP14daObjCatDoor_c */
 static int daObjCatDoor_Delete(daObjCatDoor_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjCatDoor_c();
     return 1;
 }
 
-/* 80BC4848-80BC49AC 000608 0164+00 1/0 0/0 0/0 .text            daObjCatDoor_Create__FP10fopAc_ac_c
- */
 static int daObjCatDoor_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     daObjCatDoor_c* a_this = static_cast<daObjCatDoor_c*>(i_this);
     return a_this->create();
 }
 
-/* ############################################################################################## */
-/* 80BC49E4-80BC4A04 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCatDoor_Method */
 static actor_method_class l_daObjCatDoor_Method = {
     (process_method_func)daObjCatDoor_Create,  (process_method_func)daObjCatDoor_Delete,
     (process_method_func)daObjCatDoor_Execute, (process_method_func)daObjCatDoor_IsDelete,
     (process_method_func)daObjCatDoor_Draw,
 };
 
-/* 80BC4A04-80BC4A34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CatDoor */
 extern actor_process_profile_definition g_profile_Obj_CatDoor = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp
index ca16c428c9..a766ce284e 100644
--- a/src/d/actor/d_a_obj_cb.cpp
+++ b/src/d/actor/d_a_obj_cb.cpp
@@ -11,12 +11,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80BC4B2C-80BC4B44 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__14daObj_Cb_HIO_cFv */
 daObj_Cb_HIO_c::daObj_Cb_HIO_c() {
     field_0x4 = -1;
 }
 
-/* 80BC4B44-80BC4BA8 000104 0064+00 1/0 0/0 0/0 .text            daObj_Cb_Draw__FP12obj_cb_class */
 static int daObj_Cb_Draw(obj_cb_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mModel, &i_this->tevStr);
@@ -24,13 +22,10 @@ static int daObj_Cb_Draw(obj_cb_class* i_this) {
     return 1;
 }
 
-/* 80BC4BA8-80BC4BB4 000168 000C+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* param_0, fopAc_ac_c* i_this, fopAc_ac_c* param_2) {
     static_cast<obj_cb_class*>(i_this)->field_0x59c = 3;
 }
 
-/* 80BC4BB4-80BC51B8 000174 0604+00 1/1 0/0 0/0 .text            action__FP12obj_cb_class */
 static void action(obj_cb_class* i_this) {
     fopAc_ac_c* a_this = i_this;
     cXyz local_60;
@@ -137,8 +132,6 @@ static void action(obj_cb_class* i_this) {
     }
 }
 
-/* 80BC51B8-80BC5240 000778 0088+00 2/1 0/0 0/0 .text            daObj_Cb_Execute__FP12obj_cb_class
- */
 static int daObj_Cb_Execute(obj_cb_class* i_this) {
     for (int i = 0; i < 2; i++) {
         if (i_this->field_0x598[i] != 0) {
@@ -151,17 +144,12 @@ static int daObj_Cb_Execute(obj_cb_class* i_this) {
     return 1;
 }
 
-/* 80BC5240-80BC5248 000800 0008+00 1/0 0/0 0/0 .text            daObj_Cb_IsDelete__FP12obj_cb_class
- */
 static int daObj_Cb_IsDelete(obj_cb_class* param_0) {
     return 1;
 }
 
-/* 80BC58F8-80BC58FC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80BC58F8;
 
-/* 80BC5248-80BC52CC 000808 0084+00 1/0 0/0 0/0 .text            daObj_Cb_Delete__FP12obj_cb_class
- */
 static int daObj_Cb_Delete(obj_cb_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Obj_cb");
@@ -177,7 +165,6 @@ static int daObj_Cb_Delete(obj_cb_class* i_this) {
     return 1;
 }
 
-/* 80BC52CC-80BC5408 00088C 013C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     obj_cb_class* i_this = (obj_cb_class*)actor;
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("Obj_cb", 4);
@@ -202,10 +189,8 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80BC5908-80BC5910 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Cb_HIO_c l_HIO;
 
-/* 80BC5408-80BC563C 0009C8 0234+00 1/0 0/0 0/0 .text            daObj_Cb_Create__FP10fopAc_ac_c */
 static int daObj_Cb_Create(fopAc_ac_c* actor) {
     fopAcM_ct(actor, obj_cb_class);
     obj_cb_class* i_this = (obj_cb_class*)actor;
@@ -240,7 +225,6 @@ static int daObj_Cb_Create(fopAc_ac_c* actor) {
     return rv;
 }
 
-/* 80BC5854-80BC5874 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Cb_Method */
 static actor_method_class l_daObj_Cb_Method = {
     (process_method_func)daObj_Cb_Create,
     (process_method_func)daObj_Cb_Delete,
@@ -249,7 +233,6 @@ static actor_method_class l_daObj_Cb_Method = {
     (process_method_func)daObj_Cb_Draw,
 };
 
-/* 80BC5874-80BC58A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_CB */
 extern actor_process_profile_definition g_profile_OBJ_CB = {
   fpcLy_CURRENT_e,       // mLayerID
   3,                     // mListID
diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp
index da41606dd3..1a3c82d922 100644
--- a/src/d/actor/d_a_obj_cblock.cpp
+++ b/src/d/actor/d_a_obj_cblock.cpp
@@ -40,34 +40,27 @@ public:
     /* 0x1C */ f32 field_0x1c;
 };
 
-/* 80BC6C9C-80BC6CA8 000054 000C+00 1/2 0/0 0/0 .bss             l_chainOffset */
 static cXyz l_chainOffset(0.0f, 105.0f, 30.0f);
 
-/* 80BC6CB4-80BC6CC4 00006C 000C+04 0/1 0/0 0/0 .bss             l_smokeSetOffset */
 static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f);
 
 #if !DEBUG
 static s32 unused_bss_70 = 0;
 #endif
 
-/* ############################################################################################## */
-/* 80BC6A38-80BC6A50 000000 0018+00 5/5 0/0 0/0 .rodata          l_cull_box */
 static Vec const l_cull_box[2] = {
     {-250.0f, 0.0f, -450.0f},
     {250.0f, 250.0f, 400.0f},
 };
 
-/* 80BC6AF4-80BC6AF8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Cblock";
 
-/* 80BC6AF8-80BC6B28 000024 0030+00 0/0 0/0 0/0 .data            l_side_co_offset */
 static f32 l_side_co_offset[12] = {
     -255.0f, 0.0f, -30.0f, -135.0f,
     0.0f, -30.0f, 135, 0.0f,
     -30.0f, 255.0f, 0.0f, -30.0f,
 };
 
-/* 80BC6B28-80BC6B6C 000054 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x19}}, // mObj
@@ -111,13 +104,11 @@ void daObjCBlk_HIO_c::genMessage(JORMContext* ctx) {
 static daObjCBlk_HIO_c l_HIO;
 #endif
 
-/* 80BC5A0C-80BC5A48 0000EC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjCBlk_cFv */
 void daObjCBlk_c::initBaseMtx() {
     model1->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BC5A48-80BC5ABC 000128 0074+00 1/1 0/0 0/0 .text            setBaseMtx__11daObjCBlk_cFv */
 void daObjCBlk_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y,current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -125,7 +116,6 @@ void daObjCBlk_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BC5ABC-80BC5CBC 00019C 0200+00 1/0 0/0 0/0 .text            Create__11daObjCBlk_cFv */
 int daObjCBlk_c::Create() {
     u8 pathId = getPathID();
     roomPath = dPath_GetRoomPath(pathId, fopAcM_GetHomeRoomNo(this));
@@ -167,7 +157,6 @@ int daObjCBlk_c::Create() {
     return 1;
 }
 
-/* 80BC5CF8-80BC5E58 0003D8 0160+00 1/0 0/0 0/0 .text            CreateHeap__11daObjCBlk_cFv */
 int daObjCBlk_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(350, modelData != NULL);
@@ -198,15 +187,12 @@ int daObjCBlk_c::CreateHeap() {
     return 1;
 }
 
-/* 80BC5E58-80BC5E94 000538 003C+00 1/1 0/0 0/0 .text            __dt__Q211daObjCBlk_c7chain_sFv */
 daObjCBlk_c::chain_s::~chain_s() {
 }
 
-/* 80BC5E94-80BC5E98 000574 0004+00 1/1 0/0 0/0 .text            __ct__Q211daObjCBlk_c7chain_sFv */
 daObjCBlk_c::chain_s::chain_s() {
 }
 
-/* 80BC5E98-80BC6020 000578 0188+00 1/1 0/0 0/0 .text            create__11daObjCBlk_cFv */
 int daObjCBlk_c::create() {
     fopAcM_ct(this, daObjCBlk_c);
     int rv = dComIfG_resLoad(&phase, l_arcName);
@@ -224,7 +210,6 @@ int daObjCBlk_c::create() {
     return rv;
 }
 
-/* 80BC6260-80BC6270 000940 0010+00 1/0 0/0 0/0 .text            Execute__11daObjCBlk_cFPPA3_A4_f */
 int daObjCBlk_c::Execute(f32 (**mtx)[3][4]) {
     *mtx = &mBgMtx;
     return 1;
@@ -245,12 +230,10 @@ static void dummy5() {
 }
 #endif
 
-/* 80BC6270-80BC627C 000950 000C+00 2/2 0/0 0/0 .text            initWait__11daObjCBlk_cFv */
 void daObjCBlk_c::initWait() {
     field_0xc1f = 0;
 }
 
-/* 80BC627C-80BC6414 00095C 0198+00 1/0 0/0 0/0 .text            modeWait__11daObjCBlk_cFv */
 void daObjCBlk_c::modeWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     bool bVar1 = false;
@@ -287,7 +270,6 @@ void daObjCBlk_c::modeWait() {
     }
 }
 
-/* 80BC6414-80BC6430 000AF4 001C+00 1/1 0/0 0/0 .text            initWalk__11daObjCBlk_cFv */
 void daObjCBlk_c::initWalk() {
     u8 travelTime = TRAVEL_TIME;
     walkTimer = travelTime;
@@ -295,7 +277,6 @@ void daObjCBlk_c::initWalk() {
     field_0xc1f = 1;
 }
 
-/* 80BC6430-80BC65CC 000B10 019C+00 1/0 0/0 0/0 .text            modeWalk__11daObjCBlk_cFv */
 void daObjCBlk_c::modeWalk() {
     u8 travelTime = TRAVEL_TIME;
     f32 travelDist = TRAVEL_DIST;
@@ -315,7 +296,6 @@ void daObjCBlk_c::modeWalk() {
     }
 }
 
-/* 80BC65CC-80BC6648 000CAC 007C+00 2/2 0/0 0/0 .text getChainBasePos__11daObjCBlk_cFP4cXyz */
 void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
     *pPos = l_chainOffset;
     mDoMtx_stack_c::transS(current.pos);
@@ -323,7 +303,6 @@ void daObjCBlk_c::getChainBasePos(cXyz* pPos) {
     mDoMtx_stack_c::multVec(pPos, pPos);
 }
 
-/* 80BC6648-80BC66DC 000D28 0094+00 2/2 0/0 0/0 .text            setPower__11daObjCBlk_cFf */
 void daObjCBlk_c::setPower(f32 power) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     chain_s* pChain = chains + 5;
@@ -359,7 +338,6 @@ static f32 dummy2() {
     return f0 + f1 * (f2 - f3 * (f4 - f5 * (f6 - f7 * f8 - (f7 - f9))));
 }
 
-/* 80BC66DC-80BC6868 000DBC 018C+00 1/1 0/0 0/0 .text            checkWall__11daObjCBlk_cFv */
 BOOL daObjCBlk_c::checkWall() {
     cXyz acStack_30[2] = {cXyz(-95.0f, 5.0f, 1.0f), cXyz(95.0f, 5.0f, 1.0f)};
     cXyz cStack_40(0.0f, 0.0f, 1.0f);
@@ -384,12 +362,10 @@ BOOL daObjCBlk_c::checkWall() {
     return rv;
 }
 
-/* 80BC6868-80BC6870 000F48 0008+00 1/0 0/0 0/0 .text            Draw__11daObjCBlk_cFv */
 int daObjCBlk_c::Draw() {
     return 1;
 }
 
-/* 80BC6870-80BC68A4 000F50 0034+00 1/0 0/0 0/0 .text            Delete__11daObjCBlk_cFv */
 int daObjCBlk_c::Delete() {
     dComIfG_resDelete(&phase, l_arcName);
 #if DEBUG
@@ -398,25 +374,19 @@ int daObjCBlk_c::Delete() {
     return 1;
 }
 
-/* 80BC68A4-80BC68D0 000F84 002C+00 1/0 0/0 0/0 .text            daObjCBlk_Draw__FP11daObjCBlk_c */
 static int daObjCBlk_Draw(daObjCBlk_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC68D0-80BC68F0 000FB0 0020+00 1/0 0/0 0/0 .text            daObjCBlk_Execute__FP11daObjCBlk_c
- */
 static int daObjCBlk_Execute(daObjCBlk_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC68F0-80BC6910 000FD0 0020+00 1/0 0/0 0/0 .text            daObjCBlk_Delete__FP11daObjCBlk_c
- */
 static int daObjCBlk_Delete(daObjCBlk_c* i_this) {
     fpc_ProcID unusedId = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80BC6910-80BC6930 000FF0 0020+00 1/0 0/0 0/0 .text            daObjCBlk_Create__FP10fopAc_ac_c */
 static int daObjCBlk_Create(fopAc_ac_c* i_this) {
     daObjCBlk_c* cblock = static_cast<daObjCBlk_c*>(i_this);
     fpc_ProcID unusedId = fopAcM_GetID(i_this);
@@ -433,7 +403,6 @@ static const u32 dummy3[3] = {
 
 AUDIO_INSTANCES;
 
-/* 80BC6B9C-80BC6BBC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCBlk_Method */
 static actor_method_class l_daObjCBlk_Method = {
     (process_method_func)daObjCBlk_Create,
     (process_method_func)daObjCBlk_Delete,
@@ -442,7 +411,6 @@ static actor_method_class l_daObjCBlk_Method = {
     (process_method_func)daObjCBlk_Draw,
 };
 
-/* 80BC6BBC-80BC6BEC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ChainBlock */
 extern actor_process_profile_definition g_profile_Obj_ChainBlock = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp
index 32bc0a9cb8..3f1f2d3d91 100644
--- a/src/d/actor/d_a_obj_cboard.cpp
+++ b/src/d/actor/d_a_obj_cboard.cpp
@@ -9,12 +9,10 @@
 #include "d/d_bg_w.h"
 #include "d/d_procname.h"
 
-/* 8057B958-8057B978 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjBoard_cFv */
 void daObjBoard_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8057B978-8057B9C8 000098 0050+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjBoard_cFv */
 void daObjBoard_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -22,21 +20,17 @@ void daObjBoard_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 8057BE20-8057BE24 -00001 0004+00 2/2 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_Board";
 
-/* 8057BE24-8057BE38 -00001 0014+00 1/1 0/0 0/0 .data            l_dzbName */
 static char* l_dzbName[5] = {
     "ClearB00.dzb", "ClearB01.dzb", "ClearB02.dzb", "ClearB03.dzb", "ClearB04.dzb",
 };
 
-/* 8057BE38-8057BE50 000018 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-100.0f, -10.0f, -100.0f},
     {100.0f, 10.0f, 100.0f},
 };
 
-/* 8057B9C8-8057BA70 0000E8 00A8+00 1/0 0/0 0/0 .text            Create__12daObjBoard_cFv */
 int daObjBoard_c::Create() {
     if (getNameArg() == 1) {
         scale.x *= 10.0f;
@@ -51,12 +45,10 @@ int daObjBoard_c::Create() {
     return 1;
 }
 
-/* 8057BA70-8057BA78 000190 0008+00 1/0 0/0 0/0 .text            CreateHeap__12daObjBoard_cFv */
 int daObjBoard_c::CreateHeap() {
     return 1;
 }
 
-/* 8057BA78-8057BB74 000198 00FC+00 1/1 0/0 0/0 .text            create1st__12daObjBoard_cFv */
 int daObjBoard_c::create1st() {
     int ret = dComIfG_resLoad(&mPhase, l_arcName);
     if (ret == cPhs_COMPLEATE_e) {
@@ -93,8 +85,6 @@ int daObjBoard_c::create1st() {
     return ret;
 }
 
-/* 8057BB74-8057BCC0 000294 014C+00 2/0 0/0 0/0 .text            Execute__12daObjBoard_cFPPA3_A4_f
- */
 int daObjBoard_c::Execute(Mtx** param_0) {
     switch (getArg0()) {
     case 1:
@@ -133,49 +123,39 @@ int daObjBoard_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 8057BCC0-8057BCC8 0003E0 0008+00 1/0 0/0 0/0 .text            Draw__12daObjBoard_cFv */
 int daObjBoard_c::Draw() {
     return 1;
 }
 
-/* 8057BCC8-8057BCFC 0003E8 0034+00 1/0 0/0 0/0 .text            Delete__12daObjBoard_cFv */
 int daObjBoard_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 8057BCFC-8057BD5C 00041C 0060+00 1/0 0/0 0/0 .text daObjBoard_create1st__FP12daObjBoard_c */
 static int daObjBoard_create1st(daObjBoard_c* i_this) {
     fopAcM_ct(i_this, daObjBoard_c);
 
     return i_this->create1st();
 }
 
-/* 8057BD5C-8057BD7C 00047C 0020+00 1/0 0/0 0/0 .text daObjBoard_MoveBGDelete__FP12daObjBoard_c */
 static int daObjBoard_MoveBGDelete(daObjBoard_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8057BD7C-8057BD9C 00049C 0020+00 1/0 0/0 0/0 .text daObjBoard_MoveBGExecute__FP12daObjBoard_c
- */
 static int daObjBoard_MoveBGExecute(daObjBoard_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8057BD9C-8057BDC8 0004BC 002C+00 1/0 0/0 0/0 .text daObjBoard_MoveBGDraw__FP12daObjBoard_c */
 static int daObjBoard_MoveBGDraw(daObjBoard_c* i_this) {
     return i_this->Draw();
 }
 
-/* ############################################################################################## */
-/* 8057BE90-8057BEB0 -00001 0020+00 1/0 0/0 0/0 .data            daObjBoard_METHODS */
 static actor_method_class daObjBoard_METHODS = {
     (process_method_func)daObjBoard_create1st,     (process_method_func)daObjBoard_MoveBGDelete,
     (process_method_func)daObjBoard_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjBoard_MoveBGDraw,
 };
 
-/* 8057BEB0-8057BEE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Cboard */
 extern actor_process_profile_definition g_profile_Obj_Cboard = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp
index 2be5b8fab3..d8d579dd61 100644
--- a/src/d/actor/d_a_obj_cdoor.cpp
+++ b/src/d/actor/d_a_obj_cdoor.cpp
@@ -11,25 +11,19 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80BC7D78-80BC7D80 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "Cdoor",
     "J_Suimon",
 };
 
-/* 80BC7D18-80BC7D20 000000 0008+00 2/2 0/0 0/0 .rodata          l_bmdIdx */
 static int const l_bmdIdx[2] = {4, 9};
 
-/* 80BC7D20-80BC7D28 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static int const l_dzbIdx[2] = {7, 12};
 
-/* 80BC7D80-80BC7D88 000028 0008+00 2/2 0/0 0/0 .data            l_moveOffsetY */
 static f32 l_moveOffsetY[2] = {250.0f, 230.0f};
 
-/* 80BC7D28-80BC7D30 000010 0008+00 1/1 0/0 0/0 .rodata          l_attentionOffsetY */
 static f32 const l_attentionOffsetY[2] = {75.0f, 75.0f};
 
-/* 80BC6DB8-80BC6EF0 000078 0138+00 1/0 0/0 0/0 .text            CreateHeap__12daObjCdoor_cFv */
 int daObjCdoor_c::CreateHeap() {
     J3DModelData* model_data =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmdIdx[mType]);
@@ -46,7 +40,6 @@ int daObjCdoor_c::CreateHeap() {
     return 1;
 }
 
-/* 80BC6EF0-80BC6F30 0001B0 0040+00 2/2 0/0 0/0 .text daObjCdoor_searchChain__FP10fopAc_ac_cPv */
 static void* daObjCdoor_searchChain(fopAc_ac_c* i_actor, void* i_this) {
     daObjCdoor_c* _this = static_cast<daObjCdoor_c*>(i_this);
     if (fopAcM_GetName(i_actor) == PROC_Obj_Wchain) {
@@ -59,7 +52,6 @@ static void* daObjCdoor_searchChain(fopAc_ac_c* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80BC6F30-80BC7234 0001F0 0304+00 1/1 0/0 0/0 .text            create__12daObjCdoor_cFv */
 cPhs__Step daObjCdoor_c::create() {
     fopAcM_ct(this, daObjCdoor_c);
     mType = (fopAcM_GetParam(this) >> 8) & 0xf;
@@ -110,34 +102,26 @@ cPhs__Step daObjCdoor_c::create() {
     return step;
 }
 
-/* 80BC727C-80BC729C 00053C 0020+00 1/0 0/0 0/0 .text            daObjCdoor_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObjCdoor_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjCdoor_c*>(i_this)->create();
 }
 
-/* 80BC729C-80BC7378 00055C 00DC+00 1/0 0/0 0/0 .text            __dt__12daObjCdoor_cFv */
 daObjCdoor_c::~daObjCdoor_c() {
     dComIfG_resDelete(&mPhaseReq, l_arcName[mType]);
 }
 
-/* 80BC7378-80BC73C0 000638 0048+00 1/0 0/0 0/0 .text            daObjCdoor_Delete__FP12daObjCdoor_c
- */
 static int daObjCdoor_Delete(daObjCdoor_c* i_this) {
     i_this->MoveBGDelete();
     i_this->~daObjCdoor_c();
     return 1;
 }
 
-/* 80BC73C0-80BC7424 000680 0064+00 3/3 0/0 0/0 .text            setMatrix__12daObjCdoor_cFv */
 void daObjCdoor_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BC7424-80BC7478 0006E4 0054+00 1/0 0/0 0/0 .text            Execute__12daObjCdoor_cFPPA3_A4_f
- */
 int daObjCdoor_c::Execute(Mtx** i_mtxP) {
     *i_mtxP = &mpModel->getBaseTRMtx();
     switch (mType) {
@@ -151,7 +135,6 @@ int daObjCdoor_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80BC7478-80BC7630 000738 01B8+00 1/1 0/0 0/0 .text            execCdoor__12daObjCdoor_cFv */
 void daObjCdoor_c::execCdoor() {
     if (!mEnd) {
         if (mChainID == -1) {
@@ -185,7 +168,6 @@ void daObjCdoor_c::execCdoor() {
     }
 }
 
-/* 80BC7630-80BC775C 0008F0 012C+00 1/1 0/0 0/0 .text            execWgate__12daObjCdoor_cFv */
 void daObjCdoor_c::execWgate() {
     typedef void (daObjCdoor_c::*daObjCdoor_modeFunc)();
     static daObjCdoor_modeFunc mode_proc[3] = {
@@ -208,23 +190,19 @@ void daObjCdoor_c::execWgate() {
     event_proc_call();
 }
 
-/* 80BC775C-80BC7768 000A1C 000C+00 3/3 0/0 0/0 .text            init_modeWait__12daObjCdoor_cFv */
 void daObjCdoor_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80BC7768-80BC776C 000A28 0004+00 1/0 0/0 0/0 .text            modeWait__12daObjCdoor_cFv */
 void daObjCdoor_c::modeWait() {
     /* empty function */
 }
 
-/* 80BC776C-80BC77BC 000A2C 0050+00 1/1 0/0 0/0 .text            init_modeOpen__12daObjCdoor_cFv */
 void daObjCdoor_c::init_modeOpen() {
     mOpenAnm.reset();
     mMode = MODE_OPEN;
 }
 
-/* 80BC77BC-80BC78B0 000A7C 00F4+00 1/0 0/0 0/0 .text            modeOpen__12daObjCdoor_cFv */
 void daObjCdoor_c::modeOpen() {
     fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_WATERGATE_MOVE, 0);
     if (mOpenAnm.play()) {
@@ -233,13 +211,11 @@ void daObjCdoor_c::modeOpen() {
     }
 }
 
-/* 80BC78B0-80BC7900 000B70 0050+00 1/1 0/0 0/0 .text            init_modeClose__12daObjCdoor_cFv */
 void daObjCdoor_c::init_modeClose() {
     mCloseAnm.reset();
     mMode = MODE_CLOSE;
 }
 
-/* 80BC7900-80BC79F4 000BC0 00F4+00 1/0 0/0 0/0 .text            modeClose__12daObjCdoor_cFv */
 void daObjCdoor_c::modeClose() {
     fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_WATERGATE_MOVE, 0);
     if (mCloseAnm.play()) {
@@ -248,13 +224,10 @@ void daObjCdoor_c::modeClose() {
     }
 }
 
-/* 80BC79F4-80BC7A14 000CB4 0020+00 1/0 0/0 0/0 .text daObjCdoor_Execute__FP12daObjCdoor_c */
 static int daObjCdoor_Execute(daObjCdoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC7A14-80BC7AD0 000CD4 00BC+00 1/1 0/0 0/0 .text            event_proc_call__12daObjCdoor_cFv
- */
 void daObjCdoor_c::event_proc_call() {
     typedef void (daObjCdoor_c::*daObjCdoor_eventFunc)();
     static daObjCdoor_eventFunc l_func[4] = {
@@ -266,7 +239,6 @@ void daObjCdoor_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80BC7AD0-80BC7B34 000D90 0064+00 1/0 0/0 0/0 .text            actionWait__12daObjCdoor_cFv */
 void daObjCdoor_c::actionWait() {
     if (mMapToolID != 0xff) {
         setAction(ACT_ORDER_EVENT);
@@ -275,8 +247,6 @@ void daObjCdoor_c::actionWait() {
     }
 }
 
-/* 80BC7B34-80BC7B9C 000DF4 0068+00 1/0 0/0 0/0 .text            actionOrderEvent__12daObjCdoor_cFv
- */
 void daObjCdoor_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACT_EVENT);
@@ -286,7 +256,6 @@ void daObjCdoor_c::actionOrderEvent() {
     }
 }
 
-/* 80BC7B9C-80BC7BF8 000E5C 005C+00 1/0 0/0 0/0 .text            actionEvent__12daObjCdoor_cFv */
 void daObjCdoor_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACT_DEAD);
@@ -294,12 +263,10 @@ void daObjCdoor_c::actionEvent() {
     }
 }
 
-/* 80BC7BF8-80BC7C04 000EB8 000C+00 1/0 0/0 0/0 .text            actionDead__12daObjCdoor_cFv */
 void daObjCdoor_c::actionDead() {
     setAction(ACT_WAIT);
 }
 
-/* 80BC7C04-80BC7CE4 000EC4 00E0+00 1/0 0/0 0/0 .text            Draw__12daObjCdoor_cFv */
 int daObjCdoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -317,13 +284,10 @@ int daObjCdoor_c::Draw() {
     return 1;
 }
 
-/* 80BC7CE4-80BC7D10 000FA4 002C+00 1/0 0/0 0/0 .text            daObjCdoor_Draw__FP12daObjCdoor_c
- */
 static int daObjCdoor_Draw(daObjCdoor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC7E30-80BC7E50 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCdoor_Method */
 static actor_method_class l_daObjCdoor_Method = {
     (process_method_func)daObjCdoor_Create,
     (process_method_func)daObjCdoor_Delete,
@@ -332,7 +296,6 @@ static actor_method_class l_daObjCdoor_Method = {
     (process_method_func)daObjCdoor_Draw,
 };
 
-/* 80BC7E50-80BC7E80 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Cdoor */
 extern actor_process_profile_definition g_profile_Obj_Cdoor = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp
index d833a5a0a9..c45fde1122 100644
--- a/src/d/actor/d_a_obj_chandelier.cpp
+++ b/src/d/actor/d_a_obj_chandelier.cpp
@@ -12,7 +12,6 @@
 
 static char* l_arcName = "L9Chand";
 
-/* 80BC8DA4-80BC8DE0 000060 003C+00 1/2 0/0 0/0 .data            s_exeProc__17daObjChandelier_c */
 daObjChandelier_proc daObjChandelier_c::s_exeProc[5] = {
     &daObjChandelier_c::exeModeWait,
     &daObjChandelier_c::exeModeStartSwg,
@@ -21,18 +20,14 @@ daObjChandelier_proc daObjChandelier_c::s_exeProc[5] = {
     &daObjChandelier_c::exeModeHookSwg,
 };
 
-/* 80BC7F38-80BC7F74 000078 003C+00 2/2 0/0 0/0 .text            __ct__17daObjChandelier_cFv */
 daObjChandelier_c::daObjChandelier_c() {
     /* empty function */
 }
 
-/* 80BC7F74-80BC8008 0000B4 0094+00 1/0 0/0 0/0 .text            __dt__17daObjChandelier_cFv */
 daObjChandelier_c::~daObjChandelier_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80BC8008-80BC8078 000148 0070+00 1/0 0/0 0/0 .text            CreateHeap__17daObjChandelier_cFv
- */
 int daObjChandelier_c::CreateHeap() {
     J3DModelData* bmd = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084);
@@ -42,7 +37,6 @@ int daObjChandelier_c::CreateHeap() {
     return 1;
 }
 
-/* 80BC8078-80BC8160 0001B8 00E8+00 1/0 0/0 0/0 .text            create1st__17daObjChandelier_cFv */
 cPhs__Step daObjChandelier_c::create1st() {
     fopAcM_ct(this, daObjChandelier_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
@@ -59,13 +53,11 @@ cPhs__Step daObjChandelier_c::create1st() {
     return step;
 }
 
-/* 80BC8160-80BC8194 0002A0 0034+00 1/0 0/0 0/0 .text            Delete__17daObjChandelier_cFv */
 int daObjChandelier_c::Delete() {
     this->~daObjChandelier_c();
     return 1;
 }
 
-/* 80BC8194-80BC8238 0002D4 00A4+00 1/0 0/0 0/0 .text            Draw__17daObjChandelier_cFv */
 int daObjChandelier_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -75,7 +67,6 @@ int daObjChandelier_c::Draw() {
     return 1;
 }
 
-/* 80BC8238-80BC82C0 000378 0088+00 1/0 0/0 0/0 .text Execute__17daObjChandelier_cFPPA3_A4_f */
 int daObjChandelier_c::Execute(Mtx** param_0) {
     if (s_exeProc[mMode] != NULL) {
         (this->*s_exeProc[mMode])();
@@ -85,8 +76,6 @@ int daObjChandelier_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BC82C0-80BC834C 000400 008C+00 1/0 0/0 0/0 .text            exeModeWait__17daObjChandelier_cFv
- */
 void daObjChandelier_c::exeModeWait() {
     exeModeHookSwg();
     u8 sw = getSW_0();
@@ -100,7 +89,6 @@ void daObjChandelier_c::exeModeWait() {
     }
 }
 
-/* 80BC834C-80BC83E4 00048C 0098+00 1/0 0/0 0/0 .text exeModeStartSwg__17daObjChandelier_cFv */
 void daObjChandelier_c::exeModeStartSwg() {
     moveSwing(20.0f, 300.0f, 50.0f, 0.3f);
     if (mTimer >= 90) {
@@ -115,8 +103,6 @@ void daObjChandelier_c::exeModeStartSwg() {
     }
 }
 
-/* 80BC83E4-80BC84C0 000524 00DC+00 1/0 0/0 0/0 .text            exeModeDown__17daObjChandelier_cFv
- */
 void daObjChandelier_c::exeModeDown() {
     current.pos.y += speed.y;
     speed.y += gravity;
@@ -128,7 +114,6 @@ void daObjChandelier_c::exeModeDown() {
     }
 }
 
-/* 80BC84C0-80BC851C 000600 005C+00 1/0 0/0 0/0 .text exeModeEndSwg__17daObjChandelier_cFv */
 void daObjChandelier_c::exeModeEndSwg() {
     moveSwingFall();
     if (mTimer >= 60) {
@@ -140,7 +125,6 @@ void daObjChandelier_c::exeModeEndSwg() {
     }
 }
 
-/* 80BC851C-80BC85E4 00065C 00C8+00 2/1 0/0 0/0 .text exeModeHookSwg__17daObjChandelier_cFv */
 void daObjChandelier_c::exeModeHookSwg() {
     if (field_0x60a != 0 || fopAcM_checkHookCarryNow(this)) {
         f32 f1 = 10.0f;
@@ -161,7 +145,6 @@ void daObjChandelier_c::exeModeHookSwg() {
     field_0x60a = 0;
 }
 
-/* 80BC85E4-80BC86FC 000724 0118+00 1/1 0/0 0/0 .text            init__17daObjChandelier_cFv */
 void daObjChandelier_c::init() {
     mMode = MODE_WAIT;
     if (getArg_0() == 1) {
@@ -189,8 +172,6 @@ void daObjChandelier_c::init() {
     }
 }
 
-/* 80BC86FC-80BC8780 00083C 0084+00 2/2 0/0 0/0 .text            setModelMtx__17daObjChandelier_cFv
- */
 void daObjChandelier_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -199,8 +180,6 @@ void daObjChandelier_c::setModelMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BC8780-80BC89B0 0008C0 0230+00 2/2 0/0 0/0 .text            moveSwing__17daObjChandelier_cFffff
- */
 void daObjChandelier_c::moveSwing(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     f32 f1 = -param_1 + param_0 * field_0x5fc;
     shape_angle.z += (s16)(field_0x608 * (f1 * field_0x5ec));
@@ -225,7 +204,6 @@ void daObjChandelier_c::moveSwing(f32 param_0, f32 param_1, f32 param_2, f32 par
     field_0x5fc++;
 }
 
-/* 80BC89B0-80BC8B20 000AF0 0170+00 1/1 0/0 0/0 .text moveSwingFall__17daObjChandelier_cFv */
 void daObjChandelier_c::moveSwingFall() {
     static Vec TOP_POS_Y_OFFSET = { 0.0f, 3000.0f, 0.0f };
     cLib_chaseF(&field_0x5ec, 0.0f, 0.04f);
@@ -242,7 +220,6 @@ void daObjChandelier_c::moveSwingFall() {
     current.pos = vec1 + vec4;
 }
 
-/* 80BC8B20-80BC8B7C 000C60 005C+00 3/3 0/0 0/0 .text hookSwingInitParm__17daObjChandelier_cFv */
 void daObjChandelier_c::hookSwingInitParm() {
     field_0x5ec = 1.2f;
     field_0x5f0 = 0.7f;
@@ -254,32 +231,23 @@ void daObjChandelier_c::hookSwingInitParm() {
     field_0x5f8 = 5.0f;
 }
 
-/* 80BC8B7C-80BC8BDC 000CBC 0060+00 1/0 0/0 0/0 .text
- * daObjChandelier_create1st__FP17daObjChandelier_c             */
 static cPhs__Step daObjChandelier_create1st(daObjChandelier_c* i_this) {
     fopAcM_ct(i_this, daObjChandelier_c);
     return i_this->create1st();
 }
 
-/* 80BC8BDC-80BC8BFC 000D1C 0020+00 1/0 0/0 0/0 .text
- * daObjChandelier_MoveBGDelete__FP17daObjChandelier_c          */
 static int daObjChandelier_MoveBGDelete(daObjChandelier_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BC8BFC-80BC8C1C 000D3C 0020+00 1/0 0/0 0/0 .text
- * daObjChandelier_MoveBGExecute__FP17daObjChandelier_c         */
 static int daObjChandelier_MoveBGExecute(daObjChandelier_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC8C1C-80BC8C48 000D5C 002C+00 1/0 0/0 0/0 .text
- * daObjChandelier_MoveBGDraw__FP17daObjChandelier_c            */
 static int daObjChandelier_MoveBGDraw(daObjChandelier_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC8DEC-80BC8E0C -00001 0020+00 1/0 0/0 0/0 .data            daObjChandelier_METHODS */
 static actor_method_class daObjChandelier_METHODS = {
     (process_method_func)daObjChandelier_create1st,
     (process_method_func)daObjChandelier_MoveBGDelete,
@@ -288,7 +256,6 @@ static actor_method_class daObjChandelier_METHODS = {
     (process_method_func)daObjChandelier_MoveBGDraw,
 };
 
-/* 80BC8E0C-80BC8E3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Chandelier */
 extern actor_process_profile_definition g_profile_Obj_Chandelier = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp
index af980c8892..a770f2ab71 100644
--- a/src/d/actor/d_a_obj_chest.cpp
+++ b/src/d/actor/d_a_obj_chest.cpp
@@ -13,16 +13,13 @@
 #include "d/d_bg_s.h"
 #include "d/d_bg_w.h"
 #include "d/d_procname.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_obj_eff.h"
 
-/* 80BC8EF8-80BC8F34 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjChest_cFv */
 void daObjChest_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BC9FFC-80BCA040 000000 0044+00 3/3 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x0}, 0x19}},  // mObj
@@ -37,7 +34,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80BC8F34-80BC9088 0000B4 0154+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjChest_cFv */
 void daObjChest_c::setBaseMtx() {
     mRandomRotX -= 0x8C;
     mModifyRotX += mRandomRotX;
@@ -62,7 +58,6 @@ void daObjChest_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BC9088-80BC9240 000208 01B8+00 1/0 0/0 0/0 .text            Create__12daObjChest_cFv */
 int daObjChest_c::Create() {
     u8 switch_no = getSwNo();
     if (fopAcM_isSwitch(this, switch_no)) {
@@ -96,10 +91,8 @@ int daObjChest_c::Create() {
     return 1;
 }
 
-/* 80BCA0D8-80BCA0DC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_Tansu";
 
-/* 80BC9240-80BC92B0 0003C0 0070+00 1/0 0/0 0/0 .text            CreateHeap__12daObjChest_cFv */
 int daObjChest_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -109,7 +102,6 @@ int daObjChest_c::CreateHeap() {
     return 0;
 }
 
-/* 80BC92B0-80BC93F0 000430 0140+00 1/1 0/0 0/0 .text            create__12daObjChest_cFv */
 int daObjChest_c::create() {
     fopAcM_ct(this, daObjChest_c);
 
@@ -123,8 +115,6 @@ int daObjChest_c::create() {
     return phase;
 }
 
-/* 80BC970C-80BC9764 00088C 0058+00 1/0 0/0 0/0 .text            Execute__12daObjChest_cFPPA3_A4_f
- */
 int daObjChest_c::Execute(Mtx** i_mtx) {
     mLifeCycleLength++;
     action();
@@ -133,7 +123,6 @@ int daObjChest_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BC9764-80BC9808 0008E4 00A4+00 1/1 0/0 0/0 .text            action__12daObjChest_cFv */
 void daObjChest_c::action() {
     typedef void (daObjChest_c::*actionFunc)();
     static actionFunc l_func[3] = {
@@ -145,7 +134,6 @@ void daObjChest_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80BC9808-80BC9BF0 000988 03E8+00 1/0 0/0 0/0 .text            actionWait__12daObjChest_cFv */
 void daObjChest_c::actionWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -187,7 +175,6 @@ void daObjChest_c::actionWait() {
     }
 }
 
-/* 80BC9BF0-80BC9DFC 000D70 020C+00 1/0 0/0 0/0 .text            actionMove__12daObjChest_cFv */
 void daObjChest_c::actionMove() {
     if (cLib_calcTimer<u8>(&mMoveStartTimer) == 0) {
         mExtraRot.x += 0x80;
@@ -219,12 +206,10 @@ void daObjChest_c::actionMove() {
     }
 }
 
-/* 80BC9DFC-80BC9E00 000F7C 0004+00 1/0 0/0 0/0 .text            actionEnd__12daObjChest_cFv */
 void daObjChest_c::actionEnd() {
     /* empty function */
 }
 
-/* 80BC9E00-80BC9EA4 000F80 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjChest_cFv */
 int daObjChest_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -234,43 +219,33 @@ int daObjChest_c::Draw() {
     return 1;
 }
 
-/* 80BC9EA4-80BC9ED8 001024 0034+00 1/0 0/0 0/0 .text            Delete__12daObjChest_cFv */
 int daObjChest_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80BC9ED8-80BC9F04 001058 002C+00 1/0 0/0 0/0 .text            daObjChest_Draw__FP12daObjChest_c
- */
 static int daObjChest_Draw(daObjChest_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BC9F04-80BC9F24 001084 0020+00 1/0 0/0 0/0 .text daObjChest_Execute__FP12daObjChest_c */
 static int daObjChest_Execute(daObjChest_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BC9F24-80BC9F44 0010A4 0020+00 1/0 0/0 0/0 .text            daObjChest_Delete__FP12daObjChest_c
- */
 static int daObjChest_Delete(daObjChest_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BC9F44-80BC9F64 0010C4 0020+00 1/0 0/0 0/0 .text            daObjChest_Create__FP10fopAc_ac_c
- */
 static int daObjChest_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjChest_c*>(i_this)->create();
 }
 
-/* 80BCA124-80BCA144 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjChest_Method */
 static actor_method_class l_daObjChest_Method = {
     (process_method_func)daObjChest_Create,  (process_method_func)daObjChest_Delete,
     (process_method_func)daObjChest_Execute, (process_method_func)NULL,
     (process_method_func)daObjChest_Draw,
 };
 
-/* 80BCA144-80BCA174 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Chest */
 extern actor_process_profile_definition g_profile_Obj_Chest = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp
index e41241cb7e..efe0c02d5e 100644
--- a/src/d/actor/d_a_obj_cho.cpp
+++ b/src/d/actor/d_a_obj_cho.cpp
@@ -13,20 +13,16 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80BCC750-80BCC754 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80BCC760-80BCC770 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_ChoHIO_c l_HIO;
 
-/* 80BCA30C-80BCA334 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_ChoHIO_cFv */
 daObj_ChoHIO_c::daObj_ChoHIO_c() {
     field_0x4 = -1;
     mScaleMale = 0.8f;
     mScaleFemale = 0.8f;
 }
 
-/* 80BCA334-80BCA3A0 000114 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjCHO_cFv */
 void daObjCHO_c::InitCcSph() {
     mCcStts.Init(1, 0, this);
     const static dCcD_SrcSph ccSphSrc = {
@@ -46,19 +42,16 @@ void daObjCHO_c::InitCcSph() {
     mCcSph.OnTgNoHitMark();
 }
 
-/* 80BCA3A0-80BCA3F8 000180 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjCHO_cFv */
 void daObjCHO_c::SetCcSph() {
     mCcSph.SetC(current.pos);
     mCcSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80BCA3F8-80BCA418 0001D8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObjCHO_c*>(i_this)->CreateHeap();
 }
 
-/* 80BCA418-80BCA700 0001F8 02E8+00 1/1 0/0 0/0 .text            CreateHeap__10daObjCHO_cFv */
 int daObjCHO_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Cho", 10);
     mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
@@ -104,18 +97,15 @@ int daObjCHO_c::CreateHeap() {
     return 1;
 }
 
-/* 80BCA748-80BCA768 000528 0020+00 1/0 0/0 0/0 .text            daObjCHO_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjCHO_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjCHO_c*>(i_this)->create();
 }
 
-/* 80BCA768-80BCA78C 000548 0024+00 1/0 0/0 0/0 .text            daObjCHO_Delete__FP10daObjCHO_c */
 static int daObjCHO_Delete(daObjCHO_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80BCA78C-80BCA88C 00056C 0100+00 1/1 0/0 0/0 .text            SpeedSet__10daObjCHO_cFv */
 void daObjCHO_c::SpeedSet() {
     speed.y += gravity;
     current.pos.y += speed.y;
@@ -131,7 +121,6 @@ void daObjCHO_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80BCA88C-80BCA924 00066C 0098+00 1/1 0/0 0/0 .text            WallCheck__10daObjCHO_cFv */
 void daObjCHO_c::WallCheck() {
     dBgS_LinChk lin_chk;
     lin_chk.SetObj();
@@ -142,7 +131,6 @@ void daObjCHO_c::WallCheck() {
     }
 }
 
-/* 80BCA924-80BCAB50 000704 022C+00 1/1 0/0 0/0 .text            SearchLink__10daObjCHO_cFv */
 void daObjCHO_c::SearchLink() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (current.pos.absXZ(player->current.pos) < 200.0f
@@ -159,7 +147,6 @@ void daObjCHO_c::SearchLink() {
     }
 }
 
-/* 80BCAB50-80BCAEDC 000930 038C+00 2/2 0/0 0/0 .text            WaitAction__10daObjCHO_cFv */
 void daObjCHO_c::WaitAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz vec1, target;
@@ -207,7 +194,6 @@ void daObjCHO_c::WaitAction() {
     mTargetPos = target;
 }
 
-/* 80BCAEDC-80BCB210 000CBC 0334+00 2/2 0/0 0/0 .text            MoveAction__10daObjCHO_cFv */
 void daObjCHO_c::MoveAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     SpeedSet();
@@ -256,7 +242,6 @@ void daObjCHO_c::MoveAction() {
     }
 }
 
-/* 80BCB210-80BCB268 000FF0 0058+00 1/1 0/0 0/0 .text            Action__10daObjCHO_cFv */
 void daObjCHO_c::Action() {
     switch (mAction) {
     case ACT_WAIT:
@@ -269,7 +254,6 @@ void daObjCHO_c::Action() {
     Insect_GetDemoMain();
 }
 
-/* 80BCB268-80BCB2AC 001048 0044+00 1/1 0/0 0/0 .text            ShopAction__10daObjCHO_cFv */
 void daObjCHO_c::ShopAction() {
     switch (mAction) {
     case ACT_WAIT:
@@ -281,20 +265,17 @@ void daObjCHO_c::ShopAction() {
     }
 }
 
-/* 80BCB2AC-80BCB310 00108C 0064+00 1/1 0/0 0/0 .text            checkGroundPos__10daObjCHO_cFv */
 void daObjCHO_c::checkGroundPos() {
     cXyz pos = current.pos;
     mGndChk.SetPos(&pos);
     mGroundPos = dComIfG_Bgsp().GroundCross(&mGndChk);
 }
 
-/* 80BCB310-80BCB320 0010F0 0010+00 1/0 0/0 0/0 .text            Insect_Release__10daObjCHO_cFv */
 void daObjCHO_c::Insect_Release() {
     field_0x56c = 1;
     mAction = ACT_MOVE;
 }
 
-/* 80BCC630-80BCC634 0000B8 0002+02 1/2 0/0 0/0 .rodata          l_cho_itemno */
 static u8 const l_cho_itemno[2] = {fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY};
 
 // Some unused function went here.
@@ -303,7 +284,6 @@ static f32 fake(f32 param_0, s32 param_1) {
     return param_0 * -2.0f * 4000.0f * param_1;
 }
 
-/* 80BCB320-80BCB49C 001100 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjCHO_cFv */
 void daObjCHO_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
@@ -330,7 +310,6 @@ void daObjCHO_c::Z_BufferChk() {
     mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
 }
 
-/* 80BCB49C-80BCB5C0 00127C 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjCHO_cFv */
 void daObjCHO_c::ParticleSet() {
     if (mScreenZ > mBufferZ) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -346,7 +325,6 @@ void daObjCHO_c::ParticleSet() {
     }
 }
 
-/* 80BCB5C0-80BCB834 0013A0 0274+00 1/1 0/0 0/0 .text            BoomChk__10daObjCHO_cFv */
 void daObjCHO_c::BoomChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (mBoomerangHit) {
@@ -388,7 +366,6 @@ void daObjCHO_c::BoomChk() {
     }
 }
 
-/* 80BCB87C-80BCBB40 00165C 02C4+00 1/1 0/0 0/0 .text            Execute__10daObjCHO_cFv */
 int daObjCHO_c::Execute() {
     if (ChkGetDemo()) {
         mScreenZ = mBufferZ + 10000.0f;
@@ -443,7 +420,6 @@ int daObjCHO_c::Execute() {
     return 1;
 }
 
-/* 80BCBB40-80BCBCA8 001920 0168+00 1/1 0/0 0/0 .text            ObjHit__10daObjCHO_cFv */
 void daObjCHO_c::ObjHit() {
     if (mCcSph.ChkTgHit()) {
         cCcD_Obj* hit_obj = mCcSph.GetTgHitObj();
@@ -469,7 +445,6 @@ void daObjCHO_c::ObjHit() {
     }
 }
 
-/* 80BCBCA8-80BCBD10 001A88 0068+00 1/1 0/0 0/0 .text            Delete__10daObjCHO_cFv */
 int daObjCHO_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "I_Cho");
     if (mHIOInit) {
@@ -481,7 +456,6 @@ int daObjCHO_c::Delete() {
     return 1;
 }
 
-/* 80BCBD10-80BCBD70 001AF0 0060+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjCHO_cFv */
 void daObjCHO_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -507,23 +481,19 @@ int daObjCHO_c::Draw() {
     return 1;
 }
 
-/* 80BCBD70-80BCBE50 001B50 00E0+00 1/0 0/0 0/0 .text            daObjCHO_Draw__FP10daObjCHO_c */
 static int daObjCHO_Draw(daObjCHO_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BCBE50-80BCBE70 001C30 0020+00 2/1 0/0 0/0 .text            daObjCHO_Execute__FP10daObjCHO_c */
 static int daObjCHO_Execute(daObjCHO_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BCC670-80BCC674 0000F8 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x0193, /* dSv_event_flag_c::F_0403 - Misc. - Butterfly (M) */
     0x0194, /* dSv_event_flag_c::F_0404 - Misc. - Butterfly (F) */
 };
 
-/* 80BCBE70-80BCC01C 001C50 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjCHO_cFv */
 bool daObjCHO_c::CreateChk() {
     u8 param = (fopAcM_GetParam(this) >> 8) & 0xf;
     if (param == 0xf) {
@@ -558,7 +528,6 @@ bool daObjCHO_c::CreateChk() {
     return true;
 }
 
-/* 80BCC01C-80BCC3C8 001DFC 03AC+00 1/1 0/0 0/0 .text            create__10daObjCHO_cFv */
 cPhs__Step daObjCHO_c::create() {
     fopAcM_ct(this, daObjCHO_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "I_Cho");
@@ -624,13 +593,10 @@ cPhs__Step daObjCHO_c::create() {
     return step;
 }
 
-/* 80BCC4C8-80BCC4D0 0022A8 0008+00 1/0 0/0 0/0 .text            daObjCHO_IsDelete__FP10daObjCHO_c
- */
 static int daObjCHO_IsDelete(daObjCHO_c* i_this) {
     return 1;
 }
 
-/* 80BCC688-80BCC6A8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCHO_Method */
 static actor_method_class l_daObjCHO_Method = {
     (process_method_func)daObjCHO_Create,
     (process_method_func)daObjCHO_Delete,
@@ -639,7 +605,6 @@ static actor_method_class l_daObjCHO_Method = {
     (process_method_func)daObjCHO_Draw,
 };
 
-/* 80BCC6A8-80BCC6D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Cho */
 extern actor_process_profile_definition g_profile_Obj_Cho = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp
index 6221083411..d54b9459c3 100644
--- a/src/d/actor/d_a_obj_cowdoor.cpp
+++ b/src/d/actor/d_a_obj_cowdoor.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_cowdoor.h"
 #include "d/d_procname.h"
 
-/* 80BCC7F8-80BCC86C 000078 0074+00 2/2 0/0 0/0 .text            setBaseMtx__11daCowdoor_cFv */
 void daCowdoor_c::setBaseMtx() {
     MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -16,7 +15,6 @@ void daCowdoor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::now, mBgMtx);
 }
 
-/* 80BCC86C-80BCC8C4 0000EC 0058+00 1/0 0/0 0/0 .text            Create__11daCowdoor_cFv */
 int daCowdoor_c::Create() {
     setBaseMtx();
     cullMtx = field_0x5a8->mBaseTransformMtx;
@@ -25,23 +23,18 @@ int daCowdoor_c::Create() {
     return 1;
 }
 
-/* 80BCCBDC-80BCCBE0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "A_UHDoor";
 
-/* 80BCCBE0-80BCCBE4 -00001 0004+00 1/1 0/0 0/0 .data            l_bmdName */
 static const char* l_bmdName = "A_UHDoor.bmd";
 
-/* 80BCC8C4-80BCC93C 000144 0078+00 1/0 0/0 0/0 .text            CreateHeap__11daCowdoor_cFv */
 int daCowdoor_c::CreateHeap() {
     field_0x5a8 = mDoExt_J3DModel__create(
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName), 0x80000, 0x11000084);
     return (field_0x5a8 != NULL) ? 1 : 0;
 }
 
-/* 80BCCBE4-80BCCBE8 -00001 0004+00 1/1 0/0 0/0 .data            l_dzbName */
 static const char* l_dzbName = "A_UHDoor.dzb";
 
-/* 80BCC93C-80BCCA1C 0001BC 00E0+00 1/1 0/0 0/0 .text            create__11daCowdoor_cFv */
 int daCowdoor_c::create() {
     fopAcM_ct(this, daCowdoor_c);
     int phase = dComIfG_resLoad(&field_0x5a0, l_arcName);
@@ -56,14 +49,12 @@ int daCowdoor_c::create() {
     return phase;
 }
 
-/* 80BCCA1C-80BCCA48 00029C 002C+00 1/0 0/0 0/0 .text            Execute__11daCowdoor_cFPPA3_A4_f */
 int daCowdoor_c::Execute(Mtx** param_0) {
     *param_0 = &mBgMtx;
     setBaseMtx();
     return 1;
 }
 
-/* 80BCCA48-80BCCAEC 0002C8 00A4+00 1/0 0/0 0/0 .text            Draw__11daCowdoor_cFv */
 int daCowdoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(field_0x5a8, &tevStr);
@@ -73,42 +64,33 @@ int daCowdoor_c::Draw() {
     return 1;
 }
 
-/* 80BCCAEC-80BCCB20 00036C 0034+00 1/0 0/0 0/0 .text            Delete__11daCowdoor_cFv */
 int daCowdoor_c::Delete() {
     dComIfG_resDelete(&field_0x5a0, l_arcName);
     return 1;
 }
 
-/* 80BCCB20-80BCCB4C 0003A0 002C+00 1/0 0/0 0/0 .text            daCowdoor_Draw__FP11daCowdoor_c */
 static int daCowdoor_Draw(daCowdoor_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->Draw();
 }
 
-/* 80BCCB4C-80BCCB6C 0003CC 0020+00 1/0 0/0 0/0 .text            daCowdoor_Execute__FP11daCowdoor_c
- */
 static int daCowdoor_Execute(daCowdoor_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80BCCB6C-80BCCB8C 0003EC 0020+00 1/0 0/0 0/0 .text            daCowdoor_Delete__FP11daCowdoor_c
- */
 static int daCowdoor_Delete(daCowdoor_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
 }
 
-/* 80BCCB8C-80BCCBAC 00040C 0020+00 1/0 0/0 0/0 .text            daCowdoor_Create__FP10fopAc_ac_c */
 static int daCowdoor_Create(fopAc_ac_c* i_this) {
     return static_cast<daCowdoor_c*>(i_this)->create();
 }
 
-/* 80BCCBE8-80BCCC08 -00001 0020+00 1/0 0/0 0/0 .data            l_daCowdoor_Method */
 static actor_method_class l_daCowdoor_Method = {
     (process_method_func)daCowdoor_Create,  (process_method_func)daCowdoor_Delete,
     (process_method_func)daCowdoor_Execute, (process_method_func)NULL,
     (process_method_func)daCowdoor_Draw,
 };
 
-/* 80BCCC08-80BCCC38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Cowdoor */
 extern actor_process_profile_definition g_profile_Obj_Cowdoor = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp
index 6b534acda3..b452393052 100644
--- a/src/d/actor/d_a_obj_crope.cpp
+++ b/src/d/actor/d_a_obj_crope.cpp
@@ -12,22 +12,18 @@
 #include "d/d_path.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80BCEACC-80BCEAD4 000000 0006+02 6/6 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[] = "Crope";
 
-/* 80BCCCD8-80BCCD44 000078 006C+00 1/1 0/0 0/0 .text            createHeap__12daObjCrope_cFv */
 int daObjCrope_c::createHeap() {
     ResTIMG* texImg = (ResTIMG*) dComIfG_getObjectRes(l_arcName, 3);
     JUT_ASSERT(80, texImg != NULL);
     return mLineMat.init(1, 100, texImg, 0) != 0 ? 1 : 0;
 }
 
-/* 80BCCD44-80BCCD64 0000E4 0020+00 1/1 0/0 0/0 .text daObjCrope_createHeap__FP10fopAc_ac_c */
 static int daObjCrope_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjCrope_c*>(i_this)->createHeap();
 }
 
-/* 80BCEB3C-80BCEB7C 000000 0040+00 1/1 0/0 0/0 .data            l_sphSrc */
 static dCcD_SrcSph l_sphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x79}}, // mObj
@@ -40,7 +36,6 @@ static dCcD_SrcSph l_sphSrc = {
     } // mSphAttr
 };
 
-/* 80BCEB7C-80BCEB80 000040 0004+00 1/1 0/0 0/0 .data            color$4550 */
 static GXColor color = {
     0x00,
     0x00,
@@ -48,7 +43,6 @@ static GXColor color = {
     0xFF,
 };
 
-/* 80BCCD64-80BCD3D8 000104 0674+00 1/1 0/0 0/0 .text            create__12daObjCrope_cFv */
 int daObjCrope_c::create() {
     fopAcM_ct(this, daObjCrope_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -115,28 +109,21 @@ int daObjCrope_c::create() {
     return rv;
 }
 
-/* 80BCD504-80BCD524 0008A4 0020+00 1/0 0/0 0/0 .text            daObjCrope_Create__FP10fopAc_ac_c
- */
 static int daObjCrope_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daObjCrope_c, i_this, "Obj_Crope");
     return static_cast<daObjCrope_c*>(i_this)->create();
 }
 
-/* 80BCD524-80BCD69C 0008C4 0178+00 1/1 0/0 0/0 .text            __dt__12daObjCrope_cFv */
 daObjCrope_c::~daObjCrope_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80BCD69C-80BCD6C4 000A3C 0028+00 1/0 0/0 0/0 .text            daObjCrope_Delete__FP12daObjCrope_c
- */
 static int daObjCrope_Delete(daObjCrope_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Obj_Crope");
     i_this->~daObjCrope_c();
     return 1;
 }
 
-/* 80BCD6C4-80BCD9EC 000A64 0328+00 3/3 0/0 0/0 .text            setNormalRopePos__12daObjCrope_cFv
- */
 void daObjCrope_c::setNormalRopePos() {
     int i;
     cXyz* pVVar3;
@@ -193,7 +180,6 @@ void daObjCrope_c::setNormalRopePos() {
     }
 }
 
-/* 80BCD9EC-80BCE4FC 000D8C 0B10+00 1/1 0/0 0/0 .text            setRideRopePos__12daObjCrope_cFv */
 void daObjCrope_c::setRideRopePos() {
     daPy_py_c* player = daPy_getLinkPlayerActorClass();
     cXyz* pcVar13;
@@ -325,7 +311,6 @@ void daObjCrope_c::setRideRopePos() {
     }
 }
 
-/* 80BCE4FC-80BCE954 00189C 0458+00 1/1 0/0 0/0 .text            execute__12daObjCrope_cFv */
 int daObjCrope_c::execute() {
     int i;
     cXyz* this_00;
@@ -370,12 +355,10 @@ int daObjCrope_c::execute() {
     return 1;
 }
 
-/* 80BCE99C-80BCE9BC 001D3C 0020+00 1/0 0/0 0/0 .text daObjCrope_Execute__FP12daObjCrope_c */
 static int daObjCrope_Execute(daObjCrope_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BCE9BC-80BCEA5C 001D5C 00A0+00 1/1 0/0 0/0 .text            draw__12daObjCrope_cFv */
 int daObjCrope_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     mLineMat.update(100, 5.0f, color, 0, &tevStr);
@@ -383,13 +366,10 @@ int daObjCrope_c::draw() {
     return 1;
 }
 
-/* 80BCEA5C-80BCEA7C 001DFC 0020+00 1/0 0/0 0/0 .text            daObjCrope_Draw__FP12daObjCrope_c
- */
 static int daObjCrope_Draw(daObjCrope_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BCEB80-80BCEBA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCrope_Method */
 static actor_method_class l_daObjCrope_Method = {
     (process_method_func)daObjCrope_Create,
     (process_method_func)daObjCrope_Delete,
@@ -398,7 +378,6 @@ static actor_method_class l_daObjCrope_Method = {
     (process_method_func)daObjCrope_Draw,
 };
 
-/* 80BCEBA0-80BCEBD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Crope */
 extern actor_process_profile_definition g_profile_Obj_Crope = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp
index b183c731c4..3c8b4cf25c 100644
--- a/src/d/actor/d_a_obj_crvfence.cpp
+++ b/src/d/actor/d_a_obj_crvfence.cpp
@@ -28,10 +28,8 @@ enum Action {
     /* 0x1 */ ACTION_BROKEN,
 };
 
-/* 80BD0260-80BD0264 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "CrvFence";
 
-/* 80BCEC98-80BCED24 000078 008C+00 2/2 0/0 0/0 .text            CheckVec__15daObjCRVFENCE_cFv */
 BOOL daObjCRVFENCE_c::CheckVec() {
     cXyz vec(fopAcM_GetPosition((fopAc_ac_c*)daPy_getPlayerActorClass()));
     Mtx mtx;
@@ -42,7 +40,6 @@ BOOL daObjCRVFENCE_c::CheckVec() {
     return vec.z > 0.0f;
 }
 
-/* 80BCED60-80BCEE1C 000140 00BC+00 1/1 0/0 0/0 .text Wall_Check__15daObjCRVFENCE_cF4cXyz4cXyz */
 BOOL daObjCRVFENCE_c::Wall_Check(cXyz i_start, cXyz param_2) {
     dBgS_LinChk lin_chk;
     cXyz i_end(i_start.x + param_2.x, i_start.y, i_start.z + param_2.z);
@@ -55,18 +52,15 @@ BOOL daObjCRVFENCE_c::Wall_Check(cXyz i_start, cXyz param_2) {
     return FALSE;
 }
 
-/* 80BCEE1C-80BCEE3C 0001FC 0020+00 1/0 0/0 0/0 .text daObjCRVFENCE_Create__FP10fopAc_ac_c */
 static int daObjCRVFENCE_Create(fopAc_ac_c* a_this) {
     return static_cast<daObjCRVFENCE_c*>(a_this)->create();
 }
 
-/* 80BCEE3C-80BCEE60 00021C 0024+00 1/0 0/0 0/0 .text daObjCRVFENCE_Delete__FP15daObjCRVFENCE_c */
 static int daObjCRVFENCE_Delete(daObjCRVFENCE_c* a_this) {
     static_cast<daObjCRVFENCE_c*>(a_this)->MoveBGDelete();
     return 1;
 }
 
-/* 80BCEE60-80BCEED0 000240 0070+00 1/1 0/0 0/0 .text            BgRelease__15daObjCRVFENCE_cFv */
 void daObjCRVFENCE_c::BgRelease() {
     if (mpBgW != NULL) {
         if (mpBgW->ChkUsed() && dComIfG_Bgsp().Release(mpBgW)) {
@@ -75,14 +69,12 @@ void daObjCRVFENCE_c::BgRelease() {
     }
 }
 
-/* 80BCEED0-80BCEF30 0002B0 0060+00 1/1 0/0 0/0 .text            PosSet__15daObjCRVFENCE_cFP4cXyz */
 void daObjCRVFENCE_c::PosSet(cXyz* pos) {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mDoMtx_stack_c::multVec(pos, pos);
 }
 
-/* 80BCEF30-80BCF0B0 000310 0180+00 1/1 0/0 0/0 .text            FenceMove__15daObjCRVFENCE_cFRUcP4cXyzP5csXyzP4cXyzRs */
 void daObjCRVFENCE_c::FenceMove(u8& param_1, cXyz* param_2, csXyz* param_3, cXyz* param_4, s16& param_5) {
     if (param_1 <= 3) {
         f32 fVar1 = 20.0f;
@@ -111,7 +103,6 @@ void daObjCRVFENCE_c::FenceMove(u8& param_1, cXyz* param_2, csXyz* param_3, cXyz
     }
 }
 
-/* 80BCF0B0-80BCF390 000490 02E0+00 1/1 0/0 0/0 .text            BrokenAction__15daObjCRVFENCE_cFv */
 void daObjCRVFENCE_c::BrokenAction() {
     switch (field_0x5a0) {
         case 0:
@@ -170,7 +161,6 @@ void daObjCRVFENCE_c::BrokenAction() {
     }
 }
 
-/* 80BCF390-80BCF404 000770 0074+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_searchActorDistance((fopAc_ac_c*)i_data, (fopAc_ac_c*)i_actor) < 600.0f && fopAcM_GetName(i_actor) == PROC_E_WB) {
         return i_actor;
@@ -179,7 +169,6 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80BCF404-80BCF7DC 0007E4 03D8+00 1/1 0/0 0/0 .text            NormalAction__15daObjCRVFENCE_cFv */
 void daObjCRVFENCE_c::NormalAction() {
     if (!field_0x5f4) {
         e_wb_class* wb_p = (e_wb_class*)fpcM_Search(s_obj_sub, this);
@@ -233,7 +222,6 @@ void daObjCRVFENCE_c::NormalAction() {
     }
 }
 
-/* 80BCF7DC-80BCF860 000BBC 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjCRVFENCE_cFP4cXyz */
 bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) {
     Vec sp24;
     mDoLib_project(param_1, &sp24);
@@ -269,7 +257,6 @@ bool daObjCRVFENCE_c::checkViewArea(cXyz* param_1) {
     return rv;
 }
 
-/* 80BCF860-80BCF8A4 000C40 0044+00 1/1 0/0 0/0 .text            Action__15daObjCRVFENCE_cFv */
 void daObjCRVFENCE_c::Action() {
     switch (mAction) {
         case ACTION_NORMAL:
@@ -282,7 +269,6 @@ void daObjCRVFENCE_c::Action() {
     }
 }
 
-/* 80BCF8A4-80BCF998 000C84 00F4+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjCRVFENCE_cFv */
 void daObjCRVFENCE_c::setBaseMtx() {
     mDoMtx_stack_c::transS(field_0x5ac);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -302,17 +288,14 @@ void daObjCRVFENCE_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BCF998-80BCF9C4 000D78 002C+00 1/0 0/0 0/0 .text daObjCRVFENCE_Draw__FP15daObjCRVFENCE_c */
 static int daObjCRVFENCE_Draw(daObjCRVFENCE_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BCF9C4-80BCF9E4 000DA4 0020+00 2/1 0/0 0/0 .text daObjCRVFENCE_Execute__FP15daObjCRVFENCE_c */
 static int daObjCRVFENCE_Execute(daObjCRVFENCE_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BCF9E4-80BCFAE4 000DC4 0100+00 1/0 0/0 0/0 .text            CreateHeap__15daObjCRVFENCE_cFv */
 int daObjCRVFENCE_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanFence.bmd");
 
@@ -340,7 +323,6 @@ int daObjCRVFENCE_c::CreateHeap() {
     return 1;
 }
 
-/* 80BCFAE4-80BCFD6C 000EC4 0288+00 1/1 0/0 0/0 .text            create__15daObjCRVFENCE_cFv */
 cPhs__Step daObjCRVFENCE_c::create() {
     fopAcM_ct(this, daObjCRVFENCE_c);
 
@@ -390,18 +372,15 @@ cPhs__Step daObjCRVFENCE_c::create() {
     return phase;
 }
 
-/* 80BCFFC0-80BCFFC8 0013A0 0008+00 1/0 0/0 0/0 .text            daObjCRVFENCE_IsDelete__FP15daObjCRVFENCE_c */
 static int daObjCRVFENCE_IsDelete(daObjCRVFENCE_c* i_this) {
     return 1;
 }
 
-/* 80BCFFC8-80BD000C 0013A8 0044+00 1/0 0/0 0/0 .text            Create__15daObjCRVFENCE_cFv */
 int daObjCRVFENCE_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BD000C-80BD0058 0013EC 004C+00 1/0 0/0 0/0 .text Execute__15daObjCRVFENCE_cFPPA3_A4_f */
 int daObjCRVFENCE_c::Execute(Mtx** mtx) {
     Action();
     *mtx = &mBgMtx;
@@ -409,7 +388,6 @@ int daObjCRVFENCE_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 80BD0058-80BD013C 001438 00E4+00 1/0 0/0 0/0 .text            Draw__15daObjCRVFENCE_cFv */
 int daObjCRVFENCE_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
 
@@ -432,13 +410,11 @@ int daObjCRVFENCE_c::Draw() {
     return 1;
 }
 
-/* 80BD013C-80BD0170 00151C 0034+00 1/0 0/0 0/0 .text            Delete__15daObjCRVFENCE_cFv */
 int daObjCRVFENCE_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BD0264-80BD0284 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVFENCE_Method */
 static actor_method_class l_daObjCRVFENCE_Method = {
     (process_method_func)daObjCRVFENCE_Create,
     (process_method_func)daObjCRVFENCE_Delete,
@@ -447,7 +423,6 @@ static actor_method_class l_daObjCRVFENCE_Method = {
     (process_method_func)daObjCRVFENCE_Draw,
 };
 
-/* 80BD0284-80BD02B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVFENCE */
 extern actor_process_profile_definition g_profile_Obj_CRVFENCE = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp
index 75796017ef..98072faa6c 100644
--- a/src/d/actor/d_a_obj_crvgate.cpp
+++ b/src/d/actor/d_a_obj_crvgate.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_crvgate.h"
 #include "d/d_s_play.h"
 
-/* 80BD30C0-80BD3100 000000 0040+00 12/12 0/0 0/0 .rodata          ccCylSrc$3774 */
 const static dCcD_SrcSph ccSphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x13}, {0x100000, 0x1F}, 0x75}},  // mObj
@@ -21,17 +20,12 @@ const static dCcD_SrcSph ccSphSrc = {
     }  // mSphAttr
 };
 
-/* 80BD31F4-80BD31F8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "CrvGate";
 
-/* 80BD32B8-80BD32BC 000000 0002+02 1/1 0/0 0/0 .bss s_CoCount__29@unnamed@d_a_obj_crvgate_cpp@
- */
 namespace {
 static u16 s_CoCount = 0;
 }
 
-/* 80BD0398-80BD0500 000078 0168+00 1/1 0/0 0/0 .text            initCcCylinder__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::initCcCylinder() {
     mStts.Init(0xff, 0xff, this);
 
@@ -55,8 +49,6 @@ void daObjCRVGATE_c::initCcCylinder() {
     mSph[2].SetC(mXyzSph[2]);
 }
 
-/* 80BD0500-80BD0658 0001E0 0158+00 1/1 0/0 0/0 .text            setCcCylinder__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::setCcCylinder() {
     for (int i = 0; i < 3; i++) {
         mDoMtx_stack_c::transS(current.pos);
@@ -76,22 +68,18 @@ void daObjCRVGATE_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mSph[2]);
 }
 
-/* 80BD0658-80BD0678 000338 0020+00 1/0 0/0 0/0 .text            daObjCRVGATE_Create__FP10fopAc_ac_c
- */
 static int daObjCRVGATE_Create(fopAc_ac_c* i_this) {
     daObjCRVGATE_c* a_this = (daObjCRVGATE_c*)i_this;
     fpc_ProcID _ = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
-/* 80BD0678-80BD069C 000358 0024+00 1/0 0/0 0/0 .text daObjCRVGATE_Delete__FP14daObjCRVGATE_c */
 static int daObjCRVGATE_Delete(daObjCRVGATE_c* i_this) {
     fpc_ProcID _ = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BD069C-80BD0844 00037C 01A8+00 1/1 0/0 0/0 .text            checkOpen__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::checkOpen() {
     if (dComIfGs_getKeyNum() == 0) {
         return 0;
@@ -111,7 +99,6 @@ int daObjCRVGATE_c::checkOpen() {
     }
 }
 
-/* 80BD0880-80BD0978 000560 00F8+00 1/1 0/0 0/0 .text actionStartEvent__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::actionStartEvent() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     dCamera_c* camera_body = dCam_getBody();
@@ -133,8 +120,6 @@ void daObjCRVGATE_c::actionStartEvent() {
     }
 }
 
-/* 80BD0978-80BD0A64 000658 00EC+00 1/1 0/0 0/0 .text            actionWaitEvent__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::actionWaitEvent() {
     if (eventInfo.checkCommandDoor()) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -156,7 +141,6 @@ void daObjCRVGATE_c::actionWaitEvent() {
     }
 }
 
-/* 80BD0A64-80BD0B7C 000744 0118+00 1/1 0/0 0/0 .text            Demo_Set__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::Demo_Set() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* player_pos = &fopAcM_GetPosition(player);
@@ -170,13 +154,10 @@ void daObjCRVGATE_c::Demo_Set() {
     mCamCenter.set(current.pos.x, current.pos.y + 200.0f, current.pos.z);
 }
 
-/* 80BD0B7C-80BD0B88 00085C 000C+00 2/2 0/0 0/0 .text            SetOpen__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::SetOpen() {
     mStatus = 0x0;
 }
 
-/* 80BD0B88-80BD0D28 000868 01A0+00 1/1 0/0 0/0 .text            actionDemoEvent__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::actionDemoEvent() {
     if (!mFlagDemoEventPlay) {
         mPosAccel.y += -5.0f;
@@ -207,8 +188,6 @@ void daObjCRVGATE_c::actionDemoEvent() {
     }
 }
 
-/* 80BD0D28-80BD0D90 000A08 0068+00 1/1 0/0 0/0 .text            event_proc_call__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::event_proc_call() {
     switch (mEventID) {
     case 0:
@@ -226,7 +205,6 @@ void daObjCRVGATE_c::event_proc_call() {
     }
 }
 
-/* 80BD0D90-80BD0E1C 000A70 008C+00 1/1 0/0 0/0 .text            CheckVec__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::CheckVec() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* player_pos = &fopAcM_GetPosition(player);
@@ -245,7 +223,6 @@ int daObjCRVGATE_c::CheckVec() {
     }
 }
 
-/* 80BD0E1C-80BD0F9C 000AFC 0180+00 1/1 0/0 0/0 .text            KeyVib__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::KeyVib() {
     mMoveAngle.x -= (s16)0x21;
     mMoveAngle.z += mMoveAngle.x;
@@ -271,7 +248,6 @@ void daObjCRVGATE_c::KeyVib() {
     }
 }
 
-/* 80BD0F9C-80BD10C0 000C7C 0124+00 1/1 0/0 0/0 .text            DoorVib__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::DoorVib() {
     mDoorVib.y -= (s16)(KREG_S(1) + 0x100);
     mDoorVib.z += mDoorVib.y;
@@ -288,14 +264,11 @@ void daObjCRVGATE_c::DoorVib() {
     }
 }
 
-/* 80BD10C0-80BD10D0 000DA0 0010+00 1/1 0/0 0/0 .text            VibStop__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::VibStop() {
     mDoorVib.y = 0;
     mDoorVib.x = 0;
 }
 
-/* 80BD10D0-80BD1110 000DB0 0040+00 1/1 0/0 0/0 .text            CloseVibration__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::CloseVibration() {
     if (mStatus != 0x4) {
         KeyVib();
@@ -303,17 +276,14 @@ void daObjCRVGATE_c::CloseVibration() {
     DoorVib();
 }
 
-/* 80BD315C-80BD3160 00009C 0004+00 0/2 0/0 0/0 .rodata          @4086           UNUSED */
 static f32 dummyFloat1() {
     return 350.0f;
 }
 
-/* 80BD3160-80BD3164 0000A0 0004+00 0/2 0/0 0/0 .rodata          @4087          UNUSED */
 static f32 dummyFloat2() {
     return 120.0f;
 }
 
-/* 80BD1110-80BD18E0 000DF0 07D0+00 2/2 0/0 0/0 .text            CloseAction__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::CloseAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* player_pos = &fopAcM_GetPosition(player);
@@ -424,7 +394,6 @@ void daObjCRVGATE_c::CloseAction() {
     }
 }
 
-/* 80BD18E0-80BD21E4 0015C0 0904+00 1/1 0/0 0/0 .text            OpenAction__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::OpenAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz* player_pos = &fopAcM_GetPosition(player);
@@ -573,7 +542,6 @@ void daObjCRVGATE_c::OpenAction() {
     }
 }
 
-/* 80BD21E4-80BD22C8 001EC4 00E4+00 1/1 0/0 0/0 .text            HakaiMotion__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::HakaiMotion() {
     if (mDoorAngle < -0x6000) {
         mDoorSwingTargetAngle = -0x6000 - (mDoorSwingTargetAngle + 0x6000);
@@ -595,7 +563,6 @@ void daObjCRVGATE_c::HakaiMotion() {
     }
 }
 
-/* 80BD22C8-80BD2338 001FA8 0070+00 1/1 0/0 0/0 .text            DoorAction__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::DoorAction() {
     switch (mStatus) {
     case 0:
@@ -617,18 +584,14 @@ void daObjCRVGATE_c::DoorAction() {
     }
 }
 
-/* 80BD3180-80BD3184 0000C0 0004+00 0/0 0/0 0/0 .rodata          @4671          UNUSED */
 static f32 const dummyFloat3() {
     return 50.0f;
 }
 
-/* 80BD3184-80BD3188 0000C4 0004+00 0/0 0/0 0/0 .rodata          @4672          UNUSED */
 static f32 const dummyFloat4() {
     return -10.0f;
 }
 
-/* 80BD2338-80BD245C 002018 0124+00 1/1 0/0 0/0 .text            B_CloseAction__14daObjCRVGATE_cFv
- */
 void daObjCRVGATE_c::B_CloseAction() {
     if (mDoorStep > 0x10) {
         cLib_chaseAngleS(&mDoorAngle, mDoorTargetAngle, mDoorStep);
@@ -646,7 +609,6 @@ void daObjCRVGATE_c::B_CloseAction() {
     }
 }
 
-/* 80BD245C-80BD2528 00213C 00CC+00 0/0 0/0 1/1 .text            SetB_Close__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::SetB_Close() {
     Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_GATE_CREAK, &current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
                              0);
@@ -669,7 +631,6 @@ void daObjCRVGATE_c::SetB_Close() {
     }
 }
 
-/* 80BD2528-80BD2624 002208 00FC+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::setBaseMtx() {
     cXyz local(0.0f, 0.0f, 35.0f);
     mDoMtx_stack_c::transS(mPos);
@@ -694,17 +655,14 @@ void daObjCRVGATE_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BD2624-80BD2650 002304 002C+00 1/0 0/0 0/0 .text daObjCRVGATE_Draw__FP14daObjCRVGATE_c */
 static int daObjCRVGATE_Draw(daObjCRVGATE_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BD2650-80BD2670 002330 0020+00 2/1 0/0 0/0 .text daObjCRVGATE_Execute__FP14daObjCRVGATE_c */
 static int daObjCRVGATE_Execute(daObjCRVGATE_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BD2670-80BD2758 002350 00E8+00 1/0 0/0 0/0 .text            CreateHeap__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::CreateHeap() {
     J3DModelData* model_data_gate =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanGate.bmd");
@@ -730,7 +688,6 @@ int daObjCRVGATE_c::CreateHeap() {
     return 1;
 }
 
-/* 80BD2758-80BD28C0 002438 0168+00 1/1 0/0 0/0 .text            SetDoor__14daObjCRVGATE_cFv */
 void daObjCRVGATE_c::SetDoor() {
     cXyz child_pos(current.pos.x + cM_scos(shape_angle.y) * 700.0f, current.pos.y,
                    current.pos.z - cM_ssin(shape_angle.y) * 700.0f);
@@ -758,7 +715,6 @@ void daObjCRVGATE_c::SetDoor() {
     }
 }
 
-/* 80BD28C0-80BD2BE4 0025A0 0324+00 1/1 0/0 0/0 .text            create__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::create() {
     fopAcM_ct(this, daObjCRVGATE_c);
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -813,20 +769,15 @@ int daObjCRVGATE_c::create() {
     return phase;
 }
 
-/* 80BD2E80-80BD2E88 002B60 0008+00 1/0 0/0 0/0 .text daObjCRVGATE_IsDelete__FP14daObjCRVGATE_c
- */
 static int daObjCRVGATE_IsDelete(daObjCRVGATE_c* i_this) {
     return 1;
 }
 
-/* 80BD2E88-80BD2ECC 002B68 0044+00 1/0 0/0 0/0 .text            Create__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BD2ECC-80BD2FB8 002BAC 00EC+00 1/0 0/0 0/0 .text Execute__14daObjCRVGATE_cFPPA3_A4_f
- */
 int daObjCRVGATE_c::Execute(Mtx** param_0) {
     s_CoCount = 0;
 
@@ -855,7 +806,6 @@ int daObjCRVGATE_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BD2FB8-80BD3074 002C98 00BC+00 1/0 0/0 0/0 .text            Draw__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::Draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModelGate, &tevStr);
@@ -873,20 +823,17 @@ int daObjCRVGATE_c::Draw() {
     return 1;
 }
 
-/* 80BD3074-80BD30A8 002D54 0034+00 1/0 0/0 0/0 .text            Delete__14daObjCRVGATE_cFv */
 int daObjCRVGATE_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80BD31F8-80BD3218 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVGATE_Method */
 static actor_method_class l_daObjCRVGATE_Method = {
     (process_method_func)daObjCRVGATE_Create,  (process_method_func)daObjCRVGATE_Delete,
     (process_method_func)daObjCRVGATE_Execute, (process_method_func)daObjCRVGATE_IsDelete,
     (process_method_func)daObjCRVGATE_Draw,
 };
 
-/* 80BD3218-80BD3248 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVGATE */
 extern actor_process_profile_definition g_profile_Obj_CRVGATE = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp
index f0e40a0b18..10adfceebf 100644
--- a/src/d/actor/d_a_obj_crvhahen.cpp
+++ b/src/d/actor/d_a_obj_crvhahen.cpp
@@ -7,7 +7,6 @@
 
 #include "d/actor/d_a_obj_crvhahen.h"
 
-/* 80BD4064-80BD4068 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "CrvFence";
 
 inline int daObjCRVHAHEN_c::CreateHeap() {
@@ -23,24 +22,19 @@ inline int daObjCRVHAHEN_c::CreateHeap() {
     return 1;
 }
 
-/* 80BD3338-80BD33E8 000078 00B0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daObjCRVHAHEN_c*)i_this)->CreateHeap();
 }
 
-/* 80BD33E8-80BD3408 000128 0020+00 1/0 0/0 0/0 .text daObjCRVHAHEN_Create__FP10fopAc_ac_c */
 static int daObjCRVHAHEN_Create(fopAc_ac_c* i_this) {
     static_cast<daObjCRVHAHEN_c*>(i_this)->create();
 }
 
-/* 80BD3408-80BD342C 000148 0024+00 1/0 0/0 0/0 .text daObjCRVHAHEN_Delete__FP15daObjCRVHAHEN_c */
 static int daObjCRVHAHEN_Delete(daObjCRVHAHEN_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80BD342C-80BD3628 00016C 01FC+00 0/0 0/0 2/2 .text
- * HahenSet__15daObjCRVHAHEN_cF4cXyz4cXyz4cXyz4cXyzf            */
 int daObjCRVHAHEN_c::HahenSet(cXyz i_param_1, cXyz i_param_2, cXyz i_param_3, cXyz i_param_4,
                               f32 duration) {
     mDrawHahen = true;
@@ -68,7 +62,6 @@ int daObjCRVHAHEN_c::HahenSet(cXyz i_param_1, cXyz i_param_2, cXyz i_param_3, cX
     return 1;
 }
 
-/* 80BD3628-80BD36E4 000368 00BC+00 1/1 0/0 0/0 .text Wall_Check__15daObjCRVHAHEN_cF4cXyz4cXyz */
 bool daObjCRVHAHEN_c::Wall_Check(cXyz i_origin, cXyz i_target) {
     dBgS_LinChk line_check;
 
@@ -86,8 +79,6 @@ bool daObjCRVHAHEN_c::Wall_Check(cXyz i_origin, cXyz i_target) {
     return did_line_cross;
 }
 
-/* 80BD3720-80BD38DC 000460 01BC+00 1/1 0/0 0/0 .text            Hahen_Hakai__15daObjCRVHAHEN_cFii
- */
 void daObjCRVHAHEN_c::Hahen_Hakai(int i_start, int i_end) {
     for (int i = i_start; i < i_end; ++i) {
         if (mStatus[i] > 3) {
@@ -128,7 +119,6 @@ void daObjCRVHAHEN_c::Hahen_Hakai(int i_start, int i_end) {
     }
 }
 
-/* 80BD38DC-80BD3A9C 00061C 01C0+00 1/1 0/0 0/0 .text            CheckCull__15daObjCRVHAHEN_cFv */
 void daObjCRVHAHEN_c::CheckCull() {
     daPy_py_c* player_actor = daPy_getPlayerActorClass();
     cXyz& player_pos = fopAcM_GetPosition((fopAc_ac_c*)player_actor);
@@ -144,7 +134,6 @@ void daObjCRVHAHEN_c::CheckCull() {
     }
 }
 
-/* 80BD3A9C-80BD3B20 0007DC 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjCRVHAHEN_cFP4cXyz */
 bool daObjCRVHAHEN_c::checkViewArea(cXyz* i_this) {
     Vec proj;
     mDoLib_project(i_this, &proj);
@@ -158,7 +147,6 @@ bool daObjCRVHAHEN_c::checkViewArea(cXyz* i_this) {
     return ret;
 }
 
-/* 80BD3B20-80BD3B74 000860 0054+00 1/1 0/0 0/0 .text            Execute__15daObjCRVHAHEN_cFv */
 int daObjCRVHAHEN_c::Execute() {
     if (mDrawHahen) {
         daObjCRVHAHEN_c::Hahen_Hakai(0, 10);
@@ -170,7 +158,6 @@ int daObjCRVHAHEN_c::Execute() {
     return 1;
 }
 
-/* 80BD3B74-80BD3C0C 0008B4 0098+00 1/1 0/0 0/0 .text            Delete__15daObjCRVHAHEN_cFv */
 int daObjCRVHAHEN_c::Delete() {
     if (mInitialized) {
         J3DModelData* model_data = (J3DModelData*)dRes_control_c::getRes(
@@ -183,7 +170,6 @@ int daObjCRVHAHEN_c::Delete() {
     return 1;
 }
 
-/* 80BD3C0C-80BD3CA0 00094C 0094+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjCRVHAHEN_cFv */
 void daObjCRVHAHEN_c::setBaseMtx() {
     for (int i = 0; i < 10; i++) {
         mDoMtx_stack_c::transS(mPos[i]);
@@ -214,17 +200,14 @@ inline int daObjCRVHAHEN_c::Draw() {
     return 1;
 }
 
-/* 80BD3CA0-80BD3D9C 0009E0 00FC+00 1/0 0/0 0/0 .text daObjCRVHAHEN_Draw__FP15daObjCRVHAHEN_c */
 static int daObjCRVHAHEN_Draw(daObjCRVHAHEN_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BD3D9C-80BD3DBC 000ADC 0020+00 2/1 0/0 0/0 .text daObjCRVHAHEN_Execute__FP15daObjCRVHAHEN_c */
 static int daObjCRVHAHEN_Execute(daObjCRVHAHEN_c* i_this) {
     i_this->Execute();
 }
 
-/* 80BD3DBC-80BD3F9C 000AFC 01E0+00 1/1 0/0 0/0 .text            create__15daObjCRVHAHEN_cFv */
 int daObjCRVHAHEN_c::create() {
     fopAcM_ct(this, daObjCRVHAHEN_c);
 
@@ -249,20 +232,16 @@ int daObjCRVHAHEN_c::create() {
     return phase_state;
 }
 
-/* 80BD3FE0-80BD3FE8 000D20 0008+00 1/0 0/0 0/0 .text daObjCRVHAHEN_IsDelete__FP15daObjCRVHAHEN_c */
 static int daObjCRVHAHEN_IsDelete(daObjCRVHAHEN_c* i_this) {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80BD4068-80BD4088 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVHAHEN_Method */
 static actor_method_class l_daObjCRVHAHEN_Method = {
     (process_method_func)daObjCRVHAHEN_Create,  (process_method_func)daObjCRVHAHEN_Delete,
     (process_method_func)daObjCRVHAHEN_Execute, (process_method_func)daObjCRVHAHEN_IsDelete,
     (process_method_func)daObjCRVHAHEN_Draw,
 };
 
-/* 80BD4088-80BD40B8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVHAHEN */
 extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp
index e110dfaa7f..f8d498da82 100644
--- a/src/d/actor/d_a_obj_crvlh_down.cpp
+++ b/src/d/actor/d_a_obj_crvlh_down.cpp
@@ -13,11 +13,8 @@
 #include "d/d_cc_uty.h"
 #include "d/d_s_play.h"
 
-/* 80BD4DC4-80BD4DC8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "CrvLH_Dw";
 
-/* 80BD4138-80BD41A4 000078 006C+00 1/1 0/0 0/0 .text            initCcCylinder__15daObjCRVLH_DW_cFv
- */
 void daObjCRVLH_DW_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -40,7 +37,6 @@ void daObjCRVLH_DW_c::initCcCylinder() {
     mCyl.OnTgIronBallRebound();
 }
 
-/* 80BD41A4-80BD4224 0000E4 0080+00 1/1 0/0 0/0 .text            SetCcSyl__15daObjCRVLH_DW_cFv */
 void daObjCRVLH_DW_c::SetCcSyl() {
     cXyz cStack_18 = current.pos;
 
@@ -50,20 +46,17 @@ void daObjCRVLH_DW_c::SetCcSyl() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80BD4224-80BD4244 000164 0020+00 1/0 0/0 0/0 .text daObjCRVLH_DW_Create__FP10fopAc_ac_c */
 static int daObjCRVLH_DW_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return ((daObjCRVLH_DW_c*)i_this)->create();
 }
 
-/* 80BD4244-80BD4268 000184 0024+00 1/0 0/0 0/0 .text daObjCRVLH_DW_Delete__FP15daObjCRVLH_DW_c */
 static int daObjCRVLH_DW_Delete(daObjCRVLH_DW_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BD4268-80BD42D8 0001A8 0070+00 1/1 0/0 0/0 .text            BgRelease__15daObjCRVLH_DW_cFv */
 void daObjCRVLH_DW_c::BgRelease() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         if (dComIfG_Bgsp().Release(mpBgW)) {
@@ -72,7 +65,6 @@ void daObjCRVLH_DW_c::BgRelease() {
     }
 }
 
-/* 80BD42D8-80BD45A4 000218 02CC+00 1/1 0/0 0/0 .text            Break__15daObjCRVLH_DW_cFv */
 void daObjCRVLH_DW_c::Break() {
     fopAc_ac_c* local_30;
     csXyz cStack_2c(0, fopAcM_searchPlayerAngleY(this) + 0x8000, 0);
@@ -96,7 +88,6 @@ void daObjCRVLH_DW_c::Break() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_YAGURA_BREAK, 0);
 }
 
-/* 80BD45A4-80BD4644 0004E4 00A0+00 1/1 0/0 0/0 .text            Obj_Hit__15daObjCRVLH_DW_cFv */
 void daObjCRVLH_DW_c::Obj_Hit() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -118,7 +109,6 @@ void daObjCRVLH_DW_c::Obj_Hit() {
     }
 }
 
-/* 80BD4644-80BD46A0 000584 005C+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjCRVLH_DW_cFv */
 void daObjCRVLH_DW_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -126,18 +116,14 @@ void daObjCRVLH_DW_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BD46A0-80BD46CC 0005E0 002C+00 1/0 0/0 0/0 .text daObjCRVLH_DW_Draw__FP15daObjCRVLH_DW_c */
 static int daObjCRVLH_DW_Draw(daObjCRVLH_DW_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BD46CC-80BD46EC 00060C 0020+00 2/1 0/0 0/0 .text daObjCRVLH_DW_Execute__FP15daObjCRVLH_DW_c
- */
 static int daObjCRVLH_DW_Execute(daObjCRVLH_DW_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BD46EC-80BD4764 00062C 0078+00 1/0 0/0 0/0 .text            CreateHeap__15daObjCRVLH_DW_cFv */
 int daObjCRVLH_DW_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvLH_Down.bmd");
     if (modelData == NULL) {
@@ -148,7 +134,6 @@ int daObjCRVLH_DW_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80BD4764-80BD49EC 0006A4 0288+00 1/1 0/0 0/0 .text            create__15daObjCRVLH_DW_cFv */
 int daObjCRVLH_DW_c::create() {
     fopAcM_ct(this, daObjCRVLH_DW_c);
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
@@ -196,19 +181,15 @@ int daObjCRVLH_DW_c::create() {
     return phase;
 }
 
-/* 80BD4A7C-80BD4A84 0009BC 0008+00 1/0 0/0 0/0 .text daObjCRVLH_DW_IsDelete__FP15daObjCRVLH_DW_c
- */
 static int daObjCRVLH_DW_IsDelete(daObjCRVLH_DW_c* i_this) {
     return 1;
 }
 
-/* 80BD4A84-80BD4AC8 0009C4 0044+00 1/0 0/0 0/0 .text            Create__15daObjCRVLH_DW_cFv */
 int daObjCRVLH_DW_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BD4AC8-80BD4C44 000A08 017C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_DW_cFPPA3_A4_f */
 int daObjCRVLH_DW_c::Execute(Mtx** param_0) {
     fopAc_ac_c* local_78;
     if (field_0x5bb != 0) {
@@ -237,7 +218,6 @@ int daObjCRVLH_DW_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BD4C44-80BD4CC8 000B84 0084+00 1/0 0/0 0/0 .text            Draw__15daObjCRVLH_DW_cFv */
 int daObjCRVLH_DW_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -246,20 +226,17 @@ int daObjCRVLH_DW_c::Draw() {
     return 1;
 }
 
-/* 80BD4CC8-80BD4CFC 000C08 0034+00 1/0 0/0 0/0 .text            Delete__15daObjCRVLH_DW_cFv */
 int daObjCRVLH_DW_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BD4DC8-80BD4DE8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVLH_DW_Method */
 static actor_method_class l_daObjCRVLH_DW_Method = {
     (process_method_func)daObjCRVLH_DW_Create,  (process_method_func)daObjCRVLH_DW_Delete,
     (process_method_func)daObjCRVLH_DW_Execute, (process_method_func)daObjCRVLH_DW_IsDelete,
     (process_method_func)daObjCRVLH_DW_Draw,
 };
 
-/* 80BD4DE8-80BD4E18 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVLH_DW */
 extern actor_process_profile_definition g_profile_Obj_CRVLH_DW = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp
index d72ef72b55..faeb027cd5 100644
--- a/src/d/actor/d_a_obj_crvlh_up.cpp
+++ b/src/d/actor/d_a_obj_crvlh_up.cpp
@@ -9,23 +9,18 @@
 #include "d/actor/d_a_obj_crvlh_up.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
-/* 80BD4ED8-80BD4EF8 000078 0020+00 1/0 0/0 0/0 .text daObjCRVLH_UP_Create__FP10fopAc_ac_c */
 static int daObjCRVLH_UP_Create(fopAc_ac_c* i_this) {
     return ((daObjCRVLH_UP_c*)i_this)->create();
 }
 
-/* 80BD4EF8-80BD4F1C 000098 0024+00 1/0 0/0 0/0 .text daObjCRVLH_UP_Delete__FP15daObjCRVLH_UP_c */
 static int daObjCRVLH_UP_Delete(daObjCRVLH_UP_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BD5A9C-80BD5AA0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "CrvLH_Up";
 
-/* 80BD4F1C-80BD4FB0 0000BC 0094+00 0/0 0/0 1/1 .text            HakaiSet__15daObjCRVLH_UP_cFv */
 void daObjCRVLH_UP_c::HakaiSet() {
     fopAcM_GetPosition(daPy_getPlayerActorClass());
     field_0x5db = 1;
@@ -38,14 +33,12 @@ void daObjCRVLH_UP_c::HakaiSet() {
     field_0x5d6 = cM_rndFX(16000.0f);
 }
 
-/* 80BD4FB0-80BD4FD8 000150 0028+00 1/1 0/0 0/0 .text            UpMotion__15daObjCRVLH_UP_cFv */
 void daObjCRVLH_UP_c::UpMotion() {
     if (!(field_0x5dc < nREG_F(2) + -120.0f)) {
         field_0x5dc += -5.0f;
     }
 }
 
-/* 80BD4FD8-80BD5254 000178 027C+00 1/1 0/0 0/0 .text            Hakai__15daObjCRVLH_UP_cFv */
 void daObjCRVLH_UP_c::Hakai() {
     if (cLib_chaseAngleS(&shape_angle.x, 0x3800, field_0x5d8) != 0) {
         fopAcM_seStartCurrent(this, Z2SE_OBJ_YAGURA_LAND, 0);
@@ -72,7 +65,6 @@ void daObjCRVLH_UP_c::Hakai() {
     field_0x5d8 += nREG_F(1) + 148.0f;
 }
 
-/* 80BD5254-80BD532C 0003F4 00D8+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjCRVLH_UP_cFv */
 void daObjCRVLH_UP_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::transM(0.0f, field_0x5dc, 0.0f);
@@ -85,18 +77,14 @@ void daObjCRVLH_UP_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BD532C-80BD5358 0004CC 002C+00 1/0 0/0 0/0 .text daObjCRVLH_UP_Draw__FP15daObjCRVLH_UP_c */
 static int daObjCRVLH_UP_Draw(daObjCRVLH_UP_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BD5358-80BD5378 0004F8 0020+00 2/1 0/0 0/0 .text daObjCRVLH_UP_Execute__FP15daObjCRVLH_UP_c
- */
 static int daObjCRVLH_UP_Execute(daObjCRVLH_UP_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BD5378-80BD53F0 000518 0078+00 1/0 0/0 0/0 .text            CreateHeap__15daObjCRVLH_UP_cFv */
 int daObjCRVLH_UP_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvLH_UP.bmd");
     if (modelData == NULL) {
@@ -107,7 +95,6 @@ int daObjCRVLH_UP_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80BD53F0-80BD5614 000590 0224+00 1/1 0/0 0/0 .text            create__15daObjCRVLH_UP_cFv */
 int daObjCRVLH_UP_c::create() {
     fopAcM_ct(this, daObjCRVLH_UP_c);
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
@@ -143,19 +130,15 @@ int daObjCRVLH_UP_c::create() {
     return phase;
 }
 
-/* 80BD56E4-80BD56EC 000884 0008+00 1/0 0/0 0/0 .text daObjCRVLH_UP_IsDelete__FP15daObjCRVLH_UP_c
- */
 static int daObjCRVLH_UP_IsDelete(daObjCRVLH_UP_c* i_this) {
     return 1;
 }
 
-/* 80BD56EC-80BD5730 00088C 0044+00 1/0 0/0 0/0 .text            Create__15daObjCRVLH_UP_cFv */
 int daObjCRVLH_UP_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return 4;
 }
 
-/* 80BD5730-80BD593C 0008D0 020C+00 1/0 0/0 0/0 .text Execute__15daObjCRVLH_UP_cFPPA3_A4_f */
 int daObjCRVLH_UP_c::Execute(Mtx** param_0) {
     fopAc_ac_c* local_a4;
     fopAc_ac_c* local_a8;
@@ -196,7 +179,6 @@ int daObjCRVLH_UP_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BD593C-80BD59C0 000ADC 0084+00 1/0 0/0 0/0 .text            Draw__15daObjCRVLH_UP_cFv */
 int daObjCRVLH_UP_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -205,20 +187,17 @@ int daObjCRVLH_UP_c::Draw() {
     return 1;
 }
 
-/* 80BD59C0-80BD59F4 000B60 0034+00 1/0 0/0 0/0 .text            Delete__15daObjCRVLH_UP_cFv */
 int daObjCRVLH_UP_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BD5AA0-80BD5AC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVLH_UP_Method */
 static actor_method_class l_daObjCRVLH_UP_Method = {
     (process_method_func)daObjCRVLH_UP_Create,  (process_method_func)daObjCRVLH_UP_Delete,
     (process_method_func)daObjCRVLH_UP_Execute, (process_method_func)daObjCRVLH_UP_IsDelete,
     (process_method_func)daObjCRVLH_UP_Draw,
 };
 
-/* 80BD5AC0-80BD5AF0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVLH_UP */
 extern actor_process_profile_definition g_profile_Obj_CRVLH_UP = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp
index f58528ba22..36caeb4880 100644
--- a/src/d/actor/d_a_obj_crvsteel.cpp
+++ b/src/d/actor/d_a_obj_crvsteel.cpp
@@ -7,34 +7,27 @@
 
 #include "d/actor/d_a_obj_crvsteel.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80BD5BB8-80BD5BD8 000078 0020+00 1/0 0/0 0/0 .text daObjCRVSTEEL_Create__FP10fopAc_ac_c */
 static int daObjCRVSTEEL_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjCRVSTEEL_c*>(i_this)->create();
 }
 
-/* 80BD5BD8-80BD5BFC 000098 0024+00 1/0 0/0 0/0 .text daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c */
 static int daObjCRVSTEEL_Delete(daObjCRVSTEEL_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BD5BFC-80BD5C18 0000BC 001C+00 0/0 0/0 1/1 .text            OpenSet__15daObjCRVSTEEL_cFff */
 void daObjCRVSTEEL_c::OpenSet(f32 param_1, f32 param_2) {
     speed.y = param_1;
     mMaxHeight = current.pos.y + param_2;
     mAction = 1;
 }
 
-/* 80BD5C18-80BD5C28 0000D8 0010+00 0/0 0/0 1/1 .text            CloseSet__15daObjCRVSTEEL_cFf */
 void daObjCRVSTEEL_c::CloseSet(f32 param_1) {
     speed.y = param_1;
     mAction = 2;
 }
 
-/* 80BD5C28-80BD5CA0 0000E8 0078+00 1/1 0/0 0/0 .text            CloseExecute__15daObjCRVSTEEL_cFv
- */
 void daObjCRVSTEEL_c::CloseExecute() {
     current.pos.y += speed.y;
     if (current.pos.y < mMinHeight) {
@@ -44,7 +37,6 @@ void daObjCRVSTEEL_c::CloseExecute() {
     }
 }
 
-/* 80BD5CA0-80BD5CC8 000160 0028+00 1/1 0/0 0/0 .text            OpenExecute__15daObjCRVSTEEL_cFv */
 void daObjCRVSTEEL_c::OpenExecute() {
     current.pos.y += speed.y;
     if (current.pos.y > mMaxHeight) {
@@ -52,7 +44,6 @@ void daObjCRVSTEEL_c::OpenExecute() {
     }
 }
 
-/* 80BD5CC8-80BD5D10 000188 0048+00 1/1 0/0 0/0 .text            Action__15daObjCRVSTEEL_cFv */
 void daObjCRVSTEEL_c::Action() {
     switch(mAction) {
     case 0:
@@ -66,7 +57,6 @@ void daObjCRVSTEEL_c::Action() {
     }
 }
 
-/* 80BD5D10-80BD5D6C 0001D0 005C+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjCRVSTEEL_cFv */
 void daObjCRVSTEEL_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -74,21 +64,16 @@ void daObjCRVSTEEL_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BD5D6C-80BD5D98 00022C 002C+00 1/0 0/0 0/0 .text daObjCRVSTEEL_Draw__FP15daObjCRVSTEEL_c */
 static int daObjCRVSTEEL_Draw(daObjCRVSTEEL_c* i_this) {
    return i_this->Draw();
 }
 
-/* 80BD5D98-80BD5DB8 000258 0020+00 2/1 0/0 0/0 .text daObjCRVSTEEL_Execute__FP15daObjCRVSTEEL_c
- */
 static int daObjCRVSTEEL_Execute(daObjCRVSTEEL_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BD626C-80BD6270 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "CrvSteel";
 
-/* 80BD5DB8-80BD5E30 000278 0078+00 1/0 0/0 0/0 .text            CreateHeap__15daObjCRVSTEEL_cFv */
 int daObjCRVSTEEL_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvSteelGate.bmd");
     JUT_ASSERT(86, modelData != NULL);
@@ -96,7 +81,6 @@ int daObjCRVSTEEL_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BD5E30-80BD6030 0002F0 0200+00 1/1 0/0 0/0 .text            create__15daObjCRVSTEEL_cFv */
 int daObjCRVSTEEL_c::create() {
     fopAcM_ct(this, daObjCRVSTEEL_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -127,19 +111,15 @@ int daObjCRVSTEEL_c::create() {
     return rv;
 }
 
-/* 80BD60A0-80BD60A8 000560 0008+00 1/0 0/0 0/0 .text daObjCRVSTEEL_IsDelete__FP15daObjCRVSTEEL_c
- */
 static int daObjCRVSTEEL_IsDelete(daObjCRVSTEEL_c* param_0) {
     return 1;
 }
 
-/* 80BD60A8-80BD60EC 000568 0044+00 1/0 0/0 0/0 .text            Create__15daObjCRVSTEEL_cFv */
 int daObjCRVSTEEL_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BD60EC-80BD6138 0005AC 004C+00 1/0 0/0 0/0 .text Execute__15daObjCRVSTEEL_cFPPA3_A4_f */
 int daObjCRVSTEEL_c::Execute(Mtx** param_1) {
     Action();
     *param_1 = &mBgMtx;
@@ -147,7 +127,6 @@ int daObjCRVSTEEL_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BD6138-80BD61BC 0005F8 0084+00 1/0 0/0 0/0 .text            Draw__15daObjCRVSTEEL_cFv */
 int daObjCRVSTEEL_c::Draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -156,13 +135,11 @@ int daObjCRVSTEEL_c::Draw() {
     return 1;
 }
 
-/* 80BD61BC-80BD61F0 00067C 0034+00 1/0 0/0 0/0 .text            Delete__15daObjCRVSTEEL_cFv */
 int daObjCRVSTEEL_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80BD6270-80BD6290 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCRVSTEEL_Method */
 static actor_method_class l_daObjCRVSTEEL_Method = {
     (process_method_func)daObjCRVSTEEL_Create,
     (process_method_func)daObjCRVSTEEL_Delete,
@@ -171,7 +148,6 @@ static actor_method_class l_daObjCRVSTEEL_Method = {
     (process_method_func)daObjCRVSTEEL_Draw,
 };
 
-/* 80BD6290-80BD62C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_CRVSTEEL */
 extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp
index f10034da49..434a4e8a17 100644
--- a/src/d/actor/d_a_obj_crystal.cpp
+++ b/src/d/actor/d_a_obj_crystal.cpp
@@ -9,19 +9,16 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80BD6398-80BD63B8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjCrystal_c*>(i_this)->CreateHeap();
 }
 
-/* 80BD63B8-80BD6410 000098 0058+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjCrystal_cFv */
 void daObjCrystal_c::initBaseMtx() {
     mpModel[0]->setBaseScale(scale);
     mpModel[1]->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BD6410-80BD6470 0000F0 0060+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjCrystal_cFv */
 void daObjCrystal_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -30,10 +27,8 @@ void daObjCrystal_c::setBaseMtx() {
     mpModel[1]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BD68F0-80BD68F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_Suisho";
 
-/* 80BD6470-80BD65B0 000150 0140+00 1/1 0/0 0/0 .text            Create__14daObjCrystal_cFv */
 int daObjCrystal_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel[0]->getBaseTRMtx());
@@ -58,7 +53,6 @@ int daObjCrystal_c::Create() {
     return 1;
 }
 
-/* 80BD65B0-80BD6664 000290 00B4+00 1/1 0/0 0/0 .text            CreateHeap__14daObjCrystal_cFv */
 int daObjCrystal_c::CreateHeap() {
     static int const l_bmd[] = {4, 7};
     static u32 const l_diff_flag[] = {0, 0x80000};
@@ -76,7 +70,6 @@ int daObjCrystal_c::CreateHeap() {
     return 1;
 }
 
-/* 80BD6664-80BD6718 000344 00B4+00 1/1 0/0 0/0 .text            create__14daObjCrystal_cFv */
 int daObjCrystal_c::create() {
     fopAcM_ct(this, daObjCrystal_c);
 
@@ -94,13 +87,11 @@ int daObjCrystal_c::create() {
     return phase;
 }
 
-/* 80BD6718-80BD673C 0003F8 0024+00 1/1 0/0 0/0 .text            execute__14daObjCrystal_cFv */
 int daObjCrystal_c::execute() {
     setBaseMtx();
     return 1;
 }
 
-/* 80BD673C-80BD67C8 00041C 008C+00 1/1 0/0 0/0 .text            draw__14daObjCrystal_cFv */
 int daObjCrystal_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
 
@@ -112,7 +103,6 @@ int daObjCrystal_c::draw() {
     return 1;
 }
 
-/* 80BD67C8-80BD6834 0004A8 006C+00 1/1 0/0 0/0 .text            _delete__14daObjCrystal_cFv */
 int daObjCrystal_c::_delete() {
     if (mpEmitter != NULL) {
         mpEmitter->becomeInvalidEmitter();
@@ -124,35 +114,28 @@ int daObjCrystal_c::_delete() {
     return 1;
 }
 
-/* 80BD6834-80BD6854 000514 0020+00 1/0 0/0 0/0 .text daObjCrystal_Draw__FP14daObjCrystal_c */
 static int daObjCrystal_Draw(daObjCrystal_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BD6854-80BD6874 000534 0020+00 1/0 0/0 0/0 .text daObjCrystal_Execute__FP14daObjCrystal_c */
 static int daObjCrystal_Execute(daObjCrystal_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BD6874-80BD6894 000554 0020+00 1/0 0/0 0/0 .text daObjCrystal_Delete__FP14daObjCrystal_c */
 static int daObjCrystal_Delete(daObjCrystal_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BD6894-80BD68B4 000574 0020+00 1/0 0/0 0/0 .text daObjCrystal_Create__FP14daObjCrystal_c */
 static int daObjCrystal_Create(daObjCrystal_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80BD68F4-80BD6914 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjCrystal_Method */
 static actor_method_class l_daObjCrystal_Method = {
     (process_method_func)daObjCrystal_Create,  (process_method_func)daObjCrystal_Delete,
     (process_method_func)daObjCrystal_Execute, (process_method_func)NULL,
     (process_method_func)daObjCrystal_Draw,
 };
 
-/* 80BD6914-80BD6944 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Crystal */
 extern actor_process_profile_definition g_profile_Obj_Crystal = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp
index c472ee8905..69cffc731b 100644
--- a/src/d/actor/d_a_obj_cwall.cpp
+++ b/src/d/actor/d_a_obj_cwall.cpp
@@ -14,13 +14,11 @@
 #include "d/d_com_inf_game.h"
 #include "cmath.h"
 
-/* 80BD6A4C-80BD6A88 0000EC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjCwall_cFv */
 void daObjCwall_c::initBaseMtx() {
     mWallModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BD6A88-80BD6AEC 000128 0064+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjCwall_cFv */
 void daObjCwall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(field_0xf38);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -28,69 +26,56 @@ void daObjCwall_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BD9FA4-80BD9FAC 000000 0008+00 11/11 0/0 0/0 .rodata          l_wallBmd */
 static u32 const l_wallBmd[2] = {
     5, 5,
 };
 
-/* 80BD9FAC-80BD9FB4 000008 0008+00 0/1 0/0 0/0 .rodata          l_chainBmd */
 static u32 const l_chainBmd[2] = {
     4, 4,
 };
 
-/* 80BD9FB4-80BD9FBC 000010 0008+00 0/1 0/0 0/0 .rodata          l_handleBmd */
 static u32 const l_handleBmd[2] = {
     6, 6,
 };
 
-/* 80BD9FBC-80BD9FC4 000018 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static u32 const l_dzb[2] = {
     9, 9,
 };
 
-/* 80BD9FC4-80BD9FCC 000020 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[2] = {
     0x4600, 0x5F00,
 };
 
-/* 80BD9FCC-80BD9FD8 000028 000C+00 0/1 0/0 0/0 .rodata          l_top_co_offset */
 static Vec const l_top_co_offset = {
     0.0f, 0.0f, -600.0f,
 };
 
-/* 80BD9FD8-80BD9FE4 000034 000C+00 0/1 0/0 0/0 .rodata          l_check_min */
 static Vec const l_check_min = {
     -120.0f, 0.0f, -20.0f,
 };
 
-/* 80BD9FE4-80BD9FF0 000040 000C+00 0/1 0/0 0/0 .rodata          l_check_max */
 static Vec const l_check_max = {
     120.0f, 0.0f, 80.0f,
 };
 
-/* 80BD9FF0-80BD9FFC 00004C 000C+00 0/1 0/0 0/0 .rodata          l_check_min_wolf */
 static Vec const l_check_min_wolf = {
     -120.0f, 0.0f, 50.0f,
 };
 
-/* 80BD9FFC-80BDA008 000058 000C+00 0/1 0/0 0/0 .rodata          l_check_max_wolf */
 static Vec const l_check_max_wolf = {
     120.0f, 0.0f, 160.0f,
 };
 
-/* 80BDA0E0-80BDA0E8 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "P_Cwall",
     "P_L4Cwall",
 };
 
-/* 80BDA0E8-80BDA100 000028 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-300.0f, -100.0f, -650.0f},
     {300.0f, 500.0f, 300.0f},
 };
 
-/* 80BDA100-80BDA130 000040 0030+00 1/1 0/0 0/0 .data            l_side_co_offset */
 static Vec l_side_co_offset[4] = {
     {-255.0f, 0.0f, -30.0f},
     {-135.0f, 0.0f, -30.0f},
@@ -98,7 +83,6 @@ static Vec l_side_co_offset[4] = {
     {255.0f, 0.0f, -30.0f},
 };
 
-/* 80BDA130-80BDA174 000070 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x79}}, // mObj
@@ -113,7 +97,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80BDA174-80BDA1B8 0000B4 0044+00 0/1 0/0 0/0 .data            l_cyl_src2 */
 static dCcD_SrcCyl l_cyl_src2 = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x19}}, // mObj
@@ -128,7 +111,6 @@ static dCcD_SrcCyl l_cyl_src2 = {
     } // mCyl
 };
 
-/* 80BDA1B8-80BDA1F8 0000F8 0040+00 0/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x11}, 0x58}}, // mObj
@@ -141,7 +123,6 @@ static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80BD6AEC-80BD6CCC 00018C 01E0+00 1/0 0/0 0/0 .text            Create__12daObjCwall_cFv */
 int daObjCwall_c::Create() {
     field_0xf38 = current.pos;
     field_0xf0c = getArg0();
@@ -176,7 +157,6 @@ int daObjCwall_c::Create() {
     return 1;
 }
 
-/* 80BD6D08-80BD6E94 0003A8 018C+00 1/0 0/0 0/0 .text            CreateHeap__12daObjCwall_cFv */
 int daObjCwall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_wallBmd[mType]);
     JUT_ASSERT(573, modelData != NULL);
@@ -208,15 +188,12 @@ int daObjCwall_c::CreateHeap() {
     return 1;
 }
 
-/* 80BD6E94-80BD6ED0 000534 003C+00 1/1 0/0 0/0 .text            __dt__Q212daObjCwall_c7chain_sFv */
 daObjCwall_c::chain_s::~chain_s() {
 }
 
-/* 80BD6ED0-80BD6ED4 000570 0004+00 1/1 0/0 0/0 .text            __ct__Q212daObjCwall_c7chain_sFv */
 daObjCwall_c::chain_s::chain_s() {
 }
 
-/* 80BD6ED4-80BD6F80 000574 00AC+00 1/1 0/0 0/0 .text            create1st__12daObjCwall_cFv */
 int daObjCwall_c::create1st() {
     mType = getType();
     int rv = dComIfG_resLoad(&mPhase, l_arcName[mType]);
@@ -229,8 +206,6 @@ int daObjCwall_c::create1st() {
     return rv;
 }
 
-/* 80BD6F80-80BD7288 000620 0308+00 1/0 0/0 0/0 .text            Execute__12daObjCwall_cFPPA3_A4_f
- */
 int daObjCwall_c::Execute(Mtx** param_1) {
     field_0xf44 = field_0xf38;
     field_0xf54 = field_0xf50;
@@ -290,7 +265,6 @@ int daObjCwall_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BD7288-80BD7718 000928 0490+00 1/1 0/0 0/0 .text            setTension__12daObjCwall_cFv */
 void daObjCwall_c::setTension() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 dVar9 = field_0xf54;
@@ -336,7 +310,6 @@ void daObjCwall_c::setTension() {
     }
 }
 
-/* 80BD7718-80BD7788 000DB8 0070+00 2/2 0/0 0/0 .text            calcSePos__12daObjCwall_cFv */
 void daObjCwall_c::calcSePos() {
     field_0xf2c.set(0.0f, 0.0f, 300.0f);
     mDoMtx_stack_c::transS(field_0xf38);
@@ -344,10 +317,8 @@ void daObjCwall_c::calcSePos() {
     mDoMtx_stack_c::multVec(&field_0xf2c, &field_0xf2c);
 }
 
-/* 80BDA34C-80BDA358 000054 000C+00 1/2 0/0 0/0 .bss             l_chainOffset */
 static cXyz l_chainOffset(0.0f, 105.0f, 30.0f);
 
-/* 80BD7788-80BD7804 000E28 007C+00 5/5 0/0 0/0 .text getChainBasePos__12daObjCwall_cFP4cXyz */
 void daObjCwall_c::getChainBasePos(cXyz* pBasePos) {
     *pBasePos = l_chainOffset;
     mDoMtx_stack_c::transS(field_0xf38);
@@ -355,7 +326,6 @@ void daObjCwall_c::getChainBasePos(cXyz* pBasePos) {
     mDoMtx_stack_c::multVec(pBasePos, pBasePos);
 }
 
-/* 80BD7804-80BD7AD4 000EA4 02D0+00 1/1 0/0 0/0 .text            setChainMtx__12daObjCwall_cFv */
 void daObjCwall_c::setChainMtx() {
     chain_s* pChain = mChains;
     s16 sVar7 = home.angle.y;
@@ -389,7 +359,6 @@ void daObjCwall_c::setChainMtx() {
     cLib_addCalcAngleS2(&field_0xf1a, field_0xf1c, 5, 0x800);
 }
 
-/* 80BD7AD4-80BD7ED8 001174 0404+00 1/1 0/0 0/0 .text            chain_control__12daObjCwall_cFv */
 void daObjCwall_c::chain_control() {
     cXyz* nextPos;
     cXyz* pos;
@@ -459,7 +428,6 @@ void daObjCwall_c::chain_control() {
     }
 }
 
-/* 80BD7ED8-80BD84C0 001578 05E8+00 1/1 0/0 0/0 .text            chain_control2__12daObjCwall_cFv */
 void daObjCwall_c::chain_control2() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     chain_s* local_130 = &mChains[5];
@@ -551,10 +519,8 @@ void daObjCwall_c::chain_control2() {
     }
 }
 
-/* 80BDA364-80BDA370 00006C 000C+00 0/1 0/0 0/0 .bss             l_smokeSetOffset */
 static cXyz l_smokeSetOffset(0.0f,0.0f,-200.0f);
 
-/* 80BD84C0-80BD8594 001B60 00D4+00 1/1 0/0 0/0 .text block_mode_proc_call__12daObjCwall_cFv */
 void daObjCwall_c::block_mode_proc_call() {
     static daObjCwall_c::modeFunc l_func[3] = {
         &daObjCwall_c::modeWait,
@@ -567,7 +533,6 @@ void daObjCwall_c::block_mode_proc_call() {
     }
 }
 
-/* 80BD8594-80BD85C0 001C34 002C+00 2/2 0/0 0/0 .text            initWait__12daObjCwall_cFv */
 void daObjCwall_c::initWait() {
     speed.setall(0.0f);
     field_0xf0e = 0;
@@ -575,7 +540,6 @@ void daObjCwall_c::initWait() {
     field_0xe92 = 0;
 }
 
-/* 80BD85C0-80BD8748 001C60 0188+00 1/0 0/0 0/0 .text            modeWait__12daObjCwall_cFv */
 void daObjCwall_c::modeWait() {
     u8 bVar2;
     daPy_py_c* player = static_cast<daPy_py_c*>(daPy_getPlayerActorClass());
@@ -610,7 +574,6 @@ void daObjCwall_c::modeWait() {
     }
 }
 
-/* 80BD8748-80BD8778 001DE8 0030+00 2/2 0/0 0/0 .text            initWalk__12daObjCwall_cFv */
 void daObjCwall_c::initWalk() {
     speed.setall(0.0f);
     field_0xf14 = 13;
@@ -618,7 +581,6 @@ void daObjCwall_c::initWalk() {
     field_0xe92 = 1;
 }
 
-/* 80BD8778-80BD8BC8 001E18 0450+00 1/0 0/0 0/0 .text            modeWalk__12daObjCwall_cFv */
 void daObjCwall_c::modeWalk() {
     s16 bVar1 = 13;
     f32 dVar7 = 75.0f;
@@ -650,14 +612,12 @@ void daObjCwall_c::modeWalk() {
     }
 }
 
-/* 80BD8BC8-80BD8BF0 002268 0028+00 1/1 0/0 0/0 .text            initClose__12daObjCwall_cFv */
 void daObjCwall_c::initClose() {
     speed.setall(0.0f);
     field_0xf0e = 0;
     field_0xe92 = 2;
 }
 
-/* 80BD8BF0-80BD935C 002290 076C+00 1/0 0/0 0/0 .text            modeClose__12daObjCwall_cFv */
 void daObjCwall_c::modeClose() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 dVar11 = field_0xf38.absXZ(home.pos);
@@ -745,7 +705,6 @@ void daObjCwall_c::modeClose() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80BD935C-80BD9414 0029FC 00B8+00 2/2 0/0 0/0 .text            setPower__12daObjCwall_cFfPs */
 void daObjCwall_c::setPower(f32 param_1, s16* param_2) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar3;
@@ -761,7 +720,6 @@ void daObjCwall_c::setPower(f32 param_1, s16* param_2) {
     field_0xf0f = 1;
 }
 
-/* 80BD9414-80BD95A0 002AB4 018C+00 1/1 0/0 0/0 .text            checkWall__12daObjCwall_cFv */
 BOOL daObjCwall_c::checkWall() {
     cXyz acStack_30[2] = {cXyz(-95.0f, 5.0f, 1.0f), cXyz(95.0f, 5.0f, 1.0f)};
     cXyz cStack_40(0.0f, 0.0f, 1.0f);
@@ -782,7 +740,6 @@ BOOL daObjCwall_c::checkWall() {
     return rv;
 }
 
-/* 80BD95A0-80BD977C 002C40 01DC+00 2/2 0/0 0/0 .text            checkPullNow__12daObjCwall_cFv */
 BOOL daObjCwall_c::checkPullNow() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 dummy;
@@ -811,7 +768,6 @@ BOOL daObjCwall_c::checkPullNow() {
     return 0;
 }
 
-/* 80BD977C-80BD9848 002E1C 00CC+00 2/2 0/0 0/0 .text            checkPull__12daObjCwall_cFv */
 BOOL daObjCwall_c::checkPull() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz local_2c;
@@ -824,7 +780,6 @@ BOOL daObjCwall_c::checkPull() {
     return 0;
 }
 
-/* 80BD9848-80BD9948 002EE8 0100+00 1/0 0/0 0/0 .text            Draw__12daObjCwall_cFv */
 int daObjCwall_c::Draw() {
     g_env_light.settingTevStruct( 0x10,
                                          &field_0xf38, &tevStr);
@@ -845,35 +800,28 @@ int daObjCwall_c::Draw() {
     return 1;
 }
 
-/* 80BD9948-80BD9988 002FE8 0040+00 1/0 0/0 0/0 .text            Delete__12daObjCwall_cFv */
 int daObjCwall_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mType]);
     return 1;
 }
 
-/* 80BD9988-80BD9B70 003028 01E8+00 1/0 0/0 0/0 .text daObjCwall_create1st__FP12daObjCwall_c */
 static int daObjCwall_create1st(daObjCwall_c* i_this) {
     fopAcM_ct(i_this, daObjCwall_c);
     return i_this->create1st();
 }
 
-/* 80BD9DF8-80BD9E18 003498 0020+00 1/0 0/0 0/0 .text daObjCwall_MoveBGDelete__FP12daObjCwall_c */
 static int daObjCwall_MoveBGDelete(daObjCwall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BD9E18-80BD9E38 0034B8 0020+00 1/0 0/0 0/0 .text daObjCwall_MoveBGExecute__FP12daObjCwall_c
- */
 static int daObjCwall_MoveBGExecute(daObjCwall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BD9E38-80BD9E64 0034D8 002C+00 1/0 0/0 0/0 .text daObjCwall_MoveBGDraw__FP12daObjCwall_c */
 static int daObjCwall_MoveBGDraw(daObjCwall_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BDA240-80BDA260 -00001 0020+00 1/0 0/0 0/0 .data            daObjCwall_METHODS */
 static actor_method_class daObjCwall_METHODS = {
     (process_method_func)daObjCwall_create1st,
     (process_method_func)daObjCwall_MoveBGDelete,
@@ -882,7 +830,6 @@ static actor_method_class daObjCwall_METHODS = {
     (process_method_func)daObjCwall_MoveBGDraw,
 };
 
-/* 80BDA260-80BDA290 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ChainWall */
 extern actor_process_profile_definition g_profile_Obj_ChainWall = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp
index 854947cda7..238cf71bb0 100644
--- a/src/d/actor/d_a_obj_damCps.cpp
+++ b/src/d/actor/d_a_obj_damCps.cpp
@@ -6,10 +6,7 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_damCps.h"
-#include "dol2asm.h"
 
-/* ############################################################################################## */
-/* 80BDA460-80BDA490 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_DamCps */
 extern actor_process_profile_definition g_profile_Obj_DamCps = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp
index 33af5795ea..989aa9a45b 100644
--- a/src/d/actor/d_a_obj_dan.cpp
+++ b/src/d/actor/d_a_obj_dan.cpp
@@ -13,20 +13,16 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80BDC568-80BDC56C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80BDC578-80BDC588 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_DanHIO_c l_HIO;
 
-/* 80BDA58C-80BDA5B4 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_DanHIO_cFv */
 daObj_DanHIO_c::daObj_DanHIO_c() {
     field_0x4 = -1;
     mScaleMale = 1.0f;
     mScaleFemale = 1.0f;
 }
 
-/* 80BDA5B4-80BDA620 000114 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjDAN_cFv */
 void daObjDAN_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -47,19 +43,16 @@ void daObjDAN_c::InitCcSph() {
     mCcSph.OnTgNoHitMark();
 }
 
-/* 80BDA620-80BDA678 000180 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjDAN_cFv */
 void daObjDAN_c::SetCcSph() {
     mCcSph.SetC(current.pos);
     mCcSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80BDA678-80BDA698 0001D8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObjDAN_c*>(i_this)->CreateHeap();
 }
 
-/* 80BDA698-80BDA9B0 0001F8 0318+00 1/1 0/0 0/0 .text            CreateHeap__10daObjDAN_cFv */
 int daObjDAN_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Dan", 11);
     mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL,
@@ -113,25 +106,21 @@ int daObjDAN_c::CreateHeap() {
     return 1;
 }
 
-/* 80BDA9F8-80BDAA18 000558 0020+00 1/0 0/0 0/0 .text            daObjDAN_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjDAN_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjDAN_c*>(i_this)->create();
 }
 
-/* 80BDAA18-80BDAA3C 000578 0024+00 1/0 0/0 0/0 .text            daObjDAN_Delete__FP10daObjDAN_c */
 static int daObjDAN_Delete(daObjDAN_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80BDAA3C-80BDAA9C 00059C 0060+00 2/2 0/0 0/0 .text            SpeedSet__10daObjDAN_cFv */
 void daObjDAN_c::SpeedSet() {
     cLib_addCalc2(&speedF, mTargetSpeed, 0.1f, 10.0f);
     cLib_addCalcAngleS2(&current.angle.y, mTargetAngleY, 0xa0, 0x100);
     shape_angle.y = current.angle.y;
 }
 
-/* 80BDAA9C-80BDAB14 0005FC 0078+00 1/1 0/0 0/0 .text            LinkChk__10daObjDAN_cFv */
 void daObjDAN_c::LinkChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (fopAcM_searchPlayerDistanceXZ(this) < 50.0f && player->speedF > 0.0f) {
@@ -140,7 +129,6 @@ void daObjDAN_c::LinkChk() {
     }
 }
 
-/* 80BDAB14-80BDAC10 000674 00FC+00 2/2 0/0 0/0 .text            MoveAction__10daObjDAN_cFv */
 void daObjDAN_c::MoveAction() {
     if (mTimer[0] == 0) {
         cXyz delta = home.pos - current.pos;
@@ -155,7 +143,6 @@ void daObjDAN_c::MoveAction() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KSKS, 0, -1);
 }
 
-/* 80BDAC10-80BDAFDC 000770 03CC+00 2/2 0/0 0/0 .text            DamageAction__10daObjDAN_cFv */
 void daObjDAN_c::DamageAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -242,7 +229,6 @@ void daObjDAN_c::DamageAction() {
     SpeedSet();
 }
 
-/* 80BDAFDC-80BDB074 000B3C 0098+00 1/1 0/0 0/0 .text            Action__10daObjDAN_cFv */
 void daObjDAN_c::Action() {
     for (int i = 0; i < 3; i++) {
         mTimer[i]--;
@@ -263,23 +249,19 @@ void daObjDAN_c::Action() {
     Insect_GetDemoMain();
 }
 
-/* 80BDB074-80BDB0D8 000BD4 0064+00 1/1 0/0 0/0 .text            checkGroundPos__10daObjDAN_cFv */
 void daObjDAN_c::checkGroundPos() {
     cXyz pos = current.pos;
     mGndChk.SetPos(&pos);
     mGroundH = dComIfG_Bgsp().GroundCross(&mGndChk);
 }
 
-/* 80BDB0D8-80BDB0E8 000C38 0010+00 1/0 0/0 0/0 .text            Insect_Release__10daObjDAN_cFv */
 void daObjDAN_c::Insect_Release() {
     field_0x56c = 1;
     mAction = ACT_MOVE;
 }
 
-/* 80BDC42C-80BDC430 00007C 0002+02 1/2 0/0 0/0 .rodata          l_dan_itemno */
 static u8 const l_dan_itemno[2] = {fpcNm_ITEM_M_DANGOMUSHI, fpcNm_ITEM_F_DANGOMUSHI};
 
-/* 80BDB0E8-80BDB264 000C48 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjDAN_cFv */
 void daObjDAN_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
@@ -306,7 +288,6 @@ void daObjDAN_c::Z_BufferChk() {
     mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
 }
 
-/* 80BDB264-80BDB388 000DC4 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjDAN_cFv */
 void daObjDAN_c::ParticleSet() {
     if (mScreenZ > mBufferZ) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -322,7 +303,6 @@ void daObjDAN_c::ParticleSet() {
     }
 }
 
-/* 80BDB388-80BDB4E0 000EE8 0158+00 1/1 0/0 0/0 .text            ObjHit__10daObjDAN_cFv */
 void daObjDAN_c::ObjHit() {
     if (mCcSph.ChkTgHit()) {
         cCcD_Obj* hit_obj = mCcSph.GetTgHitObj();
@@ -351,7 +331,6 @@ static f32 dummy() {
     return 100.0f;
 }
 
-/* 80BDB4E0-80BDB62C 001040 014C+00 1/1 0/0 0/0 .text            BoomChk__10daObjDAN_cFv */
 void daObjDAN_c::BoomChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     
@@ -377,7 +356,6 @@ void daObjDAN_c::BoomChk() {
     }
 }
 
-/* 80BDB62C-80BDB928 00118C 02FC+00 1/1 0/0 0/0 .text            Execute__10daObjDAN_cFv */
 int daObjDAN_c::Execute() {
     if (ChkGetDemo()) {
         mScreenZ = mBufferZ + 10000.0f;
@@ -443,7 +421,6 @@ int daObjDAN_c::Execute() {
     return 1;
 }
 
-/* 80BDB928-80BDB990 001488 0068+00 1/1 0/0 0/0 .text            Delete__10daObjDAN_cFv */
 int daObjDAN_c::Delete() {
     dComIfG_resDelete(&mPhase, "I_Dan");
     if (mHIOInit) {
@@ -455,7 +432,6 @@ int daObjDAN_c::Delete() {
     return 1;
 }
 
-/* 80BDB990-80BDBA0C 0014F0 007C+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjDAN_cFv */
 void daObjDAN_c::setBaseMtx() {
     cXyz vec(0.0f, -4.0f, 0.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -482,23 +458,19 @@ int daObjDAN_c::Draw() {
     return 1;
 }
 
-/* 80BDBA0C-80BDBAEC 00156C 00E0+00 1/0 0/0 0/0 .text            daObjDAN_Draw__FP10daObjDAN_c */
 static int daObjDAN_Draw(daObjDAN_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BDBAEC-80BDBB0C 00164C 0020+00 2/1 0/0 0/0 .text            daObjDAN_Execute__FP10daObjDAN_c */
 static int daObjDAN_Execute(daObjDAN_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BDC460-80BDC464 0000B0 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x019B, /* dSv_event_flag_c::F_0411 - Misc. - Pill bug (M) */
     0x019C, /* dSv_event_flag_c::F_0412 - Misc. - Pill bug (F) */
 };
 
-/* 80BDBB0C-80BDBCB8 00166C 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjDAN_cFv */
 bool daObjDAN_c::CreateChk() {
     u8 param = (fopAcM_GetParam(this) >> 8) & 0xf;
     if (param == 0xf) {
@@ -533,7 +505,6 @@ bool daObjDAN_c::CreateChk() {
     return true;
 }
 
-/* 80BDBCB8-80BDC170 001818 04B8+00 1/1 0/0 0/0 .text            create__10daObjDAN_cFv */
 cPhs__Step daObjDAN_c::create() {
     fopAcM_ct(this, daObjDAN_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "I_Dan");
@@ -618,13 +589,10 @@ cPhs__Step daObjDAN_c::create() {
     return step;
 }
 
-/* 80BDC2E8-80BDC2F0 001E48 0008+00 1/0 0/0 0/0 .text            daObjDAN_IsDelete__FP10daObjDAN_c
- */
 static int daObjDAN_IsDelete(daObjDAN_c* i_this) {
     return 1;
 }
 
-/* 80BDC47C-80BDC49C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjDAN_Method */
 static actor_method_class l_daObjDAN_Method = {
     (process_method_func)daObjDAN_Create,
     (process_method_func)daObjDAN_Delete,
@@ -633,7 +601,6 @@ static actor_method_class l_daObjDAN_Method = {
     (process_method_func)daObjDAN_Draw,
 };
 
-/* 80BDC49C-80BDC4CC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Dan */
 extern actor_process_profile_definition g_profile_Obj_Dan = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp
index 8325c75437..6633135f43 100644
--- a/src/d/actor/d_a_obj_digholl.cpp
+++ b/src/d/actor/d_a_obj_digholl.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80BDC618-80BDC73C 000078 0124+00 1/1 0/0 0/0 .text            create__14daObjDigholl_cFv */
 int daObjDigholl_c::create() {
     fopAcM_ct(this, daObjDigholl_c);
     field_0x569 = fopAcM_GetParam(this);
@@ -30,21 +29,17 @@ int daObjDigholl_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BDC73C-80BDC75C 00019C 0020+00 1/0 0/0 0/0 .text            daObjDigholl_Create__FP10fopAc_ac_c */
 static int daObjDigholl_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjDigholl_c*>(i_this)->create();
 }
 
-/* 80BDC75C-80BDC7B0 0001BC 0054+00 1/1 0/0 0/0 .text            __dt__14daObjDigholl_cFv */
 daObjDigholl_c::~daObjDigholl_c() {}
 
-/* 80BDC7B0-80BDC7D8 000210 0028+00 1/0 0/0 0/0 .text daObjDigholl_Delete__FP14daObjDigholl_c */
 static int daObjDigholl_Delete(daObjDigholl_c* i_this) {
     i_this->~daObjDigholl_c();
     return 1;
 }
 
-/* 80BDC7D8-80BDCAEC 000238 0314+00 1/1 0/0 0/0 .text            execute__14daObjDigholl_cFv */
 int daObjDigholl_c::execute() {
     daPy_py_c* player = daPy_getLinkPlayerActorClass();
     if (player->checkNowWolf() &&
@@ -88,29 +83,24 @@ int daObjDigholl_c::execute() {
     return 1;
 }
 
-/* 80BDCAEC-80BDCB0C 00054C 0020+00 1/0 0/0 0/0 .text daObjDigholl_Execute__FP14daObjDigholl_c */
 static int daObjDigholl_Execute(daObjDigholl_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BDCB0C-80BDCB14 00056C 0008+00 1/1 0/0 0/0 .text            draw__14daObjDigholl_cFv */
 int daObjDigholl_c::draw() {
     return 1;
 }
 
-/* 80BDCB14-80BDCB34 000574 0020+00 1/0 0/0 0/0 .text daObjDigholl_Draw__FP14daObjDigholl_c */
 static int daObjDigholl_Draw(daObjDigholl_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BDCB80-80BDCBA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjDigholl_Method */
 static actor_method_class l_daObjDigholl_Method = {
     (process_method_func)daObjDigholl_Create,  (process_method_func)daObjDigholl_Delete,
     (process_method_func)daObjDigholl_Execute, (process_method_func)NULL,
     (process_method_func)daObjDigholl_Draw,
 };
 
-/* 80BDCBA0-80BDCBD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Digholl */
 extern actor_process_profile_definition g_profile_Obj_Digholl = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp
index d3808612fe..85b588165d 100644
--- a/src/d/actor/d_a_obj_digplace.cpp
+++ b/src/d/actor/d_a_obj_digplace.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 8057BF98-8057C138 000078 01A0+00 1/1 0/0 0/0 .text            create__12daObjDigpl_cFv */
 int daObjDigpl_c::create() {
     fopAcM_ct(this, daObjDigpl_c);
 
@@ -46,23 +45,17 @@ int daObjDigpl_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8057C138-8057C158 000218 0020+00 1/0 0/0 0/0 .text            daObjDigpl_Create__FP10fopAc_ac_c
- */
 static int daObjDigpl_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjDigpl_c*>(i_this)->create();
 }
 
-/* 8057C158-8057C1B8 000238 0060+00 1/0 0/0 0/0 .text            __dt__12daObjDigpl_cFv */
 daObjDigpl_c::~daObjDigpl_c() {}
 
-/* 8057C1B8-8057C1EC 000298 0034+00 1/0 0/0 0/0 .text            daObjDigpl_Delete__FP12daObjDigpl_c
- */
 static int daObjDigpl_Delete(daObjDigpl_c* i_this) {
     i_this->~daObjDigpl_c();
     return 1;
 }
 
-/* 8057C1EC-8057C880 0002CC 0694+00 1/1 0/0 0/0 .text            execute__12daObjDigpl_cFv */
 int daObjDigpl_c::execute() {
     daPy_py_c* player_p = daPy_getLinkPlayerActorClass();
 
@@ -168,25 +161,20 @@ int daObjDigpl_c::execute() {
     return 1;
 }
 
-/* 8057C880-8057C8A0 000960 0020+00 1/0 0/0 0/0 .text daObjDigpl_Execute__FP12daObjDigpl_c */
 static int daObjDigpl_Execute(daObjDigpl_c* i_this) {
     return i_this->execute();
 }
 
-/* 8057C8A0-8057C8A8 000980 0008+00 1/0 0/0 0/0 .text            daObjDigpl_Draw__FP12daObjDigpl_c
- */
 static int daObjDigpl_Draw(daObjDigpl_c* i_this) {
     return 1;
 }
 
-/* 8057C8F8-8057C918 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjDigpl_Method */
 static actor_method_class l_daObjDigpl_Method = {
     (process_method_func)daObjDigpl_Create,  (process_method_func)daObjDigpl_Delete,
     (process_method_func)daObjDigpl_Execute, (process_method_func)NULL,
     (process_method_func)daObjDigpl_Draw,
 };
 
-/* 8057C918-8057C948 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Digpl */
 extern actor_process_profile_definition g_profile_Obj_Digpl = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp
index e1f1d26dc6..d2b87753d4 100644
--- a/src/d/actor/d_a_obj_digsnow.cpp
+++ b/src/d/actor/d_a_obj_digsnow.cpp
@@ -10,13 +10,11 @@
 #include "d/d_com_inf_game.h"
 #include <cmath.h>
 
-/* 80BDCC58-80BDCC94 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjDigSnow_cFv */
 void daObjDigSnow_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BDCC94-80BDCD08 0000B4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjDigSnow_cFv */
 void daObjDigSnow_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -24,7 +22,6 @@ void daObjDigSnow_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BDCD08-80BDCD64 000128 005C+00 1/0 0/0 0/0 .text            Create__14daObjDigSnow_cFv */
 int daObjDigSnow_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -37,10 +34,8 @@ int daObjDigSnow_c::Create() {
     return TRUE;
 }
 
-/* 80BDD708-80BDD70C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Y_horiyuk";
 
-/* 80BDCD64-80BDCDD4 000184 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjDigSnow_cFv */
 int daObjDigSnow_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(0x9F, modelData != NULL);
@@ -53,7 +48,6 @@ int daObjDigSnow_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80BDCDD4-80BDCE84 0001F4 00B0+00 1/1 0/0 0/0 .text            create1st__14daObjDigSnow_cFv */
 int daObjDigSnow_c::create1st() {
     if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetHomeRoomNo(this))) {
         return cPhs_ERROR_e;
@@ -70,8 +64,6 @@ int daObjDigSnow_c::create1st() {
     return phase_state;
 }
 
-/* 80BDCE84-80BDCF00 0002A4 007C+00 1/0 0/0 0/0 .text            Execute__14daObjDigSnow_cFPPA3_A4_f
- */
 int daObjDigSnow_c::Execute(Mtx** i_mtx) {
     if (daPy_py_c::checkNowWolf()) {
         attention_info.flags = fopAc_AttnFlag_ETC_e;
@@ -87,7 +79,6 @@ int daObjDigSnow_c::Execute(Mtx** i_mtx) {
     return TRUE;
 }
 
-/* 80BDCF00-80BDCFA4 000320 00A4+00 1/1 0/0 0/0 .text            action__14daObjDigSnow_cFv */
 void daObjDigSnow_c::action() {
     typedef void (daObjDigSnow_c::*action_func)();
     static action_func l_func[] = {
@@ -99,21 +90,16 @@ void daObjDigSnow_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80BDCFA4-80BDCFB0 0003C4 000C+00 1/1 0/0 0/0 .text            mode_init_wait__14daObjDigSnow_cFv
- */
 void daObjDigSnow_c::mode_init_wait() {
     mAction = ACTION_WAIT_e;
 }
 
-/* 80BDCFB0-80BDCFDC 0003D0 002C+00 1/0 0/0 0/0 .text            mode_wait__14daObjDigSnow_cFv */
 void daObjDigSnow_c::mode_wait() {
     if (mMode == MODE_DIG_e) {
         mode_init_dig();
     }
 }
 
-/* 80BDCFDC-80BDD0AC 0003FC 00D0+00 1/1 0/0 0/0 .text            mode_init_dig__14daObjDigSnow_cFv
- */
 void daObjDigSnow_c::mode_init_dig() {
     dBgS_ObjGndChk obj_gnd_chk;
 
@@ -134,7 +120,6 @@ void daObjDigSnow_c::mode_init_dig() {
     mAction = 1;
 }
 
-/* 80BDD124-80BDD1BC 000544 0098+00 1/0 0/0 0/0 .text            mode_dig__14daObjDigSnow_cFv */
 void daObjDigSnow_c::mode_dig() {
     f32 step = std::fabs(((current.pos.y - mGroundHeight) + 10.0f) / 35.0f);
     if (step < 1.0f) {
@@ -146,8 +131,6 @@ void daObjDigSnow_c::mode_dig() {
     }
 }
 
-/* 80BDD1BC-80BDD210 0005DC 0054+00 1/1 0/0 0/0 .text            mode_init_end__14daObjDigSnow_cFv
- */
 void daObjDigSnow_c::mode_init_end() {
     dComIfGs_onSwitch(getSwNo(), fopAcM_GetHomeRoomNo(this));
     fopAcM_delete(this);
@@ -155,10 +138,8 @@ void daObjDigSnow_c::mode_init_end() {
     mAction = 2;
 }
 
-/* 80BDD210-80BDD214 000630 0004+00 1/0 0/0 0/0 .text            mode_end__14daObjDigSnow_cFv */
 void daObjDigSnow_c::mode_end() {}
 
-/* 80BDD214-80BDD2B8 000634 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjDigSnow_cFv */
 int daObjDigSnow_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -170,38 +151,28 @@ int daObjDigSnow_c::Draw() {
     return TRUE;
 }
 
-/* 80BDD2B8-80BDD2EC 0006D8 0034+00 1/0 0/0 0/0 .text            Delete__14daObjDigSnow_cFv */
 int daObjDigSnow_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return TRUE;
 }
 
-/* 80BDD2EC-80BDD418 00070C 012C+00 1/0 0/0 0/0 .text daObjDigSnow_create1st__FP14daObjDigSnow_c
- */
 static int daObjDigSnow_create1st(daObjDigSnow_c* i_this) {
     fopAcM_ct(i_this, daObjDigSnow_c);
     return i_this->create1st();
 }
 
-/* 80BDD5E4-80BDD604 000A04 0020+00 1/0 0/0 0/0 .text
- * daObjDigSnow_MoveBGDelete__FP14daObjDigSnow_c                */
 static int daObjDigSnow_MoveBGDelete(daObjDigSnow_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BDD604-80BDD624 000A24 0020+00 1/0 0/0 0/0 .text
- * daObjDigSnow_MoveBGExecute__FP14daObjDigSnow_c               */
 static int daObjDigSnow_MoveBGExecute(daObjDigSnow_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BDD624-80BDD650 000A44 002C+00 1/0 0/0 0/0 .text daObjDigSnow_MoveBGDraw__FP14daObjDigSnow_c
- */
 static int daObjDigSnow_MoveBGDraw(daObjDigSnow_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BDD754-80BDD774 -00001 0020+00 1/0 0/0 0/0 .data            daObjDigSnow_METHODS */
 static actor_method_class daObjDigSnow_METHODS = {
     (process_method_func)daObjDigSnow_create1st,     (process_method_func)daObjDigSnow_MoveBGDelete,
     (process_method_func)daObjDigSnow_MoveBGExecute, NULL,
diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp
index ac9067e203..ae8794603c 100644
--- a/src/d/actor/d_a_obj_dmelevator.cpp
+++ b/src/d/actor/d_a_obj_dmelevator.cpp
@@ -11,15 +11,12 @@
 #include "d/d_bg_w.h"
 #include "d/d_path.h"
 
-/* 80BDF870-80BDF87C 000000 000C+00 11/11 0/0 0/0 .rodata          l_swOffset */
 static const Vec l_swOffset = {
     0.0f,
     162.0f,
     -77.0f,
 };
 
-/* 80BDD96C-80BDDBB4 0000EC 0248+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     daObjDmElevator_c* pthis = (daObjDmElevator_c*)param_1;
 
@@ -61,7 +58,6 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2
     }
 }
 
-/* 80BDDBF0-80BDDCA0 000370 00B0+00 1/1 0/0 0/0 .text            nodeCallBackForSw__FP8J3DJointi */
 static int nodeCallBackForSw(J3DJoint* param_0, int param_1) {
     if (param_1 == 0) {
         int jnt_no = param_0->getJntNo();
@@ -80,7 +76,6 @@ static int nodeCallBackForSw(J3DJoint* param_0, int param_1) {
     return 1;
 }
 
-/* 80BDDCA0-80BDDD38 000420 0098+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -98,8 +93,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80BDDD38-80BDDD90 0004B8 0058+00 1/1 0/0 0/0 .text            initBaseMtx__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::initBaseMtx() {
     mpElevatorModel->setBaseScale(scale);
     mpSwitchModel->setBaseScale(scale);
@@ -107,8 +100,6 @@ void daObjDmElevator_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BDDD90-80BDDEFC 000510 016C+00 2/2 0/0 0/0 .text            setBaseMtx__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::setBaseMtx() {
     
     mDoMtx_stack_c::transS(current.pos);
@@ -141,21 +132,16 @@ void daObjDmElevator_c::setBaseMtx() {
     mDoMtx_stack_c::multVecZero(&mXyz);
 }
 
-/* 80BDF964-80BDF968 -00001 0004+00 3/4 0/0 0/0 .data            l_el_arcName */
 static const char* l_el_arcName = "H_Elevato";
 
-/* 80BDF968-80BDF96C -00001 0004+00 3/3 0/0 0/0 .data            l_sw_arcName */
 static const char* l_sw_arcName = "D_Hfsw00";
 
-/* 80BDF96C-80BDF970 -00001 0004+00 0/1 0/0 0/0 .data            l_eventName */
 static const char* l_eventName = "ELEVATOR_MOVE";
 
-/* 80BDF970-80BDF974 -00001 0004+00 0/1 0/0 0/0 .data            l_eventName2 */
 static const char* l_eventName2 = "ELEVATOR_MOVE2";
 
 static const char* l_staffName = "dmele";
 
-/* 80BDDEFC-80BDE0A4 00067C 01A8+00 1/0 0/0 0/0 .text            Create__17daObjDmElevator_cFv */
 int daObjDmElevator_c::Create() {
     if (field_0x5e0 == 1) {
         field_0x637 = 0xe;
@@ -201,7 +187,6 @@ int daObjDmElevator_c::Create() {
     return success;
 }
 
-/* 80BDE0A4-80BDE2F8 000824 0254+00 1/1 0/0 0/0 .text            init__17daObjDmElevator_cFv */
 int daObjDmElevator_c::init() {
     dPath* path = dPath_GetRoomPath(getPathID() & 0xff, fopAcM_GetRoomNo(this));
     daPy_py_c* plink = daPy_getPlayerActorClass();
@@ -225,8 +210,6 @@ int daObjDmElevator_c::init() {
     return 1;
 }
 
-/* 80BDE2F8-80BDE448 000A78 0150+00 1/0 0/0 0/0 .text            CreateHeap__17daObjDmElevator_cFv
- */
 int daObjDmElevator_c::CreateHeap() {
     J3DModelData* pJVar1 = (J3DModelData*)dComIfG_getObjectRes((const char*)l_el_arcName, 5);
     mpElevatorModel = mDoExt_J3DModel__create(pJVar1, 0x80000, 0x11000084);
@@ -252,7 +235,6 @@ int daObjDmElevator_c::CreateHeap() {
     return 1;
 }
 
-/* 80BDE448-80BDE500 000BC8 00B8+00 1/1 0/0 0/0 .text            create1st__17daObjDmElevator_cFv */
 int daObjDmElevator_c::create1st() {
     int temp = init();
     if (temp == 0) {
@@ -273,7 +255,6 @@ int daObjDmElevator_c::create1st() {
     return ret;
 }
 
-/* 80BDE500-80BDE5F8 000C80 00F8+00 1/0 0/0 0/0 .text Execute__17daObjDmElevator_cFPPA3_A4_f */
 int daObjDmElevator_c::Execute(Mtx** param_1) {
     event_proc_call();
     setting_ride_flag();
@@ -294,7 +275,6 @@ int daObjDmElevator_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80BDE5F8-80BDE6FC 000D78 0104+00 1/1 0/0 0/0 .text setting_ride_flag__17daObjDmElevator_cFv */
 void daObjDmElevator_c::setting_ride_flag() {
     if (field_0x62f != 0) {
         if (field_0x631 != 0) {
@@ -336,7 +316,6 @@ void daObjDmElevator_c::setting_ride_flag() {
     }
 }
 
-/* 80BDE6FC-80BDE7A0 000E7C 00A4+00 1/1 0/0 0/0 .text event_sw_proc_call__17daObjDmElevator_cFv */
 void daObjDmElevator_c::event_sw_proc_call() {
     typedef void (daObjDmElevator_c::*actionFunc)();
     static actionFunc l_func[] = {
@@ -347,19 +326,14 @@ void daObjDmElevator_c::event_sw_proc_call() {
     (this->*l_func[field_0x629])();
 }
 
-/* 80BDE7A0-80BDE7AC 000F20 000C+00 2/2 0/0 0/0 .text actionSwPauseNoneInit__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::actionSwPauseNoneInit() {
     field_0x629 = 0;
 }
 
-/* 80BDE7AC-80BDE7B0 000F2C 0004+00 1/0 0/0 0/0 .text actionSwPauseNone__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionSwPauseNone() {
     /* empty function */
 }
 
-/* 80BDE7B0-80BDE808 000F30 0058+00 1/1 0/0 0/0 .text
- * actionSwPauseOrderInit__17daObjDmElevator_cFv                */
 void daObjDmElevator_c::actionSwPauseOrderInit() {
     if (field_0x629 != 1) {
         field_0x629 = 1;
@@ -368,7 +342,6 @@ void daObjDmElevator_c::actionSwPauseOrderInit() {
     }
 }
 
-/* 80BDE808-80BDE83C 000F88 0034+00 1/0 0/0 0/0 .text actionSwPauseOrder__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionSwPauseOrder() {
     if (eventInfo.mCommand == 2) {
         actionSwPauseInit();
@@ -377,14 +350,12 @@ void daObjDmElevator_c::actionSwPauseOrder() {
     }
 }
 
-/* 80BDE83C-80BDE868 000FBC 002C+00 1/1 0/0 0/0 .text actionSwPauseInit__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionSwPauseInit() {
     daPy_getPlayerActorClass()->onWolfEyeKeep();
     field_0x62a = 10;
     field_0x629 = 2;
 }
 
-/* 80BDE868-80BDE8D0 000FE8 0068+00 1/0 0/0 0/0 .text actionSwPause__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionSwPause() {
     daPy_getPlayerActorClass()->mEndResetFlg1 = daPy_getPlayerActorClass()->mEndResetFlg1 | 0x200;
     field_0x62a += -1;
@@ -394,8 +365,6 @@ void daObjDmElevator_c::actionSwPause() {
     }
 }
 
-/* 80BDE8D0-80BDE960 001050 0090+00 1/1 0/0 0/0 .text            calc_top_pos__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::calc_top_pos() {
     speed.y = speed.y - (field_0x63c - field_0x640) * (0.9f);
     speed.y = speed.y - speed.y * 0.5f;
@@ -405,7 +374,6 @@ void daObjDmElevator_c::calc_top_pos() {
     field_0x638 = cLib_minMaxLimit(field_0x638, -24.0f, 0.0f);
 }
 
-/* 80BDE960-80BDEA1C 0010E0 00BC+00 1/1 0/0 0/0 .text mode_sw_proc_call__17daObjDmElevator_cFv */
 void daObjDmElevator_c::mode_sw_proc_call() {
     typedef void (daObjDmElevator_c::*actionFunc)();
     static actionFunc l_mode_func[] = {
@@ -417,8 +385,6 @@ void daObjDmElevator_c::mode_sw_proc_call() {
     (this->*l_mode_func[field_0x628])();
 }
 
-/* 80BDEA1C-80BDEA44 00119C 0028+00 1/1 0/0 0/0 .text modeSwWaitLowerInit__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::modeSwWaitLowerInit() {
     speed.y = 0.0f;
     field_0x63c = 1.0f;
@@ -426,7 +392,6 @@ void daObjDmElevator_c::modeSwWaitLowerInit() {
     field_0x628 = 0;
 }
 
-/* 80BDEA44-80BDEB88 0011C4 0144+00 1/0 0/0 0/0 .text modeSwWaitLower__17daObjDmElevator_cFv */
 void daObjDmElevator_c::modeSwWaitLower() {
     if (field_0x631 != 0) {
         if (field_0x636 != 0) {
@@ -450,7 +415,6 @@ void daObjDmElevator_c::modeSwWaitLower() {
     }
 }
 
-/* 80BDEA1c-80BDEA40 001308 0088+00 1/1 0/0 0/0 .text modeSwLowerInit__17daObjDmElevator_cFv */
 void daObjDmElevator_c::modeSwLowerInit() {
     mDoAud_seStart(Z2SE_OBJ_HEAVY_FUMISW_ON, &mXyz, 0, 0);
 
@@ -458,8 +422,6 @@ void daObjDmElevator_c::modeSwLowerInit() {
     field_0x628 = 1;
 }
 
-/* 80BDEC10-80BDEC94 001390 0084+00 1/0 0/0 0/0 .text            modeSwLower__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::modeSwLower() {
     if (field_0x638 == -24.0f) {
         dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
@@ -470,8 +432,6 @@ void daObjDmElevator_c::modeSwLower() {
     }
 }
 
-/* 80BDEC94-80BDECB4 001414 0020+00 2/2 0/0 0/0 .text modeSwWaitUpperInit__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::modeSwWaitUpperInit() {
     speed.y = 0.0f;
     field_0x63c = 0.0f;
@@ -479,14 +439,12 @@ void daObjDmElevator_c::modeSwWaitUpperInit() {
     field_0x628 = 2;
 }
 
-/* 80BDECB4-80BDECE0 001434 002C+00 1/0 0/0 0/0 .text modeSwWaitUpper__17daObjDmElevator_cFv */
 void daObjDmElevator_c::modeSwWaitUpper() {
     if (field_0x636 == 0) {
         modeSwUpperInit();
     }
 }
 
-/* 80BDECE0-80BDED64 001460 0084+00 1/1 0/0 0/0 .text modeSwUpperInit__17daObjDmElevator_cFv */
 void daObjDmElevator_c::modeSwUpperInit() {
     mDoAud_seStart(Z2SE_OBJ_HEAVY_FUMISW_OFF, &mXyz, 0, 0);
 
@@ -494,8 +452,6 @@ void daObjDmElevator_c::modeSwUpperInit() {
     field_0x628 = 3;
 }
 
-/* 80BDED64-80BDEDE0 0014E4 007C+00 1/0 0/0 0/0 .text            modeSwUpper__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::modeSwUpper() {
     if (field_0x638 == 0.0f) {
         dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0, 1.0, 0.0));
@@ -504,7 +460,6 @@ void daObjDmElevator_c::modeSwUpper() {
     }
 }
 
-/* 80BDEDE0-80BDEECC 001560 00EC+00 1/1 0/0 0/0 .text event_proc_call__17daObjDmElevator_cFv */
 void daObjDmElevator_c::event_proc_call() {
     typedef void (daObjDmElevator_c::*actionFunc)();
     static actionFunc l_func[] = {
@@ -515,8 +470,6 @@ void daObjDmElevator_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80BDEECC-80BDEF60 00164C 0094+00 1/0 0/0 0/0 .text            actionWait__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::actionWait() {
     if (field_0x5e0 == 1) {
         mAction = 4;
@@ -529,7 +482,6 @@ void daObjDmElevator_c::actionWait() {
     }
 }
 
-/* 80BDEF60-80BDF000 0016E0 00A0+00 1/0 0/0 0/0 .text actionOrderEvent__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionOrderEvent() {
     if (eventInfo.mCommand == 2) {
         mAction = 2;
@@ -542,8 +494,6 @@ void daObjDmElevator_c::actionOrderEvent() {
     }
 }
 
-/* 80BDF000-80BDF068 001780 0068+00 1/0 0/0 0/0 .text            actionEvent__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::actionEvent() {
     dEvent_manager_c& evt_manager = dComIfGp_getEventManager();
     if (dComIfGp_evmng_endCheck(mEventIndex)) {
@@ -554,7 +504,6 @@ void daObjDmElevator_c::actionEvent() {
     }
 }
 
-/* 80BDF068-80BDF0A0 0017E8 0038+00 1/0 0/0 0/0 .text actionStartEvent__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionStartEvent() {
     if ( fopAcM_CheckStatus(this, 0x1000) != 0) {
         demoProc();
@@ -563,7 +512,6 @@ void daObjDmElevator_c::actionStartEvent() {
     }
 }
 
-/* 80BDF0A0-80BDF168 001820 00C8+00 1/0 0/0 0/0 .text actionMoveStart__17daObjDmElevator_cFv */
 void daObjDmElevator_c::actionMoveStart() {
     if (moveProc() != 0) {
         dComIfGp_getVibration().StartShock(4, 0x1f, cXyz(0.0, 1.0, 0.0));
@@ -575,13 +523,10 @@ void daObjDmElevator_c::actionMoveStart() {
     }
 }
 
-/* 80BDF168-80BDF16C 0018E8 0004+00 1/0 0/0 0/0 .text            actionDead__17daObjDmElevator_cFv
- */
 void daObjDmElevator_c::actionDead() {
     /* empty function */
 }
 
-/* 80BDF16C-80BDF320 0018EC 01B4+00 3/3 0/0 0/0 .text            demoProc__17daObjDmElevator_cFv */
 int daObjDmElevator_c::demoProc() {
     static char* action_table[2] = {
         "WAIT",
@@ -641,7 +586,6 @@ int daObjDmElevator_c::demoProc() {
     return 0;
 }
 
-/* 80BDF320-80BDF3B8 001AA0 0098+00 2/2 0/0 0/0 .text            moveInit__17daObjDmElevator_cFv */
 void daObjDmElevator_c::moveInit() {
     speedF = 0.0f;
     if (field_0x5e0 == 0) {
@@ -652,7 +596,6 @@ void daObjDmElevator_c::moveInit() {
     }
 }
 
-/* 80BDF3B8-80BDF618 001B38 0260+00 2/2 0/0 0/0 .text            moveProc__17daObjDmElevator_cFv */
 int daObjDmElevator_c::moveProc() {
     dPath* path = dPath_GetRoomPath(getPathID(), fopAcM_GetRoomNo(this));
     dPnt* pdVar3 = dPath_GetPnt(path, field_0x5e0 + (char)field_0x5e1);
@@ -690,7 +633,6 @@ int daObjDmElevator_c::moveProc() {
     return ret;
 }
 
-/* 80BDF618-80BDF6DC 001D98 00C4+00 1/0 0/0 0/0 .text            Draw__17daObjDmElevator_cFv */
 int daObjDmElevator_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpSwitchModel, &tevStr);
@@ -704,7 +646,6 @@ int daObjDmElevator_c::Draw() {
     return 1;
 }
 
-/* 80BDF6DC-80BDF764 001E5C 0088+00 1/0 0/0 0/0 .text            Delete__17daObjDmElevator_cFv */
 int daObjDmElevator_c::Delete() {
     mSoundObj.deleteObject();
 
@@ -717,32 +658,23 @@ int daObjDmElevator_c::Delete() {
     return 1;
 }
 
-/* 80BDF764-80BDF7D8 001EE4 0074+00 1/0 0/0 0/0 .text
- * daObjDmElevator_create1st__FP17daObjDmElevator_c             */
 static int daObjDmElevator_create1st(daObjDmElevator_c* i_this) {
     fopAcM_ct(i_this, daObjDmElevator_c);
     return i_this->create1st();
 }
 
-/* 80BDF7D8-80BDF7F8 001F58 0020+00 1/0 0/0 0/0 .text
- * daObjDmElevator_MoveBGDelete__FP17daObjDmElevator_c          */
 static int daObjDmElevator_MoveBGDelete(daObjDmElevator_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BDF7F8-80BDF818 001F78 0020+00 1/0 0/0 0/0 .text
- * daObjDmElevator_MoveBGExecute__FP17daObjDmElevator_c         */
 static int daObjDmElevator_MoveBGExecute(daObjDmElevator_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BDF818-80BDF844 001F98 002C+00 1/0 0/0 0/0 .text
- * daObjDmElevator_MoveBGDraw__FP17daObjDmElevator_c            */
 static int daObjDmElevator_MoveBGDraw(daObjDmElevator_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BDFAB8-80BDFAD8 -00001 0020+00 1/0 0/0 0/0 .data            daObjDmElevator_METHODS */
 static actor_method_class daObjDmElevator_METHODS = {
     (process_method_func)daObjDmElevator_create1st,
     (process_method_func)daObjDmElevator_MoveBGDelete,
@@ -751,7 +683,6 @@ static actor_method_class daObjDmElevator_METHODS = {
     (process_method_func)daObjDmElevator_MoveBGDraw,
 };
 
-/* 80BDFAD8-80BDFB08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Elevator */
 extern actor_process_profile_definition g_profile_Obj_Elevator = {
     fpcLy_CURRENT_e,            // mLayerID
     3,                          // mListID
@@ -769,5 +700,4 @@ extern actor_process_profile_definition g_profile_Obj_Elevator = {
     fopAc_CULLBOX_CUSTOM_e,     // cullType
 };
 
-/* 80BDFBF0-80BDFBF4 0000C0 0004+00 0/0 0/0 0/0 .bss sInstance__31JASGlobalInstance<10Z2SceneMgr> */
 AUDIO_INSTANCES;
diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp
index 8fe5a9b152..f8bee55fd7 100644
--- a/src/d/actor/d_a_obj_drop.cpp
+++ b/src/d/actor/d_a_obj_drop.cpp
@@ -23,7 +23,6 @@
 daObjDrop_HIO_c l_HIO;
 #endif
 
-/* 80BDFCD8-80BDFD8C 000078 00B4+00 2/2 0/0 0/0 .text            searchParentSub__FPvPv */
 static void* searchParentSub(void* pproc, void* pdata) {
     daObjDrop_c* pdrop = (daObjDrop_c*)pdata;
     fopAc_ac_c* pym = (fopAc_ac_c*)pproc;
@@ -47,13 +46,10 @@ static void* searchParentSub(void* pproc, void* pdata) {
     return NULL;
 }
 
-/* 80BE1F88-80BE1F94 000000 000C+00 4/4 0/0 0/0 .rodata          l_sizuku_body_effect_list */
 static const u16 l_sizuku_body_effect_list[6] = {0x838B, 0x838C, 0x838D, 0x838E, 0x838F, 0x842B};
 
-/* 80BE1F94-80BE1F98 00000C 0004+00 0/1 0/0 0/0 .rodata          l_sizuku_app_effect_list */
 static const u16 l_sizuku_app_effect_list[] = {0x8388, 0x8389};
 
-/* 80BE1F98-80BE1FD8 000010 0040+00 1/1 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{AT_TYPE_0, 0x0, 0x0}, {0x0, 0x0}, 0x79}},  // mObj
@@ -66,7 +62,6 @@ const static dCcD_SrcSph l_sph_src = {
     }  // mSphAttr
 };
 
-/* 80BDFD8C-80BDFE58 00012C 00CC+00 1/1 0/0 0/0 .text            Create__11daObjDrop_cFv */
 int daObjDrop_c::Create() {
     mAcchCir.SetWall(50.0f, 50.0f);
     mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
@@ -80,7 +75,6 @@ int daObjDrop_c::Create() {
     return 1;
 }
 
-/* 80BDFE58-80BE005C 0001F8 0204+00 1/1 0/0 0/0 .text            create__11daObjDrop_cFv */
 int daObjDrop_c::create() {
     fopAcM_ct(this, daObjDrop_c);
 
@@ -98,7 +92,6 @@ int daObjDrop_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE0358-80BE0430 0006F8 00D8+00 2/2 0/0 0/0 .text            dropGet__11daObjDrop_cFv */
 void daObjDrop_c::dropGet() {
     if (mSetCollectDrop) {
         dComIfGs_onTbox(getSave());
@@ -127,7 +120,6 @@ static f32 dummy() {
     return temp;
 }
 
-/* 80BE0430-80BE05DC 0007D0 01AC+00 1/1 0/0 0/0 .text            checkGetArea__11daObjDrop_cFv */
 BOOL daObjDrop_c::checkGetArea() {
     f32 dist_to_player = current.pos.abs(daPy_getPlayerActorClass()->current.pos);
 
@@ -141,8 +133,6 @@ BOOL daObjDrop_c::checkGetArea() {
     return false;
 }
 
-/* 80BE05DC-80BE0658 00097C 007C+00 1/1 0/0 0/0 .text            checkCompleteDemo__11daObjDrop_cFv
- */
 void daObjDrop_c::checkCompleteDemo() {
     u8 need_num = dComIfGp_getNeedLightDropNum();
     u8 num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea());
@@ -156,8 +146,6 @@ void daObjDrop_c::checkCompleteDemo() {
     }
 }
 
-/* 80BE0658-80BE071C 0009F8 00C4+00 1/1 0/0 0/0 .text            createLineEffect__11daObjDrop_cFv
- */
 void daObjDrop_c::createLineEffect() {
     for (int i = 0; i < 3; i++) {
         mpLineEffEmtrs[i] = dComIfGp_particle_set(0x838A, &mLinePos[i], NULL, &scale, 0xFF,
@@ -169,16 +157,12 @@ void daObjDrop_c::createLineEffect() {
     }
 }
 
-/* 80BE071C-80BE077C 000ABC 0060+00 2/2 0/0 0/0 .text            removeLineEffect__11daObjDrop_cFv
- */
 void daObjDrop_c::removeLineEffect() {
     for (int i = 0; i < 3; i++) {
         mLineEffCallbacks[i].remove();
     }
 }
 
-/* 80BE077C-80BE0840 000B1C 00C4+00 2/2 0/0 0/0 .text            createBodyEffect__11daObjDrop_cFv
- */
 void daObjDrop_c::createBodyEffect() {
     for (int i = 0; i < 6; i++) {
         mpBodyEffEmtrs[i] =
@@ -191,15 +175,12 @@ void daObjDrop_c::createBodyEffect() {
     }
 }
 
-/* 80BE0840-80BE08A0 000BE0 0060+00 2/2 0/0 0/0 .text            removeBodyEffect__11daObjDrop_cFv
- */
 void daObjDrop_c::removeBodyEffect() {
     for (int i = 0; i < 6; i++) {
         mBodyEffCallbacks[i].remove();
     }
 }
 
-/* 80BE08A0-80BE0994 000C40 00F4+00 2/1 0/0 0/0 .text            modeInit__11daObjDrop_cFv */
 int daObjDrop_c::modeInit() {
     u8 ym_swbit = getYmSwbit();
 
@@ -228,7 +209,6 @@ int daObjDrop_c::modeInit() {
     return 1;
 }
 
-/* 80BE0994-80BE09F4 000D34 0060+00 1/0 0/0 0/0 .text            modeNoParent__11daObjDrop_cFv */
 int daObjDrop_c::modeNoParent() {
     fopAc_ac_c* pparent = (fopAc_ac_c*)fpcM_Search(searchParentSub, this);
     if (pparent != NULL) {
@@ -247,7 +227,6 @@ int daObjDrop_c::modeNoParent() {
     return 1;
 }
 
-/* 80BE09F4-80BE0C08 000D94 0214+00 1/0 0/0 0/0 .text            modeParentWait__11daObjDrop_cFv */
 int daObjDrop_c::modeParentWait() {
     fopAc_ac_c* pparent = fopAcM_SearchByID(parentActorID);
     if (pparent != NULL) {
@@ -301,7 +280,6 @@ int daObjDrop_c::modeParentWait() {
     return 1;
 }
 
-/* 80BE0C08-80BE18E0 000FA8 0CD8+00 1/0 0/0 0/0 .text            modeWait__11daObjDrop_cFv */
 int daObjDrop_c::modeWait() {
     daPy_py_c* pplayer = daPy_getPlayerActorClass();
 
@@ -479,13 +457,10 @@ int daObjDrop_c::modeWait() {
     return 1;
 }
 
-/* 80BE1928-80BE1930 001CC8 0008+00 1/0 0/0 0/0 .text            actionCompleteWait__11daObjDrop_cFv
- */
 int daObjDrop_c::actionCompleteWait() {
     return 1;
 }
 
-/* 80BE1930-80BE19D0 001CD0 00A0+00 1/0 0/0 0/0 .text actionOrderCompleteDemo__11daObjDrop_cFv */
 int daObjDrop_c::actionOrderCompleteDemo() {
     camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -503,7 +478,6 @@ int daObjDrop_c::actionOrderCompleteDemo() {
     return 1;
 }
 
-/* 80BE19D0-80BE1ACC 001D70 00FC+00 1/0 0/0 0/0 .text actionCompleateDemo__11daObjDrop_cFv */
 int daObjDrop_c::actionCompleateDemo() {
     camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     pcamera->mCamera.SetTrimTypeForce(1);
@@ -529,8 +503,6 @@ int daObjDrop_c::actionCompleateDemo() {
     return 1;
 }
 
-/* 80BE1ACC-80BE1B5C 001E6C 0090+00 1/0 0/0 0/0 .text actionWaitCompleteGetDemo__11daObjDrop_cFv
- */
 int daObjDrop_c::actionWaitCompleteGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setDemoMode(DEMOMODE_COMPLETE_GET_DEMO_e);
@@ -548,7 +520,6 @@ int daObjDrop_c::actionWaitCompleteGetDemo() {
     return 1;
 }
 
-/* 80BE1B5C-80BE1BC4 001EFC 0068+00 1/0 0/0 0/0 .text actionCompleteGetDemo__11daObjDrop_cFv */
 int daObjDrop_c::actionCompleteGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGp_event_reset();
@@ -558,7 +529,6 @@ int daObjDrop_c::actionCompleteGetDemo() {
     return 1;
 }
 
-/* 80BE1BC4-80BE1DCC 001F64 0208+00 1/1 0/0 0/0 .text            execute__11daObjDrop_cFv */
 int daObjDrop_c::execute() {
     typedef int (daObjDrop_c::*exeFunc)();
     static exeFunc l_exeFunc[] = {
@@ -586,7 +556,6 @@ int daObjDrop_c::execute() {
     return 1;
 }
 
-/* 80BE1DCC-80BE1E0C 00216C 0040+00 1/1 0/0 0/0 .text            _delete__11daObjDrop_cFv */
 int daObjDrop_c::_delete() {
     removeLineEffect();
     removeBodyEffect();
@@ -594,24 +563,18 @@ int daObjDrop_c::_delete() {
     return 1;
 }
 
-/* 80BE1E0C-80BE1E2C 0021AC 0020+00 1/0 0/0 0/0 .text            daObjDrop_Execute__FP11daObjDrop_c
- */
 static int daObjDrop_Execute(daObjDrop_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BE1E2C-80BE1E4C 0021CC 0020+00 1/0 0/0 0/0 .text            daObjDrop_Delete__FP11daObjDrop_c
- */
 static int daObjDrop_Delete(daObjDrop_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BE1E4C-80BE1E6C 0021EC 0020+00 1/0 0/0 0/0 .text            daObjDrop_Create__FP10fopAc_ac_c */
 static int daObjDrop_Create(fopAc_ac_c* i_this) {
     return ((daObjDrop_c*)i_this)->create();
 }
 
-/* 80BE2158-80BE2178 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjDrop_Method */
 static actor_method_class l_daObjDrop_Method = {
     (process_method_func)daObjDrop_Create,
     (process_method_func)daObjDrop_Delete,
@@ -620,7 +583,6 @@ static actor_method_class l_daObjDrop_Method = {
     (process_method_func)NULL,
 };
 
-/* 80BE2178-80BE21A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Drop */
 extern actor_process_profile_definition g_profile_Obj_Drop = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp
index 5271e916f4..5233819eee 100644
--- a/src/d/actor/d_a_obj_dust.cpp
+++ b/src/d/actor/d_a_obj_dust.cpp
@@ -7,14 +7,11 @@
 
 #include "d/actor/d_a_obj_dust.h"
 
-/* 80BE3054-80BE3058 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "M_Dust";
 
 namespace {
-/* 80BE30F8-80BE30FC 000000 0004+00 2/2 0/0 0/0 .bss             e_ymb__26@unnamed@d_a_obj_dust_cpp@ */
 static fopAc_ac_c* e_ymb;
 
-/* 80BE30FC-80BE3100 000004 0004+00 2/2 0/0 0/0 .bss e_ymb_Pos__26@unnamed@d_a_obj_dust_cpp@ */
 static cXyz* e_ymb_Pos;
 };
 
@@ -26,7 +23,6 @@ static f64 dummyFloat2() {
     return 4503601774854144.0;
 }
 
-/* 80BE22B8-80BE2490 000078 01D8+00 1/1 0/0 0/0 .text            Search_Ymb__11daObjDust_cFv */
 void daObjDust_c::Search_Ymb() {
     f32 e_ymb_speed = 0.0f;
     cXyz ymb_rel_dist(e_ymb_Pos->x - current.pos.x, e_ymb_Pos->y - current.pos.y, e_ymb_Pos->z - current.pos.z);
@@ -55,12 +51,10 @@ void daObjDust_c::Search_Ymb() {
     }
 }
 
-/* 80BE2490-80BE24F8 000250 0068+00 1/1 0/0 0/0 .text            RideOn_Angle__11daObjDust_cFRsfsf */
 void daObjDust_c::RideOn_Angle(s16& o_angle, f32 i_value, s16 i_scale, f32 i_max) {
     cLib_addCalcAngleS(&o_angle, i_scale * (i_value / i_max), 1, 0x100, 1);
 }
 
-/* 80BE24F8-80BE2708 0002B8 0210+00 1/1 0/0 0/0 .text            Check_RideOn__11daObjDust_cFv */
 int daObjDust_c::Check_RideOn() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& player_pos = fopAcM_GetPosition(player);
@@ -96,13 +90,11 @@ int daObjDust_c::Check_RideOn() {
     return 0;
 }
 
-/* 80BE2708-80BE2734 0004C8 002C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjDust_cFv */
 void daObjDust_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80BE2734-80BE2790 0004F4 005C+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjDust_cFv */
 void daObjDust_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -111,8 +103,6 @@ void daObjDust_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BE2790-80BE27BC 000550 002C+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     fopAc_ac_c* ride_actor = (fopAc_ac_c*)i_rideActor;
     daObjDust_c* a_this = (daObjDust_c*)i_bgActor;
@@ -122,25 +112,18 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideA
     }
 }
 
-/* 80BE27BC-80BE27E8 00057C 002C+00 1/0 0/0 0/0 .text            daObjDust_Draw__FP11daObjDust_c */
 static int daObjDust_Draw(daObjDust_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BE27E8-80BE2808 0005A8 0020+00 1/0 0/0 0/0 .text            daObjDust_Execute__FP11daObjDust_c
- */
 static int daObjDust_Execute(daObjDust_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BE2808-80BE2810 0005C8 0008+00 1/0 0/0 0/0 .text            daObjDust_IsDelete__FP11daObjDust_c
- */
 static int daObjDust_IsDelete(daObjDust_c* i_this) {
     return 1;
 }
 
-/* 80BE2810-80BE2834 0005D0 0024+00 1/0 0/0 0/0 .text            daObjDust_Delete__FP11daObjDust_c
- */
 static int daObjDust_Delete(daObjDust_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
@@ -179,14 +162,12 @@ int daObjDust_c::create() {
     return phase_state;
 }
 
-/* 80BE2834-80BE2A00 0005F4 01CC+00 1/0 0/0 0/0 .text            daObjDust_Create__FP10fopAc_ac_c */
 static int daObjDust_Create(fopAc_ac_c* i_this) {
     daObjDust_c* a_this = (daObjDust_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
-/* 80BE2A70-80BE2AE8 000830 0078+00 1/0 0/0 0/0 .text            CreateHeap__11daObjDust_cFv */
 int daObjDust_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_FloatingDust01.bmd");
     JUT_ASSERT(86, modelData != NULL);
@@ -199,7 +180,6 @@ int daObjDust_c::CreateHeap() {
     return 1;
 }
 
-/* 80BE2AE8-80BE2B30 0008A8 0048+00 1/0 0/0 0/0 .text            Create__11daObjDust_cFv */
 int daObjDust_c::Create() {
     initBaseMtx();
     mpBgW->SetRideCallback(rideCallBack);
@@ -207,7 +187,6 @@ int daObjDust_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE2B30-80BE2E9C 0008F0 036C+00 1/0 0/0 0/0 .text            Execute__11daObjDust_cFPPA3_A4_f */
 int daObjDust_c::Execute(Mtx** i_mtx) {
     fopAcM_seStartLevel(this, Z2SE_OBJ_FLOATBOARD, 0);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -248,7 +227,6 @@ int daObjDust_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BE2E9C-80BE2F40 000C5C 00A4+00 1/0 0/0 0/0 .text            Draw__11daObjDust_cFv */
 int daObjDust_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -258,13 +236,11 @@ int daObjDust_c::Draw() {
     return 1;
 }
 
-/* 80BE2F40-80BE2F74 000D00 0034+00 1/0 0/0 0/0 .text            Delete__11daObjDust_cFv */
 int daObjDust_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80BE3058-80BE3078 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjDust_Method */
 static actor_method_class l_daObjDust_Method = {
     (process_method_func)daObjDust_Create,
     (process_method_func)daObjDust_Delete,
@@ -274,7 +250,6 @@ static actor_method_class l_daObjDust_Method = {
 };
 
 
-/* 80BE3078-80BE30A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_DUST */
 extern actor_process_profile_definition g_profile_Obj_DUST = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp
index a111a28b71..4724a92643 100644
--- a/src/d/actor/d_a_obj_eff.cpp
+++ b/src/d/actor/d_a_obj_eff.cpp
@@ -10,7 +10,6 @@
 #include "d/d_procname.h"
 
 
-/* 8057C9D8-8057CA94 000078 00BC+00 1/1 0/0 0/0 .text            _create__Q28daObjEff5Act_cFv */
 int daObjEff::Act_c::_create() {
     fopAcM_ct(this, Act_c);
 
@@ -24,41 +23,28 @@ int daObjEff::Act_c::_create() {
 
 namespace daObjEff {
 namespace {
-/* 8057CA94-8057CAB4 000134 0020+00 1/0 0/0 0/0 .text
- * Mthd_Create__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv       */
 int Mthd_Create(void* i_this) {
     return static_cast<daObjEff::Act_c*>(i_this)->_create();
 }
 
-/* 8057CAB4-8057CABC 000154 0008+00 1/0 0/0 0/0 .text
- * Mthd_Delete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv       */
 int Mthd_Delete(void* i_this) {
     return 1;
 }
 
-/* 8057CABC-8057CAC4 00015C 0008+00 1/0 0/0 0/0 .text
- * Mthd_Execute__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv      */
 int Mthd_Execute(void* i_this) {
     return 1;
 }
 
-/* 8057CAC4-8057CACC 000164 0008+00 1/0 0/0 0/0 .text
- * Mthd_Draw__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv         */
 int Mthd_Draw(void* i_this) {
     return 1;
 }
 
-/* 8057CACC-8057CAD4 00016C 0008+00 1/0 0/0 0/0 .text
- * Mthd_IsDelete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv     */
 int Mthd_IsDelete(void* i_this) {
     return 1;
 }
 };  // namespace
 };  // namespace daObjEff
 
-/* ############################################################################################## */
-/* 8057CAFC-8057CB1C -00001 0020+00 1/0 0/0 0/0 .data
- * Mthd_Table__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@           */
 namespace daObjEff {
 namespace {
 static actor_method_class Mthd_Table = {
@@ -69,7 +55,6 @@ static actor_method_class Mthd_Table = {
 };
 };  // namespace daObjEff
 
-/* 8057CB1C-8057CB4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Eff */
 extern actor_process_profile_definition g_profile_Obj_Eff = {
     fpcLy_CURRENT_e,
     9,
diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp
index 96db672677..bba8ab84bb 100644
--- a/src/d/actor/d_a_obj_enemy_create.cpp
+++ b/src/d/actor/d_a_obj_enemy_create.cpp
@@ -9,19 +9,15 @@
 #include "d/actor/d_a_player.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80BE3178-80BE3198 000078 0020+00 1/0 0/0 0/0 .text daObjE_CREATE_Create__FP10fopAc_ac_c */
 static int daObjE_CREATE_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjE_CREATE_c*>(i_this)->create();
 }
 
-/* 80BE3198-80BE31BC 000098 0024+00 1/0 0/0 0/0 .text daObjE_CREATE_Delete__FP15daObjE_CREATE_c */
 static int daObjE_CREATE_Delete(daObjE_CREATE_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80BE31BC-80BE345C 0000BC 02A0+00 3/3 0/0 0/0 .text            NormalAction__15daObjE_CREATE_cFv
- */
 void daObjE_CREATE_c::NormalAction() {
     cXyz offsetPos(0.0f, 0.0f, 100.0f);
 
@@ -85,8 +81,6 @@ void daObjE_CREATE_c::NormalAction() {
     }
 }
 
-/* 80BE345C-80BE34A0 00035C 0044+00 1/1 0/0 0/0 .text            SearchAction__15daObjE_CREATE_cFv
- */
 /**
  * Moves the enemy spawner position to player position
  */
@@ -95,7 +89,6 @@ void daObjE_CREATE_c::SearchAction() {
     NormalAction();
 }
 
-/* 80BE34A0-80BE3544 0003A0 00A4+00 1/1 0/0 0/0 .text            LoopAction__15daObjE_CREATE_cFv */
 /**
  * Starts the enemy spawn loop over again when all enemies are killed.
  * If a loop end switch is specified and activated, the loop will end
@@ -120,7 +113,6 @@ void daObjE_CREATE_c::LoopAction() {
     }
 }
 
-/* 80BE3544-80BE359C 000444 0058+00 1/1 0/0 0/0 .text            Action__15daObjE_CREATE_cFv */
 void daObjE_CREATE_c::Action() {
     switch (mAction) {
     case ACT_NORMAL:
@@ -135,13 +127,11 @@ void daObjE_CREATE_c::Action() {
     }
 }
 
-/* 80BE359C-80BE35C0 00049C 0024+00 1/1 0/0 0/0 .text            Execute__15daObjE_CREATE_cFv */
 int daObjE_CREATE_c::Execute() {
     Action();
     return 1;
 }
 
-/* 80BE35C0-80BE35F0 0004C0 0030+00 1/1 0/0 0/0 .text            Delete__15daObjE_CREATE_cFv */
 int daObjE_CREATE_c::Delete() {
     if (mActorList != NULL) {
         delete[] mActorList;
@@ -150,18 +140,14 @@ int daObjE_CREATE_c::Delete() {
     return 1;
 }
 
-/* 80BE35F0-80BE35F8 0004F0 0008+00 1/0 0/0 0/0 .text daObjE_CREATE_Draw__FP15daObjE_CREATE_c */
 static int daObjE_CREATE_Draw(daObjE_CREATE_c* i_this) {
     return 1;
 }
 
-/* 80BE35F8-80BE3618 0004F8 0020+00 1/0 0/0 0/0 .text daObjE_CREATE_Execute__FP15daObjE_CREATE_c
- */
 static int daObjE_CREATE_Execute(daObjE_CREATE_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BE3618-80BE3770 000518 0158+00 2/1 0/0 0/0 .text            NameChk__15daObjE_CREATE_cFv */
 void daObjE_CREATE_c::NameChk() {
     int enemyType = fopAcM_GetParam(this) & 0xF;
     mEnemyNum = (fopAcM_GetParam(this) >> 4) & 0xF;
@@ -223,7 +209,6 @@ void daObjE_CREATE_c::NameChk() {
     }
 }
 
-/* 80BE3770-80BE3878 000670 0108+00 1/1 0/0 0/0 .text            create__15daObjE_CREATE_cFv */
 int daObjE_CREATE_c::create() {
     fopAcM_ct(this, daObjE_CREATE_c);
 
@@ -257,21 +242,16 @@ int daObjE_CREATE_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE3878-80BE3880 000778 0008+00 1/0 0/0 0/0 .text daObjE_CREATE_IsDelete__FP15daObjE_CREATE_c
- */
 static int daObjE_CREATE_IsDelete(daObjE_CREATE_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BE38D4-80BE38F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjE_CREATE_Method */
 static actor_method_class l_daObjE_CREATE_Method = {
     (process_method_func)daObjE_CREATE_Create,  (process_method_func)daObjE_CREATE_Delete,
     (process_method_func)daObjE_CREATE_Execute, (process_method_func)daObjE_CREATE_IsDelete,
     (process_method_func)daObjE_CREATE_Draw,
 };
 
-/* 80BE38F4-80BE3924 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_E_CREATE */
 extern actor_process_profile_definition g_profile_Obj_E_CREATE = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp
index 32007d9154..706dd2b6f0 100644
--- a/src/d/actor/d_a_obj_fallobj.cpp
+++ b/src/d/actor/d_a_obj_fallobj.cpp
@@ -37,7 +37,6 @@ static daObjFallObj_HIO_c l_HIO;
 
 #endif
 
-/* 80BE39B8-80BE3A24 000078 006C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjFallObj_cFv */
 void daObjFallObj_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -46,7 +45,6 @@ void daObjFallObj_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BE3A24-80BE3A88 0000E4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjFallObj_cFv */
 void daObjFallObj_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -54,16 +52,13 @@ void daObjFallObj_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BE4B20-80BE4B24 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "K_drock00";
 
-/* 80BE4B24-80BE4B3C 000004 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-200.0f, -10000.0f, -200.0f},
     {200.0f, 600.0f, 200.0f},
 };
 
-/* 80BE3A88-80BE3BA8 000148 0120+00 1/0 0/0 0/0 .text            Create__14daObjFallObj_cFv */
 int daObjFallObj_c::Create() {
     u8 uVar1 = field_0x5d8 - 1;
     if (uVar1 != 0) {
@@ -86,7 +81,6 @@ int daObjFallObj_c::Create() {
     return 1;
 }
 
-/* 80BE3BA8-80BE3BD4 000268 002C+00 2/2 0/0 0/0 .text            getFallTime__14daObjFallObj_cFv */
 s16 daObjFallObj_c::getFallTime() {
     u32 time = getTime();
     if (time == 0) {
@@ -100,8 +94,6 @@ s16 daObjFallObj_c::getFallTime() {
     return time * 15;
 }
 
-/* 80BE3BD4-80BE3C28 000294 0054+00 1/1 0/0 0/0 .text            getFallHeight__14daObjFallObj_cFv
- */
 f32 daObjFallObj_c::getFallHeight() {
     u32 pos = getPos();
     if (pos == 0xff) {
@@ -111,7 +103,6 @@ f32 daObjFallObj_c::getFallHeight() {
     return pos * 50.0f + 300.0f;
 }
 
-/* 80BE3C28-80BE3C98 0002E8 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjFallObj_cFv */
 int daObjFallObj_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(260, modelData != NULL);
@@ -119,7 +110,6 @@ int daObjFallObj_c::CreateHeap() {
     return mpModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BE3C98-80BE3D24 000358 008C+00 1/1 0/0 0/0 .text            create1st__14daObjFallObj_cFv */
 int daObjFallObj_c::create1st() {
     field_0x5d8 = 1;
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -138,8 +128,6 @@ int daObjFallObj_c::create1st() {
     return phase;
 }
 
-/* 80BE3D24-80BE4138 0003E4 0414+00 1/0 0/0 0/0 .text            Execute__14daObjFallObj_cFPPA3_A4_f
- */
 int daObjFallObj_c::Execute(Mtx** i_mtx) {
     cXyz cStack_d8(0.0f, 150.0f, 160.0f);
 
@@ -180,7 +168,6 @@ int daObjFallObj_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BE4138-80BE4228 0007F8 00F0+00 1/1 0/0 0/0 .text            action__14daObjFallObj_cFv */
 void daObjFallObj_c::action() {
     bool isHang = checkHang();
 
@@ -215,7 +202,6 @@ void daObjFallObj_c::action() {
     field_0x5e4 = false;
 }
 
-/* 80BE4228-80BE42C0 0008E8 0098+00 1/1 0/0 0/0 .text            action_wait__14daObjFallObj_cFb */
 bool daObjFallObj_c::action_wait(bool param_1) {
     if (param_1) {
         mTimer = 10;
@@ -231,7 +217,6 @@ bool daObjFallObj_c::action_wait(bool param_1) {
     return param_1;
 }
 
-/* 80BE42C0-80BE43E4 000980 0124+00 1/1 0/0 0/0 .text action_fallStart__14daObjFallObj_cFv */
 bool daObjFallObj_c::action_fallStart() {
     cLib_calcTimer(&mTimer);
     if (mTimer >= 8) {
@@ -257,7 +242,6 @@ bool daObjFallObj_c::action_fallStart() {
     return false;
 }
 
-/* 80BE43E4-80BE45F4 000AA4 0210+00 1/1 0/0 0/0 .text action_countdown__14daObjFallObj_cFv */
 void daObjFallObj_c::action_countdown() {
     bool bVar1 = true;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -289,7 +273,6 @@ void daObjFallObj_c::action_countdown() {
     }
 }
 
-/* 80BE45F4-80BE466C 000CB4 0078+00 1/1 0/0 0/0 .text            action_fall__14daObjFallObj_cFv */
 void daObjFallObj_c::action_fall() {
     speed.y += gravity;
     if (speed.y < fopAcM_GetMaxFallSpeed(this)) {
@@ -302,10 +285,8 @@ void daObjFallObj_c::action_fall() {
     }
 }
 
-/* 80BE466C-80BE4670 000D2C 0004+00 1/1 0/0 0/0 .text            action_end__14daObjFallObj_cFv */
 void daObjFallObj_c::action_end() {}
 
-/* 80BE4670-80BE4700 000D30 0090+00 1/1 0/0 0/0 .text action_follow_fall__14daObjFallObj_cFv */
 void daObjFallObj_c::action_follow_fall() {
     if (parentActorID != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* parent = fopAcM_SearchByID(parentActorID);
@@ -319,7 +300,6 @@ void daObjFallObj_c::action_follow_fall() {
     }
 }
 
-/* 80BE4700-80BE47A0 000DC0 00A0+00 2/2 0/0 0/0 .text            checkHang__14daObjFallObj_cFv */
 bool daObjFallObj_c::checkHang() {
     bool rv = false;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -333,7 +313,6 @@ bool daObjFallObj_c::checkHang() {
     return rv;
 }
 
-/* 80BE47A0-80BE48A4 000E60 0104+00 1/1 0/0 0/0 .text            checkHang2__14daObjFallObj_cFv */
 bool daObjFallObj_c::checkHang2() {
     fpc_ProcID procId;
     if (parentActorID == fpcM_ERROR_PROCESS_ID_e) {
@@ -377,7 +356,6 @@ bool daObjFallObj_c::checkHang2() {
     return false;
 }
 
-/* 80BE48A4-80BE4948 000F64 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjFallObj_cFv */
 int daObjFallObj_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -399,7 +377,6 @@ int daObjFallObj_c::Draw() {
     return 1;
 }
 
-/* 80BE4948-80BE4990 001008 0048+00 1/0 0/0 0/0 .text            Delete__14daObjFallObj_cFv */
 int daObjFallObj_c::Delete() {
     mSoundObj.deleteObject();
     dComIfG_resDelete(&mPhaseReq, l_arcName);
@@ -410,32 +387,23 @@ int daObjFallObj_c::Delete() {
     return 1;
 }
 
-/* 80BE4990-80BE4A04 001050 0074+00 1/0 0/0 0/0 .text daObjFallObj_create1st__FP14daObjFallObj_c
- */
 static int daObjFallObj_create1st(daObjFallObj_c* i_this) {
     fopAcM_ct(i_this, daObjFallObj_c);
     return i_this->create1st();
 }
 
-/* 80BE4A04-80BE4A24 0010C4 0020+00 1/0 0/0 0/0 .text
- * daObjFallObj_MoveBGDelete__FP14daObjFallObj_c                */
 static int daObjFallObj_MoveBGDelete(daObjFallObj_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BE4A24-80BE4A44 0010E4 0020+00 1/0 0/0 0/0 .text
- * daObjFallObj_MoveBGExecute__FP14daObjFallObj_c               */
 static int daObjFallObj_MoveBGExecute(daObjFallObj_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BE4A44-80BE4A70 001104 002C+00 1/0 0/0 0/0 .text daObjFallObj_MoveBGDraw__FP14daObjFallObj_c
- */
 static int daObjFallObj_MoveBGDraw(daObjFallObj_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BE4B3C-80BE4B5C -00001 0020+00 1/0 0/0 0/0 .data            daObjFallObj_METHODS */
 static actor_method_class daObjFallObj_METHODS = {
     (process_method_func)daObjFallObj_create1st,
     (process_method_func)daObjFallObj_MoveBGDelete,
@@ -444,7 +412,6 @@ static actor_method_class daObjFallObj_METHODS = {
     (process_method_func)daObjFallObj_MoveBGDraw,
 };
 
-/* 80BE4B5C-80BE4B8C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_FallObj */
 extern actor_process_profile_definition g_profile_Obj_FallObj = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp
index aa81a16ffc..4bd7128eae 100644
--- a/src/d/actor/d_a_obj_fan.cpp
+++ b/src/d/actor/d_a_obj_fan.cpp
@@ -9,45 +9,36 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* ############################################################################################## */
-/* 80BE5D80-80BE5D8C 000000 000C+00 3/3 0/0 0/0 .rodata          l_bmd */
 static int const l_bmd[3] = {
     4,4,4,
 };
 
-/* 80BE5D8C-80BE5D98 00000C 000C+00 1/1 0/0 0/0 .rodata          l_dzb2 */
 static int const l_dzb2[3] = {
     7,8,8,
 };
 
-/* 80BE5D98-80BE5DA4 000018 000C+00 1/1 0/0 0/0 .rodata          l_dzb3 */
 static int const l_dzb3[3] = {
     7,9,9,
 };
 
-/* 80BE5DA4-80BE5DB0 000024 000C+00 0/1 0/0 0/0 .rodata          l_se */
 static int const l_se[3] = {
     Z2SE_OBJ_FAN_ROLL_S, Z2SE_OBJ_FAN_ROLL_M, Z2SE_OBJ_FAN_ROLL_L,
 };
 
-/* 80BE5DB0-80BE5DBC 000030 000C+00 0/1 0/0 0/0 .rodata          l_wind_se */
 static int const l_wind_se[3] = {
     Z2SE_OBJ_FAN_WIND_S, Z2SE_OBJ_FAN_WIND_M, Z2SE_OBJ_FAN_WIND_L,
 };
 
-/* 80BE5DBC-80BE5DC4 00003C 0006+02 1/2 0/0 0/0 .rodata          l_max_rotspeed */
 static s16 const l_max_rotspeed[3] = {
     0x2000,
     0x2000,
     0x0BB8,
 };
 
-/* 80BE5DC4-80BE5DD0 000044 000C+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[3] = {
     0x1680, 0x9AA0, 0x7E80,
 };
 
-/* 80BE5DD0-80BE5E10 000050 0040+00 1/1 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x1f}, {0x0, 0x11}, 0x0}}, // mObj
@@ -60,7 +51,6 @@ const static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80BE4C38-80BE4D98 000078 0160+00 1/1 0/0 0/0 .text            searchTornado2__FPvPv */
 static void* searchTornado2(void* param_1, void* param_2) {
     fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
     if (actor != NULL && fopAcM_IsActor(actor) && fopAcM_GetProfName(actor) == 0x15c &&
@@ -71,7 +61,6 @@ static void* searchTornado2(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80BE4D98-80BE4E08 0001D8 0070+00 1/1 0/0 0/0 .text            search_tornado__10daObjFan_cFv */
 fopAc_ac_c* daObjFan_c::search_tornado() {
     fopAc_ac_c* rv = NULL;
     field_0xad0 = parentActorID;
@@ -84,13 +73,11 @@ fopAc_ac_c* daObjFan_c::search_tornado() {
     return rv;
 }
 
-/* 80BE4E08-80BE4E44 000248 003C+00 1/1 0/0 0/0 .text            initBaseMtx__10daObjFan_cFv */
 void daObjFan_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BE4E44-80BE4F08 000284 00C4+00 2/2 0/0 0/0 .text            setBaseMtx__10daObjFan_cFv */
 void daObjFan_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -107,7 +94,6 @@ void daObjFan_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BE4F08-80BE4FD4 000348 00CC+00 1/0 0/0 0/0 .text            Create__10daObjFan_cFv */
 int daObjFan_c::Create() {
     field_0xace = 0x2000;
     home.angle.x -= 0x4000;
@@ -125,15 +111,12 @@ int daObjFan_c::Create() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BE5E78-80BE5E84 -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[3] = {
     "Obj_prop1",
     "Obj_prop0",
     "Obj_prop2",
 };
 
-/* 80BE4FD4-80BE50EC 000414 0118+00 1/0 0/0 0/0 .text            CreateHeap__10daObjFan_cFv */
 int daObjFan_c::CreateHeap() {
     void* modelData = dComIfG_getObjectRes(l_arcName[field_0xad4], l_bmd[field_0xad4]);
     JUT_ASSERT(352, modelData != NULL);
@@ -152,7 +135,6 @@ int daObjFan_c::CreateHeap() {
     return 1;
 }
 
-/* 80BE50EC-80BE519C 00052C 00B0+00 1/1 0/0 0/0 .text            create1st__10daObjFan_cFv */
 int daObjFan_c::create1st() {
     field_0xad4 = getType();
     int rv = dComIfG_resLoad(&mPhase, l_arcName[field_0xad4]);
@@ -171,7 +153,6 @@ int daObjFan_c::create1st() {
     return rv;
 }
 
-/* 80BE519C-80BE538C 0005DC 01F0+00 1/0 0/0 0/0 .text            Execute__10daObjFan_cFPPA3_A4_f */
 int daObjFan_c::Execute(f32 (**param_1)[3][4]) {
     search_tornado();
     if (field_0xad4 != 0) {
@@ -207,7 +188,6 @@ int daObjFan_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 80BE538C-80BE583C 0007CC 04B0+00 1/1 0/0 0/0 .text            action__10daObjFan_cFv */
 void daObjFan_c::action() {
     f32 dVar11 = 0.0f;
     f32 dVar10 = 0.0f;
@@ -275,7 +255,6 @@ void daObjFan_c::action() {
     }
 }
 
-/* 80BE5E84-80BE5EB4 00000C 0030+00 1/1 0/0 0/0 .data            l_offset_posM$3940 */
 static Vec l_offset_posM[4] = {
     {-150.0f, 150.0f, 0.0f},
     {-150.0f, -150.0f, 0.0f},
@@ -283,7 +262,6 @@ static Vec l_offset_posM[4] = {
     {150.0f, -150.0f, 0.0f},
 };
 
-/* 80BE5EB4-80BE5EE4 00003C 0030+00 1/1 0/0 0/0 .data            l_offset_posL$3941 */
 static Vec l_offset_posL[4] = {
     {-300.0f, 300.0f, 0.0f},
     {-300.0f, -300.0f, 0.0f},
@@ -291,7 +269,6 @@ static Vec l_offset_posL[4] = {
     {300.0f, -300.0f, 0.0f},
 };
 
-/* 80BE583C-80BE5960 000C7C 0124+00 1/1 0/0 0/0 .text            setCollision__10daObjFan_cFv */
 void daObjFan_c::setCollision() {
     if (field_0xad4 == 0) {
         return;
@@ -316,7 +293,6 @@ void daObjFan_c::setCollision() {
     }
 }
 
-/* 80BE5960-80BE5A04 000DA0 00A4+00 1/0 0/0 0/0 .text            Draw__10daObjFan_cFv */
 int daObjFan_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -326,7 +302,6 @@ int daObjFan_c::Draw() {
     return 1;
 }
 
-/* 80BE5A04-80BE5A78 000E44 0074+00 1/0 0/0 0/0 .text            Delete__10daObjFan_cFv */
 int daObjFan_c::Delete() {
     if (field_0x5ac != NULL && field_0x5ac->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x5ac);
@@ -335,30 +310,23 @@ int daObjFan_c::Delete() {
     return 1;
 }
 
-/* 80BE5A78-80BE5B2C 000EB8 00B4+00 1/0 0/0 0/0 .text            daObjFan_create1st__FP10daObjFan_c
- */
 static void daObjFan_create1st(daObjFan_c* param_0) {
     fopAcM_ct(param_0, daObjFan_c);
     param_0->create1st();
 }
 
-/* 80BE5D0C-80BE5D2C 00114C 0020+00 1/0 0/0 0/0 .text daObjFan_MoveBGDelete__FP10daObjFan_c */
 static int daObjFan_MoveBGDelete(daObjFan_c* param_0) {
     return param_0->MoveBGDelete();
 }
 
-/* 80BE5D2C-80BE5D4C 00116C 0020+00 1/0 0/0 0/0 .text daObjFan_MoveBGExecute__FP10daObjFan_c */
 static int daObjFan_MoveBGExecute(daObjFan_c* param_0) {
     return param_0->MoveBGExecute();
 }
 
-/* 80BE5D4C-80BE5D78 00118C 002C+00 1/0 0/0 0/0 .text            daObjFan_MoveBGDraw__FP10daObjFan_c
- */
 static int daObjFan_MoveBGDraw(daObjFan_c* param_0) {
     return param_0->MoveBGDraw();
 }
 
-/* 80BE5EE4-80BE5F04 -00001 0020+00 1/0 0/0 0/0 .data            daObjFan_METHODS */
 static actor_method_class daObjFan_METHODS = {
     (process_method_func)daObjFan_create1st,
     (process_method_func)daObjFan_MoveBGDelete,
diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp
index bf3ac7eae9..6a991bb89b 100644
--- a/src/d/actor/d_a_obj_fchain.cpp
+++ b/src/d/actor/d_a_obj_fchain.cpp
@@ -11,27 +11,21 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BE7438-80BE7440 000000 0007+01 6/6 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[] = "Fchain";
 
-/* 80BE5FF8-80BE6054 000078 005C+00 1/1 0/0 0/0 .text            createHeap__13daObjFchain_cFv */
 int daObjFchain_c::createHeap() {
     mModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
     return mModelData != NULL ? 1 : 0;
 }
 
-/* 80BE6054-80BE6074 0000D4 0020+00 1/1 0/0 0/0 .text daObjFchain_createHeap__FP10fopAc_ac_c */
 static int daObjFchain_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjFchain_c*>(i_this)->createHeap();
 }
 
-/* ############################################################################################## */
-/* 80BE7440-80BE744C 000008 000C+00 0/1 0/0 0/0 .rodata          localVec$3662 */
 static Vec const localVec = {
     0.0f, 0.0f, -9.0f,
 };
 
-/* 80BE6074-80BE6328 0000F4 02B4+00 1/1 0/0 0/0 .text            create__13daObjFchain_cFv */
 int daObjFchain_c::create() {
     fopAcM_ct(this, daObjFchain_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -75,25 +69,19 @@ int daObjFchain_c::create() {
     return rv;
 }
 
-/* 80BE63A8-80BE63C8 000428 0020+00 1/0 0/0 0/0 .text            daObjFchain_Create__FP10fopAc_ac_c
- */
 static int daObjFchain_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjFchain_c*>(i_this)->create();
 }
 
-/* 80BE63C8-80BE64B8 000448 00F0+00 1/1 0/0 0/0 .text            __dt__13daObjFchain_cFv */
 daObjFchain_c::~daObjFchain_c() {
     dComIfG_resDelete(&mPhase,l_arcName);
 }
 
-/* 80BE64B8-80BE64E0 000538 0028+00 1/0 0/0 0/0 .text daObjFchain_Delete__FP13daObjFchain_c */
 static int daObjFchain_Delete(daObjFchain_c* i_this) {
     i_this->~daObjFchain_c();
     return 1;
 }
 
-/* 80BE64E0-80BE66B4 000560 01D4+00 1/1 0/0 0/0 .text
- * checkPlayerFoot__13daObjFchain_cFPC4cXyzPC4cXyzP4cXyz        */
 void daObjFchain_c::checkPlayerFoot(cXyz const* param_1, cXyz const* param_2, cXyz* param_3) {
     cXyz local_24 = *param_1 - *param_2;
     f32 dVar4 = local_24.absXZ();
@@ -106,7 +94,6 @@ void daObjFchain_c::checkPlayerFoot(cXyz const* param_1, cXyz const* param_2, cX
     }
 }
 
-/* 80BE66B4-80BE6868 000734 01B4+00 1/1 0/0 0/0 .text setGroundVec__13daObjFchain_cFP4cXyzf */
 void daObjFchain_c::setGroundVec(cXyz* param_1, f32 param_2) {
     f32 dVar6 = param_1->absXZ();
     param_1->y += param_2;
@@ -120,12 +107,10 @@ void daObjFchain_c::setGroundVec(cXyz* param_1, f32 param_2) {
     param_1->normalizeZP();
 }
 
-/* 80BE74A4-80BE74B0 00006C 000C+00 0/1 0/0 0/0 .rodata          wolfChainBaseOffset$3862 */
 static Vec const wolfChainBaseOffset = {
     22.0f, 0.0f, -12.0f,
 };
 
-/* 80BE6868-80BE7174 0008E8 090C+00 1/1 0/0 0/0 .text            execute__13daObjFchain_cFv */
 int daObjFchain_c::execute() {
     if (dComIfGp_event_runCheck()) {
         if (dComIfGp_getEventManager().getRunEventName() != NULL) {
@@ -256,12 +241,10 @@ int daObjFchain_c::execute() {
     return 1;
 }
 
-/* 80BE7174-80BE7194 0011F4 0020+00 1/0 0/0 0/0 .text daObjFchain_Execute__FP13daObjFchain_c */
 static int daObjFchain_Execute(daObjFchain_c* i_this) {
     return static_cast<daObjFchain_c*>(i_this)->execute();
 }
 
-/* 80BE7194-80BE7324 001214 0190+00 1/0 0/0 0/0 .text            draw__19daObjFchain_shape_cFv */
 void daObjFchain_shape_c::draw() {
     daObjFchain_c* i_this = (daObjFchain_c*)getUserArea();
     cXyz* pPos = i_this->getPos();
@@ -302,7 +285,6 @@ void daObjFchain_shape_c::draw() {
     }
 }
 
-/* 80BE7324-80BE73B4 0013A4 0090+00 1/1 0/0 0/0 .text            draw__13daObjFchain_cFv */
 int daObjFchain_c::draw() {
     if (field_0x584 != 0) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -315,13 +297,10 @@ int daObjFchain_c::draw() {
     return 1;
 }
 
-/* 80BE73B4-80BE73D4 001434 0020+00 1/0 0/0 0/0 .text            daObjFchain_Draw__FP13daObjFchain_c
- */
 static int daObjFchain_Draw(daObjFchain_c* i_this) {
     return static_cast<daObjFchain_c*>(i_this)->draw();
 }
 
-/* 80BE74D8-80BE74F8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFchain_Method */
 static actor_method_class l_daObjFchain_Method = {
     (process_method_func)daObjFchain_Create,
     (process_method_func)daObjFchain_Delete,
@@ -330,7 +309,6 @@ static actor_method_class l_daObjFchain_Method = {
     (process_method_func)daObjFchain_Draw,
 };
 
-/* 80BE74F8-80BE7528 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Fchain */
 extern actor_process_profile_definition g_profile_Obj_Fchain = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp
index 0a496ce494..4ab9eac175 100644
--- a/src/d/actor/d_a_obj_fireWood.cpp
+++ b/src/d/actor/d_a_obj_fireWood.cpp
@@ -8,23 +8,19 @@
 #include "d/actor/d_a_obj_fireWood.h"
 #include "d/d_s_play.h"
 
-/* 80BE762C-80BE7668 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__16daFireWood_HIO_cFv */
 daFireWood_HIO_c::daFireWood_HIO_c() {
     mFlameOffsetY = 0.0f;
     mCollisionRadius = 60.0f;
     mWaitTime = 20;
 }
 
-/* 80BE76B0-80BE7708 000170 0058+00 1/1 0/0 0/0 .text            setBaseMtx__12daFireWood_cFv */
 void daFireWood_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
 }
 
-/* 80BE8144-80BE8154 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daFireWood_HIO_c l_HIO;
 
-/* 80BE8050-80BE8094 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daFireWood_c */
 dCcD_SrcCyl daFireWood_c::mCcDCyl = {
     daFireWood_c::mCcDObjInfo,
     {
@@ -34,7 +30,6 @@ dCcD_SrcCyl daFireWood_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80BE800C-80BE803C 000008 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daFireWood_c */
 const dCcD_SrcGObjInf daFireWood_c::mCcDObjInfo = {
     {0, {{AT_TYPE_LANTERN_SWING, 0, 0x13}, {0xD8FBFFFF, 0x1F}, {0x0}}},
     {dCcD_SE_SWORD, 0, 0, dCcD_MTRL_NONE, 0},
@@ -42,13 +37,11 @@ const dCcD_SrcGObjInf daFireWood_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80BE8094-80BE80AC 000044 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-50.0f, 0.0f, -50.0f},
     {50.0f, 100.0f, 50.0f},
 };
 
-/* 80BE7708-80BE7910 0001C8 0208+00 1/1 0/0 0/0 .text            create__12daFireWood_cFv */
 int daFireWood_c::create() {
     fopAcM_ct(this, daFireWood_c);
 
@@ -89,7 +82,6 @@ int daFireWood_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE79A0-80BE7A14 000460 0074+00 1/1 0/0 0/0 .text            lightInit__12daFireWood_cFv */
 void daFireWood_c::lightInit() {
     mLightPos = mFlamePos;
     mLightPos.y += 10.0f;
@@ -102,12 +94,10 @@ void daFireWood_c::lightInit() {
     mLightInfluence.mFluctuation = 1.0f;
 }
 
-/* 80BE7A14-80BE7A38 0004D4 0024+00 2/2 0/0 0/0 .text            setLight__12daFireWood_cFv */
 void daFireWood_c::setLight() {
     dKy_plight_set(&mLightInfluence);
 }
 
-/* 80BE7A38-80BE7E74 0004F8 043C+00 1/1 0/0 0/0 .text            Execute__12daFireWood_cFv */
 int daFireWood_c::Execute() {
     mIsSwitch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
 
@@ -166,49 +156,38 @@ int daFireWood_c::Execute() {
     return 1;
 }
 
-/* 80BE7E74-80BE7E7C 000934 0008+00 1/1 0/0 0/0 .text            Draw__12daFireWood_cFv */
 int daFireWood_c::Draw() {
     return 1;
 }
 
-/* 80BE7E7C-80BE7EA4 00093C 0028+00 1/1 0/0 0/0 .text            Delete__12daFireWood_cFv */
 int daFireWood_c::Delete() {
     dKy_plight_cut(&mLightInfluence);
     return 1;
 }
 
-/* 80BE7EA4-80BE7EC4 000964 0020+00 1/0 0/0 0/0 .text            daFireWood_Draw__FP12daFireWood_c
- */
 static int daFireWood_Draw(daFireWood_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BE7EC4-80BE7EE4 000984 0020+00 1/0 0/0 0/0 .text daFireWood_Execute__FP12daFireWood_c */
 static int daFireWood_Execute(daFireWood_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BE7EE4-80BE7F04 0009A4 0020+00 1/0 0/0 0/0 .text            daFireWood_Delete__FP12daFireWood_c
- */
 static int daFireWood_Delete(daFireWood_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80BE7F04-80BE7F24 0009C4 0020+00 1/0 0/0 0/0 .text            daFireWood_Create__FP10fopAc_ac_c
- */
 static int daFireWood_Create(fopAc_ac_c* i_this) {
     return ((daFireWood_c*)i_this)->create();
 }
 
 
-/* 80BE80AC-80BE80CC -00001 0020+00 1/0 0/0 0/0 .data            l_daFireWood_Method */
 static actor_method_class l_daFireWood_Method = {
     (process_method_func)daFireWood_Create,  (process_method_func)daFireWood_Delete,
     (process_method_func)daFireWood_Execute, (process_method_func)NULL,
     (process_method_func)daFireWood_Draw,
 };
 
-/* 80BE80CC-80BE80FC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_FireWood */
 extern actor_process_profile_definition g_profile_Obj_FireWood = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp
index 21ec4d1d87..9f192fc03f 100644
--- a/src/d/actor/d_a_obj_fireWood2.cpp
+++ b/src/d/actor/d_a_obj_fireWood2.cpp
@@ -8,23 +8,19 @@
 #include "d/actor/d_a_obj_fireWood2.h"
 #include "m_Do/m_Do_hostIO.h"
 
-/* 80BE824C-80BE8288 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__17daFireWood2_HIO_cFv */
 daFireWood2_HIO_c::daFireWood2_HIO_c() {
     mFlameOffsetY = 15.0f;
     mCollisionDiameter = 25.0f;
     mCollisionHeight = 50.0f;
 }
 
-/* 80BE82D0-80BE8328 000170 0058+00 2/2 0/0 0/0 .text            setBaseMtx__13daFireWood2_cFv */
 void daFireWood2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
 }
 
-/* 80BE908C-80BE909C 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daFireWood2_HIO_c l_HIO;
 
-/* 80BE8F40-80BE8F70 00000C 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__13daFireWood2_c */
 const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = {
     {0, {{AT_TYPE_LANTERN_SWING, 0, 0x13}, {0xD8FBFFFF, 0x1F}, {0x79}}},
     {dCcD_SE_SWORD, 0, 0, dCcD_MTRL_NONE, 0},
@@ -32,7 +28,6 @@ const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80BE8F98-80BE8FDC 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__13daFireWood2_c */
 dCcD_SrcCyl daFireWood2_c::mCcDCyl = {
     daFireWood2_c::mCcDObjInfo,
     {
@@ -42,13 +37,11 @@ dCcD_SrcCyl daFireWood2_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80BE8FDC-80BE8FF4 000044 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-50.0f, 0.0f, -50.0f},
     {50.0f, 100.0f, 50.0f},
 };
 
-/* 80BE8328-80BE85B0 0001C8 0288+00 1/1 0/0 0/0 .text            create__13daFireWood2_cFv */
 int daFireWood2_c::create() {
     fopAcM_ct(this, daFireWood2_c);
 
@@ -107,7 +100,6 @@ int daFireWood2_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE8640-80BE86CC 0004E0 008C+00 1/1 0/0 0/0 .text            lightInit__13daFireWood2_cFv */
 void daFireWood2_c::lightInit() {
     mLightPos = mFlamePos;
     mLightPos.y += 10.0f;
@@ -124,22 +116,18 @@ void daFireWood2_c::lightInit() {
     }
 }
 
-/* 80BE86CC-80BE86FC 00056C 0030+00 2/2 0/0 0/0 .text            setLight__13daFireWood2_cFv */
 void daFireWood2_c::setLight() {
     if (mIsPLight) {
         dKy_plight_set(&mLightInfluence);
     }
 }
 
-/* 80BE86FC-80BE872C 00059C 0030+00 1/1 0/0 0/0 .text            cutLight__13daFireWood2_cFv */
 void daFireWood2_c::cutLight() {
     if (mIsPLight) {
         dKy_plight_cut(&mLightInfluence);
     }
 }
 
-/* 80BE872C-80BE87DC 0005CC 00B0+00 1/1 0/0 0/0 .text            pointLightProc__13daFireWood2_cFv
- */
 void daFireWood2_c::pointLightProc() {
     if (!mIsPLight) {
         GXColor color = {0xBC, 0x66, 0x42, 0xFF};
@@ -156,7 +144,6 @@ void daFireWood2_c::pointLightProc() {
     }
 }
 
-/* 80BE87DC-80BE8D98 00067C 05BC+00 1/1 0/0 0/0 .text            Execute__13daFireWood2_cFv */
 int daFireWood2_c::Execute() {
     u8 is_switch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
 
@@ -251,12 +238,10 @@ int daFireWood2_c::Execute() {
     return 1;
 }
 
-/* 80BE8D98-80BE8DA0 000C38 0008+00 1/1 0/0 0/0 .text            Draw__13daFireWood2_cFv */
 int daFireWood2_c::Draw() {
     return 1;
 }
 
-/* 80BE8DA0-80BE8DD4 000C40 0034+00 1/1 0/0 0/0 .text            Delete__13daFireWood2_cFv */
 int daFireWood2_c::Delete() {
     if (mIsPLight) {
         dKy_plight_cut(&mLightInfluence);
@@ -265,36 +250,28 @@ int daFireWood2_c::Delete() {
     return 1;
 }
 
-/* 80BE8DD4-80BE8DF4 000C74 0020+00 1/0 0/0 0/0 .text            daFireWood2_Draw__FP13daFireWood2_c
- */
 static int daFireWood2_Draw(daFireWood2_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BE8DF4-80BE8E14 000C94 0020+00 1/0 0/0 0/0 .text daFireWood2_Execute__FP13daFireWood2_c */
 static int daFireWood2_Execute(daFireWood2_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80BE8E14-80BE8E34 000CB4 0020+00 1/0 0/0 0/0 .text daFireWood2_Delete__FP13daFireWood2_c */
 static int daFireWood2_Delete(daFireWood2_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80BE8E34-80BE8E54 000CD4 0020+00 1/0 0/0 0/0 .text            daFireWood2_Create__FP10fopAc_ac_c
- */
 static int daFireWood2_Create(fopAc_ac_c* i_this) {
     return ((daFireWood2_c*)i_this)->create();
 }
 
-/* 80BE8FF4-80BE9014 -00001 0020+00 1/0 0/0 0/0 .data            l_daFireWood2_Method */
 static actor_method_class l_daFireWood2_Method = {
     (process_method_func)daFireWood2_Create,  (process_method_func)daFireWood2_Delete,
     (process_method_func)daFireWood2_Execute, (process_method_func)NULL,
     (process_method_func)daFireWood2_Draw,
 };
 
-/* 80BE9014-80BE9044 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_FireWood2 */
 extern actor_process_profile_definition g_profile_Obj_FireWood2 = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp
index 1f8df9cd81..42a0934c9e 100644
--- a/src/d/actor/d_a_obj_firepillar.cpp
+++ b/src/d/actor/d_a_obj_firepillar.cpp
@@ -11,24 +11,20 @@
 #include "d/d_debug_viewer.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80BE9118-80BE9138 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjFPillar_cFv */
 void daObjFPillar_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BE9138-80BE9190 000098 0058+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjFPillar_cFv */
 void daObjFPillar_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80BE9ADC-80BE9AF4 000020 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static f32 l_cull_box[6] = {
     -30.0f, -10.0f, -30.0f,
     30.0f, 60.0f, 30.0f,
 };
 
-/* 80BE9AF4-80BE9B40 000038 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -41,7 +37,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 80BE9190-80BE9230 0000F0 00A0+00 1/1 0/0 0/0 .text            Create__14daObjFPillar_cFv */
 int daObjFPillar_c::Create() {
     initBaseMtx();
     mStts.Init(0, 0xff, this);
@@ -58,7 +53,6 @@ int daObjFPillar_c::Create() {
     return 1;
 }
 
-/* 80BE9230-80BE9360 000190 0130+00 1/1 0/0 0/0 .text            create__14daObjFPillar_cFv */
 int daObjFPillar_c::create() {
     fopAcM_ct(this, daObjFPillar_c);
     int rv = Create();
@@ -68,7 +62,6 @@ int daObjFPillar_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BE94E4-80BE9610 000444 012C+00 1/1 0/0 0/0 .text            execute__14daObjFPillar_cFv */
 int daObjFPillar_c::execute() {
     action();
     mCylScale.x = scale.x;
@@ -87,7 +80,6 @@ int daObjFPillar_c::execute() {
     return 1;
 }
 
-/* 80BE9610-80BE96B4 000570 00A4+00 1/1 0/0 0/0 .text            action__14daObjFPillar_cFv */
 void daObjFPillar_c::action() {
     static daObjFPillar_c::actionFunc l_func[3] = {
         &daObjFPillar_c::actionOff,
@@ -97,8 +89,6 @@ void daObjFPillar_c::action() {
     (this->*(l_func[mAction]))();
 }
 
-/* 80BE96B4-80BE96E0 000614 002C+00 2/2 0/0 0/0 .text            actionOffInit__14daObjFPillar_cFv
- */
 void daObjFPillar_c::actionOffInit() {
     u8 bVar1 = daObjFPillar_prm::getArg0(this);
     if (bVar1 == 0xff) {
@@ -108,7 +98,6 @@ void daObjFPillar_c::actionOffInit() {
     mAction = ACTION_OFF;
 }
 
-/* 80BE96E0-80BE9784 000640 00A4+00 1/0 0/0 0/0 .text            actionOff__14daObjFPillar_cFv */
 void daObjFPillar_c::actionOff() {
     cLib_chaseF(&mCylScale.y, 0.0f, scale.y * 0.1f);
     if (mActionTimer == 0) {
@@ -124,7 +113,6 @@ void daObjFPillar_c::actionOff() {
     }
 }
 
-/* 80BE9784-80BE97B8 0006E4 0034+00 1/1 0/0 0/0 .text actionOnWaitInit__14daObjFPillar_cFv */
 void daObjFPillar_c::actionOnWaitInit() {
     u8 bVar1 = daObjFPillar_prm::getArg1(this);
     if (bVar1 == 0xff) {
@@ -135,7 +123,6 @@ void daObjFPillar_c::actionOnWaitInit() {
     mAction = ACTION_ON_WAIT;
 }
 
-/* 80BE97B8-80BE986C 000718 00B4+00 1/0 0/0 0/0 .text            actionOnWait__14daObjFPillar_cFv */
 void daObjFPillar_c::actionOnWait() {
     cLib_chaseF(&mCylScale.y, scale.y * 0.1f, scale.y * 0.02f);
     if (mActionTimer == 0) {
@@ -153,7 +140,6 @@ void daObjFPillar_c::actionOnWait() {
     }
 }
 
-/* 80BE986C-80BE98A0 0007CC 0034+00 1/1 0/0 0/0 .text            actionOnInit__14daObjFPillar_cFv */
 void daObjFPillar_c::actionOnInit() {
     u8 bVar1 = daObjFPillar_prm::getArg2(this);
     if (bVar1 == 0xff) {
@@ -164,7 +150,6 @@ void daObjFPillar_c::actionOnInit() {
     mAction = ACTION_ON;
 }
 
-/* 80BE98A0-80BE9980 000800 00E0+00 1/0 0/0 0/0 .text            actionOn__14daObjFPillar_cFv */
 void daObjFPillar_c::actionOn() {
     f32 target = scale.y;
     if (mActionTimer == 0) {
@@ -186,8 +171,6 @@ void daObjFPillar_c::actionOn() {
     }
 }
 
-/* 80BE9980-80BE9984 0008E0 0004+00 1/1 0/0 0/0 .text            drawCylinder__FP4cXyzP4cXyzP5csXyz
- */
 static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) {
     static GXColor const color = {0xFF,00,00,0x60};
 
@@ -203,41 +186,33 @@ static void drawCylinder(cXyz* pos, cXyz* scale, csXyz* angle) {
     #endif
 }
 
-/* 80BE9984-80BE99B8 0008E4 0034+00 1/1 0/0 0/0 .text            draw__14daObjFPillar_cFv */
 int daObjFPillar_c::draw() {
     drawCylinder(&current.pos, &mCylScale, &current.angle);
     return 1;
 }
 
-/* 80BE99B8-80BE99C0 000918 0008+00 1/1 0/0 0/0 .text            _delete__14daObjFPillar_cFv */
 int daObjFPillar_c::_delete() {
     return 1;
 }
 
-/* 80BE99C0-80BE99E0 000920 0020+00 1/0 0/0 0/0 .text daObjFPillar_Draw__FP14daObjFPillar_c */
 static int daObjFPillar_Draw(daObjFPillar_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BE99E0-80BE9A00 000940 0020+00 1/0 0/0 0/0 .text daObjFPillar_Execute__FP14daObjFPillar_c */
 static int daObjFPillar_Execute(daObjFPillar_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BE9A00-80BE9A20 000960 0020+00 1/0 0/0 0/0 .text daObjFPillar_Delete__FP14daObjFPillar_c */
 static int daObjFPillar_Delete(daObjFPillar_c* i_this) {
     fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80BE9A20-80BE9A40 000980 0020+00 1/0 0/0 0/0 .text            daObjFPillar_Create__FP10fopAc_ac_c
- */
 static int daObjFPillar_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjFPillar_c*>(i_this)->create();
 }
 
-/* 80BE9B88-80BE9BA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFPillar_Method */
 static actor_method_class l_daObjFPillar_Method = {
     (process_method_func)daObjFPillar_Create,
     (process_method_func)daObjFPillar_Delete,
@@ -246,7 +221,6 @@ static actor_method_class l_daObjFPillar_Method = {
     (process_method_func)daObjFPillar_Draw,
 };
 
-/* 80BE9BA8-80BE9BD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_FirePillar */
 extern actor_process_profile_definition g_profile_Obj_FirePillar = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp
index a6a2659982..430fc5d391 100644
--- a/src/d/actor/d_a_obj_firepillar2.cpp
+++ b/src/d/actor/d_a_obj_firepillar2.cpp
@@ -10,15 +10,12 @@
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80BE9CB8-80BE9CD8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjFPillar2_c*>(i_this)->CreateHeap();
 }
 
-/* 80BE9CD8-80BE9D5C 000098 0084+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjFPillar2_cFv */
 void daObjFPillar2_c::initBaseMtx() {
     if (getKind() == KIND_MAGMA_POLE) {
         mDoMtx_stack_c::transS(current.pos);
@@ -31,7 +28,6 @@ void daObjFPillar2_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BE9D5C-80BE9DDC 00011C 0080+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjFPillar2_cFv */
 void daObjFPillar2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -42,16 +38,13 @@ void daObjFPillar2_c::setBaseMtx() {
     }
 }
 
-/* 80BEB548-80BEB54C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_yogan";
 
-/* 80BEB54C-80BEB564 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
-SECTION_DATA static Vec l_cull_box[2] = {
+static Vec l_cull_box[2] = {
     {-150.0f, -10.0f, -150.0f},
     {150.0f, 1200.0f, 150.0f},
 };
 
-/* 80BEB564-80BEB5B0 00003C 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -64,7 +57,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 80BE9DDC-80BEA034 00019C 0258+00 1/1 0/0 0/0 .text            Create__15daObjFPillar2_cFv */
 int daObjFPillar2_c::Create() {
     if (getKind() == KIND_MAGMA_POLE) {
         switch(getSize()) {
@@ -114,7 +106,6 @@ int daObjFPillar2_c::Create() {
     return 1;
 }
 
-/* 80BEA034-80BEA1E0 0003F4 01AC+00 1/1 0/0 0/0 .text            CreateHeap__15daObjFPillar2_cFv */
 int daObjFPillar2_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
     JUT_ASSERT(363, modelData != NULL);
@@ -137,7 +128,6 @@ int daObjFPillar2_c::CreateHeap() {
     return 1;
 }
 
-/* 80BEA228-80BEA400 0005E8 01D8+00 1/1 0/0 0/0 .text            create__15daObjFPillar2_cFv */
 int daObjFPillar2_c::create() {
     fopAcM_ct(this, daObjFPillar2_c);
     if (mInitAngles == 0) {
@@ -171,7 +161,6 @@ int daObjFPillar2_c::create() {
     return rv;
 }
 
-/* 80BEA584-80BEA734 000944 01B0+00 1/1 0/0 0/0 .text            execute__15daObjFPillar2_cFv */
 int daObjFPillar2_c::execute() {
     action();
     field_0x944.x = scale.x;
@@ -201,7 +190,6 @@ int daObjFPillar2_c::execute() {
     return 1;
 }
 
-/* 80BEA734-80BEA808 000AF4 00D4+00 1/1 0/0 0/0 .text            action__15daObjFPillar2_cFv */
 void daObjFPillar2_c::action() {
     static daObjFPillar2_c::actionFunc l_func[3] = {
         &daObjFPillar2_c::actionOff,
@@ -218,50 +206,42 @@ void daObjFPillar2_c::action() {
 }
 
 
-/* 80BEB5F8-80BEB600 0000D0 0006+02 1/1 0/0 0/0 .data            l_pipe_fire_id$4005 */
-SECTION_DATA static u16 l_pipe_fire_id[3] = {
+static u16 l_pipe_fire_id[3] = {
     0x84E1,
     0x84E2,
     0x84E3,
 };
 
-/* 80BEB600-80BEB608 0000D8 0006+02 1/1 0/0 0/0 .data            l_yogan_foot_id$4014 */
-SECTION_DATA static u16 l_yogan_foot_id[3] = {
+static u16 l_yogan_foot_id[3] = {
     0x816F,
     0x8170,
     0x8171,
 };
 
-/* 80BEB608-80BEB610 0000E0 0006+02 1/0 0/0 0/0 .data            l_yogan_headL_id$4092 */
-SECTION_DATA static u16 l_yogan_headL_id[3] = {
+static u16 l_yogan_headL_id[3] = {
     0x84E4,
     0x84E5,
     0x84E6,
 };
 
-/* 80BEB610-80BEB618 0000E8 0006+02 1/0 0/0 0/0 .data            l_yogan_headM_id$4093 */
-SECTION_DATA static u16 l_yogan_headM_id[3] = {
+static u16 l_yogan_headM_id[3] = {
     0x84E7,
     0x84E8,
     0x84E9,
 };
 
-/* 80BEB618-80BEB620 0000F0 0006+02 1/0 0/0 0/0 .data            l_yogan_headS_id$4094 */
-SECTION_DATA static u16 l_yogan_headS_id[3] = {
+static u16 l_yogan_headS_id[3] = {
     0x84EA,
     0x84EB,
     0x84EC,
 };
 
-/* 80BEB620-80BEB62C -00001 000C+00 1/1 0/0 0/0 .data            l_yogan_head_id$4095 */
-SECTION_DATA static u16* l_yogan_head_id[3] = {
+static u16* l_yogan_head_id[3] = {
     l_yogan_headS_id,
     l_yogan_headM_id,
     l_yogan_headL_id,
 };
 
-/* 80BEA808-80BEA854 000BC8 004C+00 3/3 0/0 0/0 .text            actionOffInit__15daObjFPillar2_cFv
- */
 void daObjFPillar2_c::actionOffInit() {
     u8 arg0 = getArg0();
     if (arg0 == 0xff) {
@@ -274,7 +254,6 @@ void daObjFPillar2_c::actionOffInit() {
     mAction = ACTION_OFF;
 }
 
-/* 80BEA854-80BEA98C 000C14 0138+00 1/0 0/0 0/0 .text            actionOff__15daObjFPillar2_cFv */
 void daObjFPillar2_c::actionOff() {
     cLib_chaseF(&field_0x944.y, 0.0f, scale.y * 0.1f);
     if (mActionTimer == 0) {
@@ -300,7 +279,6 @@ void daObjFPillar2_c::actionOff() {
     }
 }
 
-/* 80BEA98C-80BEAAE4 000D4C 0158+00 1/1 0/0 0/0 .text actionOnWaitInit__15daObjFPillar2_cFv */
 void daObjFPillar2_c::actionOnWaitInit() {
     if (getKind() == KIND_PIPE_FIRE) {
         for (int i = 0; i < 3; i++) {
@@ -320,8 +298,6 @@ void daObjFPillar2_c::actionOnWaitInit() {
     mAction = ACTION_ON_WAIT;
 }
 
-/* 80BEAAE4-80BEAC68 000EA4 0184+00 1/0 0/0 0/0 .text            actionOnWait__15daObjFPillar2_cFv
- */
 void daObjFPillar2_c::actionOnWait() {
     cLib_chaseF(&field_0x944.y, scale.y * 0.1f, scale.y * 0.02f);
     if (mActionTimer == 0) {
@@ -349,8 +325,6 @@ void daObjFPillar2_c::actionOnWait() {
     }
 }
 
-/* 80BEAC68-80BEADD0 001028 0168+00 1/1 0/0 0/0 .text            actionOnInit__15daObjFPillar2_cFv
- */
 void daObjFPillar2_c::actionOnInit() {
     if (getKind() == KIND_MAGMA_POLE) {
         for (int i = 0; i < 3; i++) {
@@ -376,7 +350,6 @@ void daObjFPillar2_c::actionOnInit() {
     mAction = ACTION_ON;
 }
 
-/* 80BEADD0-80BEB1B4 001190 03E4+00 1/0 0/0 0/0 .text            actionOn__15daObjFPillar2_cFv */
 void daObjFPillar2_c::actionOn() {
     f32 target = scale.y;
     if (mActionTimer == 0) {
@@ -461,7 +434,6 @@ void daObjFPillar2_c::actionOn() {
     }
 }
 
-/* 80BEB1B4-80BEB278 001574 00C4+00 1/1 0/0 0/0 .text            draw__15daObjFPillar2_cFv */
 int daObjFPillar2_c::draw() {
     if (getKind() == KIND_MAGMA_POLE) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -475,7 +447,6 @@ int daObjFPillar2_c::draw() {
     return 1;
 }
 
-/* 80BEB278-80BEB3C8 001638 0150+00 1/1 0/0 0/0 .text            _delete__15daObjFPillar2_cFv */
 int daObjFPillar2_c::_delete() {
     if (field_0x980 != NULL) {
         field_0x980->becomeInvalidEmitter();
@@ -506,30 +477,24 @@ int daObjFPillar2_c::_delete() {
     return 1;
 }
 
-/* 80BEB3C8-80BEB3E8 001788 0020+00 1/0 0/0 0/0 .text daObjFPillar2_Draw__FP15daObjFPillar2_c */
 static int daObjFPillar2_Draw(daObjFPillar2_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BEB3E8-80BEB408 0017A8 0020+00 1/0 0/0 0/0 .text daObjFPillar2_Execute__FP15daObjFPillar2_c
- */
 static int daObjFPillar2_Execute(daObjFPillar2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BEB408-80BEB428 0017C8 0020+00 1/0 0/0 0/0 .text daObjFPillar2_Delete__FP15daObjFPillar2_c */
 static int daObjFPillar2_Delete(daObjFPillar2_c* i_this) {
     fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80BEB428-80BEB448 0017E8 0020+00 1/0 0/0 0/0 .text daObjFPillar2_Create__FP10fopAc_ac_c */
 static int daObjFPillar2_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjFPillar2_c*>(i_this)->create();
 }
 
-/* 80BEB62C-80BEB64C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFPillar2_Method */
 static actor_method_class l_daObjFPillar2_Method = {
     (process_method_func)daObjFPillar2_Create,
     (process_method_func)daObjFPillar2_Delete,
@@ -538,7 +503,6 @@ static actor_method_class l_daObjFPillar2_Method = {
     (process_method_func)daObjFPillar2_Draw,
 };
 
-/* 80BEB64C-80BEB67C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_FirePillar2 */
 extern actor_process_profile_definition g_profile_Obj_FirePillar2 = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp
index c00b8ee6a5..5fbb14e0a2 100644
--- a/src/d/actor/d_a_obj_flag.cpp
+++ b/src/d/actor/d_a_obj_flag.cpp
@@ -15,7 +15,6 @@ daObjFlag_c::M_attrs const daObjFlag_c::M_attr = {
     12000.0f, 3000.0f, 12000.0f
 };
 
-/* 80BEB778-80BEB8F0 000078 0178+00 1/1 0/0 0/0 .text            create_init__11daObjFlag_cFv */
 void daObjFlag_c::create_init() {
     field_0x5dc = (*(u32*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat")) & 0xffff;
     mPos = cXyz(current.pos.x, current.pos.y + field_0x5dc, current.pos.z);
@@ -32,7 +31,6 @@ void daObjFlag_c::create_init() {
     initBaseMtx();
 }
 
-/* 80BEB8F0-80BEB984 0001F0 0094+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjFlag_cFv */
 void daObjFlag_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mpModel2->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -45,13 +43,11 @@ void daObjFlag_c::initBaseMtx() {
     }
 }
 
-/* 80BEB984-80BEB9AC 000284 0028+00 1/1 0/0 0/0 .text getJointAngle__11daObjFlag_cFP5csXyzi */
 void daObjFlag_c::getJointAngle(csXyz* i_angle, int i_index) {
     csXyz* joint =  &mFlagJoints[i_index].mJoint1;
     *i_angle = *joint;
 }
 
-/* 80BEB9AC-80BEBC58 0002AC 02AC+00 1/1 0/0 0/0 .text            calcJointAngle__11daObjFlag_cFv */
 void daObjFlag_c::calcJointAngle() {
     f32 power;
     cXyz direction;
@@ -95,8 +91,6 @@ void daObjFlag_c::calcJointAngle() {
     }
 }
 
-/* 80BEBC58-80BEBDAC 000558 0154+00 1/1 0/0 0/0 .text
- * calcAngleSwingZ__11daObjFlag_cFP11FlagJoint_cf               */
  void daObjFlag_c::calcAngleSwingZ(FlagJoint_c* param_0, f32 param_1) {
     f32 swing = param_1 * -(attr().field_0x0e / 0.7f) + attr().field_0x0e / 0.7f;
     f32 tmp = attr().field_0x1a * cM_ssin(field_0x5e8);
@@ -116,8 +110,6 @@ void daObjFlag_c::calcJointAngle() {
     param_0->mRv += (s16)(param_1 * attr().field_0x30);
 }
 
-/* 80BEBDAC-80BEBE64 0006AC 00B8+00 1/1 0/0 0/0 .text
- * calcAngleSwingX__11daObjFlag_cFP11FlagJoint_cf               */
 void daObjFlag_c::calcAngleSwingX(FlagJoint_c* param_0, f32 param_1) {
     float tmp = 16384.0f / attr().field_0x08;
     float swing = tmp * param_1 - 16384.0f;
@@ -132,7 +124,6 @@ void daObjFlag_c::calcAngleSwingX(FlagJoint_c* param_0, f32 param_1) {
     }
 }
 
-/* 80BEBE64-80BEBFC8 000764 0164+00 1/1 0/0 0/0 .text            getSwingY__11daObjFlag_cFf */
 f32 daObjFlag_c::getSwingY(f32 param_0) {
     f32 swing = param_0 * 6666.6665f;
     if(swing > 4000.0f) {
@@ -163,7 +154,6 @@ f32 daObjFlag_c::getSwingY(f32 param_0) {
     return (int)(short)((swing + var3) + var4 + var5);
 }
 
-/* 80BEBFC8-80BEC0B8 0008C8 00F0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* joint, int param_1) {
     switch(param_1) {
         default:
@@ -232,7 +222,6 @@ inline int daObjFlag_c::createHeap() {
     return 1;
 }
 
-/* 80BEC0B8-80BEC234 0009B8 017C+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_actor) {
     daObjFlag_c* i_this = static_cast<daObjFlag_c*>(i_actor);
     return i_this->createHeap();
@@ -254,7 +243,6 @@ inline int daObjFlag_c::draw() {
     return 1;
 }
 
-/* 80BEC234-80BEC300 000B34 00CC+00 1/0 0/0 0/0 .text            daObjFlag_Draw__FP11daObjFlag_c */
 static int daObjFlag_Draw(daObjFlag_c* param_0) {
     return param_0->draw();
 }
@@ -268,27 +256,20 @@ inline int daObjFlag_c::execute() {
     return 1;
 }
 
-/* 80BEC300-80BEC338 000C00 0038+00 1/0 0/0 0/0 .text            daObjFlag_Execute__FP11daObjFlag_c
- */
 static int daObjFlag_Execute(daObjFlag_c* param_0) {
     return param_0->execute();
 }
 
-/* 80BEC338-80BEC340 000C38 0008+00 1/0 0/0 0/0 .text            daObjFlag_IsDelete__FP11daObjFlag_c
- */
 static bool daObjFlag_IsDelete(daObjFlag_c* param_0) {
     return true;
 }
 
-/* 80BEC340-80BEC3BC 000C40 007C+00 1/0 0/0 0/0 .text            daObjFlag_Delete__FP11daObjFlag_c
- */
 static int daObjFlag_Delete(daObjFlag_c* param_0) {
     param_0->~daObjFlag_c();
 
     return 1;
 }
 
-/* 80BEC3BC-80BEC3F8 000CBC 003C+00 2/2 0/0 0/0 .text            __dt__11FlagJoint_cFv */
 FlagJoint_c::~FlagJoint_c() {}
 
 inline int daObjFlag_c::create() {
@@ -311,15 +292,12 @@ inline int daObjFlag_c::create() {
     return phase_state;
 }
 
-/* 80BEC3F8-80BEC4E0 000CF8 00E8+00 1/0 0/0 0/0 .text            daObjFlag_Create__FP10fopAc_ac_c */
 static int daObjFlag_Create(fopAc_ac_c* param_0) {
     return static_cast<daObjFlag_c*>(param_0)->create();
 }
 
-/* 80BEC4E0-80BEC4E4 000DE0 0004+00 1/1 0/0 0/0 .text            __ct__11FlagJoint_cFv */
 FlagJoint_c::FlagJoint_c() {}
 
-/* 80BEC580-80BEC5A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFlag_Method */
 static actor_method_class l_daObjFlag_Method = {
     (process_method_func)daObjFlag_Create,
     (process_method_func)daObjFlag_Delete,
@@ -328,7 +306,6 @@ static actor_method_class l_daObjFlag_Method = {
     (process_method_func)daObjFlag_Draw,
 };
 
-/* 80BEC5A0-80BEC5D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Flag */
 extern actor_process_profile_definition g_profile_Obj_Flag = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp
index 526491796e..5e1c59e499 100644
--- a/src/d/actor/d_a_obj_flag2.cpp
+++ b/src/d/actor/d_a_obj_flag2.cpp
@@ -54,12 +54,10 @@ public:
 daObjFlag2_Hio_c M_hio;
 #endif
 
-/* 80BEE0DC-80BEE0F0 000000 0014+00 5/5 0/0 0/0 .rodata          M_attr__12daObjFlag2_c */
 daObjFlag2_Attr_c const daObjFlag2_c::M_attr = {
     -2.0f, 0.74f, 0.68f, 40.0f, 100.0f,
 };
 
-/* 80BEE220-80BEE31C 000000 00FC+00 1/1 0/0 0/0 .data            l_pennant_flag_pos */
 static Vec l_pennant_flag_pos[21] = {
     0.0f,   0.0f,   500.0f, 0.0f,   30.0f,  400.0f, 0.0f,    -30.0f, 400.0f, 0.0f,   60.0f,
     300.0f, 0.0f,   0.0f,   300.0f, 0.0f,   -60.0f, 300.0f,  0.0f,   90.0f,  200.0f, 0.0f,
@@ -69,8 +67,6 @@ static Vec l_pennant_flag_pos[21] = {
     -30.0f, 0.0f,   0.0f,   -90.0f, 0.0f,   0.0f,   -150.0f, 0.0f,
 };
 
-/* 80BEC658-80BEC790 000078 0138+00 1/1 0/0 0/0 .text
- * initFlagPos__11FlagCloth_cFP4cXyzP10fopAc_ac_c               */
 void FlagCloth_c::initFlagPos(cXyz* pFlagPos, fopAc_ac_c* i_actor) {
     mpFlagPosition = pFlagPos;
     cXyz direction;
@@ -96,22 +92,19 @@ void FlagCloth_c::initFlagPos(cXyz* pFlagPos, fopAc_ac_c* i_actor) {
     initCcSphere(i_actor);
 }
 
-/* 80BEE31C-80BEE3C4 0000FC 00A8+00 1/1 0/0 0/0 .data            l_texCoord_64x64 */
 static f32 l_texCoord_64x64[42] = {
     1.0,  0.5,  0.8f, 0.4f, 0.8f, 0.6f, 0.6f, 0.3f, 0.6f, 0.5,  0.6f, 0.7f, 0.4f, 0.2f,
     0.4f, 0.4f, 0.4f, 0.6f, 0.4f, 0.8f, 0.2f, 0.1f, 0.2f, 0.3f, 0.2f, 0.5,  0.2f, 0.7f,
     0.2f, 0.9f, 0.0,  0.0,  0.0,  0.2f, 0.0,  0.4f, 0.0,  0.6f, 0.0,  0.8f, 0.0,  1.0,
 };
 
-/* 80BEE3C4-80BEE480 0001A4 00A8+14 1/1 0/0 0/0 .data            l_texCoord */
 static f32 l_texCoord[42] = {
     0.0,  0.5,  0.2f, 0.4f, 0.2f, 0.6f, 0.4f, 0.3f, 0.4f, 0.5,  0.4f, 0.7f, 0.6f, 0.2f,
     0.6f, 0.4f, 0.6f, 0.6f, 0.6f, 0.8f, 0.8f, 0.1f, 0.8f, 0.3f, 0.8f, 0.5,  0.8f, 0.7f,
     0.8f, 0.9f, 1.0,  0.0,  1.0,  0.2f, 1.0,  0.4f, 1.0,  0.6f, 1.0,  0.8f, 1.0,  1.0,
 };
 
-/* 80BEE480-80BEE518 000260 0098+00 1/1 0/0 0/0 .data            l_pennant_flagDL */
-static u8 l_pennant_flagDL[152] ALIGN_DECL(32) = {
+static u8 l_pennant_flagDL[152] ATTRIBUTE_ALIGN(32) = {
     0x98, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x05,
     0x05, 0x05, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0E, 0x13, 0x13,
     0x13, 0x14, 0x14, 0x14, 0x98, 0x00, 0x09, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04,
@@ -124,8 +117,6 @@ static u8 l_pennant_flagDL[152] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80BEC7CC-80BEC928 0001EC 015C+00 1/1 0/0 0/0 .text
- * calcFlagFactor__11FlagCloth_cFP4cXyzP4cXyzP4cXyzi            */
 cXyz FlagCloth_c::calcFlagFactor(cXyz* param_1, cXyz* param_2, cXyz* param_3, int param_4) {
     static int rel_pos_idx_tbl[126] = {
         1,  2,  -1, -1, -1, -1, 3,  4,  2,  0,  -1, -1, 0,  1,  4,  5,  -1, -1, 6,  7,  4,
@@ -159,8 +150,6 @@ cXyz FlagCloth_c::calcFlagFactor(cXyz* param_1, cXyz* param_2, cXyz* param_3, in
     return flagFactor;
 }
 
-/* 80BEC928-80BECAE0 000348 01B8+00 1/1 0/0 0/0 .text
- * calcFlagFactorSub__11FlagCloth_cFP4cXyzP4cXyzP4cXyzf         */
 void FlagCloth_c::calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
     cXyz acStack_2c = *param_2 - *param_1;
     param_4 = acStack_2c.abs() - param_4;
@@ -170,7 +159,6 @@ void FlagCloth_c::calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz* param_3,
     *param_3 += cStack_38;
 }
 
-/* 80BECAE0-80BECC34 000500 0154+00 2/2 0/0 0/0 .text calcFlagNormal__11FlagCloth_cFP4cXyzi */
 void FlagCloth_c::calcFlagNormal(cXyz* o_normal, int param_2) {
     static int rel_pos_idx_tbl[147] = {
         1,  2,  -1, -1, -1, -1, -1, 3,  4,  2,  0,  -1, -1, -1, 0,  1,  4,  5,  -1, -1, -1,
@@ -201,8 +189,6 @@ void FlagCloth_c::calcFlagNormal(cXyz* o_normal, int param_2) {
     o_normal->set(cStack_60);
 }
 
-/* 80BECC34-80BECC78 000654 0044+00 1/1 0/0 0/0 .text            calcFlagNormalBack__11FlagCloth_cFv
- */
 inline void FlagCloth_c::calcFlagNormalBack() {
     cXyz* pNormal = getNormal();
     cXyz* pNormalBack = getNormalBack();
@@ -211,7 +197,6 @@ inline void FlagCloth_c::calcFlagNormalBack() {
     }
 }
 
-/* 80BECC78-80BECCE4 000698 006C+00 1/1 0/0 0/0 .text initCcSphere__11FlagCloth_cFP10fopAc_ac_c */
 void FlagCloth_c::initCcSphere(fopAc_ac_c* i_actor) {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -231,7 +216,6 @@ void FlagCloth_c::initCcSphere(fopAc_ac_c* i_actor) {
     mSph.SetC(getTargetPos());
 }
 
-/* 80BECCE4-80BECD98 000704 00B4+00 1/1 0/0 0/0 .text            setCcSphere__11FlagCloth_cFv */
 void FlagCloth_c::setCcSphere() {
     if (mSph.ChkTgHit()) {
         if (mSph.GetTgHitObj()->ChkAtType(AT_TYPE_BOOMERANG)) {
@@ -247,7 +231,6 @@ void FlagCloth_c::setCcSphere() {
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80BECD98-80BECF30 0007B8 0198+00 1/1 0/0 0/0 .text            execute__11FlagCloth_cFv */
 void FlagCloth_c::execute() {
     cXyz direction;
     f32 power;
@@ -280,7 +263,6 @@ void FlagCloth_c::execute() {
     DCStoreRangeNoSync(getNormalBack(), sizeof(cXyz) * 21);
 }
 
-/* 80BECF30-80BED22C 000950 02FC+00 1/0 0/0 0/0 .text            draw__11FlagCloth_cFv */
 void FlagCloth_c::draw() {
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
@@ -331,7 +313,6 @@ void FlagCloth_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 80BED22C-80BED368 000C4C 013C+00 1/1 0/0 0/0 .text            create_init__12daObjFlag2_cFv */
 void daObjFlag2_c::create_init() {
     int* pOffset = (int*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat");
     f32 offset = (u16)*pOffset;
@@ -353,14 +334,12 @@ void daObjFlag2_c::create_init() {
     #endif
 }
 
-/* 80BED368-80BED3B8 000D88 0050+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjFlag2_cFv */
 void daObjFlag2_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
 }
 
-/* 80BED3B8-80BED44C 000DD8 0094+00 1/1 0/0 0/0 .text            initCollision__12daObjFlag2_cFv */
 void daObjFlag2_c::initCollision() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -384,12 +363,10 @@ void daObjFlag2_c::initCollision() {
     setCollision();
 }
 
-/* 80BED44C-80BED480 000E6C 0034+00 2/2 0/0 0/0 .text            setCollision__12daObjFlag2_cFv */
 void daObjFlag2_c::setCollision() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80BED480-80BED680 000EA0 0200+00 1/1 0/0 0/0 .text            createHeap__12daObjFlag2_cFv */
 int daObjFlag2_c::createHeap() {
     s8 flagNum = (u8)shape_angle.x;
     if (mFlagValid) {
@@ -422,12 +399,10 @@ int daObjFlag2_c::createHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BED680-80BED6A0 0010A0 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjFlag2_c*>(i_this)->createHeap();
 }
 
-/* 80BED6A0-80BED7A4 0010C0 0104+00 1/1 0/0 0/0 .text            create__12daObjFlag2_cFv */
 int daObjFlag2_c::create() {
     fopAcM_ct(this, daObjFlag2_c);
     s8 flagNum = (u8)shape_angle.x;
@@ -453,7 +428,6 @@ int daObjFlag2_c::create() {
     return rv;
 }
 
-/* 80BEDCE0-80BEDDA0 001700 00C0+00 1/1 0/0 0/0 .text            draw__12daObjFlag2_cFv */
 int daObjFlag2_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     dComIfGd_setListBG();
@@ -466,8 +440,6 @@ int daObjFlag2_c::draw() {
     return 1;
 }
 
-/* 80BEDDA0-80BEDDC0 0017C0 0020+00 1/0 0/0 0/0 .text            daObjFlag2_Draw__FP12daObjFlag2_c
- */
 static int daObjFlag2_Draw(daObjFlag2_c* i_this) {
     return i_this->draw();
 }
@@ -498,25 +470,20 @@ int daObjFlag2_c::execute() {
     return 1;
 }
 
-/* 80BEDDC0-80BEDEB0 0017E0 00F0+00 1/0 0/0 0/0 .text daObjFlag2_Execute__FP12daObjFlag2_c */
 static int daObjFlag2_Execute(daObjFlag2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BEDEB0-80BEDEB8 0018D0 0008+00 1/0 0/0 0/0 .text daObjFlag2_IsDelete__FP12daObjFlag2_c */
 static int daObjFlag2_IsDelete(daObjFlag2_c* i_this) {
     return 1;
 }
 
-/* 80BEDEB8-80BEDEE0 0018D8 0028+00 1/0 0/0 0/0 .text            daObjFlag2_Delete__FP12daObjFlag2_c
- */
 static int daObjFlag2_Delete(daObjFlag2_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjFlag2_c();
     return 1;
 }
 
-/* 80BEDEE0-80BEE050 001900 0170+00 1/1 0/0 0/0 .text            __dt__12daObjFlag2_cFv */
 daObjFlag2_c::~daObjFlag2_c() {
     #ifdef DEBUG
     M_hio.dt();
@@ -528,13 +495,10 @@ daObjFlag2_c::~daObjFlag2_c() {
     dComIfG_resDelete(&mArcPhase, daSetBgObj_c::getArcName(this));
 }
 
-/* 80BEE050-80BEE070 001A70 0020+00 1/0 0/0 0/0 .text            daObjFlag2_Create__FP10fopAc_ac_c
- */
 static int daObjFlag2_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjFlag2_c*>(i_this)->create();
 }
 
-/* 80BEE95C-80BEE97C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFlag2_Method */
 static actor_method_class l_daObjFlag2_Method = {
     (process_method_func)daObjFlag2_Create,
     (process_method_func)daObjFlag2_Delete,
@@ -543,7 +507,6 @@ static actor_method_class l_daObjFlag2_Method = {
     (process_method_func)daObjFlag2_Draw,
 };
 
-/* 80BEE97C-80BEE9AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Flag2 */
 extern actor_process_profile_definition g_profile_Obj_Flag2 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp
index 4936b3efba..15bb4dd5d3 100644
--- a/src/d/actor/d_a_obj_flag3.cpp
+++ b/src/d/actor/d_a_obj_flag3.cpp
@@ -52,13 +52,10 @@ public:
 daObjFlag3_Hio_c M_hio;
 #endif
 
-/* 80BF0458-80BF046C 000000 0014+00 3/3 0/0 0/0 .rodata          M_attr__12daObjFlag3_c */
 daObjFlag3_Attr_c const daObjFlag3_c::M_attr = {
     -2.0f, 0.6f, 0.68f, 40.0f, 100.0f,
 };
 
-/* 80BEF278-80BEF6D0 000878 0458+00 1/1 0/0 0/0 .text
- * calcFlagFactor__12FlagCloth2_cFP4cXyzP4cXyzP4cXyzi           */
 inline cXyz FlagCloth2_c::calcFlagFactor(cXyz* param_1, cXyz* param_2, cXyz* param_3, int param_4) {
     cXyz flagFactor(0.0f, 0.0f, 0.0f);
     if (param_4 == 0 || param_4 == 30) {
@@ -140,7 +137,6 @@ inline void FlagCloth2_c::calcFlagFactorSub(cXyz* param_1, cXyz* param_2, cXyz*
     *param_3 += cStack_38;
 }
 
-/* 80BEEF74-80BEF278 000574 0304+00 2/2 0/0 0/0 .text calcFlagNormal__12FlagCloth2_cFP4cXyzi */
 inline void FlagCloth2_c::calcFlagNormal(cXyz* param_1, int param_2) {
     cXyz* pPos = getPos();
     cXyz cStack_44(pPos[param_2]);
@@ -226,7 +222,6 @@ void FlagCloth2_c::initCcSphere(fopAc_ac_c*) {
     };
 }
 
-/* 80BF00A0-80BF0434 0016A0 0394+00 1/0 0/0 0/0 .text            draw__12FlagCloth2_cFv */
 inline void FlagCloth2_c::draw() {
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
@@ -303,7 +298,6 @@ inline void FlagCloth2_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 80BEEA78-80BEEC3C 000078 01C4+00 1/1 0/0 0/0 .text            createHeap__12daObjFlag3_cFv */
 int daObjFlag3_c::createHeap() {
     s8 flagNum = (u8)shape_angle.x;
     if (mFlagValid) {
@@ -329,7 +323,6 @@ int daObjFlag3_c::createHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BEEC3C-80BEEC5C 00023C 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjFlag3_c*>(i_this)->createHeap();
 }
@@ -346,18 +339,14 @@ inline int daObjFlag3_c::draw() {
     return 1;
 }
 
-/* 80BEEC5C-80BEED1C 00025C 00C0+00 1/0 0/0 0/0 .text            daObjFlag3_Draw__FP12daObjFlag3_c
- */
 static int daObjFlag3_Draw(daObjFlag3_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BEED1C-80BEED3C 00031C 0020+00 1/0 0/0 0/0 .text daObjFlag3_Execute__FP12daObjFlag3_c */
 static int daObjFlag3_Execute(daObjFlag3_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BEED3C-80BEEDA8 00033C 006C+00 1/1 0/0 0/0 .text            execute__12daObjFlag3_cFv */
 int daObjFlag3_c::execute() {
     if (!mFlagValid) {
         return 1;
@@ -377,7 +366,6 @@ int daObjFlag3_c::execute() {
 }
 
 
-/* 80BEEDE4-80BEEF74 0003E4 0190+00 1/1 0/0 0/0 .text            execute__12FlagCloth2_cFv */
 void FlagCloth2_c::execute() {
     cXyz direction;
     f32 power;
@@ -409,20 +397,16 @@ void FlagCloth2_c::execute() {
     DCStoreRangeNoSync(getNormalBack(), sizeof(cXyz) * 36);
 }
 
-/* 80BEF6D0-80BEF6D8 000CD0 0008+00 1/0 0/0 0/0 .text daObjFlag3_IsDelete__FP12daObjFlag3_c */
 static int daObjFlag3_IsDelete(daObjFlag3_c* i_this) {
     return 1;
 }
 
-/* 80BEF6D8-80BEF700 000CD8 0028+00 1/0 0/0 0/0 .text            daObjFlag3_Delete__FP12daObjFlag3_c
- */
 static int daObjFlag3_Delete(daObjFlag3_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjFlag3_c();
     return 1;
 }
 
-/* 80BEF700-80BEF790 000D00 0090+00 1/1 0/0 0/0 .text            __dt__12daObjFlag3_cFv */
 daObjFlag3_c::~daObjFlag3_c() {
     #ifdef DEBUG
     M_hio.dt();
@@ -434,11 +418,8 @@ daObjFlag3_c::~daObjFlag3_c() {
     dComIfG_resDelete(&mArcPhase, daSetBgObj_c::getArcName(this));
 }
 
-/* 80BEF790-80BEF93C 000D90 01AC+00 2/1 0/0 0/0 .text            __dt__12FlagCloth2_cFv */
 FlagCloth2_c::~FlagCloth2_c() {}
 
-/* 80BEF93C-80BEF95C 000F3C 0020+00 1/0 0/0 0/0 .text            daObjFlag3_Create__FP10fopAc_ac_c
- */
 static int daObjFlag3_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjFlag3_c*>(i_this)->create();
@@ -450,7 +431,6 @@ void daObjFlag3_c::initBaseMtx() {
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
 }
 
-/* 80BEFBC4-80BEFD08 0011C4 0144+00 1/1 0/0 0/0 .text            create_init__12daObjFlag3_cFv */
 void daObjFlag3_c::create_init() {
     int* pOffset = (int*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat");
     f32 offset = (u16)*pOffset;
@@ -470,7 +450,6 @@ void daObjFlag3_c::create_init() {
     #endif
 }
 
-/* 80BEFD08-80BEFF30 001308 0228+00 1/1 0/0 0/0 .text            initFlagPos__12FlagCloth2_cFP4cXyzP10fopAc_ac_c */
 void FlagCloth2_c::initFlagPos(cXyz* param_0, fopAc_ac_c* param_1) {
     mpFlagPosition = param_0;
     cXyz direction;
@@ -503,7 +482,6 @@ void FlagCloth2_c::initFlagPos(cXyz* param_0, fopAc_ac_c* param_1) {
     initTexCoord();
 }
 
-/* 80BEF95C-80BEFBC4 000F5C 0268+00 1/1 0/0 0/0 .text            create__12daObjFlag3_cFv */
 int daObjFlag3_c::create() {
     fopAcM_ct(this, daObjFlag3_c);
     s8 flagNum = (u8)shape_angle.x;
@@ -528,7 +506,6 @@ int daObjFlag3_c::create() {
     return rv;
 }
 
-/* 80BF058C-80BF05AC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjFlag3_Method */
 static actor_method_class l_daObjFlag3_Method = {
     (process_method_func)daObjFlag3_Create,
     (process_method_func)daObjFlag3_Delete,
@@ -537,7 +514,6 @@ static actor_method_class l_daObjFlag3_Method = {
     (process_method_func)daObjFlag3_Draw,
 };
 
-/* 80BF05AC-80BF05DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Flag3 */
 extern actor_process_profile_definition g_profile_Obj_Flag3 = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp
index 478905a384..1f44709e73 100644
--- a/src/d/actor/d_a_obj_fmobj.cpp
+++ b/src/d/actor/d_a_obj_fmobj.cpp
@@ -13,7 +13,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8057CBD8-8057CC44 000078 006C+00 1/0 0/0 0/0 .text daObj_Fmobj_Draw__FP15obj_fmobj_class */
 static int daObj_Fmobj_Draw(obj_fmobj_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     J3DModel* model_p = i_this->mpModel;
@@ -24,7 +23,6 @@ static int daObj_Fmobj_Draw(obj_fmobj_class* i_this) {
     return 1;
 }
 
-/* 8057CC44-8057CC84 0000E4 0040+00 1/0 0/0 0/0 .text daObj_Fmobj_Execute__FP15obj_fmobj_class */
 static int daObj_Fmobj_Execute(obj_fmobj_class* i_this) {
     fopAc_ac_c* actor = &i_this->mActor;
     i_this->field_0x578++;
@@ -38,12 +36,10 @@ static int daObj_Fmobj_Execute(obj_fmobj_class* i_this) {
     return 1;
 }
 
-/* 8057CC84-8057CC8C 000124 0008+00 1/0 0/0 0/0 .text daObj_Fmobj_IsDelete__FP15obj_fmobj_class */
 static int daObj_Fmobj_IsDelete(obj_fmobj_class* i_this) {
     return 1;
 }
 
-/* 8057CC8C-8057CCDC 00012C 0050+00 1/0 0/0 0/0 .text daObj_Fmobj_Delete__FP15obj_fmobj_class */
 static int daObj_Fmobj_Delete(obj_fmobj_class* i_this) {
     fopAc_ac_c* actor = &i_this->mActor;
     fopAcM_RegisterDeleteID(i_this, "Obj_Fmobj");
@@ -52,7 +48,6 @@ static int daObj_Fmobj_Delete(obj_fmobj_class* i_this) {
     return 1;
 }
 
-/* 8057CCDC-8057CDE0 00017C 0104+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_fmobj_class* a_this = (obj_fmobj_class*)i_this;
 
@@ -76,8 +71,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 8057CDE0-8057CF60 000280 0180+00 1/0 0/0 0/0 .text            daObj_Fmobj_Create__FP10fopAc_ac_c
- */
 static int daObj_Fmobj_Create(fopAc_ac_c* i_this) {
     obj_fmobj_class* a_this = (obj_fmobj_class*)i_this;
     fopAcM_ct(&a_this->mActor, obj_fmobj_class);
@@ -119,15 +112,12 @@ static int daObj_Fmobj_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 8057CF80-8057CFA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Fmobj_Method */
 static actor_method_class l_daObj_Fmobj_Method = {
     (process_method_func)daObj_Fmobj_Create,  (process_method_func)daObj_Fmobj_Delete,
     (process_method_func)daObj_Fmobj_Execute, (process_method_func)daObj_Fmobj_IsDelete,
     (process_method_func)daObj_Fmobj_Draw,
 };
 
-/* 8057CFA0-8057CFD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_FMOBJ */
 extern actor_process_profile_definition g_profile_OBJ_FMOBJ = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp
index 3cc6671f0a..19aae2eea0 100644
--- a/src/d/actor/d_a_obj_food.cpp
+++ b/src/d/actor/d_a_obj_food.cpp
@@ -14,20 +14,15 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80BF1F40-80BF1F44 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80BF1F50-80BF1F5C 000018 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_Food_HIO_c l_HIO;
 
-/* 80BF070C-80BF0730 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daObj_Food_HIO_cFv */
 daObj_Food_HIO_c::daObj_Food_HIO_c() {
     field_0x4 = -1;
     mBoneScale = 1.0f;
 }
 
-/* 80BF0730-80BF0854 000110 0124+00 1/0 0/0 0/0 .text            daObj_Food_Draw__FP14obj_food_class
- */
 static int daObj_Food_Draw(obj_food_class* i_this) {
     if (daPy_py_c::wolfGrabSubjectNoDraw(i_this)) {
         return 1;
@@ -56,8 +51,6 @@ static int daObj_Food_Draw(obj_food_class* i_this) {
     return 1;
 }
 
-/* 80BF0854-80BF09A4 000234 0150+00 1/1 0/0 0/0 .text            ground_ang_set__FP14obj_food_class
- */
 static void ground_ang_set(obj_food_class* i_this) {
     dBgS_GndChk gnd_chk;
     Vec vec1;
@@ -83,7 +76,6 @@ static void ground_ang_set(obj_food_class* i_this) {
     }
 }
 
-/* 80BF09A4-80BF0AD0 000384 012C+00 1/1 0/0 0/0 .text            food_carry__FP14obj_food_class */
 
 static void food_carry(obj_food_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -113,8 +105,6 @@ static void food_carry(obj_food_class* i_this) {
     cLib_addCalcAngleS2(&i_this->mGroundAngleZ, 0, 1, 0x800);
 }
 
-/* 80BF0AD0-80BF0C74 0004B0 01A4+00 2/2 0/0 0/0 .text            wall_angle_get__FP14obj_food_class
- */
 static s16 wall_angle_get(obj_food_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     dBgS_LinChk lin_chk;
@@ -148,7 +138,6 @@ static s16 wall_angle_get(obj_food_class* i_this) {
     return cM_atan2s(vec2.x, vec2.z) + 0x4000;
 }
 
-/* 80BF0C74-80BF0FC0 000654 034C+00 1/1 0/0 0/0 .text            food_normal__FP14obj_food_class */
 static void food_normal(obj_food_class* i_this) {
     if (i_this->mAcch.ChkGroundHit()) {
         fopAcM_SetFoodStatus(i_this, fopAcM_FOOD_0);
@@ -219,7 +208,6 @@ static void food_normal(obj_food_class* i_this) {
     }
 }
 
-/* 80BF0FC0-80BF1168 0009A0 01A8+00 1/1 0/0 0/0 .text            ball_move__FP14obj_food_class */
 static void ball_move(obj_food_class* i_this) {
     if (i_this->mTimer[0] == 0 && (i_this->mCcSph.ChkTgHit() || i_this->mCcSph.ChkCoHit())) {
         cCcD_Obj* hit_obj;
@@ -255,7 +243,6 @@ static void ball_move(obj_food_class* i_this) {
     }
 }
 
-/* 80BF1168-80BF1700 000B48 0598+00 1/1 0/0 0/0 .text            action__FP14obj_food_class */
 static void action(obj_food_class* i_this) {
     cXyz vec1, vec2;
 
@@ -383,7 +370,6 @@ static void action(obj_food_class* i_this) {
     i_this->attention_info.position = i_this->eyePos = i_this->current.pos;
 }
 
-/* 80BF1700-80BF1794 0010E0 0094+00 2/1 0/0 0/0 .text daObj_Food_Execute__FP14obj_food_class */
 static int daObj_Food_Execute(obj_food_class* i_this) {
     i_this->mCounter++;
     for (int i = 0; i < 4; i++) {
@@ -396,12 +382,10 @@ static int daObj_Food_Execute(obj_food_class* i_this) {
     return 1;
 }
 
-/* 80BF1794-80BF179C 001174 0008+00 1/0 0/0 0/0 .text daObj_Food_IsDelete__FP14obj_food_class */
 static int daObj_Food_IsDelete(obj_food_class* i_this) {
     return 1;
 }
 
-/* 80BF179C-80BF1804 00117C 0068+00 1/0 0/0 0/0 .text daObj_Food_Delete__FP14obj_food_class */
 static int daObj_Food_Delete(obj_food_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_fd");
     if (i_this->mHIOInit) {
@@ -413,7 +397,6 @@ static int daObj_Food_Delete(obj_food_class* i_this) {
     return 1;
 }
 
-/* 80BF1804-80BF18CC 0011E4 00C8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_food_class* _this = static_cast<obj_food_class*>(i_this);
 
@@ -433,8 +416,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80BF18CC-80BF1BE8 0012AC 031C+00 1/0 0/0 0/0 .text            daObj_Food_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObj_Food_Create(fopAc_ac_c* i_this) {
     obj_food_class* _this = static_cast<obj_food_class*>(i_this);
     fopAcM_ct(i_this, obj_food_class);
@@ -513,7 +494,6 @@ static cPhs__Step daObj_Food_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80BF1EA0-80BF1EC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Food_Method */
 static actor_method_class l_daObj_Food_Method = {
     (process_method_func)daObj_Food_Create,
     (process_method_func)daObj_Food_Delete,
@@ -522,7 +502,6 @@ static actor_method_class l_daObj_Food_Method = {
     (process_method_func)daObj_Food_Draw,
 };
 
-/* 80BF1EC0-80BF1EF0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_FOOD */
 extern actor_process_profile_definition g_profile_OBJ_FOOD = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp
index c0e2a646db..f41a3073a2 100644
--- a/src/d/actor/d_a_obj_fw.cpp
+++ b/src/d/actor/d_a_obj_fw.cpp
@@ -24,19 +24,15 @@ enum Action {
     /* 0x0 */ ACTION_FLOAT,
 };
 
-/* 80BF204C-80BF2070 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daObj_Fw_HIO_cFv */
 daObj_Fw_HIO_c::daObj_Fw_HIO_c() {
     field_0x4 = -1;
     size = 1.0f;
 }
 
-/* 80BF2C20-80BF2C24 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80BF2C30-80BF2C3C 000018 000C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daObj_Fw_HIO_c l_HIO;
 
-/* 80BF2070-80BF219C 000110 012C+00 1/1 0/0 0/0 .text            ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_ALINK) {
         obj_fw_class* i_this = (obj_fw_class*)a_this;
@@ -61,7 +57,6 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3)
     }
 }
 
-/* 80BF219C-80BF2200 00023C 0064+00 1/0 0/0 0/0 .text            daObj_Fw_Draw__FP12obj_fw_class */
 static int daObj_Fw_Draw(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -71,7 +66,6 @@ static int daObj_Fw_Draw(obj_fw_class* i_this) {
     return 1;
 }
 
-/* 80BF2200-80BF22AC 0002A0 00AC+00 1/1 0/0 0/0 .text            water_check__FP12obj_fw_class */
 static BOOL water_check(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     Vec sp78;
@@ -90,7 +84,6 @@ static BOOL water_check(obj_fw_class* i_this) {
     return FALSE;
 }
 
-/* 80BF22AC-80BF24C4 00034C 0218+00 1/1 0/0 0/0 .text            fw_float__FP12obj_fw_class */
 static void fw_float(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -131,7 +124,6 @@ static void fw_float(obj_fw_class* i_this) {
     cLib_addCalc2(&i_this->field_0x598, fVar3, 1.0f, 3.0f);
 }
 
-/* 80BF24C4-80BF2670 000564 01AC+00 1/1 0/0 0/0 .text            action__FP12obj_fw_class */
 static void action(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp30, sp3c;
@@ -168,7 +160,6 @@ static void action(obj_fw_class* i_this) {
     }
 }
 
-/* 80BF2670-80BF2718 000710 00A8+00 2/1 0/0 0/0 .text            daObj_Fw_Execute__FP12obj_fw_class */
 static int daObj_Fw_Execute(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -191,12 +182,10 @@ static int daObj_Fw_Execute(obj_fw_class* i_this) {
     return 1;
 }
 
-/* 80BF2718-80BF2720 0007B8 0008+00 1/0 0/0 0/0 .text            daObj_Fw_IsDelete__FP12obj_fw_class */
 static int daObj_Fw_IsDelete(obj_fw_class* i_this) {
     return 1;
 }
 
-/* 80BF2720-80BF279C 0007C0 007C+00 1/0 0/0 0/0 .text            daObj_Fw_Delete__FP12obj_fw_class */
 static int daObj_Fw_Delete(obj_fw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -215,7 +204,6 @@ static int daObj_Fw_Delete(obj_fw_class* i_this) {
     return 1;
 }
 
-/* 80BF279C-80BF28D0 00083C 0134+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_fw_class* i_this = (obj_fw_class*)a_this;
 
@@ -250,7 +238,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80BF28D0-80BF2AB0 000970 01E0+00 1/0 0/0 0/0 .text            daObj_Fw_Create__FP10fopAc_ac_c */
 static cPhs__Step daObj_Fw_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_fw_class);
     obj_fw_class* i_this = (obj_fw_class*)a_this;
@@ -310,7 +297,6 @@ static cPhs__Step daObj_Fw_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80BF2BBC-80BF2BDC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Fw_Method */
 static actor_method_class l_daObj_Fw_Method = {
     (process_method_func)daObj_Fw_Create,
     (process_method_func)daObj_Fw_Delete,
@@ -319,7 +305,6 @@ static actor_method_class l_daObj_Fw_Method = {
     (process_method_func)daObj_Fw_Draw,
 };
 
-/* 80BF2BDC-80BF2C0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_FW */
 extern actor_process_profile_definition g_profile_OBJ_FW = {
   fpcLy_CURRENT_e,        // mLayerID
   8,                      // mListID
diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp
index 8d874ca788..5f73a4fa86 100644
--- a/src/d/actor/d_a_obj_gadget.cpp
+++ b/src/d/actor/d_a_obj_gadget.cpp
@@ -34,13 +34,11 @@ public:
 #endif
 
 
-/* 80BF4944-80BF4970 000000 002C+00 4/4 0/0 0/0 .rodata          m__20daObj_Gadget_Param_c */
 daObj_Gadget_HIOParam const daObj_Gadget_Param_c::m = {
     0.0f, -4.0f, 1.0f, 100.0f, 37.0f, 26.0f, 13.0f, 14.0f,
      37.0f, 50.0f, 18.0f,
 };
 
-/* 80BF4970-80BF49A0 00002C 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 static dCcD_SrcGObjInf const l_ccDObjData = 
 {
         {0x0, {{0x0, 0x0, 0}, {0xD8FBFDFF, 0x1F}, 0x79}}, // mObj
@@ -49,18 +47,15 @@ static dCcD_SrcGObjInf const l_ccDObjData =
         {0x0}, // mGObjCo
 };
 
-/* 80BF4A4C-80BF4A5C 000020 0010+00 2/3 0/0 0/0 .data            l_bmdData */
 static u32 l_bmdData[2][2] = {
     35, 1, 34, 1,
 };
 
-/* 80BF4A5C-80BF4A64 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "ykM1",
 };
 
-/* 80BF4A64-80BF4AA8 000038 0044+00 1/2 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     l_ccDObjData, // mObjInf
     {
@@ -141,10 +136,8 @@ void daObj_Gadget_HIO_c::genMessage(JORMContext* ctx) {
 
 #endif
 
-/* 80BF4BE4-80BF4BE8 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static PARAM_CLASS l_HIO;
 
-/* 80BF2D2C-80BF2F28 0000EC 01FC+00 1/0 0/0 0/0 .text            __dt__14daObj_Gadget_cFv */
 daObj_Gadget_c::~daObj_Gadget_c() {
     OS_REPORT("|%06d:%x|daObj_Gadget_c -> デストラクト\n", g_Counter.mCounter0, this);
     
@@ -159,7 +152,6 @@ daObj_Gadget_c::~daObj_Gadget_c() {
         l_resNameList[l_bmdData[field_0x9d0][1]]);
 }
 
-/* 80BF2F28-80BF3228 0002E8 0300+00 1/1 0/0 0/0 .text            create__14daObj_Gadget_cFv */
 int daObj_Gadget_c::create() {
     fopAcM_ct(this, daObj_Gadget_c);
     field_0x9d0 = getType();
@@ -200,7 +192,6 @@ int daObj_Gadget_c::create() {
     return rv;
 }
 
-/* 80BF3478-80BF3504 000838 008C+00 1/1 0/0 0/0 .text            CreateHeap__14daObj_Gadget_cFv */
 int daObj_Gadget_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[field_0x9d0][1]],
@@ -210,14 +201,12 @@ int daObj_Gadget_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80BF3504-80BF3538 0008C4 0034+00 1/1 0/0 0/0 .text            Delete__14daObj_Gadget_cFv */
 int daObj_Gadget_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_Gadget_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_Gadget_c();
     return 1;
 }
 
-/* 80BF3538-80BF3FAC 0008F8 0A74+00 2/2 0/0 0/0 .text            Execute__14daObj_Gadget_cFv */
 int daObj_Gadget_c::Execute() {
     BOOL carryNow = fopAcM_checkCarryNow(this) != FALSE;
     
@@ -452,7 +441,6 @@ int daObj_Gadget_c::Execute() {
     return 1;
 }
 
-/* 80BF3FAC-80BF40E8 00136C 013C+00 1/1 0/0 0/0 .text            Draw__14daObj_Gadget_cFv */
 int daObj_Gadget_c::Draw() {
     if (mHide == 0) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -475,27 +463,21 @@ int daObj_Gadget_c::Draw() {
     return 1;
 }
 
-/* 80BF4130-80BF4150 0014F0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daObj_Gadget_cFP10fopAc_ac_c           */
 int daObj_Gadget_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return ((daObj_Gadget_c*)a_this)->CreateHeap();
 }
 
-/* 80BF4150-80BF41AC 001510 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__14daObj_Gadget_cFv
- */
 void daObj_Gadget_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80BF41AC-80BF41F0 00156C 0044+00 2/2 0/0 0/0 .text            setRoomNo__14daObj_Gadget_cFv */
 void daObj_Gadget_c::setRoomNo() {
     s8 room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_no);
     mStts.SetRoomId(room_no);
 }
 
-/* 80BF41F0-80BF424C 0015B0 005C+00 1/1 0/0 0/0 .text            reset__14daObj_Gadget_cFv */
 void daObj_Gadget_c::reset() {
     memset(&field_0x9d4, 0, (u8*)&field_0xa47 - (u8*)&field_0x9d4);
     switch (field_0x9d0) {
@@ -506,7 +488,6 @@ void daObj_Gadget_c::reset() {
     }
 }
 
-/* 80BF424C-80BF4354 00160C 0108+00 1/1 0/0 0/0 .text            setMtx__14daObj_Gadget_cFv */
 void daObj_Gadget_c::setMtx() {
     s16 angleDiff = shape_angle.y - current.angle.y;
     s16 cosVal = field_0xa14 * cM_scos(angleDiff);
@@ -521,8 +502,6 @@ void daObj_Gadget_c::setMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BF4354-80BF43F4 001714 00A0+00 1/1 0/0 0/0 .text            calcRollAngle__14daObj_Gadget_cFsi
- */
 s16 daObj_Gadget_c::calcRollAngle(s16 param_1, int param_2) {
     int result;
     if (param_1 != 0) {
@@ -546,8 +525,6 @@ s16 daObj_Gadget_c::calcRollAngle(s16 param_1, int param_2) {
     return 0;
 }
 
-/* 80BF43F4-80BF4584 0017B4 0190+00 1/1 0/0 0/0 .text            getWallAngle__14daObj_Gadget_cFsPs
- */
 BOOL daObj_Gadget_c::getWallAngle(s16 param_0, s16* param_1) {
     cXyz startPos;
     cXyz checkPos[2];
@@ -579,16 +556,12 @@ BOOL daObj_Gadget_c::getWallAngle(s16 param_0, s16* param_1) {
     return TRUE;
 }
 
-/* 80BF4584-80BF4600 001944 007C+00 1/1 0/0 0/0 .text            setSmokePrtcl__14daObj_Gadget_cFv
- */
 void daObj_Gadget_c::setSmokePrtcl() {
     fopAcM_effSmokeSet1(&field_0xa38, &field_0xa3c, &current.pos, NULL, 0.4f, &tevStr, 1);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa38);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa3c);
 }
 
-/* 80BF4600-80BF4728 0019C0 0128+00 1/1 0/0 0/0 .text            setWaterPrtcl__14daObj_Gadget_cFv
- */
 void daObj_Gadget_c::setWaterPrtcl() {
     static cXyz scl(0.4f, 0.4f, 0.4f);
     static u16 emttrId[4] = {
@@ -607,41 +580,33 @@ void daObj_Gadget_c::setWaterPrtcl() {
     }
 }
 
-/* 80BF4728-80BF4778 001AE8 0050+00 1/1 0/0 0/0 .text            setHamonPrtcl__14daObj_Gadget_cFv
- */
 void daObj_Gadget_c::setHamonPrtcl() {
     cXyz pos(current.pos.x, field_0xa04, current.pos.z);
     fopAcM_effHamonSet(&field_0xa30, &pos, 0.7f, 0.05f);
 }
 
-/* 80BF4778-80BF4798 001B38 0020+00 1/0 0/0 0/0 .text            daObj_Gadget_Create__FPv */
 static int daObj_Gadget_Create(void* i_this) {
     return ((daObj_Gadget_c*)i_this)->create();
 }
 
-/* 80BF4798-80BF47B8 001B58 0020+00 1/0 0/0 0/0 .text            daObj_Gadget_Delete__FPv */
 static int daObj_Gadget_Delete(void* i_this) {
     return ((daObj_Gadget_c*)i_this)->Delete();
 }
 
-/* 80BF47B8-80BF47D8 001B78 0020+00 1/0 0/0 0/0 .text            daObj_Gadget_Execute__FPv */
 static int daObj_Gadget_Execute(void* i_this) {
     return ((daObj_Gadget_c*)i_this)->Execute();
 }
 
-/* 80BF47D8-80BF47F8 001B98 0020+00 1/0 0/0 0/0 .text            daObj_Gadget_Draw__FPv */
 static int daObj_Gadget_Draw(void* i_this) {
     return ((daObj_Gadget_c*)i_this)->Draw();
 }
 
-/* 80BF47F8-80BF4800 001BB8 0008+00 1/0 0/0 0/0 .text            daObj_Gadget_IsDelete__FPv */
 static int daObj_Gadget_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES
 
-/* 80BF4AB0-80BF4AD0 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Gadget_MethodTable */
 static actor_method_class daObj_Gadget_MethodTable = {
     (process_method_func)daObj_Gadget_Create,
     (process_method_func)daObj_Gadget_Delete,
@@ -650,7 +615,6 @@ static actor_method_class daObj_Gadget_MethodTable = {
     (process_method_func)daObj_Gadget_Draw,
 };
 
-/* 80BF4AD0-80BF4B00 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_GADGET */
 extern actor_process_profile_definition g_profile_OBJ_GADGET = {
   fpcLy_CURRENT_e,           // mLayerID
   8,                         // mListID
diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp
index dd266ccd95..3d5a21ccd3 100644
--- a/src/d/actor/d_a_obj_ganonwall.cpp
+++ b/src/d/actor/d_a_obj_ganonwall.cpp
@@ -9,8 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* ############################################################################################## */
-/* 80BF55EC-80BF564C 000000 0060+00 1/1 0/0 0/0 .rodata          l_idx */
 static u8 const l_idx[24][4] = {
     {0x17, 0x05, 0x06, 0x01}, {0x17, 0x05, 0x06, 0x02}, {0x17, 0x05, 0x06, 0x03},
     {0x17, 0x05, 0x06, 0x04}, {0x17, 0x05, 0x06, 0x05}, {0x05, 0x06, 0x01, 0x00},
@@ -22,7 +20,6 @@ static u8 const l_idx[24][4] = {
     {0x13, 0x17, 0x04, 0x02}, {0x13, 0x17, 0x04, 0x03}, {0x17, 0x05, 0x06, 0x00},
 };
 
-/* 80BF564C-80BF56AC 000060 0060+00 0/1 0/0 0/0 .rodata          l_color */
 static const GXColor l_color[24] = {
     {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF},
     {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0x96, 0xFF},
@@ -34,31 +31,25 @@ static const GXColor l_color[24] = {
     {0xFF, 0xFF, 0xFF, 0xFF}, {0xFF, 0xFF, 0xFF, 0xFF}, {0xB4, 0xB4, 0xB4, 0xFF},
 };
 
-/* 80BF56E4-80BF56E8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Y_gwall";
 
-/* 80BF56E8-80BF56EC -00001 0004+00 1/1 0/0 0/0 .data            l_matName */
 static char* l_matName = "mat00";
 
-/* 80BF4CF8-80BF4D18 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjGWall_c*>(i_this)->CreateHeap();
 }
 
-/* 80BF4D18-80BF4D54 000098 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjGWall_cFv */
 void daObjGWall_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BF4D54-80BF4DA8 0000D4 0054+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjGWall_cFv */
 void daObjGWall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(this->shape_angle.y);
     MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
 }
 
-/* 80BF4DA8-80BF4E8C 000128 00E4+00 1/1 0/0 0/0 .text            Create__12daObjGWall_cFv */
 int daObjGWall_c::Create() {
     mEventBit1 = getEventBit1();
     mEventBit2 = getEventBit2();
@@ -77,7 +68,6 @@ int daObjGWall_c::Create() {
     return 1;
 }
 
-/* 80BF4E8C-80BF4FA8 00020C 011C+00 1/1 0/0 0/0 .text            CreateHeap__12daObjGWall_cFv */
 int daObjGWall_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11000284);
@@ -94,7 +84,6 @@ int daObjGWall_c::CreateHeap() {
     return 1;
 }
 
-/* 80BF4FF0-80BF50A4 000370 00B4+00 1/1 0/0 0/0 .text            create__12daObjGWall_cFv */
 int daObjGWall_c::create() {
     fopAcM_ct(this, daObjGWall_c);
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -109,13 +98,11 @@ int daObjGWall_c::create() {
     return phase;
 }
 
-/* 80BF50A4-80BF50CC 000424 0028+00 2/2 0/0 0/0 .text            execute__12daObjGWall_cFv */
 int daObjGWall_c::execute() {
     mpBtkAnm->play();
     return 1;
 }
 
-/* 80BF50CC-80BF5168 00044C 009C+00 1/1 0/0 0/0 .text            checkDraw__12daObjGWall_cFv */
 int daObjGWall_c::checkDraw() {
     if (mEventBit2 != 0x3ff && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2]) ||
         mEventBit1 != 0x3ff && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit1]))
@@ -125,7 +112,6 @@ int daObjGWall_c::checkDraw() {
     return 1;
 }
 
-/* 80BF5168-80BF5530 0004E8 03C8+00 1/1 0/0 0/0 .text            draw__12daObjGWall_cFv */
 int daObjGWall_c::draw() {
     if (!checkDraw()) {
         return 1;
@@ -172,36 +158,27 @@ int daObjGWall_c::draw() {
     return 1;
 }
 
-/* 80BF5530-80BF5564 0008B0 0034+00 1/1 0/0 0/0 .text            _delete__12daObjGWall_cFv */
 int daObjGWall_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80BF5564-80BF5584 0008E4 0020+00 1/0 0/0 0/0 .text            daObjGWall_Draw__FP12daObjGWall_c
- */
 static int daObjGWall_Draw(daObjGWall_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BF5584-80BF55A4 000904 0020+00 1/0 0/0 0/0 .text daObjGWall_Execute__FP12daObjGWall_c */
 static int daObjGWall_Execute(daObjGWall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BF55A4-80BF55C4 000924 0020+00 1/0 0/0 0/0 .text            daObjGWall_Delete__FP12daObjGWall_c
- */
 static int daObjGWall_Delete(daObjGWall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BF55C4-80BF55E4 000944 0020+00 1/0 0/0 0/0 .text            daObjGWall_Create__FP12daObjGWall_c
- */
 static int daObjGWall_Create(daObjGWall_c* i_this) {
     return i_this->create();
 }
 
-/* 80BF56EC-80BF570C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGWall_Method */
 static actor_method_class l_daObjGWall_Method = {
     (process_method_func)daObjGWall_Create,  
     (process_method_func)daObjGWall_Delete,
@@ -210,7 +187,6 @@ static actor_method_class l_daObjGWall_Method = {
     (process_method_func)daObjGWall_Draw,
 };
 
-/* 80BF570C-80BF573C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GanonWall */
 extern actor_process_profile_definition g_profile_Obj_GanonWall = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp
index 701a6ae00d..4718146d44 100644
--- a/src/d/actor/d_a_obj_ganonwall2.cpp
+++ b/src/d/actor/d_a_obj_ganonwall2.cpp
@@ -8,8 +8,6 @@
 #include "d/actor/d_a_obj_ganonwall2.h"
 #include "d/d_com_inf_game.h"
 
-/* ############################################################################################## */
-/* 80BF610C-80BF616C 000000 0060+00 2/2 0/0 0/0 .rodata          l_idx */
 static u8 const l_idx[24][4] = {
     0x17, 0x05, 0x06, 0x01, 0x17, 0x05, 0x06, 0x02, 0x17, 0x05, 0x06, 0x03, 0x17, 0x05, 0x06, 0x04,
     0x17, 0x05, 0x06, 0x05, 0x05, 0x06, 0x01, 0x00, 0x06, 0x0B, 0x05, 0x00, 0x06, 0x0B, 0x05, 0x01,
@@ -19,7 +17,6 @@ static u8 const l_idx[24][4] = {
     0x13, 0x17, 0x04, 0x01, 0x13, 0x17, 0x04, 0x02, 0x13, 0x17, 0x04, 0x03, 0x17, 0x05, 0x06, 0x00,
 };
 
-/* 80BF616C-80BF61CC 000060 0060+00 0/1 0/0 0/0 .rodata          l_color */
 static const GXColor l_color[24] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x96, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@@ -29,19 +26,15 @@ static const GXColor l_color[24] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB4, 0xB4, 0xB4, 0xFF,
 };
 
-/* 80BF620C-80BF6210 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_CTGWall";
 
-/* 80BF6210-80BF6214 -00001 0004+00 1/1 0/0 0/0 .data            l_matName */
 static char* l_matName = "mat00";
 
-/* 80BF57D8-80BF5814 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjGWall2_cFv */
 void daObjGWall2_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80BF5814-80BF5878 0000B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjGWall2_cFv */
 void daObjGWall2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(this->shape_angle.y);
@@ -49,7 +42,6 @@ void daObjGWall2_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BF5878-80BF5950 000118 00D8+00 1/0 0/0 0/0 .text            Create__13daObjGWall2_cFv */
 int daObjGWall2_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -66,8 +58,6 @@ int daObjGWall2_c::Create() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BF5950-80BF5A6C 0001F0 011C+00 1/0 0/0 0/0 .text            CreateHeap__13daObjGWall2_cFv */
 int daObjGWall2_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11000284);
@@ -84,7 +74,6 @@ int daObjGWall2_c::CreateHeap() {
     return 1;
 }
 
-/* 80BF5AB4-80BF5B74 000354 00C0+00 1/1 0/0 0/0 .text            create1st__13daObjGWall2_cFv */
 int daObjGWall2_c::create1st() {
     if (getEventBit1() != 0x3FF &&
         dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[(u16)getEventBit1()]) != 0)
@@ -101,9 +90,6 @@ int daObjGWall2_c::create1st() {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 80BF5B74-80BF5C0C 000414 0098+00 1/0 0/0 0/0 .text            Execute__13daObjGWall2_cFPPA3_A4_f
- */
 int daObjGWall2_c::Execute(Mtx** i_bgMtx) {
     mpBtkAnm->play();
     *i_bgMtx = &mBgMtx;
@@ -112,8 +98,6 @@ int daObjGWall2_c::Execute(Mtx** i_bgMtx) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BF5C0C-80BF6004 0004AC 03F8+00 1/0 0/0 0/0 .text            Draw__13daObjGWall2_cFv */
 int daObjGWall2_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -159,37 +143,28 @@ int daObjGWall2_c::Draw() {
     return 1;
 }
 
-/* 80BF6004-80BF6038 0008A4 0034+00 1/0 0/0 0/0 .text            Delete__13daObjGWall2_cFv */
 int daObjGWall2_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80BF6038-80BF6098 0008D8 0060+00 1/0 0/0 0/0 .text daObjGWall2_create1st__FP13daObjGWall2_c */
 static int daObjGWall2_create1st(daObjGWall2_c* i_this) {
     fopAcM_ct(i_this, daObjGWall2_c);
     return i_this->create1st();
 }
 
-/* 80BF6098-80BF60B8 000938 0020+00 1/0 0/0 0/0 .text daObjGWall2_MoveBGDelete__FP13daObjGWall2_c
- */
 static int daObjGWall2_MoveBGDelete(daObjGWall2_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BF60B8-80BF60D8 000958 0020+00 1/0 0/0 0/0 .text daObjGWall2_MoveBGExecute__FP13daObjGWall2_c
- */
 static int daObjGWall2_MoveBGExecute(daObjGWall2_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BF60D8-80BF6104 000978 002C+00 1/0 0/0 0/0 .text daObjGWall2_MoveBGDraw__FP13daObjGWall2_c */
 static int daObjGWall2_MoveBGDraw(daObjGWall2_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BF6214-80BF6234 -00001 0020+00 1/0 0/0 0/0 .data            daObjGWall2_METHODS */
 static actor_method_class daObjGWall2_METHODS = {
     (process_method_func)daObjGWall2_create1st,
     (process_method_func)daObjGWall2_MoveBGDelete,
@@ -198,7 +173,6 @@ static actor_method_class daObjGWall2_METHODS = {
     (process_method_func)daObjGWall2_MoveBGDraw,
 };
 
-/* 80BF6234-80BF6264 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GanonWall2 */
 extern actor_process_profile_definition g_profile_Obj_GanonWall2 = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp
index 252a2de83f..5618aed1b4 100644
--- a/src/d/actor/d_a_obj_gb.cpp
+++ b/src/d/actor/d_a_obj_gb.cpp
@@ -11,7 +11,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BF6318-80BF63F8 000078 00E0+00 1/0 0/0 0/0 .text            daObj_Gb_Draw__FP12obj_gb_class */
 static int daObj_Gb_Draw(obj_gb_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mModel, &i_this->tevStr);
@@ -28,8 +27,6 @@ static int daObj_Gb_Draw(obj_gb_class* i_this) {
     return 1;
 }
 
-/* 80BF63F8-80BF678C 000158 0394+00 2/1 0/0 0/0 .text            daObj_Gb_Execute__FP12obj_gb_class
- */
 static int daObj_Gb_Execute(obj_gb_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz acStack_30;
@@ -96,14 +93,10 @@ static int daObj_Gb_Execute(obj_gb_class* i_this) {
     return 1;
 }
 
-/* 80BF67C8-80BF67D0 000528 0008+00 1/0 0/0 0/0 .text            daObj_Gb_IsDelete__FP12obj_gb_class
- */
 static int daObj_Gb_IsDelete(obj_gb_class* param_0) {
     return 1;
 }
 
-/* 80BF67D0-80BF682C 000530 005C+00 1/0 0/0 0/0 .text            daObj_Gb_Delete__FP12obj_gb_class
- */
 static int daObj_Gb_Delete(obj_gb_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Obj_gb");
@@ -113,27 +106,22 @@ static int daObj_Gb_Delete(obj_gb_class* i_this) {
     return 1;
 }
 
-/* 80BF6E1C-80BF6E24 000020 0008+00 0/1 0/0 0/0 .data            bmd$3914 */
 static int bmd[2] = {
     6, 7,
 };
 
-/* 80BF6E24-80BF6E2C 000028 0008+00 0/1 0/0 0/0 .data            brk$3915 */
 static int brk[2] = {
     10, 11,
 };
 
-/* 80BF6E2C-80BF6E34 000030 0008+00 0/1 0/0 0/0 .data            btk$3916 */
 static int btk[2] = {
     14, 15,
 };
 
-/* 80BF6E34-80BF6E3C 000038 0008+00 0/1 0/0 0/0 .data            dzb$3917 */
 static int dzb[2] = {
     18, 19,
 };
 
-/* 80BF682C-80BF6A98 00058C 026C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     obj_gb_class* i_this = (obj_gb_class*)actor;
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("Obj_gb", bmd[i_this->field_0x57c]);
@@ -169,7 +157,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return i_this->mpBgW->Set(pbGd, 1, &i_this->mBgMtx) == 1 ? 0 : 1;
 }
 
-/* 80BF6AE0-80BF6DB0 000840 02D0+00 1/0 0/0 0/0 .text            daObj_Gb_Create__FP10fopAc_ac_c */
 static int daObj_Gb_Create(fopAc_ac_c* actor) {
     fopAcM_ct(actor, obj_gb_class);
     obj_gb_class* i_this = (obj_gb_class*)actor;
@@ -233,7 +220,6 @@ static int daObj_Gb_Create(fopAc_ac_c* actor) {
     return rv;
 }
 
-/* 80BF6E3C-80BF6E5C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Gb_Method */
 static actor_method_class l_daObj_Gb_Method = {
     (process_method_func)daObj_Gb_Create,
     (process_method_func)daObj_Gb_Delete,
@@ -242,7 +228,6 @@ static actor_method_class l_daObj_Gb_Method = {
     (process_method_func)daObj_Gb_Draw,
 };
 
-/* 80BF6E5C-80BF6E8C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_GB */
 extern actor_process_profile_definition g_profile_OBJ_GB = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp
index 9e093e2eb2..3b8dfee27c 100644
--- a/src/d/actor/d_a_obj_geyser.cpp
+++ b/src/d/actor/d_a_obj_geyser.cpp
@@ -9,28 +9,23 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_kankyo_rain.h"
 
-/* 80BF6F18-80BF6F38 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjGeyser_cFv */
 void daObjGeyser_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80BF6F38-80BF6F80 000098 0048+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjGeyser_cFv */
 void daObjGeyser_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80BF9088-80BF908C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_knktsn";
 
-/* 80BF908C-80BF90A4 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-100.0f, -10.0f, -100.0f},
     {100.0f, 550.0f, 100.0f},
 };
 
-/* 80BF90A4-80BF90F0 00003C 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x0, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -43,7 +38,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 80BF6F80-80BF70E0 0000E0 0160+00 1/0 0/0 0/0 .text            Create__13daObjGeyser_cFv */
 int daObjGeyser_c::Create() {
     if (getType() == 1) {
         shape_angle.x = 0x4000;
@@ -95,7 +89,6 @@ int daObjGeyser_c::Create() {
     return 1;
 }
 
-/* 80BF70E0-80BF7174 000240 0094+00 1/0 0/0 0/0 .text            CreateHeap__13daObjGeyser_cFv */
 int daObjGeyser_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(345, modelData != NULL);
@@ -109,10 +102,8 @@ int daObjGeyser_c::CreateHeap() {
     return 1;
 }
 
-/* 80BF8FE8-80BF8FF0 000000 0008+00 8/8 0/0 0/0 .rodata          l_dzb */
 static const int l_dzb[] = {7, 8};
 
-/* 80BF7174-80BF7288 0002D4 0114+00 1/1 0/0 0/0 .text            create1st__13daObjGeyser_cFv */
 int daObjGeyser_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state != cPhs_COMPLEATE_e) {
@@ -141,14 +132,11 @@ int daObjGeyser_c::create1st() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BF8FF0-80BF9008 000008 0018+00 0/1 0/0 0/0 .rodata          l_scale */
 static const Vec l_scale[] = {
     {0.7f, 1.0f, 1.0f},
     {0.3f, 0.8f, 1.0f},
 };
 
-/* 80BF7288-80BF744C 0003E8 01C4+00 1/0 0/0 0/0 .text            Execute__13daObjGeyser_cFPPA3_A4_f
- */
 int daObjGeyser_c::Execute(Mtx** param_0) {
     if (dComIfGp_event_runCheck() == 0) {
         f32 range = 5000.0f;
@@ -191,7 +179,6 @@ int daObjGeyser_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BF744C-80BF75B8 0005AC 016C+00 1/1 0/0 0/0 .text            action__13daObjGeyser_cFv */
 void daObjGeyser_c::action() {
     static void (daObjGeyser_c::*l_func[])() = {
         &daObjGeyser_c::actionOff,
@@ -220,13 +207,10 @@ void daObjGeyser_c::action() {
     }
 }
 
-/* 80BF75B8-80BF75C4 000718 000C+00 3/3 0/0 0/0 .text            actionOff2Init__13daObjGeyser_cFv
- */
 void daObjGeyser_c::actionOff2Init() {
     mAction = 0;
 }
 
-/* 80BF75C4-80BF77F0 000724 022C+00 1/0 0/0 0/0 .text            actionOff2__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOff2() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     
@@ -260,7 +244,6 @@ void daObjGeyser_c::actionOff2() {
     cLib_chaseF(&field_0x730, 0.0f, 0.1f * scale.y);
 }
 
-/* 80BF7838-80BF787C 000998 0044+00 2/2 0/0 0/0 .text actionOnWait2Init__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOnWait2Init() {
     setEmitterPre00();
     setEmitterSrc00Sand();
@@ -268,7 +251,6 @@ void daObjGeyser_c::actionOnWait2Init() {
     mAction = 1;
 }
 
-/* 80BF787C-80BF7C54 0009DC 03D8+00 1/0 0/0 0/0 .text            actionOnWait2__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOnWait2() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (getType() == 0) {
@@ -318,7 +300,6 @@ void daObjGeyser_c::actionOnWait2() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_GEYSER_LOW, 0);
 }
 
-/* 80BF7C54-80BF7CA0 000DB4 004C+00 1/1 0/0 0/0 .text            actionOn2Init__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOn2Init() {
     setEmitterClm00();
     setEmitterSmk01();
@@ -327,7 +308,6 @@ void daObjGeyser_c::actionOn2Init() {
     mAction = 2;
 }
 
-/* 80BF7CA0-80BF8158 000E00 04B8+00 1/0 0/0 0/0 .text            actionOn2__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOn2() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (getType() == 0) {
@@ -373,7 +353,6 @@ void daObjGeyser_c::actionOn2() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_GEYSER_HIGH, 0);
 }
 
-/* 80BF8158-80BF8178 0012B8 0020+00 1/1 0/0 0/0 .text actionDisappearInit__13daObjGeyser_cFUc */
 void daObjGeyser_c::actionDisappearInit(u8 param_0) {
     field_0x784 = 0xFF;
     field_0x760 = 10;
@@ -381,8 +360,6 @@ void daObjGeyser_c::actionDisappearInit(u8 param_0) {
     mAction = 3;
 }
 
-/* 80BF8178-80BF823C 0012D8 00C4+00 1/0 0/0 0/0 .text            actionDisappear__13daObjGeyser_cFv
- */
 void daObjGeyser_c::actionDisappear() {
     if (field_0x760 == 0) {
         stopEmitterClm00();
@@ -412,7 +389,6 @@ void daObjGeyser_c::actionDisappear() {
     }
 }
 
-/* 80BF823C-80BF8268 00139C 002C+00 2/2 0/0 0/0 .text            actionOffInit__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOffInit() {
     u8 var_r31 = getArg1();
     if (var_r31 == 0xFF) {
@@ -423,7 +399,6 @@ void daObjGeyser_c::actionOffInit() {
     mAction = 0;
 }
 
-/* 80BF8268-80BF82D0 0013C8 0068+00 1/0 0/0 0/0 .text            actionOff__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOff() {
     cLib_chaseF(&field_0x730, 0.0f, 0.1f * scale.y);
 
@@ -441,8 +416,6 @@ void daObjGeyser_c::actionOff() {
     }
 }
 
-/* 80BF82D0-80BF8344 001430 0074+00 1/1 0/0 0/0 .text            actionOnWaitInit__13daObjGeyser_cFv
- */
 void daObjGeyser_c::actionOnWaitInit() {
     u8 var_r30 = getArg2();
     if (var_r30 == 0xFF) {
@@ -456,7 +429,6 @@ void daObjGeyser_c::actionOnWaitInit() {
     mAction = 1;
 }
 
-/* 80BF8344-80BF83E4 0014A4 00A0+00 1/0 0/0 0/0 .text            actionOnWait__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOnWait() {
     if (field_0x760 == 0) {
         stopEmitterPre00();
@@ -477,7 +449,6 @@ void daObjGeyser_c::actionOnWait() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_GEYSER_LOW, 0);
 }
 
-/* 80BF83E4-80BF846C 001544 0088+00 1/1 0/0 0/0 .text            actionOnInit__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOnInit() {
     u8 var_r30 = getArg3();
     if (var_r30 == 0xFF) {
@@ -496,7 +467,6 @@ void daObjGeyser_c::actionOnInit() {
     mAction = 2;
 }
 
-/* 80BF846C-80BF8584 0015CC 0118+00 1/0 0/0 0/0 .text            actionOn__13daObjGeyser_cFv */
 void daObjGeyser_c::actionOn() {
     if (field_0x760 == 0) {
         cutPntWind();
@@ -531,7 +501,6 @@ void daObjGeyser_c::actionOn() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_GEYSER_HIGH, 0);
 }
 
-/* 80BF8584-80BF863C 0016E4 00B8+00 2/2 0/0 0/0 .text            setPntWind__13daObjGeyser_cFv */
 void daObjGeyser_c::setPntWind() {
     cXyz direction(0.0f, 1.0f, 0.0f);
     mDoMtx_stack_c::ZXYrotS(current.angle);
@@ -548,12 +517,10 @@ void daObjGeyser_c::setPntWind() {
     dKyw_pntwind_set(&mWind);
 }
 
-/* 80BF863C-80BF8660 00179C 0024+00 3/3 0/0 0/0 .text            cutPntWind__13daObjGeyser_cFv */
 void daObjGeyser_c::cutPntWind() {
     dKyw_pntwind_cut(&mWind);
 }
 
-/* 80BF8660-80BF8870 0017C0 0210+00 1/1 0/0 0/0 .text            movePntWind__13daObjGeyser_cFv */
 void daObjGeyser_c::movePntWind() {
     cXyz start;
     cXyz end;
@@ -576,7 +543,6 @@ void daObjGeyser_c::movePntWind() {
     }
 }
 
-/* 80BF8870-80BF8914 0019D0 00A4+00 1/0 0/0 0/0 .text            Draw__13daObjGeyser_cFv */
 int daObjGeyser_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -588,8 +554,6 @@ int daObjGeyser_c::Draw() {
     return 1;
 }
 
-/* 80BF8914-80BF89AC 001A74 0098+00 2/2 0/0 0/0 .text            setEmitterPre00__13daObjGeyser_cFv
- */
 void daObjGeyser_c::setEmitterPre00() {
     mParticleScale.set(scale.x, scale.y, scale.z);
 
@@ -600,10 +564,8 @@ void daObjGeyser_c::setEmitterPre00() {
     }
 }
 
-/* 80BF89AC-80BF89B0 001B0C 0004+00 2/2 0/0 0/0 .text setEmitterSrc00Sand__13daObjGeyser_cFv */
 void daObjGeyser_c::setEmitterSrc00Sand() {}
 
-/* 80BF89B0-80BF8A54 001B10 00A4+00 2/2 0/0 0/0 .text setEmitterSrc01Smk__13daObjGeyser_cFv */
 void daObjGeyser_c::setEmitterSrc01Smk() {
     mParticleScale.set(scale.x, scale.y, scale.z);
 
@@ -617,8 +579,6 @@ void daObjGeyser_c::setEmitterSrc01Smk() {
     }
 }
 
-/* 80BF8A54-80BF8A80 001BB4 002C+00 4/4 0/0 0/0 .text            stopEmitterPre00__13daObjGeyser_cFv
- */
 void daObjGeyser_c::stopEmitterPre00() {
     if (mpEmitterPre00 != NULL) {
         mpEmitterPre00->becomeInvalidEmitter();
@@ -626,7 +586,6 @@ void daObjGeyser_c::stopEmitterPre00() {
     }
 }
 
-/* 80BF8A80-80BF8AAC 001BE0 002C+00 5/5 0/0 0/0 .text stopEmitterSrc00Sand__13daObjGeyser_cFv */
 void daObjGeyser_c::stopEmitterSrc00Sand() {
     if (mpEmitterSrc00Sand != NULL) {
         mpEmitterSrc00Sand->becomeInvalidEmitter();
@@ -634,7 +593,6 @@ void daObjGeyser_c::stopEmitterSrc00Sand() {
     }
 }
 
-/* 80BF8AAC-80BF8AD8 001C0C 002C+00 5/5 0/0 0/0 .text stopEmitterSrc01Smk__13daObjGeyser_cFv */
 void daObjGeyser_c::stopEmitterSrc01Smk() {
     if (mpEmitterSrc01Smk != NULL) {
         mpEmitterSrc01Smk->becomeInvalidEmitter();
@@ -642,8 +600,6 @@ void daObjGeyser_c::stopEmitterSrc01Smk() {
     }
 }
 
-/* 80BF8AD8-80BF8B70 001C38 0098+00 2/2 0/0 0/0 .text            setEmitterClm00__13daObjGeyser_cFv
- */
 void daObjGeyser_c::setEmitterClm00() {
     mParticleScale.set(scale.x, scale.y, scale.z);
 
@@ -654,8 +610,6 @@ void daObjGeyser_c::setEmitterClm00() {
     }
 }
 
-/* 80BF8B70-80BF8C08 001CD0 0098+00 2/2 0/0 0/0 .text            setEmitterSmk01__13daObjGeyser_cFv
- */
 void daObjGeyser_c::setEmitterSmk01() {
     mParticleScale.set(scale.x, scale.y, scale.z);
 
@@ -666,8 +620,6 @@ void daObjGeyser_c::setEmitterSmk01() {
     }
 }
 
-/* 80BF8C08-80BF8CA0 001D68 0098+00 2/2 0/0 0/0 .text            setEmitterSmk02__13daObjGeyser_cFv
- */
 void daObjGeyser_c::setEmitterSmk02() {
     mParticleScale.set(scale.x, scale.y, scale.z);
 
@@ -678,8 +630,6 @@ void daObjGeyser_c::setEmitterSmk02() {
     }
 }
 
-/* 80BF8CA0-80BF8CCC 001E00 002C+00 4/4 0/0 0/0 .text            stopEmitterClm00__13daObjGeyser_cFv
- */
 void daObjGeyser_c::stopEmitterClm00() {
     if (mpEmitterClm00 != NULL) {
         mpEmitterClm00->becomeInvalidEmitter();
@@ -687,8 +637,6 @@ void daObjGeyser_c::stopEmitterClm00() {
     }
 }
 
-/* 80BF8CCC-80BF8CF8 001E2C 002C+00 4/4 0/0 0/0 .text            stopEmitterSmk01__13daObjGeyser_cFv
- */
 void daObjGeyser_c::stopEmitterSmk01() {
     if (mpEmitterSmk01 != NULL) {
         mpEmitterSmk01->becomeInvalidEmitter();
@@ -696,8 +644,6 @@ void daObjGeyser_c::stopEmitterSmk01() {
     }
 }
 
-/* 80BF8CF8-80BF8D24 001E58 002C+00 4/4 0/0 0/0 .text            stopEmitterSmk02__13daObjGeyser_cFv
- */
 void daObjGeyser_c::stopEmitterSmk02() {
     if (mpEmitterSmk02 != NULL) {
         mpEmitterSmk02->becomeInvalidEmitter();
@@ -705,7 +651,6 @@ void daObjGeyser_c::stopEmitterSmk02() {
     }
 }
 
-/* 80BF8D24-80BF8D98 001E84 0074+00 1/0 0/0 0/0 .text            Delete__13daObjGeyser_cFv */
 int daObjGeyser_c::Delete() {
     stopEmitterPre00();
     stopEmitterSrc00Sand();
@@ -719,30 +664,23 @@ int daObjGeyser_c::Delete() {
     return 1;
 }
 
-/* 80BF8D98-80BF8E88 001EF8 00F0+00 1/0 0/0 0/0 .text daObjGeyser_create1st__FP13daObjGeyser_c */
 static int daObjGeyser_create1st(daObjGeyser_c* i_this) {
     fopAcM_ct(i_this, daObjGeyser_c);
     return i_this->create1st();
 }
 
-/* 80BF8F2C-80BF8F4C 00208C 0020+00 1/0 0/0 0/0 .text daObjGeyser_MoveBGDelete__FP13daObjGeyser_c
- */
 static int daObjGeyser_MoveBGDelete(daObjGeyser_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BF8F4C-80BF8F6C 0020AC 0020+00 1/0 0/0 0/0 .text daObjGeyser_MoveBGExecute__FP13daObjGeyser_c
- */
 static int daObjGeyser_MoveBGExecute(daObjGeyser_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BF8F6C-80BF8F98 0020CC 002C+00 1/0 0/0 0/0 .text daObjGeyser_MoveBGDraw__FP13daObjGeyser_c */
 static int daObjGeyser_MoveBGDraw(daObjGeyser_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BF9198-80BF91B8 -00001 0020+00 1/0 0/0 0/0 .data            daObjGeyser_METHODS */
 static actor_method_class daObjGeyser_METHODS = {
     (process_method_func)daObjGeyser_create1st,
     (process_method_func)daObjGeyser_MoveBGDelete,
@@ -751,7 +689,6 @@ static actor_method_class daObjGeyser_METHODS = {
     (process_method_func)daObjGeyser_MoveBGDraw,
 };
 
-/* 80BF91B8-80BF91E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Geyser */
 extern actor_process_profile_definition g_profile_Obj_Geyser = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp
index 8e8ebbed4a..437a94f0cc 100644
--- a/src/d/actor/d_a_obj_glowSphere.cpp
+++ b/src/d/actor/d_a_obj_glowSphere.cpp
@@ -10,22 +10,18 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BF934C-80BF938C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__14daGlwSph_HIO_cFv */
 daGlwSph_HIO_c::daGlwSph_HIO_c() {
     speed = 50.0f;
     speed2 = 4.0f;
 }
 
-/* 80BFABF4-80BFAC00 000054 000C+00 2/3 0/0 0/0 .bss             l_HIO */
 static daGlwSph_HIO_c l_HIO;
 
-/* 80BFA9F0-80BFAA08 000020 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-30.0f, -10.0f, -30.0f},
     {30.0f, 60.0f, 30.0f}
 };
 
-/* 80BFA978-80BFA9A8 000008 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__10daGlwSph_c */
 const dCcD_SrcGObjInf daGlwSph_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x10000, 0x11}, {0x19}}},
     {dCcD_SE_SWORD, 0, 0, 0, 0x0},
@@ -33,7 +29,6 @@ const dCcD_SrcGObjInf daGlwSph_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80BFAA08-80BFAA48 000038 0040+00 2/2 0/0 0/0 .data            mCcDSph__10daGlwSph_c */
 dCcD_SrcSph daGlwSph_c::mCcDSph = {
     daGlwSph_c::mCcDObjInfo,
     {
@@ -41,10 +36,8 @@ dCcD_SrcSph daGlwSph_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 80BFAA48-80BFAA4C 000078 0004+00 1/2 0/0 0/0 .data            l_prmColor */
 static GXColor l_prmColor = {0xFF, 0xFF, 0xFF, 0xFF};
 
-/* 80BFAA4C-80BFAA5C 00007C 0010+00 1/3 0/0 0/0 .data            l_envColor */
 static GXColor l_envColor[] = {
     /* Gray   */ {0x3C, 0x1E, 0x3C, 0xFF},
     /* Red    */ {0xFF, 0x00, 0x32, 0xFF},
@@ -52,28 +45,22 @@ static GXColor l_envColor[] = {
     /* Blue   */ {0x00, 0x32, 0xFF, 0xFF},
 };
 
-/* 80BFAC0C-80BFAFD0 00006C 03C4+00 3/4 0/0 0/0 .bss             mSphMng__10daGlwSph_c */
 _GlSph_Mng_c daGlwSph_c::mSphMng;
 
-/* 80BF9430-80BF943C 0001D0 000C+00 0/0 0/0 1/1 .text            getSphMng__10daGlwSph_cFv */
 _GlSph_Mng_c& daGlwSph_c::getSphMng() {
     return mSphMng;
 }
 
-/* 80BF943C-80BF94AC 0001DC 0070+00 2/2 0/0 0/0 .text            setBaseMtx__10daGlwSph_cFv */
 void daGlwSph_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mpModel->setBaseScale(scale);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BF94AC-80BF94CC 00024C 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daGlwSph_cFP10fopAc_ac_c               */
 int daGlwSph_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daGlwSph_c*)i_this)->CreateHeap();
 }
 
-/* 80BF94CC-80BF95D4 00026C 0108+00 1/1 0/0 0/0 .text            CreateHeap__10daGlwSph_cFv */
 int daGlwSph_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("glwSphere", 5);
     JUT_ASSERT(0xF4, modelData != NULL);
@@ -93,7 +80,6 @@ int daGlwSph_c::CreateHeap() {
     return 1;
 }
 
-/* 80BF95D4-80BF9908 000374 0334+00 1/1 0/0 0/0 .text            create__10daGlwSph_cFv */
 int daGlwSph_c::create() {
     fopAcM_ct(this, daGlwSph_c);
 
@@ -149,7 +135,6 @@ int daGlwSph_c::create() {
     return phase_state;
 }
 
-/* 80BF9B1C-80BF9BC0 0008BC 00A4+00 1/1 0/0 0/0 .text            execute__10daGlwSph_cFv */
 int daGlwSph_c::execute() {
     if (is_getted()) {
         saveGetFlag();
@@ -171,7 +156,6 @@ int daGlwSph_c::execute() {
     return 1;
 }
 
-/* 80BF9BC0-80BF9DF0 000960 0230+00 1/1 0/0 0/0 .text            actionMain__10daGlwSph_cFv */
 void daGlwSph_c::actionMain() {
     static void (daGlwSph_c::*l_func[])() = {
         &daGlwSph_c::actionWait,
@@ -215,7 +199,6 @@ void daGlwSph_c::actionMain() {
     (this->*l_func[mAction])();
 }
 
-/* 80BF9DF0-80BF9F30 000B90 0140+00 1/1 0/0 0/0 .text            effectSet__10daGlwSph_cFv */
 void daGlwSph_c::effectSet() {
     field_0x974 = current.pos - field_0x968;
 
@@ -233,7 +216,6 @@ void daGlwSph_c::effectSet() {
     field_0x968 = current.pos;
 }
 
-/* 80BF9F30-80BFA010 000CD0 00E0+00 1/1 0/0 0/0 .text            getSE__10daGlwSph_cFv */
 void daGlwSph_c::getSE() {
     static JAISoundID sSeId[] = {
         Z2SE_OBJ_STAR_GAME_HIT_1,
@@ -250,20 +232,16 @@ void daGlwSph_c::getSE() {
     Z2GetAudioMgr()->seStart(sSeId[sph_seid], &pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 80BFA010-80BFA064 000DB0 0054+00 1/1 0/0 0/0 .text            getVibe__10daGlwSph_cFv */
 void daGlwSph_c::getVibe() {
     dComIfGp_getVibration().StartShock(VIBMODE_S_POWER4, 1, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80BFA064-80BFA070 000E04 000C+00 2/2 0/0 0/0 .text            actionWaitInit__10daGlwSph_cFv */
 void daGlwSph_c::actionWaitInit() {
     mAction = ACTION_WAIT_e;
 }
 
-/* 80BFA070-80BFA074 000E10 0004+00 1/0 0/0 0/0 .text            actionWait__10daGlwSph_cFv */
 void daGlwSph_c::actionWait() {}
 
-/* 80BFA074-80BFA130 000E14 00BC+00 1/1 0/0 0/0 .text            actionGetInit__10daGlwSph_cFv */
 void daGlwSph_c::actionGetInit() {
     field_0x980 = 1;
     dComIfGp_particle_setColor(0x8751, &current.pos, &tevStr, &l_prmColor, &l_envColor[mColor], 0.0f, 0xFF);
@@ -274,7 +252,6 @@ void daGlwSph_c::actionGetInit() {
     mAction = ACTION_GET_e;
 }
 
-/* 80BFA130-80BFA1E0 000ED0 00B0+00 1/0 0/0 0/0 .text            actionGet__10daGlwSph_cFv */
 void daGlwSph_c::actionGet() {
     if (field_0x980 > 0) {
         field_0x980--;
@@ -293,14 +270,12 @@ void daGlwSph_c::actionGet() {
     }
 }
 
-/* 80BFA1E0-80BFA204 000F80 0024+00 1/1 0/0 0/0 .text            actionMoveInit__10daGlwSph_cFv */
 void daGlwSph_c::actionMoveInit() {
     mIsNoMoveHome = true;
     mMoveSpeed = l_HIO.speed;
     mAction = ACTION_MOVE_e;
 }
 
-/* 80BFA204-80BFA2A4 000FA4 00A0+00 1/0 0/0 0/0 .text            actionMove__10daGlwSph_cFv */
 void daGlwSph_c::actionMove() {
     f32 dist_to_target = cLib_addCalc(&mMoveSpeed, 0.0f, 0.5f, 10.0f, 1.0f);
     current.pos += mMoveVec * mMoveSpeed;
@@ -311,7 +286,6 @@ void daGlwSph_c::actionMove() {
     }
 }
 
-/* 80BFA2A4-80BFA3EC 001044 0148+00 1/1 0/0 0/0 .text            draw__10daGlwSph_cFv */
 int daGlwSph_c::draw() {
     if (is_getted()) {
         return 1;
@@ -348,34 +322,28 @@ int daGlwSph_c::draw() {
     return 1;
 }
 
-/* 80BFA3EC-80BFA438 00118C 004C+00 1/1 0/0 0/0 .text            _delete__10daGlwSph_cFv */
 int daGlwSph_c::_delete() {
     dComIfG_resDelete(&mPhase, "glwSphere");
     mSphMng.remove(this);
     return 1;
 }
 
-/* 80BFA438-80BFA458 0011D8 0020+00 1/0 0/0 0/0 .text            daGlwSph_Draw__FP10daGlwSph_c */
 static int daGlwSph_Draw(daGlwSph_c* i_this) {
     return i_this->draw();
 }
 
-/* 80BFA458-80BFA478 0011F8 0020+00 1/0 0/0 0/0 .text            daGlwSph_Execute__FP10daGlwSph_c */
 static int daGlwSph_Execute(daGlwSph_c* i_this) {
     return i_this->execute();
 }
 
-/* 80BFA478-80BFA498 001218 0020+00 1/0 0/0 0/0 .text            daGlwSph_Delete__FP10daGlwSph_c */
 static int daGlwSph_Delete(daGlwSph_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80BFA498-80BFA4B8 001238 0020+00 1/0 0/0 0/0 .text            daGlwSph_Create__FP10fopAc_ac_c */
 static int daGlwSph_Create(fopAc_ac_c* i_this) {
     return ((daGlwSph_c*)i_this)->create();
 }
 
-/* 80BFA4B8-80BFA4DC 001258 0024+00 1/1 0/0 0/0 .text            _clrLstBuf__12_GlSph_Mng_cFv */
 void _GlSph_Mng_c::_clrLstBuf() {
     _GlSph_LstInfo_c* info = mListBuf;
 
@@ -385,8 +353,6 @@ void _GlSph_Mng_c::_clrLstBuf() {
     }
 }
 
-/* 80BFA4DC-80BFA528 00127C 004C+00 1/1 0/0 0/0 .text            entry__12_GlSph_Mng_cFP10daGlwSph_c
- */
 int _GlSph_Mng_c::entry(daGlwSph_c* i_sph) {
     _GlSph_LstInfo_c* info = mListBuf;
 
@@ -402,7 +368,6 @@ int _GlSph_Mng_c::entry(daGlwSph_c* i_sph) {
     return 0;
 }
 
-/* 80BFA528-80BFA55C 0012C8 0034+00 1/1 0/0 0/0 .text remove__12_GlSph_Mng_cFP10daGlwSph_c */
 void _GlSph_Mng_c::remove(daGlwSph_c* i_sph) {
     _GlSph_LstInfo_c* info = mListBuf;
 
@@ -416,7 +381,6 @@ void _GlSph_Mng_c::remove(daGlwSph_c* i_sph) {
     }
 }
 
-/* 80BFA55C-80BFA5C4 0012FC 0068+00 0/0 0/0 1/1 .text            _setting_main__12_GlSph_Mng_cFv */
 int _GlSph_Mng_c::_setting_main() {
     _GlSph_LstInfo_c* info = mListBuf;
 
@@ -434,8 +398,6 @@ int _GlSph_Mng_c::_setting_main() {
     return 1;
 }
 
-/* 80BFA5C4-80BFA60C 001364 0048+00 0/0 0/0 1/1 .text            _chkAllGet_main__12_GlSph_Mng_cFv
- */
 BOOL _GlSph_Mng_c::_chkAllGet_main() {
     _GlSph_LstInfo_c* info = mListBuf;
 
@@ -459,7 +421,6 @@ u16 _GlSph_Mng_c::mSphSe;
 /* 80BFAFEA 0002+00 data_80BFAFEA mSeClrTmr__12_GlSph_Mng_c */
 s16 _GlSph_Mng_c::mSeClrTmr;
 
-/* 80BFA60C-80BFA6D8 0013AC 00CC+00 0/0 0/0 1/1 .text            SphSeProc__12_GlSph_Mng_cFv */
 void _GlSph_Mng_c::SphSeProc() {
     if (mSeClrTmr > 0) {
         mSeClrTmr--;
@@ -482,17 +443,14 @@ void _GlSph_Mng_c::SphSeProc() {
     }
 }
 
-/* 80BFA6D8-80BFA6E8 001478 0010+00 1/1 0/0 0/0 .text            clrSphSe__12_GlSph_Mng_cFv */
 void _GlSph_Mng_c::clrSphSe() {
     mSphSe = 0;
 }
 
-/* 80BFA6E8-80BFA6F8 001488 0010+00 1/1 0/0 0/0 .text            getSphSe__12_GlSph_Mng_cFv */
 u16 _GlSph_Mng_c::getSphSe() {
     return mSphSe;
 }
 
-/* 80BFA6F8-80BFA724 001498 002C+00 1/1 0/0 0/0 .text            incSphSe__12_GlSph_Mng_cFv */
 void _GlSph_Mng_c::incSphSe() {
     mSphSe++;
     if (mSphSe > 4) {
@@ -500,14 +458,12 @@ void _GlSph_Mng_c::incSphSe() {
     }
 }
 
-/* 80BFAAC0-80BFAAE0 -00001 0020+00 1/0 0/0 0/0 .data            l_daGlwSph_Method */
 static actor_method_class l_daGlwSph_Method = {
     (process_method_func)daGlwSph_Create,  (process_method_func)daGlwSph_Delete,
     (process_method_func)daGlwSph_Execute, (process_method_func)NULL,
     (process_method_func)daGlwSph_Draw,
 };
 
-/* 80BFAAE0-80BFAB10 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_glowSphere */
 extern actor_process_profile_definition g_profile_Obj_glowSphere = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp
index ba8cc3cc3b..2dee46fc3b 100644
--- a/src/d/actor/d_a_obj_gm.cpp
+++ b/src/d/actor/d_a_obj_gm.cpp
@@ -22,25 +22,22 @@ enum OBJ_GM_RES_File_ID {
 
 class daObj_Gm_HIO_c : public JORReflexible {
 public:
-    /* 80BFB14C */ daObj_Gm_HIO_c();
-    /* 80BFD284 */ virtual ~daObj_Gm_HIO_c() {}
+    daObj_Gm_HIO_c();
+    virtual ~daObj_Gm_HIO_c() {}
 
     void genMessage(JORMContext*);
 
     /* 0x4 */ s8 id;
 };
 
-/* 80BFD3E8-80BFD404 000020 001C+00 7/8 0/0 0/0 .data            obj_size */
 static f32 obj_size[7] = {
     30.0f, 50.0f, 50.0f, 140.0f, 100.0f, 70.0f, 200.0f,
 };
 
-/* 80BFD404-80BFD420 00003C 001C+00 0/1 0/0 0/0 .data            weg */
 static f32 weg[7] = {
     60.0f, 70.0f, 80.0f, 150.0f, 100.0f, 60.0f, 200.0f,
 };
 
-/* 80BFD420-80BFD430 000058 000E+02 0/1 0/0 0/0 .data            tim */
 static s16 tim[7] = {
     1500,
     1000,
@@ -51,12 +48,10 @@ static s16 tim[7] = {
     700,
 };
 
-/* 80BFD430-80BFD44C 000068 001C+00 2/2 0/0 0/0 .data            spin_sp */
 static f32 spin_sp[7] = {
     200.0f, 100.0f, 200.0f, 66.7f, 80.0f, 0.0f, 0.0f,
 };
 
-/* 80BFD44C-80BFD45C 000084 000E+02 1/1 0/0 0/0 .data            neg */
 static s16 neg[7] = {
     300,
     200,
@@ -67,22 +62,18 @@ static s16 neg[7] = {
     150,
 };
 
-/* 80BFD45C-80BFD478 000094 001C+00 1/1 0/0 0/0 .data            obj_size_maji */
 static f32 obj_size_maji[7] = {
     0.666f, 0.8f, 0.7f, 1.2f, 1.0f, 0.7f, 1.2f,
 };
 
-/* 80BFD478-80BFD494 0000B0 001C+00 1/1 0/0 0/0 .data            gm_obj_bmd */
 static int gm_obj_bmd[7] = {
     BMDR_K_KUMO_TUBO00, BMDR_K_KUMO_TUBO01, BMDR_K_KUMO_IWA01, BMDR_K_KUMO_IWA00, BMDR_K_KUMO_HASI00, BMDR_K_KUMO_TUBO00, BMDR_K_KUMO_TUBO00,
 };
 
-/* 80BFB14C-80BFB164 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__14daObj_Gm_HIO_cFv */
 daObj_Gm_HIO_c::daObj_Gm_HIO_c() {
     id = -1;
 }
 
-/* 80BFB164-80BFB218 000104 00B4+00 1/0 0/0 0/0 .text            daObj_Gm_Draw__FP12obj_gm_class */
 static int daObj_Gm_Draw(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     
@@ -100,7 +91,6 @@ static int daObj_Gm_Draw(obj_gm_class* i_this) {
     return 1;
 }
 
-/* 80BFB218-80BFB3D4 0001B8 01BC+00 1/1 0/0 0/0 .text            wall_angle_get__FP12obj_gm_class */
 static s16 wall_angle_get(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -134,7 +124,6 @@ static s16 wall_angle_get(obj_gm_class* i_this) {
     return cM_atan2s(spac.x, spac.z) + 0x4000;
 }
 
-/* 80BFB410-80BFB508 0003B0 00F8+00 3/3 0/0 0/0 .text            ito_pos_set__FP12obj_gm_class */
 static void ito_pos_set(obj_gm_class* i_this) {
     cXyz pos;
     pos.x = 0.0f;
@@ -152,7 +141,6 @@ static void ito_pos_set(obj_gm_class* i_this) {
     MtxPull();
 }
 
-/* 80BFB508-80BFBA14 0004A8 050C+00 1/1 0/0 0/0 .text            bg_fix__FP12obj_gm_class */
 static void bg_fix(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     cXyz sp28, sp34;
@@ -276,7 +264,6 @@ static void bg_fix(obj_gm_class* i_this) {
     }
 }
 
-/* 80BFBA14-80BFC168 0009B4 0754+00 1/1 0/0 0/0 .text            swing__FP12obj_gm_class */
 static void swing(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     cXyz sp40, sp4c;
@@ -398,7 +385,6 @@ static void swing(obj_gm_class* i_this) {
     }
 }
 
-/* 80BFC168-80BFC664 001108 04FC+00 1/1 0/0 0/0 .text            drop__FP12obj_gm_class */
 static void drop(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     cXyz sp38, sp44;
@@ -489,7 +475,6 @@ static void drop(obj_gm_class* i_this) {
     a_this->attention_info.position = a_this->eyePos;
 }
 
-/* 80BFC664-80BFC7D0 001604 016C+00 1/1 0/0 0/0 .text            action__FP12obj_gm_class */
 static void action(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     s8 bVar1 = 1;
@@ -531,7 +516,6 @@ static void action(obj_gm_class* i_this) {
     a_this->attention_info.flags = 0;
 }
 
-/* 80BFC7D0-80BFC85C 001770 008C+00 1/1 0/0 0/0 .text            s_tbox_sub__FPvPv */
 static void* s_tbox_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TBOX) {
         f32 fVar1 = ((fopAc_ac_c*)i_actor)->current.pos.x - ((fopAc_ac_c*)i_data)->current.pos.x;
@@ -544,7 +528,6 @@ static void* s_tbox_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80BFC85C-80BFC8A8 0017FC 004C+00 1/1 0/0 0/0 .text            s_so_sub__FPvPv */
 static void* s_so_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_SO) {
         return i_actor;
@@ -554,7 +537,6 @@ static void* s_so_sub(void* i_actor, void* i_data) {
 }
 
 
-/* 80BFC8A8-80BFCAF8 001848 0250+00 2/1 0/0 0/0 .text            daObj_Gm_Execute__FP12obj_gm_class */
 static int daObj_Gm_Execute(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
 
@@ -608,15 +590,12 @@ static int daObj_Gm_Execute(obj_gm_class* i_this) {
     return 1;
 }
 
-/* 80BFCAF8-80BFCB00 001A98 0008+00 1/0 0/0 0/0 .text            daObj_Gm_IsDelete__FP12obj_gm_class */
 static int daObj_Gm_IsDelete(obj_gm_class* i_this) {
     return 1;
 }
 
-/* 80BFD598-80BFD59C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_initHIO;
 
-/* 80BFCB00-80BFCB74 001AA0 0074+00 1/0 0/0 0/0 .text            daObj_Gm_Delete__FP12obj_gm_class */
 static int daObj_Gm_Delete(obj_gm_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
 
@@ -634,7 +613,6 @@ static int daObj_Gm_Delete(obj_gm_class* i_this) {
     return 1;
 }
 
-/* 80BFCB74-80BFCBF0 001B14 007C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_gm_class* i_this = (obj_gm_class*)a_this;
 
@@ -649,10 +627,8 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80BFD5A8-80BFD5B0 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Gm_HIO_c l_HIO;
 
-/* 80BFCBF0-80BFD06C 001B90 047C+00 1/0 0/0 0/0 .text            daObj_Gm_Create__FP10fopAc_ac_c */
 static cPhs__Step daObj_Gm_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_gm_class);
     obj_gm_class* i_this = (obj_gm_class*)a_this;
@@ -742,7 +718,6 @@ static cPhs__Step daObj_Gm_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80BFD4D4-80BFD4F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Gm_Method */
 static actor_method_class l_daObj_Gm_Method = {
     (process_method_func)daObj_Gm_Create,
     (process_method_func)daObj_Gm_Delete,
@@ -751,7 +726,6 @@ static actor_method_class l_daObj_Gm_Method = {
     (process_method_func)daObj_Gm_Draw,
 };
 
-/* 80BFD4F4-80BFD524 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_GM */
 extern actor_process_profile_definition g_profile_OBJ_GM = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp
index 261affa54f..4ab9916f1d 100644
--- a/src/d/actor/d_a_obj_goGate.cpp
+++ b/src/d/actor/d_a_obj_goGate.cpp
@@ -8,13 +8,11 @@
 #include "d/actor/d_a_obj_goGate.h"
 #include "d/d_com_inf_game.h"
 
-/* 80BFD6AC-80BFD6DC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__14daGoGate_HIO_cFv */
 daGoGate_HIO_c::daGoGate_HIO_c() {
     mSpeed = 2.0f;
     mShockStrength = 3;
 }
 
-/* 80BFD724-80BFD7C0 000164 009C+00 2/2 0/0 0/0 .text            setBaseMtx__10daGoGate_cFv */
 void daGoGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -24,14 +22,12 @@ void daGoGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80BFD7C0-80BFD82C 000200 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daGoGate_cFv */
 int daGoGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_Ggate", 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel ? 1 : 0;
 }
 
-/* 80BFD82C-80BFD984 00026C 0158+00 1/1 0/0 0/0 .text            create__10daGoGate_cFv */
 cPhs__Step daGoGate_c::create() {
     fopAcM_ct(this, daGoGate_c);
 
@@ -63,7 +59,6 @@ cPhs__Step daGoGate_c::create() {
     return phase;
 }
 
-/* 80BFD984-80BFD9D4 0003C4 0050+00 1/0 0/0 0/0 .text            Execute__10daGoGate_cFPPA3_A4_f */
 int daGoGate_c::Execute(Mtx** param_0) {
     moveGate();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -72,10 +67,8 @@ int daGoGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80BFE11C-80BFE128 000014 000C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daGoGate_HIO_c l_HIO;
 
-/* 80BFD9D4-80BFDAD8 000414 0104+00 1/1 0/0 0/0 .text            moveGate__10daGoGate_cFv */
 void daGoGate_c::moveGate() {
     typedef void (daGoGate_c::*daGoGate_modeFunc)();
     static daGoGate_modeFunc mode_proc[] = {
@@ -97,21 +90,16 @@ void daGoGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80BFDAD8-80BFDAE4 000518 000C+00 3/3 0/0 0/0 .text            init_modeWait__10daGoGate_cFv */
 void daGoGate_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80BFDAE4-80BFDAE8 000524 0004+00 1/0 0/0 0/0 .text            modeWait__10daGoGate_cFv */
 void daGoGate_c::modeWait() {}
 
-/* 80BFDAE8-80BFDAF4 000528 000C+00 1/1 0/0 0/0 .text            init_modeMoveOpen__10daGoGate_cFv
- */
 void daGoGate_c::init_modeMoveOpen() {
     mMode = MODE_OPEN;
 }
 
-/* 80BFDAF4-80BFDC04 000534 0110+00 1/0 0/0 0/0 .text            modeMoveOpen__10daGoGate_cFv */
 void daGoGate_c::modeMoveOpen() {
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
     cXyz local(field_0x5b0, 0.0f, 0.0f);
@@ -125,13 +113,10 @@ void daGoGate_c::modeMoveOpen() {
     }
 }
 
-/* 80BFDC04-80BFDC10 000644 000C+00 1/1 0/0 0/0 .text            init_modeMoveClose__10daGoGate_cFv
- */
 void daGoGate_c::init_modeMoveClose() {
     mMode = MODE_CLOSE;
 }
 
-/* 80BFDC10-80BFDD20 000650 0110+00 1/0 0/0 0/0 .text            modeMoveClose__10daGoGate_cFv */
 void daGoGate_c::modeMoveClose() {
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
 
@@ -148,14 +133,12 @@ void daGoGate_c::modeMoveClose() {
     }
 }
 
-/* 80BFDD20-80BFDDDC 000760 00BC+00 2/2 0/0 0/0 .text            setSe__10daGoGate_cFv */
 void daGoGate_c::setSe() {
     mDoAud_seStart(Z2SE_OBJ_GORONGATE_STOP, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 0xf, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80BFDDDC-80BFDE80 00081C 00A4+00 1/0 0/0 0/0 .text            Draw__10daGoGate_cFv */
 int daGoGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -165,41 +148,34 @@ int daGoGate_c::Draw() {
     return 1;
 }
 
-/* 80BFDE80-80BFDEB0 0008C0 0030+00 1/0 0/0 0/0 .text            Delete__10daGoGate_cFv */
 int daGoGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_Ggate");
     return 1;
 }
 
-/* 80BFDEB0-80BFDEDC 0008F0 002C+00 1/0 0/0 0/0 .text            daGoGate_Draw__FP10daGoGate_c */
 static int daGoGate_Draw(daGoGate_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80BFDEDC-80BFDEFC 00091C 0020+00 1/0 0/0 0/0 .text            daGoGate_Execute__FP10daGoGate_c */
 static int daGoGate_Execute(daGoGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BFDEFC-80BFDF1C 00093C 0020+00 1/0 0/0 0/0 .text            daGoGate_Delete__FP10daGoGate_c */
 static int daGoGate_Delete(daGoGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80BFDF1C-80BFDF3C 00095C 0020+00 1/0 0/0 0/0 .text            daGoGate_Create__FP10fopAc_ac_c */
 static int daGoGate_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daGoGate_c*>(i_this)->create();
 }
 
-/* 80BFE078-80BFE098 -00001 0020+00 1/0 0/0 0/0 .data            l_daGoGate_Method */
 static actor_method_class l_daGoGate_Method = {
     (process_method_func)daGoGate_Create,  (process_method_func)daGoGate_Delete,
     (process_method_func)daGoGate_Execute, (process_method_func)NULL,
     (process_method_func)daGoGate_Draw,
 };
 
-/* 80BFE098-80BFE0C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GoGate */
 extern actor_process_profile_definition g_profile_Obj_GoGate = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp
index de3ac76862..8caae93b2a 100644
--- a/src/d/actor/d_a_obj_gomikabe.cpp
+++ b/src/d/actor/d_a_obj_gomikabe.cpp
@@ -12,10 +12,8 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 80BFFD30-80BFFD34 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "GomiKabe";
 
-/* 80BFE22C-80BFE244 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__19daObjGOMIKABE_HIO_cFv */
 daObjGOMIKABE_HIO_c::daObjGOMIKABE_HIO_c() {
     mId = -1;
 }
@@ -27,8 +25,6 @@ void daObjGOMIKABE_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80BFE244-80BFE2CC 000104 0088+00 1/1 0/0 0/0 .text            initCcCylinder__15daObjGOMIKABE_cFv
- */
 void daObjGOMIKABE_c::initCcCylinder() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -50,7 +46,6 @@ void daObjGOMIKABE_c::initCcCylinder() {
     }
 }
 
-/* 80BFE2CC-80BFE3FC 00018C 0130+00 1/1 0/0 0/0 .text            SetCcCyl__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::SetCcCyl() {
     cXyz offset(-200.0f, 0.0f, 0.0f);
     cXyz sphCenter(0.0f, 0.0f, 0.0f);
@@ -63,18 +58,15 @@ void daObjGOMIKABE_c::SetCcCyl() {
     }
 }
 
-/* 80BFE438-80BFE458 0002F8 0020+00 1/0 0/0 0/0 .text daObjGOMIKABE_Create__FP10fopAc_ac_c */
 static int daObjGOMIKABE_Create(fopAc_ac_c* i_this) {
     return ((daObjGOMIKABE_c*)i_this)->create();
 }
 
-/* 80BFE458-80BFE47C 000318 0024+00 1/0 0/0 0/0 .text daObjGOMIKABE_Delete__FP15daObjGOMIKABE_c */
 static int daObjGOMIKABE_Delete(daObjGOMIKABE_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80BFE47C-80BFE4C4 00033C 0048+00 1/1 0/0 0/0 .text            WaitAction__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::WaitAction() {
     cXyz cStack_28(current.pos.x, current.pos.y + 300.0f, current.pos.z);
     f32 height = current.pos.y;
@@ -83,7 +75,6 @@ void daObjGOMIKABE_c::WaitAction() {
     }
 }
 
-/* 80BFE4C4-80BFE52C 000384 0068+00 1/1 0/0 0/0 .text            BreakChk__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::BreakChk() {
     for (int i = 0; i < 3; i++) {
         if (mSphs[i].ChkTgHit()) {
@@ -93,7 +84,6 @@ void daObjGOMIKABE_c::BreakChk() {
     }
 }
 
-/* 80BFE52C-80BFEA24 0003EC 04F8+00 1/1 0/0 1/1 .text            BreakSet__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::BreakSet() {
     cXyz local_78(0.0f, 0.0f, 0.0f);
     cXyz cStack_84;
@@ -139,8 +129,6 @@ void daObjGOMIKABE_c::BreakSet() {
     }
 }
 
-/* 80BFEA60-80BFEB90 000920 0130+00 1/1 0/0 0/0 .text
- * getWaterStream__15daObjGOMIKABE_cFR4cXyzR4cXyzf              */
 void daObjGOMIKABE_c::getWaterStream(cXyz& param_1, cXyz& param_2, f32 i_scale) {
     mGndChk.SetPos(&param_1);
     cXyz local_48;
@@ -161,7 +149,6 @@ static f64 dummyLiteral3() { return 0.0; }
 static f32 dummyLiteral4() { return 2.0f; }
 static f32 dummyLiteral5() { return 3000.0f; }
 
-/* 80BFEB90-80BFED54 000A50 01C4+00 1/1 0/0 0/0 .text            SpeedSet__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::SpeedSet() {
     cXyz acStack_28;
     cXyz cStack_34;
@@ -194,12 +181,10 @@ void daObjGOMIKABE_c::SpeedSet() {
     }
 }
 
-/* 80BFED54-80BFED74 000C14 0020+00 1/1 0/0 0/0 .text            BreakAction__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::BreakAction() {
     SpeedSet();
 }
 
-/* 80BFED74-80BFEE24 000C34 00B0+00 1/1 0/0 0/0 .text            CheckCull__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::CheckCull() {
     if (fopAcM_searchPlayerDistance(this) > 7000.0f) {
         int notInViewNum = 0;
@@ -214,7 +199,6 @@ void daObjGOMIKABE_c::CheckCull() {
     }
 }
 
-/* 80BFEE24-80BFEEA8 000CE4 0084+00 1/1 0/0 0/0 .text checkViewArea__15daObjGOMIKABE_cF4cXyz */
 bool daObjGOMIKABE_c::checkViewArea(cXyz param_1) {
     Vec local_24;
     mDoLib_project(&param_1, &local_24);
@@ -226,7 +210,6 @@ bool daObjGOMIKABE_c::checkViewArea(cXyz param_1) {
     return rv;
 }
 
-/* 80BFEEA8-80BFEF20 000D68 0078+00 1/1 0/0 0/0 .text            Action__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::Action() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -243,7 +226,6 @@ void daObjGOMIKABE_c::Action() {
     }
 }
 
-/* 80BFEF20-80BFEF84 000DE0 0064+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -252,7 +234,6 @@ void daObjGOMIKABE_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80BFEF84-80BFF018 000E44 0094+00 2/2 0/0 0/0 .text            setBaseMtx2__15daObjGOMIKABE_cFv */
 void daObjGOMIKABE_c::setBaseMtx2() {
     for (int i = 0; i < 4; i++) {
         mDoMtx_stack_c::transS(mBreakPositions[i]);
@@ -262,18 +243,14 @@ void daObjGOMIKABE_c::setBaseMtx2() {
     }
 }
 
-/* 80BFF018-80BFF044 000ED8 002C+00 1/0 0/0 0/0 .text daObjGOMIKABE_Draw__FP15daObjGOMIKABE_c */
 static int daObjGOMIKABE_Draw(daObjGOMIKABE_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80BFF044-80BFF064 000F04 0020+00 2/1 0/0 0/0 .text daObjGOMIKABE_Execute__FP15daObjGOMIKABE_c
- */
 static int daObjGOMIKABE_Execute(daObjGOMIKABE_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80BFF064-80BFF164 000F24 0100+00 1/0 0/0 0/0 .text            CreateHeap__15daObjGOMIKABE_cFv */
 int daObjGOMIKABE_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Gomikabe.bmd");
     JUT_ASSERT(250, modelData != NULL);
@@ -295,13 +272,10 @@ int daObjGOMIKABE_c::CreateHeap() {
     return 1;
 }
 
-/* 80BFFE08-80BFFE0C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80BFFE18-80BFFE20 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObjGOMIKABE_HIO_c l_HIO;
 
-/* 80BFF164-80BFF5B4 001024 0450+00 1/1 0/0 0/0 .text            create__15daObjGOMIKABE_cFv */
 int daObjGOMIKABE_c::create() {
     fopAcM_ct(this, daObjGOMIKABE_c);
 
@@ -357,13 +331,10 @@ int daObjGOMIKABE_c::create() {
     return rv;
 }
 
-/* 80BFF8D0-80BFF8D8 001790 0008+00 1/0 0/0 0/0 .text daObjGOMIKABE_IsDelete__FP15daObjGOMIKABE_c
- */
 static int daObjGOMIKABE_IsDelete(daObjGOMIKABE_c* i_this) {
     return 1;
 }
 
-/* 80BFF8D8-80BFF938 001798 0060+00 1/0 0/0 0/0 .text            Create__15daObjGOMIKABE_cFv */
 int daObjGOMIKABE_c::Create() {
     fopAcM_setCullSizeBox(this, mBaseScale.x * -1000.0f, mBaseScale.y * -500.0f,
                           mBaseScale.z * -1000.0f, mBaseScale.x * 1000.0f, mBaseScale.y * 500.0f,
@@ -371,7 +342,6 @@ int daObjGOMIKABE_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80BFF938-80BFFA00 0017F8 00C8+00 1/0 0/0 0/0 .text Execute__15daObjGOMIKABE_cFPPA3_A4_f */
 int daObjGOMIKABE_c::Execute(Mtx** i_mtx) {
     for (int i = 0; i < 4; i++) {
         mBreakOldPositions[i] = mBreakPositions[i];
@@ -389,7 +359,6 @@ int daObjGOMIKABE_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80BFFA00-80BFFB1C 0018C0 011C+00 1/0 0/0 0/0 .text            Draw__15daObjGOMIKABE_cFv */
 int daObjGOMIKABE_c::Draw() {
     if (mAction == ACTION_WAIT) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -407,7 +376,6 @@ int daObjGOMIKABE_c::Draw() {
     return 1;
 }
 
-/* 80BFFB1C-80BFFB74 0019DC 0058+00 1/0 0/0 0/0 .text            Delete__15daObjGOMIKABE_cFv */
 int daObjGOMIKABE_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     if (mIsHIOOwner) {
@@ -417,7 +385,6 @@ int daObjGOMIKABE_c::Delete() {
     return 1;
 }
 
-/* 80BFFD34-80BFFD54 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGOMIKABE_Method */
 static actor_method_class l_daObjGOMIKABE_Method = {
     (process_method_func)daObjGOMIKABE_Create,
     (process_method_func)daObjGOMIKABE_Delete,
@@ -426,7 +393,6 @@ static actor_method_class l_daObjGOMIKABE_Method = {
     (process_method_func)daObjGOMIKABE_Draw,
 };
 
-/* 80BFFD54-80BFFD84 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GOMIKABE */
 extern actor_process_profile_definition g_profile_Obj_GOMIKABE = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp
index e9e1b7855f..94ede76333 100644
--- a/src/d/actor/d_a_obj_gpTaru.cpp
+++ b/src/d/actor/d_a_obj_gpTaru.cpp
@@ -12,10 +12,8 @@
 #include "d/d_cc_uty.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 8057F8E4-8057F920 000014 003C+00 8/8 0/0 0/0 .bss             l_HIO */
 static daGpTaru_HIO_c l_HIO;
 
-/* 8057D0CC-8057D154 0000EC 0088+00 1/1 0/0 0/0 .text            __ct__14daGpTaru_HIO_cFv */
 daGpTaru_HIO_c::daGpTaru_HIO_c() {
     weight = 200.0f;
     explosion_wait_time = 15;
@@ -34,7 +32,6 @@ daGpTaru_HIO_c::daGpTaru_HIO_c() {
     smoke_scale = 1.0f;
 }
 
-/* 8057D1F8-8057D2D0 000218 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__10daGpTaru_cFv */
 void daGpTaru_c::setBaseMtx() {
     scale.x = l_HIO.barrel_scale.x;
     scale.y = l_HIO.barrel_scale.y;
@@ -50,7 +47,6 @@ void daGpTaru_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8057D2D0-8057D33C 0002F0 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daGpTaru_cFv */
 int daGpTaru_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("K_ktar00", 3);
     JUT_ASSERT(295, modelData != NULL);
@@ -63,7 +59,6 @@ int daGpTaru_c::CreateHeap() {
     return 1;
 }
 
-/* 8057F6A8-8057F6EC 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__10daGpTaru_c */
 dCcD_SrcCyl daGpTaru_c::mCcDCyl = {
     daGpTaru_c::mCcDObjInfo,
     {
@@ -73,7 +68,6 @@ dCcD_SrcCyl daGpTaru_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 8057F584-8057F5B4 000014 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__10daGpTaru_c */
 const dCcD_SrcGObjInf daGpTaru_c::mCcDObjInfo = {
     {0, {{0, 0, 0x1F}, {0xD8FAFDBF, 0x11}, {0x79}}},
     {dCcD_SE_NONE, 0, 1, 0, 0},
@@ -81,7 +75,6 @@ const dCcD_SrcGObjInf daGpTaru_c::mCcDObjInfo = {
     {0},
 };
 
-/* 8057D33C-8057D600 00035C 02C4+00 1/1 0/0 0/0 .text            create__10daGpTaru_cFv */
 int daGpTaru_c::create() {
     fopAcM_ct(this, daGpTaru_c);
 
@@ -140,13 +133,10 @@ int daGpTaru_c::create() {
     return phase_state;
 }
 
-/* 8057D7CC-8057D7F8 0007EC 002C+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daGpTaru_cFP10fopAc_ac_c               */
 int daGpTaru_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daGpTaru_c*)i_this)->CreateHeap();
 }
 
-/* 8057D7F8-8057DAF4 000818 02FC+00 1/1 0/0 0/0 .text            bound__FP4cXyzRC13cBgS_PolyInfof */
 static f32 bound(cXyz* param_0, const cBgS_PolyInfo& param_1, f32 param_2) {
     cM3dGPla plane;
 
@@ -163,17 +153,14 @@ static f32 bound(cXyz* param_0, const cBgS_PolyInfo& param_1, f32 param_2) {
     }
 }
 
-/* 8057DB3C-8057DB60 000B5C 0024+00 1/1 0/0 0/0 .text            chkSinkAll__10daGpTaru_cFv */
 BOOL daGpTaru_c::chkSinkAll() {
     return mAcch.m_wtr.GetHeight() > 100.0f + current.pos.y;
 }
 
-/* 8057DB60-8057DB84 000B80 0024+00 3/3 0/0 0/0 .text            chkWaterLineIn__10daGpTaru_cFv */
 BOOL daGpTaru_c::chkWaterLineIn() {
     return mAcch.m_wtr.GetHeight() > 40.0f + current.pos.y;
 }
 
-/* 8057DB84-8057E224 000BA4 06A0+00 1/1 0/0 0/0 .text            bgCheck__10daGpTaru_cFv */
 void daGpTaru_c::bgCheck() {
     bool is_roof_hit = mAcch.ChkRoofHit();
     bool is_wall_hit = mAcch.ChkWallHit() != 0;
@@ -248,7 +235,6 @@ void daGpTaru_c::bgCheck() {
     }
 }
 
-/* 8057E224-8057E494 001244 0270+00 1/0 0/0 0/0 .text            Execute__10daGpTaru_cFv */
 int daGpTaru_c::Execute() {
     field_0x594 = speed;
 
@@ -306,7 +292,6 @@ int daGpTaru_c::Execute() {
     return 1;
 }
 
-/* 8057E494-8057E5DC 0014B4 0148+00 1/1 0/0 0/0 .text            mode_proc_call__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_call() {
     static void (daGpTaru_c::*l_mode_func[])() = {
         &daGpTaru_c::mode_proc_wait,
@@ -327,7 +312,6 @@ void daGpTaru_c::mode_proc_call() {
     mIsPrevCarry = fopAcM_checkCarryNow(this) != 0;
 }
 
-/* 8057E5DC-8057E618 0015FC 003C+00 2/2 0/0 0/0 .text            mode_init_wait__10daGpTaru_cFv */
 void daGpTaru_c::mode_init_wait() {
     if (field_0x954 == 0) {
         cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
@@ -338,19 +322,16 @@ void daGpTaru_c::mode_init_wait() {
     mMode = 0;
 }
 
-/* 8057E618-8057E63C 001638 0024+00 1/0 0/0 0/0 .text            mode_proc_wait__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_wait() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
 }
 
-/* 8057E63C-8057E660 00165C 0024+00 1/1 0/0 0/0 .text            mode_init_carry__10daGpTaru_cFv */
 void daGpTaru_c::mode_init_carry() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     speedF = 0.0f;
     mMode = 1;
 }
 
-/* 8057E660-8057E700 001680 00A0+00 1/0 0/0 0/0 .text            mode_proc_carry__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_carry() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     player->setGrabCollisionOffset(field_0x57c.x, field_0x57c.z, NULL);
@@ -366,25 +347,21 @@ void daGpTaru_c::mode_proc_carry() {
     }
 }
 
-/* 8057E700-8057E72C 001720 002C+00 1/1 0/0 0/0 .text            mode_init_drop__10daGpTaru_cFv */
 void daGpTaru_c::mode_init_drop() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     gravity = -l_HIO.weight;
     mMode = 2;
 }
 
-/* 8057E72C-8057E750 00174C 0024+00 1/0 0/0 0/0 .text            mode_proc_drop__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_drop() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
 }
 
-/* 8057E750-8057E768 001770 0018+00 2/2 0/0 0/0 .text            mode_init_roll__10daGpTaru_cFv */
 void daGpTaru_c::mode_init_roll() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mMode = 3;
 }
 
-/* 8057E768-8057EB2C 001788 03C4+00 1/0 0/0 0/0 .text            mode_proc_roll__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_roll() {
     f32 temp_f30 = 70.0f;
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
@@ -440,8 +417,6 @@ void daGpTaru_c::mode_proc_roll() {
     }
 }
 
-/* 8057EBA4-8057EC60 001BC4 00BC+00 1/1 0/0 0/0 .text            mode_init_exploInit__10daGpTaru_cFv
- */
 void daGpTaru_c::mode_init_exploInit() {
     mExploTimer = l_HIO.explosion_wait_time;
     field_0x938 = l_HIO.shake;
@@ -461,8 +436,6 @@ void daGpTaru_c::mode_init_exploInit() {
     mMode = 4;
 }
 
-/* 8057EC60-8057EE2C 001C80 01CC+00 1/0 0/0 0/0 .text            mode_proc_exploInit__10daGpTaru_cFv
- */
 void daGpTaru_c::mode_proc_exploInit() {
     if (mExploTimer != 0) {
         mDoAud_seStartLevel(Z2SE_OBJ_BOMBBARREL_IGNITION, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -483,8 +456,6 @@ void daGpTaru_c::mode_proc_exploInit() {
     field_0x944++;
 }
 
-/* 8057EE2C-8057EFB0 001E4C 0184+00 2/2 0/0 0/0 .text            mode_init_explosion__10daGpTaru_cFv
- */
 void daGpTaru_c::mode_init_explosion() {
     mWind.mStrength = mExploWindStrength;
 
@@ -513,20 +484,16 @@ void daGpTaru_c::mode_init_explosion() {
     mMode = 5;
 }
 
-/* 8057EFB0-8057EFFC 001FD0 004C+00 1/0 0/0 0/0 .text            mode_proc_explosion__10daGpTaru_cFv
- */
 void daGpTaru_c::mode_proc_explosion() {
     fopAcM_onSwitch(this, fopAcM_GetParam(this) & 0xFF);
     fopAcM_delete(this);
 }
 
-/* 8057EFFC-8057F014 00201C 0018+00 2/2 0/0 0/0 .text            mode_init_sink__10daGpTaru_cFv */
 void daGpTaru_c::mode_init_sink() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mMode = 6;
 }
 
-/* 8057F014-8057F104 002034 00F0+00 1/0 0/0 0/0 .text            mode_proc_sink__10daGpTaru_cFv */
 void daGpTaru_c::mode_proc_sink() {
     cLib_addCalc(&speedF, 0.0f, 0.05f, 0.1f, 0.01f);
     speed.y = cLib_minMaxLimit<f32>(speed.y, -15.0f, 13.0f);
@@ -550,7 +517,6 @@ void daGpTaru_c::mode_proc_sink() {
     }
 }
 
-/* 8057F104-8057F284 002124 0180+00 1/1 0/0 0/0 .text            breakEffSet__10daGpTaru_cFv */
 void daGpTaru_c::breakEffSet() {
     cXyz pos(current.pos);
     cXyz size(0.75f, 0.75f, 0.75f);
@@ -577,7 +543,6 @@ void daGpTaru_c::breakEffSet() {
     }
 }
 
-/* 8057F284-8057F328 0022A4 00A4+00 1/0 0/0 0/0 .text            Draw__10daGpTaru_cFv */
 int daGpTaru_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -588,7 +553,6 @@ int daGpTaru_c::Draw() {
     return 1;
 }
 
-/* 8057F328-8057F36C 002348 0044+00 1/0 0/0 0/0 .text            Delete__10daGpTaru_cFv */
 int daGpTaru_c::Delete() {
     dKyw_pntwind_cut(&mWind);
     dComIfG_resDelete(&mPhase, "K_ktar00");
@@ -599,27 +563,22 @@ int daGpTaru_c::Delete() {
     return 1;
 }
 
-/* 8057F36C-8057F398 00238C 002C+00 1/0 0/0 0/0 .text            daGpTaru_Draw__FP10daGpTaru_c */
 static int daGpTaru_Draw(daGpTaru_c* i_this) {
     return i_this->Draw();
 }
 
-/* 8057F398-8057F3C4 0023B8 002C+00 1/0 0/0 0/0 .text            daGpTaru_Execute__FP10daGpTaru_c */
 static int daGpTaru_Execute(daGpTaru_c* i_this) {
     return i_this->Execute();
 }
 
-/* 8057F3C4-8057F3F0 0023E4 002C+00 1/0 0/0 0/0 .text            daGpTaru_Delete__FP10daGpTaru_c */
 static int daGpTaru_Delete(daGpTaru_c* i_this) {
     return i_this->Delete();
 }
 
-/* 8057F3F0-8057F410 002410 0020+00 1/0 0/0 0/0 .text            daGpTaru_Create__FP10fopAc_ac_c */
 static int daGpTaru_Create(fopAc_ac_c* i_this) {
     return ((daGpTaru_c*)i_this)->create();
 }
 
-/* 8057F7A4-8057F7C4 -00001 0020+00 1/0 0/0 0/0 .data            l_daGpTaru_Method */
 static actor_method_class l_daGpTaru_Method = {
     (process_method_func)daGpTaru_Create,
     (process_method_func)daGpTaru_Delete,
@@ -628,7 +587,6 @@ static actor_method_class l_daGpTaru_Method = {
     (process_method_func)daGpTaru_Draw,
 };
 
-/* 8057F7C4-8057F7F4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GpTaru */
 extern actor_process_profile_definition g_profile_Obj_GpTaru = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp
index fb45898630..3c69faf2c8 100644
--- a/src/d/actor/d_a_obj_gra2.cpp
+++ b/src/d/actor/d_a_obj_gra2.cpp
@@ -21,7 +21,7 @@
 
 class daObj_GrA_Param_c {
 public:
-    /* 80C04B1C */ virtual ~daObj_GrA_Param_c() {}
+    virtual ~daObj_GrA_Param_c() {}
 
     static const daObj_GrA_HIO_Param_c m;
 };
@@ -123,7 +123,6 @@ public:
 };
 #endif
 
-/* 80C0FE88-80C0FE98 -00001 0010+00 1/1 0/0 0/0 .data            l_resFileNameList */
 static char* l_resFileNameList[4] = {
     "grA",
     "grA",
@@ -131,22 +130,18 @@ static char* l_resFileNameList[4] = {
     "grA",
 };
 
-/* 80C0FE98-80C0FEA8 000030 0010+00 1/0 0/0 0/0 .data            l_exLoadRes_GRAa */
 static int l_exLoadRes_GRAa[4] = {
     1, 2, -1, -1,
 };
 
-/* 80C0FEA8-80C0FEB8 000040 0010+00 1/0 0/0 0/0 .data            l_exLoadRes_GRA_jump */
 static int l_exLoadRes_GRA_jump[4] = {
     1, 2, 4, -1,
 };
 
-/* 80C0FEB8-80C0FEC8 000050 0010+00 1/0 0/0 0/0 .data            l_exLoadRes_GRA_demo */
 static int l_exLoadRes_GRA_demo[4] = {
     1, 2, 3, -1,
 };
 
-/* 80C0FEC8-80C0FED8 -00001 0010+00 2/2 0/0 0/0 .data            l_exloadRes_list */
 static int* l_exloadRes_list[4] = {
     l_exLoadRes_GRAa,
     l_exLoadRes_GRA_jump,
@@ -154,7 +149,6 @@ static int* l_exloadRes_list[4] = {
     l_exLoadRes_GRA_demo,
 };
 
-/* 80C0FED8-80C0FEEC -00001 0014+00 5/6 0/0 0/0 .data            l_resNames */
 static char* l_resNames[5] = {
     "grA",
     "grA_base",
@@ -163,12 +157,10 @@ static char* l_resNames[5] = {
     "grA_Look",
 };
 
-/* 80C0FEEC-80C0FEF4 000084 0008+00 0/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[2] = {
     3, 2,
 };
 
-/* 80C0FEF4-80C1000C 00008C 0118+00 2/2 0/0 0/0 .data            l_bckGetParamList */
 static int l_bckGetParamList[35][2] = {
     {21, 1}, {18, 0},
     {22, 1}, {11, 0},
@@ -190,36 +182,30 @@ static int l_bckGetParamList[35][2] = {
     {9, 0},
 };
 
-/* 80C1000C-80C1002C 0001A4 0020+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static int l_btpGetParamList[4][2] = {
     {28, 1}, {32, 1},
     {31, 1}, {21, 0},
 };
 
-/* 80C1002C-80C10044 0001C4 0016+02 1/2 0/0 0/0 .data            l_eventMotionChangeTable */
 static u16 l_eventMotionChangeTable[11] = {
     0, 1, 0, 2,
     3, 0, 0, 0,
     0, 0, 0,
 };
 
-/* 80C10044-80C1004C 0001DC 0008+00 1/2 0/0 0/0 .data            l_eventFaceChangeTable */
 static u16 l_eventFaceChangeTable[4] = {
     1, 2, 6, 7,
 };
 
-/* 80C1004C-80C10054 -00001 0008+00 1/1 0/0 0/0 .data            l_evtNameList */
 static char* l_evtNameList[2] = {
     NULL,
     "GRA_THROWN",
 };
 
-/* 80C10054-80C1005C 0001EC 0008+00 0/1 0/0 0/0 .data            l_entryJntNoList */
 static u16 l_entryJntNoList[4] = {
     5, 6, 7, -1,
 };
 
-/* 80BFFF0C-80BFFF58 0000EC 004C+00 2/2 0/0 0/0 .text            jointCtrlCallBack__FP8J3DJointi */
 static int jointCtrlCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -232,17 +218,14 @@ static int jointCtrlCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80BFFF58-80BFFF70 000138 0018+00 1/1 0/0 0/0 .text            rideCallBack__11daObj_GrA_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daObj_GrA_c::rideCallBack(dBgW* param_1, fopAc_ac_c* actor_p, fopAc_ac_c* param_3) {
     daObj_GrA_c* aActor_p = (daObj_GrA_c*) actor_p;
     JUT_ASSERT(684, NULL != aActor_p);
     aActor_p->field_0x10c4 = fopAcM_GetProfName(param_3) == PROC_ALINK;
 }
 
-/* 80BFFF70-80C0011C 000150 01AC+00 1/1 0/0 0/0 .text            __ct__11daObj_GrA_cFv */
 daObj_GrA_c::daObj_GrA_c() {}
 
-/* 80C0011C-80C003CC 0002FC 02B0+00 1/0 0/0 0/0 .text            __dt__11daObj_GrA_cFv */
 daObj_GrA_c::~daObj_GrA_c() {
     dComIfG_resDelete(&mPhase, getResName());
     for (int i = 0; l_exloadRes_list[mMode][i] >= 0; i++) {
@@ -267,7 +250,6 @@ daObj_GrA_c::~daObj_GrA_c() {
 #endif
 }
 
-/* 80C003CC-80C00614 0005AC 0248+00 1/1 0/0 0/0 .text            create__11daObj_GrA_cFv */
 cPhs__Step daObj_GrA_c::create() {
     int uVar1 = 0;
     fopAcM_ct(this, daObj_GrA_c);
@@ -321,7 +303,6 @@ cPhs__Step daObj_GrA_c::create() {
     return phase;
 }
 
-/* 80C0FA7C-80C0FB3C 000000 00C0+00 54/54 0/0 0/0 .rodata          m__17daObj_GrA_Param_c */
 daObj_GrA_HIO_Param_c const daObj_GrA_Param_c::m = {
     85.0f,
     -4.0f,
@@ -379,7 +360,6 @@ daObj_GrA_HIO_Param_c const daObj_GrA_Param_c::m = {
     30.0f,
 };
 
-/* 80C0FB3C-80C0FB8C 0000C0 0050+00 0/0 0/0 0/0 .rodata          l_bgcParam */
 static const f32 l_bgcParam[20] = {
     0.0f, 0.0f, 0.0f, 0.0f,
     -0.5f, 1.0f, -0.5f, 1.0f,
@@ -388,10 +368,8 @@ static const f32 l_bgcParam[20] = {
     -0.5f, 1.0f, 0.5f, -1.0f,
 };
 
-/* 80C0FB8C-80C0FB94 000110 0008+00 0/0 0/0 0/0 .rodata          l_dirToAngleTBL */
 const s16 l_dirToAngleTBL[4] = {0, 0x4000, 0x8000, 0xC000};
 
-/* 80C00614-80C00790 0007F4 017C+00 1/0 0/0 0/0 .text            CreateHeap__11daObj_GrA_cFv */
 int daObj_GrA_c::CreateHeap() {
     J3DModelData* aMdlData_p = NULL;
     field_0x844 = dKy_darkworld_check();
@@ -422,7 +400,6 @@ int daObj_GrA_c::CreateHeap() {
     return 1;
 }
 
-/* 80C00790-80C00804 000970 0074+00 1/0 0/0 0/0 .text            Delete__11daObj_GrA_cFv */
 int daObj_GrA_c::Delete() {
     fopAcM_RegisterDeleteID(this, "OBJ_GRA");
     if (dComIfGp_getVibration().CheckQuake()) {
@@ -432,7 +409,6 @@ int daObj_GrA_c::Delete() {
     return 1;
 }
 
-/* 80C00804-80C00A44 0009E4 0240+00 1/0 0/0 0/0 .text            Execute__11daObj_GrA_cFPPA3_A4_f */
 int daObj_GrA_c::Execute(Mtx** param_1) {
     int rv = 1;
     *param_1 = &mBgMtx;
@@ -476,7 +452,6 @@ int daObj_GrA_c::Execute(Mtx** param_1) {
     return rv;
 }
 
-/* 80C00A44-80C00ACC 000C24 0088+00 1/0 0/0 0/0 .text            Draw__11daObj_GrA_cFv */
 int daObj_GrA_c::Draw() {
     f32 fVar1 = 800.0f;
     if (mMode == 3) {
@@ -490,7 +465,6 @@ int daObj_GrA_c::Draw() {
     return 1;
 }
 
-/* 80C00ACC-80C00D5C 000CAC 0290+00 1/1 0/0 0/0 .text            jointCtrl__11daObj_GrA_cFP8J3DJointP8J3DModel */
 int daObj_GrA_c::jointCtrl(J3DJoint* i_joint, J3DModel* param_2) {
     Mtx MStack_78, MStack_a8;
     int jointNo = i_joint->getJntNo();
@@ -555,12 +529,10 @@ int daObj_GrA_c::jointCtrl(J3DJoint* i_joint, J3DModel* param_2) {
     return 1;
 }
 
-/* 80C00D5C-80C00D74 000F3C 0018+00 1/0 0/0 0/0 .text            getResName__11daObj_GrA_cFv */
 const char* daObj_GrA_c::getResName() {
     return l_resFileNameList[mMode];
 }
 
-/* 80C00D74-80C00DF8 000F54 0084+00 1/1 0/0 0/0 .text            getMode__11daObj_GrA_cFv */
 u8 daObj_GrA_c::getMode() {
     u32 uVar1 = fopAcM_GetParam(this) >> 28 & 3;
     strcpy(&field_0x744, "Obj_grA");
@@ -581,22 +553,18 @@ u8 daObj_GrA_c::getMode() {
     }
 }
 
-/* 80C00DF8-80C00E04 000FD8 000C+00 1/1 0/0 0/0 .text            getPathNo__11daObj_GrA_cFv */
 u8 daObj_GrA_c::getPathNo() {
     return fopAcM_GetParam(this) >> 20 & 0xFF;
 }
 
-/* 80C00E04-80C00E10 000FE4 000C+00 4/4 0/0 0/0 .text            getTagNo__11daObj_GrA_cFv */
 u16 daObj_GrA_c::getTagNo() {
     return fopAcM_GetParam(this) >> 7 & 0x7F;
 }
 
-/* 80C00E10-80C00E1C 000FF0 000C+00 1/1 0/0 0/0 .text            getJumpType__11daObj_GrA_cFv */
 u16 daObj_GrA_c::getJumpType() {
     return fopAcM_GetParam(this) >> 7 & 0x7F;
 }
 
-/* 80C00E1C-80C00EFC 000FFC 00E0+00 1/1 0/0 0/0 .text            isDelete__11daObj_GrA_cFv */
 BOOL daObj_GrA_c::isDelete() {
     if (mMode == 3) {
         if (!dComIfGs_isSwitch(field_0xa7f, fopAcM_GetRoomNo(this))) {
@@ -625,7 +593,6 @@ BOOL daObj_GrA_c::isDelete() {
     return TRUE;
 }
 
-/* 80C00EFC-80C010D4 0010DC 01D8+00 1/1 0/0 0/0 .text            restart__11daObj_GrA_cFv */
 void daObj_GrA_c::restart() {
     current.angle.set(0, home.angle.y, 0);
     shape_angle = current.angle;
@@ -683,13 +650,10 @@ void daObj_GrA_c::restart() {
     field_0x209c = 0;
 }
 
-/* 80C108EC-80C108F8 000054 000C+00 0/2 0/0 0/0 .bss             l_centerOfst */
 static cXyz l_centerOfst(0.0f, 67.0f, 26.0f);
 
-/* 80C10904-80C10908 00006C 0004+00 1/2 0/0 0/0 .bss             l_HIO */
 static OBJ_GRA_HIO_CLASS l_HIO;
 
-/* 80C010D4-80C013B0 0012B4 02DC+00 1/1 0/0 0/0 .text            init__11daObj_GrA_cFv */
 int daObj_GrA_c::init() {
     fopAcM_SetMtx(this, mpModelMorf->getModel()->getBaseTRMtx());
     mSound.init(&current.pos, &eyePos, 3, 1);
@@ -747,7 +711,6 @@ int daObj_GrA_c::init() {
     return MoveBGExecute();
 }
 
-/* 80C013B0-80C014F4 001590 0144+00 24/23 0/0 0/0 .text            setBaseAnm__11daObj_GrA_cFif */
 void daObj_GrA_c::setBaseAnm(int param_1, f32 i_morf) {
     J3DAnmTransformKey* transformKey = NULL;
     int i_mode = 2;
@@ -817,7 +780,6 @@ void daObj_GrA_c::setBaseAnm(int param_1, f32 i_morf) {
     }
 }
 
-/* 80C014F4-80C01698 0016D4 01A4+00 15/14 0/0 0/0 .text            setFaceAnm__11daObj_GrA_cFibf */
 void daObj_GrA_c::setFaceAnm(int param_1, bool i_modify, f32 i_morf) {
     J3DAnmTransform* transform = NULL;
     int i_mode = 0;
@@ -878,7 +840,6 @@ void daObj_GrA_c::setFaceAnm(int param_1, bool i_modify, f32 i_morf) {
     }
 }
 
-/* 80C01698-80C0178C 001878 00F4+00 2/2 0/0 0/0 .text            setFaceBtp__11daObj_GrA_cFi */
 void daObj_GrA_c::setFaceBtp(int param_1) {
     J3DAnmTexPattern* texPattern = NULL;
     int i_mode = 0;
@@ -912,7 +873,6 @@ void daObj_GrA_c::setFaceBtp(int param_1) {
     }
 }
 
-/* 80C0178C-80C017AC 00196C 0020+00 22/22 0/0 0/0 .text            setBaseMotion__11daObj_GrA_cFif */
 void daObj_GrA_c::setBaseMotion(int param_1, f32 param_2) {
     if (field_0xa90 >= 22) {
         return;
@@ -923,7 +883,6 @@ void daObj_GrA_c::setBaseMotion(int param_1, f32 param_2) {
     field_0xa8d = 1;
 }
 
-/* 80C017AC-80C017F0 00198C 0044+00 25/25 0/0 0/0 .text            setFaceMotion__11daObj_GrA_cFif */
 void daObj_GrA_c::setFaceMotion(int param_1, f32 param_2) {
     if (field_0xa92 >= 14) {
         return;
@@ -940,7 +899,6 @@ void daObj_GrA_c::setFaceMotion(int param_1, f32 param_2) {
     field_0xa98 = param_2;
 }
 
-/* 80C017F0-80C018C0 0019D0 00D0+00 7/7 0/0 0/0 .text            calcMotion__11daObj_GrA_cFv */
 void daObj_GrA_c::calcMotion() {
     if (field_0xa90 < 22 && mBaseMotionList[field_0xa90]) {
         field_0xa88 = (this->*mBaseMotionList[field_0xa90])(field_0xa8d);
@@ -954,12 +912,10 @@ void daObj_GrA_c::calcMotion() {
     field_0xa8e = 0;
 }
 
-/* 80C018C0-80C018F4 001AA0 0034+00 4/4 0/0 0/0 .text            checkProcess__11daObj_GrA_cFM11daObj_GrA_cFPCvPvPv_i */
 BOOL daObj_GrA_c::checkProcess(int (daObj_GrA_c::*process)(void*)) {
     return process == field_0xa50;
 }
 
-/* 80C018F4-80C019A4 001AD4 00B0+00 22/22 0/0 0/0 .text          setProcess__11daObj_GrA_cFM11daObj_GrA_cFPCvPvPv_i */
 int daObj_GrA_c::setProcess(int (daObj_GrA_c::*process)(void*)) {
     field_0xa7c = 2;
 
@@ -979,12 +935,10 @@ int daObj_GrA_c::setProcess(int (daObj_GrA_c::*process)(void*)) {
     return 1;
 }
 
-/* 80C019A4-80C019B8 001B84 0014+00 2/2 0/0 0/0 .text            getDistTableIdx__Fii */
 static u8 getDistTableIdx(int param_1, int param_2) {
     return param_1 + param_2 * 20 + 94;
 }
 
-/* 80C019B8-80C01C18 001B98 0260+00 1/0 0/0 0/0 .text            setParam__11daObj_GrA_cFv */
 void daObj_GrA_c::setParam() {
     if (mMode == 0) {
         if ((( checkProcess(&daObj_GrA_c::standWait)
@@ -1024,7 +978,6 @@ void daObj_GrA_c::setParam() {
     gravity = mpHIO->m.mGravity;
 }
 
-/* 80C01C18-80C01D7C 001DF8 0164+00 1/1 0/0 0/0 .text            checkEvent__11daObj_GrA_cFv */
 BOOL daObj_GrA_c::checkEvent() {
     BOOL rv = TRUE;
 #if VERSION != VERSION_SHIELD_DEBUG
@@ -1062,7 +1015,6 @@ BOOL daObj_GrA_c::checkEvent() {
     return rv;
 }
 
-/* 80C01D7C-80C01FE4 001F5C 0268+00 1/0 0/0 0/0 .text            mainProc__11daObj_GrA_cFv */
 void daObj_GrA_c::mainProc() {
     fopAcM_setCullSizeBox(this, -160.0f, -100.0f, -160.0f, 160.0f, 240.0f, 160.0f);
 
@@ -1094,12 +1046,10 @@ void daObj_GrA_c::mainProc() {
     calcMotion();
 }
 
-/* 80C01FE4-80C01FE8 0021C4 0004+00 1/0 0/0 0/0 .text            adjustShapeAngle__11daObj_GrA_cFv */
 void daObj_GrA_c::adjustShapeAngle() {
     /* empty function */
 }
 
-/* 80C01FE8-80C02614 0021C8 062C+00 1/0 0/0 0/0 .text            setMtx__11daObj_GrA_cFi */
 void daObj_GrA_c::setMtx(int param_1) {
     static cXyz aTrembleTrans[15] = {
         cXyz(0.0f, 0.0f, 0.0f),
@@ -1172,7 +1122,6 @@ void daObj_GrA_c::setMtx(int param_1) {
     }
 }
 
-/* 80C02614-80C02970 0027F4 035C+00 1/0 0/0 0/0 .text            setCollisions__11daObj_GrA_cFv */
 void daObj_GrA_c::setCollisions() {
     cXyz sp1c;
 
@@ -1249,7 +1198,6 @@ void daObj_GrA_c::setCollisions() {
     }
 }
 
-/* 80C02970-80C02A5C 002B50 00EC+00 1/0 0/0 0/0 .text            setAttnPos__11daObj_GrA_cFv */
 void daObj_GrA_c::setAttnPos() {
     lookat();
 
@@ -1274,17 +1222,14 @@ static s16 dummy_lit_124886(int sel) {
 }
 #endif
 
-/* 80C02A5C-80C02A60 002C3C 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__11daObj_GrA_cFv */
 void daObj_GrA_c::drawOtherMdls() {
     /* empty function */
 }
 
-/* 80C02A60-80C02A68 002C40 0008+00 1/0 0/0 0/0 .text            dbgDraw__11daObj_GrA_cFv */
 bool daObj_GrA_c::dbgDraw() {
     return true;
 }
 
-/* 80C02A68-80C02AD4 002C48 006C+00 2/2 0/0 0/0 .text            ppMoveInit__11daObj_GrA_cFv */
 int daObj_GrA_c::ppMoveInit() {
     memset(&field_0x10ac, 0, 16);
 
@@ -1300,7 +1245,6 @@ int daObj_GrA_c::ppMoveInit() {
     return 1;
 }
 
-/* 80C02AD4-80C02AE8 002CB4 0014+00 17/17 0/0 0/0 .text            setLookMode__11daObj_GrA_cFi */
 int daObj_GrA_c::setLookMode(int iNo) {
     JUT_ASSERT(2656, 0 <= iNo && iNo < NUMLOOKMODES_e);
     mLookMode = iNo;
@@ -1322,7 +1266,6 @@ static f32 dummy_lits(int sel) {
     }
 }
 
-/* 80C02AE8-80C0308C 002CC8 05A4+00 1/1 0/0 0/0 .text            lookat__11daObj_GrA_cFv */
 int daObj_GrA_c::lookat() {
     J3DModel* model = mpModelMorf->getModel();
     s16 sVar1 = current.angle.y - old.angle.y;
@@ -1429,7 +1372,6 @@ int daObj_GrA_c::lookat() {
     return 1;
 }
 
-/* 80C0308C-80C031E4 00326C 0158+00 1/1 0/0 0/0 .text            hitChk__11daObj_GrA_cFv */
 int daObj_GrA_c::hitChk() {
     if (field_0xaa4 != 0) {
         cLib_calcTimer(&field_0xaa4);
@@ -1458,7 +1400,6 @@ int daObj_GrA_c::hitChk() {
     return 1;
 }
 
-/* 80C031E4-80C0335C 0033C4 0178+00 12/0 0/0 0/0 .text            wait__11daObj_GrA_cFPv */
 int daObj_GrA_c::wait(void* param_1) {
     switch (field_0xa7c) {
         case 0: {
@@ -1497,7 +1438,6 @@ int daObj_GrA_c::wait(void* param_1) {
     return 1;
 }
 
-/* 80C0335C-80C035B8 00353C 025C+00 2/0 0/0 0/0 .text            talk__11daObj_GrA_cFPv */
 int daObj_GrA_c::talk(void* param_1) {
     int iVar1, iVar2;
     int rv = 0;
@@ -1571,7 +1511,6 @@ int daObj_GrA_c::talk(void* param_1) {
     return rv;
 }
 
-/* 80C035B8-80C036B4 003798 00FC+00 2/2 0/0 0/0 .text ctrlMsgAnm__11daObj_GrA_cFRiRiP10fopAc_ac_c */
 int daObj_GrA_c::ctrlMsgAnm(int& param_1, int& param_2, fopAc_ac_c* param_3) {
     param_1 = -1;
     param_2 = -1;
@@ -1608,7 +1547,6 @@ int daObj_GrA_c::ctrlMsgAnm(int& param_1, int& param_2, fopAc_ac_c* param_3) {
     return field_0xaa0;
 }
 
-/* 80C036B4-80C03720 003894 006C+00 2/2 0/0 0/0 .text            s_sub__FPvPv */
 static void* s_sub(void* i_actor, void* i_data) {
     daObj_GrA_c* i_this = (daObj_GrA_c*)i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_GRA && i_this->checkTagGraSub((fopAc_ac_c*)i_actor)) {
@@ -1617,7 +1555,6 @@ static void* s_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C03720-80C03764 003900 0044+00 1/1 0/0 0/0 .text checkTagGraSub__11daObj_GrA_cFP10fopAc_ac_c */
 bool daObj_GrA_c::checkTagGraSub(fopAc_ac_c* a_this) {
     daTagGra_c* i_this = (daTagGra_c*)a_this;
     if (getTagNo() == i_this->getGraNo()) {
@@ -1627,7 +1564,6 @@ bool daObj_GrA_c::checkTagGraSub(fopAc_ac_c* a_this) {
     }
 }
 
-/* 80C03764-80C03830 003944 00CC+00 1/1 0/0 0/0 .text            fallAbyssCheck__11daObj_GrA_cFv */
 bool daObj_GrA_c::fallAbyssCheck() {
     if (mGroundY == -G_CM3D_F_INF && field_0x1528.isPath()) {
         field_0x1fc0++;
@@ -1654,7 +1590,6 @@ static f32 dummy_lits_01(int sel) {
     }
 }
 
-/* 80C03830-80C03B14 003A10 02E4+00 1/1 0/0 0/0 .text            setPrtcl__11daObj_GrA_cFv */
 int daObj_GrA_c::setPrtcl() {
     static u16 const l_prticles_id[3] = {
         0x83B5,
@@ -1736,7 +1671,6 @@ int daObj_GrA_c::setPrtcl() {
 #include "d/actor/d_a_obj_gra2_soldier.inc"
 #include "d/actor/d_a_obj_gra2_base.inc"
 
-/* 80C03B14-80C03B48 003CF4 0034+00 1/0 0/0 0/0 .text            base000__11daObj_GrA_cFi */
 int daObj_GrA_c::base000(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(0, field_0xa94);
@@ -1745,7 +1679,6 @@ int daObj_GrA_c::base000(int param_1) {
     return 1;
 }
 
-/* 80C03B48-80C03B7C 003D28 0034+00 1/0 0/0 0/0 .text            base001__11daObj_GrA_cFi */
 int daObj_GrA_c::base001(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(2, field_0xa94);
@@ -1754,7 +1687,6 @@ int daObj_GrA_c::base001(int param_1) {
     return 1;
 }
 
-/* 80C03B7C-80C03C1C 003D5C 00A0+00 1/0 0/0 0/0 .text            base003__11daObj_GrA_cFi */
 int daObj_GrA_c::base003(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(4, field_0xa94);
@@ -1766,7 +1698,6 @@ int daObj_GrA_c::base003(int param_1) {
     return 1;
 }
 
-/* 80C03C1C-80C03CBC 003DFC 00A0+00 1/0 0/0 0/0 .text            base004__11daObj_GrA_cFi */
 int daObj_GrA_c::base004(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(5, field_0xa94);
@@ -1778,7 +1709,6 @@ int daObj_GrA_c::base004(int param_1) {
     return 1;
 }
 
-/* 80C03CBC-80C03D54 003E9C 0098+00 1/0 0/0 0/0 .text            base005__11daObj_GrA_cFi */
 int daObj_GrA_c::base005(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(6, field_0xa94);
@@ -1791,7 +1721,6 @@ int daObj_GrA_c::base005(int param_1) {
     return 1;
 }
 
-/* 80C03D54-80C03D88 003F34 0034+00 1/0 0/0 0/0 .text            base006__11daObj_GrA_cFi */
 int daObj_GrA_c::base006(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(7, field_0xa94);
@@ -1800,7 +1729,6 @@ int daObj_GrA_c::base006(int param_1) {
     return 1;
 }
 
-/* 80C03D88-80C03DF0 003F68 0068+00 1/0 0/0 0/0 .text            base007__11daObj_GrA_cFi */
 int daObj_GrA_c::base007(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(8, field_0xa94);
@@ -1810,7 +1738,6 @@ int daObj_GrA_c::base007(int param_1) {
     return 1;
 }
 
-/* 80C03DF0-80C03E74 003FD0 0084+00 1/0 0/0 0/0 .text            base008__11daObj_GrA_cFi */
 int daObj_GrA_c::base008(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(10, field_0xa94);
@@ -1823,7 +1750,6 @@ int daObj_GrA_c::base008(int param_1) {
     return 1;
 }
 
-/* 80C03E74-80C03F14 004054 00A0+00 1/0 0/0 0/0 .text            base009__11daObj_GrA_cFi */
 int daObj_GrA_c::base009(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(1, field_0xa94);
@@ -1836,7 +1762,6 @@ int daObj_GrA_c::base009(int param_1) {
     return 1;
 }
 
-/* 80C03F14-80C03FC0 0040F4 00AC+00 1/0 0/0 0/0 .text            base010__11daObj_GrA_cFi */
 int daObj_GrA_c::base010(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(3, field_0xa94);
@@ -1849,7 +1774,6 @@ int daObj_GrA_c::base010(int param_1) {
     return 1;
 }
 
-/* 80C03FC0-80C04118 0041A0 0158+00 1/0 0/0 0/0 .text            base013__11daObj_GrA_cFi */
 int daObj_GrA_c::base013(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(9, field_0xa94);
@@ -1875,7 +1799,6 @@ int daObj_GrA_c::base013(int param_1) {
     return 1;
 }
 
-/* 80C04118-80C04180 0042F8 0068+00 1/0 0/0 0/0 .text            base016__11daObj_GrA_cFi */
 int daObj_GrA_c::base016(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(11, field_0xa94);
@@ -1885,7 +1808,6 @@ int daObj_GrA_c::base016(int param_1) {
     return 1;
 }
 
-/* 80C04180-80C041E8 004360 0068+00 1/0 0/0 0/0 .text            base017__11daObj_GrA_cFi */
 int daObj_GrA_c::base017(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(12, field_0xa94);
@@ -1895,7 +1817,6 @@ int daObj_GrA_c::base017(int param_1) {
     return 1;
 }
 
-/* 80C041E8-80C04260 0043C8 0078+00 1/0 0/0 0/0 .text            base018__11daObj_GrA_cFi */
 int daObj_GrA_c::base018(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(13, field_0xa94);
@@ -1906,7 +1827,6 @@ int daObj_GrA_c::base018(int param_1) {
     return 1;
 }
 
-/* 80C04260-80C042D4 004440 0074+00 1/0 0/0 0/0 .text            base019__11daObj_GrA_cFi */
 int daObj_GrA_c::base019(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(14, field_0xa94);
@@ -1917,7 +1837,6 @@ int daObj_GrA_c::base019(int param_1) {
     return 1;
 }
 
-/* 80C042D4-80C04308 0044B4 0034+00 1/0 0/0 0/0 .text            base020__11daObj_GrA_cFi */
 int daObj_GrA_c::base020(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(15, field_0xa94);
@@ -1926,7 +1845,6 @@ int daObj_GrA_c::base020(int param_1) {
     return 1;
 }
 
-/* 80C04308-80C0433C 0044E8 0034+00 1/0 0/0 0/0 .text            base021__11daObj_GrA_cFi */
 int daObj_GrA_c::base021(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(16, field_0xa94);
@@ -1935,7 +1853,6 @@ int daObj_GrA_c::base021(int param_1) {
     return 1;
 }
 
-/* 80C0433C-80C04370 00451C 0034+00 1/0 0/0 0/0 .text            base022__11daObj_GrA_cFi */
 int daObj_GrA_c::base022(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(17, field_0xa94);
@@ -1944,7 +1861,6 @@ int daObj_GrA_c::base022(int param_1) {
     return 1;
 }
 
-/* 80C04370-80C043A4 004550 0034+00 1/0 0/0 0/0 .text            base023__11daObj_GrA_cFi */
 int daObj_GrA_c::base023(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(18, field_0xa94);
@@ -1953,7 +1869,6 @@ int daObj_GrA_c::base023(int param_1) {
     return 1;
 }
 
-/* 80C043A4-80C043D8 004584 0034+00 1/0 0/0 0/0 .text            base024__11daObj_GrA_cFi */
 int daObj_GrA_c::base024(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(19, field_0xa94);
@@ -1962,7 +1877,6 @@ int daObj_GrA_c::base024(int param_1) {
     return 1;
 }
 
-/* 80C043D8-80C0440C 0045B8 0034+00 1/0 0/0 0/0 .text            base025__11daObj_GrA_cFi */
 int daObj_GrA_c::base025(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(20, field_0xa94);
@@ -1971,7 +1885,6 @@ int daObj_GrA_c::base025(int param_1) {
     return 1;
 }
 
-/* 80C0440C-80C04440 0045EC 0034+00 1/0 0/0 0/0 .text            base026__11daObj_GrA_cFi */
 int daObj_GrA_c::base026(int param_1) {
     if (param_1 != 0) {
         setBaseAnm(21, field_0xa94);
@@ -1980,7 +1893,6 @@ int daObj_GrA_c::base026(int param_1) {
     return 1;
 }
 
-/* 80C04440-80C04478 004620 0038+00 1/0 0/0 0/0 .text            face000__11daObj_GrA_cFi */
 int daObj_GrA_c::face000(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(22, true, field_0xa98);
@@ -1989,7 +1901,6 @@ int daObj_GrA_c::face000(int param_1) {
     return 1;
 }
 
-/* 80C04478-80C04518 004658 00A0+00 1/0 0/0 0/0 .text            face003__11daObj_GrA_cFi */
 int daObj_GrA_c::face003(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(27, true, field_0xa98);
@@ -2001,7 +1912,6 @@ int daObj_GrA_c::face003(int param_1) {
     return 1;
 }
 
-/* 80C04518-80C045B8 0046F8 00A0+00 1/0 0/0 0/0 .text            face004__11daObj_GrA_cFi */
 int daObj_GrA_c::face004(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(28, true, field_0xa98);
@@ -2013,7 +1923,6 @@ int daObj_GrA_c::face004(int param_1) {
     return 1;
 }
 
-/* 80C045B8-80C045F0 004798 0038+00 1/0 0/0 0/0 .text            face005__11daObj_GrA_cFi */
 int daObj_GrA_c::face005(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(31, true, field_0xa98);
@@ -2022,7 +1931,6 @@ int daObj_GrA_c::face005(int param_1) {
     return 1;
 }
 
-/* 80C045F0-80C04628 0047D0 0038+00 1/0 0/0 0/0 .text            face006__11daObj_GrA_cFi */
 int daObj_GrA_c::face006(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(24, true, field_0xa98);
@@ -2031,7 +1939,6 @@ int daObj_GrA_c::face006(int param_1) {
     return 1;
 }
 
-/* 80C04628-80C04660 004808 0038+00 1/0 0/0 0/0 .text            face007__11daObj_GrA_cFi */
 int daObj_GrA_c::face007(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(25, true, field_0xa98);
@@ -2040,7 +1947,6 @@ int daObj_GrA_c::face007(int param_1) {
     return 1;
 }
 
-/* 80C04660-80C04700 004840 00A0+00 1/0 0/0 0/0 .text            face008__11daObj_GrA_cFi */
 int daObj_GrA_c::face008(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(29, true, field_0xa98);
@@ -2052,7 +1958,6 @@ int daObj_GrA_c::face008(int param_1) {
     return 1;
 }
 
-/* 80C04700-80C047A0 0048E0 00A0+00 1/0 0/0 0/0 .text            face009__11daObj_GrA_cFi */
 int daObj_GrA_c::face009(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(30, true, field_0xa98);
@@ -2064,7 +1969,6 @@ int daObj_GrA_c::face009(int param_1) {
     return 1;
 }
 
-/* 80C047A0-80C047D8 004980 0038+00 1/0 0/0 0/0 .text            face010__11daObj_GrA_cFi */
 int daObj_GrA_c::face010(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(23, true, field_0xa98);
@@ -2073,7 +1977,6 @@ int daObj_GrA_c::face010(int param_1) {
     return 1;
 }
 
-/* 80C047D8-80C04810 0049B8 0038+00 1/0 0/0 0/0 .text            face011__11daObj_GrA_cFi */
 int daObj_GrA_c::face011(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(26, true, field_0xa98);
@@ -2082,7 +1985,6 @@ int daObj_GrA_c::face011(int param_1) {
     return 1;
 }
 
-/* 80C04810-80C04848 0049F0 0038+00 1/0 0/0 0/0 .text            face012__11daObj_GrA_cFi */
 int daObj_GrA_c::face012(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(32, true, field_0xa98);
@@ -2091,7 +1993,6 @@ int daObj_GrA_c::face012(int param_1) {
     return 1;
 }
 
-/* 80C04848-80C04880 004A28 0038+00 1/0 0/0 0/0 .text            face016__11daObj_GrA_cFi */
 int daObj_GrA_c::face016(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(33, true, field_0xa98);
@@ -2100,7 +2001,6 @@ int daObj_GrA_c::face016(int param_1) {
     return 1;
 }
 
-/* 80C04880-80C048B8 004A60 0038+00 1/0 0/0 0/0 .text            face017__11daObj_GrA_cFi */
 int daObj_GrA_c::face017(int param_1) {
     if (param_1 != 0) {
         setFaceAnm(34, true, field_0xa98);
@@ -2109,7 +2009,6 @@ int daObj_GrA_c::face017(int param_1) {
     return 1;
 }
 
-/* 80C048B8-80C048F8 004A98 0040+00 1/0 0/0 0/0 .text            face999__11daObj_GrA_cFi */
 int daObj_GrA_c::face999(int param_1) {
     if (param_1 != 0) {
         int reg_r30 = 0x22;
@@ -2120,7 +2019,6 @@ int daObj_GrA_c::face999(int param_1) {
     return 1;
 }
 
-/* 80C048F8-80C04A0C 004AD8 0114+00 2/2 0/0 0/0 .text            evtcutTalk__11daObj_GrA_cFii */
 int daObj_GrA_c::evtcutTalk(int param_1, int param_2) {
     s32 sVar1 = field_0x848;
     if (param_2 != 0) {
@@ -2151,7 +2049,6 @@ int daObj_GrA_c::evtcutTalk(int param_1, int param_2) {
     return 0;
 }
 
-/* 80C04A0C-80C04A88 004BEC 007C+00 2/2 0/0 0/0 .text            setFaceTalkAfter__11daObj_GrA_cFv */
 void daObj_GrA_c::setFaceTalkAfter() {
     switch (field_0xa92) {
         case 6:
@@ -2167,34 +2064,28 @@ void daObj_GrA_c::setFaceTalkAfter() {
     }
 }
 
-/* 80C04A88-80C04AA8 004C68 0020+00 1/0 0/0 0/0 .text            daObj_GrA_Create__FPv */
 static int daObj_GrA_Create(void* i_this) {
     return ((daObj_GrA_c*)i_this)->create();
 }
 
-/* 80C04AA8-80C04AC8 004C88 0020+00 1/0 0/0 0/0 .text            daObj_GrA_Delete__FPv */
 static int daObj_GrA_Delete(void* i_this) {
     return ((daObj_GrA_c*)i_this)->MoveBGDelete();
 }
 
-/* 80C04AC8-80C04AE8 004CA8 0020+00 1/0 0/0 0/0 .text            daObj_GrA_Execute__FPv */
 static int daObj_GrA_Execute(void* i_this) {
     return ((daObj_GrA_c*)i_this)->MoveBGExecute();
 }
 
-/* 80C04AE8-80C04B14 004CC8 002C+00 1/0 0/0 0/0 .text            daObj_GrA_Draw__FPv */
 static int daObj_GrA_Draw(void* i_this) {
     return ((daObj_GrA_c*)i_this)->MoveBGDraw();
 }
 
-/* 80C04B14-80C04B1C 004CF4 0008+00 1/0 0/0 0/0 .text            daObj_GrA_IsDelete__FPv */
 static int daObj_GrA_IsDelete(void* i_this) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80C104DC-80C105E4 000674 0108+00 1/2 0/0 0/0 .data            mBaseMotionList__11daObj_GrA_c */
 daObj_GrA_c::MotionFunc daObj_GrA_c::mBaseMotionList[22] = {
     &daObj_GrA_c::base000,
     &daObj_GrA_c::base001,
@@ -2220,7 +2111,6 @@ daObj_GrA_c::MotionFunc daObj_GrA_c::mBaseMotionList[22] = {
     &daObj_GrA_c::base026,
 };
 
-/* 80C1068C-80C10734 000824 00A8+00 1/2 0/0 0/0 .data            mFaceMotionList__11daObj_GrA_c */
 daObj_GrA_c::MotionFunc daObj_GrA_c::mFaceMotionList[14] = {
     &daObj_GrA_c::face000,
     &daObj_GrA_c::face003,
@@ -2238,7 +2128,6 @@ daObj_GrA_c::MotionFunc daObj_GrA_c::mFaceMotionList[14] = {
     &daObj_GrA_c::face999,
 };
 
-/* 80C10734-80C10754 -00001 0020+00 1/0 0/0 0/0 .data            daObj_GrA_MethodTable */
 static actor_method_class daObj_GrA_MethodTable = {
     (process_method_func)daObj_GrA_Create,
     (process_method_func)daObj_GrA_Delete,
@@ -2247,7 +2136,6 @@ static actor_method_class daObj_GrA_MethodTable = {
     (process_method_func)daObj_GrA_Draw,
 };
 
-/* 80C10754-80C10784 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_GRA */
 extern actor_process_profile_definition g_profile_OBJ_GRA = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc
index ca0bf5430a..74dc70b364 100644
--- a/src/d/actor/d_a_obj_gra2_base.inc
+++ b/src/d/actor/d_a_obj_gra2_base.inc
@@ -2,7 +2,6 @@
 
 #include "d/actor/d_a_obj_gra2.h"
 
-/* 80C0CF2C-80C0CF98 00D10C 006C+00 1/1 0/0 0/0 .text            s_sub2__FPvPv */
 static void* s_sub2(void* i_actor, void* i_data) {
     daObj_GrA_c* i_this = (daObj_GrA_c*)i_data;
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_GRA && (u8)i_this->checkGraSub((fopAc_ac_c*)i_actor)) {
@@ -11,7 +10,6 @@ static void* s_sub2(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C0CF98-80C0D000 00D178 0068+00 1/1 0/0 0/0 .text checkGraSub__11daObj_GrA_cFP10fopAc_ac_c */
 BOOL daObj_GrA_c::checkGraSub(fopAc_ac_c* a_this) {
     daObj_GrA_c* i_this = (daObj_GrA_c*)a_this;
 
@@ -26,7 +24,6 @@ BOOL daObj_GrA_c::checkGraSub(fopAc_ac_c* a_this) {
     return FALSE;
 }
 
-/* 80C0D000-80C0D2FC 00D1E0 02FC+00 1/0 0/0 0/0 .text            waitDemo__11daObj_GrA_cFPv */
 int daObj_GrA_c::waitDemo(void* param_1) {
     cXyz sp34;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -91,7 +88,6 @@ int daObj_GrA_c::waitDemo(void* param_1) {
     return 1;
 }
 
-/* 80C0D2FC-80C0D3A8 00D4DC 00AC+00 1/1 0/0 0/0 .text            skipDemoGra__11daObj_GrA_cFv */
 int daObj_GrA_c::skipDemoGra() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     daObj_GrA_c* gra_p = (daObj_GrA_c*)field_0x204c.getActor();
@@ -104,7 +100,6 @@ int daObj_GrA_c::skipDemoGra() {
     return 1;
 }
 
-/* 80C0D3A8-80C0D3E0 00D588 0038+00 1/1 0/0 0/0 .text            skipCallBack__FPvi */
 static int skipCallBack(void* param_1, int param_2) {
     daObj_GrA_c* i_this = (daObj_GrA_c*)param_1;
     i_this->skipDemoGra();
@@ -112,7 +107,6 @@ static int skipCallBack(void* param_1, int param_2) {
     return 1;
 }
 
-/* 80C0D3E0-80C0EFC4 00D5C0 1BE4+00 2/0 0/0 0/0 .text            startDemo__11daObj_GrA_cFPv */
 int daObj_GrA_c::startDemo(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     daObj_GrA_c* gra_p = (daObj_GrA_c *)field_0x204c.getActor();
@@ -453,7 +447,6 @@ int daObj_GrA_c::startDemo(void* param_1) {
     return 1;
 }
 
-/* 80C0EFC4-80C0F17C 00F1A4 01B8+00 1/1 0/0 0/0 .text            turn__11daObj_GrA_cFsfi */
 BOOL daObj_GrA_c::turn(s16 param_1, f32 param_2, int param_3) {
     int o_prm_1 = param_1;
     if (field_0x1fc8 == 0) {
@@ -490,7 +483,6 @@ BOOL daObj_GrA_c::turn(s16 param_1, f32 param_2, int param_3) {
     return param_1 == current.angle.y;
 }
 
-/* 80C0F17C-80C0F330 00F35C 01B4+00 2/2 0/0 0/0 .text            turn_step__11daObj_GrA_cFsiii */
 BOOL daObj_GrA_c::turn_step(s16 param_1, int param_2, int param_3, int param_4) {
     if (field_0x1fcc == 0) {
         if ((int)fabsf(cM_sht2d((s16)(param_1 - field_0x91a.y))) > 20) {
@@ -527,7 +519,6 @@ BOOL daObj_GrA_c::turn_step(s16 param_1, int param_2, int param_3, int param_4)
     return (field_0x1fcc > 1) ? 1 : 0;
 }
 
-/* 80C0F330-80C0F590 00F510 0260+00 1/1 0/0 0/0 .text            chkFindPlayer2__11daObj_GrA_cFis */
 BOOL daObj_GrA_c::chkFindPlayer2(int param_1, s16 param_2) {
     cXyz sp80 = getAttentionPos(daPy_getPlayerActorClass());
     s16 angle_diff = fopAcM_searchPlayerAngleY(this) - current.angle.y;
@@ -569,7 +560,6 @@ BOOL daObj_GrA_c::chkFindPlayer2(int param_1, s16 param_2) {
     return FALSE;
 }
 
-/* 80C0F5A4-80C0F668 00F784 00C4+00 1/1 0/0 0/0 .text            chkPointInArea__11daObj_GrA_cF4cXyz4cXyzfffs */
 BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, f32 param_3, f32 param_4, f32 param_5, s16 param_6) {
     cXyz sp68, sp74;
     f32 var_f30 = param_4;
@@ -588,12 +578,10 @@ BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, f32 param_3, f32 pa
     return chkPointInArea(param_1, sp74, sp68, param_6); 
 }
 
-/* 80C0F668-80C0F6E0 00F848 0078+00 1/1 0/0 0/0 .text            chkPointInArea__11daObj_GrA_cF4cXyz4cXyz4cXyzs */
 BOOL daObj_GrA_c::chkPointInArea(cXyz param_1, cXyz param_2, cXyz param_3, s16 param_4) {
     return daNpcF_chkPointInArea(param_1, param_2, param_3, param_4);
 }
 
-/* 80C0F6E0-80C0F7EC 00F8C0 010C+00 1/1 0/0 0/0 .text            chkActorInSight2__11daObj_GrA_cFP10fopAc_ac_cfs */
 BOOL daObj_GrA_c::chkActorInSight2(fopAc_ac_c* actor, f32 param_2, s16 param_3) {
     if (param_2 < 180.0f) {
         s16 sVar1 = cM_deg2s(param_2);
@@ -611,7 +599,6 @@ BOOL daObj_GrA_c::chkActorInSight2(fopAc_ac_c* actor, f32 param_2, s16 param_3)
     return 1;
 }
 
-/* 80C0F7EC-80C0F860 00F9CC 0074+00 2/2 0/0 0/0 .text getAttentionPos__11daObj_GrA_cFP10fopAc_ac_c */
 cXyz daObj_GrA_c::getAttentionPos(fopAc_ac_c* i_actor_p) {
     cXyz pos = i_actor_p->attention_info.position;
 
@@ -622,7 +609,6 @@ cXyz daObj_GrA_c::getAttentionPos(fopAc_ac_c* i_actor_p) {
     return pos;
 }
 
-/* 80C0F860-80C0FA68 00FA40 0208+00 2/0 0/0 0/0 .text            standWaitJump__11daObj_GrA_cFPv */
 int daObj_GrA_c::standWaitJump(void* param_1) {
     switch (field_0xa7c) {
         case 0:
diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc
index 927dccb190..815ff867be 100644
--- a/src/d/actor/d_a_obj_gra2_soldier.inc
+++ b/src/d/actor/d_a_obj_gra2_soldier.inc
@@ -3,7 +3,6 @@
 #include "d/actor/d_a_tag_gra.h"
 #include <cmath.h>
 
-/* 80C0536C-80C053C4 00554C 0058+00 4/4 0/0 0/0 .text            getSrchCircleR__11daObj_GrA_cFv */
 f32 daObj_GrA_c::getSrchCircleR() {
     f32 srchCircleR;
     u8 uVar1 = fopAcM_GetParam(this) & 0x7F;
@@ -16,7 +15,6 @@ f32 daObj_GrA_c::getSrchCircleR() {
     return srchCircleR;
 }
 
-/* 80C053C4-80C05920 0055A4 055C+00 2/0 0/0 0/0 .text            standWait__11daObj_GrA_cFPv */
 int daObj_GrA_c::standWait(void* param_1) {
     cXyz sp5c;
 
@@ -94,7 +92,6 @@ int daObj_GrA_c::standWait(void* param_1) {
     return 1;
 }
 
-/* 80C05920-80C05F64 005B00 0644+00 3/0 0/0 0/0 .text            walk__11daObj_GrA_cFPv */
 int daObj_GrA_c::walk(void* param_1) {
     cXyz player_pos;
 
@@ -160,7 +157,6 @@ int daObj_GrA_c::walk(void* param_1) {
     return 1;
 }
 
-/* 80C05F64-80C061F4 006144 0290+00 1/0 0/0 0/0 .text            defence__11daObj_GrA_cFPv */
 int daObj_GrA_c::defence(void* param_1) {
     fopAc_ac_c* aTgHitActor_p;
     s16 sVar1;
@@ -216,7 +212,6 @@ int daObj_GrA_c::defence(void* param_1) {
     return 1;
 }
 
-/* 80C061F4-80C067D8 0063D4 05E4+00 5/0 0/0 0/0 .text            toStone__11daObj_GrA_cFPv */
 int daObj_GrA_c::toStone(void* param_1) {
     s16 sVar1;
     f32 var_f31;
@@ -327,7 +322,6 @@ int daObj_GrA_c::toStone(void* param_1) {
     return 1;
 }
 
-/* 80C067D8-80C06CDC 0069B8 0504+00 2/0 0/0 0/0 .text            step__11daObj_GrA_cFPv */
 int daObj_GrA_c::step(void* param_1) {
     switch (field_0xa7c) {
         case 0:
@@ -432,7 +426,6 @@ int daObj_GrA_c::step(void* param_1) {
     return 1;
 }
 
-/* 80C06CDC-80C0780C 006EBC 0B30+00 3/0 0/0 0/0 .text            rollReturn__11daObj_GrA_cFPv */
 int daObj_GrA_c::rollReturn(void* param_1) {
     cXyz sp48;
     f32 fVar1;
@@ -572,7 +565,6 @@ int daObj_GrA_c::rollReturn(void* param_1) {
     return 1;
 }
 
-/* 80C0780C-80C078A8 0079EC 009C+00 1/1 0/0 0/0 .text            soldierDemoSkip__11daObj_GrA_cFv */
 int daObj_GrA_c::soldierDemoSkip() {
     setLookMode(1);
     setBaseMotion(0, 0.0f);
@@ -584,7 +576,6 @@ int daObj_GrA_c::soldierDemoSkip() {
     return 1;
 }
 
-/* 80C078A8-80C07C40 007A88 0398+00 1/0 0/0 0/0 .text            soldierDemo__11daObj_GrA_cFPv */
 int daObj_GrA_c::soldierDemo(void* param_1) {
     cXyz sp1c;
 
@@ -662,7 +653,6 @@ int daObj_GrA_c::soldierDemo(void* param_1) {
     return 1;
 }
 
-/* 80C07C40-80C07C98 007E20 0058+00 1/1 0/0 0/0 .text            getSrchLinkR__11daObj_GrA_cFv */
 f32 daObj_GrA_c::getSrchLinkR() {
     int iVar1 = fopAcM_GetParam(this) & 0x7F;
     if (iVar1 == 0) {
@@ -672,7 +662,6 @@ f32 daObj_GrA_c::getSrchLinkR() {
     return iVar1 * 100;
 }
 
-/* 80C07C98-80C07CF0 007E78 0058+00 1/1 0/0 0/0 .text            getSrchGraR__11daObj_GrA_cFv */
 f32 daObj_GrA_c::getSrchGraR() {
     if (field_0x200c == 0) {
         return mpHIO->m.field_0x74 * 100.0f;
@@ -681,7 +670,6 @@ f32 daObj_GrA_c::getSrchGraR() {
     return field_0x200c * 100;
 }
 
-/* 80C07CF0-80C07D38 007ED0 0048+00 3/3 0/0 0/0 .text            getSpeed__11daObj_GrA_cFv */
 f32 daObj_GrA_c::getSpeed() {
     u32 uVar1 = fopAcM_GetParam(this) >> 14 & 63;
     if (uVar1 == 63) {
@@ -691,7 +679,6 @@ f32 daObj_GrA_c::getSpeed() {
     return uVar1;
 }
 
-/* 80C07D38-80C083F0 007F18 06B8+00 1/0 0/0 0/0 .text            standRoll__11daObj_GrA_cFPv */
 int daObj_GrA_c::standRoll(void* param_1) {
     cXyz sp38;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -759,7 +746,6 @@ int daObj_GrA_c::standRoll(void* param_1) {
     return 1;
 }
 
-/* 80C083F0-80C08804 0085D0 0414+00 3/0 0/0 0/0 .text            rollDemo__11daObj_GrA_cFPv */
 int daObj_GrA_c::rollDemo(void* param_1) {
     switch (field_0xa7c) {
         case 0:
@@ -865,7 +851,6 @@ int daObj_GrA_c::rollDemo(void* param_1) {
     return 1;
 }
 
-/* 80C08804-80C09298 0089E4 0A94+00 4/0 0/0 0/0 .text            rollAttack__11daObj_GrA_cFPv */
 int daObj_GrA_c::rollAttack(void* param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz sp3c;
@@ -1109,7 +1094,6 @@ int daObj_GrA_c::rollAttack(void* param_1) {
     return 1;
 }
 
-/* 80C09298-80C09918 009478 0680+00 4/0 0/0 0/0 .text            rollAttacked__11daObj_GrA_cFPv */
 int daObj_GrA_c::rollAttacked(void* param_1) {
     BOOL bVar1;
     s16 sVar1;
@@ -1271,7 +1255,6 @@ int daObj_GrA_c::rollAttacked(void* param_1) {
     return 1;
 }
 
-/* 80C09918-80C09F08 009AF8 05F0+00 2/0 0/0 0/0 .text            rollEscape__11daObj_GrA_cFPv */
 int daObj_GrA_c::rollEscape(void* param_1) {
     BOOL bVar1;
     cXyz sp68;
@@ -1394,7 +1377,6 @@ int daObj_GrA_c::rollEscape(void* param_1) {
     return 1;
 }
 
-/* 80C09F08-80C0A018 00A0E8 0110+00 2/2 0/0 0/0 .text            rollLanding__11daObj_GrA_cFv */
 void daObj_GrA_c::rollLanding() {
     if (mAcch.ChkGroundLanding() && field_0x201c >= 10) {
         cXyz sp28(0.0f, 0.0f, 20.0f);
@@ -1409,7 +1391,6 @@ void daObj_GrA_c::rollLanding() {
     }
 }
 
-/* 80C0A018-80C0A120 00A1F8 0108+00 3/0 0/0 0/0 .text            thrown__11daObj_GrA_cFPv */
 int daObj_GrA_c::thrown(void* param_1) {
     int rv = 0;
 
@@ -1454,7 +1435,6 @@ int daObj_GrA_c::thrown(void* param_1) {
     return rv;
 }
 
-/* 80C0A120-80C0AF94 00A300 0E74+00 2/1 0/0 0/0 .text            demo_camera__11daObj_GrA_cFv */
 void daObj_GrA_c::demo_camera() {
     f32 fVar1;
     int prm_short;
@@ -1595,7 +1575,6 @@ void daObj_GrA_c::demo_camera() {
     field_0x2056++;
 }
 
-/* 80C0AF94-80C0B9AC 00B174 0A18+00 2/1 0/0 0/0 .text            rollAttackedDemo__11daObj_GrA_cFv */
 void daObj_GrA_c::rollAttackedDemo() {
     f32 fVar1;
 
@@ -1718,7 +1697,6 @@ void daObj_GrA_c::rollAttackedDemo() {
     return;
 }
 
-/* 80C0B9AC-80C0BD90 00BB8C 03E4+00 2/2 0/0 0/0 .text            graThrowDemo__11daObj_GrA_cFv */
 void daObj_GrA_c::graThrowDemo() {
     cXyz sp2c;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1813,7 +1791,6 @@ void daObj_GrA_c::graThrowDemo() {
     }
 }
 
-/* 80C0BD90-80C0BE5C 00BF70 00CC+00 1/1 0/0 0/0 .text            setCarryStatus__11daObj_GrA_cFv */
 void daObj_GrA_c::setCarryStatus() {
     cXyz sp38;
     mDoMtx_stack_c::YrotS(-shape_angle.y);
@@ -1824,7 +1801,6 @@ void daObj_GrA_c::setCarryStatus() {
     }
 }
 
-/* 80C0BE5C-80C0BF34 00C03C 00D8+00 1/1 0/0 0/0 .text            checkThrow__11daObj_GrA_cFv */
 bool daObj_GrA_c::checkThrow() {
     if (field_0xa48 != 0) {
         if ((field_0xa48 & 1) != 0) {
@@ -1845,7 +1821,6 @@ bool daObj_GrA_c::checkThrow() {
     return false;
 }
 
-/* 80C0BF34-80C0C348 00C114 0414+00 5/5 0/0 0/0 .text            calcCatchPos__11daObj_GrA_cFfi */
 void daObj_GrA_c::calcCatchPos(f32 param_1, int param_2) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 opp_shape_angle = player->shape_angle.y + 0x8000;
@@ -1907,14 +1882,12 @@ void daObj_GrA_c::calcCatchPos(f32 param_1, int param_2) {
     }
 }
 
-/* 80C0C348-80C0C364 00C528 001C+00 1/1 0/0 0/0 .text initCrazyBeforeCatch__11daObj_GrA_cFi */
 void daObj_GrA_c::initCrazyBeforeCatch(int param_1) {
     field_0x1ff0 = 1;
     speedF = 0.0f;
     gravity = 0.0f;
 }
 
-/* 80C0C364-80C0C3E0 00C544 007C+00 1/1 0/0 0/0 .text executeCrazyBeforeCatch__11daObj_GrA_cFv */
 void daObj_GrA_c::executeCrazyBeforeCatch() {
     calcCatchPos(-120.0f, 1);
     if ((field_0xa48 & 2) != 0) {
@@ -1926,7 +1899,6 @@ void daObj_GrA_c::executeCrazyBeforeCatch() {
     }
 }
 
-/* 80C0C3E0-80C0C478 00C5C0 0098+00 2/2 0/0 0/0 .text            initCrazyCatch__11daObj_GrA_cFi */
 void daObj_GrA_c::initCrazyCatch(int param_1) {
     dComIfGp_getVibration().StartQuake(8, 15, cXyz(0.0f, 1.0f, 0.0f));
     field_0x1ff0 = 2;
@@ -1936,7 +1908,6 @@ void daObj_GrA_c::initCrazyCatch(int param_1) {
     gravity = 0.0f;
 }
 
-/* 80C0C478-80C0C5F0 00C658 0178+00 1/1 0/0 0/0 .text            executeCrazyCatch__11daObj_GrA_cFv */
 void daObj_GrA_c::executeCrazyCatch() {
     switch (field_0x1ff4) {
         case 0:
@@ -1978,7 +1949,6 @@ void daObj_GrA_c::executeCrazyCatch() {
     }
 }
 
-/* 80C0C5F0-80C0C690 00C7D0 00A0+00 1/1 0/0 0/0 .text            initCrazyThrow__11daObj_GrA_cFi */
 void daObj_GrA_c::initCrazyThrow(int param_1) {
     field_0x1ffc = param_1 & 0xFF;
     field_0x1ff4 = 0;
@@ -1997,7 +1967,6 @@ void daObj_GrA_c::initCrazyThrow(int param_1) {
     gravity = 0.0f;
 }
 
-/* 80C0C690-80C0C84C 00C870 01BC+00 1/1 0/0 0/0 .text            executeCrazyThrow__11daObj_GrA_cFv */
 void daObj_GrA_c::executeCrazyThrow() {
     f32 fVar1;
     cXyz spa0;
@@ -2050,7 +2019,6 @@ void daObj_GrA_c::executeCrazyThrow() {
     }
 }
 
-/* 80C0C84C-80C0CA64 00CA2C 0218+00 3/3 0/0 0/0 .text            initCrazyAttack__11daObj_GrA_cFv */
 void daObj_GrA_c::initCrazyAttack() {
     camera_class* camera;
 
@@ -2096,7 +2064,6 @@ void daObj_GrA_c::initCrazyAttack() {
     }
 }
 
-/* 80C0CA64-80C0CDBC 00CC44 0358+00 2/2 0/0 0/0 .text executeCrazyJumping__11daObj_GrA_cFv */
 void daObj_GrA_c::executeCrazyJumping() {
     cLib_addCalcAngleS2(&shape_angle.y, current.angle.y + 0x8000, 4, 0x1000);
     field_0x91a.y = shape_angle.y;
@@ -2146,7 +2113,6 @@ void daObj_GrA_c::executeCrazyJumping() {
     }
 }
 
-/* 80C0CDBC-80C0CF10 00CF9C 0154+00 2/2 0/0 0/0 .text            modeChangeCheck__11daObj_GrA_cFv */
 BOOL daObj_GrA_c::modeChangeCheck() {
     BOOL rv = (field_0x2030 == 0);
 
diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp
index 1370a9b268..c82892ef52 100644
--- a/src/d/actor/d_a_obj_graWall.cpp
+++ b/src/d/actor/d_a_obj_graWall.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_graWall.h"
 #include "d/d_procname.h"
 
-/* 80C10BF8-80C10D48 000078 0150+00 1/1 0/0 0/0 .text            Create__14daObjGraWall_cFv */
 int daObjGraWall_c::Create() {
     fopAcM_ct(this, daObjGraWall_c);
     field_0x6e0 = fopAcM_GetParam(this);
@@ -28,7 +27,6 @@ int daObjGraWall_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C10DD8-80C10E78 000258 00A0+00 1/1 0/0 0/0 .text            Execute__14daObjGraWall_cFv */
 int daObjGraWall_c::Execute() {
     if (field_0x6e0 != 0xff) {
         if (dComIfGs_isSwitch(field_0x6e0, fopAcM_GetRoomNo(this)) != 0) {
@@ -46,16 +44,12 @@ int daObjGraWall_c::Execute() {
     return 1;
 }
 
-/* 80C10E78-80C10E80 0002F8 0008+00 1/1 0/0 0/0 .text            Delete__14daObjGraWall_cFv */
 int daObjGraWall_c::Delete() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C10FB0-80C10FB8 000000 0008+00 1/1 0/0 0/0 .rodata          l_DATA */
 static const f32 l_DATA[2] = {180.0f, 280.0f};
 
-/* 80C10FB8-80C10FFC 000008 0044+00 1/1 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x19}},  // mObj
@@ -70,14 +64,12 @@ const static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80C10E80-80C10ED4 000300 0054+00 1/1 0/0 0/0 .text            col_init__14daObjGraWall_cFv */
 void daObjGraWall_c::col_init() {
     mStts.Init(0xff, 0xff, this);
     mCyl.Set(l_cyl_src);
     mCyl.SetStts(&mStts);
 }
 
-/* 80C10ED4-80C10F40 000354 006C+00 1/1 0/0 0/0 .text            col_set__14daObjGraWall_cFv */
 void daObjGraWall_c::col_set() {
     mCyl.SetC(current.pos);
     mCyl.SetH(l_DATA[1]);
@@ -85,29 +77,22 @@ void daObjGraWall_c::col_set() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80C10F40-80C10F60 0003C0 0020+00 1/0 0/0 0/0 .text daObjGraWall_Execute__FP14daObjGraWall_c */
 static int daObjGraWall_Execute(daObjGraWall_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C10F60-80C10F68 0003E0 0008+00 1/0 0/0 0/0 .text daObjGraWall_IsDelete__FP14daObjGraWall_c */
 static int daObjGraWall_IsDelete(daObjGraWall_c* i_this) {
     return 1;
 }
 
-/* 80C10F68-80C10F88 0003E8 0020+00 1/0 0/0 0/0 .text daObjGraWall_Delete__FP14daObjGraWall_c */
 static int daObjGraWall_Delete(daObjGraWall_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C10F88-80C10FA8 000408 0020+00 1/0 0/0 0/0 .text            daObjGraWall_create__FP10fopAc_ac_c
- */
 static int daObjGraWall_create(fopAc_ac_c* i_this) {
     return static_cast<daObjGraWall_c*>(i_this)->Create();
 }
 
-/* ############################################################################################## */
-/* 80C10FFC-80C1101C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGraWall_Method */
 static actor_method_class l_daObjGraWall_Method = {
     (process_method_func)daObjGraWall_create,
     (process_method_func)daObjGraWall_Delete,
@@ -116,7 +101,6 @@ static actor_method_class l_daObjGraWall_Method = {
     (process_method_func)NULL,
 };
 
-/* 80C1101C-80C1104C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_GRA_WALL */
 extern actor_process_profile_definition g_profile_GRA_WALL = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp
index 6c39a914b9..b27c929840 100644
--- a/src/d/actor/d_a_obj_gra_rock.cpp
+++ b/src/d/actor/d_a_obj_gra_rock.cpp
@@ -16,7 +16,6 @@ static void dummy() {
     cLib_calcTimer<s16>(0);
 }
 
-/* 80C123BC-80C12400 000000 0044+00 3/3 0/0 0/0 .rodata          mCcDCyl__14daObjGraRock_c */
 dCcD_SrcCyl const daObjGraRock_c::mCcDCyl = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x2020, 0x11}, 0x0}}, // mObj
@@ -31,7 +30,6 @@ dCcD_SrcCyl const daObjGraRock_c::mCcDCyl = {
     } // mCyl
 };
 
-/* 80C110F8-80C11444 000078 034C+00 1/1 0/0 0/0 .text            setAttnPos__14daObjGraRock_cFv */
 void daObjGraRock_c::setAttnPos() {
     cXyz cStack_50(0.0f, 680.0f, 145.0f);
     mDoMtx_stack_c::ZXYrotS(current.angle.x, current.angle.y, current.angle.z);
@@ -67,7 +65,6 @@ void daObjGraRock_c::setAttnPos() {
     shape_angle = current.angle;
 }
 
-/* 80C11444-80C114C0 0003C4 007C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjGraRock_cFv */
 void daObjGraRock_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -75,13 +72,11 @@ void daObjGraRock_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C12424-80C12428 000068 0004+00 1/1 0/0 0/0 .rodata          l_prticles_id$3890 */
 static u16 const l_prticles_id[2] = {
     0x875F,
     0x8760,
 };
 
-/* 80C114C0-80C1157C 000440 00BC+00 1/1 0/0 0/0 .text            setPrtcl__14daObjGraRock_cFv */
 void daObjGraRock_c::setPrtcl() {
     for (int i = 0; i < 2; i++) {
         mParticleIds[i] = dComIfGp_particle_set(mParticleIds[i], l_prticles_id[i], &current.pos,
@@ -89,8 +84,6 @@ void daObjGraRock_c::setPrtcl() {
     }
 }
 
-/* 80C1157C-80C11730 0004FC 01B4+00 1/1 0/0 0/0 .text            bombParticleSet__14daObjGraRock_cFv
- */
 void daObjGraRock_c::bombParticleSet() {
     dComIfGp_particle_set(0x875b, &current.pos, &tevStr, &current.angle, 0);
     dComIfGp_particle_set(0x8767, &current.pos, &tevStr, &current.angle, 0);
@@ -99,21 +92,17 @@ void daObjGraRock_c::bombParticleSet() {
     dComIfGp_particle_set(0x875e, &current.pos, &tevStr, &current.angle, 0);
 }
 
-/* 80C11730-80C1178C 0006B0 005C+00 1/1 0/0 0/0 .text            setEnvTevColor__14daObjGraRock_cFv
- */
 void daObjGraRock_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80C1178C-80C117D0 00070C 0044+00 1/1 0/0 0/0 .text            setRoomNo__14daObjGraRock_cFv */
 void daObjGraRock_c::setRoomNo() {
     s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStts.SetRoomId(roomId);
 }
 
-/* 80C117D0-80C11964 000750 0194+00 1/1 0/0 0/0 .text            col_set__14daObjGraRock_cFv */
 void daObjGraRock_c::col_set() {
     if (mCyl.ChkTgHit()) {
         if (checkHitAt(mCyl.GetTgHitObj())) {
@@ -138,12 +127,10 @@ void daObjGraRock_c::col_set() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80C11964-80C11970 0008E4 000C+00 1/1 0/0 0/0 .text checkHitAt__14daObjGraRock_cFP8cCcD_Obj */
 int daObjGraRock_c::checkHitAt(cCcD_Obj* hitObj) {
     return hitObj->ChkAtType(AT_TYPE_BOMB) ? 1 : 0;
 }
 
-/* 80C11970-80C11B68 0008F0 01F8+00 1/0 0/0 0/0 .text            Create__14daObjGraRock_cFv */
 int daObjGraRock_c::Create() {
     setBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
@@ -182,7 +169,6 @@ int daObjGraRock_c::Create() {
     return 1;
 }
 
-/* 80C1249C-80C124B0 -00001 0014+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[5] = {
     "M_VBom",
     "grA_base",
@@ -191,7 +177,6 @@ static char* l_arcName[5] = {
     "grA_RockD",
 };
 
-/* 80C11B68-80C11C64 000AE8 00FC+00 1/0 0/0 0/0 .text            CreateHeap__14daObjGraRock_cFv */
 int daObjGraRock_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], "M_VBom_Zora.bmd");
     JUT_ASSERT(488, modelData != NULL);
@@ -209,7 +194,6 @@ int daObjGraRock_c::CreateHeap() {
     return 1;
 }
 
-/* 80C11C64-80C11EA8 000BE4 0244+00 1/1 0/0 0/0 .text            create__14daObjGraRock_cFv */
 int daObjGraRock_c::create() {
     fopAcM_ct(this, daObjGraRock_c);
     field_0x9c8 = fopAcM_GetParam(this);
@@ -241,8 +225,6 @@ int daObjGraRock_c::create() {
     return rv;
 }
 
-/* 80C11FF0-80C120FC 000F70 010C+00 1/0 0/0 0/0 .text            Execute__14daObjGraRock_cFPPA3_A4_f
- */
 int daObjGraRock_c::Execute(Mtx** pMtx) {
     mBtp.play();
     if (field_0x9bd != 0) {
@@ -272,7 +254,6 @@ int daObjGraRock_c::Execute(Mtx** pMtx) {
     return 1;
 }
 
-/* 80C120FC-80C121C4 00107C 00C8+00 1/0 0/0 0/0 .text            Draw__14daObjGraRock_cFv */
 int daObjGraRock_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -283,7 +264,6 @@ int daObjGraRock_c::Draw() {
     return 1;
 }
 
-/* 80C121C4-80C1225C 001144 0098+00 1/0 0/0 0/0 .text            Delete__14daObjGraRock_cFv */
 int daObjGraRock_c::Delete() {
     for (int i = 0; i < 5; i = i + 1) {
         dComIfG_resDelete(&mPhases[i], l_arcName[i]);
@@ -296,33 +276,26 @@ int daObjGraRock_c::Delete() {
     return 1;
 }
 
-/* 80C1225C-80C12288 0011DC 002C+00 1/0 0/0 0/0 .text daObjGraRock_Draw__FP14daObjGraRock_c */
 static int daObjGraRock_Draw(daObjGraRock_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C12288-80C122A8 001208 0020+00 1/0 0/0 0/0 .text daObjGraRock_Execute__FP14daObjGraRock_c */
 static int daObjGraRock_Execute(daObjGraRock_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C122A8-80C122B0 001228 0008+00 1/0 0/0 0/0 .text daObjGraRock_IsDelete__FP14daObjGraRock_c */
 static int daObjGraRock_IsDelete(daObjGraRock_c* i_this) {
     return 1;
 }
 
-/* 80C122B0-80C122D0 001230 0020+00 1/0 0/0 0/0 .text daObjGraRock_Delete__FP14daObjGraRock_c */
 static int daObjGraRock_Delete(daObjGraRock_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C122D0-80C122F0 001250 0020+00 1/0 0/0 0/0 .text            daObjGraRock_create__FP10fopAc_ac_c
- */
 static int daObjGraRock_create(fopAc_ac_c* i_this) {
     return static_cast<daObjGraRock_c*>(i_this)->create();
 }
 
-/* 80C124B0-80C124D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGraRock_Method */
 static actor_method_class l_daObjGraRock_Method = {
     (process_method_func)daObjGraRock_create,
     (process_method_func)daObjGraRock_Delete,
@@ -331,7 +304,6 @@ static actor_method_class l_daObjGraRock_Method = {
     (process_method_func)daObjGraRock_Draw,
 };
 
-/* 80C124D0-80C12500 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GraRock */
 extern actor_process_profile_definition g_profile_Obj_GraRock = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp
index b0a18fae5c..078d1db4f0 100644
--- a/src/d/actor/d_a_obj_grave_stone.cpp
+++ b/src/d/actor/d_a_obj_grave_stone.cpp
@@ -10,10 +10,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80C13304-80C13308 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName = "H_Haka";
 
-/* 80C13250-80C13280 000000 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__14daGraveStone_c */
 dCcD_SrcGObjInf const daGraveStone_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0, 0}, {0x79}}},
     {0, 0, 0, 0, 0},
@@ -21,7 +19,6 @@ dCcD_SrcGObjInf const daGraveStone_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C13280-80C132C4 000030 0044+00 1/1 0/0 0/0 .rodata          mCcDCyl__14daGraveStone_c */
 dCcD_SrcCyl const daGraveStone_c::mCcDCyl = {
     {
         {0, {{0, 0, 0}, {0, 0}, {0x79}}},
@@ -32,7 +29,6 @@ dCcD_SrcCyl const daGraveStone_c::mCcDCyl = {
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f},
 };
 
-/* 80C125F8-80C1266C 000078 0074+00 2/2 0/0 0/0 .text            setBaseMtx__14daGraveStone_cFv */
 void daGraveStone_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -40,7 +36,6 @@ void daGraveStone_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C1266C-80C12918 0000EC 02AC+00 1/1 0/0 0/0 .text            moveCalc__14daGraveStone_cFv */
 void daGraveStone_c::moveCalc() {
     if (cLib_calcTimer(&mTimer) != 0) {
         fopAcM_posMoveF(this, mColStatus.GetCCMoveP());
@@ -93,7 +88,6 @@ void daGraveStone_c::moveCalc() {
     }
 }
 
-/* 80C12918-80C12A38 000398 0120+00 1/1 0/0 0/0 .text            setPrtcl__14daGraveStone_cFv */
 int daGraveStone_c::setPrtcl() {
     for (int i = 0; i < 4; i++) {
         mPrtclMngr[i].field_0x24.setEffectCenter(
@@ -117,21 +111,17 @@ int daGraveStone_c::setPrtcl() {
     return 1;
 }
 
-/* 80C12A38-80C12A94 0004B8 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__14daGraveStone_cFv
- */
 void daGraveStone_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80C12A94-80C12AD8 000514 0044+00 2/2 0/0 0/0 .text            setRoomNo__14daGraveStone_cFv */
 void daGraveStone_c::setRoomNo() {
     s8 room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_no);
     mColStatus.SetRoomId(room_no);
 }
 
-/* 80C12AD8-80C12CA4 000558 01CC+00 1/0 0/0 0/0 .text            Create__14daGraveStone_cFv */
 int daGraveStone_c::Create() {
     setBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -155,7 +145,6 @@ int daGraveStone_c::Create() {
     return 1;
 }
 
-/* 80C12CA4-80C12D1C 000724 0078+00 1/0 0/0 0/0 .text            CreateHeap__14daGraveStone_cFv */
 int daGraveStone_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "H_Haka.bmd");
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -165,7 +154,6 @@ int daGraveStone_c::CreateHeap() {
     return 1;
 }
 
-/* 80C12D1C-80C12EF0 00079C 01D4+00 1/1 0/0 0/0 .text            create__14daGraveStone_cFv */
 cPhs__Step daGraveStone_c::create() {
     fopAcM_ct(this, daGraveStone_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
@@ -180,8 +168,6 @@ cPhs__Step daGraveStone_c::create() {
     return step;
 }
 
-/* 80C13030-80C13078 000AB0 0048+00 1/0 0/0 0/0 .text            Execute__14daGraveStone_cFPPA3_A4_f
- */
 int daGraveStone_c::Execute(Mtx** i_mtxP) {
     *i_mtxP = &mBgMtx;
     moveCalc();
@@ -190,7 +176,6 @@ int daGraveStone_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80C13078-80C1311C 000AF8 00A4+00 1/0 0/0 0/0 .text            Draw__14daGraveStone_cFv */
 int daGraveStone_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -200,7 +185,6 @@ int daGraveStone_c::Draw() {
     return 1;
 }
 
-/* 80C1311C-80C13188 000B9C 006C+00 1/0 0/0 0/0 .text            Delete__14daGraveStone_cFv */
 int daGraveStone_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -209,33 +193,26 @@ int daGraveStone_c::Delete() {
     return 1;
 }
 
-/* 80C13188-80C131B4 000C08 002C+00 1/0 0/0 0/0 .text daGraveStone_Draw__FP14daGraveStone_c */
 static int daGraveStone_Draw(daGraveStone_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C131B4-80C131D4 000C34 0020+00 1/0 0/0 0/0 .text daGraveStone_Execute__FP14daGraveStone_c */
 static int daGraveStone_Execute(daGraveStone_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C131D4-80C131DC 000C54 0008+00 1/0 0/0 0/0 .text daGraveStone_IsDelete__FP14daGraveStone_c */
 static int daGraveStone_IsDelete(daGraveStone_c* i_this) {
     return 1;
 }
 
-/* 80C131DC-80C131FC 000C5C 0020+00 1/0 0/0 0/0 .text daGraveStone_Delete__FP14daGraveStone_c */
 static int daGraveStone_Delete(daGraveStone_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C131FC-80C1321C 000C7C 0020+00 1/0 0/0 0/0 .text            daGraveStone_create__FP10fopAc_ac_c
- */
 static cPhs__Step daGraveStone_create(fopAc_ac_c* i_this) {
     return static_cast<daGraveStone_c*>(i_this)->create();
 }
 
-/* 80C13308-80C13328 -00001 0020+00 1/0 0/0 0/0 .data            l_daGraveStone_Method */
 static actor_method_class l_daGraveStone_Method = {
     (process_method_func)daGraveStone_create,
     (process_method_func)daGraveStone_Delete,
@@ -244,7 +221,6 @@ static actor_method_class l_daGraveStone_Method = {
     (process_method_func)daGraveStone_Draw,
 };
 
-/* 80C13328-80C13358 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GraveStone */
 extern actor_process_profile_definition g_profile_Obj_GraveStone = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp
index 9ab20c8c10..75da32b6a8 100644
--- a/src/d/actor/d_a_obj_groundwater.cpp
+++ b/src/d/actor/d_a_obj_groundwater.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80C14B44-80C14B58 000014 0014+00 1/1 0/0 0/0 .bss             l_HIO */
 static daGrdWater_HIO_c l_HIO;
 
-/* 80C14A58-80C14A94 00005C 003C+00 1/2 0/0 0/0 .data            l_mode_func */
 static daGrdWater_c::modeFunc l_mode_func[5] = {
     &daGrdWater_c::modeWait,
     &daGrdWater_c::modeLevelUpA,
@@ -21,7 +19,6 @@ static daGrdWater_c::modeFunc l_mode_func[5] = {
     &daGrdWater_c::modeLevelDownB,
 };
 
-/* 80C134AC-80C134F8 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__16daGrdWater_HIO_cFv */
 daGrdWater_HIO_c::daGrdWater_HIO_c() {
     field_0x04 = 100;
     field_0x05 = 100;
@@ -32,7 +29,6 @@ daGrdWater_HIO_c::daGrdWater_HIO_c() {
     field_0x10 = 0.0f;
 }
 
-/* 80C13540-80C13618 000180 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__12daGrdWater_cFv */
 void daGrdWater_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -44,7 +40,6 @@ void daGrdWater_c::setBaseMtx() {
     mModel2->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C13618-80C139E4 000258 03CC+00 1/0 0/0 0/0 .text            CreateHeap__12daGrdWater_cFv */
 int daGrdWater_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Water", 18);
     JUT_ASSERT(189, modelData != NULL);
@@ -97,7 +92,6 @@ int daGrdWater_c::CreateHeap() {
     return 1;
 }
 
-/* 80C139E4-80C13DB0 000624 03CC+00 1/1 0/0 0/0 .text            create__12daGrdWater_cFv */
 int daGrdWater_c::create() {
     fopAcM_ct(this, daGrdWater_c);
     int rv = dComIfG_resLoad(&mPhase, "Water");
@@ -156,12 +150,9 @@ int daGrdWater_c::create() {
     return rv;
 }
 
-/* 80C13DB0-80C13FA4 0009F0 01F4+00 1/1 0/0 0/0 .text            __ct__12daGrdWater_cFv */
 daGrdWater_c::daGrdWater_c() {
 }
 
-/* 80C13FEC-80C14194 000C2C 01A8+00 1/0 0/0 0/0 .text            Execute__12daGrdWater_cFPPA3_A4_f
- */
 int daGrdWater_c::Execute(Mtx** pMtx) {
     mBtk1.play();
     mBtk2.play();
@@ -203,17 +194,13 @@ int daGrdWater_c::Execute(Mtx** pMtx) {
     return 1;
 }
 
-/* 80C14194-80C141A0 000DD4 000C+00 5/5 0/0 0/0 .text            init_modeWait__12daGrdWater_cFv */
 void daGrdWater_c::init_modeWait() {
     mMode = WAIT;
 }
 
-/* 80C141A0-80C141A4 000DE0 0004+00 1/0 0/0 0/0 .text            modeWait__12daGrdWater_cFv */
 void daGrdWater_c::modeWait() {
 }
 
-/* 80C141A4-80C1423C 000DE4 0098+00 1/1 0/0 0/0 .text            init_modeLevelUpA__12daGrdWater_cFv
- */
 void daGrdWater_c::init_modeLevelUpA() {
     mBck1a.reset();
     mBck2a.reset();
@@ -221,7 +208,6 @@ void daGrdWater_c::init_modeLevelUpA() {
     mMode = LEVEL_UP_A;
 }
 
-/* 80C1423C-80C142AC 000E7C 0070+00 1/0 0/0 0/0 .text            modeLevelUpA__12daGrdWater_cFv */
 void daGrdWater_c::modeLevelUpA() {
     int res1 = mBck1a.play();
     int res2 = mBck2a.play();
@@ -231,14 +217,12 @@ void daGrdWater_c::modeLevelUpA() {
     }
 }
 
-/* 80C142AC-80C14320 000EEC 0074+00 1/1 0/0 0/0 .text init_modeLevelDownA__12daGrdWater_cFv */
 void daGrdWater_c::init_modeLevelDownA() {
     mBck1b.reset();
     mBck2b.reset();
     mMode = LEVEL_DOWN_A;
 }
 
-/* 80C14320-80C1437C 000F60 005C+00 1/0 0/0 0/0 .text            modeLevelDownA__12daGrdWater_cFv */
 void daGrdWater_c::modeLevelDownA() {
     int res1 = mBck1b.play();
     int res2 = mBck2b.play();
@@ -247,8 +231,6 @@ void daGrdWater_c::modeLevelDownA() {
     }
 }
 
-/* 80C1437C-80C14414 000FBC 0098+00 1/1 0/0 0/0 .text            init_modeLevelUpB__12daGrdWater_cFv
- */
 void daGrdWater_c::init_modeLevelUpB() {
     mBck1c.reset();
     mBck2c.reset();
@@ -256,7 +238,6 @@ void daGrdWater_c::init_modeLevelUpB() {
     mMode = LEVEL_UP_B;
 }
 
-/* 80C14414-80C14484 001054 0070+00 1/0 0/0 0/0 .text            modeLevelUpB__12daGrdWater_cFv */
 void daGrdWater_c::modeLevelUpB() {
     int res1 = mBck1c.play();
     int res2 = mBck2c.play();
@@ -266,14 +247,12 @@ void daGrdWater_c::modeLevelUpB() {
     }
 }
 
-/* 80C14484-80C144F8 0010C4 0074+00 1/1 0/0 0/0 .text init_modeLevelDownB__12daGrdWater_cFv */
 void daGrdWater_c::init_modeLevelDownB() {
     mBck1d.reset();
     mBck2d.reset();
     mMode = LEVEL_DOWN_B;
 }
 
-/* 80C144F8-80C14554 001138 005C+00 1/0 0/0 0/0 .text            modeLevelDownB__12daGrdWater_cFv */
 void daGrdWater_c::modeLevelDownB() {
     int res1 = mBck1d.play();
     int res2 = mBck2d.play();
@@ -282,7 +261,6 @@ void daGrdWater_c::modeLevelDownB() {
     }
 }
 
-/* 80C14554-80C147EC 001194 0298+00 1/0 0/0 0/0 .text            Draw__12daGrdWater_cFv */
 int daGrdWater_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel2, &tevStr);
@@ -336,36 +314,27 @@ int daGrdWater_c::Draw() {
     return 1;
 }
 
-/* 80C147EC-80C1481C 00142C 0030+00 1/0 0/0 0/0 .text            Delete__12daGrdWater_cFv */
 int daGrdWater_c::Delete() {
     dComIfG_resDelete(&mPhase, "Water");
     return 1;
 }
 
-/* 80C1481C-80C14848 00145C 002C+00 1/0 0/0 0/0 .text            daGrdWater_Draw__FP12daGrdWater_c
- */
 static int daGrdWater_Draw(daGrdWater_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C14848-80C14868 001488 0020+00 1/0 0/0 0/0 .text daGrdWater_Execute__FP12daGrdWater_c */
 static int daGrdWater_Execute(daGrdWater_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C14868-80C14888 0014A8 0020+00 1/0 0/0 0/0 .text            daGrdWater_Delete__FP12daGrdWater_c
- */
 static int daGrdWater_Delete(daGrdWater_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C14888-80C148A8 0014C8 0020+00 1/0 0/0 0/0 .text            daGrdWater_Create__FP10fopAc_ac_c
- */
 static int daGrdWater_Create(fopAc_ac_c* i_this) {
     return static_cast<daGrdWater_c*>(i_this)->create();
 }
 
-/* 80C14A94-80C14AB4 -00001 0020+00 1/0 0/0 0/0 .data            l_daGrdWater_Method */
 static actor_method_class l_daGrdWater_Method = {
     (process_method_func)daGrdWater_Create,
     (process_method_func)daGrdWater_Delete,
@@ -374,7 +343,6 @@ static actor_method_class l_daGrdWater_Method = {
     (process_method_func)daGrdWater_Draw,
 };
 
-/* 80C14AB4-80C14AE4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_GRDWATER */
 extern actor_process_profile_definition g_profile_GRDWATER = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp
index 9651222d09..3fa62de98b 100644
--- a/src/d/actor/d_a_obj_grz_rock.cpp
+++ b/src/d/actor/d_a_obj_grz_rock.cpp
@@ -7,7 +7,6 @@
 
 #include "d/actor/d_a_obj_grz_rock.h"
 
-/* 80C14BD8-80C14C54 000078 007C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjGrzRock_cFv */
 void daObjGrzRock_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -15,18 +14,15 @@ void daObjGrzRock_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C14C54-80C14CB0 0000F4 005C+00 1/1 0/0 0/0 .text            setEnvTevColor__14daObjGrzRock_cFv */
 void daObjGrzRock_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80C14CB0-80C14CF0 000150 0040+00 1/1 0/0 0/0 .text            setRoomNo__14daObjGrzRock_cFv */
 void daObjGrzRock_c::setRoomNo() {
     fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
 }
 
-/* 80C14CF0-80C14DA0 000190 00B0+00 1/1 0/0 0/0 .text            setPrtcl__14daObjGrzRock_cFv */
 void daObjGrzRock_c::setPrtcl() {
     static u16 const l_prticles_id[6] = {
         dPa_RM(ID_ZI_S_BOMBROCK_FL_BREAK_A), dPa_RM(ID_ZI_S_BOMBROCK_FL_BREAK_B), dPa_RM(ID_ZI_S_BOMBROCK_FL_BREAK_C),
@@ -39,7 +35,6 @@ void daObjGrzRock_c::setPrtcl() {
     }
 }
 
-/* 80C14DA0-80C14EE0 000240 0140+00 1/0 0/0 0/0 .text            Create__14daObjGrzRock_cFv */
 int daObjGrzRock_c::Create() {
     setBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -54,10 +49,8 @@ int daObjGrzRock_c::Create() {
     return 1;
 }
 
-/* 80C1538C-80C15390 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "grZRock";
 
-/* 80C14EE0-80C14F50 000380 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjGrzRock_cFv */
 int daObjGrzRock_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(246, modelData != NULL);
@@ -69,7 +62,6 @@ int daObjGrzRock_c::CreateHeap() {
     return 1;
 }
 
-/* 80C14F50-80C150DC 0003F0 018C+00 1/1 0/0 0/0 .text            create__14daObjGrzRock_cFv */
 cPhs__Step daObjGrzRock_c::create() {
     fopAcM_ct(this, daObjGrzRock_c);
 
@@ -106,7 +98,6 @@ cPhs__Step daObjGrzRock_c::create() {
     return phase;
 }
 
-/* 80C1514C-80C151A4 0005EC 0058+00 1/0 0/0 0/0 .text            Execute__14daObjGrzRock_cFPPA3_A4_f */
 int daObjGrzRock_c::Execute(Mtx** mtx) {
     if (mSmashFlag) {
         setPrtcl();
@@ -119,7 +110,6 @@ int daObjGrzRock_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 80C151A4-80C15248 000644 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjGrzRock_cFv */
 int daObjGrzRock_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -129,7 +119,6 @@ int daObjGrzRock_c::Draw() {
     return 1;
 }
 
-/* 80C15248-80C152B4 0006E8 006C+00 1/0 0/0 0/0 .text            Delete__14daObjGrzRock_cFv */
 int daObjGrzRock_c::Delete() {
     for (int i = 0; i < 1; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcName);
@@ -144,32 +133,26 @@ int daObjGrzRock_c::Delete() {
     return 1;
 }
 
-/* 80C152B4-80C152E0 000754 002C+00 1/0 0/0 0/0 .text daObjGrzRock_Draw__FP14daObjGrzRock_c */
 static int daObjGrzRock_Draw(daObjGrzRock_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C152E0-80C15300 000780 0020+00 1/0 0/0 0/0 .text daObjGrzRock_Execute__FP14daObjGrzRock_c */
 static int daObjGrzRock_Execute(daObjGrzRock_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C15300-80C15308 0007A0 0008+00 1/0 0/0 0/0 .text daObjGrzRock_IsDelete__FP14daObjGrzRock_c */
 static int daObjGrzRock_IsDelete(daObjGrzRock_c* i_this) {
     return 1;
 }
 
-/* 80C15308-80C15328 0007A8 0020+00 1/0 0/0 0/0 .text daObjGrzRock_Delete__FP14daObjGrzRock_c */
 static int daObjGrzRock_Delete(daObjGrzRock_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C15328-80C15348 0007C8 0020+00 1/0 0/0 0/0 .text            daObjGrzRock_create__FP10fopAc_ac_c */
 static int daObjGrzRock_create(fopAc_ac_c* a_this) {
     return static_cast<daObjGrzRock_c*>(a_this)->create();
 }
 
-/* 80C15390-80C153B0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjGrzRock_Method */
 static actor_method_class l_daObjGrzRock_Method = {
     (process_method_func)daObjGrzRock_create,
     (process_method_func)daObjGrzRock_Delete,
@@ -178,7 +161,6 @@ static actor_method_class l_daObjGrzRock_Method = {
     (process_method_func)daObjGrzRock_Draw,
 };
 
-/* 80C153B0-80C153E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_GrzRock */
 extern actor_process_profile_definition g_profile_Obj_GrzRock = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp
index 6af2816193..84f07b814b 100644
--- a/src/d/actor/d_a_obj_h_saku.cpp
+++ b/src/d/actor/d_a_obj_h_saku.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_obj_h_saku.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80C16540-80C16544 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_Saku";
 
-/* 80C1552C-80C157D4 0000EC 02A8+00 0/0 0/0 1/1 .text            BreakSet__13daObjH_Saku_cFv */
 void daObjH_Saku_c::BreakSet() {
     cXyz pos(240.0f, 0.0f, -30.0f);
     cLib_offsetPos(&pos, &current.pos, shape_angle.y, &pos);
@@ -40,7 +38,6 @@ void daObjH_Saku_c::BreakSet() {
     }
 }
 
-/* 80C15810-80C15A4C 0003D0 023C+00 1/1 0/0 0/0 .text SpeedSet__13daObjH_Saku_cFP4cXyzP4cXyzf */
 u8 daObjH_Saku_c::SpeedSet(cXyz* param_1, cXyz* param_2, f32 param_3) {
     field_0x5c4 += 1.0f;
     cXyz spa0(*param_1);
@@ -66,7 +63,6 @@ u8 daObjH_Saku_c::SpeedSet(cXyz* param_1, cXyz* param_2, f32 param_3) {
     return false;
 }
 
-/* 80C161E8-80C1629C 000DA8 00B4+00 1/0 0/0 0/0 .text            CreateHeap__13daObjH_Saku_cFv */
 int daObjH_Saku_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "H_Saku.bmd");
     JUT_ASSERT(80, modelData != NULL);
@@ -108,7 +104,6 @@ cPhs__Step daObjH_Saku_c::create() {
     return phase;
 }
 
-/* 80C15A4C-80C15E00 00060C 03B4+00 1/1 0/0 0/0 .text            Action__13daObjH_Saku_cFv */
 void daObjH_Saku_c::Action() {
     switch (field_0x5a0) {
         case 0:
@@ -208,14 +203,12 @@ void daObjH_Saku_c::Action() {
     }
 }
 
-/* 80C15E00-80C15E44 0009C0 0044+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjH_Saku_cFv */
 void daObjH_Saku_c::initBaseMtx() {
     setBaseMtx();
     fopAcM_SetMtx(this, field_0x628->getBaseTRMtx());
     fopAcM_SetMtx(this, field_0x62c->getBaseTRMtx());
 }
 
-/* 80C15E44-80C15F4C 000A04 0108+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjH_Saku_cFv */
 void daObjH_Saku_c::setBaseMtx() {
     csXyz angle(field_0x5bc.x, field_0x5bc.y, field_0x5bc.z);
     mDoMtx_stack_c::transS(field_0x5a4);
@@ -233,43 +226,36 @@ void daObjH_Saku_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C15F4C-80C15F78 000B0C 002C+00 1/0 0/0 0/0 .text            daObjH_Saku_Draw__FP13daObjH_Saku_c */
 static int daObjH_Saku_Draw(daObjH_Saku_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C15F78-80C15F98 000B38 0020+00 1/0 0/0 0/0 .text daObjH_Saku_Execute__FP13daObjH_Saku_c */
 static int daObjH_Saku_Execute(daObjH_Saku_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C15F98-80C15FA0 000B58 0008+00 1/0 0/0 0/0 .text daObjH_Saku_IsDelete__FP13daObjH_Saku_c */
 static int daObjH_Saku_IsDelete(daObjH_Saku_c* i_this) {
     return 1;
 }
 
-/* 80C15FA0-80C15FC4 000B60 0024+00 1/0 0/0 0/0 .text daObjH_Saku_Delete__FP13daObjH_Saku_c */
 static int daObjH_Saku_Delete(daObjH_Saku_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80C15FC4-80C16178 000B84 01B4+00 1/0 0/0 0/0 .text            daObjH_Saku_Create__FP10fopAc_ac_c */
 static int daObjH_Saku_Create(fopAc_ac_c* a_this) {
     daObjH_Saku_c* i_this = (daObjH_Saku_c*)a_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80C1629C-80C162F4 000E5C 0058+00 1/0 0/0 0/0 .text            Create__13daObjH_Saku_cFv */
 int daObjH_Saku_c::Create() {
     fopAcM_setCullSizeBox(this, -700.0f, -700.0f, -700.0f, 700.0f, 700.0f, 7000.0f);
     initBaseMtx();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C162F4-80C16340 000EB4 004C+00 1/0 0/0 0/0 .text            Execute__13daObjH_Saku_cFPPA3_A4_f */
 int daObjH_Saku_c::Execute(Mtx** mtx) {
     Action();
     *mtx = &mBgMtx;
@@ -277,7 +263,6 @@ int daObjH_Saku_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 80C16340-80C1641C 000F00 00DC+00 1/0 0/0 0/0 .text            Draw__13daObjH_Saku_cFv */
 int daObjH_Saku_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(field_0x628, &tevStr);
@@ -296,23 +281,19 @@ int daObjH_Saku_c::Draw() {
     return 1;
 }
 
-/* 80C1641C-80C16450 000FDC 0034+00 1/0 0/0 0/0 .text            Delete__13daObjH_Saku_cFv */
 int daObjH_Saku_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
 namespace {
-/* 80C16634-80C16640 000054 000C+00 0/1 0/0 0/0 .bss s_pos_l__28@unnamed@d_a_obj_h_saku_cpp@ */
 static cXyz s_pos_l;
 
-/* 80C1664C-80C16658 00006C 000C+00 0/1 0/0 0/0 .bss s_pos_r__28@unnamed@d_a_obj_h_saku_cpp@ */
 static cXyz s_pos_r;
 } // namespace
 
 AUDIO_INSTANCES;
 
-/* 80C16544-80C16564 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjH_Saku_Method */
 static actor_method_class l_daObjH_Saku_Method = {
     (process_method_func)daObjH_Saku_Create,
     (process_method_func)daObjH_Saku_Delete,
@@ -321,7 +302,6 @@ static actor_method_class l_daObjH_Saku_Method = {
     (process_method_func)daObjH_Saku_Draw,
 };
 
-/* 80C16564-80C16594 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_H_Saku */
 extern actor_process_profile_definition g_profile_Obj_H_Saku = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp
index 499237fdf1..851c2be7ed 100644
--- a/src/d/actor/d_a_obj_hakai_brl.cpp
+++ b/src/d/actor/d_a_obj_hakai_brl.cpp
@@ -8,23 +8,18 @@
 #include "d/actor/d_a_obj_hakai_brl.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C16738-80C16758 000078 0020+00 1/1 0/0 0/0 .text daObjHBarrel_c_createHeap__FP10fopAc_ac_c */
 static int daObjHBarrel_c_createHeap(fopAc_ac_c* i_this) {
     return ((daObjHBarrel_c*)i_this)->createHeap();
 }
 
-/* 80C1737C-80C17380 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "HBarrel";
 
-/* 80C16758-80C1682C 000098 00D4+00 2/2 0/0 0/0 .text            __ct__14daObjHBarrel_cFv */
 daObjHBarrel_c::daObjHBarrel_c() {}
 
-/* 80C16758-80C1682C 000098 00D4+00 2/2 0/0 0/0 .text            __ct__14daObjHBarrel_cFv */
 daObjHBarrel_c::~daObjHBarrel_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80C16A98-80C16B08 0003D8 0070+00 1/1 0/0 0/0 .text            createHeap__14daObjHBarrel_cFv */
 int daObjHBarrel_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
     JUT_ASSERT(0x9a, a_model_data_p != NULL);
@@ -37,7 +32,6 @@ int daObjHBarrel_c::createHeap() {
     return 1;
 }
 
-/* 80C16B08-80C16BF8 000448 00F0+00 1/1 0/0 0/0 .text            create__14daObjHBarrel_cFv */
 int daObjHBarrel_c::create() {
     fopAcM_ct(this, daObjHBarrel_c);
 
@@ -57,14 +51,12 @@ int daObjHBarrel_c::create() {
     return loadResult;
 }
 
-/* 80C16BF8-80C16C44 000538 004C+00 1/1 0/0 0/0 .text            Delete__14daObjHBarrel_cFv */
 int daObjHBarrel_c::Delete() {
     mSound.deleteObject();
     this->~daObjHBarrel_c();
     return 1;
 }
 
-/* 80C16C44-80C16CA8 000584 0064+00 1/1 0/0 0/0 .text            draw__14daObjHBarrel_cFv */
 int daObjHBarrel_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -72,7 +64,6 @@ int daObjHBarrel_c::draw() {
     return 1;
 }
 
-/* 80C16CA8-80C16D50 0005E8 00A8+00 1/1 0/0 0/0 .text            execute__14daObjHBarrel_cFv */
 int daObjHBarrel_c::execute() {
     if (dComIfGp_checkPlayerStatus0(0, 0x1000) != 0) {
         mCyl.OffTgShield();
@@ -91,8 +82,6 @@ int daObjHBarrel_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C172FC-80C17340 000000 0044+00 2/2 0/0 0/0 .rodata          s_CcDCyl__14daObjHBarrel_c */
 dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = {
     {
         {0x0, {{0x0, 0x0, 0xd}, {(s32)0xd8fafdff, 0x11}, 0x79}},  // mObj
@@ -107,7 +96,6 @@ dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = {
     }  // mCyl
 };
 
-/* 80C16D50-80C16DEC 000690 009C+00 1/1 0/0 0/0 .text            init__14daObjHBarrel_cFv */
 void daObjHBarrel_c::init() {
     mStts.Init(0xff, 0, this);
     mCyl.Set(s_CcDCyl);
@@ -118,14 +106,12 @@ void daObjHBarrel_c::init() {
     return mCyl.SetR(90.0f);
 }
 
-/* 80C16DEC-80C16E50 00072C 0064+00 2/2 0/0 0/0 .text            setModelMtx__14daObjHBarrel_cFv */
 void daObjHBarrel_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C16E50-80C17090 000790 0240+00 1/1 0/0 0/0 .text            hitAction__14daObjHBarrel_cFv */
 void daObjHBarrel_c::hitAction() {
     if (mCyl.ChkTgHit()) {
         cCcD_ObjHitInf* hitObj = mCyl.GetTgHitObj();
@@ -161,7 +147,6 @@ void daObjHBarrel_c::hitAction() {
     }
 }
 
-/* 80C17090-80C171F8 0009D0 0168+00 1/1 0/0 0/0 .text            callEmt__14daObjHBarrel_cFv */
 void daObjHBarrel_c::callEmt() {
     static u16 const PARTICLE_NAME[3] = {
         0x82AB,
@@ -185,28 +170,23 @@ void daObjHBarrel_c::callEmt() {
     }
 }
 
-/* 80C171F8-80C1724C 000B38 0054+00 1/0 0/0 0/0 .text daObjHBarrel_create__FP14daObjHBarrel_c */
 static int daObjHBarrel_create(daObjHBarrel_c* param_0) {
     fopAcM_ct(param_0, daObjHBarrel_c);
     return param_0->create();
 }
 
-/* 80C1724C-80C1726C 000B8C 0020+00 1/0 0/0 0/0 .text daObjHBarrel_Delete__FP14daObjHBarrel_c */
 static int daObjHBarrel_Delete(daObjHBarrel_c* param_0) {
     return param_0->Delete();
 }
 
-/* 80C1726C-80C1728C 000BAC 0020+00 1/0 0/0 0/0 .text daObjHBarrel_execute__FP14daObjHBarrel_c */
 static int daObjHBarrel_execute(daObjHBarrel_c* param_0) {
     return param_0->execute();
 }
 
-/* 80C1728C-80C172AC 000BCC 0020+00 1/0 0/0 0/0 .text daObjHBarrel_draw__FP14daObjHBarrel_c */
 static int daObjHBarrel_draw(daObjHBarrel_c* param_0) {
     return param_0->draw();
 }
 
-/* 80C17380-80C173A0 -00001 0020+00 1/0 0/0 0/0 .data            daObjHBarrel_METHODS */
 static actor_method_class daObjHBarrel_METHODS = {
     (process_method_func)daObjHBarrel_create,
     (process_method_func)daObjHBarrel_Delete,
diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp
index 12d696567d..0ab4db6415 100644
--- a/src/d/actor/d_a_obj_hakai_ftr.cpp
+++ b/src/d/actor/d_a_obj_hakai_ftr.cpp
@@ -9,35 +9,23 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
-/* 80C17498-80C174B8 000078 0020+00 1/1 0/0 0/0 .text daObjHFtr_c_createHeap__FP10fopAc_ac_c */
 static int daObjHFtr_c_createHeap(fopAc_ac_c* param_0) {
     return ((daObjHFtr_c*)param_0)->createHeap();
 }
 
-/* 80C1817C-80C18188 -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName[3] = {"HChair", "HSofa", "HTable"};
 
-/* 80C174B8-80C1753C 000098 0084+00 2/2 0/0 0/0 .text            __ct__11daObjHFtr_cFv */
 daObjHFtr_c::daObjHFtr_c() {}
 
-/* 80C17778-80C17874 000358 00FC+00 1/0 0/0 0/0 .text            __dt__11daObjHFtr_cFv */
 daObjHFtr_c::~daObjHFtr_c() {
     u32 index = getNameId();
     dComIfG_resDelete(this, l_arcName[index]);
 }
 
-/* ############################################################################################## */
-/* 80C180B8-80C180C4 000000 000C+00 2/2 0/0 0/0 .rodata          l_bmdIdx */
 static u32 const l_bmdIdx[3] = {4, 4, 4};
 
-/* 80C180C4-80C180D0 00000C 000C+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static u32 const l_dzbIdx[3] = {7, 7, 7};
 
-/* 80C17874-80C179B0 000454 013C+00 1/1 0/0 0/0 .text            createHeap__11daObjHFtr_cFv */
 int daObjHFtr_c::createHeap() {
     uint nameId = getNameId();
 
@@ -67,11 +55,8 @@ int daObjHFtr_c::createHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C180D0-80C180DC 000018 000C+00 1/1 0/0 0/0 .rodata          l_heapSize */
 static u32 const l_heapSize[3] = {0x2000, 0x2000, 0x2000};
 
-/* 80C179B0-80C17AC0 000590 0110+00 1/1 0/0 0/0 .text            create__11daObjHFtr_cFv */
 int daObjHFtr_c::create() {
     fopAcM_ct(this, daObjHFtr_c);
 
@@ -95,7 +80,6 @@ int daObjHFtr_c::create() {
     return loadResult;
 }
 
-/* 80C17AC0-80C17B30 0006A0 0070+00 1/1 0/0 0/0 .text            Delete__11daObjHFtr_cFv */
 int daObjHFtr_c::Delete() {
     if (field_0x5a4 != NULL && field_0x5a4->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x5a4);
@@ -104,7 +88,6 @@ int daObjHFtr_c::Delete() {
     return 1;
 }
 
-/* 80C17B30-80C17BD4 000710 00A4+00 1/1 0/0 0/0 .text            draw__11daObjHFtr_cFv */
 int daObjHFtr_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -130,7 +113,6 @@ dCcD_SrcCyl const daObjHFtr_c::s_CcDCyl = {
     }  // mCyl
 };
 
-/* 80C17BD4-80C17CD0 0007B4 00FC+00 1/1 0/0 0/0 .text            execute__11daObjHFtr_cFv */
 int daObjHFtr_c::execute() {
     if (chkHit()) {
         callEmt();
@@ -150,7 +132,6 @@ int daObjHFtr_c::execute() {
     return 1;
 }
 
-/* 80C17CD0-80C17E10 0008B0 0140+00 1/1 0/0 0/0 .text            init__11daObjHFtr_cFv */
 void daObjHFtr_c::init() {
     static s32 const COL_OFFSET_X[3][2] = {{0, 0}, {50, -50}, {0, 0}};
     static s32 const COL_HEIGHT[3] = {170, 160, 110};
@@ -169,14 +150,12 @@ void daObjHFtr_c::init() {
     // return iVar2;
 }
 
-/* 80C17E10-80C17E74 0009F0 0064+00 2/2 0/0 0/0 .text            setModelMtx__11daObjHFtr_cFv */
 void daObjHFtr_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C17E74-80C17EDC 000A54 0068+00 1/1 0/0 0/0 .text            chkHit__11daObjHFtr_cFv */
 bool daObjHFtr_c::chkHit() {
     for (s32 i = 0; i < 2; i++) {
         if (mCyls[i].ChkTgHit()) {
@@ -187,7 +166,6 @@ bool daObjHFtr_c::chkHit() {
 }
 
 
-/* 80C17EDC-80C17FB4 000ABC 00D8+00 1/1 0/0 0/0 .text            callEmt__11daObjHFtr_cFv */
 void daObjHFtr_c::callEmt() {
     static u16 const PARTICLE_NAME[4] = {
         0x8AE7,
@@ -204,38 +182,29 @@ void daObjHFtr_c::callEmt() {
     }
 }
 
-/* 80C17FB4-80C18008 000B94 0054+00 1/0 0/0 0/0 .text            daObjHFtr_create__FP11daObjHFtr_c
- */
 static int daObjHFtr_create(daObjHFtr_c* param_0) {
     fopAcM_ct(param_0, daObjHFtr_c);
     return param_0->create();
 }
 
-/* 80C18008-80C18028 000BE8 0020+00 1/0 0/0 0/0 .text            daObjHFtr_Delete__FP11daObjHFtr_c
- */
 static int daObjHFtr_Delete(daObjHFtr_c* param_0) {
     return param_0->Delete();
 }
 
-/* 80C18028-80C18048 000C08 0020+00 1/0 0/0 0/0 .text            daObjHFtr_execute__FP11daObjHFtr_c
- */
 static int daObjHFtr_execute(daObjHFtr_c* param_0) {
     return param_0->execute();
 }
 
-/* 80C18048-80C18068 000C28 0020+00 1/0 0/0 0/0 .text            daObjHFtr_draw__FP11daObjHFtr_c */
 static int daObjHFtr_draw(daObjHFtr_c* param_0) {
     return param_0->draw();
 }
 
-/* 80C18188-80C181A8 -00001 0020+00 1/0 0/0 0/0 .data            daObjHFtr_METHODS */
 static actor_method_class daObjHFtr_METHODS = {
     (process_method_func)daObjHFtr_create,  (process_method_func)daObjHFtr_Delete,
     (process_method_func)daObjHFtr_execute, 0,
     (process_method_func)daObjHFtr_draw,
 };
 
-/* 80C181A8-80C181D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_HFtr */
 extern actor_process_profile_definition g_profile_Obj_HFtr = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp
index 517e313479..fc4707c2c6 100644
--- a/src/d/actor/d_a_obj_hasu2.cpp
+++ b/src/d/actor/d_a_obj_hasu2.cpp
@@ -7,12 +7,6 @@
 
 #include "d/actor/d_a_obj_hasu2.h"
 
-//
-// Declarations:
-//
-
-/* 80C18298-80C182DC 000078 0044+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     (void)param_0;
     if (fopAcM_GetName(param_2) == PROC_ALINK) {
@@ -22,21 +16,16 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2
     }
 }
 
-/* ############################################################################################## */
 const int l_dzbidx = {7};
 const int l_bmdidx = {4};
 
-/* 80C18A58-80C18A70 000000 0018+00 4/4 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-123.0f, -175.0f, -142.0f},
     {133.0f, 29.0f, 127.0f}
 };
 
-/* 80C18AA8-80C18AAC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_Hasu";
 
-/* 80C182DC-80C18340 0000BC 0064+00 1/1 0/0 0/0 .text            __ct__Q29nObjMHasu12daObjMHasu_cFv
- */
 nObjMHasu::daObjMHasu_c::daObjMHasu_c() :
     mConst1(25.5f),
     mConst2(6.5f),
@@ -44,7 +33,6 @@ nObjMHasu::daObjMHasu_c::daObjMHasu_c() :
 {
 }
 
-/* 80C18340-80C183D0 000120 0090+00 1/1 0/0 0/0 .text create1st__Q29nObjMHasu12daObjMHasu_cFv */
 int nObjMHasu::daObjMHasu_c::create1st() {
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e)
@@ -59,7 +47,6 @@ int nObjMHasu::daObjMHasu_c::create1st() {
     return phase;
 }
 
-/* 80C183D0-80C18440 0001B0 0070+00 2/2 0/0 0/0 .text setMtx__Q29nObjMHasu12daObjMHasu_cFv */
 void nObjMHasu::daObjMHasu_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -67,7 +54,6 @@ void nObjMHasu::daObjMHasu_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C18440-80C184B0 000220 0070+00 1/0 0/0 0/0 .text CreateHeap__Q29nObjMHasu12daObjMHasu_cFv */
 int nObjMHasu::daObjMHasu_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx);
     JUT_ASSERT(193, model_data != NULL);
@@ -79,7 +65,6 @@ int nObjMHasu::daObjMHasu_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C184B0-80C185A4 000290 00F4+00 1/0 0/0 0/0 .text Create__Q29nObjMHasu12daObjMHasu_cFv */
 int nObjMHasu::daObjMHasu_c::Create() {
     mModel->setBaseTRMtx(mMtx2);
     fopAcM_SetMtx(this, mMtx2);
@@ -98,8 +83,6 @@ int nObjMHasu::daObjMHasu_c::Create() {
     return 1;
 }
 
-/* 80C185A4-80C18600 000384 005C+00 1/0 0/0 0/0 .text
- * Execute__Q29nObjMHasu12daObjMHasu_cFPPA3_A4_f                */
 int nObjMHasu::daObjMHasu_c::Execute(Mtx** i_pMtx) {
     setMtx();
     mModel->setBaseTRMtx(mMtx2);
@@ -108,8 +91,6 @@ int nObjMHasu::daObjMHasu_c::Execute(Mtx** i_pMtx) {
     return 1;
 }
 
-/* 80C18600-80C186A4 0003E0 00A4+00 1/0 0/0 0/0 .text            Draw__Q29nObjMHasu12daObjMHasu_cFv
- */
 int nObjMHasu::daObjMHasu_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -119,13 +100,11 @@ int nObjMHasu::daObjMHasu_c::Draw() {
     return 1;
 }
 
-/* 80C186A4-80C186E0 000484 003C+00 1/0 0/0 0/0 .text Delete__Q29nObjMHasu12daObjMHasu_cFv */
 int nObjMHasu::daObjMHasu_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80C186E0-80C18888 0004C0 01A8+00 1/1 0/0 0/0 .text upDownHasu__Q29nObjMHasu12daObjMHasu_cFv */
 void nObjMHasu::daObjMHasu_c::upDownHasu() {
     { // nested scope from debug
         f32 step;
@@ -160,16 +139,12 @@ void nObjMHasu::daObjMHasu_c::upDownHasu() {
     mRideFlag = 0;
 }
 
-/* 80C18888-80C188A0 000668 0018+00 1/1 0/0 0/0 .text updateCount__Q29nObjMHasu12daObjMHasu_cFUc
- */
 void nObjMHasu::daObjMHasu_c::updateCount(u8 i_count) {
     if (mTimer < i_count) {
         mTimer = i_count;
     }
 }
 
-/* 80C188A0-80C18920 000680 0080+00 1/1 0/0 0/0 .text setHasuCount__Q29nObjMHasu12daObjMHasu_cFf
- */
 void nObjMHasu::daObjMHasu_c::setHasuCount(f32 i_count) {
     if (!unk60c_1) {
         mTimer = 45;
@@ -184,32 +159,23 @@ void nObjMHasu::daObjMHasu_c::setHasuCount(f32 i_count) {
     }
 }
 
-/* 80C18920-80C18974 000700 0054+00 1/0 0/0 0/0 .text
- * daObjMHasu_create1st__FPQ29nObjMHasu12daObjMHasu_c           */
 static int daObjMHasu_create1st(nObjMHasu::daObjMHasu_c* i_this) {
     fopAcM_ct(i_this, nObjMHasu::daObjMHasu_c);
     return i_this->create1st();
 }
 
-/* 80C18974-80C18994 000754 0020+00 1/0 0/0 0/0 .text
- * daObjMHasu_MoveBGDelete__FPQ29nObjMHasu12daObjMHasu_c        */
 static int daObjMHasu_MoveBGDelete(nObjMHasu::daObjMHasu_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C18994-80C189B4 000774 0020+00 1/0 0/0 0/0 .text
- * daObjMHasu_MoveBGExecute__FPQ29nObjMHasu12daObjMHasu_c       */
 static int daObjMHasu_MoveBGExecute(nObjMHasu::daObjMHasu_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C189B4-80C189E0 000794 002C+00 1/0 0/0 0/0 .text
- * daObjMHasu_MoveBGDraw__FPQ29nObjMHasu12daObjMHasu_c          */
 static int daObjMHasu_MoveBGDraw(nObjMHasu::daObjMHasu_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C18AAC-80C18ACC -00001 0020+00 1/0 0/0 0/0 .data            daObjMHasu_METHODS */
 actor_method_class daObjMHasu_METHODS = {
     (process_method_func)&daObjMHasu_create1st,
     (process_method_func)&daObjMHasu_MoveBGDelete,
@@ -218,7 +184,6 @@ actor_method_class daObjMHasu_METHODS = {
     (process_method_func)&daObjMHasu_MoveBGDraw,
 };
 
-/* 80C18ACC-80C18AFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MHasu */
 extern actor_process_profile_definition g_profile_Obj_MHasu = {
   fpcLy_CURRENT_e,                   // mLayerID
   3,                                 // mListID
diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp
index 60d0f71973..bd55c8b7c8 100644
--- a/src/d/actor/d_a_obj_hata.cpp
+++ b/src/d/actor/d_a_obj_hata.cpp
@@ -1,19 +1,12 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_hata
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_hata.h"
 #include "f_op/f_op_actor.h"
 
-/* 80C18BB8-80C18BD8 000078 0020+00 1/1 0/0 0/0 .text daObjHata_c_createHeap__FP10fopAc_ac_c */
 static int daObjHata_c_createHeap(fopAc_ac_c* a_this) {
     return static_cast<daObjHata_c*>(a_this)->createHeap();
 }
 
-/* 80C18BD8-80C18CCC 000098 00F4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -40,18 +33,14 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80C194C8-80C194CC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Hata";
 
-/* 80C18D08-80C18D64 0001C8 005C+00 2/2 0/0 0/0 .text            __ct__11daObjHata_cFv */
 daObjHata_c::daObjHata_c() {}
 
-/* 80C18D68-80C18E00 000228 0098+00 1/0 0/0 0/0 .text            __dt__11daObjHata_cFv */
 daObjHata_c::~daObjHata_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80C18E00-80C18E70 0002C0 0070+00 1/1 0/0 0/0 .text            createHeap__11daObjHata_cFv */
 int daObjHata_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
     JUT_ASSERT(109, a_model_data_p != NULL);
@@ -63,7 +52,6 @@ int daObjHata_c::createHeap() {
     return 1;
 }
 
-/* 80C18E70-80C18F88 000330 0118+00 1/1 0/0 0/0 .text            create__11daObjHata_cFv */
 cPhs__Step daObjHata_c::create() {
     fopAcM_ct(this, daObjHata_c);
 
@@ -90,13 +78,11 @@ cPhs__Step daObjHata_c::create() {
     return phase_step;
 }
 
-/* 80C18F88-80C18FBC 000448 0034+00 1/1 0/0 0/0 .text            Delete__11daObjHata_cFv */
 int daObjHata_c::Delete() {
     this->~daObjHata_c();
     return 1;
 }
 
-/* 80C18FBC-80C19060 00047C 00A4+00 1/1 0/0 0/0 .text            draw__11daObjHata_cFv */
 int daObjHata_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(model, &tevStr);
@@ -106,21 +92,18 @@ int daObjHata_c::draw() {
     return 1;
 }
 
-/* 80C19060-80C19098 000520 0038+00 1/1 0/0 0/0 .text            execute__11daObjHata_cFv */
 int daObjHata_c::execute() {
     moveSwing();
     setModelMtx();
     return 1;
 }
 
-/* 80C19098-80C190FC 000558 0064+00 2/2 0/0 0/0 .text            setModelMtx__11daObjHata_cFv */
 void daObjHata_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     model->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C190FC-80C1919C 0005BC 00A0+00 1/1 0/0 0/0 .text            init__11daObjHata_cFv */
 void daObjHata_c::init() {
     for (int i = 0; i < 3; i++) {
         field_0x58c[i] = cM_rndFX(1280.0f);
@@ -132,7 +115,6 @@ void daObjHata_c::init() {
     }
 }
 
-/* 80C1919C-80C193BC 00065C 0220+00 1/1 0/0 0/0 .text            moveSwing__11daObjHata_cFv */
 void daObjHata_c::moveSwing() {
     #undef SING
     static int const SING[3] = {
@@ -173,28 +155,23 @@ void daObjHata_c::moveSwing() {
     }
 }
 
-/* 80C193BC-80C19410 00087C 0054+00 1/0 0/0 0/0 .text            daObjHata_create__FP11daObjHata_c */
 static int daObjHata_create(daObjHata_c* i_this) {
     fopAcM_ct(i_this, daObjHata_c);
     return i_this->create();
 }
 
-/* 80C19410-80C19430 0008D0 0020+00 1/0 0/0 0/0 .text            daObjHata_Delete__FP11daObjHata_c */
 static int daObjHata_Delete(daObjHata_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C19430-80C19450 0008F0 0020+00 1/0 0/0 0/0 .text            daObjHata_execute__FP11daObjHata_c */
 static int daObjHata_execute(daObjHata_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C19450-80C19470 000910 0020+00 1/0 0/0 0/0 .text            daObjHata_draw__FP11daObjHata_c */
 static int daObjHata_draw(daObjHata_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C194CC-80C194EC -00001 0020+00 1/0 0/0 0/0 .data            daObjHata_METHODS */
 static actor_method_class daObjHata_METHODS = {
     (process_method_func)daObjHata_create,
     (process_method_func)daObjHata_Delete,
@@ -203,7 +180,6 @@ static actor_method_class daObjHata_METHODS = {
     (process_method_func)daObjHata_draw,
 };
 
-/* 80C194EC-80C1951C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Hata */
 extern actor_process_profile_definition g_profile_Obj_Hata = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp
index 8bc2a60e8b..1e74d83437 100644
--- a/src/d/actor/d_a_obj_hb.cpp
+++ b/src/d/actor/d_a_obj_hb.cpp
@@ -18,7 +18,6 @@ enum Action {
     /* 0x3 */ ACTION_CARRY,
 };
 
-/* 80C195B8-80C19688 000078 00D0+00 1/0 0/0 0/0 .text            daOBJ_HB_Draw__FP12obj_hb_class */
 static int daOBJ_HB_Draw(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     
@@ -32,7 +31,6 @@ static int daOBJ_HB_Draw(obj_hb_class* i_this) {
     return 1;
 }
 
-/* 80C19688-80C1988C 000148 0204+00 1/1 0/0 0/0 .text            obj_hb_carry__FP12obj_hb_class */
 static void obj_hb_carry(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -82,7 +80,6 @@ static void obj_hb_carry(obj_hb_class* i_this) {
     cLib_addCalcAngleS2(&i_this->field_0x67c, 0x2000, 1, 0x100);
 }
 
-/* 80C1988C-80C19A2C 00034C 01A0+00 1/1 0/0 0/0 .text            wall_angle_get__FP12obj_hb_class */
 static s16 wall_angle_get(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_LinChk lin_chk;
@@ -116,7 +113,6 @@ static s16 wall_angle_get(obj_hb_class* i_this) {
     return cM_atan2s(spa8.x, spa8.z) + 0x4000;
 }
 
-/* 80C19A2C-80C19AD8 0004EC 00AC+00 1/1 0/0 0/0 .text            water_check__FP12obj_hb_class */
 static BOOL water_check(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     dBgS_ObjGndChk_Spl gnd_chk_spl;
@@ -135,7 +131,6 @@ static BOOL water_check(obj_hb_class* i_this) {
     return FALSE;
 }
 
-/* 80C19AD8-80C19BEC 000598 0114+00 1/1 0/0 0/0 .text            obj_hb_set__FP12obj_hb_class */
 static void obj_hb_set(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -166,7 +161,6 @@ static void obj_hb_set(obj_hb_class* i_this) {
     }
 }
 
-/* 80C19BEC-80C19DA8 0006AC 01BC+00 1/1 0/0 0/0 .text getGroundAngle__FP10fopAc_ac_cP5csXyz */
 static BOOL getGroundAngle(fopAc_ac_c* a_this, csXyz* param_2) {
     Vec spa8;
     cXyz spb4;
@@ -217,7 +211,6 @@ static BOOL getGroundAngle(fopAc_ac_c* a_this, csXyz* param_2) {
     return rv;
 }
 
-/* 80C19DA8-80C1A490 000868 06E8+00 1/1 0/0 0/0 .text            obj_hb_drop__FP12obj_hb_class */
 static void obj_hb_drop(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp3c, sp48;
@@ -351,7 +344,6 @@ static void obj_hb_drop(obj_hb_class* i_this) {
     }
 }
 
-/* 80C1A490-80C1A748 000F50 02B8+00 1/1 0/0 0/0 .text            obj_hb_float__FP12obj_hb_class */
 static void obj_hb_float(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -397,7 +389,6 @@ static void obj_hb_float(obj_hb_class* i_this) {
     }
 }
 
-/* 80C1A748-80C1AF80 001208 0838+00 1/1 0/0 0/0 .text            action__FP12obj_hb_class */
 static void action(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     cXyz sp5c, sp68;
@@ -576,7 +567,6 @@ static void action(obj_hb_class* i_this) {
     }
 }
 
-/* 80C1AF80-80C1B124 001A40 01A4+00 2/1 0/0 0/0 .text            daOBJ_HB_Execute__FP12obj_hb_class */
 static int daOBJ_HB_Execute(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
 
@@ -618,14 +608,12 @@ static int daOBJ_HB_Execute(obj_hb_class* i_this) {
     return 1;
 }
 
-/* 80C1B124-80C1B12C 001BE4 0008+00 1/0 0/0 0/0 .text            daOBJ_HB_IsDelete__FP12obj_hb_class */
 static int daOBJ_HB_IsDelete(obj_hb_class* i_this) {
     return 1;
 }
 
 static s8 lbl_474_bss_0;
 
-/* 80C1B12C-80C1B188 001BEC 005C+00 1/0 0/0 0/0 .text            daOBJ_HB_Delete__FP12obj_hb_class */
 static int daOBJ_HB_Delete(obj_hb_class* i_this) {
     fopEn_enemy_c* a_this = (fopEn_enemy_c*)&i_this->actor;
     fpc_ProcID id = fopAcM_GetID(a_this);
@@ -639,7 +627,6 @@ static int daOBJ_HB_Delete(obj_hb_class* i_this) {
     return 1;
 }
 
-/* 80C1B188-80C1B1F4 001C48 006C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_hb_class* i_this = (obj_hb_class*)a_this;
 
@@ -653,7 +640,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80C1B1F4-80C1B4E8 001CB4 02F4+00 1/0 0/0 0/0 .text            daOBJ_HB_Create__FP10fopAc_ac_c */
 static cPhs__Step daOBJ_HB_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_hb_class);
     obj_hb_class* i_this = (obj_hb_class*)a_this;
@@ -722,7 +708,6 @@ static cPhs__Step daOBJ_HB_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80C1B750-80C1B770 -00001 0020+00 1/0 0/0 0/0 .data            l_daOBJ_HB_Method */
 static actor_method_class l_daOBJ_HB_Method = {
     (process_method_func)daOBJ_HB_Create,
     (process_method_func)daOBJ_HB_Delete,
@@ -731,7 +716,6 @@ static actor_method_class l_daOBJ_HB_Method = {
     (process_method_func)daOBJ_HB_Draw,
 };
 
-/* 80C1B770-80C1B7A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_HB */
 extern actor_process_profile_definition g_profile_OBJ_HB = {
   fpcLy_CURRENT_e,       // mLayerID
   8,                     // mListID
diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp
index 0d1d943b7d..7f54e51963 100644
--- a/src/d/actor/d_a_obj_hbombkoya.cpp
+++ b/src/d/actor/d_a_obj_hbombkoya.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80C1C734-80C1C738 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_Bombkoy";
 
-/* 80C1B878-80C1B938 000078 00C0+00 1/1 0/0 0/0 .text            create1st__16daObjHBombkoya_cFv */
 int daObjHBombkoya_c::create1st() {
     if (fopAcM_isSwitch(this, getSw2No())) {
         return cPhs_ERROR_e;
@@ -33,7 +31,6 @@ int daObjHBombkoya_c::create1st() {
     return phase;
 }
 
-/* 80C1B938-80C1B9CC 000138 0094+00 1/0 0/0 0/0 .text            CreateHeap__16daObjHBombkoya_cFv */
 int daObjHBombkoya_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -47,7 +44,6 @@ int daObjHBombkoya_c::CreateHeap() {
     return 1;
 }
 
-/* 80C1C738-80C1C77C 000004 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{AT_TYPE_BOMB, 0x4, 0x13}, {0x0, 0x0}, 0x0}},  // mObj
@@ -62,7 +58,6 @@ static dCcD_SrcCyl l_cc_cyl_src = {
     }                        // mCyl
 };
 
-/* 80C1B9CC-80C1BB34 0001CC 0168+00 1/0 0/0 0/0 .text            Create__16daObjHBombkoya_cFv */
 int daObjHBombkoya_c::Create() {
     mpModel->setBaseScale(scale);
     fopAcM_SetMtx(this, NULL);
@@ -89,8 +84,6 @@ int daObjHBombkoya_c::Create() {
     return 1;
 }
 
-/* 80C1BB7C-80C1BCA0 00037C 0124+00 1/1 0/0 0/0 .text
- * setParticle__16daObjHBombkoya_cFPUsiPQ216daObjHBombkoya_c7PSetTblii */
 bool daObjHBombkoya_c::setParticle(u16* i_particleIDs, int i_particleMax,
                                    daObjHBombkoya_c::PSetTbl* i_setTbl, int i_tableMax,
                                    int i_timer) {
@@ -119,7 +112,6 @@ bool daObjHBombkoya_c::setParticle(u16* i_particleIDs, int i_particleMax,
     return particle_set;
 }
 
-/* 80C1BCA0-80C1C098 0004A0 03F8+00 1/0 0/0 0/0 .text Execute__16daObjHBombkoya_cFPPA3_A4_f */
 int daObjHBombkoya_c::Execute(Mtx** param_0) {
     *param_0 = &mBgMtx;
 
@@ -233,7 +225,6 @@ int daObjHBombkoya_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C1C098-80C1C16C 000898 00D4+00 1/0 0/0 0/0 .text            Draw__16daObjHBombkoya_cFv */
 int daObjHBombkoya_c::Draw() {
     if (mActive && !fopAcM_isSwitch(this, getSw2No())) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -247,40 +238,30 @@ int daObjHBombkoya_c::Draw() {
     return 1;
 }
 
-/* 80C1C16C-80C1C1A8 00096C 003C+00 1/0 0/0 0/0 .text            Delete__16daObjHBombkoya_cFv */
 int daObjHBombkoya_c::Delete() {
     request_of_phase_process_class* actor_phase = (request_of_phase_process_class*)this;
     dComIfG_resDelete(actor_phase, l_arcName);
     return 1;
 }
 
-/* 80C1C1A8-80C1C2BC 0009A8 0114+00 1/0 0/0 0/0 .text
- * daObjHBombkoya_create1st__FP16daObjHBombkoya_c               */
 static int daObjHBombkoya_create1st(daObjHBombkoya_c* i_this) {
     fopAcM_ct(i_this, daObjHBombkoya_c);
 
     return i_this->create1st();
 }
 
-/* 80C1C360-80C1C380 000B60 0020+00 1/0 0/0 0/0 .text
- * daObjHBombkoya_MoveBGDelete__FP16daObjHBombkoya_c            */
 static int daObjHBombkoya_MoveBGDelete(daObjHBombkoya_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C1C380-80C1C3A0 000B80 0020+00 1/0 0/0 0/0 .text
- * daObjHBombkoya_MoveBGExecute__FP16daObjHBombkoya_c           */
 static int daObjHBombkoya_MoveBGExecute(daObjHBombkoya_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C1C3A0-80C1C3CC 000BA0 002C+00 1/0 0/0 0/0 .text
- * daObjHBombkoya_MoveBGDraw__FP16daObjHBombkoya_c              */
 static int daObjHBombkoya_MoveBGDraw(daObjHBombkoya_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C1C910-80C1C930 -00001 0020+00 1/0 0/0 0/0 .data            daObjHBombkoya_METHODS */
 static actor_method_class daObjHBombkoya_METHODS = {
     (process_method_func)daObjHBombkoya_create1st,
     (process_method_func)daObjHBombkoya_MoveBGDelete,
@@ -289,7 +270,6 @@ static actor_method_class daObjHBombkoya_METHODS = {
     (process_method_func)daObjHBombkoya_MoveBGDraw,
 };
 
-/* 80C1C930-80C1C960 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_HBombkoya */
 extern actor_process_profile_definition g_profile_Obj_HBombkoya = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp
index df65c4fdaf..1fd6a8cbc3 100644
--- a/src/d/actor/d_a_obj_heavySw.cpp
+++ b/src/d/actor/d_a_obj_heavySw.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80C1CAEC-80C1CB80 0000EC 0094+00 1/1 0/0 0/0 .text            __ct__15daHeavySw_HIO_cFv */
 daHeavySw_HIO_c::daHeavySw_HIO_c() {
     field_0x04 = 150.0f;
     field_0x08 = 450.0f;
@@ -30,7 +29,6 @@ daHeavySw_HIO_c::daHeavySw_HIO_c() {
     field_0x34 = 4;
 }
 
-/* 80C1CBC8-80C1CC70 0001C8 00A8+00 2/2 0/0 0/0 .text            setBaseMtx__11daHeavySw_cFv */
 void daHeavySw_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y - field_0x5bc, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -39,7 +37,6 @@ void daHeavySw_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C1CC70-80C1CCDC 000270 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daHeavySw_cFv */
 int daHeavySw_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Hswitch", 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -49,7 +46,6 @@ int daHeavySw_c::CreateHeap() {
     return 0;
 }
 
-/* 80C1CCDC-80C1CEB0 0002DC 01D4+00 1/1 0/0 0/0 .text            create__11daHeavySw_cFv */
 int daHeavySw_c::create() {
     fopAcM_ct(this, daHeavySw_c);
 
@@ -84,8 +80,6 @@ int daHeavySw_c::create() {
     return phase;
 }
 
-/* 80C1CF90-80C1CFC0 000590 0030+00 1/1 0/0 0/0 .text
- * rideCallBack__11daHeavySw_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     if (fopAcM_GetName(param_2) == PROC_ALINK) {
         daHeavySw_c* heavySw = static_cast<daHeavySw_c*>(param_1);
@@ -95,7 +89,6 @@ void daHeavySw_c::rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* p
     }
 }
 
-/* 80C1CFC0-80C1D02C 0005C0 006C+00 1/0 0/0 0/0 .text            Execute__11daHeavySw_cFPPA3_A4_f */
 int daHeavySw_c::Execute(Mtx** i_mtx) {
     moveSwitch();
     mObjAcch.CrrPos(dComIfG_Bgsp());
@@ -105,10 +98,8 @@ int daHeavySw_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C1DC54-80C1DC8C 000014 0038+00 7/7 0/0 0/0 .bss             l_HIO */
 static daHeavySw_HIO_c l_HIO;
 
-/* 80C1D02C-80C1D274 00062C 0248+00 1/1 0/0 0/0 .text            moveSwitch__11daHeavySw_cFv */
 void daHeavySw_c::moveSwitch() {
     typedef void (daHeavySw_c::*modeProcessFunc)();
     static modeProcessFunc mode_proc[] = {
@@ -141,19 +132,16 @@ void daHeavySw_c::moveSwitch() {
     field_0x5c8++;
 }
 
-/* 80C1D274-80C1D280 000874 000C+00 2/2 0/0 0/0 .text            init_modeWait__11daHeavySw_cFv */
 void daHeavySw_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80C1D280-80C1D2AC 000880 002C+00 1/0 0/0 0/0 .text            modeWait__11daHeavySw_cFv */
 void daHeavySw_c::modeWait() {
     if (field_0x5d8 != 0) {
         init_modeRide();
     }
 }
 
-/* 80C1D2AC-80C1D2D8 0008AC 002C+00 3/3 0/0 0/0 .text            init_modeRide__11daHeavySw_cFv */
 void daHeavySw_c::init_modeRide() {
     field_0x5c4 = l_HIO.field_0x33;
     fopAcM_SetSpeedF(this, l_HIO.field_0x18);
@@ -161,7 +149,6 @@ void daHeavySw_c::init_modeRide() {
     mMode = MODE_RIDE;
 }
 
-/* 80C1D2D8-80C1D408 0008D8 0130+00 1/0 0/0 0/0 .text            modeRide__11daHeavySw_cFv */
 void daHeavySw_c::modeRide() {
     if (field_0x5c4 != 0) {
         field_0x5c4--;
@@ -182,8 +169,6 @@ void daHeavySw_c::modeRide() {
     }
 }
 
-/* 80C1D408-80C1D434 000A08 002C+00 1/1 0/0 0/0 .text            init_modeMoveInit__11daHeavySw_cFv
- */
 void daHeavySw_c::init_modeMoveInit() {
     fopAcM_SetSpeedF(this, l_HIO.field_0x20);
     field_0x5d4 = l_HIO.field_0x24;
@@ -191,7 +176,6 @@ void daHeavySw_c::init_modeMoveInit() {
     mMode = MODE_MOVE_INIT;
 }
 
-/* 80C1D434-80C1D54C 000A34 0118+00 1/0 0/0 0/0 .text            modeMoveInit__11daHeavySw_cFv */
 void daHeavySw_c::modeMoveInit() {
     if (field_0x5dc == 0) {
         init_modeRide();
@@ -213,7 +197,6 @@ void daHeavySw_c::modeMoveInit() {
     }
 }
 
-/* 80C1D54C-80C1D588 000B4C 003C+00 1/1 0/0 0/0 .text            init_modeMove__11daHeavySw_cFv */
 void daHeavySw_c::init_modeMove() {
     field_0x5b0 = l_HIO.field_0x0c;
     field_0x5c4 = l_HIO.field_0x30;
@@ -223,7 +206,6 @@ void daHeavySw_c::init_modeMove() {
     mMode = MODE_MOVE;
 }
 
-/* 80C1D588-80C1D688 000B88 0100+00 1/0 0/0 0/0 .text            modeMove__11daHeavySw_cFv */
 void daHeavySw_c::modeMove() {
     if (field_0x5dc == 0) {
         init_modeRide();
@@ -244,8 +226,6 @@ void daHeavySw_c::modeMove() {
     }
 }
 
-/* 80C1D688-80C1D788 000C88 0100+00 2/2 0/0 0/0 .text            init_modeMoveEnd__11daHeavySw_cFv
- */
 void daHeavySw_c::init_modeMoveEnd() {
     field_0x5c5 = 1;
     u8 param = fopAcM_GetParam(this);
@@ -258,7 +238,6 @@ void daHeavySw_c::init_modeMoveEnd() {
     mMode = MODE_MOVE_END;
 }
 
-/* 80C1D788-80C1D808 000D88 0080+00 1/0 0/0 0/0 .text            modeMoveEnd__11daHeavySw_cFv */
 void daHeavySw_c::modeMoveEnd() {
     if (field_0x5c4 != 0) {
         field_0x5c4--;
@@ -270,7 +249,6 @@ void daHeavySw_c::modeMoveEnd() {
     }
 }
 
-/* 80C1D808-80C1D91C 000E08 0114+00 1/0 0/0 0/0 .text            Draw__11daHeavySw_cFv */
 int daHeavySw_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -284,42 +262,33 @@ int daHeavySw_c::Draw() {
     return 1;
 }
 
-/* 80C1D91C-80C1D94C 000F1C 0030+00 1/0 0/0 0/0 .text            Delete__11daHeavySw_cFv */
 int daHeavySw_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "Hswitch");
     return 1;
 }
 
-/* 80C1D94C-80C1D978 000F4C 002C+00 1/0 0/0 0/0 .text            daHeavySw_Draw__FP11daHeavySw_c */
 static int daHeavySw_Draw(daHeavySw_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C1D978-80C1D998 000F78 0020+00 1/0 0/0 0/0 .text            daHeavySw_Execute__FP11daHeavySw_c
- */
 static int daHeavySw_Execute(daHeavySw_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C1D998-80C1D9B8 000F98 0020+00 1/0 0/0 0/0 .text            daHeavySw_Delete__FP11daHeavySw_c
- */
 static int daHeavySw_Delete(daHeavySw_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C1D9B8-80C1D9D8 000FB8 0020+00 1/0 0/0 0/0 .text            daHeavySw_Create__FP10fopAc_ac_c */
 static int daHeavySw_Create(fopAc_ac_c* i_this) {
     return static_cast<daHeavySw_c*>(i_this)->create();
 }
 
-/* 80C1DB80-80C1DBA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daHeavySw_Method */
 static actor_method_class l_daHeavySw_Method = {
     (process_method_func)daHeavySw_Create,  (process_method_func)daHeavySw_Delete,
     (process_method_func)daHeavySw_Execute, (process_method_func)NULL,
     (process_method_func)daHeavySw_Draw,
 };
 
-/* 80C1DBA0-80C1DBD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_HeavySw */
 extern actor_process_profile_definition g_profile_Obj_HeavySw = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp
index 487d93fa12..056cdc2909 100644
--- a/src/d/actor/d_a_obj_hfuta.cpp
+++ b/src/d/actor/d_a_obj_hfuta.cpp
@@ -9,13 +9,11 @@
 #include "d/d_com_inf_game.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80C1DD8C-80C1DDC8 0000EC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjFuta_cFv */
 void daObjFuta_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C1DDC8-80C1DE94 000128 00CC+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjFuta_cFv */
 void daObjFuta_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -27,7 +25,6 @@ void daObjFuta_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), (MtxP)&mBgMtx);
 }
 
-/* 80C1DE94-80C1DF2C 0001F4 0098+00 1/0 0/0 0/0 .text            Create__11daObjFuta_cFv */
 int daObjFuta_c::Create() {
         /* dSv_event_flag_c::F_0070 - Ordon Woods - Colin went deep into the woods */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[168])) {
@@ -43,10 +40,8 @@ int daObjFuta_c::Create() {
     return 1;
 }
 
-/* 80C1EEC4-80C1EEC8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_hfuta";
 
-/* 80C1DF2C-80C1DF9C 00028C 0070+00 1/0 0/0 0/0 .text            CreateHeap__11daObjFuta_cFv */
 int daObjFuta_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(204, modelData != NULL);
@@ -54,7 +49,6 @@ int daObjFuta_c::CreateHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* 80C1DF9C-80C1E020 0002FC 0084+00 1/1 0/0 0/0 .text            create1st__11daObjFuta_cFv */
 int daObjFuta_c::create1st() {
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -66,7 +60,6 @@ int daObjFuta_c::create1st() {
     return rv;
 }
 
-/* 80C1E020-80C1EAFC 000380 0ADC+00 1/0 0/0 0/0 .text            Execute__11daObjFuta_cFPPA3_A4_f */
 int daObjFuta_c::Execute(f32 (**mtx)[3][4]) {
     mode_proc_call();
     static const csXyz l_rot_data[43] = {
@@ -130,7 +123,6 @@ int daObjFuta_c::Execute(f32 (**mtx)[3][4]) {
     return 1;
 }
 
-/* 80C1EB38-80C1EBDC 000E98 00A4+00 1/1 0/0 0/0 .text            mode_proc_call__11daObjFuta_cFv */
 void daObjFuta_c::mode_proc_call() {
     static const modeFunc l_func[] = {
         &daObjFuta_c::mode_wait,
@@ -141,7 +133,6 @@ void daObjFuta_c::mode_proc_call() {
     (this->*(l_func[mMode]))();
 }
 
-/* 80C1EBDC-80C1EC44 000F3C 0068+00 2/1 0/0 0/0 .text            mode_wait__11daObjFuta_cFv */
 void daObjFuta_c::mode_wait() {
     mTransM = cXyz::Zero;
     mZXYRotationM = csXyz::Zero;
@@ -153,7 +144,6 @@ void daObjFuta_c::mode_wait() {
     }
 }
 
-/* 80C1EC44-80C1ECB4 000FA4 0070+00 1/0 0/0 0/0 .text            mode_move__11daObjFuta_cFv */
 void daObjFuta_c::mode_move() {
     if (mRotationIndex > 12) {
         if (cLib_addCalc(&mTransM.x, 120.0f, 0.1f, 5.0f, 2.0f) == 0.0f)
@@ -163,12 +153,10 @@ void daObjFuta_c::mode_move() {
     }
 }
 
-/* 80C1ECB4-80C1ECC4 001014 0010+00 2/1 0/0 0/0 .text            mode_end__11daObjFuta_cFv */
 void daObjFuta_c::mode_end() {
     mTransM.x = 120.0f;
 }
 
-/* 80C1ECC4-80C1ED68 001024 00A4+00 1/0 0/0 0/0 .text            Draw__11daObjFuta_cFv */
 int daObjFuta_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -178,35 +166,28 @@ int daObjFuta_c::Draw() {
     return 1;
 }
 
-/* 80C1ED68-80C1ED9C 0010C8 0034+00 1/0 0/0 0/0 .text            Delete__11daObjFuta_cFv */
 int daObjFuta_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C1ED9C-80C1EDFC 0010FC 0060+00 1/0 0/0 0/0 .text daObjFuta_create1st__FP11daObjFuta_c */
 static int daObjFuta_create1st(daObjFuta_c* i_this) {
     fopAcM_ct(i_this, daObjFuta_c);
     return i_this->create1st();
 }
 
-/* 80C1EDFC-80C1EE1C 00115C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDelete__FP11daObjFuta_c */
 static int daObjFuta_MoveBGDelete(daObjFuta_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C1EE1C-80C1EE3C 00117C 0020+00 1/0 0/0 0/0 .text daObjFuta_MoveBGExecute__FP11daObjFuta_c */
 static int daObjFuta_MoveBGExecute(daObjFuta_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C1EE3C-80C1EE68 00119C 002C+00 1/0 0/0 0/0 .text daObjFuta_MoveBGDraw__FP11daObjFuta_c */
 static int daObjFuta_MoveBGDraw(daObjFuta_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80C1EF10-80C1EF30 -00001 0020+00 1/0 0/0 0/0 .data            daObjFuta_METHODS */
 static actor_method_class daObjFuta_METHODS = {
     (process_method_func)daObjFuta_create1st,
     (process_method_func)daObjFuta_MoveBGDelete,
@@ -215,7 +196,6 @@ static actor_method_class daObjFuta_METHODS = {
     (process_method_func)daObjFuta_MoveBGDraw,
 };
 
-/* 80C1EF30-80C1EF60 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Hfuta */
 extern actor_process_profile_definition g_profile_Obj_Hfuta = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp
index feb8095e5c..923a498c17 100644
--- a/src/d/actor/d_a_obj_hhashi.cpp
+++ b/src/d/actor/d_a_obj_hhashi.cpp
@@ -16,8 +16,6 @@
 #include "m_Do/m_Do_lib.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 8057F9B8-8057FA18 000078 0060+00 1/1 0/0 0/0 .text            initCcCylinder__13daObjHHASHI_cFv
- */
 void daObjHHASHI_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -39,27 +37,21 @@ void daObjHHASHI_c::initCcCylinder() {
     mCyl.SetC(current.pos);
 }
 
-/* 8057FA18-8057FA4C 0000D8 0034+00 1/1 0/0 0/0 .text            setCcCylinder__13daObjHHASHI_cFv */
 void daObjHHASHI_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 8057FA4C-8057FA6C 00010C 0020+00 1/0 0/0 0/0 .text            daObjHHASHI_Create__FP10fopAc_ac_c
- */
 static int daObjHHASHI_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjHHASHI_c*>(i_this)->create();
 }
 
-/* 8057FA6C-8057FA90 00012C 0024+00 1/0 0/0 0/0 .text daObjHHASHI_Delete__FP13daObjHHASHI_c */
 static int daObjHHASHI_Delete(daObjHHASHI_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 8057FA90-8057FD30 000150 02A0+00 1/1 0/0 0/0 .text            Set_Hahen__13daObjHHASHI_cFP4cXyz
- */
 void daObjHHASHI_c::Set_Hahen(cXyz* param_1) {
     csXyz cStack_38(0, 0, 0);
     fopAcM_seStartCurrent(this, Z2SE_OBJ_FM_BREAK_PILLAR, 0);
@@ -83,8 +75,6 @@ void daObjHHASHI_c::Set_Hahen(cXyz* param_1) {
     }
 }
 
-/* 8057FDA8-805801B0 000468 0408+00 1/1 0/0 0/0 .text            Set_Speed__13daObjHHASHI_cFssffff
- */
 void daObjHHASHI_c::Set_Speed(s16 param_1, s16 param_2, f32 param_3, f32 param_4, f32 param_5,
                                   f32 param_6) {
     csXyz cStack_f0;
@@ -125,7 +115,6 @@ void daObjHHASHI_c::Set_Speed(s16 param_1, s16 param_2, f32 param_3, f32 param_4
     }
 }
 
-/* 805801B0-80580358 000870 01A8+00 1/1 0/0 0/0 .text            Obj_Damage__13daObjHHASHI_cFv */
 void daObjHHASHI_c::Obj_Damage() {
     if (field_0xf46 == 0) {
         mStts.Move();
@@ -160,7 +149,6 @@ void daObjHHASHI_c::Obj_Damage() {
     }
 }
 
-/* 80580358-8058043C 000A18 00E4+00 1/1 0/0 0/0 .text            Wall_Check__13daObjHHASHI_cFs */
 void daObjHHASHI_c::Wall_Check(s16 idx) {
     dBgS_LinChk linChk;
     cXyz cStack_8c(
@@ -176,7 +164,6 @@ void daObjHHASHI_c::Wall_Check(s16 idx) {
     }
 }
 
-/* 8058043C-805805F4 000AFC 01B8+00 1/1 0/0 0/0 .text            Hahen_Motion__13daObjHHASHI_cFs */
 void daObjHHASHI_c::Hahen_Motion(s16 param_1) {
     if (field_0xf14[param_1] != 1) {
         f32 dVar6 = 5.0f;
@@ -208,7 +195,6 @@ void daObjHHASHI_c::Hahen_Motion(s16 param_1) {
     }
 }
 
-/* 805805F4-805807C4 000CB4 01D0+00 1/1 0/0 0/0 .text            CheckCull__13daObjHHASHI_cFv */
 void daObjHHASHI_c::CheckCull() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& playerPos = fopAcM_GetPosition(player);
@@ -224,7 +210,6 @@ void daObjHHASHI_c::CheckCull() {
     }
 }
 
-/* 805807C4-80580854 000E84 0090+00 1/1 0/0 0/0 .text            checkViewArea__13daObjHHASHI_cFi */
 bool daObjHHASHI_c::checkViewArea(int param_1) {
     Vec local_20;
     mDoLib_project(&field_0x5b0[param_1], &local_20);
@@ -235,8 +220,6 @@ bool daObjHHASHI_c::checkViewArea(int param_1) {
     return rv;
 }
 
-/* 80580854-80580A48 000F14 01F4+00 0/0 0/0 1/1 .text            Rolling__13daObjHHASHI_cFP4cXyzffSc
- */
 void daObjHHASHI_c::Rolling(cXyz* param_1, f32 param_2, f32 param_3, s8 param_4) {
     field_0x5a8 = param_4;
     if (field_0x5a4 == 2) {
@@ -249,8 +232,6 @@ void daObjHHASHI_c::Rolling(cXyz* param_1, f32 param_2, f32 param_3, s8 param_4)
     }
 }
 
-/* 80580A48-80580C80 001108 0238+00 1/1 0/0 0/0 .text            Roll_Set__13daObjHHASHI_cFP4cXyzfs
- */
 void daObjHHASHI_c::Roll_Set(cXyz* param_1, f32 param_2, s16 idx) {
     f32 dVar10 = (param_2 * (0.7f + cM_rndFX(0.2f)));
     s16 angleY = cLib_targetAngleY(&field_0x5b0[idx], param_1);
@@ -265,7 +246,6 @@ void daObjHHASHI_c::Roll_Set(cXyz* param_1, f32 param_2, s16 idx) {
     field_0xcbc[idx].y += 0x1000;
 }
 
-/* 80580C80-80580D58 001340 00D8+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjHHASHI_cFv */
 void daObjHHASHI_c::setBaseMtx() {
     if (field_0x5a4 == 2) {
         for (s16 i = 0; i < 50; i++) {
@@ -282,21 +262,16 @@ void daObjHHASHI_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), (MtxP)&mBgMtx);
 }
 
-/* 80580D58-80580D84 001418 002C+00 1/0 0/0 0/0 .text            daObjHHASHI_Draw__FP13daObjHHASHI_c
- */
 static int daObjHHASHI_Draw(daObjHHASHI_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80580D84-80580DA4 001444 0020+00 2/1 0/0 0/0 .text daObjHHASHI_Execute__FP13daObjHHASHI_c */
 static int daObjHHASHI_Execute(daObjHHASHI_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 805815E4-805815E8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "L_hhashi";
 
-/* 80580DA4-80580EA0 001464 00FC+00 1/0 0/0 0/0 .text            CreateHeap__13daObjHHASHI_cFv */
 int daObjHHASHI_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi00.bmd");
     JUT_ASSERT(90, modelData != NULL);
@@ -312,7 +287,6 @@ int daObjHHASHI_c::CreateHeap() {
     return mModel != 0 ? TRUE : FALSE;
 }
 
-/* 80580EA0-8058112C 001560 028C+00 1/1 0/0 0/0 .text            create__13daObjHHASHI_cFv */
 int daObjHHASHI_c::create() {
     fopAcM_ct(this, daObjHHASHI_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -335,19 +309,15 @@ int daObjHHASHI_c::create() {
     return rv;
 }
 
-/* 805811C4-805811CC 001884 0008+00 1/0 0/0 0/0 .text daObjHHASHI_IsDelete__FP13daObjHHASHI_c */
 static int daObjHHASHI_IsDelete(daObjHHASHI_c* param_0) {
     return 1;
 }
 
-/* 805811CC-80581210 00188C 0044+00 1/0 0/0 0/0 .text            Create__13daObjHHASHI_cFv */
 int daObjHHASHI_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80581210-805812BC 0018D0 00AC+00 1/0 0/0 0/0 .text            Execute__13daObjHHASHI_cFPPA3_A4_f
- */
 int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) {
     Obj_Damage();
     if (field_0x5a4 == 2) {
@@ -367,7 +337,6 @@ int daObjHHASHI_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 805812BC-8058140C 00197C 0150+00 1/0 0/0 0/0 .text            Draw__13daObjHHASHI_cFv */
 int daObjHHASHI_c::Draw() {
     if (dComIfGp_event_runCheck()) {
         camera_class* pCamera = dComIfGp_getCamera(0);
@@ -393,7 +362,6 @@ int daObjHHASHI_c::Draw() {
     return 1;
 }
 
-/* 8058140C-805814A4 001ACC 0098+00 1/0 0/0 0/0 .text            Delete__13daObjHHASHI_cFv */
 int daObjHHASHI_c::Delete() {
     if (field_0x1199 != 0) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd");
@@ -403,7 +371,6 @@ int daObjHHASHI_c::Delete() {
     return 1;
 }
 
-/* 805815E8-80581608 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjHHASHI_Method */
 static actor_method_class l_daObjHHASHI_Method = {
     (process_method_func)daObjHHASHI_Create,
     (process_method_func)daObjHHASHI_Delete,
@@ -412,7 +379,6 @@ static actor_method_class l_daObjHHASHI_Method = {
     (process_method_func)daObjHHASHI_Draw,
 };
 
-/* 80581608-80581638 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_HHASHI */
 extern actor_process_profile_definition g_profile_Obj_HHASHI = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp
index 672c0c146b..ad894c4975 100644
--- a/src/d/actor/d_a_obj_hsTarget.cpp
+++ b/src/d/actor/d_a_obj_hsTarget.cpp
@@ -11,10 +11,8 @@
 
 static const char* l_resNameIdx[2] = {"hsMato", "L7HsMato"};
 
-/* 80C1F42C-80C1F448 0000EC 001C+00 1/1 0/0 0/0 .text            __ct__16daHsTarget_HIO_cFv */
 daHsTarget_HIO_c::daHsTarget_HIO_c() {}
 
-/* 80C1F490-80C1F518 000150 0088+00 1/1 0/0 0/0 .text            setBaseMtx__12daHsTarget_cFv */
 void daHsTarget_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -22,10 +20,8 @@ void daHsTarget_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C1F8A0-80C1F8A8 000000 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static const u32 l_bmdIdx[2] = {4, 4};
 
-/* 80C1F518-80C1F598 0001D8 0080+00 1/0 0/0 0/0 .text            CreateHeap__12daHsTarget_cFv */
 int daHsTarget_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create(
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mIndex], l_bmdIdx[mIndex]),
@@ -33,10 +29,8 @@ int daHsTarget_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80C1F8A8-80C1F8B0 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static const u32 l_dzbIdx[2] = {7, 7};
 
-/* 80C1F598-80C1F6B0 000258 0118+00 1/1 0/0 0/0 .text            create__12daHsTarget_cFv */
 int daHsTarget_c::create() {
     fopAcM_ct(this, daHsTarget_c);
 
@@ -59,14 +53,11 @@ int daHsTarget_c::create() {
     return phase;
 }
 
-/* 80C1F6B0-80C1F6C4 000370 0014+00 1/0 0/0 0/0 .text            Execute__12daHsTarget_cFPPA3_A4_f
- */
 int daHsTarget_c::Execute(Mtx** param_0) {
     *param_0 = &mpModel->getBaseTRMtx();
     return 1;
 }
 
-/* 80C1F6C4-80C1F728 000384 0064+00 1/0 0/0 0/0 .text            Draw__12daHsTarget_cFv */
 int daHsTarget_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -74,46 +65,35 @@ int daHsTarget_c::Draw() {
     return 1;
 }
 
-/* 80C1F728-80C1F768 0003E8 0040+00 1/0 0/0 0/0 .text            Delete__12daHsTarget_cFv */
 int daHsTarget_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_resNameIdx[mIndex]);
     return 1;
 }
 
-/* 80C1F768-80C1F794 000428 002C+00 1/0 0/0 0/0 .text            daHsTarget_Draw__FP12daHsTarget_c
- */
 static int daHsTarget_Draw(daHsTarget_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDraw();
 }
 
-/* 80C1F794-80C1F7B4 000454 0020+00 1/0 0/0 0/0 .text daHsTarget_Execute__FP12daHsTarget_c */
 static int daHsTarget_Execute(daHsTarget_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80C1F7B4-80C1F7D4 000474 0020+00 1/0 0/0 0/0 .text            daHsTarget_Delete__FP12daHsTarget_c
- */
 static int daHsTarget_Delete(daHsTarget_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
 }
 
-/* 80C1F7D4-80C1F7F4 000494 0020+00 1/0 0/0 0/0 .text            daHsTarget_Create__FP10fopAc_ac_c
- */
 static int daHsTarget_Create(fopAc_ac_c* i_this) {
     return static_cast<daHsTarget_c*>(i_this)->create();
 }
 
-/* 80C1F96C-80C1F970 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daHsTarget_HIO_c l_HIO;
 
-/* 80C1F8C8-80C1F8E8 -00001 0020+00 1/0 0/0 0/0 .data            l_daHsTarget_Method */
 static actor_method_class l_daHsTarget_Method = {
     (process_method_func)daHsTarget_Create,  (process_method_func)daHsTarget_Delete,
     (process_method_func)daHsTarget_Execute, (process_method_func)NULL,
     (process_method_func)daHsTarget_Draw,
 };
 
-/* 80C1F8E8-80C1F918 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_HsTarget */
 extern actor_process_profile_definition g_profile_Obj_HsTarget = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp
index 4a264cedd0..c210405bc5 100644
--- a/src/d/actor/d_a_obj_ice_l.cpp
+++ b/src/d/actor/d_a_obj_ice_l.cpp
@@ -18,14 +18,10 @@ f32 dummyLiteral() {
     return 0.0f;
 }
 
-/* 80C1F9F8-80C1FA60 000078 0068+00 1/1 0/0 0/0 .text            RideOn_Angle__12daObjIce_l_cFRsfsf
- */
 void daObjIce_l_c::RideOn_Angle(s16& i_angle, f32 param_1, s16 param_2, f32 param_3) {
     cLib_addCalcAngleS(&i_angle, param_2 * (param_1 / param_3), 1, 0x100, 1);
 }
 
-/* 80C1FA60-80C1FCCC 0000E0 026C+00 1/1 0/0 0/0 .text            Check_RideOn__12daObjIce_l_cF4cXyz
- */
 int daObjIce_l_c::Check_RideOn(cXyz param_0) {
     fopAc_ac_c* player_p = (fopAc_ac_c*)daPy_getPlayerActorClass();
     f32 player_speed = 0.0f;
@@ -56,13 +52,11 @@ int daObjIce_l_c::Check_RideOn(cXyz param_0) {
     return 0;
 }
 
-/* 80C1FCCC-80C1FCF8 00034C 002C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjIce_l_cFv */
 void daObjIce_l_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C1FCF8-80C1FD5C 000378 0064+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjIce_l_cFv */
 void daObjIce_l_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -72,8 +66,6 @@ void daObjIce_l_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C1FD5C-80C20034 0003DC 02D8+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     cXyz* ball_pos = player_p->getIronBallCenterPos();
@@ -113,39 +105,29 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2
     }
 }
 
-/* 80C20034-80C20060 0006B4 002C+00 1/0 0/0 0/0 .text            daObjIce_l_Draw__FP12daObjIce_l_c
- */
 static int daObjIce_l_Draw(daObjIce_l_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C20060-80C20080 0006E0 0020+00 1/0 0/0 0/0 .text daObjIce_l_Execute__FP12daObjIce_l_c */
 static int daObjIce_l_Execute(daObjIce_l_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C20080-80C20088 000700 0008+00 1/0 0/0 0/0 .text daObjIce_l_IsDelete__FP12daObjIce_l_c */
 static int daObjIce_l_IsDelete(daObjIce_l_c* i_this) {
     return 1;
 }
 
-/* 80C20088-80C200AC 000708 0024+00 1/0 0/0 0/0 .text            daObjIce_l_Delete__FP12daObjIce_l_c
- */
 static int daObjIce_l_Delete(daObjIce_l_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80C200AC-80C200CC 00072C 0020+00 1/0 0/0 0/0 .text            daObjIce_l_Create__FP10fopAc_ac_c
- */
 static int daObjIce_l_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjIce_l_c*>(i_this)->create();
 }
 
-/* 80C20838-80C2083C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_Ice_l";
 
-/* 80C200CC-80C2030C 00074C 0240+00 1/1 0/0 0/0 .text            create__12daObjIce_l_cFv */
 int daObjIce_l_c::create() {
     fopAcM_ct(this, daObjIce_l_c);
 
@@ -194,7 +176,6 @@ int daObjIce_l_c::create() {
 }
 
 
-/* 80C2030C-80C20384 00098C 0078+00 1/0 0/0 0/0 .text            CreateHeap__12daObjIce_l_cFv */
 int daObjIce_l_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Ice_l.bmd");
     JUT_ASSERT(82, modelData != NULL);
@@ -207,15 +188,12 @@ int daObjIce_l_c::CreateHeap() {
     return 1;
 }
 
-/* 80C20384-80C203C4 000A04 0040+00 1/0 0/0 0/0 .text            Create__12daObjIce_l_cFv */
 int daObjIce_l_c::Create() {
     initBaseMtx();
     mpBgW->SetRideCallback(rideCallBack);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C203C4-80C206AC 000A44 02E8+00 1/0 0/0 0/0 .text            Execute__12daObjIce_l_cFPPA3_A4_f
- */
 int daObjIce_l_c::Execute(Mtx** param_0) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     cXyz& pos = fopAcM_GetPosition(player_p);
@@ -253,7 +231,6 @@ int daObjIce_l_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C206AC-80C20750 000D2C 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjIce_l_cFv */
 int daObjIce_l_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -264,13 +241,11 @@ int daObjIce_l_c::Draw() {
     return 1;
 }
 
-/* 80C20750-80C20784 000DD0 0034+00 1/0 0/0 0/0 .text            Delete__12daObjIce_l_cFv */
 int daObjIce_l_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C2083C-80C2085C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIce_l_Method */
 static actor_method_class l_daObjIce_l_Method = {
     (process_method_func)daObjIce_l_Create,
     (process_method_func)daObjIce_l_Delete,
@@ -279,7 +254,6 @@ static actor_method_class l_daObjIce_l_Method = {
     (process_method_func)daObjIce_l_Draw,
 };
 
-/* 80C2085C-80C2088C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ice_l */
 extern actor_process_profile_definition g_profile_Obj_Ice_l = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp
index 2283dbccae..57e0924c33 100644
--- a/src/d/actor/d_a_obj_ice_s.cpp
+++ b/src/d/actor/d_a_obj_ice_s.cpp
@@ -14,10 +14,8 @@
 #include "SSystem/SComponent/c_math.h"
 #include <cmath.h>
 
-/* 80C21BA8-80C21BAC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_Ice_s";
 
-/* 80C209AC-80C209DC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__17daOBJ_ICE_S_HIO_cFv */
 daOBJ_ICE_S_HIO_c::daOBJ_ICE_S_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 5000.0f;
@@ -26,19 +24,14 @@ daOBJ_ICE_S_HIO_c::daOBJ_ICE_S_HIO_c() {
 
 f32 dummyLiteral() { return 0.0f; }
 
-/* 80C209DC-80C20A44 00011C 0068+00 2/2 0/0 0/0 .text            RideOn_Angle__12daObjIce_s_cFRsfsf
- */
 void daObjIce_s_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) {
     cLib_addCalcAngleS(&param_1, param_3 * (param_2 / param_4), 5, 0x100, 1);
 }
 
-/* 80C21C38-80C21C3C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80C21C48-80C21C58 000018 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daOBJ_ICE_S_HIO_c l_HIO;
 
-/* 80C20A44-80C20C98 000184 0254+00 1/1 0/0 0/0 .text Check_LinkRideOn__12daObjIce_s_cF4cXyz */
 bool daObjIce_s_c::Check_LinkRideOn(cXyz param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 speedF = 0.0f;
@@ -66,8 +59,6 @@ bool daObjIce_s_c::Check_LinkRideOn(cXyz param_1) {
     return false;
 }
 
-/* 80C20C98-80C20EC0 0003D8 0228+00 1/1 0/0 0/0 .text            Check_RideOn__12daObjIce_s_cF4cXyz
- */
 bool daObjIce_s_c::Check_RideOn(cXyz param_1) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 var_f27 = 0.0f;
@@ -90,13 +81,11 @@ bool daObjIce_s_c::Check_RideOn(cXyz param_1) {
     return false;
 }
 
-/* 80C20EC0-80C20EEC 000600 002C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjIce_s_cFv */
 void daObjIce_s_c::initBaseMtx() {
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C20EEC-80C20F48 00062C 005C+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjIce_s_cFv */
 void daObjIce_s_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -104,8 +93,6 @@ void daObjIce_s_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C20F48-80C21234 000688 02EC+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 // NONMATCHING - regalloc, equivalent
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     (void)param_1;
@@ -147,38 +134,29 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3
     }
 }
 
-/* 80C21234-80C21260 000974 002C+00 1/0 0/0 0/0 .text            daObjIce_s_Draw__FP12daObjIce_s_c
- */
 static int daObjIce_s_Draw(daObjIce_s_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C21260-80C21280 0009A0 0020+00 1/0 0/0 0/0 .text daObjIce_s_Execute__FP12daObjIce_s_c */
 static int daObjIce_s_Execute(daObjIce_s_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C21280-80C21288 0009C0 0008+00 1/0 0/0 0/0 .text daObjIce_s_IsDelete__FP12daObjIce_s_c */
 static int daObjIce_s_IsDelete(daObjIce_s_c* param_0) {
     return 1;
 }
 
-/* 80C21288-80C212AC 0009C8 0024+00 1/0 0/0 0/0 .text            daObjIce_s_Delete__FP12daObjIce_s_c
- */
 static int daObjIce_s_Delete(daObjIce_s_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80C212AC-80C212CC 0009EC 0020+00 1/0 0/0 0/0 .text            daObjIce_s_Create__FP10fopAc_ac_c
- */
 static int daObjIce_s_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjIce_s_c*>(i_this)->create();
 }
 
-/* 80C212CC-80C2157C 000A0C 02B0+00 1/1 0/0 0/0 .text            create__12daObjIce_s_cFv */
 int daObjIce_s_c::create() {
     fopAcM_ct(this, daObjIce_s_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -225,7 +203,6 @@ int daObjIce_s_c::create() {
     return rv;
 }
 
-/* 80C2157C-80C215F4 000CBC 0078+00 1/0 0/0 0/0 .text            CreateHeap__12daObjIce_s_cFv */
 int daObjIce_s_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Ice_s.bmd");
     JUT_ASSERT(157, modelData != NULL);
@@ -233,15 +210,12 @@ int daObjIce_s_c::CreateHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* 80C215F4-80C21634 000D34 0040+00 1/0 0/0 0/0 .text            Create__12daObjIce_s_cFv */
 int daObjIce_s_c::Create() {
     initBaseMtx();
     mpBgW->SetRideCallback(rideCallBack);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C21634-80C21964 000D74 0330+00 1/0 0/0 0/0 .text            Execute__12daObjIce_s_cFPPA3_A4_f
- */
 int daObjIce_s_c::Execute(f32 (**param_1)[3][4]) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_GetPosition(player);
@@ -271,7 +245,6 @@ int daObjIce_s_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 80C21964-80C21A08 0010A4 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjIce_s_cFv */
 int daObjIce_s_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -281,7 +254,6 @@ int daObjIce_s_c::Draw() {
     return 1;
 }
 
-/* 80C21A08-80C21A60 001148 0058+00 1/0 0/0 0/0 .text            Delete__12daObjIce_s_cFv */
 int daObjIce_s_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     if (field_0x640 != 0) {
@@ -291,7 +263,6 @@ int daObjIce_s_c::Delete() {
 }
 
 
-/* 80C21BAC-80C21BCC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIce_s_Method */
 static actor_method_class l_daObjIce_s_Method = {
     (process_method_func)daObjIce_s_Create,
     (process_method_func)daObjIce_s_Delete,
@@ -300,7 +271,6 @@ static actor_method_class l_daObjIce_s_Method = {
     (process_method_func)daObjIce_s_Draw,
 };
 
-/* 80C21BCC-80C21BFC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ice_s */
 extern actor_process_profile_definition g_profile_Obj_Ice_s = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp
index ce75530929..e117a6fc2a 100644
--- a/src/d/actor/d_a_obj_iceblock.cpp
+++ b/src/d/actor/d_a_obj_iceblock.cpp
@@ -25,8 +25,6 @@ enum WALK_TYPE {
     WALK_IRON_BALL_HIT,
 };
 
-/* 80C21CD8-80C21DAC 000078 00D4+00 1/1 0/0 0/0 .text
- * PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle,
                                dBgW_Base::PushPullLabel i_label) {
     bool temp_r3 = cLib_checkBit<u8>(i_label, dBgW::PPLABEL_PUSH) != 0;
@@ -58,15 +56,12 @@ void daObjIceBlk_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s
     ((daObjIceBlk_c*)i_bgActor)->mPPLabel = i_label;
 }
 
-/* 80C21DAC-80C21DC4 00014C 0018+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
         ((daObjIceBlk_c*)i_bgActor)->mIsPlayerRide = true;
     }
 }
 
-/* 80C21DC4-80C21E24 000164 0060+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjIceBlk_cFv */
 void daObjIceBlk_c::initBaseMtx() {
     if (mpIceModel != NULL) {
         mpIceModel->setBaseScale(scale);
@@ -76,7 +71,6 @@ void daObjIceBlk_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C21E24-80C21EA4 0001C4 0080+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjIceBlk_cFv */
 void daObjIceBlk_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -89,7 +83,6 @@ void daObjIceBlk_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C21EA4-80C21F2C 000244 0088+00 1/1 0/0 0/0 .text            getPointNo__13daObjIceBlk_cFv */
 u16 daObjIceBlk_c::getPointNo() {
     u16 point_no = 0;
 
@@ -102,8 +95,6 @@ u16 daObjIceBlk_c::getPointNo() {
     return point_no;
 }
 
-/* 80C21F2C-80C21FC8 0002CC 009C+00 1/1 0/0 0/0 .text            loadCurrentPos__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::loadCurrentPos() {
     if (mpPath != NULL) {
         u16 point_no = getPointNo();
@@ -116,7 +107,6 @@ void daObjIceBlk_c::loadCurrentPos() {
     }
 }
 
-/* 80C242F4-80C24324 000000 0030+00 8/8 0/0 0/0 .rodata          l_dir_vec */
 static const Vec l_dir_vec[4] = {
     {0.0f, 0.0f, 1.0f},
     {1.0f, 0.0f, 0.0f},
@@ -124,10 +114,8 @@ static const Vec l_dir_vec[4] = {
     {-1.0f, 0.0f, 0.0f},
 };
 
-/* 80C24324-80C2432C 000030 0008+00 1/3 0/0 0/0 .rodata          l_dir_angle */
 static const s16 l_dir_angle[4] = {0x0000, 0x4000, 0x8000, 0xC000};
 
-/* 80C2432C-80C24370 000038 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x400000, 0x11}, 0x0}},  // mObj
@@ -142,8 +130,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     }  // mCyl
 };
 
-/* 80C21FC8-80C22200 000368 0238+00 2/2 0/0 0/0 .text            saveCurrentPos__13daObjIceBlk_cFv
- */
 int daObjIceBlk_c::saveCurrentPos() {
     int current_pos = -1;
 
@@ -198,26 +184,20 @@ int daObjIceBlk_c::saveCurrentPos() {
     return current_pos;
 }
 
-/* 80C22200-80C2224C 0005A0 004C+00 1/1 0/0 0/0 .text            enablePushPull__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::enablePushPull() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         mpBgW->OnPushPullOk();
     }
 }
 
-/* 80C2224C-80C22298 0005EC 004C+00 2/2 0/0 0/0 .text            disablePushPull__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::disablePushPull() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         mpBgW->OffPushPullOk();
     }
 }
 
-/* 80C244F0-80C244F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Y_icecube";
 
-/* 80C22298-80C22618 000638 0380+00 1/0 0/0 0/0 .text            Create__13daObjIceBlk_cFv */
 int daObjIceBlk_c::Create() {
     mpPath = dPath_GetRoomPath(getPathId(), fopAcM_GetRoomNo(this));
     mSwbit = getSwbit();
@@ -318,7 +298,6 @@ int daObjIceBlk_c::Create() {
     return 1;
 }
 
-/* 80C22618-80C227F4 0009B8 01DC+00 1/0 0/0 0/0 .text            CreateHeap__13daObjIceBlk_cFv */
 int daObjIceBlk_c::CreateHeap() {
     static const int l_bmd[] = {5, 8};
 
@@ -361,7 +340,6 @@ int daObjIceBlk_c::CreateHeap() {
     return 1;
 }
 
-/* 80C227F4-80C228B4 000B94 00C0+00 1/1 0/0 0/0 .text            create1st__13daObjIceBlk_cFv */
 int daObjIceBlk_c::create1st() {
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -379,8 +357,6 @@ int daObjIceBlk_c::create1st() {
     return phase;
 }
 
-/* 80C228B4-80C2294C 000C54 0098+00 1/0 0/0 0/0 .text            Execute__13daObjIceBlk_cFPPA3_A4_f
- */
 int daObjIceBlk_c::Execute(Mtx** param_0) {
     mode_proc_call();
     event_proc_call();
@@ -397,7 +373,6 @@ int daObjIceBlk_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C2294C-80C22B04 000CEC 01B8+00 1/1 0/0 0/0 .text            checkWalk__13daObjIceBlk_cFv */
 int daObjIceBlk_c::checkWalk() {
     int push_dir = -1;
 
@@ -441,15 +416,12 @@ int daObjIceBlk_c::checkWalk() {
     return push_dir;
 }
 
-/* 80C22B04-80C22B28 000EA4 0024+00 3/3 0/0 0/0 .text            clrCounter__13daObjIceBlk_cFv */
 void daObjIceBlk_c::clrCounter() {
     for (int i = 0; i < 4; i++) {
         mCounter[i] = 0;
     }
 }
 
-/* 80C22B28-80C22EF8 000EC8 03D0+00 1/1 0/0 0/0 .text            mode_proc_call__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::mode_proc_call() {
     typedef void (daObjIceBlk_c::*modeProc)(void);
     static modeProc l_func[] = {&mode_proc_wait, &mode_proc_walk};
@@ -515,8 +487,6 @@ void daObjIceBlk_c::mode_proc_call() {
     }
 }
 
-/* 80C22EF8-80C22F74 001298 007C+00 2/2 0/0 0/0 .text            mode_init_wait__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::mode_init_wait() {
     int current_pos = saveCurrentPos();
     if (current_pos - 1 == getCorrectPointNo()) {
@@ -537,8 +507,6 @@ void daObjIceBlk_c::mode_init_wait() {
     mMode = MODE_PROC_WAIT_e;
 }
 
-/* 80C22F74-80C23058 001314 00E4+00 1/0 0/0 0/0 .text            mode_proc_wait__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::mode_proc_wait() {
     int push_dir = checkWalk();
     if (push_dir != -1) {
@@ -556,16 +524,12 @@ void daObjIceBlk_c::mode_proc_wait() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80C23058-80C23088 0013F8 0030+00 1/1 0/0 0/0 .text            mode_init_walk__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::mode_init_walk() {
     fopAcM_SetGravity(this, -6.0f);
     mWalkInitPos = current.pos;
     mMode = MODE_PROC_WALK_e;
 }
 
-/* 80C23088-80C23388 001428 0300+00 1/0 0/0 0/0 .text            mode_proc_walk__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::mode_proc_walk() {
     if (mWalkType == WALK_PUSH) {
         cLib_addCalc(&speedF, 21.0f, 0.05f, 1.0f, 0.01f);
@@ -607,7 +571,6 @@ void daObjIceBlk_c::mode_proc_walk() {
     clrCounter();
 }
 
-/* 80C23388-80C2350C 001728 0184+00 1/1 0/0 0/0 .text            setEffect__13daObjIceBlk_cFv */
 void daObjIceBlk_c::setEffect() {
     static const u16 l_eff_break_b[] = {0x8679, 0x867A};
     static const u16 l_eff_break_id[] = {0x8ADF, 0x8AE0};
@@ -630,7 +593,6 @@ void daObjIceBlk_c::setEffect() {
     }
 }
 
-/* 80C2350C-80C236C8 0018AC 01BC+00 2/2 0/0 0/0 .text            checkWallPre__13daObjIceBlk_cFs */
 int daObjIceBlk_c::checkWallPre(s16 i_angle) {
     dBgS_ObjLinChk linchk;
     cXyz start;
@@ -669,7 +631,6 @@ int daObjIceBlk_c::checkWallPre(s16 i_angle) {
     return var_r29;
 }
 
-/* 80C236C8-80C237B0 001A68 00E8+00 2/2 0/0 0/0 .text            checkBgHit__13daObjIceBlk_cFv */
 int daObjIceBlk_c::checkBgHit() {
     cXyz check_pos;
     mGroundY = -G_CM3D_F_INF;
@@ -698,7 +659,6 @@ int daObjIceBlk_c::checkBgHit() {
     return var_r29;
 }
 
-/* 80C237B0-80C23860 001B50 00B0+00 1/1 0/0 0/0 .text            bgCheck__13daObjIceBlk_cFv */
 void daObjIceBlk_c::bgCheck() {
     State_e prev_state = mState;
     mState = STATE_0_e;
@@ -725,7 +685,6 @@ void daObjIceBlk_c::bgCheck() {
     }
 }
 
-/* 80C23860-80C238B0 001C00 0050+00 1/1 0/0 0/0 .text            init_bgCheck__13daObjIceBlk_cFv */
 void daObjIceBlk_c::init_bgCheck() {
     if (checkBgHit() >= 0) {
         current.pos.y = mGroundY;
@@ -737,7 +696,6 @@ void daObjIceBlk_c::init_bgCheck() {
     }
 }
 
-/* 80C238B0-80C23A08 001C50 0158+00 1/1 0/0 0/0 .text            checkFall__13daObjIceBlk_cFv */
 BOOL daObjIceBlk_c::checkFall() {
     cXyz start;
     cXyz end;
@@ -770,8 +728,6 @@ BOOL daObjIceBlk_c::checkFall() {
     return true;
 }
 
-/* 80C23A50-80C23B0C 001DF0 00BC+00 1/1 0/0 0/0 .text            event_proc_call__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::event_proc_call() {
     typedef void (daObjIceBlk_c::*actionFunc)(void);
     static actionFunc l_func[] = {&actionWait, &actionOrderEvent, &actionEvent, &actionDead};
@@ -779,7 +735,6 @@ void daObjIceBlk_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80C23B0C-80C23B70 001EAC 0064+00 1/0 0/0 0/0 .text            actionWait__13daObjIceBlk_cFv */
 void daObjIceBlk_c::actionWait() {
     if (mMode == MODE_PROC_WALK_e && mWalkType == WALK_PUSH) {
         setAction(ACTION_ORDER_EVENT_e);
@@ -788,8 +743,6 @@ void daObjIceBlk_c::actionWait() {
     }
 }
 
-/* 80C23B70-80C23C1C 001F10 00AC+00 1/0 0/0 0/0 .text            actionOrderEvent__13daObjIceBlk_cFv
- */
 void daObjIceBlk_c::actionOrderEvent() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -805,7 +758,6 @@ void daObjIceBlk_c::actionOrderEvent() {
     }
 }
 
-/* 80C23C1C-80C23CA0 001FBC 0084+00 1/0 0/0 0/0 .text            actionEvent__13daObjIceBlk_cFv */
 void daObjIceBlk_c::actionEvent() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
 
@@ -817,10 +769,8 @@ void daObjIceBlk_c::actionEvent() {
     }
 }
 
-/* 80C23CA0-80C23CA4 002040 0004+00 1/0 0/0 0/0 .text            actionDead__13daObjIceBlk_cFv */
 void daObjIceBlk_c::actionDead() {}
 
-/* 80C23CA4-80C23DA8 002044 0104+00 1/0 0/0 0/0 .text            Draw__13daObjIceBlk_cFv */
 int daObjIceBlk_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
 
@@ -842,7 +792,6 @@ int daObjIceBlk_c::Draw() {
     return 1;
 }
 
-/* 80C23DA8-80C23E68 002148 00C0+00 1/0 0/0 0/0 .text            Delete__13daObjIceBlk_cFv */
 int daObjIceBlk_c::Delete() {
     for (int i = 0; i < 2; i++) {
         if (mColdEffEmitters[i] != NULL) {
@@ -861,37 +810,29 @@ int daObjIceBlk_c::Delete() {
     return 1;
 }
 
-/* 80C23E68-80C23FCC 002208 0164+00 1/0 0/0 0/0 .text daObjIceBlk_create1st__FP13daObjIceBlk_c */
 static int daObjIceBlk_create1st(daObjIceBlk_c* i_this) {
     fopAcM_ct(i_this, daObjIceBlk_c);
     return i_this->create1st();
 }
 
-/* 80C24210-80C24230 0025B0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDelete__FP13daObjIceBlk_c
- */
 static int daObjIceBlk_MoveBGDelete(daObjIceBlk_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C24230-80C24250 0025D0 0020+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGExecute__FP13daObjIceBlk_c
- */
 static int daObjIceBlk_MoveBGExecute(daObjIceBlk_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C24250-80C2427C 0025F0 002C+00 1/0 0/0 0/0 .text daObjIceBlk_MoveBGDraw__FP13daObjIceBlk_c */
 static int daObjIceBlk_MoveBGDraw(daObjIceBlk_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C24584-80C245A4 -00001 0020+00 1/0 0/0 0/0 .data            daObjIceBlk_METHODS */
 static actor_method_class daObjIceBlk_METHODS = {
     (process_method_func)daObjIceBlk_create1st,     (process_method_func)daObjIceBlk_MoveBGDelete,
     (process_method_func)daObjIceBlk_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjIceBlk_MoveBGDraw,
 };
 
-/* 80C245A4-80C245D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_IceBlock */
 extern actor_process_profile_definition g_profile_Obj_IceBlock = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp
index d342a4e41b..1bfaf8bb4d 100644
--- a/src/d/actor/d_a_obj_iceleaf.cpp
+++ b/src/d/actor/d_a_obj_iceleaf.cpp
@@ -11,21 +11,17 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C24718-80C24738 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return ((daObjIceLeaf_c*)i_this)->CreateHeap();
 }
 
-/* 80C24738-80C24774 000098 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C25DD0-80C25DD4 -00001 0004+00 7/7 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_IceLeaf";
 
-/* 80C24774-80C249E4 0000D4 0270+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::setBaseMtx() {
     if (mRide) {
         daPy_py_c* player = dComIfGp_getLinkPlayer();
@@ -79,7 +75,6 @@ void daObjIceLeaf_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C25DD4-80C25E18 000024 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0x400000, 0x11}, 0x78}},  // mObj
@@ -94,7 +89,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }  // mCyl
 };
 
-/* 80C249E4-80C24BC4 000344 01E0+00 1/1 0/0 0/0 .text            Create__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::Create() {
     J3DJoint* joint = mpModel->getModelData()->getJointNodePointer(0);
     mTransformInfo = joint->getTransformInfo();
@@ -135,7 +129,6 @@ int daObjIceLeaf_c::Create() {
     return 1;
 }
 
-/* 80C24BC4-80C24C9C 000524 00D8+00 2/2 0/0 0/0 .text            setAnmPos__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::setAnmPos() {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(0x168, pbck != NULL);
@@ -151,7 +144,6 @@ void daObjIceLeaf_c::setAnmPos() {
     shape_angle.z += mTransformInfo.mRotation.z;
 }
 
-/* 80C24C9C-80C24DCC 0005FC 0130+00 1/1 0/0 0/0 .text            CreateHeap__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
     JUT_ASSERT(0x189, modelData != NULL);
@@ -173,7 +165,6 @@ int daObjIceLeaf_c::CreateHeap() {
     return 1;
 }
 
-/* 80C24E14-80C24F8C 000774 0178+00 1/1 0/0 0/0 .text            create__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::create() {
     fopAcM_ct(this, daObjIceLeaf_c);
 
@@ -191,7 +182,6 @@ int daObjIceLeaf_c::create() {
     return phase_state;
 }
 
-/* 80C25158-80C25360 000AB8 0208+00 1/1 0/0 0/0 .text            execute__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -224,7 +214,6 @@ int daObjIceLeaf_c::execute() {
     return 1;
 }
 
-/* 80C25360-80C2541C 000CC0 00BC+00 1/1 0/0 0/0 .text            action__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::action() {
     typedef void (daObjIceLeaf_c::*mode_func)();
     static mode_func l_func[] = {
@@ -237,7 +226,6 @@ void daObjIceLeaf_c::action() {
     (this->*l_func[mMode])();
 }
 
-/* 80C2541C-80C25614 000D7C 01F8+00 1/0 0/0 0/0 .text            modeDropWait__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::modeDropWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -271,7 +259,6 @@ void daObjIceLeaf_c::modeDropWait() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80C25614-80C258F8 000F74 02E4+00 1/0 0/0 0/0 .text            modeDrop__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::modeDrop() {
     if (mpBck->play()) {
         J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
@@ -322,17 +309,12 @@ void daObjIceLeaf_c::modeDrop() {
     }
 }
 
-/* 80C258F8-80C25904 001258 000C+00 1/0 0/0 0/0 .text            modePlayerWait__14daObjIceLeaf_cFv
- */
 void daObjIceLeaf_c::modePlayerWait() {
     attention_info.flags = fopAc_AttnFlag_ETC_e;
 }
 
-/* 80C25904-80C25908 001264 0004+00 1/0 0/0 0/0 .text            modeRide__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::modeRide() {}
 
-/* 80C25908-80C259C4 001268 00BC+00 1/1 0/0 0/0 .text            event_proc_call__14daObjIceLeaf_cFv
- */
 void daObjIceLeaf_c::event_proc_call() {
     typedef void (daObjIceLeaf_c::*action_func)();
     static action_func l_func[] = {
@@ -345,10 +327,8 @@ void daObjIceLeaf_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80C259C4-80C259C8 001324 0004+00 1/0 0/0 0/0 .text            actionWait__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::actionWait() {}
 
-/* 80C259C8-80C25A68 001328 00A0+00 1/0 0/0 0/0 .text actionOrderEvent__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACT_EVENT_e);
@@ -363,7 +343,6 @@ void daObjIceLeaf_c::actionOrderEvent() {
     }
 }
 
-/* 80C25A68-80C25AC4 0013C8 005C+00 1/0 0/0 0/0 .text            actionEvent__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACT_DEAD_e);
@@ -371,10 +350,8 @@ void daObjIceLeaf_c::actionEvent() {
     }
 }
 
-/* 80C25AC4-80C25AC8 001424 0004+00 1/0 0/0 0/0 .text            actionDead__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::actionDead() {}
 
-/* 80C25AC8-80C25BB8 001428 00F0+00 1/1 0/0 0/0 .text            setFallSE__14daObjIceLeaf_cFv */
 void daObjIceLeaf_c::setFallSE() {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(0x36C, pbck != NULL);
@@ -391,7 +368,6 @@ void daObjIceLeaf_c::setFallSE() {
               mFallStartSEPos.z);
 }
 
-/* 80C25BB8-80C25C50 001518 0098+00 1/1 0/0 0/0 .text            draw__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -406,40 +382,33 @@ int daObjIceLeaf_c::draw() {
     return 1;
 }
 
-/* 80C25C50-80C25C84 0015B0 0034+00 1/1 0/0 0/0 .text            _delete__14daObjIceLeaf_cFv */
 int daObjIceLeaf_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C25C84-80C25CA4 0015E4 0020+00 1/0 0/0 0/0 .text daObjIceLeaf_Draw__FP14daObjIceLeaf_c */
 static int daObjIceLeaf_Draw(daObjIceLeaf_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C25CA4-80C25CC4 001604 0020+00 1/0 0/0 0/0 .text daObjIceLeaf_Execute__FP14daObjIceLeaf_c */
 static int daObjIceLeaf_Execute(daObjIceLeaf_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C25CC4-80C25CE4 001624 0020+00 1/0 0/0 0/0 .text daObjIceLeaf_Delete__FP14daObjIceLeaf_c */
 static int daObjIceLeaf_Delete(daObjIceLeaf_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80C25CE4-80C25D04 001644 0020+00 1/0 0/0 0/0 .text daObjIceLeaf_Create__FP14daObjIceLeaf_c */
 static int daObjIceLeaf_Create(daObjIceLeaf_c* i_this) {
     return i_this->create();
 }
 
-/* 80C25ED8-80C25EF8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIceLeaf_Method */
 static actor_method_class l_daObjIceLeaf_Method = {
     (process_method_func)daObjIceLeaf_Create,  (process_method_func)daObjIceLeaf_Delete,
     (process_method_func)daObjIceLeaf_Execute, (process_method_func)NULL,
     (process_method_func)daObjIceLeaf_Draw,
 };
 
-/* 80C25EF8-80C25F28 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_IceLeaf */
 extern actor_process_profile_definition g_profile_Obj_IceLeaf = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp
index a6322a2a03..ff853ce782 100644
--- a/src/d/actor/d_a_obj_ihasi.cpp
+++ b/src/d/actor/d_a_obj_ihasi.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_ihasi.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C26018-80C2611C 000078 0104+00 1/0 0/0 0/0 .text daObj_Ihasi_Draw__FP15obj_ihasi_class */
 static int daObj_Ihasi_Draw(obj_ihasi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -30,18 +29,14 @@ static int daObj_Ihasi_Draw(obj_ihasi_class* i_this) {
     return 1;
 }
 
-/* 80C2611C-80C26120 00017C 0004+00 1/1 0/0 0/0 .text            ih_normal__FP15obj_ihasi_class */
 static void ih_normal(obj_ihasi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 }
 
-/* 80C26120-80C26124 000180 0004+00 1/1 0/0 0/0 .text            ih_disappear__FP15obj_ihasi_class
- */
 static void ih_disappear(obj_ihasi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 }
 
-/* 80C26124-80C26204 000184 00E0+00 1/1 0/0 0/0 .text            action__FP15obj_ihasi_class */
 static void action(obj_ihasi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -70,7 +65,6 @@ static void action(obj_ihasi_class* i_this) {
     }
 }
 
-/* 80C26204-80C262C4 000264 00C0+00 2/1 0/0 0/0 .text daObj_Ihasi_Execute__FP15obj_ihasi_class */
 static int daObj_Ihasi_Execute(obj_ihasi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
 
@@ -96,12 +90,10 @@ static int daObj_Ihasi_Execute(obj_ihasi_class* i_this) {
     return 1;
 }
 
-/* 80C262C4-80C262CC 000324 0008+00 1/0 0/0 0/0 .text daObj_Ihasi_IsDelete__FP15obj_ihasi_class */
 static int daObj_Ihasi_IsDelete(obj_ihasi_class* param_0) {
     return 1;
 }
 
-/* 80C262CC-80C26324 00032C 0058+00 1/0 0/0 0/0 .text daObj_Ihasi_Delete__FP15obj_ihasi_class */
 static int daObj_Ihasi_Delete(obj_ihasi_class* _this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)_this;
     fopAcM_RegisterDeleteID(_this, "Obj_Ihasi");
@@ -114,7 +106,6 @@ static int daObj_Ihasi_Delete(obj_ihasi_class* _this) {
     return 1;
 }
 
-/* 80C26324-80C264F8 000384 01D4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_actor) {
     obj_ihasi_class* i_this = (obj_ihasi_class*)i_actor;
 
@@ -157,8 +148,6 @@ static int useHeapInit(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80C26540-80C26880 0005A0 0340+00 1/0 0/0 0/0 .text            daObj_Ihasi_Create__FP10fopAc_ac_c
- */
 static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
     obj_ihasi_class* i_this = static_cast<obj_ihasi_class*>(i_actor);
     fopAcM_ct(i_this, obj_ihasi_class);
@@ -226,14 +215,12 @@ static int daObj_Ihasi_Create(fopAc_ac_c* i_actor) {
     return step;
 }
 
-/* 80C268D8-80C268F8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Ihasi_Method */
 static actor_method_class l_daObj_Ihasi_Method = {
     (process_method_func)daObj_Ihasi_Create,  (process_method_func)daObj_Ihasi_Delete,
     (process_method_func)daObj_Ihasi_Execute, (process_method_func)daObj_Ihasi_IsDelete,
     (process_method_func)daObj_Ihasi_Draw,
 };
 
-/* 80C268F8-80C26928 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_IHASI */
 extern actor_process_profile_definition g_profile_OBJ_IHASI = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp
index 097f9671e2..dbe2b89dfb 100644
--- a/src/d/actor/d_a_obj_ikada.cpp
+++ b/src/d/actor/d_a_obj_ikada.cpp
@@ -13,12 +13,10 @@ static f32 dummy() {
     return 0.0f;
 }
 
-/* 80C269B8-80C26A20 000078 0068+00 1/1 0/0 0/0 .text            RideOn_Angle__12daObjIkada_cFRsfsf */
 void daObjIkada_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) {
     cLib_addCalcAngleS(&param_1, param_3 * (param_2 / param_4), 1, 0x100, 1);
 }
 
-/* 80C26A20-80C26C50 0000E0 0230+00 1/1 0/0 0/0 .text            Check_RideOn__12daObjIkada_cFv */
 BOOL daObjIkada_c::Check_RideOn() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& pos = fopAcM_GetPosition(player);
@@ -46,13 +44,11 @@ BOOL daObjIkada_c::Check_RideOn() {
     return FALSE;
 }
 
-/* 80C26C50-80C26C7C 000310 002C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjIkada_cFv */
 void daObjIkada_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C26C7C-80C26CD8 00033C 005C+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjIkada_cFv */
 void daObjIkada_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -60,7 +56,6 @@ void daObjIkada_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C26CD8-80C26D3C 000398 0064+00 1/1 0/0 0/0 .text            rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
     daObjIkada_c* i_this = (daObjIkada_c*)a_this;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -72,32 +67,26 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* param_3)
     i_this->Check_RideOn();
 }
 
-/* 80C26D3C-80C26D68 0003FC 002C+00 1/0 0/0 0/0 .text            daObjIkada_Draw__FP12daObjIkada_c */
 static int daObjIkada_Draw(daObjIkada_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C26D68-80C26D88 000428 0020+00 1/0 0/0 0/0 .text            daObjIkada_Execute__FP12daObjIkada_c */
 static int daObjIkada_Execute(daObjIkada_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C26D88-80C26D90 000448 0008+00 1/0 0/0 0/0 .text            daObjIkada_IsDelete__FP12daObjIkada_c */
 static int daObjIkada_IsDelete(daObjIkada_c* i_this) {
     return 1;
 }
 
-/* 80C26D90-80C26DB4 000450 0024+00 1/0 0/0 0/0 .text            daObjIkada_Delete__FP12daObjIkada_c */
 static int daObjIkada_Delete(daObjIkada_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80C27584-80C27588 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_Ikada";
 
-/* 80C27028-80C270A0 0006E8 0078+00 1/0 0/0 0/0 .text            CreateHeap__12daObjIkada_cFv */
 int daObjIkada_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Ikada.bmd");
     JUT_ASSERT(82, modelData != NULL);
@@ -136,21 +125,18 @@ cPhs__Step daObjIkada_c::create() {
     return phase;
 }
 
-/* 80C26DB4-80C26FB8 000474 0204+00 1/0 0/0 0/0 .text            daObjIkada_Create__FP10fopAc_ac_c */
 static int daObjIkada_Create(fopAc_ac_c* a_this) {
     daObjIkada_c* i_this = (daObjIkada_c*)a_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80C270A0-80C270E0 000760 0040+00 1/0 0/0 0/0 .text            Create__12daObjIkada_cFv */
 int daObjIkada_c::Create() {
     initBaseMtx();
     mpBgW->SetRideCallback(rideCallBack);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C270E0-80C27400 0007A0 0320+00 1/0 0/0 0/0 .text            Execute__12daObjIkada_cFPPA3_A4_f */
 int daObjIkada_c::Execute(Mtx** mtx) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& unk = fopAcM_GetPosition(player);
@@ -196,7 +182,6 @@ int daObjIkada_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 80C27400-80C274A4 000AC0 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjIkada_cFv */
 int daObjIkada_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -206,13 +191,11 @@ int daObjIkada_c::Draw() {
     return 1;
 }
 
-/* 80C274A4-80C274D8 000B64 0034+00 1/0 0/0 0/0 .text            Delete__12daObjIkada_cFv */
 int daObjIkada_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C27588-80C275A8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIkada_Method */
 static actor_method_class l_daObjIkada_Method = {
     (process_method_func)daObjIkada_Create,
     (process_method_func)daObjIkada_Delete,
@@ -221,7 +204,6 @@ static actor_method_class l_daObjIkada_Method = {
     (process_method_func)daObjIkada_Draw,
 };
 
-/* 80C275A8-80C275D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ikada */
 extern actor_process_profile_definition g_profile_Obj_Ikada = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp
index 45977ab960..bf0965748e 100644
--- a/src/d/actor/d_a_obj_inobone.cpp
+++ b/src/d/actor/d_a_obj_inobone.cpp
@@ -8,12 +8,6 @@
 #include "d/actor/d_a_obj_inobone.h"
 #include "d/actor/d_a_player.h"
 
-//
-// Declarations:
-//
-
-/* 80C276B8-80C27714 000078 005C+00 1/1 0/0 0/0 .text
- * bornTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void bornTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                            fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     daObjIBone_c* a_tgActor = (daObjIBone_c*)i_tgActor;
@@ -33,8 +27,6 @@ static void bornTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
     }
 }
 
-/* 80C27714-80C27780 0000D4 006C+00 1/1 0/0 0/0 .text
- * bornCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void bornCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                            fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     daObjIBone_c* a_coActorA = (daObjIBone_c*)i_coActorA;
@@ -47,7 +39,6 @@ static void bornCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
     }
 }
 
-/* 80C28120-80C28164 000000 0044+00 3/3 0/0 0/0 .rodata          l_cyl_src */
 static const dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0xd8fafdff, 0x11}, 0x79}}, // mObj
@@ -62,7 +53,6 @@ static const dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80C28164-80C281A8 000044 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src2 */
 static const dCcD_SrcCyl l_cyl_src2 = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0x2000, 0x11}, 0x78}}, // mObj
@@ -77,7 +67,6 @@ static const dCcD_SrcCyl l_cyl_src2 = {
     } // mCyl
 };
 
-/* 80C27780-80C27810 000140 0090+00 1/1 0/0 0/0 .text            s_boar_sub__FPvPv */
 static void* s_boar_sub(void* i_actor, void* i_data) {
     if (fopAc_IsActor(i_actor)) {
         fopAc_ac_c* actor = (fopAc_ac_c*)i_actor;
@@ -96,18 +85,15 @@ static void* s_boar_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C27810-80C27830 0001D0 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static void CheckCreateHeap(fopAc_ac_c* i_this) {
     static_cast<daObjIBone_c*>(i_this)->CreateHeap();
 }
 
-/* 80C27830-80C2786C 0001F0 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjIBone_cFv */
 void daObjIBone_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C2786C-80C278CC 00022C 0060+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjIBone_cFv */
 void daObjIBone_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(csXyz(shape_angle.x, 0, 0));
@@ -115,7 +101,6 @@ void daObjIBone_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C278CC-80C279A8 00028C 00DC+00 1/1 0/0 0/0 .text            Create__12daObjIBone_cFv */
 int daObjIBone_c::Create() {
     scale.setall(1.35f);
 
@@ -139,13 +124,10 @@ int daObjIBone_c::Create() {
     return 1;
 }
 
-/* 80C281F8-80C281FC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "Obj_Ibone";
 
-/* 80C281FC-80C28200 -00001 0004+00 1/1 0/0 0/0 .data            l_bmdName */
 static const char* l_bmdName = "A_InoBone.bmd";
 
-/* 80C279A8-80C27A20 000368 0078+00 1/1 0/0 0/0 .text            CreateHeap__12daObjIBone_cFv */
 int daObjIBone_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdName);
@@ -158,7 +140,6 @@ int daObjIBone_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80C27A20-80C27BBC 0003E0 019C+00 1/1 0/0 0/0 .text            create__12daObjIBone_cFv */
 int daObjIBone_c::create() {
     fopAcM_ct(this, daObjIBone_c)
 
@@ -175,7 +156,6 @@ int daObjIBone_c::create() {
     return result;
 }
 
-/* 80C27C4C-80C27E48 00060C 01FC+00 1/1 0/0 0/0 .text            execute__12daObjIBone_cFv */
 int daObjIBone_c::execute() {
     f32 xz_distance = fopAcM_searchPlayerDistanceXZ(this);
     f32 y_distance = fopAcM_searchPlayerDistanceY(this);
@@ -233,7 +213,6 @@ int daObjIBone_c::execute() {
 
 static const char* l_effbmdName = "BreakBoarBone.bmd";  // unused
 
-/* 80C27E48-80C27FEC 000808 01A4+00 1/1 0/0 0/0 .text            setBreakEffect__12daObjIBone_cFv */
 void daObjIBone_c::setBreakEffect() {
     static const u16 particle_id[] = { dPa_RM(ID_ZM_S_BOARBONEBREAK00) };
     
@@ -263,7 +242,6 @@ void daObjIBone_c::setBreakEffect() {
     mDoAud_seStart(Z2SE_OBJ_BONES_BREAK_L, &current.pos, 0, 0);
 }
 
-/* 80C27FEC-80C28050 0009AC 0064+00 1/1 0/0 0/0 .text            draw__12daObjIBone_cFv */
 int daObjIBone_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -272,7 +250,6 @@ int daObjIBone_c::draw() {
     return 1;
 }
 
-/* 80C28050-80C28098 000A10 0048+00 1/1 0/0 0/0 .text            _delete__12daObjIBone_cFv */
 int daObjIBone_c::_delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, l_arcName);
@@ -280,31 +257,22 @@ int daObjIBone_c::_delete() {
     return 1;
 }
 
-/* 80C28098-80C280B8 000A58 0020+00 1/0 0/0 0/0 .text            daObjIBone_Draw__FP12daObjIBone_c
- */
 static int daObjIBone_Draw(daObjIBone_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C280B8-80C280D8 000A78 0020+00 1/0 0/0 0/0 .text daObjIBone_Execute__FP12daObjIBone_c */
 static int daObjIBone_Execute(daObjIBone_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C280D8-80C280F8 000A98 0020+00 1/0 0/0 0/0 .text            daObjIBone_Delete__FP12daObjIBone_c
- */
 static int daObjIBone_Delete(daObjIBone_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80C280F8-80C28118 000AB8 0020+00 1/0 0/0 0/0 .text            daObjIBone_Create__FP10fopAc_ac_c
- */
 static int daObjIBone_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjIBone_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80C28200-80C28220 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIBone_Method */
 static actor_method_class l_daObjIBone_Method = {
     (process_method_func)daObjIBone_Create,
     (process_method_func)daObjIBone_Delete,
@@ -313,7 +281,6 @@ static actor_method_class l_daObjIBone_Method = {
     (process_method_func)daObjIBone_Draw,
 };
 
-/* 80C28220-80C28250 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_InoBone */
 extern actor_process_profile_definition g_profile_Obj_InoBone = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp
index 083a895716..f5b49cac7e 100644
--- a/src/d/actor/d_a_obj_ita.cpp
+++ b/src/d/actor/d_a_obj_ita.cpp
@@ -12,8 +12,8 @@
 
 class daObj_ITA_HIO_c : public JORReflexible {
 public:
-    /* 80C2836C */ daObj_ITA_HIO_c();
-    /* 80C29184 */ virtual ~daObj_ITA_HIO_c() {}
+    daObj_ITA_HIO_c();
+    virtual ~daObj_ITA_HIO_c() {}
 
     void genMessage(JORMContext* ctx) {
         ctx->genLabel("ヒメクジ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 0x18);
@@ -31,10 +31,8 @@ public:
     /* 0x14 */ f32 gravity_settings;
 };
 
-/* 80C29318-80C2931C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_Ita";
 
-/* 80C2836C-80C283AC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__15daObj_ITA_HIO_cFv */
 daObj_ITA_HIO_c::daObj_ITA_HIO_c() {
     id = -1;
     search_area = 600.0f;
@@ -52,7 +50,6 @@ f32 daObjIta_c::dummy2() {
     return field_0x5c8;
 }
 
-/* 80C293DC-80C293F4 000014 0018+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_ITA_HIO_c l_HIO;
 
 namespace {
@@ -63,7 +60,6 @@ namespace {
     static cXyz* e_ymb_Pos;
 } // namespace
 
-/* 80C283AC-80C28674 00012C 02C8+00 1/1 0/0 0/0 .text            Search_Ymb__10daObjIta_cFv */
 void daObjIta_c::Search_Ymb() {
     f32 zero = 0.0f;
     cXyz pos(e_ymb_Pos->x - current.pos.x, e_ymb_Pos->y - current.pos.y, e_ymb_Pos->z - current.pos.z);
@@ -101,7 +97,6 @@ void daObjIta_c::Search_Ymb() {
     }
 }
 
-/* 80C28674-80C28788 0003F4 0114+00 1/1 0/0 0/0 .text            Check_RideOn__10daObjIta_cFv */
 BOOL daObjIta_c::Check_RideOn() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& pos = fopAcM_GetPosition(player);
@@ -119,13 +114,11 @@ BOOL daObjIta_c::Check_RideOn() {
     return FALSE;
 }
 
-/* 80C28788-80C287B4 000508 002C+00 1/1 0/0 0/0 .text            initBaseMtx__10daObjIta_cFv */
 void daObjIta_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C287B4-80C28838 000534 0084+00 2/2 0/0 0/0 .text            setBaseMtx__10daObjIta_cFv */
 void daObjIta_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -135,7 +128,6 @@ void daObjIta_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C28838-80C28890 0005B8 0058+00 1/1 0/0 0/0 .text            rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* i_player) {
     daObjIta_c* i_this = (daObjIta_c*)a_this;
 
@@ -150,36 +142,30 @@ static void rideCallBack(dBgW* param_1, fopAc_ac_c* a_this, fopAc_ac_c* i_player
     }
 }
 
-/* 80C28890-80C288BC 000610 002C+00 1/0 0/0 0/0 .text            daObjIta_Draw__FP10daObjIta_c */
 static int daObjIta_Draw(daObjIta_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C288BC-80C288DC 00063C 0020+00 1/0 0/0 0/0 .text            daObjIta_Execute__FP10daObjIta_c */
 static int daObjIta_Execute(daObjIta_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C288DC-80C288E4 00065C 0008+00 1/0 0/0 0/0 .text            daObjIta_IsDelete__FP10daObjIta_c */
 static int daObjIta_IsDelete(daObjIta_c* i_this) {
     return 1;
 }
 
-/* 80C288E4-80C28908 000664 0024+00 1/0 0/0 0/0 .text            daObjIta_Delete__FP10daObjIta_c */
 static int daObjIta_Delete(daObjIta_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80C28908-80C28928 000688 0020+00 1/0 0/0 0/0 .text            daObjIta_Create__FP10fopAc_ac_c */
 static int daObjIta_Create(fopAc_ac_c* a_this) {
     daObjIta_c* i_this = (daObjIta_c*)a_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80C28BB0-80C28C28 000930 0078+00 1/0 0/0 0/0 .text            CreateHeap__10daObjIta_cFv */
 int daObjIta_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_FloatingDust00.bmd");
     JUT_ASSERT(735, modelData != NULL);
@@ -191,7 +177,6 @@ int daObjIta_c::CreateHeap() {
     return 1;
 }
 
-/* 80C28928-80C28B40 0006A8 0218+00 1/1 0/0 0/0 .text            create__10daObjIta_cFv */
 cPhs__Step daObjIta_c::create() {
     fopAcM_ct(this, daObjIta_c);
 
@@ -219,7 +204,6 @@ cPhs__Step daObjIta_c::create() {
     return phase;
 }
 
-/* 80C28C28-80C28C70 0009A8 0048+00 1/0 0/0 0/0 .text            Create__10daObjIta_cFv */
 int daObjIta_c::Create() {
     initBaseMtx();
     mpBgW->SetRideCallback(rideCallBack);
@@ -227,7 +211,6 @@ int daObjIta_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C28C70-80C290AC 0009F0 043C+00 1/0 0/0 0/0 .text            Execute__10daObjIta_cFPPA3_A4_f */
 int daObjIta_c::Execute(Mtx** mtx) {
     fopAcM_seStartLevel(this, Z2SE_OBJ_FLOATBOARD, 0);
 
@@ -281,7 +264,6 @@ int daObjIta_c::Execute(Mtx** mtx) {
     return 1;
 }
 
-/* 80C290AC-80C29150 000E2C 00A4+00 1/0 0/0 0/0 .text            Draw__10daObjIta_cFv */
 int daObjIta_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -291,13 +273,11 @@ int daObjIta_c::Draw() {
     return 1;
 }
 
-/* 80C29150-80C29184 000ED0 0034+00 1/0 0/0 0/0 .text            Delete__10daObjIta_cFv */
 int daObjIta_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C2931C-80C2933C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjIta_Method */
 static actor_method_class l_daObjIta_Method = {
     (process_method_func)daObjIta_Create,
     (process_method_func)daObjIta_Delete,
@@ -306,7 +286,6 @@ static actor_method_class l_daObjIta_Method = {
     (process_method_func)daObjIta_Draw,
 };
 
-/* 80C2933C-80C2936C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ITA */
 extern actor_process_profile_definition g_profile_Obj_ITA = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp
index 2c36cd6560..d5d4e019eb 100644
--- a/src/d/actor/d_a_obj_itamato.cpp
+++ b/src/d/actor/d_a_obj_itamato.cpp
@@ -20,7 +20,7 @@ struct daObj_ItaMato_HIOParam {
 
 class daObj_ItaMato_Param_c {
 public:
-    /* 80C2AB04 */ virtual ~daObj_ItaMato_Param_c() {}
+    virtual ~daObj_ItaMato_Param_c() {}
 
     static daObj_ItaMato_HIOParam const m;
 };
@@ -42,7 +42,6 @@ public:
 #define PARAM_CLASS daObj_ItaMato_Param_c
 #endif
 
-/* 80C2AB70-80C2AB84 000000 0014+00 4/4 0/0 0/0 .rodata          m__21daObj_ItaMato_Param_c */
 daObj_ItaMato_HIOParam const daObj_ItaMato_Param_c::m = {
     110.0f,
     -3.0f,
@@ -97,7 +96,6 @@ void daObj_ItaMato_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C2AB84-80C2ABB4 000014 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 static dCcD_SrcGObjInf const l_ccDObjData = {
     {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x1F}, 0x79}}, // mObj
     {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -105,7 +103,6 @@ static dCcD_SrcGObjInf const l_ccDObjData = {
     {0x0}, // mGObjCo
 };
 
-/* 80C2AC34-80C2AC74 000000 0040+00 2/2 0/0 0/0 .data            l_ccDSph */
 static dCcD_SrcSph l_ccDSph = {
     l_ccDObjData,
     {
@@ -113,13 +110,10 @@ static dCcD_SrcSph l_ccDSph = {
     } // mSphAttr
 };
 
-/* 80C2AD64-80C2AD68 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static PARAM_CLASS l_HIO;
 
-/* 80C2AC74-80C2AC78 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "H_ItaMato";
 
-/* 80C294EC-80C296E0 0000EC 01F4+00 1/0 0/0 0/0 .text            __dt__15daObj_ItaMato_cFv */
 daObj_ItaMato_c::~daObj_ItaMato_c() {
     OS_REPORT("|%06d:%x|daObj_ItaMato_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -132,7 +126,6 @@ daObj_ItaMato_c::~daObj_ItaMato_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80C2971C-80C29AC0 00031C 03A4+00 1/1 0/0 0/0 .text            create__15daObj_ItaMato_cFv */
 cPhs__Step daObj_ItaMato_c::create() {
     fopAcM_ct(this, daObj_ItaMato_c);
 
@@ -193,7 +186,6 @@ cPhs__Step daObj_ItaMato_c::create() {
     return phase;
 }
 
-/* 80C29CD8-80C29DAC 0008D8 00D4+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_ItaMato_cFv */
 int daObj_ItaMato_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     modelData = (J3DModelData*)dComIfG_getObjectRes(getResName(), 5);
@@ -219,14 +211,12 @@ int daObj_ItaMato_c::CreateHeap() {
     return 1;
 }
 
-/* 80C29DAC-80C29DE0 0009AC 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_ItaMato_cFv */
 int daObj_ItaMato_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_ItaMato_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_ItaMato_c();
     return 1;
 }
 
-/* 80C29DE0-80C2A44C 0009E0 066C+00 2/2 0/0 0/0 .text            Execute__15daObj_ItaMato_cFv */
 int daObj_ItaMato_c::Execute() {
     cXyz sp38, sp44, sp50;
 
@@ -358,7 +348,6 @@ int daObj_ItaMato_c::Execute() {
     return 1;
 }
 
-/* 80C2A44C-80C2A5D0 00104C 0184+00 1/1 0/0 0/0 .text            Draw__15daObj_ItaMato_cFv */
 int daObj_ItaMato_c::Draw() {
     if (field_0xa16 == 0 && (field_0xa18 == 0 || health != 0)) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -383,13 +372,11 @@ int daObj_ItaMato_c::Draw() {
     return 1;
 }
 
-/* 80C2A5D0-80C2A5F0 0011D0 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__15daObj_ItaMato_cFP10fopAc_ac_c */
 int daObj_ItaMato_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daObj_ItaMato_c* i_this = (daObj_ItaMato_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80C2A5F0-80C2A620 0011F0 0030+00 1/1 0/0 0/0 .text            tgHitCallBack__15daObj_ItaMato_cFP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 void daObj_ItaMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_ac_c* param_3, dCcD_GObjInf* param_4) {
     daObj_ItaMato_c* i_this = (daObj_ItaMato_c*)param_1;
     u8 cutType = 0;
@@ -405,12 +392,10 @@ void daObj_ItaMato_c::tgHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2,
     i_this->setCutType(cutType);
 }
 
-/* 80C2A620-80C2A630 001220 0010+00 3/3 0/0 0/0 .text            getResName__15daObj_ItaMato_cFv */
 const char* daObj_ItaMato_c::getResName() {
     return l_resName;
 }
 
-/* 80C2A630-80C2A7C4 001230 0194+00 1/1 0/0 0/0 .text            setSwayParam__15daObj_ItaMato_cFP10fopAc_ac_c */
 void daObj_ItaMato_c::setSwayParam(fopAc_ac_c* i_actor) {
     f32 fVar1 = 1.0f;
     f32 fVar2[3] = {0.0f, 0.0f, PARAM.shake_pow};
@@ -456,7 +441,6 @@ void daObj_ItaMato_c::setSwayParam(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80C2A7C4-80C2A890 0013C4 00CC+00 1/1 0/0 0/0 .text            setPrtcls__15daObj_ItaMato_cFv */
 void daObj_ItaMato_c::setPrtcls() {
     static u16 const id[3] = {
         dPa_RM(ID_ZF_S_ITAMATO_BOAD00),
@@ -470,20 +454,17 @@ void daObj_ItaMato_c::setPrtcls() {
     }
 }
 
-/* 80C2A890-80C2A8EC 001490 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__15daObj_ItaMato_cFv */
 void daObj_ItaMato_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80C2A8EC-80C2A930 0014EC 0044+00 2/2 0/0 0/0 .text            setRoomNo__15daObj_ItaMato_cFv */
 void daObj_ItaMato_c::setRoomNo() {
     s8 id = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, id);
     mStts.SetRoomId(id);
 }
 
-/* 80C2A930-80C2A9C0 001530 0090+00 1/1 0/0 0/0 .text            setMtx__15daObj_ItaMato_cFv */
 void daObj_ItaMato_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -493,32 +474,26 @@ void daObj_ItaMato_c::setMtx() {
     mpModels[health]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C2A9C0-80C2A9E0 0015C0 0020+00 1/0 0/0 0/0 .text            daObj_ItaMato_Create__FPv */
 static int daObj_ItaMato_Create(void* a_this) {
     return static_cast<daObj_ItaMato_c*>(a_this)->create();
 }
 
-/* 80C2A9E0-80C2AA00 0015E0 0020+00 1/0 0/0 0/0 .text            daObj_ItaMato_Delete__FPv */
 static int daObj_ItaMato_Delete(void* a_this) {
     return static_cast<daObj_ItaMato_c*>(a_this)->Delete();
 }
 
-/* 80C2AA00-80C2AA20 001600 0020+00 1/0 0/0 0/0 .text            daObj_ItaMato_Execute__FPv */
 static int daObj_ItaMato_Execute(void* a_this) {
     return static_cast<daObj_ItaMato_c*>(a_this)->Execute();
 }
 
-/* 80C2AA20-80C2AA40 001620 0020+00 1/0 0/0 0/0 .text            daObj_ItaMato_Draw__FPv */
 static int daObj_ItaMato_Draw(void* a_this) {
     return static_cast<daObj_ItaMato_c*>(a_this)->Draw();
 }
 
-/* 80C2AA40-80C2AA48 001640 0008+00 1/0 0/0 0/0 .text            daObj_ItaMato_IsDelete__FPv */
 static int daObj_ItaMato_IsDelete(void* a_this) {
     return 1;
 }
 
-/* 80C2AC78-80C2AC98 -00001 0020+00 1/0 0/0 0/0 .data            daObj_ItaMato_MethodTable */
 static actor_method_class daObj_ItaMato_MethodTable = {
     (process_method_func)daObj_ItaMato_Create,
     (process_method_func)daObj_ItaMato_Delete,
@@ -527,7 +502,6 @@ static actor_method_class daObj_ItaMato_MethodTable = {
     (process_method_func)daObj_ItaMato_Draw,
 };
 
-/* 80C2AC98-80C2ACC8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_ITAMATO */
 extern actor_process_profile_definition g_profile_OBJ_ITAMATO = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp
index e795c596ab..7288d4985e 100644
--- a/src/d/actor/d_a_obj_item.cpp
+++ b/src/d/actor/d_a_obj_item.cpp
@@ -16,8 +16,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_mtx.h"
 
-/* 8015ADCC-8015B0B8 15570C 02EC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_polyinfo, f32 i_scale) {
     cM3dGPla plane;
 
@@ -33,12 +31,10 @@ static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_polyinfo, f32 i_scale) {
     return 0.0f;
 }
 
-/* 8015B0B8-8015B0C4 1559F8 000C+00 10/10 1/1 1/1 .text            getData__12daItemBase_cFv */
 const daItemBase_data& daItemBase_c::getData() {
     return m_data;
 }
 
-/* 8015B0C4-8015B108 155A04 0044+00 1/1 0/0 0/0 .text            initBaseMtx__8daItem_cFv */
 void daItem_c::initBaseMtx() {
     if (mpModel != NULL) {
         mpModel->setBaseScale(scale);
@@ -46,7 +42,6 @@ void daItem_c::initBaseMtx() {
     }
 }
 
-/* 8015B108-8015B190 155A48 0088+00 2/2 0/0 0/0 .text            setBaseMtx__8daItem_cFv */
 void daItem_c::setBaseMtx() {
     if (mpModel != NULL) {
         mpModel->setBaseScale(scale);
@@ -70,13 +65,11 @@ void daItem_c::setBaseMtx() {
     }
 }
 
-/* 8015B190-8015B1C8 155AD0 0038+00 1/1 0/0 0/0 .text            setBaseMtx_0__8daItem_cFv */
 void daItem_c::setBaseMtx_0() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
 }
 
-/* 8015B1C8-8015B254 155B08 008C+00 1/1 0/0 0/0 .text            setBaseMtx_1__8daItem_cFv */
 void daItem_c::setBaseMtx_1() {
     f32 max_y = mpModel->getModelData()->getJointNodePointer(0)->getMax()->y;
     f32 y = (max_y / 2) * scale.y;
@@ -88,8 +81,6 @@ void daItem_c::setBaseMtx_1() {
     mDoMtx_stack_c::transM(0.0f, -y, 0.0f);
 }
 
-/* 8015B254-8015B320 155B94 00CC+00 2/2 0/0 0/0 .text
- * itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                               fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     daItem_c* a_coActorA = (daItem_c*)i_coActorA;
@@ -109,8 +100,6 @@ static void itemGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
     }
 }
 
-/* 8015B320-8015B3D8 155C60 00B8+00 2/2 0/0 0/0 .text
- * itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void itemGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                               fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     daItem_c* a_tgActor = (daItem_c*)i_tgActor;
@@ -130,7 +119,6 @@ static void itemGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
     }
 }
 
-/* 8015B3D8-8015B7BC 155D18 03E4+00 1/1 0/0 0/0 .text            CreateInit__8daItem_cFv */
 void daItem_c::CreateInit() {
     mAcchCir.SetWall(30.0f, 30.0f);
     mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
@@ -232,14 +220,12 @@ void daItem_c::CreateInit() {
     }
 }
 
-/* 8015B7BC-8015B7D4 1560FC 0018+00 1/1 0/0 0/0 .text            setCullInfo__8daItem_cFv */
 void daItem_c::setCullInfo() {
     if (mpModel != NULL) {
         fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     }
 }
 
-/* 8015B7D4-8015BA3C 156114 0268+00 1/1 0/0 0/0 .text            _daItem_create__8daItem_cFv */
 int daItem_c::_daItem_create() {
     fopAcM_ct(this, daItem_c);
 
@@ -307,7 +293,6 @@ int daItem_c::_daItem_create() {
     return phase_state;
 }
 
-/* 8015BA9C-8015BD84 1563DC 02E8+00 1/1 0/0 0/0 .text            _daItem_execute__8daItem_cFv */
 int daItem_c::_daItem_execute() {
     field_0x950 = speed;
     CountTimer();
@@ -363,7 +348,6 @@ int daItem_c::_daItem_execute() {
     return 1;
 }
 
-/* 8015BD84-8015BDE8 1566C4 0064+00 1/1 0/0 0/0 .text            _daItem_draw__8daItem_cFv */
 int daItem_c::_daItem_draw() {
     if (mpModel == NULL) {
         return 1;
@@ -376,7 +360,6 @@ int daItem_c::_daItem_draw() {
     return 1;
 }
 
-/* 8015BDE8-8015BE60 156728 0078+00 1/1 0/0 0/0 .text            _daItem_delete__8daItem_cFv */
 int daItem_c::_daItem_delete() {
     mSound.deleteObject();
 
@@ -388,14 +371,12 @@ int daItem_c::_daItem_delete() {
     return 1;
 }
 
-/* 8015BE60-8015BEA4 1567A0 0044+00 4/4 0/0 0/0 .text            procInitNormal__8daItem_cFv */
 void daItem_c::procInitNormal() {
     mAcch.ClrGrndNone();
     mAcch.ClrMoveBGOnly();
     setStatus(STATUS_NORMAL_e);
 }
 
-/* 8015BEA4-8015BFE8 1567E4 0144+00 1/0 0/0 0/0 .text            procMainNormal__8daItem_cFv */
 void daItem_c::procMainNormal() {
     move_proc_call();
 
@@ -423,10 +404,8 @@ void daItem_c::procMainNormal() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 8015BFE8-8015BFEC 156928 0004+00 1/0 0/0 0/0 .text            procMainEnemyCarry__8daItem_cFv */
 void daItem_c::procMainEnemyCarry() {}
 
-/* 8015BFEC-8015C038 15692C 004C+00 1/1 0/0 0/0 .text            procInitForceGet__8daItem_cFv */
 void daItem_c::procInitForceGet() {
     mAcch.ClrGrndNone();
     mAcch.ClrMoveBGOnly();
@@ -434,13 +413,10 @@ void daItem_c::procInitForceGet() {
     itemGetNextExecute();
 }
 
-/* 8015C038-8015C058 156978 0020+00 1/0 0/0 0/0 .text            procMainForceGet__8daItem_cFv */
 void daItem_c::procMainForceGet() {
     procInitSimpleGetDemo();
 }
 
-/* 8015C058-8015C134 156998 00DC+00 4/4 0/0 0/0 .text            procInitSimpleGetDemo__8daItem_cFv
- */
 void daItem_c::procInitSimpleGetDemo() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     current.pos = player->getItemPos();
@@ -456,8 +432,6 @@ void daItem_c::procInitSimpleGetDemo() {
     setStatus(STATUS_SIMPLE_GET_DEMO_e);
 }
 
-/* 8015C134-8015C200 156A74 00CC+00 2/1 0/0 0/0 .text            procMainSimpleGetDemo__8daItem_cFv
- */
 void daItem_c::procMainSimpleGetDemo() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz item_pos = player->getItemPos();
@@ -482,8 +456,6 @@ void daItem_c::procMainSimpleGetDemo() {
     }
 }
 
-/* 8015C200-8015C2A4 156B40 00A4+00 1/1 0/0 0/0 .text            procInitGetDemoEvent__8daItem_cFv
- */
 void daItem_c::procInitGetDemoEvent() {
     hide();
 
@@ -502,8 +474,6 @@ void daItem_c::procInitGetDemoEvent() {
     setStatus(STATUS_WAIT_GET_DEMO_EVENT_e);
 }
 
-/* 8015C2A4-8015C3BC 156BE4 0118+00 1/0 0/0 0/0 .text            procWaitGetDemoEvent__8daItem_cFv
- */
 void daItem_c::procWaitGetDemoEvent() {
     if (eventInfo.checkCommandItem()) {
         setStatus(STATUS_GET_DEMO_EVENT_e);
@@ -537,8 +507,6 @@ void daItem_c::procWaitGetDemoEvent() {
     }
 }
 
-/* 8015C3BC-8015C41C 156CFC 0060+00 1/0 0/0 0/0 .text            procMainGetDemoEvent__8daItem_cFv
- */
 void daItem_c::procMainGetDemoEvent() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGp_event_reset();
@@ -546,8 +514,6 @@ void daItem_c::procMainGetDemoEvent() {
     }
 }
 
-/* 8015C41C-8015C514 156D5C 00F8+00 1/1 0/0 0/0 .text            procInitBoomerangCarry__8daItem_cFv
- */
 void daItem_c::procInitBoomerangCarry() {
     clrFlag(FLAG_NO_MOVE_e);
     scale = mItemScale;
@@ -564,8 +530,6 @@ void daItem_c::procInitBoomerangCarry() {
     setStatus(STATUS_BOOMERANG_CARRY_e);
 }
 
-/* 8015C514-8015C5F4 156E54 00E0+00 1/0 0/0 0/0 .text            procMainBoomerangCarry__8daItem_cFv
- */
 void daItem_c::procMainBoomerangCarry() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -585,7 +549,6 @@ void daItem_c::procMainBoomerangCarry() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 8015C5F4-8015C648 156F34 0054+00 1/1 0/0 0/0 .text            procInitSwOnWait__8daItem_cFv */
 void daItem_c::procInitSwOnWait() {
     hide();
 
@@ -598,7 +561,6 @@ void daItem_c::procInitSwOnWait() {
     setStatus(STATUS_SW_ON_WAIT_e);
 }
 
-/* 8015C648-8015C708 156F88 00C0+00 1/0 0/0 0/0 .text            procMainSwOnWait__8daItem_cFv */
 void daItem_c::procMainSwOnWait() {
     if (fopAcM_isSwitch(this, mSwitchNo)) {
         mAcch.CrrPos(dComIfG_Bgsp());
@@ -623,7 +585,6 @@ void daItem_c::procMainSwOnWait() {
     }
 }
 
-/* 8015C708-8015C738 157048 0030+00 1/1 0/0 0/0 .text            procInitBoomHitWait__8daItem_cFv */
 void daItem_c::procInitBoomHitWait() {
     mCcCyl.SetCoHitCallback(NULL);
     mCcCyl.SetTgHitCallback(NULL);
@@ -632,7 +593,6 @@ void daItem_c::procInitBoomHitWait() {
     setStatus(STATUS_BOOM_HIT_WAIT_e);
 }
 
-/* 8015C738-8015CAB8 157078 0380+00 1/0 0/0 0/0 .text            procMainBoomHitWait__8daItem_cFv */
 void daItem_c::procMainBoomHitWait() {
     m_get_timer = 0;
 
@@ -687,7 +647,6 @@ void daItem_c::procMainBoomHitWait() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 8015CAB8-8015CC4C 1573F8 0194+00 1/1 0/0 0/0 .text            move_proc_call__8daItem_cFv */
 void daItem_c::move_proc_call() {
     static procFunc mode_proc[] = {&daItem_c::mode_wait, &daItem_c::mode_water};
 
@@ -724,13 +683,11 @@ void daItem_c::move_proc_call() {
     (this->*mode_proc[mMode])();
 }
 
-/* 8015CC4C-8015CC88 15758C 003C+00 1/1 0/0 0/0 .text            mode_wait_init__8daItem_cFv */
 void daItem_c::mode_wait_init() {
     mMode = MODE_WAIT_e;
     fopAcM_SetGravity(this, getData().mGravity);
 }
 
-/* 8015CC88-8015CCD0 1575C8 0048+00 1/1 0/0 0/0 .text            mode_water_init__8daItem_cFv */
 void daItem_c::mode_water_init() {
     mMode = MODE_WATER_e;
     fopAcM_SetSpeed(this, 0.0f, 0.0f, 0.0f);
@@ -741,7 +698,6 @@ void daItem_c::mode_water_init() {
     scale = mItemScale;
 }
 
-/* 8015CCD0-8015CDCC 157610 00FC+00 1/0 0/0 0/0 .text            mode_wait__8daItem_cFv */
 void daItem_c::mode_wait() {
     if (m_timer < 5 && speed.y > 0.0f) {
         mAcch.SetGrndNone();
@@ -781,7 +737,6 @@ void daItem_c::mode_wait() {
     mAcch.ClrGrndNone();
 }
 
-/* 8015CDCC-8015CE94 15770C 00C8+00 1/0 0/0 0/0 .text            mode_water__8daItem_cFv */
 void daItem_c::mode_water() {
     mAcch.CrrPos(dComIfG_Bgsp());
 
@@ -819,13 +774,11 @@ void daItem_c::mode_water() {
     RotateYBase();
 }
 
-/* 8015CE94-8015CEEC 1577D4 0058+00 1/0 0/0 0/0 .text            setTevStr__8daItem_cFv */
 void daItem_c::setTevStr() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
 }
 
-/* 8015CEEC-8015D0A8 15782C 01BC+00 6/6 0/0 0/0 .text            itemGetNextExecute__8daItem_cFv */
 void daItem_c::itemGetNextExecute() {
     if (!checkFlag(FLAG_DELETE_ITEM_e) && !checkFlag(FLAG_INIT_GET_ITEM_e)) {
         setFlag(FLAG_INIT_GET_ITEM_e);
@@ -883,7 +836,6 @@ void daItem_c::itemGetNextExecute() {
     }
 }
 
-/* 8015D0A8-8015D370 1579E8 02C8+00 2/2 0/0 0/0 .text            itemGet__8daItem_cFv */
 void daItem_c::itemGet() {
     switch (m_itemNo) {
     case fpcNm_ITEM_HEART:
@@ -934,7 +886,6 @@ void daItem_c::itemGet() {
     }
 }
 
-/* 8015D370-8015D3CC 157CB0 005C+00 1/1 0/0 0/0 .text            checkCountTimer__8daItem_cFv */
 BOOL daItem_c::checkCountTimer() {
     BOOL can_count = true;
 
@@ -957,12 +908,10 @@ BOOL daItem_c::checkCountTimer() {
     return can_count;
 }
 
-/* 8015D3CC-8015D410 157D0C 0044+00 2/2 0/0 0/0 .text            checkPlayerGet__8daItem_cFv */
 BOOL daItem_c::checkPlayerGet() {
     return getData().mNoGetTime <= m_get_timer ? TRUE : FALSE;
 }
 
-/* 8015D410-8015D480 157D50 0070+00 1/1 0/0 0/0 .text            checkYogan__8daItem_cFv */
 void daItem_c::checkYogan() {
     if (mAcch.ChkWaterHit() && mAcch.m_wtr.GetHeight() > current.pos.y + 100.0f) {
         if (dComIfG_Bgsp().GetPolyAtt0(mAcch.m_wtr) == 6) {
@@ -971,13 +920,11 @@ void daItem_c::checkYogan() {
     }
 }
 
-/* 8015D480-8015D4AC 157DC0 002C+00 2/2 0/0 0/0 .text            deleteItem__8daItem_cFv */
 void daItem_c::deleteItem() {
     setFlag(FLAG_DELETE_ITEM_e);
     fopAcM_delete(this);
 }
 
-/* 8015D4AC-8015D56C 157DEC 00C0+00 1/1 0/0 0/0 .text            itemActionForRupee__8daItem_cFv */
 int daItem_c::itemActionForRupee() {
     mAcch.CrrPos(dComIfG_Bgsp());
     bg_check();
@@ -1000,7 +947,6 @@ int daItem_c::itemActionForRupee() {
     return 1;
 }
 
-/* 8015D56C-8015D688 157EAC 011C+00 1/1 0/0 0/0 .text            itemActionForHeart__8daItem_cFv */
 int daItem_c::itemActionForHeart() {
     f32 var_f31 = fopAcM_GetSpeed(this).y;
 
@@ -1025,7 +971,6 @@ int daItem_c::itemActionForHeart() {
     return 1;
 }
 
-/* 8015D688-8015D700 157FC8 0078+00 1/1 0/0 0/0 .text            itemActionForArrow__8daItem_cFv */
 int daItem_c::itemActionForArrow() {
     mAcch.CrrPos(dComIfG_Bgsp());
     bg_check();
@@ -1038,14 +983,11 @@ int daItem_c::itemActionForArrow() {
     return 1;
 }
 
-/* 8015D700-8015D734 158040 0034+00 1/1 0/0 0/0 .text            itemActionForBoomerang__8daItem_cFv
- */
 int daItem_c::itemActionForBoomerang() {
     mAcch.CrrPos(dComIfG_Bgsp());
     return 1;
 }
 
-/* 8015D734-8015D834 158074 0100+00 2/2 0/0 0/0 .text            bg_check__8daItem_cFv */
 void daItem_c::bg_check() {
     if (mAcch.ChkWallHit()) {
         if (speedF > 5.0f) {
@@ -1075,7 +1017,6 @@ void daItem_c::bg_check() {
     }
 }
 
-/* 8015D834-8015D95C 158174 0128+00 1/1 0/0 0/0 .text            set_bound_se__8daItem_cFv */
 void daItem_c::set_bound_se() {
     if (m_get_timer < 10) {
         return;
@@ -1105,10 +1046,8 @@ void daItem_c::set_bound_se() {
     }
 }
 
-/* 804506A8-804506B0 000128 0004+04 1/1 0/0 0/0 .sdata           m_timer_max__8daItem_c */
 s32 daItem_c::m_timer_max = 10000;
 
-/* 8015D95C-8015D9F0 15829C 0094+00 1/1 0/0 0/0 .text            CountTimer__8daItem_cFv */
 int daItem_c::CountTimer() {
     m_timer++;
 
@@ -1128,7 +1067,6 @@ int daItem_c::CountTimer() {
     return 1;
 }
 
-/* 8015D9F0-8015DAAC 158330 00BC+00 1/1 0/0 0/0 .text            initAction__8daItem_cFv */
 int daItem_c::initAction() {
     initFlag();
     initScale();
@@ -1144,7 +1082,6 @@ int daItem_c::initAction() {
     return 1;
 }
 
-/* 8015DAAC-8015DBF0 1583EC 0144+00 2/1 0/0 0/0 .text            initFlag__8daItem_cFv */
 void daItem_c::initFlag() {
     u8 type = daItem_prm::getType(this);
 
@@ -1194,7 +1131,6 @@ void daItem_c::initFlag() {
     }
 }
 
-/* 8015DBF0-8015DC40 158530 0050+00 2/1 0/0 0/0 .text            initScale__8daItem_cFv */
 void daItem_c::initScale() {
     switch (daItem_prm::getType(this)) {
     case TYPE_LAUNCH_e:
@@ -1215,7 +1151,6 @@ void daItem_c::initScale() {
     }
 }
 
-/* 803B9E98-803B9F10 016FB8 0078+00 1/2 0/0 0/0 .data            mFuncPtr__8daItem_c */
 procFunc daItem_c::mFuncPtr[] = {
     &daItem_c::procMainNormal,        &daItem_c::procMainEnemyCarry,
     &daItem_c::procMainSimpleGetDemo, &daItem_c::procWaitGetDemoEvent,
@@ -1224,7 +1159,6 @@ procFunc daItem_c::mFuncPtr[] = {
     &daItem_c::procMainForceGet,      NULL,
 };
 
-/* 803B9F10-803B9F54 017030 0044+00 1/1 0/0 0/0 .data            m_cyl_src__8daItem_c */
 dCcD_SrcCyl daItem_c::m_cyl_src = {
     {
         {0, {{0, 0, 0}, {0xFFFFFFFF, 17}, 0x59}},
@@ -1239,7 +1173,6 @@ dCcD_SrcCyl daItem_c::m_cyl_src = {
     },
 };
 
-/* 8015DC40-8015DE38 158580 01F8+00 2/2 0/0 0/0 .text            initSpeed__8daItem_cFi */
 void daItem_c::initSpeed(BOOL i_noTypeChk) {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1275,7 +1208,6 @@ void daItem_c::initSpeed(BOOL i_noTypeChk) {
     fopAcM_SetSpeedF(this, speedf);
 }
 
-/* 8015DE38-8015DE50 158778 0018+00 1/1 0/0 0/0 .text            initAngle__8daItem_cFv */
 void daItem_c::initAngle() {
     current.angle.z = 0;
     current.angle.x = 0;
@@ -1283,34 +1215,28 @@ void daItem_c::initAngle() {
     shape_angle.x = 0;
 }
 
-/* 8015DE50-8015DE70 158790 0020+00 1/0 0/0 0/0 .text            daItem_Draw__FP8daItem_c */
 static int daItem_Draw(daItem_c* i_this) {
     return i_this->_daItem_draw();
 }
 
-/* 8015DE70-8015DE90 1587B0 0020+00 1/0 0/0 0/0 .text            daItem_Execute__FP8daItem_c */
 static int daItem_Execute(daItem_c* i_this) {
     return i_this->_daItem_execute();
 }
 
-/* 8015DE90-8015DEB0 1587D0 0020+00 1/0 0/0 0/0 .text            daItem_Delete__FP8daItem_c */
 static int daItem_Delete(daItem_c* i_this) {
     return i_this->_daItem_delete();
 }
 
-/* 8015DEB0-8015DED0 1587F0 0020+00 1/0 0/0 0/0 .text            daItem_Create__FP10fopAc_ac_c */
 static int daItem_Create(fopAc_ac_c* i_this) {
     return static_cast<daItem_c*>(i_this)->_daItem_create();
 }
 
-/* 803B9F54-803B9F74 -00001 0020+00 1/0 0/0 0/0 .data            l_daItem_Method */
 static actor_method_class l_daItem_Method = {
     (process_method_func)daItem_Create,  (process_method_func)daItem_Delete,
     (process_method_func)daItem_Execute, (process_method_func)NULL,
     (process_method_func)daItem_Draw,
 };
 
-/* 803B9F74-803B9FA4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ITEM */
 extern actor_process_profile_definition g_profile_ITEM = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp
index f3e9dcf036..09b8b62985 100644
--- a/src/d/actor/d_a_obj_ito.cpp
+++ b/src/d/actor/d_a_obj_ito.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 8047B2EC-8047B324 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__15daObj_Ito_HIO_cFv */
 daObj_Ito_HIO_c::daObj_Ito_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 4.5f;
@@ -19,13 +18,10 @@ daObj_Ito_HIO_c::daObj_Ito_HIO_c() {
     field_0x10 = 1;
 }
 
-/* 8047D9C8-8047D9CC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHio;
 
-/* 8047D9D8-8047D9EC 000018 0014+00 5/5 0/0 0/0 .bss             l_HIO */
 static daObj_Ito_HIO_c l_HIO;
 
-/* 8047B324-8047B504 000124 01E0+00 1/0 0/0 0/0 .text            daObj_Ito_Draw__FP13obj_ito_class  */
 static int daObj_Ito_Draw(obj_ito_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     if (!i_this->field_0x639) {
@@ -58,7 +54,6 @@ static int daObj_Ito_Draw(obj_ito_class* i_this) {
     return 1;
 }
 
-/* 8047B504-8047B9A4 000304 04A0+00 1/1 0/0 0/0 .text cut_line_calc__FP13obj_ito_classP5ito_si */
 static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
     int i;
     fopAc_ac_c* a_this = &i_this->actor;
@@ -140,7 +135,6 @@ static void cut_line_calc(obj_ito_class* i_this, ito_s* param_2, int param_3) {
     }
 }
 
-/* 8047B9E0-8047BAF8 0007E0 0118+00 1/1 0/0 0/0 .text            cut_line__FP13obj_ito_class */
 static void cut_line(obj_ito_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -165,7 +159,6 @@ static void cut_line(obj_ito_class* i_this) {
     }
 }
 
-/* 8047BAF8-8047BF8C 0008F8 0494+00 1/1 0/0 0/0 .text            cut_set__FP13obj_ito_classi */
 static void cut_set(obj_ito_class* i_this, int param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     i_this->field_0x1038 = 1;
@@ -213,7 +206,6 @@ static void cut_set(obj_ito_class* i_this, int param_2) {
     }
 }
 
-/* 8047BF8C-8047C034 000D8C 00A8+00 1/1 0/0 0/0 .text            ito_end__FP5ito_s */
 static void ito_end(ito_s* i_this) {
     cLib_addCalc0(&i_this->field_0x250, 1.0f, 1.0f);
 
@@ -231,7 +223,6 @@ static void ito_end(ito_s* i_this) {
     }
 }
 
-/* 8047C034-8047CEE4 000E34 0EB0+00 1/1 0/0 0/0 .text            action__FP13obj_ito_class */
 static void action(obj_ito_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor;
     obj_gm_class* actor_p = (obj_gm_class*)fopAcM_SearchByID(a_this->parentActorID);
@@ -514,7 +505,6 @@ static void action(obj_ito_class* i_this) {
     }
 }
 
-/* 8047CEE4-8047CFA8 001CE4 00C4+00 1/0 0/0 0/0 .text daObj_Ito_Execute__FP13obj_ito_class */
 static int daObj_Ito_Execute(obj_ito_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -539,12 +529,10 @@ static int daObj_Ito_Execute(obj_ito_class* i_this) {
     return 1;
 }
 
-/* 8047CFA8-8047CFB0 001DA8 0008+00 1/0 0/0 0/0 .text daObj_Ito_IsDelete__FP13obj_ito_class */
 static int daObj_Ito_IsDelete(obj_ito_class* i_this) {
     return 1;
 }
 
-/* 8047CFB0-8047D024 001DB0 0074+00 1/0 0/0 0/0 .text            daObj_Ito_Delete__FP13obj_ito_class  */
 static int daObj_Ito_Delete(obj_ito_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -561,7 +549,6 @@ static int daObj_Ito_Delete(obj_ito_class* i_this) {
     return 1;
 }
 
-/* 8047D024-8047D1D8 001E24 01B4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_ito_class* i_this = (obj_ito_class*)a_this;
 
@@ -605,7 +592,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 8047D1D8-8047D594 001FD8 03BC+00 1/0 0/0 0/0 .text            daObj_Ito_Create__FP10fopAc_ac_c */
 static cPhs__Step daObj_Ito_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_ito_class);
     obj_ito_class* i_this = (obj_ito_class*)a_this;
@@ -696,7 +682,6 @@ static cPhs__Step daObj_Ito_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 8047D938-8047D958 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Ito_Method */
 static actor_method_class l_daObj_Ito_Method = {
     (process_method_func)daObj_Ito_Create,
     (process_method_func)daObj_Ito_Delete,
@@ -705,7 +690,6 @@ static actor_method_class l_daObj_Ito_Method = {
     (process_method_func)daObj_Ito_Draw,
 };
 
-/* 8047D958-8047D988 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_ITO */
 extern actor_process_profile_definition g_profile_OBJ_ITO = {
   fpcLy_CURRENT_e,        // mLayerID
   4,                      // mListID
diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp
index 0d387d56d2..a6cf31ce20 100644
--- a/src/d/actor/d_a_obj_kabuto.cpp
+++ b/src/d/actor/d_a_obj_kabuto.cpp
@@ -13,13 +13,10 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80C2E2F0-80C2E2F4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80C2E300-80C2E314 000018 0014+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_KabHIO_c l_HIO;
 
-/* 80C2AE6C-80C2AEA4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__14daObj_KabHIO_cFv */
 daObj_KabHIO_c::daObj_KabHIO_c() {
     field_0x4 = -1;
     field_0xc = 1.5f;
@@ -27,7 +24,6 @@ daObj_KabHIO_c::daObj_KabHIO_c() {
     field_0x10 = -0.6f;
 }
 
-/* 80C2AEA4-80C2AF10 000124 006C+00 1/1 0/0 0/0 .text            InitCcSph__13daObjKABUTO_cFv */
 void daObjKABUTO_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -48,19 +44,16 @@ void daObjKABUTO_c::InitCcSph() {
     mCcSph.OnTgNoHitMark();
 }
 
-/* 80C2AF10-80C2AF68 000190 0058+00 1/1 0/0 0/0 .text            SetCcSph__13daObjKABUTO_cFv */
 void daObjKABUTO_c::SetCcSph() {
     mCcSph.SetC(current.pos);
     mCcSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80C2AF68-80C2AF88 0001E8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObjKABUTO_c*>(i_this)->CreateHeap();
 }
 
-/* 80C2AF88-80C2B2E0 000208 0358+00 1/1 0/0 0/0 .text            CreateHeap__13daObjKABUTO_cFv */
 int daObjKABUTO_c::CreateHeap() {
     J3DModelData* model_data;
     if (mSex == SEX_FEMALE) {
@@ -113,20 +106,15 @@ int daObjKABUTO_c::CreateHeap() {
     return 1;
 }
 
-/* 80C2B328-80C2B348 0005A8 0020+00 1/0 0/0 0/0 .text            daObjKABUTO_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObjKABUTO_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjKABUTO_c*>(i_this)->create();
 }
 
-/* 80C2B348-80C2B36C 0005C8 0024+00 1/0 0/0 0/0 .text daObjKABUTO_Delete__FP13daObjKABUTO_c */
 static int daObjKABUTO_Delete(daObjKABUTO_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80C2B36C-80C2B4D4 0005EC 0168+00 1/1 0/0 0/0 .text            ShopWaitAction__13daObjKABUTO_cFv
- */
 void daObjKABUTO_c::ShopWaitAction() {
     switch (mMode) {
     case 0:
@@ -158,7 +146,6 @@ void daObjKABUTO_c::ShopWaitAction() {
     }
 }
 
-/* 80C2B4D4-80C2B618 000754 0144+00 1/1 0/0 0/0 .text            WaitAction__13daObjKABUTO_cFv */
 void daObjKABUTO_c::WaitAction() {
     switch (mMode) {
     case 0:
@@ -184,7 +171,6 @@ void daObjKABUTO_c::WaitAction() {
     }
 }
 
-/* 80C2B618-80C2B844 000898 022C+00 1/1 0/0 0/0 .text            WallCheck__13daObjKABUTO_cFv */
 BOOL daObjKABUTO_c::WallCheck() {
     dBgS_LinChk lin_chk;
     lin_chk.SetObj();
@@ -204,7 +190,6 @@ BOOL daObjKABUTO_c::WallCheck() {
     return false;
 }
 
-/* 80C2B88C-80C2B998 000B0C 010C+00 1/1 0/0 0/0 .text            SpeedSet__13daObjKABUTO_cFv */
 void daObjKABUTO_c::SpeedSet() {
     speed.y += gravity;
     cXyz speed_base(0.0f, speed.y, speedF);
@@ -221,7 +206,6 @@ void daObjKABUTO_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C2B998-80C2BDE8 000C18 0450+00 1/1 0/0 0/0 .text            WallWalk__13daObjKABUTO_cFv */
 void daObjKABUTO_c::WallWalk() {
     cXyz vec1(0.0f, -100.0f, speedF * 3.0f);
     cXyz vec2(0.0f, 40.0f, 0.0f);
@@ -263,7 +247,6 @@ void daObjKABUTO_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C2BDE8-80C2BFE8 001068 0200+00 2/2 0/0 0/0 .text            WalkAction__13daObjKABUTO_cFv */
 void daObjKABUTO_c::WalkAction() {
     for (int i = 0; i < 3; i++) {
         mTimers[i]--;
@@ -310,7 +293,6 @@ void daObjKABUTO_c::WalkAction() {
     WallWalk();
 }
 
-/* 80C2BFE8-80C2C7C8 001268 07E0+00 2/2 0/0 0/0 .text            MoveAction__13daObjKABUTO_cFv */
 void daObjKABUTO_c::MoveAction() {
     for (int i = 0; i < 3; i++) {
         mTimers[i]--;
@@ -444,7 +426,6 @@ void daObjKABUTO_c::MoveAction() {
     }
 }
 
-/* 80C2C7C8-80C2C944 001A48 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__13daObjKABUTO_cFv */
 void daObjKABUTO_c::Z_BufferChk() {
     cXyz vec2, vec1;
     vec1 = current.pos;
@@ -471,7 +452,6 @@ void daObjKABUTO_c::Z_BufferChk() {
     mScreenZ = ((near + far * near / vec2.z) / (far - near) + 1.0f) * 0xffffff;
 }
 
-/* 80C2C944-80C2CA08 001BC4 00C4+00 1/1 0/0 0/0 .text            Action__13daObjKABUTO_cFv */
 void daObjKABUTO_c::Action() {
     switch (mAction) {
     case ACT_WAIT:
@@ -489,7 +469,6 @@ void daObjKABUTO_c::Action() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C2CA08-80C2CAC4 001C88 00BC+00 1/1 0/0 0/0 .text            ShopAction__13daObjKABUTO_cFv */
 void daObjKABUTO_c::ShopAction() {
     switch (mAction) {
     case ACT_WAIT:
@@ -506,15 +485,12 @@ void daObjKABUTO_c::ShopAction() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C2CAC4-80C2CADC 001D44 0018+00 1/0 0/0 0/0 .text            Insect_Release__13daObjKABUTO_cFv
- */
 void daObjKABUTO_c::Insect_Release() {
     field_0x56c = 1;
     mAction = ACT_MOVE;
     mMode = 0;
 }
 
-/* 80C2E1E0-80C2E1E4 0000D0 0002+02 1/2 0/0 0/0 .rodata          l_kab_itemno */
 static u8 const l_kab_itemno[2] = {fpcNm_ITEM_M_BEETLE, fpcNm_ITEM_F_BEETLE};
 
 // Some unused function went here.
@@ -523,7 +499,6 @@ static f32 fake(f32 param_0) {
     return param_0 * -9.0f * -0.2f * 0.05f;
 }
 
-/* 80C2CADC-80C2CC18 001D5C 013C+00 1/1 0/0 0/0 .text            ParticleSet__13daObjKABUTO_cFv */
 void daObjKABUTO_c::ParticleSet() {
     if (mScreenZ > mBufferZ) {
         cLib_chaseF(&mParticleScale, 0.0f, 1.0f);
@@ -543,7 +518,6 @@ void daObjKABUTO_c::ParticleSet() {
     }
 }
 
-/* 80C2CC18-80C2D21C 001E98 0604+00 1/1 0/0 0/0 .text            Execute__13daObjKABUTO_cFv */
 int daObjKABUTO_c::Execute() {
     if (ChkGetDemo()) {
         mScreenZ = mBufferZ + 10000.0f;
@@ -637,7 +611,6 @@ int daObjKABUTO_c::Execute() {
     return 1;
 }
 
-/* 80C2D21C-80C2D3A4 00249C 0188+00 1/1 0/0 0/0 .text            ObjHit__13daObjKABUTO_cFv */
 void daObjKABUTO_c::ObjHit() {
     if (mCcSph.ChkTgHit()) {
         cCcD_Obj* hit_obj = mCcSph.GetTgHitObj();
@@ -664,7 +637,6 @@ void daObjKABUTO_c::ObjHit() {
     }
 }
 
-/* 80C2D3A4-80C2D40C 002624 0068+00 1/1 0/0 0/0 .text            Delete__13daObjKABUTO_cFv */
 int daObjKABUTO_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "Kab_m");
     if (mHIOInit) {
@@ -676,7 +648,6 @@ int daObjKABUTO_c::Delete() {
     return 1;
 }
 
-/* 80C2D40C-80C2D474 00268C 0068+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjKABUTO_cFv */
 void daObjKABUTO_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(mWallAngle);
@@ -703,24 +674,19 @@ int daObjKABUTO_c::Draw() {
     return 1;
 }
 
-/* 80C2D474-80C2D558 0026F4 00E4+00 1/0 0/0 0/0 .text            daObjKABUTO_Draw__FP13daObjKABUTO_c
- */
 static int daObjKABUTO_Draw(daObjKABUTO_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C2D558-80C2D578 0027D8 0020+00 2/1 0/0 0/0 .text daObjKABUTO_Execute__FP13daObjKABUTO_c */
 static int daObjKABUTO_Execute(daObjKABUTO_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C2E200-80C2E204 0000F0 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x0191, /* dSv_event_flag_c::F_0401 - Misc. - Beetle (M) */
     0x0192, /* dSv_event_flag_c::F_0402 - Misc. - Beetle (F) */
 };
 
-/* 80C2D578-80C2D724 0027F8 01AC+00 1/1 0/0 0/0 .text            CreateChk__13daObjKABUTO_cFv */
 bool daObjKABUTO_c::CreateChk() {
     u8 param = (fopAcM_GetParam(this) >> 8) & 0xf;
     if (param == 0xf) {
@@ -755,7 +721,6 @@ bool daObjKABUTO_c::CreateChk() {
     return true;
 }
 
-/* 80C2D724-80C2DF60 0029A4 083C+00 1/1 0/0 0/0 .text            create__13daObjKABUTO_cFv */
 cPhs__Step daObjKABUTO_c::create() {
     fopAcM_ct(this, daObjKABUTO_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "Kab_m");
@@ -883,12 +848,10 @@ cPhs__Step daObjKABUTO_c::create() {
     return step;
 }
 
-/* 80C2E060-80C2E068 0032E0 0008+00 1/0 0/0 0/0 .text daObjKABUTO_IsDelete__FP13daObjKABUTO_c */
 static int daObjKABUTO_IsDelete(daObjKABUTO_c* i_this) {
     return 1;
 }
 
-/* 80C2E228-80C2E248 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKABUTO_Method */
 static actor_method_class l_daObjKABUTO_Method = {
     (process_method_func)daObjKABUTO_Create,
     (process_method_func)daObjKABUTO_Delete,
@@ -897,7 +860,6 @@ static actor_method_class l_daObjKABUTO_Method = {
     (process_method_func)daObjKABUTO_Draw,
 };
 
-/* 80C2E248-80C2E278 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kabuto */
 extern actor_process_profile_definition g_profile_Obj_Kabuto = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp
index 93a92260df..2a90740521 100644
--- a/src/d/actor/d_a_obj_kag.cpp
+++ b/src/d/actor/d_a_obj_kag.cpp
@@ -29,8 +29,8 @@ enum I_Kag_RES_File_ID {
 
 class daObj_KagHIO_c : public JORReflexible {
 public:
-    /* 80C2E40C */ daObj_KagHIO_c();
-    /* 80C31060 */ virtual ~daObj_KagHIO_c() {}
+    daObj_KagHIO_c();
+    virtual ~daObj_KagHIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -40,13 +40,10 @@ public:
     /* 0x0C */ f32 model_scale_male;    // モデルスケール(オス) - Model Scale (Male)
 };
 
-/* 80C31430-80C31434 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_initHIO;
 
-/* 80C31440-80C31450 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_KagHIO_c l_HIO;
 
-/* 80C31290-80C312D0 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__25@unnamed@d_a_obj_kag_cpp@ */
 namespace {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -61,14 +58,12 @@ namespace {
     };
 }
 
-/* 80C2E40C-80C2E434 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_KagHIO_cFv */
 daObj_KagHIO_c::daObj_KagHIO_c() {
     id = -1;
     model_scale_male = 0.8f;
     model_scale_female = 0.8f;
 }
 
-/* 80C2E434-80C2E4D8 000114 00A4+00 8/8 0/0 0/0 .text            setAction__10daObjKAG_cFM10daObjKAG_cFPCvPv_v */
 void daObjKAG_c::setAction(actionFunc action) {
     if (mAction) {
         field_0x83c = -1;
@@ -82,12 +77,10 @@ void daObjKAG_c::setAction(actionFunc action) {
     (this->*mAction)();
 }
 
-/* 80C31150-80C31158 000004 0008+00 0/1 0/0 0/0 .rodata          l_kag_brk_index */
 static int const l_kag_brk_index[2] = {
     BRK_KAG_O, BRK_KAG_M,
 };
 
-/* 80C31158-80C31160 00000C 0008+00 0/1 0/0 0/0 .rodata          l_kag_btk_index */
 static int const l_kag_btk_index[2] = {
     BTK_KAG_O, BTK_KAG_M,
 };
@@ -125,23 +118,19 @@ int daObjKAG_c::CreateHeap() {
     return 1;
 }
 
-/* 80C2E4D8-80C2E714 0001B8 023C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     return static_cast<daObjKAG_c*>(a_this)->CreateHeap();
 }
 
-/* 80C2E75C-80C2E77C 00043C 0020+00 1/0 0/0 0/0 .text            daObjKAG_Create__FP10fopAc_ac_c */
 static int daObjKAG_Create(fopAc_ac_c* a_this) {
     return static_cast<daObjKAG_c*>(a_this)->create();
 }
 
-/* 80C2E77C-80C2E7A0 00045C 0024+00 1/0 0/0 0/0 .text            daObjKAG_Delete__FP10daObjKAG_c */
 static int daObjKAG_Delete(daObjKAG_c* i_this) {
     i_this->_delete();
     return 1;
 }
 
-/* 80C2E7A0-80C2E9F8 000480 0258+00 1/1 0/0 0/0 .text            Kag_Bgcheck__10daObjKAG_cFP4cXyzP5csXyzP4cXyz */
 bool daObjKAG_c::Kag_Bgcheck(cXyz* param_1, csXyz* param_2, cXyz* param_3) {
     dBgS_LinChk lin_chk;
     lin_chk.SetObj();
@@ -174,7 +163,6 @@ bool daObjKAG_c::Kag_Bgcheck(cXyz* param_1, csXyz* param_2, cXyz* param_3) {
     return false;
 }
 
-/* 80C2EA40-80C2F764 000720 0D24+00 6/0 0/0 0/0 .text            fly__10daObjKAG_cFv */
 void daObjKAG_c::fly() {
     if (field_0x83c == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), 2, 5.0f, 0.5f, 0.0f, -1.0f);
@@ -297,7 +285,6 @@ void daObjKAG_c::fly() {
     }
 }
 
-/* 80C2F764-80C2F8C4 001444 0160+00 2/0 0/0 0/0 .text            wait__10daObjKAG_cFv */
 void daObjKAG_c::wait() {
     if (field_0x83c == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_WALK), 2, 5.0f, 0.0f, 0.0f, -1.0f);
@@ -320,7 +307,6 @@ void daObjKAG_c::wait() {
     }
 }
 
-/* 80C2F8C4-80C2FD94 0015A4 04D0+00 1/0 0/0 0/0 .text            walk__10daObjKAG_cFv */
 void daObjKAG_c::walk() {
     if (field_0x83c == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_WALK), 2, 5.0f, 1.0f, 0.0f, -1.0f);
@@ -391,7 +377,6 @@ void daObjKAG_c::walk() {
     }
 }
 
-/* 80C2FD94-80C2FF10 001A74 017C+00 1/0 0/0 0/0 .text            bin_wait__10daObjKAG_cFv */
 void daObjKAG_c::bin_wait() {
     if (field_0x83c == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.0f, 0.0f, -1.0f);
@@ -413,7 +398,6 @@ void daObjKAG_c::bin_wait() {
     }
 }
 
-/* 80C2FF10-80C30070 001BF0 0160+00 1/0 0/0 0/0 .text            bin_action__10daObjKAG_cFv */
 void daObjKAG_c::bin_action() {
     if (field_0x83c == 0) {
         mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), J3DFrameCtrl::EMode_LOOP, 5.0f, 0.5f, 0.0f, -1.0f);
@@ -447,7 +431,6 @@ void daObjKAG_c::bin_action() {
     }
 }
 
-/* 80C30070-80C30274 001D50 0204+00 1/0 0/0 0/0 .text            hook__10daObjKAG_cFv */
 void daObjKAG_c::hook() {
     if (field_0x83c == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -489,7 +472,6 @@ void daObjKAG_c::hook() {
     }
 }
 
-/* 80C30274-80C303C4 001F54 0150+00 1/0 0/0 0/0 .text            boomerang__10daObjKAG_cFv */
 void daObjKAG_c::boomerang() {
     if (field_0x83c == 0) {
         mSph.SetTgType(0);
@@ -517,7 +499,6 @@ void daObjKAG_c::boomerang() {
     }
 }
 
-/* 80C303C4-80C30424 0020A4 0060+00 1/1 0/0 0/0 .text            action__10daObjKAG_cFv */
 void daObjKAG_c::action() {
     (this->*mAction)();
     shape_angle = current.angle;
@@ -527,13 +508,11 @@ void daObjKAG_c::action() {
     }
 }
 
-/* 80C31234-80C31238 0000E8 0002+02 0/1 0/0 0/0 .rodata          l_kag_itemno */
 static u8 const l_kag_itemno[2] = {
     0xD6,
     0xD7,
 };
 
-/* 80C30424-80C30498 002104 0074+00 1/1 0/0 0/0 .text            checkGroundPos__10daObjKAG_cFv */
 void daObjKAG_c::checkGroundPos() {
     cXyz sp28(current.pos);
     mGndChk.SetPos(&sp28);
@@ -544,7 +523,6 @@ void daObjKAG_c::checkGroundPos() {
     }
 }
 
-/* 80C30498-80C3054C 002178 00B4+00 1/1 0/0 0/0 .text            hit_check__10daObjKAG_cFv */
 void daObjKAG_c::hit_check() {
     dCcU_AtInfo atInfo;
     mStts.Move();
@@ -560,7 +538,6 @@ void daObjKAG_c::hit_check() {
     }
 }
 
-/* 80C3054C-80C306EC 00222C 01A0+00 1/1 0/0 0/0 .text            execute__10daObjKAG_cFv */
 int daObjKAG_c::execute() {
     if (ChkGetDemo()) {
         field_0x57c = field_0x578 + 10000.0f;
@@ -601,7 +578,6 @@ int daObjKAG_c::execute() {
     return 1;
 }
 
-/* 80C306EC-80C30754 0023CC 0068+00 1/1 0/0 0/0 .text            _delete__10daObjKAG_cFv */
 int daObjKAG_c::_delete() {
     dComIfG_resDelete(&mPhase, "I_Kag");
 
@@ -617,7 +593,6 @@ int daObjKAG_c::_delete() {
     return 1;
 }
 
-/* 80C30754-80C307D4 002434 0080+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjKAG_cFv */
 void daObjKAG_c::setBaseMtx() {
     J3DModel* model = mpModelMorf->getModel();
     mDoMtx_stack_c::transS(current.pos);
@@ -651,23 +626,19 @@ int daObjKAG_c::draw() {
     return 1;
 }
 
-/* 80C307D4-80C308D0 0024B4 00FC+00 1/0 0/0 0/0 .text            daObjKAG_Draw__FP10daObjKAG_c */
 static int daObjKAG_Draw(daObjKAG_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C308D0-80C308F0 0025B0 0020+00 2/1 0/0 0/0 .text            daObjKAG_Execute__FP10daObjKAG_c */
 static int daObjKAG_Execute(daObjKAG_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C31258-80C3125C 00010C 0004+00 0/1 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x01A7,
     0x01A8
 };
 
-/* 80C308F0-80C30D60 0025D0 0470+00 1/1 0/0 0/0 .text            create__10daObjKAG_cFv */
 cPhs__Step daObjKAG_c::create() {
     u8 uVar1 = (fopAcM_GetParam(this) & 0xF00) >> 8;
 
@@ -758,12 +729,10 @@ cPhs__Step daObjKAG_c::create() {
     return phase;
 }
 
-/* 80C30E4C-80C30E54 002B2C 0008+00 1/0 0/0 0/0 .text            daObjKAG_IsDelete__FP10daObjKAG_c */
 static int daObjKAG_IsDelete(daObjKAG_c* i_this) {
     return 1;
 }
 
-/* 80C30E54-80C31060 002B34 020C+00 7/7 0/0 0/0 .text            kag_setParticle__10daObjKAG_cFv */
 void daObjKAG_c::kag_setParticle() {
     if (CheckZ()) {
         cLib_chaseF(&field_0x844, 0.0f, 1.0f);
@@ -790,7 +759,6 @@ void daObjKAG_c::kag_setParticle() {
     }
 }
 
-/* 80C3136C-80C3138C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKAG_Method */
 static actor_method_class l_daObjKAG_Method = {
     (process_method_func)daObjKAG_Create,
     (process_method_func)daObjKAG_Delete,
@@ -799,7 +767,6 @@ static actor_method_class l_daObjKAG_Method = {
     (process_method_func)daObjKAG_Draw,
 };
 
-/* 80C3138C-80C313BC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kag */
 extern actor_process_profile_definition g_profile_Obj_Kag = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp
index ddb43d6b44..df3688c22a 100644
--- a/src/d/actor/d_a_obj_kage.cpp
+++ b/src/d/actor/d_a_obj_kage.cpp
@@ -9,8 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
 
-/* 80C314D8-80C3153C 000078 0064+00 1/0 0/0 0/0 .text            daObj_Kage_Draw__FP14obj_kage_class
- */
 static int daObj_Kage_Draw(obj_kage_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -20,7 +18,6 @@ static int daObj_Kage_Draw(obj_kage_class* i_this) {
     return 1;
 }
 
-/* 80C3153C-80C31764 0000DC 0228+00 2/1 0/0 0/0 .text daObj_Kage_Execute__FP14obj_kage_class */
 static int daObj_Kage_Execute(obj_kage_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp14;
@@ -69,12 +66,10 @@ static int daObj_Kage_Execute(obj_kage_class* i_this) {
     return 1;
 }
 
-/* 80C31764-80C3176C 000304 0008+00 1/0 0/0 0/0 .text daObj_Kage_IsDelete__FP14obj_kage_class */
 static int daObj_Kage_IsDelete(obj_kage_class* i_this) {
     return 1;
 }
 
-/* 80C3176C-80C3179C 00030C 0030+00 1/0 0/0 0/0 .text daObj_Kage_Delete__FP14obj_kage_class */
 static int daObj_Kage_Delete(obj_kage_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -82,7 +77,6 @@ static int daObj_Kage_Delete(obj_kage_class* i_this) {
     return 1;
 }
 
-/* 80C3179C-80C31808 00033C 006C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     obj_kage_class* i_this = (obj_kage_class*)actor;
 
@@ -97,8 +91,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80C31808-80C31954 0003A8 014C+00 1/0 0/0 0/0 .text            daObj_Kage_Create__FP10fopAc_ac_c
- */
 static int daObj_Kage_Create(fopAc_ac_c* actor) {
     fopAcM_ct(actor, obj_kage_class);
     obj_kage_class* i_this = (obj_kage_class*)actor;
@@ -129,7 +121,6 @@ static int daObj_Kage_Create(fopAc_ac_c* actor) {
     return phase_state;
 }
 
-/* 80C3199C-80C319BC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Kage_Method */
 static actor_method_class l_daObj_Kage_Method = {
     (process_method_func)daObj_Kage_Create,
     (process_method_func)daObj_Kage_Delete,
@@ -138,7 +129,6 @@ static actor_method_class l_daObj_Kage_Method = {
     (process_method_func)daObj_Kage_Draw,
 };
 
-/* 80C319BC-80C319EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KAGE */
 extern actor_process_profile_definition g_profile_OBJ_KAGE = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp
index 8b58c87d71..71dac5ff0d 100644
--- a/src/d/actor/d_a_obj_kago.cpp
+++ b/src/d/actor/d_a_obj_kago.cpp
@@ -14,8 +14,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* ############################################################################################## */
-/* 80C33C80-80C33CAC 000000 002C+00 5/5 0/0 0/0 .rodata          m__18daObj_Kago_Param_c */
 daObj_Kago_Param_c::Data const daObj_Kago_Param_c::m = {
     0.0f,
     -5.0f,
@@ -44,18 +42,15 @@ const dCcD_SrcGObjInf l_ccDObjData = {
     {0} // mGObjCo
 };
 
-/* 80C33DC0-80C33DD0 000020 0010+00 2/3 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[2][2] = {
     { 3, 1 }, { 4, 1 },
 };
 
-/* 80C33DD0-80C33DD8 -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "uri_kago"
 };
 
-/* 80C33DD8-80C33E1C 000038 0044+00 1/2 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     daNpcT_c::mCcDObjData, // mObjInf
     {
@@ -65,7 +60,6 @@ static dCcD_SrcCyl l_ccDCyl = {
     } // mCyl
 };
 
-/* 80C31AEC-80C31C90 0000EC 01A4+00 1/0 0/0 0/0 .text            __dt__12daObj_Kago_cFv */
 daObj_Kago_c::~daObj_Kago_c() {
     OS_REPORT("|%06d:%x|daObj_Kago_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (mType == 0 && daNpcT_chkTmpBit(7)) {
@@ -75,7 +69,6 @@ daObj_Kago_c::~daObj_Kago_c() {
     dComIfG_resDelete(&mPhase, l_resNameList[l_bmdData[0][1]]);
 }
 
-/* 80C31D5C-80C320FC 00035C 03A0+00 1/1 0/0 0/0 .text            create__12daObj_Kago_cFv */
 cPhs__Step daObj_Kago_c::create() {
     static int const heapSize[5] = {
         0x0820, 0x0820, 0, 0x0820, 0,
@@ -131,7 +124,6 @@ cPhs__Step daObj_Kago_c::create() {
     return phase;
 }
 
-/* 80C323D0-80C324B0 0009D0 00E0+00 1/1 0/0 0/0 .text            CreateHeap__12daObj_Kago_cFv */
 int daObj_Kago_c::CreateHeap() {
     J3DModelData* modelData;
     if (mType == 2 || mType == 3) {
@@ -152,14 +144,12 @@ int daObj_Kago_c::CreateHeap() {
     return 1;
 }
 
-/* 80C324B0-80C324E4 000AB0 0034+00 1/1 0/0 0/0 .text            Delete__12daObj_Kago_cFv */
 int daObj_Kago_c::Delete() {
     fopAcM_GetID(this);
     this->~daObj_Kago_c();
     return 1;
 }
 
-/* 80C324E4-80C332D0 000AE4 0DEC+00 2/2 0/0 0/0 .text            Execute__12daObj_Kago_cFv */
 int daObj_Kago_c::Execute() {
     int iVar1 = 0;
     f32 fVar1;
@@ -480,7 +470,6 @@ int daObj_Kago_c::Execute() {
     return 1;
 }
 
-/* 80C332D0-80C333F0 0018D0 0120+00 1/1 0/0 0/0 .text            Draw__12daObj_Kago_cFv */
 int daObj_Kago_c::Draw() {
     if(field_0xb9f == 0 && health != 3) {
 #if VERSION == VERSION_SHIELD_DEBUG
@@ -505,13 +494,11 @@ int daObj_Kago_c::Draw() {
     return 1;
 }
 
-/* 80C333F0-80C33410 0019F0 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__12daObj_Kago_cFP10fopAc_ac_c */
 int daObj_Kago_c::createHeapCallBack(fopAc_ac_c* actor) {
     daObj_Kago_c* i_this = (daObj_Kago_c*)actor;
     return i_this->CreateHeap();
 }
 
-/* 80C33410-80C334B4 001A10 00A4+00 2/2 0/0 0/0 .text            isDelete__12daObj_Kago_cFv */
 BOOL daObj_Kago_c::isDelete() {
     u8 rv;
     switch (mType) {
@@ -538,26 +525,22 @@ BOOL daObj_Kago_c::isDelete() {
     }
 }
 
-/* 80C334B4-80C33510 001AB4 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__12daObj_Kago_cFv */
 void daObj_Kago_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(field_0x7cc);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(field_0x7cc);
 }
 
-/* 80C33510-80C33554 001B10 0044+00 2/2 0/0 0/0 .text            setRoomNo__12daObj_Kago_cFv */
 void daObj_Kago_c::setRoomNo() {
     int room_id = dComIfG_Bgsp().GetRoomId(field_0x7cc);
     fopAcM_SetRoomNo(this, room_id);
     mStts.SetRoomId(room_id);
 }
 
-/* 80C33554-80C3359C 001B54 0048+00 1/1 0/0 0/0 .text            reset__12daObj_Kago_cFv */
 void daObj_Kago_c::reset() {
     memset(&field_0xb14, 0, (u8*)&field_0xba3 - (u8*)&field_0xb14);
     field_0xb0c = 1.0f;
 }
 
-/* 80C3359C-80C33620 001B9C 0084+00 1/1 0/0 0/0 .text            setMtx__12daObj_Kago_cFv */
 void daObj_Kago_c::setMtx() {
     csXyz acStack_18(shape_angle);
     acStack_18.y += field_0xb74;
@@ -567,7 +550,6 @@ void daObj_Kago_c::setMtx() {
     field_0x574->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C33620-80C337B0 001C20 0190+00 1/1 0/0 0/0 .text            getWallAngle__12daObj_Kago_cFsPs */
 int daObj_Kago_c::getWallAngle(s16 param_1, s16* param_2) {
     cXyz sp40[2];
     cXyz sp50, sp5c;
@@ -595,10 +577,8 @@ int daObj_Kago_c::getWallAngle(s16 param_1, s16* param_2) {
     return 1;
 }
 
-/* 80C33F4C-80C33F50 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Kago_Param_c l_HIO;
 
-/* 80C337B0-80C338D0 001DB0 0120+00 1/1 0/0 0/0 .text setGoalPosAndAngle__12daObj_Kago_cFv */
 void daObj_Kago_c::setGoalPosAndAngle() {
     static cXyz pos(1593.0f, 659.0f, -334.0f);
     static s16 angle = 0x471C;
@@ -611,7 +591,6 @@ void daObj_Kago_c::setGoalPosAndAngle() {
     old.pos = current.pos;
 }
 
-/* 80C338D0-80C33958 001ED0 0088+00 1/1 0/0 0/0 .text            setSmokePrtcl__12daObj_Kago_cFv */
 void daObj_Kago_c::setSmokePrtcl() {
     if (field_0xb9f == 0) {
         fopAcM_effSmokeSet1(&field_0xb94, &field_0xb98, &current.pos, NULL, 0.7f, &tevStr, 1);
@@ -620,7 +599,6 @@ void daObj_Kago_c::setSmokePrtcl() {
     }
 }
 
-/* 80C33958-80C33A58 001F58 0100+00 1/1 0/0 0/0 .text            setWaterPrtcl__12daObj_Kago_cFv */
 void daObj_Kago_c::setWaterPrtcl() {
     static u16 emttrId[4] = {
         0x01B8, 0x01B9, 0x01BA, 0x01BB,
@@ -637,7 +615,6 @@ void daObj_Kago_c::setWaterPrtcl() {
     }
 }
 
-/* 80C33A58-80C33AB4 002058 005C+00 1/1 0/0 0/0 .text            setHamonPrtcl__12daObj_Kago_cFv */
 void daObj_Kago_c::setHamonPrtcl() {
     if (field_0xb9f == 0) {
         cXyz sp18(current.pos.x, mWaterY, current.pos.z);
@@ -645,38 +622,32 @@ void daObj_Kago_c::setHamonPrtcl() {
     }
 }
 
-/* 80C33AB4-80C33AD4 0020B4 0020+00 1/0 0/0 0/0 .text            daObj_Kago_Create__FPv */
 static int daObj_Kago_Create(void* param_1) {
     daObj_Kago_c* i_this = (daObj_Kago_c*)param_1;
     return i_this->create();
 }
 
-/* 80C33AD4-80C33AF4 0020D4 0020+00 1/0 0/0 0/0 .text            daObj_Kago_Delete__FPv */
 static int daObj_Kago_Delete(void* param_1) {
     daObj_Kago_c* i_this = (daObj_Kago_c*)param_1;
     return i_this->Delete();
 }
 
-/* 80C33AF4-80C33B14 0020F4 0020+00 1/0 0/0 0/0 .text            daObj_Kago_Execute__FPv */
 static int daObj_Kago_Execute(void* param_1) {
     daObj_Kago_c* i_this = (daObj_Kago_c*)param_1;
     return i_this->Execute();
 }
 
-/* 80C33B14-80C33B34 002114 0020+00 1/0 0/0 0/0 .text            daObj_Kago_Draw__FPv */
 static int daObj_Kago_Draw(void* param_1) {
     daObj_Kago_c* i_this = (daObj_Kago_c*)param_1;
     return i_this->Draw();
 }
 
-/* 80C33B34-80C33B3C 002134 0008+00 1/0 0/0 0/0 .text            daObj_Kago_IsDelete__FPv */
 static int daObj_Kago_IsDelete(void* param_1) {
     return 1;
 }
 
 AUDIO_INSTANCES;
 
-/* 80C33E24-80C33E44 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Kago_MethodTable */
 static actor_method_class daObj_Kago_MethodTable = {
     (process_method_func)daObj_Kago_Create,
     (process_method_func)daObj_Kago_Delete,
@@ -685,7 +656,6 @@ static actor_method_class daObj_Kago_MethodTable = {
     (process_method_func)daObj_Kago_Draw,
 };
 
-/* 80C33E44-80C33E74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KAGO */
 extern actor_process_profile_definition g_profile_OBJ_KAGO = {
   fpcLy_CURRENT_e,         // mLayerID
   8,                       // mListID
diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp
index a075a01b5f..6d825948ec 100644
--- a/src/d/actor/d_a_obj_kaisou.cpp
+++ b/src/d/actor/d_a_obj_kaisou.cpp
@@ -16,7 +16,6 @@ enum Joint {
     /* 0x2 */ JNT_JOINT3,
 };
 
-/* 80C34058-80C34288 000078 0230+00 1/1 0/0 0/0 .text            ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel */
 int daObjKaisou_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     int jntNo = joint->getJntNo();
@@ -54,7 +53,6 @@ int daObjKaisou_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80C34288-80C342D4 0002A8 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -67,7 +65,6 @@ static int JointCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80C34FC0-80C34FC4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_kaisou";
 
 int daObjKaisou_c::CreateHeap() {
@@ -81,27 +78,23 @@ int daObjKaisou_c::CreateHeap() {
     return 1;
 }
 
-/* 80C342D4-80C3434C 0002F4 0078+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daObjKaisou_c* i_this = (daObjKaisou_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80C3434C-80C3436C 00036C 0020+00 1/0 0/0 0/0 .text            daObjKaisou_Create__FP10fopAc_ac_c */
 static int daObjKaisou_Create(fopAc_ac_c* a_this) {
     daObjKaisou_c* i_this = (daObjKaisou_c*)a_this;
     fpc_ProcID id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80C3436C-80C34390 00038C 0024+00 1/0 0/0 0/0 .text daObjKaisou_Delete__FP13daObjKaisou_c */
 static int daObjKaisou_Delete(daObjKaisou_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->Delete();
     return 1;
 }
 
-/* 80C34390-80C343F0 0003B0 0060+00 1/1 0/0 0/0 .text            initCcCylinder__13daObjKaisou_cFv */
 void daObjKaisou_c::initCcCylinder() {
     mStts.Init(1, 0xFF, this);
 
@@ -123,13 +116,11 @@ void daObjKaisou_c::initCcCylinder() {
     mCyl.SetC(current.pos);
 }
 
-/* 80C343F0-80C34438 000410 0048+00 1/1 0/0 0/0 .text            setCcCylinder__13daObjKaisou_cFv */
 void daObjKaisou_c::setCcCylinder() {
     mCyl.SetC(current.pos);
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80C34438-80C34824 000458 03EC+00 2/1 0/0 0/0 .text            ObjHit__13daObjKaisou_cFv */
 void daObjKaisou_c::ObjHit() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 playerSpeedF = fopAcM_GetSpeedF(player);
@@ -200,7 +191,6 @@ void daObjKaisou_c::ObjHit() {
     }
 }
 
-/* 80C34824-80C34A98 000844 0274+00 1/1 0/0 0/0 .text            Execute__13daObjKaisou_cFv */
 int daObjKaisou_c::Execute() {
     mInvulnerabilityTimer--;
     if (mInvulnerabilityTimer <= 0) {
@@ -227,13 +217,11 @@ int daObjKaisou_c::Execute() {
     return 1;
 }
 
-/* 80C34A98-80C34ACC 000AB8 0034+00 1/1 0/0 0/0 .text            Delete__13daObjKaisou_cFv */
 int daObjKaisou_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C34ACC-80C34B34 000AEC 0068+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjKaisou_cFv */
 void daObjKaisou_c::setBaseMtx() {
     cXyz scale(yREG_F(5) + 2.0f, yREG_F(5) + 2.0f, yREG_F(5) + 2.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -250,17 +238,14 @@ int daObjKaisou_c::Draw() {
     return 1;
 }
 
-/* 80C34B34-80C34BB8 000B54 0084+00 1/0 0/0 0/0 .text            daObjKaisou_Draw__FP13daObjKaisou_c */
 static int daObjKaisou_Draw(daObjKaisou_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C34BB8-80C34BD8 000BD8 0020+00 2/1 0/0 0/0 .text daObjKaisou_Execute__FP13daObjKaisou_c */
 static int daObjKaisou_Execute(daObjKaisou_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C34BD8-80C34E4C 000BF8 0274+00 1/1 0/0 0/0 .text            create__13daObjKaisou_cFv */
 cPhs__Step daObjKaisou_c::create() {
     fopAcM_ct(this, daObjKaisou_c);
 
@@ -303,12 +288,10 @@ cPhs__Step daObjKaisou_c::create() {
     return phase;
 }
 
-/* 80C34EDC-80C34EE4 000EFC 0008+00 1/0 0/0 0/0 .text daObjKaisou_IsDelete__FP13daObjKaisou_c */
 static int daObjKaisou_IsDelete(daObjKaisou_c* i_this) {
     return 1;
 }
 
-/* 80C35038-80C35058 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKaisou_Method */
 static actor_method_class l_daObjKaisou_Method = {
     (process_method_func)daObjKaisou_Create,
     (process_method_func)daObjKaisou_Delete,
@@ -317,7 +300,6 @@ static actor_method_class l_daObjKaisou_Method = {
     (process_method_func)daObjKaisou_Draw,
 };
 
-/* 80C35058-80C35088 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kaisou */
 extern actor_process_profile_definition g_profile_Obj_Kaisou = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp
index 51ed44d686..c740bbd636 100644
--- a/src/d/actor/d_a_obj_kamakiri.cpp
+++ b/src/d/actor/d_a_obj_kamakiri.cpp
@@ -18,14 +18,12 @@ static u8 l_initHIO;
 
 static daObj_KamHIO_c l_HIO;
 
-/* 80C3518C-80C351BC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__14daObj_KamHIO_cFv */
 daObj_KamHIO_c::daObj_KamHIO_c() {
     field_0x4 = -1;
     mModelScaleMale = 1.5f;
     mModelScaleFemale = 1.2f;
 }
 
-/* 80C351BC-80C35228 00011C 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjKAM_cFv */
 void daObjKAM_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -46,20 +44,17 @@ void daObjKAM_c::InitCcSph() {
     mSphere.OnTgNoHitMark();
 }
 
-/* 80C35228-80C35280 000188 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjKAM_cFv */
 void daObjKAM_c::SetCcSph() {
     mSphere.SetC(current.pos);
     mSphere.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mSphere);
 }
 
-/* 80C35280-80C352A0 0001E0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* param_0) {
     daObjKAM_c* i_this = (daObjKAM_c*)param_0;
     return i_this->CreateHeap();
 }
 
-/* 80C352A0-80C355F8 000200 0358+00 1/1 0/0 0/0 .text            CreateHeap__10daObjKAM_cFv */
 int daObjKAM_c::CreateHeap() {
     J3DModelData* modelData;
     if (mSex == SEX_FEMALE) {
@@ -118,21 +113,18 @@ int daObjKAM_c::CreateHeap() {
     return 1;
 }
 
-/* 80C35640-80C35660 0005A0 0020+00 1/0 0/0 0/0 .text            daObjKAM_Create__FP10fopAc_ac_c */
 static int daObjKAM_Create(fopAc_ac_c* param_0) {
     daObjKAM_c* i_this = (daObjKAM_c*)param_0;
     fpc_ProcID unused = fopAcM_GetID(param_0);
     return i_this->create();
 }
 
-/* 80C35660-80C35684 0005C0 0024+00 1/0 0/0 0/0 .text            daObjKAM_Delete__FP10daObjKAM_c */
 static int daObjKAM_Delete(daObjKAM_c* param_0) {
     fpc_ProcID unused = fopAcM_GetID(param_0);
     param_0->Delete();
     return 1;
 }
 
-/* 80C35684-80C357EC 0005E4 0168+00 1/1 0/0 0/0 .text            ShopWaitAction__10daObjKAM_cFv */
 void daObjKAM_c::ShopWaitAction() {
     switch (field_0x981) {
     case 0:
@@ -166,7 +158,6 @@ void daObjKAM_c::ShopWaitAction() {
     return;
 }
 
-/* 80C357EC-80C35970 00074C 0184+00 1/1 0/0 0/0 .text            WaitAction__10daObjKAM_cFv */
 void daObjKAM_c::WaitAction() {
     switch (field_0x981) {
     case 0:
@@ -199,7 +190,6 @@ void daObjKAM_c::WaitAction() {
     }
 }
 
-/* 80C35970-80C35B9C 0008D0 022C+00 1/1 0/0 0/0 .text            WallCheck__10daObjKAM_cFv */
 int daObjKAM_c::WallCheck() {
     dBgS_LinChk linChk;
     linChk.SetObj();
@@ -225,7 +215,6 @@ int daObjKAM_c::WallCheck() {
     return 0;
 }
 
-/* 80C35BE4-80C35CF0 000B44 010C+00 1/1 0/0 0/0 .text            SpeedSet__10daObjKAM_cFv */
 void daObjKAM_c::SpeedSet() {
     speed.y += gravity;
     cXyz unkXyz1(0.0f, speed.y, speedF);
@@ -242,7 +231,6 @@ void daObjKAM_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C35CF0-80C36138 000C50 0448+00 1/1 0/0 0/0 .text            WallWalk__10daObjKAM_cFv */
 void daObjKAM_c::WallWalk() {
     cXyz unkXyz1(0.0f, -100.0f, (yREG_F(6) + 3.0f) * speedF);
     cXyz unkXyz2(0.0f, yREG_F(5) + 40.0f, 0.0f);
@@ -295,7 +283,6 @@ void daObjKAM_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C36138-80C36338 001098 0200+00 2/2 0/0 0/0 .text            WalkAction__10daObjKAM_cFv */
 void daObjKAM_c::WalkAction() {
     for (s32 i = 0; i < 3; i++) {
         field_0x982[i]--;
@@ -342,7 +329,6 @@ void daObjKAM_c::WalkAction() {
     WallWalk();
 }
 
-/* 80C36338-80C36B20 001298 07E8+00 2/2 0/0 0/0 .text            MoveAction__10daObjKAM_cFv */
 void daObjKAM_c::MoveAction() {
     cXyz* unkXyzP1;
 
@@ -477,7 +463,6 @@ void daObjKAM_c::MoveAction() {
     }
 }
 
-/* 80C36B20-80C36BE4 001A80 00C4+00 1/1 0/0 0/0 .text            Action__10daObjKAM_cFv */
 void daObjKAM_c::Action() {
     switch (field_0x980) {
     case 0:
@@ -497,7 +482,6 @@ void daObjKAM_c::Action() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C36BE4-80C36CA0 001B44 00BC+00 1/1 0/0 0/0 .text            ShopAction__10daObjKAM_cFv */
 void daObjKAM_c::ShopAction() {
     switch (field_0x980) {
     case 0:
@@ -515,7 +499,6 @@ void daObjKAM_c::ShopAction() {
     mCreatureSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C36CA0-80C36CB8 001C00 0018+00 1/0 0/0 0/0 .text            Insect_Release__10daObjKAM_cFv */
 void daObjKAM_c::Insect_Release() {
     field_0x56c = 1;
     field_0x981 = 0;
@@ -528,7 +511,6 @@ f32 floatDummy() {
     return -9.0f;
 }
 
-/* 80C36CB8-80C36E34 001C18 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjKAM_cFv */
 void daObjKAM_c::Z_BufferChk() {
     cXyz currentProj;
     cXyz currentOffset;
@@ -564,7 +546,6 @@ void daObjKAM_c::Z_BufferChk() {
     field_0x9b8 = ((near + (far * near) / currentProj.z) / (far - near) + 1.0f) * 16777215.0f;
 }
 
-/* 80C36E34-80C36F58 001D94 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjKAM_cFv */
 void daObjKAM_c::ParticleSet() {
     if (field_0x9b8 > field_0x9bc) {
         cLib_addCalc2(&field_0x9a8, 0.0f, yREG_F(11) + 1.0f, 1.0f);
@@ -580,7 +561,6 @@ void daObjKAM_c::ParticleSet() {
     }
 }
 
-/* 80C36F58-80C37324 001EB8 03CC+00 1/1 0/0 0/0 .text            BoomChk__10daObjKAM_cFv */
 void daObjKAM_c::BoomChk() {
     if (field_0x9c1 != 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -637,7 +617,6 @@ void daObjKAM_c::BoomChk() {
     }
 }
 
-/* 80C37324-80C374AC 002284 0188+00 1/1 0/0 0/0 .text            ObjHit__10daObjKAM_cFv */
 void daObjKAM_c::ObjHit() {
     if (mSphere.ChkTgHit() != 0) {
         cCcD_ObjHitInf* hitObj = mSphere.GetTgHitObj();
@@ -666,7 +645,6 @@ void daObjKAM_c::ObjHit() {
     }
 }
 
-/* 80C374AC-80C37724 00240C 0278+00 1/1 0/0 0/0 .text            Execute__10daObjKAM_cFv */
 int daObjKAM_c::Execute() {
     if (ChkGetDemo() != 0) {
         field_0x9b8 = field_0x9bc + 10000.0f;
@@ -712,7 +690,6 @@ int daObjKAM_c::Execute() {
     return 1;
 }
 
-/* 80C37724-80C3778C 002684 0068+00 1/1 0/0 0/0 .text            Delete__10daObjKAM_cFv */
 int daObjKAM_c::Delete() {
     dComIfG_resDelete(&mPhase, "I_Kam");
     if (field_0xa64 != 0) {
@@ -725,7 +702,6 @@ int daObjKAM_c::Delete() {
     return 1;
 }
 
-/* 80C3778C-80C377F4 0026EC 0068+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjKAM_cFv */
 void daObjKAM_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x99a);
@@ -737,24 +713,19 @@ void daObjKAM_c::setBaseMtx() {
     mpMorfSO->modelCalc();
 }
 
-/* 80C377F4-80C378D4 002754 00E0+00 1/0 0/0 0/0 .text            daObjKAM_Draw__FP10daObjKAM_c */
 static int daObjKAM_Draw(daObjKAM_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C378D4-80C378F4 002834 0020+00 2/1 0/0 0/0 .text            daObjKAM_Execute__FP10daObjKAM_c */
 static int daObjKAM_Execute(daObjKAM_c* i_this) {
     return i_this->Execute();
 }
 
-/* ############################################################################################## */
-/* 80C384E4-80C384E8 0000DC 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x019D, /* dSv_event_flag_c::F_0413 - Misc. - Mantis (M) */
     0x019E, /* dSv_event_flag_c::F_0414 - Misc. - Mantis (F) */
 };
 
-/* 80C378F4-80C37AA0 002854 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjKAM_cFv */
 u8 daObjKAM_c::CreateChk() {
     u8 unkInt1 = (fopAcM_GetParam(this) & 0xf00) >> 8;
     if (unkInt1 == 0xf) {
@@ -792,7 +763,6 @@ u8 daObjKAM_c::CreateChk() {
     return 1;
 }
 
-/* 80C37AA0-80C38258 002A00 07B8+00 1/1 0/0 0/0 .text            create__10daObjKAM_cFv */
 int daObjKAM_c::create() {
     fopAcM_ct(this, daObjKAM_c);
 
@@ -923,20 +893,16 @@ int daObjKAM_c::create() {
     return loadResult;
 }
 
-/* 80C38358-80C38360 0032B8 0008+00 1/0 0/0 0/0 .text            daObjKAM_IsDelete__FP10daObjKAM_c
- */
 static bool daObjKAM_IsDelete(daObjKAM_c* param_0) {
     return true;
 }
 
-/* 80C3850C-80C3852C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKAM_Method */
 static actor_method_class l_daObjKAM_Method = {
     (process_method_func)daObjKAM_Create,  (process_method_func)daObjKAM_Delete,
     (process_method_func)daObjKAM_Execute, (process_method_func)daObjKAM_IsDelete,
     (process_method_func)daObjKAM_Draw,
 };
 
-/* 80C3852C-80C3855C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kam */
 extern actor_process_profile_definition g_profile_Obj_Kam = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp
index 9c930c388f..60be0364f3 100644
--- a/src/d/actor/d_a_obj_kanban2.cpp
+++ b/src/d/actor/d_a_obj_kanban2.cpp
@@ -89,8 +89,6 @@ enum daObj_Kanban2_DamageType {
 };
 
 namespace {
-/* 8058586C-805858B8 -00001 004C+00 1/1 0/0 0/0 .data
- * l_kn2_bmdidx__29@unnamed@d_a_obj_kanban2_cpp@                */
 static char* l_kn2_bmdidx[] = {
     "J_kanban00.bmd",
     "J_kanban00_01.bmd",
@@ -113,8 +111,6 @@ static char* l_kn2_bmdidx[] = {
     "J_kanban00_18.bmd",
 };
 
-/* 805858B8-805858C8 00004C 0010+00 1/1 0/0 0/0 .data
- * dKn2_CarryOffset__29@unnamed@d_a_obj_kanban2_cpp@            */
 static s16 dKn2_CarryOffset[] = {
     0xD07D,
     0xBA21,
@@ -126,8 +122,6 @@ static s16 dKn2_CarryOffset[] = {
     0xC66D,
 };
 
-/* 805858C8-80585958 00005C 0090+00 1/1 0/0 0/0 .data
- * dKb2_BAN_SPEED__29@unnamed@d_a_obj_kanban2_cpp@              */
 static struct {
     f32 speed_y;
     f32 speed_f;
@@ -152,8 +146,6 @@ static struct {
     { 0.0f, 30.0f },
 };
 
-/* 80585958-8058597C 0000EC 0024+00 1/1 0/0 0/0 .data
- * dKb2_BAN_ANGLE__29@unnamed@d_a_obj_kanban2_cpp@              */
 static u16 dKb2_BAN_ANGLE[] = {
     0x6800,
     0x7800,
@@ -175,8 +167,6 @@ static u16 dKb2_BAN_ANGLE[] = {
     0x9000,
 };
 
-/* 8058597C-805859C4 000110 0048+00 2/2 0/0 0/0 .data
- * dKb2_BAN_PARTS__29@unnamed@d_a_obj_kanban2_cpp@              */
 static u32 dKb2_BAN_PARTS[] = {
     PART_TOP_LEFT_UNDER,
     PART_SPINE_LEFT_UPPER | PART_TOP_LEFT_UPPER,
@@ -198,8 +188,6 @@ static u32 dKb2_BAN_PARTS[] = {
     0,
 };
 
-/* 805859C4-80585A04 000158 0040+00 1/1 0/0 0/0 .data cc_kn2_src__29@unnamed@d_a_obj_kanban2_cpp@
- */
 static dCcD_SrcSph cc_kn2_src = {
     {
         {0x0, {{AT_TYPE_1000, 0x2, 0x13}, {0xD8FBFDFF, 0x11}, 0x79}}, // mObj
@@ -212,8 +200,6 @@ static dCcD_SrcSph cc_kn2_src = {
     } // mSphAttr
 };
 
-/* 80585A04-80585A94 000198 0090+00 1/1 0/0 0/0 .data
- * d_KANBAN_OFFSET__29@unnamed@d_a_obj_kanban2_cpp@             */
 static struct {
     f32 x;
     f32 y;
@@ -239,13 +225,11 @@ static struct {
 };
 }
 
-/* 8058176C-80581790 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__19daObj_Kanban2_HIO_cFv */
 daObj_Kanban2_HIO_c::daObj_Kanban2_HIO_c() {
     id = -1;
     base_size = 1.0f;
 }
 
-/* 80581790-805818DC 000110 014C+00 1/1 0/0 0/0 .text            draw__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::draw() {
     cXyz sp8;
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -269,12 +253,10 @@ int daObj_Kanban2_c::draw() {
     return 1;
 }
 
-/* 80581918-80581938 000298 0020+00 1/0 0/0 0/0 .text daObj_Kanban2_Draw__FP15daObj_Kanban2_c */
 static int daObj_Kanban2_Draw(daObj_Kanban2_c* i_this) {
     return i_this->draw();
 }
 
-/* 80581938-805819BC 0002B8 0084+00 1/1 0/0 0/0 .text            setKanbanSE__15daObj_Kanban2_cFi */
 void daObj_Kanban2_c::setKanbanSE(int i_se) {
     u32 var_r31;
     if (field_0x620 <= 1) {
@@ -288,13 +270,10 @@ void daObj_Kanban2_c::setKanbanSE(int i_se) {
     Z2GetAudioMgr()->seStart(i_se, &current.pos, var_r31, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 805819BC-805819FC 00033C 0040+00 3/3 0/0 0/0 .text createBreakParts__15daObj_Kanban2_cFUl5csXyz
- */
 void daObj_Kanban2_c::createBreakParts(u32 i_parameters, csXyz i_rot) {
     fopAcM_create(PROC_OBJ_KANBAN2, i_parameters, &current.pos, fopAcM_GetRoomNo(this), &i_rot, NULL, -1);
 }
 
-/* 805819FC-80581B5C 00037C 0160+00 1/1 0/0 0/0 .text createWallHitBreak__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::createWallHitBreak() {
     BOOL play_se = FALSE;
     csXyz rotation(shape_angle);
@@ -336,7 +315,6 @@ void daObj_Kanban2_c::createWallHitBreak() {
     setCenterPos();
 }
 
-/* 80581B5C-80581C48 0004DC 00EC+00 2/1 0/0 0/0 .text getKanbanCutType__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::getKanbanCutType() {
     s16 angle_to_player = cLib_distanceAngleS(shape_angle.y, fopAcM_searchPlayerAngleY(this));
 
@@ -387,7 +365,6 @@ int daObj_Kanban2_c::getKanbanCutType() {
     }
 }
 
-/* 80581C48-80581D04 0005C8 00BC+00 1/1 0/0 0/0 .text getKanbanWolfCutType__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::getKanbanWolfCutType() {
     s16 angle_to_player = cLib_distanceAngleS(shape_angle.y, fopAcM_searchPlayerAngleY(this));
 
@@ -415,8 +392,6 @@ int daObj_Kanban2_c::getKanbanWolfCutType() {
     return DAMAGE_HORIZONTAL_SPLIT;
 }
 
-/* 80581D04-8058221C 000684 0518+00 2/1 0/0 0/0 .text            damage_check__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::damage_check() {
     int sp24 = 0;
     u8 mode = 0;
@@ -570,7 +545,6 @@ static f32 dummyFloat() {
     return rt;
 }
 
-/* 8058221C-805822F0 000B9C 00D4+00 1/1 0/0 0/0 .text float_damage_check__15daObj_Kanban2_cFv */
 bool daObj_Kanban2_c::float_damage_check() {
     if (mInvulnerabilityTimer != 0) {
         return false;
@@ -591,7 +565,6 @@ bool daObj_Kanban2_c::float_damage_check() {
     return false;
 }
 
-/* 805822F0-805825A4 000C70 02B4+00 2/2 0/0 0/0 .text            deletePart__15daObj_Kanban2_cFv */
 bool daObj_Kanban2_c::deletePart() {
     if (field_0x620 <= 1) {
         if (fopAcM_CheckCondition(this, 4)) {
@@ -612,8 +585,6 @@ bool daObj_Kanban2_c::deletePart() {
     return false;
 }
 
-/* 805825A4-805826D4 000F24 0130+00 1/1 0/0 0/0 .text            getWallAngle__15daObj_Kanban2_cFv
- */
 s16 daObj_Kanban2_c::getWallAngle() {
     cXyz line_start;
     cXyz line_end;
@@ -639,8 +610,6 @@ s16 daObj_Kanban2_c::getWallAngle() {
     return angle;
 }
 
-/* 8058271C-80582894 00109C 0178+00 2/2 0/0 0/0 .text            setGroundAngle__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::setGroundAngle() {
     Vec gnd_pos;
     cXyz sp8;
@@ -670,7 +639,6 @@ void daObj_Kanban2_c::setGroundAngle() {
     }
 }
 
-/* 80582894-80582944 001214 00B0+00 2/2 0/0 0/0 .text checkWaterSurface__15daObj_Kanban2_cFv */
 bool daObj_Kanban2_c::checkWaterSurface() {
     dBgS_ObjGndChk_Spl gnd_chk;
     Vec sp8;
@@ -686,7 +654,6 @@ bool daObj_Kanban2_c::checkWaterSurface() {
     return false;
 }
 
-/* 80582944-80582A68 0012C4 0124+00 1/1 0/0 0/0 .text checkPataGround__15daObj_Kanban2_cFss */
 bool daObj_Kanban2_c::checkPataGround(s16 param_0, s16 param_1) {
     cXyz sp18;
     cXyz spC;
@@ -711,7 +678,6 @@ bool daObj_Kanban2_c::checkPataGround(s16 param_0, s16 param_1) {
     return false;
 }
 
-/* 80582A68-80582AAC 0013E8 0044+00 3/3 0/0 0/0 .text            setCullMtx__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::setCullMtx() {
     for (int i = 0; i < 18; i++) {
         if (mPartFlags & (1 << i)) {
@@ -721,20 +687,15 @@ void daObj_Kanban2_c::setCullMtx() {
     }
 }
 
-/* 80582AAC-80582AFC 00142C 0050+00 1/1 0/0 0/0 .text setSmokeEffect__15daObj_Kanban2_cF4cXyz */
 void daObj_Kanban2_c::setSmokeEffect(cXyz i_pos) {
     fopAcM_effSmokeSet1(&field_0x9e0, &field_0x9e4, &i_pos, NULL, 0.02 * field_0x600, &tevStr, 1);
 }
 
-/* 80585CB4-80585CB8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 80585CB5 0003+00 l_initHIO None */
 static u8 l_initHIO;
 
-/* 80585CC4-80585CD0 000054 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_Kanban2_HIO_c l_HIO;
 
-/* 80582AFC-80582C40 00147C 0144+00 2/2 0/0 0/0 .text            setWaterEffect__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::setWaterEffect() {
     cXyz eff_pos(current.pos.x, field_0x604, current.pos.z);
     static cXyz sc(0.5f, 0.5f, 0.5f);
@@ -747,8 +708,6 @@ void daObj_Kanban2_c::setWaterEffect() {
     mSound.startSound(Z2SE_CM_BODYFALL_WATER_S, 0, -1);
 }
 
-/* 80582C40-80582E68 0015C0 0228+00 3/3 0/0 0/0 .text            setCenterPos__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::setCenterPos() {
     cXyz sp14(0.0f, 0.0f, 0.0f);
     cXyz sp8;
@@ -809,8 +768,6 @@ void daObj_Kanban2_c::setCenterPos() {
     }
 }
 
-/* 80582E68-80582EF0 0017E8 0088+00 2/2 0/0 0/0 .text            checkCarryOn__15daObj_Kanban2_cFv
- */
 BOOL daObj_Kanban2_c::checkCarryOn() {
     cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     if (fopAcM_checkCarryNow(this)) {
@@ -830,8 +787,6 @@ BOOL daObj_Kanban2_c::checkCarryOn() {
     return FALSE;
 }
 
-/* 80582EF0-80582F40 001870 0050+00 6/6 0/0 0/0 .text            setActionMode__15daObj_Kanban2_cFii
- */
 void daObj_Kanban2_c::setActionMode(int i_action, int i_mode) {
     if (mAction != i_action) {
         mPrevAction = mAction;
@@ -848,7 +803,6 @@ void daObj_Kanban2_c::setActionMode(int i_action, int i_mode) {
     }
 }
 
-/* 80582F40-80583364 0018C0 0424+00 1/1 0/0 0/0 .text calcNormalSwing__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::calcNormalSwing() {
     u8 sp8 = 0;
     s16 var_r29 = 0;
@@ -956,8 +910,6 @@ void daObj_Kanban2_c::calcNormalSwing() {
     field_0x626 = sp8;
 }
 
-/* 80583364-80583598 001CE4 0234+00 1/1 0/0 0/0 .text            executeNormal__15daObj_Kanban2_cFv
- */
 // NONMATCHING - gameinfo mEvent load, equivalent
 void daObj_Kanban2_c::executeNormal() {
     calcNormalSwing();
@@ -1025,7 +977,6 @@ void daObj_Kanban2_c::executeNormal() {
     }
 }
 
-/* 80583598-80583A2C 001F18 0494+00 2/1 0/0 0/0 .text            initPart__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::initPart() {
     daPy_py_c* player = daPy_getPlayerActorClass();
 
@@ -1141,7 +1092,6 @@ void daObj_Kanban2_c::initPart() {
     mMode = 9;
 }
 
-/* 80583A2C-8058437C 0023AC 0950+00 2/1 0/0 0/0 .text            executePart__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::executePart() {
     cXyz sp4C;
     attention_info.position = eyePos = current.pos;
@@ -1398,8 +1348,6 @@ void daObj_Kanban2_c::executePart() {
     }
 }
 
-/* 8058437C-80584884 002CFC 0508+00 1/1 0/0 0/0 .text            executeFloat__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::executeFloat() {
     checkWaterSurface();
 
@@ -1525,8 +1473,6 @@ void daObj_Kanban2_c::executeFloat() {
     }
 }
 
-/* 80584884-805849CC 003204 0148+00 1/1 0/0 0/0 .text            executeCarry__15daObj_Kanban2_cFv
- */
 void daObj_Kanban2_c::executeCarry() {
     attention_info.position = eyePos = current.pos;
     fopAcM_SetFoodStatus(this, fopAcM_FOOD_2);
@@ -1564,7 +1510,6 @@ void daObj_Kanban2_c::executeCarry() {
     }
 }
 
-/* 805849CC-80584AD8 00334C 010C+00 1/1 0/0 0/0 .text            action__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::action() {
     mAcch.SetGroundUpY(0.0f);
 
@@ -1595,7 +1540,6 @@ void daObj_Kanban2_c::action() {
     }
 }
 
-/* 80584AD8-80584CFC 003458 0224+00 1/1 0/0 0/0 .text            mtx_set__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::mtx_set() {
     if (field_0x62e != 0) {
         csXyz sp8(0, 0, 0);
@@ -1654,7 +1598,6 @@ void daObj_Kanban2_c::mtx_set() {
     }
 }
 
-/* 80584CFC-80584DF0 00367C 00F4+00 1/1 0/0 0/0 .text            cc_set__15daObj_Kanban2_cFv */
 void daObj_Kanban2_c::cc_set() {
     cXyz sph_center(current.pos);
 
@@ -1679,7 +1622,6 @@ void daObj_Kanban2_c::cc_set() {
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80584DF0-80584EB0 003770 00C0+00 1/1 0/0 0/0 .text            execute__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::execute() {
     if (mPartFlags == 0) {
         fopAcM_delete(this);
@@ -1706,19 +1648,14 @@ int daObj_Kanban2_c::execute() {
     return 1;
 }
 
-/* 80584EB0-80584ED0 003830 0020+00 2/1 0/0 0/0 .text daObj_Kanban2_Execute__FP15daObj_Kanban2_c
- */
 static int daObj_Kanban2_Execute(daObj_Kanban2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80584ED0-80584ED8 003850 0008+00 1/0 0/0 0/0 .text daObj_Kanban2_IsDelete__FP15daObj_Kanban2_c
- */
 static int daObj_Kanban2_IsDelete(daObj_Kanban2_c* i_this) {
     return 1;
 }
 
-/* 80584ED8-80584F44 003858 006C+00 1/1 0/0 0/0 .text            _delete__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::_delete() {
     dComIfG_resDelete(&mPhase, "Obj_kn2");
 
@@ -1734,13 +1671,11 @@ int daObj_Kanban2_c::_delete() {
     return 1;
 }
 
-/* 80584F44-80584F64 0038C4 0020+00 1/0 0/0 0/0 .text daObj_Kanban2_Delete__FP15daObj_Kanban2_c */
 static int daObj_Kanban2_Delete(daObj_Kanban2_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80584F64-805850C8 0038E4 0164+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::CreateHeap() {
     void* modelData;
     u32 part_flags = fopAcM_GetParam(this) & 0x3FFFF;
@@ -1771,13 +1706,11 @@ int daObj_Kanban2_c::CreateHeap() {
     return 1;
 }
 
-/* 805850C8-805850E8 003A48 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daObj_Kanban2_c* a_this = (daObj_Kanban2_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 805850E8-80585458 003A68 0370+00 1/1 0/0 0/0 .text            create__15daObj_Kanban2_cFv */
 int daObj_Kanban2_c::create() {
     fopAcM_ct(this, daObj_Kanban2_c);
 
@@ -1846,12 +1779,10 @@ int daObj_Kanban2_c::create() {
     return phase_state;
 }
 
-/* 80585558-80585578 003ED8 0020+00 1/0 0/0 0/0 .text daObj_Kanban2_Create__FP15daObj_Kanban2_c */
 static int daObj_Kanban2_Create(daObj_Kanban2_c* i_this) {
     return i_this->create();
 }
 
-/* 80585BCC-80585BEC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Kanban2_Method */
 static actor_method_class l_daObj_Kanban2_Method = {
     (process_method_func)daObj_Kanban2_Create,
     (process_method_func)daObj_Kanban2_Delete,
@@ -1860,7 +1791,6 @@ static actor_method_class l_daObj_Kanban2_Method = {
     (process_method_func)daObj_Kanban2_Draw,
 };
 
-/* 80585BEC-80585C1C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KANBAN2 */
 extern actor_process_profile_definition g_profile_OBJ_KANBAN2 = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp
index 83b83e69ed..c06f02b123 100644
--- a/src/d/actor/d_a_obj_kantera.cpp
+++ b/src/d/actor/d_a_obj_kantera.cpp
@@ -15,7 +15,6 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80C39648-80C3968C 000000 0044+00 4/4 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}},  // mObj
@@ -30,8 +29,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80C38678-80C38974 000078 02FC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_2, f32 param_3) {
     cM3dGPla acStack_3c;
     if (dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c) != 0) {
@@ -45,20 +42,17 @@ static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_2, f32 param_3) {
     return 0.0f;
 }
 
-/* 80C389BC-80C389F8 0003BC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__15daItemKantera_cFv */
 void daItemKantera_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C389F8-80C38A64 0003F8 006C+00 2/2 0/0 0/0 .text            setBaseMtx__15daItemKantera_cFv */
 void daItemKantera_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
 }
 
-/* 80C38A64-80C38BA8 000464 0144+00 1/1 0/0 0/0 .text            Create__15daItemKantera_cFv */
 int daItemKantera_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -77,13 +71,10 @@ int daItemKantera_c::Create() {
     return 1;
 }
 
-/* 80C38BA8-80C38BB0 0005A8 0008+00 1/0 0/0 0/0 .text            __CreateHeap__15daItemKantera_cFv
- */
 int daItemKantera_c::__CreateHeap() {
     return 1;
 }
 
-/* 80C38BB0-80C38DAC 0005B0 01FC+00 1/1 0/0 0/0 .text            create__15daItemKantera_cFv */
 int daItemKantera_c::create() {
     fopAcM_ct(this, daItemKantera_c);
 
@@ -114,7 +105,6 @@ int daItemKantera_c::create() {
     return phase;
 }
 
-/* 80C38F78-80C39068 000978 00F0+00 1/1 0/0 0/0 .text            bg_check__15daItemKantera_cFv */
 void daItemKantera_c::bg_check() {
     f32 dVar6 = 0.7f;
     if (mAcch.ChkWallHit()) {
@@ -138,15 +128,12 @@ void daItemKantera_c::bg_check() {
     }
 }
 
-/* 80C39068-80C390A0 000A68 0038+00 1/0 0/0 0/0 .text            actionInit__15daItemKantera_cFv */
 int daItemKantera_c::actionInit() {
     show();
     actionWaitInit();
     return 1;
 }
 
-/* 80C390A0-80C3911C 000AA0 007C+00 2/2 0/0 0/0 .text            actionWaitInit__15daItemKantera_cFv
- */
 int daItemKantera_c::actionWaitInit() {
     mCcCyl.OffTgSPrmBit(1);
     mCcCyl.OffCoSPrmBit(1);
@@ -158,7 +145,6 @@ int daItemKantera_c::actionWaitInit() {
     return 1;
 }
 
-/* 80C3911C-80C39234 000B1C 0118+00 1/0 0/0 0/0 .text            actionWait__15daItemKantera_cFv */
 int daItemKantera_c::actionWait() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
@@ -186,8 +172,6 @@ int daItemKantera_c::actionWait() {
     return 1;
 }
 
-/* 80C39234-80C392D0 000C34 009C+00 1/1 0/0 0/0 .text initActionOrderGetDemo__15daItemKantera_cFv
- */
 int daItemKantera_c::initActionOrderGetDemo() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -201,7 +185,6 @@ int daItemKantera_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 80C392D0-80C3934C 000CD0 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__15daItemKantera_cFv */
 int daItemKantera_c::actionOrderGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setStatus(3);
@@ -215,8 +198,6 @@ int daItemKantera_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 80C3934C-80C393B0 000D4C 0064+00 1/0 0/0 0/0 .text            actionGetDemo__15daItemKantera_cFv
- */
 int daItemKantera_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGp_event_reset();
@@ -225,7 +206,6 @@ int daItemKantera_c::actionGetDemo() {
     return 1;
 }
 
-/* 80C393B0-80C394DC 000DB0 012C+00 1/1 0/0 0/0 .text            execute__15daItemKantera_cFv */
 int daItemKantera_c::execute() {
     static daItemKantera_c::actionFunc l_demoFunc[4] = {
         &daItemKantera_c::actionInit,
@@ -242,7 +222,6 @@ int daItemKantera_c::execute() {
     return 1;
 }
 
-/* 80C394DC-80C39530 000EDC 0054+00 1/1 0/0 0/0 .text            draw__15daItemKantera_cFv */
 int daItemKantera_c::draw() {
     if (!chkDraw()) {
         return 1;
@@ -251,35 +230,28 @@ int daItemKantera_c::draw() {
     return 1;
 }
 
-/* 80C39530-80C39568 000F30 0038+00 1/1 0/0 0/0 .text            _delete__15daItemKantera_cFv */
 int daItemKantera_c::_delete() {
     DeleteBase(dItem_data::getFieldArc(m_itemNo));
     return 1;
 }
 
-/* 80C39568-80C39588 000F68 0020+00 1/0 0/0 0/0 .text daItemKantera_Draw__FP15daItemKantera_c */
 static int daItemKantera_Draw(daItemKantera_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C39588-80C395A8 000F88 0020+00 1/0 0/0 0/0 .text daItemKantera_Execute__FP15daItemKantera_c
- */
 static int daItemKantera_Execute(daItemKantera_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C395A8-80C395C8 000FA8 0020+00 1/0 0/0 0/0 .text daItemKantera_Delete__FP15daItemKantera_c */
 static int daItemKantera_Delete(daItemKantera_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80C395C8-80C395E8 000FC8 0020+00 1/0 0/0 0/0 .text daItemKantera_Create__FP10fopAc_ac_c */
 static int daItemKantera_Create(fopAc_ac_c* i_this) {
     return static_cast<daItemKantera_c*>(i_this)->create();
 }
 
 
-/* 80C3975C-80C3977C -00001 0020+00 1/0 0/0 0/0 .data            l_daItemKantera_Method */
 static actor_method_class l_daItemKantera_Method = {
     (process_method_func)daItemKantera_Create,
     (process_method_func)daItemKantera_Delete,
@@ -288,7 +260,6 @@ static actor_method_class l_daItemKantera_Method = {
     (process_method_func)daItemKantera_Draw,
 };
 
-/* 80C3977C-80C397AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kantera */
 extern actor_process_profile_definition g_profile_Obj_Kantera = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp
index 8493976d02..54d03d073c 100644
--- a/src/d/actor/d_a_obj_katatsumuri.cpp
+++ b/src/d/actor/d_a_obj_katatsumuri.cpp
@@ -18,7 +18,6 @@ static u8 hioInit;
 
 static daObj_KatHIO_c l_HIO;
 
-/* 80C3996C-80C39994 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_KatHIO_cFv */
 daObj_KatHIO_c::daObj_KatHIO_c() {
     field_0x4 = -1;
     mScaleMale = 1.0f;
@@ -30,7 +29,6 @@ static u8 const l_kat_itemno[2] = {
     fpcNm_ITEM_F_SNAIL,
 };
 
-/* 80C39994-80C39A00 000114 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjKAT_cFv */
 void daObjKAT_c::InitCcSph() {
     /* 80C3C67C-80C3C6BC 000008 0040+00 1/1 0/0 0/0 .rodata          ccSphSrc$3779 */
     const static dCcD_SrcSph ccSphSrc = {
@@ -52,15 +50,12 @@ void daObjKAT_c::InitCcSph() {
     mSph.OnTgNoHitMark();
 }
 
-/* 80C39A00-80C39A58 000180 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjKAT_cFv */
 void daObjKAT_c::SetCcSph() {
     mSph.SetC(current.pos);
     mSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80C39A58-80C39B2C 0001D8 00D4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjKAT_cFP8J3DJointP8J3DModel
- */
 int daObjKAT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     J3DJoint* joint = i_joint;
     s32 jointNo = joint->getJntNo();
@@ -73,7 +68,6 @@ int daObjKAT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80C39B2C-80C39B78 0002AC 004C+00 1/1 0/0 0/0 .text            JointCallBack__FP8J3DJointi */
 static int JointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -85,13 +79,11 @@ static int JointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80C39B78-80C39B98 0002F8 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daObjKAT_c* kat = (daObjKAT_c*)i_this;
     return kat->CreateHeap();
 }
 
-/* 80C39B98-80C39E80 000318 02E8+00 1/1 0/0 0/0 .text            CreateHeap__10daObjKAT_cFv */
 int daObjKAT_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kat", 9);
     JUT_ASSERT(0x136, modelData != NULL);
@@ -146,14 +138,12 @@ int daObjKAT_c::CreateHeap() {
     return 1;
 }
 
-/* 80C39EC8-80C39EE8 000648 0020+00 1/0 0/0 0/0 .text            daObjKAT_Create__FP10fopAc_ac_c */
 static int daObjKAT_Create(fopAc_ac_c* i_this) {
     daObjKAT_c* kat = (daObjKAT_c*)i_this;
     fpc_ProcID unused = fopAcM_GetID(i_this);
     return kat->create();
 }
 
-/* 80C39EE8-80C39F0C 000668 0024+00 1/0 0/0 0/0 .text            daObjKAT_Delete__FP10daObjKAT_c */
 static int daObjKAT_Delete(daObjKAT_c* i_this) {
     fpc_ProcID unused = fopAcM_GetID(i_this);
     i_this->Delete();
@@ -176,7 +166,6 @@ f32 dummy3() {
     return 0.02f;
 }
 
-/* 80C39F0C-80C3A490 00068C 0584+00 1/1 0/0 0/0 .text            WallWalk__10daObjKAT_cFv */
 void daObjKAT_c::WallWalk() {
     s16 unkShort1;
     float unkFloat1;
@@ -257,7 +246,6 @@ void daObjKAT_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C3A4D8-80C3A628 000C58 0150+00 2/2 0/0 0/0 .text            MoveAction__10daObjKAT_cFv */
 void daObjKAT_c::MoveAction() {
     if (fopAcM_searchPlayerDistance(this) < 1500.0f) {
         cXyz unkXyz1;
@@ -287,7 +275,6 @@ void daObjKAT_c::MoveAction() {
     }
 }
 
-/* 80C3A628-80C3A680 000DA8 0058+00 1/1 0/0 0/0 .text            Action__10daObjKAT_cFv */
 void daObjKAT_c::Action() {
     field_0x7d4--;
     if (field_0x7d4 <= 0) {
@@ -297,14 +284,12 @@ void daObjKAT_c::Action() {
     Insect_GetDemoMain();
 }
 
-/* 80C3A680-80C3A698 000E00 0018+00 1/0 0/0 0/0 .text            Insect_Release__10daObjKAT_cFv */
 void daObjKAT_c::Insect_Release() {
     field_0x56c = 1;
     field_0x808 = 2;
     field_0x7c0 = 1;
 }
 
-/* 80C3A698-80C3A8C8 000E18 0230+00 1/1 0/0 0/0 .text            checkGround__10daObjKAT_cFv */
 void daObjKAT_c::checkGround() {
     dBgS_LinChk unkLinChk1;
     unkLinChk1.SetObj();
@@ -331,7 +316,6 @@ void daObjKAT_c::checkGround() {
     }
 }
 
-/* 80C3A8C8-80C3A95C 001048 0094+00 1/1 0/0 0/0 .text            F_MoveAction__10daObjKAT_cFv */
 void daObjKAT_c::F_MoveAction() {
     switch (field_0x7c1) {
     case 0:
@@ -351,7 +335,6 @@ void daObjKAT_c::F_MoveAction() {
     }
 }
 
-/* 80C3A95C-80C3A990 0010DC 0034+00 1/1 0/0 0/0 .text            FallAction__10daObjKAT_cFv */
 void daObjKAT_c::FallAction() {
     switch (field_0x7c0) {
     case 0:
@@ -362,7 +345,6 @@ void daObjKAT_c::FallAction() {
     }
 }
 
-/* 80C3A990-80C3AAB4 001110 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjKAT_cFv */
 void daObjKAT_c::ParticleSet() {
     if (field_0x800 > field_0x804) {
         cLib_addCalc2(&field_0x80c, 0.0f, yREG_F(11) + 1.0f, 1.0f);
@@ -380,7 +362,6 @@ void daObjKAT_c::ParticleSet() {
     }
 }
 
-/* 80C3AAB4-80C3ADC8 001234 0314+00 1/1 0/0 0/0 .text            BoomChk__10daObjKAT_cFv */
 void daObjKAT_c::BoomChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 unused1 = fopAcM_searchPlayerDistanceXZ(this);
@@ -425,7 +406,6 @@ void daObjKAT_c::BoomChk() {
     }
 }
 
-/* 80C3ADC8-80C3AEC8 001548 0100+00 1/1 0/0 0/0 .text            ObjHit__10daObjKAT_cFv */
 void daObjKAT_c::ObjHit() {
     if (mSph.ChkTgHit() != 0) {
         cCcD_ObjHitInf* tgHitObj = mSph.GetTgHitObj();
@@ -455,7 +435,6 @@ void daObjKAT_c::ObjHit() {
     }
 }
 
-/* 80C3AEC8-80C3B754 001648 088C+00 1/1 0/0 0/0 .text            Execute__10daObjKAT_cFv */
 int daObjKAT_c::Execute() {
     if (ChkGetDemo() != 0) {
         field_0x800 = field_0x804 + 10000.0f;
@@ -604,7 +583,6 @@ int daObjKAT_c::Execute() {
     return 1;
 }
 
-/* 80C3B754-80C3B8D0 001ED4 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjKAT_cFv */
 void daObjKAT_c::Z_BufferChk() {
     cXyz projected;
     cXyz curWithOff;
@@ -645,7 +623,6 @@ void daObjKAT_c::Z_BufferChk() {
     field_0x800 = ((near + far * near / projected.z) / (far - near) + 1.0f) * 16777215.0f;
 }
 
-/* 80C3B8D0-80C3B938 002050 0068+00 1/1 0/0 0/0 .text            Delete__10daObjKAT_cFv */
 int daObjKAT_c::Delete() {
     dComIfG_resDelete(&mPhase, "Kat");
     if (field_0xa70 != 0) {
@@ -658,7 +635,6 @@ int daObjKAT_c::Delete() {
     return 1;
 }
 
-/* 80C3B938-80C3B9A0 0020B8 0068+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjKAT_cFv */
 void daObjKAT_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x7ea);
@@ -669,12 +645,10 @@ void daObjKAT_c::setBaseMtx() {
     mpMorfSO->modelCalc();
 }
 
-/* 80C3B9A0-80C3BA8C 002120 00EC+00 1/0 0/0 0/0 .text            daObjKAT_Draw__FP10daObjKAT_c */
 static int daObjKAT_Draw(daObjKAT_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C3BA8C-80C3BAAC 00220C 0020+00 2/1 0/0 0/0 .text            daObjKAT_Execute__FP10daObjKAT_c */
 static int daObjKAT_Execute(daObjKAT_c* i_this) {
     return i_this->Execute();
 }
@@ -684,7 +658,6 @@ static u16 const l_musiya_num[2] = {
     0x01A2, /* dSv_event_flag_c::F_0418 - Misc. - Snail (F) */
 };
 
-/* 80C3BAAC-80C3BC58 00222C 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjKAT_cFv */
 bool daObjKAT_c::CreateChk() {
     u8 uVar4 = (fopAcM_GetParam(this) & 0xf00) >> 8;
     if (uVar4 == 0xf) {
@@ -721,7 +694,6 @@ bool daObjKAT_c::CreateChk() {
     return true;
 }
 
-/* 80C3BC58-80C3C4C4 0023D8 086C+00 1/1 0/0 0/0 .text            create__10daObjKAT_cFv */
 int daObjKAT_c::create() {
     fopAcM_ct(this, daObjKAT_c);
 
@@ -872,13 +844,10 @@ int daObjKAT_c::create() {
     return loadResult;
 }
 
-/* 80C3C5C4-80C3C5CC 002D44 0008+00 1/0 0/0 0/0 .text            daObjKAT_IsDelete__FP10daObjKAT_c
- */
 static int daObjKAT_IsDelete(daObjKAT_c* param_0) {
     return 1;
 }
 
-/* 80C3C770-80C3C790 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKAT_Method */
 static actor_method_class l_daObjKAT_Method = {
     (process_method_func)daObjKAT_Create,
     (process_method_func)daObjKAT_Delete,
@@ -887,7 +856,6 @@ static actor_method_class l_daObjKAT_Method = {
     (process_method_func)daObjKAT_Draw,
 };
 
-/* 80C3C790-80C3C7C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kat */
 extern actor_process_profile_definition g_profile_Obj_Kat = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp
index 8ed6e88cd4..b6b178cc39 100644
--- a/src/d/actor/d_a_obj_kazeneko.cpp
+++ b/src/d/actor/d_a_obj_kazeneko.cpp
@@ -18,7 +18,6 @@ KazoNekoAttr const daObjKazeNeko_c::M_attr = {
     1, 0x70, 0x6400, 0x190000,
 };
 
-/* 80C3C8D8-80C3C968 000078 0090+00 1/1 0/0 0/0 .text            create_init__15daObjKazeNeko_cFv */
 void daObjKazeNeko_c::create_init() {
     fopAcM_setCullSizeBox(this, -100.0f, -10.0f, -100.0f, 100.0f, 200.0f, 100.0f);
     field_0x72c.set(current.pos.x, current.pos.y + attr().field_0x1c, current.pos.z);
@@ -27,12 +26,10 @@ void daObjKazeNeko_c::create_init() {
     initCcCylinder();
 }
 
-/* 80C3C968-80C3C988 000108 0020+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjKazeNeko_cFv */
 void daObjKazeNeko_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C3C988-80C3CA8C 000128 0104+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjKazeNeko_cFv */
 void daObjKazeNeko_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::XrotM(shape_angle.x);
@@ -50,8 +47,6 @@ void daObjKazeNeko_c::setBaseMtx() {
     }
 }
 
-/* ############################################################################################## */
-/* 80C3D41C-80C3D460 000040 0044+00 1/1 0/0 0/0 .rodata          ccCylSrc$3894 */
 const static dCcD_SrcCyl ccCylSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x2048, 0x11}, 0x0}}, // mObj
@@ -66,8 +61,6 @@ const static dCcD_SrcCyl ccCylSrc = {
     } // mCyl
 };
 
-/* 80C3CA8C-80C3CB10 00022C 0084+00 1/1 0/0 0/0 .text            initCcCylinder__15daObjKazeNeko_cFv
- */
 void daObjKazeNeko_c::initCcCylinder() {
     mStts.Init(0xff, 0xff, this);
     mCyl.Set(ccCylSrc);
@@ -77,8 +70,6 @@ void daObjKazeNeko_c::initCcCylinder() {
     mCyl.SetH(attr().mCylHeight);
 }
 
-/* 80C3CB10-80C3CB7C 0002B0 006C+00 1/1 0/0 0/0 .text            setCcCylinder__15daObjKazeNeko_cFv
- */
 void daObjKazeNeko_c::setCcCylinder() {
     mCyl.SetC(current.pos);
     mCyl.SetR(attr().mCylRadius);
@@ -86,7 +77,6 @@ void daObjKazeNeko_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80C3CB7C-80C3CC40 00031C 00C4+00 1/1 0/0 0/0 .text            swingHead__15daObjKazeNeko_cFv */
 void daObjKazeNeko_c::swingHead() {
     if (field_0x744 != 0.0f) {
         f32 dVar5 = field_0x744 * cM_ssin(field_0x74c);
@@ -106,13 +96,11 @@ static f32 dummyFloat2() {
     return -1.0f;
 }
 
-/* 80C3CC40-80C3CC90 0003E0 0050+00 0/0 0/0 1/1 .text getFirstVec__15daObjKazeNeko_cFP4cXyzi */
 void daObjKazeNeko_c::getFirstVec(cXyz* param_1, int param_2) {
     s16 sVar4 = field_0x748 + (param_2 << 14);
     param_1->set((attr().field_0x20 * cM_ssin(sVar4)), 30.0f, attr().field_0x20 * cM_scos(sVar4));
 }
 
-/* 80C3D490-80C3D494 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "J_Kazami";
 
 inline int daObjKazeNeko_c::createHeap() {
@@ -134,7 +122,6 @@ inline int daObjKazeNeko_c::createHeap() {
 }
 
 
-/* 80C3CC90-80C3CD90 000430 0100+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjKazeNeko_c*>(i_this)->createHeap();
 }
@@ -159,7 +146,6 @@ inline int daObjKazeNeko_c::draw() {
     return 1;
 }
 
-/* 80C3CD90-80C3CEA8 000530 0118+00 1/0 0/0 0/0 .text daObjKazeNeko_Draw__FP15daObjKazeNeko_c */
 static int daObjKazeNeko_Draw(daObjKazeNeko_c* i_this) {
     return i_this->draw();
 }
@@ -194,14 +180,10 @@ inline int daObjKazeNeko_c::execute() {
     return 1;
 }
 
-/* 80C3CEA8-80C3D030 000648 0188+00 1/0 0/0 0/0 .text daObjKazeNeko_Execute__FP15daObjKazeNeko_c
- */
 static int daObjKazeNeko_Execute(daObjKazeNeko_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C3D030-80C3D038 0007D0 0008+00 1/0 0/0 0/0 .text daObjKazeNeko_IsDelete__FP15daObjKazeNeko_c
- */
 static int daObjKazeNeko_IsDelete(daObjKazeNeko_c* i_this) {
     return 1;
 }
@@ -210,7 +192,6 @@ inline daObjKazeNeko_c::~daObjKazeNeko_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C3D038-80C3D168 0007D8 0130+00 1/0 0/0 0/0 .text daObjKazeNeko_Delete__FP15daObjKazeNeko_c */
 static int daObjKazeNeko_Delete(daObjKazeNeko_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjKazeNeko_c();
@@ -230,15 +211,12 @@ inline int daObjKazeNeko_c::create() {
     return rv;
 }
 
-/* 80C3D168-80C3D2A0 000908 0138+00 1/0 0/0 0/0 .text daObjKazeNeko_Create__FP10fopAc_ac_c */
 static int daObjKazeNeko_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjKazeNeko_c*>(i_this)->create();
 }
 
 
-/* ############################################################################################## */
-/* 80C3D494-80C3D4B4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKazeNeko_Method */
 static actor_method_class l_daObjKazeNeko_Method = {
     (process_method_func)daObjKazeNeko_Create,
     (process_method_func)daObjKazeNeko_Delete,
@@ -247,7 +225,6 @@ static actor_method_class l_daObjKazeNeko_Method = {
     (process_method_func)daObjKazeNeko_Draw,
 };
 
-/* 80C3D4B4-80C3D4E4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KazeNeko */
 extern actor_process_profile_definition g_profile_Obj_KazeNeko = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp
index 295b4d4f57..5651ca72a8 100644
--- a/src/d/actor/d_a_obj_kbacket.cpp
+++ b/src/d/actor/d_a_obj_kbacket.cpp
@@ -12,10 +12,6 @@
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
 static s32 l_bmdData[4] = { 8, 0, 9, 0 };
 
 static char* l_resNameList[1] = { "Kakashi" };
@@ -40,7 +36,6 @@ static dCcD_SrcCyl l_ccDCyl = {
     } // mCyl
 };
 
-/* 80587FEC-80587FF0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_KBacket_Param_c l_HIO;
 
 static inline const daObj_KBacket_HIOParam* get_params(daObj_KBacket_c* i_this) {
@@ -62,7 +57,6 @@ daObj_KBacket_c::~daObj_KBacket_c() {
 }
 
 
-/* 80586048-805863F0 0002E8 03A8+00 1/1 0/0 0/0 .text            create__15daObj_KBacket_cFv */
 int daObj_KBacket_c::create() {
     fopAcM_ct(this, daObj_KBacket_c);
 
@@ -111,7 +105,6 @@ int daObj_KBacket_c::create() {
     return res;
 }
 
-/* 80586604-80586704 0008A4 0100+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_KBacket_cFv */
 int daObj_KBacket_c::CreateHeap() {
     J3DModelData* modelData;
 
@@ -140,14 +133,12 @@ int daObj_KBacket_c::CreateHeap() {
     return 1;
 }
 
-/* 80586704-80586738 0009A4 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_KBacket_cFv */
 int daObj_KBacket_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_KBacket_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_KBacket_c();
     return 1;
 }
 
-/* 80586738-8058742C 0009D8 0CF4+00 2/2 0/0 0/0 .text            Execute__15daObj_KBacket_cFv */
 int daObj_KBacket_c::Execute() {
 
     f32 movePMag = get_params(this)->field_0x28;
@@ -519,7 +510,6 @@ int daObj_KBacket_c::Execute() {
     return 1;
 }
 
-/* 8058742C-80587558 0016CC 012C+00 1/1 0/0 0/0 .text            Draw__15daObj_KBacket_cFv */
 int daObj_KBacket_c::Draw() {
     if (this->field_0xa48 == 0x0) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -542,32 +532,25 @@ int daObj_KBacket_c::Draw() {
     return 1;
 }
 
-/* 805875A0-805875C0 001840 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_KBacket_cFP10fopAc_ac_c          */
 void daObj_KBacket_c::createHeapCallBack(fopAc_ac_c* param_0) {
     ((daObj_KBacket_c*)param_0)->CreateHeap();
 }
 
-/* 805875C0-8058761C 001860 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__15daObj_KBacket_cFv
- */
 void daObj_KBacket_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 8058761C-80587660 0018BC 0044+00 2/2 0/0 0/0 .text            setRoomNo__15daObj_KBacket_cFv */
 void daObj_KBacket_c::setRoomNo() {
     s8 roomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomNo);
     mStts.SetRoomId(roomNo);
 }
 
-/* 80587660-80587694 001900 0034+00 1/1 0/0 0/0 .text            reset__15daObj_KBacket_cFv */
 void daObj_KBacket_c::reset() {
     memset(&field_0x9d4, 0, (size_t)&field_0xa4c - (size_t)&field_0x9d4);
 }
 
-/* 80587694-805877C4 001934 0130+00 1/1 0/0 0/0 .text            setMtx__15daObj_KBacket_cFv */
 void daObj_KBacket_c::setMtx() {
     s16 angleDiff = current.angle.y - shape_angle.y;
     s16 cos = cM_scos(angleDiff) * field_0xa18;
@@ -590,8 +573,6 @@ void daObj_KBacket_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 805877C4-80587864 001A64 00A0+00 1/1 0/0 0/0 .text            calcRollAngle__15daObj_KBacket_cFsi
- */
 s16 daObj_KBacket_c::calcRollAngle(s16 param_0, int param_1) {
     // this matches in release but the debug match is pretty horrible
 
@@ -615,8 +596,6 @@ s16 daObj_KBacket_c::calcRollAngle(s16 param_0, int param_1) {
     return 0;
 }
 
-/* 80587864-805879F4 001B04 0190+00 1/1 0/0 0/0 .text            getWallAngle__15daObj_KBacket_cFsPs
- */
 int daObj_KBacket_c::getWallAngle(s16 param_0, s16* param_1) {
     cXyz unkXyz1;
     cXyz unkXyzArr[2];
@@ -649,16 +628,12 @@ int daObj_KBacket_c::getWallAngle(s16 param_0, s16* param_1) {
     return 1;
 }
 
-/* 805879F4-80587A70 001C94 007C+00 1/1 0/0 0/0 .text            setSmokePrtcl__15daObj_KBacket_cFv
- */
 void daObj_KBacket_c::setSmokePrtcl() {
     fopAcM_effSmokeSet1(&field_0xa3c, &field_0xa40, &current.pos, NULL, 0.6f, &tevStr, 1);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa3c);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa40);
 }
 
-/* 80587A70-80587B68 001D10 00F8+00 1/1 0/0 0/0 .text            setWaterPrtcl__15daObj_KBacket_cFv
- */
 void daObj_KBacket_c::setWaterPrtcl() {
     /* 80587EF0-80587EF8 000078 0008+00 1/1 0/0 0/0 .data            emttrId$4670 */
     static u16 emttrId[4] = {
@@ -678,39 +653,31 @@ void daObj_KBacket_c::setWaterPrtcl() {
     }
 }
 
-/* 80587B68-80587BB8 001E08 0050+00 1/1 0/0 0/0 .text            setHamonPrtcl__15daObj_KBacket_cFv
- */
 void daObj_KBacket_c::setHamonPrtcl() {
     cXyz translation(current.pos.x, field_0xa04, current.pos.z);
     fopAcM_effHamonSet(&field_0xa34, &translation, 0.7f, 0.05f);
 }
 
-/* 80587BB8-80587BD8 001E58 0020+00 1/0 0/0 0/0 .text            daObj_KBacket_Create__FPv */
 static int daObj_KBacket_Create(void* i_this) {
     return ((daObj_KBacket_c*)i_this)->create();
 }
 
-/* 80587BD8-80587BF8 001E78 0020+00 1/0 0/0 0/0 .text            daObj_KBacket_Delete__FPv */
 static int daObj_KBacket_Delete(void* i_this) {
     return ((daObj_KBacket_c*)i_this)->Delete();
 }
 
-/* 80587BF8-80587C18 001E98 0020+00 1/0 0/0 0/0 .text            daObj_KBacket_Execute__FPv */
 static int daObj_KBacket_Execute(void* i_this) {
     return ((daObj_KBacket_c*)i_this)->Execute();
 }
 
-/* 80587C18-80587C38 001EB8 0020+00 1/0 0/0 0/0 .text            daObj_KBacket_Draw__FPv */
 static int daObj_KBacket_Draw(void* i_this) {
     return ((daObj_KBacket_c*)i_this)->Draw();
 }
 
-/* 80587C38-80587C40 001ED8 0008+00 1/0 0/0 0/0 .text            daObj_KBacket_IsDelete__FPv */
 static int daObj_KBacket_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80587EF8-80587F18 -00001 0020+00 1/0 0/0 0/0 .data            daObj_KBacket_MethodTable */
 static actor_method_class daObj_KBacket_MethodTable = {
     (process_method_func)daObj_KBacket_Create,
     (process_method_func)daObj_KBacket_Delete,
@@ -719,7 +686,6 @@ static actor_method_class daObj_KBacket_MethodTable = {
     (process_method_func)daObj_KBacket_Draw,
 };
 
-/* 80587F18-80587F48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KBACKET */
 extern actor_process_profile_definition g_profile_OBJ_KBACKET = {
     fpcLy_CURRENT_e,            // mLayerID
     8,                          // mListID
diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp
index 5b9f102db6..ab857d9a14 100644
--- a/src/d/actor/d_a_obj_kbox.cpp
+++ b/src/d/actor/d_a_obj_kbox.cpp
@@ -9,9 +9,7 @@
 #include "d/actor/d_a_obj_kbox.h"
 #include "d/d_cc_d.h"
 #include "Z2AudioLib/Z2Instances.h"
-#include "dol2asm.h"
 
-/* 80C3D60C-80C3D630 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daObj_Kbox_HIO_cFv */
 daObj_Kbox_HIO_c::daObj_Kbox_HIO_c() {
     mId = -1;
     mWidth = 2.0f;
@@ -28,11 +26,8 @@ void daObj_Kbox_HIO_c::genMessage(JORMContext* ctx) {
 
 static bool l_HIOInit;
 
-/* 80C3F294-80C3F2A0 000054 000C+00 3/4 0/0 0/0 .bss             l_HIO */
 static daObj_Kbox_HIO_c l_HIO;
 
-/* 80C3D630-80C3D74C 000110 011C+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_ALINK) {
         obj_kbox_class* i_this = (obj_kbox_class*) param_2;
@@ -53,7 +48,6 @@ static void ride_call_back(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param
     }
 }
 
-/* 80C3D74C-80C3D8BC 00022C 0170+00 1/1 0/0 0/0 .text            break_eff__FP14obj_kbox_class */
 static void break_eff(obj_kbox_class* i_this) {
     static u16 const particle_id[3] = {
         0x82AB,
@@ -73,8 +67,6 @@ static void break_eff(obj_kbox_class* i_this) {
     }
 }
 
-/* 80C3D8F8-80C3DA18 0003D8 0120+00 1/0 0/0 0/0 .text            daObj_Kbox_Draw__FP14obj_kbox_class
- */
 static int daObj_Kbox_Draw(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     g_env_light.settingTevStruct(8, &a_this->current.pos, &a_this->tevStr);
@@ -94,7 +86,6 @@ static int daObj_Kbox_Draw(obj_kbox_class* i_this) {
     return 1;
 }
 
-/* 80C3DA18-80C3DAB4 0004F8 009C+00 1/1 0/0 0/0 .text            kbox_ground__FP14obj_kbox_class */
 static void kbox_ground(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     i_this->mSph.OnCoSetBit();
@@ -109,7 +100,6 @@ static void kbox_ground(obj_kbox_class* i_this) {
     }
 }
 
-/* 80C3DAB4-80C3DBE4 000594 0130+00 1/1 0/0 0/0 .text            kbox_carry__FP14obj_kbox_class */
 static void kbox_carry(obj_kbox_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
@@ -141,7 +131,6 @@ static void kbox_carry(obj_kbox_class* i_this) {
     }
 }
 
-/* 80C3DBE4-80C3DDC4 0006C4 01E0+00 1/1 0/0 0/0 .text            water_check__FP14obj_kbox_class */
 static BOOL water_check(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     dBgS_LinChk mLinChk;
@@ -170,7 +159,6 @@ static BOOL water_check(obj_kbox_class* i_this) {
     return FALSE;
 }
 
-/* 80C3DE3C-80C3DFAC 00091C 0170+00 1/1 0/0 0/0 .text            kbox_drop__FP14obj_kbox_class */
 static int kbox_drop(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     BOOL rv = TRUE;
@@ -204,7 +192,6 @@ static int kbox_drop(obj_kbox_class* i_this) {
     return rv;
 }
 
-/* 80C3DFAC-80C3E340 000A8C 0394+00 1/1 0/0 0/0 .text            kbox_float__FP14obj_kbox_class */
 static void kbox_float(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cLib_addCalc0(&a_this->speed.y, 1.0f, 0.25f);
@@ -260,7 +247,6 @@ static void kbox_float(obj_kbox_class* i_this) {
     cLib_addCalc2(&i_this->field_0x5a8, fVar10, 1.0f, 5.0f);
 }
 
-/* 80C3E340-80C3E8E8 000E20 05A8+00 1/1 0/0 0/0 .text            action__FP14obj_kbox_class */
 static void action(obj_kbox_class* i_this) {
     fopAc_ac_c* player;
     s8 bVar2;
@@ -410,7 +396,6 @@ static void action(obj_kbox_class* i_this) {
     }
 }
 
-/* 80C3E8E8-80C3EA24 0013C8 013C+00 2/1 0/0 0/0 .text daObj_Kbox_Execute__FP14obj_kbox_class */
 static int daObj_Kbox_Execute(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     i_this->field_0x578++;
@@ -437,12 +422,10 @@ static int daObj_Kbox_Execute(obj_kbox_class* i_this) {
     return 1;
 }
 
-/* 80C3EA24-80C3EA2C 001504 0008+00 1/0 0/0 0/0 .text daObj_Kbox_IsDelete__FP14obj_kbox_class */
 static int daObj_Kbox_IsDelete(obj_kbox_class* i_this) {
     return 1;
 }
 
-/* 80C3EA2C-80C3EAAC 00150C 0080+00 1/0 0/0 0/0 .text daObj_Kbox_Delete__FP14obj_kbox_class */
 static int daObj_Kbox_Delete(obj_kbox_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     fopAcM_GetID(a_this);
@@ -458,7 +441,6 @@ static int daObj_Kbox_Delete(obj_kbox_class* i_this) {
     return 1;
 }
 
-/* 80C3EAAC-80C3EBCC 00158C 0120+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_kbox_class* i_this = (obj_kbox_class*)a_this;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kbox", 4);
@@ -483,8 +465,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80C3EBCC-80C3EE98 0016AC 02CC+00 1/0 0/0 0/0 .text            daObj_Kbox_Create__FP10fopAc_ac_c
- */
 static int daObj_Kbox_Create(fopAc_ac_c* a_this) {
     obj_kbox_class* i_this = (obj_kbox_class*)a_this;
     fopAcM_ct(a_this, obj_kbox_class);
@@ -540,7 +520,6 @@ static int daObj_Kbox_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 80C3F174-80C3F194 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Kbox_Method */
 static actor_method_class l_daObj_Kbox_Method = {
     (process_method_func)daObj_Kbox_Create,
     (process_method_func)daObj_Kbox_Delete,
@@ -549,7 +528,6 @@ static actor_method_class l_daObj_Kbox_Method = {
     (process_method_func)daObj_Kbox_Draw,
 };
 
-/* 80C3F194-80C3F1C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KBOX */
 extern actor_process_profile_definition g_profile_OBJ_KBOX = {
   fpcLy_CURRENT_e,        // mLayerID
   8,                      // mListID
diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp
index fa730bb588..c9974a81d4 100644
--- a/src/d/actor/d_a_obj_key.cpp
+++ b/src/d/actor/d_a_obj_key.cpp
@@ -19,8 +19,8 @@
 
 class daObj_Key_HIO_c : public JORReflexible{
 public:
-    /* 80C3F40C */ daObj_Key_HIO_c();
-    /* 80C40F28 */ virtual ~daObj_Key_HIO_c() {}
+    daObj_Key_HIO_c();
+    virtual ~daObj_Key_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -29,15 +29,12 @@ public:
     /* 0xC */ f32 chain_size;
 };
 
-/* 80C3F40C-80C3F43C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__15daObj_Key_HIO_cFv */
 daObj_Key_HIO_c::daObj_Key_HIO_c() {
     id = -1;
     size = 1.0f;
     chain_size = 1.5f;
 }
 
-/* 80C3F43C-80C3F4D4 00011C 0098+00 1/0 0/0 0/0 .text            daObj_Key_Draw__FP13obj_key_class
- */
 static int daObj_Key_Draw(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -53,16 +50,12 @@ static int daObj_Key_Draw(obj_key_class* i_this) {
     return 1;
 }
 
-/* 80C41138-80C4113C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80C41148-80C41158 000018 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daObj_Key_HIO_c l_HIO;
 
-/* 80C41158-80C4115A 000028 0002+00 2/2 0/0 0/0 .bss             target_info_count */
 static s16 target_info_count;
 
-/* 80C3F4D4-80C3F540 0001B4 006C+00 1/1 0/0 0/0 .text            s_count_sub__FPvPv */
 static void* s_count_sub(void* i_actor, void* i_other) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_KEY && ((fopAc_ac_c*)i_actor)->field_0x560 != 0) {
         ((fopAc_ac_c*)i_actor)->health = target_info_count;
@@ -72,7 +65,6 @@ static void* s_count_sub(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80C3F540-80C3F600 000220 00C0+00 1/1 0/0 0/0 .text            s_master_sub__FPvPv */
 static void* s_master_sub(void* i_actor, void* i_other) {
     if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DN) ||
         fopAcM_GetName(i_actor) == PROC_E_RD ||
@@ -93,8 +85,6 @@ static void* s_master_sub(void* i_actor, void* i_other) {
     return NULL;
 }
 
-/* 80C3F600-80C3F6B4 0002E0 00B4+00 1/1 0/0 0/0 .text            masterkey_check__FP13obj_key_class
- */
 static void masterkey_check(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -111,7 +101,6 @@ static void masterkey_check(obj_key_class* i_this) {
     }
 }
 
-/* 80C3F6B4-80C3F728 000394 0074+00 1/1 0/0 0/0 .text            action_check__FP13obj_key_class */
 static void action_check(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -124,8 +113,6 @@ static void action_check(obj_key_class* i_this) {
     }
 }
 
-/* 80C3F728-80C3FB84 000408 045C+00 1/1 0/0 0/0 .text            chain_control_00__FP13obj_key_class
- */
 static void chain_control_00(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -243,8 +230,6 @@ static void chain_control_00(obj_key_class* i_this) {
     i_this->hide = FALSE;
 }
 
-/* 80C3FBC0-80C406EC 0008A0 0B2C+00 1/1 0/0 0/0 .text            chain_control_01__FP13obj_key_class
- */
 static void chain_control_01(obj_key_class* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)&i_this->actor;
 
@@ -500,7 +485,6 @@ static void chain_control_01(obj_key_class* i_this) {
     i_this->hide = FALSE;
 }
 
-/* 80C406EC-80C408B4 0013CC 01C8+00 1/1 0/0 0/0 .text            action__FP13obj_key_class */
 static void action(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     f32 temp_f31 = -3.0f + TREG_F(12);
@@ -544,7 +528,6 @@ static void action(obj_key_class* i_this) {
     }
 }
 
-/* 80C408B4-80C4093C 001594 0088+00 2/1 0/0 0/0 .text daObj_Key_Execute__FP13obj_key_class */
 static int daObj_Key_Execute(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
 
@@ -560,13 +543,10 @@ static int daObj_Key_Execute(obj_key_class* i_this) {
     return 1;
 }
 
-/* 80C4093C-80C40944 00161C 0008+00 1/0 0/0 0/0 .text daObj_Key_IsDelete__FP13obj_key_class */
 static int daObj_Key_IsDelete(obj_key_class* i_this) {
     return 1;
 }
 
-/* 80C40944-80C409AC 001624 0068+00 1/0 0/0 0/0 .text            daObj_Key_Delete__FP13obj_key_class
- */
 static int daObj_Key_Delete(obj_key_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -584,7 +564,6 @@ static int daObj_Key_Delete(obj_key_class* i_this) {
     return 1;
 }
 
-/* 80C409AC-80C40AB8 00168C 010C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_key_class* a_this = (obj_key_class*)i_this;
 
@@ -609,7 +588,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C40AB8-80C40DE4 001798 032C+00 1/0 0/0 0/0 .text            daObj_Key_Create__FP10fopAc_ac_c */
 static int daObj_Key_Create(fopAc_ac_c* i_this) {
     obj_key_class* a_this = (obj_key_class*)i_this;
     fopAcM_ct(i_this, obj_key_class);
@@ -662,7 +640,6 @@ static int daObj_Key_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80C41098-80C410B8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Key_Method */
 static actor_method_class l_daObj_Key_Method = {
     (process_method_func)daObj_Key_Create,
     (process_method_func)daObj_Key_Delete,
@@ -671,7 +648,6 @@ static actor_method_class l_daObj_Key_Method = {
     (process_method_func)daObj_Key_Draw,
 };
 
-/* 80C410B8-80C410E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KEY */
 extern actor_process_profile_definition g_profile_OBJ_KEY = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp
index 5ed1b9e534..67e36b4da9 100644
--- a/src/d/actor/d_a_obj_keyhole.cpp
+++ b/src/d/actor/d_a_obj_keyhole.cpp
@@ -11,13 +11,11 @@
 #include "d/actor/d_a_player.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80C4124C-80C41270 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__19daObj_Keyhole_HIO_cFv */
 daObj_Keyhole_HIO_c::daObj_Keyhole_HIO_c() {
     id = -1;
     obj_size = 1.0f;
 }
 
-/* 80C41270-80C4134C 000110 00DC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -38,7 +36,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80C4134C-80C41454 0001EC 0108+00 1/0 0/0 0/0 .text daObj_Keyhole_Draw__FP17obj_keyhole_class */
 static int daObj_Keyhole_Draw(obj_keyhole_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     g_env_light.settingTevStruct(16, &actor->current.pos, &actor->tevStr);
@@ -63,8 +60,6 @@ static int daObj_Keyhole_Draw(obj_keyhole_class* i_this) {
     return 1;
 }
 
-/* 80C41454-80C41654 0002F4 0200+00 1/1 0/0 0/0 .text
- * chain_control1__FP17obj_keyhole_classP10kh_chain_si          */
 static void chain_control1(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int unused) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp24;
@@ -120,8 +115,6 @@ static void chain_control1(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int
     }
 }
 
-/* 80C41690-80C419C4 000530 0334+00 1/1 0/0 0/0 .text
- * chain_control1_2__FP17obj_keyhole_classP10kh_chain_si        */
 static void chain_control1_2(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int unused) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp48;
@@ -197,8 +190,6 @@ static void chain_control1_2(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, i
     }
 }
 
-/* 80C419C4-80C41C84 000864 02C0+00 1/1 0/0 0/0 .text
- * chain_control2__FP17obj_keyhole_classP10kh_chain_si          */
 static void chain_control2(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int unused) {
     cXyz sp30;
     cXyz sp24;
@@ -250,8 +241,6 @@ static void chain_control2(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int
     }
 }
 
-/* 80C41C84-80C41D6C 000B24 00E8+00 1/1 0/0 0/0 .text
- * chain_control3__FP17obj_keyhole_classP10kh_chain_si          */
 static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int unused) {
     cXyz sp30;
     cXyz sp24;
@@ -267,11 +256,8 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int
 /* 80C43CE5 0003+00 data_80C43CE5 None */
 static u8 l_HIOInit;
 
-/* 80C43CF4-80C43D00 000054 000C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daObj_Keyhole_HIO_c l_HIO;
 
-/* 80C41D6C-80C42380 000C0C 0614+00 1/1 0/0 0/0 .text            chain_move__FP17obj_keyhole_class
- */
 static void chain_move(obj_keyhole_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -387,7 +373,6 @@ static void chain_move(obj_keyhole_class* i_this) {
     }
 }
 
-/* 80C42380-80C42518 001220 0198+00 1/1 0/0 0/0 .text            open__FP17obj_keyhole_class */
 static void open(obj_keyhole_class* i_this) {
     switch (i_this->mode) {
     case 0:
@@ -420,7 +405,6 @@ static void open(obj_keyhole_class* i_this) {
     }
 }
 
-/* 80C42518-80C427D0 0013B8 02B8+00 1/1 0/0 0/0 .text            drop__FP17obj_keyhole_class */
 static void drop(obj_keyhole_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp18;
@@ -499,8 +483,6 @@ static void drop(obj_keyhole_class* i_this) {
     }
 }
 
-/* 80C427D0-80C42D0C 001670 053C+00 2/1 0/0 0/0 .text daObj_Keyhole_Execute__FP17obj_keyhole_class
- */
 static int daObj_Keyhole_Execute(obj_keyhole_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     cXyz sp34;
@@ -635,14 +617,10 @@ static int daObj_Keyhole_Execute(obj_keyhole_class* i_this) {
     return 1;
 }
 
-/* 80C42D0C-80C42D14 001BAC 0008+00 1/0 0/0 0/0 .text
- * daObj_Keyhole_IsDelete__FP17obj_keyhole_class                */
 static int daObj_Keyhole_IsDelete(obj_keyhole_class* i_this) {
     return 1;
 }
 
-/* 80C42D14-80C42DC8 001BB4 00B4+00 1/0 0/0 0/0 .text daObj_Keyhole_Delete__FP17obj_keyhole_class
- */
 static int daObj_Keyhole_Delete(obj_keyhole_class* i_this) {
     fopAc_ac_c* actor = &i_this->actor;
     fpc_ProcID id = fopAcM_GetID(actor);
@@ -667,7 +645,6 @@ static int daObj_Keyhole_Delete(obj_keyhole_class* i_this) {
     return 1;
 }
 
-/* 80C42DC8-80C4307C 001C68 02B4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_keyhole_class* a_this = (obj_keyhole_class*)i_this;
     void* modelData;
@@ -729,7 +706,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C4307C-80C434AC 001F1C 0430+00 1/0 0/0 0/0 .text daObj_Keyhole_Create__FP10fopAc_ac_c */
 static int daObj_Keyhole_Create(fopAc_ac_c* a_this) {
     obj_keyhole_class* i_this = (obj_keyhole_class*)a_this;
     fopAcM_ct(a_this, obj_keyhole_class);
@@ -858,7 +834,6 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 80C43C14-80C43C34 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Keyhole_Method */
 static actor_method_class l_daObj_Keyhole_Method = {
     (process_method_func)daObj_Keyhole_Create,
     (process_method_func)daObj_Keyhole_Delete,
@@ -867,7 +842,6 @@ static actor_method_class l_daObj_Keyhole_Method = {
     (process_method_func)daObj_Keyhole_Draw,
 };
 
-/* 80C43C34-80C43C64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KEYHOLE */
 extern actor_process_profile_definition g_profile_OBJ_KEYHOLE = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp
index ca7c06e34d..c377aba360 100644
--- a/src/d/actor/d_a_obj_kgate.cpp
+++ b/src/d/actor/d_a_obj_kgate.cpp
@@ -31,7 +31,6 @@ enum {
     AREA_CHECK_HORSE,
 };
 
-/* 80588078-805880C8 000078 0050+00 3/3 0/0 0/0 .text            search_coach__FPvPv */
 static void* search_coach(void* i_actor, void* i_data) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH)
     {
@@ -41,31 +40,23 @@ static void* search_coach(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8058AB30-8058AB3C 000000 000C+00 10/10 0/0 0/0 .rodata          l_gateBmdIdx */
 static int const l_gateBmdIdx[] = {5, 4, 5};
 
-/* 8058AB3C-8058AB48 00000C 000C+00 0/1 0/0 0/0 .rodata          l_gateKeyIdx */
 static int const l_gateKeyIdx[] = {7, -1, 7};
 
-/* 8058AB48-8058AB54 000018 000C+00 0/1 0/0 0/0 .rodata          l_gateHookIdx */
 static int const l_gateHookIdx[] = {6, -1, 6};
 
-/* 8058AB54-8058AB60 000024 000C+00 0/2 0/0 0/0 .rodata          l_gateDzbIdx */
 static int const l_gateDzbIdx[] = {10, 7, 10};
 
-/* 8058AB60-8058AB6C 000030 000C+00 0/1 0/0 0/0 .rodata          l_gate_heap */
 static u32 const l_gate_heap[] = {0x1940, 0x1940, 0x1940};
 
-/* 8058AB6C-8058AB78 00003C 000C+00 0/1 0/0 0/0 .rodata          l_key_heap */
 static u32 const l_key_heap[] = {0x1000, 0x1000, 0x1000};
 
-/* 8058AB78-8058AB90 000048 0018+00 0/1 0/0 0/0 .rodata          l_cull_box */
 static Vec const l_cull_box[] = {
     {-300.0f, 0.0f, -350.0f},
     {300.0f, 450.0f, 350.0f},
 };
 
-/* 8058AB90-8058ABD4 000060 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x20, 0x11}, 0x78}},  // mObj
@@ -80,7 +71,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 805880C8-8058827C 0000C8 01B4+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjKGate_cFv */
 void daObjKGate_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -114,7 +104,6 @@ void daObjKGate_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8058827C-805887A0 00027C 0524+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjKGate_cFv */
 void daObjKGate_c::setBaseMtx() {
     cXyz sp30;
     cXyz sp3C;
@@ -214,14 +203,12 @@ void daObjKGate_c::setBaseMtx() {
     }
 }
 
-/* 8058AD44-8058AD50 -00001 000C+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {
     "D_Kgate00",
     "D_Kgate01",
     "M_RGate00",
 };
 
-/* 805887A0-805889A4 0007A0 0204+00 1/0 0/0 0/0 .text            Create__12daObjKGate_cFv */
 int daObjKGate_c::Create() {
     static char* l_evName[] = {"KOKI_GATE_OPEN00", NULL, "RIDER_GATE_OPEN00"};
 
@@ -281,7 +268,6 @@ int daObjKGate_c::Create() {
     return 1;
 }
 
-/* 805889A4-80588BF8 0009A4 0254+00 1/0 0/0 0/0 .text            CreateHeap__12daObjKGate_cFv */
 int daObjKGate_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateBmdIdx[mNameArg]);
@@ -331,7 +317,6 @@ int daObjKGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80588BF8-80588D00 000BF8 0108+00 1/1 0/0 0/0 .text            create1st__12daObjKGate_cFv */
 int daObjKGate_c::create1st() {
     mNameArg = getNameArg();
     if (mNameArg == 1) {
@@ -361,7 +346,6 @@ int daObjKGate_c::create1st() {
     return phase_state;
 }
 
-/* 80588D00-805890D4 000D00 03D4+00 2/2 0/0 0/0 .text checkAreaL__12daObjKGate_cFPC4cXyzPC4cXyz */
 int daObjKGate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     Mtx m;
@@ -445,7 +429,6 @@ int daObjKGate_c::checkAreaL(cXyz const* param_0, cXyz const* param_1) {
     return 0;
 }
 
-/* 805890D4-805894A4 0010D4 03D0+00 2/2 0/0 0/0 .text checkAreaR__12daObjKGate_cFPC4cXyzPC4cXyz */
 int daObjKGate_c::checkAreaR(cXyz const* param_0, cXyz const* param_1) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     Mtx m;
@@ -531,7 +514,6 @@ int daObjKGate_c::checkAreaR(cXyz const* param_0, cXyz const* param_1) {
     return 0;
 }
 
-/* 805894A4-805895D0 0014A4 012C+00 1/1 0/0 0/0 .text            checkOpen__12daObjKGate_cFv */
 BOOL daObjKGate_c::checkOpen() {
     if (dComIfGs_getKeyNum() == 0) {
         return false;
@@ -560,7 +542,6 @@ BOOL daObjKGate_c::checkOpen() {
     return false;
 }
 
-/* 805895D0-80589664 0015D0 0094+00 1/1 0/0 0/0 .text checkDirL__12daObjKGate_cFP10fopAc_ac_c */
 BOOL daObjKGate_c::checkDirL(fopAc_ac_c* i_actor) {
     Mtx m;
     mDoMtx_inverse(mpGateModel->getBaseTRMtx(), m);
@@ -576,7 +557,6 @@ BOOL daObjKGate_c::checkDirL(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80589664-805896F8 001664 0094+00 1/1 0/0 0/0 .text checkDirR__12daObjKGate_cFP10fopAc_ac_c */
 BOOL daObjKGate_c::checkDirR(fopAc_ac_c* i_actor) {
     Mtx m;
     mDoMtx_inverse(mpGateModel2->getBaseTRMtx(), m);
@@ -592,17 +572,14 @@ BOOL daObjKGate_c::checkDirR(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 805896F8-80589774 0016F8 007C+00 1/1 0/0 0/0 .text            setAtkSE__12daObjKGate_cFv */
 void daObjKGate_c::setAtkSE() {
     fopAcM_seStart(this, Z2SE_OBJ_FLN_GATE_ATK, 0);
 }
 
-/* 80589774-805897F0 001774 007C+00 1/1 0/0 0/0 .text            setCrkSE__12daObjKGate_cFv */
 void daObjKGate_c::setCrkSE() {
     fopAcM_seStart(this, Z2SE_OBJ_FLN_GATE_CRK, 0);
 }
 
-/* 805897F0-805898A0 0017F0 00B0+00 1/1 0/0 0/0 .text            action__12daObjKGate_cFv */
 void daObjKGate_c::action() {
     typedef void (daObjKGate_c::*func)();
     static func l_func[] = {&daObjKGate_c::action_typeA, &daObjKGate_c::action_typeB,
@@ -613,7 +590,6 @@ void daObjKGate_c::action() {
     }
 }
 
-/* 805898A0-80589F40 0018A0 06A0+00 2/0 0/0 0/0 .text            action_typeA__12daObjKGate_cFv */
 void daObjKGate_c::action_typeA() {
     u8 sw_no = getSwNo();
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -799,7 +775,6 @@ void daObjKGate_c::action_typeA() {
     }
 }
 
-/* 80589F40-8058A1B0 001F40 0270+00 1/0 0/0 0/0 .text            action_typeB__12daObjKGate_cFv */
 void daObjKGate_c::action_typeB() {
     static const Vec l_tg_offset[] = {
         {-150.0f, 0.0f, 0.0f}, {-50.0f, 0.0f, 0.0f}, {50.0f, 0.0f, 0.0f}, {150.0f, 0.0f, 0.0f}};
@@ -859,8 +834,6 @@ void daObjKGate_c::action_typeB() {
     }
 }
 
-/* 8058A1B0-8058A294 0021B0 00E4+00 1/0 0/0 0/0 .text            actionWaitEvent__12daObjKGate_cFv
- */
 void daObjKGate_c::actionWaitEvent() {
     if (eventInfo.checkCommandDoor()) {
         setAction(ACT_EVENT);
@@ -874,7 +847,6 @@ void daObjKGate_c::actionWaitEvent() {
     }
 }
 
-/* 8058A294-8058A2FC 002294 0068+00 1/0 0/0 0/0 .text            actionEvent__12daObjKGate_cFv */
 void daObjKGate_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACT_DEAD);
@@ -884,11 +856,8 @@ void daObjKGate_c::actionEvent() {
     }
 }
 
-/* 8058A2FC-8058A300 0022FC 0004+00 1/0 0/0 0/0 .text            actionDead__12daObjKGate_cFv */
 void daObjKGate_c::actionDead() {}
 
-/* 8058A300-8058A3A4 002300 00A4+00 1/1 0/0 0/0 .text            event_proc_call__12daObjKGate_cFv
- */
 void daObjKGate_c::event_proc_call() {
     typedef void (daObjKGate_c::*func)();
     static func l_func[] = {&daObjKGate_c::actionWaitEvent, &daObjKGate_c::actionEvent,
@@ -897,7 +866,6 @@ void daObjKGate_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 8058A3A4-8058A508 0023A4 0164+00 1/1 0/0 0/0 .text            demoProc__12daObjKGate_cFv */
 void daObjKGate_c::demoProc() {
     mStaffID = dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0);
     int demo_action = getDemoAction();
@@ -940,15 +908,12 @@ void daObjKGate_c::demoProc() {
     }
 }
 
-/* 8058A508-8058A550 002508 0048+00 1/1 0/0 0/0 .text            getDemoAction__12daObjKGate_cFv */
 int daObjKGate_c::getDemoAction() {
     static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"};
 
     return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
-/* 8058A550-8058A5B8 002550 0068+00 1/0 0/0 0/0 .text            Execute__12daObjKGate_cFPPA3_A4_f
- */
 int daObjKGate_c::Execute(Mtx** param_0) {
     event_proc_call();
     action();
@@ -960,7 +925,6 @@ int daObjKGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 8058A5B8-8058A6F4 0025B8 013C+00 1/0 0/0 0/0 .text            Draw__12daObjKGate_cFv */
 int daObjKGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpGateModel, &tevStr);
@@ -988,7 +952,6 @@ int daObjKGate_c::Draw() {
     return 1;
 }
 
-/* 8058A6F4-8058A768 0026F4 0074+00 1/0 0/0 0/0 .text            Delete__12daObjKGate_cFv */
 int daObjKGate_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         if (dComIfG_Bgsp().Release(mpBgW)) {
@@ -1002,36 +965,29 @@ int daObjKGate_c::Delete() {
     return 1;
 }
 
-/* 8058A768-8058A81C 002768 00B4+00 1/0 0/0 0/0 .text daObjKGate_create1st__FP12daObjKGate_c */
 static int daObjKGate_create1st(daObjKGate_c* i_this) {
     fopAcM_ct(i_this, daObjKGate_c);
     return i_this->create1st();
 }
 
-/* 8058AA58-8058AA78 002A58 0020+00 1/0 0/0 0/0 .text daObjKGate_MoveBGDelete__FP12daObjKGate_c */
 static int daObjKGate_MoveBGDelete(daObjKGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8058AA78-8058AA98 002A78 0020+00 1/0 0/0 0/0 .text daObjKGate_MoveBGExecute__FP12daObjKGate_c
- */
 static int daObjKGate_MoveBGExecute(daObjKGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8058AA98-8058AAC4 002A98 002C+00 1/0 0/0 0/0 .text daObjKGate_MoveBGDraw__FP12daObjKGate_c */
 static int daObjKGate_MoveBGDraw(daObjKGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 8058ADFC-8058AE1C -00001 0020+00 1/0 0/0 0/0 .data            daObjKGate_METHODS */
 static actor_method_class daObjKGate_METHODS = {
     (process_method_func)daObjKGate_create1st,     (process_method_func)daObjKGate_MoveBGDelete,
     (process_method_func)daObjKGate_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjKGate_MoveBGDraw,
 };
 
-/* 8058AE1C-8058AE4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KkrGate */
 extern actor_process_profile_definition g_profile_Obj_KkrGate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp
index 0f7f1b0645..2168f577f4 100644
--- a/src/d/actor/d_a_obj_ki.cpp
+++ b/src/d/actor/d_a_obj_ki.cpp
@@ -10,22 +10,17 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C44B90-80C44B98 000000 0008+00 1/1 0/0 0/0 .data            ki_bmd */
 static int ki_bmd[2] = {9, 10};
 
-/* 80C44C08-80C44C0C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 80C44C18-80C44C20 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Ki_HIO_c l_HIO;
 
-/* 80C43EEC-80C43F0C 0000EC 0020+00 1/1 0/0 0/0 .text            __ct__14daObj_Ki_HIO_cFv */
 daObj_Ki_HIO_c::daObj_Ki_HIO_c() {
     field_0x4 = -1;
     field_0x5 = 0;
 }
 
-/* 80C43F0C-80C44010 00010C 0104+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -43,7 +38,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80C44010-80C44080 000210 0070+00 1/0 0/0 0/0 .text            daObj_Ki_Draw__FP12obj_ki_class */
 static int daObj_Ki_Draw(obj_ki_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -52,7 +46,6 @@ static int daObj_Ki_Draw(obj_ki_class* i_this) {
     return 1;
 }
 
-/* 80C44080-80C4408C 000280 000C+00 1/1 0/0 0/0 .text            action__FP12obj_ki_class */
 static void action(obj_ki_class* i_this) {
     cXyz vec;
     if (i_this->field_0x57a == 0) {
@@ -60,8 +53,6 @@ static void action(obj_ki_class* i_this) {
     }
 }
 
-/* 80C440C8-80C443E0 0002C8 0318+00 2/1 0/0 0/0 .text            daObj_Ki_Execute__FP12obj_ki_class
- */
 static int daObj_Ki_Execute(obj_ki_class* i_this) {
     i_this->mCounter++;
     for (int i = 0; i < 4; i++) {
@@ -102,14 +93,10 @@ static int daObj_Ki_Execute(obj_ki_class* i_this) {
     return 1;
 }
 
-/* 80C4441C-80C44424 00061C 0008+00 1/0 0/0 0/0 .text            daObj_Ki_IsDelete__FP12obj_ki_class
- */
 static int daObj_Ki_IsDelete(obj_ki_class* i_this) {
     return 1;
 }
 
-/* 80C44424-80C4448C 000624 0068+00 1/0 0/0 0/0 .text            daObj_Ki_Delete__FP12obj_ki_class
- */
 static int daObj_Ki_Delete(obj_ki_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "Obj_Ki");
     if (i_this->mHIOInit) {
@@ -119,7 +106,6 @@ static int daObj_Ki_Delete(obj_ki_class* i_this) {
     return 1;
 }
 
-/* 80C4448C-80C4466C 00068C 01E0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_ki_class* _this = static_cast<obj_ki_class*>(i_this);
 
@@ -153,7 +139,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C4466C-80C449F8 00086C 038C+00 1/0 0/0 0/0 .text            daObj_Ki_Create__FP10fopAc_ac_c */
 static cPhs__Step daObj_Ki_Create(fopAc_ac_c* i_this) {
     obj_ki_class* _this = static_cast<obj_ki_class*>(i_this);
     fopAcM_ct(_this, obj_ki_class);
@@ -231,7 +216,6 @@ static cPhs__Step daObj_Ki_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80C44BA0-80C44BC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Ki_Method */
 static actor_method_class l_daObj_Ki_Method = {
     (process_method_func)daObj_Ki_Create,
     (process_method_func)daObj_Ki_Delete,
@@ -240,7 +224,6 @@ static actor_method_class l_daObj_Ki_Method = {
     (process_method_func)daObj_Ki_Draw,
 };
 
-/* 80C44BC0-80C44BF0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KI */
 extern actor_process_profile_definition g_profile_OBJ_KI = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp
index 425379f7f1..cbbf33e408 100644
--- a/src/d/actor/d_a_obj_kiPot.cpp
+++ b/src/d/actor/d_a_obj_kiPot.cpp
@@ -10,24 +10,20 @@
 
 static daKiPot_HIO_c l_HIO;
 
-/* 80C451A4-80C451BC 000000 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-50.0f, 0.0f, -50.0f},
     {50.0f, 100.0f, 50.0f},
 };
 
-/* 80C44D0C-80C44D30 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__13daKiPot_HIO_cFv */
 daKiPot_HIO_c::daKiPot_HIO_c() {
     field_0x06 = 0x14;
 }
 
-/* 80C44D78-80C44DD0 000158 0058+00 2/2 0/0 0/0 .text            setBaseMtx__9daKiPot_cFv */
 void daKiPot_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80C44DD0-80C44E7C 0001B0 00AC+00 1/1 0/0 0/0 .text            create__9daKiPot_cFv */
 int daKiPot_c::create() {
     fopAcM_ct(this, daKiPot_c);
 
@@ -46,7 +42,6 @@ int daKiPot_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C44E7C-80C44EF8 00025C 007C+00 1/1 0/0 0/0 .text            Execute__9daKiPot_cFv */
 int daKiPot_c::Execute() {
     procMain();
     attention_info.position = current.pos;
@@ -56,7 +51,6 @@ int daKiPot_c::Execute() {
     return 1;
 }
 
-/* 80C44EF8-80C44F74 0002D8 007C+00 1/1 0/0 0/0 .text            procMain__9daKiPot_cFv */
 void daKiPot_c::procMain() {
     typedef void (daKiPot_c::*modeProcessFunc)();
     static modeProcessFunc mode_proc[] = {
@@ -66,12 +60,10 @@ void daKiPot_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C44F74-80C44F80 000354 000C+00 1/1 0/0 0/0 .text            init_modeWait__9daKiPot_cFv */
 void daKiPot_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C44F80-80C45008 000360 0088+00 1/0 0/0 0/0 .text            modeWait__9daKiPot_cFv */
 void daKiPot_c::modeWait() {
     if (chkEvent() && eventInfo.checkCommandCatch() == 0) {
         dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1);
@@ -79,7 +71,6 @@ void daKiPot_c::modeWait() {
     }
 }
 
-/* 80C45008-80C45058 0003E8 0050+00 1/1 0/0 0/0 .text            chkEvent__9daKiPot_cFv */
 s32 daKiPot_c::chkEvent() {
     s32 result = 1;
 
@@ -93,44 +84,36 @@ s32 daKiPot_c::chkEvent() {
     return result;
 }
 
-/* 80C45058-80C45060 000438 0008+00 1/1 0/0 0/0 .text            Draw__9daKiPot_cFv */
 int daKiPot_c::Draw() {
     return 1;
 }
 
-/* 80C45060-80C45068 000440 0008+00 1/1 0/0 0/0 .text            Delete__9daKiPot_cFv */
 int daKiPot_c::Delete() {
     return 1;
 }
 
-/* 80C45068-80C45088 000448 0020+00 1/0 0/0 0/0 .text            daKiPot_Draw__FP9daKiPot_c */
 static int daKiPot_Draw(daKiPot_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C45088-80C450A8 000468 0020+00 1/0 0/0 0/0 .text            daKiPot_Execute__FP9daKiPot_c */
 static int daKiPot_Execute(daKiPot_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C450A8-80C450C8 000488 0020+00 1/0 0/0 0/0 .text            daKiPot_Delete__FP9daKiPot_c */
 static int daKiPot_Delete(daKiPot_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C450C8-80C450E8 0004A8 0020+00 1/0 0/0 0/0 .text            daKiPot_Create__FP10fopAc_ac_c */
 static int daKiPot_Create(fopAc_ac_c* i_this) {
     return static_cast<daKiPot_c*>(i_this)->create();
 }
 
-/* 80C451D4-80C451F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daKiPot_Method */
 static actor_method_class l_daKiPot_Method = {
     (process_method_func)daKiPot_Create,  (process_method_func)daKiPot_Delete,
     (process_method_func)daKiPot_Execute, 0,
     (process_method_func)daKiPot_Draw,
 };
 
-/* 80C451F4-80C45224 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KiPot */
 extern actor_process_profile_definition g_profile_Obj_KiPot = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp
index fc51c96d32..1a2dc43615 100644
--- a/src/d/actor/d_a_obj_kita.cpp
+++ b/src/d/actor/d_a_obj_kita.cpp
@@ -10,7 +10,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C4534C-80C4538C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__16daObj_Kita_HIO_cFv */
 daObj_Kita_HIO_c::daObj_Kita_HIO_c() {
     mId = -1;
     mModelSizeX = 1.2f;
@@ -35,8 +34,6 @@ void daObj_Kita_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C4538C-80C45424 00012C 0098+00 1/0 0/0 0/0 .text            daObj_Kita_Draw__FP14obj_kita_class
- */
 static int daObj_Kita_Draw(obj_kita_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     g_env_light.settingTevStruct(0x10, &a_this->current.pos, &a_this->tevStr);
@@ -47,19 +44,14 @@ static int daObj_Kita_Draw(obj_kita_class* i_this) {
     return 1;
 }
 
-/* 80C45424-80C45430 0001C4 000C+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     ((obj_kita_class*)param_1)->field_0x590 = 20;
 }
 
-/* 80C45FF0-80C45FF4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80C46000-80C46018 000018 0018+00 4/4 0/0 0/0 .bss             l_HIO */
 static daObj_Kita_HIO_c l_HIO;
 
-/* 80C45430-80C458D8 0001D0 04A8+00 1/1 0/0 0/0 .text            ita_control__FP14obj_kita_class */
 static void ita_control(obj_kita_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cXyz local_84;
@@ -128,7 +120,6 @@ static void ita_control(obj_kita_class* i_this) {
     }
 }
 
-/* 80C458D8-80C45A10 000678 0138+00 1/1 0/0 0/0 .text            action__FP14obj_kita_class */
 static void action(obj_kita_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cXyz cStack_24;
@@ -160,7 +151,6 @@ static void action(obj_kita_class* i_this) {
     }
 }
 
-/* 80C45A10-80C45A6C 0007B0 005C+00 2/1 0/0 0/0 .text daObj_Kita_Execute__FP14obj_kita_class */
 static int daObj_Kita_Execute(obj_kita_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     i_this->field_0x572++;
@@ -173,12 +163,10 @@ static int daObj_Kita_Execute(obj_kita_class* i_this) {
     return 1;
 }
 
-/* 80C45A6C-80C45A74 00080C 0008+00 1/0 0/0 0/0 .text daObj_Kita_IsDelete__FP14obj_kita_class */
 static int daObj_Kita_IsDelete(obj_kita_class * i_this) {
     return 1;
 }
 
-/* 80C45A74-80C45B10 000814 009C+00 1/0 0/0 0/0 .text daObj_Kita_Delete__FP14obj_kita_class */
 static int daObj_Kita_Delete(obj_kita_class* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Obj_Kita");
     dComIfG_resDelete(&i_this->mPhase, "Obj_kita");
@@ -193,7 +181,6 @@ static int daObj_Kita_Delete(obj_kita_class* i_this) {
     return 1;
 }
 
-/* 80C45B10-80C45C4C 0008B0 013C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_kita_class* i_this = (obj_kita_class*)a_this;
     for (int i = 0; i < i_this->mNumKitas - 1; i++) {
@@ -219,8 +206,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80C45C4C-80C45E44 0009EC 01F8+00 1/0 0/0 0/0 .text            daObj_Kita_Create__FP10fopAc_ac_c
- */
 static int daObj_Kita_Create(fopAc_ac_c* a_this) {
     obj_kita_class* i_this = (obj_kita_class*)a_this;
     fopAcM_ct(a_this, obj_kita_class);
@@ -271,7 +256,6 @@ static int daObj_Kita_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 80C45F8C-80C45FAC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Kita_Method */
 static actor_method_class l_daObj_Kita_Method = {
     (process_method_func)daObj_Kita_Create,
     (process_method_func)daObj_Kita_Delete,
@@ -280,7 +264,6 @@ static actor_method_class l_daObj_Kita_Method = {
     (process_method_func)daObj_Kita_Draw,
 };
 
-/* 80C45FAC-80C45FDC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_KITA */
 extern actor_process_profile_definition g_profile_OBJ_KITA = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp
index 268910b1de..cf3e76aa82 100644
--- a/src/d/actor/d_a_obj_kjgjs.cpp
+++ b/src/d/actor/d_a_obj_kjgjs.cpp
@@ -12,7 +12,6 @@
 static const u32 l_dzbidx[2] = {8, 9};
 static const char* l_arcName = "K_jgjs";
 
-/* 80C46098-80C4616C 000078 00D4+00 1/1 0/0 0/0 .text            create1st__12daObjKJgjs_cFv */
 int daObjKJgjs_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -33,7 +32,6 @@ int daObjKJgjs_c::create1st() {
     return phase;
 }
 
-/* 80C4616C-80C461E4 00014C 0078+00 1/1 0/0 0/0 .text            setMtx__12daObjKJgjs_cFv */
 void daObjKJgjs_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -41,10 +39,8 @@ void daObjKJgjs_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::now, mMtx[0]);
 }
 
-/* 80C4654C-80C46554 000008 0008+00 1/1 0/0 0/0 .rodata          l_bmdidx */
 static const u32 l_bmdidx[2] = {4, 5};
 
-/* 80C461E4-80C46264 0001C4 0080+00 1/0 0/0 0/0 .text            CreateHeap__12daObjKJgjs_cFv */
 int daObjKJgjs_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create(
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[field_0x60c]), 0x80000, 0x11000084);
@@ -58,7 +54,6 @@ static const Vec l_cull_box[4] = {
     {75.52f, 10.95f, 78.06f},
 };
 
-/* 80C46264-80C46310 000244 00AC+00 1/0 0/0 0/0 .text            Create__12daObjKJgjs_cFv */
 int daObjKJgjs_c::Create() {
     fopAcM_SetMtx(this, mMtx[1]);
     MTXCopy(mMtx[1], mpModel->mBaseTransformMtx);
@@ -73,13 +68,11 @@ int daObjKJgjs_c::Create() {
     return 1;
 }
 
-/* 80C46310-80C46320 0002F0 0010+00 1/0 0/0 0/0 .text            Execute__12daObjKJgjs_cFPPA3_A4_f */
 int daObjKJgjs_c::Execute(f32 (**i_mtx)[3][4]) {
     *i_mtx = mMtx;
     return 1;
 }
 
-/* 80C46320-80C463C4 000300 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjKJgjs_cFv */
 int daObjKJgjs_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -89,19 +82,16 @@ int daObjKJgjs_c::Draw() {
     return 1;
 }
 
-/* 80C463C4-80C46400 0003A4 003C+00 1/0 0/0 0/0 .text            Delete__12daObjKJgjs_cFv */
 int daObjKJgjs_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80C46400-80C46460 0003E0 0060+00 1/0 0/0 0/0 .text daObjKJgjs_create1st__FP12daObjKJgjs_c */
 static int daObjKJgjs_create1st(daObjKJgjs_c* i_this) {
     fopAcM_ct(i_this, daObjKJgjs_c);
     return i_this->create1st();
 }
 
-/* 80C46460-80C46480 000440 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDelete__FP12daObjKJgjs_c */
 static int daObjKJgjs_MoveBGDelete(daObjKJgjs_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
 }
@@ -111,22 +101,18 @@ static int daObjKJgjs_MoveBGExecute(daObjKJgjs_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80C464A0-80C464CC 000480 002C+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGDraw__FP12daObjKJgjs_c */
 static int daObjKJgjs_MoveBGDraw(daObjKJgjs_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDraw();
 }
 
-/* 80C464CC-80C4653C 0004AC 0070+00 1/0 0/0 0/0 .text            __dt__12daObjKJgjs_cFv */
 daObjKJgjs_c::~daObjKJgjs_c() {}
 
-/* 80C46590-80C465B0 -00001 0020+00 1/0 0/0 0/0 .data            daObjKJgjs_METHODS */
 static actor_method_class daObjKJgjs_METHODS = {
     (process_method_func)daObjKJgjs_create1st,     (process_method_func)daObjKJgjs_MoveBGDelete,
     (process_method_func)daObjKJgjs_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjKJgjs_MoveBGDraw,
 };
 
-/* 80C465B0-80C465E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KJgjs */
 extern actor_process_profile_definition g_profile_Obj_KJgjs = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp
index b819cc28d7..722d922282 100644
--- a/src/d/actor/d_a_obj_kkanban.cpp
+++ b/src/d/actor/d_a_obj_kkanban.cpp
@@ -9,7 +9,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_procname.h"
 
-/* 80C46698-80C46768 000078 00D0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         s32 jointNo = i_joint->getJntNo();
@@ -27,23 +26,19 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80C46768-80C467A4 000148 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjKKanban_cFv */
 void daObjKKanban_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C467A4-80C46808 000184 0064+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjKKanban_cFv */
 void daObjKKanban_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C46F98-80C46F9C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_KKanban";
 
-/* 80C46F9C-80C46FF0 000004 0054+00 1/1 0/0 0/0 .data            l_tri_src */
 static dCcD_SrcTri l_tri_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x20, 0x11}, 0x0}},  // mObj
@@ -56,7 +51,6 @@ static dCcD_SrcTri l_tri_src = {
     }                                                                 // mTriAttr
 };
 
-/* 80C46808-80C46928 0001E8 0120+00 1/0 0/0 0/0 .text            Create__14daObjKKanban_cFv */
 int daObjKKanban_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -76,7 +70,6 @@ int daObjKKanban_c::Create() {
     return 1;
 }
 
-/* 80C46928-80C469F4 000308 00CC+00 1/1 0/0 0/0 .text            setTG__14daObjKKanban_cFv */
 void daObjKKanban_c::setTG() {
     cXyz tg[3];
 
@@ -90,14 +83,12 @@ void daObjKKanban_c::setTG() {
     mTri.setPos(&tg[0], &tg[1], &tg[2]);
 }
 
-/* 80C469F4-80C46A64 0003D4 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjKKanban_cFv */
 int daObjKKanban_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80C46A64-80C46AE4 000444 0080+00 1/1 0/0 0/0 .text            create1st__14daObjKKanban_cFv */
 int daObjKKanban_c::create1st() {
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -109,8 +100,6 @@ int daObjKKanban_c::create1st() {
     return phase;
 }
 
-/* 80C46AE4-80C46C1C 0004C4 0138+00 1/0 0/0 0/0 .text            Execute__14daObjKKanban_cFPPA3_A4_f
- */
 int daObjKKanban_c::Execute(Mtx** i_mtx) {
     field_0x750++;
     mRotX = (field_0x74c + 50.0f) * cM_scos((field_0x74a + 1000) * field_0x750);
@@ -128,7 +117,6 @@ int daObjKKanban_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C46C1C-80C46CC0 0005FC 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjKKanban_cFv */
 int daObjKKanban_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -138,45 +126,34 @@ int daObjKKanban_c::Draw() {
     return 1;
 }
 
-/* 80C46CC0-80C46CF4 0006A0 0034+00 1/0 0/0 0/0 .text            Delete__14daObjKKanban_cFv */
 int daObjKKanban_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80C46CF4-80C46DF4 0006D4 0100+00 1/0 0/0 0/0 .text daObjKKanban_create1st__FP14daObjKKanban_c
- */
 static int daObjKKanban_create1st(daObjKKanban_c* i_this) {
     fopAcM_ct(i_this, daObjKKanban_c);
     return i_this->create1st();
 }
 
-/* 80C46EE0-80C46F00 0008C0 0020+00 1/0 0/0 0/0 .text
- * daObjKKanban_MoveBGDelete__FP14daObjKKanban_c                */
 static int daObjKKanban_MoveBGDelete(daObjKKanban_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C46F00-80C46F20 0008E0 0020+00 1/0 0/0 0/0 .text
- * daObjKKanban_MoveBGExecute__FP14daObjKKanban_c               */
 static int daObjKKanban_MoveBGExecute(daObjKKanban_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C46F20-80C46F4C 000900 002C+00 1/0 0/0 0/0 .text daObjKKanban_MoveBGDraw__FP14daObjKKanban_c
- */
 static int daObjKKanban_MoveBGDraw(daObjKKanban_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C46FF0-80C47010 -00001 0020+00 1/0 0/0 0/0 .data            daObjKKanban_METHODS */
 static actor_method_class daObjKKanban_METHODS = {
     (process_method_func)daObjKKanban_create1st,     (process_method_func)daObjKKanban_MoveBGDelete,
     (process_method_func)daObjKKanban_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjKKanban_MoveBGDraw,
 };
 
-/* 80C47010-80C47040 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KKanban */
 extern actor_process_profile_definition g_profile_Obj_KKanban = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp
index 884edf8b10..ab92c2a56d 100644
--- a/src/d/actor/d_a_obj_klift00.cpp
+++ b/src/d/actor/d_a_obj_klift00.cpp
@@ -67,8 +67,6 @@ void daObjKLift00_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 8058AF38-8058AF60 000078 0028+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* unused, fopAc_ac_c* k_lift, fopAc_ac_c* riding_actor) {
     daObjKLift00_c* const kLift = static_cast<daObjKLift00_c*>(k_lift);
     fopAc_ac_c* const rideActor = riding_actor;
@@ -76,10 +74,8 @@ static void rideCallBack(dBgW* unused, fopAc_ac_c* k_lift, fopAc_ac_c* riding_ac
     kLift->rideActor(rideActor);
 }
 
-/* 8058C3F4-8058C3F8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "K_lift00";
 
-/* 8058C3F8-8058C438 000004 0040+00 1/1 0/0 0/0 .data            l_cc_sph_src */
 static dCcD_SrcSph l_cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {(s32)0xd8fbfdff, 0x11}, 0x79}}, // mObj
@@ -92,7 +88,6 @@ static dCcD_SrcSph l_cc_sph_src = {
     } // mSphAttr
 };
 
-/* 8058C438-8058C47C 000044 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x408000, 0x11}, 0x0}}, // mObj
@@ -117,7 +112,6 @@ void dummy() {
     delete (dCcD_Cyl*)NULL;
 }
 
-/* 8058B02C-8058B0D0 00016C 00A4+00 1/1 0/0 0/0 .text            create1st__14daObjKLift00_cFv */
 cPhs__Step daObjKLift00_c::create1st() {
     mNumChainModels = getArg0();
     mNumChains = mNumChainModels + 1;
@@ -141,11 +135,8 @@ cPhs__Step daObjKLift00_c::create1st() {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 8058C380-8058C38C 000000 000C+00 5/5 0/0 0/0 .rodata          l_bmdidx */
 static const int l_bmdidx[3] = {5, 6, 4};
 
-/* 8058B0D0-8058B4B0 000210 03E0+00 2/2 0/0 0/0 .text            setMtx__14daObjKLift00_cFv */
 void daObjKLift00_c::setMtx() {
     Mtx nonFoundationChainRotationMatrix;
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -221,7 +212,6 @@ void daObjKLift00_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mNewBgMtx);
 }
 
-/* 8058B4B0-8058B5EC 0005F0 013C+00 1/1 0/0 0/0 .text rideActor__14daObjKLift00_cFP10fopAc_ac_c */
 void daObjKLift00_c::rideActor(fopAc_ac_c* riding_actor) {
     if(!fopAcM_CheckCondition(this, fopAcCnd_NOEXEC_e)) {
         cXyz vectorFromFoundationChainToRideActor = riding_actor->current.pos - mChainPositions[mNumChains - 1].mCurrentPos;
@@ -241,7 +231,6 @@ void daObjKLift00_c::rideActor(fopAc_ac_c* riding_actor) {
     }
 }
 
-/* 8058B5EC-8058B77C 00072C 0190+00 1/0 0/0 0/0 .text            CreateHeap__14daObjKLift00_cFv */
 int daObjKLift00_c::CreateHeap() {
     J3DModelData* const model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, l_bmdidx[2]));
     JUT_ASSERT(304, model_data != NULL);
@@ -272,7 +261,6 @@ int daObjKLift00_c::CreateHeap() {
     return mChainMdlObjs ? TRUE : FALSE;
 }
 
-/* 8058B77C-8058B97C 0008BC 0200+00 1/0 0/0 0/0 .text            Create__14daObjKLift00_cFv */
 int daObjKLift00_c::Create() {
     mpLiftPlatform->setBaseScale(scale);
     mChainPositions[0].mCurrentPos = current.pos; 
@@ -308,8 +296,6 @@ int daObjKLift00_c::Create() {
     return 1;
 }
 
-/* 8058B97C-8058BEEC 000ABC 0570+00 1/0 0/0 0/0 .text            Execute__14daObjKLift00_cFPPA3_A4_f
- */
 int daObjKLift00_c::Execute(Mtx** i_mtx) {
     // Apply wind sway
     #if DEBUG
@@ -448,7 +434,6 @@ int daObjKLift00_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 8058BEEC-8058C014 00102C 0128+00 1/0 0/0 0/0 .text            Draw__14daObjKLift00_cFv */
 int daObjKLift00_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpLiftPlatform, &tevStr);
@@ -473,7 +458,6 @@ int daObjKLift00_c::Draw() {
     return 1;
 }
 
-/* 8058C014-8058C050 001154 003C+00 1/0 0/0 0/0 .text            Delete__14daObjKLift00_cFv */
 int daObjKLift00_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
 
@@ -484,32 +468,23 @@ int daObjKLift00_c::Delete() {
     return 1;
 }
 
-/* 8058C050-8058C164 001190 0114+00 1/0 0/0 0/0 .text daObjKLift00_create1st__FP14daObjKLift00_c
- */
 static int daObjKLift00_create1st(daObjKLift00_c* i_this) {
     fopAcM_ct(i_this, daObjKLift00_c);
     return i_this->create1st();
 }
 
-/* 8058C2C0-8058C2E0 001400 0020+00 1/0 0/0 0/0 .text
- * daObjKLift00_MoveBGDelete__FP14daObjKLift00_c                */
 static int daObjKLift00_MoveBGDelete(daObjKLift00_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8058C2E0-8058C300 001420 0020+00 1/0 0/0 0/0 .text
- * daObjKLift00_MoveBGExecute__FP14daObjKLift00_c               */
 static int daObjKLift00_MoveBGExecute(daObjKLift00_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8058C300-8058C32C 001440 002C+00 1/0 0/0 0/0 .text daObjKLift00_MoveBGDraw__FP14daObjKLift00_c
- */
 static int daObjKLift00_MoveBGDraw(daObjKLift00_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 8058C47C-8058C49C -00001 0020+00 1/0 0/0 0/0 .data            daObjKLift00_METHODS */
 static actor_method_class daObjKLift00_METHODS = {
     (process_method_func)daObjKLift00_create1st,
     (process_method_func)daObjKLift00_MoveBGDelete,
@@ -518,7 +493,6 @@ static actor_method_class daObjKLift00_METHODS = {
     (process_method_func)daObjKLift00_MoveBGDraw,
 };
 
-/* 8058C49C-8058C4CC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KLift00 */
 extern actor_process_profile_definition g_profile_Obj_KLift00 = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp
index 6e191749eb..9f63965cb7 100644
--- a/src/d/actor/d_a_obj_knBullet.cpp
+++ b/src/d/actor/d_a_obj_knBullet.cpp
@@ -8,14 +8,12 @@
 #include "d/actor/d_a_obj_knBullet.h"
 #include "d/actor/d_a_npc_kn.h"
 
-/* 80C47950-80C4795C 000000 000C+00 4/4 0/0 0/0 .rodata          l_DATA */
 static const daObjKnBullet_Hio_Param_c l_DATA = {
     30.0f,
     20.0f,
     150
 };
 
-/* 80C4795C-80C4799C 00000C 0040+00 1/1 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{AT_TYPE_THROW_OBJ, 0x0, 0xd}, {0x10, 0x1f}, 0x0}}, // mObj
@@ -28,7 +26,6 @@ const static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80C47118-80C47270 000078 0158+00 1/1 0/0 0/0 .text            Create__15daObjKnBullet_cFv */
 int daObjKnBullet_c::Create() {
     fopAcM_ct(this, daObjKnBullet_c);
 
@@ -47,7 +44,6 @@ int daObjKnBullet_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C47300-80C47480 000260 0180+00 1/1 0/0 0/0 .text            Execute__15daObjKnBullet_cFv */
 int daObjKnBullet_c::Execute() {
     if (!col_chk()) {
         return 1;
@@ -79,24 +75,20 @@ int daObjKnBullet_c::Execute() {
     return 1;
 }
 
-/* 80C47480-80C47488 0003E0 0008+00 1/1 0/0 0/0 .text            Draw__15daObjKnBullet_cFv */
 int daObjKnBullet_c::Draw() {
     return 1;
 }
 
-/* 80C47488-80C47490 0003E8 0008+00 1/1 0/0 0/0 .text            Delete__15daObjKnBullet_cFv */
 int daObjKnBullet_c::Delete() {
     return 1;
 }
 
-/* 80C47490-80C474E8 0003F0 0058+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjKnBullet_cFv */
 void daObjKnBullet_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::XYZrotM(shape_angle);
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C474E8-80C47558 000448 0070+00 1/1 0/0 0/0 .text            col_init__15daObjKnBullet_cFv */
 void daObjKnBullet_c::col_init() {
     mCcStts.Init(0xFF, 0xFF, this);
     mCcSph.Set(l_sph_src);
@@ -105,7 +97,6 @@ void daObjKnBullet_c::col_init() {
     mCcSph.SetR(l_DATA.radius);
 }
 
-/* 80C47558-80C477B4 0004B8 025C+00 1/1 0/0 0/0 .text            col_chk__15daObjKnBullet_cFv */
 BOOL daObjKnBullet_c::col_chk() {
     if (mActionMode == 0) {
         return TRUE;
@@ -163,7 +154,6 @@ BOOL daObjKnBullet_c::col_chk() {
     return TRUE;
 }
 
-/* 80C477B4-80C478A4 000714 00F0+00 1/1 0/0 0/0 .text            hitPrtclSet__15daObjKnBullet_cFv */
 void daObjKnBullet_c::hitPrtclSet() {
     for (int i = 0; i < 3; i++) {
         JPABaseEmitter* emt = dComIfGp_particle_getEmitter(mEmtIds[i]);
@@ -184,34 +174,26 @@ void daObjKnBullet_c::hitPrtclSet() {
     }
 }
 
-/* 80C478A4-80C478C4 000804 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Execute__FP15daObjKnBullet_c
- */
 static int daObjKnBullet_Execute(daObjKnBullet_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C478C4-80C478E4 000824 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Draw__FP15daObjKnBullet_c */
 static int daObjKnBullet_Draw(daObjKnBullet_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C478E4-80C478EC 000844 0008+00 1/0 0/0 0/0 .text daObjKnBullet_IsDelete__FP15daObjKnBullet_c
- */
 static int daObjKnBullet_IsDelete(daObjKnBullet_c* i_this) {
     return 1;
 }
 
-/* 80C478EC-80C4790C 00084C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_Delete__FP15daObjKnBullet_c */
 static int daObjKnBullet_Delete(daObjKnBullet_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C4790C-80C4792C 00086C 0020+00 1/0 0/0 0/0 .text daObjKnBullet_create__FP10fopAc_ac_c */
 static int daObjKnBullet_create(fopAc_ac_c* i_this) {
     return ((daObjKnBullet_c*)i_this)->Create();
 }
 
-/* 80C479CC-80C479EC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKnBullet_Method */
 static actor_method_class l_daObjKnBullet_Method = {
     (process_method_func)daObjKnBullet_create,
     (process_method_func)daObjKnBullet_Delete,
@@ -220,7 +202,6 @@ static actor_method_class l_daObjKnBullet_Method = {
     (process_method_func)daObjKnBullet_Draw,
 };
 
-/* 80C479EC-80C47A1C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_KN_BULLET */
 extern actor_process_profile_definition g_profile_KN_BULLET = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp
index 12ab8d33c9..57e3ecf582 100644
--- a/src/d/actor/d_a_obj_kshutter.cpp
+++ b/src/d/actor/d_a_obj_kshutter.cpp
@@ -91,7 +91,6 @@ enum Type {
     /* 0x4 */ TYPE_V_SHUTTER,
 };
 
-/* 80C47AB8-80C47B2C 000078 0074+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjKshtr_cFv */
 void daObjKshtr_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -100,7 +99,6 @@ void daObjKshtr_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C47B2C-80C47C14 0000EC 00E8+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjKshtr_cFv */
 void daObjKshtr_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x5fc, current.pos.z);
 
@@ -119,27 +117,22 @@ void daObjKshtr_c::setBaseMtx() {
     }
 }
 
-/* 80C49CA8-80C49CBC 000000 0014+00 8/8 0/0 0/0 .rodata          l_bmd */
 static int const l_bmd[5] = {
     BMDR_S_SHUT_ROU, BMDR_S_SHUT_ROU, BMDR_DOOR_SHUTTER_00, BMDR_K_L3BDOOR, BMDR_V_SHUTTER,
 };
 
-/* 80C49CBC-80C49CD0 000014 0014+00 1/1 0/0 0/0 .rodata          l_dzb */
 static int const l_dzb[5] = {
     DZB_S_SHUT00_S_SHUT_ROU, DZB_S_SHUT00_S_SHUT_ROU, DZB_LV3SHUT00_S_SHUT_ROU, DZB_K_L3BDOOR, DZB_V_SHUTTER,
 };
 
-/* 80C49CD0-80C49CE4 000028 0014+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[5] = {
     0x1300, 0x1300, 0x1300, 0x1300, 0x20D0,
 };
 
-/* 80C49CE4-80C49CFC 00003C 0018+00 0/1 0/0 0/0 .rodata          l_cull_box */
 static f32 const l_cull_box[6] = {
     -450.0f, 0.0f, -50.0f, 450.0f, 700.0f, 150.0f,
 };
 
-/* 80C49E80-80C49E94 -00001 0014+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName[5] = {
     "S_shut00",
     "S_shut00",
@@ -148,7 +141,6 @@ static char* l_arcName[5] = {
     "V_Shutter",
 };
 
-/* 80C49E94-80C49EBC -00001 0028+00 1/2 0/0 0/0 .data            l_anmName */
 static char* l_anmName[10] = {
     "oj_DoorOpC.bck",
     "md_oj_DoorOpC.bck",
@@ -162,7 +154,6 @@ static char* l_anmName[10] = {
     "V_Shutter.bck",
 };
 
-/* 80C49EBC-80C49EE4 -00001 0028+00 1/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName[10] = {
     "KEY_JAIL_00",
     "KEY_JAIL_WOLF_00",
@@ -176,7 +167,6 @@ static char* l_eventName[10] = {
     NULL,
 };
 
-/* 80C47C14-80C47E54 0001D4 0240+00 1/0 0/0 0/0 .text            Create__12daObjKshtr_cFv */
 int daObjKshtr_c::Create() {
     if (!fopAcM_isSwitch(this, mSwNo)) {
         field_0x5ec = false;
@@ -238,14 +228,12 @@ int daObjKshtr_c::Create() {
     return 1;
 }
 
-/* 80C47E54-80C47EA8 000414 0054+00 4/4 0/0 0/0 .text            offDzb__12daObjKshtr_cFv */
 void daObjKshtr_c::offDzb() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
     }
 }
 
-/* 80C49EE4-80C49EF8 -00001 0014+00 3/4 0/0 0/0 .data            l_anmArcName */
 static char* l_anmArcName[5] = {
     "DoorY00",
     "DoorY00",
@@ -254,7 +242,6 @@ static char* l_anmArcName[5] = {
     "V_Shutter",
 };
 
-/* 80C47EA8-80C48008 000468 0160+00 1/0 0/0 0/0 .text            CreateHeap__12daObjKshtr_cFv */
 int daObjKshtr_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
 
@@ -292,7 +279,6 @@ int daObjKshtr_c::CreateHeap() {
     return 1;
 }
 
-/* 80C48050-80C48148 000610 00F8+00 1/1 0/0 0/0 .text            initKey__12daObjKshtr_cFv */
 void daObjKshtr_c::initKey() {
     if (!field_0x61e) {
         if ((int)checkKey() != 0) {
@@ -318,7 +304,6 @@ void daObjKshtr_c::initKey() {
     }
 }
 
-/* 80C48148-80C4827C 000708 0134+00 1/0 0/0 0/0 .text            phase_0__12daObjKshtr_cFv */
 cPhs__Step daObjKshtr_c::phase_0() {
     if (!field_0x619) {
         mHomeAngleZ = home.angle.z;
@@ -372,7 +357,6 @@ cPhs__Step daObjKshtr_c::phase_0() {
     }
 }
 
-/* 80C4827C-80C48320 00083C 00A4+00 1/0 0/0 0/0 .text            phase_1__12daObjKshtr_cFv */
 cPhs__Step daObjKshtr_c::phase_1() {
     if (mKeyHoleId != fpcM_ERROR_PROCESS_ID_e) {
         obj_keyhole_class* keyhole_p = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
@@ -393,12 +377,10 @@ cPhs__Step daObjKshtr_c::phase_1() {
     return cPhs_INIT_e;
 }
 
-/* 80C48320-80C48328 0008E0 0008+00 1/0 0/0 0/0 .text            phase_2__12daObjKshtr_cFv */
 cPhs__Step daObjKshtr_c::phase_2() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C48328-80C483CC 0008E8 00A4+00 1/1 0/0 0/0 .text            create1st__12daObjKshtr_cFv */
 cPhs__Step daObjKshtr_c::create1st() {
     static daObjKshtr_c::PhaseFunc l_ct_func[3] = {
         &daObjKshtr_c::phase_0,
@@ -409,7 +391,6 @@ cPhs__Step daObjKshtr_c::create1st() {
     return (this->*l_ct_func[mPhase])();
 }
 
-/* 80C483CC-80C48470 00098C 00A4+00 1/1 0/0 0/0 .text            event_proc_call__12daObjKshtr_cFv */
 void daObjKshtr_c::event_proc_call() {
     static daObjKshtr_c::ActionFunc l_func[3] = {
         &daObjKshtr_c::actionWaitEvent,
@@ -420,7 +401,6 @@ void daObjKshtr_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80C48470-80C4852C 000A30 00BC+00 1/1 0/0 0/0 .text            event_proc_call2__12daObjKshtr_cFv */
 void daObjKshtr_c::event_proc_call2() {
     static daObjKshtr_c::ActionFunc l_func[4] = {
         &daObjKshtr_c::actionWaitEvent2,
@@ -432,7 +412,6 @@ void daObjKshtr_c::event_proc_call2() {
     (this->*l_func[mAction])();
 }
 
-/* 80C4852C-80C48590 000AEC 0064+00 1/0 0/0 0/0 .text            Execute__12daObjKshtr_cFPPA3_A4_f */
 int daObjKshtr_c::Execute(Mtx** param_1) {
     if (checkKey() == 1) {
         event_proc_call();
@@ -446,7 +425,6 @@ int daObjKshtr_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80C48590-80C48708 000B50 0178+00 1/1 0/0 0/0 .text            checkArea__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::checkArea() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp78;
@@ -480,7 +458,6 @@ BOOL daObjKshtr_c::checkArea() {
     return FALSE;
 }
 
-/* 80C48708-80C48798 000CC8 0090+00 1/1 0/0 0/0 .text            checkOpen__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::checkOpen() {
     if (mType == TYPE_L3BOSS) {
         if (!dComIfGs_isDungeonItemBossKey()) {
@@ -497,7 +474,6 @@ BOOL daObjKshtr_c::checkOpen() {
     return true;
 }
 
-/* 80C48798-80C487E0 000D58 0048+00 1/1 0/0 0/0 .text            getDemoAction__12daObjKshtr_cFv */
 int daObjKshtr_c::getDemoAction() {
     static char* action_table[6] = {
         "WAIT",
@@ -511,7 +487,6 @@ int daObjKshtr_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 6, 0, 0);
 }
 
-/* 80C487E0-80C489E0 000DA0 0200+00 1/1 0/0 0/0 .text            demoProc2__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::demoProc2() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     mStaffId = dComIfGp_evmng_getMyStaffId("JAIL_DOOR", NULL, 0);
@@ -586,7 +561,6 @@ BOOL daObjKshtr_c::demoProc2() {
     return FALSE;
 }
 
-/* 80C489E0-80C48AC8 000FA0 00E8+00 1/1 0/0 0/0 .text            adjustmentProc__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::adjustmentProc() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz sp18, sp24;
@@ -606,7 +580,6 @@ BOOL daObjKshtr_c::adjustmentProc() {
     return FALSE;
 }
 
-/* 80C48AC8-80C48B84 001088 00BC+00 1/1 0/0 0/0 .text            keyUnlockInit__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::keyUnlockInit() {
     obj_keyhole_class* keyhole_p = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
     if (keyhole_p != NULL) {
@@ -619,7 +592,6 @@ BOOL daObjKshtr_c::keyUnlockInit() {
     return TRUE;
 }
 
-/* 80C48B84-80C48BD8 001144 0054+00 1/1 0/0 0/0 .text            keyUnlock__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::keyUnlock() {
     obj_keyhole_class* keyhole_p = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
     if (keyhole_p != NULL && keyhole_p->checkOpenEnd()) {
@@ -629,7 +601,6 @@ BOOL daObjKshtr_c::keyUnlock() {
     return FALSE;
 }
 
-/* 80C48BD8-80C48D0C 001198 0134+00 2/2 0/0 0/0 .text            openInit__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::openInit() {
     field_0x5fc = 0.0f;
     speedF = 0.0f;
@@ -655,7 +626,6 @@ BOOL daObjKshtr_c::openInit() {
     return TRUE;
 }
 
-/* 80C48D0C-80C48D80 0012CC 0074+00 2/2 0/0 0/0 .text            openProc__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::openProc() {
     switch (mType) {
         case TYPE_0:
@@ -677,7 +647,6 @@ BOOL daObjKshtr_c::openProc() {
     }
 }
 
-/* 80C48D80-80C48F94 001340 0214+00 1/1 0/0 0/0 .text            openProc_type1__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::openProc_type1() {
     BOOL rv = mpBckAnm->play();
 
@@ -698,7 +667,6 @@ BOOL daObjKshtr_c::openProc_type1() {
     return rv;
 }
 
-/* 80C48F94-80C490F8 001554 0164+00 1/1 0/0 0/0 .text            openProc_type2__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::openProc_type2() {
     static u16 const l_eff_id[5] = {
         0x8762,
@@ -725,13 +693,11 @@ BOOL daObjKshtr_c::openProc_type2() {
     return rv;
 }
 
-/* 80C490F8-80C49158 0016B8 0060+00 1/1 0/0 0/0 .text openProc_typeL3Boss__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::openProc_typeL3Boss() {
     cLib_chaseF(&speedF, 30.0f, 4.0f);
     return cLib_chaseF(&field_0x5fc, -450.0f, speedF) != 0 ? TRUE : FALSE;
 }
 
-/* 80C49158-80C4925C 001718 0104+00 1/1 0/0 0/0 .text            demoProc__12daObjKshtr_cFv */
 void daObjKshtr_c::demoProc() {
     static daObjKshtr_c::DemoFunc l_demoProc[2] = {
         &daObjKshtr_c::demoJail1,
@@ -750,7 +716,6 @@ void daObjKshtr_c::demoProc() {
     }
 }
 
-/* 80C4925C-80C494A8 00181C 024C+00 1/0 0/0 0/0 .text            demoJail1__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::demoJail1() {
     obj_keyhole_class* keyhole_p = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
 
@@ -794,7 +759,6 @@ BOOL daObjKshtr_c::demoJail1() {
     return FALSE;
 }
 
-/* 80C494A8-80C495A4 001A68 00FC+00 1/0 0/0 0/0 .text            demoJail2__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::demoJail2() {
     obj_keyhole_class* keyhole_p = (obj_keyhole_class*)fopAcM_SearchByID(mKeyHoleId);
 
@@ -833,7 +797,6 @@ BOOL daObjKshtr_c::demoJail2() {
     return FALSE;
 }
 
-/* 80C495A4-80C496C8 001B64 0124+00 1/0 0/0 0/0 .text            demoJail11__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::demoJail11() {
     switch (mDemoMode) {
         case 0:
@@ -857,12 +820,10 @@ BOOL daObjKshtr_c::demoJail11() {
     return FALSE;
 }
 
-/* 80C496C8-80C496D0 001C88 0008+00 1/0 0/0 0/0 .text            demoJail21__12daObjKshtr_cFv */
 BOOL daObjKshtr_c::demoJail21() {
     return TRUE;
 }
 
-/* 80C496D0-80C497A0 001C90 00D0+00 4/4 0/0 0/0 .text            anmInit__12daObjKshtr_cFv */
 void daObjKshtr_c::anmInit() {
     if (mpBckAnm != NULL) {
         BOOL isWolf = FALSE;
@@ -887,7 +848,6 @@ void daObjKshtr_c::anmInit() {
     }
 }
 
-/* 80C497A0-80C49880 001D60 00E0+00 1/0 0/0 0/0 .text            actionWaitEvent__12daObjKshtr_cFv */
 void daObjKshtr_c::actionWaitEvent() {
     if (eventInfo.checkCommandDoor()) {
         setAction(1);
@@ -910,7 +870,6 @@ void daObjKshtr_c::actionWaitEvent() {
     }
 }
 
-/* 80C49880-80C49914 001E40 0094+00 1/0 0/0 0/0 .text            actionEvent__12daObjKshtr_cFv */
 void daObjKshtr_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(field_0x5f0[mIsWolf])) {
         setAction(2);
@@ -924,12 +883,10 @@ void daObjKshtr_c::actionEvent() {
     }
 }
 
-/* 80C49914-80C49918 001ED4 0004+00 1/0 0/0 0/0 .text            actionDead__12daObjKshtr_cFv */
 void daObjKshtr_c::actionDead() {
     /* empty function */
 }
 
-/* 80C49918-80C499CC 001ED8 00B4+00 1/0 0/0 0/0 .text            actionWaitEvent2__12daObjKshtr_cFv */
 void daObjKshtr_c::actionWaitEvent2() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(1);
@@ -945,14 +902,12 @@ void daObjKshtr_c::actionWaitEvent2() {
     }
 }
 
-/* 80C499CC-80C49A08 001F8C 003C+00 1/0 0/0 0/0 .text            actionOpen__12daObjKshtr_cFv */
 void daObjKshtr_c::actionOpen() {
     if (openProc()) {
         setAction(2);
     }
 }
 
-/* 80C49A08-80C49A70 001FC8 0068+00 1/0 0/0 0/0 .text            actionEvent2__12daObjKshtr_cFv */
 void daObjKshtr_c::actionEvent2() {
     if (dComIfGp_evmng_endCheck(field_0x5f0[0])) {
         setAction(2);
@@ -962,12 +917,10 @@ void daObjKshtr_c::actionEvent2() {
     }
 }
 
-/* 80C49A70-80C49A74 002030 0004+00 1/0 0/0 0/0 .text            actionDead2__12daObjKshtr_cFv */
 void daObjKshtr_c::actionDead2() {
     /* empty function */
 }
 
-/* 80C49A74-80C49B4C 002034 00D8+00 1/0 0/0 0/0 .text            Draw__12daObjKshtr_cFv */
 int daObjKshtr_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -984,7 +937,6 @@ int daObjKshtr_c::Draw() {
     return 1;
 }
 
-/* 80C49B4C-80C49BB8 00210C 006C+00 1/0 0/0 0/0 .text            Delete__12daObjKshtr_cFv */
 int daObjKshtr_c::Delete() {
     dComIfG_resDelete(&mPhase1, l_arcName[mType]);
 
@@ -995,28 +947,23 @@ int daObjKshtr_c::Delete() {
     return 1;
 }
 
-/* 80C49BB8-80C49C18 002178 0060+00 1/0 0/0 0/0 .text            daObjKshtr_create1st__FP12daObjKshtr_c */
 static int daObjKshtr_create1st(daObjKshtr_c* i_this) {
     fopAcM_ct(i_this, daObjKshtr_c);
     return i_this->create1st();
 }
 
-/* 80C49C18-80C49C38 0021D8 0020+00 1/0 0/0 0/0 .text            daObjKshtr_MoveBGDelete__FP12daObjKshtr_c */
 static int daObjKshtr_MoveBGDelete(daObjKshtr_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C49C38-80C49C58 0021F8 0020+00 1/0 0/0 0/0 .text            daObjKshtr_MoveBGExecute__FP12daObjKshtr_c */
 static int daObjKshtr_MoveBGExecute(daObjKshtr_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C49C58-80C49C84 002218 002C+00 1/0 0/0 0/0 .text            daObjKshtr_MoveBGDraw__FP12daObjKshtr_c */
 static int daObjKshtr_MoveBGDraw(daObjKshtr_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C4A060-80C4A080 -00001 0020+00 1/0 0/0 0/0 .data            daObjKshtr_METHODS */
 static actor_method_class daObjKshtr_METHODS = {
     (process_method_func)daObjKshtr_create1st,
     (process_method_func)daObjKshtr_MoveBGDelete,
@@ -1025,7 +972,6 @@ static actor_method_class daObjKshtr_METHODS = {
     (process_method_func)daObjKshtr_MoveBGDraw,
 };
 
-/* 80C4A080-80C4A0B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kshutter */
 extern actor_process_profile_definition g_profile_Obj_Kshutter = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp
index 72817be7f9..082dc1341b 100644
--- a/src/d/actor/d_a_obj_ktOnFire.cpp
+++ b/src/d/actor/d_a_obj_ktOnFire.cpp
@@ -10,24 +10,21 @@
 
 class daKtOnFire_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8058C60C */ daKtOnFire_HIO_c();
-    /* 8058CEA8 */ ~daKtOnFire_HIO_c() {}
+    daKtOnFire_HIO_c();
+    ~daKtOnFire_HIO_c() {}
 
     void genMessage(JORMContext*);
 
     /* 0x4 */ u8 wait_time;
 };
 
-/* 8058D0CC-8058D0D4 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daKtOnFire_HIO_c l_HIO;
 
-/* 8058CFDC-8058CFF4 000000 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {
     {-50.0f, 0.0f, -50.0f},
     {50.0f, 100.0f, 50.0f},
 };
 
-/* 8058CF88-8058CFB8 000000 0030+00 3/3 0/0 0/0 .rodata          mCcDObjInfo__12daKtOnFire_c */
 const dCcD_SrcGObjInf daKtOnFire_c::mCcDObjInfo = {
     {0x0, {{0x200, 0x0, 0x13}, {0xD8FBFFFF, 0x11}, 0x0}}, // mObj
     {dCcD_SE_SWORD, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
@@ -35,7 +32,6 @@ const dCcD_SrcGObjInf daKtOnFire_c::mCcDObjInfo = {
     {0x0}, // mGObjCo
 };
 
-/* 8058CFF4-8058D038 000018 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daKtOnFire_c */
 dCcD_SrcCyl daKtOnFire_c::mCcDCyl = {
     mCcDObjInfo,
     {
@@ -45,18 +41,15 @@ dCcD_SrcCyl daKtOnFire_c::mCcDCyl = {
     } // mCyl
 };
 
-/* 8058C60C-8058C630 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daKtOnFire_HIO_cFv */
 daKtOnFire_HIO_c::daKtOnFire_HIO_c() {
     wait_time = 20;
 }
 
-/* 8058C678-8058C6D0 000158 0058+00 1/1 0/0 0/0 .text            setBaseMtx__12daKtOnFire_cFv */
 void daKtOnFire_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 8058C6D0-8058C8D0 0001B0 0200+00 1/1 0/0 0/0 .text            create__12daKtOnFire_cFv */
 int daKtOnFire_c::create() {
     fopAcM_ct(this, daKtOnFire_c);
 
@@ -98,7 +91,6 @@ int daKtOnFire_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8058C960-8058C9D4 000440 0074+00 1/1 0/0 0/0 .text            lightInit__12daKtOnFire_cFv */
 void daKtOnFire_c::lightInit() {
     mLightPos = mTorchPos;
     mLightPos.y += 10.0f;
@@ -111,17 +103,14 @@ void daKtOnFire_c::lightInit() {
     mLight.mFluctuation = 1.0f;
 }
 
-/* 8058C9D4-8058C9F8 0004B4 0024+00 2/2 0/0 0/0 .text            setLight__12daKtOnFire_cFv */
 void daKtOnFire_c::setLight() {
     dKy_plight_set(&mLight);
 }
 
-/* 8058C9F8-8058CA1C 0004D8 0024+00 1/1 0/0 0/0 .text            cutLight__12daKtOnFire_cFv */
 void daKtOnFire_c::cutLight() {
     dKy_plight_cut(&mLight);
 }
 
-/* 8058CA1C-8058CDF8 0004FC 03DC+00 1/1 0/0 0/0 .text            Execute__12daKtOnFire_cFv */
 int daKtOnFire_c::Execute() {
     u8 prev_switch = mIsSwitch;
     mIsSwitch = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
@@ -178,41 +167,31 @@ int daKtOnFire_c::Execute() {
     return 1;
 }
 
-/* 8058CDF8-8058CE00 0008D8 0008+00 1/1 0/0 0/0 .text            Draw__12daKtOnFire_cFv */
 int daKtOnFire_c::Draw() {
     return 1;
 }
 
-/* 8058CE00-8058CE28 0008E0 0028+00 1/1 0/0 0/0 .text            Delete__12daKtOnFire_cFv */
 int daKtOnFire_c::Delete() {
     dKy_plight_cut(&mLight);
     return 1;
 }
 
-/* 8058CE28-8058CE48 000908 0020+00 1/0 0/0 0/0 .text            daKtOnFire_Draw__FP12daKtOnFire_c
- */
 static int daKtOnFire_Draw(daKtOnFire_c* i_this) {
     return i_this->Draw();
 }
 
-/* 8058CE48-8058CE68 000928 0020+00 1/0 0/0 0/0 .text daKtOnFire_Execute__FP12daKtOnFire_c */
 static int daKtOnFire_Execute(daKtOnFire_c* i_this) {
     return i_this->Execute();
 }
 
-/* 8058CE68-8058CE88 000948 0020+00 1/0 0/0 0/0 .text            daKtOnFire_Delete__FP12daKtOnFire_c
- */
 static int daKtOnFire_Delete(daKtOnFire_c* i_this) {
     return i_this->Delete();
 }
 
-/* 8058CE88-8058CEA8 000968 0020+00 1/0 0/0 0/0 .text            daKtOnFire_Create__FP10fopAc_ac_c
- */
 static int daKtOnFire_Create(fopAc_ac_c* i_this) {
     return ((daKtOnFire_c*)i_this)->create();
 }
 
-/* 8058D038-8058D058 -00001 0020+00 1/0 0/0 0/0 .data            l_daKtOnFire_Method */
 static actor_method_class l_daKtOnFire_Method = {
     (process_method_func)daKtOnFire_Create,
     (process_method_func)daKtOnFire_Delete,
@@ -221,7 +200,6 @@ static actor_method_class l_daKtOnFire_Method = {
     (process_method_func)daKtOnFire_Draw,
 };
 
-/* 8058D058-8058D088 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_KtOnFire */
 extern actor_process_profile_definition g_profile_Tag_KtOnFire = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp
index de05ee059c..621413f632 100644
--- a/src/d/actor/d_a_obj_kuwagata.cpp
+++ b/src/d/actor/d_a_obj_kuwagata.cpp
@@ -14,8 +14,8 @@
 
 class daObj_KuwHIO_c : public JORReflexible{
 public:
-    /* 80C4A1EC */ daObj_KuwHIO_c();
-    /* 80C4D3E8 */ virtual ~daObj_KuwHIO_c() {}
+    daObj_KuwHIO_c();
+    virtual ~daObj_KuwHIO_c() {}
 
     void genMessage(JORMContext* ctx);
 
@@ -24,7 +24,6 @@ public:
     /* 0x0C */ f32 mMaleModelScale;
 };
 
-/* 80C4A1EC-80C4A21C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__14daObj_KuwHIO_cFv */
 daObj_KuwHIO_c::daObj_KuwHIO_c() {
     mId = -1;
     mMaleModelScale = 1.5f;
@@ -41,7 +40,6 @@ void daObj_KuwHIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C4A21C-80C4A288 00011C 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjKUW_cFv */
 void daObjKUW_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -62,20 +60,17 @@ void daObjKUW_c::InitCcSph() {
     mSph.OnTgNoHitMark();
 }
 
-/* 80C4A288-80C4A2E0 000188 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjKUW_cFv */
 void daObjKUW_c::SetCcSph() {
     mSph.SetC(current.pos);
     mSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80C4A2E0-80C4A300 0001E0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     daObjKUW_c* i_this = (daObjKUW_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80C4A300-80C4A658 000200 0358+00 1/1 0/0 0/0 .text            CreateHeap__10daObjKUW_cFv */
 int daObjKUW_c::CreateHeap() {
     J3DModelData* modelData;
     
@@ -133,20 +128,17 @@ int daObjKUW_c::CreateHeap() {
     return 1;
 }
 
-/* 80C4A6A0-80C4A6C0 0005A0 0020+00 1/0 0/0 0/0 .text            daObjKUW_Create__FP10fopAc_ac_c */
 static int daObjKUW_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daObjKUW_c, i_this, "Obj_Kuw");
     return a_this->create();
 }
 
-/* 80C4A6C0-80C4A6E4 0005C0 0024+00 1/0 0/0 0/0 .text            daObjKUW_Delete__FP10daObjKUW_c */
 static int daObjKUW_Delete(daObjKUW_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Obj_Kuw");
     i_this->Delete();
     return 1;
 }
 
-/* 80C4A6E4-80C4A84C 0005E4 0168+00 1/1 0/0 0/0 .text            ShopWaitAction__10daObjKUW_cFv */
 void daObjKUW_c::ShopWaitAction() {
     switch (mSubAction) {
     case 0:
@@ -176,7 +168,6 @@ void daObjKUW_c::ShopWaitAction() {
         break;
     }
 }
-/* 80C4A84C-80C4A9D0 00074C 0184+00 1/1 0/0 0/0 .text            WaitAction__10daObjKUW_cFv */
 void daObjKUW_c::WaitAction() {
     switch (mSubAction) {
     case 0:
@@ -209,7 +200,6 @@ void daObjKUW_c::WaitAction() {
     }
 }
 
-/* 80C4A9D0-80C4ABFC 0008D0 022C+00 1/1 0/0 0/0 .text            WallCheck__10daObjKUW_cFv */
 BOOL daObjKUW_c::WallCheck() {
     dBgS_LinChk linChk;
     linChk.SetObj();
@@ -234,7 +224,6 @@ BOOL daObjKUW_c::WallCheck() {
     return FALSE;
 }
 
-/* 80C4AC44-80C4AD50 000B44 010C+00 1/1 0/0 0/0 .text            SpeedSet__10daObjKUW_cFv */
 void daObjKUW_c::SpeedSet() {
     speed.y += gravity;
     cXyz cStack_1c(0.0f, speed.y, speedF);
@@ -254,7 +243,6 @@ void daObjKUW_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C4AD50-80C4B1A0 000C50 0450+00 1/1 0/0 0/0 .text            WallWalk__10daObjKUW_cFv */
 void daObjKUW_c::WallWalk() {
     cXyz cStack_13c(0.0f, -100.0f, 3.0f * speedF);
     cXyz cStack_148(0.0f, 40.0f, 0.0f);
@@ -308,7 +296,6 @@ void daObjKUW_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80C4B1A0-80C4B3A0 0010A0 0200+00 2/2 0/0 0/0 .text            WalkAction__10daObjKUW_cFv */
 void daObjKUW_c::WalkAction() {
     for (int i = 0; i < 3; i++) {
         mTimers[i]--;
@@ -351,7 +338,6 @@ void daObjKUW_c::WalkAction() {
     WallWalk();
 }
 
-/* 80C4B3A0-80C4BB88 0012A0 07E8+00 2/2 0/0 0/0 .text            MoveAction__10daObjKUW_cFv */
 void daObjKUW_c::MoveAction() {
     for (int i = 0; i < 3; i++) {
         mTimers[i]--;
@@ -491,7 +477,6 @@ void daObjKUW_c::MoveAction() {
     }
 }
 
-/* 80C4BB88-80C4BC4C 001A88 00C4+00 1/1 0/0 0/0 .text            Action__10daObjKUW_cFv */
 void daObjKUW_c::Action() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -509,7 +494,6 @@ void daObjKUW_c::Action() {
     mSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C4BC4C-80C4BD08 001B4C 00BC+00 1/1 0/0 0/0 .text            ShopAction__10daObjKUW_cFv */
 void daObjKUW_c::ShopAction() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -526,22 +510,18 @@ void daObjKUW_c::ShopAction() {
     mSound.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80C4BD08-80C4BD20 001C08 0018+00 1/0 0/0 0/0 .text            Insect_Release__10daObjKUW_cFv */
 void daObjKUW_c::Insect_Release() {
     field_0x56c = 1;
     mSubAction = 0;
     mAction = ACTION_MOVE;
 }
 
-/* ############################################################################################## */
-/* 80C4D548-80C4D54C 0000B8 0002+02 1/2 0/0 0/0 .rodata          l_kuw_itemno */
 static u8 const l_kuw_itemno[2] = {
     fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE,
 };
 
 static f32 dummyFloat() { return -9.0f; }
 
-/* 80C4BD20-80C4BE9C 001C20 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjKUW_cFv */
 void daObjKUW_c::Z_BufferChk() {
     cXyz local_5c;
     cXyz cStack_68;
@@ -576,7 +556,6 @@ void daObjKUW_c::Z_BufferChk() {
     field_0x9b8 = ((nearPlane + ((farPlane * nearPlane) / local_5c.z)) / (farPlane - nearPlane) + 1.0f) * 16777215.0f;
 }
 
-/* 80C4BE9C-80C4BFC0 001D9C 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjKUW_cFv */
 void daObjKUW_c::ParticleSet() {
     if (field_0x9b8 > (f32)field_0x9bc) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -594,7 +573,6 @@ void daObjKUW_c::ParticleSet() {
     }
 }
 
-/* 80C4BFC0-80C4C38C 001EC0 03CC+00 1/1 0/0 0/0 .text            BoomChk__10daObjKUW_cFv */
 void daObjKUW_c::BoomChk() {
     if (field_0x9c1 != 0) {
         daPy_py_c* playerActor = daPy_getPlayerActorClass();
@@ -645,7 +623,6 @@ void daObjKUW_c::BoomChk() {
     }
 }
 
-/* 80C4C38C-80C4C514 00228C 0188+00 1/1 0/0 0/0 .text            ObjHit__10daObjKUW_cFv */
 void daObjKUW_c::ObjHit() {
     if (mSph.ChkTgHit()) {
         cCcD_ObjHitInf* hitObj = mSph.GetTgHitObj();
@@ -672,7 +649,6 @@ void daObjKUW_c::ObjHit() {
     }
 }
 
-/* 80C4C514-80C4C78C 002414 0278+00 1/1 0/0 0/0 .text            Execute__10daObjKUW_cFv */
 int daObjKUW_c::Execute() {
     if (ChkGetDemo()) {
         field_0x9b8 = field_0x9bc + 10000.0f;
@@ -721,13 +697,10 @@ int daObjKUW_c::Execute() {
     return 1;
 }
 
-/* 80C4D660-80C4D664 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80C4D670-80C4D680 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_KuwHIO_c l_HIO;
 
-/* 80C4C78C-80C4C7F4 00268C 0068+00 1/1 0/0 0/0 .text            Delete__10daObjKUW_cFv */
 int daObjKUW_c::Delete() {
     dComIfG_resDelete(&mPhase, "I_Kuw");
     if (mIsHIOOwner) {
@@ -741,7 +714,6 @@ int daObjKUW_c::Delete() {
     return 1;
 }
 
-/* 80C4C7F4-80C4C85C 0026F4 0068+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjKUW_cFv */
 void daObjKUW_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x99a);
@@ -767,21 +739,16 @@ int daObjKUW_c::Draw() {
     return 1;
 }
 
-/* 80C4C85C-80C4C93C 00275C 00E0+00 1/0 0/0 0/0 .text            daObjKUW_Draw__FP10daObjKUW_c */
 static int daObjKUW_Draw(daObjKUW_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C4C93C-80C4C95C 00283C 0020+00 2/1 0/0 0/0 .text            daObjKUW_Execute__FP10daObjKUW_c */
 static int daObjKUW_Execute(daObjKUW_c* i_this) {
     return i_this->Execute();
 }
 
-/* ############################################################################################## */
-/* 80C4D574-80C4D578 0000E4 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = { 0x195, 0x196 };
 
-/* 80C4C95C-80C4CB08 00285C 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjKUW_cFv */
 bool daObjKUW_c::CreateChk() {
     u8 type = (fopAcM_GetParam(this) & 0xf00) >> 8;
     if (type == 0xf) {
@@ -809,7 +776,6 @@ bool daObjKUW_c::CreateChk() {
     return true;
 }
 
-/* 80C4CB08-80C4D2E0 002A08 07D8+00 1/1 0/0 0/0 .text            create__10daObjKUW_cFv */
 int daObjKUW_c::create() {
     fopAcM_ct(this, daObjKUW_c);
     int rv = dComIfG_resLoad(&mPhase, "I_Kuw");
@@ -922,13 +888,10 @@ int daObjKUW_c::create() {
     return rv;
 }
 
-/* 80C4D3E0-80C4D3E8 0032E0 0008+00 1/0 0/0 0/0 .text            daObjKUW_IsDelete__FP10daObjKUW_c
- */
 static int daObjKUW_IsDelete(daObjKUW_c* param_0) {
     return 1;
 }
 
-/* 80C4D59C-80C4D5BC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKUW_Method */
 static actor_method_class l_daObjKUW_Method = {
     (process_method_func)daObjKUW_Create,
     (process_method_func)daObjKUW_Delete,
@@ -937,7 +900,6 @@ static actor_method_class l_daObjKUW_Method = {
     (process_method_func)daObjKUW_Draw,
 };
 
-/* 80C4D5BC-80C4D5EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Kuw */
 extern actor_process_profile_definition g_profile_Obj_Kuw = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp
index b042db42a0..728bbe784b 100644
--- a/src/d/actor/d_a_obj_kwheel00.cpp
+++ b/src/d/actor/d_a_obj_kwheel00.cpp
@@ -37,14 +37,10 @@ void daObjKWheel00_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* ############################################################################################## */
-/* 80C4E800-80C4E808 000000 0008+00 2/2 0/0 0/0 .rodata          l_dzbidx */
 static const u32 l_dzbidx[2] = {7, 7};
 
-/* 80C4E870-80C4E878 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName[2] = { "K_Wheel00", "S_wheel00" }; // K = Kinto, S = Shirogane?
 
-/* 80C4D6F8-80C4D7A8 000078 00B0+00 1/1 0/0 0/0 .text            create1st__15daObjKWheel00_cFv */
 int daObjKWheel00_c::create1st() {
     m_type = static_cast<Type_e>(getType());
     JUT_ASSERT(118, m_type == 0 || m_type == 1);
@@ -67,7 +63,6 @@ int daObjKWheel00_c::create1st() {
 
 }
 
-/* 80C4D7A8-80C4D86C 000128 00C4+00 1/1 0/0 0/0 .text            searchLv3Water__FPvPv */
 static void* searchLv3Water(void* param_0, void* i_this) {
     daLv3Water_c* const lv3Water = static_cast<daLv3Water_c*>(param_0);
     daObjKWheel00_c* const kWheel00 = static_cast<daObjKWheel00_c*>(i_this);
@@ -85,17 +80,13 @@ static void* searchLv3Water(void* param_0, void* i_this) {
     return NULL;
 }
 
-/* ############################################################################################## */
-/* 80C4E808-80C4E810 000008 0008+00 1/1 0/0 0/0 .rodata          l_bmdidx */
 static const int l_bmdidx[2] = {4, 4};
 
-/* 80C4E810-80C4E840 000010 0030+00 1/1 0/0 0/0 .rodata          l_cull_box */
 const Vec l_cull_box[4] = {
     {-830.0f, -830.0f, -2500.0f}, {830.0f, 830.0f, 200.0f}, // Type 0
     {-560.0f, -560.0f, -350.0f}, {560.0f, 560.0f, 350.0f}   // Type 1
 };
 
-/* 80C4D86C-80C4D9B8 0001EC 014C+00 2/2 0/0 0/0 .text            setMtx__15daObjKWheel00_cFv */
 void daObjKWheel00_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -116,7 +107,6 @@ void daObjKWheel00_c::setMtx() {
     }
 }
 
-/* 80C4D9B8-80C4DA38 000338 0080+00 1/0 0/0 0/0 .text            CreateHeap__15daObjKWheel00_cFv */
 int daObjKWheel00_c::CreateHeap() {
     J3DModelData* const model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName[m_type], l_bmdidx[m_type]));
     JUT_ASSERT(206, model_data != NULL);
@@ -125,8 +115,6 @@ int daObjKWheel00_c::CreateHeap() {
     return !mpModel ? 0 : 1;
 }
 
-/* ############################################################################################## */
-/* 80C4E878-80C4E8B8 000008 0040+00 1/1 0/0 0/0 .data            l_sphSrc */
 static dCcD_SrcSph l_sphSrc = {
     {
         {0x0, {{AT_TYPE_0, 0x1, 0x0}, {0xd8fbfdff, 0x0}, 0x79}}, // mObj
@@ -139,10 +127,8 @@ static dCcD_SrcSph l_sphSrc = {
     } // mSphAttr
 };
 
-/* 80C4E8B8-80C4E8C0 000048 0008+00 2/2 0/0 0/0 .data            l_se_angle */
 u16 l_se_angle[4] = {0, 0x3FFF, 0x7FFF, 0xBFFF}; // {0°, 90°, 180°, 270°}
 
-/* 80C4DA38-80C4DBBC 0003B8 0184+00 1/0 0/0 0/0 .text            Create__15daObjKWheel00_cFv */
 int daObjKWheel00_c::Create() {
     mpModel->setBaseTRMtx(mTransformMtx);
     fopAcM_SetMtx(this, mTransformMtx);
@@ -186,7 +172,6 @@ int daObjKWheel00_c::Create() {
     return 1;
 }
 
-/* 80C4E8C0-80C4E920 000050 0060+00 1/1 0/0 0/0 .data            l_pos */
 static Vec l_pos[8] = {
     {830.0f, 0.0f, 0.0f}, {0.0f, 830.0f, 0.0f},
     {-830.0f, 0.0f, 0.0f}, {0.0f, -830.0f, 0.0f},
@@ -194,7 +179,6 @@ static Vec l_pos[8] = {
     {-560.0f, 0.0f, 0.0f}, {0.0f, -560.0f, 0.0f}
 };
 
-/* 80C4DBBC-80C4E1B0 00053C 05F4+00 1/0 0/0 0/0 .text Execute__15daObjKWheel00_cFPPA3_A4_f */
 int daObjKWheel00_c::Execute(Mtx** i_mtx) {
     eventUpdate();
 
@@ -326,7 +310,6 @@ int daObjKWheel00_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C4E1B0-80C4E254 000B30 00A4+00 1/0 0/0 0/0 .text            Draw__15daObjKWheel00_cFv */
 int daObjKWheel00_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -338,7 +321,6 @@ int daObjKWheel00_c::Draw() {
     return 1;
 }
 
-/* 80C4E254-80C4E298 000BD4 0044+00 1/0 0/0 0/0 .text            Delete__15daObjKWheel00_cFv */
 int daObjKWheel00_c::Delete() {
     dComIfG_resDelete(this, l_arcName[m_type]);
 
@@ -349,7 +331,6 @@ int daObjKWheel00_c::Delete() {
     return 1;
 }
 
-/* 80C4E298-80C4E2C0 000C18 0028+00 2/1 0/0 0/0 .text            eventStart__15daObjKWheel00_cFv */
 bool daObjKWheel00_c::eventStart() {
     #if DEBUG
     if(getArg0())
@@ -366,8 +347,6 @@ bool daObjKWheel00_c::eventStart() {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80C4E920-80C4E940 -00001 0020+00 1/0 0/0 0/0 .data            daObjKWheel00_METHODS */
 static actor_method_class daObjKWheel00_METHODS = {
     (process_method_func)daObjKWheel00_create1st,
     (process_method_func)daObjKWheel00_MoveBGDelete,
@@ -376,7 +355,6 @@ static actor_method_class daObjKWheel00_METHODS = {
     (process_method_func)daObjKWheel00_MoveBGDraw,
 };
 
-/* 80C4E940-80C4E970 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KWheel00 */
 extern actor_process_profile_definition g_profile_Obj_KWheel00 = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
@@ -394,27 +372,19 @@ extern actor_process_profile_definition g_profile_Obj_KWheel00 = {
   fopAc_CULLBOX_CUSTOM_e,  // cullType
 };
 
-/* 80C4E2C0-80C4E394 000C40 00D4+00 1/0 0/0 0/0 .text daObjKWheel00_create1st__FP15daObjKWheel00_c
- */
 static int daObjKWheel00_create1st(daObjKWheel00_c* i_this) {
     fopAcM_ct(i_this, daObjKWheel00_c);
     return i_this->create1st();
 }
 
-/* 80C4E5D0-80C4E5F0 000F50 0020+00 1/0 0/0 0/0 .text
- * daObjKWheel00_MoveBGDelete__FP15daObjKWheel00_c              */
 static int daObjKWheel00_MoveBGDelete(daObjKWheel00_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C4E5F0-80C4E610 000F70 0020+00 1/0 0/0 0/0 .text
- * daObjKWheel00_MoveBGExecute__FP15daObjKWheel00_c             */
 static int daObjKWheel00_MoveBGExecute(daObjKWheel00_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C4E610-80C4E63C 000F90 002C+00 1/0 0/0 0/0 .text
- * daObjKWheel00_MoveBGDraw__FP15daObjKWheel00_c                */
 static int daObjKWheel00_MoveBGDraw(daObjKWheel00_c* i_this) {
     return i_this->MoveBGDraw();
 }
diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp
index c048de7efa..5d49c98003 100644
--- a/src/d/actor/d_a_obj_kwheel01.cpp
+++ b/src/d/actor/d_a_obj_kwheel01.cpp
@@ -18,16 +18,11 @@ static int daObjKWheel01_MoveBGDelete(daObjKWheel01_c*);
 static int daObjKWheel01_MoveBGExecute(daObjKWheel01_c*);
 static int daObjKWheel01_MoveBGDraw(daObjKWheel01_c*);
 
-/* ############################################################################################## */
-/* 80C4F6B8-80C4F6C4 000000 000C+00 2/2 0/0 0/0 .rodata          l_dzbidx */
 static const u32 l_dzbidx[3] = {9, 8, 10};
 
-/* ############################################################################################## */
-/* 80C4F6C4-80C4F6CC 00000C 0008+00 1/1 0/0 0/0 .rodata          l_bmdidx */
 static const int l_bmdidx[2] = {4, 5};
 
 
-/* 80C4F6F8-80C4F6FC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "K_Wheel01";
 
 // Likely to have been a macro; matches for loop at beginning of create1st for both debug and retail, despite retail only calling getArg4567()
@@ -53,13 +48,11 @@ void daObjKWheel01_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C4F6FC-80C4F72C 000004 0030+00 3/3 0/0 0/0 .data            l_pos */
 static Vec l_pos[4] = {
     {930.0f, -165.0f, 0.0f}, {0.0f, -165.0f, 930.0f},
     {-930.0f, -165.0f, 0.0f}, {0.0f, -165.0f, -930.0f}
 };
 
-/* 80C4EA78-80C4EC54 000078 01DC+00 1/1 0/0 0/0 .text            create1st__15daObjKWheel01_cFv */
 cPhs__Step daObjKWheel01_c::create1st() {
     bool atLeastOneKLiftExists = false;
     s8 debugStackVar;
@@ -109,13 +102,11 @@ cPhs__Step daObjKWheel01_c::create1st() {
     return phase;
 }
 
-/* 80C4F6CC-80C4F6E4 000014 0018+00 1/1 0/0 0/0 .rodata          l_cull_box */
 static const Vec l_cull_box[2] = {
     {-1260.0f, -3050.0f, -1260.0f},
     {1260.0f, 2800.0f, 1260.0f}
 };
 
-/* 80C4EC54-80C4EDCC 000254 0178+00 2/2 0/0 0/0 .text            setMtx__15daObjKWheel01_cFv */
 void daObjKWheel01_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -139,7 +130,6 @@ void daObjKWheel01_c::setMtx() {
     }
 }
 
-/* 80C4EDCC-80C4EF38 0003CC 016C+00 1/0 0/0 0/0 .text            CreateHeap__15daObjKWheel01_cFv */
 int daObjKWheel01_c::CreateHeap() {
     J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, l_bmdidx[getOut()]));
     JUT_ASSERT(229, model_data != NULL);
@@ -168,7 +158,6 @@ int daObjKWheel01_c::CreateHeap() {
     return 1;
 }
 
-/* 80C4EF38-80C4EFEC 000538 00B4+00 1/0 0/0 0/0 .text            Create__15daObjKWheel01_cFv */
 int daObjKWheel01_c::Create() {
     mpModel->setBaseTRMtx(mTransformMtx);
     fopAcM_SetMtx(this, mTransformMtx);
@@ -193,7 +182,6 @@ int daObjKWheel01_c::Create() {
     return 1;
 }
 
-/* 80C4EFEC-80C4F048 0005EC 005C+00 1/1 0/0 0/0 .text            searchKWheel00__FPvPv */
 static void* searchKWheel00(void* param_0, void* i_this) {
     i_this; // Needed to bring closer to matching debug REL
     if(param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) {
@@ -206,7 +194,6 @@ static void* searchKWheel00(void* param_0, void* i_this) {
     return NULL;
 }
 
-/* 80C4F048-80C4F344 000648 02FC+00 1/0 0/0 0/0 .text Execute__15daObjKWheel01_cFPPA3_A4_f */
 int daObjKWheel01_c::Execute(Mtx** i_mtx) {
     eventUpdate();
 
@@ -298,7 +285,6 @@ int daObjKWheel01_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C4F344-80C4F3E8 000944 00A4+00 1/0 0/0 0/0 .text            Draw__15daObjKWheel01_cFv */
 int daObjKWheel01_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -310,7 +296,6 @@ int daObjKWheel01_c::Draw() {
     return 1;
 }
 
-/* 80C4F3E8-80C4F498 0009E8 00B0+00 1/0 0/0 0/0 .text            Delete__15daObjKWheel01_cFv */
 int daObjKWheel01_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
 
@@ -326,7 +311,6 @@ int daObjKWheel01_c::Delete() {
     return 1;
 }
 
-/* 80C4F498-80C4F4C0 000A98 0028+00 2/2 0/0 0/0 .text            eventStart__15daObjKWheel01_cFv */
 bool daObjKWheel01_c::eventStart() {
     #ifdef DEBUG
     if(getArg0())
@@ -343,8 +327,6 @@ bool daObjKWheel01_c::eventStart() {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80C4F72C-80C4F74C -00001 0020+00 1/0 0/0 0/0 .data            daObjKWheel01_METHODS */
 static actor_method_class daObjKWheel01_METHODS = {
     (process_method_func)daObjKWheel01_create1st,
     (process_method_func)daObjKWheel01_MoveBGDelete,
@@ -353,7 +335,6 @@ static actor_method_class daObjKWheel01_METHODS = {
     (process_method_func)daObjKWheel01_MoveBGDraw,
 };
 
-/* 80C4F74C-80C4F77C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KWheel01 */
 extern actor_process_profile_definition g_profile_Obj_KWheel01 = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
@@ -371,27 +352,19 @@ extern actor_process_profile_definition g_profile_Obj_KWheel01 = {
   fopAc_CULLBOX_CUSTOM_e,  // cullType
 };
 
-/* 80C4F4C0-80C4F540 000AC0 0080+00 1/1 0/0 0/0 .text daObjKWheel01_create1st__FP15daObjKWheel01_c
- */
 static int daObjKWheel01_create1st(daObjKWheel01_c* i_this) {
     fopAcM_ct(i_this, daObjKWheel01_c);
     return i_this->create1st();
 }
 
-/* 80C4F540-80C4F560 000B40 0020+00 1/0 0/0 0/0 .text
- * daObjKWheel01_MoveBGDelete__FP15daObjKWheel01_c              */
 static int daObjKWheel01_MoveBGDelete(daObjKWheel01_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C4F560-80C4F580 000B60 0020+00 1/0 0/0 0/0 .text
- * daObjKWheel01_MoveBGExecute__FP15daObjKWheel01_c             */
 static int daObjKWheel01_MoveBGExecute(daObjKWheel01_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C4F580-80C4F5AC 000B80 002C+00 1/0 0/0 0/0 .text
- * daObjKWheel01_MoveBGDraw__FP15daObjKWheel01_c                */
 static int daObjKWheel01_MoveBGDraw(daObjKWheel01_c* i_this) {
     return i_this->MoveBGDraw();
 }
diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp
index 702db0affa..3907766d16 100644
--- a/src/d/actor/d_a_obj_kznkarm.cpp
+++ b/src/d/actor/d_a_obj_kznkarm.cpp
@@ -80,7 +80,6 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) {
 
 #endif
 
-/* 80C50D08-80C50D40 000000 0038+00 8/8 0/0 0/0 .rodata          M_attr__14daObjKznkarm_c */
  daObjKznkarm_Attr_c const daObjKznkarm_c::M_attr = {
     -5.0f, -30.0f, 0.6f, 0.94f,
      40.0f, 40.0f, -60.0f,
@@ -88,10 +87,8 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) {
     12.0f, 0, 0x1000, 0, 0xE000,
 };
 
-/* 80C50DC4-80C50DC8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "J_Kazami";
 
-/* 80C50E28-80C50E88 000084 0060+00 1/2 0/0 0/0 .data            ActionTable__14daObjKznkarm_c */
 daObjKznkarm_c::actionFunc daObjKznkarm_c::ActionTable[4][2] = {
     &daObjKznkarm_c::initBroken,
     &daObjKznkarm_c::executeBroken,
@@ -103,21 +100,17 @@ daObjKznkarm_c::actionFunc daObjKznkarm_c::ActionTable[4][2] = {
     &daObjKznkarm_c::executeStay,
 };
 
-/* 80C4F858-80C4F88C 000078 0034+00 5/5 0/0 0/0 .text
- * setAction__14daObjKznkarm_cFQ214daObjKznkarm_c6Mode_e        */
 void daObjKznkarm_c::setAction(daObjKznkarm_c::Mode_e i_action) {
     JUT_ASSERT(209, i_action < MODE_MAX_e);
     mAction = ActionTable[i_action];
     callInit();
 }
 
-/* 80C4F88C-80C4F8B4 0000AC 0028+00 1/1 0/0 0/0 .text            callInit__14daObjKznkarm_cFv */
 void daObjKznkarm_c::callInit() {
     JUT_ASSERT(225, mAction != NULL);
     (this->*mAction[0])();
 }
 
-/* 80C4F8B4-80C4F8E0 0000D4 002C+00 1/1 0/0 0/0 .text            callExecute__14daObjKznkarm_cFv */
 void daObjKznkarm_c::callExecute() {
     JUT_ASSERT(238, mAction != NULL);
     (this->*mAction[1])();
@@ -131,7 +124,6 @@ inline daObjKznkarm_Attr_c* daObjKznkarm_c::attr() const {
     #endif
 }
 
-/* 80C4F8E0-80C4F960 000100 0080+00 1/0 0/0 0/0 .text            initBroken__14daObjKznkarm_cFv */
 void daObjKznkarm_c::initBroken() {
     mMode = MODE_BROKEN_e;
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80);
@@ -145,8 +137,6 @@ void daObjKznkarm_c::initBroken() {
     field_0x7b0 = 10;
 }
 
-/* 80C4F960-80C4FBBC 000180 025C+00 1/0 0/0 0/0 .text            executeBroken__14daObjKznkarm_cFv
- */
 void daObjKznkarm_c::executeBroken() {
     speed.y += gravity;
     if (speed.y < maxFallSpeed) {
@@ -185,7 +175,6 @@ void daObjKznkarm_c::executeBroken() {
     mAcch.CrrPos(dComIfG_Bgsp());
 }
 
-/* 80C4FBBC-80C4FBEC 0003DC 0030+00 1/0 0/0 0/0 .text            initCarry__14daObjKznkarm_cFv */
 void daObjKznkarm_c::initCarry() {
     mMode = MODE_CARRY_e;
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80);
@@ -194,7 +183,6 @@ void daObjKznkarm_c::initCarry() {
     field_0x7af = 0;
 }
 
-/* 80C4FBEC-80C4FD18 00040C 012C+00 1/0 0/0 0/0 .text            executeCarry__14daObjKznkarm_cFv */
 void daObjKznkarm_c::executeCarry() {
     eyePos = attention_info.position = current.pos;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -220,7 +208,6 @@ void daObjKznkarm_c::executeCarry() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C4FD18-80C4FDB4 000538 009C+00 1/0 0/0 0/0 .text            initThrow__14daObjKznkarm_cFv */
 void daObjKznkarm_c::initThrow() {
     mMode = MODE_THROW_e;
     fopAcM_OffStatus(this, fopAcM_STATUS_UNK_0x80);
@@ -235,7 +222,6 @@ void daObjKznkarm_c::initThrow() {
     field_0x7ac = attr()->throw_angular_speed;
 }
 
-/* 80C4FDB4-80C50440 0005D4 068C+00 1/0 0/0 0/0 .text            executeThrow__14daObjKznkarm_cFv */
 void daObjKznkarm_c::executeThrow() {
     if (field_0x7ae != 0) {
         speed.y += gravity * 0.2f;
@@ -313,7 +299,6 @@ void daObjKznkarm_c::executeThrow() {
     setBaseMtx();
 }
 
-/* 80C50488-80C50504 000CA8 007C+00 1/0 0/0 0/0 .text            initStay__14daObjKznkarm_cFv */
 void daObjKznkarm_c::initStay() {
     mMode = MODE_STAY_e;
     fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x80);
@@ -323,7 +308,6 @@ void daObjKznkarm_c::initStay() {
     shape_angle.z = (s16)getGroundSlope(shape_angle.y - 0x4000);
 }
 
-/* 80C50504-80C505F8 000D24 00F4+00 1/0 0/0 0/0 .text            executeStay__14daObjKznkarm_cFv */
 void daObjKznkarm_c::executeStay() {
     if (shape_angle.x != field_0x7a8) {
         eyePos = attention_info.position = current.pos;
@@ -340,7 +324,6 @@ void daObjKznkarm_c::executeStay() {
     }
 }
 
-/* 80C505F8-80C506DC 000E18 00E4+00 1/1 0/0 0/0 .text            create_init__14daObjKznkarm_cFv */
 void daObjKznkarm_c::create_init() {
     fopAcM_setCullSizeBox(this, -10.0f, -15.0f, -15.0f, 120.0f, 40.0f, 15.0f);
     fopAcM_OnCarryType(this, fopAcM_CARRY_UNK_30);
@@ -359,13 +342,11 @@ void daObjKznkarm_c::create_init() {
     #endif
 }
 
-/* 80C506DC-80C50708 000EFC 002C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjKznkarm_cFv */
 void daObjKznkarm_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C50708-80C5076C 000F28 0064+00 3/3 0/0 0/0 .text            setBaseMtx__14daObjKznkarm_cFv */
 void daObjKznkarm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -373,8 +354,6 @@ void daObjKznkarm_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C5076C-80C507F8 000F8C 008C+00 1/1 0/0 0/0 .text            getGroundSlope__14daObjKznkarm_cFs
- */
 s16 daObjKznkarm_c::getGroundSlope(s16 param_0) {
     cM3dGPla groundPla;
     bool hit = dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &groundPla);
@@ -394,7 +373,6 @@ inline int daObjKznkarm_c::createHeap() {
     return TRUE;
 }
 
-/* 80C507F8-80C50870 001018 0078+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* a_this) {
     daObjKznkarm_c* i_this = ((daObjKznkarm_c*)a_this);
     return i_this->createHeap();
@@ -413,7 +391,6 @@ inline int daObjKznkarm_c::draw() {
     return 1;
 }
 
-/* 80C50870-80C50984 001090 0114+00 1/0 0/0 0/0 .text daObjKznkarm_Draw__FP14daObjKznkarm_c */
 static int daObjKznkarm_Draw(daObjKznkarm_c* i_this) {
     return i_this->draw();
 }
@@ -428,12 +405,10 @@ inline int daObjKznkarm_c::execute() {
     return 1;
 }
 
-/* 80C50984-80C509A8 0011A4 0024+00 1/0 0/0 0/0 .text daObjKznkarm_Execute__FP14daObjKznkarm_c */
 static int daObjKznkarm_Execute(daObjKznkarm_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C509A8-80C509B0 0011C8 0008+00 1/0 0/0 0/0 .text daObjKznkarm_IsDelete__FP14daObjKznkarm_c */
 static int daObjKznkarm_IsDelete(daObjKznkarm_c* i_this) {
     return 1;
 }
@@ -445,7 +420,6 @@ inline daObjKznkarm_c::~daObjKznkarm_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C509B0-80C50A5C 0011D0 00AC+00 1/0 0/0 0/0 .text daObjKznkarm_Delete__FP14daObjKznkarm_c */
 static int daObjKznkarm_Delete(daObjKznkarm_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "KznkArm");
     i_this->~daObjKznkarm_c();
@@ -464,14 +438,11 @@ inline int daObjKznkarm_c::create() {
     return rv;
 }
 
-/* 80C50A5C-80C50B3C 00127C 00E0+00 1/0 0/0 0/0 .text            daObjKznkarm_Create__FP10fopAc_ac_c
- */
 static int daObjKznkarm_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daObjKznkarm_c, i_this, "KznkArm");
     return a_this->create();
 }
 
-/* 80C50E90-80C50EB0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjKznkarm_Method */
 static actor_method_class l_daObjKznkarm_Method = {
     (process_method_func)daObjKznkarm_Create,
     (process_method_func)daObjKznkarm_Delete,
@@ -480,7 +451,6 @@ static actor_method_class l_daObjKznkarm_Method = {
     (process_method_func)daObjKznkarm_Draw,
 };
 
-/* 80C50EB0-80C50EE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KznkArm */
 extern actor_process_profile_definition g_profile_Obj_KznkArm = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp
index 426be1f87c..fe8aa0ceb7 100644
--- a/src/d/actor/d_a_obj_ladder.cpp
+++ b/src/d/actor/d_a_obj_ladder.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_s.h"
 #include "d/d_bg_w.h"
-#include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 
 struct Attr {
@@ -31,10 +30,7 @@ struct Attr {
     /* 0x20 */ f32 field_0x20;
 };
 
-/* ############################################################################################## */
-/* 8058DD50-8058DD74 000000 0024+00 5/5 0/0 0/0 .rodata
- * L_attr__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@        */
- SECTION_RODATA static Attr const L_attr = {
+static Attr const L_attr = {
     -3.0f, 0.005f, 0.0005f,
     0.5f, 0x03, 0x4B, 0x32, 0x2D, 0x28, 0x4E20,
     0x3CC3, 0x0F, 2.0f, 1.0f,
@@ -44,8 +40,7 @@ inline static const Attr& attr() {
     return L_attr;
 }
 
-/* 8058DD74-8058DD7C 000024 0005+03 3/3 0/0 0/0 .rodata          M_arcname__Q211daObjLadder5Act_c */
-SECTION_RODATA char const daObjLadder::Act_c::M_arcname[5] = "Mhsg";
+char const daObjLadder::Act_c::M_arcname[5] = "Mhsg";
 
 struct AttrType {
     /* 0x0 */ s16 field_0x0;
@@ -53,9 +48,7 @@ struct AttrType {
     /* 0x4 */ f32 field_0x4;
 };
 
-/* 8058DDCC-8058DDFC 000020 0030+00 3/3 0/0 0/0 .data
- * L_attr_type__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@   */
-SECTION_DATA static AttrType L_attr_type[6] = {
+static AttrType L_attr_type[6] = {
     { 0x08, 0x10, 600.0f},
     { 0x09, 0x11, 900.0f},
     { 0x04, 0x0C, 1200.0f},
@@ -68,8 +61,6 @@ static inline const AttrType& attr_type(daObjLadder::Act_c::Type_e type) {
     return L_attr_type[type];
 }
 
-/* 8058D158-8058D1D8 000078 0080+00 1/0 0/0 0/0 .text            CreateHeap__Q211daObjLadder5Act_cFv
- */
 int daObjLadder::Act_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, attr_type(mType).field_0x0);
     JUT_ASSERT(382, model_data != NULL);
@@ -77,7 +68,6 @@ int daObjLadder::Act_c::CreateHeap() {
     return mModel != NULL;
 }
 
-/* 8058D1D8-8058D378 0000F8 01A0+00 1/0 0/0 0/0 .text            Create__Q211daObjLadder5Act_cFv */
 int daObjLadder::Act_c::Create() {
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
     init_mtx();
@@ -106,7 +96,6 @@ int daObjLadder::Act_c::Create() {
     return 1;
 }
 
-/* 8058D378-8058D478 000298 0100+00 1/1 0/0 0/0 .text Mthd_Create__Q211daObjLadder5Act_cFv */
 int daObjLadder::Act_c::Mthd_Create() {
     fopAcM_ct(this, Act_c);
     int phase_state = dComIfG_resLoad(&mPhase, M_arcname);
@@ -119,19 +108,16 @@ int daObjLadder::Act_c::Mthd_Create() {
     return phase_state;
 }
 
-/* 8058D4F0-8058D4F8 000410 0008+00 1/0 0/0 0/0 .text            Delete__Q211daObjLadder5Act_cFv */
 int daObjLadder::Act_c::Delete() {
     return 1;
 }
 
-/* 8058D4F8-8058D544 000418 004C+00 1/1 0/0 0/0 .text Mthd_Delete__Q211daObjLadder5Act_cFv */
 int daObjLadder::Act_c::Mthd_Delete() {
     int rv = MoveBGDelete();
     dComIfG_resDelete(&mPhase, M_arcname);
     return rv;
 }
 
-/* 8058D544-8058D5AC 000464 0068+00 1/1 0/0 0/0 .text demo_end_reset__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::demo_end_reset() {
     if (mInDemo && dComIfGp_evmng_endCheck(mEventIdx)) {
         dComIfGp_event_reset();
@@ -139,27 +125,21 @@ void daObjLadder::Act_c::demo_end_reset() {
     }
 }
 
-/* 8058D5AC-8058D5B8 0004CC 000C+00 1/1 0/0 0/0 .text mode_wait_init__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::mode_wait_init() {
     mMode = MODE_WAIT;
 }
 
-/* 8058D5B8-8058D614 0004D8 005C+00 1/0 0/0 0/0 .text            mode_wait__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::mode_wait() {
     if (fopAcM_isSwitch(this, prm_get_swSave())) {
         mode_demoreq_init();
     }
 }
 
-/* 8058D614-8058D628 000534 0014+00 1/1 0/0 0/0 .text mode_demoreq_init__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::mode_demoreq_init() {
     mMode = MODE_DEMOREQ;
     mInDemo = false;
 }
 
-/* 8058D628-8058D6E8 000548 00C0+00 1/0 0/0 0/0 .text mode_demoreq__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::mode_demoreq() {
     bool isDemo = false;
     if (dComIfGp_evmng_existence(mEventIdx)) {
@@ -178,7 +158,6 @@ void daObjLadder::Act_c::mode_demoreq() {
     }
 }
 
-/* 8058D6E8-8058D710 000608 0028+00 1/1 0/0 0/0 .text mode_vib_init__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::mode_vib_init() {
     mVibrationTimer = attr().vibrationTimer;
     field_0x610 = 0;
@@ -186,8 +165,6 @@ void daObjLadder::Act_c::mode_vib_init() {
     mMode = MODE_VIB;
 }
 
-/* 8058D710-8058D7A8 000630 0098+00 1/0 0/0 0/0 .text            mode_vib__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::mode_vib() {
     field_0x610 += attr().field_0x16;
     field_0x612 += attr().field_0x18;
@@ -198,7 +175,6 @@ void daObjLadder::Act_c::mode_vib() {
     }
 }
 
-/* 8058D7A8-8058D7EC 0006C8 0044+00 1/1 0/0 0/0 .text mode_drop_init__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::mode_drop_init() {
     gravity = -5.0f;
     speed.set(cXyz::Zero);
@@ -206,8 +182,6 @@ void daObjLadder::Act_c::mode_drop_init() {
     mMode = MODE_DROP;
 }
 
-/* 8058D7EC-8058D9C0 00070C 01D4+00 1/0 0/0 0/0 .text            mode_drop__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::mode_drop() {
     daObj::posMoveF_stream(this, NULL, &cXyz::Zero, attr().field_0x04, attr().field_0x08);
     if (current.pos.y < mHeight) {
@@ -240,21 +214,15 @@ void daObjLadder::Act_c::mode_drop() {
     }
 }
 
-/* 8058D9C0-8058D9CC 0008E0 000C+00 2/2 0/0 0/0 .text mode_fell_init__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::mode_fell_init() {
     mMode = MODE_FELL;
 }
 
-/* 8058D9CC-8058D9D0 0008EC 0004+00 1/0 0/0 0/0 .text            mode_fell__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::mode_fell() {
 }
 
-/* ############################################################################################## */
-/* 8058DF20-8058DF50 000000 0030+00 2/2 0/0 0/0 .bss             M_tmp_mtx__Q211daObjLadder5Act_c */
 Mtx daObjLadder::Act_c::M_tmp_mtx;
 
-/* 8058D9D0-8058DA64 0008F0 0094+00 3/3 0/0 0/0 .text            set_mtx__Q211daObjLadder5Act_cFv */
 void daObjLadder::Act_c::set_mtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -263,14 +231,11 @@ void daObjLadder::Act_c::set_mtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8058DA64-8058DAA0 000984 003C+00 1/1 0/0 0/0 .text            init_mtx__Q211daObjLadder5Act_cFv
- */
 void daObjLadder::Act_c::init_mtx() {
     mModel->setBaseScale(scale);
     set_mtx();
 }
 
-/* 8058DAA0-8058DBB8 0009C0 0118+00 1/0 0/0 0/0 .text Execute__Q211daObjLadder5Act_cFPPA3_A4_f */
 int daObjLadder::Act_c::Execute(f32 (**param_1)[3][4]) {
     static const daObjLadder::Act_c::modeProc mode_proc[5] = {
         &daObjLadder::Act_c::mode_wait, &daObjLadder::Act_c::mode_demoreq,
@@ -286,7 +251,6 @@ int daObjLadder::Act_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 8058DBB8-8058DC5C 000AD8 00A4+00 1/0 0/0 0/0 .text            Draw__Q211daObjLadder5Act_cFv */
 int daObjLadder::Act_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -297,38 +261,26 @@ int daObjLadder::Act_c::Draw() {
     return 1;
 }
 
-/* 8058DC5C-8058DC7C 000B7C 0020+00 1/0 0/0 0/0 .text
- * Mthd_Create__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */
 static int Mthd_Create(daObjLadder::Act_c* i_this) {
     return i_this->Mthd_Create();
 }
 
-/* 8058DC7C-8058DC9C 000B9C 0020+00 1/0 0/0 0/0 .text
- * Mthd_Delete__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */
 static int Mthd_Delete(daObjLadder::Act_c* i_this) {
     return i_this->Mthd_Delete();
 }
 
-/* 8058DC9C-8058DCBC 000BBC 0020+00 1/0 0/0 0/0 .text
- * Mthd_Execute__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */
 static int Mthd_Execute(daObjLadder::Act_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8058DCBC-8058DCE8 000BDC 002C+00 1/0 0/0 0/0 .text
- * Mthd_Draw__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv  */
 static int Mthd_Draw(daObjLadder::Act_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 8058DCE8-8058DD14 000C08 002C+00 1/0 0/0 0/0 .text
- * Mthd_IsDelete__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */
 static int Mthd_IsDelete(daObjLadder::Act_c* i_this) {
     return i_this->MoveBGIsDelete();
 }
 
-/* 8058DE74-8058DE94 -00001 0020+00 1/0 0/0 0/0 .data
- * Mthd_Table__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@    */
 static actor_method_class Mthd_Table = {
     (process_method_func)Mthd_Create, 
     (process_method_func)Mthd_Delete, 
@@ -337,7 +289,6 @@ static actor_method_class Mthd_Table = {
     (process_method_func)Mthd_Draw,
 };
 
-/* 8058DE94-8058DEC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ladder */
 extern actor_process_profile_definition g_profile_Obj_Ladder = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp
index 3dc84afee9..24ea9eab26 100644
--- a/src/d/actor/d_a_obj_laundry.cpp
+++ b/src/d/actor/d_a_obj_laundry.cpp
@@ -11,16 +11,9 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_wether.h"
 
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80C52000-80C52034 000000 0034+00 3/3 0/0 0/0 .rodata          M_attr__10daObjLdy_c */
 daObjLdy_Attr_c const daObjLdy_c::mAttr = {5.0f, 30.0f, 130.0f, -50.0f, 0.15f, 0.45f, 0.3f, 1000.0f,
                                            0.0f, 0.0f,  0.0f,   0.0f,   0,     10,    0};
 
-/* 80C50F98-80C51088 000078 00F0+00 1/1 0/0 0/0 .text            create_init__10daObjLdy_cFv */
 void daObjLdy_c::create_init() {
     fopAcM_setCullSizeBox(this, -60.0f, -200.0f, -60.0f, 60.0f, 50.0f, 60.0f);
     fopAcM_setCullSizeFar(this, 1.5f);
@@ -39,7 +32,6 @@ void daObjLdy_c::create_init() {
     initBaseMtx();
 }
 
-/* 80C51088-80C510F8 000168 0070+00 1/1 0/0 0/0 .text            initBaseMtx__10daObjLdy_cFv */
 void daObjLdy_c::initBaseMtx() {
     setBaseMtx();
 
@@ -52,7 +44,6 @@ void daObjLdy_c::initBaseMtx() {
     }
 }
 
-/* 80C510F8-80C5116C 0001D8 0074+00 2/2 0/0 0/0 .text            setBaseMtx__10daObjLdy_cFv */
 void daObjLdy_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -61,14 +52,11 @@ void daObjLdy_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C5116C-80C51194 00024C 0028+00 1/1 0/0 0/0 .text getJointAngle__10daObjLdy_cFP5csXyzi */
 void daObjLdy_c::getJointAngle(csXyz* i_jointAngle, int i_index) {
     LaundJoint_c* joint = &mJoints[i_index];
     *i_jointAngle = joint->mAngle;
 }
 
-/* ############################################################################################## */
-/* 80C52054-80C52098 000054 0044+00 0/0 0/0 0/0 .rodata          ccCylSrc$3800 */
 const static dCcD_SrcCyl ccCylSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x16048, 0x11}, 0x149}},  // mObj
@@ -87,8 +75,6 @@ static f32 dummy(cXyz v) {
     return 40.0f + v.abs();
 }
 
-/* 80C51194-80C51644 000274 04B0+00 1/1 0/0 0/0 .text            setNormalClothPos__10daObjLdy_cFv
- */
 void daObjLdy_c::setNormalClothPos() {
     cXyz adjustedPosition;
     cXyz windVector = dKyw_get_AllWind_vecpow(&current.pos);
@@ -152,7 +138,6 @@ void daObjLdy_c::setNormalClothPos() {
     }
 }
 
-/* 80C51644-80C5183C 000724 01F8+00 1/1 0/0 0/0 .text            calcJointAngle__10daObjLdy_cFv */
 void daObjLdy_c::calcJointAngle() {
     cXyz position;
     LaundJoint_c* joint = &mJoints[0];
@@ -171,12 +156,10 @@ void daObjLdy_c::calcJointAngle() {
     }
 }
 
-/* 80C5183C-80C51844 00091C 0008+00 1/1 0/0 0/0 .text            divorceParent__10daObjLdy_cFv */
 bool daObjLdy_c::divorceParent() {
     return true;
 }
 
-/* 80C51844-80C518FC 000924 00B8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int i_callbackCondition) {
     J3DModel* jointModel;
     u16 jointNo;
@@ -197,7 +180,6 @@ static int nodeCallBack(J3DJoint* i_joint, int i_callbackCondition) {
     return 1;
 }
 
-/* 80C520F0-80C520F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "J_Sentaku";
 
 int daObjLdy_c::getObjType() {
@@ -232,7 +214,6 @@ int daObjLdy_c::createHeap() {
     return 1;
 }
 
-/* 80C518FC-80C51A98 0009DC 019C+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjLdy_c*>(i_this)->createHeap();
 }
@@ -247,7 +228,6 @@ int daObjLdy_c::daObjLdy_Draw() {
     return 1;
 }
 
-/* 80C51AE0-80C51B9C 000BC0 00BC+00 1/0 0/0 0/0 .text            daObjLdy_Draw__FP10daObjLdy_c */
 static int daObjLdy_Draw(daObjLdy_c* i_this) {
     return i_this->daObjLdy_Draw();
 }
@@ -259,13 +239,10 @@ int daObjLdy_c::daObjLdy_Execute() {
     return 1;
 }
 
-/* 80C51B9C-80C51BDC 000C7C 0040+00 1/0 0/0 0/0 .text            daObjLdy_Execute__FP10daObjLdy_c */
 static int daObjLdy_Execute(daObjLdy_c* i_this) {
     return i_this->daObjLdy_Execute();
 }
 
-/* 80C51BDC-80C51BE4 000CBC 0008+00 1/0 0/0 0/0 .text            daObjLdy_IsDelete__FP10daObjLdy_c
- */
 static int daObjLdy_IsDelete(daObjLdy_c* i_this) {
     return 1;
 }
@@ -274,7 +251,6 @@ daObjLdy_c::~daObjLdy_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C51BE4-80C51D2C 000CC4 0148+00 1/0 0/0 0/0 .text            daObjLdy_Delete__FP10daObjLdy_c */
 static int daObjLdy_Delete(daObjLdy_c* i_this) {
     i_this->~daObjLdy_c();
     return 1;
@@ -295,19 +271,16 @@ int daObjLdy_c::create() {
     return phase;
 }
 
-/* 80C51D68-80C51EC0 000E48 0158+00 1/0 0/0 0/0 .text            daObjLdy_Create__FP10fopAc_ac_c */
 static int daObjLdy_Create(fopAc_ac_c* i_this) {
     return ((daObjLdy_c*)i_this)->create();
 }
 
-/* 80C520F4-80C52114 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjLdy_Method */
 static actor_method_class l_daObjLdy_Method = {
     (process_method_func)daObjLdy_Create,  (process_method_func)daObjLdy_Delete,
     (process_method_func)daObjLdy_Execute, (process_method_func)daObjLdy_IsDelete,
     (process_method_func)daObjLdy_Draw,
 };
 
-/* 80C52114-80C52144 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Laundry */
 extern actor_process_profile_definition g_profile_Obj_Laundry = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp
index 70342a53de..f147a088c1 100644
--- a/src/d/actor/d_a_obj_laundry_rope.cpp
+++ b/src/d/actor/d_a_obj_laundry_rope.cpp
@@ -12,24 +12,15 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_wether.h"
 #include "d/d_path.h"
-#include "dol2asm.h"
 
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 80C53304-80C53318 000000 0014+00 3/3 0/0 0/0 .rodata          M_attr__14daObjLndRope_c */
 daObjLndRope_Attr_c const daObjLndRope_c::mAttr = {-5.0f, 0.2f, 0.5f, 0.8f, 0.0f};
 
-/* 80C53318-80C53328 000014 000D+03 0/1 0/0 0/0 .rodata          l_laundryList */
 static const s8 l_laundryList[13] = {-1, -1, 3, 0, -1, 1, 1, -1, 2, 2, -1, 2, -1};
 
 u8 daObjLndRope_c::getPathId() {
     return fopAcM_GetParamBit(this, 8, 8);
 }
 
-/* 80C521F8-80C52820 000078 0628+00 1/1 0/0 0/0 .text            create_init__14daObjLndRope_cFv */
 void daObjLndRope_c::create_init() {
     gravity = attr()->mGravity;
     dPath* roomPath = dPath_GetRoomPath(getPathId(), fopAcM_GetRoomNo(this));
@@ -95,20 +86,16 @@ void daObjLndRope_c::create_init() {
     }
 }
 
-/* 80C5285C-80C52890 0006DC 0034+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjLndRope_cFv */
 void daObjLndRope_c::initBaseMtx() {
     setBaseMtx();
     fopAcM_SetMtx(this, mMtx);
 }
 
-/* 80C52890-80C528E0 000710 0050+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjLndRope_cFv */
 void daObjLndRope_c::setBaseMtx() {
     mDoMtx_trans(mMtx, current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_ZXYrotM(mMtx, shape_angle.x, shape_angle.y, 0);
 }
 
-/* ############################################################################################## */
-/* 80C53364-80C533A4 000060 0040+00 0/0 0/0 0/0 .rodata          ccSphSrc$3837 */
 const static dCcD_SrcSph ccSphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x1607a, 0x11}, 0x149}},  // mObj
@@ -133,7 +120,6 @@ f32 daObjLndRope_c::getStartRate(cXyz* i_ropeSegmentPos) {
     }
 }
 
-/* 80C528E0-80C52CC8 000760 03E8+00 2/2 0/0 0/0 .text setNormalRopePos__14daObjLndRope_cFv */
 void daObjLndRope_c::setNormalRopePos() {
     cXyz* ropePos = mRopeMat.getPos(0) + 1;
     cXyz* pos1 = mPositions1;
@@ -221,7 +207,6 @@ void daObjLndRope_c::setNormalRopePos() {
     }
 }
 
-/* 80C533CC-80C533D0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_SRope";
 
 int daObjLndRope_c::createHeap() {
@@ -240,7 +225,6 @@ int daObjLndRope_c::createHeap() {
     return 1;
 }
 
-/* 80C52CC8-80C52D70 000B48 00A8+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjLndRope_c*>(i_this)->createHeap();
 }
@@ -253,7 +237,6 @@ int daObjLndRope_c::draw() {
     return 1;
 }
 
-/* 80C52D70-80C52E04 000BF0 0094+00 1/0 0/0 0/0 .text daObjLndRope_Draw__FP14daObjLndRope_c */
 static int daObjLndRope_Draw(daObjLndRope_c* i_this) {
     return i_this->draw();
 }
@@ -264,12 +247,10 @@ int daObjLndRope_c::execute() {
     return 1;
 }
 
-/* 80C52E04-80C52E34 000C84 0030+00 1/0 0/0 0/0 .text daObjLndRope_Execute__FP14daObjLndRope_c */
 static int daObjLndRope_Execute(daObjLndRope_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C52E34-80C52E3C 000CB4 0008+00 1/0 0/0 0/0 .text daObjLndRope_IsDelete__FP14daObjLndRope_c */
 static int daObjLndRope_IsDelete(daObjLndRope_c* i_this) {
     return 1;
 }
@@ -278,7 +259,6 @@ daObjLndRope_c::~daObjLndRope_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C52E3C-80C52F2C 000CBC 00F0+00 1/0 0/0 0/0 .text daObjLndRope_Delete__FP14daObjLndRope_c */
 static int daObjLndRope_Delete(daObjLndRope_c* i_this) {
     i_this->~daObjLndRope_c();
     return 1;
@@ -298,21 +278,16 @@ int daObjLndRope_c::create() {
     return phase;
 }
 
-/* 80C52FF8-80C53140 000E78 0148+00 1/0 0/0 0/0 .text            daObjLndRope_Create__FP10fopAc_ac_c
- */
 static int daObjLndRope_Create(fopAc_ac_c* i_this) {
     return ((daObjLndRope_c*)i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80C533D4-80C533F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjLndRope_Method */
 static actor_method_class l_daObjLndRope_Method = {
     (process_method_func)daObjLndRope_Create,  (process_method_func)daObjLndRope_Delete,
     (process_method_func)daObjLndRope_Execute, (process_method_func)daObjLndRope_IsDelete,
     (process_method_func)daObjLndRope_Draw,
 };
 
-/* 80C533F4-80C53424 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_LndRope */
 extern actor_process_profile_definition g_profile_Obj_LndRope = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp
index a92a40525f..005ffa3cae 100644
--- a/src/d/actor/d_a_obj_lbox.cpp
+++ b/src/d/actor/d_a_obj_lbox.cpp
@@ -11,7 +11,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_hostIO.h"
 
-/* 80C54008-80C54048 000000 0040+00 1/1 0/0 0/0 .data            cc_sph_src$3950 */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}},  // mObj
@@ -24,21 +23,16 @@ static dCcD_SrcSph cc_sph_src = {
     }                                // mSphAttr
 };
 
-/* 80C540E8-80C540EC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80C540E8;
 
-/* 80C540F8-80C54108 000018 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_Lbox_HIO_c l_HIO;
 
-/* 80C5356C-80C5359C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__16daObj_Lbox_HIO_cFv */
 daObj_Lbox_HIO_c::daObj_Lbox_HIO_c() {
     field_0x4 = -1;
     mSize = 2.0f;
     mHeight = 0.0f;
 }
 
-/* 80C5359C-80C53600 00011C 0064+00 1/0 0/0 0/0 .text            daObj_Lbox_Draw__FP14obj_lbox_class
- */
 static int daObj_Lbox_Draw(obj_lbox_class* i_this) {
     g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -46,7 +40,6 @@ static int daObj_Lbox_Draw(obj_lbox_class* i_this) {
     return 1;
 }
 
-/* 80C53600-80C5396C 000180 036C+00 1/1 0/0 0/0 .text            action__FP14obj_lbox_class */
 static void action(obj_lbox_class* i_this) {
     switch (i_this->field_0x57a) {
     case 2:
@@ -104,7 +97,6 @@ static void action(obj_lbox_class* i_this) {
     i_this->attention_info.position = i_this->eyePos;
 }
 
-/* 80C5396C-80C539C8 0004EC 005C+00 2/1 0/0 0/0 .text daObj_Lbox_Execute__FP14obj_lbox_class */
 static int daObj_Lbox_Execute(obj_lbox_class* i_this) {
     i_this->field_0x578++;
     for (int i = 0; i < 2; i++) {
@@ -116,12 +108,10 @@ static int daObj_Lbox_Execute(obj_lbox_class* i_this) {
     return 1;
 }
 
-/* 80C539C8-80C539D0 000548 0008+00 1/0 0/0 0/0 .text daObj_Lbox_IsDelete__FP14obj_lbox_class */
 static int daObj_Lbox_IsDelete(obj_lbox_class* i_this) {
     return 1;
 }
 
-/* 80C539D0-80C53A38 000550 0068+00 1/0 0/0 0/0 .text daObj_Lbox_Delete__FP14obj_lbox_class */
 static int daObj_Lbox_Delete(obj_lbox_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhaseReq, "Obj_lbox");
@@ -132,7 +122,6 @@ static int daObj_Lbox_Delete(obj_lbox_class* i_this) {
     return 1;
 }
 
-/* 80C53A38-80C53B3C 0005B8 0104+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_lbox_class* a_this = static_cast<obj_lbox_class*>(i_this);
 
@@ -157,8 +146,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C53B3C-80C53E14 0006BC 02D8+00 1/0 0/0 0/0 .text            daObj_Lbox_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) {
     obj_lbox_class* a_this = static_cast<obj_lbox_class*>(i_this);
     fopAcM_ct(a_this, obj_lbox_class);
@@ -203,13 +190,11 @@ static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80C54048-80C54068 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Lbox_Method */
 static actor_method_class l_daObj_Lbox_Method = {
     (process_method_func)daObj_Lbox_Create, (process_method_func)daObj_Lbox_Delete,
     (process_method_func)daObj_Lbox_Execute, (process_method_func)daObj_Lbox_IsDelete,
     (process_method_func)daObj_Lbox_Draw};
 
-/* 80C54068-80C54098 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_LBOX */
 extern actor_process_profile_definition g_profile_OBJ_LBOX = {
     fpcLy_CURRENT_e,
     3,
@@ -226,17 +211,3 @@ extern actor_process_profile_definition g_profile_OBJ_LBOX = {
     fopAc_ACTOR_e,
     fopAc_CULLBOX_CUSTOM_e,
 };
-
-/* 80C53E14-80C53E5C 000994 0048+00 1/0 0/0 0/0 .text            __dt__8cM3dGSphFv */
-
-/* 80C53E5C-80C53EA4 0009DC 0048+00 1/0 0/0 0/0 .text            __dt__8cM3dGAabFv */
-
-/* 80C53EA4-80C53F14 000A24 0070+00 3/2 0/0 0/0 .text            __dt__12dBgS_ObjAcchFv */
-
-/* 80C53F14-80C53F5C 000A94 0048+00 2/1 0/0 0/0 .text            __dt__16daObj_Lbox_HIO_cFv */
-
-/* 80C53F5C-80C53F98 000ADC 003C+00 0/0 1/0 0/0 .text            __sinit_d_a_obj_lbox_cpp */
-
-/* 80C53F98-80C53FA0 000B18 0008+00 1/0 0/0 0/0 .text            @36@__dt__12dBgS_ObjAcchFv */
-
-/* 80C53FA0-80C53FA8 000B20 0008+00 1/0 0/0 0/0 .text            @20@__dt__12dBgS_ObjAcchFv */
diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp
index 039202d92b..45cf09f03b 100644
--- a/src/d/actor/d_a_obj_life_container.cpp
+++ b/src/d/actor/d_a_obj_life_container.cpp
@@ -11,7 +11,6 @@
 #include "d/d_item_data.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 804CE3F4-804CE438 000000 0044+00 6/6 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -26,8 +25,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 804CC7D8-804CCAD4 000078 02FC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_wallpoly, f32 i_scale) {
     cM3dGPla plane;
 
@@ -43,8 +40,6 @@ static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_wallpoly, f32 i_scale) {
     return 0.0f;
 }
 
-/* 804CCB1C-804CCB78 0003BC 005C+00 1/1 0/0 0/0 .text
- * lifeGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void lifeGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                               fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     if (i_tgActor != NULL &&
@@ -55,8 +50,6 @@ static void lifeGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
     }
 }
 
-/* 804CCB78-804CCBE4 000418 006C+00 1/1 0/0 0/0 .text
- * lifeGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void lifeGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                               fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     if (i_coActorA != NULL && i_coActorB != NULL && i_coActorB == (fopAc_ac_c*)dComIfGp_getLinkPlayer()) {
@@ -66,12 +59,10 @@ static void lifeGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
     }
 }
 
-/* 804CCBE4-804CCC04 000484 0020+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjLife_cFv */
 void daObjLife_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 804CCC04-804CCC6C 0004A4 0068+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjLife_cFv */
 void daObjLife_c::setBaseMtx() {
     mpModel->setBaseScale(scale);
     
@@ -80,7 +71,6 @@ void daObjLife_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 804CCC6C-804CCE00 00050C 0194+00 1/1 0/0 0/0 .text            Create__11daObjLife_cFv */
 int daObjLife_c::Create() {
     scale.x = scale.y = scale.z = 0.0f;
     initBaseMtx();
@@ -109,7 +99,6 @@ int daObjLife_c::Create() {
     return 1;
 }
 
-/* 804CCE00-804CCF5C 0006A0 015C+00 1/1 0/0 0/0 .text            setEffect__11daObjLife_cFv */
 void daObjLife_c::setEffect() {
     cXyz size(1.5f, 1.5f, 1.5f);
 
@@ -126,23 +115,19 @@ void daObjLife_c::setEffect() {
     }
 }
 
-/* 804CCF5C-804CCFAC 0007FC 0050+00 2/2 0/0 0/0 .text            endEffect00__11daObjLife_cFv */
 void daObjLife_c::endEffect00() {
     mEffect0.remove();
     mEffect1.remove();
 }
 
-/* 804CCFAC-804CCFD8 00084C 002C+00 3/3 0/0 0/0 .text            endEffect02__11daObjLife_cFv */
 void daObjLife_c::endEffect02() {
     mEffect2.remove();
 }
 
-/* 804CCFD8-804CCFE0 000878 0008+00 1/0 0/0 0/0 .text            __CreateHeap__11daObjLife_cFv */
 int daObjLife_c::__CreateHeap() {
     return 1;
 }
 
-/* 804CCFE0-804CD258 000880 0278+00 1/1 0/0 0/0 .text            create__11daObjLife_cFv */
 int daObjLife_c::create() {
     fopAcM_ct(this, daObjLife_c);
 
@@ -185,7 +170,6 @@ int daObjLife_c::create() {
     return phase_state;
 }
 
-/* 804CD428-804CD5B8 000CC8 0190+00 1/1 0/0 0/0 .text            bg_check__11daObjLife_cFv */
 void daObjLife_c::bg_check() {
     f32 bounce_speed_scale = 0.7f;
 
@@ -217,7 +201,6 @@ void daObjLife_c::bg_check() {
     }
 }
 
-/* 804CD5B8-804CD660 000E58 00A8+00 3/3 0/0 0/0 .text            actionWaitInit__11daObjLife_cFv */
 int daObjLife_c::actionWaitInit() {
     mCcCyl.OnTgSPrmBit(1);
     mCcCyl.OnCoSPrmBit(1);
@@ -235,7 +218,6 @@ int daObjLife_c::actionWaitInit() {
     return 1;
 }
 
-/* 804CD660-804CD8C0 000F00 0260+00 1/0 0/0 0/0 .text            actionWait__11daObjLife_cFv */
 int daObjLife_c::actionWait() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN11A") == 0) {
         if (mLv5Counter < 20000) {
@@ -297,7 +279,6 @@ int daObjLife_c::actionWait() {
     return 1;
 }
 
-/* 804CD8C0-804CD98C 001160 00CC+00 3/3 0/0 0/0 .text initActionOrderGetDemo__11daObjLife_cFv */
 int daObjLife_c::initActionOrderGetDemo() {
     mCcCyl.OffTgSPrmBit(1);
     mCcCyl.OffCoSPrmBit(1);
@@ -319,8 +300,6 @@ int daObjLife_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 804CD98C-804CDA08 00122C 007C+00 1/0 0/0 0/0 .text            actionOrderGetDemo__11daObjLife_cFv
- */
 int daObjLife_c::actionOrderGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setStatus(STATUS_GET_DEMO_e);
@@ -336,7 +315,6 @@ int daObjLife_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 804CDA08-804CDBC8 0012A8 01C0+00 1/0 0/0 0/0 .text            actionGetDemo__11daObjLife_cFv */
 int daObjLife_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGp_event_reset();
@@ -367,7 +345,6 @@ int daObjLife_c::actionGetDemo() {
     return 1;
 }
 
-/* 804CDBC8-804CDC2C 001468 0064+00 1/0 0/0 0/0 .text            actionSwOnWait__11daObjLife_cFv */
 int daObjLife_c::actionSwOnWait() {
     if (fopAcM_isSwitch(this, getSwNo()) && cLib_calcTimer<u8>(&field_0x935) == 0) {
         actionWaitInit();
@@ -376,7 +353,6 @@ int daObjLife_c::actionSwOnWait() {
     return 1;
 }
 
-/* 804CDC2C-804CDD0C 0014CC 00E0+00 1/1 0/0 0/0 .text actionInitBoomerangCarry__11daObjLife_cFv */
 int daObjLife_c::actionInitBoomerangCarry() {
     mCcCyl.OnTgSPrmBit(1);
     mCcCyl.OnCoSPrmBit(1);
@@ -392,7 +368,6 @@ int daObjLife_c::actionInitBoomerangCarry() {
     return 1;
 }
 
-/* 804CDD0C-804CDD7C 0015AC 0070+00 1/0 0/0 0/0 .text actionBoomerangCarry__11daObjLife_cFv */
 int daObjLife_c::actionBoomerangCarry() {
     fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG);
     if (boomerang != NULL) {
@@ -406,19 +381,16 @@ int daObjLife_c::actionBoomerangCarry() {
     return 1;
 }
 
-/* 804CDD7C-804CDD8C 00161C 0010+00 0/0 0/0 1/1 .text            actionInitWait2__11daObjLife_cFv */
 int daObjLife_c::actionInitWait2() {
     setStatus(STATUS_WAIT_2_e);
     return 1;
 }
 
-/* 804CDD8C-804CDDAC 00162C 0020+00 1/0 0/0 0/0 .text            actionWait2__11daObjLife_cFv */
 int daObjLife_c::actionWait2() {
     attention_info.position = current.pos;
     return 1;
 }
 
-/* 804CDDAC-804CDE70 00164C 00C4+00 1/1 0/0 0/0 .text            calcScale__11daObjLife_cFv */
 void daObjLife_c::calcScale() {
     cLib_chaseF(&field_0x954, 1.0f, 0.2f);
     if (field_0x954 == 1.0f) {
@@ -435,7 +407,6 @@ void daObjLife_c::calcScale() {
     scale.setall(field_0x950 + field_0x954);
 }
 
-/* 804CDE70-804CE19C 001710 032C+00 1/1 0/0 0/0 .text            execute__11daObjLife_cFv */
 int daObjLife_c::execute() {
     static int (daObjLife_c::*l_demoFunc[])() = {
         &daObjLife_c::actionWait,
@@ -490,7 +461,6 @@ int daObjLife_c::execute() {
     return 1;
 }
 
-/* 804CE19C-804CE1F0 001A3C 0054+00 1/1 0/0 0/0 .text            draw__11daObjLife_cFv */
 int daObjLife_c::draw() {
     if (!chkDraw()) {
         return 1;
@@ -500,12 +470,10 @@ int daObjLife_c::draw() {
     return 1;
 }
 
-/* 804CE1F0-804CE214 001A90 0024+00 1/0 0/0 0/0 .text            setListStart__11daObjLife_cFv */
 void daObjLife_c::setListStart() {
     dComIfGd_setListDark();
 }
 
-/* 804CE214-804CE274 001AB4 0060+00 1/1 0/0 0/0 .text            _delete__11daObjLife_cFv */
 int daObjLife_c::_delete() {
     mSound.deleteObject();
     endEffect00();
@@ -515,29 +483,22 @@ int daObjLife_c::_delete() {
     return 1;
 }
 
-/* 804CE274-804CE294 001B14 0020+00 1/0 0/0 0/0 .text            daObjLife_Draw__FP11daObjLife_c */
 static int daObjLife_Draw(daObjLife_c* i_this) {
     return i_this->draw();
 }
 
-/* 804CE294-804CE2B4 001B34 0020+00 1/0 0/0 0/0 .text            daObjLife_Execute__FP11daObjLife_c
- */
 static int daObjLife_Execute(daObjLife_c* i_this) {
     return i_this->execute();
 }
 
-/* 804CE2B4-804CE2D4 001B54 0020+00 1/0 0/0 0/0 .text            daObjLife_Delete__FP11daObjLife_c
- */
 static int daObjLife_Delete(daObjLife_c* i_this) {
     return i_this->_delete();
 }
 
-/* 804CE2D4-804CE2F4 001B74 0020+00 1/0 0/0 0/0 .text            daObjLife_Create__FP10fopAc_ac_c */
 static int daObjLife_Create(fopAc_ac_c* i_this) {
     return ((daObjLife_c*)i_this)->create();
 }
 
-/* 804CE57C-804CE59C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjLife_Method */
 static actor_method_class l_daObjLife_Method = {
     (process_method_func)daObjLife_Create,
     (process_method_func)daObjLife_Delete,
@@ -546,7 +507,6 @@ static actor_method_class l_daObjLife_Method = {
     (process_method_func)daObjLife_Draw,
 };
 
-/* 804CE59C-804CE5CC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_LifeContainer */
 extern actor_process_profile_definition g_profile_Obj_LifeContainer = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp
index 1791cce237..374a9215e7 100644
--- a/src/d/actor/d_a_obj_lp.cpp
+++ b/src/d/actor/d_a_obj_lp.cpp
@@ -13,7 +13,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80C54198-80C542FC 000078 0164+00 1/0 0/0 0/0 .text            daObj_Lp_Draw__FP12obj_lp_class */
 static int daObj_Lp_Draw(obj_lp_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     wd_ss* mWdSs = i_this->mWdSs;
@@ -49,19 +48,14 @@ static int daObj_Lp_Draw(obj_lp_class* i_this) {
     return 1;
 }
 
-/* 80C55B80-80C55B84 000040 0004+00 0/2 0/0 0/0 .bss             tandem */
 static int tandem;
 
-/* 80C55B84-80C55B88 000044 0004+00 0/2 0/0 0/0 .bss             demo_f */
 static int demo_f;
 
-/* 80C55B88-80C55BB0 000048 0028+00 1/3 0/0 0/0 .bss             target_info */
 static int target_info[10];
 
-/* 80C55BB0-80C55BB4 000070 0004+00 1/3 0/0 0/0 .bss             target_info_count */
 static int target_info_count;
 
-/* 80C542FC-80C54374 0001DC 0078+00 1/1 0/0 0/0 .text            s_ks_sub__FPvPv */
 static void* s_ks_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == 0x60) {
         if (target_info_count < 10) {
@@ -74,7 +68,6 @@ static void* s_ks_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80C54374-80C546D8 000254 0364+00 1/1 0/0 0/0 .text            hit_check__FP12obj_lp_classP5wd_ss */
 static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     cXyz sp6c, sp60;
@@ -140,7 +133,6 @@ static int hit_check(obj_lp_class* i_this, wd_ss* WdSs) {
     return rv;
 }
 
-/* 80C546D8-80C54B20 0005B8 0448+00 1/1 0/0 0/0 .text hasu_action__FP12obj_lp_classP5wd_ss */
 static void hasu_action(obj_lp_class* i_this, wd_ss* WdSs) {
     if (!hit_check(i_this, WdSs)) {
         cLib_addCalc0(&WdSs->field_0x28.x, 0.1f, 0.2f);
@@ -197,7 +189,6 @@ static void hasu_action(obj_lp_class* i_this, wd_ss* WdSs) {
     }
 }
 
-/* 80C54B20-80C54D40 000A00 0220+00 1/1 0/0 0/0 .text set_out_check__FP12obj_lp_classP4cXyz */
 static int set_out_check(obj_lp_class* i_this, cXyz* param_2) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cXyz sp3c = *param_2 - a_this->current.pos;
@@ -219,7 +210,6 @@ static int set_out_check(obj_lp_class* i_this, cXyz* param_2) {
     return 0;
 }
 
-/* 80C54D40-80C550F0 000C20 03B0+00 2/1 0/0 0/0 .text            daObj_Lp_Execute__FP12obj_lp_class */
 static int daObj_Lp_Execute(obj_lp_class* i_this) {
     i_this->field_0x574++;
     if (i_this->field_0xadb0) {
@@ -313,12 +303,10 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) {
     return 1;
 }
 
-/* 80C550F0-80C550F8 000FD0 0008+00 1/0 0/0 0/0 .text            daObj_Lp_IsDelete__FP12obj_lp_class */
 static int daObj_Lp_IsDelete(obj_lp_class* i_this) {
     return 1;
 }
 
-/* 80C550F8-80C5518C 000FD8 0094+00 1/0 0/0 0/0 .text            daObj_Lp_Delete__FP12obj_lp_class */
 static int daObj_Lp_Delete(obj_lp_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     if (i_this->field_0xadb4) {
@@ -329,7 +317,6 @@ static int daObj_Lp_Delete(obj_lp_class* i_this) {
     return 1;
 }
 
-/* 80C5518C-80C552C0 00106C 0134+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_lp_class* i_this = (obj_lp_class*)a_this;
 
@@ -359,7 +346,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80C552C0-80C55488 0011A0 01C8+00 1/1 0/0 0/0 .text            set_pos_check__FP12obj_lp_classi */
 static int set_pos_check(obj_lp_class* i_this, int param_2) {
     f32 fVar1 = 35.0f;
     if (i_this->field_0x572 == 1) {
@@ -376,7 +362,6 @@ static int set_pos_check(obj_lp_class* i_this, int param_2) {
     return 1;
 }
 
-/* 80C55488-80C559C8 001368 0540+00 1/0 0/0 0/0 .text            daObj_Lp_Create__FP10fopAc_ac_c */
 static int daObj_Lp_Create(fopAc_ac_c* a_this) {
     fopAcM_ct(a_this, obj_lp_class);
     obj_lp_class* i_this = (obj_lp_class*)a_this;
@@ -500,7 +485,6 @@ static int daObj_Lp_Create(fopAc_ac_c* a_this) {
     return phase_state;
 }
 
-/* 80C55ADC-80C55AFC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Lp_Method */
 static actor_method_class l_daObj_Lp_Method = {
     (process_method_func)daObj_Lp_Create,
     (process_method_func)daObj_Lp_Delete,
@@ -509,7 +493,6 @@ static actor_method_class l_daObj_Lp_Method = {
     (process_method_func)daObj_Lp_Draw,
 };
 
-/* 80C55AFC-80C55B2C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_LP */
 extern actor_process_profile_definition g_profile_OBJ_LP = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp
index c1a1c0726c..33eeb9c3c4 100644
--- a/src/d/actor/d_a_obj_lv1Candle00.cpp
+++ b/src/d/actor/d_a_obj_lv1Candle00.cpp
@@ -8,10 +8,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C56B9C-80C56BA4 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daLv1Cdl00_HIO_c l_HIO;
 
-/* 80C56A50-80C56A80 000000 0030+00 4/4 0/0 0/0 .rodata          mCcDObjInfo__12daLv1Cdl00_c */
 dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = {
     {
         0, {
@@ -25,19 +23,16 @@ dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C56AC0-80C56B04 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daLv1Cdl00_c */
 dCcD_SrcCyl daLv1Cdl00_c::mCcDCyl = {
     daLv1Cdl00_c::mCcDObjInfo,
     { {0.0f, 0.0f, 0.0f}, 0, 0}
 };
 
-/* 80C55D0C-80C55D38 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__16daLv1Cdl00_HIO_cFv */
 daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() :
     field_0x4(60),
     field_0x5(1)
     {}
 
-/* 80C55D80-80C55E08 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daLv1Cdl00_cFv */
 void daLv1Cdl00_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -45,7 +40,6 @@ void daLv1Cdl00_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C55E08-80C55E74 0001E8 006C+00 1/1 0/0 0/0 .text            CreateHeap__12daLv1Cdl00_cFv */
 int daLv1Cdl00_c::CreateHeap() {
     J3DModelData* bmd = (J3DModelData*)dComIfG_getObjectRes("lv1cdl00", 4);
     mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084);
@@ -55,7 +49,6 @@ int daLv1Cdl00_c::CreateHeap() {
     return true;
 }
 
-/* 80C55E74-80C56110 000254 029C+00 1/1 0/0 0/0 .text            create__12daLv1Cdl00_cFv */
 cPhs__Step daLv1Cdl00_c::create() {
     fopAcM_ct(this, daLv1Cdl00_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "lv1cdl00");
@@ -103,13 +96,10 @@ cPhs__Step daLv1Cdl00_c::create() {
     return step;
 }
 
-/* 80C561A0-80C561C0 000580 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daLv1Cdl00_cFP10fopAc_ac_c             */
 int daLv1Cdl00_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daLv1Cdl00_c*>(i_this)->CreateHeap();
 }
 
-/* 80C561C0-80C56268 0005A0 00A8+00 1/1 0/0 0/0 .text            lightInit__12daLv1Cdl00_cFv */
 void daLv1Cdl00_c::lightInit() {
     mLightPos = mTorchPos;
     mLightPos.y += 10.0f;
@@ -128,21 +118,18 @@ void daLv1Cdl00_c::lightInit() {
     }
 }
 
-/* 80C56268-80C562A0 000648 0038+00 2/2 0/0 0/0 .text            setLight__12daLv1Cdl00_cFv */
 void daLv1Cdl00_c::setLight() {
     if (mLightType == 1 || mLightType == 2) {
         dKy_plight_set(&mLight);
     }
 }
 
-/* 80C562A0-80C562D8 000680 0038+00 1/1 0/0 0/0 .text            cutLight__12daLv1Cdl00_cFv */
 void daLv1Cdl00_c::cutLight() {
     if (mLightType == 1 || mLightType == 2) {
         dKy_plight_cut(&mLight);
     }
 }
 
-/* 80C562D8-80C56388 0006B8 00B0+00 1/1 0/0 0/0 .text            pointLightProc__12daLv1Cdl00_cFv */
 void daLv1Cdl00_c::pointLightProc() {
     if (mLightType != 1) {
         GXColor color = { 0xbc, 0x66, 0x42, 0xff };
@@ -157,7 +144,6 @@ void daLv1Cdl00_c::pointLightProc() {
     }
 }
 
-/* 80C56388-80C567EC 000768 0464+00 1/1 0/0 0/0 .text            Execute__12daLv1Cdl00_cFv */
 int daLv1Cdl00_c::Execute() {
     u8 sw = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xff);
     if (mIsSwitch != sw) {
@@ -245,7 +231,6 @@ int daLv1Cdl00_c::Execute() {
     return true;
 }
 
-/* 80C567EC-80C56890 000BCC 00A4+00 1/1 0/0 0/0 .text            Draw__12daLv1Cdl00_cFv */
 int daLv1Cdl00_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -255,7 +240,6 @@ int daLv1Cdl00_c::Draw() {
     return true;
 }
 
-/* 80C56890-80C568F0 000C70 0060+00 1/1 0/0 0/0 .text            Delete__12daLv1Cdl00_cFv */
 int daLv1Cdl00_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, "lv1cdl00");
@@ -265,30 +249,22 @@ int daLv1Cdl00_c::Delete() {
     return true;
 }
 
-/* 80C568F0-80C56910 000CD0 0020+00 1/0 0/0 0/0 .text            daLv1Cdl00_Draw__FP12daLv1Cdl00_c
- */
 static int daLv1Cdl00_Draw(daLv1Cdl00_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C56910-80C56930 000CF0 0020+00 1/0 0/0 0/0 .text daLv1Cdl00_Execute__FP12daLv1Cdl00_c */
 static int daLv1Cdl00_Execute(daLv1Cdl00_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C56930-80C56950 000D10 0020+00 1/0 0/0 0/0 .text            daLv1Cdl00_Delete__FP12daLv1Cdl00_c
- */
 static int daLv1Cdl00_Delete(daLv1Cdl00_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C56950-80C56970 000D30 0020+00 1/0 0/0 0/0 .text            daLv1Cdl00_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daLv1Cdl00_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv1Cdl00_c*>(i_this)->create();
 }
 
-/* 80C56B04-80C56B24 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv1Cdl00_Method */
 static actor_method_class l_daLv1Cdl00_Method = {
     (process_method_func)daLv1Cdl00_Create,
     (process_method_func)daLv1Cdl00_Delete,
@@ -297,7 +273,6 @@ static actor_method_class l_daLv1Cdl00_Method = {
     (process_method_func)daLv1Cdl00_Draw,
 };
 
-/* 80C56B24-80C56B54 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv1Cdl00 */
 extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp
index ebe06a820c..c0c6a1f859 100644
--- a/src/d/actor/d_a_obj_lv1Candle01.cpp
+++ b/src/d/actor/d_a_obj_lv1Candle01.cpp
@@ -8,10 +8,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C579CC-80C579D4 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daLv1Cdl01_HIO_c l_HIO;
 
-/* 80C5785C-80C5788C 000000 0030+00 4/4 0/0 0/0 .rodata          mCcDObjInfo__12daLv1Cdl01_c */
 dCcD_SrcGObjInf const daLv1Cdl01_c::mCcDObjInfo = {
     {
         0, {
@@ -25,19 +23,16 @@ dCcD_SrcGObjInf const daLv1Cdl01_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C578CC-80C57910 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daLv1Cdl01_c */
 dCcD_SrcCyl daLv1Cdl01_c::mCcDCyl = {
     daLv1Cdl01_c::mCcDObjInfo,
     { {0.0f, 0.0f, 0.0f}, 0, 0}
 };
 
-/* 80C56CAC-80C56CD8 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__16daLv1Cdl01_HIO_cFv */
 daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() :
     field_0x4(60),
     field_0x5(1)
     {}
 
-/* 80C56D20-80C56DA8 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daLv1Cdl01_cFv */
 void daLv1Cdl01_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -45,7 +40,6 @@ void daLv1Cdl01_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C56DA8-80C56E14 0001E8 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daLv1Cdl01_cFv */
 int daLv1Cdl01_c::CreateHeap() {
     J3DModelData* bmd = (J3DModelData*)dComIfG_getObjectRes("lv1cdl01", 4);
     mpModel = mDoExt_J3DModel__create(bmd, 0x80000, 0x11000084);
@@ -55,7 +49,6 @@ int daLv1Cdl01_c::CreateHeap() {
     return true;
 }
 
-/* 80C56E14-80C57048 000254 0234+00 1/1 0/0 0/0 .text            create__12daLv1Cdl01_cFv */
 cPhs__Step daLv1Cdl01_c::create() {
     fopAcM_ct(this, daLv1Cdl01_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, "lv1cdl01");
@@ -87,7 +80,6 @@ cPhs__Step daLv1Cdl01_c::create() {
     return step;
 }
 
-/* 80C570D8-80C57164 000518 008C+00 1/1 0/0 0/0 .text            lightInit__12daLv1Cdl01_cFv */
 void daLv1Cdl01_c::lightInit() {
     mLightPos = mTorchPos;
     mLightPos.y += 10.0f;
@@ -103,21 +95,18 @@ void daLv1Cdl01_c::lightInit() {
     }
 }
 
-/* 80C57164-80C57194 0005A4 0030+00 2/2 0/0 0/0 .text            setLight__12daLv1Cdl01_cFv */
 void daLv1Cdl01_c::setLight() {
     if (mLightType != 0) {
         dKy_plight_set(&mLight);
     }
 }
 
-/* 80C57194-80C571C4 0005D4 0030+00 1/1 0/0 0/0 .text            cutLight__12daLv1Cdl01_cFv */
 void daLv1Cdl01_c::cutLight() {
     if (mLightType != 0) {
         dKy_plight_cut(&mLight);
     }
 }
 
-/* 80C571C4-80C57274 000604 00B0+00 1/1 0/0 0/0 .text            pointLightProc__12daLv1Cdl01_cFv */
 void daLv1Cdl01_c::pointLightProc() {
     if (mLightType == 0) {
         GXColor color = { 0xbc, 0x66, 0x42, 0xff };
@@ -132,8 +121,6 @@ void daLv1Cdl01_c::pointLightProc() {
     }
 }
 
-/* 80C57274-80C575F4 0006B4 0380+00 1/0 0/0 0/0 .text            Execute__12daLv1Cdl01_cFPPA3_A4_f
- */
 int daLv1Cdl01_c::Execute(Mtx** param_0) {
     *param_0 = &mpModel->getBaseTRMtx();
     if (mTimer != 0) {
@@ -198,7 +185,6 @@ int daLv1Cdl01_c::Execute(Mtx** param_0) {
     return true;
 }
 
-/* 80C575F4-80C57698 000A34 00A4+00 1/0 0/0 0/0 .text            Draw__12daLv1Cdl01_cFv */
 int daLv1Cdl01_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -208,7 +194,6 @@ int daLv1Cdl01_c::Draw() {
     return true;
 }
 
-/* 80C57698-80C576F0 000AD8 0058+00 1/0 0/0 0/0 .text            Delete__12daLv1Cdl01_cFv */
 int daLv1Cdl01_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, "lv1cdl01");
@@ -218,30 +203,22 @@ int daLv1Cdl01_c::Delete() {
     return true;
 }
 
-/* 80C576F0-80C5771C 000B30 002C+00 1/0 0/0 0/0 .text            daLv1Cdl01_Draw__FP12daLv1Cdl01_c
- */
 static int daLv1Cdl01_Draw(daLv1Cdl01_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5771C-80C5773C 000B5C 0020+00 1/0 0/0 0/0 .text daLv1Cdl01_Execute__FP12daLv1Cdl01_c */
 static int daLv1Cdl01_Execute(daLv1Cdl01_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5773C-80C5775C 000B7C 0020+00 1/0 0/0 0/0 .text            daLv1Cdl01_Delete__FP12daLv1Cdl01_c
- */
 static int daLv1Cdl01_Delete(daLv1Cdl01_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C5775C-80C5777C 000B9C 0020+00 1/0 0/0 0/0 .text            daLv1Cdl01_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daLv1Cdl01_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv1Cdl01_c*>(i_this)->create();
 }
 
-/* 80C57910-80C57930 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv1Cdl01_Method */
 static actor_method_class l_daLv1Cdl01_Method = {
     (process_method_func)daLv1Cdl01_Create,
     (process_method_func)daLv1Cdl01_Delete,
@@ -250,7 +227,6 @@ static actor_method_class l_daLv1Cdl01_Method = {
     (process_method_func)daLv1Cdl01_Draw,
 };
 
-/* 80C57930-80C57960 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv1Cdl01 */
 extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp
index 49a1f79fdf..2f38049f01 100644
--- a/src/d/actor/d_a_obj_lv2Candle.cpp
+++ b/src/d/actor/d_a_obj_lv2Candle.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor.h"
 
-/* 8058F2AC-8058F2E0 000014 0034+00 4/4 0/0 0/0 .bss             l_HIO */
 static daLv2Candle_HIO_c l_HIO;
 
-/* 8058E04C-8058E0F4 0000EC 00A8+00 1/1 0/0 0/0 .text            __ct__17daLv2Candle_HIO_cFv */
 daLv2Candle_HIO_c::daLv2Candle_HIO_c() {
     mTimer = 30;
     mPow = 500.0f;
@@ -37,7 +35,6 @@ daLv2Candle_HIO_c::daLv2Candle_HIO_c() {
     mColor2B = 0x42;
 }
 
-/* 8058F144-8058F174 000014 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__13daLv2Candle_c */
 dCcD_SrcGObjInf const daLv2Candle_c::mCcDObjInfo = {
     {
         0, {
@@ -51,27 +48,23 @@ dCcD_SrcGObjInf const daLv2Candle_c::mCcDObjInfo = {
     {0},
 };
 
-/* 8058F1C8-8058F20C 000000 0044+00 2/2 0/0 0/0 .data            mCcDCyl__13daLv2Candle_c */
 dCcD_SrcCyl daLv2Candle_c::mCcDCyl = {
     daLv2Candle_c::mCcDObjInfo,
     { {0.0f, 0.0f, 0.0f}, 0, 0}
 };
 
-/* 8058F20C-8058F218 -00001 000C+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[3] = {
     "L2candl",
     "L4candl",
     "L9Candle",
 };
 
-/* 8058F174-8058F180 000044 000C+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static u32 const l_bmdIdx[3] = {
     4,
     4,
     3,
 };
 
-/* 8058E13C-8058E1C4 0001DC 0088+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv2Candle_cFv */
 void daLv2Candle_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -79,7 +72,6 @@ void daLv2Candle_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8058E1C4-8058E244 000264 0080+00 1/1 0/0 0/0 .text            CreateHeap__13daLv2Candle_cFv */
 int daLv2Candle_c::CreateHeap() {
     J3DModelData* bmd =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]);
@@ -90,7 +82,6 @@ int daLv2Candle_c::CreateHeap() {
     return true;
 }
 
-/* 8058E244-8058E52C 0002E4 02E8+00 1/1 0/0 0/0 .text            create__13daLv2Candle_cFv */
 cPhs__Step daLv2Candle_c::create() {
     fopAcM_ct(this, daLv2Candle_c);
     mModelType = getModelType();
@@ -147,18 +138,14 @@ cPhs__Step daLv2Candle_c::create() {
     return step;
 }
 
-/* 8058E5BC-8058E608 00065C 004C+00 2/2 0/0 0/0 .text            isSwitch__13daLv2Candle_cFv */
 u8 daLv2Candle_c::isSwitch() {
     return mSwType ^ fopAcM_isSwitch(this, mSw);
 }
 
-/* 8058E608-8058E628 0006A8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daLv2Candle_cFP10fopAc_ac_c            */
 int daLv2Candle_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daLv2Candle_c*>(i_this)->CreateHeap();
 }
 
-/* 8058E628-8058E678 0006C8 0050+00 1/1 0/0 0/0 .text searchDemoTagAct__13daLv2Candle_cFPvPv */
 void* daLv2Candle_c::searchDemoTagAct(void* i_actor, void* param_1) {
     if (i_actor != NULL && fopAc_IsActor(i_actor) &&
                            fopAcM_GetProfName(i_actor) == PROC_Tag_Lv4Candle) {
@@ -167,7 +154,6 @@ void* daLv2Candle_c::searchDemoTagAct(void* i_actor, void* param_1) {
     return NULL;
 }
 
-/* 8058E678-8058E720 000718 00A8+00 1/1 0/0 0/0 .text            lightInit__13daLv2Candle_cFv */
 void daLv2Candle_c::lightInit() {
     mLightPos = mTorchPos;
     mLightPos.y += 10.0f;
@@ -184,22 +170,18 @@ void daLv2Candle_c::lightInit() {
     mIntensity = 0.0f;
 }
 
-/* 8058E720-8058E750 0007C0 0030+00 2/2 0/0 0/0 .text            setLight__13daLv2Candle_cFv */
 void daLv2Candle_c::setLight() {
     if (mLightType != 0) {
         dKy_plight_set(&mLight);
     }
 }
 
-/* 8058E750-8058E780 0007F0 0030+00 1/1 0/0 0/0 .text            cutLight__13daLv2Candle_cFv */
 void daLv2Candle_c::cutLight() {
     if (mLightType != 0) {
         dKy_plight_cut(&mLight);
     }
 }
 
-/* 8058E780-8058E99C 000820 021C+00 1/1 0/0 0/0 .text            pointLightProc__13daLv2Candle_cFv
- */
 void daLv2Candle_c::pointLightProc() {
     if (mLightType != 0) {
         if (mIsLit && mLightAnm != 0xf) {
@@ -247,7 +229,6 @@ void daLv2Candle_c::pointLightProc() {
     }
 }
 
-/* 8058E99C-8058EEC8 000A3C 052C+00 1/1 0/0 0/0 .text            Execute__13daLv2Candle_cFv */
 int daLv2Candle_c::Execute() {
     if (mSw == 0xff) {
         if (mTimer != 0) {
@@ -369,7 +350,6 @@ int daLv2Candle_c::Execute() {
     return true;
 }
 
-/* 8058EEC8-8058EF6C 000F68 00A4+00 1/1 0/0 0/0 .text            Draw__13daLv2Candle_cFv */
 int daLv2Candle_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -379,7 +359,6 @@ int daLv2Candle_c::Draw() {
     return true;
 }
 
-/* 8058EF6C-8058EFD0 00100C 0064+00 1/1 0/0 0/0 .text            Delete__13daLv2Candle_cFv */
 int daLv2Candle_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]);
@@ -389,29 +368,22 @@ int daLv2Candle_c::Delete() {
     return true;
 }
 
-/* 8058EFD0-8058EFF0 001070 0020+00 1/0 0/0 0/0 .text            daLv2Candle_Draw__FP13daLv2Candle_c
- */
 static int daLv2Candle_Draw(daLv2Candle_c* i_this) {
     return i_this->Draw();
 }
 
-/* 8058EFF0-8058F010 001090 0020+00 1/0 0/0 0/0 .text daLv2Candle_Execute__FP13daLv2Candle_c */
 static int daLv2Candle_Execute(daLv2Candle_c* i_this) {
     return i_this->Execute();
 }
 
-/* 8058F010-8058F030 0010B0 0020+00 1/0 0/0 0/0 .text daLv2Candle_Delete__FP13daLv2Candle_c */
 static int daLv2Candle_Delete(daLv2Candle_c* i_this) {
     return i_this->Delete();
 }
 
-/* 8058F030-8058F050 0010D0 0020+00 1/0 0/0 0/0 .text            daLv2Candle_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daLv2Candle_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv2Candle_c*>(i_this)->create();
 }
 
-/* 8058F218-8058F238 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv2Candle_Method */
 static actor_method_class l_daLv2Candle_Method = {
     (process_method_func)daLv2Candle_Create,
     (process_method_func)daLv2Candle_Delete,
@@ -420,7 +392,6 @@ static actor_method_class l_daLv2Candle_Method = {
     (process_method_func)daLv2Candle_Draw,
 };
 
-/* 8058F238-8058F268 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv2Candle */
 extern actor_process_profile_definition g_profile_Obj_Lv2Candle = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp
index d714b23c13..d38da29adc 100644
--- a/src/d/actor/d_a_obj_lv3Candle.cpp
+++ b/src/d/actor/d_a_obj_lv3Candle.cpp
@@ -9,19 +9,12 @@
 
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
 static daLv3Candle_HIO_c l_HIO;
 
-/* 80C57ACC-80C57AF0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__17daLv3Candle_HIO_cFv */
 daLv3Candle_HIO_c::daLv3Candle_HIO_c() {
     field_0x04 = 0x1e;
 }
 
-/* ############################################################################################## */
-/* 80C58564-80C58594 000000 0030+00 5/5 0/0 0/0 .rodata          mCcDObjInfo__13daLv3Candle_c */
 dCcD_SrcGObjInf const daLv3Candle_c::mCcDObjInfo = {
     {0, {{0x200, 0, 0x13}, {0xd8fbfdff, 0x1f}, {0x79}}},
     {1, 0, 0, 0, 0},
@@ -31,10 +24,8 @@ dCcD_SrcGObjInf const daLv3Candle_c::mCcDObjInfo = {
 
 dCcD_SrcSph daLv3Candle_c::mCcDSph = {daLv3Candle_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 0.0f}}};
 
-/* 80C58630-80C58638 -00001 0008+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[] = {"L3candl", "L3candl2"};
 
-/* 80C57B38-80C57BC0 000158 0088+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv3Candle_cFv */
 void daLv3Candle_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -42,10 +33,8 @@ void daLv3Candle_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C58594-80C5859C 000030 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static u32 const l_bmdIdx[] = {0x03, 0x03};
 
-/* 80C57BC0-80C57C40 0001E0 0080+00 1/1 0/0 0/0 .text            CreateHeap__13daLv3Candle_cFv */
 int daLv3Candle_c::CreateHeap() {
     J3DModelData* model_data =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bmdIdx[mType]);
@@ -58,7 +47,6 @@ int daLv3Candle_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C57C40-80C57EDC 000260 029C+00 1/1 0/0 0/0 .text            create__13daLv3Candle_cFv */
 cPhs__Step daLv3Candle_c::create() {
     fopAcM_ct(this, daLv3Candle_c);
 
@@ -106,13 +94,10 @@ cPhs__Step daLv3Candle_c::create() {
     return step;
 }
 
-/* 80C57F6C-80C57F8C 00058C 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daLv3Candle_cFP10fopAc_ac_c            */
 int daLv3Candle_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daLv3Candle_c*>(i_this)->CreateHeap();
 }
 
-/* 80C57F8C-80C58018 0005AC 008C+00 1/1 0/0 0/0 .text            lightInit__13daLv3Candle_cFv */
 void daLv3Candle_c::lightInit() {
     mLightPos = mTorchPos;
     mLightPos.y += 10.0f;
@@ -130,8 +115,6 @@ void daLv3Candle_c::lightInit() {
     mIntensity = 0.0f;
 }
 
-/* 80C58018-80C580A0 000638 0088+00 1/1 0/0 0/0 .text            pointLightProc__13daLv3Candle_cFv
- */
 void daLv3Candle_c::pointLightProc() {
     if (!mIsLit) {
         GXColor color = {188, 102, 66, 255};
@@ -143,7 +126,6 @@ void daLv3Candle_c::pointLightProc() {
     }
 }
 
-/* 80C580A0-80C582FC 0006C0 025C+00 1/1 0/0 0/0 .text            Execute__13daLv3Candle_cFv */
 int daLv3Candle_c::Execute() {
     dComIfGp_particle_setSimple(0x100, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f);
     dComIfGp_particle_setSimple(0x101, &mTorchPos, 0xff, g_whiteColor, g_whiteColor, 0, 0.0f);
@@ -193,7 +175,6 @@ int daLv3Candle_c::Execute() {
     return TRUE;
 }
 
-/* 80C582FC-80C583A0 00091C 00A4+00 1/1 0/0 0/0 .text            Draw__13daLv3Candle_cFv */
 int daLv3Candle_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -205,7 +186,6 @@ int daLv3Candle_c::Draw() {
     return TRUE;
 }
 
-/* 80C583A0-80C58404 0009C0 0064+00 1/1 0/0 0/0 .text            Delete__13daLv3Candle_cFv */
 int daLv3Candle_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhaseReq, l_resNameIdx[mType]);
@@ -216,36 +196,28 @@ int daLv3Candle_c::Delete() {
     return TRUE;
 }
 
-/* 80C58404-80C58424 000A24 0020+00 1/0 0/0 0/0 .text            daLv3Candle_Draw__FP13daLv3Candle_c
- */
 static int daLv3Candle_Draw(daLv3Candle_c* i_this) {
     return static_cast<daLv3Candle_c*>(i_this)->Draw();
 }
 
-/* 80C58424-80C58444 000A44 0020+00 1/0 0/0 0/0 .text daLv3Candle_Execute__FP13daLv3Candle_c */
 static int daLv3Candle_Execute(daLv3Candle_c* i_this) {
     return static_cast<daLv3Candle_c*>(i_this)->Execute();
 }
 
-/* 80C58444-80C58464 000A64 0020+00 1/0 0/0 0/0 .text daLv3Candle_Delete__FP13daLv3Candle_c */
 static int daLv3Candle_Delete(daLv3Candle_c* i_this) {
     return static_cast<daLv3Candle_c*>(i_this)->Delete();
 }
 
-/* 80C58464-80C58484 000A84 0020+00 1/0 0/0 0/0 .text            daLv3Candle_Create__FP10fopAc_ac_c
- */
 static int daLv3Candle_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv3Candle_c*>(i_this)->create();
 }
 
-/* 80C58638-80C58658 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv3Candle_Method */
 static actor_method_class l_daLv3Candle_Method = {
     (process_method_func)daLv3Candle_Create,  (process_method_func)daLv3Candle_Delete,
     (process_method_func)daLv3Candle_Execute, NULL,
     (process_method_func)daLv3Candle_Draw,
 };
 
-/* 80C58658-80C58688 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv3Candle */
 extern actor_process_profile_definition g_profile_Obj_Lv3Candle = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp
index a1d66b74dd..a3c733e0a3 100644
--- a/src/d/actor/d_a_obj_lv3Water.cpp
+++ b/src/d/actor/d_a_obj_lv3Water.cpp
@@ -14,8 +14,8 @@
 
 class daLv3Water_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C587CC */ daLv3Water_HIO_c();
-    /* 80C59C34 */ virtual ~daLv3Water_HIO_c() {}
+    daLv3Water_HIO_c();
+    virtual ~daLv3Water_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -23,10 +23,8 @@ public:
     /* 0x04 */ u8 field_0x04;
 };
 
-/* 80C5A314-80C5A31C 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daLv3Water_HIO_c l_HIO;
 
-/* 80C5A15C-80C5A1B0 -00001 0054+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[] = {
     "Kr10water", "Kr10wat01", "Kr02wat00", "Kr03wat00", "Kr03wat01", "Kr03wat02", "Kr03wat03",
     "Kr03wat04", "Kr07wat00", "Kr08wat00", "Kr08wat01", "Kr02wat01", "Kr02wat02", "Kr02wat03",
@@ -38,12 +36,10 @@ static daLv3Water_c::modeFunc l_mode_func[] = {
     &daLv3Water_c::mode_proc_levelCtrl,
 };
 
-/* 80C587CC-80C587F0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daLv3Water_HIO_cFv */
 daLv3Water_HIO_c::daLv3Water_HIO_c() {
     field_0x04 = NULL;
 }
 
-/* 80C58838-80C5891C 000158 00E4+00 2/2 0/0 0/0 .text            setBaseMtx__12daLv3Water_cFv */
 void daLv3Water_c::setBaseMtx() {
     if (mpModel2 != NULL) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -60,32 +56,26 @@ void daLv3Water_c::setBaseMtx() {
     mpModel1->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C59E70-80C59EC4 000000 0054+00 2/2 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {
     5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-/* 80C59EC4-80C59F18 000054 0054+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {
     13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 11, 11,
 };
 
-/* 80C59F18-80C59F6C 0000A8 0054+00 0/1 0/0 0/0 .rodata          l_btkIdx */
 static const int l_btkIdx[] = {
     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 8, 8,
 };
 
-/* 80C59F6C-80C59FC0 0000FC 0054+00 0/1 0/0 0/0 .rodata          l_bmdIdrIdx */
 static const int l_bmdIdrIdx[] = {
     6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, -1, -1,
 };
 
-/* 80C59FC0-80C5A014 000150 0054+00 0/1 0/0 0/0 .rodata          l_btkIdrIdx */
 static const int l_btkIdrIdx[] = {
     10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, -1, -1,
 };
 
-/* 80C5891C-80C58ABC 00023C 01A0+00 1/0 0/0 0/0 .text            CreateHeap__12daLv3Water_cFv */
 int daLv3Water_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bmdIdx[mType]);
@@ -120,7 +110,6 @@ int daLv3Water_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5A018-80C5A048 0001A8 002A+06 1/1 0/0 0/0 .rodata          estimateSizeTbl$3746 */
 static u16 const estimateSizeTbl[] = {
     0x1CE0,
     0x4F90,
@@ -149,7 +138,6 @@ static u16 const estimateSizeTbl[] = {
     0x0000,
 };
 
-/* 80C58ABC-80C58D20 0003DC 0264+00 1/1 0/0 0/0 .text            create__12daLv3Water_cFv */
 int daLv3Water_c::create() {
     fopAcM_ct(this, daLv3Water_c);
 
@@ -189,8 +177,6 @@ int daLv3Water_c::create() {
     return phase;
 }
 
-/* 80C58D68-80C58E20 000688 00B8+00 1/0 0/0 0/0 .text            Execute__12daLv3Water_cFPPA3_A4_f
- */
 int daLv3Water_c::Execute(Mtx** i_mtx) {
     mBtk1.play();
 
@@ -208,7 +194,6 @@ int daLv3Water_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C58E20-80C596F4 000740 08D4+00 2/1 0/0 0/0 .text            effectSet__12daLv3Water_cFv */
 void daLv3Water_c::effectSet() {
     switch (mType) {
     case 8:
@@ -283,7 +268,6 @@ void daLv3Water_c::effectSet() {
     }
 }
 
-/* 80C596F4-80C59754 001014 0060+00 1/0 0/0 0/0 .text            mode_proc_wait__12daLv3Water_cFv */
 void daLv3Water_c::mode_proc_wait() {
     if (mSwitch1 != mSwitch2) {
         int event = getParamEvent();
@@ -295,7 +279,6 @@ void daLv3Water_c::mode_proc_wait() {
     }
 }
 
-/* 80C59754-80C597FC 001074 00A8+00 1/1 0/0 0/0 .text mode_init_levelCtrl__12daLv3Water_cFv */
 void daLv3Water_c::mode_init_levelCtrl() {
     field_0x600 = 0;
     field_0x604 = l_HIO.field_0x04;
@@ -307,7 +290,6 @@ void daLv3Water_c::mode_init_levelCtrl() {
     mMode = LEVEL_CTRL;
 }
 
-/* 80C597FC-80C598BC 00111C 00C0+00 1/0 0/0 0/0 .text mode_proc_levelCtrl__12daLv3Water_cFv */
 void daLv3Water_c::mode_proc_levelCtrl() {
     if (field_0x604 != NULL) {
         field_0x604 = field_0x604 - 1;
@@ -328,7 +310,6 @@ void daLv3Water_c::mode_proc_levelCtrl() {
     }
 }
 
-/* 80C598BC-80C59AA0 0011DC 01E4+00 1/0 0/0 0/0 .text            Draw__12daLv3Water_cFv */
 int daLv3Water_c::Draw() {
     if (field_0x605 == NULL) {
         return 0;
@@ -376,13 +357,11 @@ int daLv3Water_c::Draw() {
     return 1;
 }
 
-/* 80C59AA0-80C59AE0 0013C0 0040+00 1/0 0/0 0/0 .text            Delete__12daLv3Water_cFv */
 int daLv3Water_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mType]);
     return 1;
 }
 
-/* 80C59AE0-80C59BA8 001400 00C8+00 2/1 0/0 0/0 .text            eventStart__12daLv3Water_cFv */
 bool daLv3Water_c::eventStart() {
     field_0x601 = fpcM_GetParam(this) >> 0x18;
     mSwitch1 = mSwitch2;
@@ -403,38 +382,28 @@ bool daLv3Water_c::eventStart() {
     return true;
 }
 
-/* 80C59BA8-80C59BD4 0014C8 002C+00 1/0 0/0 0/0 .text            daLv3Water_Draw__FP12daLv3Water_c
- */
 static int daLv3Water_Draw(daLv3Water_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C59BD4-80C59BF4 0014F4 0020+00 1/0 0/0 0/0 .text daLv3Water_Execute__FP12daLv3Water_c */
 static int daLv3Water_Execute(daLv3Water_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C59BF4-80C59C14 001514 0020+00 1/0 0/0 0/0 .text            daLv3Water_Delete__FP12daLv3Water_c
- */
 static int daLv3Water_Delete(daLv3Water_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C59C14-80C59C34 001534 0020+00 1/0 0/0 0/0 .text            daLv3Water_Create__FP10fopAc_ac_c
- */
 static int daLv3Water_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv3Water_c*>(i_this)->create();
 }
 
-/* 80C59C34-80C59C90 001554 005C+00 2/1 0/0 0/0 .text            __dt__16daLv3Water_HIO_cFv */
-/* 80C5A228-80C5A248 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv3Water_Method */
 static actor_method_class l_daLv3Water_Method = {
     (process_method_func)daLv3Water_Create,  (process_method_func)daLv3Water_Delete,
     (process_method_func)daLv3Water_Execute, 0,
     (process_method_func)daLv3Water_Draw,
 };
 
-/* 80C5A248-80C5A278 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv3Water */
 extern actor_process_profile_definition g_profile_Obj_Lv3Water = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp
index c6ce4fab6f..dc3847cc74 100644
--- a/src/d/actor/d_a_obj_lv3Water2.cpp
+++ b/src/d/actor/d_a_obj_lv3Water2.cpp
@@ -11,8 +11,8 @@
 #include "m_Do/m_Do_graphic.h"
 
 struct daLv3Water2_HIO_c : public mDoHIO_entry_c {
-    /* 80C5A40C */ daLv3Water2_HIO_c();
-    /* 80C5B14C */ ~daLv3Water2_HIO_c() {}
+    daLv3Water2_HIO_c();
+    ~daLv3Water2_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -28,7 +28,6 @@ static int daLv3Water2_Create(fopAc_ac_c* i_this);
 
 static daLv3Water2_HIO_c l_HIO;
 
-/* 80C5A40C-80C5A430 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__17daLv3Water2_HIO_cFv */
 daLv3Water2_HIO_c::daLv3Water2_HIO_c() {
     mLevelControlWaitFrames = 0;
 }
@@ -39,15 +38,12 @@ void daLv3Water2_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C5B3C4-80C5B3C8 -00001 0004+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[] = {"Kr03wat04"};
 
-/* 80C5B3E0-80C5B3F8 00003C 0018+00 1/2 0/0 0/0 .data            l_mode_func */
 static actionFunc l_mode_func[] = {
     &daLv3Water2_c::mode_proc_wait, &daLv3Water2_c::mode_proc_levelCtrl 
 };
 
-/* 80C5B3F8-80C5B418 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv3Water2_Method */
 static actor_method_class l_daLv3Water2_Method = {
     (process_method_func)daLv3Water2_Create,
     (process_method_func)daLv3Water2_Delete,
@@ -56,7 +52,6 @@ static actor_method_class l_daLv3Water2_Method = {
     (process_method_func)daLv3Water2_Draw,
 };
 
-/* 80C5B418-80C5B448 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv3Water2 */
 extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
@@ -74,7 +69,6 @@ extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = {
   fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
-/* 80C5A478-80C5A4F8 000158 0080+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv3Water2_cFv */
 void daLv3Water2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -83,17 +77,12 @@ void daLv3Water2_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* ############################################################################################## */
-/* 80C5B364-80C5B368 000000 0004+00 3/3 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {5};
 
-/* 80C5B368-80C5B36C 000004 0004+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {13};
 
-/* 80C5B36C-80C5B370 000008 0004+00 0/1 0/0 0/0 .rodata          l_btkIdx */
 static const int l_btkIdx[] = {9};
 
-/* 80C5A4F8-80C5A5E4 0001D8 00EC+00 1/0 0/0 0/0 .text            CreateHeap__13daLv3Water2_cFv */
 int daLv3Water2_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_resNameIdx[mResourceIndex], l_bmdIdx[mResourceIndex]));
     JUT_ASSERT(171, modelData != NULL);
@@ -107,7 +96,6 @@ int daLv3Water2_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5A5E4-80C5A7FC 0002C4 0218+00 1/1 0/0 0/0 .text            create__13daLv3Water2_cFv */
 cPhs__Step daLv3Water2_c::create() {
     fopAcM_ct(this, daLv3Water2_c);
     mResourceIndex = getParam(0, 4);
@@ -140,8 +128,6 @@ cPhs__Step daLv3Water2_c::create() {
     return resPhase;
 }
 
-/* 80C5A844-80C5AC10 000524 03CC+00 1/0 0/0 0/0 .text            Execute__13daLv3Water2_cFPPA3_A4_f
- */
 int daLv3Water2_c::Execute(Mtx** i_mtx) {
     mWaterSurfaceRefractionAnm.play();
 
@@ -172,8 +158,6 @@ int daLv3Water2_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C5AC10-80C5ACB8 0008F0 00A8+00 1/0 0/0 0/0 .text            mode_proc_wait__13daLv3Water2_cFv
- */
 void daLv3Water2_c::mode_proc_wait() {
     if(mEastSwInitialStatus != mEastSwCurrentStatus) {
         if(getParamEvent() != 0xFF)
@@ -189,7 +173,6 @@ void daLv3Water2_c::mode_proc_wait() {
     }
 }
 
-/* 80C5ACB8-80C5ACE4 000998 002C+00 1/1 0/0 0/0 .text mode_init_levelCtrl__13daLv3Water2_cFv */
 void daLv3Water2_c::mode_init_levelCtrl() {
     mCurrentWaterLvFrame = 0;
     mLevelControlWaitFrames = l_HIO.mLevelControlWaitFrames;
@@ -197,7 +180,6 @@ void daLv3Water2_c::mode_init_levelCtrl() {
     mMode = LEVEL_CTRL;
 }
 
-/* 80C5ACE4-80C5ADA4 0009C4 00C0+00 1/0 0/0 0/0 .text mode_proc_levelCtrl__13daLv3Water2_cFv */
 void daLv3Water2_c::mode_proc_levelCtrl() {
     if(mLevelControlWaitFrames) {
         mLevelControlWaitFrames--;
@@ -219,7 +201,6 @@ void daLv3Water2_c::mode_proc_levelCtrl() {
     }
 }
 
-/* 80C5ADA4-80C5AEFC 000A84 0158+00 1/0 0/0 0/0 .text            Draw__13daLv3Water2_cFv */
 int daLv3Water2_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -253,7 +234,6 @@ int daLv3Water2_c::Draw() {
     return 1;
 }
 
-/* 80C5AEFC-80C5AF3C 000BDC 0040+00 1/0 0/0 0/0 .text            Delete__13daLv3Water2_cFv */
 int daLv3Water2_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mResourceIndex]);
 
@@ -264,7 +244,6 @@ int daLv3Water2_c::Delete() {
     return 1;
 }
 
-/* 80C5AF3C-80C5B0C0 000C1C 0184+00 2/1 0/0 0/0 .text            eventStart__13daLv3Water2_cFv */
 bool daLv3Water2_c::eventStart() {
     if(mEastSwInitialStatus != mEastSwCurrentStatus) {
         mWaterLv = getParamLevel1() * 5.0f;
@@ -290,25 +269,19 @@ bool daLv3Water2_c::eventStart() {
     return true;
 }
 
-/* 80C5B0C0-80C5B0EC 000DA0 002C+00 1/0 0/0 0/0 .text            daLv3Water2_Draw__FP13daLv3Water2_c
- */
 static int daLv3Water2_Draw(daLv3Water2_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5B0EC-80C5B10C 000DCC 0020+00 1/0 0/0 0/0 .text daLv3Water2_Execute__FP13daLv3Water2_c */
 static int daLv3Water2_Execute(daLv3Water2_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5B10C-80C5B12C 000DEC 0020+00 1/0 0/0 0/0 .text daLv3Water2_Delete__FP13daLv3Water2_c */
 static int daLv3Water2_Delete(daLv3Water2_c* i_this) {
     const fpc_ProcID procID = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80C5B12C-80C5B14C 000E0C 0020+00 1/0 0/0 0/0 .text            daLv3Water2_Create__FP10fopAc_ac_c
- */
 static int daLv3Water2_Create(fopAc_ac_c* i_this) {
     daLv3Water2_c* const lv3Water2 = static_cast<daLv3Water2_c*>(i_this);
     const fpc_ProcID procID = fopAcM_GetID(i_this);
diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp
index ce00d14080..4126100671 100644
--- a/src/d/actor/d_a_obj_lv3WaterB.cpp
+++ b/src/d/actor/d_a_obj_lv3WaterB.cpp
@@ -10,8 +10,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C5B578-80C5B71C 000078 01A4+00 1/0 0/0 0/0 .text
- * daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class                */
 static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpBWaterModel, &i_this->tevStr);
@@ -44,7 +42,6 @@ static int daObj_Lv3waterB_Draw(obj_lv3WaterB_class* i_this) {
     return 1;
 }
 
-/* 80C5B71C-80C5B89C 00021C 0180+00 1/1 0/0 0/0 .text            action__FP19obj_lv3WaterB_class */
 static void action(obj_lv3WaterB_class* i_this) {
     switch (i_this->mAction) {
     case LV3WATERB_ACT_WAIT:
@@ -83,21 +80,15 @@ static void action(obj_lv3WaterB_class* i_this) {
     }
 }
 
-/* 80C5B89C-80C5B8C0 00039C 0024+00 2/1 0/0 0/0 .text
- * daObj_Lv3waterB_Execute__FP19obj_lv3WaterB_class             */
 static int daObj_Lv3waterB_Execute(obj_lv3WaterB_class* i_this) {
     action(i_this);
     return 1;
 }
 
-/* 80C5B8C0-80C5B8C8 0003C0 0008+00 1/0 0/0 0/0 .text
- * daObj_Lv3waterB_IsDelete__FP19obj_lv3WaterB_class            */
 static int daObj_Lv3waterB_IsDelete(obj_lv3WaterB_class* i_this) {
     return 1;
 }
 
-/* 80C5B8C8-80C5B94C 0003C8 0084+00 1/0 0/0 0/0 .text
- * daObj_Lv3waterB_Delete__FP19obj_lv3WaterB_class              */
 static int daObj_Lv3waterB_Delete(obj_lv3WaterB_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mBWaterPhase, "L3_bwater");
@@ -112,7 +103,6 @@ static int daObj_Lv3waterB_Delete(obj_lv3WaterB_class* i_this) {
     return 1;
 }
 
-/* 80C5B94C-80C5BB8C 00044C 0240+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_lv3WaterB_class* a_this = static_cast<obj_lv3WaterB_class*>(i_this);
 
@@ -167,7 +157,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C5BBD4-80C5BD48 0006D4 0174+00 1/0 0/0 0/0 .text daObj_Lv3waterB_Create__FP10fopAc_ac_c */
 static int daObj_Lv3waterB_Create(fopAc_ac_c* i_this) {
     obj_lv3WaterB_class* a_this = static_cast<obj_lv3WaterB_class*>(i_this);
     fopAcM_ct(a_this, obj_lv3WaterB_class);
@@ -209,14 +198,12 @@ static int daObj_Lv3waterB_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80C5BD84-80C5BDA4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Lv3waterB_Method */
 static actor_method_class l_daObj_Lv3waterB_Method = {
     (process_method_func)daObj_Lv3waterB_Create,  (process_method_func)daObj_Lv3waterB_Delete,
     (process_method_func)daObj_Lv3waterB_Execute, (process_method_func)daObj_Lv3waterB_IsDelete,
     (process_method_func)daObj_Lv3waterB_Draw,
 };
 
-/* 80C5BDA4-80C5BDD4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_LV3WATERB */
 extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp
index c550e276fb..e927138514 100644
--- a/src/d/actor/d_a_obj_lv3saka00.cpp
+++ b/src/d/actor/d_a_obj_lv3saka00.cpp
@@ -10,19 +10,16 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C5BE58-80C5BE78 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjLv3saka_cFv */
 void daObjLv3saka_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C5BE78-80C5BED8 000098 0060+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjLv3saka_cFv */
 void daObjLv3saka_c::setBaseMtx() {
     MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_YrotM(mDoMtx_stack_c::get(), shape_angle.y);
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C5BED8-80C5BFA0 0000F8 00C8+00 1/0 0/0 0/0 .text            Create__14daObjLv3saka_cFv */
 int daObjLv3saka_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         if (mpBgW->ChkUsed()) {
@@ -41,17 +38,12 @@ int daObjLv3saka_c::Create() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C5C3C4-80C5C3CC 000000 0008+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static int const l_dzbIdx[] = {3, 3};
 
-/* 80C5C3CC-80C5C3D4 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzbIdx2 */
 static int const l_dzbIdx2[] = {4, 4};
 
-/* 80C5C3F0-80C5C3F8 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {"Obj_saka", "Obj_saka2"};
 
-/* 80C5BFA0-80C5C058 0001C0 00B8+00 1/0 0/0 0/0 .text            CreateHeap__14daObjLv3saka_cFv */
 int daObjLv3saka_c::CreateHeap() {
     mpBgW2 = new dBgW();
     if (mpBgW2 == NULL ||
@@ -65,11 +57,8 @@ int daObjLv3saka_c::CreateHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C5C3D4-80C5C3DC 000010 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static int const l_heap_size[] = {0x00004E00, 0x00002900};
 
-/* 80C5C058-80C5C0FC 000278 00A4+00 1/1 0/0 0/0 .text            create1st__14daObjLv3saka_cFv */
 int daObjLv3saka_c::create1st() {
     int phase = dComIfG_resLoad(&mPhase, l_arcName[getType()]);
     if (phase == cPhs_COMPLEATE_e) {
@@ -82,8 +71,6 @@ int daObjLv3saka_c::create1st() {
     return phase;
 }
 
-/* 80C5C0FC-80C5C17C 00031C 0080+00 1/0 0/0 0/0 .text            Execute__14daObjLv3saka_cFPPA3_A4_f
- */
 int daObjLv3saka_c::Execute(Mtx** param_0) {
     if (fopAcM_isSwitch(this, getSwbit())) {
         setWtrDzb();
@@ -97,7 +84,6 @@ int daObjLv3saka_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C5C17C-80C5C1F8 00039C 007C+00 1/1 0/0 0/0 .text            setNrmDzb__14daObjLv3saka_cFv */
 void daObjLv3saka_c::setNrmDzb() {
     if (!mpBgW->ChkUsed()) {
         if (mpBgW2->ChkUsed()) {
@@ -108,7 +94,6 @@ void daObjLv3saka_c::setNrmDzb() {
     }
 }
 
-/* 80C5C1F8-80C5C274 000418 007C+00 1/1 0/0 0/0 .text            setWtrDzb__14daObjLv3saka_cFv */
 void daObjLv3saka_c::setWtrDzb() {
     if (!mpBgW2->ChkUsed()) {
         if (mpBgW->ChkUsed()) {
@@ -119,12 +104,10 @@ void daObjLv3saka_c::setWtrDzb() {
     }
 }
 
-/* 80C5C274-80C5C27C 000494 0008+00 1/0 0/0 0/0 .text            Draw__14daObjLv3saka_cFv */
 int daObjLv3saka_c::Draw() {
     return 1;
 }
 
-/* 80C5C27C-80C5C2F0 00049C 0074+00 1/0 0/0 0/0 .text            Delete__14daObjLv3saka_cFv */
 int daObjLv3saka_c::Delete() {
     if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW2);
@@ -133,39 +116,28 @@ int daObjLv3saka_c::Delete() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C5C2F0-80C5C350 000510 0060+00 1/0 0/0 0/0 .text daObjLv3saka_create1st__FP14daObjLv3saka_c
- */
 static int daObjLv3saka_create1st(daObjLv3saka_c* i_this) {
     fopAcM_ct(i_this, daObjLv3saka_c);
     return i_this->create1st();
 }
 
-/* 80C5C350-80C5C370 000570 0020+00 1/0 0/0 0/0 .text
- * daObjLv3saka_MoveBGDelete__FP14daObjLv3saka_c                */
 static int daObjLv3saka_MoveBGDelete(daObjLv3saka_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C5C370-80C5C390 000590 0020+00 1/0 0/0 0/0 .text
- * daObjLv3saka_MoveBGExecute__FP14daObjLv3saka_c               */
 static int daObjLv3saka_MoveBGExecute(daObjLv3saka_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5C390-80C5C3BC 0005B0 002C+00 1/0 0/0 0/0 .text daObjLv3saka_MoveBGDraw__FP14daObjLv3saka_c
- */
 static int daObjLv3saka_MoveBGDraw(daObjLv3saka_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5C3F8-80C5C418 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv3saka_METHODS */
 static actor_method_class daObjLv3saka_METHODS = {
     (process_method_func)daObjLv3saka_create1st, (process_method_func)daObjLv3saka_MoveBGDelete,
     (process_method_func)daObjLv3saka_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjLv3saka_MoveBGDraw};
 
-/* 80C5C418-80C5C448 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv3R10Saka */
 extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp
index 086e155a31..c500d876a6 100644
--- a/src/d/actor/d_a_obj_lv3waterEff.cpp
+++ b/src/d/actor/d_a_obj_lv3waterEff.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C5C878-80C5C880 000000 0008+00 1/1 0/0 0/0 .rodata          l_eff_id */
 static u16 const l_eff_id[] = {
     0x86D2,
     0x86D3,
@@ -17,7 +16,6 @@ static u16 const l_eff_id[] = {
     0x86D5,
 };
 
-/* 80C5C4F8-80C5C5DC 000078 00E4+00 1/1 0/0 0/0 .text            Create__15daObjWaterEff_cFv */
 int daObjWaterEff_c::Create() {
     for (int i = 0; i < 4; i++) {
         mParticles[i] = dComIfGp_particle_set(l_eff_id[i], &current.pos, NULL, NULL, 0xFF, NULL, -1,
@@ -29,7 +27,6 @@ int daObjWaterEff_c::Create() {
     return 1;
 }
 
-/* 80C5C5DC-80C5C670 00015C 0094+00 1/1 0/0 0/0 .text            create__15daObjWaterEff_cFv */
 int daObjWaterEff_c::create() {
     fopAcM_ct(this, daObjWaterEff_c);
 
@@ -40,7 +37,6 @@ int daObjWaterEff_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C5C6B0-80C5C7B8 000230 0108+00 1/1 0/0 0/0 .text            execute__15daObjWaterEff_cFv */
 int daObjWaterEff_c::execute() {
     if (dKy_camera_water_in_status_check()) {
         for (int i = 0; i < 4; i++) {
@@ -63,7 +59,6 @@ int daObjWaterEff_c::execute() {
     return 1;
 }
 
-/* 80C5C7B8-80C5C810 000338 0058+00 1/1 0/0 0/0 .text            _delete__15daObjWaterEff_cFv */
 int daObjWaterEff_c::_delete() {
     for (int i = 0; i < 4; i++) {
         if (mParticles[i] != NULL) {
@@ -76,24 +71,18 @@ int daObjWaterEff_c::_delete() {
     return 1;
 }
 
-/* 80C5C810-80C5C830 000390 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Execute__FP15daObjWaterEff_c
- */
 static int daObjWaterEff_Execute(daObjWaterEff_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C5C830-80C5C850 0003B0 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Delete__FP15daObjWaterEff_c */
 static int daObjWaterEff_Delete(daObjWaterEff_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80C5C850-80C5C870 0003D0 0020+00 1/0 0/0 0/0 .text daObjWaterEff_Create__FP10fopAc_ac_c */
 static int daObjWaterEff_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWaterEff_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80C5C8A0-80C5C8C0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWaterEff_Method */
 static actor_method_class l_daObjWaterEff_Method = {
     (process_method_func)daObjWaterEff_Create,
     (process_method_func)daObjWaterEff_Delete,
@@ -102,7 +91,6 @@ static actor_method_class l_daObjWaterEff_Method = {
     (process_method_func)NULL,
 };
 
-/* 80C5C8C0-80C5C8F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WaterEff */
 extern actor_process_profile_definition g_profile_Obj_WaterEff = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
index 220bd87641..f575131af7 100644
--- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
+++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
@@ -12,26 +12,22 @@
 
 class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c();
-    /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {}
+    dalv4CandleDemoTag_HIO_c();
+    virtual ~dalv4CandleDemoTag_HIO_c() {}
 
     void genMessage(JORMContext*);
 
     /* 0x4 */ s16 mEnemyWaitTime;
 };
 
-/* 80C5C9EC-80C5CA10 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__24dalv4CandleDemoTag_HIO_cFv
- */
 dalv4CandleDemoTag_HIO_c::dalv4CandleDemoTag_HIO_c() {
     mEnemyWaitTime = 60;
 }
 
-/* 80C5CA58-80C5CA90 000158 0038+00 2/2 0/0 0/0 .text setBaseMtx__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
 }
 
-/* 80C5CA90-80C5CBA4 000190 0114+00 1/1 0/0 0/0 .text            create__20dalv4CandleDemoTag_cFv */
 int dalv4CandleDemoTag_c::create() {
     fopAcM_ct(this, dalv4CandleDemoTag_c);
 
@@ -56,8 +52,6 @@ int dalv4CandleDemoTag_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C5CBA4-80C5CBE8 0002A4 0044+00 1/1 0/0 0/0 .text            Execute__20dalv4CandleDemoTag_cFv
- */
 int dalv4CandleDemoTag_c::Execute() {
     eventUpdate();
     procMain();
@@ -65,11 +59,8 @@ int dalv4CandleDemoTag_c::Execute() {
     return 1;
 }
 
-/* 80C5D354-80C5D35C 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static dalv4CandleDemoTag_HIO_c l_HIO;
 
-/* 80C5CBE8-80C5CCA4 0002E8 00BC+00 1/1 0/0 0/0 .text            procMain__20dalv4CandleDemoTag_cFv
- */
 void dalv4CandleDemoTag_c::procMain() {
     static dalv4CandleDemoTag_c::procFunc mode_proc[4] = {
         &dalv4CandleDemoTag_c::modeWatch,
@@ -81,14 +72,11 @@ void dalv4CandleDemoTag_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C5CCA4-80C5CCC0 0003A4 001C+00 2/2 0/0 0/0 .text init_modeWatch__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::init_modeWatch() {
     mEnemyWaitTime = l_HIO.mEnemyWaitTime;
     mMode = 0;
 }
 
-/* 80C5CCC0-80C5CDC0 0003C0 0100+00 1/0 0/0 0/0 .text            modeWatch__20dalv4CandleDemoTag_cFv
- */
 void dalv4CandleDemoTag_c::modeWatch() {
     mpShutterActor = (daLv4EdShutter_c*)fopAcM_Search(searchShutterAct, this);
 
@@ -116,8 +104,6 @@ void dalv4CandleDemoTag_c::modeWatch() {
     }
 }
 
-/* 80C5CDC0-80C5CE70 0004C0 00B0+00 1/1 0/0 0/0 .text
- * init_modeEnemyCreate__20dalv4CandleDemoTag_cFv               */
 void dalv4CandleDemoTag_c::init_modeEnemyCreate() {
     dPath* path_p = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
 
@@ -135,19 +121,16 @@ void dalv4CandleDemoTag_c::init_modeEnemyCreate() {
     mMode = 1;
 }
 
-/* 80C5CE70-80C5CEB4 000570 0044+00 1/0 0/0 0/0 .text modeEnemyCreate__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::modeEnemyCreate() {
     if (fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) {
         init_modeNG();
     }
 }
 
-/* 80C5CEB4-80C5CEC0 0005B4 000C+00 1/1 0/0 0/0 .text init_modeNG__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::init_modeNG() {
     mMode = 2;
 }
 
-/* 80C5CEC0-80C5CF34 0005C0 0074+00 1/0 0/0 0/0 .text            modeNG__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::modeNG() {
     if (!fopAcM_myRoomSearchEnemy(fopAcM_GetRoomNo(this))) {
         fopAcM_onSwitch(this, mSwDest);
@@ -156,25 +139,19 @@ void dalv4CandleDemoTag_c::modeNG() {
     }
 }
 
-/* 80C5CF34-80C5CF40 000634 000C+00 2/2 0/0 0/0 .text init_modeEnd__20dalv4CandleDemoTag_cFv */
 void dalv4CandleDemoTag_c::init_modeEnd() {
     mMode = 3;
 }
 
-/* 80C5CF40-80C5CF78 000640 0038+00 1/0 0/0 0/0 .text            modeEnd__20dalv4CandleDemoTag_cFv
- */
 void dalv4CandleDemoTag_c::modeEnd() {
     fopAcM_offSwitch(this, mSwNG);
 }
 
-/* 80C5CF78-80C5CF9C 000678 0024+00 2/1 0/0 0/0 .text eventStart__20dalv4CandleDemoTag_cFv */
 bool dalv4CandleDemoTag_c::eventStart() {
     init_modeEnemyCreate();
     return true;
 }
 
-/* 80C5CF9C-80C5CFEC 00069C 0050+00 1/1 0/0 0/0 .text
- * searchShutterAct__20dalv4CandleDemoTag_cFPvPv                */
 void* dalv4CandleDemoTag_c::searchShutterAct(void* param_0, void* param_1) {
     if (param_0 != NULL && fopAcM_IsActor(param_0) &&
         fopAcM_GetProfName(param_0) == PROC_Obj_Lv4EdShutter)
@@ -185,40 +162,30 @@ void* dalv4CandleDemoTag_c::searchShutterAct(void* param_0, void* param_1) {
     return NULL;
 }
 
-/* 80C5CFEC-80C5CFF4 0006EC 0008+00 1/1 0/0 0/0 .text            Draw__20dalv4CandleDemoTag_cFv */
 int dalv4CandleDemoTag_c::Draw() {
     return 1;
 }
 
-/* 80C5CFF4-80C5CFFC 0006F4 0008+00 1/1 0/0 0/0 .text            Delete__20dalv4CandleDemoTag_cFv */
 int dalv4CandleDemoTag_c::Delete() {
     return 1;
 }
 
-/* 80C5CFFC-80C5D01C 0006FC 0020+00 1/0 0/0 0/0 .text
- * dalv4CandleDemoTag_Draw__FP20dalv4CandleDemoTag_c            */
 static int dalv4CandleDemoTag_Draw(dalv4CandleDemoTag_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C5D01C-80C5D03C 00071C 0020+00 1/0 0/0 0/0 .text
- * dalv4CandleDemoTag_Execute__FP20dalv4CandleDemoTag_c         */
 static int dalv4CandleDemoTag_Execute(dalv4CandleDemoTag_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C5D03C-80C5D05C 00073C 0020+00 1/0 0/0 0/0 .text
- * dalv4CandleDemoTag_Delete__FP20dalv4CandleDemoTag_c          */
 static int dalv4CandleDemoTag_Delete(dalv4CandleDemoTag_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C5D05C-80C5D07C 00075C 0020+00 1/0 0/0 0/0 .text dalv4CandleDemoTag_Create__FP10fopAc_ac_c */
 static int dalv4CandleDemoTag_Create(fopAc_ac_c* i_this) {
     return static_cast<dalv4CandleDemoTag_c*>(i_this)->create();
 }
 
-/* 80C5D298-80C5D2B8 -00001 0020+00 1/0 0/0 0/0 .data            l_dalv4CandleDemoTag_Method */
 static actor_method_class l_dalv4CandleDemoTag_Method = {
     (process_method_func)dalv4CandleDemoTag_Create,
     (process_method_func)dalv4CandleDemoTag_Delete,
@@ -227,7 +194,6 @@ static actor_method_class l_dalv4CandleDemoTag_Method = {
     (process_method_func)dalv4CandleDemoTag_Draw,
 };
 
-/* 80C5D2B8-80C5D2E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv4CandleDm */
 extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm = {
   fpcLy_CURRENT_e,              // mLayerID
   7,                            // mListID
diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp
index 10f87a433b..341038d975 100644
--- a/src/d/actor/d_a_obj_lv4CandleTag.cpp
+++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp
@@ -4,25 +4,22 @@
 
 class dalv4CandleTag_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5D44C */ dalv4CandleTag_HIO_c();
-    /* 80C5D9C0 */ virtual ~dalv4CandleTag_HIO_c() {}
+    dalv4CandleTag_HIO_c();
+    virtual ~dalv4CandleTag_HIO_c() {}
 
     void genMessage(JORMContext*);
 
     /* 0x4 */ u8 mTimer;
 };
 
-/* 80C5D44C-80C5D470 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__20dalv4CandleTag_HIO_cFv */
 dalv4CandleTag_HIO_c::dalv4CandleTag_HIO_c() {
     mTimer = 60;
 }
 
-/* 80C5D4B8-80C5D4F0 000158 0038+00 2/2 0/0 0/0 .text            setBaseMtx__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
 }
 
-/* 80C5D4F0-80C5D5D4 000190 00E4+00 1/1 0/0 0/0 .text            create__16dalv4CandleTag_cFv */
 int dalv4CandleTag_c::create() {
     fopAcM_ct(this, dalv4CandleTag_c);
 
@@ -42,7 +39,6 @@ int dalv4CandleTag_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C5D5D4-80C5D618 000274 0044+00 1/1 0/0 0/0 .text            Execute__16dalv4CandleTag_cFv */
 int dalv4CandleTag_c::Execute() {
     eventUpdate();
     procMain();
@@ -50,10 +46,8 @@ int dalv4CandleTag_c::Execute() {
     return 1;
 }
 
-/* 80C5DCA4-80C5DCAC 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static dalv4CandleTag_HIO_c l_HIO;
 
-/* 80C5D618-80C5D6D4 0002B8 00BC+00 1/1 0/0 0/0 .text            procMain__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::procMain() {
     static void (dalv4CandleTag_c::*mode_proc[])() = {
         &dalv4CandleTag_c::modeWatch,
@@ -65,12 +59,10 @@ void dalv4CandleTag_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C5D6D4-80C5D6E0 000374 000C+00 2/2 0/0 0/0 .text init_modeWatch__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::init_modeWatch() {
     mMode = 0;
 }
 
-/* 80C5D6E0-80C5D78C 000380 00AC+00 1/0 0/0 0/0 .text            modeWatch__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::modeWatch() {
     if (fopAcM_isSwitch(this, mSwOK)) {
         init_modeEnd();
@@ -83,15 +75,12 @@ void dalv4CandleTag_c::modeWatch() {
     }
 }
 
-/* 80C5D78C-80C5D814 00042C 0088+00 1/1 0/0 0/0 .text            init_modeNG__16dalv4CandleTag_cFv
- */
 void dalv4CandleTag_c::init_modeNG() {
     mTimer = l_HIO.mTimer;
     mDoAud_seStart(Z2SE_OBJ_LV4_CNDL_MISS, NULL, 0, 0);
     mMode = 1;
 }
 
-/* 80C5D814-80C5D8A0 0004B4 008C+00 1/0 0/0 0/0 .text            modeNG__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::modeNG() {
     if (mTimer != 0) {
         mTimer--;
@@ -106,66 +95,51 @@ void dalv4CandleTag_c::modeNG() {
     }
 }
 
-/* 80C5D8A0-80C5D8AC 000540 000C+00 1/1 0/0 0/0 .text init_modeNGWait__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::init_modeNGWait() {
     mMode = 2;
 }
 
-/* 80C5D8AC-80C5D8FC 00054C 0050+00 1/0 0/0 0/0 .text            modeNGWait__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::modeNGWait() {
     if (!fopAcM_isSwitch(this, mSwNG)) {
         init_modeWatch();
     }
 }
 
-/* 80C5D8FC-80C5D908 00059C 000C+00 2/2 0/0 0/0 .text            init_modeEnd__16dalv4CandleTag_cFv
- */
 void dalv4CandleTag_c::init_modeEnd() {
     mMode = 3;
 }
 
-/* 80C5D908-80C5D90C 0005A8 0004+00 1/0 0/0 0/0 .text            modeEnd__16dalv4CandleTag_cFv */
 void dalv4CandleTag_c::modeEnd() {}
 
-/* 80C5D90C-80C5D930 0005AC 0024+00 2/1 0/0 0/0 .text            eventStart__16dalv4CandleTag_cFv */
 bool dalv4CandleTag_c::eventStart() {
     init_modeNG();
     return true;
 }
 
-/* 80C5D930-80C5D938 0005D0 0008+00 1/1 0/0 0/0 .text            Draw__16dalv4CandleTag_cFv */
 int dalv4CandleTag_c::Draw() {
     return 1;
 }
 
-/* 80C5D938-80C5D940 0005D8 0008+00 1/1 0/0 0/0 .text            Delete__16dalv4CandleTag_cFv */
 int dalv4CandleTag_c::Delete() {
     return 1;
 }
 
-/* 80C5D940-80C5D960 0005E0 0020+00 1/0 0/0 0/0 .text dalv4CandleTag_Draw__FP16dalv4CandleTag_c */
 static int dalv4CandleTag_Draw(dalv4CandleTag_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C5D960-80C5D980 000600 0020+00 1/0 0/0 0/0 .text dalv4CandleTag_Execute__FP16dalv4CandleTag_c
- */
 static int dalv4CandleTag_Execute(dalv4CandleTag_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80C5D980-80C5D9A0 000620 0020+00 1/0 0/0 0/0 .text dalv4CandleTag_Delete__FP16dalv4CandleTag_c
- */
 static int dalv4CandleTag_Delete(dalv4CandleTag_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80C5D9A0-80C5D9C0 000640 0020+00 1/0 0/0 0/0 .text dalv4CandleTag_Create__FP10fopAc_ac_c */
 static int dalv4CandleTag_Create(fopAc_ac_c* i_this) {
     return ((dalv4CandleTag_c*)i_this)->create();
 }
 
-/* 80C5DBE4-80C5DC04 -00001 0020+00 1/0 0/0 0/0 .data            l_dalv4CandleTag_Method */
 static actor_method_class l_dalv4CandleTag_Method = {
     (process_method_func)dalv4CandleTag_Create,
     (process_method_func)dalv4CandleTag_Delete,
@@ -174,7 +148,6 @@ static actor_method_class l_dalv4CandleTag_Method = {
     (process_method_func)dalv4CandleTag_Draw,
 };
 
-/* 80C5DC04-80C5DC34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv4Candle */
 extern actor_process_profile_definition g_profile_Tag_Lv4Candle = {
     fpcLy_CURRENT_e,              // mLayerID
     7,                            // mListID
diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp
index 88acd5fbe7..389e2960c9 100644
--- a/src/d/actor/d_a_obj_lv4EdShutter.cpp
+++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp
@@ -9,8 +9,8 @@
 
 class daLv4EdShutter_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C5DDAC */ daLv4EdShutter_HIO_c();
-    /* 80C5E72C */ virtual ~daLv4EdShutter_HIO_c() {}
+    daLv4EdShutter_HIO_c();
+    virtual ~daLv4EdShutter_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -20,7 +20,6 @@ public:
     /* 0x0E */ u8 field_0xe;
 };
 
-/* 80C5DDAC-80C5DDF0 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__20daLv4EdShutter_HIO_cFv */
 daLv4EdShutter_HIO_c::daLv4EdShutter_HIO_c() {
     close_max_speed = 80.0f;
     open_speed_max = 40.0f;
@@ -28,7 +27,6 @@ daLv4EdShutter_HIO_c::daLv4EdShutter_HIO_c() {
     field_0xe = 4;
 }
 
-/* 80C5DE38-80C5DEC8 000178 0090+00 2/2 0/0 0/0 .text            setBaseMtx__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mMovePos, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, 0);
@@ -36,7 +34,6 @@ void daLv4EdShutter_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C5DEC8-80C5DF34 000208 006C+00 1/0 0/0 0/0 .text            CreateHeap__16daLv4EdShutter_cFv */
 int daLv4EdShutter_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_AShtr", 4);
     JUT_ASSERT(165, modelData != NULL);
@@ -48,7 +45,6 @@ int daLv4EdShutter_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5DF34-80C5E0A4 000274 0170+00 1/1 0/0 0/0 .text            create__16daLv4EdShutter_cFv */
 int daLv4EdShutter_c::create() {
     fopAcM_ct(this, daLv4EdShutter_c);
 
@@ -79,7 +75,6 @@ int daLv4EdShutter_c::create() {
     return phase_state;
 }
 
-/* 80C5E0A4-80C5E0F4 0003E4 0050+00 1/0 0/0 0/0 .text Execute__16daLv4EdShutter_cFPPA3_A4_f */
 int daLv4EdShutter_c::Execute(Mtx** param_0) {
     move();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -87,10 +82,8 @@ int daLv4EdShutter_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C5EA64-80C5EA74 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daLv4EdShutter_HIO_c l_HIO;
 
-/* 80C5E0F4-80C5E1B0 000434 00BC+00 1/1 0/0 0/0 .text            move__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::move() {
     static void (daLv4EdShutter_c::*mode_proc[])() = {
         &daLv4EdShutter_c::modeWait,
@@ -102,14 +95,11 @@ void daLv4EdShutter_c::move() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C5E1B0-80C5E1C8 0004F0 0018+00 3/3 0/0 0/0 .text            init_modeWait__16daLv4EdShutter_cFv
- */
 void daLv4EdShutter_c::init_modeWait() {
     mWaitTimer = getWaitTime();
     mMode = 0;
 }
 
-/* 80C5E1C8-80C5E2E0 000508 0118+00 1/0 0/0 0/0 .text            modeWait__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::modeWait() {
     if (mStatus == 0) {
         if (fopAcM_isSwitch(this, mCloseSw)) {
@@ -136,8 +126,6 @@ void daLv4EdShutter_c::modeWait() {
     }
 }
 
-/* 80C5E2E0-80C5E394 000620 00B4+00 1/1 0/0 0/0 .text            init_modeOpen__16daLv4EdShutter_cFv
- */
 void daLv4EdShutter_c::init_modeOpen() {
     mMoveSpeed = l_HIO.open_speed_max;
 
@@ -147,7 +135,6 @@ void daLv4EdShutter_c::init_modeOpen() {
     mMode = 1;
 }
 
-/* 80C5E394-80C5E464 0006D4 00D0+00 1/0 0/0 0/0 .text            modeOpen__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::modeOpen() {
     f32 remaining = cLib_addCalc(&mMovePos, -300.0f, 0.3f, mMoveSpeed, 5.0f);
     if (remaining == 0.0f) {
@@ -163,7 +150,6 @@ void daLv4EdShutter_c::modeOpen() {
     }
 }
 
-/* 80C5E464-80C5E518 0007A4 00B4+00 1/1 0/0 0/0 .text init_modeClose__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::init_modeClose() {
     mMoveSpeed = l_HIO.close_max_speed;
 
@@ -173,7 +159,6 @@ void daLv4EdShutter_c::init_modeClose() {
     mMode = 2;
 }
 
-/* 80C5E518-80C5E584 000858 006C+00 1/0 0/0 0/0 .text            modeClose__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::modeClose() {
     f32 remaining = cLib_addCalc(&mMovePos, 0.0f, 0.3f, mMoveSpeed, 5.0f);
     if (remaining == 0.0f) {
@@ -182,16 +167,12 @@ void daLv4EdShutter_c::modeClose() {
     }
 }
 
-/* 80C5E584-80C5E590 0008C4 000C+00 2/2 0/0 0/0 .text            init_modeEnd__16daLv4EdShutter_cFv
- */
 void daLv4EdShutter_c::init_modeEnd() {
     mMode = 3;
 }
 
-/* 80C5E590-80C5E594 0008D0 0004+00 1/0 0/0 0/0 .text            modeEnd__16daLv4EdShutter_cFv */
 void daLv4EdShutter_c::modeEnd() {}
 
-/* 80C5E594-80C5E5CC 0008D4 0038+00 2/1 0/0 0/0 .text            eventStart__16daLv4EdShutter_cFv */
 bool daLv4EdShutter_c::eventStart() {
     if (mStatus == 0) {
         init_modeClose();
@@ -202,7 +183,6 @@ bool daLv4EdShutter_c::eventStart() {
     return true;
 }
 
-/* 80C5E5CC-80C5E670 00090C 00A4+00 1/0 0/0 0/0 .text            Draw__16daLv4EdShutter_cFv */
 int daLv4EdShutter_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -213,35 +193,27 @@ int daLv4EdShutter_c::Draw() {
     return 1;
 }
 
-/* 80C5E670-80C5E6A0 0009B0 0030+00 1/0 0/0 0/0 .text            Delete__16daLv4EdShutter_cFv */
 int daLv4EdShutter_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_AShtr");
     return 1;
 }
 
-/* 80C5E6A0-80C5E6CC 0009E0 002C+00 1/0 0/0 0/0 .text daLv4EdShutter_Draw__FP16daLv4EdShutter_c */
 static int daLv4EdShutter_Draw(daLv4EdShutter_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5E6CC-80C5E6EC 000A0C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Execute__FP16daLv4EdShutter_c
- */
 static int daLv4EdShutter_Execute(daLv4EdShutter_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5E6EC-80C5E70C 000A2C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Delete__FP16daLv4EdShutter_c
- */
 static int daLv4EdShutter_Delete(daLv4EdShutter_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C5E70C-80C5E72C 000A4C 0020+00 1/0 0/0 0/0 .text daLv4EdShutter_Create__FP10fopAc_ac_c */
 static int daLv4EdShutter_Create(fopAc_ac_c* i_this) {
     return ((daLv4EdShutter_c*)i_this)->create();
 }
 
-/* 80C5E984-80C5E9A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv4EdShutter_Method */
 static actor_method_class l_daLv4EdShutter_Method = {
     (process_method_func)daLv4EdShutter_Create,
     (process_method_func)daLv4EdShutter_Delete,
@@ -250,7 +222,6 @@ static actor_method_class l_daLv4EdShutter_Method = {
     (process_method_func)daLv4EdShutter_Draw,
 };
 
-/* 80C5E9A4-80C5E9D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4EdShutter */
 extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp
index 1336cb301f..c5424c2882 100644
--- a/src/d/actor/d_a_obj_lv4Gate.cpp
+++ b/src/d/actor/d_a_obj_lv4Gate.cpp
@@ -9,16 +9,13 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C5F52C-80C5F538 000014 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daLv4Gate_HIO_c l_HIO;
 
-/* 80C5EB6C-80C5EB9C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__15daLv4Gate_HIO_cFv */
 daLv4Gate_HIO_c::daLv4Gate_HIO_c() {
     mMoveSpeed = 2.0f;
     mShockStrength = 3;
 }
 
-/* 80C5EBE4-80C5EC80 000164 009C+00 2/2 0/0 0/0 .text            setBaseMtx__11daLv4Gate_cFv */
 void daLv4Gate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -28,7 +25,6 @@ void daLv4Gate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C5EC80-80C5ECEC 000200 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daLv4Gate_cFv */
 int daLv4Gate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4Gate", 4);
 
@@ -40,7 +36,6 @@ int daLv4Gate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5ECEC-80C5EE54 00026C 0168+00 1/1 0/0 0/0 .text            create__11daLv4Gate_cFv */
 int daLv4Gate_c::create() {
     fopAcM_ct(this, daLv4Gate_c);
 
@@ -82,7 +77,6 @@ int daLv4Gate_c::create() {
     return phase;
 }
 
-/* 80C5EE54-80C5EEA4 0003D4 0050+00 1/0 0/0 0/0 .text            Execute__11daLv4Gate_cFPPA3_A4_f */
 int daLv4Gate_c::Execute(Mtx** i_mtxP) {
     moveGate();
     *i_mtxP = &mpModel->getBaseTRMtx();
@@ -91,7 +85,6 @@ int daLv4Gate_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80C5EEA4-80C5EF48 000424 00A4+00 1/1 0/0 0/0 .text            moveGate__11daLv4Gate_cFv */
 void daLv4Gate_c::moveGate() {
     typedef void (daLv4Gate_c::*modeFunc)();
     static modeFunc mode_proc[] = {&daLv4Gate_c::modeWait, &daLv4Gate_c::modeMove,
@@ -100,12 +93,10 @@ void daLv4Gate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C5EF48-80C5EF54 0004C8 000C+00 1/1 0/0 0/0 .text            init_modeWait__11daLv4Gate_cFv */
 void daLv4Gate_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80C5EF54-80C5EFB0 0004D4 005C+00 1/0 0/0 0/0 .text            modeWait__11daLv4Gate_cFv */
 void daLv4Gate_c::modeWait() {
     mInitMove = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
     if (mInitMove) {
@@ -113,12 +104,10 @@ void daLv4Gate_c::modeWait() {
     }
 }
 
-/* 80C5EFB0-80C5EFBC 000530 000C+00 1/1 0/0 0/0 .text            init_modeMove__11daLv4Gate_cFv */
 void daLv4Gate_c::init_modeMove() {
     mMode = MODE_MOVE_e;
 }
 
-/* 80C5EFBC-80C5F0C4 00053C 0108+00 1/0 0/0 0/0 .text            modeMove__11daLv4Gate_cFv */
 void daLv4Gate_c::modeMove() {
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
 
@@ -134,8 +123,6 @@ void daLv4Gate_c::modeMove() {
     }
 }
 
-/* 80C5F0C4-80C5F1E4 000644 0120+00 2/2 0/0 0/0 .text            init_modeMoveEnd__11daLv4Gate_cFv
- */
 void daLv4Gate_c::init_modeMoveEnd() {
     if (!mGateOpened) {
         mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -153,10 +140,8 @@ void daLv4Gate_c::init_modeMoveEnd() {
     mMode = MODE_MOVE_END_e;
 }
 
-/* 80C5F1E4-80C5F1E8 000764 0004+00 1/0 0/0 0/0 .text            modeMoveEnd__11daLv4Gate_cFv */
 void daLv4Gate_c::modeMoveEnd() {}
 
-/* 80C5F1E8-80C5F28C 000768 00A4+00 1/0 0/0 0/0 .text            Draw__11daLv4Gate_cFv */
 int daLv4Gate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -167,42 +152,33 @@ int daLv4Gate_c::Draw() {
     return 1;
 }
 
-/* 80C5F28C-80C5F2BC 00080C 0030+00 1/0 0/0 0/0 .text            Delete__11daLv4Gate_cFv */
 int daLv4Gate_c::Delete() {
     dComIfG_resDelete(&mPhase, "L4Gate");
     return 1;
 }
 
-/* 80C5F2BC-80C5F2E8 00083C 002C+00 1/0 0/0 0/0 .text            daLv4Gate_Draw__FP11daLv4Gate_c */
 static int daLv4Gate_Draw(daLv4Gate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5F2E8-80C5F308 000868 0020+00 1/0 0/0 0/0 .text            daLv4Gate_Execute__FP11daLv4Gate_c
- */
 static int daLv4Gate_Execute(daLv4Gate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5F308-80C5F328 000888 0020+00 1/0 0/0 0/0 .text            daLv4Gate_Delete__FP11daLv4Gate_c
- */
 static int daLv4Gate_Delete(daLv4Gate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C5F328-80C5F348 0008A8 0020+00 1/0 0/0 0/0 .text            daLv4Gate_Create__FP10fopAc_ac_c */
 static int daLv4Gate_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv4Gate_c*>(i_this)->create();
 }
 
-/* 80C5F484-80C5F4A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv4Gate_Method */
 static actor_method_class l_daLv4Gate_Method = {
     (process_method_func)daLv4Gate_Create,  (process_method_func)daLv4Gate_Delete,
     (process_method_func)daLv4Gate_Execute, (process_method_func)NULL,
     (process_method_func)daLv4Gate_Draw,
 };
 
-/* 80C5F4A4-80C5F4D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Gate */
 extern actor_process_profile_definition g_profile_Obj_Lv4Gate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp
index c2855a1fce..1534cd5175 100644
--- a/src/d/actor/d_a_obj_lv4HsTarget.cpp
+++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C5F62C-80C5F648 0000EC 001C+00 1/1 0/0 0/0 .text            __ct__19daLv4HsTarget_HIO_cFv */
 daLv4HsTarget_HIO_c::daLv4HsTarget_HIO_c() {}
 
-/* 80C5F690-80C5F718 000150 0088+00 1/1 0/0 0/0 .text            setBaseMtx__15daLv4HsTarget_cFv */
 void daLv4HsTarget_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -21,7 +19,6 @@ void daLv4HsTarget_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C5F718-80C5F784 0001D8 006C+00 1/0 0/0 0/0 .text            CreateHeap__15daLv4HsTarget_cFv */
 int daLv4HsTarget_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4HsMato", 4);
 
@@ -33,7 +30,6 @@ int daLv4HsTarget_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5F784-80C5F85C 000244 00D8+00 1/1 0/0 0/0 .text            create__15daLv4HsTarget_cFv */
 int daLv4HsTarget_c::create() {
     fopAcM_ct(this, daLv4HsTarget_c);
 
@@ -52,13 +48,11 @@ int daLv4HsTarget_c::create() {
     return phase;
 }
 
-/* 80C5F85C-80C5F870 00031C 0014+00 1/0 0/0 0/0 .text Execute__15daLv4HsTarget_cFPPA3_A4_f */
 int daLv4HsTarget_c::Execute(Mtx** param_0) {
     *param_0 = &mpModel->getBaseTRMtx();
     return 1;
 }
 
-/* 80C5F870-80C5F8D4 000330 0064+00 1/0 0/0 0/0 .text            Draw__15daLv4HsTarget_cFv */
 int daLv4HsTarget_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -67,45 +61,35 @@ int daLv4HsTarget_c::Draw() {
     return 1;
 }
 
-/* 80C5F8D4-80C5F904 000394 0030+00 1/0 0/0 0/0 .text            Delete__15daLv4HsTarget_cFv */
 int daLv4HsTarget_c::Delete() {
     dComIfG_resDelete(&mPhase, "L4HsMato");
     return 1;
 }
 
-/* 80C5F904-80C5F930 0003C4 002C+00 1/0 0/0 0/0 .text daLv4HsTarget_Draw__FP15daLv4HsTarget_c */
 static int daLv4HsTarget_Draw(daLv4HsTarget_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C5F930-80C5F950 0003F0 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Execute__FP15daLv4HsTarget_c
- */
 static int daLv4HsTarget_Execute(daLv4HsTarget_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C5F950-80C5F970 000410 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Delete__FP15daLv4HsTarget_c */
 static int daLv4HsTarget_Delete(daLv4HsTarget_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C5F970-80C5F990 000430 0020+00 1/0 0/0 0/0 .text daLv4HsTarget_Create__FP10fopAc_ac_c */
 static int daLv4HsTarget_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv4HsTarget_c*>(i_this)->create();
 }
 
-/* 80C5FAEC-80C5FAF0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daLv4HsTarget_HIO_c l_HIO;
 
-/* ############################################################################################## */
-/* 80C5FA48-80C5FA68 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv4HsTarget_Method */
 static actor_method_class l_daLv4HsTarget_Method = {
     (process_method_func)daLv4HsTarget_Create,  (process_method_func)daLv4HsTarget_Delete,
     (process_method_func)daLv4HsTarget_Execute, (process_method_func)NULL,
     (process_method_func)daLv4HsTarget_Draw,
 };
 
-/* 80C5FA68-80C5FA98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4HsTarget */
 extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp
index 2f8bb36ad7..ba99c61da9 100644
--- a/src/d/actor/d_a_obj_lv4PoGate.cpp
+++ b/src/d/actor/d_a_obj_lv4PoGate.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C5FBEC-80C5FC5C 0000EC 0070+00 1/1 0/0 0/0 .text            __ct__17daLv4PoGate_HIO_cFv */
 daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() {
     mOpenSpeed = 10.0f;
     mCloseStep1Speed = 10.0f;
@@ -23,7 +22,6 @@ daLv4PoGate_HIO_c::daLv4PoGate_HIO_c() {
     mShockStrength = 3;
 }
 
-/* 80C5FCA4-80C5FD40 0001A4 009C+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv4PoGate_cFv */
 void daLv4PoGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -33,7 +31,6 @@ void daLv4PoGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C5FD40-80C5FDAC 000240 006C+00 1/0 0/0 0/0 .text            CreateHeap__13daLv4PoGate_cFv */
 int daLv4PoGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4R02Gate", 4);
 
@@ -45,7 +42,6 @@ int daLv4PoGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C5FDAC-80C5FEDC 0002AC 0130+00 1/1 0/0 0/0 .text            create__13daLv4PoGate_cFv */
 int daLv4PoGate_c::create() {
     fopAcM_ct(this, daLv4PoGate_c);
 
@@ -76,8 +72,6 @@ int daLv4PoGate_c::create() {
     return phase;
 }
 
-/* 80C5FEDC-80C5FF2C 0003DC 0050+00 1/0 0/0 0/0 .text            Execute__13daLv4PoGate_cFPPA3_A4_f
- */
 int daLv4PoGate_c::Execute(Mtx** param_0) {
     moveGate();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -86,10 +80,8 @@ int daLv4PoGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C609C4-80C609EC 000014 0028+00 9/9 0/0 0/0 .bss             l_HIO */
 static daLv4PoGate_HIO_c l_HIO;
 
-/* 80C5FF2C-80C60090 00042C 0164+00 1/1 0/0 0/0 .text            moveGate__13daLv4PoGate_cFv */
 void daLv4PoGate_c::moveGate() {
     typedef void (daLv4PoGate_c::*modeFunc)();
     static modeFunc mode_proc[] = {
@@ -113,15 +105,12 @@ void daLv4PoGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C60090-80C6009C 000590 000C+00 3/3 0/0 0/0 .text            init_modeWait__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80C6009C-80C600A0 00059C 0004+00 1/0 0/0 0/0 .text            modeWait__13daLv4PoGate_cFv */
 void daLv4PoGate_c::modeWait() {}
 
-/* 80C600A0-80C60150 0005A0 00B0+00 1/1 0/0 0/0 .text init_modeMoveOpen__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeMoveOpen() {
     cXyz sound_pos(current.pos);
     sound_pos.y = home.pos.y;
@@ -131,7 +120,6 @@ void daLv4PoGate_c::init_modeMoveOpen() {
     mMode = MODE_MOVE_OPEN_e;
 }
 
-/* 80C60150-80C60200 000650 00B0+00 1/0 0/0 0/0 .text            modeMoveOpen__13daLv4PoGate_cFv */
 void daLv4PoGate_c::modeMoveOpen() {
     if (cLib_addCalc(&mMoveValue, mMoveTarget, 0.5f, l_HIO.mOpenSpeed, 0.5f) == 0.0f) {
         mDoAud_seStart(Z2SE_READ_RIDDLE_A, NULL, 0, 0);
@@ -140,7 +128,6 @@ void daLv4PoGate_c::modeMoveOpen() {
     }
 }
 
-/* 80C60200-80C602B0 000700 00B0+00 1/1 0/0 0/0 .text init_modeMoveClose__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeMoveClose() {
     cXyz sound_pos(current.pos);
     sound_pos.y = home.pos.y;
@@ -150,7 +137,6 @@ void daLv4PoGate_c::init_modeMoveClose() {
     mMode = MODE_MOVE_CLOSE_e;
 }
 
-/* 80C602B0-80C6031C 0007B0 006C+00 1/0 0/0 0/0 .text            modeMoveClose__13daLv4PoGate_cFv */
 void daLv4PoGate_c::modeMoveClose() {
     if (cLib_addCalc(&mMoveValue, l_HIO.mCloseStep1Amount, 0.5f, l_HIO.mCloseStep1Speed, 0.1f) ==
         0.0f)
@@ -159,13 +145,11 @@ void daLv4PoGate_c::modeMoveClose() {
     }
 }
 
-/* 80C6031C-80C60338 00081C 001C+00 1/1 0/0 0/0 .text init_modeMoveCloseWait__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeMoveCloseWait() {
     mCloseWaitTime = l_HIO.mCloseStep1Wait;
     mMode = MODE_MOVE_CLOSE_WAIT_e;
 }
 
-/* 80C60338-80C60370 000838 0038+00 1/0 0/0 0/0 .text modeMoveCloseWait__13daLv4PoGate_cFv */
 void daLv4PoGate_c::modeMoveCloseWait() {
     if (mCloseWaitTime != 0) {
         mCloseWaitTime--;
@@ -174,13 +158,10 @@ void daLv4PoGate_c::modeMoveCloseWait() {
     }
 }
 
-/* 80C60370-80C6037C 000870 000C+00 1/1 0/0 0/0 .text init_modeMoveClose2__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeMoveClose2() {
     mMode = MODE_MOVE_CLOSE2_e;
 }
 
-/* 80C6037C-80C603E0 00087C 0064+00 1/0 0/0 0/0 .text            modeMoveClose2__13daLv4PoGate_cFv
- */
 void daLv4PoGate_c::modeMoveClose2() {
     if (cLib_addCalc(&mMoveValue, l_HIO.mCloseStep2Amount, 0.5f, l_HIO.mCloseStep2Speed, 0.5f) ==
         0.0f)
@@ -189,14 +170,11 @@ void daLv4PoGate_c::modeMoveClose2() {
     }
 }
 
-/* 80C603E0-80C603FC 0008E0 001C+00 1/1 0/0 0/0 .text init_modeMoveClose2Wait__13daLv4PoGate_cFv
- */
 void daLv4PoGate_c::init_modeMoveClose2Wait() {
     mCloseWaitTime = l_HIO.mCloseStep2Wait;
     mMode = MODE_MOVE_CLOSE2_WAIT_e;
 }
 
-/* 80C603FC-80C60434 0008FC 0038+00 1/0 0/0 0/0 .text modeMoveClose2Wait__13daLv4PoGate_cFv */
 void daLv4PoGate_c::modeMoveClose2Wait() {
     if (mCloseWaitTime != 0) {
         mCloseWaitTime--;
@@ -205,14 +183,11 @@ void daLv4PoGate_c::modeMoveClose2Wait() {
     }
 }
 
-/* 80C60434-80C60450 000934 001C+00 1/1 0/0 0/0 .text init_modeMoveClose3__13daLv4PoGate_cFv */
 void daLv4PoGate_c::init_modeMoveClose3() {
     fopAcM_SetSpeedF(this, l_HIO.mCloseStep3Speed);
     mMode = MODE_MOVE_CLOSE3_e;
 }
 
-/* 80C60450-80C604D8 000950 0088+00 1/0 0/0 0/0 .text            modeMoveClose3__13daLv4PoGate_cFv
- */
 void daLv4PoGate_c::modeMoveClose3() {
     cLib_chaseF(&speedF, l_HIO.mCloseStep3Max, l_HIO.mCloseStep3Max / 30.0f);
 
@@ -222,12 +197,10 @@ void daLv4PoGate_c::modeMoveClose3() {
     }
 }
 
-/* 80C604D8-80C60534 0009D8 005C+00 2/2 0/0 0/0 .text            setSe__13daLv4PoGate_cFv */
 void daLv4PoGate_c::setSe() {
     dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 15, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80C60534-80C605F8 000A34 00C4+00 2/2 0/0 0/0 .text            setEffect__13daLv4PoGate_cFi */
 void daLv4PoGate_c::setEffect(int param_0) {
     static u16 const particle_id[] = {0x88C9, 0x88CA, 0x88CB, 0x88CC, 0x88CD,
                                       0x88CE, 0x88CF, 0x88D0, 0x88D1, 0x88D2};
@@ -249,7 +222,6 @@ void daLv4PoGate_c::setEffect(int param_0) {
     }
 }
 
-/* 80C605F8-80C6069C 000AF8 00A4+00 1/0 0/0 0/0 .text            Draw__13daLv4PoGate_cFv */
 int daLv4PoGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -260,42 +232,33 @@ int daLv4PoGate_c::Draw() {
     return 1;
 }
 
-/* 80C6069C-80C606CC 000B9C 0030+00 1/0 0/0 0/0 .text            Delete__13daLv4PoGate_cFv */
 int daLv4PoGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "L4R02Gate");
     return 1;
 }
 
-/* 80C606CC-80C606F8 000BCC 002C+00 1/0 0/0 0/0 .text            daLv4PoGate_Draw__FP13daLv4PoGate_c
- */
 static int daLv4PoGate_Draw(daLv4PoGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C606F8-80C60718 000BF8 0020+00 1/0 0/0 0/0 .text daLv4PoGate_Execute__FP13daLv4PoGate_c */
 static int daLv4PoGate_Execute(daLv4PoGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C60718-80C60738 000C18 0020+00 1/0 0/0 0/0 .text daLv4PoGate_Delete__FP13daLv4PoGate_c */
 static int daLv4PoGate_Delete(daLv4PoGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C60738-80C60758 000C38 0020+00 1/0 0/0 0/0 .text            daLv4PoGate_Create__FP10fopAc_ac_c
- */
 static int daLv4PoGate_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv4PoGate_c*>(i_this)->create();
 }
 
-/* 80C6091C-80C6093C -00001 0020+00 1/0 0/0 0/0 .data            l_daLv4PoGate_Method */
 static actor_method_class l_daLv4PoGate_Method = {
     (process_method_func)daLv4PoGate_Create,  (process_method_func)daLv4PoGate_Delete,
     (process_method_func)daLv4PoGate_Execute, (process_method_func)NULL,
     (process_method_func)daLv4PoGate_Draw,
 };
 
-/* 80C6093C-80C6096C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4PoGate */
 extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp
index 51aaf0a2cb..339d6da31d 100644
--- a/src/d/actor/d_a_obj_lv4RailWall.cpp
+++ b/src/d/actor/d_a_obj_lv4RailWall.cpp
@@ -10,10 +10,8 @@
 #include "d/actor/d_a_b_ds.h"
 #include "d/d_s_play.h"
 
-/* 80C61BDC-80C61BE0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_L4Rwall";
 
-/* 80C60A78-80C60AC4 000078 004C+00 2/2 0/0 0/0 .text            s_BossSearch__FPvPv */
 static void* s_BossSearch(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_B_DS) {
         return i_actor;
@@ -22,13 +20,11 @@ static void* s_BossSearch(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C60AC4-80C60B00 0000C4 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C60B00-80C60B7C 000100 007C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mHeight, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -36,7 +32,6 @@ void daObjLv4Wall_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C60B7C-80C60CD0 00017C 0154+00 1/0 0/0 0/0 .text            Create__14daObjLv4Wall_cFv */
 int daObjLv4Wall_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit()) || dComIfGs_isStageBossEnemy() || BREG_S(9) != 0) {
         mHeight = 3375.0f;
@@ -59,7 +54,6 @@ int daObjLv4Wall_c::Create() {
     return 1;
 }
 
-/* 80C60CD0-80C60D40 0002D0 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjLv4Wall_cFv */
 int daObjLv4Wall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(217, modelData != NULL);
@@ -71,7 +65,6 @@ int daObjLv4Wall_c::CreateHeap() {
     return 1;
 }
 
-/* 80C60D40-80C60DC4 000340 0084+00 1/1 0/0 0/0 .text            create1st__14daObjLv4Wall_cFv */
 int daObjLv4Wall_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -84,8 +77,6 @@ int daObjLv4Wall_c::create1st() {
     return phase_state;
 }
 
-/* 80C60DC4-80C60E90 0003C4 00CC+00 1/0 0/0 0/0 .text            Execute__14daObjLv4Wall_cFPPA3_A4_f
- */
 int daObjLv4Wall_c::Execute(Mtx** param_0) {
     if (mpSwSpinner == NULL) {
         mpSwSpinner = (daObjSwSpinner_c*)fopAcM_SearchByName(PROC_Obj_SwSpinner);
@@ -106,7 +97,6 @@ int daObjLv4Wall_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C60E90-80C60F4C 000490 00BC+00 1/1 0/0 0/0 .text            action__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::action() {
     static void (daObjLv4Wall_c::*l_func[])() = {
         &daObjLv4Wall_c::mode_wait,
@@ -118,13 +108,10 @@ void daObjLv4Wall_c::action() {
     eventUpdate();
 }
 
-/* 80C60F4C-80C60F58 00054C 000C+00 1/1 0/0 0/0 .text            mode_init_wait__14daObjLv4Wall_cFv
- */
 void daObjLv4Wall_c::mode_init_wait() {
     mMode = MODE_WAIT;
 }
 
-/* 80C60F58-80C61004 000558 00AC+00 1/0 0/0 0/0 .text            mode_wait__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::mode_wait() {
     if ((mpSwSpinner->GetRotSpeedY() / 4096.0f) > 0.7f) {
         mRotCounter++;
@@ -140,8 +127,6 @@ void daObjLv4Wall_c::mode_wait() {
     }
 }
 
-/* 80C61004-80C61068 000604 0064+00 2/2 0/0 0/0 .text            mode_init_move__14daObjLv4Wall_cFv
- */
 void daObjLv4Wall_c::mode_init_move() {
     fopAcM_onSwitch(this, getSwbit());
     speed.y = 0.0f;
@@ -150,7 +135,6 @@ void daObjLv4Wall_c::mode_init_move() {
     mMode = MODE_MOVE;
 }
 
-/* 80C61068-80C613C0 000668 0358+00 1/0 0/0 0/0 .text            mode_move__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::mode_move() {
     static const f32 l_spd_tbl[] = {
         0.0f,
@@ -213,23 +197,18 @@ void daObjLv4Wall_c::mode_move() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_DS_CLMN_UP, 0);
 }
 
-/* 80C613C0-80C613CC 0009C0 000C+00 2/2 0/0 0/0 .text            mode_init_dead__14daObjLv4Wall_cFv
- */
 void daObjLv4Wall_c::mode_init_dead() {
     mMode = MODE_DEAD;
 }
 
-/* 80C613CC-80C613D0 0009CC 0004+00 1/0 0/0 0/0 .text            mode_dead__14daObjLv4Wall_cFv */
 void daObjLv4Wall_c::mode_dead() {}
 
-/* 80C613D0-80C6143C 0009D0 006C+00 2/1 0/0 0/0 .text            eventStart__14daObjLv4Wall_cFv */
 bool daObjLv4Wall_c::eventStart() {
     dComIfGp_getVibration().StartQuake(4, 0xF, cXyz(0.0f, 1.0f, 0.0f));
     mode_init_move();
     return 1;
 }
 
-/* 80C6143C-80C614E0 000A3C 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjLv4Wall_cFv */
 int daObjLv4Wall_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -240,38 +219,28 @@ int daObjLv4Wall_c::Draw() {
     return 1;
 }
 
-/* 80C614E0-80C61514 000AE0 0034+00 1/0 0/0 0/0 .text            Delete__14daObjLv4Wall_cFv */
 int daObjLv4Wall_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C61514-80C61660 000B14 014C+00 1/0 0/0 0/0 .text daObjLv4Wall_create1st__FP14daObjLv4Wall_c
- */
 static int daObjLv4Wall_create1st(daObjLv4Wall_c* i_this) {
     fopAcM_ct(i_this, daObjLv4Wall_c);
     return i_this->create1st();
 }
 
-/* 80C6182C-80C6184C 000E2C 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Wall_MoveBGDelete__FP14daObjLv4Wall_c                */
 static int daObjLv4Wall_MoveBGDelete(daObjLv4Wall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6184C-80C6186C 000E4C 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Wall_MoveBGExecute__FP14daObjLv4Wall_c               */
 static int daObjLv4Wall_MoveBGExecute(daObjLv4Wall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6186C-80C61898 000E6C 002C+00 1/0 0/0 0/0 .text daObjLv4Wall_MoveBGDraw__FP14daObjLv4Wall_c
- */
 static int daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C61C28-80C61C48 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4Wall_METHODS */
 static actor_method_class daObjLv4Wall_METHODS = {
     (process_method_func)daObjLv4Wall_create1st,
     (process_method_func)daObjLv4Wall_MoveBGDelete,
@@ -280,7 +249,6 @@ static actor_method_class daObjLv4Wall_METHODS = {
     (process_method_func)daObjLv4Wall_MoveBGDraw,
 };
 
-/* 80C61C48-80C61C78 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4RailWall */
 extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp
index 4ec1ab65e8..9e89c7b56d 100644
--- a/src/d/actor/d_a_obj_lv4SlideWall.cpp
+++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp
@@ -7,14 +7,12 @@
 
 #include "d/actor/d_a_obj_lv4SlideWall.h"
 
-/* 80C61E2C-80C61E68 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__15daSldWall_HIO_cFv */
 daSldWall_HIO_c::daSldWall_HIO_c() {
     move_amount = 900.0f;
     speed = 4.0f;
     vibration = 3;
 }
 
-/* 80C61EB0-80C61F4C 000170 009C+00 2/2 0/0 0/0 .text            setBaseMtx__11daSldWall_cFv */
 void daSldWall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -23,7 +21,6 @@ void daSldWall_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C61F4C-80C61FB8 00020C 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daSldWall_cFv */
 int daSldWall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4SldWall", 4);
     JUT_ASSERT(160, modelData != NULL);
@@ -35,10 +32,8 @@ int daSldWall_c::CreateHeap() {
     return 1;
 }
 
-/* 80C627DC-80C627EC 000014 0010+00 5/5 0/0 0/0 .bss             l_HIO */
 static daSldWall_HIO_c l_HIO;
 
-/* 80C61FB8-80C620E4 000278 012C+00 1/1 0/0 0/0 .text            create__11daSldWall_cFv */
 int daSldWall_c::create() {
     fopAcM_ct(this, daSldWall_c);
 
@@ -70,7 +65,6 @@ int daSldWall_c::create() {
     return phase_state;
 }
 
-/* 80C620E4-80C62134 0003A4 0050+00 1/0 0/0 0/0 .text            Execute__11daSldWall_cFPPA3_A4_f */
 int daSldWall_c::Execute(Mtx** param_0) {
     moveWall();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -78,7 +72,6 @@ int daSldWall_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C62134-80C62238 0003F4 0104+00 1/1 0/0 0/0 .text            moveWall__11daSldWall_cFv */
 void daSldWall_c::moveWall() {
     static void (daSldWall_c::*mode_proc[])() = {
         &daSldWall_c::modeWait,
@@ -100,21 +93,16 @@ void daSldWall_c::moveWall() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C62238-80C62244 0004F8 000C+00 3/3 0/0 0/0 .text            init_modeWait__11daSldWall_cFv */
 void daSldWall_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C62244-80C62248 000504 0004+00 1/0 0/0 0/0 .text            modeWait__11daSldWall_cFv */
 void daSldWall_c::modeWait() {}
 
-/* 80C62248-80C62254 000508 000C+00 1/1 0/0 0/0 .text            init_modeMoveOpen__11daSldWall_cFv
- */
 void daSldWall_c::init_modeMoveOpen() {
     mMode = 1;
 }
 
-/* 80C62254-80C62314 000514 00C0+00 1/0 0/0 0/0 .text            modeMoveOpen__11daSldWall_cFv */
 void daSldWall_c::modeMoveOpen() {
     mDoAud_seStartLevel(0x801b1, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -125,13 +113,10 @@ void daSldWall_c::modeMoveOpen() {
     }
 }
 
-/* 80C62314-80C62320 0005D4 000C+00 1/1 0/0 0/0 .text            init_modeMoveClose__11daSldWall_cFv
- */
 void daSldWall_c::init_modeMoveClose() {
     mMode = 2;
 }
 
-/* 80C62320-80C623E0 0005E0 00C0+00 1/0 0/0 0/0 .text            modeMoveClose__11daSldWall_cFv */
 void daSldWall_c::modeMoveClose() {
     mDoAud_seStartLevel(0x801b1, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -142,13 +127,11 @@ void daSldWall_c::modeMoveClose() {
     }
 }
 
-/* 80C623E0-80C6249C 0006A0 00BC+00 2/2 0/0 0/0 .text            setSe__11daSldWall_cFv */
 void daSldWall_c::setSe() {
     mDoAud_seStart(0x801b2, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     dComIfGp_getVibration().StartShock(l_HIO.vibration, 0xF, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80C6249C-80C62540 00075C 00A4+00 1/0 0/0 0/0 .text            Draw__11daSldWall_cFv */
 int daSldWall_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -159,7 +142,6 @@ int daSldWall_c::Draw() {
     return 1;
 }
 
-/* 80C62540-80C62570 000800 0030+00 1/0 0/0 0/0 .text            Delete__11daSldWall_cFv */
 int daSldWall_c::Delete() {
     dComIfG_resDelete(&mPhase, "L4SldWall");
     
@@ -169,29 +151,22 @@ int daSldWall_c::Delete() {
     return 1;
 }
 
-/* 80C62570-80C6259C 000830 002C+00 1/0 0/0 0/0 .text            daSldWall_Draw__FP11daSldWall_c */
 static int daSldWall_Draw(daSldWall_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6259C-80C625BC 00085C 0020+00 1/0 0/0 0/0 .text            daSldWall_Execute__FP11daSldWall_c
- */
 static int daSldWall_Execute(daSldWall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C625BC-80C625DC 00087C 0020+00 1/0 0/0 0/0 .text            daSldWall_Delete__FP11daSldWall_c
- */
 static int daSldWall_Delete(daSldWall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C625DC-80C625FC 00089C 0020+00 1/0 0/0 0/0 .text            daSldWall_Create__FP10fopAc_ac_c */
 static int daSldWall_Create(fopAc_ac_c* i_this) {
     return ((daSldWall_c*)i_this)->create();
 }
 
-/* 80C62738-80C62758 -00001 0020+00 1/0 0/0 0/0 .data            l_daSldWall_Method */
 static actor_method_class l_daSldWall_Method = {
     (process_method_func)daSldWall_Create,
     (process_method_func)daSldWall_Delete,
@@ -200,7 +175,6 @@ static actor_method_class l_daSldWall_Method = {
     (process_method_func)daSldWall_Draw,
 };
 
-/* 80C62758-80C62788 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4SlideWall */
 extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp
index ddfb8539c2..8331c5f41a 100644
--- a/src/d/actor/d_a_obj_lv4bridge.cpp
+++ b/src/d/actor/d_a_obj_lv4bridge.cpp
@@ -7,13 +7,11 @@
 
 #include "d/actor/d_a_obj_lv4bridge.h"
 
-/* 80C62878-80C628B4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C628B4-80C62994 0000B4 00E0+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::setBaseMtx() {
     cXyz sp14(0.0f, 0.0f, field_0x5bc);
     mDoMtx_stack_c::YrotS(shape_angle.y);
@@ -28,7 +26,6 @@ void daObjLv4Brg_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C62994-80C62A2C 000194 0098+00 1/0 0/0 0/0 .text            Create__13daObjLv4Brg_cFv */
 int daObjLv4Brg_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         field_0x5bc = 2000.0f;
@@ -44,10 +41,8 @@ int daObjLv4Brg_c::Create() {
     return 1;
 }
 
-/* 80C631BC-80C631C0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_l4brg";
 
-/* 80C62A2C-80C62A9C 00022C 0070+00 1/0 0/0 0/0 .text            CreateHeap__13daObjLv4Brg_cFv */
 int daObjLv4Brg_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(170, modelData != NULL);
@@ -60,7 +55,6 @@ int daObjLv4Brg_c::CreateHeap() {
     return 1;
 }
 
-/* 80C62A9C-80C62B20 00029C 0084+00 1/1 0/0 0/0 .text            create1st__13daObjLv4Brg_cFv */
 int daObjLv4Brg_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -73,8 +67,6 @@ int daObjLv4Brg_c::create1st() {
     return phase_state;
 }
 
-/* 80C62B20-80C62B6C 000320 004C+00 1/0 0/0 0/0 .text            Execute__13daObjLv4Brg_cFPPA3_A4_f
- */
 int daObjLv4Brg_c::Execute(Mtx** param_0) {
     action();
     *param_0 = &mBgMtx;
@@ -82,7 +74,6 @@ int daObjLv4Brg_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C62B6C-80C62C28 00036C 00BC+00 1/1 0/0 0/0 .text            action__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::action() {
     static void (daObjLv4Brg_c::*l_func[])() = {
         &daObjLv4Brg_c::mode_wait,
@@ -94,13 +85,10 @@ void daObjLv4Brg_c::action() {
     eventUpdate();
 }
 
-/* 80C62C28-80C62C34 000428 000C+00 1/1 0/0 0/0 .text            mode_init_wait__13daObjLv4Brg_cFv
- */
 void daObjLv4Brg_c::mode_init_wait() {
     mMode = 0;
 }
 
-/* 80C62C34-80C62CE4 000434 00B0+00 1/0 0/0 0/0 .text            mode_wait__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::mode_wait() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         if (getEvID() != 0xFF) {
@@ -113,14 +101,11 @@ void daObjLv4Brg_c::mode_wait() {
     }
 }
 
-/* 80C62CE4-80C62CFC 0004E4 0018+00 2/2 0/0 0/0 .text            mode_init_move__13daObjLv4Brg_cFv
- */
 void daObjLv4Brg_c::mode_init_move() {
     speed.y = 0.0f;
     mMode = 1;
 }
 
-/* 80C62CFC-80C62E24 0004FC 0128+00 1/0 0/0 0/0 .text            mode_move__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::mode_move() {
     mDoAud_seStartLevel(Z2SE_OBJ_DS_END_BRG, &field_0x5c4, 0, 0);
     cLib_chaseF(&speed.y, 20.0f, 2.0f);
@@ -133,23 +118,18 @@ void daObjLv4Brg_c::mode_move() {
     }
 }
 
-/* 80C62E24-80C62E30 000624 000C+00 2/2 0/0 0/0 .text            mode_init_dead__13daObjLv4Brg_cFv
- */
 void daObjLv4Brg_c::mode_init_dead() {
     mMode = 2;
 }
 
-/* 80C62E30-80C62E34 000630 0004+00 1/0 0/0 0/0 .text            mode_dead__13daObjLv4Brg_cFv */
 void daObjLv4Brg_c::mode_dead() {}
 
-/* 80C62E34-80C62EA0 000634 006C+00 2/1 0/0 0/0 .text            eventStart__13daObjLv4Brg_cFv */
 bool daObjLv4Brg_c::eventStart() {
     dComIfGp_getVibration().StartQuake(4, 0xF, cXyz(0.0f, 1.0f, 0.0f));
     mode_init_move();
     return true;
 }
 
-/* 80C62EA0-80C62F44 0006A0 00A4+00 1/0 0/0 0/0 .text            Draw__13daObjLv4Brg_cFv */
 int daObjLv4Brg_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -160,36 +140,28 @@ int daObjLv4Brg_c::Draw() {
     return 1;
 }
 
-/* 80C62F44-80C62F78 000744 0034+00 1/0 0/0 0/0 .text            Delete__13daObjLv4Brg_cFv */
 int daObjLv4Brg_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C62F78-80C62FF8 000778 0080+00 1/0 0/0 0/0 .text daObjLv4Brg_create1st__FP13daObjLv4Brg_c */
 static int daObjLv4Brg_create1st(daObjLv4Brg_c* i_this) {
     fopAcM_ct(i_this, daObjLv4Brg_c);
     return i_this->create1st();
 }
 
-/* 80C62FF8-80C63018 0007F8 0020+00 1/0 0/0 0/0 .text daObjLv4Brg_MoveBGDelete__FP13daObjLv4Brg_c
- */
 static int daObjLv4Brg_MoveBGDelete(daObjLv4Brg_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C63018-80C63038 000818 0020+00 1/0 0/0 0/0 .text daObjLv4Brg_MoveBGExecute__FP13daObjLv4Brg_c
- */
 static int daObjLv4Brg_MoveBGExecute(daObjLv4Brg_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C63038-80C63064 000838 002C+00 1/0 0/0 0/0 .text daObjLv4Brg_MoveBGDraw__FP13daObjLv4Brg_c */
 static int daObjLv4Brg_MoveBGDraw(daObjLv4Brg_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C63208-80C63228 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4Brg_METHODS */
 static actor_method_class daObjLv4Brg_METHODS = {
     (process_method_func)daObjLv4Brg_create1st,
     (process_method_func)daObjLv4Brg_MoveBGDelete,
@@ -198,7 +170,6 @@ static actor_method_class daObjLv4Brg_METHODS = {
     (process_method_func)daObjLv4Brg_MoveBGDraw,
 };
 
-/* 80C63228-80C63258 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Bridge */
 extern actor_process_profile_definition g_profile_Obj_Lv4Bridge = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp
index d9ffab9240..7a7f692324 100644
--- a/src/d/actor/d_a_obj_lv4chandelier.cpp
+++ b/src/d/actor/d_a_obj_lv4chandelier.cpp
@@ -11,7 +11,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
-#include "dol2asm.h"
 
 #ifdef DEBUG
 class daObjLv4Chan_HIO_c : public mDoHIO_entry_c {
@@ -29,16 +28,12 @@ void daObjLv4Chan_HIO_c::genMessage(JORMContext* ctx) {
 static daObjLv4Chan_HIO_c l_HIO;
 #endif
 
-/* 80C63338-80C63360 000078 0028+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     ((daObjLv4Chan_c*)param_2)->rideActor(param_3);
 }
 
-/* 80C66990-80C66994 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Lv4Chan";
 
-/* 80C63360-80C634CC 0000A0 016C+00 1/1 0/0 0/0 .text            create1st__14daObjLv4Chan_cFv */
 int daObjLv4Chan_c::create1st() {
     int rv = dComIfG_resLoad(this, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -83,13 +78,10 @@ int daObjLv4Chan_c::create1st() {
     return rv;
 }
 
-/* 80C66860-80C66868 000000 0008+00 10/10 0/0 0/0 .rodata          l_bmdidx */
 static u32 const l_bmdidx[2] = {
     4, 5,
 };
 
-/* 80C634CC-80C636B4 00020C 01E8+00 1/1 0/0 0/0 .text
- * setMtxChain__14daObjLv4Chan_cFPQ214daObjLv4Chan_c8ChainPosP10dMdl_obj_ci */
 void daObjLv4Chan_c::setMtxChain(daObjLv4Chan_c::ChainPos* i_chains, dMdl_obj_c* i_mdls,
                                      int param_3) {
     s16 sVar8 = 0;
@@ -120,7 +112,6 @@ void daObjLv4Chan_c::setMtxChain(daObjLv4Chan_c::ChainPos* i_chains, dMdl_obj_c*
     }
 }
 
-/* 80C636B4-80C639B4 0003F4 0300+00 2/2 0/0 0/0 .text            setMtx__14daObjLv4Chan_cFv */
 void daObjLv4Chan_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -168,7 +159,6 @@ void daObjLv4Chan_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x5a8);
 }
 
-/* 80C639B4-80C63CFC 0006F4 0348+00 1/1 0/0 0/0 .text rideActor__14daObjLv4Chan_cFP10fopAc_ac_c */
 void daObjLv4Chan_c::rideActor(fopAc_ac_c* param_1) {
     field_0x2498 = 1;
     f32 dVar8 = 1.0f;
@@ -211,7 +201,6 @@ void daObjLv4Chan_c::rideActor(fopAc_ac_c* param_1) {
     mChains[2][mChainLengths[2] - 1].field_0x0.z -= dVar8 * (local_54.z * 0.0075f * (cM_rndFX(0.025f) + 1.0f));
 }
 
-/* 80C63CFC-80C63F34 000A3C 0238+00 1/0 0/0 0/0 .text            CreateHeap__14daObjLv4Chan_cFv */
 int daObjLv4Chan_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]);
     JUT_ASSERT(478, model_data != NULL);
@@ -256,7 +245,6 @@ int daObjLv4Chan_c::CreateHeap() {
     return 1;
 }
 
-/* 80C63F34-80C63FA8 000C74 0074+00 1/1 0/0 0/0 .text            searchSwChain__FPvPv */
 static void* searchSwChain(void* i_actor, void* i_this) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) &&
         fopAcM_GetProfName(i_actor) == PROC_Obj_SwChain)
@@ -268,7 +256,6 @@ static void* searchSwChain(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80C66994-80C669D4 000004 0040+00 1/1 0/0 0/0 .data            cc_sph_src */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj
@@ -281,7 +268,6 @@ static dCcD_SrcSph cc_sph_src = {
     } // mSphAttr
 };
 
-/* 80C63FA8-80C6449C 000CE8 04F4+00 1/0 0/0 0/0 .text            Create__14daObjLv4Chan_cFv */
 int daObjLv4Chan_c::Create() {
     mModel->setBaseScale(scale);
     field_0x23d4 = 0;
@@ -366,8 +352,6 @@ int daObjLv4Chan_c::Create() {
     return 1;
 }
 
-/* 80C6449C-80C64668 0011DC 01CC+00 1/1 0/0 0/0 .text
- * constraintChain__14daObjLv4Chan_cFPQ214daObjLv4Chan_c8ChainPosi */
 void daObjLv4Chan_c::constraintChain(daObjLv4Chan_c::ChainPos* i_chains, int param_2) {
     bool iVar4 = field_0x2418 == field_0x2484;
     for (int i = field_0x2418; i < param_2; i++) {
@@ -408,23 +392,18 @@ void daObjLv4Chan_c::constraintChain(daObjLv4Chan_c::ChainPos* i_chains, int par
     }
 }
 
-/* 80C668D0-80C668DC 000070 000C+00 0/1 0/0 0/0 .rodata          l_pos0 */
 static Vec const l_pos0 = {
     -163.12f, 150.0f, -282.54f,
 };
 
-/* 80C668DC-80C668E8 00007C 000C+00 0/1 0/0 0/0 .rodata          l_pos1 */
 static Vec const l_pos1 = {
     -163.12f, 150.0f, 282.54f,
 };
 
-/* 80C668E8-80C668F4 000088 000C+00 0/1 0/0 0/0 .rodata          l_pos2 */
 static Vec const l_pos2 = {
     326.25f, 150.0f, 0.0f,
 };
 
-/* 80C64668-80C647FC 0013A8 0194+00 1/1 0/0 0/0 .text            constraintBase__14daObjLv4Chan_cFv
- */
 void daObjLv4Chan_c::constraintBase() {
     cXyz acStack_20;
     MTXMultVec(field_0x5a8, &l_pos0, &acStack_20);
@@ -435,15 +414,12 @@ void daObjLv4Chan_c::constraintBase() {
     mChains[2][mChainLengths[2] - 1].field_0xc = (acStack_20 + mChains[2][mChainLengths[2] - 1].field_0xc) * 0.5f;
 }
 
-/* 80C647FC-80C64878 00153C 007C+00 1/1 0/0 0/0 .text
- * calcVec__14daObjLv4Chan_cFPQ214daObjLv4Chan_c8ChainPosi      */
 void daObjLv4Chan_c::calcVec(daObjLv4Chan_c::ChainPos* i_chains, int param_2) {
     for (int i = 0; i < param_2; i++) {
         i_chains[i].field_0x0 = i_chains[i].field_0xc - i_chains[i].field_0x18;
     }
 }
 
-/* 80C64878-80C648F4 0015B8 007C+00 2/2 0/0 0/0 .text            chkGnd__14daObjLv4Chan_cFv */
 void daObjLv4Chan_c::chkGnd() {
     cXyz cStack_18;
     cStack_18 = field_0x23bc;
@@ -453,14 +429,11 @@ void daObjLv4Chan_c::chkGnd() {
     field_0x247c = dComIfG_Bgsp().GroundCross(&mGndChk);
 }
 
-/* 80C668FC-80C66924 00009C 0028+00 0/1 0/0 0/0 .rodata          l_curve */
 static int const l_curve[10] = {
     0, 0, 0, 0, 0, 1, 1,
     2, 2, 4,
 };
 
-/* 80C648F4-80C65F04 001634 1610+00 1/0 0/0 0/0 .text            Execute__14daObjLv4Chan_cFPPA3_A4_f
- */
 int daObjLv4Chan_c::Execute(Mtx** i_mtx) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     int local_1f0 = 0;
@@ -822,7 +795,6 @@ int daObjLv4Chan_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C65F04-80C66114 002C44 0210+00 1/0 0/0 0/0 .text            Draw__14daObjLv4Chan_cFv */
 int daObjLv4Chan_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel,
@@ -866,7 +838,6 @@ int daObjLv4Chan_c::Draw() {
     return 1;
 }
 
-/* 80C66114-80C66150 002E54 003C+00 1/0 0/0 0/0 .text            Delete__14daObjLv4Chan_cFv */
 int daObjLv4Chan_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
 
@@ -877,32 +848,23 @@ int daObjLv4Chan_c::Delete() {
     return 1;
 }
 
-/* 80C66150-80C6627C 002E90 012C+00 1/0 0/0 0/0 .text daObjLv4Chan_create1st__FP14daObjLv4Chan_c
- */
 static int daObjLv4Chan_create1st(daObjLv4Chan_c* i_this) {
     fopAcM_ct(i_this, daObjLv4Chan_c);
     return i_this->create1st();
 }
 
-/* 80C664D4-80C664F4 003214 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Chan_MoveBGDelete__FP14daObjLv4Chan_c                */
 static int daObjLv4Chan_MoveBGDelete(daObjLv4Chan_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C664F4-80C66514 003234 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Chan_MoveBGExecute__FP14daObjLv4Chan_c               */
 static int daObjLv4Chan_MoveBGExecute(daObjLv4Chan_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C66514-80C66540 003254 002C+00 1/0 0/0 0/0 .text daObjLv4Chan_MoveBGDraw__FP14daObjLv4Chan_c
- */
 static int daObjLv4Chan_MoveBGDraw(daObjLv4Chan_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C669D4-80C669F4 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4Chan_METHODS */
 static actor_method_class daObjLv4Chan_METHODS = {
     (process_method_func)daObjLv4Chan_create1st,
     (process_method_func)daObjLv4Chan_MoveBGDelete,
@@ -911,7 +873,6 @@ static actor_method_class daObjLv4Chan_METHODS = {
     (process_method_func)daObjLv4Chan_MoveBGDraw,
 };
 
-/* 80C669F4-80C66A24 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Chan */
 extern actor_process_profile_definition g_profile_Obj_Lv4Chan = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp
index 012049af90..d01616f31f 100644
--- a/src/d/actor/d_a_obj_lv4digsand.cpp
+++ b/src/d/actor/d_a_obj_lv4digsand.cpp
@@ -11,14 +11,11 @@
 #include "d/d_item.h"
 #include <cmath.h>
 
-/* 80C66B18-80C66B54 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjL4DigSand_cFv
- */
 void daObjL4DigSand_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C66B54-80C66BC8 0000B4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -26,7 +23,6 @@ void daObjL4DigSand_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C66BC8-80C66C24 000128 005C+00 1/0 0/0 0/0 .text            Create__16daObjL4DigSand_cFv */
 int daObjL4DigSand_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -37,10 +33,8 @@ int daObjL4DigSand_c::Create() {
     return 1;
 }
 
-/* 80C6760C-80C67610 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_DSand";
 
-/* 80C66C24-80C66C94 000184 0070+00 1/0 0/0 0/0 .text            CreateHeap__16daObjL4DigSand_cFv */
 int daObjL4DigSand_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(0x9B, modelData != NULL);
@@ -53,7 +47,6 @@ int daObjL4DigSand_c::CreateHeap() {
     return 1;
 }
 
-/* 80C66C94-80C66D40 0001F4 00AC+00 1/1 0/0 0/0 .text            create1st__16daObjL4DigSand_cFv */
 int daObjL4DigSand_c::create1st() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         return cPhs_ERROR_e;
@@ -70,7 +63,6 @@ int daObjL4DigSand_c::create1st() {
     return phase_state;
 }
 
-/* 80C66D40-80C66DD0 0002A0 0090+00 1/0 0/0 0/0 .text Execute__16daObjL4DigSand_cFPPA3_A4_f */
 int daObjL4DigSand_c::Execute(Mtx** param_0) {
     if (daPy_py_c::checkNowWolf() && checkItemGet(fpcNm_ITEM_SMELL_POH, 1)) {
         attention_info.flags = fopAc_AttnFlag_ETC_e;
@@ -85,7 +77,6 @@ int daObjL4DigSand_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C66DD0-80C66E74 000330 00A4+00 1/1 0/0 0/0 .text            action__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::action() {
     typedef void (daObjL4DigSand_c::*mode_func)();
     static mode_func l_func[] = {
@@ -97,20 +88,16 @@ void daObjL4DigSand_c::action() {
     (this->*l_func[mMode])();
 }
 
-/* 80C66E74-80C66E80 0003D4 000C+00 1/1 0/0 0/0 .text mode_init_wait__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::mode_init_wait() {
     mMode = 0;
 }
 
-/* 80C66E80-80C66EAC 0003E0 002C+00 1/0 0/0 0/0 .text            mode_wait__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::mode_wait() {
     if (field_0x941 == 1) {
         mode_init_dig();
     }
 }
 
-/* 80C66EAC-80C66F84 00040C 00D8+00 1/1 0/0 0/0 .text            mode_init_dig__16daObjL4DigSand_cFv
- */
 void daObjL4DigSand_c::mode_init_dig() {
     dBgS_ObjGndChk gndchk;
     gndchk.SetActorPid(base.base.id);
@@ -131,7 +118,6 @@ void daObjL4DigSand_c::mode_init_dig() {
     mMode = 1;
 }
 
-/* 80C66FFC-80C670AC 00055C 00B0+00 1/0 0/0 0/0 .text            mode_dig__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::mode_dig() {
     if (cLib_calcTimer<u8>(&mTimer) == 0) {
         f32 var_f31 = std::fabs(((current.pos.y - mGroundY) + 10.0f) / 15.0f);
@@ -145,18 +131,14 @@ void daObjL4DigSand_c::mode_dig() {
     }
 }
 
-/* 80C670AC-80C67100 00060C 0054+00 1/1 0/0 0/0 .text            mode_init_end__16daObjL4DigSand_cFv
- */
 void daObjL4DigSand_c::mode_init_end() {
     fopAcM_onSwitch(this, getSwNo());
     fopAcM_delete(this);
     mMode = 2;
 }
 
-/* 80C67100-80C67104 000660 0004+00 1/0 0/0 0/0 .text            mode_end__16daObjL4DigSand_cFv */
 void daObjL4DigSand_c::mode_end() {}
 
-/* 80C67104-80C671A8 000664 00A4+00 1/0 0/0 0/0 .text            Draw__16daObjL4DigSand_cFv */
 int daObjL4DigSand_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -167,38 +149,28 @@ int daObjL4DigSand_c::Draw() {
     return 1;
 }
 
-/* 80C671A8-80C671DC 000708 0034+00 1/0 0/0 0/0 .text            Delete__16daObjL4DigSand_cFv */
 int daObjL4DigSand_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C671DC-80C67308 00073C 012C+00 1/0 0/0 0/0 .text
- * daObjL4DigSand_create1st__FP16daObjL4DigSand_c               */
 static int daObjL4DigSand_create1st(daObjL4DigSand_c* i_this) {
     fopAcM_ct(i_this, daObjL4DigSand_c);
     return i_this->create1st();
 }
 
-/* 80C674D4-80C674F4 000A34 0020+00 1/0 0/0 0/0 .text
- * daObjL4DigSand_MoveBGDelete__FP16daObjL4DigSand_c            */
 static int daObjL4DigSand_MoveBGDelete(daObjL4DigSand_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C674F4-80C67514 000A54 0020+00 1/0 0/0 0/0 .text
- * daObjL4DigSand_MoveBGExecute__FP16daObjL4DigSand_c           */
 static int daObjL4DigSand_MoveBGExecute(daObjL4DigSand_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C67514-80C67540 000A74 002C+00 1/0 0/0 0/0 .text
- * daObjL4DigSand_MoveBGDraw__FP16daObjL4DigSand_c              */
 static int daObjL4DigSand_MoveBGDraw(daObjL4DigSand_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C67658-80C67678 -00001 0020+00 1/0 0/0 0/0 .data            daObjL4DigSand_METHODS */
 static actor_method_class daObjL4DigSand_METHODS = {
     (process_method_func)daObjL4DigSand_create1st,
     (process_method_func)daObjL4DigSand_MoveBGDelete,
@@ -207,7 +179,6 @@ static actor_method_class daObjL4DigSand_METHODS = {
     (process_method_func)daObjL4DigSand_MoveBGDraw,
 };
 
-/* 80C67678-80C676A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4DigSand */
 extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp
index 681c038445..a951b8cb09 100644
--- a/src/d/actor/d_a_obj_lv4floor.cpp
+++ b/src/d/actor/d_a_obj_lv4floor.cpp
@@ -9,13 +9,11 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C677F8-80C67834 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C67834-80C678B0 0000B4 007C+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mMoveYPos, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -24,16 +22,13 @@ void daObjLv4Floor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C678B0-80C678D4 000130 0024+00 1/0 0/0 0/0 .text            Create__15daObjLv4Floor_cFv */
 int daObjLv4Floor_c::Create() {
     initBaseMtx();
     return 1;
 }
 
-/* 80C67DBC-80C67DC0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_L4Floor";
 
-/* 80C678D4-80C67944 000154 0070+00 1/0 0/0 0/0 .text            CreateHeap__15daObjLv4Floor_cFv */
 int daObjLv4Floor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -44,7 +39,6 @@ int daObjLv4Floor_c::CreateHeap() {
     return 1;
 }
 
-/* 80C67944-80C679E4 0001C4 00A0+00 1/1 0/0 0/0 .text            create1st__15daObjLv4Floor_cFv */
 int daObjLv4Floor_c::create1st() {
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase != cPhs_COMPLEATE_e) {
@@ -63,7 +57,6 @@ int daObjLv4Floor_c::create1st() {
     return phase;
 }
 
-/* 80C679E4-80C67A30 000264 004C+00 1/0 0/0 0/0 .text Execute__15daObjLv4Floor_cFPPA3_A4_f */
 int daObjLv4Floor_c::Execute(Mtx** param_0) {
     action();
     *param_0 = &mBgMtx;
@@ -72,7 +65,6 @@ int daObjLv4Floor_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C67A30-80C67AD4 0002B0 00A4+00 1/1 0/0 0/0 .text            action__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::action() {
     typedef void (daObjLv4Floor_c::*actionFunc)();
     static actionFunc l_func[] = {&daObjLv4Floor_c::mode_wait, &daObjLv4Floor_c::mode_move,
@@ -81,21 +73,17 @@ void daObjLv4Floor_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80C67AD4-80C67B28 000354 0054+00 1/0 0/0 0/0 .text            mode_wait__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::mode_wait() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         mode_init_move();
     }
 }
 
-/* 80C67B28-80C67B40 0003A8 0018+00 1/1 0/0 0/0 .text            mode_init_move__15daObjLv4Floor_cFv
- */
 void daObjLv4Floor_c::mode_init_move() {
     speed.y = 0.0f;
     mAction = MODE_MOVE_e;
 }
 
-/* 80C67B40-80C67BA8 0003C0 0068+00 1/0 0/0 0/0 .text            mode_move__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::mode_move() {
     cLib_chaseF(&speed.y, 3.8f, 0.08f);
 
@@ -104,18 +92,14 @@ void daObjLv4Floor_c::mode_move() {
     }
 }
 
-/* 80C67BA8-80C67BB4 000428 000C+00 1/1 0/0 0/0 .text            mode_init_dead__15daObjLv4Floor_cFv
- */
 void daObjLv4Floor_c::mode_init_dead() {
     mAction = MODE_DEAD_e;
 }
 
-/* 80C67BB4-80C67BD4 000434 0020+00 1/0 0/0 0/0 .text            mode_dead__15daObjLv4Floor_cFv */
 void daObjLv4Floor_c::mode_dead() {
     fopAcM_delete(this);
 }
 
-/* 80C67BD4-80C67C78 000454 00A4+00 1/0 0/0 0/0 .text            Draw__15daObjLv4Floor_cFv */
 int daObjLv4Floor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -126,39 +110,28 @@ int daObjLv4Floor_c::Draw() {
     return 1;
 }
 
-/* 80C67C78-80C67CAC 0004F8 0034+00 1/0 0/0 0/0 .text            Delete__15daObjLv4Floor_cFv */
 int daObjLv4Floor_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C67CAC-80C67D0C 00052C 0060+00 1/0 0/0 0/0 .text daObjLv4Floor_create1st__FP15daObjLv4Floor_c
- */
 static int daObjLv4Floor_create1st(daObjLv4Floor_c* i_this) {
     fopAcM_ct(i_this, daObjLv4Floor_c);
     return i_this->create1st();
 }
 
-/* 80C67D0C-80C67D2C 00058C 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Floor_MoveBGDelete__FP15daObjLv4Floor_c              */
 static int daObjLv4Floor_MoveBGDelete(daObjLv4Floor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C67D2C-80C67D4C 0005AC 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Floor_MoveBGExecute__FP15daObjLv4Floor_c             */
 static int daObjLv4Floor_MoveBGExecute(daObjLv4Floor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C67D4C-80C67D78 0005CC 002C+00 1/0 0/0 0/0 .text
- * daObjLv4Floor_MoveBGDraw__FP15daObjLv4Floor_c                */
 static int daObjLv4Floor_MoveBGDraw(daObjLv4Floor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80C67E08-80C67E28 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4Floor_METHODS */
 static actor_method_class daObjLv4Floor_METHODS = {
     (process_method_func)daObjLv4Floor_create1st,
     (process_method_func)daObjLv4Floor_MoveBGDelete,
@@ -167,7 +140,6 @@ static actor_method_class daObjLv4Floor_METHODS = {
     (process_method_func)daObjLv4Floor_MoveBGDraw,
 };
 
-/* 80C67E28-80C67E58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Floor */
 extern actor_process_profile_definition g_profile_Obj_Lv4Floor = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp
index ec9b7a4cfe..686c651e2e 100644
--- a/src/d/actor/d_a_obj_lv4gear.cpp
+++ b/src/d/actor/d_a_obj_lv4gear.cpp
@@ -8,12 +8,10 @@
 #include "d/actor/d_a_obj_lv4gear.h"
 #include "d/d_procname.h"
 
-/* 80C67F18-80C67F38 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjLv4Gear_c*>(i_this)->CreateHeap();
 }
 
-/* 80C67F38-80C67FB4 000098 007C+00 1/1 0/0 0/0 .text            searchSwSpinSub__FPvPv */
 static void* searchSwSpinSub(void* i_actor, void* i_data) {
     daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_actor;
     daObjLv4Gear_c* gear = (daObjLv4Gear_c*)i_data;
@@ -28,20 +26,17 @@ static void* searchSwSpinSub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C67FB4-80C67FF0 000114 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjLv4Gear_cFv */
 void daObjLv4Gear_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C67FF0-80C68050 000150 0060+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjLv4Gear_cFv */
 void daObjLv4Gear_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y + mRotation);
     MTXCopy(mDoMtx_stack_c::get(), mpModel->mBaseTransformMtx);
 }
 
-/* 80C68050-80C680A4 0001B0 0054+00 1/1 0/0 0/0 .text            Create__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -50,13 +45,10 @@ int daObjLv4Gear_c::Create() {
     return 1;
 }
 
-/* 80C68500-80C68508 000000 0008+00 2/2 0/0 0/0 .rodata          l_bmd */
 static int const l_bmd[] = {4, 3};
 
-/* 80C6852C-80C68530 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Gear";
 
-/* 80C680A4-80C68124 000204 0080+00 1/1 0/0 0/0 .text            CreateHeap__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]);
     JUT_ASSERT(213, modelData != NULL);
@@ -68,16 +60,12 @@ int daObjLv4Gear_c::CreateHeap() {
     return 1;
 }
 
-/* 80C68508-80C68510 000008 0008+00 0/0 0/0 0/0 .rodata          l_size */
 static int const l_size[] = {0x42C80000, 0x43960000};
 
-/* 80C68510-80C68514 000010 0004+00 0/1 0/0 0/0 .rodata          l_rot_start_time */
 static s16 const l_rot_start_time[] = {15, 100};
 
-/* 80C68514-80C6851C 000014 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static int const l_heap_size[] = {0xF00, 0xF00};
 
-/* 80C68124-80C681F4 000284 00D0+00 1/1 0/0 0/0 .text            create__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::create() {
     fopAcM_ct(this, daObjLv4Gear_c);
 
@@ -97,7 +85,6 @@ int daObjLv4Gear_c::create() {
     return phase;
 }
 
-/* 80C681F4-80C683E0 000354 01EC+00 1/1 0/0 0/0 .text            execute__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::execute() {
     mTarget = 0;
 
@@ -138,7 +125,6 @@ int daObjLv4Gear_c::execute() {
     return 1;
 }
 
-/* 80C683E0-80C68444 000540 0064+00 1/1 0/0 0/0 .text            draw__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -147,40 +133,33 @@ int daObjLv4Gear_c::draw() {
     return 1;
 }
 
-/* 80C68444-80C68478 0005A4 0034+00 1/1 0/0 0/0 .text            _delete__14daObjLv4Gear_cFv */
 int daObjLv4Gear_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C68478-80C68498 0005D8 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Draw__FP14daObjLv4Gear_c */
 static int daObjLv4Gear_Draw(daObjLv4Gear_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C68498-80C684B8 0005F8 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Execute__FP14daObjLv4Gear_c */
 static int daObjLv4Gear_Execute(daObjLv4Gear_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C684B8-80C684D8 000618 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Delete__FP14daObjLv4Gear_c */
 static int daObjLv4Gear_Delete(daObjLv4Gear_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80C684D8-80C684F8 000638 0020+00 1/0 0/0 0/0 .text daObjLv4Gear_Create__FP14daObjLv4Gear_c */
 static int daObjLv4Gear_Create(daObjLv4Gear_c* i_this) {
     return i_this->create();
 }
 
-/* 80C68530-80C68550 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjLv4Gear_Method */
 static actor_method_class l_daObjLv4Gear_Method = {
     (process_method_func)daObjLv4Gear_Create,  (process_method_func)daObjLv4Gear_Delete,
     (process_method_func)daObjLv4Gear_Execute, (process_method_func)NULL,
     (process_method_func)daObjLv4Gear_Draw,
 };
 
-/* 80C68550-80C68580 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Gear */
 extern actor_process_profile_definition g_profile_Obj_Lv4Gear = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp
index a0cf2ad489..49b60eeba5 100644
--- a/src/d/actor/d_a_obj_lv4prelvtr.cpp
+++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_obj_lv4prelvtr.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C68B98-80C68B9C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "PRElvtr";
 
-/* 80C685F8-80C68688 000078 0090+00 1/1 0/0 0/0 .text            create1st__14daObjPRElvtr_cFv */
 int daObjPRElvtr_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -24,7 +22,6 @@ int daObjPRElvtr_c::create1st() {
     return phase;
 }
 
-/* 80C68688-80C686F8 000108 0070+00 2/2 0/0 0/0 .text            setMtx__14daObjPRElvtr_cFv */
 void daObjPRElvtr_c::setMtx() {
     PSMTXTrans(mDoMtx_stack_c::get(), current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -32,20 +29,17 @@ void daObjPRElvtr_c::setMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mMtx1);
 }
 
-/* 80C686F8-80C68768 000178 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjPRElvtr_cFv */
 int daObjPRElvtr_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80C68B68-80C68B80 000000 0018+00 1/1 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-725.0f, -315.0f, -725.0f},
     {725.0f, -15.0f, 725.0f},
 };
 
-/* 80C68768-80C687D0 0001E8 0068+00 1/0 0/0 0/0 .text            Create__14daObjPRElvtr_cFv */
 int daObjPRElvtr_c::Create() {
     mpModel->setBaseTRMtx(mMtx2);
     fopAcM_SetMtx(this, mMtx2);
@@ -54,7 +48,6 @@ int daObjPRElvtr_c::Create() {
     return 1;
 }
 
-/* 80C687D0-80C68844 000250 0074+00 1/1 0/0 0/0 .text            searchObjSwTurn__FPvPv */
 static fopAc_ac_c* searchObjSwTurn(void* i_actor1, void* i_actor2) {
     if (i_actor1 != NULL && fopAcM_IsActor(i_actor1) &&
         fopAcM_GetProfName(i_actor1) == PROC_Obj_SwTurn)
@@ -67,8 +60,6 @@ static fopAc_ac_c* searchObjSwTurn(void* i_actor1, void* i_actor2) {
     return NULL;
 }
 
-/* 80C68844-80C68944 0002C4 0100+00 1/0 0/0 0/0 .text            Execute__14daObjPRElvtr_cFPPA3_A4_f
- */
 int daObjPRElvtr_c::Execute(Mtx** i_mtx) {
     daObjSwTurn_c* sw_turn =
         (daObjSwTurn_c*)fopAcM_Search((fopAcIt_JudgeFunc)searchObjSwTurn, this);
@@ -87,7 +78,6 @@ int daObjPRElvtr_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C68944-80C689E8 0003C4 00A4+00 1/0 0/0 0/0 .text            Draw__14daObjPRElvtr_cFv */
 int daObjPRElvtr_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -97,45 +87,34 @@ int daObjPRElvtr_c::Draw() {
     return 1;
 }
 
-/* 80C689E8-80C68A24 000468 003C+00 1/0 0/0 0/0 .text            Delete__14daObjPRElvtr_cFv */
 int daObjPRElvtr_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80C68A24-80C68A84 0004A4 0060+00 1/0 0/0 0/0 .text daObjPRElvtr_create1st__FP14daObjPRElvtr_c
- */
 static int daObjPRElvtr_create1st(daObjPRElvtr_c* i_this) {
     fopAcM_ct(i_this, daObjPRElvtr_c);
     return i_this->create1st();
 }
 
-/* 80C68A84-80C68AA4 000504 0020+00 1/0 0/0 0/0 .text
- * daObjPRElvtr_MoveBGDelete__FP14daObjPRElvtr_c                */
 static int daObjPRElvtr_MoveBGDelete(daObjPRElvtr_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C68AA4-80C68AC4 000524 0020+00 1/0 0/0 0/0 .text
- * daObjPRElvtr_MoveBGExecute__FP14daObjPRElvtr_c               */
 static int daObjPRElvtr_MoveBGExecute(daObjPRElvtr_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C68AC4-80C68AF0 000544 002C+00 1/0 0/0 0/0 .text daObjPRElvtr_MoveBGDraw__FP14daObjPRElvtr_c
- */
 static int daObjPRElvtr_MoveBGDraw(daObjPRElvtr_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C68B9C-80C68BBC -00001 0020+00 1/0 0/0 0/0 .data            daObjPRElvtr_METHODS */
 static actor_method_class daObjPRElvtr_METHODS = {
     (process_method_func)daObjPRElvtr_create1st,     (process_method_func)daObjPRElvtr_MoveBGDelete,
     (process_method_func)daObjPRElvtr_MoveBGExecute, 0,
     (process_method_func)daObjPRElvtr_MoveBGDraw,
 };
 
-/* 80C68BBC-80C68BEC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_PRElvtr */
 extern actor_process_profile_definition g_profile_Obj_PRElvtr = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp
index c551b8be8c..de524ae7f4 100644
--- a/src/d/actor/d_a_obj_lv4prwall.cpp
+++ b/src/d/actor/d_a_obj_lv4prwall.cpp
@@ -8,28 +8,24 @@
 #include "d/actor/d_a_obj_lv4prwall.h"
 #include "d/actor/d_a_obj_swturn.h"
 
-/* 80C698E8-80C698F4 000000 000C+00 2/2 0/0 0/0 .rodata          l_dzbidx */
 static const int l_dzbidx[] = {
     7,
     7,
     7,
 };
 
-/* 80C698F4-80C69900 00000C 000C+00 1/1 0/0 0/0 .rodata          l_bmdidx */
 static const int l_bmdidx[] = {
     4,
     4,
     4,
 };
 
-/* 80C69990-80C6999C -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[3] = {
     "PRWallR09",
     "P_Rwall",
     "PRWallR04",
 };
 
-/* 80C68C98-80C68DD8 000078 0140+00 1/1 0/0 0/1 .text            create1st__16daObjLv4PRwall_cFv */
 int daObjLv4PRwall_c::create1st() {
     mType = getType();
 
@@ -55,7 +51,6 @@ int daObjLv4PRwall_c::create1st() {
     return phase_state;
 }
 
-/* 80C69900-80C69948 000018 0048+00 1/1 0/0 0/0 .rodata          l_cull_box */
 static const Vec l_cull_box[] = {
     {-1600.0f, -100.0f, -1600.0f},
     {1600.0f, 1437.7f, 1600.0f},
@@ -65,7 +60,6 @@ static const Vec l_cull_box[] = {
     {1100.23f, 1000.7f, 1100.23f},
 };
 
-/* 80C68DD8-80C68F20 0001B8 0148+00 3/3 0/0 0/0 .text            setMtx__16daObjLv4PRwall_cFv */
 void daObjLv4PRwall_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x620, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y + field_0x60e);
@@ -87,7 +81,6 @@ void daObjLv4PRwall_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mModelMtx);
 }
 
-/* 80C68F20-80C68FA0 000300 0080+00 1/0 0/0 0/0 .text            CreateHeap__16daObjLv4PRwall_cFv */
 int daObjLv4PRwall_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmdidx[mType]);
     JUT_ASSERT(226, model_data != NULL);
@@ -100,7 +93,6 @@ int daObjLv4PRwall_c::CreateHeap() {
     return 1;
 }
 
-/* 80C68FA0-80C69064 000380 00C4+00 1/0 0/0 0/0 .text            Create__16daObjLv4PRwall_cFv */
 int daObjLv4PRwall_c::Create() {
     fopAcM_SetMtx(this, mModelMtx);
     mpModel->setBaseTRMtx(mModelMtx);
@@ -124,7 +116,6 @@ int daObjLv4PRwall_c::Create() {
     return 1;
 }
 
-/* 80C69064-80C690D8 000444 0074+00 1/1 0/0 0/0 .text            searchObjSwTurn__FPvPv */
 static void* searchObjSwTurn(void* i_actor, void* i_data) {
     daObjSwTurn_c* swturn = (daObjSwTurn_c*)i_actor;
     daObjLv4PRwall_c* prwall = (daObjLv4PRwall_c*)i_data;
@@ -137,7 +128,6 @@ static void* searchObjSwTurn(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C690D8-80C696BC 0004B8 05E4+00 1/0 0/0 0/0 .text Execute__16daObjLv4PRwall_cFPPA3_A4_f */
 int daObjLv4PRwall_c::Execute(Mtx** param_0) {
     daObjSwTurn_c* swturn = (daObjSwTurn_c*)fopAcM_Search(searchObjSwTurn, this);
     if (swturn != NULL) {
@@ -272,7 +262,6 @@ int daObjLv4PRwall_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C696BC-80C69760 000A9C 00A4+00 1/0 0/0 0/0 .text            Draw__16daObjLv4PRwall_cFv */
 int daObjLv4PRwall_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -283,38 +272,28 @@ int daObjLv4PRwall_c::Draw() {
     return 1;
 }
 
-/* 80C69760-80C697A4 000B40 0044+00 1/0 0/0 0/0 .text            Delete__16daObjLv4PRwall_cFv */
 int daObjLv4PRwall_c::Delete() {
     dComIfG_resDelete(this, l_arcName[mType]);
     return 1;
 }
 
-/* 80C697A4-80C69804 000B84 0060+00 1/0 0/0 0/0 .text
- * daObjLv4PRwall_create1st__FP16daObjLv4PRwall_c               */
 static int daObjLv4PRwall_create1st(daObjLv4PRwall_c* i_this) {
     fopAcM_ct(i_this, daObjLv4PRwall_c);
     return i_this->create1st();
 }
 
-/* 80C69804-80C69824 000BE4 0020+00 1/0 0/0 0/0 .text
- * daObjLv4PRwall_MoveBGDelete__FP16daObjLv4PRwall_c            */
 static int daObjLv4PRwall_MoveBGDelete(daObjLv4PRwall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C69824-80C69844 000C04 0020+00 1/0 0/0 0/0 .text
- * daObjLv4PRwall_MoveBGExecute__FP16daObjLv4PRwall_c           */
 static int daObjLv4PRwall_MoveBGExecute(daObjLv4PRwall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C69844-80C69870 000C24 002C+00 1/0 0/0 0/0 .text
- * daObjLv4PRwall_MoveBGDraw__FP16daObjLv4PRwall_c              */
 static int daObjLv4PRwall_MoveBGDraw(daObjLv4PRwall_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6999C-80C699BC -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4PRwall_METHODS */
 static actor_method_class daObjLv4PRwall_METHODS = {
     (process_method_func)daObjLv4PRwall_create1st,
     (process_method_func)daObjLv4PRwall_MoveBGDelete,
@@ -323,7 +302,6 @@ static actor_method_class daObjLv4PRwall_METHODS = {
     (process_method_func)daObjLv4PRwall_MoveBGDraw,
 };
 
-/* 80C699BC-80C699EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4PRwall */
 extern actor_process_profile_definition g_profile_Obj_Lv4PRwall = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp
index 4e2c23d3e1..f49ac3edc9 100644
--- a/src/d/actor/d_a_obj_lv4sand.cpp
+++ b/src/d/actor/d_a_obj_lv4sand.cpp
@@ -8,16 +8,13 @@
 #include "d/actor/d_a_obj_lv4sand.h"
 #include "d/d_s_play.h"
 
-/* 80C6A400-80C6A404 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_L4Sand";
 
-/* 80C69A98-80C69AD4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C69AD4-80C69B50 0000B4 007C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mHeight, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -25,7 +22,6 @@ void daObjLv4Sand_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C69B50-80C69C28 000130 00D8+00 1/0 0/0 0/0 .text            Create__14daObjLv4Sand_cFv */
 int daObjLv4Sand_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit()) || dComIfGs_isStageBossEnemy() || BREG_S(9) != 0) {
         mHeight = -3500.0f;
@@ -42,7 +38,6 @@ int daObjLv4Sand_c::Create() {
     return 1;
 }
 
-/* 80C69C28-80C69D44 000208 011C+00 1/0 0/0 0/0 .text            CreateHeap__14daObjLv4Sand_cFv */
 int daObjLv4Sand_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(167, modelData != NULL);
@@ -62,7 +57,6 @@ int daObjLv4Sand_c::CreateHeap() {
     return 1;
 }
 
-/* 80C69D8C-80C69E10 00036C 0084+00 1/1 0/0 0/0 .text            create1st__14daObjLv4Sand_cFv */
 int daObjLv4Sand_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -75,8 +69,6 @@ int daObjLv4Sand_c::create1st() {
     return phase_state;
 }
 
-/* 80C69E10-80C69F18 0003F0 0108+00 1/0 0/0 0/0 .text            Execute__14daObjLv4Sand_cFPPA3_A4_f
- */
 int daObjLv4Sand_c::Execute(Mtx** param_0) {
     action();
     *param_0 = &mBgMtx;
@@ -94,7 +86,6 @@ int daObjLv4Sand_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C69F18-80C69FBC 0004F8 00A4+00 1/1 0/0 0/0 .text            action__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::action() {
     static void (daObjLv4Sand_c::*l_func[])() = {
         &daObjLv4Sand_c::mode_wait,
@@ -105,27 +96,21 @@ void daObjLv4Sand_c::action() {
     (this->*l_func[mMode])();
 }
 
-/* 80C69FBC-80C69FC8 00059C 000C+00 1/1 0/0 0/0 .text            mode_init_wait__14daObjLv4Sand_cFv
- */
 void daObjLv4Sand_c::mode_init_wait() {
     mMode = MODE_WAIT;
 }
 
-/* 80C69FC8-80C6A01C 0005A8 0054+00 1/0 0/0 0/0 .text            mode_wait__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::mode_wait() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         mode_init_move();
     }
 }
 
-/* 80C6A01C-80C6A034 0005FC 0018+00 2/2 0/0 0/0 .text            mode_init_move__14daObjLv4Sand_cFv
- */
 void daObjLv4Sand_c::mode_init_move() {
     speed.y = 0.0f;
     mMode = MODE_MOVE;
 }
 
-/* 80C6A034-80C6A09C 000614 0068+00 1/0 0/0 0/0 .text            mode_move__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::mode_move() {
     cLib_chaseF(&speed.y, 8.5f + KREG_F(1), 0.3f + KREG_F(2));
     if (cLib_chaseF(&mHeight, -3500.0f, speed.y)) {
@@ -133,22 +118,17 @@ void daObjLv4Sand_c::mode_move() {
     }
 }
 
-/* 80C6A09C-80C6A0A8 00067C 000C+00 2/2 0/0 0/0 .text            mode_init_dead__14daObjLv4Sand_cFv
- */
 void daObjLv4Sand_c::mode_init_dead() {
     mMode = MODE_DEAD;
 }
 
-/* 80C6A0A8-80C6A0AC 000688 0004+00 1/0 0/0 0/0 .text            mode_dead__14daObjLv4Sand_cFv */
 void daObjLv4Sand_c::mode_dead() {}
 
-/* 80C6A0AC-80C6A0D0 00068C 0024+00 2/1 0/0 0/0 .text            eventStart__14daObjLv4Sand_cFv */
 bool daObjLv4Sand_c::eventStart() {
     mode_init_move();
     return true;
 }
 
-/* 80C6A0D0-80C6A18C 0006B0 00BC+00 1/0 0/0 0/0 .text            Draw__14daObjLv4Sand_cFv */
 int daObjLv4Sand_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -160,38 +140,28 @@ int daObjLv4Sand_c::Draw() {
     return 1;
 }
 
-/* 80C6A18C-80C6A1C0 00076C 0034+00 1/0 0/0 0/0 .text            Delete__14daObjLv4Sand_cFv */
 int daObjLv4Sand_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C6A1C0-80C6A240 0007A0 0080+00 1/0 0/0 0/0 .text daObjLv4Sand_create1st__FP14daObjLv4Sand_c
- */
 static int daObjLv4Sand_create1st(daObjLv4Sand_c* i_this) {
     fopAcM_ct(i_this, daObjLv4Sand_c);
     return i_this->create1st();
 }
 
-/* 80C6A240-80C6A260 000820 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Sand_MoveBGDelete__FP14daObjLv4Sand_c                */
 static int daObjLv4Sand_MoveBGDelete(daObjLv4Sand_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6A260-80C6A280 000840 0020+00 1/0 0/0 0/0 .text
- * daObjLv4Sand_MoveBGExecute__FP14daObjLv4Sand_c               */
 static int daObjLv4Sand_MoveBGExecute(daObjLv4Sand_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6A280-80C6A2AC 000860 002C+00 1/0 0/0 0/0 .text daObjLv4Sand_MoveBGDraw__FP14daObjLv4Sand_c
- */
 static int daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6A44C-80C6A46C -00001 0020+00 1/0 0/0 0/0 .data            daObjLv4Sand_METHODS */
 static actor_method_class daObjLv4Sand_METHODS = {
     (process_method_func)daObjLv4Sand_create1st,
     (process_method_func)daObjLv4Sand_MoveBGDelete,
@@ -200,7 +170,6 @@ static actor_method_class daObjLv4Sand_METHODS = {
     (process_method_func)daObjLv4Sand_MoveBGDraw,
 };
 
-/* 80C6A46C-80C6A49C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv4Sand */
 extern actor_process_profile_definition g_profile_Obj_Lv4Sand = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp
index f1f1ac6c3e..7cffaf0a2b 100644
--- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp
+++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C6A60C-80C6A658 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__16daFlorBoad_HIO_cFv */
 daFlorBoad_HIO_c::daFlorBoad_HIO_c() {
     field_0x10 = 3;
     field_0x11 = 2;
@@ -19,7 +18,6 @@ daFlorBoad_HIO_c::daFlorBoad_HIO_c() {
     field_0x4.z = 1.0f;
 }
 
-/* 80C6A6FC-80C6A784 0001DC 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daFlorBoad_cFv */
 void daFlorBoad_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -28,7 +26,6 @@ void daFlorBoad_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daFlorBoad_cFv */
 int daFlorBoad_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5haYuka", 4);
     JUT_ASSERT(0, modelData != NULL);
@@ -41,7 +38,6 @@ int daFlorBoad_c::CreateHeap() {
     return 1;
 }
 
-/* 80C6A7F0-80C6A9C0 0002D0 01D0+00 1/1 0/0 0/0 .text            create__12daFlorBoad_cFv */
 int daFlorBoad_c::create() {
     fopAcM_ct(this, daFlorBoad_c);
 
@@ -70,8 +66,6 @@ int daFlorBoad_c::create() {
     return phase;
 }
 
-/* 80C6AAAC-80C6AB04 00058C 0058+00 1/0 0/0 0/0 .text            Execute__12daFlorBoad_cFPPA3_A4_f
- */
 int daFlorBoad_c::Execute(Mtx** param_0) {
     procMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -80,10 +74,8 @@ int daFlorBoad_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C6B30C-80C6B320 000014 0014+00 2/2 0/0 0/0 .bss             l_HIO */
 static daFlorBoad_HIO_c l_HIO;
 
-/* 80C6B14C-80C6B17C 000004 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daFlorBoad_c */
 const dCcD_SrcGObjInf daFlorBoad_c::mCcDObjInfo = {
     {0, {{0, 1, 0}, {0x400020, 0x11}, {0}}},
     {dCcD_SE_SWORD, 0, 0, 2, 1},
@@ -91,7 +83,6 @@ const dCcD_SrcGObjInf daFlorBoad_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C6B1B8-80C6B1FC 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daFlorBoad_c */
 dCcD_SrcCyl daFlorBoad_c::mCcDCyl = {
     daFlorBoad_c::mCcDObjInfo,
     {
@@ -101,7 +92,6 @@ dCcD_SrcCyl daFlorBoad_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80C6AB04-80C6AB90 0005E4 008C+00 1/1 0/0 0/0 .text            procMain__12daFlorBoad_cFv */
 void daFlorBoad_c::procMain() {
     typedef void (daFlorBoad_c::*procFunc)();
     static procFunc mode_proc[] = {
@@ -112,13 +102,11 @@ void daFlorBoad_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C6AB90-80C6ABAC 000670 001C+00 1/1 0/0 0/0 .text            init_modeWait__12daFlorBoad_cFv */
 void daFlorBoad_c::init_modeWait() {
     field_0x725 = l_HIO.field_0x10;
     mMode = MODE_WAIT;
 }
 
-/* 80C6ABAC-80C6AC9C 00068C 00F0+00 1/0 0/0 0/0 .text            modeWait__12daFlorBoad_cFv */
 void daFlorBoad_c::modeWait() {
     if (mCcCyl.ChkTgHit()) {
         dCcD_GObjInf* hit_obj = mCcCyl.GetTgHitGObj();
@@ -144,7 +132,6 @@ void daFlorBoad_c::modeWait() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80C6AC9C-80C6AD40 00077C 00A4+00 1/1 0/0 0/0 .text            init_modeBreak__12daFlorBoad_cFv */
 void daFlorBoad_c::init_modeBreak() {
     if (mSwBit1 != 0xFF) {
         fopAcM_onSwitch(this, mSwBit1);
@@ -155,7 +142,6 @@ void daFlorBoad_c::init_modeBreak() {
     mMode = MODE_BREAK;
 }
 
-/* 80C6AD40-80C6AEB0 000820 0170+00 1/0 0/0 0/0 .text            modeBreak__12daFlorBoad_cFv */
 void daFlorBoad_c::modeBreak() {
     dComIfGp_particle_set(0x8C01, &current.pos, NULL, NULL);
     dComIfGp_particle_set(0x8C02, &current.pos, NULL, NULL);
@@ -164,7 +150,6 @@ void daFlorBoad_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C6AEB0-80C6AF54 000990 00A4+00 1/0 0/0 0/0 .text            Draw__12daFlorBoad_cFv */
 int daFlorBoad_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -175,43 +160,33 @@ int daFlorBoad_c::Draw() {
     return 1;
 }
 
-/* 80C6AF54-80C6AF84 000A34 0030+00 1/0 0/0 0/0 .text            Delete__12daFlorBoad_cFv */
 int daFlorBoad_c::Delete() {
     dComIfG_resDelete(&mPhase, "L5haYuka");
     return 1;
 }
 
-/* 80C6AF84-80C6AFB0 000A64 002C+00 1/0 0/0 0/0 .text            daFlorBoad_Draw__FP12daFlorBoad_c
- */
 static int daFlorBoad_Draw(daFlorBoad_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6AFB0-80C6AFD0 000A90 0020+00 1/0 0/0 0/0 .text daFlorBoad_Execute__FP12daFlorBoad_c */
 static int daFlorBoad_Execute(daFlorBoad_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6AFD0-80C6AFF0 000AB0 0020+00 1/0 0/0 0/0 .text            daFlorBoad_Delete__FP12daFlorBoad_c
- */
 static int daFlorBoad_Delete(daFlorBoad_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6AFF0-80C6B010 000AD0 0020+00 1/0 0/0 0/0 .text            daFlorBoad_Create__FP10fopAc_ac_c
- */
 static int daFlorBoad_Create(fopAc_ac_c* i_this) {
     return ((daFlorBoad_c*)i_this)->create();
 }
 
-/* 80C6B22C-80C6B24C -00001 0020+00 1/0 0/0 0/0 .data            l_daFlorBoad_Method */
 static actor_method_class l_daFlorBoad_Method = {
     (process_method_func)daFlorBoad_Create,  (process_method_func)daFlorBoad_Delete,
     (process_method_func)daFlorBoad_Execute, (process_method_func)NULL,
     (process_method_func)daFlorBoad_Draw,
 };
 
-/* 80C6B24C-80C6B27C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv5FBoard */
 extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp
index 69b29dab51..7dfe4e3134 100644
--- a/src/d/actor/d_a_obj_lv5IceWall.cpp
+++ b/src/d/actor/d_a_obj_lv5IceWall.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C6B42C-80C6B478 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__15daIceWall_HIO_cFv */
 daIceWall_HIO_c::daIceWall_HIO_c() {
     hitcount = 3;
     hitcount2 = 2;
@@ -19,7 +18,6 @@ daIceWall_HIO_c::daIceWall_HIO_c() {
     xyz.z = 1.0f;
 }
 
-/* 80C6B51C-80C6B5E4 0001DC 00C8+00 2/2 0/0 0/0 .text            setBaseMtx__11daIceWall_cFv */
 void daIceWall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -30,7 +28,6 @@ void daIceWall_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text            CreateHeap__11daIceWall_cFv */
 int daIceWall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4);
     JUT_ASSERT(0, modelData != NULL);
@@ -51,10 +48,8 @@ int daIceWall_c::CreateHeap() {
     return 1;
 }
 
-/* 80C6C83C-80C6C850 000014 0014+00 3/3 0/0 0/0 .bss             l_HIO */
 static daIceWall_HIO_c l_HIO;
 
-/* 80C6C644-80C6C674 000004 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__11daIceWall_c */
 const dCcD_SrcGObjInf daIceWall_c::mCcDObjInfo = {
     {0, {{0x100, 1, 0}, {0x400000, 0x11}, {0}}},
     {dCcD_SE_SWORD, 0, 0, 2, 1},
@@ -62,7 +57,6 @@ const dCcD_SrcGObjInf daIceWall_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C6C6E8-80C6C72C 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daIceWall_c */
 dCcD_SrcCyl daIceWall_c::mCcDCyl = {
     daIceWall_c::mCcDObjInfo,
     {
@@ -72,10 +66,8 @@ dCcD_SrcCyl daIceWall_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80C6C674-80C6C67C 000034 0008+00 0/0 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {4, 5};
 
-/* 80C6B69C-80C6B924 00035C 0288+00 1/1 0/0 0/0 .text            create__11daIceWall_cFv */
 int daIceWall_c::create() {
     fopAcM_ct(this, daIceWall_c);
 
@@ -121,7 +113,6 @@ int daIceWall_c::create() {
     return phase;
 }
 
-/* 80C6BB60-80C6BBC4 000820 0064+00 1/0 0/0 0/0 .text            Execute__11daIceWall_cFPPA3_A4_f */
 int daIceWall_c::Execute(Mtx** param_0) {
     procMain();
     *param_0 = &mpModel[mIsBreaking]->getBaseTRMtx();
@@ -130,7 +121,6 @@ int daIceWall_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C6BBC4-80C6BC50 000884 008C+00 1/1 0/0 0/0 .text            procMain__11daIceWall_cFv */
 void daIceWall_c::procMain() {
     typedef void (daIceWall_c::*procFunc)();
     static procFunc mode_proc[] = {
@@ -141,13 +131,11 @@ void daIceWall_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C6BC50-80C6BC6C 000910 001C+00 1/1 0/0 0/0 .text            init_modeWait__11daIceWall_cFv */
 void daIceWall_c::init_modeWait() {
     mHitcount = l_HIO.hitcount;
     mMode = MODE_WAIT;
 }
 
-/* 80C6BC6C-80C6C170 00092C 0504+00 1/0 0/0 0/0 .text            modeWait__11daIceWall_cFv */
 void daIceWall_c::modeWait() {
     for (int i = 0; i < 2; i++) {
         if (mCcCyl[i].ChkTgHit()) {
@@ -235,7 +223,6 @@ void daIceWall_c::modeWait() {
     }
 }
 
-/* 80C6C170-80C6C1C0 000E30 0050+00 1/1 0/0 0/0 .text            init_modeBreak__11daIceWall_cFv */
 void daIceWall_c::init_modeBreak() {
     if (mIsBreakSwBit != 0xFF) {
         fopAcM_onSwitch(this, mIsBreakSwBit);
@@ -244,7 +231,6 @@ void daIceWall_c::init_modeBreak() {
     mMode = MODE_BREAK;
 }
 
-/* 80C6C1C0-80C6C374 000E80 01B4+00 1/0 0/0 0/0 .text            modeBreak__11daIceWall_cFv */
 void daIceWall_c::modeBreak() {
     cXyz ptcl_scale(1.0f, 1.0f, 1.0f);
     mEmitter0ID = dComIfGp_particle_set(mEmitter0ID, 0x867B, &current.pos, &shape_angle,
@@ -268,7 +254,6 @@ void daIceWall_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C6C374-80C6C44C 001034 00D8+00 1/0 0/0 0/0 .text            Draw__11daIceWall_cFv */
 int daIceWall_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[mIsBreaking], &tevStr);
@@ -281,42 +266,33 @@ int daIceWall_c::Draw() {
     return 1;
 }
 
-/* 80C6C44C-80C6C47C 00110C 0030+00 1/0 0/0 0/0 .text            Delete__11daIceWall_cFv */
 int daIceWall_c::Delete() {
     dComIfG_resDelete(&mPhase, "l5IceWall");
     return 1;
 }
 
-/* 80C6C47C-80C6C4A8 00113C 002C+00 1/0 0/0 0/0 .text            daIceWall_Draw__FP11daIceWall_c */
 static int daIceWall_Draw(daIceWall_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6C4A8-80C6C4C8 001168 0020+00 1/0 0/0 0/0 .text            daIceWall_Execute__FP11daIceWall_c
- */
 static int daIceWall_Execute(daIceWall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6C4C8-80C6C4E8 001188 0020+00 1/0 0/0 0/0 .text            daIceWall_Delete__FP11daIceWall_c
- */
 static int daIceWall_Delete(daIceWall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6C4E8-80C6C508 0011A8 0020+00 1/0 0/0 0/0 .text            daIceWall_Create__FP10fopAc_ac_c */
 static int daIceWall_Create(fopAc_ac_c* i_this) {
     return ((daIceWall_c*)i_this)->create();
 }
 
-/* 80C6C75C-80C6C77C -00001 0020+00 1/0 0/0 0/0 .data            l_daIceWall_Method */
 static actor_method_class l_daIceWall_Method = {
     (process_method_func)daIceWall_Create,  (process_method_func)daIceWall_Delete,
     (process_method_func)daIceWall_Execute, (process_method_func)NULL,
     (process_method_func)daIceWall_Draw,
 };
 
-/* 80C6C77C-80C6C7AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_IceWall */
 extern actor_process_profile_definition g_profile_Obj_IceWall = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp
index 4ad3180d74..e2065e2bb9 100644
--- a/src/d/actor/d_a_obj_lv5SwIce.cpp
+++ b/src/d/actor/d_a_obj_lv5SwIce.cpp
@@ -9,12 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C6C94C-80C6C97C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__16daLv5SwIce_HIO_cFv */
 daLv5SwIce_HIO_c::daLv5SwIce_HIO_c() {
     hitcount = 3;
 }
 
-/* 80C6CA20-80C6CAA8 0001C0 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daLv5SwIce_cFv */
 void daLv5SwIce_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -23,7 +21,6 @@ void daLv5SwIce_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daLv5SwIce_cFv */
 int daLv5SwIce_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5SwIce", 4);
     JUT_ASSERT(0, modelData != NULL);
@@ -36,7 +33,6 @@ int daLv5SwIce_c::CreateHeap() {
     return 1;
 }
 
-/* 80C6CB14-80C6CCE4 0002B4 01D0+00 1/1 0/0 0/0 .text            create__12daLv5SwIce_cFv */
 int daLv5SwIce_c::create() {
     fopAcM_ct(this, daLv5SwIce_c);
 
@@ -64,8 +60,6 @@ int daLv5SwIce_c::create() {
     return phase;
 }
 
-/* 80C6CDD0-80C6CE28 000570 0058+00 1/0 0/0 0/0 .text            Execute__12daLv5SwIce_cFPPA3_A4_f
- */
 int daLv5SwIce_c::Execute(Mtx** param_0) {
     procMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -74,10 +68,8 @@ int daLv5SwIce_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C6D6D4-80C6D6DC 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daLv5SwIce_HIO_c l_HIO;
 
-/* 80C6D508-80C6D538 000000 0030+00 3/3 0/0 0/0 .rodata          mCcDObjInfo__12daLv5SwIce_c */
 const dCcD_SrcGObjInf daLv5SwIce_c::mCcDObjInfo = {
     {0, {{0x100, 1, 0}, {0x400000, 0x11}, {0}}},
     {dCcD_SE_SWORD, 0, 0, 2, 1},
@@ -85,7 +77,6 @@ const dCcD_SrcGObjInf daLv5SwIce_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C6D580-80C6D5C4 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daLv5SwIce_c */
 dCcD_SrcCyl daLv5SwIce_c::mCcDCyl = {
     daLv5SwIce_c::mCcDObjInfo,
     {
@@ -95,7 +86,6 @@ dCcD_SrcCyl daLv5SwIce_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80C6CE28-80C6CEB4 0005C8 008C+00 1/1 0/0 0/0 .text            procMain__12daLv5SwIce_cFv */
 void daLv5SwIce_c::procMain() {
     typedef void (daLv5SwIce_c::*procFunc)();
     static procFunc mode_proc[] = {
@@ -106,13 +96,11 @@ void daLv5SwIce_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C6CEB4-80C6CED0 000654 001C+00 1/1 0/0 0/0 .text            init_modeWait__12daLv5SwIce_cFv */
 void daLv5SwIce_c::init_modeWait() {
     mHitcount = l_HIO.hitcount;
     mMode = MODE_WAIT;
 }
 
-/* 80C6CED0-80C6D0F4 000670 0224+00 1/0 0/0 0/0 .text            modeWait__12daLv5SwIce_cFv */
 void daLv5SwIce_c::modeWait() {
     if (mCcCyl.ChkTgHit()) {
         dCcD_GObjInf* hit_obj = mCcCyl.GetTgHitGObj();
@@ -150,7 +138,6 @@ void daLv5SwIce_c::modeWait() {
     }
 }
 
-/* 80C6D0F4-80C6D144 000894 0050+00 1/1 0/0 0/0 .text            init_modeBreak__12daLv5SwIce_cFv */
 void daLv5SwIce_c::init_modeBreak() {
     if (mSwBit1 != 0xFF) {
         fopAcM_onSwitch(this, mSwBit1);
@@ -159,7 +146,6 @@ void daLv5SwIce_c::init_modeBreak() {
     mMode = MODE_BREAK;
 }
 
-/* 80C6D144-80C6D260 0008E4 011C+00 1/0 0/0 0/0 .text            modeBreak__12daLv5SwIce_cFv */
 void daLv5SwIce_c::modeBreak() {
     cXyz ptcl_scale(0.75f, 0.75f, 0.75f);
     for (int i = 0; i < 2; i++) {
@@ -172,7 +158,6 @@ void daLv5SwIce_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C6D260-80C6D314 000A00 00B4+00 1/0 0/0 0/0 .text            Draw__12daLv5SwIce_cFv */
 int daLv5SwIce_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -185,43 +170,33 @@ int daLv5SwIce_c::Draw() {
     return 1;
 }
 
-/* 80C6D314-80C6D344 000AB4 0030+00 1/0 0/0 0/0 .text            Delete__12daLv5SwIce_cFv */
 int daLv5SwIce_c::Delete() {
     dComIfG_resDelete(&mPhase, "L5SwIce");
     return 1;
 }
 
-/* 80C6D344-80C6D370 000AE4 002C+00 1/0 0/0 0/0 .text            daLv5SwIce_Draw__FP12daLv5SwIce_c
- */
 static int daLv5SwIce_Draw(daLv5SwIce_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6D370-80C6D390 000B10 0020+00 1/0 0/0 0/0 .text daLv5SwIce_Execute__FP12daLv5SwIce_c */
 static int daLv5SwIce_Execute(daLv5SwIce_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6D390-80C6D3B0 000B30 0020+00 1/0 0/0 0/0 .text            daLv5SwIce_Delete__FP12daLv5SwIce_c
- */
 static int daLv5SwIce_Delete(daLv5SwIce_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6D3B0-80C6D3D0 000B50 0020+00 1/0 0/0 0/0 .text            daLv5SwIce_Create__FP10fopAc_ac_c
- */
 static int daLv5SwIce_Create(fopAc_ac_c* i_this) {
     return ((daLv5SwIce_c*)i_this)->create();
 }
 
-/* 80C6D5F4-80C6D614 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv5SwIce_Method */
 static actor_method_class l_daLv5SwIce_Method = {
     (process_method_func)daLv5SwIce_Create,  (process_method_func)daLv5SwIce_Delete,
     (process_method_func)daLv5SwIce_Execute, (process_method_func)NULL,
     (process_method_func)daLv5SwIce_Draw,
 };
 
-/* 80C6D614-80C6D644 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv5SwIce */
 extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp
index 9176d0e99b..f9def42d2a 100644
--- a/src/d/actor/d_a_obj_lv5ychndlr.cpp
+++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp
@@ -11,10 +11,8 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C6E9F4-80C6E9F8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Ychandelr";
 
-/* 80C6D758-80C6D7E0 000078 0088+00 1/1 0/0 0/0 .text            create1st__14daObjYchndlr_cFv */
 int daObjYchndlr_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -27,16 +25,13 @@ int daObjYchndlr_c::create1st() {
     return phase;
 }
 
-/* 80C6E980-80C6E988 000000 0008+00 2/2 0/0 0/0 .rodata          l_bmdidx */
 static const int l_bmdidx[] = {4, 5};
 
-/* 80C6E988-80C6E9A0 000008 0018+00 1/1 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-1500.0f, -2500.0f, -500.0f},
     {1500.0f, 200.0f, 500.0f},
 };
 
-/* 80C6E9F8-80C6EA28 000004 0030+00 2/2 0/0 0/0 .data            l_shaft_vec */
 static Vec l_shaft_vec[] = {
     {-140.0f, 0.0f, 200.0f},
     {140.0f, 0.0f, 200.0f},
@@ -44,10 +39,8 @@ static Vec l_shaft_vec[] = {
     {140.0f, 0.0f, -200.0f},
 };
 
-/* 80C6EA28-80C6EA30 000034 0008+00 1/1 0/0 0/0 .data            l_shaft_roty */
 static s16 l_shaft_roty[] = {0x7FFF, 0x7FFF, 0x0000, 0x0000};
 
-/* 80C6D7E0-80C6D980 000100 01A0+00 2/2 0/0 0/0 .text            setMtx__14daObjYchndlr_cFv */
 void daObjYchndlr_c::setMtx() {
     for (int i = 0; i < 4; i++) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -72,13 +65,10 @@ void daObjYchndlr_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x5a8);
 }
 
-/* 80C6D980-80C6D9A8 0002A0 0028+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     ((daObjYchndlr_c*)i_this)->rideActor(i_rideActor);
 }
 
-/* 80C6D9A8-80C6DA5C 0002C8 00B4+00 1/1 0/0 0/0 .text rideActor__14daObjYchndlr_cFP10fopAc_ac_c */
 void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) {
     field_0xc8c = 1;
 
@@ -94,7 +84,6 @@ void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text            CreateHeap__14daObjYchndlr_cFv */
 int daObjYchndlr_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]);
     JUT_ASSERT(0, model_data != NULL);
@@ -117,7 +106,6 @@ int daObjYchndlr_c::CreateHeap() {
     return 1;
 }
 
-/* 80C6EA30-80C6EA74 00003C 0044+00 1/1 0/0 0/0 .data            l_cc_src_shaft_cyl */
 static dCcD_SrcCyl l_cc_src_shaft_cyl = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}},  // mObj
@@ -132,7 +120,6 @@ static dCcD_SrcCyl l_cc_src_shaft_cyl = {
     }  // mCyl
 };
 
-/* 80C6EA74-80C6EAB8 000080 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x408000, 0x11}, 0x0}},  // mObj
@@ -147,7 +134,6 @@ static dCcD_SrcCyl l_cc_cyl_src = {
     }  // mCyl
 };
 
-/* 80C6DB5C-80C6DC64 00047C 0108+00 1/0 0/0 0/0 .text            Create__14daObjYchndlr_cFv */
 int daObjYchndlr_c::Create() {
     fopAcM_SetMtx(this, field_0x5d8);
     setMtx();
@@ -174,8 +160,6 @@ int daObjYchndlr_c::Create() {
     return 1;
 }
 
-/* 80C6DC64-80C6E300 000584 069C+00 1/0 0/0 0/0 .text            Execute__14daObjYchndlr_cFPPA3_A4_f
- */
 int daObjYchndlr_c::Execute(Mtx** param_0) {
     s16 var_r27 = mShaftRotZ;
     if (var_r27 < 0) {
@@ -329,7 +313,6 @@ int daObjYchndlr_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C6E300-80C6E3C8 000C20 00C8+00 1/0 0/0 0/0 .text            Draw__14daObjYchndlr_cFv */
 int daObjYchndlr_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpChandlierModel, &tevStr);
@@ -345,45 +328,34 @@ int daObjYchndlr_c::Draw() {
     return 1;
 }
 
-/* 80C6E3C8-80C6E404 000CE8 003C+00 1/0 0/0 0/0 .text            Delete__14daObjYchndlr_cFv */
 int daObjYchndlr_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80C6E404-80C6E518 000D24 0114+00 1/0 0/0 0/0 .text daObjYchndlr_create1st__FP14daObjYchndlr_c
- */
 static int daObjYchndlr_create1st(daObjYchndlr_c* i_this) {
     fopAcM_ct(i_this, daObjYchndlr_c);
     return i_this->create1st();
 }
 
-/* 80C6E754-80C6E774 001074 0020+00 1/0 0/0 0/0 .text
- * daObjYchndlr_MoveBGDelete__FP14daObjYchndlr_c                */
 static int daObjYchndlr_MoveBGDelete(daObjYchndlr_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C6E774-80C6E794 001094 0020+00 1/0 0/0 0/0 .text
- * daObjYchndlr_MoveBGExecute__FP14daObjYchndlr_c               */
 static int daObjYchndlr_MoveBGExecute(daObjYchndlr_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C6E794-80C6E7C0 0010B4 002C+00 1/0 0/0 0/0 .text daObjYchndlr_MoveBGDraw__FP14daObjYchndlr_c
- */
 static int daObjYchndlr_MoveBGDraw(daObjYchndlr_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C6EAB8-80C6EAD8 -00001 0020+00 1/0 0/0 0/0 .data            daObjYchndlr_METHODS */
 static actor_method_class daObjYchndlr_METHODS = {
     (process_method_func)daObjYchndlr_create1st,     (process_method_func)daObjYchndlr_MoveBGDelete,
     (process_method_func)daObjYchndlr_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjYchndlr_MoveBGDraw,
 };
 
-/* 80C6EAD8-80C6EB08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ychndlr */
 extern actor_process_profile_definition g_profile_Obj_Ychndlr = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp
index 8a6ec0588b..d5393d6379 100644
--- a/src/d/actor/d_a_obj_lv5yiblltray.cpp
+++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp
@@ -12,10 +12,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_obj_carry.h"
 
-/* 80C70A38-80C70A3C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "YIblltray";
 
-/* 80C6EBF8-80C6EC88 000078 0090+00 1/1 0/0 0/0 .text            create1st__16daObjYIblltray_cFv */
 int daObjYIblltray_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -30,19 +28,15 @@ int daObjYIblltray_c::create1st() {
     return phase;
 }
 
-/* 80C709A0-80C709B8 000000 0018+00 3/3 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-238.95999f, -200.0f, -134.22f},
     {238.95999f, 200.0f, 218.67f},
 };
 
-/* 80C70A3C-80C70A48 000004 000C+00 1/1 0/0 0/0 .data            l_in_ball */
 static Vec l_in_ball = {0.0f, 0.0f, 87.0f};
 
-/* 80C70A48-80C70A54 000010 000C+00 1/1 0/0 0/0 .data            l_base */
 static Vec l_base = {0.0f, 0.0f, -60.0f};
 
-/* 80C6EC88-80C6EDA8 000108 0120+00 3/3 0/0 0/0 .text            setMtx__16daObjYIblltray_cFv */
 void daObjYIblltray_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -65,7 +59,6 @@ void daObjYIblltray_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mHandleMtx);
 }
 
-/* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text            CreateHeap__16daObjYIblltray_cFv */
 int daObjYIblltray_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9);
     JUT_ASSERT(0, model_data != NULL);
@@ -92,16 +85,12 @@ int daObjYIblltray_c::CreateHeap() {
     return 1;
 }
 
-/* 80C6EED4-80C6EEFC 000354 0028+00 1/1 0/0 0/0 .text
- * rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallback(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     ((daObjYIblltray_c*)i_this)->rideActor(i_rideActor);
 }
 
-/* 80C70A54-80C70A60 00001C 000C+00 1/1 0/0 0/0 .data            l_back_pos */
 static Vec l_back_pos = {0.0f, -52.0f, -369.0f};
 
-/* 80C70A60-80C70AA4 000028 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x39}},  // mObj
@@ -116,7 +105,6 @@ static dCcD_SrcCyl l_cc_cyl_src = {
     }  // mCyl
 };
 
-/* 80C6EEFC-80C6F1E8 00037C 02EC+00 1/0 0/0 0/0 .text            Create__16daObjYIblltray_cFv */
 int daObjYIblltray_c::Create() {
     mpTrayModel->setBaseTRMtx(mTrayMtx);
     fopAcM_SetMtx(this, mTrayMtx);
@@ -188,8 +176,6 @@ int daObjYIblltray_c::Create() {
     return 1;
 }
 
-/* 80C6F1E8-80C6F23C 000668 0054+00 2/2 0/0 0/0 .text rideActor__16daObjYIblltray_cFP10fopAc_ac_c
- */
 void daObjYIblltray_c::rideActor(fopAc_ac_c* i_actor) {
     if (mBallID == fpcM_ERROR_PROCESS_ID_e && fopAcM_GetProfName(i_actor) == PROC_Obj_Carry &&
         ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_IRON_BALL)
@@ -200,7 +186,6 @@ void daObjYIblltray_c::rideActor(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80C6F23C-80C6F2BC 0006BC 0080+00 1/1 0/0 0/0 .text            sendBall__16daObjYIblltray_cFUi */
 void daObjYIblltray_c::sendBall(fpc_ProcID i_ID) {
     mBallID = i_ID;
     mMode = MODE_SEND_BALL;
@@ -212,7 +197,6 @@ void daObjYIblltray_c::sendBall(fpc_ProcID i_ID) {
     fopAcM_SetRoomNo(ball, fopAcM_GetHomeRoomNo(this));
 }
 
-/* 80C6F2BC-80C6F338 00073C 007C+00 1/1 0/0 0/0 .text            searchObjYIblltray__FPvPv */
 static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) {
     if (i_trayB != NULL && fopAcM_IsActor(i_trayB) &&
         fopAcM_GetProfName(i_trayB) == PROC_Obj_YIblltray && i_trayB != i_trayA)
@@ -225,7 +209,6 @@ static fopAc_ac_c* searchObjYIblltray(void* i_trayB, void* i_trayA) {
     return NULL;
 }
 
-/* 80C6F338-80C6F3BC 0007B8 0084+00 1/1 0/0 0/0 .text            searchNearIronball__FPvPv */
 static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) {
     if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry &&
         ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL &&
@@ -238,8 +221,6 @@ static fopAc_ac_c* searchNearIronball(void* i_ball, void* i_tray) {
     return NULL;
 }
 
-/* 80C6F3BC-80C6F440 00083C 0084+00 1/1 0/0 0/0 .text            searchNearBackTrayIronball__FPvPv
- */
 static fopAc_ac_c* searchNearBackTrayIronball(void* i_ball, void* i_tray) {
     if (i_ball != NULL && fopAcM_IsActor(i_ball) && fopAcM_GetProfName(i_ball) == PROC_Obj_Carry &&
         ((daObjCarry_c*)i_ball)->getType() == daObjCarry_c::TYPE_IRON_BALL &&
@@ -252,19 +233,14 @@ static fopAc_ac_c* searchNearBackTrayIronball(void* i_ball, void* i_tray) {
     return NULL;
 }
 
-/* 80C6F440-80C6F450 0008C0 0010+00 1/1 0/0 0/0 .text            onAttention__16daObjYIblltray_cFv
- */
 void daObjYIblltray_c::onAttention() {
     attention_info.flags |= fopAc_AttnFlag_ETC_e;
 }
 
-/* 80C6F450-80C6F460 0008D0 0010+00 1/1 0/0 0/0 .text            offAttention__16daObjYIblltray_cFv
- */
 void daObjYIblltray_c::offAttention() {
     attention_info.flags &= ~fopAc_AttnFlag_ETC_e;
 }
 
-/* 80C6F460-80C702E0 0008E0 0E80+00 1/0 0/0 0/0 .text Execute__16daObjYIblltray_cFPPA3_A4_f */
 int daObjYIblltray_c::Execute(Mtx** param_0) {
     if (!getNoSameRoom() && mTrayID == fpcM_ERROR_PROCESS_ID_e) {
         daObjYIblltray_c* ptray =
@@ -545,7 +521,6 @@ int daObjYIblltray_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C702E0-80C70330 001760 0050+00 1/1 0/0 0/0 .text            initRotTo__16daObjYIblltray_cFv */
 void daObjYIblltray_c::initRotTo() {
     mMode = MODE_INIT_ROT;
     field_0x63c = 0.0f;
@@ -554,7 +529,6 @@ void daObjYIblltray_c::initRotTo() {
     ball->startCtrl();
 }
 
-/* 80C70330-80C70408 0017B0 00D8+00 1/0 0/0 0/0 .text            Draw__16daObjYIblltray_cFv */
 int daObjYIblltray_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpTrayModel, &tevStr);
@@ -569,7 +543,6 @@ int daObjYIblltray_c::Draw() {
     return 1;
 }
 
-/* 80C70408-80C70480 001888 0078+00 1/0 0/0 0/0 .text            Delete__16daObjYIblltray_cFv */
 int daObjYIblltray_c::Delete() {
     if (mBallID != fpcM_ERROR_PROCESS_ID_e) {
         daObjCarry_c* ball = (daObjCarry_c*)fopAcM_SearchByID(mBallID);
@@ -580,32 +553,23 @@ int daObjYIblltray_c::Delete() {
     return 1;
 }
 
-/* 80C70480-80C70554 001900 00D4+00 1/0 0/0 0/0 .text
- * daObjYIblltray_create1st__FP16daObjYIblltray_c               */
 static int daObjYIblltray_create1st(daObjYIblltray_c* i_this) {
     fopAcM_ct(i_this, daObjYIblltray_c);
     return i_this->create1st();
 }
 
-/* 80C707D8-80C707F8 001C58 0020+00 1/0 0/0 0/0 .text
- * daObjYIblltray_MoveBGDelete__FP16daObjYIblltray_c            */
 static int daObjYIblltray_MoveBGDelete(daObjYIblltray_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C707F8-80C70818 001C78 0020+00 1/0 0/0 0/0 .text
- * daObjYIblltray_MoveBGExecute__FP16daObjYIblltray_c           */
 static int daObjYIblltray_MoveBGExecute(daObjYIblltray_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C70818-80C70844 001C98 002C+00 1/0 0/0 0/0 .text
- * daObjYIblltray_MoveBGDraw__FP16daObjYIblltray_c              */
 static int daObjYIblltray_MoveBGDraw(daObjYIblltray_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C70AA4-80C70AC4 -00001 0020+00 1/0 0/0 0/0 .data            daObjYIblltray_METHODS */
 static actor_method_class daObjYIblltray_METHODS = {
     (process_method_func)daObjYIblltray_create1st,
     (process_method_func)daObjYIblltray_MoveBGDelete,
@@ -614,7 +578,6 @@ static actor_method_class daObjYIblltray_METHODS = {
     (process_method_func)daObjYIblltray_MoveBGDraw,
 };
 
-/* 80C70AC4-80C70AF4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_YIblltray */
 extern actor_process_profile_definition g_profile_Obj_YIblltray = {
     fpcLy_CURRENT_e,           // mLayerID
     3,                         // mListID
diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp
index a8a32c086d..bc43006fe6 100644
--- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp
+++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp
@@ -10,8 +10,8 @@
 
 class daLv6ChangeGate_HIO_c : public fOpAcm_HIO_entry_c {
 public:
-    /* 80C70C4C */ daLv6ChangeGate_HIO_c();
-    /* 80C71EE8 */ virtual ~daLv6ChangeGate_HIO_c() {}
+    daLv6ChangeGate_HIO_c();
+    virtual ~daLv6ChangeGate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -20,17 +20,14 @@ public:
     /* 0xC */ u8 unk_0xc;
 };
 
-/* 80C70C4C-80C70C94 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__21daLv6ChangeGate_HIO_cFv */
 daLv6ChangeGate_HIO_c::daLv6ChangeGate_HIO_c() {
     speed = 10.0f;
     move_amount = 562.5f;
     unk_0xc = 3;
 }
 
-/* 80C7238C-80C7239C 000014 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daLv6ChangeGate_HIO_c l_HIO;
 
-/* 80C72154-80C72184 000008 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__17daLv6ChangeGate_c */
 const dCcD_SrcGObjInf daLv6ChangeGate_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}},
     {dCcD_SE_SWORD, 0, 0, 0, 0},
@@ -38,14 +35,11 @@ const dCcD_SrcGObjInf daLv6ChangeGate_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C721CC-80C72210 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__17daLv6ChangeGate_c */
 dCcD_SrcCyl daLv6ChangeGate_c::mCcDCyl = {
     mCcDObjInfo,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80C70D38-80C70DD4 0001D8 009C+00 2/2 0/0 0/0 .text            setBaseMtx__17daLv6ChangeGate_cFv
- */
 void daLv6ChangeGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z);
@@ -54,8 +48,6 @@ void daLv6ChangeGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C70DD4-80C70E40 000274 006C+00 1/0 0/0 0/0 .text            CreateHeap__17daLv6ChangeGate_cFv
- */
 int daLv6ChangeGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6ChBlk", 4);
     JUT_ASSERT(240, modelData != NULL);
@@ -68,7 +60,6 @@ int daLv6ChangeGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C70E40-80C7106C 0002E0 022C+00 1/1 0/0 0/0 .text            create__17daLv6ChangeGate_cFv */
 int daLv6ChangeGate_c::create() {
     fopAcM_ct(this, daLv6ChangeGate_c);
 
@@ -112,12 +103,10 @@ int daLv6ChangeGate_c::create() {
     return phase_state;
 }
 
-/* 80C712A8-80C712F4 000748 004C+00 2/2 0/0 0/0 .text            isSwitch__17daLv6ChangeGate_cFv */
 u8 daLv6ChangeGate_c::isSwitch() {
     return mSwState ^ fopAcM_isSwitch(this, mSwbit);
 }
 
-/* 80C712F4-80C71494 000794 01A0+00 1/0 0/0 0/0 .text Execute__17daLv6ChangeGate_cFPPA3_A4_f */
 int daLv6ChangeGate_c::Execute(Mtx** param_0) {
     eventUpdate();
     moveGate();
@@ -153,7 +142,6 @@ int daLv6ChangeGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C71494-80C715BC 000934 0128+00 1/1 0/0 0/0 .text            moveGate__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::moveGate() {
     static void (daLv6ChangeGate_c::*mode_proc[])() = {
         &daLv6ChangeGate_c::modeWait,
@@ -176,8 +164,6 @@ void daLv6ChangeGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C715BC-80C715F4 000A5C 0038+00 2/1 0/0 0/0 .text            eventStart__17daLv6ChangeGate_cFv
- */
 bool daLv6ChangeGate_c::eventStart() {
     if (mIsSwitch) {
         init_modeSlideRight();
@@ -188,16 +174,12 @@ bool daLv6ChangeGate_c::eventStart() {
     return true;
 }
 
-/* 80C715F4-80C71600 000A94 000C+00 3/3 0/0 0/0 .text init_modeWait__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C71600-80C71604 000AA0 0004+00 1/0 0/0 0/0 .text            modeWait__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::modeWait() {}
 
-/* 80C71604-80C716B4 000AA4 00B0+00 1/1 0/0 0/0 .text init_modeSlideRight__17daLv6ChangeGate_cFv
- */
 void daLv6ChangeGate_c::init_modeSlideRight() {
    mTimer = getWaitTime();
     if (mTimer == 0xFF) {
@@ -211,7 +193,6 @@ void daLv6ChangeGate_c::init_modeSlideRight() {
     mMode = 1;
 }
 
-/* 80C716B4-80C7183C 000B54 0188+00 1/0 0/0 0/0 .text modeSlideRight__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::modeSlideRight() {
     if (mTimer != 0) {
         mTimer--;
@@ -230,7 +211,6 @@ void daLv6ChangeGate_c::modeSlideRight() {
     }
 }
 
-/* 80C7183C-80C718EC 000CDC 00B0+00 1/1 0/0 0/0 .text init_modeSlideLeft__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::init_modeSlideLeft() {
     mTimer = getWaitTime();
     if (mTimer == 0xFF) {
@@ -244,7 +224,6 @@ void daLv6ChangeGate_c::init_modeSlideLeft() {
     mMode = 2;
 }
 
-/* 80C718EC-80C71A74 000D8C 0188+00 1/0 0/0 0/0 .text modeSlideLeft__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::modeSlideLeft() {
     if (mTimer != 0) {
         mTimer--;
@@ -263,13 +242,11 @@ void daLv6ChangeGate_c::modeSlideLeft() {
     }
 }
 
-/* 80C71A74-80C71AF8 000F14 0084+00 1/1 0/0 0/0 .text init_modeBreak__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::init_modeBreak() {
     mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK_STN, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = 3;
 }
 
-/* 80C71AF8-80C71D40 000F98 0248+00 1/0 0/0 0/0 .text            modeBreak__17daLv6ChangeGate_cFv */
 void daLv6ChangeGate_c::modeBreak() {
     cXyz effpos(mMoveTransX, 0.0f, 0.0f);
     mDoMtx_stack_c::ZXYrotS(NULL, shape_angle.y, shape_angle.z);
@@ -292,7 +269,6 @@ void daLv6ChangeGate_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C71D40-80C71DE4 0011E0 00A4+00 1/0 0/0 0/0 .text            Draw__17daLv6ChangeGate_cFv */
 int daLv6ChangeGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -303,36 +279,27 @@ int daLv6ChangeGate_c::Draw() {
     return 1;
 }
 
-/* 80C71DE4-80C71E14 001284 0030+00 1/0 0/0 0/0 .text            Delete__17daLv6ChangeGate_cFv */
 int daLv6ChangeGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6ChBlk");
     return 1;
 }
 
-/* 80C71E14-80C71E40 0012B4 002C+00 1/0 0/0 0/0 .text daLv6ChangeGate_Draw__FP17daLv6ChangeGate_c
- */
 static int daLv6ChangeGate_Draw(daLv6ChangeGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C71E40-80C71E60 0012E0 0020+00 1/0 0/0 0/0 .text
- * daLv6ChangeGate_Execute__FP17daLv6ChangeGate_c               */
 static int daLv6ChangeGate_Execute(daLv6ChangeGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C71E60-80C71E80 001300 0020+00 1/0 0/0 0/0 .text
- * daLv6ChangeGate_Delete__FP17daLv6ChangeGate_c                */
 static int daLv6ChangeGate_Delete(daLv6ChangeGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C71E80-80C71EA0 001320 0020+00 1/0 0/0 0/0 .text daLv6ChangeGate_Create__FP10fopAc_ac_c */
 static int daLv6ChangeGate_Create(fopAc_ac_c* i_this) {
     return ((daLv6ChangeGate_c*)i_this)->create();
 }
 
-/* 80C72270-80C72290 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6ChangeGate_Method */
 static actor_method_class l_daLv6ChangeGate_Method = {
     (process_method_func)daLv6ChangeGate_Create,
     (process_method_func)daLv6ChangeGate_Delete,
@@ -341,7 +308,6 @@ static actor_method_class l_daLv6ChangeGate_Method = {
     (process_method_func)daLv6ChangeGate_Draw,
 };
 
-/* 80C72290-80C722C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6ChgGate */
 extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = {
   fpcLy_CURRENT_e,           // mLayerID
   3,                         // mListID
diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp
index a047d6b406..79bf3a8438 100644
--- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp
+++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_obj_lv6FurikoTrap.h"
 
 
-/* 80C7248C-80C724C8 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__21daLv6FurikoTrap_HIO_cFv */
 daLv6FurikoTrap_HIO_c::daLv6FurikoTrap_HIO_c() {
     mIntervalSeconds = 1.0f;
     mMaxAngle = 45.0f;
@@ -33,7 +32,6 @@ const dCcD_SrcGObjInf daLv6FurikoTrap_c::mCcDObjInfo = {
 };
 dCcD_SrcSph daLv6FurikoTrap_c::mCcDSph = {mCcDObjInfo};
 
-/* 80C72510-80C72598 000170 0088+00 2/2 0/0 0/0 .text            setBaseMtx__17daLv6FurikoTrap_cFv */
 void daLv6FurikoTrap_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -41,7 +39,6 @@ void daLv6FurikoTrap_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C72598-80C72604 0001F8 006C+00 1/0 0/0 0/0 .text            CreateHeap__17daLv6FurikoTrap_cFv */
 int daLv6FurikoTrap_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6Furiko", 4);
     JUT_ASSERT(236, modelData != NULL);
@@ -52,7 +49,6 @@ int daLv6FurikoTrap_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C72604-80C727D4 000264 01D0+00 1/1 0/0 0/0 .text            create__17daLv6FurikoTrap_cFv */
 int daLv6FurikoTrap_c::create() {
     fopAcM_ct(this, daLv6FurikoTrap_c);
     int phase = dComIfG_resLoad(&mPhase, "L6Furiko");
@@ -81,7 +77,6 @@ int daLv6FurikoTrap_c::create() {
     return phase;
 }
 
-/* 80C729B4-80C72CA8 000614 02F4+00 1/0 0/0 0/0 .text Execute__17daLv6FurikoTrap_cFPPA3_A4_f */
 int daLv6FurikoTrap_c::Execute(Mtx** i_pMtx) {
     move();
     *i_pMtx = &mModel->getBaseTRMtx();
@@ -119,7 +114,6 @@ int daLv6FurikoTrap_c::Execute(Mtx** i_pMtx) {
     return TRUE;
 }
 
-/* 80C72CA8-80C72D24 000908 007C+00 1/1 0/0 0/0 .text            move__17daLv6FurikoTrap_cFv */
 void daLv6FurikoTrap_c::move() {
     typedef void (daLv6FurikoTrap_c::*func_call)();
     static const func_call mode_proc[] = {
@@ -128,14 +122,12 @@ void daLv6FurikoTrap_c::move() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C72D24-80C72D38 000984 0014+00 1/1 0/0 0/0 .text init_modeMove__17daLv6FurikoTrap_cFv */
 void daLv6FurikoTrap_c::init_modeMove() {
     mAngle = 0;
     mTimer = 0;
     mMode = 0;
 }
 
-/* 80C72D38-80C72EE0 000998 01A8+00 1/0 0/0 0/0 .text            modeMove__17daLv6FurikoTrap_cFv */
 void daLv6FurikoTrap_c::modeMove() {
     int unused = shape_angle.z;
     mAngleIncrement = cM_deg2s((2.0f * l_HIO.mMaxAngle) / (30.0f * l_HIO.mIntervalSeconds));
@@ -156,7 +148,6 @@ void daLv6FurikoTrap_c::modeMove() {
     }
 }
 
-/* 80C72EE0-80C72F94 000B40 00B4+00 1/0 0/0 0/0 .text            Draw__17daLv6FurikoTrap_cFv */
 int daLv6FurikoTrap_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -167,7 +158,6 @@ int daLv6FurikoTrap_c::Draw() {
     return TRUE;
 }
 
-/* 80C72F94-80C72FC4 000BF4 0030+00 1/0 0/0 0/0 .text            Delete__17daLv6FurikoTrap_cFv */
 int daLv6FurikoTrap_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6Furiko");
 #if DEBUG
@@ -176,30 +166,25 @@ int daLv6FurikoTrap_c::Delete() {
     return TRUE;
 }
 
-/* 80C72FC4-80C72FF0 000C24 002C+00 1/0 0/0 0/0 .text            daLv6FurikoTrap_Draw__FP17daLv6FurikoTrap_c */
 static int daLv6FurikoTrap_Draw(daLv6FurikoTrap_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C72FF0-80C73010 000C50 0020+00 1/0 0/0 0/0 .text            daLv6FurikoTrap_Execute__FP17daLv6FurikoTrap_c */
 static int daLv6FurikoTrap_Execute(daLv6FurikoTrap_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C73010-80C73030 000C70 0020+00 1/0 0/0 0/0 .text            daLv6FurikoTrap_Delete__FP17daLv6FurikoTrap_c */
 static int daLv6FurikoTrap_Delete(daLv6FurikoTrap_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80C73030-80C73050 000C90 0020+00 1/0 0/0 0/0 .text            daLv6FurikoTrap_Create__FP10fopAc_ac_c */
 static int daLv6FurikoTrap_Create(fopAc_ac_c* i_this) {
     daLv6FurikoTrap_c* this_trap = (daLv6FurikoTrap_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return this_trap->create();
 }
 
-/* 80C73214-80C73234 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6FurikoTrap_Method */
 static actor_method_class l_daLv6FurikoTrap_Method = {
     (process_method_func)daLv6FurikoTrap_Create,
     (process_method_func)daLv6FurikoTrap_Delete,
@@ -208,7 +193,6 @@ static actor_method_class l_daLv6FurikoTrap_Method = {
     (process_method_func)daLv6FurikoTrap_Draw,
 };
 
-/* 80C73234-80C73264 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6FuriTrap */
 extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = {
   fpcLy_CURRENT_e,           // mLayerID
   3,                         // mListID
diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp
index 52b89f6143..813a9fb366 100644
--- a/src/d/actor/d_a_obj_lv6Lblock.cpp
+++ b/src/d/actor/d_a_obj_lv6Lblock.cpp
@@ -7,19 +7,16 @@
 
 #include "d/actor/d_a_obj_lv6Lblock.h"
 
-/* 80C73D04-80C73D0C 000020 0008+00 1/1 0/0 0/0 .data            l_liftUpMax */
 static f32 l_liftUpMax[] = {
     300.0f,
     150.0f,
 };
 
-/* 80C733EC-80C7341C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__17daLv6Lblock_HIO_cFv */
 daLv6Lblock_HIO_c::daLv6Lblock_HIO_c() {
     speed = 15.0f;
     unk_0xc = 3;
 }
 
-/* 80C73464-80C734EC 000164 0088+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv6Lblock_cFv */
 void daLv6Lblock_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -27,7 +24,6 @@ void daLv6Lblock_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C734EC-80C73558 0001EC 006C+00 1/0 0/0 0/0 .text            CreateHeap__13daLv6Lblock_cFv */
 int daLv6Lblock_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6Lblock", 4);
     JUT_ASSERT(177, modelData != NULL);
@@ -40,7 +36,6 @@ int daLv6Lblock_c::CreateHeap() {
     return 1;
 }
 
-/* 80C73558-80C736C0 000258 0168+00 1/1 0/0 0/0 .text            create__13daLv6Lblock_cFv */
 int daLv6Lblock_c::create() {
     fopAcM_ct(this, daLv6Lblock_c);
 
@@ -77,13 +72,10 @@ int daLv6Lblock_c::create() {
     return phase_state;
 }
 
-/* 80C736C0-80C7370C 0003C0 004C+00 2/2 0/0 0/0 .text            isSwitch__13daLv6Lblock_cFv */
 u8 daLv6Lblock_c::isSwitch() {
     return mSwState ^ fopAcM_isSwitch(this, mSwbit);
 }
 
-/* 80C7370C-80C7375C 00040C 0050+00 1/0 0/0 0/0 .text            Execute__13daLv6Lblock_cFPPA3_A4_f
- */
 int daLv6Lblock_c::Execute(Mtx** param_0) {
     moveBlock();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -91,10 +83,8 @@ int daLv6Lblock_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C73DFC-80C73E0C 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daLv6Lblock_HIO_c l_HIO;
 
-/* 80C7375C-80C73850 00045C 00F4+00 1/1 0/0 0/0 .text            moveBlock__13daLv6Lblock_cFv */
 void daLv6Lblock_c::moveBlock() {
     static void (daLv6Lblock_c::*mode_proc[])() = {
         &daLv6Lblock_c::modeWait,
@@ -116,21 +106,16 @@ void daLv6Lblock_c::moveBlock() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C73850-80C7385C 000550 000C+00 3/3 0/0 0/0 .text            init_modeWait__13daLv6Lblock_cFv */
 void daLv6Lblock_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C7385C-80C73860 00055C 0004+00 1/0 0/0 0/0 .text            modeWait__13daLv6Lblock_cFv */
 void daLv6Lblock_c::modeWait() {}
 
-/* 80C73860-80C7386C 000560 000C+00 1/1 0/0 0/0 .text            init_modeLiftUp__13daLv6Lblock_cFv
- */
 void daLv6Lblock_c::init_modeLiftUp() {
     mMode = 1;
 }
 
-/* 80C7386C-80C7398C 00056C 0120+00 1/0 0/0 0/0 .text            modeLiftUp__13daLv6Lblock_cFv */
 void daLv6Lblock_c::modeLiftUp() {
     f32 dist_to_target = cLib_addCalc(&current.pos.y, mBaseHeight + mMaxHeight, 0.1f, l_HIO.speed, 5.0f);
     mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_UP, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -141,12 +126,10 @@ void daLv6Lblock_c::modeLiftUp() {
     }
 }
 
-/* 80C7398C-80C73998 00068C 000C+00 1/1 0/0 0/0 .text init_modeLiftDown__13daLv6Lblock_cFv */
 void daLv6Lblock_c::init_modeLiftDown() {
     mMode = 2;
 }
 
-/* 80C73998-80C73AB0 000698 0118+00 1/0 0/0 0/0 .text            modeLiftDown__13daLv6Lblock_cFv */
 void daLv6Lblock_c::modeLiftDown() {
     f32 dist_to_target = cLib_addCalc(&current.pos.y, mBaseHeight, 0.1f, l_HIO.speed, 5.0f);
     mDoAud_seStartLevel(Z2SE_OBJ_L6_UD_BLOCK_DW, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -157,7 +140,6 @@ void daLv6Lblock_c::modeLiftDown() {
     }
 }
 
-/* 80C73AB0-80C73B54 0007B0 00A4+00 1/0 0/0 0/0 .text            Draw__13daLv6Lblock_cFv */
 int daLv6Lblock_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -168,35 +150,27 @@ int daLv6Lblock_c::Draw() {
     return 1;
 }
 
-/* 80C73B54-80C73B84 000854 0030+00 1/0 0/0 0/0 .text            Delete__13daLv6Lblock_cFv */
 int daLv6Lblock_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6Lblock");
     return 1;
 }
 
-/* 80C73B84-80C73BB0 000884 002C+00 1/0 0/0 0/0 .text            daLv6Lblock_Draw__FP13daLv6Lblock_c
- */
 static int daLv6Lblock_Draw(daLv6Lblock_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C73BB0-80C73BD0 0008B0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Execute__FP13daLv6Lblock_c */
 static int daLv6Lblock_Execute(daLv6Lblock_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C73BD0-80C73BF0 0008D0 0020+00 1/0 0/0 0/0 .text daLv6Lblock_Delete__FP13daLv6Lblock_c */
 static int daLv6Lblock_Delete(daLv6Lblock_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C73BF0-80C73C10 0008F0 0020+00 1/0 0/0 0/0 .text            daLv6Lblock_Create__FP10fopAc_ac_c
- */
 static int daLv6Lblock_Create(fopAc_ac_c* i_this) {
     return ((daLv6Lblock_c*)i_this)->create();
 }
 
-/* 80C73D54-80C73D74 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6Lblock_Method */
 static actor_method_class l_daLv6Lblock_Method = {
     (process_method_func)daLv6Lblock_Create,
     (process_method_func)daLv6Lblock_Delete,
@@ -205,7 +179,6 @@ static actor_method_class l_daLv6Lblock_Method = {
     (process_method_func)daLv6Lblock_Draw,
 };
 
-/* 80C73D74-80C73DA4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6Lblock */
 extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp
index 960bc0fb6a..c8002190f3 100644
--- a/src/d/actor/d_a_obj_lv6SwGate.cpp
+++ b/src/d/actor/d_a_obj_lv6SwGate.cpp
@@ -29,21 +29,16 @@ void daLv6SwGate_HIO_c::genMessage(JORMContext* context)
 }
 #endif
 
-/* 80C75754-80C7576C 000014 0018+00 4/4 0/0 0/0 .bss             l_HIO */
 static daLv6SwGate_HIO_c l_HIO;
 
-/* 80C75530-80C75560 00000C 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__13daLv6SwGate_c */
 const dCcD_SrcGObjInf daLv6SwGate_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, {1, 0, 0, 0, 0}, {0xA, 0, 0, 0, 0}, {0}
 };
 
-/* 80C755B8-80C755FC 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__13daLv6SwGate_c */
 dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = {mCcDObjInfo};
 
-/* 80C755FC-80C75614 000064 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f};
 
-/* 80C74004-80C74158 0001E4 0154+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv6SwGate_cFv */
 void daLv6SwGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -59,7 +54,6 @@ void daLv6SwGate_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C74158-80C7429C 000338 0144+00 1/0 0/0 0/0 .text            CreateHeap__13daLv6SwGate_cFv */
 int daLv6SwGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6SwGate", 4);
     JUT_ASSERT(273, modelData != NULL);
@@ -84,7 +78,6 @@ int daLv6SwGate_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C7429C-80C744E4 00047C 0248+00 1/1 0/0 0/0 .text            create__13daLv6SwGate_cFv */
 int daLv6SwGate_c::create() {
     fopAcM_ct(this, daLv6SwGate_c);
     if (getSw2() != 0xff && fopAcM_isSwitch(this, getSw2())) {
@@ -128,13 +121,10 @@ int daLv6SwGate_c::create() {
     return phase;
 }
 
-/* 80C74720-80C7476C 000900 004C+00 2/2 0/0 0/0 .text            isSwitch__13daLv6SwGate_cFv */
 u8 daLv6SwGate_c::isSwitch() {
     return fopAcM_isSwitch(this, mUnderylingSwitch) ^ mUnderlyingSwitchState;
 }
 
-/* 80C7476C-80C74A3C 00094C 02D0+00 1/0 0/0 0/0 .text            Execute__13daLv6SwGate_cFPPA3_A4_f
- */
 int daLv6SwGate_c::Execute(Mtx** i_pMTx) {
     moveGate();
     for (int i = 0; i < 12; i++) {
@@ -181,7 +171,6 @@ enum DALV6SWGATE_C_MODE {
     DALV6SWGATE_C_MODE_BREAK,
 };
 
-/* 80C74A3C-80C74B48 000C1C 010C+00 1/1 0/0 0/0 .text            moveGate__13daLv6SwGate_cFv */
 void daLv6SwGate_c::moveGate() {
     typedef void (daLv6SwGate_c::*func_call)();
     const static func_call mode_proc[] = {
@@ -203,22 +192,18 @@ void daLv6SwGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C74B48-80C74B54 000D28 000C+00 3/3 0/0 0/0 .text            init_modeWait__13daLv6SwGate_cFv */
 void daLv6SwGate_c::init_modeWait() {
     mMode = DALV6SWGATE_C_MODE_WAIT;
 }
 
-/* 80C74B54-80C74B58 000D34 0004+00 1/0 0/0 0/0 .text            modeWait__13daLv6SwGate_cFv */
 void daLv6SwGate_c::modeWait() {
     return;
 }
 
-/* 80C74B58-80C74B64 000D38 000C+00 1/1 0/0 0/0 .text            init_modeOpen__13daLv6SwGate_cFv */
 void daLv6SwGate_c::init_modeOpen() {
     mMode = DALV6SWGATE_C_MODE_OPEN;
 }
 
-/* 80C74B64-80C74C7C 000D44 0118+00 1/0 0/0 0/0 .text            modeOpen__13daLv6SwGate_cFv */
 void daLv6SwGate_c::modeOpen() {
     f32 calc = cLib_addCalc(&mMovementAmount, l_HIO.mMovementAmount, 0.1f, l_HIO.mSpeed, 5.0f);
     mDoAud_seStartLevel(Z2SE_OBJ_L6_SW_GATE_OP_MV, &current.pos, 0,
@@ -230,14 +215,11 @@ void daLv6SwGate_c::modeOpen() {
     }
 }
 
-/* 80C74C7C-80C74C94 000E5C 0018+00 1/1 0/0 0/0 .text            init_modeClose__13daLv6SwGate_cFv
- */
 void daLv6SwGate_c::init_modeClose() {
     fopAcM_SetSpeedF(this, 0.0f);
     mMode = DALV6SWGATE_C_MODE_CLOSE;
 }
 
-/* 80C74C94-80C74DBC 000E74 0128+00 1/0 0/0 0/0 .text            modeClose__13daLv6SwGate_cFv */
 void daLv6SwGate_c::modeClose() {
     int unused = cLib_chaseF(&speedF, l_HIO.mMaximumSpeed, l_HIO.mAcceleration);
     f32 calc = cLib_addCalc(&mMovementAmount, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 5.0f);
@@ -250,15 +232,12 @@ void daLv6SwGate_c::modeClose() {
     }
 }
 
-/* 80C74DBC-80C74E40 000F9C 0084+00 1/1 0/0 0/0 .text            init_modeBreak__13daLv6SwGate_cFv
- */
 void daLv6SwGate_c::init_modeBreak() {
     OS_REPORT("== break! ==\n");
     mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = DALV6SWGATE_C_MODE_BREAK;
 }
 
-/* 80C74E40-80C7524C 001020 040C+00 1/0 0/0 0/0 .text            modeBreak__13daLv6SwGate_cFv */
 void daLv6SwGate_c::modeBreak() {
     cXyz p(-150.0f - mMovementAmount, 0.0f, 0.0f);
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -286,7 +265,6 @@ void daLv6SwGate_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C7524C-80C752F8 00142C 00AC+00 1/0 0/0 0/0 .text            Draw__13daLv6SwGate_cFv */
 int daLv6SwGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr);
@@ -297,7 +275,6 @@ int daLv6SwGate_c::Draw() {
     return TRUE;
 }
 
-/* 80C752F8-80C75360 0014D8 0068+00 1/0 0/0 0/0 .text            Delete__13daLv6SwGate_cFv */
 int daLv6SwGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6SwGate");
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -309,32 +286,25 @@ int daLv6SwGate_c::Delete() {
     return TRUE;
 }
 
-/* 80C75360-80C7538C 001540 002C+00 1/0 0/0 0/0 .text            daLv6SwGate_Draw__FP13daLv6SwGate_c
- */
 static int daLv6SwGate_Draw(daLv6SwGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C7538C-80C753AC 00156C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Execute__FP13daLv6SwGate_c */
 static int daLv6SwGate_Execute(daLv6SwGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C753AC-80C753CC 00158C 0020+00 1/0 0/0 0/0 .text daLv6SwGate_Delete__FP13daLv6SwGate_c */
 static int daLv6SwGate_Delete(daLv6SwGate_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80C753CC-80C753EC 0015AC 0020+00 1/0 0/0 0/0 .text            daLv6SwGate_Create__FP10fopAc_ac_c
- */
 static int daLv6SwGate_Create(fopAc_ac_c* i_this) {
     daLv6SwGate_c* this_gate = (daLv6SwGate_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return this_gate->create();
 }
 
-/* 80C75674-80C75694 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6SwGate_Method */
 static actor_method_class l_daLv6SwGate_Method = {
     (process_method_func)daLv6SwGate_Create,  
     (process_method_func)daLv6SwGate_Delete,
@@ -343,7 +313,6 @@ static actor_method_class l_daLv6SwGate_Method = {
     (process_method_func)daLv6SwGate_Draw,
 };
 
-/* 80C75694-80C756C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6SwGate */
 extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp
index d5d5147d36..b683f3618d 100644
--- a/src/d/actor/d_a_obj_lv6SzGate.cpp
+++ b/src/d/actor/d_a_obj_lv6SzGate.cpp
@@ -9,13 +9,10 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C76688-80C766A0 000020 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {{-1200.0f, -300.0f, -100.0f}, {1200.0f, 300.0f, 100.0f}};
 
-/* 80C767E4-80C767FC 000014 0018+00 4/4 0/0 0/0 .bss             l_HIO */
 static daLv6SzGate_HIO_c l_HIO;
 
-/* 80C7586C-80C758B8 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__17daLv6SzGate_HIO_cFv */
 daLv6SzGate_HIO_c::daLv6SzGate_HIO_c() {
     mSpeed = 4.0f;
     field_0x08 = 30.0f;
@@ -28,7 +25,6 @@ void daLv6SzGate_HIO_c::genMessage(JORMContext* arg) {
     // DEBUG NONMATCHING
 }
 
-/* 80C75900-80C75A54 000180 0154+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv6SzGate_cFv */
 void daLv6SzGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -47,7 +43,6 @@ void daLv6SzGate_c::setBaseMtx() {
     mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80C75A54-80C75C0C 0002D4 01B8+00 1/0 0/0 0/0 .text            CreateHeap__13daLv6SzGate_cFv */
 int daLv6SzGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6SzGate", 6);
     field_0x5a8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
@@ -81,7 +76,6 @@ int daLv6SzGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C75C0C-80C75DD0 00048C 01C4+00 1/1 0/0 0/0 .text            create__13daLv6SzGate_cFv */
 cPhs__Step daLv6SzGate_c::create() {
     fopAcM_ct(this, daLv6SzGate_c);
 
@@ -113,8 +107,6 @@ cPhs__Step daLv6SzGate_c::create() {
     return phase;
 }
 
-/* 80C75E18-80C75E78 000698 0060+00 1/0 0/0 0/0 .text            Execute__13daLv6SzGate_cFPPA3_A4_f
- */
 int daLv6SzGate_c::Execute(Mtx** param_0) {
     moveGate();
     *param_0 = &field_0x5a8->getBaseTRMtx();
@@ -125,7 +117,6 @@ int daLv6SzGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C75E78-80C75F64 0006F8 00EC+00 1/1 0/0 0/0 .text            moveGate__13daLv6SzGate_cFv */
 void daLv6SzGate_c::moveGate() {
     typedef void (daLv6SzGate_c::*daLv6SzGate_modeFunc)();
     static daLv6SzGate_modeFunc mode_proc[] = {
@@ -136,25 +127,21 @@ void daLv6SzGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C75F64-80C75F70 0007E4 000C+00 2/2 0/0 0/0 .text            init_modeWait__13daLv6SzGate_cFv */
 void daLv6SzGate_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80C75F70-80C75FC0 0007F0 0050+00 1/0 0/0 0/0 .text            modeWait__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeWait() {
     if (fopAcM_isSwitch(this, field_0x5e2)) {
         init_modeOpenWait0();
     }
 }
 
-/* 80C75FC0-80C75FD8 000840 0018+00 1/1 0/0 0/0 .text init_modeOpenWait0__13daLv6SzGate_cFv */
 void daLv6SzGate_c::init_modeOpenWait0() {
     field_0x5e1 = getWaitTime();
     mMode = MODE_OPENWAIT0;
 }
 
-/* 80C75FD8-80C76010 000858 0038+00 1/0 0/0 0/0 .text            modeOpenWait0__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeOpenWait0() {
     if (field_0x5e1 != 0) {
         --field_0x5e1;
@@ -163,14 +150,12 @@ void daLv6SzGate_c::modeOpenWait0() {
     }
 }
 
-/* 80C76010-80C76094 000890 0084+00 1/1 0/0 0/0 .text init_modeOpenWait__13daLv6SzGate_cFv */
 void daLv6SzGate_c::init_modeOpenWait() {
     mDoAud_seStart(Z2SE_OBJ_L6_MARIO_GATE_ON, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = MODE_OPENWAIT;
 }
 
-/* 80C76094-80C760F0 000914 005C+00 1/0 0/0 0/0 .text            modeOpenWait__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeOpenWait() {
     int iVar1 = field_0x5b0.play();
     int iVar2 = field_0x5c8.play();
@@ -179,12 +164,10 @@ void daLv6SzGate_c::modeOpenWait() {
     }
 }
 
-/* 80C760F0-80C760FC 000970 000C+00 1/1 0/0 0/0 .text            init_modeOpen__13daLv6SzGate_cFv */
 void daLv6SzGate_c::init_modeOpen() {
     mMode = MODE_OPEN;
 }
 
-/* 80C760FC-80C7624C 00097C 0150+00 1/0 0/0 0/0 .text            modeOpen__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeOpen() {
     float tmp = cLib_addCalc(&field_0x5e4, l_HIO.field_0x10, 0.2f, l_HIO.mSpeed, 0.5f);
     mDoAud_seStartLevel(Z2SE_OBJ_L6_MARIO_GATE_MV, &current.pos, 0,
@@ -198,7 +181,6 @@ void daLv6SzGate_c::modeOpen() {
     }
 }
 
-/* 80C7624C-80C76328 000ACC 00DC+00 1/0 0/0 0/0 .text            modeClose__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeClose() {
     f32 fVar1 = cLib_chaseF(&speedF, l_HIO.field_0x08, l_HIO.field_0x0c);
     fVar1 = cLib_addCalc(&field_0x5e4, 0.0f, 1.0f, fopAcM_GetSpeedF(this), 5.0f);
@@ -209,20 +191,17 @@ void daLv6SzGate_c::modeClose() {
     }
 }
 
-/* 80C76328-80C76344 000BA8 001C+00 2/2 0/0 0/0 .text            init_modeEnd__13daLv6SzGate_cFv */
 void daLv6SzGate_c::init_modeEnd() {
     field_0x5b0.setPlaySpeed(-1.0f);
     field_0x5c8.setPlaySpeed(-1.0f);
     mMode = MODE_END;
 }
 
-/* 80C76344-80C7637C 000BC4 0038+00 1/0 0/0 0/0 .text            modeEnd__13daLv6SzGate_cFv */
 void daLv6SzGate_c::modeEnd() {
     field_0x5b0.play();
     field_0x5c8.play();
 }
 
-/* 80C7637C-80C76490 000BFC 0114+00 1/0 0/0 0/0 .text            Draw__13daLv6SzGate_cFv */
 int daLv6SzGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(field_0x5a8, &tevStr);
@@ -243,7 +222,6 @@ int daLv6SzGate_c::Draw() {
     return 1;
 }
 
-/* 80C76490-80C764F8 000D10 0068+00 1/0 0/0 0/0 .text            Delete__13daLv6SzGate_cFv */
 int daLv6SzGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6SzGate");
     if (field_0x5e8 != NULL) {
@@ -254,38 +232,30 @@ int daLv6SzGate_c::Delete() {
     return 1;
 }
 
-/* 80C764F8-80C76524 000D78 002C+00 1/0 0/0 0/0 .text            daLv6SzGate_Draw__FP13daLv6SzGate_c
- */
 static int daLv6SzGate_Draw(daLv6SzGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C76524-80C76544 000DA4 0020+00 1/0 0/0 0/0 .text daLv6SzGate_Execute__FP13daLv6SzGate_c */
 static int daLv6SzGate_Execute(daLv6SzGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C76544-80C76564 000DC4 0020+00 1/0 0/0 0/0 .text daLv6SzGate_Delete__FP13daLv6SzGate_c */
 static int daLv6SzGate_Delete(daLv6SzGate_c* i_this) {
     fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80C76564-80C76584 000DE4 0020+00 1/0 0/0 0/0 .text            daLv6SzGate_Create__FP10fopAc_ac_c
- */
 static int daLv6SzGate_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daLv6SzGate_c*>(i_this)->create();
 }
 
-/* 80C76730-80C76750 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6SzGate_Method */
 static actor_method_class l_daLv6SzGate_Method = {
     (process_method_func)daLv6SzGate_Create,  (process_method_func)daLv6SzGate_Delete,
     (process_method_func)daLv6SzGate_Execute, (process_method_func)NULL,
     (process_method_func)daLv6SzGate_Draw,
 };
 
-/* 80C76750-80C76780 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6SzGate */
 extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp
index d058f007dc..151f070fab 100644
--- a/src/d/actor/d_a_obj_lv6Tenbin.cpp
+++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp
@@ -8,11 +8,6 @@
 #include "d/actor/d_a_cstatue.h"
 #include "d/actor/d_a_player.h"
 
-//
-// Declarations:
-//
-
-/* 80C768EC-80C76988 0000EC 009C+00 1/1 0/0 0/0 .text            __ct__14daTenbin_HIO_cFv */
 daTenbin_HIO_c::daTenbin_HIO_c() {
     mPlateSpacing = 480.0f;
     mFallAmount = 160.0f;
@@ -56,13 +51,10 @@ void daTenbin_HIO_c::genMessage(JORMContext* context) {
 }
 #endif
 
-/* 80C77A08-80C77A20 000000 0018+00 2/2 0/0 0/0 .data            l_cull_box */
 static cull_box l_cull_box = {-300.0f, -500.0f, -400.0f, 1200.0f, 300.0f, 1300.0f};
 
-/* 80C77ADC-80C77B20 000014 0044+00 5/5 0/0 0/0 .bss             l_HIO */
 static daTenbin_HIO_c l_HIO;
 
-/* 80C769D0-80C76BCC 0001D0 01FC+00 2/2 0/0 0/0 .text            setBaseMtx__10daTenbin_cFv */
 void daTenbin_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -84,7 +76,6 @@ void daTenbin_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C76BCC-80C76D10 0003CC 0144+00 1/0 0/0 0/0 .text            CreateHeap__10daTenbin_cFv */
 int daTenbin_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L6Tenbin", 5);
     JUT_ASSERT(261, modelData != NULL);
@@ -108,7 +99,6 @@ int daTenbin_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C76D10-80C76EE0 000510 01D0+00 1/1 0/0 0/0 .text            create__10daTenbin_cFv */
 int daTenbin_c::create() {
     fopAcM_ct(this, daTenbin_c);
     int phase = dComIfG_resLoad(&mPhase, "L6Tenbin");
@@ -164,8 +154,6 @@ int daTenbin_c::create() {
     return phase;
 }
 
-/* 80C76EE0-80C77078 0006E0 0198+00 1/1 0/0 0/0 .text
- * rideCallBackRight__10daTenbin_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) {
     (void)i_dBgW;
     daTenbin_c* i_tenbin = (daTenbin_c*)i_act1;
@@ -198,8 +186,6 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
     }
 }
 
-/* 80C77078-80C77200 000878 0188+00 1/1 0/0 0/0 .text
- * rideCallBackLeft__10daTenbin_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) {
     (void)i_dBgW;
     daTenbin_c* i_tenbin = (daTenbin_c*)i_act1;
@@ -232,7 +218,6 @@ void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c*
     }
 }
 
-/* 80C77200-80C772BC 000A00 00BC+00 1/0 0/0 0/0 .text            Execute__10daTenbin_cFPPA3_A4_f */
 int daTenbin_c::Execute(Mtx** i_pMtx) {
     fopAcM_setCullSizeBox(this, l_cull_box.min.x - l_HIO.mPlateSpacing / 2.0f, l_cull_box.min.y,
                           l_cull_box.min.z, l_cull_box.max.x + l_HIO.mPlateSpacing / 2.0f,
@@ -249,7 +234,6 @@ int daTenbin_c::Execute(Mtx** i_pMtx) {
     return TRUE;
 }
 
-/* 80C772BC-80C77464 000ABC 01A8+00 1/1 0/0 0/0 .text            procMain__10daTenbin_cFv */
 void daTenbin_c::procMain() {
     typedef void (daTenbin_c::*func_call)(void);
     static const func_call mode_proc[] = {&daTenbin_c::modeWait};
@@ -263,12 +247,10 @@ void daTenbin_c::procMain() {
     field_0x5D0++;
 }
 
-/* 80C77464-80C77470 000C64 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daTenbin_cFv */
 void daTenbin_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C77470-80C77668 000C70 01F8+00 1/0 0/0 0/0 .text            modeWait__10daTenbin_cFv */
 void daTenbin_c::modeWait() {
     balanceCheck();
     if (mWaitTime == 0) {
@@ -300,7 +282,6 @@ void daTenbin_c::modeWait() {
     field_0x5B8 = field_0x5B4;
 }
 
-/* 80C77668-80C7772C 000E68 00C4+00 1/1 0/0 0/0 .text            balanceCheck__10daTenbin_cFv */
 void daTenbin_c::balanceCheck() {
     if (field_0x5B6 != field_0x5B2 || field_0x5B8 != field_0x5B4) {
         if (field_0x5B2 == field_0x5B4) {
@@ -323,7 +304,6 @@ void daTenbin_c::balanceCheck() {
     }
 }
 
-/* 80C7772C-80C77810 000F2C 00E4+00 1/0 0/0 0/0 .text            Draw__10daTenbin_cFv */
 int daTenbin_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr);
@@ -337,7 +317,6 @@ int daTenbin_c::Draw() {
     return TRUE;
 }
 
-/* 80C77810-80C77878 001010 0068+00 1/0 0/0 0/0 .text            Delete__10daTenbin_cFv */
 int daTenbin_c::Delete() {
     dComIfG_resDelete(&mPhase, "L6Tenbin");
     if (mdBgW != NULL && mdBgW->ChkUsed()) {
@@ -349,30 +328,25 @@ int daTenbin_c::Delete() {
     return TRUE;
 }
 
-/* 80C77878-80C778A4 001078 002C+00 1/0 0/0 0/0 .text            daTenbin_Draw__FP10daTenbin_c */
 static int daTenbin_Draw(daTenbin_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C778A4-80C778C4 0010A4 0020+00 1/0 0/0 0/0 .text            daTenbin_Execute__FP10daTenbin_c */
 static int daTenbin_Execute(daTenbin_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C778C4-80C778E4 0010C4 0020+00 1/0 0/0 0/0 .text            daTenbin_Delete__FP10daTenbin_c */
 static int daTenbin_Delete(daTenbin_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80C778E4-80C77904 0010E4 0020+00 1/0 0/0 0/0 .text            daTenbin_Create__FP10fopAc_ac_c */
 static int daTenbin_Create(fopAc_ac_c* i_this) {
     daTenbin_c* this_tenbin = (daTenbin_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return this_tenbin->create();
 }
 
-/* 80C77A38-80C77A58 -00001 0020+00 1/0 0/0 0/0 .data            l_daTenbin_Method */
 static actor_method_class l_daTenbin_Method = {
     (process_method_func)daTenbin_Create,  
     (process_method_func)daTenbin_Delete,
@@ -381,7 +355,6 @@ static actor_method_class l_daTenbin_Method = {
     (process_method_func)daTenbin_Draw,
 };
 
-/* 80C77A58-80C77A88 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6Tenbin */
 extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp
index b05008885c..3a18fbeafa 100644
--- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp
+++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_obj_lv6TogeRoll.h"
 #include "d/d_path.h"
 
-/* 80C79D44-80C79D58 000014 0014+00 4/4 0/0 0/0 .bss             l_HIO */
 static daTogeRoll_HIO_c l_HIO;
 
-/* 80C79B0C-80C79B4C 000020 0040+00 2/2 0/0 0/0 .data            mCcDSph__12daTogeRoll_c */
 dCcD_SrcSph daTogeRoll_c::mCcDSph = {
     daTogeRoll_c::mCcDObjInfo,  // mObjInf
     {
@@ -19,7 +17,6 @@ dCcD_SrcSph daTogeRoll_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 80C79B4C-80C79B98 000060 004C+00 2/2 0/0 0/0 .data            mCcDCps__12daTogeRoll_c */
 dCcD_SrcCps daTogeRoll_c::mCcDCps = {
     daTogeRoll_c::mCcDObjInfo2,  // mObjInf
     {
@@ -27,7 +24,6 @@ dCcD_SrcCps daTogeRoll_c::mCcDCps = {
     }  // mCpsAttr
 };
 
-/* 80C77C2C-80C77C80 0000EC 0054+00 1/1 0/0 0/0 .text            __ct__16daTogeRoll_HIO_cFv */
 daTogeRoll_HIO_c::daTogeRoll_HIO_c() {
     field_0x04 = 60;
     field_0x05 = 1;
@@ -37,7 +33,6 @@ daTogeRoll_HIO_c::daTogeRoll_HIO_c() {
     field_0x10 = 50.0f;
 }
 
-/* 80C77CC8-80C77D50 000188 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daTogeRoll_cFv */
 void daTogeRoll_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -46,7 +41,6 @@ void daTogeRoll_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C77D50-80C77DBC 000210 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daTogeRoll_cFv */
 int daTogeRoll_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("togeRol", 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -56,7 +50,6 @@ int daTogeRoll_c::CreateHeap() {
     return 1;
 }
 
-/* 80C799F0-80C79A20 00000C 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daTogeRoll_c */
 dCcD_SrcGObjInf const daTogeRoll_c::mCcDObjInfo = {
     {0, {{0x800, 0x1, 0x1f}, {0xdafbfdff, 0x1f}, {0x79}}},
     {1, 0, 1, 0, 1},
@@ -64,7 +57,6 @@ dCcD_SrcGObjInf const daTogeRoll_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C79A20-80C79A50 00003C 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo2__12daTogeRoll_c */
 dCcD_SrcGObjInf const daTogeRoll_c::mCcDObjInfo2 = {
     {0, {{0, 0, 0}, {0xdafbfdff, 0x1f}, {0}}},
     {1, 0, 0, 0, 0},
@@ -72,14 +64,12 @@ dCcD_SrcGObjInf const daTogeRoll_c::mCcDObjInfo2 = {
     {0},
 };
 
-/* 80C79A50-80C79A90 00006C 0040+00 1/1 0/0 0/0 .rodata          mSpeed__12daTogeRoll_c */
 f32 const daTogeRoll_c::mSpeed[] = {
     10.0f, 16.6666666f, 23.3333333f, 25.0f,      26.6666666f, 28.3333333f,
     30.0f, 31.6666666f, 33.3333333f, 40.0f,      46.6666666f, 53.3333333f,
     60.0f, 66.6666666f, 83.3333333f, 3.3333333f,
 };
 
-/* 80C77DBC-80C78058 00027C 029C+00 1/1 0/0 0/0 .text            create__12daTogeRoll_cFv */
 int daTogeRoll_c::create() {
     fopAcM_ct(this, daTogeRoll_c);
 
@@ -128,8 +118,6 @@ int daTogeRoll_c::create() {
     return phase;
 }
 
-/* 80C78294-80C78638 000754 03A4+00 1/0 0/0 0/0 .text            Execute__12daTogeRoll_cFPPA3_A4_f
- */
 int daTogeRoll_c::Execute(Mtx** i_mtx) {
     moveTogeRoll();
 
@@ -210,7 +198,6 @@ int daTogeRoll_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C78638-80C78A8C 000AF8 0454+00 1/1 0/0 0/0 .text            moveTogeRoll__12daTogeRoll_cFv */
 void daTogeRoll_c::moveTogeRoll() {
     if (mPathID != 0xFF) {
         static daTogeRoll_c::modeFunc mode_proc[] = {
@@ -245,7 +232,6 @@ void daTogeRoll_c::moveTogeRoll() {
     }
 }
 
-/* 80C78A8C-80C78B7C 000F4C 00F0+00 1/1 0/0 0/0 .text            init_modeBound__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeBound() {
     field_0x5dc = 1;
     fopAcM_SetSpeedF(this, 0.0f);
@@ -260,27 +246,23 @@ void daTogeRoll_c::init_modeBound() {
     mMode = MODE_BOUND;
 }
 
-/* 80C78B7C-80C78BD8 00103C 005C+00 1/0 0/0 0/0 .text            modeBound__12daTogeRoll_cFv */
 void daTogeRoll_c::modeBound() {
     if (cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, field_0x5d4, 1.0f) == 0) {
         init_modeBoundWait();
     }
 }
 
-/* 80C78BD8-80C78C34 001098 005C+00 1/0 0/0 0/0 .text            modeBound2__12daTogeRoll_cFv */
 void daTogeRoll_c::modeBound2() {
     if (cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, field_0x5d4, 1.0f) == 0) {
         init_modeBoundWait();
     }
 }
 
-/* 80C78C34-80C78C50 0010F4 001C+00 2/2 0/0 0/0 .text init_modeBoundWait__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeBoundWait() {
     field_0x5db = l_HIO.field_0x06;
     mMode = MODE_BOUND_WAIT;
 }
 
-/* 80C78C50-80C78CA8 001110 0058+00 1/0 0/0 0/0 .text            modeBoundWait__12daTogeRoll_cFv */
 void daTogeRoll_c::modeBoundWait() {
     if (field_0x5db != NULL) {
         field_0x5db -= 1;
@@ -291,12 +273,10 @@ void daTogeRoll_c::modeBoundWait() {
     }
 }
 
-/* 80C78CA8-80C78CB4 001168 000C+00 1/1 0/0 0/0 .text            init_modeAcc__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeAcc() {
     mMode = MODE_ACC;
 }
 
-/* 80C78CB4-80C78DA0 001174 00EC+00 1/0 0/0 0/0 .text            modeAcc__12daTogeRoll_cFv */
 void daTogeRoll_c::modeAcc() {
     int iVar1 = cLib_chaseF(&speedF, field_0x5d4, field_0x5d4 / l_HIO.field_0x08);
 
@@ -310,12 +290,10 @@ void daTogeRoll_c::modeAcc() {
     }
 }
 
-/* 80C78DA0-80C78DAC 001260 000C+00 1/1 0/0 0/0 .text            init_modeMove__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeMove() {
     mMode = MODE_MOVE;
 }
 
-/* 80C78DAC-80C790C4 00126C 0318+00 1/0 0/0 0/0 .text            modeMove__12daTogeRoll_cFv */
 void daTogeRoll_c::modeMove() {
     cXyz pos1 = field_0x5c8;
     cXyz pos2 = field_0x5b0;
@@ -340,12 +318,10 @@ void daTogeRoll_c::modeMove() {
     }
 }
 
-/* 80C790C4-80C790D0 001584 000C+00 1/1 0/0 0/0 .text            init_modeBrk__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeBrk() {
     mMode = MODE_BRK;
 }
 
-/* 80C790D0-80C792CC 001590 01FC+00 1/0 0/0 0/0 .text            modeBrk__12daTogeRoll_cFv */
 void daTogeRoll_c::modeBrk() {
     cXyz pos1 = current.pos;
     f32 fVar1 = cLib_addCalcPos(&current.pos, field_0x5b0, 0.1f, fopAcM_GetSpeedF(this), 0.5f);
@@ -360,37 +336,30 @@ void daTogeRoll_c::modeBrk() {
     }
 }
 
-/* 80C792CC-80C792E4 00178C 0018+00 2/2 0/0 0/0 .text            init_modeWaitInit__12daTogeRoll_cFv
- */
 void daTogeRoll_c::init_modeWaitInit() {
     speedF = 0.0f;
     mMode = MODE_WAIT_INIT;
 }
 
-/* 80C792E4-80C79318 0017A4 0034+00 1/0 0/0 0/0 .text            modeWaitInit__12daTogeRoll_cFv */
 void daTogeRoll_c::modeWaitInit() {
     setNextPoint();
     init_modeWait();
 }
 
-/* 80C79318-80C79324 0017D8 000C+00 2/2 0/0 0/0 .text            init_modeWait__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80C79324-80C79344 0017E4 0020+00 1/0 0/0 0/0 .text            modeWait__12daTogeRoll_cFv */
 void daTogeRoll_c::modeWait() {
     init_modeAcc();
 }
 
-/* 80C79344-80C793C8 001804 0084+00 1/1 0/0 0/0 .text            init_modeBreak__12daTogeRoll_cFv */
 void daTogeRoll_c::init_modeBreak() {
     mDoAud_seStart(Z2SE_OBJ_TRAP_BREAK, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = MODE_BREAK;
 }
 
-/* 80C793C8-80C795E8 001888 0220+00 1/0 0/0 0/0 .text            modeBreak__12daTogeRoll_cFv */
 void daTogeRoll_c::modeBreak() {
     csXyz rot = shape_angle;
     rot.x = 0.0f;
@@ -406,7 +375,6 @@ void daTogeRoll_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C795E8-80C79714 001AA8 012C+00 2/2 0/0 0/0 .text            setNextPoint__12daTogeRoll_cFv */
 void daTogeRoll_c::setNextPoint() {
     s16 sVar = field_0x5ae + field_0x5ad;
     dPath* room_path = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
@@ -433,7 +401,6 @@ void daTogeRoll_c::setNextPoint() {
     field_0x5ae = sVar;
 }
 
-/* 80C79714-80C797B8 001BD4 00A4+00 1/0 0/0 0/0 .text            Draw__12daTogeRoll_cFv */
 int daTogeRoll_c::Draw() {
     g_env_light.settingTevStruct(64, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -443,44 +410,34 @@ int daTogeRoll_c::Draw() {
     return 1;
 }
 
-/* 80C797B8-80C797FC 001C78 0044+00 1/0 0/0 0/0 .text            Delete__12daTogeRoll_cFv */
 int daTogeRoll_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, "togeRol");
     return 1;
 }
 
-/* 80C797FC-80C79828 001CBC 002C+00 1/0 0/0 0/0 .text            daTogeRoll_Draw__FP12daTogeRoll_c
- */
 static int daTogeRoll_Draw(daTogeRoll_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C79828-80C79848 001CE8 0020+00 1/0 0/0 0/0 .text daTogeRoll_Execute__FP12daTogeRoll_c */
 static int daTogeRoll_Execute(daTogeRoll_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C79848-80C79868 001D08 0020+00 1/0 0/0 0/0 .text            daTogeRoll_Delete__FP12daTogeRoll_c
- */
 static int daTogeRoll_Delete(daTogeRoll_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C79868-80C79888 001D28 0020+00 1/0 0/0 0/0 .text            daTogeRoll_Create__FP10fopAc_ac_c
- */
 static int daTogeRoll_Create(fopAc_ac_c* i_this) {
     return static_cast<daTogeRoll_c*>(i_this)->create();
 }
 
-/* 80C79C70-80C79C90 -00001 0020+00 1/0 0/0 0/0 .data            l_daTogeRoll_Method */
 static actor_method_class l_daTogeRoll_Method = {
     (process_method_func)daTogeRoll_Create,  (process_method_func)daTogeRoll_Delete,
     (process_method_func)daTogeRoll_Execute, 0,
     (process_method_func)daTogeRoll_Draw,
 };
 
-/* 80C79C90-80C79CC0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6TogeRoll */
 extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp
index 89ff9b1e3f..a80598ca88 100644
--- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp
+++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp
@@ -12,8 +12,8 @@
 
 class daLv6TogeTrap_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C79E4C */ daLv6TogeTrap_HIO_c();
-    /* 80C7C504 */ virtual ~daLv6TogeTrap_HIO_c() {}
+    daLv6TogeTrap_HIO_c();
+    virtual ~daLv6TogeTrap_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -31,7 +31,6 @@ public:
     /* 0x24 */ f32 rotate_speed;
 };
 
-/* 80C79E4C-80C79EC8 0000EC 007C+00 1/1 0/0 0/0 .text            __ct__19daLv6TogeTrap_HIO_cFv */
 daLv6TogeTrap_HIO_c::daLv6TogeTrap_HIO_c() {
     field_0x4 = 60;
     field_0x5 = 1;
@@ -50,10 +49,8 @@ daLv6TogeTrap_HIO_c::daLv6TogeTrap_HIO_c() {
     return_accel = 10.0f;
 }
 
-/* 80C7CA64-80C7CA8C 000014 0028+00 9/9 0/0 0/0 .bss             l_HIO */
 static daLv6TogeTrap_HIO_c l_HIO;
 
-/* 80C7C630-80C7C660 000018 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__15daLv6TogeTrap_c */
 const dCcD_SrcGObjInf daLv6TogeTrap_c::mCcDObjInfo = {
     {0, {{0x800, 0x1, 0x1F}, {0xD8FBFDFF, 0x11}, {0x79}}},
     {dCcD_SE_SWORD, 0, 1, 0, 1},
@@ -61,7 +58,6 @@ const dCcD_SrcGObjInf daLv6TogeTrap_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80C7C660-80C7C690 000048 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo2__15daLv6TogeTrap_c */
 const dCcD_SrcGObjInf daLv6TogeTrap_c::mCcDObjInfo2 = {
     {0, {{0x0, 0x0, 0}, {0xDAFBFDFF, 0x11}, {0x0}}},
     {dCcD_SE_SWORD, 0, 0, 0, 0},
@@ -69,7 +65,6 @@ const dCcD_SrcGObjInf daLv6TogeTrap_c::mCcDObjInfo2 = {
     {0},
 };
 
-/* 80C7C798-80C7C7D8 000020 0040+00 1/2 0/0 0/0 .data            mCcDSph__15daLv6TogeTrap_c */
 dCcD_SrcSph daLv6TogeTrap_c::mCcDSph = {
     daLv6TogeTrap_c::mCcDObjInfo,
     {
@@ -77,7 +72,6 @@ dCcD_SrcSph daLv6TogeTrap_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 80C7C7D8-80C7C81C 000060 0044+00 1/2 0/0 0/0 .data            mCcDCyl__15daLv6TogeTrap_c */
 dCcD_SrcCyl daLv6TogeTrap_c::mCcDCyl = {
     daLv6TogeTrap_c::mCcDObjInfo2,
     {
@@ -87,14 +81,12 @@ dCcD_SrcCyl daLv6TogeTrap_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80C7C81C-80C7C828 -00001 000C+00 2/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[3] = {
     "L6TogeTp",
     "L4TogeTp",
     "L9Toge",
 };
 
-/* 80C7C690-80C7C6D0 000078 0040+00 0/1 0/0 0/0 .rodata          mSpeed__15daLv6TogeTrap_c */
 const f32 daLv6TogeTrap_c::mSpeed[16] = {
     10.0f,
     16.666666f,
@@ -114,13 +106,10 @@ const f32 daLv6TogeTrap_c::mSpeed[16] = {
     3.3333333f,
 };
 
-/* 80C7C6D0-80C7C6DC 0000B8 000C+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {4, 4, 4};
 
-/* 80C7C6DC-80C7C6E8 0000C4 000C+00 0/0 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {7, 7, 7};
 
-/* 80C79F10-80C79FE8 0001B0 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x * (field_0x610 + oREG_F(19)), current.pos.y, current.pos.z * (field_0x610 + oREG_F(19)));
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -133,7 +122,6 @@ void daLv6TogeTrap_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C79FE8-80C7A068 000288 0080+00 1/0 0/0 0/0 .text            CreateHeap__15daLv6TogeTrap_cFv */
 int daLv6TogeTrap_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]);
     JUT_ASSERT(376, modelData != NULL);
@@ -146,7 +134,6 @@ int daLv6TogeTrap_c::CreateHeap() {
     return 1;
 }
 
-/* 80C7A068-80C7A534 000308 04CC+00 1/1 0/0 0/0 .text            create__15daLv6TogeTrap_cFv */
 int daLv6TogeTrap_c::create() {
     fopAcM_ct(this, daLv6TogeTrap_c);
 
@@ -263,7 +250,6 @@ int daLv6TogeTrap_c::create() {
     return phase_state;
 }
 
-/* 80C7A6B0-80C7A700 000950 0050+00 1/1 0/0 0/0 .text searchSekizoAct__15daLv6TogeTrap_cFPvPv */
 void* daLv6TogeTrap_c::searchSekizoAct(void* i_actor, void* i_data) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_CSTATUE) {
         return i_actor;
@@ -272,7 +258,6 @@ void* daLv6TogeTrap_c::searchSekizoAct(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C7A700-80C7A97C 0009A0 027C+00 1/0 0/0 0/0 .text Execute__15daLv6TogeTrap_cFPPA3_A4_f */
 int daLv6TogeTrap_c::Execute(Mtx** param_0) {
     moveLift();
 
@@ -325,7 +310,6 @@ int daLv6TogeTrap_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C7A97C-80C7ABC8 000C1C 024C+00 1/1 0/0 0/0 .text            moveLift__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::moveLift() {
     if (mPathNo != 0xFF) {
         static void (daLv6TogeTrap_c::*mode_proc[])() = {
@@ -368,8 +352,6 @@ void daLv6TogeTrap_c::moveLift() {
     }
 }
 
-/* 80C7ABC8-80C7ACA0 000E68 00D8+00 1/1 0/0 0/0 .text            executeType1__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::executeType1() {
     if (field_0x60b == 0 && mCcSph.ChkCoHit()) {
         fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc();
@@ -384,8 +366,6 @@ void daLv6TogeTrap_c::executeType1() {
     }
 }
 
-/* 80C7ACA0-80C7AD40 000F40 00A0+00 1/1 0/0 0/0 .text            init_modeBound__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeBound() {
     field_0x60b = 1;
     fopAcM_SetSpeedF(this, 0.0f);
@@ -400,21 +380,17 @@ void daLv6TogeTrap_c::init_modeBound() {
     mMode = 6;
 }
 
-/* 80C7AD40-80C7ADA4 000FE0 0064+00 1/0 0/0 0/0 .text            modeBound__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeBound() {
     if (0.0f == cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, mMoveSpeed, 5.0f)) {
         init_modeBoundWait();
     }
 }
 
-/* 80C7ADA4-80C7ADC0 001044 001C+00 1/1 0/0 0/0 .text init_modeBoundWait__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::init_modeBoundWait() {
     field_0x60a = l_HIO.return_wait;
     mMode = 7;
 }
 
-/* 80C7ADC0-80C7AE18 001060 0058+00 1/0 0/0 0/0 .text            modeBoundWait__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::modeBoundWait() {
     if (field_0x60a != 0) {
         field_0x60a--;
@@ -425,13 +401,10 @@ void daLv6TogeTrap_c::modeBoundWait() {
     }
 }
 
-/* 80C7AE18-80C7AE24 0010B8 000C+00 1/1 0/0 0/0 .text            init_modeAcc__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeAcc() {
     mMode = 0;
 }
 
-/* 80C7AE24-80C7AF10 0010C4 00EC+00 1/0 0/0 0/0 .text            modeAcc__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeAcc() {
     BOOL temp_r30 = cLib_chaseF(&speedF, mMoveSpeed, mMoveSpeed / l_HIO.return_accel);
     cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, fopAcM_GetSpeedF(this), 0.1f);
@@ -443,13 +416,10 @@ void daLv6TogeTrap_c::modeAcc() {
     }
 }
 
-/* 80C7AF10-80C7AF1C 0011B0 000C+00 1/1 0/0 0/0 .text            init_modeMove__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeMove() {
     mMode = 1;
 }
 
-/* 80C7AF1C-80C7B234 0011BC 0318+00 1/0 0/0 0/0 .text            modeMove__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeMove() {
     f32 temp_f30 = 30.0f;
     f32 temp_f29 = 300.0f;
@@ -473,13 +443,10 @@ void daLv6TogeTrap_c::modeMove() {
     }
 }
 
-/* 80C7B234-80C7B240 0014D4 000C+00 1/1 0/0 0/0 .text            init_modeBrk__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeBrk() {
     mMode = 3;
 }
 
-/* 80C7B240-80C7B43C 0014E0 01FC+00 1/0 0/0 0/0 .text            modeBrk__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeBrk() {
     cXyz sp14(current.pos);
     f32 temp_f31 = cLib_addCalcPos(&current.pos, field_0x5b0, 0.1f, fopAcM_GetSpeedF(this), 0.5f);
@@ -491,13 +458,10 @@ void daLv6TogeTrap_c::modeBrk() {
     }
 }
 
-/* 80C7B43C-80C7B448 0016DC 000C+00 1/1 0/0 0/0 .text            init_modeMove2__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeMove2() {
     mMode = 2;
 }
 
-/* 80C7B448-80C7B518 0016E8 00D0+00 1/0 0/0 0/0 .text            modeMove2__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeMove2() {
     f32 temp_f31 = cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, mMoveSpeed, mMoveSpeed);
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, mMoveSpeed, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -506,14 +470,11 @@ void daLv6TogeTrap_c::modeMove2() {
     }
 }
 
-/* 80C7B518-80C7B530 0017B8 0018+00 3/3 0/0 0/0 .text init_modeWaitInit__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::init_modeWaitInit() {
     fopAcM_SetSpeedF(this, 0.0f);
     mMode = 5;
 }
 
-/* 80C7B530-80C7B600 0017D0 00D0+00 1/0 0/0 0/0 .text            modeWaitInit__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::modeWaitInit() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     setNextPoint();
@@ -529,13 +490,10 @@ void daLv6TogeTrap_c::modeWaitInit() {
     }
 }
 
-/* 80C7B600-80C7B60C 0018A0 000C+00 2/2 0/0 0/0 .text            init_modeWait__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeWait() {
     mMode = 4;
 }
 
-/* 80C7B60C-80C7B6D4 0018AC 00C8+00 1/0 0/0 0/0 .text            modeWait__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeWait() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -548,8 +506,6 @@ void daLv6TogeTrap_c::modeWait() {
     }
 }
 
-/* 80C7B6D4-80C7B988 001974 02B4+00 1/1 0/0 0/0 .text            executeType2__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::executeType2() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz sp40;
@@ -611,39 +567,30 @@ void daLv6TogeTrap_c::executeType2() {
     }
 }
 
-/* 80C7B988-80C7B9A8 001C28 0020+00 2/2 0/0 0/0 .text init_modeWaitType2__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::init_modeWaitType2() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x5db = 0;
     mMode = 8;
 }
 
-/* 80C7B9A8-80C7BA38 001C48 0090+00 1/0 0/0 0/0 .text            modeWaitType2__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::modeWaitType2() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80C7BA38-80C7BA50 001CD8 0018+00 1/1 0/0 0/0 .text init_modeMoveInitType2__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeMoveInitType2() {
     fopAcM_SetSpeedF(this, 0.0f);
     mMode = 9;
 }
 
-/* 80C7BA50-80C7BAE8 001CF0 0098+00 1/0 0/0 0/0 .text modeMoveInitType2__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeMoveInitType2() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     init_modeAccType2();
 }
 
-/* 80C7BAE8-80C7BAF4 001D88 000C+00 1/1 0/0 0/0 .text init_modeAccType2__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::init_modeAccType2() {
     mMode = 10;
 }
 
-/* 80C7BAF4-80C7BC54 001D94 0160+00 1/0 0/0 0/0 .text            modeAccType2__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::modeAccType2() {
     cLib_chaseF(&speedF, field_0x604, field_0x604 / l_HIO.search_accel);
     f32 temp_f31 = cLib_addCalcPos(&current.pos, field_0x5b0, 1.0f, fopAcM_GetSpeedF(this), 0.1f);
@@ -665,15 +612,12 @@ void daLv6TogeTrap_c::modeAccType2() {
     }
 }
 
-/* 80C7BC54-80C7BC7C 001EF4 0028+00 2/2 0/0 0/0 .text
- * init_modeWaitAttackType2__15daLv6TogeTrap_cFv                */
 void daLv6TogeTrap_c::init_modeWaitAttackType2() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x60a = l_HIO.search_wait;
     mMode = 11;
 }
 
-/* 80C7BC7C-80C7BD64 001F1C 00E8+00 1/0 0/0 0/0 .text modeWaitAttackType2__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeWaitAttackType2() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -689,12 +633,10 @@ void daLv6TogeTrap_c::modeWaitAttackType2() {
     }
 }
 
-/* 80C7BD64-80C7BD70 002004 000C+00 1/1 0/0 0/0 .text init_modeRotate__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::init_modeRotate() {
     mMode = 13;
 }
 
-/* 80C7BD70-80C7BED8 002010 0168+00 1/0 0/0 0/0 .text            modeRotate__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeRotate() {
     if (mCcSph.ChkCoHit()) {
         fopAc_ac_c* co_hitactor = mCcSph.GetCoHitAc();
@@ -713,8 +655,6 @@ void daLv6TogeTrap_c::modeRotate() {
     mDoAud_seStartLevel(Z2SE_OBJ_TOGE_SPIN, &field_0x8c4, mMoveSpeed, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80C7BED8-80C7BFE4 002178 010C+00 1/1 0/0 0/0 .text            init_modeBreak__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::init_modeBreak() {
     cXyz sound_pos;
     if (mType == 3 || mType == 4) {
@@ -730,7 +670,6 @@ void daLv6TogeTrap_c::init_modeBreak() {
     mMode = 12;
 }
 
-/* 80C7BFE4-80C7C1D8 002284 01F4+00 1/0 0/0 0/0 .text            modeBreak__15daLv6TogeTrap_cFv */
 void daLv6TogeTrap_c::modeBreak() {
     cXyz effpos;
     if (mType == 3 || mType == 4) {
@@ -749,8 +688,6 @@ void daLv6TogeTrap_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80C7C1D8-80C7C33C 002478 0164+00 2/2 0/0 0/0 .text            setNextPoint__15daLv6TogeTrap_cFv
- */
 void daLv6TogeTrap_c::setNextPoint() {
     s16 step = field_0x5ae + mRotateDirection;
     dPath* path = dPath_GetRoomPath(mPathNo, fopAcM_GetRoomNo(this));
@@ -790,7 +727,6 @@ void daLv6TogeTrap_c::setNextPoint() {
     }
 }
 
-/* 80C7C33C-80C7C3E0 0025DC 00A4+00 1/0 0/0 0/0 .text            Draw__15daLv6TogeTrap_cFv */
 int daLv6TogeTrap_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -800,7 +736,6 @@ int daLv6TogeTrap_c::Draw() {
     return 1;
 }
 
-/* 80C7C3E0-80C7C430 002680 0050+00 1/0 0/0 0/0 .text            Delete__15daLv6TogeTrap_cFv */
 int daLv6TogeTrap_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]);
@@ -811,28 +746,22 @@ int daLv6TogeTrap_c::Delete() {
     return 1;
 }
 
-/* 80C7C430-80C7C45C 0026D0 002C+00 1/0 0/0 0/0 .text daLv6TogeTrap_Draw__FP15daLv6TogeTrap_c */
 static int daLv6TogeTrap_Draw(daLv6TogeTrap_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C7C45C-80C7C47C 0026FC 0020+00 1/0 0/0 0/0 .text daLv6TogeTrap_Execute__FP15daLv6TogeTrap_c
- */
 static int daLv6TogeTrap_Execute(daLv6TogeTrap_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C7C47C-80C7C49C 00271C 0020+00 1/0 0/0 0/0 .text daLv6TogeTrap_Delete__FP15daLv6TogeTrap_c */
 static int daLv6TogeTrap_Delete(daLv6TogeTrap_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C7C49C-80C7C4BC 00273C 0020+00 1/0 0/0 0/0 .text daLv6TogeTrap_Create__FP10fopAc_ac_c */
 static int daLv6TogeTrap_Create(fopAc_ac_c* i_this) {
     return ((daLv6TogeTrap_c*)i_this)->create();
 }
 
-/* 80C7C978-80C7C998 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6TogeTrap_Method */
 static actor_method_class l_daLv6TogeTrap_Method = {
     (process_method_func)daLv6TogeTrap_Create,
     (process_method_func)daLv6TogeTrap_Delete,
@@ -841,7 +770,6 @@ static actor_method_class l_daLv6TogeTrap_Method = {
     (process_method_func)daLv6TogeTrap_Draw,
 };
 
-/* 80C7C998-80C7C9C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6TogeTrap */
 extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp
index acc33276b3..e2e60af6bb 100644
--- a/src/d/actor/d_a_obj_lv6bemos.cpp
+++ b/src/d/actor/d_a_obj_lv6bemos.cpp
@@ -31,7 +31,6 @@ enum Obj_lv6bm_RES_File_ID {
     /* 0x17 */ DZB_LV6_OBJ_BEMOS,
 };
 
-/* 80C7DECC-80C7DF0C 000000 0040+00 5/5 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0xd8fbfdff, 0x11}, 0x0}}, // mObj
@@ -44,7 +43,6 @@ const static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80C7CB18-80C7CE24 000078 030C+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -98,13 +96,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80C7CE24-80C7CE60 000384 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjL6Bm_cFv */
 void daObjL6Bm_c::initBaseMtx() {
     mBeamosModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C7CE60-80C7CED4 0003C0 0074+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjL6Bm_cFv */
 void daObjL6Bm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -112,16 +108,13 @@ void daObjL6Bm_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C7DF98-80C7DF9C -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_lv6bm";
 
-/* 80C7DF9C-80C7DFB4 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static f32 l_cull_box[6] = {
     -200.0f, -100.0f, -200.0f,
     200.0f, 100.0f, 200.0f,
 };
 
-/* 80C7DFB4-80C7E000 00003C 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -134,7 +127,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 80C7CED4-80C7CFD0 000434 00FC+00 1/0 0/0 0/0 .text            Create__11daObjL6Bm_cFv */
 int daObjL6Bm_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mBeamosModel->getBaseTRMtx());
@@ -170,7 +162,6 @@ int daObjL6Bm_c::Create() {
     return 1;
 }
 
-/* 80C7CFD0-80C7D2B0 000530 02E0+00 1/0 0/0 0/0 .text            CreateHeap__11daObjL6Bm_cFv */
 int daObjL6Bm_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_K_BIMO00);
     JUT_ASSERT(620, modelData != NULL);
@@ -223,7 +214,6 @@ int daObjL6Bm_c::CreateHeap() {
     return 1;
 }
 
-/* 80C7D2F8-80C7D3A4 000858 00AC+00 1/1 0/0 0/0 .text            create1st__11daObjL6Bm_cFv */
 cPhs__Step daObjL6Bm_c::create1st() {
     if (fopAcM_isSwitch(this, getSwBit())) {
         OS_REPORT("ビーモス破壊済み！<%d>\n", getSwBit() & 0xFF); // Beamos has been destroyed! <%d>\n
@@ -241,7 +231,6 @@ cPhs__Step daObjL6Bm_c::create1st() {
     return phase;
 }
 
-/* 80C7D3A4-80C7D4F4 000904 0150+00 1/0 0/0 0/0 .text            Execute__11daObjL6Bm_cFPPA3_A4_f */
 int daObjL6Bm_c::Execute(f32 (**param_1)[3][4]) {
     static u16 const l_particle_id[6] = {
         0x828F, 0x8290, 0x8291, 0x8292, 0x8293, 0x8294,
@@ -269,7 +258,6 @@ int daObjL6Bm_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 80C7D4F4-80C7D598 000A54 00A4+00 1/1 0/0 0/0 .text            action__11daObjL6Bm_cFv */
 void daObjL6Bm_c::action() {
     static daObjL6Bm_c::actionFunc l_func[3] = {
         &daObjL6Bm_c::actionWait,
@@ -280,7 +268,6 @@ void daObjL6Bm_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80C7D598-80C7D6CC 000AF8 0134+00 1/0 0/0 0/0 .text            actionWait__11daObjL6Bm_cFv */
 void daObjL6Bm_c::actionWait() {
     bool var_r28 = false;
     bool var_r27 = false;
@@ -323,7 +310,6 @@ void daObjL6Bm_c::actionWait() {
     }
 }
 
-/* 80C7D6CC-80C7D894 000C2C 01C8+00 1/0 0/0 0/0 .text            actionFindPlayer__11daObjL6Bm_cFv */
 void daObjL6Bm_c::actionFindPlayer() {
     f32 fVar1;
     bool var_r28 = false;
@@ -366,12 +352,10 @@ void daObjL6Bm_c::actionFindPlayer() {
     field_0x892 = current.angle.y;
 }
 
-/* 80C7D894-80C7D898 000DF4 0004+00 1/0 0/0 0/0 .text            actionAttack__11daObjL6Bm_cFv */
 void daObjL6Bm_c::actionAttack() {
     /* empty function */
 }
 
-/* 80C7D898-80C7DA74 000DF8 01DC+00 1/0 0/0 0/0 .text            Draw__11daObjL6Bm_cFv */
 int daObjL6Bm_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mBeamosModel, &tevStr);
@@ -401,34 +385,28 @@ int daObjL6Bm_c::Draw() {
     return 1;
 }
 
-/* 80C7DABC-80C7DAF0 00101C 0034+00 1/0 0/0 0/0 .text            Delete__11daObjL6Bm_cFv */
 int daObjL6Bm_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80C7DAF0-80C7DC78 001050 0188+00 1/0 0/0 0/0 .text daObjL6Bm_create1st__FP11daObjL6Bm_c */
 static int daObjL6Bm_create1st(daObjL6Bm_c* i_this) {
     fopAcM_ct(i_this, daObjL6Bm_c);
     return i_this->create1st();
 }
 
-/* 80C7DDDC-80C7DDFC 00133C 0020+00 1/0 0/0 0/0 .text daObjL6Bm_MoveBGDelete__FP11daObjL6Bm_c */
 static int daObjL6Bm_MoveBGDelete(daObjL6Bm_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C7DDFC-80C7DE1C 00135C 0020+00 1/0 0/0 0/0 .text daObjL6Bm_MoveBGExecute__FP11daObjL6Bm_c */
 static int daObjL6Bm_MoveBGExecute(daObjL6Bm_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C7DE1C-80C7DE48 00137C 002C+00 1/0 0/0 0/0 .text daObjL6Bm_MoveBGDraw__FP11daObjL6Bm_c */
 static int daObjL6Bm_MoveBGDraw(daObjL6Bm_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C7E048-80C7E068 -00001 0020+00 1/0 0/0 0/0 .data            daObjL6Bm_METHODS */
 static actor_method_class daObjL6Bm_METHODS = {
     (process_method_func)daObjL6Bm_create1st,
     (process_method_func)daObjL6Bm_MoveBGDelete,
@@ -437,7 +415,6 @@ static actor_method_class daObjL6Bm_METHODS = {
     (process_method_func)daObjL6Bm_MoveBGDraw,
 };
 
-/* 80C7E068-80C7E098 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6bemos */
 extern actor_process_profile_definition g_profile_Obj_Lv6bemos = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp
index d8f240f8d0..38558229f4 100644
--- a/src/d/actor/d_a_obj_lv6bemos2.cpp
+++ b/src/d/actor/d_a_obj_lv6bemos2.cpp
@@ -54,7 +54,6 @@ enum Particle {
     /* 0x890C */ ZL2_SMOKE00_IA8 = 0x890C,
 };
 
-/* 80C7E1B8-80C7E30C 000078 0154+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         int jntNo = i_joint->getJntNo();
@@ -82,13 +81,10 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80C81C2C-80C81C38 000000 000C+00 9/9 0/0 0/0 .rodata          l_eye_offset */
 static f32 const l_eye_offset[3] = {0.0f, 430.0f, 80.0f};
 
-/* 80C81C38-80C81C44 00000C 000C+00 0/1 0/0 0/0 .rodata          l_beam_offsetPos */
 static f32 const l_beam_offsetPos[3] = {0.0f, 98.0f, 125.0f};
 
-/* 80C7E30C-80C7E374 0001CC 0068+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initBaseMtx() {
     cXyz sp18(0.5f, 0.5f, 1.0f);
     mBeamosModel->setBaseScale(scale);
@@ -96,7 +92,6 @@ void daObjLv6Bm_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C7E374-80C7E448 000234 00D4+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -111,28 +106,20 @@ void daObjLv6Bm_c::setBaseMtx() {
     mBeamEffectModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C81D24-80C81D28 -00001 0004+00 9/10 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "E_bm6";
 
-/* 80C81D28-80C81D2C -00001 0004+00 0/1 0/0 0/0 .data            l_eye_matName */
 static char* l_eye_matName = "bm6_eye";
 
-/* 80C81D2C-80C81D30 -00001 0004+00 0/1 0/0 0/0 .data            l_head_joint */
 static char* l_head_joint = "head";
 
-/* 80C81D30-80C81D34 -00001 0004+00 0/1 0/0 0/0 .data            l_bigGear_joint */
 static char* l_bigGear_joint = "cogRed";
 
-/* 80C81D34-80C81D38 -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear0_joint */
 static char* l_smallGear0_joint = "cogBlue";
 
-/* 80C81D38-80C81D3C -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear1_joint */
 static char* l_smallGear1_joint = "cogGreen";
 
-/* 80C81D3C-80C81D40 -00001 0004+00 0/1 0/0 0/0 .data            l_smallGear2_joint */
 static char* l_smallGear2_joint = "cogYellow";
 
-/* 80C81D40-80C81D54 00003C 0014+00 0/2 0/0 0/0 .data            l_joint_table */
 static char* l_joint_table[5] = {
     l_head_joint,
     l_bigGear_joint,
@@ -141,13 +128,11 @@ static char* l_joint_table[5] = {
     l_smallGear2_joint,
 };
 
-/* 80C81D54-80C81D6C 000050 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static f32 l_cull_box[6] = {
     -1200.0f, -100.0f, -1200.0f,
     1200.0f, 400.0f, 1200.0f,
 };
 
-/* 80C81D6C-80C81DAC 000068 0040+00 0/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x402420, 0x11}, 0x58}}, // mObj
@@ -160,7 +145,6 @@ static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80C81DAC-80C81DF8 0000A8 004C+00 0/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
@@ -173,7 +157,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 80C81DF8-80C81E3C 0000F4 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x400, 0x11}, 0x18}}, // mObj
@@ -188,7 +171,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80C7E448-80C7E764 000308 031C+00 1/0 0/0 0/0 .text            Create__12daObjLv6Bm_cFv */
 int daObjLv6Bm_c::Create() {
     fopAcM_SetMtx(this, mBeamosModel->getBaseTRMtx());
     mStts.Init(0xFF, 0xFF, this);
@@ -250,7 +232,6 @@ int daObjLv6Bm_c::Create() {
     return 1;
 }
 
-/* 80C7E764-80C7EB34 000624 03D0+00 1/0 0/0 0/0 .text            CreateHeap__12daObjLv6Bm_cFv */
 int daObjLv6Bm_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDE_BM6);
     JUT_ASSERT(620, modelData != NULL);
@@ -316,7 +297,6 @@ int daObjLv6Bm_c::CreateHeap() {
     return 1;
 }
 
-/* 80C7EB7C-80C7EC6C 000A3C 00F0+00 1/1 0/0 0/0 .text            create1st__12daObjLv6Bm_cFv */
 cPhs__Step daObjLv6Bm_c::create1st() {
     if (fopAcM_isSwitch(this, (u8)getSwNo3())) {
         OS_REPORT("Lv6ビーモス：既に破壊！<%d>\n", getSwNo3()); // Lv6 Beamos: Already destroyed! <%d>
@@ -347,7 +327,6 @@ cPhs__Step daObjLv6Bm_c::create1st() {
     return phase;
 }
 
-/* 80C7EC6C-80C7EE50 000B2C 01E4+00 1/0 0/0 0/0 .text            Execute__12daObjLv6Bm_cFPPA3_A4_f */
 int daObjLv6Bm_c::Execute(f32 (**param_1)[3][4]) {
     field_0xa20++;
 
@@ -385,7 +364,6 @@ int daObjLv6Bm_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 80C7EE50-80C7F2A4 000D10 0454+00 1/1 0/0 0/0 .text            action__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::action() {
     static daObjLv6Bm_c::actionFunc l_func[6] = {
         &daObjLv6Bm_c::actionSwWait,
@@ -465,7 +443,6 @@ void daObjLv6Bm_c::action() {
     dComIfG_Ccsp()->Set(&field_0x87c);
 }
 
-/* 80C7F2A4-80C7F8BC 001164 0618+00 1/1 0/0 0/0 .text            calcBeam__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::calcBeam() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_searchPlayerDistanceXZ(this);
@@ -527,7 +504,6 @@ void daObjLv6Bm_c::calcBeam() {
 
 }
 
-/* 80C7F904-80C7FA54 0017C4 0150+00 1/1 0/0 0/0 .text            checkFindPlayer__12daObjLv6Bm_cFv */
 int daObjLv6Bm_c::checkFindPlayer() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 searchDistance = getSearchDistance();
@@ -559,7 +535,6 @@ int daObjLv6Bm_c::checkFindPlayer() {
     return rv;
 }
 
-/* 80C7FA54-80C7FBA4 001914 0150+00 1/1 0/0 0/0 .text            checkSearchPlayer__12daObjLv6Bm_cFv */
 s8 daObjLv6Bm_c::checkSearchPlayer() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 searchDistance = getSearchDistance();
@@ -592,7 +567,6 @@ s8 daObjLv6Bm_c::checkSearchPlayer() {
     return rv;
 }
 
-/* 80C7FBA4-80C7FBFC 001A64 0058+00 2/2 0/0 0/0 .text            getSearchDistance__12daObjLv6Bm_cFv */
 f32 daObjLv6Bm_c::getSearchDistance() {
     f32 rv = 1000.0f;
     if (getSearchDist() != 15 && getSearchDist() != 0) {
@@ -601,7 +575,6 @@ f32 daObjLv6Bm_c::getSearchDistance() {
     return rv;
 }
 
-/* 80C7FBFC-80C7FC54 001ABC 0058+00 1/1 0/0 0/0 .text getBeamSearchDistance__12daObjLv6Bm_cFv */
 f32 daObjLv6Bm_c::getBeamSearchDistance() {
     f32 rv = 1000.0f;
     if (getBeamSearchDist() != 15 && getBeamSearchDist() != 0) {
@@ -610,7 +583,6 @@ f32 daObjLv6Bm_c::getBeamSearchDistance() {
     return rv;
 }
 
-/* 80C7FC54-80C7FD8C 001B14 0138+00 1/1 0/0 0/0 .text            effect_proc__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::effect_proc() {
     static daObjLv6Bm_c::effectFunc l_eff_func[2] = {
         &daObjLv6Bm_c::effectWait,
@@ -626,12 +598,10 @@ void daObjLv6Bm_c::effect_proc() {
     }
 }
 
-/* 80C7FD8C-80C7FD90 001C4C 0004+00 1/0 0/0 0/0 .text            effectWait__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::effectWait() {
     /* empty function */
 }
 
-/* 80C7FD90-80C7FEC4 001C50 0134+00 1/1 0/0 0/0 .text            initEffectSet0__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initEffectSet0() {
     static u16 const eff_id[2] = {
         ZL2_ICEROCK_1,
@@ -653,7 +623,6 @@ void daObjLv6Bm_c::initEffectSet0() {
     field_0xa1a = 1;
 }
 
-/* 80C7FEC4-80C7FF78 001D84 00B4+00 1/0 0/0 0/0 .text            effectSet0__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::effectSet0() {
     if (field_0xa24 != NULL) {
         if (field_0xa24->isEnableDeleteEmitter()) {
@@ -666,7 +635,6 @@ void daObjLv6Bm_c::effectSet0() {
     }
 }
 
-/* 80C7FF78-80C7FFB8 001E38 0040+00 1/1 0/0 0/0 .text            initActionSwWait__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionSwWait() {
     field_0x9d6 = 0;
     field_0x9d8 = 0;
@@ -678,7 +646,6 @@ void daObjLv6Bm_c::initActionSwWait() {
     field_0xa10 = 0;
 }
 
-/* 80C7FFB8-80C802AC 001E78 02F4+00 1/0 0/0 0/0 .text            actionSwWait__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionSwWait() {
     cXyz i_sePos;
     switch (mMode) {
@@ -717,13 +684,11 @@ void daObjLv6Bm_c::actionSwWait() {
     }
 }
 
-/* 80C802AC-80C802C0 00216C 0014+00 3/3 0/0 0/0 .text            initActionWarning__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionWarning() {
     mMode = 0;
     field_0xa10 = 1;
 }
 
-/* 80C802C0-80C803D8 002180 0118+00 1/0 0/0 0/0 .text            actionWarning__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionWarning() {
     field_0x9d8 = 500;
     fopAcM_searchPlayerAngleY(this);
@@ -755,7 +720,6 @@ void daObjLv6Bm_c::actionWarning() {
     field_0x9d4 = field_0x9d2 + field_0x9da;
 }
 
-/* 80C803D8-80C80538 002298 0160+00 1/1 0/0 0/0 .text initActionFindPlayer__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionFindPlayer() {
     mpBrkAnm->init(mBeamosModel->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_SERCH),
                    1, 0, 1.0f, 0, -1);
@@ -769,7 +733,6 @@ void daObjLv6Bm_c::initActionFindPlayer() {
     field_0xa10 = 2;
 }
 
-/* 80C80538-80C80684 0023F8 014C+00 1/0 0/0 0/0 .text            actionFindPlayer__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionFindPlayer() {
     switch (mMode) {
         case 0:
@@ -805,7 +768,6 @@ void daObjLv6Bm_c::actionFindPlayer() {
     }
 }
 
-/* 80C80684-80C8082C 002544 01A8+00 1/1 0/0 0/0 .text            initActionAttack__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionAttack() {
     static u16 const eff_id[4] = {
         ZL2_GLOW02_3,
@@ -840,7 +802,6 @@ void daObjLv6Bm_c::initActionAttack() {
     field_0xa10 = 3;
 }
 
-/* 80C8082C-80C80F48 0026EC 071C+00 1/0 0/0 0/0 .text            actionAttack__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionAttack() {
     static u16 const l_eff_id[2] = {
         ZL2_GLOW02_1,
@@ -999,7 +960,6 @@ void daObjLv6Bm_c::actionAttack() {
     }
 }
 
-/* 80C80F48-80C81154 002E08 020C+00 1/1 0/0 0/0 .text            initActionDead__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionDead() {
     if (field_0x9c2 > -0x4000 && field_0x9c2 < 0x4000) {
         field_0x9c4 = 0;
@@ -1040,7 +1000,6 @@ void daObjLv6Bm_c::initActionDead() {
     field_0xa10 = 4;
 }
 
-/* 80C81154-80C81428 003014 02D4+00 2/0 0/0 0/0 .text            actionDead__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionDead() {
     switch (mMode) {
         case 0:
@@ -1110,7 +1069,6 @@ void daObjLv6Bm_c::actionDead() {
     field_0x9d4 = field_0x9d2 + field_0x9da;
 }
 
-/* 80C81428-80C814FC 0032E8 00D4+00 1/1 0/0 0/0 .text            initActionEnd__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::initActionEnd() {
     mpBckAnm->init((J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_BM6_DOWN), 1, 0, 0.0f, 0, -1, true);
     mpBckAnm->setFrame(mpBckAnm->getEndFrame());
@@ -1120,12 +1078,10 @@ void daObjLv6Bm_c::initActionEnd() {
     field_0xa10 = 5;
 }
 
-/* 80C814FC-80C81500 0033BC 0004+00 1/0 0/0 0/0 .text            actionEnd__12daObjLv6Bm_cFv */
 void daObjLv6Bm_c::actionEnd() {
     /* empty function */
 }
 
-/* 80C81500-80C816A8 0033C0 01A8+00 1/0 0/0 0/0 .text            Draw__12daObjLv6Bm_cFv */
 int daObjLv6Bm_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mBeamosModel, &tevStr);
@@ -1155,7 +1111,6 @@ int daObjLv6Bm_c::Draw() {
     return 1;
 }
 
-/* 80C816A8-80C81808 003568 0160+00 1/0 0/0 0/0 .text            Delete__12daObjLv6Bm_cFv */
 int daObjLv6Bm_c::Delete() {
     if (field_0xa50 != NULL) {
         field_0xa50->becomeInvalidEmitter();
@@ -1192,28 +1147,23 @@ int daObjLv6Bm_c::Delete() {
     return 1;
 }
 
-/* 80C81808-80C819C8 0036C8 01C0+00 1/0 0/0 0/0 .text daObjLv6Bm_create1st__FP12daObjLv6Bm_c */
 static int daObjLv6Bm_create1st(daObjLv6Bm_c* i_this) {
     fopAcM_ct(i_this, daObjLv6Bm_c);
     return i_this->create1st();
 }
 
-/* 80C81AFC-80C81B1C 0039BC 0020+00 1/0 0/0 0/0 .text daObjLv6Bm_MoveBGDelete__FP12daObjLv6Bm_c */
 static int daObjLv6Bm_MoveBGDelete(daObjLv6Bm_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C81B1C-80C81B3C 0039DC 0020+00 1/0 0/0 0/0 .text daObjLv6Bm_MoveBGExecute__FP12daObjLv6Bm_c */
 static int daObjLv6Bm_MoveBGExecute(daObjLv6Bm_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C81B3C-80C81B68 0039FC 002C+00 1/0 0/0 0/0 .text daObjLv6Bm_MoveBGDraw__FP12daObjLv6Bm_c */
 static int daObjLv6Bm_MoveBGDraw(daObjLv6Bm_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C81F18-80C81F38 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv6Bm_METHODS */
 static actor_method_class daObjLv6Bm_METHODS = {
     (process_method_func)daObjLv6Bm_create1st,
     (process_method_func)daObjLv6Bm_MoveBGDelete,
@@ -1222,7 +1172,6 @@ static actor_method_class daObjLv6Bm_METHODS = {
     (process_method_func)daObjLv6Bm_MoveBGDraw,
 };
 
-/* 80C81F38-80C81F68 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6bemos2 */
 extern actor_process_profile_definition g_profile_Obj_Lv6bemos2 = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp
index f40648e564..92a80c9d3d 100644
--- a/src/d/actor/d_a_obj_lv6egate.cpp
+++ b/src/d/actor/d_a_obj_lv6egate.cpp
@@ -7,12 +7,10 @@
 
 #include "d/actor/d_a_obj_lv6egate.h"
 
-/* 80C82BB0-80C82BB4 -00001 0004+00 2/2 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "LV6EGATE";
 
 static const int l_dzbidx = 3;
 
-/* 80C82078-80C82108 000078 0090+00 1/1 0/0 0/0 .text            create1st__15daObjLv6EGate_cFv */
 int daObjLv6EGate_c::create1st() {
     int phase_state = dComIfG_resLoad(this, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -26,7 +24,6 @@ int daObjLv6EGate_c::create1st() {
     return phase_state;
 }
 
-/* 80C82108-80C82178 000108 0070+00 2/2 0/0 0/0 .text            setMtx__15daObjLv6EGate_cFv */
 void daObjLv6EGate_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -34,18 +31,15 @@ void daObjLv6EGate_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x5a8);
 }
 
-/* 80C82178-80C82180 000178 0008+00 1/0 0/0 0/0 .text            CreateHeap__15daObjLv6EGate_cFv */
 int daObjLv6EGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C82B70-80C82B88 000000 0018+00 2/2 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-500.0f, 0.0f, -50.0f},
     {500.0f, 300.0f, 50.0f},
 };
 
-/* 80C82BB4-80C82BF8 000004 0044+00 1/1 0/0 0/0 .data            l_at_cyl_src */
 static dCcD_SrcCyl l_at_cyl_src = {
     {
         {0x0, {{0x100, 0x2, 0xd}, {0x400, 0x0}, 0x11}}, // mObj
@@ -60,7 +54,6 @@ static dCcD_SrcCyl l_at_cyl_src = {
     } // mCyl
 };
 
-/* 80C82180-80C822DC 000180 015C+00 1/0 0/0 0/0 .text            Create__15daObjLv6EGate_cFv */
 int daObjLv6EGate_c::Create() {
     fopAcM_SetMtx(this, field_0x5d8);
     fopAcM_setCullSizeBox(this, l_cull_box.min.x, l_cull_box.min.y, l_cull_box.min.z, l_cull_box.max.x, l_cull_box.max.y, l_cull_box.max.z);
@@ -95,7 +88,6 @@ int daObjLv6EGate_c::Create() {
     return 1;
 }
 
-/* 80C822DC-80C82330 0002DC 0054+00 2/2 0/0 0/0 .text            offDisp__15daObjLv6EGate_cFv */
 void daObjLv6EGate_c::offDisp() {
     mElecOff = true;
 
@@ -105,7 +97,6 @@ void daObjLv6EGate_c::offDisp() {
     }
 }
 
-/* 80C82330-80C82388 000330 0058+00 2/2 0/0 0/0 .text            onDisp__15daObjLv6EGate_cFv */
 void daObjLv6EGate_c::onDisp() {
     mElecOff = false;
 
@@ -115,7 +106,6 @@ void daObjLv6EGate_c::onDisp() {
     }
 }
 
-/* 80C82388-80C82690 000388 0308+00 1/0 0/0 0/0 .text Execute__15daObjLv6EGate_cFPPA3_A4_f */
 int daObjLv6EGate_c::Execute(Mtx** param_0) {
     if (getSwNo() != 0xFF) {
         if (getType() != 0) {
@@ -182,7 +172,6 @@ int daObjLv6EGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C82690-80C826A0 000690 0010+00 1/0 0/0 0/0 .text            Draw__15daObjLv6EGate_cFv */
 int daObjLv6EGate_c::Draw() {
     if (mElecOff) {
         return 1;
@@ -191,38 +180,28 @@ int daObjLv6EGate_c::Draw() {
     return 1;
 }
 
-/* 80C826A0-80C826DC 0006A0 003C+00 1/0 0/0 0/0 .text            Delete__15daObjLv6EGate_cFv */
 int daObjLv6EGate_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80C826DC-80C82790 0006DC 00B4+00 1/0 0/0 0/0 .text daObjLv6EGate_create1st__FP15daObjLv6EGate_c
- */
 static int daObjLv6EGate_create1st(daObjLv6EGate_c* i_this) {
     fopAcM_ct(i_this, daObjLv6EGate_c);
     return i_this->create1st();
 }
 
-/* 80C829CC-80C829EC 0009CC 0020+00 1/0 0/0 0/0 .text
- * daObjLv6EGate_MoveBGDelete__FP15daObjLv6EGate_c              */
 static int daObjLv6EGate_MoveBGDelete(daObjLv6EGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C829EC-80C82A0C 0009EC 0020+00 1/0 0/0 0/0 .text
- * daObjLv6EGate_MoveBGExecute__FP15daObjLv6EGate_c             */
 static int daObjLv6EGate_MoveBGExecute(daObjLv6EGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C82A0C-80C82A38 000A0C 002C+00 1/0 0/0 0/0 .text
- * daObjLv6EGate_MoveBGDraw__FP15daObjLv6EGate_c                */
 static int daObjLv6EGate_MoveBGDraw(daObjLv6EGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C82BF8-80C82C18 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv6EGate_METHODS */
 static actor_method_class daObjLv6EGate_METHODS = {
     (process_method_func)daObjLv6EGate_create1st,
     (process_method_func)daObjLv6EGate_MoveBGDelete,
@@ -231,7 +210,6 @@ static actor_method_class daObjLv6EGate_METHODS = {
     (process_method_func)daObjLv6EGate_MoveBGDraw,
 };
 
-/* 80C82C18-80C82C48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6EGate */
 extern actor_process_profile_definition g_profile_Obj_Lv6EGate = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp
index 28326c1a7f..1810a8e865 100644
--- a/src/d/actor/d_a_obj_lv6elevta.cpp
+++ b/src/d/actor/d_a_obj_lv6elevta.cpp
@@ -12,7 +12,6 @@
 //
 // Declarations:
 //
-/* 80C83854-80C83858 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Lv6ElevtA";
 static const int l_dzbidx = {7};
 static const int l_bmdidx = {4};
@@ -31,7 +30,6 @@ void daObjLv6ElevtA_HIO_c::genMessage(JORMContext* context) {
 static daObjLv6ElevtA_HIO_c l_HIO;
 #endif
 
-/* 80C82D38-80C82DC8 000078 0090+00 1/1 0/0 0/0 .text            create1st__16daObjLv6ElevtA_cFv */
 int daObjLv6ElevtA_c::create1st() {
     int phase = dComIfG_resLoad(this, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -47,7 +45,6 @@ int daObjLv6ElevtA_c::create1st() {
     return phase;
 }
 
-/* 80C82DC8-80C82E38 000108 0070+00 2/2 0/0 0/0 .text            setMtx__16daObjLv6ElevtA_cFv */
 void daObjLv6ElevtA_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -55,7 +52,6 @@ void daObjLv6ElevtA_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx1);
 }
 
-/* 80C82E38-80C82EA8 000178 0070+00 1/0 0/0 0/0 .text            CreateHeap__16daObjLv6ElevtA_cFv */
 int daObjLv6ElevtA_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx);
     JUT_ASSERT(145, model_data != NULL);
@@ -66,14 +62,11 @@ int daObjLv6ElevtA_c::CreateHeap() {
     return TRUE;
 }
 
-/* ############################################################################################## */
-/* 80C83810-80C83828 000000 0018+00 2/2 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     -393.13f, -3000.0f, -750.0f,
     393.13f, 150.0f, 393.13f
 };
 
-/* 80C82EA8-80C82FA4 0001E8 00FC+00 1/0 0/0 0/0 .text            Create__16daObjLv6ElevtA_cFv */
 int daObjLv6ElevtA_c::Create() {
     mModel->setBaseTRMtx(mMtx2);
     fopAcM_SetMtx(this, mMtx2);
@@ -93,7 +86,6 @@ int daObjLv6ElevtA_c::Create() {
     return TRUE;
 }
 
-/* 80C82FA4-80C83028 0002E4 0084+00 1/1 0/0 0/0 .text            searchObjLv6SwTurn__FPvPv */
 static void* searchObjLv6SwTurn(void* i_turn, void* i_elevta) {
     if (i_turn != NULL && fopAcM_IsActor(i_turn) &&
         fopAcM_GetProfName(i_turn) == PROC_Obj_Lv6SwTurn)
@@ -109,7 +101,6 @@ static void* searchObjLv6SwTurn(void* i_turn, void* i_elevta) {
     return NULL;
 }
 
-/* 80C83028-80C830BC 000368 0094+00 2/1 0/0 0/0 .text            eventStart__16daObjLv6ElevtA_cFv */
 bool daObjLv6ElevtA_c::eventStart() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         mMode = 2;
@@ -121,7 +112,6 @@ bool daObjLv6ElevtA_c::eventStart() {
     return true;
 }
 
-/* 80C830BC-80C8321C 0003FC 0160+00 1/1 0/0 0/0 .text            moveAngle__16daObjLv6ElevtA_cFPv */
 void daObjLv6ElevtA_c::moveAngle(void* i_FoundActor) {
     fopAc_ac_c* found = (fopAc_ac_c*)i_FoundActor;
     if (mAngle > 0) {
@@ -143,7 +133,6 @@ void daObjLv6ElevtA_c::moveAngle(void* i_FoundActor) {
                                   -1.0f, 0);
 }
 
-/* 80C8321C-80C83538 00055C 031C+00 1/0 0/0 0/0 .text Execute__16daObjLv6ElevtA_cFPPA3_A4_f */
 int daObjLv6ElevtA_c::Execute(Mtx** i_pMtx) {
     fopAc_ac_c* found = fopAcM_Search(searchObjLv6SwTurn, this);
     if (found == NULL || getSwNo() == 0xff || getSw2No() == 0xff) {
@@ -241,7 +230,6 @@ int daObjLv6ElevtA_c::Execute(Mtx** i_pMtx) {
     return TRUE;
 }
 
-/* 80C83538-80C835DC 000878 00A4+00 1/0 0/0 0/0 .text            Draw__16daObjLv6ElevtA_cFv */
 int daObjLv6ElevtA_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -251,7 +239,6 @@ int daObjLv6ElevtA_c::Draw() {
     return TRUE;
 }
 
-/* 80C835DC-80C83618 00091C 003C+00 1/0 0/0 0/0 .text            Delete__16daObjLv6ElevtA_cFv */
 int daObjLv6ElevtA_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
 #if DEBUG
@@ -260,33 +247,23 @@ int daObjLv6ElevtA_c::Delete() {
     return TRUE;
 }
 
-/* 80C83618-80C83698 000958 0080+00 1/0 0/0 0/0 .text
- * daObjLv6ElevtA_create1st__FP16daObjLv6ElevtA_c               */
 static int daObjLv6ElevtA_create1st(daObjLv6ElevtA_c* i_this) {
     fopAcM_ct(i_this, daObjLv6ElevtA_c);
     return i_this->create1st();
 }
 
-/* 80C83698-80C836B8 0009D8 0020+00 1/0 0/0 0/0 .text
- * daObjLv6ElevtA_MoveBGDelete__FP16daObjLv6ElevtA_c            */
 static int daObjLv6ElevtA_MoveBGDelete(daObjLv6ElevtA_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C836B8-80C836D8 0009F8 0020+00 1/0 0/0 0/0 .text
- * daObjLv6ElevtA_MoveBGExecute__FP16daObjLv6ElevtA_c           */
 static int daObjLv6ElevtA_MoveBGExecute(daObjLv6ElevtA_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C836D8-80C83704 000A18 002C+00 1/0 0/0 0/0 .text
- * daObjLv6ElevtA_MoveBGDraw__FP16daObjLv6ElevtA_c              */
 static int daObjLv6ElevtA_MoveBGDraw(daObjLv6ElevtA_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80C83858-80C83878 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv6ElevtA_METHODS */
 static actor_method_class daObjLv6ElevtA_METHODS = {
     (process_method_func)daObjLv6ElevtA_create1st,
     (process_method_func)daObjLv6ElevtA_MoveBGDelete,
@@ -295,7 +272,6 @@ static actor_method_class daObjLv6ElevtA_METHODS = {
     (process_method_func)daObjLv6ElevtA_MoveBGDraw,
 };
 
-/* 80C83878-80C838A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6ElevtA */
 extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA = {
     fpcLy_CURRENT_e,           // mLayerID
     2,                         // mListID
diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp
index 89b608e14e..af4fe5615a 100644
--- a/src/d/actor/d_a_obj_lv6swturn.cpp
+++ b/src/d/actor/d_a_obj_lv6swturn.cpp
@@ -28,8 +28,6 @@ void daObjLv6SwTurn_HIO_c::genMessage(JORMContext* context) {
 }
 #endif
 
-/* 80C83998-80C83A98 000078 0100+00 1/1 0/0 0/0 .text
- * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_2,
                               dBgW_Base::PushPullLabel pushPull) {
     (void)param_2;  // needed to match debug
@@ -59,17 +57,13 @@ static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_
     return actor1;
 }
 
-/* 80C846F0-80C846F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_l6tsw";
 
-/* 80C83A98-80C83AD4 000178 003C+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjLv6SwTurn_cFv
- */
 void daObjLv6SwTurn_c::initBaseMtx() {
     unk5A8->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C83AD4-80C83B38 0001B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__16daObjLv6SwTurn_cFv */
 void daObjLv6SwTurn_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -77,7 +71,6 @@ void daObjLv6SwTurn_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C83B38-80C83C10 000218 00D8+00 1/0 0/0 0/0 .text            Create__16daObjLv6SwTurn_cFv */
 int daObjLv6SwTurn_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         unk5BC = 1;
@@ -96,7 +89,6 @@ int daObjLv6SwTurn_c::Create() {
 }
 
 
-/* 80C83C10-80C83C80 0002F0 0070+00 1/0 0/0 0/0 .text            CreateHeap__16daObjLv6SwTurn_cFv */
 int daObjLv6SwTurn_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(268, modelData != NULL);
@@ -111,7 +103,6 @@ int daObjLv6SwTurn_c::CreateHeap() {
 static daObjLv6SwTurn_HIO_c l_HIO;
 #endif
 
-/* 80C83C80-80C83D04 000360 0084+00 1/1 0/0 0/0 .text            create1st__16daObjLv6SwTurn_cFv */
 int daObjLv6SwTurn_c::create1st() {
     int step = dComIfG_resLoad(&unk5A0, l_arcName);
     if (step == cPhs_COMPLEATE_e) {
@@ -126,7 +117,6 @@ int daObjLv6SwTurn_c::create1st() {
     return step;
 }
 
-/* 80C83D04-80C83D94 0003E4 0090+00 1/0 0/0 0/0 .text Execute__16daObjLv6SwTurn_cFPPA3_A4_f */
 int daObjLv6SwTurn_c::Execute(Mtx** i_pMtx) {
     unk5C0++;
     mode_proc_call();
@@ -138,7 +128,6 @@ int daObjLv6SwTurn_c::Execute(Mtx** i_pMtx) {
     return TRUE;
 }
 
-/* 80C83D94-80C83E20 000474 008C+00 1/1 0/0 0/0 .text mode_proc_call__16daObjLv6SwTurn_cFv */
 enum daObjLv6SwTurn_c_mode{
     DAOBJLV6SWTURN_C_MODE_WAIT,
     DAOBJLV6SWTURN_C_MODE_ROTATE,
@@ -162,8 +151,6 @@ void daObjLv6SwTurn_c::mode_proc_call() {
 #endif
 }
 
-/* 80C83E20-80C83E58 000500 0038+00 2/2 0/0 0/0 .text            init_modeWait__16daObjLv6SwTurn_cFv
- */
 void daObjLv6SwTurn_c::init_modeWait() {
     unk5B2 = 0;
     unk5B8 = -1;
@@ -173,7 +160,6 @@ void daObjLv6SwTurn_c::init_modeWait() {
     mMode = DAOBJLV6SWTURN_C_MODE_WAIT;
 }
 
-/* 80C83E58-80C84238 000538 03E0+00 1/0 0/0 0/0 .text            modeWait__16daObjLv6SwTurn_cFv */
 void daObjLv6SwTurn_c::modeWait() {
     bool a = true;
     int b = -1;
@@ -266,7 +252,6 @@ void daObjLv6SwTurn_c::modeWait() {
     unk5CA = current.angle.y;
 }
 
-/* 80C84238-80C8425C 000918 0024+00 1/1 0/0 0/0 .text init_modeRotate__16daObjLv6SwTurn_cFv */
 void daObjLv6SwTurn_c::init_modeRotate() {
     unk5B4 = 0;
     unk5BD = 0;
@@ -275,7 +260,6 @@ void daObjLv6SwTurn_c::init_modeRotate() {
     mMode = DAOBJLV6SWTURN_C_MODE_ROTATE;
 }
 
-/* 80C8425C-80C844F8 00093C 029C+00 1/0 0/0 0/0 .text            modeRotate__16daObjLv6SwTurn_cFv */
 void daObjLv6SwTurn_c::modeRotate() {
     unk5B0++;
 #if DEBUG
@@ -320,7 +304,6 @@ void daObjLv6SwTurn_c::modeRotate() {
     }
 }
 
-/* 80C844F8-80C8459C 000BD8 00A4+00 1/0 0/0 0/0 .text            Draw__16daObjLv6SwTurn_cFv */
 int daObjLv6SwTurn_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(unk5A8, &tevStr);
@@ -335,7 +318,6 @@ int daObjLv6SwTurn_c::Draw() {
     return TRUE;
 }
 
-/* 80C8459C-80C845D0 000C7C 0034+00 1/0 0/0 0/0 .text            Delete__16daObjLv6SwTurn_cFv */
 int daObjLv6SwTurn_c::Delete() {
     dComIfG_resDelete(&unk5A0, l_arcName);
 #if DEBUG
@@ -344,33 +326,23 @@ int daObjLv6SwTurn_c::Delete() {
     return TRUE;
 }
 
-/* 80C845D0-80C84630 000CB0 0060+00 1/0 0/0 0/0 .text
- * daObjLv6SwTurn_create1st__FP16daObjLv6SwTurn_c               */
 static int daObjLv6SwTurn_create1st(daObjLv6SwTurn_c* i_this) {
     fopAcM_ct(i_this, daObjLv6SwTurn_c);
     return i_this->create1st();
 }
 
-/* 80C84630-80C84650 000D10 0020+00 1/0 0/0 0/0 .text
- * daObjLv6SwTurn_MoveBGDelete__FP16daObjLv6SwTurn_c            */
 static int daObjLv6SwTurn_MoveBGDelete(daObjLv6SwTurn_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C84650-80C84670 000D30 0020+00 1/0 0/0 0/0 .text
- * daObjLv6SwTurn_MoveBGExecute__FP16daObjLv6SwTurn_c           */
 static int daObjLv6SwTurn_MoveBGExecute(daObjLv6SwTurn_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C84670-80C8469C 000D50 002C+00 1/0 0/0 0/0 .text
- * daObjLv6SwTurn_MoveBGDraw__FP16daObjLv6SwTurn_c              */
 static int daObjLv6SwTurn_MoveBGDraw(daObjLv6SwTurn_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80C84724-80C84744 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv6SwTurn_METHODS */
 static actor_method_class daObjLv6SwTurn_METHODS = {
     (process_method_func)daObjLv6SwTurn_create1st,
     (process_method_func)daObjLv6SwTurn_MoveBGDelete,
@@ -379,7 +351,6 @@ static actor_method_class daObjLv6SwTurn_METHODS = {
     (process_method_func)daObjLv6SwTurn_MoveBGDraw,
 };
 
-/* 80C84744-80C84774 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv6SwTurn */
 extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = {
     fpcLy_CURRENT_e,           // mLayerID
     3,                         // mListID
diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp
index 221d0f7038..d7bb8c2815 100644
--- a/src/d/actor/d_a_obj_lv7BsGate.cpp
+++ b/src/d/actor/d_a_obj_lv7BsGate.cpp
@@ -9,8 +9,8 @@
 
 class daLv7BsGate_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C848AC */ daLv7BsGate_HIO_c();
-    /* 80C85164 */ virtual ~daLv7BsGate_HIO_c() {}
+    daLv7BsGate_HIO_c();
+    virtual ~daLv7BsGate_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -19,29 +19,23 @@ public:
     /* 0x0C */ u8 vibration;
 };
 
-/* 80C8536C-80C8537C 000014 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daLv7BsGate_HIO_c l_HIO;
 
-/* 80C85264-80C8526C -00001 0008+00 3/3 0/0 0/0 .data            l_type */
 static char* l_type[2] = {
     "L7Gate",
     "L7GateL",
 };
 
-/* 80C8526C-80C85274 000028 0008+00 1/1 0/0 0/0 .data            l_bmdIdx */
 static int l_bmdIdx[] = {4, 4};
 
-/* 80C85274-80C8527C 000030 0008+00 1/1 0/0 0/0 .data            l_dzbIdx */
 static int l_dzbIdx[] = {7, 7};
 
-/* 80C848AC-80C848E8 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__17daLv7BsGate_HIO_cFv */
 daLv7BsGate_HIO_c::daLv7BsGate_HIO_c() {
     open_speed = 2.0f;
     close_speed = 12.0f;
     vibration = 3;
 }
 
-/* 80C84930-80C849CC 000170 009C+00 2/2 0/0 0/0 .text            setBaseMtx__13daLv7BsGate_cFv */
 void daLv7BsGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -50,7 +44,6 @@ void daLv7BsGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C849CC-80C84A4C 00020C 0080+00 1/0 0/0 0/0 .text            CreateHeap__13daLv7BsGate_cFv */
 int daLv7BsGate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_type[mType], l_bmdIdx[mType]);
     JUT_ASSERT(191, modelData != NULL);
@@ -63,7 +56,6 @@ int daLv7BsGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80C84A4C-80C84BCC 00028C 0180+00 1/1 0/0 0/0 .text            create__13daLv7BsGate_cFv */
 int daLv7BsGate_c::create() {
     fopAcM_ct(this, daLv7BsGate_c);
 
@@ -103,8 +95,6 @@ int daLv7BsGate_c::create() {
     return phase_state;
 }
 
-/* 80C84BCC-80C84C1C 00040C 0050+00 1/0 0/0 0/0 .text            Execute__13daLv7BsGate_cFPPA3_A4_f
- */
 int daLv7BsGate_c::Execute(Mtx** param_0) {
     moveGate();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -112,7 +102,6 @@ int daLv7BsGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C84C1C-80C84D24 00045C 0108+00 1/1 0/0 0/0 .text            moveGate__13daLv7BsGate_cFv */
 void daLv7BsGate_c::moveGate() {
     static void (daLv7BsGate_c::*mode_proc[])() = {
         &daLv7BsGate_c::modeWait,
@@ -133,20 +122,16 @@ void daLv7BsGate_c::moveGate() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C84D24-80C84D30 000564 000C+00 3/3 0/0 0/0 .text            init_modeWait__13daLv7BsGate_cFv */
 void daLv7BsGate_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C84D30-80C84D34 000570 0004+00 1/0 0/0 0/0 .text            modeWait__13daLv7BsGate_cFv */
 void daLv7BsGate_c::modeWait() {}
 
-/* 80C84D34-80C84D40 000574 000C+00 1/1 0/0 0/0 .text            init_modeOpen__13daLv7BsGate_cFv */
 void daLv7BsGate_c::init_modeOpen() {
     mMode = 1;
 }
 
-/* 80C84D40-80C84E94 000580 0154+00 1/0 0/0 0/0 .text            modeOpen__13daLv7BsGate_cFv */
 void daLv7BsGate_c::modeOpen() {
     if (mLR == 0) {
         mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_OP, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -162,13 +147,10 @@ void daLv7BsGate_c::modeOpen() {
     }
 }
 
-/* 80C84E94-80C84EA0 0006D4 000C+00 1/1 0/0 0/0 .text            init_modeClose__13daLv7BsGate_cFv
- */
 void daLv7BsGate_c::init_modeClose() {
     mMode = 2;
 }
 
-/* 80C84EA0-80C84FF4 0006E0 0154+00 1/0 0/0 0/0 .text            modeClose__13daLv7BsGate_cFv */
 void daLv7BsGate_c::modeClose() {
     if (mLR == 0) {
         mDoAud_seStartLevel(Z2SE_OBJ_SW_W_DR_CL, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -184,7 +166,6 @@ void daLv7BsGate_c::modeClose() {
     }
 }
 
-/* 80C84FF4-80C85098 000834 00A4+00 1/0 0/0 0/0 .text            Draw__13daLv7BsGate_cFv */
 int daLv7BsGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -194,7 +175,6 @@ int daLv7BsGate_c::Draw() {
     return 1;
 }
 
-/* 80C85098-80C850D8 0008D8 0040+00 1/0 0/0 0/0 .text            Delete__13daLv7BsGate_cFv */
 int daLv7BsGate_c::Delete() {
     dComIfG_resDelete(&mPhase, l_type[mType]);
     #if DEBUG
@@ -203,29 +183,22 @@ int daLv7BsGate_c::Delete() {
     return 1;
 }
 
-/* 80C850D8-80C85104 000918 002C+00 1/0 0/0 0/0 .text            daLv7BsGate_Draw__FP13daLv7BsGate_c
- */
 static int daLv7BsGate_Draw(daLv7BsGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C85104-80C85124 000944 0020+00 1/0 0/0 0/0 .text daLv7BsGate_Execute__FP13daLv7BsGate_c */
 static int daLv7BsGate_Execute(daLv7BsGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C85124-80C85144 000964 0020+00 1/0 0/0 0/0 .text daLv7BsGate_Delete__FP13daLv7BsGate_c */
 static int daLv7BsGate_Delete(daLv7BsGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C85144-80C85164 000984 0020+00 1/0 0/0 0/0 .text            daLv7BsGate_Create__FP10fopAc_ac_c
- */
 static int daLv7BsGate_Create(fopAc_ac_c* i_this) {
     return ((daLv7BsGate_c*)i_this)->create();
 }
 
-/* 80C852C4-80C852E4 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv7BsGate_Method */
 static actor_method_class l_daLv7BsGate_Method = {
     (process_method_func)daLv7BsGate_Create,
     (process_method_func)daLv7BsGate_Delete,
@@ -234,7 +207,6 @@ static actor_method_class l_daLv7BsGate_Method = {
     (process_method_func)daLv7BsGate_Draw,
 };
 
-/* 80C852E4-80C85314 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv7BsGate */
 extern actor_process_profile_definition g_profile_Obj_Lv7BsGate = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp
index 1cc854cffa..9593ac84a1 100644
--- a/src/d/actor/d_a_obj_lv7PropellerY.cpp
+++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp
@@ -9,8 +9,8 @@
 
 class daPropY_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8546C */ daPropY_HIO_c();
-    /* 80C86084 */ virtual ~daPropY_HIO_c() {}
+    daPropY_HIO_c();
+    virtual ~daPropY_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -23,19 +23,15 @@ public:
     /* 0x1C */ f32 y_offset;
 };
 
-/* 80C86194-80C8619C -00001 0008+00 3/3 0/0 0/0 .data            l_type */
 static char* l_type[2] = {
     "stickwl00",
     "stickwl01",
 };
 
-/* 80C8619C-80C861A4 000028 0008+00 1/1 0/0 0/0 .data            l_bmdIdx */
 static int l_bmdIdx[] = {4, 4};
 
-/* 80C861A4-80C861AC 000030 0008+00 1/1 0/0 0/0 .data            l_dzbIdx */
 static int l_dzbIdx[] = {7, 7};
 
-/* 80C8546C-80C854C4 0000EC 0058+00 1/1 0/0 0/0 .text            __ct__13daPropY_HIO_cFv */
 daPropY_HIO_c::daPropY_HIO_c() {
     rot_speed = 0.0f;
     rot_accel = 0.1f;
@@ -46,10 +42,8 @@ daPropY_HIO_c::daPropY_HIO_c() {
     y_offset = 0.0f;
 }
 
-/* 80C862CC-80C862EC 000014 0020+00 7/7 0/0 0/0 .bss             l_HIO */
 static daPropY_HIO_c l_HIO;
 
-/* 80C8550C-80C855A4 00018C 0098+00 2/2 0/0 0/0 .text            setBaseMtx__9daPropY_cFv */
 void daPropY_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + l_HIO.y_offset, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -57,7 +51,6 @@ void daPropY_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C855A4-80C85624 000224 0080+00 1/0 0/0 0/0 .text            CreateHeap__9daPropY_cFv */
 int daPropY_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_type[mType], l_bmdIdx[mType]);
     JUT_ASSERT(184, modelData != NULL);
@@ -70,7 +63,6 @@ int daPropY_c::CreateHeap() {
     return 1;
 }
 
-/* 80C85624-80C85810 0002A4 01EC+00 1/1 0/0 0/0 .text            create__9daPropY_cFv */
 int daPropY_c::create() {
     fopAcM_ct(this, daPropY_c);
 
@@ -128,7 +120,6 @@ int daPropY_c::create() {
     return phase_state;
 }
 
-/* 80C85810-80C85860 000490 0050+00 1/0 0/0 0/0 .text            Execute__9daPropY_cFPPA3_A4_f */
 int daPropY_c::Execute(Mtx** param_0) {
     procMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -136,7 +127,6 @@ int daPropY_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C85860-80C859B4 0004E0 0154+00 1/1 0/0 0/0 .text            procMain__9daPropY_cFv */
 void daPropY_c::procMain() {
     static void (daPropY_c::*mode_proc[])() = {
         &daPropY_c::modeMoveWait,
@@ -165,22 +155,18 @@ void daPropY_c::procMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C859B4-80C859C0 000634 000C+00 2/2 0/0 0/0 .text            init_modeMoveWait__9daPropY_cFv */
 void daPropY_c::init_modeMoveWait() {
     mMode = 0;
 }
 
-/* 80C859C0-80C859C4 000640 0004+00 1/0 0/0 0/0 .text            modeMoveWait__9daPropY_cFv */
 void daPropY_c::modeMoveWait() {}
 
-/* 80C859C4-80C859E0 000644 001C+00 2/2 0/0 0/0 .text            init_modeMove__9daPropY_cFv */
 void daPropY_c::init_modeMove() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x5c4 = 0.0f;
     mMode = 1;
 }
 
-/* 80C859E0-80C85B08 000660 0128+00 1/0 0/0 0/0 .text            modeMove__9daPropY_cFv */
 void daPropY_c::modeMove() {
     cLib_chaseF(&speedF, 360.0f / (30.0f * l_HIO.rot_time_sec), l_HIO.field_0xc);
     field_0x5b4 = cM_deg2s(speedF);
@@ -192,13 +178,11 @@ void daPropY_c::modeMove() {
     }
 }
 
-/* 80C85B08-80C85B24 000788 001C+00 2/2 0/0 0/0 .text            init_modeWait__9daPropY_cFv */
 void daPropY_c::init_modeWait() {
     mTimer = l_HIO.wait_time;
     mMode = 2;
 }
 
-/* 80C85B24-80C85B5C 0007A4 0038+00 1/0 0/0 0/0 .text            modeWait__9daPropY_cFv */
 void daPropY_c::modeWait() {
     if (mTimer == 0) {
         init_modeMove2();
@@ -207,14 +191,12 @@ void daPropY_c::modeWait() {
     }
 }
 
-/* 80C85B5C-80C85B84 0007DC 0028+00 2/2 0/0 0/0 .text            init_modeMove2__9daPropY_cFv */
 void daPropY_c::init_modeMove2() {
     fopAcM_SetSpeedF(this, l_HIO.rot_speed);
     field_0x5c4 = 0.0f;
     mMode = 3;
 }
 
-/* 80C85B84-80C85CAC 000804 0128+00 1/0 0/0 0/0 .text            modeMove2__9daPropY_cFv */
 void daPropY_c::modeMove2() {
     cLib_chaseF(&speedF, l_HIO.max_rot_speed, l_HIO.rot_accel);
     s16 temp_r30 = cLib_addCalcAngleS(&shape_angle.y, field_0x5b6, 1, (182.04445f * fopAcM_GetSpeedF(this)), 1);
@@ -231,7 +213,6 @@ void daPropY_c::modeMove2() {
     }
 }
 
-/* 80C85CAC-80C85DD0 00092C 0124+00 1/1 0/0 0/0 .text            init_modeStop__9daPropY_cFv */
 void daPropY_c::init_modeStop() {
     if (mTurnType == 0) {
         fopAcM_SetSpeedF(this, cM_deg2s(360.0f / (30.0f * l_HIO.rot_time_sec)));
@@ -254,7 +235,6 @@ void daPropY_c::init_modeStop() {
     mMode = 4;
 }
 
-/* 80C85DD0-80C85F14 000A50 0144+00 1/0 0/0 0/0 .text            modeStop__9daPropY_cFv */
 void daPropY_c::modeStop() {
     s16 var_r30;
     if (mTurnType == 0) {
@@ -276,7 +256,6 @@ void daPropY_c::modeStop() {
     }
 }
 
-/* 80C85F14-80C85FB8 000B94 00A4+00 1/0 0/0 0/0 .text            Draw__9daPropY_cFv */
 int daPropY_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -286,7 +265,6 @@ int daPropY_c::Draw() {
     return 1;
 }
 
-/* 80C85FB8-80C85FF8 000C38 0040+00 1/0 0/0 0/0 .text            Delete__9daPropY_cFv */
 int daPropY_c::Delete() {
     dComIfG_resDelete(&mPhase, l_type[mType]);
     #if DEBUG
@@ -295,27 +273,22 @@ int daPropY_c::Delete() {
     return 1;
 }
 
-/* 80C85FF8-80C86024 000C78 002C+00 1/0 0/0 0/0 .text            daPropY_Draw__FP9daPropY_c */
 static int daPropY_Draw(daPropY_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C86024-80C86044 000CA4 0020+00 1/0 0/0 0/0 .text            daPropY_Execute__FP9daPropY_c */
 static int daPropY_Execute(daPropY_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C86044-80C86064 000CC4 0020+00 1/0 0/0 0/0 .text            daPropY_Delete__FP9daPropY_c */
 static int daPropY_Delete(daPropY_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C86064-80C86084 000CE4 0020+00 1/0 0/0 0/0 .text            daPropY_Create__FP10fopAc_ac_c */
 static int daPropY_Create(fopAc_ac_c* i_this) {
     return ((daPropY_c*)i_this)->create();
 }
 
-/* 80C86224-80C86244 -00001 0020+00 1/0 0/0 0/0 .data            l_daPropY_Method */
 static actor_method_class l_daPropY_Method = {
     (process_method_func)daPropY_Create,
     (process_method_func)daPropY_Delete,
@@ -324,7 +297,6 @@ static actor_method_class l_daPropY_Method = {
     (process_method_func)daPropY_Draw,
 };
 
-/* 80C86244-80C86274 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv7PropY */
 extern actor_process_profile_definition g_profile_Obj_Lv7PropY = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp
index 260ba1825d..73fc13ca86 100644
--- a/src/d/actor/d_a_obj_lv7bridge.cpp
+++ b/src/d/actor/d_a_obj_lv7bridge.cpp
@@ -32,7 +32,6 @@ void daObjLv7Brg_HIO_c::genMessage(JORMContext* ctx) {
 static daObjLv7Brg_HIO_c l_HIO;
 #endif
 
-/* 80C86378-80C863EC 000078 0074+00 1/1 0/0 0/0 .text            searchSwSpinner__FPvPv */
 static void* searchSwSpinner(void* i_actor, void* i_data) {
     fopAc_ac_c* swspinner = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* brg = (fopAc_ac_c*)i_data;
@@ -46,8 +45,6 @@ static void* searchSwSpinner(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80C863EC-80C86454 0000EC 0068+00 1/1 0/0 0/0 .text            search_swspinner__13daObjLv7Brg_cFv
- */
 daObjSwSpinner_c* daObjLv7Brg_c::search_swspinner() {
     daObjSwSpinner_c* swspinner = NULL;
     if (parentActorID == fpcM_ERROR_PROCESS_ID_e) {
@@ -60,7 +57,6 @@ daObjSwSpinner_c* daObjLv7Brg_c::search_swspinner() {
     return swspinner;
 }
 
-/* 80C86454-80C864B4 000154 0060+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjLv7Brg_cFv */
 void daObjLv7Brg_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
 
@@ -71,13 +67,10 @@ void daObjLv7Brg_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C879A0-80C879A8 000000 0008+00 4/4 0/0 0/0 .rodata          l_bmd */
 static const int l_bmd[] = {4, 10};
 
-/* 80C879A8-80C879B0 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static const int l_dzb[] = {7, 13};
 
-/* 80C879B0-80C879C4 000010 0012+02 0/1 0/0 0/0 .rodata          l_eff_id */
 static const u16 l_eff_id[] = {
     dPa_RM(ID_ZI_S_LV7BRDG_BREAK_A),
     dPa_RM(ID_ZI_S_LV7BRDG_BREAK_B),
@@ -90,10 +83,8 @@ static const u16 l_eff_id[] = {
     dPa_RM(ID_ZI_S_LV7BRDG_BREAK_I),
 };
 
-/* 80C879C4-80C879CC 000024 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0x6000, 0x20000};
 
-/* 80C864B4-80C865B8 0001B4 0104+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjLv7Brg_cFv */
 void daObjLv7Brg_c::setBaseMtx() {
     cXyz sp8(field_0xa78, 0.0f, 0.0f);
     if (mKind == 1) {
@@ -116,13 +107,11 @@ void daObjLv7Brg_c::setBaseMtx() {
     }
 }
 
-/* 80C87A54-80C87A5C -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "Obj_l7brg",
     "K_bridge",
 };
 
-/* 80C87A5C-80C87AA0 000028 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x0, 0xd}, {0x0, 0x0}, 0x19}}, // mObj
@@ -137,7 +126,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80C865B8-80C867CC 0002B8 0214+00 1/0 0/0 0/0 .text            Create__13daObjLv7Brg_cFv */
 int daObjLv7Brg_c::Create() {
     field_0xa94 = -1;
     field_0xa95 = field_0xa94;
@@ -184,7 +172,6 @@ int daObjLv7Brg_c::Create() {
     return 1;
 }
 
-/* 80C867CC-80C869FC 0004CC 0230+00 1/0 0/0 0/0 .text            CreateHeap__13daObjLv7Brg_cFv */
 int daObjLv7Brg_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmd[mKind]);
     JUT_ASSERT(374, modelData != NULL);
@@ -225,7 +212,6 @@ int daObjLv7Brg_c::CreateHeap() {
     return 1;
 }
 
-/* 80C86A44-80C86B40 000744 00FC+00 1/1 0/0 0/0 .text            create1st__13daObjLv7Brg_cFv */
 int daObjLv7Brg_c::create1st() {
     if (!mInitParams) {
         mInitParams = TRUE;
@@ -253,8 +239,6 @@ int daObjLv7Brg_c::create1st() {
     return phase_state;
 }
 
-/* 80C86B40-80C86E68 000840 0328+00 1/0 0/0 0/0 .text            Execute__13daObjLv7Brg_cFPPA3_A4_f
- */
 int daObjLv7Brg_c::Execute(Mtx** param_0) {
     search_swspinner();
     action();
@@ -326,7 +310,6 @@ int daObjLv7Brg_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C86E68-80C86F44 000B68 00DC+00 1/1 0/0 0/0 .text            action__13daObjLv7Brg_cFv */
 void daObjLv7Brg_c::action() {
     static void (daObjLv7Brg_c::*mode_proc[])() = {
         &daObjLv7Brg_c::mode_action,
@@ -341,7 +324,6 @@ void daObjLv7Brg_c::action() {
     }
 }
 
-/* 80C86F44-80C87210 000C44 02CC+00 1/0 0/0 0/0 .text            mode_action__13daObjLv7Brg_cFv */
 // NONMATCHING - small regalloc
 void daObjLv7Brg_c::mode_action() {
     f32 var_f31;
@@ -408,10 +390,8 @@ void daObjLv7Brg_c::mode_action() {
     }
 }
 
-/* 80C87210-80C87214 000F10 0004+00 1/0 0/0 0/0 .text            mode_end__13daObjLv7Brg_cFv */
 void daObjLv7Brg_c::mode_end() {}
 
-/* 80C87214-80C87304 000F14 00F0+00 1/1 0/0 0/0 .text            calcCoPos__13daObjLv7Brg_cFv */
 void daObjLv7Brg_c::calcCoPos() {
     cXyz sp8[2];
     sp8[0].set(2700.0f, -80.0f, 450.0f);
@@ -433,7 +413,6 @@ void daObjLv7Brg_c::calcCoPos() {
     mCcCyl[1].SetC(sp8[1]);
 }
 
-/* 80C87304-80C87458 001004 0154+00 1/0 0/0 0/0 .text            Draw__13daObjLv7Brg_cFv */
 int daObjLv7Brg_c::Draw() {
     if (0.0f == field_0xa78) {
         return 1;
@@ -459,7 +438,6 @@ int daObjLv7Brg_c::Draw() {
     return 1;
 }
 
-/* 80C87458-80C874CC 001158 0074+00 1/0 0/0 0/0 .text            Delete__13daObjLv7Brg_cFv */
 int daObjLv7Brg_c::Delete() {
     if (mpBgw2 != NULL && mpBgw2->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgw2);
@@ -469,30 +447,23 @@ int daObjLv7Brg_c::Delete() {
     return 1;
 }
 
-/* 80C874CC-80C875B8 0011CC 00EC+00 1/0 0/0 0/0 .text daObjLv7Brg_create1st__FP13daObjLv7Brg_c */
 static int daObjLv7Brg_create1st(daObjLv7Brg_c* i_this) {
     fopAcM_ct(i_this, daObjLv7Brg_c);
     return i_this->create1st();
 }
 
-/* 80C878D4-80C878F4 0015D4 0020+00 1/0 0/0 0/0 .text daObjLv7Brg_MoveBGDelete__FP13daObjLv7Brg_c
- */
 static int daObjLv7Brg_MoveBGDelete(daObjLv7Brg_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C878F4-80C87914 0015F4 0020+00 1/0 0/0 0/0 .text daObjLv7Brg_MoveBGExecute__FP13daObjLv7Brg_c
- */
 static int daObjLv7Brg_MoveBGExecute(daObjLv7Brg_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C87914-80C87940 001614 002C+00 1/0 0/0 0/0 .text daObjLv7Brg_MoveBGDraw__FP13daObjLv7Brg_c */
 static int daObjLv7Brg_MoveBGDraw(daObjLv7Brg_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C87AD0-80C87AF0 -00001 0020+00 1/0 0/0 0/0 .data            daObjLv7Brg_METHODS */
 static actor_method_class daObjLv7Brg_METHODS = {
     (process_method_func)daObjLv7Brg_create1st,
     (process_method_func)daObjLv7Brg_MoveBGDelete,
@@ -501,7 +472,6 @@ static actor_method_class daObjLv7Brg_METHODS = {
     (process_method_func)daObjLv7Brg_MoveBGDraw,
 };
 
-/* 80C87AF0-80C87B20 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv7Bridge */
 extern actor_process_profile_definition g_profile_Obj_Lv7Bridge = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp
index ff8e26847f..a980d06f7d 100644
--- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp
+++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp
@@ -9,8 +9,8 @@
 
 class daKekaiTrap_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C87CAC */ daKekaiTrap_HIO_c();
-    /* 80C88438 */ virtual ~daKekaiTrap_HIO_c() {}
+    daKekaiTrap_HIO_c();
+    virtual ~daKekaiTrap_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -22,19 +22,14 @@ public:
     /* 0x18 */ u8 disappear_wait;
 };
 
-/* 80C8861C-80C88638 000014 001C+00 5/5 0/0 0/0 .bss             l_HIO */
 static daKekaiTrap_HIO_c l_HIO;
 
-/* 80C88524-80C88528 -00001 0004+00 3/3 0/0 0/0 .data            l_type */
 static char* l_type[] = {"Lv8Kekkai"};
 
-/* 80C88528-80C8852C 000024 0004+00 1/1 0/0 0/0 .data            l_bmdIdx */
 static int l_bmdIdx[] = {4};
 
-/* 80C8852C-80C88530 000028 0004+00 1/1 0/0 0/0 .data            l_dzbIdx */
 static int l_dzbIdx[] = {7};
 
-/* 80C87CAC-80C87CF8 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__17daKekaiTrap_HIO_cFv */
 daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() {
     appear_init_speed = 0.0f;
     appear_max_speed = 0.7f;
@@ -44,7 +39,6 @@ daKekaiTrap_HIO_c::daKekaiTrap_HIO_c() {
     disappear_wait = 30;
 }
 
-/* 80C87D40-80C87DC8 000180 0088+00 2/2 0/0 0/0 .text            setBaseMtx__13daKekaiTrap_cFv */
 void daKekaiTrap_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -52,7 +46,6 @@ void daKekaiTrap_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C87DC8-80C87E48 000208 0080+00 1/0 0/0 0/0 .text            CreateHeap__13daKekaiTrap_cFv */
 int daKekaiTrap_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_type[mType], l_bmdIdx[mType]);
     JUT_ASSERT(170, modelData != NULL);
@@ -65,7 +58,6 @@ int daKekaiTrap_c::CreateHeap() {
     return 1;
 }
 
-/* 80C87E48-80C87FB0 000288 0168+00 1/1 0/0 0/0 .text            create__13daKekaiTrap_cFv */
 int daKekaiTrap_c::create() {
     fopAcM_ct(this, daKekaiTrap_c);
 
@@ -100,8 +92,6 @@ int daKekaiTrap_c::create() {
     return phase_state;
 }
 
-/* 80C87FB0-80C88000 0003F0 0050+00 1/0 0/0 0/0 .text            Execute__13daKekaiTrap_cFPPA3_A4_f
- */
 int daKekaiTrap_c::Execute(Mtx** param_0) {
     moveMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -109,7 +99,6 @@ int daKekaiTrap_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C88000-80C88104 000440 0104+00 1/1 0/0 0/0 .text            moveMain__13daKekaiTrap_cFv */
 void daKekaiTrap_c::moveMain() {
     static void (daKekaiTrap_c::*mode_proc[])() = {
         &daKekaiTrap_c::modeWait,
@@ -130,23 +119,18 @@ void daKekaiTrap_c::moveMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C88104-80C88110 000544 000C+00 3/3 0/0 0/0 .text            init_modeWait__13daKekaiTrap_cFv */
 void daKekaiTrap_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C88110-80C88114 000550 0004+00 1/0 0/0 0/0 .text            modeWait__13daKekaiTrap_cFv */
 void daKekaiTrap_c::modeWait() {}
 
-/* 80C88114-80C88138 000554 0024+00 1/1 0/0 0/0 .text            init_modeMoveUp__13daKekaiTrap_cFv
- */
 void daKekaiTrap_c::init_modeMoveUp() {
     fopAcM_SetSpeedF(this, l_HIO.appear_init_speed);
     mTimer = l_HIO.appear_wait;
     mMode = 1;
 }
 
-/* 80C88138-80C881F0 000578 00B8+00 1/0 0/0 0/0 .text            modeMoveUp__13daKekaiTrap_cFv */
 void daKekaiTrap_c::modeMoveUp() {
     if (mTimer != 0) {
         mTimer--;
@@ -163,14 +147,12 @@ void daKekaiTrap_c::modeMoveUp() {
     }
 }
 
-/* 80C881F0-80C88214 000630 0024+00 1/1 0/0 0/0 .text init_modeMoveDown__13daKekaiTrap_cFv */
 void daKekaiTrap_c::init_modeMoveDown() {
     fopAcM_SetSpeedF(this, l_HIO.disappear_init_speed);
     mTimer = l_HIO.disappear_wait;
     mMode = 2;
 }
 
-/* 80C88214-80C882C8 000654 00B4+00 1/0 0/0 0/0 .text            modeMoveDown__13daKekaiTrap_cFv */
 void daKekaiTrap_c::modeMoveDown() {
     if (mTimer != 0) {
         mTimer--;
@@ -187,7 +169,6 @@ void daKekaiTrap_c::modeMoveDown() {
     }
 }
 
-/* 80C882C8-80C8836C 000708 00A4+00 1/0 0/0 0/0 .text            Draw__13daKekaiTrap_cFv */
 int daKekaiTrap_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -198,7 +179,6 @@ int daKekaiTrap_c::Draw() {
     return 1;
 }
 
-/* 80C8836C-80C883AC 0007AC 0040+00 1/0 0/0 0/0 .text            Delete__13daKekaiTrap_cFv */
 int daKekaiTrap_c::Delete() {
     dComIfG_resDelete(&mPhase, l_type[mType]);
     #if DEBUG
@@ -207,29 +187,22 @@ int daKekaiTrap_c::Delete() {
     return 1;
 }
 
-/* 80C883AC-80C883D8 0007EC 002C+00 1/0 0/0 0/0 .text            daKekaiTrap_Draw__FP13daKekaiTrap_c
- */
 static int daKekaiTrap_Draw(daKekaiTrap_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C883D8-80C883F8 000818 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Execute__FP13daKekaiTrap_c */
 static int daKekaiTrap_Execute(daKekaiTrap_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C883F8-80C88418 000838 0020+00 1/0 0/0 0/0 .text daKekaiTrap_Delete__FP13daKekaiTrap_c */
 static int daKekaiTrap_Delete(daKekaiTrap_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C88418-80C88438 000858 0020+00 1/0 0/0 0/0 .text            daKekaiTrap_Create__FP10fopAc_ac_c
- */
 static int daKekaiTrap_Create(fopAc_ac_c* i_this) {
     return ((daKekaiTrap_c*)i_this)->create();
 }
 
-/* 80C88578-80C88598 -00001 0020+00 1/0 0/0 0/0 .data            l_daKekaiTrap_Method */
 static actor_method_class l_daKekaiTrap_Method = {
     (process_method_func)daKekaiTrap_Create,
     (process_method_func)daKekaiTrap_Delete,
@@ -238,7 +211,6 @@ static actor_method_class l_daKekaiTrap_Method = {
     (process_method_func)daKekaiTrap_Draw,
 };
 
-/* 80C88598-80C885C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv8KekkaiTrap */
 extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp
index 6ea0f76c25..ae41f36554 100644
--- a/src/d/actor/d_a_obj_lv8Lift.cpp
+++ b/src/d/actor/d_a_obj_lv8Lift.cpp
@@ -10,7 +10,6 @@
 #include "d/d_path.h"
 #include "d/d_bg_w.h"
 
-/* 80C8872C-80C88790 0000EC 0064+00 1/1 0/0 0/0 .text            __ct__14daL8Lift_HIO_cFv */
 daL8Lift_HIO_c::daL8Lift_HIO_c() {
     mStopDisappearTime = 30;
     mStartMoveTime = 60;
@@ -27,7 +26,6 @@ daL8Lift_HIO_c::daL8Lift_HIO_c() {
     mLightRadius = 600.0f;
 }
 
-/* 80C887D8-80C88860 000198 0088+00 2/2 0/0 0/0 .text            setBaseMtx__10daL8Lift_cFv */
 void daL8Lift_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -35,14 +33,12 @@ void daL8Lift_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::now);
 }
 
-/* 80C89F64-80C89FA4 000004 0040+00 0/1 0/0 0/0 .rodata          mSpeed__10daL8Lift_c */
 f32 const daL8Lift_c::mSpeed[16] = {
     5.0f, 6.6666665f, 8.333333f, 10.0f, 11.666667f, 13.333333f,
     15.0f, 16.666666f, 18.333334f, 20.0f, 21.666666, 23.333334,
     25.0f, 26.666666f, 28.333334f, 3.3333333f
 };
 
-/* 80C88860-80C88928 000220 00C8+00 1/0 0/0 0/0 .text            CreateHeap__10daL8Lift_cFv */
 int daL8Lift_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L8Lift", 5);
     JUT_ASSERT(190, modelData != NULL);
@@ -58,10 +54,8 @@ int daL8Lift_c::CreateHeap() {
     return 1;
 }
 
-/* 80C8A1F4-80C8A208 000014 0014+00 5/5 0/0 0/0 .bss             l_HIO */
 static daL8Lift_HIO_c l_HIO;
 
-/* 80C88928-80C88C44 0002E8 031C+00 1/1 0/0 0/0 .text            create__10daL8Lift_cFv */
 int daL8Lift_c::create() {
     fopAcM_ct(this, daL8Lift_c);
 
@@ -125,7 +119,6 @@ int daL8Lift_c::create() {
     return phase_state;
 }
 
-/* 80C88D6C-80C88DBC 00072C 0050+00 2/2 0/0 0/0 .text            lightSet__10daL8Lift_cFv */
 void daL8Lift_c::lightSet() {
     mLight.mPosition = current.pos;
     mLight.mColor.r = l_HIO.mLightColorR;
@@ -135,14 +128,12 @@ void daL8Lift_c::lightSet() {
     mLight.mFluctuation = 1.0f;
 }
 
-/* 80C88DBC-80C88DD4 00077C 0018+00 1/1 0/0 0/0 .text       rideCallBack__10daL8Lift_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daL8Lift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
         ((daL8Lift_c*)i_this)->mPlayerRide = true;
     }
 }
 
-/* 80C88DD4-80C88E34 000794 0060+00 1/0 0/0 0/0 .text            Execute__10daL8Lift_cFPPA3_A4_f */
 int daL8Lift_c::Execute(f32 (**param_1)[3][4]) {
     moveLift();
     lightSet();
@@ -152,7 +143,6 @@ int daL8Lift_c::Execute(f32 (**param_1)[3][4]) {
     return 1;
 }
 
-/* 80C88E34-80C890B8 0007F4 0284+00 1/1 0/0 0/0 .text            moveLift__10daL8Lift_cFv */
 void daL8Lift_c::moveLift() {
     if (mPathID != 0xff) {
         typedef void (daL8Lift_c::*mode_func)();
@@ -207,7 +197,6 @@ void daL8Lift_c::moveLift() {
     }
 }
 
-/* 80C890B8-80C89198 000A78 00E0+00 1/0 0/0 0/0 .text            modeAcc__10daL8Lift_cFv */
 void daL8Lift_c::modeAcc() {
     int iVar1 = cLib_chaseF(&speedF, mMoveSpeed, mMoveSpeed / 30.0f);
     if (iVar1 == 1 || current.pos == mTargetPos) {
@@ -217,12 +206,10 @@ void daL8Lift_c::modeAcc() {
     mDoAud_seStartLevel(Z2SE_OBJ_L8_L_LIFT_MV, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80C89198-80C891A4 000B58 000C+00 1/1 0/0 0/0 .text            init_modeMove__10daL8Lift_cFv */
 void daL8Lift_c::init_modeMove() {
     mMode = MODE_MOVE_e;
 }
 
-/* 80C891A4-80C894BC 000B64 0318+00 1/0 0/0 0/0 .text            modeMove__10daL8Lift_cFv */
 void daL8Lift_c::modeMove() {
     cXyz sp38 = mPrevTargetPos;
     cXyz sp44 = mTargetPos;
@@ -243,12 +230,10 @@ void daL8Lift_c::modeMove() {
     mDoAud_seStartLevel(Z2SE_OBJ_L8_L_LIFT_MV, &current.pos, fopAcM_GetSpeedF(this), dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80C894BC-80C894C8 000E7C 000C+00 1/1 0/0 0/0 .text            init_modeBrk__10daL8Lift_cFv */
 void daL8Lift_c::init_modeBrk() {
     mMode = MODE_BRK_e;
 }
 
-/* 80C894C8-80C896C8 000E88 0200+00 1/0 0/0 0/0 .text            modeBrk__10daL8Lift_cFv */
 void daL8Lift_c::modeBrk() {
     cXyz sp44 = current.pos;
     f32 fVar6 = cLib_addCalcPos(&current.pos, mTargetPos, 0.1f, speedF, 0.5f);
@@ -261,40 +246,33 @@ void daL8Lift_c::modeBrk() {
     }
 }
 
-/* 80C896C8-80C896D4 001088 000C+00 3/3 0/0 0/0 .text            init_modeWaitInit__10daL8Lift_cFv */
 void daL8Lift_c::init_modeWaitInit() {
     mMode = MODE_WAIT_INIT_e;
 }
 
-/* 80C896D4-80C89708 001094 0034+00 1/0 0/0 0/0 .text            modeWaitInit__10daL8Lift_cFv */
 void daL8Lift_c::modeWaitInit() {
     setNextPoint();
     init_modeWait();
 }
 
-/* 80C89708-80C89714 0010C8 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daL8Lift_cFv */
 void daL8Lift_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80C89714-80C89720 0010D4 000C+00 1/0 0/0 0/0 .text            modeWait__10daL8Lift_cFv */
 void daL8Lift_c::modeWait() {
     mMode = MODE_ACC_e;
 }
 
-/* 80C89720-80C8972C 0010E0 000C+00 3/3 0/0 0/0 .text            init_modeMoveWait__10daL8Lift_cFv */
 void daL8Lift_c::init_modeMoveWait() {
     mMode = MODE_MOVE_WAIT_e;
 }
 
-/* 80C8972C-80C89770 0010EC 0044+00 1/0 0/0 0/0 .text            modeMoveWait__10daL8Lift_cFv */
 void daL8Lift_c::modeMoveWait() {
     if ((mSwbit != 0xff && mIsSwitch) && mPlayerRide) {
         init_modeWaitInit();
     }
 }
 
-/* 80C89770-80C89820 001130 00B0+00 3/3 0/0 0/0 .text            init_modeOnAnm__10daL8Lift_cFv */
 void daL8Lift_c::init_modeOnAnm() {
     if (mpBgW) {
         dComIfG_Bgsp().Regist(mpBgW, this);
@@ -305,7 +283,6 @@ void daL8Lift_c::init_modeOnAnm() {
     mMode = MODE_ON_ANM_e;
 }
 
-/* 80C89820-80C89874 0011E0 0054+00 1/0 0/0 0/0 .text            modeOnAnm__10daL8Lift_cFv */
 void daL8Lift_c::modeOnAnm() {
     if (mBtk.play() == 1) {
         field_0x808 = 1;
@@ -315,7 +292,6 @@ void daL8Lift_c::modeOnAnm() {
     }
 }
 
-/* 80C89874-80C898DC 001234 0068+00 1/1 0/0 0/0 .text            init_modeStop__10daL8Lift_cFv */
 void daL8Lift_c::init_modeStop() {
     if (mLightSet) {
         mLightSet = 0;
@@ -327,7 +303,6 @@ void daL8Lift_c::init_modeStop() {
     mMode = MODE_STOP_e;
 }
 
-/* 80C898DC-80C899D0 00129C 00F4+00 1/0 0/0 0/0 .text            modeStop__10daL8Lift_cFv */
 void daL8Lift_c::modeStop() {
     if (mStopDisappearTimer) {
         mStopDisappearTimer--;
@@ -348,29 +323,24 @@ void daL8Lift_c::modeStop() {
     }
 }
 
-/* 80C899D0-80C89A04 001390 0034+00 2/2 0/0 0/0 .text            init_modeInitSet__10daL8Lift_cFv */
 void daL8Lift_c::init_modeInitSet() {
     liftReset();
     mMode = MODE_INIT_SET_e;
 }
 
-/* 80C89A04-80C89A24 0013C4 0020+00 1/0 0/0 0/0 .text            modeInitSet__10daL8Lift_cFv */
 void daL8Lift_c::modeInitSet() {
     init_modeOnAnm();
 }
 
-/* 80C89A24-80C89A58 0013E4 0034+00 1/1 0/0 0/0 .text            init_modeInitSet2__10daL8Lift_cFv */
 void daL8Lift_c::init_modeInitSet2() {
     liftReset();
     mMode = MODE_INIT_SET2_e;
 }
 
-/* 80C89A58-80C89A78 001418 0020+00 1/0 0/0 0/0 .text            modeInitSet2__10daL8Lift_cFv */
 void daL8Lift_c::modeInitSet2() {
     init_modeMoveWait();
 }
 
-/* 80C89A78-80C89ADC 001438 0064+00 2/2 0/0 0/0 .text            liftReset__10daL8Lift_cFv */
 void daL8Lift_c::liftReset() {
     dPath* mPath = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
     dPnt* mPnt = mPath->m_points;
@@ -379,7 +349,6 @@ void daL8Lift_c::liftReset() {
     mCurrentPoint = 0;
 }
 
-/* 80C89ADC-80C89C10 00149C 0134+00 1/1 0/0 0/0 .text            setNextPoint__10daL8Lift_cFv */
 void daL8Lift_c::setNextPoint() {
     s16 next_point = mCurrentPoint + mPathDirection;
     dPath* pathp = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
@@ -411,7 +380,6 @@ void daL8Lift_c::setNextPoint() {
     mCurrentPoint = next_point;
 }
 
-/* 80C89C10-80C89DC8 0015D0 01B8+00 1/0 0/0 0/0 .text            Draw__10daL8Lift_cFv */
 int daL8Lift_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -443,7 +411,6 @@ int daL8Lift_c::Draw() {
     return 1;
 }
 
-/* 80C89DC8-80C89E18 001788 0050+00 1/0 0/0 0/0 .text            Delete__10daL8Lift_cFv */
 int daL8Lift_c::Delete() {
     dComIfG_resDelete(&mPhase, "L8Lift");
     if (mLightSet) {
@@ -452,28 +419,23 @@ int daL8Lift_c::Delete() {
     return 1;
 }
 
-/* 80C89E18-80C89E44 0017D8 002C+00 1/0 0/0 0/0 .text            daL8Lift_Draw__FP10daL8Lift_c */
 static int daL8Lift_Draw(daL8Lift_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C89E44-80C89E64 001804 0020+00 1/0 0/0 0/0 .text            daL8Lift_Execute__FP10daL8Lift_c */
 static int daL8Lift_Execute(daL8Lift_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C89E64-80C89E84 001824 0020+00 1/0 0/0 0/0 .text            daL8Lift_Delete__FP10daL8Lift_c */
 static int daL8Lift_Delete(daL8Lift_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C89E84-80C89EA4 001844 0020+00 1/0 0/0 0/0 .text            daL8Lift_Create__FP10fopAc_ac_c */
 static int daL8Lift_Create(fopAc_ac_c* a_this) {
     daL8Lift_c* i_this = (daL8Lift_c*)a_this;
     return i_this->create();
 }
 
-/* 80C8A114-80C8A134 -00001 0020+00 1/0 0/0 0/0 .data            l_daL8Lift_Method */
 static actor_method_class l_daL8Lift_Method = {
     (process_method_func)daL8Lift_Create,
     (process_method_func)daL8Lift_Delete,
@@ -482,7 +444,6 @@ static actor_method_class l_daL8Lift_Method = {
     (process_method_func)daL8Lift_Draw,
 };
 
-/* 80C8A134-80C8A164 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv8Lift */
 extern actor_process_profile_definition g_profile_Obj_Lv8Lift = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp
index ee7d87bf5b..dc35898871 100644
--- a/src/d/actor/d_a_obj_lv8OptiLift.cpp
+++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"
 
-/* 80C8A30C-80C8A368 0000EC 005C+00 1/1 0/0 0/0 .text            __ct__16daOptiLift_HIO_cFv */
 daOptiLift_HIO_c::daOptiLift_HIO_c() {
     mStopDisappearTime = 30;
     mStartMoveTime = 30;
@@ -28,7 +27,6 @@ daOptiLift_HIO_c::daOptiLift_HIO_c() {
     mLightRadius = 600.0f;
 }
 
-/* 80C8A3B0-80C8A438 000190 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daOptiLift_cFv */
 void daOptiLift_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -36,13 +34,11 @@ void daOptiLift_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C8B9B0-80C8B9F0 000004 0040+00 1/1 0/0 0/0 .rodata          mSpeed__12daOptiLift_c */
 const f32 daOptiLift_c::mSpeed[] = {
     5.0f,       6.6666665f, 8.333333f,  10.0f,      11.666667f, 13.333333f, 15.0f,      16.666666f,
     18.333334f, 20.0f,      21.666666f, 23.333334f, 25.0f,      26.666666f, 28.333334f, 3.3333333f,
 };
 
-/* 80C8A438-80C8A500 000218 00C8+00 1/0 0/0 0/0 .text            CreateHeap__12daOptiLift_cFv */
 int daOptiLift_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Lv8Lift", 5);
     JUT_ASSERT(0xC4, modelData != NULL);
@@ -58,10 +54,8 @@ int daOptiLift_c::CreateHeap() {
     return 1;
 }
 
-/* 80C8BBEC-80C8BC00 000014 0014+00 5/5 0/0 0/0 .bss             l_HIO */
 static daOptiLift_HIO_c l_HIO;
 
-/* 80C8A500-80C8A738 0002E0 0238+00 1/1 0/0 0/0 .text            create__12daOptiLift_cFv */
 int daOptiLift_c::create() {
     fopAcM_ct(this, daOptiLift_c);
 
@@ -120,7 +114,6 @@ int daOptiLift_c::create() {
     return phase_state;
 }
 
-/* 80C8A780-80C8A7D0 000560 0050+00 2/2 0/0 0/0 .text            lightSet__12daOptiLift_cFv */
 void daOptiLift_c::lightSet() {
     mLight.mPosition = current.pos;
     mLight.mColor.r = l_HIO.mLightColorR;
@@ -130,16 +123,12 @@ void daOptiLift_c::lightSet() {
     mLight.mFluctuation = 1.0f;
 }
 
-/* 80C8A7D0-80C8A7E8 0005B0 0018+00 1/1 0/0 0/0 .text
- * rideCallBack__12daOptiLift_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daOptiLift_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
         ((daOptiLift_c*)i_this)->mPlayerRide = true;
     }
 }
 
-/* 80C8A7E8-80C8A848 0005C8 0060+00 1/0 0/0 0/0 .text            Execute__12daOptiLift_cFPPA3_A4_f
- */
 int daOptiLift_c::Execute(Mtx** param_0) {
     moveLift();
     lightSet();
@@ -151,7 +140,6 @@ int daOptiLift_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C8A848-80C8AAC4 000628 027C+00 1/1 0/0 0/0 .text            moveLift__12daOptiLift_cFv */
 void daOptiLift_c::moveLift() {
     if (mPathID != 0xFF) {
         typedef void (daOptiLift_c::*mode_func)();
@@ -208,12 +196,10 @@ void daOptiLift_c::moveLift() {
     }
 }
 
-/* 80C8AAC4-80C8AAD0 0008A4 000C+00 2/2 0/0 0/0 .text            init_modeAcc__12daOptiLift_cFv */
 void daOptiLift_c::init_modeAcc() {
     mMode = MODE_ACC_e;
 }
 
-/* 80C8AAD0-80C8ABB0 0008B0 00E0+00 1/0 0/0 0/0 .text            modeAcc__12daOptiLift_cFv */
 void daOptiLift_c::modeAcc() {
     if (cLib_chaseF(&speedF, mMoveSpeed, mMoveSpeed / 30.0f) == 1 || current.pos == mTargetPos) {
         init_modeMove();
@@ -225,12 +211,10 @@ void daOptiLift_c::modeAcc() {
     mDoAud_seStartLevel(Z2SE_OBJ_L8_L_LIFT_MV, &current.pos, fopAcM_GetSpeedF(this), reverb);
 }
 
-/* 80C8ABB0-80C8ABBC 000990 000C+00 1/1 0/0 0/0 .text            init_modeMove__12daOptiLift_cFv */
 void daOptiLift_c::init_modeMove() {
     mMode = MODE_MOVE_e;
 }
 
-/* 80C8ABBC-80C8AED4 00099C 0318+00 1/0 0/0 0/0 .text            modeMove__12daOptiLift_cFv */
 void daOptiLift_c::modeMove() {
     cXyz sp54(mPrevTargetPos);
     cXyz sp60(mTargetPos);
@@ -257,12 +241,10 @@ void daOptiLift_c::modeMove() {
     mDoAud_seStartLevel(Z2SE_OBJ_L8_L_LIFT_MV, &current.pos, fopAcM_GetSpeedF(this), reverb);
 }
 
-/* 80C8AED4-80C8AEE0 000CB4 000C+00 1/1 0/0 0/0 .text            init_modeBrk__12daOptiLift_cFv */
 void daOptiLift_c::init_modeBrk() {
     mMode = MODE_BRK_e;
 }
 
-/* 80C8AEE0-80C8B100 000CC0 0220+00 1/0 0/0 0/0 .text            modeBrk__12daOptiLift_cFv */
 void daOptiLift_c::modeBrk() {
     cXyz prev_pos(current.pos);
 
@@ -285,8 +267,6 @@ void daOptiLift_c::modeBrk() {
     }
 }
 
-/* 80C8B100-80C8B1B0 000EE0 00B0+00 2/2 0/0 0/0 .text            init_modeMoveInit__12daOptiLift_cFv
- */
 void daOptiLift_c::init_modeMoveInit() {
     if (mpBgW != NULL) {
         dComIfG_Bgsp().Regist(mpBgW, this);
@@ -300,22 +280,18 @@ void daOptiLift_c::init_modeMoveInit() {
     mMode = MODE_MOVE_INIT_e;
 }
 
-/* 80C8B1B0-80C8B1F0 000F90 0040+00 1/0 0/0 0/0 .text            modeMoveInit__12daOptiLift_cFv */
 void daOptiLift_c::modeMoveInit() {
     if (mBtk.play() == TRUE) {
         init_modeMoveWait();
     }
 }
 
-/* 80C8B1F0-80C8B230 000FD0 0040+00 1/1 0/0 0/0 .text            init_modeMoveWait__12daOptiLift_cFv
- */
 void daOptiLift_c::init_modeMoveWait() {
     dKy_plight_set(&mLight);
     mLightSet = true;
     mMode = MODE_MOVE_WAIT_e;
 }
 
-/* 80C8B230-80C8B288 001010 0058+00 1/0 0/0 0/0 .text            modeMoveWait__12daOptiLift_cFv */
 void daOptiLift_c::modeMoveWait() {
     if (mPlayerRide) {
         setNextPoint();
@@ -328,15 +304,12 @@ void daOptiLift_c::modeMoveWait() {
     }
 }
 
-/* 80C8B288-80C8B294 001068 000C+00 2/2 0/0 0/0 .text            init_modeWait__12daOptiLift_cFv */
 void daOptiLift_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80C8B294-80C8B298 001074 0004+00 1/0 0/0 0/0 .text            modeWait__12daOptiLift_cFv */
 void daOptiLift_c::modeWait() {}
 
-/* 80C8B298-80C8B318 001078 0080+00 3/3 0/0 0/0 .text            init_modeStop__12daOptiLift_cFv */
 void daOptiLift_c::init_modeStop() {
     if (getArg1() != 0xF) {
         field_0x616 = 1;
@@ -352,7 +325,6 @@ void daOptiLift_c::init_modeStop() {
     mMode = MODE_STOP_e;
 }
 
-/* 80C8B318-80C8B428 0010F8 0110+00 1/0 0/0 0/0 .text            modeStop__12daOptiLift_cFv */
 void daOptiLift_c::modeStop() {
     if (mStopDisappearTimer != 0) {
         mStopDisappearTimer--;
@@ -372,32 +344,25 @@ void daOptiLift_c::modeStop() {
     }
 }
 
-/* 80C8B428-80C8B464 001208 003C+00 1/1 0/0 0/0 .text            init_modeInitSet__12daOptiLift_cFv
- */
 void daOptiLift_c::init_modeInitSet() {
     liftReset();
     field_0x616 = 0;
     mMode = MODE_INIT_SET_e;
 }
 
-/* 80C8B464-80C8B484 001244 0020+00 1/0 0/0 0/0 .text            modeInitSet__12daOptiLift_cFv */
 void daOptiLift_c::modeInitSet() {
     init_modeWait();
 }
 
-/* 80C8B484-80C8B4B8 001264 0034+00 1/1 0/0 0/0 .text            init_modeInitSet2__12daOptiLift_cFv
- */
 void daOptiLift_c::init_modeInitSet2() {
     liftReset();
     mMode = MODE_INIT_SET2_e;
 }
 
-/* 80C8B4B8-80C8B4D8 001298 0020+00 1/0 0/0 0/0 .text            modeInitSet2__12daOptiLift_cFv */
 void daOptiLift_c::modeInitSet2() {
     init_modeMoveInit();
 }
 
-/* 80C8B4D8-80C8B53C 0012B8 0064+00 2/2 0/0 0/0 .text            liftReset__12daOptiLift_cFv */
 void daOptiLift_c::liftReset() {
     dPath* pathp = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
     dPnt* pointp = pathp->m_points;
@@ -410,7 +375,6 @@ void daOptiLift_c::liftReset() {
     mCurrentPoint = 0;
 }
 
-/* 80C8B53C-80C8B66C 00131C 0130+00 2/2 0/0 0/0 .text            setNextPoint__12daOptiLift_cFv */
 void daOptiLift_c::setNextPoint() {
     s16 next_point = mCurrentPoint + mPathDirection;
     dPath* pathp = dPath_GetRoomPath(mPathID, fopAcM_GetRoomNo(this));
@@ -448,7 +412,6 @@ void daOptiLift_c::setNextPoint() {
     mCurrentPoint = next_point;
 }
 
-/* 80C8B66C-80C8B824 00144C 01B8+00 1/0 0/0 0/0 .text            Draw__12daOptiLift_cFv */
 int daOptiLift_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -482,7 +445,6 @@ int daOptiLift_c::Draw() {
     return 1;
 }
 
-/* 80C8B824-80C8B874 001604 0050+00 1/0 0/0 0/0 .text            Delete__12daOptiLift_cFv */
 int daOptiLift_c::Delete() {
     dComIfG_resDelete(&mPhase, "Lv8Lift");
     if (mLightSet) {
@@ -492,37 +454,28 @@ int daOptiLift_c::Delete() {
     return 1;
 }
 
-/* 80C8B874-80C8B8A0 001654 002C+00 1/0 0/0 0/0 .text            daOptiLift_Draw__FP12daOptiLift_c
- */
 static int daOptiLift_Draw(daOptiLift_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C8B8A0-80C8B8C0 001680 0020+00 1/0 0/0 0/0 .text daOptiLift_Execute__FP12daOptiLift_c */
 static int daOptiLift_Execute(daOptiLift_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C8B8C0-80C8B8E0 0016A0 0020+00 1/0 0/0 0/0 .text            daOptiLift_Delete__FP12daOptiLift_c
- */
 static int daOptiLift_Delete(daOptiLift_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C8B8E0-80C8B900 0016C0 0020+00 1/0 0/0 0/0 .text            daOptiLift_Create__FP10fopAc_ac_c
- */
 static int daOptiLift_Create(fopAc_ac_c* i_this) {
     return ((daOptiLift_c*)i_this)->create();
 }
 
-/* 80C8BB3C-80C8BB5C -00001 0020+00 1/0 0/0 0/0 .data            l_daOptiLift_Method */
 static actor_method_class l_daOptiLift_Method = {
     (process_method_func)daOptiLift_Create,  (process_method_func)daOptiLift_Delete,
     (process_method_func)daOptiLift_Execute, (process_method_func)NULL,
     (process_method_func)daOptiLift_Draw,
 };
 
-/* 80C8BB5C-80C8BB8C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv8OptiLift */
 extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp
index ffef276232..8426b5aa8f 100644
--- a/src/d/actor/d_a_obj_lv8UdFloor.cpp
+++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp
@@ -9,8 +9,8 @@
 
 class daUdFloor_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8BD0C */ daUdFloor_HIO_c();
-    /* 80C8CB44 */ virtual ~daUdFloor_HIO_c() {}
+    daUdFloor_HIO_c();
+    virtual ~daUdFloor_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -27,13 +27,11 @@ public:
     /* 0x14 */ u8 up_framecount;
 };
 
-/* 80C8CC64-80C8CC6C -00001 0008+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[2] = {
     "L8Step",
     "L8StepX",
 };
 
-/* 80C8BD0C-80C8BD80 0000EC 0074+00 1/1 0/0 0/0 .text            __ct__15daUdFloor_HIO_cFv */
 daUdFloor_HIO_c::daUdFloor_HIO_c() {
     field_0x4 = 60;
     init_speed = 0.0f;
@@ -50,7 +48,6 @@ daUdFloor_HIO_c::daUdFloor_HIO_c() {
     up_framecount = 15;
 }
 
-/* 80C8BDC8-80C8BE64 0001A8 009C+00 2/2 0/0 0/0 .text            setBaseMtx__11daUdFloor_cFv */
 void daUdFloor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(0, current.angle.y, 0);
@@ -59,10 +56,8 @@ void daUdFloor_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C8CBF4-80C8CBFC 000004 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {4, 4};
 
-/* 80C8BE64-80C8BEE4 000244 0080+00 1/0 0/0 0/0 .text            CreateHeap__11daUdFloor_cFv */
 int daUdFloor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]);
     JUT_ASSERT(231, modelData != NULL);
@@ -75,16 +70,12 @@ int daUdFloor_c::CreateHeap() {
     return 1;
 }
 
-/* 80C8CBFC-80C8CC04 00000C 0008+00 0/1 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {7, 7};
 
-/* 80C8CC04-80C8CC0C 000014 0008+00 0/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0x1200, 0x1400};
 
-/* 80C8CD8C-80C8CDA4 000014 0018+00 7/7 0/0 0/0 .bss             l_HIO */
 static daUdFloor_HIO_c l_HIO;
 
-/* 80C8BEE4-80C8C0DC 0002C4 01F8+00 1/1 0/0 0/0 .text            create__11daUdFloor_cFv */
 int daUdFloor_c::create() {
     fopAcM_ct(this, daUdFloor_c);
 
@@ -131,7 +122,6 @@ int daUdFloor_c::create() {
     return phase_state;
 }
 
-/* 80C8C0DC-80C8C12C 0004BC 0050+00 1/0 0/0 0/0 .text            Execute__11daUdFloor_cFPPA3_A4_f */
 int daUdFloor_c::Execute(Mtx** param_0) {
     moveLift();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -139,7 +129,6 @@ int daUdFloor_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C8C12C-80C8C264 00050C 0138+00 1/1 0/0 0/0 .text            moveLift__11daUdFloor_cFv */
 void daUdFloor_c::moveLift() {
     static void (daUdFloor_c::*mode_proc[])() = {
         &daUdFloor_c::modeWait,
@@ -162,15 +151,12 @@ void daUdFloor_c::moveLift() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C8C264-80C8C270 000644 000C+00 3/3 0/0 0/0 .text            init_modeWait__11daUdFloor_cFv */
 void daUdFloor_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C8C270-80C8C274 000650 0004+00 1/0 0/0 0/0 .text            modeWait__11daUdFloor_cFv */
 void daUdFloor_c::modeWait() {}
 
-/* 80C8C274-80C8C310 000654 009C+00 1/1 0/0 0/0 .text init_modeUpMoveInit__11daUdFloor_cFv */
 void daUdFloor_c::init_modeUpMoveInit() {
     field_0x5c4 = 0;
     field_0x5c5 = l_HIO.up_framecount;
@@ -178,14 +164,12 @@ void daUdFloor_c::init_modeUpMoveInit() {
     mMode = 1;
 }
 
-/* 80C8C310-80C8C354 0006F0 0044+00 1/0 0/0 0/0 .text            modeUpMoveInit__11daUdFloor_cFv */
 void daUdFloor_c::modeUpMoveInit() {
     if (colorAnm(1) == TRUE) {
         init_modeUpMove();
     }
 }
 
-/* 80C8C354-80C8C5E4 000734 0290+00 2/2 0/0 0/0 .text            colorAnm__11daUdFloor_cFi */
 u8 daUdFloor_c::colorAnm(BOOL param_0) {
     u8 rt = FALSE;
 
@@ -208,7 +192,6 @@ u8 daUdFloor_c::colorAnm(BOOL param_0) {
     return rt;
 }
 
-/* 80C8C5E4-80C8C68C 0009C4 00A8+00 1/1 0/0 0/0 .text            init_modeUpMove__11daUdFloor_cFv */
 void daUdFloor_c::init_modeUpMove() {
     fopAcM_SetSpeedF(this, l_HIO.init_speed);
     field_0x5ba = mTimer;
@@ -218,7 +201,6 @@ void daUdFloor_c::init_modeUpMove() {
     mMode = 2;
 }
 
-/* 80C8C68C-80C8C7F8 000A6C 016C+00 1/0 0/0 0/0 .text            modeUpMove__11daUdFloor_cFv */
 void daUdFloor_c::modeUpMove() {
     if (field_0x5ba != 0) {
         field_0x5ba--;
@@ -235,29 +217,23 @@ void daUdFloor_c::modeUpMove() {
     }
 }
 
-/* 80C8C7F8-80C8C81C 000BD8 0024+00 1/1 0/0 0/0 .text init_modeDownMoveInit__11daUdFloor_cFv */
 void daUdFloor_c::init_modeDownMoveInit() {
     field_0x5c4 = 0;
     field_0x5c5 = l_HIO.down_framecount;
     mMode = 3;
 }
 
-/* 80C8C81C-80C8C860 000BFC 0044+00 1/0 0/0 0/0 .text            modeDownMoveInit__11daUdFloor_cFv
- */
 void daUdFloor_c::modeDownMoveInit() {
     if (colorAnm(0) == TRUE) {
         init_modeDownMove();
     }
 }
 
-/* 80C8C860-80C8C8E4 000C40 0084+00 1/1 0/0 0/0 .text            init_modeDownMove__11daUdFloor_cFv
- */
 void daUdFloor_c::init_modeDownMove() {
     mDoAud_seStart(Z2SE_OBJ_L8_STAIR_MV_DW, &home.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mMode = 4;
 }
 
-/* 80C8C8E4-80C8C994 000CC4 00B0+00 1/0 0/0 0/0 .text            modeDownMove__11daUdFloor_cFv */
 void daUdFloor_c::modeDownMove() {
     if (cLib_addCalc(&field_0x5c0, 0.0f, 0.3f, field_0x5b4, 0.1f) == 0.0f) {
         mDoAud_seStart(Z2SE_OBJ_L8_STAIR_ST_DW, &home.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -265,7 +241,6 @@ void daUdFloor_c::modeDownMove() {
     }
 }
 
-/* 80C8C994-80C8CA78 000D74 00E4+00 1/0 0/0 0/0 .text            Draw__11daUdFloor_cFv */
 int daUdFloor_c::Draw() {
     g_env_light.settingTevStruct(64, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -280,7 +255,6 @@ int daUdFloor_c::Draw() {
     return 1;
 }
 
-/* 80C8CA78-80C8CAB8 000E58 0040+00 1/0 0/0 0/0 .text            Delete__11daUdFloor_cFv */
 int daUdFloor_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]);
     #if DEBUG
@@ -289,29 +263,22 @@ int daUdFloor_c::Delete() {
     return 1;
 }
 
-/* 80C8CAB8-80C8CAE4 000E98 002C+00 1/0 0/0 0/0 .text            daUdFloor_Draw__FP11daUdFloor_c */
 static int daUdFloor_Draw(daUdFloor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C8CAE4-80C8CB04 000EC4 0020+00 1/0 0/0 0/0 .text            daUdFloor_Execute__FP11daUdFloor_c
- */
 static int daUdFloor_Execute(daUdFloor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C8CB04-80C8CB24 000EE4 0020+00 1/0 0/0 0/0 .text            daUdFloor_Delete__FP11daUdFloor_c
- */
 static int daUdFloor_Delete(daUdFloor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C8CB24-80C8CB44 000F04 0020+00 1/0 0/0 0/0 .text            daUdFloor_Create__FP10fopAc_ac_c */
 static int daUdFloor_Create(fopAc_ac_c* i_this) {
     return ((daUdFloor_c*)i_this)->create();
 }
 
-/* 80C8CCE4-80C8CD04 -00001 0020+00 1/0 0/0 0/0 .data            l_daUdFloor_Method */
 static actor_method_class l_daUdFloor_Method = {
     (process_method_func)daUdFloor_Create,
     (process_method_func)daUdFloor_Delete,
@@ -320,7 +287,6 @@ static actor_method_class l_daUdFloor_Method = {
     (process_method_func)daUdFloor_Draw,
 };
 
-/* 80C8CD04-80C8CD34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv8UdFloor */
 extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp
index 0930239f17..1e5d6f6365 100644
--- a/src/d/actor/d_a_obj_lv9SwShutter.cpp
+++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp
@@ -9,8 +9,8 @@
 
 class daLv9SwShutter_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80C8CEAC */ daLv9SwShutter_HIO_c();
-    /* 80C8D730 */ virtual ~daLv9SwShutter_HIO_c() {}
+    daLv9SwShutter_HIO_c();
+    virtual ~daLv9SwShutter_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -20,7 +20,6 @@ public:
     /* 0x10 */ u8 vibration;
 };
 
-/* 80C8CEAC-80C8CEF0 0000EC 0044+00 1/1 0/0 0/0 .text            __ct__20daLv9SwShutter_HIO_cFv */
 daLv9SwShutter_HIO_c::daLv9SwShutter_HIO_c() {
     open_speed = 6.0f;
     close_speed = 30.0f;
@@ -28,10 +27,8 @@ daLv9SwShutter_HIO_c::daLv9SwShutter_HIO_c() {
     vibration = 3;
 }
 
-/* 80C8D91C-80C8D930 000014 0014+00 3/3 0/0 0/0 .bss             l_HIO */
 static daLv9SwShutter_HIO_c l_HIO;
 
-/* 80C8CF38-80C8CFD4 000178 009C+00 2/2 0/0 0/0 .text            setBaseMtx__16daLv9SwShutter_cFv */
 void daLv9SwShutter_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -40,7 +37,6 @@ void daLv9SwShutter_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C8CFD4-80C8D040 000214 006C+00 1/0 0/0 0/0 .text            CreateHeap__16daLv9SwShutter_cFv */
 int daLv9SwShutter_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L9SwShut", 4);
     JUT_ASSERT(167, modelData != NULL);
@@ -53,7 +49,6 @@ int daLv9SwShutter_c::CreateHeap() {
     return 1;
 }
 
-/* 80C8D040-80C8D168 000280 0128+00 1/1 0/0 0/0 .text            create__16daLv9SwShutter_cFv */
 int daLv9SwShutter_c::create() {
     fopAcM_ct(this, daLv9SwShutter_c);
 
@@ -85,7 +80,6 @@ int daLv9SwShutter_c::create() {
     return phase_state;
 }
 
-/* 80C8D168-80C8D1B8 0003A8 0050+00 1/0 0/0 0/0 .text Execute__16daLv9SwShutter_cFPPA3_A4_f */
 int daLv9SwShutter_c::Execute(Mtx** param_0) {
     moveShutter();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -93,8 +87,6 @@ int daLv9SwShutter_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C8D1B8-80C8D2BC 0003F8 0104+00 1/1 0/0 0/0 .text            moveShutter__16daLv9SwShutter_cFv
- */
 void daLv9SwShutter_c::moveShutter() {
     static void (daLv9SwShutter_c::*mode_proc[])() = {
         &daLv9SwShutter_c::modeWait,
@@ -115,22 +107,16 @@ void daLv9SwShutter_c::moveShutter() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80C8D2BC-80C8D2C8 0004FC 000C+00 3/3 0/0 0/0 .text            init_modeWait__16daLv9SwShutter_cFv
- */
 void daLv9SwShutter_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80C8D2C8-80C8D2CC 000508 0004+00 1/0 0/0 0/0 .text            modeWait__16daLv9SwShutter_cFv */
 void daLv9SwShutter_c::modeWait() {}
 
-/* 80C8D2CC-80C8D2D8 00050C 000C+00 1/1 0/0 0/0 .text            init_modeOpen__16daLv9SwShutter_cFv
- */
 void daLv9SwShutter_c::init_modeOpen() {
     mMode = 1;
 }
 
-/* 80C8D2D8-80C8D440 000518 0168+00 1/0 0/0 0/0 .text            modeOpen__16daLv9SwShutter_cFv */
 void daLv9SwShutter_c::modeOpen() {
     f32 temp_f31 = cLib_addCalc(&field_0x5b0, 600.0f, 0.1f, l_HIO.open_speed, 5.0f);
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -145,13 +131,11 @@ void daLv9SwShutter_c::modeOpen() {
     }
 }
 
-/* 80C8D440-80C8D458 000680 0018+00 1/1 0/0 0/0 .text init_modeClose__16daLv9SwShutter_cFv */
 void daLv9SwShutter_c::init_modeClose() {
     fopAcM_SetSpeedF(this, 0.0f);
     mMode = 2;
 }
 
-/* 80C8D458-80C8D5D0 000698 0178+00 1/0 0/0 0/0 .text            modeClose__16daLv9SwShutter_cFv */
 void daLv9SwShutter_c::modeClose() {
     cLib_chaseF(&speedF, l_HIO.close_speed, l_HIO.close_accel);
 
@@ -168,7 +152,6 @@ void daLv9SwShutter_c::modeClose() {
     }
 }
 
-/* 80C8D5D0-80C8D674 000810 00A4+00 1/0 0/0 0/0 .text            Draw__16daLv9SwShutter_cFv */
 int daLv9SwShutter_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -178,7 +161,6 @@ int daLv9SwShutter_c::Draw() {
     return 1;
 }
 
-/* 80C8D674-80C8D6A4 0008B4 0030+00 1/0 0/0 0/0 .text            Delete__16daLv9SwShutter_cFv */
 int daLv9SwShutter_c::Delete() {
     dComIfG_resDelete(&mPhase, "L9SwShut");
     #if DEBUG
@@ -187,29 +169,22 @@ int daLv9SwShutter_c::Delete() {
     return 1;
 }
 
-/* 80C8D6A4-80C8D6D0 0008E4 002C+00 1/0 0/0 0/0 .text daLv9SwShutter_Draw__FP16daLv9SwShutter_c */
 static int daLv9SwShutter_Draw(daLv9SwShutter_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C8D6D0-80C8D6F0 000910 0020+00 1/0 0/0 0/0 .text daLv9SwShutter_Execute__FP16daLv9SwShutter_c
- */
 static int daLv9SwShutter_Execute(daLv9SwShutter_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C8D6F0-80C8D710 000930 0020+00 1/0 0/0 0/0 .text daLv9SwShutter_Delete__FP16daLv9SwShutter_c
- */
 static int daLv9SwShutter_Delete(daLv9SwShutter_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C8D710-80C8D730 000950 0020+00 1/0 0/0 0/0 .text daLv9SwShutter_Create__FP10fopAc_ac_c */
 static int daLv9SwShutter_Create(fopAc_ac_c* i_this) {
     return ((daLv9SwShutter_c*)i_this)->create();
 }
 
-/* 80C8D874-80C8D894 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv9SwShutter_Method */
 static actor_method_class l_daLv9SwShutter_Method = {
     (process_method_func)daLv9SwShutter_Create,
     (process_method_func)daLv9SwShutter_Delete,
@@ -218,7 +193,6 @@ static actor_method_class l_daLv9SwShutter_Method = {
     (process_method_func)daLv9SwShutter_Draw,
 };
 
-/* 80C8D894-80C8D8C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Lv9SwShutter */
 extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp
index 11bc745ab8..062a6d10ce 100644
--- a/src/d/actor/d_a_obj_magLift.cpp
+++ b/src/d/actor/d_a_obj_magLift.cpp
@@ -6,18 +6,15 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_magLift.h"
-#include "dol2asm.h"
 #include "d/d_path.h"
 
 static daMagLift_HIO_c l_HIO;
 
-/* 80C8DA2C-80C8DA58 0000EC 002C+00 1/1 0/0 0/0 .text            __ct__15daMagLift_HIO_cFv */
 daMagLift_HIO_c::daMagLift_HIO_c() {
     field_0x4 = 0x3c;
     field_0x5 = 1;
 }
 
-/* 80C8DAA0-80C8DB28 000160 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daMagLift_cFv */
 void daMagLift_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -25,7 +22,6 @@ void daMagLift_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C8DB28-80C8DB94 0001E8 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daMagLift_cFv */
 int daMagLift_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L_maglift", 4);
 
@@ -41,14 +37,11 @@ int daMagLift_c::CreateHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C8E65C-80C8E69C 000000 0040+00 4/4 0/0 0/0 .rodata          mSpeed__11daMagLift_c */
 const f32 daMagLift_c::mSpeed[16] = {
     5.0f,       6.6666665f, 8.333333f,  10.0f,      11.666667f, 13.333333f, 15.0f,      16.666666f,
     18.333334f, 20.0f,      21.666666f, 23.333334f, 25.0f,      26.666666f, 28.333334f, 3.3333333f,
 };
 
-/* 80C8DB94-80C8DD38 000254 01A4+00 1/1 0/0 0/0 .text            create__11daMagLift_cFv */
 int daMagLift_c::create() {
     fopAcM_ct(this, daMagLift_c);
     int phase = dComIfG_resLoad(&mPhaseReq,"L_maglift");
@@ -84,7 +77,6 @@ int daMagLift_c::create() {
     return phase;
 }
 
-/* 80C8DD38-80C8DD88 0003F8 0050+00 1/0 0/0 0/0 .text            Execute__11daMagLift_cFPPA3_A4_f */
 int daMagLift_c::Execute(Mtx** i_mtx) {
     moveLift();
     *i_mtx = &mpModel->getBaseTRMtx();
@@ -92,7 +84,6 @@ int daMagLift_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80C8DD88-80C8DE98 000448 0110+00 1/1 0/0 0/0 .text            moveLift__11daMagLift_cFv */
 void daMagLift_c::moveLift() {
     if (field_0x5ae != 0xff) {
         typedef void (daMagLift_c::*modeFunc)();
@@ -105,7 +96,6 @@ void daMagLift_c::moveLift() {
     }
 }
 
-/* 80C8DE98-80C8DF20 000558 0088+00 1/0 0/0 0/0 .text            modeAcc__11daMagLift_cFv */
 void daMagLift_c::modeAcc() {
     if (TRUE == cLib_chaseF(&speedF, mMoveSpeed, mMoveSpeed / 30.0f) || current.pos == field_0x5b4) {
         init_modeMove();
@@ -113,12 +103,10 @@ void daMagLift_c::modeAcc() {
     cLib_addCalcPos(&current.pos, field_0x5b4, 1.0f, fopAcM_GetSpeedF(this), 0.1f);
 }
 
-/* 80C8DF20-80C8DF2C 0005E0 000C+00 1/1 0/0 0/0 .text            init_modeMove__11daMagLift_cFv */
 void daMagLift_c::init_modeMove() {
     mMode = MODE_MOVE_e;
 }
 
-/* 80C8DF2C-80C8E1EC 0005EC 02C0+00 1/0 0/0 0/0 .text            modeMove__11daMagLift_cFv */
 void daMagLift_c::modeMove() {
     cXyz sp54(field_0x5c0);
     cXyz sp60(field_0x5b4);
@@ -142,12 +130,10 @@ void daMagLift_c::modeMove() {
     cLib_addCalcPos(&current.pos, field_0x5b4, 1.0f, fopAcM_GetSpeedF(this), 0.1f);
 }
 
-/* 80C8E1EC-80C8E1F8 0008AC 000C+00 1/1 0/0 0/0 .text            init_modeBrk__11daMagLift_cFv */
 void daMagLift_c::init_modeBrk() {
     mMode = MODE_BRK_e;
 }
 
-/* 80C8E1F8-80C8E260 0008B8 0068+00 1/0 0/0 0/0 .text            modeBrk__11daMagLift_cFv */
 void daMagLift_c::modeBrk() {
     f32 val = cLib_addCalcPos(&current.pos, field_0x5b4, 0.1f, fopAcM_GetSpeedF(this), 0.5f);
     if (val == 0.0f) {
@@ -156,47 +142,37 @@ void daMagLift_c::modeBrk() {
     }
 }
 
-/* 80C8E260-80C8E26C 000920 000C+00 3/3 0/0 0/0 .text            init_modeWaitInit__11daMagLift_cFv
- */
 void daMagLift_c::init_modeWaitInit() {
     mMode = MODE_WAIT_INIT_e;
 }
 
-/* 80C8E26C-80C8E2A0 00092C 0034+00 1/0 0/0 0/0 .text            modeWaitInit__11daMagLift_cFv */
 void daMagLift_c::modeWaitInit() {
     setNextPoint();
     init_modeWait();
 }
 
-/* 80C8E2A0-80C8E2AC 000960 000C+00 1/1 0/0 0/0 .text            init_modeWait__11daMagLift_cFv */
 void daMagLift_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80C8E2AC-80C8E2B8 00096C 000C+00 1/0 0/0 0/0 .text            modeWait__11daMagLift_cFv */
 void daMagLift_c::modeWait() {
     mMode = MODE_ACC_e;
 }
 
-/* 80C8E2B8-80C8E2C4 000978 000C+00 1/1 0/0 0/0 .text            init_modeMoveWait__11daMagLift_cFv
- */
 void daMagLift_c::init_modeMoveWait() {
     mMode = MODE_MOVE_WAIT_e;
 }
 
-/* 80C8E2C4-80C8E318 000984 0054+00 1/0 0/0 0/0 .text            modeMoveWait__11daMagLift_cFv */
 void daMagLift_c::modeMoveWait() {
     if (fopAcM_isSwitch(this, (fopAcM_GetParam(this) & 0xff000) >> 0xc) & 0xff) {
         init_modeWaitInit();
     }
 }
 
-/* 80C8E318-80C8E31C 0009D8 0004+00 1/0 0/0 0/0 .text            modeDead__11daMagLift_cFv */
 void daMagLift_c::modeDead() {
     /* empty function */
 }
 
-/* 80C8E31C-80C8E450 0009DC 0134+00 1/1 0/0 0/0 .text            setNextPoint__11daMagLift_cFv */
 void daMagLift_c::setNextPoint() {
     s16 sVar1 = mPoint + field_0x5af;
     dPath* path = dPath_GetRoomPath(field_0x5ae, fopAcM_GetRoomNo(this));
@@ -227,7 +203,6 @@ void daMagLift_c::setNextPoint() {
     mPoint = sVar1;
 }
 
-/* 80C8E450-80C8E4F4 000B10 00A4+00 1/0 0/0 0/0 .text            Draw__11daMagLift_cFv */
 int daMagLift_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -238,35 +213,27 @@ int daMagLift_c::Draw() {
     return 1;
 }
 
-/* 80C8E4F4-80C8E524 000BB4 0030+00 1/0 0/0 0/0 .text            Delete__11daMagLift_cFv */
 int daMagLift_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "L_maglift");
     return 1;
 }
 
-/* 80C8E524-80C8E550 000BE4 002C+00 1/0 0/0 0/0 .text            daMagLift_Draw__FP11daMagLift_c */
 static int daMagLift_Draw(daMagLift_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C8E550-80C8E570 000C10 0020+00 1/0 0/0 0/0 .text            daMagLift_Execute__FP11daMagLift_c
- */
 static int daMagLift_Execute(daMagLift_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C8E570-80C8E590 000C30 0020+00 1/0 0/0 0/0 .text            daMagLift_Delete__FP11daMagLift_c
- */
 static int daMagLift_Delete(daMagLift_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C8E590-80C8E5B0 000C50 0020+00 1/0 0/0 0/0 .text            daMagLift_Create__FP10fopAc_ac_c */
 static int daMagLift_Create(fopAc_ac_c* i_this) {
     return static_cast<daMagLift_c*>(i_this)->create();
 }
 
-/* 80C8E7B0-80C8E7D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daMagLift_Method */
 static actor_method_class l_daMagLift_Method = {
     (process_method_func) daMagLift_Create,
     (process_method_func) daMagLift_Delete,
@@ -275,7 +242,6 @@ static actor_method_class l_daMagLift_Method = {
     (process_method_func) daMagLift_Draw,
 };
 
-/* 80C8E7D0-80C8E800 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MagLift */
 extern actor_process_profile_definition g_profile_Obj_MagLift = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp
index e6903186a2..8c75554859 100644
--- a/src/d/actor/d_a_obj_magLiftRot.cpp
+++ b/src/d/actor/d_a_obj_magLiftRot.cpp
@@ -14,10 +14,8 @@
 #include "d/d_bg_w.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80C8FBB0-80C8FBBC -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[3] = {"MagLiftS", "MagLiftM", "MagLiftL"};
 
-/* 80C8E94C-80C8E9E0 0000EC 0094+00 1/1 0/0 0/0 .text            __ct__18daMagLiftRot_HIO_cFv */
 daMagLiftRot_HIO_c::daMagLiftRot_HIO_c() {
     mWaitTime = 60;
     mInitSpeed = 0.0f;
@@ -36,7 +34,6 @@ daMagLiftRot_HIO_c::daMagLiftRot_HIO_c() {
     mMinMoveDecay = 1.0f;
 }
 
-/* 80C8EA28-80C8EB1C 0001C8 00F4+00 2/2 0/0 0/0 .text            setBaseMtx__14daMagLiftRot_cFv */
 void daMagLiftRot_c::setBaseMtx() {
     scale.x = field_0x62c;
     scale.y = 1.0f;
@@ -56,20 +53,14 @@ void daMagLiftRot_c::setBaseMtx() {
 }
 
 
-/* ############################################################################################## */
-/* 80C8FB18-80C8FB24 000030 000C+00 0/1 0/0 0/0 .rodata          l_bmdIdx */
 static int const l_bmdIdx[] = {4, 4, 6};
 
-/* 80C8FB24-80C8FB30 00003C 000C+00 0/1 0/0 0/0 .rodata          l_dzbIdx */
 static int const l_dzbIdx[] = {7, 7, 15};
 
-/* 80C8FB30-80C8FB3C 000048 000C+00 2/3 0/0 0/0 .rodata          l_btkIdx */
 static int const l_btkIdx[] = {-1, -1, 12};
 
-/* 80C8FB3C-80C8FB48 000054 000C+00 2/3 0/0 0/0 .rodata          l_brkIdx */
 static int const l_brkIdx[] = {-1, -1, 9};
 
-/* 80C8EB1C-80C8EC64 0002BC 0148+00 1/0 0/0 0/0 .text            CreateHeap__14daMagLiftRot_cFv */
 int daMagLiftRot_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmdIdx[mType]);
@@ -93,7 +84,6 @@ int daMagLiftRot_c::CreateHeap() {
     return 1;
 }
 
-/* 80C8EC64-80C8EF4C 000404 02E8+00 1/1 0/0 0/0 .text            create__14daMagLiftRot_cFv */
 int daMagLiftRot_c::create() {
     fopAcM_ct(this, daMagLiftRot_c);
 
@@ -181,8 +171,6 @@ int daMagLiftRot_c::create() {
     return phase;
 }
 
-/* 80C8EF94-80C8F02C 000734 0098+00 1/0 0/0 0/0 .text            Execute__14daMagLiftRot_cFPPA3_A4_f
- */
 int daMagLiftRot_c::Execute(Mtx** param_0) {
     moveLift();
 
@@ -199,10 +187,8 @@ int daMagLiftRot_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C8FCCC-80C8FD0C 000014 0040+00 4/4 0/0 0/0 .bss             l_HIO */
 static daMagLiftRot_HIO_c l_HIO;
 
-/* 80C8F02C-80C8F264 0007CC 0238+00 1/1 0/0 0/0 .text            moveLift__14daMagLiftRot_cFv */
 void daMagLiftRot_c::moveLift() {
     typedef void (daMagLiftRot_c::*modeFunc)();
     static modeFunc mode_proc[] = {&daMagLiftRot_c::modeMove, &daMagLiftRot_c::modeWait,
@@ -220,8 +206,6 @@ void daMagLiftRot_c::moveLift() {
     field_0x5f8 += 1.0f;
 }
 
-/* 80C8F264-80C8F4A0 000A04 023C+00 1/1 0/0 0/0 .text            init_modeMove__14daMagLiftRot_cFv
- */
 void daMagLiftRot_c::init_modeMove() {
     fopAcM_SetSpeedF(this, l_HIO.mInitSpeed);
 
@@ -255,7 +239,6 @@ void daMagLiftRot_c::init_modeMove() {
 }
 
 
-/* 80C8F4A0-80C8F538 000C40 0098+00 1/0 0/0 0/0 .text            modeMove__14daMagLiftRot_cFv */
 void daMagLiftRot_c::modeMove() {
     cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration);
 
@@ -269,8 +252,6 @@ void daMagLiftRot_c::modeMove() {
 }
 
 
-/* 80C8F538-80C8F7CC 000CD8 0294+00 3/3 0/0 0/0 .text            init_modeWait__14daMagLiftRot_cFv
- */
 void daMagLiftRot_c::init_modeWait() {
     static u32 selLabel[] = {Z2SE_OBJ_MAGNELIFT_STOP_S, Z2SE_OBJ_MAGNELIFT_STOP_M,
                                   Z2SE_OBJ_MAGNELIFT_STOP_L};
@@ -313,7 +294,6 @@ void daMagLiftRot_c::init_modeWait() {
 }
 
 
-/* 80C8F7CC-80C8F804 000F6C 0038+00 1/0 0/0 0/0 .text            modeWait__14daMagLiftRot_cFv */
 void daMagLiftRot_c::modeWait() {
     if (mTimer == 0) {
         init_modeMove();
@@ -322,12 +302,10 @@ void daMagLiftRot_c::modeWait() {
     }
 }
 
-/* 80C8F804-80C8F810 000FA4 000C+00 1/1 0/0 0/0 .text init_modeMoveWait__14daMagLiftRot_cFv */
 void daMagLiftRot_c::init_modeMoveWait() {
     mMode = 2;
 }
 
-/* 80C8F810-80C8F86C 000FB0 005C+00 1/0 0/0 0/0 .text            modeMoveWait__14daMagLiftRot_cFv */
 void daMagLiftRot_c::modeMoveWait() {
     u8 sw_on = fopAcM_isSwitch(this, (fopAcM_GetParam(this) >> 0x18) & 0xFF);
 
@@ -337,7 +315,6 @@ void daMagLiftRot_c::modeMoveWait() {
     }
 }
 
-/* 80C8F86C-80C8F970 00100C 0104+00 1/0 0/0 0/0 .text            Draw__14daMagLiftRot_cFv */
 int daMagLiftRot_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -357,34 +334,27 @@ int daMagLiftRot_c::Draw() {
     return 1;
 }
 
-/* 80C8F970-80C8F9B0 001110 0040+00 1/0 0/0 0/0 .text            Delete__14daMagLiftRot_cFv */
 int daMagLiftRot_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mType]);
     return 1;
 }
 
-/* 80C8F9B0-80C8F9DC 001150 002C+00 1/0 0/0 0/0 .text daMagLiftRot_Draw__FP14daMagLiftRot_c */
 static int daMagLiftRot_Draw(daMagLiftRot_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C8F9DC-80C8F9FC 00117C 0020+00 1/0 0/0 0/0 .text daMagLiftRot_Execute__FP14daMagLiftRot_c */
 static int daMagLiftRot_Execute(daMagLiftRot_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C8F9FC-80C8FA1C 00119C 0020+00 1/0 0/0 0/0 .text daMagLiftRot_Delete__FP14daMagLiftRot_c */
 static int daMagLiftRot_Delete(daMagLiftRot_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C8FA1C-80C8FA3C 0011BC 0020+00 1/0 0/0 0/0 .text            daMagLiftRot_Create__FP10fopAc_ac_c
- */
 static int daMagLiftRot_Create(fopAc_ac_c* i_this) {
     return static_cast<daMagLiftRot_c*>(i_this)->create();
 }
 
-/* 80C8FC1C-80C8FC3C -00001 0020+00 1/0 0/0 0/0 .data            l_daMagLiftRot_Method */
 static actor_method_class l_daMagLiftRot_Method = {
     (process_method_func)daMagLiftRot_Create,
     (process_method_func)daMagLiftRot_Delete,
@@ -393,7 +363,6 @@ static actor_method_class l_daMagLiftRot_Method = {
     (process_method_func)daMagLiftRot_Draw,
 };
 
-/* 80C8FC3C-80C8FC6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MagLiftRot */
 extern actor_process_profile_definition g_profile_Obj_MagLiftRot = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp
index 7e3c542dea..8037b46713 100644
--- a/src/d/actor/d_a_obj_magne_arm.cpp
+++ b/src/d/actor/d_a_obj_magne_arm.cpp
@@ -11,30 +11,21 @@
 #include "d/d_com_inf_game.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-#include "dol2asm.h"
 
-/* ############################################################################################## */
-/* 80592848-80592854 000000 000C+00 15/15 0/0 0/0 .rodata          l_magne_scale */
 static u8 const l_magne_scale[12] = {
     0x40, 0x40, 0x00, 0x00, 0x40, 0x09, 0x99, 0x9A, 0x40, 0x40, 0x00, 0x00,
 };
 
-/* 80592854-80592864 00000C 0010+00 0/4 0/0 0/0 .rodata          l_trans */
 static f32 const l_trans[4] = {0.0f, 1050.0f, 450.0f, 900.0f};
 
-/* 80592864-80592874 00001C 0010+00 0/1 0/0 0/0 .rodata          l_down_length */
 static f32 const l_down_length[4] = {1100.0f, 800.0f, 1100.0f, 800.0f};
 
-/* 80592874-8059287C 00002C 0008+00 0/6 0/0 0/0 .rodata          l_roll_speed */
 static s16 const l_roll_speed[4] = {200, 200, 200, 1000};
 
-/* 8059287C-80592880 000034 0004+00 4/4 0/0 0/0 .rodata          l_stop_timer */
 static u8 const l_stop_timer[4] = {60, 60, 60, 60};
 
-/* 80592880-80592888 000038 0008+00 0/4 0/0 0/0 .rodata          l_rot_speedY */
 static s16 const l_rot_speedY[4] = {200, 200, 200, 200};
 
-/* 8058F358-8058F3D4 000078 007C+00 1/1 0/0 0/0 .text getBpartsOffset__11daObjMarm_cFP4cXyz */
 void daObjMarm_c::getBpartsOffset(cXyz* i_BPartOffset) {
     static Vec const s_offsetB = {-150.0f, 1200.0f, 0.0f};
     *i_BPartOffset = s_offsetB;
@@ -43,7 +34,6 @@ void daObjMarm_c::getBpartsOffset(cXyz* i_BPartOffset) {
     mDoMtx_stack_c::multVec(i_BPartOffset, i_BPartOffset);
 }
 
-/* 8058F3D4-8058F46C 0000F4 0098+00 1/1 0/0 0/0 .text getDpartsOffset__11daObjMarm_cFP4cXyz */
 void daObjMarm_c::getDpartsOffset(cXyz* i_DPartOffset) {
     static Vec const s_offsetD = {0.0f, 2500.0f, 0.0f};
     *i_DPartOffset = s_offsetD;
@@ -53,7 +43,6 @@ void daObjMarm_c::getDpartsOffset(cXyz* i_DPartOffset) {
     mDoMtx_stack_c::multVec(i_DPartOffset, i_DPartOffset);
 }
 
-/* 8058F46C-8058F504 00018C 0098+00 3/3 0/0 0/0 .text getEpartsOffset__11daObjMarm_cFP4cXyz */
 void daObjMarm_c::getEpartsOffset(cXyz* i_EPartOffset) {
     static Vec const s_offsetE = {0.0f, 2500.0f, 1460.0f};
     *i_EPartOffset = s_offsetE;
@@ -63,8 +52,6 @@ void daObjMarm_c::getEpartsOffset(cXyz* i_EPartOffset) {
     mDoMtx_stack_c::multVec(i_EPartOffset, i_EPartOffset);
 }
 
-/* ############################################################################################## */
-/* 8058F504-8058F610 000224 010C+00 4/4 0/0 0/0 .text getFpartsOffset__11daObjMarm_cFP4cXyz */
 void daObjMarm_c::getFpartsOffset(cXyz* i_FPartOffset) {
     static Vec const s_offsetF = {0.0f, 2500.0f, 1780.0f};
     *i_FPartOffset = s_offsetF;
@@ -77,8 +64,6 @@ void daObjMarm_c::getFpartsOffset(cXyz* i_FPartOffset) {
     mDoMtx_stack_c::multVec(i_FPartOffset, i_FPartOffset);
 }
 
-/* ############################################################################################## */
-/* 8058F610-8058F6B4 000330 00A4+00 1/1 0/0 0/0 .text getRopeStartPos__11daObjMarm_cFP4cXyz */
 void daObjMarm_c::getRopeStartPos(cXyz* i_ropeStartPos) {
     getEpartsOffset(i_ropeStartPos);
     cXyz rope_start_pos(0.0f, 0.0f, 320.0f);
@@ -88,7 +73,6 @@ void daObjMarm_c::getRopeStartPos(cXyz* i_ropeStartPos) {
     *i_ropeStartPos += rope_start_pos;
 }
 
-/* 8058F6B4-8058F77C 0003D4 00C8+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjMarm_cFv */
 void daObjMarm_c::initBaseMtx() {
     mpModel[0]->setBaseScale(scale);
     mpModel[1]->setBaseScale(scale);
@@ -99,7 +83,6 @@ void daObjMarm_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8058F77C-8058FA38 00049C 02BC+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjMarm_cFv */
 void daObjMarm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -152,40 +135,30 @@ void daObjMarm_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx2);
 }
 
-/* 8058FA38-8058FA50 000758 0018+00 1/1 0/0 0/0 .text   rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c  */
 void rideCallBack(dBgW* param_0, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
         static_cast<daObjMarm_c*>(i_this)->mPlayerRide = TRUE;
     }
 }
 
-/* ############################################################################################## */
-/* 805929A0-805929A4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "D_Marm";
 
 static void dummyStrings() {
     DEAD_STRING("D_MN54");
 }
 
-/* 805929A4-805929BC 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {{-500.0f, -3000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}};
 
-/* 805929BC-805929D4 00003C 0018+00 1/1 0/0 0/0 .data            l_cull_box2 */
 static Vec l_cull_box2[2] = {{-500.0f, -4000.0f, -500.0f}, {500.0f, 3000.0f, 2500.0f}};
 
-/* 805928D0-805928DC 000088 000C+00 0/0 0/0 0/0 .rodata          l_offsetB$3735 */
 static Vec const l_offsetB = {-150.0f, 1200.0f, 0.0f};  // unused
 
-/* 805928DC-805928E8 000094 000C+00 0/0 0/0 0/0 .rodata          l_offsetD$3736 */
 static Vec const l_offsetD = {0.0f, 2500.0f, 0.0f};     // unused
 
-/* 805928E8-805928F4 0000A0 000C+00 0/0 0/0 0/0 .rodata          l_offsetE$3737 */
 static Vec const l_offsetE = {0.0f, 2500.0f, 1460.0f};  // unused
 
-/* 805928F4-80592900 0000AC 000C+00 0/0 0/0 0/0 .rodata          l_offsetF$3738 */
 static Vec const l_offsetF = {0.0f, 1000.0f, 1760.0f};  // unused
 
-/* 8058FA50-8058FCF8 000770 02A8+00 1/0 0/0 0/0 .text            Create__11daObjMarm_cFv */
 int daObjMarm_c::Create() {
     calcHimo();
     f32* size = mpRope1->getSize(0);
@@ -261,20 +234,14 @@ int daObjMarm_c::Create() {
     return TRUE;
 }
 
-/* ############################################################################################## */
-/* 805929D4-805929D8 000054 0004+00 0/1 0/0 0/0 .data            l_att_disXZ */
 static f32 l_att_disXZ = 3000.0f;
 
-/* 805929D8-805929DC 000058 0004+00 0/1 0/0 0/0 .data            l_att_high */
 static f32 l_att_high = 2000.0f;
 
-/* 805929DC-805929E0 00005C 0004+00 0/1 0/0 0/0 .data            l_att_low */
 static f32 l_att_low = -500.0f;
 
-/* 805929E0-805929E4 000060 0002+02 0/1 0/0 0/0 .data            l_att_ang */
 static s16 l_att_ang = 0x6000;
 
-/* 8058FCF8-805901FC 000A18 0504+00 1/0 0/0 0/0 .text            CreateHeap__11daObjMarm_cFv */
 int daObjMarm_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
     mpModel[0] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -365,7 +332,6 @@ int daObjMarm_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80590244-805902D8 000F64 0094+00 1/0 0/0 0/0 .text            phase_0__11daObjMarm_cFv */
 cPhs__Step daObjMarm_c::phase_0() {
     mMoveType = getMoveType();
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
@@ -379,7 +345,6 @@ cPhs__Step daObjMarm_c::phase_0() {
     return cPhs_INIT_e;
 }
 
-/* 805902D8-80590364 000FF8 008C+00 1/0 0/0 0/0 .text            phase_1__11daObjMarm_cFv */
 cPhs__Step daObjMarm_c::phase_1() {
     cXyz scale(1.0f, 1.0f, 1.0f);
     mID = fopAcM_create(PROC_Obj_MHole, 0x12FF, &current.pos, fopAcM_GetRoomNo(this),
@@ -392,7 +357,6 @@ cPhs__Step daObjMarm_c::phase_1() {
     return cPhs_INIT_e;
 }
 
-/* 80590364-80590460 001084 00FC+00 1/0 0/0 0/0 .text            phase_2__11daObjMarm_cFv */
 cPhs__Step daObjMarm_c::phase_2() {
     daObjMHole_c* m_hole_actor = (daObjMHole_c*)fopAcM_SearchByID(mID);
     if (m_hole_actor != NULL) {
@@ -410,8 +374,6 @@ cPhs__Step daObjMarm_c::phase_2() {
     return cPhs_INIT_e;
 }
 
-/* ############################################################################################## */
-/* 80590460-80590504 001180 00A4+00 1/1 0/0 0/0 .text            create1st__11daObjMarm_cFv */
 int daObjMarm_c::create1st() {
     typedef cPhs__Step (daObjMarm_c::*daObjMarm_func)();
     static daObjMarm_func l_ct_func[] = {
@@ -422,8 +384,6 @@ int daObjMarm_c::create1st() {
     (this->*l_ct_func[mPhaseIndex])();
 }
 
-/* ############################################################################################## */
-/* 80590504-80590818 001224 0314+00 1/0 0/0 0/0 .text            Execute__11daObjMarm_cFPPA3_A4_f */
 int daObjMarm_c::Execute(Mtx** i_bgMtx) {
     mRotOffsetSwing++;
     action();
@@ -478,7 +438,6 @@ int daObjMarm_c::Execute(Mtx** i_bgMtx) {
     return 1;
 }
 
-/* 80590818-80590B7C 001538 0364+00 1/1 0/0 0/0 .text            action__11daObjMarm_cFv */
 void daObjMarm_c::action() {
     typedef void (daObjMarm_c::*daObjMarm_func)();
 
@@ -535,20 +494,17 @@ void daObjMarm_c::action() {
     }
 }
 
-/* 80590B7C-80590B8C 00189C 0010+00 1/1 0/0 0/0 .text init_typeA_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::init_typeA_modeWait() {
     mStopTimer = 0;
     mMode = MODE_WAIT_e;
 }
 
-/* 80590B8C-80590BE0 0018AC 0054+00 1/0 0/0 0/0 .text            typeA_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeWait() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         init_typeA_modeMholeOn();
     }
 }
 
-/* 80590BE0-80590C48 001900 0068+00 1/1 0/0 0/0 .text init_typeA_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::init_typeA_modeMholeOn() {
     daObjMHole_c* m_hole_actor = (daObjMHole_c*)fopAcM_SearchByID(mID);
     if (m_hole_actor != NULL) {
@@ -560,23 +516,18 @@ void daObjMarm_c::init_typeA_modeMholeOn() {
     mMode = MODE_MHOLE_ON_e;
 }
 
-/* 80590C48-80590C68 001968 0020+00 1/0 0/0 0/0 .text            typeA_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeMholeOn() {
     init_typeA_modeRotate();
 }
 
-/* 80590C68-80590C6C 001988 0004+00 1/0 0/0 0/0 .text            typeA_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeLiftUp() {
     /* empty function */
 }
 
-/* 80590C6C-80590C70 00198C 0004+00 1/0 0/0 0/0 .text            typeA_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeLiftDown() {
     /* empty function */
 }
 
-/* ############################################################################################## */
-/* 80590C70-80590CE4 001990 0074+00 2/2 0/0 0/0 .text init_typeA_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::init_typeA_modeRotate() {
     mStopTimer = l_stop_timer[0];
     if (mPlayerRide != FALSE) {
@@ -588,8 +539,6 @@ void daObjMarm_c::init_typeA_modeRotate() {
     mMode = MODE_ROTATE_e;
 }
 
-/* ############################################################################################## */
-/* 80590CE4-80590E24 001A04 0140+00 1/0 0/0 0/0 .text            typeA_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeRotate() {
     u32 stop_timer = (u8)mStopTimer;
     if (cLib_calcTimer(&mStopTimer) == 0) {
@@ -627,25 +576,21 @@ void daObjMarm_c::typeA_modeRotate() {
     }
 }
 
-/* 80590E24-80590E28 001B44 0004+00 1/0 0/0 0/0 .text            typeA_modeEnd__11daObjMarm_cFv */
 void daObjMarm_c::typeA_modeEnd() {
     /* empty function */
 }
 
-/* 80590E28-80590E38 001B48 0010+00 1/1 0/0 0/0 .text init_typeB_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::init_typeB_modeWait() {
     mStopTimer = 0;
     mMode = MODE_WAIT_e;
 }
 
-/* 80590E38-80590E8C 001B58 0054+00 1/0 0/0 0/0 .text            typeB_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeWait() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         init_typeB_modeMholeOn();
     }
 }
 
-/* 80590E8C-80590EF4 001BAC 0068+00 1/1 0/0 0/0 .text init_typeB_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::init_typeB_modeMholeOn() {
     daObjMHole_c* m_hole_actor = (daObjMHole_c*)fopAcM_SearchByID(mID);
     if (m_hole_actor != NULL) {
@@ -657,20 +602,16 @@ void daObjMarm_c::init_typeB_modeMholeOn() {
     mMode = MODE_MHOLE_ON_e;
 }
 
-/* 80590EF4-80590F14 001C14 0020+00 1/0 0/0 0/0 .text            typeB_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeMholeOn() {
     init_typeB_modeRotate();
 }
 
-/* 80590F14-80590F30 001C34 001C+00 1/1 0/0 0/0 .text init_typeB_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::init_typeB_modeLiftUp() {
     mStopTimer = 30;
     mLiftRotation = 0;
     mMode = MODE_LIFT_UP_e;
 }
 
-/* ############################################################################################## */
-/* 80590F30-80591004 001C50 00D4+00 1/0 0/0 0/0 .text            typeB_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeLiftUp() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[1], 20, 50, 10);
@@ -684,7 +625,6 @@ void daObjMarm_c::typeB_modeLiftUp() {
     }
 }
 
-/* 80591004-805910E8 001D24 00E4+00 1/0 0/0 0/0 .text            typeB_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeLiftDown() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[1], 20, 50, 10);
@@ -698,7 +638,6 @@ void daObjMarm_c::typeB_modeLiftDown() {
     }
 }
 
-/* 805910E8-80591160 001E08 0078+00 4/4 0/0 0/0 .text init_typeB_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::init_typeB_modeRotate() {
     mStopTimer = l_stop_timer[1];
     if (mPlayerRide != FALSE) {
@@ -710,7 +649,6 @@ void daObjMarm_c::init_typeB_modeRotate() {
     mMode = MODE_ROTATE_e;
 }
 
-/* 80591160-805912AC 001E80 014C+00 1/0 0/0 0/0 .text            typeB_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeRotate() {
     u32 stop_timer = mStopTimer;
     if (cLib_calcTimer(&mStopTimer) == 0) {
@@ -750,25 +688,21 @@ void daObjMarm_c::typeB_modeRotate() {
     }
 }
 
-/* 805912AC-805912B0 001FCC 0004+00 1/0 0/0 0/0 .text            typeB_modeEnd__11daObjMarm_cFv */
 void daObjMarm_c::typeB_modeEnd() {
     /* empty function */
 }
 
-/* 805912B0-805912C0 001FD0 0010+00 1/1 0/0 0/0 .text init_typeC_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::init_typeC_modeWait() {
     mStopTimer = 0;
     mMode = MODE_WAIT_e;
 }
 
-/* 805912C0-80591314 001FE0 0054+00 1/0 0/0 0/0 .text            typeC_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::typeC_modeWait() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         init_typeC_modeMholeOn();
     }
 }
 
-/* 80591314-8059137C 002034 0068+00 1/1 0/0 0/0 .text init_typeC_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::init_typeC_modeMholeOn() {
     daObjMHole_c* m_hole_actor = (daObjMHole_c*)fopAcM_SearchByID(mID);
     if (m_hole_actor != NULL) {
@@ -780,20 +714,16 @@ void daObjMarm_c::init_typeC_modeMholeOn() {
     mMode = MODE_MHOLE_ON_e;
 }
 
-/* 8059137C-8059139C 00209C 0020+00 1/0 0/0 0/0 .text            typeC_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::typeC_modeMholeOn() {
     init_typeC_modeLiftUp();
 }
 
-/* 8059139C-805913B8 0020BC 001C+00 2/2 0/0 0/0 .text init_typeC_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::init_typeC_modeLiftUp() {
     mStopTimer = 30;
     mLiftRotation = 0;
     mMode = MODE_LIFT_UP_e;
 }
 
-/* 805913B8-8059148C 0020D8 00D4+00 1/0 0/0 0/0 .text            typeC_modeLiftUp__11daObjMarm_cFv
- */
 void daObjMarm_c::typeC_modeLiftUp() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[2], 20, 50, 10);
@@ -807,14 +737,12 @@ void daObjMarm_c::typeC_modeLiftUp() {
     }
 }
 
-/* 8059148C-805914A8 0021AC 001C+00 1/1 0/0 0/0 .text init_typeC_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::init_typeC_modeLiftDown() {
     mStopTimer = 30;
     mLiftRotation = 0;
     mMode = MODE_LIFT_DOWN_e;
 }
 
-/* 805914A8-8059158C 0021C8 00E4+00 1/0 0/0 0/0 .text            typeC_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::typeC_modeLiftDown() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[2], 20, 50, 10);
@@ -828,7 +756,6 @@ void daObjMarm_c::typeC_modeLiftDown() {
     }
 }
 
-/* 8059158C-80591604 0022AC 0078+00 1/1 0/0 0/0 .text init_typeC_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::init_typeC_modeRotate() {
     mStopTimer = l_stop_timer[2];
     if (mPlayerRide != FALSE) {
@@ -840,7 +767,6 @@ void daObjMarm_c::init_typeC_modeRotate() {
     mMode = MODE_ROTATE_e;
 }
 
-/* 80591604-80591750 002324 014C+00 1/0 0/0 0/0 .text            typeC_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::typeC_modeRotate() {
     u32 stop_timer = mStopTimer;
     if (cLib_calcTimer(&mStopTimer) == 0) {
@@ -880,25 +806,21 @@ void daObjMarm_c::typeC_modeRotate() {
     }
 }
 
-/* 80591750-80591754 002470 0004+00 1/0 0/0 0/0 .text            typeC_modeEnd__11daObjMarm_cFv */
 void daObjMarm_c::typeC_modeEnd() {
     /* empty function */
 }
 
-/* 80591754-80591764 002474 0010+00 1/1 0/0 0/0 .text init_typeD_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::init_typeD_modeWait() {
     mStopTimer = 0;
     mMode = MODE_WAIT_e;
 }
 
-/* 80591764-805917B8 002484 0054+00 1/0 0/0 0/0 .text            typeD_modeWait__11daObjMarm_cFv */
 void daObjMarm_c::typeD_modeWait() {
     if (fopAcM_isSwitch(this, getSwNo())) {
         init_typeD_modeMholeOn();
     }
 }
 
-/* 805917B8-80591820 0024D8 0068+00 1/1 0/0 0/0 .text init_typeD_modeMholeOn__11daObjMarm_cFv */
 void daObjMarm_c::init_typeD_modeMholeOn() {
     daObjMHole_c* m_hole_actor = (daObjMHole_c*)fopAcM_SearchByID(mID);
     if (m_hole_actor != NULL) {
@@ -910,20 +832,16 @@ void daObjMarm_c::init_typeD_modeMholeOn() {
     mMode = MODE_MHOLE_ON_e;
 }
 
-/* 80591820-80591840 002540 0020+00 1/0 0/0 0/0 .text            typeD_modeMholeOn__11daObjMarm_cFv
- */
 void daObjMarm_c::typeD_modeMholeOn() {
     init_typeD_modeRotate();
 }
 
-/* 80591840-8059185C 002560 001C+00 1/1 0/0 0/0 .text init_typeD_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::init_typeD_modeLiftUp() {
     mStopTimer = 30;
     mLiftRotation = 0;
     mMode = MODE_LIFT_UP_e;
 }
 
-/* 8059185C-80591930 00257C 00D4+00 1/0 0/0 0/0 .text            typeD_modeLiftUp__11daObjMarm_cFv */
 void daObjMarm_c::typeD_modeLiftUp() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[3], 20, 50, 10);
@@ -937,14 +855,12 @@ void daObjMarm_c::typeD_modeLiftUp() {
     }
 }
 
-/* 80591930-8059194C 002650 001C+00 1/1 0/0 0/0 .text init_typeD_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::init_typeD_modeLiftDown() {
     mStopTimer = 30;
     mLiftRotation = 0;
     mMode = MODE_LIFT_DOWN_e;
 }
 
-/* 8059194C-80591A30 00266C 00E4+00 1/0 0/0 0/0 .text            typeD_modeLiftDown__11daObjMarm_cFv */
 void daObjMarm_c::typeD_modeLiftDown() {
     if (cLib_calcTimer(&mStopTimer) == 0) {
         cLib_addCalcAngleS(&mLiftRotation, l_roll_speed[3], 20, 50, 10);
@@ -959,7 +875,6 @@ void daObjMarm_c::typeD_modeLiftDown() {
     }
 }
 
-/* 80591A30-80591AA8 002750 0078+00 3/3 0/0 0/0 .text init_typeD_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::init_typeD_modeRotate() {
     mStopTimer = l_stop_timer[3];
     if (mPlayerRide != FALSE) {
@@ -971,7 +886,6 @@ void daObjMarm_c::init_typeD_modeRotate() {
     mMode = MODE_ROTATE_e;
 }
 
-/* 80591AA8-80591BF4 0027C8 014C+00 1/0 0/0 0/0 .text            typeD_modeRotate__11daObjMarm_cFv */
 void daObjMarm_c::typeD_modeRotate() {
     u32 stop_timer = mStopTimer;
     if (cLib_calcTimer(&mStopTimer) == 0) {
@@ -1011,17 +925,14 @@ void daObjMarm_c::typeD_modeRotate() {
     }
 }
 
-/* 80591BF4-80591BF8 002914 0004+00 1/0 0/0 0/0 .text            typeD_modeEnd__11daObjMarm_cFv */
 void daObjMarm_c::typeD_modeEnd() {
     /* empty function */
 }
 
-/* 80591BF8-80591BFC 002918 0004+00 8/8 0/0 0/0 .text            setMagneHoleEffect__11daObjMarm_cFv */
 void daObjMarm_c::setMagneHoleEffect() {
     /* empty function */
 }
 
-/* 80591BFC-80591C38 00291C 003C+00 5/5 0/0 0/0 .text            endMagneHoleEffect__11daObjMarm_cFv */
 void daObjMarm_c::endMagneHoleEffect() {
     if (mpEmitter != NULL) {
         mpEmitter->becomeInvalidEmitter();
@@ -1030,8 +941,6 @@ void daObjMarm_c::endMagneHoleEffect() {
     }
 }
 
-/* ############################################################################################## */
-/* 80591C38-80591E18 002958 01E0+00 2/2 0/0 0/0 .text            calcHimo__11daObjMarm_cFv */
 void daObjMarm_c::calcHimo() {
     cXyz offset1;
     cXyz offset2;
@@ -1071,39 +980,30 @@ void daObjMarm_c::calcHimo() {
     }
 }
 
-/* ############################################################################################## */
-/* 80591E18-80591E80 002B38 0068+00 4/4 0/0 0/0 .text            seStart_MOVESTART__11daObjMarm_cFv */
 void daObjMarm_c::seStart_MOVESTART() {
     mDoAud_seStart(Z2SE_OBJ_MAGNEARM_MOVESTART, &mSeMarmPos, 0, 0);
 }
 
-/* 80591E80-80591EE8 002BA0 0068+00 4/4 0/0 0/0 .text            seStartLevel_MOVE__11daObjMarm_cFv */
 void daObjMarm_c::seStartLevel_MOVE() {
     mDoAud_seStartLevel(Z2SE_OBJ_MAGNEARM_MOVE, &mSeMarmPos, 0, 0);
 }
 
-/* 80591EE8-80591F50 002C08 0068+00 4/4 0/0 0/0 .text            seStart_STOP__11daObjMarm_cFv */
 void daObjMarm_c::seStart_STOP() {
     mDoAud_seStart(Z2SE_OBJ_MAGNEARM_STOP, &mSeMarmPos, 0, 0);
 }
 
-/* 80591F50-80591FB8 002C70 0068+00 3/3 0/0 0/0 .text            seStartLevel_UP__11daObjMarm_cFv */
 void daObjMarm_c::seStartLevel_UP() {
     mDoAud_seStartLevel(Z2SE_OBJ_MAGNEARM_UP, &mSeMarmLiftPos, 0, 0);
 }
 
-/* 80591FB8-80592020 002CD8 0068+00 3/3 0/0 0/0 .text            seStartLevel_DOWN__11daObjMarm_cFv */
 void daObjMarm_c::seStartLevel_DOWN() {
     mDoAud_seStartLevel(Z2SE_OBJ_MAGNEARM_DOWN, &mSeMarmLiftPos, 0, 0);
 }
 
-/* 80592020-80592088 002D40 0068+00 4/4 0/0 0/0 .text            seStart_SWING__11daObjMarm_cFv */
 void daObjMarm_c::seStart_SWING() {
     mDoAud_seStart(Z2SE_OBJ_MAGNEARM_SWING, &mSeMarmSwingPos, 0, 0);
 }
 
-/* ############################################################################################## */
-/* 80592088-805923C4 002DA8 033C+00 1/0 0/0 0/0 .text            Draw__11daObjMarm_cFv */
 int daObjMarm_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr);
@@ -1155,12 +1055,10 @@ int daObjMarm_c::Draw() {
     return 1;
 }
 
-/* 805923C4-805923C8 0030E4 0004+00 1/1 0/0 0/0 .text            debugDraw__11daObjMarm_cFv */
 void daObjMarm_c::debugDraw() {
     /* empty function */
 }
 
-/* 805923C8-80592468 0030E8 00A0+00 1/0 0/0 0/0 .text            Delete__11daObjMarm_cFv */
 int daObjMarm_c::Delete() {
     if (mpBgW1 != NULL && mpBgW1->ChkUsed() != NULL) {
         dComIfG_Bgsp().Release(mpBgW1);
@@ -1175,30 +1073,23 @@ int daObjMarm_c::Delete() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80592468-80592594 003188 012C+00 1/0 0/0 0/0 .text daObjMarm_create1st__FP11daObjMarm_c */
 static int daObjMarm_create1st(daObjMarm_c* i_this) {
     fopAcM_ct(i_this, daObjMarm_c);
     return i_this->create1st();
 }
 
-/* 80592760-80592780 003480 0020+00 1/0 0/0 0/0 .text daObjMarm_MoveBGDelete__FP11daObjMarm_c */
 static int daObjMarm_MoveBGDelete(daObjMarm_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80592780-805927A0 0034A0 0020+00 1/0 0/0 0/0 .text daObjMarm_MoveBGExecute__FP11daObjMarm_c */
 static int daObjMarm_MoveBGExecute(daObjMarm_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 805927A0-805927CC 0034C0 002C+00 1/0 0/0 0/0 .text daObjMarm_MoveBGDraw__FP11daObjMarm_c */
 static int daObjMarm_MoveBGDraw(daObjMarm_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80592C6C-80592C8C -00001 0020+00 1/0 0/0 0/0 .data            daObjMarm_METHODS */
 static actor_method_class daObjMarm_METHODS = {
     (process_method_func)daObjMarm_create1st,
     (process_method_func)daObjMarm_MoveBGDelete,
@@ -1207,7 +1098,6 @@ static actor_method_class daObjMarm_METHODS = {
     (process_method_func)daObjMarm_MoveBGDraw,
 };
 
-/* 80592C8C-80592CBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MagneArm */
 extern actor_process_profile_definition g_profile_Obj_MagneArm = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp
index cd8346c06b..8ab96846e8 100644
--- a/src/d/actor/d_a_obj_maki.cpp
+++ b/src/d/actor/d_a_obj_maki.cpp
@@ -21,13 +21,10 @@
 #include "m_Do/m_Do_mtx.h"
 #include "types.h"
 
-/* 80C8FE0C-80C8FE24 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__16daObj_Maki_HIO_cFv */
 daObj_Maki_HIO_c::daObj_Maki_HIO_c() {
     field_0x4 = -1;
 }
 
-/* 80C8FE24-80C8FEDC 000104 00B8+00 1/0 0/0 0/0 .text            daObj_Maki_Draw__FP14obj_maki_class
- */
 int daObj_Maki_Draw(obj_maki_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
 
@@ -42,7 +39,6 @@ int daObj_Maki_Draw(obj_maki_class* i_this) {
     return 1;
 }
 
-/* 80C8FEDC-80C90378 0001BC 049C+00 2/1 0/0 0/0 .text daObj_Maki_Execute__FP14obj_maki_class */
 int daObj_Maki_Execute(obj_maki_class* i_this) {
     for (int i = 0; i < 2; i++) {
         if (i_this->field_0x580[i] != 0) {
@@ -131,14 +127,12 @@ int daObj_Maki_Execute(obj_maki_class* i_this) {
     return 1;
 }
 
-/* 80C90378-80C90380 000658 0008+00 1/0 0/0 0/0 .text daObj_Maki_IsDelete__FP14obj_maki_class */
 int daObj_Maki_IsDelete(obj_maki_class* i_this) {
     return true;
 }
 
 u8 lbl_567_bss_8;
 
-/* 80C90380-80C903F0 000660 0070+00 1/0 0/0 0/0 .text daObj_Maki_Delete__FP14obj_maki_class */
 int daObj_Maki_Delete(obj_maki_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_maki");
     if (i_this->field_0x72c != 0) {
@@ -152,7 +146,6 @@ int daObj_Maki_Delete(obj_maki_class* i_this) {
     return 1;
 }
 
-/* 80C903F0-80C90544 0006D0 0154+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 int useHeapInit(fopAc_ac_c* i_this) {
     obj_maki_class* a_this = (obj_maki_class*)i_this;
 
@@ -183,11 +176,8 @@ int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C90A60-80C90A68 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 daObj_Maki_HIO_c l_HIO;
 
-/* 80C9058C-80C9080C 00086C 0280+00 1/0 0/0 0/0 .text            daObj_Maki_Create__FP10fopAc_ac_c
- */
 cPhs__Step daObj_Maki_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_maki_class);
     obj_maki_class* a_this = (obj_maki_class*)i_this;
@@ -246,14 +236,12 @@ cPhs__Step daObj_Maki_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80C909C4-80C909E4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Maki_Method */
 actor_method_class l_daObj_Maki_Method = {
     (process_method_func)daObj_Maki_Create,  (process_method_func)daObj_Maki_Delete,
     (process_method_func)daObj_Maki_Execute, (process_method_func)daObj_Maki_IsDelete,
     (process_method_func)daObj_Maki_Draw,
 };
 
-/* 80C909E4-80C90A14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_MAKI */
 extern actor_process_profile_definition g_profile_OBJ_MAKI = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp
index 8b3c6c2f16..629ef7b826 100644
--- a/src/d/actor/d_a_obj_master_sword.cpp
+++ b/src/d/actor/d_a_obj_master_sword.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_meter2_info.h"
 
-/* 80C91940-80C91944 000000 0004+00 2/2 0/0 0/0 .rodata          mAttr__18daObjMasterSword_c */
 daObjMasterSword_Attr_c const daObjMasterSword_c::mAttr = {1.0f};
 
 void daObjMasterSword_c::initBaseMtx() {
@@ -25,7 +24,6 @@ void daObjMasterSword_c::initBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C90AF8-80C90B50 000078 0058+00 1/0 0/0 0/0 .text            initWait__18daObjMasterSword_cFv */
 void daObjMasterSword_c::initWait() {
     cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     current.pos = home.pos;
@@ -33,7 +31,6 @@ void daObjMasterSword_c::initWait() {
     shape_angle = home.angle;
 }
 
-/* 80C90B50-80C90C50 0000D0 0100+00 1/0 0/0 0/0 .text            executeWait__18daObjMasterSword_cFv */
 void daObjMasterSword_c::executeWait() {
     if (daPy_getPlayerActorClass()->checkPriActorOwn(this)) {
         for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) {
@@ -53,15 +50,12 @@ void daObjMasterSword_c::executeWait() {
     }
 }
 
-/* 80C90C50-80C90C70 0001D0 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__18daObjMasterSword_cFP10fopAc_ac_c */
 int daObjMasterSword_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObjMasterSword_c*>(i_this)->CreateHeap();
 }
 
-/* 80C9199C-80C919A0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "MstrSword";
 
-/* 80C90C70-80C90D98 0001F0 0128+00 1/1 0/0 0/0 .text            CreateHeap__18daObjMasterSword_cFv */
 int daObjMasterSword_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
@@ -82,7 +76,6 @@ int daObjMasterSword_c::CreateHeap() {
     return 1;
 }
 
-/* 80C90D98-80C90DB8 000318 0020+00 1/0 0/0 0/0 .text daObjMasterSword_Create__FP10fopAc_ac_c */
 static int daObjMasterSword_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjMasterSword_c*>(i_this)->create();
 }
@@ -121,7 +114,6 @@ void daObjMasterSword_c::setAction(daObjMasterSword_c::Mode_e i_mode) {
     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());
     initCollision();
@@ -148,7 +140,6 @@ 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);
 
@@ -168,13 +159,11 @@ int daObjMasterSword_c::create() {
     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();
     return 1;
 }
 
-/* 80C91448-80C915E8 0009C8 01A0+00 1/1 0/0 0/0 .text            __dt__18daObjMasterSword_cFv */
 daObjMasterSword_c::~daObjMasterSword_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
@@ -207,19 +196,14 @@ int daObjMasterSword_c::execute() {
     return 1;
 }
 
-/* 80C915E8-80C916F4 000B68 010C+00 1/0 0/0 0/0 .text
- * daObjMasterSword_Execute__FP18daObjMasterSword_c             */
 static int daObjMasterSword_Execute(daObjMasterSword_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C916F4-80C91714 000C74 0020+00 1/0 0/0 0/0 .text
- * daObjMasterSword_Draw__FP18daObjMasterSword_c                */
 static int daObjMasterSword_Draw(daObjMasterSword_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C91714-80C91894 000C94 0180+00 1/1 0/0 0/0 .text            draw__18daObjMasterSword_cFv */
 int daObjMasterSword_c::draw() {
     if (dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[73])) {
         return 1;
@@ -246,13 +230,10 @@ int daObjMasterSword_c::draw() {
     return 1;
 }
 
-/* 80C91894-80C9189C 000E14 0008+00 1/0 0/0 0/0 .text
- * daObjMasterSword_IsDelete__FP18daObjMasterSword_c            */
 static int daObjMasterSword_IsDelete(daObjMasterSword_c* param_0) {
     return 1;
 }
 
-/* 80C91A14-80C91A34 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMasterSword_Method */
 static actor_method_class l_daObjMasterSword_Method = {
     (process_method_func)daObjMasterSword_Create,
     (process_method_func)daObjMasterSword_Delete,
@@ -261,7 +242,6 @@ static actor_method_class l_daObjMasterSword_Method = {
     (process_method_func)daObjMasterSword_Draw,
 };
 
-/* 80C91A34-80C91A64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MasterSword */
 extern actor_process_profile_definition g_profile_Obj_MasterSword = {
   fpcLy_CURRENT_e,            // mLayerID
   7,                          // mListID
diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp
index d9291f41e7..0cdbd235fa 100644
--- a/src/d/actor/d_a_obj_mato.cpp
+++ b/src/d/actor/d_a_obj_mato.cpp
@@ -10,8 +10,6 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80C91B58-80C91C1C 000078 00C4+00 5/5 0/0 0/0 .text
- * setAction__11daObjMATO_cFM11daObjMATO_cFPCvPvi_vi            */
 void daObjMATO_c::setAction(void (daObjMATO_c::*i_action)(int), int i_no) {
     if (mData[i_no].action != NULL) {
         mData[i_no].mode = -1;
@@ -24,7 +22,6 @@ void daObjMATO_c::setAction(void (daObjMATO_c::*i_action)(int), int i_no) {
     (this->*mData[i_no].action)(i_no);
 }
 
-/* 80C92C50-80C92C6C 000000 001C+00 6/6 0/0 0/0 .rodata          l_B_ling_bmd_table */
 static const int l_B_ling_bmd_table[] = {
     4,
     3,
@@ -54,26 +51,21 @@ int daObjMATO_c::CreateHeap() {
     return 1;
 }
 
-/* 80C91C1C-80C91D04 00013C 00E8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daObjMATO_c*)i_this)->CreateHeap();
 }
 
-/* 80C91D04-80C91D24 000224 0020+00 1/0 0/0 0/0 .text            daObjMATO_Create__FP10fopAc_ac_c */
 static int daObjMATO_Create(fopAc_ac_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return ((daObjMATO_c*)i_this)->create();
 }
 
-/* 80C91D24-80C91D48 000244 0024+00 1/0 0/0 0/0 .text            daObjMATO_Delete__FP11daObjMATO_c
- */
 static int daObjMATO_Delete(daObjMATO_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->_delete();
     return 1;
 }
 
-/* 80C91D48-80C91DE4 000268 009C+00 1/1 0/0 0/0 .text            action__11daObjMATO_cFv */
 void daObjMATO_c::action() {
     int i;
     for (i = 0; i < mpPath->m_num; i++) {
@@ -86,7 +78,6 @@ void daObjMATO_c::action() {
 }
 
 namespace {
-/* 80C92CDC-80C92D20 000000 0044+00 1/1 0/0 0/0 .data cc_cyl_src__26@unnamed@d_a_obj_mato_cpp@ */
 static dCcD_SrcCyl cc_cyl_src = {
     {
         {0, {{0, 0, 0}, {0, 0}, 0x119}},
@@ -102,7 +93,6 @@ static dCcD_SrcCyl cc_cyl_src = {
 };
 }
 
-/* 80C91DE4-80C91ECC 000304 00E8+00 1/1 0/0 0/0 .text            hit_check__11daObjMATO_cFv */
 void daObjMATO_c::hit_check() {
     if (field_0x39f6 != 0) {
         for (int i = 0; i < mpPath->m_num; i++) {
@@ -121,7 +111,6 @@ void daObjMATO_c::hit_check() {
     }
 }
 
-/* 80C91ECC-80C91F74 0003EC 00A8+00 2/0 0/0 0/0 .text            start_wait__11daObjMATO_cFi */
 void daObjMATO_c::start_wait(int i_no) {
     if (mData[i_no].mode == 0) {
         mData[i_no].is_hit = FALSE;
@@ -133,7 +122,6 @@ void daObjMATO_c::start_wait(int i_no) {
     }
 }
 
-/* 80C91F74-80C92044 000494 00D0+00 1/0 0/0 0/0 .text            wait__11daObjMATO_cFi */
 void daObjMATO_c::wait(int i_no) {
     if (mData[i_no].mode == 0) {
         mData[i_no].mode++;
@@ -148,7 +136,6 @@ void daObjMATO_c::wait(int i_no) {
     }
 }
 
-/* 80C92C78-80C92C94 000028 001C+00 0/1 0/0 0/0 .rodata          l_rupee_itemno_table */
 static const int l_rupee_itemno_table[] = {
     fpcNm_ITEM_GREEN_RUPEE,
     fpcNm_ITEM_BLUE_RUPEE,
@@ -159,7 +146,6 @@ static const int l_rupee_itemno_table[] = {
     fpcNm_ITEM_SILVER_RUPEE,
 };
 
-/* 80C92C94-80C92C9C 000044 0007+01 0/1 0/0 0/0 .rodata          l_rupee_count_table */
 static const u8 l_rupee_count_table[] = {
     1,
     5,
@@ -170,7 +156,6 @@ static const u8 l_rupee_count_table[] = {
     200,
 };
 
-/* 80C92C9C-80C92CB8 00004C 001C+00 0/1 0/0 0/0 .rodata          l_rupee_getse */
 static const u32 l_rupee_getse[] = {
     Z2SE_GREEN_LUPY_GET,
     Z2SE_BLUE_LUPY_GET,
@@ -181,7 +166,6 @@ static const u32 l_rupee_getse[] = {
     Z2SE_RED_LUPY_GET,
 };
 
-/* 80C92044-80C921A8 000564 0164+00 2/0 0/0 0/0 .text            disappear__11daObjMATO_cFi */
 void daObjMATO_c::disappear(int i_no) {
     if (mData[i_no].mode == 0) {
         mData[i_no].timer = 20;
@@ -211,7 +195,6 @@ void daObjMATO_c::disappear(int i_no) {
     }
 }
 
-/* 80C921A8-80C922AC 0006C8 0104+00 1/1 0/0 0/0 .text            getRupee__11daObjMATO_cFi */
 void daObjMATO_c::getRupee(int i_no) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz size(1.0f, 1.0f, 1.0f);
@@ -224,7 +207,6 @@ void daObjMATO_c::getRupee(int i_no) {
     mDoAud_seStart(l_rupee_getse[mData[i_no].type], NULL, 0, 0);
 }
 
-/* 80C922AC-80C92380 0007CC 00D4+00 1/1 0/0 0/0 .text            execute__11daObjMATO_cFv */
 int daObjMATO_c::execute() {
     u8 swbit = (fopAcM_GetParam(this) & 0xFF00) >> 8;
     if (swbit != 0xFF) {
@@ -247,7 +229,6 @@ int daObjMATO_c::execute() {
     return 1;
 }
 
-/* 80C92380-80C9243C 0008A0 00BC+00 1/1 0/0 0/0 .text            _delete__11daObjMATO_cFv */
 int daObjMATO_c::_delete() {
     if (mIsAddSimpleModel) {
         J3DModelData* a_pModelData[2];
@@ -262,7 +243,6 @@ int daObjMATO_c::_delete() {
     return 1;
 }
 
-/* 80C9243C-80C92584 00095C 0148+00 1/1 0/0 0/0 .text            setBaseMtx__11daObjMATO_cFv */
 void daObjMATO_c::setBaseMtx() {
     cXyz sp8;
     for (int i = 0; i < mpPath->m_num; i++) {
@@ -291,18 +271,14 @@ int daObjMATO_c::draw() {
     return 1;
 }
 
-/* 80C92584-80C92630 000AA4 00AC+00 1/0 0/0 0/0 .text            daObjMATO_Draw__FP11daObjMATO_c */
 static int daObjMATO_Draw(daObjMATO_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C92630-80C92650 000B50 0020+00 2/1 0/0 0/0 .text            daObjMATO_Execute__FP11daObjMATO_c
- */
 static int daObjMATO_Execute(daObjMATO_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C92650-80C927AC 000B70 015C+00 1/1 0/0 0/0 .text            mato_init__11daObjMATO_cFv */
 int daObjMATO_c::mato_init() {
     int rail_no = fopAcM_GetParam(this) & 0xFF;
     mpPath = dPath_GetRoomPath(rail_no, fopAcM_GetRoomNo(this));
@@ -339,7 +315,6 @@ int daObjMATO_c::mato_init() {
     return 1;
 }
 
-/* 80C927AC-80C92924 000CCC 0178+00 1/1 0/0 0/0 .text            create__11daObjMATO_cFv */
 int daObjMATO_c::create() {
     fopAcM_ct(this, daObjMATO_c);
 
@@ -384,13 +359,10 @@ int daObjMATO_c::create() {
     return phase_state;
 }
 
-/* 80C92BF8-80C92C00 001118 0008+00 1/0 0/0 0/0 .text            daObjMATO_IsDelete__FP11daObjMATO_c
- */
 static int daObjMATO_IsDelete(daObjMATO_c* i_this) {
     return 1;
 }
 
-/* 80C92D5C-80C92D7C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMATO_Method */
 static actor_method_class l_daObjMATO_Method = {
     (process_method_func)daObjMATO_Create,
     (process_method_func)daObjMATO_Delete,
@@ -399,7 +371,6 @@ static actor_method_class l_daObjMATO_Method = {
     (process_method_func)daObjMATO_Draw,
 };
 
-/* 80C92D7C-80C92DAC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Mato */
 extern actor_process_profile_definition g_profile_Obj_Mato = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp
index cbf48fea99..86241d83d1 100644
--- a/src/d/actor/d_a_obj_metalbox.cpp
+++ b/src/d/actor/d_a_obj_metalbox.cpp
@@ -6,18 +6,15 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_metalbox.h"
-#include "dol2asm.h"
 #include "d/d_com_inf_game.h"
 
 static char const* l_arcName = "L_mbox_00";
 
-/* 80592E98-80592ED4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjMBox_cFv */
 void daObjMBox_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80592ED4-80592F48 0000B4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjMBox_cFv */
 void daObjMBox_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -25,7 +22,6 @@ void daObjMBox_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::now, mBgMtx);
 }
 
-/* 80592F48-80592FD4 000128 008C+00 1/0 0/0 0/0 .text            Create__11daObjMBox_cFv */
 int daObjMBox_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -37,7 +33,6 @@ int daObjMBox_c::Create() {
     return 1;
 }
 
-/* 80592FD4-80593044 0001B4 0070+00 1/0 0/0 0/0 .text            CreateHeap__11daObjMBox_cFv */
 int daObjMBox_c::CreateHeap() {
     J3DModelData* objectRes = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
 
@@ -49,7 +44,6 @@ int daObjMBox_c::CreateHeap() {
     return 1;
 }
 
-/* 80593044-805931C4 000224 0180+00 1/1 0/0 0/0 .text            create__11daObjMBox_cFv */
 int daObjMBox_c::create() {
     fopAcM_ct(this, daObjMBox_c);
 
@@ -64,7 +58,6 @@ int daObjMBox_c::create() {
     return phase_state;
 }
 
-/* 805932C4-805932F0 0004A4 002C+00 1/0 0/0 0/0 .text            Execute__11daObjMBox_cFPPA3_A4_f */
 int daObjMBox_c::Execute(Mtx** param_0) {
     *param_0 = &mBgMtx;
     setBaseMtx();
@@ -72,7 +65,6 @@ int daObjMBox_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 805932F0-80593394 0004D0 00A4+00 1/0 0/0 0/0 .text            Draw__11daObjMBox_cFv */
 int daObjMBox_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -83,38 +75,29 @@ int daObjMBox_c::Draw() {
     return 1;
 }
 
-/* 80593394-805933C8 000574 0034+00 1/0 0/0 0/0 .text            Delete__11daObjMBox_cFv */
 int daObjMBox_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     
     return 1;
 }
 
-/* 805933C8-805933F4 0005A8 002C+00 1/0 0/0 0/0 .text            daObjMBox_Draw__FP11daObjMBox_c */
 static int daObjMBox_Draw(daObjMBox_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 805933F4-80593414 0005D4 0020+00 1/0 0/0 0/0 .text            daObjMBox_Execute__FP11daObjMBox_c
- */
 static int daObjMBox_Execute(daObjMBox_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80593414-80593434 0005F4 0020+00 1/0 0/0 0/0 .text            daObjMBox_Delete__FP11daObjMBox_c
- */
 static int daObjMBox_Delete(daObjMBox_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80593434-80593454 000614 0020+00 1/0 0/0 0/0 .text            daObjMBox_Create__FP10fopAc_ac_c */
 static int daObjMBox_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjMBox_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80593480-805934A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMBox_Method */
 static actor_method_class l_daObjMBox_Method = {
     (process_method_func)daObjMBox_Create,
     (process_method_func)daObjMBox_Delete,
@@ -123,7 +106,6 @@ static actor_method_class l_daObjMBox_Method = {
     (process_method_func)daObjMBox_Draw,
 };
 
-/* 805934A0-805934D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MetalBox */
 extern actor_process_profile_definition g_profile_Obj_MetalBox = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp
index 38b8d37b1c..923faa6e3c 100644
--- a/src/d/actor/d_a_obj_mgate.cpp
+++ b/src/d/actor/d_a_obj_mgate.cpp
@@ -11,19 +11,15 @@
 #include "d/d_lib.h"
 #include "d/d_procname.h"
 
-/* ############################################################################################## */
-/* 80593E48-80593E60 000000 0018+00 2/2 0/0 0/0 .rodata          l_key_offset */
 static Vec const l_key_offset[2] = {
     {205.0f, 180.0f, 0.0f},
     {230.0f, 180.0f, 0.0f},
 };
 
-/* 80593E60-80593E74 000018 0014+00 0/0 0/0 0/0 .rodata          l_col_offsetX */
 static f32 const l_col_offsetX[5] = {
     80.0f, 160.0f, 240.0f, 320.0f, 400.0f,
 };
 
-/* 80593E74-80593EA4 00002C 0030+00 0/1 0/0 0/0 .rodata          l_roll_crash_check_areaL */
 static Vec const l_roll_crash_check_areaL[4] = {
     {0.0f, 0.0f, -140.0f},
     {410.0f, 0.0f, -140.0f},
@@ -31,7 +27,6 @@ static Vec const l_roll_crash_check_areaL[4] = {
     {0.0f, 0.0f, 140.0f},
 };
 
-/* 80593EA4-80593ED4 00005C 0030+00 0/1 0/0 0/0 .rodata          l_roll_crash_check_areaL2 */
 static Vec const l_roll_crash_check_areaL2[4] = {
     {0.0f, 0.0f, -140.0f},
     {460.0f, 0.0f, -140.0f},
@@ -39,7 +34,6 @@ static Vec const l_roll_crash_check_areaL2[4] = {
     {0.0f, 0.0f, 140.0f},
 };
 
-/* 805935B8-80593630 000078 0078+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjMGate_cFv */
 void daObjMGate_c::initBaseMtx() {
     if (mpKeyModel != NULL) {
         mpKeyModel->setBaseScale(scale);
@@ -53,7 +47,6 @@ void daObjMGate_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80593630-80593760 0000F0 0130+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjMGate_cFv */
 void daObjMGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -73,7 +66,6 @@ void daObjMGate_c::setBaseMtx() {
     }
 }
 
-/* 80593760-805937AC 000220 004C+00 1/0 0/0 0/0 .text            Create__12daObjMGate_cFv */
 int daObjMGate_c::Create() {
     initBaseMtx();
 
@@ -82,31 +74,25 @@ int daObjMGate_c::Create() {
     return 1;
 }
 
-/* 80593F88-80593F90 -00001 0008+00 1/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {
     "M_IGate",
     "M_HGate",
 };
 
-/* 80593F90-80593F98 -00001 0008+00 0/1 0/0 0/0 .data            l_bmdName */
 static char* l_bmdName[] = {
     "M_IzumiGate.bmd",
     "M_HashiGate.bmd",
 };
 
-/* 80593F98-80593FA0 -00001 0008+00 0/1 0/0 0/0 .data            l_dzbName */
 static char* l_dzbName[] = {
     "M_IzumiGate.dzb",
     "M_HashiGate.dzb",
 };
 
-/* 80593FA0-80593FA4 -00001 0004+00 1/3 0/0 0/0 .data            l_keyArcName */
 static char* l_keyArcName = "M_GateKey";
 
-/* 80593FA4-80593FA8 -00001 0004+00 0/1 0/0 0/0 .data            l_keyBmdName */
 static char* l_keyBmdName = "M_IGateKey.bmd";
 
-/* 805937AC-8059388C 00026C 00E0+00 1/0 0/0 0/0 .text            CreateHeap__12daObjMGate_cFv */
 int daObjMGate_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmdName[mKind]);
@@ -126,7 +112,6 @@ int daObjMGate_c::CreateHeap() {
     return 1;
 }
 
-/* 8059388C-80593988 00034C 00FC+00 1/1 0/0 0/0 .text            create1st__12daObjMGate_cFv */
 int daObjMGate_c::create1st() {
     mKind = getKind();
     mType = getType();
@@ -150,8 +135,6 @@ int daObjMGate_c::create1st() {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 80593ED8-80593EDC 000090 0004+00 0/0 0/0 0/0 .rodata          @3752 */
 // unused but still left in?
 #pragma push
 #pragma force_active on
@@ -163,8 +146,6 @@ static u8 const lit_3752[4] = {
 };
 #pragma pop
 
-/* 80593988-80593C4C 000448 02C4+00 1/0 0/0 0/0 .text            Execute__12daObjMGate_cFPPA3_A4_f
- */
 int daObjMGate_c::Execute(Mtx** param_0) {
     daPy_py_c* player_p = dComIfGp_getLinkPlayer();
     mCounter++;
@@ -215,7 +196,6 @@ int daObjMGate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80593C4C-80593D18 00070C 00CC+00 1/0 0/0 0/0 .text            Draw__12daObjMGate_cFv */
 int daObjMGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -232,44 +212,35 @@ int daObjMGate_c::Draw() {
     return 1;
 }
 
-/* 80593D18-80593D74 0007D8 005C+00 1/0 0/0 0/0 .text            Delete__12daObjMGate_cFv */
 int daObjMGate_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mKind]);
     dComIfG_resDelete(&mKeyPhase, l_keyArcName);
     return 1;
 }
 
-/* 80593D74-80593DD4 000834 0060+00 1/0 0/0 0/0 .text daObjMGate_create1st__FP12daObjMGate_c */
 static int daObjMGate_create1st(daObjMGate_c* i_this) {
     fopAcM_ct(i_this, daObjMGate_c);
     return i_this->create1st();
 }
 
-/* 80593DD4-80593DF4 000894 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDelete__FP12daObjMGate_c */
 static int daObjMGate_MoveBGDelete(daObjMGate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80593DF4-80593E14 0008B4 0020+00 1/0 0/0 0/0 .text daObjMGate_MoveBGExecute__FP12daObjMGate_c
- */
 static int daObjMGate_MoveBGExecute(daObjMGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80593E14-80593E40 0008D4 002C+00 1/0 0/0 0/0 .text daObjMGate_MoveBGDraw__FP12daObjMGate_c */
 static int daObjMGate_MoveBGDraw(daObjMGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80593FA8-80593FC8 -00001 0020+00 1/0 0/0 0/0 .data            daObjMGate_METHODS */
 static actor_method_class daObjMGate_METHODS = {
     (process_method_func)daObjMGate_create1st,     (process_method_func)daObjMGate_MoveBGDelete,
     (process_method_func)daObjMGate_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjMGate_MoveBGDraw,
 };
 
-/* 80593FC8-80593FF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MGate */
 extern actor_process_profile_definition g_profile_Obj_MGate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp
index af48ccf6a7..bfff9235e6 100644
--- a/src/d/actor/d_a_obj_mhole.cpp
+++ b/src/d/actor/d_a_obj_mhole.cpp
@@ -11,29 +11,20 @@
 #include "d/d_debug_viewer.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* ############################################################################################## */
-/* 80C93D88-80C93D90 000000 0008+00 5/5 0/0 0/0 .rodata          l_bmd */
 static u32 const l_bmd[2] = {5, 5};
 
-/* 80C93D90-80C93D98 000008 0008+00 0/1 0/0 0/0 .rodata          l_brk */
 static u32 const l_brk[2] = {8, 8};
 
-/* 80C93D98-80C93DA0 000010 0008+00 0/1 0/0 0/0 .rodata          l_btk1 */
 static u32 const l_btk1[2] = {11, 11};
 
-/* 80C93DA0-80C93DA8 000018 0008+00 0/1 0/0 0/0 .rodata          l_btk2 */
 static u32 const l_btk2[2] = {12, 12};
 
-/* 80C93DA8-80C93DB0 000020 0008+00 0/1 0/0 0/0 .rodata          l_length */
 static f32 const l_length[2] = {2000.0f, 1000.0f};
 
-/* 80C93DB0-80C93DB8 000028 0008+00 0/1 0/0 0/0 .rodata          l_size */
 static f32 const l_size[2] = {150.0f, 370.0f};
 
-/* 80C93E14-80C93E1C -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName[2] = {"ef_MgnF_L", "ef_MgnF_S"};
 
-/* 80C93E1C-80C93E68 000008 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{AT_TYPE_40000, 0x0, 0x1d}, {0x0, 0x0}, 0x0}},  // mObj
@@ -71,7 +62,6 @@ void daObjMHole_HIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 80C92E58-80C92FB8 000078 0160+00 1/1 0/0 0/0 .text            searchParentSub__FPvPv */
 static void* searchParentSub(void* i_magLift, void* i_mhole) {
     daObjMHole_c* mhole = (daObjMHole_c*)i_mhole;
     fopAc_ac_c* mag_lift = (fopAc_ac_c*)i_magLift;
@@ -86,18 +76,15 @@ static void* searchParentSub(void* i_magLift, void* i_mhole) {
     return NULL;
 }
 
-/* 80C92FB8-80C92FD8 0001D8 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* p_actor) {
     return static_cast<daObjMHole_c*>(p_actor)->CreateHeap();
 }
 
-/* 80C92FD8-80C93014 0001F8 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjMHole_cFv */
 void daObjMHole_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C93014-80C9307C 000234 0068+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjMHole_cFv */
 void daObjMHole_c::setBaseMtx() {
 #ifdef DEBUG
     if (l_HIO.scale_adjust_on != 0) {
@@ -115,7 +102,6 @@ void daObjMHole_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C9307C-80C93198 00029C 011C+00 1/1 0/0 0/0 .text            Create__12daObjMHole_cFv */
 int daObjMHole_c::Create() {
     if (getType() != 0x2) {
         u8 sw_bit = getSwbit();
@@ -141,7 +127,6 @@ int daObjMHole_c::Create() {
     return 1;
 }
 
-/* 80C93198-80C93204 0003B8 006C+00 1/1 0/0 0/0 .text            checkParent__12daObjMHole_cFv */
 int daObjMHole_c::checkParent() {
     parentActorID = fopAcM_GetID(fpcM_Search(searchParentSub, this));
     if (parentActorID == fpcM_ERROR_PROCESS_ID_e) {
@@ -150,8 +135,6 @@ int daObjMHole_c::checkParent() {
     return TRUE;
 }
 
-/* ############################################################################################## */
-/* 80C93204-80C93498 000424 0294+00 1/1 0/0 0/0 .text            CreateHeap__12daObjMHole_cFv */
 int daObjMHole_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmd[mKind]);
     JUT_ASSERT(336, modelData != NULL);
@@ -198,7 +181,6 @@ int daObjMHole_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80C934E0-80C93660 000700 0180+00 1/1 0/0 0/0 .text            create__12daObjMHole_cFv */
 int daObjMHole_c::create() {
     fopAcM_ct(this, daObjMHole_c);
 
@@ -225,7 +207,6 @@ int daObjMHole_c::create() {
     return phase;
 }
 
-/* 80C936A8-80C93928 0008C8 0280+00 1/1 0/0 0/0 .text            execute__12daObjMHole_cFv */
 int daObjMHole_c::execute() {
     if (getType() == 0x1 && parentActorID != fpcM_ERROR_PROCESS_ID_e) {
         fopAc_ac_c* actor = fopAcM_SearchByID(parentActorID);
@@ -281,8 +262,6 @@ int daObjMHole_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80C93928-80C93A88 000B48 0160+00 1/1 0/0 0/0 .text            effectSet__12daObjMHole_cFv */
 void daObjMHole_c::effectSet() {
     static u16 const l_eff_id_L[4] = {0x86EF, 0x86F0, 0x86F1, 0x86F2};
     static u16 const l_eff_id_S[4] = {0x86F3, 0x86F4, 0x86F5, 0x86F6};
@@ -307,7 +286,6 @@ void daObjMHole_c::effectSet() {
     }
 }
 
-/* 80C93A88-80C93ADC 000CA8 0054+00 1/1 0/0 0/0 .text            effectEnd__12daObjMHole_cFv */
 void daObjMHole_c::effectEnd() {
     for (int i = 0; i < 4; i++) {
         if (mpEmitter[i] != NULL) {
@@ -318,8 +296,6 @@ void daObjMHole_c::effectEnd() {
     }
 }
 
-/* ############################################################################################## */
-/* 80C93ADC-80C93CAC 000CFC 01D0+00 1/1 0/0 0/0 .text            draw__12daObjMHole_cFv */
 int daObjMHole_c::draw() {
     g_env_light.settingTevStruct(0x0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -369,7 +345,6 @@ int daObjMHole_c::draw() {
     return 1;
 }
 
-/* 80C93CAC-80C93D00 000ECC 0054+00 1/1 0/0 0/0 .text            _delete__12daObjMHole_cFv */
 int daObjMHole_c::_delete() {
     effectEnd();
     mSound.deleteObject();
@@ -381,29 +356,24 @@ int daObjMHole_c::_delete() {
     return 1;
 }
 
-/* 80C93D00-80C93D20 000F20 0020+00 1/0 0/0 0/0 .text            daObjMHole_Draw__FP12daObjMHole_c */
 static int daObjMHole_Draw(daObjMHole_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C93D20-80C93D40 000F40 0020+00 1/0 0/0 0/0 .text daObjMHole_Execute__FP12daObjMHole_c */
 static int daObjMHole_Execute(daObjMHole_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C93D40-80C93D60 000F60 0020+00 1/0 0/0 0/0 .text            daObjMHole_Delete__FP12daObjMHole_c */
 static int daObjMHole_Delete(daObjMHole_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Hasu");
     return i_this->_delete();
 }
 
-/* 80C93D60-80C93D80 000F80 0020+00 1/0 0/0 0/0 .text            daObjMHole_Create__FP10fopAc_ac_c */
 static int daObjMHole_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daObjMHole_c,i_this, "MHole");
     return static_cast<daObjMHole_c*>(i_this)->create();
 }
 
-/* 80C93E68-80C93E88 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMHole_Method */
 static actor_method_class l_daObjMHole_Method = {
     (process_method_func)daObjMHole_Create,  
     (process_method_func)daObjMHole_Delete,
@@ -412,7 +382,6 @@ static actor_method_class l_daObjMHole_Method = {
     (process_method_func)daObjMHole_Draw,
 };
 
-/* 80C93E88-80C93EB8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MHole */
 extern actor_process_profile_definition g_profile_Obj_MHole = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp
index 644bdae0ce..2258318bc6 100644
--- a/src/d/actor/d_a_obj_mie.cpp
+++ b/src/d/actor/d_a_obj_mie.cpp
@@ -14,23 +14,19 @@
 #include "SSystem/SComponent/c_counter.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 80C95B88-80C95B90 000000 0008+00 3/3 0/0 0/0 .data            l_bmdData */
 static u32 l_bmdData[1][2] = {
     23, 1,
 };
 
-/* 80C95B90-80C95B98 -00001 0008+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "pouyaA",
 };
 
-/* 80C95AAC-80C95AD8 000000 002C+00 3/3 0/0 0/0 .rodata          m__17daObj_Mie_Param_c */
 daObj_Mie_HIOParam const daObj_Mie_Param_c::m = {
     0.0f, -4.0f, 1.0f, 100.0f, 255.0f, 20.0f, 10.0f, 14.0f, 37.0f, 50.0f, 18.0f,
 };
 
-/* 80C95AD8-80C95B08 00002C 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 static dCcD_SrcGObjInf const l_ccDObjData = 
 {
         {0x0, {{0x0, 0x0, 0}, {0xD8FBFDFF, 0x1F}, 0x79}}, // mObj
@@ -39,7 +35,6 @@ static dCcD_SrcGObjInf const l_ccDObjData =
         {0x0}, // mGObjCo
 };
 
-/* 80C95B98-80C95BDC 000010 0044+00 1/1 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     l_ccDObjData, // mObjInf
     {
@@ -77,7 +72,6 @@ void daObj_Mie_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80C93FCC-80C941C8 0000EC 01FC+00 1/0 0/0 0/0 .text            __dt__11daObj_Mie_cFv */
 daObj_Mie_c::~daObj_Mie_c() {
     OS_REPORT("|%06d:%x|daObj_Mie_c -> デストラクト\n", g_Counter.mCounter0, this);
 
@@ -90,7 +84,6 @@ daObj_Mie_c::~daObj_Mie_c() {
     dComIfG_resDelete(&mPhase, l_resNameList[l_bmdData[mType][1]]);
 }
 
-/* 80C941C8-80C94398 0002E8 01D0+00 1/1 0/0 0/0 .text            create__11daObj_Mie_cFv */
 int daObj_Mie_c::create() {
     fopAcM_ct(this, daObj_Mie_c);
     mType = getType();
@@ -112,7 +105,6 @@ int daObj_Mie_c::create() {
     return rv;
 }
 
-/* 80C945E8-80C94674 000708 008C+00 1/1 0/0 0/0 .text            CreateHeap__11daObj_Mie_cFv */
 int daObj_Mie_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[mType][1]],
@@ -122,14 +114,12 @@ int daObj_Mie_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80C94674-80C946A8 000794 0034+00 1/1 0/0 0/0 .text            Delete__11daObj_Mie_cFv */
 int daObj_Mie_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_Mie_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_Mie_c();
     return 1;
 }
 
-/* 80C946A8-80C95140 0007C8 0A98+00 1/1 0/0 0/0 .text            Execute__11daObj_Mie_cFv */
 int daObj_Mie_c::Execute() {
     BOOL local_a8 = fopAcM_checkCarryNow(this) != 0;
     s16 local_b6;
@@ -360,7 +350,6 @@ int daObj_Mie_c::Execute() {
     return 1;
 }
 
-/* 80C95140-80C95290 001260 0150+00 1/1 0/0 0/0 .text            Draw__11daObj_Mie_cFv */
 int daObj_Mie_c::Draw() {
     if (field_0xa45 == 0) {
         J3DModelData* modelData = mModel->getModelData();
@@ -384,13 +373,10 @@ int daObj_Mie_c::Draw() {
     return 1;
 }
 
-/* 80C952D8-80C952F8 0013F8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daObj_Mie_cFP10fopAc_ac_c              */
 int daObj_Mie_c::createHeapCallBack(fopAc_ac_c* a_this) {
     return ((daObj_Mie_c*)a_this)->CreateHeap();
 }
 
-/* 80C952F8-80C9536C 001418 0074+00 1/1 0/0 0/0 .text            srchPouyaa__11daObj_Mie_cFPvPv */
 void* daObj_Mie_c::srchPouyaa(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && param_1 != param_2 &&
         fopAcM_GetName(param_1) == PROC_NPC_POUYA &&
@@ -401,20 +387,17 @@ void* daObj_Mie_c::srchPouyaa(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80C9536C-80C953C8 00148C 005C+00 1/1 0/0 0/0 .text            setEnvTevColor__11daObj_Mie_cFv */
 void daObj_Mie_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80C953C8-80C9540C 0014E8 0044+00 1/1 0/0 0/0 .text            setRoomNo__11daObj_Mie_cFv */
 void daObj_Mie_c::setRoomNo() {
     s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStts.SetRoomId(roomId);
 }
 
-/* 80C9540C-80C954BC 00152C 00B0+00 1/1 0/0 0/0 .text            setMtx__11daObj_Mie_cFv */
 void daObj_Mie_c::setMtx() {
     daNpc_Pouya_c* pouya = NULL;
     if (field_0xa40 != 0) {
@@ -432,7 +415,6 @@ void daObj_Mie_c::setMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80C954BC-80C9555C 0015DC 00A0+00 1/1 0/0 0/0 .text            calcRollAngle__11daObj_Mie_cFsi */
 s16 daObj_Mie_c::calcRollAngle(s16 param_1, int param_2) {
     int r27 = 4;
     if (param_1 != 0) {
@@ -457,7 +439,6 @@ s16 daObj_Mie_c::calcRollAngle(s16 param_1, int param_2) {
     return 0;
 }
 
-/* 80C9555C-80C956EC 00167C 0190+00 1/1 0/0 0/0 .text            getWallAngle__11daObj_Mie_cFsPs */
 int daObj_Mie_c::getWallAngle(s16 param_1, s16* param_2) {
     cXyz cStack_50;
     cXyz acStack_40[2];
@@ -484,17 +465,14 @@ int daObj_Mie_c::getWallAngle(s16 param_1, s16* param_2) {
     return 1;
 }
 
-/* 80C956EC-80C95768 00180C 007C+00 1/1 0/0 0/0 .text            setSmokePrtcl__11daObj_Mie_cFv */
 void daObj_Mie_c::setSmokePrtcl() {
     fopAcM_effSmokeSet1(&field_0xa38, &field_0xa3c, &current.pos, NULL, 0.4f, &tevStr, 1);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa38);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa3c);
 }
 
-/* 80C95D1C-80C95D20 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Mie_Param_c l_HIO;
 
-/* 80C95768-80C95890 001888 0128+00 1/1 0/0 0/0 .text            setWaterPrtcl__11daObj_Mie_cFv */
 void daObj_Mie_c::setWaterPrtcl() {
     static u16 emttrId[4] = {
         0x01B8, 0x01B9, 0x01BA, 0x01BB,
@@ -508,40 +486,33 @@ void daObj_Mie_c::setWaterPrtcl() {
     }
 }
 
-/* 80C95890-80C958E0 0019B0 0050+00 1/1 0/0 0/0 .text            setHamonPrtcl__11daObj_Mie_cFv */
 void daObj_Mie_c::setHamonPrtcl() {
     cXyz cStack_18(current.pos.x, field_0xa04, current.pos.z);
     fopAcM_effHamonSet(&field_0xa30, &cStack_18, 0.7f, 0.05f);
 }
 
-/* 80C958E0-80C95900 001A00 0020+00 1/0 0/0 0/0 .text            daObj_Mie_Create__FPv */
 static int daObj_Mie_Create(void* a_this) {
     return ((daObj_Mie_c*)a_this)->create();
 }
 
-/* 80C95900-80C95920 001A20 0020+00 1/0 0/0 0/0 .text            daObj_Mie_Delete__FPv */
 static int daObj_Mie_Delete(void* a_this) {
     return ((daObj_Mie_c*)a_this)->Delete();
 }
 
-/* 80C95920-80C95940 001A40 0020+00 1/0 0/0 0/0 .text            daObj_Mie_Execute__FPv */
 static int daObj_Mie_Execute(void* a_this) {
     return ((daObj_Mie_c*)a_this)->Execute();
 }
 
-/* 80C95940-80C95960 001A60 0020+00 1/0 0/0 0/0 .text            daObj_Mie_Draw__FPv */
 static int daObj_Mie_Draw(void* a_this) {
     return ((daObj_Mie_c*)a_this)->Draw();
 }
 
-/* 80C95960-80C95968 001A80 0008+00 1/0 0/0 0/0 .text            daObj_Mie_IsDelete__FPv */
 static int daObj_Mie_IsDelete(void* a_this) {
     return 1;
 }
 
 AUDIO_INSTANCES
 
-/* 80C95BE4-80C95C04 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Mie_MethodTable */
 static actor_method_class daObj_Mie_MethodTable = {
     (process_method_func)daObj_Mie_Create,
     (process_method_func)daObj_Mie_Delete,
@@ -550,7 +521,6 @@ static actor_method_class daObj_Mie_MethodTable = {
     (process_method_func)daObj_Mie_Draw,
 };
 
-/* 80C95C04-80C95C34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_MIE */
 extern actor_process_profile_definition g_profile_OBJ_MIE = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp
index 4cc0b70ce7..c29220e154 100644
--- a/src/d/actor/d_a_obj_mirror_6pole.cpp
+++ b/src/d/actor/d_a_obj_mirror_6pole.cpp
@@ -9,11 +9,8 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80C9654C-80C96550 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "MR-6Pole";
 
-/* 80C96580-80C965B0 000054 0030+00 3/4 0/0 0/0 .data            ActionTable__18daObjMirror6Pole_c
- */
 const actionFunc daObjMirror6Pole_c::ActionTable[][2] = {
     {&daObjMirror6Pole_c::initWait, &daObjMirror6Pole_c::executeWait},
     {&daObjMirror6Pole_c::initDemo, &daObjMirror6Pole_c::executeDemo},
@@ -38,24 +35,18 @@ void daObjMirror6Pole_c::callExecute() {
     (this->*mAction[1])();
 }
 
-/* 80C95E18-80C95E2C 000078 0014+00 1/0 0/0 0/0 .text            initWait__18daObjMirror6Pole_cFv */
 void daObjMirror6Pole_c::initWait() {
     mpBck->setPlaySpeed(0.0f);
 }
 
-/* 80C95E2C-80C95E88 00008C 005C+00 1/0 0/0 0/0 .text            executeWait__18daObjMirror6Pole_cFv
- */
 void daObjMirror6Pole_c::executeWait() {
     if (dComIfGp_event_runCheck()) {
         setAction(MODE_DEMO_e);
     }
 }
 
-/* 80C95E88-80C95E8C 0000E8 0004+00 1/0 0/0 0/0 .text            initDemo__18daObjMirror6Pole_cFv */
 void daObjMirror6Pole_c::initDemo() {}
 
-/* 80C95E8C-80C95EFC 0000EC 0070+00 1/0 0/0 0/0 .text            executeDemo__18daObjMirror6Pole_cFv
- */
 void daObjMirror6Pole_c::executeDemo() {
     if (!dComIfGp_event_runCheck()) {
         setAction(MODE_WAIT_e);
@@ -64,8 +55,6 @@ void daObjMirror6Pole_c::executeDemo() {
     setBaseMtx();
 }
 
-/* 80C95EFC-80C95F50 00015C 0054+00 1/1 0/0 0/0 .text            setBaseMtx__18daObjMirror6Pole_cFv
- */
 void daObjMirror6Pole_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -84,15 +73,11 @@ void daObjMirror6Pole_c::create_init() {
     setAction(MODE_WAIT_e);
 }
 
-/* 80C95F50-80C95F70 0001B0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__18daObjMirror6Pole_cFP10fopAc_ac_c       */
 int daObjMirror6Pole_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daObjMirror6Pole_c* a_this = (daObjMirror6Pole_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 80C95F70-80C961D8 0001D0 0268+00 1/1 0/0 0/0 .text            CreateHeap__18daObjMirror6Pole_cFv
- */
 int daObjMirror6Pole_c::CreateHeap() {
     BOOL r26 = FALSE;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7);
@@ -134,7 +119,6 @@ int daObjMirror6Pole_c::create() {
     return phase;
 }
 
-/* 80C96220-80C96328 000480 0108+00 1/0 0/0 0/0 .text daObjMirror6Pole_Create__FP10fopAc_ac_c */
 static int daObjMirror6Pole_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daObjMirror6Pole_c, i_this, "Obj_Mirror6Pole");
     return static_cast<daObjMirror6Pole_c*>(i_this)->create();
@@ -144,8 +128,6 @@ daObjMirror6Pole_c::~daObjMirror6Pole_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C96328-80C96378 000588 0050+00 1/0 0/0 0/0 .text
- * daObjMirror6Pole_Delete__FP18daObjMirror6Pole_c              */
 static int daObjMirror6Pole_Delete(daObjMirror6Pole_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Obj_Mirror6Pole");
     i_this->~daObjMirror6Pole_c();
@@ -158,8 +140,6 @@ int daObjMirror6Pole_c::execute() {
     return 1;
 }
 
-/* 80C96378-80C963BC 0005D8 0044+00 1/0 0/0 0/0 .text
- * daObjMirror6Pole_Execute__FP18daObjMirror6Pole_c             */
 static int daObjMirror6Pole_Execute(daObjMirror6Pole_c* i_this) {
     return i_this->execute();
 }
@@ -178,26 +158,20 @@ int daObjMirror6Pole_c::draw() {
     return 1;
 }
 
-/* 80C963BC-80C9648C 00061C 00D0+00 1/0 0/0 0/0 .text
- * daObjMirror6Pole_Draw__FP18daObjMirror6Pole_c                */
 static int daObjMirror6Pole_Draw(daObjMirror6Pole_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C9648C-80C96494 0006EC 0008+00 1/0 0/0 0/0 .text
- * daObjMirror6Pole_IsDelete__FP18daObjMirror6Pole_c            */
 static int daObjMirror6Pole_IsDelete(daObjMirror6Pole_c* i_this) {
     return 1;
 }
 
-/* 80C965B0-80C965D0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMirror6Pole_Method */
 static actor_method_class l_daObjMirror6Pole_Method = {
     (process_method_func)daObjMirror6Pole_Create,  (process_method_func)daObjMirror6Pole_Delete,
     (process_method_func)daObjMirror6Pole_Execute, (process_method_func)daObjMirror6Pole_IsDelete,
     (process_method_func)daObjMirror6Pole_Draw,
 };
 
-/* 80C965D0-80C96600 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Mirror6Pole */
 extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp
index e9d9238e0e..5612a9ddc3 100644
--- a/src/d/actor/d_a_obj_mirror_chain.cpp
+++ b/src/d/actor/d_a_obj_mirror_chain.cpp
@@ -8,17 +8,14 @@
 #include "d/actor/d_a_obj_mirror_chain.h"
 #include "d/d_com_inf_game.h"
 
-/* 80C98080-80C98084 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName = "MR-Chain";
 
-/* 80C98138-80C98148 000000 0010+00 2/2 0/0 0/0 .bss             l_scissor */
 static u32 l_scissor[4];
 
 #if DEBUG
 static u8 l_begin;
 #endif
 
-/* 80C96698-80C96DAC 000078 0714+00 1/0 0/0 0/0 .text            draw__22dScissorBegin_packet_cFv */
 void dScissorBegin_packet_c::draw() {
     GXGetScissor(&l_scissor[0], &l_scissor[1], &l_scissor[2], &l_scissor[3]);
 
@@ -183,7 +180,6 @@ void dScissorBegin_packet_c::draw() {
     }
 }
 
-/* 80C96DE8-80C96E20 0007C8 0038+00 1/0 0/0 0/0 .text            draw__20dScissorEnd_packet_cFv */
 void dScissorEnd_packet_c::draw() {
     #if DEBUG
     JUT_ASSERT(246, l_begin);
@@ -193,13 +189,10 @@ void dScissorEnd_packet_c::draw() {
     GXSetScissor(l_scissor[0], l_scissor[1], l_scissor[2], l_scissor[3]);
 }
 
-/* 80C96E20-80C96E40 000800 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return ((daObjMirrorChain_c*)i_this)->createHeap();
 }
 
-/* 80C96E40-80C975A4 000820 0764+00 1/1 0/0 0/0 .text            createHeap__18daObjMirrorChain_cFv
- */
 int daObjMirrorChain_c::createHeap() {
     J3DModelData* modelData;
 
@@ -300,15 +293,11 @@ int daObjMirrorChain_c::createHeap() {
     return 1;
 }
 
-/* 80C975EC-80C97618 000FCC 002C+00 1/1 0/0 0/0 .text            initBaseMtx__18daObjMirrorChain_cFv
- */
 void daObjMirrorChain_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C97618-80C97698 000FF8 0080+00 1/1 0/0 0/0 .text            setBaseMtx__18daObjMirrorChain_cFv
- */
 void daObjMirrorChain_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -322,13 +311,10 @@ void daObjMirrorChain_c::setBaseMtx() {
     mpActiveBgW->Move();
 }
 
-/* 80C97698-80C976B8 001078 0020+00 1/0 0/0 0/0 .text
- * daObjMirrorChain_Draw__FP18daObjMirrorChain_c                */
 static int daObjMirrorChain_Draw(daObjMirrorChain_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C976B8-80C97968 001098 02B0+00 1/1 0/0 0/0 .text            draw__18daObjMirrorChain_cFv */
 int daObjMirrorChain_c::draw() {
     static const f32 SCISSOR_CENTER_X = 1799.2f;
     static const f32 SCISSOR_CENTER_Y = 4779.58f;
@@ -408,13 +394,10 @@ int daObjMirrorChain_c::draw() {
     return 1;
 }
 
-/* 80C97968-80C97988 001348 0020+00 1/0 0/0 0/0 .text
- * daObjMirrorChain_Execute__FP18daObjMirrorChain_c             */
 static int daObjMirrorChain_Execute(daObjMirrorChain_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C97988-80C97BA4 001368 021C+00 1/1 0/0 0/0 .text            execute__18daObjMirrorChain_cFv */
 int daObjMirrorChain_c::execute() {
     if (mpBckAnm != NULL) {
         mpBckAnm->play();
@@ -454,8 +437,6 @@ int daObjMirrorChain_c::execute() {
     return 1;
 }
 
-/* 80C97BA4-80C97BAC 001584 0008+00 1/0 0/0 0/0 .text
- * daObjMirrorChain_IsDelete__FP18daObjMirrorChain_c            */
 static int daObjMirrorChain_IsDelete(daObjMirrorChain_c* i_this) {
     return 1;
 }
@@ -472,8 +453,6 @@ daObjMirrorChain_c::~daObjMirrorChain_c() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
 }
 
-/* 80C97BAC-80C97CC4 00158C 0118+00 1/0 0/0 0/0 .text
- * daObjMirrorChain_Delete__FP18daObjMirrorChain_c              */
 static int daObjMirrorChain_Delete(daObjMirrorChain_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjMirrorChain_c();
@@ -512,13 +491,11 @@ cPhs__Step daObjMirrorChain_c::create() {
     return phase_state;
 }
 
-/* 80C97D24-80C97F3C 001704 0218+00 1/0 0/0 0/0 .text daObjMirrorChain_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjMirrorChain_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return ((daObjMirrorChain_c*)i_this)->create();
 }
 
-/* 80C980B4-80C980D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMirrorChain_Method */
 static actor_method_class l_daObjMirrorChain_Method = {
     (process_method_func)daObjMirrorChain_Create,
     (process_method_func)daObjMirrorChain_Delete,
@@ -527,7 +504,6 @@ static actor_method_class l_daObjMirrorChain_Method = {
     (process_method_func)daObjMirrorChain_Draw,
 };
 
-/* 80C980D4-80C98104 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MirrorChain */
 extern actor_process_profile_definition g_profile_Obj_MirrorChain = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp
index 683cff4ca4..3fcb48c5ed 100644
--- a/src/d/actor/d_a_obj_mirror_sand.cpp
+++ b/src/d/actor/d_a_obj_mirror_sand.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_mirror_sand.h"
 #include "d/d_procname.h"
 
-/* 80C989F0-80C989F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "MR-Sand";
 
 int daObjMirrorSand_c::createHeap() {
@@ -50,20 +49,15 @@ int daObjMirrorSand_c::createHeap() {
     return 1;
 }
 
-/* 80C981D8-80C984C0 000078 02E8+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjMirrorSand_c*>(i_this)->createHeap();
 }
 
-/* 80C98508-80C98534 0003A8 002C+00 1/1 0/0 0/0 .text            initBaseMtx__17daObjMirrorSand_cFv
- */
 void daObjMirrorSand_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     setBaseMtx();
 }
 
-/* 80C98534-80C98598 0003D4 0064+00 1/1 0/0 0/0 .text            setBaseMtx__17daObjMirrorSand_cFv
- */
 void daObjMirrorSand_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -87,8 +81,6 @@ int daObjMirrorSand_c::draw() {
     return 1;
 }
 
-/* 80C98598-80C98668 000438 00D0+00 1/0 0/0 0/0 .text daObjMirrorSand_Draw__FP17daObjMirrorSand_c
- */
 static int daObjMirrorSand_Draw(daObjMirrorSand_c* i_this) {
     return i_this->draw();
 }
@@ -106,14 +98,10 @@ int daObjMirrorSand_c::execute() {
     return 1;
 }
 
-/* 80C98668-80C98700 000508 0098+00 1/0 0/0 0/0 .text
- * daObjMirrorSand_Execute__FP17daObjMirrorSand_c               */
 static int daObjMirrorSand_Execute(daObjMirrorSand_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C98700-80C98708 0005A0 0008+00 1/0 0/0 0/0 .text
- * daObjMirrorSand_IsDelete__FP17daObjMirrorSand_c              */
 static int daObjMirrorSand_IsDelete(daObjMirrorSand_c* i_this) {
     return 1;
 }
@@ -130,8 +118,6 @@ daObjMirrorSand_c::~daObjMirrorSand_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80C98708-80C987B8 0005A8 00B0+00 1/0 0/0 0/0 .text
- * daObjMirrorSand_Delete__FP17daObjMirrorSand_c                */
 static int daObjMirrorSand_Delete(daObjMirrorSand_c* i_this) {
     i_this->~daObjMirrorSand_c();
     return 1;
@@ -173,19 +159,16 @@ int daObjMirrorSand_c::create() {
     return phase;
 }
 
-/* 80C98818-80C989D0 0006B8 01B8+00 1/0 0/0 0/0 .text daObjMirrorSand_Create__FP10fopAc_ac_c */
 static int daObjMirrorSand_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjMirrorSand_c*>(i_this)->create();
 }
 
-/* 80C989F4-80C98A14 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMirrorSand_Method */
 static actor_method_class l_daObjMirrorSand_Method = {
     (process_method_func)daObjMirrorSand_Create,  (process_method_func)daObjMirrorSand_Delete,
     (process_method_func)daObjMirrorSand_Execute, (process_method_func)daObjMirrorSand_IsDelete,
     (process_method_func)daObjMirrorSand_Draw,
 };
 
-/* 80C98A14-80C98A44 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MirrorSand */
 extern actor_process_profile_definition g_profile_Obj_MirrorSand = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp
index 72e55b8c05..b289b74685 100644
--- a/src/d/actor/d_a_obj_mirror_screw.cpp
+++ b/src/d/actor/d_a_obj_mirror_screw.cpp
@@ -9,10 +9,8 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80C997C0-80C997C4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName = "MR-Screw";
 
-/* 80C9975C-80C99774 000000 0018+00 3/3 0/0 0/0 .rodata          M_attr__18daObjMirrorScrew_c */
 daObjMirrorScrew_c::attr const daObjMirrorScrew_c::M_attr = {
     -2710.0f,  // mDownDist
     0.6f,      // mRotSpeedThreshold
@@ -22,8 +20,6 @@ daObjMirrorScrew_c::attr const daObjMirrorScrew_c::M_attr = {
     -3.375f,   // mDownSpeed
 };
 
-/* 80C997F4-80C99824 000054 0030+00 2/3 0/0 0/0 .data            ActionTable__18daObjMirrorScrew_c
- */
 daObjMirrorScrew_actionFunc daObjMirrorScrew_c::ActionTable[2][2] = {
     {
         &daObjMirrorScrew_c::initWait,
@@ -35,13 +31,10 @@ daObjMirrorScrew_actionFunc daObjMirrorScrew_c::ActionTable[2][2] = {
     },
 };
 
-/* 80C98AD8-80C98AE4 000078 000C+00 1/0 0/0 0/0 .text            initWait__18daObjMirrorScrew_cFv */
 void daObjMirrorScrew_c::initWait() {
     mSpinCount = 0;
 }
 
-/* 80C98AE4-80C98C00 000084 011C+00 1/0 0/0 0/0 .text            executeWait__18daObjMirrorScrew_cFv
- */
 void daObjMirrorScrew_c::executeWait() {
     if (mpSwSpinner != NULL) {
         if (mpSwSpinner->GetRotSpeedY() / (f32)0x1000 > M_attr.mRotSpeedThreshold) {
@@ -58,7 +51,6 @@ void daObjMirrorScrew_c::executeWait() {
     }
 }
 
-/* 80C98C00-80C98F04 0001A0 0304+00 1/0 0/0 0/0 .text            initDown__18daObjMirrorScrew_cFv */
 void daObjMirrorScrew_c::initDown() {
     speedF = 0.0f;
     mSpinCount = M_attr.mResetSpinCount;
@@ -82,8 +74,6 @@ void daObjMirrorScrew_c::initDown() {
     dComIfGp_particle_set(0x8AD1, &pos, &angle, NULL);
 }
 
-/* 80C98F04-80C99154 0004A4 0250+00 1/0 0/0 0/0 .text            executeDown__18daObjMirrorScrew_cFv
- */
 void daObjMirrorScrew_c::executeDown() {
     dComIfG_inf_c* gameinfo = &g_dComIfG_gameInfo;
     if (dComIfGp_event_runCheck()) {
@@ -137,26 +127,18 @@ void daObjMirrorScrew_c::executeDown() {
     }
 }
 
-/* 80C99154-80C99180 0006F4 002C+00 1/0 0/0 0/0 .text
- * daObjMirrorScrew_Draw__FP18daObjMirrorScrew_c                */
 static int daObjMirrorScrew_Draw(daObjMirrorScrew_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80C99180-80C991A0 000720 0020+00 1/0 0/0 0/0 .text
- * daObjMirrorScrew_Execute__FP18daObjMirrorScrew_c             */
 static int daObjMirrorScrew_Execute(daObjMirrorScrew_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C991A0-80C991A8 000740 0008+00 1/0 0/0 0/0 .text
- * daObjMirrorScrew_IsDelete__FP18daObjMirrorScrew_c            */
 static int daObjMirrorScrew_IsDelete(daObjMirrorScrew_c* i_this) {
     return 1;
 }
 
-/* 80C991A8-80C991CC 000748 0024+00 1/0 0/0 0/0 .text
- * daObjMirrorScrew_Delete__FP18daObjMirrorScrew_c              */
 static int daObjMirrorScrew_Delete(daObjMirrorScrew_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
@@ -184,14 +166,11 @@ cPhs__Step daObjMirrorScrew_c::create() {
     return step;
 }
 
-/* 80C991CC-80C992F4 00076C 0128+00 1/0 0/0 0/0 .text daObjMirrorScrew_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjMirrorScrew_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjMirrorScrew_c*>(i_this)->create();
 }
 
-/* 80C992F4-80C99364 000894 0070+00 1/0 0/0 0/0 .text            CreateHeap__18daObjMirrorScrew_cFv
- */
 int daObjMirrorScrew_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -210,7 +189,6 @@ void daObjMirrorScrew_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80C99364-80C99490 000904 012C+00 1/0 0/0 0/0 .text            Create__18daObjMirrorScrew_cFv */
 int daObjMirrorScrew_c::Create() {
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
     initBaseMtx();
@@ -230,7 +208,6 @@ int daObjMirrorScrew_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80C99490-80C99608 000A30 0178+00 1/0 0/0 0/0 .text Execute__18daObjMirrorScrew_cFPPA3_A4_f */
 int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) {
     if (mpSwSpinner == NULL) {
         mpSwSpinner = static_cast<daObjSwSpinner_c*>(fopAcM_SearchByName(PROC_Obj_SwSpinner));
@@ -262,7 +239,6 @@ int daObjMirrorScrew_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80C99608-80C996AC 000BA8 00A4+00 1/0 0/0 0/0 .text            Draw__18daObjMirrorScrew_cFv */
 int daObjMirrorScrew_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -273,20 +249,17 @@ int daObjMirrorScrew_c::Draw() {
     return 1;
 }
 
-/* 80C996AC-80C996E0 000C4C 0034+00 1/0 0/0 0/0 .text            Delete__18daObjMirrorScrew_cFv */
 int daObjMirrorScrew_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80C99824-80C99844 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMirrorScrew_Method */
 static actor_method_class l_daObjMirrorScrew_Method = {
     (process_method_func)daObjMirrorScrew_Create,  (process_method_func)daObjMirrorScrew_Delete,
     (process_method_func)daObjMirrorScrew_Execute, (process_method_func)daObjMirrorScrew_IsDelete,
     (process_method_func)daObjMirrorScrew_Draw,
 };
 
-/* 80C99844-80C99874 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MirrorScrew */
 extern actor_process_profile_definition g_profile_Obj_MirrorScrew = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp
index fb2fba8140..ea651144ae 100644
--- a/src/d/actor/d_a_obj_mirror_table.cpp
+++ b/src/d/actor/d_a_obj_mirror_table.cpp
@@ -11,21 +11,16 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80C9B2A4-80C9B2A8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName = "MR-Table";
 
-/* 80C9B244-80C9B250 000000 000C+00 3/3 0/0 0/0 .rodata          l_minPos */
 static Vec const l_minPos = {1672.183f, 4613.6299f, -21013.793f};
 
-/* 80C9B250-80C9B25C 00000C 000C+00 1/1 0/0 0/0 .rodata          l_maxPos */
 static Vec const l_maxPos = {1926.217f, 4613.6299f, -20866.969f};
 
-/* 80C99918-80C99938 000078 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjMirrorTable_c*>(i_this)->createHeap();
 }
 
-/* 80C99938-80C99F34 000098 05FC+00 1/1 0/0 0/0 .text            createHeap__18daObjMirrorTable_cFv */
 int daObjMirrorTable_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 21);
     JUT_ASSERT(105, modelData != NULL);
@@ -143,7 +138,6 @@ int daObjMirrorTable_c::createHeap() {
     return 1;
 }
 
-/* 80C99F7C-80C9A040 0006DC 00C4+00 1/1 0/0 0/0 .text            isSwitch__18daObjMirrorTable_cFv */
 bool daObjMirrorTable_c::isSwitch() {
     return fopAcM_isSwitch(this, getSwitchNo())
            /* dSv_event_flag_c::F_0361 - Arbiter's Grounds - Spun the spinning pillars */
@@ -206,29 +200,22 @@ void daObjMirrorTable_c::checkOnPanel() {
     }
 }
 
-/* 80C9A040-80C9A260 0007A0 0220+00 1/1 0/0 0/0 .text
- * rideCallBack1__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c             */
 static void rideCallBack1(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
     if (fopAcM_GetName(i_actor) == PROC_ALINK) {
         static_cast<daObjMirrorTable_c*>(i_this)->checkOnPanel();
     }
 }
 
-/* 80C9A260-80C9A278 0009C0 0018+00 1/1 0/0 0/0 .text
- * rideCallBack2__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c             */
 static void rideCallBack2(dBgW* i_bgW, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
     if (fopAcM_GetName(i_actor) == PROC_ALINK) {
         static_cast<daObjMirrorTable_c*>(i_this)->field_0x875 = 15;
     }
 }
 
-/* 80C9A278-80C9A298 0009D8 0020+00 1/0 0/0 0/0 .text
- * daObjMirrorTable_Draw__FP18daObjMirrorTable_c                */
 static int daObjMirrorTable_Draw(daObjMirrorTable_c* i_this) {
     return i_this->draw();
 }
 
-/* 80C9A298-80C9A4B0 0009F8 0218+00 1/1 0/0 0/0 .text            draw__18daObjMirrorTable_cFv */
 int daObjMirrorTable_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpTableModel, &tevStr);
@@ -311,13 +298,10 @@ void daObjMirrorTable_c::setBaseMtx() {
     }
 }
 
-/* 80C9A4B0-80C9A4D0 000C10 0020+00 1/0 0/0 0/0 .text
- * daObjMirrorTable_Execute__FP18daObjMirrorTable_c             */
 static int daObjMirrorTable_Execute(daObjMirrorTable_c* i_this) {
     return i_this->execute();
 }
 
-/* 80C9A4D0-80C9A9D4 000C30 0504+00 1/1 0/0 0/0 .text            execute__18daObjMirrorTable_cFv */
 int daObjMirrorTable_c::execute() {
     mpTableUpBckAnm->play();
     if (!mpTableUpBckAnm->isStop()) {
@@ -370,8 +354,6 @@ int daObjMirrorTable_c::execute() {
     return 1;
 }
 
-/* 80C9A9D4-80C9A9DC 001134 0008+00 1/0 0/0 0/0 .text
- * daObjMirrorTable_IsDelete__FP18daObjMirrorTable_c            */
 static int daObjMirrorTable_IsDelete(daObjMirrorTable_c* i_this) {
     return 1;
 }
@@ -389,19 +371,15 @@ daObjMirrorTable_c::~daObjMirrorTable_c() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
 }
 
-/* 80C9A9DC-80C9AAB0 00113C 00D4+00 1/0 0/0 0/0 .text
- * daObjMirrorTable_Delete__FP18daObjMirrorTable_c              */
 static int daObjMirrorTable_Delete(daObjMirrorTable_c* i_this) {
     i_this->~daObjMirrorTable_c();
     return 1;
 }
 
-/* 80C9AB10-80C9AB30 001270 0020+00 1/0 0/0 0/0 .text daObjMirrorTable_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjMirrorTable_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjMirrorTable_c*>(i_this)->create();
 }
 
-/* 80C9AB30-80C9ABFC 001290 00CC+00 1/1 0/0 0/0 .text            create__18daObjMirrorTable_cFv */
 cPhs__Step daObjMirrorTable_c::create() {
     fopAcM_ct(this, daObjMirrorTable_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -414,8 +392,6 @@ cPhs__Step daObjMirrorTable_c::create() {
     return step;
 }
 
-/* 80C9ABFC-80C9AFD0 00135C 03D4+00 1/1 0/0 0/0 .text            create_init__18daObjMirrorTable_cFv
- */
 void daObjMirrorTable_c::create_init() {
                                 /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */
     bool mirror_complete_flag = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
@@ -471,15 +447,12 @@ void daObjMirrorTable_c::create_init() {
     }
 }
 
-/* 80C9AFD0-80C9B220 001730 0250+00 1/1 0/0 0/0 .text            initBaseMtx__18daObjMirrorTable_cFv
- */
 void daObjMirrorTable_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpTableModel->getBaseTRMtx());
     mpTableUpBckAnm->play();
     setBaseMtx();
 }
 
-/* 80C9B2A8-80C9B2C8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjMirrorTable_Method */
 static actor_method_class l_daObjMirrorTable_Method = {
     (process_method_func)daObjMirrorTable_Create,
     (process_method_func)daObjMirrorTable_Delete,
@@ -488,7 +461,6 @@ static actor_method_class l_daObjMirrorTable_Method = {
     (process_method_func)daObjMirrorTable_Draw,
 };
 
-/* 80C9B2C8-80C9B2F8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MirrorTable */
 extern actor_process_profile_definition g_profile_Obj_MirrorTable = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 7f15c1265d..48b9976add 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -13,13 +13,11 @@
 #include "d/actor/d_a_obj_burnbox.h"
 #include "d/actor/d_a_obj_eff.h"
 
-/* 80480F28-80480F78 000000 0050+00 14/14 0/0 0/0 .rodata          M_lin5__Q212daObjMovebox5Bgc_c */
 const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin5[] = {
     {0.0f, 0.0f, 0.0f, 0.0f},   {-0.5f, -0.5f, 1.0f, 1.0f}, {0.5f, -0.5f, -1.0f, 1.0f},
     {0.5f, 0.5f, -1.0f, -1.0f}, {-0.5f, 0.5f, 1.0f, -1.0f},
 };
 
-/* 80480F78-804810E8 000050 0170+00 0/4 0/0 0/0 .rodata          M_lin20__Q212daObjMovebox5Bgc_c */
 const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
     {0.0f, 0.0f, 0.0f, 0.0f},    {-0.25f, -0.25f, 0.0f, 0.0f}, {-0.5f, -0.5f, 1.0f, 1.0f},
     {0.0f, -0.5f, -1.0f, 1.0f},  {0.0f, 0.0f, -1.0f, -1.0f},   {-0.5f, 0.0f, 1.0f, -1.0f},
@@ -31,7 +29,6 @@ const daObjMovebox::BgcSrc_c daObjMovebox::Bgc_c::M_lin20[] = {
     {-0.75f, 0.25f, 0.0f, 0.0f}, {-0.75f, -0.25f, 0.0f, 0.0f},
 };
 
-/* 8047DAEC-8047DBB0 0000EC 00C4+00 1/1 0/0 0/0 .text            __ct__Q212daObjMovebox5Bgc_cFv */
 daObjMovebox::Bgc_c::Bgc_c() {
     for (int i = 0; i < 23; i++) {
         field_0x0[i] = 0.0f;
@@ -45,12 +42,8 @@ daObjMovebox::Bgc_c::Bgc_c() {
     mState = STATE_0_e;
 }
 
-/* 804818D4-80482060 000054 078C+00 7/8 0/0 0/0 .bss             M_gnd_work__Q212daObjMovebox5Bgc_c
- */
 dBgS_ObjGndChk daObjMovebox::Bgc_c::M_gnd_work[23];
 
-/* 8047DBF0-8047DD88 0001F0 0198+00 1/1 0/0 0/0 .text
- * gnd_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cif */
 void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor,
                                   const daObjMovebox::BgcSrc_c* i_bgcSrc, int i_checkNum,
                                   f32 param_3) {
@@ -83,11 +76,8 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor,
     }
 }
 
-/* 8048206C-804820C0 0007EC 0054+00 1/2 0/0 0/0 .bss             M_wrt_work__Q212daObjMovebox5Bgc_c
- */
 dBgS_WtrChk daObjMovebox::Bgc_c::M_wrt_work;
 
-/* 8047DD88-8047DE58 000388 00D0+00 1/1 0/0 0/0 .text wrt_pos__Q212daObjMovebox5Bgc_cFRC4cXyz */
 void daObjMovebox::Bgc_c::wrt_pos(cXyz const& param_0) {
     cXyz sp28(param_0);
 
@@ -106,12 +96,8 @@ void daObjMovebox::Bgc_c::wrt_pos(cXyz const& param_0) {
     }
 }
 
-/* 804820CC-80482ADC 00084C 0A10+00 3/4 0/0 0/0 .bss             M_wall_work__Q212daObjMovebox5Bgc_c
- */
 dBgS_ObjLinChk daObjMovebox::Bgc_c::M_wall_work[23];
 
-/* 8047DE58-8047E134 000458 02DC+00 1/1 0/0 0/0 .text
- * wall_pos__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cisf */
 void daObjMovebox::Bgc_c::wall_pos(daObjMovebox::Act_c const* i_actor,
                                    daObjMovebox::BgcSrc_c const* i_bgcSrc, int i_num, s16 param_3,
                                    f32 param_4) {
@@ -165,8 +151,6 @@ void daObjMovebox::Bgc_c::wall_pos(daObjMovebox::Act_c const* i_actor,
     }
 }
 
-/* 8047E134-8047E2D4 000734 01A0+00 2/2 0/0 0/0 .text
- * proc_vertical__Q212daObjMovebox5Bgc_cFPQ212daObjMovebox5Act_c */
 void daObjMovebox::Bgc_c::proc_vertical(daObjMovebox::Act_c* i_actor) {
     State_e var_r29 = mState;
     mState = STATE_0_e;
@@ -207,8 +191,6 @@ void daObjMovebox::Bgc_c::proc_vertical(daObjMovebox::Act_c* i_actor) {
     }
 }
 
-/* 8047E2D4-8047E350 0008D4 007C+00 2/2 0/0 0/0 .text
- * chk_wall_pre__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis */
 bool daObjMovebox::Bgc_c::chk_wall_pre(daObjMovebox::Act_c const* i_actor,
                                        daObjMovebox::BgcSrc_c const* i_bgcSrc, int i_num,
                                        s16 param_3) {
@@ -216,8 +198,6 @@ bool daObjMovebox::Bgc_c::chk_wall_pre(daObjMovebox::Act_c const* i_actor,
     return field_0x178 >= 0;
 }
 
-/* 8047E350-8047E5A0 000950 0250+00 1/1 0/0 0/0 .text
- * chk_wall_touch__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cs */
 bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor,
                                          daObjMovebox::BgcSrc_c const* i_bgcSrc, s16 param_2) {
     static dBgS_ObjLinChk touch_work;
@@ -257,8 +237,6 @@ bool daObjMovebox::Bgc_c::chk_wall_touch(daObjMovebox::Act_c const* i_actor,
     return dComIfG_Bgsp().LineCross(&touch_work);
 }
 
-/* 8047E5A0-8047E628 000BA0 0088+00 1/1 0/0 0/0 .text
- * chk_wall_touch2__Q212daObjMovebox5Bgc_cFPCQ212daObjMovebox5Act_cPCQ212daObjMovebox8BgcSrc_cis */
 bool daObjMovebox::Bgc_c::chk_wall_touch2(daObjMovebox::Act_c const* i_actor,
                                           daObjMovebox::BgcSrc_c const* i_bgcSrc, int i_num,
                                           s16 param_3) {
@@ -273,14 +251,10 @@ bool daObjMovebox::Bgc_c::chk_wall_touch2(daObjMovebox::Act_c const* i_actor,
     return chk;
 }
 
-/* 8047E628-8047E650 000C28 0028+00 4/4 0/0 0/0 .text prm_get_swSave1__Q212daObjMovebox5Act_cCFv
- */
 int daObjMovebox::Act_c::prm_get_swSave1() const {
     return prm_get_swSave();
 }
 
-/* 8047E650-8047E680 000C50 0030+00 1/1 0/0 0/0 .text            prmZ_init__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::prmZ_init() {
     if (!field_0x900) {
         field_0x900 = 1;
@@ -297,8 +271,6 @@ void daObjMovebox::Act_c::prmZ_init() {
     }
 }
 
-/* 8047E680-8047E6B0 000C80 0030+00 1/1 0/0 0/0 .text            prmX_init__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::prmX_init() {
     if (!field_0x901) {
         mPrmX = home.angle.x;
@@ -310,14 +282,10 @@ void daObjMovebox::Act_c::prmX_init() {
     shape_angle.x = 0;
 }
 
-/* 80481104-80481124 -00001 0020+00 3/3 0/0 0/0 .rodata          M_arcname__Q212daObjMovebox5Act_c
- */
 const char* const daObjMovebox::Act_c::M_arcname[8] = {
     "Kkiba_00", "Osiblk", "H_Box20", "A_SMBlock", "P_Lv4blk", "P_Lv4blk2", "H_OsiHaka", "dummy4",
 };
 
-/* 80481124-80481168 0001FC 0044+00 0/1 0/0 0/0 .rodata          M_cyl_src__Q212daObjMovebox5Act_c
- */
 const dCcD_SrcCyl daObjMovebox::Act_c::M_cyl_src = {
     {
         0,
@@ -333,7 +301,6 @@ const dCcD_SrcCyl daObjMovebox::Act_c::M_cyl_src = {
     }  // mCyl
 };
 
-/* 80481168-80481668 000240 0500+00 6/18 0/0 0/0 .rodata          M_attr__Q212daObjMovebox5Act_c */
 const daObjMovebox::Hio_c::Attr_c daObjMovebox::Act_c::M_attr[8] = {
     {
         0x6,     0xE,     0xA,     0x6,           0xE,    0xA,           75.0f,  90.0f,   -3.0f,
@@ -399,13 +366,10 @@ const daObjMovebox::Hio_c::Attr_c daObjMovebox::Act_c::M_attr[8] = {
     },
 };
 
-/* 8047E6B0-8047E6C8 000CB0 0018+00 5/5 0/0 0/0 .text            attr__Q212daObjMovebox5Act_cCFv */
 const daObjMovebox::Hio_c::Attr_c& daObjMovebox::Act_c::attr() const {
     return M_attr[mType];
 }
 
-/* 8047E6C8-8047E7B0 000CC8 00E8+00 2/2 0/0 0/0 .text            set_mtx__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::set_mtx() {
     bool var_r29 = field_0x5ac == 2;
 
@@ -433,8 +397,6 @@ void daObjMovebox::Act_c::set_mtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 8047E7B0-8047E7F4 000DB0 0044+00 1/1 0/0 0/0 .text            init_mtx__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::init_mtx() {
     if (mpModel != NULL) {
         mpModel->setBaseScale(scale);
@@ -443,8 +405,6 @@ void daObjMovebox::Act_c::init_mtx() {
     set_mtx();
 }
 
-/* 8047E7F4-8047E92C 000DF4 0138+00 1/1 0/0 0/0 .text            path_init__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::path_init() {
     int path_id = prmZ_get_pathId();
     int sw1 = prm_get_swSave1();
@@ -470,8 +430,6 @@ void daObjMovebox::Act_c::path_init() {
     }
 }
 
-/* 8047E92C-8047EB48 000F2C 021C+00 1/1 0/0 0/0 .text            path_save__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::path_save() {
     int path_id = prmZ_get_pathId();
     int sw1 = prm_get_swSave1();
@@ -529,7 +487,6 @@ void daObjMovebox::Act_c::path_save() {
     }
 }
 
-/* 8047EB48-8047EBEC 001148 00A4+00 1/0 0/0 0/0 .text CreateHeap__Q212daObjMovebox5Act_cFv */
 int daObjMovebox::Act_c::CreateHeap() {
     BOOL var_r29 = true;
 
@@ -547,8 +504,6 @@ int daObjMovebox::Act_c::CreateHeap() {
     return var_r29;
 }
 
-/* 8047EBEC-8047ED10 0011EC 0124+00 1/1 0/0 0/0 .text
- * RideCallBack__Q212daObjMovebox5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_ac_c* i_rideActor) {
     Act_c* a_this = (Act_c*)i_actor;
 
@@ -601,8 +556,6 @@ enum MOVE_DIR {
     DIR_WEST,
 };
 
-/* 8047ED10-8047EE0C 001310 00FC+00 1/1 0/0 0/0 .text
- * PPCallBack__Q212daObjMovebox5Act_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor,
                                             s16 i_angle, dBgW_Base::PushPullLabel i_pplabel) {
     Act_c* a_this = (Act_c*)i_bgActor;
@@ -647,7 +600,6 @@ fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i
     }
 }
 
-/* 8047EE0C-8047F11C 00140C 0310+00 1/0 0/0 0/0 .text            Create__Q212daObjMovebox5Act_cFv */
 int daObjMovebox::Act_c::Create() {
     field_0x8b8 = 0;
     field_0x8bc = 0.0f;
@@ -720,8 +672,6 @@ int daObjMovebox::Act_c::Create() {
     return 1;
 }
 
-/* 8047F11C-8047F38C 00171C 0270+00 1/1 0/0 0/0 .text            afl_sway__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::afl_sway() {
     const BgcSrc_c* pbgc;
     s32 check_num;
@@ -779,7 +729,6 @@ void daObjMovebox::Act_c::afl_sway() {
     field_0x8c4 = 0.0f;
 }
 
-/* 8047F38C-8047F50C 00198C 0180+00 1/1 0/0 0/0 .text check_to_walk__Q212daObjMovebox5Act_cFv */
 int daObjMovebox::Act_c::check_to_walk() {
     int var_r27 = -1;
     bool var_r26 = true;
@@ -828,14 +777,12 @@ int daObjMovebox::Act_c::check_to_walk() {
     return var_r27;
 }
 
-/* 8047F50C-8047F530 001B0C 0024+00 3/3 0/0 0/0 .text clr_moment_cnt__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::clr_moment_cnt() {
     for (int i = 0; i < 4; i++) {
         field_0x8f0[i] = 0;
     }
 }
 
-/* 8047F530-8047F5CC 001B30 009C+00 1/1 0/0 0/0 .text chk_appear__Q212daObjMovebox5Act_cCFv */
 bool daObjMovebox::Act_c::chk_appear() const {
     int path_id = prmZ_get_pathId();
     int sw1 = prm_get_swSave1();
@@ -850,8 +797,6 @@ bool daObjMovebox::Act_c::chk_appear() const {
     return (!is_sw1 && !temp_r29) || (is_sw1 && temp_r29);
 }
 
-/* 8047F5CC-8047F634 001BCC 0068+00 1/1 0/0 0/0 .text
- * eff_smoke_slip_start__Q212daObjMovebox5Act_cFv               */
 void daObjMovebox::Act_c::eff_smoke_slip_start() {
     static cXyz scl(0.6f, 0.6f, 0.6f);
 
@@ -860,7 +805,6 @@ void daObjMovebox::Act_c::eff_smoke_slip_start() {
                       i_attr().mPullMoveTime;
 }
 
-/* 8047F634-8047F6A8 001C34 0074+00 3/3 0/0 0/0 .text mode_wait_init__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::mode_wait_init() {
     fopAcM_SetSpeedF(this, 0.0f);
     fopAcM_SetGravity(this, i_attr().mGravity);
@@ -870,8 +814,6 @@ void daObjMovebox::Act_c::mode_wait_init() {
     field_0x5ac = 0;
 }
 
-/* 8047F6A8-8047F8D4 001CA8 022C+00 1/0 0/0 0/0 .text            mode_wait__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::mode_wait() {
     if (field_0x8fa > 0) {
         field_0x8fa--;
@@ -915,15 +857,12 @@ void daObjMovebox::Act_c::mode_wait() {
     }
 }
 
-/* 8047F8D4-8047F8F4 001ED4 0020+00 1/1 0/0 0/0 .text mode_walk_init__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::mode_walk_init() {
     fopAcM_SetSpeedF(this, 0.0f);
     field_0x902 = 0;
     field_0x5ac = 1;
 }
 
-/* 8047F8F4-8047FCBC 001EF4 03C8+00 1/0 0/0 0/0 .text            mode_walk__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::mode_walk() {
     static cXyz dir_vec[] = {
         cXyz(0.0f, 0.0f, 1.0f),
@@ -980,15 +919,12 @@ void daObjMovebox::Act_c::mode_walk() {
     }
 }
 
-/* 8047FCBC-8047FCE4 0022BC 0028+00 1/1 0/0 0/0 .text mode_afl_init__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::mode_afl_init() {
     fopAcM_SetSpeedF(this, 0.0f);
     mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
     field_0x5ac = 2;
 }
 
-/* 8047FCE4-8047FEE4 0022E4 0200+00 1/0 0/0 0/0 .text            mode_afl__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::mode_afl() {
     f32 var_f31;
     f32 var_f30 = current.pos.y - mBgc.field_0x60;
@@ -1040,7 +976,6 @@ void daObjMovebox::Act_c::mode_proc_call() {
     (this->*mode_proc[field_0x5ac])();
 }
 
-/* 8047FF5C-80480020 00255C 00C4+00 1/1 0/0 0/0 .text sound_slip__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::sound_slip() {
     u32 var_r29 = 0;
     if (mBgc.field_0x5c >= 0) {
@@ -1054,7 +989,6 @@ void daObjMovebox::Act_c::sound_slip() {
     mDoAud_seStartLevel(i_attr().field_0x7c, &eyePos, var_r29, mReverb);
 }
 
-/* 80480020-804800E4 002620 00C4+00 1/1 0/0 0/0 .text sound_limit__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::sound_limit() {
     u32 var_r29 = 0;
     if (mBgc.field_0x178 >= 0) {
@@ -1068,7 +1002,6 @@ void daObjMovebox::Act_c::sound_limit() {
     mDoAud_seStart(i_attr().field_0x80, &eyePos, var_r29, mReverb);
 }
 
-/* 804800E4-804801A8 0026E4 00C4+00 1/1 0/0 0/0 .text sound_land__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::sound_land() {
     u32 var_r29 = 0;
     if (mBgc.field_0x5c >= 0) {
@@ -1082,8 +1015,6 @@ void daObjMovebox::Act_c::sound_land() {
     mDoAud_seStart(i_attr().field_0x84, &eyePos, var_r29, mReverb);
 }
 
-/* 804801A8-804801FC 0027A8 0054+00 1/1 0/0 0/0 .text            vib_land__Q212daObjMovebox5Act_cFv
- */
 void daObjMovebox::Act_c::vib_land() {
     dComIfGp_getVibration().StartShock(4, 31, cXyz(0.0f, 1.0f, 0.0f));
 }
@@ -1092,7 +1023,6 @@ f32 dummy_literal(f32 x) {
     return x + 75.0f + 2.0f;
 }
 
-/* 804801FC-8048027C 0027FC 0080+00 1/1 0/0 0/0 .text eff_land_smoke__Q212daObjMovebox5Act_cFv */
 void daObjMovebox::Act_c::eff_land_smoke() {
     daObjEff::Act_c::make_land_smoke(&current.pos, i_attr().mLandSmokeScale);
 }
@@ -1103,7 +1033,6 @@ void dummy_static() {
 
 AUDIO_INSTANCES;
 
-/* 8048027C-80480728 00287C 04AC+00 1/0 0/0 0/0 .text Execute__Q212daObjMovebox5Act_cFPPA3_A4_f */
 int daObjMovebox::Act_c::Execute(Mtx** param_0) {
     if (field_0x908 != 0) {
         if (--field_0x908 == 0) {
@@ -1213,7 +1142,6 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80480728-804808B4 002D28 018C+00 1/0 0/0 0/0 .text            Draw__Q212daObjMovebox5Act_cFv */
 int daObjMovebox::Act_c::Draw() {
     if (mpModel != NULL) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -1239,7 +1167,6 @@ int daObjMovebox::Act_c::Draw() {
     return 1;
 }
 
-/* 804808FC-80480920 002EFC 0024+00 1/0 0/0 0/0 .text            Delete__Q212daObjMovebox5Act_cFv */
 int daObjMovebox::Act_c::Delete() {
     if (mpBgW != NULL) {
         mpBgW->SetRideCallback(NULL);
@@ -1281,38 +1208,26 @@ int daObjMovebox::Act_c::Mthd_Delete() {
 
 namespace daObjMovebox {
 namespace {
-/* 80480920-80480AD4 002F20 01B4+00 1/0 0/0 0/0 .text
- * Mthd_Create__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
 int Mthd_Create(void* i_this) {
     return ((daObjMovebox::Act_c*)i_this)->Mthd_Create();
 }
 
-/* 80480BC0-80480C18 0031C0 0058+00 1/0 0/0 0/0 .text
- * Mthd_Delete__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
 int Mthd_Delete(void* i_this) {
     return ((daObjMovebox::Act_c*)i_this)->Mthd_Delete();
 }
 
-/* 80480C18-80480C38 003218 0020+00 1/0 0/0 0/0 .text
- * Mthd_Execute__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
 int Mthd_Execute(void* i_this) {
     return ((daObjMovebox::Act_c*)i_this)->MoveBGExecute();
 }
 
-/* 80480C38-80480C64 003238 002C+00 1/0 0/0 0/0 .text
- * Mthd_Draw__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
 int Mthd_Draw(void* i_this) {
     return ((daObjMovebox::Act_c*)i_this)->MoveBGDraw();
 }
 
-/* 80480C64-80480C90 003264 002C+00 1/0 0/0 0/0 .text
- * Mthd_IsDelete__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */
 int Mthd_IsDelete(void* i_this) {
     return ((daObjMovebox::Act_c*)i_this)->MoveBGIsDelete();
 }
 
-/* 8048176C-8048178C -00001 0020+00 1/0 0/0 0/0 .data
- * Mthd_Table__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@  */
 static actor_method_class Mthd_Table = {
     (process_method_func)Mthd_Create,  (process_method_func)Mthd_Delete,
     (process_method_func)Mthd_Execute, (process_method_func)Mthd_IsDelete,
@@ -1321,7 +1236,6 @@ static actor_method_class Mthd_Table = {
 };  // namespace
 };  // namespace daObjMovebox
 
-/* 8048178C-804817BC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Movebox */
 extern actor_process_profile_definition g_profile_Obj_Movebox = {
     fpcLy_CURRENT_e,              // mLayerID
     3,                            // mListID
diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp
index 655cbae71e..809495fa19 100644
--- a/src/d/actor/d_a_obj_msima.cpp
+++ b/src/d/actor/d_a_obj_msima.cpp
@@ -14,7 +14,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C9B40C-80C9B44C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__17daObj_Msima_HIO_cFv */
 daObj_Msima_HIO_c::daObj_Msima_HIO_c() {
     mId = -1;
     mSize = 1.0f;
@@ -42,8 +41,6 @@ void daObj_Msima_HIO_c::genMessage(JORMContext* context) {
 }
 #endif
 
-/* 80C9B44C-80C9B4A8 00012C 005C+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_ALINK || fopAcM_GetName(param_3) == PROC_E_GOB ||
     fopAcM_GetName(param_3) == PROC_B_ZANT)
@@ -59,7 +56,6 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* a_this, fopAc_ac_c* param_3)
     }
 }
 
-/* 80C9B4A8-80C9B5F8 000188 0150+00 1/0 0/0 0/0 .text daObj_Msima_Draw__FP15obj_msima_class */
 static int daObj_Msima_Draw(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     J3DModel* pModel;
@@ -85,24 +81,19 @@ static int daObj_Msima_Draw(obj_msima_class* i_this) {
     return 1;
 }
 
-/* 80C9B5F8-80C9B60C 0002D8 0014+00 1/1 0/0 0/0 .text            msima_start__FP15obj_msima_class */
 static void msima_start(obj_msima_class* i_this) {
     i_this->field_0x598 = 0x802;
     i_this->field_0x59a = 0x708;
 }
 
-/* 80C9CEA4-80C9CEA8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */
 /* 80C9CEA5 0003+00 data_80C9CEA5 None */
 static bool l_HIOInit;
 
-/* 80C9CEB4-80C9CEC8 000054 0014+00 4/5 0/0 0/0 .bss             l_HIO */
 static daObj_Msima_HIO_c l_HIO;
 
-/* 80C9CED4-80C9CEE0 000074 000C+00 1/2 0/0 0/0 .bss             c_pos */
 static cXyz c_pos(0.0f,0.0f,0.0f);
 
-/* 80C9B60C-80C9B890 0002EC 0284+00 1/1 0/0 0/0 .text            msima_drop__FP15obj_msima_class */
 static void msima_drop(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     a_this->shape_angle.x = -i_this->field_0x59c * cM_ssin(i_this->field_0x594);
@@ -136,7 +127,6 @@ static void msima_drop(obj_msima_class* i_this) {
     }
 }
 
-/* 80C9B8CC-80C9BA30 0005AC 0164+00 1/1 0/0 0/0 .text            msima_float__FP15obj_msima_class */
 static void msima_float(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     f32 dVar7 = i_this->field_0x59c * 0.004f;
@@ -162,7 +152,6 @@ static void msima_float(obj_msima_class* i_this) {
     cLib_addCalc2(&i_this->field_0x5a8, fVar1, 1.0f, 5.0f);
 }
 
-/* 80C9BA30-80C9BEB0 000710 0480+00 1/1 0/0 0/0 .text            action__FP15obj_msima_class */
 static void action(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -264,7 +253,6 @@ static void action(obj_msima_class* i_this) {
     }
 }
 
-/* 80C9CF10-80C9CF40 0000B0 0030+00 1/2 0/0 0/0 .bss             chain_p */
 static cXyz chain_p[4] = {
     cXyz(0.0f,200.0f,1100.0f),
     cXyz(-1100.0f,200.0f,0.0f),
@@ -272,8 +260,6 @@ static cXyz chain_p[4] = {
     cXyz(1100.0f,200.0f,0.0f),
 };
 
-/* 80C9BEB0-80C9C00C 000B90 015C+00 1/1 0/0 0/0 .text
- * chain_move__FP15obj_msima_classP10ms_chain_si                */
 static void chain_move(obj_msima_class* i_this, ms_chain_s* param_2, int param_3) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cXyz cStack_4c;
@@ -296,7 +282,6 @@ static void chain_move(obj_msima_class* i_this, ms_chain_s* param_2, int param_3
     }
 }
 
-/* 80C9CF70-80C9CFA0 000110 0030+00 1/2 0/0 0/0 .bss             chain_p2 */
 static cXyz chain_p2[4] = {
     cXyz(0.0f,4000.0f,1100.0f),
     cXyz(-1100.0f,4000.0f,0.0f),
@@ -304,8 +289,6 @@ static cXyz chain_p2[4] = {
     cXyz(1100.0f,4000.0f,0.0f),
 };
 
-/* 80C9C00C-80C9C25C 000CEC 0250+00 1/1 0/0 0/0 .text
- * chain_move2__FP15obj_msima_classP10ms_chain_si               */
 static void chain_move2(obj_msima_class* i_this, ms_chain_s* param_2, int param_3) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     cXyz local_5c;
@@ -340,7 +323,6 @@ static void chain_move2(obj_msima_class* i_this, ms_chain_s* param_2, int param_
     cLib_addCalc0(&param_2->field_0x8c, 0.03f, 20.0f);
 }
 
-/* 80C9C25C-80C9C3A8 000F3C 014C+00 2/1 0/0 0/0 .text daObj_Msima_Execute__FP15obj_msima_class */
 static int daObj_Msima_Execute(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     if (dComIfGp_event_runCheck()) {
@@ -375,12 +357,10 @@ static int daObj_Msima_Execute(obj_msima_class* i_this) {
     return 1;
 }
 
-/* 80C9C3A8-80C9C3B0 001088 0008+00 1/0 0/0 0/0 .text daObj_Msima_IsDelete__FP15obj_msima_class */
 static int daObj_Msima_IsDelete(obj_msima_class* i_this) {
     return 1;
 }
 
-/* 80C9C3B0-80C9C42C 001090 007C+00 1/0 0/0 0/0 .text daObj_Msima_Delete__FP15obj_msima_class */
 static int daObj_Msima_Delete(obj_msima_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mActor;
     fopAcM_GetID(a_this);
@@ -396,7 +376,6 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) {
     return 1;
 }
 
-/* 80C9C42C-80C9C720 00110C 02F4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_msima_class* i_this = (obj_msima_class*)a_this;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_S_MAGNE_SIMA);
@@ -454,8 +433,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80C9C768-80C9CA60 001448 02F8+00 1/0 0/0 0/0 .text            daObj_Msima_Create__FP10fopAc_ac_c
- */
 static int daObj_Msima_Create(fopAc_ac_c* a_this) {
     obj_msima_class* i_this = (obj_msima_class*)a_this;
     fopAcM_ct(a_this, obj_msima_class);
@@ -529,7 +506,6 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* 80C9CDF8-80C9CE18 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Msima_Method */
 static actor_method_class l_daObj_Msima_Method = {
     (process_method_func)daObj_Msima_Create,
     (process_method_func)daObj_Msima_Delete,
@@ -538,7 +514,6 @@ static actor_method_class l_daObj_Msima_Method = {
     (process_method_func)daObj_Msima_Draw,
 };
 
-/* 80C9CE18-80C9CE48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_MSIMA */
 extern actor_process_profile_definition g_profile_OBJ_MSIMA = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp
index 89a5e82580..08cde715cb 100644
--- a/src/d/actor/d_a_obj_mvstair.cpp
+++ b/src/d/actor/d_a_obj_mvstair.cpp
@@ -9,13 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80C9E8AC-80C9E8B4 000000 0008+00 4/4 0/0 0/0 .rodata          l_bmdName */
 static const int l_bmdName[] = {4, 4};
 
-/* 80C9E8B4-80C9E8BC 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzbName */
 static const int l_dzbName[] = {7, 7};
 
-/* 80C9E8BC-80C9E8D4 000010 0018+00 1/2 0/0 0/0 .rodata          l_move_len */
 static const f32 l_move_len[] = {
     150.0f,
     300.0f,
@@ -25,16 +22,13 @@ static const f32 l_move_len[] = {
     550.0f,
 };
 
-/* 80C9E8D4-80C9E8DC 000028 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0xB40, 0x2C60};
 
-/* 80C9D098-80C9D0D4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjStair_cFv */
 void daObjStair_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80C9D0D4-80C9D148 0000B4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjStair_cFv */
 void daObjStair_c::setBaseMtx() {
     mDoMtx_stack_c::transS(mModelPos.x, mModelPos.y, mModelPos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -43,7 +37,6 @@ void daObjStair_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80C9D148-80C9D2B8 000128 0170+00 1/0 0/0 0/0 .text            Create__12daObjStair_cFv */
 int daObjStair_c::Create() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
@@ -79,13 +72,11 @@ int daObjStair_c::Create() {
     return 1;
 }
 
-/* 80C9E940-80C9E948 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "K_mvkai00",
     "Lv9_mvkai",
 };
 
-/* 80C9D2B8-80C9D338 000298 0080+00 1/0 0/0 0/0 .text            CreateHeap__12daObjStair_cFv */
 int daObjStair_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mResType], l_bmdName[mResType]);
     JUT_ASSERT(250, modelData != NULL);
@@ -98,7 +89,6 @@ int daObjStair_c::CreateHeap() {
     return 1;
 }
 
-/* 80C9D338-80C9D41C 000318 00E4+00 1/1 0/0 0/0 .text            create1st__12daObjStair_cFv */
 int daObjStair_c::create1st() {
     mType = getType();
     if (getMdlType() == 7 || getMdlType() == 0) {
@@ -120,8 +110,6 @@ int daObjStair_c::create1st() {
     return phase_state;
 }
 
-/* 80C9D41C-80C9D4D8 0003FC 00BC+00 1/1 0/0 0/0 .text            event_proc_call__12daObjStair_cFv
- */
 void daObjStair_c::event_proc_call() {
     static int (daObjStair_c::*l_func[])() = {
         &daObjStair_c::actionWait,
@@ -133,7 +121,6 @@ void daObjStair_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80C9D4D8-80C9D594 0004B8 00BC+00 1/1 0/0 0/0 .text            mode_proc_call__12daObjStair_cFv */
 void daObjStair_c::mode_proc_call() {
     static int (daObjStair_c::*l_func[])() = {
         &daObjStair_c::modeWaitUpper,
@@ -145,8 +132,6 @@ void daObjStair_c::mode_proc_call() {
     (this->*l_func[mMode])();
 }
 
-/* 80C9D594-80C9D710 000574 017C+00 1/0 0/0 0/0 .text            Execute__12daObjStair_cFPPA3_A4_f
- */
 int daObjStair_c::Execute(Mtx** param_0) {
     event_proc_call();
     mode_proc_call();
@@ -178,7 +163,6 @@ int daObjStair_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80C9D710-80C9D7B4 0006F0 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjStair_cFv */
 int daObjStair_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -189,7 +173,6 @@ int daObjStair_c::Draw() {
     return 1;
 }
 
-/* 80C9D7B4-80C9D82C 000794 0078+00 1/0 0/0 0/0 .text            Delete__12daObjStair_cFv */
 int daObjStair_c::Delete() {
     if (mSmokeEmitter != NULL) {
         mSmokeEmitter->becomeInvalidEmitter();
@@ -201,7 +184,6 @@ int daObjStair_c::Delete() {
     return 1;
 }
 
-/* 80C9D82C-80C9D8EC 00080C 00C0+00 1/0 0/0 0/0 .text            actionWait__12daObjStair_cFv */
 int daObjStair_c::actionWait() {
     if (fopAcM_isSwitch(this, getSwbit2())) {
         setAction(ACTION_END_e);
@@ -217,8 +199,6 @@ int daObjStair_c::actionWait() {
     return 1;
 }
 
-/* 80C9D8EC-80C9D95C 0008CC 0070+00 1/0 0/0 0/0 .text            actionOrderEvent__12daObjStair_cFv
- */
 int daObjStair_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT_e);
@@ -230,7 +210,6 @@ int daObjStair_c::actionOrderEvent() {
     return 1;
 }
 
-/* 80C9D95C-80C9D9BC 00093C 0060+00 1/0 0/0 0/0 .text            actionEvent__12daObjStair_cFv */
 int daObjStair_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventId)) {
         setAction(ACTION_WAIT_e);
@@ -240,13 +219,10 @@ int daObjStair_c::actionEvent() {
     return 1;
 }
 
-/* 80C9D9BC-80C9D9C4 00099C 0008+00 1/0 0/0 0/0 .text            actionEnd__12daObjStair_cFv */
 int daObjStair_c::actionEnd() {
     return 1;
 }
 
-/* 80C9D9C4-80C9D9F4 0009A4 0030+00 2/2 0/0 0/0 .text            modeWaitUpperInit__12daObjStair_cFv
- */
 int daObjStair_c::modeWaitUpperInit() {
     current.pos.y = home.pos.y;
     mModelPos = current.pos;
@@ -254,7 +230,6 @@ int daObjStair_c::modeWaitUpperInit() {
     return 1;
 }
 
-/* 80C9D9F4-80C9DA98 0009D4 00A4+00 1/0 0/0 0/0 .text            modeWaitUpper__12daObjStair_cFv */
 int daObjStair_c::modeWaitUpper() {
     int is_swbit = fopAcM_isSwitch(this, getSwbit());
     int dir = getDir();
@@ -266,7 +241,6 @@ int daObjStair_c::modeWaitUpper() {
     return 1;
 }
 
-/* 80C9DA98-80C9DADC 000A78 0044+00 1/1 0/0 0/0 .text            modeUpperInit__12daObjStair_cFv */
 int daObjStair_c::modeUpperInit() {
     mMoveStartShakeTimer = 30;
     mMoveEndShakeTimer = 15;
@@ -278,7 +252,6 @@ int daObjStair_c::modeUpperInit() {
     return 1;
 }
 
-/* 80C9DADC-80C9DEDC 000ABC 0400+00 1/0 0/0 0/0 .text            modeUpper__12daObjStair_cFv */
 int daObjStair_c::modeUpper() {
     f32 move_speed = 50.0f;
     s16 shake_speed = 15000;
@@ -349,8 +322,6 @@ int daObjStair_c::modeUpper() {
     return 1;
 }
 
-/* 80C9DF18-80C9DF60 000EF8 0048+00 2/2 0/0 0/0 .text            modeWaitLowerInit__12daObjStair_cFv
- */
 int daObjStair_c::modeWaitLowerInit() {
     current.pos.y = home.pos.y + l_move_len[mType];
     mModelPos = current.pos;
@@ -358,7 +329,6 @@ int daObjStair_c::modeWaitLowerInit() {
     return 1;
 }
 
-/* 80C9DF60-80C9E004 000F40 00A4+00 1/0 0/0 0/0 .text            modeWaitLower__12daObjStair_cFv */
 int daObjStair_c::modeWaitLower() {
     int is_swbit = fopAcM_isSwitch(this, getSwbit());
     int dir = getDir();
@@ -370,7 +340,6 @@ int daObjStair_c::modeWaitLower() {
     return 1;
 }
 
-/* 80C9E004-80C9E034 000FE4 0030+00 1/1 0/0 0/0 .text            modeLowerInit__12daObjStair_cFv */
 int daObjStair_c::modeLowerInit() {
     mMoveAccel = 0.0f;
     mMoveStep = 0.0f;
@@ -380,7 +349,6 @@ int daObjStair_c::modeLowerInit() {
     return 1;
 }
 
-/* 80C9E034-80C9E3D8 001014 03A4+00 1/0 0/0 0/0 .text            modeLower__12daObjStair_cFv */
 int daObjStair_c::modeLower() {
     f32 move_speed = 50.0f;
     f32 shake_amount = 3.0f;
@@ -442,7 +410,6 @@ int daObjStair_c::modeLower() {
     return 1;
 }
 
-/* 80C9E3D8-80C9E5A0 0013B8 01C8+00 1/1 0/0 0/0 .text            setParticle__12daObjStair_cFv */
 void daObjStair_c::setParticle() {
     if (mParticleLeftEmitter[0].getEmitter() == NULL) {
         dComIfGp_particle_set(0x833C, &mParticleLeftPos[0], &home.angle, NULL, 0xFF, &mParticleLeftEmitter[0], fopAcM_GetRoomNo(this), NULL, NULL, NULL);
@@ -463,7 +430,6 @@ void daObjStair_c::setParticle() {
     }
 }
 
-/* 80C9E5A0-80C9E614 001580 0074+00 2/2 0/0 0/0 .text            removeParticle__12daObjStair_cFv */
 void daObjStair_c::removeParticle() {
     for (int i = 0; i < 2; i++) {
         mParticleLeftEmitter[i].remove();
@@ -471,29 +437,23 @@ void daObjStair_c::removeParticle() {
     }
 }
 
-/* 80C9E614-80C9E700 0015F4 00EC+00 1/0 0/0 0/0 .text daObjStair_create1st__FP12daObjStair_c */
 static int daObjStair_create1st(daObjStair_c* i_this) {
     fopAcM_ct(i_this, daObjStair_c);
     return i_this->create1st();
 }
 
-/* 80C9E7B4-80C9E7D4 001794 0020+00 1/0 0/0 0/0 .text daObjStair_MoveBGDelete__FP12daObjStair_c */
 static int daObjStair_MoveBGDelete(daObjStair_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80C9E7D4-80C9E7F4 0017B4 0020+00 1/0 0/0 0/0 .text daObjStair_MoveBGExecute__FP12daObjStair_c
- */
 static int daObjStair_MoveBGExecute(daObjStair_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80C9E7F4-80C9E820 0017D4 002C+00 1/0 0/0 0/0 .text daObjStair_MoveBGDraw__FP12daObjStair_c */
 static int daObjStair_MoveBGDraw(daObjStair_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80C9EA08-80C9EA28 -00001 0020+00 1/0 0/0 0/0 .data            daObjStair_METHODS */
 static actor_method_class daObjStair_METHODS = {
     (process_method_func)daObjStair_create1st,
     (process_method_func)daObjStair_MoveBGDelete,
@@ -502,7 +462,6 @@ static actor_method_class daObjStair_METHODS = {
     (process_method_func)daObjStair_MoveBGDraw,
 };
 
-/* 80C9EA28-80C9EA58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_MvStair */
 extern actor_process_profile_definition g_profile_Obj_MvStair = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp
index a415301401..38f2ac8963 100644
--- a/src/d/actor/d_a_obj_myogan.cpp
+++ b/src/d/actor/d_a_obj_myogan.cpp
@@ -11,14 +11,12 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80C9EBAC-80C9EBDC 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__18daObj_Myogan_HIO_cFv */
 daObj_Myogan_HIO_c::daObj_Myogan_HIO_c() {
     field_0x4 = -1;
     mSize = 1.0f;
     mNormalHeight = 0.0f;
 }
 
-/* 80C9EBDC-80C9EC70 00011C 0094+00 1/0 0/0 0/0 .text daObj_Myogan_Draw__FP16obj_myogan_class */
 static int daObj_Myogan_Draw(obj_myogan_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -30,13 +28,10 @@ static int daObj_Myogan_Draw(obj_myogan_class* i_this) {
     return 1;
 }
 
-/* 80C9F318-80C9F31C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool initialized;
 
-/* 80C9F328-80C9F338 000018 0010+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_Myogan_HIO_c l_HIO;
 
-/* 80C9EC70-80C9ED5C 0001B0 00EC+00 1/1 0/0 0/0 .text            action__FP16obj_myogan_class */
 static void action(obj_myogan_class* i_this) {
     switch (i_this->mAction) {
     case 0:
@@ -59,8 +54,6 @@ static void action(obj_myogan_class* i_this) {
     i_this->mpBtk->play();
 }
 
-/* 80C9ED5C-80C9EDB8 00029C 005C+00 2/1 0/0 0/0 .text daObj_Myogan_Execute__FP16obj_myogan_class
- */
 static int daObj_Myogan_Execute(obj_myogan_class* i_this) {
     i_this->field_0x57c++;
 
@@ -74,13 +67,10 @@ static int daObj_Myogan_Execute(obj_myogan_class* i_this) {
     return 1;
 }
 
-/* 80C9EDB8-80C9EDC0 0002F8 0008+00 1/0 0/0 0/0 .text daObj_Myogan_IsDelete__FP16obj_myogan_class
- */
 static int daObj_Myogan_IsDelete(obj_myogan_class* i_this) {
     return 1;
 }
 
-/* 80C9EDC0-80C9EE28 000300 0068+00 1/0 0/0 0/0 .text daObj_Myogan_Delete__FP16obj_myogan_class */
 static int daObj_Myogan_Delete(obj_myogan_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "S_YOGAN");
     if (i_this->mInitialized) {
@@ -91,7 +81,6 @@ static int daObj_Myogan_Delete(obj_myogan_class* i_this) {
     return 1;
 }
 
-/* 80C9EE28-80C9F064 000368 023C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_myogan_class* a_this = (obj_myogan_class*)i_this;
 
@@ -139,8 +128,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80C9F0AC-80C9F1F0 0005EC 0144+00 1/0 0/0 0/0 .text            daObj_Myogan_Create__FP10fopAc_ac_c
- */
 static int daObj_Myogan_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_myogan_class);
     obj_myogan_class* a_this = (obj_myogan_class*)i_this;
@@ -174,14 +161,12 @@ static int daObj_Myogan_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80C9F2A8-80C9F2C8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Myogan_Method */
 static actor_method_class l_daObj_Myogan_Method = {
     (process_method_func)daObj_Myogan_Create,  (process_method_func)daObj_Myogan_Delete,
     (process_method_func)daObj_Myogan_Execute, (process_method_func)daObj_Myogan_IsDelete,
     (process_method_func)daObj_Myogan_Draw,
 };
 
-/* 80C9F2C8-80C9F2F8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_MYOGAN */
 extern actor_process_profile_definition g_profile_OBJ_MYOGAN = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp
index 994544510b..31bb71ef78 100644
--- a/src/d/actor/d_a_obj_nagaisu.cpp
+++ b/src/d/actor/d_a_obj_nagaisu.cpp
@@ -7,23 +7,18 @@
 
 #include "d/actor/d_a_obj_nagaisu.h"
 
-/* 80C9F3B8-80C9F3D8 000078 0020+00 1/1 0/0 0/0 .text daObjNagaisu_c_createHeap__FP10fopAc_ac_c */
 static int daObjNagaisu_c_createHeap(fopAc_ac_c* i_this) {
     return ((daObjNagaisu_c*)i_this)->createHeap();
 }
 
-/* 80CA0408-80CA040C -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Nagaisu";
 
-/* 80C9F3D8-80C9F45C 000098 0084+00 2/2 0/0 0/0 .text            __ct__14daObjNagaisu_cFv */
 daObjNagaisu_c::daObjNagaisu_c() {}
 
-/* 80C9F4B8-80C9F5A8 000178 00F0+00 1/0 0/0 0/0 .text            __dt__14daObjNagaisu_cFv */
 daObjNagaisu_c::~daObjNagaisu_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80C9F5A8-80C9F668 000268 00C0+00 1/1 0/0 0/0 .text            createHeap__14daObjNagaisu_cFv */
 int daObjNagaisu_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(156, a_model_data_p != NULL);
@@ -45,7 +40,6 @@ int daObjNagaisu_c::createHeap() {
     return 1;
 }
 
-/* 80CA035C-80CA0378 000000 001C+00 3/3 0/0 0/0 .rodata          REMOVE_ISU_IDX__14daObjNagaisu_c */
 const int daObjNagaisu_c::REMOVE_ISU_IDX[] = {
     6,
     7,
@@ -56,7 +50,6 @@ const int daObjNagaisu_c::REMOVE_ISU_IDX[] = {
     29,
 };
 
-/* 80CA0378-80CA03BC 00001C 0044+00 0/1 0/0 0/0 .rodata          s_CcDCyl__15daObjIsuChild_c */
 const dCcD_SrcCyl daObjIsuChild_c::s_CcDCyl = {
     {
         {0, {{0, 0, 0}, {0x400020, 0x11}, 0}},
@@ -71,7 +64,6 @@ const dCcD_SrcCyl daObjIsuChild_c::s_CcDCyl = {
     },
 };
 
-/* 80C9F668-80C9F7A8 000328 0140+00 1/1 0/0 0/0 .text            create__14daObjNagaisu_cFv */
 int daObjNagaisu_c::create() {
     fopAcM_ct(this, daObjNagaisu_c);
 
@@ -101,7 +93,6 @@ int daObjNagaisu_c::create() {
     return phase_state;
 }
 
-/* 80C9F7A8-80C9F81C 000468 0074+00 1/1 0/0 0/0 .text            Delete__14daObjNagaisu_cFv */
 int daObjNagaisu_c::Delete() {
     daObjIsuChild_c* a_child_p = mChild;
     for (int i = 0; i < 60; i++) {
@@ -114,7 +105,6 @@ int daObjNagaisu_c::Delete() {
     return 1;
 }
 
-/* 80C9F81C-80C9F8C4 0004DC 00A8+00 1/1 0/0 0/0 .text            draw__14daObjNagaisu_cFv */
 int daObjNagaisu_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -131,7 +121,6 @@ int daObjNagaisu_c::draw() {
     return 1;
 }
 
-/* 80C9F8C4-80C9F914 000584 0050+00 1/1 0/0 0/0 .text            execute__14daObjNagaisu_cFv */
 int daObjNagaisu_c::execute() {
     daObjIsuChild_c* a_child_p = mChild;
     for (int i = 0; i < 60; i++) {
@@ -142,12 +131,10 @@ int daObjNagaisu_c::execute() {
     return 1;
 }
 
-/* 80C9F914-80C9F944 0005D4 0030+00 1/1 0/0 0/0 .text            init__14daObjNagaisu_cFv */
 void daObjNagaisu_c::init() {
     mCcStts.Init(0xFF, 0, this);
 }
 
-/* 80C9F944-80C9FA90 000604 014C+00 1/1 0/0 0/0 .text            setIsu__14daObjNagaisu_cFv */
 void daObjNagaisu_c::setIsu() {
     daObjIsuChild_c* a_child_p = mChild;
     f32 start_x_pos = current.pos.x;
@@ -200,16 +187,13 @@ void daObjNagaisu_c::setIsu() {
     }
 }
 
-/* 80C9FA90-80C9FAFC 000750 006C+00 1/1 0/0 0/0 .text            __ct__15daObjIsuChild_cFv */
 daObjIsuChild_c::daObjIsuChild_c() {
     mIsDead = false;
     mpBgW = NULL;
 }
 
-/* 80C9FCDC-80C9FD4C 00099C 0070+00 3/2 0/0 0/0 .text            __dt__15daObjIsuChild_cFv */
 daObjIsuChild_c::~daObjIsuChild_c() {}
 
-/* 80C9FD4C-80C9FE28 000A0C 00DC+00 1/1 0/0 0/0 .text            createHeap__15daObjIsuChild_cFv */
 int daObjIsuChild_c::createHeap() {
     mpBgW = new dBgW();
     if (mpBgW == NULL) {
@@ -227,8 +211,6 @@ int daObjIsuChild_c::createHeap() {
     return 1;
 }
 
-/* 80C9FE28-80C9FF54 000AE8 012C+00 1/1 0/0 0/0 .text
- * create__15daObjIsuChild_cFP14daObjNagaisu_cP9dCcD_Stts       */
 void daObjIsuChild_c::create(daObjNagaisu_c* i_parent, dCcD_Stts* i_ccStts) {
     static const int COL_OFFSET_X[] = {
         60,
@@ -252,7 +234,6 @@ void daObjIsuChild_c::create(daObjNagaisu_c* i_parent, dCcD_Stts* i_ccStts) {
     }
 }
 
-/* 80C9FF54-80CA0034 000C14 00E0+00 1/1 0/0 0/0 .text            execute__15daObjIsuChild_cFv */
 int daObjIsuChild_c::execute() {
     if (!mIsDead) {
         if (chkHit()) {
@@ -268,7 +249,6 @@ int daObjIsuChild_c::execute() {
     }
 }
 
-/* 80CA0034-80CA00B8 000CF4 0084+00 1/1 0/0 0/0 .text            draw__15daObjIsuChild_cFP6dMdl_c */
 int daObjIsuChild_c::draw(dMdl_c* i_mdl) {
     if (!mIsDead) {
         mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z);
@@ -278,7 +258,6 @@ int daObjIsuChild_c::draw(dMdl_c* i_mdl) {
     }
 }
 
-/* 80CA00B8-80CA0118 000D78 0060+00 2/2 0/0 0/0 .text            Delete__15daObjIsuChild_cFv */
 void daObjIsuChild_c::Delete() {
     if (!mIsDead) {
         if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -287,7 +266,6 @@ void daObjIsuChild_c::Delete() {
     }
 }
 
-/* 80CA0118-80CA0180 000DD8 0068+00 1/1 0/0 0/0 .text            chkHit__15daObjIsuChild_cFv */
 bool daObjIsuChild_c::chkHit() {
     for (int i = 0; i < 2; i++) {
         if (mCcCyl[i].ChkTgHit()) {
@@ -298,7 +276,6 @@ bool daObjIsuChild_c::chkHit() {
     return false;
 }
 
-/* 80CA0180-80CA0258 000E40 00D8+00 1/1 0/0 0/0 .text            callEmt__15daObjIsuChild_cFv */
 void daObjIsuChild_c::callEmt() {
     cXyz pos(mPos.x, mPos.y, mPos.z);
     csXyz rot(0, -0x8000, 0);
@@ -316,28 +293,23 @@ void daObjIsuChild_c::callEmt() {
     }
 }
 
-/* 80CA0258-80CA02AC 000F18 0054+00 1/0 0/0 0/0 .text daObjNagaisu_create__FP14daObjNagaisu_c */
 static int daObjNagaisu_create(daObjNagaisu_c* i_this) {
     fopAcM_ct(i_this, daObjNagaisu_c);
     return i_this->create();
 }
 
-/* 80CA02AC-80CA02CC 000F6C 0020+00 1/0 0/0 0/0 .text daObjNagaisu_Delete__FP14daObjNagaisu_c */
 static int daObjNagaisu_Delete(daObjNagaisu_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CA02CC-80CA02EC 000F8C 0020+00 1/0 0/0 0/0 .text daObjNagaisu_execute__FP14daObjNagaisu_c */
 static int daObjNagaisu_execute(daObjNagaisu_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CA02EC-80CA030C 000FAC 0020+00 1/0 0/0 0/0 .text daObjNagaisu_draw__FP14daObjNagaisu_c */
 static int daObjNagaisu_draw(daObjNagaisu_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CA040C-80CA042C -00001 0020+00 1/0 0/0 0/0 .data            daObjNagaisu_METHODS */
 static actor_method_class daObjNagaisu_METHODS = {
     (process_method_func)daObjNagaisu_create,
     (process_method_func)daObjNagaisu_Delete,
@@ -346,7 +318,6 @@ static actor_method_class daObjNagaisu_METHODS = {
     (process_method_func)daObjNagaisu_draw,
 };
 
-/* 80CA042C-80CA045C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Nagaisu */
 extern actor_process_profile_definition g_profile_Obj_Nagaisu = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp
index fbd16c46aa..3bc335f88f 100644
--- a/src/d/actor/d_a_obj_nameplate.cpp
+++ b/src/d/actor/d_a_obj_nameplate.cpp
@@ -12,8 +12,6 @@
 #include "f_op/f_op_actor.h"
 #include "include/SSystem/SComponent/c_math.h"
 
-/* ############################################################################################## */
-/* 80594E74-80594E94 000000 0020+00 5/5 0/0 0/0 .rodata          M_attr__16daObjNameplate_c */
 // clang-format off
 daObjNameplate_c::M_attrs const daObjNameplate_c::M_attr = {
     50.0f,
@@ -29,8 +27,6 @@ daObjNameplate_c::M_attrs const daObjNameplate_c::M_attr = {
 };
 // clang-format on
 
-/* 80594098-8059415C 000078 00C4+00 1/1 0/0 0/0 .text            create_init__16daObjNameplate_cFv
- */
 void daObjNameplate_c::create_init() {
     fopAcM_setCullSizeBox(this, -75.0f, -180.0f, -25.0f, 75.0f, 20.0f, 25.0f);
 
@@ -45,13 +41,10 @@ void daObjNameplate_c::create_init() {
     initCcSphere();
 }
 
-/* 8059415C-8059417C 00013C 0020+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjNameplate_cFv
- */
 void daObjNameplate_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8059417C-80594248 00015C 00CC+00 2/2 0/0 0/0 .text            setBaseMtx__16daObjNameplate_cFv */
 void daObjNameplate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(home.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -73,8 +66,6 @@ void daObjNameplate_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::now, mMtx);
 }
 
-/* 80594248-805942B8 000228 0070+00 1/1 0/0 0/0 .text            initCcSphere__16daObjNameplate_cFv
- */
 void daObjNameplate_c::initCcSphere() {
     /* 80594EB4-80594EF4 000040 0040+00 1/1 0/0 0/0 .rodata          ccSphSrc$3700 */
     const static dCcD_SrcSph ccSphSrc = {
@@ -96,8 +87,6 @@ void daObjNameplate_c::initCcSphere() {
     mCcDSph.SetR(attr().radius1);
 }
 
-/* 805942B8-8059434C 000298 0094+00 1/1 0/0 0/0 .text            setCcSphere__16daObjNameplate_cFv
- */
 void daObjNameplate_c::setCcSphere() {
     cXyz local_lc1;
     cXyz local_lc(0.0f, -115.0f, 0.0f);  // fails unless this unused cXyz is present
@@ -112,8 +101,6 @@ void daObjNameplate_c::setCcSphere() {
     dComIfG_Ccsp()->Set(&mCcDSph);
 }
 
-/* 8059434C-805945CC 00032C 0280+00 1/1 0/0 0/0 .text            calcAngle__16daObjNameplate_cFv
- */
 void daObjNameplate_c::calcAngle() {
     if (field_0x77E > 0) {
         field_0x77E += -1;
@@ -193,8 +180,6 @@ void daObjNameplate_c::calcSpring() {
     field_0x722 = field_0x778;
 }
 
-/* 80594754-805947F8 000734 00A4+00 1/1 0/0 0/0 .text checkHitAngle__16daObjNameplate_cFv
- */
 int daObjNameplate_c::checkHitAngle() {
     s16 sourceAngle = fopAcM_searchPlayerAngleY(this) - shape_angle.y;
 
@@ -211,8 +196,6 @@ int daObjNameplate_c::checkHitAngle() {
     return -1;
 }
 
-/* 805947F8-80594950 0007D8 0158+00 1/1 0/0 0/0 .text messageProc__16daObjNameplate_cFv
- */
 void daObjNameplate_c::messageProc() {
     switch (mShowMessage) {
     case 0:
@@ -247,7 +230,6 @@ void daObjNameplate_c::messageProc() {
     }
 }
 
-/* 80594F28-80594F2C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 char* daObjNameplate_c::l_arcName = "J_Hyosatu";
 
 int daObjNameplate_c::createHeap() {
@@ -262,8 +244,6 @@ int daObjNameplate_c::createHeap() {
     return 1;
 }
 
-/* 80594950-805949C8 000930 0078+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c
- */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjNameplate_c*>(i_this)->createHeap();
 }
@@ -279,8 +259,6 @@ int daObjNameplate_c::draw() {
     return 1;
 }
 
-/* 805949C8-80594A6C 0009A8 00A4+00 1/0 0/0 0/0 .text daObjNameplate_Draw__FP16daObjNameplate_c
- */
 static int daObjNameplate_Draw(daObjNameplate_c* i_this) {
     return i_this->draw();
 }
@@ -297,8 +275,6 @@ static int daObjNameplate_Execute(daObjNameplate_c* i_this) {
     return 1;
 }
 
-/* 80594AB4-80594ABC 000A94 0008+00 1/0 0/0 0/0 .text
- * daObjNameplate_IsDelete__FP16daObjNameplate_c                */
 static int daObjNameplate_IsDelete(daObjNameplate_c* i_this) {
     return 1;
 }
@@ -326,21 +302,18 @@ int daObjNameplate_c::create() {
     return phase_state;
 }
 
-/* 80594BF8-80594D38 000BD8 0140+00 1/0 0/0 0/0 .text daObjNameplate_Create__FP10fopAc_ac_c */
 static int daObjNameplate_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjNameplate_c*>(i_this)->create();
 }
 
 /* ##############################################################################################
  */
-/* 80594F2C-80594F4C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjNameplate_Method */
 static actor_method_class l_daObjNameplate_Method = {
     (process_method_func)daObjNameplate_Create,  (process_method_func)daObjNameplate_Delete,
     (process_method_func)daObjNameplate_Execute, (process_method_func)daObjNameplate_IsDelete,
     (process_method_func)daObjNameplate_Draw,
 };
 
-/* 80594F4C-80594F7C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_NamePlate */
 extern actor_process_profile_definition g_profile_Obj_NamePlate = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp
index cf14cb6156..10cc59d483 100644
--- a/src/d/actor/d_a_obj_nan.cpp
+++ b/src/d/actor/d_a_obj_nan.cpp
@@ -13,15 +13,14 @@
 
 class daObj_NanHIO_c {
 public:
-    /* 80CA05AC */ daObj_NanHIO_c();
-    /* 80CA30D0 */ virtual ~daObj_NanHIO_c() {}
+    daObj_NanHIO_c();
+    virtual ~daObj_NanHIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 field_0x8;
     /* 0x0C */ f32 field_0xc;
 };
 
-/* 80CA32D0-80CA3310 000020 0040+00 0/1 0/0 0/0 .data cc_sph_src__25@unnamed@d_a_obj_nan_cpp@ */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x014040, 0x43}, 0}}, // mObj
@@ -34,15 +33,12 @@ static dCcD_SrcSph cc_sph_src = {
     } // mSphAttr
 };
 
-/* 80CA05AC-80CA05D4 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_NanHIO_cFv */
 daObj_NanHIO_c::daObj_NanHIO_c() {
     field_0x4 = -1;
     field_0xc = 1.2f;
     field_0x8 = 1.2f;
 }
 
-/* 80CA05D4-80CA0678 000114 00A4+00 9/9 0/0 0/0 .text
- * setAction__10daObjNAN_cFM10daObjNAN_cFPCvPv_v                */
 void daObjNAN_c::setAction(actionFunc action) {
     if (mAction != NULL) {
         field_0x7d0 = -1;
@@ -54,13 +50,10 @@ void daObjNAN_c::setAction(actionFunc action) {
     (this->*mAction)();
 }
 
-/* ############################################################################################## */
-/* 80CA31C0-80CA31C8 000004 0008+00 0/1 0/0 0/0 .rodata          l_nan_brk_index */
 static int const l_nan_brk_index[2] = {
     13, 12,
 };
 
-/* 80CA31C8-80CA31D0 00000C 0008+00 0/1 0/0 0/0 .rodata          l_nan_btk_index */
 static int const l_nan_btk_index[2] = {
     17, 16,
 };
@@ -97,25 +90,21 @@ inline int daObjNAN_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA0678-80CA08EC 0001B8 0274+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObjNAN_c*>(i_this)->CreateHeap();
 }
 
-/* 80CA0934-80CA0954 000474 0020+00 1/0 0/0 0/0 .text            daObjNAN_Create__FP10fopAc_ac_c */
 static int daObjNAN_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daObjNAN_c*>(i_this)->create();
 }
 
-/* 80CA0954-80CA0978 000494 0024+00 1/0 0/0 0/0 .text            daObjNAN_Delete__FP10daObjNAN_c */
 static int daObjNAN_Delete(daObjNAN_c* i_this) {
     fopAcM_GetID(i_this);
     static_cast<daObjNAN_c*>(i_this)->_delete();
     return 1;
 }
 
-/* 80CA0978-80CA0A2C 0004B8 00B4+00 1/1 0/0 0/0 .text            nan_posMove__10daObjNAN_cFv */
 void daObjNAN_c::nan_posMove() {
     if (field_0x7fc == 0) {
         cLib_chaseAngleS(&field_0x7d4.x, field_0x7da.x, 0x100);
@@ -129,7 +118,6 @@ void daObjNAN_c::nan_posMove() {
     current.pos += posOffset;
 }
 
-/* 80CA0A2C-80CA0D54 00056C 0328+00 4/0 0/0 0/0 .text            turn__10daObjNAN_cFv */
 void daObjNAN_c::turn() {
     if (field_0x7d0 == 0) {
         speedF = 0.0f;
@@ -172,7 +160,6 @@ void daObjNAN_c::turn() {
     }
 }
 
-/* 80CA0D9C-80CA0E7C 0008DC 00E0+00 2/2 0/0 0/0 .text            nan_WalkAnm__10daObjNAN_cFv */
 u8 daObjNAN_c::nan_WalkAnm() {
     if (mMorf->getFrame() == 39.0f ||
         mMorf->getFrame() == 79.0f)
@@ -189,7 +176,6 @@ u8 daObjNAN_c::nan_WalkAnm() {
     return 0;
 }
 
-/* 80CA0E7C-80CA1184 0009BC 0308+00 1/0 0/0 0/0 .text            wait__10daObjNAN_cFv */
 void daObjNAN_c::wait() {
     if (field_0x7d0 == 0) {
         field_0x7d0++;
@@ -228,7 +214,6 @@ void daObjNAN_c::wait() {
     }
 }
 
-/* 80CA1184-80CA1904 000CC4 0780+00 4/0 0/0 0/0 .text            walk__10daObjNAN_cFv */
 void daObjNAN_c::walk() {
     if (field_0x7d0 == 0) {
         field_0x7e0 = 180;
@@ -325,7 +310,6 @@ void daObjNAN_c::walk() {
     }
 }
 
-/* 80CA1904-80CA1A20 001444 011C+00 1/0 0/0 0/0 .text            bin_wait__10daObjNAN_cFv */
 void daObjNAN_c::bin_wait() {
     if (field_0x7d0 == 0) {
         fopAcM_OnStatus(this, 0x4000);
@@ -345,7 +329,6 @@ void daObjNAN_c::bin_wait() {
     }
 }
 
-/* 80CA1A20-80CA1B50 001560 0130+00 1/0 0/0 0/0 .text            bin_action__10daObjNAN_cFv */
 void daObjNAN_c::bin_action() {
     if (field_0x7d0 == 0) {
         mDraw = true;
@@ -377,7 +360,6 @@ void daObjNAN_c::bin_action() {
     }
 }
 
-/* 80CA1B50-80CA1D5C 001690 020C+00 6/6 0/0 0/0 .text            nan_setParticle__10daObjNAN_cFv */
 void daObjNAN_c::nan_setParticle() {
     if (CheckZ()) {
         cLib_chaseF(&field_0x7e8, 0.0f, 1.0f);
@@ -409,7 +391,6 @@ void daObjNAN_c::nan_setParticle() {
     }
 }
 
-/* 80CA1D5C-80CA1F60 00189C 0204+00 1/0 0/0 0/0 .text            hook__10daObjNAN_cFv */
 void daObjNAN_c::hook() {
     if (field_0x7d0 == 0) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -444,7 +425,6 @@ void daObjNAN_c::hook() {
     }
 }
 
-/* 80CA1F60-80CA2368 001AA0 0408+00 1/0 0/0 0/0 .text            boomerang__10daObjNAN_cFv */
 void daObjNAN_c::boomerang() {
     if (field_0x7d0 == 0) {
         mSph.SetTgType(0);
@@ -498,7 +478,6 @@ void daObjNAN_c::boomerang() {
     }
 }
 
-/* 80CA2368-80CA2658 001EA8 02F0+00 3/0 0/0 0/0 .text            drop__10daObjNAN_cFv */
 void daObjNAN_c::drop() {
     if (field_0x7d0 == 0) {
         speedF = 0.0f;
@@ -536,7 +515,6 @@ void daObjNAN_c::drop() {
     }
 }
 
-/* 80CA2658-80CA270C 002198 00B4+00 1/1 0/0 0/0 .text            hit_check__10daObjNAN_cFv */
 void daObjNAN_c::hit_check() {
     dCcU_AtInfo local_40;
     mStts.Move();
@@ -550,7 +528,6 @@ void daObjNAN_c::hit_check() {
     }
 }
 
-/* 80CA270C-80CA276C 00224C 0060+00 1/1 0/0 0/0 .text            action__10daObjNAN_cFv */
 void daObjNAN_c::action() {
     (this->*mAction)();
     shape_angle = current.angle;
@@ -559,13 +536,10 @@ void daObjNAN_c::action() {
     }
 }
 
-/* ############################################################################################## */
-/* 80CA3270-80CA3274 0000B4 0002+02 0/1 0/0 0/0 .rodata          l_nan_itemno */
 static u8 const l_nan_itemno[2] = {
     fpcNm_ITEM_M_NANAFUSHI, fpcNm_ITEM_F_NANAFUSHI,
 };
 
-/* 80CA276C-80CA2904 0022AC 0198+00 1/1 0/0 0/0 .text            execute__10daObjNAN_cFv */
 int daObjNAN_c::execute() {
     if (ChkGetDemo()) {
         field_0x57c = field_0x578 + 10000.0f;
@@ -599,11 +573,8 @@ int daObjNAN_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80CA3498-80CA349C 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_hio_init;
 
-/* 80CA2904-80CA296C 002444 0068+00 1/1 0/0 0/0 .text            _delete__10daObjNAN_cFv */
 int daObjNAN_c::_delete() {
     dComIfG_resDelete(&mPhase, "I_Nan");
     if (field_0x7fd != 0) {
@@ -615,7 +586,6 @@ int daObjNAN_c::_delete() {
     return 1;
 }
 
-/* 80CA296C-80CA29EC 0024AC 0080+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjNAN_cFv */
 void daObjNAN_c::setBaseMtx() {
     J3DModel* model = mMorf->getModel();
     mDoMtx_stack_c::transS(current.pos);
@@ -653,30 +623,23 @@ inline int daObjNAN_c::draw() {
     return 1;
 }
 
-/* 80CA29EC-80CA2B48 00252C 015C+00 1/0 0/0 0/0 .text            daObjNAN_Draw__FP10daObjNAN_c */
 static int daObjNAN_Draw(daObjNAN_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CA2B48-80CA2B68 002688 0020+00 2/1 0/0 0/0 .text            daObjNAN_Execute__FP10daObjNAN_c */
 static int daObjNAN_Execute(daObjNAN_c* i_this) {
     return i_this->execute();
 }
 
-/* ############################################################################################## */
-/* 80CA3294-80CA3298 0000D8 0004+00 0/1 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x0199, /* dSv_event_flag_c::F_0409 - Misc. - Phasmid (M) */
     0x019A, /* dSv_event_flag_c::F_0410 - Misc. - Phasmid (F) */
 };
 
-/* 80CA3298-80CA329C 0000DC 0004+00 0/1 0/0 0/0 .rodata          l_heapsize */
 static u16 const l_heapsize[2] = {0x0EE0, 0x0EC0};
 
-/* 80CA34A8-80CA34B8 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_NanHIO_c l_HIO;
 
-/* 80CA2B68-80CA2FDC 0026A8 0474+00 1/1 0/0 0/0 .text            create__10daObjNAN_cFv */
 int daObjNAN_c::create() {
     u8 uVar6 = (fopAcM_GetParam(this) & 0xf00) >> 8;
     fopAcM_ct(this, daObjNAN_c);
@@ -752,13 +715,10 @@ int daObjNAN_c::create() {
     return rv;
 }
 
-/* 80CA30C8-80CA30D0 002C08 0008+00 1/0 0/0 0/0 .text            daObjNAN_IsDelete__FP10daObjNAN_c
- */
 static int daObjNAN_IsDelete(daObjNAN_c* i_this) {
     return 1;
 }
 
-/* 80CA33D0-80CA33F0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjNAN_Method */
 static actor_method_class l_daObjNAN_Method = {
     (process_method_func)daObjNAN_Create,
     (process_method_func)daObjNAN_Delete,
@@ -767,7 +727,6 @@ static actor_method_class l_daObjNAN_Method = {
     (process_method_func)daObjNAN_Draw,
 };
 
-/* 80CA33F0-80CA3420 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Nan */
 extern actor_process_profile_definition g_profile_Obj_Nan = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp
index 91a1003d75..770e7311f9 100644
--- a/src/d/actor/d_a_obj_ndoor.cpp
+++ b/src/d/actor/d_a_obj_ndoor.cpp
@@ -9,9 +9,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
-/* 80CA3538-80CA359C 000078 0064+00 1/0 0/0 0/0 .text daObj_Ndoor_Draw__FP15obj_ndoor_class */
 static int daObj_Ndoor_Draw(obj_ndoor_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -19,7 +17,6 @@ static int daObj_Ndoor_Draw(obj_ndoor_class* i_this) {
     return 1;
 }
 
-/* 80CA359C-80CA37A4 0000DC 0208+00 2/1 0/0 0/0 .text daObj_Ndoor_Execute__FP15obj_ndoor_class */
 static int daObj_Ndoor_Execute(obj_ndoor_class* i_this) {
     cXyz cStack_28;
 
@@ -69,19 +66,16 @@ static int daObj_Ndoor_Execute(obj_ndoor_class* i_this) {
     return 1;
 }
 
-/* 80CA37A4-80CA37AC 0002E4 0008+00 1/0 0/0 0/0 .text daObj_Ndoor_IsDelete__FP15obj_ndoor_class */
 static int daObj_Ndoor_IsDelete(obj_ndoor_class* i_this) {
     return 1;
 }
 
-/* 80CA37AC-80CA37DC 0002EC 0030+00 1/0 0/0 0/0 .text daObj_Ndoor_Delete__FP15obj_ndoor_class */
 static int daObj_Ndoor_Delete(obj_ndoor_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Obj_ndoor");
     return 1;
 }
 
-/* 80CA37DC-80CA3848 00031C 006C+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_ndoor_class* a_this = (obj_ndoor_class*)i_this;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_ndoor", 3);
@@ -94,8 +88,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return a_this->mpModel != NULL ? 1 : 0;
 }
 
-/* 80CA3848-80CA39AC 000388 0164+00 1/0 0/0 0/0 .text            daObj_Ndoor_Create__FP10fopAc_ac_c
- */
 static int daObj_Ndoor_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -133,14 +125,12 @@ static int daObj_Ndoor_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80CA3AB8-80CA3AD8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Ndoor_Method */
 static actor_method_class l_daObj_Ndoor_Method = {
     (process_method_func)daObj_Ndoor_Create,  (process_method_func)daObj_Ndoor_Delete,
     (process_method_func)daObj_Ndoor_Execute, (process_method_func)daObj_Ndoor_IsDelete,
     (process_method_func)daObj_Ndoor_Draw,
 };
 
-/* 80CA3AD8-80CA3B08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_NDOOR */
 extern actor_process_profile_definition g_profile_OBJ_NDOOR = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp
index aeb729f17f..2c65db643f 100644
--- a/src/d/actor/d_a_obj_nougu.cpp
+++ b/src/d/actor/d_a_obj_nougu.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_npc.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80CA4A00-80CA4A40 000000 0040+00 2/2 0/0 0/0 .data            mCcDSph__13daObj_Nougu_c */
 dCcD_SrcSph daObj_Nougu_c::mCcDSph = {
     daNpcT_c::mCcDObjData,
     {
@@ -17,16 +16,13 @@ dCcD_SrcSph daObj_Nougu_c::mCcDSph = {
     },
 };
 
-/* 80CA4A40-80CA4A44 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "Jagar4";
 
-/* 80CA3C0C-80CA3D58 0000EC 014C+00 1/0 0/0 0/0 .text            __dt__13daObj_Nougu_cFv */
 daObj_Nougu_c::~daObj_Nougu_c() {
     OS_REPORT("|%06d:%x|daObj_Nougu_c -> デストラクト\n", g_Counter.mCounter0, this);
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80CA49B8-80CA49C8 000000 0010+00 3/3 0/0 0/0 .rodata          m__19daObj_Nougu_Param_c */
 const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = {
     0.0f,
     -3.0f,
@@ -34,7 +30,6 @@ const daObj_Nougu_HIOParam daObj_Nougu_Param_c::m = {
     200.0f
 };
 
-/* 80CA3E24-80CA40D8 000304 02B4+00 1/1 0/0 0/0 .text            create__13daObj_Nougu_cFv */
 int daObj_Nougu_c::create() {
     fopAcM_ct(this, daObj_Nougu_c);
 
@@ -82,7 +77,6 @@ int daObj_Nougu_c::create() {
     return phase_state;
 }
 
-/* 80CA4328-80CA43A0 000808 0078+00 1/1 0/0 0/0 .text            CreateHeap__13daObj_Nougu_cFv */
 int daObj_Nougu_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
     if (mdlData_p == NULL) {
@@ -97,14 +91,12 @@ int daObj_Nougu_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA43A0-80CA43D4 000880 0034+00 1/1 0/0 0/0 .text            Delete__13daObj_Nougu_cFv */
 int daObj_Nougu_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_Nougu_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_Nougu_c();
     return 1;
 }
 
-/* 80CA43D4-80CA45F4 0008B4 0220+00 2/2 0/0 0/0 .text            Execute__13daObj_Nougu_cFv */
 int daObj_Nougu_c::Execute() {
     cXyz sp14;
     cXyz sp8;
@@ -142,7 +134,6 @@ int daObj_Nougu_c::Execute() {
     return 1;
 }
 
-/* 80CA45F4-80CA46B8 000AD4 00C4+00 1/1 0/0 0/0 .text            Draw__13daObj_Nougu_cFv */
 int daObj_Nougu_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -155,18 +146,14 @@ int daObj_Nougu_c::Draw() {
     return 1;
 }
 
-/* 80CA46B8-80CA46D8 000B98 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daObj_Nougu_cFP10fopAc_ac_c            */
 int daObj_Nougu_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daObj_Nougu_c*)i_this)->CreateHeap();
 }
 
-/* 80CA46D8-80CA46E8 000BB8 0010+00 3/3 0/0 0/0 .text            getResName__13daObj_Nougu_cFv */
 const char* daObj_Nougu_c::getResName() {
     return l_resName;
 }
 
-/* 80CA46E8-80CA4708 000BC8 0020+00 1/1 0/0 0/0 .text            isDelete__13daObj_Nougu_cFv */
 int daObj_Nougu_c::isDelete() {
     switch (mType) {
     case 0:
@@ -176,19 +163,15 @@ int daObj_Nougu_c::isDelete() {
     return 0;
 }
 
-/* 80CA4708-80CA4764 000BE8 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__13daObj_Nougu_cFv
- */
 void daObj_Nougu_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80CA4764-80CA47A4 000C44 0040+00 2/2 0/0 0/0 .text            setRoomNo__13daObj_Nougu_cFv */
 void daObj_Nougu_c::setRoomNo() {
     fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
 }
 
-/* 80CA47A4-80CA4808 000C84 0064+00 1/1 0/0 0/0 .text            setMtx__13daObj_Nougu_cFv */
 void daObj_Nougu_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -196,35 +179,28 @@ void daObj_Nougu_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CA4808-80CA4828 000CE8 0020+00 1/0 0/0 0/0 .text            daObj_Nougu_Create__FPv */
 static int daObj_Nougu_Create(void* i_this) {
     return ((daObj_Nougu_c*)i_this)->create();
 }
 
-/* 80CA4828-80CA4848 000D08 0020+00 1/0 0/0 0/0 .text            daObj_Nougu_Delete__FPv */
 static int daObj_Nougu_Delete(void* i_this) {
     return ((daObj_Nougu_c*)i_this)->Delete();
 }
 
-/* 80CA4848-80CA4868 000D28 0020+00 1/0 0/0 0/0 .text            daObj_Nougu_Execute__FPv */
 static int daObj_Nougu_Execute(void* i_this) {
     return ((daObj_Nougu_c*)i_this)->Execute();
 }
 
-/* 80CA4868-80CA4888 000D48 0020+00 1/0 0/0 0/0 .text            daObj_Nougu_Draw__FPv */
 static int daObj_Nougu_Draw(void* i_this) {
     return ((daObj_Nougu_c*)i_this)->Draw();
 }
 
-/* 80CA4888-80CA4890 000D68 0008+00 1/0 0/0 0/0 .text            daObj_Nougu_IsDelete__FPv */
 static int daObj_Nougu_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CA4B24-80CA4B28 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Nougu_Param_c l_HIO;
 
-/* 80CA4A44-80CA4A64 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Nougu_MethodTable */
 static actor_method_class daObj_Nougu_MethodTable = {
     (process_method_func)daObj_Nougu_Create,
     (process_method_func)daObj_Nougu_Delete,
@@ -233,7 +209,6 @@ static actor_method_class daObj_Nougu_MethodTable = {
     (process_method_func)daObj_Nougu_Draw,
 };
 
-/* 80CA4A64-80CA4A94 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_NOUGU */
 extern actor_process_profile_definition g_profile_OBJ_NOUGU = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp
index 5b7f6d3cc6..1f49c3870c 100644
--- a/src/d/actor/d_a_obj_octhashi.cpp
+++ b/src/d/actor/d_a_obj_octhashi.cpp
@@ -12,7 +12,6 @@
 #include "d/d_cc_uty.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CA6480-80CA64C0 000000 0040+00 6/6 0/0 0/0 .rodata          ccSphSrc$3655 */
 const static dCcD_SrcSph ccSphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x13}, {0x104002, 0x1f}, 0x7f}}, // mObj
@@ -29,7 +28,6 @@ static char* l_arcName[1] = {
     "Octhashi"
 };
 
-/* 80CA6588-80CA65CC 000004 0044+00 1/1 0/0 0/0 .data            ccCylSrc$3656 */
 static dCcD_SrcCyl ccCylSrc = {
     {
         {0x0, {{0x0, 0x0, 0xd}, {0x104002, 0x1f}, 0x75}}, // mObj
@@ -46,8 +44,6 @@ static dCcD_SrcCyl ccCylSrc = {
 
 static s8 l_cyl_height_init = 0;
 
-/* 80CA4BB8-80CA4D98 000078 01E0+00 1/1 0/0 0/0 .text            initCcCylinder__15daObjOCTHASHI_cFv
- */
 void daObjOCTHASHI_c::initCcCylinder() {
     if (l_cyl_height_init == 0) {
         ccCylSrc.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f;
@@ -70,12 +66,10 @@ void daObjOCTHASHI_c::initCcCylinder() {
     mCyl.OnCoSameActorHit();
 }
 
-/* 80CA4D98-80CA4DB8 000258 0020+00 1/0 0/0 0/0 .text daObjOCTHASHI_Create__FP10fopAc_ac_c */
 static int daObjOCTHASHI_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjOCTHASHI_c*>(i_this)->create();
 }
 
-/* 80CA4DB8-80CA4DFC 000278 0044+00 1/0 0/0 0/0 .text daObjOCTHASHI_Delete__FP15daObjOCTHASHI_c */
 static int daObjOCTHASHI_Delete(daObjOCTHASHI_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
@@ -83,7 +77,6 @@ static int daObjOCTHASHI_Delete(daObjOCTHASHI_c* i_this) {
     return 1;
 }
 
-/* 80CA4DFC-80CA4EA4 0002BC 00A8+00 1/1 0/0 0/0 .text            SetCoSph__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::SetCoSph() {
     for (int idx = 0; idx < mPieceNum; ++idx) {
         mColliders[idx].OffCoSameActorHit();
@@ -93,14 +86,12 @@ void daObjOCTHASHI_c::SetCoSph() {
     }
 }
 
-/* 80CA4EA4-80CA4F24 000364 0080+00 1/1 0/0 0/0 .text            SetCoCyl__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::SetCoCyl() {
     mCyl.SetC(current.pos);
     mCyl.SetH(mPieceNum * 790.0f);
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80CA4F24-80CA52F0 0003E4 03CC+00 1/1 0/0 0/0 .text            HakaiSet2__15daObjOCTHASHI_cFi */
 void daObjOCTHASHI_c::HakaiSet2(int param_0) {
     for (int idx = param_0 - 1; idx >= 0; --idx) {
         field_0x6d8 += 10.0f;
@@ -136,8 +127,6 @@ void daObjOCTHASHI_c::HakaiSet2(int param_0) {
     field_0x6c8 = 1;
 }
 
-/* 80CA52F0-80CA546C 0007B0 017C+00 1/1 0/0 0/0 .text            HakaiMotion2__15daObjOCTHASHI_cFv
- */
 void daObjOCTHASHI_c::HakaiMotion2() {
     int num_processed = 0;
     cXyz cStack_20(7.0f, 7.0f, 7.0f);
@@ -162,7 +151,6 @@ void daObjOCTHASHI_c::HakaiMotion2() {
     }
 }
 
-/* 80CA54E4-80CA55C4 0009A4 00E0+00 1/1 0/0 0/0 .text            CylAction__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::CylAction() {
     if (mCyl.ChkTgHit()) {
         eyePos = *mCyl.GetTgHitPosP();
@@ -178,7 +166,6 @@ void daObjOCTHASHI_c::CylAction() {
     }
 }
 
-/* 80CA55C4-80CA5844 000A84 0280+00 1/1 0/0 0/0 .text            SphAction__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::SphAction() {
     // The following replace the unused rodata lits:
     f32 padding[1] = {0.0f};
@@ -232,7 +219,6 @@ void daObjOCTHASHI_c::SphAction() {
     return;
 }
 
-/* 80CA5844-80CA58F4 000D04 00B0+00 1/1 0/0 0/0 .text            SphAction2__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::SphAction2() {
     for (int idx = 0; idx < mPieceNum; ++idx) {
         if (mColliders[idx].ChkTgHit()) {
@@ -244,7 +230,6 @@ void daObjOCTHASHI_c::SphAction2() {
     }
 }
 
-/* 80CA58F4-80CA59BC 000DB4 00C8+00 1/1 0/0 0/0 .text            Action__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::Action() {
     switch (field_0x6cb) {
         case 0:
@@ -271,7 +256,6 @@ void daObjOCTHASHI_c::Action() {
     }
 }
 
-/* 80CA59BC-80CA5A88 000E7C 00CC+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjOCTHASHI_cFv */
 void daObjOCTHASHI_c::setBaseMtx() {
     for (int idx = 0; idx < mPieceNum; ++idx) {
         mDoMtx_stack_c::transS(field_0x5a0[idx]);
@@ -283,24 +267,18 @@ void daObjOCTHASHI_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CA5A88-80CA5A94 000F48 000C+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     static_cast<daObjOCTHASHI_c*>(param_1)->field_0x6e8 = 0x1e;
 }
 
-/* 80CA5A94-80CA5AC0 000F54 002C+00 1/0 0/0 0/0 .text daObjOCTHASHI_Draw__FP15daObjOCTHASHI_c */
 static int daObjOCTHASHI_Draw(daObjOCTHASHI_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CA5AC0-80CA5AE0 000F80 0020+00 2/1 0/0 0/0 .text daObjOCTHASHI_Execute__FP15daObjOCTHASHI_c
- */
 static int daObjOCTHASHI_Execute(daObjOCTHASHI_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CA5AE0-80CA5B98 000FA0 00B8+00 1/0 0/0 0/0 .text            CreateHeap__15daObjOCTHASHI_cFv */
 int daObjOCTHASHI_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], "S_octhashi00.bmd");
     JUT_ASSERT(84, modelData != NULL);
@@ -317,7 +295,6 @@ int daObjOCTHASHI_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA5B98-80CA5EE4 001058 034C+00 1/1 0/0 0/0 .text            create__15daObjOCTHASHI_cFv */
 int daObjOCTHASHI_c::create() {
     fopAcM_ct(this, daObjOCTHASHI_c);
     mPieceNum = fopAcM_GetParam(this) & 0xff;
@@ -356,8 +333,6 @@ int daObjOCTHASHI_c::create() {
     return phase;
 }
 
-/* 80CA6254-80CA625C 001714 0008+00 1/0 0/0 0/0 .text daObjOCTHASHI_IsDelete__FP15daObjOCTHASHI_c
- */
 static int daObjOCTHASHI_IsDelete(daObjOCTHASHI_c* param_0) {
     return 1;
 }
@@ -366,14 +341,12 @@ static void dummy() {
     delete (cCcD_GStts*)NULL;
 }
 
-/* 80CA62A4-80CA62F8 001764 0054+00 1/0 0/0 0/0 .text            Create__15daObjOCTHASHI_cFv */
 int daObjOCTHASHI_c::Create() {
     mpBgW->SetRideCallback(rideCallBack);
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return 4;
 }
 
-/* 80CA62F8-80CA636C 0017B8 0074+00 1/0 0/0 0/0 .text Execute__15daObjOCTHASHI_cFPPA3_A4_f */
 int daObjOCTHASHI_c::Execute(Mtx **i_mtx) {
     Action();
     *i_mtx = &mBgMtx;
@@ -383,7 +356,6 @@ int daObjOCTHASHI_c::Execute(Mtx **i_mtx) {
     return 1;
 }
 
-/* 80CA636C-80CA6444 00182C 00D8+00 1/0 0/0 0/0 .text            Draw__15daObjOCTHASHI_cFv */
 int daObjOCTHASHI_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     for (int idx = 0; idx < mPieceNum; ++idx) {
@@ -396,13 +368,11 @@ int daObjOCTHASHI_c::Draw() {
     return 1;
 }
 
-/* 80CA6444-80CA6478 001904 0034+00 1/0 0/0 0/0 .text            Delete__15daObjOCTHASHI_cFv */
 int daObjOCTHASHI_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName[0]);
     return 1;
 }
 
-/* 80CA65CC-80CA65EC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjOCTHASHI_Method */
 static actor_method_class l_daObjOCTHASHI_Method = {
     (process_method_func)daObjOCTHASHI_Create,
     (process_method_func)daObjOCTHASHI_Delete,
@@ -411,7 +381,6 @@ static actor_method_class l_daObjOCTHASHI_Method = {
     (process_method_func)daObjOCTHASHI_Draw,
 };
 
-/* 80CA65EC-80CA661C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OCTHASHI */
 extern actor_process_profile_definition g_profile_OCTHASHI = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp
index 824d05d702..fb89e3ac97 100644
--- a/src/d/actor/d_a_obj_oiltubo.cpp
+++ b/src/d/actor/d_a_obj_oiltubo.cpp
@@ -7,19 +7,14 @@
 
 #include "d/actor/d_a_obj_oiltubo.h"
 
-/* 80CA79A8-80CA79AC -00001 0004+00 1/1 0/0 0/0 .data            l_resFileName */
 static char* l_resFileName = "Obj_otubo";
 
-/* 80CA79AC-80CA79B0 -00001 0004+00 0/1 0/0 0/0 .data            l_bmdFileName */
 static char* l_bmdFileName = "x_oiltubo_00.bmd";
 
-/* 80CA79B0-80CA79B4 -00001 0004+00 0/1 0/0 0/0 .data            l_bbmdFileName */
 static char* l_bbmdFileName = "x_oiltubo_00b.bmd";
 
-/* 80CA79B4-80CA79B8 -00001 0004+00 0/2 0/0 0/0 .data            l_bbtkFileName */
 static char* l_bbtkFileName = "x_oiltubo_00b.btk";
 
-/* 80CA79B8-80CA79FC 000030 0044+00 2/2 0/0 0/0 .data            mCcDCyl__15daObj_Oiltubo_c */
 dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = {
     daObj_Oiltubo_c::mCcDObjInfo,
     {
@@ -29,7 +24,6 @@ dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = {
     }                        // mCyl
 };
 
-/* 80CA6718-80CA6914 000078 01FC+00 1/1 0/0 0/0 .text            create__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::create() {
     fopAcM_ct(this, daObj_Oiltubo_c);
 
@@ -45,7 +39,6 @@ int daObj_Oiltubo_c::create() {
     return phase_state;
 }
 
-/* 80CA78F4-80CA7924 000000 0030+00 5/5 0/0 0/0 .rodata          mCcDObjInfo__15daObj_Oiltubo_c */
 const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = {
     {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x1F}, 0x79}},  // mObj
     {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0},                  // mGObjAt
@@ -53,7 +46,6 @@ const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = {
     {0x0},                                               // mGObjCo
 };
 
-/* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName);
     JUT_ASSERT(0, mdlData_p != NULL);
@@ -77,14 +69,12 @@ int daObj_Oiltubo_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA6C5C-80CA6CA0 0005BC 0044+00 1/1 0/0 0/0 .text            Delete__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::Delete() {
     dComIfG_resDelete(&mPhase, getResName());
     mSound.deleteObject();
     return 1;
 }
 
-/* 80CA6CA0-80CA6EDC 000600 023C+00 2/2 0/0 0/0 .text            Execute__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::Execute() {
     BOOL event_chk = chkEvent();
 
@@ -131,7 +121,6 @@ int daObj_Oiltubo_c::Execute() {
     return 1;
 }
 
-/* 80CA6EDC-80CA6FC8 00083C 00EC+00 1/1 0/0 0/0 .text            Draw__15daObj_Oiltubo_cFv */
 int daObj_Oiltubo_c::Draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBModel, &tevStr);
@@ -147,18 +136,14 @@ int daObj_Oiltubo_c::Draw() {
     return 1;
 }
 
-/* 80CA6FC8-80CA6FE8 000928 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_Oiltubo_cFP10fopAc_ac_c          */
 int daObj_Oiltubo_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_Oiltubo_c*>(i_this)->CreateHeap();
 }
 
-/* 80CA6FE8-80CA6FF8 000948 0010+00 4/4 0/0 0/0 .text            getResName__15daObj_Oiltubo_cFv */
 const char* daObj_Oiltubo_c::getResName() {
     return l_resFileName;
 }
 
-/* 80CA6FF8-80CA7068 000958 0070+00 1/1 0/0 0/0 .text            restart__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::restart() {
     current.angle.set(0, home.angle.y, 0);
     shape_angle = current.angle;
@@ -166,7 +151,6 @@ void daObj_Oiltubo_c::restart() {
     setProcess(&daObj_Oiltubo_c::wait);
 }
 
-/* 80CA7068-80CA720C 0009C8 01A4+00 1/1 0/0 0/0 .text            initialize__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::initialize() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     fopAcM_SetMtx(this, mpBModel->getBaseTRMtx());
@@ -197,8 +181,6 @@ void daObj_Oiltubo_c::initialize() {
     Execute();
 }
 
-/* 80CA720C-80CA72BC 000B6C 00B0+00 1/1 0/0 0/0 .text
- * setProcess__15daObj_Oiltubo_cFM15daObj_Oiltubo_cFPCvPvPv_i   */
 int daObj_Oiltubo_c::setProcess(daObj_Oiltubo_c::processFn i_process) {
     mMode = 2;
 
@@ -217,21 +199,17 @@ int daObj_Oiltubo_c::setProcess(daObj_Oiltubo_c::processFn i_process) {
     return 1;
 }
 
-/* 80CA72BC-80CA7318 000C1C 005C+00 1/1 0/0 0/0 .text            setParam__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::setParam() {
     scale.set(1.0f, 1.0f, 1.0f);
     mAcchCir.SetWallR(50.0f);
     mAcchCir.SetWallH(70.0f);
 }
 
-/* 80CA7318-80CA7374 000C78 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__15daObj_Oiltubo_cFv
- */
 void daObj_Oiltubo_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGroundChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGroundChk);
 }
 
-/* 80CA7374-80CA73B8 000CD4 0044+00 2/2 0/0 0/0 .text            setRoomNo__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::setRoomNo() {
     int roomId = dComIfG_Bgsp().GetRoomId(mGroundChk);
 
@@ -239,7 +217,6 @@ void daObj_Oiltubo_c::setRoomNo() {
     mCcStts.SetRoomId(roomId);
 }
 
-/* 80CA73B8-80CA7430 000D18 0078+00 1/1 0/0 0/0 .text            setMtx__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -249,14 +226,12 @@ void daObj_Oiltubo_c::setMtx() {
     mpBModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CA7430-80CA7478 000D90 0048+00 1/1 0/0 0/0 .text            setAttnPos__15daObj_Oiltubo_cFv */
 void daObj_Oiltubo_c::setAttnPos() {
     attention_info.position = current.pos;
     attention_info.position.y += 150.0f;
     eyePos = current.pos;
 }
 
-/* 80CA7478-80CA74C8 000DD8 0050+00 1/1 0/0 0/0 .text            chkEvent__15daObj_Oiltubo_cFv */
 BOOL daObj_Oiltubo_c::chkEvent() {
     BOOL var_r5 = 1;
 
@@ -271,7 +246,6 @@ BOOL daObj_Oiltubo_c::chkEvent() {
     return var_r5;
 }
 
-/* 80CA74C8-80CA7558 000E28 0090+00 1/0 0/0 0/0 .text            wait__15daObj_Oiltubo_cFPv */
 int daObj_Oiltubo_c::wait(void* unused) {
     switch (mMode) {
     case 1:
@@ -288,39 +262,32 @@ int daObj_Oiltubo_c::wait(void* unused) {
     return 1;
 }
 
-/* 80CA7558-80CA7578 000EB8 0020+00 1/0 0/0 0/0 .text            daObj_Oiltubo_Create__FPv */
 static int daObj_Oiltubo_Create(void* i_this) {
     return static_cast<daObj_Oiltubo_c*>(i_this)->create();
 }
 
-/* 80CA7578-80CA7598 000ED8 0020+00 1/0 0/0 0/0 .text            daObj_Oiltubo_Delete__FPv */
 static int daObj_Oiltubo_Delete(void* i_this) {
     return static_cast<daObj_Oiltubo_c*>(i_this)->Delete();
 }
 
-/* 80CA7598-80CA75B8 000EF8 0020+00 1/0 0/0 0/0 .text            daObj_Oiltubo_Execute__FPv */
 static int daObj_Oiltubo_Execute(void* i_this) {
     return static_cast<daObj_Oiltubo_c*>(i_this)->Execute();
 }
 
-/* 80CA75B8-80CA75D8 000F18 0020+00 1/0 0/0 0/0 .text            daObj_Oiltubo_Draw__FPv */
 static int daObj_Oiltubo_Draw(void* i_this) {
     return static_cast<daObj_Oiltubo_c*>(i_this)->Draw();
 }
 
-/* 80CA75D8-80CA75E0 000F38 0008+00 1/0 0/0 0/0 .text            daObj_Oiltubo_IsDelete__FPv */
 static int daObj_Oiltubo_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CA7A08-80CA7A28 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Oiltubo_MethodTable */
 static actor_method_class daObj_Oiltubo_MethodTable = {
     (process_method_func)daObj_Oiltubo_Create,  (process_method_func)daObj_Oiltubo_Delete,
     (process_method_func)daObj_Oiltubo_Execute, (process_method_func)daObj_Oiltubo_IsDelete,
     (process_method_func)daObj_Oiltubo_Draw,
 };
 
-/* 80CA7A28-80CA7A58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_OILTUBO */
 extern actor_process_profile_definition g_profile_OBJ_OILTUBO = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp
index 6f38e10a5c..605b7e2b88 100644
--- a/src/d/actor/d_a_obj_onsen.cpp
+++ b/src/d/actor/d_a_obj_onsen.cpp
@@ -8,14 +8,12 @@
 #include "d/actor/d_a_obj_onsen.h"
 #include "d/d_procname.h"
 
-/* 80CA7B58-80CA7BB0 000078 0058+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjOnsen_cFv */
 void daObjOnsen_c::initBaseMtx() {
     mpModel[0]->setBaseScale(scale);
     mpModel[1]->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CA7BB0-80CA7C28 0000D0 0078+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjOnsen_cFv */
 void daObjOnsen_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -24,7 +22,6 @@ void daObjOnsen_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::now, mBgMtx);
 }
 
-/* 80CA7C28-80CA7C74 000148 004C+00 1/0 0/0 0/0 .text            Create__12daObjOnsen_cFv */
 int daObjOnsen_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel[0]->mBaseTransformMtx);
@@ -32,28 +29,21 @@ int daObjOnsen_c::Create() {
     return 1;
 }
 
-/* 80CA811C-80CA8124 000000 0008+00 1/1 0/0 0/0 .rodata          l_bmd */
 static const u32 l_bmd[2] = {5, 5};
 
-/* 80CA8124-80CA812C 000008 0008+00 0/1 0/0 0/0 .rodata          l_btk */
 static const u32 l_btk[2] = {9, 9};
 
-/* 80CA812C-80CA8134 000010 0008+00 0/1 0/0 0/0 .rodata          l_bmd2 */
 static const u32 l_bmd2[2] = {6, 6};
 
-/* 80CA8134-80CA813C 000018 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static const u32 l_dzb[2] = {12, 12};
 
-/* 80CA813C-80CA8144 000020 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[2] = {10240, 6880};
 
-/* 80CA815C-80CA8164 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "H_Onsen",
     "H_KaOnsen",
 };
 
-/* 80CA7C74-80CA7DFC 000194 0188+00 1/0 0/0 0/0 .text            CreateHeap__12daObjOnsen_cFv */
 int daObjOnsen_c::CreateHeap() {
     J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
     mpModel[0] = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000084);
@@ -77,7 +67,6 @@ int daObjOnsen_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA7E44-80CA7EEC 000364 00A8+00 1/1 0/0 0/0 .text            create1st__12daObjOnsen_cFv */
 int daObjOnsen_c::create1st() {
     mType = getType();
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName[mType]);
@@ -90,15 +79,12 @@ int daObjOnsen_c::create1st() {
     return phase;
 }
 
-/* 80CA7EEC-80CA7F1C 00040C 0030+00 1/0 0/0 0/0 .text            Execute__12daObjOnsen_cFPPA3_A4_f
- */
 int daObjOnsen_c::Execute(Mtx** i_mtx) {
     *i_mtx = &mBgMtx;
     mpBtk->play();
     return 1;
 }
 
-/* 80CA7F1C-80CA8008 00043C 00EC+00 1/0 0/0 0/0 .text            Draw__12daObjOnsen_cFv */
 int daObjOnsen_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr);
@@ -113,42 +99,34 @@ int daObjOnsen_c::Draw() {
     return 1;
 }
 
-/* 80CA8008-80CA8048 000528 0040+00 1/0 0/0 0/0 .text            Delete__12daObjOnsen_cFv */
 int daObjOnsen_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName[mType]);
     return 1;
 }
 
-/* 80CA8048-80CA80A8 000568 0060+00 1/0 0/0 0/0 .text daObjOnsen_create1st__FP12daObjOnsen_c */
 static int daObjOnsen_create1st(daObjOnsen_c* i_this) {
     fopAcM_ct(i_this, daObjOnsen_c);
     return i_this->create1st();
 }
 
-/* 80CA80A8-80CA80C8 0005C8 0020+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGDelete__FP12daObjOnsen_c */
 static int daObjOnsen_MoveBGDelete(daObjOnsen_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDelete();
 }
 
-/* 80CA80C8-80CA80E8 0005E8 0020+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGExecute__FP12daObjOnsen_c
- */
 static int daObjOnsen_MoveBGExecute(daObjOnsen_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGExecute();
 }
 
-/* 80CA80E8-80CA8114 000608 002C+00 1/0 0/0 0/0 .text daObjOnsen_MoveBGDraw__FP12daObjOnsen_c */
 static int daObjOnsen_MoveBGDraw(daObjOnsen_c* i_this) {
     return static_cast<dBgS_MoveBgActor*>(i_this)->MoveBGDraw();
 }
 
-/* 80CA8164-80CA8184 -00001 0020+00 1/0 0/0 0/0 .data            daObjOnsen_METHODS */
 static actor_method_class daObjOnsen_METHODS = {
     (process_method_func)daObjOnsen_create1st,     (process_method_func)daObjOnsen_MoveBGDelete,
     (process_method_func)daObjOnsen_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjOnsen_MoveBGDraw,
 };
 
-/* 80CA8184-80CA81B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Onsen */
 extern actor_process_profile_definition g_profile_Obj_Onsen = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp
index 19d79e690f..a5c521a599 100644
--- a/src/d/actor/d_a_obj_onsenFire.cpp
+++ b/src/d/actor/d_a_obj_onsenFire.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_onsenFire.h"
 #include "d/d_procname.h"
 
-/* 80CA8278-80CA82F4 000078 007C+00 1/1 0/0 0/0 .text            create__16daObjOnsenFire_cFv */
 int daObjOnsenFire_c::create() {
     fopAcM_ct(this, daObjOnsenFire_c);
          /* dSv_event_flag_c::F_0377 - Castle Town - Goron spring water shop open! */
@@ -18,7 +17,6 @@ int daObjOnsenFire_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CA82F4-80CA83FC 0000F4 0108+00 1/1 0/0 0/0 .text            execute__16daObjOnsenFire_cFv */
 int daObjOnsenFire_c::execute() {
     dComIfGp_particle_setSimple(0x100,&current.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
     dComIfGp_particle_setSimple(0x101,&current.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
@@ -27,33 +25,25 @@ int daObjOnsenFire_c::execute() {
     return 1;
 }
 
-/* 80CA83FC-80CA841C 0001FC 0020+00 1/0 0/0 0/0 .text daObjOnsenFire_Create__FP10fopAc_ac_c */
 static int daObjOnsenFire_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjOnsenFire_c*>(i_this)->create();
 }
 
-/* 80CA841C-80CA843C 00021C 0020+00 1/0 0/0 0/0 .text daObjOnsenFire_Execute__FP16daObjOnsenFire_c
- */
 static int daObjOnsenFire_Execute(daObjOnsenFire_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CA843C-80CA846C 00023C 0030+00 1/0 0/0 0/0 .text daObjOnsenFire_Delete__FP16daObjOnsenFire_c
- */
 static int daObjOnsenFire_Delete(daObjOnsenFire_c* i_this) {
     i_this->~daObjOnsenFire_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80CA8480-80CA84A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjOnsenFire_Method */
 static actor_method_class l_daObjOnsenFire_Method = {
     (process_method_func)daObjOnsenFire_Create,
     (process_method_func)daObjOnsenFire_Delete,
     (process_method_func)daObjOnsenFire_Execute
 };
 
-/* 80CA84A0-80CA84D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_ONSEN_FIRE */
 extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = {
     fpcLy_CURRENT_e,           // mLayerID         
     3,                         // mListID       
diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp
index 67f83b283b..47092de050 100644
--- a/src/d/actor/d_a_obj_onsenTaru.cpp
+++ b/src/d/actor/d_a_obj_onsenTaru.cpp
@@ -11,7 +11,6 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 80CA85CC-80CA861C 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__15daOnsTaru_HIO_cFv */
 daOnsTaru_HIO_c::daOnsTaru_HIO_c() {
     mCoolTime = 120;
     mVibration = 3;
@@ -19,10 +18,8 @@ daOnsTaru_HIO_c::daOnsTaru_HIO_c() {
     mCollisionRadius = 125.0f;
 }
 
-/* 80CA9DF4-80CA9E04 000014 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daOnsTaru_HIO_c l_HIO;
 
-/* 80CA9B80-80CA9BB0 000008 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__11daOnsTaru_c */
 const dCcD_SrcGObjInf daOnsTaru_c::mCcDObjInfo = {
     {0, {{8, 0, 0x1F}, {0xD8FADDAF, 0x1F}, {0x79}}},
     {dCcD_SE_NONE, 0, 1, 0, 0},
@@ -30,7 +27,6 @@ const dCcD_SrcGObjInf daOnsTaru_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80CA9C38-80CA9C7C 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daOnsTaru_c */
 dCcD_SrcCyl daOnsTaru_c::mCcDCyl = {
     daOnsTaru_c::mCcDObjInfo,
     {
@@ -40,7 +36,6 @@ dCcD_SrcCyl daOnsTaru_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80CA86C0-80CA8748 0001E0 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daOnsTaru_cFv */
 void daOnsTaru_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -48,7 +43,6 @@ void daOnsTaru_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CA8748-80CA87B4 000268 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daOnsTaru_cFv */
 int daOnsTaru_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("maroTaru", 3);
     JUT_ASSERT(231, modelData != NULL);
@@ -61,7 +55,6 @@ int daOnsTaru_c::CreateHeap() {
     return 1;
 }
 
-/* 80CA87B4-80CA8A54 0002D4 02A0+00 1/1 0/0 0/0 .text            create__11daOnsTaru_cFv */
 int daOnsTaru_c::create() {
     fopAcM_ct(this, daOnsTaru_c);
 
@@ -108,23 +101,18 @@ int daOnsTaru_c::create() {
     return phase_state;
 }
 
-/* 80CA8C20-80CA8C4C 000740 002C+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daOnsTaru_cFP10fopAc_ac_c              */
 int daOnsTaru_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daOnsTaru_c*)i_this)->CreateHeap();
 }
 
-/* 80CA8C4C-80CA8C70 00076C 0024+00 1/1 0/0 0/0 .text            chkSinkAll__11daOnsTaru_cFv */
 BOOL daOnsTaru_c::chkSinkAll() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + 100.0f;
 }
 
-/* 80CA8C70-80CA8C94 000790 0024+00 3/3 0/0 0/0 .text            chkWaterLineIn__11daOnsTaru_cFv */
 BOOL daOnsTaru_c::chkWaterLineIn() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + 40.0f;
 }
 
-/* 80CA8C94-80CA8F38 0007B4 02A4+00 1/1 0/0 0/0 .text            bgCheck__11daOnsTaru_cFv */
 void daOnsTaru_c::bgCheck() {
     bool roof_hit = mAcch.ChkRoofHit();
     bool wall_hit = mAcch.ChkWallHit();
@@ -179,7 +167,6 @@ void daOnsTaru_c::bgCheck() {
     }
 }
 
-/* 80CA8F38-80CA9184 000A58 024C+00 1/0 0/0 0/0 .text            Execute__11daOnsTaru_cFv */
 int daOnsTaru_c::Execute() {
     field_0x594 = speed;
     mode_proc_call();
@@ -234,7 +221,6 @@ int daOnsTaru_c::Execute() {
     return 1;
 }
 
-/* 80CA9184-80CA929C 000CA4 0118+00 1/1 0/0 0/0 .text            mode_proc_call__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_call() {
     typedef void (daOnsTaru_c::*mode_func)();
     static mode_func l_mode_func[] = {
@@ -251,7 +237,6 @@ void daOnsTaru_c::mode_proc_call() {
     mIsCarryNow = fopAcM_checkCarryNow(this);
 }
 
-/* 80CA929C-80CA92CC 000DBC 0030+00 2/2 0/0 0/0 .text            mode_init_wait__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_init_wait() {
     cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     speedF = 0.0f;
@@ -259,12 +244,10 @@ void daOnsTaru_c::mode_init_wait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80CA92CC-80CA92F0 000DEC 0024+00 1/0 0/0 0/0 .text            mode_proc_wait__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_wait() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
 }
 
-/* 80CA92F0-80CA9320 000E10 0030+00 1/1 0/0 0/0 .text            mode_init_carry__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_init_carry() {
     mCcCyl.OffCoSetBit();
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
@@ -272,7 +255,6 @@ void daOnsTaru_c::mode_init_carry() {
     mMode = MODE_CARRY_e;
 }
 
-/* 80CA9320-80CA93C0 000E40 00A0+00 1/0 0/0 0/0 .text            mode_proc_carry__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_carry() {
     daPy_getPlayerActorClass()->setGrabCollisionOffset(mGrabOffset.x, mGrabOffset.z, NULL);
 
@@ -287,7 +269,6 @@ void daOnsTaru_c::mode_proc_carry() {
     }
 }
 
-/* 80CA93C0-80CA9400 000EE0 0040+00 1/1 0/0 0/0 .text            mode_init_drop__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_init_drop() {
     mCcCyl.OnAtSetBit();
     mCollisionRadius = l_HIO.mCollisionRadius;
@@ -296,12 +277,10 @@ void daOnsTaru_c::mode_init_drop() {
     mMode = MODE_DROP_e;
 }
 
-/* 80CA9400-80CA9424 000F20 0024+00 1/0 0/0 0/0 .text            mode_proc_drop__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_drop() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
 }
 
-/* 80CA9424-80CA9514 000F44 00F0+00 2/2 0/0 0/0 .text            mode_init_break__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_init_break() {
     mDoAud_seStart(Z2SE_OBJ_ONSEN_TARU_BRK, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -313,16 +292,13 @@ void daOnsTaru_c::mode_init_break() {
     mMode = MODE_BREAK_e;
 }
 
-/* 80CA9514-80CA9518 001034 0004+00 1/0 0/0 0/0 .text            mode_proc_break__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_break() {}
 
-/* 80CA9518-80CA9530 001038 0018+00 2/2 0/0 0/0 .text            mode_init_sink__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_init_sink() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mMode = MODE_SINK_e;
 }
 
-/* 80CA9530-80CA9620 001050 00F0+00 1/0 0/0 0/0 .text            mode_proc_sink__11daOnsTaru_cFv */
 void daOnsTaru_c::mode_proc_sink() {
     cLib_addCalc(&speedF, 0.0f, 0.05f, 0.1f, 0.01f);
     speed.y = cLib_minMaxLimit<f32>(speed.y, -15.0f, 13.0f);
@@ -346,7 +322,6 @@ void daOnsTaru_c::mode_proc_sink() {
     }
 }
 
-/* 80CA9620-80CA98B8 001140 0298+00 1/1 0/0 0/0 .text            breakEffSet__11daOnsTaru_cFv */
 void daOnsTaru_c::breakEffSet() {
     dComIfGp_particle_set(0x8A9A, &current.pos, NULL, NULL);
     dComIfGp_particle_set(0x8A9B, &current.pos, NULL, NULL);
@@ -371,7 +346,6 @@ void daOnsTaru_c::breakEffSet() {
     }
 }
 
-/* 80CA98B8-80CA995C 0013D8 00A4+00 1/0 0/0 0/0 .text            Draw__11daOnsTaru_cFv */
 int daOnsTaru_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -382,42 +356,33 @@ int daOnsTaru_c::Draw() {
     return 1;
 }
 
-/* 80CA995C-80CA998C 00147C 0030+00 1/0 0/0 0/0 .text            Delete__11daOnsTaru_cFv */
 int daOnsTaru_c::Delete() {
     dComIfG_resDelete(&mPhase, "maroTaru");
     return 1;
 }
 
-/* 80CA998C-80CA99B8 0014AC 002C+00 1/0 0/0 0/0 .text            daOnsTaru_Draw__FP11daOnsTaru_c */
 static int daOnsTaru_Draw(daOnsTaru_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CA99B8-80CA99E4 0014D8 002C+00 1/0 0/0 0/0 .text            daOnsTaru_Execute__FP11daOnsTaru_c
- */
 static int daOnsTaru_Execute(daOnsTaru_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80CA99E4-80CA9A10 001504 002C+00 1/0 0/0 0/0 .text            daOnsTaru_Delete__FP11daOnsTaru_c
- */
 static int daOnsTaru_Delete(daOnsTaru_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CA9A10-80CA9A30 001530 0020+00 1/0 0/0 0/0 .text            daOnsTaru_Create__FP10fopAc_ac_c */
 static int daOnsTaru_Create(fopAc_ac_c* i_this) {
     return ((daOnsTaru_c*)i_this)->create();
 }
 
-/* 80CA9CF4-80CA9D14 -00001 0020+00 1/0 0/0 0/0 .data            l_daOnsTaru_Method */
 static actor_method_class l_daOnsTaru_Method = {
     (process_method_func)daOnsTaru_Create,  (process_method_func)daOnsTaru_Delete,
     (process_method_func)daOnsTaru_Execute, (process_method_func)NULL,
     (process_method_func)daOnsTaru_Draw,
 };
 
-/* 80CA9D14-80CA9D44 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_OnsenTaru */
 extern actor_process_profile_definition g_profile_Obj_OnsenTaru = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp
index 258fff6e1c..8161298b19 100644
--- a/src/d/actor/d_a_obj_ornament_cloth.cpp
+++ b/src/d/actor/d_a_obj_ornament_cloth.cpp
@@ -71,7 +71,6 @@ public:
 };
 #endif
 
-/* 80595CB4-80595CE4 000000 0030+00 4/4 0/0 0/0 .rodata          M_attr__14daObjOnCloth_c */
 daObjOnCloth_Attr_c const daObjOnCloth_c::M_attr = {
     8.0f,
     -40.0f,
@@ -89,7 +88,6 @@ daObjOnCloth_Attr_c const daObjOnCloth_c::M_attr = {
     0
 };
 
-/* 80595038-80595158 000078 0120+00 1/1 0/0 0/0 .text            create_init__14daObjOnCloth_cFv */
 void daObjOnCloth_c::create_init() {
     fopAcM_setCullSizeBox(this, -50.0f, -170.0f, -50.0f, 50.0f, 20.0f, 50.0f);
     ClothJoint_c* clothJoints_p = mClothJoints;
@@ -105,12 +103,10 @@ void daObjOnCloth_c::create_init() {
     initBaseMtx();
 }
 
-/* 80595158-80595178 000198 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjOnCloth_cFv */
 void daObjOnCloth_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80595178-805951DC 0001B8 0064+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjOnCloth_cFv */
 void daObjOnCloth_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -118,7 +114,6 @@ void daObjOnCloth_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 805951DC-805954B0 00021C 02D4+00 1/1 0/0 0/0 .text setNormalClothPos__14daObjOnCloth_cFv */
 void daObjOnCloth_c::setNormalClothPos() {
     cXyz sp4c = dKyw_get_AllWind_vecpow(&current.pos);
     sp4c *= attr().offset * attr().windRate;
@@ -144,7 +139,6 @@ void daObjOnCloth_c::setNormalClothPos() {
     }
 }
 
-/* 805954B0-80595638 0004F0 0188+00 1/1 0/0 0/0 .text            calcJointAngle__14daObjOnCloth_cFv */
 void daObjOnCloth_c::calcJointAngle() {
     cXyz sp24;
     ClothJoint_c* clothJoints_p = mClothJoints;
@@ -176,7 +170,6 @@ void daObjOnCloth_c::calcJointAngle() {
     }
 }
 
-/* 80595638-80595784 000678 014C+00 1/1 0/0 0/0 .text            checkPlayerMove__14daObjOnCloth_cFv */
 void daObjOnCloth_c::checkPlayerMove() {
     f32 fVar1 = field_0x650[0];
     ClothJoint_c* clothJoints_p = mClothJoints + 1;
@@ -206,7 +199,6 @@ void daObjOnCloth_c::checkPlayerMove() {
     }
 }
 
-/* 80595784-80595850 0007C4 00CC+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     if (param_2 != 0) {
         return 1;
@@ -226,7 +218,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80595D60-80595D64 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "J_Necktie";
 
 int daObjOnCloth_c::createHeap() {
@@ -265,7 +256,6 @@ int daObjOnCloth_c::createHeap() {
     return 1;
 }
 
-/* 80595850-805959E8 000890 0198+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* a_this) {
     return static_cast<daObjOnCloth_c*>(a_this)->createHeap();
 }
@@ -280,7 +270,6 @@ int daObjOnCloth_c::draw() {
     return 1;
 }
 
-/* 80595A30-80595AEC 000A70 00BC+00 1/0 0/0 0/0 .text daObjOnCloth_Draw__FP14daObjOnCloth_c */
 static int daObjOnCloth_Draw(daObjOnCloth_c* i_this) {
     return i_this->draw();
 }
@@ -292,12 +281,10 @@ int daObjOnCloth_c::execute() {
     return 1;
 }
 
-/* 80595AEC-80595B2C 000B2C 0040+00 1/0 0/0 0/0 .text daObjOnCloth_Execute__FP14daObjOnCloth_c */
 static int daObjOnCloth_Execute(daObjOnCloth_c* i_this) {
     return i_this->execute();
 }
 
-/* 80595B2C-80595B34 000B6C 0008+00 1/0 0/0 0/0 .text daObjOnCloth_IsDelete__FP14daObjOnCloth_c */
 static int daObjOnCloth_IsDelete(daObjOnCloth_c* i_this) {
     return 1;
 }
@@ -306,13 +293,11 @@ daObjOnCloth_c::~daObjOnCloth_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80595B34-80595B9C 000B74 0068+00 1/0 0/0 0/0 .text daObjOnCloth_Delete__FP14daObjOnCloth_c */
 static int daObjOnCloth_Delete(daObjOnCloth_c* i_this) {
     i_this->~daObjOnCloth_c();
     return 1;
 }
 
-/* 80595B9C-80595BD8 000BDC 003C+00 2/2 0/0 0/0 .text            __dt__12ClothJoint_cFv */
 ClothJoint_c::~ClothJoint_c() {}
 
 cPhs__Step daObjOnCloth_c::create() {
@@ -331,17 +316,14 @@ cPhs__Step daObjOnCloth_c::create() {
     return phase;
 }
 
-/* 80595BD8-80595CA8 000C18 00D0+00 1/0 0/0 0/0 .text            daObjOnCloth_Create__FP10fopAc_ac_c */
 static cPhs__Step daObjOnCloth_Create(fopAc_ac_c* a_this) {
     return static_cast<daObjOnCloth_c*>(a_this)->create();
 }
 
-/* 80595CA8-80595CAC 000CE8 0004+00 1/1 0/0 0/0 .text            __ct__12ClothJoint_cFv */
 ClothJoint_c::ClothJoint_c() {
     /* empty function */
 }
 
-/* 80595D64-80595D84 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjOnCloth_Method */
 static actor_method_class l_daObjOnCloth_Method = {
     (process_method_func)daObjOnCloth_Create,
     (process_method_func)daObjOnCloth_Delete,
@@ -350,7 +332,6 @@ static actor_method_class l_daObjOnCloth_Method = {
     (process_method_func)daObjOnCloth_Draw,
 };
 
-/* 80595D84-80595DB4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_OnCloth */
 extern actor_process_profile_definition g_profile_Obj_OnCloth = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp
index ec7f42579e..cbfd26c8c8 100644
--- a/src/d/actor/d_a_obj_pdoor.cpp
+++ b/src/d/actor/d_a_obj_pdoor.cpp
@@ -12,10 +12,7 @@
 #include "cmath.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
-#include "dol2asm.h"
 
-/* 80CA9E98-80CA9F9C 000078 0104+00 1/1 0/0 0/0 .text
- * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static fopAc_ac_c* PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* param_2, s16 param_3,
                            dBgW_Base::PushPullLabel param_4) {
     int iVar2 = cLib_checkBit<int>(param_4, 3);
@@ -42,13 +39,11 @@ static fopAc_ac_c* PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* param_2, s16 param
     return i_this;
 }
 
-/* 80CA9F9C-80CA9FD8 00017C 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjPDoor_cFv */
 void daObjPDoor_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CA9FD8-80CAA03C 0001B8 0064+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjPDoor_cFv */
 void daObjPDoor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -56,16 +51,13 @@ void daObjPDoor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CAAB6C-80CAAB70 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_OsuDoor";
 
-/* 80CAAB70-80CAAB88 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static f32 l_cull_box[6] = {
     0.0f, 0.0f, -600.0f,
     600.0f, 1000.0f, 600.0f,
 };
 
-/* 80CAA03C-80CAA14C 00021C 0110+00 1/0 0/0 0/0 .text            Create__12daObjPDoor_cFv */
 int daObjPDoor_c::Create() {
     BOOL isSw = fopAcM_isSwitch(this, getSwbit());
     BOOL isSw2 = fopAcM_isSwitch(this, getSwbit2());
@@ -89,7 +81,6 @@ int daObjPDoor_c::Create() {
     return 1;
 }
 
-/* 80CAA14C-80CAA1BC 00032C 0070+00 1/0 0/0 0/0 .text            CreateHeap__12daObjPDoor_cFv */
 int daObjPDoor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(270, modelData != NULL);
@@ -97,7 +88,6 @@ int daObjPDoor_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80CAA1BC-80CAA23C 00039C 0080+00 1/1 0/0 0/0 .text            create1st__12daObjPDoor_cFv */
 int daObjPDoor_c::create1st() {
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -109,8 +99,6 @@ int daObjPDoor_c::create1st() {
     return rv;
 }
 
-/* 80CAA23C-80CAA290 00041C 0054+00 1/0 0/0 0/0 .text            Execute__12daObjPDoor_cFPPA3_A4_f
- */
 int daObjPDoor_c::Execute(Mtx** ppMtx) {
     mode_proc_call();
     *ppMtx = &mBgMtx;
@@ -119,7 +107,6 @@ int daObjPDoor_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80CAA290-80CAA31C 000470 008C+00 1/1 0/0 0/0 .text            mode_proc_call__12daObjPDoor_cFv */
 void daObjPDoor_c::mode_proc_call() {
     static daObjPDoor_c::modeFunc l_func[2] = {
         &daObjPDoor_c::modeWait,
@@ -128,7 +115,6 @@ void daObjPDoor_c::mode_proc_call() {
     (this->*(l_func[mMode]))();
 }
 
-/* 80CAA31C-80CAA354 0004FC 0038+00 1/1 0/0 0/0 .text            init_modeWait__12daObjPDoor_cFv */
 void daObjPDoor_c::init_modeWait() {
     field_0x5ba = 0;
     field_0x5b0 = -1;
@@ -138,7 +124,6 @@ void daObjPDoor_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80CAA354-80CAA698 000534 0344+00 1/0 0/0 0/0 .text            modeWait__12daObjPDoor_cFv */
 void daObjPDoor_c::modeWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     bool bVar3 = true;
@@ -213,8 +198,6 @@ void daObjPDoor_c::modeWait() {
     }
 }
 
-/* 80CAA698-80CAA6B4 000878 001C+00 1/1 0/0 0/0 .text            init_modeRotate__12daObjPDoor_cFv
- */
 void daObjPDoor_c::init_modeRotate() {
     field_0x5bc = 0;
     field_0x5b4 = 0;
@@ -222,7 +205,6 @@ void daObjPDoor_c::init_modeRotate() {
     mMode = MODE_ROTATE;
 }
 
-/* 80CAA6B4-80CAA968 000894 02B4+00 1/0 0/0 0/0 .text            modeRotate__12daObjPDoor_cFv */
 void daObjPDoor_c::modeRotate() {
     daPy_getPlayerActorClass();
     field_0x5b8++;
@@ -256,7 +238,6 @@ void daObjPDoor_c::modeRotate() {
     }
 }
 
-/* 80CAA968-80CAAA0C 000B48 00A4+00 1/0 0/0 0/0 .text            Draw__12daObjPDoor_cFv */
 int daObjPDoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -266,36 +247,29 @@ int daObjPDoor_c::Draw() {
     return 1;
 }
 
-/* 80CAAA0C-80CAAA4C 000BEC 0040+00 1/0 0/0 0/0 .text            Delete__12daObjPDoor_cFv */
 int daObjPDoor_c::Delete() {
     mpBgW->SetPushPullCallback(NULL);
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80CAAA4C-80CAAAAC 000C2C 0060+00 1/0 0/0 0/0 .text daObjPDoor_create1st__FP12daObjPDoor_c */
 static int daObjPDoor_create1st(daObjPDoor_c* i_this) {
     fopAcM_ct(i_this, daObjPDoor_c);
     return i_this->create1st();
 }
 
-/* 80CAAAAC-80CAAACC 000C8C 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDelete__FP12daObjPDoor_c */
 static int daObjPDoor_MoveBGDelete(daObjPDoor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CAAACC-80CAAAEC 000CAC 0020+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGExecute__FP12daObjPDoor_c
- */
 static int daObjPDoor_MoveBGExecute(daObjPDoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CAAAEC-80CAAB18 000CCC 002C+00 1/0 0/0 0/0 .text daObjPDoor_MoveBGDraw__FP12daObjPDoor_c */
 static int daObjPDoor_MoveBGDraw(daObjPDoor_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CAABB8-80CAABD8 -00001 0020+00 1/0 0/0 0/0 .data            daObjPDoor_METHODS */
 static actor_method_class daObjPDoor_METHODS = {
     (process_method_func)daObjPDoor_create1st,
     (process_method_func)daObjPDoor_MoveBGDelete,
@@ -304,7 +278,6 @@ static actor_method_class daObjPDoor_METHODS = {
     (process_method_func)daObjPDoor_MoveBGDraw,
 };
 
-/* 80CAABD8-80CAAC08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_PushDoor */
 extern actor_process_profile_definition g_profile_Obj_PushDoor = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp
index 9f6026e00f..a978454723 100644
--- a/src/d/actor/d_a_obj_pdtile.cpp
+++ b/src/d/actor/d_a_obj_pdtile.cpp
@@ -11,64 +11,48 @@
 #include "d/d_bg_w.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80CAACB8-80CAACE0 000078 0028+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     static_cast<daObjPDtile_c*>(param_2)->rideActor(param_3);
 }
 
-/* 80CAC5BC-80CAC5C0 -00001 0004+00 0/1 0/0 0/0 .data            l_arcName4 */
 static char* l_arcName4 = "P_Dtile";
 
-/* 80CAC5C0-80CAC5C8 000024 0008+00 0/1 0/0 0/0 .data            l_dzbidx4 */
 static u32 l_dzbidx4[2] = {
     9, 8,
 };
 
-/* 80CAC5C8-80CAC5D0 00002C 0008+00 0/1 0/0 0/0 .data            l_bmdidx4 */
 static u32 l_bmdidx4[2] = {
     5, 4,
 };
 
-/* 80CAC5D0-80CAC600 000034 0030+00 0/1 0/0 0/0 .data            l_cull_box4 */
 static Vec l_cull_box4[2][2] = {
     {{-50.0f, -100.0f, -50.0f}, {50.0f, 20.49f, 50.0f}},
     {{-160.0f, -460.0f, -160.0f}, {160.0f, 20.0f, 160.0f}},
 };
 
-/* 80CAC600-80CAC604 -00001 0004+00 0/1 0/0 0/0 .data            l_arcName7 */
 static char* l_arcName7 = "P_Dtile00";
 
-/* 80CAC604-80CAC608 000068 0004+00 0/1 0/0 0/0 .data            l_dzbidx7 */
 static u32 l_dzbidx7 = 7;
 
-/* 80CAC608-80CAC60C 00006C 0004+00 0/1 0/0 0/0 .data            l_bmdidx7 */
 static u32 l_bmdidx7 = 4;
 
-/* 80CAC60C-80CAC624 000070 0018+00 0/1 0/0 0/0 .data            l_cull_box7 */
 static Vec l_cull_box7[2] = {
     {-200.0f, -700.0f, -200.0f},
     {200.0f, 50.0f, 200.0f},
 };
 
-/* 80CAC624-80CAC628 -00001 0004+00 0/1 0/0 0/0 .data            l_arcName9 */
 static char* l_arcName9 = "Lv9_Dtile";
 
-/* 80CAC628-80CAC62C 00008C 0004+00 0/1 0/0 0/0 .data            l_dzbidx9 */
 static u32 l_dzbidx9 = 7;
 
-/* 80CAC62C-80CAC630 000090 0004+00 0/1 0/0 0/0 .data            l_bmdidx9 */
 static u32 l_bmdidx9 = 4;
 
-/* 80CAC630-80CAC648 000094 0018+00 0/1 0/0 0/0 .data            l_cull_box9 */
 static Vec l_cull_box9[2] = {
     {-200.0f, -650.0f, -200.0f},
     {200.0f, 50.0f, 200.0f},
 };
 
-/* 80CAACE0-80CAAE80 0000A0 01A0+00 1/1 0/0 0/0 .text            create1st__13daObjPDtile_cFv */
 int daObjPDtile_c::create1st() {
     mType = (Type)getType();
     if (mType == TYPE_4) {
@@ -116,7 +100,6 @@ int daObjPDtile_c::create1st() {
     return rv;
 }
 
-/* 80CAAE80-80CAAF90 000240 0110+00 3/3 0/0 0/0 .text            setMtx__13daObjPDtile_cFv */
 void daObjPDtile_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x + field_0x620.x,
                            current.pos.y,
@@ -140,7 +123,6 @@ void daObjPDtile_c::setMtx() {
     }
 }
 
-/* 80CAAF90-80CAB1F0 000350 0260+00 1/1 0/0 0/0 .text rideActor__13daObjPDtile_cFP10fopAc_ac_c */
 void daObjPDtile_c::rideActor(fopAc_ac_c* param_1) {
     if (param_1 == daPy_getLinkPlayerActorClass() ||
         fopAcM_GetProfName(param_1) == PROC_B_GG)
@@ -196,7 +178,6 @@ void daObjPDtile_c::rideActor(fopAc_ac_c* param_1) {
     field_0x7b4 = 1;
 }
 
-/* 80CAB1F0-80CAB258 0005B0 0068+00 1/0 0/0 0/0 .text            CreateHeap__13daObjPDtile_cFv */
 int daObjPDtile_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(mArcName, mBmdId);
     JUT_ASSERT(557, model_data != NULL);
@@ -204,8 +185,6 @@ int daObjPDtile_c::CreateHeap() {
     return mModel != 0 ? TRUE : FALSE;
 }
 
-/* ############################################################################################## */
-/* 80CAC648-80CAC68C 0000AC 0044+00 1/1 0/0 0/0 .data            cc_cyl_src */
 static dCcD_SrcCyl cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x8020, 0x11}, 0x0}}, // mObj
@@ -220,7 +199,6 @@ static dCcD_SrcCyl cc_cyl_src = {
     } // mCyl
 };
 
-/* 80CAB258-80CAB374 000618 011C+00 1/0 0/0 0/0 .text            Create__13daObjPDtile_cFv */
 int daObjPDtile_c::Create() {
     mModel->setBaseTRMtx(field_0x5d8);
     fopAcM_SetMtx(this, field_0x5d8);
@@ -247,8 +225,6 @@ int daObjPDtile_c::Create() {
     return 1;
 }
 
-/* 80CAB374-80CABED8 000734 0B64+00 1/0 0/0 0/0 .text            Execute__13daObjPDtile_cFPPA3_A4_f
- */
 int daObjPDtile_c::Execute(Mtx** param_1) {
     if (mCyl.ChkTgHit()) {
         field_0x614 = 1;
@@ -489,7 +465,6 @@ int daObjPDtile_c::Execute(Mtx** param_1) {
     return 1;
 }
 
-/* 80CABF50-80CAC094 001310 0144+00 1/0 0/0 0/0 .text            Draw__13daObjPDtile_cFv */
 int daObjPDtile_c::Draw() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (field_0x610 == 4 && player != NULL) {
@@ -513,38 +488,30 @@ int daObjPDtile_c::Draw() {
     return 1;
 }
 
-/* 80CAC094-80CAC0D8 001454 0044+00 1/0 0/0 0/0 .text            Delete__13daObjPDtile_cFv */
 int daObjPDtile_c::Delete() {
     dComIfG_resDelete(this, mArcName);
     mSoundObj.deleteObject();
     return 1;
 }
 
-/* 80CAC0D8-80CAC1D4 001498 00FC+00 1/0 0/0 0/0 .text daObjPDtile_create1st__FP13daObjPDtile_c */
 static int daObjPDtile_create1st(daObjPDtile_c* i_this) {
     fopAcM_ct(i_this,daObjPDtile_c);
     return i_this->create1st();
 }
 
-/* 80CAC2C0-80CAC2E0 001680 0020+00 1/0 0/0 0/0 .text daObjPDtile_MoveBGDelete__FP13daObjPDtile_c
- */
 static int daObjPDtile_MoveBGDelete(daObjPDtile_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CAC2E0-80CAC300 0016A0 0020+00 1/0 0/0 0/0 .text daObjPDtile_MoveBGExecute__FP13daObjPDtile_c
- */
 static int daObjPDtile_MoveBGExecute(daObjPDtile_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CAC300-80CAC32C 0016C0 002C+00 1/0 0/0 0/0 .text daObjPDtile_MoveBGDraw__FP13daObjPDtile_c */
 static int daObjPDtile_MoveBGDraw(daObjPDtile_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
 
-/* 80CAC68C-80CAC6AC -00001 0020+00 1/0 0/0 0/0 .data            daObjPDtile_METHODS */
 static actor_method_class daObjPDtile_METHODS = {
     (process_method_func)daObjPDtile_create1st,
     (process_method_func)daObjPDtile_MoveBGDelete,
@@ -553,7 +520,6 @@ static actor_method_class daObjPDtile_METHODS = {
     (process_method_func)daObjPDtile_MoveBGDraw,
 };
 
-/* 80CAC6AC-80CAC6DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_PDtile */
 extern actor_process_profile_definition g_profile_Obj_PDtile = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp
index 72c09c23f8..e33ee4e5b0 100644
--- a/src/d/actor/d_a_obj_pdwall.cpp
+++ b/src/d/actor/d_a_obj_pdwall.cpp
@@ -9,10 +9,8 @@
 
 static const int l_dzbidx = 7;
 
-/* 80CAD1FC-80CAD200 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Dwall";
 
-/* 80CAC7F8-80CAC8DC 000078 00E4+00 1/1 0/0 0/0 .text            create1st__13daObjPDwall_cFv */
 int daObjPDwall_c::create1st() {
     int phase_state = dComIfG_resLoad(this, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -33,13 +31,11 @@ int daObjPDwall_c::create1st() {
     return phase_state;
 }
 
-/* 80CAD1B8-80CAD1D0 000000 0018+00 2/2 0/0 0/0 .rodata          l_cull_box */
 static const cull_box l_cull_box = {
     {-100.0f, -800.0f, -300.0f},
     {750.0f, 500.0f, 300.0f},
 };
 
-/* 80CAC8DC-80CACA44 00015C 0168+00 2/2 0/0 0/0 .text            setMtx__13daObjPDwall_cFv */
 void daObjPDwall_c::setMtx() {
     for (int i = 0; i < 10; i++) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x808[i], current.pos.z);
@@ -57,7 +53,6 @@ void daObjPDwall_c::setMtx() {
     }
 }
 
-/* 80CACA44-80CACBA8 0002C4 0164+00 1/0 0/0 0/0 .text            CreateHeap__13daObjPDwall_cFv */
 int daObjPDwall_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(175, model_data != NULL);
@@ -86,7 +81,6 @@ int daObjPDwall_c::CreateHeap() {
     return 1;
 }
 
-/* 80CACBA8-80CACCE0 000428 0138+00 1/0 0/0 0/0 .text            Create__13daObjPDwall_cFv */
 int daObjPDwall_c::Create() {
     field_0xa14 = 0;
 
@@ -113,8 +107,6 @@ int daObjPDwall_c::Create() {
     return 1;
 }
 
-/* 80CACCE0-80CACF14 000560 0234+00 1/0 0/0 0/0 .text            Execute__13daObjPDwall_cFPPA3_A4_f
- */
 int daObjPDwall_c::Execute(Mtx** param_0) {
     if (field_0xa10 == 0 && fopAcM_isSwitch(this, getSwNo())) {
         field_0xa14++;
@@ -157,7 +149,6 @@ int daObjPDwall_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CACF14-80CACFD4 000794 00C0+00 1/0 0/0 0/0 .text            Draw__13daObjPDwall_cFv */
 int daObjPDwall_c::Draw() {
     dComIfGd_setListBG();
 
@@ -171,7 +162,6 @@ int daObjPDwall_c::Draw() {
     return 1;
 }
 
-/* 80CACFD4-80CAD074 000854 00A0+00 1/0 0/0 0/0 .text            Delete__13daObjPDwall_cFv */
 int daObjPDwall_c::Delete() {
     for (int i = 0; i < 9; i++) {
         if (mpBgw[i] != NULL && mpBgw[i]->ChkUsed()) {
@@ -183,30 +173,23 @@ int daObjPDwall_c::Delete() {
     return 1;
 }
 
-/* 80CAD074-80CAD0D4 0008F4 0060+00 1/0 0/0 0/0 .text daObjPDwall_create1st__FP13daObjPDwall_c */
 static int daObjPDwall_create1st(daObjPDwall_c* i_this) {
     fopAcM_ct(i_this, daObjPDwall_c);
     return i_this->create1st();
 }
 
-/* 80CAD0D4-80CAD0F4 000954 0020+00 1/0 0/0 0/0 .text daObjPDwall_MoveBGDelete__FP13daObjPDwall_c
- */
 static int daObjPDwall_MoveBGDelete(daObjPDwall_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CAD0F4-80CAD114 000974 0020+00 1/0 0/0 0/0 .text daObjPDwall_MoveBGExecute__FP13daObjPDwall_c
- */
 static int daObjPDwall_MoveBGExecute(daObjPDwall_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CAD114-80CAD140 000994 002C+00 1/0 0/0 0/0 .text daObjPDwall_MoveBGDraw__FP13daObjPDwall_c */
 static int daObjPDwall_MoveBGDraw(daObjPDwall_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CAD200-80CAD220 -00001 0020+00 1/0 0/0 0/0 .data            daObjPDwall_METHODS */
 static actor_method_class daObjPDwall_METHODS = {
     (process_method_func)daObjPDwall_create1st,
     (process_method_func)daObjPDwall_MoveBGDelete,
@@ -215,7 +198,6 @@ static actor_method_class daObjPDwall_METHODS = {
     (process_method_func)daObjPDwall_MoveBGDraw,
 };
 
-/* 80CAD220-80CAD250 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_PDwall */
 extern actor_process_profile_definition g_profile_Obj_PDwall = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp
index 0a68e6f752..0e56c045d3 100644
--- a/src/d/actor/d_a_obj_picture.cpp
+++ b/src/d/actor/d_a_obj_picture.cpp
@@ -7,26 +7,21 @@
 
 #include "d/actor/d_a_obj_picture.h"
 
-/* 80CAD2F8-80CAD318 000078 0020+00 1/1 0/0 0/0 .text daObjPicture_c_createHeap__FP10fopAc_ac_c */
 static int daObjPicture_c_createHeap(fopAc_ac_c* i_this) {
     return ((daObjPicture_c*)i_this)->createHeap();
 }
 
-/* 80CAF0E8-80CAF0EC -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "L9Picture";
 
-/* 80CAF0EC-80CAF104 000004 0018+00 1/1 0/0 0/0 .data            l_LINE_OFFSET_POS */
 static Vec l_LINE_OFFSET_POS[] = {
     {-100.0f, 200.0f, -2.0f},
     {100.0f, 200.0f, -2.0f},
 };
 
-/* 80CAF104-80CAF110 00001C 000C+00 1/1 0/0 0/0 .data            l_PIC_AT_OFFSET_POS */
 static Vec l_PIC_AT_OFFSET_POS = {
     0.0f, 100.0f, 0.0f
 };
 
-/* 80CAD318-80CAD498 000098 0180+00 2/2 0/0 0/0 .text            __ct__14daObjPicture_cFv */
 daObjPicture_c::daObjPicture_c() {
     memset(mpBgw, 0, 8);
     mpRopestModel = NULL;
@@ -34,22 +29,18 @@ daObjPicture_c::daObjPicture_c() {
     memset(mpRopeMat, 0, 8);
 }
 
-/* 80CAD6C8-80CAD908 000448 0240+00 1/0 0/0 0/0 .text            __dt__14daObjPicture_cFv */
 daObjPicture_c::~daObjPicture_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CAF01C-80CAF024 000000 0008+00 6/6 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {
     11, 10,
 };
 
-/* 80CAF024-80CAF02C 000008 0008+00 0/1 0/0 0/0 .rodata          l_PictureBmdIdx */
 static const int l_PictureBmdIdx[] = {
     6, 7,
 };
 
-/* 80CAD908-80CADC18 000688 0310+00 1/1 0/0 0/0 .text            createHeap__14daObjPicture_cFv */
 int daObjPicture_c::createHeap() {
     int bmd_idx = getArg_0() & 1;
 
@@ -121,7 +112,6 @@ int daObjPicture_c::createHeap() {
     return 1;
 }
 
-/* 80CADC18-80CADFB0 000998 0398+00 1/1 0/0 0/0 .text            create__14daObjPicture_cFv */
 int daObjPicture_c::create() {
     fopAcM_ct(this, daObjPicture_c);
 
@@ -208,7 +198,6 @@ int daObjPicture_c::create() {
     return phase_state;
 }
 
-/* 80CADFB0-80CAE05C 000D30 00AC+00 1/1 0/0 0/0 .text            Delete__14daObjPicture_cFv */
 int daObjPicture_c::Delete() {
     for (int i = 0; i < 2; i++) {
         if (i == 1 && field_0xd26 != 0) {
@@ -224,7 +213,6 @@ int daObjPicture_c::Delete() {
     return 1;
 }
 
-/* 80CAE05C-80CAE1B8 000DDC 015C+00 1/1 0/0 0/0 .text            draw__14daObjPicture_cFv */
 int daObjPicture_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpRopestModel, &tevStr);
@@ -248,7 +236,6 @@ int daObjPicture_c::draw() {
     return 1;
 }
 
-/* 80CAE1B8-80CAE510 000F38 0358+00 1/1 0/0 0/0 .text            execute__14daObjPicture_cFv */
 int daObjPicture_c::execute() {
     if (field_0xd26 != 0) {
         setTmgModelMtx();
@@ -333,7 +320,6 @@ int daObjPicture_c::execute() {
     return 1;
 }
 
-/* 80CAE510-80CAE5B0 001290 00A0+00 1/1 0/0 0/0 .text            init__14daObjPicture_cFv */
 void daObjPicture_c::init() {
     field_0xd24 = 0;
     gravity = -3.0f;
@@ -348,8 +334,6 @@ void daObjPicture_c::init() {
     mDoMtx_stack_c::multVec(&sp8, &field_0xca0);
 }
 
-/* 80CAE5B0-80CAE638 001330 0088+00 2/2 0/0 0/0 .text            setPicModelMtx__14daObjPicture_cFv
- */
 void daObjPicture_c::setPicModelMtx() {
     if (field_0xd26 == 0) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -359,8 +343,6 @@ void daObjPicture_c::setPicModelMtx() {
     }
 }
 
-/* 80CAE638-80CAE6C4 0013B8 008C+00 2/2 0/0 0/0 .text            setTmgModelMtx__14daObjPicture_cFv
- */
 void daObjPicture_c::setTmgModelMtx() {
     mDoMtx_stack_c::transS(home.pos.x, home.pos.y + 325.0f, home.pos.z);
     mDoMtx_stack_c::ZXYrotM(home.angle.x, home.angle.y, home.angle.z);
@@ -368,7 +350,6 @@ void daObjPicture_c::setTmgModelMtx() {
     mpRopestModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CAE6C4-80CAE744 001444 0080+00 4/4 0/0 0/0 .text getLinePosPic__14daObjPicture_cFiP4cXyz */
 void daObjPicture_c::getLinePosPic(int param_0, cXyz* o_pos) {
     *o_pos = l_LINE_OFFSET_POS[param_0];
     mDoMtx_stack_c::transS(current.pos);
@@ -376,13 +357,10 @@ void daObjPicture_c::getLinePosPic(int param_0, cXyz* o_pos) {
     mDoMtx_stack_c::multVec(o_pos, o_pos);
 }
 
-/* 80CAE744-80CAE76C 0014C4 0028+00 2/2 0/0 0/0 .text            getPosTmg__14daObjPicture_cFP4cXyz
- */
 void daObjPicture_c::getPosTmg(cXyz* o_pos) {
     o_pos->set(home.pos.x, 325.0f + home.pos.y, home.pos.z);
 }
 
-/* 80CAE76C-80CAE8E8 0014EC 017C+00 1/1 0/0 0/0 .text            setLinePos__14daObjPicture_cFv */
 void daObjPicture_c::setLinePos() {
     cXyz tmgpos;
     cXyz picpos[2];
@@ -411,8 +389,6 @@ void daObjPicture_c::setLinePos() {
     }
 }
 
-/* 80CAE8E8-80CAEA60 001668 0178+00 1/1 0/0 0/0 .text            moveLineFall1__14daObjPicture_cFv
- */
 void daObjPicture_c::moveLineFall1() {
     cXyz picpos[2];
     getLinePosPic(0, &picpos[0]);
@@ -445,8 +421,6 @@ void daObjPicture_c::moveLineFall1() {
     }
 }
 
-/* 80CAEA60-80CAED28 0017E0 02C8+00 1/1 0/0 0/0 .text            moveLineFall2__14daObjPicture_cFv
- */
 void daObjPicture_c::moveLineFall2() {
     field_0xd27 = 1;
 
@@ -482,7 +456,6 @@ void daObjPicture_c::moveLineFall2() {
     }
 }
 
-/* 80CAED28-80CAEDDC 001AA8 00B4+00 1/1 0/0 0/0 .text            chkHitRope__14daObjPicture_cFv */
 bool daObjPicture_c::chkHitRope() {
     for (int i = 0; i < 2; i++) {
         if (mCps[i].ChkTgHit()) {
@@ -499,7 +472,6 @@ bool daObjPicture_c::chkHitRope() {
     return 0;
 }
 
-/* 80CAEDDC-80CAEE90 001B5C 00B4+00 1/1 0/0 0/0 .text            chkHitBombTg__14daObjPicture_cFv */
 bool daObjPicture_c::chkHitBombTg() {
     for (int i = 0; i < 2; i++) {
         if (mCps2[i].ChkTgHit()) {
@@ -516,7 +488,6 @@ bool daObjPicture_c::chkHitBombTg() {
     return 0;
 }
 
-/* 80CAEE90-80CAEF18 001C10 0088+00 1/1 0/0 0/0 .text            setPicAtCol__14daObjPicture_cFv */
 void daObjPicture_c::setPicAtCol() {
     mPicAtPos = l_PIC_AT_OFFSET_POS;
     mDoMtx_stack_c::transS(current.pos);
@@ -526,28 +497,23 @@ void daObjPicture_c::setPicAtCol() {
     dComIfG_Ccsp()->Set(&mAtCyl);
 }
 
-/* 80CAEF18-80CAEF6C 001C98 0054+00 1/0 0/0 0/0 .text daObjPicture_create__FP14daObjPicture_c */
 static int daObjPicture_create(daObjPicture_c* i_this) {
     fopAcM_ct(i_this, daObjPicture_c);
     return i_this->create();
 }
 
-/* 80CAEF6C-80CAEF8C 001CEC 0020+00 1/0 0/0 0/0 .text daObjPicture_Delete__FP14daObjPicture_c */
 static int daObjPicture_Delete(daObjPicture_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CAEF8C-80CAEFAC 001D0C 0020+00 1/0 0/0 0/0 .text daObjPicture_execute__FP14daObjPicture_c */
 static int daObjPicture_execute(daObjPicture_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CAEFAC-80CAEFCC 001D2C 0020+00 1/0 0/0 0/0 .text daObjPicture_draw__FP14daObjPicture_c */
 static int daObjPicture_draw(daObjPicture_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CAF110-80CAF15C 000028 004C+00 1/1 0/0 0/0 .data            s_CcDCps__14daObjPicture_c */
 #if DEBUG
 const
 #endif
@@ -563,8 +529,6 @@ dCcD_SrcCps daObjPicture_c::s_CcDCps = {
     } // mCpsAttr
 };
 
-/* 80CAF15C-80CAF1A0 000074 0044+00 1/1 0/0 0/0 .data            s_CcDCyl_pic_at__14daObjPicture_c
- */
 #if DEBUG
 const
 #endif
@@ -582,7 +546,6 @@ dCcD_SrcCyl daObjPicture_c::s_CcDCyl_pic_at = {
     }  // mCyl
 };
 
-/* 80CAF1A0-80CAF1C0 -00001 0020+00 1/0 0/0 0/0 .data            daObjPicture_METHODS */
 static actor_method_class daObjPicture_METHODS = {
     (process_method_func)daObjPicture_create,
     (process_method_func)daObjPicture_Delete,
@@ -591,7 +554,6 @@ static actor_method_class daObjPicture_METHODS = {
     (process_method_func)daObjPicture_draw,
 };
 
-/* 80CAF1C0-80CAF1F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Picture */
 extern actor_process_profile_definition g_profile_Obj_Picture = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp
index 39d156b5d4..2b94b225b6 100644
--- a/src/d/actor/d_a_obj_pillar.cpp
+++ b/src/d/actor/d_a_obj_pillar.cpp
@@ -22,19 +22,14 @@
 #define SHAKE_MODE_QUAKE       102
 #define SHAKE_MODE_END         103
 
-/* 80CB09D4-80CB09DC 000000 0008+00 7/7 0/0 0/0 .rodata          l_bmd */
 static const int l_bmd[] = {5, 5};
 
-/* 80CB09DC-80CB09E4 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static const int l_dzb[] = {8, 8};
 
-/* 80CB09E4-80CB09EC 000010 0008+00 1/1 0/0 0/0 .rodata          l_shadowBmd */
 static const int l_shadowBmd[] = {4, 4};
 
-/* 80CB09EC-80CB09F4 000018 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0x1830, 0xC00};
 
-/* 80CB09F4-80CB0A38 000020 0044+00 1/1 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x400000, 0x11}, 0x0}}, // mObj
@@ -54,7 +49,6 @@ const static dCcD_SrcCyl l_cyl_src = {
 #define SHAKE_DATA_WEAK        2
 #define SHAKE_DATA_CRASH       3
 
-/* 80CB0A38-80CB0A68 000064 0030+00 2/4 0/0 0/0 .rodata          l_shake_data */
 static const daPillar_c::sdata_t l_shake_data[] = {
     /* CRASH FIRST */ {5, 0, 800, 20, 7000, 400, 65},
     /* STRONG      */ {255, 0, 600, 20, 6000, 300, 40},
@@ -62,13 +56,11 @@ static const daPillar_c::sdata_t l_shake_data[] = {
     /* CRASH       */ {5, 0, 800, 120, 7000, 30, 15},
 };
 
-/* 80CB0B08-80CB0B10 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {
     "K_mbhasi0",
     "K_mbhasi1",
 };
 
-/* 80CAF32C-80CAF3B0 0000EC 0084+00 1/1 0/0 0/0 .text            __ct__14daPillar_HIO_cFv */
 daPillar_HIO_c::daPillar_HIO_c() {
     mShakeData = l_shake_data[SHAKE_DATA_CRASH_FIRST];
     field_0x1c = 0.0f;
@@ -79,8 +71,6 @@ daPillar_HIO_c::daPillar_HIO_c() {
     mIsAdjust = false;
 }
 
-/* 80CAF3F8-80CAF4B4 0001B8 00BC+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
     if (((daPillar_c*)i_this)->mIsRollAttack && fopAcM_GetName(i_rideActor) == PROC_Obj_Carry) {
@@ -96,7 +86,6 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActo
     }
 }
 
-/* 80CAF4B4-80CAF5EC 000274 0138+00 2/2 0/0 0/0 .text            setBaseMtx__10daPillar_cFv */
 void daPillar_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, mRotY, shape_angle.z);
@@ -111,7 +100,6 @@ void daPillar_c::setBaseMtx() {
     }
 }
 
-/* 80CAF5EC-80CAF7A8 0003AC 01BC+00 1/0 0/0 0/0 .text            Create__10daPillar_cFv */
 int daPillar_c::Create() {
     setBaseMtx();
 
@@ -174,7 +162,6 @@ int daPillar_c::Create() {
     return 1;
 }
 
-/* 80CAF7A8-80CAF8A4 000568 00FC+00 1/0 0/0 0/0 .text            CreateHeap__10daPillar_cFv */
 int daPillar_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_bmd[mMdlType]);
     JUT_ASSERT(0, modelData != NULL);
@@ -195,7 +182,6 @@ int daPillar_c::CreateHeap() {
     return 1;
 }
 
-/* 80CAF8A4-80CAFA58 000664 01B4+00 1/1 0/0 0/0 .text            create1st__10daPillar_cFv */
 int daPillar_c::create1st() {
     fopAcM_ct(this, daPillar_c);
 
@@ -224,7 +210,6 @@ int daPillar_c::create1st() {
     return phase_state;
 }
 
-/* 80CAFB44-80CAFC08 000904 00C4+00 2/2 0/0 0/0 .text            checkAttacked__10daPillar_cFv */
 bool daPillar_c::checkAttacked() {
     u8 swbit = getSwbit();
     if (swbit != 0xFF) {
@@ -247,7 +232,6 @@ bool daPillar_c::checkAttacked() {
     return false;
 }
 
-/* 80CAFC08-80CAFD64 0009C8 015C+00 1/1 0/0 0/0 .text            on_switch__10daPillar_cFv */
 void daPillar_c::on_switch() {
     u8 swbit = getSwbit();
     if (swbit != 0xFF) {
@@ -281,7 +265,6 @@ void daPillar_c::on_switch() {
     }
 }
 
-/* 80CAFD64-80CAFF60 000B24 01FC+00 1/1 0/0 0/0 .text            checkShake__10daPillar_cFv */
 int daPillar_c::checkShake() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 player_dist = player->current.pos.abs(current.pos);
@@ -313,7 +296,6 @@ int daPillar_c::checkShake() {
     return SHAKE_NONE;
 }
 
-/* 80CAFF60-80CB01E0 000D20 0280+00 1/1 0/0 0/0 .text            setShake_rcrash__10daPillar_cFv */
 void daPillar_c::setShake_rcrash() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getLinkPlayer();
     u8 swbit = getSwbit();
@@ -342,22 +324,18 @@ void daPillar_c::setShake_rcrash() {
     }
 }
 
-/* 80CB01E0-80CB022C 000FA0 004C+00 1/1 0/0 0/0 .text            setShake_strong__10daPillar_cFv */
 void daPillar_c::setShake_strong() {
     mShakeData = l_shake_data[SHAKE_DATA_STRONG];
     shape_angle.x = mShakeData.mInitAngleX;
 }
 
-/* 80CB022C-80CB0278 000FEC 004C+00 1/1 0/0 0/0 .text            setShake_weak__10daPillar_cFv */
 void daPillar_c::setShake_weak() {
     mShakeData = l_shake_data[SHAKE_DATA_WEAK];
     shape_angle.x = mShakeData.mInitAngleX;
 }
 
-/* 80CB0C2C-80CB0C54 000014 0028+00 2/2 0/0 0/0 .bss             l_HIO */
 static daPillar_HIO_c l_HIO;
 
-/* 80CB0278-80CB031C 001038 00A4+00 1/1 0/0 0/0 .text            switch_proc_call__10daPillar_cFv */
 void daPillar_c::switch_proc_call() {
     typedef void (daPillar_c::*actionFunc)();
     static actionFunc l_func[] = {
@@ -369,7 +347,6 @@ void daPillar_c::switch_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80CB031C-80CB0378 0010DC 005C+00 1/0 0/0 0/0 .text            actionSwOnWait__10daPillar_cFv */
 void daPillar_c::actionSwOnWait() {
     if (mIsRollAttack) {
         if (checkAttacked()) {
@@ -383,7 +360,6 @@ void daPillar_c::actionSwOnWait() {
     }
 }
 
-/* 80CB0378-80CB03CC 001138 0054+00 2/1 0/0 0/0 .text            actionSwOn__10daPillar_cFv */
 void daPillar_c::actionSwOn() {
     OS_REPORT("swon:mTimer<%d>\n", mTimer);
     if (mTimer > 0) {
@@ -394,10 +370,8 @@ void daPillar_c::actionSwOn() {
     }
 }
 
-/* 80CB03CC-80CB03D0 00118C 0004+00 1/0 0/0 0/0 .text            actionEnd__10daPillar_cFv */
 void daPillar_c::actionEnd() {}
 
-/* 80CB03D0-80CB0658 001190 0288+00 1/0 0/0 0/0 .text            Execute__10daPillar_cFPPA3_A4_f */
 int daPillar_c::Execute(Mtx** param_0) {
     fopAcM_rollPlayerCrash(this, l_HIO.field_0x1c + 85.0f, 0xD, 200.0f, -100.0f, TRUE, l_HIO.field_0x20);
     mIsRollAttack = false;
@@ -464,7 +438,6 @@ int daPillar_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CB0658-80CB0740 001418 00E8+00 1/0 0/0 0/0 .text            Draw__10daPillar_cFv */
 int daPillar_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -481,36 +454,28 @@ int daPillar_c::Draw() {
     return 1;
 }
 
-/* 80CB0740-80CB0780 001500 0040+00 1/0 0/0 0/0 .text            Delete__10daPillar_cFv */
 int daPillar_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mMdlType]);
     return 1;
 }
 
-/* 80CB0780-80CB0874 001540 00F4+00 1/0 0/0 0/0 .text            daPillar_create1st__FP10daPillar_c
- */
 static int daPillar_create1st(daPillar_c* i_this) {
     fopAcM_ct(i_this, daPillar_c);
     return i_this->create1st();
 }
 
-/* 80CB0874-80CB0894 001634 0020+00 1/0 0/0 0/0 .text daPillar_MoveBGDelete__FP10daPillar_c */
 static int daPillar_MoveBGDelete(daPillar_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CB0894-80CB08B4 001654 0020+00 1/0 0/0 0/0 .text daPillar_MoveBGExecute__FP10daPillar_c */
 static int daPillar_MoveBGExecute(daPillar_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CB08B4-80CB08E0 001674 002C+00 1/0 0/0 0/0 .text            daPillar_MoveBGDraw__FP10daPillar_c
- */
 static int daPillar_MoveBGDraw(daPillar_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CB0B58-80CB0B78 -00001 0020+00 1/0 0/0 0/0 .data            daPillar_METHODS */
 static actor_method_class daPillar_METHODS = {
     (process_method_func)daPillar_create1st,
     (process_method_func)daPillar_MoveBGDelete,
@@ -519,7 +484,6 @@ static actor_method_class daPillar_METHODS = {
     (process_method_func)daPillar_MoveBGDraw,
 };
 
-/* 80CB0B78-80CB0BA8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Pillar */
 extern actor_process_profile_definition g_profile_Obj_Pillar = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp
index 81c278b52c..c76c4ccfad 100644
--- a/src/d/actor/d_a_obj_pleaf.cpp
+++ b/src/d/actor/d_a_obj_pleaf.cpp
@@ -6,20 +6,15 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_pleaf.h"
-#include "dol2asm.h"
 
-/* 80CB189C-80CB18A0 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "J_Hatake";
 
-/* 80CB0D4C-80CB0F08 0000EC 01BC+00 1/0 0/0 0/0 .text            __dt__13daObj_Pleaf_cFv */
 daObj_Pleaf_c::~daObj_Pleaf_c() {
     dComIfG_resDelete(&mPhaseReq, getResName());
 }
 
-/* 80CB1864-80CB1874 000000 0010+00 2/2 0/0 0/0 .rodata          m__19daObj_Pleaf_Param_c */
 daObj_Pleaf_Param_c::params const daObj_Pleaf_Param_c::m = {0, -3.0f, 1.0f, 900.0f};
 
-/* 80CB0F08-80CB1180 0002A8 0278+00 1/1 0/0 0/0 .text            create__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::create() {
     fopAcM_ct(this, daObj_Pleaf_c);
     mType = getType();
@@ -50,7 +45,6 @@ int daObj_Pleaf_c::create() {
     return phase;
 }
 
-/* 80CB134C-80CB13C4 0006EC 0078+00 1/1 0/0 0/0 .text            CreateHeap__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
     if (modelData == NULL) {
@@ -63,13 +57,11 @@ int daObj_Pleaf_c::CreateHeap() {
     return 0;
 }
 
-/* 80CB13C4-80CB13F8 000764 0034+00 1/1 0/0 0/0 .text            Delete__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::Delete() {
     this->~daObj_Pleaf_c();
     return 1;
 }
 
-/* 80CB13F8-80CB14D4 000798 00DC+00 2/2 0/0 0/0 .text            Execute__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::Execute() {
     cXyz new_pos = current.pos;
     new_pos.y += 50.0f;
@@ -86,7 +78,6 @@ int daObj_Pleaf_c::Execute() {
     return 1;
 }
 
-/* 80CB14D4-80CB1598 000874 00C4+00 1/1 0/0 0/0 .text            Draw__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -100,18 +91,14 @@ int daObj_Pleaf_c::Draw() {
     return 1;
 }
 
-/* 80CB1598-80CB15B8 000938 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daObj_Pleaf_cFP10fopAc_ac_c            */
 int daObj_Pleaf_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_Pleaf_c*>(i_this)->CreateHeap();
 }
 
-/* 80CB15B8-80CB15C8 000958 0010+00 3/3 0/0 0/0 .text            getResName__13daObj_Pleaf_cFv */
 char* daObj_Pleaf_c::getResName() {
     return l_resName;
 }
 
-/* 80CB15C8-80CB15E8 000968 0020+00 1/1 0/0 0/0 .text            isDelete__13daObj_Pleaf_cFv */
 int daObj_Pleaf_c::isDelete() {
     switch (mType) {
     case 0:
@@ -121,19 +108,15 @@ int daObj_Pleaf_c::isDelete() {
     }
 }
 
-/* 80CB15E8-80CB1644 000988 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__13daObj_Pleaf_cFv
- */
 void daObj_Pleaf_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80CB1644-80CB1684 0009E4 0040+00 2/2 0/0 0/0 .text            setRoomNo__13daObj_Pleaf_cFv */
 void daObj_Pleaf_c::setRoomNo() {
     fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
 }
 
-/* 80CB1684-80CB16E8 000A24 0064+00 1/1 0/0 0/0 .text            setMtx__13daObj_Pleaf_cFv */
 void daObj_Pleaf_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -141,39 +124,32 @@ void daObj_Pleaf_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CB16E8-80CB1708 000A88 0020+00 1/0 0/0 0/0 .text            daObj_Pleaf_Create__FPv */
 static int daObj_Pleaf_Create(void* i_this) {
     return static_cast<daObj_Pleaf_c*>(i_this)->create();
 }
 
-/* 80CB1708-80CB1728 000AA8 0020+00 1/0 0/0 0/0 .text            daObj_Pleaf_Delete__FPv */
 static int daObj_Pleaf_Delete(void* i_this) {
     return static_cast<daObj_Pleaf_c*>(i_this)->Delete();
 }
 
-/* 80CB1728-80CB1748 000AC8 0020+00 1/0 0/0 0/0 .text            daObj_Pleaf_Execute__FPv */
 static int daObj_Pleaf_Execute(void* i_this) {
     return static_cast<daObj_Pleaf_c*>(i_this)->Execute();
 }
 
-/* 80CB1748-80CB1768 000AE8 0020+00 1/0 0/0 0/0 .text            daObj_Pleaf_Draw__FPv */
 static int daObj_Pleaf_Draw(void* i_this) {
     return static_cast<daObj_Pleaf_c*>(i_this)->Draw();
 }
 
-/* 80CB1768-80CB1770 000B08 0008+00 1/0 0/0 0/0 .text            daObj_Pleaf_IsDelete__FPv */
 static int daObj_Pleaf_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CB18A0-80CB18C0 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Pleaf_MethodTable */
 static actor_method_class daObj_Pleaf_MethodTable = {
     (process_method_func)daObj_Pleaf_Create,  (process_method_func)daObj_Pleaf_Delete,
     (process_method_func)daObj_Pleaf_Execute, (process_method_func)daObj_Pleaf_IsDelete,
     (process_method_func)daObj_Pleaf_Draw,
 };
 
-/* 80CB18C0-80CB18F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_PLEAF */
 extern actor_process_profile_definition g_profile_OBJ_PLEAF = {
     fpcLy_CURRENT_e,           // mLayerID
     8,                         // mListID
@@ -191,5 +167,4 @@ extern actor_process_profile_definition g_profile_OBJ_PLEAF = {
     fopAc_CULLBOX_CUSTOM_e,    // cullType
 };
 
-/* 80CB197C-80CB1980 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Pleaf_Param_c l_HIO;
diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp
index 548c15cc1b..2604a19296 100644
--- a/src/d/actor/d_a_obj_poCandle.cpp
+++ b/src/d/actor/d_a_obj_poCandle.cpp
@@ -9,8 +9,8 @@
 
 class daPoCandle_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CB1A6C */ daPoCandle_HIO_c();
-    /* 80CB2508 */ virtual ~daPoCandle_HIO_c() {}
+    daPoCandle_HIO_c();
+    virtual ~daPoCandle_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -18,13 +18,11 @@ public:
     /* 0x8 */ f32 firescale;
 };
 
-/* 80CB1A6C-80CB1A9C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__16daPoCandle_HIO_cFv */
 daPoCandle_HIO_c::daPoCandle_HIO_c() {
     waittimer = 30;
     firescale = 3.0f;
 }
 
-/* 80CB1AE4-80CB1B6C 000164 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daPoCandle_cFv */
 void daPoCandle_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -32,7 +30,6 @@ void daPoCandle_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CB1B6C-80CB1BD8 0001EC 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daPoCandle_cFv */
 int daPoCandle_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_PCNDL", 4);
     JUT_ASSERT(160, modelData != NULL);
@@ -45,7 +42,6 @@ int daPoCandle_c::CreateHeap() {
     return 1;
 }
 
-/* 80CB1BD8-80CB1D74 000258 019C+00 1/1 0/0 0/0 .text            create__12daPoCandle_cFv */
 int daPoCandle_c::create() {
     fopAcM_ct(this, daPoCandle_c);
 
@@ -85,7 +81,6 @@ int daPoCandle_c::create() {
     return phase_state;
 }
 
-/* 80CB1D74-80CB1E00 0003F4 008C+00 1/1 0/0 0/0 .text            lightInit__12daPoCandle_cFv */
 void daPoCandle_c::lightInit() {
     mLightPos = mFirePos;
     mLightPos.y += 10.0f;
@@ -103,21 +98,18 @@ void daPoCandle_c::lightInit() {
     mPlightRefDist = 0.0f;
 }
 
-/* 80CB1E00-80CB1E30 000480 0030+00 1/1 0/0 0/0 .text            setLight__12daPoCandle_cFv */
 void daPoCandle_c::setLight() {
     if (mLightType != 0) {
         dKy_plight_set(&mLight);
     }
 }
 
-/* 80CB1E30-80CB1E60 0004B0 0030+00 1/1 0/0 0/0 .text            cutLight__12daPoCandle_cFv */
 void daPoCandle_c::cutLight() {
     if (mLightType != 0) {
         dKy_plight_cut(&mLight);
     }
 }
 
-/* 80CB1E60-80CB1F10 0004E0 00B0+00 1/1 0/0 0/0 .text            pointLightProc__12daPoCandle_cFv */
 void daPoCandle_c::pointLightProc() {
     if (mLightType == 0) {
         GXColor light_color = {0xBC, 0x66, 0x42, 0xFF};
@@ -134,11 +126,8 @@ void daPoCandle_c::pointLightProc() {
     }
 }
 
-/* 80CB284C-80CB2858 000014 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daPoCandle_HIO_c l_HIO;
 
-/* 80CB1F10-80CB2140 000590 0230+00 1/0 0/0 0/0 .text            Execute__12daPoCandle_cFPPA3_A4_f
- */
 int daPoCandle_c::Execute(Mtx** param_0) {
     static void (daPoCandle_c::*mode_proc[])() = {
         &daPoCandle_c::modeWait,
@@ -164,12 +153,10 @@ int daPoCandle_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CB2140-80CB214C 0007C0 000C+00 2/2 0/0 0/0 .text            init_modeWait__12daPoCandle_cFv */
 void daPoCandle_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80CB214C-80CB21D8 0007CC 008C+00 1/0 0/0 0/0 .text            modeWait__12daPoCandle_cFv */
 void daPoCandle_c::modeWait() {
     u8 prev_switch = mIsSwitch;
     mIsSwitch = fopAcM_isSwitch(this, mSwbit);
@@ -187,8 +174,6 @@ void daPoCandle_c::modeWait() {
     }
 }
 
-/* 80CB21D8-80CB22D4 000858 00FC+00 2/2 0/0 0/0 .text            init_modeOnFire__12daPoCandle_cFv
- */
 void daPoCandle_c::init_modeOnFire() {
     mDoAud_seStart(Z2SE_OBJ_FIRE_IGNITION, &mFirePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     cXyz effscale(l_HIO.firescale, l_HIO.firescale, l_HIO.firescale);
@@ -198,12 +183,10 @@ void daPoCandle_c::init_modeOnFire() {
     mMode = 1;
 }
 
-/* 80CB22D4-80CB22F4 000954 0020+00 1/0 0/0 0/0 .text            modeOnFire__12daPoCandle_cFv */
 void daPoCandle_c::modeOnFire() {
     init_modeWait();
 }
 
-/* 80CB22F4-80CB2354 000974 0060+00 1/0 0/0 0/0 .text            modeOnSwWait__12daPoCandle_cFv */
 void daPoCandle_c::modeOnSwWait() {
     if (mSwWaitTimer != 0) {
         mSwWaitTimer--;
@@ -213,21 +196,17 @@ void daPoCandle_c::modeOnSwWait() {
     }
 }
 
-/* 80CB2354-80CB2360 0009D4 000C+00 1/1 0/0 0/0 .text            init_modeEnd__12daPoCandle_cFv */
 void daPoCandle_c::init_modeEnd() {
     mMode = 3;
 }
 
-/* 80CB2360-80CB2364 0009E0 0004+00 1/0 0/0 0/0 .text            modeEnd__12daPoCandle_cFv */
 void daPoCandle_c::modeEnd() {}
 
-/* 80CB2364-80CB2388 0009E4 0024+00 2/1 0/0 0/0 .text            eventStart__12daPoCandle_cFv */
 bool daPoCandle_c::eventStart() {
     init_modeOnFire();
     return true;
 }
 
-/* 80CB2388-80CB242C 000A08 00A4+00 1/0 0/0 0/0 .text            Draw__12daPoCandle_cFv */
 int daPoCandle_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -237,7 +216,6 @@ int daPoCandle_c::Draw() {
     return 1;
 }
 
-/* 80CB242C-80CB247C 000AAC 0050+00 1/0 0/0 0/0 .text            Delete__12daPoCandle_cFv */
 int daPoCandle_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_PCNDL");
     if (mLightType != 0) {
@@ -247,30 +225,22 @@ int daPoCandle_c::Delete() {
     return 1;
 }
 
-/* 80CB247C-80CB24A8 000AFC 002C+00 1/0 0/0 0/0 .text            daPoCandle_Draw__FP12daPoCandle_c
- */
 static int daPoCandle_Draw(daPoCandle_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CB24A8-80CB24C8 000B28 0020+00 1/0 0/0 0/0 .text daPoCandle_Execute__FP12daPoCandle_c */
 static int daPoCandle_Execute(daPoCandle_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CB24C8-80CB24E8 000B48 0020+00 1/0 0/0 0/0 .text            daPoCandle_Delete__FP12daPoCandle_c
- */
 static int daPoCandle_Delete(daPoCandle_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CB24E8-80CB2508 000B68 0020+00 1/0 0/0 0/0 .text            daPoCandle_Create__FP10fopAc_ac_c
- */
 static int daPoCandle_Create(fopAc_ac_c* i_this) {
     return ((daPoCandle_c*)i_this)->create();
 }
 
-/* 80CB2770-80CB2790 -00001 0020+00 1/0 0/0 0/0 .data            l_daPoCandle_Method */
 static actor_method_class l_daPoCandle_Method = {
     (process_method_func)daPoCandle_Create,
     (process_method_func)daPoCandle_Delete,
@@ -279,7 +249,6 @@ static actor_method_class l_daPoCandle_Method = {
     (process_method_func)daPoCandle_Draw,
 };
 
-/* 80CB2790-80CB27C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_poCandle */
 extern actor_process_profile_definition g_profile_Obj_poCandle = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp
index 60f2b6ca51..5c89dd88e2 100644
--- a/src/d/actor/d_a_obj_poFire.cpp
+++ b/src/d/actor/d_a_obj_poFire.cpp
@@ -9,8 +9,8 @@
 
 class daPoFire_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CB294C */ daPoFire_HIO_c();
-    /* 80CB3D24 */ virtual ~daPoFire_HIO_c() {}
+    daPoFire_HIO_c();
+    virtual ~daPoFire_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -28,12 +28,9 @@ public:
     /* 0x30 */ u8 mFireWaitTime;      // Fire wait
 };
 
-/* ############################################################################################## */
 
-/* 80CB4114-80CB4148 000014 0034+00 5/5 0/0 0/0 .bss             l_HIO */
 static daPoFire_HIO_c l_HIO;
 
-/* 80CB294C-80CB29C4 0000EC 0078+00 1/1 0/0 0/0 .text            __ct__14daPoFire_HIO_cFv */
 daPoFire_HIO_c::daPoFire_HIO_c() {
     unk6 = 0x3C;
     mWaitPeriod = 1.0f;
@@ -71,20 +68,16 @@ void daPoFire_HIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 80CB2A0C-80CB2A74 0001AC 0068+00 2/2 0/0 0/0 .text            setBaseMtx__10daPoFire_cFv */
 void daPoFire_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     mDoMtx_stack_c::transM(unk5F8.x, unk5F8.y, unk5F8.z);
 }
 
-/* ############################################################################################## */
 
-/* 80CB3F08-80CB3F0C 00001C 0004+00 1/2 0/0 0/0 .rodata          itemNo */
 static u8 const itemNo[4] = {fpcNm_ITEM_POU_FIRE1, fpcNm_ITEM_POU_FIRE2, fpcNm_ITEM_POU_FIRE3,
                              fpcNm_ITEM_POU_FIRE4};
 
-/* 80CB2A74-80CB2BB8 000214 0144+00 1/1 0/0 0/0 .text            create__10daPoFire_cFv */
 int daPoFire_c::create() {
     fopAcM_ct(this, daPoFire_c);
 
@@ -120,7 +113,6 @@ int daPoFire_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CB2BB8-80CB2BFC 000358 0044+00 1/1 0/0 0/0 .text            Execute__10daPoFire_cFv */
 int daPoFire_c::Execute() {
     eventUpdate();
     procMain();
@@ -128,8 +120,6 @@ int daPoFire_c::Execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80CB2BFC-80CB2D84 00039C 0188+00 1/1 0/0 0/0 .text            procMain__10daPoFire_cFv */
 void daPoFire_c::procMain() {
     static const daPoFire_c::modeProc mode_proc[9] = {
         &daPoFire_c::modeInitMove, &daPoFire_c::modeWait,   &daPoFire_c::modeWaitSetEffect,
@@ -145,9 +135,7 @@ void daPoFire_c::procMain() {
     attention_info.position.y += 20.0f;
 }
 
-/* ############################################################################################## */
 
-/* 80CB2D84-80CB2F68 000524 01E4+00 1/1 0/0 0/0 .text            setFire__10daPoFire_cFv */
 void daPoFire_c::setFire() {
     cXyz temp_r1(0.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::transS(unk5F8.x, unk5F8.y, unk5F8.z);
@@ -167,7 +155,6 @@ void daPoFire_c::setFire() {
     unk5AC = temp_r2;
 }
 
-/* 80CB2F68-80CB2FD4 000708 006C+00 1/1 0/0 0/0 .text            searchCandle__10daPoFire_cFPvPv */
 void* daPoFire_c::searchCandle(void* i_actor, void* i_this) {
     daPoFire_c* _this = static_cast<daPoFire_c*>(i_this);
     daPoCandle_c* _actor = static_cast<daPoCandle_c*>(i_actor);
@@ -180,7 +167,6 @@ void* daPoFire_c::searchCandle(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80CB2FD4-80CB3024 000774 0050+00 1/1 0/0 0/0 .text            searchFireTag__10daPoFire_cFPvPv */
 void* daPoFire_c::searchFireTag(void* i_actor, void* i_this) {
     daPoFire_c* _this = static_cast<daPoFire_c*>(i_this);
     daTagPoFire_c* _actor = static_cast<daTagPoFire_c*>(i_actor);
@@ -190,8 +176,6 @@ void* daPoFire_c::searchFireTag(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80CB3024-80CB30FC 0007C4 00D8+00 1/1 0/0 0/0 .text            init_modeInitMove__10daPoFire_cFv
- */
 void daPoFire_c::init_modeInitMove() {
     dBgS_GndChk gndchk;
     gndchk.SetPos(&current.pos);
@@ -204,9 +188,7 @@ void daPoFire_c::init_modeInitMove() {
     mMode = MODE_INIT_MOVE;
 }
 
-/* ############################################################################################## */
 
-/* 80CB30FC-80CB31FC 00089C 0100+00 1/0 0/0 0/0 .text            modeInitMove__10daPoFire_cFv */
 void daPoFire_c::modeInitMove() {
     f32 calc_res = cLib_addCalc(&current.pos.y, mGroundY + 70.0f, 0.5f, 2.0f, 0.5f);
     if (calc_res == 0.0f) {
@@ -236,9 +218,7 @@ static f32 dummy1() {
     return -1.0f;
 }
 
-/* ############################################################################################## */
 
-/* 80CB31FC-80CB32EC 00099C 00F0+00 1/0 0/0 0/0 .text            modeWait__10daPoFire_cFv */
 void daPoFire_c::modeWait() {
     if (eventInfo.checkCommandCatch()) {
         init_modeWaitSetEffect();
@@ -251,7 +231,6 @@ void daPoFire_c::modeWait() {
     unk5D8 += l_HIO.mWaitVertSpeed;
 }
 
-/* 80CB32EC-80CB3380 000A8C 0094+00 1/1 0/0 0/0 .text init_modeWaitSetEffect__10daPoFire_cFv */
 void daPoFire_c::init_modeWaitSetEffect() {
     for (int i = 0; i < 2; i++) {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKeys[i]);
@@ -264,8 +243,6 @@ void daPoFire_c::init_modeWaitSetEffect() {
     mMode = MODE_WAIT_SET_EFFECT;
 }
 
-/* 80CB3380-80CB3540 000B20 01C0+00 1/0 0/0 0/0 .text            modeWaitSetEffect__10daPoFire_cFv
- */
 void daPoFire_c::modeWaitSetEffect() {
     JPABaseEmitter* emitter;
     if (!daPy_getLinkPlayerActorClass()->getBottleMtx()) {
@@ -291,16 +268,13 @@ void daPoFire_c::modeWaitSetEffect() {
     }
 }
 
-/* 80CB3540-80CB355C 000CE0 001C+00 1/1 0/0 0/0 .text            init_modeMoveOut__10daPoFire_cFv */
 void daPoFire_c::init_modeMoveOut() {
     unk5EC = 0.0f;
     unk5F0 = 0.0f;
     mMode = MODE_MOVE_OUT;
 }
 
-/* ############################################################################################## */
 
-/* 80CB355C-80CB3714 000CFC 01B8+00 1/0 0/0 0/0 .text            modeMoveOut__10daPoFire_cFv */
 void daPoFire_c::modeMoveOut() {
     unk5E8 = 1.0f + cM_ssin(cM_deg2s(unk5EC * l_HIO.mMovePeriod1));
     f32 temp_f31 = cLib_addCalcPos(&current.pos, mpTagPoFire->current.pos, 1.0f,
@@ -322,14 +296,12 @@ void daPoFire_c::modeMoveOut() {
     }
 }
 
-/* 80CB3714-80CB3730 000EB4 001C+00 2/2 0/0 0/0 .text            init_modeMove__10daPoFire_cFv */
 void daPoFire_c::init_modeMove() {
     unk5EC = 0.0f;
     unk5F0 = 0.0f;
     mMode = MODE_MOVE;
 }
 
-/* 80CB3730-80CB38EC 000ED0 01BC+00 1/0 0/0 0/0 .text            modeMove__10daPoFire_cFv */
 void daPoFire_c::modeMove() {
     unk5E8 = 1.0f + cM_ssin(cM_deg2s(unk5EC * l_HIO.mMovePeriod1));
     f32 temp_f31 = cLib_addCalcPos(&current.pos, mpPoCandle->getFirePos(), 1.0f,
@@ -350,8 +322,6 @@ void daPoFire_c::modeMove() {
     }
 }
 
-/* 80CB38EC-80CB3918 00108C 002C+00 1/1 0/0 0/0 .text            init_modeMoveWait__10daPoFire_cFv
- */
 void daPoFire_c::init_modeMoveWait() {
     mWaitTimer = l_HIO.mFireWaitTime;
     mMoveEnd = true;
@@ -359,7 +329,6 @@ void daPoFire_c::init_modeMoveWait() {
     mMode = MODE_MOVE_WAIT;
 }
 
-/* 80CB3918-80CB3958 0010B8 0040+00 1/0 0/0 0/0 .text            modeMoveWait__10daPoFire_cFv */
 void daPoFire_c::modeMoveWait() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -369,9 +338,7 @@ void daPoFire_c::modeMoveWait() {
     init_modeFireEnd();
 }
 
-/* ############################################################################################## */
 
-/* 80CB3958-80CB39CC 0010F8 0074+00 1/0 0/0 0/0 .text            modeNoMove__10daPoFire_cFv */
 void daPoFire_c::modeNoMove() {
     f32 calc_res = cLib_addCalc(&current.pos.y, mGroundY + 300.0f, 0.5f, 2.0f, 0.5f);
     if (calc_res == 0.0f) {
@@ -380,27 +347,22 @@ void daPoFire_c::modeNoMove() {
     }
 }
 
-/* 80CB39CC-80CB39E0 00116C 0014+00 1/1 0/0 0/0 .text            init_modeOnFire__10daPoFire_cFv */
 void daPoFire_c::init_modeOnFire() {
     unk5C4 = 0;
     mMode = MODE_ON_FIRE;
 }
 
-/* ############################################################################################## */
 
-/* 80CB39E0-80CB3ADC 001180 00FC+00 1/0 0/0 0/0 .text            modeOnFire__10daPoFire_cFv */
 void daPoFire_c::modeOnFire() {
     cXyz sp8(3.5f, 3.5f, 3.5f);
     mParticleKeys[0] = dComIfGp_particle_set(mParticleKeys[0], 0x8670, &current.pos, NULL, &sp8);
     mParticleKeys[1] = dComIfGp_particle_set(mParticleKeys[1], 0x8671, &current.pos, NULL, &sp8);
 }
 
-/* 80CB3ADC-80CB3AE8 00127C 000C+00 3/3 0/0 0/0 .text            init_modeFireEnd__10daPoFire_cFv */
 void daPoFire_c::init_modeFireEnd() {
     mMode = MODE_FIRE_END;
 }
 
-/* 80CB3AE8-80CB3B70 001288 0088+00 1/0 0/0 0/0 .text            modeFireEnd__10daPoFire_cFv */
 void daPoFire_c::modeFireEnd() {
     for (int i = 0; i < 2; i++) {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKeys[i]);
@@ -412,7 +374,6 @@ void daPoFire_c::modeFireEnd() {
     fopAcM_delete(this);
 }
 
-/* 80CB3B70-80CB3BE0 001310 0070+00 2/1 0/0 0/0 .text            eventStart__10daPoFire_cFv */
 bool daPoFire_c::eventStart() {
     mStaffID = dComIfGp_evmng_getMyStaffId("pofire", NULL, 0);
     dComIfGp_event_setTalkPartner(mpPoCandle);
@@ -420,7 +381,6 @@ bool daPoFire_c::eventStart() {
     return true;
 }
 
-/* 80CB3BE0-80CB3C64 001380 0084+00 2/1 0/0 0/0 .text            eventRun__10daPoFire_cFv */
 bool daPoFire_c::eventRun() {
     static char* action_table[1] = {
         "MOVE_END",
@@ -436,17 +396,14 @@ bool daPoFire_c::eventRun() {
     return true;
 }
 
-/* 80CB3C64-80CB3C6C 001404 0008+00 2/1 0/0 0/0 .text            eventEnd__10daPoFire_cFv */
 bool daPoFire_c::eventEnd() {
     return true;
 }
 
-/* 80CB3C6C-80CB3C74 00140C 0008+00 1/1 0/0 0/0 .text            Draw__10daPoFire_cFv */
 int daPoFire_c::Draw() {
     return 1;
 }
 
-/* 80CB3C74-80CB3CA4 001414 0030+00 1/1 0/0 0/0 .text            Delete__10daPoFire_cFv */
 int daPoFire_c::Delete() {
     dComIfG_resDelete(&mPhase, "poFire");
 
@@ -457,36 +414,30 @@ int daPoFire_c::Delete() {
     return 1;
 }
 
-/* 80CB3CA4-80CB3CC4 001444 0020+00 1/0 0/0 0/0 .text            daPoFire_Draw__FP10daPoFire_c */
 static int daPoFire_Draw(daPoFire_c* i_this) {
     return static_cast<daPoFire_c*>(i_this)->Draw();
 }
 
-/* 80CB3CC4-80CB3CE4 001464 0020+00 1/0 0/0 0/0 .text            daPoFire_Execute__FP10daPoFire_c */
 static int daPoFire_Execute(daPoFire_c* i_this) {
     return static_cast<daPoFire_c*>(i_this)->Execute();
 }
 
-/* 80CB3CE4-80CB3D04 001484 0020+00 1/0 0/0 0/0 .text            daPoFire_Delete__FP10daPoFire_c */
 static int daPoFire_Delete(daPoFire_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "daPoFire");
     return static_cast<daPoFire_c*>(i_this)->Delete();
 }
 
-/* 80CB3D04-80CB3D24 0014A4 0020+00 1/0 0/0 0/0 .text            daPoFire_Create__FP10fopAc_ac_c */
 static int daPoFire_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daPoFire_c, i_this, "daPoFire");
     return a_this->create();
 }
 
-/* 80CB4050-80CB4070 -00001 0020+00 1/0 0/0 0/0 .data            l_daPoFire_Method */
 static actor_method_class l_daPoFire_Method = {
     (process_method_func)daPoFire_Create,  (process_method_func)daPoFire_Delete,
     (process_method_func)daPoFire_Execute, NULL,
     (process_method_func)daPoFire_Draw,
 };
 
-/* 80CB4070-80CB40A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_poFire */
 extern actor_process_profile_definition g_profile_Obj_poFire = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp
index 738dd89a5b..c1b0a5c56b 100644
--- a/src/d/actor/d_a_obj_poTbox.cpp
+++ b/src/d/actor/d_a_obj_poTbox.cpp
@@ -9,8 +9,8 @@
 
 class daPoTbox_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CB424C */ daPoTbox_HIO_c();
-    /* 80CB4F14 */ virtual ~daPoTbox_HIO_c() {}
+    daPoTbox_HIO_c();
+    virtual ~daPoTbox_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -18,29 +18,24 @@ public:
     /* 0x8 */ f32 close_speed;
 };
 
-/* 80CB500C-80CB5014 -00001 0008+00 3/3 0/0 0/0 .data            l_type */
 static char* l_type[2] = {
     "pouBox0",
     "pouBox1",
 };
 
-/* 80CB5014-80CB501C 000028 0008+00 1/1 0/0 0/0 .data            l_bmdIdx */
 static int l_bmdIdx[] = {
     10, 8,
 };
 
-/* 80CB501C-80CB5024 000030 0008+00 1/1 0/0 0/0 .data            l_dzbIdx */
 static int l_dzbIdx[] = {
     21, 11,
 };
 
-/* 80CB424C-80CB4280 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__14daPoTbox_HIO_cFv */
 daPoTbox_HIO_c::daPoTbox_HIO_c() {
     open_speed = 2.0f;
     close_speed = 12.0f;
 }
 
-/* 80CB42C8-80CB43D0 000168 0108+00 2/2 0/0 0/0 .text            setBaseMtx__10daPoTbox_cFv */
 void daPoTbox_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -60,7 +55,6 @@ void daPoTbox_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CB43D0-80CB46C4 000270 02F4+00 1/0 0/0 0/0 .text            CreateHeap__10daPoTbox_cFv */
 int daPoTbox_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_type[mStat], l_bmdIdx[mStat]);
     JUT_ASSERT(185, modelData != NULL);
@@ -112,7 +106,6 @@ int daPoTbox_c::CreateHeap() {
     return 1;
 }
 
-/* 80CB46C4-80CB4954 000564 0290+00 1/1 0/0 0/0 .text            create__10daPoTbox_cFv */
 int daPoTbox_c::create() {
     fopAcM_ct(this, daPoTbox_c);
 
@@ -161,10 +154,8 @@ int daPoTbox_c::create() {
     return phase_state;
 }
 
-/* 80CB5134-80CB5140 000014 000C+00 1/1 0/0 0/0 .bss             l_HIO */
 static daPoTbox_HIO_c l_HIO;
 
-/* 80CB499C-80CB4AA8 00083C 010C+00 1/0 0/0 0/0 .text            Execute__10daPoTbox_cFPPA3_A4_f */
 int daPoTbox_c::Execute(Mtx** param_0) {
     static void (daPoTbox_c::*mode_proc[])() = {
         &daPoTbox_c::modeWait,
@@ -185,12 +176,10 @@ int daPoTbox_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CB4AA8-80CB4AB4 000948 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daPoTbox_cFv */
 void daPoTbox_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80CB4AB4-80CB4B10 000954 005C+00 1/0 0/0 0/0 .text            modeWait__10daPoTbox_cFv */
 void daPoTbox_c::modeWait() {
     mIsSwitch = fopAcM_isSwitch(this, getSw());
     if (mIsSwitch) {
@@ -198,7 +187,6 @@ void daPoTbox_c::modeWait() {
     }
 }
 
-/* 80CB4B10-80CB4BF8 0009B0 00E8+00 1/1 0/0 0/0 .text            init_modeOpen__10daPoTbox_cFv */
 void daPoTbox_c::init_modeOpen() {
     if (mpBgW != NULL) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -216,7 +204,6 @@ void daPoTbox_c::init_modeOpen() {
     mMode = 1;
 }
 
-/* 80CB4BF8-80CB4C54 000A98 005C+00 1/0 0/0 0/0 .text            modeOpen__10daPoTbox_cFv */
 void daPoTbox_c::modeOpen() {
     int bck_play = mBck.play();
     int brk_play = mBrk.play();
@@ -226,25 +213,20 @@ void daPoTbox_c::modeOpen() {
     }
 }
 
-/* 80CB4C54-80CB4C60 000AF4 000C+00 2/2 0/0 0/0 .text            init_modeOpenEnd__10daPoTbox_cFv */
 void daPoTbox_c::init_modeOpenEnd() {
     mMode = 2;
 }
 
-/* 80CB4C60-80CB4C84 000B00 0024+00 1/0 0/0 0/0 .text            modeOpenEnd__10daPoTbox_cFv */
 void daPoTbox_c::modeOpenEnd() {
     mBtk.play();
 }
 
-/* 80CB4C84-80CB4C90 000B24 000C+00 1/1 0/0 0/0 .text            init_modeEnd__10daPoTbox_cFv */
 void daPoTbox_c::init_modeEnd() {
     mMode = 3;
 }
 
-/* 80CB4C90-80CB4C94 000B30 0004+00 1/0 0/0 0/0 .text            modeEnd__10daPoTbox_cFv */
 void daPoTbox_c::modeEnd() {}
 
-/* 80CB4C94-80CB4E14 000B34 0180+00 1/0 0/0 0/0 .text            Draw__10daPoTbox_cFv */
 int daPoTbox_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBoxModel, &tevStr);
@@ -287,7 +269,6 @@ int daPoTbox_c::Draw() {
     return 1;
 }
 
-/* 80CB4E14-80CB4E88 000CB4 0074+00 1/0 0/0 0/0 .text            Delete__10daPoTbox_cFv */
 int daPoTbox_c::Delete() {
     dComIfG_resDelete(&mPhase, l_type[mStat]);
 
@@ -298,27 +279,22 @@ int daPoTbox_c::Delete() {
     return 1;
 }
 
-/* 80CB4E88-80CB4EB4 000D28 002C+00 1/0 0/0 0/0 .text            daPoTbox_Draw__FP10daPoTbox_c */
 static int daPoTbox_Draw(daPoTbox_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CB4EB4-80CB4ED4 000D54 0020+00 1/0 0/0 0/0 .text            daPoTbox_Execute__FP10daPoTbox_c */
 static int daPoTbox_Execute(daPoTbox_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CB4ED4-80CB4EF4 000D74 0020+00 1/0 0/0 0/0 .text            daPoTbox_Delete__FP10daPoTbox_c */
 static int daPoTbox_Delete(daPoTbox_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CB4EF4-80CB4F14 000D94 0020+00 1/0 0/0 0/0 .text            daPoTbox_Create__FP10fopAc_ac_c */
 static int daPoTbox_Create(fopAc_ac_c* i_this) {
     return ((daPoTbox_c*)i_this)->create();
 }
 
-/* 80CB5084-80CB50A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daPoTbox_Method */
 static actor_method_class l_daPoTbox_Method = {
     (process_method_func)daPoTbox_Create,
     (process_method_func)daPoTbox_Delete,
@@ -327,7 +303,6 @@ static actor_method_class l_daPoTbox_Method = {
     (process_method_func)daPoTbox_Draw,
 };
 
-/* 80CB50A4-80CB50D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_poTbox */
 extern actor_process_profile_definition g_profile_Obj_poTbox = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp
index 91bba7f93c..a037e42944 100644
--- a/src/d/actor/d_a_obj_prop.cpp
+++ b/src/d/actor/d_a_obj_prop.cpp
@@ -8,25 +8,20 @@
 #include "d/actor/d_a_obj_prop.h"
 #include "d/d_procname.h"
 
-/* 80CB51D8-80CB51F8 000078 0020+00 1/1 0/0 0/0 .text daObjProp_c_createHeap__FP10fopAc_ac_c */
 static bool daObjProp_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjProp_c*>(i_this)->createHeap();
 }
 
-/* 80CB5628-80CB562C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "L7Prop";
 
-/* 80CB51F8-80CB5234 000098 003C+00 2/2 0/0 0/0 .text            __ct__11daObjProp_cFv */
 daObjProp_c::daObjProp_c() {}
 
-/* 80CB5234-80CB52B4 0000D4 0080+00 1/0 0/0 0/0 .text            __dt__11daObjProp_cFv */
 daObjProp_c::~daObjProp_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
 static const u32 BMD_IDX[] = {3, 4};
 
-/* 80CB52B4-80CB5334 000154 0080+00 1/1 0/0 0/0 .text            createHeap__11daObjProp_cFv */
 bool daObjProp_c::createHeap() {
     u32 nameArg = getNameArg_0();
     u32 bmd = BMD_IDX[nameArg];
@@ -35,7 +30,6 @@ bool daObjProp_c::createHeap() {
     return mpModel != NULL;
 }
 
-/* 80CB5334-80CB5408 0001D4 00D4+00 1/1 0/0 0/0 .text            create__11daObjProp_cFv */
 int daObjProp_c::create() {
     fopAcM_ct(this, daObjProp_c);
 
@@ -54,13 +48,11 @@ int daObjProp_c::create() {
     return phase;
 }
 
-/* 80CB5408-80CB543C 0002A8 0034+00 1/1 0/0 0/0 .text            Delete__11daObjProp_cFv */
 int daObjProp_c::Delete() {
     this->~daObjProp_c();
     return 1;
 }
 
-/* 80CB543C-80CB54A0 0002DC 0064+00 1/1 0/0 0/0 .text            draw__11daObjProp_cFv */
 int daObjProp_c::draw() {
     g_env_light.settingTevStruct(NULL, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -70,54 +62,45 @@ int daObjProp_c::draw() {
 
 static const s16 ADD_ANGLE[] = {0x1800, 0xE800};
 
-/* 80CB54A0-80CB54E4 000340 0044+00 1/1 0/0 0/0 .text            execute__11daObjProp_cFv */
 int daObjProp_c::execute() {
     shape_angle.y += ADD_ANGLE[mArg];
     setModelMtx();
     return 1;
 }
 
-/* 80CB54E4-80CB54F4 000384 0010+00 1/1 0/0 0/0 .text            init__11daObjProp_cFv */
 void daObjProp_c::init() {
     mArg = getArg_0() & 1;
 }
 
-/* 80CB54F4-80CB5558 000394 0064+00 2/2 0/0 0/0 .text            setModelMtx__11daObjProp_cFv */
 void daObjProp_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
 }
 
-/* 80CB5558-80CB55AC 0003F8 0054+00 1/0 0/0 0/0 .text            daObjProp_create__FP11daObjProp_c */
 static int daObjProp_create(daObjProp_c* i_this) {
     fopAcM_ct(i_this, daObjProp_c);
     return i_this->create();
 }
 
-/* 80CB55AC-80CB55CC 00044C 0020+00 1/0 0/0 0/0 .text            daObjProp_Delete__FP11daObjProp_c */
 static int daObjProp_Delete(daObjProp_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CB55CC-80CB55EC 00046C 0020+00 1/0 0/0 0/0 .text            daObjProp_execute__FP11daObjProp_c */
 static int daObjProp_execute(daObjProp_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CB55EC-80CB560C 00048C 0020+00 1/0 0/0 0/0 .text            daObjProp_draw__FP11daObjProp_c */
 static int daObjProp_draw(daObjProp_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CB562C-80CB564C -00001 0020+00 1/0 0/0 0/0 .data            daObjProp_METHODS */
 static actor_method_class daObjProp_METHODS = {
     (process_method_func)daObjProp_create,  (process_method_func)daObjProp_Delete,
     (process_method_func)daObjProp_execute, (process_method_func)NULL,
     (process_method_func)daObjProp_draw,
 };
 
-/* 80CB564C-80CB567C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Prop */
 extern actor_process_profile_definition g_profile_Obj_Prop = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp
index eae5cb482a..f13a30ef89 100644
--- a/src/d/actor/d_a_obj_pumpkin.cpp
+++ b/src/d/actor/d_a_obj_pumpkin.cpp
@@ -16,8 +16,6 @@
 #include "JSystem/JHostIO/JORFile.h"
 #endif
 
-/* ############################################################################################## */
-/* 80CB8370-80CB83A4 000000 0034+00 5/5 0/0 0/0 .rodata          m__21daObj_Pumpkin_Param_c */
 const daObj_Pumpkin_HIOParam daObj_Pumpkin_Param_c::m = {
     0.0f,
     -5.0f,
@@ -130,7 +128,6 @@ void daObj_Pumpkin_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-/* 80CB83A4-80CB83D4 000034 0030+00 1/1 0/0 0/0 .rodata          l_ccDObjData */
 const dCcD_SrcGObjInf l_ccDObjData = {
     {0, // mFlags
         {
@@ -145,18 +142,15 @@ const dCcD_SrcGObjInf l_ccDObjData = {
 };
 
 
-/* 80CB848C-80CB8494 000020 0008+00 2/3 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     {3, 1},
 };
 
-/* 80CB8494-80CB849C -00001 0008+00 2/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "pumpkin",
 };
 
-/* 80CB849C-80CB84E0 000030 0044+00 1/2 0/0 0/0 .data            l_ccDCyl */
 static dCcD_SrcCyl l_ccDCyl = {
     l_ccDObjData, // mObjInf
     {
@@ -166,10 +160,8 @@ static dCcD_SrcCyl l_ccDCyl = {
     } // mCyl
 };
 
-/* 80CB85DC-80CB85E0 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static OBJ_PUMPKIN_HIO_CLASS l_HIO;
 
-/* 80CB578C-80CB5A04 0000EC 0278+00 1/0 0/0 0/0 .text            __dt__15daObj_Pumpkin_cFv */
 daObj_Pumpkin_c::~daObj_Pumpkin_c() {
     // "|%06d:%x|daObj_Pumpkin_c -> Destruct\n":
     OS_REPORT("|%06d:%x|daObj_Pumpkin_c -> デストラクト\n", g_Counter.mCounter0, this);
@@ -182,7 +174,6 @@ daObj_Pumpkin_c::~daObj_Pumpkin_c() {
     dComIfG_resDelete(&mPhaseReq, l_resNameList[l_bmdData[0][1]]);
 }
 
-/* 80CB5A04-80CB5D74 000364 0370+00 1/1 0/0 0/0 .text            create__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::create() {
     fopAcM_ct(this, daObj_Pumpkin_c);
 
@@ -228,7 +219,6 @@ int daObj_Pumpkin_c::create() {
     return phase;
 }
 
-/* 80CB5F88-80CB6018 0008E8 0090+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]);
@@ -244,14 +234,12 @@ int daObj_Pumpkin_c::CreateHeap() {
     return 1;
 }
 
-/* 80CB6018-80CB604C 000978 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_Pumpkin_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_Pumpkin_c();
     return 1;
 }
 
-/* 80CB604C-80CB7638 0009AC 15EC+00 1/1 0/0 0/0 .text            Execute__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::Execute() {
     f32 var_f29 = mpHIO->m.floating_offset;
     f32 f_scale = mpHIO->m.scale;
@@ -679,7 +667,6 @@ int daObj_Pumpkin_c::Execute() {
     return 1;
 }
 
-/* 80CB7638-80CB77DC 001F98 01A4+00 1/1 0/0 0/0 .text            Draw__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::Draw() {
     if (field_0xBB0 == 0) {
         g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -708,14 +695,11 @@ int daObj_Pumpkin_c::Draw() {
     return 1;
 }
 
-/* 80CB7824-80CB7844 002184 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_Pumpkin_cFP10fopAc_ac_c          */
 int daObj_Pumpkin_c::createHeapCallBack(fopAc_ac_c* i_this) {
     daObj_Pumpkin_c* a_this = static_cast<daObj_Pumpkin_c*>(i_this);
     return a_this->CreateHeap();
 }
 
-/* 80CB7844-80CB78C8 0021A4 0084+00 1/1 0/0 0/0 .text            isDelete__15daObj_Pumpkin_cFv */
 int daObj_Pumpkin_c::isDelete() {
     switch ((s32) mType) {
     case 0:
@@ -731,21 +715,17 @@ int daObj_Pumpkin_c::isDelete() {
     }
 }
 
-/* 80CB78C8-80CB7924 002228 005C+00 1/1 0/0 0/0 .text            setEnvTevColor__15daObj_Pumpkin_cFv
- */
 void daObj_Pumpkin_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80CB7924-80CB7968 002284 0044+00 1/1 0/0 0/0 .text            setRoomNo__15daObj_Pumpkin_cFv */
 void daObj_Pumpkin_c::setRoomNo() {
     s8 room_id = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_id);
     mStts.SetRoomId(room_id);
 }
 
-/* 80CB7968-80CB79DC 0022C8 0074+00 2/2 0/0 0/0 .text            reset__15daObj_Pumpkin_cFv */
 void daObj_Pumpkin_c::reset() {
     int num_bytes = (u8*)&field_0xbb4 - (u8*)&field_0xB20;
     memset(&field_0xB20, 0, num_bytes);
@@ -760,7 +740,6 @@ void daObj_Pumpkin_c::reset() {
     mItemProcId = -1;
 }
 
-/* 80CB79DC-80CB7AE4 00233C 0108+00 2/2 0/0 0/0 .text            setMtx__15daObj_Pumpkin_cFv */
 void daObj_Pumpkin_c::setMtx() {
     s16 angleDiff = shape_angle.y - current.angle.y;
     s16 dVar5 = field_0xB7C * cM_scos(angleDiff);
@@ -773,8 +752,6 @@ void daObj_Pumpkin_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CB7AE4-80CB7B84 002444 00A0+00 1/1 0/0 0/0 .text            calcRollAngle__15daObj_Pumpkin_cFsi
- */
 s16 daObj_Pumpkin_c::calcRollAngle(s16 arg0, int arg1) {
     int reg_r31;
     int reg_r30;
@@ -803,8 +780,6 @@ s16 daObj_Pumpkin_c::calcRollAngle(s16 arg0, int arg1) {
     return 0;
 }
 
-/* 80CB7B84-80CB7D14 0024E4 0190+00 1/1 0/0 0/0 .text            getWallAngle__15daObj_Pumpkin_cFsPs
- */
 int daObj_Pumpkin_c::getWallAngle(s16 arg0, s16* arg1) {
     cXyz sp_0x20;
     cXyz sp_0x30[2];
@@ -834,16 +809,12 @@ int daObj_Pumpkin_c::getWallAngle(s16 arg0, s16* arg1) {
     return 1;
 }
 
-/* 80CB7D14-80CB7D98 002674 0084+00 1/1 0/0 0/0 .text            setSmokePrtcl__15daObj_Pumpkin_cFv
- */
 void daObj_Pumpkin_c::setSmokePrtcl() {
     fopAcM_effSmokeSet1(&mSmokePrtcl1, &mSmokePrtcl2, &current.pos, NULL, 0.6f * mPumpkinScale, &tevStr, 1);
     dComIfGp_particle_levelEmitterOnEventMove(mSmokePrtcl1);
     dComIfGp_particle_levelEmitterOnEventMove(mSmokePrtcl2);
 }
 
-/* 80CB7D98-80CB7E98 0026F8 0100+00 1/1 0/0 0/0 .text            setWaterPrtcl__15daObj_Pumpkin_cFv
- */
 void daObj_Pumpkin_c::setWaterPrtcl() {
     static u16 emttrId[4] = {
         ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D,
@@ -858,14 +829,11 @@ void daObj_Pumpkin_c::setWaterPrtcl() {
     }
 }
 
-/* 80CB7E98-80CB7EF4 0027F8 005C+00 1/1 0/0 0/0 .text            setHamonPrtcl__15daObj_Pumpkin_cFv
- */
 void daObj_Pumpkin_c::setHamonPrtcl() {
     cXyz water_pos(current.pos.x, mWaterY, current.pos.z);
     fopAcM_effHamonSet(&mHamonPrtcl, &water_pos, 0.7f * mPumpkinScale, 0.05f);
 }
 
-/* 80CB7EF4-80CB81A4 002854 02B0+00 1/1 0/0 0/0 .text            crash__15daObj_Pumpkin_cFv */
 void daObj_Pumpkin_c::crash() {
     fopAc_ac_c* actor_p = NULL;
     s32 reg_r30 = 0;
@@ -889,33 +857,27 @@ void daObj_Pumpkin_c::crash() {
     field_0xBAE = 1;
 }
 
-/* 80CB81A4-80CB81C4 002B04 0020+00 1/0 0/0 0/0 .text            daObj_Pumpkin_Create__FPv */
 static int daObj_Pumpkin_Create(void* i_this) {
     int ret = static_cast<daObj_Pumpkin_c*>(i_this)->create();
     return ret;
 }
 
-/* 80CB81C4-80CB81E4 002B24 0020+00 1/0 0/0 0/0 .text            daObj_Pumpkin_Delete__FPv */
 static int daObj_Pumpkin_Delete(void* i_this) {
     return static_cast<daObj_Pumpkin_c*>(i_this)->Delete();
 }
 
-/* 80CB81E4-80CB8204 002B44 0020+00 1/0 0/0 0/0 .text            daObj_Pumpkin_Execute__FPv */
 static int daObj_Pumpkin_Execute(void* i_this) {
     return static_cast<daObj_Pumpkin_c*>(i_this)->Execute();
 }
 
-/* 80CB8204-80CB8224 002B64 0020+00 1/0 0/0 0/0 .text            daObj_Pumpkin_Draw__FPv */
 static int daObj_Pumpkin_Draw(void* i_this) {
     return static_cast<daObj_Pumpkin_c*>(i_this)->Draw();
 }
 
-/* 80CB8224-80CB822C 002B84 0008+00 1/0 0/0 0/0 .text            daObj_Pumpkin_IsDelete__FPv */
 static int daObj_Pumpkin_IsDelete(void*) {
     return 1;
 }
 
-/* 80CB84E8-80CB8508 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Pumpkin_MethodTable */
 static actor_method_class daObj_Pumpkin_MethodTable = {
     (process_method_func)daObj_Pumpkin_Create,
     (process_method_func)daObj_Pumpkin_Delete,
@@ -924,7 +886,6 @@ static actor_method_class daObj_Pumpkin_MethodTable = {
     (process_method_func)daObj_Pumpkin_Draw,
 };
 
-/* 80CB8508-80CB8538 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_PUMPKIN */
 extern actor_process_profile_definition g_profile_OBJ_PUMPKIN = {
   fpcLy_CURRENT_e,            // mLayerID
   8,                          // mListID
diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp
index f6a7f49e5a..4836748dd1 100644
--- a/src/d/actor/d_a_obj_rcircle.cpp
+++ b/src/d/actor/d_a_obj_rcircle.cpp
@@ -8,23 +8,18 @@
 #include "d/actor/d_a_obj_rcircle.h"
 #include "d/d_procname.h"
 
-/* 80CB8658-80CB8678 000078 0020+00 1/1 0/0 0/0 .text daObjRCircle_c_createHeap__FP10fopAc_ac_c */
 static int daObjRCircle_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjRCircle_c*>(i_this)->createHeap();
 }
 
-/* 80CB8D10-80CB8D14 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "RCircle";
 
-/* 80CB8678-80CB8704 000098 008C+00 2/2 0/0 0/0 .text            __ct__14daObjRCircle_cFv */
 daObjRCircle_c::daObjRCircle_c() {}
 
-/* 80CB874C-80CB8814 00016C 00C8+00 1/0 0/0 0/0 .text            __dt__14daObjRCircle_cFv */
 daObjRCircle_c::~daObjRCircle_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CB8814-80CB8928 000234 0114+00 1/1 0/0 0/0 .text            createHeap__14daObjRCircle_cFv */
 int daObjRCircle_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
@@ -41,7 +36,6 @@ int daObjRCircle_c::createHeap() {
     return 1;
 }
 
-/* 80CB8928-80CB8A28 000348 0100+00 1/1 0/0 0/0 .text            create__14daObjRCircle_cFv */
 int daObjRCircle_c::create() {
     fopAcM_ct(this, daObjRCircle_c);
     if (fopAcM_isSwitch(this, getSwBit())) {
@@ -63,13 +57,11 @@ int daObjRCircle_c::create() {
     return phase;
 }
 
-/* 80CB8A28-80CB8A5C 000448 0034+00 1/1 0/0 0/0 .text            Delete__14daObjRCircle_cFv */
 int daObjRCircle_c::Delete() {
     this->~daObjRCircle_c();
     return 1;
 }
 
-/* 80CB8A5C-80CB8B28 00047C 00CC+00 1/1 0/0 0/0 .text            draw__14daObjRCircle_cFv */
 int daObjRCircle_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -82,7 +74,6 @@ int daObjRCircle_c::draw() {
     return 1;
 }
 
-/* 80CB8B28-80CB8BE4 000548 00BC+00 1/1 0/0 0/0 .text            execute__14daObjRCircle_cFv */
 int daObjRCircle_c::execute() {
     if (mSwitch) {
         if (mBrk.isStop()) {
@@ -99,46 +90,38 @@ int daObjRCircle_c::execute() {
     return 1;
 }
 
-/* 80CB8BE4-80CB8BF0 000604 000C+00 1/1 0/0 0/0 .text            init__14daObjRCircle_cFv */
 void daObjRCircle_c::init() {
     mSwitch = 0;
 }
 
-/* 80CB8BF0-80CB8C44 000610 0054+00 1/1 0/0 0/0 .text            setModelMtx__14daObjRCircle_cFv */
 void daObjRCircle_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
 }
 
-/* 80CB8C44-80CB8C98 000664 0054+00 1/0 0/0 0/0 .text daObjRCircle_create__FP14daObjRCircle_c */
 static int daObjRCircle_create(daObjRCircle_c* i_this) {
     fopAcM_ct(i_this, daObjRCircle_c);
     return i_this->create();
 }
 
-/* 80CB8C98-80CB8CB8 0006B8 0020+00 1/0 0/0 0/0 .text daObjRCircle_Delete__FP14daObjRCircle_c */
 static int daObjRCircle_Delete(daObjRCircle_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CB8CB8-80CB8CD8 0006D8 0020+00 1/0 0/0 0/0 .text daObjRCircle_execute__FP14daObjRCircle_c */
 static int daObjRCircle_execute(daObjRCircle_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CB8CD8-80CB8CF8 0006F8 0020+00 1/0 0/0 0/0 .text daObjRCircle_draw__FP14daObjRCircle_c */
 static int daObjRCircle_draw(daObjRCircle_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CB8D14-80CB8D34 -00001 0020+00 1/0 0/0 0/0 .data            daObjRCircle_METHODS */
 static actor_method_class daObjRCircle_METHODS = {
     (process_method_func)daObjRCircle_create,  (process_method_func)daObjRCircle_Delete,
     (process_method_func)daObjRCircle_execute, (process_method_func)NULL,
     (process_method_func)daObjRCircle_draw,
 };
 
-/* 80CB8D34-80CB8D64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RCircle */
 extern actor_process_profile_definition g_profile_Obj_RCircle = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp
index 7737f1d5ed..5667750d46 100644
--- a/src/d/actor/d_a_obj_rfHole.cpp
+++ b/src/d/actor/d_a_obj_rfHole.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80CB8E6C-80CB8EBC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__14daRfHole_HIO_cFv */
 daRfHole_HIO_c::daRfHole_HIO_c() {
     field_0x04 = 130.0f;
     field_0x08 = 200.0f;
@@ -19,7 +18,6 @@ daRfHole_HIO_c::daRfHole_HIO_c() {
     field_0x15 = 4;
 }
 
-/* 80CB8F04-80CB8F8C 000184 0088+00 2/2 0/0 0/0 .text            setBaseMtx__10daRfHole_cFv */
 void daRfHole_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -27,7 +25,6 @@ void daRfHole_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CB8F8C-80CB8FF8 00020C 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daRfHole_cFv */
 int daRfHole_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Otosiana", 4);
     JUT_ASSERT(167, modelData!=NULL);
@@ -35,7 +32,6 @@ int daRfHole_c::CreateHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* 80CB8FF8-80CB9148 000278 0150+00 1/1 0/0 0/0 .text            create__10daRfHole_cFv */
 int daRfHole_c::create() {
     fopAcM_ct(this, daRfHole_c);
     int rv = dComIfG_resLoad(&mPhase, "Otosiana");
@@ -63,18 +59,14 @@ int daRfHole_c::create() {
     return rv;
 }
 
-/* 80CB9148-80CB9194 0003C8 004C+00 1/1 0/0 0/0 .text
- * rideCallBack__10daRfHole_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c  */
 void daRfHole_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_ALINK && static_cast<daRfHole_c*>(param_2)->playerAreaCheck()) {
         static_cast<daRfHole_c*>(param_2)->field_0x5ae = 1;
     }
 }
 
-/* 80CB9BF4-80CB9C0C 000014 0018+00 4/4 0/0 0/0 .bss             l_HIO */
 static daRfHole_HIO_c l_HIO;
 
-/* 80CB9194-80CB940C 000414 0278+00 1/1 0/0 0/0 .text            playerAreaCheck__10daRfHole_cFv */
 int daRfHole_c::playerAreaCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz cStack_30(l_HIO.field_0x0c, 0.0f, 0.0f);
@@ -98,7 +90,6 @@ int daRfHole_c::playerAreaCheck() {
     return rv;
 }
 
-/* 80CB940C-80CB9464 00068C 0058+00 1/0 0/0 0/0 .text            Execute__10daRfHole_cFPPA3_A4_f */
 int daRfHole_c::Execute(Mtx** i_mtx) {
     holeProc();
     *i_mtx = &mModel->getBaseTRMtx();
@@ -107,26 +98,22 @@ int daRfHole_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80CB9464-80CB9520 0006E4 00BC+00 1/1 0/0 0/0 .text            holeProc__10daRfHole_cFv */
 void daRfHole_c::holeProc() {
     static ModeFunc mode_proc[] = {&daRfHole_c::modeWait, &daRfHole_c::modeBreak,
                                    &daRfHole_c::modeBreakEff, &daRfHole_c::modeEnd};
     (this->*(mode_proc[mMode]))();
 }
 
-/* 80CB9520-80CB952C 0007A0 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daRfHole_cFv */
 void daRfHole_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80CB952C-80CB9558 0007AC 002C+00 1/0 0/0 0/0 .text            modeWait__10daRfHole_cFv */
 void daRfHole_c::modeWait() {
     if (field_0x5ae != 0) {
         init_modeBreak();
     }
 }
 
-/* 80CB9558-80CB96AC 0007D8 0154+00 1/1 0/0 0/0 .text            init_modeBreak__10daRfHole_cFv */
 void daRfHole_c::init_modeBreak() {
     setBreakEffect();
     dComIfGp_getVibration().StartShock(l_HIO.field_0x15, 15, cXyz(0.0f, 1.0f, 0.0f));
@@ -139,35 +126,28 @@ void daRfHole_c::init_modeBreak() {
     mMode = MODE_BREAK;
 }
 
-/* 80CB96AC-80CB96CC 00092C 0020+00 1/0 0/0 0/0 .text            modeBreak__10daRfHole_cFv */
 void daRfHole_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80CB96CC-80CB971C 00094C 0050+00 1/1 0/0 0/0 .text            init_modeBreakEff__10daRfHole_cFv
- */
 void daRfHole_c::init_modeBreakEff() {
     setBreakEffect();
     fopAcM_onSwitch(this, (u8)fopAcM_GetParam(this));
     mMode = MODE_BREAK_EFF;
 }
 
-/* 80CB971C-80CB973C 00099C 0020+00 1/0 0/0 0/0 .text            modeBreakEff__10daRfHole_cFv */
 void daRfHole_c::modeBreakEff() {
     fopAcM_delete(this);
 }
 
-/* 80CB973C-80CB9748 0009BC 000C+00 1/1 0/0 0/0 .text            init_modeEnd__10daRfHole_cFv */
 void daRfHole_c::init_modeEnd() {
     mMode = MODE_END;
 }
 
-/* 80CB9748-80CB9768 0009C8 0020+00 1/0 0/0 0/0 .text            modeEnd__10daRfHole_cFv */
 void daRfHole_c::modeEnd() {
     fopAcM_delete(this);
 }
 
-/* 80CB9768-80CB9878 0009E8 0110+00 2/2 0/0 0/0 .text            setBreakEffect__10daRfHole_cFv */
 void daRfHole_c::setBreakEffect() {
     static u16 const particle_id[5] = {
         0x83B0, 0x83B1, 0x83B2, 0x83B3, 0x83B4,
@@ -182,7 +162,6 @@ void daRfHole_c::setBreakEffect() {
     }
 }
 
-/* 80CB9878-80CB991C 000AF8 00A4+00 1/0 0/0 0/0 .text            Draw__10daRfHole_cFv */
 int daRfHole_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -192,34 +171,28 @@ int daRfHole_c::Draw() {
     return 1;
 }
 
-/* 80CB991C-80CB994C 000B9C 0030+00 1/0 0/0 0/0 .text            Delete__10daRfHole_cFv */
 int daRfHole_c::Delete() {
     dComIfG_resDelete(&mPhase, "Otosiana");
     return 1;
 }
 
-/* 80CB994C-80CB9978 000BCC 002C+00 1/0 0/0 0/0 .text            daRfHole_Draw__FP10daRfHole_c */
 static int daRfHole_Draw(daRfHole_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CB9978-80CB9998 000BF8 0020+00 1/0 0/0 0/0 .text            daRfHole_Execute__FP10daRfHole_c */
 static int daRfHole_Execute(daRfHole_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CB9998-80CB99B8 000C18 0020+00 1/0 0/0 0/0 .text            daRfHole_Delete__FP10daRfHole_c */
 static int daRfHole_Delete(daRfHole_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CB99B8-80CB99D8 000C38 0020+00 1/0 0/0 0/0 .text            daRfHole_Create__FP10fopAc_ac_c */
 static int daRfHole_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daRfHole_c*>(i_this)->create();
 }
 
-/* 80CB9B4C-80CB9B6C -00001 0020+00 1/0 0/0 0/0 .data            l_daRfHole_Method */
 static actor_method_class l_daRfHole_Method = {
     (process_method_func)daRfHole_Create,
     (process_method_func)daRfHole_Delete,
@@ -228,7 +201,6 @@ static actor_method_class l_daRfHole_Method = {
     (process_method_func)daRfHole_Draw,
 };
 
-/* 80CB9B6C-80CB9B9C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RfHole */
 extern actor_process_profile_definition g_profile_Obj_RfHole = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp
index 6022b51bff..58b762528e 100644
--- a/src/d/actor/d_a_obj_rgate.cpp
+++ b/src/d/actor/d_a_obj_rgate.cpp
@@ -34,7 +34,6 @@ enum {
     AREA_CHECK_HORSE,
 };
 
-/* 80CB9C98-80CB9CE8 000078 0050+00 3/3 0/0 0/0 .text            search_coach__FPvPv */
 static void* search_coach(void* i_actor, void* i_data) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_NPC_COACH)
     {
@@ -44,7 +43,6 @@ static void* search_coach(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80CB9CE8-80CB9DF8 0000C8 0110+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -69,14 +67,11 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80CBC368-80CBC380 000000 0018+00 7/7 0/0 0/0 .rodata          l_cull_box */
 static const Vec l_cull_box[2] = {
     {-400.0f, 0.0f, -400.0f},
     {400.0f, 450.0f, 400.0f},
 };
 
-/* 80CBC380-80CBC3C4 000018 0044+00 0/0 0/0 0/0 .rodata          l_cyl_src */
 static const dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x20, 0x11}, 0x78}},  // mObj
@@ -91,7 +86,6 @@ static const dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80CB9DF8-80CB9F4C 0001D8 0154+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjRgate_cFv */
 void daObjRgate_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -118,7 +112,6 @@ void daObjRgate_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CB9F4C-80CBA468 00032C 051C+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjRgate_cFv */
 void daObjRgate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -215,10 +208,8 @@ void daObjRgate_c::setBaseMtx() {
     }
 }
 
-/* 80CBC4C0-80CBC4C4 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_RGate00";
 
-/* 80CBA468-80CBA654 000848 01EC+00 1/0 0/0 0/0 .text            Create__12daObjRgate_cFv */
 int daObjRgate_c::Create() {
     static char* l_evName = "RIDER_GATE_OPEN00";
 
@@ -267,7 +258,6 @@ int daObjRgate_c::Create() {
     return 1;
 }
 
-/* 80CBA654-80CBA828 000A34 01D4+00 1/0 0/0 0/0 .text            CreateHeap__12daObjRgate_cFv */
 int daObjRgate_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(472, modelData != NULL);
@@ -311,7 +301,6 @@ int daObjRgate_c::CreateHeap() {
     return 1;
 }
 
-/* 80CBA828-80CBA8A8 000C08 0080+00 1/1 0/0 0/0 .text            create1st__12daObjRgate_cFv */
 int daObjRgate_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -325,7 +314,6 @@ int daObjRgate_c::create1st() {
     return phase_state;
 }
 
-/* 80CBA8A8-80CBAC38 000C88 0390+00 1/1 0/0 0/0 .text checkAreaL__12daObjRgate_cFPC4cXyzPC4cXyz */
 int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     Mtx m;
@@ -401,7 +389,6 @@ int daObjRgate_c::checkAreaL(cXyz const* unused1, cXyz const* unused2) {
     return 0;
 }
 
-/* 80CBAC38-80CBAFC4 001018 038C+00 1/1 0/0 0/0 .text checkAreaR__12daObjRgate_cFPC4cXyzPC4cXyz */
 int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     Mtx m;
@@ -479,7 +466,6 @@ int daObjRgate_c::checkAreaR(cXyz const* unused1, cXyz const* unused2) {
     return 0;
 }
 
-/* 80CBAFC4-80CBB0F0 0013A4 012C+00 1/1 0/0 0/0 .text            checkOpen__12daObjRgate_cFv */
 BOOL daObjRgate_c::checkOpen() {
     if (dComIfGs_getKeyNum() == 0) {
         return false;
@@ -508,7 +494,6 @@ BOOL daObjRgate_c::checkOpen() {
     return false;
 }
 
-/* 80CBB0F0-80CBB180 0014D0 0090+00 1/1 0/0 0/0 .text checkDirL__12daObjRgate_cFP10fopAc_ac_c */
 BOOL daObjRgate_c::checkDirL(fopAc_ac_c* i_actor) {
     Mtx m;
     mDoMtx_inverse(field_0xc30, m);
@@ -524,7 +509,6 @@ BOOL daObjRgate_c::checkDirL(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80CBB180-80CBB210 001560 0090+00 1/1 0/0 0/0 .text checkDirR__12daObjRgate_cFP10fopAc_ac_c */
 BOOL daObjRgate_c::checkDirR(fopAc_ac_c* i_actor) {
     Mtx m;
     mDoMtx_inverse(field_0xc00, m);
@@ -540,17 +524,14 @@ BOOL daObjRgate_c::checkDirR(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80CBB210-80CBB28C 0015F0 007C+00 1/1 0/0 0/0 .text            setAtkSE__12daObjRgate_cFv */
 void daObjRgate_c::setAtkSE() {
     fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_ATK, 0);
 }
 
-/* 80CBB28C-80CBB308 00166C 007C+00 1/1 0/0 0/0 .text            setCrkSE__12daObjRgate_cFv */
 void daObjRgate_c::setCrkSE() {
     fopAcM_seStart(this, Z2SE_OBJ_RIDER_GATE_CRK, 0);
 }
 
-/* 80CBB308-80CBB370 0016E8 0068+00 1/1 0/0 0/0 .text            action__12daObjRgate_cFv */
 void daObjRgate_c::action() {
         /* dSv_event_flag_c::M_035 - Cutscene - [cutscene: 35] after carriage guarding event */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[68])) {
@@ -561,7 +542,6 @@ void daObjRgate_c::action() {
     }
 }
 
-/* 80CBB370-80CBBA10 001750 06A0+00 1/1 0/0 0/0 .text            action_typeA__12daObjRgate_cFv */
 void daObjRgate_c::action_typeA() {
     u8 sw_no = getSwNo();
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -747,8 +727,6 @@ void daObjRgate_c::action_typeA() {
     }
 }
 
-/* 80CBBA10-80CBBAF4 001DF0 00E4+00 1/0 0/0 0/0 .text            actionWaitEvent__12daObjRgate_cFv
- */
 void daObjRgate_c::actionWaitEvent() {
     if (eventInfo.checkCommandDoor()) {
         setAction(ACT_EVENT);
@@ -762,7 +740,6 @@ void daObjRgate_c::actionWaitEvent() {
     }
 }
 
-/* 80CBBAF4-80CBBB5C 001ED4 0068+00 1/0 0/0 0/0 .text            actionEvent__12daObjRgate_cFv */
 void daObjRgate_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACT_DEAD);
@@ -772,11 +749,8 @@ void daObjRgate_c::actionEvent() {
     }
 }
 
-/* 80CBBB5C-80CBBB60 001F3C 0004+00 1/0 0/0 0/0 .text            actionDead__12daObjRgate_cFv */
 void daObjRgate_c::actionDead() {}
 
-/* 80CBBB60-80CBBC04 001F40 00A4+00 1/1 0/0 0/0 .text            event_proc_call__12daObjRgate_cFv
- */
 void daObjRgate_c::event_proc_call() {
     typedef void (daObjRgate_c::*func)();
     static func l_func[] = {&daObjRgate_c::actionWaitEvent, &daObjRgate_c::actionEvent,
@@ -785,7 +759,6 @@ void daObjRgate_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80CBBC04-80CBBD68 001FE4 0164+00 1/1 0/0 0/0 .text            demoProc__12daObjRgate_cFv */
 void daObjRgate_c::demoProc() {
     mStaffID = dComIfGp_evmng_getMyStaffId("K_GATE", NULL, 0);
     int demo_action = getDemoAction();
@@ -828,15 +801,12 @@ void daObjRgate_c::demoProc() {
     }
 }
 
-/* 80CBBD68-80CBBDB0 002148 0048+00 1/1 0/0 0/0 .text            getDemoAction__12daObjRgate_cFv */
 int daObjRgate_c::getDemoAction() {
     static char* action_table[] = {"WAIT", "ADJUSTMENT", "UNLOCK", "OPEN"};
 
     return dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 }
 
-/* 80CBBDB0-80CBBE18 002190 0068+00 1/0 0/0 0/0 .text            Execute__12daObjRgate_cFPPA3_A4_f
- */
 int daObjRgate_c::Execute(Mtx** param_0) {
     event_proc_call();
     action();
@@ -848,7 +818,6 @@ int daObjRgate_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CBBE18-80CBBF34 0021F8 011C+00 1/0 0/0 0/0 .text            Draw__12daObjRgate_cFv */
 int daObjRgate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpGateModel, &tevStr);
@@ -874,7 +843,6 @@ int daObjRgate_c::Draw() {
     return 1;
 }
 
-/* 80CBBF34-80CBBFA0 002314 006C+00 1/0 0/0 0/0 .text            Delete__12daObjRgate_cFv */
 int daObjRgate_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         if (dComIfG_Bgsp().Release(mpBgW)) {
@@ -888,37 +856,29 @@ int daObjRgate_c::Delete() {
     return 1;
 }
 
-/* 80CBBFA0-80CBC054 002380 00B4+00 1/0 0/0 0/0 .text daObjRgate_create1st__FP12daObjRgate_c */
 static int daObjRgate_create1st(daObjRgate_c* i_this) {
     fopAcM_ct(i_this, daObjRgate_c);
     return i_this->create1st();
 }
 
-/* 80CBC290-80CBC2B0 002670 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDelete__FP12daObjRgate_c */
 static int daObjRgate_MoveBGDelete(daObjRgate_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CBC2B0-80CBC2D0 002690 0020+00 1/0 0/0 0/0 .text daObjRgate_MoveBGExecute__FP12daObjRgate_c
- */
 static int daObjRgate_MoveBGExecute(daObjRgate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CBC2D0-80CBC2FC 0026B0 002C+00 1/0 0/0 0/0 .text daObjRgate_MoveBGDraw__FP12daObjRgate_c */
 static int daObjRgate_MoveBGDraw(daObjRgate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80CBC51C-80CBC53C -00001 0020+00 1/0 0/0 0/0 .data            daObjRgate_METHODS */
 static actor_method_class daObjRgate_METHODS = {
     (process_method_func)daObjRgate_create1st,     (process_method_func)daObjRgate_MoveBGDelete,
     (process_method_func)daObjRgate_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjRgate_MoveBGDraw,
 };
 
-/* 80CBC53C-80CBC56C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RiderGate */
 extern actor_process_profile_definition g_profile_Obj_RiderGate = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp
index e1263128e7..ecf841b3f6 100644
--- a/src/d/actor/d_a_obj_riverrock.cpp
+++ b/src/d/actor/d_a_obj_riverrock.cpp
@@ -10,17 +10,14 @@
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CBDB40-80CBDB44 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "RiverRock";
 
-/* 80CBC6CC-80CBC6F4 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__20daObjRIVERROCK_HIO_cFv */
 daObjRIVERROCK_HIO_c::daObjRIVERROCK_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 0.0f;
     field_0xc = 0.0f;
 }
 
-/* 80CBC6F4-80CBC754 000114 0060+00 1/1 0/0 0/0 .text initCcCylinder__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::initCcCylinder() {
     const static dCcD_SrcCyl ccCylSrc = {
         {
@@ -42,26 +39,21 @@ void daObjRIVERROCK_c::initCcCylinder() {
     mCyl.SetC(current.pos);
 }
 
-/* 80CBC754-80CBC7B4 000174 0060+00 1/1 0/0 0/0 .text            SetCcCyl__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::SetCcCyl() {
     mCyl.SetC(current.pos);
     mCyl.SetR(field_0x5c4.x * 1000.0f);
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80CBC7B4-80CBC7D4 0001D4 0020+00 1/0 0/0 0/0 .text daObjRIVERROCK_Create__FP10fopAc_ac_c */
 static int daObjRIVERROCK_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjRIVERROCK_c*>(i_this)->create();
 }
 
-/* 80CBC7D4-80CBC7F8 0001F4 0024+00 1/0 0/0 0/0 .text daObjRIVERROCK_Delete__FP16daObjRIVERROCK_c
- */
 static int daObjRIVERROCK_Delete(daObjRIVERROCK_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80CBC7F8-80CBC8BC 000218 00C4+00 1/1 0/0 0/0 .text BreakWaitAction__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::BreakWaitAction() {
     shape_angle.x = field_0x5b4 * cM_ssin(field_0x5aa);
     cLib_addCalcAngleS(&field_0x5b0, 0x10, 0x100, 0x50, 0);
@@ -72,7 +64,6 @@ void daObjRIVERROCK_c::BreakWaitAction() {
     }
 }
 
-/* 80CBC8BC-80CBCC3C 0002DC 0380+00 1/1 0/0 0/0 .text            CheckBG__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::CheckBG() {
     mSoundObj.startLevelSound(Z2SE_OBJ_RG_ROCKPOLE_FALL, 0, -1);
     cXyz particlePos(0.0f, 5650.0f * field_0x5c4.y, field_0x5c4.z * 700.0f);
@@ -112,13 +103,10 @@ void daObjRIVERROCK_c::CheckBG() {
     field_0x5d0 = particlePos;
 }
 
-/* 80CBDBE8-80CBDBEC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool mHIOInitialized;
 
-/* 80CBDBF8-80CBDC08 000018 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daObjRIVERROCK_HIO_c l_HIO;
 
-/* 80CBCC3C-80CBCCC0 00065C 0084+00 1/1 0/0 0/0 .text BreakMoveAction__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::BreakMoveAction() {
     cLib_addCalcAngleS(&field_0x5aa, 0x1500, l_HIO.field_0x8 + 3628.0f, 0x1500, 0);
     field_0x5e8.x += field_0x5aa;
@@ -126,8 +114,6 @@ void daObjRIVERROCK_c::BreakMoveAction() {
     CheckBG();
 }
 
-/* 80CBCCC0-80CBCD94 0006E0 00D4+00 1/1 0/0 0/0 .text            BrokenAction__16daObjRIVERROCK_cFv
- */
 void daObjRIVERROCK_c::BrokenAction() {
     s16 sVar1 = field_0x5b4 * cM_ssin(field_0x5aa);
     if (sVar1 > 0) {
@@ -141,8 +127,6 @@ void daObjRIVERROCK_c::BrokenAction() {
     }
 }
 
-/* 80CBCD94-80CBCDE8 0007B4 0054+00 1/1 0/0 0/0 .text            BreakAction__16daObjRIVERROCK_cFv
- */
 void daObjRIVERROCK_c::BreakAction() {
     switch (mBreakSubAction) {
     case BREAK_WAIT:
@@ -160,7 +144,6 @@ void daObjRIVERROCK_c::BreakAction() {
     }
 }
 
-/* 80CBCDE8-80CBCE2C 000808 0044+00 1/1 0/0 0/0 .text            Action__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::Action() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -172,7 +155,6 @@ void daObjRIVERROCK_c::Action() {
     }
 }
 
-/* 80CBCE2C-80CBD1C4 00084C 0398+00 3/3 0/0 0/0 .text            BreakSet__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::BreakSet() {
     eyePos = current.pos;
     fopAcM_seStart(this, Z2SE_OBJ_RG_ROCK_BREAK, 0);
@@ -200,14 +182,12 @@ void daObjRIVERROCK_c::BreakSet() {
     mBreakSubAction = BREAK_WAIT;
 }
 
-/* 80CBD1C4-80CBD204 000BE4 0040+00 1/1 0/0 0/0 .text            WaitAction__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::WaitAction() {
     if (mCyl.ChkTgHit()) {
         BreakSet();
     }
 }
 
-/* 80CBD204-80CBD2FC 000C24 00F8+00 1/1 0/0 0/0 .text            setBaseMtx__16daObjRIVERROCK_cFv */
 void daObjRIVERROCK_c::setBaseMtx() {
     if (mBreakSubAction == BREAK_MOVE || mBreakSubAction == BREAK_BROKEN ||
         mBreakSubAction == BREAK_3)
@@ -228,18 +208,14 @@ void daObjRIVERROCK_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CBD2FC-80CBD328 000D1C 002C+00 1/0 0/0 0/0 .text daObjRIVERROCK_Draw__FP16daObjRIVERROCK_c */
 static int daObjRIVERROCK_Draw(daObjRIVERROCK_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CBD328-80CBD348 000D48 0020+00 2/1 0/0 0/0 .text daObjRIVERROCK_Execute__FP16daObjRIVERROCK_c
- */
 static int daObjRIVERROCK_Execute(daObjRIVERROCK_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CBD348-80CBD3C0 000D68 0078+00 1/0 0/0 0/0 .text            CreateHeap__16daObjRIVERROCK_cFv */
 int daObjRIVERROCK_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "M_RiverRock.bmd");
     JUT_ASSERT(242, modelData != NULL);
@@ -247,7 +223,6 @@ int daObjRIVERROCK_c::CreateHeap() {
     return mModel != NULL ? TRUE : FALSE;
 }
 
-/* 80CBD3C0-80CBD71C 000DE0 035C+00 1/1 0/0 0/0 .text            create__16daObjRIVERROCK_cFv */
 int daObjRIVERROCK_c::create() {
     fopAcM_ct(this, daObjRIVERROCK_c);
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
@@ -291,13 +266,10 @@ int daObjRIVERROCK_c::create() {
     return rv;
 }
 
-/* 80CBD7AC-80CBD7B4 0011CC 0008+00 1/0 0/0 0/0 .text
- * daObjRIVERROCK_IsDelete__FP16daObjRIVERROCK_c                */
 static int daObjRIVERROCK_IsDelete(daObjRIVERROCK_c* i_this) {
     return 1;
 }
 
-/* 80CBD7B4-80CBD814 0011D4 0060+00 1/0 0/0 0/0 .text            Create__16daObjRIVERROCK_cFv */
 int daObjRIVERROCK_c::Create() {
     fopAcM_setCullSizeBox(this, field_0x5c4.x * -1000.0f, field_0x5c4.y * -500.0f,
                           field_0x5c4.z * -1000.0f, field_0x5c4.x * 1000.0f, field_0x5c4.y * 500.0f,
@@ -305,7 +277,6 @@ int daObjRIVERROCK_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CBD814-80CBD8E0 001234 00CC+00 1/0 0/0 0/0 .text Execute__16daObjRIVERROCK_cFPPA3_A4_f */
 int daObjRIVERROCK_c::Execute(Mtx** ppMtx) {
     Action();
     field_0x5a9 = fopAcM_GetParam(this) >> 24;
@@ -322,7 +293,6 @@ int daObjRIVERROCK_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80CBD8E0-80CBD964 001300 0084+00 1/0 0/0 0/0 .text            Draw__16daObjRIVERROCK_cFv */
 int daObjRIVERROCK_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -331,7 +301,6 @@ int daObjRIVERROCK_c::Draw() {
     return 1;
 }
 
-/* 80CBD964-80CBD9C4 001384 0060+00 1/0 0/0 0/0 .text            Delete__16daObjRIVERROCK_cFv */
 int daObjRIVERROCK_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     if (mHIONeedDelete) {
@@ -341,7 +310,6 @@ int daObjRIVERROCK_c::Delete() {
     return 1;
 }
 
-/* 80CBDB44-80CBDB64 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjRIVERROCK_Method */
 static actor_method_class l_daObjRIVERROCK_Method = {
     (process_method_func)daObjRIVERROCK_Create,
     (process_method_func)daObjRIVERROCK_Delete,
@@ -350,7 +318,6 @@ static actor_method_class l_daObjRIVERROCK_Method = {
     (process_method_func)daObjRIVERROCK_Draw,
 };
 
-/* 80CBDB64-80CBDB94 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RIVERROCK */
 extern actor_process_profile_definition g_profile_Obj_RIVERROCK = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp
index fe7a6ea279..072bf8bbee 100644
--- a/src/d/actor/d_a_obj_rock.cpp
+++ b/src/d/actor/d_a_obj_rock.cpp
@@ -11,12 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Declarations:
-//
-
-/* 80CBDC98-80CBDD20 000078 0088+00 1/0 0/0 0/0 .text            daObj_Rock_Draw__FP14obj_rock_class
- */
 static int daObj_Rock_Draw(obj_rock_class* i_this) {
     int room = fopAcM_GetRoomNo(i_this);
     rock_ss* rock = i_this->mRocks;
@@ -30,7 +24,6 @@ static int daObj_Rock_Draw(obj_rock_class* i_this) {
     return TRUE;
 }
 
-/* 80CBDD20-80CBDE48 000100 0128+00 2/1 0/0 0/0 .text daObj_Rock_Execute__FP14obj_rock_class */
 static int daObj_Rock_Execute(obj_rock_class* i_this) {
     if (i_this->mPatchInitialized == FALSE) {
         rock_ss* rock = i_this->mRocks;
@@ -57,12 +50,10 @@ static int daObj_Rock_Execute(obj_rock_class* i_this) {
     return TRUE;
 }
 
-/* 80CBDE48-80CBDE50 000228 0008+00 1/0 0/0 0/0 .text daObj_Rock_IsDelete__FP14obj_rock_class */
 static bool daObj_Rock_IsDelete(obj_rock_class* i_this) {
     return true;
 }
 
-/* 80CBDE50-80CBDED8 000230 0088+00 1/0 0/0 0/0 .text daObj_Rock_Delete__FP14obj_rock_class */
 static int daObj_Rock_Delete(obj_rock_class* i_this) {
     if (i_this->mInitialized) {
         J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Obj_rock", 3);
@@ -72,7 +63,6 @@ static int daObj_Rock_Delete(obj_rock_class* i_this) {
     return TRUE;
 }
 
-/* 80CBDED8-80CBDF84 0002B8 00AC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_rock_class* a_this = static_cast<obj_rock_class*>(i_this);
 
@@ -88,8 +78,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return TRUE;
 }
 
-/* 80CBDF84-80CBE138 000364 01B4+00 1/1 0/0 0/0 .text            set_pos_check__FP14obj_rock_classi
- */
 static int set_pos_check(obj_rock_class* i_this, int target_index) {
     for (int i = 0; i < target_index; i++) {
         cXyz dir = i_this->mRocks[i].mPos - i_this->mRocks[target_index].mPos;
@@ -101,7 +89,6 @@ static int set_pos_check(obj_rock_class* i_this, int target_index) {
     return TRUE;
 }
 
-/* 80CBE7F0-80CBE830 000000 0040+00 1/1 0/0 0/0 .data            cc_sph_src$3926 */
 static dCcD_SrcSph cc_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}},  // mObj
@@ -114,8 +101,6 @@ static dCcD_SrcSph cc_sph_src = {
     }                                // mSphAttr
 };
 
-/* 80CBE138-80CBE5A4 000518 046C+00 1/0 0/0 0/0 .text            daObj_Rock_Create__FP10fopAc_ac_c
- */
 static int daObj_Rock_Create(fopAc_ac_c* i_this) {
     obj_rock_class* a_this = static_cast<obj_rock_class*>(i_this);
     fopAcM_ct(a_this, obj_rock_class);
@@ -206,13 +191,10 @@ static int daObj_Rock_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 80CBE5A4-80CBE678 000984 00D4+00 1/1 0/0 0/0 .text            __dt__7rock_ssFv */
 rock_ss::~rock_ss() {}
 
-/* 80CBE678-80CBE70C 000A58 0094+00 1/1 0/0 0/0 .text            __ct__7rock_ssFv */
 rock_ss::rock_ss() {}
 
-/* 80CBE830-80CBE850 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Rock_Method */
 static actor_method_class l_daObj_Rock_Method = {
     (process_method_func)daObj_Rock_Create, (process_method_func)daObj_Rock_Delete,
     (process_method_func)daObj_Rock_Execute, (process_method_func)daObj_Rock_IsDelete,
diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp
index d4ab1c051f..4d28591b5a 100644
--- a/src/d/actor/d_a_obj_rope_bridge.cpp
+++ b/src/d/actor/d_a_obj_rope_bridge.cpp
@@ -9,13 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80597E84-80597E8C -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {"L_RopeB_S", "L_RopeB_L"};
 
-/* 80597E8C-80597E90 -00001 0004+00 3/3 0/0 0/0 .data            l_ropeArcName */
 static char* l_ropeArcName = "L_Ropest";
 
-/* 80595E38-80595ED8 000078 00A0+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjRBridge_cFv */
 void daObjRBridge_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(NULL, current.angle.y, 0);
@@ -29,7 +26,6 @@ void daObjRBridge_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80595ED8-80595F84 000118 00AC+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjRBridge_cFv */
 void daObjRBridge_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -45,8 +41,6 @@ void daObjRBridge_c::setBaseMtx() {
     }
 }
 
-/* 80595F84-80595FE0 0001C4 005C+00 2/2 0/0 0/0 .text            checkE3Special__14daObjRBridge_cFv
- */
 BOOL daObjRBridge_c::checkE3Special() {
     // E3 Dungeon - Fortress (Interior 1)
     if (strcmp(dComIfGp_getStartStageName(), "D_MN54") == 0 && dComIfGp_roomControl_getStayNo() == 7) {
@@ -56,37 +50,28 @@ BOOL daObjRBridge_c::checkE3Special() {
     return FALSE;
 }
 
-/* 80597D7C-80597D84 000000 0008+00 9/9 0/0 0/0 .rodata          l_brgBmdIdx */
 static const int l_brgBmdIdx[] = {4, 4};
 
-/* 80597D84-80597D8C 000008 0008+00 1/1 0/0 0/0 .rodata          l_brgDzbIdx */
 static const int l_brgDzbIdx[] = {7, 7};
 
-/* 80597D8C-80597D94 000010 0008+00 0/0 0/0 0/0 .rodata          l_brg_height */
 static const f32 l_brg_height[] = {600.0f, 1200.0f};
 
-/* 80597D94-80597D9C 000018 0008+00 0/1 0/0 0/0 .rodata          l_rope_length */
 static const f32 l_rope_length[] = {300.0f, 450.0f};
 
-/* 80597D9C-80597DA4 000020 0008+00 0/2 0/0 0/0 .rodata          l_himo_thick */
 static const int l_himo_thick[] = {80, 220};
 
-/* 80597DA4-80597DAC 000028 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0x2500, 0x2500};
 
-/* 80597DAC-80597DC4 000030 0018+00 1/1 0/0 0/0 .rodata          l_rope_cullbox_offset */
 static const Vec l_rope_cullbox_offset[] = {
     {0.0f, 550.0f, 0.0f},
     {0.0f, 1100.0f, 0.0f},
 };
 
-/* 80597DC4-80597DDC 000048 0018+00 1/1 0/0 0/0 .rodata          l_rope_cullbox */
 static const cull_box l_rope_cullbox = {
     {-350.0f, 0.0f, -350.0f},
     {350.0f, 350.0f, 350.0f},
 };
 
-/* 80595FE0-80596130 000220 0150+00 1/1 0/0 0/0 .text            setStPos__14daObjRBridge_cFv */
 void daObjRBridge_c::setStPos() {
     f32 height[2] = {845.0f + KREG_F(3), 1600.0f + KREG_F(4)};
     cXyz start(0.0f, 0.0f, 100.0f);
@@ -110,7 +95,6 @@ void daObjRBridge_c::setStPos() {
     eyePos = mStopPos;
 }
 
-/* 8059616C-805963C4 0003AC 0258+00 1/1 0/0 0/0 .text            initLinePos__14daObjRBridge_cFv */
 void daObjRBridge_c::initLinePos() {
     cXyz st_pos;
     cXyz brg_pos[2];
@@ -150,7 +134,6 @@ void daObjRBridge_c::initLinePos() {
     }
 }
 
-/* 805963C4-80596768 000604 03A4+00 1/1 0/0 0/0 .text            setLinePos__14daObjRBridge_cFv */
 void daObjRBridge_c::setLinePos() {
     cXyz st_pos;
     cXyz brg_pos[2];
@@ -216,22 +199,18 @@ void daObjRBridge_c::setLinePos() {
     }
 }
 
-/* 80597E90-80597EA8 00002C 0018+00 1/1 0/0 0/0 .data            l_rope_offsetL */
 static Vec l_rope_offsetL[] = {
     {-120.0f, 1165.0f, 0.0f},
     {120.0f, 1165.0f, 0.0f},
 };
 
-/* 80597EA8-80597EC0 000044 0018+00 1/1 0/0 0/0 .data            l_rope_offsetS */
 static Vec l_rope_offsetS[] = {
     {-120.0f, 575.0f, 0.0f},
     {120.0f, 575.0f, 0.0f},
 };
 
-/* 80597EC0-80597ECC 00005C 000C+00 1/1 0/0 0/0 .data            l_rope_offsetSt */
 static Vec l_rope_offsetSt = {0.0f, 0.0f, 70.0f};
 
-/* 80596768-805967E4 0009A8 007C+00 4/4 0/0 0/0 .text getLinePosSt__14daObjRBridge_cFP4cXyz */
 void daObjRBridge_c::getLinePosSt(cXyz* o_pos) {
     *o_pos = l_rope_offsetSt;
     mDoMtx_stack_c::transS(mStopPos);
@@ -239,7 +218,6 @@ void daObjRBridge_c::getLinePosSt(cXyz* o_pos) {
     mDoMtx_stack_c::multVec(o_pos, o_pos);
 }
 
-/* 805967E4-8059689C 000A24 00B8+00 4/4 0/0 0/0 .text getLinePosBrg__14daObjRBridge_cFiP4cXyz */
 void daObjRBridge_c::getLinePosBrg(int param_0, cXyz* o_pos) {
     if (mType == 0) {
         *o_pos = l_rope_offsetS[param_0];
@@ -252,7 +230,6 @@ void daObjRBridge_c::getLinePosBrg(int param_0, cXyz* o_pos) {
     mDoMtx_stack_c::multVec(o_pos, o_pos);
 }
 
-/* 8059689C-805969FC 000ADC 0160+00 1/1 0/0 0/0 .text            checkTight__14daObjRBridge_cFv */
 BOOL daObjRBridge_c::checkTight() {
     cXyz brg_pos;
     cXyz st_pos;
@@ -266,31 +243,24 @@ BOOL daObjRBridge_c::checkTight() {
     return FALSE;
 }
 
-/* 80597ECC-80597EE4 000068 0018+00 0/1 0/0 0/0 .data            l_cull_sizeS */
 static cull_box l_cull_sizeS = {
     {-250.0f, 0.0f, -100.0f},
     {250.0f, 1100.0f, 1000.0f},
 };
 
-/* 80597EE4-80597EFC 000080 0018+00 0/1 0/0 0/0 .data            l_cull_sizeL */
 static cull_box l_cull_sizeL = {
     {-400.0f, 0.0f, -100.0f},
     {400.0f, 1500.0f, 1500.0f},
 };
 
-/* 80597EFC-80597F04 000098 0008+00 0/1 0/0 0/0 .data            l_att_disXZ */
 static f32 l_att_disXZ[] = {2000.0f, 2000.0f};
 
-/* 80597F04-80597F0C 0000A0 0008+00 0/1 0/0 0/0 .data            l_att_high */
 static f32 l_att_high[] = {1000.0f, 2000.0f};
 
-/* 80597F0C-80597F14 0000A8 0008+00 0/1 0/0 0/0 .data            l_att_low */
 static f32 l_att_low[] = {-500.0f, -500.0f};
 
-/* 80597F14-80597F18 0000B0 0004+00 0/1 0/0 0/0 .data            l_att_ang */
 static s16 l_att_ang[] = {0x6000, 0x6000};
 
-/* 80597F18-80597F58 0000B4 0040+00 0/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x2002, 0x11}, 0x18}}, // mObj
@@ -303,7 +273,6 @@ static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80597F58-80597F98 0000F4 0040+00 0/1 0/0 0/0 .data            l_sph_src2 */
 static dCcD_SrcSph l_sph_src2 = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x10}, 0x19}}, // mObj
@@ -316,7 +285,6 @@ static dCcD_SrcSph l_sph_src2 = {
     } // mSphAttr
 };
 
-/* 80597F98-80597FE4 000134 004C+00 0/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x2002, 0x11}, 0x0}}, // mObj
@@ -329,7 +297,6 @@ static dCcD_SrcCps l_cps_src = {
     } // mCpsAttr
 };
 
-/* 805969FC-80596B88 000C3C 018C+00 1/0 0/0 0/0 .text            Create__14daObjRBridge_cFv */
 int daObjRBridge_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit()) || fopAcM_isSwitch(this, getSwbit2())) {
         shape_angle.x = 0x4000;
@@ -371,7 +338,6 @@ int daObjRBridge_c::Create() {
     return 1;
 }
 
-/* 80596B88-80596DE8 000DC8 0260+00 1/0 0/0 0/0 .text            CreateHeap__14daObjRBridge_cFv */
 int daObjRBridge_c::CreateHeap() {
     void* modelData = dComIfG_getObjectRes(l_arcName[mType], l_brgBmdIdx[mType]);
     JUT_ASSERT(837, modelData != NULL);
@@ -421,7 +387,6 @@ int daObjRBridge_c::CreateHeap() {
     return 1;
 }
 
-/* 80596DEC-80596EBC 00102C 00D0+00 1/1 0/0 0/0 .text            create1st__14daObjRBridge_cFv */
 int daObjRBridge_c::create1st() {
     mType = getType();
     if (mType != 0 && mType != 1) {
@@ -448,8 +413,6 @@ int daObjRBridge_c::create1st() {
     return phase_state;
 }
 
-/* 80596EBC-80596FA8 0010FC 00EC+00 1/0 0/0 0/0 .text            Execute__14daObjRBridge_cFPPA3_A4_f
- */
 int daObjRBridge_c::Execute(Mtx** param_0) {
     action();
     setLinePos();
@@ -466,7 +429,6 @@ int daObjRBridge_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80596FA8-8059715C 0011E8 01B4+00 1/1 0/0 0/0 .text            action__14daObjRBridge_cFv */
 void daObjRBridge_c::action() {
     typedef void (daObjRBridge_c::*modeProc)();
     static modeProc mode_proc[] = {
@@ -500,13 +462,11 @@ void daObjRBridge_c::action() {
     dComIfG_Ccsp()->Set(&mCcSph2);
 }
 
-/* 8059715C-80597170 00139C 0014+00 1/1 0/0 0/0 .text            init_wait__14daObjRBridge_cFv */
 void daObjRBridge_c::init_wait() {
     mFallTimer = 5;
     mMode = 0;
 }
 
-/* 80597170-805973BC 0013B0 024C+00 1/0 0/0 0/0 .text            mode_wait__14daObjRBridge_cFv */
 void daObjRBridge_c::mode_wait() {
     if (checkTight()) {
         field_0xb18 = 0;
@@ -552,7 +512,6 @@ void daObjRBridge_c::mode_wait() {
     }
 }
 
-/* 805973BC-805973E4 0015FC 0028+00 1/1 0/0 0/0 .text            init_cut__14daObjRBridge_cFv */
 void daObjRBridge_c::init_cut() {
     field_0xb18 = 0;
     field_0xb1a = 0;
@@ -561,7 +520,6 @@ void daObjRBridge_c::init_cut() {
     mMode = 1;
 }
 
-/* 805973E4-805975E8 001624 0204+00 1/0 0/0 0/0 .text            mode_cut__14daObjRBridge_cFv */
 void daObjRBridge_c::mode_cut() {
     if (mFallTimer >= 0) {
         if (mFallTimer == 0 && !checkE3Special()) {
@@ -593,15 +551,12 @@ void daObjRBridge_c::mode_cut() {
     }
 }
 
-/* 805975E8-805975F4 001828 000C+00 2/2 0/0 0/0 .text            init_end__14daObjRBridge_cFv */
 void daObjRBridge_c::init_end() {
     mMode = 2;
 }
 
-/* 805975F4-805975F8 001834 0004+00 1/0 0/0 0/0 .text            mode_end__14daObjRBridge_cFv */
 void daObjRBridge_c::mode_end() {}
 
-/* 805975F8-805977D0 001838 01D8+00 1/0 0/0 0/0 .text            Draw__14daObjRBridge_cFv */
 int daObjRBridge_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBrgModel, &tevStr);
@@ -633,7 +588,6 @@ int daObjRBridge_c::Draw() {
     return 1;
 }
 
-/* 805977D0-805978BC 001A10 00EC+00 1/1 0/0 0/0 .text checkHimoCulling__14daObjRBridge_cFv */
 BOOL daObjRBridge_c::checkHimoCulling() {
     Mtx cullmtx;
     cXyz offset(l_rope_cullbox_offset[mType]);
@@ -649,7 +603,6 @@ BOOL daObjRBridge_c::checkHimoCulling() {
     return fopAcM_checkCullingBox(cullmtx, min.x, min.y, min.z, max.x, max.y, max.z);
 }
 
-/* 805978BC-80597920 001AFC 0064+00 1/0 0/0 0/0 .text            Delete__14daObjRBridge_cFv */
 int daObjRBridge_c::Delete() {
     mSound.deleteObject();
 
@@ -658,32 +611,23 @@ int daObjRBridge_c::Delete() {
     return 1;
 }
 
-/* 80597920-80597A90 001B60 0170+00 1/0 0/0 0/0 .text daObjRBridge_create1st__FP14daObjRBridge_c
- */
 static int daObjRBridge_create1st(daObjRBridge_c* a_this) {
     fopAcM_ct(a_this, daObjRBridge_c);
     return a_this->create1st();
 }
 
-/* 80597CC0-80597CE0 001F00 0020+00 1/0 0/0 0/0 .text
- * daObjRBridge_MoveBGDelete__FP14daObjRBridge_c                */
 static int daObjRBridge_MoveBGDelete(daObjRBridge_c* a_this) {
     return a_this->MoveBGDelete();
 }
 
-/* 80597CE0-80597D00 001F20 0020+00 1/0 0/0 0/0 .text
- * daObjRBridge_MoveBGExecute__FP14daObjRBridge_c               */
 static int daObjRBridge_MoveBGExecute(daObjRBridge_c* a_this) {
     return a_this->MoveBGExecute();
 }
 
-/* 80597D00-80597D2C 001F40 002C+00 1/0 0/0 0/0 .text daObjRBridge_MoveBGDraw__FP14daObjRBridge_c
- */
 static int daObjRBridge_MoveBGDraw(daObjRBridge_c* a_this) {
     return a_this->MoveBGDraw();
 }
 
-/* 8059803C-8059805C -00001 0020+00 1/0 0/0 0/0 .data            daObjRBridge_METHODS */
 static actor_method_class daObjRBridge_METHODS = {
     (process_method_func)daObjRBridge_create1st,
     (process_method_func)daObjRBridge_MoveBGDelete,
@@ -692,7 +636,6 @@ static actor_method_class daObjRBridge_METHODS = {
     (process_method_func)daObjRBridge_MoveBGDraw,
 };
 
-/* 8059805C-8059808C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RopeBridge */
 extern actor_process_profile_definition g_profile_Obj_RopeBridge = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp
index f4216d8596..ec3bdb1113 100644
--- a/src/d/actor/d_a_obj_rotBridge.cpp
+++ b/src/d/actor/d_a_obj_rotBridge.cpp
@@ -7,14 +7,12 @@
 
 #include "d/actor/d_a_obj_rotBridge.h"
 
-/* 80CBF6D8-80CBF6E4 -00001 000C+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[3] = {
     "P_Mbridge",
     "P_Mbridge",
     "P_Mbrid9",
 };
 
-/* 80CBE98C-80CBE9DC 0000EC 0050+00 1/1 0/0 0/0 .text            __ct__17daRotBridge_HIO_cFv */
 daRotBridge_HIO_c::daRotBridge_HIO_c() {
     field_0x5 = 60;
     field_0x6 = 1;
@@ -25,7 +23,6 @@ daRotBridge_HIO_c::daRotBridge_HIO_c() {
     draw_wall_collision = FALSE;
 }
 
-/* 80CBEA24-80CBEB38 000184 0114+00 2/2 0/0 0/0 .text            setBaseMtx__13daRotBridge_cFv */
 void daRotBridge_c::setBaseMtx() {
 
     if (mpBgW2 != NULL) {
@@ -49,28 +46,24 @@ void daRotBridge_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CBF66C-80CBF678 000004 000C+00 0/1 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[] = {
     8,
     8,
     8,
 };
 
-/* 80CBF678-80CBF684 000010 000C+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {
     12,
     12,
     11,
 };
 
-/* 80CBF684-80CBF690 00001C 000C+00 0/1 0/0 0/0 .rodata          l_bckIdx */
 static const int l_bckIdx[] = {
     5,
     5,
     5,
 };
 
-/* 80CBEB38-80CBECBC 000298 0184+00 1/0 0/0 0/0 .text            CreateHeap__13daRotBridge_cFv */
 int daRotBridge_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mType], l_bmdIdx[mType]);
     JUT_ASSERT(216, modelData != NULL);
@@ -97,7 +90,6 @@ int daRotBridge_c::CreateHeap() {
     return 1;
 }
 
-/* 80CBECBC-80CBEED4 00041C 0218+00 1/1 0/0 0/0 .text            create__13daRotBridge_cFv */
 int daRotBridge_c::create() {
     fopAcM_ct(this, daRotBridge_c);
 
@@ -140,16 +132,12 @@ int daRotBridge_c::create() {
     return phase_state;
 }
 
-/* 80CBEF1C-80CBEF34 00067C 0018+00 1/1 0/0 0/0 .text
- * rideCallBack__13daRotBridge_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daRotBridge_c::rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     if (fopAcM_GetName(i_rideActor) == PROC_ALINK) {
         ((daRotBridge_c*)i_bgActor)->mIsPlayerRide = TRUE;
     }
 }
 
-/* 80CBEF34-80CBF050 000694 011C+00 1/0 0/0 0/0 .text            Execute__13daRotBridge_cFPPA3_A4_f
- */
 int daRotBridge_c::Execute(Mtx** param_0) {
     u8 isSw = fopAcM_isSwitch(this, fopAcM_GetParam(this) & 0xFF);
     if (bitSw != isSw) {
@@ -173,11 +161,8 @@ int daRotBridge_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CBF794-80CBF7AC 000014 0018+00 3/3 0/0 0/0 .bss             l_HIO */
 static daRotBridge_HIO_c l_HIO;
 
-/* 80CBF050-80CBF1EC 0007B0 019C+00 1/1 0/0 0/0 .text            playerAreaCheck__13daRotBridge_cFv
- */
 void daRotBridge_c::playerAreaCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -190,7 +175,6 @@ void daRotBridge_c::playerAreaCheck() {
     }
 }
 
-/* 80CBF1EC-80CBF404 00094C 0218+00 1/1 0/0 0/0 .text            moveBridge__13daRotBridge_cFv */
 void daRotBridge_c::moveBridge() {
     if (mDoMove) {
         mDoMtx_MtxToRot(mpModel->getAnmMtx(0), &mRotation);
@@ -223,7 +207,6 @@ void daRotBridge_c::moveBridge() {
     }
 }
 
-/* 80CBF404-80CBF4BC 000B64 00B8+00 1/0 0/0 0/0 .text            Draw__13daRotBridge_cFv */
 int daRotBridge_c::Draw() {
 #if DEBUG
     if (l_HIO.draw_wall_collision && mpBgW2 != NULL) {
@@ -242,7 +225,6 @@ int daRotBridge_c::Draw() {
     return 1;
 }
 
-/* 80CBF4BC-80CBF530 000C1C 0074+00 1/0 0/0 0/0 .text            Delete__13daRotBridge_cFv */
 int daRotBridge_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mType]);
 
@@ -253,30 +235,23 @@ int daRotBridge_c::Delete() {
     return 1;
 }
 
-/* 80CBF530-80CBF55C 000C90 002C+00 1/0 0/0 0/0 .text            daRotBridge_Draw__FP13daRotBridge_c
- */
 static int daRotBridge_Draw(daRotBridge_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CBF55C-80CBF57C 000CBC 0020+00 1/0 0/0 0/0 .text daRotBridge_Execute__FP13daRotBridge_c */
 static int daRotBridge_Execute(daRotBridge_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CBF57C-80CBF59C 000CDC 0020+00 1/0 0/0 0/0 .text daRotBridge_Delete__FP13daRotBridge_c */
 static int daRotBridge_Delete(daRotBridge_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CBF59C-80CBF5BC 000CFC 0020+00 1/0 0/0 0/0 .text            daRotBridge_Create__FP10fopAc_ac_c
- */
 static int daRotBridge_Create(fopAc_ac_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return ((daRotBridge_c*)i_this)->create();
 }
 
-/* 80CBF6E4-80CBF704 -00001 0020+00 1/0 0/0 0/0 .data            l_daRotBridge_Method */
 static actor_method_class l_daRotBridge_Method = {
     (process_method_func)daRotBridge_Create,
     (process_method_func)daRotBridge_Delete,
@@ -285,7 +260,6 @@ static actor_method_class l_daRotBridge_Method = {
     (process_method_func)daRotBridge_Draw,
 };
 
-/* 80CBF704-80CBF734 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RotBridge */
 extern actor_process_profile_definition g_profile_Obj_RotBridge = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp
index e9d23a0637..3bdc7bb769 100644
--- a/src/d/actor/d_a_obj_rotTrap.cpp
+++ b/src/d/actor/d_a_obj_rotTrap.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_rotTrap.h"
 #include "d/d_s_play.h"
 
-/* 80CBF8AC-80CBF8F8 0000EC 004C+00 1/1 0/0 0/0 .text            __ct__15daRotTrap_HIO_cFv */
 daRotTrap_HIO_c::daRotTrap_HIO_c() {
     vibration = 3;
     rotate_time = 4.5f;
@@ -18,10 +17,8 @@ daRotTrap_HIO_c::daRotTrap_HIO_c() {
     acc = 150;
 }
 
-/* 80CC0AC4-80CC0AD4 000014 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daRotTrap_HIO_c l_HIO;
 
-/* 80CC080C-80CC083C 000004 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__11daRotTrap_c */
 dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = {
     {0, {{AT_TYPE_800, 0x1, 0x1F}, {0x0, 0x0}, {0}}},
     {dCcD_SE_SWORD, 0, 1, 0, 0},
@@ -29,13 +26,11 @@ dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = {
     {0}
 };
 
-/* 80CC0880-80CC08C4 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daRotTrap_c */
 dCcD_SrcCyl daRotTrap_c::mCcDCyl = {
     mCcDObjInfo,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80CC08C4-80CC096C 000064 00A8+00 0/1 0/0 0/0 .data            atPos */
 static Vec atPos[] = {
     {-37.0f, 130.0f, -200.0f},
     {-37.0f, 130.0f, -300.0f},
@@ -53,7 +48,6 @@ static Vec atPos[] = {
     {37.0f, 130.0f, 800.0f},
 };
 
-/* 80CC096C-80CC09A4 00010C 0038+00 0/1 0/0 0/0 .data            atR */
 static f32 atR[] = {
     50.0f,
     50.0f,
@@ -71,7 +65,6 @@ static f32 atR[] = {
     50.0f,
 };
 
-/* 80CBF940-80CBF9D8 000180 0098+00 2/2 0/0 0/0 .text            setBaseMtx__11daRotTrap_cFv */
 void daRotTrap_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -81,7 +74,6 @@ void daRotTrap_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CBF9D8-80CBFAC8 000218 00F0+00 1/0 0/0 0/0 .text            CreateHeap__11daRotTrap_cFv */
 int daRotTrap_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_kama", 4);
     JUT_ASSERT(214, modelData != NULL);
@@ -100,7 +92,6 @@ int daRotTrap_c::CreateHeap() {
     return 1;
 }
 
-/* 80CBFAC8-80CBFC88 000308 01C0+00 1/1 0/0 0/0 .text            create__11daRotTrap_cFv */
 int daRotTrap_c::create() {
     fopAcM_ct(this, daRotTrap_c);
 
@@ -135,7 +126,6 @@ int daRotTrap_c::create() {
     return phase_state;
 }
 
-/* 80CBFEC4-80CBFF1C 000704 0058+00 1/0 0/0 0/0 .text            Execute__11daRotTrap_cFPPA3_A4_f */
 int daRotTrap_c::Execute(Mtx** param_0) {
     procMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -144,7 +134,6 @@ int daRotTrap_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CBFF1C-80CC00AC 00075C 0190+00 1/1 0/0 0/0 .text            procMain__11daRotTrap_cFv */
 void daRotTrap_c::procMain() {
     static void (daRotTrap_c::*mode_proc[])() = {
         &daRotTrap_c::modeWait,
@@ -204,7 +193,6 @@ void daRotTrap_c::procMain() {
     }
 }
 
-/* 80CC00AC-80CC0120 0008EC 0074+00 1/1 0/0 0/0 .text            init_modeWait__11daRotTrap_cFv */
 void daRotTrap_c::init_modeWait() {
     if (mpBgW != NULL) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -218,7 +206,6 @@ void daRotTrap_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80CC0120-80CC0180 000960 0060+00 1/0 0/0 0/0 .text            modeWait__11daRotTrap_cFv */
 void daRotTrap_c::modeWait() {
     if (fopAcM_isSwitch(this, mSwbit)) {
         init_modeAcc();
@@ -229,7 +216,6 @@ void daRotTrap_c::modeWait() {
     }
 }
 
-/* 80CC0180-80CC027C 0009C0 00FC+00 1/1 0/0 0/0 .text            init_modeAcc__11daRotTrap_cFv */
 void daRotTrap_c::init_modeAcc() {
     if (mpBgW2 != NULL) {
         dComIfG_Bgsp().Release(mpBgW2);
@@ -247,7 +233,6 @@ void daRotTrap_c::init_modeAcc() {
     mMode = 1;
 }
 
-/* 80CC027C-80CC034C 000ABC 00D0+00 1/0 0/0 0/0 .text            modeAcc__11daRotTrap_cFv */
 void daRotTrap_c::modeAcc() {
     mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     BOOL temp_r30 = cLib_chaseAngleS(&field_0x5b2, field_0x5b0, field_0x5b0 / l_HIO.acc);
@@ -259,13 +244,11 @@ void daRotTrap_c::modeAcc() {
     }
 }
 
-/* 80CC034C-80CC0360 000B8C 0014+00 2/2 0/0 0/0 .text            init_modeMove__11daRotTrap_cFv */
 void daRotTrap_c::init_modeMove() {
     field_0x5ae = 0;
     mMode = 2;
 }
 
-/* 80CC0360-80CC0440 000BA0 00E0+00 1/0 0/0 0/0 .text            modeMove__11daRotTrap_cFv */
 void daRotTrap_c::modeMove() {
     mDoAud_seStartLevel(Z2SE_OBJ_RL_SWD_LV, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     field_0x5b0 = cM_deg2s(360.0f / (30.0f * l_HIO.rotate_time));
@@ -277,7 +260,6 @@ void daRotTrap_c::modeMove() {
     seSet();
 }
 
-/* 80CC0440-80CC0548 000C80 0108+00 2/2 0/0 0/0 .text            seSet__11daRotTrap_cFv */
 void daRotTrap_c::seSet() {
     if (shape_angle.y & 0x8000) {
         if (field_0x5ae == 0) {
@@ -290,7 +272,6 @@ void daRotTrap_c::seSet() {
     }
 }
 
-/* 80CC0548-80CC05EC 000D88 00A4+00 1/0 0/0 0/0 .text            Draw__11daRotTrap_cFv */
 int daRotTrap_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -301,7 +282,6 @@ int daRotTrap_c::Draw() {
     return 1;
 }
 
-/* 80CC05EC-80CC0654 000E2C 0068+00 1/0 0/0 0/0 .text            Delete__11daRotTrap_cFv */
 int daRotTrap_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_kama");
 
@@ -312,30 +292,23 @@ int daRotTrap_c::Delete() {
     return 1;
 }
 
-/* 80CC0654-80CC0680 000E94 002C+00 1/0 0/0 0/0 .text            daRotTrap_Draw__FP11daRotTrap_c */
 static int daRotTrap_Draw(daRotTrap_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CC0680-80CC06A0 000EC0 0020+00 1/0 0/0 0/0 .text            daRotTrap_Execute__FP11daRotTrap_c
- */
 static int daRotTrap_Execute(daRotTrap_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CC06A0-80CC06C0 000EE0 0020+00 1/0 0/0 0/0 .text            daRotTrap_Delete__FP11daRotTrap_c
- */
 static int daRotTrap_Delete(daRotTrap_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CC06C0-80CC06E0 000F00 0020+00 1/0 0/0 0/0 .text            daRotTrap_Create__FP10fopAc_ac_c */
 static int daRotTrap_Create(fopAc_ac_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return ((daRotTrap_c*)i_this)->create();
 }
 
-/* 80CC09EC-80CC0A0C -00001 0020+00 1/0 0/0 0/0 .data            l_daRotTrap_Method */
 static actor_method_class l_daRotTrap_Method = {
     (process_method_func)daRotTrap_Create,
     (process_method_func)daRotTrap_Delete,
@@ -344,7 +317,6 @@ static actor_method_class l_daRotTrap_Method = {
     (process_method_func)daRotTrap_Draw,
 };
 
-/* 80CC0A0C-80CC0A3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RotTrap */
 extern actor_process_profile_definition g_profile_Obj_RotTrap = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp
index a6a07a69c5..fa3048b733 100644
--- a/src/d/actor/d_a_obj_roten.cpp
+++ b/src/d/actor/d_a_obj_roten.cpp
@@ -9,13 +9,11 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CC0B58-80CC0B94 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObj_Roten_cFv */
 void daObj_Roten_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CC0B94-80CC0C20 0000B4 008C+00 2/2 0/0 0/0 .text            setBaseMtx__13daObj_Roten_cFv */
 void daObj_Roten_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -24,7 +22,6 @@ void daObj_Roten_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CC0C20-80CC0EC4 000140 02A4+00 1/0 0/0 0/0 .text            Create__13daObj_Roten_cFv */
 int daObj_Roten_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
@@ -71,13 +68,10 @@ int daObj_Roten_c::Create() {
     return 1;
 }
 
-/* 80CC144C-80CC1450 -00001 0004+00 1/1 0/0 0/0 .data            l_resFileName */
 static char* l_resFileName = "Obj_roten";
 
-/* 80CC1450-80CC1454 000004 0004+00 1/1 0/0 0/0 .data            l_bmdFileIdx */
 static u32 l_bmdFileIdx = 4;
 
-/* 80CC0EC4-80CC0F40 0003E4 007C+00 1/0 0/0 0/0 .text            CreateHeap__13daObj_Roten_cFv */
 int daObj_Roten_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileIdx);
     JUT_ASSERT(156, mdlData_p != NULL);
@@ -85,11 +79,8 @@ int daObj_Roten_c::CreateHeap() {
     return mModel != NULL;
 }
 
-/* ############################################################################################## */
-/* 80CC1454-80CC1458 000008 0004+00 1/1 0/0 0/0 .data            l_dzbFileIdx */
 static u32 l_dzbFileIdx = 7;
 
-/* 80CC0F40-80CC1038 000460 00F8+00 1/1 0/0 0/0 .text            create__13daObj_Roten_cFv */
 int daObj_Roten_c::create() {
     fopAcM_ct(this, daObj_Roten_c);
          /* dSv_event_flag_c::M_031 - Goron Mines - Goron Mines clear */
@@ -108,8 +99,6 @@ int daObj_Roten_c::create() {
     return rv;
 }
 
-/* 80CC1038-80CC1138 000558 0100+00 1/0 0/0 0/0 .text            Execute__13daObj_Roten_cFPPA3_A4_f
- */
 int daObj_Roten_c::Execute(Mtx** ppMtx) {
     if (mWithinTime) {
         if (dComIfGp_roomControl_getStayNo() != 0) {
@@ -123,7 +112,6 @@ int daObj_Roten_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80CC1138-80CC1254 000658 011C+00 1/0 0/0 0/0 .text            Draw__13daObj_Roten_cFv */
 int daObj_Roten_c::Draw() {
     if (mWithinTime) {
         cLib_addCalc(&mBossLightRefDist, 1.0f, 0.5f, 0.1f, 0.0001f);
@@ -142,7 +130,6 @@ int daObj_Roten_c::Draw() {
     return 1;
 }
 
-/* 80CC1254-80CC12E4 000774 0090+00 1/0 0/0 0/0 .text            Delete__13daObj_Roten_cFv */
 int daObj_Roten_c::Delete() {
     for (int i = 0; i < 2; i = i + 1) {
         if (mEmitters[i] != NULL) {
@@ -155,41 +142,33 @@ int daObj_Roten_c::Delete() {
     return 1;
 }
 
-/* 80CC12E4-80CC12F4 000804 0010+00 3/3 0/0 0/0 .text            getResName__13daObj_Roten_cFv */
 char* daObj_Roten_c::getResName() {
     return l_resFileName;
 }
 
-/* 80CC12F4-80CC1314 000814 0020+00 1/0 0/0 0/0 .text            daObj_Roten_Create__FPv */
 static int daObj_Roten_Create(void* i_this) {
     return static_cast<daObj_Roten_c*>(i_this)->create();
 }
 
-/* 80CC1314-80CC1334 000834 0020+00 1/0 0/0 0/0 .text            daObj_Roten_Delete__FPv */
 static int daObj_Roten_Delete(void* i_this) {
     return static_cast<daObj_Roten_c*>(i_this)->MoveBGDelete();
 }
 
-/* 80CC1334-80CC1354 000854 0020+00 1/0 0/0 0/0 .text            daObj_Roten_Execute__FPv */
 static int daObj_Roten_Execute(void* i_this) {
     return static_cast<daObj_Roten_c*>(i_this)->MoveBGExecute();
 }
 
-/* 80CC1354-80CC1380 000874 002C+00 1/0 0/0 0/0 .text            daObj_Roten_Draw__FPv */
 static int daObj_Roten_Draw(void* i_this) {
     return static_cast<daObj_Roten_c*>(i_this)->Draw();
 }
 
-/* 80CC1380-80CC1388 0008A0 0008+00 1/0 0/0 0/0 .text            daObj_Roten_IsDelete__FPv */
 static int daObj_Roten_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CC1388-80CC13F8 0008A8 0070+00 1/0 0/0 0/0 .text            __dt__13daObj_Roten_cFv */
 daObj_Roten_c::~daObj_Roten_c() {
 }
 
-/* 80CC1458-80CC1478 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Roten_MethodTable */
 static actor_method_class daObj_Roten_MethodTable = {
     (process_method_func)daObj_Roten_Create,
     (process_method_func)daObj_Roten_Delete,
@@ -198,7 +177,6 @@ static actor_method_class daObj_Roten_MethodTable = {
     (process_method_func)daObj_Roten_Draw,
 };
 
-/* 80CC1478-80CC14A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_ROTEN */
 extern actor_process_profile_definition g_profile_OBJ_ROTEN = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp
index b4259f6b81..803f9f365b 100644
--- a/src/d/actor/d_a_obj_rstair.cpp
+++ b/src/d/actor/d_a_obj_rstair.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80CC1558-80CC1614 000078 00BC+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjRotStair_cFv */
 void daObjRotStair_c::initBaseMtx() {
     mWaterModels[0]->setBaseScale(scale);
     mWaterModels[1]->setBaseScale(scale);
@@ -21,7 +20,6 @@ void daObjRotStair_c::initBaseMtx() {
     mWaterModels[1]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CC1614-80CC16B0 000134 009C+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjRotStair_cFv */
 void daObjRotStair_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -32,22 +30,18 @@ void daObjRotStair_c::setBaseMtx() {
     mWaterModels[1]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CC2700-80CC2708 000000 0008+00 3/3 0/0 0/0 .rodata          l_wtr_bmd */
 static u32 const l_wtr_bmd[2] = {
     6, 7,
 };
 
-/* 80CC2708-80CC2710 000008 0008+00 0/1 0/0 0/0 .rodata          l_wtr_btk */
 static u32 const l_wtr_btk[2] = {
     10, 11
 };
 
-/* 80CC2710-80CC2720 000010 0010+00 2/2 0/0 0/0 .rodata          l_target_angleY */
 static s16 const l_target_angleY[8] = {
     0x7FFF, 0x4000, 0x0000, -0x4000, 0x0000, -0x4000, 0x7FFF, 0x4000,
 };
 
-/* 80CC16B0-80CC17F0 0001D0 0140+00 1/0 0/0 0/0 .text            Create__15daObjRotStair_cFv */
 int daObjRotStair_c::Create() {
     for (int i = 0; i < 4; i = i + 1) {
         mIsSw[i] = fopAcM_isSwitch(this, i + getSwNo());
@@ -76,15 +70,12 @@ int daObjRotStair_c::Create() {
     return 1;
 }
 
-/* 80CC275C-80CC2760 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "K_spkai00";
 
-/* 80CC2760-80CC276C 000024 000C+00 0/0 0/0 0/0 .data            l_water_check_offset */
 static Vec l_water_check_offset = {
     0.0f, 2000.0f, -2000.0f,
 };
 
-/* 80CC17F0-80CC19E0 000310 01F0+00 1/0 0/0 0/0 .text            CreateHeap__15daObjRotStair_cFv */
 int daObjRotStair_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(215, modelData != NULL);
@@ -114,7 +105,6 @@ int daObjRotStair_c::CreateHeap() {
     return 1;
 }
 
-/* 80CC1A28-80CC1AF0 000548 00C8+00 1/1 0/0 0/0 .text            create1st__15daObjRotStair_cFv */
 int daObjRotStair_c::create1st() {
     if (mInit == 0) {
         field_0x5c8 = home.angle.x;
@@ -139,7 +129,6 @@ int daObjRotStair_c::create1st() {
     return rv;
 }
 
-/* 80CC1AF0-80CC1BA4 000610 00B4+00 1/0 0/0 0/0 .text Execute__15daObjRotStair_cFPPA3_A4_f */
 int daObjRotStair_c::Execute(Mtx** ppMtx) {
     move_proc_call();
     event_proc_call();
@@ -156,8 +145,6 @@ int daObjRotStair_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80CC1BA4-80CC1C30 0006C4 008C+00 1/1 0/0 0/0 .text            move_proc_call__15daObjRotStair_cFv
- */
 void daObjRotStair_c::move_proc_call() {
     static daObjRotStair_c::modeFunc l_func[2] = {
         &daObjRotStair_c::modeWait,
@@ -166,8 +153,6 @@ void daObjRotStair_c::move_proc_call() {
     (this->*(l_func[mMode]))();
 }
 
-/* 80CC1C30-80CC1CF0 000750 00C0+00 2/2 0/0 0/0 .text            init_modeWait__15daObjRotStair_cFv
- */
 void daObjRotStair_c::init_modeWait() {
     s8 dVar3 = field_0x5e3;
     if (dVar3 >= 4) {
@@ -182,7 +167,6 @@ void daObjRotStair_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80CC1CF0-80CC1DF8 000810 0108+00 1/0 0/0 0/0 .text            modeWait__15daObjRotStair_cFv */
 void daObjRotStair_c::modeWait() {
     s8 dVar3 = field_0x5e3;
     if (dVar3 >= 4) {
@@ -205,7 +189,6 @@ void daObjRotStair_c::modeWait() {
     }
 }
 
-/* 80CC1DF8-80CC1EC8 000918 00D0+00 1/1 0/0 0/0 .text init_modeRotate__15daObjRotStair_cFv */
 void daObjRotStair_c::init_modeRotate() {
     s8 dVar3 = field_0x5e3;
     if (dVar3 >= 4) {
@@ -223,7 +206,6 @@ void daObjRotStair_c::init_modeRotate() {
     mMode = MODE_ROTATE;
 }
 
-/* 80CC1EC8-80CC2024 0009E8 015C+00 1/0 0/0 0/0 .text            modeRotate__15daObjRotStair_cFv */
 void daObjRotStair_c::modeRotate() {
     if (abs(mTargetAngle - shape_angle.y) < mAngleStep) {
         dComIfGp_getVibration().StartShock(8, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
@@ -238,7 +220,6 @@ void daObjRotStair_c::modeRotate() {
     fopAcM_seStartLevel(this, Z2SE_OBJ_ROLLSTAIR_ROLL, 0);
 }
 
-/* 80CC2024-80CC20E0 000B44 00BC+00 1/1 0/0 0/0 .text event_proc_call__15daObjRotStair_cFv */
 void daObjRotStair_c::event_proc_call() {
     static daObjRotStair_c::actionFunc l_func[4] = {
         &daObjRotStair_c::actionWait,
@@ -250,7 +231,6 @@ void daObjRotStair_c::event_proc_call() {
     (this->*(l_func[mAction]))();
 }
 
-/* 80CC20E0-80CC2158 000C00 0078+00 1/0 0/0 0/0 .text            actionWait__15daObjRotStair_cFv */
 void daObjRotStair_c::actionWait() {
     if (mMapToolId != 0xff && field_0x5e2) {
         field_0x5e2 = false;
@@ -260,7 +240,6 @@ void daObjRotStair_c::actionWait() {
     }
 }
 
-/* 80CC2158-80CC21C0 000C78 0068+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjRotStair_cFv */
 void daObjRotStair_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT);
@@ -270,7 +249,6 @@ void daObjRotStair_c::actionOrderEvent() {
     }
 }
 
-/* 80CC21C0-80CC221C 000CE0 005C+00 1/0 0/0 0/0 .text            actionEvent__15daObjRotStair_cFv */
 void daObjRotStair_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventId)) {
         setAction(ACTION_DEAD);
@@ -278,12 +256,9 @@ void daObjRotStair_c::actionEvent() {
     }
 }
 
-/* 80CC221C-80CC2220 000D3C 0004+00 1/0 0/0 0/0 .text            actionDead__15daObjRotStair_cFv */
 void daObjRotStair_c::actionDead() {
 }
 
-/* 80CC2220-80CC22A0 000D40 0080+00 1/1 0/0 0/0 .text            checkChangeSw__15daObjRotStair_cFv
- */
 int daObjRotStair_c::checkChangeSw() {
     for (int i = 0; i < 4; i++) {
         if (mIsSw[i] != fopAcM_isSwitch(this, i + getSwNo())) {
@@ -293,7 +268,6 @@ int daObjRotStair_c::checkChangeSw() {
     return -1;
 }
 
-/* 80CC22A0-80CC2310 000DC0 0070+00 1/1 0/0 0/0 .text            offSwitch__15daObjRotStair_cFi */
 void daObjRotStair_c::offSwitch(int idx) {
     for (int i = 0; i < 4; i++) {
         int swNo = getSwNo() + i;
@@ -303,8 +277,6 @@ void daObjRotStair_c::offSwitch(int idx) {
     }
 }
 
-/* 80CC2310-80CC2364 000E30 0054+00 3/3 0/0 0/0 .text            onWaterModel__15daObjRotStair_cFv
- */
 void daObjRotStair_c::onWaterModel() {
     if (!mWaterModelOn) {
         dComIfG_Bgsp().Regist(mWaterBgw, this);
@@ -312,8 +284,6 @@ void daObjRotStair_c::onWaterModel() {
     }
 }
 
-/* 80CC2364-80CC23C4 000E84 0060+00 3/3 0/0 0/0 .text            offWaterModel__15daObjRotStair_cFv
- */
 void daObjRotStair_c::offWaterModel() {
     if (mWaterModelOn) {
         if (mWaterBgw->ChkUsed()) {
@@ -323,7 +293,6 @@ void daObjRotStair_c::offWaterModel() {
     }
 }
 
-/* 80CC23C4-80CC25C0 000EE4 01FC+00 1/0 0/0 0/0 .text            Draw__15daObjRotStair_cFv */
 int daObjRotStair_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -359,7 +328,6 @@ int daObjRotStair_c::Draw() {
     return 1;
 }
 
-/* 80CC25C0-80CC262C 0010E0 006C+00 1/0 0/0 0/0 .text            Delete__15daObjRotStair_cFv */
 int daObjRotStair_c::Delete() {
     if (mWaterBgw != NULL && mWaterBgw->ChkUsed()) {
         dComIfG_Bgsp().Release(mWaterBgw);
@@ -368,33 +336,24 @@ int daObjRotStair_c::Delete() {
     return 1;
 }
 
-/* 80CC262C-80CC268C 00114C 0060+00 1/0 0/0 0/0 .text daObjRotStair_create1st__FP15daObjRotStair_c
- */
 static int daObjRotStair_create1st(daObjRotStair_c* i_this) {
     fopAcM_ct(i_this, daObjRotStair_c);
     return i_this->create1st();
 }
 
-/* 80CC268C-80CC26AC 0011AC 0020+00 1/0 0/0 0/0 .text
- * daObjRotStair_MoveBGDelete__FP15daObjRotStair_c              */
 static int daObjRotStair_MoveBGDelete(daObjRotStair_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CC26AC-80CC26CC 0011CC 0020+00 1/0 0/0 0/0 .text
- * daObjRotStair_MoveBGExecute__FP15daObjRotStair_c             */
 static int daObjRotStair_MoveBGExecute(daObjRotStair_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CC26CC-80CC26F8 0011EC 002C+00 1/0 0/0 0/0 .text
- * daObjRotStair_MoveBGDraw__FP15daObjRotStair_c                */
 static int daObjRotStair_MoveBGDraw(daObjRotStair_c* i_this) {
     return i_this->Draw();
 }
 
 
-/* 80CC27FC-80CC281C -00001 0020+00 1/0 0/0 0/0 .data            daObjRotStair_METHODS */
 static actor_method_class daObjRotStair_METHODS = {
     (process_method_func)daObjRotStair_create1st,
     (process_method_func)daObjRotStair_MoveBGDelete,
@@ -403,7 +362,6 @@ static actor_method_class daObjRotStair_METHODS = {
     (process_method_func)daObjRotStair_MoveBGDraw,
 };
 
-/* 80CC281C-80CC284C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_RotStair */
 extern actor_process_profile_definition g_profile_Obj_RotStair = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp
index 602a178578..72657355a8 100644
--- a/src/d/actor/d_a_obj_rw.cpp
+++ b/src/d/actor/d_a_obj_rw.cpp
@@ -12,8 +12,8 @@
 
 class daOBJ_RW_HIO_c : public JORReflexible {
 public:
-    /* 80CC298C */ daOBJ_RW_HIO_c();
-    /* 80CC3A5C */ virtual ~daOBJ_RW_HIO_c() {}
+    daOBJ_RW_HIO_c();
+    virtual ~daOBJ_RW_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -22,13 +22,11 @@ public:
     /* 0xC */ u8 unk_0xC[0x14 - 0xC];
 };
 
-/* 80CC298C-80CC29B0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daOBJ_RW_HIO_cFv */
 daOBJ_RW_HIO_c::daOBJ_RW_HIO_c() {
     id = -1;
     base_size = 1.0f;
 }
 
-/* 80CC29B0-80CC2A74 000110 00C4+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -48,7 +46,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80CC2A74-80CC2BA4 0001D4 0130+00 1/0 0/0 0/0 .text            daOBJ_RW_Draw__FP12obj_rw_class */
 static int daOBJ_RW_Draw(obj_rw_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
 
@@ -75,7 +72,6 @@ static int daOBJ_RW_Draw(obj_rw_class* i_this) {
     return 1;
 }
 
-/* 80CC2BA4-80CC2E60 000304 02BC+00 1/1 0/0 0/0 .text            damage_check__FP12obj_rw_class */
 static void damage_check(obj_rw_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -149,7 +145,6 @@ static void damage_check(obj_rw_class* i_this) {
     }
 }
 
-/* 80CC2E60-80CC2E78 0005C0 0018+00 1/1 0/0 0/0 .text            normal__FP12obj_rw_class */
 static void normal(obj_rw_class* i_this) {
     switch (i_this->mode) {
     case 0:
@@ -158,7 +153,6 @@ static void normal(obj_rw_class* i_this) {
     }
 }
 
-/* 80CC2E78-80CC2F1C 0005D8 00A4+00 1/1 0/0 0/0 .text            action__FP12obj_rw_class */
 static void action(obj_rw_class* i_this) {
     cXyz sp14;
     cXyz sp8;
@@ -176,14 +170,10 @@ static void action(obj_rw_class* i_this) {
     i_this->field_0x670 = i_this->field_0x66c * (20.0f + TREG_F(16)) * cM_ssin(i_this->field_0x672);
 }
 
-/* 80CC3C80-80CC3C84 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 l_HIOInit;
 
-/* 80CC3C90-80CC3CA4 000018 0014+00 3/3 0/0 0/0 .bss             l_HIO */
 static daOBJ_RW_HIO_c l_HIO;
 
-/* 80CC2F1C-80CC32EC 00067C 03D0+00 2/1 0/0 0/0 .text            daOBJ_RW_Execute__FP12obj_rw_class
- */
 static int daOBJ_RW_Execute(obj_rw_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     cXyz sp1C;
@@ -267,14 +257,10 @@ static int daOBJ_RW_Execute(obj_rw_class* i_this) {
     return 1;
 }
 
-/* 80CC32EC-80CC32F4 000A4C 0008+00 1/0 0/0 0/0 .text            daOBJ_RW_IsDelete__FP12obj_rw_class
- */
 static int daOBJ_RW_IsDelete(obj_rw_class* i_this) {
     return 1;
 }
 
-/* 80CC32F4-80CC3368 000A54 0074+00 1/0 0/0 0/0 .text            daOBJ_RW_Delete__FP12obj_rw_class
- */
 static int daOBJ_RW_Delete(obj_rw_class* i_this) {
     fopAc_ac_c* actor = &i_this->enemy;
     fopAcM_GetID(actor);
@@ -292,7 +278,6 @@ static int daOBJ_RW_Delete(obj_rw_class* i_this) {
     return 1;
 }
 
-/* 80CC3368-80CC3400 000AC8 0098+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     obj_rw_class* i_this = (obj_rw_class*)actor;
 
@@ -309,7 +294,6 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80CC3400-80CC36E4 000B60 02E4+00 1/0 0/0 0/0 .text            daOBJ_RW_Create__FP10fopAc_ac_c */
 static int daOBJ_RW_Create(fopAc_ac_c* actor) {
     obj_rw_class* i_this = (obj_rw_class*)actor;
     fopAcM_ct(actor, obj_rw_class);
@@ -400,7 +384,6 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) {
     return phase_state;
 }
 
-/* 80CC3BF8-80CC3C18 -00001 0020+00 1/0 0/0 0/0 .data            l_daOBJ_RW_Method */
 static actor_method_class l_daOBJ_RW_Method = {
     (process_method_func)daOBJ_RW_Create,
     (process_method_func)daOBJ_RW_Delete,
@@ -409,7 +392,6 @@ static actor_method_class l_daOBJ_RW_Method = {
     (process_method_func)daOBJ_RW_Draw,
 };
 
-/* 80CC3C18-80CC3C48 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_RW */
 extern actor_process_profile_definition g_profile_OBJ_RW = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp
index 50982d2dff..1572b883f6 100644
--- a/src/d/actor/d_a_obj_sWallShutter.cpp
+++ b/src/d/actor/d_a_obj_sWallShutter.cpp
@@ -9,13 +9,11 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 
-/* 80598FE8-80598FF0 -00001 0008+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[2] = {
     "P_Rgate",
     "SDGate",
 };
 
-/* 805981EC-8059825C 0000EC 0070+00 1/1 0/0 0/0 .text            __ct__17daSwShutter_HIO_cFv */
 daSwShutter_HIO_c::daSwShutter_HIO_c() {
     mInitSpeed = 0.0f;
     mMaxSpeed = 100.0f;
@@ -29,7 +27,6 @@ daSwShutter_HIO_c::daSwShutter_HIO_c() {
     mMinAtten = 0.1f;
 }
 
-/* 805982A4-80598344 0001A4 00A0+00 2/2 0/0 0/0 .text            setBaseMtx__13daSwShutter_cFv */
 void daSwShutter_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -39,10 +36,8 @@ void daSwShutter_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80598F98-80598FA0 000020 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static const int l_bmdIdx[2] = {4, 4};
 
-/* 80598344-805983C4 000244 0080+00 1/0 0/0 0/0 .text            CreateHeap__13daSwShutter_cFv */
 int daSwShutter_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]);
@@ -55,10 +50,8 @@ int daSwShutter_c::CreateHeap() {
     return 1;
 }
 
-/* 80598FA0-80598FA8 000028 0008+00 0/1 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[2] = {7, 7};
 
-/* 805983C4-80598564 0002C4 01A0+00 1/1 0/0 0/0 .text            create__13daSwShutter_cFv */
 int daSwShutter_c::create() {
     fopAcM_ct(this, daSwShutter_c);
 
@@ -104,8 +97,6 @@ int daSwShutter_c::create() {
     return phase_state;
 }
 
-/* 80598564-805985B4 000464 0050+00 1/0 0/0 0/0 .text            Execute__13daSwShutter_cFPPA3_A4_f
- */
 int daSwShutter_c::Execute(Mtx** param_0) {
     moveMain();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -113,10 +104,8 @@ int daSwShutter_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 805990F4-80599120 000014 002C+00 4/4 0/0 0/0 .bss             l_HIO */
 static daSwShutter_HIO_c l_HIO;
 
-/* 805985B4-8059873C 0004B4 0188+00 1/1 0/0 0/0 .text            moveMain__13daSwShutter_cFv */
 void daSwShutter_c::moveMain() {
     typedef void (daSwShutter_c::*modeFunc)();
     static modeFunc mode_proc[] = {
@@ -135,19 +124,16 @@ void daSwShutter_c::moveMain() {
     mCounter++;
 }
 
-/* 8059873C-80598748 00063C 000C+00 1/1 0/0 0/0 .text            init_modeWait__13daSwShutter_cFv */
 void daSwShutter_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80598748-8059879C 000648 0054+00 1/0 0/0 0/0 .text            modeWait__13daSwShutter_cFv */
 void daSwShutter_c::modeWait() {
     if (fopAcM_isSwitch(this, getSwBit())) {
         init_modeMoveDownInit();
     }
 }
 
-/* 8059879C-805989D0 00069C 0234+00 1/1 0/0 0/0 .text init_modeMoveDownInit__13daSwShutter_cFv */
 void daSwShutter_c::init_modeMoveDownInit() {
     mShakeStrength = l_HIO.mShakeStrength;
     mShakeAmpY = l_HIO.mShakeAmpY;
@@ -170,15 +156,12 @@ void daSwShutter_c::init_modeMoveDownInit() {
     mMode = MODE_MOVE_DOWN_INIT;
 }
 
-/* 805989D0-80598A04 0008D0 0034+00 1/0 0/0 0/0 .text            modeMoveDownInit__13daSwShutter_cFv
- */
 void daSwShutter_c::modeMoveDownInit() {
     if (mShakeStrength == 0.0f) {
         init_modeMoveDown();
     }
 }
 
-/* 80598A04-80598AFC 000904 00F8+00 1/1 0/0 0/0 .text init_modeMoveDown__13daSwShutter_cFv */
 void daSwShutter_c::init_modeMoveDown() {
     fopAcM_SetSpeedF(this, l_HIO.mInitSpeed);
 
@@ -191,7 +174,6 @@ void daSwShutter_c::init_modeMoveDown() {
     mMode = MODE_MOVE_DOWN;
 }
 
-/* 80598AFC-80598D4C 0009FC 0250+00 1/0 0/0 0/0 .text            modeMoveDown__13daSwShutter_cFv */
 void daSwShutter_c::modeMoveDown() {
     cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mAcceleration);
     f32 target_dist =
@@ -212,16 +194,12 @@ void daSwShutter_c::modeMoveDown() {
     }
 }
 
-/* 80598D4C-80598D58 000C4C 000C+00 2/2 0/0 0/0 .text init_modeMoveDownEnd__13daSwShutter_cFv */
 void daSwShutter_c::init_modeMoveDownEnd() {
     mMode = MODE_MOVE_DOWN_END;
 }
 
-/* 80598D58-80598D5C 000C58 0004+00 1/0 0/0 0/0 .text            modeMoveDownEnd__13daSwShutter_cFv
- */
 void daSwShutter_c::modeMoveDownEnd() {}
 
-/* 80598D5C-80598E00 000C5C 00A4+00 1/0 0/0 0/0 .text            Draw__13daSwShutter_cFv */
 int daSwShutter_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -232,42 +210,33 @@ int daSwShutter_c::Draw() {
     return 1;
 }
 
-/* 80598E00-80598E40 000D00 0040+00 1/0 0/0 0/0 .text            Delete__13daSwShutter_cFv */
 int daSwShutter_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]);
     return 1;
 }
 
-/* 80598E40-80598E6C 000D40 002C+00 1/0 0/0 0/0 .text            daSwShutter_Draw__FP13daSwShutter_c
- */
 static int daSwShutter_Draw(daSwShutter_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80598E6C-80598E8C 000D6C 0020+00 1/0 0/0 0/0 .text daSwShutter_Execute__FP13daSwShutter_c */
 static int daSwShutter_Execute(daSwShutter_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80598E8C-80598EAC 000D8C 0020+00 1/0 0/0 0/0 .text daSwShutter_Delete__FP13daSwShutter_c */
 static int daSwShutter_Delete(daSwShutter_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80598EAC-80598ECC 000DAC 0020+00 1/0 0/0 0/0 .text            daSwShutter_Create__FP10fopAc_ac_c
- */
 static int daSwShutter_Create(fopAc_ac_c* i_this) {
     return ((daSwShutter_c*)i_this)->create();
 }
 
-/* 80599050-80599070 -00001 0020+00 1/0 0/0 0/0 .data            l_daSwShutter_Method */
 static actor_method_class l_daSwShutter_Method = {
     (process_method_func)daSwShutter_Create,  (process_method_func)daSwShutter_Delete,
     (process_method_func)daSwShutter_Execute, (process_method_func)NULL,
     (process_method_func)daSwShutter_Draw,
 };
 
-/* 80599070-805990A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwallShutter */
 extern actor_process_profile_definition g_profile_Obj_SwallShutter = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp
index 0c61f93ccb..0ded1a1fc8 100644
--- a/src/d/actor/d_a_obj_saidan.cpp
+++ b/src/d/actor/d_a_obj_saidan.cpp
@@ -9,19 +9,13 @@
 
 #include "d/d_com_inf_game.h"
 
-//
-// Declarations:
-//
-
 static daSaidan_HIO_c l_HIO;
 
-/* 80CC3DAC-80CC3DE0 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__14daSaidan_HIO_cFv */
 daSaidan_HIO_c::daSaidan_HIO_c() {
     mMaxStep = 2.0f;
     mTargetPosX = 250.0f;
 }
 
-/* 80CC3E28-80CC3EB0 000168 0088+00 2/2 0/0 0/0 .text            setBaseMtx__10daSaidan_cFv */
 void daSaidan_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -29,7 +23,6 @@ void daSaidan_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CC3EB0-80CC3F1C 0001F0 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daSaidan_cFv */
 int daSaidan_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("H_Saidan", 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -41,7 +34,6 @@ int daSaidan_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80CC3F1C-80CC4054 00025C 0138+00 1/1 0/0 0/0 .text            create__10daSaidan_cFv */
 cPhs__Step daSaidan_c::create() {
     fopAcM_ct(this, daSaidan_c);
 
@@ -69,7 +61,6 @@ cPhs__Step daSaidan_c::create() {
     return step;
 }
 
-/* 80CC4054-80CC40A4 000394 0050+00 1/0 0/0 0/0 .text            Execute__10daSaidan_cFPPA3_A4_f */
 int daSaidan_c::Execute(Mtx** i_mtx) {
     moveProc();
     *i_mtx = &mpModel->getBaseTRMtx();
@@ -78,7 +69,6 @@ int daSaidan_c::Execute(Mtx** i_mtx) {
     return TRUE;
 }
 
-/* 80CC40A4-80CC4148 0003E4 00A4+00 1/1 0/0 0/0 .text            moveProc__10daSaidan_cFv */
 void daSaidan_c::moveProc() {
     typedef void (daSaidan_c::*proc_func)();
     static proc_func mode_proc[] = {
@@ -90,12 +80,10 @@ void daSaidan_c::moveProc() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80CC4148-80CC4154 000488 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daSaidan_cFv */
 void daSaidan_c::init_modeWait() {
     mMode = MODE_WAIT_e;
 }
 
-/* 80CC4154-80CC41B0 000494 005C+00 1/0 0/0 0/0 .text            modeWait__10daSaidan_cFv */
 void daSaidan_c::modeWait() {
     mIsSwitch = fopAcM_isSwitch(this, (u8)fopAcM_GetParam(this));
     if (mIsSwitch != 0) {
@@ -103,12 +91,10 @@ void daSaidan_c::modeWait() {
     }
 }
 
-/* 80CC41B0-80CC41BC 0004F0 000C+00 1/1 0/0 0/0 .text            init_modeMove__10daSaidan_cFv */
 void daSaidan_c::init_modeMove() {
     mMode = MODE_MOVE_e;
 }
 
-/* 80CC41BC-80CC4290 0004FC 00D4+00 1/0 0/0 0/0 .text            modeMove__10daSaidan_cFv */
 void daSaidan_c::modeMove() {
     f32 currX =
         cLib_addCalc(&current.pos.x, mOriginalPosX - l_HIO.mTargetPosX, 0.2f, l_HIO.mMaxStep, 0.5f);
@@ -120,19 +106,16 @@ void daSaidan_c::modeMove() {
     }
 }
 
-/* 80CC4290-80CC4314 0005D0 0084+00 2/2 0/0 0/0 .text            init_modeMoveEnd__10daSaidan_cFv */
 void daSaidan_c::init_modeMoveEnd() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_CHURCH_ALTER_STOP, 0);
 
     mMode = MODE_MOVE_END_e;
 }
 
-/* 80CC4314-80CC4318 000654 0004+00 1/0 0/0 0/0 .text            modeMoveEnd__10daSaidan_cFv */
 void daSaidan_c::modeMoveEnd() {
     /* empty function */
 }
 
-/* 80CC4318-80CC43BC 000658 00A4+00 1/0 0/0 0/0 .text            Draw__10daSaidan_cFv */
 int daSaidan_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -144,40 +127,33 @@ int daSaidan_c::Draw() {
     return TRUE;
 }
 
-/* 80CC43BC-80CC43EC 0006FC 0030+00 1/0 0/0 0/0 .text            Delete__10daSaidan_cFv */
 int daSaidan_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "H_Saidan");
     return TRUE;
 }
 
-/* 80CC43EC-80CC4418 00072C 002C+00 1/0 0/0 0/0 .text            daSaidan_Draw__FP10daSaidan_c */
 static int daSaidan_Draw(daSaidan_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CC4418-80CC4438 000758 0020+00 1/0 0/0 0/0 .text            daSaidan_Execute__FP10daSaidan_c */
 static int daSaidan_Execute(daSaidan_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CC4438-80CC4458 000778 0020+00 1/0 0/0 0/0 .text            daSaidan_Delete__FP10daSaidan_c */
 static int daSaidan_Delete(daSaidan_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CC4458-80CC4478 000798 0020+00 1/0 0/0 0/0 .text            daSaidan_Create__FP10fopAc_ac_c */
 static int daSaidan_Create(fopAc_ac_c* i_this) {
     return static_cast<daSaidan_c*>(i_this)->create();
 }
 
-/* 80CC45B4-80CC45D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daSaidan_Method */
 static actor_method_class l_daSaidan_Method = {
     (process_method_func)daSaidan_Create,  (process_method_func)daSaidan_Delete,
     (process_method_func)daSaidan_Execute, NULL,
     (process_method_func)daSaidan_Draw,
 };
 
-/* 80CC45D4-80CC4604 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Saidan */
 extern actor_process_profile_definition g_profile_Obj_Saidan = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp
index 4b8d546494..b56deef764 100644
--- a/src/d/actor/d_a_obj_sakuita.cpp
+++ b/src/d/actor/d_a_obj_sakuita.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_sakuita.h"
 #include "d/d_a_obj.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
 #ifdef DEBUG
 class daObjSakuita_Hio_c : public JORReflexible {
@@ -59,15 +58,12 @@ void daObjSakuita_Hio_c::dt() {
 static daObjSakuita_Hio_c M_hio;
 #endif
 
-/* 80CC50B4-80CC50E0 000000 002C+00 3/3 0/0 0/0 .rodata          M_attr__14daObjSakuita_c */
 daObjSakuita_Attr_c const daObjSakuita_c::M_attr = {
     20.0f, 12.0f, 70.0f, -50.0f, 0.8f, 0.5f, -6.0f, 900.0f, 20000.0f, 100.0f, 0x1400, 0x14,
 };
 
-/* 80CC512C-80CC5130 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "A_Sakuita";
 
-/* 80CC46F8-80CC47F8 000078 0100+00 1/1 0/0 0/0 .text            create_init__14daObjSakuita_cFv */
 void daObjSakuita_c::create_init() {
     fopAcM_setCullSizeBox(this, -30.0f, -90.0f, -10.0f, 30.0f, 20.0f, 10.0f);
     gravity = attr().mGravity;
@@ -87,12 +83,10 @@ void daObjSakuita_c::create_init() {
     #endif
 }
 
-/* 80CC47F8-80CC4818 000178 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSakuita_cFv */
 void daObjSakuita_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CC4818-80CC489C 000198 0084+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjSakuita_cFv */
 void daObjSakuita_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZrotM(field_0x744.z);
@@ -104,7 +98,6 @@ void daObjSakuita_c::setBaseMtx() {
 
 f32 dummyLiteral() { return 0.5f; }
 
-/* 80CC489C-80CC4A98 00021C 01FC+00 1/1 0/0 0/0 .text            setPlatePos__14daObjSakuita_cFv */
 void daObjSakuita_c::setPlatePos() {
     cXyz cStack_24;
     cXyz cStack_30;
@@ -135,7 +128,6 @@ void daObjSakuita_c::setPlatePos() {
     field_0x728 = field_0x71c;
 }
 
-/* 80CC4A98-80CC4B5C 000418 00C4+00 1/1 0/0 0/0 .text            calcAngle__14daObjSakuita_cFv */
 void daObjSakuita_c::calcAngle() {
     cXyz local_28 = current.pos - field_0x71c;
     field_0x744.x = cM_atan2s(local_28.z, local_28.y);
@@ -150,7 +142,6 @@ inline int daObjSakuita_c::createHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* 80CC4B5C-80CC4BD4 0004DC 0078+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_actor) {
     return static_cast<daObjSakuita_c*>(i_actor)->createHeap();
 }
@@ -160,7 +151,6 @@ inline int daObjSakuita_c::draw() {
     return 1;
 }
 
-/* 80CC4BD4-80CC4C14 000554 0040+00 1/0 0/0 0/0 .text daObjSakuita_Draw__FP14daObjSakuita_c */
 static int daObjSakuita_Draw(daObjSakuita_c* i_this) {
     return i_this->draw();
 }
@@ -176,24 +166,20 @@ inline int daObjSakuita_c::execute() {
     return 1;
 }
 
-/* 80CC4C14-80CC4C6C 000594 0058+00 1/0 0/0 0/0 .text daObjSakuita_Execute__FP14daObjSakuita_c */
 static int daObjSakuita_Execute(daObjSakuita_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CC4C6C-80CC4C74 0005EC 0008+00 1/0 0/0 0/0 .text daObjSakuita_IsDelete__FP14daObjSakuita_c */
 static int daObjSakuita_IsDelete(daObjSakuita_c* i_this) {
     return 1;
 }
 
-/* 80CC4C74-80CC4C9C 0005F4 0028+00 1/0 0/0 0/0 .text daObjSakuita_Delete__FP14daObjSakuita_c */
 static int daObjSakuita_Delete(daObjSakuita_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daObjSakuita_c();
     return 1;
 }
 
-/* 80CC4C9C-80CC4E40 00061C 01A4+00 1/1 0/0 0/0 .text            __dt__14daObjSakuita_cFv */
 daObjSakuita_c::~daObjSakuita_c() {
     #ifdef DEBUG
     M_hio.dt();
@@ -221,14 +207,11 @@ inline int daObjSakuita_c::create() {
     return rv;
 }
 
-/* 80CC4E40-80CC4F78 0007C0 0138+00 1/0 0/0 0/0 .text            daObjSakuita_Create__FP10fopAc_ac_c
- */
 static int daObjSakuita_Create(fopAc_ac_c* i_actor) {
     fopAcM_GetID(i_actor);
     return static_cast<daObjSakuita_c*>(i_actor)->create();
 }
 
-/* 80CC5130-80CC5150 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSakuita_Method */
 static actor_method_class l_daObjSakuita_Method = {
     (process_method_func)daObjSakuita_Create,
     (process_method_func)daObjSakuita_Delete,
@@ -237,7 +220,6 @@ static actor_method_class l_daObjSakuita_Method = {
     (process_method_func)daObjSakuita_Draw,
 };
 
-/* 80CC5150-80CC5180 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Sakuita */
 extern actor_process_profile_definition g_profile_Obj_Sakuita = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp
index 6e861fda1a..c0cef88f63 100644
--- a/src/d/actor/d_a_obj_sakuita_rope.cpp
+++ b/src/d/actor/d_a_obj_sakuita_rope.cpp
@@ -58,19 +58,16 @@ void daObjItaRope_Hio_c::genMessage(JORMContext* ctx) {
 
 #endif
 
-/* 80CC5238-80CC527C 000078 0044+00 1/1 0/0 0/0 .text setModelData__9Sakuita_cFP12J3DModelData */
 int Sakuita_c::setModelData(J3DModelData* i_modelData) {
     mModel = mDoExt_J3DModel__create(i_modelData, 0x20000, 0x11000084);
     JUT_ASSERT(140, mModel != NULL);
     return 1;
 }
 
-/* 80CC68F0-80CC6904 000000 0014+00 4/4 0/0 0/0 .rodata          M_attr__14daObjItaRope_c */
 daObjItaRope_Attr_c const daObjItaRope_c::M_attr = {
     -5.0f, 0.2f, 0.5f, 0.8f, 0.0f,
 };
 
-/* 80CC527C-80CC5314 0000BC 0098+00 1/1 0/0 0/0 .text            create__9Sakuita_cFP4cXyzsSc */
 void Sakuita_c::create(cXyz* param_1, s16 param_2, s8 param_3) {
     field_0x04 = param_1;
     field_0x36 = param_2;
@@ -83,7 +80,6 @@ void Sakuita_c::create(cXyz* param_1, s16 param_2, s8 param_3) {
     initBaseMtx();
 }
 
-/* 80CC5314-80CC5354 000154 0040+00 1/1 0/0 0/0 .text            execute__9Sakuita_cFP4cXyzs */
 void Sakuita_c::execute(cXyz* param_1, s16 param_2) {
     field_0x36 = param_2;
     setPlatePos(param_1);
@@ -91,17 +87,14 @@ void Sakuita_c::execute(cXyz* param_1, s16 param_2) {
     setBaseMtx();
 }
 
-/* 80CC5354-80CC5390 000194 003C+00 1/1 0/0 0/0 .text            draw__9Sakuita_cFv */
 void Sakuita_c::draw() {
     dComIfGp_entrySimpleModel(mModel, field_0x3a);
 }
 
-/* 80CC5390-80CC53B0 0001D0 0020+00 1/1 0/0 0/0 .text            initBaseMtx__9Sakuita_cFv */
 void Sakuita_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CC53B0-80CC5444 0001F0 0094+00 2/2 0/0 0/0 .text            setBaseMtx__9Sakuita_cFv */
 void Sakuita_c::setBaseMtx() {
     mDoMtx_stack_c::transS(field_0x04->x, field_0x04->y - 6.0f, field_0x04->z);
     mDoMtx_stack_c::ZrotM(mRotation.z);
@@ -110,7 +103,6 @@ void Sakuita_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CC5444-80CC5720 000284 02DC+00 1/1 0/0 0/0 .text            setPlatePos__9Sakuita_cFP4cXyz */
 void Sakuita_c::setPlatePos(cXyz* param_1) {
     cXyz acStack_34(*param_1);
     f32 dVar5 = param_1->abs();
@@ -138,7 +130,6 @@ void Sakuita_c::setPlatePos(cXyz* param_1) {
     field_0x14 = field_0x08;
 }
 
-/* 80CC5720-80CC57E4 000560 00C4+00 2/2 0/0 0/0 .text            calcAngle__9Sakuita_cFv */
 void Sakuita_c::calcAngle() {
     cXyz local_28 = *field_0x04 - field_0x08;
     mRotation.x = cM_atan2s(local_28.z, local_28.y);
@@ -146,7 +137,6 @@ void Sakuita_c::calcAngle() {
     mRotation.z = -cM_atan2s(local_28.x, local_28.y);
 }
 
-/* 80CC6998-80CC699C -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "A_Sakuita";
 
 #ifdef DEBUG
@@ -168,7 +158,6 @@ inline daObjItaRope_c::~daObjItaRope_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80CC57E4-80CC5E48 000624 0664+00 1/1 0/0 0/0 .text            create_init__14daObjItaRope_cFv */
 void daObjItaRope_c::create_init() {
     gravity = attr().mGravity;
     JUT_ASSERT(359, getPathID() != 0xff);
@@ -223,19 +212,16 @@ void daObjItaRope_c::create_init() {
     #endif
 }
 
-/* 80CC5E48-80CC5E7C 000C88 0034+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjItaRope_cFv */
 void daObjItaRope_c::initBaseMtx() {
     setBaseMtx();
     fopAcM_SetMtx(this, mMtx);
 }
 
-/* 80CC5E7C-80CC5ECC 000CBC 0050+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjItaRope_cFv */
 void daObjItaRope_c::setBaseMtx() {
     mDoMtx_trans(mMtx, current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_ZXYrotM(mMtx, shape_angle.x, shape_angle.y, 0);
 }
 
-/* 80CC5ECC-80CC622C 000D0C 0360+00 2/2 0/0 0/0 .text setNormalRopePos__14daObjItaRope_cFv */
 void daObjItaRope_c::setNormalRopePos() {
     cXyz* pPos = mLineMat.getPos(0) + 1;
     RopeWork_c* pRope = mRopes;
@@ -314,22 +300,17 @@ inline int daObjItaRope_c::createHeap() {
     return 1;
 }
 
-/* 80CC622C-80CC63E4 00106C 01B8+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_actor) {
     daObjItaRope_c* i_this = static_cast<daObjItaRope_c*>(i_actor);
     return i_this->createHeap();
 }
 
-/* 80CC63E4-80CC6420 001224 003C+00 2/2 0/0 0/0 .text            __dt__9Sakuita_cFv */
 Sakuita_c::~Sakuita_c() {}
 
-/* 80CC6420-80CC6424 001260 0004+00 1/1 0/0 0/0 .text            __ct__9Sakuita_cFv */
 Sakuita_c::Sakuita_c() {}
 
-/* 80CC6424-80CC6460 001264 003C+00 2/2 0/0 0/0 .text            __dt__10RopeWork_cFv */
 RopeWork_c::~RopeWork_c() {}
 
-/* 80CC6460-80CC6464 0012A0 0004+00 1/1 0/0 0/0 .text            __ct__10RopeWork_cFv */
 RopeWork_c::RopeWork_c() {}
 
 int daObjItaRope_c::draw() {
@@ -344,7 +325,6 @@ int daObjItaRope_c::draw() {
     return 1;
 }
 
-/* 80CC6464-80CC652C 0012A4 00C8+00 1/0 0/0 0/0 .text daObjItaRope_Draw__FP14daObjItaRope_c */
 static int daObjItaRope_Draw(daObjItaRope_c* i_this) {
     return i_this->draw();
 }
@@ -363,17 +343,14 @@ int daObjItaRope_c::execute() {
     return 1;
 }
 
-/* 80CC652C-80CC6610 00136C 00E4+00 1/0 0/0 0/0 .text daObjItaRope_Execute__FP14daObjItaRope_c */
 static int daObjItaRope_Execute(daObjItaRope_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CC6610-80CC6618 001450 0008+00 1/0 0/0 0/0 .text daObjItaRope_IsDelete__FP14daObjItaRope_c */
 static int daObjItaRope_IsDelete(daObjItaRope_c* i_this) {
     return 1;
 }
 
-/* 80CC6618-80CC6738 001458 0120+00 1/0 0/0 0/0 .text daObjItaRope_Delete__FP14daObjItaRope_c */
 static int daObjItaRope_Delete(daObjItaRope_c* i_this) {
     fopAcM_RegisterDeleteID(i_this,  "Obj_ItaRope");
     i_this->~daObjItaRope_c();
@@ -396,14 +373,11 @@ int daObjItaRope_c::create() {
     return rv;
 }
 
-/* 80CC6738-80CC6844 001578 010C+00 1/0 0/0 0/0 .text            daObjItaRope_Create__FP10fopAc_ac_c
- */
 static int daObjItaRope_Create(fopAc_ac_c* i_actor) {
     fopAcM_RegisterCreateID(daObjItaRope_c, i_actor, "Obj_ItaRope");
     return static_cast<daObjItaRope_c*>(i_actor)->create();
 }
 
-/* 80CC69A0-80CC69C0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjItaRope_Method */
 static actor_method_class l_daObjItaRope_Method = {
     (process_method_func)daObjItaRope_Create,
     (process_method_func)daObjItaRope_Delete,
@@ -412,7 +386,6 @@ static actor_method_class l_daObjItaRope_Method = {
     (process_method_func)daObjItaRope_Draw,
 };
 
-/* 80CC69C0-80CC69F0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ItaRope */
 extern actor_process_profile_definition g_profile_Obj_ItaRope = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp
index 7d7afaa0a3..fd392f1bfa 100644
--- a/src/d/actor/d_a_obj_scannon.cpp
+++ b/src/d/actor/d_a_obj_scannon.cpp
@@ -10,22 +10,16 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
 
-/* 80CC9324-80CC9328 -00001 0004+00 0/3 0/0 0/0 .data            l_arcName_Comp */
 char* l_arcName_Comp = "SkyCannon";
 
-/* 80CC9328-80CC932C -00001 0004+00 0/3 0/0 0/0 .data            l_arcName_Crash */
 char* l_arcName_Crash = "SCanHai";
 
-/* 80CC932C-80CC9330 -00001 0004+00 1/3 0/0 0/0 .data            l_arcName_Zev */
 char* l_arcName_Zev = "SCanZev";
 
-/* 80CC9330-80CC9334 -00001 0004+00 0/3 0/0 0/0 .data            l_arcName_Ptl */
 char* l_arcName_Ptl = "SCanPtl";
 
-/* 80CC9334-80CC9338 -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 char* l_staffName = "SCannon";
 
-/* 80CC9338-80CC9348 -00001 0010+00 1/1 0/0 0/0 .data            l_eventName */
 char* l_eventName[4] = {
     "SKY_CANNON_WARP_END",
     "SKY_CANNON_FIRE_FIRST",
@@ -33,7 +27,6 @@ char* l_eventName[4] = {
     "SKY_CANNON_FIRE_SECOND",
 };
 
-/* 80CC6A98-80CC6AEC 000078 0054+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* i_proc, int param_1) {
     int layer = dComIfG_play_c::getLayerNo(0);
     if ((layer == 3 || layer == 10) && i_proc != NULL) {
@@ -43,12 +36,10 @@ static int eventCallBack(void* i_proc, int param_1) {
     return 1;
 }
 
-/* 80CC6AEC-80CC6B0C 0000CC 0020+00 1/1 0/0 0/0 .text daSCannon_c_createHeap__FP10fopAc_ac_c */
 static int daSCannon_c_createHeap(fopAc_ac_c* i_this) {
     return ((daSCannon_c*)i_this)->createHeap();
 }
 
-/* 80CC6B0C-80CC6BC8 0000EC 00BC+00 2/2 0/0 0/0 .text            __ct__11daSCannon_cFv */
 daSCannon_c::daSCannon_c() {
     mpBgW = NULL;
     memset(mpModels, 0, sizeof(mpModels));
@@ -60,7 +51,6 @@ daSCannon_c::daSCannon_c() {
     mpPtlModel = NULL;
 }
 
-/* 80CC6C10-80CC6D10 0001F0 0100+00 1/0 0/0 0/0 .text            __dt__11daSCannon_cFv */
 daSCannon_c::~daSCannon_c() {
     char* arcname;
     if (mLayerNo == 3 || mLayerNo == 10) {
@@ -76,26 +66,22 @@ daSCannon_c::~daSCannon_c() {
     dComIfG_resDelete(&mZevPhase, l_arcName_Zev);
 }
 
-/* 80CC9188-80CC9194 000000 000C+00 11/11 0/0 0/0 .rodata          TKS_SET_POS */
 static const Vec TKS_SET_POS = {
     -98491.227f, -18346.793f, 52057.156f,
 };
 
-/* 80CC9194-80CC919C 00000C 0006+02 0/1 0/0 0/0 .rodata          SMK_PARTICLE_NAME */
 static const u16 SMK_PARTICLE_NAME[] = {
     dPa_RM(ID_ZF_S_SKYCANNON00_SMK),
     dPa_RM(ID_ZF_S_SKYCANNON01_SMK),
     dPa_RM(ID_ZF_S_SKYCANNON02_SMK),
 };
 
-/* 80CC919C-80CC91A4 000014 0006+02 0/1 0/0 0/0 .rodata          APP_PARTICLE_NAME */
 static const u16 APP_PARTICLE_NAME[] = {
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_APP_A),
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_APP_B),
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_APP_C),
 };
 
-/* 80CC6D10-80CC7124 0002F0 0414+00 1/1 0/0 0/0 .text            create__11daSCannon_cFv */
 int daSCannon_c::create() {
     fopAcM_ct(this, daSCannon_c);
 
@@ -189,13 +175,11 @@ int daSCannon_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80CC7204-80CC7228 0007E4 0024+00 2/2 0/0 0/0 .text            execute__11daSCannon_cFv */
 int daSCannon_c::execute() {
     middleExe();
     return 1;
 }
 
-/* 80CC7228-80CC747C 000808 0254+00 1/1 0/0 0/0 .text            draw__11daSCannon_cFv */
 int daSCannon_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModels[mIsRepaired], &tevStr);
@@ -240,7 +224,6 @@ int daSCannon_c::draw() {
     return 1;
 }
 
-/* 80CC747C-80CC7508 000A5C 008C+00 1/1 0/0 0/0 .text            Delete__11daSCannon_cFv */
 int daSCannon_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -254,14 +237,12 @@ int daSCannon_c::Delete() {
     return 1;
 }
 
-/* 80CC7508-80CC7578 000AE8 0070+00 3/3 0/0 0/0 .text            setModelMtx__11daSCannon_cFv */
 void daSCannon_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModels[mIsRepaired]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CC7578-80CC7608 000B58 0090+00 1/1 0/0 0/0 .text            setPtlModelMtx__11daSCannon_cFv */
 void daSCannon_c::setPtlModelMtx() {
     if (mpPtlModel != NULL) {
         mDoMtx_stack_c::transS(current.pos.x, 1800.0f + current.pos.y, current.pos.z);
@@ -271,7 +252,6 @@ void daSCannon_c::setPtlModelMtx() {
     }
 }
 
-/* 80CC7608-80CC7970 000BE8 0368+00 1/1 0/0 0/0 .text            createHeap__11daSCannon_cFv */
 int daSCannon_c::createHeap() {
     char* arcname;
     int bmd_index;
@@ -356,7 +336,6 @@ int daSCannon_c::createHeap() {
     return 1;
 }
 
-/* 80CC7970-80CC7A10 000F50 00A0+00 1/1 0/0 0/0 .text            middleExe__11daSCannon_cFv */
 void daSCannon_c::middleExe() {
     if (s_exeProc[mMode] != NULL) {
         (this->*s_exeProc[mMode])();
@@ -371,7 +350,6 @@ void daSCannon_c::middleExe() {
     }
 }
 
-/* 80CC7A10-80CC7AB8 000FF0 00A8+00 1/1 0/0 0/0 .text            orderEvtInit__11daSCannon_cFv */
 void daSCannon_c::orderEvtInit() {
     eventInfo.setArchiveName(l_arcName_Zev);
     mEvtIdx = dComIfGp_getEventManager().getEventIdx(this, l_eventName[mDemoType], 0xFF);
@@ -395,7 +373,6 @@ void daSCannon_c::orderEvtInit() {
     eventInfo.onCondition(dEvtCnd_CANDEMO_e);
 }
 
-/* 80CC7AB8-80CC7C48 001098 0190+00 1/0 0/0 0/0 .text            exeModeWait__11daSCannon_cFv */
 void daSCannon_c::exeModeWait() {
     if (mLayerNo == 3) {
         switch (mDemoType) {
@@ -428,7 +405,6 @@ void daSCannon_c::exeModeWait() {
     }
 }
 
-/* 80CC7C48-80CC7D14 001228 00CC+00 1/0 0/0 0/0 .text            exeModeOrderEvt__11daSCannon_cFv */
 void daSCannon_c::exeModeOrderEvt() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         const char* staffName = mDemoType == DEMOTYPE_FIRE_TKS ? "Tks" : l_staffName;
@@ -449,7 +425,6 @@ void daSCannon_c::exeModeOrderEvt() {
     eventInfo.onCondition(dEvtCnd_CANDEMO_e);
 }
 
-/* 80CC9378-80CC93A8 000074 0030+00 1/2 0/0 0/0 .data            s_exeProc__11daSCannon_c */
 void (daSCannon_c::*daSCannon_c::s_exeProc[])() = {
     &daSCannon_c::exeModeWait,
     &daSCannon_c::exeModeOrderEvt,
@@ -457,25 +432,21 @@ void (daSCannon_c::*daSCannon_c::s_exeProc[])() = {
     &daSCannon_c::exeModeEnd,
 };
 
-/* 80CC93A8-80CC93B0 -00001 0008+00 1/0 0/0 0/0 .data            CUT_TYPE_TABLE_WARP_END */
 char* CUT_TYPE_TABLE_WARP_END[2] = {
     "WAIT",
     "MOVE",
 };
 
-/* 80CC93B0-80CC93BC -00001 000C+00 1/0 0/0 0/0 .data            CUT_TYPE_TABLE_FIRE_TKS */
 char* CUT_TYPE_TABLE_FIRE_TKS[3] = {
     "0001_WAIT",
     "0002_RUN",
     "0003_JUMP",
 };
 
-/* 80CC93BC-80CC93C0 -00001 0004+00 1/0 0/0 0/0 .data            CUT_TYPE_TABLE_FIRE_FIRST */
 char* CUT_TYPE_TABLE_FIRE_FIRST[1] = {
     "LINK_IN",
 };
 
-/* 80CC93C0-80CC93D0 -00001 0010+00 1/0 0/0 0/0 .data            CUT_TYPE_TABLE_FIRE_SECOND */
 char* CUT_TYPE_TABLE_FIRE_SECOND[4] = {
     "SET",
     "MOVE",
@@ -483,25 +454,21 @@ char* CUT_TYPE_TABLE_FIRE_SECOND[4] = {
     "FINISH",
 };
 
-/* 80CC9400-80CC9430 0000FC 0030+00 1/1 0/0 0/0 .data s_demoExeProc_WarpEnd__11daSCannon_c */
 void (daSCannon_c::*daSCannon_c::s_demoExeProc_WarpEnd[][2])() = {
     {&daSCannon_c::demoInitWarpEndWait, &daSCannon_c::demoExeWarpEndWait},
     {&daSCannon_c::demoInitWarpEndMove, &daSCannon_c::demoExeWarpEndMove},
 };
 
-/* 80CC9430-80CC9478 00012C 0048+00 1/1 0/0 0/0 .data s_demoExeProc_FireTks__11daSCannon_c */
 void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireTks[][2])() = {
     {NULL, NULL},
     {NULL, NULL},
     {NULL, NULL},
 };
 
-/* 80CC9490-80CC94A8 00018C 0018+00 1/1 0/0 0/0 .data s_demoExeProc_FireFirst__11daSCannon_c */
 void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireFirst[][2])() = {
     {&daSCannon_c::demoInitLinkIn, &daSCannon_c::demoExeLinkIn},
 };
 
-/* 80CC9508-80CC9568 000204 0060+00 1/1 0/0 0/0 .data s_demoExeProc_FireSecond__11daSCannon_c */
 void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireSecond[][2])() = {
     {&daSCannon_c::demoInitSet, &daSCannon_c::demoExeSet},
     {&daSCannon_c::demoInitMove, &daSCannon_c::demoExeMove},
@@ -509,8 +476,6 @@ void (daSCannon_c::*daSCannon_c::s_demoExeProc_FireSecond[][2])() = {
     {&daSCannon_c::demoInitFinish, &daSCannon_c::demoExeFinish},
 };
 
-/* 80CC7D14-80CC7EBC 0012F4 01A8+00 1/0 0/0 0/0 .text            exeModeActionEvt__11daSCannon_cFv
- */
 void daSCannon_c::exeModeActionEvt() {
     if (dComIfGp_evmng_endCheck(mEvtIdx) != 0) {
         dComIfGp_event_reset();
@@ -547,10 +512,8 @@ void daSCannon_c::exeModeActionEvt() {
     }
 }
 
-/* 80CC7EBC-80CC7EC0 00149C 0004+00 1/0 0/0 0/0 .text            exeModeEnd__11daSCannon_cFv */
 void daSCannon_c::exeModeEnd() {}
 
-/* 80CC91C4-80CC91F4 -00001 0030+00 2/2 0/0 0/0 .rodata          s_demoTable__11daSCannon_c */
 const daSCannon_c::demoTable_s daSCannon_c::s_demoTable[] = {
     {s_demoExeProc_WarpEnd, CUT_TYPE_TABLE_WARP_END, 2},
     {s_demoExeProc_FireFirst, CUT_TYPE_TABLE_FIRE_FIRST, 1},
@@ -558,7 +521,6 @@ const daSCannon_c::demoTable_s daSCannon_c::s_demoTable[] = {
     {s_demoExeProc_FireSecond, CUT_TYPE_TABLE_FIRE_SECOND, 4},
 };
 
-/* 80CC7EC0-80CC7FAC 0014A0 00EC+00 1/1 0/0 0/0 .text            demoExe__11daSCannon_cFv */
 void daSCannon_c::demoExe() {
     char** cut_table = s_demoTable[mDemoType].cut_table;
     int cut_num = s_demoTable[mDemoType].cut_num;
@@ -574,7 +536,6 @@ void daSCannon_c::demoExe() {
     }
 }
 
-/* 80CC7FAC-80CC8044 00158C 0098+00 2/2 0/0 0/0 .text            demoModeInit__11daSCannon_cFi */
 void daSCannon_c::demoModeInit(int i_actIdx) {
     if (i_actIdx < 0 || i_actIdx >= s_demoTable[mDemoType].cut_num) {
         return;
@@ -585,10 +546,8 @@ void daSCannon_c::demoModeInit(int i_actIdx) {
     }
 }
 
-/* 80CC8044-80CC8048 001624 0004+00 1/0 0/0 0/0 .text            demoInitLinkIn__11daSCannon_cFv */
 void daSCannon_c::demoInitLinkIn() {}
 
-/* 80CC8048-80CC8108 001628 00C0+00 1/0 0/0 0/0 .text            demoExeLinkIn__11daSCannon_cFv */
 void daSCannon_c::demoExeLinkIn() {
     if (!fopAcM_checkHookCarryNow(this)) {
         daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -604,7 +563,6 @@ void daSCannon_c::demoExeLinkIn() {
     }
 }
 
-/* 80CC8108-80CC81DC 0016E8 00D4+00 1/0 0/0 0/0 .text            demoInitSet__11daSCannon_cFv */
 void daSCannon_c::demoInitSet() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_TCANNON_ACTION_LAKE, 0);
     mBck.setPlaySpeed(1.0f);
@@ -612,7 +570,6 @@ void daSCannon_c::demoInitSet() {
     dComIfGp_getVibration().StartShock(VIBMODE_S_POWER3, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80CC81DC-80CC8274 0017BC 0098+00 1/0 0/0 0/0 .text            demoExeSet__11daSCannon_cFv */
 void daSCannon_c::demoExeSet() {
     exeEmtRt(mHeadJointNo, ARRAY_SIZE(mpEmtSmk), mpEmtSmk);
     if (mBck.checkFrame(84)) {
@@ -621,10 +578,8 @@ void daSCannon_c::demoExeSet() {
     }
 }
 
-/* 80CC8274-80CC8278 001854 0004+00 1/0 0/0 0/0 .text            demoInitMove__11daSCannon_cFv */
 void daSCannon_c::demoInitMove() {}
 
-/* 80CC8278-80CC8378 001858 0100+00 1/0 0/0 0/0 .text            demoExeMove__11daSCannon_cFv */
 void daSCannon_c::demoExeMove() {
     exeEmtRt(mHeadJointNo, ARRAY_SIZE(mpEmtSmk), mpEmtSmk);
     if (mBck.checkFrame(104.0f)) {
@@ -636,12 +591,10 @@ void daSCannon_c::demoExeMove() {
     }
 }
 
-/* 80CC8378-80CC83CC 001958 0054+00 1/0 0/0 0/0 .text            demoInitFire__11daSCannon_cFv */
 void daSCannon_c::demoInitFire() {
     dComIfGp_getVibration().StartQuake(3, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80CC83CC-80CC8430 0019AC 0064+00 1/0 0/0 0/0 .text            demoExeFire__11daSCannon_cFv */
 void daSCannon_c::demoExeFire() {
     exeEmtRt(mHeadJointNo, ARRAY_SIZE(mpEmtSmk), mpEmtSmk);
     if (mBck.checkFrame(235.0f)) {
@@ -649,7 +602,6 @@ void daSCannon_c::demoExeFire() {
     }
 }
 
-/* 80CC8430-80CC8538 001A10 0108+00 1/0 0/0 0/0 .text            demoInitFinish__11daSCannon_cFv */
 void daSCannon_c::demoInitFinish() {
 #ifdef DEBUG
     if (dComIfG_play_c::getLayerNo(0) == 3 || dComIfG_play_c::getLayerNo(0) == 10) {
@@ -676,7 +628,6 @@ void daSCannon_c::demoInitFinish() {
     }
 }
 
-/* 80CC8538-80CC8648 001B18 0110+00 1/0 0/0 0/0 .text            demoExeFinish__11daSCannon_cFv */
 void daSCannon_c::demoExeFinish() {
     exeEmtRt(mHeadJointNo, ARRAY_SIZE(mpEmtSmk), mpEmtSmk);
     mDemoFinishTimer++;
@@ -694,7 +645,6 @@ void daSCannon_c::demoExeFinish() {
     }
 }
 
-/* 80CC8648-80CC8714 001C28 00CC+00 1/0 0/0 0/0 .text demoInitWarpEndWait__11daSCannon_cFv */
 void daSCannon_c::demoInitWarpEndWait() {
     int* timer_p = dComIfGp_evmng_getMyIntegerP(mStaffId, "Timer");
     if (timer_p != NULL) {
@@ -712,8 +662,6 @@ void daSCannon_c::demoInitWarpEndWait() {
     }
 }
 
-/* 80CC8714-80CC8804 001CF4 00F0+00 1/0 0/0 0/0 .text            demoExeWarpEndWait__11daSCannon_cFv
- */
 void daSCannon_c::demoExeWarpEndWait() {
     if (mTimer == 35) {
         initEmtRt(mCrashJointNo, ARRAY_SIZE(mpEmtApp), APP_PARTICLE_NAME, mpEmtApp);
@@ -730,13 +678,10 @@ void daSCannon_c::demoExeWarpEndWait() {
     mpPtlBtk->play();
 }
 
-/* 80CC8804-80CC8818 001DE4 0014+00 1/0 0/0 0/0 .text demoInitWarpEndMove__11daSCannon_cFv */
 void daSCannon_c::demoInitWarpEndMove() {
     mpCrashBtk->setPlaySpeed(1.0f);
 }
 
-/* 80CC8818-80CC88A8 001DF8 0090+00 1/0 0/0 0/0 .text            demoExeWarpEndMove__11daSCannon_cFv
- */
 void daSCannon_c::demoExeWarpEndMove() {
     exeEmtRt(mCrashJointNo, ARRAY_SIZE(mpEmtApp), mpEmtApp);
     if (mpCrashBtk->isStop()) {
@@ -747,7 +692,6 @@ void daSCannon_c::demoExeWarpEndMove() {
     mpPtlBtk->play();
 }
 
-/* 80CC88A8-80CC8998 001E88 00F0+00 2/2 0/0 0/0 .text            changeScene__11daSCannon_cFv */
 void daSCannon_c::changeScene() {
     if (mLayerNo == 3 || mLayerNo == 10) {
         if (dComIfGp_getVibration().CheckQuake()) {
@@ -768,7 +712,6 @@ void daSCannon_c::changeScene() {
     }
 }
 
-/* 80CC8998-80CC8A30 001F78 0098+00 1/1 0/0 0/0 .text            init__11daSCannon_cFv */
 void daSCannon_c::init() {
     int layerNo = mLayerNo;
 
@@ -797,8 +740,6 @@ void daSCannon_c::init() {
     }
 }
 
-/* 80CC8A30-80CC8B60 002010 0130+00 2/2 0/0 0/0 .text
- * initEmtRt__11daSCannon_cFUsiPCUsPP14JPABaseEmitter           */
 void daSCannon_c::initEmtRt(u16 i_jointNo, int i_emtNum, const u16* i_name_list, JPABaseEmitter** i_emt_list) {
     MtxP mtx = mpModels[mIsRepaired]->getAnmMtx(i_jointNo);
     if (mtx != NULL) {
@@ -815,8 +756,6 @@ void daSCannon_c::initEmtRt(u16 i_jointNo, int i_emtNum, const u16* i_name_list,
     }
 }
 
-/* 80CC8B60-80CC8BF4 002140 0094+00 6/6 0/0 0/0 .text
- * exeEmtRt__11daSCannon_cFUsiPP14JPABaseEmitter                */
 void daSCannon_c::exeEmtRt(u16 i_jointNo, int i_emtNum, JPABaseEmitter** i_emt_list) {
     MtxP mtx = mpModels[mIsRepaired]->getAnmMtx(i_jointNo);
     if (mtx != NULL) {
@@ -828,7 +767,6 @@ void daSCannon_c::exeEmtRt(u16 i_jointNo, int i_emtNum, JPABaseEmitter** i_emt_l
     }
 }
 
-/* 80CC8BF4-80CC8CDC 0021D4 00E8+00 1/1 0/0 0/0 .text            initEmtLine__11daSCannon_cFv */
 void daSCannon_c::initEmtLine() {
     cXyz pos;
     csXyz rot;
@@ -842,7 +780,6 @@ void daSCannon_c::initEmtLine() {
     mpEmtLine = dComIfGp_particle_set(dPa_RM(ID_ZF_S_TOBYCANNON00LINE), &pos, &tevStr, &rot, NULL);
 }
 
-/* 80CC8CDC-80CC8DA0 0022BC 00C4+00 1/1 0/0 0/0 .text            exeEmtLine__11daSCannon_cFv */
 void daSCannon_c::exeEmtLine() {
     cXyz pos;
     JGeometry::TVec3<s16> rot;
@@ -859,7 +796,6 @@ void daSCannon_c::exeEmtLine() {
     }
 }
 
-/* 80CC8DA0-80CC8DDC 002380 003C+00 1/1 0/0 0/0 .text            delEmtAll__11daSCannon_cFv */
 void daSCannon_c::delEmtAll() {
     if (mpEmtLine != NULL) {
         mpEmtLine->becomeInvalidEmitter();
@@ -868,7 +804,6 @@ void daSCannon_c::delEmtAll() {
     }
 }
 
-/* 80CC8DDC-80CC8E60 0023BC 0084+00 0/0 0/0 1/1 .text            setCannonRepair__11daSCannon_cFv */
 void daSCannon_c::setCannonRepair() {
     if (dComIfG_play_c::getLayerNo(0) == 1) {
         mIsRepaired = TRUE;
@@ -879,31 +814,23 @@ void daSCannon_c::setCannonRepair() {
     }
 }
 
-/* 80CC8E60-80CC8EB4 002440 0054+00 1/0 0/0 0/0 .text            daSCannon_create__FP11daSCannon_c
- */
 static int daSCannon_create(daSCannon_c* i_this) {
     fopAcM_ct(i_this, daSCannon_c);
     return i_this->create();
 }
 
-/* 80CC8EB4-80CC8ED4 002494 0020+00 1/0 0/0 0/0 .text            daSCannon_Delete__FP11daSCannon_c
- */
 static int daSCannon_Delete(daSCannon_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CC8ED4-80CC8EF4 0024B4 0020+00 1/0 0/0 0/0 .text            daSCannon_execute__FP11daSCannon_c
- */
 static int daSCannon_execute(daSCannon_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CC8EF4-80CC8F14 0024D4 0020+00 1/0 0/0 0/0 .text            daSCannon_draw__FP11daSCannon_c */
 static int daSCannon_draw(daSCannon_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CC9568-80CC9588 -00001 0020+00 1/0 0/0 0/0 .data            daSCannon_METHODS */
 static actor_method_class daSCannon_METHODS = {
     (process_method_func)daSCannon_create,
     (process_method_func)daSCannon_Delete,
@@ -912,7 +839,6 @@ static actor_method_class daSCannon_METHODS = {
     (process_method_func)daSCannon_draw,
 };
 
-/* 80CC9588-80CC95B8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SCannon */
 extern actor_process_profile_definition g_profile_Obj_SCannon = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp
index 43ab24d58a..0e913238fe 100644
--- a/src/d/actor/d_a_obj_scannon_crs.cpp
+++ b/src/d/actor/d_a_obj_scannon_crs.cpp
@@ -9,12 +9,10 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_meter2_info.h"
 
-/* 80CC9678-80CC9698 000078 0020+00 1/1 0/0 0/0 .text daSCannonCrs_c_createHeap__FP10fopAc_ac_c */
 static int daSCannonCrs_c_createHeap(fopAc_ac_c* i_this) {
     return ((daSCannonCrs_c*)i_this)->createHeap();
 }
 
-/* 80CC9698-80CC973C 000098 00A4+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* i_proc, int param_1) {
     if (i_proc == NULL) {
         return 1;
@@ -34,28 +32,22 @@ static int eventCallBack(void* i_proc, int param_1) {
     return 1;
 }
 
-/* 80CCB17C-80CCB180 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "SCanCrs";
 
-/* 80CCB180-80CCB184 -00001 0004+00 1/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName = "SKY_CANNON_WARP_START";
 
-/* 80CCB184-80CCB188 -00001 0004+00 2/2 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "SCanCrs";
 
-/* 80CC973C-80CC97F4 00013C 00B8+00 2/2 0/0 0/0 .text            __ct__14daSCannonCrs_cFv */
 daSCannonCrs_c::daSCannonCrs_c() {
     mpBgW = NULL;
     memset(mpDisapEmt, 0, sizeof(mpDisapEmt));
     memset(mpBeamEmt, 0, sizeof(mpBeamEmt));
 }
 
-/* 80CC983C-80CC9910 00023C 00D4+00 1/0 0/0 0/0 .text            __dt__14daSCannonCrs_cFv */
 daSCannonCrs_c::~daSCannonCrs_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CCB080-80CCB088 000000 0008+00 6/6 0/0 0/0 .rodata          DISAP_PARTICLE_NAME */
 static const u16 DISAP_PARTICLE_NAME[] = {
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_DISAPP_A),
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_DISAPP_B),
@@ -63,7 +55,6 @@ static const u16 DISAP_PARTICLE_NAME[] = {
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_DISAPP_D),
 };
 
-/* 80CCB088-80CCB090 000008 0008+00 0/1 0/0 0/0 .rodata          BEAM_PARTICLE_NAME */
 static const u16 BEAM_PARTICLE_NAME[] = {
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_BIND_A),
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_BIND_B),
@@ -71,7 +62,6 @@ static const u16 BEAM_PARTICLE_NAME[] = {
     dPa_RM(ID_ZI_S_SKYCANNON_CRASH_BIND_D),
 };
 
-/* 80CC9910-80CC9B10 000310 0200+00 1/1 0/0 0/0 .text            create__14daSCannonCrs_cFv */
 int daSCannonCrs_c::create() {
     fopAcM_ct(this, daSCannonCrs_c);
 
@@ -116,7 +106,6 @@ int daSCannonCrs_c::create() {
     return phase_state;
 }
 
-/* 80CC9B10-80CC9B80 000510 0070+00 1/1 0/0 0/0 .text            Delete__14daSCannonCrs_cFv */
 int daSCannonCrs_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -126,7 +115,6 @@ int daSCannonCrs_c::Delete() {
     return 1;
 }
 
-/* 80CC9B80-80CC9C64 000580 00E4+00 1/1 0/0 0/0 .text            draw__14daSCannonCrs_cFv */
 int daSCannonCrs_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -141,7 +129,6 @@ int daSCannonCrs_c::draw() {
     return 1;
 }
 
-/* 80CC9C64-80CC9CA4 000664 0040+00 1/1 0/0 0/0 .text            execute__14daSCannonCrs_cFv */
 int daSCannonCrs_c::execute() {
     daMidna_c* midna_p = daPy_py_c::getMidnaActor();
     if (midna_p == NULL) {
@@ -152,7 +139,6 @@ int daSCannonCrs_c::execute() {
     return 1;
 }
 
-/* 80CC9CA4-80CC9D60 0006A4 00BC+00 1/1 0/0 0/0 .text middleExe__14daSCannonCrs_cFP9daMidna_c */
 void daSCannonCrs_c::middleExe(daMidna_c* i_midna_p) {
     if (mVoiceTimer != 0) {
         mVoiceTimer--;
@@ -171,7 +157,6 @@ void daSCannonCrs_c::middleExe(daMidna_c* i_midna_p) {
     mBtk.play();
 }
 
-/* 80CC9D60-80CC9F34 000760 01D4+00 1/0 0/0 0/0 .text exeModeWait__14daSCannonCrs_cFP9daMidna_c */
 void daSCannonCrs_c::exeModeWait(daMidna_c* i_midna_p) {
     if (dComIfGp_evmng_startCheck(mEvtIdx) != 0) {
         if (strcmp(dComIfGp_getEventManager().getRunEventName(), "SKY_CANNON_WARP_START") == 0) {
@@ -208,8 +193,6 @@ void daSCannonCrs_c::exeModeWait(daMidna_c* i_midna_p) {
     }
 }
 
-/* 80CC9F34-80CC9F80 000934 004C+00 1/0 0/0 0/0 .text exeModePreWait__14daSCannonCrs_cFP9daMidna_c
- */
 void daSCannonCrs_c::exeModePreWait(daMidna_c* i_midna_p) {
     if (eventInfo.checkCommandTalk()) {
         dComIfGp_event_reset();
@@ -218,8 +201,6 @@ void daSCannonCrs_c::exeModePreWait(daMidna_c* i_midna_p) {
     mMode = MODE_WAIT;
 }
 
-/* 80CC9F80-80CCA240 000980 02C0+00 1/0 0/0 0/0 .text
- * exeModeOrderEvt__14daSCannonCrs_cFP9daMidna_c                */
 void daSCannonCrs_c::exeModeOrderEvt(daMidna_c* i_midna_p) {
     if (eventInfo.checkCommandTalk()) {
         i_midna_p->onTagWaitPosPortalObj(&mPortalWaitPos);
@@ -261,8 +242,6 @@ void daSCannonCrs_c::exeModeOrderEvt(daMidna_c* i_midna_p) {
     }
 }
 
-/* 80CCA240-80CCA2CC 000C40 008C+00 1/0 0/0 0/0 .text exeModeTalkEvt__14daSCannonCrs_cFP9daMidna_c
- */
 void daSCannonCrs_c::exeModeTalkEvt(daMidna_c* i_midna_p) {
     if (mMsgFlow.doFlow(this, NULL, 0)) {
         field_0x652 = 1;
@@ -276,8 +255,6 @@ void daSCannonCrs_c::exeModeTalkEvt(daMidna_c* i_midna_p) {
     }
 }
 
-/* 80CCA2CC-80CCA344 000CCC 0078+00 1/0 0/0 0/0 .text exeModeWarpEvt__14daSCannonCrs_cFP9daMidna_c
- */
 void daSCannonCrs_c::exeModeWarpEvt(daMidna_c* i_midna_p) {
     if (dComIfGp_evmng_endCheck(mEvtIdx) != 0) {
         mMode = MODE_END;
@@ -287,10 +264,8 @@ void daSCannonCrs_c::exeModeWarpEvt(daMidna_c* i_midna_p) {
     }
 }
 
-/* 80CCA344-80CCA348 000D44 0004+00 1/0 0/0 0/0 .text exeModeEnd__14daSCannonCrs_cFP9daMidna_c */
 void daSCannonCrs_c::exeModeEnd(daMidna_c* i_midna_p) {}
 
-/* 80CCB1D0-80CCB218 000074 0048+00 1/2 0/0 0/0 .data            s_exeProc__14daSCannonCrs_c */
 void (daSCannonCrs_c::*daSCannonCrs_c::s_exeProc[])(daMidna_c*) = {
     &daSCannonCrs_c::exeModeWait,
     &daSCannonCrs_c::exeModePreWait,
@@ -300,7 +275,6 @@ void (daSCannonCrs_c::*daSCannonCrs_c::s_exeProc[])(daMidna_c*) = {
     &daSCannonCrs_c::exeModeEnd,
 };
 
-/* 80CCA348-80CCA74C 000D48 0404+00 1/1 0/0 0/0 .text            demoExe__14daSCannonCrs_cFv */
 void daSCannonCrs_c::demoExe() {
     static char* CUT_TYPE_TABLE[4] = {
         "WAIT",
@@ -384,7 +358,6 @@ void daSCannonCrs_c::demoExe() {
     }
 }
 
-/* 80CCA74C-80CCA848 00114C 00FC+00 1/1 0/0 0/0 .text            init__14daSCannonCrs_cFv */
 void daSCannonCrs_c::init() {
     static const Vec MIDNA_WAIT_POS_OFFSET = {100.0f, 900.0f, 90.0f};
     cXyz wait_offset(MIDNA_WAIT_POS_OFFSET);
@@ -406,7 +379,6 @@ void daSCannonCrs_c::init() {
     field_0x652 = 0;
 }
 
-/* 80CCA848-80CCA8CC 001248 0084+00 2/2 0/0 0/0 .text            setModelMtx__14daSCannonCrs_cFv */
 void daSCannonCrs_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -415,7 +387,6 @@ void daSCannonCrs_c::setModelMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CCA8CC-80CCAAC4 0012CC 01F8+00 1/1 0/0 0/0 .text            createHeap__14daSCannonCrs_cFv */
 int daSCannonCrs_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10);
     JUT_ASSERT(967, a_model_data_p != NULL);
@@ -457,8 +428,6 @@ int daSCannonCrs_c::createHeap() {
     return 1;
 }
 
-/* 80CCAAC4-80CCAB24 0014C4 0060+00 2/2 0/0 0/0 .text            chkInTalkRange__14daSCannonCrs_cFv
- */
 bool daSCannonCrs_c::chkInTalkRange() {
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
     if (player_p == NULL) {
@@ -472,8 +441,6 @@ bool daSCannonCrs_c::chkInTalkRange() {
     return false;
 }
 
-/* 80CCAB24-80CCAC48 001524 0124+00 1/1 0/0 0/0 .text
- * initEmtRt__14daSCannonCrs_cFUsiPCUsPP14JPABaseEmitter        */
 void daSCannonCrs_c::initEmtRt(u16 i_jointNo, int i_emtNum, const u16* i_name_list, JPABaseEmitter** i_emt_list) {
     MtxP mtx = mpModel->getAnmMtx(i_jointNo);
     if (mtx != NULL) {
@@ -490,8 +457,6 @@ void daSCannonCrs_c::initEmtRt(u16 i_jointNo, int i_emtNum, const u16* i_name_li
     }
 }
 
-/* 80CCAC48-80CCACD0 001648 0088+00 1/1 0/0 0/0 .text
- * exeEmtRt__14daSCannonCrs_cFUsiPP14JPABaseEmitter             */
 void daSCannonCrs_c::exeEmtRt(u16 i_jointNo, int i_emtNum, JPABaseEmitter** i_emt_list) {
     MtxP mtx = mpModel->getAnmMtx(i_jointNo);
     if (mtx != NULL) {
@@ -503,7 +468,6 @@ void daSCannonCrs_c::exeEmtRt(u16 i_jointNo, int i_emtNum, JPABaseEmitter** i_em
     }
 }
 
-/* 80CCACD0-80CCAF20 0016D0 0250+00 1/1 0/0 0/0 .text callMidnaBeamEmt__14daSCannonCrs_cFv */
 void daSCannonCrs_c::callMidnaBeamEmt() {
     static const Vec MIDNA_BEAM_OFFSET = {0.0f, 50.0f, 0.0f};
 
@@ -527,28 +491,23 @@ void daSCannonCrs_c::callMidnaBeamEmt() {
     }
 }
 
-/* 80CCAF20-80CCAF74 001920 0054+00 1/0 0/0 0/0 .text daSCannonCrs_create__FP14daSCannonCrs_c */
 static int daSCannonCrs_create(daSCannonCrs_c* i_this) {
     fopAcM_ct(i_this, daSCannonCrs_c);
     return i_this->create();
 }
 
-/* 80CCAF74-80CCAF94 001974 0020+00 1/0 0/0 0/0 .text daSCannonCrs_Delete__FP14daSCannonCrs_c */
 static int daSCannonCrs_Delete(daSCannonCrs_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CCAF94-80CCAFB4 001994 0020+00 1/0 0/0 0/0 .text daSCannonCrs_execute__FP14daSCannonCrs_c */
 static int daSCannonCrs_execute(daSCannonCrs_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CCAFB4-80CCAFD4 0019B4 0020+00 1/0 0/0 0/0 .text daSCannonCrs_draw__FP14daSCannonCrs_c */
 static int daSCannonCrs_draw(daSCannonCrs_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CCB228-80CCB248 -00001 0020+00 1/0 0/0 0/0 .data            daSCannonCrs_METHODS */
 static actor_method_class daSCannonCrs_METHODS = {
     (process_method_func)daSCannonCrs_create,
     (process_method_func)daSCannonCrs_Delete,
@@ -557,7 +516,6 @@ static actor_method_class daSCannonCrs_METHODS = {
     (process_method_func)daSCannonCrs_draw,
 };
 
-/* 80CCB248-80CCB278 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SCannonCrs */
 extern actor_process_profile_definition g_profile_Obj_SCannonCrs = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp
index 4ffca191e9..bbd08bcc79 100644
--- a/src/d/actor/d_a_obj_scannon_ten.cpp
+++ b/src/d/actor/d_a_obj_scannon_ten.cpp
@@ -10,16 +10,12 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80CCCCF0-80CCCCF4 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "SCanTen";
 
-/* 80CCCCF4-80CCCCF8 -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "SCanTen";
 
-/* 80CCCCF8-80CCCCFC -00001 0004+00 1/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName = "SKY_CANNON_TEN_FIRE";
 
-/* 80CCB318-80CCB344 000078 002C+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* i_proc, int param_1) {
     if (i_proc != NULL) {
         ((daObjSCannonTen_c*)i_proc)->changeScene();
@@ -28,26 +24,20 @@ static int eventCallBack(void* i_proc, int param_1) {
     return 1;
 }
 
-/* 80CCB344-80CCB364 0000A4 0020+00 1/1 0/0 0/0 .text daObjSCannonTen_c_createHeap__FP10fopAc_ac_c
- */
 static int daObjSCannonTen_c_createHeap(fopAc_ac_c* i_this) {
     return ((daObjSCannonTen_c*)i_this)->createHeap();
 }
 
-/* 80CCB364-80CCB3F4 0000C4 0090+00 2/2 0/0 0/0 .text            __ct__17daObjSCannonTen_cFv */
 daObjSCannonTen_c::daObjSCannonTen_c() {
     mpBgW = NULL;
     memset(mpEmtSmk, 0, sizeof(mpEmtSmk));
     mpEmtLine = NULL;
 }
 
-/* 80CCB43C-80CCB4EC 00019C 00B0+00 1/0 0/0 0/0 .text            __dt__17daObjSCannonTen_cFv */
 daObjSCannonTen_c::~daObjSCannonTen_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CCB4EC-80CCB66C 00024C 0180+00 1/1 0/0 0/0 .text            createHeap__17daObjSCannonTen_cFv
- */
 int daObjSCannonTen_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9);
     JUT_ASSERT(116, a_model_data_p != NULL);
@@ -80,7 +70,6 @@ int daObjSCannonTen_c::createHeap() {
     return 1;
 }
 
-/* 80CCB66C-80CCB900 0003CC 0294+00 1/1 0/0 0/0 .text            create__17daObjSCannonTen_cFv */
 int daObjSCannonTen_c::create() {
     fopAcM_ct(this, daObjSCannonTen_c);
 
@@ -127,7 +116,6 @@ int daObjSCannonTen_c::create() {
     return phase_state;
 }
 
-/* 80CCB9E0-80CCBA58 000740 0078+00 1/1 0/0 0/0 .text            Delete__17daObjSCannonTen_cFv */
 int daObjSCannonTen_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -138,7 +126,6 @@ int daObjSCannonTen_c::Delete() {
     return 1;
 }
 
-/* 80CCBA58-80CCBB6C 0007B8 0114+00 1/1 0/0 0/0 .text            draw__17daObjSCannonTen_cFv */
 int daObjSCannonTen_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -154,13 +141,11 @@ int daObjSCannonTen_c::draw() {
     return 1;
 }
 
-/* 80CCBB6C-80CCBB90 0008CC 0024+00 1/1 0/0 0/0 .text            execute__17daObjSCannonTen_cFv */
 int daObjSCannonTen_c::execute() {
     middleExe();
     return 1;
 }
 
-/* 80CCBB90-80CCBC08 0008F0 0078+00 1/1 0/0 0/0 .text            middleExe__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::middleExe() {
     if (s_exeProc[mMode] != NULL) {
         (this->*s_exeProc[mMode])();
@@ -171,8 +156,6 @@ void daObjSCannonTen_c::middleExe() {
     mBck.play();
 }
 
-/* 80CCBC08-80CCBCB0 000968 00A8+00 1/0 0/0 0/0 .text            exeModeWait__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::exeModeWait() {
     if (aREG_F(0) == 0.0f && fopAcM_checkHookCarryNow(this) && dComIfGp_checkPlayerStatus1(0, 0x10)) {
         eventInfo.setArchiveName(l_arcName);
@@ -191,7 +174,6 @@ void daObjSCannonTen_c::exeModeWait() {
     }
 }
 
-/* 80CCBCB0-80CCBD4C 000A10 009C+00 1/0 0/0 0/0 .text exeModeOrderEvt__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::exeModeOrderEvt() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         mStaffId = dComIfGp_evmng_getMyStaffId(l_staffName, NULL, 0);
@@ -203,7 +185,6 @@ void daObjSCannonTen_c::exeModeOrderEvt() {
     }
 }
 
-/* 80CCCD2C-80CCCD5C 00005C 0030+00 1/2 0/0 0/0 .data            s_exeProc__17daObjSCannonTen_c */
 void (daObjSCannonTen_c::*daObjSCannonTen_c::s_exeProc[])() = {
     &daObjSCannonTen_c::exeModeWait,
     &daObjSCannonTen_c::exeModeOrderEvt,
@@ -211,8 +192,6 @@ void (daObjSCannonTen_c::*daObjSCannonTen_c::s_exeProc[])() = {
     &daObjSCannonTen_c::exeModeEnd,
 };
 
-/* 80CCCDEC-80CCCE7C 00011C 0090+00 2/3 0/0 0/0 .data            s_demoExeProc__17daObjSCannonTen_c
- */
 void (daObjSCannonTen_c::*daObjSCannonTen_c::s_demoExeProc[][2])() = {
     {&daObjSCannonTen_c::demoInitLinkIn, &daObjSCannonTen_c::demoExeLinkIn},
     {&daObjSCannonTen_c::demoInitSet, &daObjSCannonTen_c::demoExeSet},
@@ -222,7 +201,6 @@ void (daObjSCannonTen_c::*daObjSCannonTen_c::s_demoExeProc[][2])() = {
     {&daObjSCannonTen_c::demoInitFinish, &daObjSCannonTen_c::demoExeFinish},
 };
 
-/* 80CCBD4C-80CCBDCC 000AAC 0080+00 1/0 0/0 0/0 .text exeModeActionEvt__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::exeModeActionEvt() {
     if (dComIfGp_evmng_endCheck(mEvtIdx) != 0) {
         dComIfGp_event_reset();
@@ -233,11 +211,8 @@ void daObjSCannonTen_c::exeModeActionEvt() {
     }
 }
 
-/* 80CCBDCC-80CCBDD0 000B2C 0004+00 1/0 0/0 0/0 .text            exeModeEnd__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::exeModeEnd() {}
 
-/* 80CCBDD0-80CCBE8C 000B30 00BC+00 1/1 0/0 0/0 .text            demoExe__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoExe() {
     static char* CUT_TYPE_TABLE_FIRE_SECOND[6] = {
         "LINK_IN",
@@ -260,8 +235,6 @@ void daObjSCannonTen_c::demoExe() {
     }
 }
 
-/* 80CCBE8C-80CCBF00 000BEC 0074+00 2/2 0/0 0/0 .text            demoModeInit__17daObjSCannonTen_cFi
- */
 void daObjSCannonTen_c::demoModeInit(int i_actIdx) {
     if (i_actIdx < 0 || i_actIdx >= 6) {
         return;
@@ -272,10 +245,8 @@ void daObjSCannonTen_c::demoModeInit(int i_actIdx) {
     }
 }
 
-/* 80CCBF00-80CCBF04 000C60 0004+00 1/0 0/0 0/0 .text demoInitLinkIn__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoInitLinkIn() {}
 
-/* 80CCBF04-80CCBFC4 000C64 00C0+00 1/0 0/0 0/0 .text demoExeLinkIn__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoExeLinkIn() {
     if (!fopAcM_checkHookCarryNow(this)) {
         daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -291,8 +262,6 @@ void daObjSCannonTen_c::demoExeLinkIn() {
     }
 }
 
-/* 80CCBFC4-80CCC088 000D24 00C4+00 1/0 0/0 0/0 .text            demoInitSet__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoInitSet() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_TCANNON_ACTION_L7, 0);
     mBck.setPlaySpeed(1.0f);
@@ -300,8 +269,6 @@ void daObjSCannonTen_c::demoInitSet() {
     dComIfGp_getVibration().StartShock(VIBMODE_S_POWER3, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80CCC088-80CCC114 000DE8 008C+00 1/0 0/0 0/0 .text            demoExeSet__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoExeSet() {
     exeEmtSmoke();
     if (mBck.checkFrame(84)) {
@@ -310,12 +277,8 @@ void daObjSCannonTen_c::demoExeSet() {
     }
 }
 
-/* 80CCC114-80CCC118 000E74 0004+00 1/0 0/0 0/0 .text            demoInitMove__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoInitMove() {}
 
-/* 80CCC118-80CCC20C 000E78 00F4+00 1/0 0/0 0/0 .text            demoExeMove__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoExeMove() {
     exeEmtSmoke();
     if (mBck.checkFrame(104.0f)) {
@@ -327,14 +290,10 @@ void daObjSCannonTen_c::demoExeMove() {
     }
 }
 
-/* 80CCC20C-80CCC260 000F6C 0054+00 1/0 0/0 0/0 .text            demoInitFire__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoInitFire() {
     dComIfGp_getVibration().StartQuake(3, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80CCC260-80CCC2B8 000FC0 0058+00 1/0 0/0 0/0 .text            demoExeFire__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::demoExeFire() {
     exeEmtSmoke();
     if (mBck.checkFrame(235.0f)) {
@@ -342,7 +301,6 @@ void daObjSCannonTen_c::demoExeFire() {
     }
 }
 
-/* 80CCC2B8-80CCC37C 001018 00C4+00 1/0 0/0 0/0 .text demoInitFireEnd__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoInitFireEnd() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_BOMB_EXPLODE, 0);
 
@@ -350,7 +308,6 @@ void daObjSCannonTen_c::demoInitFireEnd() {
     dComIfGp_getVibration().StartShock(8, 0x1F, cXyz(0.0f, 1.0f, 0.0f));
 }
 
-/* 80CCC37C-80CCC3D4 0010DC 0058+00 1/0 0/0 0/0 .text demoExeFireEnd__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoExeFireEnd() {
     exeEmtSmoke();
     if (mBck.checkFrame(255.0f)) {
@@ -358,7 +315,6 @@ void daObjSCannonTen_c::demoExeFireEnd() {
     }
 }
 
-/* 80CCC3D4-80CCC498 001134 00C4+00 1/0 0/0 0/0 .text demoInitFinish__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoInitFinish() {
 #ifdef DEBUG
     J3DJoint* joint_p = mpModel->getModelData()->getJointNodePointer(mHeadJointNo);
@@ -381,7 +337,6 @@ void daObjSCannonTen_c::demoInitFinish() {
     }
 }
 
-/* 80CCC498-80CCC528 0011F8 0090+00 1/0 0/0 0/0 .text demoExeFinish__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::demoExeFinish() {
     exeEmtSmoke();
     exeEmtLine();
@@ -392,23 +347,18 @@ void daObjSCannonTen_c::demoExeFinish() {
     }
 }
 
-/* 80CCC528-80CCC53C 001288 0014+00 1/1 0/0 0/0 .text            init__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::init() {
     mTimer = 0;
     mMode = MODE_WAIT;
     mShadowKey = 0;
 }
 
-/* 80CCC53C-80CCC5A0 00129C 0064+00 2/2 0/0 0/0 .text            setModelMtx__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CCC5A0-80CCC628 001300 0088+00 2/2 0/0 0/0 .text            changeScene__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::changeScene() {
     if (dComIfGp_getVibration().CheckQuake()) {
         dComIfGp_getVibration().StopQuake(0x1F);
@@ -419,8 +369,6 @@ void daObjSCannonTen_c::changeScene() {
     dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 80CCC628-80CCC74C 001388 0124+00 1/1 0/0 0/0 .text            initEmtSmoke__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::initEmtSmoke() {
     static const u16 PARTICLE_NAME[] = {
         dPa_RM(ID_ZF_S_SKYCANNON00_SMK),
@@ -443,8 +391,6 @@ void daObjSCannonTen_c::initEmtSmoke() {
     }
 }
 
-/* 80CCC74C-80CCC7D0 0014AC 0084+00 5/5 0/0 0/0 .text            exeEmtSmoke__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::exeEmtSmoke() {
     MtxP mtx = mpModel->getAnmMtx(mHeadJointNo);
     if (mtx != NULL) {
@@ -456,8 +402,6 @@ void daObjSCannonTen_c::exeEmtSmoke() {
     }
 }
 
-/* 80CCC7D0-80CCC8B8 001530 00E8+00 1/1 0/0 0/0 .text            initEmtLine__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::initEmtLine() {
     cXyz pos;
     csXyz rot;
@@ -471,8 +415,6 @@ void daObjSCannonTen_c::initEmtLine() {
     mpEmtLine = dComIfGp_particle_set(dPa_RM(ID_ZF_S_TOBYCANNON00LINE), &pos, &tevStr, &rot, NULL);
 }
 
-/* 80CCC8B8-80CCC97C 001618 00C4+00 1/1 0/0 0/0 .text            exeEmtLine__17daObjSCannonTen_cFv
- */
 void daObjSCannonTen_c::exeEmtLine() {
     cXyz pos;
     JGeometry::TVec3<s16> rot;
@@ -489,7 +431,6 @@ void daObjSCannonTen_c::exeEmtLine() {
     }
 }
 
-/* 80CCC97C-80CCC9B8 0016DC 003C+00 1/1 0/0 0/0 .text            delEmtAll__17daObjSCannonTen_cFv */
 void daObjSCannonTen_c::delEmtAll() {
     if (mpEmtLine != NULL) {
         mpEmtLine->becomeInvalidEmitter();
@@ -498,32 +439,23 @@ void daObjSCannonTen_c::delEmtAll() {
     }
 }
 
-/* 80CCC9B8-80CCCA0C 001718 0054+00 1/0 0/0 0/0 .text
- * daObjSCannonTen_create__FP17daObjSCannonTen_c                */
 static int daObjSCannonTen_create(daObjSCannonTen_c* i_this) {
     fopAcM_ct(i_this, daObjSCannonTen_c);
     return i_this->create();
 }
 
-/* 80CCCA0C-80CCCA2C 00176C 0020+00 1/0 0/0 0/0 .text
- * daObjSCannonTen_Delete__FP17daObjSCannonTen_c                */
 static int daObjSCannonTen_Delete(daObjSCannonTen_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CCCA2C-80CCCA4C 00178C 0020+00 1/0 0/0 0/0 .text
- * daObjSCannonTen_execute__FP17daObjSCannonTen_c               */
 static int daObjSCannonTen_execute(daObjSCannonTen_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CCCA4C-80CCCA6C 0017AC 0020+00 1/0 0/0 0/0 .text daObjSCannonTen_draw__FP17daObjSCannonTen_c
- */
 static int daObjSCannonTen_draw(daObjSCannonTen_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CCCE94-80CCCEB4 -00001 0020+00 1/0 0/0 0/0 .data            daObjSCannonTen_METHODS */
 static actor_method_class daObjSCannonTen_METHODS = {
     (process_method_func)daObjSCannonTen_create,
     (process_method_func)daObjSCannonTen_Delete,
@@ -532,7 +464,6 @@ static actor_method_class daObjSCannonTen_METHODS = {
     (process_method_func)daObjSCannonTen_draw,
 };
 
-/* 80CCCEB4-80CCCEE4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SCannonTen */
 extern actor_process_profile_definition g_profile_Obj_SCannonTen = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp
index 4e17ec7e72..78619c266f 100644
--- a/src/d/actor/d_a_obj_sekidoor.cpp
+++ b/src/d/actor/d_a_obj_sekidoor.cpp
@@ -6,25 +6,20 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_sekidoor.h"
+   
 
-/* ############################################################################################## */   
-
-/* 80CCDA5C-80CCDA64 000020 0008+00 2/3 0/0 0/0 .data            l_bmdData */
 static struct {
     u32 bmdIdx;
     u32 resIdx;
 } l_bmdData[1] = {4, 1};
 
-/* 80CCDA64-80CCDA6C 000028 0008+00 0/1 0/0 0/0 .data            l_dzbData */
 static struct {
     u32 dzbIdx;
     u32 resIdx;
 } l_dzbData[1] = {7, 1};
 
-/* 80CCDA6C-80CCDA74 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {"", "SekiDoor"};
 
-/* 80CCD02C-80CCD154 0000EC 0128+00 1/1 0/0 0/0 .text            create__16daObj_SekiDoor_cFv */
 int daObj_SekiDoor_c::create() {
     fopAcM_ct(this, daObj_SekiDoor_c);
 
@@ -50,7 +45,6 @@ int daObj_SekiDoor_c::create() {
     return step;
 }
 
-/* 80CCD154-80CCD1F0 000214 009C+00 1/0 0/0 0/0 .text            CreateHeap__16daObj_SekiDoor_cFv */
 int daObj_SekiDoor_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[mBitSW].resIdx],
@@ -69,7 +63,6 @@ int daObj_SekiDoor_c::CreateHeap() {
     return 1;
 }
 
-/* 80CCD1F0-80CCD23C 0002B0 004C+00 1/0 0/0 0/0 .text            Create__16daObj_SekiDoor_cFv */
 int daObj_SekiDoor_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -78,26 +71,20 @@ int daObj_SekiDoor_c::Create() {
     return 1;
 }
 
-/* 80CCD23C-80CCD290 0002FC 0054+00 1/0 0/0 0/0 .text            Delete__16daObj_SekiDoor_cFv */
 int daObj_SekiDoor_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_resNameList[l_bmdData[mBitSW].resIdx]);
 
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80CCDA08-80CCDA0C 000000 0001+03 2/2 0/0 0/0 .rodata          m__22daObj_SekiDoor_Param_c */
 const u8 daObj_SekiDoor_Param_c::m = 0;
 
-/* 80CCDA0C-80CCDA10 000004 0004+00 1/3 0/0 0/0 .rodata          @3956 */
 static const f32 reference_posy = 460.0f;
 
-/* 80CCDA10-80CCDA14 000008 0004+00 0/1 0/0 0/0 .rodata          @3957 */
 static const f32 rising_speed_y = 4.0f;
 
 
-/* 80CCD290-80CCD51C 000350 028C+00 1/0 0/0 0/0 .text Execute__16daObj_SekiDoor_cFPPA3_A4_f */
 int daObj_SekiDoor_c::Execute(Mtx** i_mtx) {
     cXyz temp_y_position;
     *i_mtx = &mBgMtx;
@@ -162,7 +149,6 @@ int daObj_SekiDoor_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80CCD538-80CCD5DC 0005F8 00A4+00 1/0 0/0 0/0 .text            Draw__16daObj_SekiDoor_cFv */
 int daObj_SekiDoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -174,7 +160,6 @@ int daObj_SekiDoor_c::Draw() {
     return 1;
 }
 
-/* 80CCD5DC-80CCD64C 00069C 0070+00 0/0 0/0 1/1 .text            evtSkip__16daObj_SekiDoor_cFv */
 void daObj_SekiDoor_c::evtSkip() {
     if (mFrameCounter != 0){
         dComIfGp_getVibration().StopQuake(0xf);
@@ -185,9 +170,7 @@ void daObj_SekiDoor_c::evtSkip() {
     mDestroyed = true;
 }
 
-/* ############################################################################################## */
 
-/* 80CCD64C-80CCD810 00070C 01C4+00 1/1 0/0 0/0 .text            setPrtcls__16daObj_SekiDoor_cFv */
 void daObj_SekiDoor_c::setPrtcls() {
     static const u16 id[4] = {
         0x8B85, 0x8B86, 0x8B87, 0x8B88,
@@ -229,13 +212,11 @@ void daObj_SekiDoor_c::setPrtcls() {
     }
 }
 
-/* 80CCD810-80CCD84C 0008D0 003C+00 1/1 0/0 0/0 .text            initBaseMtx__16daObj_SekiDoor_cFv */
 void daObj_SekiDoor_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CCD84C-80CCD8D8 00090C 008C+00 2/2 0/0 0/0 .text            setBaseMtx__16daObj_SekiDoor_cFv */
 void daObj_SekiDoor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mDoorPosY, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -245,37 +226,29 @@ void daObj_SekiDoor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CCD8D8-80CCD8F8 000998 0020+00 1/0 0/0 0/0 .text            daObj_SekiDoor_Create__FPv */
 static int daObj_SekiDoor_Create(void* i_this) {
     return static_cast<daObj_SekiDoor_c*>(i_this)->create();
 }
 
-/* 80CCD8F8-80CCD918 0009B8 0020+00 1/0 0/0 0/0 .text            daObj_SekiDoor_Delete__FPv */
 static int daObj_SekiDoor_Delete(void* i_this) {
     return static_cast<daObj_SekiDoor_c*>(i_this)->MoveBGDelete();
 }
 
-/* 80CCD918-80CCD938 0009D8 0020+00 1/0 0/0 0/0 .text            daObj_SekiDoor_Execute__FPv */
 static int daObj_SekiDoor_Execute(void* i_this) {
     return static_cast<daObj_SekiDoor_c*>(i_this)->MoveBGExecute();
 }
 
-/* 80CCD938-80CCD964 0009F8 002C+00 1/0 0/0 0/0 .text            daObj_SekiDoor_Draw__FPv */
 static int daObj_SekiDoor_Draw(void* i_this) {
     return static_cast<daObj_SekiDoor_c*>(i_this)->MoveBGDraw();
 }
 
-/* 80CCD964-80CCD96C 000A24 0008+00 1/0 0/0 0/0 .text            daObj_SekiDoor_IsDelete__FPv */
 static int daObj_SekiDoor_IsDelete(void* param_0) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80CCDB0C-80CCDB10 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_SekiDoor_Param_c l_HIO;
 
-/* 80CCDA74-80CCDA94 -00001 0020+00 1/0 0/0 0/0 .data            daObj_SekiDoor_MethodTable */
 static actor_method_class daObj_SekiDoor_MethodTable = {
     (process_method_func)daObj_SekiDoor_Create,
     (process_method_func)daObj_SekiDoor_Delete,
@@ -284,7 +257,6 @@ static actor_method_class daObj_SekiDoor_MethodTable = {
     (process_method_func)daObj_SekiDoor_Draw,
 };
 
-/* 80CCDA94-80CCDAC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SEKIDOOR */
 extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = {
     fpcLy_CURRENT_e,             // mLayerID
     7,                           // mListID
diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp
index 425d46ccd5..c2303e6b78 100644
--- a/src/d/actor/d_a_obj_sekizo.cpp
+++ b/src/d/actor/d_a_obj_sekizo.cpp
@@ -9,22 +9,18 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CCE19C-80CCE1A4 000020 0008+00 2/3 0/0 0/0 .data            l_bmdData */
 static struct {
     u32 bmdIdx;
     u32 resIdx;
 } l_bmdData[1] = {4, 1};
 
-/* 80CCE1A4-80CCE1AC 000028 0008+00 0/1 0/0 0/0 .data            l_dzbData */
 static struct {
     u32 dzbIdx;
     u32 resIdx;
 } l_dzbData[1] = {7, 1};
 
-/* 80CCE1AC-80CCE1B4 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {"", "Sekizo"};
 
-/* 80CCDC0C-80CCDD00 0000EC 00F4+00 1/1 0/0 0/0 .text            create__14daObj_Sekizo_cFv */
 cPhs__Step daObj_Sekizo_c::create() {
     fopAcM_ct(this, daObj_Sekizo_c);
 
@@ -42,7 +38,6 @@ cPhs__Step daObj_Sekizo_c::create() {
     return step;
 }
 
-/* 80CCDD00-80CCDD8C 0001E0 008C+00 1/0 0/0 0/0 .text            CreateHeap__14daObj_Sekizo_cFv */
 int daObj_Sekizo_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[field_0x5b0].resIdx], l_bmdData[field_0x5b0].bmdIdx);
@@ -54,7 +49,6 @@ int daObj_Sekizo_c::CreateHeap() {
     return true;
 }
 
-/* 80CCDD8C-80CCDDE8 00026C 005C+00 1/0 0/0 0/0 .text            Create__14daObj_Sekizo_cFv */
 int daObj_Sekizo_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -64,14 +58,11 @@ int daObj_Sekizo_c::Create() {
     return 1;
 }
 
-/* 80CCDDE8-80CCDE3C 0002C8 0054+00 1/0 0/0 0/0 .text            Delete__14daObj_Sekizo_cFv */
 int daObj_Sekizo_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_resNameList[l_bmdData[field_0x5b0].resIdx]);
     return 1;
 }
 
-/* 80CCDE3C-80CCDEF4 00031C 00B8+00 1/0 0/0 0/0 .text            Execute__14daObj_Sekizo_cFPPA3_A4_f
- */
 int daObj_Sekizo_c::Execute(Mtx** i_mtx) {
     if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
         *i_mtx = &mBgMtx;
@@ -89,7 +80,6 @@ int daObj_Sekizo_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80CCDEF4-80CCDFA4 0003D4 00B0+00 1/0 0/0 0/0 .text            Draw__14daObj_Sekizo_cFv */
 int daObj_Sekizo_c::Draw() {
     if (!field_0x5b2) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -101,13 +91,11 @@ int daObj_Sekizo_c::Draw() {
     return 1;
 }
 
-/* 80CCDFA4-80CCDFE0 000484 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObj_Sekizo_cFv */
 void daObj_Sekizo_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CCDFE0-80CCE044 0004C0 0064+00 2/2 0/0 0/0 .text            setBaseMtx__14daObj_Sekizo_cFv */
 void daObj_Sekizo_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -115,44 +103,35 @@ void daObj_Sekizo_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CCE044-80CCE064 000524 0020+00 1/0 0/0 0/0 .text            daObj_Sekizo_Create__FPv */
 static int daObj_Sekizo_Create(void* i_this) {
     return static_cast<daObj_Sekizo_c*>(i_this)->create();
 }
 
-/* 80CCE064-80CCE084 000544 0020+00 1/0 0/0 0/0 .text            daObj_Sekizo_Delete__FPv */
 static int daObj_Sekizo_Delete(void* i_this) {
     return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGDelete();
 }
 
-/* 80CCE084-80CCE0A4 000564 0020+00 1/0 0/0 0/0 .text            daObj_Sekizo_Execute__FPv */
 static int daObj_Sekizo_Execute(void* i_this) {
     return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGExecute();
 }
 
-/* 80CCE0A4-80CCE0D0 000584 002C+00 1/0 0/0 0/0 .text            daObj_Sekizo_Draw__FPv */
 static int daObj_Sekizo_Draw(void* i_this) {
     return static_cast<daObj_Sekizo_c*>(i_this)->MoveBGDraw();
 }
 
-/* 80CCE0D0-80CCE0D8 0005B0 0008+00 1/0 0/0 0/0 .text            daObj_Sekizo_IsDelete__FPv */
 static int daObj_Sekizo_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CCE240-80CCE24C 000008 000C+00 1/1 0/0 0/0 .bss             @3800 */
 static u8 lit_3800[12];
 
-/* 80CCE24C-80CCE250 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Sekizo_Param_c l_HIO;
 
-/* 80CCE1B4-80CCE1D4 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Sekizo_MethodTable */
 static actor_method_class daObj_Sekizo_MethodTable = {
     (process_method_func)daObj_Sekizo_Create, (process_method_func)daObj_Sekizo_Delete,
     (process_method_func)daObj_Sekizo_Execute, (process_method_func)daObj_Sekizo_IsDelete,
     (process_method_func)daObj_Sekizo_Draw};
 
-/* 80CCE1D4-80CCE204 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SEKIZO */
 extern actor_process_profile_definition g_profile_OBJ_SEKIZO = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp
index 25d74915a3..cc2bb52860 100644
--- a/src/d/actor/d_a_obj_sekizoa.cpp
+++ b/src/d/actor/d_a_obj_sekizoa.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_obj_sekizoa
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_sekizoa.h"
@@ -16,49 +11,41 @@
 #include "f_op/f_op_msg.h"
 
 
-/* 80CD5EF8-80CD5F40 000020 0048+00 1/1 0/0 0/0 .data            l_bmdData */
 static daNpc_GetParam1 l_bmdData[9] = {
     {36, 1}, {36, 1}, {35, 1}, {37, 1}, {38, 1}, {3, 2}, {3, 2}, {4, 2}, {5, 2},
 };
 
-/* 80CD5F40-80CD5F90 -00001 0050+00 3/4 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[10] = {
     {"", 1},     {"NO_RESPONSE", 1}, {"START", 1}, {"RESTART", 1}, {"TURN", 1},
     {"JUMP", 1}, {"GOAL", 1},        {"EXIT", 1},  {"FREE", 1},    {"EXTINCTION", 1},
 };
 
-/* 80CD5F90-80CD5F9C -00001 000C+00 3/4 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "sekizoA",
     "seki_1k",
 };
 
-/* 80CD5F9C-80CD5FA0 0000C4 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     0x01,
     0xFF,
 };
 
-/* 80CD5FA0-80CD5FA4 0000C8 0003+01 1/0 0/0 0/0 .data            l_loadResPtrn1 */
 static s8 l_loadResPtrn1[3] = {
     0x01,
     0x02,
     0xFF,
 };
 
-/* 80CD5FA4-80CD5FC4 -00001 0020+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[8] = {
     l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0, l_loadResPtrn0,
     l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1, l_loadResPtrn1,
 };
 
-/* 80CD5FC4-80CD5FE0 0000EC 001C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static daNpcT_faceMotionAnmData_c l_faceMotionAnmData = {
     -1, 0, 0, -1, 0, 0, 0,
 };
 
-/* 80CD5FE0-80CD6280 000108 02A0+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static daNpcT_motionAnmData_c l_motionAnmData[24] = {
     {daObj_Sekizoa_c::ANM_SEKI_WAIT_A, 2, 1, -1, 0, 0, 0},
     {daObj_Sekizoa_c::ANM_SEKI_WAIT_R, 2, 1, -1, 0, 0, 0},
@@ -85,7 +72,6 @@ static daNpcT_motionAnmData_c l_motionAnmData[24] = {
     {daObj_Sekizoa_c::ANM_SEKI_STEP_L, 0, 1, -1, 0, 0, 0},
     {daObj_Sekizoa_c::ANM_SEKI_WAIT_A, 2, 1, -1, 0, 0, 0}};
 
-/* 80CD6280-80CD6290 0003A8 0010+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] = {
     {0, -1, 0},
     {-1, 0, 0},
@@ -93,7 +79,6 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[4] =
     {-1, 0, 0},
 };
 
-/* 80CD6290-80CD6410 0003B8 0180+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[96] = {
     {0, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {1, -1, 0},  {-1, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {2, -1, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {3, -1, 1},  {-1, 0, 0},
@@ -110,12 +95,10 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[96] = {
     {21, -1, 1}, {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {22, 4, 1},  {-1, 0, 0},  {-1, 0, 0},
     {-1, 0, 0},  {23, 0, 0},  {-1, 0, 0},  {-1, 0, 0},  {-1, 0, 0}};
 
-/* 80CD6410-80CD6434 -00001 0024+00 1/1 0/0 0/0 .data            mCutNameList__15daObj_Sekizoa_c */
 char* daObj_Sekizoa_c::mCutNameList[9] = {
     "", "START", "START", "TURN", "JUMP", "GOAL", "EXIT", "FREE", "EXTINCTION",
 };
 
-/* 80CD6494-80CD6500 0005BC 006C+00 1/2 0/0 0/0 .data            mCutList__15daObj_Sekizoa_c */
 daObj_Sekizoa_c::cutFunc daObj_Sekizoa_c::mCutList[9] = {
     NULL,
     &daObj_Sekizoa_c::cutStart,
@@ -128,10 +111,8 @@ daObj_Sekizoa_c::cutFunc daObj_Sekizoa_c::mCutList[9] = {
     &daObj_Sekizoa_c::cutExtinction,
 };
 
-/* 80CD692C-80CD6938 000054 000C+00 3/4 0/0 0/0 .bss             l_srcPosR */
 static cXyz l_srcPosR(-600.0f, 1000.0f, 1800.0f);
 
-/* 80CD6944-80CD6950 00006C 000C+00 3/4 0/0 0/0 .bss             l_srcPosL */
 static cXyz l_srcPosL(600.0f, 1000.0f, 1800.0f);
 
 daObj_Sekizoa_Param_c::Data const daObj_Sekizoa_Param_c::m = {
@@ -140,7 +121,6 @@ daObj_Sekizoa_Param_c::Data const daObj_Sekizoa_Param_c::m = {
     0.0,   4.0,   0.0, 0.0,    0.0,   0.0,   0.0,   0.0,  0.0, 600.0, 30.0, 0.004, 0,
 };
 
-/* 80CCE34C-80CCE570 0000EC 0224+00 1/0 0/0 0/0 .text            __dt__15daObj_Sekizoa_cFv */
 daObj_Sekizoa_c::~daObj_Sekizoa_c() {
     if (mpMorf[0] != NULL) {
         mpMorf[0]->stopZelAnime();
@@ -159,9 +139,7 @@ daObj_Sekizoa_c::~daObj_Sekizoa_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**)l_resNameList);
 }
 
-/* ############################################################################################## */
 
-/* 80CCE570-80CCE8B0 000310 0340+00 1/1 0/0 0/0 .text            create__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::create() {
     static u32 const heapSize[8] = {
         0x2390, 0x2380, 0x2390, 0x2380, 0x2350, 0x2340, 0x33E0, 0,
@@ -215,9 +193,7 @@ int daObj_Sekizoa_c::create() {
     return ret;
 }
 
-/* ############################################################################################## */
 
-/* 80CCE8B0-80CCEC54 000650 03A4+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::CreateHeap() {
     J3DModelData* modelData;
     int arcIdx;
@@ -307,18 +283,15 @@ int daObj_Sekizoa_c::CreateHeap() {
     return 0;
 }
 
-/* 80CCEC54-80CCEC88 0009F4 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::Delete() {
     this->~daObj_Sekizoa_c();
     return 1;
 }
 
-/* 80CCEC88-80CCECA8 000A28 0020+00 2/2 0/0 0/0 .text            Execute__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::Execute() {
     return execute();
 }
 
-/* 80CCECA8-80CCED74 000A48 00CC+00 1/1 0/0 0/0 .text            Draw__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::Draw() {
     daNpcT_MatAnm_c* mat_anm = mpMatAnm[0];
     if (mat_anm != NULL) {
@@ -335,14 +308,10 @@ int daObj_Sekizoa_c::Draw() {
     return daNpcT_c::draw(0, 0, mRealShadowSize, NULL, 0.0f, temp_int, (mType == TYPE_6), 0);
 }
 
-/* 80CCED74-80CCED94 000B14 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_Sekizoa_cFP10fopAc_ac_c          */
 int daObj_Sekizoa_c::createHeapCallBack(fopAc_ac_c* i_this) {
     static_cast<daObj_Sekizoa_c*>(i_this)->CreateHeap();
 }
 
-/* 80CCED94-80CCEE30 000B34 009C+00 1/1 0/0 0/0 .text            srchSekizoa__15daObj_Sekizoa_cFPvPv
- */
 void* daObj_Sekizoa_c::srchSekizoa(void* i_actor, void* i_this) {
     if (mFindCount < 50 && i_actor != NULL && i_actor != i_this) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_SEKIZOA) {
@@ -353,9 +322,7 @@ void* daObj_Sekizoa_c::srchSekizoa(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* ############################################################################################## */
 
-/* 80CCEE30-80CCEFA4 000BD0 0174+00 1/1 0/0 0/0 .text            getSekizoaP__15daObj_Sekizoa_cFi */
 fopAc_ac_c* daObj_Sekizoa_c::getSekizoaP(int param_0) {
     fopAc_ac_c* actor = NULL;
     f32 minDistance = 1.0e9f;
@@ -373,7 +340,6 @@ fopAc_ac_c* daObj_Sekizoa_c::getSekizoaP(int param_0) {
     return actor;
 }
 
-/* 80CCEFA4-80CCF03C 000D44 0098+00 1/1 0/0 0/0 .text            getKMsgTagP__15daObj_Sekizoa_cFv */
 fopAc_ac_c* daObj_Sekizoa_c::getKMsgTagP() {
     mFindCount = 0;
     mSrchName = 0x2eb;
@@ -386,7 +352,6 @@ fopAc_ac_c* daObj_Sekizoa_c::getKMsgTagP() {
     return NULL;
 }
 
-/* 80CCF03C-80CCF138 000DDC 00FC+00 1/1 0/0 0/0 .text            isDelete__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::isDelete() {
     bool ret;
     switch (mType) {
@@ -420,7 +385,6 @@ int daObj_Sekizoa_c::isDelete() {
     }
 }
 
-/* 80CCF138-80CCF358 000ED8 0220+00 2/1 0/0 0/0 .text            reset__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::reset() {
     csXyz temp_angle;
     int iVar1 = (u8*)&field_0x117C - (u8*)&mInitFunc;
@@ -473,7 +437,6 @@ void daObj_Sekizoa_c::reset() {
     setAngle(temp_angle);
 }
 
-/* 80CCF358-80CCF3E4 0010F8 008C+00 1/0 0/0 0/0 .text            afterJntAnm__15daObj_Sekizoa_cFi */
 void daObj_Sekizoa_c::afterJntAnm(int param_0) {
     if (param_0 == 1) {
         mDoMtx_stack_c::YrotM(mStagger.getAngleZ(1));
@@ -484,9 +447,7 @@ void daObj_Sekizoa_c::afterJntAnm(int param_0) {
     }
 }
 
-/* ############################################################################################## */
 
-/* 80CCF3E4-80CCF6BC 001184 02D8+00 1/0 0/0 0/0 .text            setParam__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::setParam() {
     selectAction();
     srchActors();
@@ -564,8 +525,6 @@ void daObj_Sekizoa_c::setParam() {
     }
 }
 
-/* 80CCF6BC-80CCF704 00145C 0048+00 1/0 0/0 0/0 .text            checkChangeEvt__15daObj_Sekizoa_cFv
- */
 BOOL daObj_Sekizoa_c::checkChangeEvt() {
     switch (mType) {
     case TYPE_0:
@@ -583,12 +542,10 @@ BOOL daObj_Sekizoa_c::checkChangeEvt() {
     }
 }
 
-/* 80CCF704-80CCF708 0014A4 0004+00 1/0 0/0 0/0 .text setAfterTalkMotion__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::setAfterTalkMotion() {
     /* empty function */
 }
 
-/* 80CCF708-80CCF9A8 0014A8 02A0+00 1/1 0/0 0/0 .text            srchActors__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::srchActors() {
     switch (mType) {
     case TYPE_0:
@@ -657,7 +614,6 @@ void daObj_Sekizoa_c::srchActors() {
     }
 }
 
-/* 80CCF9A8-80CCFAA8 001748 0100+00 1/0 0/0 0/0 .text            evtTalk__15daObj_Sekizoa_cFv */
 BOOL daObj_Sekizoa_c::evtTalk() {
     if (chkAction(&daObj_Sekizoa_c::talk)) {
         (this->*(mExecuteFunc))(0);
@@ -676,9 +632,7 @@ BOOL daObj_Sekizoa_c::evtTalk() {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80CCFAA8-80CCFBA0 001848 00F8+00 1/0 0/0 0/0 .text            evtCutProc__15daObj_Sekizoa_cFv */
 BOOL daObj_Sekizoa_c::evtCutProc() {
     int staff_id = dComIfGp_getEventManager().getMyStaffId("Sekizoa", this, -1);
     if (mType == TYPE_1 || mType == TYPE_3) {
@@ -696,7 +650,6 @@ BOOL daObj_Sekizoa_c::evtCutProc() {
     }
 }
 
-/* 80CCFBA0-80CCFD08 001940 0168+00 1/0 0/0 0/0 .text            action__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::action() {
     if (mCyl.ChkTgHit()) {
         mSound.startCollisionSE(mCyl.GetTgHitObjHitSeID(1), 2);
@@ -718,16 +671,13 @@ void daObj_Sekizoa_c::action() {
     }
 }
 
-/* 80CCFD08-80CCFD80 001AA8 0078+00 1/0 0/0 0/0 .text            beforeMove__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::beforeMove() {
     if (checkHide() || mNoDraw != 0) {
         attention_info.flags = 0;
     }
 }
 
-/* ############################################################################################## */
 
-/* 80CCFD80-80CD009C 001B20 031C+00 1/0 0/0 0/0 .text            setAttnPos__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::setAttnPos() {
     cXyz vec_pos(30.0f, 30.0f, 0.0f);
     Mtx M_stack;
@@ -773,10 +723,7 @@ void daObj_Sekizoa_c::setAttnPos() {
     attention_info.position.y += daObj_Sekizoa_Param_c::m.field_0x00;
 }
 
-/* ############################################################################################## */
 
-/* 80CD009C-80CD03C0 001E3C 0324+00 1/0 0/0 0/0 .text            setCollision__15daObj_Sekizoa_cFv
- */
 void daObj_Sekizoa_c::setCollision() {
     u32 temp_1;
     u32 temp_2;
@@ -850,13 +797,10 @@ void daObj_Sekizoa_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-/* 80CD03C0-80CD03C8 002160 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::drawDbgInfo() {
     return 0;
 }
 
-/* 80CD03C8-80CD04FC 002168 0134+00 1/0 0/0 0/0 .text            drawOtherMdl__15daObj_Sekizoa_cFv
- */
 void daObj_Sekizoa_c::drawOtherMdl() {
     if (mType == TYPE_6) {
         J3DModel* mp_model = mpMorf[1]->getModel();
@@ -886,10 +830,7 @@ void daObj_Sekizoa_c::drawOtherMdl() {
     }
 }
 
-/* ############################################################################################## */
 
-/* 80CD04FC-80CD05D0 00229C 00D4+00 1/1 0/0 0/0 .text            setYariAnm__15daObj_Sekizoa_cFiif
- */
 int daObj_Sekizoa_c::setYariAnm(int i_frame, int i_mode, f32 i_morf) {
     static struct {
         u32 param_0;
@@ -938,7 +879,6 @@ int daObj_Sekizoa_c::setYariAnm(int i_frame, int i_mode, f32 i_morf) {
     return 1;
 }
 
-/* 80CD05D0-80CD06BC 002370 00EC+00 1/0 0/0 0/0 .text            drawGhost__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::drawGhost() {
     J3DModel* ghost_model = mpMorf[0]->getModel();
     if (mType == TYPE_6) {
@@ -954,7 +894,6 @@ void daObj_Sekizoa_c::drawGhost() {
     }
 }
 
-/* 80CD06BC-80CD0A84 00245C 03C8+00 2/0 0/0 0/0 .text afterSetMotionAnm__15daObj_Sekizoa_cFiifi */
 bool daObj_Sekizoa_c::afterSetMotionAnm(int i_frame, int i_mode, f32 i_morf, int param_3) {
     f32 var1;
     static struct {
@@ -1094,8 +1033,6 @@ bool daObj_Sekizoa_c::afterSetMotionAnm(int i_frame, int i_mode, f32 i_morf, int
     return 0;
 }
 
-/* 80CD0A84-80CD0B08 002824 0084+00 1/1 0/0 0/0 .text            selectAction__15daObj_Sekizoa_cFv
- */
 int daObj_Sekizoa_c::selectAction() {
     mInitFunc = NULL;
     switch (mType) {
@@ -1110,14 +1047,10 @@ int daObj_Sekizoa_c::selectAction() {
     return 1;
 }
 
-/* 80CD0B08-80CD0B34 0028A8 002C+00 1/1 0/0 0/0 .text
- * chkAction__15daObj_Sekizoa_cFM15daObj_Sekizoa_cFPCvPvPv_i */
 int daObj_Sekizoa_c::chkAction(actionFunc i_action) {
     return mExecuteFunc == i_action;
 }
 
-/* 80CD0B34-80CD0BDC 0028D4 00A8+00 2/2 0/0 0/0 .text
- * setAction__15daObj_Sekizoa_cFM15daObj_Sekizoa_cFPCvPvPv_i    */
 int daObj_Sekizoa_c::setAction(actionFunc i_action) {
     mMode = 3;
     if (mExecuteFunc != NULL) {
@@ -1132,9 +1065,7 @@ int daObj_Sekizoa_c::setAction(actionFunc i_action) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80CD0BDC-80CD0DE8 00297C 020C+00 1/1 0/0 0/0 .text checkMoveDirection__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::checkMoveDirection() {
     cXyz temp_vec;
     cXyz temp_vec2;
@@ -1166,7 +1097,6 @@ int daObj_Sekizoa_c::checkMoveDirection() {
     return 0;
 }
 
-/* 80CD0DE8-80CD0E30 002B88 0048+00 3/3 0/0 0/0 .text getWaitMotionNo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::getWaitMotionNo() {
     switch (mType) {
     case TYPE_0:
@@ -1179,7 +1109,6 @@ int daObj_Sekizoa_c::getWaitMotionNo() {
     return 0;
 }
 
-/* 80CD0E30-80CD0E78 002BD0 0048+00 4/4 0/0 0/0 .text getGameMotionNo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::getGameMotionNo() {
     switch (mType) {
     case TYPE_0:
@@ -1192,7 +1121,6 @@ int daObj_Sekizoa_c::getGameMotionNo() {
     return 0;
 }
 
-/* 80CD0E78-80CD0EAC 002C18 0034+00 1/1 0/0 0/0 .text getNoJumpMotionNo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::getNoJumpMotionNo() {
     switch (mType) {
     case TYPE_0:
@@ -1203,7 +1131,6 @@ int daObj_Sekizoa_c::getNoJumpMotionNo() {
     return -1;
 }
 
-/* 80CD0EAC-80CD0EE0 002C4C 0034+00 1/1 0/0 0/0 .text getHitMotionNo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::getHitMotionNo() {
     switch (mType) {
     case TYPE_0:
@@ -1214,7 +1141,6 @@ int daObj_Sekizoa_c::getHitMotionNo() {
     return -1;
 }
 
-/* 80CD0EE0-80CD0F14 002C80 0034+00 2/2 0/0 0/0 .text getStepMotionNo__15daObj_Sekizoa_cFv */
 int daObj_Sekizoa_c::getStepMotionNo() {
     switch (mType) {
     case TYPE_0:
@@ -1225,9 +1151,7 @@ int daObj_Sekizoa_c::getStepMotionNo() {
     return -1;
 }
 
-/* ############################################################################################## */
 
-/* 80CD0F14-80CD14D8 002CB4 05C4+00 2/2 0/0 0/0 .text            jump__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::jump() {
     cXyz temp_vec;
 
@@ -1338,9 +1262,7 @@ void daObj_Sekizoa_c::jump() {
     return;
 }
 
-/* ############################################################################################## */
 
-/* 80CD14D8-80CD1688 003278 01B0+00 2/2 0/0 0/0 .text            landing__15daObj_Sekizoa_cFv */
 void daObj_Sekizoa_c::landing() {
     mDoAud_seStart(Z2SE_SEKI_JUMP_LAND, 0, 0, 0);
     if (chkPressPlayer()) {
@@ -1358,9 +1280,7 @@ void daObj_Sekizoa_c::landing() {
     }
 }
 
-/* ############################################################################################## */
 
-/* 80CD1688-80CD2708 003428 1080+00 2/0 0/0 0/0 .text            cutStart__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutStart(int i_staffIdx) {
     cXyz c_stack_9c;
     csXyz c_stack_c8;
@@ -1771,7 +1691,6 @@ int daObj_Sekizoa_c::cutStart(int i_staffIdx) {
     return ret;
 }
 
-/* 80CD2708-80CD2908 0044A8 0200+00 1/0 0/0 0/0 .text            cutTurn__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutTurn(int i_staffIdx) {
     int ret = 0;
     int prm = -1;
@@ -1812,7 +1731,6 @@ int daObj_Sekizoa_c::cutTurn(int i_staffIdx) {
     return ret;
 }
 
-/* 80CD2908-80CD2B64 0046A8 025C+00 1/0 0/0 0/0 .text            cutJump__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutJump(int i_staffIdx) {
     daObj_Sekizoa_c* actor_3;
 
@@ -1875,7 +1793,6 @@ int daObj_Sekizoa_c::cutJump(int i_staffIdx) {
     return ret;
 }
 
-/* 80CD2B64-80CD376C 004904 0C08+00 3/0 0/0 0/0 .text            cutGoal__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutGoal(int i_staffIdx) {
     cXyz cStack_a8;
     csXyz cStack_b0;
@@ -2106,7 +2023,6 @@ int daObj_Sekizoa_c::cutGoal(int i_staffIdx) {
     return ret;
 }
 
-/* 80CD376C-80CD38F0 00550C 0184+00 1/0 0/0 0/0 .text            cutExit__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutExit(int i_staffIdx) {
     int var_r30 = 0;
     int prm = -1;
@@ -2157,7 +2073,6 @@ int daObj_Sekizoa_c::cutExit(int i_staffIdx) {
     return var_r30;
 }
 
-/* 80CD38F0-80CD3BD8 005690 02E8+00 1/0 0/0 0/0 .text            cutFree__15daObj_Sekizoa_cFi */
 int daObj_Sekizoa_c::cutFree(int i_staffIdx) {
     cXyz cStack_2c;
     csXyz cStack_34;
@@ -2234,10 +2149,7 @@ int daObj_Sekizoa_c::cutFree(int i_staffIdx) {
     return var_r30;
 }
 
-/* ############################################################################################## */
 
-/* 80CD3BD8-80CD3F08 005978 0330+00 1/0 0/0 0/0 .text            cutExtinction__15daObj_Sekizoa_cFi
- */
 int daObj_Sekizoa_c::cutExtinction(int i_staffIdx) {
     cXyz cStack_b0;
     char acStack_a4[100];
@@ -2319,7 +2231,6 @@ int daObj_Sekizoa_c::cutExtinction(int i_staffIdx) {
     return ret;
 }
 
-/* 80CD3F08-80CD425C 005CA8 0354+00 1/0 0/0 0/0 .text            wait__15daObj_Sekizoa_cFPv */
 int daObj_Sekizoa_c::wait(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2371,7 +2282,6 @@ int daObj_Sekizoa_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80CD425C-80CD45B0 005FFC 0354+00 1/0 0/0 0/0 .text            puzzle__15daObj_Sekizoa_cFPv */
 int daObj_Sekizoa_c::puzzle(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2447,7 +2357,6 @@ int daObj_Sekizoa_c::puzzle(void* param_0) {
     return 1;
 }
 
-/* 80CD45B0-80CD4778 006350 01C8+00 2/0 0/0 0/0 .text            talk__15daObj_Sekizoa_cFPv */
 int daObj_Sekizoa_c::talk(void* param_0) {
     switch (mMode) {
     case 0:
@@ -2481,43 +2390,34 @@ int daObj_Sekizoa_c::talk(void* param_0) {
     return 0;
 }
 
-/* 80CD4778-80CD4798 006518 0020+00 1/0 0/0 0/0 .text            daObj_Sekizoa_Create__FPv */
 static int daObj_Sekizoa_Create(void* i_this) {
     return static_cast<daObj_Sekizoa_c*>(i_this)->create();
 }
 
-/* 80CD4798-80CD47B8 006538 0020+00 1/0 0/0 0/0 .text            daObj_Sekizoa_Delete__FPv */
 static int daObj_Sekizoa_Delete(void* i_this) {
     return static_cast<daObj_Sekizoa_c*>(i_this)->Delete();
 }
 
-/* 80CD47B8-80CD47D8 006558 0020+00 1/0 0/0 0/0 .text            daObj_Sekizoa_Execute__FPv */
 static int daObj_Sekizoa_Execute(void* i_this) {
     return static_cast<daObj_Sekizoa_c*>(i_this)->Execute();
 }
 
-/* 80CD47D8-80CD47F8 006578 0020+00 1/0 0/0 0/0 .text            daObj_Sekizoa_Draw__FPv */
 static int daObj_Sekizoa_Draw(void* i_this) {
     return static_cast<daObj_Sekizoa_c*>(i_this)->Draw();
 }
 
-/* 80CD47F8-80CD4800 006598 0008+00 1/0 0/0 0/0 .text            daObj_Sekizoa_IsDelete__FPv */
 static int daObj_Sekizoa_IsDelete(void* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
 
-/* 80CD695C-80CD6960 000084 0004+00 0/1 0/0 0/0 .bss             l_HIO */
 static daObj_Sekizoa_Param_c l_HIO;
 
-/* 80CD671C-80CD673C -00001 0020+00 1/0 0/0 0/0 .data            daObj_Sekizoa_MethodTable */
 static actor_method_class daObj_Sekizoa_MethodTable = {
     daObj_Sekizoa_Create,   daObj_Sekizoa_Delete, daObj_Sekizoa_Execute,
     daObj_Sekizoa_IsDelete, daObj_Sekizoa_Draw,
 };
 
-/* 80CD673C-80CD676C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SEKIZOA */
 extern actor_process_profile_definition g_profile_OBJ_SEKIZOA = {
     fpcLy_CURRENT_e,             // mLayerID
     3,                           // mListID
diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp
index 1a6dec64a5..ba531cd92f 100644
--- a/src/d/actor/d_a_obj_shield.cpp
+++ b/src/d/actor/d_a_obj_shield.cpp
@@ -13,7 +13,6 @@
 #include "d/d_item_data.h"
 #include "cmath.h"
 
-/* 80CD8274-80CD82B8 000000 0044+00 5/5 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -28,8 +27,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80CD6A58-80CD6D54 000078 02FC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) {
     cM3dGPla acStack_3c;
     if (dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c)) {
@@ -42,13 +39,11 @@ static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) {
     return 0;
 }
 
-/* 80CD6D9C-80CD6DD8 0003BC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daItemShield_cFv */
 void daItemShield_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CD6DD8-80CD7094 0003F8 02BC+00 2/2 0/0 0/0 .text            setBaseMtx__14daItemShield_cFv */
 void daItemShield_c::setBaseMtx() {
     cLib_addCalcAngleS(&field_0x952, field_0x954, 3, 500, 100);
     if (field_0x950 > -9000 && field_0x954 > 0) {
@@ -78,7 +73,6 @@ void daItemShield_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CD7094-80CD724C 0006B4 01B8+00 1/1 0/0 0/0 .text            Create__14daItemShield_cFv */
 int daItemShield_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -106,12 +100,10 @@ int daItemShield_c::Create() {
     return 1;
 }
 
-/* 80CD724C-80CD7254 00086C 0008+00 1/0 0/0 0/0 .text            __CreateHeap__14daItemShield_cFv */
 int daItemShield_c::__CreateHeap() {
     return 1;
 }
 
-/* 80CD7254-80CD7420 000874 01CC+00 1/1 0/0 0/0 .text            create__14daItemShield_cFv */
 int daItemShield_c::create() {
     fopAcM_ct(this, daItemShield_c);
     m_itemNo = fpcNm_ITEM_WOOD_SHIELD;
@@ -137,7 +129,6 @@ int daItemShield_c::create() {
     return rv;
 }
 
-/* 80CD75EC-80CD7734 000C0C 0148+00 1/1 0/0 0/0 .text            bg_check__14daItemShield_cFv */
 void daItemShield_c::bg_check() {
     f32 dVar6 = 0.7f;
     if (mAcch.ChkWallHit()) {
@@ -162,7 +153,6 @@ void daItemShield_c::bg_check() {
     }
 }
 
-/* 80CD7734-80CD77F0 000D54 00BC+00 1/1 0/0 0/0 .text action_proc_call__14daItemShield_cFv */
 int daItemShield_c::action_proc_call() {
     static daItemShield_c::actionFunc l_actionFunc[4] = {
         &daItemShield_c::actionInit,
@@ -173,15 +163,12 @@ int daItemShield_c::action_proc_call() {
     return (this->*(l_actionFunc[mStatus]))();
 }
 
-/* 80CD77F0-80CD7828 000E10 0038+00 1/0 0/0 0/0 .text            actionInit__14daItemShield_cFv */
 int daItemShield_c::actionInit() {
     daItemBase_c::show();
     actionWaitInit();
     return 1;
 }
 
-/* 80CD7828-80CD7890 000E48 0068+00 2/2 0/0 0/0 .text            actionWaitInit__14daItemShield_cFv
- */
 int daItemShield_c::actionWaitInit() {
     mCcCyl.OffTgSPrmBit(1);
     mCcCyl.OnCoSPrmBit(1);
@@ -191,7 +178,6 @@ int daItemShield_c::actionWaitInit() {
     return 1;
 }
 
-/* 80CD7890-80CD7C68 000EB0 03D8+00 1/0 0/0 0/0 .text            actionWait__14daItemShield_cFv */
 int daItemShield_c::actionWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if ((player->checkWolfAttackReverse() || daPy_getPlayerActorClass()->checkFrontRollCrash()) &&
@@ -245,8 +231,6 @@ int daItemShield_c::actionWait() {
     return 1;
 }
 
-/* 80CD7C68-80CD7D04 001288 009C+00 1/1 0/0 0/0 .text initActionOrderGetDemo__14daItemShield_cFv
- */
 int daItemShield_c::initActionOrderGetDemo() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -261,7 +245,6 @@ int daItemShield_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 80CD7D04-80CD7D80 001324 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__14daItemShield_cFv */
 int daItemShield_c::actionOrderGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setStatus(STATUS_GETDEMO);
@@ -275,8 +258,6 @@ int daItemShield_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 80CD7D80-80CD7E00 0013A0 0080+00 1/0 0/0 0/0 .text            actionGetDemo__14daItemShield_cFv
- */
 int daItemShield_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGp_event_reset();
@@ -286,8 +267,6 @@ int daItemShield_c::actionGetDemo() {
     return 1;
 }
 
-/* 80CD7E00-80CD7EBC 001420 00BC+00 1/1 0/0 0/0 .text            event_proc_call__14daItemShield_cFv
- */
 void daItemShield_c::event_proc_call() {
     static daItemShield_c::camActionFunc l_func[4] = {
         &daItemShield_c::actionWaitCamDemo,
@@ -299,7 +278,6 @@ void daItemShield_c::event_proc_call() {
     (this->*(l_func[mAction]))();
 }
 
-/* 80CD7EBC-80CD7F20 0014DC 0064+00 1/0 0/0 0/0 .text actionWaitCamDemo__14daItemShield_cFv */
 void daItemShield_c::actionWaitCamDemo() {
     if (field_0x937) {
         setAction(ACTION_ORDER_CAM_DEMO);
@@ -309,7 +287,6 @@ void daItemShield_c::actionWaitCamDemo() {
     }
 }
 
-/* 80CD7F20-80CD7F88 001540 0068+00 1/0 0/0 0/0 .text actionOrderCamDemo__14daItemShield_cFv */
 void daItemShield_c::actionOrderCamDemo() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_CAM_DEMO);
@@ -320,8 +297,6 @@ void daItemShield_c::actionOrderCamDemo() {
     }
 }
 
-/* 80CD7F88-80CD7FE4 0015A8 005C+00 1/0 0/0 0/0 .text            actionCamDemo__14daItemShield_cFv
- */
 void daItemShield_c::actionCamDemo() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         setAction(ACTION_CAM_DEMO_END);
@@ -329,11 +304,9 @@ void daItemShield_c::actionCamDemo() {
     }
 }
 
-/* 80CD7FE4-80CD7FE8 001604 0004+00 1/0 0/0 0/0 .text actionCamDemoEnd__14daItemShield_cFv */
 void daItemShield_c::actionCamDemoEnd() {
 }
 
-/* 80CD7FE8-80CD80EC 001608 0104+00 1/1 0/0 0/0 .text            execute__14daItemShield_cFv */
 int daItemShield_c::execute() {
     field_0x938 = speed;
     mRotAngleCoeff++;
@@ -353,7 +326,6 @@ int daItemShield_c::execute() {
     return 1;
 }
 
-/* 80CD80EC-80CD8140 00170C 0054+00 1/1 0/0 0/0 .text            draw__14daItemShield_cFv */
 int daItemShield_c::draw() {
     if (!daItemBase_c::chkDraw()) {
         return 1;
@@ -363,34 +335,27 @@ int daItemShield_c::draw() {
     return 1;
 }
 
-/* 80CD8140-80CD8178 001760 0038+00 1/1 0/0 0/0 .text            _delete__14daItemShield_cFv */
 int daItemShield_c::_delete() {
     daItemBase_c::DeleteBase(dItem_data::getFieldArc(m_itemNo));
     return 1;
 }
 
-/* 80CD8178-80CD8198 001798 0020+00 1/0 0/0 0/0 .text daItemShield_Draw__FP14daItemShield_c */
 static int daItemShield_Draw(daItemShield_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CD8198-80CD81B8 0017B8 0020+00 1/0 0/0 0/0 .text daItemShield_Execute__FP14daItemShield_c */
 static int daItemShield_Execute(daItemShield_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CD81B8-80CD81D8 0017D8 0020+00 1/0 0/0 0/0 .text daItemShield_Delete__FP14daItemShield_c */
 static int daItemShield_Delete(daItemShield_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80CD81D8-80CD81F8 0017F8 0020+00 1/0 0/0 0/0 .text            daItemShield_Create__FP10fopAc_ac_c
- */
 static int daItemShield_Create(fopAc_ac_c* i_this) {
     return static_cast<daItemShield_c*>(i_this)->create();
 }
 
-/* 80CD841C-80CD843C -00001 0020+00 1/0 0/0 0/0 .data            l_daItemShield_Method */
 static actor_method_class l_daItemShield_Method = {
     (process_method_func)daItemShield_Create,
     (process_method_func)daItemShield_Delete,
@@ -399,7 +364,6 @@ static actor_method_class l_daItemShield_Method = {
     (process_method_func)daItemShield_Draw,
 };
 
-/* 80CD843C-80CD846C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Shield */
 extern actor_process_profile_definition g_profile_Obj_Shield = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp
index 26e2b0f905..18e6ec5186 100644
--- a/src/d/actor/d_a_obj_sm_door.cpp
+++ b/src/d/actor/d_a_obj_sm_door.cpp
@@ -12,22 +12,17 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_e_pm.h"
 
-/* 80CD968C-80CD9690 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "sm_door";
 
-/* 80CD85B8-80CD85D8 000078 0020+00 1/0 0/0 0/0 .text            daObjSM_DOOR_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObjSM_DOOR_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjSM_DOOR_c*>(i_this)->create();
 }
 
-/* 80CD85D8-80CD85FC 000098 0024+00 1/0 0/0 0/0 .text daObjSM_DOOR_Delete__FP14daObjSM_DOOR_c */
 static int daObjSM_DOOR_Delete(daObjSM_DOOR_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80CD85FC-80CD8784 0000BC 0188+00 1/1 0/0 0/0 .text            s_obj_sub__FPvPv */
 static void* s_obj_sub(void* i_actor, void* i_this) {
     fopAc_ac_c* actor = static_cast<fopAc_ac_c*>(i_actor);
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
@@ -41,7 +36,6 @@ static void* s_obj_sub(void* i_actor, void* i_this) {
     return NULL;
 }
 
-/* 80CD8784-80CD8790 000244 000C+00 1/1 0/0 0/0 .text            ChangeModel__14daObjSM_DOOR_cFv */
 void daObjSM_DOOR_c::ChangeModel() {
     mUseAlphaModel = true;
 }
@@ -50,7 +44,6 @@ f32 dummy_literal() {
     return 1000.0f;
 }
 
-/* 80CD8790-80CD8A40 000250 02B0+00 1/1 0/0 0/0 .text            Action__14daObjSM_DOOR_cFv */
 void daObjSM_DOOR_c::Action() {
     switch (mMode) {
     case 0: {
@@ -94,7 +87,6 @@ void daObjSM_DOOR_c::Action() {
     }
 }
 
-/* 80CD8A40-80CD8A90 000500 0050+00 2/2 0/0 0/0 .text            SetDzb__14daObjSM_DOOR_cFv */
 int daObjSM_DOOR_c::SetDzb() {
     if (mpBgW != NULL && dComIfG_Bgsp().Regist(mpBgW, this)) {
         return 0;
@@ -102,7 +94,6 @@ int daObjSM_DOOR_c::SetDzb() {
     return 1;
 }
 
-/* 80CD8A90-80CD8AF8 000550 0068+00 3/3 0/0 0/0 .text            ReleaceDzb__14daObjSM_DOOR_cFv */
 int daObjSM_DOOR_c::ReleaceDzb() {
     if (mpBgW != NULL && mpBgW->ChkUsed() && dComIfG_Bgsp().Release(mpBgW)) {
         return 0;
@@ -110,7 +101,6 @@ int daObjSM_DOOR_c::ReleaceDzb() {
     return 1;
 }
 
-/* 80CD8AF8-80CD8BBC 0005B8 00C4+00 1/1 0/0 0/0 .text            DrawChk1__14daObjSM_DOOR_cFv */
 void daObjSM_DOOR_c::DrawChk1() {
     if (mSwBit != 0xff && dComIfGs_isSwitch(mSwBit, fopAcM_GetRoomNo(this)) && mActive == false) {
         if (SetDzb()) {
@@ -124,7 +114,6 @@ void daObjSM_DOOR_c::DrawChk1() {
     }
 }
 
-/* 80CD8BBC-80CD8C80 00067C 00C4+00 1/1 0/0 0/0 .text            DrawChk2__14daObjSM_DOOR_cFv */
 void daObjSM_DOOR_c::DrawChk2() {
     if (mSwBit != 0xff && !dComIfGs_isSwitch(mSwBit, fopAcM_GetRoomNo(this)) && mActive == false) {
         if (SetDzb()) {
@@ -138,7 +127,6 @@ void daObjSM_DOOR_c::DrawChk2() {
     }
 }
 
-/* 80CD8C80-80CD8D00 000740 0080+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjSM_DOOR_cFv */
 void daObjSM_DOOR_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -150,17 +138,14 @@ void daObjSM_DOOR_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CD8D00-80CD8D2C 0007C0 002C+00 1/0 0/0 0/0 .text daObjSM_DOOR_Draw__FP14daObjSM_DOOR_c */
 static int daObjSM_DOOR_Draw(daObjSM_DOOR_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CD8D2C-80CD8D4C 0007EC 0020+00 2/1 0/0 0/0 .text daObjSM_DOOR_Execute__FP14daObjSM_DOOR_c */
 static int daObjSM_DOOR_Execute(daObjSM_DOOR_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CD90A4-80CD9258 000B64 01B4+00 1/0 0/0 0/0 .text            CreateHeap__14daObjSM_DOOR_cFv */
 inline int daObjSM_DOOR_c::CreateHeap() {
     J3DModelData* model_data;
     J3DModelData* alpha_model_data;
@@ -189,7 +174,6 @@ inline int daObjSM_DOOR_c::CreateHeap() {
     return 1;
 }
 
-/* 80CD8D4C-80CD902C 00080C 02E0+00 1/1 0/0 0/0 .text            create__14daObjSM_DOOR_cFv */
 cPhs__Step daObjSM_DOOR_c::create() {
     fopAcM_ct(this, daObjSM_DOOR_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhase, l_arcName);
@@ -239,19 +223,15 @@ cPhs__Step daObjSM_DOOR_c::create() {
     return step;
 }
 
-/* 80CD909C-80CD90A4 000B5C 0008+00 1/0 0/0 0/0 .text daObjSM_DOOR_IsDelete__FP14daObjSM_DOOR_c */
 static int daObjSM_DOOR_IsDelete(daObjSM_DOOR_c* i_this) {
     return 1;
 }
 
-/* 80CD9258-80CD929C 000D18 0044+00 1/0 0/0 0/0 .text            Create__14daObjSM_DOOR_cFv */
 inline int daObjSM_DOOR_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CD929C-80CD930C 000D5C 0070+00 1/0 0/0 0/0 .text            Execute__14daObjSM_DOOR_cFPPA3_A4_f
- */
 inline int daObjSM_DOOR_c::Execute(Mtx** i_mtxP) {
     if (mSwType == 0xF) {
         DrawChk1();
@@ -265,7 +245,6 @@ inline int daObjSM_DOOR_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80CD930C-80CD9544 000DCC 0238+00 1/0 0/0 0/0 .text            Draw__14daObjSM_DOOR_cFv */
 inline int daObjSM_DOOR_c::Draw() {
     if (mActive) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -300,13 +279,11 @@ inline int daObjSM_DOOR_c::Draw() {
     return 1;
 }
 
-/* 80CD9544-80CD9578 001004 0034+00 1/0 0/0 0/0 .text            Delete__14daObjSM_DOOR_cFv */
 inline int daObjSM_DOOR_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80CD9690-80CD96B0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSM_DOOR_Method */
 static actor_method_class l_daObjSM_DOOR_Method = {
     (process_method_func)daObjSM_DOOR_Create,
     (process_method_func)daObjSM_DOOR_Delete,
@@ -315,7 +292,6 @@ static actor_method_class l_daObjSM_DOOR_Method = {
     (process_method_func)daObjSM_DOOR_Draw,
 };
 
-/* 80CD96B0-80CD96E0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SM_DOOR */
 extern actor_process_profile_definition g_profile_Obj_SM_DOOR = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp
index 84405765f8..9e78e78c40 100644
--- a/src/d/actor/d_a_obj_smallkey.cpp
+++ b/src/d/actor/d_a_obj_smallkey.cpp
@@ -12,7 +12,6 @@
 #include "d/d_tresure.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80CDB7F4-80CDB838 000000 0044+00 6/6 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -27,7 +26,6 @@ const static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80CD97B8-80CD9B40 000078 0388+00 1/1 0/0 0/0 .text            searchParentSub__FPvPv */
 static void* searchParentSub(void* i_actor, void* i_data) {
     fopAc_ac_c* a_actor = (fopAc_ac_c*)i_actor;
     fopAc_ac_c* a_other = (fopAc_ac_c*)i_data;
@@ -56,8 +54,6 @@ static void* searchParentSub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80CD9B40-80CD9E3C 000400 02FC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_polyinfo, f32 i_scale) {
     cM3dGPla plane;
 
@@ -73,8 +69,6 @@ static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_polyinfo, f32 i_scale) {
     return 0.0f;
 }
 
-/* 80CD9E84-80CD9EE0 000744 005C+00 1/1 0/0 0/0 .text
- * keyGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void keyGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
                              fopAc_ac_c* i_atActor, dCcD_GObjInf* i_atObjInf) {
     daKey_c* a_tgActor = (daKey_c*)i_tgActor;
@@ -86,8 +80,6 @@ static void keyGetTgCallBack(fopAc_ac_c* i_tgActor, dCcD_GObjInf* i_tgObjInf,
     }
 }
 
-/* 80CD9EE0-80CD9F2C 0007A0 004C+00 1/1 0/0 0/0 .text
- * keyGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void keyGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
                              fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) {
     daKey_c* a_coActorA = (daKey_c*)i_coActorA;
@@ -99,13 +91,11 @@ static void keyGetCoCallBack(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA,
     }
 }
 
-/* 80CD9F2C-80CD9F68 0007EC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__7daKey_cFv */
 void daKey_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CD9F68-80CD9FDC 000828 0074+00 2/2 0/0 0/0 .text            setBaseMtx__7daKey_cFv */
 void daKey_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::transM(0.0f, 5.0f, 0.0f);
@@ -114,7 +104,6 @@ void daKey_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CD9FDC-80CDA15C 00089C 0180+00 1/1 0/0 0/0 .text            Create__7daKey_cFv */
 int daKey_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -144,12 +133,10 @@ int daKey_c::Create() {
     return 1;
 }
 
-/* 80CDA15C-80CDA164 000A1C 0008+00 1/0 0/0 0/0 .text            __CreateHeap__7daKey_cFv */
 int daKey_c::__CreateHeap() {
     return 1;
 }
 
-/* 80CDA164-80CDA404 000A24 02A0+00 1/1 0/0 0/0 .text            create__7daKey_cFv */
 int daKey_c::create() {
     fopAcM_ct(this, daKey_c);
 
@@ -194,7 +181,6 @@ int daKey_c::create() {
     return phase_state;
 }
 
-/* 80CDA680-80CDA7E8 000F40 0168+00 1/1 0/0 0/0 .text            bg_check__7daKey_cFv */
 void daKey_c::bg_check() {
     f32 temp_f31 = 0.7f;
 
@@ -221,7 +207,6 @@ void daKey_c::bg_check() {
     }
 }
 
-/* 80CDA7E8-80CDA81C 0010A8 0034+00 1/1 0/0 0/0 .text            actionInitInit__7daKey_cFv */
 int daKey_c::actionInitInit() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -230,7 +215,6 @@ int daKey_c::actionInitInit() {
     return 1;
 }
 
-/* 80CDA81C-80CDA8C8 0010DC 00AC+00 1/0 0/0 0/0 .text            actionInit__7daKey_cFv */
 int daKey_c::actionInit() {
     void* pparent = fpcM_Search(searchParentSub, this);
     if (pparent != NULL) {
@@ -250,7 +234,6 @@ int daKey_c::actionInit() {
     return 1;
 }
 
-/* 80CDA8C8-80CDA8FC 001188 0034+00 1/1 0/0 0/0 .text            actionParentWaitInit__7daKey_cFv */
 int daKey_c::actionParentWaitInit() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -259,7 +242,6 @@ int daKey_c::actionParentWaitInit() {
     return 1;
 }
 
-/* 80CDA8FC-80CDA9AC 0011BC 00B0+00 1/0 0/0 0/0 .text            actionParentWait__7daKey_cFv */
 int daKey_c::actionParentWait() {
     fopAc_ac_c* pparent = (fopAc_ac_c*)fopAcM_SearchByID(parentActorID);
     if (pparent == NULL) {
@@ -275,7 +257,6 @@ int daKey_c::actionParentWait() {
     return 1;
 }
 
-/* 80CDA9AC-80CDAA28 00126C 007C+00 3/3 0/0 1/1 .text            actionWaitInit__7daKey_cFv */
 int daKey_c::actionWaitInit() {
     mCcCyl.OnTgSPrmBit(1);
     mCcCyl.OffCoSPrmBit(1);
@@ -288,7 +269,6 @@ int daKey_c::actionWaitInit() {
     return 1;
 }
 
-/* 80CDAA28-80CDAB74 0012E8 014C+00 1/0 0/0 0/0 .text            actionWait__7daKey_cFv */
 int daKey_c::actionWait() {
     fopAcM_posMoveF(this, mCcStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
@@ -327,8 +307,6 @@ int daKey_c::actionWait() {
     return 1;
 }
 
-/* 80CDAB74-80CDAC18 001434 00A4+00 2/2 0/0 0/0 .text            initActionOrderGetDemo__7daKey_cFv
- */
 int daKey_c::initActionOrderGetDemo() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -346,7 +324,6 @@ int daKey_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 80CDAC18-80CDAC94 0014D8 007C+00 1/0 0/0 0/0 .text            actionOrderGetDemo__7daKey_cFv */
 int daKey_c::actionOrderGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setStatus(STATUS_GET_DEMO_e);
@@ -361,7 +338,6 @@ int daKey_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 80CDAC94-80CDAD28 001554 0094+00 1/0 0/0 0/0 .text            actionGetDemo__7daKey_cFv */
 int daKey_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         dComIfGs_onTbox(getSaveBitNo());
@@ -373,7 +349,6 @@ int daKey_c::actionGetDemo() {
     return 1;
 }
 
-/* 80CDAD28-80CDADD4 0015E8 00AC+00 1/1 0/0 0/0 .text            actionInitSwOnWait__7daKey_cFv */
 int daKey_c::actionInitSwOnWait() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -394,7 +369,6 @@ int daKey_c::actionInitSwOnWait() {
     return 1;
 }
 
-/* 80CDADD4-80CDAE54 001694 0080+00 1/0 0/0 0/0 .text            actionSwOnWait__7daKey_cFv */
 int daKey_c::actionSwOnWait() {
     if (fopAcM_isSwitch(this, getSwNo()) && cLib_calcTimer<u8>(&mSwOnTimer) == 0) {
         show();
@@ -405,7 +379,6 @@ int daKey_c::actionSwOnWait() {
     return 1;
 }
 
-/* 80CDAE54-80CDAF40 001714 00EC+00 1/1 0/0 0/0 .text actionInitBoomerangCarry__7daKey_cFv */
 int daKey_c::actionInitBoomerangCarry() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OnTgSPrmBit(1);
@@ -422,7 +395,6 @@ int daKey_c::actionInitBoomerangCarry() {
     return 1;
 }
 
-/* 80CDAF40-80CDAFB4 001800 0074+00 1/0 0/0 0/0 .text            actionBoomerangCarry__7daKey_cFv */
 int daKey_c::actionBoomerangCarry() {
     fopAc_ac_c* pboomerang = fopAcM_SearchByName(PROC_BOOMERANG);
     if (pboomerang != NULL) {
@@ -438,7 +410,6 @@ int daKey_c::actionBoomerangCarry() {
     return 1;
 }
 
-/* 80CDAFB4-80CDB0D8 001874 0124+00 2/2 0/0 0/0 .text            effectSet__7daKey_cFv */
 void daKey_c::effectSet() {
     if (mEffect[0].getEmitter() == NULL) {
         cXyz eff_scale[] = {  // needs to be an array to match...
@@ -452,13 +423,11 @@ void daKey_c::effectSet() {
     }
 }
 
-/* 80CDB0D8-80CDB128 001998 0050+00 2/2 0/0 0/0 .text            effectStop__7daKey_cFv */
 void daKey_c::effectStop() {
     mEffect[0].remove();
     mEffect[1].remove();
 }
 
-/* 80CDB128-80CDB2E0 0019E8 01B8+00 1/1 0/0 0/0 .text            effectCtrl__7daKey_cFv */
 void daKey_c::effectCtrl() {
     cXyz eff_scale;
     f32 cam_dist = current.pos.abs(dComIfGp_getCamera(0)->lookat.eye);
@@ -491,15 +460,12 @@ void daKey_c::effectCtrl() {
     }
 }
 
-/* 80CDB2E0-80CDB36C 001BA0 008C+00 5/5 0/0 0/0 .text            seStartTwinkle_private__7daKey_cFUl
- */
 void daKey_c::seStartTwinkle_private(u32 i_soundId) {
     if (field_0x984 == 0) {
         fopAcM_seStartLevel(this, i_soundId, 0);
     }
 }
 
-/* 80CDB36C-80CDB3D8 001C2C 006C+00 1/1 0/0 0/0 .text            actionInitE_GB__7daKey_cFv */
 int daKey_c::actionInitE_GB() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mCcCyl.OffTgSPrmBit(1);
@@ -511,13 +477,11 @@ int daKey_c::actionInitE_GB() {
     return 1;
 }
 
-/* 80CDB3D8-80CDB404 001C98 002C+00 1/0 0/0 0/0 .text            actionE_GB__7daKey_cFv */
 int daKey_c::actionE_GB() {
     seStartTwinkle_private(Z2SE_OBJ_KEY_TWINKLE_HIDDEN);
     return 1;
 }
 
-/* 80CDB404-80CDB5D4 001CC4 01D0+00 2/2 0/0 0/0 .text            execute__7daKey_cFv */
 int daKey_c::execute() {
     static int (daKey_c::*l_demoFunc[])() = {
         &daKey_c::actionInit,
@@ -549,7 +513,6 @@ int daKey_c::execute() {
     return 1;
 }
 
-/* 80CDB5D4-80CDB628 001E94 0054+00 1/1 0/0 0/0 .text            draw__7daKey_cFv */
 int daKey_c::draw() {
     if (!chkDraw()) {
         return 1;
@@ -559,36 +522,30 @@ int daKey_c::draw() {
     return 1;
 }
 
-/* 80CDB628-80CDB674 001EE8 004C+00 1/1 0/0 0/0 .text            _delete__7daKey_cFv */
 int daKey_c::_delete() {
     effectStop();
     DeleteBase(dItem_data::getFieldArc(m_itemNo));
     return 1;
 }
 
-/* 80CDB674-80CDB694 001F34 0020+00 1/0 0/0 0/0 .text            daKey_Draw__FP7daKey_c */
 static int daKey_Draw(daKey_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CDB694-80CDB6B4 001F54 0020+00 1/0 0/0 0/0 .text            daKey_Execute__FP7daKey_c */
 static int daKey_Execute(daKey_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CDB6B4-80CDB6D4 001F74 0020+00 1/0 0/0 0/0 .text            daKey_Delete__FP7daKey_c */
 static int daKey_Delete(daKey_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80CDB6D4-80CDB6F4 001F94 0020+00 1/0 0/0 0/0 .text            daKey_Create__FP10fopAc_ac_c */
 static int daKey_Create(fopAc_ac_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return ((daKey_c*)i_this)->create();
 }
 
-/* 80CDB988-80CDB9A8 -00001 0020+00 1/0 0/0 0/0 .data            l_daKey_Method */
 static actor_method_class l_daKey_Method = {
     (process_method_func)daKey_Create,
     (process_method_func)daKey_Delete,
@@ -597,7 +554,6 @@ static actor_method_class l_daKey_Method = {
     (process_method_func)daKey_Draw,
 };
 
-/* 80CDB9A8-80CDB9D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SmallKey */
 extern actor_process_profile_definition g_profile_Obj_SmallKey = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp
index 0b48e94b0d..9ed31d198c 100644
--- a/src/d/actor/d_a_obj_smgdoor.cpp
+++ b/src/d/actor/d_a_obj_smgdoor.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_meter2_info.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
 #ifdef DEBUG
 class daObjSmgDoor_HIO_c : public mDoHIO_entry_c {
@@ -35,14 +34,12 @@ void daObjSmgDoor_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80CDBB38-80CDBB5C 000078 0024+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* a_this, int param_1) {
     daObjSmgDoor_c* i_this = (daObjSmgDoor_c*)a_this;
     i_this->sceneChange();
     return 1;
 }
 
-/* 80CDBB5C-80CDBBEC 00009C 0090+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::initBaseMtx() {
     mpModel[0]->setBaseScale(scale);
     mpModel[1]->setBaseScale(scale);
@@ -52,7 +49,6 @@ void daObjSmgDoor_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CDBBEC-80CDBD38 00012C 014C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::setBaseMtx() {
     cXyz cStack_18(-145.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::YrotS(current.angle.y);
@@ -74,31 +70,25 @@ void daObjSmgDoor_c::setBaseMtx() {
     cMtx_copy(field_0x5b8, mBgMtx);
 }
 
-/* 80CDCCE4-80CDCCEC -00001 0008+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {"A_SMGDoor", "A_SMKDoor"};
 
-/* 80CDCCEC-80CDCCF4 -00001 0008+00 1/1 0/0 0/0 .data            l_bmd */
 static char* l_bmd[2] = {
     "A_SMGDoor.bmd",
     "A_SMKDoor.bmd",
 };
 
-/* 80CDCCF4-80CDCCFC -00001 0008+00 1/1 0/0 0/0 .data            l_dzb */
 static char* l_dzb[2] = {
     "A_SMGDoor.dzb",
     "A_SMKDoor.dzb",
 };
 
-/* 80CDCCFC-80CDCD04 -00001 0008+00 0/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName[2] = {
     "NOW_DOOR_IN",
     "OLD_DOOR_IN",
 };
 
-/* 80CDCD04-80CDCD1C 000040 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {{-200.0f, 0.0f, -50.0f}, {200.0f, 400.0f, 50.0f}};
 
-/* 80CDBD38-80CDBE1C 000278 00E4+00 1/0 0/0 0/0 .text            Create__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, field_0x5b8);
@@ -116,7 +106,6 @@ int daObjSmgDoor_c::Create() {
     return 1;
 }
 
-/* 80CDBE1C-80CDBED4 00035C 00B8+00 1/0 0/0 0/0 .text            CreateHeap__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
     JUT_ASSERT(252, modelData != NULL);
@@ -130,7 +119,6 @@ int daObjSmgDoor_c::CreateHeap() {
     return 1;
 }
 
-/* 80CDBED4-80CDBFA4 000414 00D0+00 1/1 0/0 0/0 .text            create1st__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::create1st() {
     mType = getType();
     int phase = dComIfG_resLoad(&mPhase, l_arcName[mType]);
@@ -152,8 +140,6 @@ int daObjSmgDoor_c::create1st() {
     return phase;
 }
 
-/* 80CDBFA4-80CDBFF0 0004E4 004C+00 1/0 0/0 0/0 .text            Execute__14daObjSmgDoor_cFPPA3_A4_f
- */
 int daObjSmgDoor_c::Execute(Mtx** param_0) {
     event_proc_call();
     *param_0 = &mBgMtx;
@@ -161,8 +147,6 @@ int daObjSmgDoor_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CDBFF0-80CDC038 000530 0048+00 1/1 0/0 0/0 .text            getDemoAction__14daObjSmgDoor_cFv
- */
 int daObjSmgDoor_c::getDemoAction() {
     static char* action_table[6] = {
         "WAIT", "OPEN", "SETGOAL", "SETPOS", "SCENE_CHG", "COLOR_CHG",
@@ -171,7 +155,6 @@ int daObjSmgDoor_c::getDemoAction() {
     return dComIfGp_evmng_getMyActIdx(mStaffId, action_table, 6, 0, 0);
 }
 
-/* 80CDC038-80CDC248 000578 0210+00 1/1 0/0 0/0 .text            demoProc__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::demoProc() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     mStaffId = dComIfGp_evmng_getMyStaffId("smgdoor", 0, 0);
@@ -229,7 +212,6 @@ int daObjSmgDoor_c::demoProc() {
     return 0;
 }
 
-/* 80CDC248-80CDC378 000788 0130+00 1/1 0/0 0/0 .text            openInit__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::openInit() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -249,7 +231,6 @@ int daObjSmgDoor_c::openInit() {
     return 1;
 }
 
-/* 80CDC378-80CDC4AC 0008B8 0134+00 1/1 0/0 0/0 .text            openProc__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::openProc() {
     int ret = 0;
     cLib_chaseS(&field_0x5ee, 0x3c, 3);
@@ -275,7 +256,6 @@ int daObjSmgDoor_c::openProc() {
     return ret;
 }
 
-/* 80CDC4AC-80CDC548 0009EC 009C+00 1/1 0/0 0/0 .text            setGoal__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::setGoal() {
     cXyz cStack_18(0.0f, 0.0f, 60.0f);
 
@@ -289,7 +269,6 @@ void daObjSmgDoor_c::setGoal() {
     dComIfGp_evmng_setGoal(&cStack_18);
 }
 
-/* 80CDC548-80CDC610 000A88 00C8+00 1/1 0/0 0/0 .text            setPos__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::setPos() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz acStack_28(0.0f, 0.0f, 300.0f);
@@ -305,7 +284,6 @@ void daObjSmgDoor_c::setPos() {
     return;
 }
 
-/* 80CDC610-80CDC65C 000B50 004C+00 2/2 0/0 0/0 .text            sceneChange__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::sceneChange() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     player->onSceneChangeArea(getNextSceneID(), 0xff, 0);
@@ -313,8 +291,6 @@ void daObjSmgDoor_c::sceneChange() {
     OS_REPORT("現在＆過去の扉：シーン切替先<%d>\n", getNextSceneID());
 }
 
-/* 80CDC65C-80CDC700 000B9C 00A4+00 1/1 0/0 0/0 .text            event_proc_call__14daObjSmgDoor_cFv
- */
 void daObjSmgDoor_c::event_proc_call() {
     static actionFunc l_func[] = {&daObjSmgDoor_c::actionWaitEvent, &daObjSmgDoor_c::actionEvent,
                                   &daObjSmgDoor_c::actionDead};
@@ -322,8 +298,6 @@ void daObjSmgDoor_c::event_proc_call() {
     (this->*(l_func[mAction]))();
 }
 
-/* 80CDC700-80CDC790 000C40 0090+00 1/0 0/0 0/0 .text            actionWaitEvent__14daObjSmgDoor_cFv
- */
 void daObjSmgDoor_c::actionWaitEvent() {
     if (eventInfo.checkCommandDoor()) {
         attention_info.position.y = home.pos.y;
@@ -342,17 +316,14 @@ void daObjSmgDoor_c::actionWaitEvent() {
     }
 }
 
-/* 80CDC790-80CDC7F4 000CD0 0064+00 1/0 0/0 0/0 .text            actionEvent__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::actionEvent() {
     dMeter2Info_onGameStatus(2);
     dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0);
     demoProc();
 }
 
-/* 80CDC7F4-80CDC7F8 000D34 0004+00 1/0 0/0 0/0 .text            actionDead__14daObjSmgDoor_cFv */
 void daObjSmgDoor_c::actionDead() {}
 
-/* 80CDC7F8-80CDC974 000D38 017C+00 1/1 0/0 0/0 .text            checkArea__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::checkArea() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz player_to_door_vec;
@@ -386,7 +357,6 @@ int daObjSmgDoor_c::checkArea() {
     return 1;
 }
 
-/* 80CDC974-80CDCA00 000EB4 008C+00 1/1 0/0 0/0 .text            checkOpen__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::checkOpen() {
     if (getSwbit() != 0xff) {
         if (fopAcM_isSwitch(this, getSwbit()) == 0) {
@@ -405,7 +375,6 @@ int daObjSmgDoor_c::checkOpen() {
     return 1;
 }
 
-/* 80CDCA00-80CDCAC4 000F40 00C4+00 1/0 0/0 0/0 .text            Draw__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[0], &tevStr);
@@ -424,7 +393,6 @@ int daObjSmgDoor_c::Draw() {
     return 1;
 }
 
-/* 80CDCAC4-80CDCB04 001004 0040+00 1/0 0/0 0/0 .text            Delete__14daObjSmgDoor_cFv */
 int daObjSmgDoor_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mType]);
 #ifdef DEBUG
@@ -433,40 +401,29 @@ int daObjSmgDoor_c::Delete() {
     return 1;
 }
 
-/* 80CDCB04-80CDCB64 001044 0060+00 1/0 0/0 0/0 .text daObjSmgDoor_create1st__FP14daObjSmgDoor_c
- */
 static int daObjSmgDoor_create1st(daObjSmgDoor_c* i_this) {
     fopAcM_ct(i_this, daObjSmgDoor_c);
     return i_this->create1st();
 }
 
-/* 80CDCB64-80CDCB84 0010A4 0020+00 1/0 0/0 0/0 .text
- * daObjSmgDoor_MoveBGDelete__FP14daObjSmgDoor_c                */
 static int daObjSmgDoor_MoveBGDelete(daObjSmgDoor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CDCB84-80CDCBA4 0010C4 0020+00 1/0 0/0 0/0 .text
- * daObjSmgDoor_MoveBGExecute__FP14daObjSmgDoor_c               */
 static int daObjSmgDoor_MoveBGExecute(daObjSmgDoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CDCBA4-80CDCBD0 0010E4 002C+00 1/0 0/0 0/0 .text daObjSmgDoor_MoveBGDraw__FP14daObjSmgDoor_c
- */
 static int daObjSmgDoor_MoveBGDraw(daObjSmgDoor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80CDCD7C-80CDCD9C -00001 0020+00 1/0 0/0 0/0 .data            daObjSmgDoor_METHODS */
 static actor_method_class daObjSmgDoor_METHODS = {
     (process_method_func)daObjSmgDoor_create1st,     (process_method_func)daObjSmgDoor_MoveBGDelete,
     (process_method_func)daObjSmgDoor_MoveBGExecute, 0,
     (process_method_func)daObjSmgDoor_MoveBGDraw,
 };
 
-/* 80CDCD9C-80CDCDCC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SmgDoor */
 extern actor_process_profile_definition g_profile_Obj_SmgDoor = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp
index d7fd9ea381..d23c8acbb4 100644
--- a/src/d/actor/d_a_obj_smoke.cpp
+++ b/src/d/actor/d_a_obj_smoke.cpp
@@ -8,18 +8,15 @@
 #include "d/actor/d_a_obj_smoke.h"
 #include "d/d_procname.h"
 
-/* 80CDCE78-80CDCE98 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjSmoke_cFv */
 void daObjSmoke_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CDCE98-80CDCEF0 000098 0058+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjSmoke_cFv */
 void daObjSmoke_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80CDCEF0-80CDCF9C 0000F0 00AC+00 1/1 0/0 0/0 .text            Create__12daObjSmoke_cFv */
 int daObjSmoke_c::Create() {
     initBaseMtx();
 
@@ -31,7 +28,6 @@ int daObjSmoke_c::Create() {
     return 1;
 }
 
-/* 80CDCF9C-80CDD004 00019C 0068+00 1/1 0/0 0/0 .text            create__12daObjSmoke_cFv */
 int daObjSmoke_c::create() {
     fopAcM_ct(this, daObjSmoke_c);
     if (Create() == 0) {
@@ -40,7 +36,6 @@ int daObjSmoke_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CDD004-80CDD0B8 000204 00B4+00 1/1 0/0 0/0 .text            execute__12daObjSmoke_cFv */
 int daObjSmoke_c::execute() {
     if (fopAcM_isSwitch(this, getSwbit()) && !mParticle) {
         mParticle = dComIfGp_particle_set(0x85A6, &current.pos, &current.angle, &scale, 255, NULL,
@@ -50,7 +45,6 @@ int daObjSmoke_c::execute() {
     return 1;
 }
 
-/* 80CDD0B8-80CDD0F8 0002B8 0040+00 1/1 0/0 0/0 .text            _delete__12daObjSmoke_cFv */
 int daObjSmoke_c::_delete() {
     if (mParticle) {
         mParticle->quitImmortalEmitter();
@@ -60,32 +54,24 @@ int daObjSmoke_c::_delete() {
     return 1;
 }
 
-/* 80CDD0F8-80CDD118 0002F8 0020+00 1/0 0/0 0/0 .text daObjSmoke_Execute__FP12daObjSmoke_c */
 static int daObjSmoke_Execute(daObjSmoke_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CDD118-80CDD138 000318 0020+00 1/0 0/0 0/0 .text            daObjSmoke_Delete__FP12daObjSmoke_c
- */
 static int daObjSmoke_Delete(daObjSmoke_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80CDD138-80CDD158 000338 0020+00 1/0 0/0 0/0 .text            daObjSmoke_Create__FP10fopAc_ac_c
- */
 static int daObjSmoke_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjSmoke_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80CDD164-80CDD184 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSmoke_Method */
 static actor_method_class l_daObjSmoke_Method = {
     (process_method_func)daObjSmoke_Create,
     (process_method_func)daObjSmoke_Delete,
     (process_method_func)daObjSmoke_Execute,
 };
 
-/* 80CDD184-80CDD1B4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Smoke */
 extern actor_process_profile_definition g_profile_Obj_Smoke = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp
index 1ffcc74ae4..6970789bdf 100644
--- a/src/d/actor/d_a_obj_smtile.cpp
+++ b/src/d/actor/d_a_obj_smtile.cpp
@@ -7,22 +7,18 @@
 
 #include "d/actor/d_a_obj_smtile.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80CDE394-80CDE39C 000000 0008+00 3/3 0/0 0/0 .data            l_bmdData */
 static u32 l_bmdData[1][2] = {
     4, 1,
 };
 
-/* 80CDE39C-80CDE3A4 -00001 0008+00 3/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "A_SMTile",
 };
 
-/* 80CDE3A4-80CDE3F8 000010 0054+00 3/3 0/0 0/0 .data            l_tileMoveData */
-SECTION_DATA static s8 l_tileMoveData[21][4] = {
+static s8 l_tileMoveData[21][4] = {
     0x01, 0x03, 0x05, 0x01, 0x01, 0x02, 0x04, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x02,
     0x04, 0x00, 0x00, 0x02, 0x03, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01,
     0x00, 0xFF, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
@@ -31,7 +27,6 @@ SECTION_DATA static s8 l_tileMoveData[21][4] = {
     0x02, 0x02, 0xFF, 0x03, 0x05, 0x02, 0xFF, 0x02, 0x04, 0x02, 0xFF, 0x01, 0x03, 0x02,
 };
 
-/* 80CDD2AC-80CDD3AC 0000EC 0100+00 1/0 0/0 0/0 .text            __dt__14daObj_SMTile_cFv */
 daObj_SMTile_c::~daObj_SMTile_c() {
     OS_REPORT("|%06d:%x|daObj_SMTile_c -> デストラクト\n", g_Counter.mCounter0, this);
     dComIfG_resDelete(
@@ -39,7 +34,6 @@ daObj_SMTile_c::~daObj_SMTile_c() {
         l_resNameList[l_bmdData[mType][1]]);
 }
 
-/* 80CDD3E8-80CDD580 000228 0198+00 1/1 0/0 0/0 .text            create__14daObj_SMTile_cFv */
 int daObj_SMTile_c::create() {
     fopAcM_ct(this, daObj_SMTile_c);
     mType = getType();
@@ -65,13 +59,10 @@ int daObj_SMTile_c::create() {
     return rv;
 }
 
-/* ############################################################################################## */
-/* 80CDE35C-80CDE364 000000 0008+00 4/4 0/0 0/0 .rodata          m__20daObj_SMTile_Param_c */
 f32 const daObj_SMTile_Param_c::m[2] = {
     600.0f, 20.0f,
 };
 
-/* 80CDD5CC-80CDD6E8 00040C 011C+00 1/1 0/0 0/0 .text            CreateHeap__14daObj_SMTile_cFv */
 int daObj_SMTile_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(
         l_resNameList[l_bmdData[mType][1]],
@@ -93,14 +84,12 @@ int daObj_SMTile_c::CreateHeap() {
     return 0;
 }
 
-/* 80CDD6E8-80CDD71C 000528 0034+00 1/1 0/0 0/0 .text            Delete__14daObj_SMTile_cFv */
 int daObj_SMTile_c::Delete() {
     OS_REPORT("|%06d:%x|daObj_SMTile_c -> Delete\n", g_Counter.mCounter0, this);
     this->~daObj_SMTile_c();
     return 1;
 }
 
-/* 80CDD71C-80CDDA98 00055C 037C+00 2/2 0/0 0/0 .text            Execute__14daObj_SMTile_cFv */
 int daObj_SMTile_c::Execute() {
     if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
         if (field_0xb2b != 0) {
@@ -179,7 +168,6 @@ int daObj_SMTile_c::Execute() {
     return 0;
 }
 
-/* 80CDDA98-80CDDB28 0008D8 0090+00 1/1 0/0 0/0 .text            Draw__14daObj_SMTile_cFv */
 int daObj_SMTile_c::Draw() {
     J3DModelData* modelData = mModel->getModelData();
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -190,13 +178,10 @@ int daObj_SMTile_c::Draw() {
     return 1;
 }
 
-/* 80CDDB28-80CDDB48 000968 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daObj_SMTile_cFP10fopAc_ac_c           */
 int daObj_SMTile_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_SMTile_c*>(i_this)->CreateHeap();
 }
 
-/* 80CDDB48-80CDDD28 000988 01E0+00 1/1 0/0 0/0 .text            setDstPos__14daObj_SMTile_cFv */
 void daObj_SMTile_c::setDstPos() {
     cXyz local_2c;
     cXyz local_38;
@@ -230,7 +215,6 @@ void daObj_SMTile_c::setDstPos() {
     }
 }
 
-/* 80CDDD28-80CDDEFC 000B68 01D4+00 1/1 0/0 0/0 .text            setPrtcls__14daObj_SMTile_cFii */
 void daObj_SMTile_c::setPrtcls(int param_1, int param_2) {
     switch(param_1) {
     case 1:
@@ -255,12 +239,10 @@ void daObj_SMTile_c::setPrtcls(int param_1, int param_2) {
     }
 }
 
-/* 80CDE37C-80CDE384 000020 0008+00 0/1 0/0 0/0 .rodata          id$4105 */
 static u16 const id[4] = {
     0xFFFF, 0x86EC, 0x86ED, 0x86EE,
 };
 
-/* 80CDDEFC-80CDE1A8 000D3C 02AC+00 1/1 0/0 0/0 .text            touchPrtcls__14daObj_SMTile_cFf */
 void daObj_SMTile_c::touchPrtcls(f32 param_1) {
     cXyz local_3c;
     cXyz cStack_48(1.0f, 1.0f, 1.0f);
@@ -302,7 +284,6 @@ void daObj_SMTile_c::touchPrtcls(f32 param_1) {
     }
 }
 
-/* 80CDE1A8-80CDE21C 000FE8 0074+00 1/1 0/0 0/0 .text            setMtx__14daObj_SMTile_cFv */
 void daObj_SMTile_c::setMtx() {
     csXyz acStack_18(shape_angle);
     acStack_18.y += 0x8000;
@@ -312,35 +293,28 @@ void daObj_SMTile_c::setMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CDE21C-80CDE23C 00105C 0020+00 1/0 0/0 0/0 .text            daObj_SMTile_Create__FPv */
 static int daObj_SMTile_Create(void* i_this) {
     static_cast<daObj_SMTile_c*>(i_this)->create();
 }
 
-/* 80CDE23C-80CDE25C 00107C 0020+00 1/0 0/0 0/0 .text            daObj_SMTile_Delete__FPv */
 static int daObj_SMTile_Delete(void* i_this) {
     static_cast<daObj_SMTile_c*>(i_this)->Delete();
 }
 
-/* 80CDE25C-80CDE27C 00109C 0020+00 1/0 0/0 0/0 .text            daObj_SMTile_Execute__FPv */
 static int daObj_SMTile_Execute(void* i_this) {
     static_cast<daObj_SMTile_c*>(i_this)->Execute();
 }
 
-/* 80CDE27C-80CDE29C 0010BC 0020+00 1/0 0/0 0/0 .text            daObj_SMTile_Draw__FPv */
 static int daObj_SMTile_Draw(void* i_this) {
     static_cast<daObj_SMTile_c*>(i_this)->Draw();
 }
 
-/* 80CDE29C-80CDE2A4 0010DC 0008+00 1/0 0/0 0/0 .text            daObj_SMTile_IsDelete__FPv */
 static int daObj_SMTile_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CDE484-80CDE488 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_SMTile_Param_c l_HIO;
 
-/* 80CDE3F8-80CDE418 -00001 0020+00 1/0 0/0 0/0 .data            daObj_SMTile_MethodTable */
 static actor_method_class daObj_SMTile_MethodTable = {
     (process_method_func)daObj_SMTile_Create,
     (process_method_func)daObj_SMTile_Delete,
@@ -349,7 +323,6 @@ static actor_method_class daObj_SMTile_MethodTable = {
     (process_method_func)daObj_SMTile_Draw,
 };
 
-/* 80CDE418-80CDE448 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SMTILE */
 extern actor_process_profile_definition g_profile_OBJ_SMTILE = {
   fpcLy_CURRENT_e,           // mLayerID
   7,                         // mListID
diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp
index cc92412ee1..169d79749e 100644
--- a/src/d/actor/d_a_obj_smw_stone.cpp
+++ b/src/d/actor/d_a_obj_smw_stone.cpp
@@ -10,31 +10,25 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CDEF1C-80CDEF20 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "WStoneF";
 
-/* 80CDE518-80CDE538 000078 0020+00 1/1 0/0 0/0 .text daSmWStone_c_createHeap__FP10fopAc_ac_c */
 static int daSmWStone_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daSmWStone_c*>(i_this)->createHeap();
 }
 
-/* 80CDE538-80CDE588 000098 0050+00 2/2 0/0 0/0 .text            __ct__12daSmWStone_cFv */
 daSmWStone_c::daSmWStone_c() {
     mpBgW = NULL;
     mMode = 0;
 }
 
-/* 80CDE588-80CDE614 0000E8 008C+00 1/0 0/0 0/0 .text            __dt__12daSmWStone_cFv */
 daSmWStone_c::~daSmWStone_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CDEEF4-80CDEF00 000000 000C+00 1/1 0/0 0/0 .rodata          @3776 */
 static u8 const lit_3776[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80CDE614-80CDE7F8 000174 01E4+00 1/1 0/0 0/0 .text            create__12daSmWStone_cFv */
 cPhs__Step daSmWStone_c::create() {
     fopAcM_ct(this, daSmWStone_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
@@ -65,7 +59,6 @@ cPhs__Step daSmWStone_c::create() {
     return step;
 }
 
-/* 80CDE8D8-80CDE92C 000438 0054+00 1/1 0/0 0/0 .text            execute__12daSmWStone_cFv */
 int daSmWStone_c::execute() {
     switch (mMode) {
     case 0:
@@ -80,7 +73,6 @@ int daSmWStone_c::execute() {
     return 1;
 }
 
-/* 80CDE92C-80CDEA2C 00048C 0100+00 1/1 0/0 0/0 .text            draw__12daSmWStone_cFv */
 int daSmWStone_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -94,7 +86,6 @@ int daSmWStone_c::draw() {
     return 1;
 }
 
-/* 80CDEA2C-80CDEAA4 00058C 0078+00 1/1 0/0 0/0 .text            Delete__12daSmWStone_cFv */
 int daSmWStone_c::Delete() {
     attention_info.flags = 0;
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -104,7 +95,6 @@ int daSmWStone_c::Delete() {
     return 1;
 }
 
-/* 80CDEAA4-80CDEBA0 000604 00FC+00 1/1 0/0 0/0 .text            exeModeHowl__12daSmWStone_cFv */
 void daSmWStone_c::exeModeHowl() {
     u8 swbit;
     if (mDelete || (swbit = getSwBit0(), fopAcM_isSwitch(this, swbit))) {
@@ -127,14 +117,12 @@ void daSmWStone_c::exeModeHowl() {
     }
 }
 
-/* 80CDEBA0-80CDEC04 000700 0064+00 2/2 0/0 0/0 .text            setModelMtx__12daSmWStone_cFv */
 void daSmWStone_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CDEC04-80CDED30 000764 012C+00 1/1 0/0 0/0 .text            createHeap__12daSmWStone_cFv */
 int daSmWStone_c::createHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -157,7 +145,6 @@ int daSmWStone_c::createHeap() {
     return 1;
 }
 
-/* 80CDED30-80CDED9C 000890 006C+00 1/1 0/0 0/0 .text            init__12daSmWStone_cFv */
 void daSmWStone_c::init() {
     u8 swbit = getSwBit0();
     if (fopAcM_isSwitch(this, swbit)) {
@@ -169,7 +156,6 @@ void daSmWStone_c::init() {
     mShadowKey = 0;
 }
 
-/* 80CDED9C-80CDEE28 0008FC 008C+00 1/1 0/0 0/0 .text            chkWlfInRange__12daSmWStone_cFv */
 bool daSmWStone_c::chkWlfInRange() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (player == NULL) {
@@ -184,31 +170,23 @@ bool daSmWStone_c::chkWlfInRange() {
     return false;
 }
 
-/* 80CDEE28-80CDEE7C 000988 0054+00 1/0 0/0 0/0 .text            daSmWStone_create__FP12daSmWStone_c
- */
 static cPhs__Step daSmWStone_create(daSmWStone_c* i_this) {
     fopAcM_ct(i_this, daSmWStone_c);
     return i_this->create();
 }
 
-/* 80CDEE7C-80CDEE9C 0009DC 0020+00 1/0 0/0 0/0 .text            daSmWStone_Delete__FP12daSmWStone_c
- */
 static int daSmWStone_Delete(daSmWStone_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CDEE9C-80CDEEBC 0009FC 0020+00 1/0 0/0 0/0 .text daSmWStone_execute__FP12daSmWStone_c */
 static int daSmWStone_execute(daSmWStone_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CDEEBC-80CDEEDC 000A1C 0020+00 1/0 0/0 0/0 .text            daSmWStone_draw__FP12daSmWStone_c
- */
 static int daSmWStone_draw(daSmWStone_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CDEF20-80CDEF40 -00001 0020+00 1/0 0/0 0/0 .data            daSmWStone_METHODS */
 static actor_method_class daSmWStone_METHODS = {
     (process_method_func)daSmWStone_create,
     (process_method_func)daSmWStone_Delete,
@@ -217,7 +195,6 @@ static actor_method_class daSmWStone_METHODS = {
     (process_method_func)daSmWStone_draw,
 };
 
-/* 80CDEF40-80CDEF70 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SmWStone */
 extern actor_process_profile_definition g_profile_Obj_SmWStone = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp
index 92597760ef..e06e2b0083 100644
--- a/src/d/actor/d_a_obj_snowEffTag.cpp
+++ b/src/d/actor/d_a_obj_snowEffTag.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80CDF0AC-80CDF0E4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__18daSnowEffTag_HIO_cFv */
 daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() {
     field_0x4 = 20;
     mDisplayRange = false;
@@ -19,13 +18,11 @@ daSnowEffTag_HIO_c::daSnowEffTag_HIO_c() {
     mBottom = 1;
 }
 
-/* 80CDF12C-80CDF184 00016C 0058+00 1/1 0/0 0/0 .text            setBaseMtx__14daSnowEffTag_cFv */
 void daSnowEffTag_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80CDF184-80CDF2B8 0001C4 0134+00 1/1 0/0 0/0 .text            create__14daSnowEffTag_cFv */
 int daSnowEffTag_c::create() {
     fopAcM_ct(this, daSnowEffTag_c);
 
@@ -55,8 +52,6 @@ int daSnowEffTag_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CDF2B8-80CDF498 0002F8 01E0+00 1/1 0/0 0/0 .text            playerAreaCheck__14daSnowEffTag_cFv
- */
 bool daSnowEffTag_c::playerAreaCheck() {
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
     bool in_area = false;
@@ -81,7 +76,6 @@ bool daSnowEffTag_c::playerAreaCheck() {
     return in_area;
 }
 
-/* 80CDF498-80CDF5E4 0004D8 014C+00 1/1 0/0 0/0 .text            Execute__14daSnowEffTag_cFv */
 int daSnowEffTag_c::Execute() {
     if (playerAreaCheck() == true) {
         if (!mPlayedSound) {
@@ -102,51 +96,40 @@ int daSnowEffTag_c::Execute() {
     return 1;
 }
 
-/* 80CDF5E4-80CDF5EC 000624 0008+00 1/1 0/0 0/0 .text            Draw__14daSnowEffTag_cFv */
 int daSnowEffTag_c::Draw() {
     return 1;
 }
 
-/* 80CDF5EC-80CDF5F4 00062C 0008+00 1/1 0/0 0/0 .text            Delete__14daSnowEffTag_cFv */
 int daSnowEffTag_c::Delete() {
     return 1;
 }
 
-/* 80CDF5F4-80CDF614 000634 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Draw__FP14daSnowEffTag_c */
 static int daSnowEffTag_Draw(daSnowEffTag_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CDF614-80CDF634 000654 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Execute__FP14daSnowEffTag_c */
 static int daSnowEffTag_Execute(daSnowEffTag_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80CDF634-80CDF654 000674 0020+00 1/0 0/0 0/0 .text daSnowEffTag_Delete__FP14daSnowEffTag_c */
 static int daSnowEffTag_Delete(daSnowEffTag_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CDF654-80CDF674 000694 0020+00 1/0 0/0 0/0 .text            daSnowEffTag_Create__FP10fopAc_ac_c
- */
 static int daSnowEffTag_Create(fopAc_ac_c* i_this) {
     return static_cast<daSnowEffTag_c*>(i_this)->create();
 }
 
-/* 80CDF674-80CDF6D0 0006B4 005C+00 2/1 0/0 0/0 .text            __dt__18daSnowEffTag_HIO_cFv */
 daSnowEffTag_HIO_c::~daSnowEffTag_HIO_c() {}
 
-/* 80CDF7D4-80CDF7DC 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daSnowEffTag_HIO_c l_HIO;
 
-/* 80CDF758-80CDF778 -00001 0020+00 1/0 0/0 0/0 .data            l_daSnowEffTag_Method */
 static actor_method_class l_daSnowEffTag_Method = {
     (process_method_func)daSnowEffTag_Create,  (process_method_func)daSnowEffTag_Delete,
     (process_method_func)daSnowEffTag_Execute, (process_method_func)NULL,
     (process_method_func)daSnowEffTag_Draw,
 };
 
-/* 80CDF778-80CDF7A8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_SnowEff */
 extern actor_process_profile_definition g_profile_Tag_SnowEff = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp
index 9287851cb3..9fb1a611c7 100644
--- a/src/d/actor/d_a_obj_snow_soup.cpp
+++ b/src/d/actor/d_a_obj_snow_soup.cpp
@@ -10,19 +10,14 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 
-/* 80CDF858-80CDF878 000078 0020+00 1/1 0/0 0/0 .text daObjSnowSoup_c_createHeap__FP10fopAc_ac_c
- */
 static int daObjSnowSoup_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjSnowSoup_c*>(i_this)->createHeap();
 }
 
-/* 80CE0280-80CE0284 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "SnowSoup";
 
-/* 80CE023C-80CE0248 000000 000C+00 3/3 0/0 0/0 .rodata          SOUP_MODEL_OFFSET */
 static Vec const SOUP_MODEL_OFFSET = {3317.86f, 214.73f, 323.3f};
 
-/* 80CDF878-80CDF910 000098 0098+00 2/2 0/0 0/0 .text            __ct__15daObjSnowSoup_cFv */
 daObjSnowSoup_c::daObjSnowSoup_c() {
     for (int i = 0; i < 3; i++) {
         for (int j = 0; j < 2; j++) {
@@ -33,12 +28,10 @@ daObjSnowSoup_c::daObjSnowSoup_c() {
     memset(mpModel, 0, 0xc);
 }
 
-/* 80CDF910-80CDF990 000130 0080+00 1/0 0/0 0/0 .text            __dt__15daObjSnowSoup_cFv */
 daObjSnowSoup_c::~daObjSnowSoup_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80CDF990-80CDFA3C 0001B0 00AC+00 1/1 0/0 0/0 .text            createHeap__15daObjSnowSoup_cFv */
 int daObjSnowSoup_c::createHeap() {
     static u32 const BMD_IDX[3] = {3, 4, 5};
     for (int i = 0; i < 3; i++) {
@@ -51,7 +44,6 @@ int daObjSnowSoup_c::createHeap() {
     return true;
 }
 
-/* 80CDFA3C-80CDFB70 00025C 0134+00 1/1 0/0 0/0 .text            create__15daObjSnowSoup_cFv */
 cPhs__Step daObjSnowSoup_c::create() {
     fopAcM_ct(this, daObjSnowSoup_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(this, l_arcName);
@@ -71,7 +63,6 @@ cPhs__Step daObjSnowSoup_c::create() {
     return step;
 }
 
-/* 80CDFB70-80CDFBC4 000390 0054+00 1/1 0/0 0/0 .text            Delete__15daObjSnowSoup_cFv */
 int daObjSnowSoup_c::Delete() {
     deleteSmkEmtCommon();
     deleteSmkEmtChange(mState);
@@ -79,7 +70,6 @@ int daObjSnowSoup_c::Delete() {
     return 1;
 }
 
-/* 80CDFBC4-80CDFC40 0003E4 007C+00 1/1 0/0 0/0 .text            draw__15daObjSnowSoup_cFv */
 int daObjSnowSoup_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel[mState], &tevStr);
@@ -87,7 +77,6 @@ int daObjSnowSoup_c::draw() {
     return 1;
 }
 
-/* 80CDFC40-80CDFE14 000460 01D4+00 1/1 0/0 0/0 .text            execute__15daObjSnowSoup_cFv */
 int daObjSnowSoup_c::execute() {
     mDoAud_seStartLevel(Z2SE_OBJ_NABE_BUBBLE, &mBubblePos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     mDoAud_seStartLevel(Z2SE_OBJ_FIREWOOD_BURNING, &mFirewoodPos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -121,7 +110,6 @@ int daObjSnowSoup_c::execute() {
     return 1;
 }
 
-/* 80CDFE14-80CDFEA4 000634 0090+00 1/1 0/0 0/0 .text            init__15daObjSnowSoup_cFv */
 void daObjSnowSoup_c::init() {
     mState = 0;
         /* dSv_event_flag_c::F_0004 - Snowpeak Ruins - Handed over secret ingredient and left room */
@@ -133,14 +121,12 @@ void daObjSnowSoup_c::init() {
     }
 }
 
-/* 80CDFEA4-80CDFF14 0006C4 0070+00 2/2 0/0 0/0 .text            setModelMtx__15daObjSnowSoup_cFv */
 void daObjSnowSoup_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel[mState]->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CDFF14-80CDFFF8 000734 00E4+00 1/1 0/0 0/0 .text createSmkEmtCommon__15daObjSnowSoup_cFv */
 void daObjSnowSoup_c::createSmkEmtCommon() {
     static u16 const PARTICLE_NAME[4] = {0x87E1, 0x87E2, 0x87E3, 0x87E6};
     cXyz vec1(0.0f, 0.0f, 0.0f);
@@ -151,7 +137,6 @@ void daObjSnowSoup_c::createSmkEmtCommon() {
     }
 }
 
-/* 80CDFFF8-80CE003C 000818 0044+00 1/1 0/0 0/0 .text deleteSmkEmtCommon__15daObjSnowSoup_cFv */
 void daObjSnowSoup_c::deleteSmkEmtCommon() {
     for (int i = 0; i < 4; i++) {
         if (mpSmkEmtCommon[i] != NULL) {
@@ -161,7 +146,6 @@ void daObjSnowSoup_c::deleteSmkEmtCommon() {
     }
 }
 
-/* 80CE003C-80CE0134 00085C 00F8+00 2/2 0/0 0/0 .text createSmkEmtChange__15daObjSnowSoup_cFi */
 void daObjSnowSoup_c::createSmkEmtChange(int i_state) {
     static u16 const PARTICLE_NAME[3][2] = {{0x8984, 0x8985}, {0x8A8B, 0x8A8D}, {0x8A8C, 0x8A8E}};
     cXyz vec1(0.0f, 0.0f, 0.0f);
@@ -173,7 +157,6 @@ void daObjSnowSoup_c::createSmkEmtChange(int i_state) {
     }
 }
 
-/* 80CE0134-80CE0180 000954 004C+00 2/2 0/0 0/0 .text deleteSmkEmtChange__15daObjSnowSoup_cFi */
 void daObjSnowSoup_c::deleteSmkEmtChange(int i_state) {
     for (int i = 0; i < 2; i++) {
         if (mpSmkEmtChange[i_state][i] != NULL) {
@@ -183,30 +166,24 @@ void daObjSnowSoup_c::deleteSmkEmtChange(int i_state) {
     }
 }
 
-/* 80CE0180-80CE01D4 0009A0 0054+00 1/0 0/0 0/0 .text daObjSnowSoup_create__FP15daObjSnowSoup_c */
 
 static cPhs__Step daObjSnowSoup_create(daObjSnowSoup_c* i_this) {
     fopAcM_ct(i_this, daObjSnowSoup_c);
     return i_this->create();
 }
 
-/* 80CE01D4-80CE01F4 0009F4 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_Delete__FP15daObjSnowSoup_c */
 static int daObjSnowSoup_Delete(daObjSnowSoup_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CE01F4-80CE0214 000A14 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_execute__FP15daObjSnowSoup_c
- */
 static int daObjSnowSoup_execute(daObjSnowSoup_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CE0214-80CE0234 000A34 0020+00 1/0 0/0 0/0 .text daObjSnowSoup_draw__FP15daObjSnowSoup_c */
 static int daObjSnowSoup_draw(daObjSnowSoup_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CE0284-80CE02A4 -00001 0020+00 1/0 0/0 0/0 .data            daObjSnowSoup_METHODS */
 static actor_method_class daObjSnowSoup_METHODS = {
     (process_method_func)daObjSnowSoup_create,
     (process_method_func)daObjSnowSoup_Delete,
@@ -215,7 +192,6 @@ static actor_method_class daObjSnowSoup_METHODS = {
     (process_method_func)daObjSnowSoup_draw,
 };
 
-/* 80CE02A4-80CE02D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SnowSoup */
 extern actor_process_profile_definition g_profile_Obj_SnowSoup = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp
index 1f320d33f0..921f8b74ab 100644
--- a/src/d/actor/d_a_obj_so.cpp
+++ b/src/d/actor/d_a_obj_so.cpp
@@ -16,13 +16,11 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80CE03CC-80CE03F0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__14daObj_So_HIO_cFv */
 daObj_So_HIO_c::daObj_So_HIO_c() {
     field_0x4 = -1;
     mScale = 0.8f;
 }
 
-/* 80CE03F0-80CE04FC 000110 010C+00 1/0 0/0 0/0 .text            daObj_So_Draw__FP12obj_so_class */
 static int daObj_So_Draw(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -50,7 +48,6 @@ static int daObj_So_Draw(obj_so_class* i_this) {
     return 1;
 }
 
-/* 80CE04FC-80CE0510 00021C 0014+00 1/1 0/0 0/0 .text            ride_call_back_0__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void ride_call_back_0(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
     obj_so_class* i_this = (obj_so_class*)a_this;
 
@@ -58,7 +55,6 @@ static void ride_call_back_0(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_
     i_this->field_0xc30[0] = 3;
 }
 
-/* 80CE0510-80CE0524 000230 0014+00 1/1 0/0 0/0 .text            ride_call_back_1__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 static void ride_call_back_1(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_3) {
     obj_so_class* i_this = (obj_so_class*)a_this;
 
@@ -66,7 +62,6 @@ static void ride_call_back_1(dBgW* i_BgW, fopAc_ac_c* a_this, fopAc_ac_c* param_
     i_this->field_0xc30[1] = 3;
 }
 
-/* 80CE0524-80CE0744 000244 0220+00 1/1 0/0 0/0 .text            so_hasira__FP12obj_so_class */
 static void so_hasira(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPillar_c* pillar_p = (daPillar_c*)fopAcM_SearchByName(PROC_Obj_Pillar);
@@ -114,7 +109,6 @@ static void so_hasira(obj_so_class* i_this) {
     }
 }
 
-/* 80CE0744-80CE0C54 000464 0510+00 4/4 0/0 0/0 .text            part_set__FP12obj_so_classSc */
 static void part_set(obj_so_class* i_this, s8 param_2) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp48, sp54;
@@ -229,7 +223,6 @@ static void part_set(obj_so_class* i_this, s8 param_2) {
     }
 }
 
-/* 80CE0C90-80CE0F58 0009B0 02C8+00 1/1 0/0 0/0 .text            so_drop__FP12obj_so_class */
 static void so_drop(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp30, sp3c;
@@ -296,7 +289,6 @@ static void so_drop(obj_so_class* i_this) {
     }
 }
 
-/* 80CE0F94-80CE1084 000CB4 00F0+00 1/1 0/0 0/0 .text            so_break__FP12obj_so_class */
 static void so_break(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp2c, sp38;
@@ -316,7 +308,6 @@ static void so_break(obj_so_class* i_this) {
     }
 }
 
-/* 80CE1084-80CE12D8 000DA4 0254+00 1/1 0/0 0/0 .text            so_hang__FP12obj_so_class */
 static void so_hang(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAc_ac_c* actor = fopAcM_SearchByID(i_this->field_0x1b94);
@@ -364,7 +355,6 @@ static void so_hang(obj_so_class* i_this) {
     }
 }
 
-/* 80CE12D8-80CE14DC 000FF8 0204+00 1/1 0/0 0/0 .text            action__FP12obj_so_class */
 static void action(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp38;
@@ -415,7 +405,6 @@ static void action(obj_so_class* i_this) {
     }
 }
 
-/* 80CE14DC-80CE2A64 0011FC 1588+00 1/1 0/0 0/0 .text            part_move__FP12obj_so_class */
 static void part_move(obj_so_class* i_this) {
     static u16 e_id[3] = {
         0x82AB,
@@ -813,7 +802,6 @@ static void part_move(obj_so_class* i_this) {
     }
 }
 
-/* 80CE2ADC-80CE2EAC 0027FC 03D0+00 1/1 0/0 0/0 .text            demo_camera__FP12obj_so_class */
 static void demo_camera(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -889,13 +877,10 @@ static void demo_camera(obj_so_class* i_this) {
     }
 }
 
-/* 80CE3C90-80CE3C94 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80CE3C90;
 
-/* 80CE3CA0-80CE3CAC 000018 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_So_HIO_c l_HIO;
 
-/* 80CE2EAC-80CE2F60 002BCC 00B4+00 2/1 0/0 0/0 .text            daObj_So_Execute__FP12obj_so_class */
 static int daObj_So_Execute(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -915,12 +900,10 @@ static int daObj_So_Execute(obj_so_class* i_this) {
     return 1;
 }
 
-/* 80CE2F60-80CE2F68 002C80 0008+00 1/0 0/0 0/0 .text            daObj_So_IsDelete__FP12obj_so_class */
 static int daObj_So_IsDelete(obj_so_class* i_this) {
     return 1;
 }
 
-/* 80CE2F68-80CE3018 002C88 00B0+00 1/0 0/0 0/0 .text            daObj_So_Delete__FP12obj_so_class */
 static int daObj_So_Delete(obj_so_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
 
@@ -943,7 +926,6 @@ static int daObj_So_Delete(obj_so_class* i_this) {
     return 1;
 }
 
-/* 80CE3018-80CE327C 002D38 0264+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_so_class* i_this = (obj_so_class*)a_this;
 
@@ -996,7 +978,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80CE327C-80CE36D0 002F9C 0454+00 1/0 0/0 0/0 .text            daObj_So_Create__FP10fopAc_ac_c */
 static int daObj_So_Create(fopAc_ac_c* a_this) {
     static dCcD_SrcCyl cc_cyl_src = {
         {
@@ -1096,7 +1077,6 @@ static int daObj_So_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80CE3BBC-80CE3BDC -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_So_Method */
 static actor_method_class l_daObj_So_Method = {
     (process_method_func)daObj_So_Create,
     (process_method_func)daObj_So_Delete,
@@ -1105,7 +1085,6 @@ static actor_method_class l_daObj_So_Method = {
     (process_method_func)daObj_So_Draw,
 };
 
-/* 80CE3BDC-80CE3C0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SO */
 extern actor_process_profile_definition g_profile_OBJ_SO = {
   fpcLy_CURRENT_e,        // mLayerID
   2,                      // mListID
diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp
index dd8298846d..dddb1517c5 100644
--- a/src/d/actor/d_a_obj_spinLift.cpp
+++ b/src/d/actor/d_a_obj_spinLift.cpp
@@ -6,12 +6,11 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_spinLift.h"
-#include "dol2asm.h"
 
 class daSpinLift_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80CE3DAC */ daSpinLift_HIO_c();
-    /* 80CE4C10 */ ~daSpinLift_HIO_c() {};
+    daSpinLift_HIO_c();
+    ~daSpinLift_HIO_c() {};
 
 #ifdef DEBUG
     void genMessage(JORMContext*);
@@ -22,10 +21,8 @@ public:
     /* 0x0C */ u8 mVibration;
 };
 
-/* 80CE4ED4-80CE4EE4 000014 0010+00 4/4 0/0 0/0 .bss             l_HIO */
 static daSpinLift_HIO_c l_HIO;
 
-/* 80CE3DAC-80CE3DE4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__16daSpinLift_HIO_cFv */
 daSpinLift_HIO_c::daSpinLift_HIO_c() {
     field_0x06 = 0x3c;
     mInitialSpeed = 0.0f;
@@ -53,20 +50,17 @@ void daSpinLift_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80CE4DA8-80CE4DCC -00001 0024+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[] = {
     "L4_N_Entr", "L4_N_SlpH", "L4_N_SlpL", "L4_Center", "L4_Switch",
     "L4_S_Slp",  "L4_Wal_ZE", "L4_Wal_ZW", "L4_Wal_X",
 };
 
-/* 80CE3E2C-80CE3E9C 00016C 0070+00 2/2 0/0 0/0 .text            setBaseMtx__12daSpinLift_cFv */
 void daSpinLift_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mpModel->setBaseScale(scale);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CE3E9C-80CE3F1C 0001DC 0080+00 1/0 0/0 0/0 .text            CreateHeap__12daSpinLift_cFv */
 int daSpinLift_c::CreateHeap() {
     static u32 const l_bmdIdx[] = {4, 4, 4, 4, 4, 4, 4, 4, 4};
     J3DModelData* modelData =
@@ -79,7 +73,6 @@ int daSpinLift_c::CreateHeap() {
     return 1;
 }
 
-/* 80CE3F1C-80CE40FC 00025C 01E0+00 1/1 0/0 0/0 .text            create__12daSpinLift_cFv */
 int daSpinLift_c::create() {
     static const int l_dzbIdx[] = {7, 7, 7, 7, 7, 7, 7, 7, 7};
     fopAcM_ct(this, daSpinLift_c);
@@ -122,8 +115,6 @@ int daSpinLift_c::create() {
     return phase;
 }
 
-/* 80CE40FC-80CE414C 00043C 0050+00 1/0 0/0 0/0 .text            Execute__12daSpinLift_cFPPA3_A4_f
- */
 int daSpinLift_c::Execute(Mtx** param_0) {
     moveLift();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -131,7 +122,6 @@ int daSpinLift_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CE414C-80CE4290 00048C 0144+00 1/1 0/0 0/0 .text            moveLift__12daSpinLift_cFv */
 void daSpinLift_c::moveLift() {
     static daSpinLift_c::modeFunc mode_proc[] = {
         &daSpinLift_c::modeWait,
@@ -155,23 +145,18 @@ void daSpinLift_c::moveLift() {
     (this->*mode_proc[field_0x5ac])();
 }
 
-/* 80CE4290-80CE429C 0005D0 000C+00 3/3 0/0 0/0 .text            init_modeWait__12daSpinLift_cFv */
 void daSpinLift_c::init_modeWait() {
     field_0x5ac = 0;
 }
 
-/* 80CE429C-80CE42A0 0005DC 0004+00 1/0 0/0 0/0 .text            modeWait__12daSpinLift_cFv */
 void daSpinLift_c::modeWait() {}
 
-/* 80CE42A0-80CE42C4 0005E0 0024+00 1/1 0/0 0/0 .text            init_modeUpMove__12daSpinLift_cFv
- */
 void daSpinLift_c::init_modeUpMove() {
     fopAcM_SetSpeedF(this, l_HIO.mInitialSpeed);
     field_0x5ba = mTimer;
     field_0x5ac = 1;
 }
 
-/* 80CE42C4-80CE468C 000604 03C8+00 1/0 0/0 0/0 .text            modeUpMove__12daSpinLift_cFv */
 void daSpinLift_c::modeUpMove() {
     if (field_0x5ba != 0) {
         field_0x5ba--;
@@ -209,13 +194,10 @@ void daSpinLift_c::modeUpMove() {
     }
 }
 
-/* 80CE468C-80CE4698 0009CC 000C+00 1/1 0/0 0/0 .text            init_modeDownMove__12daSpinLift_cFv
- */
 void daSpinLift_c::init_modeDownMove() {
     field_0x5ac = 2;
 }
 
-/* 80CE4698-80CE4790 0009D8 00F8+00 1/0 0/0 0/0 .text            modeDownMove__12daSpinLift_cFv */
 void daSpinLift_c::modeDownMove() {
     f32 dVar3 = cLib_addCalc(&current.pos.y, home.pos.y, 0.3f, mMoveSpeed, 0.1f);
 
@@ -231,8 +213,6 @@ void daSpinLift_c::modeDownMove() {
     }
 }
 
-/* 80CE4790-80CE4A9C 000AD0 030C+00 2/2 0/0 0/0 .text            init_modeMoveEnd__12daSpinLift_cFv
- */
 void daSpinLift_c::init_modeMoveEnd() {
     if (fopAcM_isSwitch(this, getEndSw()) == 0) {
         fopAcM_onSwitch(this, getEndSw());
@@ -254,10 +234,8 @@ void daSpinLift_c::init_modeMoveEnd() {
     field_0x5ac = 3;
 }
 
-/* 80CE4A9C-80CE4AA0 000DDC 0004+00 1/0 0/0 0/0 .text            modeMoveEnd__12daSpinLift_cFv */
 void daSpinLift_c::modeMoveEnd() {}
 
-/* 80CE4AA0-80CE4B44 000DE0 00A4+00 1/0 0/0 0/0 .text            Draw__12daSpinLift_cFv */
 int daSpinLift_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -267,7 +245,6 @@ int daSpinLift_c::Draw() {
     return 1;
 }
 
-/* 80CE4B44-80CE4B84 000E84 0040+00 1/0 0/0 0/0 .text            Delete__12daSpinLift_cFv */
 int daSpinLift_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mModelType]);
 #ifdef DEBUG
@@ -276,40 +253,31 @@ int daSpinLift_c::Delete() {
     return 1;
 }
 
-/* 80CE4B84-80CE4BB0 000EC4 002C+00 1/0 0/0 0/0 .text            daSpinLift_Draw__FP12daSpinLift_c
- */
 static int daSpinLift_Draw(daSpinLift_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80CE4BB0-80CE4BD0 000EF0 0020+00 1/0 0/0 0/0 .text daSpinLift_Execute__FP12daSpinLift_c */
 static int daSpinLift_Execute(daSpinLift_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CE4BD0-80CE4BF0 000F10 0020+00 1/0 0/0 0/0 .text            daSpinLift_Delete__FP12daSpinLift_c
- */
 static int daSpinLift_Delete(daSpinLift_c* i_this) {
     fpc_ProcID proc_id = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80CE4BF0-80CE4C10 000F30 0020+00 1/0 0/0 0/0 .text            daSpinLift_Create__FP10fopAc_ac_c
- */
 static int daSpinLift_Create(fopAc_ac_c* a_this) {
     daSpinLift_c* i_this = (daSpinLift_c*)a_this;
     fpc_ProcID proc_id = fopAcM_GetID(a_this);
     return i_this->create();
 }
 
-/* 80CE4E2C-80CE4E4C -00001 0020+00 1/0 0/0 0/0 .data            l_daSpinLift_Method */
 static actor_method_class l_daSpinLift_Method = {
     (process_method_func)daSpinLift_Create,  (process_method_func)daSpinLift_Delete,
     (process_method_func)daSpinLift_Execute, 0,
     (process_method_func)daSpinLift_Draw,
 };
 
-/* 80CE4E4C-80CE4E7C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SpinLift */
 extern actor_process_profile_definition g_profile_Obj_SpinLift = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_ss_base.cpp b/src/d/actor/d_a_obj_ss_base.cpp
index 113cfc709a..e4712d3813 100644
--- a/src/d/actor/d_a_obj_ss_base.cpp
+++ b/src/d/actor/d_a_obj_ss_base.cpp
@@ -1,18 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: a/obj/d_a_obj_ss_base
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_ss_base.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Declarations:
-//
-
-/* 8015E3F8-8015E450 158D38 0058+00 0/0 0/0 3/3 .text            __ct__14daObj_SSBase_cFv */
 daObj_SSBase_c::daObj_SSBase_c() {
     mpParentPtr = NULL;
     field_0x570 = 0;
@@ -20,15 +10,12 @@ daObj_SSBase_c::daObj_SSBase_c() {
     mValueNum = 0;
 }
 
-/* 8015E450-8015E4B0 158D90 0060+00 1/0 0/0 3/3 .text            __dt__14daObj_SSBase_cFv */
 daObj_SSBase_c::~daObj_SSBase_c() {}
 
-/* 8015E4B0-8015E4C8 158DF0 0018+00 1/0 0/0 2/0 .text            getProcessID__14daObj_SSBase_cFv */
 u32 daObj_SSBase_c::getProcessID() {
     return fopAcM_GetID(this);
 }
 
-/* 8015E4C8-8015E4CC 158E08 0004+00 1/0 0/0 0/0 .text            setSoldOut__14daObj_SSBase_cFv */
 void daObj_SSBase_c::setSoldOut() {
     /* empty function */
 }
diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp
index ada7eb9b7c..9ea78dfd7e 100644
--- a/src/d/actor/d_a_obj_ss_drink.cpp
+++ b/src/d/actor/d_a_obj_ss_drink.cpp
@@ -10,16 +10,11 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_msg_object.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
-/* 80CE69E4-80CE69E8 -00001 0004+00 2/2 0/0 0/0 .data            l_resFileName */
 static char* l_resFileName = "Obj_btl";
 
-/* 80CE69E8-80CE69EC -00001 0004+00 1/2 0/0 0/0 .data            l_bmdName */
 static char* l_bmdName = "al_bottle.bmd";
 
-/* ############################################################################################## */
-/* 80CE6930-80CE6960 000000 0030+00 5/5 0/0 0/0 .rodata          mCcDObjInfo__15daObj_SSDrink_c */
 dCcD_SrcGObjInf const daObj_SSDrink_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0, 0}, {0x79}}},
     {0, 0, 0, 0, {0}},
@@ -27,15 +22,12 @@ dCcD_SrcGObjInf const daObj_SSDrink_c::mCcDObjInfo = {
     {{0}},
 };
 
-/* 80CE69EC-80CE6A30 000028 0044+00 2/2 0/0 0/0 .data            mCcDCyl__15daObj_SSDrink_c */
 dCcD_SrcCyl daObj_SSDrink_c::mCcDCyl = {mCcDObjInfo, {}};
 
-/* 80CE4F78-80CE51C8 000078 0250+00 1/0 0/0 0/0 .text            __dt__15daObj_SSDrink_cFv */
 daObj_SSDrink_c::~daObj_SSDrink_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80CE51C8-80CE53EC 0002C8 0224+00 1/1 0/0 0/0 .text            create__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::create() {
     fopAcM_ct(this, daObj_SSDrink_c);
     field_0xb0b = getTypeFromParam();
@@ -56,7 +48,6 @@ int daObj_SSDrink_c::create() {
     return phase;
 }
 
-/* 80CE53EC-80CE55A8 0004EC 01BC+00 1/1 0/0 0/0 .text            CreateHeap__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::CreateHeap() {
     J3DModelData* mdlData_p = NULL;
     J3DAnmTevRegKey* pbrk;
@@ -88,13 +79,11 @@ int daObj_SSDrink_c::CreateHeap() {
     return 1;
 }
 
-/* 80CE55F0-80CE5624 0006F0 0034+00 1/1 0/0 0/0 .text            Delete__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::Delete() {
     this->~daObj_SSDrink_c();
     return 1;
 }
 
-/* 80CE5624-80CE5858 000724 0234+00 2/2 0/0 0/0 .text            Execute__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::Execute() {
     setParam();
     mStts.Move();
@@ -146,7 +135,6 @@ int daObj_SSDrink_c::Execute() {
     return 1;
 }
 
-/* 80CE5858-80CE5994 000958 013C+00 1/1 0/0 0/0 .text            Draw__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::Draw() {
     if (checkProcess(&daObj_SSDrink_c::drink)) {
         return 1;
@@ -170,14 +158,11 @@ int daObj_SSDrink_c::Draw() {
     return 1;
 }
 
-/* 80CE59DC-80CE59FC 000ADC 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__15daObj_SSDrink_cFP10fopAc_ac_c          */
 int daObj_SSDrink_c::createHeapCallBack(fopAc_ac_c* a_this) {
     daObj_SSDrink_c* i_this = (daObj_SSDrink_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80CE59FC-80CE5A50 000AFC 0054+00 1/0 0/0 0/0 .text            setSoldOut__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::setSoldOut() {
     if (getParentPtr() != NULL) {
         ((daMyna_c*)getParentPtr())->onEventFlag(0);
@@ -185,12 +170,10 @@ void daObj_SSDrink_c::setSoldOut() {
     }
 }
 
-/* 80CE5A50-80CE5A60 000B50 0010+00 4/4 0/0 0/0 .text            getResName__15daObj_SSDrink_cFv */
 char* daObj_SSDrink_c::getResName() {
     return l_resFileName;
 }
 
-/* 80CE5A60-80CE5B0C 000B60 00AC+00 1/1 0/0 0/0 .text getTypeFromParam__15daObj_SSDrink_cFv */
 u8 daObj_SSDrink_c::getTypeFromParam() {
     u8 x = fopAcM_GetParam((this)) & 0xf;
 
@@ -220,13 +203,11 @@ u8 daObj_SSDrink_c::getTypeFromParam() {
     return 6;
 }
 
-/* 80CE5B0C-80CE5B18 000C0C 000C+00 1/1 0/0 0/0 .text getSwitchFromParam__15daObj_SSDrink_cFv */
 u8 daObj_SSDrink_c::getSwitchFromParam() {
     u8 switch_from_prm = (fopAcM_GetParam(this) & 0xff0) >> 4;
     return switch_from_prm;
 }
 
-/* 80CE5B18-80CE5B3C 000C18 0024+00 1/1 0/0 0/0 .text getCapacityFromParam__15daObj_SSDrink_cFv */
 u8 daObj_SSDrink_c::getCapacityFromParam() {
     if (field_0xb0b == 6) {
         return 2;
@@ -239,27 +220,22 @@ u8 daObj_SSDrink_c::getCapacityFromParam() {
     return 0;
 }
 
-/* 80CE5B3C-80CE5B74 000C3C 0038+00 2/2 0/0 0/0 .text            getFlowNodeNum__15daObj_SSDrink_cFv
- */
 u16 daObj_SSDrink_c::getFlowNodeNum() {
     u16 var_r31 = home.angle.x;
     return var_r31 == 0xFFFF || var_r31 == 0 ? -1 : var_r31;
 }
 
-/* 80CE5B74-80CE5B80 000C74 000C+00 1/1 0/0 0/0 .text            getValue__15daObj_SSDrink_cFv */
 u16 daObj_SSDrink_c::getValue() {
     u16 value = (fopAcM_GetParam(this) & 0xffff000) >> 12;
     return value;
 }
 
-/* 80CE5B80-80CE5BF0 000C80 0070+00 1/1 0/0 0/0 .text            restart__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::restart() {
     current.angle.set(0, home.angle.y, 0);
     shape_angle = current.angle;
     setProcess(&daObj_SSDrink_c::wait);
 }
 
-/* 80CE5BF0-80CE5DB0 000CF0 01C0+00 1/1 0/0 0/0 .text            initialize__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::initialize() {
     J3DModelData* modelData = mpModel->getModelData();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -290,14 +266,10 @@ void daObj_SSDrink_c::initialize() {
     Execute();
 }
 
-/* 80CE5DB0-80CE5DDC 000EB0 002C+00 6/6 0/0 0/0 .text
- * checkProcess__15daObj_SSDrink_cFM15daObj_SSDrink_cFPCvPvPv_i */
 int daObj_SSDrink_c::checkProcess(ProcessFunc param_0) {
     return field_0xaf0 == param_0;
 }
 
-/* 80CE5DDC-80CE5EC8 000EDC 00EC+00 4/4 0/0 0/0 .text
- * setProcess__15daObj_SSDrink_cFM15daObj_SSDrink_cFPCvPvPv_i   */
 int daObj_SSDrink_c::setProcess(ProcessFunc param_0) {
     int ret = 0;
 
@@ -322,7 +294,6 @@ int daObj_SSDrink_c::setProcess(ProcessFunc param_0) {
     return ret;
 }
 
-/* 80CE5EC8-80CE5FE4 000FC8 011C+00 1/1 0/0 0/0 .text            setParam__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::setParam() {
     f32 some_float = 1.0f;
     scale.set(some_float, some_float, some_float);
@@ -351,21 +322,17 @@ void daObj_SSDrink_c::setParam() {
     fopAcM_onSwitch(this, getSwitchFromParam());
 }
 
-/* 80CE5FE4-80CE6040 0010E4 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__15daObj_SSDrink_cFv
- */
 void daObj_SSDrink_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80CE6040-80CE6084 001140 0044+00 2/2 0/0 0/0 .text            setRoomNo__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::setRoomNo() {
     s8 room_id = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, room_id);
     mStts.SetRoomId(room_id);
 }
 
-/* 80CE6084-80CE60E8 001184 0064+00 1/1 0/0 0/0 .text            setMtx__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -373,7 +340,6 @@ void daObj_SSDrink_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CE60E8-80CE6170 0011E8 0088+00 1/1 0/0 0/0 .text            setAttnPos__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::setAttnPos() {
     if (!checkProcess(&daObj_SSDrink_c::talk)) {
         attention_info.position = current.pos;
@@ -382,13 +348,11 @@ void daObj_SSDrink_c::setAttnPos() {
     eyePos = current.pos;
 }
 
-/* 80CE6170-80CE61E4 001270 0074+00 1/1 0/0 0/0 .text            animeEntry__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::animeEntry() {
     mpBtpAnm->entry(mpModel->getModelData(), field_0xb0a);
     mpBrkAnm->entry(mpModel->getModelData(), field_0xb0b);
 }
 
-/* 80CE61E4-80CE622C 0012E4 0048+00 1/1 0/0 0/0 .text            animePlay__15daObj_SSDrink_cFv */
 void daObj_SSDrink_c::animePlay() {
     if (mpBtpAnm != NULL) {
         mpBtpAnm->play();
@@ -399,7 +363,6 @@ void daObj_SSDrink_c::animePlay() {
     }
 }
 
-/* 80CE622C-80CE63AC 00132C 0180+00 1/1 0/0 0/0 .text            chkEvent__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::chkEvent() {
     int ret = 1;
 
@@ -429,7 +392,6 @@ int daObj_SSDrink_c::chkEvent() {
     return ret;
 }
 
-/* 80CE63AC-80CE644C 0014AC 00A0+00 1/1 0/0 0/0 .text            orderEvent__15daObj_SSDrink_cFv */
 int daObj_SSDrink_c::orderEvent() {
     if (!daPy_py_c::checkNowWolf() && field_0xb0c != 0x60 && getFlowNodeNum() != -1) {
         attention_info.flags = fopAc_AttnFlag_TALKREAD_e | fopAc_AttnFlag_SPEAK_e;
@@ -446,7 +408,6 @@ int daObj_SSDrink_c::orderEvent() {
     return 1;
 }
 
-/* 80CE644C-80CE6454 00154C 0008+00 2/0 0/0 0/0 .text            wait__15daObj_SSDrink_cFPv */
 int daObj_SSDrink_c::wait(void* param_0) {
 #ifdef DEBUG
     switch (field_0xb08) {
@@ -459,7 +420,6 @@ int daObj_SSDrink_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80CE6454-80CE6514 001554 00C0+00 3/0 0/0 0/0 .text            talk__15daObj_SSDrink_cFPv */
 int daObj_SSDrink_c::talk(void* param_0) {
     int ret = 0;
 
@@ -479,7 +439,6 @@ int daObj_SSDrink_c::talk(void* param_0) {
     return ret;
 }
 
-/* 80CE6514-80CE6624 001614 0110+00 5/0 0/0 0/0 .text            drink__15daObj_SSDrink_cFPv */
 int daObj_SSDrink_c::drink(void* param_0) {
     int ret = 0;
 
@@ -508,39 +467,32 @@ int daObj_SSDrink_c::drink(void* param_0) {
     return ret;
 }
 
-/* 80CE6624-80CE6644 001724 0020+00 1/0 0/0 0/0 .text            daObj_SSDrink_Create__FPv */
 static int daObj_SSDrink_Create(void* i_this) {
     return ((daObj_SSDrink_c*)i_this)->create();
 }
 
-/* 80CE6644-80CE6664 001744 0020+00 1/0 0/0 0/0 .text            daObj_SSDrink_Delete__FPv */
 static int daObj_SSDrink_Delete(void* i_this) {
     return ((daObj_SSDrink_c*)i_this)->Delete();
 }
 
-/* 80CE6664-80CE6684 001764 0020+00 1/0 0/0 0/0 .text            daObj_SSDrink_Execute__FPv */
 static int daObj_SSDrink_Execute(void* i_this) {
     return ((daObj_SSDrink_c*)i_this)->Execute();
 }
 
-/* 80CE6684-80CE66A4 001784 0020+00 1/0 0/0 0/0 .text            daObj_SSDrink_Draw__FPv */
 static int daObj_SSDrink_Draw(void* i_this) {
     return ((daObj_SSDrink_c*)i_this)->Draw();
 }
 
-/* 80CE66A4-80CE66AC 0017A4 0008+00 1/0 0/0 0/0 .text            daObj_SSDrink_IsDelete__FPv */
 static int daObj_SSDrink_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CE6AA8-80CE6AC8 -00001 0020+00 1/0 0/0 0/0 .data            daObj_SSDrink_MethodTable */
 static actor_method_class daObj_SSDrink_MethodTable = {
     (process_method_func)daObj_SSDrink_Create,  (process_method_func)daObj_SSDrink_Delete,
     (process_method_func)daObj_SSDrink_Execute, (process_method_func)daObj_SSDrink_IsDelete,
     (process_method_func)daObj_SSDrink_Draw,
 };
 
-/* 80CE6AC8-80CE6AF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SSDRINK */
 extern actor_process_profile_definition g_profile_OBJ_SSDRINK = {
     fpcLy_CURRENT_e,             // mLayerID
     7,                           // mListID
diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp
index 0f063e19c7..59fbb9f9da 100644
--- a/src/d/actor/d_a_obj_ss_item.cpp
+++ b/src/d/actor/d_a_obj_ss_item.cpp
@@ -11,24 +11,20 @@
 #include "m_Do/m_Do_ext.h"
 #include "d/actor/d_a_myna.h"
 
-/* 80CE7F34-80CE7F40 -00001 000C+00 1/1 0/0 0/0 .data            l_resFileName */
 static char* l_resFileName[] = {
     "Always",
     "Always",
     "Pumpkin",
 };
 
-/* 80CE7F40-80CE7F4C 00000C 000C+00 1/1 0/0 0/0 .data            l_bmdIdxName */
 static int l_bmdIdxName[] = {0x23, 0x23, 0x00};
 
-/* 80CE7F4C-80CE7F58 -00001 000C+00 1/2 0/0 0/0 .data            l_bmdFileName */
 static char* l_bmdFileName[] = {
     "",
     "",
     "pumpkin.bmd",
 };
 
-/* 80CE7EB0-80CE7EE0 000000 0030+00 5/5 0/0 0/0 .rodata          mCcDObjInfo__14daObj_SSItem_c */
 dCcD_SrcGObjInf const daObj_SSItem_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0, 0}, {0x79}}},
     {0, 0, 0, 0, {0}},
@@ -36,15 +32,12 @@ dCcD_SrcGObjInf const daObj_SSItem_c::mCcDObjInfo = {
     {{0}},
 };
 
-/* 80CE7F58-80CE7F9C 000024 0044+00 2/2 0/0 0/0 .data            mCcDCyl__14daObj_SSItem_c */
 dCcD_SrcCyl daObj_SSItem_c::mCcDCyl = {mCcDObjInfo, {}};
 
-/* 80CE6C18-80CE6E68 000078 0250+00 1/0 0/0 0/0 .text            __dt__14daObj_SSItem_cFv */
 daObj_SSItem_c::~daObj_SSItem_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 80CE6E68-80CE70CC 0002C8 0264+00 1/1 0/0 0/0 .text            create__14daObj_SSItem_cFv */
 int daObj_SSItem_c::create() {
     fopAcM_ct(this, daObj_SSItem_c);
     field_0xB0E = getTypeFromParam();
@@ -71,7 +64,6 @@ int daObj_SSItem_c::create() {
     }
 }
 
-/* 80CE7298-80CE7358 0006F8 00C0+00 1/1 0/0 0/0 .text            CreateHeap__14daObj_SSItem_cFv */
 BOOL daObj_SSItem_c::CreateHeap() {
     J3DModelData* modelData;
     if (l_bmdIdxName[field_0xB0E] != 0) {
@@ -85,13 +77,11 @@ BOOL daObj_SSItem_c::CreateHeap() {
     return mpModel != NULL;
 }
 
-/* 80CE7358-80CE738C 0007B8 0034+00 1/1 0/0 0/0 .text            Delete__14daObj_SSItem_cFv */
 int daObj_SSItem_c::Delete() {
     this->~daObj_SSItem_c();
     return 1;
 }
 
-/* 80CE738C-80CE7610 0007EC 0284+00 2/2 0/0 0/0 .text            Execute__14daObj_SSItem_cFv */
 int daObj_SSItem_c::Execute() {
     if (field_0xB0E == 2) {
         return 1;
@@ -144,7 +134,6 @@ int daObj_SSItem_c::Execute() {
     }
 }
 
-/* 80CE7610-80CE7710 000A70 0100+00 1/1 0/0 0/0 .text            Draw__14daObj_SSItem_cFv */
 int daObj_SSItem_c::Draw() {
     if (field_0xB0E == 2) {
         return 1;
@@ -165,13 +154,10 @@ int daObj_SSItem_c::Draw() {
     }
 }
 
-/* 80CE7758-80CE7778 000BB8 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daObj_SSItem_cFP10fopAc_ac_c           */
 int daObj_SSItem_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_SSItem_c*>(i_this)->CreateHeap();
 }
 
-/* 80CE7778-80CE77CC 000BD8 0054+00 1/0 0/0 0/0 .text            setSoldOut__14daObj_SSItem_cFv */
 void daObj_SSItem_c::setSoldOut() {
     if (getParentPtr() != NULL) {
         static_cast<daMyna_c*>(getParentPtr())->onEventFlag(0);
@@ -179,7 +165,6 @@ void daObj_SSItem_c::setSoldOut() {
     }
 }
 
-/* 80CE77CC-80CE77F8 000C2C 002C+00 1/0 0/0 0/0 .text            getProcessID__14daObj_SSItem_cFv */
 u32 daObj_SSItem_c::getProcessID() {
     if (field_0xB0E == 2) {
         return field_0xB04;
@@ -188,7 +173,6 @@ u32 daObj_SSItem_c::getProcessID() {
     }
 }
 
-/* 80CE77F8-80CE7838 000C58 0040+00 0/0 0/0 1/1 .text getExchangeItemPtr__14daObj_SSItem_cFv */
 daObj_SSItem_c* daObj_SSItem_c::getExchangeItemPtr() {
     if (field_0xB0E == 2) {
         return static_cast<daObj_SSItem_c*>(fopAcM_SearchByID(field_0xB04));
@@ -196,12 +180,10 @@ daObj_SSItem_c* daObj_SSItem_c::getExchangeItemPtr() {
     return this;
 }
 
-/* 80CE7838-80CE7850 000C98 0018+00 4/4 0/0 0/0 .text            getResName__14daObj_SSItem_cFv */
 char* daObj_SSItem_c::getResName() {
     return l_resFileName[field_0xB0E];
 }
 
-/* 80CE7850-80CE789C 000CB0 004C+00 1/1 0/0 0/0 .text getTypeFromParam__14daObj_SSItem_cFv */
 u8 daObj_SSItem_c::getTypeFromParam() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -215,8 +197,6 @@ u8 daObj_SSItem_c::getTypeFromParam() {
     }
 }
 
-/* 80CE789C-80CE78D4 000CFC 0038+00 1/1 0/0 0/0 .text            getFlowNodeNum__14daObj_SSItem_cFv
- */
 u16 daObj_SSItem_c::getFlowNodeNum() {
     u16 num = home.angle.x;
     bool bVar1 = false;
@@ -234,19 +214,16 @@ u16 daObj_SSItem_c::getFlowNodeNum() {
     return num2;
 }
 
-/* 80CE78D4-80CE78E0 000D34 000C+00 1/1 0/0 0/0 .text            getValue__14daObj_SSItem_cFv */
 u16 daObj_SSItem_c::getValue() {
     return (fopAcM_GetParam(this) >> 0xC) & 0xFFFF;
 }
 
-/* 80CE78E0-80CE7950 000D40 0070+00 1/1 0/0 0/0 .text            restart__14daObj_SSItem_cFv */
 void daObj_SSItem_c::restart() {
     current.angle.set(0, home.angle.y, 0);
     shape_angle = current.angle;
     setProcess(&daObj_SSItem_c::wait);
 }
 
-/* 80CE7950-80CE7B04 000DB0 01B4+00 1/1 0/0 0/0 .text            initialize__14daObj_SSItem_cFv */
 void daObj_SSItem_c::initialize() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f);
@@ -271,8 +248,6 @@ void daObj_SSItem_c::initialize() {
     Execute();
 }
 
-/* 80CE7B04-80CE7BB4 000F64 00B0+00 1/1 0/0 0/0 .text
- * setProcess__14daObj_SSItem_cFM14daObj_SSItem_cFPCvPvPv_i     */
 int daObj_SSItem_c::setProcess(ProcessFunc i_process) {
     mEventType = 2;
     if (mProcessFunc != NULL) {
@@ -287,7 +262,6 @@ int daObj_SSItem_c::setProcess(ProcessFunc i_process) {
     return 1;
 }
 
-/* 80CE7BB4-80CE7C24 001014 0070+00 1/1 0/0 0/0 .text            setParam__14daObj_SSItem_cFv */
 void daObj_SSItem_c::setParam() {
     scale.set(1.4f, 1.4f, 1.4f);
     cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
@@ -296,21 +270,17 @@ void daObj_SSItem_c::setParam() {
     gravity = -5.0f;
 }
 
-/* 80CE7C24-80CE7C80 001084 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__14daObj_SSItem_cFv
- */
 void daObj_SSItem_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80CE7C80-80CE7CC4 0010E0 0044+00 2/2 0/0 0/0 .text            setRoomNo__14daObj_SSItem_cFv */
 void daObj_SSItem_c::setRoomNo() {
     s32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
     mStts.SetRoomId(roomId);
 }
 
-/* 80CE7CC4-80CE7D28 001124 0064+00 1/1 0/0 0/0 .text            setMtx__14daObj_SSItem_cFv */
 void daObj_SSItem_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -318,13 +288,11 @@ void daObj_SSItem_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CE7D28-80CE7D5C 001188 0034+00 1/1 0/0 0/0 .text            setAttnPos__14daObj_SSItem_cFv */
 void daObj_SSItem_c::setAttnPos() {
     attention_info.position = current.pos;
     eyePos = current.pos;
 }
 
-/* 80CE7D5C-80CE7D8C 0011BC 0030+00 1/0 0/0 0/0 .text            wait__14daObj_SSItem_cFPv */
 int daObj_SSItem_c::wait(void* param_0) {
     switch (mEventType) {
     case 0:
@@ -377,39 +345,32 @@ int daObj_SSItem_c::cancel(void* param_0) {
     return 1;
 }
 
-/* 80CE7D8C-80CE7DAC 0011EC 0020+00 1/0 0/0 0/0 .text            daObj_SSItem_Create__FPv */
 static int daObj_SSItem_Create(void* i_this) {
     return static_cast<daObj_SSItem_c*>(i_this)->create();
 }
 
-/* 80CE7DAC-80CE7DCC 00120C 0020+00 1/0 0/0 0/0 .text            daObj_SSItem_Delete__FPv */
 static int daObj_SSItem_Delete(void* i_this) {
     return static_cast<daObj_SSItem_c*>(i_this)->Delete();
 }
 
-/* 80CE7DCC-80CE7DEC 00122C 0020+00 1/0 0/0 0/0 .text            daObj_SSItem_Execute__FPv */
 static int daObj_SSItem_Execute(void* i_this) {
     return static_cast<daObj_SSItem_c*>(i_this)->Execute();
 }
 
-/* 80CE7DEC-80CE7E0C 00124C 0020+00 1/0 0/0 0/0 .text            daObj_SSItem_Draw__FPv */
 static int daObj_SSItem_Draw(void* i_this) {
     return static_cast<daObj_SSItem_c*>(i_this)->Draw();
 }
 
-/* 80CE7E0C-80CE7E14 00126C 0008+00 1/0 0/0 0/0 .text            daObj_SSItem_IsDelete__FPv */
 static int daObj_SSItem_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80CE7FA8-80CE7FC8 -00001 0020+00 1/0 0/0 0/0 .data            daObj_SSItem_MethodTable */
 static actor_method_class daObj_SSItem_MethodTable = {
     (process_method_func)daObj_SSItem_Create,  (process_method_func)daObj_SSItem_Delete,
     (process_method_func)daObj_SSItem_Execute, (process_method_func)daObj_SSItem_IsDelete,
     (process_method_func)daObj_SSItem_Draw,
 };
 
-/* 80CE7FC8-80CE7FF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SSITEM */
 extern actor_process_profile_definition g_profile_OBJ_SSITEM = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp
index e3125be585..99c5f04d43 100644
--- a/src/d/actor/d_a_obj_stairBlock.cpp
+++ b/src/d/actor/d_a_obj_stairBlock.cpp
@@ -7,14 +7,12 @@
 
 #include "d/actor/d_a_obj_stairBlock.h"
 
-/* 80CE816C-80CE81AC 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__18daStairBlock_HIO_cFv */
 daStairBlock_HIO_c::daStairBlock_HIO_c() {
     for (int i = 0; i < 10; i++) {
         collision_radius[i] = 0.0f;
     }
 }
 
-/* 80CE81F4-80CE82A0 000174 00AC+00 1/1 0/0 0/0 .text            setBaseMtx__14daStairBlock_cFv */
 void daStairBlock_c::setBaseMtx() {
     for (int i = 0; i < 10; i++) {
         mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
@@ -24,7 +22,6 @@ void daStairBlock_c::setBaseMtx() {
     }
 }
 
-/* 80CE8DC0-80CE8DF0 000004 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__14daStairBlock_c */
 const dCcD_SrcGObjInf daStairBlock_c::mCcDObjInfo = {
     {0, {0, 0, 0, {0x0, 0x0}, {0x19}}},
     {dCcD_SE_NONE, 0, 0, 0, 0x0},
@@ -32,17 +29,14 @@ const dCcD_SrcGObjInf daStairBlock_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80CE8DF0-80CE8E18 000034 0028+00 0/1 0/0 0/0 .rodata          l_bmdIdx */
 static const s32 l_bmdIdx[10] = {
     0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19,
 };
 
-/* 80CE8E18-80CE8E40 00005C 0028+00 0/1 0/0 0/0 .rodata          l_bckIdx */
 static const s32 l_bckIdx[10] = {
     0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D,
 };
 
-/* 80CE8E40-80CE8EB8 000084 0078+00 0/1 0/0 0/0 .rodata          centerPos */
 static const Vec centerPos[10] = {
     {28214.64f, -2576.334f, 7412.408f},   {28217.744f, -2681.6169f, 7392.684f},
     {28336.742f, -2641.343f, 7329.605f},  {27901.223f, -2526.949f, 7028.0098f},
@@ -51,7 +45,6 @@ static const Vec centerPos[10] = {
     {27985.621f, -2644.115f, 6984.075f},  {27985.621f, -2644.115f, 6984.075f},
 };
 
-/* 80CE82A0-80CE83F0 000220 0150+00 1/0 0/0 0/0 .text            CreateHeap__14daStairBlock_cFv */
 int daStairBlock_c::CreateHeap() {
     for (int i = 0; i < 10; i++) {
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("StaBlock", l_bmdIdx[i]);
@@ -70,7 +63,6 @@ int daStairBlock_c::CreateHeap() {
     return 1;
 }
 
-/* 80CE83F0-80CE85B0 000370 01C0+00 1/1 0/0 0/0 .text            create__14daStairBlock_cFv */
 int daStairBlock_c::create() {
     fopAcM_ct(this, daStairBlock_c);
 
@@ -100,16 +92,12 @@ int daStairBlock_c::create() {
     return phase;
 }
 
-/* 80CE8874-80CE88A0 0007F4 002C+00 1/1 0/0 0/0 .text
- * createHeapCallBack__14daStairBlock_cFP10fopAc_ac_c           */
 int daStairBlock_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daStairBlock_c*>(i_this)->CreateHeap();
 }
 
-/* 80CE8FD4-80CE9000 000014 002C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daStairBlock_HIO_c l_HIO;
 
-/* 80CE88A0-80CE8B24 000820 0284+00 1/0 0/0 0/0 .text            Execute__14daStairBlock_cFv */
 int daStairBlock_c::Execute() {
     for (int i = 0; i < 10; i++) {
         if (mSpheres[i].ChkCoHit()) {
@@ -139,7 +127,6 @@ int daStairBlock_c::Execute() {
     return 1;
 }
 
-/* 80CE8B24-80CE8C08 000AA4 00E4+00 1/0 0/0 0/0 .text            Draw__14daStairBlock_cFv */
 int daStairBlock_c::Draw() {
     g_env_light.settingTevStruct(0x40, &current.pos, &tevStr);
     dComIfGd_setListBG();
@@ -153,7 +140,6 @@ int daStairBlock_c::Draw() {
     return 1;
 }
 
-/* 80CE8C08-80CE8C38 000B88 0030+00 1/0 0/0 0/0 .text            Delete__14daStairBlock_cFv */
 int daStairBlock_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "StaBlock");
 
@@ -164,38 +150,30 @@ int daStairBlock_c::Delete() {
     return 1;
 }
 
-/* 80CE8C38-80CE8C64 000BB8 002C+00 1/0 0/0 0/0 .text daStairBlock_Draw__FP14daStairBlock_c */
 static int daStairBlock_Draw(daStairBlock_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80CE8C64-80CE8C90 000BE4 002C+00 1/0 0/0 0/0 .text daStairBlock_Execute__FP14daStairBlock_c */
 static int daStairBlock_Execute(daStairBlock_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80CE8C90-80CE8CBC 000C10 002C+00 1/0 0/0 0/0 .text daStairBlock_Delete__FP14daStairBlock_c */
 static int daStairBlock_Delete(daStairBlock_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80CE8CBC-80CE8CDC 000C3C 0020+00 1/0 0/0 0/0 .text            daStairBlock_Create__FP10fopAc_ac_c
- */
 static int daStairBlock_Create(fopAc_ac_c* i_this) {
     return static_cast<daStairBlock_c*>(i_this)->create();
 }
 
-/* 80CE8ED8-80CE8F18 000000 0040+00 2/2 0/0 0/0 .data            mCcDSph__14daStairBlock_c */
 dCcD_SrcSph daStairBlock_c::mCcDSph = {daStairBlock_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 4.0f}}};
 
-/* 80CE8F18-80CE8F38 -00001 0020+00 1/0 0/0 0/0 .data            l_daStairBlock_Method */
 static actor_method_class l_daStairBlock_Method = {
     (process_method_func)daStairBlock_Create,  (process_method_func)daStairBlock_Delete,
     (process_method_func)daStairBlock_Execute, 0,
     (process_method_func)daStairBlock_Draw,
 };
 
-/* 80CE8F38-80CE8F68 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_StairBlock */
 extern actor_process_profile_definition g_profile_Obj_StairBlock = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp
index 5b275c4fff..b868cc59c1 100644
--- a/src/d/actor/d_a_obj_stick.cpp
+++ b/src/d/actor/d_a_obj_stick.cpp
@@ -7,17 +7,14 @@
 
 #include "d/actor/d_a_obj_stick.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "d/d_resorce.h"
 #include "m_Do/m_Do_ext.h"
 #include "d/actor/d_a_npc.h"
 
-/* 80599E3C-80599E4C 000000 0010+00 3/3 0/0 0/0 .rodata          m__19daObj_Stick_Param_c */
 const daObj_Stick_Param_c::daObj_Stick_HIOParam daObj_Stick_Param_c::m = {
     0.0f, -3.0f, 1.0f, 100.0f
 };
 
-/* 80599E70-80599EB0 000000 0040+00 2/2 0/0 0/0 .data            mCcDSph__13daObj_Stick_c */
 dCcD_SrcSph daObj_Stick_c::mCcDSph = {
     daNpcT_c::mCcDObjData,                                               // mObjInf
     {
@@ -25,15 +22,12 @@ dCcD_SrcSph daObj_Stick_c::mCcDSph = {
     }  // mSphAttr
 };
 
-/* 80599EB0-80599EB4 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "Taro6";
 
-/* 8059922C-805993E8 0000EC 01BC+00 1/0 0/0 0/0 .text            __dt__13daObj_Stick_cFv */
 daObj_Stick_c::~daObj_Stick_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 805993E8-805996BC 0002A8 02D4+00 1/1 0/0 0/0 .text            create__13daObj_Stick_cFv */
 int daObj_Stick_c::create() {
     fopAcM_ct(this, daObj_Stick_c);
 
@@ -78,7 +72,6 @@ int daObj_Stick_c::create() {
     return phase_state;
 }
 
-/* 80599888-80599900 000748 0078+00 1/1 0/0 0/0 .text            CreateHeap__13daObj_Stick_cFv */
 int daObj_Stick_c::CreateHeap() {
     J3DModelData* objectRes = (J3DModelData*)dComIfG_getObjectRes(getResName(), 3);
     if (objectRes == NULL) {
@@ -93,14 +86,12 @@ int daObj_Stick_c::CreateHeap() {
     return 1;
 }
 
-/* 80599900-80599934 0007C0 0034+00 1/1 0/0 0/0 .text            Delete__13daObj_Stick_cFv */
 int daObj_Stick_c::Delete() {
     this->~daObj_Stick_c();
 
     return 1;
 }
 
-/* 80599934-80599A78 0007F4 0144+00 2/2 0/0 0/0 .text            Execute__13daObj_Stick_cFv */
 int daObj_Stick_c::Execute() {
     mAcch.CrrPos(dComIfG_Bgsp());
     mGndChk = mAcch.m_gnd;
@@ -121,7 +112,6 @@ int daObj_Stick_c::Execute() {
     return 1;
 }
 
-/* 80599A78-80599B3C 000938 00C4+00 1/1 0/0 0/0 .text            Draw__13daObj_Stick_cFv */
 int daObj_Stick_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -146,18 +136,14 @@ int daObj_Stick_c::Draw() {
     return 1;
 }
 
-/* 80599B3C-80599B5C 0009FC 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daObj_Stick_cFP10fopAc_ac_c            */
 int daObj_Stick_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_Stick_c*>(i_this)->CreateHeap();
 }
 
-/* 80599B5C-80599B6C 000A1C 0010+00 3/3 0/0 0/0 .text            getResName__13daObj_Stick_cFv */
 const char* daObj_Stick_c::getResName() {
     return l_resName;
 }
 
-/* 80599B6C-80599B8C 000A2C 0020+00 1/1 0/0 0/0 .text            isDelete__13daObj_Stick_cFv */
 BOOL daObj_Stick_c::isDelete() {
     switch(mType) {
         case 0:
@@ -167,20 +153,16 @@ BOOL daObj_Stick_c::isDelete() {
     }
 }
 
-/* 80599B8C-80599BE8 000A4C 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__13daObj_Stick_cFv
- */
 void daObj_Stick_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80599BE8-80599C28 000AA8 0040+00 2/2 0/0 0/0 .text            setRoomNo__13daObj_Stick_cFv */
 void daObj_Stick_c::setRoomNo() {
     u32 roomId = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomId);
 }
 
-/* 80599C28-80599C8C 000AE8 0064+00 1/1 0/0 0/0 .text            setMtx__13daObj_Stick_cFv */
 void daObj_Stick_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -188,32 +170,26 @@ void daObj_Stick_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80599C8C-80599CAC 000B4C 0020+00 1/0 0/0 0/0 .text            daObj_Stick_Create__FPv */
 static u32 daObj_Stick_Create(void* i_this) {
     return static_cast<daObj_Stick_c*>(i_this)->create();
 }
 
-/* 80599CAC-80599CCC 000B6C 0020+00 1/0 0/0 0/0 .text            daObj_Stick_Delete__FPv */
 static void daObj_Stick_Delete(void* param_0) {
     static_cast<daObj_Stick_c*>(param_0)->Delete();
 }
 
-/* 80599CCC-80599CEC 000B8C 0020+00 1/0 0/0 0/0 .text            daObj_Stick_Execute__FPv */
 static void daObj_Stick_Execute(void* param_0) {
     static_cast<daObj_Stick_c*>(param_0)->Execute();
 }
 
-/* 80599CEC-80599D0C 000BAC 0020+00 1/0 0/0 0/0 .text            daObj_Stick_Draw__FPv */
 static void daObj_Stick_Draw(void* param_0) {
     static_cast<daObj_Stick_c*>(param_0)->Draw();
 }
 
-/* 80599D0C-80599D14 000BCC 0008+00 1/0 0/0 0/0 .text            daObj_Stick_IsDelete__FPv */
 static bool daObj_Stick_IsDelete(void* param_0) {
     return true;
 }
 
-/* 80599EB4-80599ED4 -00001 0020+00 1/0 0/0 0/0 .data            daObj_Stick_MethodTable */
 static actor_method_class daObj_Stick_MethodTable = {
     (process_method_func)daObj_Stick_Create,
     (process_method_func)daObj_Stick_Delete,
@@ -222,7 +198,6 @@ static actor_method_class daObj_Stick_MethodTable = {
     (process_method_func)daObj_Stick_Draw,
 };
 
-/* 80599ED4-80599F04 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_STICK */
 extern actor_process_profile_definition g_profile_OBJ_STICK = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
@@ -240,5 +215,4 @@ extern actor_process_profile_definition g_profile_OBJ_STICK = {
   fopAc_CULLBOX_CUSTOM_e,   // cullType
 };
 
-/* 80599F94-80599F98 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_Stick_Param_c l_HIO;
diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp
index edf2a96a5c..54038f2b6e 100644
--- a/src/d/actor/d_a_obj_stone.cpp
+++ b/src/d/actor/d_a_obj_stone.cpp
@@ -16,10 +16,8 @@
 #include "SSystem/SComponent/c_math.h"
 #include "cmath.h"
 
-/* 80CECAB4-80CECABC 000000 0008+00 14/14 0/0 0/0 .rodata          l_bmdIdx */
 const static int l_bmdIdx[2] = {3, 3};
 
-/* 80CECABC-80CECAFC 000008 0040+00 0/1 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0, {{AT_TYPE_THROW_OBJ, 0x03, 0x13}, {0xD8FAFDFF, 0x11}, 0x79}},
@@ -34,116 +32,93 @@ const static dCcD_SrcSph l_sph_src = {
         },
     }};
 
-/* 80CECAFC-80CECB04 000048 0008+00 0/3 0/0 0/0 .rodata          l_r */
 // radius
 const static f32 l_r[2] = {
     30.0f,
     50.0f,
 };
 
-/* 80CECB04-80CECB0C 000050 0008+00 0/1 0/0 0/0 .rodata          l_rolling_speedF */
 const static f32 l_rolling_speedF[2] = {9.0f, 9.0f};
 
-/* 80CECB0C-80CECB14 000058 0008+00 0/0 0/0 0/0 .rodata          l_rolling_time */
 const static u32 l_rolling_time[2] = {
     30,
     23,
 };
 
-/* 80CECB14-80CECB1C 000060 0008+00 1/2 0/0 0/0 .rodata          l_initial_offsetY */
 const static f32 l_initial_offsetY[2] = {10.0f, 20.0f};
 
-/* 80CECB1C-80CECB24 000068 0008+00 0/3 0/0 0/0 .rodata          l_put_offsetY */
 const static f32 l_put_offsetY[2] = {20.0f, 30.0f};
 
-/* 80CECB24-80CECB28 000070 0002+02 1/2 0/0 0/0 .rodata          l_weight */
 const static u8 l_weight[2] = {120, 200};
 
-/* 80CECB28-80CECB30 000074 0008+00 0/1 0/0 0/0 .rodata          l_speedH */
 const static f32 l_speedH[2] = {
     36.0f,
     43.0f,
 };
 
-/* 80CECB30-80CECB38 00007C 0008+00 0/1 0/0 0/0 .rodata          l_speedV */
 const static f32 l_speedV[2] = {
     27.0f,
     22.0f,
 };
 
-/* 80CECB38-80CECB40 000084 0008+00 0/1 0/0 0/0 .rodata          l_water_speedH */
 const static f32 l_water_speedH[2] = {
     5.0f,
     5.0f,
 };
 
-/* 80CECB40-80CECB48 00008C 0008+00 0/1 0/0 0/0 .rodata          l_water_speedV */
 const static f32 l_water_speedV[2] = {
     5.0f,
     5.0f,
 };
 
-/* 80CECB48-80CECB50 000094 0008+00 0/1 0/0 0/0 .rodata          l_water_resist */
 const static f32 l_water_resist[2] = {
     0.02f,
     0.02f,
 };
 
-/* 80CECB50-80CECB58 00009C 0008+00 0/1 0/0 0/0 .rodata          l_water_walk_resist */
 const static f32 l_water_walk_resist[2] = {
     0.15f,
     0.15f,
 };
 
-/* 80CECB58-80CECB60 0000A4 0008+00 0/2 0/0 0/0 .rodata          l_buoyancy */
 const static f32 l_buoyancy[2] = {
     5.9f,
     5.9f,
 };
 
-/* 80CECB60-80CECB68 0000AC 0008+00 1/1 0/0 0/0 .rodata          l_shadow_size */
 const static f32 l_shadow_size[2] = {40.0f, 65.0f};
 
-/* 80CECB68-80CECB70 0000B4 0008+00 0/1 0/0 0/0 .rodata          l_wpillar_scl */
 const static f32 l_wpillar_scl[2] = {
     0.65f,
     1.1f,
 };
 
-/* 80CECB70-80CECB78 0000BC 0008+00 0/1 0/0 0/0 .rodata          l_hamon_scl */
 const static f32 l_hamon_scl[2] = {
     0.7f,
     1.2f,
 };
 
-/* 80CECB78-80CECB80 0000C4 0008+00 0/1 0/0 0/0 .rodata          l_yogan_eff_scl */
 const static f32 l_yogan_eff_scl[2] = {
     0.6f,
     1.1f,
 };
 
-/* 80CECB80-80CECB88 0000CC 0008+00 0/1 0/0 0/0 .rodata          l_wall_h */
 const static f32 l_wall_h[2] = {
     30.0f,
     50.0f,
 };
 
-/* 80CECB88-80CECB90 0000D4 0008+00 0/1 0/0 0/0 .rodata          l_wall_r */
 const static f32 l_wall_r[2] = {30.0f, 50.0f};
 
-/* 80CECB90-80CECB94 0000DC 0004+00 0/1 0/0 0/0 .rodata          l_rot_angle */
 const static s16 l_rot_angle[2] = {35, 18};
 
-/* 80CECB94-80CECB98 0000E0 0004+00 0/1 0/0 0/0 .rodata          l_walk_rot_angle */
 const static s16 l_walk_rot_angle[2] = {40, 40};
 
-/* 80CECC74-80CECC7C -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "D_Srock",  // small rock
     "D_Brock",  // big rock
 };
 
-/* 80CE9078-80CE935C 000078 02E4+00 1/1 0/0 0/0 .text            bound__FP4cXyzRC13cBgS_PolyInfof */
 static f32 bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) {
     cM3dGPla plane;
     f32 ret;
@@ -160,12 +135,10 @@ static f32 bound(cXyz* param_0, cBgS_PolyInfo const& param_1, f32 param_2) {
     }
 }
 
-/* 80CE93A4-80CE93C4 0003A4 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static bool CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjStone_c*>(i_this)->CreateHeap();
 }
 
-/* 80CE93C4-80CE9468 0003C4 00A4+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjStone_cFv */
 void daObjStone_c::initBaseMtx() {
     field_0x0910 = cXyz::Zero;
     field_0x091c = 0;
@@ -175,7 +148,6 @@ void daObjStone_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CE9468-80CE9540 000468 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjStone_cFv */
 void daObjStone_c::setBaseMtx() {
     mDoMtx_quatMultiply(&field_0x0920, &field_0x0930, &field_0x0920);
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mInitialOffsetY, current.pos.z);
@@ -187,7 +159,6 @@ void daObjStone_c::setBaseMtx() {
     field_0x0920 = ZeroQuat;
 }
 
-/* 80CE9540-80CE97C0 000540 0280+00 1/1 0/0 0/0 .text            Create__12daObjStone_cFv */
 int daObjStone_c::Create() {
     mShapeAngle = shape_angle;
     shape_angle.setall(0);
@@ -251,7 +222,6 @@ int daObjStone_c::Create() {
 }
 
 
-/* 80CE97C0-80CE9840 0007C0 0080+00 1/1 0/0 0/0 .text            CreateHeap__12daObjStone_cFv */
 bool daObjStone_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create(
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mStoneType], l_bmdIdx[mStoneType]), 0x80000,
@@ -259,7 +229,6 @@ bool daObjStone_c::CreateHeap() {
     return mpModel != NULL;
 }
 
-/* 80CE9840-80CE99D4 000840 0194+00 1/1 0/0 0/0 .text            create__12daObjStone_cFv */
 int daObjStone_c::create() {
     fopAcM_ct(this, daObjStone_c);
 
@@ -282,7 +251,6 @@ int daObjStone_c::create() {
     return phase;
 }
 
-/* 80CE9BA0-80CE9CF8 000BA0 0158+00 1/1 0/0 0/0 .text            execute__12daObjStone_cFv */
 int daObjStone_c::execute() {
     cXyz pos;
 
@@ -310,7 +278,6 @@ int daObjStone_c::execute() {
     return 1;
 }
 
-/* 80CE9CF8-80CEAF10 000CF8 1218+00 1/1 0/0 0/0 .text            mode_proc_call__12daObjStone_cFv */
 void daObjStone_c::mode_proc_call() {
     static daObjStone_c::modeFunc l_func[7] = {
         &daObjStone_c::modeWait,
@@ -525,8 +492,6 @@ void daObjStone_c::mode_proc_call() {
     field_0x0951 = isWallhit != 0;
 }
 
-/* 80CEAF88-80CEAFD8 001F88 0050+00 1/1 0/0 0/0 .text            init_modePutWait__12daObjStone_cFv
- */
 void daObjStone_c::init_modePutWait() {
     mCollider.OffAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -536,12 +501,10 @@ void daObjStone_c::init_modePutWait() {
     field_0x0907 = 3;
 }
 
-/* 80CEAFD8-80CEAFE8 001FD8 0010+00 1/0 0/0 0/0 .text            modePutWait__12daObjStone_cFv */
 void daObjStone_c::modePutWait() {
     mMode++;
 }
 
-/* 80CEAFE8-80CEB01C 001FE8 0034+00 2/2 0/0 0/0 .text            init_modeWait__12daObjStone_cFv */
 void daObjStone_c::init_modeWait() {
     mCollider.OffAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -550,7 +513,6 @@ void daObjStone_c::init_modeWait() {
     field_0x0907 = 0;
 }
 
-/* 80CEB01C-80CEB0B8 00201C 009C+00 1/0 0/0 0/0 .text            modeWait__12daObjStone_cFv */
 void daObjStone_c::modeWait() {
     mMode++;
     speedF *= 0.95f;
@@ -563,7 +525,6 @@ void daObjStone_c::modeWait() {
     }
 }
 
-/* 80CEB0B8-80CEB0F8 0020B8 0040+00 1/1 0/0 0/0 .text            init_modeDrop__12daObjStone_cFv */
 void daObjStone_c::init_modeDrop() {
     mCollider.OnAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -573,7 +534,6 @@ void daObjStone_c::init_modeDrop() {
     field_0x0907 = 1;
 }
 
-/* 80CEB0F8-80CEB35C 0020F8 0264+00 1/0 0/0 0/0 .text            modeDrop__12daObjStone_cFv */
 void daObjStone_c::modeDrop() {
     cXyz pos2, pos;
     mMode++;
@@ -606,7 +566,6 @@ void daObjStone_c::modeDrop() {
 }
 
 
-/* 80CEB35C-80CEB480 00235C 0124+00 1/1 0/0 0/0 .text            init_modeCarry__12daObjStone_cFv */
 void daObjStone_c::init_modeCarry() {
     mCollider.OffCoSPrmBit(1);
     mCollider.OffAtSPrmBit(1);
@@ -624,7 +583,6 @@ void daObjStone_c::init_modeCarry() {
     field_0x0907 = 2;
 }
 
-/* 80CEB480-80CEB6E8 002480 0268+00 1/0 0/0 0/0 .text            modeCarry__12daObjStone_cFv */
 void daObjStone_c::modeCarry() {
     mMode++;
 
@@ -689,7 +647,6 @@ void daObjStone_c::modeCarry() {
     }
 }
 
-/* 80CEB6E8-80CEB720 0026E8 0038+00 2/2 0/0 0/0 .text            init_modeWalk__12daObjStone_cFv */
 void daObjStone_c::init_modeWalk() {
     mCollider.OffAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -698,7 +655,6 @@ void daObjStone_c::init_modeWalk() {
     field_0x0907 = 4;
 }
 
-/* 80CEB720-80CEBCDC 002720 05BC+00 1/0 0/0 0/0 .text            modeWalk__12daObjStone_cFv */
 void daObjStone_c::modeWalk() {
     mMode++;
     if (field_0x0908 == 0) {
@@ -778,8 +734,6 @@ void daObjStone_c::modeWalk() {
     }
 }
 
-/* 80CEBCDC-80CEBE24 002CDC 0148+00 1/1 0/0 0/0 .text init_modePushWolfNonBreak__12daObjStone_cFv
- */
 void daObjStone_c::init_modePushWolfNonBreak() {
     mCollider.OffAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -800,7 +754,6 @@ void daObjStone_c::init_modePushWolfNonBreak() {
     field_0x0907 = 4;
 }
 
-/* 80CEBE24-80CEBE84 002E24 0060+00 1/1 0/0 0/0 .text            init_modeYogan__12daObjStone_cFv */
 void daObjStone_c::init_modeYogan() {
     mCollider.OffAtSPrmBit(1);
     mCollider.OnCoSPrmBit(1);
@@ -812,7 +765,6 @@ void daObjStone_c::init_modeYogan() {
     field_0x0907 = 6;
 }
 
-/* 80CEBE84-80CEBF1C 002E84 0098+00 1/0 0/0 0/0 .text            modeYogan__12daObjStone_cFv */
 void daObjStone_c::modeYogan() {
     f32 height = mChkObj.m_wtr.GetHeight();
     f32 pos_y = 200.0f + current.pos.y;
@@ -830,12 +782,10 @@ void daObjStone_c::modeYogan() {
     mMode++;
 }
 
-/* 80CECC20-80CECC2C 00016C 0006+06 0/1 0/0 0/0 .rodata          l_eff_id$5089 */
 const static u16 l_eff_id[3] = {
     0x859B, 0x859C, 0x859D,
 };
 
-/* 80CEBF1C-80CEC180 002F1C 0264+00 1/1 0/0 0/0 .text            init_modeBreak__12daObjStone_cFv */
 void daObjStone_c::init_modeBreak() {
     if (field_0x0907 != 5) {
         fopAcM_cancelCarryNow(this);
@@ -873,13 +823,11 @@ void daObjStone_c::init_modeBreak() {
     }
 }
 
-/* 80CEC180-80CEC1AC 003180 002C+00 1/0 0/0 0/0 .text            modeBreak__12daObjStone_cFv */
 void daObjStone_c::modeBreak() {
     mMode++;
     fopAcM_delete(this);
 }
 
-/* 80CEC1AC-80CEC264 0031AC 00B8+00 1/1 0/0 0/0 .text            CrrPos__12daObjStone_cFv */
 void daObjStone_c::CrrPos() {
     bool check1 = false;
     bool check2 = false;
@@ -905,7 +853,6 @@ void daObjStone_c::CrrPos() {
     }
 }
 
-/* 80CEC264-80CEC33C 003264 00D8+00 3/3 0/0 0/0 .text            createItem__12daObjStone_cFv */
 void daObjStone_c::createItem() {
     int item_no = getItemNo();
     int item_bit = getItemBit();
@@ -922,8 +869,6 @@ void daObjStone_c::createItem() {
     }
 }
 
-/* 80CEC33C-80CEC5BC 00333C 0280+00 2/2 0/0 0/0 .text            calcRotBaseMtx__12daObjStone_cFPs
- */
 void daObjStone_c::calcRotBaseMtx(s16* param_1) {
     cXyz local_5c = current.pos - old.pos;
     cXyz cStack_68(local_5c.x, 0.0f, local_5c.z);
@@ -966,7 +911,6 @@ void daObjStone_c::calcRotBaseMtx(s16* param_1) {
     }
 }
 
-/* 80CEC5BC-80CEC6D8 0035BC 011C+00 1/1 0/0 0/0 .text            checkRollAngle__12daObjStone_cFv */
 int daObjStone_c::checkRollAngle() {
     f32 dVar11 = 89.0f;
     cXyz pos = current.pos;
@@ -989,10 +933,8 @@ int daObjStone_c::checkRollAngle() {
     return 0;
 }
 
-/* 80CECC34-80CECC3C 000180 0006+02 0/1 0/0 0/0 .rodata          l_carry_eff_id$5307 */
 const static u16 l_carry_eff_id[3] = {0x859E, 0x859F, 0x85A0};
 
-/* 80CEC6D8-80CEC7DC 0036D8 0104+00 1/1 0/0 0/0 .text            set_carry_eff__12daObjStone_cFv */
 void daObjStone_c::set_carry_eff() {
     cXyz pos;
 
@@ -1014,7 +956,6 @@ void daObjStone_c::set_carry_eff() {
     }
 }
 
-/* 80CEC7DC-80CEC888 0037DC 00AC+00 2/2 0/0 0/0 .text            effect_delete__12daObjStone_cFb */
 void daObjStone_c::effect_delete(bool param_1) {
     for (int i = 0; i < 3; i = i + 1) {
         if (field_0x0964[i] != NULL) {
@@ -1032,7 +973,6 @@ void daObjStone_c::effect_delete(bool param_1) {
     }
 }
 
-/* 80CEC888-80CEC948 003888 00C0+00 1/1 0/0 0/0 .text            draw__12daObjStone_cFv */
 int daObjStone_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -1049,7 +989,6 @@ int daObjStone_c::draw() {
     return 1;
 }
 
-/* 80CEC948-80CEC9BC 003948 0074+00 1/1 0/0 0/0 .text            _delete__12daObjStone_cFv */
 int daObjStone_c::_delete() {
     mSound.deleteObject();
     u16 setid = fopAcM_GetSetId(this);
@@ -1059,30 +998,22 @@ int daObjStone_c::_delete() {
     return 1;
 }
 
-/* 80CEC9BC-80CEC9DC 0039BC 0020+00 1/0 0/0 0/0 .text            daObjStone_Draw__FP12daObjStone_c
- */
 static int daObjStone_Draw(daObjStone_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CEC9DC-80CEC9FC 0039DC 0020+00 1/0 0/0 0/0 .text daObjStone_Execute__FP12daObjStone_c */
 static int daObjStone_Execute(daObjStone_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CEC9FC-80CECA1C 0039FC 0020+00 1/0 0/0 0/0 .text            daObjStone_Delete__FP12daObjStone_c
- */
 static int daObjStone_Delete(daObjStone_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80CECA1C-80CECA3C 003A1C 0020+00 1/0 0/0 0/0 .text            daObjStone_Create__FP10fopAc_ac_c
- */
 static int daObjStone_Create(fopAc_ac_c* param_0) {
     return static_cast<daObjStone_c*>(param_0)->create();
 }
 
-/* 80CECD24-80CECD44 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjStone_Method */
 static actor_method_class l_daObjStone_Method = {
     (process_method_func)daObjStone_Create,
     (process_method_func)daObjStone_Delete,
@@ -1091,7 +1022,6 @@ static actor_method_class l_daObjStone_Method = {
     (process_method_func)daObjStone_Draw,
 };
 
-/* 80CECD44-80CECD74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Stone */
 extern actor_process_profile_definition g_profile_Obj_Stone = {
     fpcLy_CURRENT_e,        // mLayerID
     8,                      // mListID
diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp
index fa0dfa2aff..2fc0713860 100644
--- a/src/d/actor/d_a_obj_stoneMark.cpp
+++ b/src/d/actor/d_a_obj_stoneMark.cpp
@@ -13,22 +13,18 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 8059A410-8059A414 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "A_IwaAto";
 
-/* 8059A018-8059A038 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjSMark_cFv */
 void daObjSMark_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8059A038-8059A080 000098 0048+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjSMark_cFv */
 void daObjSMark_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     MTXCopy(mDoMtx_stack_c::get(), cullMtx);
 }
 
-/* 8059A080-8059A168 0000E0 00E8+00 1/1 0/0 0/0 .text            Create__12daObjSMark_cFv */
 int daObjSMark_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, cullMtx);
@@ -41,7 +37,6 @@ int daObjSMark_c::Create() {
     return 1;
 }
 
-/* 8059A168-8059A25C 0001C8 00F4+00 1/1 0/0 0/0 .text            create__12daObjSMark_cFv */
 int daObjSMark_c::create() {
     fopAcM_ct(this, daObjSMark_c);
 
@@ -55,7 +50,6 @@ int daObjSMark_c::create() {
     return phase;
 }
 
-/* 8059A2CC-8059A33C 00032C 0070+00 1/1 0/0 0/0 .text            draw__12daObjSMark_cFv */
 int daObjSMark_c::draw() {
     static const f32 l_shadow_size[2] = {55.0f, 85.0f};
     dComIfGd_setSimpleShadow(&current.pos, mObjAcch.GetGroundH(),
@@ -65,31 +59,22 @@ int daObjSMark_c::draw() {
     return 1;
 }
 
-/* 8059A33C-8059A370 00039C 0034+00 1/1 0/0 0/0 .text            _delete__12daObjSMark_cFv */
 int daObjSMark_c::_delete() {
     dComIfG_resDelete(&mpPhase, l_arcName);
     return 1;
 }
-/* 8059A370-8059A390 0003D0 0020+00 1/0 0/0 0/0 .text            daObjSMark_Draw__FP12daObjSMark_c
- */
 static int daObjSMark_Draw(daObjSMark_c* i_this) {
     return i_this->draw();
 }
 
-/* 8059A390-8059A3B0 0003F0 0020+00 1/0 0/0 0/0 .text            daObjSMark_Delete__FP12daObjSMark_c
- */
 static int daObjSMark_Delete(daObjSMark_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8059A3B0-8059A3D0 000410 0020+00 1/0 0/0 0/0 .text            daObjSMark_Create__FP10fopAc_ac_c
- */
 static int daObjSMark_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjSMark_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 8059A414-8059A434 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSMark_Method */
 static actor_method_class l_daObjSMark_Method = {
     (process_method_func)daObjSMark_Create,
     (process_method_func)daObjSMark_Delete,
@@ -98,7 +83,6 @@ static actor_method_class l_daObjSMark_Method = {
     (process_method_func)daObjSMark_Draw,
 };
 
-/* 8059A434-8059A464 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_StoneMark */
 extern actor_process_profile_definition g_profile_Obj_StoneMark = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp
index d83dca2826..a8ef3e2c54 100644
--- a/src/d/actor/d_a_obj_stopper.cpp
+++ b/src/d/actor/d_a_obj_stopper.cpp
@@ -9,12 +9,10 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/d_com_inf_game.h"
 
-/* 80CECF0C-80CECF34 0000EC 0028+00 1/1 0/0 0/0 .text            getStopModelData__Fv */
 static J3DModelData* getStopModelData() {
     return (J3DModelData*)dComIfG_getStageRes("door-stop.bmd");
 }
 
-/* 80CECF34-80CECFE8 000114 00B4+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjStopper_cFv */
 void daObjStopper_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     static cXyz l_offset(0.0f, 0.0f, 100.f);
@@ -22,7 +20,6 @@ void daObjStopper_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CED024-80CED0B8 000204 0094+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjStopper_cFv */
 void daObjStopper_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0x950, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -31,7 +28,6 @@ void daObjStopper_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CED0B8-80CED20C 000298 0154+00 1/0 0/0 0/0 .text            Create__14daObjStopper_cFv */
 int daObjStopper_c::Create() {
     if (fopAcM_isSwitch(this, getSwNo2())) {
         field_0x950 = 300.0f;
@@ -61,7 +57,6 @@ int daObjStopper_c::Create() {
     return 1;
 }
 
-/* 80CED20C-80CED258 0003EC 004C+00 1/0 0/0 0/0 .text            CreateHeap__14daObjStopper_cFv */
 int daObjStopper_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create(getStopModelData(), 0x80000, 0x11000084);
     if (mpModel == NULL) {
@@ -70,7 +65,6 @@ int daObjStopper_c::CreateHeap() {
     return 1;
 }
 
-/* 80CED258-80CED440 000438 01E8+00 1/1 0/0 0/0 .text            create__14daObjStopper_cFv */
 int daObjStopper_c::create() {
     fopAcM_ct(this, daObjStopper_c);
     if (!field_0x9fc) {
@@ -90,8 +84,6 @@ int daObjStopper_c::create() {
     }
 }
 
-/* 80CED6BC-80CED708 00089C 004C+00 1/0 0/0 0/0 .text            Execute__14daObjStopper_cFPPA3_A4_f
- */
 int daObjStopper_c::Execute(Mtx** param_0) {
     action();
     *param_0 = &mBgMtx;
@@ -99,7 +91,6 @@ int daObjStopper_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CED708-80CED824 0008E8 011C+00 1/1 0/0 0/0 .text            action__14daObjStopper_cFv */
 void daObjStopper_c::action() {
     static void (daObjStopper_c::* l_func[])() = {
         &daObjStopper_c::actionWait,       &daObjStopper_c::actionWaitOrderEvent,
@@ -109,7 +100,6 @@ void daObjStopper_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80CED824-80CEDA24 000A04 0200+00 1/0 0/0 0/0 .text            actionWait__14daObjStopper_cFv */
 void daObjStopper_c::actionWait() {
     BOOL isSwitch = fopAcM_isSwitch(this, getSwNo());
     if (isSwitch != field_0x94e && field_0x94e == 0) {
@@ -172,7 +162,6 @@ void daObjStopper_c::actionWait() {
     field_0x94e = isSwitch;
 }
 
-/* 80CEDA24-80CEDAAC 000C04 0088+00 1/0 0/0 0/0 .text actionWaitOrderEvent__14daObjStopper_cFv */
 void daObjStopper_c::actionWaitOrderEvent() {
     if (cLib_calcTimer(&field_0x95f) == 0) {
         setAction(ACTION_ORDER_EVENT);
@@ -183,7 +172,6 @@ void daObjStopper_c::actionWaitOrderEvent() {
     }
 }
 
-/* 80CEDAAC-80CEDB2C 000C8C 0080+00 1/0 0/0 0/0 .text actionOrderEvent__14daObjStopper_cFv */
 void daObjStopper_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT);
@@ -195,7 +183,6 @@ void daObjStopper_c::actionOrderEvent() {
     }
 }
 
-/* 80CEDB2C-80CEE048 000D0C 051C+00 1/0 0/0 0/0 .text            actionEvent__14daObjStopper_cFv */
 void daObjStopper_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIDs[field_0x94d])) {
         dComIfGp_event_reset();
@@ -277,25 +264,19 @@ void daObjStopper_c::actionEvent() {
     field_0x97c++;
 }
 
-/* 80CEE048-80CEE04C 001228 0004+00 1/0 0/0 0/0 .text            actionDead__14daObjStopper_cFv */
 void daObjStopper_c::actionDead() {
     /* empty function */
 }
 
-/* 80CEE04C-80CEE05C 00122C 0010+00 1/0 0/0 0/0 .text            actionWaitClose__14daObjStopper_cFv
- */
 void daObjStopper_c::actionWaitClose() {
     field_0x950 = 300.0f;
 }
 
-/* 80CEE05C-80CEE0E0 00123C 0084+00 1/0 0/0 0/0 .text            actionCloseInit__14daObjStopper_cFv
- */
 void daObjStopper_c::actionCloseInit() {
     setAction(ACTION_CLOSE);
     fopAcM_seStart(this, Z2SE_OBJ_BOOMSHTR2_CLOSE, 0);
 }
 
-/* 80CEE0E0-80CEE148 0012C0 0068+00 1/0 0/0 0/0 .text            actionClose__14daObjStopper_cFv */
 void daObjStopper_c::actionClose() {
     cLib_chaseF(&speedF, 60.0f, 6.0f);
     if (cLib_chaseF(&field_0x950, 0.0f, speedF)) {
@@ -303,7 +284,6 @@ void daObjStopper_c::actionClose() {
     }
 }
 
-/* 80CEE148-80CEE5D0 001328 0488+00 1/1 0/0 0/0 .text            hint_action1__14daObjStopper_cFv */
 void daObjStopper_c::hint_action1() {
     switch (field_0x95c) {
     case 0:
@@ -378,7 +358,6 @@ void daObjStopper_c::hint_action1() {
     }
 }
 
-/* 80CEE5D0-80CEEA28 0017B0 0458+00 1/1 0/0 0/0 .text            hint_action2__14daObjStopper_cFv */
 void daObjStopper_c::hint_action2() {
     switch (field_0x95c) {
     case 0:
@@ -452,7 +431,6 @@ void daObjStopper_c::hint_action2() {
     }
 }
 
-/* 80CEEA28-80CEECFC 001C08 02D4+00 1/1 0/0 0/0 .text            hint_action3__14daObjStopper_cFv */
 void daObjStopper_c::hint_action3() {
     cLib_calcTimer(&field_0x956);
     switch (field_0x95c) {
@@ -498,7 +476,6 @@ void daObjStopper_c::hint_action3() {
     }
 }
 
-/* 80CEECFC-80CEED60 001EDC 0064+00 1/0 0/0 0/0 .text            Draw__14daObjStopper_cFv */
 int daObjStopper_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -506,7 +483,6 @@ int daObjStopper_c::Draw() {
     return 1;
 }
 
-/* 80CEED60-80CEEDF0 001F40 0090+00 1/0 0/0 0/0 .text            Delete__14daObjStopper_cFv */
 int daObjStopper_c::Delete() {
     field_0x984[0].remove();
     field_0x984[1].remove();
@@ -516,35 +492,28 @@ int daObjStopper_c::Delete() {
     return 1;
 }
 
-/* 80CEEDF0-80CEEE1C 001FD0 002C+00 1/0 0/0 0/0 .text daObjStopper_Draw__FP14daObjStopper_c */
 static int daObjStopper_Draw(daObjStopper_c* param_0) {
     return param_0->MoveBGDraw();
 }
 
-/* 80CEEE1C-80CEEE3C 001FFC 0020+00 1/0 0/0 0/0 .text daObjStopper_Execute__FP14daObjStopper_c */
 static int daObjStopper_Execute(daObjStopper_c* param_0) {
     return param_0->MoveBGExecute();
 }
 
-/* 80CEEE3C-80CEEE5C 00201C 0020+00 1/0 0/0 0/0 .text daObjStopper_Delete__FP14daObjStopper_c */
 static int daObjStopper_Delete(daObjStopper_c* param_0) {
     return param_0->MoveBGDelete();
 }
 
-/* 80CEEE5C-80CEEE7C 00203C 0020+00 1/0 0/0 0/0 .text            daObjStopper_Create__FP10fopAc_ac_c
- */
 static int daObjStopper_Create(fopAc_ac_c* param_0) {
     return static_cast<daObjStopper_c*>(param_0)->create();
 }
 
-/* 80CEF0E0-80CEF100 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjStopper_Method */
 static actor_method_class l_daObjStopper_Method = {
     (process_method_func)daObjStopper_Create,  (process_method_func)daObjStopper_Delete,
     (process_method_func)daObjStopper_Execute, 0,
     (process_method_func)daObjStopper_Draw,
 };
 
-/* 80CEF100-80CEF130 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Stopper */
 extern actor_process_profile_definition g_profile_Obj_Stopper = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp
index 768546487d..6713215f5a 100644
--- a/src/d/actor/d_a_obj_stopper2.cpp
+++ b/src/d/actor/d_a_obj_stopper2.cpp
@@ -7,10 +7,8 @@
 
 #include "d/actor/d_a_obj_stopper2.h"
 
-/* 80CEFF24-80CEFF28 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Stop00";
 
-/* 80CEFF28-80CEFF38 -00001 0010+00 1/1 0/0 0/0 .data            l_evName */
 static char* l_evName[4] = {
     "STOP_OPEN",
     "STOP_CLOSE",
@@ -18,46 +16,37 @@ static char* l_evName[4] = {
     "STOP_CLOSE2",
 };
 
-/* 80CEFF38-80CEFF3C -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "dstop";
 
-/* 80CEF338-80CEF358 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return ((daObjStopper2_c*)i_this)->CreateHeap();
 }
 
-/* 80CEF358-80CEF368 000098 0010+00 1/1 0/0 0/0 .text            getStopName__Fv */
 static const char* getStopName() {
     return "door-stop.bmd";
 }
 
-/* 80CEF368-80CEF38C 0000A8 0024+00 1/1 0/0 0/0 .text getStopModelData__15daObjStopper2_cFv */
 J3DModelData* daObjStopper2_c::getStopModelData() {
     return (J3DModelData*)dComIfG_getStageRes(getStopName());
 }
 
-/* 80CEF38C-80CEF3C8 0000CC 003C+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjStopper2_cFv */
 void daObjStopper2_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CEF3C8-80CEF434 000108 006C+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjStopper2_cFv */
 void daObjStopper2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mOffsetY, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CEF434-80CEF44C 000174 0018+00 2/2 0/0 0/0 .text            getMaxOffsetY__15daObjStopper2_cFv
- */
 f32 daObjStopper2_c::getMaxOffsetY() {
     J3DJoint* root_jnt = mpModel->getModelData()->getJointNodePointer(0);
     JUT_ASSERT(154, root_jnt != NULL);
     return root_jnt->getMax()->y;
 }
 
-/* 80CEF44C-80CEF57C 00018C 0130+00 1/1 0/0 0/0 .text            Create__15daObjStopper2_cFv */
 int daObjStopper2_c::Create() {
     if (!fopAcM_isSwitch(this, getSwbit())) {
         mOffsetY = 0.0f;
@@ -85,7 +74,6 @@ int daObjStopper2_c::Create() {
     return 1;
 }
 
-/* 80CEF57C-80CEF5C8 0002BC 004C+00 1/1 0/0 0/0 .text            CreateHeap__15daObjStopper2_cFv */
 int daObjStopper2_c::CreateHeap() {
     J3DModelData* modelData = getStopModelData();
     JUT_ASSERT(206, modelData != NULL);
@@ -98,7 +86,6 @@ int daObjStopper2_c::CreateHeap() {
     return 1;
 }
 
-/* 80CEF5C8-80CEF66C 000308 00A4+00 1/1 0/0 0/0 .text            create__15daObjStopper2_cFv */
 int daObjStopper2_c::create() {
     fopAcM_ct(this, daObjStopper2_c);
 
@@ -125,14 +112,12 @@ int daObjStopper2_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CEF66C-80CEF6A4 0003AC 0038+00 1/1 0/0 0/0 .text            execute__15daObjStopper2_cFv */
 int daObjStopper2_c::execute() {
     event_proc_call();
     setBaseMtx();
     return 1;
 }
 
-/* 80CEF6A4-80CEF760 0003E4 00BC+00 1/1 0/0 0/0 .text event_proc_call__15daObjStopper2_cFv */
 void daObjStopper2_c::event_proc_call() {
     static void (daObjStopper2_c::*l_func[])() = {
         &daObjStopper2_c::actionWait,
@@ -144,7 +129,6 @@ void daObjStopper2_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80CEF760-80CEF98C 0004A0 022C+00 1/0 0/0 0/0 .text            actionWait__15daObjStopper2_cFv */
 void daObjStopper2_c::actionWait() {
     BOOL is_switch = fopAcM_isSwitch(this, getSwbit());
 
@@ -191,7 +175,6 @@ void daObjStopper2_c::actionWait() {
     }
 }
 
-/* 80CEF98C-80CEFA60 0006CC 00D4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjStopper2_cFv */
 void daObjStopper2_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(2);
@@ -209,7 +192,6 @@ void daObjStopper2_c::actionOrderEvent() {
     }
 }
 
-/* 80CEFA60-80CEFAD4 0007A0 0074+00 1/0 0/0 0/0 .text            actionEvent__15daObjStopper2_cFv */
 void daObjStopper2_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx[field_0x584])) {
         setAction(0);
@@ -219,10 +201,8 @@ void daObjStopper2_c::actionEvent() {
     }
 }
 
-/* 80CEFAD4-80CEFAD8 000814 0004+00 1/0 0/0 0/0 .text            actionDead__15daObjStopper2_cFv */
 void daObjStopper2_c::actionDead() {}
 
-/* 80CEFAD8-80CEFD40 000818 0268+00 2/2 0/0 0/0 .text            demoProc__15daObjStopper2_cFv */
 int daObjStopper2_c::demoProc() {
     static char* action_table[3] = {
         "WAIT",
@@ -286,7 +266,6 @@ int daObjStopper2_c::demoProc() {
     return 0;
 }
 
-/* 80CEFD40-80CEFDB8 000A80 0078+00 1/1 0/0 0/0 .text            draw__15daObjStopper2_cFv */
 int daObjStopper2_c::draw() {
     if (field_0x588 == 0) {
         return 1;
@@ -298,34 +277,27 @@ int daObjStopper2_c::draw() {
     return 1;
 }
 
-/* 80CEFDB8-80CEFDEC 000AF8 0034+00 1/1 0/0 0/0 .text            _delete__15daObjStopper2_cFv */
 int daObjStopper2_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80CEFDEC-80CEFE0C 000B2C 0020+00 1/0 0/0 0/0 .text daObjStopper2_Draw__FP15daObjStopper2_c */
 static int daObjStopper2_Draw(daObjStopper2_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CEFE0C-80CEFE2C 000B4C 0020+00 1/0 0/0 0/0 .text daObjStopper2_Execute__FP15daObjStopper2_c
- */
 static int daObjStopper2_Execute(daObjStopper2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CEFE2C-80CEFE4C 000B6C 0020+00 1/0 0/0 0/0 .text daObjStopper2_Delete__FP15daObjStopper2_c */
 static int daObjStopper2_Delete(daObjStopper2_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80CEFE4C-80CEFE6C 000B8C 0020+00 1/0 0/0 0/0 .text daObjStopper2_Create__FP15daObjStopper2_c */
 static int daObjStopper2_Create(daObjStopper2_c* i_this) {
     return i_this->create();
 }
 
-/* 80CEFFA8-80CEFFC8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjStopper2_Method */
 static actor_method_class l_daObjStopper2_Method = {
     (process_method_func)daObjStopper2_Create,
     (process_method_func)daObjStopper2_Delete,
@@ -334,7 +306,6 @@ static actor_method_class l_daObjStopper2_Method = {
     (process_method_func)daObjStopper2_Draw,
 };
 
-/* 80CEFFC8-80CEFFF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Stopper2 */
 extern actor_process_profile_definition g_profile_Obj_Stopper2 = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp
index 3468351715..69fa4f8325 100644
--- a/src/d/actor/d_a_obj_suisya.cpp
+++ b/src/d/actor/d_a_obj_suisya.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80CF0078-80CF0148 000078 00D0+00 1/1 0/0 0/0 .text            draw__14daObj_Suisya_cFv */
 int daObj_Suisya_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -24,12 +23,10 @@ int daObj_Suisya_c::draw() {
     return 1;
 }
 
-/* 80CF0148-80CF0168 000148 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Draw__FP14daObj_Suisya_c */
 static int daObj_Suisya_Draw(daObj_Suisya_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CF0168-80CF020C 000168 00A4+00 1/1 0/0 0/0 .text            execute__14daObj_Suisya_cFv */
 int daObj_Suisya_c::execute() {
     Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_WATERMILL_ROUND, &current.pos, 0, 0, 1.0f, 1.0f,
                                          -1.0f, -1.0f, 0);
@@ -41,28 +38,23 @@ int daObj_Suisya_c::execute() {
     return 1;
 }
 
-/* 80CF020C-80CF022C 00020C 0020+00 2/1 0/0 0/0 .text daObj_Suisya_Execute__FP14daObj_Suisya_c */
 static int daObj_Suisya_Execute(daObj_Suisya_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CF022C-80CF0234 00022C 0008+00 1/0 0/0 0/0 .text daObj_Suisya_IsDelete__FP14daObj_Suisya_c */
 static int daObj_Suisya_IsDelete(daObj_Suisya_c* i_this) {
     return 1;
 }
 
-/* 80CF0234-80CF0264 000234 0030+00 1/1 0/0 0/0 .text            _delete__14daObj_Suisya_cFv */
 int daObj_Suisya_c::_delete() {
     dComIfG_resDelete(&mPhase, "Obj_sui");
     return 1;
 }
 
-/* 80CF0264-80CF0284 000264 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Delete__FP14daObj_Suisya_c */
 static int daObj_Suisya_Delete(daObj_Suisya_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80CF0284-80CF02F0 000284 006C+00 1/1 0/0 0/0 .text            CreateHeap__14daObj_Suisya_cFv */
 int daObj_Suisya_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_sui", 3);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -73,12 +65,10 @@ int daObj_Suisya_c::CreateHeap() {
     return 1;
 }
 
-/* 80CF02F0-80CF0310 0002F0 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return static_cast<daObj_Suisya_c*>(i_this)->CreateHeap();
 }
 
-/* 80CF0310-80CF0478 000310 0168+00 1/1 0/0 0/0 .text            create__14daObj_Suisya_cFv */
 int daObj_Suisya_c::create() {
     fopAcM_ct(this, daObj_Suisya_c);
 
@@ -104,19 +94,16 @@ int daObj_Suisya_c::create() {
     return phase;
 }
 
-/* 80CF04E8-80CF0508 0004E8 0020+00 1/0 0/0 0/0 .text daObj_Suisya_Create__FP14daObj_Suisya_c */
 static int daObj_Suisya_Create(daObj_Suisya_c* i_this) {
     return i_this->create();
 }
 
-/* 80CF054C-80CF056C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Suisya_Method */
 static actor_method_class l_daObj_Suisya_Method = {
     (process_method_func)daObj_Suisya_Create,  (process_method_func)daObj_Suisya_Delete,
     (process_method_func)daObj_Suisya_Execute, (process_method_func)daObj_Suisya_IsDelete,
     (process_method_func)daObj_Suisya_Draw,
 };
 
-/* 80CF056C-80CF059C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SUISYA */
 extern actor_process_profile_definition g_profile_OBJ_SUISYA = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp
index 7637841038..8721eb5eef 100644
--- a/src/d/actor/d_a_obj_sw.cpp
+++ b/src/d/actor/d_a_obj_sw.cpp
@@ -15,7 +15,6 @@
 #include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 80CF0638-80CF0774 000078 013C+00 1/0 0/0 0/0 .text            daObj_Sw_Draw__FP12obj_sw_class */
 static int daObj_Sw_Draw(obj_sw_class* i_this) {
     static _GXColor l_color = {
         0x14,
@@ -50,10 +49,8 @@ static int daObj_Sw_Draw(obj_sw_class* i_this) {
     return 1;
 }
 
-/* 80CF3278-80CF327C 000000 0004+00 3/3 0/0 0/0 .bss             saru_ct */
 static int saru_ct;
 
-/* 80CF0774-80CF07F8 0001B4 0084+00 1/1 0/0 0/0 .text            s_ks_sub__FPvPv */
 static void* s_ks_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
         int swBit = fopAcM_GetParam(i_actor) >> 24;
@@ -73,7 +70,6 @@ struct path {
     f32 field_0xc;
 };
 
-/* 80CF3100-80CF3210 000004 0110+00 3/3 0/0 0/0 .data            sc_path */
 static path sc_path[17] = {
     {1, 8172.0f, 3380.0f, -10887.0f},
     {1, 8305.0f, 3524.0f, -11275.0f},
@@ -94,7 +90,6 @@ static path sc_path[17] = {
     {0, 0.0f, 0.0f, 0.0f},
 };
 
-/* 80CF07F8-80CF08F8 000238 0100+00 1/1 0/0 0/0 .text            s_ksdel_sub__FPvPv */
 static void* s_ksdel_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) {
         fopAcM_delete((fopAc_ac_c*)i_actor);
@@ -111,14 +106,12 @@ static void* s_ksdel_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80CF08F8-80CF09A8 000338 00B0+00 3/3 0/0 0/0 .text            anm_init__FP8obj_sc_sifUcf */
 static void anm_init(obj_sc_s* i_this, int param_2, f32 i_morf, u8 i_mode, f32 i_speed) {
     i_this->mpModelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Npc_ksw", param_2), i_mode,
                                 i_morf, i_speed, 0.0f, -1.0f, NULL);
     i_this->field_0x3c = param_2;
 }
 
-/* 80CF09A8-80CF1008 0003E8 0660+00 1/1 0/0 0/0 .text            sc_build__FP12obj_sw_class */
 static void sc_build(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     obj_sc_s* sc_p = i_this->field_0x5a8;
@@ -237,7 +230,6 @@ static void sc_build(obj_sw_class* i_this) {
     }
 }
 
-/* 80CF1044-80CF1384 000A84 0340+00 1/1 0/0 0/0 .text            sc_move__FP12obj_sw_class */
 static void sc_move(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp24, sp30;
@@ -282,7 +274,6 @@ static void sc_move(obj_sw_class* i_this) {
     }
 }
 
-/* 80CF1384-80CF1970 000DC4 05EC+00 1/1 0/0 0/0 .text            demo_camera__FP12obj_sw_class */
 static void demo_camera(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -407,7 +398,6 @@ static void demo_camera(obj_sw_class* i_this) {
     }
 }
 
-/* 80CF1970-80CF2160 0013B0 07F0+00 1/1 0/0 0/0 .text            sc_action__FP12obj_sw_class */
 static void sc_action(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     cXyz sp90;
@@ -543,7 +533,6 @@ static void sc_action(obj_sw_class* i_this) {
     demo_camera(i_this);
 }
 
-/* 80CF2160-80CF2604 001BA0 04A4+00 1/1 0/0 0/0 .text            sw_action__FP12obj_sw_class */
 static void sw_action(obj_sw_class* i_this) {
     f32 tmp;
     f32 fVar1;
@@ -618,8 +607,6 @@ static void sw_action(obj_sw_class* i_this) {
     i_this->field_0x900 = 0.0f;
 }
 
-/* 80CF2604-80CF26F0 002044 00EC+00 2/1 0/0 0/0 .text            daObj_Sw_Execute__FP12obj_sw_class
- */
 static int daObj_Sw_Execute(obj_sw_class* i_this) {
     for (int i = 0; i < 3; i++) {
         if (i_this->field_0x57a[i] != 0) {
@@ -646,14 +633,10 @@ static int daObj_Sw_Execute(obj_sw_class* i_this) {
     return 1;
 }
 
-/* 80CF26F0-80CF26F8 002130 0008+00 1/0 0/0 0/0 .text            daObj_Sw_IsDelete__FP12obj_sw_class
- */
 static int daObj_Sw_IsDelete(obj_sw_class* i_this) {
     return 1;
 }
 
-/* 80CF26F8-80CF2790 002138 0098+00 1/0 0/0 0/0 .text            daObj_Sw_Delete__FP12obj_sw_class
- */
 static int daObj_Sw_Delete(obj_sw_class* i_this) {
     fopAc_ac_c* a_this = &i_this->actor;
     fopAcM_GetID(a_this);
@@ -672,7 +655,6 @@ static int daObj_Sw_Delete(obj_sw_class* i_this) {
     return 1;
 }
 
-/* 80CF2790-80CF29D4 0021D0 0244+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_sw_class* i_this = (obj_sw_class*)a_this;
 
@@ -719,7 +701,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80CF29D4-80CF2F38 002414 0564+00 1/0 0/0 0/0 .text            daObj_Sw_Create__FP10fopAc_ac_c */
 static int daObj_Sw_Create(fopAc_ac_c* a_this) {
     obj_sw_class* i_this = (obj_sw_class*)a_this;
     int phase;
@@ -831,14 +812,12 @@ static int daObj_Sw_Create(fopAc_ac_c* a_this) {
     return phase;
 }
 
-/* 80CF3210-80CF3230 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Sw_Method */
 static actor_method_class l_daObj_Sw_Method = {
     (process_method_func)daObj_Sw_Create,  (process_method_func)daObj_Sw_Delete,
     (process_method_func)daObj_Sw_Execute, (process_method_func)daObj_Sw_IsDelete,
     (process_method_func)daObj_Sw_Draw,
 };
 
-/* 80CF3230-80CF3260 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_SW */
 extern actor_process_profile_definition g_profile_OBJ_SW = {
     fpcLy_CURRENT_e,       // mLayerID
     4,                     // mListID
diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp
index 96a2989e06..44ebafa0a8 100644
--- a/src/d/actor/d_a_obj_swBallA.cpp
+++ b/src/d/actor/d_a_obj_swBallA.cpp
@@ -10,17 +10,12 @@
 #include "d/actor/d_a_obj_carry.h"
 #include "d/d_com_inf_game.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "dol2asm.h"
 #include "d/d_lib.h"
 
-/* ############################################################################################## */
-/* 80CF4508-80CF4528 000000 0020+00 2/2 0/0 0/0 .bss             l_target_info */
 static daObjCarry_c* l_target_info[8];
 
-/* 80CF4528-80CF452C 000020 0004+00 2/2 0/0 0/0 .bss             l_target_info_count */
 static int l_target_info_count;
 
-/* 80CF32F8-80CF3374 000078 007C+00 1/1 0/0 0/0 .text            s_ball_sub__FPvPv */
 static void* s_ball_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry &&
         ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_LV8_BALL)
@@ -33,17 +28,12 @@ static void* s_ball_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80CF3374-80CF3394 0000F4 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* param_0) {
     return ((daObjSwBallA_c*)param_0)->CreateHeap();
 }
 
-/* ############################################################################################## */
-/* 80CF43E4-80CF43E8 000000 0004+00 4/4 0/0 0/0 .rodata          l_color */
 static GXColor const l_color = {0x3,0x96,0xFF,0xFF};
 
-/* 80CF3394-80CF34E4 000114 0150+00 1/1 0/0 0/0 .text
- * checkArea_sub__14daObjSwBallA_cFP10fopAc_ac_c                */
 int daObjSwBallA_c::checkArea_sub(fopAc_ac_c* param_1) {
     if (param_1 == NULL) {
         return 0;
@@ -72,7 +62,6 @@ int daObjSwBallA_c::checkArea_sub(fopAc_ac_c* param_1) {
 }
 
 
-/* 80CF34E4-80CF3610 000264 012C+00 1/1 0/0 0/0 .text            search_ball__14daObjSwBallA_cFv */
 void daObjSwBallA_c::search_ball() {
     l_target_info_count = 0;
     for (int i = 0; i < 8; i++) {
@@ -103,19 +92,16 @@ void daObjSwBallA_c::search_ball() {
     }
 }
 
-/* 80CF3610-80CF3630 000390 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSwBallA_cFv */
 void daObjSwBallA_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CF3630-80CF3694 0003B0 0064+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjSwBallA_cFv */
 void daObjSwBallA_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CF3694-80CF37FC 000414 0168+00 1/1 0/0 0/0 .text            Create__14daObjSwBallA_cFv */
 int daObjSwBallA_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
@@ -142,10 +128,8 @@ int daObjSwBallA_c::Create() {
     return 1;
 }
 
-/* 80CF4438-80CF443C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_LBswA";
 
-/* 80CF37FC-80CF3928 00057C 012C+00 1/1 0/0 0/0 .text            CreateHeap__14daObjSwBallA_cFv */
 int daObjSwBallA_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(381, modelData != NULL);
@@ -163,7 +147,6 @@ int daObjSwBallA_c::CreateHeap() {
     return 1;
 }
 
-/* 80CF3970-80CF3A90 0006F0 0120+00 1/1 0/0 0/0 .text            create__14daObjSwBallA_cFv */
 int daObjSwBallA_c::create() {
     fopAcM_ct(this, daObjSwBallA_c);
     if (field_0x5c4 == 0) {
@@ -188,7 +171,6 @@ int daObjSwBallA_c::create() {
     return res;
 }
 
-/* 80CF3A90-80CF3B40 000810 00B0+00 1/1 0/0 0/0 .text            execute__14daObjSwBallA_cFv */
 int daObjSwBallA_c::execute() {
     typedef void (daObjSwBallA_c::*ballfunc)();
     static ballfunc l_func[2] = {&daObjSwBallA_c::actionRun, &daObjSwBallA_c::actionStop};
@@ -198,7 +180,6 @@ int daObjSwBallA_c::execute() {
     return 1;
 }
 
-/* 80CF3B40-80CF3D80 0008C0 0240+00 1/0 0/0 0/0 .text            actionRun__14daObjSwBallA_cFv */
 void daObjSwBallA_c::actionRun() {
     u32 iVar4 = field_0x5c0;
     search_ball();
@@ -236,12 +217,10 @@ void daObjSwBallA_c::actionRun() {
 }
 
 
-/* 80CF3D80-80CF3D84 000B00 0004+00 1/0 0/0 0/0 .text            actionStop__14daObjSwBallA_cFv */
 void daObjSwBallA_c::actionStop() {
     /* empty function */
 }
 
-/* 80CF3D84-80CF406C 000B04 02E8+00 1/1 0/0 0/0 .text            PutCrrPos__14daObjSwBallA_cFv */
 void daObjSwBallA_c::PutCrrPos() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar5 = cLib_targetAngleY(&player->current.pos, &current.pos) - player->shape_angle.y;
@@ -313,7 +292,6 @@ void daObjSwBallA_c::PutCrrPos() {
     }
 }
 
-/* 80CF406C-80CF41F4 000DEC 0188+00 1/1 0/0 0/0 .text            draw__14daObjSwBallA_cFv */
 int daObjSwBallA_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -337,7 +315,6 @@ int daObjSwBallA_c::draw() {
 }
 
 
-/* 80CF41F4-80CF4274 000F74 0080+00 1/1 0/0 0/0 .text            _delete__14daObjSwBallA_cFv */
 int daObjSwBallA_c::_delete() {
     if (!fopAcM_isSwitch(this, getSwbit2())) {
         fopAcM_offSwitch(this, getSwbit());
@@ -346,28 +323,22 @@ int daObjSwBallA_c::_delete() {
     return 1;
 }
 
-/* 80CF4274-80CF4294 000FF4 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Draw__FP14daObjSwBallA_c */
 static int daObjSwBallA_Draw(daObjSwBallA_c* param_0) {
     return param_0->draw();
 }
 
-/* 80CF4294-80CF42B4 001014 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Execute__FP14daObjSwBallA_c */
 static int daObjSwBallA_Execute(daObjSwBallA_c* param_0) {
     return param_0->execute();
 }
 
-/* 80CF42B4-80CF42D4 001034 0020+00 1/0 0/0 0/0 .text daObjSwBallA_Delete__FP14daObjSwBallA_c */
 static int daObjSwBallA_Delete(daObjSwBallA_c* param_0) {
     return param_0->_delete();
 }
 
-/* 80CF42D4-80CF42F4 001054 0020+00 1/0 0/0 0/0 .text            daObjSwBallA_Create__FP10fopAc_ac_c
- */
 static int daObjSwBallA_Create(fopAc_ac_c* param_0) {
     return ((daObjSwBallA_c*)param_0)->create();
 }
 
-/* 80CF446C-80CF448C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSwBallA_Method */
 static actor_method_class l_daObjSwBallA_Method = {
     (process_method_func)daObjSwBallA_Create,
     (process_method_func)daObjSwBallA_Delete,
@@ -376,7 +347,6 @@ static actor_method_class l_daObjSwBallA_Method = {
     (process_method_func)daObjSwBallA_Draw,
 };
 
-/* 80CF448C-80CF44BC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwBallA */
 extern actor_process_profile_definition g_profile_Obj_SwBallA = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp
index 1f1e62e856..691d00ec72 100644
--- a/src/d/actor/d_a_obj_swBallB.cpp
+++ b/src/d/actor/d_a_obj_swBallB.cpp
@@ -10,17 +10,12 @@
 #include "d/actor/d_a_obj_carry.h"
 #include "d/d_com_inf_game.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "dol2asm.h"
 #include "d/d_lib.h"
 
-/* ############################################################################################## */
-/* 80CF5B10-80CF5B18 000000 0008+00 2/2 0/0 0/0 .bss             l_target_info */
 static daObjCarry_c* l_target_info[2];
 
-/* 80CF5B18-80CF5B1C 000008 0004+00 2/2 0/0 0/0 .bss             l_target_info_count */
 static int l_target_info_count;
 
-/* 80CF45B8-80CF464C 000078 0094+00 1/1 0/0 0/0 .text            s_ball_sub__FPvPv */
 static void* s_ball_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry &&
         ((daObjCarry_c*)param_1)->prm_chk_type_lightball())
@@ -33,16 +28,12 @@ static void* s_ball_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80CF464C-80CF466C 00010C 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* param_0) {
     return ((daObjSwBallB_c*)param_0)->CreateHeap();
 }
 
-/* ############################################################################################## */
-/* 80CF59D0-80CF59D4 000000 0004+00 5/5 0/0 0/0 .rodata          l_color */
 static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF};
 
-/* 80CF59D4-80CF59E0 000004 000C+00 0/1 0/0 0/0 .rodata          l_event_bitA */
 static u16 const l_event_bitA[6] = {
     0x4304, /* dSv_event_flag_c::F_0551 - Palace of Twilight - Palace of Twilight control use 1 */
     0x4302, /* dSv_event_flag_c::F_0552 - Palace of Twilight - Palace of Twilight control use 2 */
@@ -52,7 +43,6 @@ static u16 const l_event_bitA[6] = {
     0x4420, /* dSv_event_flag_c::F_0556 - Palace of Twilight - Palace of Twilight control use 6 */
 };
 
-/* 80CF59E0-80CF59EC 000010 000C+00 0/1 0/0 0/0 .rodata          l_event_bitB */
 static u16 const l_event_bitB[6] = {
     0x4410, /* dSv_event_flag_c::F_0557 - Palace of Twilight - Palace of Twilight control use 7 */
     0x4408, /* dSv_event_flag_c::F_0558 - Palace of Twilight - Palace of Twilight control use 8 */
@@ -62,7 +52,6 @@ static u16 const l_event_bitB[6] = {
     0x4580, /* dSv_event_flag_c::F_0562 - Palace of Twilight - Palace of Twilight control use 12 */
 };
 
-/* 80CF466C-80CF47BC 00012C 0150+00 1/1 0/0 0/0 .text            checkArea_sub__14daObjSwBallB_cFP10fopAc_ac_c */
 int daObjSwBallB_c::checkArea_sub(fopAc_ac_c* param_1) {
     if (param_1 == NULL) {
         return 0;
@@ -90,7 +79,6 @@ int daObjSwBallB_c::checkArea_sub(fopAc_ac_c* param_1) {
     return 0;
 }
 
-/* 80CF47BC-80CF496C 00027C 01B0+00 1/1 0/0 0/0 .text            search_ball__14daObjSwBallB_cFv */
 void daObjSwBallB_c::search_ball() {
     l_target_info_count = 0;
     for (int i = 0; i < 2; i++) {
@@ -130,19 +118,16 @@ void daObjSwBallB_c::search_ball() {
     }
 }
 
-/* 80CF496C-80CF498C 00042C 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSwBallB_cFv */
 void daObjSwBallB_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CF498C-80CF49F0 00044C 0064+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjSwBallB_cFv */
 void daObjSwBallB_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CF49F0-80CF4B74 0004B0 0184+00 1/1 0/0 0/0 .text            Create__14daObjSwBallB_cFv */
 int daObjSwBallB_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
@@ -171,10 +156,8 @@ int daObjSwBallB_c::Create() {
     return 1;
 }
 
-/* 80CF5A40-80CF5A44 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_LBswBC";
 
-/* 80CF4B74-80CF4CA0 000634 012C+00 1/1 0/0 0/0 .text            CreateHeap__14daObjSwBallB_cFv */
 int daObjSwBallB_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(427, modelData != NULL);
@@ -192,7 +175,6 @@ int daObjSwBallB_c::CreateHeap() {
     return 1;
 }
 
-/* 80CF4CE8-80CF4E08 0007A8 0120+00 1/1 0/0 0/0 .text            create__14daObjSwBallB_cFv */
 int daObjSwBallB_c::create() {
     fopAcM_ct(this, daObjSwBallB_c);
     if (field_0x5a0 == 0) {
@@ -217,7 +199,6 @@ int daObjSwBallB_c::create() {
     return res;
 }
 
-/* 80CF4E08-80CF4EB8 0008C8 00B0+00 2/2 0/0 0/0 .text            execute__14daObjSwBallB_cFv */
 int daObjSwBallB_c::execute() {
     typedef void (daObjSwBallB_c::*ballfunc)();
     static ballfunc l_func[2] = {&daObjSwBallB_c::actionRun, &daObjSwBallB_c::actionStop};
@@ -227,7 +208,6 @@ int daObjSwBallB_c::execute() {
     return 1;
 }
 
-/* 80CF4EB8-80CF5384 000978 04CC+00 1/0 0/0 0/0 .text            actionRun__14daObjSwBallB_cFv */
 void daObjSwBallB_c::actionRun() {
     u32 iVar4 = field_0x59c;
     search_ball();
@@ -303,12 +283,10 @@ void daObjSwBallB_c::actionRun() {
     }
 }
 
-/* 80CF5384-80CF5388 000E44 0004+00 1/0 0/0 0/0 .text            actionStop__14daObjSwBallB_cFv */
 void daObjSwBallB_c::actionStop() {
     /* empty function */
 }
 
-/* 80CF5388-80CF56A4 000E48 031C+00 1/1 0/0 0/0 .text            PutCrrPos__14daObjSwBallB_cFv */
 void daObjSwBallB_c::PutCrrPos() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     s16 sVar5 = cLib_targetAngleY(&player->current.pos, &current.pos) - player->shape_angle.y;
@@ -381,7 +359,6 @@ void daObjSwBallB_c::PutCrrPos() {
     }
 }
 
-/* 80CF56A4-80CF582C 001164 0188+00 1/1 0/0 0/0 .text            draw__14daObjSwBallB_cFv */
 int daObjSwBallB_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -404,34 +381,27 @@ int daObjSwBallB_c::draw() {
     return 1;
 }
 
-/* 80CF582C-80CF5860 0012EC 0034+00 1/1 0/0 0/0 .text            _delete__14daObjSwBallB_cFv */
 int daObjSwBallB_c::_delete() {
     dComIfG_resDelete(&field_0x57c, l_arcName);
     return 1;
 }
 
-/* 80CF5860-80CF5880 001320 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Draw__FP14daObjSwBallB_c */
 static int daObjSwBallB_Draw(daObjSwBallB_c* param_0) {
     return param_0->draw();
 }
 
-/* 80CF5880-80CF58A0 001340 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Execute__FP14daObjSwBallB_c */
 static int daObjSwBallB_Execute(daObjSwBallB_c* param_0) {
     return param_0->execute();
 }
 
-/* 80CF58A0-80CF58C0 001360 0020+00 1/0 0/0 0/0 .text daObjSwBallB_Delete__FP14daObjSwBallB_c */
 static int daObjSwBallB_Delete(daObjSwBallB_c* param_0) {
     return param_0->_delete();
 }
 
-/* 80CF58C0-80CF58E0 001380 0020+00 1/0 0/0 0/0 .text            daObjSwBallB_Create__FP10fopAc_ac_c
- */
 static int daObjSwBallB_Create(fopAc_ac_c* param_0) {
     return ((daObjSwBallB_c*)param_0)->create();
 }
 
-/* 80CF5A74-80CF5A94 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSwBallB_Method */
 static actor_method_class l_daObjSwBallB_Method = {
     (process_method_func)daObjSwBallB_Create,
     (process_method_func)daObjSwBallB_Delete,
@@ -440,7 +410,6 @@ static actor_method_class l_daObjSwBallB_Method = {
     (process_method_func)daObjSwBallB_Draw,
 };
 
-/* 80CF5A94-80CF5AC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwBallB */
 extern actor_process_profile_definition g_profile_Obj_SwBallB = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp
index 98cb8af529..639a6368dd 100644
--- a/src/d/actor/d_a_obj_swBallC.cpp
+++ b/src/d/actor/d_a_obj_swBallC.cpp
@@ -15,12 +15,10 @@
 #include "f_op/f_op_msg_mng.h"
 #include "f_op/f_op_msg.h"
 
-/* 80CF5B98-80CF5BB8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* param_0) {
     return ((daObjSwBallC_c*)param_0)->CreateHeap();
 }
 
-/* 80CF5BB8-80CF5C24 000098 006C+00 2/2 0/0 0/0 .text            s_swb_sub__FPvPv */
 static void* s_swb_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_SwBallB &&
         (u32)((daObjSwBallB_c*)param_1)->getID() == ((daObjSwBallC_c*)param_2)->field_0x582)
@@ -30,7 +28,6 @@ static void* s_swb_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80CF5C24-80CF5C7C 000104 0058+00 2/2 0/0 0/0 .text            s_ballA_sub__FPvPv */
 static void* s_ballA_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry &&
         ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S)
@@ -40,7 +37,6 @@ static void* s_ballA_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80CF5C7C-80CF5CD4 00015C 0058+00 2/2 0/0 0/0 .text            s_ballB_sub__FPvPv */
 static void* s_ballB_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry &&
         ((daObjCarry_c*)param_1)->getType() == daObjCarry_c::TYPE_BALL_S_2)
@@ -50,33 +46,26 @@ static void* s_ballB_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80CF5CD4-80CF5CF4 0001B4 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSwBallC_cFv */
 void daObjSwBallC_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CF5CF4-80CF5D58 0001D4 0064+00 1/1 0/0 0/0 .text            setBaseMtx__14daObjSwBallC_cFv */
 void daObjSwBallC_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* ############################################################################################## */
-/* 80CF6CD4-80CF6CD8 000000 0004+00 3/3 0/0 0/0 .rodata          l_color */
 static GXColor const l_color = {0x03, 0x96, 0xFF, 0xFF};
 
-/* 80CF6DB0-80CF6DB4 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_LBswBC";
 
-/* 80CF6DB4-80CF6DB8 -00001 0004+00 1/1 0/0 0/0 .data            l_evName */
 static char* l_evName = "REVIVE_MASTER_SWORD";
 
 static f32 dummyFloat() {
     return -1.0f;
 }
 
-/* 80CF5D58-80CF5EF8 000238 01A0+00 1/1 0/0 0/0 .text            Create__14daObjSwBallC_cFv */
 int daObjSwBallC_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mModel->getBaseTRMtx());
@@ -104,10 +93,8 @@ int daObjSwBallC_c::Create() {
     return 1;
 }
 
-/* 80CF6DB8-80CF6DBC -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "lbsw";
 
-/* 80CF5EF8-80CF6024 0003D8 012C+00 1/1 0/0 0/0 .text            CreateHeap__14daObjSwBallC_cFv */
 int daObjSwBallC_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6);
     JUT_ASSERT(427, modelData != NULL);
@@ -125,7 +112,6 @@ int daObjSwBallC_c::CreateHeap() {
     return 1;
 }
 
-/* 80CF606C-80CF6120 00054C 00B4+00 1/1 0/0 0/0 .text            create__14daObjSwBallC_cFv */
 int daObjSwBallC_c::create() {
     fopAcM_ct(this, daObjSwBallC_c);
     int res = dComIfG_resLoad(&field_0x568, l_arcName);
@@ -139,27 +125,22 @@ int daObjSwBallC_c::create() {
     return res;
 }
 
-/* 80CF6120-80CF6144 000600 0024+00 2/2 0/0 0/0 .text            execute__14daObjSwBallC_cFv */
 int daObjSwBallC_c::execute() {
     event_proc_call();
     return 1;    
 }
 
-/* 80CF6144-80CF6200 000624 00BC+00 1/2 0/0 0/0 .text            event_proc_call__14daObjSwBallC_cFv
- */
 void daObjSwBallC_c::event_proc_call() {
     typedef void (daObjSwBallC_c::*ballfunc)();
     static ballfunc l_func[4] = {&daObjSwBallC_c::actionWait, &daObjSwBallC_c::actionOrderEvent, &daObjSwBallC_c::actionEvent, &daObjSwBallC_c::actionDead};
     (this->*l_func[field_0x57f])(); 
 }
 
-/* 80CF6E1C-80CF6E50 -00001 0034+00 1/1 0/0 0/0 .data            action_table$3966 */
 static char* action_table[13] = {
     "WAIT",    "ON",   "OFF",     "ON_ALL_B", "OFF_ALL_B", "DEL_BALL",  "SOUND",
     "SCALING", "INIT", "MESSAGE", "ST_CUT2",  "LINK_INIT", "EQUIP_SWD",
 };
 
-/* 80CF6200-80CF629C 0006E0 009C+00 1/0 0/0 0/0 .text            actionWait__14daObjSwBallC_cFv */
 void daObjSwBallC_c::actionWait() {
     if (fopAcM_isSwitch(this, 0x3d) && fopAcM_isSwitch(this, 0x3e)) {
         setAction(1);
@@ -168,7 +149,6 @@ void daObjSwBallC_c::actionWait() {
     }
 }
 
-/* 80CF629C-80CF6344 00077C 00A8+00 1/0 0/0 0/0 .text actionOrderEvent__14daObjSwBallC_cFv */
 void daObjSwBallC_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(2);
@@ -182,7 +162,6 @@ void daObjSwBallC_c::actionOrderEvent() {
     }
 }
 
-/* 80CF6344-80CF63F0 000824 00AC+00 1/0 0/0 0/0 .text            actionEvent__14daObjSwBallC_cFv */
 void daObjSwBallC_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(field_0x57c)) {
         setAction(3);
@@ -196,12 +175,10 @@ void daObjSwBallC_c::actionEvent() {
     }
 }
 
-/* 80CF63F0-80CF63F4 0008D0 0004+00 1/0 0/0 0/0 .text            actionDead__14daObjSwBallC_cFv */
 void daObjSwBallC_c::actionDead() {
     /* empty function */
 }
 
-/* 80CF63F4-80CF6818 0008D4 0424+00 4/2 0/0 0/0 .text            demoProc__14daObjSwBallC_cFv */
 int daObjSwBallC_c::demoProc() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz acStack_38;
@@ -323,8 +300,6 @@ int daObjSwBallC_c::demoProc() {
     return 0;
 }
 
-/* 80CF6818-80CF6888 000CF8 0070+00 2/2 0/0 0/0 .text            setLightOnSwB__14daObjSwBallC_cFv
- */
 void daObjSwBallC_c::setLightOnSwB() {
     for (u8 i = 0; i < 6; i++) {
         field_0x582 = i;
@@ -335,8 +310,6 @@ void daObjSwBallC_c::setLightOnSwB() {
     }
 }
 
-/* 80CF6888-80CF68F8 000D68 0070+00 1/1 0/0 0/0 .text            setLightOffSwB__14daObjSwBallC_cFv
- */
 void daObjSwBallC_c::setLightOffSwB() {
     for (u8 i = 0; i < 6; i++) {
         field_0x582 = i;
@@ -347,14 +320,11 @@ void daObjSwBallC_c::setLightOffSwB() {
     }
 }
 
-/* 80CF68F8-80CF692C 000DD8 0034+00 1/1 0/0 0/0 .text            deleteLightBall__14daObjSwBallC_cFv
- */
 void daObjSwBallC_c::deleteLightBall() {
     deleteLightBallA();
     deleteLightBallB();
 }
 
-/* 80CF692C-80CF6964 000E0C 0038+00 1/1 0/0 0/0 .text deleteLightBallA__14daObjSwBallC_cFv */
 void daObjSwBallC_c::deleteLightBallA() {
     fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this);
     if (ball != NULL) {
@@ -362,7 +332,6 @@ void daObjSwBallC_c::deleteLightBallA() {
     }
 }
 
-/* 80CF6964-80CF699C 000E44 0038+00 1/1 0/0 0/0 .text deleteLightBallB__14daObjSwBallC_cFv */
 void daObjSwBallC_c::deleteLightBallB() {
     fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballB_sub, this);
     if (ball != NULL) {
@@ -370,7 +339,6 @@ void daObjSwBallC_c::deleteLightBallB() {
     }
 }
 
-/* 80CF699C-80CF6A74 000E7C 00D8+00 1/1 0/0 0/0 .text calcLightBallScale__14daObjSwBallC_cFv */
 int daObjSwBallC_c::calcLightBallScale() {
     int uVar3 = 0;
     fopAc_ac_c* ball = (fopAc_ac_c*)fpcM_Search(s_ballA_sub, this);
@@ -390,7 +358,6 @@ int daObjSwBallC_c::calcLightBallScale() {
     return uVar3;
 }
 
-/* 80CF6A74-80CF6BFC 000F54 0188+00 1/1 0/0 0/0 .text            draw__14daObjSwBallC_cFv */
 int daObjSwBallC_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -413,33 +380,27 @@ int daObjSwBallC_c::draw() {
     return 1;
 }
 
-/* 80CF6BFC-80CF6C30 0010DC 0034+00 1/1 0/0 0/0 .text            _delete__14daObjSwBallC_cFv */
 int daObjSwBallC_c::_delete() {
     dComIfG_resDelete(&field_0x568, l_arcName);
     return 1;
 }
 
-/* 80CF6C30-80CF6C50 001110 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Draw__FP14daObjSwBallC_c */
 static int daObjSwBallC_Draw(daObjSwBallC_c* param_0) {
     return param_0->draw();
 }
 
-/* 80CF6C50-80CF6C70 001130 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Execute__FP14daObjSwBallC_c */
 static int daObjSwBallC_Execute(daObjSwBallC_c* param_0) {
     return param_0->execute();
 }
 
-/* 80CF6C70-80CF6C90 001150 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Delete__FP14daObjSwBallC_c */
 static int daObjSwBallC_Delete(daObjSwBallC_c* param_0) {
     return param_0->_delete();
 }
 
-/* 80CF6C90-80CF6CB0 001170 0020+00 1/0 0/0 0/0 .text daObjSwBallC_Create__FP14daObjSwBallC_c */
 static int daObjSwBallC_Create(daObjSwBallC_c* param_0) {
     return param_0->create();
 }
 
-/* 80CF6EB8-80CF6ED8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSwBallC_Method */
 static actor_method_class l_daObjSwBallC_Method = {
     (process_method_func)daObjSwBallC_Create,
     (process_method_func)daObjSwBallC_Delete,
@@ -448,7 +409,6 @@ static actor_method_class l_daObjSwBallC_Method = {
     (process_method_func)daObjSwBallC_Draw,
 };
 
-/* 80CF6ED8-80CF6F08 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwBallC */
 extern actor_process_profile_definition g_profile_Obj_SwBallC = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp
index f5452f3cb0..ea77efa68e 100644
--- a/src/d/actor/d_a_obj_swLight.cpp
+++ b/src/d/actor/d_a_obj_swLight.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_swLight.h"
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
 #ifdef DEBUG
 class daObjSwLight_HIO_c : public mDoHIO_entry_c {
@@ -43,13 +42,11 @@ void daObjSwLight_HIO_c::genMessage(JORMContext* ctx) {
 static daObjSwLight_HIO_c l_HIO;
 #endif
 
-/* 80CF6F98-80CF6FD4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjSwLight_cFv */
 void daObjSwLight_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CF6FD4-80CF7038 0000B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjSwLight_cFv */
 void daObjSwLight_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -57,8 +54,6 @@ void daObjSwLight_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* ############################################################################################## */
-/* 80CF83A0-80CF83E0 000000 0040+00 4/4 0/0 0/0 .rodata          l_sph_src_at */
 const static dCcD_SrcSph l_sph_src_at = {
     {
         {0x0, {{AT_TYPE_LANTERN_SWING, 0x0, 0x11}, {0x0, 0x0}, 0x78}},  // mObj
@@ -71,7 +66,6 @@ const static dCcD_SrcSph l_sph_src_at = {
     }  // mSphAttr
 };
 
-/* 80CF83E0-80CF8420 000040 0040+00 0/1 0/0 0/0 .rodata          l_sph_src_tg */
 const static dCcD_SrcSph l_sph_src_tg = {
     {
         {0x0, {{0x0, 0x0, 0x10}, {0x202, 0x11}, 0x78}},  // mObj
@@ -84,10 +78,8 @@ const static dCcD_SrcSph l_sph_src_tg = {
     }  // mSphAttr
 };
 
-/* 80CF8488-80CF848C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_l8sw0";
 
-/* 80CF848C-80CF84A4 000024 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {{
                                 -500.0f,
                                 0.0f,
@@ -99,7 +91,6 @@ static Vec l_cull_box[2] = {{
                                 500.0f,
                             }};
 
-/* 80CF84A4-80CF84E8 00003C 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0xd8fafdff, 0x11}, 0x79}},  // mObj
@@ -114,7 +105,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }  // mCyl
 };
 
-/* 80CF7038-80CF71F0 000118 01B8+00 1/0 0/0 0/0 .text            Create__14daObjSwLight_cFv */
 int daObjSwLight_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         init_modeSwOffWait();
@@ -165,7 +155,6 @@ int daObjSwLight_c::Create() {
     return 1;
 }
 
-/* 80CF71F0-80CF7260 0002D0 0070+00 1/0 0/0 0/0 .text            CreateHeap__14daObjSwLight_cFv */
 int daObjSwLight_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(385, modelData != NULL);
@@ -173,7 +162,6 @@ int daObjSwLight_c::CreateHeap() {
     return mpModel == NULL ? 0 : 1;
 }
 
-/* 80CF7260-80CF7320 000340 00C0+00 1/1 0/0 0/0 .text            create1st__14daObjSwLight_cFv */
 int daObjSwLight_c::create1st() {
     if (field_0xb20 == 0) {
         field_0xb20 = 1;
@@ -199,8 +187,6 @@ int daObjSwLight_c::create1st() {
     return phase;
 }
 
-/* 80CF7320-80CF73E0 000400 00C0+00 1/0 0/0 0/0 .text            Execute__14daObjSwLight_cFPPA3_A4_f
- */
 int daObjSwLight_c::Execute(Mtx** param_0) {
     action();
     eventUpdate();
@@ -220,7 +206,6 @@ int daObjSwLight_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80CF73E0-80CF761C 0004C0 023C+00 1/1 0/0 0/0 .text            action__14daObjSwLight_cFv */
 void daObjSwLight_c::action() {
     static modeFunc l_func[] = {
         &daObjSwLight_c::modeSwOnWait,
@@ -266,7 +251,6 @@ void daObjSwLight_c::action() {
     }
 }
 
-/* 80CF761C-80CF766C 0006FC 0050+00 2/2 0/0 0/0 .text init_modeSwOnWait__14daObjSwLight_cFv */
 void daObjSwLight_c::init_modeSwOnWait() {
     // Light Candlestick Switch: Switch <%d> was turned off.
     OS_REPORT("光燭台スイッチ：スイッチ<%d>オフしました\n", getSwbit());
@@ -276,7 +260,6 @@ void daObjSwLight_c::init_modeSwOnWait() {
     field_0xae0 = 0;
 }
 
-/* 80CF766C-80CF777C 00074C 0110+00 1/0 0/0 0/0 .text            modeSwOnWait__14daObjSwLight_cFv */
 void daObjSwLight_c::modeSwOnWait() {
     checkHit();
     u8 tmp = field_0xae6;
@@ -321,12 +304,10 @@ void daObjSwLight_c::modeSwOnWait() {
     }
 }
 
-/* 80CF777C-80CF7788 00085C 000C+00 1/1 0/0 0/0 .text init_modeOnLight__14daObjSwLight_cFv */
 void daObjSwLight_c::init_modeOnLight() {
     field_0xae0 = 2;
 }
 
-/* 80CF7788-80CF77D8 000868 0050+00 1/0 0/0 0/0 .text            modeOnLight__14daObjSwLight_cFv */
 void daObjSwLight_c::modeOnLight() {
 #ifdef DEBUG
     if (cLib_chaseF(&field_0xadc, l_HIO.mLightMaxRadius, l_HIO.mLightMaxRadius * 0.05f)) {
@@ -339,7 +320,6 @@ void daObjSwLight_c::modeOnLight() {
 #endif
 }
 
-/* 80CF77D8-80CF7838 0008B8 0060+00 3/3 0/0 0/0 .text init_modeSwOffWait__14daObjSwLight_cFv */
 void daObjSwLight_c::init_modeSwOffWait() {
     // Light Candlestick Switch: Switch <%d> was turned on.
     OS_REPORT("光燭台スイッチ：スイッチ<%d>オンしました\n", getSwbit());
@@ -350,8 +330,6 @@ void daObjSwLight_c::init_modeSwOffWait() {
     field_0xae0 = 1;
 }
 
-/* 80CF7838-80CF7974 000918 013C+00 1/0 0/0 0/0 .text            modeSwOffWait__14daObjSwLight_cFv
- */
 void daObjSwLight_c::modeSwOffWait() {
     checkHit();
 
@@ -397,10 +375,8 @@ void daObjSwLight_c::modeSwOffWait() {
     }
 }
 
-/* 80CF7974-80CF7978 000A54 0004+00 1/0 0/0 0/0 .text            modeDead__14daObjSwLight_cFv */
 void daObjSwLight_c::modeDead() {}
 
-/* 80CF7978-80CF7A6C 000A58 00F4+00 2/2 0/0 0/0 .text            checkHit__14daObjSwLight_cFv */
 int daObjSwLight_c::checkHit() {
     field_0xae7 = field_0xae6;
     field_0xae6 = 0;
@@ -429,7 +405,6 @@ int daObjSwLight_c::checkHit() {
     return 1;
 }
 
-/* 80CF7A6C-80CF7A98 000B4C 002C+00 1/1 0/0 0/0 .text            setOnTimer__14daObjSwLight_cFv */
 void daObjSwLight_c::setOnTimer() {
     if (getOnTime() == 0 || getOnTime() == 255) {
         field_0xae4 = 75;
@@ -438,7 +413,6 @@ void daObjSwLight_c::setOnTimer() {
     }
 }
 
-/* 80CF7A98-80CF7BA8 000B78 0110+00 1/0 0/0 0/0 .text            Draw__14daObjSwLight_cFv */
 int daObjSwLight_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -468,7 +442,6 @@ int daObjSwLight_c::Draw() {
     return 1;
 }
 
-/* 80CF7BA8-80CF7BF0 000C88 0048+00 1/0 0/0 0/0 .text            Delete__14daObjSwLight_cFv */
 int daObjSwLight_c::Delete() {
     mSound.deleteObject();
     dComIfG_resDelete(&mPhase, l_arcName);
@@ -478,40 +451,29 @@ int daObjSwLight_c::Delete() {
     return 1;
 }
 
-/* 80CF7BF0-80CF7D8C 000CD0 019C+00 1/0 0/0 0/0 .text daObjSwLight_create1st__FP14daObjSwLight_c
- */
 static int daObjSwLight_create1st(daObjSwLight_c* i_this) {
     fopAcM_ct(i_this, daObjSwLight_c);
     return i_this->create1st();
 }
 
-/* 80CF8010-80CF8030 0010F0 0020+00 1/0 0/0 0/0 .text
- * daObjSwLight_MoveBGDelete__FP14daObjSwLight_c                */
 static int daObjSwLight_MoveBGDelete(daObjSwLight_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CF8030-80CF8050 001110 0020+00 1/0 0/0 0/0 .text
- * daObjSwLight_MoveBGExecute__FP14daObjSwLight_c               */
 static int daObjSwLight_MoveBGExecute(daObjSwLight_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CF8050-80CF807C 001130 002C+00 1/0 0/0 0/0 .text daObjSwLight_MoveBGDraw__FP14daObjSwLight_c
- */
 static int daObjSwLight_MoveBGDraw(daObjSwLight_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80CF8548-80CF8568 -00001 0020+00 1/0 0/0 0/0 .data            daObjSwLight_METHODS */
 static actor_method_class daObjSwLight_METHODS = {
     (process_method_func)daObjSwLight_create1st,     (process_method_func)daObjSwLight_MoveBGDelete,
     (process_method_func)daObjSwLight_MoveBGExecute, 0,
     (process_method_func)daObjSwLight_MoveBGDraw,
 };
 
-/* 80CF8568-80CF8598 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwLight */
 extern actor_process_profile_definition g_profile_Obj_SwLight = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp
index 4bdcd6517c..05e9599880 100644
--- a/src/d/actor/d_a_obj_swchain.cpp
+++ b/src/d/actor/d_a_obj_swchain.cpp
@@ -111,13 +111,11 @@ void daObjSwChain_HIO_c::genMessage(JORMContext* ctx) {
 static daObjSwChain_HIO_c l_HIO;
 #endif
 
-/* 80CF86B8-80CF86D8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* a_this) {
     daObjSwChain_c* i_this = (daObjSwChain_c*)a_this;
     return i_this->CreateHeap();
 }
 
-/* 80CF86D8-80CF8768 000098 0090+00 2/2 0/0 0/0 .text            GetActorName__FR13cBgS_PolyInfo */
 static s16 GetActorName(cBgS_PolyInfo& param_0) {
     if (dComIfG_Bgsp().ChkPolySafe(param_0)) {
         if (dComIfG_Bgsp().ChkMoveBG_NoDABg(param_0)) {
@@ -130,10 +128,8 @@ static s16 GetActorName(cBgS_PolyInfo& param_0) {
     return PROC_Obj_SwChain;
 }
 
-/* 80CFB798-80CFB79C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Chain";
 
-/* 80CFB79C-80CFB7DC 000004 0040+00 1/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x11}, 0x58}},  // mObj
@@ -146,7 +142,6 @@ static dCcD_SrcSph l_sph_src = {
     }  // mSphAttr
 };
 
-/* 80CFB7DC-80CFB81C 000044 0040+00 1/1 0/0 0/0 .data            l_sph_srcCo */
 static dCcD_SrcSph l_sph_srcCo = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x10}, 0x49}},  // mObj
@@ -159,7 +154,6 @@ static dCcD_SrcSph l_sph_srcCo = {
     }  // mSphAttr
 };
 
-/* 80CF8768-80CF89C0 000128 0258+00 1/1 0/0 0/0 .text            Create__14daObjSwChain_cFv */
 int daObjSwChain_c::Create() {
     mStts.Init(0xff, 0xff, this);
     mSph1.Set(l_sph_src);
@@ -208,7 +202,6 @@ int daObjSwChain_c::Create() {
     return 1;
 }
 
-/* 80CF89C0-80CF8B00 000380 0140+00 1/1 0/0 0/0 .text            CreateHeap__14daObjSwChain_cFv */
 int daObjSwChain_c::CreateHeap() {
     mChains = new chain_s[mChainNum + 1];
 
@@ -238,7 +231,6 @@ int daObjSwChain_c::CreateHeap() {
     return 1;
 }
 
-/* 80CF8B48-80CF8DD0 000508 0288+00 1/1 0/0 0/0 .text            create1st__14daObjSwChain_cFv */
 int daObjSwChain_c::create1st() {
     fopAcM_ct(this, daObjSwChain_c);
 
@@ -309,7 +301,6 @@ int daObjSwChain_c::create1st() {
     return phase;
 }
 
-/* 80CF8ED0-80CF94E4 000890 0614+00 1/1 0/0 0/0 .text            execute__14daObjSwChain_cFv */
 int daObjSwChain_c::execute() {
 #ifdef DEBUG
     if (l_HIO.mProcessStop) {
@@ -455,12 +446,10 @@ int daObjSwChain_c::execute() {
     return 1;
 }
 
-/* 80CF94E4-80CF9500 000EA4 001C+00 1/1 0/0 0/0 .text            getChainBasePos__14daObjSwChain_cFP4cXyz */
 void daObjSwChain_c::getChainBasePos(cXyz* param_0) {
     *param_0 = home.pos;
 }
 
-/* 80CF9500-80CF99C0 000EC0 04C0+00 1/1 0/0 0/0 .text            chain_control__14daObjSwChain_cFv */
 void daObjSwChain_c::chain_control() {
     f32 fVar1;
     chain_s* chains_p2 = mChains;
@@ -596,7 +585,6 @@ void daObjSwChain_c::chain_control() {
     }
 }
 
-/* 80CF99C0-80CFA05C 001380 069C+00 1/1 0/0 0/0 .text            chain_control2__14daObjSwChain_cFv */
 void daObjSwChain_c::chain_control2() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     chain_s* chains_p = &mChains[mChainNum];
@@ -737,7 +725,6 @@ void daObjSwChain_c::chain_control2() {
     }
 }
 
-/* 80CFA05C-80CFA124 001A1C 00C8+00 1/1 0/0 0/0 .text            initChainMtx__14daObjSwChain_cFv */
 void daObjSwChain_c::initChainMtx() {
     int iVar1 = 0;
     for (int i = 0; i < mChainNum + 1; i++) {
@@ -753,7 +740,6 @@ void daObjSwChain_c::initChainMtx() {
     setChainMtx();
 }
 
-/* 80CFA124-80CFA4A8 001AE4 0384+00 2/2 0/0 0/0 .text            setChainMtx__14daObjSwChain_cFv */
 void daObjSwChain_c::setChainMtx() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     chain_s* chains_p1;
@@ -811,7 +797,6 @@ void daObjSwChain_c::setChainMtx() {
     cLib_addCalcAngleS2(&field_0xa6e, field_0xa70, 5, 800);
 }
 
-/* 80CFA4A8-80CFAD50 001E68 08A8+00 1/1 0/0 0/0 .text            chain_count_control__14daObjSwChain_cFv */
 void daObjSwChain_c::chain_count_control() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     chain_s* chains_p = &mChains[getTopChainNo()];
@@ -990,7 +975,6 @@ void daObjSwChain_c::chain_count_control() {
     }
 }
 
-/* 80CFAD50-80CFB450 002710 0700+00 1/1 0/0 0/0 .text            setTension__14daObjSwChain_cFv */
 void daObjSwChain_c::setTension() {
     f32 fVar1 = pow;
     field_0xa6a = 0;
@@ -1101,12 +1085,10 @@ void daObjSwChain_c::setTension() {
     }
 }
 
-/* 80CFB450-80CFB464 002E10 0014+00 8/8 0/0 0/0 .text            getTopChainNo__14daObjSwChain_cFv */
 int daObjSwChain_c::getTopChainNo() {
     return mChainNum - mOutNum + 1;
 }
 
-/* 80CFB464-80CFB53C 002E24 00D8+00 1/1 0/0 0/0 .text            checkPlayerPull__14daObjSwChain_cFv */
 BOOL daObjSwChain_c::checkPlayerPull() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     cXyz sp2c;
@@ -1122,7 +1104,6 @@ BOOL daObjSwChain_c::checkPlayerPull() {
     return FALSE;
 }
 
-/* 80CFB53C-80CFB5E8 002EFC 00AC+00 1/1 0/0 0/0 .text            draw__14daObjSwChain_cFv */
 int daObjSwChain_c::draw() {
     g_env_light.settingTevStruct(0, &home.pos, &tevStr);
     
@@ -1182,7 +1163,6 @@ int daObjSwChain_c::draw() {
     return 1;
 }
 
-/* 80CFB5E8-80CFB61C 002FA8 0034+00 1/1 0/0 0/0 .text            _delete__14daObjSwChain_cFv */
 int daObjSwChain_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
 #ifdef DEBUG
@@ -1191,37 +1171,31 @@ int daObjSwChain_c::_delete() {
     return 1;
 }
 
-/* 80CFB61C-80CFB63C 002FDC 0020+00 1/0 0/0 0/0 .text            daObjSwChain_Draw__FP14daObjSwChain_c */
 static int daObjSwChain_Draw(daObjSwChain_c* i_this) {
     return i_this->draw();
 }
 
-/* 80CFB63C-80CFB65C 002FFC 0020+00 1/0 0/0 0/0 .text            daObjSwChain_Execute__FP14daObjSwChain_c */
 static int daObjSwChain_Execute(daObjSwChain_c* i_this) {
     return i_this->execute();
 }
 
-/* 80CFB65C-80CFB67C 00301C 0020+00 1/0 0/0 0/0 .text            daObjSwChain_Delete__FP14daObjSwChain_c */
 static int daObjSwChain_Delete(daObjSwChain_c* i_this) {
     fpc_ProcID unused = fopAcM_GetID(i_this);
     return i_this->_delete();
 }
 
-/* 80CFB67C-80CFB69C 00303C 0020+00 1/0 0/0 0/0 .text            daObjSwChain_Create__FP10fopAc_ac_c */
 static int daObjSwChain_Create(fopAc_ac_c* a_this) {
     daObjSwChain_c* i_this = (daObjSwChain_c*)a_this;
     fpc_ProcID unused = fopAcM_GetID(a_this);
     return i_this->create1st();
 }
 
-/* 80CFB81C-80CFB83C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSwChain_Method */
 static actor_method_class l_daObjSwChain_Method = {
     (process_method_func)daObjSwChain_Create,  (process_method_func)daObjSwChain_Delete,
     (process_method_func)daObjSwChain_Execute, 0,
     (process_method_func)daObjSwChain_Draw,
 };
 
-/* 80CFB83C-80CFB86C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwChain */
 extern actor_process_profile_definition g_profile_Obj_SwChain = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp
index 900c5abcda..4387d35e7a 100644
--- a/src/d/actor/d_a_obj_swhang.cpp
+++ b/src/d/actor/d_a_obj_swhang.cpp
@@ -12,32 +12,26 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 80CFD1DC-80CFD1F0 000000 0014+00 4/4 0/0 0/0 .rodata          l_bmdIdx */
 static u32 const l_bmdIdx[5] = {
     4, 4, 4, 4, 4,
 };
 
-/* 80CFD1F0-80CFD204 000014 0014+00 1/1 0/0 0/0 .rodata          l_dzbIdx */
 static u32 const l_dzbIdx[5] = {
     7, 7, 7, 7, 7,
 };
 
-/* 80CFD204-80CFD218 000028 0014+00 1/1 0/0 0/0 .rodata          l_dzbIdx2 */
 static u32 const l_dzbIdx2[5] = {
     8, 8, 8, 8, 8,
 };
 
-/* 80CFD218-80CFD22C 00003C 0014+00 1/3 0/0 0/0 .rodata          l_pull_length */
 static f32 const l_pull_length[5] = {
     100.0f, 100.0f, 130.0f, 100.0f, 200.0f,
 };
 
-/* 80CFD22C-80CFD240 000050 0014+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[5] = {
     0x1980, 0x1980, 0x1980, 0x2030, 0x2030,
 };
 
-/* 80CFB938-80CFB9D8 000078 00A0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* pJoint, int param_2) {
     if (param_2 == 0) {
         J3DJoint* my_joint = pJoint;
@@ -53,7 +47,6 @@ static int nodeCallBack(J3DJoint* pJoint, int param_2) {
     return 1;
 }
 
-/* 80CFB9D8-80CFBA60 000118 0088+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjSwHang_cFv */
 void daObjSwHang_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
@@ -63,7 +56,6 @@ void daObjSwHang_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80CFBA60-80CFBAC8 0001A0 0068+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjSwHang_cFv */
 void daObjSwHang_c::setBaseMtx() {
     f32 hang_length = mHangLength + KREG_F(10);
     mDoMtx_stack_c::transS(current.pos.x,
@@ -73,7 +65,6 @@ void daObjSwHang_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CFD2D8-80CFD2EC -00001 0014+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[5] = {
     "S_bura_A",
     "S_bura_B",
@@ -82,7 +73,6 @@ static char* l_arcName[5] = {
     "S_bura_7c",
 };
 
-/* 80CFD2EC-80CFD300 -00001 0014+00 0/1 0/0 0/0 .data            l_pull_jnt */
 static char* l_pull_jnt[5] = {
     "totte",
     "hook",
@@ -91,13 +81,11 @@ static char* l_pull_jnt[5] = {
     "tottel",
 };
 
-/* 80CFD300-80CFD33C 000048 003C+00 3/3 0/0 0/0 .data            l_hang_offset */
 static Vec l_hang_offset[5] = {
     {0.0f, -470.0f, 10.0f}, {0.0f, -183.0f, 10.0f},   {0.0f, -200.0f, 10.0f},
     {0.0f, -520.0f, 10.0f}, {0.0f, -1010.0f, 10.0f},
 };
 
-/* 80CFD33C-80CFD37C 000084 0040+00 0/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x10}, 0x19}}, // mObj
@@ -110,7 +98,6 @@ static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80CFD37C-80CFD3BC 0000C4 0040+00 0/1 0/0 0/0 .data            l_sph_src2 */
 static dCcD_SrcSph l_sph_src2 = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x4000, 0x11}, 0x18}}, // mObj
@@ -123,7 +110,6 @@ static dCcD_SrcSph l_sph_src2 = {
     } // mSphAttr
 };
 
-/* 80CFBAC8-80CFBCB8 000208 01F0+00 1/0 0/0 0/0 .text            Create__13daObjSwHang_cFv */
 int daObjSwHang_c::Create() {
     if (checkDown()) {
         mHangLength = l_pull_length[mType];
@@ -166,7 +152,6 @@ int daObjSwHang_c::Create() {
     return 1;
 }
 
-/* 80CFBCB8-80CFBDD0 0003F8 0118+00 1/0 0/0 0/0 .text            CreateHeap__13daObjSwHang_cFv */
 int daObjSwHang_c::CreateHeap() {
    J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(
         l_arcName[mType],
@@ -187,7 +172,6 @@ int daObjSwHang_c::CreateHeap() {
     return 1;
 }
 
-/* 80CFBDD0-80CFBF60 000510 0190+00 1/1 0/0 0/0 .text            create1st__13daObjSwHang_cFv */
 int daObjSwHang_c::create1st() {
     fopAcM_ct(this, daObjSwHang_c);
     mType = getType_private();
@@ -203,7 +187,6 @@ int daObjSwHang_c::create1st() {
     return rv;
 }
 
-/* 80CFC04C-80CFC114 00078C 00C8+00 1/1 0/0 0/0 .text            calcHangPos__13daObjSwHang_cFv */
 void daObjSwHang_c::calcHangPos() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     mHangPos = l_hang_offset[mType];
@@ -217,7 +200,6 @@ void daObjSwHang_c::calcHangPos() {
     mDoMtx_stack_c::multVec(&mHangPos, &mHangPos);
 }
 
-/* 80CFC114-80CFC194 000854 0080+00 4/4 0/0 0/0 .text            checkDown__13daObjSwHang_cFv */
 BOOL daObjSwHang_c::checkDown() {
     if (!checkType()) {
         if (fopAcM_isSwitch(this, getSwNo())) {
@@ -231,8 +213,6 @@ BOOL daObjSwHang_c::checkDown() {
     return 0;
 }
 
-/* 80CFC194-80CFC1F4 0008D4 0060+00 2/2 0/0 0/0 .text            changeOnStatus__13daObjSwHang_cFv
- */
 void daObjSwHang_c::changeOnStatus() {
     if (!checkType()) {
         fopAcM_onSwitch(this, getSwNo());
@@ -241,8 +221,6 @@ void daObjSwHang_c::changeOnStatus() {
     }
 }
 
-/* 80CFC1F4-80CFC254 000934 0060+00 1/1 0/0 0/0 .text            changeOffStatus__13daObjSwHang_cFv
- */
 void daObjSwHang_c::changeOffStatus() {
     if (!checkType()) {
         fopAcM_offSwitch(this, getSwNo());
@@ -251,8 +229,6 @@ void daObjSwHang_c::changeOffStatus() {
     }
 }
 
-/* 80CFC254-80CFC4C4 000994 0270+00 1/0 0/0 0/0 .text            Execute__13daObjSwHang_cFPPA3_A4_f
- */
 int daObjSwHang_c::Execute(Mtx** ppMtx) {
     eventUpdate();
     action();
@@ -297,7 +273,6 @@ int daObjSwHang_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80CFC4C4-80CFC550 000C04 008C+00 1/1 0/0 0/0 .text            action__13daObjSwHang_cFv */
 void daObjSwHang_c::action() {
     static daObjSwHang_c::modeFunc l_func[2] = {
         &daObjSwHang_c::modeOffWait,
@@ -306,7 +281,6 @@ void daObjSwHang_c::action() {
     (this->*(l_func[mMode]))();
 }
 
-/* 80CFC550-80CFC698 000C90 0148+00 1/1 0/0 0/0 .text            checkDownSw__13daObjSwHang_cFv */
 void daObjSwHang_c::checkDownSw() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     clrFlag();
@@ -348,14 +322,11 @@ void daObjSwHang_c::checkDownSw() {
     }
 }
 
-/* 80CFC698-80CFC6AC 000DD8 0014+00 2/2 0/0 0/0 .text            init_modeOffWait__13daObjSwHang_cFv
- */
 void daObjSwHang_c::init_modeOffWait() {
     field_0x77e = 10;
     mMode = MODE_OFF_WAIT;
 }
 
-/* 80CFC6AC-80CFCA34 000DEC 0388+00 1/0 0/0 0/0 .text            modeOffWait__13daObjSwHang_cFv */
 void daObjSwHang_c::modeOffWait() {
     daPy_getPlayerActorClass();
     u16 flags = mFlags;
@@ -419,13 +390,10 @@ void daObjSwHang_c::modeOffWait() {
     }
 }
 
-/* 80CFCA34-80CFCA40 001174 000C+00 2/2 0/0 0/0 .text            init_modeOnWait__13daObjSwHang_cFv
- */
 void daObjSwHang_c::init_modeOnWait() {
     mMode = MODE_ON_WAIT;
 }
 
-/* 80CFCA40-80CFCCE0 001180 02A0+00 1/0 0/0 0/0 .text            modeOnWait__13daObjSwHang_cFv */
 void daObjSwHang_c::modeOnWait() {
     daPy_getPlayerActorClass();
     bool isUp = !checkDown();
@@ -474,13 +442,11 @@ void daObjSwHang_c::modeOnWait() {
     }
 }
 
-/* 80CFCCE0-80CFCD04 001420 0024+00 2/1 0/0 0/0 .text            eventStart__13daObjSwHang_cFv */
 bool daObjSwHang_c::eventStart() {
     changeOnStatus();
     return true;
 }
 
-/* 80CFCD04-80CFCD98 001444 0094+00 1/0 0/0 0/0 .text            Draw__13daObjSwHang_cFv */
 int daObjSwHang_c::Draw() {
     if (mType == TYPE_0 || mType == TYPE_1) {
         g_env_light.settingTevStruct( 0,
@@ -496,7 +462,6 @@ int daObjSwHang_c::Draw() {
     return 1;
 }
 
-/* 80CFCD98-80CFCE0C 0014D8 0074+00 1/0 0/0 0/0 .text            Delete__13daObjSwHang_cFv */
 int daObjSwHang_c::Delete() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         bool unused_r29 = dComIfG_Bgsp().Release(mpBgW);
@@ -505,25 +470,19 @@ int daObjSwHang_c::Delete() {
     return 1;
 }
 
-/* 80CFCE0C-80CFCF20 00154C 0114+00 1/0 0/0 0/0 .text daObjSwHang_create1st__FP13daObjSwHang_c */
 static int daObjSwHang_create1st(daObjSwHang_c* i_this) {
     fopAcM_ct(i_this, daObjSwHang_c);
     return i_this->create1st();
 }
 
-/* 80CFCF20-80CFCF40 001660 0020+00 1/0 0/0 0/0 .text daObjSwHang_MoveBGDelete__FP13daObjSwHang_c
- */
 static int daObjSwHang_MoveBGDelete(daObjSwHang_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80CFCF40-80CFCF60 001680 0020+00 1/0 0/0 0/0 .text daObjSwHang_MoveBGExecute__FP13daObjSwHang_c
- */
 static int daObjSwHang_MoveBGExecute(daObjSwHang_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80CFCF60-80CFCF8C 0016A0 002C+00 1/0 0/0 0/0 .text daObjSwHang_MoveBGDraw__FP13daObjSwHang_c */
 static int daObjSwHang_MoveBGDraw(daObjSwHang_c* i_this) {
     return i_this->MoveBGDraw();
 }
@@ -533,7 +492,6 @@ static void dummy() {
     delete (cCcD_GStts*)NULL;
 }
 
-/* 80CFD3EC-80CFD40C -00001 0020+00 1/0 0/0 0/0 .data            daObjSwHang_METHODS */
 static actor_method_class daObjSwHang_METHODS = {
     (process_method_func)daObjSwHang_create1st,
     (process_method_func)daObjSwHang_MoveBGDelete,
@@ -542,7 +500,6 @@ static actor_method_class daObjSwHang_METHODS = {
     (process_method_func)daObjSwHang_MoveBGDraw,
 };
 
-/* 80CFD40C-80CFD43C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwHang */
 extern actor_process_profile_definition g_profile_Obj_SwHang = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp
index be97a8c181..7a619b7c57 100644
--- a/src/d/actor/d_a_obj_sword.cpp
+++ b/src/d/actor/d_a_obj_sword.cpp
@@ -10,23 +10,19 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 
-/* 80CFDEB4-80CFDECC 000020 0018+00 1/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {{-200.0f, 0.0f, -200.0f}, {200.0f, 100.0f, 200.0f}};
 
-/* 80CFD558-80CFD594 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjSword_cFv */
 void daObjSword_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80CFD594-80CFD600 0000B4 006C+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjSword_cFv */
 void daObjSword_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80CFD600-80CFD67C 000120 007C+00 1/1 0/0 0/0 .text            Create__12daObjSword_cFv */
 int daObjSword_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -38,7 +34,6 @@ int daObjSword_c::Create() {
     return 1;
 }
 
-/* 80CFD67C-80CFD848 00019C 01CC+00 1/1 0/0 0/0 .text            create__12daObjSword_cFv */
 cPhs__Step daObjSword_c::create() {
     fopAcM_ct(this, daObjSword_c);
     m_itemNo = 0x28;
@@ -58,7 +53,6 @@ cPhs__Step daObjSword_c::create() {
     return phase;
 }
 
-/* 80CFDA14-80CFDA8C 000534 0078+00 1/0 0/0 0/0 .text            actionWait__12daObjSword_cFv */
 int daObjSword_c::actionWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (fopAcM_checkCarryNow(this)) {
@@ -73,7 +67,6 @@ int daObjSword_c::actionWait() {
     return 1;
 }
 
-/* 80CFDA8C-80CFDB04 0005AC 0078+00 1/1 0/0 0/0 .text initActionOrderGetDemo__12daObjSword_cFv */
 int daObjSword_c::initActionOrderGetDemo() {
     hide();
     fopAcM_orderItemEvent(this, 0, 0);
@@ -84,7 +77,6 @@ int daObjSword_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 80CFDB04-80CFDB80 000624 007C+00 1/0 0/0 0/0 .text actionOrderGetDemo__12daObjSword_cFv */
 int daObjSword_c::actionOrderGetDemo() {
     if (eventInfo.checkCommandItem()) {
         setStatus(2);
@@ -98,7 +90,6 @@ int daObjSword_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 80CFDB80-80CFDC1C 0006A0 009C+00 1/0 0/0 0/0 .text            actionGetDemo__12daObjSword_cFv */
 int daObjSword_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         fopAcM_onItem(this, getItemBit());
@@ -109,7 +100,6 @@ int daObjSword_c::actionGetDemo() {
     return 1;
 }
 
-/* 80CFDC1C-80CFDD18 00073C 00FC+00 2/2 0/0 0/0 .text            execute__12daObjSword_cFv */
 int daObjSword_c::execute() {
     static int (daObjSword_c::* l_demoFunc[])() = {
         &daObjSword_c::actionWait, &daObjSword_c::actionOrderGetDemo, &daObjSword_c::actionGetDemo};
@@ -121,7 +111,6 @@ int daObjSword_c::execute() {
     return 1;
 }
 
-/* 80CFDD18-80CFDD6C 000838 0054+00 1/1 0/0 0/0 .text            draw__12daObjSword_cFv */
 int daObjSword_c::draw() {
     if (!chkDraw()) {
         return 1;
@@ -130,43 +119,33 @@ int daObjSword_c::draw() {
     return 1;
 }
 
-/* 80CFDD6C-80CFDDA4 00088C 0038+00 1/1 0/0 0/0 .text            _delete__12daObjSword_cFv */
 int daObjSword_c::_delete() {
     DeleteBase(dItem_data::getFieldArc(m_itemNo));
     return 1;
 }
 
-/* 80CFDDA4-80CFDDC4 0008C4 0020+00 1/0 0/0 0/0 .text            daObjSword_Draw__FP12daObjSword_c
- */
 static int daObjSword_Draw(daObjSword_c* param_0) {
     return param_0->draw();
 }
 
-/* 80CFDDC4-80CFDDE4 0008E4 0020+00 1/0 0/0 0/0 .text daObjSword_Execute__FP12daObjSword_c */
 static int daObjSword_Execute(daObjSword_c* param_0) {
     return param_0->execute();
 }
 
-/* 80CFDDE4-80CFDE04 000904 0020+00 1/0 0/0 0/0 .text            daObjSword_Delete__FP12daObjSword_c
- */
 static int daObjSword_Delete(daObjSword_c* param_0) {
     return param_0->_delete();
 }
 
-/* 80CFDE04-80CFDE24 000924 0020+00 1/0 0/0 0/0 .text            daObjSword_Create__FP12daObjSword_c
- */
 static int daObjSword_Create(daObjSword_c* param_0) {
     return param_0->create();
 }
 
-/* 80CFDF14-80CFDF34 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSword_Method */
 static actor_method_class l_daObjSword_Method = {
     (process_method_func)daObjSword_Create,  (process_method_func)daObjSword_Delete,
     (process_method_func)daObjSword_Execute, 0,
     (process_method_func)daObjSword_Draw,
 };
 
-/* 80CFDF34-80CFDF64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Sword */
 extern actor_process_profile_definition g_profile_Obj_Sword = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp
index fdaf66f11c..43c5b6ba23 100644
--- a/src/d/actor/d_a_obj_swpropeller.cpp
+++ b/src/d/actor/d_a_obj_swpropeller.cpp
@@ -15,7 +15,6 @@
 #define TYPE_BOOMERANG 0  // only turns when hit with boomerang
 #define TYPE_WIND 1       // automatically turns
 
-/* 8059A518-8059A5C8 000078 00B0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -33,31 +32,25 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8059A5C8-8059A5E8 000128 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjSwPr_c*>(i_this)->CreateHeap();
 }
 
-/* 8059A5E8-8059A624 000148 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjSwPr_cFv */
 void daObjSwPr_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 8059A624-8059A670 000184 004C+00 3/3 0/0 0/0 .text            setBaseMtx__11daObjSwPr_cFv */
 void daObjSwPr_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8059B2C8-8059B2D0 000000 0008+00 3/3 0/0 0/0 .rodata          l_bmdName */
 static int const l_bmdName[] = {3, 3};
 
-/* 8059B2D0-8059B2D8 000008 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[] = {0xF20, 0x36C0};
 
-/* 8059B2D8-8059B31C 000010 0044+00 0/1 0/0 0/0 .rodata          l_cyl_src */
 static const dCcD_SrcCyl l_cyl_src = {
     {
         {0, {{0, 0, 0}, {0x10040, 0x11}, 0x58}},
@@ -72,20 +65,15 @@ static const dCcD_SrcCyl l_cyl_src = {
     },
 };
 
-/* 8059B31C-8059B334 000054 0018+00 0/1 0/0 0/0 .rodata          l_cull_size */
 static f32 const l_cull_size[] = {-150.0f, 0.0f, -150.0f, 150.0f, 150.0f, 150.0f};
 
-/* 8059B334-8059B33C 00006C 0006+02 0/0 0/0 0/0 .rodata          l_r00_rot_time */
 // This was used for this object's HIO, which was removed in retail
 static s16 const l_r00_rot_time[] = {190, 148, 100};
 
-/* 8059B380-8059B388 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[] = {"K_prop00", "Lv9_puro"};
 
-/* 8059B388-8059B38C -00001 0004+00 1/1 0/0 0/0 .data            l_joint_name */
 static char* l_joint_name = "kaiten";
 
-/* 8059A670-8059A808 0001D0 0198+00 1/1 0/0 0/0 .text            Create__11daObjSwPr_cFv */
 int daObjSwPr_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -127,7 +115,6 @@ int daObjSwPr_c::Create() {
     return 1;
 }
 
-/* 8059A808-8059A888 000368 0080+00 1/1 0/0 0/0 .text            CreateHeap__11daObjSwPr_cFv */
 int daObjSwPr_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName[mModelType], l_bmdName[mModelType]);
@@ -140,7 +127,6 @@ int daObjSwPr_c::CreateHeap() {
     return 1;
 }
 
-/* 8059A888-8059AA74 0003E8 01EC+00 1/1 0/0 0/0 .text            create__11daObjSwPr_cFv */
 int daObjSwPr_c::create() {
     fopAcM_ct(this, daObjSwPr_c);
 
@@ -166,13 +152,11 @@ int daObjSwPr_c::create() {
     return phase;
 }
 
-/* 8059AB04-8059AB14 000664 0010+00 1/1 0/0 0/0 .text            setRotateTime__11daObjSwPr_cFv */
 int daObjSwPr_c::setRotateTime() {
     field_0x83a = 0;
     return 100;
 }
 
-/* 8059AB14-8059AB9C 000674 0088+00 1/1 0/0 0/0 .text            switchCtrl__11daObjSwPr_cFv */
 void daObjSwPr_c::switchCtrl() {
     int sw = getSwbit();
 
@@ -183,7 +167,6 @@ void daObjSwPr_c::switchCtrl() {
     }
 }
 
-/* 8059AB9C-8059ADCC 0006FC 0230+00 1/1 0/0 0/0 .text execute_type_boomerang__11daObjSwPr_cFv */
 void daObjSwPr_c::execute_type_boomerang() {
     bool tg_hit = mCyl1.ChkTgHit();
 
@@ -233,8 +216,6 @@ void daObjSwPr_c::execute_type_boomerang() {
     field_0x838 = tg_hit;
 }
 
-/* 8059ADCC-8059B014 00092C 0248+00 1/1 0/0 0/0 .text            execute_type_wind__11daObjSwPr_cFv
- */
 void daObjSwPr_c::execute_type_wind() {
     s16 target_speed = 0;
     int sw = getSwbit();
@@ -293,7 +274,6 @@ void daObjSwPr_c::execute_type_wind() {
     field_0x83d = var_r29;
 }
 
-/* 8059B014-8059B148 000B74 0134+00 1/1 0/0 0/0 .text            execute__11daObjSwPr_cFv */
 int daObjSwPr_c::execute() {
     switch (mNameArg) {
     case TYPE_BOOMERANG:
@@ -313,7 +293,6 @@ int daObjSwPr_c::execute() {
     return 1;
 }
 
-/* 8059B148-8059B1AC 000CA8 0064+00 1/1 0/0 0/0 .text            draw__11daObjSwPr_cFv */
 int daObjSwPr_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -322,42 +301,33 @@ int daObjSwPr_c::draw() {
     return 1;
 }
 
-/* 8059B1AC-8059B1EC 000D0C 0040+00 1/1 0/0 0/0 .text            _delete__11daObjSwPr_cFv */
 int daObjSwPr_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mModelType]);
     return 1;
 }
 
-/* 8059B1EC-8059B20C 000D4C 0020+00 1/0 0/0 0/0 .text            daObjSwPr_Draw__FP11daObjSwPr_c */
 static int daObjSwPr_Draw(daObjSwPr_c* i_this) {
     return i_this->draw();
 }
 
-/* 8059B20C-8059B22C 000D6C 0020+00 1/0 0/0 0/0 .text            daObjSwPr_Execute__FP11daObjSwPr_c
- */
 static int daObjSwPr_Execute(daObjSwPr_c* i_this) {
     return i_this->execute();
 }
 
-/* 8059B22C-8059B24C 000D8C 0020+00 1/0 0/0 0/0 .text            daObjSwPr_Delete__FP11daObjSwPr_c
- */
 static int daObjSwPr_Delete(daObjSwPr_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8059B24C-8059B26C 000DAC 0020+00 1/0 0/0 0/0 .text            daObjSwPr_Create__FP10fopAc_ac_c */
 static int daObjSwPr_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjSwPr_c*>(i_this)->create();
 }
 
-/* 8059B38C-8059B3AC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSwPr_Method */
 static actor_method_class l_daObjSwPr_Method = {
     (process_method_func)daObjSwPr_Create,  (process_method_func)daObjSwPr_Delete,
     (process_method_func)daObjSwPr_Execute, (process_method_func)NULL,
     (process_method_func)daObjSwPr_Draw,
 };
 
-/* 8059B3AC-8059B3DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Swpropeller */
 extern actor_process_profile_definition g_profile_Obj_Swpropeller = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp
index c6ed8c7d43..fbceaee644 100644
--- a/src/d/actor/d_a_obj_swpush.cpp
+++ b/src/d/actor/d_a_obj_swpush.cpp
@@ -34,7 +34,6 @@ enum S_lv6bota_RES_File_ID {
     /* 0x7 */ DZB_KBOTA3_00 = 0x7,
 };
 
-/* 80482D4C-80482D7C 0000EC 0030+00 1/1 0/0 0/0 .text            prmZ_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::prmZ_init() {
     if (mPrmZInit) {
         return;
@@ -46,30 +45,24 @@ void daObjSwpush::Act_c::prmZ_init() {
     shape_angle.z = 0;
 }
 
-/* 80482D7C-80482DC4 00011C 0048+00 2/2 0/0 0/0 .text is_switch2__Q211daObjSwpush5Act_cCFv */
 bool daObjSwpush::Act_c::is_switch2() const {
     return fopAcM_isSwitch(this, prmZ_get_swSave2() & 0xFF);
 }
 
-/* 80482DC4-80482DE8 000164 0024+00 1/1 0/0 0/0 .text            solidHeapCB__Q211daObjSwpush5Act_cFP10fopAc_ac_c */
 BOOL daObjSwpush::Act_c::solidHeapCB(fopAc_ac_c* a_this) {
     return static_cast<daObjSwpush::Act_c*>(a_this)->create_heap();
 }
 
-/* 80484D10-80484D18 000000 0006+02 8/8 0/0 0/0 .rodata          M_bmd__Q211daObjSwpush5Act_c */
 s16 const daObjSwpush::Act_c::M_bmd[3] = {BMDR_KBOTA_00, BMDR_S_LV3BOTA, BMDR_S_LV6BOTA};
 
-/* 80484D18-80484D20 000008 0006+02 1/1 0/0 0/0 .rodata          M_dzb__Q211daObjSwpush5Act_c */
 s16 const daObjSwpush::Act_c::M_dzb[3] = {DZB_KBOTA_00, DZB_KBOTA2_00, DZB_KBOTA3_00};
 
-/* 80484EA4-80484EB0 -00001 000C+00 3/3 0/0 0/0 .data            M_arcname__Q211daObjSwpush5Act_c */
 char* daObjSwpush::Act_c::M_arcname[3] = {
     "Kbota_00",
     "S_lv3bota",
     "S_lv6bota",
 };
 
-/* 80482DE8-80482FE8 000188 0200+00 1/1 0/0 0/0 .text create_heap__Q211daObjSwpush5Act_cFv */
 bool daObjSwpush::Act_c::create_heap() {
     bool rv = false;
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mMdl], M_bmd[mMdl]);
@@ -114,7 +107,6 @@ bool daObjSwpush::Act_c::create_heap() {
     return rv;
 }
 
-/* 80482FE8-80483038 000388 0050+00 1/1 0/0 0/0 .text create_res_load__Q211daObjSwpush5Act_cFv */
 cPhs__Step daObjSwpush::Act_c::create_res_load() {
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, M_arcname[mMdl]);
     if (phase != cPhs_COMPLEATE_e) {
@@ -124,10 +116,8 @@ cPhs__Step daObjSwpush::Act_c::create_res_load() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80484D20-80484D2C 000010 000C+00 0/1 0/0 0/0 .rodata          M_heap_size__Q211daObjSwpush5Act_c */
 u32 const daObjSwpush::Act_c::M_heap_size[3] = {0x1000, 0x1000, 0x1000};
 
-/* 80484D2C-80484E08 00001C 00DC+00 4/10 0/0 0/0 .rodata          M_attr__Q211daObjSwpush5Act_c */
 daObjSwpush::Hio_c::Attr_c const daObjSwpush::Act_c::M_attr[5] = {
     {
         (AttrFlag_e)(FLAG_STAY_PRESSED | FLAG_OBEY_SAVE),
@@ -207,10 +197,8 @@ daObjSwpush::Hio_c::Attr_c const daObjSwpush::Act_c::M_attr[5] = {
 
 };
 
-/* 80484E08-80484E0C 0000F8 0004+00 0/3 0/0 0/0 .rodata          M_op_vtx__Q211daObjSwpush5Act_c */
 u8 const daObjSwpush::Act_c::M_op_vtx[4] = {0x0D, 0x0B, 0x0A, 0x0C};
 
-/* 80483038-80483450 0003D8 0418+00 1/1 0/0 0/0 .text Mthd_Create__Q211daObjSwpush5Act_cFv */
 cPhs__Step daObjSwpush::Act_c::Mthd_Create() {
     fopAcM_ct(this, daObjSwpush::Act_c);
 
@@ -319,7 +307,6 @@ cPhs__Step daObjSwpush::Act_c::Mthd_Create() {
     return phase;
 }
 
-/* 8048348C-804834E8 00082C 005C+00 1/1 0/0 0/0 .text Mthd_Delete__Q211daObjSwpush5Act_cFv */
 int daObjSwpush::Act_c::Mthd_Delete() {
     if (dComIfG_Bgsp().Release(mpBgW)) {
         OS_REPORT_ERROR("Release Error(%s %d)\n", "d_a_obj_swpush.cpp", 777);
@@ -329,25 +316,21 @@ int daObjSwpush::Act_c::Mthd_Delete() {
     return 1;
 }
 
-/* 804834E8-80483534 000888 004C+00 2/2 0/0 0/0 .text            set_mtx__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::set_mtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80483534-80483570 0008D4 003C+00 1/1 0/0 0/0 .text            init_mtx__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::init_mtx() {
     mpModel->setBaseScale(scale);
     set_mtx();
 }
 
-/* 80483570-80483574 000910 0004+00 2/2 0/0 0/0 .text set_btp_frame__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::set_btp_frame() {
     /* empty function */
 }
 
-/* 80483574-80483910 000914 039C+00 1/1 0/0 0/0 .text            rideCB__Q211daObjSwpush5Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt) {
     Act_c* i_this = (Act_c*)i_ac;
     if (fopAcM_CheckStatus(i_pt, fopAcStts_FREEZE_e)) {
@@ -425,7 +408,6 @@ void daObjSwpush::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_ac, fopAc_ac_c* i_pt)
     }
 }
 
-/* 804839B4-80483A5C 000D54 00A8+00 1/1 0/0 0/0 .text jnodeCB__Q211daObjSwpush5Act_cFP8J3DJointi */
 int daObjSwpush::Act_c::jnodeCB(J3DJoint* i_joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = (J3DModel*)j3dSys.getModel();
@@ -440,7 +422,6 @@ int daObjSwpush::Act_c::jnodeCB(J3DJoint* i_joint, int param_2) {
     return 1;
 }
 
-/* 80483A5C-80483B70 000DFC 0114+00 1/1 0/0 0/0 .text calc_top_pos__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::calc_top_pos() {
     f32 fVar1 = attr().draw_resist;
     mSpeed -= (mCurHFrac - mTargetHFrac) * attr().draw_spring;
@@ -468,13 +449,11 @@ void daObjSwpush::Act_c::calc_top_pos() {
     }
 }
 
-/* 80483B70-80483B7C 000F10 000C+00 3/3 0/0 0/0 .text top_bg_aim_req__Q211daObjSwpush5Act_cFfs */
 void daObjSwpush::Act_c::top_bg_aim_req(f32 param_1, s16 param_2) {
     field_0x5e4 = param_1;
     field_0x5e0 = param_2;
 }
 
-/* 80483B7C-80483D0C 000F1C 0190+00 1/1 0/0 0/0 .text set_push_flag__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::set_push_flag() {
     if (mVibTimer != 0) {
         mVibTimer--;
@@ -513,7 +492,6 @@ void daObjSwpush::Act_c::set_push_flag() {
     }
 }
 
-/* 80483D0C-80483D2C 0010AC 0020+00 2/2 0/0 0/0 .text mode_upper_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_upper_init() {
     mMode = MODE_UPPER;
     mTargetHFrac = 1.0f;
@@ -521,7 +499,6 @@ void daObjSwpush::Act_c::mode_upper_init() {
     mDebounceTimer = 0;
 }
 
-/* 80483D2C-80483FA8 0010CC 027C+00 1/0 0/0 0/0 .text            mode_upper__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_upper() {
     bool bVar1 = false;
     bool bVar2 = false;
@@ -584,7 +561,6 @@ void daObjSwpush::Act_c::mode_upper() {
     }
 }
 
-/* 80483FA8-80484008 001348 0060+00 1/1 0/0 0/0 .text mode_u_l_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_u_l_init() {
     mMode = MODE_U_L;
     mTargetHFrac = 0.0f;
@@ -592,7 +568,6 @@ void daObjSwpush::Act_c::mode_u_l_init() {
     top_bg_aim_req(0.0f, attr().bg_time_lag);
 }
 
-/* 80484008-804841D4 0013A8 01CC+00 1/0 0/0 0/0 .text            mode_u_l__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_u_l() {
     if (mCurHFrac <= 0.0f) {
         if (mChangingState) {
@@ -617,14 +592,12 @@ void daObjSwpush::Act_c::mode_u_l() {
     }
 }
 
-/* 804841D4-804841F4 001574 0020+00 2/2 0/0 0/0 .text mode_lower_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_lower_init() {
     mMode = MODE_LOWER;
     mTargetHFrac = 0.0f;
     mChangingState = false;
 }
 
-/* 804841F4-80484388 001594 0194+00 1/0 0/0 0/0 .text            mode_lower__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_lower() {
     bool pressing = false;
 
@@ -664,14 +637,12 @@ void daObjSwpush::Act_c::mode_lower() {
     }
 }
 
-/* 80484388-804843C0 001728 0038+00 1/1 0/0 0/0 .text mode_l_u_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_l_u_init() {
     mMode = MODE_L_U;
     mTargetHFrac = 1.0f;
     top_bg_aim_req(1.0f, 1);
 }
 
-/* 804843C0-80484570 001760 01B0+00 1/0 0/0 0/0 .text            mode_l_u__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::mode_l_u() {
     if (mCurHFrac >= 1.0f) {
         if (mChangingState) {
@@ -692,17 +663,14 @@ void daObjSwpush::Act_c::mode_l_u() {
     }
 }
 
-/* 80484570-8048457C 001910 000C+00 4/4 0/0 0/0 .text demo_non_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_non_init() {
     mDemoMode = DEMO_MODE_NON;
 }
 
-/* 8048457C-80484580 00191C 0004+00 1/0 0/0 0/0 .text            demo_non__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_non() {
     /* empty function */
 }
 
-/* 80484580-804845D8 001920 0058+00 1/1 0/0 0/0 .text demo_reqPause_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_reqPause_init() {
     if (mDemoMode == DEMO_MODE_NON) {
         mDemoMode = DEMO_MODE_REQ_PAUSE;
@@ -711,7 +679,6 @@ void daObjSwpush::Act_c::demo_reqPause_init() {
     }
 }
 
-/* 804845D8-8048460C 001978 0034+00 2/1 0/0 0/0 .text demo_reqPause__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_reqPause() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         demo_runPause_init();
@@ -720,14 +687,12 @@ void daObjSwpush::Act_c::demo_reqPause() {
     }
 }
 
-/* 8048460C-8048464C 0019AC 0040+00 1/1 0/0 0/0 .text demo_runPause_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_runPause_init() {
     daPy_getPlayerActorClass()->onWolfEyeKeep();
     mDemoMode = DEMO_MODE_RUN_PAUSE;
     mPauseTimer = attr().demo_run_time;
 }
 
-/* 8048464C-804846B4 0019EC 0068+00 1/0 0/0 0/0 .text demo_runPause__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_runPause() {
     daPy_getPlayerActorClass()->onWolfEyeKeep();
     mPauseTimer--;
@@ -738,7 +703,6 @@ void daObjSwpush::Act_c::demo_runPause() {
     }
 }
 
-/* 804846B4-80484708 001A54 0054+00 1/1 0/0 0/0 .text demo_stop_puase__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_stop_puase() {
     if (mDemoMode == DEMO_MODE_REQ_PAUSE) {
         demo_reqPause();
@@ -749,7 +713,6 @@ void daObjSwpush::Act_c::demo_stop_puase() {
     }
 }
 
-/* 80484708-804847B4 001AA8 00AC+00 2/2 0/0 0/0 .text demo_reqSw_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_reqSw_init() {
     if (dComIfGp_evmng_existence(mEventID) && (mDemoMode == DEMO_MODE_NON || mDemoMode == DEMO_MODE_REQ_PAUSE || mDemoMode == DEMO_MODE_RUN_PAUSE)) {
         demo_stop_puase();
@@ -759,7 +722,6 @@ void daObjSwpush::Act_c::demo_reqSw_init() {
     }
 }
 
-/* 804847B4-80484828 001B54 0074+00 1/0 0/0 0/0 .text            demo_reqSw__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_reqSw() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         demo_runSw_init();
@@ -769,12 +731,10 @@ void daObjSwpush::Act_c::demo_reqSw() {
     }
 }
 
-/* 80484828-80484834 001BC8 000C+00 1/1 0/0 0/0 .text demo_runSw_init__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_runSw_init() {
     mDemoMode = DEMO_MODE_RUN_SW;
 }
 
-/* 80484834-80484890 001BD4 005C+00 1/0 0/0 0/0 .text            demo_runSw__Q211daObjSwpush5Act_cFv */
 void daObjSwpush::Act_c::demo_runSw() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         dComIfGp_event_reset();
@@ -782,7 +742,6 @@ void daObjSwpush::Act_c::demo_runSw() {
     }
 }
 
-/* 80484890-804848D8 001C30 0048+00 1/1 0/0 0/0 .text check_ride_couple__Q211daObjSwpush5Act_cFs */
 bool daObjSwpush::Act_c::check_ride_couple(s16 param_1) {
     if (param_1 == PROC_ALINK) {
         field_0x5f2 |= 1;
@@ -793,7 +752,6 @@ bool daObjSwpush::Act_c::check_ride_couple(s16 param_1) {
     return field_0x5f2 == 3;
 }
 
-/* 804848D8-80484908 001C78 0030+00 1/1 0/0 0/0 .text nr_ride_people__Q211daObjSwpush5Act_cFc */
 int daObjSwpush::Act_c::nr_ride_people(char param_1) {
     int rv = 0;
     for (int i = 0; i < 8; i++) {
@@ -805,7 +763,6 @@ int daObjSwpush::Act_c::nr_ride_people(char param_1) {
     return rv;
 }
 
-/* 80484908-80484BB8 001CA8 02B0+00 2/2 0/0 0/0 .text Mthd_Execute__Q211daObjSwpush5Act_cFv */
 int daObjSwpush::Act_c::Mthd_Execute() {
     typedef void (daObjSwpush::Act_c::*procFunc)();
 
@@ -864,7 +821,6 @@ int daObjSwpush::Act_c::Mthd_Execute() {
     return 1;
 }
 
-/* 80484BB8-80484C5C 001F58 00A4+00 1/1 0/0 0/0 .text            Mthd_Draw__Q211daObjSwpush5Act_cFv */
 int daObjSwpush::Act_c::Mthd_Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -909,7 +865,6 @@ namespace {
 
 AUDIO_INSTANCES;
 
-/* 80484FA8-80484FD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Swpush */
 extern actor_process_profile_definition g_profile_Obj_Swpush = {
   fpcLy_CURRENT_e,        // mLayerID
   2,                      // mListID
diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp
index 01a077a135..23c16ed0ae 100644
--- a/src/d/actor/d_a_obj_swpush2.cpp
+++ b/src/d/actor/d_a_obj_swpush2.cpp
@@ -12,53 +12,42 @@
 daObjSwpush2::Hio_c daObjSwpush2::Act_c::M_hio;
 #endif
 
-/* 80CFE098-80CFE0A4 000078 000C+00 1/1 0/0 0/0 .text getArcName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getArcName() {
     return "K_swmn00";
 }
 
-/* 80CFE0A4-80CFE0B4 000084 0010+00 1/1 0/0 0/0 .text getBmdName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getBmdName() {
     return "K_hum_isw00.bmd";
 }
 
-/* 80CFE0B4-80CFE0C4 000094 0010+00 1/1 0/0 0/0 .text getDzbName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getDzbName() {
     return "K_hum_isw00.dzb";
 }
 
-/* 80CFE0C4-80CFE0D4 0000A4 0010+00 1/1 0/0 0/0 .text getNmlBtkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getNmlBtkName() {
     return "K_isw_nml.btk";
 }
 
-/* 80CFE0D4-80CFE0E4 0000B4 0010+00 1/1 0/0 0/0 .text getNmlBrkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getNmlBrkName() {
     return "K_isw_nml.brk";
 }
 
-/* 80CFE0E4-80CFE0F4 0000C4 0010+00 1/1 0/0 0/0 .text getOnBtkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getOnBtkName() {
     return "K_isw_on.btk";
 }
 
-/* 80CFE0F4-80CFE104 0000D4 0010+00 1/1 0/0 0/0 .text getRunBpkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getRunBpkName() {
     return "K_isw_run.bpk";
 }
 
-/* 80CFE104-80CFE114 0000E4 0010+00 1/1 0/0 0/0 .text getRunBrkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getRunBrkName() {
     return "K_isw_run.brk";
 }
 
-/* 80CFE114-80CFE124 0000F4 0010+00 1/1 0/0 0/0 .text getRunBtkName__Q212daObjSwpush25Act_cFv */
 const char* daObjSwpush2::Act_c::getRunBtkName() {
     return "K_isw_run.btk";
 }
 
-/* 80CFE124-80CFE154 000104 0030+00 1/1 0/0 0/0 .text            prmZ_init__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::prmZ_init() {
     if (!mPrmInit) {
         mPrmZ = home.angle.z;
@@ -69,7 +58,6 @@ void daObjSwpush2::Act_c::prmZ_init() {
     }
 }
 
-/* 80CFE154-80CFE1AC 000134 0058+00 1/1 0/0 0/0 .text is_switch2__Q212daObjSwpush25Act_cCFv */
 bool daObjSwpush2::Act_c::is_switch2() const {
     int swbit = prmZ_get_swSave2();
     if (swbit == 0xFF) {
@@ -79,17 +67,12 @@ bool daObjSwpush2::Act_c::is_switch2() const {
     return fopAcM_isSwitch(this, swbit);
 }
 
-/* 80CFE1AC-80CFE1D0 00018C 0024+00 1/1 0/0 0/0 .text
- * solidHeapCB__Q212daObjSwpush25Act_cFP10fopAc_ac_c            */
 int daObjSwpush2::Act_c::solidHeapCB(fopAc_ac_c* i_this) {
     return ((daObjSwpush2::Act_c*)i_this)->create_heap();
 }
 
-/* 80CFFBF4-80CFFC00 000000 0009+03 5/4 0/0 0/0 .rodata          M_arcname__Q212daObjSwpush25Act_c
- */
 const char daObjSwpush2::Act_c::M_arcname[9] = "K_swmn00";
 
-/* 80CFFC00-80CFFCE0 -00001 00E0+00 7/10 0/0 0/0 .rodata          M_attr__Q212daObjSwpush25Act_c */
 const daObjSwpush2::Attr_c daObjSwpush2::Act_c::M_attr[4] = {
     {
         0x2000,
@@ -165,7 +148,6 @@ const daObjSwpush2::Attr_c daObjSwpush2::Act_c::M_attr[4] = {
     },
 };
 
-/* 80CFE1D0-80CFE690 0001B0 04C0+00 1/1 0/0 0/0 .text create_heap__Q212daObjSwpush25Act_cFv */
 bool daObjSwpush2::Act_c::create_heap() {
     void* model_data = dComIfG_getObjectRes(getArcName(), getBmdName());
     JUT_ASSERT(436, model_data != NULL);
@@ -250,7 +232,6 @@ bool daObjSwpush2::Act_c::create_heap() {
     return 1;
 }
 
-/* 80CFE6D8-80CFE8CC 0006B8 01F4+00 1/1 0/0 0/0 .text create_init__Q212daObjSwpush25Act_cFv */
 bool daObjSwpush2::Act_c::create_init() {
     bool rt = true;
 
@@ -296,7 +277,6 @@ bool daObjSwpush2::Act_c::create_init() {
     return rt;
 }
 
-/* 80CFE8CC-80CFE928 0008AC 005C+00 1/1 0/0 0/0 .text create_res_load__Q212daObjSwpush25Act_cFv */
 int daObjSwpush2::Act_c::create_res_load() {
     int phase_state;
     if (attr().arcname != NULL) {
@@ -312,7 +292,6 @@ int daObjSwpush2::Act_c::create_res_load() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80CFE928-80CFEA3C 000908 0114+00 1/1 0/0 0/0 .text Mthd_Create__Q212daObjSwpush25Act_cFv */
 int daObjSwpush2::Act_c::Mthd_Create() {
     fopAcM_ct(this, daObjSwpush2::Act_c);
     
@@ -342,7 +321,6 @@ int daObjSwpush2::Act_c::Mthd_Create() {
     return phase_state;
 }
 
-/* 80CFEA3C-80CFEAB4 000A1C 0078+00 1/1 0/0 0/0 .text Mthd_Delete__Q212daObjSwpush25Act_cFv */
 int daObjSwpush2::Act_c::Mthd_Delete() {
     if (mpBgw != NULL && mpBgw->ChkUsed()) {
         if (dComIfG_Bgsp().Release(mpBgw)) {
@@ -358,8 +336,6 @@ int daObjSwpush2::Act_c::Mthd_Delete() {
     return 1;
 }
 
-/* 80CFEAB4-80CFEB3C 000A94 0088+00 2/2 0/0 0/0 .text            set_mtx__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::set_mtx() {
     mDoMtx_stack_c::transS(current.pos.x, mTopPos + (-10.0f + current.pos.y), current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -369,15 +345,11 @@ void daObjSwpush2::Act_c::set_mtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80CFEB3C-80CFEB78 000B1C 003C+00 1/1 0/0 0/0 .text            init_mtx__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::init_mtx() {
     mpModel->setBaseScale(scale);
     set_mtx();
 }
 
-/* 80CFEB78-80CFEBE4 000B58 006C+00 1/1 0/0 0/0 .text
- * rideCB__Q212daObjSwpush25Act_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) {
     (void)i_bgw;
     daObjSwpush2::Act_c* a_this = (daObjSwpush2::Act_c*)i_this;
@@ -400,13 +372,11 @@ void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_
     }
 }
 
-/* 80CFEBE4-80CFEC4C 000BC4 0068+00 1/1 0/0 0/0 .text calc_top_pos__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::calc_top_pos() {
     cLib_addCalc(&field_0x5e8, field_0x5ec, 0.05f, 0.02f, 0.01f);
     mTopPos = -50.0f * (1.0f - field_0x5e8);
 }
 
-/* 80CFEC4C-80CFEDDC 000C2C 0190+00 1/1 0/0 0/0 .text set_push_flag__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::set_push_flag() {
     if (mShockTimer != 0) {
         mShockTimer--;
@@ -447,7 +417,6 @@ void daObjSwpush2::Act_c::set_push_flag() {
     }
 }
 
-/* 80CFEDDC-80CFEDFC 000DBC 0020+00 2/2 0/0 0/0 .text mode_upper_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::mode_upper_init() {
     mModeProc = 0;
     field_0x5df = 0;
@@ -455,7 +424,6 @@ void daObjSwpush2::Act_c::mode_upper_init() {
     field_0x5ec = 1.0f;
 }
 
-/* 80CFEDFC-80CFEF84 000DDC 0188+00 1/0 0/0 0/0 .text mode_upper__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::mode_upper() {
     bool do_pause_demo = false;
     bool do_sw_demo = false;
@@ -496,14 +464,11 @@ void daObjSwpush2::Act_c::mode_upper() {
     }
 }
 
-/* 80CFEF84-80CFEF98 000F64 0014+00 1/1 0/0 0/0 .text mode_u_l_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::mode_u_l_init() {
     mModeProc = 1;
     field_0x5f0 = 12;
 }
 
-/* 80CFEF98-80CFF168 000F78 01D0+00 1/0 0/0 0/0 .text            mode_u_l__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::mode_u_l() {
     if (field_0x5f0 != 0) {
         field_0x5f0--;
@@ -535,18 +500,14 @@ void daObjSwpush2::Act_c::mode_u_l() {
     }
 }
 
-/* 80CFF168-80CFF188 001148 0020+00 2/2 0/0 0/0 .text mode_lower_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::mode_lower_init() {
     mModeProc = 2;
     field_0x5df = 0;
     field_0x5ec = -1.0f;
 }
 
-/* 80CFF188-80CFF18C 001168 0004+00 1/0 0/0 0/0 .text mode_lower__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::mode_lower() {}
 
-/* 80CFF18C-80CFF24C 00116C 00C0+00 1/0 0/0 0/0 .text            mode_l_u__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::mode_l_u() {
     if (field_0x5e8 >= 1.0f) {
         if (field_0x5df != 0) {
@@ -560,17 +521,12 @@ void daObjSwpush2::Act_c::mode_l_u() {
     }
 }
 
-/* 80CFF24C-80CFF258 00122C 000C+00 4/4 0/0 0/0 .text demo_non_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_non_init() {
     mDemoProc = 0;
 }
 
-/* 80CFF258-80CFF25C 001238 0004+00 1/0 0/0 0/0 .text            demo_non__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::demo_non() {}
 
-/* 80CFF25C-80CFF2B4 00123C 0058+00 1/1 0/0 0/0 .text demo_reqPause_init__Q212daObjSwpush25Act_cFv
- */
 void daObjSwpush2::Act_c::demo_reqPause_init() {
     if (mDemoProc == 0) {
         mDemoProc = 1;
@@ -579,7 +535,6 @@ void daObjSwpush2::Act_c::demo_reqPause_init() {
     }
 }
 
-/* 80CFF2B4-80CFF2EC 001294 0038+00 2/1 0/0 0/0 .text demo_reqPause__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_reqPause() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         demo_runPause_init(TRUE);
@@ -588,8 +543,6 @@ void daObjSwpush2::Act_c::demo_reqPause() {
     }
 }
 
-/* 80CFF2EC-80CFF31C 0012CC 0030+00 2/2 0/0 0/0 .text demo_runPause_init__Q212daObjSwpush25Act_cFi
- */
 void daObjSwpush2::Act_c::demo_runPause_init(BOOL i_setRunTime) {
     mDemoProc = 2;
     if (i_setRunTime) {
@@ -597,7 +550,6 @@ void daObjSwpush2::Act_c::demo_runPause_init(BOOL i_setRunTime) {
     }
 }
 
-/* 80CFF31C-80CFF374 0012FC 0058+00 1/0 0/0 0/0 .text demo_runPause__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_runPause() {
     mDemoRunTime--;
     if (mDemoRunTime <= 0) {
@@ -606,7 +558,6 @@ void daObjSwpush2::Act_c::demo_runPause() {
     }
 }
 
-/* 80CFF374-80CFF3C8 001354 0054+00 1/1 0/0 0/0 .text demo_stop_puase__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_stop_puase() {
     if (mDemoProc == 1) {
         demo_reqPause();
@@ -617,7 +568,6 @@ void daObjSwpush2::Act_c::demo_stop_puase() {
     }
 }
 
-/* 80CFF3C8-80CFF48C 0013A8 00C4+00 1/1 0/0 0/0 .text demo_reqSw_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_reqSw_init() {
     if (dComIfGp_evmng_existence(mEventIdx)) {
         if (mDemoProc == 0 || mDemoProc == 1 || mDemoProc == 2) {
@@ -632,7 +582,6 @@ void daObjSwpush2::Act_c::demo_reqSw_init() {
     }
 }
 
-/* 80CFF48C-80CFF500 00146C 0074+00 1/0 0/0 0/0 .text demo_reqSw__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_reqSw() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         demo_runSw_init();
@@ -642,12 +591,10 @@ void daObjSwpush2::Act_c::demo_reqSw() {
     }
 }
 
-/* 80CFF500-80CFF50C 0014E0 000C+00 1/1 0/0 0/0 .text demo_runSw_init__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_runSw_init() {
     mDemoProc = 4;
 }
 
-/* 80CFF50C-80CFF568 0014EC 005C+00 1/0 0/0 0/0 .text demo_runSw__Q212daObjSwpush25Act_cFv */
 void daObjSwpush2::Act_c::demo_runSw() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         dComIfGp_event_reset();
@@ -655,7 +602,6 @@ void daObjSwpush2::Act_c::demo_runSw() {
     }
 }
 
-/* 80CFF568-80CFF8FC 001548 0394+00 1/1 0/0 0/0 .text Mthd_Execute__Q212daObjSwpush25Act_cFv */
 int daObjSwpush2::Act_c::Mthd_Execute() {
     static void (daObjSwpush2::Act_c::*demo_proc[])() = {
         &daObjSwpush2::Act_c::demo_non,
@@ -707,8 +653,6 @@ int daObjSwpush2::Act_c::Mthd_Execute() {
     return 1;
 }
 
-/* 80CFF8FC-80CFFB50 0018DC 0254+00 1/1 0/0 0/0 .text            Mthd_Draw__Q212daObjSwpush25Act_cFv
- */
 int daObjSwpush2::Act_c::Mthd_Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -744,32 +688,22 @@ int daObjSwpush2::Act_c::Mthd_Draw() {
 
 namespace daObjSwpush2 {
 namespace {
-/* 80CFFB50-80CFFB70 001B30 0020+00 1/0 0/0 0/0 .text
- * Mthd_Create__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@FPv */
 int Mthd_Create(void* i_this) {
     return ((Act_c*)i_this)->Mthd_Create();
 }
 
-/* 80CFFB70-80CFFB90 001B50 0020+00 1/0 0/0 0/0 .text
- * Mthd_Delete__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@FPv */
 int Mthd_Delete(void* i_this) {
     return ((Act_c*)i_this)->Mthd_Delete();
 }
 
-/* 80CFFB90-80CFFBB0 001B70 0020+00 1/0 0/0 0/0 .text
- * Mthd_Execute__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@FPv */
 int Mthd_Execute(void* i_this) {
     return ((Act_c*)i_this)->Mthd_Execute();
 }
 
-/* 80CFFBB0-80CFFBD0 001B90 0020+00 1/0 0/0 0/0 .text
- * Mthd_Draw__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@FPv */
 int Mthd_Draw(void* i_this) {
     return ((Act_c*)i_this)->Mthd_Draw();
 }
 
-/* 80CFFE98-80CFFEB8 -00001 0020+00 1/0 0/0 0/0 .data
- * Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@  */
 actor_method_class Mthd_Table = {
     (process_method_func)Mthd_Create, 
     (process_method_func)Mthd_Delete, 
@@ -780,7 +714,6 @@ actor_method_class Mthd_Table = {
 }
 }
 
-/* 80CFFEB8-80CFFEE8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Swpush2 */
 extern actor_process_profile_definition g_profile_Obj_Swpush2 = {
   fpcLy_CURRENT_e,        // mLayerID
   2,                      // mListID
diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp
index eafd0c3554..38e8b0f4e8 100644
--- a/src/d/actor/d_a_obj_swpush5.cpp
+++ b/src/d/actor/d_a_obj_swpush5.cpp
@@ -10,11 +10,8 @@
 #include "d/d_s_play.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 8059C6A4-8059C6AC 000000 0008+00 7/7 0/0 0/0 .rodata          l_dzbIdx */
 static const int l_dzbIdx[] = {7, 8};
 
-/* 8059B4EC-8059B754 0000EC 0268+00 1/1 0/0 0/0 .text
- * rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     daObjSw5_c* i_this = (daObjSw5_c*)i_bgActor;
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -50,7 +47,6 @@ static void rideCallBack(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideA
     }
 }
 
-/* 8059B754-8059B804 000354 00B0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == 0) {
         int jnt_no = i_joint->getJntNo();
@@ -70,7 +66,6 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 8059B804-8059B88C 000404 0088+00 1/1 0/0 0/0 .text            initBaseMtx__10daObjSw5_cFv */
 void daObjSw5_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -80,7 +75,6 @@ void daObjSw5_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8059B88C-8059B920 00048C 0094+00 2/2 0/0 0/0 .text            setBaseMtx__10daObjSw5_cFv */
 void daObjSw5_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -91,7 +85,6 @@ void daObjSw5_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 8059B920-8059BA1C 000520 00FC+00 1/0 0/0 0/0 .text            Create__10daObjSw5_cFv */
 int daObjSw5_c::Create() {
     if (dComIfG_Bgsp().Regist(mpBgW2, this)) {
         return 0;
@@ -119,10 +112,8 @@ int daObjSw5_c::Create() {
     return 1;
 }
 
-/* 8059C6FC-8059C700 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "D_Hfsw00";
 
-/* 8059BA1C-8059BB1C 00061C 0100+00 1/0 0/0 0/0 .text            CreateHeap__10daObjSw5_cFv */
 int daObjSw5_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(308, modelData != NULL);
@@ -141,7 +132,6 @@ int daObjSw5_c::CreateHeap() {
     return 1;
 }
 
-/* 8059BB1C-8059BBD4 00071C 00B8+00 1/1 0/0 0/0 .text            create__10daObjSw5_cFv */
 int daObjSw5_c::create() {
     fopAcM_ct(this, daObjSw5_c);
 
@@ -156,7 +146,6 @@ int daObjSw5_c::create() {
     return phase_state;
 }
 
-/* 8059BBD4-8059BC70 0007D4 009C+00 1/0 0/0 0/0 .text            Execute__10daObjSw5_cFPPA3_A4_f */
 int daObjSw5_c::Execute(Mtx** param_0) {
     setting_ride_flag();
     mCounter++;
@@ -178,8 +167,6 @@ int daObjSw5_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 8059BC70-8059BD24 000870 00B4+00 1/1 0/0 0/0 .text            setting_ride_flag__10daObjSw5_cFv
- */
 void daObjSw5_c::setting_ride_flag() {
     if (mUnkRideTimer != 0) {
         mUnkRideTimer--;
@@ -209,7 +196,6 @@ void daObjSw5_c::setting_ride_flag() {
     }
 }
 
-/* 8059BD24-8059BD2C 000924 0008+00 1/1 0/0 0/0 .text            checkPushable__10daObjSw5_cFv */
 // getSwNo2 always returns 0xFF, so this function always returns true
 BOOL daObjSw5_c::checkPushable() {
     u8 swbit2 = getSwNo2();
@@ -224,7 +210,6 @@ BOOL daObjSw5_c::checkPushable() {
     return false;
 }
 
-/* 8059BD2C-8059BE18 00092C 00EC+00 1/1 0/0 0/0 .text            event_proc_call__10daObjSw5_cFv */
 void daObjSw5_c::event_proc_call() {
     static void (daObjSw5_c::*l_func[])() = {
         &daObjSw5_c::actionPauseNone,
@@ -238,16 +223,12 @@ void daObjSw5_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 8059BE18-8059BE24 000A18 000C+00 2/2 0/0 0/0 .text            actionPauseNoneInit__10daObjSw5_cFv
- */
 void daObjSw5_c::actionPauseNoneInit() {
     mAction = 0;
 }
 
-/* 8059BE24-8059BE28 000A24 0004+00 1/0 0/0 0/0 .text            actionPauseNone__10daObjSw5_cFv */
 void daObjSw5_c::actionPauseNone() {}
 
-/* 8059BE28-8059BE80 000A28 0058+00 1/1 0/0 0/0 .text actionPauseOrderInit__10daObjSw5_cFv */
 void daObjSw5_c::actionPauseOrderInit() {
     if (mAction != 1) {
         mAction = 1;
@@ -256,7 +237,6 @@ void daObjSw5_c::actionPauseOrderInit() {
     }
 }
 
-/* 8059BE80-8059BEB4 000A80 0034+00 1/0 0/0 0/0 .text            actionPauseOrder__10daObjSw5_cFv */
 void daObjSw5_c::actionPauseOrder() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         actionPauseInit();
@@ -265,14 +245,12 @@ void daObjSw5_c::actionPauseOrder() {
     }
 }
 
-/* 8059BEB4-8059BEE0 000AB4 002C+00 1/1 0/0 0/0 .text            actionPauseInit__10daObjSw5_cFv */
 void daObjSw5_c::actionPauseInit() {
     daPy_getPlayerActorClass()->onWolfEyeKeep();
     mPauseTimer = 10;
     mAction = 2;
 }
 
-/* 8059BEE0-8059BF48 000AE0 0068+00 1/0 0/0 0/0 .text            actionPause__10daObjSw5_cFv */
 void daObjSw5_c::actionPause() {
     daPy_getPlayerActorClass()->onWolfEyeKeep();
 
@@ -283,16 +261,12 @@ void daObjSw5_c::actionPause() {
     }
 }
 
-/* 8059BF48-8059BF4C 000B48 0004+00 1/0 0/0 0/0 .text            actionWait__10daObjSw5_cFv */
 void daObjSw5_c::actionWait() {}
 
-/* 8059BF4C-8059BF50 000B4C 0004+00 1/0 0/0 0/0 .text            actionOrder__10daObjSw5_cFv */
 void daObjSw5_c::actionOrder() {}
 
-/* 8059BF50-8059BF54 000B50 0004+00 1/0 0/0 0/0 .text            actionEvent__10daObjSw5_cFv */
 void daObjSw5_c::actionEvent() {}
 
-/* 8059BF54-8059BFE4 000B54 0090+00 1/1 0/0 0/0 .text            calc_top_pos__10daObjSw5_cFv */
 void daObjSw5_c::calc_top_pos() {
     speed.y -= (field_0x5f8 - field_0x5fc) * (0.9f + KREG_F(1));
     speed.y -= speed.y * (0.5f + KREG_F(0));
@@ -302,7 +276,6 @@ void daObjSw5_c::calc_top_pos() {
     mTopPos = cLib_minMaxLimit<f32>(mTopPos, -25.0f, 0.0f);
 }
 
-/* 8059BFE4-8059C0A0 000BE4 00BC+00 1/1 0/0 0/0 .text            mode_proc_call__10daObjSw5_cFv */
 void daObjSw5_c::mode_proc_call() {
     static void (daObjSw5_c::*l_mode_func[])() = {
         &daObjSw5_c::modeWaitLower,
@@ -314,8 +287,6 @@ void daObjSw5_c::mode_proc_call() {
     (this->*l_mode_func[mMode])();
 }
 
-/* 8059C0A0-8059C0C8 000CA0 0028+00 1/1 0/0 0/0 .text            modeWaitLowerInit__10daObjSw5_cFv
- */
 void daObjSw5_c::modeWaitLowerInit() {
     speed.y = 0.0f;
     field_0x5f8 = 1.0f;
@@ -323,7 +294,6 @@ void daObjSw5_c::modeWaitLowerInit() {
     mMode = 0;
 }
 
-/* 8059C0C8-8059C23C 000CC8 0174+00 1/0 0/0 0/0 .text            modeWaitLower__10daObjSw5_cFv */
 void daObjSw5_c::modeWaitLower() {
     bool var_r30 = false;
     bool do_pause = false;
@@ -359,14 +329,12 @@ void daObjSw5_c::modeWaitLower() {
     }
 }
 
-/* 8059C23C-8059C2D0 000E3C 0094+00 1/1 0/0 0/0 .text            modeLowerInit__10daObjSw5_cFv */
 void daObjSw5_c::modeLowerInit() {
     fopAcM_seStart(this, Z2SE_OBJ_HEAVY_FUMISW_ON, 0);
     field_0x5fc = 0.0f;
     mMode = 1;
 }
 
-/* 8059C2D0-8059C364 000ED0 0094+00 1/0 0/0 0/0 .text            modeLower__10daObjSw5_cFv */
 void daObjSw5_c::modeLower() {
     daPy_getPlayerActorClass();
     if (-25.0f == mTopPos) {
@@ -378,27 +346,22 @@ void daObjSw5_c::modeLower() {
     }
 }
 
-/* 8059C364-8059C370 000F64 000C+00 2/2 0/0 0/0 .text            modeWaitUpperInit__10daObjSw5_cFv
- */
 void daObjSw5_c::modeWaitUpperInit() {
     mMode = 2;
 }
 
-/* 8059C370-8059C3C4 000F70 0054+00 1/0 0/0 0/0 .text            modeWaitUpper__10daObjSw5_cFv */
 void daObjSw5_c::modeWaitUpper() {
     if (!fopAcM_isSwitch(this, getSwNo())) {
         modeUpperInit();
     }
 }
 
-/* 8059C3C4-8059C454 000FC4 0090+00 1/1 0/0 0/0 .text            modeUpperInit__10daObjSw5_cFv */
 void daObjSw5_c::modeUpperInit() {
     fopAcM_seStart(this, Z2SE_OBJ_HEAVY_FUMISW_OFF, 0);
     field_0x5fc = 1.0f;
     mMode = 3;
 }
 
-/* 8059C454-8059C4BC 001054 0068+00 1/0 0/0 0/0 .text            modeUpper__10daObjSw5_cFv */
 void daObjSw5_c::modeUpper() {
     if (mTopPos == 0.0f) {
         modeWaitLowerInit();
@@ -411,7 +374,6 @@ void daObjSw5_c::modeUpper() {
     }
 }
 
-/* 8059C4BC-8059C560 0010BC 00A4+00 1/0 0/0 0/0 .text            Draw__10daObjSw5_cFv */
 int daObjSw5_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -422,7 +384,6 @@ int daObjSw5_c::Draw() {
     return 1;
 }
 
-/* 8059C560-8059C5CC 001160 006C+00 1/0 0/0 0/0 .text            Delete__10daObjSw5_cFv */
 int daObjSw5_c::Delete() {
     if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW2);
@@ -432,27 +393,22 @@ int daObjSw5_c::Delete() {
     return 1;
 }
 
-/* 8059C5CC-8059C5F8 0011CC 002C+00 1/0 0/0 0/0 .text            daObjSw5_Draw__FP10daObjSw5_c */
 static int daObjSw5_Draw(daObjSw5_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 8059C5F8-8059C618 0011F8 0020+00 1/0 0/0 0/0 .text            daObjSw5_Execute__FP10daObjSw5_c */
 static int daObjSw5_Execute(daObjSw5_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 8059C618-8059C638 001218 0020+00 1/0 0/0 0/0 .text            daObjSw5_Delete__FP10daObjSw5_c */
 static int daObjSw5_Delete(daObjSw5_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 8059C638-8059C658 001238 0020+00 1/0 0/0 0/0 .text            daObjSw5_Create__FP10fopAc_ac_c */
 static int daObjSw5_Create(fopAc_ac_c* i_this) {
     return ((daObjSw5_c*)i_this)->create();
 }
 
-/* 8059C7F0-8059C810 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjSw5_Method */
 static actor_method_class l_daObjSw5_Method = {
     (process_method_func)daObjSw5_Create,
     (process_method_func)daObjSw5_Delete,
@@ -461,7 +417,6 @@ static actor_method_class l_daObjSw5_Method = {
     (process_method_func)daObjSw5_Draw,
 };
 
-/* 8059C810-8059C840 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Swpush5 */
 extern actor_process_profile_definition g_profile_Obj_Swpush5 = {
   fpcLy_CURRENT_e,        // mLayerID
   2,                      // mListID
diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp
index 73f63b135a..ef05a2e449 100644
--- a/src/d/actor/d_a_obj_swspinner.cpp
+++ b/src/d/actor/d_a_obj_swspinner.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_swspinner.h"
 #include "d/d_procname.h"
 
-/* 80CFFF78-80D00174 000078 01FC+00 1/1 0/0 0/0 .text            search_spinner_sub__FPvPv */
 static void* search_spinner_sub(void* i_actor, void* i_data) {
     daSpinner_c* spinner = (daSpinner_c*)i_actor;
     daObjSwSpinner_c* sw = (daObjSwSpinner_c*)i_data;
@@ -31,15 +30,12 @@ static void* search_spinner_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80D00174-80D001CC 000274 0058+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjSwSpinner_cFv
- */
 void daObjSwSpinner_c::initBaseMtx() {
     mpModelA->setBaseScale(scale);
     mpModelB->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D001CC-80D00284 0002CC 00B8+00 2/2 0/0 0/0 .text            setBaseMtx__16daObjSwSpinner_cFv */
 void daObjSwSpinner_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -54,7 +50,6 @@ void daObjSwSpinner_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D00284-80D0035C 000384 00D8+00 1/0 0/0 0/0 .text            Create__16daObjSwSpinner_cFv */
 int daObjSwSpinner_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit2())) {
         mPartBHeight = 50.0f;
@@ -75,10 +70,8 @@ int daObjSwSpinner_c::Create() {
     return 1;
 }
 
-/* 80D00AE0-80D00AE4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "P_Sswitch";
 
-/* 80D0035C-80D00498 00045C 013C+00 1/0 0/0 0/0 .text            CreateHeap__16daObjSwSpinner_cFv */
 int daObjSwSpinner_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(0xED, modelData != NULL);
@@ -103,7 +96,6 @@ int daObjSwSpinner_c::CreateHeap() {
     return 1;
 }
 
-/* 80D00498-80D00518 000598 0080+00 1/1 0/0 0/0 .text            create1st__16daObjSwSpinner_cFv */
 int daObjSwSpinner_c::create1st() {
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -116,7 +108,6 @@ int daObjSwSpinner_c::create1st() {
     return phase;
 }
 
-/* 80D00518-80D00890 000618 0378+00 1/0 0/0 0/0 .text Execute__16daObjSwSpinner_cFPPA3_A4_f */
 int daObjSwSpinner_c::Execute(Mtx** param_0) {
     daSpinner_c* spinner = NULL;
     mPrevAngle = shape_angle.y;
@@ -187,7 +178,6 @@ int daObjSwSpinner_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D00890-80D00954 000990 00C4+00 1/0 0/0 0/0 .text            Draw__16daObjSwSpinner_cFv */
 int daObjSwSpinner_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModelA, &tevStr);
@@ -200,7 +190,6 @@ int daObjSwSpinner_c::Draw() {
     return 1;
 }
 
-/* 80D00954-80D009C0 000A54 006C+00 1/0 0/0 0/0 .text            Delete__16daObjSwSpinner_cFv */
 int daObjSwSpinner_c::Delete() {
     if (mpBgW2 != NULL && mpBgW2->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW2);
@@ -210,32 +199,23 @@ int daObjSwSpinner_c::Delete() {
     return 1;
 }
 
-/* 80D009C0-80D00A20 000AC0 0060+00 1/0 0/0 0/0 .text
- * daObjSwSpinner_create1st__FP16daObjSwSpinner_c               */
 static int daObjSwSpinner_create1st(daObjSwSpinner_c* i_this) {
     fopAcM_ct(i_this, daObjSwSpinner_c);
     return i_this->create1st();
 }
 
-/* 80D00A20-80D00A40 000B20 0020+00 1/0 0/0 0/0 .text
- * daObjSwSpinner_MoveBGDelete__FP16daObjSwSpinner_c            */
 static int daObjSwSpinner_MoveBGDelete(daObjSwSpinner_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D00A40-80D00A60 000B40 0020+00 1/0 0/0 0/0 .text
- * daObjSwSpinner_MoveBGExecute__FP16daObjSwSpinner_c           */
 static int daObjSwSpinner_MoveBGExecute(daObjSwSpinner_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D00A60-80D00A8C 000B60 002C+00 1/0 0/0 0/0 .text
- * daObjSwSpinner_MoveBGDraw__FP16daObjSwSpinner_c              */
 static int daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D00AE4-80D00B04 -00001 0020+00 1/0 0/0 0/0 .data            daObjSwSpinner_METHODS */
 static actor_method_class daObjSwSpinner_METHODS = {
     (process_method_func)daObjSwSpinner_create1st,
     (process_method_func)daObjSwSpinner_MoveBGDelete,
@@ -244,7 +224,6 @@ static actor_method_class daObjSwSpinner_METHODS = {
     (process_method_func)daObjSwSpinner_MoveBGDraw,
 };
 
-/* 80D00B04-80D00B34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwSpinner */
 extern actor_process_profile_definition g_profile_Obj_SwSpinner = {
     fpcLy_CURRENT_e,           // mLayerID
     3,                         // mListID
diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp
index c798bf71ce..832b274748 100644
--- a/src/d/actor/d_a_obj_swturn.cpp
+++ b/src/d/actor/d_a_obj_swturn.cpp
@@ -13,36 +13,28 @@
 #include "d/d_bg_w.h"
 #include "cmath.h"
 
-/* 80D0206C-80D02074 000000 0008+00 5/5 0/0 0/0 .rodata          l_bmd */
 static u32 const l_bmd[2] = {
     4, 4,
 };
 
-/* 80D02074-80D0207C 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static u32 const l_dzb[2] = {
     7, 7,
 };
 
-/* 80D0207C-80D02084 000010 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static u32 const l_heap_size[2] = {
     0x4530, 0x2BE0,
 };
 
-/* 80D02084-80D02088 000018 0004+00 0/3 0/0 0/0 .rodata          l_rot_time */
 static s16 const l_rot_time[2] = {0x5A, 0x1E};
 
-/* 80D02088-80D0208C 00001C 0002+02 0/1 0/0 0/0 .rodata          l_tame_time_1st */
 static u8 const l_tame_time_1st[2] = {
     0x2F, 0x2F,
 };
 
-/* 80D0208C-80D02090 000020 0002+02 0/1 0/0 0/0 .rodata          l_tame_time_cnt */
 static u8 const l_tame_time_cnt[2] = {
     0x23, 0x23,
 };
 
-/* 80D00BD8-80D00CD8 000078 0100+00 1/1 0/0 0/0 .text
- * PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 static fopAc_ac_c* PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* param_2, s16 param_3,
                               dBgW_Base::PushPullLabel param_4) {
     int pushBits = cLib_checkBit((int)param_4, dBgW_Base::PPLABEL_PUSH | dBgW_Base::PPLABEL_PULL);
@@ -70,13 +62,11 @@ static fopAc_ac_c* PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* param_2, s16 param
     return i_this;
 }
 
-/* 80D00CD8-80D00D14 000178 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjSwTurn_cFv */
 void daObjSwTurn_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D00D14-80D00D78 0001B4 0064+00 3/3 0/0 0/0 .text            setBaseMtx__13daObjSwTurn_cFv */
 void daObjSwTurn_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -84,7 +74,6 @@ void daObjSwTurn_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D00D78-80D00EE4 000218 016C+00 1/0 0/0 0/0 .text            Create__13daObjSwTurn_cFv */
 int daObjSwTurn_c::Create() {
     if (mKind == KIND_0) {
         if (fopAcM_isSwitch(this, getSwNo())) {
@@ -124,13 +113,11 @@ int daObjSwTurn_c::Create() {
     return 1;
 }
 
-/* 80D020EC-80D020F4 -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "P_Lv4tsw",
     "P_Lv4tswD",
 };
 
-/* 80D00EE4-80D00F64 000384 0080+00 1/0 0/0 0/0 .text            CreateHeap__13daObjSwTurn_cFv */
 int daObjSwTurn_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mModelType], l_bmd[mModelType]);
     JUT_ASSERT(347, modelData != NULL);
@@ -138,7 +125,6 @@ int daObjSwTurn_c::CreateHeap() {
     return mModel != 0 ? TRUE : FALSE;
 }
 
-/* 80D00F64-80D01074 000404 0110+00 1/1 0/0 0/0 .text            create1st__13daObjSwTurn_cFv */
 int daObjSwTurn_c::create1st() {
     mKind = getKind();
     mModelType = getModelType();
@@ -167,8 +153,6 @@ int daObjSwTurn_c::create1st() {
     return rv;
 }
 
-/* 80D01074-80D010D4 000514 0060+00 1/0 0/0 0/0 .text            Execute__13daObjSwTurn_cFPPA3_A4_f
- */
 int daObjSwTurn_c::Execute(Mtx** ppMtx) {
     field_0x5c8++;
     mode_proc_call();
@@ -178,8 +162,6 @@ int daObjSwTurn_c::Execute(Mtx** ppMtx) {
     return 1;
 }
 
-/* 80D010D4-80D01160 000574 008C+00 1/1 0/0 0/0 .text            mode_proc_call__13daObjSwTurn_cFv
- */
 void daObjSwTurn_c::mode_proc_call() {
     static daObjSwTurn_c::modeFunc l_func[2] = {
         &daObjSwTurn_c::modeWait,
@@ -188,7 +170,6 @@ void daObjSwTurn_c::mode_proc_call() {
     (this->*(l_func[mMode]))();
 }
 
-/* 80D01160-80D01198 000600 0038+00 3/3 0/0 0/0 .text            init_modeWait__13daObjSwTurn_cFv */
 void daObjSwTurn_c::init_modeWait() {
     field_0x5ba = 0;
     field_0x5c0 = -1;
@@ -198,7 +179,6 @@ void daObjSwTurn_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80D01198-80D01770 000638 05D8+00 1/0 0/0 0/0 .text            modeWait__13daObjSwTurn_cFv */
 void daObjSwTurn_c::modeWait() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     bool bVar4 = true;
@@ -326,8 +306,6 @@ void daObjSwTurn_c::modeWait() {
     field_0x5dc = field_0x5ba;
 }
 
-/* 80D01770-80D018B4 000C10 0144+00 1/1 0/0 0/0 .text            init_modeRotate__13daObjSwTurn_cFv
- */
 void daObjSwTurn_c::init_modeRotate() {
     field_0x5bc = 0;
     field_0x5c6 = 0;
@@ -344,7 +322,6 @@ void daObjSwTurn_c::init_modeRotate() {
     mMode = MODE_ROTATE;
 }
 
-/* 80D018B4-80D01958 000D54 00A4+00 1/0 0/0 0/0 .text            modeRotate__13daObjSwTurn_cFv */
 void daObjSwTurn_c::modeRotate() {
     switch(mKind) {
     case KIND_0:
@@ -357,7 +334,6 @@ void daObjSwTurn_c::modeRotate() {
     }
 }
 
-/* 80D01958-80D01B60 000DF8 0208+00 1/1 0/0 0/0 .text            rotate_sub_0__13daObjSwTurn_cFv */
 void daObjSwTurn_c::rotate_sub_0() {
     field_0x5b8++;
     shape_angle.y = home.angle.y + (field_0x5c4 << 14);
@@ -384,7 +360,6 @@ void daObjSwTurn_c::rotate_sub_0() {
     }
 }
 
-/* 80D01B60-80D01EB0 001000 0350+00 1/1 0/0 0/0 .text            rotate_sub_1__13daObjSwTurn_cFv */
 void daObjSwTurn_c::rotate_sub_1() {
     daPy_getPlayerActorClass();
     field_0x5b8++;
@@ -421,7 +396,6 @@ void daObjSwTurn_c::rotate_sub_1() {
     }
 }
 
-/* 80D01EB0-80D01F58 001350 00A8+00 1/0 0/0 0/0 .text            Draw__13daObjSwTurn_cFv */
 int daObjSwTurn_c::Draw() {
     setBaseMtx();
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -432,36 +406,28 @@ int daObjSwTurn_c::Draw() {
     return 1;
 }
 
-/* 80D01F58-80D01F98 0013F8 0040+00 1/0 0/0 0/0 .text            Delete__13daObjSwTurn_cFv */
 int daObjSwTurn_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName[mModelType]);
     return 1;
 }
 
-/* 80D01F98-80D01FF8 001438 0060+00 1/0 0/0 0/0 .text daObjSwTurn_create1st__FP13daObjSwTurn_c */
 static int daObjSwTurn_create1st(daObjSwTurn_c* i_this) {
     fopAcM_ct(i_this, daObjSwTurn_c);
     return i_this->create1st();
 }
 
-/* 80D01FF8-80D02018 001498 0020+00 1/0 0/0 0/0 .text daObjSwTurn_MoveBGDelete__FP13daObjSwTurn_c
- */
 static int daObjSwTurn_MoveBGDelete(daObjSwTurn_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D02018-80D02038 0014B8 0020+00 1/0 0/0 0/0 .text daObjSwTurn_MoveBGExecute__FP13daObjSwTurn_c
- */
 static int daObjSwTurn_MoveBGExecute(daObjSwTurn_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D02038-80D02064 0014D8 002C+00 1/0 0/0 0/0 .text daObjSwTurn_MoveBGDraw__FP13daObjSwTurn_c */
 static int daObjSwTurn_MoveBGDraw(daObjSwTurn_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D02124-80D02144 -00001 0020+00 1/0 0/0 0/0 .data            daObjSwTurn_METHODS */
 static actor_method_class daObjSwTurn_METHODS = {
     (process_method_func)daObjSwTurn_create1st,
     (process_method_func)daObjSwTurn_MoveBGDelete,
@@ -470,7 +436,6 @@ static actor_method_class daObjSwTurn_METHODS = {
     (process_method_func)daObjSwTurn_MoveBGDraw,
 };
 
-/* 80D02144-80D02174 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SwTurn */
 extern actor_process_profile_definition g_profile_Obj_SwTurn = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp
index 7ed152373a..3214bcf364 100644
--- a/src/d/actor/d_a_obj_syRock.cpp
+++ b/src/d/actor/d_a_obj_syRock.cpp
@@ -14,8 +14,8 @@
 
 class daSyRock_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D022AC */ daSyRock_HIO_c();
-    /* 80D03C44 */ ~daSyRock_HIO_c() {}
+    daSyRock_HIO_c();
+    ~daSyRock_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -44,13 +44,10 @@ public:
 
 typedef void (daSyRock_c::*actionFunc)();
 
-/* 80D0426C-80D042A0 000014 0034+00 8/8 0/0 0/0 .bss             l_HIO */
 static daSyRock_HIO_c l_HIO;
 
-/* 80D0405C-80D040A0 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__10daSyRock_c */
 dCcD_SrcCyl daSyRock_c::mCcDCyl = {mCcDObjInfo};
 
-/* 80D022AC-80D02334 0000EC 0088+00 1/1 0/0 0/0 .text            __ct__14daSyRock_HIO_cFv */
 daSyRock_HIO_c::daSyRock_HIO_c() {
     mShakeAmplitude = 450.0f;
     mShakeXOscillationAngle = 90.0f;
@@ -67,7 +64,6 @@ daSyRock_HIO_c::daSyRock_HIO_c() {
     mMaxWaterPillarRange = 5.0f;
 }
 
-/* 80D0237C-80D02454 0001BC 00D8+00 2/2 0/0 0/0 .text            setBaseMtx__10daSyRock_cFv */
 void daSyRock_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(0, shape_angle.y, shape_angle.z);
@@ -81,7 +77,6 @@ void daSyRock_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D02454-80D02584 000294 0130+00 1/0 0/0 0/0 .text            CreateHeap__10daSyRock_cFv */
 int daSyRock_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("syourock", 4));
     JUT_ASSERT(271, modelData != NULL);
@@ -114,7 +109,6 @@ dCcD_SrcGObjInf const daSyRock_c::mCcDObjInfo = {
     {},  // mGObjCo
 };
 
-/* 80D02584-80D02930 0003C4 03AC+00 1/1 0/0 0/0 .text            create__10daSyRock_cFv */
 cPhs__Step daSyRock_c::create() {
     fopAcM_ct(this, daSyRock_c);
 
@@ -183,7 +177,6 @@ cPhs__Step daSyRock_c::create() {
     return requestedPhaseProcess;
 }
 
-/* 80D02AFC-80D02BE0 00093C 00E4+00 1/1 0/0 0/0 .text            setFallStat__10daSyRock_cFv */
 void daSyRock_c::setFallStat() {
     mpWaterPillar = static_cast<daWtPillar_c*>(fopAcIt_Judge(searchWaterPillar, this));
     if(mpWaterPillar) {
@@ -209,7 +202,6 @@ void daSyRock_c::setFallStat() {
     }
 }
 
-/* 80D02BE0-80D02C54 000A20 0074+00 1/0 0/0 0/0 .text            Execute__10daSyRock_cFPPA3_A4_f */
 int daSyRock_c::Execute(Mtx** i_mtx) {
     eventUpdate();
     move();
@@ -222,7 +214,6 @@ int daSyRock_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D02C54-80D02E70 000A94 021C+00 1/1 0/0 0/0 .text            move__10daSyRock_cFv */
 void daSyRock_c::move() {
     static actionFunc mode_proc[] = {
     &daSyRock_c::modeWait, &daSyRock_c::modeDropInit,
@@ -250,12 +241,10 @@ void daSyRock_c::move() {
     dComIfG_Ccsp()->Set(&mUnbrokenCylinderCollider);
 }
 
-/* 80D02E70-80D02E7C 000CB0 000C+00 1/1 0/0 0/0 .text            init_modeWait__10daSyRock_cFv */
 void daSyRock_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80D02E7C-80D02F88 000CBC 010C+00 1/0 0/0 0/0 .text            modeWait__10daSyRock_cFv */
 void daSyRock_c::modeWait() {
     if(mDropAutomaticallySwitchNo != 0xFF && dComIfGs_isSwitch(mDropAutomaticallySwitchNo, fopAcM_GetHomeRoomNo(this))) {
         field_0x779 = 0;
@@ -278,7 +267,6 @@ void daSyRock_c::modeWait() {
     }
 }
 
-/* 80D02F88-80D02FB8 000DC8 0030+00 2/1 0/0 0/0 .text            eventStart__10daSyRock_cFv */
 bool daSyRock_c::eventStart() {
     // field_0x779 is always 0 when eventStart() is called (see modeWait())
     if(!field_0x779)
@@ -287,8 +275,6 @@ bool daSyRock_c::eventStart() {
     return true;
 }
 
-/* 80D02FB8-80D03070 000DF8 00B8+00 1/1 0/0 0/0 .text            init_modeDropInit__10daSyRock_cFv
- */
 void daSyRock_c::init_modeDropInit() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_STALAC_BREAK, 0);
 
@@ -302,7 +288,6 @@ void daSyRock_c::init_modeDropInit() {
     mMode = MODE_DROP_INIT;
 }
 
-/* 80D03070-80D030A8 000EB0 0038+00 1/0 0/0 0/0 .text            modeDropInit__10daSyRock_cFv */
 void daSyRock_c::modeDropInit() {
     if(mWaitFrames)
         mWaitFrames--;
@@ -310,7 +295,6 @@ void daSyRock_c::modeDropInit() {
         init_modeDrop();
 }
 
-/* 80D030A8-80D03250 000EE8 01A8+00 3/3 0/0 0/0 .text searchWaterPillar__10daSyRock_cFPvPv */
 void* daSyRock_c::searchWaterPillar(void* i_proc, void* i_this) {
     daSyRock_c* const syRock = static_cast<daSyRock_c*>(i_this);
     daWtPillar_c* const wtPillar = static_cast<daWtPillar_c*>(i_proc);
@@ -327,7 +311,6 @@ void* daSyRock_c::searchWaterPillar(void* i_proc, void* i_this) {
     return NULL;
 }
 
-/* 80D03250-80D03384 001090 0134+00 1/1 0/0 0/0 .text            init_modeDrop__10daSyRock_cFv */
 void daSyRock_c::init_modeDrop() {
     gravity = -l_HIO.mFallAcceleration;
     maxFallSpeed = -l_HIO.mMaxFallSpeed;
@@ -348,14 +331,12 @@ void daSyRock_c::init_modeDrop() {
     mMode = MODE_DROP;
 }
 
-/* 80D03384-80D033D0 0011C4 004C+00 1/0 0/0 0/0 .text            modeDrop__10daSyRock_cFv */
 void daSyRock_c::modeDrop() {
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
     bgCheck();
 }
 
-/* 80D033D0-80D03440 001210 0070+00 1/1 0/0 0/0 .text            init_modeSink__10daSyRock_cFv */
 void daSyRock_c::init_modeSink() {
     gravity = -l_HIO.mFallAcceleration + l_HIO.mFallWaterBouyancy;
     speed.y = cLib_minMaxLimit(speed.y, -15.0f, 13.0f);
@@ -366,7 +347,6 @@ void daSyRock_c::init_modeSink() {
     mMode = MODE_SINK;
 }
 
-/* 80D03440-80D034E8 001280 00A8+00 1/0 0/0 0/0 .text            modeSink__10daSyRock_cFv */
 void daSyRock_c::modeSink() {
     if(!mpWaterPillar)
         cLib_addCalcAngleS(&shape_angle.z, 0x4000, 1, 0x444, 1);
@@ -379,7 +359,6 @@ void daSyRock_c::modeSink() {
     bgCheck();
 }
 
-/* 80D034E8-80D035F8 001328 0110+00 1/1 0/0 0/0 .text            init_modeMove__10daSyRock_cFv */
 void daSyRock_c::init_modeMove() {
     fopAcM_seStartCurrent(this, Z2SE_OBJ_STALAC_LAND_WATER, 0);
 
@@ -403,7 +382,6 @@ void daSyRock_c::init_modeMove() {
     mMode = MODE_MOVE;
 }
 
-/* 80D035F8-80D036B8 001438 00C0+00 1/0 0/0 0/0 .text            modeMove__10daSyRock_cFv */
 void daSyRock_c::modeMove() {
     mpWaterPillar->onRockFlag();
 
@@ -422,12 +400,10 @@ void daSyRock_c::modeMove() {
     }
 }
 
-/* 80D036B8-80D036DC 0014F8 0024+00 1/1 0/0 0/0 .text            chkWaterLineIn__10daSyRock_cFv */
 BOOL daSyRock_c::chkWaterLineIn() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + 150.0f;
 }
 
-/* 80D036DC-80D03984 00151C 02A8+00 2/2 0/0 0/0 .text            bgCheck__10daSyRock_cFv */
 void daSyRock_c::bgCheck() {
     // Note stack ordering issues arise if fopAcM_seStartCurrent() is used instead of mDoAud_seStart()
     const u32 hitGround = mAcch.ChkGroundHit() ? TRUE : FALSE;
@@ -479,7 +455,6 @@ void daSyRock_c::bgCheck() {
     }
 }
 
-/* 80D03984-80D03A48 0017C4 00C4+00 1/1 0/0 0/0 .text            init_modeDropEnd__10daSyRock_cFv */
 void daSyRock_c::init_modeDropEnd() {
     if(!mAcch.ChkWaterIn()) {
         dComIfGp_getVibration().StartShock(l_HIO.mShockStrength, 0xF, cXyz(0.0f, 1.0f, 0.0f));
@@ -496,12 +471,10 @@ void daSyRock_c::init_modeDropEnd() {
     mMode = MODE_DROP_END;
 }
 
-/* 80D03A48-80D03A4C 001888 0004+00 1/0 0/0 0/0 .text            modeDropEnd__10daSyRock_cFv */
 void daSyRock_c::modeDropEnd() {
     /* empty function */
 }
 
-/* 80D03A4C-80D03B08 00188C 00BC+00 1/0 0/0 0/0 .text            Draw__10daSyRock_cFv */
 int daSyRock_c::Draw() {
     g_env_light.settingTevStruct(0x10, fopAcM_GetPosition_p(this), &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModels[mIsUnbroken], &tevStr);
@@ -513,7 +486,6 @@ int daSyRock_c::Draw() {
     return 1;
 }
 
-/* 80D03B08-80D03B70 001948 0068+00 1/0 0/0 0/0 .text            Delete__10daSyRock_cFv */
 int daSyRock_c::Delete() {
     dComIfG_resDelete(&mPhase, "syourock");
 
@@ -523,28 +495,23 @@ int daSyRock_c::Delete() {
     return 1;
 }
 
-/* 80D03B70-80D03B9C 0019B0 002C+00 1/0 0/0 0/0 .text            daSyRock_Draw__FP10daSyRock_c */
 static int daSyRock_Draw(daSyRock_c* i_this) {
     return i_this->Draw();
     return 1;
 }
 
-/* 80D03B9C-80D03BBC 0019DC 0020+00 1/0 0/0 0/0 .text            daSyRock_Execute__FP10daSyRock_c */
 static int daSyRock_Execute(daSyRock_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D03BBC-80D03BDC 0019FC 0020+00 1/0 0/0 0/0 .text            daSyRock_Delete__FP10daSyRock_c */
 static int daSyRock_Delete(daSyRock_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D03BDC-80D03BFC 001A1C 0020+00 1/0 0/0 0/0 .text            daSyRock_Create__FP10fopAc_ac_c */
 static int daSyRock_Create(fopAc_ac_c* i_this) {
     return static_cast<daSyRock_c*>(i_this)->create();
 }
 
-/* 80D04130-80D04150 -00001 0020+00 1/0 0/0 0/0 .data            l_daSyRock_Method */
 static actor_method_class l_daSyRock_Method = {
     (process_method_func)daSyRock_Create,
     (process_method_func)daSyRock_Delete,
@@ -553,7 +520,6 @@ static actor_method_class l_daSyRock_Method = {
     (process_method_func)daSyRock_Draw,
 };
 
-/* 80D04150-80D04180 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SyRock */
 extern actor_process_profile_definition g_profile_Obj_SyRock = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp
index 25d5a0834f..d185b9ac2f 100644
--- a/src/d/actor/d_a_obj_szbridge.cpp
+++ b/src/d/actor/d_a_obj_szbridge.cpp
@@ -7,20 +7,15 @@
 
 #include "d/actor/d_a_obj_szbridge.h"
 
-/* 80D04338-80D04360 000078 0028+00 1/1 0/0 0/0 .text
- * rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c              */
 static void rideCallback(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) {
     static_cast<daObjSZbridge_c*>(param_1)->rideActor(param_2);
 }
 
-/* 80D04C38-80D04C50 000000 0018+00 3/3 0/0 0/0 .rodata          l_cull_box */
 static const Vec l_cull_box[2] = {
     {-310.0f, -30.0f, -760.0f},
     {310.0f, 360.0f, 760.0f},
 };
 
-/* 80D04360-80D04424 0000A0 00C4+00 1/1 0/0 0/0 .text rideActor__15daObjSZbridge_cFP10fopAc_ac_c
- */
 void daObjSZbridge_c::rideActor(fopAc_ac_c* i_actor) {
     cXyz pos = i_actor->current.pos;
     pos.y = mWaterY;
@@ -31,10 +26,8 @@ void daObjSZbridge_c::rideActor(fopAc_ac_c* i_actor) {
     field_0x620 = 10;
 }
 
-/* 80D04C8C-80D04C90 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "S_Zbridge";
 
-/* 80D04424-80D044B8 000164 0094+00 1/1 0/0 0/0 .text            create1st__15daObjSZbridge_cFv */
 int daObjSZbridge_c::create1st() {
     int rv = dComIfG_resLoad(this, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -47,7 +40,6 @@ int daObjSZbridge_c::create1st() {
     return rv;
 }
 
-/* 80D044B8-80D04528 0001F8 0070+00 2/2 0/0 0/0 .text            setMtx__15daObjSZbridge_cFv */
 void daObjSZbridge_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -55,14 +47,12 @@ void daObjSZbridge_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D04528-80D04598 000268 0070+00 1/0 0/0 0/0 .text            CreateHeap__15daObjSZbridge_cFv */
 int daObjSZbridge_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80D04598-80D047D4 0002D8 023C+00 2/2 0/0 0/0 .text            chkBg__15daObjSZbridge_cFv */
 void daObjSZbridge_c::chkBg() {
     cXyz chk_pos;
 
@@ -107,7 +97,6 @@ void daObjSZbridge_c::chkBg() {
     }
 }
 
-/* 80D048C4-80D04974 000604 00B0+00 1/0 0/0 0/0 .text            Create__15daObjSZbridge_cFv */
 int daObjSZbridge_c::Create() {
     mpBgW->SetRideCallback(rideCallback);
     chkBg();
@@ -127,7 +116,6 @@ int daObjSZbridge_c::Create() {
     return 1;
 }
 
-/* 80D04974-80D049E4 0006B4 0070+00 1/0 0/0 0/0 .text Execute__15daObjSZbridge_cFPPA3_A4_f */
 int daObjSZbridge_c::Execute(Mtx** param_0) {
     chkBg();
 
@@ -143,7 +131,6 @@ int daObjSZbridge_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D049E4-80D04A88 000724 00A4+00 1/0 0/0 0/0 .text            Draw__15daObjSZbridge_cFv */
 int daObjSZbridge_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -155,38 +142,28 @@ int daObjSZbridge_c::Draw() {
     return 1;
 }
 
-/* 80D04A88-80D04AC4 0007C8 003C+00 1/0 0/0 0/0 .text            Delete__15daObjSZbridge_cFv */
 int daObjSZbridge_c::Delete() {
     dComIfG_resDelete(this, l_arcName);
     return 1;
 }
 
-/* 80D04AC4-80D04B24 000804 0060+00 1/0 0/0 0/0 .text daObjSZbridge_create1st__FP15daObjSZbridge_c
- */
 static int daObjSZbridge_create1st(daObjSZbridge_c* i_this) {
     fopAcM_ct(i_this, daObjSZbridge_c);
     return i_this->create1st();
 }
 
-/* 80D04B24-80D04B44 000864 0020+00 1/0 0/0 0/0 .text
- * daObjSZbridge_MoveBGDelete__FP15daObjSZbridge_c              */
 static int daObjSZbridge_MoveBGDelete(daObjSZbridge_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D04B44-80D04B64 000884 0020+00 1/0 0/0 0/0 .text
- * daObjSZbridge_MoveBGExecute__FP15daObjSZbridge_c             */
 static int daObjSZbridge_MoveBGExecute(daObjSZbridge_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D04B64-80D04B90 0008A4 002C+00 1/0 0/0 0/0 .text
- * daObjSZbridge_MoveBGDraw__FP15daObjSZbridge_c                */
 static int daObjSZbridge_MoveBGDraw(daObjSZbridge_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D04C90-80D04CB0 -00001 0020+00 1/0 0/0 0/0 .data            daObjSZbridge_METHODS */
 static actor_method_class daObjSZbridge_METHODS = {
     (process_method_func)daObjSZbridge_create1st,
     (process_method_func)daObjSZbridge_MoveBGDelete,
@@ -195,7 +172,6 @@ static actor_method_class daObjSZbridge_METHODS = {
     (process_method_func)daObjSZbridge_MoveBGDraw,
 };
 
-/* 80D04CB0-80D04CE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_SZbridge */
 extern actor_process_profile_definition g_profile_Obj_SZbridge = {
     fpcLy_CURRENT_e,          // mLayerID
     3,                        // mListID
diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp
index e89b67e90d..fc03e4f7b4 100644
--- a/src/d/actor/d_a_obj_taFence.cpp
+++ b/src/d/actor/d_a_obj_taFence.cpp
@@ -12,8 +12,8 @@
 
 class daTaFence_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 80D04E6C */ daTaFence_HIO_c();
-    /* 80D06000 */ virtual ~daTaFence_HIO_c() {}
+    daTaFence_HIO_c();
+    virtual ~daTaFence_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -48,10 +48,8 @@ public:
     /* 0x71 */ u8 shake_time;
 };
 
-/* 80D0633C-80D063B0 000014 0074+00 5/5 0/0 0/0 .bss             l_HIO */
 static daTaFence_HIO_c l_HIO;
 
-/* 80D04E6C-80D04F44 0000EC 00D8+00 1/1 0/0 0/0 .text            __ct__15daTaFence_HIO_cFv */
 daTaFence_HIO_c::daTaFence_HIO_c() {
     fall_init_speed = 0.0f;
     fall_max_speed = 13.0f;
@@ -87,7 +85,6 @@ daTaFence_HIO_c::daTaFence_HIO_c() {
     shake_time = 27;
 }
 
-/* 80D04F8C-80D0503C 00020C 00B0+00 2/2 0/0 0/0 .text            setBaseMtx__11daTaFence_cFv */
 void daTaFence_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -97,7 +94,6 @@ void daTaFence_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D0503C-80D050A8 0002BC 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daTaFence_cFv */
 int daTaFence_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_Mfence", 4);
     JUT_ASSERT(339, modelData != NULL);
@@ -110,7 +106,6 @@ int daTaFence_c::CreateHeap() {
     return 1;
 }
 
-/* 80D06114-80D06144 000034 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__11daTaFence_c */
 const dCcD_SrcGObjInf daTaFence_c::mCcDObjInfo = {
     {0, {{0x0, 0x0, 0x0}, {0x400032, 0x11}, {0x0}}},
     {dCcD_SE_SWORD, 0, 0, 0, 0},
@@ -118,7 +113,6 @@ const dCcD_SrcGObjInf daTaFence_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80D061C4-80D06208 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daTaFence_c */
 dCcD_SrcCyl daTaFence_c::mCcDCyl = {
     daTaFence_c::mCcDObjInfo,
     {
@@ -128,7 +122,6 @@ dCcD_SrcCyl daTaFence_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80D050A8-80D05314 000328 026C+00 1/1 0/0 0/0 .text            create__11daTaFence_cFv */
 int daTaFence_c::create() {
     fopAcM_ct(this, daTaFence_c);
 
@@ -201,7 +194,6 @@ int daTaFence_c::create() {
     return phase_state;
 }
 
-/* 80D05550-80D055A0 0007D0 0050+00 1/0 0/0 0/0 .text            Execute__11daTaFence_cFPPA3_A4_f */
 int daTaFence_c::Execute(Mtx** param_0) {
     fenceProc();
     *param_0 = &mpModel->getBaseTRMtx();
@@ -209,7 +201,6 @@ int daTaFence_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D06144-80D06174 000064 0030+00 0/1 0/0 0/0 .rodata          l_check_area */
 static const Vec l_check_area[4] = {
     {-225.0f, 0.0f, -100.0f},
     {-225.0f, 225.0f, -100.0f},
@@ -217,7 +208,6 @@ static const Vec l_check_area[4] = {
     {225.0f, 0.0f, 100.0f},
 };
 
-/* 80D055A0-80D057C4 000820 0224+00 1/1 0/0 0/0 .text            fenceProc__11daTaFence_cFv */
 void daTaFence_c::fenceProc() {
     static void (daTaFence_c::*mode_proc[])() = {
         &daTaFence_c::modeWait,
@@ -239,12 +229,10 @@ void daTaFence_c::fenceProc() {
     mCounter++;
 }
 
-/* 80D057C4-80D057D0 000A44 000C+00 1/1 0/0 0/0 .text            init_modeWait__11daTaFence_cFv */
 void daTaFence_c::init_modeWait() {
     mMode = 0;
 }
 
-/* 80D057D0-80D05A54 000A50 0284+00 1/0 0/0 0/0 .text            modeWait__11daTaFence_cFv */
 void daTaFence_c::modeWait() {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
     if (player->checkFrontRollCrash()) {
@@ -303,8 +291,6 @@ void daTaFence_c::modeWait() {
     }
 }
 
-/* 80D05A54-80D05B5C 000CD4 0108+00 1/1 0/0 0/0 .text            init_modeMoveInit__11daTaFence_cFv
- */
 void daTaFence_c::init_modeMoveInit() {
     if (mCollapseTimer == 0) {
         mCollapseTimer = l_HIO.collapse_time;
@@ -328,7 +314,6 @@ void daTaFence_c::init_modeMoveInit() {
     mMode = 1;
 }
 
-/* 80D05B5C-80D05B94 000DDC 0038+00 1/0 0/0 0/0 .text            modeMoveInit__11daTaFence_cFv */
 void daTaFence_c::modeMoveInit() {
     if (mCollapseTimer == 0) {
         init_modeMove();
@@ -337,7 +322,6 @@ void daTaFence_c::modeMoveInit() {
     }
 }
 
-/* 80D05B94-80D05CAC 000E14 0118+00 1/1 0/0 0/0 .text            init_modeMove__11daTaFence_cFv */
 void daTaFence_c::init_modeMove() {
     for (int i = 0; i < 11; i++) {
         mCyl[i].OffCoSetBit();
@@ -365,7 +349,6 @@ void daTaFence_c::init_modeMove() {
     mMode = 2;
 }
 
-/* 80D05CAC-80D05D2C 000F2C 0080+00 1/0 0/0 0/0 .text            modeMove__11daTaFence_cFv */
 void daTaFence_c::modeMove() {
     cLib_chaseF(&speedF, mFallSpeed, mFallSpeed / 30.0f);
     if (cLib_addCalcAngleS(&shape_angle.x, field_0x1384, 1, (182.04445f * fopAcM_GetSpeedF(this)), 1) == 0) {
@@ -373,8 +356,6 @@ void daTaFence_c::modeMove() {
     }
 }
 
-/* 80D05D2C-80D05E54 000FAC 0128+00 2/2 0/0 0/0 .text            init_modeMoveEnd__11daTaFence_cFv
- */
 void daTaFence_c::init_modeMoveEnd() {
     mDoAud_seStart(Z2SE_OBJ_ATK_FENCE_FALLDOWN, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
     dComIfGp_getVibration().StartShock(l_HIO.vibration, 0xF, cXyz(0.0f, 1.0f, 0.0f));
@@ -389,10 +370,8 @@ void daTaFence_c::init_modeMoveEnd() {
     mMode = 3;
 }
 
-/* 80D05E54-80D05E58 0010D4 0004+00 1/0 0/0 0/0 .text            modeMoveEnd__11daTaFence_cFv */
 void daTaFence_c::modeMoveEnd() {}
 
-/* 80D05E58-80D05EFC 0010D8 00A4+00 1/0 0/0 0/0 .text            Draw__11daTaFence_cFv */
 int daTaFence_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -402,7 +381,6 @@ int daTaFence_c::Draw() {
     return 1;
 }
 
-/* 80D05EFC-80D05F2C 00117C 0030+00 1/0 0/0 0/0 .text            Delete__11daTaFence_cFv */
 int daTaFence_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_Mfence");
     #if DEBUG
@@ -411,29 +389,22 @@ int daTaFence_c::Delete() {
     return 1;
 }
 
-/* 80D05F2C-80D05F58 0011AC 002C+00 1/0 0/0 0/0 .text            daTaFence_Draw__FP11daTaFence_c */
 static int daTaFence_Draw(daTaFence_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D05F58-80D05F78 0011D8 0020+00 1/0 0/0 0/0 .text            daTaFence_Execute__FP11daTaFence_c
- */
 static int daTaFence_Execute(daTaFence_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D05F78-80D05F98 0011F8 0020+00 1/0 0/0 0/0 .text            daTaFence_Delete__FP11daTaFence_c
- */
 static int daTaFence_Delete(daTaFence_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D05F98-80D05FB8 001218 0020+00 1/0 0/0 0/0 .text            daTaFence_Create__FP10fopAc_ac_c */
 static int daTaFence_Create(fopAc_ac_c* i_this) {
     return ((daTaFence_c*)i_this)->create();
 }
 
-/* 80D06268-80D06288 -00001 0020+00 1/0 0/0 0/0 .data            l_daTaFence_Method */
 static actor_method_class l_daTaFence_Method = {
     (process_method_func)daTaFence_Create,
     (process_method_func)daTaFence_Delete,
@@ -442,7 +413,6 @@ static actor_method_class l_daTaFence_Method = {
     (process_method_func)daTaFence_Draw,
 };
 
-/* 80D06288-80D062B8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TaFence */
 extern actor_process_profile_definition g_profile_Obj_TaFence = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp
index 13d2a6e58a..3928dfcff3 100644
--- a/src/d/actor/d_a_obj_table.cpp
+++ b/src/d/actor/d_a_obj_table.cpp
@@ -13,7 +13,6 @@
 #include "d/d_meter2_info.h"
 #include "d/d_msg_object.h"
 
-/* 80D06C1C-80D06C20 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Table";
 
 void daObjTable_c::initBaseMtx() {
@@ -42,36 +41,27 @@ int daObjTable_c::create() {
     return phase_state;
 }
 
-/* 80D06438-80D06464 000078 002C+00 1/0 0/0 0/0 .text            daObjTable_Draw__FP12daObjTable_c
- */
 static int daObjTable_Draw(daObjTable_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D06464-80D06484 0000A4 0020+00 1/0 0/0 0/0 .text daObjTable_Execute__FP12daObjTable_c */
 static int daObjTable_Execute(daObjTable_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D06484-80D0648C 0000C4 0008+00 1/0 0/0 0/0 .text daObjTable_IsDelete__FP12daObjTable_c */
 static int daObjTable_IsDelete(daObjTable_c* i_this) {
     return 1;
 }
 
-/* 80D0648C-80D064B0 0000CC 0024+00 1/0 0/0 0/0 .text            daObjTable_Delete__FP12daObjTable_c
- */
 static int daObjTable_Delete(daObjTable_c* i_this) {
     i_this->MoveBGDelete();
     return 1;
 }
 
-/* 80D064B0-80D06560 0000F0 00B0+00 1/0 0/0 0/0 .text            daObjTable_Create__FP10fopAc_ac_c
- */
 static int daObjTable_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjTable_c*>(i_this)->create();
 }
 
-/* 80D06560-80D065D0 0001A0 0070+00 1/0 0/0 0/0 .text            CreateHeap__12daObjTable_cFv */
 int daObjTable_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -82,7 +72,6 @@ int daObjTable_c::CreateHeap() {
     return true;
 }
 
-/* 80D065D0-80D0695C 000210 038C+00 1/0 0/0 0/0 .text            Create__12daObjTable_cFv */
 int daObjTable_c::Create() {
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
     if (dKy_darkworld_check() || dComIfGs_isStageSwitch(0x18, 0x4b)) {
@@ -148,8 +137,6 @@ int daObjTable_c::Create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D0695C-80D06AD8 00059C 017C+00 1/0 0/0 0/0 .text            Execute__12daObjTable_cFPPA3_A4_f
- */
 int daObjTable_c::Execute(Mtx** i_mtx) {
     eventInfo.onCondition(1);
 
@@ -180,7 +167,6 @@ int daObjTable_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D06AD8-80D06BC8 000718 00F0+00 1/0 0/0 0/0 .text            Draw__12daObjTable_cFv */
 int daObjTable_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -196,20 +182,17 @@ int daObjTable_c::Draw() {
     return 1;
 }
 
-/* 80D06BC8-80D06BFC 000808 0034+00 1/0 0/0 0/0 .text            Delete__12daObjTable_cFv */
 int daObjTable_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D06C20-80D06C40 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTable_Method */
 static actor_method_class l_daObjTable_Method = {
     (process_method_func)daObjTable_Create,  (process_method_func)daObjTable_Delete,
     (process_method_func)daObjTable_Execute, (process_method_func)daObjTable_IsDelete,
     (process_method_func)daObjTable_Draw,
 };
 
-/* 80D06C40-80D06C70 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Table */
 extern actor_process_profile_definition g_profile_Obj_Table = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp
index f4957a9862..2f88fe7993 100644
--- a/src/d/actor/d_a_obj_takaraDai.cpp
+++ b/src/d/actor/d_a_obj_takaraDai.cpp
@@ -9,7 +9,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D06D8C-80D06E1C 0000EC 0090+00 1/1 0/0 0/0 .text            __ct__15daTkraDai_HIO_cFv */
 daTkraDai_HIO_c::daTkraDai_HIO_c() {
     field_0x04 = 12.0f;
     field_0x10 = 4.0f;
@@ -27,7 +26,6 @@ daTkraDai_HIO_c::daTkraDai_HIO_c() {
     field_0x38 = 15;
 }
 
-/* 80D06E64-80D06FFC 0001C4 0198+00 2/2 0/0 0/0 .text            setBaseMtx__11daTkraDai_cFv */
 void daTkraDai_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -48,7 +46,6 @@ void daTkraDai_c::setBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), field_0x62c);
 }
 
-/* 80D06FFC-80D07140 00035C 0144+00 1/0 0/0 0/0 .text            CreateHeap__11daTkraDai_cFv */
 int daTkraDai_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("M_TakaraD", 4);
     mpBaseModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -75,7 +72,6 @@ int daTkraDai_c::CreateHeap() {
     return 1;
 }
 
-/* 80D07140-80D07344 0004A0 0204+00 1/1 0/0 0/0 .text            create__11daTkraDai_cFv */
 int daTkraDai_c::create() {
     fopAcM_ct(this, daTkraDai_c);
 
@@ -123,7 +119,6 @@ int daTkraDai_c::create() {
     return phase;
 }
 
-/* 80D07344-80D073A4 0006A4 0060+00 1/0 0/0 0/0 .text            Execute__11daTkraDai_cFPPA3_A4_f */
 int daTkraDai_c::Execute(Mtx** param_0) {
     procMain();
     setBaseMtx();
@@ -134,10 +129,8 @@ int daTkraDai_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D0791C-80D07958 000014 003C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daTkraDai_HIO_c l_HIO;
 
-/* 80D073A4-80D074D0 000704 012C+00 1/1 0/0 0/0 .text            procMain__11daTkraDai_cFv */
 void daTkraDai_c::procMain() {
     typedef void (daTkraDai_c::*daTkraDai_modeFunc)();
     static daTkraDai_modeFunc mode_proc[] = {
@@ -150,14 +143,12 @@ void daTkraDai_c::procMain() {
     field_0x5d0++;
 }
 
-/* 80D074D0-80D07528 000830 0058+00 1/1 0/0 0/0 .text            init_modeWait__11daTkraDai_cFv */
 void daTkraDai_c::init_modeWait() {
     field_0x5dc = l_HIO.field_0x08;
     field_0x61a = cM_deg2s(360.0f / (l_HIO.field_0x04 * 30.0f));
     mMode = 0;
 }
 
-/* 80D07528-80D075A4 000888 007C+00 1/0 0/0 0/0 .text            modeWait__11daTkraDai_cFv */
 void daTkraDai_c::modeWait() {
     field_0x5dc = l_HIO.field_0x08;
     field_0x5e4 = l_HIO.field_0x0c;
@@ -169,7 +160,6 @@ void daTkraDai_c::modeWait() {
     }
 }
 
-/* 80D075A4-80D07668 000904 00C4+00 1/0 0/0 0/0 .text            Draw__11daTkraDai_cFv */
 int daTkraDai_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBaseModel, &tevStr);
@@ -181,7 +171,6 @@ int daTkraDai_c::Draw() {
     return 1;
 }
 
-/* 80D07668-80D076D0 0009C8 0068+00 1/0 0/0 0/0 .text            Delete__11daTkraDai_cFv */
 int daTkraDai_c::Delete() {
     dComIfG_resDelete(&mPhase, "M_TakaraD");
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -190,37 +179,29 @@ int daTkraDai_c::Delete() {
     return 1;
 }
 
-/* 80D076D0-80D076FC 000A30 002C+00 1/0 0/0 0/0 .text            daTkraDai_Draw__FP11daTkraDai_c */
 static int daTkraDai_Draw(daTkraDai_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D076FC-80D0771C 000A5C 0020+00 1/0 0/0 0/0 .text            daTkraDai_Execute__FP11daTkraDai_c
- */
 static int daTkraDai_Execute(daTkraDai_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D0771C-80D0773C 000A7C 0020+00 1/0 0/0 0/0 .text            daTkraDai_Delete__FP11daTkraDai_c
- */
 static int daTkraDai_Delete(daTkraDai_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D0773C-80D0775C 000A9C 0020+00 1/0 0/0 0/0 .text            daTkraDai_Create__FP10fopAc_ac_c */
 static int daTkraDai_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daTkraDai_c*>(i_this)->create();
 }
 
-/* 80D07878-80D07898 -00001 0020+00 1/0 0/0 0/0 .data            l_daTkraDai_Method */
 static actor_method_class l_daTkraDai_Method = {
     (process_method_func)daTkraDai_Create,  (process_method_func)daTkraDai_Delete,
     (process_method_func)daTkraDai_Execute, 0,
     (process_method_func)daTkraDai_Draw,
 };
 
-/* 80D07898-80D078C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TakaraDai */
 extern actor_process_profile_definition g_profile_Obj_TakaraDai = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp
index a2f3ad0b48..ff49667c98 100644
--- a/src/d/actor/d_a_obj_tatigi.cpp
+++ b/src/d/actor/d_a_obj_tatigi.cpp
@@ -10,9 +10,7 @@
 #include "d/d_cc_uty.h"
 #include "d/d_s_play.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80D079D8-80D07A60 000078 0088+00 1/0 0/0 0/0 .text daObj_Tatigi_Draw__FP16obj_tatigi_class */
 static int daObj_Tatigi_Draw(obj_tatigi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mBase;
     int roomNo = fopAcM_GetRoomNo(a_this);
@@ -25,8 +23,6 @@ static int daObj_Tatigi_Draw(obj_tatigi_class* i_this) {
     return 1;
 }
 
-/* 80D07A60-80D07CE8 000100 0288+00 2/1 0/0 0/0 .text daObj_Tatigi_Execute__FP16obj_tatigi_class
- */
 static int daObj_Tatigi_Execute(obj_tatigi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mBase;
     i_this->field_0x574++;
@@ -73,13 +69,10 @@ static int daObj_Tatigi_Execute(obj_tatigi_class* i_this) {
     return 1;
 }
 
-/* 80D07CE8-80D07CF0 000388 0008+00 1/0 0/0 0/0 .text daObj_Tatigi_IsDelete__FP16obj_tatigi_class
- */
 static int daObj_Tatigi_IsDelete(obj_tatigi_class* param_0) {
     return 1;
 }
 
-/* 80D07CF0-80D07D78 000390 0088+00 1/0 0/0 0/0 .text daObj_Tatigi_Delete__FP16obj_tatigi_class */
 static int daObj_Tatigi_Delete(obj_tatigi_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mBase;
     fopAcM_RegisterDeleteID(i_this, "Obj_Tatigi");
@@ -91,7 +84,6 @@ static int daObj_Tatigi_Delete(obj_tatigi_class* i_this) {
     return 1;
 }
 
-/* 80D07D78-80D07E24 000418 00AC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_tatigi_class* i_this = (obj_tatigi_class*)a_this;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_tg", 3);
@@ -105,7 +97,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80D07E24-80D07FD8 0004C4 01B4+00 1/1 0/0 0/0 .text set_pos_check__FP16obj_tatigi_classi */
 static BOOL set_pos_check(obj_tatigi_class* i_this, int param_2) {
     cXyz cStack_2c;
     f32 dVar7 = KREG_F(7) + 150.0f;
@@ -118,8 +109,6 @@ static BOOL set_pos_check(obj_tatigi_class* i_this, int param_2) {
     return TRUE;
 }
 
-/* 80D07FD8-80D083C0 000678 03E8+00 1/0 0/0 0/0 .text            daObj_Tatigi_Create__FP10fopAc_ac_c
- */
 static int daObj_Tatigi_Create(fopAc_ac_c* a_this) {
     static dCcD_SrcCyl cc_cyl_src = {
         {
@@ -215,8 +204,6 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) {
     return rv;
 }
 
-/* ############################################################################################## */
-/* 80D0866C-80D0868C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Tatigi_Method */
 static actor_method_class l_daObj_Tatigi_Method = {
     (process_method_func)daObj_Tatigi_Create,
     (process_method_func)daObj_Tatigi_Delete,
@@ -225,7 +212,6 @@ static actor_method_class l_daObj_Tatigi_Method = {
     (process_method_func)daObj_Tatigi_Draw,
 };
 
-/* 80D0868C-80D086BC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_TATIGI */
 extern actor_process_profile_definition g_profile_OBJ_TATIGI = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp
index e5e1016315..4fe39620da 100644
--- a/src/d/actor/d_a_obj_ten.cpp
+++ b/src/d/actor/d_a_obj_ten.cpp
@@ -16,21 +16,17 @@
 #include "m_Do/m_Do_lib.h"
 #include "d/d_menu_insect.h"
 
-/* 80D087CC-80D087F4 0000EC 0028+00 1/1 0/0 0/0 .text            __ct__14daObj_TenHIO_cFv */
 daObj_TenHIO_c::daObj_TenHIO_c() {
     field_0x4 = -1;
     field_0xc = 1.0f;
     field_0x8 = 1.0f;
 }
 
-/* ############################################################################################## */
-/* 80D0B8F4-80D0B8F8 000004 0002+02 1/2 0/0 0/0 .rodata          l_ten_itemno */
 static u8 const l_ten_itemno[2] = {
     0xCE,
     0xCF,
 };
 
-/* 80D0B8F8-80D0B938 000008 0040+00 1/1 0/0 0/0 .rodata          ccSphSrc$3779 */
 const static dCcD_SrcSph ccSphSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x14002, 0x11}, 0x0}}, // mObj
@@ -43,7 +39,6 @@ const static dCcD_SrcSph ccSphSrc = {
     } // mSphAttr
 };
 
-/* 80D087F4-80D08860 000114 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjTEN_cFv */
 void daObjTEN_c::InitCcSph() {
     mStts.Init(1, 0, this);
     mSph.Set(ccSphSrc);
@@ -52,14 +47,12 @@ void daObjTEN_c::InitCcSph() {
     mSph.OnTgNoHitMark();
 }
 
-/* 80D08860-80D088B8 000180 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjTEN_cFv */
 void daObjTEN_c::SetCcSph() {
     mSph.SetC(current.pos);
     mSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80D088B8-80D08B84 0001D8 02CC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* actor) {
     daObjTEN_c* i_this = static_cast<daObjTEN_c*>(actor);
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Ten", 10);
@@ -104,18 +97,15 @@ static int useHeapInit(fopAc_ac_c* actor) {
     return 1;
 }
 
-/* 80D08BCC-80D08BEC 0004EC 0020+00 1/0 0/0 0/0 .text            daObjTEN_Create__FP10fopAc_ac_c */
 static int daObjTEN_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjTEN_c*>(i_this)->create();
 }
 
-/* 80D08BEC-80D08C10 00050C 0024+00 1/0 0/0 0/0 .text            daObjTEN_Delete__FP10daObjTEN_c */
 static int daObjTEN_Delete(daObjTEN_c* i_this) {
     static_cast<daObjTEN_c*>(i_this)->Delete();
     return 1;
 }
 
-/* 80D08C10-80D08D94 000530 0184+00 2/2 0/0 0/0 .text            WaitAction__10daObjTEN_cFv */
 void daObjTEN_c::WaitAction() {
     switch (field_0x5e9) {
     case 0:
@@ -149,7 +139,6 @@ void daObjTEN_c::WaitAction() {
     }
 }
 
-/* 80D08D94-80D08FC0 0006B4 022C+00 1/1 0/0 0/0 .text            WallCheck__10daObjTEN_cFv */
 BOOL daObjTEN_c::WallCheck() {
     dBgS_LinChk linChk;
     linChk.SetObj();
@@ -169,7 +158,6 @@ BOOL daObjTEN_c::WallCheck() {
     return 0;
 }
 
-/* 80D09008-80D09114 000928 010C+00 1/1 0/0 0/0 .text            SpeedSet__10daObjTEN_cFv */
 void daObjTEN_c::SpeedSet() {
     speed.y += gravity;
     cXyz speedAmp(0.0f, speed.y, speedF);
@@ -186,7 +174,6 @@ void daObjTEN_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80D09114-80D09548 000A34 0434+00 1/1 0/0 0/0 .text            WallWalk__10daObjTEN_cFv */
 void daObjTEN_c::WallWalk() {
     cXyz cStack_138(0.0f, -100.0f, 3.0f * speedF);
     cXyz cStack_144(0.0f, 40.0f, 0.0f);
@@ -227,7 +214,6 @@ void daObjTEN_c::WallWalk() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80D09548-80D09748 000E68 0200+00 2/2 0/0 0/0 .text            WalkAction__10daObjTEN_cFv */
 void daObjTEN_c::WalkAction() {
     for (int i = 0; i < 3; i++) {
         field_0x5ea[i]--;
@@ -269,7 +255,6 @@ void daObjTEN_c::WalkAction() {
     WallWalk();
 }
 
-/* 80D09748-80D09F58 001068 0810+00 2/2 0/0 0/0 .text            MoveAction__10daObjTEN_cFv */
 void daObjTEN_c::MoveAction() {
     for (int i = 0; i < 3; i++) {
         field_0x5ea[i]--;
@@ -412,7 +397,6 @@ void daObjTEN_c::MoveAction() {
     }
 }
 
-/* 80D09F58-80D0A01C 001878 00C4+00 1/1 0/0 0/0 .text            Action__10daObjTEN_cFv */
 void daObjTEN_c::Action() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -430,7 +414,6 @@ void daObjTEN_c::Action() {
     mCreature.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80D0A01C-80D0A0D8 00193C 00BC+00 1/1 0/0 0/0 .text            ShopAction__10daObjTEN_cFv */
 void daObjTEN_c::ShopAction() {
     switch (mAction) {
     case ACTION_WAIT:
@@ -447,14 +430,12 @@ void daObjTEN_c::ShopAction() {
     mCreature.startCreatureSoundLevel(Z2SE_INSCT_KIRA, 0, -1);
 }
 
-/* 80D0A0D8-80D0A13C 0019F8 0064+00 1/1 0/0 0/0 .text            checkGroundPos__10daObjTEN_cFv */
 void daObjTEN_c::checkGroundPos() {
     cXyz acStack_28(current.pos);
     mGndChk.SetPos(&acStack_28);
     field_0x5e4 = dComIfG_Bgsp().GroundCross(&mGndChk);
 }
 
-/* 80D0A13C-80D0A154 001A5C 0018+00 1/0 0/0 0/0 .text            Insect_Release__10daObjTEN_cFv */
 void daObjTEN_c::Insect_Release() {
     field_0x56c = 1;
     field_0x624 = 2;
@@ -463,7 +444,6 @@ void daObjTEN_c::Insect_Release() {
 
 static f32 dummyLiteral() { return -9.0f; }
 
-/* 80D0A154-80D0A278 001A74 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjTEN_cFv */
 void daObjTEN_c::ParticleSet() {
     if (field_0x618 > field_0x61c) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -479,7 +459,6 @@ void daObjTEN_c::ParticleSet() {
     }
 }
 
-/* 80D0A278-80D0A644 001B98 03CC+00 1/1 0/0 0/0 .text            BoomChk__10daObjTEN_cFv */
 void daObjTEN_c::BoomChk() {
     if (field_0x7a8 != 0) {
         cXyz* playerPos = &fopAcM_GetPosition(daPy_getPlayerActorClass());
@@ -529,7 +508,6 @@ void daObjTEN_c::BoomChk() {
     }
 }
 
-/* 80D0A644-80D0A8C8 001F64 0284+00 1/1 0/0 0/0 .text            Execute__10daObjTEN_cFv */
 int daObjTEN_c::Execute() {
     if (ChkGetDemo()) {
         field_0x618 = field_0x61c + 10000.0f;
@@ -581,7 +559,6 @@ int daObjTEN_c::Execute() {
     return 1;
 }
 
-/* 80D0A8C8-80D0AA50 0021E8 0188+00 1/1 0/0 0/0 .text            ObjHit__10daObjTEN_cFv */
 void daObjTEN_c::ObjHit() {
     if (mSph.ChkTgHit()) {
         cCcD_Obj* hitObj = mSph.GetTgHitObj();
@@ -610,7 +587,6 @@ void daObjTEN_c::ObjHit() {
     }
 }
 
-/* 80D0AA50-80D0ABCC 002370 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjTEN_cFv */
 void daObjTEN_c::Z_BufferChk() {
     cXyz local_5c;
     cXyz cStack_68;
@@ -639,11 +615,8 @@ void daObjTEN_c::Z_BufferChk() {
     field_0x618 = ((near + ((far * near) / local_5c.z)) / (far - near) + 1.0f) * 16777215.0f;
 }
 
-/* ############################################################################################## */
-/* 80D0BAB8-80D0BABC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80D0BAB8;
 
-/* 80D0ABCC-80D0AC34 0024EC 0068+00 1/1 0/0 0/0 .text            Delete__10daObjTEN_cFv */
 int daObjTEN_c::Delete() {
     dComIfG_resDelete(&mPhase, "I_Ten");
     if (field_0xa64 != 0) {
@@ -653,7 +626,6 @@ int daObjTEN_c::Delete() {
     return 1;
 }
 
-/* 80D0AC34-80D0AC9C 002554 0068+00 1/1 0/0 0/0 .text            setBaseMtx__10daObjTEN_cFv */
 void daObjTEN_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(field_0x602);
@@ -663,7 +635,6 @@ void daObjTEN_c::setBaseMtx() {
     mMorf->modelCalc();
 }
 
-/* 80D0AC9C-80D0AD7C 0025BC 00E0+00 1/0 0/0 0/0 .text            daObjTEN_Draw__FP10daObjTEN_c */
 static int daObjTEN_Draw(daObjTEN_c* i_this) {
     if (i_this->mDraw) {
         i_this->Z_BufferChk();
@@ -682,19 +653,15 @@ static int daObjTEN_Draw(daObjTEN_c* i_this) {
     return 1;
 }
 
-/* 80D0AD7C-80D0AD9C 00269C 0020+00 2/1 0/0 0/0 .text            daObjTEN_Execute__FP10daObjTEN_c */
 static int daObjTEN_Execute(daObjTEN_c* i_this) {
     return i_this->Execute();
 }
 
-/* ############################################################################################## */
-/* 80D0B9D0-80D0B9D4 0000E0 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x19F, /* dSv_event_flag_c::F_0415 - Misc. - Ladybug (M) */
     0x1A0, /* dSv_event_flag_c::F_0416 - Misc. - Ladybug (F) */
 };
 
-/* 80D0AD9C-80D0AF48 0026BC 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjTEN_cFv */
 bool daObjTEN_c::CreateChk() {
     u8 uVar1 = (fopAcM_GetParam(this) & 0xf00) >> 8;
     if (uVar1 == 15) {
@@ -725,10 +692,8 @@ bool daObjTEN_c::CreateChk() {
     return 1;
 }
 
-/* 80D0BAC8-80D0BAD8 000018 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_TenHIO_c l_HIO;
 
-/* 80D0AF48-80D0B740 002868 07F8+00 1/1 0/0 0/0 .text            create__10daObjTEN_cFv */
 int daObjTEN_c::create() {
     fopAcM_ct(this, daObjTEN_c);
     int rv = dComIfG_resLoad(&mPhase, "I_Ten");
@@ -831,13 +796,10 @@ int daObjTEN_c::create() {
     return rv;
 }
 
-/* 80D0B840-80D0B848 003160 0008+00 1/0 0/0 0/0 .text            daObjTEN_IsDelete__FP10daObjTEN_c
- */
 static int daObjTEN_IsDelete(daObjTEN_c* param_0) {
     return 1;
 }
 
-/* 80D0B9F4-80D0BA14 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTEN_Method */
 static actor_method_class l_daObjTEN_Method = {
     (process_method_func)daObjTEN_Create,
     (process_method_func)daObjTEN_Delete,
@@ -846,7 +808,6 @@ static actor_method_class l_daObjTEN_Method = {
     (process_method_func)daObjTEN_Draw,
 };
 
-/* 80D0BA14-80D0BA44 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Ten */
 extern actor_process_profile_definition g_profile_Obj_Ten = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp
index 174eeaeec7..84e5087771 100644
--- a/src/d/actor/d_a_obj_testcube.cpp
+++ b/src/d/actor/d_a_obj_testcube.cpp
@@ -6,10 +6,7 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_testcube.h"
-#include "dol2asm.h"
 
-/* ############################################################################################## */
-/* 80D0BB60-80D0BB90 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TestCube */
 extern actor_process_profile_definition g_profile_Obj_TestCube = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp
index 6a6f1609f4..295b7f1c32 100644
--- a/src/d/actor/d_a_obj_tgake.cpp
+++ b/src/d/actor/d_a_obj_tgake.cpp
@@ -10,13 +10,11 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D0BC18-80D0BC54 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjGake_cFv */
 void daObjGake_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D0BC54-80D0BCB8 0000B4 0064+00 1/1 0/0 0/0 .text            setBaseMtx__11daObjGake_cFv */
 void daObjGake_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -25,7 +23,6 @@ void daObjGake_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D0BCB8-80D0BD30 000118 0078+00 1/0 0/0 0/0 .text            Create__11daObjGake_cFv */
 int daObjGake_c::Create() {
     mEventBit1 = getEventBit1();
     mEventBit2 = getEventBit2();
@@ -39,10 +36,8 @@ int daObjGake_c::Create() {
     return 1;
 }
 
-/* 80D0C144-80D0C148 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "A_TGake";
 
-/* 80D0BD30-80D0BDA0 000190 0070+00 1/0 0/0 0/0 .text            CreateHeap__11daObjGake_cFv */
 int daObjGake_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -53,7 +48,6 @@ int daObjGake_c::CreateHeap() {
     return 1;
 }
 
-/* 80D0BDA0-80D0BE24 000200 0084+00 1/1 0/0 0/0 .text            create1st__11daObjGake_cFv */
 int daObjGake_c::create1st() {
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase == cPhs_COMPLEATE_e) {
@@ -66,7 +60,6 @@ int daObjGake_c::create1st() {
     return phase;
 }
 
-/* 80D0BE24-80D0BF7C 000284 0158+00 1/0 0/0 0/0 .text            Execute__11daObjGake_cFPPA3_A4_f */
 int daObjGake_c::Execute(Mtx** param_0) {
     if ((mEventBit2 != 0x3FF &&
          dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[mEventBit2])) ||
@@ -94,7 +87,6 @@ int daObjGake_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D0BF7C-80D0C034 0003DC 00B8+00 1/0 0/0 0/0 .text            Draw__11daObjGake_cFv */
 int daObjGake_c::Draw() {
     if (mHide) {
         return 1;
@@ -110,42 +102,35 @@ int daObjGake_c::Draw() {
     return 1;
 }
 
-/* 80D0C034-80D0C068 000494 0034+00 1/0 0/0 0/0 .text            Delete__11daObjGake_cFv */
 int daObjGake_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80D0C068-80D0C0C8 0004C8 0060+00 1/0 0/0 0/0 .text daObjGake_create1st__FP11daObjGake_c */
 static int daObjGake_create1st(daObjGake_c* i_this) {
     fopAcM_ct(i_this, daObjGake_c);
 
     return i_this->create1st();
 }
 
-/* 80D0C0C8-80D0C0E8 000528 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGDelete__FP11daObjGake_c */
 static int daObjGake_MoveBGDelete(daObjGake_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D0C0E8-80D0C108 000548 0020+00 1/0 0/0 0/0 .text daObjGake_MoveBGExecute__FP11daObjGake_c */
 static int daObjGake_MoveBGExecute(daObjGake_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D0C108-80D0C134 000568 002C+00 1/0 0/0 0/0 .text daObjGake_MoveBGDraw__FP11daObjGake_c */
 static int daObjGake_MoveBGDraw(daObjGake_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D0C148-80D0C168 -00001 0020+00 1/0 0/0 0/0 .data            daObjGake_METHODS */
 static actor_method_class daObjGake_METHODS = {
     (process_method_func)daObjGake_create1st,     (process_method_func)daObjGake_MoveBGDelete,
     (process_method_func)daObjGake_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daObjGake_MoveBGDraw,
 };
 
-/* 80D0C168-80D0C198 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Gake */
 extern actor_process_profile_definition g_profile_Obj_Gake = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp
index 5c11e3b788..ddc839117c 100644
--- a/src/d/actor/d_a_obj_thashi.cpp
+++ b/src/d/actor/d_a_obj_thashi.cpp
@@ -8,13 +8,7 @@
 #include "d/actor/d_a_obj_thashi.h"
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
-//
-// Forward References:
-//
 
-//
-// Declarations:
-//
 char* l_arcName = "S_thashi";
 
 static void dataStripping() {
@@ -29,8 +23,6 @@ static void dataStripping() {
     stripFloat(getStripInt());
 }
 
-/* 80D0C238-80D0C298 000078 0060+00 1/1 0/0 0/0 .text            initCcCylinder__13daObjTHASHI_cFv
- */
 void daObjTHASHI_c::initCcCylinder() {
     #if !DEBUG
     const
@@ -94,15 +86,12 @@ static void dataStripping2() {
     stripFloat(FB_HEIGHT);
 }
 
-/* 80D0C298-80D0C2B8 0000D8 0020+00 1/0 0/0 0/0 .text            daObjTHASHI_Create__FP10fopAc_ac_c
- */
 static int daObjTHASHI_Create(fopAc_ac_c* param_0) {
     daObjTHASHI_c* i_this = (daObjTHASHI_c*)param_0;
     fpc_ProcID id = fopAcM_GetID(param_0);
     return i_this->create();
 }
 
-/* 80D0C2B8-80D0C2DC 0000F8 0024+00 1/0 0/0 0/0 .text daObjTHASHI_Delete__FP13daObjTHASHI_c */
 static int daObjTHASHI_Delete(daObjTHASHI_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->MoveBGDelete();
@@ -115,7 +104,6 @@ static void strippedFunc3(cXyz* a, csXyz* b) {
     delete[] a;
 }
 
-/* 80D0C354-80D0C608 000194 02B4+00 2/1 0/0 0/0 .text            setBaseMtx__13daObjTHASHI_cFv */
 void daObjTHASHI_c::setBaseMtx() {
     switch (unk5A4) {
     case 0:
@@ -167,18 +155,14 @@ void daObjTHASHI_c::setBaseMtx() {
     }
 }
 
-/* 80D0C608-80D0C634 000448 002C+00 1/0 0/0 0/0 .text            daObjTHASHI_Draw__FP13daObjTHASHI_c
- */
 static int daObjTHASHI_Draw(daObjTHASHI_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D0C634-80D0C654 000474 0020+00 2/1 0/0 0/0 .text daObjTHASHI_Execute__FP13daObjTHASHI_c */
 static int daObjTHASHI_Execute(daObjTHASHI_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D0C654-80D0C8B4 000494 0260+00 1/0 0/0 0/0 .text            CreateHeap__13daObjTHASHI_cFv */
 int daObjTHASHI_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "S_thashi00.bmd");
     JUT_ASSERT(92, modelData != NULL);
@@ -220,7 +204,6 @@ int daObjTHASHI_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80D0C8B4-80D0CBC8 0006F4 0314+00 1/1 0/0 0/0 .text            create__13daObjTHASHI_cFv */
 int daObjTHASHI_c::create() {
     fopAcM_ct(this, daObjTHASHI_c);
     int phase_state = dComIfG_resLoad(&unk11A8, l_arcName);
@@ -249,12 +232,10 @@ int daObjTHASHI_c::create() {
     return phase_state;
 }
 
-/* 80D0CE68-80D0CE70 000CA8 0008+00 1/0 0/0 0/0 .text daObjTHASHI_IsDelete__FP13daObjTHASHI_c */
 static int daObjTHASHI_IsDelete(daObjTHASHI_c* param_0) {
     return TRUE;
 }
 
-/* 80D0D35C-80D0D37C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTHASHI_Method */
 static actor_method_class l_daObjTHASHI_Method = {
     (process_method_func)daObjTHASHI_Create,
     (process_method_func)daObjTHASHI_Delete,
@@ -263,7 +244,6 @@ static actor_method_class l_daObjTHASHI_Method = {
     (process_method_func)daObjTHASHI_Draw,
 };
 
-/* 80D0D37C-80D0D3AC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_THASHI */
 extern actor_process_profile_definition g_profile_Obj_THASHI = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
@@ -281,21 +261,17 @@ extern actor_process_profile_definition g_profile_Obj_THASHI = {
   fopAc_CULLBOX_CUSTOM_e, // cullType
 };
 
-/* 80D0CE70-80D0CEB4 000CB0 0044+00 1/0 0/0 0/0 .text            Create__13daObjTHASHI_cFv */
 int daObjTHASHI_c::Create() {
     fopAcM_setCullSizeBox(this, -1000.0f, -500.0f, -1000.0f, 1000.0f, 500.0f, 1000.0f);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D0CEB4-80D0CEE0 000CF4 002C+00 1/0 0/0 0/0 .text            Execute__13daObjTHASHI_cFPPA3_A4_f
- */
 int daObjTHASHI_c::Execute(Mtx** i_pMtx) {
     *i_pMtx = &mBgMtx;
     setBaseMtx();
     return TRUE;
 }
 
-/* 80D0CEE0-80D0D140 000D20 0260+00 3/0 0/0 0/0 .text            Draw__13daObjTHASHI_cFv */
 // needs to be inline for jump tables to be at end of data
 inline int daObjTHASHI_c::Draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
@@ -357,7 +333,6 @@ inline int daObjTHASHI_c::Draw() {
     return TRUE;
 }
 
-/* 80D0D140-80D0D174 000F80 0034+00 1/0 0/0 0/0 .text            Delete__13daObjTHASHI_cFv */
 // has to be inline to maintain function order with Draw as inline
 inline int daObjTHASHI_c::Delete() {
     dComIfG_resDelete(&unk11A8, l_arcName);
diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp
index 6043b9eeca..c181ec45be 100644
--- a/src/d/actor/d_a_obj_thdoor.cpp
+++ b/src/d/actor/d_a_obj_thdoor.cpp
@@ -24,8 +24,6 @@ void daObjThDoor_HIO_c::genMessage(JORMContext* ctx) {
 static daObjThDoor_HIO_c l_HIO;
 #endif
 
-/* 80D0D4F8-80D0D59C 000078 00A4+00 1/1 0/0 0/0 .text            checkPlayerPos__FP13daObjThDoor_c
- */
 static BOOL checkPlayerPos(daObjThDoor_c* i_this) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz acStack_28 = player->current.pos - i_this->current.pos;
@@ -40,8 +38,6 @@ static BOOL checkPlayerPos(daObjThDoor_c* i_this) {
     return rv;
 }
 
-/* 80D0D59C-80D0D618 00011C 007C+00 1/1 0/0 0/0 .text
- * doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void doorCoHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_ac_c* param_3,
                               dCcD_GObjInf* param_4) {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
@@ -54,13 +50,11 @@ static void doorCoHitCallBack(fopAc_ac_c* param_1, dCcD_GObjInf* param_2, fopAc_
     }
 }
 
-/* 80D0D618-80D0D654 000198 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjThDoor_cFv */
 void daObjThDoor_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D0D654-80D0D6B8 0001D4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjThDoor_cFv */
 void daObjThDoor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -68,16 +62,12 @@ void daObjThDoor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D0E678-80D0E67C -00001 0004+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "V_CTDoor";
 
-/* 80D0E67C-80D0E680 -00001 0004+00 0/1 0/0 0/0 .data            l_evName */
 static char* l_evName = "CHASE_AWAY_WOLF";
 
-/* 80D0E680-80D0E684 -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "thdoor";
 
-/* 80D0E684-80D0E6C8 00002C 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x10}, 0x19}}, // mObj
@@ -92,7 +82,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80D0D6B8-80D0D7F8 000238 0140+00 1/0 0/0 0/0 .text            Create__13daObjThDoor_cFv */
 int daObjThDoor_c::Create() {
     if (fopAcM_isSwitch(this, getSwbit())) {
         field_0x608 = 0;
@@ -123,7 +112,6 @@ int daObjThDoor_c::Create() {
     return 1;
 }
 
-/* 80D0D7F8-80D0D868 000378 0070+00 1/0 0/0 0/0 .text            CreateHeap__13daObjThDoor_cFv */
 int daObjThDoor_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(319, modelData != NULL);
@@ -131,7 +119,6 @@ int daObjThDoor_c::CreateHeap() {
     return mModel != NULL ? 1 : 0;
 }
 
-/* 80D0D868-80D0D8E8 0003E8 0080+00 1/1 0/0 0/0 .text            create1st__13daObjThDoor_cFv */
 int daObjThDoor_c::create1st() {
     int rv = dComIfG_resLoad(&mPhase, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -152,8 +139,6 @@ int daObjThDoor_c::create1st() {
     return rv;
 }
 
-/* 80D0D8E8-80D0D9B4 000468 00CC+00 1/0 0/0 0/0 .text            Execute__13daObjThDoor_cFPPA3_A4_f
- */
 int daObjThDoor_c::Execute(Mtx** i_mtx) {
     event_proc_call();
     current.angle.y = home.angle.y - field_0x608;
@@ -165,7 +150,6 @@ int daObjThDoor_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D0D9B4-80D0DAC8 000534 0114+00 1/1 0/0 0/0 .text            set_cyl__13daObjThDoor_cFv */
 void daObjThDoor_c::set_cyl() {
     cXyz acStack_28[2] = {cXyz(37.5f, 0.0f, 0.0f), cXyz(112.5f, 0.0f, 0.0f)};
     cXyz cStack_38;
@@ -179,7 +163,6 @@ void daObjThDoor_c::set_cyl() {
     }
 }
 
-/* 80D0DAC8-80D0DB90 000648 00C8+00 1/1 0/0 0/0 .text            action__13daObjThDoor_cFv */
 void daObjThDoor_c::action() {
     s16 sVar1 = field_0x608;
     set_cyl();
@@ -204,8 +187,6 @@ void daObjThDoor_c::action() {
     }
 }
 
-/* 80D0DB90-80D0DC4C 000710 00BC+00 1/1 0/0 0/0 .text            event_proc_call__13daObjThDoor_cFv
- */
 void daObjThDoor_c::event_proc_call() {
     static daObjThDoor_c::actionFunc l_func[4] = {
         &daObjThDoor_c::actionWait,
@@ -217,7 +198,6 @@ void daObjThDoor_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80D0DC4C-80D0DCC8 0007CC 007C+00 1/0 0/0 0/0 .text            actionWait__13daObjThDoor_cFv */
 void daObjThDoor_c::actionWait() {
     action();
     if (checkDemo() && checkArea()) {
@@ -227,8 +207,6 @@ void daObjThDoor_c::actionWait() {
     }
 }
 
-/* 80D0DCC8-80D0DD90 000848 00C8+00 1/0 0/0 0/0 .text            actionOrderEvent__13daObjThDoor_cFv
- */
 void daObjThDoor_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT);
@@ -243,7 +221,6 @@ void daObjThDoor_c::actionOrderEvent() {
     }
 }
 
-/* 80D0DD90-80D0DE30 000910 00A0+00 1/0 0/0 0/0 .text            actionEvent__13daObjThDoor_cFv */
 void daObjThDoor_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         setAction(ACTION_DEAD);
@@ -260,11 +237,9 @@ void daObjThDoor_c::actionEvent() {
     }
 }
 
-/* 80D0DE30-80D0DE34 0009B0 0004+00 1/0 0/0 0/0 .text            actionDead__13daObjThDoor_cFv */
 void daObjThDoor_c::actionDead() {}
 
 
-/* 80D0DE34-80D0E06C 0009B4 0238+00 2/2 0/0 0/0 .text            demoProc__13daObjThDoor_cFv */
 int daObjThDoor_c::demoProc() {
     static char* action_table[3] = {
         "WAIT",
@@ -324,7 +299,6 @@ int daObjThDoor_c::demoProc() {
     return 0;
 }
 
-/* 80D0E06C-80D0E150 000BEC 00E4+00 1/1 0/0 0/0 .text            checkArea__13daObjThDoor_cFv */
 BOOL daObjThDoor_c::checkArea() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz local_28(player->current.pos);
@@ -343,7 +317,6 @@ BOOL daObjThDoor_c::checkArea() {
     return 1;
 }
 
-/* 80D0E150-80D0E1F4 000CD0 00A4+00 1/0 0/0 0/0 .text            Draw__13daObjThDoor_cFv */
 int daObjThDoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -353,7 +326,6 @@ int daObjThDoor_c::Draw() {
     return 1;
 }
 
-/* 80D0E1F4-80D0E228 000D74 0034+00 1/0 0/0 0/0 .text            Delete__13daObjThDoor_cFv */
 int daObjThDoor_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
 
@@ -364,31 +336,23 @@ int daObjThDoor_c::Delete() {
     return 1;
 }
 
-/* 80D0E228-80D0E2E4 000DA8 00BC+00 1/0 0/0 0/0 .text daObjThDoor_create1st__FP13daObjThDoor_c */
 static int daObjThDoor_create1st(daObjThDoor_c* i_this) {
     fopAcM_ct(i_this, daObjThDoor_c);
     return i_this->create1st();
 }
 
-/* 80D0E520-80D0E540 0010A0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDelete__FP13daObjThDoor_c
- */
 static int daObjThDoor_MoveBGDelete(daObjThDoor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D0E540-80D0E560 0010C0 0020+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGExecute__FP13daObjThDoor_c
- */
 static int daObjThDoor_MoveBGExecute(daObjThDoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D0E560-80D0E58C 0010E0 002C+00 1/0 0/0 0/0 .text daObjThDoor_MoveBGDraw__FP13daObjThDoor_c */
 static int daObjThDoor_MoveBGDraw(daObjThDoor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80D0E734-80D0E754 -00001 0020+00 1/0 0/0 0/0 .data            daObjThDoor_METHODS */
 static actor_method_class daObjThDoor_METHODS = {
     (process_method_func)daObjThDoor_create1st,
     (process_method_func)daObjThDoor_MoveBGDelete,
@@ -397,7 +361,6 @@ static actor_method_class daObjThDoor_METHODS = {
     (process_method_func)daObjThDoor_MoveBGDraw,
 };
 
-/* 80D0E754-80D0E784 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TDoor */
 extern actor_process_profile_definition g_profile_Obj_TDoor = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp
index 08595e3965..8f3e95a855 100644
--- a/src/d/actor/d_a_obj_timeFire.cpp
+++ b/src/d/actor/d_a_obj_timeFire.cpp
@@ -7,20 +7,16 @@
 
 #include "d/actor/d_a_obj_timeFire.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 80D0E8EC-80D0E910 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daTimeFire_HIO_cFv */
 daTimeFire_HIO_c::daTimeFire_HIO_c() {
     field_0x4 = 20;
 }
 
-/* 80D0E958-80D0E9B0 000158 0058+00 1/1 0/0 0/0 .text            setBaseMtx__12daTimeFire_cFv */
 void daTimeFire_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80D0E9B0-80D0EACC 0001B0 011C+00 1/1 0/0 0/0 .text            create__12daTimeFire_cFv */
 int daTimeFire_c::create() {
     fopAcM_ct(this, daTimeFire_c);
     setBaseMtx();
@@ -44,7 +40,6 @@ int daTimeFire_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D0EACC-80D0EB40 0002CC 0074+00 1/1 0/0 0/0 .text            lightInit__12daTimeFire_cFv */
 void daTimeFire_c::lightInit() {
     field_0x594 = field_0x570;
     field_0x594.y += 10.0f;
@@ -56,17 +51,14 @@ void daTimeFire_c::lightInit() {
     mLightInfluence.mFluctuation = 1.0f;
 }
 
-/* 80D0EB40-80D0EB64 000340 0024+00 2/2 0/0 0/0 .text            setLight__12daTimeFire_cFv */
 void daTimeFire_c::setLight() {
     dKy_plight_set(&mLightInfluence);
 }
 
-/* 80D0EB64-80D0EB88 000364 0024+00 2/2 0/0 0/0 .text            cutLight__12daTimeFire_cFv */
 void daTimeFire_c::cutLight() {
     dKy_plight_cut(&mLightInfluence);
 }
 
-/* 80D0EB88-80D0ED68 000388 01E0+00 1/1 0/0 0/0 .text            Execute__12daTimeFire_cFv */
 int daTimeFire_c::Execute() {
     bool prevFireCheck = field_0x56c;
     field_0x56c = fireCheck(0);
@@ -89,7 +81,6 @@ int daTimeFire_c::Execute() {
     return 1;
 }
 
-/* 80D0ED68-80D0EF88 000568 0220+00 2/2 0/0 0/0 .text            fireCheck__12daTimeFire_cFUc */
 bool daTimeFire_c::fireCheck(u8 param_1) {
     bool inTime = false;
     BOOL isSw;
@@ -128,44 +119,33 @@ bool daTimeFire_c::fireCheck(u8 param_1) {
     return 0;
 }
 
-/* 80D0EF88-80D0EF90 000788 0008+00 1/1 0/0 0/0 .text            Draw__12daTimeFire_cFv */
 int daTimeFire_c::Draw() {
     return 1;
 }
 
-/* 80D0EF90-80D0EFB8 000790 0028+00 1/1 0/0 0/0 .text            Delete__12daTimeFire_cFv */
 int daTimeFire_c::Delete() {
     dKy_plight_cut(&mLightInfluence);
     return 1;
 }
 
-/* 80D0EFB8-80D0EFD8 0007B8 0020+00 1/0 0/0 0/0 .text            daTimeFire_Draw__FP12daTimeFire_c
- */
 static int daTimeFire_Draw(daTimeFire_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D0EFD8-80D0EFF8 0007D8 0020+00 1/0 0/0 0/0 .text daTimeFire_Execute__FP12daTimeFire_c */
 static int daTimeFire_Execute(daTimeFire_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D0EFF8-80D0F018 0007F8 0020+00 1/0 0/0 0/0 .text            daTimeFire_Delete__FP12daTimeFire_c
- */
 static int daTimeFire_Delete(daTimeFire_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D0F018-80D0F038 000818 0020+00 1/0 0/0 0/0 .text            daTimeFire_Create__FP10fopAc_ac_c
- */
 static int daTimeFire_Create(fopAc_ac_c* i_this) {
     return static_cast<daTimeFire_c*>(i_this)->create();
 }
 
-/* 80D0F17C-80D0F184 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daTimeFire_HIO_c l_HIO;
 
-/* 80D0F100-80D0F120 -00001 0020+00 1/0 0/0 0/0 .data            l_daTimeFire_Method */
 static actor_method_class l_daTimeFire_Method = {
     (process_method_func)daTimeFire_Create,
     (process_method_func)daTimeFire_Delete,
@@ -174,7 +154,6 @@ static actor_method_class l_daTimeFire_Method = {
     (process_method_func)daTimeFire_Draw,
 };
 
-/* 80D0F120-80D0F150 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TimeFire */
 extern actor_process_profile_definition g_profile_Obj_TimeFire = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp
index 32823eeddd..da06396c0a 100644
--- a/src/d/actor/d_a_obj_timer.cpp
+++ b/src/d/actor/d_a_obj_timer.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80485198-8048526C 000078 00D4+00 1/1 0/0 0/0 .text            _create__Q210daObjTimer5Act_cFv */
 int daObjTimer::Act_c::_create() {
     fopAcM_ct(this, Act_c);
     fopAcM_offDraw(this);
@@ -26,31 +25,26 @@ int daObjTimer::Act_c::_create() {
     }
 }
 
-/* 8048526C-80485274 00014C 0008+00 1/1 0/0 0/0 .text            _delete__Q210daObjTimer5Act_cFv */
 bool daObjTimer::Act_c::_delete() {
     return true;
 }
 
-/* 80485274-80485284 000154 0010+00 2/2 0/0 0/0 .text mode_wait_init__Q210daObjTimer5Act_cFv */
 void daObjTimer::Act_c::mode_wait_init() {
     field_0x56c = 0;
     field_0x568 = 0;
 }
 
-/* 80485284-804852E0 000164 005C+00 1/0 0/0 0/0 .text            mode_wait__Q210daObjTimer5Act_cFv */
 void daObjTimer::Act_c::mode_wait() {
     if (fopAcM_isSwitch(this, prm_get_swSave())) {
         mode_count_init();
     }
 }
 
-/* 804852E0-80485324 0001C0 0044+00 2/2 0/0 0/0 .text mode_count_init__Q210daObjTimer5Act_cFv */
 void daObjTimer::Act_c::mode_count_init() {
     field_0x56c = prm_get_time() * 15;
     field_0x568 = 1;
 }
 
-/* 80485324-804854BC 000204 0198+00 1/0 0/0 0/0 .text            mode_count__Q210daObjTimer5Act_cFv */
 void daObjTimer::Act_c::mode_count() {
     Z2SoundID soundID;
     
@@ -88,7 +82,6 @@ void daObjTimer::Act_c::mode_count() {
     }
 }
 
-/* 804854BC-804855A4 00039C 00E8+00 1/1 0/0 0/0 .text            _execute__Q210daObjTimer5Act_cFv */
 bool daObjTimer::Act_c::_execute() {
     static daObjTimer::Act_c::modeProc const mode_proc[2] = {
         &daObjTimer::Act_c::mode_wait,
@@ -144,7 +137,6 @@ namespace {
 
 };  // namespace daObjTimer
 
-/* 804856B8-804856E8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Timer */
 extern actor_process_profile_definition g_profile_Obj_Timer = {
   fpcLy_CURRENT_e,          // mLayerID
   10,                       // mListID
diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp
index 2175fba353..67c92ecd58 100644
--- a/src/d/actor/d_a_obj_tks.cpp
+++ b/src/d/actor/d_a_obj_tks.cpp
@@ -10,7 +10,6 @@
 #include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D12910-80D12940 000020 0030+00 1/2 0/0 0/0 .data            l_bckGetParamList */
 static daNpc_GetParam1 l_bckGetParamList[] = {
     {-1, 2},
     {7, 0},
@@ -20,17 +19,14 @@ static daNpc_GetParam1 l_bckGetParamList[] = {
     {9, 0},
 };
 
-/* 80D12940-80D12948 000050 0008+00 1/1 0/0 0/0 .data            l_btpGetParamList */
 static daNpc_GetParam1 l_btpGetParamList[] = {
     {20, 2},
 };
 
-/* 80D12948-80D12950 000058 0008+00 1/2 0/0 0/0 .data            l_btkGetParamList */
 static daNpc_GetParam1 l_btkGetParamList[] = {
     {17, 2},
 };
 
-/* 80D12950-80D12954 000060 0004+00 0/0 0/0 0/0 .data            l_evtNames */
 // unused
 static u8 l_evtNames[4] = {
     0x00,
@@ -39,16 +35,12 @@ static u8 l_evtNames[4] = {
     0x00,
 };
 
-/* 80D12954-80D12958 -00001 0004+00 6/9 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "TKS2";
 
-/* 80D12958-80D1295C -00001 0004+00 0/2 0/0 0/0 .data            l_myName */
 static char* l_myName = "ObjTks";
 
-/* 80D0F28C-80D0F3F0 0000EC 0164+00 1/1 0/0 0/0 .text            __ct__10daObjTks_cFv */
 daObjTks_c::daObjTks_c() {}
 
-/* 80D0F480-80D0F640 0002E0 01C0+00 1/0 0/0 0/0 .text            __dt__10daObjTks_cFv */
 daObjTks_c::~daObjTks_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 
@@ -61,7 +53,6 @@ daObjTks_c::~daObjTks_c() {
     }
 }
 
-/* 80D1273C-80D127BC 000000 0080+00 11/11 0/0 0/0 .rodata          m__16daObjTks_Param_c */
 const daObjTks_HIOParam daObjTks_Param_c::m = {
     90.0f,
     -3.0f,
@@ -103,7 +94,6 @@ const daObjTks_HIOParam daObjTks_Param_c::m = {
     0.8f,
 };
 
-/* 80D0F640-80D0F904 0004A0 02C4+00 1/1 0/0 0/0 .text            Create__10daObjTks_cFv */
 int daObjTks_c::Create() {
     fopAcM_ct(this, daObjTks_c);
 
@@ -156,7 +146,6 @@ int daObjTks_c::Create() {
     return phase_state;
 }
 
-/* 80D0F904-80D0FB78 000764 0274+00 1/1 0/0 0/0 .text            CreateHeap__10daObjTks_cFv */
 int daObjTks_c::CreateHeap() {
     J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xE);
     JUT_ASSERT(314, NULL != mdlData_p);
@@ -192,14 +181,12 @@ int daObjTks_c::CreateHeap() {
     return 1;
 }
 
-/* 80D0FD34-80D0FD68 000B94 0034+00 1/1 0/0 0/0 .text            Delete__10daObjTks_cFv */
 int daObjTks_c::Delete() {
     fpc_ProcID id = fopAcM_GetID(this);
     this->~daObjTks_c();
     return 1;
 }
 
-/* 80D0FD68-80D0FE60 000BC8 00F8+00 2/2 0/0 0/0 .text            Execute__10daObjTks_cFv */
 int daObjTks_c::Execute() {
     if (field_0xde0 == 0) {
         return 1;
@@ -216,7 +203,6 @@ int daObjTks_c::Execute() {
     return 1;
 }
 
-/* 80D0FE60-80D0FED0 000CC0 0070+00 1/1 0/0 0/0 .text            Draw__10daObjTks_cFv */
 int daObjTks_c::Draw() {
     if (field_0xde0 == 0) {
         return 1;
@@ -227,8 +213,6 @@ int daObjTks_c::Draw() {
     return 1;
 }
 
-/* 80D0FED0-80D10094 000D30 01C4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjTks_cFP8J3DJointP8J3DModel
- */
 int daObjTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     int jnt_no = i_joint->getJntNo();
 
@@ -266,14 +250,10 @@ int daObjTks_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
     return 1;
 }
 
-/* 80D10094-80D100B4 000EF4 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__10daObjTks_cFP10fopAc_ac_c               */
 int daObjTks_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daObjTks_c*)i_this)->CreateHeap();
 }
 
-/* 80D100B4-80D10100 000F14 004C+00 1/1 0/0 0/0 .text ctrlJointCallBack__10daObjTks_cFP8J3DJointi
- */
 int daObjTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     if (param_1 == NULL) {
         J3DModel* mdl_p = j3dSys.getModel();
@@ -287,7 +267,6 @@ int daObjTks_c::ctrlJointCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80D10100-80D10184 000F60 0084+00 1/0 0/0 0/0 .text            setMtx__10daObjTks_cFv */
 void daObjTks_c::setMtx() {
     J3DModel* mdl_p = mAnm_p->getModel();
 
@@ -305,8 +284,6 @@ void daObjTks_c::setMtx() {
     mAnm_p->modelCalc();
 }
 
-/* 80D10184-80D102D0 000FE4 014C+00 1/0 0/0 0/0 .text            setExpressionAnm__10daObjTks_cFib
- */
 bool daObjTks_c::setExpressionAnm(int i_anm, bool i_modify) {
     mAnmFlags &= ~ANM_EXPRESSION_FLAGS;
 
@@ -345,7 +322,6 @@ bool daObjTks_c::setExpressionAnm(int i_anm, bool i_modify) {
     }    
 }
 
-/* 80D102D0-80D103A4 001130 00D4+00 1/0 0/0 0/0 .text            setExpressionBtp__10daObjTks_cFi */
 bool daObjTks_c::setExpressionBtp(int i_anm) {
     J3DAnmTexPattern* btp_p = getTexPtrnAnmP(l_arcName, l_btpGetParamList[i_anm].fileIdx);
     int mode = l_btpGetParamList[i_anm].arcIdx;
@@ -368,7 +344,6 @@ bool daObjTks_c::setExpressionBtp(int i_anm) {
     }
 }
 
-/* 80D103A4-80D103E8 001204 0044+00 1/0 0/0 0/0 .text            setMotion__10daObjTks_cFifi */
 void daObjTks_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     s16 motion = i_motion;
     if (i_restart || mMotion != motion) {
@@ -381,7 +356,6 @@ void daObjTks_c::setMotion(int i_motion, f32 i_morf, BOOL i_restart) {
     }
 }
 
-/* 80D103E8-80D10578 001248 0190+00 1/1 0/0 0/0 .text            reset__10daObjTks_cFv */
 void daObjTks_c::reset() {
     initialize();
     mpMatAnm->initialize();
@@ -413,8 +387,6 @@ void daObjTks_c::reset() {
     mMotionMorfOverride = 0.0f;
 }
 
-/* 80D10578-80D10618 0013D8 00A0+00 1/1 0/0 0/0 .text
- * setAction__10daObjTks_cFM10daObjTks_cFPCvPv_v                */
 int daObjTks_c::setAction(void (daObjTks_c::*i_action)()) {
     field_0xdde = 3;
 
@@ -432,7 +404,6 @@ int daObjTks_c::setAction(void (daObjTks_c::*i_action)()) {
     return 1;
 }
 
-/* 80D10618-80D106C8 001478 00B0+00 3/0 0/0 0/0 .text            wait__10daObjTks_cFv */
 void daObjTks_c::wait() {
     switch (field_0xdde) {
     case 0:
@@ -451,7 +422,6 @@ void daObjTks_c::wait() {
     }
 }
 
-/* 80D106C8-80D106F4 001528 002C+00 1/0 0/0 0/0 .text            setExpression__10daObjTks_cFif */
 void daObjTks_c::setExpression(int i_expression, f32 i_morf) {
     if (i_expression >= 0 && i_expression < 2) {
         mExpression = i_expression;
@@ -495,7 +465,6 @@ void daObjTks_c::playMotion() {
     }
 }
 
-/* 80D11CB4-80D11E94 002B14 01E0+00 1/1 0/0 0/0 .text            lookat__10daObjTks_cFv */
 void daObjTks_c::lookat() {
     daPy_py_c* player = NULL;
     J3DModel* model_p = mAnm_p->getModel();
@@ -548,7 +517,6 @@ void daObjTks_c::lookat() {
     mLookat.calc(this, model_p->getBaseTRMtx(), sp24, var_r28, temp_r26, 0);
 }
 
-/* 80D106F4-80D10A80 001554 038C+00 1/0 0/0 0/0 .text            talk__10daObjTks_cFv */
 void daObjTks_c::talk() {
     switch (field_0xdde) {
     case 0:
@@ -601,7 +569,6 @@ void daObjTks_c::talk() {
     }
 }
 
-/* 80D10A80-80D11104 0018E0 0684+00 1/0 0/0 0/0 .text            demo__10daObjTks_cFv */
 void daObjTks_c::demo() {
     switch (field_0xdde) {
     case 0:
@@ -711,7 +678,6 @@ void daObjTks_c::demo() {
     }
 }
 
-/* 80D11104-80D11228 001F64 0124+00 1/0 0/0 0/0 .text            setMotionAnm__10daObjTks_cFif */
 void daObjTks_c::setMotionAnm(int i_anm, f32 i_morf) {
     if (i_anm < 2 || i_anm >= 6) {
         return;
@@ -732,7 +698,6 @@ void daObjTks_c::setMotionAnm(int i_anm, f32 i_morf) {
     }
 }
 
-/* 80D11228-80D115B8 002088 0390+00 3/0 0/0 0/0 .text            warp__10daObjTks_cFv */
 void daObjTks_c::warp() {
     switch (field_0xdde) {
     case 0:
@@ -800,32 +765,26 @@ void daObjTks_c::warp() {
     }
 }
 
-/* 80D115B8-80D115D8 002418 0020+00 1/0 0/0 0/0 .text            daObjTks_Create__FPv */
 static int daObjTks_Create(void* i_this) {
     return ((daObjTks_c*)i_this)->Create();
 }
 
-/* 80D115D8-80D115F8 002438 0020+00 1/0 0/0 0/0 .text            daObjTks_Delete__FPv */
 static int daObjTks_Delete(void* i_this) {
     return ((daObjTks_c*)i_this)->Delete();
 }
 
-/* 80D115F8-80D11618 002458 0020+00 1/0 0/0 0/0 .text            daObjTks_Execute__FPv */
 static int daObjTks_Execute(void* i_this) {
     return ((daObjTks_c*)i_this)->Execute();
 }
 
-/* 80D11618-80D11638 002478 0020+00 1/0 0/0 0/0 .text            daObjTks_Draw__FPv */
 static int daObjTks_Draw(void* i_this) {
     return ((daObjTks_c*)i_this)->Draw();
 }
 
-/* 80D11638-80D11640 002498 0008+00 1/0 0/0 0/0 .text            daObjTks_IsDelete__FPv */
 static int daObjTks_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D11670-80D116C8 0024D0 0058+00 1/0 0/0 0/0 .text            setParam__10daObjTks_cFv */
 void daObjTks_c::setParam() {
     calcSpringF(&field_0xdcc, 0.7f, &field_0xdd0);
     scale.setall(field_0xdcc);
@@ -836,7 +795,6 @@ void daObjTks_c::setParam() {
     #endif
 }
 
-/* 80D116C8-80D118E8 002528 0220+00 1/0 0/0 0/0 .text            main__10daObjTks_cFv */
 BOOL daObjTks_c::main() {
     if (mAction != NULL) {
         (this->*mAction)();
@@ -847,7 +805,6 @@ BOOL daObjTks_c::main() {
     return 1;
 }
 
-/* 80D118E8-80D119BC 002748 00D4+00 1/0 0/0 0/0 .text            ctrlBtk__10daObjTks_cFv */
 BOOL daObjTks_c::ctrlBtk() {
     if (mpMatAnm != NULL) {
         J3DAnmTextureSRTKey* btk_p = getTexSRTKeyAnmP(l_arcName, l_btkGetParamList[0].fileIdx);
@@ -864,7 +821,6 @@ BOOL daObjTks_c::ctrlBtk() {
     return FALSE;
 }
 
-/* 80D119BC-80D11CB4 00281C 02F8+00 1/0 0/0 0/0 .text            setAttnPos__10daObjTks_cFv */
 void daObjTks_c::setAttnPos() {
     if (mLookMode == LOOK_RESET) {
         for (int i = 0; i < 3; i++) {
@@ -910,18 +866,14 @@ void daObjTks_c::setAttnPos() {
     }
 }
 
-/* 80D11E94-80D11E9C 002CF4 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__10daObjTks_cFv */
 BOOL daObjTks_c::drawDbgInfo() {
     return false;
 }
 
-/* 80D11E9C-80D11EA0 002CFC 0004+00 1/0 0/0 0/0 .text            drawOtherMdls__10daObjTks_cFv */
 void daObjTks_c::drawOtherMdls() {}
 
-/* 80D12B04-80D12B08 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObjTks_Param_c l_HIO;
 
-/* 80D129BC-80D129DC -00001 0020+00 1/0 0/0 0/0 .data            daObjTks_MethodTable */
 static actor_method_class daObjTks_MethodTable = {
     (process_method_func)daObjTks_Create,
     (process_method_func)daObjTks_Delete,
@@ -930,7 +882,6 @@ static actor_method_class daObjTks_MethodTable = {
     (process_method_func)daObjTks_Draw,
 };
 
-/* 80D129DC-80D12A0C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_TKS */
 extern actor_process_profile_definition g_profile_OBJ_TKS = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp
index 15c43f671e..ee4c1e14a7 100644
--- a/src/d/actor/d_a_obj_tmoon.cpp
+++ b/src/d/actor/d_a_obj_tmoon.cpp
@@ -8,25 +8,21 @@
 #include "d/actor/d_a_obj_tmoon.h"
 #include "f_op/f_op_draw_tag.h"
 
-/* 80D12B98-80D12BB8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjTMoon_c*>(i_this)->CreateHeap();
 }
 
-/* 80D12BB8-80D12BF4 000098 003C+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjTMoon_cFv */
 void daObjTMoon_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D12BF4-80D12C48 0000D4 0054+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjTMoon_cFv */
 void daObjTMoon_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
 }
 
-/* 80D12C48-80D12C9C 000128 0054+00 1/1 0/0 0/0 .text            Create__12daObjTMoon_cFv */
 int daObjTMoon_c::Create() {
     field_0x574 = getEventBit1();
     field_0x576 = getEventBit2();
@@ -35,17 +31,14 @@ int daObjTMoon_c::Create() {
     return 1;
 }
 
-/* 80D12FA0-80D12FA4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "A_TMoon";
 
-/* 80D12C9C-80D12D0C 00017C 0070+00 1/1 0/0 0/0 .text            CreateHeap__12daObjTMoon_cFv */
 int daObjTMoon_c::CreateHeap() {
     mpModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes(l_arcName, 3), 0x80000,
                                       0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80D12D0C-80D12DC0 0001EC 00B4+00 1/1 0/0 0/0 .text            create__12daObjTMoon_cFv */
 int daObjTMoon_c::create() {
     fopAcM_ct(this, daObjTMoon_c);
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -59,7 +52,6 @@ int daObjTMoon_c::create() {
     return phase;
 }
 
-/* 80D12DC0-80D12EB4 0002A0 00F4+00 1/1 0/0 0/0 .text            execute__12daObjTMoon_cFv */
 int daObjTMoon_c::execute() {
     if ((field_0x576 != 0x3ff) &&
             (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x576])) ||
@@ -77,49 +69,38 @@ int daObjTMoon_c::execute() {
     return 1;
 }
 
-/* 80D12EB4-80D12EDC 000394 0028+00 1/1 0/0 0/0 .text            draw__12daObjTMoon_cFv */
 int daObjTMoon_c::draw() {
     g_env_light.moon_pos = current.pos;
     return 1;
 }
 
-/* 80D12EDC-80D12F10 0003BC 0034+00 1/1 0/0 0/0 .text            _delete__12daObjTMoon_cFv */
 int daObjTMoon_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D12F10-80D12F30 0003F0 0020+00 1/0 0/0 0/0 .text            daObjTMoon_Draw__FP12daObjTMoon_c
- */
 static int daObjTMoon_Draw(daObjTMoon_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D12F30-80D12F50 000410 0020+00 1/0 0/0 0/0 .text daObjTMoon_Execute__FP12daObjTMoon_c */
 static int daObjTMoon_Execute(daObjTMoon_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D12F50-80D12F70 000430 0020+00 1/0 0/0 0/0 .text            daObjTMoon_Delete__FP12daObjTMoon_c
- */
 static int daObjTMoon_Delete(daObjTMoon_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D12F70-80D12F90 000450 0020+00 1/0 0/0 0/0 .text            daObjTMoon_Create__FP12daObjTMoon_c
- */
 static int daObjTMoon_Create(daObjTMoon_c* i_this) {
     return i_this->create();
 }
 
-/* 80D12FA4-80D12FC4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTMoon_Method */
 static actor_method_class l_daObjTMoon_Method = {
     (process_method_func)daObjTMoon_Create,  (process_method_func)daObjTMoon_Delete,
     (process_method_func)daObjTMoon_Execute, (process_method_func)NULL,
     (process_method_func)daObjTMoon_Draw,
 };
 
-/* 80D12FC4-80D12FF4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TMoon */
 extern actor_process_profile_definition g_profile_Obj_TMoon = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp
index 7fc42d1844..475cfe423f 100644
--- a/src/d/actor/d_a_obj_toaru_maki.cpp
+++ b/src/d/actor/d_a_obj_toaru_maki.cpp
@@ -8,30 +8,23 @@
 #include "d/actor/d_a_obj_toaru_maki.h"
 #include "d/d_bg_w.h"
 
-/* 80D13078-80D13098 000078 0020+00 1/1 0/0 0/0 .text daObjToaruMaki_c_createHeap__FP10fopAc_ac_c
- */
 static int daObjToaruMaki_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjToaruMaki_c*>(i_this)->createHeap();
 }
 
-/* 80D13624-80D1362C -00001 0008+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {"T_Maki1", "T_Maki2"};
 
-/* 80D13098-80D130E0 000098 0048+00 2/2 0/0 0/0 .text            __ct__16daObjToaruMaki_cFv */
 daObjToaruMaki_c::daObjToaruMaki_c() {
     mpBgW = NULL;
     mpModel = NULL;
 }
 
-/* 80D130E0-80D1316C 0000E0 008C+00 1/0 0/0 0/0 .text            __dt__16daObjToaruMaki_cFv */
 daObjToaruMaki_c::~daObjToaruMaki_c() {
     dComIfG_resDelete(this, l_arcName[getNameArg_0()]);
 }
 
-/* 80D13604-80D1360C 000000 0008+00 1/1 0/0 0/0 .rodata          l_bmdIdx */
 static const u32 l_bmdIdx[2] = {4, 3};
 
-/* 80D1316C-80D132B4 00016C 0148+00 1/1 0/0 0/0 .text            createHeap__16daObjToaruMaki_cFv */
 int daObjToaruMaki_c::createHeap() {
     u32 nameArg = getNameArg_0();
     J3DModelData* a_model_data_p =
@@ -57,13 +50,11 @@ int daObjToaruMaki_c::createHeap() {
     return 1;
 }
 
-/* 80D1360C-80D13614 000008 0008+00 1/1 0/0 0/0 .rodata          l_heapSize */
 static const u32 l_heapSize[2] = {
     0x2000,
     0x0EB0,
 };
 
-/* 80D132B4-80D133C0 0002B4 010C+00 1/1 0/0 0/0 .text            create__16daObjToaruMaki_cFv */
 int daObjToaruMaki_c::create() {
     fopAcM_ct(this, daObjToaruMaki_c);
     u32 nameArg = getNameArg_0();
@@ -84,7 +75,6 @@ int daObjToaruMaki_c::create() {
     return rv;
 }
 
-/* 80D133C0-80D1343C 0003C0 007C+00 1/1 0/0 0/0 .text            Delete__16daObjToaruMaki_cFv */
 int daObjToaruMaki_c::Delete() {
     if (getNameArg_0() == 0 && mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
@@ -93,15 +83,12 @@ int daObjToaruMaki_c::Delete() {
     return 1;
 }
 
-/* 80D1343C-80D134A0 00043C 0064+00 2/2 0/0 0/0 .text            setModelMtx__16daObjToaruMaki_cFv
- */
 void daObjToaruMaki_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D134A0-80D13524 0004A0 0084+00 1/1 0/0 0/0 .text            draw__16daObjToaruMaki_cFv */
 int daObjToaruMaki_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -110,38 +97,29 @@ int daObjToaruMaki_c::draw() {
     return 1;
 }
 
-/* 80D13524-80D13548 000524 0024+00 1/1 0/0 0/0 .text            execute__16daObjToaruMaki_cFv */
 int daObjToaruMaki_c::execute() {
     setModelMtx();
     return 1;
 }
 
-/* 80D13548-80D1359C 000548 0054+00 1/0 0/0 0/0 .text daObjToaruMaki_create__FP16daObjToaruMaki_c
- */
 static int daObjToaruMaki_create(daObjToaruMaki_c* i_this) {
     // !@bug this setup is called twice. No adverse effects though.
     fopAcM_ct(i_this, daObjToaruMaki_c);
     return i_this->create();
 }
 
-/* 80D1359C-80D135BC 00059C 0020+00 1/0 0/0 0/0 .text daObjToaruMaki_Delete__FP16daObjToaruMaki_c
- */
 static int daObjToaruMaki_Delete(daObjToaruMaki_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D135BC-80D135DC 0005BC 0020+00 1/0 0/0 0/0 .text daObjToaruMaki_execute__FP16daObjToaruMaki_c
- */
 static int daObjToaruMaki_execute(daObjToaruMaki_c* i_this) {
     return i_this->execute();;
 }
 
-/* 80D135DC-80D135FC 0005DC 0020+00 1/0 0/0 0/0 .text daObjToaruMaki_draw__FP16daObjToaruMaki_c */
 static int daObjToaruMaki_draw(daObjToaruMaki_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D1362C-80D1364C -00001 0020+00 1/0 0/0 0/0 .data            daObjToaruMaki_METHODS */
 static actor_method_class daObjToaruMaki_METHODS = {
     (process_method_func)daObjToaruMaki_create,
     (process_method_func)daObjToaruMaki_Delete,
@@ -150,7 +128,6 @@ static actor_method_class daObjToaruMaki_METHODS = {
     (process_method_func)daObjToaruMaki_draw,
 };
 
-/* 80D1364C-80D1367C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ToaruMaki */
 extern actor_process_profile_definition g_profile_Obj_ToaruMaki = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp
index 021339eaeb..efda2a889a 100644
--- a/src/d/actor/d_a_obj_toby.cpp
+++ b/src/d/actor/d_a_obj_toby.cpp
@@ -18,7 +18,6 @@
 #include "d/d_debug_viewer.h"
 #endif
 
-/* 80D156D4-80D15794 000000 00C0+00 1/1 0/0 0/0 .data            r05yuka_image */
 static s8 r05yuka_image[192] = {
     0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -34,7 +33,6 @@ static s8 r05yuka_image[192] = {
     0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80D15794-80D15854 0000C0 00C0+00 1/1 0/0 0/0 .data            r11yuka_image */
 static s8 r11yuka_image[192] = {
     0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -52,8 +50,8 @@ static s8 r11yuka_image[192] = {
 
 class daObj_Toby_HIO_c : public JORReflexible{
 public:
-    /* 80D1378C */ daObj_Toby_HIO_c();
-    /* 80D15534 */ virtual ~daObj_Toby_HIO_c() {}
+    daObj_Toby_HIO_c();
+    virtual ~daObj_Toby_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -61,14 +59,11 @@ public:
     /* 0x8 */ f32 field_0x8;
 };
 
-/* 80D1378C-80D137B0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__16daObj_Toby_HIO_cFv */
 daObj_Toby_HIO_c::daObj_Toby_HIO_c() {
     field_0x4 = -1;
     field_0x8 = 1.0f;
 }
 
-/* 80D137B0-80D13870 000110 00C0+00 1/0 0/0 0/0 .text            daObj_Toby_Draw__FP14obj_toby_class
- */
 static int daObj_Toby_Draw(obj_toby_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mBase;
     g_env_light.settingTevStruct(0x10, &a_this->current.pos, &a_this->tevStr);
@@ -111,7 +106,6 @@ static int daObj_Toby_Draw(obj_toby_class* i_this) {
     return 1;
 }
 
-/* 80D13870-80D139FC 0001D0 018C+00 1/1 0/0 0/0 .text            s_bomb_sub__FPvPv */
 static void* s_bomb_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1)) {
         fopAc_ac_c* actor = (fopAc_ac_c*)param_1;
@@ -128,7 +122,6 @@ static void* s_bomb_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D13A38-80D13ABC 000398 0084+00 1/1 0/0 0/0 .text            shot_b_sub__FPvPv */
 static void* shot_b_sub(void* param_1, void* param_2) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (fopAcM_IsActor(param_1)) {
@@ -145,21 +138,16 @@ static void* shot_b_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D158F4-80D158F8 -00001 0004+00 2/2 0/0 0/0 .bss             None */
 /* 80D158F4 0001+00 data_80D158F4 @1009 */
 /* 80D158F5 0003+00 data_80D158F5 None */
 static u8 l_HIOInit;
 
-/* 80D15904-80D15910 000054 000C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Toby_HIO_c l_HIO;
 
-/* 80D15910-80D15914 000060 0004+00 1/2 0/0 0/0 .bss             hz_check_pos_x */
 static f32 hz_check_pos_x;
 
-/* 80D15914-80D15918 000064 0004+00 1/2 0/0 0/0 .bss             hz_check_pos_z */
 static f32 hz_check_pos_z;
 
-/* 80D13ABC-80D13B58 00041C 009C+00 1/1 0/0 0/0 .text            s_hz_sub__FPvPv */
 static void* s_hz_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1)) {
         if (fopAcM_GetName(param_1) == PROC_E_HZ) {
@@ -177,7 +165,6 @@ static void* s_hz_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D13B58-80D1417C 0004B8 0624+00 1/1 0/0 0/0 .text yuka_ground__FP14obj_toby_classP6yuka_s */
 static void yuka_ground(obj_toby_class* i_this, yuka_s* pYuka) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mBase;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -275,7 +262,6 @@ static void yuka_ground(obj_toby_class* i_this, yuka_s* pYuka) {
     }
 }
 
-/* 80D1417C-80D14264 000ADC 00E8+00 1/1 0/0 0/0 .text yuka_fly__FP14obj_toby_classP6yuka_s */
 static void yuka_fly(obj_toby_class* i_this, yuka_s* pYuka) {
     pYuka->mAngle += pYuka->mAngleSpeed;
     pYuka->mPos += pYuka->mSpeed;
@@ -289,7 +275,6 @@ static void yuka_fly(obj_toby_class* i_this, yuka_s* pYuka) {
     pYuka->mParticle = dComIfGp_particle_set(pYuka->mParticle, 0x8343, &pYuka->mPos, 0, 0);
 }
 
-/* 80D14264-80D14384 000BC4 0120+00 1/1 0/0 0/0 .text yuka_mtxset__FP14obj_toby_classP6yuka_s */
 static void yuka_mtxset(obj_toby_class* i_this, yuka_s* pYuka) {
     mDoMtx_stack_c::transS(pYuka->mPos.x, pYuka->mPos.y, pYuka->mPos.z);
     mDoMtx_stack_c::YrotM(pYuka->mAngle.y);
@@ -306,7 +291,6 @@ static void yuka_mtxset(obj_toby_class* i_this, yuka_s* pYuka) {
     }
 }
 
-/* 80D14384-80D14584 000CE4 0200+00 1/1 0/0 0/0 .text            yuka_control__FP14obj_toby_class */
 static void yuka_control(obj_toby_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     yuka_s* pYuka = i_this->mYukas;
@@ -340,7 +324,6 @@ static void yuka_control(obj_toby_class* i_this) {
     }
 }
 
-/* 80D14584-80D14810 000EE4 028C+00 1/1 0/0 0/0 .text            demo_camera__FP14obj_toby_class */
 static void demo_camera(obj_toby_class* i_this) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
@@ -393,7 +376,6 @@ static void demo_camera(obj_toby_class* i_this) {
     }
 }
 
-/* 80D14810-80D14884 001170 0074+00 2/1 0/0 0/0 .text daObj_Toby_Execute__FP14obj_toby_class */
 static int daObj_Toby_Execute(obj_toby_class* i_this) {
     i_this->field_0x580++;
     for (int i = 0; i < 2; i++) {
@@ -406,12 +388,10 @@ static int daObj_Toby_Execute(obj_toby_class* i_this) {
     return 1;
 }
 
-/* 80D14884-80D1488C 0011E4 0008+00 1/0 0/0 0/0 .text daObj_Toby_IsDelete__FP14obj_toby_class */
 static int daObj_Toby_IsDelete(obj_toby_class* param_0) {
     return 1;
 }
 
-/* 80D1488C-80D149DC 0011EC 0150+00 1/0 0/0 0/0 .text daObj_Toby_Delete__FP14obj_toby_class */
 static int daObj_Toby_Delete(obj_toby_class* i_this) {
     static int const l_bmdidx[2] = {4, 5};
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
@@ -442,7 +422,6 @@ static int daObj_Toby_Delete(obj_toby_class* i_this) {
     return 1;
 }
 
-/* 80D149DC-80D14BD4 00133C 01F8+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* a_this) {
     obj_toby_class* i_this = (obj_toby_class*)a_this;
     void* modelData;
@@ -491,8 +470,6 @@ static int useHeapInit(fopAc_ac_c* a_this) {
     return 1;
 }
 
-/* 80D14BD4-80D14CFC 001534 0128+00 1/1 0/0 0/0 .text            set_pos_check__FP14obj_toby_classi
- */
 static int set_pos_check(obj_toby_class* i_this, int param_2) {
     fopAc_ac_c* a_this = (fopAc_ac_c*)i_this;
     for (int i = 0; i < param_2; i++) {
@@ -514,8 +491,6 @@ static int set_pos_check(obj_toby_class* i_this, int param_2) {
     return 1;
 }
 
-/* 80D14CFC-80D154F4 00165C 07F8+00 1/0 0/0 0/0 .text            daObj_Toby_Create__FP10fopAc_ac_c
- */
 static int daObj_Toby_Create(fopAc_ac_c* a_this) {
     static u32 const l_bmdidx[2] = {4, 5};
 
@@ -722,7 +697,6 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) {
 
 AUDIO_INSTANCES;
 
-/* 80D15854-80D15874 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Toby_Method */
 static actor_method_class l_daObj_Toby_Method = {
     (process_method_func)daObj_Toby_Create,
     (process_method_func)daObj_Toby_Delete,
@@ -731,7 +705,6 @@ static actor_method_class l_daObj_Toby_Method = {
     (process_method_func)daObj_Toby_Draw,
 };
 
-/* 80D15874-80D158A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_TOBY */
 extern actor_process_profile_definition g_profile_OBJ_TOBY = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp
index 8b9607a8ea..f196f24419 100644
--- a/src/d/actor/d_a_obj_tobyhouse.cpp
+++ b/src/d/actor/d_a_obj_tobyhouse.cpp
@@ -40,27 +40,22 @@ void daObjTobyHouse_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80D1774C-80D17754 000000 0008+00 4/4 0/0 0/0 .rodata          l_bmd */
 static int const l_bmd[2] = {
     11, 5,
 };
 
-/* 80D17754-80D1775C 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzb */
 static int const l_dzb[2] = {
     15, 8,
 };
 
-/* 80D1775C-80D17764 000010 0008+00 0/1 0/0 0/0 .rodata          l_LodBmd */
 static int const l_LodBmd[2] = {
     12, 4,
 };
 
-/* 80D17764-80D17770 000018 000C+00 0/1 0/0 0/0 .rodata          l_bck */
 static int const l_bck[3] = {
     6, 7, 8,
 };
 
-/* 80D15AAC-80D15DA8 0000EC 02FC+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor)) {
         fopAc_ac_c* data = (fopAc_ac_c*)i_data;
@@ -85,7 +80,6 @@ static void* s_b_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80D15DA8-80D15E98 0003E8 00F0+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int i_jointNo) {
     if (i_jointNo == 0) {
         int jnt = i_joint->getJntNo();
@@ -106,7 +100,6 @@ static int nodeCallBack(J3DJoint* i_joint, int i_jointNo) {
     return 1;
 }
 
-/* 80D15E98-80D15F0C 0004D8 0074+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* param_1, int param_2) {
     if (param_1 != NULL) {
         ((daObjTobyHouse_c*)param_1)->sceneChange();
@@ -119,14 +112,11 @@ static int eventCallBack(void* param_1, int param_2) {
     return 1;
 }
 
-/* 80D15F0C-80D15F48 00054C 003C+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjTobyHouse_cFv
- */
 void daObjTobyHouse_c::initBaseMtx() {
     mModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D15F48-80D15FE0 000588 0098+00 2/2 0/0 0/0 .text            setBaseMtx__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x,
                            current.pos.y + mHeightOffset,
@@ -138,21 +128,17 @@ void daObjTobyHouse_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D17878-80D17880 -00001 0008+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "M_THouse",
     "U_THouse",
 };
-/* 80D17880-80D17884 -00001 0004+00 1/1 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name = "thouse";
 
-/* 80D17884-80D1788C -00001 0008+00 1/1 0/0 0/0 .data            l_event_name */
 static char* l_event_name[2] = {
     "TOBY_HOUSE_FIRE_TO_RAKKA",
     "TOBY_HOUSE_FIRE_TO_DESERT",
 };
 
-/* 80D15FE0-80D161A4 000620 01C4+00 1/0 0/0 0/0 .text            Create__16daObjTobyHouse_cFv */
 int daObjTobyHouse_c::Create() {
     fopAcM_setCullSizeFar(this, 10.0f);
     cXyz cStack_24(current.pos);
@@ -198,7 +184,6 @@ int daObjTobyHouse_c::Create() {
     return 1;
 }
 
-/* 80D161A4-80D163A8 0007E4 0204+00 1/0 0/0 0/0 .text            CreateHeap__16daObjTobyHouse_cFv */
 int daObjTobyHouse_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]);
     JUT_ASSERT(430, modelData != NULL);
@@ -231,7 +216,6 @@ int daObjTobyHouse_c::CreateHeap() {
     return 1;
 }
 
-/* 80D163F0-80D164C0 000A30 00D0+00 1/1 0/0 0/0 .text            create1st__16daObjTobyHouse_cFv */
 int daObjTobyHouse_c::create1st() {
     if (dComIfG_play_c::getLayerNo(0) == 13) {
         mType = TYPE_1;
@@ -260,7 +244,6 @@ int daObjTobyHouse_c::create1st() {
     return rv;
 }
 
-/* 80D164C0-80D16560 000B00 00A0+00 1/0 0/0 0/0 .text Execute__16daObjTobyHouse_cFPPA3_A4_f */
 int daObjTobyHouse_c::Execute(Mtx** i_mtx) {
     field_0x5c8++;
     action();
@@ -273,7 +256,6 @@ int daObjTobyHouse_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D16560-80D1661C 000BA0 00BC+00 1/1 0/0 0/0 .text            action__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::action() {
     static daObjTobyHouse_c::actionFunc l_func[4] = {
         &daObjTobyHouse_c::actionWait,
@@ -285,7 +267,6 @@ void daObjTobyHouse_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 80D1661C-80D166E0 000C5C 00C4+00 1/0 0/0 0/0 .text            actionWait__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::actionWait() {
     if (dComIfGs_isOneZoneSwitch(5, 0xffffffff)) {
         field_0x5e2 = 1;
@@ -305,7 +286,6 @@ void daObjTobyHouse_c::actionWait() {
     }
 }
 
-/* 80D166E0-80D167BC 000D20 00DC+00 1/0 0/0 0/0 .text actionOrderEvent__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         fpcM_Search(s_b_sub, this);
@@ -319,8 +299,6 @@ void daObjTobyHouse_c::actionOrderEvent() {
     }
 }
 
-/* 80D167BC-80D16860 000DFC 00A4+00 1/0 0/0 0/0 .text            actionEvent__16daObjTobyHouse_cFv
- */
 void daObjTobyHouse_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIds[mEventIdIdx])) {
         dComIfGp_event_reset();
@@ -333,10 +311,8 @@ void daObjTobyHouse_c::actionEvent() {
     }
 }
 
-/* 80D16860-80D16864 000EA0 0004+00 1/0 0/0 0/0 .text            actionDead__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::actionDead() {}
 
-/* 80D16864-80D171C0 000EA4 095C+00 2/1 0/0 0/0 .text            demoProc__16daObjTobyHouse_cFv */
 void daObjTobyHouse_c::demoProc() {
     static const char* action_table[7] = {
         "WAIT",
@@ -509,8 +485,6 @@ void daObjTobyHouse_c::demoProc() {
     }
 }
 
-/* 80D171C0-80D17230 001800 0070+00 2/2 0/0 0/0 .text            sceneChange__16daObjTobyHouse_cFv
- */
 void daObjTobyHouse_c::sceneChange() {
     u8 exitId = 3;
     switch (field_0x5e2) {
@@ -527,7 +501,6 @@ void daObjTobyHouse_c::sceneChange() {
     dStage_changeScene(exitId, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
 }
 
-/* 80D17230-80D17374 001870 0144+00 1/0 0/0 0/0 .text            Draw__16daObjTobyHouse_cFv */
 int daObjTobyHouse_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     if (checkLODModel()) {
@@ -555,8 +528,6 @@ int daObjTobyHouse_c::Draw() {
     return 1;
 }
 
-/* 80D17374-80D174F8 0019B4 0184+00 1/1 0/0 0/0 .text            checkLODModel__16daObjTobyHouse_cFv
- */
 BOOL daObjTobyHouse_c::checkLODModel() {
     if (dComIfGp_event_runCheck()) {
         return FALSE;
@@ -574,7 +545,6 @@ BOOL daObjTobyHouse_c::checkLODModel() {
     return FALSE;
 }
 
-/* 80D174F8-80D17618 001B38 0120+00 1/0 0/0 0/0 .text            Delete__16daObjTobyHouse_cFv */
 int daObjTobyHouse_c::Delete() {
     if (field_0x5f0 != NULL) {
         field_0x5f0->becomeInvalidEmitter();
@@ -608,32 +578,23 @@ int daObjTobyHouse_c::Delete() {
     return 1;
 }
 
-/* 80D17618-80D17678 001C58 0060+00 1/0 0/0 0/0 .text
- * daObjTobyHouse_create1st__FP16daObjTobyHouse_c               */
 static int daObjTobyHouse_create1st(daObjTobyHouse_c* i_this) {
     fopAcM_ct(i_this, daObjTobyHouse_c);
     return i_this->create1st();
 }
 
-/* 80D17678-80D17698 001CB8 0020+00 1/0 0/0 0/0 .text
- * daObjTobyHouse_MoveBGDelete__FP16daObjTobyHouse_c            */
 static int daObjTobyHouse_MoveBGDelete(daObjTobyHouse_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D17698-80D176B8 001CD8 0020+00 1/0 0/0 0/0 .text
- * daObjTobyHouse_MoveBGExecute__FP16daObjTobyHouse_c           */
 static int daObjTobyHouse_MoveBGExecute(daObjTobyHouse_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D176B8-80D176E4 001CF8 002C+00 1/0 0/0 0/0 .text
- * daObjTobyHouse_MoveBGDraw__FP16daObjTobyHouse_c              */
 static int daObjTobyHouse_MoveBGDraw(daObjTobyHouse_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D17930-80D17950 -00001 0020+00 1/0 0/0 0/0 .data            daObjTobyHouse_METHODS */
 static actor_method_class daObjTobyHouse_METHODS = {
     (process_method_func)daObjTobyHouse_create1st,
     (process_method_func)daObjTobyHouse_MoveBGDelete,
@@ -642,7 +603,6 @@ static actor_method_class daObjTobyHouse_METHODS = {
     (process_method_func)daObjTobyHouse_MoveBGDraw,
 };
 
-/* 80D17950-80D17980 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TobyHouse */
 extern actor_process_profile_definition g_profile_Obj_TobyHouse = {
   fpcLy_CURRENT_e,          // mLayerID
   3,                        // mListID
diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp
index 69b6dd1158..0c12d3f554 100644
--- a/src/d/actor/d_a_obj_togeTrap.cpp
+++ b/src/d/actor/d_a_obj_togeTrap.cpp
@@ -10,7 +10,6 @@
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D17B6C-80D17BD0 0000EC 0064+00 1/1 0/0 0/0 .text            __ct__16daTogeTrap_HIO_cFv */
 daTogeTrap_HIO_c::daTogeTrap_HIO_c() {
     mInitialSpeed = 0.0f;
     mMaxSpeed = 250.0f;
@@ -21,10 +20,8 @@ daTogeTrap_HIO_c::daTogeTrap_HIO_c() {
     mRange = 500.0f;
 }
 
-/* 80D190B4-80D190D4 000014 0020+00 8/8 0/0 0/0 .bss             l_HIO */
 static daTogeTrap_HIO_c l_HIO;
 
-/* 80D18F30-80D18F74 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daTogeTrap_c */
 const dCcD_SrcGObjInf daTogeTrap_c::mCcDObjInfo = {
     {0, {{2, 1, 0x1D}, {0x480028, 0x11}, {0}}},
     {dCcD_SE_SWORD, 0, 0, 0, 0},
@@ -32,7 +29,6 @@ const dCcD_SrcGObjInf daTogeTrap_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80CA9C38-80CA9C7C 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__11daOnsTaru_c */
 dCcD_SrcCyl daTogeTrap_c::mCcDCyl = {
     daTogeTrap_c::mCcDObjInfo,
     {
@@ -42,7 +38,6 @@ dCcD_SrcCyl daTogeTrap_c::mCcDCyl = {
     }  // mCyl
 };
 
-/* 80D17C74-80D17D5C 0001F4 00E8+00 2/2 0/0 0/0 .text            setBaseMtx__12daTogeTrap_cFv */
 void daTogeTrap_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -54,7 +49,6 @@ void daTogeTrap_c::setBaseMtx() {
     mWolfEyeModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D17D5C-80D17E14 0002DC 00B8+00 1/0 0/0 0/0 .text            CreateHeap__12daTogeTrap_cFv */
 int daTogeTrap_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_Toge", 4);
     JUT_ASSERT(251, modelData != NULL);
@@ -72,7 +66,6 @@ int daTogeTrap_c::CreateHeap() {
     return 1;
 }
 
-/* 80D17E14-80D18008 000394 01F4+00 1/1 0/0 0/0 .text            create__12daTogeTrap_cFv */
 int daTogeTrap_c::create() {
     fopAcM_ct(this, daTogeTrap_c);
     mSwBit = getSwBit();
@@ -110,16 +103,12 @@ int daTogeTrap_c::create() {
     return phase;
 }
 
-/* 80D18244-80D1825C 0007C4 0018+00 1/1 0/0 0/0 .text
- * rideCallBack__12daTogeTrap_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c */
 void daTogeTrap_c::rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) {
     if (fopAcM_GetName(param_3) == PROC_Obj_Movebox) {
         ((daTogeTrap_c*)param_2)->field_0xadd = 1;
     }
 }
 
-/* 80D1825C-80D182C8 0007DC 006C+00 1/0 0/0 0/0 .text            Execute__12daTogeTrap_cFPPA3_A4_f
- */
 int daTogeTrap_c::Execute(Mtx** i_mtx) {
     moveMain();
     *i_mtx = &mModel->getBaseTRMtx();
@@ -131,7 +120,6 @@ int daTogeTrap_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D182C8-80D185DC 000848 0314+00 1/1 0/0 0/0 .text            moveMain__12daTogeTrap_cFv */
 void daTogeTrap_c::moveMain() {
     static daTogeTrap_c::modeFunc mode_proc[4] = {
         &daTogeTrap_c::modeWait,
@@ -184,8 +172,6 @@ void daTogeTrap_c::moveMain() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80D185DC-80D186B0 000B5C 00D4+00 2/2 0/0 0/0 .text            playerAreaCheck__12daTogeTrap_cFv
- */
 BOOL daTogeTrap_c::playerAreaCheck() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     cXyz local_48 = current.pos - player->current.pos;
@@ -200,16 +186,12 @@ BOOL daTogeTrap_c::playerAreaCheck() {
     return rv;
 }
 
-/* 80D186B0-80D186BC 000C30 000C+00 3/3 0/0 0/0 .text            init_modeWait__12daTogeTrap_cFv */
 void daTogeTrap_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80D186BC-80D186C0 000C3C 0004+00 1/0 0/0 0/0 .text            modeWait__12daTogeTrap_cFv */
 void daTogeTrap_c::modeWait() {}
 
-/* 80D186C0-80D18784 000C40 00C4+00 1/1 0/0 0/0 .text            init_modeMoveUp__12daTogeTrap_cFv
- */
 void daTogeTrap_c::init_modeMoveUp() {
     fopAcM_SetSpeedF(this, l_HIO.mInitialSpeed);
     mDoAud_seStart(Z2SE_OBJ_SWD_FENCE_POP, &home.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -220,7 +202,6 @@ void daTogeTrap_c::init_modeMoveUp() {
     this->mMode = MODE_MOVE_UP;
 }
 
-/* 80D18784-80D188C0 000D04 013C+00 1/0 0/0 0/0 .text            modeMoveUp__12daTogeTrap_cFv */
 void daTogeTrap_c::modeMoveUp() {
     cLib_chaseF(&speedF, l_HIO.mMaxSpeed, l_HIO.mMaxSpeed / 30.0f);
     if (cLib_addCalc(&current.pos.y, home.pos.y, 1.0f, fopAcM_GetSpeedF(this), 1.0f) == 0.0f) {
@@ -236,14 +217,11 @@ void daTogeTrap_c::modeMoveUp() {
     }
 }
 
-/* 80D188C0-80D188DC 000E40 001C+00 1/1 0/0 0/0 .text            init_modeMoveDown__12daTogeTrap_cFv
- */
 void daTogeTrap_c::init_modeMoveDown() {
     fopAcM_SetSpeedF(this, l_HIO.mInitialDownSpeed);
     this->mMode = MODE_MOVE_DOWN;
 }
 
-/* 80D188DC-80D18994 000E5C 00B8+00 1/0 0/0 0/0 .text            modeMoveDown__12daTogeTrap_cFv */
 void daTogeTrap_c::modeMoveDown() {
     cLib_chaseF(&speedF, l_HIO.mMaxDownSpeed, l_HIO.mMaxDownSpeed / 30.0f);
     if (cLib_addCalc(&current.pos.y, home.pos.y - 300.0f, 1.0f, fopAcM_GetSpeedF(this), 1.0f) == 0.0f) {
@@ -255,7 +233,6 @@ void daTogeTrap_c::modeMoveDown() {
     }
 }
 
-/* 80D18994-80D18A5C 000F14 00C8+00 1/1 0/0 0/0 .text            init_modeBreak__12daTogeTrap_cFv */
 void daTogeTrap_c::init_modeBreak() {
     daPy_py_c* player = dComIfGp_getLinkPlayer();
     if (player->getSpinnerRideSpeed() >= l_HIO.mSpinnerSpeed && mpBgW != NULL) {
@@ -265,7 +242,6 @@ void daTogeTrap_c::init_modeBreak() {
     this->mMode = MODE_BREAK;
 }
 
-/* 80D18A5C-80D18BEC 000FDC 0190+00 1/0 0/0 0/0 .text            modeBreak__12daTogeTrap_cFv */
 void daTogeTrap_c::modeBreak() {
     dComIfGp_particle_set(0x8ada, &current.pos, &shape_angle, 0);
     dComIfGp_particle_set(0x8adb, &current.pos, &shape_angle, 0);
@@ -277,7 +253,6 @@ void daTogeTrap_c::modeBreak() {
     fopAcM_delete(this);
 }
 
-/* 80D18BEC-80D18CA4 00116C 00B8+00 1/0 0/0 0/0 .text            Draw__12daTogeTrap_cFv */
 int daTogeTrap_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -290,7 +265,6 @@ int daTogeTrap_c::Draw() {
     return 1;
 }
 
-/* 80D18CA4-80D18CD4 001224 0030+00 1/0 0/0 0/0 .text            Delete__12daTogeTrap_cFv */
 int daTogeTrap_c::Delete() {
     dComIfG_resDelete(&mPhase, "P_Toge");
 
@@ -301,30 +275,22 @@ int daTogeTrap_c::Delete() {
     return 1;
 }
 
-/* 80D18CD4-80D18D00 001254 002C+00 1/0 0/0 0/0 .text            daTogeTrap_Draw__FP12daTogeTrap_c
- */
 static int daTogeTrap_Draw(daTogeTrap_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D18D00-80D18D20 001280 0020+00 1/0 0/0 0/0 .text daTogeTrap_Execute__FP12daTogeTrap_c */
 static int daTogeTrap_Execute(daTogeTrap_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D18D20-80D18D40 0012A0 0020+00 1/0 0/0 0/0 .text            daTogeTrap_Delete__FP12daTogeTrap_c
- */
 static int daTogeTrap_Delete(daTogeTrap_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D18D40-80D18D60 0012C0 0020+00 1/0 0/0 0/0 .text            daTogeTrap_Create__FP10fopAc_ac_c
- */
 static int daTogeTrap_Create(fopAc_ac_c* i_this) {
     return ((daTogeTrap_c*)i_this)->create();
 }
 
-/* 80D18FD4-80D18FF4 -00001 0020+00 1/0 0/0 0/0 .data            l_daTogeTrap_Method */
 static actor_method_class l_daTogeTrap_Method = {
     (process_method_func)daTogeTrap_Create,
     (process_method_func)daTogeTrap_Delete,
@@ -333,7 +299,6 @@ static actor_method_class l_daTogeTrap_Method = {
     (process_method_func)daTogeTrap_Draw,
 };
 
-/* 80D18FF4-80D19024 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TogeTrap */
 extern actor_process_profile_definition g_profile_Obj_TogeTrap = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp
index c89c57a537..8c45cd2a45 100644
--- a/src/d/actor/d_a_obj_tombo.cpp
+++ b/src/d/actor/d_a_obj_tombo.cpp
@@ -16,8 +16,8 @@
 
 class daObj_TomHIO_c : public JORReflexible {
 public:
-    /* 80D191CC */ daObj_TomHIO_c();
-    /* 80D1B618 */ virtual ~daObj_TomHIO_c() {}
+    daObj_TomHIO_c();
+    virtual ~daObj_TomHIO_c() {}
 
     #ifdef DEBUG
     void genMessage(JORMContext* context) {
@@ -41,7 +41,6 @@ public:
     /* 0x10 */ f32 mBtkSpeed;
 };
 
-/* 80D191CC-80D19200 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__14daObj_TomHIO_cFv */
 daObj_TomHIO_c::daObj_TomHIO_c() {
     mId = -1;
     mMaleModelScale = 0.9f;
@@ -49,13 +48,10 @@ daObj_TomHIO_c::daObj_TomHIO_c() {
     mBtkSpeed = 1.0f;
 }
 
-/* ############################################################################################## */
-/* 80D1B6E0-80D1B6E4 000008 0002+02 1/2 0/0 0/0 .rodata          l_tom_itemno */
 static u8 const l_tom_itemno[2] = {
     fpcNm_ITEM_M_DRAGONFLY, fpcNm_ITEM_F_DRAGONFLY,
 };
 
-/* 80D19200-80D1926C 000120 006C+00 1/1 0/0 0/0 .text            InitCcSph__12daObjTOMBO_cFv */
 void daObjTOMBO_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -76,19 +72,16 @@ void daObjTOMBO_c::InitCcSph() {
     mSph.OnTgNoHitMark();
 }
 
-/* 80D1926C-80D192C4 00018C 0058+00 1/1 0/0 0/0 .text            SetCcSph__12daObjTOMBO_cFv */
 void daObjTOMBO_c::SetCcSph() {
     mSph.SetC(current.pos);
     mSph.SetR(20.0f);
     dComIfG_Ccsp()->Set(&mSph);
 }
 
-/* 80D192C4-80D192E4 0001E4 0020+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     return ((daObjTOMBO_c*)i_this)->CreateHeap();
 }
 
-/* 80D192E4-80D195CC 000204 02E8+00 1/1 0/0 0/0 .text            CreateHeap__12daObjTOMBO_cFv */
 int daObjTOMBO_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Tombo", 9);
     JUT_ASSERT(259, modelData != NULL);
@@ -131,20 +124,15 @@ int daObjTOMBO_c::CreateHeap() {
     return 1;
 }
 
-/* 80D19614-80D19634 000534 0020+00 1/0 0/0 0/0 .text            daObjTOMBO_Create__FP10fopAc_ac_c
- */
 static int daObjTOMBO_Create(fopAc_ac_c* i_this) {
     return ((daObjTOMBO_c*)i_this)->create();
 }
 
-/* 80D19634-80D19658 000554 0024+00 1/0 0/0 0/0 .text            daObjTOMBO_Delete__FP12daObjTOMBO_c
- */
 static int daObjTOMBO_Delete(daObjTOMBO_c* i_this) {
     i_this->Delete();
     return 1;
 }
 
-/* 80D19658-80D19744 000578 00EC+00 2/2 0/0 0/0 .text            WaitAction__12daObjTOMBO_cFv */
 void daObjTOMBO_c::WaitAction() {
     cXyz cStack_28;
     switch (field_0x712) {
@@ -168,7 +156,6 @@ void daObjTOMBO_c::WaitAction() {
     SpeedSet();
 }
 
-/* 80D19744-80D19834 000664 00F0+00 2/2 0/0 0/0 .text            SpeedSet__12daObjTOMBO_cFv */
 void daObjTOMBO_c::SpeedSet() {
     current.pos.y += speed.y;
     cXyz cStack_1c(0.0f, 0.0f, speedF);
@@ -183,7 +170,6 @@ void daObjTOMBO_c::SpeedSet() {
     shape_angle.y = current.angle.y;
 }
 
-/* 80D19834-80D1997C 000754 0148+00 1/1 0/0 0/0 .text            CheckWater__12daObjTOMBO_cFv */
 bool daObjTOMBO_c::CheckWater() {
     dBgS_ObjGndChk_All adStack_6c;
     cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z);
@@ -197,7 +183,6 @@ bool daObjTOMBO_c::CheckWater() {
     return FALSE;
 }
 
-/* 80D199F4-80D19B48 000914 0154+00 1/1 0/0 0/0 .text            CheckGround__12daObjTOMBO_cFv */
 void daObjTOMBO_c::CheckGround() {
     dBgS_ObjGndChk_All adStack_6c;
     cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z);
@@ -216,7 +201,6 @@ void daObjTOMBO_c::CheckGround() {
     }
 }
 
-/* 80D19B48-80D19C34 000A68 00EC+00 1/1 0/0 0/0 .text            CheckWall__12daObjTOMBO_cFv */
 void daObjTOMBO_c::CheckWall() {
     dBgS_LinChk linChk;
     cXyz cStack_8c(0.0f, 0.0f, 200.0f);
@@ -231,7 +215,6 @@ void daObjTOMBO_c::CheckWall() {
     }
 }
 
-/* 80D19C34-80D19E48 000B54 0214+00 1/1 0/0 0/0 .text            SearchLink__12daObjTOMBO_cFv */
 void daObjTOMBO_c::SearchLink() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& playerPos = fopAcM_GetPosition(player);
@@ -246,7 +229,6 @@ void daObjTOMBO_c::SearchLink() {
     }
 }
 
-/* 80D19E48-80D1A138 000D68 02F0+00 2/2 0/0 0/0 .text            LinkAction__12daObjTOMBO_cFv */
 void daObjTOMBO_c::LinkAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     fopAcM_GetPosition(player);
@@ -293,7 +275,6 @@ void daObjTOMBO_c::LinkAction() {
     field_0x73c = cStack_28;
 }
 
-/* 80D1A138-80D1A280 001058 0148+00 2/2 0/0 0/0 .text            MoveAction__12daObjTOMBO_cFv */
 void daObjTOMBO_c::MoveAction() {
     cXyz local_1c;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -325,7 +306,6 @@ void daObjTOMBO_c::MoveAction() {
     }
 }
 
-/* 80D1A280-80D1A3EC 0011A0 016C+00 1/1 0/0 0/0 .text            Action__12daObjTOMBO_cFv */
 void daObjTOMBO_c::Action() {
     if (fopAcM_checkHookCarryNow(this)) {
         if (CheckWater()) {
@@ -360,7 +340,6 @@ void daObjTOMBO_c::Action() {
     Insect_GetDemoMain();
 }
 
-/* 80D1A3EC-80D1A514 00130C 0128+00 1/1 0/0 0/0 .text            ShopAction__12daObjTOMBO_cFv */
 void daObjTOMBO_c::ShopAction() {
     for (int i = 0; i < 3; i++) {
         field_0x714[i]--;
@@ -386,7 +365,6 @@ void daObjTOMBO_c::ShopAction() {
     }
 }
 
-/* 80D1A514-80D1A524 001434 0010+00 1/0 0/0 0/0 .text            Insect_Release__12daObjTOMBO_cFv */
 void daObjTOMBO_c::Insect_Release() {
     field_0x56c = 1;
     mAction = ACTION_MOVE;
@@ -399,7 +377,6 @@ static f32 dummyLiteral4() { return 0.5f; }
 static f32 dummyLiteral5() { return 0.7f; }
 static f32 dummyLiteral6() { return 0.25f; }
 
-/* 80D1A524-80D1A648 001444 0124+00 1/1 0/0 0/0 .text            ParticleSet__12daObjTOMBO_cFv */
 void daObjTOMBO_c::ParticleSet() {
     if (field_0x750 > field_0x754) {
         cLib_addCalc2(&mParticleScale, 0.0f, 1.0f, 1.0f);
@@ -415,7 +392,6 @@ void daObjTOMBO_c::ParticleSet() {
     }
 }
 
-/* 80D1A648-80D1A8BC 001568 0274+00 1/1 0/0 0/0 .text            BoomChk__12daObjTOMBO_cFv */
 void daObjTOMBO_c::BoomChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (mIsHitByBoomerang) {
@@ -457,13 +433,10 @@ void daObjTOMBO_c::BoomChk() {
     }
 }
 
-/* 80D1B8F0-80D1B8F4 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool l_HIOInit;
 
-/* 80D1B900-80D1B914 000018 0014+00 3/3 0/0 0/0 .bss             l_HIO */
 static daObj_TomHIO_c l_HIO;
 
-/* 80D1A904-80D1AB20 001824 021C+00 1/1 0/0 0/0 .text            Execute__12daObjTOMBO_cFv */
 int daObjTOMBO_c::Execute() {
     if (ChkGetDemo()) {
         field_0x750 = field_0x754 + 10000.0f;
@@ -502,7 +475,6 @@ int daObjTOMBO_c::Execute() {
     return 1;
 }
 
-/* 80D1AB20-80D1AC84 001A40 0164+00 1/1 0/0 0/0 .text            ObjHit__12daObjTOMBO_cFv */
 void daObjTOMBO_c::ObjHit() {
     if (mSph.ChkTgHit()) {
         cCcD_Obj* tgHitObj = mSph.GetTgHitObj();
@@ -529,7 +501,6 @@ void daObjTOMBO_c::ObjHit() {
     }
 }
 
-/* 80D1AC84-80D1AE00 001BA4 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__12daObjTOMBO_cFv */
 void daObjTOMBO_c::Z_BufferChk() {
     cXyz local_5c;
     cXyz cStack_68;
@@ -559,7 +530,6 @@ void daObjTOMBO_c::Z_BufferChk() {
         ((near + ((far * near) / local_5c.z)) / (far - near) + 1.0f) * 16777215.0f;
 }
 
-/* 80D1AE00-80D1AE68 001D20 0068+00 1/1 0/0 0/0 .text            Delete__12daObjTOMBO_cFv */
 int daObjTOMBO_c::Delete() {
     dComIfG_resDelete(&mPhase, "Tombo");
     if (mIsHIOOwner) {
@@ -572,7 +542,6 @@ int daObjTOMBO_c::Delete() {
     return 1;
 }
 
-/* 80D1AE68-80D1AEC8 001D88 0060+00 1/1 0/0 0/0 .text            setBaseMtx__12daObjTOMBO_cFv */
 void daObjTOMBO_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -598,24 +567,19 @@ inline int daObjTOMBO_c::Draw() {
     return 1;
 }
 
-/* 80D1AEC8-80D1AFA8 001DE8 00E0+00 1/0 0/0 0/0 .text            daObjTOMBO_Draw__FP12daObjTOMBO_c
- */
 static int daObjTOMBO_Draw(daObjTOMBO_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D1AFA8-80D1AFC8 001EC8 0020+00 2/1 0/0 0/0 .text daObjTOMBO_Execute__FP12daObjTOMBO_c */
 static int daObjTOMBO_Execute(daObjTOMBO_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D1B7E0-80D1B7E4 000108 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 static u16 const l_musiya_num[2] = {
     0x01A3, /* dSv_event_flag_c::F_0419 - Misc. - Dragonfly (M) */
     0x01A4, /* dSv_event_flag_c::F_0420 - Misc. - Dragonfly (F) */
 };
 
-/* 80D1AFC8-80D1B174 001EE8 01AC+00 1/1 0/0 0/0 .text            CreateChk__12daObjTOMBO_cFv */
 bool daObjTOMBO_c::CreateChk() {
     u8 uVar4 = (fopAcM_GetParam(this) & 0xf00) >> 8;
     if (uVar4 == 0xf) {
@@ -646,7 +610,6 @@ bool daObjTOMBO_c::CreateChk() {
     return 1;
 }
 
-/* 80D1B174-80D1B510 002094 039C+00 1/1 0/0 0/0 .text            create__12daObjTOMBO_cFv */
 int daObjTOMBO_c::create() {
     fopAcM_ct(this, daObjTOMBO_c);
     int phase = dComIfG_resLoad(&mPhase, "Tombo");
@@ -708,12 +671,10 @@ int daObjTOMBO_c::create() {
     return phase;
 }
 
-/* 80D1B610-80D1B618 002530 0008+00 1/0 0/0 0/0 .text daObjTOMBO_IsDelete__FP12daObjTOMBO_c */
 static int daObjTOMBO_IsDelete(daObjTOMBO_c* param_0) {
     return 1;
 }
 
-/* 80D1B7F8-80D1B818 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTOMBO_Method */
 static actor_method_class l_daObjTOMBO_Method = {
     (process_method_func)daObjTOMBO_Create,
     (process_method_func)daObjTOMBO_Delete,
@@ -722,7 +683,6 @@ static actor_method_class l_daObjTOMBO_Method = {
     (process_method_func)daObjTOMBO_Draw,
 };
 
-/* 80D1B818-80D1B848 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Tombo */
 extern actor_process_profile_definition g_profile_Obj_Tombo = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp
index 66e0c86681..16f5b4c8e4 100644
--- a/src/d/actor/d_a_obj_tornado.cpp
+++ b/src/d/actor/d_a_obj_tornado.cpp
@@ -8,9 +8,7 @@
 #include "d/actor/d_a_obj_tornado.h"
 #include "d/d_kankyo_rain.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
-/* 80D1B998-80D1BA0C 000078 0074+00 2/2 0/0 0/0 .text            setPntWind__11daObjTrnd_cFv */
 void daObjTrnd_c::setPntWind() {
     mWindInfluence.position = current.pos;
     mWindInfluence.mDirection.x = 0.0f;
@@ -22,12 +20,10 @@ void daObjTrnd_c::setPntWind() {
     dKyw_pntwind_set(&mWindInfluence);
 }
 
-/* 80D1BA0C-80D1BA30 0000EC 0024+00 2/2 0/0 0/0 .text            cutPntWind__11daObjTrnd_cFv */
 void daObjTrnd_c::cutPntWind() {
     dKyw_pntwind_cut(&mWindInfluence);
 }
 
-/* 80D1BA30-80D1BC40 000110 0210+00 1/1 0/0 0/0 .text            movePntWind__11daObjTrnd_cFv */
 void daObjTrnd_c::movePntWind() {
     cXyz start;
     cXyz end;
@@ -56,7 +52,6 @@ void daObjTrnd_c::movePntWind() {
     }
 }
 
-/* 80D1BC40-80D1BE04 000320 01C4+00 1/1 0/0 0/0 .text            setCpsInfo__11daObjTrnd_cFv */
 void daObjTrnd_c::setCpsInfo() {
     cLib_chaseF(&mNowLength, mTargetLength, scale.y * 3000.0f * 0.05f);
     mWindCps.mEnd.x = 0;
@@ -89,19 +84,16 @@ void daObjTrnd_c::setCpsInfo() {
     }
 }
 
-/* 80D1BE04-80D1BE24 0004E4 0020+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjTrnd_cFv */
 void daObjTrnd_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D1BE24-80D1BE6C 000504 0048+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjTrnd_cFv */
 void daObjTrnd_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80D1C3B4-80D1C400 000000 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{AT_TYPE_LANTERN_SWING, 0x0, 0x11}, {0x0, 0x0}, 0x0}},  // mObj
@@ -114,7 +106,6 @@ static dCcD_SrcCps l_cps_src = {
     }  // mCpsAttr
 };
 
-/* 80D1BE6C-80D1BFB0 00054C 0144+00 1/1 0/0 0/0 .text            Create__11daObjTrnd_cFv */
 int daObjTrnd_c::Create() {
     current.angle.z = 0;
     shape_angle.z = 0;
@@ -152,7 +143,6 @@ int daObjTrnd_c::Create() {
     return 1;
 }
 
-/* 80D1BFB0-80D1C0A8 000690 00F8+00 1/1 0/0 0/0 .text            create__11daObjTrnd_cFv */
 int daObjTrnd_c::create() {
     fopAcM_ct(this, daObjTrnd_c);
     if (!Create()) {
@@ -162,7 +152,6 @@ int daObjTrnd_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D1C0F0-80D1C290 0007D0 01A0+00 1/1 0/0 0/0 .text            execute__11daObjTrnd_cFv */
 int daObjTrnd_c::execute() {
     if (getSwbit() != 0xFF && !fopAcM_isSwitch(this, getSwbit())) {
         if (mTargetLength != 0.0f) {
@@ -201,37 +190,28 @@ int daObjTrnd_c::execute() {
     return 1;
 }
 
-/* 80D1C290-80D1C298 000970 0008+00 1/1 0/0 0/0 .text            draw__11daObjTrnd_cFv */
 int daObjTrnd_c::draw() {
     return 1;
 }
 
-/* 80D1C298-80D1C2CC 000978 0034+00 1/1 0/0 0/0 .text            _delete__11daObjTrnd_cFv */
 int daObjTrnd_c::_delete() {
     dKy_getEnvlight()->evt_wind_go = 0;
     cutPntWind();
     return 1;
 }
 
-/* 80D1C2CC-80D1C2EC 0009AC 0020+00 1/0 0/0 0/0 .text            daObjTrnd_Draw__FP11daObjTrnd_c */
 static int daObjTrnd_Draw(daObjTrnd_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D1C2EC-80D1C30C 0009CC 0020+00 1/0 0/0 0/0 .text            daObjTrnd_Execute__FP11daObjTrnd_c
- */
 static int daObjTrnd_Execute(daObjTrnd_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D1C30C-80D1C32C 0009EC 0020+00 1/0 0/0 0/0 .text            daObjTrnd_Delete__FP11daObjTrnd_c
- */
 static int daObjTrnd_Delete(daObjTrnd_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D1C32C-80D1C34C 000A0C 0020+00 1/0 0/0 0/0 .text            daObjTrnd_Create__FP11daObjTrnd_c
- */
 static int daObjTrnd_Create(daObjTrnd_c* i_this) {
     return i_this->create();
 }
@@ -240,14 +220,12 @@ void dummyString() {
     DEAD_STRING("");
 }
 
-/* 80D1C400-80D1C420 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTrnd_Method */
 static actor_method_class l_daObjTrnd_Method = {
     (process_method_func)daObjTrnd_Create,  (process_method_func)daObjTrnd_Delete,
     (process_method_func)daObjTrnd_Execute, (process_method_func)NULL,
     (process_method_func)daObjTrnd_Draw,
 };
 
-/* 80D1C420-80D1C450 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Tornado */
 extern actor_process_profile_definition g_profile_Obj_Tornado = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp
index 37b0bcf831..704ac0c9d1 100644
--- a/src/d/actor/d_a_obj_tornado2.cpp
+++ b/src/d/actor/d_a_obj_tornado2.cpp
@@ -10,25 +10,18 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo_rain.h"
 
-/* 80D1D3D4-80D1D3DC 000000 0006+02 6/6 0/0 0/0 .rodata          l_R02_eff_id */
 static const u16 l_R02_eff_id[3] = {0x8B5E, 0x8B5F, 0xFFFF};
 
-/* 80D1D3DC-80D1D3E4 000008 0006+02 0/1 0/0 0/0 .rodata          l_R04_eff_id */
 static const u16 l_R04_eff_id[3] = {0x8B60, 0x8B61, 0xFFFF};
 
-/* 80D1D3E4-80D1D3EC 000010 0006+02 0/1 0/0 0/0 .rodata          l_R05_eff_id */
 static const u16 l_R05_eff_id[3] = {0x8B6B, 0x8B6C, 0xFFFF};
 
-/* 80D1D3EC-80D1D3F4 000018 0006+02 0/1 0/0 0/0 .rodata          l_R07_eff_id */
 static const u16 l_R07_eff_id[3] = {0x8B6D, 0x8B6E, 0xFFFF};
 
-/* 80D1D3F4-80D1D3FC 000020 0006+02 0/1 0/0 0/0 .rodata          l_R14_eff_id */
 static const u16 l_R14_eff_id[3] = {0x8B66, 0x8B67, 0x8B68};
 
-/* 80D1D3FC-80D1D404 000028 0006+02 0/1 0/0 0/0 .rodata          l_R51_eff_id */
 static const u16 l_R51_eff_id[3] = {0x8B69, 0x8B6A, 0xFFFF};
 
-/* 80D1C4D8-80D1C54C 000078 0074+00 1/1 0/0 0/0 .text            setPntWind__12daObjTrnd2_cFv */
 void daObjTrnd2_c::setPntWind() {
     mWindInfluence.position = current.pos;
     mWindInfluence.mDirection.x = 0.0f;
@@ -40,12 +33,10 @@ void daObjTrnd2_c::setPntWind() {
     dKyw_pntwind_set(&mWindInfluence);
 }
 
-/* 80D1C54C-80D1C570 0000EC 0024+00 1/1 0/0 0/0 .text            cutPntWind__12daObjTrnd2_cFv */
 void daObjTrnd2_c::cutPntWind() {
     dKyw_pntwind_cut(&mWindInfluence);
 }
 
-/* 80D1C570-80D1C780 000110 0210+00 1/1 0/0 0/0 .text            movePntWind__12daObjTrnd2_cFv */
 void daObjTrnd2_c::movePntWind() {
     cXyz start;
     cXyz end;
@@ -74,7 +65,6 @@ void daObjTrnd2_c::movePntWind() {
     }
 }
 
-/* 80D1C780-80D1C924 000320 01A4+00 1/1 0/0 0/0 .text            setCpsInfo__12daObjTrnd2_cFv */
 void daObjTrnd2_c::setCpsInfo() {
     cLib_chaseF(&mNowLength, mTargetLength, mDefaultLength * scale.y * 0.05f);
     mWindCps.mEnd.x = 0;
@@ -109,19 +99,16 @@ void daObjTrnd2_c::setCpsInfo() {
     movePntWind();
 }
 
-/* 80D1C924-80D1C944 0004C4 0020+00 1/1 0/0 0/0 .text            initBaseMtx__12daObjTrnd2_cFv */
 void daObjTrnd2_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D1C944-80D1C98C 0004E4 0048+00 2/2 0/0 0/0 .text            setBaseMtx__12daObjTrnd2_cFv */
 void daObjTrnd2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     MTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80D1D458-80D1D4A4 000000 004C+00 1/1 0/0 0/0 .data            l_cps_src */
 static dCcD_SrcCps l_cps_src = {
     {
         {0x0, {{AT_TYPE_LANTERN_SWING, 0x0, 0x1d}, {0x0, 0x0}, 0x0}},  // mObj
@@ -134,7 +121,6 @@ static dCcD_SrcCps l_cps_src = {
     }  // mCpsAttr
 };
 
-/* 80D1C98C-80D1CC80 00052C 02F4+00 1/1 0/0 0/0 .text            Create__12daObjTrnd2_cFv */
 int daObjTrnd2_c::Create() {
     mDefaultRadius = 150.0f;
     mDefaultLength = 1000.0f;
@@ -216,7 +202,6 @@ int daObjTrnd2_c::Create() {
     return 1;
 }
 
-/* 80D1CC80-80D1CD78 000820 00F8+00 1/1 0/0 0/0 .text            create__12daObjTrnd2_cFv */
 int daObjTrnd2_c::create() {
     fopAcM_ct(this, daObjTrnd2_c);
     if (!Create()) {
@@ -226,7 +211,6 @@ int daObjTrnd2_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D1CDC0-80D1D0AC 000960 02EC+00 1/1 0/0 0/0 .text            execute__12daObjTrnd2_cFv */
 int daObjTrnd2_c::execute() {
     bool set_column;
     u32 swBit;
@@ -311,7 +295,6 @@ int daObjTrnd2_c::execute() {
     return 1;
 }
 
-/* 80D1D0AC-80D1D214 000C4C 0168+00 1/1 0/0 0/0 .text            setParticle__12daObjTrnd2_cFv */
 void daObjTrnd2_c::setParticle() {
     const u16* efflist_p = NULL;
     switch (fopAcM_GetRoomNo(this)) {
@@ -355,7 +338,6 @@ void daObjTrnd2_c::setParticle() {
     stopParticle();
 }
 
-/* 80D1D214-80D1D278 000DB4 0064+00 1/1 0/0 0/0 .text            endParticle__12daObjTrnd2_cFv */
 void daObjTrnd2_c::endParticle() {
     for (int i = 0; i < 3; i++) {
         if (mParticles[i] != NULL) {
@@ -367,7 +349,6 @@ void daObjTrnd2_c::endParticle() {
     }
 }
 
-/* 80D1D278-80D1D2AC 000E18 0034+00 2/2 0/0 0/0 .text            startParticle__12daObjTrnd2_cFv */
 void daObjTrnd2_c::startParticle() {
     for (int i = 0; i < 3; i++) {
         if (mParticles[i] != NULL) {
@@ -376,7 +357,6 @@ void daObjTrnd2_c::startParticle() {
     }
 }
 
-/* 80D1D2AC-80D1D2E0 000E4C 0034+00 2/2 0/0 0/0 .text            stopParticle__12daObjTrnd2_cFv */
 void daObjTrnd2_c::stopParticle() {
     for (int i = 0; i < 3; i++) {
         if (mParticles[i] != NULL) {
@@ -385,12 +365,10 @@ void daObjTrnd2_c::stopParticle() {
     }
 }
 
-/* 80D1D2E0-80D1D2E8 000E80 0008+00 1/1 0/0 0/0 .text            draw__12daObjTrnd2_cFv */
 int daObjTrnd2_c::draw() {
     return 1;
 }
 
-/* 80D1D2E8-80D1D330 000E88 0048+00 1/1 0/0 0/0 .text            _delete__12daObjTrnd2_cFv */
 int daObjTrnd2_c::_delete() {
     dKy_getEnvlight()->evt_wind_go = 0;
     cutPntWind();
@@ -398,30 +376,22 @@ int daObjTrnd2_c::_delete() {
     return 1;
 }
 
-/* 80D1D330-80D1D350 000ED0 0020+00 1/0 0/0 0/0 .text            daObjTrnd2_Draw__FP12daObjTrnd2_c
- */
 static int daObjTrnd2_Draw(daObjTrnd2_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D1D350-80D1D370 000EF0 0020+00 1/0 0/0 0/0 .text daObjTrnd2_Execute__FP12daObjTrnd2_c */
 static int daObjTrnd2_Execute(daObjTrnd2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D1D370-80D1D390 000F10 0020+00 1/0 0/0 0/0 .text            daObjTrnd2_Delete__FP12daObjTrnd2_c
- */
 static int daObjTrnd2_Delete(daObjTrnd2_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D1D390-80D1D3B0 000F30 0020+00 1/0 0/0 0/0 .text            daObjTrnd2_Create__FP12daObjTrnd2_c
- */
 static int daObjTrnd2_Create(daObjTrnd2_c* i_this) {
     return i_this->create();
 }
 
-/* 80D1D4A4-80D1D4C4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjTrnd2_Method */
 static actor_method_class l_daObjTrnd2_Method = {
     (process_method_func)daObjTrnd2_Create,  (process_method_func)daObjTrnd2_Delete,
     (process_method_func)daObjTrnd2_Execute, (process_method_func)NULL,
diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp
index 18ee9213f6..285b9f6448 100644
--- a/src/d/actor/d_a_obj_tp.cpp
+++ b/src/d/actor/d_a_obj_tp.cpp
@@ -17,7 +17,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80D1D578-80D1D764 000078 01EC+00 1/0 0/0 0/0 .text            daObj_Tp_Draw__FP12obj_tp_class */
 static int daObj_Tp_Draw(obj_tp_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mMorf->getModel(), &i_this->tevStr);
@@ -57,7 +56,6 @@ static int daObj_Tp_Draw(obj_tp_class* i_this) {
     return 1;
 }
 
-/* 80D1D764-80D1D850 000264 00EC+00 1/1 0/0 0/0 .text            anm_init__FP12obj_tp_classifUcf */
 static void anm_init(obj_tp_class* i_this, int param_2, f32 param_3, u8 param_4, f32 param_5) {
     if (i_this->field_0x594 != 0) {
         if (param_2 == 7) {
@@ -73,7 +71,6 @@ static void anm_init(obj_tp_class* i_this, int param_2, f32 param_3, u8 param_4,
     i_this->field_0x574 = param_2;
 }
 
-/* 80D1D850-80D1D8C8 000350 0078+00 1/1 0/0 0/0 .text            s_tp_sub__FPvPv */
 static void* s_tp_sub(void* param_1, void* param_2) {
     if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_TP) &&
         ((fopAc_ac_c*)param_1)->parentActorID == ((fopAc_ac_c*)param_2)->parentActorID &&
@@ -84,8 +81,6 @@ static void* s_tp_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D1D8C8-80D1E460 0003C8 0B98+00 3/1 0/0 0/0 .text            daObj_Tp_Execute__FP12obj_tp_class
- */
 static int daObj_Tp_Execute(obj_tp_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     if (i_this->field_0x5a4 != 0) {
@@ -280,14 +275,10 @@ static int daObj_Tp_Execute(obj_tp_class* i_this) {
     return 1;
 }
 
-/* 80D1E460-80D1E468 000F60 0008+00 1/0 0/0 0/0 .text            daObj_Tp_IsDelete__FP12obj_tp_class
- */
 static int daObj_Tp_IsDelete(obj_tp_class* param_0) {
     return 1;
 }
 
-/* 80D1E468-80D1E4C0 000F68 0058+00 1/0 0/0 0/0 .text            daObj_Tp_Delete__FP12obj_tp_class
- */
 static int daObj_Tp_Delete(obj_tp_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Obj_tp");
@@ -297,33 +288,26 @@ static int daObj_Tp_Delete(obj_tp_class* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D1EEE0-80D1EEE8 000040 0008+00 0/1 0/0 0/0 .data            bmd$4283 */
 static int bmd[2] = {
     0x11, 0x12,
 };
 
-/* 80D1EEE8-80D1EEF0 000048 0008+00 0/1 0/0 0/0 .data            brk$4284 */
 static int brk[2] = {
     0x17, 0x18,
 };
 
-/* 80D1EEF0-80D1EEF8 000050 0008+00 0/1 0/0 0/0 .data            eff_bmd$4296 */
 static int eff_bmd[2] = {
     0x0F, 0x10,
 };
 
-/* 80D1EEF8-80D1EF00 000058 0008+00 0/1 0/0 0/0 .data            eff_btk$4297 */
 static int eff_btk[2] = {
     0x1B, 0x1C,
 };
 
-/* 80D1EF00-80D1EF08 000060 0008+00 0/1 0/0 0/0 .data            eff_brk$4298 */
 static int eff_brk[2] = {
     0x15, 0x16,
 };
 
-/* 80D1EF08-80D1EF4C 000068 0044+00 1/1 0/0 0/0 .data            cc_cyl_src$4468 */
 static dCcD_SrcCyl cc_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fafdbf, 0x11}, 0x79}}, // mObj
@@ -338,7 +322,6 @@ static dCcD_SrcCyl cc_cyl_src = {
     } // mCyl
 };
 
-/* 80D1E4C0-80D1E908 000FC0 0448+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_tp_class* tp = static_cast<obj_tp_class*>(i_this);
     tp->mMorf =
@@ -419,7 +402,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D1E950-80D1ECF0 001450 03A0+00 1/0 0/0 0/0 .text            daObj_Tp_Create__FP10fopAc_ac_c */
 static int daObj_Tp_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_tp_class);
     obj_tp_class* tp = (obj_tp_class*)i_this;
@@ -498,7 +480,6 @@ static int daObj_Tp_Create(fopAc_ac_c* i_this) {
     return rv;
 }
 
-/* 80D1EF4C-80D1EF6C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Tp_Method */
 static actor_method_class l_daObj_Tp_Method = {
     (process_method_func)daObj_Tp_Create,
     (process_method_func)daObj_Tp_Delete,
@@ -507,7 +488,6 @@ static actor_method_class l_daObj_Tp_Method = {
     (process_method_func)daObj_Tp_Draw,
 };
 
-/* 80D1EF6C-80D1EF9C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_TP */
 extern actor_process_profile_definition g_profile_OBJ_TP = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp
index a89e90ffd5..465d355bbe 100644
--- a/src/d/actor/d_a_obj_treesh.cpp
+++ b/src/d/actor/d_a_obj_treesh.cpp
@@ -8,10 +8,8 @@
 #include "d/actor/d_a_obj_treesh.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D1F8F4-80D1F8F8 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_TreeSh";
 
-/* 80D1F0CC-80D1F10C 0000EC 0040+00 1/1 0/0 0/0 .text            __ct__14daTreeSh_HIO_cFv */
 daTreeSh_HIO_c::daTreeSh_HIO_c() {
     shake_strength = 800;
     shake_speed = 500;
@@ -21,7 +19,6 @@ daTreeSh_HIO_c::daTreeSh_HIO_c() {
     field_0xa.x = 0;
 }
 
-/* 80D1F190-80D1F258 0001B0 00C8+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     if (!param_1) {
         int jnt_no = i_joint->getJntNo();
@@ -43,20 +40,17 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) {
     return 1;
 }
 
-/* 80D1F258-80D1F294 000278 003C+00 1/1 0/0 0/0 .text            initBaseMtx__10daTreeSh_cFv */
 void daTreeSh_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D1F294-80D1F2E8 0002B4 0054+00 1/1 0/0 0/0 .text            setBaseMtx__10daTreeSh_cFv */
 void daTreeSh_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D1F2E8-80D1F358 000308 0070+00 1/0 0/0 0/0 .text            CreateHeap__10daTreeSh_cFv */
 int daTreeSh_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     JUT_ASSERT(211, modelData != NULL);
@@ -69,7 +63,6 @@ int daTreeSh_c::CreateHeap() {
     return 1;
 }
 
-/* 80D1F358-80D1F414 000378 00BC+00 1/0 0/0 0/0 .text            Create__10daTreeSh_cFv */
 int daTreeSh_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -86,10 +79,8 @@ int daTreeSh_c::Create() {
     return 1;
 }
 
-/* 80D1F99C-80D1F9AC 000014 0010+00 2/2 0/0 0/0 .bss             l_HIO */
 static daTreeSh_HIO_c l_HIO;
 
-/* 80D1F414-80D1F49C 000434 0088+00 1/1 0/0 0/0 .text            create1st__10daTreeSh_cFv */
 int daTreeSh_c::create1st() {
     int phase_state = dComIfG_resLoad(&mPhase, l_arcName);
     if (phase_state == cPhs_COMPLEATE_e) {
@@ -105,7 +96,6 @@ int daTreeSh_c::create1st() {
     return phase_state;
 }
 
-/* 80D1F49C-80D1F648 0004BC 01AC+00 1/0 0/0 0/0 .text            Execute__10daTreeSh_cFPPA3_A4_f */
 int daTreeSh_c::Execute(Mtx** param_0) {
     for (int i = 0; i < 2; i++) {
         if (mShakeTimer[i] == 0) {
@@ -126,7 +116,6 @@ int daTreeSh_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D1F648-80D1F6EC 000668 00A4+00 1/0 0/0 0/0 .text            Draw__10daTreeSh_cFv */
 int daTreeSh_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -137,7 +126,6 @@ int daTreeSh_c::Draw() {
     return 1;
 }
 
-/* 80D1F6EC-80D1F720 00070C 0034+00 1/0 0/0 0/0 .text            Delete__10daTreeSh_cFv */
 int daTreeSh_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
 #ifdef DEBUG
@@ -146,30 +134,23 @@ int daTreeSh_c::Delete() {
     return 1;
 }
 
-/* 80D1F720-80D1F7AC 000740 008C+00 1/0 0/0 0/0 .text            daTreeSh_create1st__FP10daTreeSh_c
- */
 static int daTreeSh_create1st(daTreeSh_c* i_this) {
     fopAcM_ct(i_this, daTreeSh_c);
     return i_this->create1st();
 }
 
-/* 80D1F7B0-80D1F7D0 0007D0 0020+00 1/0 0/0 0/0 .text daTreeSh_MoveBGDelete__FP10daTreeSh_c */
 static int daTreeSh_MoveBGDelete(daTreeSh_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D1F7D0-80D1F7F0 0007F0 0020+00 1/0 0/0 0/0 .text daTreeSh_MoveBGExecute__FP10daTreeSh_c */
 static int daTreeSh_MoveBGExecute(daTreeSh_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D1F7F0-80D1F81C 000810 002C+00 1/0 0/0 0/0 .text            daTreeSh_MoveBGDraw__FP10daTreeSh_c
- */
 static int daTreeSh_MoveBGDraw(daTreeSh_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D1F8F8-80D1F918 -00001 0020+00 1/0 0/0 0/0 .data            daTreeSh_METHODS */
 static actor_method_class daTreeSh_METHODS = {
     (process_method_func)daTreeSh_create1st,
     (process_method_func)daTreeSh_MoveBGDelete,
@@ -178,7 +159,6 @@ static actor_method_class daTreeSh_METHODS = {
     (process_method_func)daTreeSh_MoveBGDraw,
 };
 
-/* 80D1F918-80D1F948 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TREESH */
 extern actor_process_profile_definition g_profile_TREESH = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp
index 691dc7608c..05cee13772 100644
--- a/src/d/actor/d_a_obj_twGate.cpp
+++ b/src/d/actor/d_a_obj_twGate.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_obj_twGate.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D205B0-80D205E4 -00001 0034+00 3/3 0/0 0/0 .data            l_resNameIdx */
 static char* l_resNameIdx[13] = {
     "twGtFiro",
     "twGtK0102",
@@ -25,7 +24,6 @@ static char* l_resNameIdx[13] = {
     "",
 };
 
-/* 80D1FAAC-80D1FAE0 0000EC 0034+00 1/1 0/0 0/0 .text            __ct__14daTwGate_HIO_cFv */
 daTwGate_HIO_c::daTwGate_HIO_c() {
     mRange = 1900.0f;
 }
@@ -37,7 +35,6 @@ void daTwGate_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80D1FB84-80D1FC0C 0001C4 0088+00 2/2 0/0 0/0 .text            setBaseMtx__10daTwGate_cFv */
 void daTwGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -45,33 +42,26 @@ void daTwGate_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* ############################################################################################## */
-/* 80D2030C-80D20340 000004 0034+00 0/2 0/0 0/0 .rodata          l_bmdIdx */
 static int const l_bmdIdx[13] = {
     6, 6, 6, -1, -1, -1, 6, 6, 6, 6, 6, 6, -1,
 };
 
-/* 80D20340-80D20374 000038 0034+00 0/1 0/0 0/0 .rodata          l_dzbIdx */
 static u32 const l_dzbIdx[13] = {
     15, 15, 15, -1, -1, -1, 15, 15, 15, 15, 15, 15, -1,
 };
 
-/* 80D20374-80D203A8 00006C 0034+00 0/1 0/0 0/0 .rodata          l_btkIdx */
 static u32 const l_btkIdx[13] = {
     12, 12, 12, -1, -1, -1, 12, 12, 12, 12, 12, 12, -1,
 };
 
-/* 80D203A8-80D203DC 0000A0 0034+00 0/1 0/0 0/0 .rodata          l_brkIdx */
 static u32 const l_brkIdx[13] = {
     9, 9, 9, -1, -1, -1, 9, 9, 9, 9, 9, 9, -1,
 };
 
-/* 80D203DC-80D20410 0000D4 0034+00 0/2 0/0 0/0 .rodata          l_twFlagIdx */
 static u32 const l_twFlagIdx[13] = {
     0, 1, 2, 4, -1, -1, 0, 1, 1, 2, 2, 4, 4,
 };
 
-/* 80D20410-80D204AC 000108 009C+00 0/1 0/0 0/0 .rodata          l_cheeckPos0 */
 static Vec const l_cheeckPos0[13] = {
     {-572.6072f, 314.9037f, -20792.293f},
     {-24536.904f, -7234.991f, 73427.242f},
@@ -88,7 +78,6 @@ static Vec const l_cheeckPos0[13] = {
     {0.0f, 0.0f, 0.0f},
 };
 
-/* 80D204AC-80D20548 0001A4 009C+00 0/1 0/0 0/0 .rodata          l_cheeckPos1 */
 static Vec const l_cheeckPos1[13] = {
     {-178.19418f, 308.69842f, -20657.326f},
     {-23610.3066f, -7234.9912f, 74043.75f},
@@ -105,7 +94,6 @@ static Vec const l_cheeckPos1[13] = {
     {0.0f, 0.0f, 0.0f},
 };
 
-/* 80D1FC0C-80D1FD44 00024C 0138+00 1/0 0/0 0/0 .text            CreateHeap__10daTwGate_cFv */
 int daTwGate_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mGateType], l_bmdIdx[mGateType]);
@@ -123,10 +111,8 @@ int daTwGate_c::CreateHeap() {
     return 1;
 }
 
-/* 80D206AC-80D206B4 000014 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daTwGate_HIO_c l_HIO;
 
-/* 80D1FD44-80D1FF14 000384 01D0+00 1/1 0/0 0/0 .text            create__10daTwGate_cFv */
 int daTwGate_c::create() {
     fopAcM_ct(this, daTwGate_c);
     mGateType = getGateType();
@@ -161,7 +147,6 @@ int daTwGate_c::create() {
     return rv;
 }
 
-/* 80D1FFA4-80D200B4 0005E4 0110+00 1/0 0/0 0/0 .text            Execute__10daTwGate_cFPPA3_A4_f */
 int daTwGate_c::Execute(Mtx** i_mtx) {
     if (dComIfGs_isDarkClearLV(l_twFlagIdx[mGateType]) == TRUE) {
         fopAcM_delete(this);
@@ -186,7 +171,6 @@ int daTwGate_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D200B4-80D20180 0006F4 00CC+00 1/0 0/0 0/0 .text            Draw__10daTwGate_cFv */
 int daTwGate_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -199,7 +183,6 @@ int daTwGate_c::Draw() {
     return 1;
 }
 
-/* 80D20180-80D201C0 0007C0 0040+00 1/0 0/0 0/0 .text            Delete__10daTwGate_cFv */
 int daTwGate_c::Delete() {
     dComIfG_resDelete(&mPhase, l_resNameIdx[mGateType]);
 
@@ -210,29 +193,24 @@ int daTwGate_c::Delete() {
     return 1;
 }
 
-/* 80D201C0-80D201EC 000800 002C+00 1/0 0/0 0/0 .text            daTwGate_Draw__FP10daTwGate_c */
 static int daTwGate_Draw(daTwGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D201EC-80D2020C 00082C 0020+00 1/0 0/0 0/0 .text            daTwGate_Execute__FP10daTwGate_c */
 static int daTwGate_Execute(daTwGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D2020C-80D2022C 00084C 0020+00 1/0 0/0 0/0 .text            daTwGate_Delete__FP10daTwGate_c */
 static int daTwGate_Delete(daTwGate_c* i_this) {
     fopAcM_RegisterDeleteID(i_this, "daTwGate");
     return i_this->MoveBGDelete();
 }
 
-/* 80D2022C-80D2024C 00086C 0020+00 1/0 0/0 0/0 .text            daTwGate_Create__FP10fopAc_ac_c */
 static int daTwGate_Create(fopAc_ac_c* i_this) {
     fopAcM_RegisterCreateID(daTwGate_c, i_this, "daTwGate");
     return a_this->create();
 }
 
-/* 80D205E4-80D20604 -00001 0020+00 1/0 0/0 0/0 .data            l_daTwGate_Method */
 static actor_method_class l_daTwGate_Method = {
     (process_method_func)daTwGate_Create,
     (process_method_func)daTwGate_Delete,
@@ -241,7 +219,6 @@ static actor_method_class l_daTwGate_Method = {
     (process_method_func)daTwGate_Draw,
 };
 
-/* 80D20604-80D20634 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_TwGate */
 extern actor_process_profile_definition g_profile_Obj_TwGate = {
   fpcLy_CURRENT_e,               // mLayerID
   3,                             // mListID
diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp
index 8f19dc4db6..0a23727f5b 100644
--- a/src/d/actor/d_a_obj_udoor.cpp
+++ b/src/d/actor/d_a_obj_udoor.cpp
@@ -11,11 +11,6 @@
 #include "d/actor/d_a_player.h"
 #include "SSystem/SComponent/c_math.h"
 
-//
-// Declarations:
-//
-
-/* 80D20738-80D2079C 000078 0064+00 1/0 0/0 0/0 .text daObj_Udoor_Draw__FP15obj_udoor_class */
 static int daObj_Udoor_Draw(obj_udoor_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -23,7 +18,6 @@ static int daObj_Udoor_Draw(obj_udoor_class* i_this) {
     return 1;
 }
 
-/* 80D2079C-80D209BC 0000DC 0220+00 2/1 0/0 0/0 .text daObj_Udoor_Execute__FP15obj_udoor_class */
 static int daObj_Udoor_Execute(obj_udoor_class* i_this) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -69,12 +63,10 @@ static int daObj_Udoor_Execute(obj_udoor_class* i_this) {
     return 1;
 }
 
-/* 80D209BC-80D209C4 0002FC 0008+00 1/0 0/0 0/0 .text daObj_Udoor_IsDelete__FP15obj_udoor_class */
 static bool daObj_Udoor_IsDelete(obj_udoor_class* param_0) {
     return true;
 }
 
-/* 80D209C4-80D20A1C 000304 0058+00 1/0 0/0 0/0 .text daObj_Udoor_Delete__FP15obj_udoor_class */
 static int daObj_Udoor_Delete(obj_udoor_class* i_this) {
     fopAcM_GetID(i_this);
     dComIfG_resDelete(&i_this->mPhase, "Obj_udoor");
@@ -85,7 +77,6 @@ static int daObj_Udoor_Delete(obj_udoor_class* i_this) {
     return 1;
 }
 
-/* 80D20A1C-80D20B40 00035C 0124+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     static int bmdd[2] = { 4, 5 };
 
@@ -116,7 +107,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D20B40-80D20D48 000480 0208+00 1/0 0/0 0/0 .text            daObj_Udoor_Create__FP10fopAc_ac_c */
 static cPhs__Step daObj_Udoor_Create(fopAc_ac_c* i_this) {
     static dCcD_SrcSph cc_sph_src = {
         {
@@ -166,7 +156,6 @@ static cPhs__Step daObj_Udoor_Create(fopAc_ac_c* i_this) {
     return phase_state;
 }
 
-/* 80D20E6C-80D20E8C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Udoor_Method */
 static actor_method_class l_daObj_Udoor_Method = {
     (process_method_func)daObj_Udoor_Create,
     (process_method_func)daObj_Udoor_Delete,
@@ -175,7 +164,6 @@ static actor_method_class l_daObj_Udoor_Method = {
     (process_method_func)daObj_Udoor_Draw,
 };
 
-/* 80D20E8C-80D20EBC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_UDOOR */
 extern actor_process_profile_definition g_profile_OBJ_UDOOR = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp
index 3eabb4986d..db9dc4fa17 100644
--- a/src/d/actor/d_a_obj_usaku.cpp
+++ b/src/d/actor/d_a_obj_usaku.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D20F58-80D20FBC 000078 0064+00 1/0 0/0 0/0 .text daObj_Usaku_Draw__FP15obj_usaku_class */
 static int daObj_Usaku_Draw(obj_usaku_class* i_this) {
     g_env_light.settingTevStruct(0x10, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -19,7 +18,6 @@ static int daObj_Usaku_Draw(obj_usaku_class* i_this) {
     return 1;
 }
 
-/* 80D20FBC-80D21048 0000DC 008C+00 2/1 0/0 0/0 .text daObj_Usaku_Execute__FP15obj_usaku_class */
 static int daObj_Usaku_Execute(obj_usaku_class* i_this) {
     mDoMtx_stack_c::transS(i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z);
     mDoMtx_stack_c::YrotM(i_this->shape_angle.y);
@@ -33,12 +31,10 @@ static int daObj_Usaku_Execute(obj_usaku_class* i_this) {
     return 1;
 }
 
-/* 80D21048-80D21050 000168 0008+00 1/0 0/0 0/0 .text daObj_Usaku_IsDelete__FP15obj_usaku_class */
 static int daObj_Usaku_IsDelete(obj_usaku_class* i_this) {
     return 1;
 }
 
-/* 80D21050-80D210A8 000170 0058+00 1/0 0/0 0/0 .text daObj_Usaku_Delete__FP15obj_usaku_class */
 static int daObj_Usaku_Delete(obj_usaku_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_usaku");
 
@@ -48,7 +44,6 @@ static int daObj_Usaku_Delete(obj_usaku_class* i_this) {
     return 1;
 }
 
-/* 80D210A8-80D211AC 0001C8 0104+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_usaku_class* a_this = (obj_usaku_class*)i_this;
 
@@ -72,8 +67,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D211AC-80D212D4 0002CC 0128+00 1/0 0/0 0/0 .text            daObj_Usaku_Create__FP10fopAc_ac_c
- */
 static int daObj_Usaku_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_usaku_class);
     obj_usaku_class* a_this = (obj_usaku_class*)i_this;
@@ -102,15 +95,12 @@ static int daObj_Usaku_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 80D212F8-80D21318 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Usaku_Method */
 static actor_method_class l_daObj_Usaku_Method = {
     (process_method_func)daObj_Usaku_Create,  (process_method_func)daObj_Usaku_Delete,
     (process_method_func)daObj_Usaku_Execute, (process_method_func)daObj_Usaku_IsDelete,
     (process_method_func)daObj_Usaku_Draw,
 };
 
-/* 80D21318-80D21348 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_USAKU */
 extern actor_process_profile_definition g_profile_OBJ_USAKU = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp
index dfbd794041..e6c8c6818c 100644
--- a/src/d/actor/d_a_obj_vground.cpp
+++ b/src/d/actor/d_a_obj_vground.cpp
@@ -8,26 +8,22 @@
 #include "d/actor/d_a_obj_vground.h"
 #include "d/d_procname.h"
 
-/* 80D213D8-80D213F8 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjVGnd_c*>(i_this)->CreateHeap();
 }
 
-/* 80D213F8-80D21448 000098 0050+00 1/1 0/0 0/0 .text            initBaseMtx__11daObjVGnd_cFv */
 void daObjVGnd_c::initBaseMtx() {
     current.pos.y += 5.0f;
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D21448-80D214AC 0000E8 0064+00 2/2 0/0 0/0 .text            setBaseMtx__11daObjVGnd_cFv */
 void daObjVGnd_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     MTXCopy(mDoMtx_stack_c::now, mpModel->mBaseTransformMtx);
 }
 
-/* 80D214AC-80D21500 00014C 0054+00 1/1 0/0 0/0 .text            Create__11daObjVGnd_cFv */
 int daObjVGnd_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -36,10 +32,8 @@ int daObjVGnd_c::Create() {
     return 1;
 }
 
-/* 80D21A24-80D21A28 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_VolcGnd";
 
-/* 80D21500-80D216AC 0001A0 01AC+00 1/1 0/0 0/0 .text            CreateHeap__11daObjVGnd_cFv */
 int daObjVGnd_c::CreateHeap() {
     J3DModelData* mpObjectRes = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     mpModel = mDoExt_J3DModel__create(mpObjectRes, 0x80000, 0x11000284);
@@ -63,7 +57,6 @@ int daObjVGnd_c::CreateHeap() {
     return 1;
 }
 
-/* 80D216F4-80D217A8 000394 00B4+00 1/1 0/0 0/0 .text            create__11daObjVGnd_cFv */
 int daObjVGnd_c::create() {
     fopAcM_ct(this, daObjVGnd_c);
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -77,7 +70,6 @@ int daObjVGnd_c::create() {
     return phase;
 }
 
-/* 80D217A8-80D21878 000448 00D0+00 2/2 0/0 0/0 .text            execute__11daObjVGnd_cFv */
 int daObjVGnd_c::execute() {
         /* dSv_event_flag_c::M_032 - Main Event - Melted Zora river ice with magma rock */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) {
@@ -96,7 +88,6 @@ int daObjVGnd_c::execute() {
     return 1;
 }
 
-/* 80D21878-80D2194C 000518 00D4+00 1/1 0/0 0/0 .text            draw__11daObjVGnd_cFv */
 int daObjVGnd_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -108,42 +99,33 @@ int daObjVGnd_c::draw() {
     return 1;
 }
 
-/* 80D2194C-80D21980 0005EC 0034+00 1/1 0/0 0/0 .text            _delete__11daObjVGnd_cFv */
 int daObjVGnd_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D21980-80D219A0 000620 0020+00 1/0 0/0 0/0 .text            daObjVGnd_Draw__FP11daObjVGnd_c */
 static int daObjVGnd_Draw(daObjVGnd_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D219A0-80D219C0 000640 0020+00 1/0 0/0 0/0 .text            daObjVGnd_Execute__FP11daObjVGnd_c
- */
 static int daObjVGnd_Execute(daObjVGnd_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D219C0-80D219E0 000660 0020+00 1/0 0/0 0/0 .text            daObjVGnd_Delete__FP11daObjVGnd_c
- */
 static int daObjVGnd_Delete(daObjVGnd_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D219E0-80D21A00 000680 0020+00 1/0 0/0 0/0 .text            daObjVGnd_Create__FP10fopAc_ac_c */
 static int daObjVGnd_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjVGnd_c*>(i_this)->create();
 }
 
-/* 80D21A28-80D21A48 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjVGnd_Method */
 static actor_method_class l_daObjVGnd_Method = {
     (process_method_func)daObjVGnd_Create,  (process_method_func)daObjVGnd_Delete,
     (process_method_func)daObjVGnd_Execute, (process_method_func)NULL,
     (process_method_func)daObjVGnd_Draw,
 };
 
-/* 80D21A48-80D21A78 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_VolcGnd */
 extern actor_process_profile_definition g_profile_Obj_VolcGnd = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp
index 9f559a1407..d1b90b6493 100644
--- a/src/d/actor/d_a_obj_volcball.cpp
+++ b/src/d/actor/d_a_obj_volcball.cpp
@@ -13,14 +13,8 @@
 #include "d/d_event_lib.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Declarations:
-//
-
-/* 80D23EAC-80D23EB0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "M_Volcbal";
 
-/* 80D23EB0-80D23F58 000024 00A8+00 1/1 0/0 0/0 .data            l_param */
 static daObjVolcBall_c::volc_param_c l_param[] = {
     {
         -3.0f, -70.0f, 1.0f,  1700.0f, 400.0f, 1.0f, 0.5f, 5.0f,    5.0f, 50.0f, 20.0f,
@@ -32,17 +26,14 @@ static daObjVolcBall_c::volc_param_c l_param[] = {
     },
 };
 
-/* 80D21B18-80D21B30 000078 0018+00 8/8 0/0 0/0 .text            getData__15daObjVolcBall_cFv */
 daObjVolcBall_c::volc_param_c* daObjVolcBall_c::getData() {
     return &l_param[mIsBigVolc];
 }
 
-/* 80D21B30-80D21B50 000090 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjVolcBall_c*>(i_this)->CreateHeap();
 }
 
-/* 80D21B50-80D21BA0 0000B0 0050+00 1/1 0/0 0/0 .text            search_big_volc__FPvPv */
 static void* search_big_volc(void* i_actor, void*) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) &&
         fopAcM_GetProfName(i_actor) == PROC_Obj_VolcanicBomb)
@@ -53,12 +44,10 @@ static void* search_big_volc(void* i_actor, void*) {
     return NULL;
 }
 
-/* 80D21BA0-80D21BC0 000100 0020+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjVolcBall_cFv */
 void daObjVolcBall_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D21BC0-80D21C40 000120 0080+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjVolcBall_cFv */
 void daObjVolcBall_c::setBaseMtx() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -70,7 +59,6 @@ void daObjVolcBall_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x28ec);
 }
 
-/* 80D23DCC-80D23E0C 000000 0040+00 7/7 0/0 0/0 .rodata          l_sph_src */
 static const dCcD_SrcSph l_sph_src = {
     {
         {0, {{AT_TYPE_BOMB, 1, 0x1F}, {0, 0x11}, 0}},
@@ -86,7 +74,6 @@ static const dCcD_SrcSph l_sph_src = {
     }
 };
 
-/* 80D21C40-80D21D80 0001A0 0140+00 1/1 0/0 0/0 .text            Create__15daObjVolcBall_cFv */
 int daObjVolcBall_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, field_0x28ec);
@@ -117,7 +104,6 @@ int daObjVolcBall_c::Create() {
 }
 
 
-/* 80D21D80-80D21E28 0002E0 00A8+00 1/1 0/0 0/0 .text            CreateHeap__15daObjVolcBall_cFv */
 int daObjVolcBall_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
 
@@ -131,7 +117,6 @@ int daObjVolcBall_c::CreateHeap() {
     return 1;
 }
 
-/* 80D21E28-80D21FA8 000388 0180+00 1/1 0/0 0/0 .text            create__15daObjVolcBall_cFv */
 int daObjVolcBall_c::create() {
     fopAcM_ct(this, daObjVolcBall_c);
 
@@ -158,7 +143,6 @@ int daObjVolcBall_c::create() {
     return phase;
 }
 
-/* 80D22424-80D22484 000984 0060+00 1/1 0/0 0/0 .text            execute__15daObjVolcBall_cFv */
 int daObjVolcBall_c::execute() {
     f32 ball_gravity = getData()->mGravity;
     f32 ball_fall_speed = getData()->mMaxFallSpeed;
@@ -172,7 +156,6 @@ int daObjVolcBall_c::execute() {
 
 typedef void (daObjVolcBall_c::*actionFunc)();
 
-/* 80D22484-80D22570 0009E4 00EC+00 1/1 0/0 0/0 .text            action__15daObjVolcBall_cFv */
 void daObjVolcBall_c::action() {
     static actionFunc l_func[] = {
         &daObjVolcBall_c::actionPlayerWait, &daObjVolcBall_c::actionSwWait,
@@ -183,23 +166,19 @@ void daObjVolcBall_c::action() {
     (this->*l_func[mMode])();
 }
 
-/* 80D22570-80D2257C 000AD0 000C+00 1/1 0/0 0/0 .text initActionPlayerWait__15daObjVolcBall_cFv */
 void daObjVolcBall_c::initActionPlayerWait() {
     setAction(MODE_PLAYER_WAIT);
 }
 
-/* 80D2257C-80D225A4 000ADC 0028+00 3/3 0/0 0/0 .text initActionWarning__15daObjVolcBall_cFv */
 void daObjVolcBall_c::initActionWarning() {
     setAction(MODE_QUAKE);
     startQuake();
 }
 
-/* 80D225A4-80D225B0 000B04 000C+00 1/1 0/0 0/0 .text initActionSwWait__15daObjVolcBall_cFv */
 void daObjVolcBall_c::initActionSwWait() {
     setAction(MODE_SWITCH_WAIT);
 }
 
-/* 80D225B0-80D2267C 000B10 00CC+00 1/0 0/0 0/0 .text actionPlayerWait__15daObjVolcBall_cFv */
 void daObjVolcBall_c::actionPlayerWait() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -212,8 +191,6 @@ void daObjVolcBall_c::actionPlayerWait() {
     }
 }
 
-/* 80D2267C-80D22724 000BDC 00A8+00 1/0 0/0 0/0 .text            actionSwWait__15daObjVolcBall_cFv
- */
 void daObjVolcBall_c::actionSwWait() {
     if (fopAcM_isSwitch(this, getSwBit())) {
         setAction(MODE_STOP);
@@ -221,7 +198,6 @@ void daObjVolcBall_c::actionSwWait() {
     }
 }
 
-/* 80D22724-80D227E4 000C84 00C0+00 1/0 0/0 0/0 .text            actionStop__15daObjVolcBall_cFv */
 void daObjVolcBall_c::actionStop() {
     if (!fopAcM_isSwitch(this, getSwBit())) {
         setAction(MODE_SWITCH_WAIT);
@@ -234,8 +210,6 @@ void daObjVolcBall_c::actionStop() {
     }
 }
 
-/* 80D227E4-80D22944 000D44 0160+00 1/0 0/0 0/0 .text            actionWarning__15daObjVolcBall_cFv
- */
 void daObjVolcBall_c::actionWarning() {
     if (!dComIfGp_getVibration().CheckQuake()) {
         startQuake();
@@ -260,8 +234,6 @@ void daObjVolcBall_c::actionWarning() {
                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80D22944-80D22C6C 000EA4 0328+00 1/0 0/0 0/0 .text            actionEruption__15daObjVolcBall_cFv
- */
 void daObjVolcBall_c::actionEruption() {
     if (!dComIfGp_getVibration().CheckQuake()) {
         startQuake();
@@ -323,8 +295,6 @@ void daObjVolcBall_c::actionEruption() {
                           dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80D22C6C-80D22CD4 0011CC 0068+00 1/1 0/0 0/0 .text            initActionEnd__15daObjVolcBall_cFv
- */
 void daObjVolcBall_c::initActionEnd() {
     field_0x2925 = 0;
     field_0x2924 = 0;
@@ -337,7 +307,6 @@ void daObjVolcBall_c::initActionEnd() {
     setAction(MODE_END);
 }
 
-/* 80D22CD4-80D22DDC 001234 0108+00 1/0 0/0 0/0 .text            actionEnd__15daObjVolcBall_cFv */
 void daObjVolcBall_c::actionEnd() {
     if (mIsBigVolc != 1 || (mIsBigVolc == 1 && fopAcM_isSwitch(this, getSwBit()))) {
         return;
@@ -368,7 +337,6 @@ void daObjVolcBall_c::actionEnd() {
     
 }
 
-/* 80D22DDC-80D22E24 00133C 0048+00 2/1 0/0 0/0 .text            eventStart__15daObjVolcBall_cFv */
 bool daObjVolcBall_c::eventStart() {
     daObjVolcBom_c* bom_p = (daObjVolcBom_c*)fopAcM_SearchByID(mBigVolcActorID);
     if (bom_p != NULL) {
@@ -378,8 +346,6 @@ bool daObjVolcBall_c::eventStart() {
     return true;
 }
 
-/* 80D22E24-80D22ED4 001384 00B0+00 1/1 0/0 0/0 .text            setEruptEffect__15daObjVolcBall_cFi
- */
 void daObjVolcBall_c::setEruptEffect(int i_ballNo) {
     static u16 const l_effect_id[6] = {0x84A8, 0x84A9, 0x84AA, 0x84AB, 0x84AC, 0x84AD};
 
@@ -392,8 +358,6 @@ void daObjVolcBall_c::setEruptEffect(int i_ballNo) {
     }
 }
 
-/* 80D22ED4-80D22FCC 001434 00F8+00 2/2 0/0 0/0 .text            setFallEffect__15daObjVolcBall_cFi
- */
 void daObjVolcBall_c::setFallEffect(int i_ballNo) {
     static u16 const l_fall_effect_id[4] = {0x84AE, 0x84AF, 0x84B0, 0x84B1};
 
@@ -414,8 +378,6 @@ void daObjVolcBall_c::setFallEffect(int i_ballNo) {
     }
 }
 
-/* 80D22FCC-80D23034 00152C 0068+00 2/2 0/0 0/0 .text            endFallEffect__15daObjVolcBall_cFi
- */
 void daObjVolcBall_c::endFallEffect(int i_ballNo) {
     vball_s* ball = &mBall[i_ballNo];
 
@@ -424,7 +386,6 @@ void daObjVolcBall_c::endFallEffect(int i_ballNo) {
     }
 }
 
-/* 80D23034-80D23188 001594 0154+00 1/1 0/0 0/0 .text createSearchBall__15daObjVolcBall_cFv */
 bool daObjVolcBall_c::createSearchBall() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
     bool var_r30 = false;
@@ -455,7 +416,6 @@ bool daObjVolcBall_c::createSearchBall() {
     return var_r30;
 }
 
-/* 80D23188-80D23438 0016E8 02B0+00 1/1 0/0 0/0 .text createNormalBall__15daObjVolcBall_cFv */
 bool daObjVolcBall_c::createNormalBall() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -515,7 +475,6 @@ bool daObjVolcBall_c::createNormalBall() {
     return bvar;
 }
 
-/* 80D23438-80D23868 001998 0430+00 1/1 0/0 0/0 .text            executeBall__15daObjVolcBall_cFv */
 int daObjVolcBall_c::executeBall() {
     int ret = 0;
     vball_s* ball = mBall;
@@ -579,7 +538,6 @@ int daObjVolcBall_c::executeBall() {
     return ret;
 }
 
-/* 80D23868-80D23904 001DC8 009C+00 3/3 0/0 0/0 .text            startQuake__15daObjVolcBall_cFv */
 void daObjVolcBall_c::startQuake() {
     if (mIsBigVolc == 0) {
         dComIfGp_getVibration().StartQuake(2, 31, cXyz(0.0f, 1.0f, 0.0f));
@@ -588,7 +546,6 @@ void daObjVolcBall_c::startQuake() {
     }
 }
 
-/* 80D23904-80D23A0C 001E64 0108+00 1/1 0/0 0/0 .text            draw__15daObjVolcBall_cFv */
 int daObjVolcBall_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
 
@@ -617,7 +574,6 @@ int daObjVolcBall_c::draw() {
     return 1;
 }
 
-/* 80D23A0C-80D23AA4 001F6C 0098+00 1/1 0/0 0/0 .text            _delete__15daObjVolcBall_cFv */
 int daObjVolcBall_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
 
@@ -632,28 +588,22 @@ int daObjVolcBall_c::_delete() {
     return 1;
 }
 
-/* 80D23AA4-80D23AC4 002004 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Draw__FP15daObjVolcBall_c */
 static int daObjVolcBall_Draw(daObjVolcBall_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D23AC4-80D23AE4 002024 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Execute__FP15daObjVolcBall_c
- */
 static int daObjVolcBall_Execute(daObjVolcBall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D23AE4-80D23B04 002044 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Delete__FP15daObjVolcBall_c */
 static int daObjVolcBall_Delete(daObjVolcBall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D23B04-80D23B24 002064 0020+00 1/0 0/0 0/0 .text daObjVolcBall_Create__FP10fopAc_ac_c */
 static int daObjVolcBall_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjVolcBall_c*>(i_this)->create();
 }
 
-/* 80D23FE8-80D24008 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjVolcBall_Method */
 static actor_method_class l_daObjVolcBall_Method = {
     (process_method_func)daObjVolcBall_Create,
     (process_method_func)daObjVolcBall_Delete,
@@ -662,7 +612,6 @@ static actor_method_class l_daObjVolcBall_Method = {
     (process_method_func)daObjVolcBall_Draw,
 };
 
-/* 80D24008-80D24038 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_VolcanicBall */
 extern actor_process_profile_definition g_profile_Obj_VolcanicBall = {
   fpcLy_CURRENT_e,         // mLayerID
   3,                       // mListID
diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp
index f11c0f6e80..935311f4cc 100644
--- a/src/d/actor/d_a_obj_volcbom.cpp
+++ b/src/d/actor/d_a_obj_volcbom.cpp
@@ -27,7 +27,6 @@ void daObjVolcBom_HIO_c::genMessage(JORMContext* ctx) {
 static daObjVolcBom_HIO_c l_HIO;
 #endif
 
-/* 80D24198-80D241E0 000078 0048+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* param_1, int param_2) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (param_1 != 0) {
@@ -36,14 +35,12 @@ static int eventCallBack(void* param_1, int param_2) {
     return 1;
 }
 
-/* 80D241E0-80D24238 0000C0 0058+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjVolcBom_cFv */
 void daObjVolcBom_c::initBaseMtx() {
     mModel1->setBaseScale(scale);
     mModel2->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D24238-80D242A8 000118 0070+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjVolcBom_cFv */
 void daObjVolcBom_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -52,36 +49,28 @@ void daObjVolcBom_c::setBaseMtx() {
     mModel2->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D26B5C-80D26B68 000000 000C+00 9/9 0/0 0/0 .rodata          l_midna_offset */
 static Vec const l_midna_offset = {
     0.0f, 1000.0f, 0.0f,
 };
 
-/* 80D26B68-80D26B6C 00000C 0002+02 0/1 0/0 0/0 .rodata          l_disapp_eff */
 static u16 const l_disapp_eff[1] = { 0x8B30 };
 
-/* 80D26B6C-80D26B74 000010 0006+02 0/1 0/0 0/0 .rodata          l_start_eff */
 static u16 const l_start_eff[3] = {
     0x8B31,
     0x8B32,
     0x8B33,
 };
 
-/* 80D26B74-80D26B7C 000018 0008+00 1/1 0/0 0/0 .rodata          l_bind_eff */
 static u16 const l_bind_eff[4] = {
     0x8B47, 0x8B48, 0x8B49, 0x8B4A,
 };
 
-/* 80D26C74-80D26C78 -00001 0004+00 5/6 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "M_VolcBom";
 
-/* 80D26C78-80D26C7C -00001 0004+00 0/1 0/0 0/0 .data            l_portal_warp_name */
 static char* l_portal_warp_name = "PORTAL_WARP_BIGVOLC";
 
-/* 80D26C7C-80D26C80 -00001 0004+00 2/2 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name = "BigVolc";
 
-/* 80D26C80-80D26CC4 00002C 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x1f}, {0x0, 0x10}, 0x78}}, // mObj
@@ -96,7 +85,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80D242A8-80D244E0 000188 0238+00 1/0 0/0 0/0 .text            Create__14daObjVolcBom_cFv */
 int daObjVolcBom_c::Create() {
     int swbit = getSwbit();
     if (fopAcM_isSwitch(this, swbit)) {
@@ -148,7 +136,6 @@ int daObjVolcBom_c::Create() {
     #endif
 }
 
-/* 80D244E0-80D248AC 0003C0 03CC+00 1/0 0/0 0/0 .text            CreateHeap__14daObjVolcBom_cFv */
 int daObjVolcBom_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 12);
     JUT_ASSERT(389, modelData != NULL);
@@ -204,7 +191,6 @@ int daObjVolcBom_c::CreateHeap() {
     return 1;
 }
 
-/* 80D248F4-80D249D0 0007D4 00DC+00 1/1 0/0 0/0 .text            create1st__14daObjVolcBom_cFv */
 int daObjVolcBom_c::create1st() {
         /* dSv_event_flag_c::M_032 - Main Event - Melted Zora river ice with magma rock */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[65])) {
@@ -234,8 +220,6 @@ int daObjVolcBom_c::create1st() {
     return rv;
 }
 
-/* 80D249D0-80D24A2C 0008B0 005C+00 1/0 0/0 0/0 .text            Execute__14daObjVolcBom_cFPPA3_A4_f
- */
 int daObjVolcBom_c::Execute(Mtx** i_mtx) {
     mode_proc_call();
     *i_mtx = &mBgMtx;
@@ -264,8 +248,6 @@ int daObjVolcBom_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D24A2C-80D24B18 00090C 00EC+00 1/1 0/0 0/0 .text            mode_proc_call__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::mode_proc_call() {
     static daObjVolcBom_c::modeFunc mode_proc[4] = {
         &daObjVolcBom_c::modeWaitAppear,
@@ -295,7 +277,6 @@ void daObjVolcBom_c::mode_proc_call() {
     #endif
 }
 
-/* 80D24B18-80D24B6C 0009F8 0054+00 1/1 0/0 0/0 .text init_modeWaitAppear__14daObjVolcBom_cFv */
 void daObjVolcBom_c::init_modeWaitAppear() {
     disappear();
     clrDzb();
@@ -304,8 +285,6 @@ void daObjVolcBom_c::init_modeWaitAppear() {
     mMode = MODE_WAIT_APPEAR;
 }
 
-/* 80D24B6C-80D24D80 000A4C 0214+00 1/0 0/0 0/0 .text            modeWaitAppear__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::modeWaitAppear() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     J3DJoint* root_jnt = mModel1->getModelData()->getJointNodePointer(0);
@@ -354,8 +333,6 @@ void daObjVolcBom_c::modeWaitAppear() {
     }
 }
 
-/* 80D24D80-80D24E50 000C60 00D0+00 1/1 0/0 0/0 .text            init_modeFall__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::init_modeFall() {
     mBrk2->setPlaySpeed(1.0f);
     mBtk2->setPlaySpeed(1.0f);
@@ -368,7 +345,6 @@ void daObjVolcBom_c::init_modeFall() {
     mMode = MODE_FALL;
 }
 
-/* 80D26BB0-80D26BC0 000054 000E+02 0/1 0/0 0/0 .rodata          l_effect_id$4032 */
 static u16 const l_effect_id[7] = {
     0x85F7,
     0x85F8,
@@ -379,7 +355,6 @@ static u16 const l_effect_id[7] = {
     0x85FD,
 };
 
-/* 80D24E50-80D25024 000D30 01D4+00 1/0 0/0 0/0 .text            modeFall__14daObjVolcBom_cFv */
 void daObjVolcBom_c::modeFall() {
     bool isHomeHeight = false;
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -413,14 +388,11 @@ void daObjVolcBom_c::modeFall() {
     }
 }
 
-/* 80D25024-80D25038 000F04 0014+00 1/1 0/0 0/0 .text init_modeWaitEndFallDemo__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::init_modeWaitEndFallDemo() {
     mSmokeTimer = 5;
     mMode = MODE_WAIT_END_FALL_DEMO;
 }
 
-/* 80D25038-80D25094 000F18 005C+00 1/0 0/0 0/0 .text modeWaitEndFallDemo__14daObjVolcBom_cFv */
 void daObjVolcBom_c::modeWaitEndFallDemo() {
     if (cLib_calcTimer(&mSmokeTimer) == 0) {
         setSmoke();
@@ -431,8 +403,6 @@ void daObjVolcBom_c::modeWaitEndFallDemo() {
     }
 }
 
-/* 80D25094-80D25100 000F74 006C+00 2/2 0/0 0/0 .text            init_modeWait__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::init_modeWait() {
     eyePos = current.pos;
     attention_info.position = current.pos;
@@ -441,7 +411,6 @@ void daObjVolcBom_c::init_modeWait() {
     mMode = MODE_WAIT;
 }
 
-/* 80D25100-80D25178 000FE0 0078+00 1/0 0/0 0/0 .text            modeWait__14daObjVolcBom_cFv */
 void daObjVolcBom_c::modeWait() {
     cXyz cStack_18(current.pos);
     cStack_18.y -= 750.0f;
@@ -450,31 +419,26 @@ void daObjVolcBom_c::modeWait() {
     event_proc_call();
 }
 
-/* 80D25178-80D251CC 001058 0054+00 1/1 0/0 0/0 .text            clrDzb__14daObjVolcBom_cFv */
 void daObjVolcBom_c::clrDzb() {
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mpBgW);
     }
 }
 
-/* 80D251CC-80D25224 0010AC 0058+00 1/1 0/0 0/0 .text            setDzb__14daObjVolcBom_cFv */
 void daObjVolcBom_c::setDzb() {
     if (mpBgW != NULL && !mpBgW->ChkUsed()) {
         dComIfG_Bgsp().Regist(mpBgW, this);
     }
 }
 
-/* 80D25224-80D25230 001104 000C+00 2/2 0/0 0/0 .text            appear__14daObjVolcBom_cFv */
 void daObjVolcBom_c::appear() {
     misAppearing = false;
 }
 
-/* 80D25230-80D2523C 001110 000C+00 1/1 0/0 0/0 .text            disappear__14daObjVolcBom_cFv */
 void daObjVolcBom_c::disappear() {
     misAppearing = true;
 }
 
-/* 80D2523C-80D252C8 00111C 008C+00 2/2 0/0 0/0 .text            setSmoke__14daObjVolcBom_cFv */
 void daObjVolcBom_c::setSmoke() {
     if (mSmokeEmitter == NULL) {
         mSmokeEmitter =
@@ -487,7 +451,6 @@ void daObjVolcBom_c::setSmoke() {
     }
 }
 
-/* 80D252C8-80D25364 0011A8 009C+00 3/3 0/0 0/0 .text checkTalkDistance__14daObjVolcBom_cFv */
 bool daObjVolcBom_c::checkTalkDistance() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     f32 playerDist = fopAcM_searchPlayerDistanceXZ(this);
@@ -499,7 +462,6 @@ bool daObjVolcBom_c::checkTalkDistance() {
     return false;
 }
 
-/* 80D25364-80D253FC 001244 0098+00 1/1 0/0 0/0 .text calcMidnaWaitPos__14daObjVolcBom_cFv */
 void daObjVolcBom_c::calcMidnaWaitPos() {
     cXyz cStack_18(0.0f, 1000.0f, 0.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -509,7 +471,6 @@ void daObjVolcBom_c::calcMidnaWaitPos() {
     attention_info.position.y += 250.0f;
 }
 
-/* 80D253FC-80D25528 0012DC 012C+00 1/1 0/0 0/0 .text            setSrcEffect__14daObjVolcBom_cFv */
 void daObjVolcBom_c::setSrcEffect() {
     for (int i = 0; i < 1; i++) {
         mDisappearEmitters[i] = dComIfGp_particle_set(l_disapp_eff[i], &current.pos, &home.angle, &scale,
@@ -528,8 +489,6 @@ void daObjVolcBom_c::setSrcEffect() {
     }
 }
 
-/* 80D25528-80D255F4 001408 00CC+00 1/1 0/0 0/0 .text            setBindEffect__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::setBindEffect() {
     for (int i = 0; i < 4; i++) {
         mBindEmitters[i] = dComIfGp_particle_set(l_bind_eff[i], &current.pos, &home.angle, &scale,
@@ -540,7 +499,6 @@ void daObjVolcBom_c::setBindEffect() {
     }
 }
 
-/* 80D255F4-80D25664 0014D4 0070+00 1/1 0/0 0/0 .text followBindEffect__14daObjVolcBom_cFv */
 void daObjVolcBom_c::followBindEffect() {
     for (int i = 0; i < 4; i++) {
         if (mBindEmitters[i] != NULL) {
@@ -549,8 +507,6 @@ void daObjVolcBom_c::followBindEffect() {
     }
 }
 
-/* 80D25664-80D256B8 001544 0054+00 1/1 0/0 0/0 .text            endBindEffect__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::endBindEffect() {
     for (int i = 0; i < 4; i++) {
         if (mBindEmitters[i] != NULL) {
@@ -561,8 +517,6 @@ void daObjVolcBom_c::endBindEffect() {
     }
 }
 
-/* 80D256B8-80D25758 001598 00A0+00 1/1 0/0 0/0 .text            followSrcEffect__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::followSrcEffect() {
     for (int i = 0; i < 1; i++) {
         if (mDisappearEmitters[i] != NULL) {
@@ -577,7 +531,6 @@ void daObjVolcBom_c::followSrcEffect() {
     }
 }
 
-/* 80D25758-80D257E4 001638 008C+00 1/1 0/0 0/0 .text            endSrcEffect__14daObjVolcBom_cFv */
 void daObjVolcBom_c::endSrcEffect() {
     for (int i = 0; i < 1; i++) {
         if (mDisappearEmitters[i] != NULL) {
@@ -596,8 +549,6 @@ void daObjVolcBom_c::endSrcEffect() {
     }
 }
 
-/* 80D257E4-80D25914 0016C4 0130+00 1/1 0/0 0/0 .text            event_proc_call__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::event_proc_call() {
     static daObjVolcBom_c::actionFunc l_func[6] = {
         &daObjVolcBom_c::actionWait,
@@ -619,8 +570,6 @@ void daObjVolcBom_c::event_proc_call() {
     }
 }
 
-/* 80D25914-80D25A08 0017F4 00F4+00 1/1 0/0 0/0 .text            orderZHintEvent__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::orderZHintEvent() {
     daMidna_c* midna = daPy_py_c::getMidnaActor();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -639,7 +588,6 @@ void daObjVolcBom_c::orderZHintEvent() {
     }
 }
 
-/* 80D25A08-80D25B04 0018E8 00FC+00 1/0 0/0 0/0 .text            actionWait__14daObjVolcBom_cFv */
 void daObjVolcBom_c::actionWait() {
     if (checkTalkDistance()
            /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete 
@@ -665,7 +613,6 @@ void daObjVolcBom_c::actionWait() {
     }
 }
 
-/* 80D25B04-80D25CA0 0019E4 019C+00 2/1 0/0 0/0 .text actionOrderEvent__14daObjVolcBom_cFv */
 void daObjVolcBom_c::actionOrderEvent() {
     daMidna_c* midna = daPy_py_c::getMidnaActor();
     if (eventInfo.checkCommandTalk()) {
@@ -681,7 +628,6 @@ void daObjVolcBom_c::actionOrderEvent() {
     }
 }
 
-/* 80D25CA0-80D25DEC 001B80 014C+00 1/0 0/0 0/0 .text actionOrderATalkEvent__14daObjVolcBom_cFv */
 void daObjVolcBom_c::actionOrderATalkEvent() {
     daMidna_c* midna = (daMidna_c*)daPy_py_c::getMidnaActor();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -710,8 +656,6 @@ void daObjVolcBom_c::actionOrderATalkEvent() {
     }
 }
 
-/* 80D25DEC-80D25E78 001CCC 008C+00 1/0 0/0 0/0 .text            actionTalkEvent__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::actionTalkEvent() {
     if (mMsgFlow.doFlow(this, NULL, 0)) {
         dComIfGp_event_reset();
@@ -724,8 +668,6 @@ void daObjVolcBom_c::actionTalkEvent() {
     }
 }
 
-/* 80D25E78-80D25EE4 001D58 006C+00 1/0 0/0 0/0 .text            actionWarpEvent__14daObjVolcBom_cFv
- */
 void daObjVolcBom_c::actionWarpEvent() {
     if (!dComIfGp_evmng_endCheck(mEventId)) {
         dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0);
@@ -733,10 +675,8 @@ void daObjVolcBom_c::actionWarpEvent() {
     }
 }
 
-/* 80D25EE4-80D25EE8 001DC4 0004+00 1/0 0/0 0/0 .text            actionDead__14daObjVolcBom_cFv */
 void daObjVolcBom_c::actionDead() {}
 
-/* 80D25EE8-80D26468 001DC8 0580+00 3/3 0/0 0/0 .text            demoProc__14daObjVolcBom_cFv */
 void daObjVolcBom_c::demoProc() {
     static const char* action_table[4] = {
         "WAIT",
@@ -830,7 +770,6 @@ void daObjVolcBom_c::demoProc() {
     }
 }
 
-/* 80D26468-80D264E8 002348 0080+00 1/1 0/0 0/0 .text            calcObjPos__14daObjVolcBom_cFv */
 void daObjVolcBom_c::calcObjPos() {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8);
     JUT_ASSERT(1459, pbck != NULL);
@@ -841,7 +780,6 @@ void daObjVolcBom_c::calcObjPos() {
     mWarpSEPos.z = info.mTranslate.z;
 }
 
-/* 80D264E8-80D266FC 0023C8 0214+00 1/0 0/0 0/0 .text            Draw__14daObjVolcBom_cFv */
 int daObjVolcBom_c::Draw() {
     if (misAppearing) {
         return 1;
@@ -896,7 +834,6 @@ int daObjVolcBom_c::Draw() {
     return 1;
 }
 
-/* 80D266FC-80D26774 0025DC 0078+00 1/0 0/0 0/0 .text            Delete__14daObjVolcBom_cFv */
 int daObjVolcBom_c::Delete() {
     #ifdef DEBUG
     if (l_HIO.field_0x04 != 0) {
@@ -920,32 +857,23 @@ int daObjVolcBom_c::Delete() {
     return 1;
 }
 
-/* 80D26774-80D268A8 002654 0134+00 1/0 0/0 0/0 .text daObjVolcBom_create1st__FP14daObjVolcBom_c
- */
 static int daObjVolcBom_create1st(daObjVolcBom_c* i_this) {
     fopAcM_ct(i_this, daObjVolcBom_c);
     return ((daObjVolcBom_c*)i_this)->create1st();
 }
 
-/* 80D26A74-80D26A94 002954 0020+00 1/0 0/0 0/0 .text
- * daObjVolcBom_MoveBGDelete__FP14daObjVolcBom_c                */
 static int daObjVolcBom_MoveBGDelete(daObjVolcBom_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D26A94-80D26AB4 002974 0020+00 1/0 0/0 0/0 .text
- * daObjVolcBom_MoveBGExecute__FP14daObjVolcBom_c               */
 static int daObjVolcBom_MoveBGExecute(daObjVolcBom_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D26AB4-80D26AE0 002994 002C+00 1/0 0/0 0/0 .text daObjVolcBom_MoveBGDraw__FP14daObjVolcBom_c
- */
 static int daObjVolcBom_MoveBGDraw(daObjVolcBom_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D26DC4-80D26DE4 -00001 0020+00 1/0 0/0 0/0 .data            daObjVolcBom_METHODS */
 static actor_method_class daObjVolcBom_METHODS = {
     (process_method_func)daObjVolcBom_create1st,
     (process_method_func)daObjVolcBom_MoveBGDelete,
@@ -954,7 +882,6 @@ static actor_method_class daObjVolcBom_METHODS = {
     (process_method_func)daObjVolcBom_MoveBGDraw,
 };
 
-/* 80D26DE4-80D26E14 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_VolcanicBomb */
 extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp
index 902a57bf7d..8c66522d24 100644
--- a/src/d/actor/d_a_obj_warp_kbrg.cpp
+++ b/src/d/actor/d_a_obj_warp_kbrg.cpp
@@ -13,40 +13,28 @@
 #include "d/d_bg_w.h"
 #include "d/d_meter2_info.h"
 
-/* 80D295B4-80D295BC 000000 0008+00 6/6 0/0 0/0 .rodata          l_bmd_idx */
 static const int l_bmd_idx[] = {9, 11};
 
-/* 80D295BC-80D295C4 000008 0008+00 1/1 0/0 0/0 .rodata          l_dzb_idx */
 static const int l_dzb_idx[] = {15, 22};
 
-/* 80D295C4-80D295CC 000010 0008+00 0/1 0/0 0/0 .rodata          l_btk_idx */
 static const int l_btk_idx[] = {12, 19};
 
-/* 80D295CC-80D295D4 000018 0008+00 1/2 0/0 0/0 .rodata          l_bck_idx */
 static const int l_bck_idx[] = {6, 7};
 
-/* 80D295D4-80D295E0 000020 000A+02 0/1 0/0 0/0 .rodata          l_disapp_eff */
 static const u16 l_disapp_eff[] = {0x8532, 0x8533, 0x8534, 0x8535, 0x8536};
 
-/* 80D295E0-80D295E8 00002C 0006+02 0/1 0/0 0/0 .rodata          l_start_eff */
 static const u16 l_start_eff[] = {0x8B3F, 0x8B40, 0x8B41};
 
-/* 80D295E8-80D295F4 000034 000C+00 0/1 0/0 0/0 .rodata          l_app_eff */
 static const u16 l_app_eff[] = {0x852D, 0x852E, 0x852F, 0x8530, 0x8531, 0x8B3C};
 
-/* 80D295F4-80D295F8 000040 0004+00 0/1 0/0 0/0 .rodata          l_end_eff */
 static const u16 l_end_eff[] = {0x8B3D, 0x8B3E};
 
-/* 80D295F8-80D29600 000044 0008+00 1/1 0/0 0/0 .rodata          l_bind_eff */
 static const u16 l_bind_eff[] = {0x8B4F, 0x8B50, 0x8B51, 0x8B52};
 
-/* 80D29600-80D29608 00004C 0008+00 1/1 0/0 0/0 .rodata          l_heap_size */
 static const u32 l_heap_size[] = {0x6400, 0x7E60};
 
-/* 80D29608-80D29614 000054 000C+00 1/1 0/0 0/0 .rodata          l_midna_wait_offset */
 static const Vec l_midna_wait_offset = {0.0f, -200.0f, 1200.0f};
 
-/* 80D26F38-80D26FA8 000078 0070+00 1/1 0/0 0/0 .text            eventCallBack__FPvi */
 static int eventCallBack(void* i_proc, int param_1) {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -63,7 +51,6 @@ static int eventCallBack(void* i_proc, int param_1) {
     return 1;
 }
 
-/* 80D26FA8-80D27008 0000E8 0060+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::initBaseMtx() {
     mpBridgeModel->setBaseScale(scale);
 
@@ -74,7 +61,6 @@ void daObjWarpKBrg_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D27008-80D270C4 000148 00BC+00 2/2 0/0 0/0 .text            setBaseMtx__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mpBridgeModel->setBaseTRMtx(mDoMtx_stack_c::get());
@@ -91,25 +77,20 @@ void daObjWarpKBrg_c::setBaseMtx() {
     }
 }
 
-/* 80D29730-80D29738 -00001 0008+00 5/5 0/0 0/0 .data            l_arcName */
 static char* l_arcName[2] = {
     "Obj_kbrgS",
     "Obj_kbrgD",
 };
 
-/* 80D29738-80D2973C -00001 0004+00 3/3 0/0 0/0 .data            l_evArcName */
 static char* l_evArcName = "Obj_kbrg";
 
-/* 80D2973C-80D29744 -00001 0008+00 1/1 0/0 0/0 .data            l_portal_warp_name */
 static char* l_portal_warp_name[2] = {
     "PORTAL_WARP_KBRIDGE",
     "PORTAL_WARP_KBRIDGE_OUT",
 };
 
-/* 80D29744-80D29748 -00001 0004+00 4/4 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name = "WarpBrg";
 
-/* 80D270C4-80D27300 000204 023C+00 1/0 0/0 0/0 .text            Create__15daObjWarpKBrg_cFv */
 int daObjWarpKBrg_c::Create() {
     switch (getNameArg()) {
     case 0:
@@ -173,7 +154,6 @@ int daObjWarpKBrg_c::Create() {
     return 1;
 }
 
-/* 80D27300-80D2766C 000440 036C+00 1/0 0/0 0/0 .text            CreateHeap__15daObjWarpKBrg_cFv */
 int daObjWarpKBrg_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bmd_idx[getNameArg()]);
     JUT_ASSERT(380, modelData != NULL);
@@ -231,7 +211,6 @@ int daObjWarpKBrg_c::CreateHeap() {
     return 1;
 }
 
-/* 80D276B4-80D2781C 0007F4 0168+00 1/1 0/0 0/0 .text            create1st__15daObjWarpKBrg_cFv */
 int daObjWarpKBrg_c::create1st() {
     if (!mPrmInit) {
         mMsgID = home.angle.z;
@@ -276,7 +255,6 @@ int daObjWarpKBrg_c::create1st() {
     return phase_state;
 }
 
-/* 80D2781C-80D27890 00095C 0074+00 1/0 0/0 0/0 .text Execute__15daObjWarpKBrg_cFPPA3_A4_f */
 int daObjWarpKBrg_c::Execute(Mtx** param_0) {
     #if VERSION == VERSION_SHIELD_DEBUG
     calcMidnaWaitPos();
@@ -293,7 +271,6 @@ int daObjWarpKBrg_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D27890-80D27A38 0009D0 01A8+00 1/1 0/0 0/0 .text event_proc_call__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::event_proc_call() {
     static void (daObjWarpKBrg_c::*l_func[])() = {
         &daObjWarpKBrg_c::actionWait,
@@ -322,7 +299,6 @@ void daObjWarpKBrg_c::event_proc_call() {
     }
 }
 
-/* 80D27A38-80D27B2C 000B78 00F4+00 1/1 0/0 0/0 .text orderZHintEvent__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::orderZHintEvent() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -343,7 +319,6 @@ void daObjWarpKBrg_c::orderZHintEvent() {
     }
 }
 
-/* 80D27B2C-80D27C6C 000C6C 0140+00 1/0 0/0 0/0 .text            actionWait__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionWait() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -366,7 +341,6 @@ void daObjWarpKBrg_c::actionWait() {
     }
 }
 
-/* 80D27C6C-80D27E08 000DAC 019C+00 2/1 0/0 0/0 .text actionOrderEvent__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionOrderEvent() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
 
@@ -381,7 +355,6 @@ void daObjWarpKBrg_c::actionOrderEvent() {
     }
 }
 
-/* 80D27E08-80D27ED0 000F48 00C8+00 1/0 0/0 0/0 .text actionWaitWarpEvent__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionWaitWarpEvent() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
 
@@ -394,8 +367,6 @@ void daObjWarpKBrg_c::actionWaitWarpEvent() {
     }
 }
 
-/* 80D27ED0-80D28040 001010 0170+00 1/0 0/0 0/0 .text actionOrderATalkEvent__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::actionOrderATalkEvent() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
 
@@ -419,7 +390,6 @@ void daObjWarpKBrg_c::actionOrderATalkEvent() {
     }
 }
 
-/* 80D28040-80D280CC 001180 008C+00 1/0 0/0 0/0 .text actionTalkEvent__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionTalkEvent() {
     if (mMsgFlow.doFlow(this, NULL, 0)) {
         dComIfGp_event_reset();
@@ -436,7 +406,6 @@ void daObjWarpKBrg_c::actionTalkEvent() {
     }
 }
 
-/* 80D280CC-80D28144 00120C 0078+00 1/0 0/0 0/0 .text actionWarpEvent__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionWarpEvent() {
     if (!dComIfGp_evmng_endCheck(mEventId[mEventType])) {
         dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0);
@@ -444,13 +413,10 @@ void daObjWarpKBrg_c::actionWarpEvent() {
     }
 }
 
-/* 80D28144-80D28148 001284 0004+00 1/0 0/0 0/0 .text            actionDead__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionDead() {}
 
-/* 80D28148-80D2814C 001288 0004+00 1/0 0/0 0/0 .text            actionWait2__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionWait2() {}
 
-/* 80D2814C-80D281E4 00128C 0098+00 1/0 0/0 0/0 .text actionOrderEvent2__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionOrderEvent2() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_WARP_EVENT2_e);
@@ -461,7 +427,6 @@ void daObjWarpKBrg_c::actionOrderEvent2() {
     }
 }
 
-/* 80D281E4-80D28248 001324 0064+00 1/0 0/0 0/0 .text actionWarpEvent2__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionWarpEvent2() {
     if (dComIfGp_evmng_endCheck(mEventId[mEventType])) {
         setAction(ACTION_DEAD2_e);
@@ -470,10 +435,8 @@ void daObjWarpKBrg_c::actionWarpEvent2() {
     }
 }
 
-/* 80D28248-80D2824C 001388 0004+00 1/0 0/0 0/0 .text            actionDead2__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::actionDead2() {}
 
-/* 80D2824C-80D28A50 00138C 0804+00 8/6 0/0 0/0 .text            demoProc__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::demoProc() {
     static char* action_table[7] = {
         "WAIT",
@@ -645,7 +608,6 @@ void daObjWarpKBrg_c::demoProc() {
     }
 }
 
-/* 80D28A50-80D28AE0 001B90 0090+00 1/1 0/0 0/0 .text            calcObjPos__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::calcObjPos() {
     J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bck_idx[getNameArg()]);
     JUT_ASSERT(1191, pbck != NULL);
@@ -657,7 +619,6 @@ void daObjWarpKBrg_c::calcObjPos() {
     mObjPos.z = transinfo.mTranslate.z;
 }
 
-/* 80D28AE0-80D28B7C 001C20 009C+00 2/2 0/0 0/0 .text checkTalkDistance__15daObjWarpKBrg_cFv */
 bool daObjWarpKBrg_c::checkTalkDistance() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 player_dist = fopAcM_searchPlayerDistanceXZ(this);
@@ -669,7 +630,6 @@ bool daObjWarpKBrg_c::checkTalkDistance() {
     }
 }
 
-/* 80D28B7C-80D28C10 001CBC 0094+00 1/1 0/0 0/0 .text calcMidnaWaitPos__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::calcMidnaWaitPos() {
     cXyz offset(l_midna_wait_offset);
     mDoMtx_stack_c::transS(current.pos);
@@ -680,8 +640,6 @@ void daObjWarpKBrg_c::calcMidnaWaitPos() {
     attention_info.position.y += 250.0f;
 }
 
-/* 80D28C10-80D28CDC 001D50 00CC+00 1/1 0/0 0/0 .text            setBindEffect__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::setBindEffect() {
     for (int i = 0; i < 4; i++) {
         mBindEfEmitterID[i] = dComIfGp_particle_set(l_bind_eff[i], &current.pos, &home.angle, &scale, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -691,7 +649,6 @@ void daObjWarpKBrg_c::setBindEffect() {
     }
 }
 
-/* 80D28CDC-80D28D4C 001E1C 0070+00 1/1 0/0 0/0 .text followBindEffect__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::followBindEffect() {
     for (int i = 0; i < 4; i++) {
         if (mBindEfEmitterID[i] != NULL) {
@@ -700,8 +657,6 @@ void daObjWarpKBrg_c::followBindEffect() {
     }
 }
 
-/* 80D28D4C-80D28E9C 001E8C 0150+00 1/1 0/0 0/0 .text            setSrcEffect__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::setSrcEffect() {
     for (int i = 0; i < 5; i++) {
         mDisappEfEmitterID[i] = dComIfGp_particle_set(l_disapp_eff[i], &current.pos, &home.angle, &scale, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -718,8 +673,6 @@ void daObjWarpKBrg_c::setSrcEffect() {
     }
 }
 
-/* 80D28E9C-80D28FEC 001FDC 0150+00 1/1 0/0 0/0 .text            setDstEffect__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::setDstEffect() {
     for (int i = 0; i < 6; i++) {
         mAppEfEmitterID[i] = dComIfGp_particle_set(l_app_eff[i], &current.pos, &home.angle, &scale, 0xFF, NULL, -1, NULL, NULL, NULL);
@@ -736,7 +689,6 @@ void daObjWarpKBrg_c::setDstEffect() {
     }
 }
 
-/* 80D28FEC-80D290A8 00212C 00BC+00 1/1 0/0 0/0 .text followSrcEffect__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::followSrcEffect() {
     for (int i = 0; i < 5; i++) {
         if (mDisappEfEmitterID[i] != NULL) {
@@ -751,7 +703,6 @@ void daObjWarpKBrg_c::followSrcEffect() {
     }
 }
 
-/* 80D290A8-80D29158 0021E8 00B0+00 1/1 0/0 0/0 .text followDstEffect__15daObjWarpKBrg_cFv */
 void daObjWarpKBrg_c::followDstEffect() {
     for (int i = 0; i < 6; i++) {
         if (mAppEfEmitterID[i] != NULL) {
@@ -766,8 +717,6 @@ void daObjWarpKBrg_c::followDstEffect() {
     }
 }
 
-/* 80D29158-80D291FC 002298 00A4+00 1/1 0/0 0/0 .text            endSrcEffect__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::endSrcEffect() {
     for (int i = 0; i < 5; i++) {
         if (mDisappEfEmitterID[i] != NULL) {
@@ -786,8 +735,6 @@ void daObjWarpKBrg_c::endSrcEffect() {
     }
 }
 
-/* 80D291FC-80D292A0 00233C 00A4+00 2/2 0/0 0/0 .text            endDstEffect__15daObjWarpKBrg_cFv
- */
 void daObjWarpKBrg_c::endDstEffect() {
     for (int i = 0; i < 6; i++) {
         if (mAppEfEmitterID[i] != NULL) {
@@ -806,7 +753,6 @@ void daObjWarpKBrg_c::endDstEffect() {
     }
 }
 
-/* 80D292A0-80D29448 0023E0 01A8+00 1/0 0/0 0/0 .text            Draw__15daObjWarpKBrg_cFv */
 int daObjWarpKBrg_c::Draw() {
     if (getNameArg() == 1) {
         g_env_light.settingTevStruct(32, &current.pos, &tevStr);
@@ -842,7 +788,6 @@ int daObjWarpKBrg_c::Draw() {
     return 1;
 }
 
-/* 80D29448-80D294B0 002588 0068+00 1/0 0/0 0/0 .text            Delete__15daObjWarpKBrg_cFv */
 int daObjWarpKBrg_c::Delete() {
     endSrcEffect();
     endDstEffect();
@@ -852,32 +797,23 @@ int daObjWarpKBrg_c::Delete() {
     return 1;
 }
 
-/* 80D294B0-80D29524 0025F0 0074+00 1/0 0/0 0/0 .text daObjWarpKBrg_create1st__FP15daObjWarpKBrg_c
- */
 static int daObjWarpKBrg_create1st(daObjWarpKBrg_c* i_this) {
     fopAcM_ct(i_this, daObjWarpKBrg_c);
     return i_this->create1st();
 }
 
-/* 80D29524-80D29544 002664 0020+00 1/0 0/0 0/0 .text
- * daObjWarpKBrg_MoveBGDelete__FP15daObjWarpKBrg_c              */
 static int daObjWarpKBrg_MoveBGDelete(daObjWarpKBrg_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D29544-80D29564 002684 0020+00 1/0 0/0 0/0 .text
- * daObjWarpKBrg_MoveBGExecute__FP15daObjWarpKBrg_c             */
 static int daObjWarpKBrg_MoveBGExecute(daObjWarpKBrg_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D29564-80D29590 0026A4 002C+00 1/0 0/0 0/0 .text
- * daObjWarpKBrg_MoveBGDraw__FP15daObjWarpKBrg_c                */
 static int daObjWarpKBrg_MoveBGDraw(daObjWarpKBrg_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D298A4-80D298C4 -00001 0020+00 1/0 0/0 0/0 .data            daObjWarpKBrg_METHODS */
 static actor_method_class daObjWarpKBrg_METHODS = {
     (process_method_func)daObjWarpKBrg_create1st,
     (process_method_func)daObjWarpKBrg_MoveBGDelete,
@@ -886,7 +822,6 @@ static actor_method_class daObjWarpKBrg_METHODS = {
     (process_method_func)daObjWarpKBrg_MoveBGDraw,
 };
 
-/* 80D298C4-80D298F4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_KakarikoBrg */
 extern actor_process_profile_definition g_profile_Obj_KakarikoBrg = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp
index ed904413d2..28ed2b08dd 100644
--- a/src/d/actor/d_a_obj_warp_obrg.cpp
+++ b/src/d/actor/d_a_obj_warp_obrg.cpp
@@ -12,53 +12,40 @@
 #include "d/actor/d_a_midna.h"
 #include "d/d_bg_w.h"
 
-/* 80D2B934-80D2B938 -00001 0004+00 6/6 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_obrg";
 
-/* 80D2B938-80D2B940 -00001 0008+00 1/1 0/0 0/0 .data            l_portal_warp_name */
 static char* l_portal_warp_name[2] = {
     "PORTAL_WARP_OBRIDGE",
     "PORTAL_WARP_OUT_OBRIDGE",
 };
 
-/* 80D2B7F8-80D2B800 000000 0008+00 6/6 0/0 0/0 .rodata          l_bmd_idx */
 static const int l_bmd_idx[] = {12, 11};
 
-/* 80D2B800-80D2B808 000008 0008+00 0/1 0/0 0/0 .rodata          l_dzb_idx */
 static const int l_dzb_idx[] = {20, 19};
 
-/* 80D2B808-80D2B810 000010 0008+00 1/3 0/0 0/0 .rodata          l_bck_idx */
 static const int l_bck_idx[] = {8, 7};
 
-/* 80D2B810-80D2B818 000018 0008+00 0/1 0/0 0/0 .rodata          l_btk_idx */
 static const int l_btk_idx[] = {16, 15};
 
-/* 80D2B818-80D2B824 000020 000A+02 0/1 0/0 0/0 .rodata          l_beam_eff */
 static const u16 l_beam_eff[] = {0x8B4B, 0x8B4C, 0x8B4D, 0x8B4E, 0x8B53};
 
-/* 80D2B824-80D2B830 00002C 000A+02 0/1 0/0 0/0 .rodata          l_disapp_eff */
 static const u16 l_disapp_eff[] = {0x8B38, 0x8B39, 0x8B3A, 0x8B3B, 0x8B35};
 
-/* 80D2B830-80D2B838 000038 0006+02 0/1 0/0 0/0 .rodata          l_app_eff */
 static const u16 l_app_eff[] = {0x8B34, 0x8B36, 0x8B37};
 
-/* 80D2B838-80D2B844 000040 000C+00 1/1 0/0 0/0 .rodata          l_midna_wait_offset */
 static const Vec l_midna_wait_offset = {100.0f, -1265.0f, -760.0f};
 
-/* 80D2B940-80D2B948 -00001 0008+00 3/3 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name[2] = {
     "WarpOB1",
     "WarpOB2",
 };
 
-/* 80D299B8-80D29A00 000078 0048+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::initBaseMtx() {
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D29A00-80D29ACC 0000C0 00CC+00 1/1 0/0 0/0 .text            setBaseMtx__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -76,7 +63,6 @@ void daObjWarpOBrg_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D29ACC-80D29BB4 00018C 00E8+00 1/0 0/0 0/0 .text            Create__15daObjWarpOBrg_cFv */
 int daObjWarpOBrg_c::Create() {
     initBaseMtx();
     fopAcM_setCullSizeBox2(this, mpModel->getModelData());
@@ -102,7 +88,6 @@ int daObjWarpOBrg_c::Create() {
     return 1;
 }
 
-/* 80D29BB4-80D29E34 000274 0280+00 1/0 0/0 0/0 .text            CreateHeap__15daObjWarpOBrg_cFv */
 int daObjWarpOBrg_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd_idx[getNameArg()]);
     JUT_ASSERT(254, modelData != NULL);
@@ -139,7 +124,6 @@ int daObjWarpOBrg_c::CreateHeap() {
     return 1;
 }
 
-/* 80D29E7C-80D2A008 00053C 018C+00 1/1 0/0 0/0 .text            create1st__15daObjWarpOBrg_cFv */
 int daObjWarpOBrg_c::create1st() {
     if (!mPrmInit) {
         mMsgID = home.angle.z;
@@ -192,7 +176,6 @@ int daObjWarpOBrg_c::create1st() {
     return phase_state;
 }
 
-/* 80D2A008-80D2A04C 0006C8 0044+00 1/0 0/0 0/0 .text Execute__15daObjWarpOBrg_cFPPA3_A4_f */
 int daObjWarpOBrg_c::Execute(Mtx** param_0) {
     #if VERSION == VERSION_SHIELD_DEBUG
     calcMidnaWaitPos();
@@ -204,7 +187,6 @@ int daObjWarpOBrg_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 80D2A04C-80D2A194 00070C 0148+00 1/1 0/0 0/0 .text event_proc_call__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::event_proc_call() {
     static void (daObjWarpOBrg_c::*l_func[])() = {
         &daObjWarpOBrg_c::actionWait,
@@ -229,7 +211,6 @@ void daObjWarpOBrg_c::event_proc_call() {
     }
 }
 
-/* 80D2A194-80D2A4CC 000854 0338+00 1/0 0/0 0/0 .text            actionWait__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionWait() {
     daMidna_c* midna_p = daPy_py_c::getMidnaActor();
 
@@ -271,7 +252,6 @@ void daObjWarpOBrg_c::actionWait() {
     }
 }
 
-/* 80D2A4CC-80D2A740 000B8C 0274+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionOrderEvent() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();
 
@@ -299,7 +279,6 @@ void daObjWarpOBrg_c::actionOrderEvent() {
     }
 }
 
-/* 80D2A740-80D2A7C4 000E00 0084+00 1/0 0/0 0/0 .text actionTalkEvent__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionTalkEvent() {
     if (mMsgFlow.doFlow(this, NULL, 0)) {
         setAction(ACTION_ORDER_EVENT_e);
@@ -312,7 +291,6 @@ void daObjWarpOBrg_c::actionTalkEvent() {
     }
 }
 
-/* 80D2A7C4-80D2A93C 000E84 0178+00 1/0 0/0 0/0 .text actionWarpEvent__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionWarpEvent() {
     if (!dComIfGp_evmng_endCheck(mEventId)) {
         demoProc();
@@ -350,7 +328,6 @@ void daObjWarpOBrg_c::actionWarpEvent() {
     }
 }
 
-/* 80D2A93C-80D2A9E4 000FFC 00A8+00 1/0 0/0 0/0 .text actionOrderEventDst__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionOrderEventDst() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name[getNameArg()], NULL, 0);
@@ -361,17 +338,14 @@ void daObjWarpOBrg_c::actionOrderEventDst() {
     }
 }
 
-/* 80D2A9E4-80D2AA30 0010A4 004C+00 1/0 0/0 0/0 .text actionWarpEventDst__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionWarpEventDst() {
     if (!dComIfGp_evmng_endCheck(mEventId)) {
         demoProc();
     }
 }
 
-/* 80D2AA30-80D2AA34 0010F0 0004+00 1/0 0/0 0/0 .text            actionDead__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::actionDead() {}
 
-/* 80D2AA34-80D2B3BC 0010F4 0988+00 2/2 0/0 0/0 .text            demoProc__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::demoProc() {
     static char* action_table[4] = {
         "WAIT",
@@ -555,7 +529,6 @@ void daObjWarpOBrg_c::demoProc() {
     }
 }
 
-/* 80D2B3BC-80D2B534 001A7C 0178+00 2/2 0/0 0/0 .text checkTalkDistance__15daObjWarpOBrg_cFv */
 bool daObjWarpOBrg_c::checkTalkDistance() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 player_dist = mMidnaWaitPos.absXZ(*fopAcM_GetPosition_p(daPy_getPlayerActorClass()));
@@ -569,7 +542,6 @@ bool daObjWarpOBrg_c::checkTalkDistance() {
     }
 }
 
-/* 80D2B534-80D2B5C8 001BF4 0094+00 1/1 0/0 0/0 .text calcMidnaWaitPos__15daObjWarpOBrg_cFv */
 void daObjWarpOBrg_c::calcMidnaWaitPos() {
     cXyz offset(l_midna_wait_offset);
     mDoMtx_stack_c::transS(current.pos);
@@ -580,7 +552,6 @@ void daObjWarpOBrg_c::calcMidnaWaitPos() {
     attention_info.position.y += 250.0f;
 }
 
-/* 80D2B5C8-80D2B6C0 001C88 00F8+00 1/0 0/0 0/0 .text            Draw__15daObjWarpOBrg_cFv */
 int daObjWarpOBrg_c::Draw() {
     if (getNameArg() == 1) {
         g_env_light.settingTevStruct(32, &current.pos, &tevStr);
@@ -599,38 +570,28 @@ int daObjWarpOBrg_c::Draw() {
     return 1;
 }
 
-/* 80D2B6C0-80D2B6F4 001D80 0034+00 1/0 0/0 0/0 .text            Delete__15daObjWarpOBrg_cFv */
 int daObjWarpOBrg_c::Delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80D2B6F4-80D2B768 001DB4 0074+00 1/0 0/0 0/0 .text daObjWarpOBrg_create1st__FP15daObjWarpOBrg_c
- */
 static int daObjWarpOBrg_create1st(daObjWarpOBrg_c* i_this) {
     fopAcM_ct(i_this, daObjWarpOBrg_c);
     return i_this->create1st();
 }
 
-/* 80D2B768-80D2B788 001E28 0020+00 1/0 0/0 0/0 .text
- * daObjWarpOBrg_MoveBGDelete__FP15daObjWarpOBrg_c              */
 static int daObjWarpOBrg_MoveBGDelete(daObjWarpOBrg_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D2B788-80D2B7A8 001E48 0020+00 1/0 0/0 0/0 .text
- * daObjWarpOBrg_MoveBGExecute__FP15daObjWarpOBrg_c             */
 static int daObjWarpOBrg_MoveBGExecute(daObjWarpOBrg_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D2B7A8-80D2B7D4 001E68 002C+00 1/0 0/0 0/0 .text
- * daObjWarpOBrg_MoveBGDraw__FP15daObjWarpOBrg_c                */
 static int daObjWarpOBrg_MoveBGDraw(daObjWarpOBrg_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D2BA00-80D2BA20 -00001 0020+00 1/0 0/0 0/0 .data            daObjWarpOBrg_METHODS */
 static actor_method_class daObjWarpOBrg_METHODS = {
     (process_method_func)daObjWarpOBrg_create1st,
     (process_method_func)daObjWarpOBrg_MoveBGDelete,
@@ -639,7 +600,6 @@ static actor_method_class daObjWarpOBrg_METHODS = {
     (process_method_func)daObjWarpOBrg_MoveBGDraw,
 };
 
-/* 80D2BA20-80D2BA50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_OrdinBrg */
 extern actor_process_profile_definition g_profile_Obj_OrdinBrg = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp
index 5d906a6c4b..aefe9d1e19 100644
--- a/src/d/actor/d_a_obj_waterGate.cpp
+++ b/src/d/actor/d_a_obj_waterGate.cpp
@@ -15,10 +15,8 @@ static int daWtGate_Execute(daWtGate_c*);
 static int daWtGate_Delete(daWtGate_c*);
 static int daWtGate_Create(fopAc_ac_c*);
 
-/* 80D2C5BC-80D2C5C8 000014 000C+00 3/3 0/0 0/0 .bss             l_HIO */
 static daWtGate_HIO_c l_HIO;
 
-/* 80D2BB8C-80D2BBC4 0000EC 0038+00 1/1 0/0 0/0 .text            __ct__14daWtGate_HIO_cFv */
 daWtGate_HIO_c::daWtGate_HIO_c() {
     mMaxSpeed = 4.0f;
     field_0x8 = 30;
@@ -32,7 +30,6 @@ void daWtGate_HIO_c::genMessage(JORMContext* ctx) {
 }
 #endif
 
-/* 80D2BC0C-80D2BC94 00016C 0088+00 2/2 0/0 0/0 .text            setBaseMtx__10daWtGate_cFv */
 void daWtGate_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); 
@@ -40,7 +37,6 @@ void daWtGate_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D2BC94-80D2BD00 0001F4 006C+00 1/0 0/0 0/0 .text            CreateHeap__10daWtGate_cFv */
 int daWtGate_c::CreateHeap() {
     J3DModelData* const modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("S_Zsuimon", 4));
     JUT_ASSERT(159, modelData != NULL);
@@ -53,7 +49,6 @@ int daWtGate_c::CreateHeap() {
         return 1;
 }
 
-/* 80D2BD00-80D2BE7C 000260 017C+00 1/1 0/0 0/0 .text            create__10daWtGate_cFv */
 cPhs__Step daWtGate_c::create() {
     fopAcM_ct(this, daWtGate_c);
 
@@ -95,7 +90,6 @@ cPhs__Step daWtGate_c::create() {
     return resPhase;
 }
 
-/* 80D2BE7C-80D2BECC 0003DC 0050+00 1/0 0/0 0/0 .text            Execute__10daWtGate_cFPPA3_A4_f */
 int daWtGate_c::Execute(Mtx** i_mtx) {
     move();
 
@@ -105,7 +99,6 @@ int daWtGate_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D2BECC-80D2BF88 00042C 00BC+00 1/1 0/0 0/0 .text            move__10daWtGate_cFv */
 void daWtGate_c::move() {
     static const actionFunc mode_proc[] = {
         &daWtGate_c::modeWait, &daWtGate_c::modeOpen,
@@ -115,12 +108,10 @@ void daWtGate_c::move() {
     (this->*mode_proc[mMode])();
 }
 
-/* 80D2BF88-80D2BF94 0004E8 000C+00 3/3 0/0 0/0 .text            init_modeWait__10daWtGate_cFv */
 void daWtGate_c::init_modeWait() {
     mMode = WAIT;
 }
 
-/* 80D2BF94-80D2C010 0004F4 007C+00 1/0 0/0 0/0 .text            modeWait__10daWtGate_cFv */
 void daWtGate_c::modeWait() {
     //  The state of the switch never actually changes in-game, so after a water gate opens,
     //  it never closes. The aesthetic functionality of closing still works, though
@@ -135,13 +126,11 @@ void daWtGate_c::modeWait() {
     }
 }
 
-/* 80D2C010-80D2C02C 000570 001C+00 1/1 0/0 0/0 .text            init_modeOpen__10daWtGate_cFv */
 void daWtGate_c::init_modeOpen() {
     mMaxMoveSpeed = l_HIO.mMaxSpeed;
     mMode = OPEN;
 }
 
-/* 80D2C02C-80D2C134 00058C 0108+00 1/0 0/0 0/0 .text            modeOpen__10daWtGate_cFv */
 void daWtGate_c::modeOpen() {
     const f32 currentAndOpenedYPosDiff = cLib_addCalc(&current.pos.y, mClosedYPos + mOpenYOffset, 1.0f / 5.0f, mMaxMoveSpeed, 1.0f);
     if(currentAndOpenedYPosDiff == 0.0f) {
@@ -153,13 +142,11 @@ void daWtGate_c::modeOpen() {
     }
 }
 
-/* 80D2C134-80D2C150 000694 001C+00 1/1 0/0 0/0 .text            init_modeClose__10daWtGate_cFv */
 void daWtGate_c::init_modeClose() {
     mMaxMoveSpeed = l_HIO.mMaxSpeed;
     mMode = CLOSE;
 }
 
-/* 80D2C150-80D2C250 0006B0 0100+00 1/0 0/0 0/0 .text            modeClose__10daWtGate_cFv */
 void daWtGate_c::modeClose() {
     const f32 currentAndClosedYPosDiff = cLib_addCalc(&current.pos.y, mClosedYPos, 1.0f / 5.0f, mMaxMoveSpeed, 1.0f);
     if(currentAndClosedYPosDiff == 0.0f) {
@@ -171,17 +158,14 @@ void daWtGate_c::modeClose() {
     }
 }
 
-/* 80D2C250-80D2C25C 0007B0 000C+00 1/1 0/0 0/0 .text            init_modeEnd__10daWtGate_cFv */
 void daWtGate_c::init_modeEnd() {
     mMode = END;
 }
 
-/* 80D2C25C-80D2C260 0007BC 0004+00 1/0 0/0 0/0 .text            modeEnd__10daWtGate_cFv */
 void daWtGate_c::modeEnd() {
     /* empty function */
 }
 
-/* 80D2C260-80D2C304 0007C0 00A4+00 1/0 0/0 0/0 .text            Draw__10daWtGate_cFv */
 int daWtGate_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -193,7 +177,6 @@ int daWtGate_c::Draw() {
     return 1;
 }
 
-/* 80D2C304-80D2C334 000864 0030+00 1/0 0/0 0/0 .text            Delete__10daWtGate_cFv */
 int daWtGate_c::Delete() {
     dComIfG_resDelete(&mPhase, "S_Zsuimon");
 
@@ -204,30 +187,25 @@ int daWtGate_c::Delete() {
     return 1;
 }
 
-/* 80D2C334-80D2C360 000894 002C+00 1/0 0/0 0/0 .text            daWtGate_Draw__FP10daWtGate_c */
 static int daWtGate_Draw(daWtGate_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D2C360-80D2C380 0008C0 0020+00 1/0 0/0 0/0 .text            daWtGate_Execute__FP10daWtGate_c */
 static int daWtGate_Execute(daWtGate_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D2C380-80D2C3A0 0008E0 0020+00 1/0 0/0 0/0 .text            daWtGate_Delete__FP10daWtGate_c */
 static int daWtGate_Delete(daWtGate_c* i_this) {
     const fpc_ProcID procID = fopAcM_GetID(i_this);
     return i_this->MoveBGDelete();
 }
 
-/* 80D2C3A0-80D2C3C0 000900 0020+00 1/0 0/0 0/0 .text            daWtGate_Create__FP10fopAc_ac_c */
 static int daWtGate_Create(fopAc_ac_c* i_this) {
     daWtGate_c* const waterGate = static_cast<daWtGate_c*>(i_this);
     const fpc_ProcID procID = fopAcM_GetID(i_this);
     return waterGate->create();
 }
 
-/* 80D2C518-80D2C538 -00001 0020+00 1/0 0/0 0/0 .data            l_daWtGate_Method */
 static actor_method_class l_daWtGate_Method = {
     (process_method_func)daWtGate_Create,
     (process_method_func)daWtGate_Delete,
@@ -236,7 +214,6 @@ static actor_method_class l_daWtGate_Method = {
     (process_method_func)daWtGate_Draw,
 };
 
-/* 80D2C538-80D2C568 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WtGate */
 extern actor_process_profile_definition g_profile_Obj_WtGate = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp
index 8e931a02f7..66348849db 100644
--- a/src/d/actor/d_a_obj_waterPillar.cpp
+++ b/src/d/actor/d_a_obj_waterPillar.cpp
@@ -10,8 +10,8 @@
 #include "SSystem/SComponent/c_math.h"
 
 struct daWtPillar_HIO_c : public mDoHIO_entry_c {
-    /* 80D2C6CC */ daWtPillar_HIO_c();
-    /* 80D2DF34 */ virtual ~daWtPillar_HIO_c() {}
+    daWtPillar_HIO_c();
+    virtual ~daWtPillar_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -44,7 +44,6 @@ int daWtPillar_Execute(daWtPillar_c* i_this);
 int daWtPillar_Delete(daWtPillar_c* i_this);
 int daWtPillar_Create(fopAc_ac_c* i_this);
 
-/* 80D2C6CC-80D2C768 0000EC 009C+00 1/1 0/0 0/0 .text            __ct__16daWtPillar_HIO_cFv */
 daWtPillar_HIO_c::daWtPillar_HIO_c() {
     field_0x04.setall(1.0f);
     field_0x10.setall(0);
@@ -62,7 +61,6 @@ daWtPillar_HIO_c::daWtPillar_HIO_c() {
     mEffectOscillationMinDecay = 1.0f / 100.0f;
 }
 
-/* 80D2C7B0-80D2C838 0001D0 0088+00 2/2 0/0 0/0 .text            setBaseMtx__12daWtPillar_cFv */
 void daWtPillar_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + mCurrentHeight, current.pos.z);
     mDoMtx_stack_c::transM(mEffectOscillationVerticalOffset.x, mEffectOscillationVerticalOffset.y, mEffectOscillationVerticalOffset.z);
@@ -71,13 +69,10 @@ void daWtPillar_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D2C838-80D2C858 000258 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daWtPillar_cFP10fopAc_ac_c             */
 int daWtPillar_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daWtPillar_c*>(i_this)->CreateHeap();
 }
 
-/* 80D2C858-80D2C960 000278 0108+00 1/1 0/0 0/0 .text            CreateHeap__12daWtPillar_cFv */
 int daWtPillar_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("efWater", 8));
     JUT_ASSERT(369, modelData != NULL);
@@ -97,7 +92,6 @@ int daWtPillar_c::CreateHeap() {
     return 1;
 }
 
-/* 80D2E86C-80D2E884 000020 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 Vec l_cull_box[2] = {
     {-30.0f, -10.0f, -30.0f},
     {30.0f, 60.0f, 30.0f}
@@ -116,19 +110,15 @@ const dCcD_SrcGObjInf daWtPillar_c::mCcDObjCoInfo = {
     {},  // mGObjCo
 };
 
-/* 80D2EB3C-80D2EB94 000014 0058+00 5/5 0/0 0/0 .bss             l_HIO */
 daWtPillar_HIO_c l_HIO;
 
-/* 80D2E884-80D2E8D0 000038 004C+00 1/2 0/0 0/0 .data            mCcDCps__12daWtPillar_c */
 dCcD_SrcCps daWtPillar_c::mCcDCps = {
     daWtPillar_c::mCcDObjInfo,
     { { {0.0f, 0.0f, 0.0f}, {0.0f,1100.0f, 0.0f}, 150.0f }}
 };
 
-/* 80D2E8D0-80D2E914 000084 0044+00 1/2 0/0 0/0 .data            mCcDCyl__12daWtPillar_c */
 dCcD_SrcCyl daWtPillar_c::mCcDCyl = {daWtPillar_c::mCcDObjCoInfo};
 
-/* 80D2C960-80D2CC0C 000380 02AC+00 1/1 0/0 0/0 .text            create__12daWtPillar_cFv */
 cPhs__Step daWtPillar_c::create() {
     fopAcM_ct(this, daWtPillar_c);
     const cPhs__Step phase = static_cast<cPhs__Step>(dComIfG_resLoad(&mPhase, "efWater"));
@@ -216,7 +206,6 @@ cPhs__Step daWtPillar_c::create() {
     return phase;
 }
 
-/* 80D2CC0C-80D2CE4C 00062C 0240+00 1/1 0/0 0/0 .text            execute__12daWtPillar_cFv */
 int daWtPillar_c::execute() {
     mModelRotationAnimation.play();
     mVerticalTextureScrollAnimation.play();
@@ -269,7 +258,6 @@ int daWtPillar_c::execute() {
     return 1;
 }
 
-/* 80D2CE4C-80D2CF98 00086C 014C+00 1/1 0/0 0/0 .text            actionMain__12daWtPillar_cFv */
 void daWtPillar_c::actionMain() {
     static actionFunc l_func[] = {
     &daWtPillar_c::actionSwWait, &daWtPillar_c::actionWait,
@@ -282,7 +270,6 @@ void daWtPillar_c::actionMain() {
     (this->*l_func[mAction])();
 }
 
-/* 80D2EA04-80D2EA14 0001B8 000E+02 1/1 0/0 0/0 .data            l_eff$3970 */
 static u16 l_eff[7] = {
     0x86E3, // Smoke-like water foam particles, placed at pillar top
     0x86E4, // Large paint splatter-type water foam particles, placed at pillar top
@@ -293,7 +280,6 @@ static u16 l_eff[7] = {
     0x86EA  // Water splash particles, placed at pillar top
 };
 
-/* 80D2CF98-80D2D278 0009B8 02E0+00 1/1 0/0 0/0 .text            effectSet__12daWtPillar_cFv */
 void daWtPillar_c::effectSet() {
     // Create foam particles at the bottom and top of the pillar
     cXyz effectOscillationOffset;
@@ -324,7 +310,6 @@ void daWtPillar_c::effectSet() {
         mBottomAndTopParticleEmmitters[6] = dComIfGp_particle_set(mBottomAndTopParticleEmmitters[6],l_eff[6], &mTopPos, NULL, NULL);
 }
 
-/* 80D2D278-80D2D3FC 000C98 0184+00 1/1 0/0 0/0 .text            effectSet2__12daWtPillar_cFv */
 void daWtPillar_c::effectSet2() {
       
     /* If the bottom of the pillar is at least 500.0 units underwater and the
@@ -351,13 +336,10 @@ void daWtPillar_c::effectSet2() {
     }
 }
 
-/* 80D2D3FC-80D2D408 000E1C 000C+00 1/1 0/0 0/0 .text            actionSwWaitInit__12daWtPillar_cFv
- */
 void daWtPillar_c::actionSwWaitInit() {
     mAction = ACTION_SW_WAIT;
 }
 
-/* 80D2D408-80D2D488 000E28 0080+00 1/0 0/0 0/0 .text            actionSwWait__12daWtPillar_cFv */
 void daWtPillar_c::actionSwWait() {
     if(dComIfGs_isSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this))) { 
         if(getEventID() != 0xFF)
@@ -367,13 +349,11 @@ void daWtPillar_c::actionSwWait() {
     }
 }
 
-/* 80D2D488-80D2D4AC 000EA8 0024+00 2/1 0/0 0/0 .text            eventStart__12daWtPillar_cFv */
 bool daWtPillar_c::eventStart() {
     actionUpFirstInit();
     return TRUE;
 }
 
-/* 80D2D4AC-80D2D588 000ECC 00DC+00 1/1 0/0 0/0 .text            actionWaitInit__12daWtPillar_cFv */
 void daWtPillar_c::actionWaitInit() {
     mWaitFrameDelay = getParam(12, 5) * 0.5f * 30.0f;
     mStartedRisingOrDoesNotRiseAndFall = field_0xB44 = false;
@@ -383,7 +363,6 @@ void daWtPillar_c::actionWaitInit() {
     mAction = ACTION_WAIT;
 }
 
-/* 80D2D588-80D2D5C0 000FA8 0038+00 1/0 0/0 0/0 .text            actionWait__12daWtPillar_cFv */
 void daWtPillar_c::actionWait() {
     if(mWaitFrameDelay)
         mWaitFrameDelay--;
@@ -391,8 +370,6 @@ void daWtPillar_c::actionWait() {
         actionUpFirstInit();
 }
 
-/* 80D2D5C0-80D2D6C4 000FE0 0104+00 3/3 0/0 0/0 .text            actionUpFirstInit__12daWtPillar_cFv
- */
 void daWtPillar_c::actionUpFirstInit() {
     mTargetMaxSpeed = (getParam(17, 5) * 100.0f * 5.0f) / 30.0f;
 
@@ -410,7 +387,6 @@ void daWtPillar_c::actionUpFirstInit() {
     mAction = ACTION_UP_FIRST;
 }
 
-/* 80D2D6C4-80D2D73C 0010E4 0078+00 1/0 0/0 0/0 .text            actionUpFirst__12daWtPillar_cFv */
 void daWtPillar_c::actionUpFirst() {
     cLib_chaseF(&speedF, mTargetMaxSpeed, mTargetMaxSpeed / 30.0f);
 
@@ -420,7 +396,6 @@ void daWtPillar_c::actionUpFirst() {
         actionUpFirstWaitInit();
 }
 
-/* 80D2D73C-80D2D780 00115C 0044+00 1/1 0/0 0/0 .text actionUpFirstWaitInit__12daWtPillar_cFv */
 void daWtPillar_c::actionUpFirstWaitInit() {
     mWaitFrameDelay = l_HIO.mUpFirstWaitFrames;
     mEffectOscillationAmplitude = l_HIO.mEffectOscillationAmplitude;
@@ -431,8 +406,6 @@ void daWtPillar_c::actionUpFirstWaitInit() {
     mAction = ACTION_UP_FIRST_WAIT;
 }
 
-/* 80D2D780-80D2D7B8 0011A0 0038+00 1/0 0/0 0/0 .text            actionUpFirstWait__12daWtPillar_cFv
- */
 void daWtPillar_c::actionUpFirstWait() {
     if(mWaitFrameDelay)
         mWaitFrameDelay--;
@@ -440,7 +413,6 @@ void daWtPillar_c::actionUpFirstWait() {
         actionUpInit();
 }
 
-/* 80D2D7B8-80D2D850 0011D8 0098+00 1/1 0/0 0/0 .text            actionUpInit__12daWtPillar_cFv */
 void daWtPillar_c::actionUpInit() {
     mTargetMaxSpeed = getParam(22, 5) * 100.0f * 5.0f / 30.0f;
 
@@ -458,7 +430,6 @@ void daWtPillar_c::actionUpInit() {
     mAction = ACTION_UP;
 }
 
-/* 80D2D850-80D2D95C 001270 010C+00 1/0 0/0 0/0 .text            actionUp__12daWtPillar_cFv */
 void daWtPillar_c::actionUp() {
     cLib_chaseF(&speedF, mTargetMaxSpeed, mTargetMaxSpeed / 30.0f);
 
@@ -475,8 +446,6 @@ void daWtPillar_c::actionUp() {
 
 }
 
-/* 80D2D95C-80D2D9A0 00137C 0044+00 1/1 0/0 0/0 .text            actionUpWaitInit__12daWtPillar_cFv
- */
 void daWtPillar_c::actionUpWaitInit() {
     mWaitFrameDelay = l_HIO.mUpWaitFrames;
     mEffectOscillationAmplitude = l_HIO.mEffectOscillationAmplitude;
@@ -487,7 +456,6 @@ void daWtPillar_c::actionUpWaitInit() {
     mAction = ACTION_UP_WAIT;
 }
 
-/* 80D2D9A0-80D2DA58 0013C0 00B8+00 1/0 0/0 0/0 .text            actionUpWait__12daWtPillar_cFv */
 void daWtPillar_c::actionUpWait() {
     mDoAud_seStartLevel(Z2SE_OBJ_WTR_CLMN_UP, &mTopPos, mMaxHeight + mTargetHeightStalactiteOffset, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -497,14 +465,12 @@ void daWtPillar_c::actionUpWait() {
         actionDownInit();
 }
 
-/* 80D2DA58-80D2DA78 001478 0020+00 1/1 0/0 0/0 .text            actionDownInit__12daWtPillar_cFv */
 void daWtPillar_c::actionDownInit() {
     speedF = 0.0f;
     mStalactiteShouldStartShaking = true;
     mAction = ACTION_DOWN;
 }
 
-/* 80D2DA78-80D2DB68 001498 00F0+00 1/0 0/0 0/0 .text            actionDown__12daWtPillar_cFv */
 void daWtPillar_c::actionDown() {
     cLib_chaseF(&speedF, l_HIO.mDownwardSpeedUnitsPerSecond / 30.0f, (l_HIO.mDownwardSpeedUnitsPerSecond / 30.0f) / 30.0f);
 
@@ -516,12 +482,10 @@ void daWtPillar_c::actionDown() {
         actionWaitInit();
 }
 
-/* 80D2DB68-80D2DB74 001588 000C+00 2/2 0/0 0/0 .text actionRockWaitInit__12daWtPillar_cFv */
 void daWtPillar_c::actionRockWaitInit() {
     mAction = ACTION_ROCK_WAIT;
 }
 
-/* 80D2DB74-80D2DC20 001594 00AC+00 1/0 0/0 0/0 .text            actionRockWait__12daWtPillar_cFv */
 void daWtPillar_c::actionRockWait() {
     mDoAud_seStartLevel(Z2SE_OBJ_WTR_CLMN_UP, &mTopPos, mMaxHeight + mTargetHeightStalactiteOffset, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 
@@ -529,13 +493,10 @@ void daWtPillar_c::actionRockWait() {
         actionRockOnInit();
 }
 
-/* 80D2DC20-80D2DC2C 001640 000C+00 1/1 0/0 0/0 .text            actionRockOnInit__12daWtPillar_cFv
- */
 void daWtPillar_c::actionRockOnInit() {
     mAction = ACTION_ROCK_ON;
 }
 
-/* 80D2DC2C-80D2DD0C 00164C 00E0+00 1/0 0/0 0/0 .text            actionRockOn__12daWtPillar_cFv */
 void daWtPillar_c::actionRockOn() {
     const f32 differenceBetweenCurrentAndMaxHeightWithStalactiteWeight = cLib_addCalc(&mCurrentHeight, mMaxHeight - 250.0f, 3.0f / 5.0f, 10.0f, 0.1f);
 
@@ -545,23 +506,18 @@ void daWtPillar_c::actionRockOn() {
         actionEndInit();
 }
 
-/* 80D2DD0C-80D2DD18 00172C 000C+00 1/1 0/0 0/0 .text            actionEndInit__12daWtPillar_cFv */
 void daWtPillar_c::actionEndInit() {
     mAction = ACTION_END;
 }
 
-/* 80D2DD18-80D2DDB0 001738 0098+00 1/0 0/0 0/0 .text            actionEnd__12daWtPillar_cFv */
 void daWtPillar_c::actionEnd() {
     mDoAud_seStartLevel(Z2SE_OBJ_WTR_CLMN_UP, &mTopPos, mMaxHeight + mTargetHeightStalactiteOffset, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80D2DDB0-80D2DDB8 0017D0 0008+00 0/0 0/0 1/1 .text            getPillarHeight__12daWtPillar_cFv
- */
 f32 daWtPillar_c::getPillarHeight() {
     return mCurrentHeight;
 }
 
-/* 80D2DDB8-80D2DE84 0017D8 00CC+00 1/1 0/0 0/0 .text            draw__12daWtPillar_cFv */
 int daWtPillar_c::draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -577,36 +533,27 @@ int daWtPillar_c::draw() {
     return 1;
 }
 
-/* 80D2DE84-80D2DEB4 0018A4 0030+00 1/1 0/0 0/0 .text            _delete__12daWtPillar_cFv */
 int daWtPillar_c::_delete() {
     dComIfG_resDelete(&mPhase, "efWater");
     return 1;
 }
 
-/* 80D2DEB4-80D2DED4 0018D4 0020+00 1/0 0/0 0/0 .text            daWtPillar_Draw__FP12daWtPillar_c
- */
 int daWtPillar_Draw(daWtPillar_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D2DED4-80D2DEF4 0018F4 0020+00 1/0 0/0 0/0 .text daWtPillar_Execute__FP12daWtPillar_c */
 int daWtPillar_Execute(daWtPillar_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D2DEF4-80D2DF14 001914 0020+00 1/0 0/0 0/0 .text            daWtPillar_Delete__FP12daWtPillar_c
- */
 int daWtPillar_Delete(daWtPillar_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D2DF14-80D2DF34 001934 0020+00 1/0 0/0 0/0 .text            daWtPillar_Create__FP10fopAc_ac_c
- */
 int daWtPillar_Create(fopAc_ac_c* i_this) {
     return static_cast<daWtPillar_c*>(i_this)->create();
 }
 
-/* 80D2EA14-80D2EA34 -00001 0020+00 1/0 0/0 0/0 .data            l_daWtPillar_Method */
 actor_method_class l_daWtPillar_Method = {
     (process_method_func)daWtPillar_Create,
     (process_method_func)daWtPillar_Delete,
@@ -615,7 +562,6 @@ actor_method_class l_daWtPillar_Method = {
     (process_method_func)daWtPillar_Draw,
 };
 
-/* 80D2EA34-80D2EA64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WaterPillar */
 extern actor_process_profile_definition g_profile_Obj_WaterPillar = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp
index 76b99c67b7..9fb2f92b00 100644
--- a/src/d/actor/d_a_obj_waterfall.cpp
+++ b/src/d/actor/d_a_obj_waterfall.cpp
@@ -17,14 +17,10 @@ static int daObjWaterFall_Execute(daObjWaterFall_c* i_this);
 static int daObjWaterFall_Delete(daObjWaterFall_c* i_this);
 static int daObjWaterFall_Create(fopAc_ac_c* i_this);
 
-/* ############################################################################################## */
-/* 80D2FE50-80D2FE78 000000 0028+00 4/4 0/0 0/0 .bss             target_info */
 static fopAc_ac_c* target_info[MAX_TARGET_INFO_COUNT];
 
-/* 80D2FE78-80D2FE7C 000028 0004+00 4/4 0/0 0/0 .bss             target_info_count */
 static s32 target_info_count;
 
-/* 80D2EC18-80D2ECA4 000078 008C+00 1/1 0/0 0/0 .text            s_b_sub__FPvPv */
 static void* s_b_sub(void* param_0, void* unused) {
     if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NBOMB) {
         dBomb_c* foundBomb = static_cast<dBomb_c*>(param_0);
@@ -40,7 +36,6 @@ static void* s_b_sub(void* param_0, void* unused) {
     return NULL;
 }
 
-/* 80D2ECA4-80D2ED14 000104 0070+00 1/1 0/0 0/0 .text            s_a_sub__FPvPv */
 static void* s_a_sub(void* param_0, void* unused) {
     if(fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_ARROW) {
         const u32 idx = target_info_count;  //  Regalloc issues if this isn't done
@@ -54,8 +49,6 @@ static void* s_a_sub(void* param_0, void* unused) {
     return NULL;
 }
 
-/* 80D2ED14-80D2EFF8 000174 02E4+00 1/1 0/0 0/0 .text            search_bomb__16daObjWaterFall_cFv
- */
 void daObjWaterFall_c::search_bomb() {
     if(checkFallOut() != TRUE) {
         //  Get rid of previously found arrow or bomb processes populating target_info
@@ -103,8 +96,6 @@ void daObjWaterFall_c::search_bomb() {
     }
 }
 
-/* 80D2F034-80D2F324 000494 02F0+00 1/1 0/0 0/0 .text            search_arrow__16daObjWaterFall_cFv
- */
 void daObjWaterFall_c::search_arrow() {
     //  Some waterfalls (e.g. in the Lakebed Temple) allow arrows to fly through them
     if(getType() == ALLOW_ARROWS_e || checkFallOut() == TRUE)
@@ -154,13 +145,10 @@ void daObjWaterFall_c::search_arrow() {
     }
 }
 
-/* 80D2F324-80D2F344 000784 0020+00 1/1 0/0 0/0 .text            initBaseMtx__16daObjWaterFall_cFv
- */
 void daObjWaterFall_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D2F344-80D2F39C 0007A4 0058+00 1/1 0/0 0/0 .text            setBaseMtx__16daObjWaterFall_cFv */
 void daObjWaterFall_c::setBaseMtx() {
     cXyz* pos = fopAcM_GetPosition_p(this);
     PSMTXTrans(mDoMtx_stack_c::get(), pos->x, pos->y, pos->z);
@@ -169,10 +157,8 @@ void daObjWaterFall_c::setBaseMtx() {
     mDoMtx_stack_c::ZXYrotM(shapeAngle->x, shapeAngle->y, shapeAngle->z);
 }
 
-/* 80D2FD84-80D2FD88 -00001 0004+00 1/1 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "sample";
 
-/* 80D2FD88-80D2FDCC 000004 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x2, 0x10}, 0x119}}, // mObj
@@ -187,7 +173,6 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80D2F39C-80D2F5A0 0007FC 0204+00 1/1 0/0 0/0 .text            Create__16daObjWaterFall_cFv */
 cPhs__Step daObjWaterFall_c::Create() {
     initBaseMtx();
 
@@ -232,8 +217,6 @@ cPhs__Step daObjWaterFall_c::Create() {
     return cPhs_LOADING_e;
 }
 
-/* ############################################################################################## */
-/* 80D2FDCC-80D2FDEC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWaterFall_Method */
 static actor_method_class l_daObjWaterFall_Method = {
     (process_method_func)daObjWaterFall_Create,
     (process_method_func)daObjWaterFall_Delete,
@@ -242,7 +225,6 @@ static actor_method_class l_daObjWaterFall_Method = {
     (process_method_func)daObjWaterFall_Draw,
 };
 
-/* 80D2FDEC-80D2FE1C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WaterFall */
 extern actor_process_profile_definition g_profile_Obj_WaterFall = {
   fpcLy_CURRENT_e,          // mLayerID
   7,                        // mListID
@@ -260,7 +242,6 @@ extern actor_process_profile_definition g_profile_Obj_WaterFall = {
   fopAc_CULLBOX_CUSTOM_e,   // cullType
 };
 
-/* 80D2F5A0-80D2F6DC 000A00 013C+00 1/1 0/0 0/0 .text            create__16daObjWaterFall_cFv */
 cPhs__Step daObjWaterFall_c::create() {
     fopAcM_ct(this, daObjWaterFall_c);
 
@@ -271,7 +252,6 @@ cPhs__Step daObjWaterFall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D2F984-80D2FA6C 000DE4 00E8+00 1/1 0/0 0/0 .text            execute__16daObjWaterFall_cFv */
 int daObjWaterFall_c::execute() {
     if(getSwbit() != 0xFF && !fopAcM_isSwitch(this, getSwbit()))
         return 1;
@@ -294,8 +274,6 @@ int daObjWaterFall_c::execute() {
     return 1;
 }
 
-/* 80D2FA6C-80D2FC94 000ECC 0228+00 1/1 0/0 0/0 .text            push_player__16daObjWaterFall_cFv
- */
 void daObjWaterFall_c::push_player() {
     daPy_py_c* const player = daPy_getPlayerActorClass();
     
@@ -332,35 +310,27 @@ void daObjWaterFall_c::push_player() {
     }
 }
 
-/* 80D2FC94-80D2FC9C 0010F4 0008+00 1/1 0/0 0/0 .text            draw__16daObjWaterFall_cFv */
 int daObjWaterFall_c::draw() {
     return 1;
 }
 
-/* 80D2FC9C-80D2FCD0 0010FC 0034+00 1/1 0/0 0/0 .text            _delete__16daObjWaterFall_cFv */
 int daObjWaterFall_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80D2FCD0-80D2FCF0 001130 0020+00 1/0 0/0 0/0 .text daObjWaterFall_Draw__FP16daObjWaterFall_c */
 static int daObjWaterFall_Draw(daObjWaterFall_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D2FCF0-80D2FD10 001150 0020+00 1/0 0/0 0/0 .text daObjWaterFall_Execute__FP16daObjWaterFall_c
- */
 static int daObjWaterFall_Execute(daObjWaterFall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D2FD10-80D2FD30 001170 0020+00 1/0 0/0 0/0 .text daObjWaterFall_Delete__FP16daObjWaterFall_c
- */
 static int daObjWaterFall_Delete(daObjWaterFall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D2FD30-80D2FD50 001190 0020+00 1/0 0/0 0/0 .text daObjWaterFall_Create__FP10fopAc_ac_c */
 static int daObjWaterFall_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWaterFall_c*>(i_this)->create();
 }
diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp
index 45fa8ba07b..6fc56d3add 100644
--- a/src/d/actor/d_a_obj_wchain.cpp
+++ b/src/d/actor/d_a_obj_wchain.cpp
@@ -13,10 +13,8 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 
-/* 80D31924-80D3192C 000000 0007+01 8/8 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[7] = "Wchain";
 
-/* 80D2FEF8-80D2FF9C 000078 00A4+00 1/1 0/0 0/0 .text            createHeap__13daObjWchain_cFv */
 int daObjWchain_c::createHeap() {
     J3DModelData* handle_model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpHandleModel = mDoExt_J3DModel__create(handle_model_data, 0x80000, 0x11000084);
@@ -28,12 +26,10 @@ int daObjWchain_c::createHeap() {
     return 1;
 }
 
-/* 80D2FF9C-80D2FFBC 00011C 0020+00 1/1 0/0 0/0 .text daObjWchain_createHeap__FP10fopAc_ac_c */
 static int daObjWchain_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjWchain_c*>(i_this)->createHeap();
 }
 
-/* 80D2FFBC-80D30394 00013C 03D8+00 1/1 0/0 0/0 .text            create__13daObjWchain_cFv */
 cPhs__Step daObjWchain_c::create() {
     fopAcM_ct(this, daObjWchain_c);
     mSw = fopAcM_GetParam(this) & 0xff;
@@ -86,24 +82,19 @@ cPhs__Step daObjWchain_c::create() {
     return step;
 }
 
-/* 80D30414-80D30434 000594 0020+00 1/0 0/0 0/0 .text            daObjWchain_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObjWchain_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWchain_c*>(i_this)->create();
 }
 
-/* 80D30434-80D3050C 0005B4 00D8+00 1/1 0/0 0/0 .text            __dt__13daObjWchain_cFv */
 daObjWchain_c::~daObjWchain_c() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
 }
 
-/* 80D3050C-80D30534 00068C 0028+00 1/0 0/0 0/0 .text daObjWchain_Delete__FP13daObjWchain_c */
 static int daObjWchain_Delete(daObjWchain_c* i_this) {
     i_this->~daObjWchain_c();
     return 1;
 }
 
-/* 80D30534-80D305E4 0006B4 00B0+00 2/2 0/0 0/0 .text            setMatrix__13daObjWchain_cFv */
 void daObjWchain_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZrotM(mHandleRotation);
@@ -114,7 +105,6 @@ void daObjWchain_c::setMatrix() {
     mDoMtx_stack_c::multVec(&eyeOffset, &eyePos);
 }
 
-/* 80D305E4-80D3080C 000764 0228+00 1/1 0/0 0/0 .text getChainAngleZ__13daObjWchain_cFP4cXyzi */
 s16 daObjWchain_c::getChainAngleZ(cXyz* param_0, int param_1) {
     cXyz vec(param_0->x, 0.0f, param_0->z);
     f32 len = vec.abs();
@@ -129,7 +119,6 @@ s16 daObjWchain_c::getChainAngleZ(cXyz* param_0, int param_1) {
     }
 }
 
-/* 80D3080C-80D310AC 00098C 08A0+00 1/1 0/0 0/0 .text            setChainPos__13daObjWchain_cFv */
 void daObjWchain_c::setChainPos() {
     cXyz prev_pos, vec1;
 
@@ -256,7 +245,6 @@ void daObjWchain_c::setChainPos() {
     }
 }
 
-/* 80D310AC-80D313F8 00122C 034C+00 1/1 0/0 0/0 .text            execute__13daObjWchain_cFv */
 int daObjWchain_c::execute() {
     if (!mRidePrev && mRide) {
         fopAcM_seStartCurrent(this, Z2SE_OBJ_GNAW_CHAIN_SW, 0);
@@ -312,12 +300,10 @@ int daObjWchain_c::execute() {
 }
 
 
-/* 80D313F8-80D31418 001578 0020+00 1/0 0/0 0/0 .text daObjWchain_Execute__FP13daObjWchain_c */
 static int daObjWchain_Execute(daObjWchain_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D31418-80D31810 001598 03F8+00 1/0 0/0 0/0 .text            draw__19daObjWchain_shape_cFv */
 void daObjWchain_shape_c::draw() {
     daObjWchain_c* chain = (daObjWchain_c*)getUserArea();
     cXyz* pos = chain->getChainPos();
@@ -376,7 +362,6 @@ void daObjWchain_shape_c::draw() {
 }
 
 
-/* 80D31810-80D318A0 001990 0090+00 1/1 0/0 0/0 .text            draw__13daObjWchain_cFv */
 int daObjWchain_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpHandleModel, &tevStr);
@@ -386,13 +371,10 @@ int daObjWchain_c::draw() {
     return 1;
 }
 
-/* 80D318A0-80D318C0 001A20 0020+00 1/0 0/0 0/0 .text            daObjWchain_Draw__FP13daObjWchain_c
- */
 static int daObjWchain_Draw(daObjWchain_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D319E4-80D31A04 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWchain_Method */
 static actor_method_class l_daObjWchain_Method = {
     (process_method_func)daObjWchain_Create,
     (process_method_func)daObjWchain_Delete,
@@ -401,7 +383,6 @@ static actor_method_class l_daObjWchain_Method = {
     (process_method_func)daObjWchain_Draw,
 };
 
-/* 80D31A04-80D31A34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Wchain */
 extern actor_process_profile_definition g_profile_Obj_Wchain = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp
index 0fad1b0cd1..aa9a5e0822 100644
--- a/src/d/actor/d_a_obj_wdStick.cpp
+++ b/src/d/actor/d_a_obj_wdStick.cpp
@@ -12,13 +12,10 @@
 #include "f_op/f_op_kankyo_mng.h"
 #include <cmath.h>
 
-/* 80D34424-80D34430 000014 000C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daWdStick_HIO_c l_HIO;
 
-/* 80D3423C-80D3427C 000020 0040+00 2/2 0/0 0/0 .data            mCcDSph__11daWdStick_c */
 dCcD_SrcSph daWdStick_c::mCcDSph = {daWdStick_c::mCcDObjInfo, {{{0.0f, 0.0f, 0.0f}, 4.0f}}};
 
-/* 80D31B4C-80D31B88 0000EC 003C+00 1/1 0/0 0/0 .text            __ct__15daWdStick_HIO_cFv */
 daWdStick_HIO_c::daWdStick_HIO_c() {
     field_0x04 = 60;
     field_0x05 = 1;
@@ -26,7 +23,6 @@ daWdStick_HIO_c::daWdStick_HIO_c() {
     field_0x08 = 0;
 }
 
-/* 80D31BD0-80D31C58 000170 0088+00 2/2 0/0 0/0 .text            setBaseMtx__11daWdStick_cFv */
 void daWdStick_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -34,7 +30,6 @@ void daWdStick_c::setBaseMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D31C58-80D31CC4 0001F8 006C+00 1/0 0/0 0/0 .text            CreateHeap__11daWdStick_cFv */
 int daWdStick_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Kinobou", 4);
     JUT_ASSERT(245, modelData != NULL);
@@ -42,8 +37,6 @@ int daWdStick_c::CreateHeap() {
     return mModel != 0 ? 1 : 0;
 }
 
-/* ############################################################################################## */
-/* 80D34138-80D34168 000000 0030+00 10/10 0/0 0/0 .rodata          mCcDObjInfo__11daWdStick_c */
 dCcD_SrcGObjInf const daWdStick_c::mCcDObjInfo = {
     {0, {{0x200, 0, 0x1f}, {0xd8fbffff, 0x1f}, {0x0}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
@@ -51,7 +44,6 @@ dCcD_SrcGObjInf const daWdStick_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80D31CC4-80D31F9C 000264 02D8+00 1/1 0/0 0/0 .text            create__11daWdStick_cFv */
 int daWdStick_c::create() {
     fopAcM_ct(this, daWdStick_c);
     int rv = dComIfG_resLoad(&mPhase, "H_Kinobou");
@@ -88,21 +80,16 @@ int daWdStick_c::create() {
     return rv;
 }
 
-/* 80D32168-80D32194 000708 002C+00 1/1 0/0 0/0 .text
- * createHeapCallBack__11daWdStick_cFP10fopAc_ac_c              */
 int daWdStick_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daWdStick_c*>(i_this)->CreateHeap();
 }
 
-/* 80D32194-80D32198 000734 0004+00 1/1 0/0 0/0 .text            lightInit__11daWdStick_cFv */
 void daWdStick_c::lightInit() {
 }
 
-/* 80D32198-80D3219C 000738 0004+00 2/2 0/0 0/0 .text            setLight__11daWdStick_cFv */
 void daWdStick_c::setLight() {
 }
 
-/* 80D3219C-80D3269C 00073C 0500+00 1/1 0/0 0/0 .text            setFire__11daWdStick_cFv */
 void daWdStick_c::setFire() {
     mDoMtx_stack_c::ZXYrotS(shape_angle.x, shape_angle.y, shape_angle.z);
     cXyz local_24(75.0f, 4.0f, 0.0f);
@@ -156,7 +143,6 @@ void daWdStick_c::setFire() {
     }
 }
 
-/* 80D3269C-80D32A70 000C3C 03D4+00 1/0 0/0 0/0 .text            Execute__11daWdStick_cFv */
 int daWdStick_c::Execute() {
     field_0x594 = speed;
     field_0xa7c = field_0xa64;
@@ -221,7 +207,6 @@ int daWdStick_c::Execute() {
     return 1;
 }
 
-/* 80D32A70-80D32D6C 001010 02FC+00 1/1 0/0 0/0 .text            bound__FP4cXyzRC13cBgS_PolyInfof */
 static f32 bound(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) {
     cM3dGPla acStack_3c;
     if (dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c) != 0) {
@@ -234,7 +219,6 @@ static f32 bound(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) {
     return 0.0f;
 }
 
-/* 80D32DB4-80D33348 001354 0594+00 3/3 0/0 0/0 .text            bgCheck__11daWdStick_cFv */
 void daWdStick_c::bgCheck() {
     bool isRoofHit = mAcch.ChkRoofHit() != 0;
     bool isGroundLanding = mAcch.ChkGroundLanding() != 0;
@@ -293,7 +277,6 @@ void daWdStick_c::bgCheck() {
     }
 }
 
-/* 80D33348-80D333F4 0018E8 00AC+00 1/1 0/0 0/0 .text            setBoundSe__11daWdStick_cFv */
 void daWdStick_c::setBoundSe() {
     u32 uVar1 = fabsf(field_0x594.y) * 2.0f;
     if (uVar1 > 100) {
@@ -302,7 +285,6 @@ void daWdStick_c::setBoundSe() {
     mDoAud_seStart(Z2SE_OBJ_WOODSTICK_BOUND, &current.pos, uVar1, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
 }
 
-/* 80D333F4-80D3350C 001994 0118+00 1/1 0/0 0/0 .text            mode_proc_call__11daWdStick_cFv */
 void daWdStick_c::mode_proc_call() {
     static daWdStick_c::modeFunc l_mode_func[5] = {
         &daWdStick_c::mode_proc_wait,
@@ -319,7 +301,6 @@ void daWdStick_c::mode_proc_call() {
     misCarrying = fopAcM_checkCarryNow(this);
 }
 
-/* 80D3350C-80D3353C 001AAC 0030+00 4/4 0/0 0/0 .text            mode_init_wait__11daWdStick_cFv */
 void daWdStick_c::mode_init_wait() {
     cLib_onBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     speedF = 0.0f;
@@ -327,21 +308,18 @@ void daWdStick_c::mode_init_wait() {
     mMode = MODE_WAIT;
 }
 
-/* 80D3353C-80D33588 001ADC 004C+00 1/0 0/0 0/0 .text            mode_proc_wait__11daWdStick_cFv */
 void daWdStick_c::mode_proc_wait() {
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
     bgCheck();
 }
 
-/* 80D33588-80D335AC 001B28 0024+00 1/1 0/0 0/0 .text            mode_init_carry__11daWdStick_cFv */
 void daWdStick_c::mode_init_carry() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     speedF = 0.0f;
     mMode = MODE_CARRY;
 }
 
-/* 80D335AC-80D3386C 001B4C 02C0+00 1/0 0/0 0/0 .text            mode_proc_carry__11daWdStick_cFv */
 void daWdStick_c::mode_proc_carry() {
     daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass();
     cXyz cStack_154(current.pos);
@@ -391,27 +369,23 @@ void daWdStick_c::mode_proc_carry() {
     }
 }
 
-/* 80D3386C-80D33890 001E0C 0024+00 1/1 0/0 0/0 .text            mode_init_drop__11daWdStick_cFv */
 void daWdStick_c::mode_init_drop() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     gravity = -5.0f;
     mMode = MODE_DROP;
 }
 
-/* 80D33890-80D338DC 001E30 004C+00 1/0 0/0 0/0 .text            mode_proc_drop__11daWdStick_cFv */
 void daWdStick_c::mode_proc_drop() {
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
     mAcch.CrrPos(dComIfG_Bgsp());
     bgCheck();
 }
 
-/* 80D338DC-80D338F4 001E7C 0018+00 2/2 0/0 0/0 .text            mode_init_roll__11daWdStick_cFv */
 void daWdStick_c::mode_init_roll() {
     cLib_offBit<u32>(attention_info.flags, fopAc_AttnFlag_CARRY_e);
     mMode = MODE_ROLL;
 }
 
-/* 80D338F4-80D33CCC 001E94 03D8+00 1/0 0/0 0/0 .text            mode_proc_roll__11daWdStick_cFv */
 void daWdStick_c::mode_proc_roll() {
     f32 dVar14 = 70.0f;
     fopAcM_posMoveF(this, mStts.GetCCMoveP());
@@ -463,12 +437,10 @@ void daWdStick_c::mode_proc_roll() {
 
 f32 dummyLiteral() { return 100.0f; }
 
-/* 80D33D44-80D33D68 0022E4 0024+00 2/2 0/0 0/0 .text            chkWaterLineIn__11daWdStick_cFv */
 BOOL daWdStick_c::chkWaterLineIn() {
     return mAcch.m_wtr.GetHeight() > current.pos.y + 40.0f;
 }
 
-/* 80D33D68-80D33D8C 002308 0024+00 1/1 0/0 0/0 .text            mode_init_sink__11daWdStick_cFv */
 void daWdStick_c::mode_init_sink() {
     field_0xab0 = 0;
     field_0xaae = 0;
@@ -476,7 +448,6 @@ void daWdStick_c::mode_init_sink() {
     mMode = MODE_SINK;
 }
 
-/* 80D33D8C-80D33EB0 00232C 0124+00 1/0 0/0 0/0 .text            mode_proc_sink__11daWdStick_cFv */
 void daWdStick_c::mode_proc_sink() {
     cLib_addCalc(&speedF, 0, 0.05f, 0.1f, 0.01f);
     speed.y = cLib_minMaxLimit(speed.y, -15.0f, 13.0f);
@@ -500,7 +471,6 @@ void daWdStick_c::mode_proc_sink() {
     }
 }
 
-/* 80D33EB0-80D33F14 002450 0064+00 1/0 0/0 0/0 .text            Draw__11daWdStick_cFv */
 int daWdStick_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel, &tevStr);
@@ -508,35 +478,27 @@ int daWdStick_c::Draw() {
     return 1;
 }
 
-/* 80D33F14-80D33F44 0024B4 0030+00 1/0 0/0 0/0 .text            Delete__11daWdStick_cFv */
 int daWdStick_c::Delete() {
     dComIfG_resDelete(&mPhase, "H_Kinobou");
     return 1;
 }
 
-/* 80D33F44-80D33F70 0024E4 002C+00 1/0 0/0 0/0 .text            daWdStick_Draw__FP11daWdStick_c */
 static int daWdStick_Draw(daWdStick_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D33F70-80D33F9C 002510 002C+00 1/0 0/0 0/0 .text            daWdStick_Execute__FP11daWdStick_c
- */
 static int daWdStick_Execute(daWdStick_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D33F9C-80D33FC8 00253C 002C+00 1/0 0/0 0/0 .text            daWdStick_Delete__FP11daWdStick_c
- */
 static int daWdStick_Delete(daWdStick_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D33FC8-80D33FE8 002568 0020+00 1/0 0/0 0/0 .text            daWdStick_Create__FP10fopAc_ac_c */
 static int daWdStick_Create(fopAc_ac_c* i_this) {
     return static_cast<daWdStick_c*>(i_this)->create();
 }
 
-/* 80D342F4-80D34314 -00001 0020+00 1/0 0/0 0/0 .data            l_daWdStick_Method */
 static actor_method_class l_daWdStick_Method = {
     (process_method_func)daWdStick_Create,
     (process_method_func)daWdStick_Delete,
@@ -545,7 +507,6 @@ static actor_method_class l_daWdStick_Method = {
     (process_method_func)daWdStick_Draw,
 };
 
-/* 80D34314-80D34344 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WdStick */
 extern actor_process_profile_definition g_profile_Obj_WdStick = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp
index 9ba80e6d79..470ca3536f 100644
--- a/src/d/actor/d_a_obj_web0.cpp
+++ b/src/d/actor/d_a_obj_web0.cpp
@@ -13,13 +13,10 @@
 #include "f_op/f_op_actor_mng.h"
 #include "global.h"
 
-/* 80D3452C-80D34544 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__16daObj_Web0_HIO_cFv */
 daObj_Web0_HIO_c::daObj_Web0_HIO_c() {
     field_0x4 = -1;
 }
 
-/* 80D34544-80D345C0 000104 007C+00 1/0 0/0 0/0 .text            daObj_Web0_Draw__FP14obj_web0_class
- */
 static int daObj_Web0_Draw(obj_web0_class* i_this) {
     g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -29,7 +26,6 @@ static int daObj_Web0_Draw(obj_web0_class* i_this) {
     return 1;
 }
 
-/* 80D345C0-80D34794 000180 01D4+00 1/1 0/0 0/0 .text            damage_check__FP14obj_web0_class */
 static void damage_check(obj_web0_class* i_this) {
     i_this->mStts.Move();
 
@@ -71,7 +67,6 @@ static void damage_check(obj_web0_class* i_this) {
     }
 }
 
-/* 80D34794-80D34B24 000354 0390+00 2/1 0/0 0/0 .text daObj_Web0_Execute__FP14obj_web0_class */
 static int daObj_Web0_Execute(obj_web0_class* i_this) {
     fopAc_ac_c* base_p = i_this;
     fopAc_ac_c* player = (fopAc_ac_c*) dComIfGp_getPlayer(0);
@@ -158,15 +153,12 @@ static int daObj_Web0_Execute(obj_web0_class* i_this) {
     return 1;
 }
 
-/* 80D34B24-80D34B2C 0006E4 0008+00 1/0 0/0 0/0 .text daObj_Web0_IsDelete__FP14obj_web0_class */
 static int daObj_Web0_IsDelete(obj_web0_class* i_this) {
     return 1;
 }
 
-/* 80D35290-80D35294 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80D35290;
 
-/* 80D34B2C-80D34B94 0006EC 0068+00 1/0 0/0 0/0 .text daObj_Web0_Delete__FP14obj_web0_class */
 static int daObj_Web0_Delete(obj_web0_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_web0");
 
@@ -178,7 +170,6 @@ static int daObj_Web0_Delete(obj_web0_class* i_this) {
     return 1;
 }
 
-/* 80D34B94-80D34D44 000754 01B0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_web0_class* _this = static_cast<obj_web0_class*>(i_this);
 
@@ -216,11 +207,8 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D352A0-80D352A8 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Web0_HIO_c l_HIO;
 
-/* 80D34D8C-80D35054 00094C 02C8+00 1/0 0/0 0/0 .text            daObj_Web0_Create__FP10fopAc_ac_c
- */
 static int daObj_Web0_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_web0_class);
     obj_web0_class* _this = static_cast<obj_web0_class*>(i_this);
@@ -292,14 +280,12 @@ static int daObj_Web0_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80D35208-80D35228 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Web0_Method */
 static actor_method_class l_daObj_Web0_Method = {
     (process_method_func)daObj_Web0_Create,  (process_method_func)daObj_Web0_Delete,
     (process_method_func)daObj_Web0_Execute, (process_method_func)daObj_Web0_IsDelete,
     (process_method_func)daObj_Web0_Draw,
 };
 
-/* 80D35228-80D35258 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_WEB0 */
 extern actor_process_profile_definition g_profile_OBJ_WEB0 = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp
index 697c4c6621..bf3fb86dbc 100644
--- a/src/d/actor/d_a_obj_web1.cpp
+++ b/src/d/actor/d_a_obj_web1.cpp
@@ -12,13 +12,10 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80D353AC-80D353C4 0000EC 0018+00 1/1 0/0 0/0 .text            __ct__16daObj_Web1_HIO_cFv */
 daObj_Web1_HIO_c::daObj_Web1_HIO_c() {
     field_0x4 = -1;
 }
 
-/* 80D353C4-80D35440 000104 007C+00 1/0 0/0 0/0 .text            daObj_Web1_Draw__FP14obj_web1_class
- */
 static int daObj_Web1_Draw(obj_web1_class* i_this) {
     g_env_light.settingTevStruct(16, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -28,8 +25,6 @@ static int daObj_Web1_Draw(obj_web1_class* i_this) {
     return 1;
 }
 
-/* 80D35440-80D35508 000180 00C8+00 1/1 0/0 0/0 .text
- * ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c            */
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor) {
     obj_web1_class* _this = static_cast<obj_web1_class*>(i_this);
 
@@ -56,7 +51,6 @@ static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_actor)
     }
 }
 
-/* 80D35508-80D35774 000248 026C+00 1/1 0/0 0/0 .text            action__FP14obj_web1_class */
 static void action(obj_web1_class* i_this) {
     if (i_this->mReboundTimer != 0) {
         if (i_this->mReboundTimer == 60 || i_this->mReboundTimer == 40 ||
@@ -124,7 +118,6 @@ static void action(obj_web1_class* i_this) {
     cLib_addCalc2(&i_this->field_0x5b0, target, 0.5f, 0.5f);
 }
 
-/* 80D35774-80D35A3C 0004B4 02C8+00 2/1 0/0 0/0 .text daObj_Web1_Execute__FP14obj_web1_class */
 static int daObj_Web1_Execute(obj_web1_class* i_this) {
     i_this->field_0x59c++;
 
@@ -184,15 +177,12 @@ static int daObj_Web1_Execute(obj_web1_class* i_this) {
     return 1;
 }
 
-/* 80D35A3C-80D35A44 00077C 0008+00 1/0 0/0 0/0 .text daObj_Web1_IsDelete__FP14obj_web1_class */
 static int daObj_Web1_IsDelete(obj_web1_class* i_this) {
     return 1;
 }
 
-/* 80D361F8-80D361FC 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 data_80D361F8;
 
-/* 80D35A44-80D35AC0 000784 007C+00 1/0 0/0 0/0 .text daObj_Web1_Delete__FP14obj_web1_class */
 static int daObj_Web1_Delete(obj_web1_class* i_this) {
     dComIfG_resDelete(&i_this->mPhase, "Obj_web1");
 
@@ -208,7 +198,6 @@ static int daObj_Web1_Delete(obj_web1_class* i_this) {
     return 1;
 }
 
-/* 80D35AC0-80D35C9C 000800 01DC+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_web1_class* _this = static_cast<obj_web1_class*>(i_this);
 
@@ -247,11 +236,8 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D36208-80D36210 000018 0008+00 2/2 0/0 0/0 .bss             l_HIO */
 static daObj_Web1_HIO_c l_HIO;
 
-/* 80D35CE4-80D35F98 000A24 02B4+00 1/0 0/0 0/0 .text            daObj_Web1_Create__FP10fopAc_ac_c
- */
 static int daObj_Web1_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_web1_class);
     obj_web1_class* _this = static_cast<obj_web1_class*>(i_this);
@@ -321,14 +307,12 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* 80D36170-80D36190 -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Web1_Method */
 static actor_method_class l_daObj_Web1_Method = {
     (process_method_func)daObj_Web1_Create,  (process_method_func)daObj_Web1_Delete,
     (process_method_func)daObj_Web1_Execute, (process_method_func)daObj_Web1_IsDelete,
     (process_method_func)daObj_Web1_Draw,
 };
 
-/* 80D36190-80D361C0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_WEB1 */
 extern actor_process_profile_definition g_profile_OBJ_WEB1 = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp
index d546a33abb..954dc3291b 100644
--- a/src/d/actor/d_a_obj_well_cover.cpp
+++ b/src/d/actor/d_a_obj_well_cover.cpp
@@ -9,13 +9,11 @@
 #include "d/d_procname.h"
 #include "d/actor/d_a_player.h"
 
-/* 80D36298-80D362D4 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjWCover_cFv */
 void daObjWCover_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D362D4-80D36348 0000B4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjWCover_cFv */
 void daObjWCover_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -23,7 +21,6 @@ void daObjWCover_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D36348-80D36394 000128 004C+00 1/0 0/0 0/0 .text            Create__13daObjWCover_cFv */
 int daObjWCover_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -31,10 +28,8 @@ int daObjWCover_c::Create() {
     return 1;
 }
 
-/* 80D36A6C-80D36A70 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "H_Idohuta";
 
-/* 80D36394-80D36404 000174 0070+00 1/0 0/0 0/0 .text            CreateHeap__13daObjWCover_cFv */
 int daObjWCover_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, 4));
     JUT_ASSERT(194, modelData != NULL);
@@ -42,7 +37,6 @@ int daObjWCover_c::CreateHeap() {
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80D36404-80D364E0 0001E4 00DC+00 1/1 0/0 0/0 .text            create__13daObjWCover_cFv */
 int daObjWCover_c::create() {
     fopAcM_ct(this, daObjWCover_c);
     if (fopAcM_isSwitch(this, getSwNo())) {
@@ -60,8 +54,6 @@ int daObjWCover_c::create() {
     return rv;
 }
 
-/* 80D364E0-80D3652C 0002C0 004C+00 1/0 0/0 0/0 .text            Execute__13daObjWCover_cFPPA3_A4_f
- */
 int daObjWCover_c::Execute(Mtx** i_mtx) {
     action();
     *i_mtx = &mBgMtx;
@@ -71,7 +63,6 @@ int daObjWCover_c::Execute(Mtx** i_mtx) {
 
 typedef void (daObjWCover_c::*modeFunc)();
 
-/* 80D3652C-80D365B8 00030C 008C+00 1/1 0/0 0/0 .text            action__13daObjWCover_cFv */
 void daObjWCover_c::action() {
     static modeFunc l_func[] = {
         &daObjWCover_c::modeWait,
@@ -81,7 +72,6 @@ void daObjWCover_c::action() {
     (this->*l_func[field_0x5b0])();
 }
 
-/* 80D365B8-80D36790 000398 01D8+00 1/0 0/0 0/0 .text            modeWait__13daObjWCover_cFv */
 void daObjWCover_c::modeWait() {
     cXyz acStack_48(150.0f, 0.0f, 0.0f);
     mDoMtx_stack_c::transS(current.pos);
@@ -95,15 +85,12 @@ void daObjWCover_c::modeWait() {
     }
 }
 
-/* 80D36A34-80D36A3C 000028 0006+02 0/1 0/0 0/0 .rodata          particle_id$3806 */
 static u16 const particle_id[3] = {
     0x82AB,
     0x82AC,
     0x82AD,
 };
 
-/* 80D36790-80D3689C 000570 010C+00 1/1 0/0 0/0 .text            init_modeBreak__13daObjWCover_cFv
- */
 void daObjWCover_c::init_modeBreak() {
     fopAcM_onSwitch(this, getSwNo());
     cXyz acStack_28(150.0f, 0.0f, 0.0f);
@@ -117,12 +104,10 @@ void daObjWCover_c::init_modeBreak() {
     field_0x5b0 = 1;
 }
 
-/* 80D3689C-80D368A0 00067C 0004+00 1/0 0/0 0/0 .text            modeBreak__13daObjWCover_cFv */
 void daObjWCover_c::modeBreak() {
     /* empty function */
 }
 
-/* 80D368A0-80D36944 000680 00A4+00 1/0 0/0 0/0 .text            Draw__13daObjWCover_cFv */
 int daObjWCover_c::Draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -132,35 +117,27 @@ int daObjWCover_c::Draw() {
     return 1;
 }
 
-/* 80D36944-80D36978 000724 0034+00 1/0 0/0 0/0 .text            Delete__13daObjWCover_cFv */
 int daObjWCover_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D36978-80D369A4 000758 002C+00 1/0 0/0 0/0 .text            daObjWCover_Draw__FP13daObjWCover_c
- */
 static int daObjWCover_Draw(daObjWCover_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D369A4-80D369C4 000784 0020+00 1/0 0/0 0/0 .text daObjWCover_Execute__FP13daObjWCover_c */
 static int daObjWCover_Execute(daObjWCover_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D369C4-80D369E4 0007A4 0020+00 1/0 0/0 0/0 .text daObjWCover_Delete__FP13daObjWCover_c */
 static int daObjWCover_Delete(daObjWCover_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D369E4-80D36A04 0007C4 0020+00 1/0 0/0 0/0 .text            daObjWCover_Create__FP10fopAc_ac_c
- */
 static int daObjWCover_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWCover_c*>(i_this)->create();
 }
 
-/* 80D36AA0-80D36AC0 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWCover_Method */
 static actor_method_class l_daObjWCover_Method = {
     (process_method_func)daObjWCover_Create,
     (process_method_func)daObjWCover_Delete,
diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp
index 8296a14e4f..979934f296 100644
--- a/src/d/actor/d_a_obj_wflag.cpp
+++ b/src/d/actor/d_a_obj_wflag.cpp
@@ -8,7 +8,6 @@
 #include "d/d_com_inf_game.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80D36B98-80D36CA0 000078 0108+00 1/0 0/0 0/0 .text daObj_Wflag_Draw__FP15obj_wflag_class */
 static int daObj_Wflag_Draw(obj_wflag_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     g_env_light.setLightTevColorType_MAJI(i_this->mpModel, &i_this->tevStr);
@@ -28,11 +27,9 @@ static int daObj_Wflag_Draw(obj_wflag_class* i_this) {
     return 1;
 }
 
-/* 80D378CC-80D37918 000000 004C+00 1/1 0/0 0/0 .data            pd$3822 */
 static f32 pd[19] = {1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.2f,
                      0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f};
 
-/* 80D36CA0-80D36F54 000180 02B4+00 1/1 0/0 0/0 .text tail_control__FP10fopAc_ac_cP9wf_tail_s */
 static void tail_control(fopAc_ac_c* param_1, wf_tail_s* param_2) {
     cXyz local_74;
     cXyz cStack_80;
@@ -81,7 +78,6 @@ static void tail_control(fopAc_ac_c* param_1, wf_tail_s* param_2) {
     }
 }
 
-/* 80D36F90-80D37058 000470 00C8+00 1/1 0/0 0/0 .text            tail_mtxset__FP9wf_tail_s */
 static void tail_mtxset(wf_tail_s* i_tail) {
     for (int i = 0; i < 19; i++) {
         MtxTrans(i_tail->field_0x004[i].x, i_tail->field_0x004[i].y, i_tail->field_0x004[i].z, 0);
@@ -93,7 +89,6 @@ static void tail_mtxset(wf_tail_s* i_tail) {
     }
 }
 
-/* 80D37058-80D372D0 000538 0278+00 2/1 0/0 0/0 .text daObj_Wflag_Execute__FP15obj_wflag_class */
 static int daObj_Wflag_Execute(obj_wflag_class* i_this) {
     cXyz cStack_3c;
     i_this->field_0x836++;
@@ -140,18 +135,15 @@ static int daObj_Wflag_Execute(obj_wflag_class* i_this) {
     return 1;
 }
 
-/* 80D372D0-80D372D8 0007B0 0008+00 1/0 0/0 0/0 .text daObj_Wflag_IsDelete__FP15obj_wflag_class */
 static int daObj_Wflag_IsDelete(obj_wflag_class* i_this) {
     return 1;
 }
 
-/* 80D372D8-80D37308 0007B8 0030+00 1/0 0/0 0/0 .text daObj_Wflag_Delete__FP15obj_wflag_class */
 static int daObj_Wflag_Delete(obj_wflag_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "Obj_wflag");
     return 1;
 }
 
-/* 80D37308-80D375EC 0007E8 02E4+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_actor) {
     obj_wflag_class* i_this = (obj_wflag_class*)i_actor;
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 10);
@@ -195,8 +187,6 @@ static int useHeapInit(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80D37634-80D37720 000B14 00EC+00 1/0 0/0 0/0 .text            daObj_Wflag_Create__FP10fopAc_ac_c
- */
 static int daObj_Wflag_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_wflag_class);
     int rv = dComIfG_resLoad(&((obj_wflag_class*)i_this)->mPhaseReq, "Obj_wflag");
@@ -224,7 +214,6 @@ static actor_method_class l_daObj_Wflag_Method = {
     (process_method_func)daObj_Wflag_Draw,
 };
 
-/* 80D37938-80D37968 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_WFLAG */
 extern actor_process_profile_definition g_profile_OBJ_WFLAG = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp
index 17e399fa20..7fdf27847e 100644
--- a/src/d/actor/d_a_obj_wind_stone.cpp
+++ b/src/d/actor/d_a_obj_wind_stone.cpp
@@ -8,26 +8,20 @@
 #include "d/actor/d_a_obj_wind_stone.h"
 #include "d/actor/d_a_alink.h"
 #include "d/d_meter2_info.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 
-/* 80D379F8-80D37A18 000078 0020+00 1/1 0/0 0/0 .text daWindStone_c_createHeap__FP10fopAc_ac_c */
 static int daWindStone_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daWindStone_c*>(i_this)->createHeap();
 }
 
-/* 80D38634-80D38638 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "WindStone";
 
-/* 80D37A18-80D37A68 000098 0050+00 2/2 0/0 0/0 .text            __ct__13daWindStone_cFv */
 daWindStone_c::daWindStone_c() : mpBgW(NULL), field_0x5c4(0) {}
 
-/* 80D37A68-80D37AF4 0000E8 008C+00 1/0 0/0 0/0 .text            __dt__13daWindStone_cFv */
 daWindStone_c::~daWindStone_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80D37AF4-80D37C20 000174 012C+00 1/1 0/0 0/0 .text            createHeap__13daWindStone_cFv */
 int daWindStone_c::createHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -49,13 +43,10 @@ int daWindStone_c::createHeap() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D38608-80D38614 000000 000C+00 1/1 0/0 0/0 .rodata          @3760 */
-SECTION_RODATA static u8 const lit_3760[12] = {
+static u8 const lit_3760[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80D37C20-80D37E2C 0002A0 020C+00 1/1 0/0 0/0 .text            create__13daWindStone_cFv */
 int daWindStone_c::create() {
     fopAcM_ct(this, daWindStone_c);
 
@@ -87,7 +78,6 @@ int daWindStone_c::create() {
     return phase;
 }
 
-/* 80D37F0C-80D37F6C 00058C 0060+00 1/1 0/0 0/0 .text            execute__13daWindStone_cFv */
 int daWindStone_c::execute() {
     switch (field_0x5c4) {
     case 0:
@@ -103,7 +93,6 @@ int daWindStone_c::execute() {
     return 1;
 }
 
-/* 80D37F6C-80D3806C 0005EC 0100+00 1/1 0/0 0/0 .text            draw__13daWindStone_cFv */
 int daWindStone_c::draw() {
     g_env_light.settingTevStruct(8, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -117,7 +106,6 @@ int daWindStone_c::draw() {
     return 1;
 }
 
-/* 80D3806C-80D3811C 0006EC 00B0+00 1/1 0/0 0/0 .text            Delete__13daWindStone_cFv */
 int daWindStone_c::Delete() {
     if (fopAcM_isSwitch(this, getSwBit1())) {
         fopAcM_offSwitch(this, getSwBit1());
@@ -129,14 +117,12 @@ int daWindStone_c::Delete() {
     return 1;
 }
 
-/* 80D3811C-80D38180 00079C 0064+00 2/2 0/0 0/0 .text            setModelMtx__13daWindStone_cFv */
 void daWindStone_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D38180-80D381EC 000800 006C+00 1/1 0/0 0/0 .text            init__13daWindStone_cFv */
 void daWindStone_c::init() {
     if (!chkEveOccur()) {
         if (chkMapDispMode()) {
@@ -150,7 +136,6 @@ void daWindStone_c::init() {
     field_0x5c0 = 0;
 }
 
-/* 80D381EC-80D38278 00086C 008C+00 1/1 0/0 0/0 .text            chkWlfInRange__13daWindStone_cFv */
 bool daWindStone_c::chkWlfInRange() {
     if (dComIfGp_getPlayer(0) == NULL) {
         return false;
@@ -164,7 +149,6 @@ bool daWindStone_c::chkWlfInRange() {
     return false;
 }
 
-/* 80D38278-80D382C4 0008F8 004C+00 2/2 0/0 0/0 .text            chkEveOccur__13daWindStone_cFv */
 bool daWindStone_c::chkEveOccur() {
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[getDelEveFlgId()]) == false) {
         return true;
@@ -172,7 +156,6 @@ bool daWindStone_c::chkEveOccur() {
     return false;
 }
 
-/* 80D382C4-80D3835C 000944 0098+00 1/1 0/0 0/0 .text            exeModeHowl__13daWindStone_cFv */
 void daWindStone_c::exeModeHowl() {
     if (!chkEveOccur()) {
         attention_info.flags = 0;
@@ -188,8 +171,6 @@ void daWindStone_c::exeModeHowl() {
     }
 }
 
-/* 80D3835C-80D383FC 0009DC 00A0+00 1/1 0/0 0/0 .text            exeModeMapDisp__13daWindStone_cFv
- */
 void daWindStone_c::exeModeMapDisp() {
     if (dComIfGp_getEvent().isOrderOK() || !dComIfGp_event_runCheck()) {
         dMeter2Info_setGoldWolfMapType(getGoldWolfIdx());
@@ -199,8 +180,6 @@ void daWindStone_c::exeModeMapDisp() {
     }
 }
 
-/* 80D383FC-80D384C4 000A7C 00C8+00 1/1 0/0 0/0 .text            chkMapDispMode__13daWindStone_cFv
- */
 bool daWindStone_c::chkMapDispMode() {
     if (fopAcM_isSwitch(this, getSwBit2())) {
         return false;
@@ -225,8 +204,6 @@ bool daWindStone_c::chkMapDispMode() {
     return false;
 }
 
-/* 80D384C4-80D3853C 000B44 0078+00 1/1 0/0 0/0 .text            getGoldWolfIdx__13daWindStone_cFv
- */
 u8 daWindStone_c::getGoldWolfIdx() {
     switch (getTuneId()) {
     case 3:
@@ -246,37 +223,30 @@ u8 daWindStone_c::getGoldWolfIdx() {
     }
 }
 
-/* 80D3853C-80D38590 000BBC 0054+00 1/0 0/0 0/0 .text daWindStone_create__FP13daWindStone_c */
 static int daWindStone_create(daWindStone_c* i_this) {
     fopAcM_ct(i_this, daWindStone_c);
 
     return i_this->create();
 }
 
-/* 80D38590-80D385B0 000C10 0020+00 1/0 0/0 0/0 .text daWindStone_Delete__FP13daWindStone_c */
 static int daWindStone_Delete(daWindStone_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D385B0-80D385D0 000C30 0020+00 1/0 0/0 0/0 .text daWindStone_execute__FP13daWindStone_c */
 static int daWindStone_execute(daWindStone_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D385D0-80D385F0 000C50 0020+00 1/0 0/0 0/0 .text            daWindStone_draw__FP13daWindStone_c
- */
 static int daWindStone_draw(daWindStone_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D38638-80D38658 -00001 0020+00 1/0 0/0 0/0 .data            daWindStone_METHODS */
 static actor_method_class daWindStone_METHODS = {
     (process_method_func)daWindStone_create,  (process_method_func)daWindStone_Delete,
     (process_method_func)daWindStone_execute, (process_method_func)NULL,
     (process_method_func)daWindStone_draw,
 };
 
-/* 80D38658-80D38688 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WindStone */
 extern actor_process_profile_definition g_profile_Obj_WindStone = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp
index aa3061d3ee..7421152697 100644
--- a/src/d/actor/d_a_obj_window.cpp
+++ b/src/d/actor/d_a_obj_window.cpp
@@ -9,13 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D39284-80D39288 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "J_KazeD";
 
-/* 80D3922C-80D39238 000000 000C+00 3/3 0/0 0/0 .rodata          l_bck */
 static int const l_bck[3] = {5, 6, -1};
 
-/* 80D39288-80D392CC 000004 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}},  // mObj
@@ -30,14 +27,12 @@ static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80D38758-80D387B8 000078 0060+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjWindow_cFv */
 void daObjWindow_c::initBaseMtx() {
     mpModel->calc();
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D387B8-80D38840 0000D8 0088+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjWindow_cFv */
 void daObjWindow_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -49,7 +44,6 @@ void daObjWindow_c::setBaseMtx() {
     }
 }
 
-/* 80D38840-80D388F0 000160 00B0+00 1/0 0/0 0/0 .text            Create__13daObjWindow_cFv */
 int daObjWindow_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -63,7 +57,6 @@ int daObjWindow_c::Create() {
     return 1;
 }
 
-/* 80D388F0-80D38A20 000210 0130+00 1/0 0/0 0/0 .text            CreateHeap__13daObjWindow_cFv */
 int daObjWindow_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -80,7 +73,6 @@ int daObjWindow_c::CreateHeap() {
     return 1;
 }
 
-/* 80D38A68-80D38B04 000388 009C+00 1/1 0/0 0/0 .text            create1st__13daObjWindow_cFv */
 cPhs__Step daObjWindow_c::create1st() {
     mType = getType();
     if (mType == 0xff) {
@@ -96,8 +88,6 @@ cPhs__Step daObjWindow_c::create1st() {
     return step;
 }
 
-/* 80D38B04-80D38F28 000424 0424+00 1/0 0/0 0/0 .text            Execute__13daObjWindow_cFPPA3_A4_f
- */
 int daObjWindow_c::Execute(Mtx** i_mtx) {
     if (mpBckAnm != NULL) {
         mpBckAnm->play();
@@ -137,7 +127,6 @@ int daObjWindow_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D38F28-80D39000 000848 00D8+00 1/0 0/0 0/0 .text            Draw__13daObjWindow_cFv */
 int daObjWindow_c::Draw() {
     g_env_light.settingTevStruct(0x14, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -151,36 +140,28 @@ int daObjWindow_c::Draw() {
     return 1;
 }
 
-/* 80D39000-80D39034 000920 0034+00 1/0 0/0 0/0 .text            Delete__13daObjWindow_cFv */
 int daObjWindow_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D39034-80D39128 000954 00F4+00 1/0 0/0 0/0 .text daObjWindow_create1st__FP13daObjWindow_c */
 static cPhs__Step daObjWindow_create1st(daObjWindow_c* i_this) {
     fopAcM_ct(i_this, daObjWindow_c);
     return i_this->create1st();
 }
 
-/* 80D391B8-80D391D8 000AD8 0020+00 1/0 0/0 0/0 .text daObjWindow_MoveBGDelete__FP13daObjWindow_c
- */
 static int daObjWindow_MoveBGDelete(daObjWindow_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D391D8-80D391F8 000AF8 0020+00 1/0 0/0 0/0 .text daObjWindow_MoveBGExecute__FP13daObjWindow_c
- */
 static int daObjWindow_MoveBGExecute(daObjWindow_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D391F8-80D39224 000B18 002C+00 1/0 0/0 0/0 .text daObjWindow_MoveBGDraw__FP13daObjWindow_c */
 static int daObjWindow_MoveBGDraw(daObjWindow_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D392CC-80D392EC -00001 0020+00 1/0 0/0 0/0 .data            daObjWindow_METHODS */
 static actor_method_class daObjWindow_METHODS = {
     (process_method_func)daObjWindow_create1st,
     (process_method_func)daObjWindow_MoveBGDelete,
@@ -189,7 +170,6 @@ static actor_method_class daObjWindow_METHODS = {
     (process_method_func)daObjWindow_MoveBGDraw,
 };
 
-/* 80D392EC-80D3931C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Window */
 extern actor_process_profile_definition g_profile_Obj_Window = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp
index a3c1f221ee..c724e7380f 100644
--- a/src/d/actor/d_a_obj_wood_pendulum.cpp
+++ b/src/d/actor/d_a_obj_wood_pendulum.cpp
@@ -7,25 +7,21 @@
 
 #include "d/actor/d_a_obj_wood_pendulum.h"
 
-/* 80D393F8-80D39418 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjWPndlm_c*>(i_this)->CreateHeap();
 }
 
-/* 80D39418-80D39454 000098 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjWPndlm_cFv */
 void daObjWPndlm_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D39454-80D394CC 0000D4 0078+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjWPndlm_cFv */
 void daObjWPndlm_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z + field_0x958);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D39C88-80D39CC8 000000 0040+00 2/2 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x0, 0xd}, {0x0, 0x10}, 0x0}},  // mObj
@@ -38,7 +34,6 @@ const static dCcD_SrcSph l_sph_src = {
     }  // mSphAttr
 };
 
-/* 80D39CC8-80D39D08 000040 0040+00 0/1 0/0 0/0 .rodata          l_sph_src2 */
 const static dCcD_SrcSph l_sph_src2 = {
     {
         {0x0, {{0x0, 0x0, 0xc}, {0xd8fafdff, 0x11}, 0x0}},  // mObj
@@ -51,7 +46,6 @@ const static dCcD_SrcSph l_sph_src2 = {
     }  // mSphAttr
 };
 
-/* 80D394CC-80D395C8 00014C 00FC+00 1/1 0/0 0/0 .text            Create__13daObjWPndlm_cFv */
 int daObjWPndlm_c::Create() {
     initBaseMtx();
     cullMtx = mpModel->getBaseTRMtx();
@@ -75,10 +69,8 @@ int daObjWPndlm_c::Create() {
     return 1;
 }
 
-/* 80D39D44-80D39D48 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "A_Turuki";
 
-/* 80D395C8-80D39638 000248 0070+00 1/1 0/0 0/0 .text            CreateHeap__13daObjWPndlm_cFv */
 int daObjWPndlm_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -88,7 +80,6 @@ int daObjWPndlm_c::CreateHeap() {
     return 1;
 }
 
-/* 80D39638-80D39798 0002B8 0160+00 1/1 0/0 0/0 .text            create__13daObjWPndlm_cFv */
 int daObjWPndlm_c::create() {
     int phase;
 
@@ -107,7 +98,6 @@ int daObjWPndlm_c::create() {
     return phase;
 }
 
-/* 80D39978-80D39B68 0005F8 01F0+00 1/1 0/0 0/0 .text            execute__13daObjWPndlm_cFv */
 int daObjWPndlm_c::execute() {
     u8 arg1 = getArg1();
     if (arg1 == 0 || arg1 == 255) {
@@ -144,7 +134,6 @@ int daObjWPndlm_c::execute() {
     return 1;
 }
 
-/* 80D39B68-80D39BCC 0007E8 0064+00 1/1 0/0 0/0 .text            draw__13daObjWPndlm_cFv */
 int daObjWPndlm_c::draw() {
     g_env_light.settingTevStruct(0, &this->current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -152,42 +141,33 @@ int daObjWPndlm_c::draw() {
     return 1;
 }
 
-/* 80D39BCC-80D39C00 00084C 0034+00 1/1 0/0 0/0 .text            _delete__13daObjWPndlm_cFv */
 int daObjWPndlm_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D39C00-80D39C20 000880 0020+00 1/0 0/0 0/0 .text            daObjWPndlm_Draw__FP13daObjWPndlm_c
- */
 static int daObjWPndlm_Draw(daObjWPndlm_c* i_this) {
     return static_cast<daObjWPndlm_c*>(i_this)->draw();
 }
 
-/* 80D39C20-80D39C40 0008A0 0020+00 1/0 0/0 0/0 .text daObjWPndlm_Execute__FP13daObjWPndlm_c */
 static int daObjWPndlm_Execute(daObjWPndlm_c* i_this) {
     return static_cast<daObjWPndlm_c*>(i_this)->execute();
 }
 
-/* 80D39C40-80D39C60 0008C0 0020+00 1/0 0/0 0/0 .text daObjWPndlm_Delete__FP13daObjWPndlm_c */
 static int daObjWPndlm_Delete(daObjWPndlm_c* i_this) {
     return static_cast<daObjWPndlm_c*>(i_this)->_delete();
 }
 
-/* 80D39C60-80D39C80 0008E0 0020+00 1/0 0/0 0/0 .text            daObjWPndlm_Create__FP10fopAc_ac_c
- */
 static int daObjWPndlm_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWPndlm_c*>(i_this)->create();
 }
 
-/* 80D39D48-80D39D68 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWPndlm_Method */
 static actor_method_class l_daObjWPndlm_Method = {
     (process_method_func)daObjWPndlm_Create,  (process_method_func)daObjWPndlm_Delete,
     (process_method_func)daObjWPndlm_Execute, 0,
     (process_method_func)daObjWPndlm_Draw,
 };
 
-/* 80D39D68-80D39D98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WoodPendulum */
 extern actor_process_profile_definition g_profile_Obj_WoodPendulum = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp
index b20d921c13..b541439e4b 100644
--- a/src/d/actor/d_a_obj_wood_statue.cpp
+++ b/src/d/actor/d_a_obj_wood_statue.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 
 #ifdef DEBUG
 
@@ -38,7 +37,6 @@ daObjWStatue_HIO_c l_HIO;
 #endif
 
 
-/* 80D3B638-80D3B67C 000000 0044+00 5/5 0/0 0/0 .rodata          l_cyl_src */
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj
@@ -53,14 +51,10 @@ const static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 80D3B73C-80D3B740 -00001 0004+00 1/1 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "O_wood";
 
-/* 80D3B740-80D3B744 -00001 0004+00 1/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName = "GET_WOOD_STATUE";
 
-/* 80D39E38-80D3A134 000078 02FC+00 1/1 0/0 0/0 .text            Reflect__FP4cXyzRC13cBgS_PolyInfof
- */
 static f32 Reflect(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) {
     cM3dGPla acStack_3c;
     bool isTriPla = dComIfG_Bgsp().GetTriPla(param_2, &acStack_3c);
@@ -75,8 +69,6 @@ static f32 Reflect(cXyz* param_1, cBgS_PolyInfo const& param_2, f32 param_3) {
     }
 }
 
-/* 80D3A17C-80D3A1D8 0003BC 005C+00 1/1 0/0 0/0 .text
- * lifeGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void lifeGetTgCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* param_3,
                               dCcD_GObjInf* param_4) {
     if (i_this != NULL &&
@@ -89,8 +81,6 @@ static void lifeGetTgCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_a
     return;
 }
 
-/* 80D3A1D8-80D3A21C 000418 0044+00 1/1 0/0 0/0 .text
- * lifeGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void lifeGetCoCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_ac_c* param_3,
                               dCcD_GObjInf* param_4) {
     if (i_this != NULL && param_3 != NULL && param_3 == dComIfGp_getLinkPlayer()) {
@@ -98,7 +88,6 @@ static void lifeGetCoCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_2, fopAc_a
     }
 }
 
-/* 80D3A21C-80D3A268 00045C 004C+00 1/1 0/0 0/0 .text            s_sh_sub__FPvPv */
 static void* s_sh_sub(void* param_1, void* param_2) {
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_E_SH) {
         return param_1;
@@ -106,20 +95,17 @@ static void* s_sh_sub(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D3A268-80D3A2A4 0004A8 003C+00 1/1 0/0 0/0 .text            initBaseMtx__14daObjWStatue_cFv */
 void daObjWStatue_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D3A2A4-80D3A2F0 0004E4 004C+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjWStatue_cFv */
 void daObjWStatue_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D3A2F0-80D3A474 000530 0184+00 1/1 0/0 0/0 .text            Create__14daObjWStatue_cFv */
 int daObjWStatue_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -152,12 +138,10 @@ int daObjWStatue_c::Create() {
     #endif
 }
 
-/* 80D3A474-80D3A47C 0006B4 0008+00 1/0 0/0 0/0 .text            __CreateHeap__14daObjWStatue_cFv */
 int daObjWStatue_c::__CreateHeap() {
     return 1;
 }
 
-/* 80D3A47C-80D3A66C 0006BC 01F0+00 1/1 0/0 0/0 .text            create__14daObjWStatue_cFv */
 int daObjWStatue_c::create() {
     fopAcM_ct(this, daObjWStatue_c);
     m_itemNo = fpcNm_ITEM_WOOD_STATUE;
@@ -183,7 +167,6 @@ int daObjWStatue_c::create() {
     return rv;
 }
 
-/* 80D3A8E8-80D3AA3C 000B28 0154+00 1/1 0/0 0/0 .text            bg_check__14daObjWStatue_cFv */
 void daObjWStatue_c::bg_check() {
     f32 dVar6 = 0.7f;
     if (mAcch.ChkWallHit()) {
@@ -214,8 +197,6 @@ void daObjWStatue_c::bg_check() {
     }
 }
 
-/* 80D3AA3C-80D3AA80 000C7C 0044+00 1/1 0/0 0/0 .text            actionWaitInit__14daObjWStatue_cFv
- */
 int daObjWStatue_c::actionWaitInit() {
     mCcCyl.OnTgSPrmBit(1);
     mCcCyl.OnCoSPrmBit(1);
@@ -225,7 +206,6 @@ int daObjWStatue_c::actionWaitInit() {
     return 1;
 }
 
-/* 80D3AA80-80D3AB9C 000CC0 011C+00 1/0 0/0 0/0 .text            actionWait__14daObjWStatue_cFv */
 int daObjWStatue_c::actionWait() {
     mBoundSETimer++;
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
@@ -254,8 +234,6 @@ int daObjWStatue_c::actionWait() {
     return 1;
 }
 
-/* 80D3AB9C-80D3AC64 000DDC 00C8+00 2/2 0/0 0/0 .text initActionOrderGetDemo__14daObjWStatue_cFv
- */
 int daObjWStatue_c::initActionOrderGetDemo() {
     mCcCyl.OffTgSPrmBit(1);
     mCcCyl.OffCoSPrmBit(1);
@@ -270,7 +248,6 @@ int daObjWStatue_c::initActionOrderGetDemo() {
     return 1;
 }
 
-/* 80D3AC64-80D3ACAC 000EA4 0048+00 1/0 0/0 0/0 .text actionOrderGetDemo__14daObjWStatue_cFv */
 int daObjWStatue_c::actionOrderGetDemo() {
     setStatus(STATUS_GET_DEMO);
     if (mItemId != fpcM_ERROR_PROCESS_ID_e) {
@@ -279,8 +256,6 @@ int daObjWStatue_c::actionOrderGetDemo() {
     return 1;
 }
 
-/* 80D3ACAC-80D3AD30 000EEC 0084+00 1/0 0/0 0/0 .text            actionGetDemo__14daObjWStatue_cFv
- */
 int daObjWStatue_c::actionGetDemo() {
     if (dComIfGp_evmng_endCheck("DEFAULT_GETITEM")) {
         fopAcM_onSwitch(this, getSwbit2());
@@ -290,7 +265,6 @@ int daObjWStatue_c::actionGetDemo() {
     return 1;
 }
 
-/* 80D3AD30-80D3AD88 000F70 0058+00 1/1 0/0 0/0 .text actionInitSwOnWait__14daObjWStatue_cFv */
 int daObjWStatue_c::actionInitSwOnWait() {
     mCcCyl.OffTgSPrmBit(1);
     mCcCyl.OffCoSPrmBit(1);
@@ -300,8 +274,6 @@ int daObjWStatue_c::actionInitSwOnWait() {
     return 1;
 }
 
-/* 80D3AD88-80D3AE7C 000FC8 00F4+00 1/0 0/0 0/0 .text            actionSwOnWait__14daObjWStatue_cFv
- */
 int daObjWStatue_c::actionSwOnWait() {
     base_process_class* iVar2 = fpcM_Search(s_sh_sub, this);
     switch (field_0x93a) {
@@ -339,8 +311,6 @@ int daObjWStatue_c::actionSwOnWait() {
     return 1;
 }
 
-/* 80D3AE7C-80D3AF5C 0010BC 00E0+00 1/1 0/0 0/0 .text actionInitBoomerangCarry__14daObjWStatue_cFv
- */
 int daObjWStatue_c::actionInitBoomerangCarry() {
     mCcCyl.OnTgSPrmBit(1);
     mCcCyl.OnCoSPrmBit(1);
@@ -353,7 +323,6 @@ int daObjWStatue_c::actionInitBoomerangCarry() {
     return 1;
 }
 
-/* 80D3AF5C-80D3AFC0 00119C 0064+00 1/0 0/0 0/0 .text actionBoomerangCarry__14daObjWStatue_cFv */
 int daObjWStatue_c::actionBoomerangCarry() {
     fopAc_ac_c* boomerang = fopAcM_SearchByName(PROC_BOOMERANG);
     if (boomerang != NULL) {
@@ -367,7 +336,6 @@ int daObjWStatue_c::actionBoomerangCarry() {
     return 1;
 }
 
-/* 80D3AFC0-80D3B164 001200 01A4+00 1/1 0/0 0/0 .text            demoProc__14daObjWStatue_cFv */
 void daObjWStatue_c::demoProc() {
     static char* action_table[4] = {
         "WAIT",
@@ -425,7 +393,6 @@ void daObjWStatue_c::demoProc() {
     }
 }
 
-/* 80D3B164-80D3B250 0013A4 00EC+00 1/1 0/0 0/0 .text            effectSet__14daObjWStatue_cFv */
 void daObjWStatue_c::effectSet() {
     if (mCallbacks[0].getEmitter() == NULL) {
         dComIfGp_particle_set(0x827a, &current.pos, &shape_angle, &scale, 0xff, &mCallbacks[0],
@@ -435,13 +402,11 @@ void daObjWStatue_c::effectSet() {
     }
 }
 
-/* 80D3B250-80D3B2A0 001490 0050+00 1/1 0/0 0/0 .text            effectStop__14daObjWStatue_cFv */
 void daObjWStatue_c::effectStop() {
     mCallbacks[0].remove();
     mCallbacks[1].remove();
 }
 
-/* 80D3B2A0-80D3B428 0014E0 0188+00 1/1 0/0 0/0 .text            execute__14daObjWStatue_cFv */
 int daObjWStatue_c::execute() {
     static daObjWStatue_c::demoFunc l_demoFunc[5] = {
         &daObjWStatue_c::actionWait,           &daObjWStatue_c::actionOrderGetDemo,
@@ -460,7 +425,6 @@ int daObjWStatue_c::execute() {
     return 1;
 }
 
-/* 80D3B428-80D3B47C 001668 0054+00 1/1 0/0 0/0 .text            draw__14daObjWStatue_cFv */
 int daObjWStatue_c::draw() {
     if (!chkDraw()) {
         return 1;
@@ -469,10 +433,8 @@ int daObjWStatue_c::draw() {
     return 1;
 }
 
-/* 80D3B47C-80D3B480 0016BC 0004+00 1/0 0/0 0/0 .text            setListStart__14daObjWStatue_cFv */
 void daObjWStatue_c::setListStart() {}
 
-/* 80D3B480-80D3B4B8 0016C0 0038+00 1/1 0/0 0/0 .text            _delete__14daObjWStatue_cFv */
 int daObjWStatue_c::_delete() {
     DeleteBase(dItem_data::getFieldArc(m_itemNo));
 
@@ -483,38 +445,30 @@ int daObjWStatue_c::_delete() {
     return 1;
 }
 
-/* 80D3B4B8-80D3B4D8 0016F8 0020+00 1/0 0/0 0/0 .text daObjWStatue_Draw__FP14daObjWStatue_c */
 static int daObjWStatue_Draw(daObjWStatue_c * i_this) {
     return i_this->draw();
 }
 
-/* 80D3B4D8-80D3B4F8 001718 0020+00 1/0 0/0 0/0 .text daObjWStatue_Execute__FP14daObjWStatue_c
-    */
 static int daObjWStatue_Execute(daObjWStatue_c * i_this) {
     return i_this->execute();
 }
 
-/* 80D3B4F8-80D3B518 001738 0020+00 1/0 0/0 0/0 .text daObjWStatue_Delete__FP14daObjWStatue_c */
 static int daObjWStatue_Delete(daObjWStatue_c * i_this) {
     fopAcM_RegisterDeleteID(i_this, "ObjLife");
     return i_this->_delete();
 }
 
-/* 80D3B518-80D3B538 001758 0020+00 1/0 0/0 0/0 .text daObjWStatue_Create__FP10fopAc_ac_c
-    */
 static int daObjWStatue_Create(fopAc_ac_c * i_this) {
     fopAcM_RegisterCreateID(daObjWStatue_c, i_this, "ObjLife");
     return a_this->create();
 }
 
-/* 80D3B7CC-80D3B7EC -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWStatue_Method */
 static actor_method_class l_daObjWStatue_Method = {
     (process_method_func)daObjWStatue_Create,  (process_method_func)daObjWStatue_Delete,
     (process_method_func)daObjWStatue_Execute, NULL,
     (process_method_func)daObjWStatue_Draw,
 };
 
-/* 80D3B7EC-80D3B81C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WoodStatue */
 extern actor_process_profile_definition g_profile_Obj_WoodStatue = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp
index 578e5edd9d..7f3008e76f 100644
--- a/src/d/actor/d_a_obj_wsword.cpp
+++ b/src/d/actor/d_a_obj_wsword.cpp
@@ -9,10 +9,8 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80D3BF2C-80D3BF30 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_brksw";
 
-/* 80D3BF30-80D3BF74 000004 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x19}},  // mObj
@@ -27,25 +25,21 @@ static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80D3B978-80D3B998 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjWSword_c*>(i_this)->CreateHeap();
 }
 
-/* 80D3B998-80D3B9D4 000098 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjWSword_cFv */
 void daObjWSword_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D3B9D4-80D3BA40 0000D4 006C+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjWSword_cFv */
 void daObjWSword_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D3BA40-80D3BAB8 000140 0078+00 1/1 0/0 0/0 .text            Create__13daObjWSword_cFv */
 int daObjWSword_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -56,14 +50,12 @@ int daObjWSword_c::Create() {
     return 1;
 }
 
-/* 80D3BAB8-80D3BB28 0001B8 0070+00 1/1 0/0 0/0 .text            CreateHeap__13daObjWSword_cFv */
 int daObjWSword_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
     return mpModel != NULL ? 1 : 0;
 }
 
-/* 80D3BB28-80D3BCA0 000228 0178+00 1/1 0/0 0/0 .text            create__13daObjWSword_cFv */
 int daObjWSword_c::create() {
     fopAcM_ct(this, daObjWSword_c);
     int phase = dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -77,7 +69,6 @@ int daObjWSword_c::create() {
     return phase;
 }
 
-/* 80D3BDA0-80D3BDF0 0004A0 0050+00 1/1 0/0 0/0 .text            execute__13daObjWSword_cFv */
 int daObjWSword_c::execute() {
     setBaseMtx();
     mCyl.SetC(current.pos);
@@ -85,7 +76,6 @@ int daObjWSword_c::execute() {
     return 1;
 }
 
-/* 80D3BDF0-80D3BE54 0004F0 0064+00 1/1 0/0 0/0 .text            draw__13daObjWSword_cFv */
 int daObjWSword_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -93,35 +83,27 @@ int daObjWSword_c::draw() {
     return 1;
 }
 
-/* 80D3BE54-80D3BE88 000554 0034+00 1/1 0/0 0/0 .text            _delete__13daObjWSword_cFv */
 int daObjWSword_c::_delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D3BE88-80D3BEA8 000588 0020+00 1/0 0/0 0/0 .text            daObjWSword_Draw__FP13daObjWSword_c
- */
 static int daObjWSword_Draw(daObjWSword_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D3BEA8-80D3BEC8 0005A8 0020+00 1/0 0/0 0/0 .text daObjWSword_Execute__FP13daObjWSword_c */
 static int daObjWSword_Execute(daObjWSword_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D3BEC8-80D3BEE8 0005C8 0020+00 1/0 0/0 0/0 .text daObjWSword_Delete__FP13daObjWSword_c */
 static int daObjWSword_Delete(daObjWSword_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D3BEE8-80D3BF08 0005E8 0020+00 1/0 0/0 0/0 .text            daObjWSword_Create__FP10fopAc_ac_c
- */
 static int daObjWSword_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjWSword_c*>(i_this)->create();
 }
 
-/* 80D3BF74-80D3BF94 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjWSword_Method */
 static actor_method_class l_daObjWSword_Method = {
     (process_method_func)daObjWSword_Create,
     (process_method_func)daObjWSword_Delete,
@@ -130,7 +112,6 @@ static actor_method_class l_daObjWSword_Method = {
     (process_method_func)daObjWSword_Draw,
 };
 
-/* 80D3BF94-80D3BFC4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_WoodenSword */
 extern actor_process_profile_definition g_profile_Obj_WoodenSword = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp
index ca5108b762..d9a4b4b2a0 100644
--- a/src/d/actor/d_a_obj_yel_bag.cpp
+++ b/src/d/actor/d_a_obj_yel_bag.cpp
@@ -12,48 +12,39 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "SSystem/SComponent/c_lib.h"
 
-/* 80D3DD94-80D3DD9C 000020 0008+00 1/1 0/0 0/0 .data            l_bmdGetParamList */
 static int l_bmdGetParamList[2] = {
     3, 0,
 };
 
-/* 80D3DD9C-80D3DDA8 000028 000C+00 1/0 0/0 0/0 .data            l_loadRes_YBAG0 */
 static int l_loadRes_YBAG0[3] = {
     0, -1, -1,
 };
 
-/* 80D3DDA8-80D3DDB0 -00001 0008+00 1/2 0/0 0/0 .data            l_loadRes_list */
 static int* l_loadRes_list[2] = {
     l_loadRes_YBAG0,
     l_loadRes_YBAG0,
 };
 
-/* 80D3DDB0-80D3DDB4 -00001 0004+00 2/4 0/0 0/0 .data            l_resNames */
 static char* l_resNames[] = {"yel_bag"};
 
-/* 80D3DDB4-80D3DDF8 000040 0044+00 1/2 0/0 0/0 .data            mCcDCyl__12daObj_YBag_c */
 dCcD_SrcCyl daObj_YBag_c::mCcDCyl = {
     daNpcT_c::mCcDObjData,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80D3DDF8-80D3DE00 000084 0008+00 1/1 0/0 0/0 .data            emttrId$4511 */
 static u16 emttrId[4] = {
     0x01B8, 0x01B9, 0x01BA, 0x01BB,
 };
 
-/* 80D3C0EC-80D3C200 0000EC 0114+00 1/1 0/0 0/0 .text            __ct__12daObj_YBag_cFv */
 daObj_YBag_c::daObj_YBag_c() {
 }
 
-/* 80D3C408-80D3C610 000408 0208+00 1/0 0/0 0/0 .text            __dt__12daObj_YBag_cFv */
 daObj_YBag_c::~daObj_YBag_c() {
     for (int i = 0; l_loadRes_list[mType][i] >= 0; i++) {
         dComIfG_resDelete(&mPhases[i], l_resNames[l_loadRes_list[mType][i]]);
     }
 }
 
-/* 80D3DC8C-80D3DCBC 000000 0030+00 4/4 0/0 0/0 .rodata          mCcDObjInfo__12daObj_YBag_c */
 const dCcD_SrcGObjInf daObj_YBag_c::mCcDObjInfo = {
     {0, {{0, 0, 0}, {0, 0x00}, {0x79}}},
     {dCcD_SE_NONE, 0, 0, 0, 0},
@@ -61,13 +52,11 @@ const dCcD_SrcGObjInf daObj_YBag_c::mCcDObjInfo = {
     {0},
 };
 
-/* 80D3DCBC-80D3DCE8 000030 002C+00 0/3 0/0 0/0 .rodata          m__18daObj_YBag_Param_c */
 f32 const daObj_YBag_Param_c::m[11] = {
     0.0f, -4.0f, 1.0f, 400.0f, 255.0f, 10.0f, 4.0f, 10.0f, 
     41.0f, 32.0f, 3.0f,
 };
 
-/* 80D3C610-80D3C898 000610 0288+00 1/1 0/0 0/0 .text            create__12daObj_YBag_cFv */
 int daObj_YBag_c::create() {
     fopAcM_ct(this, daObj_YBag_c);
     mType = getTypeFromParam();
@@ -109,7 +98,6 @@ int daObj_YBag_c::create() {
     return cPhs_INIT_e;
 }
 
-/* 80D3C898-80D3C93C 000898 00A4+00 1/1 0/0 0/0 .text            CreateHeap__12daObj_YBag_cFv */
 int daObj_YBag_c::CreateHeap() {
     J3DModelData* modelData = NULL;
     if (l_bmdGetParamList[0] >= 0) {
@@ -124,14 +112,12 @@ int daObj_YBag_c::CreateHeap() {
     return mModel != NULL;
 }
 
-/* 80D3C93C-80D3C970 00093C 0034+00 1/1 0/0 0/0 .text            Delete__12daObj_YBag_cFv */
 int daObj_YBag_c::Delete() {
     fopAcM_GetID(this);
     this->~daObj_YBag_c();
     return 1;
 }
 
-/* 80D3C970-80D3D32C 000970 09BC+00 2/2 0/0 0/0 .text            Execute__12daObj_YBag_cFv */
 int daObj_YBag_c::Execute() {
     int local_8c = fopAcM_checkCarryNow(this) != 0;
     scale.set(daObj_YBag_Param_c::m[2], daObj_YBag_Param_c::m[2], daObj_YBag_Param_c::m[2]);
@@ -340,7 +326,6 @@ int daObj_YBag_c::Execute() {
     return 1;
 }
 
-/* 80D3D32C-80D3D438 00132C 010C+00 1/1 0/0 0/0 .text            Draw__12daObj_YBag_cFv */
 int daObj_YBag_c::Draw() {
     g_env_light.settingTevStruct( 0,
                                          &current.pos, &tevStr);
@@ -365,37 +350,29 @@ int daObj_YBag_c::Draw() {
     return 1;
 }
 
-/* 80D3D438-80D3D458 001438 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daObj_YBag_cFP10fopAc_ac_c             */
 int daObj_YBag_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daObj_YBag_c*>(i_this)->CreateHeap();
 }
 
-/* 80D3D458-80D3D460 001458 0008+00 1/1 0/0 0/0 .text            getTypeFromParam__12daObj_YBag_cFv
- */
 int daObj_YBag_c::getTypeFromParam() {
     return 0;
 }
 
-/* 80D3D460-80D3D468 001460 0008+00 1/1 0/0 0/0 .text            isDelete__12daObj_YBag_cFv */
 int daObj_YBag_c::isDelete() {
     return 0;
 }
 
-/* 80D3D468-80D3D4C4 001468 005C+00 2/2 0/0 0/0 .text            setEnvTevColor__12daObj_YBag_cFv */
 void daObj_YBag_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80D3D4C4-80D3D508 0014C4 0044+00 2/2 0/0 0/0 .text            setRoomNo__12daObj_YBag_cFv */
 void daObj_YBag_c::setRoomNo() {
     int roomNo = dComIfG_Bgsp().GetRoomId(mGndChk);
     fopAcM_SetRoomNo(this, roomNo);
     mStts.SetRoomId(roomNo);
 }
 
-/* 80D3D508-80D3D5C8 001508 00C0+00 1/1 0/0 0/0 .text            reset__12daObj_YBag_cFv */
 void daObj_YBag_c::reset() {
     field_0x9c4.setall(0.0f);
     field_0x9d0.setall(0.0f);
@@ -427,7 +404,6 @@ void daObj_YBag_c::reset() {
     field_0xa34 = 0;
 }
 
-/* 80D3D5C8-80D3D69C 0015C8 00D4+00 1/1 0/0 0/0 .text            setMtx__12daObj_YBag_cFv */
 void daObj_YBag_c::setMtx() {
     s16 angleDiff = current.angle.y - shape_angle.y;
     s16 dVar5 = field_0xa04 * cM_scos(angleDiff);
@@ -439,7 +415,6 @@ void daObj_YBag_c::setMtx() {
     mModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D3D69C-80D3D73C 00169C 00A0+00 1/1 0/0 0/0 .text            calcRollAngle__12daObj_YBag_cFsi */
 s16 daObj_YBag_c::calcRollAngle(s16 param_1, int param_2) {
     if (param_1 != 0) {
         int rv;
@@ -462,7 +437,6 @@ s16 daObj_YBag_c::calcRollAngle(s16 param_1, int param_2) {
     return 0;
 }
 
-/* 80D3D73C-80D3D8CC 00173C 0190+00 1/1 0/0 0/0 .text            getWallAngle__12daObj_YBag_cFsPs */
 int daObj_YBag_c::getWallAngle(s16 param_1, s16* param_2) {
     cXyz cStack_50;
     cXyz acStack_40[2];
@@ -488,17 +462,14 @@ int daObj_YBag_c::getWallAngle(s16 param_1, s16* param_2) {
     return 1;
 }
 
-/* 80D3D8CC-80D3D948 0018CC 007C+00 1/1 0/0 0/0 .text            setSmokePrtcl__12daObj_YBag_cFv */
 void daObj_YBag_c::setSmokePrtcl() {
     fopAcM_effSmokeSet1(&field_0xa10, &field_0xa14, &current.pos, NULL, 0.4f, &tevStr, 1);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa10);
     dComIfGp_particle_levelEmitterOnEventMove(field_0xa14);
 }
 
-/* 80D3DF1C-80D3DF20 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daObj_YBag_Param_c l_HIO;
 
-/* 80D3D948-80D3DA70 001948 0128+00 1/1 0/0 0/0 .text            setWaterPrtcl__12daObj_YBag_cFv */
 void daObj_YBag_c::setWaterPrtcl() {
     static const cXyz scl(0.4f, 0.4f, 0.4f);
 
@@ -510,38 +481,31 @@ void daObj_YBag_c::setWaterPrtcl() {
     }
 }
 
-/* 80D3DA70-80D3DAC0 001A70 0050+00 1/1 0/0 0/0 .text            setHamonPrtcl__12daObj_YBag_cFv */
 void daObj_YBag_c::setHamonPrtcl() {
     cXyz cStack_18(current.pos.x, field_0x9f4, current.pos.z);
     fopAcM_effHamonSet(field_0xa28, &cStack_18, 0.7f, 0.05f);
 }
 
-/* 80D3DAC0-80D3DAE0 001AC0 0020+00 1/0 0/0 0/0 .text            daObj_YBag_Create__FPv */
 static int daObj_YBag_Create(void* i_this) {
     return static_cast<daObj_YBag_c*>(i_this)->create();
 }
 
-/* 80D3DAE0-80D3DB00 001AE0 0020+00 1/0 0/0 0/0 .text            daObj_YBag_Delete__FPv */
 static int daObj_YBag_Delete(void* i_this) {
     return static_cast<daObj_YBag_c*>(i_this)->Delete();
 }
 
-/* 80D3DB00-80D3DB20 001B00 0020+00 1/0 0/0 0/0 .text            daObj_YBag_Execute__FPv */
 static int daObj_YBag_Execute(void* i_this) {
     return static_cast<daObj_YBag_c*>(i_this)->Execute();
 }
 
-/* 80D3DB20-80D3DB40 001B20 0020+00 1/0 0/0 0/0 .text            daObj_YBag_Draw__FPv */
 static int daObj_YBag_Draw(void* i_this) {
     return static_cast<daObj_YBag_c*>(i_this)->Draw();
 }
 
-/* 80D3DB40-80D3DB48 001B40 0008+00 1/0 0/0 0/0 .text            daObj_YBag_IsDelete__FPv */
 static int daObj_YBag_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D3DE00-80D3DE20 -00001 0020+00 1/0 0/0 0/0 .data            daObj_YBag_MethodTable */
 static actor_method_class daObj_YBag_MethodTable = {
     (process_method_func)daObj_YBag_Create,
     (process_method_func)daObj_YBag_Delete,
@@ -550,7 +514,6 @@ static actor_method_class daObj_YBag_MethodTable = {
     (process_method_func)daObj_YBag_Draw,
 };
 
-/* 80D3DE20-80D3DE50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_YBAG */
 extern actor_process_profile_definition g_profile_OBJ_YBAG = {
   fpcLy_CURRENT_e,         // mLayerID
   8,                       // mListID
diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp
index e2d6b7a265..73074aead3 100644
--- a/src/d/actor/d_a_obj_yobikusa.cpp
+++ b/src/d/actor/d_a_obj_yobikusa.cpp
@@ -12,14 +12,8 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-//
-// Declarations:
-//
-
-/* 8059DF88-8059DF8C -00001 0004+00 1/1 0/0 0/0 .data            l_arcName1 */
 static const char* l_arcName1 = "J_Tobi";
 
-/* 8059DF8C-8059DF90 -00001 0004+00 1/1 0/0 0/0 .data            l_arcName2 */
 static const char* l_arcName2 = "J_Umak";
 
 daObjYobikusa_c::actionFuncEntry daObjYobikusa_c::ActionTable[] = {
@@ -28,25 +22,19 @@ daObjYobikusa_c::actionFuncEntry daObjYobikusa_c::ActionTable[] = {
     {&daObjYobikusa_c::initPickLeaf, &daObjYobikusa_c::executePickLeaf},
 };
 
-/* 8059C9F8-8059CA2C 000078 0034+00 5/5 0/0 0/0 .text
- * setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e      */
 void daObjYobikusa_c::setAction(daObjYobikusa_c::Mode_e i_mode) {
     mActionEntry = &ActionTable[i_mode];
     callInit();
 }
 
-/* 8059CA2C-8059CA54 0000AC 0028+00 1/1 0/0 0/0 .text            callInit__15daObjYobikusa_cFv */
 void daObjYobikusa_c::callInit() {
     (this->*(mActionEntry->initFn))();
 }
 
-/* 8059CA54-8059CA80 0000D4 002C+00 1/1 0/0 0/0 .text            callExecute__15daObjYobikusa_cFv */
 void daObjYobikusa_c::callExecute() {
     (this->*(mActionEntry->execFn))();
 }
 
-/* 8059CA80-8059CA8C 000100 000C+00 1/0 0/0 0/0 .text            initSwingWind__15daObjYobikusa_cFv
- */
 void daObjYobikusa_c::initSwingWind() {
     mMode = MODE_SWING_WIND;
 }
@@ -55,7 +43,6 @@ daObjYobikusa_c::attributes const daObjYobikusa_c::M_attr = {
     1000.0f, 4000.0f, 0.0f, 1500.0f, 500.0f, 1152.0f, 512.0f, 200.0f, 400.0f,
     0.02f,   0.0f,    0.0f, 5000.0f, 150.0f, 1024,    64,     10000,  6582};
 
-/* 8059CA8C-8059CC54 00010C 01C8+00 1/0 0/0 0/0 .text executeSwingWind__15daObjYobikusa_cFv */
 void daObjYobikusa_c::executeSwingWind() {
     f32 wind_pow;
     cXyz wind_dir;
@@ -90,13 +77,10 @@ void daObjYobikusa_c::executeSwingWind() {
     }
 }
 
-/* 8059CC54-8059CC60 0002D4 000C+00 1/0 0/0 0/0 .text            initPushDown__15daObjYobikusa_cFv
- */
 void daObjYobikusa_c::initPushDown() {
     mMode = MODE_PUSH_DOWN;
 }
 
-/* 8059CC60-8059CD44 0002E0 00E4+00 1/0 0/0 0/0 .text executePushDown__15daObjYobikusa_cFv */
 void daObjYobikusa_c::executePushDown() {
     if (!mCcCyl.ChkCoHit()) {
         setAction(MODE_SWING_WIND);
@@ -114,15 +98,12 @@ void daObjYobikusa_c::executePushDown() {
     }
 }
 
-/* 8059CD44-8059CD80 0003C4 003C+00 1/0 0/0 0/0 .text            initPickLeaf__15daObjYobikusa_cFv
- */
 void daObjYobikusa_c::initPickLeaf() {
     mMode = MODE_PICK_LEAF;
     fopAcM_cancelCarryNow(this);
     toPickLeaf();
 }
 
-/* 8059CD80-8059CE7C 000400 00FC+00 1/0 0/0 0/0 .text executePickLeaf__15daObjYobikusa_cFv */
 void daObjYobikusa_c::executePickLeaf() {
     f32 amplitude = mPickLeafAmplitude * cM_ssin(mPickLeafTick);
     mLeafAngles[1].y = amplitude * cM_scos(mPlayerDeltaAngle);
@@ -141,7 +122,6 @@ void daObjYobikusa_c::executePickLeaf() {
     }
 }
 
-/* 8059CE7C-8059D040 0004FC 01C4+00 1/1 0/0 0/0 .text            create_init__15daObjYobikusa_cFv */
 void daObjYobikusa_c::create_init() {
     initBaseMtx();
     fopAcM_setCullSizeBox(this, -50.0f, -30.0f, -50.0f, 50.0f, 120.0f, 50.0f);
@@ -171,7 +151,6 @@ void daObjYobikusa_c::create_init() {
     field_0x766 = cM_rnd() * 65535.0f;
 }
 
-/* 8059D120-8059D198 0007A0 0078+00 1/1 0/0 0/0 .text            initBaseMtx__15daObjYobikusa_cFv */
 void daObjYobikusa_c::initBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -180,18 +159,14 @@ void daObjYobikusa_c::initBaseMtx() {
     cMtx_copy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 8059D198-8059D1BC 000818 0024+00 1/1 0/0 0/0 .text getJointAngle__15daObjYobikusa_cFP5csXyzi */
 void daObjYobikusa_c::getJointAngle(csXyz* i_angle, int i_index) {
     *i_angle = mLeafAngles[i_index];
 }
 
-/* 8059D1BC-8059D1C4 00083C 0008+00 1/1 0/0 0/0 .text            getJointScale__15daObjYobikusa_cFi
- */
 f32 daObjYobikusa_c::getJointScale(int _unused) {
     return mJointScale;
 }
 
-/* 8059D1C4-8059D2E4 000844 0120+00 1/1 0/0 0/0 .text            nodeCallBack__FP8J3DJointi */
 static int nodeCallBack(J3DJoint* i_jnt, int i_param) {
     if (i_param != 0) {
         return 1;
@@ -229,8 +204,6 @@ static int nodeCallBack(J3DJoint* i_jnt, int i_param) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 8059DEE0-8059DF24 000064 0044+00 1/1 0/0 0/0 .rodata          ccCylSrc$3880 */
 const static dCcD_SrcCyl ccCylSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8480422, 0x11}, 0x139}},  // mObj
@@ -245,8 +218,6 @@ const static dCcD_SrcCyl ccCylSrc = {
     }                        // mCyl
 };
 
-/* 8059D320-8059D380 0009A0 0060+00 1/1 0/0 0/0 .text            initCcCylinder__15daObjYobikusa_cFv
- */
 void daObjYobikusa_c::initCcCylinder() {
     mStts.Init(0xff, 0xff, this);
     mCcCyl.Set(ccCylSrc);
@@ -254,13 +225,10 @@ void daObjYobikusa_c::initCcCylinder() {
     mCcCyl.SetC(current.pos);
 }
 
-/* 8059D380-8059D3B4 000A00 0034+00 1/1 0/0 0/0 .text            setCcCylinder__15daObjYobikusa_cFv
- */
 void daObjYobikusa_c::setCcCylinder() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 8059D3B4-8059D454 000A34 00A0+00 1/1 0/0 0/0 .text            toPickLeaf__15daObjYobikusa_cFv */
 bool daObjYobikusa_c::toPickLeaf() {
     if (mJointScale == 1.0f) {
         mJointScale = 0.0f;
@@ -277,7 +245,6 @@ bool daObjYobikusa_c::toPickLeaf() {
     return false;
 }
 
-/* 8059D454-8059D520 000AD4 00CC+00 2/2 0/0 0/0 .text            setNewLeaf__15daObjYobikusa_cFv */
 bool daObjYobikusa_c::setNewLeaf() {
     cLib_chaseF(&mJointScale, 1.0f, attr()->mJointScaleStep);
 
@@ -337,7 +304,6 @@ int daObjYobikusa_c::createHeap() {
     return TRUE;
 }
 
-/* 8059D520-8059D674 000BA0 0154+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daObjYobikusa_c*>(i_this)->createHeap();
 }
@@ -353,18 +319,14 @@ int daObjYobikusa_c::draw() {
     return TRUE;
 }
 
-/* 8059D674-8059D718 000CF4 00A4+00 1/0 0/0 0/0 .text daObjYobikusa_Draw__FP15daObjYobikusa_c */
 static int daObjYobikusa_Draw(daObjYobikusa_c* i_this) {
     return i_this->draw();
 }
 
-/* 8059D718-8059D738 000D98 0020+00 1/0 0/0 0/0 .text daObjYobikusa_Execute__FP15daObjYobikusa_c
- */
 static int daObjYobikusa_Execute(daObjYobikusa_c* i_this) {
     return i_this->execute();
 }
 
-/* 8059D738-8059D9A0 000DB8 0268+00 1/1 0/0 0/0 .text            execute__15daObjYobikusa_cFv */
 int daObjYobikusa_c::execute() {
     if (mpActiveModel == mpModelTypeB) {
         if (!(!fopAcM_CheckCondition(this, 4) &&
@@ -403,8 +365,6 @@ int daObjYobikusa_c::execute() {
     return TRUE;
 }
 
-/* 8059D9A0-8059D9A8 001020 0008+00 1/0 0/0 0/0 .text daObjYobikusa_IsDelete__FP15daObjYobikusa_c
- */
 static bool daObjYobikusa_IsDelete(daObjYobikusa_c* i_this) {
     return true;
 }
@@ -413,7 +373,6 @@ daObjYobikusa_c::~daObjYobikusa_c() {
     dComIfG_resDelete(&mPhase, mResName);
 }
 
-/* 8059D9A8-8059DAF4 001028 014C+00 1/0 0/0 0/0 .text daObjYobikusa_Delete__FP15daObjYobikusa_c */
 static int daObjYobikusa_Delete(daObjYobikusa_c* i_this) {
     i_this->~daObjYobikusa_c();
     return TRUE;
@@ -447,19 +406,16 @@ cPhs__Step daObjYobikusa_c::create() {
     return step;
 }
 
-/* 8059DAF4-8059DC88 001174 0194+00 1/0 0/0 0/0 .text daObjYobikusa_Create__FP10fopAc_ac_c */
 static int daObjYobikusa_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjYobikusa_c*>(i_this)->create();
 }
 
-/* 8059E020-8059E040 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjYobikusa_Method */
 static actor_method_class l_daObjYobikusa_Method = {
     (process_method_func)daObjYobikusa_Create,  (process_method_func)daObjYobikusa_Delete,
     (process_method_func)daObjYobikusa_Execute, (process_method_func)daObjYobikusa_IsDelete,
     (process_method_func)daObjYobikusa_Draw,
 };
 
-/* 8059E040-8059E070 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Yobikusa */
 extern actor_process_profile_definition g_profile_Obj_Yobikusa = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp
index 439c322ceb..133e29fe62 100644
--- a/src/d/actor/d_a_obj_yousei.cpp
+++ b/src/d/actor/d_a_obj_yousei.cpp
@@ -11,7 +11,6 @@
 #include "d/d_item.h"
 #include "Z2AudioLib/Z2Instances.h"
 
-/* 804CE738-804CE7A4 000078 006C+00 1/1 0/0 0/0 .text            InitCcSph__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::InitCcSph() {
     const static dCcD_SrcSph ccSphSrc = {
         {
@@ -32,7 +31,6 @@ void daObjYOUSEI_c::InitCcSph() {
     mCcSph.OnTgNoHitMark();
 }
 
-/* 804CE7A4-804CE7FC 0000E4 0058+00 1/1 0/0 0/0 .text            SetCcSph__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::SetCcSph() {
     mCcSph.SetC(current.pos);
     mCcSph.SetR(40.0f);
@@ -51,28 +49,23 @@ int daObjYOUSEI_c::CreateHeap() {
     return 1;
 }
 
-/* 804CE7FC-804CE8DC 00013C 00E0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     daObjYOUSEI_c* a_this = (daObjYOUSEI_c*)i_this;
     return a_this->CreateHeap();
 }
 
-/* 804CE8DC-804CE8FC 00021C 0020+00 1/0 0/0 0/0 .text            daObjYOUSEI_Create__FP10fopAc_ac_c
- */
 static int daObjYOUSEI_Create(fopAc_ac_c* i_this) {
     daObjYOUSEI_c* a_this = (daObjYOUSEI_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
     return a_this->create();
 }
 
-/* 804CE8FC-804CE920 00023C 0024+00 1/0 0/0 0/0 .text daObjYOUSEI_Delete__FP13daObjYOUSEI_c */
 static int daObjYOUSEI_Delete(daObjYOUSEI_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     i_this->Delete();
     return 1;
 }
 
-/* 804CE920-804CE9D0 000260 00B0+00 1/1 0/0 0/0 .text            SpeedSet__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::SpeedSet() {
     speed.y += gravity;
     current.pos.y += speed.y;
@@ -85,13 +78,10 @@ void daObjYOUSEI_c::SpeedSet() {
     current.pos.z += ato.z;
 }
 
-/* 804D1828-804D182C 000040 0004+00 0/0 0/0 0/0 .bss             s_dis */
 static f32 s_dis;
 
-/* 804D182C-804D1830 000044 0004+00 4/5 0/0 0/0 .bss             sLink_Pos */
 static cXyz* sLink_Pos;
 
-/* 804CE9D0-804CEE50 000310 0480+00 1/1 0/0 0/0 .text            MoveAction__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::MoveAction() {
     switch (mMode) {
     case 0:
@@ -160,7 +150,6 @@ void daObjYOUSEI_c::MoveAction() {
     field_0x610 = dComIfGp_particle_set(field_0x610, 0x732, &current.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 804CEE50-804CF098 000790 0248+00 1/1 0/0 0/0 .text            BinAction__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::BinAction() {
     switch (mMode) {
     case 0:
@@ -198,14 +187,12 @@ void daObjYOUSEI_c::BinAction() {
     field_0x608 = dComIfGp_particle_set(field_0x608, 0x731, &current.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL);
 }
 
-/* 804D1830-804D1834 -00001 0004+00 2/3 0/0 0/0 .bss             None */
 /* 804D1830 0001+00 data_804D1830 None */
 static u8 data_804D1830;
 
 /* 804D1831 0003+00 data_804D1831 None */
 static u8 data_804D1831;
 
-/* 804CF098-804CF6C4 0009D8 062C+00 1/1 0/0 0/0 .text            LinkChk__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::LinkChk() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz& player_pos = fopAcM_GetPosition(player);
@@ -272,7 +259,6 @@ void daObjYOUSEI_c::LinkChk() {
     }
 }
 
-/* 804CF6C4-804CFCE8 001004 0624+00 1/1 0/0 0/0 .text            WaitAction__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::WaitAction() {
     u8 sp18 = 0;
     f32 var_f30 = 0.0f;
@@ -410,7 +396,6 @@ void daObjYOUSEI_c::WaitAction() {
     cLib_addCalcAngleS2(&current.angle.y, mAngleTarget, (26.0f - var_f29) + nREG_S(0), (field_0x61a + 0x1000));
 }
 
-/* 804CFCE8-804D057C 001628 0894+00 1/1 0/0 0/0 .text            LinkAction__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::LinkAction() {
     u8 sp18 = 0;
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -559,7 +544,6 @@ void daObjYOUSEI_c::LinkAction() {
     field_0x5f8 = sp38;
 }
 
-/* 804D057C-804D065C 001EBC 00E0+00 1/1 0/0 0/0 .text            LinkSearch__13daObjYOUSEI_cFv */
 bool daObjYOUSEI_c::LinkSearch() {
     if (mDistToPlayer < 200.0f) {
         f32 var_f31;
@@ -580,7 +564,6 @@ bool daObjYOUSEI_c::LinkSearch() {
     return false;
 }
 
-/* 804D065C-804D0780 001F9C 0124+00 1/1 0/0 0/0 .text            WayBgCheck__13daObjYOUSEI_cFffs */
 bool daObjYOUSEI_c::WayBgCheck(f32 param_0, f32 param_1, s16 param_2) {
     dBgS_LinChk line_chk;
     cXyz sp2C;
@@ -604,7 +587,6 @@ bool daObjYOUSEI_c::WayBgCheck(f32 param_0, f32 param_1, s16 param_2) {
     return false;
 }
 
-/* 804D0780-804D080C 0020C0 008C+00 4/4 0/0 0/0 .text            CareAction__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::CareAction() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (player->checkNowWolf()) {
@@ -619,7 +601,6 @@ void daObjYOUSEI_c::CareAction() {
     mSound.startCreatureSound(Z2SE_FAIRY_S_FLY_RTT, 0, -1);
 }
 
-/* 804D080C-804D0910 00214C 0104+00 2/2 0/0 0/0 .text            CheckGround__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::CheckGround() {
     dBgS_ObjGndChk_All gnd_chk;
     cXyz pos(current.pos.x, 100.0f + current.pos.y, current.pos.z);
@@ -631,7 +612,6 @@ void daObjYOUSEI_c::CheckGround() {
     }
 }
 
-/* 804D0988-804D0AD0 0022C8 0148+00 1/1 0/0 0/0 .text            CheckWater__13daObjYOUSEI_cFv */
 bool daObjYOUSEI_c::CheckWater() {
     dBgS_ObjGndChk_All gnd_chk;
     cXyz pos(current.pos.x, 100.0f + current.pos.y, current.pos.z);
@@ -645,7 +625,6 @@ bool daObjYOUSEI_c::CheckWater() {
     return false;
 }
 
-/* 804D0AD0-804D0CCC 002410 01FC+00 1/1 0/0 0/0 .text            Action__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::Action() {
     switch (mAction) {
     case 0:
@@ -700,7 +679,6 @@ void daObjYOUSEI_c::Action() {
     shape_angle.y = current.angle.y;
 }
 
-/* 804D0CCC-804D0DF0 00260C 0124+00 1/1 0/0 0/0 .text            ObjHit__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::ObjHit() {
     if (mCcSph.ChkTgHit()) {
         cCcD_Obj* hit_obj = mCcSph.GetTgHitObj();
@@ -728,7 +706,6 @@ void daObjYOUSEI_c::ObjHit() {
     }
 }
 
-/* 804D0DF0-804D0F98 002730 01A8+00 1/1 0/0 0/0 .text            Execute__13daObjYOUSEI_cFv */
 int daObjYOUSEI_c::Execute() {
     sLink_Pos = &fopAcM_GetPosition(daPy_getPlayerActorClass());
     mDistToPlayer = fopAcM_searchPlayerDistanceXZ(this);
@@ -759,7 +736,6 @@ int daObjYOUSEI_c::Execute() {
     return 1;
 }
 
-/* 804D0F98-804D0FCC 0028D8 0034+00 1/1 0/0 0/0 .text            Delete__13daObjYOUSEI_cFv */
 int daObjYOUSEI_c::Delete() {
     if (heap != NULL) {
         mpModelMorf->stopZelAnime();
@@ -768,7 +744,6 @@ int daObjYOUSEI_c::Delete() {
     return 1;
 }
 
-/* 804D0FCC-804D1040 00290C 0074+00 1/1 0/0 0/0 .text            setBaseMtx__13daObjYOUSEI_cFv */
 void daObjYOUSEI_c::setBaseMtx() {
     cXyz sp8(0.2f, 0.2f, 0.2f);
     mDoMtx_stack_c::transS(current.pos);
@@ -790,18 +765,14 @@ int daObjYOUSEI_c::Draw() {
     return 1;
 }
 
-/* 804D1040-804D10FC 002980 00BC+00 1/0 0/0 0/0 .text            daObjYOUSEI_Draw__FP13daObjYOUSEI_c
- */
 static int daObjYOUSEI_Draw(daObjYOUSEI_c* i_this) {
     return i_this->Draw();
 }
 
-/* 804D10FC-804D111C 002A3C 0020+00 2/1 0/0 0/0 .text daObjYOUSEI_Execute__FP13daObjYOUSEI_c */
 static int daObjYOUSEI_Execute(daObjYOUSEI_c* i_this) {
     return i_this->Execute();
 }
 
-/* 804D111C-804D149C 002A5C 0380+00 1/1 0/0 0/0 .text            create__13daObjYOUSEI_cFv */
 int daObjYOUSEI_c::create() {
     fopAcM_ct(this, daObjYOUSEI_c);
 
@@ -878,12 +849,10 @@ int daObjYOUSEI_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804D159C-804D15A4 002EDC 0008+00 1/0 0/0 0/0 .text daObjYOUSEI_IsDelete__FP13daObjYOUSEI_c */
 static int daObjYOUSEI_IsDelete(daObjYOUSEI_c* i_this) {
     return 1;
 }
 
-/* 804D1728-804D1748 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjYOUSEI_Method */
 static actor_method_class l_daObjYOUSEI_Method = {
     (process_method_func)daObjYOUSEI_Create,
     (process_method_func)daObjYOUSEI_Delete,
@@ -892,7 +861,6 @@ static actor_method_class l_daObjYOUSEI_Method = {
     (process_method_func)daObjYOUSEI_Draw,
 };
 
-/* 804D1748-804D1778 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_Yousei */
 extern actor_process_profile_definition g_profile_Obj_Yousei = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp
index c1b9286bd6..7b0681700a 100644
--- a/src/d/actor/d_a_obj_ystone.cpp
+++ b/src/d/actor/d_a_obj_ystone.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D3ECBC-80D3ECD8 -00001 001C+00 4/4 0/0 0/0 .data            l_arcName */
 static char const* l_arcName[7] = {
     "N_gD_mskF",
     "N_gD_mskB",
@@ -20,7 +19,6 @@ static char const* l_arcName[7] = {
     "MirrorB",
 };
 
-/* 80D3ECD8-80D3ECFC -00001 0024+00 1/1 0/0 0/0 .data            l_stageName$3775 */
 static char const* l_stageName[9] = {
     "D_MN05A",
     "D_MN04A",
@@ -33,16 +31,12 @@ static char const* l_stageName[9] = {
     "D_MN01A",
 };
 
-/* 80D3EC0C-80D3EC28 000000 001C+00 2/2 0/0 0/0 .rodata          l_bmdIndex */
 static int const l_bmdIndex[7] = {4, 4, 4, 9, 9, 10, 11};
 
-/* 80D3EC28-80D3EC34 00001C 000C+00 0/1 0/0 0/0 .rodata          l_brkIndex */
 static int const l_brkIndex[3] = {7, 7, 7};
 
-/* 80D3EC34-80D3EC50 000028 001C+00 0/1 0/0 0/0 .rodata          l_btkIndex */
 static int const l_btkIndex[7] = {14, 14, 14, 14, 14, 15, 16};
 
-/* 80D3E018-80D3E090 000078 0078+00 1/1 0/0 0/0 .text            getNowLevel__Fv */
 static int getNowLevel() {
     for (int i = 0; i < 9; i++) {
         if (!strcmp(dComIfGp_getStartStageName(), l_stageName[i])) {
@@ -52,7 +46,6 @@ static int getNowLevel() {
     return -1;
 }
 
-/* 80D3E090-80D3E180 0000F0 00F0+00 1/0 0/0 0/0 .text daObj_Ystone_Draw__FP16obj_ystone_class */
 static int daObj_Ystone_Draw(obj_ystone_class* i_this) {
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
     if (i_this->mLevel < 3) {
@@ -73,7 +66,6 @@ static int daObj_Ystone_Draw(obj_ystone_class* i_this) {
     return 1;
 }
 
-/* 80D3E180-80D3E25C 0001E0 00DC+00 1/1 0/0 0/0 .text setModelBaseMtx__FP16obj_ystone_class */
 static void setModelBaseMtx(obj_ystone_class* i_this) {
     J3DModel* model;
     if (i_this->mLevel < 3) {
@@ -97,7 +89,6 @@ static u16 mirror_effect_id[10] = {
     0x89A0, 0x89A1, 0x89A2, 0x89A5, 0x89A6, 0x89A7, 0x89A8, 0x89A9, 0x89AA, 0x89AB
 };
 
-/* 80D3E25C-80D3E6EC 0002BC 0490+00 2/1 0/0 0/0 .text            action__FP16obj_ystone_class */
 static void action(obj_ystone_class* i_this) {
     if (i_this->mLevel < 3) {
         switch (i_this->mShadowMode) {
@@ -193,8 +184,6 @@ static void action(obj_ystone_class* i_this) {
     }
 }
 
-/* 80D3E6EC-80D3E770 00074C 0084+00 2/1 0/0 0/0 .text daObj_Ystone_Execute__FP16obj_ystone_class
- */
 static int daObj_Ystone_Execute(obj_ystone_class* i_this) {
     if (i_this->mLevel < 3 && i_this->field_0x59b) {
         return 1;
@@ -206,19 +195,15 @@ static int daObj_Ystone_Execute(obj_ystone_class* i_this) {
     }
 }
 
-/* 80D3E770-80D3E778 0007D0 0008+00 1/0 0/0 0/0 .text daObj_Ystone_IsDelete__FP16obj_ystone_class
- */
 static int daObj_Ystone_IsDelete(obj_ystone_class* i_this) {
     return 1;
 }
 
-/* 80D3E778-80D3E7B8 0007D8 0040+00 1/0 0/0 0/0 .text daObj_Ystone_Delete__FP16obj_ystone_class */
 static int daObj_Ystone_Delete(obj_ystone_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, l_arcName[i_this->mLevel]);
     return 1;
 }
 
-/* 80D3E7B8-80D3EA38 000818 0280+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     obj_ystone_class* _this = static_cast<obj_ystone_class*>(i_this);
     void* model_data =
@@ -261,8 +246,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-/* 80D3EA80-80D3EC04 000AE0 0184+00 1/0 0/0 0/0 .text            daObj_Ystone_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) {
     obj_ystone_class* _this = static_cast<obj_ystone_class*>(i_this);
     fopAcM_ct(_this, obj_ystone_class);
@@ -302,7 +285,6 @@ static cPhs__Step daObj_Ystone_Create(fopAc_ac_c* i_this) {
 }
 
 
-/* 80D3ED2C-80D3ED4C -00001 0020+00 1/0 0/0 0/0 .data            l_daObj_Ystone_Method */
 static actor_method_class l_daObj_Ystone_Method = {
     (process_method_func)daObj_Ystone_Create,
     (process_method_func)daObj_Ystone_Delete,
@@ -311,7 +293,6 @@ static actor_method_class l_daObj_Ystone_Method = {
     (process_method_func)daObj_Ystone_Draw,
 };
 
-/* 80D3ED4C-80D3ED7C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_YSTONE */
 extern actor_process_profile_definition g_profile_OBJ_YSTONE = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp
index b89cf50460..296fd6c392 100644
--- a/src/d/actor/d_a_obj_zcloth.cpp
+++ b/src/d/actor/d_a_obj_zcloth.cpp
@@ -11,20 +11,17 @@
 #include "d/d_a_itembase_static.h"
 #include "d/d_procname.h"
 
-/* 80D3EE18-80D3EE54 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daObjZCloth_cFv */
 void daObjZCloth_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80D3EE54-80D3EEC0 0000B4 006C+00 2/2 0/0 0/0 .text            setBaseMtx__13daObjZCloth_cFv */
 void daObjZCloth_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D3EEC0-80D3EF0C 000120 004C+00 1/1 0/0 0/0 .text            Create__13daObjZCloth_cFv */
 int daObjZCloth_c::Create() {
     initBaseMtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
@@ -32,7 +29,6 @@ int daObjZCloth_c::Create() {
     return 1;
 }
 
-/* 80D3EF0C-80D3F0AC 00016C 01A0+00 1/1 0/0 0/0 .text            create__13daObjZCloth_cFv */
 int daObjZCloth_c::create() {
     fopAcM_ct(this, daObjZCloth_c);
     m_itemNo = 0x31;
@@ -48,45 +44,37 @@ int daObjZCloth_c::create() {
     return phase;
 }
 
-/* 80D3F1AC-80D3F1D0 00040C 0024+00 1/1 0/0 0/0 .text            execute__13daObjZCloth_cFv */
 int daObjZCloth_c::execute() {
     setBaseMtx();
     return 1;
 }
 
-/* 80D3F1D0-80D3F200 000430 0030+00 1/1 0/0 0/0 .text            draw__13daObjZCloth_cFv */
 int daObjZCloth_c::draw() {
     DrawBase();
     return 1;
 }
 
-/* 80D3F200-80D3F23C 000460 003C+00 1/1 0/0 0/0 .text            _delete__13daObjZCloth_cFv */
 int daObjZCloth_c::_delete() {
     dComIfG_resDelete(&mPhase, dItem_data::getFieldArc(m_itemNo)); 
     return 1;
 }  
 
-/* 80D3F23C-80D3F25C 00049C 0020+00 1/0 0/0 0/0 .text            daObjZCloth_Draw__FP13daObjZCloth_c */
 static int daObjZCloth_Draw(daObjZCloth_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D3F25C-80D3F27C 0004BC 0020+00 1/0 0/0 0/0 .text daObjZCloth_Execute__FP13daObjZCloth_c */
 static int daObjZCloth_Execute(daObjZCloth_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D3F27C-80D3F29C 0004DC 0020+00 1/0 0/0 0/0 .text daObjZCloth_Delete__FP13daObjZCloth_c */
 static int daObjZCloth_Delete(daObjZCloth_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D3F29C-80D3F2BC 0004FC 0020+00 1/0 0/0 0/0 .text            daObjZCloth_Create__FP10fopAc_ac_c */
 static int daObjZCloth_Create(fopAc_ac_c* i_this) {
     return static_cast<daObjZCloth_c*>(i_this)->create();
 }
 
-/* 80D3F2D4-80D3F2F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjZCloth_Method */
 static actor_method_class l_daObjZCloth_Method = {
     (process_method_func)daObjZCloth_Create,
     (process_method_func)daObjZCloth_Delete,
@@ -95,7 +83,6 @@ static actor_method_class l_daObjZCloth_Method = {
     (process_method_func)daObjZCloth_Draw,
 };
 
-/* 80D3F2F4-80D3F324 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ZoraCloth */
 extern actor_process_profile_definition g_profile_Obj_ZoraCloth = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp
index 9f12781447..e23cff73c1 100644
--- a/src/d/actor/d_a_obj_zdoor.cpp
+++ b/src/d/actor/d_a_obj_zdoor.cpp
@@ -6,14 +6,8 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_obj_zdoor.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_player.h"
 
-//
-// Declarations:
-//
-
-/* 80D401EC-80D40228 000000 003C+00 3/3 0/0 0/0 .rodata          l_cyl_data */
 static const cM3dGCylS l_cyl_data[3] = {
     {{
          0.0f,
@@ -38,7 +32,6 @@ static const cM3dGCylS l_cyl_data[3] = {
      150.0f},
 };
 
-/* 80D40228-80D40264 00003C 003C+00 1/1 0/0 0/0 .rodata          l_cyl_data2 */
 static const cM3dGCylS l_cyl_data2[3] = {
     {{
          0.0f,
@@ -63,21 +56,18 @@ static const cM3dGCylS l_cyl_data2[3] = {
      150.0f},
 };
 
-/* 80D40264-80D4026C 000078 0006+02 0/1 0/0 0/0 .rodata          l_open_limit_max */
 static const s16 l_open_limit_max[3] = {
     0x4E20,
     0x5555,
     0,
 };
 
-/* 80D4026C-80D40274 000080 0006+02 0/1 0/0 0/0 .rodata          l_open_limit_min */
 static const s16 l_open_limit_min[3] = {
     0x1388,
     0xAAAB,
     0xAE39,
 };
 
-/* 80D40274-80D4027C 000088 0006+02 2/2 0/0 0/0 .rodata          l_open_speed */
 static const s16 l_open_speed[3] = {
     0x00FA,
     0x0200,
@@ -87,7 +77,6 @@ static const s16 l_open_speed[3] = {
 /*
     Checks if the player is in front or behind the door.
 */
-/* 80D3F438-80D3F4DC 000078 00A4+00 2/2 0/0 0/0 .text            checkPlayerPos__FP9daZdoor_c */
 static BOOL checkPlayerPos(daZdoor_c* i_this) {
 
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -104,8 +93,6 @@ static BOOL checkPlayerPos(daZdoor_c* i_this) {
     return is_in_front;
 }
 
-/* 80D3F4DC-80D3F570 00011C 0094+00 1/1 0/0 0/0 .text
- * doorCoHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void doorCoHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* colliding_actor,
                                   dCcD_GObjInf* param_3) {
     daZdoor_c* i_this = static_cast<daZdoor_c*>(param_0);
@@ -127,8 +114,6 @@ static void doorCoHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_
     }
 }
 
-/* 80D3F570-80D3F65C 0001B0 00EC+00 1/1 0/0 0/0 .text
- * doorTgHitCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf */
 static void doorTgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_ac_c* colliding_actor,
                                   dCcD_GObjInf* param_3) {
     daZdoor_c* i_this = static_cast<daZdoor_c*>(param_0);
@@ -162,8 +147,6 @@ static void doorTgHitCallBack(fopAc_ac_c* param_0, dCcD_GObjInf* param_1, fopAc_
     }
 }
 
-/* ############################################################################################## */
-/* 80D40310-80D40354 000000 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x19}},  // mObj
@@ -178,7 +161,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80D40354-80D40398 000044 0044+00 1/1 0/0 0/0 .data            l_cyl_src2 */
 static dCcD_SrcCyl l_cyl_src2 = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x79}},  // mObj
@@ -193,7 +175,6 @@ static dCcD_SrcCyl l_cyl_src2 = {
     }                        // mCyl
 };
 
-/* 80D3F65C-80D3F740 00029C 00E4+00 1/1 0/0 0/0 .text            init_cyl__9daZdoor_cFv */
 void daZdoor_c::init_cyl() {
     mStts.Init(0xff, 0xff, this);
     for (int i = 0; i < 4; i++) {
@@ -209,7 +190,6 @@ void daZdoor_c::init_cyl() {
     mCylinder.cM3dGCyl::Set(l_cyl_data2[mDoorType]);
 }
 
-/* 80D3F740-80D3F884 000380 0144+00 1/1 0/0 0/0 .text            set_cyl__9daZdoor_cFv */
 void daZdoor_c::set_cyl() {
     cXyz vecs[] = {
         cXyz(60.0f, 0.0f, 0.0f),
@@ -230,7 +210,6 @@ void daZdoor_c::set_cyl() {
     mCylinder.SetC(current.pos);
 }
 
-/* 80D3F884-80D3F8F8 0004C4 0074+00 2/2 0/0 0/0 .text            setBaseMtx__9daZdoor_cFv */
 void daZdoor_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -238,7 +217,6 @@ void daZdoor_c::setBaseMtx() {
     MTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D3F8F8-80D3F970 000538 0078+00 1/0 0/0 0/0 .text            Create__9daZdoor_cFv */
 int daZdoor_c::Create() {
     setBaseMtx();
 
@@ -255,21 +233,18 @@ int daZdoor_c::Create() {
     return 1;
 }
 
-/* 80D40398-80D403A4 -00001 000C+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName[3] = {
     "J_Zdoor",
     "J_Rdoor",
     "J_STdoa",
 };
 
-/* 80D403A4-80D403B0 -00001 000C+00 1/1 0/0 0/0 .data            l_bmdName */
 static char* l_bmdName[3] = {
     "J_Zdoor.bmd",
     "J_Rdoor.bmd",
     "J_STdoa.bmd",
 };
 
-/* 80D3F970-80D3F9F0 0005B0 0080+00 1/0 0/0 0/0 .text            CreateHeap__9daZdoor_cFv */
 int daZdoor_c::CreateHeap() {
     J3DModelData* modelData
         = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mDoorType], l_bmdName[mDoorType]);
@@ -283,20 +258,17 @@ int daZdoor_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80D402A4-80D402A8 0000B8 0004+00 1/1 0/0 0/0 .rodata          estimateSizeTbl$3848 */
 static const u16 estimateSizeTbl[2] = {
     0x0CF0,
     0x0D30,
 };
 
-/* 80D403B0-80D403BC -00001 000C+00 1/1 0/0 0/0 .data            l_dzbName */
 static char* l_dzbName[3] = {
     "J_Zdoor.dzb",
     "J_Rdoor.dzb",
     "J_STdoa.dzb",
 };
 
-/* 80D3F9F0-80D3FACC 000630 00DC+00 1/1 0/0 0/0 .text            create1st__9daZdoor_cFv */
 int daZdoor_c::create1st() {
     mDoorType = getType();
     int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName[mDoorType]);
@@ -314,7 +286,6 @@ int daZdoor_c::create1st() {
     return phase_state;
 }
 
-/* 80D3FACC-80D3FCE8 00070C 021C+00 1/0 0/0 0/0 .text            Execute__9daZdoor_cFPPA3_A4_f */
 int daZdoor_c::Execute(Mtx** i_mtx) {
     s16 current_open_angle = mOpenAngle;
     set_cyl();
@@ -367,7 +338,6 @@ int daZdoor_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D3FCE8-80D3FD8C 000928 00A4+00 1/0 0/0 0/0 .text            Draw__9daZdoor_cFv */
 int daZdoor_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel->mModelData, &tevStr);
@@ -379,38 +349,29 @@ int daZdoor_c::Draw() {
     return 1;
 }
 
-/* 80D3FD8C-80D3FDCC 0009CC 0040+00 1/0 0/0 0/0 .text            Delete__9daZdoor_cFv */
 int daZdoor_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName[mDoorType]);
     return 1;
 }
 
-/* 80D3FDCC-80D3FF18 000A0C 014C+00 1/0 0/0 0/0 .text            daZdoor_create1st__FP9daZdoor_c */
 static int daZdoor_create1st(daZdoor_c* i_this) {
     fopAcM_ct(i_this, daZdoor_c);
 
     return i_this->create1st();
 }
 
-/* 80D40168-80D40188 000DA8 0020+00 1/0 0/0 0/0 .text            daZdoor_MoveBGDelete__FP9daZdoor_c
- */
 static int daZdoor_MoveBGDelete(daZdoor_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D40188-80D401A8 000DC8 0020+00 1/0 0/0 0/0 .text            daZdoor_MoveBGExecute__FP9daZdoor_c
- */
 static int daZdoor_MoveBGExecute(daZdoor_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D401A8-80D401D4 000DE8 002C+00 1/0 0/0 0/0 .text            daZdoor_MoveBGDraw__FP9daZdoor_c */
 static int daZdoor_MoveBGDraw(daZdoor_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* ############################################################################################## */
-/* 80D403BC-80D403DC -00001 0020+00 1/0 0/0 0/0 .data            daZdoor_METHODS */
 static actor_method_class daZdoor_METHODS = {
     (process_method_func)daZdoor_create1st,
     (process_method_func)daZdoor_MoveBGDelete,
@@ -419,7 +380,6 @@ static actor_method_class daZdoor_METHODS = {
     (process_method_func)daZdoor_MoveBGDraw,
 };
 
-/* 80D403DC-80D4040C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ZDoor */
 extern actor_process_profile_definition g_profile_Obj_ZDoor = {
   fpcLy_CURRENT_e,        // mLayerID
   3,                      // mListID
diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp
index 89de362dfe..480dc394ef 100644
--- a/src/d/actor/d_a_obj_zrTurara.cpp
+++ b/src/d/actor/d_a_obj_zrTurara.cpp
@@ -11,17 +11,14 @@
 #include "d/d_procname.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80D4056C-80D4059C 0000EC 0030+00 1/1 0/0 0/0 .text            __ct__16daZrTurara_HIO_cFv */
 daZrTurara_HIO_c::daZrTurara_HIO_c() {
     mDebrisNum = 5;
     // mDebrisRange = 250.0f;
     mDebrisRange = 250.0f;
 }
 
-/* 80D4178C-80D41798 000014 000C+00 2/2 0/0 0/0 .bss             l_HIO */
 static daZrTurara_HIO_c l_HIO;
 
-/* 80D415A0-80D415D0 000004 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daZrTurara_c */
 dCcD_SrcGObjInf const daZrTurara_c::mCcDObjInfo = {
     {0, {
         {0, 0, 0},
@@ -33,13 +30,11 @@ dCcD_SrcGObjInf const daZrTurara_c::mCcDObjInfo = {
     {0}
 };
 
-/* 80D41628-80D4166C 000020 0044+00 2/2 0/0 0/0 .data            mCcDCyl__12daZrTurara_c */
 dCcD_SrcCyl daZrTurara_c::mCcDCyl = {
     mCcDObjInfo,
     {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}
 };
 
-/* 80D405E4-80D40714 000164 0130+00 2/2 0/0 0/0 .text            setBaseMtx__12daZrTurara_cFv */
 void daZrTurara_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -57,7 +52,6 @@ void daZrTurara_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mRockBgMtx);
 }
 
-/* 80D40714-80D40844 000294 0130+00 1/0 0/0 0/0 .text            CreateHeap__12daZrTurara_cFv */
 int daZrTurara_c::CreateHeap() {
     J3DModelData* base_model_data = (J3DModelData*)dComIfG_getObjectRes("M_DrpRock", 5);
     mpBaseModel = mDoExt_J3DModel__create(base_model_data, 0x80000, 0x11000084);
@@ -79,7 +73,6 @@ int daZrTurara_c::CreateHeap() {
     return 1;
 }
 
-/* 80D40844-80D40B1C 0003C4 02D8+00 1/1 0/0 0/0 .text            create__12daZrTurara_cFv */
 cPhs__Step daZrTurara_c::create() {
     fopAcM_ct(this, daZrTurara_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "M_DrpRock");
@@ -129,8 +122,6 @@ cPhs__Step daZrTurara_c::create() {
     return step;
 }
 
-/* 80D40C08-80D40C68 000788 0060+00 1/0 0/0 0/0 .text            Execute__12daZrTurara_cFPPA3_A4_f
- */
 int daZrTurara_c::Execute(Mtx** i_mtxP) {
     move();
     *i_mtxP = &mpBaseModel->getBaseTRMtx();
@@ -141,7 +132,6 @@ int daZrTurara_c::Execute(Mtx** i_mtxP) {
     return 1;
 }
 
-/* 80D40C68-80D40D88 0007E8 0120+00 1/1 0/0 0/0 .text            move__12daZrTurara_cFv */
 void daZrTurara_c::move() {
     typedef void (daZrTurara_c::*daZrTurara_modeFunc)();
     static daZrTurara_modeFunc mode_proc[3] = {
@@ -159,7 +149,6 @@ void daZrTurara_c::move() {
 }
 
 
-/* 80D40D88-80D40E0C 000908 0084+00 1/0 0/0 0/0 .text            modeWait__12daZrTurara_cFv */
 void daZrTurara_c::modeWait() {
     if (mSw2 != 0xff && fopAcM_isSwitch(this, mSw2)) {
         init_modeBreak();
@@ -169,7 +158,6 @@ void daZrTurara_c::modeWait() {
     }
 }
 
-/* 80D40E0C-80D410E0 00098C 02D4+00 1/1 0/0 0/0 .text            init_modeBreak__12daZrTurara_cFv */
 void daZrTurara_c::init_modeBreak() {
     mDoAud_seStart(Z2SE_OBJ_RG_ROCK_BREAK, &current.pos, 0,
                    dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
@@ -193,7 +181,6 @@ void daZrTurara_c::init_modeBreak() {
     mMode = 1;
 }
 
-/* 80D410E0-80D412A0 000C60 01C0+00 1/0 0/0 0/0 .text            modeBreak__12daZrTurara_cFv */
 void daZrTurara_c::modeBreak() {
     cXyz scale(mScaleF, mScaleF, mScaleF);
     mParticleKey = dComIfGp_particle_set(mParticleKey, 0x8a98, &current.pos, NULL, &scale);
@@ -218,17 +205,14 @@ void daZrTurara_c::modeBreak() {
     }
 }
 
-/* 80D412A0-80D412AC 000E20 000C+00 2/2 0/0 0/0 .text            init_modeEnd__12daZrTurara_cFv */
 void daZrTurara_c::init_modeEnd() {
     mMode = 2;
 }
 
-/* 80D412AC-80D412B0 000E2C 0004+00 1/0 0/0 0/0 .text            modeEnd__12daZrTurara_cFv */
 void daZrTurara_c::modeEnd() {
     /* empty function */
 }
 
-/* 80D412B0-80D41380 000E30 00D0+00 1/0 0/0 0/0 .text            Draw__12daZrTurara_cFv */
 int daZrTurara_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpBaseModel, &tevStr);
@@ -242,7 +226,6 @@ int daZrTurara_c::Draw() {
     return 1;
 }
 
-/* 80D41380-80D413E8 000F00 0068+00 1/0 0/0 0/0 .text            Delete__12daZrTurara_cFv */
 int daZrTurara_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "M_DrpRock");
     if (mpRockBgW != NULL && mpRockBgW->ChkUsed()) {
@@ -251,30 +234,22 @@ int daZrTurara_c::Delete() {
     return 1;
 }
 
-/* 80D413E8-80D41414 000F68 002C+00 1/0 0/0 0/0 .text            daZrTurara_Draw__FP12daZrTurara_c
- */
 static int daZrTurara_Draw(daZrTurara_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D41414-80D41434 000F94 0020+00 1/0 0/0 0/0 .text daZrTurara_Execute__FP12daZrTurara_c */
 static int daZrTurara_Execute(daZrTurara_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D41434-80D41454 000FB4 0020+00 1/0 0/0 0/0 .text            daZrTurara_Delete__FP12daZrTurara_c
- */
 static int daZrTurara_Delete(daZrTurara_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D41454-80D41474 000FD4 0020+00 1/0 0/0 0/0 .text            daZrTurara_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daZrTurara_Create(fopAc_ac_c* i_this) {
     return static_cast<daZrTurara_c*>(i_this)->create();
 }
 
-/* 80D416B4-80D416D4 -00001 0020+00 1/0 0/0 0/0 .data            l_daZrTurara_Method */
 static actor_method_class l_daZrTurara_Method = {
     (process_method_func)daZrTurara_Create,
     (process_method_func)daZrTurara_Delete,
@@ -283,7 +258,6 @@ static actor_method_class l_daZrTurara_Method = {
     (process_method_func)daZrTurara_Draw,
 };
 
-/* 80D416D4-80D41704 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_zrTurara */
 extern actor_process_profile_definition g_profile_Obj_zrTurara = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp
index c33aa9bbb4..538227d539 100644
--- a/src/d/actor/d_a_obj_zrTuraraRock.cpp
+++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp
@@ -10,10 +10,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D425AC-80D425CC 000014 0020+00 2/2 0/0 0/0 .bss             l_HIO */
 static daZrTuraRc_HIO_c l_HIO;
 
-/* 80D4188C-80D418EC 0000EC 0060+00 1/1 0/0 0/0 .text            __ct__16daZrTuraRc_HIO_cFv */
 daZrTuraRc_HIO_c::daZrTuraRc_HIO_c() {
     field_0x04 = 450.0f;
     mGravity = 10.0f;
@@ -25,7 +23,6 @@ daZrTuraRc_HIO_c::daZrTuraRc_HIO_c() {
     field_0x1c = 5.0f;
 }
 
-/* 80D423D4-80D42404 000014 0030+00 1/1 0/0 0/0 .rodata          mCcDObjInfo__12daZrTuraRc_c */
 dCcD_SrcGObjInf const daZrTuraRc_c::mCcDObjInfo = {
     {0, {
         {0x20, 1, 0x1F},
@@ -37,13 +34,11 @@ dCcD_SrcGObjInf const daZrTuraRc_c::mCcDObjInfo = {
     {0}
 };
 
-/* 80D42460-80D424A0 000020 0040+00 2/2 0/0 0/0 .data            mCcDSph__12daZrTuraRc_c */
 dCcD_SrcSph daZrTuraRc_c::mCcDSph = {
     mCcDObjInfo,
     {{{0.0f, 0.0f, 0.0f}, 0.0f}}
 };
 
-/* 80D41934-80D419D4 000194 00A0+00 2/2 0/0 0/0 .text            setBaseMtx__12daZrTuraRc_cFv */
 void daZrTuraRc_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -52,7 +47,6 @@ void daZrTuraRc_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D419D4-80D41A40 000234 006C+00 1/1 0/0 0/0 .text            CreateHeap__12daZrTuraRc_cFv */
 int daZrTuraRc_c::CreateHeap() {
     J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("M_DRockHn", 3);
     mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084);
@@ -62,7 +56,6 @@ int daZrTuraRc_c::CreateHeap() {
     return 1;
 }
 
-/* 80D41A40-80D41D24 0002A0 02E4+00 1/1 0/0 0/0 .text            create__12daZrTuraRc_cFv */
 cPhs__Step daZrTuraRc_c::create() {
     fopAcM_ct(this, daZrTuraRc_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, "M_DRockHn");
@@ -93,13 +86,10 @@ cPhs__Step daZrTuraRc_c::create() {
     return step;
 }
 
-/* 80D41EF0-80D41F10 000750 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__12daZrTuraRc_cFP10fopAc_ac_c             */
 int daZrTuraRc_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daZrTuraRc_c*>(i_this)->CreateHeap();
 }
 
-/* 80D41F10-80D41F78 000770 0068+00 1/1 0/0 0/0 .text            Execute__12daZrTuraRc_cFv */
 int daZrTuraRc_c::Execute() {
     move();
     setBaseMtx();
@@ -108,7 +98,6 @@ int daZrTuraRc_c::Execute() {
     return 1;
 }
 
-/* 80D41F78-80D4204C 0007D8 00D4+00 1/1 0/0 0/0 .text            move__12daZrTuraRc_cFv */
 void daZrTuraRc_c::move() {
     typedef void (daZrTuraRc_c::*daZrTuraRc_modeFunc)();
     static daZrTuraRc_modeFunc mode_proc[2] = {
@@ -121,7 +110,6 @@ void daZrTuraRc_c::move() {
     dComIfG_Ccsp()->Set(&mCcSph);
 }
 
-/* 80D4204C-80D42084 0008AC 0038+00 1/1 0/0 0/0 .text            init_modeDrop__12daZrTuraRc_cFv */
 void daZrTuraRc_c::init_modeDrop() {
     fopAcM_SetGravity(this, -l_HIO.mGravity);
     fopAcM_SetMaxFallSpeed(this, -l_HIO.mMaxFallSpeed);
@@ -129,7 +117,6 @@ void daZrTuraRc_c::init_modeDrop() {
     mMode = 0;
 }
 
-/* 80D42084-80D420FC 0008E4 0078+00 1/0 0/0 0/0 .text            modeDrop__12daZrTuraRc_cFv */
 void daZrTuraRc_c::modeDrop() {
     fopAcM_posMoveF(this, mCcStatus.GetCCMoveP());
     mSound.startLevelSound(Z2SE_OBJ_RG_ROCK_FALL, 0, -1);
@@ -137,7 +124,6 @@ void daZrTuraRc_c::modeDrop() {
     bgCheck();
 }
 
-/* 80D420FC-80D42128 00095C 002C+00 1/1 0/0 0/0 .text            bgCheck__12daZrTuraRc_cFv */
 void daZrTuraRc_c::bgCheck() {
     // this should be ChkGroundHit but that doesn't match
     if (mAcch.m_flags >> 5 & 1) {
@@ -145,19 +131,15 @@ void daZrTuraRc_c::bgCheck() {
     }
 }
 
-/* 80D42128-80D4215C 000988 0034+00 1/1 0/0 0/0 .text            init_modeDropEnd__12daZrTuraRc_cFv
- */
 void daZrTuraRc_c::init_modeDropEnd() {
     fopAcM_delete(this);
     mMode = 1;
 }
 
-/* 80D4215C-80D42160 0009BC 0004+00 1/0 0/0 0/0 .text            modeDropEnd__12daZrTuraRc_cFv */
 void daZrTuraRc_c::modeDropEnd() {
     /* empty function */
 }
 
-/* 80D42160-80D421C4 0009C0 0064+00 1/1 0/0 0/0 .text            Draw__12daZrTuraRc_cFv */
 int daZrTuraRc_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -165,37 +147,28 @@ int daZrTuraRc_c::Draw() {
     return 1;
 }
 
-/* 80D421C4-80D42208 000A24 0044+00 1/1 0/0 0/0 .text            Delete__12daZrTuraRc_cFv */
 int daZrTuraRc_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, "M_DRockHn");
     mSound.deleteObject();
     return 1;
 }
 
-/* 80D42208-80D42228 000A68 0020+00 1/0 0/0 0/0 .text            daZrTuraRc_Draw__FP12daZrTuraRc_c
- */
 static int daZrTuraRc_Draw(daZrTuraRc_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D42228-80D42248 000A88 0020+00 1/0 0/0 0/0 .text daZrTuraRc_Execute__FP12daZrTuraRc_c */
 static int daZrTuraRc_Execute(daZrTuraRc_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D42248-80D42268 000AA8 0020+00 1/0 0/0 0/0 .text            daZrTuraRc_Delete__FP12daZrTuraRc_c
- */
 static int daZrTuraRc_Delete(daZrTuraRc_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D42268-80D42288 000AC8 0020+00 1/0 0/0 0/0 .text            daZrTuraRc_Create__FP10fopAc_ac_c
- */
 static cPhs__Step daZrTuraRc_Create(fopAc_ac_c* i_this) {
     return static_cast<daZrTuraRc_c*>(i_this)->create();
 }
 
-/* 80D424D0-80D424F0 -00001 0020+00 1/0 0/0 0/0 .data            l_daZrTuraRc_Method */
 static actor_method_class l_daZrTuraRc_Method = {
     (process_method_func)daZrTuraRc_Create,
     (process_method_func)daZrTuraRc_Delete,
@@ -204,7 +177,6 @@ static actor_method_class l_daZrTuraRc_Method = {
     (process_method_func)daZrTuraRc_Draw,
 };
 
-/* 80D424F0-80D42520 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_zrTuraraRc */
 extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp
index cabf22379b..02f593e25f 100644
--- a/src/d/actor/d_a_obj_zraMark.cpp
+++ b/src/d/actor/d_a_obj_zraMark.cpp
@@ -12,12 +12,10 @@
 #include "d/actor/d_a_npc_hoz.h"
 #include "d/actor/d_a_npc_zra.h"
 
-/* 80D42658-80D42678 000078 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return ((daObjZraMark_c*)i_this)->CreateHeap();
 }
 
-/* 80D43D88-80D43D9C 000000 0014+00 4/4 0/0 0/0 .rodata          l_DATA */
 static const daObjZraMark_Hio_Param_c l_DATA = {
     8.0f,    // mMarkSize
     2.0f,    // mInteriorMarkSize
@@ -26,7 +24,6 @@ static const daObjZraMark_Hio_Param_c l_DATA = {
     820.0f,  // mMarkCollisionHeight
 };
 
-/* 80D43D9C-80D43DE0 000014 0044+00 1/1 0/0 0/0 .rodata          l_sph_src */
 static const dCcD_SrcCyl l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x11}, 0x79}},  // mObj
@@ -41,13 +38,10 @@ static const dCcD_SrcCyl l_sph_src = {
     }  // mCylAttr
 };
 
-/* 80D43DE0-80D43DF0 000058 0010+00 0/1 0/0 0/0 .rodata          l_arcIdx */
 static const int l_arcIdx[] = {3, 6, 5, 4};
 
-/* 80D43FA4-80D43FA8 -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName[1] = {"buoy"};
 
-/* 80D42678-80D4287C 000098 0204+00 1/1 0/0 0/0 .text            Create__14daObjZraMark_cFv */
 int daObjZraMark_c::Create() {
     fopAcM_ct(this, daObjZraMark_c);
 
@@ -81,7 +75,6 @@ int daObjZraMark_c::Create() {
     return phase_state;
 }
 
-/* 80D4287C-80D42A7C 00029C 0200+00 1/1 0/0 0/0 .text            CreateHeap__14daObjZraMark_cFv */
 int daObjZraMark_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], l_arcIdx[mType]);
     JUT_ASSERT(0x176, modelData != NULL);
@@ -131,7 +124,6 @@ int daObjZraMark_c::CreateHeap() {
     return TRUE;
 }
 
-/* 80D42A7C-80D42B0C 00049C 0090+00 1/1 0/0 0/0 .text            Execute__14daObjZraMark_cFv */
 int daObjZraMark_c::Execute() {
     if (is_blasted()) {
         if (is_branch_pat()) {
@@ -148,7 +140,6 @@ int daObjZraMark_c::Execute() {
     return 1;
 }
 
-/* 80D42B0C-80D42C98 00052C 018C+00 1/1 0/0 0/0 .text            Draw__14daObjZraMark_cFv */
 int daObjZraMark_c::Draw() {
     if (is_blasted()) {
         mHahenMngr.draw();
@@ -172,7 +163,6 @@ int daObjZraMark_c::Draw() {
     return 1;
 }
 
-/* 80D42C98-80D42CE0 0006B8 0048+00 1/1 0/0 0/0 .text            Delete__14daObjZraMark_cFv */
 int daObjZraMark_c::Delete() {
     for (int i = 0; i < 1; i++) {
         dComIfG_resDelete(&mPhase[i], l_arcName[i]);
@@ -182,7 +172,6 @@ int daObjZraMark_c::Delete() {
     return 1;
 }
 
-/* 80D42CE0-80D42D2C 000700 004C+00 1/1 0/0 0/0 .text            getType__14daObjZraMark_cFv */
 int daObjZraMark_c::getType() {
     u8 prm = fopAcM_GetParam(this) >> 8;
     switch (prm) {
@@ -197,7 +186,6 @@ int daObjZraMark_c::getType() {
     }
 }
 
-/* 80D42D2C-80D42EE0 00074C 01B4+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjZraMark_cFv */
 void daObjZraMark_c::setBaseMtx() {
     static const Vec l_coOffset[] = {
         {8.0f, -50.0f, 0.0f},
@@ -238,7 +226,6 @@ void daObjZraMark_c::setBaseMtx() {
     mCcCyl.SetR(l_DATA.mMarkCollisionRadius * size);
 }
 
-/* 80D42EE0-80D42F5C 000900 007C+00 1/1 0/0 0/0 .text            col_init__14daObjZraMark_cFv */
 void daObjZraMark_c::col_init() {
     mCcStts.Init(0xFF, 0xFF, this);
     mCcCyl.Set(l_sph_src);
@@ -249,7 +236,6 @@ void daObjZraMark_c::col_init() {
     }
 }
 
-/* 80D42F5C-80D432C8 00097C 036C+00 1/1 0/0 0/0 .text            col_set__14daObjZraMark_cFv */
 void daObjZraMark_c::col_set() {
     if (mpHoz == NULL) {
         mpHoz = schHoz();
@@ -310,7 +296,6 @@ void daObjZraMark_c::col_set() {
     dComIfG_Ccsp()->Set(&mCcCyl);
 }
 
-/* 80D432C8-80D43314 000CE8 004C+00 1/1 0/0 0/0 .text            schHoz__14daObjZraMark_cFv */
 daNpc_Hoz_c* daObjZraMark_c::schHoz() {
     fopAc_ac_c* hoz = NULL;
     if (fopAcM_SearchByName(PROC_NPC_HOZ, &hoz) && hoz != NULL) {
@@ -320,8 +305,6 @@ daNpc_Hoz_c* daObjZraMark_c::schHoz() {
     return NULL;
 }
 
-/* 80D43314-80D43370 000D34 005C+00 0/0 0/0 1/1 .text entryPointer__14daObjZraMark_cFP10fopAc_ac_c
- */
 bool daObjZraMark_c::entryPointer(fopAc_ac_c* i_actor) {
     if (field_0x72c < 2) {
         mActorMngr[field_0x72c].entry(i_actor);
@@ -332,7 +315,6 @@ bool daObjZraMark_c::entryPointer(fopAc_ac_c* i_actor) {
     return false;
 }
 
-/* 80D43370-80D433F4 000D90 0084+00 1/1 0/0 0/0 .text            informBlast__14daObjZraMark_cFv */
 void daObjZraMark_c::informBlast() {
     if (field_0x72c != 0) {
         for (int i = 0; i < field_0x72c; i++) {
@@ -344,34 +326,26 @@ void daObjZraMark_c::informBlast() {
     }
 }
 
-/* 80D433F4-80D43414 000E14 0020+00 1/0 0/0 0/0 .text daObjZraMark_Execute__FP14daObjZraMark_c */
 static int daObjZraMark_Execute(daObjZraMark_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D43414-80D43434 000E34 0020+00 1/0 0/0 0/0 .text daObjZraMark_Draw__FP14daObjZraMark_c */
 static int daObjZraMark_Draw(daObjZraMark_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D43434-80D4343C 000E54 0008+00 1/0 0/0 0/0 .text daObjZraMark_IsDelete__FP14daObjZraMark_c */
 static int daObjZraMark_IsDelete(daObjZraMark_c* i_this) {
     return 1;
 }
 
-/* 80D4343C-80D4345C 000E5C 0020+00 1/0 0/0 0/0 .text daObjZraMark_Delete__FP14daObjZraMark_c */
 static int daObjZraMark_Delete(daObjZraMark_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D4345C-80D4347C 000E7C 0020+00 1/0 0/0 0/0 .text            daObjZraMark_create__FP10fopAc_ac_c
- */
 static int daObjZraMark_create(fopAc_ac_c* i_this) {
     return ((daObjZraMark_c*)i_this)->Create();
 }
 
-/* 80D4347C-80D434F8 000E9C 007C+00 1/1 0/0 0/0 .text create__16_ZraMark_Hahen_cFRC4cXyzScScScSc
- */
 int _ZraMark_Hahen_c::create(const cXyz& i_pos, s8 i_roomNo, s8 i_color, s8 param_3, s8 i_no) {
     setColor(i_color);
 
@@ -384,7 +358,6 @@ int _ZraMark_Hahen_c::create(const cXyz& i_pos, s8 i_roomNo, s8 i_color, s8 para
     return 0;
 }
 
-/* 80D434F8-80D4357C 000F18 0084+00 1/1 0/0 0/0 .text            loadModel__16_ZraMark_Hahen_cFv */
 BOOL _ZraMark_Hahen_c::loadModel() {
     static const int sHahenBmdType[] = {7, 8};
     J3DModelData* modelData =
@@ -400,7 +373,6 @@ BOOL _ZraMark_Hahen_c::loadModel() {
     return 1;
 }
 
-/* 80D4357C-80D43808 000F9C 028C+00 1/1 0/0 0/0 .text init__16_ZraMark_Hahen_cFRC4cXyzScScSc */
 void _ZraMark_Hahen_c::init(cXyz const& i_pos, s8 i_roomNo, s8 param_2, s8 i_no) {
     static const f32 sScale[] = {
         3.0f, 2.0f, 6.0f, 4.0f, 2.0f, 6.0f, 3.0f, 1.0f, 0.5f, 0.69999999f, 0.5f, 1.2f, 1.0f, 0.8f,
@@ -495,7 +467,6 @@ void _ZraMark_Hahen_c::init(cXyz const& i_pos, s8 i_roomNo, s8 param_2, s8 i_no)
     dKy_tevstr_init(&mTevstr, i_roomNo, 0xFF);
 }
 
-/* 80D43808-80D43864 001228 005C+00 1/1 0/0 0/0 .text            calcSpeed__16_ZraMark_Hahen_cFv */
 void _ZraMark_Hahen_c::calcSpeed() {
     cXyz speed;
     speed.x = field_0x3c0 * cM_ssin(field_0x3bc);
@@ -505,7 +476,6 @@ void _ZraMark_Hahen_c::calcSpeed() {
     setSpeed(speed);
 }
 
-/* 80D43864-80D438C8 001284 0064+00 2/2 0/0 0/0 .text            setMtx__16_ZraMark_Hahen_cFv */
 void _ZraMark_Hahen_c::setMtx() {
     mDoMtx_stack_c::transS(mPos.x, mPos.y, mPos.z);
     mDoMtx_stack_c::XYZrotM(mAngle);
@@ -513,7 +483,6 @@ void _ZraMark_Hahen_c::setMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D438C8-80D43968 0012E8 00A0+00 1/1 0/0 0/0 .text            draw__16_ZraMark_Hahen_cFv */
 void _ZraMark_Hahen_c::draw() {
     g_env_light.settingTevStruct(16, &mPos, &mTevstr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr);
@@ -523,8 +492,6 @@ void _ZraMark_Hahen_c::draw() {
     dComIfGd_setList();
 }
 
-/* 80D43968-80D439F8 001388 0090+00 1/1 0/0 0/0 .text
- * create__20_ZraMark_Hahen_Mng_cFRC4cXyzScScScSc               */
 int _ZraMark_Hahen_Mng_c::create(const cXyz& i_pos, s8 i_roomNo, s8 i_color, s8 param_3,
                                  s8 unused) {
     _ZraMark_Hahen_c* hahen = mHahen;
@@ -539,7 +506,6 @@ int _ZraMark_Hahen_Mng_c::create(const cXyz& i_pos, s8 i_roomNo, s8 i_color, s8
     return 1;
 }
 
-/* 80D439F8-80D43A74 001418 007C+00 1/1 0/0 0/0 .text            calc__20_ZraMark_Hahen_Mng_cFv */
 void _ZraMark_Hahen_Mng_c::calc() {
     if (getTimer() > 0) {
         _ZraMark_Hahen_c* hahen = mHahen;
@@ -551,7 +517,6 @@ void _ZraMark_Hahen_Mng_c::calc() {
     }
 }
 
-/* 80D43A74-80D43ACC 001494 0058+00 1/1 0/0 0/0 .text            draw__20_ZraMark_Hahen_Mng_cFv */
 void _ZraMark_Hahen_Mng_c::draw() {
     if (getTimer() > 0) {
         _ZraMark_Hahen_c* hahen = mHahen;
@@ -562,7 +527,6 @@ void _ZraMark_Hahen_Mng_c::draw() {
     }
 }
 
-/* 80D43FA8-80D43FC8 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjZraMark_Method */
 static actor_method_class l_daObjZraMark_Method = {
     (process_method_func)daObjZraMark_create,
     (process_method_func)daObjZraMark_Delete,
@@ -571,7 +535,6 @@ static actor_method_class l_daObjZraMark_Method = {
     (process_method_func)daObjZraMark_Draw,
 };
 
-/* 80D43FC8-80D43FF8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ZRA_MARK */
 extern actor_process_profile_definition g_profile_ZRA_MARK = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp
index 250bcf5d6e..faf0234e79 100644
--- a/src/d/actor/d_a_obj_zra_freeze.cpp
+++ b/src/d/actor/d_a_obj_zra_freeze.cpp
@@ -12,13 +12,10 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80D44BC4-80D44BC8 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "zrF";
 
-/* 80D44B48-80D44B50 000000 0008+00 3/3 0/0 0/0 .rodata          l_DATA */
 static f32 const l_DATA[2] = { 800.0f, 0.0f };
 
-/* 80D440B8-80D44124 000078 006C+00 2/2 0/0 0/0 .text            setBaseMtx__13daZraFreeze_cFv */
 void daZraFreeze_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::XYZrotM(shape_angle);
@@ -26,8 +23,6 @@ void daZraFreeze_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mMtx);
 }
 
-/* 80D44124-80D4429C 0000E4 0178+00 1/1 0/0 0/0 .text            chkActorInScreen__13daZraFreeze_cFv
- */
 BOOL daZraFreeze_c::chkActorInScreen() {
     cXyz proj;
     cXyz vec[8];
@@ -52,12 +47,10 @@ BOOL daZraFreeze_c::chkActorInScreen() {
     return true;
 }
 
-/* 80D4429C-80D442BC 00025C 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daZraFreeze_c*>(i_this)->CreateHeap();
 }
 
-/* 80D442BC-80D4443C 00027C 0180+00 1/1 0/0 0/0 .text            Create__13daZraFreeze_cFv */
 cPhs__Step daZraFreeze_c::Create() {
     fopAcM_ct(this, daZraFreeze_c);
     field_0x5b0 = (fopAcM_GetParam(this) >> 8) & 0xff;
@@ -86,7 +79,6 @@ cPhs__Step daZraFreeze_c::Create() {
     return step;
 }
 
-/* 80D4443C-80D444C0 0003FC 0084+00 1/1 0/0 0/0 .text            CreateHeap__13daZraFreeze_cFv */
 int daZraFreeze_c::CreateHeap() {
     static char* l_bmdName[3] = {
         "zrA_a_TW.bmd",
@@ -101,8 +93,6 @@ int daZraFreeze_c::CreateHeap() {
     return 1;
 }
 
-/* 80D444C0-80D44698 000480 01D8+00 1/1 0/0 0/0 .text            setHitodamaPrtcl__13daZraFreeze_cFv
- */
 void daZraFreeze_c::setHitodamaPrtcl() {
     cXyz pos = current.pos;
     field_0x5dc = (u16)(field_0x5de << 1);
@@ -126,7 +116,6 @@ void daZraFreeze_c::setHitodamaPrtcl() {
     }
 }
 
-/* 80D44698-80D449E0 000658 0348+00 1/1 0/0 0/0 .text            Execute__13daZraFreeze_cFv */
 int daZraFreeze_c::Execute() {
     if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) {
         setBaseMtx();
@@ -166,7 +155,6 @@ int daZraFreeze_c::Execute() {
     return 1;
 }
 
-/* 80D449E0-80D44A84 0009A0 00A4+00 1/1 0/0 0/0 .text            Draw__13daZraFreeze_cFv */
 int daZraFreeze_c::Draw() {
     if (field_0x5b0 == 0xff || dComIfGs_isSwitch(field_0x5b0, fopAcM_GetRoomNo(this))) {
         if (mTwilight != 0 && dComIfGs_wolfeye_effect_check() == true) {
@@ -178,41 +166,31 @@ int daZraFreeze_c::Draw() {
     return 1;
 }
 
-/* 80D44A84-80D44AB8 000A44 0034+00 1/1 0/0 0/0 .text            Delete__13daZraFreeze_cFv */
 int daZraFreeze_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     return 1;
 }
 
-/* 80D44AB8-80D44AD8 000A78 0020+00 1/0 0/0 0/0 .text            daZraFreeze_Draw__FP13daZraFreeze_c
- */
 static int daZraFreeze_Draw(daZraFreeze_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D44AD8-80D44AF8 000A98 0020+00 1/0 0/0 0/0 .text daZraFreeze_Execute__FP13daZraFreeze_c */
 static int daZraFreeze_Execute(daZraFreeze_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D44AF8-80D44B00 000AB8 0008+00 1/0 0/0 0/0 .text daZraFreeze_IsDelete__FP13daZraFreeze_c */
 static int daZraFreeze_IsDelete(daZraFreeze_c* i_this) {
     return 1;
 }
 
-/* 80D44B00-80D44B20 000AC0 0020+00 1/0 0/0 0/0 .text daZraFreeze_Delete__FP13daZraFreeze_c */
 static int daZraFreeze_Delete(daZraFreeze_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D44B20-80D44B40 000AE0 0020+00 1/0 0/0 0/0 .text            daZraFreeze_create__FP10fopAc_ac_c
- */
 static cPhs__Step daZraFreeze_create(fopAc_ac_c* i_this) {
     return static_cast<daZraFreeze_c*>(i_this)->Create();
 }
 
-/* ############################################################################################## */
-/* 80D44BD4-80D44BF4 -00001 0020+00 1/0 0/0 0/0 .data            l_daZraFreeze_Method */
 static actor_method_class l_daZraFreeze_Method = {
     (process_method_func)daZraFreeze_create,
     (process_method_func)daZraFreeze_Delete,
@@ -221,7 +199,6 @@ static actor_method_class l_daZraFreeze_Method = {
     (process_method_func)daZraFreeze_Draw,
 };
 
-/* 80D44BF4-80D44C24 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_OBJ_ZRAFREEZE */
 extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp
index c0f3d277e8..0f8ed50ac9 100644
--- a/src/d/actor/d_a_obj_zra_rock.cpp
+++ b/src/d/actor/d_a_obj_zra_rock.cpp
@@ -10,10 +10,8 @@
 #include "d/d_bg_w.h"
 #include "d/d_procname.h"
 
-/* 80D455F0-80D455F4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char const* l_arcName = "H_ZraRock";
 
-/* 80D44CB8-80D44D3C 000078 0084+00 1/1 0/0 0/0 .text            setAttnPos__14daObjZraRock_cFv */
 void daObjZraRock_c::setAttnPos() {
     cXyz vec(10.0f, 152.3f, 0.0f);
     mDoMtx_stack_c::ZXYrotS(current.angle.x, current.angle.y, current.angle.z);
@@ -21,7 +19,6 @@ void daObjZraRock_c::setAttnPos() {
     attention_info.position += current.pos;
 }
 
-/* 80D44D3C-80D44DCC 0000FC 0090+00 2/2 0/0 0/0 .text            setBaseMtx__14daObjZraRock_cFv */
 void daObjZraRock_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
@@ -30,19 +27,15 @@ void daObjZraRock_c::setBaseMtx() {
     PSMTXCopy(mDoMtx_stack_c::get(), mBgMtx);
 }
 
-/* 80D44DCC-80D44E28 00018C 005C+00 1/1 0/0 0/0 .text            setEnvTevColor__14daObjZraRock_cFv
- */
 void daObjZraRock_c::setEnvTevColor() {
     tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
     tevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
 }
 
-/* 80D44E28-80D44E68 0001E8 0040+00 1/1 0/0 0/0 .text            setRoomNo__14daObjZraRock_cFv */
 void daObjZraRock_c::setRoomNo() {
     fopAcM_SetRoomNo(this, dComIfG_Bgsp().GetRoomId(mGndChk));
 }
 
-/* 80D44E68-80D44FB0 000228 0148+00 1/0 0/0 0/0 .text            Create__14daObjZraRock_cFv */
 int daObjZraRock_c::Create() {
     setBaseMtx();
     fopAcM_SetMtx(this, mpModelOpa->getBaseTRMtx());
@@ -59,7 +52,6 @@ int daObjZraRock_c::Create() {
     return 1;
 }
 
-/* 80D44FB0-80D450E0 000370 0130+00 1/0 0/0 0/0 .text            CreateHeap__14daObjZraRock_cFv */
 int daObjZraRock_c::CreateHeap() {
     J3DModelData* model_data_opa = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6);
     mpModelOpa = mDoExt_J3DModel__create(model_data_opa, 0x80000, 0x11000084);
@@ -79,7 +71,6 @@ int daObjZraRock_c::CreateHeap() {
     return 1;
 }
 
-/* 80D450E0-80D45264 0004A0 0184+00 1/1 0/0 0/0 .text            create__14daObjZraRock_cFv */
 cPhs__Step daObjZraRock_c::create() {
     fopAcM_ct(this, daObjZraRock_c);
     cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&mPhaseReq, l_arcName);
@@ -95,8 +86,6 @@ cPhs__Step daObjZraRock_c::create() {
     return step;
 }
 
-/* 80D4531C-80D45374 0006DC 0058+00 1/0 0/0 0/0 .text            Execute__14daObjZraRock_cFPPA3_A4_f
- */
 int daObjZraRock_c::Execute(Mtx** i_mtx) {
     mBrkAnm.play();
     *i_mtx = &mBgMtx;
@@ -105,7 +94,6 @@ int daObjZraRock_c::Execute(Mtx** i_mtx) {
     return 1;
 }
 
-/* 80D45374-80D454AC 000734 0138+00 1/0 0/0 0/0 .text            Draw__14daObjZraRock_cFv */
 int daObjZraRock_c::Draw() {
     g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
     if (mDemoStart) {
@@ -124,7 +112,6 @@ int daObjZraRock_c::Draw() {
     return 1;
 }
 
-/* 80D454AC-80D45518 00086C 006C+00 1/0 0/0 0/0 .text            Delete__14daObjZraRock_cFv */
 int daObjZraRock_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -133,33 +120,26 @@ int daObjZraRock_c::Delete() {
     return 1;
 }
 
-/* 80D45518-80D45544 0008D8 002C+00 1/0 0/0 0/0 .text daObjZraRock_Draw__FP14daObjZraRock_c */
 static int daObjZraRock_Draw(daObjZraRock_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80D45544-80D45564 000904 0020+00 1/0 0/0 0/0 .text daObjZraRock_Execute__FP14daObjZraRock_c */
 static int daObjZraRock_Execute(daObjZraRock_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80D45564-80D4556C 000924 0008+00 1/0 0/0 0/0 .text daObjZraRock_IsDelete__FP14daObjZraRock_c */
 static int daObjZraRock_IsDelete(daObjZraRock_c* param_0) {
     return 1;
 }
 
-/* 80D4556C-80D4558C 00092C 0020+00 1/0 0/0 0/0 .text daObjZraRock_Delete__FP14daObjZraRock_c */
 static int daObjZraRock_Delete(daObjZraRock_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80D4558C-80D455AC 00094C 0020+00 1/0 0/0 0/0 .text            daObjZraRock_create__FP10fopAc_ac_c
- */
 static cPhs__Step daObjZraRock_create(fopAc_ac_c* i_this) {
     return static_cast<daObjZraRock_c*>(i_this)->create();
 }
 
-/* 80D455F4-80D45614 -00001 0020+00 1/0 0/0 0/0 .data            l_daObjZraRock_Method */
 static actor_method_class l_daObjZraRock_Method = {
     (process_method_func)daObjZraRock_create,
     (process_method_func)daObjZraRock_Delete,
@@ -169,7 +149,6 @@ static actor_method_class l_daObjZraRock_Method = {
 
 };
 
-/* 80D45614-80D45644 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Obj_ZraRock */
 extern actor_process_profile_definition g_profile_Obj_ZraRock = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp
index e1b222e293..2218b10a10 100644
--- a/src/d/actor/d_a_passer_mng.cpp
+++ b/src/d/actor/d_a_passer_mng.cpp
@@ -10,12 +10,10 @@
 #include "d/d_path.h"
 #include "d/d_stage.h"
 
-/* 80D45718-80D45738 000078 0020+00 1/0 0/0 0/0 .text daPasserMng_Execute__FP13daPasserMng_c */
 static int daPasserMng_Execute(daPasserMng_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D45738-80D4597C 000098 0244+00 1/1 0/0 0/0 .text            execute__13daPasserMng_cFv */
 int daPasserMng_c::execute() {
     int time = getTime();
     if ((field_0x596 != 0 || (time >= startTime && time < endTime)) &&
@@ -40,33 +38,28 @@ int daPasserMng_c::execute() {
     return 1;
 }
 
-/* 80D46C20-80D46C40 000000 0020+00 1/0 0/0 0/0 .rodata          groupA */
 static u8 const groupA[32] = {
     0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x50, 0x00, 0x00, 0x06, 0x01, 0x00, 0x00, 0x07,
     0x01, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00, 0x1B, 0x01, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x1D,
 };
 
-/* 80D46C40-80D46C64 000020 0024+00 1/0 0/0 0/0 .rodata          groupB */
 static u8 const groupB[36] = {
     0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x11,
     0x11, 0x00, 0x00, 0x12, 0x10, 0x00, 0x00, 0x13, 0x40, 0x00, 0x00, 0x09,
     0x40, 0x00, 0x00, 0x08, 0x50, 0x00, 0x00, 0x0A, 0x01, 0x00, 0x00, 0x0B,
 };
 
-/* 80D46C64-80D46C88 000044 0024+00 1/0 0/0 0/0 .rodata          groupC */
 static u8 const groupC[36] = {
     0x08, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x01,
     0x50, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x03, 0x21, 0x00, 0x00, 0x17,
     0x10, 0x00, 0x00, 0x18, 0x01, 0x00, 0x00, 0x19, 0x10, 0x00, 0x00, 0x1A,
 };
 
-/* 80D46C88-80D46CA8 000068 0020+00 1/0 0/0 0/0 .rodata          groupD */
 static u8 const groupD[32] = {
     0x07, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x14, 0x21, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x16,
     0x11, 0x00, 0x00, 0x0C, 0x50, 0x00, 0x00, 0x0E, 0x40, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x0D,
 };
 
-/* 80D46CB0-80D46CC0 -00001 0010+00 1/1 0/0 0/0 .data            mGroupTbl__13daPasserMng_c */
 daPasserMng_c::Group* daPasserMng_c::mGroupTbl[4] = {
     (Group*)groupA,
     (Group*)groupB,
@@ -74,8 +67,6 @@ daPasserMng_c::Group* daPasserMng_c::mGroupTbl[4] = {
     (Group*)groupD,
 };
 
-/* 80D4597C-80D45E14 0002DC 0498+00 3/2 0/0 0/0 .text            getPasserParam__13daPasserMng_cFv
- */
 int daPasserMng_c::getPasserParam() {
     u32 param = (getPathID() & 0xff) << 16;
     u8 groupNo = getGroupNo();
@@ -120,7 +111,6 @@ int daPasserMng_c::getPasserParam() {
     return param;
 }
 
-/* 80D45E14-80D466FC 000774 08E8+00 2/1 0/0 0/0 .text getLuggageParamHigh__13daPasserMng_cFUl */
 int daPasserMng_c::getLuggageParamHigh(u32 param_1) {
     int paramLow;
 
@@ -506,33 +496,27 @@ int daPasserMng_c::getLuggageParamHigh(u32 param_1) {
     return paramLow << 8;
 }
 
-/* 80D466FC-80D46704 00105C 0008+00 1/0 0/0 0/0 .text daPasserMng_IsDelete__FP13daPasserMng_c */
 static int daPasserMng_IsDelete(daPasserMng_c* i_this) {
     return 1;
 }
 
-/* 80D46704-80D46748 001064 0044+00 1/0 0/0 0/0 .text daPasserMng_Delete__FP13daPasserMng_c */
 static int daPasserMng_Delete(daPasserMng_c* i_this) {
     fopAcM_GetID(i_this);
     i_this->~daPasserMng_c();
     return 1;
 }
 
-/* 80D46748-80D46768 0010A8 0020+00 1/0 0/0 0/0 .text            daPasserMng_Create__FP10fopAc_ac_c
- */
 static int daPasserMng_Create(fopAc_ac_c* i_this) {
     fopAcM_GetID(i_this);
     return static_cast<daPasserMng_c*>(i_this)->create();
 }
 
-/* 80D46768-80D467C0 0010C8 0058+00 1/1 0/0 0/0 .text            create__13daPasserMng_cFv */
 int daPasserMng_c::create() {
     fopAcM_ct(this, daPasserMng_c);
     create_init();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D467C0-80D46B9C 001120 03DC+00 1/1 0/0 0/0 .text            create_init__13daPasserMng_cFv */
 void daPasserMng_c::create_init() {
     npcId = getDetailLevel() == 0 ? PROC_NPC_PASSER : PROC_NPC_PASSER2;
     mPath = dPath_GetRoomPath(getPathID(), fopAcM_GetHomeRoomNo(this));
@@ -610,8 +594,6 @@ void daPasserMng_c::create_init() {
     }
 }
 
-/* ############################################################################################## */
-/* 80D46DB0-80D46DD0 -00001 0020+00 1/0 0/0 0/0 .data            l_daPasserMng_Method */
 static actor_method_class l_daPasserMng_Method = {
     (process_method_func)daPasserMng_Create,
     (process_method_func)daPasserMng_Delete,
@@ -619,7 +601,6 @@ static actor_method_class l_daPasserMng_Method = {
     (process_method_func)daPasserMng_IsDelete,
 };
 
-/* 80D46DD0-80D46E00 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PASSER_MNG */
 extern actor_process_profile_definition g_profile_PASSER_MNG = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp
index d05e3f357d..0f17d4d256 100644
--- a/src/d/actor/d_a_path_line.cpp
+++ b/src/d/actor/d_a_path_line.cpp
@@ -7,10 +7,7 @@
 
 #include "d/actor/d_a_path_line.h"
 #include "f_op/f_op_actor_mng.h"
-#include "dol2asm.h"
 
-/* ############################################################################################## */
-/* 80485780-804857B4 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_PATH_LINE */
 extern actor_process_profile_definition2 g_profile_PATH_LINE = {
   fpcLy_CURRENT_e,       // mLayerID
   9,                     // mListID
diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp
index 64dfcb6534..27f8199b16 100644
--- a/src/d/actor/d_a_peru.cpp
+++ b/src/d/actor/d_a_peru.cpp
@@ -9,37 +9,31 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include "d/actor/d_a_obj_catdoor.h"
 
-/* 80D4C1FC-80D4C204 000020 0008+00 1/1 0/0 0/0 .data            l_bmdData */
 static int l_bmdData[1][2] = {
     24, 1,
 };
 
-/* 80D4C204-80D4C21C -00001 0018+00 0/1 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[3] = {
     {"", 0},
     {"PERU_APPEAR", 1},
     {"PERU_APPEAR_SKIP", 1},
 };
 
-/* 80D4C21C-80D4C224 -00001 0008+00 2/3 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[2] = {
     "",
     "Peru",
 };
 
-/* 80D4C224-80D4C228 000048 0002+02 1/0 0/0 0/0 .data            l_loadResPtrn0 */
 static s8 l_loadResPtrn0[2] = {
     1, -1,
 };
 
-/* 80D4C228-80D4C234 -00001 000C+00 1/2 0/0 0/0 .data            l_loadResPtrnList */
 static s8* l_loadResPtrnList[3] = {
     l_loadResPtrn0,
     l_loadResPtrn0,
     l_loadResPtrn0,
 };
 
-/* 80D4C234-80D4C2C0 000058 008C+00 0/1 0/0 0/0 .data            l_faceMotionAnmData */
 static u8 l_faceMotionAnmData[140] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E,
     0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0A,
@@ -52,7 +46,6 @@ static u8 l_faceMotionAnmData[140] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80D4C2C0-80D4C3F4 0000E4 0134+00 0/1 0/0 0/0 .data            l_motionAnmData */
 static u8 l_motionAnmData[308] = {
     0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1B,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11,
@@ -76,7 +69,6 @@ static u8 l_motionAnmData[308] = {
     0x00, 0x01, 0x00, 0x00,
 };
 
-/* 80D4C3F4-80D4C444 000218 0050+00 0/1 0/0 0/0 .data            l_faceMotionSequenceData */
 static u8 l_faceMotionSequenceData[80] = {
     0x00, 0x01, 0xFF, 0x01, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
     0x00, 0x02, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
@@ -85,7 +77,6 @@ static u8 l_faceMotionSequenceData[80] = {
     0x00, 0x04, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
 };
 
-/* 80D4C444-80D4C4E4 000268 00A0+00 0/1 0/0 0/0 .data            l_motionSequenceData */
 static u8 l_motionSequenceData[160] = {
     0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
     0x00, 0x01, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
@@ -99,21 +90,18 @@ static u8 l_motionSequenceData[160] = {
     0x00, 0x04, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
 };
 
-/* 80D4C4E4-80D4C4F0 -00001 000C+00 1/1 0/0 0/0 .data            mCutNameList__8daPeru_c */
 const char* daPeru_c::mCutNameList[3] = {
     "",
     "PERU_APPEAR",
     "PERU_APPEAR_SKIP",
 };
 
-/* 80D4C508-80D4C52C 00032C 0024+00 1/2 0/0 0/0 .data            mCutList__8daPeru_c */
 daPeru_c::cutAppearFunc daPeru_c::mCutList[3] = {
     NULL,
     &daPeru_c::cutAppear,
     &daPeru_c::cutAppear_skip,
 };
 
-/* 80D46EEC-80D46FCC 0000EC 00E0+00 1/0 0/0 0/0 .text            __dt__8daPeru_cFv */
 daPeru_c::~daPeru_c() {
     OS_REPORT("|%06d:%x|daPeru_c -> デストラクト\n", g_Counter.mCounter0, this);
     if (heap != NULL) {
@@ -122,8 +110,6 @@ daPeru_c::~daPeru_c() {
     deleteRes(l_loadResPtrnList[mType], (const char**) l_resNameList);
 }
 
-/* ############################################################################################## */
-/* 80D4C060-80D4C0F8 000000 0098+00 19/19 0/0 0/0 .rodata          m__14daPeru_Param_c */
 PeruParams const daPeru_Param_c::m = {
     60.0f,
     -3.0f,
@@ -168,7 +154,6 @@ PeruParams const daPeru_Param_c::m = {
     0.0f,
 };
 
-/* 80D46FCC-80D4720C 0001CC 0240+00 1/1 0/0 0/0 .text            create__8daPeru_cFv */
 int daPeru_c::create() {
     daNpcT_ct(this, daPeru_c, (daNpcT_faceMotionAnmData_c*)l_faceMotionAnmData, (daNpcT_motionAnmData_c*)l_motionAnmData, (daNpcT_MotionSeqMngr_c::sequenceStepData_c*)l_faceMotionSequenceData, 4, (daNpcT_MotionSeqMngr_c::sequenceStepData_c*)l_motionSequenceData, 4, l_evtList, l_resNameList);
     OS_REPORT("------------ ルイーズ生成処理開始\n");
@@ -215,7 +200,6 @@ int daPeru_c::create() {
     return rv;
 }
 
-/* 80D4720C-80D474A0 00040C 0294+00 1/1 0/0 0/0 .text            CreateHeap__8daPeru_cFv */
 int daPeru_c::CreateHeap() {
     // Not sure how to force 0 assignment otherwise. 
     enum IdxVal {dummy_zero};
@@ -257,7 +241,6 @@ int daPeru_c::CreateHeap() {
     return 0;
 }
 
-/* 80D4765C-80D47750 00085C 00F4+00 1/1 0/0 0/0 .text            typeInitialize__8daPeru_cFv */
 int daPeru_c::typeInitialize() {
     if (mType == 0) {
         if (daNpcT_chkEvtBit(0x127)) {
@@ -278,7 +261,6 @@ int daPeru_c::typeInitialize() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D47750-80D47784 000950 0034+00 1/1 0/0 0/0 .text            Delete__8daPeru_cFv */
 int daPeru_c::Delete() {
     OS_REPORT("|%06d:%x|daPeru_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -286,12 +268,10 @@ int daPeru_c::Delete() {
     return 1;
 }
 
-/* 80D47784-80D477A4 000984 0020+00 2/2 0/0 0/0 .text            Execute__8daPeru_cFv */
 int daPeru_c::Execute() {
     return execute();
 }
 
-/* 80D477A4-80D47840 0009A4 009C+00 1/1 0/0 0/0 .text            Draw__8daPeru_cFv */
 int daPeru_c::Draw() {
     daNpcT_MatAnm_c* matAnm = mpMatAnm[0];
     if (matAnm != NULL) {
@@ -302,13 +282,10 @@ int daPeru_c::Draw() {
     draw(0, 0, daPeru_Param_c::m.field_0x00[3], NULL, 100.0f, 0, field_0xe80, 0);
 }
 
-/* 80D47840-80D47860 000A40 0020+00 1/1 0/0 0/0 .text createHeapCallBack__8daPeru_cFP10fopAc_ac_c
- */
 int daPeru_c::createHeapCallBack(fopAc_ac_c* i_this) {
     return static_cast<daPeru_c*>(i_this)->CreateHeap();
 }
 
-/* 80D47860-80D478B8 000A60 0058+00 1/1 0/0 0/0 .text ctrlJointCallBack__8daPeru_cFP8J3DJointi */
 int daPeru_c::ctrlJointCallBack(J3DJoint* joint, int param_2) {
     if (param_2 == 0) {
         J3DModel* model = j3dSys.getModel();
@@ -320,7 +297,6 @@ int daPeru_c::ctrlJointCallBack(J3DJoint* joint, int param_2) {
     return 1;
 }
 
-/* 80D478B8-80D478EC 000AB8 0034+00 1/1 0/0 0/0 .text            isDelete__8daPeru_cFv */
 int daPeru_c::isDelete() {
     if (mType == 0) {
         return 0;
@@ -333,7 +309,6 @@ int daPeru_c::isDelete() {
     }
 }
 
-/* 80D478EC-80D47B20 000AEC 0234+00 1/1 0/0 0/0 .text            reset__8daPeru_cFv */
 void daPeru_c::reset() {
     initialize();
     attention_info.distances[fopAc_attn_LOCK_e] = daNpcT_getDistTableIdx(daPeru_Param_c::m.field_0x48[2], daPeru_Param_c::m.field_0x48[3]);
@@ -362,7 +337,6 @@ void daPeru_c::reset() {
     setAction(&daPeru_c::wait, 0);
 }
 
-/* 80D47B20-80D47C4C 000D20 012C+00 1/0 0/0 0/0 .text            setParam__8daPeru_cFv */
 void daPeru_c::setParam() {
     srchActors();
     attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e;
@@ -387,13 +361,11 @@ void daPeru_c::setParam() {
     mMorfFrames = daPeru_Param_c::m.field_0x00[17];
 }
 
-/* 80D47C4C-80D47CAC 000E4C 0060+00 1/0 0/0 0/0 .text            setAfterTalkMotion__8daPeru_cFv */
 void daPeru_c::setAfterTalkMotion() {
     mFaceMotionSeqMngr.getNo();
     mFaceMotionSeqMngr.setNo(2, -1.0f, 0, 0);
 }
 
-/* 80D47CAC-80D47D5C 000EAC 00B0+00 1/1 0/0 0/0 .text            srchActors__8daPeru_cFv */
 void daPeru_c::srchActors() {
     if (mActors[0].getActorP() == NULL) {
         mActors[0].entry(getEvtAreaTagP(16, 0));
@@ -411,7 +383,6 @@ void daPeru_c::srchActors() {
     }
 }
 
-/* 80D47D5C-80D47E48 000F5C 00EC+00 1/0 0/0 0/0 .text            evtTalk__8daPeru_cFv */
 int daPeru_c::evtTalk() {
     if (chkAction(&daPeru_c::talk)) {
         (this->*(mActionFunc))(0);
@@ -421,7 +392,6 @@ int daPeru_c::evtTalk() {
     return 1;
 }
 
-/* 80D47E48-80D47F10 001048 00C8+00 1/0 0/0 0/0 .text            evtCutProc__8daPeru_cFv */
 int daPeru_c::evtCutProc() {
     int rv = 0;
     int staffId = dComIfGp_getEventManager().getMyStaffId("Peru", this, -1);
@@ -436,14 +406,12 @@ int daPeru_c::evtCutProc() {
     return rv;
 }
 
-/* 80D47F10-80D47F5C 001110 004C+00 1/0 0/0 0/0 .text            action__8daPeru_cFv */
 void daPeru_c::action() {
     if (mActionFunc != NULL) {
         (this->*(mActionFunc))(0);
     }
 }
 
-/* 80D47F5C-80D481A4 00115C 0248+00 1/0 0/0 0/0 .text            setAttnPos__8daPeru_cFv */
 void daPeru_c::setAttnPos() {
     cXyz acStack_3c(10.0f, 0.0f, 0.0f);
     mStagger.calc(0);
@@ -467,7 +435,6 @@ void daPeru_c::setAttnPos() {
     mDoMtx_stack_c::multVec(&cStack_48, &attention_info.position);
 }
 
-/* 80D481A4-80D4835C 0013A4 01B8+00 1/0 0/0 0/0 .text            setCollision__8daPeru_cFv */
 void daPeru_c::setCollision() {
     f32 local_48[2] = { 20.0f, -10.0f};
     if (!mHide) {
@@ -504,13 +471,10 @@ void daPeru_c::setCollision() {
     }
 }
 
-/* 80D4835C-80D48364 00155C 0008+00 1/0 0/0 0/0 .text            drawDbgInfo__8daPeru_cFv */
 BOOL daPeru_c::drawDbgInfo() {
     return FALSE;
 }
 
-/* 80D48364-80D48414 001564 00B0+00 13/13 0/0 0/0 .text setAction__8daPeru_cFM8daPeru_cFPCvPvi_ii
- */
 int daPeru_c::setAction(actionFunc a_func, int param_2) {
     mMode = MODE_INVALID;
     if (mActionFunc != NULL) {
@@ -524,7 +488,6 @@ int daPeru_c::setAction(actionFunc a_func, int param_2) {
     return 1;
 }
 
-/* 80D48414-80D486A0 001614 028C+00 10/0 0/0 0/0 .text            wait__8daPeru_cFi */
 int daPeru_c::wait(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -575,7 +538,6 @@ int daPeru_c::wait(int param_0) {
     return 1;
 }
 
-/* 80D486A0-80D48720 0018A0 0080+00 1/1 0/0 0/0 .text            is_AppearDemo_start__8daPeru_cFv */
 BOOL daPeru_c::is_AppearDemo_start() {
     if (mActors[0].getActorP() != NULL) {
         daTag_EvtArea_c* evtArea = (daTag_EvtArea_c*)mActors[0].getActorP();
@@ -586,8 +548,6 @@ BOOL daPeru_c::is_AppearDemo_start() {
     return FALSE;
 }
 
-/* 80D48720-80D48750 001920 0030+00 1/1 0/0 0/0 .text            _AppearDemoTag_delete__8daPeru_cFv
- */
 void daPeru_c::_AppearDemoTag_delete() {
     fopAc_ac_c* actor = mActors[0].getActorP();
     if (actor != NULL) {
@@ -595,7 +555,6 @@ void daPeru_c::_AppearDemoTag_delete() {
     }
 }
 
-/* 80D48750-80D48A7C 001950 032C+00 2/0 0/0 0/0 .text            talk__8daPeru_cFi */
 int daPeru_c::talk(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -651,7 +610,6 @@ int daPeru_c::talk(int param_0) {
     return 0;
 }
 
-/* 80D48A7C-80D48C58 001C7C 01DC+00 1/0 0/0 0/0 .text            jump_st__8daPeru_cFi */
 int daPeru_c::jump_st(int param_1) {
     switch(mMode) {
     case MODE_ENTER:
@@ -694,7 +652,6 @@ int daPeru_c::jump_st(int param_1) {
     return 0;
 }
 
-/* 80D48C58-80D48E34 001E58 01DC+00 1/0 0/0 0/0 .text            jump_ed__8daPeru_cFi */
 int daPeru_c::jump_ed(int param_1) {
     switch (mMode) {
     case MODE_ENTER:
@@ -734,7 +691,6 @@ int daPeru_c::jump_ed(int param_1) {
     return 0;
 }
 
-/* 80D48E34-80D48FA8 002034 0174+00 1/0 0/0 0/0 .text            sniff__8daPeru_cFi */
 int daPeru_c::sniff(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -761,7 +717,6 @@ int daPeru_c::sniff(int param_0) {
     return 0;
 }
 
-/* 80D48FA8-80D4910C 0021A8 0164+00 1/0 0/0 0/0 .text            demo_appear__8daPeru_cFi */
 int daPeru_c::demo_appear(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -792,7 +747,6 @@ int daPeru_c::demo_appear(int param_0) {
     return 0;
 }
 
-/* 80D4910C-80D492A8 00230C 019C+00 1/0 0/0 0/0 .text            demo_walk_to_link__8daPeru_cFi */
 int daPeru_c::demo_walk_to_link(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -832,7 +786,6 @@ int daPeru_c::demo_walk_to_link(int param_0) {
     return 0;
 }
 
-/* 80D492A8-80D49418 0024A8 0170+00 1/0 0/0 0/0 .text            demo_walk_circle__8daPeru_cFi */
 int daPeru_c::demo_walk_circle(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -863,7 +816,6 @@ int daPeru_c::demo_walk_circle(int param_0) {
     return 0;
 }
 
-/* 80D49418-80D4971C 002618 0304+00 1/0 0/0 0/0 .text            demo_walk_to_window__8daPeru_cFi */
 int daPeru_c::demo_walk_to_window(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -906,8 +858,6 @@ int daPeru_c::demo_walk_to_window(int param_0) {
     return 0;
 }
 
-/* 80D4971C-80D499AC 00291C 0290+00 1/0 0/0 0/0 .text            demo_walk_to_pathway__8daPeru_cFi
- */
  int daPeru_c::demo_walk_to_pathway(int param_0) {
     switch(mMode) {
     case MODE_ENTER:
@@ -940,7 +890,6 @@ int daPeru_c::demo_walk_to_window(int param_0) {
      return 0;
 }
 
-/* 80D499AC-80D49A40 002BAC 0094+00 1/0 0/0 0/0 .text            cutAppear__8daPeru_cFi */
 int daPeru_c::cutAppear(int param_1) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* pCutId = dComIfGp_evmng_getMyIntegerP(param_1, "cut_id");
@@ -955,10 +904,8 @@ int daPeru_c::cutAppear(int param_1) {
     return _cutAppear_Main(*pCutId);
 }
 
-/* 80D4C83C-80D4C840 000054 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daPeru_Param_c l_HIO;
 
-/* 80D49A40-80D4A334 002C40 08F4+00 1/1 0/0 0/0 .text            _cutAppear_Init__8daPeru_cFRCi */
 int daPeru_c::_cutAppear_Init(int const& param_1) {
     switch(param_1) {
     case 10:
@@ -1064,7 +1011,6 @@ int daPeru_c::_cutAppear_Init(int const& param_1) {
     return 1;
 }
 
-/* 80D4A334-80D4A840 003534 050C+00 1/1 0/0 0/0 .text            _cutAppear_Main__8daPeru_cFRCi */
 int daPeru_c::_cutAppear_Main(int const& param_1) {
     int rv = FALSE;
     switch (param_1) {
@@ -1179,7 +1125,6 @@ int daPeru_c::_cutAppear_Main(int const& param_1) {
     return rv;
 }
 
-/* 80D4A840-80D4A920 003A40 00E0+00 1/1 0/0 0/0 .text            _catdoor_open__8daPeru_cFv */
 void daPeru_c::_catdoor_open() {
     daObjCatDoor_c* pCatDoor = (daObjCatDoor_c*)mActors[1].getActorP();
     if (pCatDoor == NULL) {
@@ -1190,8 +1135,6 @@ void daPeru_c::_catdoor_open() {
     }
 }
 
-/* 80D4A920-80D4A984 003B20 0064+00 1/1 0/0 0/0 .text            _catdoor_open_demoskip__8daPeru_cFv
- */
 void daPeru_c::_catdoor_open_demoskip() {
     daObjCatDoor_c* pCatDoor = (daObjCatDoor_c*)mActors[1].getActorP();
     if (pCatDoor == NULL) {
@@ -1202,7 +1145,6 @@ void daPeru_c::_catdoor_open_demoskip() {
     }
 }
 
-/* 80D4A984-80D4AA18 003B84 0094+00 1/0 0/0 0/0 .text            cutAppear_skip__8daPeru_cFi */
 int daPeru_c::cutAppear_skip(int param_1) {
     dEvent_manager_c& eventManager = dComIfGp_getEventManager();
     int* pCutId = dComIfGp_evmng_getMyIntegerP(param_1, "cut_id");
@@ -1217,8 +1159,6 @@ int daPeru_c::cutAppear_skip(int param_1) {
     return _cutAppear_skip_Main(*pCutId);
 }
 
-/* 80D4AA18-80D4AAF0 003C18 00D8+00 1/1 0/0 0/0 .text            _cutAppear_skip_Init__8daPeru_cFRCi
- */
 int daPeru_c::_cutAppear_skip_Init(int const& param_1) {
     switch (param_1) {
     case 10:
@@ -1238,8 +1178,6 @@ int daPeru_c::_cutAppear_skip_Init(int const& param_1) {
     return 0;
 }
 
-/* 80D4AAF0-80D4AB08 003CF0 0018+00 1/1 0/0 0/0 .text            _cutAppear_skip_Main__8daPeru_cFRCi
- */
 int daPeru_c::_cutAppear_skip_Main(int const& param_0) {
     int rv = 0;
     if (param_0 == 10) {
@@ -1248,27 +1186,22 @@ int daPeru_c::_cutAppear_skip_Main(int const& param_0) {
     return rv;
 }
 
-/* 80D4AB08-80D4AB28 003D08 0020+00 1/0 0/0 0/0 .text            daPeru_Create__FPv */
 static int daPeru_Create(void* i_this) {
     return static_cast<daPeru_c*>(i_this)->create();
 }
 
-/* 80D4AB28-80D4AB48 003D28 0020+00 1/0 0/0 0/0 .text            daPeru_Delete__FPv */
 static int daPeru_Delete(void* i_this) {
     return static_cast<daPeru_c*>(i_this)->Delete();
 }
 
-/* 80D4AB48-80D4AB68 003D48 0020+00 1/0 0/0 0/0 .text            daPeru_Execute__FPv */
 static int daPeru_Execute(void* i_this) {
     return static_cast<daPeru_c*>(i_this)->Execute();
 }
 
-/* 80D4AB68-80D4AB88 003D68 0020+00 1/0 0/0 0/0 .text            daPeru_Draw__FPv */
 static int daPeru_Draw(void* i_this) {
     return static_cast<daPeru_c*>(i_this)->Draw();
 }
 
-/* 80D4AB88-80D4AB90 003D88 0008+00 1/0 0/0 0/0 .text            daPeru_IsDelete__FPv */
 static int daPeru_IsDelete(void* i_this) {
     return 1;
 }
@@ -1276,7 +1209,6 @@ static int daPeru_IsDelete(void* i_this) {
 AUDIO_INSTANCES
 
 
-/* 80D4C61C-80D4C63C -00001 0020+00 1/0 0/0 0/0 .data            daPeru_MethodTable */
 static actor_method_class daPeru_MethodTable = {
     (process_method_func)daPeru_Create,
     (process_method_func)daPeru_Delete,
@@ -1285,7 +1217,6 @@ static actor_method_class daPeru_MethodTable = {
     (process_method_func)daPeru_Draw,
 };
 
-/* 80D4C63C-80D4C66C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PERU */
 extern actor_process_profile_definition g_profile_PERU = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp
index d8829057eb..d59d689d97 100644
--- a/src/d/actor/d_a_player.cpp
+++ b/src/d/actor/d_a_player.cpp
@@ -33,7 +33,6 @@ void daPy_frameCtrl_c::updateFrame() {
     offNowSetFlg();
 }
 
-/* 8015E544-8015E5B0 158E84 006C+00 0/0 1/1 6/6 .text setFrameCtrl__16daPy_frameCtrl_cFUcssff */
 void daPy_frameCtrl_c::setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32 i_rate,
                                     f32 i_frame) {
     setAttribute(i_attribute);
@@ -51,8 +50,6 @@ void daPy_frameCtrl_c::setFrameCtrl(u8 i_attribute, s16 i_start, s16 i_end, f32
     offEndFlg();
 }
 
-/* 8015E5B0-8015E654 158EF0 00A4+00 0/0 1/1 18/18 .text initOffset__20daPy_boomerangMove_cFPC4cXyz
- */
 void daPy_boomerangMove_c::initOffset(cXyz const* i_offset) {
     daBoomerang_c* boomerang_p = daPy_py_c::getThrowBoomerangActor();
 
@@ -68,7 +65,6 @@ void daPy_boomerangMove_c::initOffset(cXyz const* i_offset) {
     field_0x0 = 0;
 }
 
-/* 80451018-8045101C 000518 0004+00 2/2 33/32 103/103 .sbss            m_midnaActor__9daPy_py_c */
 daMidna_c* daPy_py_c::m_midnaActor;
 
 /* 8045101C 0002+00 data_8045101C m_dropAngleY__20daPy_boomerangMove_c */
@@ -77,8 +73,6 @@ s16 daPy_boomerangMove_c::m_dropAngleY;
 /* 8045101E 0002+00 data_8045101E m_eventKeepFlg__20daPy_boomerangMove_c */
 s16 daPy_boomerangMove_c::m_eventKeepFlg;
 
-/* 8015E654-8015E87C 158F94 0228+00 0/0 1/1 17/17 .text
- * posMove__20daPy_boomerangMove_cFP4cXyzPsP10fopAc_ac_cs       */
 int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param_2, s16 param_3) {
     daBoomerang_c* boomerang_p = daPy_py_c::getThrowBoomerangActor();
 
@@ -127,8 +121,6 @@ int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param
     return 0;
 }
 
-/* 8015E87C-8015EA0C 1591BC 0190+00 1/1 1/1 17/17 .text
- * bgCheckAfterOffset__20daPy_boomerangMove_cFPC4cXyz           */
 void daPy_boomerangMove_c::bgCheckAfterOffset(cXyz const* i_offset) {
     daBoomerang_c* boomerang_p = daPy_py_c::getThrowBoomerangActor();
     if (boomerang_p != NULL) {
@@ -139,31 +131,24 @@ void daPy_boomerangMove_c::bgCheckAfterOffset(cXyz const* i_offset) {
     }
 }
 
-/* 8015EA0C-8015EA20 15934C 0014+00 0/0 3/3 0/0 .text            setParamData__9daPy_py_cFiiii */
 u32 daPy_py_c::setParamData(int param_0, int param_1, int param_2, int param_3) {
     return param_3 | (param_0 & 0x3F | (param_1 & 0x1F) << 0xC | param_2 << 0x18);
 }
 
-/* 8015EA20-8015EA48 159360 0028+00 0/0 10/10 3/3 .text            checkFishingRodItem__9daPy_py_cFi
- */
 BOOL daPy_py_c::checkFishingRodItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_FISHING_ROD_1 || (i_itemNo >= fpcNm_ITEM_BEE_ROD && i_itemNo <= fpcNm_ITEM_JEWEL_WORM_ROD);
 }
 
-/* 8015EA48-8015EA88 159388 0040+00 0/0 3/3 0/0 .text            checkBombItem__9daPy_py_cFi */
 BOOL daPy_py_c::checkBombItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_NORMAL_BOMB || i_itemNo == fpcNm_ITEM_WATER_BOMB || i_itemNo == fpcNm_ITEM_POKE_BOMB;
 }
 
-/* 8015EA88-8015EAD8 1593C8 0050+00 0/0 5/5 0/0 .text            checkBottleItem__9daPy_py_cFi */
 BOOL daPy_py_c::checkBottleItem(int i_itemNo) {
     return (i_itemNo >= fpcNm_ITEM_EMPTY_BOTTLE && i_itemNo <= fpcNm_ITEM_FAIRY) || i_itemNo == fpcNm_ITEM_BEE_CHILD ||
            i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY_DROP || i_itemNo == fpcNm_ITEM_CHUCHU_BLACK ||
            (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo <= fpcNm_ITEM_LV3_SOUP);
 }
 
-/* 8015EAD8-8015EB40 159418 0068+00 0/0 3/3 0/0 .text            checkDrinkBottleItem__9daPy_py_cFi
- */
 BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) {
     return (i_itemNo >= fpcNm_ITEM_RED_BOTTLE && i_itemNo <= fpcNm_ITEM_HALF_MILK_BOTTLE) || i_itemNo == fpcNm_ITEM_RED_BOTTLE_2 ||
            i_itemNo == fpcNm_ITEM_UGLY_SOUP || i_itemNo == fpcNm_ITEM_HOT_SPRING || i_itemNo == fpcNm_ITEM_BEE_CHILD ||
@@ -171,42 +156,32 @@ BOOL daPy_py_c::checkDrinkBottleItem(int i_itemNo) {
            (i_itemNo >= fpcNm_ITEM_CHUCHU_RARE && i_itemNo != fpcNm_ITEM_CHUCHU_YELLOW && i_itemNo <= fpcNm_ITEM_LV3_SOUP);
 }
 
-/* 8015EB40-8015EB68 159480 0028+00 0/0 4/4 0/0 .text            checkOilBottleItem__9daPy_py_cFi */
 BOOL daPy_py_c::checkOilBottleItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_CHUCHU_YELLOW || i_itemNo == fpcNm_ITEM_OIL_BOTTLE_2 || i_itemNo == fpcNm_ITEM_OIL_BOTTLE;
 }
 
-/* 8015EB68-8015EB90 1594A8 0028+00 0/0 2/2 0/0 .text            checkOpenBottleItem__9daPy_py_cFi
- */
 BOOL daPy_py_c::checkOpenBottleItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_WATER_BOTTLE || i_itemNo == fpcNm_ITEM_WORM || i_itemNo == fpcNm_ITEM_FAIRY;
 }
 
-/* 8015EB90-8015EBB8 1594D0 0028+00 0/0 11/11 0/0 .text            checkBowItem__9daPy_py_cFi */
 BOOL daPy_py_c::checkBowItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_BOW || i_itemNo == fpcNm_ITEM_BOMB_ARROW || i_itemNo == fpcNm_ITEM_HAWK_ARROW;
 }
 
-/* 8015EBB8-8015EBD8 1594F8 0020+00 0/0 23/23 0/0 .text            checkHookshotItem__9daPy_py_cFi
- */
 BOOL daPy_py_c::checkHookshotItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_HOOKSHOT || i_itemNo == fpcNm_ITEM_W_HOOKSHOT;
 }
 
-/* 8015EBD8-8015EC28 159518 0050+00 0/0 3/3 0/0 .text            checkTradeItem__9daPy_py_cFi */
 BOOL daPy_py_c::checkTradeItem(int i_itemNo) {
     return (i_itemNo >= fpcNm_ITEM_LETTER && i_itemNo <= fpcNm_ITEM_IRIAS_PENDANT) || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT ||
            i_itemNo == fpcNm_ITEM_AIR_LETTER || i_itemNo == fpcNm_ITEM_ANCIENT_DOCUMENT2 || i_itemNo == fpcNm_ITEM_RAFRELS_MEMO ||
            i_itemNo == fpcNm_ITEM_TKS_LETTER || i_itemNo == fpcNm_ITEM_ASHS_SCRIBBLING;
 }
 
-/* 8015EC28-8015EC48 159568 0020+00 0/0 2/2 0/0 .text            checkDungeonWarpItem__9daPy_py_cFi
- */
 BOOL daPy_py_c::checkDungeonWarpItem(int i_itemNo) {
     return i_itemNo == fpcNm_ITEM_DUNGEON_EXIT || i_itemNo == fpcNm_ITEM_DUNGEON_BACK;
 }
 
-/* 8015EC48-8015ECB8 159588 0070+00 0/0 10/10 3/3 .text            setActor__16daPy_actorKeep_cFv */
 void daPy_actorKeep_c::setActor() {
     if (mID != -1) {
         mActor = fopAcM_SearchByID(mID);
@@ -219,8 +194,6 @@ void daPy_actorKeep_c::setActor() {
     }
 }
 
-/* 8015ECB8-8015ECFC 1595F8 0044+00 0/0 59/59 4/4 .text setData__16daPy_actorKeep_cFP10fopAc_ac_c
- */
 void daPy_actorKeep_c::setData(fopAc_ac_c* i_actor) {
     if (i_actor != NULL) {
         mActor = i_actor;
@@ -252,14 +225,11 @@ void daPy_anmHeap_c::initData() {
     resetArcNo();
 }
 
-/* 8015EDC4-8015EE00 159704 003C+00 0/0 1/1 1/1 .text            mallocBuffer__14daPy_anmHeap_cFv */
 void* daPy_anmHeap_c::mallocBuffer() {
     mBuffer = new (0x20) u8[mBufferSize];
     return mBuffer;
 }
 
-/* 8015EE00-8015EF84 159740 0184+00 0/0 1/1 1/1 .text
- * createHeap__14daPy_anmHeap_cFQ214daPy_anmHeap_c16daAlinkHEAP_TYPE */
 void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) {
     u32 size;
 
@@ -294,7 +264,6 @@ void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) {
     mDoExt_adjustSolidHeap(mAnimeHeap);
 }
 
-/* 8015EF84-8015F068 1598C4 00E4+00 3/3 0/0 0/0 .text            loadData__14daPy_anmHeap_cFUs */
 void* daPy_anmHeap_c::loadData(u16 i_resId) {
     static const char twglArcName[] = "TWGate_Lk";
     static const char twgwArcName[] = "TWGate_Wf";
@@ -325,7 +294,6 @@ void* daPy_anmHeap_c::loadData(u16 i_resId) {
     return dComIfG_getObjectRes(arcName[mArcNo - 1], i_resId);
 }
 
-/* 8015F068-8015F0D0 1599A8 0068+00 0/0 9/9 5/5 .text            loadDataIdx__14daPy_anmHeap_cFUs */
 void* daPy_anmHeap_c::loadDataIdx(u16 i_resID) {
     void* data;
 
@@ -344,8 +312,6 @@ void* daPy_anmHeap_c::loadDataIdx(u16 i_resID) {
     return data;
 }
 
-/* 8015F0D0-8015F118 159A10 0048+00 0/0 3/3 0/0 .text            loadDataPriIdx__14daPy_anmHeap_cFUs
- */
 void* daPy_anmHeap_c::loadDataPriIdx(u16 i_resID) {
     void* data;
 
@@ -359,7 +325,6 @@ void* daPy_anmHeap_c::loadDataPriIdx(u16 i_resID) {
     return data;
 }
 
-/* 8015F118-8015F168 159A58 0050+00 0/0 5/5 5/5 .text loadDataDemoRID__14daPy_anmHeap_cFUsUs */
 void* daPy_anmHeap_c::loadDataDemoRID(u16 i_resID, u16 i_arcNo) {
     void* data;
 
@@ -374,14 +339,11 @@ void* daPy_anmHeap_c::loadDataDemoRID(u16 i_resID, u16 i_arcNo) {
     return data;
 }
 
-/* 8015F168-8015F1A0 159AA8 0038+00 1/1 4/4 0/0 .text            setAnimeHeap__14daPy_anmHeap_cFv */
 JKRHeap* daPy_anmHeap_c::setAnimeHeap() {
     mAnimeHeap->freeAll();
     return mDoExt_setCurrentHeap(mAnimeHeap);
 }
 
-/* ############################################################################################## */
-/* 803BA0C0-803BA14C 0171E0 0089+03 1/1 0/0 0/0 .data            l_sightDL */
 static u8 l_sightDL[] = {
     0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08,
@@ -394,7 +356,6 @@ static u8 l_sightDL[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8015F1A0-8015F2FC 159AE0 015C+00 1/0 1/1 0/0 .text            draw__18daPy_sightPacket_cFv */
 void daPy_sightPacket_c::draw() {
     GXTexObj texObj;
 
@@ -424,7 +385,6 @@ void daPy_sightPacket_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 8015F2FC-8015F384 159C3C 0088+00 0/0 1/1 0/0 .text            setSight__18daPy_sightPacket_cFv */
 void daPy_sightPacket_c::setSight() {
     Vec proj;
 
@@ -435,14 +395,11 @@ void daPy_sightPacket_c::setSight() {
     dComIfGd_set2DXlu(this);
 }
 
-/* 8015F384-8015F398 159CC4 0014+00 0/0 1/1 0/0 .text
- * setSightImage__18daPy_sightPacket_cFP7ResTIMG                */
 void daPy_sightPacket_c::setSightImage(ResTIMG* i_img) {
     mpImg = i_img;
     mpData = (u8*)i_img + i_img->imageOffset;
 }
 
-/* 8015F398-8015F3C4 159CD8 002C+00 0/0 8/8 10/10 .text checkMasterSwordEquip__9daPy_py_cFv */
 BOOL daPy_py_c::checkMasterSwordEquip() {
     u32 equipSword = dComIfGs_getSelectEquipSword();
     bool isMasterSword = false;
@@ -454,16 +411,12 @@ BOOL daPy_py_c::checkMasterSwordEquip() {
     return isMasterSword;
 }
 
-/* 8015F3C4-8015F3FC 159D04 0038+00 0/0 4/4 0/0 .text            checkWoodShieldEquip__9daPy_py_cFv
- */
 BOOL daPy_py_c::checkWoodShieldEquip() {
     u16 equipShield = dComIfGs_getSelectEquipShield();
 
     return equipShield == fpcNm_ITEM_WOOD_SHIELD || equipShield == fpcNm_ITEM_SHIELD;
 }
 
-/* 8015F3FC-8015F424 159D3C 0028+00 0/0 4/4 3/3 .text            getAttentionOffsetY__9daPy_py_cFv
- */
 f32 daPy_py_c::getAttentionOffsetY() {
     if (checkNowWolf()) {
         return -12.5f;
@@ -472,14 +425,10 @@ f32 daPy_py_c::getAttentionOffsetY() {
     return 57.5f;
 }
 
-/* 8015F424-8015F438 159D64 0014+00 0/0 17/17 33/33 .text            checkNowWolfEyeUp__9daPy_py_cFv
- */
 int daPy_py_c::checkNowWolfEyeUp() {
     return daAlink_getAlinkActorClass()->checkWolfEyeUp();
 }
 
-/* 8015F438-8015F478 159D78 0040+00 0/0 0/0 1/1 .text            forceRestartRoom__9daPy_py_cFiUli
- */
 
 void daAlink_c::startRestartRoomFromOut(int param_0, u32 param_1, int param_2) {
     startRestartRoom(param_1, param_2, param_0, dComIfGp_event_runCheck());
@@ -489,43 +438,32 @@ void daPy_py_c::forceRestartRoom(int param_0, u32 param_1, int param_2) {
     daAlink_getAlinkActorClass()->startRestartRoomFromOut(param_0, param_1, param_2);
 }
 
-/* 8015F478-8015F4B8 159DB8 0040+00 0/0 0/0 3/3 .text
- * setFmChainPos__9daPy_py_cFP10fopAc_ac_cP4cXyzi               */
 BOOL daPy_py_c::setFmChainPos(fopAc_ac_c* param_0, cXyz* param_1, int param_2) {
     return daAlink_getAlinkActorClass()->setFmChainPosFromOut(param_0, param_1, param_2);
 }
 
-/* 8015F4B8-8015F4F0 159DF8 0038+00 0/0 0/0 1/1 .text            cancelFmChainGrab__9daPy_py_cFv */
 void daPy_py_c::cancelFmChainGrab() {
     daAlink_getAlinkActorClass()->cancelFmChainGrabFromOut();
 }
 
-/* 8015F4F0-8015F520 159E30 0030+00 0/0 0/0 17/17 .text            setLookPos__9daPy_py_cFP4cXyz */
 void daPy_py_c::setLookPos(cXyz* i_pos) {
     daAlink_getAlinkActorClass()->setLookPosFromOut(i_pos);
 }
 
-/* 8015F520-8015F55C 159E60 003C+00 0/0 0/0 4/4 .text            setPlayerSe__9daPy_py_cFUl */
 void daPy_py_c::setPlayerSe(u32 i_sfxID) {
     daAlink_getAlinkActorClass()->seStartOnlyReverb(i_sfxID);
 }
 
-/* 8015F55C-8015F60C 159E9C 00B0+00 1/1 0/0 2/2 .text
- * linkGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c              */
 bool daPy_py_c::linkGrabSubjectNoDraw(fopAc_ac_c* i_actor) {
     return (fopAcM_checkCarryNow(i_actor) &&
             daPy_getPlayerActorClass()->getGrabActorID() == fopAcM_GetID(i_actor)) &&
            dComIfGp_checkCameraAttentionStatus(dComIfGp_getPlayerCameraID(0), 2);
 }
 
-/* 8015F60C-8015F660 159F4C 0054+00 0/0 0/0 2/2 .text
- * wolfGrabSubjectNoDraw__9daPy_py_cFP10fopAc_ac_c              */
 bool daPy_py_c::wolfGrabSubjectNoDraw(fopAc_ac_c* i_actor) {
     return checkNowWolf() && linkGrabSubjectNoDraw(i_actor);
 }
 
-/* 8015F660-8015F698 159FA0 0038+00 2/2 1/1 1/1 .text            checkRoomRestartStart__9daPy_py_cFv
- */
 bool daPy_py_c::checkRoomRestartStart() {
     u8 mode = getLastSceneMode();
     if (mode == 4 || mode == 8 || mode == 5) {
@@ -535,7 +473,6 @@ bool daPy_py_c::checkRoomRestartStart() {
     return false;
 }
 
-/* 8015F698-8015F730 159FD8 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallA__9daPy_py_cFv */
 u32 daPy_py_c::checkCarryStartLightBallA() {
     if (checkRoomRestartStart() || !dComIfGp_getStage() ||
         !dComIfGp_getStage()->getStagInfo() ||
@@ -547,7 +484,6 @@ u32 daPy_py_c::checkCarryStartLightBallA() {
     return dComIfGs_getLastSceneMode() & 0x100000;
 }
 
-/* 8015F730-8015F7C8 15A070 0098+00 0/0 2/2 1/1 .text checkCarryStartLightBallB__9daPy_py_cFv */
 u32 daPy_py_c::checkCarryStartLightBallB() {
     if (checkRoomRestartStart() || !dComIfGp_getStage() ||
         !dComIfGp_getStage()->getStagInfo() ||
@@ -571,7 +507,6 @@ f32 daPy_py_c::getSpinnerRideSpeed() const {
     return rideSpeed;
 }
 
-/* 8015F814-8015F89C 15A154 0088+00 0/0 0/0 1/1 .text checkSpinnerReflectEffect__9daPy_py_cFv */
 bool daPy_py_c::checkSpinnerReflectEffect() {
     daSpinner_c* spinner_p = getSpinnerActor();
 
@@ -582,49 +517,39 @@ bool daPy_py_c::checkSpinnerReflectEffect() {
     return false;
 }
 
-/* 8015F89C-8015F8C8 15A1DC 002C+00 0/0 0/0 7/7 .text            checkBoomerangCharge__9daPy_py_cFv
- */
 bool daPy_py_c::checkBoomerangCharge() {
     return daAlink_getAlinkActorClass()->checkBoomerangChargeEnd();
 }
 
-/* 8015F8C8-8015F8D0 15A208 0008+00 0/0 0/0 1/1 .text checkBoomerangChargeTime__9daPy_py_cFv */
 u8 daPy_py_c::checkBoomerangChargeTime() {
     return 0;
 }
 
-/* 8015F8D0-8015F8E4 15A210 0014+00 3/3 1/1 5/5 .text getThrowBoomerangActor__9daPy_py_cFv */
 daBoomerang_c* daPy_py_c::getThrowBoomerangActor() {
     return static_cast<daBoomerang_c*>(
         daAlink_getAlinkActorClass()->getThrowBoomerangAcKeep()->getActor());
 }
 
-/* 8015F8E4-8015F914 15A224 0030+00 0/0 0/0 2/2 .text
- * cancelBoomerangLockActor__9daPy_py_cFP10fopAc_ac_c           */
 void daPy_py_c::cancelBoomerangLockActor(fopAc_ac_c* i_actor) {
     daAlink_getAlinkActorClass()->cancelBoomerangLock(i_actor);
 }
 
-/* 8015F914-8015F954 15A254 0040+00 0/0 0/0 2/2 .text            setPlayerDamage__9daPy_py_cFii */
 void daPy_py_c::setPlayerDamage(int i_dmgAmount, int i_setDmgTimer) {
     daAlink_getAlinkActorClass()->setDamagePoint(i_dmgAmount, FALSE, i_setDmgTimer, 0);
 }
 
-/* 8015F954-8015F968 15A294 0014+00 0/0 3/3 0/0 .text            setMidnaMotionNum__9daPy_py_cFi */
 void daPy_py_c::setMidnaMotionNum(int i_motionNum) {
     if (m_midnaActor != NULL) {
         m_midnaActor->setMotionNum(i_motionNum);
     }
 }
 
-/* 8015F968-8015F97C 15A2A8 0014+00 0/0 3/3 0/0 .text            setMidnaFaceNum__9daPy_py_cFi */
 void daPy_py_c::setMidnaFaceNum(int i_faceNum) {
     if (m_midnaActor != NULL) {
         m_midnaActor->setFaceNum(i_faceNum);
     }
 }
 
-/* 8015F97C-8015FA2C 15A2BC 00B0+00 0/0 7/7 2/2 .text            daPy_addCalcShort__FPsssss */
 int daPy_addCalcShort(s16* i_value, s16 i_target, s16 i_scale, s16 i_maxStep, s16 i_minStep) {
     int delta = i_target - *i_value;
 
diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp
index 6eeca6dbad..0b9d0cca4d 100644
--- a/src/d/actor/d_a_ppolamp.cpp
+++ b/src/d/actor/d_a_ppolamp.cpp
@@ -10,20 +10,16 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80D4C938-80D4C958 000078 0020+00 1/1 0/0 0/0 .text daPPolamp_c_createHeap__FP10fopAc_ac_c */
 static int daPPolamp_c_createHeap(fopAc_ac_c* i_this) {
     return ((daPPolamp_c*)i_this)->createHeap();
 }
 
-/* 80D4D2D0-80D4D2D4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "PPolamp";
 
-/* 80D4C958-80D4C9FC 000098 00A4+00 1/0 0/0 0/0 .text            __dt__11daPPolamp_cFv */
 daPPolamp_c::~daPPolamp_c() {
     dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80D4C9FC-80D4CB24 00013C 0128+00 1/1 0/0 0/0 .text            create__11daPPolamp_cFv */
 int daPPolamp_c::create() {
     int rv = dComIfG_resLoad(this, l_arcName);
     if (rv == cPhs_COMPLEATE_e) {
@@ -45,7 +41,6 @@ int daPPolamp_c::create() {
     return rv;
 }
 
-/* 80D4CB24-80D4CB84 000264 0060+00 1/1 0/0 0/0 .text            execute__11daPPolamp_cFv */
 int daPPolamp_c::execute() {
     if (mSwingTimer != 0) {
         mSwingTimer--;
@@ -58,7 +53,6 @@ int daPPolamp_c::execute() {
     return 1;
 }
 
-/* 80D4CB84-80D4CCF0 0002C4 016C+00 1/1 0/0 0/0 .text            draw__11daPPolamp_cFv */
 int daPPolamp_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mModel1, &tevStr);
@@ -80,13 +74,11 @@ int daPPolamp_c::draw() {
     return 1;
 }
 
-/* 80D4CCF0-80D4CD24 000430 0034+00 1/1 0/0 0/0 .text            Delete__11daPPolamp_cFv */
 int daPPolamp_c::Delete() {
     this->~daPPolamp_c();
     return 1;
 }
 
-/* 80D4CD24-80D4CDA8 000464 0084+00 2/2 0/0 0/0 .text            setModelMtx__11daPPolamp_cFv */
 void daPPolamp_c::setModelMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -95,7 +87,6 @@ void daPPolamp_c::setModelMtx() {
     mModel1->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D4CDA8-80D4CE9C 0004E8 00F4+00 1/1 0/0 0/0 .text            setPclModelMtx__11daPPolamp_cFv */
 void daPPolamp_c::setPclModelMtx() {
     Vec local_20;
     Vec local_2c = {0.0f, -45.0f, 0.0f};
@@ -110,7 +101,6 @@ void daPPolamp_c::setPclModelMtx() {
     mModel2->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D4CE9C-80D4CFB0 0005DC 0114+00 1/1 0/0 0/0 .text            createHeap__11daPPolamp_cFv */
 int daPPolamp_c::createHeap() {
     J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
     JUT_ASSERT(347, a_model_data_p != NULL);
@@ -135,7 +125,6 @@ int daPPolamp_c::createHeap() {
     return 1;
 }
 
-/* 80D4CFB0-80D4D10C 0006F0 015C+00 1/1 0/0 0/0 .text            moveSwing__11daPPolamp_cFv */
 void daPPolamp_c::moveSwing() {
     s16 sVar1 = field_0x598 * 65 - 500;
     shape_angle.z += (s16)(field_0x5a4 * (field_0x59c * sVar1));
@@ -154,7 +143,6 @@ void daPPolamp_c::moveSwing() {
     field_0x598++;
 }
 
-/* 80D4D10C-80D4D140 00084C 0034+00 1/1 0/0 0/0 .text            initParam__11daPPolamp_cFv */
 void daPPolamp_c::initParam() {
     field_0x598 = 0;
     field_0x59c = 1;
@@ -164,31 +152,23 @@ void daPPolamp_c::initParam() {
     field_0x5a8 = 1.0f;
 }
 
-/* 80D4D140-80D4D1CC 000880 008C+00 1/0 0/0 0/0 .text            daPPolamp_create__FP11daPPolamp_c
- */
 static int daPPolamp_create(daPPolamp_c* i_this) {
     fopAcM_ct(i_this, daPPolamp_c);
     return i_this->create();
 }
 
-/* 80D4D214-80D4D234 000954 0020+00 1/0 0/0 0/0 .text            daPPolamp_Delete__FP11daPPolamp_c
- */
 static int daPPolamp_Delete(daPPolamp_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D4D234-80D4D254 000974 0020+00 1/0 0/0 0/0 .text            daPPolamp_execute__FP11daPPolamp_c
- */
 static int daPPolamp_execute(daPPolamp_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D4D254-80D4D274 000994 0020+00 1/0 0/0 0/0 .text            daPPolamp_draw__FP11daPPolamp_c */
 static int daPPolamp_draw(daPPolamp_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D4D2D4-80D4D2F4 -00001 0020+00 1/0 0/0 0/0 .data            daPPolamp_METHODS */
 static actor_method_class daPPolamp_METHODS = {
     (process_method_func)daPPolamp_create,
     (process_method_func)daPPolamp_Delete,
@@ -197,7 +177,6 @@ static actor_method_class daPPolamp_METHODS = {
     (process_method_func)daPPolamp_draw,
 };
 
-/* 80D4D2F4-80D4D324 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_PPolamp */
 extern actor_process_profile_definition g_profile_PPolamp = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp
index 15e1bc11a1..e86bfca349 100644
--- a/src/d/actor/d_a_scene_exit.cpp
+++ b/src/d/actor/d_a_scene_exit.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "m_Do/m_Do_mtx.h"
 
-/* 80485838-80485974 000078 013C+00 1/1 0/0 0/0 .text            checkWork__8daScex_cFv */
 int daScex_c::checkWork() {
     if (getArg1() == 0xFF || getArg1() == 0 || getArg1() == 3) {
         if (fopAcM_isSwitch(this, getSwNo())) {
@@ -48,18 +47,15 @@ inline int daScex_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80485974-80485A30 0001B4 00BC+00 1/0 0/0 0/0 .text            daScex_Create__FP10fopAc_ac_c */
 static int daScex_Create(fopAc_ac_c* i_this) {
     daScex_c* scx = static_cast<daScex_c*>(i_this);
     return scx->create();
 }
 
-/* 80485A30-80485A50 000270 0020+00 1/0 0/0 0/0 .text            daScex_Execute__FP8daScex_c */
 static int daScex_Execute(daScex_c* i_this) {
     return i_this->execute();
 }
 
-/* 80485A50-80485C90 000290 0240+00 1/1 0/0 0/0 .text            execute__8daScex_cFv */
 // NONMATCHING - regalloc, this matches debug but not retail :/
 int daScex_c::execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -103,15 +99,12 @@ int daScex_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80485CAC-80485CCC -00001 0020+00 1/0 0/0 0/0 .data            l_daScex_Method */
 static actor_method_class l_daScex_Method = {
     (process_method_func)daScex_Create,
     NULL,
     (process_method_func)daScex_Execute,
 };
 
-/* 80485CCC-80485D00 -00001 0034+00 0/0 0/0 1/0 .data            g_profile_SCENE_EXIT */
 extern actor_process_profile_definition2 g_profile_SCENE_EXIT = {
   fpcLy_CURRENT_e,       // mLayerID
   10,                    // mListID
diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp
index fc51a1c2d7..437f136dde 100644
--- a/src/d/actor/d_a_scene_exit2.cpp
+++ b/src/d/actor/d_a_scene_exit2.cpp
@@ -9,24 +9,19 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 8059E158-8059E178 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__10daScExit_cFv */
 void daScExit_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 8059E178-8059E1B0 000098 0038+00 1/1 0/0 0/0 .text            setBaseMtx__10daScExit_cFv */
 void daScExit_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
 }
 
-/* 8059E858-8059E85C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "SceneExit";
 
-/* 8059E85C-8059E860 -00001 0004+00 1/1 0/0 0/0 .data            l_evName */
 static char* l_evName = "SCENE_EXIT";
 
-/* 8059E1B0-8059E230 0000D0 0080+00 1/1 0/0 0/0 .text            Create__10daScExit_cFv */
 int daScExit_c::Create() {
     mRadius = scale.x * 100.0f;
     initBaseMtx();
@@ -37,7 +32,6 @@ int daScExit_c::Create() {
     return 1;
 }
 
-/* 8059E230-8059E2C0 000150 0090+00 1/1 0/0 0/0 .text            create__10daScExit_cFv */
 int daScExit_c::create() {
     fopAcM_ct(this, daScExit_c);
 
@@ -51,13 +45,11 @@ int daScExit_c::create() {
     return phase;
 }
 
-/* 8059E2C0-8059E2E4 0001E0 0024+00 1/1 0/0 0/0 .text            execute__10daScExit_cFv */
 int daScExit_c::execute() {
     event_proc_call();
     return 1;
 }
 
-/* 8059E2E4-8059E3A0 000204 00BC+00 1/1 0/0 0/0 .text            event_proc_call__10daScExit_cFv */
 void daScExit_c::event_proc_call() {
     typedef void (daScExit_c::*actionFunc)();
     static actionFunc l_func[] = {&daScExit_c::actionWait, &daScExit_c::actionOrderEvent,
@@ -66,7 +58,6 @@ void daScExit_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 8059E3A0-8059E408 0002C0 0068+00 1/0 0/0 0/0 .text            actionWait__10daScExit_cFv */
 void daScExit_c::actionWait() {
     if (checkArea()) {
         setAction(ACTION_ORDER_EVENT_e);
@@ -75,7 +66,6 @@ void daScExit_c::actionWait() {
     }
 }
 
-/* 8059E408-8059E488 000328 0080+00 1/0 0/0 0/0 .text            actionOrderEvent__10daScExit_cFv */
 void daScExit_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT_e);
@@ -87,7 +77,6 @@ void daScExit_c::actionOrderEvent() {
     }
 }
 
-/* 8059E488-8059E504 0003A8 007C+00 1/0 0/0 0/0 .text            actionEvent__10daScExit_cFv */
 void daScExit_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACTION_DEAD_e);
@@ -98,10 +87,8 @@ void daScExit_c::actionEvent() {
     }
 }
 
-/* 8059E504-8059E508 000424 0004+00 1/0 0/0 0/0 .text            actionDead__10daScExit_cFv */
 void daScExit_c::actionDead() {}
 
-/* 8059E508-8059E6CC 000428 01C4+00 2/2 0/0 0/0 .text            demoProc__10daScExit_cFv */
 int daScExit_c::demoProc() {
     static char* action_table[3] = {"WAIT", "START", "SCENE_CHG"};
 
@@ -149,50 +136,41 @@ int daScExit_c::demoProc() {
     return 0;
 }
 
-/* 8059E6CC-8059E714 0005EC 0048+00 1/1 0/0 0/0 .text            checkArea__10daScExit_cFv */
 BOOL daScExit_c::checkArea() {
     return fopAcM_searchPlayerDistanceXZ(this) < mRadius;
 }
 
-/* 8059E714-8059E71C 000634 0008+00 1/1 0/0 0/0 .text            draw__10daScExit_cFv */
 int daScExit_c::draw() {
     return 1;
 }
 
-/* 8059E71C-8059E750 00063C 0034+00 1/1 0/0 0/0 .text            _delete__10daScExit_cFv */
 int daScExit_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 8059E750-8059E770 000670 0020+00 1/0 0/0 0/0 .text            daScExit_Draw__FP10daScExit_c */
 static int daScExit_Draw(daScExit_c* i_this) {
     return i_this->draw();
 }
 
-/* 8059E770-8059E790 000690 0020+00 1/0 0/0 0/0 .text            daScExit_Execute__FP10daScExit_c */
 static int daScExit_Execute(daScExit_c* i_this) {
     return i_this->execute();
 }
 
-/* 8059E790-8059E7B0 0006B0 0020+00 1/0 0/0 0/0 .text            daScExit_Delete__FP10daScExit_c */
 static int daScExit_Delete(daScExit_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8059E7B0-8059E7D0 0006D0 0020+00 1/0 0/0 0/0 .text            daScExit_Create__FP10daScExit_c */
 static int daScExit_Create(daScExit_c* i_this) {
     return i_this->create();
 }
 
-/* 8059E8CC-8059E8EC -00001 0020+00 1/0 0/0 0/0 .data            l_daScExit_Method */
 static actor_method_class l_daScExit_Method = {
     (process_method_func)daScExit_Create,  (process_method_func)daScExit_Delete,
     (process_method_func)daScExit_Execute, (process_method_func)NULL,
     (process_method_func)daScExit_Draw,
 };
 
-/* 8059E8EC-8059E91C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SCENE_EXIT2 */
 extern actor_process_profile_definition g_profile_SCENE_EXIT2 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp
index 5023dabea9..f9456a4c25 100644
--- a/src/d/actor/d_a_set_bgobj.cpp
+++ b/src/d/actor/d_a_set_bgobj.cpp
@@ -9,10 +9,8 @@
 #include "stdio.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata          l_specName */
 static const char l_specName[] = "spec.dat";
 
-/* 80485D78-80485DFC 000078 0084+00 1/1 0/0 0/0 .text            CreateInit__12daSetBgObj_cFv */
 int daSetBgObj_c::CreateInit() {
     static s16 l_bg_profName[5] = {
         PROC_BG_OBJ, PROC_BG_OBJ, PROC_BG_OBJ, PROC_Obj_Flag2, PROC_Obj_Flag3,
@@ -25,7 +23,6 @@ int daSetBgObj_c::CreateInit() {
     return 1;
 }
 
-/* 80485DFC-80485E88 0000FC 008C+00 1/1 0/0 0/0 .text            create__12daSetBgObj_cFv */
 int daSetBgObj_c::create() {
     fopAcM_ct(this, daSetBgObj_c);
 
@@ -40,32 +37,24 @@ int daSetBgObj_c::create() {
     return phase;
 }
 
-/* 80485E88-80485EB8 000188 0030+00 1/1 0/0 0/0 .text            Delete__12daSetBgObj_cFv */
 int daSetBgObj_c::Delete() {
     dComIfG_resDelete(&mPhase, mArcName);
     return 1;
 }
 
-/* 80485EB8-80485ED8 0001B8 0020+00 1/0 0/0 0/0 .text            daSetBgObj_Delete__FP12daSetBgObj_c
- */
 static int daSetBgObj_Delete(daSetBgObj_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80485ED8-80485EF8 0001D8 0020+00 1/0 0/0 0/0 .text            daSetBgObj_Create__FP10fopAc_ac_c
- */
 static int daSetBgObj_Create(fopAc_ac_c* i_this) {
     return static_cast<daSetBgObj_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80485F1C-80485F3C -00001 0020+00 1/0 0/0 0/0 .data            l_daSetBgObj_Method */
 static actor_method_class l_daSetBgObj_Method = {
     (process_method_func)daSetBgObj_Create,
     (process_method_func)daSetBgObj_Delete,
 };
 
-/* 80485F3C-80485F6C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SET_BG_OBJ */
 extern actor_process_profile_definition g_profile_SET_BG_OBJ = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index ee9ec383b8..2adae1cce4 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 8059E9B8-8059EC04 000078 024C+00 2/2 0/0 0/0 .text            getShopArcname__12daShopItem_cFv */
 const char* daShopItem_c::getShopArcname() {
     switch (m_itemNo) {
     case fpcNm_ITEM_NONE:
@@ -91,10 +90,8 @@ const char* daShopItem_c::getShopArcname() {
     return mData[mShopItemID].get_arcName();
 }
 
-/* 8059F438-8059F43C 000000 0004+00 2/2 0/0 0/0 .rodata          m_cullfar_max__12daShopItem_c */
 const f32 daShopItem_c::m_cullfar_max = 5000.0f;
 
-/* 8059EC04-8059EC1C 0002C4 0018+00 1/1 0/0 0/0 .text            getHeapSize__12daShopItem_cFv */
 u16 daShopItem_c::getHeapSize() {
     static const u16 HeapSizeTbl[] = {
         0x0810, 0x0810, 0x0810, 0x0810, 0x0810, 0x0810, 0x0810, 0x0810,
@@ -109,7 +106,6 @@ u16 daShopItem_c::getHeapSize() {
     return HeapSizeTbl[a_ShopItemID];
 }
 
-/* 8059EC1C-8059ED58 0002DC 013C+00 1/1 0/0 0/0 .text            CreateInit__12daShopItem_cFv */
 void daShopItem_c::CreateInit() {
     fopAcM_SetMtx(this, mMtx);
     fopAcM_setCullSizeBox(this, -100.0f, 0.0f, -100.0f, 100.0f, 200.0f, 100.0f);
@@ -134,7 +130,6 @@ void daShopItem_c::CreateInit() {
     mpModel->setUserArea(NULL);
 }
 
-/* 8059ED58-8059EEF4 000418 019C+00 2/2 0/0 0/0 .text            set_mtx__12daShopItem_cFv */
 void daShopItem_c::set_mtx() {
     mpModel->setBaseScale(scale);
 
@@ -166,14 +161,12 @@ void daShopItem_c::set_mtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 8059EEF4-8059EF48 0005B4 0054+00 1/1 0/0 0/0 .text            _execute__12daShopItem_cFv */
 bool daShopItem_c::_execute() {
     animPlay(1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f);
     set_mtx();
     return true;
 }
 
-/* 8059EF48-8059EF9C 000608 0054+00 1/1 0/0 0/0 .text            _draw__12daShopItem_cFv */
 bool daShopItem_c::_draw() {
     if (!chkDraw()) {
         return true;
@@ -183,10 +176,8 @@ bool daShopItem_c::_draw() {
     return true;
 }
 
-/* 8059EF9C-8059EFA0 00065C 0004+00 1/0 0/0 0/0 .text            setListStart__12daShopItem_cFv */
 void daShopItem_c::setListStart() {}
 
-/* 8059EFA0-8059F024 000660 0084+00 1/0 0/0 0/0 .text            setShadow__12daShopItem_cFv */
 void daShopItem_c::setShadow() {
     if (m_itemNo != fpcNm_ITEM_NONE) {
         daItemBase_c::setShadow();
@@ -197,32 +188,26 @@ void daShopItem_c::setShadow() {
     }
 }
 
-/* 8059F024-8059F044 0006E4 0020+00 1/0 0/0 0/0 .text            chkFlag__12daShopItem_cFi */
 BOOL daShopItem_c::chkFlag(int i_flag) {
     return mData[mShopItemID].get_flag() & i_flag;
 }
 
-/* 8059F044-8059F064 000704 0020+00 1/0 0/0 0/0 .text            getTevFrm__12daShopItem_cFv */
 s8 daShopItem_c::getTevFrm() {
     return mData[mShopItemID].get_tevfrm();
 }
 
-/* 8059F064-8059F084 000724 0020+00 1/0 0/0 0/0 .text            getBtpFrm__12daShopItem_cFv */
 s8 daShopItem_c::getBtpFrm() {
     return mData[mShopItemID].get_btpfrm();
 }
 
-/* 8059F084-8059F0A0 000744 001C+00 1/0 0/0 0/0 .text            getShadowSize__12daShopItem_cFv */
 u8 daShopItem_c::getShadowSize() {
     return mData[mShopItemID].get_shadowSize();
 }
 
-/* 8059F0A0-8059F0BC 000760 001C+00 1/0 0/0 0/0 .text            getCollisionH__12daShopItem_cFv */
 u8 daShopItem_c::getCollisionH() {
     return mData[mShopItemID].get_collisionH();
 }
 
-/* 8059F0BC-8059F0D8 00077C 001C+00 1/0 0/0 0/0 .text            getCollisionR__12daShopItem_cFv */
 u8 daShopItem_c::getCollisionR() {
     return mData[mShopItemID].get_collisionR();
 }
@@ -258,7 +243,6 @@ int daShopItem_c::_create() {
     return phase_state;
 }
 
-/* 8059F0D8-8059F294 000798 01BC+00 1/0 0/0 0/0 .text            daShopItem_Create__FPv */
 static int daShopItem_Create(void* i_this) {
     return static_cast<daShopItem_c*>(i_this)->_create();
 }
@@ -268,34 +252,28 @@ int daShopItem_c::_delete() {
     return 1;
 }
 
-/* 8059F394-8059F3D0 000A54 003C+00 1/0 0/0 0/0 .text            daShopItem_Delete__FPv */
 static int daShopItem_Delete(void* i_this) {
     return static_cast<daShopItem_c*>(i_this)->_delete();
 }
 
-/* 8059F3D0-8059F3F4 000A90 0024+00 1/0 0/0 0/0 .text            daShopItem_Draw__FPv */
 static int daShopItem_Draw(void* i_this) {
     return static_cast<daShopItem_c*>(i_this)->_draw();
 }
 
-/* 8059F3F4-8059F418 000AB4 0024+00 1/0 0/0 0/0 .text            daShopItem_Execute__FPv */
 static int daShopItem_Execute(void* i_this) {
     return static_cast<daShopItem_c*>(i_this)->_execute();
 }
 
-/* 8059F418-8059F420 000AD8 0008+00 1/0 0/0 0/0 .text            daShopItem_IsDelete__FPv */
 static int daShopItem_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8059F49C-8059F4BC -00001 0020+00 1/0 0/0 0/0 .data            daShopItemMethodTable */
 static actor_method_class daShopItemMethodTable = {
     (process_method_func)daShopItem_Create,  (process_method_func)daShopItem_Delete,
     (process_method_func)daShopItem_Execute, (process_method_func)daShopItem_IsDelete,
     (process_method_func)daShopItem_Draw,
 };
 
-/* 8059F4BC-8059F4EC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_ShopItem */
 extern actor_process_profile_definition g_profile_ShopItem = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp
index d72507250c..e90975a6eb 100644
--- a/src/d/actor/d_a_skip_2D.cpp
+++ b/src/d/actor/d_a_skip_2D.cpp
@@ -9,13 +9,10 @@
 #include "d/d_meter_button.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80D4D478-80D4D498 000078 0020+00 1/1 0/0 0/0 .text            daSkip2D_createHeap__FP10fopAc_ac_c
- */
 static int daSkip2D_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daSkip2D_c*>(i_this)->createHeap();
 }
 
-/* 80D4D498-80D4D4F4 000098 005C+00 1/1 0/0 0/0 .text            createHeap__10daSkip2D_cFv */
 int daSkip2D_c::createHeap() {
     mpButton = new dMeterButton_c();
 
@@ -26,7 +23,6 @@ int daSkip2D_c::createHeap() {
     return 1;
 }
 
-/* 80D4D4F4-80D4D588 0000F4 0094+00 1/1 0/0 0/0 .text            create__10daSkip2D_cFv */
 int daSkip2D_c::create() {
     fopAcM_ct(this, daSkip2D_c);
 
@@ -37,63 +33,51 @@ int daSkip2D_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D4D588-80D4D590 000188 0008+00 1/1 0/0 0/0 .text            destroy__10daSkip2D_cFv */
 int daSkip2D_c::destroy() {
     return 1;
 }
 
-/* 80D4D590-80D4D5D0 000190 0040+00 1/1 0/0 0/0 .text            draw__10daSkip2D_cFv */
 int daSkip2D_c::draw() {
     dComIfGd_set2DOpaTop((dDlst_base_c*)&mpButton);  // ???
     return 1;
 }
 
-/* 80D4D5D0-80D4D5D8 0001D0 0008+00 1/1 0/0 0/0 .text            execute__10daSkip2D_cFv */
 int daSkip2D_c::execute() {
     return 1;
 }
 
-/* 80D4D5D8-80D4D5EC 0001D8 0014+00 1/1 0/0 0/0 .text            initiate__10daSkip2D_cFv */
 void daSkip2D_c::initiate() {
     field_0x56c = 0;
     mpButton = NULL;
     field_0x574 = 0;
 }
 
-/* 80D4D5EC-80D4D60C 0001EC 0020+00 1/0 0/0 0/0 .text            daSkip2D_Create__FPv */
 static int daSkip2D_Create(void* i_this) {
     return static_cast<daSkip2D_c*>(i_this)->create();
 }
 
-/* 80D4D60C-80D4D62C 00020C 0020+00 1/0 0/0 0/0 .text            daSkip2D_Delete__FPv */
 static int daSkip2D_Delete(void* i_this) {
     return static_cast<daSkip2D_c*>(i_this)->destroy();
 }
 
-/* 80D4D62C-80D4D64C 00022C 0020+00 1/0 0/0 0/0 .text            daSkip2D_Execute__FPv */
 static int daSkip2D_Execute(void* i_this) {
     return static_cast<daSkip2D_c*>(i_this)->execute();
 }
 
-/* 80D4D64C-80D4D66C 00024C 0020+00 1/0 0/0 0/0 .text            daSkip2D_Draw__FPv */
 static int daSkip2D_Draw(void* i_this) {
     return static_cast<daSkip2D_c*>(i_this)->draw();
 }
 
-/* 80D4D66C-80D4D674 00026C 0008+00 1/0 0/0 0/0 .text            daSkip2D_IsDelete__FPv */
 static int daSkip2D_IsDelete(void*) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D4D6DC-80D4D6FC -00001 0020+00 1/0 0/0 0/0 .data            daSkip2D_MethodTable */
 static actor_method_class daSkip2D_MethodTable = {
     (process_method_func)daSkip2D_Create,  (process_method_func)daSkip2D_Delete,
     (process_method_func)daSkip2D_Execute, (process_method_func)daSkip2D_IsDelete,
     (process_method_func)daSkip2D_Draw,
 };
 
-/* 80D4D6FC-80D4D72C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SKIP2D */
 extern actor_process_profile_definition g_profile_SKIP2D = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp
index 5e817b955e..14971a072c 100644
--- a/src/d/actor/d_a_spinner.cpp
+++ b/src/d/actor/d_a_spinner.cpp
@@ -7,19 +7,16 @@
 
 #include "d/actor/d_a_spinner.h"
 #include "d/actor/d_a_tag_sppath.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_mirror.h"
 #include "Z2AudioLib/Z2Instances.h"
 #include "SSystem/SComponent/c_math.h"
 #include "m_Do/m_Do_controller_pad.h"
 
-/* 804D4D90-804D4D9C 000000 000C+00 9/9 0/0 0/0 .rodata          @3768 */
 static u8 const lit_3768[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 804D198C-804D1A50 0000EC 00C4+00 1/1 0/0 0/0 .text            createHeap__11daSpinner_cFv */
 int daSpinner_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x21);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -35,12 +32,10 @@ int daSpinner_c::createHeap() {
     return 1;
 }
 
-/* 804D1A50-804D1A70 0001B0 0020+00 1/1 0/0 0/0 .text daSpinner_createHeap__FP10fopAc_ac_c */
 static int daSpinner_createHeap(fopAc_ac_c* i_this) {
     return ((daSpinner_c*)i_this)->createHeap();
 }
 
-/* 804D4EA8-804D4EEC 000000 0044+00 1/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0, {{AT_TYPE_SPINNER, 1, 0x12}, {0, 0}, 0x69}},
@@ -55,7 +50,6 @@ static dCcD_SrcCyl l_cylSrc = {
     }
 };
 
-/* 804D1A70-804D1D60 0001D0 02F0+00 1/1 0/0 0/0 .text            create__11daSpinner_cFv */
 int daSpinner_c::create() {
     fopAcM_ct(this, daSpinner_c);
 
@@ -103,26 +97,21 @@ int daSpinner_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804D1FB0-804D1FD0 000710 0020+00 1/0 0/0 0/0 .text            daSpinner_Create__FP10fopAc_ac_c */
 static int daSpinner_Create(fopAc_ac_c* i_this) {
     return ((daSpinner_c*)i_this)->create();
 }
 
-/* 804D1FD0-804D21B8 000730 01E8+00 1/1 0/0 0/0 .text            __dt__11daSpinner_cFv */
 daSpinner_c::~daSpinner_c() {
     mSound.deleteObject();
     clearSpreadEffect();
     clearPathMove();
 }
 
-/* 804D21B8-804D21E0 000918 0028+00 1/0 0/0 0/0 .text            daSpinner_Delete__FP11daSpinner_c
- */
 static int daSpinner_Delete(daSpinner_c* i_this) {
     i_this->~daSpinner_c();
     return 1;
 }
 
-/* 804D21E0-804D2278 000940 0098+00 2/2 0/0 0/0 .text            setRoomInfo__11daSpinner_cFv */
 void daSpinner_c::setRoomInfo() {
     int roomNo;
     if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
@@ -138,7 +127,6 @@ void daSpinner_c::setRoomInfo() {
     fopAcM_SetRoomNo(this, roomNo);
 }
 
-/* 804D2278-804D2320 0009D8 00A8+00 2/2 0/0 0/0 .text            setMatrix__11daSpinner_cFv */
 void daSpinner_c::setMatrix() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y + field_0xa84 + 90.0f, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
@@ -149,7 +137,6 @@ void daSpinner_c::setMatrix() {
     mpModel->calc();
 }
 
-/* 804D2320-804D25F4 000A80 02D4+00 1/1 0/0 0/0 .text            setEffect__11daSpinner_cFv */
 void daSpinner_c::setEffect() {
     static JGeometry::TVec3<f32> effDirection(0.0f, 1.0f, 0.0f);
     static cXyz particleScale(1.5f, 1.5f, 1.5f);
@@ -204,7 +191,6 @@ void daSpinner_c::setEffect() {
     }
 }
 
-/* 804D25F4-804D3048 000D54 0A54+00 1/1 0/0 0/0 .text            posMove__11daSpinner_cFv */
 int daSpinner_c::posMove() {
     daAlink_c* player = daAlink_getAlinkActorClass();
     
@@ -367,7 +353,6 @@ int daSpinner_c::posMove() {
     return 1;
 }
 
-/* 804D3090-804D3174 0017F0 00E4+00 3/3 0/0 0/0 .text            setReflectAngle__11daSpinner_cFv */
 void daSpinner_c::setReflectAngle() {
     if (mpPathMove != NULL) {
         current.angle.y += 0x8000;
@@ -389,7 +374,6 @@ void daSpinner_c::setReflectAngle() {
     } 
 }
 
-/* 804D3174-804D3468 0018D4 02F4+00 1/1 0/0 0/0 .text            setWallHit__11daSpinner_cFsUl */
 void daSpinner_c::setWallHit(s16 param_0, u32 param_1) {
     field_0xa80 = param_0;
     setReflectAngle();
@@ -422,7 +406,6 @@ void daSpinner_c::setWallHit(s16 param_0, u32 param_1) {
     }
 }
 
-/* 804D34B0-804D3618 001C10 0168+00 1/1 0/0 0/0 .text            setAnm__11daSpinner_cFv */
 void daSpinner_c::setAnm() {
     if (mBck.isStop() && mTrigJump) {
         mBck.init(mpSpoutBck, 1, -1, 1.0f, 0, -1, true);
@@ -449,7 +432,6 @@ void daSpinner_c::setAnm() {
     }
 }
 
-/* 804D3618-804D3694 001D78 007C+00 2/2 0/0 0/0 .text            setNextPathNum__11daSpinner_cFv */
 int daSpinner_c::setNextPathNum() {
     if (mPathNo == 0 && mPathDirection == -1) {
         mPathNo = mpPathMove->m_num - 1;
@@ -463,7 +445,6 @@ int daSpinner_c::setNextPathNum() {
     return 0;
 }
 
-/* 804D3694-804D36F4 001DF4 0060+00 1/1 0/0 0/0 .text            getPathNextPos__11daSpinner_cFv */
 Vec* daSpinner_c::getPathNextPos() {
     int next_point_no = mPathNo + mPathDirection;
     if (next_point_no < 0) {
@@ -477,8 +458,6 @@ Vec* daSpinner_c::getPathNextPos() {
     return &mpPathMove->m_points[next_point_no].m_position;
 }
 
-/* 804D36F4-804D3774 001E54 0080+00 1/1 0/0 0/0 .text checkLineWallHit__11daSpinner_cFP4cXyzP4cXyz
- */
 int daSpinner_c::checkLineWallHit(cXyz* i_start, cXyz* i_end) {
     mLinChk.Set(i_start, i_end, this);
     if (dComIfG_Bgsp().LineCross(&mLinChk)) {
@@ -490,7 +469,6 @@ int daSpinner_c::checkLineWallHit(cXyz* i_start, cXyz* i_end) {
     return 0;
 }
 
-/* 804D3774-804D3D60 001ED4 05EC+00 1/1 0/0 0/0 .text            checkPathMove__11daSpinner_cFv */
 int daSpinner_c::checkPathMove() {
     if (mpPathMove != NULL) {
         return 1;
@@ -627,7 +605,6 @@ int daSpinner_c::checkPathMove() {
     return 0;
 }
 
-/* 804D3D60-804D3F14 0024C0 01B4+00 1/1 0/0 0/0 .text            setSpreadEffect__11daSpinner_cFv */
 void daSpinner_c::setSpreadEffect() {
     u32* emitter_id = mSpreadEmitterIDs;
 
@@ -653,8 +630,6 @@ void daSpinner_c::setSpreadEffect() {
     }
 }
 
-/* 804D3F14-804D3F8C 002674 0078+00 2/2 0/0 0/0 .text            clearSpreadEffect__11daSpinner_cFv
- */
 void daSpinner_c::clearSpreadEffect() {
     for (int i = 0; i < 2; i++) {
         JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mSpreadEmitterIDs[i]);
@@ -664,7 +639,6 @@ void daSpinner_c::clearSpreadEffect() {
     }
 }
 
-/* 804D3F8C-804D4B94 0026EC 0C08+00 1/1 0/0 0/0 .text            execute__11daSpinner_cFv */
 int daSpinner_c::execute() {
     if (mDeleteFlg) {
         clearSpreadEffect();
@@ -925,13 +899,10 @@ int daSpinner_c::execute() {
     return 1;
 }
 
-/* 804D4B94-804D4BB4 0032F4 0020+00 1/0 0/0 0/0 .text            daSpinner_Execute__FP11daSpinner_c
- */
 static int daSpinner_Execute(daSpinner_c* i_this) {
     return i_this->execute();
 }
 
-/* 804D4BB4-804D4D08 003314 0154+00 1/1 0/0 0/0 .text            draw__11daSpinner_cFv */
 int daSpinner_c::draw() {
     g_env_light.settingTevStruct(0, &current.pos, &tevStr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr);
@@ -951,12 +922,10 @@ int daSpinner_c::draw() {
     return 1;
 }
 
-/* 804D4D08-804D4D28 003468 0020+00 1/0 0/0 0/0 .text            daSpinner_Draw__FP11daSpinner_c */
 static int daSpinner_Draw(daSpinner_c* i_this) {
     return i_this->draw();
 }
 
-/* 804D4EEC-804D4F0C -00001 0020+00 1/0 0/0 0/0 .data            l_daSpinner_Method */
 static actor_method_class l_daSpinner_Method = {
     (process_method_func)daSpinner_Create,
     (process_method_func)daSpinner_Delete,
@@ -965,7 +934,6 @@ static actor_method_class l_daSpinner_Method = {
     (process_method_func)daSpinner_Draw,
 };
 
-/* 804D4F0C-804D4F3C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SPINNER */
 extern actor_process_profile_definition g_profile_SPINNER = {
   fpcLy_CURRENT_e,       // mLayerID
   4,                     // mListID
diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp
index b0cb93f81d..de4faf2a17 100644
--- a/src/d/actor/d_a_sq.cpp
+++ b/src/d/actor/d_a_sq.cpp
@@ -13,19 +13,14 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 805A1330-805A1334 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool hioInit;
 
-/* 805A1340-805A1370 000018 0030+00 8/8 0/0 0/0 .bss             l_HIO */
 static daSq_HIO_c l_HIO;
 
-/* 805A11E8-805A11F8 000000 0010+00 2/2 0/0 0/0 .data            wait_bck */
 static u32 wait_bck[4] = {9, 10, 11, 12};
 
-/* 805A11F8-805A1204 000010 000C+00 1/1 0/0 0/0 .data            carry_wait_bck */
 static u32 carry_wait_bck[3] = {9, 9, 9};
 
-/* 8059F66C-8059F6D8 0000EC 006C+00 1/1 0/0 0/0 .text            __ct__10daSq_HIO_cFv */
 daSq_HIO_c::daSq_HIO_c() {
     field_0x4 = -1;
     mScale = 2.0f;
@@ -40,7 +35,6 @@ daSq_HIO_c::daSq_HIO_c() {
     field_0x2c = 17.0f;
 }
 
-/* 8059F6D8-8059F808 000158 0130+00 5/5 0/0 0/0 .text            anm_init__FP8sq_classifUcfi */
 static void anm_init(sq_class* i_this, int i_bck, f32 i_morf, u8 i_mode, f32 i_speed, int i_bas) {
     if (i_this->field_0x60c > 1.0f) {
         return;
@@ -56,7 +50,6 @@ static void anm_init(sq_class* i_this, int i_bck, f32 i_morf, u8 i_mode, f32 i_s
     }
 }
 
-/* 8059F808-8059F900 000288 00F8+00 1/0 0/0 0/0 .text            daSq_Draw__FP8sq_class */
 static int daSq_Draw(sq_class* i_this) {
     J3DModel* model = i_this->mpMorf->getModel();
     g_env_light.settingTevStruct(0, &i_this->current.pos, &i_this->tevStr);
@@ -72,7 +65,6 @@ static int daSq_Draw(sq_class* i_this) {
     return 1;
 }
 
-/* 8059F900-8059F9FC 000380 00FC+00 2/2 0/0 0/0 .text            way_bg_check__FP8sq_class */
 static BOOL way_bg_check(sq_class* i_this) {
     fopAc_ac_c* _this = static_cast<fopAc_ac_c*>(i_this);
     cXyz vec1, vec2, vec3;
@@ -93,14 +85,12 @@ static BOOL way_bg_check(sq_class* i_this) {
     }
 }
 
-/* 8059F9FC-8059FA68 00047C 006C+00 2/2 0/0 0/0 .text            turn_set__FP8sq_class */
 static void turn_set(sq_class* i_this) {
     s16 angle_table[3] = {-0x8000, 0x4000, -0x4000};
     s16 angle = angle_table[(int)cM_rndF(2.99f)];
     i_this->mTargetAngleY = i_this->current.angle.y + angle;
 }
 
-/* 8059FA68-8059FE50 0004E8 03E8+00 1/1 0/0 0/0 .text            sq_normal__FP8sq_class */
 static void sq_normal(sq_class* i_this) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     f32 target_speed = 0.0f;
@@ -188,7 +178,6 @@ static void sq_normal(sq_class* i_this) {
     }
 }
 
-/* 8059FE50-805A0024 0008D0 01D4+00 1/1 0/0 0/0 .text            sq_away__FP8sq_class */
 static void sq_away(sq_class* i_this) {
     f32 target_speed = 0.0f;
     cXyz player_delta = i_this->current.pos - dComIfGp_getPlayer(0)->current.pos;
@@ -227,7 +216,6 @@ static void sq_away(sq_class* i_this) {
     cLib_addCalcAngleS2(&i_this->current.angle.y, i_this->mTargetAngleY, 2, 0x3000);
 }
 
-/* 805A0024-805A0160 000AA4 013C+00 1/1 0/0 0/0 .text            sq_carry__FP8sq_class */
 static void sq_carry(sq_class* i_this) {
     i_this->mCcSph.OffCoSetBit();
     i_this->speed.y = 0.0f;
@@ -260,7 +248,6 @@ static void sq_carry(sq_class* i_this) {
     }
 }
 
-/* 805A0160-805A021C 000BE0 00BC+00 1/1 0/0 0/0 .text            sq_fly__FP8sq_class */
 static void sq_fly(sq_class* i_this) {
     switch (i_this->mMode) {
     case 0:
@@ -280,7 +267,6 @@ static void sq_fly(sq_class* i_this) {
     }
 }
 
-/* 805A021C-805A037C 000C9C 0160+00 1/1 0/0 0/0 .text            sq_message__FP8sq_class */
 static void sq_message(sq_class* i_this) {
     int anm;
     f32 rnd;
@@ -313,7 +299,6 @@ static void sq_message(sq_class* i_this) {
     }
 }
 
-/* 805A037C-805A06A4 000DFC 0328+00 1/1 0/0 0/0 .text            action__FP8sq_class */
 static void action(sq_class* i_this) {
     cXyz vec1, vec2;
     i_this->gravity = -7.0f;
@@ -399,7 +384,6 @@ static void action(sq_class* i_this) {
     i_this->shape_angle.z = i_this->current.angle.z;
 }
 
-/* 805A06A4-805A07C8 001124 0124+00 1/1 0/0 0/0 .text            message__FP8sq_class */
 static int message(sq_class* i_this) {
     if (i_this->mIsTalking != 0) {
         i_this->mMessageTimer = 10;
@@ -427,7 +411,6 @@ static int message(sq_class* i_this) {
     return 0;
 }
 
-/* 805A07C8-805A09EC 001248 0224+00 2/1 0/0 0/0 .text            daSq_Execute__FP8sq_class */
 static int daSq_Execute(sq_class* i_this) {
     cXyz vec(0.0f, 0.0f, 0.0f);
     cLib_addCalc2(&i_this->scale.x, 1.0f, 1.0f, 0.25f);
@@ -473,12 +456,10 @@ static int daSq_Execute(sq_class* i_this) {
     return 1;
 }
 
-/* 805A09EC-805A09F4 00146C 0008+00 1/0 0/0 0/0 .text            daSq_IsDelete__FP8sq_class */
 static int daSq_IsDelete(sq_class* i_this) {
     return 1;
 }
 
-/* 805A09F4-805A0A48 001474 0054+00 1/0 0/0 0/0 .text            daSq_Delete__FP8sq_class */
 static int daSq_Delete(sq_class* i_this) {
     dComIfG_resDelete(&i_this->mPhaseReq, "Sq");
     if (i_this->mHIOInit) {
@@ -487,7 +468,6 @@ static int daSq_Delete(sq_class* i_this) {
     return 1;
 }
 
-/* 805A0A48-805A0BE8 0014C8 01A0+00 1/1 0/0 0/0 .text            useHeapInit__FP10fopAc_ac_c */
 static int useHeapInit(fopAc_ac_c* i_this) {
     sq_class* _this = static_cast<sq_class*>(i_this);
     
@@ -508,7 +488,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
                                  1, 0, 1.0f, 0, -1) ? 1 : 0;
 }
 
-/* 805A0C30-805A0FB0 0016B0 0380+00 1/0 0/0 0/0 .text            daSq_Create__FP10fopAc_ac_c */
 static cPhs__Step daSq_Create(fopAc_ac_c* i_this) {
     sq_class* _this = static_cast<sq_class*>(i_this);
     fopAcM_ct(i_this, sq_class);
@@ -596,7 +575,6 @@ static cPhs__Step daSq_Create(fopAc_ac_c* i_this) {
     return step;
 }
 
-/* 805A1284-805A12A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daSq_Method */
 static actor_method_class l_daSq_Method = {
     (process_method_func)daSq_Create,
     (process_method_func)daSq_Delete,
@@ -605,7 +583,6 @@ static actor_method_class l_daSq_Method = {
     (process_method_func)daSq_Draw,
 };
 
-/* 805A12A4-805A12D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SQ */
 extern actor_process_profile_definition g_profile_SQ = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp
index 6eba1b9b7d..c27b839a89 100644
--- a/src/d/actor/d_a_startAndGoal.cpp
+++ b/src/d/actor/d_a_startAndGoal.cpp
@@ -10,7 +10,6 @@
 #include "d/d_meter2_info.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80D4D7B8-80D4D84C 000078 0094+00 1/1 0/0 0/0 .text chkPassed2__21daStartAndGoal_Path_cF4cXyz */
 BOOL daStartAndGoal_Path_c::chkPassed2(cXyz i_checkPos) {
     int var_r31 = 0;
     while (var_r31 < 1) {
@@ -27,7 +26,6 @@ BOOL daStartAndGoal_Path_c::chkPassed2(cXyz i_checkPos) {
     return var_r31 > 0;
 }
 
-/* 80D4D84C-80D4D884 00010C 0038+00 1/1 0/0 0/0 .text            getType__16daStartAndGoal_cFv */
 int daStartAndGoal_c::getType() {
     switch (fopAcM_GetParam(this) & 0xFF) {
     case 0:
@@ -39,21 +37,18 @@ int daStartAndGoal_c::getType() {
     }
 }
 
-/* ############################################################################################## */
 struct timer_info {
     /* 0x0 */ s32 mode;
     /* 0x4 */ u8 type;
     /* 0x5 */ u8 field_0x5;
 };
 
-/* 80D4DECC-80D4DEE4 000000 0018+00 4/4 0/0 0/0 .data            l_timerType */
 static timer_info l_timerType[] = {
     {3, 0, 1},
     {4, 2, 0},
     {3, 1, 1},
 };
 
-/* 80D4D884-80D4D928 000144 00A4+00 1/1 0/0 0/0 .text            Create__16daStartAndGoal_cFv */
 int daStartAndGoal_c::Create() {
     fopAcM_ct(this, daStartAndGoal_c);
 
@@ -63,10 +58,8 @@ int daStartAndGoal_c::Create() {
 
 daStartAndGoal_Path_c::~daStartAndGoal_Path_c() {}
 
-/* 80D4DEB8-80D4DEBC 000000 0001+03 1/1 0/0 0/0 .rodata          l_DATA */
 static const u8 l_DATA[1] = {0};  // unused
 
-/* 80D4D998-80D4DA68 000258 00D0+00 1/1 0/0 0/0 .text            init__16daStartAndGoal_cFv */
 void daStartAndGoal_c::init() {
     field_0xb98 = 1;
     mStarted = false;
@@ -84,8 +77,6 @@ void daStartAndGoal_c::init() {
     mAction = 0;
 }
 
-/* 80D4DA68-80D4DB30 000328 00C8+00 1/1 0/0 0/0 .text            actorPosCheck__16daStartAndGoal_cFv
- */
 void daStartAndGoal_c::actorPosCheck() {
     cXyz pos(daPy_getPlayerActorClass()->current.pos);
     if (mPath.chkPassed2(pos)) {
@@ -100,7 +91,6 @@ void daStartAndGoal_c::actorPosCheck() {
     }
 }
 
-/* 80D4DB30-80D4DBAC 0003F0 007C+00 0/0 0/0 2/2 .text readyStartTimer__16daStartAndGoal_cFv */
 int daStartAndGoal_c::readyStartTimer() {
     if (dComIfG_TimerStart(l_timerType[mType].mode, 0)) {
         mAction = 1;
@@ -111,14 +101,10 @@ int daStartAndGoal_c::readyStartTimer() {
     return 0;
 }
 
-/* 80D4DBAC-80D4DBD0 00046C 0024+00 1/1 0/0 2/2 .text            isStartCheck__16daStartAndGoal_cFv
- */
 BOOL daStartAndGoal_c::isStartCheck() {
     return dTimer_isStart();
 }
 
-/* 80D4DBD0-80D4DC50 000490 0080+00 1/1 0/0 0/0 .text            isReadyCheck__16daStartAndGoal_cFv
- */
 BOOL daStartAndGoal_c::isReadyCheck() {
     if (mStarted) {
         return TRUE;
@@ -135,7 +121,6 @@ BOOL daStartAndGoal_c::isReadyCheck() {
     return dTimer_isStart();
 }
 
-/* 80D4DC50-80D4DCF4 000510 00A4+00 1/1 0/0 0/0 .text            Execute__16daStartAndGoal_cFv */
 int daStartAndGoal_c::Execute() {
     switch (mAction) {
     case 0:
@@ -161,12 +146,10 @@ int daStartAndGoal_c::Execute() {
     return 1;
 }
 
-/* 80D4DCF4-80D4DCFC 0005B4 0008+00 1/1 0/0 0/0 .text            Draw__16daStartAndGoal_cFv */
 int daStartAndGoal_c::Draw() {
     return 1;
 }
 
-/* 80D4DCFC-80D4DD80 0005BC 0084+00 1/1 0/0 0/0 .text            Delete__16daStartAndGoal_cFv */
 int daStartAndGoal_c::Delete() {
     if (field_0xb98 == 1) {
         dComIfG_TimerDeleteRequest(l_timerType[mType].mode);
@@ -179,42 +162,32 @@ int daStartAndGoal_c::Delete() {
     return 1;
 }
 
-/* 80D4DD80-80D4DDA0 000640 0020+00 1/0 0/0 0/0 .text daStartAndGoal_Execute__FP16daStartAndGoal_c
- */
 static int daStartAndGoal_Execute(daStartAndGoal_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D4DDA0-80D4DDC0 000660 0020+00 1/0 0/0 0/0 .text daStartAndGoal_Draw__FP16daStartAndGoal_c */
 static int daStartAndGoal_Draw(daStartAndGoal_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D4DDC0-80D4DDC8 000680 0008+00 1/0 0/0 0/0 .text
- * daStartAndGoal_IsDelete__FP16daStartAndGoal_c                */
 static int daStartAndGoal_IsDelete(daStartAndGoal_c* i_this) {
     return 1;
 }
 
-/* 80D4DDC8-80D4DDE8 000688 0020+00 1/0 0/0 0/0 .text daStartAndGoal_Delete__FP16daStartAndGoal_c
- */
 static int daStartAndGoal_Delete(daStartAndGoal_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D4DDE8-80D4DE08 0006A8 0020+00 1/0 0/0 0/0 .text daStartAndGoal_create__FP10fopAc_ac_c */
 static int daStartAndGoal_create(fopAc_ac_c* i_this) {
     return static_cast<daStartAndGoal_c*>(i_this)->Create();
 }
 
-/* 80D4DEE4-80D4DF04 -00001 0020+00 1/0 0/0 0/0 .data            l_daStartAndGoal_Method */
 static actor_method_class l_daStartAndGoal_Method = {
     (process_method_func)daStartAndGoal_create,  (process_method_func)daStartAndGoal_Delete,
     (process_method_func)daStartAndGoal_Execute, (process_method_func)daStartAndGoal_IsDelete,
     (process_method_func)daStartAndGoal_Draw,
 };
 
-/* 80D4DF04-80D4DF34 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_START_AND_GOAL */
 extern actor_process_profile_definition g_profile_START_AND_GOAL = {
     fpcLy_CURRENT_e,
     9,
diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp
index efbf3ba22d..74f07e4750 100644
--- a/src/d/actor/d_a_suspend.cpp
+++ b/src/d/actor/d_a_suspend.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_suspend.h"
 #include "d/d_procname.h"
 
-/* 804D5118-804D51E0 000078 00C8+00 1/1 0/0 0/0 .text            create__7daSus_cFv */
 int daSus_c::create() {
     s8 roomNo = fopAcM_GetRoomNo(this);
 
@@ -34,19 +33,15 @@ int daSus_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804D51E0-804D5234 000140 0054+00 1/0 0/0 0/0 .text            daSus_create__FP7daSus_c */
 static int daSus_create(daSus_c* i_this) {
     fopAcM_ct(i_this, daSus_c);
 
     return i_this->create();
 }
-/* ############################################################################################## */
-/* 804D524C-804D526C -00001 0020+00 1/0 0/0 0/0 .data            daSus_METHODS */
 static actor_method_class daSus_METHODS = {
     (process_method_func)daSus_create, NULL, NULL, NULL, NULL,
 };
 
-/* 804D526C-804D529C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SUSPEND */
 extern actor_process_profile_definition g_profile_SUSPEND = {
     fpcLy_CURRENT_e,
     11,
diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp
index 8d5dbe0ca2..7416f25cab 100644
--- a/src/d/actor/d_a_swBall.cpp
+++ b/src/d/actor/d_a_swBall.cpp
@@ -11,13 +11,10 @@
 #include "d/d_lib.h"
 #include "d/d_s_play.h"
 
-/* 80D4EA50-80D4EA70 000000 0020+00 2/2 0/0 0/0 .bss             l_target_info */
 static fopAc_ac_c* l_target_info[8];
 
-/* 80D4EA70-80D4EA74 000020 0004+00 2/2 0/0 0/0 .bss             l_target_info_count */
 static int l_target_info_count;
 
-/* 80D4DFD8-80D4E054 000078 007C+00 1/1 0/0 0/0 .text            s_ball_sub__FPvPv */
 static void* s_ball_sub(void* i_actor, void* i_data) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Carry && ((daObjCarry_c*)i_actor)->getType() == daObjCarry_c::TYPE_LV8_BALL) {
         if (l_target_info_count < 8) {
@@ -32,7 +29,6 @@ static void* s_ball_sub(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80D4E054-80D4E194 0000F4 0140+00 2/2 0/0 0/0 .text checkArea_sub__10daSwBall_cFP10fopAc_ac_c */
 BOOL daSwBall_c::checkArea_sub(fopAc_ac_c* i_ball) {
     if (getType() == 0) {
         if (i_ball->current.pos.y >= current.pos.y - 10.0f && i_ball->current.pos.y < current.pos.y + (100.0f * scale.y) && fopAcM_searchActorDistanceXZ(this, i_ball) < (100.0f * scale.x)) {
@@ -52,7 +48,6 @@ BOOL daSwBall_c::checkArea_sub(fopAc_ac_c* i_ball) {
     return FALSE;
 }
 
-/* 80D4E194-80D4E248 000234 00B4+00 2/2 0/0 0/0 .text            checkArea__10daSwBall_cFv */
 BOOL daSwBall_c::checkArea() {
     fopAc_ac_c* ball_actors[8];
 
@@ -71,7 +66,6 @@ BOOL daSwBall_c::checkArea() {
     return FALSE;
 }
 
-/* 80D4E248-80D4E374 0002E8 012C+00 1/1 0/0 0/0 .text            search_ball__10daSwBall_cFv */
 void daSwBall_c::search_ball() {
     l_target_info_count = 0;
 
@@ -106,7 +100,6 @@ void daSwBall_c::search_ball() {
     }
 }
 
-/* 80D4E374-80D4E42C 000414 00B8+00 1/1 0/0 0/0 .text            Create__10daSwBall_cFv */
 int daSwBall_c::Create() {
     for (int i = 0; i < 8; i++) {
         mBallIDs[i] = fpcM_ERROR_PROCESS_ID_e;
@@ -131,7 +124,6 @@ int daSwBall_c::Create() {
     return 1;
 }
 
-/* 80D4E42C-80D4E494 0004CC 0068+00 1/1 0/0 0/0 .text            create__10daSwBall_cFv */
 int daSwBall_c::create() {
     fopAcM_ct(this, daSwBall_c);
 
@@ -142,7 +134,6 @@ int daSwBall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D4E494-80D4E524 000534 0090+00 2/2 0/0 0/0 .text            execute__10daSwBall_cFv */
 int daSwBall_c::execute() {
     static void (daSwBall_c::*l_func[])() = {
         &daSwBall_c::actionRun,
@@ -153,7 +144,6 @@ int daSwBall_c::execute() {
     return 1;
 }
 
-/* 80D4E524-80D4E6C4 0005C4 01A0+00 1/0 0/0 0/0 .text            actionRun__10daSwBall_cFv */
 void daSwBall_c::actionRun() {
     search_ball();
     BOOL in_area = checkArea();
@@ -204,10 +194,8 @@ void daSwBall_c::actionRun() {
     PutCrrPos();
 }
 
-/* 80D4E6C4-80D4E6C8 000764 0004+00 1/0 0/0 0/0 .text            actionStop__10daSwBall_cFv */
 void daSwBall_c::actionStop() {}
 
-/* 80D4E6C8-80D4E90C 000768 0244+00 1/1 0/0 0/0 .text            PutCrrPos__10daSwBall_cFv */
 void daSwBall_c::PutCrrPos() {
     if (checkPullLBall()) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -266,34 +254,28 @@ void daSwBall_c::PutCrrPos() {
     }
 }
 
-/* 80D4E90C-80D4E914 0009AC 0008+00 1/1 0/0 0/0 .text            _delete__10daSwBall_cFv */
 int daSwBall_c::_delete() {
     return 1;
 }
 
-/* 80D4E914-80D4E934 0009B4 0020+00 1/0 0/0 0/0 .text            daSwBall_Execute__FP10daSwBall_c */
 static int daSwBall_Execute(daSwBall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D4E934-80D4E954 0009D4 0020+00 1/0 0/0 0/0 .text            daSwBall_Delete__FP10daSwBall_c */
 static int daSwBall_Delete(daSwBall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D4E954-80D4E974 0009F4 0020+00 1/0 0/0 0/0 .text            daSwBall_Create__FP10fopAc_ac_c */
 static int daSwBall_Create(fopAc_ac_c* i_this) {
     return ((daSwBall_c*)i_this)->create();
 }
 
-/* 80D4E9FC-80D4EA1C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwBall_Method */
 static actor_method_class l_daSwBall_Method = {
     (process_method_func)daSwBall_Create,
     (process_method_func)daSwBall_Delete,
     (process_method_func)daSwBall_Execute,
 };
 
-/* 80D4EA1C-80D4EA4C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SwBall */
 extern actor_process_profile_definition g_profile_SwBall = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp
index 60e97df99e..0940fd6d45 100644
--- a/src/d/actor/d_a_swLBall.cpp
+++ b/src/d/actor/d_a_swLBall.cpp
@@ -13,14 +13,10 @@
 #include "d/d_lib.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* ############################################################################################## */
-/* 80D4F5A0-80D4F5A8 000000 0008+00 2/2 0/0 0/0 .bss             l_target_info */
 static daObjCarry_c* l_target_info[2];
 
-/* 80D4F5A8-80D4F5AC 000008 0004+00 2/2 0/0 0/0 .bss             l_target_info_count */
 static int l_target_info_count;
 
-/* 80D4EAF8-80D4EB8C 000078 0094+00 1/1 0/0 0/0 .text            s_lb_sub__FPvPv */
 static void* s_lb_sub(void* param_1, void* param_2) {
     if ((fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_Obj_Carry) &&
         static_cast<daObjCarry_c*>(param_1)->prm_chk_type_lightball())
@@ -33,8 +29,6 @@ static void* s_lb_sub(void* param_1, void* param_2) {
     return 0;
 }
 
-/* 80D4EB8C-80D4ECCC 00010C 0140+00 2/2 0/0 0/0 .text checkArea_sub__11daSwLBall_cFP10fopAc_ac_c
- */
 int daSwLBall_c::checkArea_sub(fopAc_ac_c* param_1) {
     if (getType() == 0) {
         if (param_1->current.pos.y >= current.pos.y - 10.0f &&
@@ -57,7 +51,6 @@ int daSwLBall_c::checkArea_sub(fopAc_ac_c* param_1) {
     return 0;
 }
 
-/* 80D4ECCC-80D4ED80 00024C 00B4+00 1/1 0/0 0/0 .text            checkArea__11daSwLBall_cFv */
 int daSwLBall_c::checkArea() {
     fopAc_ac_c* actors[4];
     for (int i = 0; i < 2; i++) {
@@ -73,7 +66,6 @@ int daSwLBall_c::checkArea() {
     return 0;
 }
 
-/* 80D4ED80-80D4EEAC 000300 012C+00 2/2 0/0 0/0 .text            search_lb__11daSwLBall_cFv */
 void daSwLBall_c::search_lb() {
     l_target_info_count = 0;
     for (int i = 0; i < 2; i++) {
@@ -104,7 +96,6 @@ void daSwLBall_c::search_lb() {
     }
 }
 
-/* 80D4EEAC-80D4EEF8 00042C 004C+00 1/1 0/0 0/0 .text            Create__11daSwLBall_cFv */
 int daSwLBall_c::Create() {
     for (int i = 0; i < 2; i++) {
         mProcIds[i] = -1;
@@ -114,7 +105,6 @@ int daSwLBall_c::Create() {
     return 1;
 }
 
-/* 80D4EEF8-80D4EF60 000478 0068+00 1/1 0/0 0/0 .text            create__11daSwLBall_cFv */
 int daSwLBall_c::create() {
     fopAcM_ct(this, daSwLBall_c);
     if (!Create()) {
@@ -123,7 +113,6 @@ int daSwLBall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D4EF60-80D4F008 0004E0 00A8+00 2/2 0/0 0/0 .text            execute__11daSwLBall_cFv */
 int daSwLBall_c::execute() {
     static actionFunc funcs[3] = {
         &daSwLBall_c::actionInit,
@@ -135,7 +124,6 @@ int daSwLBall_c::execute() {
     return 1;
 }
 
-/* 80D4F008-80D4F080 000588 0078+00 1/0 0/0 0/0 .text            actionInit__11daSwLBall_cFv */
 void daSwLBall_c::actionInit() {
     search_lb();
     if (getArg0() == 1 && fopAcM_isSwitch(this, getSwbit())) {
@@ -146,7 +134,6 @@ void daSwLBall_c::actionInit() {
     setAction(ACTION_RUN);
 }
 
-/* 80D4F080-80D4F220 000600 01A0+00 1/0 0/0 0/0 .text            actionRun__11daSwLBall_cFv */
 void daSwLBall_c::actionRun() {
     search_lb();
     int isArea = checkArea();
@@ -193,11 +180,9 @@ void daSwLBall_c::actionRun() {
     PutCrrPos();
 }
 
-/* 80D4F220-80D4F224 0007A0 0004+00 1/0 0/0 0/0 .text            actionStop__11daSwLBall_cFv */
 void daSwLBall_c::actionStop() {
 }
 
-/* 80D4F224-80D4F444 0007A4 0220+00 1/1 0/0 0/0 .text            PutCrrPos__11daSwLBall_cFv */
 void daSwLBall_c::PutCrrPos() {
     if (checkPullLBall()) {
         daPy_py_c* player = daPy_getPlayerActorClass();
@@ -245,30 +230,22 @@ void daSwLBall_c::PutCrrPos() {
     }
 }
 
-/* 80D4F444-80D4F44C 0009C4 0008+00 1/1 0/0 0/0 .text            _delete__11daSwLBall_cFv */
 int daSwLBall_c::_delete() {
     return 1;
 }
 
-/* 80D4F44C-80D4F46C 0009CC 0020+00 1/0 0/0 0/0 .text            daSwLBall_Execute__FP11daSwLBall_c
- */
 static int daSwLBall_Execute(daSwLBall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D4F46C-80D4F48C 0009EC 0020+00 1/0 0/0 0/0 .text            daSwLBall_Delete__FP11daSwLBall_c
- */
 static int daSwLBall_Delete(daSwLBall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D4F48C-80D4F4AC 000A0C 0020+00 1/0 0/0 0/0 .text            daSwLBall_Create__FP10fopAc_ac_c */
 static int daSwLBall_Create(fopAc_ac_c* i_this) {
     return static_cast<daSwLBall_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80D4F54C-80D4F56C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwLBall_Method */
 static actor_method_class l_daSwLBall_Method = {
     (process_method_func)daSwLBall_Create,
     (process_method_func)daSwLBall_Delete,
@@ -277,7 +254,6 @@ static actor_method_class l_daSwLBall_Method = {
     NULL,
 };
 
-/* 80D4F56C-80D4F59C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SwLBall */
 extern actor_process_profile_definition g_profile_SwLBall = {
   fpcLy_CURRENT_e,        // mLayerID
   7,                      // mListID
diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp
index bd6a32c874..6064cb669b 100644
--- a/src/d/actor/d_a_swTime.cpp
+++ b/src/d/actor/d_a_swTime.cpp
@@ -9,7 +9,6 @@
 #include "d/d_procname.h"
 
 
-/* 80D4F638-80D4F660 000078 0028+00 1/1 0/0 0/0 .text            Create__10daSwTime_cFv */
 int daSwTime_c::Create() {
     mTime = getTime();
     mSwbit = getSwbit();
@@ -17,7 +16,6 @@ int daSwTime_c::Create() {
     return 1;
 }
 
-/* 80D4F660-80D4F6C8 0000A0 0068+00 1/1 0/0 0/0 .text            create__10daSwTime_cFv */
 int daSwTime_c::create() {
     fopAcM_ct(this, daSwTime_c);
     if (!Create()) {
@@ -26,7 +24,6 @@ int daSwTime_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D4F6C8-80D4F758 000108 0090+00 1/1 0/0 0/0 .text            execute__10daSwTime_cFv */
 int daSwTime_c::execute() {
     if (mSwbit2 != 0xFF && !fopAcM_isSwitch(this,mSwbit2)) {
         return 1;
@@ -39,35 +36,28 @@ int daSwTime_c::execute() {
     return 1;
 }
 
-/* 80D4F758-80D4F760 000198 0008+00 1/1 0/0 0/0 .text            _delete__10daSwTime_cFv */
 int daSwTime_c::_delete() {
     return 1;
 }
 
-/* 80D4F760-80D4F780 0001A0 0020+00 1/0 0/0 0/0 .text            daSwTime_Execute__FP10daSwTime_c */
 static int daSwTime_Execute(daSwTime_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D4F780-80D4F7A0 0001C0 0020+00 1/0 0/0 0/0 .text            daSwTime_Delete__FP10daSwTime_c */
 static int daSwTime_Delete(daSwTime_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D4F7A0-80D4F7C0 0001E0 0020+00 1/0 0/0 0/0 .text            daSwTime_Create__FP10daSwTime_c */
 static int daSwTime_Create(daSwTime_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80D4F7C8-80D4F7E8 -00001 0020+00 1/0 0/0 0/0 .data            l_daSwTime_Method */
 static actor_method_class l_daSwTime_Method = {
     (process_method_func)daSwTime_Create,
     (process_method_func)daSwTime_Delete,
     (process_method_func)daSwTime_Execute
 };
 
-/* 80D4F7E8-80D4F818 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SwTime */
 extern actor_process_profile_definition g_profile_SwTime = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp
index 7cb3fda6ca..96c53a8ee5 100644
--- a/src/d/actor/d_a_swc00.cpp
+++ b/src/d/actor/d_a_swc00.cpp
@@ -10,11 +10,9 @@
 #include "d/actor/d_a_horse.h"
 #include "d/d_debug_viewer.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 805A13F8-805A15DC 000078 01E4+00 1/1 0/0 0/0 .text            hitCheck__FP9daSwc00_c */
 static BOOL hitCheck(daSwc00_c* i_swc) {
     fopAc_ac_c* a_this = i_swc;
     fopAc_ac_c* playerAc = daPy_getPlayerActorClass();
@@ -83,7 +81,6 @@ int daSwc00_Draw(daSwc00_c* i_this) {
 
 #endif
 
-/* 805A15DC-805A15FC 00025C 0020+00 1/0 0/0 0/0 .text            daSwc00_Execute__FP9daSwc00_c */
 static int daSwc00_Execute(daSwc00_c* i_this) {
     return i_this->execute();
 }
@@ -100,7 +97,6 @@ inline static int daSwc00_getSw2No(daSwc00_c* i_this) {
     return (fopAcM_GetParam(i_this) >> 8) & 0xff; 
 }
 
-/* 805A15FC-805A18E8 00027C 02EC+00 2/1 0/0 0/0 .text            execute__9daSwc00_cFv */
 int daSwc00_c::execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     u8 condition = daSwc00_getCondition(this);
@@ -196,7 +192,6 @@ int daSwc00_c::execute() {
     return 1;
 }
 
-/* 805A18E8-805A19A4 000568 00BC+00 1/1 0/0 0/0 .text            event_proc_call__9daSwc00_cFv */
 void daSwc00_c::event_proc_call() {
     static daSwc00_c::actionFunc l_func[4] = {
         &daSwc00_c::actionWait,
@@ -211,7 +206,6 @@ static inline u8 daSwc00_getEvID(daSwc00_c* i_this) {
     return fopAcM_GetParam(i_this) >> 24;
 }
 
-/* 805A19A4-805A1A28 000624 0084+00 1/0 0/0 0/0 .text            actionWait__9daSwc00_cFv */
 void daSwc00_c::actionWait() {
     if (field_0x584 != 0) {
         if (daSwc00_getEvID(this) != 0xff) {
@@ -225,7 +219,6 @@ void daSwc00_c::actionWait() {
     }
 }
 
-/* 805A1A28-805A1A94 0006A8 006C+00 1/0 0/0 0/0 .text            actionOrderEvent__9daSwc00_cFv */
 void daSwc00_c::actionOrderEvent() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(ACTION_EVENT);
@@ -235,7 +228,6 @@ void daSwc00_c::actionOrderEvent() {
     }
 }
 
-/* 805A1A94-805A1AF0 000714 005C+00 1/0 0/0 0/0 .text            actionEvent__9daSwc00_cFv */
 void daSwc00_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventID)) {
         setAction(ACTION_DEAD);
@@ -243,19 +235,16 @@ void daSwc00_c::actionEvent() {
     }
 }
 
-/* 805A1AF0-805A1B1C 000770 002C+00 1/0 0/0 0/0 .text            actionDead__9daSwc00_cFv */
 void daSwc00_c::actionDead() {
     if (field_0x583 != 0) {
         fopAcM_delete(this);
     }
 }
 
-/* 805A1B1C-805A1B24 00079C 0008+00 1/0 0/0 0/0 .text            daSwc00_IsDelete__FP9daSwc00_c */
 static int daSwc00_IsDelete(daSwc00_c* i_this) {
     return 1;
 }
 
-/* 805A1B24-805A1B2C 0007A4 0008+00 1/0 0/0 0/0 .text            daSwc00_Delete__FP9daSwc00_c */
 static int daSwc00_Delete(daSwc00_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
     return 1;
@@ -265,7 +254,6 @@ static inline int daSwc00_getScale(daSwc00_c* i_this) {
     return (fopAcM_GetParam(i_this) >> 20) & 0xf;
 }
 
-/* 805A1B2C-805A1D8C 0007AC 0260+00 2/0 0/0 0/0 .text            daSwc00_Create__FP10fopAc_ac_c */
 static int daSwc00_Create(fopAc_ac_c* a_this) {
     daSwc00_c* i_this = (daSwc00_c*)a_this;
     fopAcM_ct(i_this, daSwc00_c);
@@ -336,7 +324,6 @@ static int daSwc00_Create(fopAc_ac_c* a_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A1ED4-805A1EF4 -00001 0020+00 1/0 0/0 0/0 .data            l_daSwc00_Method */
 static actor_method_class l_daSwc00_Method = {
     (process_method_func)daSwc00_Create,
     (process_method_func)daSwc00_Delete,
@@ -349,7 +336,6 @@ static actor_method_class l_daSwc00_Method = {
     #endif
 };
 
-/* 805A1EF4-805A1F24 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SWC00 */
 extern actor_process_profile_definition g_profile_SWC00 = {
   fpcLy_CURRENT_e,       // mLayerID
   7,                     // mListID
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index 9c519b8e09..7d6a9dc14a 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -13,20 +13,16 @@
 #define COLOR_RED    2
 #define COLOR_GREEN  3
 
-/* 804873BC-804873C0 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "S_swHit00";
 
-/* 80485FF8-80486004 000078 000C+00 9/9 0/0 0/0 .text            getSwNo__10daSwhit0_cFv */
 int daSwhit0_c::getSwNo() {
     return fopAcM_GetParam(this) & 0xFF;
 }
 
-/* 80486004-80486010 000084 000C+00 1/1 0/0 0/0 .text            getSwNo2__10daSwhit0_cFv */
 int daSwhit0_c::getSwNo2() {
     return home.angle.z & 0xFF;
 }
 
-/* 80486010-8048602C 000090 001C+00 3/3 0/0 0/0 .text            getEvNo__10daSwhit0_cFv */
 u8 daSwhit0_c::getEvNo() {
     u8 evNo = (fopAcM_GetParam(this) >> 8) & 0xFF;
     if (evNo == 0xFE) {
@@ -36,7 +32,6 @@ u8 daSwhit0_c::getEvNo() {
     return evNo;
 }
 
-/* 8048602C-80486048 0000AC 001C+00 1/1 0/0 0/0 .text            getTimer__10daSwhit0_cFv */
 u8 daSwhit0_c::getTimer() {
     u8 timer = (fopAcM_GetParam(this) >> 16) & 0xFF;
     if (timer == 0xFF) {
@@ -46,7 +41,6 @@ u8 daSwhit0_c::getTimer() {
     return timer;
 }
 
-/* 80486048-80486064 0000C8 001C+00 4/4 0/0 0/0 .text            getType__10daSwhit0_cFv */
 u8 daSwhit0_c::getType() {
     u8 type = (fopAcM_GetParam(this) >> 30);
     if (type >= 4) {
@@ -56,7 +50,6 @@ u8 daSwhit0_c::getType() {
     return type;
 }
 
-/* 80486064-804860EC 0000E4 0088+00 1/1 0/0 0/0 .text            makeEventId__10daSwhit0_cFv */
 void daSwhit0_c::makeEventId() {
     u8 prm = (fopAcM_GetParam(this) >> 8) & 0xFF;
     if (prm == 0xFE) {
@@ -66,7 +59,6 @@ void daSwhit0_c::makeEventId() {
     }
 }
 
-/* 804860EC-80486214 00016C 0128+00 1/1 0/0 0/0 .text            CreateHeap__10daSwhit0_cFv */
 int daSwhit0_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
     JUT_ASSERT(193, modelData != NULL);
@@ -87,7 +79,6 @@ int daSwhit0_c::CreateHeap() {
     return 1;
 }
 
-/* 804873C0-80487400 000004 0040+00 1/1 0/0 0/0 .data            l_sph_src */
 static dCcD_SrcSph l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fafdff, 0x51}, 0x0}}, // mObj
@@ -100,7 +91,6 @@ static dCcD_SrcSph l_sph_src = {
     } // mSphAttr
 };
 
-/* 80486214-80486390 000294 017C+00 1/1 0/0 0/0 .text            CreateInit__10daSwhit0_cFv */
 int daSwhit0_c::CreateInit() {
     shape_angle.z = 0;
     current.angle.z = 0;
@@ -129,12 +119,10 @@ int daSwhit0_c::CreateInit() {
     return 1;
 }
 
-/* 80486390-804863B0 000410 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     return ((daSwhit0_c*)i_this)->CreateHeap();
 }
 
-/* 804863B0-804865B4 000430 0204+00 1/1 0/0 0/0 .text            create__10daSwhit0_cFv */
 int daSwhit0_c::create() {
     fopAcM_ct(this, daSwhit0_c);
 
@@ -162,7 +150,6 @@ int daSwhit0_c::create() {
     return phase_state;
 }
 
-/* 8048668C-80486704 00070C 0078+00 2/2 0/0 0/0 .text            checkHit__10daSwhit0_cFv */
 bool daSwhit0_c::checkHit() {
     if (dComIfGp_event_runCheck()) {
         return false;
@@ -176,7 +163,6 @@ bool daSwhit0_c::checkHit() {
     return false;
 }
 
-/* 80486704-80486788 000784 0084+00 1/1 0/0 0/0 .text            setCombackTimer__10daSwhit0_cFv */
 void daSwhit0_c::setCombackTimer() {
     if (getType() == 0 || getType() == 3) {
         mCombackTimer = 0;
@@ -187,7 +173,6 @@ void daSwhit0_c::setCombackTimer() {
     }
 }
 
-/* 80486788-80486800 000808 0078+00 1/1 0/0 0/0 .text            endCombackTimer__10daSwhit0_cFv */
 int daSwhit0_c::endCombackTimer() {
     if (mCombackTimer > 0) {
         if (!fopAcM_isSwitch(this, getSwNo2()) && --mCombackTimer == 0) {
@@ -198,20 +183,17 @@ int daSwhit0_c::endCombackTimer() {
     return 0;
 }
 
-/* 80486800-80486858 000880 0058+00 4/4 0/0 0/0 .text            onSwitch__10daSwhit0_cFv */
 void daSwhit0_c::onSwitch() {
     fopAcM_onSwitch(this, getSwNo());
     onFlag(1);
     setCombackTimer();
 }
 
-/* 80486858-804868A8 0008D8 0050+00 4/4 0/0 0/0 .text            offSwitch__10daSwhit0_cFv */
 void daSwhit0_c::offSwitch() {
     fopAcM_offSwitch(this, getSwNo());
     offFlag(1);
 }
 
-/* 804868A8-804869C4 000928 011C+00 2/2 0/0 0/0 .text            DemoProc__10daSwhit0_cFv */
 int daSwhit0_c::DemoProc() {
     static char* action_table[2] = {
         "WAIT",
@@ -237,7 +219,6 @@ int daSwhit0_c::DemoProc() {
     return 1;
 }
 
-/* 804869C4-80486ABC 000A44 00F8+00 2/2 0/0 0/0 .text            orderEvent__10daSwhit0_cFv */
 void daSwhit0_c::orderEvent() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN06") == 0 && dComIfGp_getStartStageRoomNo() == 4 && fopAcM_isSwitch(this, 50) && fopAcM_isSwitch(this, 51)) {
         fopAcM_orderOtherEventId(this, mEventId, getEvNo(), 0xFFFF, 0, 1);
@@ -248,7 +229,6 @@ void daSwhit0_c::orderEvent() {
     eventInfo.onCondition(2);
 }
 
-/* 80486ABC-80486BC4 000B3C 0108+00 1/1 0/0 0/0 .text            actionOffWait__10daSwhit0_cFv */
 int daSwhit0_c::actionOffWait() {
     if (checkHit()) {
         fopAcM_seStart(this, JA_SE_OBJ_HIT_SHOCK_SWITCH, 0);
@@ -272,7 +252,6 @@ int daSwhit0_c::actionOffWait() {
     return 1;
 }
 
-/* 80486BC4-80486C28 000C44 0064+00 1/1 0/0 0/0 .text            actionToOnReady__10daSwhit0_cFv */
 int daSwhit0_c::actionToOnReady() {
     if (dComIfGp_event_runCheck()) {
         return 1;
@@ -289,7 +268,6 @@ int daSwhit0_c::actionToOnReady() {
     return 1;
 }
 
-/* 80486C28-80486CE4 000CA8 00BC+00 1/1 0/0 0/0 .text            actionToOnOrder__10daSwhit0_cFv */
 int daSwhit0_c::actionToOnOrder() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         if (dComIfGp_evmng_isMapToolCamera(getEvNo())) {
@@ -309,7 +287,6 @@ int daSwhit0_c::actionToOnOrder() {
     return 1;
 }
 
-/* 80486CE4-80486D88 000D64 00A4+00 1/1 0/0 0/0 .text            actionToOnDemo__10daSwhit0_cFv */
 int daSwhit0_c::actionToOnDemo() {
     if (dComIfGp_evmng_endCheck(mEventId)) {
         if (fopAcM_isSwitch(this, getSwNo())) {
@@ -326,7 +303,6 @@ int daSwhit0_c::actionToOnDemo() {
     return 1;
 }
 
-/* 80486D88-80486EC4 000E08 013C+00 1/1 0/0 0/0 .text            actionToOnDemo2__10daSwhit0_cFv */
 int daSwhit0_c::actionToOnDemo2() {
     if (mReadyTimer != 0) {
         mReadyTimer--;
@@ -357,7 +333,6 @@ int daSwhit0_c::actionToOnDemo2() {
     return 1;
 }
 
-/* 80486EC4-80486FC0 000F44 00FC+00 1/1 0/0 0/0 .text            actionSwWait__10daSwhit0_cFv */
 int daSwhit0_c::actionSwWait() {
     if (dComIfGp_event_runCheck()) {
         return 0;
@@ -378,7 +353,6 @@ int daSwhit0_c::actionSwWait() {
     return 1;
 }
 
-/* 80486FC0-804870E0 001040 0120+00 1/1 0/0 0/0 .text            actionOnWait__10daSwhit0_cFv */
 int daSwhit0_c::actionOnWait() {
     if (!fopAcM_isSwitch(this, getSwNo()) || endCombackTimer()) {
         offSwitch();
@@ -404,7 +378,6 @@ int daSwhit0_c::actionOnWait() {
     return 1;
 }
 
-/* 804870E0-80487138 001160 0058+00 1/1 0/0 0/0 .text            setDrawMtx__10daSwhit0_cFv */
 void daSwhit0_c::setDrawMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::XYZrotM(current.angle.x, current.angle.y, current.angle.z);
@@ -436,7 +409,6 @@ int daSwhit0_c::draw() {
     return 1;
 }
 
-/* 80487138-80487228 0011B8 00F0+00 1/0 0/0 0/0 .text            daSwhit0_Draw__FP10daSwhit0_c */
 static int daSwhit0_Draw(daSwhit0_c* i_this) {
     if (i_this->argument != 0) {
         return 1;
@@ -477,7 +449,6 @@ int daSwhit0_c::execute() {
     return 1;
 }
 
-/* 80487228-804872E4 0012A8 00BC+00 2/0 0/0 0/0 .text            daSwhit0_Execute__FP10daSwhit0_c */
 static int daSwhit0_Execute(daSwhit0_c* i_this) {
     i_this->mBck.play();
     i_this->execute();
@@ -485,7 +456,6 @@ static int daSwhit0_Execute(daSwhit0_c* i_this) {
     return 1;
 }
 
-/* 804872E4-8048732C 001364 0048+00 1/0 0/0 0/0 .text            daSwhit0_Delete__FP10daSwhit0_c */
 static int daSwhit0_Delete(daSwhit0_c* i_this) {
     if (i_this->argument == 0) {
         dComIfG_resDelete(i_this, l_arcName);
@@ -494,12 +464,10 @@ static int daSwhit0_Delete(daSwhit0_c* i_this) {
     return 1;
 }
 
-/* 8048732C-8048734C 0013AC 0020+00 1/0 0/0 0/0 .text            daSwhit0_Create__FP10fopAc_ac_c */
 static int daSwhit0_Create(fopAc_ac_c* i_this) {
     return ((daSwhit0_c*)i_this)->create();
 }
 
-/* 8048743C-8048745C -00001 0020+00 1/0 0/0 0/0 .data            l_daSwhit0_Method */
 static actor_method_class l_daSwhit0_Method = {
     (process_method_func)daSwhit0_Create,
     (process_method_func)daSwhit0_Delete,
@@ -508,7 +476,6 @@ static actor_method_class l_daSwhit0_Method = {
     (process_method_func)daSwhit0_Draw,
 };
 
-/* 8048745C-8048748C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_SWHIT0 */
 extern actor_process_profile_definition g_profile_SWHIT0 = {
   fpcLy_CURRENT_e,       // mLayerID
   8,                     // mListID
diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp
index 23e5acd4fa..a2997806d1 100644
--- a/src/d/actor/d_a_tag_CstaSw.cpp
+++ b/src/d/actor/d_a_tag_CstaSw.cpp
@@ -8,18 +8,15 @@
 #include "d/actor/d_a_tag_CstaSw.h"
 #include "d/d_procname.h"
 
-/* 805A202C-805A2050 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__17daTagCstaSw_HIO_cFv */
 daTagCstaSw_HIO_c::daTagCstaSw_HIO_c() {
     unk_0x4 = 0;
 }
 
-/* 805A2098-805A20F0 000158 0058+00 1/1 0/0 0/0 .text            setBaseMtx__13daTagCstaSw_cFv */
 void daTagCstaSw_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 805A20F0-805A2150 0001B0 0060+00 1/1 0/0 0/0 .text            create__13daTagCstaSw_cFv */
 int daTagCstaSw_c::create() {
     fopAcM_ct(this, daTagCstaSw_c);
     mSwitch = getSw();
@@ -27,7 +24,6 @@ int daTagCstaSw_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A2150-805A21A0 000210 0050+00 1/1 0/0 0/0 .text searchSekizoAct__13daTagCstaSw_cFPvPv */
 fopAc_ac_c* daTagCstaSw_c::searchSekizoAct(void* i_actor, void*) {
     if (i_actor && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_CSTAF) {
         return (fopAc_ac_c*)i_actor;
@@ -35,7 +31,6 @@ fopAc_ac_c* daTagCstaSw_c::searchSekizoAct(void* i_actor, void*) {
     return NULL;
 }
 
-/* 805A21A0-805A2340 000260 01A0+00 1/1 0/0 0/0 .text            areaCheck__13daTagCstaSw_cFv */
 bool daTagCstaSw_c::areaCheck() {
     bool in_area = false;
 
@@ -52,7 +47,6 @@ bool daTagCstaSw_c::areaCheck() {
     return in_area;
 }
 
-/* 805A2340-805A23F0 000400 00B0+00 1/1 0/0 0/0 .text            Execute__13daTagCstaSw_cFv */
 int daTagCstaSw_c::Execute() {
     if (areaCheck() == 1) {
         if (!fopAcM_isSwitch(this, mSwitch)) {
@@ -66,53 +60,40 @@ int daTagCstaSw_c::Execute() {
     return 1;
 }
 
-/* 805A23F0-805A23F8 0004B0 0008+00 1/1 0/0 0/0 .text            Draw__13daTagCstaSw_cFv */
 int daTagCstaSw_c::Draw() {
     return 1;
 }
 
-/* 805A23F8-805A2400 0004B8 0008+00 1/1 0/0 0/0 .text            Delete__13daTagCstaSw_cFv */
 int daTagCstaSw_c::Delete() {
     return 1;
 }
 
-/* 805A2400-805A2420 0004C0 0020+00 1/0 0/0 0/0 .text            daTagCstaSw_Draw__FP13daTagCstaSw_c
- */
 static int daTagCstaSw_Draw(daTagCstaSw_c* i_this) {
     return i_this->Draw();
 }
 
-/* 805A2420-805A2440 0004E0 0020+00 1/0 0/0 0/0 .text daTagCstaSw_Execute__FP13daTagCstaSw_c */
 static int daTagCstaSw_Execute(daTagCstaSw_c* i_this) {
     return i_this->Execute();
 }
 
-/* 805A2440-805A2460 000500 0020+00 1/0 0/0 0/0 .text daTagCstaSw_Delete__FP13daTagCstaSw_c */
 static int daTagCstaSw_Delete(daTagCstaSw_c* i_this) {
     return i_this->Delete();
 }
 
-/* 805A2460-805A2480 000520 0020+00 1/0 0/0 0/0 .text            daTagCstaSw_Create__FP10fopAc_ac_c
- */
 static int daTagCstaSw_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagCstaSw_c*>(i_this)->create();
 }
 
-/* 805A2480-805A24DC 000540 005C+00 2/1 0/0 0/0 .text            __dt__17daTagCstaSw_HIO_cFv */
 daTagCstaSw_HIO_c::~daTagCstaSw_HIO_c() {}
 
-/* 805A25CC-805A25D4 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daTagCstaSw_HIO_c l_HIO;
 
-/* ############################################################################################## */
-/* 805A2550-805A2570 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagCstaSw_Method */
 static actor_method_class l_daTagCstaSw_Method = {
     (process_method_func)daTagCstaSw_Create,  (process_method_func)daTagCstaSw_Delete,
     (process_method_func)daTagCstaSw_Execute, (process_method_func)NULL,
     (process_method_func)daTagCstaSw_Draw,
 };
 
-/* 805A2570-805A25A0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_CstaSw */
 extern actor_process_profile_definition g_profile_Tag_CstaSw = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp
index b0f42939ab..76034636c2 100644
--- a/src/d/actor/d_a_tag_Lv6Gate.cpp
+++ b/src/d/actor/d_a_tag_Lv6Gate.cpp
@@ -10,21 +10,16 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80D4F898-80D4F8B8 000078 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daTagLv6Gate_c*>(i_this)->createHeap();
 }
 
-/* 80D50908-80D50914 000000 000C+00 2/2 0/0 0/0 .rodata          l_minRelative */
 static f32 const l_minRelative[] = {-700.0f, -300.0f, -2000.0f};
 
-/* 80D50914-80D50920 00000C 000C+00 0/1 0/0 0/0 .rodata          l_maxRelative */
 static f32 const l_maxRelative[] = {700.0f, 0.0f, 1000.0f};
 
-/* 80D509C8-80D509CC -00001 0004+00 4/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Lv6Gate";
 
-/* 80D4F8B8-80D4FB70 000098 02B8+00 1/1 0/0 0/0 .text            createHeap__14daTagLv6Gate_cFv */
 int daTagLv6Gate_c::createHeap() {
     J3DAnmTextureSRTKey* btk;
 
@@ -72,8 +67,6 @@ int daTagLv6Gate_c::createHeap() {
     return 1;
 }
 
-/* 80D4FBB8-80D4FBD8 000398 0020+00 1/0 0/0 0/0 .text            daTagLv6Gate_Create__FP10fopAc_ac_c
- */
 static int daTagLv6Gate_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagLv6Gate_c*>(i_this)->create();
 }
@@ -122,7 +115,6 @@ inline bool daTagLv6Gate_c::checkOpenArea() {
     return false;
 }
 
-/* 80D4FEDC-80D5068C 0006BC 07B0+00 1/1 0/0 0/0 .text            execute__14daTagLv6Gate_cFv */
 inline int daTagLv6Gate_c::execute() {
     dComIfG_inf_c& game_info = g_dComIfG_gameInfo;  // Fake match?
 
@@ -301,7 +293,6 @@ void daTagLv6Gate_c::create_init() {
     }
 }
 
-/* 80D4FBD8-80D4FE5C 0003B8 0284+00 1/1 0/0 0/0 .text            create__14daTagLv6Gate_cFv */
 int daTagLv6Gate_c::create() {
     fopAcM_ct(this, daTagLv6Gate_c);
 
@@ -318,17 +309,14 @@ int daTagLv6Gate_c::create() {
     return phase;
 }
 
-/* 80D4FEBC-80D4FEDC 00069C 0020+00 1/0 0/0 0/0 .text daTagLv6Gate_Execute__FP14daTagLv6Gate_c */
 static int daTagLv6Gate_Execute(daTagLv6Gate_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5068C-80D506AC 000E6C 0020+00 1/0 0/0 0/0 .text daTagLv6Gate_Draw__FP14daTagLv6Gate_c */
 static int daTagLv6Gate_Draw(daTagLv6Gate_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D506AC-80D50848 000E8C 019C+00 1/1 0/0 0/0 .text            draw__14daTagLv6Gate_cFv */
 int daTagLv6Gate_c::draw() {
     g_env_light.settingTevStruct(16, &current.pos, &tevStr);
 
@@ -357,7 +345,6 @@ int daTagLv6Gate_c::draw() {
     return 1;
 }
 
-/* 80D50848-80D50850 001028 0008+00 1/0 0/0 0/0 .text daTagLv6Gate_IsDelete__FP14daTagLv6Gate_c */
 static int daTagLv6Gate_IsDelete(daTagLv6Gate_c* i_this) {
     return 1;
 }
@@ -372,20 +359,17 @@ daTagLv6Gate_c::~daTagLv6Gate_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80D50850-80D50900 001030 00B0+00 1/0 0/0 0/0 .text daTagLv6Gate_Delete__FP14daTagLv6Gate_c */
 static int daTagLv6Gate_Delete(daTagLv6Gate_c* i_this) {
     i_this->~daTagLv6Gate_c();
     return 1;
 }
 
-/* 80D509CC-80D509EC -00001 0020+00 1/0 0/0 0/0 .data            l_daTagLv6Gate_Method */
 static actor_method_class l_daTagLv6Gate_Method = {
     (process_method_func)daTagLv6Gate_Create,  (process_method_func)daTagLv6Gate_Delete,
     (process_method_func)daTagLv6Gate_Execute, (process_method_func)daTagLv6Gate_IsDelete,
     (process_method_func)daTagLv6Gate_Draw,
 };
 
-/* 80D509EC-80D50A1C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv6Gate */
 extern actor_process_profile_definition g_profile_Tag_Lv6Gate = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp
index 13fd4a25db..2457f4da6c 100644
--- a/src/d/actor/d_a_tag_Lv7Gate.cpp
+++ b/src/d/actor/d_a_tag_Lv7Gate.cpp
@@ -10,7 +10,6 @@
 #include "d/d_path.h"
 #include "d/d_procname.h"
 
-/* 80D51B50-80D51B54 -00001 0004+00 5/5 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Lv7Gate";
 
 int daTagLv7Gate_c::createHeap() {
@@ -37,18 +36,14 @@ int daTagLv7Gate_c::createHeap() {
     return 1;
 }
 
-/* 80D50AB8-80D50BFC 000078 0144+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daTagLv7Gate_c*>(i_this)->createHeap();
 }
 
-/* 80D50C44-80D50C64 000204 0020+00 1/0 0/0 0/0 .text            daTagLv7Gate_Create__FP10fopAc_ac_c
- */
 static int daTagLv7Gate_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagLv7Gate_c*>(i_this)->create();
 }
 
-/* 80D50C64-80D50D30 000224 00CC+00 1/1 0/0 0/0 .text            create__14daTagLv7Gate_cFv */
 int daTagLv7Gate_c::create() {
     int phase;
 
@@ -115,7 +110,6 @@ void daTagLv7Gate_c::setBaseMtx() {
     }
 }
 
-/* 80D50D30-80D511A8 0002F0 0478+00 1/1 0/0 0/0 .text            create_init__14daTagLv7Gate_cFv */
 void daTagLv7Gate_c::create_init() {
     attention_info.flags = 0;
     mLastFrame = 0;
@@ -172,7 +166,6 @@ void daTagLv7Gate_c::create_init() {
     fopAcM_orderOtherEventId(this, mEvtId, -1, -1, 2, 1);
 }
 
-/* 80D511A8-80D511C8 000768 0020+00 1/0 0/0 0/0 .text daTagLv7Gate_Execute__FP14daTagLv7Gate_c */
 static int daTagLv7Gate_Execute(daTagLv7Gate_c* i_this) {
     return i_this->execute();
 }
@@ -224,7 +217,6 @@ void daTagLv7Gate_c::flyAnime() {
     }
 }
 
-/* 80D511C8-80D51628 000788 0460+00 1/1 0/0 0/0 .text            execute__14daTagLv7Gate_cFv */
 int daTagLv7Gate_c::execute() {
     // Fakematch
     dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay();
@@ -327,7 +319,6 @@ bool daTagLv7Gate_c::setNextPoint() {
     return bVar1;
 }
 
-/* 80D51628-80D519BC 000BE8 0394+00 1/1 0/0 0/0 .text            calcFly__14daTagLv7Gate_cFv */
 void daTagLv7Gate_c::calcFly() {
     f32 speed = speedF;
     if (checkPoint(speed)) {
@@ -351,12 +342,10 @@ int daTagLv7Gate_c::draw() {
     return 1;
 }
 
-/* 80D519BC-80D51A58 000F7C 009C+00 1/0 0/0 0/0 .text daTagLv7Gate_Draw__FP14daTagLv7Gate_c */
 static int daTagLv7Gate_Draw(daTagLv7Gate_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D51A58-80D51A60 001018 0008+00 1/0 0/0 0/0 .text daTagLv7Gate_IsDelete__FP14daTagLv7Gate_c */
 static int daTagLv7Gate_IsDelete(daTagLv7Gate_c* i_this) {
     return 1;
 }
@@ -367,20 +356,17 @@ daTagLv7Gate_c::~daTagLv7Gate_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80D51A60-80D51ACC 001020 006C+00 1/0 0/0 0/0 .text daTagLv7Gate_Delete__FP14daTagLv7Gate_c */
 static int daTagLv7Gate_Delete(daTagLv7Gate_c* i_this) {
     i_this->~daTagLv7Gate_c();
     return 1;
 }
 
-/* 80D51B54-80D51B74 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagLv7Gate_Method */
 static actor_method_class l_daTagLv7Gate_Method = {
     (process_method_func)daTagLv7Gate_Create,  (process_method_func)daTagLv7Gate_Delete,
     (process_method_func)daTagLv7Gate_Execute, (process_method_func)daTagLv7Gate_IsDelete,
     (process_method_func)daTagLv7Gate_Draw,
 };
 
-/* 80D51B74-80D51BA4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv7Gate */
 extern actor_process_profile_definition g_profile_Tag_Lv7Gate = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp
index dd8a5c9522..714d8dfe46 100644
--- a/src/d/actor/d_a_tag_Lv8Gate.cpp
+++ b/src/d/actor/d_a_tag_Lv8Gate.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_Lv8Gate
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_Lv8Gate.h"
@@ -13,13 +8,8 @@
 #include "d/d_procname.h"
 #include "d/actor/d_a_obj_mirror_table.h"
 
-//
-// Declarations:
-//
-
 static char* l_arcName = "Lv8Gate";
 
-/* 80D51C38-80D51C58 000078 0020+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daTagLv8Gate_c*>(i_this)->createHeap();
 }
@@ -97,7 +87,6 @@ inline int daTagLv8Gate_c::draw() {
     return TRUE;
 }
 
-/* 80D51C58-80D51D80 000098 0128+00 1/1 0/0 0/0 .text            createHeap__14daTagLv8Gate_cFv */
 int daTagLv8Gate_c::createHeap() {
     if (strcmp(dComIfGp_getStartStageName(), "D_MN08") == 0) {
         J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8);
@@ -115,19 +104,15 @@ int daTagLv8Gate_c::createHeap() {
     return 1;
 }
 
-/* 80D51DC8-80D51F28 000208 0160+00 1/0 0/0 0/0 .text            daTagLv8Gate_Create__FP10fopAc_ac_c
- */
 static int daTagLv8Gate_Create(fopAc_ac_c* i_this) {
     daTagLv8Gate_c* a_this = static_cast<daTagLv8Gate_c*>(i_this);
     return a_this->create();
 }
 
-/* 80D51F28-80D51F48 000368 0020+00 1/0 0/0 0/0 .text daTagLv8Gate_Execute__FP14daTagLv8Gate_c */
 static int daTagLv8Gate_Execute(daTagLv8Gate_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D51F48-80D522F0 000388 03A8+00 1/1 0/0 0/0 .text            execute__14daTagLv8Gate_cFv */
 inline int daTagLv8Gate_c::execute() {
     #if VERSION != VERSION_SHIELD_DEBUG
     // TODO: gameInfo fake match to force reuse of pointer
@@ -230,30 +215,25 @@ inline int daTagLv8Gate_c::execute() {
     return 1;
 }
 
-/* 80D522F0-80D5246C 000730 017C+00 1/0 0/0 0/0 .text daTagLv8Gate_Draw__FP14daTagLv8Gate_c */
 static int daTagLv8Gate_Draw(daTagLv8Gate_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D5246C-80D52474 0008AC 0008+00 1/0 0/0 0/0 .text daTagLv8Gate_IsDelete__FP14daTagLv8Gate_c */
 static int daTagLv8Gate_IsDelete(daTagLv8Gate_c* i_this) {
     return TRUE;
 }
 
-/* 80D52474-80D524C4 0008B4 0050+00 1/0 0/0 0/0 .text daTagLv8Gate_Delete__FP14daTagLv8Gate_c */
 static int daTagLv8Gate_Delete(daTagLv8Gate_c* i_this) {
     i_this->~daTagLv8Gate_c();
     return TRUE;
 }
 
-/* 80D52514-80D52534 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagLv8Gate_Method */
 static actor_method_class l_daTagLv8Gate_Method = {
     (process_method_func)daTagLv8Gate_Create,  (process_method_func)daTagLv8Gate_Delete,
     (process_method_func)daTagLv8Gate_Execute, (process_method_func)daTagLv8Gate_IsDelete,
     (process_method_func)daTagLv8Gate_Draw,
 };
 
-/* 80D52534-80D52564 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv8Gate */
 extern actor_process_profile_definition g_profile_Tag_Lv8Gate = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp
index f3e52dfcc3..fedf39024c 100644
--- a/src/d/actor/d_a_tag_TWgate.cpp
+++ b/src/d/actor/d_a_tag_TWgate.cpp
@@ -22,17 +22,14 @@ struct daTagTWGate_zevParam {
     /* 0x1B */ s8 mLayer;
 };
 
-/* 80D525F8-80D52604 000078 000C+00 1/0 0/0 0/0 .text            initWait__13daTagTWGate_cFv */
 void daTagTWGate_c::initWait() {
     mEventID = -1;
 }
 
-/* 80D557AC-80D557B0 000000 0001+03 5/5 0/0 0/0 .rodata          mAttr__13daTagTWGate_c */
 u8 const daTagTWGate_c::mAttr[1] = {
     0x00,
 };
 
-/* 80D557B0-80D55820 -00001 0070+00 14/18 0/0 0/0 .rodata          l_zevParamTbl */
 static daTagTWGate_zevParam const l_zevParamTbl[4] = {
     {
         "TWGate_FL",
@@ -80,10 +77,8 @@ static daTagTWGate_zevParam const l_zevParamTbl[4] = {
     },
 };
 
-/* 80D55994-80D55998 -00001 0004+00 12/12 0/0 0/0 .data            l_myName */
 static const char* l_myName = "Gate";
 
-/* 80D55AD0-80D55C08 00015C 0138+00 14/15 0/0 0/0 .data            ActionTable__13daTagTWGate_c */
 actionFunc daTagTWGate_c::ActionTable[13][2] = {
     {&daTagTWGate_c::initWait, &daTagTWGate_c::executeWait},
     {&daTagTWGate_c::initDemoFilone1, &daTagTWGate_c::executeDemoFilone1},
@@ -100,7 +95,6 @@ actionFunc daTagTWGate_c::ActionTable[13][2] = {
     {&daTagTWGate_c::initDemoHyral3, &daTagTWGate_c::executeDemoHyral3},
 };
 
-/* 80D52604-80D528F0 000084 02EC+00 1/0 0/0 0/0 .text            executeWait__13daTagTWGate_cFv */
 void daTagTWGate_c::executeWait() {
     f32 radius = pow(scale.x * 100.0f, 2.0f);
     f32 distance = fopAcM_searchActorDistanceXZ2(this, (fopAc_ac_c*)dComIfGp_getPlayer(0));
@@ -161,15 +155,12 @@ void daTagTWGate_c::executeWait() {
     }
 }
 
-/* 80D528F0-80D5297C 000370 008C+00 1/0 0/0 0/0 .text            initDemoFilone1__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoFilone1() {
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
     mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1);
     fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1);
 }
 
-/* 80D5297C-80D52AF4 0003FC 0178+00 1/0 0/0 0/0 .text executeDemoFilone1__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoFilone1() {
     dEvent_manager_c& event_manager = dComIfGp_getEventManager();
     int staffId = event_manager.getMyStaffId(l_myName, NULL, 0);
@@ -206,8 +197,6 @@ void daTagTWGate_c::executeDemoFilone1() {
     }
 }
 
-/* 80D52AF4-80D52BF0 000574 00FC+00 1/0 0/0 0/0 .text            initDemoFilone2__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoFilone2() {
     fopAcM_onSwitch(this, getSwitch());
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
@@ -225,7 +214,6 @@ void daTagTWGate_c::initDemoFilone2() {
     }
 }
 
-/* 80D52BF0-80D52DB4 000670 01C4+00 1/0 0/0 0/0 .text executeDemoFilone2__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoFilone2() {
     s32 staffId = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0);
 
@@ -271,8 +259,6 @@ void daTagTWGate_c::executeDemoFilone2() {
     }
 }
 
-/* 80D52DB4-80D52E7C 000834 00C8+00 1/0 0/0 0/0 .text            initDemoFilone3__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoFilone3() {
     field_0x5de = 1;
     mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1;  // checking if wolf?
@@ -284,7 +270,6 @@ void daTagTWGate_c::initDemoFilone3() {
     fopAcM_orderChangeEventId(this, mEventID, 1, -1);
 }
 
-/* 80D52E7C-80D53250 0008FC 03D4+00 1/0 0/0 0/0 .text executeDemoFilone3__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoFilone3() {
     s32 staffId = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0);
 
@@ -374,15 +359,12 @@ void daTagTWGate_c::executeDemoFilone3() {
     }
 }
 
-/* 80D53250-80D532DC 000CD0 008C+00 1/0 0/0 0/0 .text            initDemoOrdin1__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoOrdin1() {
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
     mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1);
     fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1);
 }
 
-/* 80D532DC-80D53454 000D5C 0178+00 1/0 0/0 0/0 .text executeDemoOrdin1__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoOrdin1() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -410,8 +392,6 @@ void daTagTWGate_c::executeDemoOrdin1() {
     }
 }
 
-/* 80D53454-80D53550 000ED4 00FC+00 1/0 0/0 0/0 .text            initDemoOrdin2__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoOrdin2() {
     fopAcM_onSwitch(this, getSwitch());
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
@@ -427,7 +407,6 @@ void daTagTWGate_c::initDemoOrdin2() {
     }
 }
 
-/* 80D53550-80D53714 000FD0 01C4+00 1/0 0/0 0/0 .text executeDemoOrdin2__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoOrdin2() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -472,8 +451,6 @@ void daTagTWGate_c::executeDemoOrdin2() {
     }
 }
 
-/* 80D53714-80D537DC 001194 00C8+00 1/0 0/0 0/0 .text            initDemoOrdin3__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoOrdin3() {
     field_0x5de = 1;
     mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1;  // checking if wolf?
@@ -485,7 +462,6 @@ void daTagTWGate_c::initDemoOrdin3() {
     fopAcM_orderChangeEventId(this, mEventID, 1, -1);
 }
 
-/* 80D537DC-80D53BD0 00125C 03F4+00 1/0 0/0 0/0 .text executeDemoOrdin3__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoOrdin3() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -567,15 +543,12 @@ void daTagTWGate_c::executeDemoOrdin3() {
     }
 }
 
-/* 80D53BD0-80D53C5C 001650 008C+00 1/0 0/0 0/0 .text            initDemoRanail1__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoRanail1() {
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
     mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1);
     fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1);
 }
 
-/* 80D53C5C-80D53DD4 0016DC 0178+00 1/0 0/0 0/0 .text executeDemoRanail1__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoRanail1() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -603,8 +576,6 @@ void daTagTWGate_c::executeDemoRanail1() {
     }
 }
 
-/* 80D53DD4-80D53ED0 001854 00FC+00 1/0 0/0 0/0 .text            initDemoRanail2__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoRanail2() {
     fopAcM_onSwitch(this, getSwitch());
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
@@ -620,7 +591,6 @@ void daTagTWGate_c::initDemoRanail2() {
     }
 }
 
-/* 80D53ED0-80D54094 001950 01C4+00 1/0 0/0 0/0 .text executeDemoRanail2__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoRanail2() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -665,8 +635,6 @@ void daTagTWGate_c::executeDemoRanail2() {
     }
 }
 
-/* 80D54094-80D54178 001B14 00E4+00 1/0 0/0 0/0 .text            initDemoRanail3__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoRanail3() {
     field_0x5de = 1;
     mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1;  // checking if wolf?
@@ -680,7 +648,6 @@ void daTagTWGate_c::initDemoRanail3() {
     dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[170]);
 }
 
-/* 80D54178-80D5456C 001BF8 03F4+00 1/0 0/0 0/0 .text executeDemoRanail3__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoRanail3() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -762,15 +729,12 @@ void daTagTWGate_c::executeDemoRanail3() {
     }
 }
 
-/* 80D5456C-80D545F8 001FEC 008C+00 1/0 0/0 0/0 .text            initDemoHyral1__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoHyral1() {
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
     mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mEventName, -1);
     fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1);
 }
 
-/* 80D545F8-80D54770 002078 0178+00 1/0 0/0 0/0 .text executeDemoHyral1__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoHyral1() {
     dEvent_manager_c& evtMng = dComIfGp_getEventManager();
     int staffId = evtMng.getMyStaffId(l_myName, NULL, 0);
@@ -798,8 +762,6 @@ void daTagTWGate_c::executeDemoHyral1() {
     }
 }
 
-/* 80D54770-80D5486C 0021F0 00FC+00 1/0 0/0 0/0 .text            initDemoHyral2__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoHyral2() {
     fopAcM_onSwitch(this, getSwitch());
     eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName);
@@ -815,7 +777,6 @@ void daTagTWGate_c::initDemoHyral2() {
     }
 }
 
-/* 80D5486C-80D54A30 0022EC 01C4+00 1/0 0/0 0/0 .text executeDemoHyral2__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoHyral2() {
     dEvent_manager_c& eventMgr = dComIfGp_getEventManager();
     int staffId = eventMgr.getMyStaffId(l_myName, NULL, 0);
@@ -858,8 +819,6 @@ void daTagTWGate_c::executeDemoHyral2() {
     }
 }
 
-/* 80D54A30-80D54AF8 0024B0 00C8+00 1/0 0/0 0/0 .text            initDemoHyral3__13daTagTWGate_cFv
- */
 void daTagTWGate_c::initDemoHyral3() {
     field_0x5de = 1;
     mIsWolf = (dComIfGp_getLinkPlayer()->mNoResetFlg1 >> 25) & 1;  // checking if wolf?
@@ -871,7 +830,6 @@ void daTagTWGate_c::initDemoHyral3() {
     fopAcM_orderChangeEventId(this, mEventID, 1, -1);
 }
 
-/* 80D54AF8-80D54ECC 002578 03D4+00 1/0 0/0 0/0 .text executeDemoHyral3__13daTagTWGate_cFv */
 void daTagTWGate_c::executeDemoHyral3() {
     dEvent_manager_c& eventMgr = dComIfGp_getEventManager();
     int staffId = eventMgr.getMyStaffId(l_myName, NULL, 0);
@@ -943,7 +901,6 @@ void daTagTWGate_c::executeDemoHyral3() {
     }
 }
 
-/* 80D54ECC-80D54F88 00294C 00BC+00 4/4 0/0 0/0 .text            initBaseMtx__13daTagTWGate_cFv */
 void daTagTWGate_c::initBaseMtx() {
     cullMtx = mpMorf->getModel()->getBaseTRMtx();
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
@@ -960,8 +917,6 @@ void daTagTWGate_c::initBaseMtx() {
     mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80D54F88-80D5502C 002A08 00A4+00 4/4 0/0 0/0 .text            downloadModels__13daTagTWGate_cFv
- */
 int daTagTWGate_c::downloadModels() {
     int phase_state = dComIfG_resLoad(&mPhaseMdRes, "TWGate_Md");
 
@@ -980,13 +935,10 @@ int daTagTWGate_c::downloadModels() {
     return phase_state == cPhs_ERROR_e ? -1 : 0;
 }
 
-/* 80D5502C-80D55068 002AAC 003C+00 4/4 0/0 0/0 .text initTalk__13daTagTWGate_cFiPP10fopAc_ac_c */
 void daTagTWGate_c::initTalk(int param_0, fopAc_ac_c** param_1) {
     mMsgFlow.init(this, param_0, 0, param_1);
 }
 
-/* 80D55068-80D55160 002AE8 00F8+00 4/4 0/0 0/0 .text talkProc__13daTagTWGate_cFPiiPP10fopAc_ac_c
- */
 bool daTagTWGate_c::talkProc(int* param_1, int param_2, fopAc_ac_c** param_3) {
     bool rv = false;
     if (dMsgObject_isMsgSendControl()) {
@@ -1012,13 +964,10 @@ bool daTagTWGate_c::talkProc(int* param_1, int param_2, fopAc_ac_c** param_3) {
     return rv;
 }
 
-/* 80D55160-80D55180 002BE0 0020+00 1/1 0/0 0/0 .text
- * createHeapCallBack__13daTagTWGate_cFP10fopAc_ac_c            */
 int daTagTWGate_c::createHeapCallBack(fopAc_ac_c* i_actor) {
     return ((daTagTWGate_c*)i_actor)->CreateHeap();
 }
 
-/* 80D55180-80D55288 002C00 0108+00 1/1 0/0 0/0 .text            CreateHeap__13daTagTWGate_cFv */
 int daTagTWGate_c::CreateHeap() {
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("TWGate_Md", 7));
     mpMorf =
@@ -1056,8 +1005,6 @@ int daTagTWGate_c::create() {
     return phase_state;
 }
 
-/* 80D55288-80D55388 002D08 0100+00 1/0 0/0 0/0 .text            daTagTWGate_Create__FP10fopAc_ac_c
- */
 static int daTagTWGate_Create(fopAc_ac_c* i_actor) {
     return ((daTagTWGate_c*)i_actor)->create();
 }
@@ -1074,37 +1021,29 @@ inline daTagTWGate_c::~daTagTWGate_c() {
     }
 }
 
-/* 80D55388-80D5543C 002E08 00B4+00 1/0 0/0 0/0 .text daTagTWGate_Delete__FP13daTagTWGate_c */
 static int daTagTWGate_Delete(daTagTWGate_c* i_gate) {
     i_gate->~daTagTWGate_c();
     return 1;
 }
 
-/* 80D5543C-80D554E4 002EBC 00A8+00 1/0 0/0 0/0 .text daTagTWGate_Execute__FP13daTagTWGate_c */
 static int daTagTWGate_Execute(daTagTWGate_c* i_gate) {
     return i_gate->execute();
 }
 
-/* 80D554E4-80D55518 002F64 0034+00 1/0 0/0 0/0 .text            daTagTWGate_Draw__FP13daTagTWGate_c
- */
 static int daTagTWGate_Draw(daTagTWGate_c* i_gate) {
     return i_gate->draw();
 }
 
-/* 80D55518-80D55520 002F98 0008+00 1/0 0/0 0/0 .text daTagTWGate_IsDelete__FP13daTagTWGate_c */
 static int daTagTWGate_IsDelete(daTagTWGate_c*) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D55C08-80D55C28 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagTWGate_Method */
 static actor_method_class l_daTagTWGate_Method = {
     (process_method_func)daTagTWGate_Create,  (process_method_func)daTagTWGate_Delete,
     (process_method_func)daTagTWGate_Execute, (process_method_func)daTagTWGate_IsDelete,
     (process_method_func)daTagTWGate_Draw,
 };
 
-/* 80D55C28-80D55C58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_TWGate */
 extern actor_process_profile_definition g_profile_Tag_TWGate = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp
index 48b6b297d7..20792436e8 100644
--- a/src/d/actor/d_a_tag_ajnot.cpp
+++ b/src/d/actor/d_a_tag_ajnot.cpp
@@ -9,29 +9,22 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 805A2658-805A26A8 000078 0050+00 1/1 0/0 0/0 .text            create__12daTagAJnot_cFv */
 int daTagAJnot_c::create() {
     fopAcM_ct(this, daTagAJnot_c);
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A26A8-805A26C8 0000C8 0020+00 1/0 0/0 0/0 .text            daTagAJnot_Create__FP10fopAc_ac_c
- */
 static int daTagAJnot_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagAJnot_c*>(i_this)->create();
 }
 
-/* 805A26C8-805A271C 0000E8 0054+00 1/1 0/0 0/0 .text            __dt__12daTagAJnot_cFv */
 daTagAJnot_c::~daTagAJnot_c() {}
 
-/* 805A271C-805A2744 00013C 0028+00 1/0 0/0 0/0 .text            daTagAJnot_Delete__FP12daTagAJnot_c
- */
 static int daTagAJnot_Delete(daTagAJnot_c* i_this) {
     i_this->~daTagAJnot_c();
     return 1;
 }
 
-/* 805A2744-805A2850 000164 010C+00 1/1 0/0 0/0 .text            execute__12daTagAJnot_cFv */
 int daTagAJnot_c::execute() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     f32 y_dist_to_player = player->current.pos.y - current.pos.y;
@@ -55,26 +48,20 @@ int daTagAJnot_c::execute() {
     return 1;
 }
 
-/* 805A2850-805A2870 000270 0020+00 1/0 0/0 0/0 .text daTagAJnot_Execute__FP12daTagAJnot_c */
 static int daTagAJnot_Execute(daTagAJnot_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A2870-805A2878 000290 0008+00 1/0 0/0 0/0 .text            daTagAJnot_Draw__FP12daTagAJnot_c
- */
 static int daTagAJnot_Draw(daTagAJnot_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A288C-805A28AC -00001 0020+00 1/0 0/0 0/0 .data            l_daTagAJnot_Method */
 static actor_method_class l_daTagAJnot_Method = {
     (process_method_func)daTagAJnot_Create,  (process_method_func)daTagAJnot_Delete,
     (process_method_func)daTagAJnot_Execute, (process_method_func)NULL,
     (process_method_func)daTagAJnot_Draw,
 };
 
-/* 805A28AC-805A28DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_AJnot */
 extern actor_process_profile_definition g_profile_Tag_AJnot = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp
index cc3ef0b8de..545889075c 100644
--- a/src/d/actor/d_a_tag_allmato.cpp
+++ b/src/d/actor/d_a_tag_allmato.cpp
@@ -7,7 +7,6 @@
 #include "d/actor/d_a_arrow.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 804897BC-804897FC -00001 0040+00 2/2 0/0 0/0 .data            l_evtList */
 static daNpcT_evtData_c l_evtList[8] = {
     {"", 0},
     {"FOCUS_BOUMATO", 2},
@@ -28,14 +27,12 @@ static daNpcT_evtData_c l_evtList[8] = {
 #define EVT_HIT_BOUMATO3          6
 #define EVT_NEARPIN_BOUMATO       7
 
-/* 804897FC-80489808 -00001 000C+00 2/2 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Taro1",
     "Taro2",
 };
 
-/* 80487538-80487670 000078 0138+00 1/1 0/0 0/0 .text            create__15daTag_AllMato_cFv */
 int daTag_AllMato_c::create() {
     int var_r29 = 0;
     fopAcM_ct(this, daTag_AllMato_c);
@@ -62,12 +59,10 @@ int daTag_AllMato_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804876B0-804876B8 0001F0 0008+00 1/1 0/0 0/0 .text            Delete__15daTag_AllMato_cFv */
 int daTag_AllMato_c::Delete() {
     return 1;
 }
 
-/* 804876B8-80487C5C 0001F8 05A4+00 1/1 0/0 0/0 .text            Execute__15daTag_AllMato_cFv */
 int daTag_AllMato_c::Execute() {
     camera_class* camera_p = NULL;
 
@@ -275,19 +270,14 @@ int daTag_AllMato_c::Execute() {
     return 0;
 }
 
-/* 80487C5C-80487C64 00079C 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_AllMato_cFv */
 int daTag_AllMato_c::Draw() {
     return 1;
 }
 
-/* 80489880-80489A10 000000 0190+00 9/9 0/0 0/0 .bss             l_findActorPtrs */
 static fopAc_ac_c* l_findActorPtrs[100];
 
-/* 80489A10-80489A14 000190 0004+00 9/9 0/0 0/0 .bss             l_findCount */
 static u32 l_findCount;
 
-/* 80487C64-80487D00 0007A4 009C+00 1/1 0/0 0/0 .text            srchBouMato__15daTag_AllMato_cFPvPv
- */
 void* daTag_AllMato_c::srchBouMato(void* i_actor, void* i_data) {
     if (l_findCount < 100 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_BOUMATO) {
@@ -299,8 +289,6 @@ void* daTag_AllMato_c::srchBouMato(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80487D00-80487D9C 000840 009C+00 1/1 0/0 0/0 .text            srchItaMato__15daTag_AllMato_cFPvPv
- */
 void* daTag_AllMato_c::srchItaMato(void* i_actor, void* i_data) {
     if (l_findCount < 100 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_OBJ_ITAMATO) {
@@ -312,7 +300,6 @@ void* daTag_AllMato_c::srchItaMato(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80487D9C-80487E38 0008DC 009C+00 1/1 0/0 0/0 .text            srchTaro__15daTag_AllMato_cFPvPv */
 void* daTag_AllMato_c::srchTaro(void* i_actor, void* i_data) {
     if (l_findCount < 100 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_NPC_TARO) {
@@ -324,8 +311,6 @@ void* daTag_AllMato_c::srchTaro(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80487E38-80487ED4 000978 009C+00 1/1 0/0 0/0 .text            srchArrow__15daTag_AllMato_cFPvPv
- */
 void* daTag_AllMato_c::srchArrow(void* i_actor, void* i_data) {
     if (l_findCount < 100 && i_actor != NULL && i_actor != i_data) {
         if (fopAcM_IsExecuting(fopAcM_GetID(i_actor)) && fopAcM_GetName(i_actor) == PROC_ARROW) {
@@ -337,7 +322,6 @@ void* daTag_AllMato_c::srchArrow(void* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 80487ED4-80487F80 000A14 00AC+00 2/2 0/0 0/0 .text            isDelete__15daTag_AllMato_cFv */
 int daTag_AllMato_c::isDelete() {
     BOOL rt = FALSE;
     
@@ -356,7 +340,6 @@ int daTag_AllMato_c::isDelete() {
     return rt;
 }
 
-/* 80487F80-80488034 000AC0 00B4+00 1/1 0/0 0/0 .text entryBouMatoActors__15daTag_AllMato_cFv */
 void daTag_AllMato_c::entryBouMatoActors() {
     for (int i = 0; i < 1; i++) {
         mItaMatoActorMngr[i].remove();
@@ -373,7 +356,6 @@ void daTag_AllMato_c::entryBouMatoActors() {
     }
 }
 
-/* 80488034-80488104 000B74 00D0+00 1/1 0/0 0/0 .text entryItaMatoActors__15daTag_AllMato_cFv */
 void daTag_AllMato_c::entryItaMatoActors() {
     for (int i = 0; i < 2; i++) {
         mItaMatoActorMngr[i].remove();
@@ -390,8 +372,6 @@ void daTag_AllMato_c::entryItaMatoActors() {
     }
 }
 
-/* 80488104-804881C0 000C44 00BC+00 1/1 0/0 0/0 .text            getTaroActorP__15daTag_AllMato_cFv
- */
 fopAc_ac_c* daTag_AllMato_c::getTaroActorP() {
     int var_r28 = 0;
     l_findCount = 0;
@@ -407,8 +387,6 @@ fopAc_ac_c* daTag_AllMato_c::getTaroActorP() {
     return NULL;
 }
 
-/* 804881C0-80488238 000D00 0078+00 2/2 0/0 0/0 .text            getArrowActorP__15daTag_AllMato_cFv
- */
  fopAc_ac_c* daTag_AllMato_c::getArrowActorP() {
     int var_r28 = 0;
     l_findCount = 0;
@@ -424,8 +402,6 @@ fopAc_ac_c* daTag_AllMato_c::getTaroActorP() {
     return NULL;
 }
 
-/* 80488238-80488994 000D78 075C+00 1/1 0/0 0/0 .text            checkCrsMato__15daTag_AllMato_cFv
- */
  int daTag_AllMato_c::checkCrsMato() {
     fopAc_ac_c* sp24 = NULL;
     if (mArrowActorMngr.getActorP() == NULL) {
@@ -500,8 +476,6 @@ fopAc_ac_c* daTag_AllMato_c::getTaroActorP() {
     return 0;
 }
 
-/* 80488994-80488F40 0014D4 05AC+00 1/1 0/0 0/0 .text            checkCrsMato2__15daTag_AllMato_cFv
- */
 int daTag_AllMato_c::checkCrsMato2() {
     fopAc_ac_c* sp28;
     getArrowActorP();
@@ -556,8 +530,6 @@ int daTag_AllMato_c::checkCrsMato2() {
     return 0;
 }
 
-/* 80488F40-80488FD8 001A80 0098+00 1/1 0/0 0/0 .text            checkBrkMato__15daTag_AllMato_cFv
- */
 int daTag_AllMato_c::checkBrkMato() {
     int rt = 0;
 
@@ -573,7 +545,6 @@ int daTag_AllMato_c::checkBrkMato() {
     return 0;
 }
 
-/* 80488FD8-804890B0 001B18 00D8+00 1/1 0/0 0/0 .text            evtChange__15daTag_AllMato_cFUs */
 void daTag_AllMato_c::evtChange(u16 i_action) {
     if (strlen(l_resNameList[l_evtList[i_action].num]) != 0) {
         eventInfo.setArchiveName(l_resNameList[l_evtList[i_action].num]);
@@ -585,32 +556,26 @@ void daTag_AllMato_c::evtChange(u16 i_action) {
     fopAcM_orderChangeEventId(this, mEventIdx, 1, 0xFFFF);
 }
 
-/* 804890B0-804890D0 001BF0 0020+00 1/0 0/0 0/0 .text            daTag_AllMato_Create__FPv */
 static int daTag_AllMato_Create(void* i_this) {
     return ((daTag_AllMato_c*)i_this)->create();
 }
 
-/* 804890D0-804890F0 001C10 0020+00 1/0 0/0 0/0 .text            daTag_AllMato_Delete__FPv */
 static int daTag_AllMato_Delete(void* i_this) {
     return ((daTag_AllMato_c*)i_this)->Delete();
 }
 
-/* 804890F0-80489110 001C30 0020+00 1/0 0/0 0/0 .text            daTag_AllMato_Execute__FPv */
 static int daTag_AllMato_Execute(void* i_this) {
     return ((daTag_AllMato_c*)i_this)->Execute();
 }
 
-/* 80489110-80489130 001C50 0020+00 1/0 0/0 0/0 .text            daTag_AllMato_Draw__FPv */
 static int daTag_AllMato_Draw(void* i_this) {
     return ((daTag_AllMato_c*)i_this)->Draw();
 }
 
-/* 80489130-80489138 001C70 0008+00 1/0 0/0 0/0 .text            daTag_AllMato_IsDelete__FPv */
 static int daTag_AllMato_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80489808-80489828 -00001 0020+00 1/0 0/0 0/0 .data            daTag_AllMato_MethodTable */
 static actor_method_class daTag_AllMato_MethodTable = {
     (process_method_func)daTag_AllMato_Create,
     (process_method_func)daTag_AllMato_Delete,
@@ -619,7 +584,6 @@ static actor_method_class daTag_AllMato_MethodTable = {
     (process_method_func)daTag_AllMato_Draw
 };
 
-/* 80489828-80489858 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_ALLMATO */
 extern actor_process_profile_definition g_profile_TAG_ALLMATO = {
     fpcLy_CURRENT_e,                // mLayerID
     10,                              // mListID
diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp
index 257d43b351..bf510a2d09 100644
--- a/src/d/actor/d_a_tag_arena.cpp
+++ b/src/d/actor/d_a_tag_arena.cpp
@@ -7,28 +7,21 @@
 
 #include "d/actor/d_a_tag_arena.h"
 
-/* 80D55CD8-80D55D28 000078 0050+00 1/0 0/0 0/0 .text            daTagArena_Create__FP10fopAc_ac_c
- */
 static int daTagArena_Create(fopAc_ac_c* i_this) {
     daTagArena_c* arena_tag = (daTagArena_c*)i_this;
     return arena_tag->create();
 }
 
-/* 80D55D28-80D55D58 0000C8 0030+00 1/0 0/0 0/0 .text            daTagArena_Delete__FP12daTagArena_c
- */
 static int daTagArena_Delete(daTagArena_c* i_this) {
     i_this->~daTagArena_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D55D60-80D55D80 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagArena_Method */
 static actor_method_class l_daTagArena_Method = {
     (process_method_func)daTagArena_Create,
     (process_method_func)daTagArena_Delete,
 };
 
-/* 80D55D80-80D55DB0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Arena */
 extern actor_process_profile_definition g_profile_Tag_Arena = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp
index f347a04bf6..2f894ea23b 100644
--- a/src/d/actor/d_a_tag_assistance.cpp
+++ b/src/d/actor/d_a_tag_assistance.cpp
@@ -7,31 +7,24 @@
 
 #include "d/actor/d_a_tag_assistance.h"
 
-/* 80D55E38-80D55E98 000078 0060+00 1/0 0/0 0/0 .text            daTagAssist_Create__FP10fopAc_ac_c
- */
 static int daTagAssist_Create(fopAc_ac_c* i_this) {
     daTagAssist_c* tag_assist = (daTagAssist_c*)i_this;
     return tag_assist->create();
 }
 
-/* 80D55E98-80D55EC8 0000D8 0030+00 1/0 0/0 0/0 .text daTagAssist_Execute__FP13daTagAssist_c */
 static int daTagAssist_Execute(daTagAssist_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D55EC8-80D55ED0 000108 0008+00 1/0 0/0 0/0 .text daTagAssist_IsDelete__FP13daTagAssist_c */
 static int daTagAssist_IsDelete(daTagAssist_c* i_this) {
     return 1;
 }
 
-/* 80D55ED0-80D55F00 000110 0030+00 1/0 0/0 0/0 .text daTagAssist_Delete__FP13daTagAssist_c */
 static int daTagAssist_Delete(daTagAssist_c* i_this) {
     i_this->~daTagAssist_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D55F08-80D55F28 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagAssist_Method */
 static actor_method_class l_daTagAssist_Method = {
     (process_method_func)daTagAssist_Create,
     (process_method_func)daTagAssist_Delete,
@@ -39,7 +32,6 @@ static actor_method_class l_daTagAssist_Method = {
     (process_method_func)daTagAssist_IsDelete
 };
 
-/* 80D55F28-80D55F58 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Assist */
 extern actor_process_profile_definition g_profile_Tag_Assist = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp
index 23e42f479f..78e97941fd 100644
--- a/src/d/actor/d_a_tag_attack_item.cpp
+++ b/src/d/actor/d_a_tag_attack_item.cpp
@@ -4,13 +4,11 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
 
-/* 805A2958-805A2990 000078 0038+00 1/1 0/0 0/0 .text            setBaseMtx__14daTagAtkItem_cFv */
 void daTagAtkItem_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(shape_angle);
 }
 
-/* 805A32F4-805A3338 000000 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1f}, {0x400020, 0x11}, 0x78}},  // mObj
@@ -25,7 +23,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 805A2990-805A2A34 0000B0 00A4+00 1/1 0/0 0/0 .text            Create__14daTagAtkItem_cFv */
 int daTagAtkItem_c::Create() {
     mCcStts.Init(0, 0xFF, this);
     mCyl.Set(l_cyl_src);
@@ -37,7 +34,6 @@ int daTagAtkItem_c::Create() {
     return 1;
 }
 
-/* 805A2A34-805A2B5C 000154 0128+00 1/1 0/0 0/0 .text            create__14daTagAtkItem_cFv */
 int daTagAtkItem_c::create() {
     fopAcM_ct(this, daTagAtkItem_c);
 
@@ -49,7 +45,6 @@ int daTagAtkItem_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A2C48-805A2CA8 000368 0060+00 1/1 0/0 0/0 .text            execute__14daTagAtkItem_cFv */
 int daTagAtkItem_c::execute() {
     action();
     setBaseMtx();
@@ -60,7 +55,6 @@ int daTagAtkItem_c::execute() {
 }
 
 
-/* 805A2CA8-805A2D10 0003C8 0068+00 1/1 0/0 0/0 .text            action__14daTagAtkItem_cFv */
 void daTagAtkItem_c::action() {
     if (checkHit()) {
         if (getEvId() != 0xFF) {
@@ -73,19 +67,16 @@ void daTagAtkItem_c::action() {
 }
 
 
-/* 805A2D10-805A2D34 000430 0024+00 2/1 0/0 0/0 .text            eventStart__14daTagAtkItem_cFv */
 bool daTagAtkItem_c::eventStart() {
     createItem();
     return true;
 }
 
-/* 805A2D34-805A2D58 000454 0024+00 2/1 0/0 0/0 .text            eventEnd__14daTagAtkItem_cFv */
 bool daTagAtkItem_c::eventEnd() {
     fopAcM_delete(this);
     return true;
 }
 
-/* 805A2D58-805A2F54 000478 01FC+00 1/1 0/0 0/0 .text            checkHit__14daTagAtkItem_cFv */
 BOOL daTagAtkItem_c::checkHit() {
     if (mCyl.ChkTgHit()) {
         cCcD_Obj* hitobj_p = mCyl.GetTgHitObj();
@@ -112,7 +103,6 @@ BOOL daTagAtkItem_c::checkHit() {
     return false;
 }
 
-/* 805A2F54-805A3038 000674 00E4+00 2/2 0/0 0/0 .text            createItem__14daTagAtkItem_cFv */
 void daTagAtkItem_c::createItem() {
     csXyz angle(0, 0, 0);
 
@@ -136,27 +126,22 @@ void daTagAtkItem_c::createItem() {
     }
 }
 
-/* 805A3038-805A3040 000758 0008+00 1/1 0/0 0/0 .text            _delete__14daTagAtkItem_cFv */
 int daTagAtkItem_c::_delete() {
     return 1;
 }
 
-/* 805A3040-805A3060 000760 0020+00 1/0 0/0 0/0 .text daTagAtkItem_Execute__FP14daTagAtkItem_c */
 static int daTagAtkItem_Execute(daTagAtkItem_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A3060-805A3080 000780 0020+00 1/0 0/0 0/0 .text daTagAtkItem_Delete__FP14daTagAtkItem_c */
 static int daTagAtkItem_Delete(daTagAtkItem_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805A3080-805A30A0 0007A0 0020+00 1/0 0/0 0/0 .text daTagAtkItem_Create__FP14daTagAtkItem_c */
 static int daTagAtkItem_Create(daTagAtkItem_c* i_this) {
     return i_this->create();
 }
 
-/* 805A3338-805A3358 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagAtkItem_Method */
 static actor_method_class l_daTagAtkItem_Method = {
     (process_method_func)daTagAtkItem_Create,
     (process_method_func)daTagAtkItem_Delete,
@@ -165,7 +150,6 @@ static actor_method_class l_daTagAtkItem_Method = {
     (process_method_func)NULL,
 };
 
-/* 805A3358-805A3388 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_AttackItem */
 extern actor_process_profile_definition g_profile_Tag_AttackItem = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp
index 48d6554260..79936139ef 100644
--- a/src/d/actor/d_a_tag_attention.cpp
+++ b/src/d/actor/d_a_tag_attention.cpp
@@ -10,7 +10,6 @@
 
 static const u8 l_dist_tbl[] = { 0x23, 0x24 };
 
-/* 804D5318-804D5354 000078 003C+00 1/1 0/0 0/0 .text            Create__8daAttp_cFv */
 int daAttp_c::Create() {
     attention_info.distances[fopAc_attn_LOCK_e] = l_dist_tbl[daAttp_prm::getArg4(this)];
 
@@ -18,14 +17,12 @@ int daAttp_c::Create() {
     return 1;
 }
 
-/* 804D5354-804D53AC 0000B4 0058+00 1/1 0/0 0/0 .text            create__8daAttp_cFv */
 int daAttp_c::create() {
     fopAcM_ct(this, daAttp_c);
     Create();
     return cPhs_COMPLEATE_e;
 }
 
-/* 804D53AC-804D568C 00010C 02E0+00 3/2 0/0 0/0 .text            execute__8daAttp_cFv */
 int daAttp_c::execute() {
     bool bVar1 = true;
     fopAc_ac_c& link = *daPy_getPlayerActorClass();
@@ -122,46 +119,37 @@ int daAttp_c::execute() {
     return 1;
 }
 
-/* 804D568C-804D5694 0003EC 0008+00 1/1 0/0 0/0 .text            draw__8daAttp_cFv */
 int daAttp_c::draw() {
     return 1;
 }
 
-/* 804D5694-804D569C 0003F4 0008+00 1/1 0/0 0/0 .text            _delete__8daAttp_cFv */
 int daAttp_c::_delete() {
     return 1;
 }
 
-/* 804D569C-804D56BC 0003FC 0020+00 1/0 0/0 0/0 .text            daAttp_Draw__FP8daAttp_c */
 static int daAttp_Draw(daAttp_c* i_this) {
     return i_this->draw();
 }
 
-/* 804D56BC-804D56DC 00041C 0020+00 1/0 0/0 0/0 .text            daAttp_Execute__FP8daAttp_c */
 
 static int daAttp_Execute(daAttp_c* i_this) {
     return i_this->execute();
 }
 
-/* 804D56DC-804D56FC 00043C 0020+00 1/0 0/0 0/0 .text            daAttp_Delete__FP8daAttp_c */
 static int daAttp_Delete(daAttp_c* i_this) {
     return i_this->_delete();
 }
 
-/* 804D56FC-804D571C 00045C 0020+00 1/0 0/0 0/0 .text            daAttp_Create__FP10fopAc_ac_c */
 static int daAttp_Create(fopAc_ac_c* i_this) {
     return static_cast<daAttp_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 804D574C-804D576C -00001 0020+00 1/0 0/0 0/0 .data            l_daAttp_Method */
 static actor_method_class l_daAttp_Method = {
     (process_method_func)daAttp_Create,  (process_method_func)daAttp_Delete,
     (process_method_func)daAttp_Execute, (process_method_func)NULL,
     (process_method_func)daAttp_Draw,
 };
 
-/* 804D576C-804D579C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Attp */
 extern actor_process_profile_definition g_profile_Tag_Attp = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp
index d2febc9a04..2a26995e22 100644
--- a/src/d/actor/d_a_tag_bottle_item.cpp
+++ b/src/d/actor/d_a_tag_bottle_item.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 80D55FD8-80D5605C 000078 0084+00 1/1 0/0 0/0 .text            create__18daTag_BottleItem_cFv */
 s32 daTag_BottleItem_c::create() {
     s32 ret;
 
@@ -28,12 +27,10 @@ s32 daTag_BottleItem_c::create() {
 }
 
 
-/* 80D5605C-80D56064 0000FC 0008+00 1/1 0/0 0/0 .text            Delete__18daTag_BottleItem_cFv */
 s32 daTag_BottleItem_c::Delete() {
     return 1;
 }
 
-/* 80D56064-80D560D0 000104 006C+00 2/2 0/0 0/0 .text            Execute__18daTag_BottleItem_cFv */
 s32 daTag_BottleItem_c::Execute() {
     if (chkEvent()) {
         if (mProcessFunc) {
@@ -46,26 +43,21 @@ s32 daTag_BottleItem_c::Execute() {
     return 1;
 }
 
-/* 80D560D0-80D560D8 000170 0008+00 1/1 0/0 0/0 .text            Draw__18daTag_BottleItem_cFv */
 s32 daTag_BottleItem_c::Draw() {
     return 1;
 }
 
-/* 80D560D8-80D56100 000178 0028+00 1/1 0/0 0/0 .text setTypeFromParam__18daTag_BottleItem_cFv */
 void daTag_BottleItem_c::setTypeFromParam() {
     mBottleItemType = fopAcM_GetParam(this);
     makeSoup();
 }
 
-/* 80D56100-80D56170 0001A0 0070+00 1/1 0/0 0/0 .text            restart__18daTag_BottleItem_cFv */
 void daTag_BottleItem_c::restart() {
     current.angle.set(0,home.angle.y,0);
     shape_angle = current.angle;
     setProcess(&daTag_BottleItem_c::wait);
 }
 
-/* 80D56170-80D561E8 000210 0078+00 1/1 0/0 0/0 .text            initialize__18daTag_BottleItem_cFv
- */
 void daTag_BottleItem_c::initialize() {
     fopAcM_setCullSizeBox(this,-30.0f,-15.0f,-30.0f,30.0f,45.0f,30.0f);
     attention_info.flags = 0;
@@ -75,14 +67,10 @@ void daTag_BottleItem_c::initialize() {
     Execute();
 }
 
-/* 80D561E8-80D56214 000288 002C+00 1/1 0/0 0/0 .text
- * checkProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i */
 int daTag_BottleItem_c::checkProcess(ProcessFunc i_processFunc) {
     return mProcessFunc == i_processFunc;
 }
 
-/* 80D56214-80D56300 0002B4 00EC+00 1/1 0/0 0/0 .text
- * setProcess__18daTag_BottleItem_cFM18daTag_BottleItem_cFPCvPvPv_i */
 int daTag_BottleItem_c::setProcess(ProcessFunc i_processFunc) {
     int uVar3 = 0;
 
@@ -106,14 +94,11 @@ int daTag_BottleItem_c::setProcess(ProcessFunc i_processFunc) {
     return uVar3;
 }
 
-/* 80D56300-80D56334 0003A0 0034+00 1/1 0/0 0/0 .text            setAttnPos__18daTag_BottleItem_cFv
- */
 void daTag_BottleItem_c::setAttnPos() {
     attention_info.position = current.pos;
     eyePos = current.pos;
 }
 
-/* 80D56334-80D56384 0003D4 0050+00 1/1 0/0 0/0 .text            chkEvent__18daTag_BottleItem_cFv */
 s32 daTag_BottleItem_c::chkEvent() {
     s32 uVar2 = 1;
   
@@ -127,8 +112,6 @@ s32 daTag_BottleItem_c::chkEvent() {
     return uVar2;
 }
 
-/* 80D56384-80D56418 000424 0094+00 1/1 0/0 0/0 .text            orderEvent__18daTag_BottleItem_cFv
- */
 s32 daTag_BottleItem_c::orderEvent() {
     makeSoup();
 
@@ -147,7 +130,6 @@ s32 daTag_BottleItem_c::orderEvent() {
     return 1;
 }
 
-/* 80D56418-80D564A0 0004B8 0088+00 2/2 0/0 0/0 .text            makeSoup__18daTag_BottleItem_cFv */
 void daTag_BottleItem_c::makeSoup() {
     if (mBottleItemType == fpcNm_ITEM_LV1_SOUP
            /* dSv_event_flag_c::F_0003 - Snowpeak Ruins - Handed over tomato puree and left room */
@@ -162,7 +144,6 @@ void daTag_BottleItem_c::makeSoup() {
     }
 }
 
-/* 80D564A0-80D56568 000540 00C8+00 1/0 0/0 0/0 .text            wait__18daTag_BottleItem_cFPv */
 int daTag_BottleItem_c::wait(void* param_0) {
     switch(mEventType) {
     case 1:
@@ -181,32 +162,26 @@ int daTag_BottleItem_c::wait(void* param_0) {
     return 1;
 }
 
-/* 80D56568-80D56588 000608 0020+00 1/0 0/0 0/0 .text            daTag_BottleItem_Create__FPv */
 static s32 daTag_BottleItem_Create(void* i_this) {
     return static_cast<daTag_BottleItem_c*>(i_this)->create();
 }
 
-/* 80D56588-80D565A8 000628 0020+00 1/0 0/0 0/0 .text            daTag_BottleItem_Delete__FPv */
 static s32 daTag_BottleItem_Delete(void* i_this) {
     return static_cast<daTag_BottleItem_c*>(i_this)->Delete();
 }
 
-/* 80D565A8-80D565C8 000648 0020+00 1/0 0/0 0/0 .text            daTag_BottleItem_Execute__FPv */
 static s32 daTag_BottleItem_Execute(void* i_this) {
     return static_cast<daTag_BottleItem_c*>(i_this)->Execute();
 }
 
-/* 80D565C8-80D565E8 000668 0020+00 1/0 0/0 0/0 .text            daTag_BottleItem_Draw__FPv */
 static s32 daTag_BottleItem_Draw(void* i_this) {
     return static_cast<daTag_BottleItem_c*>(i_this)->Draw();
 }
 
-/* 80D565E8-80D565F0 000688 0008+00 1/0 0/0 0/0 .text            daTag_BottleItem_IsDelete__FPv */
 static s32 daTag_BottleItem_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D565F0-80D56650 000690 0060+00 1/0 0/0 0/0 .text            __dt__18daTag_BottleItem_cFv */
 daTag_BottleItem_c::~daTag_BottleItem_c() {}
 
 static actor_method_class daTag_BottleItem_MethodTable = {
@@ -217,7 +192,6 @@ static actor_method_class daTag_BottleItem_MethodTable = {
     (process_method_func)daTag_BottleItem_Draw
 };
 
-/* 80D5669C-80D566CC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_BTLITM */
 extern actor_process_profile_definition g_profile_TAG_BTLITM = {
     fpcLy_CURRENT_e,                // mLayerID
     7,                              // mListID
diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp
index 4ec7fdba6c..20cc72700e 100644
--- a/src/d/actor/d_a_tag_camera.cpp
+++ b/src/d/actor/d_a_tag_camera.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_camera
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_camera.h"
@@ -12,187 +7,133 @@
 #include "d/actor/d_a_horse.h"
 
 namespace {
-/* 80489A98-80489AA0 000078 0008+00 1/0 0/0 0/0 .text
- * always_true__28@unnamed@d_a_tag_camera_cpp@Fv                */
 bool always_true() {
     return true;
 }
 
-/* 8048A670-8048A674 000000 0004+00 15/15 0/0 0/0 .bss Player__28@unnamed@d_a_tag_camera_cpp@ */
 daAlink_c* Player;
 
-/* 80489AA0-80489B18 000080 0078+00 1/0 0/0 0/0 .text
- * is_player_riding_horse__28@unnamed@d_a_tag_camera_cpp@Fv     */
 bool is_player_riding_horse() {
     return Player->checkHorseRide() || Player->checkBoarRide();
 }
 
-/* 80489B18-80489B2C 0000F8 0014+00 1/0 0/0 0/0 .text
- * is_player_swimming__28@unnamed@d_a_tag_camera_cpp@Fv         */
 bool is_player_swimming() {
     return dComIfGp_checkPlayerStatus0(0, 0x100000);
 }
 
-/* 80489B2C-80489B6C 00010C 0040+00 1/0 0/0 0/0 .text
- * is_player_riding_canoe__28@unnamed@d_a_tag_camera_cpp@Fv     */
 bool is_player_riding_canoe() {
     return Player->checkCanoeRide() != 0;
 }
 
-/* 80489B6C-80489BE0 00014C 0074+00 1/0 0/0 0/0 .text
- * is_player_jumping_by_horse__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_jumping_by_horse() {
     daHorse_c* phorse = dComIfGp_getHorseActor();
 
     return Player->checkHorseRide() && phorse->checkJump();
 }
 
-/* 80489BE0-80489C04 0001C0 0024+00 1/0 0/0 0/0 .text
- * is_player_climbing__28@unnamed@d_a_tag_camera_cpp@Fv         */
 bool is_player_climbing() {
     return dComIfGp_checkPlayerStatus0(0, 0x2000008) != 0;
 }
 
-/* 80489C04-80489C1C 0001E4 0018+00 1/0 0/0 0/0 .text
- * is_player_wear_magneboots__28@unnamed@d_a_tag_camera_cpp@Fv  */
 bool is_player_wear_magneboots() {
     return Player->checkMagneBootsOn();
 }
 
-/* 80489C1C-80489C34 0001FC 0018+00 1/0 0/0 0/0 .text
- * is_player_wolf__28@unnamed@d_a_tag_camera_cpp@Fv             */
 bool is_player_wolf() {
     return Player->checkNowWolf();
 }
 
-/* 80489C34-80489C6C 000214 0038+00 1/0 0/0 0/0 .text
- * is_player_pulling_chainblock__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_pulling_chainblock() {
     return Player->checkChainBlockPushPull();
 }
 
-/* 80489C6C-80489CAC 00024C 0040+00 1/0 0/0 0/0 .text
- * is_player_playing_spinner__28@unnamed@d_a_tag_camera_cpp@Fv  */
 bool is_player_playing_spinner() {
     return Player->checkSpinnerRide() != 0;
 }
 
-/* 80489CAC-80489CE4 00028C 0038+00 1/0 0/0 0/0 .text
- * is_player_sliding_slope__28@unnamed@d_a_tag_camera_cpp@Fv    */
 bool is_player_sliding_slope() {
     return Player->checkLv3Slide();
 }
 
-/* 80489CE4-80489CF8 0002C4 0014+00 2/1 0/0 0/0 .text
- * is_player_on_watersurface__28@unnamed@d_a_tag_camera_cpp@Fv  */
 bool is_player_on_watersurface() {
     return dComIfGp_checkCameraAttentionStatus(0, 0x800) != 0;
 }
 
-/* 80489CF8-80489D30 0002D8 0038+00 1/0 0/0 0/0 .text
- * is_player_moving_on_spinnerrail__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_moving_on_spinnerrail() {
     return Player->checkSpinnerPathMove();
 }
 
-/* 80489D30-80489D5C 000310 002C+00 1/0 0/0 0/0 .text
- * is_player_gliding__28@unnamed@d_a_tag_camera_cpp@Fv          */
 bool is_player_gliding() {
     return Player->checkCokkoGlide();
 }
 
-/* 80489D5C-80489D70 00033C 0014+00 1/0 0/0 0/0 .text
- * is_player_hunging_by_hookshot__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_hunging_by_hookshot() {
     return dComIfGp_checkPlayerStatus1(0, 0x10000) != 0;
 }
 
-/* 80489D70-80489DB0 000350 0040+00 1/0 0/0 0/0 .text
- * is_player_on_rope__28@unnamed@d_a_tag_camera_cpp@Fv          */
 bool is_player_on_rope() {
     return Player->checkWolfRope() != 0;
 }
 
-/* 80489DB0-80489DE4 000390 0034+00 1/0 0/0 0/0 .text
- * is_player_using_copyrod__28@unnamed@d_a_tag_camera_cpp@Fv    */
 bool is_player_using_copyrod() {
     return Player->getCopyRodCameraActor() != NULL;
 }
 
-/* 80489DE4-80489DF8 0003C4 0014+00 1/0 0/0 0/0 .text
- * is_player_hunging_wall_by_hookshot__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_hunging_wall_by_hookshot() {
     return dComIfGp_checkPlayerStatus1(0, 0x2000000) != 0;
 }
 
-/* 80489DF8-80489E18 0003D8 0020+00 1/0 0/0 0/0 .text
- * is_player_carried_by_cargo__28@unnamed@d_a_tag_camera_cpp@Fv */
 bool is_player_carried_by_cargo() {
     return Player->checkCargoCarry();
 }
 
-/* 80489E18-80489E8C 0003F8 0074+00 1/0 0/0 0/0 .text
- * is_player_playing_rodeo__28@unnamed@d_a_tag_camera_cpp@Fv    */
 bool is_player_playing_rodeo() {
     daHorse_c* phorse = dComIfGp_getHorseActor();
 
     return Player->checkHorseRide() && phorse->checkRodeoMode();
 }
 
-/* 80489E8C-80489EDC 00046C 0050+00 1/0 0/0 0/0 .text
- * is_player_in_water__28@unnamed@d_a_tag_camera_cpp@Fv         */
 bool is_player_in_water() {
     return dComIfGp_checkPlayerStatus0(0, 0x100000) && !is_player_on_watersurface();
 }
 
-/* 80489EDC-80489F14 0004BC 0038+00 1/0 0/0 0/0 .text
- * is_player_hugging_eal__28@unnamed@d_a_tag_camera_cpp@Fv      */
 bool is_player_hugging_eal() {
     return Player->checkOctaIealHang();
 }
 }  // namespace
 
-/* 80489F14-80489F20 0004F4 000C+00 1/1 0/0 0/0 .text            getSwType__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getSwType() {
     return fopAcM_GetParam(this) & 0xF;
 }
 
-/* 80489F20-80489F2C 000500 000C+00 1/1 0/0 0/0 .text            getPrio__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getPrio() {
     return (fopAcM_GetParam(this) >> 4) & 0xF;
 }
 
-/* 80489F2C-80489F38 00050C 000C+00 1/1 0/0 0/0 .text            getSwBit__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getSwBit() {
     return (fopAcM_GetParam(this) >> 8) & 0xFF;
 }
 
-/* 80489F38-80489F44 000518 000C+00 2/2 0/0 0/0 .text            getCondition__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getCondition() {
     return (fopAcM_GetParam(this) >> 0x10) & 0xFF;
 }
 
-/* 80489F44-80489F50 000524 000C+00 1/1 0/0 0/0 .text            getCameraId__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getCameraId() {
     return (fopAcM_GetParam(this) >> 0x18) & 0xFF;
 }
 
-/* 80489F50-80489F5C 000530 000C+00 1/1 0/0 0/0 .text            getRailID__11daTag_Cam_cFv */
 u8 daTag_Cam_c::getRailID() {
     return home.angle.z & 0xFF;
 }
 
-/* 80489F5C-80489F68 00053C 000C+00 2/2 0/0 0/0 .text            getAreaType__11daTag_Cam_cFv */
 u16 daTag_Cam_c::getAreaType() {
     return home.angle.z & 0x100;
 }
 
-/* 80489F68-80489F74 000548 000C+00 1/1 0/0 0/0 .text            getAreaNoChk__11daTag_Cam_cFv */
 u16 daTag_Cam_c::getAreaNoChk() {
     return home.angle.z & 0x200;
 }
 
-/* 8048A590-8048A59C 000000 000C+00 2/2 0/0 0/0 .rodata          @3874 */
 static u8 const lit_3874[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
@@ -252,7 +193,6 @@ int daTag_Cam_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80489F74-8048A378 000554 0404+00 1/1 0/0 0/0 .text            execute__11daTag_Cam_cFv */
 int daTag_Cam_c::execute() {
     if (fopAcM_GetRoomNo(this) != dComIfGp_roomControl_getStayNo()) {
         return 0;
@@ -328,45 +268,35 @@ int daTag_Cam_c::execute() {
     return 1;
 }
 
-/* 8048A378-8048A380 000958 0008+00 1/0 0/0 0/0 .text            daTag_Cam_Draw__FP11daTag_Cam_c */
 static int daTag_Cam_Draw(daTag_Cam_c* i_this) {
     return 1;
 }
 
-/* 8048A380-8048A3A4 000960 0024+00 1/0 0/0 0/0 .text            daTag_Cam_Execute__FP11daTag_Cam_c
- */
 static int daTag_Cam_Execute(daTag_Cam_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 8048A3A4-8048A3AC 000984 0008+00 1/0 0/0 0/0 .text            daTag_Cam_IsDelete__FP11daTag_Cam_c
- */
 static int daTag_Cam_IsDelete(daTag_Cam_c* i_this) {
     return 1;
 }
 
-/* 8048A3AC-8048A3DC 00098C 0030+00 1/0 0/0 0/0 .text            daTag_Cam_Delete__FP11daTag_Cam_c
- */
 static int daTag_Cam_Delete(daTag_Cam_c* i_this) {
     i_this->~daTag_Cam_c();
     return 1;
 }
 
-/* 8048A3DC-8048A588 0009BC 01AC+00 1/0 0/0 0/0 .text            daTag_Cam_Create__FP10fopAc_ac_c */
 static int daTag_Cam_Create(fopAc_ac_c* i_this) {
     daTag_Cam_c* a_this = (daTag_Cam_c*)i_this;
     return a_this->create();
 }
 
-/* 8048A620-8048A640 -00001 0020+00 1/0 0/0 0/0 .data            l_daTag_Cam_Method */
 static actor_method_class l_daTag_Cam_Method = {
     (process_method_func)daTag_Cam_Create,  (process_method_func)daTag_Cam_Delete,
     (process_method_func)daTag_Cam_Execute, (process_method_func)daTag_Cam_IsDelete,
     (process_method_func)daTag_Cam_Draw,
 };
 
-/* 8048A640-8048A670 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_CAMERA */
 extern actor_process_profile_definition g_profile_TAG_CAMERA = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp
index 1846c7c8ef..f7c17fbf5b 100644
--- a/src/d/actor/d_a_tag_chgrestart.cpp
+++ b/src/d/actor/d_a_tag_chgrestart.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_chgrestart.h"
 #include "d/d_procname.h"
 
-/* 80D56758-80D567E4 000078 008C+00 1/1 0/0 0/0 .text            Create__17daTagChgRestart_cFv */
 s32 daTagChgRestart_c::Create() {
     mVertices[0].x = -100.0f * scale.x;
     mVertices[0].z = -100.0f * scale.z;
@@ -30,7 +29,6 @@ s32 daTagChgRestart_c::Create() {
     return 1;
 }
 
-/* 80D567E4-80D56878 000104 0094+00 1/1 0/0 0/0 .text            create__17daTagChgRestart_cFv */
 s32 daTagChgRestart_c::create() {
     fopAcM_ct(this, daTagChgRestart_c);
 
@@ -41,7 +39,6 @@ s32 daTagChgRestart_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D568B8-80D56A84 0001D8 01CC+00 1/1 0/0 0/0 .text            execute__17daTagChgRestart_cFv */
 s32 daTagChgRestart_c::execute() {
     if (fopAcM_isSwitch(this, daTagChgRestart_prm::getSwNo(this))) {
         return 1;
@@ -85,37 +82,28 @@ s32 daTagChgRestart_c::execute() {
     return 1;
 }
 
-/* 80D56A84-80D56A8C 0003A4 0008+00 1/1 0/0 0/0 .text            _delete__17daTagChgRestart_cFv */
 s32 daTagChgRestart_c::_delete() {
     return 1;
 }
 
-/* 80D56A8C-80D56AAC 0003AC 0020+00 1/0 0/0 0/0 .text
- * daTagChgRestart_Execute__FP17daTagChgRestart_c               */
 static s32 daTagChgRestart_Execute(daTagChgRestart_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D56AAC-80D56ACC 0003CC 0020+00 1/0 0/0 0/0 .text
- * daTagChgRestart_Delete__FP17daTagChgRestart_c                */
 static s32 daTagChgRestart_Delete(daTagChgRestart_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D56ACC-80D56AEC 0003EC 0020+00 1/0 0/0 0/0 .text daTagChgRestart_Create__FP10fopAc_ac_c */
 static s32 daTagChgRestart_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagChgRestart_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80D56B00-80D56B20 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagChgRestart_Method */
 static actor_method_class l_daTagChgRestart_Method = {
     (process_method_func)daTagChgRestart_Create,
     (process_method_func)daTagChgRestart_Delete,
     (process_method_func)daTagChgRestart_Execute,
 };
 
-/* 80D56B20-80D56B50 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_ChgRestart */
 extern actor_process_profile_definition g_profile_Tag_ChgRestart = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp
index 524171d11c..0aa8b7fdd0 100644
--- a/src/d/actor/d_a_tag_chkpoint.cpp
+++ b/src/d/actor/d_a_tag_chkpoint.cpp
@@ -9,7 +9,6 @@
 #include <cmath.h>
 #include "d/actor/d_a_player.h"
 
-/* 8048A6F8-8048A9EC 000078 02F4+00 1/1 0/0 0/0 .text            execute__11daTag_Chk_cFv */
 int daTag_Chk_c::execute() {
     if (fopAcM_GetRoomNo(this) != dComIfGp_roomControl_getStayNo()) {
         return 0;
@@ -75,43 +74,33 @@ int daTag_Chk_c::execute() {
     return 1;
 }
 
-/* 8048A9EC-8048A9F4 00036C 0008+00 1/0 0/0 0/0 .text            daTag_Chk_Draw__FP11daTag_Chk_c */
 static int daTag_Chk_Draw(daTag_Chk_c* i_this) {
     return 1;
 }
 
-/* 8048A9F4-8048AA18 000374 0024+00 1/0 0/0 0/0 .text            daTag_Chk_Execute__FP11daTag_Chk_c
- */
 static int daTag_Chk_Execute(daTag_Chk_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 8048AA18-8048AA20 000398 0008+00 1/0 0/0 0/0 .text            daTag_Chk_IsDelete__FP11daTag_Chk_c
- */
 static int daTag_Chk_IsDelete(daTag_Chk_c* i_this) {
     return 1;
 }
 
-/* 8048AA20-8048AA50 0003A0 0030+00 1/0 0/0 0/0 .text            daTag_Chk_Delete__FP11daTag_Chk_c
- */
 static int daTag_Chk_Delete(daTag_Chk_c* i_this) {
     i_this->~daTag_Chk_c();
     return 1;
 }
 
-/* 8048AA50-8048AC20 0003D0 01D0+00 1/0 0/0 0/0 .text            daTag_Chk_Create__FP10fopAc_ac_c */
 static int daTag_Chk_Create(fopAc_ac_c* i_this) {
     return static_cast<daTag_Chk_c*>(i_this)->create();
 }
 
-/* 8048AC68-8048AC88 -00001 0020+00 1/0 0/0 0/0 .data            l_daTag_Chk_Method */
 static actor_method_class l_daTag_Chk_Method = {
     (process_method_func)daTag_Chk_Create, (process_method_func)daTag_Chk_Delete,
     (process_method_func)daTag_Chk_Execute, (process_method_func)daTag_Chk_IsDelete,
     (process_method_func)daTag_Chk_Draw};
 
-/* 8048AC88-8048ACB8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_CHKPOINT */
 extern actor_process_profile_definition g_profile_TAG_CHKPOINT = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp
index 348cf30b21..674959ab27 100644
--- a/src/d/actor/d_a_tag_csw.cpp
+++ b/src/d/actor/d_a_tag_csw.cpp
@@ -10,10 +10,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_w.h"
 
-/* 80D58648-80D5864C -00001 0004+00 2/3 0/0 0/0 .data            l_arcName */
 static const char* l_arcName = "Lv6Warp";
 
-/* 80D5864C-80D58690 000024 0044+00 0/1 0/0 0/0 .data            l_cyl_src */
 #pragma push
 #pragma force_active on
 static dCcD_SrcCyl l_cyl_src = {
@@ -31,7 +29,6 @@ static dCcD_SrcCyl l_cyl_src = {
 };
 #pragma pop
 
-/* 80D58690-80D586D4 000068 0044+00 0/1 0/0 0/0 .data            l_tg_src */
 #pragma push
 #pragma force_active on
 static dCcD_SrcCyl l_tg_src = {
@@ -49,26 +46,20 @@ static dCcD_SrcCyl l_tg_src = {
 };
 #pragma pop
 
-/* 80D56BD8-80D56D98 000078 01C0+00 1/1 0/0 0/0 .text            __dt__10daTagCsw_cFv */
 daTagCsw_c::~daTagCsw_c() {}
 
-/* ############################################################################################## */
-/* 80D585B8-80D585C0 000000 0008+00 2/2 0/0 0/0 .rodata          l_bmd_idx */
 static u8 const l_bmd_idx[8] = {
     0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x06,
 };
 
-/* 80D585C0-80D585C8 000008 0008+00 0/0 0/0 0/0 .rodata          l_brk_idx */
 static u8 const l_brk_idx[8] = {
     0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0A,
 };
 
-/* 80D585C8-80D585D0 000010 0008+00 0/0 0/0 0/0 .rodata          l_dbz_idx */
 static u8 const l_dbz_idx[8] = {
     0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x0E,
 };
 
-/* 80D56D98-80D56EF8 000238 0160+00 2/2 0/0 0/0 .text            setMtx__10daTagCsw_cFv */
 void daTagCsw_c::setMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::YrotM(current.angle.y);
@@ -90,7 +81,6 @@ void daTagCsw_c::setMtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x5bc);
 }
 
-/* 80D56EF8-80D572B8 000398 03C0+00 1/1 0/0 0/0 .text            createHeap__10daTagCsw_cFv */
 int daTagCsw_c::createHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5);
     JUT_ASSERT(303, modelData != NULL);
@@ -164,12 +154,10 @@ int daTagCsw_c::createHeap() {
     return 1;
 }
 
-/* 80D57300-80D57320 0007A0 0020+00 1/1 0/0 0/0 .text daTagCsw_c_createHeap__FP10fopAc_ac_c */
 static int daTagCsw_c_createHeap(fopAc_ac_c* i_this) {
     return static_cast<daTagCsw_c*>(i_this)->createHeap();
 }
 
-/* 80D57320-80D573C0 0007C0 00A0+00 1/1 0/0 0/0 .text chkInsideStatueStart__10daTagCsw_cFv */
 int daTagCsw_c::chkInsideStatueStart() {
     bool rv = false;
     if (fopAcM_isSwitch(this, getSw())) {
@@ -186,7 +174,6 @@ int daTagCsw_c::chkInsideStatueStart() {
     return rv;
 }
 
-/* 80D573C0-80D576D4 000860 0314+00 1/1 0/0 0/0 .text            create__10daTagCsw_cFv */
 int daTagCsw_c::create() {
     fopAcM_ct(this, daTagCsw_c);
     field_0x570 = getType();
@@ -234,7 +221,6 @@ int daTagCsw_c::create() {
     return rv;
 }
 
-/* 80D577C0-80D57840 000C60 0080+00 1/1 0/0 0/0 .text            searchTagCswOut__FPvPv */
 static void* searchTagCswOut(void* param_1, void* param_2) {
     if (param_1 != NULL && fopAcM_IsActor(param_1) && fopAcM_GetProfName(param_1) == PROC_TAG_CSW &&
         static_cast<daTagCsw_c*>(param_1)->getType() == 1)
@@ -248,7 +234,6 @@ static void* searchTagCswOut(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D57840-80D5789C 000CE0 005C+00 1/1 0/0 0/0 .text            searchCStatue__FPvPv */
 static void* searchCStatue(void* param_1, void* param_2) {
     if (param_1 != NULL && fopAcM_IsActor(param_1) && fopAcM_GetProfName(param_1) == PROC_CSTATUE &&
         static_cast<daCstatue_c*>(param_1)->checkNormalType())
@@ -258,7 +243,6 @@ static void* searchCStatue(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D5789C-80D57968 000D3C 00CC+00 1/1 0/0 0/0 .text            Delete__10daTagCsw_cFv */
 int daTagCsw_c::Delete() {
     if (field_0x584 != NULL && field_0x584->ChkUsed()) {
         dComIfG_Bgsp().Release(field_0x584);
@@ -272,7 +256,6 @@ int daTagCsw_c::Delete() {
     return dComIfG_resDelete(this, l_arcName);
 }
 
-/* 80D57968-80D579A8 000E08 0040+00 2/2 0/0 0/0 .text            onLight__10daTagCsw_cFv */
 void daTagCsw_c::onLight() {
     field_0x57c->setPlayMode(0);
     field_0x57c->setPlaySpeed(1.0f);
@@ -283,7 +266,6 @@ void daTagCsw_c::onLight() {
     mLightOn = true;
 }
 
-/* 80D579A8-80D579E8 000E48 0040+00 2/2 0/0 0/0 .text            offLight__10daTagCsw_cFv */
 void daTagCsw_c::offLight() {
     field_0x57c->setPlayMode(1);
     field_0x57c->setPlaySpeed(-1.0f);
@@ -294,7 +276,6 @@ void daTagCsw_c::offLight() {
     mLightOn = false;
 }
 
-/* 80D579E8-80D583B8 000E88 09D0+00 1/1 0/0 0/0 .text            execute__10daTagCsw_cFv */
 int daTagCsw_c::execute() {
     bool bVar3 = false;
     daCstatue_c* statue = (daCstatue_c*)fopAcM_Search(searchCStatue, this);
@@ -475,7 +456,6 @@ int daTagCsw_c::execute() {
     return 1;
 }
 
-/* 80D583B8-80D584C4 001858 010C+00 1/1 0/0 0/0 .text            draw__10daTagCsw_cFv */
 int daTagCsw_c::draw() {
     field_0x57c->entry(field_0x574->getModelData());
     if (field_0x578 != NULL) {
@@ -495,35 +475,28 @@ int daTagCsw_c::draw() {
     return 1;
 }
 
-/* 80D584C4-80D584E4 001964 0020+00 1/0 0/0 0/0 .text            daTagCsw_Draw__FP10daTagCsw_c */
 static int daTagCsw_Draw(daTagCsw_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D584E4-80D58504 001984 0020+00 1/0 0/0 0/0 .text            daTagCsw_Execute__FP10daTagCsw_c */
 static int daTagCsw_Execute(daTagCsw_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D58504-80D5850C 0019A4 0008+00 1/0 0/0 0/0 .text            daTagCsw_IsDelete__FP10daTagCsw_c
- */
 static int daTagCsw_IsDelete(daTagCsw_c* i_this) {
     return 1;
 }
 
-/* 80D5850C-80D58548 0019AC 003C+00 1/0 0/0 0/0 .text            daTagCsw_Delete__FP10daTagCsw_c */
 static int daTagCsw_Delete(daTagCsw_c* i_this) {
     i_this->Delete();
     i_this->~daTagCsw_c();
     return 1;
 }
 
-/* 80D58548-80D58568 0019E8 0020+00 1/0 0/0 0/0 .text            daTagCsw_Create__FP10fopAc_ac_c */
 static int daTagCsw_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagCsw_c*>(i_this)->create();
 }
 
-/* 80D586D4-80D586F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagCsw_Method */
 static actor_method_class l_daTagCsw_Method = {
     (process_method_func)daTagCsw_Create,
     (process_method_func)daTagCsw_Delete,
@@ -532,7 +505,6 @@ static actor_method_class l_daTagCsw_Method = {
     (process_method_func)daTagCsw_Draw,
 };
 
-/* 80D586F4-80D58724 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_CSW */
 extern actor_process_profile_definition g_profile_TAG_CSW = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp
index 4ab15bc9d5..6f318f7ee1 100644
--- a/src/d/actor/d_a_tag_escape.cpp
+++ b/src/d/actor/d_a_tag_escape.cpp
@@ -8,21 +8,16 @@
 #include "d/actor/d_a_tag_escape.h"
 #include "d/d_procname.h"
 
-/* 80D587D8-80D58828 000078 0050+00 1/0 0/0 0/0 .text            daTagEscape_Create__FP10fopAc_ac_c
- */
 static int daTagEscape_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, daTagEscape_c);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D58828-80D58858 0000C8 0030+00 1/0 0/0 0/0 .text daTagEscape_Delete__FP13daTagEscape_c */
 static int daTagEscape_Delete(daTagEscape_c* i_this) {
     i_this->~daTagEscape_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D58860-80D58880 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagEscape_Method */
 static actor_method_class l_daTagEscape_Method = {
     (process_method_func)daTagEscape_Create,
     (process_method_func)daTagEscape_Delete,
@@ -31,7 +26,6 @@ static actor_method_class l_daTagEscape_Method = {
     (process_method_func)NULL,
 };
 
-/* 80D58880-80D588B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Escape */
 extern actor_process_profile_definition g_profile_Tag_Escape = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp
index 574c0a02cf..b7071829e3 100644
--- a/src/d/actor/d_a_tag_event.cpp
+++ b/src/d/actor/d_a_tag_event.cpp
@@ -1,56 +1,41 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_event
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_event.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_horse.h"
 
-/* 8048AD38-8048AD68 000078 0030+00 1/1 0/0 0/0 .text            daTag_getBk__FUl */
 static fopAc_ac_c* daTag_getBk(u32 param_0) {
     return fopAcM_searchFromName("Bk", 0xF, param_0);
 }
 
-/* 8048AD68-8048AD74 0000A8 000C+00 4/4 0/0 0/0 .text            getEventNo__13daTag_Event_cFv */
 u8 daTag_Event_c::getEventNo() {
     return fopAcM_GetParam(this) >> 0x18;
 }
 
-/* 8048AD74-8048AD80 0000B4 000C+00 4/4 0/0 0/0 .text            getSwbit__13daTag_Event_cFv */
 u8 daTag_Event_c::getSwbit() {
     return fopAcM_GetParam(this) >> 0x8;
 }
 
-/* 8048AD80-8048AD8C 0000C0 000C+00 1/1 0/0 0/0 .text            getSwbit2__13daTag_Event_cFv */
 u8 daTag_Event_c::getSwbit2() {
     return fopAcM_GetParam(this) >> 0x10;
 }
 
-/* 8048AD8C-8048AD98 0000CC 000C+00 1/1 0/0 0/0 .text            getType__13daTag_Event_cFv */
 u8 daTag_Event_c::getType() {
     return fopAcM_GetParam(this);
 }
 
-/* 8048AD98-8048ADA4 0000D8 000C+00 1/1 0/0 0/0 .text getInvalidEventFlag__13daTag_Event_cFv */
 u16 daTag_Event_c::getInvalidEventFlag() {
     return home.angle.x & 0x7FFF;
 }
 
-/* 8048ADA4-8048ADB0 0000E4 000C+00 1/1 0/0 0/0 .text            getAreaType__13daTag_Event_cFv */
 u16 daTag_Event_c::getAreaType() {
     return home.angle.x & 0x8000;
 }
 
-/* 8048ADB0-8048ADBC 0000F0 000C+00 1/1 0/0 0/0 .text getValidEventFlag__13daTag_Event_cFv */
 u16 daTag_Event_c::getValidEventFlag() {
     return home.angle.z;
 }
 
-/* 8048ADBC-8048ADEC 0000FC 0030+00 2/2 0/0 0/0 .text            horseRodeo__13daTag_Event_cFv */
 BOOL daTag_Event_c::horseRodeo() {
     if (getType() == 5) {
         return true;
@@ -59,7 +44,6 @@ BOOL daTag_Event_c::horseRodeo() {
     }
 }
 
-/* 8048ADEC-8048AEEC 00012C 0100+00 2/2 0/0 0/0 .text            arrivalTerms__13daTag_Event_cFv */
 BOOL daTag_Event_c::arrivalTerms() {
     int swbit2 = getSwbit2();
     if (swbit2 != 0xFF) {
@@ -85,18 +69,14 @@ BOOL daTag_Event_c::arrivalTerms() {
     return true;
 }
 
-/* 8048AEEC-8048AEF8 00022C 000C+00 1/1 0/0 0/0 .text            demoInitProc__13daTag_Event_cFv */
 void daTag_Event_c::demoInitProc() {
     field_0x56e = 0;
 }
 
-/* 8048AEF8-8048AEFC 000238 0004+00 1/1 0/0 0/0 .text            demoEndProc__13daTag_Event_cFv */
 void daTag_Event_c::demoEndProc() {}
 
-/* 8048AEFC-8048AF00 00023C 0004+00 1/1 0/0 0/0 .text            demoProc__13daTag_Event_cFv */
 void daTag_Event_c::demoProc() {}
 
-/* 8048AF00-8048B0E4 000240 01E4+00 1/1 0/0 0/0 .text            create__13daTag_Event_cFv */
 int daTag_Event_c::create() {
     fopAcM_ct(this, daTag_Event_c);
 
@@ -146,7 +126,6 @@ int daTag_Event_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8048B0E4-8048B1B0 000424 00CC+00 1/1 0/0 0/0 .text            actionNext__13daTag_Event_cFv */
 int daTag_Event_c::actionNext() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         mEventIdx = mMapEventIdx;
@@ -170,7 +149,6 @@ int daTag_Event_c::actionNext() {
     return 1;
 }
 
-/* 8048B1B0-8048B268 0004F0 00B8+00 3/3 0/0 0/0 .text            actionEvent__13daTag_Event_cFv */
 int daTag_Event_c::actionEvent() {
     if (dComIfGp_evmng_endCheck(mEventIdx)) {
         dComIfGp_event_reset();
@@ -190,7 +168,6 @@ int daTag_Event_c::actionEvent() {
     return 1;
 }
 
-/* 8048B268-8048B378 0005A8 0110+00 1/1 0/0 0/0 .text            actionReady__13daTag_Event_cFv */
 int daTag_Event_c::actionReady() {
     int swbit = getSwbit();
 
@@ -217,7 +194,6 @@ int daTag_Event_c::actionReady() {
     return 1;
 }
 
-/* 8048B378-8048B514 0006B8 019C+00 1/1 0/0 0/0 .text            checkArea__13daTag_Event_cFv */
 BOOL daTag_Event_c::checkArea() {
     cXyz pos;
     daPy_py_c* player = dComIfGp_getLinkPlayer();
@@ -249,7 +225,6 @@ BOOL daTag_Event_c::checkArea() {
     return false;
 }
 
-/* 8048B514-8048B5C8 000854 00B4+00 2/2 0/0 0/0 .text            actionHunt__13daTag_Event_cFv */
 int daTag_Event_c::actionHunt() {
     int swbit = getSwbit();
 
@@ -263,19 +238,16 @@ int daTag_Event_c::actionHunt() {
     return 1;
 }
 
-/* 8048B5C8-8048B5F4 000908 002C+00 1/1 0/0 0/0 .text            actionArrival__13daTag_Event_cFv */
 int daTag_Event_c::actionArrival() {
     setActio(ACTION_HUNT);
     actionHunt();
     return 1;
 }
 
-/* 8048B5F4-8048B5FC 000934 0008+00 1/1 0/0 0/0 .text            actionWait__13daTag_Event_cFv */
 int daTag_Event_c::actionWait() {
     return true;
 }
 
-/* 8048B5FC-8048B6D4 00093C 00D8+00 1/1 0/0 0/0 .text            actionHunt2__13daTag_Event_cFv */
 int daTag_Event_c::actionHunt2() {
     int swbit = getSwbit();
 
@@ -295,7 +267,6 @@ int daTag_Event_c::actionHunt2() {
     return 1;
 }
 
-/* 8048B6D4-8048B784 000A14 00B0+00 1/1 0/0 0/0 .text            execute__13daTag_Event_cFv */
 int daTag_Event_c::execute() {
     if (home.roomNo != dComIfGp_roomControl_getStayNo()) {
         return 0;
@@ -327,48 +298,38 @@ int daTag_Event_c::execute() {
     return 1;
 }
 
-/* 8048B784-8048B78C 000AC4 0008+00 1/1 0/0 0/0 .text            draw__13daTag_Event_cFv */
 int daTag_Event_c::draw() {
     return 1;
 }
 
-/* 8048B78C-8048B7AC 000ACC 0020+00 1/0 0/0 0/0 .text            daTag_Event_Draw__FP13daTag_Event_c
- */
 static int daTag_Event_Draw(daTag_Event_c* i_this) {
     return i_this->draw();
 }
 
-/* 8048B7AC-8048B7D0 000AEC 0024+00 1/0 0/0 0/0 .text daTag_Event_Execute__FP13daTag_Event_c */
 static int daTag_Event_Execute(daTag_Event_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 8048B7D0-8048B7D8 000B10 0008+00 1/0 0/0 0/0 .text daTag_Event_IsDelete__FP13daTag_Event_c */
 static int daTag_Event_IsDelete(daTag_Event_c* i_this) {
     return 1;
 }
 
-/* 8048B7D8-8048B808 000B18 0030+00 1/0 0/0 0/0 .text daTag_Event_Delete__FP13daTag_Event_c */
 static int daTag_Event_Delete(daTag_Event_c* i_this) {
     i_this->~daTag_Event_c();
     return 1;
 }
 
-/* 8048B808-8048B828 000B48 0020+00 1/0 0/0 0/0 .text            daTag_Event_Create__FP10fopAc_ac_c
- */
 static int daTag_Event_Create(fopAc_ac_c* i_this) {
     return static_cast<daTag_Event_c*>(i_this)->create();
 }
 
-/* 8048B844-8048B864 -00001 0020+00 1/0 0/0 0/0 .data            l_daTag_Event_Method */
 static actor_method_class l_daTag_Event_Method = {
     (process_method_func)daTag_Event_Create,  (process_method_func)daTag_Event_Delete,
     (process_method_func)daTag_Event_Execute, (process_method_func)daTag_Event_IsDelete,
     (process_method_func)daTag_Event_Draw,
 };
 
-/* 8048B864-8048B894 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_EVENT */
 extern actor_process_profile_definition g_profile_TAG_EVENT = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp
index cbb14a261b..a4b48deadc 100644
--- a/src/d/actor/d_a_tag_evt.cpp
+++ b/src/d/actor/d_a_tag_evt.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_evt
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_evt.h"
@@ -12,23 +7,19 @@
 #include "d/d_save.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8048C3FC-8048C404 -00001 0008+00 1/1 0/0 0/0 .data            l_evtNameList */
 static char* l_evtNameList[] = {
     NULL,
     "JUMP_DEMOSTAGE",
 };
 
-/* 8048C404-8048C408 -00001 0004+00 2/2 0/0 0/0 .data            l_resFileName */
 static char* l_resFileName = "TAGEVT";
 
-/* 8048C408-8048C414 -00001 000C+00 1/1 0/0 0/0 .data            mEvtCutList__11daTag_Evt_c */
 char* daTag_Evt_c::mEvtCutList[] = {
     "WAIT",
     "TALK",
     "NEXT",
 };
 
-/* 8048B918-8048B9D8 000078 00C0+00 1/1 0/0 0/0 .text            create__11daTag_Evt_cFv */
 int daTag_Evt_c::create() {
     fopAcM_ct(this, daTag_Evt_c);
     cPhs__Step phase = (cPhs__Step)dComIfG_resLoad(&mPhase, l_resFileName);
@@ -41,13 +32,11 @@ int daTag_Evt_c::create() {
     return phase;
 }
 
-/* 8048B9D8-8048BA0C 000138 0034+00 1/1 0/0 0/0 .text            destroy__11daTag_Evt_cFv */
 int daTag_Evt_c::destroy() {
     dComIfG_resDelete(&mPhase, l_resFileName);
     return 1;
 }
 
-/* 8048BA0C-8048BE44 00016C 0438+00 1/1 0/0 0/0 .text            execute__11daTag_Evt_cFv */
 int daTag_Evt_c::execute() {
     BOOL bVar = true;
     eyePos.set(current.pos.x, current.pos.y + 100.0f, current.pos.z);
@@ -120,12 +109,10 @@ int daTag_Evt_c::execute() {
     return 1;
 }
 
-/* 8048BE44-8048BE4C 0005A4 0008+00 1/1 0/0 0/0 .text            draw__11daTag_Evt_cFv */
 int daTag_Evt_c::draw() {
     return 1;
 }
 
-/* 8048BE4C-8048BF64 0005AC 0118+00 1/1 0/0 0/0 .text            getParam__11daTag_Evt_cFv */
 int daTag_Evt_c::getParam() {
     field_0x5E0 = fopAcM_GetParam(this) & 0xFFF;
     field_0x5E2 = (fopAcM_GetParam(this) >> 0xC) & 0xFFF;
@@ -158,7 +145,6 @@ int daTag_Evt_c::getParam() {
     return 1;
 }
 
-/* 8048BF64-8048C090 0006C4 012C+00 1/1 0/0 0/0 .text            isDelete__11daTag_Evt_cFv */
 int daTag_Evt_c::isDelete() {
     if (field_0x5E0 != 0xFFF || field_0x5E2 != 0xFFF) {
         if (field_0x5E0 == 0xFFF ||
@@ -190,7 +176,6 @@ int daTag_Evt_c::isDelete() {
     }
 }
 
-/* 8048C090-8048C124 0007F0 0094+00 1/1 0/0 0/0 .text            doEvtCutWait__11daTag_Evt_cFi */
 int daTag_Evt_c::doEvtCutWait(int param_0) {
     if (dComIfGp_getEventManager().getIsAddvance(param_0)) {
         int* pTimer = dComIfGp_evmng_getMyIntegerP(param_0, "timer");
@@ -199,7 +184,6 @@ int daTag_Evt_c::doEvtCutWait(int param_0) {
     return cLib_calcTimer(&mTimer) == 0;
 }
 
-/* 8048C124-8048C1C8 000884 00A4+00 1/1 0/0 0/0 .text            doEvtCutTalk__11daTag_Evt_cFi */
 int daTag_Evt_c::doEvtCutTalk(int param_0) {
     if (dComIfGp_getEventManager().getIsAddvance(param_0)) {
         mMsgFlow.init(this, *dComIfGp_evmng_getMyIntegerP(param_0, "flowNodeNo"), 0, NULL);
@@ -209,7 +193,6 @@ int daTag_Evt_c::doEvtCutTalk(int param_0) {
     }
 }
 
-/* 8048C1C8-8048C27C 000928 00B4+00 1/1 0/0 0/0 .text            doEvtCutNext__11daTag_Evt_cFi */
 int daTag_Evt_c::doEvtCutNext(int param_0) {
     if (dComIfGp_getEventManager().getIsAddvance(param_0)) {
         if ((field_0x5E4 == 0 || field_0x5E4 == 1) && field_0x5DE != 0xFF) {
@@ -221,42 +204,34 @@ int daTag_Evt_c::doEvtCutNext(int param_0) {
     return 0;
 }
 
-/* 8048C27C-8048C29C 0009DC 0020+00 1/0 0/0 0/0 .text            daTag_Evt_Create__FPv */
 static int daTag_Evt_Create(void* i_this) {
     return static_cast<daTag_Evt_c*>(i_this)->create();
 }
 
-/* 8048C29C-8048C2BC 0009FC 0020+00 1/0 0/0 0/0 .text            daTag_Evt_Delete__FPv */
 static int daTag_Evt_Delete(void* i_this) {
     return static_cast<daTag_Evt_c*>(i_this)->destroy();
 }
 
-/* 8048C2BC-8048C2DC 000A1C 0020+00 1/0 0/0 0/0 .text            daTag_Evt_Execute__FPv */
 static int daTag_Evt_Execute(void* i_this) {
     return static_cast<daTag_Evt_c*>(i_this)->execute();
 }
 
-/* 8048C2DC-8048C2FC 000A3C 0020+00 1/0 0/0 0/0 .text            daTag_Evt_Draw__FPv */
 static int daTag_Evt_Draw(void* i_this) {
     return static_cast<daTag_Evt_c*>(i_this)->draw();
 }
 
-/* 8048C2FC-8048C304 000A5C 0008+00 1/0 0/0 0/0 .text            daTag_Evt_IsDelete__FPv */
 static int daTag_Evt_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8048C304-8048C374 000A64 0070+00 1/0 0/0 0/0 .text            __dt__11daTag_Evt_cFv */
 daTag_Evt_c::~daTag_Evt_c() {}
 
-/* 8048C414-8048C434 -00001 0020+00 1/0 0/0 0/0 .data            daTag_Evt_MethodTable */
 static actor_method_class daTag_Evt_MethodTable = {
     (process_method_func)daTag_Evt_Create,  (process_method_func)daTag_Evt_Delete,
     (process_method_func)daTag_Evt_Execute, (process_method_func)daTag_Evt_IsDelete,
     (process_method_func)daTag_Evt_Draw,
 };
 
-/* 8048C434-8048C464 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_EVT */
 extern actor_process_profile_definition g_profile_TAG_EVT = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp
index cdbbd92b4e..84c36219f2 100644
--- a/src/d/actor/d_a_tag_evtarea.cpp
+++ b/src/d/actor/d_a_tag_evtarea.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_npc.h"
 #include "d/d_procname.h"
 
-/* 8048C4F8-8048C728 000078 0230+00 2/1 0/0 0/0 .text            create__15daTag_EvtArea_cFv */
 cPhs__Step daTag_EvtArea_c::create() {
     fopAcM_ct(this, daTag_EvtArea_c);
 
@@ -94,12 +93,10 @@ cPhs__Step daTag_EvtArea_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8048C728-8048C730 0002A8 0008+00 1/1 0/0 0/0 .text            Delete__15daTag_EvtArea_cFv */
 BOOL daTag_EvtArea_c::Delete() {
     return true;
 }
 
-/* 8048C730-8048C894 0002B0 0164+00 1/1 0/0 0/0 .text            Execute__15daTag_EvtArea_cFv */
 BOOL daTag_EvtArea_c::Execute() {
     if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
         if (isDelete()) {
@@ -129,12 +126,10 @@ BOOL daTag_EvtArea_c::Execute() {
     return false;
 }
 
-/* 8048C894-8048C89C 000414 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_EvtArea_cFv */
 BOOL daTag_EvtArea_c::Draw() {
     return true;
 }
 
-/* 8048C89C-8048C94C 00041C 00B0+00 2/2 0/0 0/0 .text            isDelete__15daTag_EvtArea_cFv */
 BOOL daTag_EvtArea_c::isDelete() {
     bool ret;
     if (getOffEvtBit() != -1) {
@@ -153,8 +148,6 @@ BOOL daTag_EvtArea_c::isDelete() {
     return ret;
 }
 
-/* 8048C94C-8048CC80 0004CC 0334+00 1/1 0/0 16/16 .text
- * chkPointInArea__15daTag_EvtArea_cF4cXyz4cXyz                 */
 BOOL daTag_EvtArea_c::chkPointInArea(cXyz i_point, cXyz i_addSize) {
     cXyz area_vtx[4];
     cXyz size, center, player_to_home, point_to_current;
@@ -211,39 +204,32 @@ BOOL daTag_EvtArea_c::chkPointInArea(cXyz i_point, cXyz i_addSize) {
     return false;
 }
 
-/* 8048CC80-8048CCA0 000800 0020+00 1/0 0/0 0/0 .text            daTag_EvtArea_Create__FPv */
 static cPhs__Step daTag_EvtArea_Create(void* i_this) {
     return static_cast<daTag_EvtArea_c*>(i_this)->create();
 }
 
-/* 8048CCA0-8048CCC0 000820 0020+00 1/0 0/0 0/0 .text            daTag_EvtArea_Delete__FPv */
 static BOOL daTag_EvtArea_Delete(void* i_this) {
     return static_cast<daTag_EvtArea_c*>(i_this)->Delete();
 }
 
-/* 8048CCC0-8048CCE0 000840 0020+00 1/0 0/0 0/0 .text            daTag_EvtArea_Execute__FPv */
 static BOOL daTag_EvtArea_Execute(void* i_this) {
     return static_cast<daTag_EvtArea_c*>(i_this)->Execute();
 }
 
-/* 8048CCE0-8048CD00 000860 0020+00 1/0 0/0 0/0 .text            daTag_EvtArea_Draw__FPv */
 static BOOL daTag_EvtArea_Draw(void* i_this) {
     return static_cast<daTag_EvtArea_c*>(i_this)->Draw();
 }
 
-/* 8048CD00-8048CD08 000880 0008+00 1/0 0/0 0/0 .text            daTag_EvtArea_IsDelete__FPv */
 static BOOL daTag_EvtArea_IsDelete(void* i_this) {
     return true;
 }
 
-/* 8048CE48-8048CE68 -00001 0020+00 1/0 0/0 0/0 .data            daTag_EvtArea_MethodTable */
 static actor_method_class daTag_EvtArea_MethodTable = {
     (process_method_func)daTag_EvtArea_Create,  (process_method_func)daTag_EvtArea_Delete,
     (process_method_func)daTag_EvtArea_Execute, (process_method_func)daTag_EvtArea_IsDelete,
     (process_method_func)daTag_EvtArea_Draw,
 };
 
-/* 8048CE68-8048CE98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_EVTAREA */
 extern actor_process_profile_definition g_profile_TAG_EVTAREA = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp
index af5f9c7f50..084e7198e2 100644
--- a/src/d/actor/d_a_tag_evtmsg.cpp
+++ b/src/d/actor/d_a_tag_evtmsg.cpp
@@ -10,21 +10,16 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 8048D838-8048D844 -00001 000C+00 0/1 0/0 0/0 .data            mEvtCutNameList__14daTag_EvtMsg_c
- */
 char* daTag_EvtMsg_c::mEvtCutNameList[] = {"", "TALK", "WAIT"};
 
-/* 8048D85C-8048D880 000044 0024+00 0/2 0/0 0/0 .data            mEvtCutList__14daTag_EvtMsg_c */
 EvtCutFunc daTag_EvtMsg_c::mEvtCutList[] = {
     NULL,
     &daTag_EvtMsg_c::ECut_talk,
     &daTag_EvtMsg_c::ECut_wait,
 };
 
-/* 8048D880-8048D884 -00001 0004+00 0/1 0/0 0/0 .data            l_myName */
 static char* l_myName = "EvtMsg";
 
-/* 8048CF38-8048D014 000078 00DC+00 1/1 0/0 0/0 .text            create__14daTag_EvtMsg_cFv */
 int daTag_EvtMsg_c::create() {
     fopAcM_ct(this, daTag_EvtMsg_c);
 
@@ -44,12 +39,10 @@ int daTag_EvtMsg_c::create() {
     return isDelete() == TRUE ? cPhs_ERROR_e : cPhs_COMPLEATE_e;
 }
 
-/* 8048D014-8048D01C 000154 0008+00 1/1 0/0 0/0 .text            Delete__14daTag_EvtMsg_cFv */
 int daTag_EvtMsg_c::Delete() {
     return 1;
 }
 
-/* 8048D01C-8048D31C 00015C 0300+00 1/1 0/0 0/0 .text            Execute__14daTag_EvtMsg_cFv */
 int daTag_EvtMsg_c::Execute() {
     dEvent_manager_c& evt_mng = dComIfGp_getEventManager();
 
@@ -118,12 +111,10 @@ int daTag_EvtMsg_c::Execute() {
     return 0;
 }
 
-/* 8048D31C-8048D324 00045C 0008+00 1/1 0/0 0/0 .text            Draw__14daTag_EvtMsg_cFv */
 int daTag_EvtMsg_c::Draw() {
     return 1;
 }
 
-/* 8048D324-8048D340 000464 001C+00 1/1 0/0 0/0 .text            getOnEvtBit__14daTag_EvtMsg_cFv */
 u32 daTag_EvtMsg_c::getOnEvtBit() {
     u32 bit = fopAcM_GetParam(this) & 0xFFF;
     if (bit != 0xFFF) {
@@ -133,7 +124,6 @@ u32 daTag_EvtMsg_c::getOnEvtBit() {
     return -1;
 }
 
-/* 8048D340-8048D35C 000480 001C+00 1/1 0/0 0/0 .text            getOffEvtBit__14daTag_EvtMsg_cFv */
 u32 daTag_EvtMsg_c::getOffEvtBit() {
     u32 bit = (fopAcM_GetParam(this) >> 0xC) & 0xFFF;
     if (bit != 0xFFF) {
@@ -143,22 +133,18 @@ u32 daTag_EvtMsg_c::getOffEvtBit() {
     return -1;
 }
 
-/* 8048D35C-8048D368 00049C 000C+00 1/1 0/0 0/0 .text            getOnSwBit__14daTag_EvtMsg_cFv */
 u8 daTag_EvtMsg_c::getOnSwBit() {
     return home.angle.x & 0xFF;
 }
 
-/* 8048D368-8048D374 0004A8 000C+00 2/2 0/0 0/0 .text            getOffSwBit__14daTag_EvtMsg_cFv */
 u8 daTag_EvtMsg_c::getOffSwBit() {
     return (home.angle.x >> 8) & 0xFF;
 }
 
-/* 8048D374-8048D384 0004B4 0010+00 1/1 0/0 0/0 .text            getProcType__14daTag_EvtMsg_cFv */
 u8 daTag_EvtMsg_c::getProcType() {
     return fopAcM_GetParam(this) & 0x2000000;
 }
 
-/* 8048D384-8048D428 0004C4 00A4+00 2/2 0/0 0/0 .text            isDelete__14daTag_EvtMsg_cFv */
 BOOL daTag_EvtMsg_c::isDelete() {
     BOOL ret = false;
 
@@ -177,7 +163,6 @@ BOOL daTag_EvtMsg_c::isDelete() {
     return ret;
 }
 
-/* 8048D428-8048D54C 000568 0124+00 1/1 0/0 0/0 .text chkPointInArea__14daTag_EvtMsg_cF4cXyz */
 BOOL daTag_EvtMsg_c::chkPointInArea(cXyz param_0) {
     if (getOnEvtBit() == -1 || (getOnEvtBit() != -1 && !daNpcF_chkEvtBit(getOnEvtBit())) ||
         getOnSwBit() == 0xFF ||
@@ -189,7 +174,6 @@ BOOL daTag_EvtMsg_c::chkPointInArea(cXyz param_0) {
     return 0;
 }
 
-/* 8048D54C-8048D5CC 00068C 0080+00 1/0 0/0 0/0 .text            ECut_talk__14daTag_EvtMsg_cFi */
 BOOL daTag_EvtMsg_c::ECut_talk(int i_staffID) {
     if (dComIfGp_getEventManager().getIsAddvance(i_staffID)) {
         mMsgFlow.init(this, mFlowID, 0, NULL);
@@ -202,7 +186,6 @@ BOOL daTag_EvtMsg_c::ECut_talk(int i_staffID) {
     return false;
 }
 
-/* 8048D5CC-8048D668 00070C 009C+00 1/0 0/0 0/0 .text            ECut_wait__14daTag_EvtMsg_cFi */
 BOOL daTag_EvtMsg_c::ECut_wait(int i_staffID) {
     dEvent_manager_c& evt_mng = dComIfGp_getEventManager();
     int timer = 0;
@@ -223,42 +206,34 @@ BOOL daTag_EvtMsg_c::ECut_wait(int i_staffID) {
     return 0;
 }
 
-/* 8048D668-8048D688 0007A8 0020+00 1/0 0/0 0/0 .text            daTag_EvtMsg_Create__FPv */
 static int daTag_EvtMsg_Create(void* i_this) {
     return static_cast<daTag_EvtMsg_c*>(i_this)->create();
 }
 
-/* 8048D688-8048D6A8 0007C8 0020+00 1/0 0/0 0/0 .text            daTag_EvtMsg_Delete__FPv */
 static int daTag_EvtMsg_Delete(void* i_this) {
     return static_cast<daTag_EvtMsg_c*>(i_this)->Delete();
 }
 
-/* 8048D6A8-8048D6C8 0007E8 0020+00 1/0 0/0 0/0 .text            daTag_EvtMsg_Execute__FPv */
 static int daTag_EvtMsg_Execute(void* i_this) {
     return static_cast<daTag_EvtMsg_c*>(i_this)->Execute();
 }
 
-/* 8048D6C8-8048D6E8 000808 0020+00 1/0 0/0 0/0 .text            daTag_EvtMsg_Draw__FPv */
 static int daTag_EvtMsg_Draw(void* i_this) {
     return static_cast<daTag_EvtMsg_c*>(i_this)->Draw();
 }
 
-/* 8048D6E8-8048D6F0 000828 0008+00 1/0 0/0 0/0 .text            daTag_EvtMsg_IsDelete__FPv */
 static int daTag_EvtMsg_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8048D6F0-8048D760 000830 0070+00 1/0 0/0 0/0 .text            __dt__14daTag_EvtMsg_cFv */
 daTag_EvtMsg_c::~daTag_EvtMsg_c() {}
 
-/* 8048D884-8048D8A4 -00001 0020+00 1/0 0/0 0/0 .data            daTag_EvtMsg_MethodTable */
 static actor_method_class daTag_EvtMsg_MethodTable = {
     (process_method_func)daTag_EvtMsg_Create,  (process_method_func)daTag_EvtMsg_Delete,
     (process_method_func)daTag_EvtMsg_Execute, (process_method_func)daTag_EvtMsg_IsDelete,
     (process_method_func)daTag_EvtMsg_Draw,
 };
 
-/* 8048D8A4-8048D8D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_EVTMSG */
 extern actor_process_profile_definition g_profile_TAG_EVTMSG = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp
index 14d2b7e06e..cafd66d876 100644
--- a/src/d/actor/d_a_tag_firewall.cpp
+++ b/src/d/actor/d_a_tag_firewall.cpp
@@ -17,13 +17,10 @@ struct Tag_FWall_n {
     static u16 game_over_eff_name[];
 };
 
-/* 80D58938-80D58940 000078 0008+00 1/0 0/0 0/0 .text            daTag_FWall_Draw__FP13daTag_FWall_c
- */
 static int daTag_FWall_Draw(daTag_FWall_c* i_this) {
     return 1;
 }
 
-/* 80D5950C-80D5954C 000000 0040+00 1/1 0/0 0/0 .data            cc_sph_src__11Tag_FWall_n */
 dCcD_SrcSph Tag_FWall_n::cc_sph_src = {
     {
         {0x0, {{0x400, 0x1, 0xC}, {0x0, 0x0}, 0x0}},  // mObj
@@ -36,17 +33,12 @@ dCcD_SrcSph Tag_FWall_n::cc_sph_src = {
     }                                // mSphAttr
 };
 
-/* 80D5954C-80D59554 000040 0008+00 1/1 0/0 0/0 .data            game_over_eff_name__11Tag_FWall_n
- */
 u16 Tag_FWall_n::game_over_eff_name[] = {0x84CC, 0x84CD, 0x84CE, 0x84CF};
 
-/* 80D595C0-80D595C4 000000 0004+00 1/1 0/0 0/0 .bss             fire_leader */
 static daTag_FWall_c* fire_leader;
 
-/* 80D595C4-80D595C8 000004 0004+00 2/2 0/0 0/0 .bss             None */
 static u8 fire_num;
 
-/* 80D58940-80D5901C 000080 06DC+00 1/1 0/0 0/0 .text            execute__13daTag_FWall_cFv */
 int daTag_FWall_c::execute() {
     cXyz cam_eye = dCam_getBody()->Eye();
     cXyz pos;
@@ -158,27 +150,22 @@ int daTag_FWall_c::execute() {
     return 1;
 }
 
-/* 80D59058-80D59078 000798 0020+00 1/0 0/0 0/0 .text daTag_FWall_Execute__FP13daTag_FWall_c */
 static int daTag_FWall_Execute(daTag_FWall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D59078-80D59080 0007B8 0008+00 1/1 0/0 0/0 .text            _delete__13daTag_FWall_cFv */
 int daTag_FWall_c::_delete() {
     return 1;
 }
 
-/* 80D59080-80D590A0 0007C0 0020+00 1/0 0/0 0/0 .text daTag_FWall_IsDelete__FP13daTag_FWall_c */
 static int daTag_FWall_IsDelete(daTag_FWall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D590A0-80D590A8 0007E0 0008+00 1/0 0/0 0/0 .text daTag_FWall_Delete__FP13daTag_FWall_c */
 static int daTag_FWall_Delete(daTag_FWall_c* i_this) {
     return 1;
 }
 
-/* 80D590A8-80D592D0 0007E8 0228+00 1/1 0/0 0/0 .text            create__13daTag_FWall_cFv */
 int daTag_FWall_c::create() {
     fopAcM_ct(this, daTag_FWall_c);
 
@@ -216,19 +203,16 @@ int daTag_FWall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D594B4-80D594D4 000BF4 0020+00 1/0 0/0 0/0 .text daTag_FWall_Create__FP13daTag_FWall_c */
 static int daTag_FWall_Create(daTag_FWall_c* i_this) {
     return i_this->create();
 }
 
-/* 80D59554-80D59574 -00001 0020+00 1/0 0/0 0/0 .data            l_daTag_FWall_Method */
 static actor_method_class l_daTag_FWall_Method = {
     (process_method_func)daTag_FWall_Create,  (process_method_func)daTag_FWall_Delete,
     (process_method_func)daTag_FWall_Execute, (process_method_func)daTag_FWall_IsDelete,
     (process_method_func)daTag_FWall_Draw,
 };
 
-/* 80D59574-80D595A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_FWall */
 extern actor_process_profile_definition g_profile_Tag_FWall = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp
index e2bb35b93a..cf22e4a191 100644
--- a/src/d/actor/d_a_tag_gra.cpp
+++ b/src/d/actor/d_a_tag_gra.cpp
@@ -7,26 +7,21 @@
 
 #include "d/actor/d_a_tag_gra.h"
 
-/* 80D59658-80D596E8 000078 0090+00 1/0 0/0 0/0 .text            daTagGra_Create__FP10fopAc_ac_c */
 static int daTagGra_Create(fopAc_ac_c* i_this) {
     daTagGra_c* gra_tag = (daTagGra_c*)i_this;
     return gra_tag->create();
 }
 
-/* 80D596E8-80D59718 000108 0030+00 1/0 0/0 0/0 .text            daTagGra_Delete__FP10daTagGra_c */
 static int daTagGra_Delete(daTagGra_c* i_this) {
     i_this->~daTagGra_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D59720-80D59740 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagGra_Method */
 static actor_method_class l_daTagGra_Method = {
     (process_method_func)daTagGra_Create,
     (process_method_func)daTagGra_Delete
 };
 
-/* 80D59740-80D59770 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_GRA */
 extern actor_process_profile_definition g_profile_TAG_GRA = {
     fpcLy_CURRENT_e,        // mLayerID
     3,                      // mListID
diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp
index a05b85a1f0..d525baba31 100644
--- a/src/d/actor/d_a_tag_gstart.cpp
+++ b/src/d/actor/d_a_tag_gstart.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 805A3478-805A34F4 000078 007C+00 1/1 0/0 0/0 .text            create__13daTagGstart_cFv */
 int daTagGstart_c::create() {
     fopAcM_ct(this, daTagGstart_c);
 
@@ -22,22 +21,17 @@ int daTagGstart_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A34F4-805A3514 0000F4 0020+00 1/0 0/0 0/0 .text            daTagGstart_Create__FP10fopAc_ac_c
- */
 static int daTagGstart_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagGstart_c*>(i_this)->create();
 }
 
-/* 805A3514-805A3568 000114 0054+00 1/1 0/0 0/0 .text            __dt__13daTagGstart_cFv */
 daTagGstart_c::~daTagGstart_c() {}
 
-/* 805A3568-805A3590 000168 0028+00 1/0 0/0 0/0 .text daTagGstart_Delete__FP13daTagGstart_c */
 static int daTagGstart_Delete(daTagGstart_c* i_this) {
     i_this->~daTagGstart_c();
     return 1;
 }
 
-/* 805A3590-805A3658 000190 00C8+00 1/1 0/0 0/0 .text            execute__13daTagGstart_cFv */
 int daTagGstart_c::execute() {
     if ((mSwNo == 0xFF || dComIfGs_isSwitch(mSwNo, fopAcM_GetHomeRoomNo(this))) &&
         (mSwNo2 == 0xFF || !dComIfGs_isSwitch(mSwNo2, fopAcM_GetHomeRoomNo(this))))
@@ -50,26 +44,20 @@ int daTagGstart_c::execute() {
     return 1;
 }
 
-/* 805A3658-805A3678 000258 0020+00 1/0 0/0 0/0 .text daTagGstart_Execute__FP13daTagGstart_c */
 static int daTagGstart_Execute(daTagGstart_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A3678-805A3680 000278 0008+00 1/0 0/0 0/0 .text            daTagGstart_Draw__FP13daTagGstart_c
- */
 static int daTagGstart_Draw(daTagGstart_c*) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A3688-805A36A8 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagGstart_Method */
 static actor_method_class l_daTagGstart_Method = {
     (process_method_func)daTagGstart_Create,  (process_method_func)daTagGstart_Delete,
     (process_method_func)daTagGstart_Execute, (process_method_func)NULL,
     (process_method_func)daTagGstart_Draw,
 };
 
-/* 805A36A8-805A36D8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Gstart */
 extern actor_process_profile_definition g_profile_Tag_Gstart = {
     fpcLy_CURRENT_e,
     2,
diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp
index f1e29f1062..8ce2487596 100644
--- a/src/d/actor/d_a_tag_guard.cpp
+++ b/src/d/actor/d_a_tag_guard.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_guard.h"
 #include "d/d_stage.h"
 
-/* 80D597F8-80D5985C 000078 0064+00 0/0 0/0 1/1 .text getAppearPoint__12daTagGuard_cFP3Vec */
 int daTagGuard_c::getAppearPoint(Vec* i_appearPnt) {
     if (mPath == NULL) {
         return 0;
@@ -18,7 +17,6 @@ int daTagGuard_c::getAppearPoint(Vec* i_appearPnt) {
     return 1;
 }
 
-/* 80D5985C-80D59928 0000DC 00CC+00 0/0 0/0 1/1 .text            createGuard__12daTagGuard_cFUl */
 void daTagGuard_c::createGuard(u32 i_parameters) {
     cXyz pos = current.pos;
 
@@ -49,27 +47,20 @@ void daTagGuard_c::create_init() {
     current.angle.y = cLib_targetAngleY(&pnt1->m_position, &pnt2->m_position);
 }
 
-/* 80D59928-80D599E0 0001A8 00B8+00 1/0 0/0 0/0 .text            daTagGuard_Create__FP10fopAc_ac_c
- */
 static int daTagGuard_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagGuard_c*>(i_this)->create();
 }
 
-/* 80D599E0-80D59A10 000260 0030+00 1/0 0/0 0/0 .text            daTagGuard_Delete__FP12daTagGuard_c
- */
 static int daTagGuard_Delete(daTagGuard_c* i_this) {
     i_this->~daTagGuard_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D59A18-80D59A38 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagGuard_Method */
 static actor_method_class l_daTagGuard_Method = {
     (process_method_func)daTagGuard_Create,
     (process_method_func)daTagGuard_Delete,
 };
 
-/* 80D59A38-80D59A68 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_GUARD */
 extern actor_process_profile_definition g_profile_TAG_GUARD = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp
index f0b5bec4e9..b11458bdb0 100644
--- a/src/d/actor/d_a_tag_hinit.cpp
+++ b/src/d/actor/d_a_tag_hinit.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_hinit.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 805A3758-805A3800 000078 00A8+00 1/1 0/0 0/0 .text            create__12daTagHinit_cFv */
 int daTagHinit_c::create() {
     fopAcM_ct(this, daTagHinit_c);
 
@@ -25,23 +24,17 @@ int daTagHinit_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A3800-805A3820 000120 0020+00 1/0 0/0 0/0 .text            daTagHinit_Create__FP10fopAc_ac_c
- */
 static int daTagHinit_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagHinit_c*>(i_this)->create();
 }
 
-/* 805A3820-805A3874 000140 0054+00 1/1 0/0 0/0 .text            __dt__12daTagHinit_cFv */
 daTagHinit_c::~daTagHinit_c() {}
 
-/* 805A3874-805A389C 000194 0028+00 1/0 0/0 0/0 .text            daTagHinit_Delete__FP12daTagHinit_c
- */
 static int daTagHinit_Delete(daTagHinit_c* i_this) {
     i_this->~daTagHinit_c();
     return 1;
 }
 
-/* 805A389C-805A39B8 0001BC 011C+00 1/1 0/0 0/0 .text            execute__12daTagHinit_cFv */
 int daTagHinit_c::execute() {
     if ((field_0x56c == 0xFFFF ||
          dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x56c])) &&
@@ -62,19 +55,14 @@ int daTagHinit_c::execute() {
     return 1;
 }
 
-/* 805A39B8-805A39D8 0002D8 0020+00 1/0 0/0 0/0 .text daTagHinit_Execute__FP12daTagHinit_c */
 static int daTagHinit_Execute(daTagHinit_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A39D8-805A39E0 0002F8 0008+00 1/0 0/0 0/0 .text            daTagHinit_Draw__FP12daTagHinit_c
- */
 static int daTagHinit_Draw(daTagHinit_c*) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A39E8-805A3A08 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagHinit_Method */
 static actor_method_class l_daTagHinit_Method = {
     (process_method_func)daTagHinit_Create,  (process_method_func)daTagHinit_Delete,
     (process_method_func)daTagHinit_Execute, (process_method_func)NULL,
@@ -82,7 +70,6 @@ static actor_method_class l_daTagHinit_Method = {
 
 };
 
-/* 805A3A08-805A3A38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Hinit */
 extern actor_process_profile_definition g_profile_Tag_Hinit = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp
index b0a8eae4cb..8e42bf334a 100644
--- a/src/d/actor/d_a_tag_hjump.cpp
+++ b/src/d/actor/d_a_tag_hjump.cpp
@@ -11,10 +11,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_horse.h"
 
-/* 805A4238-805A4240 000000 0007+01 4/4 0/0 0/0 .rodata          l_arcName */
 static char const l_arcName[] = "Hfence";
 
-/* 805A3AB8-805A3B24 000078 006C+00 1/0 0/0 0/0 .text            CreateHeap__12daTagHjump_cFv */
 int daTagHjump_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -25,7 +23,6 @@ int daTagHjump_c::CreateHeap() {
     return 1;
 }
 
-/* 805A3B24-805A3D80 0000E4 025C+00 1/1 0/0 0/0 .text            create__12daTagHjump_cFv */
 int daTagHjump_c::create() {
     fopAcM_ct(this, daTagHjump_c);
 
@@ -88,28 +85,22 @@ int daTagHjump_c::create() {
     return phase;
 }
 
-/* 805A3D80-805A3DA0 000340 0020+00 1/0 0/0 0/0 .text            daTagHjump_Create__FP10fopAc_ac_c
- */
 static int daTagHjump_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagHjump_c*>(i_this)->create();
 }
 
-/* 805A3DA0-805A3E34 000360 0094+00 1/1 0/0 0/0 .text            __dt__12daTagHjump_cFv */
 daTagHjump_c::~daTagHjump_c() {
     if (mType != TYPE_TRIGGER_e) {
         dComIfG_resDelete(&mPhase, l_arcName);
     }
 }
 
-/* 805A3E34-805A3E70 0003F4 003C+00 1/0 0/0 0/0 .text            daTagHjump_Delete__FP12daTagHjump_c
- */
 static int daTagHjump_Delete(daTagHjump_c* i_this) {
     i_this->MoveBGDelete();
     i_this->~daTagHjump_c();
     return 1;
 }
 
-/* 805A3E70-805A4134 000430 02C4+00 1/1 0/0 0/0 .text            execute__12daTagHjump_cFv */
 int daTagHjump_c::execute() {
     daHorse_c* horse_p = dComIfGp_getHorseActor();
 
@@ -168,12 +159,10 @@ int daTagHjump_c::execute() {
     return 1;
 }
 
-/* 805A4134-805A4154 0006F4 0020+00 1/0 0/0 0/0 .text daTagHjump_Execute__FP12daTagHjump_c */
 static int daTagHjump_Execute(daTagHjump_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A4154-805A4204 000714 00B0+00 1/0 0/0 0/0 .text            Draw__12daTagHjump_cFv */
 int daTagHjump_c::Draw() {
     if (mType != TYPE_TRIGGER_e) {
         g_env_light.settingTevStruct(0x10, &current.pos, &tevStr);
@@ -187,20 +176,16 @@ int daTagHjump_c::Draw() {
     return 1;
 }
 
-/* 805A4204-805A4230 0007C4 002C+00 1/0 0/0 0/0 .text            daTagHjump_Draw__FP12daTagHjump_c
- */
 static int daTagHjump_Draw(daTagHjump_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 805A426C-805A428C -00001 0020+00 1/0 0/0 0/0 .data            l_daTagHjump_Method */
 static actor_method_class l_daTagHjump_Method = {
     (process_method_func)daTagHjump_Create,  (process_method_func)daTagHjump_Delete,
     (process_method_func)daTagHjump_Execute, (process_method_func)NULL,
     (process_method_func)daTagHjump_Draw,
 };
 
-/* 805A428C-805A42BC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Hjump */
 extern actor_process_profile_definition g_profile_Tag_Hjump = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp
index fa011312da..246205421a 100644
--- a/src/d/actor/d_a_tag_howl.cpp
+++ b/src/d/actor/d_a_tag_howl.cpp
@@ -10,19 +10,16 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8048D958-8048D9BC 000078 0064+00 1/1 0/0 0/0 .text            create__12daTag_Howl_cFv */
 int daTag_Howl_c::create() {
     fopAcM_ct(this, daTag_Howl_c);
     getParam();
     return cPhs_COMPLEATE_e;
 }
 
-/* 8048D9BC-8048D9C4 0000DC 0008+00 1/1 0/0 0/0 .text            destroy__12daTag_Howl_cFv */
 int daTag_Howl_c::destroy() {
     return 1;
 }
 
-/* 8048D9C4-8048DA24 0000E4 0060+00 1/1 0/0 0/0 .text            execute__12daTag_Howl_cFv */
 int daTag_Howl_c::execute() {
     fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo());
     attention_info.flags = 0;
@@ -35,12 +32,10 @@ int daTag_Howl_c::execute() {
     return 1;
 }
 
-/* 8048DA24-8048DA2C 000144 0008+00 1/1 0/0 0/0 .text            draw__12daTag_Howl_cFv */
 int daTag_Howl_c::draw() {
     return 1;
 }
 
-/* 8048DA2C-8048DC1C 00014C 01F0+00 1/1 0/0 0/0 .text            isAreaCheck__12daTag_Howl_cFv */
 u8 daTag_Howl_c::isAreaCheck() {
     if (getSwitchBit() != 0xFF) {
         if (dComIfGs_isSaveSwitch(getSwitchBit())) {
@@ -60,7 +55,6 @@ u8 daTag_Howl_c::isAreaCheck() {
     return false;
 }
 
-/* 8048DC1C-8048DC68 00033C 004C+00 1/1 0/0 0/0 .text            getParam__12daTag_Howl_cFv */
 int daTag_Howl_c::getParam() {
     mCurveID = fopAcM_GetParam(this) & 0xF;
     field_0x569 = fopAcM_GetParam(this) >> 0x1E;
@@ -70,38 +64,30 @@ int daTag_Howl_c::getParam() {
     return 1;
 }
 
-/* 8048DC68-8048DC74 000388 000C+00 1/1 0/0 0/0 .text            getSwitchBit__12daTag_Howl_cFv */
 u8 daTag_Howl_c::getSwitchBit() {
     return (fopAcM_GetParam(this) >> 4) & 0xFF;
 }
 
-/* 8048DC74-8048DC94 000394 0020+00 1/0 0/0 0/0 .text            daTag_Howl_Create__FPv */
 static int daTag_Howl_Create(void* i_this) {
     return static_cast<daTag_Howl_c*>(i_this)->create();
 }
 
-/* 8048DC94-8048DCB4 0003B4 0020+00 1/0 0/0 0/0 .text            daTag_Howl_Delete__FPv */
 static int daTag_Howl_Delete(void* i_this) {
     return static_cast<daTag_Howl_c*>(i_this)->destroy();
 }
 
-/* 8048DCB4-8048DCD4 0003D4 0020+00 1/0 0/0 0/0 .text            daTag_Howl_Execute__FPv */
 static int daTag_Howl_Execute(void* i_this) {
     return static_cast<daTag_Howl_c*>(i_this)->execute();
 }
 
-/* 8048DCD4-8048DCF4 0003F4 0020+00 1/0 0/0 0/0 .text            daTag_Howl_Draw__FPv */
 static int daTag_Howl_Draw(void* i_this) {
     return static_cast<daTag_Howl_c*>(i_this)->draw();
 }
 
-/* 8048DCF4-8048DCFC 000414 0008+00 1/0 0/0 0/0 .text            daTag_Howl_IsDelete__FPv */
 static int daTag_Howl_IsDelete(void* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 8048DD88-8048DDA8 -00001 0020+00 1/0 0/0 0/0 .data            daTag_Howl_MethodTable */
 static actor_method_class daTag_Howl_MethodTable = {
     (process_method_func)daTag_Howl_Create,  (process_method_func)daTag_Howl_Delete,
     (process_method_func)daTag_Howl_Execute, (process_method_func)daTag_Howl_IsDelete,
@@ -109,7 +95,6 @@ static actor_method_class daTag_Howl_MethodTable = {
 
 };
 
-/* 8048DDA8-8048DDD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_HOWL */
 extern actor_process_profile_definition g_profile_TAG_HOWL = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp
index f8878edba0..c7d8b4c256 100644
--- a/src/d/actor/d_a_tag_hstop.cpp
+++ b/src/d/actor/d_a_tag_hstop.cpp
@@ -11,7 +11,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "d/actor/d_a_horse.h"
 
-/* 805A43EC-805A45D8 0000EC 01EC+00 1/1 0/0 0/0 .text            create__12daTagHstop_cFv */
 int daTagHstop_c::create() {
     fopAcM_ct(this, daTagHstop_c);
 
@@ -64,13 +63,10 @@ int daTagHstop_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A45D8-805A45F8 0002D8 0020+00 1/0 0/0 0/0 .text            daTagHstop_Create__FP10fopAc_ac_c
- */
 static int daTagHstop_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagHstop_c*>(i_this)->create();
 }
 
-/* 805A45F8-805A4690 0002F8 0098+00 1/1 0/0 0/0 .text            __dt__12daTagHstop_cFv */
 daTagHstop_c::~daTagHstop_c() {
     if (mPrev != NULL) {
         mPrev->mNext = mNext;
@@ -85,14 +81,11 @@ daTagHstop_c::~daTagHstop_c() {
     }
 }
 
-/* 805A4690-805A46B8 000390 0028+00 1/0 0/0 0/0 .text            daTagHstop_Delete__FP12daTagHstop_c
- */
 static int daTagHstop_Delete(daTagHstop_c* i_this) {
     static_cast<daTagHstop_c*>(i_this)->~daTagHstop_c();
     return 1;
 }
 
-/* 805A46B8-805A475C 0003B8 00A4+00 2/2 0/0 0/0 .text            setActive__12daTagHstop_cFv */
 void daTagHstop_c::setActive() {
     if (mPrm0 == 0xFF || mPrm1 == 2 ||
         (mPrm1 == 0 && dComIfGs_isSwitch(mPrm0, fopAcM_GetHomeRoomNo(this))) ||
@@ -104,10 +97,8 @@ void daTagHstop_c::setActive() {
     }
 }
 
-/* 805A4B8C-805A4BD8 000014 004C+00 2/2 0/0 0/0 .bss             m_msgFlow__12daTagHstop_c */
 dMsgFlow_c daTagHstop_c::m_msgFlow;
 
-/* 805A475C-805A4AA8 00045C 034C+00 1/1 0/0 0/0 .text            execute__12daTagHstop_cFv */
 int daTagHstop_c::execute() {
     if (eventInfo.checkCommandTalk()) {
         if (field_0x573 == 2) {
@@ -172,26 +163,20 @@ int daTagHstop_c::execute() {
     return 1;
 }
 
-/* 805A4AA8-805A4AC8 0007A8 0020+00 1/0 0/0 0/0 .text daTagHstop_Execute__FP12daTagHstop_c */
 static int daTagHstop_Execute(daTagHstop_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A4AC8-805A4AD0 0007C8 0008+00 1/0 0/0 0/0 .text            daTagHstop_Draw__FP12daTagHstop_c
- */
 static int daTagHstop_Draw(daTagHstop_c*) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A4B24-805A4B44 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagHstop_Method */
 static actor_method_class l_daTagHstop_Method = {
     (process_method_func)daTagHstop_Create,  (process_method_func)daTagHstop_Delete,
     (process_method_func)daTagHstop_Execute, (process_method_func)NULL,
     (process_method_func)daTagHstop_Draw,
 };
 
-/* 805A4B44-805A4B74 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Hstop */
 extern actor_process_profile_definition g_profile_Tag_Hstop = {
     fpcLy_CURRENT_e,
     3,
diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp
index f87ad9417e..3bbabb540c 100644
--- a/src/d/actor/d_a_tag_instruction.cpp
+++ b/src/d/actor/d_a_tag_instruction.cpp
@@ -8,21 +8,16 @@
 #include "d/actor/d_a_tag_instruction.h"
 #include "d/d_procname.h"
 
-/* 80D59AF8-80D59B48 000078 0050+00 1/0 0/0 0/0 .text            daTagInst_Create__FP10fopAc_ac_c */
 static int daTagInst_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, daTagInst_c);
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D59B48-80D59B78 0000C8 0030+00 1/0 0/0 0/0 .text            daTagInst_Delete__FP11daTagInst_c
- */
 static int daTagInst_Delete(daTagInst_c* i_this) {
     i_this->~daTagInst_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D59B80-80D59BA0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagInst_Method */
 static actor_method_class l_daTagInst_Method = {
     (process_method_func)daTagInst_Create,
     (process_method_func)daTagInst_Delete,
@@ -31,7 +26,6 @@ static actor_method_class l_daTagInst_Method = {
     (process_method_func)NULL,
 };
 
-/* 80D59BA0-80D59BD0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Instruction */
 extern actor_process_profile_definition g_profile_Tag_Instruction = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp
index 280fce8cc6..efa0bd63a9 100644
--- a/src/d/actor/d_a_tag_kago_fall.cpp
+++ b/src/d/actor/d_a_tag_kago_fall.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_kago_fall
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_kago_fall.h"
@@ -15,13 +10,8 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_graphic.h"
 
-//
-// Declarations:
-//
-
 static u32 m_master_id = -1;
 
-/* 80D59C58-80D59DE0 000078 0188+00 1/1 0/0 0/0 .text            create__15daTagKagoFall_cFv */
 int daTagKagoFall_c::create() {
     fopAcM_ct(this, daTagKagoFall_c);
 
@@ -56,7 +46,6 @@ int daTagKagoFall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D59DE0-80D59E18 000200 0038+00 1/1 0/0 0/0 .text            execute__15daTagKagoFall_cFv */
 int daTagKagoFall_c::execute() {
     if (mActionMode == ACTION_MODE_RIVER) {
         actionWaitRiver();
@@ -67,13 +56,11 @@ int daTagKagoFall_c::execute() {
     return TRUE;
 }
 
-/* 80D59E18-80D59E24 000238 000C+00 1/1 0/0 0/0 .text setActionMode__15daTagKagoFall_cFUcUc */
 void daTagKagoFall_c::setActionMode(ActionMode mode, u8 state) {
     mActionMode = mode;
     mActionState = state;
 }
 
-/* 80D59E24-80D5A218 000244 03F4+00 1/1 0/0 0/0 .text actionWaitRiver__15daTagKagoFall_cFv */
 void daTagKagoFall_c::actionWaitRiver() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     dCamera_c* camera = dCam_getBody();
@@ -171,8 +158,6 @@ void daTagKagoFall_c::actionWaitRiver() {
     }
 }
 
-/* 80D5A218-80D5A67C 000638 0464+00 1/1 0/0 0/0 .text            actionWaitFall__15daTagKagoFall_cFv
- */
 void daTagKagoFall_c::actionWaitFall() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     cXyz v;
@@ -269,36 +254,28 @@ void daTagKagoFall_c::actionWaitFall() {
     }
 }
 
-/* 80D5A67C-80D5A684 000A9C 0008+00 1/1 0/0 0/0 .text            _delete__15daTagKagoFall_cFv */
 int daTagKagoFall_c::_delete() {
     return TRUE;
 }
 
-/* 80D5A684-80D5A6A4 000AA4 0020+00 1/0 0/0 0/0 .text daTagKagoFall_Execute__FP15daTagKagoFall_c
- */
 static int daTagKagoFall_Execute(daTagKagoFall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5A6A4-80D5A6C4 000AC4 0020+00 1/0 0/0 0/0 .text daTagKagoFall_Delete__FP15daTagKagoFall_c */
 static int daTagKagoFall_Delete(daTagKagoFall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D5A6C4-80D5A6E4 000AE4 0020+00 1/0 0/0 0/0 .text daTagKagoFall_Create__FP15daTagKagoFall_c */
 static int daTagKagoFall_Create(daTagKagoFall_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80D5A714-80D5A734 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagKagoFall_Method */
 static actor_method_class l_daTagKagoFall_Method = {
     (process_method_func)daTagKagoFall_Create,
     (process_method_func)daTagKagoFall_Delete,
     (process_method_func)daTagKagoFall_Execute,
 };
 
-/* 80D5A734-80D5A764 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_KagoFall */
 extern actor_process_profile_definition g_profile_Tag_KagoFall = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp
index a46ad4072f..f1b81cd1d4 100644
--- a/src/d/actor/d_a_tag_kmsg.cpp
+++ b/src/d/actor/d_a_tag_kmsg.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_kmsg
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_kmsg.h"
@@ -16,21 +11,18 @@ struct EventListItem {
     u32 field_0x4;
 };
 
-/* 8048EB2C-8048EB44 -00001 0018+00 1/1 0/0 0/0 .data            l_evtList */
 static EventListItem l_evtList[3] = {
     {"", 0},
     {"EXTINCTION", 2},
     {"PURCHASE", 1},
 };
 
-/* 8048EB44-8048EB50 -00001 000C+00 1/1 0/0 0/0 .data            l_resNameList */
 static char* l_resNameList[3] = {
     "",
     "Bans1",
     "sekizoA",
 };
 
-/* 8048DE78-8048DFDC 000078 0164+00 1/1 0/0 0/0 .text            create__12daTag_KMsg_cFv */
 int daTag_KMsg_c::create() {
     attention_info.position = current.pos;
     eyePos = attention_info.position;
@@ -55,7 +47,6 @@ int daTag_KMsg_c::create() {
     }
 }
 
-/* 8048DFDC-8048E010 0001DC 0034+00 1/1 0/0 0/0 .text            Delete__12daTag_KMsg_cFv */
 int daTag_KMsg_c::Delete() {
     OS_REPORT("|%06d:%x|daTag_KMsg_c -> Delete\n", g_Counter.mCounter0, this);
     fopAcM_GetID(this);
@@ -63,7 +54,6 @@ int daTag_KMsg_c::Delete() {
     return 1;
 }
 
-/* 8048E010-8048E8B8 000210 08A8+00 1/1 0/0 0/0 .text            Execute__12daTag_KMsg_cFv */
 // NONMATCHING Various issues: stack, getTalkAngle
 int daTag_KMsg_c::Execute() {
     bool var_r28 = false;
@@ -217,12 +207,10 @@ int daTag_KMsg_c::Execute() {
     return 0;
 }
 
-/* 8048E8B8-8048E8C0 000AB8 0008+00 1/1 0/0 0/0 .text            Draw__12daTag_KMsg_cFv */
 int daTag_KMsg_c::Draw() {
     return 1;
 }
 
-/* 8048E8C0-8048E9A8 000AC0 00E8+00 2/2 0/0 0/0 .text            isDelete__12daTag_KMsg_cFv */
 int daTag_KMsg_c::isDelete() {
     switch(getType()) {
     case KMSG_TYPE_0:
@@ -246,32 +234,26 @@ int daTag_KMsg_c::isDelete() {
     }
 }
 
-/* 8048E9A8-8048E9C8 000BA8 0020+00 1/0 0/0 0/0 .text            daTag_KMsg_Create__FPv */
 static int daTag_KMsg_Create(void* i_this) {
     return static_cast<daTag_KMsg_c*>(i_this)->create();
 }
 
-/* 8048E9C8-8048E9E8 000BC8 0020+00 1/0 0/0 0/0 .text            daTag_KMsg_Delete__FPv */
 static int daTag_KMsg_Delete(void* i_this) {
     return static_cast<daTag_KMsg_c*>(i_this)->Delete();
 }
 
-/* 8048E9E8-8048EA08 000BE8 0020+00 1/0 0/0 0/0 .text            daTag_KMsg_Execute__FPv */
 static int daTag_KMsg_Execute(void* i_this) {
     return static_cast<daTag_KMsg_c*>(i_this)->Execute();
 }
 
-/* 8048EA08-8048EA28 000C08 0020+00 1/0 0/0 0/0 .text            daTag_KMsg_Draw__FPv */
 static int daTag_KMsg_Draw(void* i_this) {
     return static_cast<daTag_KMsg_c*>(i_this)->Draw();
 }
 
-/* 8048EA28-8048EA30 000C28 0008+00 1/0 0/0 0/0 .text            daTag_KMsg_IsDelete__FPv */
 static int daTag_KMsg_IsDelete(void* param_0) {
     return 1;
 }
 
-/* 8048EB50-8048EB70 -00001 0020+00 1/0 0/0 0/0 .data            daTag_KMsg_MethodTable */
 static void* daTag_KMsg_MethodTable[8] = {
     (void*)daTag_KMsg_Create,
     (void*)daTag_KMsg_Delete,
@@ -280,7 +262,6 @@ static void* daTag_KMsg_MethodTable[8] = {
     (void*)daTag_KMsg_Draw,
 };
 
-/* 8048EB70-8048EBA0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_KMSG */
 extern void* g_profile_TAG_KMSG[12] = {
     (void*)0xFFFFFFFD, (void*)0x0008FFFD,
     (void*)0x02EB0000, (void*)&g_fpcLf_Method,
diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp
index b6f6ae204c..f3057743ff 100644
--- a/src/d/actor/d_a_tag_lantern.cpp
+++ b/src/d/actor/d_a_tag_lantern.cpp
@@ -8,23 +8,19 @@
 #include "d/actor/d_a_tag_lantern.h"
 #include "d/d_procname.h"
 
-/* 8048ECAC-8048ED28 0000EC 007C+00 1/0 0/0 0/0 .text            __dt__15daTag_Lantern_cFv */
 daTag_Lantern_c::~daTag_Lantern_c() {}
 
-/* 8048ED28-8048EDA8 000168 0080+00 1/1 0/0 0/0 .text            create__15daTag_Lantern_cFv */
 int daTag_Lantern_c::create() {
     fopAcM_ct(this, daTag_Lantern_c);
     initialize();
     return cPhs_COMPLEATE_e;
 }
 
-/* 8048EDA8-8048EDDC 0001E8 0034+00 1/1 0/0 0/0 .text            Delete__15daTag_Lantern_cFv */
 int daTag_Lantern_c::Delete() {
     this->~daTag_Lantern_c();
     return 1;
 }
 
-/* 8048EDDC-8048EF6C 00021C 0190+00 2/2 0/0 0/0 .text            Execute__15daTag_Lantern_cFv */
 int daTag_Lantern_c::Execute() {
     dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay();  // fake match
 
@@ -63,12 +59,10 @@ int daTag_Lantern_c::Execute() {
     return 1;
 }
 
-/* 8048EF6C-8048EF74 0003AC 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_Lantern_cFv */
 int daTag_Lantern_c::Draw() {
     return 1;
 }
 
-/* 8048EF74-8048F024 0003B4 00B0+00 1/1 0/0 0/0 .text            initialize__15daTag_Lantern_cFv */
 void daTag_Lantern_c::initialize() {
     fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
 
@@ -88,42 +82,34 @@ void daTag_Lantern_c::initialize() {
     Execute();
 }
 
-/* 8048F024-8048F044 000464 0020+00 1/0 0/0 0/0 .text            daTag_Lantern_Create__FPv */
 static int daTag_Lantern_Create(void* i_this) {
     return static_cast<daTag_Lantern_c*>(i_this)->create();
 }
 
-/* 8048F044-8048F064 000484 0020+00 1/0 0/0 0/0 .text            daTag_Lantern_Delete__FPv */
 static int daTag_Lantern_Delete(void* i_this) {
     return static_cast<daTag_Lantern_c*>(i_this)->Delete();
 }
 
-/* 8048F064-8048F084 0004A4 0020+00 1/0 0/0 0/0 .text            daTag_Lantern_Execute__FPv */
 static int daTag_Lantern_Execute(void* i_this) {
     return static_cast<daTag_Lantern_c*>(i_this)->Execute();
 }
 
-/* 8048F084-8048F0A4 0004C4 0020+00 1/0 0/0 0/0 .text            daTag_Lantern_Draw__FPv */
 static int daTag_Lantern_Draw(void* i_this) {
     return static_cast<daTag_Lantern_c*>(i_this)->Draw();
 }
 
-/* 8048F0A4-8048F0AC 0004E4 0008+00 1/0 0/0 0/0 .text            daTag_Lantern_IsDelete__FPv */
 static int daTag_Lantern_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 8048F1D4-8048F1D8 000014 0004+00 1/1 0/0 0/0 .bss             l_HIO */
 static daTag_Lantern_Param_c l_HIO;
 
-/* 8048F154-8048F174 -00001 0020+00 1/0 0/0 0/0 .data            daTag_Lantern_MethodTable */
 static actor_method_class daTag_Lantern_MethodTable = {
     (process_method_func)daTag_Lantern_Create,  (process_method_func)daTag_Lantern_Delete,
     (process_method_func)daTag_Lantern_Execute, (process_method_func)daTag_Lantern_IsDelete,
     (process_method_func)daTag_Lantern_Draw,
 };
 
-/* 8048F174-8048F1A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_LANTERN */
 extern actor_process_profile_definition g_profile_TAG_LANTERN = {
     fpcLy_CURRENT_e,             // mLayerID
     7,                           // mListID
diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp
index 0f69c654db..6d628ccbe0 100644
--- a/src/d/actor/d_a_tag_lightball.cpp
+++ b/src/d/actor/d_a_tag_lightball.cpp
@@ -6,18 +6,15 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D5A7F8-80D5A818 000078 0020+00 1/1 0/0 0/0 .text   initBaseMtx__16daTagLightBall_cFv */
 void daTagLightBall_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D5A818-80D5A870 000098 0058+00 1/1 0/0 0/0 .text   setBaseMtx__16daTagLightBall_cFv */
 void daTagLightBall_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80D5A870-80D5A9B8 0000F0 0148+00 1/1 0/0 0/0 .text   Create__16daTagLightBall_cFv */
 int daTagLightBall_c::Create() {
     initBaseMtx();
     u8 swbit = getSwBit();
@@ -48,7 +45,6 @@ int daTagLightBall_c::Create() {
     return 1;
 }
 
-/* 80D5A9B8-80D5AA20 000238 0068+00 1/1 0/0 0/0 .text   create__16daTagLightBall_cFv */
 int daTagLightBall_c::create() {
     fopAcM_ct(this, daTagLightBall_c);
 
@@ -59,7 +55,6 @@ int daTagLightBall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5AA20-80D5ABA0 0002A0 0180+00 1/1 0/0 0/0 .text   execute__16daTagLightBall_cFv */
 int daTagLightBall_c::execute() {
     u8 swbit = getSwBit();
     if (swbit != 0xFF) {
@@ -85,12 +80,10 @@ int daTagLightBall_c::execute() {
     return 1;
 }
 
-/* 80D5ABA0-80D5ABA8 000420 0008+00 1/1 0/0 0/0 .text   draw__16daTagLightBall_cFv */
 int daTagLightBall_c::draw() {
     return 1;
 }
 
-/* 80D5ABA8-80D5ABF0 000428 0048+00 1/1 0/0 0/0 .text   _delete__16daTagLightBall_cFv */
 int daTagLightBall_c::_delete() {
     if (mInfSet) {
         dKy_dalkmist_inf_cut(&mInfluence);
@@ -100,37 +93,28 @@ int daTagLightBall_c::_delete() {
     return 1;
 }
 
-/* 80D5ABF0-80D5AC10 000470 0020+00 1/0 0/0 0/0 .text   daTagLightBall_Draw__FP16daTagLightBall_c */
 static int daTagLightBall_Draw(daTagLightBall_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D5AC10-80D5AC30 000490 0020+00 1/0 0/0 0/0 .text   daTagLightBall_Execute__FP16daTagLightBall_c
- */
 static int daTagLightBall_Execute(daTagLightBall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5AC30-80D5AC50 0004B0 0020+00 1/0 0/0 0/0 .text   daTagLightBall_Delete__FP16daTagLightBall_c
- */
 static int daTagLightBall_Delete(daTagLightBall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D5AC50-80D5AC70 0004D0 0020+00 1/0 0/0 0/0 .text   daTagLightBall_Create__FP10fopAc_ac_c */
 static int daTagLightBall_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagLightBall_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80D5AC7C-80D5AC9C -00001 0020+00 1/0 0/0 0/0 .data   l_daTagLightBall_Method */
 static actor_method_class l_daTagLightBall_Method = {
     (process_method_func)daTagLightBall_Create,  (process_method_func)daTagLightBall_Delete,
     (process_method_func)daTagLightBall_Execute, (process_method_func)NULL,
     (process_method_func)daTagLightBall_Draw,
 };
 
-/* 80D5AC9C-80D5ACCC -00001 0030+00 0/0 0/0 1/0 .data   g_profile_Tag_LightBall */
 extern actor_process_profile_definition g_profile_Tag_LightBall = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp
index c3c06ba04d..a0a16af039 100644
--- a/src/d/actor/d_a_tag_lv2prchk.cpp
+++ b/src/d/actor/d_a_tag_lv2prchk.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 805A4C58-805A4CDC 000078 0084+00 1/1 0/0 0/0 .text            Create__15daTagLv2PrChk_cFv */
 int daTagLv2PrChk_c::Create() {
     mSwbit2 = getSwbit2();
     if (mSwbit2 == 0xFF) {
@@ -25,7 +24,6 @@ int daTagLv2PrChk_c::Create() {
     return 1;
 }
 
-/* 805A4CDC-805A4D44 0000FC 0068+00 1/1 0/0 0/0 .text            create__15daTagLv2PrChk_cFv */
 int daTagLv2PrChk_c::create() {
     fopAcM_ct(this, daTagLv2PrChk_c);
 
@@ -36,13 +34,11 @@ int daTagLv2PrChk_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A4D44-805A4D68 000164 0024+00 1/1 0/0 0/0 .text            execute__15daTagLv2PrChk_cFv */
 int daTagLv2PrChk_c::execute() {
     action();
     return 1;
 }
 
-/* 805A4D68-805A4DF4 000188 008C+00 1/1 0/0 0/0 .text            action__15daTagLv2PrChk_cFv */
 void daTagLv2PrChk_c::action() {
     typedef void (daTagLv2PrChk_c::*actionFunc)();
     static actionFunc l_func[] = {&daTagLv2PrChk_c::actionCheck, &daTagLv2PrChk_c::actionEnd};
@@ -50,7 +46,6 @@ void daTagLv2PrChk_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 805A4DF4-805A5290 000214 049C+00 1/0 0/0 0/0 .text            actionCheck__15daTagLv2PrChk_cFv */
 void daTagLv2PrChk_c::actionCheck() {
     bool switch_1 = fopAcM_isSwitch(this, mSwbit2);
     bool switch_2 = fopAcM_isSwitch(this, mSwbit2 + 1);
@@ -152,38 +147,28 @@ void daTagLv2PrChk_c::actionCheck() {
     }
 }
 
-/* 805A5290-805A5294 0006B0 0004+00 1/0 0/0 0/0 .text            actionEnd__15daTagLv2PrChk_cFv */
 void daTagLv2PrChk_c::actionEnd() {}
 
-/* 805A5294-805A52F4 0006B4 0060+00 1/1 0/0 0/0 .text            seStartWrong__15daTagLv2PrChk_cFv
- */
 void daTagLv2PrChk_c::seStartWrong() {
     Z2GetAudioMgr()->seStart(Z2SE_SYS_RESULT_WRONG, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 805A52F4-805A52FC 000714 0008+00 1/1 0/0 0/0 .text            _delete__15daTagLv2PrChk_cFv */
 int daTagLv2PrChk_c::_delete() {
     return 1;
 }
 
-/* 805A52FC-805A531C 00071C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Execute__FP15daTagLv2PrChk_c
- */
 static int daTagLv2PrChk_Execute(daTagLv2PrChk_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A531C-805A533C 00073C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Delete__FP15daTagLv2PrChk_c */
 static int daTagLv2PrChk_Delete(daTagLv2PrChk_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805A533C-805A535C 00075C 0020+00 1/0 0/0 0/0 .text daTagLv2PrChk_Create__FP15daTagLv2PrChk_c */
 static int daTagLv2PrChk_Create(daTagLv2PrChk_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 805A53BC-805A53DC -00001 0020+00 1/0 0/0 0/0 .data            l_daTagLv2PrChk_Method */
 static actor_method_class l_daTagLv2PrChk_Method = {
     (process_method_func)daTagLv2PrChk_Create,
     (process_method_func)daTagLv2PrChk_Delete,
@@ -192,7 +177,6 @@ static actor_method_class l_daTagLv2PrChk_Method = {
     (process_method_func)NULL,
 };
 
-/* 805A53DC-805A540C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv2PrChk */
 extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp
index 5e0f29a673..2a280630b4 100644
--- a/src/d/actor/d_a_tag_lv5soup.cpp
+++ b/src/d/actor/d_a_tag_lv5soup.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
 
-/* 80D5AD58-80D5ADEC 000078 0094+00 1/1 0/0 0/0 .text            create__15daTag_Lv5Soup_cFv */
 int daTag_Lv5Soup_c::create() {
     fopAcM_ct(this, daTag_Lv5Soup_c);
     fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f);
@@ -17,12 +16,10 @@ int daTag_Lv5Soup_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5ADEC-80D5ADF4 00010C 0008+00 1/1 0/0 0/0 .text            Delete__15daTag_Lv5Soup_cFv */
 int daTag_Lv5Soup_c::Delete() {
     return 1;
 }
 
-/* 80D5ADF4-80D5AE9C 000114 00A8+00 1/1 0/0 0/0 .text            Execute__15daTag_Lv5Soup_cFv */
 int daTag_Lv5Soup_c::Execute() {
     if (isAreaCheck()) {
         // Yeto took pumpkin and pumpkin not in soup
@@ -40,12 +37,10 @@ int daTag_Lv5Soup_c::Execute() {
     return 1;
 }
 
-/* 80D5AE9C-80D5AEA4 0001BC 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_Lv5Soup_cFv */
 int daTag_Lv5Soup_c::Draw() {
     return 1;
 }
 
-/* 80D5AEA4-80D5B06C 0001C4 01C8+00 1/1 0/0 0/0 .text            isAreaCheck__15daTag_Lv5Soup_cFv */
 bool daTag_Lv5Soup_c::isAreaCheck() {
     cXyz dist = daPy_getPlayerActorClass()->current.pos - current.pos;
     f32 boundX = scale.x * 100.0f;
@@ -58,42 +53,34 @@ bool daTag_Lv5Soup_c::isAreaCheck() {
     }
 }
 
-/* 80D5B06C-80D5B08C 00038C 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Create__FPv */
 static int daTag_Lv5Soup_Create(void* i_this) {
     return static_cast<daTag_Lv5Soup_c*>(i_this)->create();
 }
 
-/* 80D5B08C-80D5B0AC 0003AC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Delete__FPv */
 static int daTag_Lv5Soup_Delete(void* i_this) {
     return static_cast<daTag_Lv5Soup_c*>(i_this)->Delete();
 }
 
-/* 80D5B0AC-80D5B0CC 0003CC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Execute__FPv */
 static int daTag_Lv5Soup_Execute(void* i_this) {
     return static_cast<daTag_Lv5Soup_c*>(i_this)->Execute();
 }
 
-/* 80D5B0CC-80D5B0EC 0003EC 0020+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_Draw__FPv */
 static int daTag_Lv5Soup_Draw(void* i_this) {
     return static_cast<daTag_Lv5Soup_c*>(i_this)->Draw();
 }
 
-/* 80D5B0EC-80D5B0F4 00040C 0008+00 1/0 0/0 0/0 .text            daTag_Lv5Soup_IsDelete__FPv */
 static int daTag_Lv5Soup_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D5B0F4-80D5B154 000414 0060+00 1/0 0/0 0/0 .text            __dt__15daTag_Lv5Soup_cFv */
 daTag_Lv5Soup_c::~daTag_Lv5Soup_c() {}
 
-/* 80D5B18C-80D5B1AC -00001 0020+00 1/0 0/0 0/0 .data            daTag_Lv5Soup_MethodTable */
 static actor_method_class daTag_Lv5Soup_MethodTable = {
     (process_method_func)daTag_Lv5Soup_Create,  (process_method_func)daTag_Lv5Soup_Delete,
     (process_method_func)daTag_Lv5Soup_Execute, (process_method_func)daTag_Lv5Soup_IsDelete,
     (process_method_func)daTag_Lv5Soup_Draw,
 };
 
-/* 80D5B1AC-80D5B1DC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_LV5SOUP */
 extern actor_process_profile_definition g_profile_TAG_LV5SOUP = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp
index 48cf225a63..b110597add 100644
--- a/src/d/actor/d_a_tag_lv6CstaSw.cpp
+++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp
@@ -8,18 +8,15 @@
 #include "d/actor/d_a_tag_lv6CstaSw.h"
 #include "d/d_procname.h"
 
-/* 80D5B2EC-80D5B310 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__17daLv6CstaSw_HIO_cFv */
 daLv6CstaSw_HIO_c::daLv6CstaSw_HIO_c() {
     unk_0x4 = 0;
 }
 
-/* 80D5B358-80D5B3B0 000158 0058+00 1/1 0/0 0/0 .text            setBaseMtx__13daLv6CstaSw_cFv */
 void daLv6CstaSw_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80D5B3B0-80D5B410 0001B0 0060+00 1/1 0/0 0/0 .text            create__13daLv6CstaSw_cFv */
 int daLv6CstaSw_c::create() {
     fopAcM_ct(this, daLv6CstaSw_c);
     mSwitch = getSw();
@@ -27,7 +24,6 @@ int daLv6CstaSw_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5B410-80D5B460 000210 0050+00 1/1 0/0 0/0 .text searchSekizoAct__13daLv6CstaSw_cFPvPv */
 fopAc_ac_c* daLv6CstaSw_c::searchSekizoAct(void* i_actor, void*) {
     if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetProfName(i_actor) == PROC_CSTATUE) {
         return (fopAc_ac_c*)i_actor;
@@ -36,7 +32,6 @@ fopAc_ac_c* daLv6CstaSw_c::searchSekizoAct(void* i_actor, void*) {
     return NULL;
 }
 
-/* 80D5B460-80D5B600 000260 01A0+00 1/1 0/0 0/0 .text            areaCheck__13daLv6CstaSw_cFv */
 bool daLv6CstaSw_c::areaCheck() {
     bool in_area = false;
 
@@ -53,7 +48,6 @@ bool daLv6CstaSw_c::areaCheck() {
     return in_area;
 }
 
-/* 80D5B600-80D5B6B0 000400 00B0+00 1/1 0/0 0/0 .text            Execute__13daLv6CstaSw_cFv */
 int daLv6CstaSw_c::Execute() {
     if (areaCheck() == true) {
         if (!fopAcM_isSwitch(this, mSwitch)) {
@@ -68,53 +62,40 @@ int daLv6CstaSw_c::Execute() {
     return 1;
 }
 
-/* 80D5B6B0-80D5B6B8 0004B0 0008+00 1/1 0/0 0/0 .text            Draw__13daLv6CstaSw_cFv */
 int daLv6CstaSw_c::Draw() {
     return 1;
 }
 
-/* 80D5B6B8-80D5B6C0 0004B8 0008+00 1/1 0/0 0/0 .text            Delete__13daLv6CstaSw_cFv */
 int daLv6CstaSw_c::Delete() {
     return 1;
 }
 
-/* 80D5B6C0-80D5B6E0 0004C0 0020+00 1/0 0/0 0/0 .text            daLv6CstaSw_Draw__FP13daLv6CstaSw_c
- */
 static int daLv6CstaSw_Draw(daLv6CstaSw_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D5B6E0-80D5B700 0004E0 0020+00 1/0 0/0 0/0 .text daLv6CstaSw_Execute__FP13daLv6CstaSw_c */
 static int daLv6CstaSw_Execute(daLv6CstaSw_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D5B700-80D5B720 000500 0020+00 1/0 0/0 0/0 .text daLv6CstaSw_Delete__FP13daLv6CstaSw_c */
 static int daLv6CstaSw_Delete(daLv6CstaSw_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D5B720-80D5B740 000520 0020+00 1/0 0/0 0/0 .text            daLv6CstaSw_Create__FP10fopAc_ac_c
- */
 static int daLv6CstaSw_Create(fopAc_ac_c* i_this) {
     return static_cast<daLv6CstaSw_c*>(i_this)->create();
 }
 
-/* 80D5B740-80D5B79C 000540 005C+00 2/1 0/0 0/0 .text            __dt__17daLv6CstaSw_HIO_cFv */
 daLv6CstaSw_HIO_c::~daLv6CstaSw_HIO_c() {}
 
-/* 80D5B88C-80D5B894 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daLv6CstaSw_HIO_c l_HIO;
 
-/* ############################################################################################## */
-/* 80D5B810-80D5B830 -00001 0020+00 1/0 0/0 0/0 .data            l_daLv6CstaSw_Method */
 static actor_method_class l_daLv6CstaSw_Method = {
     (process_method_func)daLv6CstaSw_Create,  (process_method_func)daLv6CstaSw_Delete,
     (process_method_func)daLv6CstaSw_Execute, (process_method_func)NULL,
     (process_method_func)daLv6CstaSw_Draw,
 };
 
-/* 80D5B830-80D5B860 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Lv6CstaSw */
 extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp
index 88cf1bc714..086b0ccae5 100644
--- a/src/d/actor/d_a_tag_magne.cpp
+++ b/src/d/actor/d_a_tag_magne.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_magne.h"
 #include "d/d_procname.h"
 
-/* 805A5498-805A54DC 000078 0044+00 1/1 0/0 0/0 .text            Create__12daTagMagne_cFv */
 int daTagMagne_c::Create() {
     if (mTagMagne != NULL) {
         return 0;
@@ -22,7 +21,6 @@ int daTagMagne_c::Create() {
     return 1;
 }
 
-/* 805A54DC-805A5578 0000BC 009C+00 1/1 0/0 0/0 .text            create__12daTagMagne_cFv */
 int daTagMagne_c::create() {
     fopAcM_ct(this, daTagMagne_c);
 
@@ -37,26 +35,19 @@ int daTagMagne_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A5578-805A558C 000158 0014+00 1/1 0/0 0/0 .text            _delete__12daTagMagne_cFv */
 int daTagMagne_c::_delete() {
     mTagMagne = NULL;
     return 1;
 }
 
-/* 805A558C-805A55AC 00016C 0020+00 1/0 0/0 0/0 .text            daTagMagne_Delete__FP12daTagMagne_c
- */
 static void daTagMagne_Delete(daTagMagne_c* i_this) {
     i_this->_delete();
 }
 
-/* 805A55AC-805A55CC 00018C 0020+00 1/0 0/0 0/0 .text            daTagMagne_Create__FP10fopAc_ac_c
- */
 static void daTagMagne_Create(fopAc_ac_c* i_this) {
     ((daTagMagne_c*)i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 805A55D4-805A55F4 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMagne_Method */
 static actor_method_class l_daTagMagne_Method = {
     (process_method_func)daTagMagne_Create,
     (process_method_func)daTagMagne_Delete,
@@ -65,7 +56,6 @@ static actor_method_class l_daTagMagne_Method = {
     (process_method_func)NULL,
 };
 
-/* 805A55F4-805A5624 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Magne */
 extern actor_process_profile_definition g_profile_Tag_Magne = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp
index 931b119e1b..2fae8c8102 100644
--- a/src/d/actor/d_a_tag_mhint.cpp
+++ b/src/d/actor/d_a_tag_mhint.cpp
@@ -12,7 +12,6 @@
 #include "d/d_procname.h"
 #include "d/d_meter2_info.h"
 
-/* 805A56B8-805A58C8 000078 0210+00 1/1 0/0 0/0 .text            create__12daTagMhint_cFv */
 int daTagMhint_c::create() {
     fopAcM_ct(this, daTagMhint_c);
 
@@ -64,23 +63,17 @@ int daTagMhint_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A58C8-805A58E8 000288 0020+00 1/0 0/0 0/0 .text            daTagMhint_Create__FP10fopAc_ac_c
- */
 static int daTagMhint_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMhint_c*>(i_this)->create();
 }
 
-/* 805A58E8-805A594C 0002A8 0064+00 1/1 0/0 0/0 .text            __dt__12daTagMhint_cFv */
 daTagMhint_c::~daTagMhint_c() {}
 
-/* 805A594C-805A5974 00030C 0028+00 1/0 0/0 0/0 .text            daTagMhint_Delete__FP12daTagMhint_c
- */
 static int daTagMhint_Delete(daTagMhint_c* i_this) {
     i_this->~daTagMhint_c();
     return 1;
 }
 
-/* 805A5974-805A5AE4 000334 0170+00 1/1 0/0 0/0 .text            eventOrder__12daTagMhint_cFv */
 void daTagMhint_c::eventOrder() {
     if (!dComIfGp_event_runCheck()) {
         eventInfo.onCondition(dEvtCnd_CANTALK_e);
@@ -112,7 +105,6 @@ void daTagMhint_c::eventOrder() {
     }
 }
 
-/* 805A5AE4-805A6004 0004A4 0520+00 1/1 0/0 0/0 .text            execute__12daTagMhint_cFv */
 int daTagMhint_c::execute() {
     daMidna_c* midna_p = daPy_py_c::getMidnaActor();
     if (midna_p == NULL) {
@@ -228,26 +220,20 @@ int daTagMhint_c::execute() {
     return 1;
 }
 
-/* 805A6004-805A6024 0009C4 0020+00 1/0 0/0 0/0 .text daTagMhint_Execute__FP12daTagMhint_c */
 static int daTagMhint_Execute(daTagMhint_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A6024-805A602C 0009E4 0008+00 1/0 0/0 0/0 .text            daTagMhint_Draw__FP12daTagMhint_c
- */
 static int daTagMhint_Draw(daTagMhint_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A6054-805A6074 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMhint_Method */
 static actor_method_class l_daTagMhint_Method = {
     (process_method_func)daTagMhint_Create,  (process_method_func)daTagMhint_Delete,
     (process_method_func)daTagMhint_Execute, (process_method_func)NULL,
     (process_method_func)daTagMhint_Draw,
 };
 
-/* 805A6074-805A60A4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Mhint */
 extern actor_process_profile_definition g_profile_Tag_Mhint = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp
index 02e8af7208..ad7168eed1 100644
--- a/src/d/actor/d_a_tag_mist.cpp
+++ b/src/d/actor/d_a_tag_mist.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 8048F258-8048F2C4 000078 006C+00 1/1 0/0 0/0 .text            offSw__11daTagMist_cFv */
 void daTagMist_c::offSw() {
     u8 sw_no_num;
     u8 top_sw_no;
@@ -22,7 +21,6 @@ void daTagMist_c::offSw() {
     }
 }
 
-/* 8048F2C4-8048F310 0000E4 004C+00 1/1 0/0 0/0 .text            onMySw__11daTagMist_cFv */
 void daTagMist_c::onMySw() {
     u32 my_sw_no;
     u32 top_sw_no;
@@ -35,7 +33,6 @@ void daTagMist_c::onMySw() {
     }
 }
 
-/* 8048F310-8048F370 000130 0060+00 1/1 0/0 0/0 .text            isMySw__11daTagMist_cFv */
 BOOL daTagMist_c::isMySw() {
     u32 my_sw_no;
     u32 top_sw_no;
@@ -50,7 +47,6 @@ BOOL daTagMist_c::isMySw() {
     }
 }
 
-/* 8048F370-8048F444 000190 00D4+00 1/1 0/0 0/0 .text            Create__11daTagMist_cFv */
 int daTagMist_c::Create() {
     mVertices[0].x = scale.x * -50.0f;
     mVertices[0].z = scale.z * -50.0f;
@@ -77,7 +73,6 @@ int daTagMist_c::Create() {
     return 1;
 }
 
-/* 8048F444-8048F518 000264 00D4+00 1/1 0/0 0/0 .text            create__11daTagMist_cFv */
 int daTagMist_c::create() {
     fopAcM_ct(this, daTagMist_c);
 
@@ -102,7 +97,6 @@ int daTagMist_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8048F558-8048F690 000378 0138+00 1/1 0/0 0/0 .text            execute__11daTagMist_cFv */
 int daTagMist_c::execute() {
     if (fopAcM_isSwitch(this, daTagMist_prm::getSwNo2(this))) {
         return 1;
@@ -128,30 +122,22 @@ int daTagMist_c::execute() {
     return 1;
 }
 
-/* 8048F690-8048F698 0004B0 0008+00 1/1 0/0 0/0 .text            _delete__11daTagMist_cFv */
 int daTagMist_c::_delete() {
     return 1;
 }
 
-/* 8048F698-8048F6B8 0004B8 0020+00 1/0 0/0 0/0 .text            daTagMist_Execute__FP11daTagMist_c
- */
 static int daTagMist_Execute(daTagMist_c* i_this) {
     return i_this->execute();
 }
 
-/* 8048F6B8-8048F6D8 0004D8 0020+00 1/0 0/0 0/0 .text            daTagMist_Delete__FP11daTagMist_c
- */
 static int daTagMist_Delete(daTagMist_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8048F6D8-8048F6F8 0004F8 0020+00 1/0 0/0 0/0 .text            daTagMist_Create__FP10fopAc_ac_c */
 static int daTagMist_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMist_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 8048F70C-8048F72C -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMist_Method */
 static actor_method_class l_daTagMist_Method = {
     (process_method_func)daTagMist_Create,
     (process_method_func)daTagMist_Delete,
@@ -160,7 +146,6 @@ static actor_method_class l_daTagMist_Method = {
     (process_method_func)NULL,
 };
 
-/* 8048F72C-8048F75C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Mist */
 extern actor_process_profile_definition g_profile_Tag_Mist = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp
index f31a6ef060..00f4201ad2 100644
--- a/src/d/actor/d_a_tag_mmsg.cpp
+++ b/src/d/actor/d_a_tag_mmsg.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_mmsg
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_mmsg.h"
@@ -10,8 +5,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* ############################################################################################## */
-/* 80D5B918-80D5BA94 000078 017C+00 1/1 0/0 0/0 .text            create__11daTagMmsg_cFv */
 int daTagMmsg_c::create() {
     fopAcM_ct(this, daTagMmsg_c);
 
@@ -44,22 +37,17 @@ int daTagMmsg_c::create() {
     return 4;
 }
 
-/* 80D5BA94-80D5BAB4 0001F4 0020+00 1/0 0/0 0/0 .text            daTagMmsg_Create__FP10fopAc_ac_c */
 static int daTagMmsg_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMmsg_c*>(i_this)->create();
 }
 
-/* 80D5BAB4-80D5BB08 000214 0054+00 1/1 0/0 0/0 .text            __dt__11daTagMmsg_cFv */
 daTagMmsg_c::~daTagMmsg_c() {}
 
-/* 80D5BB08-80D5BB30 000268 0028+00 1/0 0/0 0/0 .text            daTagMmsg_Delete__FP11daTagMmsg_c
- */
 static int daTagMmsg_Delete(daTagMmsg_c* i_this) {
     i_this->~daTagMmsg_c();
     return 1;
 }
 
-/* 80D5BB30-80D5BD08 000290 01D8+00 1/1 0/0 0/0 .text            execute__11daTagMmsg_cFv */
 int daTagMmsg_c::execute() {
     if (daPy_py_c::getMidnaActor() == NULL) {
         return 1;
@@ -94,26 +82,20 @@ int daTagMmsg_c::execute() {
     return 1;
 }
 
-/* 80D5BD08-80D5BD28 000468 0020+00 1/0 0/0 0/0 .text            daTagMmsg_Execute__FP11daTagMmsg_c
- */
 static int daTagMmsg_Execute(daTagMmsg_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5BD28-80D5BD30 000488 0008+00 1/0 0/0 0/0 .text            daTagMmsg_Draw__FP11daTagMmsg_c */
 static int daTagMmsg_Draw(daTagMmsg_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5BD44-80D5BD64 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMmsg_Method */
 static actor_method_class l_daTagMmsg_Method = {
     (process_method_func)daTagMmsg_Create,  (process_method_func)daTagMmsg_Delete,
     (process_method_func)daTagMmsg_Execute, (process_method_func)NULL,
     (process_method_func)daTagMmsg_Draw,
 };
 
-/* 80D5BD64-80D5BD94 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Mmsg */
 extern actor_process_profile_definition g_profile_Tag_Mmsg = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index a19e5ce2cf..2a9c59d708 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -8,29 +8,22 @@
 #include "d/actor/d_a_tag_msg.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 8048F7D8-8048F7F8 000078 0020+00 1/1 0/0 0/0 .text            createHeapCallBack__FP10fopAc_ac_c
- */
 static int createHeapCallBack(fopAc_ac_c* i_this) {
     return ((daTag_Msg_c*)i_this)->createHeap();
 }
 
-/* 804901C4-804901C8 -00001 0004+00 1/1 0/0 0/0 .data            l_resName */
 static char* l_resName = "TagMsg";
 
-/* 804901C8-804901D0 -00001 0008+00 1/1 0/0 0/0 .data            l_evtNameTBL */
 static char* l_evtNameTBL[2] = {
     NULL,
     "SPEAK",
 };
 
-/* 8048F7F8-8048F878 000098 0080+00 1/0 0/0 0/0 .text            __dt__11daTag_Msg_cFv */
 daTag_Msg_c::~daTag_Msg_c() {
     dComIfG_resDelete(&mPhase, getResName());
 }
 
-/* 8048F878-8048F954 000118 00DC+00 1/1 0/0 0/0 .text            create__11daTag_Msg_cFv */
 int daTag_Msg_c::create() {
     fopAcM_ct(this, daTag_Msg_c);
 
@@ -50,7 +43,6 @@ int daTag_Msg_c::create() {
     return phase_state;
 }
 
-/* 8048F954-8048F9B4 0001F4 0060+00 1/1 0/0 0/0 .text            createHeap__11daTag_Msg_cFv */
 int daTag_Msg_c::createHeap() {
     mParam = new daTag_Msg_Param_c();
     if (mParam == NULL) {
@@ -60,16 +52,13 @@ int daTag_Msg_c::createHeap() {
     return 1;
 }
 
-/* 8048F9B4-8048F9E8 000254 0034+00 1/1 0/0 0/0 .text            destroy__11daTag_Msg_cFv */
 int daTag_Msg_c::destroy() {
     this->~daTag_Msg_c();
     return 1;
 }
 
-/* 80490178-8049017C 000000 0001+03 1/1 0/0 0/0 .rodata          m__17daTag_Msg_Param_c */
 const daTag_Msg_HIO_Param_c daTag_Msg_Param_c::m = {0};
 
-/* 8048F9E8-8048FC68 000288 0280+00 1/1 0/0 0/0 .text            execute__11daTag_Msg_cFv */
 int daTag_Msg_c::execute() {
     bool set_event = true;
 
@@ -139,18 +128,15 @@ int daTag_Msg_c::execute() {
     return 1;
 }
 
-/* 8048FC68-8048FC70 000508 0008+00 1/1 0/0 0/0 .text            draw__11daTag_Msg_cFv */
 int daTag_Msg_c::draw() {
     return 1;
 }
 
-/* 8048FC70-8048FE18 000510 01A8+00 1/1 0/0 0/0 .text            rangeCheck__11daTag_Msg_cFv */
 BOOL daTag_Msg_c::rangeCheck() {
     cXyz player_dist = daPy_getPlayerActorClass()->current.pos - current.pos;
     return player_dist.absXZ() < scale.x && (-scale.y < player_dist.y && player_dist.y < scale.y);
 }
 
-/* 8048FE18-8048FF8C 0006B8 0174+00 1/1 0/0 0/0 .text            otherCheck__11daTag_Msg_cFv */
 BOOL daTag_Msg_c::otherCheck() {
     if (field_0x5dc) {
         if (mOnSaveLabel == 0xFFF ||
@@ -185,12 +171,10 @@ BOOL daTag_Msg_c::otherCheck() {
     return angle_to_player <= 0x1000;
 }
 
-/* 8048FF8C-8048FF9C 00082C 0010+00 2/2 0/0 0/0 .text            getResName__11daTag_Msg_cFv */
 char* daTag_Msg_c::getResName() {
     return l_resName;
 }
 
-/* 8048FF9C-8049004C 00083C 00B0+00 1/1 0/0 0/0 .text            getParam__11daTag_Msg_cFv */
 void daTag_Msg_c::getParam() {
     mOnSwitch = home.angle.x & 0xFF;
     mOffSwitch = (home.angle.x >> 8) & 0xFF;
@@ -210,13 +194,11 @@ void daTag_Msg_c::getParam() {
     strcpy(mStaffName, "Tag_ms");
 }
 
-/* 804901D0-804901D8 -00001 0008+00 1/1 0/0 0/0 .data            mEvtCutTBL__11daTag_Msg_c */
-SECTION_DATA char* daTag_Msg_c::mEvtCutTBL[2] = {
+char* daTag_Msg_c::mEvtCutTBL[2] = {
     "SPEAK",
     "PAUSE",
 };
 
-/* 8049004C-804900A0 0008EC 0054+00 1/1 0/0 0/0 .text            cut_speak__11daTag_Msg_cFii */
 BOOL daTag_Msg_c::cut_speak(int i_staffId, BOOL i_isAdvance) {
     if (i_isAdvance) {
         mMsgFlow.init(this, mFlowID, 0, NULL);
@@ -226,27 +208,22 @@ BOOL daTag_Msg_c::cut_speak(int i_staffId, BOOL i_isAdvance) {
     }
 }
 
-/* 804900A0-804900C0 000940 0020+00 1/0 0/0 0/0 .text            daTag_Msg_Create__FPv */
 static int daTag_Msg_Create(void* i_this) {
     return ((daTag_Msg_c*)i_this)->create();
 }
 
-/* 804900C0-804900E0 000960 0020+00 1/0 0/0 0/0 .text            daTag_Msg_Delete__FPv */
 static int daTag_Msg_Delete(void* i_this) {
     return ((daTag_Msg_c*)i_this)->destroy();
 }
 
-/* 804900E0-80490100 000980 0020+00 1/0 0/0 0/0 .text            daTag_Msg_Execute__FPv */
 static int daTag_Msg_Execute(void* i_this) {
     return ((daTag_Msg_c*)i_this)->execute();
 }
 
-/* 80490100-80490120 0009A0 0020+00 1/0 0/0 0/0 .text            daTag_Msg_Draw__FPv */
 static int daTag_Msg_Draw(void* i_this) {
     return ((daTag_Msg_c*)i_this)->draw();
 }
 
-/* 80490120-80490128 0009C0 0008+00 1/0 0/0 0/0 .text            daTag_Msg_IsDelete__FPv */
 static int daTag_Msg_IsDelete(void* i_this) {
     return 1;
 }
@@ -255,14 +232,12 @@ void dummyString() {
     DEAD_STRING("Timer");
 }
 
-/* 804901D8-804901F8 -00001 0020+00 1/0 0/0 0/0 .data            daTag_Msg_MethodTable */
 static actor_method_class daTag_Msg_MethodTable = {
     (process_method_func)daTag_Msg_Create,  (process_method_func)daTag_Msg_Delete,
     (process_method_func)daTag_Msg_Execute, (process_method_func)daTag_Msg_IsDelete,
     (process_method_func)daTag_Msg_Draw,
 };
 
-/* 804901F8-80490228 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_MSG */
 extern actor_process_profile_definition g_profile_TAG_MSG = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp
index 24addcce62..4a6d974a2e 100644
--- a/src/d/actor/d_a_tag_mstop.cpp
+++ b/src/d/actor/d_a_tag_mstop.cpp
@@ -11,7 +11,6 @@
 #include "d/actor/d_a_npc4.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 805A6138-805A6318 000078 01E0+00 1/1 0/0 0/0 .text            create__12daTagMstop_cFv */
 int daTagMstop_c::create() {
     fopAcM_ct(this, daTagMstop_c);
 
@@ -68,29 +67,22 @@ int daTagMstop_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A6318-805A6338 000258 0020+00 1/0 0/0 0/0 .text            daTagMstop_Create__FP10fopAc_ac_c
- */
 static int daTagMstop_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMstop_c*>(i_this)->create();
 }
 
-/* 805A6338-805A639C 000278 0064+00 1/1 0/0 0/0 .text            __dt__12daTagMstop_cFv */
 daTagMstop_c::~daTagMstop_c() {}
 
-/* 805A639C-805A63C4 0002DC 0028+00 1/0 0/0 0/0 .text            daTagMstop_Delete__FP12daTagMstop_c
- */
 static int daTagMstop_Delete(daTagMstop_c* i_this) {
     i_this->~daTagMstop_c();
     return 1;
 }
 
-/* 805A63C4-805A63F8 000304 0034+00 1/1 0/0 0/0 .text            eventOrder__12daTagMstop_cFv */
 void daTagMstop_c::eventOrder() {
     eventInfo.onCondition(dEvtCnd_CANTALK_e);
     fopAcM_orderSpeakEvent(this, 0, 0);
 }
 
-/* 805A63F8-805A693C 000338 0544+00 1/1 0/0 0/0 .text            execute__12daTagMstop_cFv */
 int daTagMstop_c::execute() {
     if (field_0x56c) {
         fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_DARK_GATE, 0);
@@ -172,24 +164,18 @@ int daTagMstop_c::execute() {
     return 1;
 }
 
-/* 805A693C-805A695C 00087C 0020+00 1/0 0/0 0/0 .text daTagMstop_Execute__FP12daTagMstop_c */
 static int daTagMstop_Execute(daTagMstop_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A695C-805A6964 00089C 0008+00 1/0 0/0 0/0 .text            daTagMstop_Draw__FP12daTagMstop_c
- */
 static int daTagMstop_Draw(daTagMstop_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 805A6984-805A69A4 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMstop_Method */
 static actor_method_class l_daTagMstop_Method = {
     (process_method_func)daTagMstop_Create, (process_method_func)daTagMstop_Delete,
     (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw};
 
-/* 805A69A4-805A69D4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Mstop */
 extern actor_process_profile_definition g_profile_Tag_Mstop = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp
index 20505fa253..2fd9cfa7b9 100644
--- a/src/d/actor/d_a_tag_mwait.cpp
+++ b/src/d/actor/d_a_tag_mwait.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_midna.h"
 #include "d/d_procname.h"
 
-/* 80D5BE18-80D5BFFC 000078 01E4+00 1/1 0/0 0/0 .text            create__12daTagMwait_cFv */
 int daTagMwait_c::create() {
     fopAcM_ct(this, daTagMwait_c);
 
@@ -54,23 +53,17 @@ int daTagMwait_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5BFFC-80D5C01C 00025C 0020+00 1/0 0/0 0/0 .text            daTagMwait_Create__FP10fopAc_ac_c
- */
 static int daTagMwait_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMwait_c*>(i_this)->create();
 }
 
-/* 80D5C01C-80D5C080 00027C 0064+00 1/1 0/0 0/0 .text            __dt__12daTagMwait_cFv */
 daTagMwait_c::~daTagMwait_c() {}
 
-/* 80D5C080-80D5C0A8 0002E0 0028+00 1/0 0/0 0/0 .text            daTagMwait_Delete__FP12daTagMwait_c
- */
 static int daTagMwait_Delete(daTagMwait_c* i_this) {
     i_this->~daTagMwait_c();
     return 1;
 }
 
-/* 80D5C0A8-80D5C550 000308 04A8+00 1/1 0/0 0/0 .text            execute__12daTagMwait_cFv */
 int daTagMwait_c::execute() {
     daMidna_c* midna_p = daPy_py_c::getMidnaActor();
     daPy_py_c* player_p = daPy_getLinkPlayerActorClass();
@@ -148,26 +141,20 @@ int daTagMwait_c::execute() {
     return 1;
 }
 
-/* 80D5C550-80D5C570 0007B0 0020+00 1/0 0/0 0/0 .text daTagMwait_Execute__FP12daTagMwait_c */
 static int daTagMwait_Execute(daTagMwait_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5C570-80D5C578 0007D0 0008+00 1/0 0/0 0/0 .text            daTagMwait_Draw__FP12daTagMwait_c
- */
 static int daTagMwait_Draw(daTagMwait_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5C5C4-80D5C5E4 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMwait_Method */
 static actor_method_class l_daTagMwait_Method = {
     (process_method_func)daTagMwait_Create,  (process_method_func)daTagMwait_Delete,
     (process_method_func)daTagMwait_Execute, (process_method_func)NULL,
     (process_method_func)daTagMwait_Draw,
 };
 
-/* 80D5C5E4-80D5C614 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Mwait */
 extern actor_process_profile_definition g_profile_Tag_Mwait = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp
index 02b27e31e0..f1984096c3 100644
--- a/src/d/actor/d_a_tag_myna2.cpp
+++ b/src/d/actor/d_a_tag_myna2.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_myna2.h"
 #include "d/d_procname.h"
 
-/* 80D5C698-80D5C708 000078 0070+00 1/1 0/0 0/0 .text            create__12daTagMyna2_cFv */
 s32 daTagMyna2_c::create() {
     fopAcM_ct(this, daTagMyna2_c);
     mSwitchNo = getSwBit();
@@ -17,7 +16,6 @@ s32 daTagMyna2_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5C708-80D5C9A8 0000E8 02A0+00 1/1 0/0 0/0 .text            execute__12daTagMyna2_cFv */
 s32 daTagMyna2_c::execute() {
     if (!dComIfGp_event_runCheck()) {
         if (!dComIfGs_isSwitch(mSwitchNo,fopAcM_GetRoomNo(this))) {
@@ -53,33 +51,25 @@ s32 daTagMyna2_c::execute() {
     return 1;
 }
 
-/* 80D5C9A8-80D5C9C8 000388 0020+00 1/0 0/0 0/0 .text            daTagMyna2_Create__FP10fopAc_ac_c
- */
 static s32 daTagMyna2_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagMyna2_c*>(i_this)->create();
 }
 
-/* 80D5C9C8-80D5C9E8 0003A8 0020+00 1/0 0/0 0/0 .text daTagMyna2_Execute__FP12daTagMyna2_c */
 static s32 daTagMyna2_Execute(daTagMyna2_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5C9E8-80D5CA18 0003C8 0030+00 1/0 0/0 0/0 .text            daTagMyna2_Delete__FP12daTagMyna2_c
- */
 static s32 daTagMyna2_Delete(daTagMyna2_c* i_this) {
     i_this->~daTagMyna2_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5CA64-80D5CA84 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagMyna2_Method */
 static actor_method_class l_daTagMyna2_Method = {
     (process_method_func)daTagMyna2_Create,
     (process_method_func)daTagMyna2_Delete,
     (process_method_func)daTagMyna2_Execute,
 };
 
-/* 80D5CA84-80D5CAB4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_MYNA2 */
 extern actor_process_profile_definition g_profile_TAG_MYNA2 = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp
index 513344b86b..a7fb443563 100644
--- a/src/d/actor/d_a_tag_myna_light.cpp
+++ b/src/d/actor/d_a_tag_myna_light.cpp
@@ -7,14 +7,12 @@
 #include "d/d_stage.h"
 #include "d/d_particle.h"
 
-/* 80D5CB38-80D5CB9C 000078 0064+00 1/1 0/0 0/0 .text            create__17daTag_MynaLight_cFv */
 int daTag_MynaLight_c::create() {
     fopAcM_ct(this, daTag_MynaLight_c);
     initialize();
     return 4;
 }
 
-/* 80D5CB9C-80D5CBF4 0000DC 0058+00 1/1 0/0 0/0 .text            Delete__17daTag_MynaLight_cFv */
 int daTag_MynaLight_c::Delete() {
     for (int i = 0; i < 2; i++) {
         if (field_0x570[i] != NULL) {
@@ -26,7 +24,6 @@ int daTag_MynaLight_c::Delete() {
     return 1;
 }
 
-/* 80D5CBF4-80D5CD94 000134 01A0+00 1/1 0/0 0/0 .text            Execute__17daTag_MynaLight_cFv */
 int daTag_MynaLight_c::Execute() {
     u8 uVar1 = (int)(dComIfGs_getTime() * 0.06666667f) & 0xFF;
     u8 turn_on_time = getTurnOnTime() & 0xFF;
@@ -57,7 +54,6 @@ int daTag_MynaLight_c::Execute() {
     return 1;
 }
 
-/* 80D5CD94-80D5CE40 0002D4 00AC+00 1/1 0/0 0/0 .text            Draw__17daTag_MynaLight_cFv */
 int daTag_MynaLight_c::Draw() {
     if (mTurnOnFlag) {
         cLib_addCalc(&field_0x56c, 1.0f, 0.5f, 0.1f, 0.0001f);
@@ -72,7 +68,6 @@ int daTag_MynaLight_c::Draw() {
     return 1;
 }
 
-/* 80D5CE40-80D5D148 000380 0308+00 0/0 0/0 1/1 .text setTurnOnOffChange__17daTag_MynaLight_cFv */
 bool daTag_MynaLight_c::setTurnOnOffChange() {
     if (checkTurnOnOffChange()) {
         mTurnOnFlag = field_0x578;
@@ -115,18 +110,14 @@ bool daTag_MynaLight_c::setTurnOnOffChange() {
     return mTurnOnFlag;
 }
 
-/* 80D5D148-80D5D154 000688 000C+00 1/1 0/0 0/0 .text getTurnOnTime__17daTag_MynaLight_cFv */
 u32 daTag_MynaLight_c::getTurnOnTime() {
     return fopAcM_GetParamBit(this, 0, 5);
 }
 
-/* 80D5D154-80D5D160 000694 000C+00 1/1 0/0 0/0 .text getTurnOffTime__17daTag_MynaLight_cFv */
 u32 daTag_MynaLight_c::getTurnOffTime() {
     return fopAcM_GetParamBit(this, 5, 5);
 }
 
-/* 80D5D160-80D5D210 0006A0 00B0+00 1/1 0/0 0/0 .text            initialize__17daTag_MynaLight_cFv
- */
 void daTag_MynaLight_c::initialize() {
     fopAcM_setCullSizeBox(this, -30.0, -15.0, -30.0, 30.0, 45.0, 30.0);
     attention_info.flags = 0;
@@ -140,43 +131,34 @@ void daTag_MynaLight_c::initialize() {
     }
 }
 
-/* 80D5D210-80D5D230 000750 0020+00 1/0 0/0 0/0 .text            daTag_MynaLight_Create__FPv */
 static int daTag_MynaLight_Create(void* i_this) {
     return static_cast<daTag_MynaLight_c*>(i_this)->create();
 }
 
-/* 80D5D230-80D5D250 000770 0020+00 1/0 0/0 0/0 .text            daTag_MynaLight_Delete__FPv */
 static int daTag_MynaLight_Delete(void* i_this) {
     return static_cast<daTag_MynaLight_c*>(i_this)->Delete();
 }
 
-/* 80D5D250-80D5D270 000790 0020+00 1/0 0/0 0/0 .text            daTag_MynaLight_Execute__FPv */
 static int daTag_MynaLight_Execute(void* i_this) {
     return static_cast<daTag_MynaLight_c*>(i_this)->Execute();
 }
 
-/* 80D5D270-80D5D290 0007B0 0020+00 1/0 0/0 0/0 .text            daTag_MynaLight_Draw__FPv */
 static int daTag_MynaLight_Draw(void* i_this) {
     return static_cast<daTag_MynaLight_c*>(i_this)->Draw();
 }
 
-/* 80D5D290-80D5D298 0007D0 0008+00 1/0 0/0 0/0 .text            daTag_MynaLight_IsDelete__FPv */
 static int daTag_MynaLight_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D5D298-80D5D2F8 0007D8 0060+00 1/0 0/0 0/0 .text            __dt__17daTag_MynaLight_cFv */
 daTag_MynaLight_c::~daTag_MynaLight_c() {}
 
-/* ############################################################################################## */
-/* 80D5D348-80D5D368 -00001 0020+00 1/0 0/0 0/0 .data            daTag_MynaLight_MethodTable */
 static actor_method_class daTag_MynaLight_MethodTable = {
     (process_method_func)daTag_MynaLight_Create,  (process_method_func)daTag_MynaLight_Delete,
     (process_method_func)daTag_MynaLight_Execute, (process_method_func)daTag_MynaLight_IsDelete,
     (process_method_func)daTag_MynaLight_Draw,
 };
 
-/* 80D5D368-80D5D398 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_MNLIGHT */
 extern actor_process_profile_definition g_profile_TAG_MNLIGHT = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp
index 0eb69dacf6..fd12d75a47 100644
--- a/src/d/actor/d_a_tag_pachi.cpp
+++ b/src/d/actor/d_a_tag_pachi.cpp
@@ -1,19 +1,11 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_pachi
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_pachi.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D5D438-80D5D570 000078 0138+00 1/1 0/0 0/0 .text            __dt__11daTagPati_cFv */
 daTagPati_c::~daTagPati_c() {}
 
-/* ############################################################################################## */
-/* 80D5D914-80D5D958 000000 0044+00 1/1 0/0 0/0 .rodata          l_sph_src */
 static dCcD_SrcCyl const l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xD8FBFDFF, 0x0}, 0x19}},  // mObj
@@ -28,7 +20,6 @@ static dCcD_SrcCyl const l_sph_src = {
     }                        // mCyl
 };
 
-/* 80D5D570-80D5D6A0 0001B0 0130+00 1/1 0/0 0/0 .text            create__11daTagPati_cFv */
 int daTagPati_c::create() {
     fopAcM_ct(this, daTagPati_c);
     field_0x6E0 = get_prm();
@@ -39,15 +30,12 @@ int daTagPati_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5D78C-80D5D7C8 0003CC 003C+00 1/1 0/0 0/0 .text            Execute__11daTagPati_cFv */
 int daTagPati_c::Execute() {
     col_set();
     field_0x6E4 = chk_CoHit();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5D7C8-80D5D830 000408 0068+00 1/1 0/0 0/0 .text            col_set__11daTagPati_cFv */
 void daTagPati_c::col_set() {
     mCyl.SetR(1350.f);
     mCyl.SetH(300000.0f);
@@ -55,38 +43,29 @@ void daTagPati_c::col_set() {
     dComIfG_Ccsp()->Set(&mCyl);
 }
 
-/* 80D5D830-80D5D85C 000470 002C+00 1/1 0/0 0/0 .text            chk_CoHit__11daTagPati_cFv */
 u32 daTagPati_c::chk_CoHit() {
     return mCyl.ChkCoHit() ? 1 : 0;
 }
 
-/* 80D5D85C-80D5D87C 00049C 0020+00 1/0 0/0 0/0 .text            daTagPati_Create__FP10fopAc_ac_c */
 static int daTagPati_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagPati_c*>(i_this)->create();
 }
 
-/* 80D5D87C-80D5D89C 0004BC 0020+00 1/0 0/0 0/0 .text            daTagPati_Execute__FP10fopAc_ac_c
- */
 static int daTagPati_Execute(fopAc_ac_c* i_this) {
     return static_cast<daTagPati_c*>(i_this)->Execute();
 }
 
-/* 80D5D89C-80D5D8C4 0004DC 0028+00 1/0 0/0 0/0 .text            daTagPati_Delete__FP11daTagPati_c
- */
 static int daTagPati_Delete(daTagPati_c* i_this) {
     i_this->~daTagPati_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5D960-80D5D980 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagPati_Method */
 static actor_method_class l_daTagPati_Method = {
     (process_method_func)daTagPati_Create,
     (process_method_func)daTagPati_Delete,
     (process_method_func)daTagPati_Execute,
 };
 
-/* 80D5D980-80D5D9B0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_PATI */
 extern actor_process_profile_definition g_profile_TAG_PATI = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp
index d56d890f5d..76e0c30ddd 100644
--- a/src/d/actor/d_a_tag_poFire.cpp
+++ b/src/d/actor/d_a_tag_poFire.cpp
@@ -8,18 +8,15 @@
 #include "d/actor/d_a_tag_poFire.h"
 #include "d/d_procname.h"
 
-/* 80D5DACC-80D5DAF0 0000EC 0024+00 1/1 0/0 0/0 .text            __ct__17daTagPoFire_HIO_cFv */
 daTagPoFire_HIO_c::daTagPoFire_HIO_c() {
     unk_0x4 = 0x14;
 }
 
-/* 80D5DB38-80D5DB90 000158 0058+00 1/1 0/0 0/0 .text            setBaseMtx__13daTagPoFire_cFv */
 void daTagPoFire_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80D5DB90-80D5DBF0 0001B0 0060+00 1/1 0/0 0/0 .text            create__13daTagPoFire_cFv */
 int daTagPoFire_c::create() {
     fopAcM_ct(this, daTagPoFire_c);
     field_0x569 = 0;
@@ -27,7 +24,6 @@ int daTagPoFire_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5DBF0-80D5DC20 000210 0030+00 1/1 0/0 0/0 .text            Execute__13daTagPoFire_cFv */
 int daTagPoFire_c::Execute() {
     if (field_0x569) {
         fopAcM_delete(this);
@@ -35,55 +31,42 @@ int daTagPoFire_c::Execute() {
     return 1;
 }
 
-/* 80D5DC20-80D5DC28 000240 0008+00 1/1 0/0 0/0 .text            Draw__13daTagPoFire_cFv */
 int daTagPoFire_c::Draw() {
     return 1;
 }
 
-/* 80D5DC28-80D5DC30 000248 0008+00 1/1 0/0 0/0 .text            Delete__13daTagPoFire_cFv */
 int daTagPoFire_c::Delete() {
     return 1;
 }
 
-/* 80D5DC30-80D5DC50 000250 0020+00 1/0 0/0 0/0 .text            daTagPoFire_Draw__FP13daTagPoFire_c
- */
 static int daTagPoFire_Draw(daTagPoFire_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D5DC50-80D5DC70 000270 0020+00 1/0 0/0 0/0 .text daTagPoFire_Execute__FP13daTagPoFire_c */
 static int daTagPoFire_Execute(daTagPoFire_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D5DC70-80D5DC90 000290 0020+00 1/0 0/0 0/0 .text daTagPoFire_Delete__FP13daTagPoFire_c */
 static int daTagPoFire_Delete(daTagPoFire_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D5DC90-80D5DCB0 0002B0 0020+00 1/0 0/0 0/0 .text            daTagPoFire_Create__FP10fopAc_ac_c
- */
 static int daTagPoFire_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagPoFire_c*>(i_this)->create();
 }
 
-/* 80D5DCB0-80D5DD0C 0002D0 005C+00 2/1 0/0 0/0 .text            __dt__17daTagPoFire_HIO_cFv */
 daTagPoFire_HIO_c::~daTagPoFire_HIO_c() {}
 
-/* 80D5DDD0-80D5DDDC 000008 000C+00 1/1 0/0 0/0 .bss             @3617 */
 static u8 lit_3617[12];
 
-/* 80D5DDDC-80D5DDE4 000014 0008+00 1/1 0/0 0/0 .bss             l_HIO */
 static daTagPoFire_HIO_c l_HIO;
 
-/* 80D5DD5C-80D5DD7C -00001 0020+00 1/0 0/0 0/0 .data            l_daTagPoFire_Method */
 static actor_method_class l_daTagPoFire_Method = {
     (process_method_func)daTagPoFire_Create,  (process_method_func)daTagPoFire_Delete,
     (process_method_func)daTagPoFire_Execute, (process_method_func)NULL,
     (process_method_func)daTagPoFire_Draw,
 };
 
-/* 80D5DD7C-80D5DDAC -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_poFire */
 extern actor_process_profile_definition g_profile_Tag_poFire = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp
index 8f16f32751..f18a56ab83 100644
--- a/src/d/actor/d_a_tag_push.cpp
+++ b/src/d/actor/d_a_tag_push.cpp
@@ -1,15 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tag_push
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_push.h"
 #include "d/actor/d_a_npc4.h"
 #include "d/d_procname.h"
 
-/* 804902B8-80490418 000078 0160+00 2/1 0/0 0/0 .text            srchActor__12daTag_Push_cFPvPv */
 void* daTag_Push_c::srchActor(void* param_0, void* param_1) {
     BOOL bVar1 = false;
     if (param_0 != NULL && fopAcM_IsActor(param_0)) {
@@ -52,7 +46,6 @@ void* daTag_Push_c::srchActor(void* param_0, void* param_1) {
     return param_0;
 }
 
-/* 80490418-804904D4 0001D8 00BC+00 1/1 0/0 0/0 .text            create__12daTag_Push_cFv */
 int daTag_Push_c::create() {
     fopAcM_ct(this, daTag_Push_c);
     scale.x *= 100.0f;
@@ -65,12 +58,10 @@ int daTag_Push_c::create() {
     }
 }
 
-/* 804904D4-804904DC 000294 0008+00 1/1 0/0 0/0 .text            Delete__12daTag_Push_cFv */
 int daTag_Push_c::Delete() {
     return 1;
 }
 
-/* 804904DC-804906BC 00029C 01E0+00 1/1 0/0 0/0 .text            Execute__12daTag_Push_cFv */
 int daTag_Push_c::Execute() {
     if (home.roomNo == dComIfGp_roomControl_getStayNo()) {
         fopAc_ac_c* actor = mActorMngr.getActorP();
@@ -115,12 +106,10 @@ int daTag_Push_c::Execute() {
     return 0;
 }
 
-/* 804906BC-804906C4 00047C 0008+00 1/1 0/0 0/0 .text            Draw__12daTag_Push_cFv */
 int daTag_Push_c::Draw() {
     return 1;
 }
 
-/* 804906C4-80490724 000484 0060+00 2/2 0/0 0/0 .text            isDelete__12daTag_Push_cFv */
 int daTag_Push_c::isDelete() {
     bool retVal = false;
     if (getBitSW2() != 0xFF) {
@@ -131,7 +120,6 @@ int daTag_Push_c::isDelete() {
     return retVal;
 }
 
-/* 80490724-804907FC 0004E4 00D8+00 1/1 0/0 0/0 .text chkPointInArea__12daTag_Push_cF4cXyz */
 int daTag_Push_c::chkPointInArea(cXyz param_0) {
     if ((getBitSW() != 0xFF && dComIfGs_isSwitch(getBitSW(), fopAcM_GetRoomNo(this))) ||
         getBitSW() == 0xFF)
@@ -142,40 +130,32 @@ int daTag_Push_c::chkPointInArea(cXyz param_0) {
     }
 }
 
-/* 804907FC-8049081C 0005BC 0020+00 1/0 0/0 0/0 .text            daTag_Push_Create__FPv */
 static int daTag_Push_Create(void* i_this) {
     return static_cast<daTag_Push_c*>(i_this)->create();
 }
 
-/* 8049081C-8049083C 0005DC 0020+00 1/0 0/0 0/0 .text            daTag_Push_Delete__FPv */
 static int daTag_Push_Delete(void* i_this) {
     return static_cast<daTag_Push_c*>(i_this)->Delete();
 }
 
-/* 8049083C-8049085C 0005FC 0020+00 1/0 0/0 0/0 .text            daTag_Push_Execute__FPv */
 static int daTag_Push_Execute(void* i_this) {
     return static_cast<daTag_Push_c*>(i_this)->Execute();
 }
 
-/* 8049085C-8049087C 00061C 0020+00 1/0 0/0 0/0 .text            daTag_Push_Draw__FPv */
 static int daTag_Push_Draw(void* i_this) {
     return static_cast<daTag_Push_c*>(i_this)->Draw();
 }
 
-/* 8049087C-80490884 00063C 0008+00 1/0 0/0 0/0 .text            daTag_Push_IsDelete__FPv */
 static int daTag_Push_IsDelete(void* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80490978-80490998 -00001 0020+00 1/0 0/0 0/0 .data            daTag_Push_MethodTable */
 static actor_method_class daTag_Push_MethodTable = {
     (process_method_func)daTag_Push_Create,  (process_method_func)daTag_Push_Delete,
     (process_method_func)daTag_Push_Execute, (process_method_func)daTag_Push_IsDelete,
     (process_method_func)daTag_Push_Draw,
 };
 
-/* 80490998-804909C8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_PUSH */
 extern actor_process_profile_definition g_profile_TAG_PUSH = {
     fpcLy_CURRENT_e,
     8,
diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp
index fb69c910ac..3e57df3334 100644
--- a/src/d/actor/d_a_tag_qs.cpp
+++ b/src/d/actor/d_a_tag_qs.cpp
@@ -13,8 +13,6 @@
 #include "d/d_com_inf_game.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* ############################################################################################## */
-/* 80D5ED44-80D5ED88 000000 0044+00 1/1 0/0 0/0 .data            l_cc_cyl_src */
 static dCcD_SrcCyl l_cc_cyl_src = {
     {
         {0x0, {{AT_TYPE_CSTATUE_SWING, 0x0, 0x11}, {0x0, 0x0}, 0x0}}, // mObj
@@ -29,10 +27,8 @@ static dCcD_SrcCyl l_cc_cyl_src = {
     } // mCyl
 };
 
-/* 80D5DE78-80D5DFB0 000078 0138+00 1/1 0/0 0/0 .text            __dt__9daTagQs_cFv */
 daTagQs_c::~daTagQs_c() {}
 
-/* 80D5DFB0-80D5E110 0001B0 0160+00 1/1 0/0 0/0 .text            create__9daTagQs_cFv */
 int daTagQs_c::create() {
     fopAcM_ct(this, daTagQs_c);
     f32 typeScale;
@@ -51,27 +47,22 @@ int daTagQs_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5E1FC-80D5E220 0003FC 0024+00 2/2 0/0 0/0 .text            getPower__9daTagQs_cFv */
 f32 daTagQs_c::getPower() {
     return getType() == 0 ? 4.0f : 5.0f;
 }
 
-/* 80D5E220-80D5E244 000420 0024+00 1/1 0/0 0/0 .text            getSafeArea__9daTagQs_cFv */
 f32 daTagQs_c::getSafeArea() {
     return getType() == 0 ? 0.8f : 0.5f;
 }
 
-/* 80D5E244-80D5E268 000444 0024+00 1/1 0/0 0/0 .text            getPower80__9daTagQs_cFv */
 f32 daTagQs_c::getPower80() {
     return getType() == 0 ? 6.0f : 10.0f;
 }
 
-/* 80D5E268-80D5E28C 000468 0024+00 1/1 0/0 0/0 .text            getCenterPower__9daTagQs_cFv */
 f32 daTagQs_c::getCenterPower() {
     return getType() == 0 ? 12.0f : 20.0f;
 }
 
-/* 80D5E28C-80D5E3F8 00048C 016C+00 1/1 0/0 0/0 .text            calcPower__9daTagQs_cFff */
 f32 daTagQs_c::calcPower(f32 param_1, f32 param_2) {
     f32 dVar12 = 1.0f;
     if (getSwNo() != 0xff) {
@@ -90,7 +81,6 @@ f32 daTagQs_c::calcPower(f32 param_1, f32 param_2) {
             getPower80());
 }
 
-/* 80D5E3F8-80D5E64C 0005F8 0254+00 1/1 0/0 0/0 .text            hikiyose__FP4cXyzP4cXyzP4cXyzf */
 static int hikiyose(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
     cXyz cStack_44 = *param_1 - *param_2;
     cXyz cStack_50(cStack_44);
@@ -117,7 +107,6 @@ static int hikiyose(cXyz* param_1, cXyz* param_2, cXyz* param_3, f32 param_4) {
     return 0;
 }
 
-/* 80D5E64C-80D5E9F8 00084C 03AC+00 1/1 0/0 0/0 .text            search__FPvPv */
 static void* search(void* param_1, void* param_2) {
     if (param_1 == NULL || !fopAcM_IsActor(param_1)) {
         return NULL;
@@ -179,7 +168,6 @@ static void* search(void* param_1, void* param_2) {
     return NULL;
 }
 
-/* 80D5E9F8-80D5EBF8 000BF8 0200+00 1/1 0/0 0/0 .text            execute__9daTagQs_cFv */
 int daTagQs_c::execute() {
     fopAcM_Search(search, this);
     if (getSwNo() != 0xff) {
@@ -215,45 +203,37 @@ int daTagQs_c::execute() {
     return 1;
 }
 
-/* 80D5EBF8-80D5EC00 000DF8 0008+00 1/1 0/0 0/0 .text            draw__9daTagQs_cFv */
 int daTagQs_c::draw() {
     return 1;
 }
 
-/* 80D5EC00-80D5EC20 000E00 0020+00 1/0 0/0 0/0 .text            daTagQs_Draw__FP9daTagQs_c */
 static int daTagQs_Draw(daTagQs_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D5EC20-80D5EC40 000E20 0020+00 1/0 0/0 0/0 .text            daTagQs_Execute__FP9daTagQs_c */
 static int daTagQs_Execute(daTagQs_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5EC40-80D5EC48 000E40 0008+00 1/0 0/0 0/0 .text            daTagQs_IsDelete__FP9daTagQs_c */
 static int daTagQs_IsDelete(daTagQs_c* i_this) {
     return 1;
 }
 
-/* 80D5EC48-80D5EC70 000E48 0028+00 1/0 0/0 0/0 .text            daTagQs_Delete__FP9daTagQs_c */
 static int daTagQs_Delete(daTagQs_c* i_this) {
     i_this->~daTagQs_c();
     return 1;
 }
 
-/* 80D5EC70-80D5EC90 000E70 0020+00 1/0 0/0 0/0 .text            daTagQs_Create__FP10fopAc_ac_c */
 static int daTagQs_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagQs_c*>(i_this)->create();
 }
 
-/* 80D5ED88-80D5EDA8 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagQs_Method */
 static actor_method_class l_daTagQs_Method = {
     (process_method_func)daTagQs_Create,     (process_method_func)daTagQs_Delete,
     (process_method_func)daTagQs_Execute, (process_method_func)daTagQs_IsDelete,
     (process_method_func)daTagQs_Draw,
 };
 
-/* 80D5EDA8-80D5EDD8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_QS */
 extern actor_process_profile_definition g_profile_TAG_QS = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp
index 8ea2f302db..6d336fb945 100644
--- a/src/d/actor/d_a_tag_ret_room.cpp
+++ b/src/d/actor/d_a_tag_ret_room.cpp
@@ -8,30 +8,24 @@
 #include "d/actor/d_a_tag_ret_room.h"
 #include "d/actor/d_a_player.h"
 
-/* 80D5EE98-80D5EED4 000078 003C+00 2/2 0/0 0/0 .text   __ct__12daTagRetRm_cFv */
 daTagRetRm_c::daTagRetRm_c() {}
 
-/* 80D5EED4-80D5EF34 0000B4 0060+00 1/0 0/0 0/0 .text   __dt__12daTagRetRm_cFv */
 daTagRetRm_c::~daTagRetRm_c() {}
 
-/* 80D5EF34-80D5EF8C 000114 0058+00 1/1 0/0 0/0 .text   create__12daTagRetRm_cFv */
 int daTagRetRm_c::create() {
     fopAcM_ct(this, daTagRetRm_c);
     init();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5EF8C-80D5EF94 00016C 0008+00 1/1 0/0 0/0 .text   Delete__12daTagRetRm_cFv */
 int daTagRetRm_c::Delete() {
     return 1;
 }
 
-/* 80D5EF94-80D5EF9C 000174 0008+00 1/1 0/0 0/0 .text   draw__12daTagRetRm_cFv */
 int daTagRetRm_c::draw() {
     return 1;
 }
 
-/* 80D5EF9C-80D5F010 00017C 0074+00 1/1 0/0 0/0 .text   execute__12daTagRetRm_cFv */
 int daTagRetRm_c::execute() {
     if (field_0x578 != 0) {
         field_0x578--;
@@ -47,7 +41,6 @@ int daTagRetRm_c::execute() {
     return 1;
 }
 
-/* 80D5F010-80D5F050 0001F0 0040+00 1/1 0/0 0/0 .text   init__12daTagRetRm_cFv */
 void daTagRetRm_c::init() {
     field_0x56c = scale.x * 50;
     field_0x570 = scale.y * 100;
@@ -55,7 +48,6 @@ void daTagRetRm_c::init() {
     field_0x578 = 0;
 }
 
-/* 80D5F050-80D5F14C 000230 00FC+00 1/1 0/0 0/0 .text   chkPlyrInTag__12daTagRetRm_cFv */
 u8 daTagRetRm_c::chkPlyrInTag() {
     cXyz pos;
     if (dComIfGp_getPlayer(0) == NULL) {
@@ -74,29 +66,23 @@ u8 daTagRetRm_c::chkPlyrInTag() {
     }
 }
 
-/* 80D5F14C-80D5F1A0 00032C 0054+00 1/0 0/0 0/0 .text   daTagRetRm_create__FP12daTagRetRm_c */
 static int daTagRetRm_create(daTagRetRm_c* i_this) {
     fopAcM_ct(i_this, daTagRetRm_c);
     return i_this->create();
 }
 
-/* 80D5F1A0-80D5F1C0 000380 0020+00 1/0 0/0 0/0 .text   daTagRetRm_Delete__FP12daTagRetRm_c */
 static int daTagRetRm_Delete(daTagRetRm_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D5F1C0-80D5F1E0 0003A0 0020+00 1/0 0/0 0/0 .text   daTagRetRm_execute__FP12daTagRetRm_c */
 static int daTagRetRm_execute(daTagRetRm_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5F1E0-80D5F200 0003C0 0020+00 1/0 0/0 0/0 .text   daTagRetRm_draw__FP12daTagRetRm_c */
 static int daTagRetRm_draw(daTagRetRm_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D5F214-80D5F234 -00001 0020+00 1/0 0/0 0/0 .data            daTagRetRm_METHODS */
 static actor_method_class daTagRetRm_METHODS = {
     (process_method_func)daTagRetRm_create,  (process_method_func)daTagRetRm_Delete,
     (process_method_func)daTagRetRm_execute, (process_method_func)NULL,
@@ -104,7 +90,6 @@ static actor_method_class daTagRetRm_METHODS = {
 
 };
 
-/* 80D5F234-80D5F264 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_RetRoom */
 extern actor_process_profile_definition g_profile_Tag_RetRoom = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp
index 004f366960..7f14af3253 100644
--- a/src/d/actor/d_a_tag_river_back.cpp
+++ b/src/d/actor/d_a_tag_river_back.cpp
@@ -8,13 +8,10 @@
 #include "d/actor/d_a_tag_river_back.h"
 #include "d/d_procname.h"
 
-/* 80D5F9A0-80D5F9A4 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "RvBack";
 
-/* 80D5F9A4-80D5F9A8 -00001 0004+00 1/1 0/0 0/0 .data            l_evName */
 static char* l_evName = "RIVER_BACK";
 
-/* 80D5F2F8-80D5F360 000078 0068+00 1/1 0/0 0/0 .text            Create__16daTagRiverBack_cFv */
 int daTagRiverBack_c::Create() {
     mMapToolID = -1;
     eventInfo.setArchiveName(l_arcName);
@@ -22,7 +19,6 @@ int daTagRiverBack_c::Create() {
     return 1;
 }
 
-/* 80D5F360-80D5F3F0 0000E0 0090+00 1/1 0/0 0/0 .text            create__16daTagRiverBack_cFv */
 int daTagRiverBack_c::create() {
     fopAcM_ct(this, daTagRiverBack_c);
     int phase = dComIfG_resLoad(&mPhase, l_arcName);
@@ -35,7 +31,6 @@ int daTagRiverBack_c::create() {
     return phase;
 }
 
-/* 80D5F3F0-80D5F48C 000170 009C+00 1/1 0/0 0/0 .text            execute__16daTagRiverBack_cFv */
 int daTagRiverBack_c::execute() {
     u8 swBit = getSwBit();
     if (swBit != 0xFF && fopAcM_isSwitch(this, swBit) != 0) {
@@ -52,11 +47,8 @@ int daTagRiverBack_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D5F9A8-80D5F9AC -00001 0004+00 1/1 0/0 0/0 .data            l_staffName */
 static char* l_staffName = "rvback";
 
-/* 80D5F48C-80D5F548 00020C 00BC+00 1/1 0/0 0/0 .text event_proc_call__16daTagRiverBack_cFv */
 void daTagRiverBack_c::event_proc_call() {
     typedef void (daTagRiverBack_c::*actionFunc)();
     /* 80D5F9DC-80D5FA0C 00005C 0030+00 0/1 0/0 0/0 .data            l_func$3711 */
@@ -67,7 +59,6 @@ void daTagRiverBack_c::event_proc_call() {
     (this->*l_func[mAction])();
 }
 
-/* 80D5F548-80D5F5BC 0002C8 0074+00 1/0 0/0 0/0 .text            actionWait__16daTagRiverBack_cFv */
 void daTagRiverBack_c::actionWait() {
     if (dComIfGp_checkPlayerStatus0(0, 0x100000) != 0) {
         mCount = 0;
@@ -77,7 +68,6 @@ void daTagRiverBack_c::actionWait() {
     }
 }
 
-/* 80D5F5BC-80D5F66C 00033C 00B0+00 1/0 0/0 0/0 .text actionOrderEvent__16daTagRiverBack_cFv */
 void daTagRiverBack_c::actionOrderEvent() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (eventInfo.checkCommandDemoAccrpt()) {
@@ -91,8 +81,6 @@ void daTagRiverBack_c::actionOrderEvent() {
     }
 }
 
-/* 80D5F66C-80D5F70C 0003EC 00A0+00 1/0 0/0 0/0 .text            actionEvent__16daTagRiverBack_cFv
- */
 void daTagRiverBack_c::actionEvent() {
     daPy_py_c* player = daPy_getPlayerActorClass();
     mCount += 1;
@@ -107,13 +95,10 @@ void daTagRiverBack_c::actionEvent() {
     }
 }
 
-/* 80D5F70C-80D5F710 00048C 0004+00 1/0 0/0 0/0 .text            actionDead__16daTagRiverBack_cFv */
 void daTagRiverBack_c::actionDead() {}
 
-/* 80D5FA0C-80D5FA14 -00001 0008+00 1/1 0/0 0/0 .data            action_table$3769 */
 static char* action_table[] = {"WAIT", "SCENE_CHG"};
 
-/* 80D5F710-80D5F88C 000490 017C+00 2/2 0/0 0/0 .text            demoProc__16daTagRiverBack_cFv */
 int daTagRiverBack_c::demoProc() {
     int act_id = dComIfGp_evmng_getMyActIdx(mStaffID, action_table, ARRAY_SIZEU(action_table), 0, 0);
 
@@ -148,37 +133,27 @@ int daTagRiverBack_c::demoProc() {
     return 0;
 }
 
-/* 80D5F88C-80D5F8C0 00060C 0034+00 1/1 0/0 0/0 .text            _delete__16daTagRiverBack_cFv */
 int daTagRiverBack_c::_delete() {
     dComIfG_resDelete(&mPhase, l_arcName);
     return 1;
 }
 
-/* 80D5F8C0-80D5F8E0 000640 0020+00 1/0 0/0 0/0 .text daTagRiverBack_Execute__FP16daTagRiverBack_c
- */
 static int daTagRiverBack_Execute(daTagRiverBack_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5F8E0-80D5F900 000660 0020+00 1/0 0/0 0/0 .text daTagRiverBack_Delete__FP16daTagRiverBack_c
- */
 static int daTagRiverBack_Delete(daTagRiverBack_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D5F900-80D5F920 000680 0020+00 1/0 0/0 0/0 .text daTagRiverBack_Create__FP16daTagRiverBack_c
- */
 static int daTagRiverBack_Create(daTagRiverBack_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80D5FA14-80D5FA34 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagRiverBack_Method */
 static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagRiverBack_Create,
                                                      (process_method_func)daTagRiverBack_Delete,
                                                      (process_method_func)daTagRiverBack_Execute};
 
-/* 80D5FA34-80D5FA64 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_RiverBack */
 extern actor_process_profile_definition g_profile_Tag_RiverBack = {
     fpcLy_CURRENT_e,           // mLayerID
     7,                         // mListID
diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp
index d9e761f083..24608dc1a8 100644
--- a/src/d/actor/d_a_tag_rmbit_sw.cpp
+++ b/src/d/actor/d_a_tag_rmbit_sw.cpp
@@ -8,30 +8,24 @@
 #include "d/actor/d_a_tag_rmbit_sw.h"
 #include "d/d_procname.h"
 
-/* 80D5FAF8-80D5FB34 000078 003C+00 2/2 0/0 0/0 .text            __ct__14daTagRmbitSw_cFv */
 daTagRmbitSw_c::daTagRmbitSw_c() {}
 
-/* 80D5FB34-80D5FB94 0000B4 0060+00 1/0 0/0 0/0 .text            __dt__14daTagRmbitSw_cFv */
 daTagRmbitSw_c::~daTagRmbitSw_c() {}
 
-/* 80D5FB94-80D5FBEC 000114 0058+00 1/1 0/0 0/0 .text            create__14daTagRmbitSw_cFv */
 int daTagRmbitSw_c::create() {
     fopAcM_ct(this, daTagRmbitSw_c);
     init();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D5FBEC-80D5FBF4 00016C 0008+00 1/1 0/0 0/0 .text            Delete__14daTagRmbitSw_cFv */
 int daTagRmbitSw_c::Delete() {
     return 1;
 }
 
-/* 80D5FBF4-80D5FBFC 000174 0008+00 1/1 0/0 0/0 .text            draw__14daTagRmbitSw_cFv */
 int daTagRmbitSw_c::draw() {
     return 1;
 }
 
-/* 80D5FBFC-80D5FDB8 00017C 01BC+00 1/1 0/0 0/0 .text            execute__14daTagRmbitSw_cFv */
 int daTagRmbitSw_c::execute() {
     if (chkPlyrInTag()) {
         if (getArg3_CngBitFlg() == 1) {
@@ -79,14 +73,12 @@ int daTagRmbitSw_c::execute() {
     return 1;
 }
 
-/* 80D5FDB8-80D5FDF0 000338 0038+00 1/1 0/0 0/0 .text            init__14daTagRmbitSw_cFv */
 void daTagRmbitSw_c::init() {
     field_0x56c = scale.x * 50.0f;
     field_0x570 = scale.y * 100.0f;
     field_0x574 = scale.z * 50.0f;
 }
 
-/* 80D5FDF0-80D5FEEC 000370 00FC+00 1/1 0/0 0/0 .text            chkPlyrInTag__14daTagRmbitSw_cFv */
 u8 daTagRmbitSw_c::chkPlyrInTag() {
     fopAc_ac_c* fopPos = dComIfGp_getPlayer(0);
 
@@ -105,29 +97,23 @@ u8 daTagRmbitSw_c::chkPlyrInTag() {
     return 0;
 }
 
-/* 80D5FEEC-80D5FF40 00046C 0054+00 1/0 0/0 0/0 .text daTagRmbitSw_create__FP14daTagRmbitSw_c */
 int daTagRmbitSw_create(daTagRmbitSw_c* i_this) {
     fopAcM_ct(i_this, daTagRmbitSw_c);
     return i_this->create();
 }
 
-/* 80D5FF40-80D5FF60 0004C0 0020+00 1/0 0/0 0/0 .text daTagRmbitSw_Delete__FP14daTagRmbitSw_c */
 static int daTagRmbitSw_Delete(daTagRmbitSw_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D5FF60-80D5FF80 0004E0 0020+00 1/0 0/0 0/0 .text daTagRmbitSw_execute__FP14daTagRmbitSw_c */
 static int daTagRmbitSw_execute(daTagRmbitSw_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D5FF80-80D5FFA0 000500 0020+00 1/0 0/0 0/0 .text daTagRmbitSw_draw__FP14daTagRmbitSw_c */
 static int daTagRmbitSw_draw(daTagRmbitSw_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D5FFB4-80D5FFD4 -00001 0020+00 1/0 0/0 0/0 .data            daTagRmbitSw_METHODS */
 static actor_method_class daTagRmbitSw_METHODS = {
     (process_method_func)daTagRmbitSw_create,  (process_method_func)daTagRmbitSw_Delete,
     (process_method_func)daTagRmbitSw_execute, (process_method_func)NULL,
@@ -135,7 +121,6 @@ static actor_method_class daTagRmbitSw_METHODS = {
 
 };
 
-/* 80D5FFD4-80D60004 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_RmbitSw */
 extern actor_process_profile_definition g_profile_Tag_RmbitSw = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp
index fa58d27626..ba2fa83032 100644
--- a/src/d/actor/d_a_tag_schedule.cpp
+++ b/src/d/actor/d_a_tag_schedule.cpp
@@ -7,26 +7,21 @@
 
 #include "d/actor/d_a_tag_schedule.h"
 
-/* 80D60098-80D600E8 000078 0050+00 1/0 0/0 0/0 .text daTagSchedule_Create__FP10fopAc_ac_c */
 static int daTagSchedule_Create(fopAc_ac_c* i_this) {
     daTagSchedule_c* schedule_tag = (daTagSchedule_c*)i_this;
     return schedule_tag->create();
 }
 
-/* 80D600E8-80D60118 0000C8 0030+00 1/0 0/0 0/0 .text daTagSchedule_Delete__FP15daTagSchedule_c */
 static int daTagSchedule_Delete(daTagSchedule_c* i_this) {
     i_this->~daTagSchedule_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D60120-80D60140 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSchedule_Method */
 static actor_method_class l_daTagSchedule_Method = {
     (process_method_func)daTagSchedule_Create,
     (process_method_func)daTagSchedule_Delete
 };
 
-/* 80D60140-80D60170 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Schedule */
 extern actor_process_profile_definition g_profile_Tag_Schedule = {
     fpcLy_CURRENT_e,            // mLayerID
     7,                          // mListID
diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp
index 69ea59bf41..e395c5a7af 100644
--- a/src/d/actor/d_a_tag_setBall.cpp
+++ b/src/d/actor/d_a_tag_setBall.cpp
@@ -8,22 +8,18 @@
 #include "d/actor/d_a_tag_setBall.h"
 #include "d/d_procname.h"
 
-/* 80D601F8-80D60218 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daTagSetBall_cFv */
 void daTagSetBall_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D60218-80D6021C 000098 0004+00 1/1 0/0 0/0 .text            setBaseMtx__14daTagSetBall_cFv */
 void daTagSetBall_c::setBaseMtx() {}
 
-/* 80D6021C-80D6024C 00009C 0030+00 1/1 0/0 0/0 .text            Create__14daTagSetBall_cFv */
 int daTagSetBall_c::Create() {
     mType = getType_private();
     initBaseMtx();
     return 1;
 }
 
-/* 80D6024C-80D602B4 0000CC 0068+00 1/1 0/0 0/0 .text            create__14daTagSetBall_cFv */
 int daTagSetBall_c::create() {
     fopAcM_ct(this, daTagSetBall_c);
 
@@ -34,33 +30,26 @@ int daTagSetBall_c::create() {
     }
 }
 
-/* 80D602B4-80D602BC 000134 0008+00 1/1 0/0 0/0 .text            execute__14daTagSetBall_cFv */
 int daTagSetBall_c::execute() {
     return 1;
 }
 
-/* 80D602BC-80D602C4 00013C 0008+00 1/1 0/0 0/0 .text            _delete__14daTagSetBall_cFv */
 int daTagSetBall_c::_delete() {
     return 1;
 }
 
-/* 80D602C4-80D602E4 000144 0020+00 1/0 0/0 0/0 .text daTagSetBall_Execute__FP14daTagSetBall_c */
 static int daTagSetBall_Execute(daTagSetBall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D602E4-80D60304 000164 0020+00 1/0 0/0 0/0 .text daTagSetBall_Delete__FP14daTagSetBall_c */
 static int daTagSetBall_Delete(daTagSetBall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D60304-80D60324 000184 0020+00 1/0 0/0 0/0 .text daTagSetBall_Create__FP14daTagSetBall_c */
 static int daTagSetBall_Create(daTagSetBall_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80D6032C-80D6034C -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSetBall_Method */
 static actor_method_class l_daTagSetBall_Method = {
     (process_method_func)daTagSetBall_Create,
     (process_method_func)daTagSetBall_Delete,
@@ -69,7 +58,6 @@ static actor_method_class l_daTagSetBall_Method = {
     (process_method_func)NULL,
 };
 
-/* 80D6034C-80D6037C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_SetBall */
 extern actor_process_profile_definition g_profile_Tag_SetBall = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp
index d1529aab4f..ab3d6ff7c5 100644
--- a/src/d/actor/d_a_tag_setrestart.cpp
+++ b/src/d/actor/d_a_tag_setrestart.cpp
@@ -10,7 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text            Create__14daTagRestart_cFv */
 int daTagRestart_c::Create() {
     field_0x56c[0].x = scale.x * -100.0f;
     field_0x56c[0].z = scale.z * -100.0f;
@@ -33,7 +32,6 @@ int daTagRestart_c::Create() {
     return 1;
 }
 
-/* 80D6048C-80D60520 00010C 0094+00 1/1 0/0 0/0 .text            create__14daTagRestart_cFv */
 int daTagRestart_c::create() {
     fopAcM_ct(this, daTagRestart_c);
 
@@ -44,7 +42,6 @@ int daTagRestart_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D60560-80D60744 0001E0 01E4+00 1/1 0/0 0/0 .text            execute__14daTagRestart_cFv */
 int daTagRestart_c::execute() {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
 
@@ -85,29 +82,22 @@ int daTagRestart_c::execute() {
     return 1;
 }
 
-/* 80D60744-80D6074C 0003C4 0008+00 1/1 0/0 0/0 .text            _delete__14daTagRestart_cFv */
 int daTagRestart_c::_delete() {
     return 1;
 }
 
-/* 80D6074C-80D6076C 0003CC 0020+00 1/0 0/0 0/0 .text daTagRestart_Execute__FP14daTagRestart_c */
 static int daTagRestart_Execute(daTagRestart_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D6076C-80D6078C 0003EC 0020+00 1/0 0/0 0/0 .text daTagRestart_Delete__FP14daTagRestart_c */
 static int daTagRestart_Delete(daTagRestart_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D6078C-80D607AC 00040C 0020+00 1/0 0/0 0/0 .text            daTagRestart_Create__FP10fopAc_ac_c
- */
 static int daTagRestart_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagRestart_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80D607C0-80D607E0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagRestart_Method */
 static actor_method_class l_daTagRestart_Method = {
     (process_method_func)daTagRestart_Create,
     (process_method_func)daTagRestart_Delete,
@@ -116,7 +106,6 @@ static actor_method_class l_daTagRestart_Method = {
     (process_method_func)NULL,
 };
 
-/* 80D607E0-80D60810 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Restart */
 extern actor_process_profile_definition g_profile_Tag_Restart = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp
index 8f4aa77f9d..32a89a6176 100644
--- a/src/d/actor/d_a_tag_shop_camera.cpp
+++ b/src/d/actor/d_a_tag_shop_camera.cpp
@@ -6,33 +6,24 @@
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tag_shop_camera.h"
-#include "dol2asm.h"
 
-
-/* 80D60898-80D608FC 000078 0064+00 1/1 0/0 0/0 .text            create__18daTag_ShopCamera_cFv */
 int daTag_ShopCamera_c::create() {
     fopAcM_ct(this, daTag_ShopCamera_c);
     initialize();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D608FC-80D60904 0000DC 0008+00 1/1 0/0 0/0 .text            Delete__18daTag_ShopCamera_cFv */
 int daTag_ShopCamera_c::Delete() {
     return 1;
 }
 
-/* 80D60904-80D6090C 0000E4 0008+00 1/1 0/0 0/0 .text            Execute__18daTag_ShopCamera_cFv */
 int daTag_ShopCamera_c::Execute() {
     return 1;
 }
 
-/* 80D6090C-80D60914 0000EC 0008+00 1/1 0/0 0/0 .text            Draw__18daTag_ShopCamera_cFv */
 int daTag_ShopCamera_c::Draw() {
     return 1;
 }
-
-/* 80D60914-80D60990 0000F4 007C+00 1/1 0/0 0/0 .text            initialize__18daTag_ShopCamera_cFv
- */
  
 void daTag_ShopCamera_c::initialize() {
     fopAcM_setCullSizeBox(this,-30.0f,-15.0f,-30.0f,30.0f,45.0f,30.0f);
@@ -41,52 +32,47 @@ void daTag_ShopCamera_c::initialize() {
     shape_angle = current.angle;
 }
 
-/* 80D60990-80D609B0 000170 0020+00 1/0 0/0 0/0 .text            daTag_ShopCamera_Create__FPv */
 static int daTag_ShopCamera_Create(void* i_this) {
     return static_cast<daTag_ShopCamera_c*>(i_this)->create();
 }
 
-/* 80D609B0-80D609D0 000190 0020+00 1/0 0/0 0/0 .text            daTag_ShopCamera_Delete__FPv */
 static int daTag_ShopCamera_Delete(void* i_this) {
     return static_cast<daTag_ShopCamera_c*>(i_this)->Delete();
 }
 
-/* 80D609D0-80D609F0 0001B0 0020+00 1/0 0/0 0/0 .text            daTag_ShopCamera_Execute__FPv */
 static int daTag_ShopCamera_Execute(void* i_this) {
     return static_cast<daTag_ShopCamera_c*>(i_this)->Execute();
 }
 
-/* 80D609F0-80D60A10 0001D0 0020+00 1/0 0/0 0/0 .text            daTag_ShopCamera_Draw__FPv */
 static int daTag_ShopCamera_Draw(void* i_this) {
     return static_cast<daTag_ShopCamera_c*>(i_this)->Draw();
 }
 
-/* 80D60A10-80D60A18 0001F0 0008+00 1/0 0/0 0/0 .text            daTag_ShopCamera_IsDelete__FPv */
 static int daTag_ShopCamera_IsDelete(void* param_0) {
     return 1;
 }
 
-// settings these up properly causes the match to fail?
-
-/* ############################################################################################## */
-/* 80D60A90-80D60AB0 -00001 0020+00 1/0 0/0 0/0 .data            daTag_ShopCamera_MethodTable */
-SECTION_DATA static void* daTag_ShopCamera_MethodTable[8] = {
-    (void*)daTag_ShopCamera_Create,
-    (void*)daTag_ShopCamera_Delete,
-    (void*)daTag_ShopCamera_Execute,
-    (void*)daTag_ShopCamera_IsDelete,
-    (void*)daTag_ShopCamera_Draw,
-    (void*)NULL,
-    (void*)NULL,
-    (void*)NULL,
+static actor_method_class daTag_ShopCamera_MethodTable = {
+    (process_method_func)daTag_ShopCamera_Create,
+    (process_method_func)daTag_ShopCamera_Delete,
+    (process_method_func)daTag_ShopCamera_Execute,
+    (process_method_func)daTag_ShopCamera_IsDelete,
+    (process_method_func)daTag_ShopCamera_Draw,
 };
 
-/* 80D60AB0-80D60AE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_SHOPCAM */
-SECTION_DATA extern void* g_profile_TAG_SHOPCAM[12] = {
-    (void*)0xFFFFFFFD, (void*)0x0007FFFD,
-    (void*)0x01260000, (void*)&g_fpcLf_Method,
-    (void*)0x0000056C, (void*)NULL,
-    (void*)NULL,       (void*)&g_fopAc_Method,
-    (void*)0x004A0000, (void*)&daTag_ShopCamera_MethodTable,
-    (void*)0x00064100, (void*)0x050E0000,
+extern actor_process_profile_definition g_profile_TAG_SHOPCAM = {
+    fpcLy_CURRENT_e,              // mLayerID
+    7,                            // mListID
+    fpcPi_CURRENT_e,              // mListPrio
+    PROC_TAG_SHOPCAM,             // mProcName
+    &g_fpcLf_Method.base,        // sub_method
+    sizeof(daTag_ShopCamera_c),     // mSize
+    0,                            // mSizeOther
+    0,                            // mParameters
+    &g_fopAc_Method.base,         // sub_method
+    74,                           // mPriority
+    &daTag_ShopCamera_MethodTable,  // sub_method
+    0x64100,                      // mStatus
+    5,                            // mActorType
+    fopAc_CULLBOX_CUSTOM_e,       // cullType
 };
diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp
index 2c40db0875..a16c01d993 100644
--- a/src/d/actor/d_a_tag_shop_item.cpp
+++ b/src/d/actor/d_a_tag_shop_item.cpp
@@ -8,7 +8,6 @@
 #include "d/actor/d_a_tag_shop_item.h"
 #include "d/d_procname.h"
 
-/* 80D60B78-80D60D78 000078 0200+00 1/1 0/0 0/0 .text            create__16daTag_ShopItem_cFv */
 int daTag_ShopItem_c::create() {
     fopAcM_ct(this, daTag_ShopItem_c);
     initialize();
@@ -76,7 +75,6 @@ int daTag_ShopItem_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D60D78-80D60E04 000278 008C+00 1/1 0/0 0/0 .text            Delete__16daTag_ShopItem_cFv */
 int daTag_ShopItem_c::Delete() {
     if (field_0x572 && getGroupID() == 15) {
         if (dComIfGs_isSaveSwitch(getSwitchBit1())) {
@@ -87,7 +85,6 @@ int daTag_ShopItem_c::Delete() {
     return 1;
 }
 
-/* 80D60E04-80D61024 000304 0220+00 1/1 0/0 0/0 .text            Execute__16daTag_ShopItem_cFv */
 int daTag_ShopItem_c::Execute() {
     if (mProcessID == fpcM_ERROR_PROCESS_ID_e) {
         if (mCreateTimer == 0) {
@@ -134,34 +131,26 @@ int daTag_ShopItem_c::Execute() {
     return 1;
 }
 
-/* 80D61024-80D6102C 000524 0008+00 1/1 0/0 0/0 .text            Draw__16daTag_ShopItem_cFv */
 int daTag_ShopItem_c::Draw() {
     return 1;
 }
 
-/* 80D6102C-80D61038 00052C 000C+00 1/1 0/0 0/0 .text            getType__16daTag_ShopItem_cFv */
 u8 daTag_ShopItem_c::getType() {
     return fopAcM_GetParam(this) & 0xFF;
 }
 
-/* 80D61038-80D61044 000538 000C+00 3/3 0/0 0/0 .text            getGroupID__16daTag_ShopItem_cFv */
 u8 daTag_ShopItem_c::getGroupID() {
     return fopAcM_GetParam(this) >> 0x1C;
 }
 
-/* 80D61044-80D61050 000544 000C+00 3/3 0/0 1/1 .text            getSwitchBit1__16daTag_ShopItem_cFv
- */
 u8 daTag_ShopItem_c::getSwitchBit1() {
     return home.angle.z & 0xFF;
 }
 
-/* 80D61050-80D6105C 000550 000C+00 3/3 0/0 0/0 .text            getSwitchBit2__16daTag_ShopItem_cFv
- */
 u8 daTag_ShopItem_c::getSwitchBit2() {
     return home.angle.z >> 8 & 0xFF;
 }
 
-/* 80D6105C-80D610E0 00055C 0084+00 1/1 0/0 0/0 .text            initialize__16daTag_ShopItem_cFv */
 void daTag_ShopItem_c::initialize() {
     fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f);
     attention_info.flags = 0;
@@ -170,42 +159,34 @@ void daTag_ShopItem_c::initialize() {
     mProcessID = -1;
 }
 
-/* 80D610E0-80D61100 0005E0 0020+00 1/0 0/0 0/0 .text            daTag_ShopItem_Create__FPv */
 static int daTag_ShopItem_Create(void* i_this) {
     return static_cast<daTag_ShopItem_c*>(i_this)->create();
 }
 
-/* 80D61100-80D61120 000600 0020+00 1/0 0/0 0/0 .text            daTag_ShopItem_Delete__FPv */
 static int daTag_ShopItem_Delete(void* i_this) {
     return static_cast<daTag_ShopItem_c*>(i_this)->Delete();
 }
 
-/* 80D61120-80D61140 000620 0020+00 1/0 0/0 0/0 .text            daTag_ShopItem_Execute__FPv */
 static int daTag_ShopItem_Execute(void* i_this) {
     return static_cast<daTag_ShopItem_c*>(i_this)->Execute();
 }
 
-/* 80D61140-80D61160 000640 0020+00 1/0 0/0 0/0 .text            daTag_ShopItem_Draw__FPv */
 static int daTag_ShopItem_Draw(void* i_this) {
     return static_cast<daTag_ShopItem_c*>(i_this)->Draw();
 }
 
-/* 80D61160-80D61168 000660 0008+00 1/0 0/0 0/0 .text            daTag_ShopItem_IsDelete__FPv */
 static int daTag_ShopItem_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D61168-80D611C8 000668 0060+00 1/0 0/0 0/0 .text            __dt__16daTag_ShopItem_cFv */
 daTag_ShopItem_c::~daTag_ShopItem_c() {}
 
-/* 80D611F0-80D61210 -00001 0020+00 1/0 0/0 0/0 .data            daTag_ShopItem_MethodTable */
 static actor_method_class daTag_ShopItem_MethodTable = {
     (process_method_func)daTag_ShopItem_Create,  (process_method_func)daTag_ShopItem_Delete,
     (process_method_func)daTag_ShopItem_Execute, (process_method_func)daTag_ShopItem_IsDelete,
     (process_method_func)daTag_ShopItem_Draw,
 };
 
-/* 80D61210-80D61240 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_SHOPITM */
 extern actor_process_profile_definition g_profile_TAG_SHOPITM = {
     fpcLy_CURRENT_e,              // mLayerID
     7,                            // mListID
diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp
index 2a969482fa..ba2d60e688 100644
--- a/src/d/actor/d_a_tag_smk_emt.cpp
+++ b/src/d/actor/d_a_tag_smk_emt.cpp
@@ -8,46 +8,37 @@
 #include "d/actor/d_a_tag_smk_emt.h"
 #include "d/d_procname.h"
 
-/* 80D612D8-80D61324 000078 004C+00 2/2 0/0 0/0 .text            __ct__13daTagSmkEmt_cFv */
 daTagSmkEmt_c::daTagSmkEmt_c() {
     memset(&mParticles,0,0xc);
 }
 
-/* 80D61324-80D61384 0000C4 0060+00 1/0 0/0 0/0 .text            __dt__13daTagSmkEmt_cFv */
 daTagSmkEmt_c::~daTagSmkEmt_c() {}
 
-/* 80D61384-80D613DC 000124 0058+00 1/1 0/0 0/0 .text            create__13daTagSmkEmt_cFv */
 int daTagSmkEmt_c::create() {
     fopAcM_ct(this, daTagSmkEmt_c);
     createSmkEmt();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D613DC-80D61400 00017C 0024+00 1/1 0/0 0/0 .text            Delete__13daTagSmkEmt_cFv */
 int daTagSmkEmt_c::Delete() {
     deleteSmkEmt();
     return 1;
 }
 
-/* 80D61400-80D61408 0001A0 0008+00 1/1 0/0 0/0 .text            draw__13daTagSmkEmt_cFv */
 int daTagSmkEmt_c::draw() {
     return 1;
 }
 
-/* 80D61408-80D61410 0001A8 0008+00 1/1 0/0 0/0 .text            execute__13daTagSmkEmt_cFv */
 int daTagSmkEmt_c::execute() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D61600-80D61608 000000 0006+02 1/1 0/0 0/0 .rodata          PARTICLE_NAME$3654 */
 static u16 const PARTICLE_NAME[3] = {
     0x87E7,
     0x87E8,
     0x87E9
 };
 
-/* 80D61410-80D61500 0001B0 00F0+00 1/1 0/0 0/0 .text            createSmkEmt__13daTagSmkEmt_cFv */
 void daTagSmkEmt_c::createSmkEmt() {
     cXyz pos(current.pos);
     csXyz angle(0,0,0);
@@ -58,7 +49,6 @@ void daTagSmkEmt_c::createSmkEmt() {
     }
 }
 
-/* 80D61500-80D61544 0002A0 0044+00 1/1 0/0 0/0 .text            deleteSmkEmt__13daTagSmkEmt_cFv */
 void daTagSmkEmt_c::deleteSmkEmt() {
     for (int i = 0; i < 3; i++) {
         if (mParticles[i]) {
@@ -68,30 +58,23 @@ void daTagSmkEmt_c::deleteSmkEmt() {
     }
 }
 
-/* 80D61544-80D61598 0002E4 0054+00 1/0 0/0 0/0 .text daTagSmkEmt_create__FP13daTagSmkEmt_c */
 static int daTagSmkEmt_create(daTagSmkEmt_c* i_this) {
     fopAcM_ct(i_this, daTagSmkEmt_c);
     return i_this->create();
 }
 
-/* 80D61598-80D615B8 000338 0020+00 1/0 0/0 0/0 .text daTagSmkEmt_Delete__FP13daTagSmkEmt_c */
 static int daTagSmkEmt_Delete(daTagSmkEmt_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D615B8-80D615D8 000358 0020+00 1/0 0/0 0/0 .text daTagSmkEmt_execute__FP13daTagSmkEmt_c */
 static int daTagSmkEmt_execute(daTagSmkEmt_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D615D8-80D615F8 000378 0020+00 1/0 0/0 0/0 .text            daTagSmkEmt_draw__FP13daTagSmkEmt_c
- */
 static int daTagSmkEmt_draw(daTagSmkEmt_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D6160C-80D6162C -00001 0020+00 1/0 0/0 0/0 .data            daTagSmkEmt_METHODS */
 static actor_method_class daTagSmkEmt_METHODS = {
     (process_method_func)daTagSmkEmt_create,
     (process_method_func)daTagSmkEmt_Delete,
@@ -100,7 +83,6 @@ static actor_method_class daTagSmkEmt_METHODS = {
     (process_method_func)daTagSmkEmt_draw
 };
 
-/* 80D6162C-80D6165C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_SmkEmt */
 extern actor_process_profile_definition g_profile_Tag_SmkEmt = {
     fpcLy_CURRENT_e,         // mLayerID    
     7,                       // mListID  
diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp
index 4ffa50a2e6..2459ad8caf 100644
--- a/src/d/actor/d_a_tag_spinner.cpp
+++ b/src/d/actor/d_a_tag_spinner.cpp
@@ -8,13 +8,11 @@
 #include "d/actor/d_a_tag_spinner.h"
 #include "d/d_procname.h"
 
-/* 80D616F8-80D61718 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* param_0) {
     daTagSpinner_c* tag = (daTagSpinner_c*)param_0;
     return tag->CreateHeap();
 }
 
-/* 80D61718-80D618A4 000098 018C+00 1/1 0/0 0/0 .text            search_spinner_sub__FPvPv */
 static void* search_spinner_sub(void* tag_0, void* tag_1) {
     fopAc_ac_c* actor = (fopAc_ac_c*)tag_0;
     daTagSpinner_c* actor2 = (daTagSpinner_c*)tag_1;
@@ -27,18 +25,15 @@ static void* search_spinner_sub(void* tag_0, void* tag_1) {
     return 0;
 }
 
-/* 80D618A4-80D618C4 000224 0020+00 1/1 0/0 0/0 .text            initBaseMtx__14daTagSpinner_cFv */
 void daTagSpinner_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 80D618C4-80D6191C 000244 0058+00 1/1 0/0 0/0 .text            setBaseMtx__14daTagSpinner_cFv */
 void daTagSpinner_c::setBaseMtx() {
     MTXTrans(mDoMtx_stack_c::now, current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_ZXYrotM(mDoMtx_stack_c::now, shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 80D6191C-80D6196C 00029C 0050+00 1/1 0/0 0/0 .text            Create__14daTagSpinner_cFv */
 int daTagSpinner_c::Create() {
     initBaseMtx();
     mRadius = scale.x * 100.0f;
@@ -46,12 +41,10 @@ int daTagSpinner_c::Create() {
     return 1;
 }
 
-/* 80D6196C-80D61974 0002EC 0008+00 1/1 0/0 0/0 .text            CreateHeap__14daTagSpinner_cFv */
 int daTagSpinner_c::CreateHeap() {
     return 1;
 }
 
-/* 80D61974-80D61A00 0002F4 008C+00 1/1 0/0 0/0 .text            create__14daTagSpinner_cFv */
 int daTagSpinner_c::create() {
     int iVar1;
     int iVar2;
@@ -70,7 +63,6 @@ int daTagSpinner_c::create() {
     return iVar2;
 }
 
-/* 80D61A00-80D61AB4 000380 00B4+00 1/1 0/0 0/0 .text            execute__14daTagSpinner_cFv */
 int daTagSpinner_c::execute() {
     daSpinner_c* mpSpinner =
         (daSpinner_c*)fopAcM_Search((fopAcIt_JudgeFunc)search_spinner_sub, this);
@@ -84,28 +76,22 @@ int daTagSpinner_c::execute() {
     return 1;
 }
 
-/* 80D61AB4-80D61ABC 000434 0008+00 1/1 0/0 0/0 .text            _delete__14daTagSpinner_cFv */
 int daTagSpinner_c::_delete() {
     return 1;
 }
 
-/* 80D61ABC-80D61ADC 00043C 0020+00 1/0 0/0 0/0 .text daTagSpinner_Execute__FP14daTagSpinner_c */
 static int daTagSpinner_Execute(daTagSpinner_c* tag) {
     return tag->execute();
 }
 
-/* 80D61ADC-80D61AFC 00045C 0020+00 1/0 0/0 0/0 .text daTagSpinner_Delete__FP14daTagSpinner_c */
 static int daTagSpinner_Delete(daTagSpinner_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D61AFC-80D61B1C 00047C 0020+00 1/0 0/0 0/0 .text            daTagSpinner_Create__FP10fopAc_ac_c */
 static int daTagSpinner_Create(fopAc_ac_c* tag) {
     return static_cast<daTagSpinner_c*>(tag)->create();
 }
 
-/* ############################################################################################## */
-/* 80D61B48-80D61B68 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSpinner_Method */
 static actor_method_class l_daTagSpinner_Method = {
     (process_method_func)daTagSpinner_Create,
     (process_method_func)daTagSpinner_Delete,
@@ -113,7 +99,6 @@ static actor_method_class l_daTagSpinner_Method = {
 
 };
 
-/* 80D61B68-80D61B98 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Spinner */
 extern actor_process_profile_definition g_profile_Tag_Spinner = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp
index 0ae96d39da..1309de896b 100644
--- a/src/d/actor/d_a_tag_sppath.cpp
+++ b/src/d/actor/d_a_tag_sppath.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player.h"
 #include "math.h"
 
-/* 80D62C54-80D62C98 000000 0044+00 1/1 0/0 0/0 .data            l_cylSrc */
 static dCcD_SrcCyl l_cylSrc = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0x80000, 0x11}, 0x0}},  // mObj
@@ -24,7 +23,6 @@ static dCcD_SrcCyl l_cylSrc = {
     }                        // mCyl
 };
 
-/* 80D61C18-80D61DB8 000078 01A0+00 1/1 0/0 0/0 .text            create__13daTagSppath_cFv */
 int daTagSppath_c::create() {
     fopAcM_ct(this, daTagSppath_c);
 
@@ -52,23 +50,17 @@ int daTagSppath_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D61EA4-80D61EC4 000304 0020+00 1/0 0/0 0/0 .text            daTagSppath_Create__FP10fopAc_ac_c
- */
 static int daTagSppath_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagSppath_c*>(i_this)->create();
 }
 
-/* 80D61EC4-80D61FFC 000324 0138+00 1/1 0/0 0/0 .text            __dt__13daTagSppath_cFv */
 daTagSppath_c::~daTagSppath_c() {}
 
-/* 80D61FFC-80D62024 00045C 0028+00 1/0 0/0 0/0 .text daTagSppath_Delete__FP13daTagSppath_c */
 static int daTagSppath_Delete(daTagSppath_c* i_this) {
     i_this->~daTagSppath_c();
     return 1;
 }
 
-/* 80D62024-80D62978 000484 0954+00 1/1 0/0 0/1 .text
- * getNearPathPos__13daTagSppath_cFP4cXyzP5dPath                */
 int daTagSppath_c::getNearPathPos(cXyz* i_result, dPath* i_path) {
     daPy_py_c* py = daPy_getPlayerActorClass();
     cXyz* pyCurPos = &py->current.pos;
@@ -153,7 +145,6 @@ int daTagSppath_c::getNearPathPos(cXyz* i_result, dPath* i_path) {
     return bestNo;
 }
 
-/* 80D629C0-80D62BA0 000E20 01E0+00 1/1 0/0 0/0 .text            execute__13daTagSppath_cFv */
 int daTagSppath_c::execute() {
     daPy_py_c* py = daPy_getPlayerActorClass();
 
@@ -195,26 +186,20 @@ int daTagSppath_c::execute() {
     return 1;
 }
 
-/* 80D62BA0-80D62BC0 001000 0020+00 1/0 0/0 0/0 .text daTagSppath_Execute__FP13daTagSppath_c */
 static int daTagSppath_Execute(daTagSppath_c* tag) {
     return tag->execute();
 }
 
-/* 80D62BC0-80D62BC8 001020 0008+00 1/0 0/0 0/0 .text            daTagSppath_Draw__FP13daTagSppath_c
- */
 static int daTagSppath_Draw(daTagSppath_c* i_this) {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D62C98-80D62CB8 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSppath_Method */
 static actor_method_class l_daTagSppath_Method = {
     (process_method_func)daTagSppath_Create,  (process_method_func)daTagSppath_Delete,
     (process_method_func)daTagSppath_Execute, (process_method_func)NULL,
     (process_method_func)daTagSppath_Draw,
 };
 
-/* 80D62CB8-80D62CE8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Sppath */
 extern actor_process_profile_definition g_profile_Tag_Sppath = {
     fpcLy_CURRENT_e,         // mLayerID
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp
index 414e834074..2236440fda 100644
--- a/src/d/actor/d_a_tag_spring.cpp
+++ b/src/d/actor/d_a_tag_spring.cpp
@@ -9,24 +9,20 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_procname.h"
 
-/* 805A6A58-805A6A78 000078 0020+00 1/1 0/0 0/0 .text            initBaseMtx__13daTagSpring_cFv */
 void daTagSpring_c::initBaseMtx() {
     setBaseMtx();
 }
 
-/* 805A6A78-805A6AD0 000098 0058+00 1/1 0/0 0/0 .text            setBaseMtx__13daTagSpring_cFv */
 void daTagSpring_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z);
     mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
 }
 
-/* 805A6AD0-805A6AF4 0000F0 0024+00 1/1 0/0 0/0 .text            Create__13daTagSpring_cFv */
 int daTagSpring_c::Create() {
     initBaseMtx();
     return 1;
 }
 
-/* 805A6AF4-805A6B5C 000114 0068+00 1/1 0/0 0/0 .text            create__13daTagSpring_cFv */
 int daTagSpring_c::create() {
     fopAcM_ct(this, daTagSpring_c);
 
@@ -38,7 +34,6 @@ int daTagSpring_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 805A6B5C-805A6C84 00017C 0128+00 1/1 0/0 0/0 .text            execute__13daTagSpring_cFv */
 int daTagSpring_c::execute() {
     if (getSwbit() != 0xFF) {
         if (!fopAcM_isSwitch(this, getSwbit())) {
@@ -70,34 +65,27 @@ int daTagSpring_c::execute() {
     return 1;
 }
 
-/* 805A6C84-805A6DFC 0002A4 0178+00 1/1 0/0 0/0 .text            checkArea__13daTagSpring_cFv */
 u8 daTagSpring_c::checkArea() {
     fopAc_ac_c* player_p = daPy_getPlayerActorClass();
     return player_p->current.pos.absXZ(current.pos) < (scale.x * 1000);
 }
 
-/* 805A6DFC-805A6E04 00041C 0008+00 1/1 0/0 0/0 .text            _delete__13daTagSpring_cFv */
 int daTagSpring_c::_delete() {
     return 1;
 }
 
-/* 805A6E04-805A6E24 000424 0020+00 1/0 0/0 0/0 .text daTagSpring_Execute__FP13daTagSpring_c */
 static int daTagSpring_Execute(daTagSpring_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A6E24-805A6E44 000444 0020+00 1/0 0/0 0/0 .text daTagSpring_Delete__FP13daTagSpring_c */
 static int daTagSpring_Delete(daTagSpring_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805A6E44-805A6E64 000464 0020+00 1/0 0/0 0/0 .text daTagSpring_Create__FP13daTagSpring_c */
 static int daTagSpring_Create(daTagSpring_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 805A6E90-805A6EB0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagSpring_Method */
 static actor_method_class l_daTagSpring_Method = {
     (process_method_func)daTagSpring_Create,
     (process_method_func)daTagSpring_Delete,
@@ -105,7 +93,6 @@ static actor_method_class l_daTagSpring_Method = {
     (process_method_func)NULL,
 };
 
-/* 805A6EB0-805A6EE0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Spring */
 extern actor_process_profile_definition g_profile_Tag_Spring = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp
index 5b545c280d..1f09b87d0b 100644
--- a/src/d/actor/d_a_tag_ss_drink.cpp
+++ b/src/d/actor/d_a_tag_ss_drink.cpp
@@ -11,7 +11,6 @@
 #include "d/d_msg_object.h"
 #include "d/actor/d_a_myna.h"
 
-/* 80D62DB8-80D62E5C 000078 00A4+00 1/1 0/0 0/0 .text            create__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::create() {
     fopAcM_ct(this, daTag_SSDrink_c);
     field_0x5D2 = getTypeFromParam();
@@ -22,12 +21,10 @@ int daTag_SSDrink_c::create() {
     return 4;
 }
 
-/* 80D62E5C-80D62E64 00011C 0008+00 1/1 0/0 0/0 .text            Delete__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::Delete() {
     return 1;
 }
 
-/* 80D62E64-80D62ED0 000124 006C+00 2/2 0/0 0/0 .text            Execute__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::Execute() {
     if (chkEvent()) {
         if (mProcessFunc) {
@@ -39,12 +36,10 @@ int daTag_SSDrink_c::Execute() {
     return 1;
 }
 
-/* 80D62ED0-80D62ED8 000190 0008+00 1/1 0/0 0/0 .text            Draw__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::Draw() {
     return 1;
 }
 
-/* 80D62ED8-80D62F80 000198 00A8+00 2/1 0/0 0/0 .text getTypeFromParam__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::getTypeFromParam() {
     switch (fopAcM_GetParamBit(this, 0, 4)) {
     case 0:
@@ -74,13 +69,10 @@ int daTag_SSDrink_c::getTypeFromParam() {
     }
 }
 
-/* 80D62F80-80D62F8C 000240 000C+00 2/2 0/0 0/0 .text getSwitchFromParam__15daTag_SSDrink_cFv */
 u8 daTag_SSDrink_c::getSwitchFromParam() {
     return fopAcM_GetParamBit(this, 4, 8);
 }
 
-/* 80D62F8C-80D62FC8 00024C 003C+00 3/3 0/0 0/0 .text            getFlowNodeNum__15daTag_SSDrink_cFv
- */
 u16 daTag_SSDrink_c::getFlowNodeNum() {
     u16 num = home.angle.x;
     bool bVar1 = false;
@@ -98,19 +90,16 @@ u16 daTag_SSDrink_c::getFlowNodeNum() {
     return num2 & 0xFFFF;
 }
 
-/* 80D62FC8-80D62FD4 000288 000C+00 1/1 0/0 0/0 .text            getValue__15daTag_SSDrink_cFv */
 u16 daTag_SSDrink_c::getValue() {
     return fopAcM_GetParamBit(this, 12, 16);
 }
 
-/* 80D62FD4-80D63044 000294 0070+00 1/1 0/0 0/0 .text            restart__15daTag_SSDrink_cFv */
 void daTag_SSDrink_c::restart() {
     current.angle.set(0, home.angle.y, 0);
     shape_angle = current.angle;
     setProcess(&daTag_SSDrink_c::wait);
 }
 
-/* 80D63044-80D630BC 000304 0078+00 1/1 0/0 0/0 .text            initialize__15daTag_SSDrink_cFv */
 void daTag_SSDrink_c::initialize() {
     fopAcM_setCullSizeBox(this, -30.0f, -15.0f, -30.0f, 30.0f, 45.0f, 30.0f);
     attention_info.flags = 0;
@@ -120,14 +109,10 @@ void daTag_SSDrink_c::initialize() {
     Execute();
 }
 
-/* 80D630BC-80D630E8 00037C 002C+00 2/2 0/0 0/0 .text
- * checkProcess__15daTag_SSDrink_cFM15daTag_SSDrink_cFPCvPvPv_i */
 int daTag_SSDrink_c::checkProcess(ProcessFunc i_processFunc) {
     return mProcessFunc == i_processFunc;
 }
 
-/* 80D630E8-80D631D4 0003A8 00EC+00 3/3 0/0 0/0 .text
- * setProcess__15daTag_SSDrink_cFM15daTag_SSDrink_cFPCvPvPv_i   */
 int daTag_SSDrink_c::setProcess(ProcessFunc i_processFunc) {
     int retVal = 0;
 
@@ -149,13 +134,11 @@ int daTag_SSDrink_c::setProcess(ProcessFunc i_processFunc) {
     return retVal;
 }
 
-/* 80D631D4-80D63208 000494 0034+00 1/1 0/0 0/0 .text            setAttnPos__15daTag_SSDrink_cFv */
 void daTag_SSDrink_c::setAttnPos() {
     attention_info.position = current.pos;
     eyePos = current.pos;
 }
 
-/* 80D63208-80D63384 0004C8 017C+00 1/1 0/0 0/0 .text            chkEvent__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::chkEvent() {
     int retVal = 1;
     if (!dComIfGp_getEvent().isOrderOK()) {
@@ -183,7 +166,6 @@ int daTag_SSDrink_c::chkEvent() {
     return retVal;
 }
 
-/* 80D63384-80D63490 000644 010C+00 1/1 0/0 0/0 .text            orderEvent__15daTag_SSDrink_cFv */
 int daTag_SSDrink_c::orderEvent() {
     if (!dComIfGp_getLinkPlayer()->checkWolf() && fopAcM_isSwitch(this, getSwitchFromParam()) &&
         field_0x5D3 != 0x60 && getFlowNodeNum() != 0xFFFF)
@@ -204,7 +186,6 @@ int daTag_SSDrink_c::orderEvent() {
     return 1;
 }
 
-/* 80D63490-80D635C8 000750 0138+00 2/0 0/0 0/0 .text            wait__15daTag_SSDrink_cFPv */
 int daTag_SSDrink_c::wait(void* param_0) {
     switch (mEventType) {
     case 1:
@@ -231,7 +212,6 @@ int daTag_SSDrink_c::wait(void* param_0) {
     }
 }
 
-/* 80D635C8-80D6369C 000888 00D4+00 2/0 0/0 0/0 .text            talk__15daTag_SSDrink_cFPv */
 int daTag_SSDrink_c::talk(void* param_0) {
     int retVal = 0;
     switch (mEventType) {
@@ -252,49 +232,38 @@ int daTag_SSDrink_c::talk(void* param_0) {
     return retVal;
 }
 
-/* 80D6369C-80D636BC 00095C 0020+00 1/0 0/0 0/0 .text            daTag_SSDrink_Create__FPv */
 static int daTag_SSDrink_Create(void* i_this) {
     return static_cast<daTag_SSDrink_c*>(i_this)->create();
 }
 
-/* 80D636BC-80D636DC 00097C 0020+00 1/0 0/0 0/0 .text            daTag_SSDrink_Delete__FPv */
 static int daTag_SSDrink_Delete(void* i_this) {
     return static_cast<daTag_SSDrink_c*>(i_this)->Delete();
 }
 
-/* 80D636DC-80D636FC 00099C 0020+00 1/0 0/0 0/0 .text            daTag_SSDrink_Execute__FPv */
 static int daTag_SSDrink_Execute(void* i_this) {
     return static_cast<daTag_SSDrink_c*>(i_this)->Execute();
 }
 
-/* 80D636FC-80D6371C 0009BC 0020+00 1/0 0/0 0/0 .text            daTag_SSDrink_Draw__FPv */
 static int daTag_SSDrink_Draw(void* i_this) {
     return static_cast<daTag_SSDrink_c*>(i_this)->Draw();
 }
 
-/* 80D6371C-80D63724 0009DC 0008+00 1/0 0/0 0/0 .text            daTag_SSDrink_IsDelete__FPv */
 static int daTag_SSDrink_IsDelete(void* i_this) {
     return 1;
 }
 
-/* 80D63724-80D63794 0009E4 0070+00 1/0 0/0 0/0 .text            __dt__15daTag_SSDrink_cFv */
 daTag_SSDrink_c::~daTag_SSDrink_c() {}
 
-/* 80D63794-80D63798 000A54 0004+00 1/0 0/0 0/0 .text            setSoldOut__14daObj_SSBase_cFv
- */
 void daObj_SSBase_c::setSoldOut() {
     /* empty function */
 }
 
-/* ############################################################################################## */
-/* 80D63808-80D63828 -00001 0020+00 1/0 0/0 0/0 .data            daTag_SSDrink_MethodTable */
 static actor_method_class daTag_SSDrink_MethodTable = {
     (process_method_func)daTag_SSDrink_Create,  (process_method_func)daTag_SSDrink_Delete,
     (process_method_func)daTag_SSDrink_Execute, (process_method_func)daTag_SSDrink_IsDelete,
     (process_method_func)daTag_SSDrink_Draw,
 };
 
-/* 80D63828-80D63858 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_SSDRINK */
 extern actor_process_profile_definition g_profile_TAG_SSDRINK = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp
index 04706d623c..cf561f103c 100644
--- a/src/d/actor/d_a_tag_statue_evt.cpp
+++ b/src/d/actor/d_a_tag_statue_evt.cpp
@@ -8,13 +8,11 @@
 #include "d/actor/d_a_tag_statue_evt.h"
 #include "d/d_com_inf_game.h"
 
-/* 805A6F58-805A6F78 000078 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* i_this) {
     daTagStatue_c* tag_statue = static_cast<daTagStatue_c*>(i_this);
     return tag_statue->CreateHeap();
 }
 
-/* 805A6F78-805A6FC4 000098 004C+00 2/2 0/0 0/0 .text            s_s_sub__FPvPv */
 // Returns ID of Owl Statue corresponding to tag
 static void* s_s_sub(void* i_proc, void* unused) {
     if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_CSTAF) {
@@ -24,14 +22,11 @@ static void* s_s_sub(void* i_proc, void* unused) {
     return NULL;
 }
 
-/* 805A6FC4-805A7000 0000E4 003C+00 1/1 0/0 0/0 .text            initBaseMtx__13daTagStatue_cFv */
 void daTagStatue_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* ############################################################################################## */
-/* 805A8104-805A8110 000000 000C+00 4/4 0/0 0/0 .rodata          l_event_bit */
 static const u16 l_event_bit[6] = {
     dSv_event_flag_c::F_0791, /* Sky character - Sky character 1 */
     dSv_event_flag_c::F_0792, /* Sky character - Sky character 2 */
@@ -41,7 +36,6 @@ static const u16 l_event_bit[6] = {
     dSv_event_flag_c::F_0812, /* N/A - N/A */
 };
 
-/* 805A7000-805A7068 000120 0068+00 2/2 0/0 0/0 .text            setBaseMtx__13daTagStatue_cFv */
 void daTagStatue_c::setBaseMtx() {
     const cXyz& current_pos = fopAcM_GetPosition(this);
     mDoMtx_stack_c::transS(current_pos.x, 1.0f + current_pos.y, current_pos.z);
@@ -51,15 +45,12 @@ void daTagStatue_c::setBaseMtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::now);
 }
 
-/* 805A821C-805A8220 -00001 0004+00 3/4 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Obj_cs_f";
 
-/* 805A8220-805A8228 000024 0006+02 1/1 0/0 0/0 .data            l_eff_id */
 static u16 l_eff_id[3] = {
     0x8C7E, 0x8C7F, 0x8C84
 };
 
-/* 805A8228-805A8240 -00001 0018+00 0/1 0/0 0/0 .data            l_eventName */
 static char* l_eventName[6] = {
     "SKY_LETTERS_00",   // Faron Woods
     "SKY_LETTERS_01",   // Gerudo Desert
@@ -69,7 +60,6 @@ static char* l_eventName[6] = {
     "SKY_LETTERS_05"    // Ruined Theatre
 };
 
-/* 805A8240-805A8258 -00001 0018+00 2/3 0/0 0/0 .data            l_evArcName */
 static char* l_evArcName[6] = {
     NULL,               // Faron Woods
     "cs_ev_01",         // Gerudo Desert
@@ -79,13 +69,11 @@ static char* l_evArcName[6] = {
     "cs_ev_05"          // Ruined Theatre
 };
 
-/* 805A8258-805A8270 00005C 0018+00 0/1 0/0 0/0 .data            l_cull_box */
 static Vec l_cull_box[2] = {
     {-300.0f, -100.0f, -300.0f}, // Min
     {300.0f, 400.0f, 300.0f}     // Max
 };
 
-/* 805A7068-805A7230 000188 01C8+00 1/1 0/0 0/0 .text            Create__13daTagStatue_cFv */
 cPhs__Step daTagStatue_c::Create() {
     if(fopAcM_isSwitch(this, getSwbit2())) {
         // Player already obtained Sky Character from this tag
@@ -131,7 +119,6 @@ cPhs__Step daTagStatue_c::Create() {
     return cPhs_LOADING_e;
 }
 
-/* 805A7230-805A73DC 000350 01AC+00 1/1 0/0 0/0 .text            CreateHeap__13daTagStatue_cFv */
 int daTagStatue_c::CreateHeap() {
     J3DModelData* model_data = static_cast<J3DModelData*>(dComIfG_getObjectRes(l_arcName, 6));
     mpModel = mDoExt_J3DModel__create(model_data, 0x00080000, 0x11000284);
@@ -154,7 +141,6 @@ int daTagStatue_c::CreateHeap() {
     return 1;
 }
 
-/* 805A7424-805A7514 000544 00F0+00 1/2 0/0 0/0 .text            create__13daTagStatue_cFv */
 cPhs__Step daTagStatue_c::create() {
     fopAcM_ct(this, daTagStatue_c);
 
@@ -180,7 +166,6 @@ cPhs__Step daTagStatue_c::create() {
     return static_cast<cPhs__Step>(phase);
 }
 
-/* 805A7514-805A759C 000634 0088+00 1/1 0/0 0/0 .text            execute__13daTagStatue_cFv */
 int daTagStatue_c::execute() {
     if(static_cast<u32>(mOwlStatueId + (1 << 16)) == 0xFFFF) {
         base_process_class* found_owl_statue = fpcEx_Search(s_s_sub, this);
@@ -199,7 +184,6 @@ int daTagStatue_c::execute() {
     return 1;
 }
 
-/* 805A759C-805A76AC 0006BC 0110+00 1/1 0/0 0/0 .text            event_proc_call__13daTagStatue_cFv */
 void daTagStatue_c::event_proc_call() {
     typedef void (daTagStatue_c::*actionFunc)(void);
     static actionFunc l_func[4] = {&daTagStatue_c::actionWait, &daTagStatue_c::actionOrderEvent,
@@ -218,7 +202,6 @@ void daTagStatue_c::event_proc_call() {
     }
 }
 
-/* 805A76AC-805A7714 0007CC 0068+00 1/0 0/0 0/0 .text            actionWait__13daTagStatue_cFv */
 void daTagStatue_c::actionWait() {
     if(checkStartDemo()) {
         // Statue is far enough away and player is close enough to the tag for the cutscene to be ordered
@@ -228,7 +211,6 @@ void daTagStatue_c::actionWait() {
     }
 }
 
-/* 805A7714-805A77A0 000834 008C+00 1/0 0/0 0/0 .text            actionOrderEvent__13daTagStatue_cFv */
 void daTagStatue_c::actionOrderEvent() {
     if(eventInfo.checkCommandDemoAccrpt()) {
         // Cutscene order accepted
@@ -243,7 +225,6 @@ void daTagStatue_c::actionOrderEvent() {
     }
 }
 
-/* 805A77A0-805A7848 0008C0 00A8+00 1/0 0/0 0/0 .text            actionEvent__13daTagStatue_cFv */
 void daTagStatue_c::actionEvent() {
     if(dComIfGp_evmng_endCheck(mEventId)) {
         setAction(ACTION_DEAD_e);
@@ -256,7 +237,6 @@ void daTagStatue_c::actionEvent() {
     }
 }
 
-/* 805A7848-805A784C 000968 0004+00 1/0 0/0 0/0 .text            actionDead__13daTagStatue_cFv */
 void daTagStatue_c::actionDead() {
     /* empty function */
 }
@@ -267,7 +247,6 @@ static char* action_table[3] = {
     "ITEM"
 };
 
-/* 805A82DC-805A8324 0000E0 0048+00 0/1 0/0 0/0 .data            l_statue_pos$3943 */
 // Saved positions of Owl Statues for cutscenes
 static Vec l_statue_pos[6] = {
     {-17312.3007812f, -349.100006104f, -20523.1992188f},    // Faron Woods
@@ -278,7 +257,6 @@ static Vec l_statue_pos[6] = {
     {-81451.296875f, -1654.09997559f, 20832.1992188}        // Ruined Theatre
 };
 
-/* 805A8324-805A8330 000128 000C+00 0/1 0/0 0/0 .data            l_statue_ang$3944 */
 // Saved y orientations of Owl Statues for cutscenes
 static s16 l_statue_ang[6] = {
     16384,  // Faron Woods
@@ -289,7 +267,6 @@ static s16 l_statue_ang[6] = {
     16384   // Ruined Theatre
 };
 
-/* 805A784C-805A7A68 00096C 021C+00 2/2 0/0 0/0 .text            demoProc__13daTagStatue_cFv */
 int daTagStatue_c::demoProc() {
     int act_id = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0);
 
@@ -358,7 +335,6 @@ int daTagStatue_c::demoProc() {
     return 0;
 }
 
-/* 805A7A68-805A7B24 000B88 00BC+00 2/2 0/0 0/0 .text            setParticle__13daTagStatue_cFv */
 void daTagStatue_c::setParticle() {
     for(int i = 0; i < 3; i++) {
         if(!mpLightRingEmitters[i]) {
@@ -367,7 +343,6 @@ void daTagStatue_c::setParticle() {
     }
 }
 
-/* 805A7B24-805A7B78 000C44 0054+00 2/2 0/0 0/0 .text            endParticle__13daTagStatue_cFv */
 void daTagStatue_c::endParticle() {
     for(int i = 0; i < 3; i++) {
         if(mpLightRingEmitters[i]) {
@@ -378,7 +353,6 @@ void daTagStatue_c::endParticle() {
     }
 }
 
-/* 805A7B78-805A7CD0 000C98 0158+00 1/1 0/0 0/0 .text            checkStartDemo__13daTagStatue_cFv */
 // Check if statue is far enough away from the Sky Character platform and if player is close enough to the tag for the cutscene
 //  of obtaining a Sky Character to be ordered
 BOOL daTagStatue_c::checkStartDemo() {
@@ -394,7 +368,6 @@ BOOL daTagStatue_c::checkStartDemo() {
     return (tag_distance_to_player < 100.0f);
 }
 
-/* 805A7CD0-805A7E94 000DF0 01C4+00 2/2 0/0 0/0 .text            checkOnEffect__13daTagStatue_cFv */
 // Return whether the owl statue has moved far enough away (in the horizontal plane) from the platform where the Sky Character is obtained 
 //  in order for its glowing effects to occur and the cutscene to be ordered
 BOOL daTagStatue_c::checkOnEffect() {
@@ -430,7 +403,6 @@ BOOL daTagStatue_c::checkOnEffect() {
     return FALSE;
 }
 
-/* 805A7E94-805A7F0C 000FB4 0078+00 1/1 0/0 0/0 .text            getLetterCount__13daTagStatue_cFv */
 s32 daTagStatue_c::getLetterCount() {
     s32 numLetters = 0;
     for(int i = 0; i < 6; i++) {
@@ -442,7 +414,6 @@ s32 daTagStatue_c::getLetterCount() {
 return numLetters;
 }
 
-/* 805A7F0C-805A7FF8 00102C 00EC+00 1/1 0/0 0/0 .text            draw__13daTagStatue_cFv */
 int daTagStatue_c::draw() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     env_light->settingTevStruct(0, &current.pos, &tevStr);
@@ -461,7 +432,6 @@ int daTagStatue_c::draw() {
     return 1;
 }
 
-/* 805A7FF8-805A8060 001118 0068+00 1/1 0/0 0/0 .text            _delete__13daTagStatue_cFv */
 int daTagStatue_c::_delete() {
     endParticle();
     dComIfG_resDelete(&mArcPhase, l_arcName);
@@ -472,27 +442,22 @@ int daTagStatue_c::_delete() {
     return 1;
 }
 
-/* 805A8060-805A8080 001180 0020+00 1/0 0/0 0/0 .text            daTagStatue_Draw__FP13daTagStatue_c */
  static int daTagStatue_Draw(daTagStatue_c* i_this) {
     return i_this->draw();
  }
 
-/* 805A8080-805A80A0 0011A0 0020+00 1/0 0/0 0/0 .text daTagStatue_Execute__FP13daTagStatue_c */
 static int daTagStatue_Execute(daTagStatue_c* i_this) {
     return i_this->execute();
 }
 
-/* 805A80A0-805A80C0 0011C0 0020+00 1/0 0/0 0/0 .text daTagStatue_Delete__FP13daTagStatue_c */
 static int daTagStatue_Delete(daTagStatue_c* i_this) {
     return i_this->_delete();
 }
 
-/* 805A80C0-805A80E0 0011E0 0020+00 1/0 0/0 0/0 .text daTagStatue_Create__FP13daTagStatue_c */
 static int daTagStatue_Create(daTagStatue_c* i_this) {
     return i_this->create();
 }
 
-/* 805A8330-805A8350 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagStatue_Method */
 static actor_method_class l_daTagStatue_Method = {
 reinterpret_cast<process_method_func>(daTagStatue_Create),
 reinterpret_cast<process_method_func>(daTagStatue_Delete),
@@ -501,7 +466,6 @@ NULL,
 reinterpret_cast<process_method_func>(daTagStatue_Draw),
 };
 
-/* 805A8350-805A8380 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Statue */
 extern actor_process_profile_definition g_profile_Tag_Statue = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp
index 691e5cf95c..ab8a611eb1 100644
--- a/src/d/actor/d_a_tag_stream.cpp
+++ b/src/d/actor/d_a_tag_stream.cpp
@@ -9,7 +9,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_procname.h"
 
-/* 80D638F8-80D63A78 000078 0180+00 1/1 0/0 0/0 .text            create__13daTagStream_cFv */
 int daTagStream_c::create() {
     fopAcM_ct(this, daTagStream_c);
 
@@ -60,13 +59,10 @@ int daTagStream_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D63A78-80D63A98 0001F8 0020+00 1/0 0/0 0/0 .text            daTagStream_Create__FP10fopAc_ac_c
- */
 static int daTagStream_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagStream_c*>(i_this)->create();
 }
 
-/* 80D63A98-80D63B30 000218 0098+00 1/1 0/0 0/0 .text            __dt__13daTagStream_cFv */
 daTagStream_c::~daTagStream_c() {
     if (field_0x570) {
         field_0x570->mNext = mNext;
@@ -81,13 +77,11 @@ daTagStream_c::~daTagStream_c() {
     }
 };
 
-/* 80D63B30-80D63B58 0002B0 0028+00 1/0 0/0 0/0 .text daTagStream_Delete__FP13daTagStream_c */
 static int daTagStream_Delete(daTagStream_c* i_this) {
     i_this->~daTagStream_c();
     return 1;
 }
 
-/* 80D63B58-80D63BC0 0002D8 0068+00 1/1 0/0 0/0 .text            execute__13daTagStream_cFv */
 int daTagStream_c::execute() {
     if (field_0x56b == 0xFF || fopAcM_isSwitch(this,field_0x56b)) {
         mStreamOn = 1;
@@ -98,19 +92,14 @@ int daTagStream_c::execute() {
     return 1;
 }
 
-/* 80D63BC0-80D63BE0 000340 0020+00 1/0 0/0 0/0 .text daTagStream_Execute__FP13daTagStream_c */
 static int daTagStream_Execute(daTagStream_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D63BE0-80D63BE8 000360 0008+00 1/0 0/0 0/0 .text            daTagStream_Draw__FP13daTagStream_c
- */
 static bool daTagStream_Draw(daTagStream_c* param_0) {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80D63BF4-80D63C14 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagStream_Method */
 static actor_method_class l_daTagStream_Method = {
     (process_method_func)daTagStream_Create,
     (process_method_func)daTagStream_Delete,
@@ -119,7 +108,6 @@ static actor_method_class l_daTagStream_Method = {
     (process_method_func)daTagStream_Draw
 };
 
-/* 80D63C14-80D63C44 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Stream */
 extern actor_process_profile_definition g_profile_Tag_Stream = {
     fpcLy_CURRENT_e,        // mLayerID
     7,                      // mListID
diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp
index c35896f94d..9f0fcff0ee 100644
--- a/src/d/actor/d_a_tag_telop.cpp
+++ b/src/d/actor/d_a_tag_telop.cpp
@@ -9,7 +9,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 80490A58-80490AF8 000078 00A0+00 1/1 0/0 0/0 .text            create__13daTag_Telop_cFv */
 int daTag_Telop_c::create() {
     fopAcM_ct(this, daTag_Telop_c);
 
@@ -26,7 +25,6 @@ int daTag_Telop_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80490AF8-80490B5C 000118 0064+00 1/1 0/0 0/0 .text            execute__13daTag_Telop_cFv */
 void daTag_Telop_c::execute() {
     switch (mMessageStatus) {
     case 0:
@@ -40,44 +38,34 @@ void daTag_Telop_c::execute() {
     }
 }
 
-/* 80490B5C-80490B64 00017C 0008+00 1/0 0/0 0/0 .text            daTag_Telop_Draw__FP13daTag_Telop_c
- */
 static int daTag_Telop_Draw(daTag_Telop_c* i_this) {
     return 1;
 }
 
-/* 80490B64-80490B88 000184 0024+00 1/0 0/0 0/0 .text daTag_Telop_Execute__FP13daTag_Telop_c */
 static int daTag_Telop_Execute(daTag_Telop_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 80490B88-80490B90 0001A8 0008+00 1/0 0/0 0/0 .text daTag_Telop_IsDelete__FP13daTag_Telop_c */
 static int daTag_Telop_IsDelete(daTag_Telop_c* i_this) {
     return 1;
 }
 
-/* 80490B90-80490BC0 0001B0 0030+00 1/0 0/0 0/0 .text daTag_Telop_Delete__FP13daTag_Telop_c */
 static int daTag_Telop_Delete(daTag_Telop_c* i_this) {
     i_this->~daTag_Telop_c();
     return 1;
 }
 
-/* 80490BC0-80490BE0 0001E0 0020+00 1/0 0/0 0/0 .text            daTag_Telop_Create__FP10fopAc_ac_c
- */
 static int daTag_Telop_Create(fopAc_ac_c* i_this) {
     return static_cast<daTag_Telop_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80490BE8-80490C08 -00001 0020+00 1/0 0/0 0/0 .data            l_daTag_Telop_Method */
 static actor_method_class l_daTag_Telop_Method = {
     (process_method_func)daTag_Telop_Create,  (process_method_func)daTag_Telop_Delete,
     (process_method_func)daTag_Telop_Execute, (process_method_func)daTag_Telop_IsDelete,
     (process_method_func)daTag_Telop_Draw,
 };
 
-/* 80490C08-80490C38 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_TELOP */
 extern actor_process_profile_definition g_profile_TAG_TELOP = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp
index 0cd1b38910..65058ab6cd 100644
--- a/src/d/actor/d_a_tag_theB_hint.cpp
+++ b/src/d/actor/d_a_tag_theB_hint.cpp
@@ -7,32 +7,25 @@
 
 #include "d/actor/d_a_tag_theB_hint.h"
 
-/* 80D63CD8-80D63D4C 000078 0074+00 1/0 0/0 0/0 .text daTagTheBHint_Create__FP10fopAc_ac_c */
 static int daTagTheBHint_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagTheBHint_c*>(i_this)->create();
 }
 
-/* 80D63D4C-80D63D7C 0000EC 0030+00 1/0 0/0 0/0 .text daTagTheBHint_Delete__FP15daTagTheBHint_c */
 static int daTagTheBHint_Delete(daTagTheBHint_c* i_this) {
     i_this->~daTagTheBHint_c();
     return 1;
 }
 
-/* 80D63D7C-80D63E4C 00011C 00D0+00 1/0 0/0 0/0 .text daTagTheBHint_Execute__FP15daTagTheBHint_c
- */
 static int daTagTheBHint_Execute(daTagTheBHint_c* i_this) {
     return i_this->execute();
 }
 
-/* ############################################################################################## */
-/* 80D63E64-80D63E84 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagTheBHint_Method */
 static actor_method_class l_daTagTheBHint_Method = {
     (process_method_func)daTagTheBHint_Create,
     (process_method_func)daTagTheBHint_Delete,
     (process_method_func)daTagTheBHint_Execute
 };
 
-/* 80D63E84-80D63EB4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_TheBHint */
 extern actor_process_profile_definition g_profile_Tag_TheBHint = {
     fpcLy_CURRENT_e,          // mLayerID
     7,                        // mListID
diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp
index 0d10532f5c..fa3732ee29 100644
--- a/src/d/actor/d_a_tag_wara_howl.cpp
+++ b/src/d/actor/d_a_tag_wara_howl.cpp
@@ -10,30 +10,24 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D63F38-80D63F74 000078 003C+00 2/2 0/0 0/0 .text            __ct__13daTagWrHowl_cFv */
 daTagWrHowl_c::daTagWrHowl_c() {}
 
-/* 80D63F74-80D63FD4 0000B4 0060+00 1/0 0/0 0/0 .text            __dt__13daTagWrHowl_cFv */
 daTagWrHowl_c::~daTagWrHowl_c() {}
 
-/* 80D63FD4-80D6402C 000114 0058+00 1/1 0/0 0/0 .text            create__13daTagWrHowl_cFv */
 int daTagWrHowl_c::create() {
     fopAcM_ct(this, daTagWrHowl_c);
     init();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D6402C-80D64034 00016C 0008+00 1/1 0/0 0/0 .text            Delete__13daTagWrHowl_cFv */
 int daTagWrHowl_c::Delete() {
     return 1;
 }
 
-/* 80D64034-80D6403C 000174 0008+00 1/1 0/0 0/0 .text            draw__13daTagWrHowl_cFv */
 int daTagWrHowl_c::draw() {
     return 1;
 }
 
-/* 80D6403C-80D64090 00017C 0054+00 1/1 0/0 0/0 .text            execute__13daTagWrHowl_cFv */
 int daTagWrHowl_c::execute() {
     attention_info.flags = 0;
 
@@ -45,13 +39,11 @@ int daTagWrHowl_c::execute() {
     return 1;
 }
 
-/* 80D64090-80D640B4 0001D0 0024+00 1/1 0/0 0/0 .text            init__13daTagWrHowl_cFv */
 void daTagWrHowl_c::init() {
     field_0x56c = 50.0f * scale.x;
     field_0x570 = field_0x56c * field_0x56c;
 }
 
-/* 80D640B4-80D64144 0001F4 0090+00 1/1 0/0 0/0 .text            chkWlfInTag__13daTagWrHowl_cFv */
 bool daTagWrHowl_c::chkWlfInTag() {
     if (dComIfGp_getPlayer(0) == NULL) {
         return false;
@@ -67,37 +59,29 @@ bool daTagWrHowl_c::chkWlfInTag() {
     return false;
 }
 
-/* 80D64144-80D64198 000284 0054+00 1/0 0/0 0/0 .text daTagWrHowl_create__FP13daTagWrHowl_c */
 static int daTagWrHowl_create(daTagWrHowl_c* i_this) {
     fopAcM_ct(i_this, daTagWrHowl_c);
     return i_this->create();
 }
 
-/* 80D64198-80D641B8 0002D8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_Delete__FP13daTagWrHowl_c */
 static int daTagWrHowl_Delete(daTagWrHowl_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D641B8-80D641D8 0002F8 0020+00 1/0 0/0 0/0 .text daTagWrHowl_execute__FP13daTagWrHowl_c */
 static int daTagWrHowl_execute(daTagWrHowl_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D641D8-80D641F8 000318 0020+00 1/0 0/0 0/0 .text            daTagWrHowl_draw__FP13daTagWrHowl_c
- */
 static int daTagWrHowl_draw(daTagWrHowl_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D64204-80D64224 -00001 0020+00 1/0 0/0 0/0 .data            daTagWrHowl_METHODS */
 static actor_method_class daTagWrHowl_METHODS = {
     (process_method_func)daTagWrHowl_create,  (process_method_func)daTagWrHowl_Delete,
     (process_method_func)daTagWrHowl_execute, (process_method_func)NULL,
     (process_method_func)daTagWrHowl_draw,
 };
 
-/* 80D64224-80D64254 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_WaraHowl */
 extern actor_process_profile_definition g_profile_Tag_WaraHowl = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp
index aa96ad07fd..92102c77a0 100644
--- a/src/d/actor/d_a_tag_watchge.cpp
+++ b/src/d/actor/d_a_tag_watchge.cpp
@@ -8,21 +8,16 @@
 #include "d/actor/d_a_tag_watchge.h"
 #include "d/d_procname.h"
 
-/* 80D642D8-80D642E0 000078 0008+00 1/1 0/0 0/0 .text            draw__14daTagWatchGe_cFv */
 int daTagWatchGe_c::draw() {
     return 1;
 }
 
-/* 80D642E0-80D64300 000080 0020+00 1/0 0/0 0/0 .text daTagWatchGe_Draw__FP14daTagWatchGe_c */
 static int daTagWatchGe_Draw(daTagWatchGe_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D64528-80D6452C 000000 0004+00 2/2 0/0 0/0 .bss             m_group_count */
 static s32 m_group_count;
 
-/* 80D64300-80D64338 0000A0 0038+00 1/1 0/0 0/0 .text            s_watchge__FPvPv */
 static void* s_watchge(void* i_guayP, void* i_this) {
     u8 group_no = static_cast<daTagWatchGe_c*>(i_this)->getGroupNo();
     if (fopAcM_GetName(i_guayP) == PROC_E_GE) {
@@ -34,7 +29,6 @@ static void* s_watchge(void* i_guayP, void* i_this) {
     return 0;
 }
 
-/* 80D64338-80D643C8 0000D8 0090+00 1/1 0/0 0/0 .text            execute__14daTagWatchGe_cFv */
 int daTagWatchGe_c::execute() {
     if (field_0x56a != 0) {
         field_0x56a--;
@@ -51,22 +45,18 @@ int daTagWatchGe_c::execute() {
     return 1;
 }
 
-/* 80D643C8-80D643E8 000168 0020+00 1/0 0/0 0/0 .text daTagWatchGe_Execute__FP14daTagWatchGe_c */
 static int daTagWatchGe_Execute(daTagWatchGe_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D643E8-80D643F0 000188 0008+00 1/0 0/0 0/0 .text daTagWatchGe_IsDelete__FP14daTagWatchGe_c */
 static int daTagWatchGe_IsDelete(daTagWatchGe_c* i_this) {
     return 1;
 }
 
-/* 80D643F0-80D643F8 000190 0008+00 1/0 0/0 0/0 .text daTagWatchGe_Delete__FP14daTagWatchGe_c */
 static int daTagWatchGe_Delete(daTagWatchGe_c* i_this) {
     return 1;
 }
 
-/* 80D643F8-80D644B0 000198 00B8+00 1/1 0/0 0/0 .text            create__14daTagWatchGe_cFv */
 int daTagWatchGe_c::create() {
     fopAcM_ct(this, daTagWatchGe_c);
     mGroupNo = fopAcM_GetParam(this);
@@ -88,13 +78,10 @@ int daTagWatchGe_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D644B0-80D644D0 000250 0020+00 1/0 0/0 0/0 .text daTagWatchGe_Create__FP14daTagWatchGe_c */
 static int daTagWatchGe_Create(daTagWatchGe_c* i_this) {
     return i_this->create();
 }
 
-/* ############################################################################################## */
-/* 80D644D8-80D644F8 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagWatchGe_Method */
 static actor_method_class l_daTagWatchGe_Method = {
     (process_method_func)daTagWatchGe_Create,
     (process_method_func)daTagWatchGe_Delete,
@@ -103,7 +90,6 @@ static actor_method_class l_daTagWatchGe_Method = {
     (process_method_func)daTagWatchGe_Draw
 };
 
-/* 80D644F8-80D64528 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_WatchGe */
 extern actor_process_profile_definition g_profile_Tag_WatchGe = {
     fpcLy_CURRENT_e,         // mLayerID  
     7,                       // mListID
diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp
index f39549044f..6bffd89a36 100644
--- a/src/d/actor/d_a_tag_waterfall.cpp
+++ b/src/d/actor/d_a_tag_waterfall.cpp
@@ -10,10 +10,8 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 80D64D94-80D64D98 000000 0004+00 2/2 0/0 0/0 .data            m_master_id */
 static u32 m_master_id = static_cast<u32>(0xFFFFFFFF);
 
-/* 80D6462C-80D64680 0000EC 0054+00 1/1 0/0 0/0 .text            __ct__20daTagWaterFall_HIO_cFv */
 daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() {
     field_0x04 = -1;
     mBaseFogNear = 0.0f;
@@ -27,17 +25,14 @@ daTagWaterFall_HIO_c::daTagWaterFall_HIO_c() {
     field_0x20 = 0.0f;
 }
 
-/* 80D64680-80D64688 000140 0008+00 1/1 0/0 0/0 .text            draw__16daTagWaterFall_cFv */
 int daTagWaterFall_c::draw() {
     return 1;
 }
 
-/* 80D64688-80D646A8 000148 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Draw__FP16daTagWaterFall_c */
 static int daTagWaterFall_Draw(daTagWaterFall_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D646A8-80D64724 000168 007C+00 1/1 0/0 0/0 .text            s_waterfall__FPvPv */
 void* s_waterfall(void* pProc, void* unused) {
     if (fopAc_IsActor(pProc)) {
         if (fopAcM_GetName(pProc) == PROC_Tag_WaterFall) {
@@ -55,8 +50,6 @@ void* s_waterfall(void* pProc, void* unused) {
     return NULL;
 }
 
-/* 80D64724-80D64768 0001E4 0044+00 1/1 0/0 0/0 .text            getEllipseY__16daTagWaterFall_cFf
- */
 f32 daTagWaterFall_c::getEllipseY(f32 x) {
     // Ellipse is in standard form;
     // x,y-plane of ellipse is the horizontal world plane
@@ -72,8 +65,6 @@ f32 daTagWaterFall_c::getEllipseY(f32 x) {
     return JMAFastSqrt(ellipseYSquared);
 }
 
-/* 80D64768-80D6486C 000228 0104+00 1/1 0/0 2/2 .text checkHitWaterFall__16daTagWaterFall_cF4cXyz
- */
 bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) {
     Vec dst;
 
@@ -101,21 +92,15 @@ bool daTagWaterFall_c::checkHitWaterFall(cXyz objPos) {
     return false;
 }
 
-/* 80D6486C-80D648B4 00032C 0048+00 1/1 0/0 0/0 .text
- * checkHitWaterFallCamera__16daTagWaterFall_cFv                */
 bool daTagWaterFall_c::checkHitWaterFallCamera() {
     const camera_class* camera = dComIfGp_getCamera(0);
     return checkHitWaterFall(camera->lookat.eye);
 }
 
-/* ############################################################################################## */
-/* 80D64E00-80D64E04 000008 0004+00 2/2 0/0 0/0 .bss             None */
 static bool masterWaterfallTagExists;
 
-/* 80D64E10-80D64E34 000018 0024+00 3/3 0/0 0/0 .bss             l_HIO */
 static daTagWaterFall_HIO_c l_HIO;
 
-/* 80D648B4-80D64AB8 000374 0204+00 1/1 0/0 0/0 .text            execute__16daTagWaterFall_cFv */
 int daTagWaterFall_c::execute() {
     u32 masterId = m_master_id;
     u32 waterfallId = fpcM_GetID(this);
@@ -180,20 +165,15 @@ int daTagWaterFall_c::execute() {
     return 1;
 }
 
-/* 80D64AB8-80D64AD8 000578 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Execute__FP16daTagWaterFall_c
- */
 
 static int daTagWaterFall_Execute(daTagWaterFall_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D64AD8-80D64AE0 000598 0008+00 1/0 0/0 0/0 .text
- * daTagWaterFall_IsDelete__FP16daTagWaterFall_c                */
 static int daTagWaterFall_IsDelete(daTagWaterFall_c* i_this) {
     return 1;
 }
 
-/* 80D64AE0-80D64B00 0005A0 0020+00 1/1 0/0 0/0 .text            _delete__16daTagWaterFall_cFv */
 int daTagWaterFall_c::_delete() {
     if (mIsMasterWaterfallTag) {
         masterWaterfallTagExists = false;
@@ -201,13 +181,10 @@ int daTagWaterFall_c::_delete() {
     return 1;
 }
 
-/* 80D64B00-80D64B20 0005C0 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Delete__FP16daTagWaterFall_c
- */
 static int daTagWaterFall_Delete(daTagWaterFall_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D64B20-80D64CBC 0005E0 019C+00 1/1 0/0 0/0 .text            create__16daTagWaterFall_cFv */
 cPhs__Step daTagWaterFall_c::create() {
     fopAcM_ct(this, daTagWaterFall_c);
 
@@ -250,23 +227,18 @@ cPhs__Step daTagWaterFall_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D64CBC-80D64CDC 00077C 0020+00 1/0 0/0 0/0 .text daTagWaterFall_Create__FP16daTagWaterFall_c
- */
 static int daTagWaterFall_Create(daTagWaterFall_c* i_this) {
     return i_this->create();
 }
 
-/* 80D64CDC-80D64D24 00079C 0048+00 2/1 0/0 0/0 .text            __dt__20daTagWaterFall_HIO_cFv */
 daTagWaterFall_HIO_c::~daTagWaterFall_HIO_c() {}
 
-/* 80D64D98-80D64DB8 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagWaterFall_Method */
 static actor_method_class l_daTagWaterFall_Method = {
     (process_method_func)daTagWaterFall_Create,  (process_method_func)daTagWaterFall_Delete,
     (process_method_func)daTagWaterFall_Execute, (process_method_func)daTagWaterFall_IsDelete,
     (process_method_func)daTagWaterFall_Draw,
 };
 
-/* 80D64DB8-80D64DE8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_WaterFall */
 extern actor_process_profile_definition g_profile_Tag_WaterFall = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp
index 0a4a17284b..c896c2406e 100644
--- a/src/d/actor/d_a_tag_wljump.cpp
+++ b/src/d/actor/d_a_tag_wljump.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_midna.h"
 
-/* 80D64EB8-80D64FE4 000078 012C+00 1/1 0/0 0/0 .text            create__13daTagWljump_cFv */
 int daTagWljump_c::create() {
     fopAcM_ct(this, daTagWljump_c);
 
@@ -42,8 +41,6 @@ int daTagWljump_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D64FE4-80D65004 0001A4 0020+00 1/0 0/0 0/0 .text            daTagWljump_Create__FP10fopAc_ac_c
- */
 static int daTagWljump_Create(fopAc_ac_c* i_this) {
     daTagWljump_c* a_this = (daTagWljump_c*)i_this;
     fpc_ProcID id = fopAcM_GetID(i_this);
@@ -51,10 +48,8 @@ static int daTagWljump_Create(fopAc_ac_c* i_this) {
     return a_this->create();
 }
 
-/* 80D65004-80D65068 0001C4 0064+00 1/1 0/0 0/0 .text            __dt__13daTagWljump_cFv */
 daTagWljump_c::~daTagWljump_c() {}
 
-/* 80D65068-80D65090 000228 0028+00 1/0 0/0 0/0 .text daTagWljump_Delete__FP13daTagWljump_c */
 static int daTagWljump_Delete(daTagWljump_c* i_this) {
     fpc_ProcID id = fopAcM_GetID(i_this);
 
@@ -62,7 +57,6 @@ static int daTagWljump_Delete(daTagWljump_c* i_this) {
     return 1;
 }
 
-/* 80D65090-80D6587C 000250 07EC+00 1/1 0/0 0/0 .text            execute__13daTagWljump_cFv */
 int daTagWljump_c::execute() {
     attention_info.flags = 0;
 
@@ -226,23 +220,18 @@ int daTagWljump_c::execute() {
     return 1;
 }
 
-/* 80D6587C-80D6589C 000A3C 0020+00 1/0 0/0 0/0 .text daTagWljump_Execute__FP13daTagWljump_c */
 static int daTagWljump_Execute(daTagWljump_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D6589C-80D658A4 000A5C 0008+00 1/1 0/0 0/0 .text            draw__13daTagWljump_cFv */
 int daTagWljump_c::draw() {
     return 1;
 }
 
-/* 80D658A4-80D658C4 000A64 0020+00 1/0 0/0 0/0 .text            daTagWljump_Draw__FP13daTagWljump_c
- */
 static int daTagWljump_Draw(daTagWljump_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D65914-80D65934 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagWljump_Method */
 static actor_method_class l_daTagWljump_Method = {
     (process_method_func)daTagWljump_Create,
     (process_method_func)daTagWljump_Delete,
@@ -251,7 +240,6 @@ static actor_method_class l_daTagWljump_Method = {
     (process_method_func)daTagWljump_Draw,
 };
 
-/* 80D65934-80D65964 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_Tag_Wljump */
 extern actor_process_profile_definition g_profile_Tag_Wljump = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp
index 848e32d93e..5c7a663137 100644
--- a/src/d/actor/d_a_tag_yami.cpp
+++ b/src/d/actor/d_a_tag_yami.cpp
@@ -8,8 +8,6 @@
 #include "d/actor/d_a_tag_yami.h"
 #include "d/d_com_inf_game.h"
 
-/* ############################################################################################## */
-/* 80D66210-80D66254 000000 0044+00 2/2 0/0 0/0 .rodata          l_sph_src */
 const static dCcD_SrcCyl l_sph_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x0}, 0x19}},  // mObj
@@ -24,7 +22,6 @@ const static dCcD_SrcCyl l_sph_src = {
     }  // mCyl
 };
 
-/* 80D659F8-80D65C24 000078 022C+00 1/1 0/0 0/0 .text            create__11daTagYami_cFv */
 int daTagYami_c::create() {
     fopAcM_ct(this, daTagYami_c);
 
@@ -64,15 +61,12 @@ int daTagYami_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D65C24-80D65C60 0002A4 003C+00 1/1 0/0 0/0 .text            Execute__11daTagYami_cFv */
 int daTagYami_c::Execute() {
     col_set();
     mIsCoHit = chk_CoHit();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D65C60-80D65D08 0002E0 00A8+00 1/1 0/0 0/0 .text            calcCoC__11daTagYami_cFR4cXyz */
 void daTagYami_c::calcCoC(cXyz& i_dst) {
     cXyz base(0.0f, 0.0f, 430.0f);
     mDoMtx_stack_c::ZXYrotS(csXyz(0, -0x7f96, 0));
@@ -80,12 +74,10 @@ void daTagYami_c::calcCoC(cXyz& i_dst) {
     i_dst = home.pos + base;
 }
 
-/* 80D65D08-80D65D0C 000388 0004+00 1/1 0/0 0/0 .text            col_set__11daTagYami_cFv */
 void daTagYami_c::col_set() {
     /* empty function */
 }
 
-/* 80D65D0C-80D65D60 00038C 0054+00 1/1 0/0 0/0 .text            chk_CoHit__11daTagYami_cFv */
 u32 daTagYami_c::chk_CoHit() {
     if (!mCoHitValid) {
         return 0;
@@ -96,8 +88,6 @@ u32 daTagYami_c::chk_CoHit() {
     return plDist < coR;
 }
 
-/* ############################################################################################## */
-/* 80D65D60-80D65EEC 0003E0 018C+00 1/1 0/0 0/0 .text            getPlDist__11daTagYami_cFv */
 f32 daTagYami_c::getPlDist() {
     cXyz coC(mCoC);
     daPy_py_c* py = daPy_getPlayerActorClass();
@@ -106,44 +96,34 @@ f32 daTagYami_c::getPlDist() {
     return diff.absXZ();
 }
 
-/* 80D65EEC-80D65F24 00056C 0038+00 0/0 0/0 1/1 .text            onMidnaTagSw__11daTagYami_cFv */
 void daTagYami_c::onMidnaTagSw() {
     fopAcM_onSwitch(this, mMTagSw);
 }
 
-/* 80D65F24-80D65F5C 0005A4 0038+00 0/0 0/0 1/1 .text            offMidnaTagSw2__11daTagYami_cFv */
 void daTagYami_c::offMidnaTagSw2() {
     OS_REPORT("-----------off mtag2 sw!!\n");
     fopAcM_offSwitch(this, mMTagSw2);
 }
 
-/* 80D65F5C-80D65F7C 0005DC 0020+00 1/0 0/0 0/0 .text            daTagYami_Create__FP10fopAc_ac_c */
 int daTagYami_Create(fopAc_ac_c* i_this) {
     return static_cast<daTagYami_c*>(i_this)->create();
 }
 
-/* 80D65F7C-80D65F9C 0005FC 0020+00 1/0 0/0 0/0 .text            daTagYami_Execute__FP10fopAc_ac_c
- */
 int daTagYami_Execute(fopAc_ac_c* i_this) {
     return static_cast<daTagYami_c*>(i_this)->Execute();
 }
 
-/* 80D65F9C-80D660B8 00061C 011C+00 1/0 0/0 0/0 .text            daTagYami_Delete__FP11daTagYami_c
- */
 int daTagYami_Delete(daTagYami_c* i_this) {
     i_this->~daTagYami_c();
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80D66280-80D662A0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTagYami_Method */
 static actor_method_class l_daTagYami_Method = {
     (process_method_func)daTagYami_Create,
     (process_method_func)daTagYami_Delete,
     (process_method_func)daTagYami_Execute,
 };
 
-/* 80D662A0-80D662D0 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TAG_YAMI */
 extern actor_process_profile_definition g_profile_TAG_YAMI = {
     fpcLy_CURRENT_e,         // mLayerID
     3,                       // mListID
diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp
index 35d47d3c64..82132b589b 100644
--- a/src/d/actor/d_a_talk.cpp
+++ b/src/d/actor/d_a_talk.cpp
@@ -9,12 +9,10 @@
 #include "d/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 80D66378-80D663E4 000078 006C+00 1/1 0/0 0/0 .text            __dt__8daTalk_cFv */
 daTalk_c::~daTalk_c() {
     dMsgObject_getMsgObjectClass()->setProcessID(-1);
 }
 
-/* 80D663E4-80D664AC 0000E4 00C8+00 1/1 0/0 0/0 .text            create__8daTalk_cFv */
 int daTalk_c::create() {
     fopAcM_ct(this, daTalk_c);
 
@@ -27,7 +25,6 @@ int daTalk_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D664AC-80D6665C 0001AC 01B0+00 1/1 0/0 0/0 .text            execute__8daTalk_cFv */
 int daTalk_c::execute() {
     dComIfG_inf_c& dcomif = g_dComIfG_gameInfo;
     if (dcomif.play.getEvent().runCheck()) {
@@ -70,57 +67,46 @@ int daTalk_c::execute() {
     return 1;
 }
 
-/* 80D6665C-80D66664 00035C 0008+00 1/1 0/0 0/0 .text            draw__8daTalk_cFv */
 int daTalk_c::draw() {
     return 1;
 }
 
-/* 80D66664-80D66688 000364 0024+00 1/1 0/0 0/0 .text            setStatus__8daTalk_cFUs */
 void daTalk_c::setStatus(u16 i_status) {
     dMsgObject_getMsgObjectClass()->setStatus(i_status);
 }
 
-/* 80D66688-80D666A8 000388 0020+00 2/2 0/0 0/0 .text            getStatus__8daTalk_cFv */
 u16 daTalk_c::getStatus() {
     return dMsgObject_getMsgObjectClass()->getStatus();
 }
 
-/* 80D666A8-80D666E4 0003A8 003C+00 1/1 0/0 0/0 .text            messageSet__8daTalk_cFv */
 u32 daTalk_c::messageSet() {
     return fopMsgM_messageSet(dMsgObject_getMsgObjectClass()->getIdx(),
                               dMsgObject_getMsgObjectClass()->getpTalkActor(), 1000);
 }
 
-/* 80D666E4-80D66704 0003E4 0020+00 1/0 0/0 0/0 .text            daTalk_Create__FP10fopAc_ac_c */
 static int daTalk_Create(fopAc_ac_c* i_this) {
     return static_cast<daTalk_c*>(i_this)->create();
 }
 
-/* 80D66704-80D6672C 000404 0028+00 1/0 0/0 0/0 .text            daTalk_Delete__FP8daTalk_c */
 static int daTalk_Delete(daTalk_c* i_this) {
     i_this->~daTalk_c();
     return 1;
 }
 
-/* 80D6672C-80D6674C 00042C 0020+00 1/0 0/0 0/0 .text            daTalk_Execute__FP8daTalk_c */
 static int daTalk_Execute(daTalk_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D6674C-80D6676C 00044C 0020+00 1/0 0/0 0/0 .text            daTalk_Draw__FP8daTalk_c */
 static int daTalk_Draw(daTalk_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 80D66774-80D66794 -00001 0020+00 1/0 0/0 0/0 .data            l_daTalk_Method */
 static actor_method_class l_daTalk_Method = {
     (process_method_func)daTalk_Create,  (process_method_func)daTalk_Delete,
     (process_method_func)daTalk_Execute, (process_method_func)NULL,
     (process_method_func)daTalk_Draw,
 };
 
-/* 80D66794-80D667C4 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TALK */
 extern actor_process_profile_definition g_profile_TALK = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index d1c1140301..6aeefbf433 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d_a_tbox
-//
-
 #include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_tbox.h"
@@ -16,20 +11,16 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cmath.h>
 
-/* 804961D4-804961EC 000000 0018+00 16/16 0/0 0/0 .rodata          l_cull_size_box */
 static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f };
 
-/* 804961EC-80496228 000018 003C+00 1/2 0/0 0/0 .rodata          l_cyl_info */
 static const cM3dGCylS l_cyl_info[3] = {
     { 0.0f, 0.0f, -40.0f, 40.0f, 60.0f },
     { 0.0f, 0.0f, -60.0f, 50.0f, 70.0f },
     { 0.0f, 0.0f, -60.0f, 70.0f, 80.0f },
 };
 
-/* 804964B4-804964B8 -00001 0004+00 2/4 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name = "TREASURE";
 
-/* 804964B8-804964FC 000024 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x0}, 0x79}}, // mObj
@@ -44,17 +35,14 @@ static dCcD_SrcCyl l_cyl_src = {
     } // mCyl
 };
 
-/* 804964FC-80496550 -00001 0054+00 1/1 0/0 0/0 .data            l_modelInfo */
 static daTbox_ModelInfo l_modelInfo[3] = {
     { "Dalways", 12, 7, 25, 26, 14, 19 },
     { "Dalways", 13, 8, 27, 28, 14, 19 },
     { "BoxC", 14, 8, 20, 21, 11, 17 },
 };
 
-/* 804968E4-804968F0 000054 000C+00 2/3 0/0 0/0 .bss             l_light_offset */
 static cXyz l_light_offset(0.0f, 35.0f, 0.0f);
 
-/* 80490D2C-80490DCC 0000EC 00A0+00 1/1 0/0 0/0 .text            __ct__12daTbox_HIO_cFv */
 daTbox_HIO_c::daTbox_HIO_c() {
     mItemNo = 1;
     mUseDebugItemNo = 0;
@@ -76,15 +64,12 @@ daTbox_HIO_c::daTbox_HIO_c() {
     mForPlacementCheck = 0;
 }
 
-/* 80490E50-80490E6C 000210 001C+00 6/6 0/0 0/0 .text            getModelInfo__8daTbox_cFv */
 daTbox_ModelInfo* daTbox_c::getModelInfo() {
     return &l_modelInfo[getShapeType()];
 }
 
-/* 80496238-80496244 000064 000C+00 0/1 0/0 0/0 .rodata          l_open_se_id */
 static const u32 l_open_se_id[3] = { Z2SE_OBJ_TBOX_OPEN_A, Z2SE_OBJ_TBOX_OPEN_B, Z2SE_OBJ_TBOX_OPEN_C };
 
-/* 80490E6C-80491170 00022C 0304+00 1/1 0/0 0/0 .text            commonShapeSet__8daTbox_cFv */
 cPhs__Step daTbox_c::commonShapeSet() {
     daTbox_ModelInfo* model_info = getModelInfo();
 
@@ -154,17 +139,14 @@ cPhs__Step daTbox_c::commonShapeSet() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804911B8-804911C0 000578 0008+00 1/1 0/0 0/0 .text            effectShapeSet__8daTbox_cFv */
 cPhs__Step daTbox_c::effectShapeSet() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804911C0-804911C8 000580 0008+00 1/1 0/0 0/0 .text            envShapeSet__8daTbox_cFv */
 cPhs__Step daTbox_c::envShapeSet() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 804911C8-8049129C 000588 00D4+00 1/1 0/0 0/0 .text            bgCheckSet__8daTbox_cFv */
 cPhs__Step daTbox_c::bgCheckSet() {
     daTbox_ModelInfo* model_info = getModelInfo();
 
@@ -185,7 +167,6 @@ cPhs__Step daTbox_c::bgCheckSet() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8049129C-804912EC 00065C 0050+00 1/1 0/0 0/0 .text            lightReady__8daTbox_cFv */
 void daTbox_c::lightReady() {
     setLightPos();
     mLight.mColor.r = 0;
@@ -196,7 +177,6 @@ void daTbox_c::lightReady() {
     mAllcolRatio = 0.0f;
 }
 
-/* 804912EC-8049135C 0006AC 0070+00 2/2 0/0 0/0 .text            setLightPos__8daTbox_cFv */
 void daTbox_c::setLightPos() {
     cXyz offset(l_light_offset);
     cXyz pos;
@@ -204,12 +184,10 @@ void daTbox_c::setLightPos() {
     mLight.mPosition.set(pos.x, pos.y, pos.z);
 }
 
-/* 8049135C-80491364 00071C 0008+00 2/2 0/0 0/0 .text            checkEnv__8daTbox_cFv */
 int daTbox_c::checkEnv() {
     return true;
 }
 
-/* 80491364-8049139C 000724 0038+00 2/2 0/0 0/0 .text            checkAppear__8daTbox_cFv */
 int daTbox_c::checkAppear() {
     if (getFuncType() == 2 || (getSwType() == 15 && getFuncType() == 1)) {
         return true;
@@ -217,12 +195,10 @@ int daTbox_c::checkAppear() {
     return false;
 }
 
-/* 8049139C-804913D0 00075C 0034+00 4/4 0/0 0/0 .text            checkOpen__8daTbox_cFv */
 int daTbox_c::checkOpen() {
     return dComIfGs_isTbox(getTboxNo());
 }
 
-/* 804913D0-8049141C 000790 004C+00 3/3 0/0 0/0 .text            clrDzb__8daTbox_cFv */
 void daTbox_c::clrDzb() {
     if (mpBgCollision != NULL) {
         dComIfG_Bgsp().Release(mpBgCollision);
@@ -230,7 +206,6 @@ void daTbox_c::clrDzb() {
     }
 }
 
-/* 8049141C-80491484 0007DC 0068+00 6/6 0/0 0/0 .text            setDzb__8daTbox_cFv */
 void daTbox_c::setDzb() {
     clrDzb();
 
@@ -248,7 +223,6 @@ void daTbox_c::setDzb() {
     JUT_ASSERT(0x285, !rt);
 }
 
-/* 80491484-80491544 000844 00C0+00 1/1 0/0 0/0 .text            surfaceProc__8daTbox_cFv */
 void daTbox_c::surfaceProc() {
     if (mpBgCollision != NULL && flagCheck(0x20)) {
         if (field_0x750 < -1.0f) {
@@ -265,7 +239,6 @@ void daTbox_c::surfaceProc() {
     }
 }
 
-/* 80491544-804915BC 000904 0078+00 1/1 0/0 0/0 .text            checkNormal__8daTbox_cFv */
 int daTbox_c::checkNormal() {
     int func_type = getFuncType();
     if (func_type == 0 || func_type == 6 || func_type == 5 || func_type == 3) {
@@ -283,7 +256,6 @@ int daTbox_c::checkNormal() {
     }
 }
 
-/* 804915BC-80491624 00097C 0068+00 2/2 0/0 0/0 .text            checkEnvEffectTbox__8daTbox_cFv */
 int daTbox_c::checkEnvEffectTbox() {
     if (getShapeType() == SHAPE_SMALL) {
         return false;
@@ -300,7 +272,6 @@ int daTbox_c::checkEnvEffectTbox() {
     return dItem_data::chkFlag(getItemNo(), 0x40);
 }
 
-/* 80491624-804916A4 0009E4 0080+00 1/1 0/0 0/0 .text            calcHeapSize__8daTbox_cFv */
 u32 daTbox_c::calcHeapSize() {
     int shape_type = getShapeType();
     checkOpen();
@@ -322,7 +293,6 @@ u32 daTbox_c::calcHeapSize() {
     return heap_size;
 }
 
-/* 804916A4-80491744 000A64 00A0+00 1/0 0/0 0/0 .text            CreateHeap__8daTbox_cFv */
 int daTbox_c::CreateHeap() {
     cPhs__Step step = commonShapeSet();
     if (step != cPhs_COMPLEATE_e) {
@@ -351,7 +321,6 @@ int daTbox_c::CreateHeap() {
     return true;
 }
 
-/* 80491744-804919B0 000B04 026C+00 1/1 0/0 0/0 .text            CreateInit__8daTbox_cFv */
 void daTbox_c::CreateInit() {
     int func_type = getFuncType();
     flagClr();
@@ -411,7 +380,6 @@ void daTbox_c::CreateInit() {
                           l_cull_size_box[3], l_cull_size_box[4], l_cull_size_box[5]);
 }
 
-/* 804919B0-80491BB0 000D70 0200+00 1/1 0/0 0/0 .text            initPos__8daTbox_cFv */
 void daTbox_c::initPos() {
     int func_type = getFuncType();
     if ((func_type == 6 && getSwType() == 15) || func_type == 7) {
@@ -458,7 +426,6 @@ void daTbox_c::initPos() {
     }
 }
 
-/* 80491BB0-80491F68 000F70 03B8+00 1/1 0/0 0/0 .text            initAnm__8daTbox_cFv */
 void daTbox_c::initAnm() {
     int func_type = getFuncType();
 
@@ -535,7 +502,6 @@ void daTbox_c::initAnm() {
     }
 }
 
-/* 80491F68-804920A8 001328 0140+00 1/1 0/0 0/0 .text            boxCheck__8daTbox_cFv */
 int daTbox_c::boxCheck() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     if (!strcmp(dComIfGp_getStartStageName(), "R_SP01") && fopAcM_GetRoomNo(this) == 7 &&
@@ -554,7 +520,6 @@ int daTbox_c::boxCheck() {
     }
 }
 
-/* 804920A8-8049216C 001468 00C4+00 1/1 0/0 0/0 .text            demoProcOpen__8daTbox_cFv */
 void daTbox_c::demoProcOpen() {
     if (mDemoFrame < 1000) {
         mDemoFrame++;
@@ -576,7 +541,6 @@ void daTbox_c::demoProcOpen() {
     environmentProc();
 }
 
-/* 8049216C-8049233C 00152C 01D0+00 1/1 0/0 0/0 .text            lightColorProc__8daTbox_cFv */
 void daTbox_c::lightColorProc() {
     static int const key_frame[7] = {0x00, 0x07, 0x1e, 0x25, 0x2c, 0x5c, 0x8c};
     static GXColorS10 const key_color[7] = {
@@ -615,7 +579,6 @@ void daTbox_c::lightColorProc() {
     }
 }
 
-/* 8049233C-80492398 0016FC 005C+00 1/1 0/0 0/0 .text            environmentProc__8daTbox_cFv */
 void daTbox_c::environmentProc() {
     if (mDemoFrame > 139) {
         cLib_addCalc(&mAllcolRatio, 1.0f, 0.05f, 0.1f, 0.05f);
@@ -624,17 +587,14 @@ void daTbox_c::environmentProc() {
     }
 }
 
-/* 80492398-804923D4 001758 003C+00 1/1 0/0 0/0 .text            lightUpProc__8daTbox_cFv */
 void daTbox_c::lightUpProc() {
     cLib_addCalc(&mLight.mPow, 70.0f, 0.05f, 5.0f, 1.0f);
 }
 
-/* 804923D4-80492408 001794 0034+00 1/1 0/0 0/0 .text            lightDownProc__8daTbox_cFv */
 void daTbox_c::lightDownProc() {
     cLib_addCalc0(&mLight.mPow, 0.05f, 5.0f);
 }
 
-/* 80492408-80492450 0017C8 0048+00 2/2 0/0 0/0 .text            dropProcInitCall__8daTbox_cFv */
 void daTbox_c::dropProcInitCall() {
     switch (getSwType()) {
     case 0:
@@ -646,7 +606,6 @@ void daTbox_c::dropProcInitCall() {
     }
 }
 
-/* 80492450-804928DC 001810 048C+00 1/1 0/0 0/0 .text            dropProcInit__8daTbox_cFv */
 void daTbox_c::dropProcInit() {
     dPath* path_p = dPath_GetRoomPath(getPathId(), -1);
     JUT_ASSERT(0x56A, path_p != NULL);
@@ -687,7 +646,6 @@ void daTbox_c::dropProcInit() {
     field_0x9c8 = var_f30 / 19.0f;
 }
 
-/* 804928DC-80492B10 001C9C 0234+00 2/2 0/0 0/0 .text calcJumpGoalAndAngle__8daTbox_cFP4cXyzPs */
 int daTbox_c::calcJumpGoalAndAngle(cXyz* i_pos, s16* i_angle) {
     dPath* path_p = dPath_GetRoomPath(getPathId(), -1);
     if (path_p != NULL) {
@@ -712,7 +670,6 @@ int daTbox_c::calcJumpGoalAndAngle(cXyz* i_pos, s16* i_angle) {
     return false;
 }
 
-/* 80492B10-80492BC8 001ED0 00B8+00 4/4 0/0 0/0 .text            getDropSAngle__8daTbox_cFPs */
 bool daTbox_c::getDropSAngle(s16* i_angle) {
     if (getFuncType() == 6 && getSwType() == 0 && getDir() != 0) {
         *i_angle = cM_deg2s((getDir() - 1) * 24 + 12);
@@ -722,7 +679,6 @@ bool daTbox_c::getDropSAngle(s16* i_angle) {
     return false;
 }
 
-/* 80492BC8-80492C84 001F88 00BC+00 1/1 0/0 0/0 .text            getDir__8daTbox_cFv */
 int daTbox_c::getDir() {
     if (getSwType() == 15) {
         if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) {
@@ -743,7 +699,6 @@ int daTbox_c::getDir() {
     }
 }
 
-/* 80492C84-80492D08 002044 0084+00 2/2 0/0 0/0 .text setRotAxis__8daTbox_cFPC4cXyzPC4cXyz */
 void daTbox_c::setRotAxis(cXyz const* i_pos, cXyz const* i_goalPos) {
     mRotAxis = *i_goalPos - *i_pos;
     mRotAxis.y = 0.0f;
@@ -751,7 +706,6 @@ void daTbox_c::setRotAxis(cXyz const* i_pos, cXyz const* i_goalPos) {
     mDoMtx_stack_c::multVec(&mRotAxis, &mRotAxis);
 }
 
-/* 80492D08-80492F50 0020C8 0248+00 1/1 0/0 0/0 .text            dropProcInit2__8daTbox_cFv */
 void daTbox_c::dropProcInit2() {
     cXyz goal_pos;
     if (!calcJumpGoalAndAngle(&goal_pos, &current.angle.y)) {
@@ -779,7 +733,6 @@ void daTbox_c::dropProcInit2() {
     field_0x9c8 = temp / 19.0f;
 }
 
-/* 80492F50-804932C0 002310 0370+00 2/2 0/0 0/0 .text            dropProc__8daTbox_cFv */
 void daTbox_c::dropProc() {
     if (field_0x9c8 != 0) {
         s16 temp = field_0x9c6;
@@ -827,7 +780,6 @@ void daTbox_c::dropProc() {
     }
 }
 
-/* 80493338-80493484 0026F8 014C+00 1/1 0/0 0/0 .text            demoInitAppear__8daTbox_cFv */
 void daTbox_c::demoInitAppear() {
     mpEffectAnm->setFrame(0.0f);
     mpEffectAnm->setPlaySpeed(1.0f);
@@ -845,7 +797,6 @@ void daTbox_c::demoInitAppear() {
     fopAcM_seStart(this, Z2SE_OBJ_T_BOX_EMERGE, 0);
 }
 
-/* 80493484-80493518 002844 0094+00 1/1 0/0 0/0 .text            demoProcAppear__8daTbox_cFv */
 void daTbox_c::demoProcAppear() {
     if (field_0x75a != 0) {
         field_0x75a--;
@@ -861,7 +812,6 @@ void daTbox_c::demoProcAppear() {
     }
 }
 
-/* 80493518-80493838 0028D8 0320+00 7/7 0/0 0/0 .text            demoProc__8daTbox_cFv */
 int daTbox_c::demoProc() {
     static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT", "DROP"};
     int act_idx = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0);
@@ -965,7 +915,6 @@ int daTbox_c::demoProc() {
     return false;
 }
 
-/* 80493838-804939A4 002BF8 016C+00 2/2 0/0 0/0 .text            OpenInit_com__8daTbox_cFv */
 void daTbox_c::OpenInit_com() {
     field_0x97e = 0;
 
@@ -995,7 +944,6 @@ void daTbox_c::OpenInit_com() {
     fopAcM_seStart(this, mOpenSeId, 0);
 }
 
-/* 804939A4-804939F4 002D64 0050+00 1/1 0/0 0/0 .text            OpenInit__8daTbox_cFv */
 void daTbox_c::OpenInit() {
     OpenInit_com();
     field_0x759 = 1;
@@ -1004,12 +952,10 @@ void daTbox_c::OpenInit() {
     setLightPos();
 }
 
-/* 804939F4-804939FC 002DB4 0008+00 2/0 0/0 0/0 .text            actionWait__8daTbox_cFv */
 int daTbox_c::actionWait() {
     return true;
 }
 
-/* 804939FC-80493CC8 002DBC 02CC+00 1/0 0/0 0/0 .text            actionDemo__8daTbox_cFv */
 int daTbox_c::actionDemo() {
     if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) {
         if (field_0x718) {
@@ -1065,7 +1011,6 @@ int daTbox_c::actionDemo() {
     return true;
 }
 
-/* 80493CC8-80493D90 003088 00C8+00 2/0 0/0 0/0 .text            actionDemo2__8daTbox_cFv */
 int daTbox_c::actionDemo2() {
     if ((getEvent() == 0xFF && dComIfGp_evmng_endCheck("DEFAULT_TREASURE_APPEAR")) ||
                 (getEvent() != 0xFF && dComIfGp_evmng_endCheck(mEventId))) {
@@ -1078,7 +1023,6 @@ int daTbox_c::actionDemo2() {
     return true;
 }
 
-/* 80493D90-80493ED8 003150 0148+00 2/0 0/0 0/0 .text            actionDropDemo__8daTbox_cFv */
 int daTbox_c::actionDropDemo() {
     if (mEventId != -1) {
         if (dComIfGp_evmng_endCheck(mEventId)) {
@@ -1106,7 +1050,6 @@ int daTbox_c::actionDropDemo() {
     return true;
 }
 
-/* 80493ED8-80493FE8 003298 0110+00 5/3 0/0 0/0 .text            getBombItemNo__8daTbox_cFUcUc */
 u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) {
     u8 new_item_no = i_itemNo;
     switch (i_bombType) {
@@ -1185,7 +1128,6 @@ u8 daTbox_c::getBombItemNo(u8 i_bombType, u8 i_itemNo) {
     return new_item_no;
 }
 
-/* 80493FE8-80494144 0033A8 015C+00 1/1 0/0 0/0 .text            getBombItemNo2__8daTbox_cFUcUcUc */
 u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) {
     u8 new_type, new_item_no = i_itemNo;
     switch (i_itemNo) {
@@ -1250,8 +1192,6 @@ u8 daTbox_c::getBombItemNo2(u8 i_bombType1, u8 i_bombType2, u8 i_itemNo) {
     return new_item_no;
 }
 
-/* 80494144-804942CC 003504 0188+00 1/1 0/0 0/0 .text            getBombItemNo3__8daTbox_cFUcUcUcUc
- */
 u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i_itemNo) {
     u8 new_type, new_item_no = i_itemNo;
     switch (i_itemNo) {
@@ -1316,7 +1256,6 @@ u8 daTbox_c::getBombItemNo3(u8 i_bombType1, u8 i_bombType2, u8 i_bombType3, u8 i
     return new_item_no;
 }
 
-/* 804942CC-804945C8 00368C 02FC+00 1/1 0/0 0/0 .text            getBombItemNoMain__8daTbox_cFUc */
 u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) {
     u8 bomb_type[3], bomb_max[3], bomb_num[3];
     u8 bag_count = 0;
@@ -1417,7 +1356,6 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) {
     return i_itemNo;
 }
 
-/* 804945C8-804946A4 003988 00DC+00 1/1 0/0 0/0 .text            setGetDemoItem__8daTbox_cFv */
 int daTbox_c::setGetDemoItem() {
     u8 item_no = getItemNo();
     if (item_no == fpcNm_ITEM_BOMB_5 || item_no == fpcNm_ITEM_BOMB_10 || item_no == fpcNm_ITEM_BOMB_20 || item_no == fpcNm_ITEM_BOMB_30 ||
@@ -1441,7 +1379,6 @@ int daTbox_c::setGetDemoItem() {
     return true;
 }
 
-/* 804946A4-804948CC 003A64 0228+00 11/0 0/0 0/0 .text            actionOpenWait__8daTbox_cFv */
 int daTbox_c::actionOpenWait() {
     daMidna_c* midna = daPy_py_c::getMidnaActor();
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -1481,7 +1418,6 @@ int daTbox_c::actionOpenWait() {
     return true;
 }
 
-/* 804948CC-80494950 003C8C 0084+00 1/0 0/0 0/0 .text            actionNotOpenDemo__8daTbox_cFv */
 int daTbox_c::actionNotOpenDemo() {
     if (dComIfGp_evmng_endCheck(mEventId)) {
         setAction(&daTbox_c::actionOpenWait);
@@ -1492,7 +1428,6 @@ int daTbox_c::actionNotOpenDemo() {
     return true;
 }
 
-/* 80494950-80494A0C 003D10 00BC+00 3/3 0/0 0/0 .text            checkDrop__8daTbox_cFv */
 int daTbox_c::checkDrop() {
     if (getSwType() == 15) {
         if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) {
@@ -1509,8 +1444,6 @@ int daTbox_c::checkDrop() {
     return false;
 }
 
-/* 80494A0C-80494D88 003DCC 037C+00 1/1 0/0 0/0 .text            settingDropDemoCamera__8daTbox_cFv
- */
 void daTbox_c::settingDropDemoCamera() {
     camera_class* player_camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     player_camera->mCamera.Stop();
@@ -1575,7 +1508,6 @@ void daTbox_c::settingDropDemoCamera() {
     field_0x9c9 = 1;
 }
 
-/* 80494D88-80494E98 004148 0110+00 1/0 0/0 0/0 .text            actionSwOnWait__8daTbox_cFv */
 int daTbox_c::actionSwOnWait() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(&daTbox_c::actionDemo2);
@@ -1593,7 +1525,6 @@ int daTbox_c::actionSwOnWait() {
     return true;
 }
 
-/* 80494E98-80494F44 004258 00AC+00 1/0 0/0 0/0 .text            actionSwOnWait2__8daTbox_cFv */
 int daTbox_c::actionSwOnWait2() {
     if (dComIfGs_isSwitch(getSwNo(), fopAcM_GetRoomNo(this))) {
         setAction(&daTbox_c::actionOpenWait);
@@ -1608,7 +1539,6 @@ int daTbox_c::actionSwOnWait2() {
     return true;
 }
 
-/* 80494F44-80495058 004304 0114+00 1/0 0/0 0/0 .text            actionDropWait__8daTbox_cFv */
 int daTbox_c::actionDropWait() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(&daTbox_c::actionDropDemo);
@@ -1632,7 +1562,6 @@ int daTbox_c::actionDropWait() {
     return true;
 }
 
-/* 80495058-8049518C 004418 0134+00 1/0 0/0 0/0 .text            actionGenocide__8daTbox_cFv */
 int daTbox_c::actionGenocide() {
     if (eventInfo.checkCommandDemoAccrpt()) {
         setAction(&daTbox_c::actionDemo2);
@@ -1654,8 +1583,6 @@ int daTbox_c::actionGenocide() {
     return true;
 }
 
-/* 8049518C-80495250 00454C 00C4+00 1/0 0/0 0/0 .text            actionDropWaitForWeb__8daTbox_cFv
- */
 int daTbox_c::actionDropWaitForWeb() {
     if (field_0x9fd != 0) {
         if (field_0x9fc != 0) {
@@ -1680,7 +1607,6 @@ int daTbox_c::actionDropWaitForWeb() {
     return true;
 }
 
-/* 80495250-804953D4 004610 0184+00 1/0 0/0 0/0 .text            actionDropForWeb__8daTbox_cFv */
 int daTbox_c::actionDropForWeb() {
     fopAcM_posMoveF(this, NULL);
     mAcch.CrrPos(dComIfG_Bgsp());
@@ -1709,7 +1635,6 @@ int daTbox_c::actionDropForWeb() {
     return true;
 }
 
-/* 804953D4-80495490 004794 00BC+00 1/1 0/0 0/0 .text            initBaseMtx__8daTbox_cFv */
 void daTbox_c::initBaseMtx() {
     field_0x9c4 = 0;
     mRotAxis = cXyz::BaseX;
@@ -1730,7 +1655,6 @@ void daTbox_c::initBaseMtx() {
     }
 }
 
-/* 80495490-80495660 004850 01D0+00 4/4 0/0 0/0 .text            setBaseMtx__8daTbox_cFv */
 void daTbox_c::setBaseMtx() {
     Mtx mtx;
     if (field_0x9c4 == 0) {
@@ -1768,10 +1692,8 @@ void daTbox_c::setBaseMtx() {
     }
 }
 
-/* 804968FC-80496930 00006C 0034+00 0/1 0/0 0/0 .bss             l_HIO */
 static daTbox_HIO_c l_HIO;
 
-/* 80495660-804956EC 004A20 008C+00 1/1 0/0 0/0 .text            mode_proc_call__8daTbox_cFv */
 void daTbox_c::mode_proc_call() {
     static daTbox_modeFn l_func[2] = {
         &daTbox_c::mode_exec_wait,
@@ -1780,7 +1702,6 @@ void daTbox_c::mode_proc_call() {
     (this->*l_func[mMode])();
 }
 
-/* 804956EC-80495818 004AAC 012C+00 1/0 0/0 0/0 .text            mode_exec_wait__8daTbox_cFv */
 void daTbox_c::mode_exec_wait() {
     bool bvar1 = false;
 
@@ -1805,7 +1726,6 @@ void daTbox_c::mode_exec_wait() {
     }
 }
 
-/* 80495818-80495910 004BD8 00F8+00 2/1 0/0 0/0 .text            mode_exec__8daTbox_cFv */
 void daTbox_c::mode_exec() {
     action();
 
@@ -1830,7 +1750,6 @@ void daTbox_c::mode_exec() {
     }
 }
 
-/* 80495910-804959EC 004CD0 00DC+00 1/1 0/0 0/0 .text            create1st__8daTbox_cFv */
 cPhs__Step daTbox_c::create1st() {
     if (!mParamsInit) {
         field_0x980 = home.angle.x;
@@ -1863,7 +1782,6 @@ cPhs__Step daTbox_c::create1st() {
     return step;
 }
 
-/* 804959EC-80495AF0 004DAC 0104+00 1/0 0/0 0/0 .text            Execute__8daTbox_cFPPA3_A4_f */
 int daTbox_c::Execute(Mtx** param_0) {
     mode_proc_call();
     *param_0 = &mBgMtx;
@@ -1881,7 +1799,6 @@ int daTbox_c::Execute(Mtx** param_0) {
     return true;
 }
 
-/* 80495AF0-80495C9C 004EB0 01AC+00 1/0 0/0 0/0 .text            Draw__8daTbox_cFv */
 int daTbox_c::Draw() {
     if (flagCheck(0x40)) {
         return true;
@@ -1920,7 +1837,6 @@ int daTbox_c::Draw() {
     return true;
 }
 
-/* 80495C9C-80495CFC 00505C 0060+00 1/0 0/0 0/0 .text            Delete__8daTbox_cFv */
 int daTbox_c::Delete() {
     if (mpBgCollision != NULL) {
         dComIfG_Bgsp().Release(mpBgCollision);
@@ -1930,29 +1846,23 @@ int daTbox_c::Delete() {
     return true;
 }
 
-/* 80495CFC-80495E38 0050BC 013C+00 1/0 0/0 0/0 .text            daTbox_create1st__FP8daTbox_c */
 cPhs__Step daTbox_create1st(daTbox_c* i_this) {
     fopAcM_ct(i_this, daTbox_c);
     return i_this->create1st();
 }
 
-/* 80496004-80496024 0053C4 0020+00 1/0 0/0 0/0 .text            daTbox_MoveBGDelete__FP8daTbox_c */
 static int daTbox_MoveBGDelete(daTbox_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 80496024-80496044 0053E4 0020+00 1/0 0/0 0/0 .text            daTbox_MoveBGExecute__FP8daTbox_c
- */
 static int daTbox_MoveBGExecute(daTbox_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 80496044-80496070 005404 002C+00 1/0 0/0 0/0 .text            daTbox_MoveBGDraw__FP8daTbox_c */
 static int daTbox_MoveBGDraw(daTbox_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80496730-80496750 -00001 0020+00 1/0 0/0 0/0 .data            daTbox_METHODS */
 static actor_method_class daTbox_METHODS = {
     (process_method_func)daTbox_create1st,
     (process_method_func)daTbox_MoveBGDelete,
@@ -1961,7 +1871,6 @@ static actor_method_class daTbox_METHODS = {
     (process_method_func)daTbox_MoveBGDraw,
 };
 
-/* 80496750-80496780 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TBOX */
 extern actor_process_profile_definition g_profile_TBOX = {
     fpcLy_CURRENT_e,
     4,
diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp
index 5fadbf7d8d..f844bff156 100644
--- a/src/d/actor/d_a_tbox2.cpp
+++ b/src/d/actor/d_a_tbox2.cpp
@@ -9,13 +9,11 @@
 #include "d/d_bg_w.h"
 #include "d/actor/d_a_midna.h"
 
-/* 80496A18-80496A54 000078 003C+00 1/1 0/0 0/0 .text            initBaseMtx__9daTbox2_cFv */
 void daTbox2_c::initBaseMtx() {
     mpModel->setBaseScale(scale);
     setBaseMtx();
 }
 
-/* 80496A54-80496AB8 0000B4 0064+00 2/2 0/0 0/0 .text            setBaseMtx__9daTbox2_cFv */
 void daTbox2_c::setBaseMtx() {
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::YrotM(shape_angle.y);
@@ -24,13 +22,11 @@ void daTbox2_c::setBaseMtx() {
 }
 
 
-/* 80498160-80498180 000000 0020+00 4/4 0/0 0/0 .rodata          l_resInfo */
 static const res_info l_resInfo[] = {
     {9, 5, 13, 14},   // Small Chest
     {10, 6, 15, 16},  // Big Chest
 };
 
-/* 80498180-804981BC 000020 003C+00 1/2 0/0 0/0 .rodata          l_cyl_info */
 static const cM3dGCylS l_cyl_info[] = {
     {
         {0.0f, 0.0f, -40.0f},  // center
@@ -49,13 +45,10 @@ static const cM3dGCylS l_cyl_info[] = {
     },
 };
 
-/* 8049827C-80498280 -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "Tbox2";
 
-/* 80498280-80498284 -00001 0004+00 1/1 0/0 0/0 .data            l_staff_name */
 static char* l_staff_name = "TREASURE";
 
-/* 80498284-804982C8 000028 0044+00 1/1 0/0 0/0 .data            l_cyl_src */
 static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x1e}, {0x0, 0x0}, 0x79}},  // mObj
@@ -70,7 +63,6 @@ static dCcD_SrcCyl l_cyl_src = {
     }                        // mCyl
 };
 
-/* 80496AB8-80496C20 000118 0168+00 1/0 0/0 0/0 .text            Create__9daTbox2_cFv */
 int daTbox2_c::Create() {
     init_actionOpenWait();
     initBaseMtx();
@@ -108,7 +100,6 @@ int daTbox2_c::Create() {
     return 1;
 }
 
-/* 80496C20-80496DF4 000280 01D4+00 1/0 0/0 0/0 .text            CreateHeap__9daTbox2_cFv */
 int daTbox2_c::CreateHeap() {
     J3DModelData* modelData =
         (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no);
@@ -140,7 +131,6 @@ int daTbox2_c::CreateHeap() {
     return true;
 }
 
-/* 80496E3C-80497080 00049C 0244+00 1/1 0/0 0/0 .text            create1st__9daTbox2_cFv */
 int daTbox2_c::create1st() {
     fopAcM_ct(this, daTbox2_c);
     mModelType = getModelType();
@@ -164,7 +154,6 @@ int daTbox2_c::create1st() {
     return phase_state;
 }
 
-/* 8049724C-80497478 0008AC 022C+00 3/3 0/0 0/0 .text            demoProc__9daTbox2_cFv */
 int daTbox2_c::demoProc() {
     static char* action_table[] = {"WAIT", "OPEN", "APPEAR", "OPEN_SHORT"};
     int act_idx =
@@ -209,7 +198,6 @@ int daTbox2_c::demoProc() {
     return 0;
 }
 
-/* 80497478-80497500 000AD8 0088+00 1/1 0/0 0/0 .text            openInit__9daTbox2_cFv */
 void daTbox2_c::openInit() {
     daPy_py_c* player_p = daPy_getPlayerActorClass();
 
@@ -227,7 +215,6 @@ void daTbox2_c::openInit() {
     mpBck->setPlaySpeed(1.0f);
 }
 
-/* 80497500-804975EC 000B60 00EC+00 1/0 0/0 0/0 .text            Execute__9daTbox2_cFPPA3_A4_f */
 int daTbox2_c::Execute(Mtx** param_0) {
     mode_proc_call();
     *param_0 = &mBgMtx;
@@ -247,7 +234,6 @@ int daTbox2_c::Execute(Mtx** param_0) {
     return 1;
 }
 
-/* 804975EC-80497678 000C4C 008C+00 1/1 0/0 0/0 .text            mode_proc_call__9daTbox2_cFv */
 void daTbox2_c::mode_proc_call() {
     typedef void (daTbox2_c::*mode_func)();
     static mode_func l_func[] = {
@@ -258,7 +244,6 @@ void daTbox2_c::mode_proc_call() {
     (this->*l_func[mMode])();
 }
 
-/* 80497678-80497790 000CD8 0118+00 1/0 0/0 0/0 .text            mode_exec_wait__9daTbox2_cFv */
 void daTbox2_c::mode_exec_wait() {
     bool start_exec = false;
     mNoDraw = true;
@@ -281,7 +266,6 @@ void daTbox2_c::mode_exec_wait() {
     }
 }
 
-/* 80497790-8049780C 000DF0 007C+00 2/1 0/0 0/0 .text            mode_exec__9daTbox2_cFv */
 void daTbox2_c::mode_exec() {
     action();
     fopAcM_posMoveF(this, NULL);
@@ -291,7 +275,6 @@ void daTbox2_c::mode_exec() {
     eyePos = current.pos;
 }
 
-/* 8049780C-804978C8 000E6C 00BC+00 1/1 0/0 0/0 .text            action__9daTbox2_cFv */
 void daTbox2_c::action() {
     typedef void (daTbox2_c::*action_func)();
     static action_func l_func[] = {
@@ -304,20 +287,16 @@ void daTbox2_c::action() {
     (this->*l_func[mAction])();
 }
 
-/* 804978C8-804978D4 000F28 000C+00 1/1 0/0 0/0 .text            init_actionWait__9daTbox2_cFv */
 void daTbox2_c::init_actionWait() {
     mAction = ACTION_WAIT_e;
 }
 
-/* 804978D4-804978D8 000F34 0004+00 1/0 0/0 0/0 .text            actionWait__9daTbox2_cFv */
 void daTbox2_c::actionWait() {}
 
-/* 804978D8-804978E4 000F38 000C+00 1/1 0/0 0/0 .text init_actionNotOpenDemo__9daTbox2_cFv */
 void daTbox2_c::init_actionNotOpenDemo() {
     mAction = ACTION_NOT_OPEN_DEMO_e;
 }
 
-/* 804978E4-8049794C 000F44 0068+00 1/0 0/0 0/0 .text            actionNotOpenDemo__9daTbox2_cFv */
 void daTbox2_c::actionNotOpenDemo() {
     if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) {
         dComIfGp_event_reset();
@@ -327,13 +306,10 @@ void daTbox2_c::actionNotOpenDemo() {
     }
 }
 
-/* 8049794C-80497958 000FAC 000C+00 1/1 0/0 0/0 .text            init_actionOpenDemo__9daTbox2_cFv
- */
 void daTbox2_c::init_actionOpenDemo() {
     mAction = ACTION_OPEN_DEMO_e;
 }
 
-/* 80497958-80497A0C 000FB8 00B4+00 1/0 0/0 0/0 .text            actionOpenDemo__9daTbox2_cFv */
 void daTbox2_c::actionOpenDemo() {
     if (dComIfGp_evmng_endCheck(eventInfo.getEventId())) {
         dComIfGp_event_reset();
@@ -352,13 +328,10 @@ void daTbox2_c::actionOpenDemo() {
     }
 }
 
-/* 80497A0C-80497A18 00106C 000C+00 3/3 0/0 0/0 .text            init_actionOpenWait__9daTbox2_cFv
- */
 void daTbox2_c::init_actionOpenWait() {
     mAction = ACTION_OPEN_WAIT_e;
 }
 
-/* 80497A18-80497BD0 001078 01B8+00 1/0 0/0 0/0 .text            actionOpenWait__9daTbox2_cFv */
 void daTbox2_c::actionOpenWait() {
     daMidna_c* midna_p = (daMidna_c*)daPy_py_c::getMidnaActor();  // cast needed for reg alloc
     daPy_py_c* player_p = daPy_getPlayerActorClass();
@@ -392,7 +365,6 @@ void daTbox2_c::actionOpenWait() {
     }
 }
 
-/* 80497BD0-80497C60 001230 0090+00 1/1 0/0 0/0 .text            setGetDemoItem__9daTbox2_cFv */
 int daTbox2_c::setGetDemoItem() {
     u8 item_no = getItemNo();
 
@@ -410,7 +382,6 @@ int daTbox2_c::setGetDemoItem() {
     return 1;
 }
 
-/* 80497C60-80497DA0 0012C0 0140+00 1/1 0/0 0/0 .text            boxCheck__9daTbox2_cFv */
 BOOL daTbox2_c::boxCheck() {
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -434,7 +405,6 @@ BOOL daTbox2_c::boxCheck() {
     return false;
 }
 
-/* 80497DA0-80497E6C 001400 00CC+00 1/0 0/0 0/0 .text            Draw__9daTbox2_cFv */
 int daTbox2_c::Draw() {
     if (mNoDraw) {
         return 1;
@@ -450,7 +420,6 @@ int daTbox2_c::Draw() {
     return 1;
 }
 
-/* 80497E6C-80497ED8 0014CC 006C+00 1/0 0/0 0/0 .text            Delete__9daTbox2_cFv */
 int daTbox2_c::Delete() {
     if (mBoxBgW != NULL && mBoxBgW->ChkUsed()) {
         dComIfG_Bgsp().Release(mBoxBgW);
@@ -460,37 +429,29 @@ int daTbox2_c::Delete() {
     return 1;
 }
 
-/* 80497ED8-8049808C 001538 01B4+00 1/0 0/0 0/0 .text            daTbox2_create1st__FP9daTbox2_c */
 static int daTbox2_create1st(daTbox2_c* i_this) {
     fopAcM_ct(i_this, daTbox2_c);
     return i_this->create1st();
 }
 
-/* 8049808C-804980AC 0016EC 0020+00 1/0 0/0 0/0 .text            daTbox2_MoveBGDelete__FP9daTbox2_c
- */
 static int daTbox2_MoveBGDelete(daTbox2_c* i_this) {
     return i_this->MoveBGDelete();
 }
 
-/* 804980AC-804980CC 00170C 0020+00 1/0 0/0 0/0 .text            daTbox2_MoveBGExecute__FP9daTbox2_c
- */
 static int daTbox2_MoveBGExecute(daTbox2_c* i_this) {
     return i_this->MoveBGExecute();
 }
 
-/* 804980CC-804980F8 00172C 002C+00 1/0 0/0 0/0 .text            daTbox2_MoveBGDraw__FP9daTbox2_c */
 static int daTbox2_MoveBGDraw(daTbox2_c* i_this) {
     return i_this->MoveBGDraw();
 }
 
-/* 80498368-80498388 -00001 0020+00 1/0 0/0 0/0 .data            daTbox2_METHODS */
 static actor_method_class daTbox2_METHODS = {
     (process_method_func)daTbox2_create1st,     (process_method_func)daTbox2_MoveBGDelete,
     (process_method_func)daTbox2_MoveBGExecute, (process_method_func)NULL,
     (process_method_func)daTbox2_MoveBGDraw,
 };
 
-/* 80498388-804983B8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TBOX2 */
 extern actor_process_profile_definition g_profile_TBOX2 = {
     fpcLy_CURRENT_e,
     4,
diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp
index c97c94aba0..1e4a0d788b 100644
--- a/src/d/actor/d_a_tboxSw.cpp
+++ b/src/d/actor/d_a_tboxSw.cpp
@@ -9,12 +9,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D66858-80D66860 000078 0008+00 1/1 0/0 0/0 .text            Create__10daTboxSw_cFv */
 int daTboxSw_c::Create() {
     return 1;
 }
 
-/* 80D66860-80D668C8 000080 0068+00 1/1 0/0 0/0 .text            create__10daTboxSw_cFv */
 int daTboxSw_c::create() {
     fopAcM_ct(this, daTboxSw_c);
 
@@ -25,7 +23,6 @@ int daTboxSw_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80D668C8-80D66938 0000E8 0070+00 1/1 0/0 0/0 .text            execute__10daTboxSw_cFv */
 int daTboxSw_c::execute() {
     if (dComIfGs_isTbox(daTboxSw_prm::getTboxNo(this))) {
         dComIfGs_onSwitch(daTboxSw_prm::getSwNo(this), fopAcM_GetHomeRoomNo(this));
@@ -35,45 +32,36 @@ int daTboxSw_c::execute() {
     return 1;
 }
 
-/* 80D66938-80D66940 000158 0008+00 1/1 0/0 0/0 .text            draw__10daTboxSw_cFv */
 int daTboxSw_c::draw() {
     return 1;
 }
 
-/* 80D66940-80D66948 000160 0008+00 1/1 0/0 0/0 .text            _delete__10daTboxSw_cFv */
 int daTboxSw_c::_delete() {
     return 1;
 }
 
-/* 80D66948-80D66968 000168 0020+00 1/0 0/0 0/0 .text            daTboxSw_Draw__FP10daTboxSw_c */
 static int daTboxSw_Draw(daTboxSw_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D66968-80D66988 000188 0020+00 1/0 0/0 0/0 .text            daTboxSw_Execute__FP10daTboxSw_c */
 static int daTboxSw_Execute(daTboxSw_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D66988-80D669A8 0001A8 0020+00 1/0 0/0 0/0 .text            daTboxSw_Delete__FP10daTboxSw_c */
 static int daTboxSw_Delete(daTboxSw_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80D669A8-80D669C8 0001C8 0020+00 1/0 0/0 0/0 .text            daTboxSw_Create__FP10fopAc_ac_c */
 static int daTboxSw_Create(fopAc_ac_c* i_this) {
     return static_cast<daTboxSw_c*>(i_this)->create();
 }
 
-/* ############################################################################################## */
-/* 80D669D0-80D669F0 -00001 0020+00 1/0 0/0 0/0 .data            l_daTboxSw_Method */
 static actor_method_class l_daTboxSw_Method = {
     (process_method_func)daTboxSw_Create,  (process_method_func)daTboxSw_Delete,
     (process_method_func)daTboxSw_Execute, (process_method_func)NULL,
     (process_method_func)daTboxSw_Draw,
 };
 
-/* 80D669F0-80D66A20 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TBOX_SW */
 extern actor_process_profile_definition g_profile_TBOX_SW = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp
index 98b7c1e9c0..6e08dd431b 100644
--- a/src/d/actor/d_a_title.cpp
+++ b/src/d/actor/d_a_title.cpp
@@ -18,9 +18,9 @@
 
 class daTit_HIO_c {
 public:
-    /* 80D66B0C */ daTit_HIO_c();
+    daTit_HIO_c();
 
-    /* 80D67A08 */ virtual ~daTit_HIO_c() {}
+    virtual ~daTit_HIO_c() {}
 
     /* 0x04 */ s8 field_0x4;
     /* 0x08 */ f32 mPSScaleX;
@@ -32,15 +32,12 @@ public:
     /* 0x1A */ u8 field_0x1a;
 };
 
-/* 80D67D8C-80D67DA8 000014 001C+00 4/4 0/0 0/0 .bss             g_daTitHIO */
 static daTit_HIO_c g_daTitHIO;
 
-/* 80D67BD4-80D67BE0 000000 000C+00 2/2 0/0 0/0 .rodata          @3772 */
 static u8 const lit_3772[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80D67BE0-80D67BE8 00000C 0006+02 3/3 0/0 0/0 .rodata          l_arcName */
 #if VERSION == VERSION_GCN_PAL
 static char const l_arcName[] = "TitlePal";
 #else
@@ -52,7 +49,6 @@ static procFunc daTitleProc[6] = {
     &daTitle_c::keyWait, &daTitle_c::nextScene_proc, &daTitle_c::fastLogoDisp,
 };
 
-/* 80D66B0C-80D66B54 0000EC 0048+00 1/1 0/0 0/0 .text            __ct__11daTit_HIO_cFv */
 daTit_HIO_c::daTit_HIO_c() {
     mPSScaleX = 1.0f;
     mPSScaleY = 1.0f;
@@ -81,7 +77,6 @@ daTit_HIO_c::daTit_HIO_c() {
     field_0x1a = 15;
 }
 
-/* 80D66B54-80D66CDC 000134 0188+00 1/1 0/0 0/0 .text            CreateHeap__9daTitle_cFv */
 int daTitle_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000285);
@@ -105,7 +100,6 @@ int daTitle_c::CreateHeap() {
     return 1;
 }
 
-/* 80D66CDC-80D66E7C 0002BC 01A0+00 1/1 0/0 0/0 .text            create__9daTitle_cFv */
 int daTitle_c::create() {
     fopAcM_ct(this, daTitle_c);
     
@@ -129,13 +123,10 @@ int daTitle_c::create() {
     return phase_state;
 }
 
-/* 80D66E7C-80D66E9C 00045C 0020+00 1/1 0/0 0/0 .text createHeapCallBack__9daTitle_cFP10fopAc_ac_c
- */
 int daTitle_c::createHeapCallBack(fopAc_ac_c* title) {
     return ((daTitle_c*)title)->CreateHeap();
 }
 
-/* 80D66E9C-80D66F34 00047C 0098+00 1/1 0/0 0/0 .text            Execute__9daTitle_cFv */
 int daTitle_c::Execute() {
     if (fopOvlpM_IsPeek()) {
         return 1;
@@ -152,7 +143,6 @@ int daTitle_c::Execute() {
     return 1;
 }
 
-/* 80D66F34-80D67010 000514 00DC+00 1/1 0/0 0/0 .text            KeyWaitAnm__9daTitle_cFv */
 void daTitle_c::KeyWaitAnm() {
     if (field_0x5f9 != 0) {
         if (field_0x604 == 0) {
@@ -176,12 +166,10 @@ void daTitle_c::KeyWaitAnm() {
     }
 }
 
-/* 80D67010-80D6701C 0005F0 000C+00 1/1 0/0 0/0 .text            loadWait_init__9daTitle_cFv */
 void daTitle_c::loadWait_init() {
     mProcID = 0;
 }
 
-/* 80D6701C-80D672E0 0005FC 02C4+00 1/0 0/0 0/0 .text            loadWait_proc__9daTitle_cFv */
 void daTitle_c::loadWait_proc() {
     if (mpMount->sync()) {
         JKRHeap* heap = mDoExt_setCurrentHeap(m2DHeap);
@@ -217,12 +205,10 @@ void daTitle_c::loadWait_proc() {
     }
 }
 
-/* 80D672E0-80D672EC 0008C0 000C+00 1/1 0/0 0/0 .text            logoDispWaitInit__9daTitle_cFv */
 void daTitle_c::logoDispWaitInit() {
     mProcID = 1;
 }
 
-/* 80D672EC-80D67350 0008CC 0064+00 1/0 0/0 0/0 .text            logoDispWait__9daTitle_cFv */
 void daTitle_c::logoDispWait() {
     if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) {
         fastLogoDispInit();
@@ -231,7 +217,6 @@ void daTitle_c::logoDispWait() {
     }
 }
 
-/* 80D67350-80D6737C 000930 002C+00 1/1 0/0 0/0 .text            logoDispAnmInit__9daTitle_cFv */
 void daTitle_c::logoDispAnmInit() {
     mBck.setPlaySpeed(1.0f);
     mBpk.setPlaySpeed(1.0f);
@@ -241,7 +226,6 @@ void daTitle_c::logoDispAnmInit() {
     mProcID = 2;
 }
 
-/* 80D6737C-80D674A8 00095C 012C+00 1/0 0/0 0/0 .text            logoDispAnm__9daTitle_cFv */
 void daTitle_c::logoDispAnm() {
     mBck.play();
     mBpk.play();
@@ -257,12 +241,10 @@ void daTitle_c::logoDispAnm() {
     }
 }
 
-/* 80D674A8-80D674B4 000A88 000C+00 2/2 0/0 0/0 .text            keyWaitInit__9daTitle_cFv */
 void daTitle_c::keyWaitInit() {
     mProcID = 3;
 }
 
-/* 80D674B4-80D67544 000A94 0090+00 1/0 0/0 0/0 .text            keyWait__9daTitle_cFv */
 void daTitle_c::keyWait() {
     if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) {
         mDoAud_seStart(Z2SE_TITLE_ENTER, NULL, 0, 0);
@@ -270,12 +252,10 @@ void daTitle_c::keyWait() {
     }
 }
 
-/* 80D67544-80D67550 000B24 000C+00 1/1 0/0 0/0 .text            nextScene_init__9daTitle_cFv */
 void daTitle_c::nextScene_init() {
     mProcID = 4;
 }
 
-/* 80D67550-80D675EC 000B30 009C+00 1/0 0/0 0/0 .text            nextScene_proc__9daTitle_cFv */
 void daTitle_c::nextScene_proc() {
     if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) {
         scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
@@ -287,7 +267,6 @@ void daTitle_c::nextScene_proc() {
     }
 }
 
-/* 80D675EC-80D676AC 000BCC 00C0+00 1/1 0/0 0/0 .text            fastLogoDispInit__9daTitle_cFv */
 void daTitle_c::fastLogoDispInit() {
     mBck.setFrame(mBck.getEndFrame() - 1.0f);
     mBpk.setFrame(mBpk.getEndFrame() - 1.0f);
@@ -300,7 +279,6 @@ void daTitle_c::fastLogoDispInit() {
     mProcID = 5;
 }
 
-/* 80D676AC-80D676F4 000C8C 0048+00 1/0 0/0 0/0 .text            fastLogoDisp__9daTitle_cFv */
 void daTitle_c::fastLogoDisp() {
     if (field_0x5fc != 0) {
         field_0x5fc--;
@@ -313,7 +291,6 @@ void daTitle_c::fastLogoDisp() {
     keyWaitInit();
 }
 
-/* 80D676F4-80D67768 000CD4 0074+00 1/1 0/0 0/0 .text            getDemoPrm__9daTitle_cFv */
 int daTitle_c::getDemoPrm() {
     dDemo_actor_c* demoActor = dDemo_c::getActor(demoActorID);
     dDemo_prm_c* prm;
@@ -328,7 +305,6 @@ int daTitle_c::getDemoPrm() {
     return -1;
 }
 
-/* 80D67768-80D6786C 000D48 0104+00 1/1 0/0 0/0 .text            Draw__9daTitle_cFv */
 int daTitle_c::Draw() {
     J3DModelData* modelData = mpModel->getModelData();
     MTXTrans(mpModel->getBaseTRMtx(), 0.0f, 0.0f, -430.0f);
@@ -350,7 +326,6 @@ int daTitle_c::Draw() {
     return 1;
 }
 
-/* 80D6786C-80D67948 000E4C 00DC+00 1/1 0/0 0/0 .text            Delete__9daTitle_cFv */
 int daTitle_c::Delete() {
     dComIfG_resDelete(&mPhaseReq, l_arcName);
     delete mTitle.Scr;
@@ -367,33 +342,27 @@ int daTitle_c::Delete() {
     return 1;
 }
 
-/* 80D67948-80D67968 000F28 0020+00 1/0 0/0 0/0 .text            daTitle_Draw__FP9daTitle_c */
 static int daTitle_Draw(daTitle_c* i_this) {
     return i_this->Draw();
 }
 
-/* 80D67968-80D67988 000F48 0020+00 1/0 0/0 0/0 .text            daTitle_Execute__FP9daTitle_c */
 static int daTitle_Execute(daTitle_c* i_this) {
     return i_this->Execute();
 }
 
-/* 80D67988-80D679A8 000F68 0020+00 1/0 0/0 0/0 .text            daTitle_Delete__FP9daTitle_c */
 static int daTitle_Delete(daTitle_c* i_this) {
     return i_this->Delete();
 }
 
-/* 80D679A8-80D679C8 000F88 0020+00 1/0 0/0 0/0 .text            daTitle_Create__FP10fopAc_ac_c */
 static int daTitle_Create(fopAc_ac_c* i_this) {
     return static_cast<daTitle_c*>(i_this)->create();
 }
 
-/* 80D679C8-80D67A04 000FA8 003C+00 1/0 0/0 0/0 .text            draw__15dDlst_daTitle_cFv */
 void dDlst_daTitle_c::draw() {
     J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
     Scr->draw(0.0f, 0.0f, ctx);
 }
 
-/* 80D67CF0-80D67D10 -00001 0020+00 1/0 0/0 0/0 .data            l_daTitle_Method */
 static actor_method_class l_daTitle_Method = {
     (process_method_func)daTitle_Create,
     (process_method_func)daTitle_Delete,
@@ -402,7 +371,6 @@ static actor_method_class l_daTitle_Method = {
     (process_method_func)daTitle_Draw,
 };
 
-/* 80D67D10-80D67D40 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_TITLE */
 extern actor_process_profile_definition g_profile_TITLE = {
   fpcLy_CURRENT_e,         // mLayerID
   7,                       // mListID
diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp
index 9cf7e5f178..fa7682526f 100644
--- a/src/d/actor/d_a_vrbox.cpp
+++ b/src/d/actor/d_a_vrbox.cpp
@@ -11,7 +11,6 @@
 
 static int daVrbox_color_set(vrbox_class* i_this);
 
-/* 80498518-804986B8 000078 01A0+00 1/0 0/0 0/0 .text            daVrbox_Draw__FP11vrbox_class */
 static int daVrbox_Draw(vrbox_class* i_this) {
     J3DModel* soraModel_p = i_this->mpSoraModel;
     f32 fvar = 0.0f;
@@ -63,8 +62,6 @@ static int daVrbox_Draw(vrbox_class* i_this) {
     return 1;
 }
 
-/* 804986B8-80498850 000218 0198+00 1/1 0/0 0/0 .text            daVrbox_color_set__FP11vrbox_class
- */
 static int daVrbox_color_set(vrbox_class* i_this) {
     if ((g_env_light.vrbox_kasumi_outer_col.r + g_env_light.vrbox_kasumi_outer_col.g +
          g_env_light.vrbox_kasumi_outer_col.b + g_env_light.vrbox_sky_col.r + g_env_light.vrbox_sky_col.g +
@@ -107,24 +104,18 @@ static int daVrbox_color_set(vrbox_class* i_this) {
     return 1;
 }
 
-/* 80498850-80498858 0003B0 0008+00 1/0 0/0 0/0 .text            daVrbox_Execute__FP11vrbox_class */
 static int daVrbox_Execute(vrbox_class* i_this) {
     return 1;
 }
 
-/* 80498858-80498860 0003B8 0008+00 1/0 0/0 0/0 .text            daVrbox_IsDelete__FP11vrbox_class
- */
 static int daVrbox_IsDelete(vrbox_class* i_this) {
     return 1;
 }
 
-/* 80498860-80498868 0003C0 0008+00 1/0 0/0 0/0 .text            daVrbox_Delete__FP11vrbox_class */
 static int daVrbox_Delete(vrbox_class* i_this) {
     return 1;
 }
 
-/* 80498868-804988DC 0003C8 0074+00 1/1 0/0 0/0 .text            daVrbox_solidHeapCB__FP10fopAc_ac_c
- */
 static int daVrbox_solidHeapCB(fopAc_ac_c* i_this) {
     vrbox_class* this_ = (vrbox_class*)i_this;
 
@@ -134,7 +125,6 @@ static int daVrbox_solidHeapCB(fopAc_ac_c* i_this) {
     return modelData != NULL && this_->mpSoraModel != NULL;
 }
 
-/* 804988DC-80498988 00043C 00AC+00 1/0 0/0 0/0 .text            daVrbox_Create__FP10fopAc_ac_c */
 static int daVrbox_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, vrbox_class);
     vrbox_class* this_ = (vrbox_class*)i_this;
@@ -152,15 +142,12 @@ static int daVrbox_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 804989A8-804989C8 -00001 0020+00 1/0 0/0 0/0 .data            l_daVrbox_Method */
 static actor_method_class l_daVrbox_Method = {
     (process_method_func)daVrbox_Create,  (process_method_func)daVrbox_Delete,
     (process_method_func)daVrbox_Execute, (process_method_func)daVrbox_IsDelete,
     (process_method_func)daVrbox_Draw,
 };
 
-/* 804989C8-804989F8 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_VRBOX */
 extern actor_process_profile_definition g_profile_VRBOX = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index b73b8caa4b..550fe2c21a 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -15,7 +15,6 @@
 
 static int daVrbox2_color_set(vrbox2_class* param_0);
 
-/* 80498A78-80498ACC 000078 0054+00 1/1 0/0 0/0 .text            texScrollCheck__FRf */
 static void texScrollCheck(f32& param_0) {
     while (param_0 < 0.0f)
         param_0 += 1.0f;
@@ -24,7 +23,6 @@ static void texScrollCheck(f32& param_0) {
         param_0 -= 1.0f;
 }
 
-/* 80498ACC-804990DC 0000CC 0610+00 1/0 0/0 0/0 .text            daVrbox2_Draw__FP12vrbox2_class */
 // NONMATCHING - reg alloc
 static int daVrbox2_Draw(vrbox2_class* i_this) {
     camera_class* camera_p;
@@ -212,7 +210,6 @@ static int daVrbox2_Draw(vrbox2_class* i_this) {
     return 1;
 }
 
-/* 804990DC-804997E8 0006DC 070C+00 1/1 0/0 0/0 .text daVrbox2_color_set__FP12vrbox2_class */
 static int daVrbox2_color_set(vrbox2_class* i_this) {
     fopAc_ac_c* actor = i_this;
     J3DMaterial* material_0;
@@ -389,8 +386,6 @@ static int daVrbox2_color_set(vrbox2_class* i_this) {
     return 1;
 }
 
-/* 804997E8-8049982C 000DE8 0044+00 1/0 0/0 0/0 .text            daVrbox2_Execute__FP12vrbox2_class
- */
 static int daVrbox2_Execute(vrbox2_class* i_this) {
     i_this = i_this; // ?? fakematch? only needed for debug
 
@@ -401,20 +396,15 @@ static int daVrbox2_Execute(vrbox2_class* i_this) {
     return 1;
 }
 
-/* 8049982C-80499834 000E2C 0008+00 1/0 0/0 0/0 .text            daVrbox2_IsDelete__FP12vrbox2_class
- */
 static int daVrbox2_IsDelete(vrbox2_class* i_this) {
     return 1;
 }
 
-/* 80499834-8049983C 000E34 0008+00 1/0 0/0 0/0 .text            daVrbox2_Delete__FP12vrbox2_class
- */
 static int daVrbox2_Delete(vrbox2_class* i_this) {
     fopAcM_RegisterDeleteID(i_this, "Vrbox2");
     return 1;
 }
 
-/* 8049983C-80499978 000E3C 013C+00 1/1 0/0 0/0 .text daVrbox2_solidHeapCB__FP10fopAc_ac_c */
 static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) {
     vrbox2_class* a_this = (vrbox2_class*)i_this;
 
@@ -447,7 +437,6 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) {
     return a_this->mpKumoModel != NULL && a_this->model2 != NULL && a_this->model2_und != NULL;
 }
 
-/* 80499978-80499A1C 000F78 00A4+00 1/0 0/0 0/0 .text            daVrbox2_Create__FP10fopAc_ac_c */
 static int daVrbox2_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, vrbox2_class);
 
@@ -459,15 +448,12 @@ static int daVrbox2_Create(fopAc_ac_c* i_this) {
     return phase;
 }
 
-/* ############################################################################################## */
-/* 80499B18-80499B38 -00001 0020+00 1/0 0/0 0/0 .data            l_daVrbox2_Method */
 static actor_method_class l_daVrbox2_Method = {
     (process_method_func)daVrbox2_Create,  (process_method_func)daVrbox2_Delete,
     (process_method_func)daVrbox2_Execute, (process_method_func)daVrbox2_IsDelete,
     (process_method_func)daVrbox2_Draw,
 };
 
-/* 80499B38-80499B68 -00001 0030+00 0/0 0/0 1/0 .data            g_profile_VRBOX2 */
 extern actor_process_profile_definition g_profile_VRBOX2 = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp
index 60ac874857..3a021961b8 100644
--- a/src/d/actor/d_a_warp_bug.cpp
+++ b/src/d/actor/d_a_warp_bug.cpp
@@ -10,10 +10,8 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
-/* 80D67E38-80D67E3C 000078 0004+00 1/1 0/0 0/0 .text            create_init__11daWarpBug_cFv */
 void daWarpBug_c::create_init() {}
 
-/* 80D68208-80D6820C -00001 0004+00 3/3 0/0 0/0 .data            l_arcName */
 static char* l_arcName = "WarpBug";
 
 int daWarpBug_c::createHeap() {
@@ -46,17 +44,14 @@ int daWarpBug_c::createHeap() {
     return 1;
 }
 
-/* 80D67E3C-80D68000 00007C 01C4+00 1/1 0/0 0/0 .text            createSolidHeap__FP10fopAc_ac_c */
 static int createSolidHeap(fopAc_ac_c* i_this) {
     return static_cast<daWarpBug_c*>(i_this)->createHeap();
 }
 
-/* 80D68048-80D68068 000288 0020+00 1/0 0/0 0/0 .text            daWarpBug_Draw__FP11daWarpBug_c */
 static int daWarpBug_Draw(daWarpBug_c* i_this) {
     return i_this->draw();
 }
 
-/* 80D68068-80D68078 0002A8 0010+00 1/1 0/0 0/0 .text            draw__11daWarpBug_cFv */
 int daWarpBug_c::draw() {
 #ifdef DEBUG
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -123,14 +118,10 @@ int daWarpBug_c::execute() {
     return 1;
 }
 
-/* 80D68078-80D680D8 0002B8 0060+00 1/0 0/0 0/0 .text            daWarpBug_Execute__FP11daWarpBug_c
- */
 static int daWarpBug_Execute(daWarpBug_c* i_this) {
     return i_this->execute();
 }
 
-/* 80D680D8-80D680E0 000318 0008+00 1/0 0/0 0/0 .text            daWarpBug_IsDelete__FP11daWarpBug_c
- */
 static int daWarpBug_IsDelete(daWarpBug_c* i_this) {
     return 1;
 }
@@ -139,8 +130,6 @@ daWarpBug_c::~daWarpBug_c() {
     dComIfG_resDelete(&mPhase, l_arcName);
 }
 
-/* 80D680E0-80D68130 000320 0050+00 1/0 0/0 0/0 .text            daWarpBug_Delete__FP11daWarpBug_c
- */
 static int daWarpBug_Delete(daWarpBug_c* i_this) {
     i_this->~daWarpBug_c();
     return 1;
@@ -161,19 +150,16 @@ int daWarpBug_c::create() {
     return phase;
 }
 
-/* 80D68130-80D681D4 000370 00A4+00 1/0 0/0 0/0 .text            daWarpBug_Create__FP10fopAc_ac_c */
 static int daWarpBug_Create(fopAc_ac_c* i_this) {
     return static_cast<daWarpBug_c*>(i_this)->create();
 }
 
-/* 80D6820C-80D6822C -00001 0020+00 1/0 0/0 0/0 .data            l_daWarpBug_Method */
 static actor_method_class l_daWarpBug_Method = {
     (process_method_func)daWarpBug_Create,  (process_method_func)daWarpBug_Delete,
     (process_method_func)daWarpBug_Execute, (process_method_func)daWarpBug_IsDelete,
     (process_method_func)daWarpBug_Draw,
 };
 
-/* 80D6822C-80D6825C -00001 0030+00 0/0 0/0 1/0 .data            g_profile_WarpBug */
 extern actor_process_profile_definition g_profile_WarpBug = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp
index e66c71a730..9a33c16168 100644
--- a/src/d/actor/d_a_ykgr.cpp
+++ b/src/d/actor/d_a_ykgr.cpp
@@ -14,7 +14,7 @@
 
 struct daYkgr_HIO_c : public mDoHIO_entry_c {
     daYkgr_HIO_c();
-    /* 805A8D98 */ virtual ~daYkgr_HIO_c() {}
+    virtual ~daYkgr_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -66,14 +66,11 @@ inline dPa_YkgrPcallBack::dPa_YkgrPcallBack() {
     field_0x1c = 1;
 }
 
-/* 805A848C-805A84D4 0000EC 0048+00 1/0 0/0 0/0 .text
- * draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_YkgrPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     GXSetIndTexMtx(GX_ITM_0, field_0x4, field_0x1c);
     GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_A0);
 }
 
-/* 805A84D4-805A85D4 000134 0100+00 2/2 0/0 0/0 .text            setParam__17dPa_YkgrPcallBackFf */
 void dPa_YkgrPcallBack::setParam(f32 param_1) {
     if (param_1 <= -17.0f || param_1 >= 47.0f) return; {
         if (param_1 >= 0.0f) {
@@ -91,10 +88,8 @@ void dPa_YkgrPcallBack::setParam(f32 param_1) {
     }
 }
 
-/* 805A9104-805A912C 000054 0028+00 2/3 0/0 0/0 .bss             l_HIO */
 static daYkgr_HIO_c l_HIO;
 
-/* 805A85D4-805A882C 000234 0258+00 1/1 0/0 0/0 .text            getPosRate__8daYkgr_cFv */
 f32 daYkgr_c::getPosRate() {
     if (m_path == NULL) {
         return 0.0f;
@@ -121,10 +116,8 @@ f32 daYkgr_c::getPosRate() {
     return rate;
 }
 
-/* 805A9138-805A9158 000088 0020+00 2/3 0/0 0/0 .bss             YkgrCB */
 static dPa_YkgrPcallBack YkgrCB;
 
-/* 805A882C-805A8A48 00048C 021C+00 1/0 0/0 0/0 .text            daYkgrCreate__FPv */
 inline int daYkgr_c::_create() {
     int uVar1 = u8((fopAcM_GetParam(this) & 0x00F00000) >> 0x14);
     fopAcM_ct(this, daYkgr_c);
@@ -190,12 +183,10 @@ inline int daYkgr_c::_delete() {
     return 1;
 }
 
-/* 805A8A48-805A8A50 0006A8 0008+00 1/0 0/0 0/0 .text            daYkgrDelete__FPv */
 static int daYkgrDelete(void* i_this) {
     return static_cast<daYkgr_c*>(i_this)->_delete();
 }
 
-/* 805A8A50-805A8BBC 0006B0 016C+00 1/0 0/0 0/0 .text            daYkgrExecute__FPv */
 inline int daYkgr_c::_execute() {
     cLib_addCalc2(&field_0x5a4, m_aim_rate, 0.25f, 0.05f);
     cLib_addCalc2(&m_aim_rate, l_HIO.field_0x1c, 0.25f, 0.05f);
@@ -243,7 +234,6 @@ void daYkgr_c::set_mtx() {
     MTXCopy(mDoMtx_stack_c::get(), field_0x570);
 }
 
-/* 805A8BBC-805A8D90 00081C 01D4+00 1/0 0/0 0/0 .text            daYkgrDraw__FPv */
 inline int daYkgr_c::_draw() {
     bool rv;
     f32 alpha = 255.0f;
@@ -279,12 +269,10 @@ static int daYkgrDraw(void* i_this) {
     return static_cast<daYkgr_c*>(i_this)->_draw();
 }
 
-/* 805A8D90-805A8D98 0009F0 0008+00 1/0 0/0 0/0 .text            daYkgrIsDelete__FPv */
 static int daYkgrIsDelete(void* param_0) {
     return 1;
 }
 
-/* 805A9020-805A9040 -00001 0020+00 1/0 0/0 0/0 .data            daYkgrMethodTable */
 static actor_method_class daYkgrMethodTable = {
     daYkgrCreate,
     daYkgrDelete,
diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc
index 4389ef19a5..f798a78a3e 100644
--- a/src/d/actor/d_flower.inc
+++ b/src/d/actor/d_flower.inc
@@ -5,12 +5,10 @@
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80524BD8-805253D8 001A00 0800+00 0/1 0/0 0/0 .data            l_J_Ohana00_64TEX */
 const u16 l_J_Ohana00_64TEX__width = 63;
 const u16 l_J_Ohana00_64TEX__height = 63;
 #include "assets/l_J_Ohana00_64TEX.h"
 
-/* 805253D8-8052569C 002200 02C4+00 0/1 0/0 0/0 .data            l_flowerPos */
 static u8 l_flowerPos[708] = {
     0xC0, 0x8C, 0x2C, 0xF7, 0x42, 0x05, 0xBC, 0xDF, 0xC1, 0xA1, 0x00, 0x70, 0xBF, 0x50, 0x51, 0xB9,
     0x42, 0x12, 0x58, 0xAD, 0xC0, 0xDE, 0xCE, 0x40, 0xC1, 0x04, 0x67, 0x23, 0x41, 0xE5, 0x87, 0x25,
@@ -59,7 +57,6 @@ static u8 l_flowerPos[708] = {
     0xC0, 0xE9, 0x27, 0x8D,
 };
 
-/* 8052569C-80525750 0024C4 00B4+00 0/1 0/0 0/0 .data            l_flowerNormal */
 static u8 l_flowerNormal[180] = {
     0x3C, 0x8D, 0x2C, 0x38, 0x3F, 0x7F, 0xF5, 0xF9, 0x3B, 0x46, 0xF7, 0xA1, 0x3C, 0x76, 0x83,
     0x7F, 0x3F, 0x7F, 0xF5, 0xF9, 0x3C, 0x12, 0x5F, 0xE9, 0xBB, 0xE5, 0xA3, 0x5D, 0x3F, 0x7F,
@@ -75,12 +72,10 @@ static u8 l_flowerNormal[180] = {
     0x46, 0x54, 0x0D, 0x3C, 0x4B, 0xEE, 0x80, 0x3F, 0x7F, 0xF5, 0xF9, 0x3C, 0x49, 0x81, 0xBF,
 };
 
-/* 80525750-80525758 002578 0008+00 0/1 0/0 0/0 .data            l_flowerColor */
 static u8 l_flowerColor[8] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0xB2, 0xB2, 0xFF,
 };
 
-/* 80525758-80525898 002580 0138+08 0/1 0/0 0/0 .data            l_flowerTexCoord */
 static u8 l_flowerTexCoord[] = {
     0x40, 0x40, 0xD0, 0xEA, 0x3D, 0x69, 0x70, 0x72, 0x40, 0x7D, 0xD8, 0x30, 0x3F, 0x81, 0x3D, 0xC9,
     0x40, 0x40, 0xCE, 0x85, 0x3F, 0x81, 0x3D, 0xC9, 0x40, 0x01, 0xDD, 0x33, 0x3F, 0x81, 0x3D, 0xC9,
@@ -103,26 +98,20 @@ static u8 l_flowerTexCoord[] = {
     0x3E, 0xA7, 0x67, 0x4D, 0x3C, 0x14, 0x46, 0x74, 0x3E, 0xA7, 0x73, 0xE2, 0xBC, 0x2F, 0x46, 0xAA,
     0x3E, 0xA7, 0x72, 0xD6, 0xBD, 0x2F, 0x46, 0xAA};
 
-/* 80525898-805259F8 0026C0 0150+10 0/1 0/0 0/0 .data            l_J_hana00DL */
 #include "assets/l_J_hana00DL.h"
 
-/* 805259F8-80525AD8 002820 00DE+02 0/1 0/0 0/0 .data            l_J_hana00_cDL */
 #include "assets/l_J_hana00_cDL.h"
 
-/* 80525AD8-80525B78 002900 0099+07 0/2 0/0 0/0 .data            l_matDL */
 #include "assets/l_matDL__d_a_grass.h"
 l_matDL__d_a_grass(l_J_Ohana00_64TEX)
 
-/* 80525B78-80525C18 0029A0 0099+07 0/2 0/0 0/0 .data            l_matLight4DL */
 #include "assets/l_matLight4DL.h"
 l_matLight4DL(l_J_Ohana00_64TEX)
 
-/* 80525C18-80526C18 002A40 1000+00 0/1 0/0 0/0 .data            l_J_Ohana01_64128_0419TEX */
 const u16 l_J_Ohana01_64128_0419TEX__width = 63;
 const u16 l_J_Ohana01_64128_0419TEX__height = 127;
 #include "assets/l_J_Ohana01_64128_0419TEX.h"
 
-/* 80526C18-805270E0 003A40 04C8+00 0/1 0/0 0/0 .data            l_flowerPos2 */
 static u8 l_flowerPos2[1224] = {
     0x40, 0x25, 0x9F, 0x34, 0x42, 0xC2, 0x95, 0x72, 0xC1, 0x22, 0x34, 0x78, 0x41, 0x4D, 0xF9, 0x63,
     0x43, 0x09, 0x35, 0x0D, 0x40, 0x97, 0xD7, 0x54, 0x41, 0x76, 0x80, 0x55, 0x42, 0xBA, 0x1C, 0xB4,
@@ -203,7 +192,6 @@ static u8 l_flowerPos2[1224] = {
     0xC1, 0x1E, 0x5D, 0x2D, 0xBF, 0xA4, 0x4D, 0x4D,
 };
 
-/* 805270E0-80527200 003F08 0120+00 0/1 0/0 0/0 .data            l_flowerNormal2 */
 static u8 l_flowerNormal2[288] = {
     0xBB, 0xC4, 0x93, 0x42, 0x3F, 0x7F, 0xF6, 0x6F, 0xBC, 0x83, 0x0E, 0x3D, 0x3C, 0x83, 0x0C, 0x24,
     0x3F, 0x7F, 0xF5, 0x84, 0x3C, 0x03, 0x0E, 0x3D, 0xB8, 0x51, 0xB7, 0x17, 0x3F, 0x7F, 0xF5, 0xF9,
@@ -225,12 +213,10 @@ static u8 l_flowerNormal2[288] = {
     0x3B, 0x76, 0x7B, 0x1C, 0x3B, 0x99, 0x6B, 0x76, 0x3F, 0x7F, 0xF5, 0xF9, 0xBC, 0x8A, 0x1D, 0xFC,
 };
 
-/* 80527200-80527208 004028 0008+00 0/1 0/0 0/0 .data            l_flowerColor2 */
 static u8 l_flowerColor2[8] = {
     0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xB2, 0xFF,
 };
 
-/* 80527208-80527338 004030 0120+10 0/1 0/0 0/0 .data            l_flowerTexCoord2 */
 static u8 l_flowerTexCoord2[] = {
     0x3F, 0xF3, 0x6D, 0x11, 0x3F, 0x72, 0x0B, 0xA2, 0x3F, 0x80, 0x00, 0x00, 0x3C, 0xAB, 0xDC, 0x27,
     0x3D, 0xC9, 0x2E, 0xE8, 0x3F, 0x72, 0x0B, 0xA2, 0x40, 0x2B, 0x93, 0x9A, 0x3F, 0x81, 0x7B, 0x96,
@@ -251,24 +237,18 @@ static u8 l_flowerTexCoord2[] = {
     0x40, 0x1B, 0x7D, 0x52, 0x3F, 0x97, 0xF6, 0xBA, 0x40, 0x04, 0x26, 0x74, 0x3F, 0x80, 0x3F, 0x79,
     0x40, 0x1B, 0x7D, 0x52, 0x3F, 0x80, 0x3F, 0x79, 0x40, 0x1B, 0x7D, 0x52, 0x3F, 0x51, 0x10, 0x6F};
 
-/* 80527338-80527478 004160 0138+08 0/1 0/0 0/0 .data            l_J_hana01DL */
 #include "assets/l_J_hana01DL.h"
 
-/* 80527478-80527558 0042A0 00DE+02 0/0 0/0 0/0 .data            l_J_hana01_c_00DL */
 #include "assets/l_J_hana01_c_00DL.h"
 
-/* 80527558-80527698 004380 0128+18 0/1 0/0 0/0 .data            l_J_hana01_c_01DL */
 #include "assets/l_J_hana01_c_01DL.h"
 
-/* 80527698-80527738 0044C0 0099+07 0/2 0/0 0/0 .data            l_mat2DL */
 #include "assets/l_mat2DL__d_a_grass.h"
 l_mat2DL__d_a_grass(l_J_Ohana01_64128_0419TEX)
 
-/* 80527738-805277D4 004560 0099+03 0/2 0/0 0/0 .data            l_mat2Light4DL */
 #include "assets/l_mat2Light4DL.h"
 l_mat2Light4DL(l_J_Ohana01_64128_0419TEX)
 
-/* 80520988-80520AD8 004D28 0150+00 1/1 0/0 0/0 .text WorkCo__14dFlower_data_cFP10fopAc_ac_cUli */
 void dFlower_data_c::WorkCo(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo) {
     cXyz sp8;
     sp8.x = m_pos.x - i_hitActor->current.pos.x;
@@ -299,7 +279,6 @@ void dFlower_data_c::WorkCo(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo)
     }
 }
 
-/* 80520AD8-80520B34 004E78 005C+00 4/4 0/0 0/0 .text            deleteAnm__14dFlower_data_cFv */
 void dFlower_data_c::deleteAnm() {
     if (field_0x01 >= 8) {
         daGrass_c::getFlower()->deleteAnm(field_0x01);
@@ -308,8 +287,6 @@ void dFlower_data_c::deleteAnm() {
     }
 }
 
-/* 80520B34-80520CFC 004ED4 01C8+00 1/1 0/0 0/0 .text
- * WorkAt_NoCutAnim__14dFlower_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj */
 void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo,
                                       dCcMassS_HitInf* i_hitinf, cCcD_Obj* i_hitobj) {
     dCcD_GObjInf* var_r26 = dCcD_GetGObjInf(i_hitobj);
@@ -344,11 +321,8 @@ void dFlower_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int
     var_r29->m_angX = cM_atan2s(temp_f31, 220.0f);
 }
 
-/* 805284E8-805284EC 000C20 0004+00 1/2 0/0 0/0 .bss             None */
 static bool data_805284E8;
 
-/* 80520CFC-80521A3C 00509C 0D40+00 1/1 0/0 0/0 .text
- * WorkAt__14dFlower_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInf  */
 void dFlower_data_c::WorkAt(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo, dCcMassS_HitInf* i_hitinf) {
     cCcD_Obj* hitobj_p = i_hitinf->GetAtHitObj();
 
@@ -467,7 +441,6 @@ void dFlower_data_c::WorkAt(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo,
     }
 }
 
-/* 80521A3C-80521BF8 005DDC 01BC+00 1/1 0/0 0/0 .text hitCheck__14dFlower_data_cFP10fopAc_ac_ci */
 void dFlower_data_c::hitCheck(fopAc_ac_c* i_hitActor, int i_roomNo) {
     dCcMassS_HitInf hitinf;
 
@@ -504,14 +477,11 @@ void dFlower_data_c::hitCheck(fopAc_ac_c* i_hitActor, int i_roomNo) {
     }
 }
 
-/* 80521BF8-80521C08 005F98 0010+00 1/1 0/0 0/0 .text newData__14dFlower_room_cFP14dFlower_data_c
- */
 void dFlower_room_c::newData(dFlower_data_c* i_data) {
     i_data->mp_next = mp_data;
     mp_data = i_data;
 }
 
-/* 80521C08-80521C64 005FA8 005C+00 1/1 0/0 0/0 .text            deleteData__14dFlower_room_cFv */
 void dFlower_room_c::deleteData() {
     while (mp_data != NULL) {
         mp_data->deleteAnm();
@@ -520,7 +490,6 @@ void dFlower_room_c::deleteData() {
     }
 }
 
-/* 80521C64-80521DAC 006004 0148+00 1/1 0/0 0/0 .text            __ct__16dFlower_packet_cFv */
 dFlower_packet_c::dFlower_packet_c() {
     dFlower_data_c* data_p = m_data;
     for (int i = 0; i < 1000; i++) {
@@ -543,7 +512,6 @@ dFlower_packet_c::dFlower_packet_c() {
     m_deleteRoom = &dFlower_packet_c::deleteRoom;
 }
 
-/* 80521DAC-80522774 00614C 09C8+00 2/0 0/0 0/0 .text            draw__16dFlower_packet_cFv */
 void dFlower_packet_c::draw() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     j3dSys.reinitGX();
@@ -809,7 +777,6 @@ void dFlower_packet_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 80522774-8052299C 006B14 0228+00 1/1 0/0 0/0 .text            calc__16dFlower_packet_cFv */
 void dFlower_packet_c::calc() {
     dFlower_anm_c* anm_p = getAnm();
 
@@ -854,7 +821,6 @@ void dFlower_packet_c::calc() {
     }
 }
 
-/* 8052299C-80522A64 006D3C 00C8+00 2/2 0/0 0/0 .text            flowerCheckGroundY__FR4cXyz */
 static f32 flowerCheckGroundY(cXyz& param_0) {
     dBgS_GndChk sp8;
     param_0.y += 50.0f;
@@ -871,7 +837,6 @@ static f32 flowerCheckGroundY(cXyz& param_0) {
     }
 }
 
-/* 80522A64-80522CBC 006E04 0258+00 1/1 0/0 0/0 .text            update__16dFlower_packet_cFv */
 void dFlower_packet_c::update() {
     dFlower_anm_c* var_r29 = getAnm();
 
@@ -926,8 +891,6 @@ void dFlower_packet_c::update() {
     dComIfGd_getListPacket()->entryImm(this, 0);
 }
 
-/* 80522CBC-80522E28 00705C 016C+00 1/1 0/0 0/0 .text
- * setData__16dFlower_packet_cFP14dFlower_data_ciScR4cXyziScs   */
 void dFlower_packet_c::setData(dFlower_data_c* i_data, int i_dataNo, s8 param_2, cXyz& i_pos,
                                int i_roomNo, s8 i_tableNo, s16 i_addCol) {
     f32 y_pos;
@@ -967,7 +930,6 @@ void dFlower_packet_c::setData(dFlower_data_c* i_data, int i_dataNo, s8 param_2,
     m_dataNum = i_dataNo;
 }
 
-/* 80522E28-80522F0C 0071C8 00E4+00 1/1 0/0 0/0 .text newData__16dFlower_packet_cFScR4cXyziScs */
 dFlower_data_c* dFlower_packet_c::newData(s8 param_0, cXyz& i_pos, int i_roomNo, s8 i_tableNo,
                                           s16 i_addCol) {
     dFlower_data_c* data_p = m_data + m_dataNum;
@@ -992,12 +954,10 @@ dFlower_data_c* dFlower_packet_c::newData(s8 param_0, cXyz& i_pos, int i_roomNo,
     return NULL;
 }
 
-/* 80522F0C-80522F40 0072AC 0034+00 1/0 0/0 0/0 .text            deleteRoom__16dFlower_packet_cFi */
 void dFlower_packet_c::deleteRoom(int i_roomNo) {
     m_room[i_roomNo].deleteData();
 }
 
-/* 80522F40-80522F8C 0072E0 004C+00 2/2 0/0 0/0 .text            newAnm__16dFlower_packet_cFv */
 int dFlower_packet_c::newAnm() {
     dFlower_anm_c* anm_p = m_anm + 8;
     for (int i = 8; i < 72; i++) {
@@ -1014,7 +974,6 @@ int dFlower_packet_c::newAnm() {
     return -1;
 }
 
-/* 80522F8C-80522FB4 00732C 0028+00 1/1 0/0 0/0 .text            setAnm__16dFlower_packet_cFis */
 void dFlower_packet_c::setAnm(int i_idx, s16 i_angY) {
     dFlower_anm_c* anm_p = m_anm + i_idx;
 
@@ -1023,20 +982,16 @@ void dFlower_packet_c::setAnm(int i_idx, s16 i_angY) {
     anm_p->m_angX = 0;
 }
 
-/* 80522FB4-80522FC0 007354 000C+00 1/1 0/0 0/0 .text            __ct__14dFlower_room_cFv */
 dFlower_room_c::dFlower_room_c() {
     mp_data = NULL;
 }
 
-/* 80522FC0-80522FCC 007360 000C+00 1/1 0/0 0/0 .text            __ct__13dFlower_anm_cFv */
 dFlower_anm_c::dFlower_anm_c() {
     m_state = 0;
 }
 
-/* 80522FCC-80523008 00736C 003C+00 2/2 0/0 0/0 .text            __dt__14dFlower_data_cFv */
 dFlower_data_c::~dFlower_data_c() {}
 
-/* 80523008-80523014 0073A8 000C+00 1/1 0/0 0/0 .text            __ct__14dFlower_data_cFv */
 dFlower_data_c::dFlower_data_c() {
     m_state = 0;
 }
diff --git a/src/d/actor/d_grass.inc b/src/d/actor/d_grass.inc
index 588f95cd03..e5f470b74a 100644
--- a/src/d/actor/d_grass.inc
+++ b/src/d/actor/d_grass.inc
@@ -10,17 +10,14 @@
 #include "d/d_camera.h"
 #include "f_op/f_op_camera_mng.h"
 
-/* 805231F8-805239F8 000020 0800+00 0/1 0/0 0/0 .data            l_M_kusa05_RGBATEX */
 const u16 l_M_Hijiki00TEX__width = 31;
 const u16 l_M_Hijiki00TEX__height = 31;
 #include "assets/l_M_kusa05_RGBATEX.h"  // ALIGN 32
 
-/* 805239F8-805241F8 000820 0800+00 0/1 0/0 0/0 .data            l_M_Hijiki00TEX */
 const u16 l_M_kusa05_RGBATEX__width = 31;
 const u16 l_M_kusa05_RGBATEX__height = 31;
 #include "assets/l_M_Hijiki00TEX.h"  // ALIGN 32
 
-/* 805241F8-805245B8 001020 03C0+00 0/1 0/0 0/0 .data            l_pos */
 static u8 l_pos[960] = {
     0x3F, 0x4A, 0x56, 0xEF, 0xC2, 0x20, 0x00, 0x00, 0x41, 0xFB, 0x17, 0xE4, 0x41, 0xAA, 0xBB, 0xEA,
     0xC2, 0x20, 0x00, 0x00, 0xC1, 0xB7, 0x03, 0x7A, 0x42, 0x55, 0x8D, 0x6F, 0x43, 0x13, 0x16, 0x3F,
@@ -84,16 +81,13 @@ static u8 l_pos[960] = {
     0x40, 0xD8, 0x8F, 0xF3, 0xC1, 0xDC, 0xC3, 0xBB, 0x42, 0x96, 0x89, 0xEC, 0xC1, 0xAA, 0x6C, 0x09,
 };
 
-/* 805245B8-805245C4 0013E0 000C+00 0/1 0/0 0/0 .data            l_normal */
 static Vec l_normal = {0.0f, 1.0f, 0.0f};
 
-/* 805245C4-805245D8 0013EC 0014+00 0/1 0/0 0/0 .data            l_color */
 static GXColor l_color[] = {
     {0xFF, 0xFF, 0xFF, 0x00}, {0xFF, 0xFF, 0xFF, 0x80}, {0xFF, 0xFF, 0xFF, 0x79},
     {0xFF, 0xFF, 0xFF, 0x73}, {0xFF, 0xFF, 0xFF, 0xFF},
 };
 
-/* 805245D8-80524678 001400 00A0+00 0/1 0/0 0/0 .data            l_texCoord */
 static u8 l_texCoord[160] = {
     0x3F, 0x86, 0xF6, 0x27, 0x3F, 0x9C, 0x00, 0x00, 0x40, 0x03, 0x7B, 0x14, 0x3F, 0x9C, 0x00, 0x00,
     0x40, 0x03, 0x7B, 0x14, 0x3D, 0x00, 0x00, 0x00, 0x3F, 0x86, 0xF6, 0x27, 0x3D, 0x00, 0x00, 0x00,
@@ -107,29 +101,22 @@ static u8 l_texCoord[160] = {
     0x3F, 0x94, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0xBD, 0xC0, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00,
 };
 
-/* 80524678-80524758 0014A0 00CB+15 0/1 0/0 0/0 .data            l_M_Kusa_9qDL */
 #include "assets/l_M_Kusa_9qDL.h"
 
-/* 80524758-80524838 001580 00CB+15 0/1 0/0 0/0 .data            l_M_Kusa_9q_cDL */
 #include "assets/l_M_Kusa_9q_cDL.h"
 
-/* 80524838-80524918 001660 00D4+0C 0/1 0/0 0/0 .data            l_M_TenGusaDL */
 #include "assets/l_M_TenGusaDL.h"
 
-/* 80524918-805249D8 001740 00A8+18 0/2 0/0 0/0 .data            l_Tengusa_matDL */
 #include "assets/l_Tengusa_matDL.h"
 
 l_Tengusa_matDL(l_M_Hijiki00TEX)
 
-/* 805249D8-80524A98 001800 00A8+18 0/2 0/0 0/0 .data            l_kusa9q_matDL */
 #include "assets/l_kusa9q_matDL.h"
 l_kusa9q_matDL(l_M_kusa05_RGBATEX)
 
-/* 80524A98-80524B40 0018C0 00A8+00 0/2 0/0 0/0 .data            l_kusa9q_l4_matDL */
 #include "assets/l_kusa9q_l4_matDL.h"
 l_kusa9q_l4_matDL(l_M_kusa05_RGBATEX)
 
-/* 8051D88C-8051DA20 001C2C 0194+00 1/1 0/0 0/0 .text WorkCo__13dGrass_data_cFP10fopAc_ac_cUli */
 void dGrass_data_c::WorkCo(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo) {
     cXyz sp18;
 
@@ -169,8 +156,6 @@ void dGrass_data_c::WorkCo(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo)
     }
 }
 
-/* 8051DA20-8051DF54 001DC0 0534+00 1/1 0/0 0/0 .text
- * WorkAt_NoCutAnim__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_Obj */
 void dGrass_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo, dCcMassS_HitInf* i_hitinf, cCcD_Obj* i_hitObj) {
     cXyz spC;
     dCcD_GObjInf* gobj_p = dCcD_GetGObjInf(i_hitObj);
@@ -245,8 +230,6 @@ void dGrass_data_c::WorkAt_NoCutAnim(fopAc_ac_c* i_hitActor, u32 i_massFlg, int
     anm_p->m_state = 2;
 }
 
-/* 8051DF54-8051E1C8 0022F4 0274+00 1/1 0/0 0/0 .text
- * Direction_Set__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfP8cCcD_ObjP5csXyz */
 void dGrass_data_c::Direction_Set(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo,
                                   dCcMassS_HitInf* i_hitinf, cCcD_Obj* i_hitObj, csXyz* i_rotation) {
     cXyz sp8;
@@ -292,8 +275,6 @@ void dGrass_data_c::Direction_Set(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_r
 
 static u8 data_8052790d;
 
-/* 8051E1C8-8051EB4C 002568 0984+00 1/1 0/0 0/0 .text
- * WorkAt__13dGrass_data_cFP10fopAc_ac_cUliP15dCcMassS_HitInfUs */
 void dGrass_data_c::WorkAt(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo, dCcMassS_HitInf* i_hitinf,
                            u16 i_particleID) {
     cCcD_Obj* hit_obj = i_hitinf->GetAtHitObj();
@@ -386,7 +367,6 @@ void dGrass_data_c::WorkAt(fopAc_ac_c* i_hitActor, u32 i_massFlg, int i_roomNo,
     }
 }
 
-/* 8051EB88-8051ED98 002F28 0210+00 1/1 0/0 0/0 .text            hitCheck__13dGrass_data_cFiUs */
 void dGrass_data_c::hitCheck(int i_roomNo, u16 i_particleName) {
     dCcMassS_HitInf hitinf;
     fopAc_ac_c* hit_actor;
@@ -424,13 +404,11 @@ void dGrass_data_c::hitCheck(int i_roomNo, u16 i_particleName) {
     }
 }
 
-/* 8051EDE0-8051EDF0 003180 0010+00 1/1 0/0 0/0 .text newData__13dGrass_room_cFP13dGrass_data_c */
 void dGrass_room_c::newData(dGrass_data_c* i_data) {
     i_data->mp_next = mp_data;
     mp_data = i_data;
 }
 
-/* 8051EDF0-8051EE8C 003190 009C+00 1/1 0/0 0/0 .text            deleteData__13dGrass_room_cFv */
 void dGrass_room_c::deleteData() {
     while (mp_data != NULL) {
         mp_data->m_state = 0;
@@ -445,7 +423,6 @@ void dGrass_room_c::deleteData() {
     }
 }
 
-/* 8051EE8C-8051F03C 00322C 01B0+00 1/1 0/0 0/0 .text            __ct__15dGrass_packet_cFv */
 dGrass_packet_c::dGrass_packet_c() {
     dGrass_data_c* data_p = m_data;
     for (int i = 0; i < 1500; i++) {
@@ -486,7 +463,6 @@ dGrass_packet_c::dGrass_packet_c() {
     m_deleteRoom = &dGrass_packet_c::deleteRoom;
 }
 
-/* 8051F03C-8051FABC 0033DC 0A80+00 1/0 0/0 0/0 .text            draw__15dGrass_packet_cFv */
 void dGrass_packet_c::draw() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     cXyz spB4;
@@ -772,7 +748,6 @@ void dGrass_packet_c::draw() {
     J3DShape::resetVcdVatCache();
 }
 
-/* 8051FABC-8051FF88 003E5C 04CC+00 1/1 0/0 0/0 .text            calc__15dGrass_packet_cFv */
 void dGrass_packet_c::calc() {
     cXyz* temp_r29 = dKyw_get_wind_vec();
     f32 var_f31 = dKyw_get_wind_pow() * dKyw_get_wind_pow();
@@ -856,7 +831,6 @@ void dGrass_packet_c::calc() {
     }
 }
 
-/* 8051FF88-80520030 004328 00A8+00 2/3 0/0 0/1 .text            checkGroundY__FR4cXyz */
 static f32 checkGroundY(cXyz& param_0) {
     dBgS_GndChk sp8;
     param_0.y += 50.0f;
@@ -875,7 +849,6 @@ static f32 checkGroundY(cXyz& param_0) {
     return temp_f31;
 }
 
-/* 80520030-8052067C 0043D0 064C+00 1/1 0/0 0/0 .text            update__15dGrass_packet_cFv */
 void dGrass_packet_c::update() {
     static s16 mAngleZ[1500];
 
@@ -991,8 +964,6 @@ void dGrass_packet_c::update() {
     dComIfGd_getListPacket()->entryImm(this, 0);
 }
 
-/* 8052067C-80520770 004A1C 00F4+00 1/1 0/0 0/0 .text
- * setData__15dGrass_packet_cFP13dGrass_data_ciR4cXyziUcUcsUc   */
 void dGrass_packet_c::setData(dGrass_data_c* i_data, int i_dataNo, cXyz& i_pos, int i_roomNo,
                               u8 i_tableNo, u8 i_itemBitNo, s16 i_addCol, u8 param_7) {
     f32 y_pos;
@@ -1016,7 +987,6 @@ void dGrass_packet_c::setData(dGrass_data_c* i_data, int i_dataNo, cXyz& i_pos,
     m_dataNum = i_dataNo;
 }
 
-/* 80520770-80520864 004B10 00F4+00 1/1 0/0 0/0 .text newData__15dGrass_packet_cFR4cXyziUcUcsUc */
 dGrass_data_c* dGrass_packet_c::newData(cXyz& i_pos, int i_roomNo, u8 i_tableNo, u8 i_itemBitNo,
                                         s16 i_addCol, u8 param_5) {
     dGrass_data_c* data_p = m_data + m_dataNum;
@@ -1041,12 +1011,10 @@ dGrass_data_c* dGrass_packet_c::newData(cXyz& i_pos, int i_roomNo, u8 i_tableNo,
     return NULL;
 }
 
-/* 80520864-80520898 004C04 0034+00 1/0 0/0 0/0 .text            deleteRoom__15dGrass_packet_cFi */
 void dGrass_packet_c::deleteRoom(int i_roomNo) {
     m_room[i_roomNo].deleteData();
 }
 
-/* 80520898-805208E4 004C38 004C+00 2/2 0/0 0/0 .text            newAnm__15dGrass_packet_cFv */
 int dGrass_packet_c::newAnm() {
     dGrass_anm_c* anm_p = m_anm + 16;
     for (int i = 16; i < 112; i++) {
@@ -1063,7 +1031,6 @@ int dGrass_packet_c::newAnm() {
     return -1;
 }
 
-/* 805208E4-8052090C 004C84 0028+00 1/1 0/0 0/0 .text            setAnm__15dGrass_packet_cFis */
 void dGrass_packet_c::setAnm(int i_idx, s16) {
     dGrass_anm_c* anm_p = m_anm + i_idx;
 
diff --git a/src/d/d_a_horse_static.cpp b/src/d/d_a_horse_static.cpp
index 890a801669..b8bd910123 100644
--- a/src/d/d_a_horse_static.cpp
+++ b/src/d/d_a_horse_static.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/actor/d_a_horse_static
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_a_horse_static.h"
diff --git a/src/d/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp
index 876460634b..1fc19bef87 100644
--- a/src/d/d_a_itembase_static.cpp
+++ b/src/d/d_a_itembase_static.cpp
@@ -42,8 +42,6 @@ bool daItemBase_c::chkDead() {
     return cLib_checkBit<u8>(field_0x92b, 2);
 }
 
-/* 80037B0C-80037B78 03244C 006C+00 0/0 0/0 1/1 .text            CheckItemCreateHeap__FP10fopAc_ac_c
- */
 int CheckItemCreateHeap(fopAc_ac_c* i_this) {
     daItemBase_c* a_this = static_cast<daItemBase_c*>(i_this);
 
@@ -54,7 +52,6 @@ int CheckItemCreateHeap(fopAc_ac_c* i_this) {
                                   dItem_data::getBrkName(item_no), dItem_data::getBtpName(item_no));
 }
 
-/* 80037B78-80037BE0 0324B8 0068+00 0/0 1/1 7/7 .text CheckFieldItemCreateHeap__FP10fopAc_ac_c */
 int CheckFieldItemCreateHeap(fopAc_ac_c* i_this) {
     daItemBase_c* a_this = static_cast<daItemBase_c*>(i_this);
 
@@ -66,7 +63,6 @@ int CheckFieldItemCreateHeap(fopAc_ac_c* i_this) {
         dItem_data::getItemBrkName(item_no), dItem_data::getItemBtpName(item_no));
 }
 
-/* 803792B0-803792E8 005910 0038+00 0/0 1/1 0/0 .rodata          m_data__12daItemBase_c */
 const daItemBase_data daItemBase_c::m_data = {
     -4.5f,  // mGravity
     0.62f,  // mGroundReflect
diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp
index 2f661e697f..9f2efe0894 100644
--- a/src/d/d_a_obj.cpp
+++ b/src/d/d_a_obj.cpp
@@ -13,8 +13,6 @@
 
 namespace daObj {
 
-/* 80037038-80037180 031978 0148+00 4/4 0/0 0/0 .text eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi
- */
 void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) {
     J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20);
     J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42);
@@ -30,47 +28,35 @@ void eff_break_tsubo(fopAc_ac_c* i_actor, cXyz i_scale, int i_type) {
                           fopAcM_GetRoomNo(i_actor), NULL, NULL, &i_scale);
 }
 
-/* 80037180-80037210 031AC0 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo__5daObjFP10fopAc_ac_c
- */
 void make_eff_break_kotubo(fopAc_ac_c* i_actor) {
     static cXyz scale(1.0f, 1.0f, 1.0f);
 
     eff_break_tsubo(i_actor, scale, 0);
 }
 
-/* 80037210-800372A0 031B50 0090+00 0/0 0/0 2/2 .text make_eff_break_kotubo2__5daObjFP10fopAc_ac_c
- */
 void make_eff_break_kotubo2(fopAc_ac_c* i_actor) {
     static cXyz scale(1.0f, 1.0f, 1.0f);
 
     eff_break_tsubo(i_actor, scale, 1);
 }
 
-/* 800372A0-80037330 031BE0 0090+00 0/0 0/0 1/1 .text
- * make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c               */
 void make_eff_break_gm_kotubo(fopAc_ac_c* i_actor) {
     static cXyz scale(1.0f, 1.0f, 1.0f);
 
     eff_break_tsubo(i_actor, scale, 3);
 }
 
-/* 80037330-800373C0 031C70 0090+00 0/0 0/0 1/1 .text
- * make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c               */
 void make_eff_break_gm_ootubo(fopAc_ac_c* i_actor) {
     static cXyz scale(2.0f, 2.0f, 2.0f);
 
     eff_break_tsubo(i_actor, scale, 4);
 }
 
-/* 800373C0-800373F0 031D00 0030+00 0/0 0/0 4/4 .text
- * posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff        */
 void posMoveF_stream(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* param_2, f32 param_3,
                      f32 param_4) {
     posMoveF_grade(i_actor, param_1, param_2, param_3, param_4, NULL, 0.0f, 0.0f, NULL);
 }
 
-/* 800373F0-800374EC 031D30 00FC+00 1/1 0/0 0/0 .text
- * posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff */
 
 namespace {
 void posMoveF_resist_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* stream_spd, f32 param_3,
@@ -116,8 +102,6 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_
 }
 }  // namespace
 
-/* 80037620-80037788 031F60 0168+00 1/1 0/0 0/0 .text
- * posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz */
 void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream_spd, f32 param_3,
                     f32 param_4, cXyz const* param_5, f32 friction, f32 no_grade_cos,
                     cXyz const* param_8) {
@@ -156,8 +140,6 @@ void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream
     fopAcM_posMove(i_actor, param_1);
 }
 
-/* 80037788-80037900 0320C8 0178+00 0/0 0/0 1/1 .text quat_rotBaseY__5daObjFP10QuaternionRC4cXyz
- */
 void quat_rotBaseY(Quaternion* quat, cXyz const& param_1) {
     static const Quaternion zero_quat = {0.0f, 0.0f, 0.0f, 1.0f};
 
@@ -179,8 +161,6 @@ void quat_rotBaseY(Quaternion* quat, cXyz const& param_1) {
     }
 }
 
-/* 80037900-80037A4C 032240 014C+00 0/0 0/0 3/3 .text
- * HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl                */
 void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj, u32 param_3) {
     int hit_se = const_cast<dCcD_GObjInf*>(i_CcObj)->GetTgHitObjSe();
     fopAc_ac_c* hit_actor = const_cast<dCcD_GObjInf*>(i_CcObj)->GetTgHitAc();
diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp
index b09660a5d0..a10a053e28 100644
--- a/src/d/d_a_shop_item_static.cpp
+++ b/src/d/d_a_shop_item_static.cpp
@@ -7,17 +7,14 @@
 
 #include "d/d_a_shop_item_static.h"
 
-/* 80037C14-80037C1C 032554 0008+00 0/0 1/1 0/0 .text            getRotateP__12daShopItem_cFv */
 csXyz* daShopItem_c::getRotateP() {
     return &current.angle;
 }
 
-/* 80037C1C-80037C24 03255C 0008+00 0/0 2/2 0/0 .text            getPosP__12daShopItem_cFv */
 cXyz* daShopItem_c::getPosP() {
     return &current.pos;
 }
 
-/* 803792E8-80379738 -00001 0450+00 1/1 0/0 9/9 .rodata          mData__12daShopItem_c */
 ResourceData const daShopItem_c::mData[23] = {
     {"B_mD_sold", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0x8000, 0}, 0, 0, 0, 0, -1, -1},
     {"B_mD_oil", 3, -1, -1, -1, -1, -1, -1, 0.0f, 1.0f, 0, {0, 0, 0}, 0, 0, 0, 0, -1, -1},
@@ -44,7 +41,6 @@ ResourceData const daShopItem_c::mData[23] = {
     {"O_mD_bott", 6, 12, -1, -1, -1, 9, 15, 0.0f, 1.0f, 0, {0, 0, 0}, 4, 0, 0, 0, 12, 0},
 };
 
-/* 80037C24-80037C7C 032564 0058+00 0/0 0/0 1/1 .text CheckShopItemCreateHeap__FP10fopAc_ac_c */
 int CheckShopItemCreateHeap(fopAc_ac_c* i_this) {
     daShopItem_c* a_this = static_cast<daShopItem_c*>(i_this);
 
diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp
index 4116135965..d2b9ac2b1b 100644
--- a/src/d/d_att_dist.cpp
+++ b/src/d/d_att_dist.cpp
@@ -3,7 +3,6 @@
 #include "d/d_att_dist.h"
 #include "d/d_attention.h"
 
-/* 803A9C70-803AB608 006D90 1998+00 0/0 5/5 13/13 .data            dist_table__12dAttention_c */
 dist_entry dAttention_c::dist_table[234] = {
     {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0},
     {250.0f, 375.0f, 500.0f, 400.0f, -400.0f, 0.5f, 0},
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index 61cc3bac2a..bfc7628675 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -16,8 +16,8 @@
 
 class dAttDrawParam_c : public JORReflexible {
 public:
-    /* 80070158 */ dAttDrawParam_c();
-    /* 80073FC4 */ virtual ~dAttDrawParam_c() {}
+    dAttDrawParam_c();
+    virtual ~dAttDrawParam_c() {}
 
     void genMessage(JORMContext*);
 
@@ -26,8 +26,6 @@ public:
     /* 0xC */ f32 field_0xc;
 };
 
-/* 80070018-80070038 06A958 0020+00 2/2 0/0 0/0 .text padLockButton__25@unnamed@d_attention_cpp@Fl
- */
 namespace {
 static bool padLockTrigger(s32 i_padNo) {
     return mDoCPd_c::getTrigL(i_padNo) != 0;
@@ -38,14 +36,12 @@ static bool padLockButton(s32 i_padNo) {
 }
 }  // namespace
 
-/* 803A9BF8-803A9C04 006D18 000C+00 2/2 0/0 0/0 .data            loc_type_tbl__12dAttention_c */
 type_tbl_entry dAttention_c::loc_type_tbl[3] = {
     {fopAc_attn_LOCK_e, fopAc_AttnFlag_LOCK_e},
     {fopAc_attn_TALK_e, fopAc_AttnFlag_TALK_e},
     {fopAc_attn_BATTLE_e, fopAc_AttnFlag_BATTLE_e},
 };
 
-/* 803A9C04-803A9C18 006D24 0014+00 1/1 0/0 0/0 .data            act_type_tbl__12dAttention_c */
 type_tbl_entry dAttention_c::act_type_tbl[5] = {
     {fopAc_attn_SPEAK_e, fopAc_AttnFlag_SPEAK_e},
     {fopAc_attn_CARRY_e, fopAc_AttnFlag_CARRY_e},
@@ -54,10 +50,8 @@ type_tbl_entry dAttention_c::act_type_tbl[5] = {
     {fopAc_attn_ETC_e, fopAc_AttnFlag_ETC_e},
 };
 
-/* 80450F58-80450F60 000458 0008+00 0/0 2/2 0/0 .sbss            None */
 static bool l_isFinalBossStg;
 
-/* 80070038-80070110 06A978 00D8+00 1/1 0/0 0/0 .text            __ct__11dAttParam_cFl */
 dAttParam_c::dAttParam_c(s32) {
     field_0x4 = 45.0f;
     field_0x8 = 30.0f;
@@ -95,7 +89,6 @@ dAttParam_c::dAttParam_c(s32) {
 #endif
 }
 
-/* 80070110-80070158 06AA50 0048+00 2/1 0/0 0/0 .text            __dt__11dAttParam_cFv */
 dAttParam_c::~dAttParam_c() {
 #if DEBUG
     releaseHIO();
@@ -139,7 +132,6 @@ void dAttParam_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 80070158-80070178 06AA98 0020+00 1/1 0/0 0/0 .text            __ct__15dAttDrawParam_cFv */
 dAttDrawParam_c::dAttDrawParam_c() {
     mCursorDistance = 250.0f;
     field_0xc = 2.0f;
@@ -152,8 +144,6 @@ void dAttDrawParam_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 80070178-80070198 06AAB8 0020+00 1/0 0/0 0/0 .text
- * execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo         */
 int dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* transform) {
     if (param_0 == 0) {
         transform->mTranslate.y *= YREG_F(17) + 0.6f;
@@ -162,10 +152,8 @@ int dAttDraw_CallBack_c::execute(u16 param_0, J3DTransformInfo* transform) {
     return 1;
 }
 
-/* 80424B0C-80424B20 05182C 0010+04 3/3 0/0 0/0 .bss             g_AttDwHIO */
 dAttDrawParam_c g_AttDwHIO;
 
-/* 80070198-80070774 06AAD8 05DC+00 0/0 1/1 0/0 .text __ct__12dAttention_cFP10fopAc_ac_cUl */
 dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) {
     mpPlayer = i_player;
     mPadNo = i_padNo;
@@ -268,7 +256,6 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) {
     g_AttDwHIO.field_0x4 = mDoHIO_CREATE_CHILD("注目カーソル", &g_AttDwHIO);
 }
 
-/* 80070774-80070844 06B0B4 00D0+00 0/0 2/2 0/0 .text            __dt__12dAttention_cFv */
 dAttention_c::~dAttention_c() {
     if (heap != NULL) {
         mDoExt_destroySolidHeap(heap);
@@ -278,7 +265,6 @@ dAttention_c::~dAttention_c() {
     mDoHIO_DELETE_CHILD(g_AttDwHIO.field_0x4);
 }
 
-/* 80070844-80070880 06B184 003C+00 2/2 2/2 8/8 .text            GetLockonList__12dAttention_cFl */
 dAttList_c* dAttention_c::GetLockonList(s32 i_no) {
     if (mLockonCount != 0) {
         return &mLockOnList[(mLockOnOffset + i_no) % mLockonCount];
@@ -287,7 +273,6 @@ dAttList_c* dAttention_c::GetLockonList(s32 i_no) {
     return NULL;
 }
 
-/* 80070880-80070974 06B1C0 00F4+00 0/0 5/5 2/2 .text            getActionBtnB__12dAttention_cFv */
 dAttList_c* dAttention_c::getActionBtnB() {
     int i;
     dAttList_c* list = GetLockonList(0);
@@ -318,7 +303,6 @@ dAttList_c* dAttention_c::getActionBtnB() {
     return NULL;
 }
 
-/* 80070974-80070A70 06B2B4 00FC+00 0/0 1/1 0/0 .text            getActionBtnXY__12dAttention_cFv */
 dAttList_c* dAttention_c::getActionBtnXY() {
     int i;
     dAttList_c* list = GetLockonList(0);
@@ -349,10 +333,8 @@ dAttList_c* dAttention_c::getActionBtnXY() {
     return NULL;
 }
 
-/* 80450660-80450664 0000E0 0004+00 2/2 0/0 0/0 .sdata           loc_type_num__12dAttention_c */
 int dAttention_c::loc_type_num = 3;
 
-/* 80070A70-80070AC0 06B3B0 0050+00 1/1 0/0 0/0 .text            chkAttMask__12dAttention_cFUlUl */
 int dAttention_c::chkAttMask(u32 i_type, u32 i_mask) {
     int i;
     for (i = 0; i < loc_type_num; i++) {
@@ -364,7 +346,6 @@ int dAttention_c::chkAttMask(u32 i_type, u32 i_mask) {
     return 1;
 }
 
-/* 80070AC0-80070B2C 06B400 006C+00 2/2 0/0 0/0 .text            check_event_condition__FUlUs */
 static int check_event_condition(u32 i_attnType, u16 i_condition) {
     switch (i_attnType) {
     case fopAc_attn_TALK_e:
@@ -388,21 +369,16 @@ static int check_event_condition(u32 i_attnType, u16 i_condition) {
     return false;
 }
 
-/* 80450664-80450668 0000E4 0004+00 1/1 0/0 0/0 .sdata           act_type_num__12dAttention_c */
 int dAttention_c::act_type_num = 5;
 
-/* 80450668-8045066C 0000E8 0004+00 1/1 0/0 0/0 .sdata           chk_type_tbl__12dAttention_c */
 type_tbl_entry dAttention_c::chk_type_tbl[1] = {
     {fopAc_attn_CHECK_e, fopAc_AttnFlag_CHECK_e},
 };
 
-/* 8045066C-80450670 0000EC 0004+00 1/1 0/0 0/0 .sdata           chk_type_num__12dAttention_c */
 int dAttention_c::chk_type_num = 1;
 
-/* 80450670-80450674 0000F0 0004+00 2/2 0/0 0/0 .sdata           None */
 static bool attn_opt_hold = true;
 
-/* 80070B2C-80070BF4 06B46C 00C8+00 2/2 0/0 0/0 .text            check_flontofplayer__FUlss */
 static int check_flontofplayer(u32 i_checkMask, s16 i_ang1, s16 i_ang2) {
     static int ftp_table[9] = {
         0x4, 0x1, 0x2, 0x8, 0x10, 0x20, 0x40, 0x80, 0x100,
@@ -444,14 +420,12 @@ static int check_flontofplayer(u32 i_checkMask, s16 i_ang1, s16 i_ang2) {
     return false;
 }
 
-/* 80070BF4-80070C40 06B534 004C+00 2/2 0/0 0/0 .text            distace_weight__Ffsf */
 static f32 distace_weight(f32 i_distance, s16 i_angle, f32 i_ratio) {
     f32 var_f31 = i_angle / (f32)0x8000;
     f32 var_f30 = SQUARE(var_f31);
     return i_distance * ((1.0f - i_ratio) + (i_ratio * var_f30));
 }
 
-/* 80070C40-80070CA0 06B580 0060+00 2/2 0/0 0/0 .text            distace_angle_adjust__Ffsf */
 static f32 distace_angle_adjust(f32 i_distAdjust, s16 i_angle, f32 i_ratio) {
     f32 var_f31 = i_angle / (f32)0x8000;
     if (var_f31 < 0.0f) {
@@ -462,8 +436,6 @@ static f32 distace_angle_adjust(f32 i_distAdjust, s16 i_angle, f32 i_ratio) {
     return i_distAdjust * ((1.0f - i_ratio) + (i_ratio * var_f30));
 }
 
-/* 80070CA0-80070E90 06B5E0 01F0+00 3/3 0/0 0/0 .text            check_distace__FP4cXyzsP4cXyzffff
- */
 static BOOL check_distace(cXyz* i_pos, s16 i_angle, cXyz* i_attnPos, f32 i_distMax, f32 i_distAdjust,
                           f32 i_max_y, f32 i_min_y) {
     cXyz dist = *i_attnPos - *i_pos;
@@ -480,8 +452,6 @@ static BOOL check_distace(cXyz* i_pos, s16 i_angle, cXyz* i_attnPos, f32 i_distM
     return true;
 }
 
-/* 80070E90-800710C0 06B7D0 0230+00 2/2 0/0 0/0 .text
- * calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl              */
 f32 dAttention_c::calcWeight(int i_listType, fopAc_ac_c* i_actor, f32 i_distance, s16 i_angle,
                              s16 i_invAngle, u32* i_attnType) {
     int i;
@@ -554,8 +524,6 @@ f32 dAttention_c::calcWeight(int i_listType, fopAc_ac_c* i_actor, f32 i_distance
     return weight;
 }
 
-/* 800710C0-80071240 06BA00 0180+00 1/1 0/0 0/0 .text
- * setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl           */
 void dAttention_c::setList(int i_listType, fopAc_ac_c* i_actor, f32 i_weight, f32 i_distance,
                            cSAngle i_angle, u32 i_attnType) {
     int max;
@@ -613,7 +581,6 @@ void dAttention_c::setList(int i_listType, fopAc_ac_c* i_actor, f32 i_weight, f3
     }
 }
 
-/* 80071240-8007138C 06BB80 014C+00 6/6 0/0 0/0 .text            initList__12dAttention_cFUl */
 void dAttention_c::initList(u32 flags) {
     mPlayerAttentionFlags = flags;
 
@@ -648,8 +615,6 @@ void dAttention_c::initList(u32 flags) {
     setFlag(0x1000);
 }
 
-/* 8007138C-800713CC 06BCCC 0040+00 1/1 0/0 0/0 .text            select_attention__FP10fopAc_ac_cPv
- */
 static int select_attention(fopAc_ac_c* i_actor, void* i_attention) {
     if (i_actor->attention_info.flags == 0) {
         return 0;
@@ -660,14 +625,12 @@ static int select_attention(fopAc_ac_c* i_actor, void* i_attention) {
     return rt;
 }
 
-/* 800713CC-80071424 06BD0C 0058+00 4/4 0/0 0/0 .text            makeList__12dAttention_cFv */
 int dAttention_c::makeList() {
     fopAcIt_Executor((fopAcIt_ExecutorFunc)select_attention, this);
     setFlag(0x2000);
     return mLockonCount + mActionCount + mCheckObjectCount;
 }
 
-/* 80071424-80071488 06BD64 0064+00 1/1 0/0 0/0 .text setOwnerAttentionPos__12dAttention_cFv */
 void dAttention_c::setOwnerAttentionPos() {
     mOwnerAttnPos = mpPlayer->attention_info.position;
 
@@ -676,8 +639,6 @@ void dAttention_c::setOwnerAttentionPos() {
     }
 }
 
-/* 80071488-8007167C 06BDC8 01F4+00 1/1 0/0 0/0 .text
- * SelectAttention__12dAttention_cFP10fopAc_ac_c                */
 int dAttention_c::SelectAttention(fopAc_ac_c* i_actor) {
     cSAngle angle;
     cSAngle inv_angle;
@@ -710,7 +671,6 @@ int dAttention_c::SelectAttention(fopAc_ac_c* i_actor) {
     return 0;
 }
 
-/* 800716B8-800718A4 06BFF8 01EC+00 4/4 0/0 0/0 .text            sortList__12dAttention_cFv */
 void dAttention_c::sortList() {
     int i;
     int j;
@@ -756,7 +716,6 @@ void dAttention_c::sortList() {
     }
 }
 
-/* 800718A4-80071960 06C1E4 00BC+00 2/2 0/0 0/0 .text            stockAttention__12dAttention_cFv */
 void dAttention_c::stockAttention() {
     fopAc_ac_c* lockon_actor = LockonTarget(0);
 
@@ -779,7 +738,6 @@ void dAttention_c::stockAttention() {
     LockonTarget(0);
 }
 
-/* 80071960-80071A68 06C2A0 0108+00 2/2 0/0 0/0 .text            nextAttention__12dAttention_cFv */
 fopAc_ac_c* dAttention_c::nextAttention() {
     if (!attn_opt_hold && mLockonCount == 1) {
         field_0x32e = 0;
@@ -809,14 +767,12 @@ fopAc_ac_c* dAttention_c::nextAttention() {
     return LockonTarget(0);
 }
 
-/* 80071A68-80071A98 06C3A8 0030+00 3/3 0/0 0/0 .text            freeAttention__12dAttention_cFv */
 int dAttention_c::freeAttention() {
     mLockTargetID = fpcM_ERROR_PROCESS_ID_e;
     initList(0xFFFFFFFF);
     return 0;
 }
 
-/* 80071A98-80071CC0 06C3D8 0228+00 2/2 0/0 0/0 .text            chaseAttention__12dAttention_cFv */
 bool dAttention_c::chaseAttention() {
     cSAngle a1;
     cSAngle a2;
@@ -869,8 +825,6 @@ bool dAttention_c::chaseAttention() {
     return (actor->attention_info.flags & fopAc_AttnFlags_LOCK) != false;
 }
 
-/* 80071CC0-80071D6C 06C600 00AC+00 1/1 0/0 0/0 .text EnemyDistance__12dAttention_cFP10fopAc_ac_c
- */
 f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) {
     if (i_actor == mpPlayer || mpPlayer == NULL) {
         return -1.0f;
@@ -891,8 +845,6 @@ f32 dAttention_c::EnemyDistance(fopAc_ac_c* i_actor) {
     return -1.0f;
 }
 
-/* 80071D6C-80071DEC 06C6AC 0080+00 1/1 0/0 0/0 .text            sound_attention__FP10fopAc_ac_cPv
- */
 static int sound_attention(fopAc_ac_c* i_actor, void* i_attention) {
     dAttention_c* attention = (dAttention_c*)i_attention;
 
@@ -909,7 +861,6 @@ static int sound_attention(fopAc_ac_c* i_actor, void* i_attention) {
     return 0;
 }
 
-/* 80071DEC-80071E84 06C72C 0098+00 1/1 0/0 0/0 .text            runSoundProc__12dAttention_cFv */
 void dAttention_c::runSoundProc() {
     mEnemyActorID = fpcM_ERROR_PROCESS_ID_e;
     mEnemyDist = 10000.0f;
@@ -926,7 +877,6 @@ void dAttention_c::runSoundProc() {
     }
 }
 
-/* 80071E84-800720F4 06C7C4 0270+00 1/1 0/0 0/0 .text            runDrawProc__12dAttention_cFv */
 void dAttention_c::runDrawProc() {
     int lockon_cnt = GetLockonCount();
 
@@ -1005,7 +955,6 @@ void dAttention_c::runDebugDisp0() {
 }
 #endif
 
-/* 800720F4-800720F8 06CA34 0004+00 1/1 0/0 0/0 .text            runDebugDisp__12dAttention_cFv */
 void dAttention_c::runDebugDisp() {
 #if DEBUG
     if (mAttParam.CheckFlag(0x4000)) {
@@ -1081,7 +1030,6 @@ void dAttention_c::runDebugDisp() {
 #endif
 }
 
-/* 800720F8-800722A0 06CA38 01A8+00 1/1 0/0 0/0 .text            checkButton__12dAttention_cFv */
 void dAttention_c::checkButton() {
     if (l_isFinalBossStg && dComIfGp_roomControl_getStayNo() == 0 &&
         !dComIfGs_isSaveDunSwitch(1)) {
@@ -1127,7 +1075,6 @@ void dAttention_c::checkButton() {
     }
 }
 
-/* 800722A0-800722EC 06CBE0 004C+00 2/2 0/0 0/0 .text            triggerProc__12dAttention_cFv */
 bool dAttention_c::triggerProc() {
     if (chaseAttention()) {
         setFlag(0x8);
@@ -1137,7 +1084,6 @@ bool dAttention_c::triggerProc() {
     return false;
 }
 
-/* 800722EC-80072344 06CC2C 0058+00 2/2 0/0 0/0 .text            lostCheck__12dAttention_cFv */
 int dAttention_c::lostCheck() {
     if (chaseAttention()) {
         return false;
@@ -1148,7 +1094,6 @@ int dAttention_c::lostCheck() {
     return true;
 }
 
-/* 80072344-800725F0 06CC84 02AC+00 1/1 0/0 0/0 .text judgementStatus4Hold__12dAttention_cFv */
 void dAttention_c::judgementStatus4Hold() {
     int var_r29 = mAttnStatus;
     int var_r30 = -1;
@@ -1258,7 +1203,6 @@ void dAttention_c::judgementStatus4Hold() {
 #endif
 }
 
-/* 800725F0-80072924 06CF30 0334+00 1/1 0/0 0/0 .text judgementStatus4Switch__12dAttention_cFv */
 void dAttention_c::judgementStatus4Switch() {
     int var_r29 = mAttnStatus;
     int var_r30 = -1;
@@ -1383,7 +1327,6 @@ void dAttention_c::judgementStatus4Switch() {
 #endif
 }
 
-/* 80072924-80072BD4 06D264 02B0+00 0/0 1/1 0/0 .text            Run__12dAttention_cFv */
 int dAttention_c::Run() {
     clrFlag(0x3FFFFF);
 
@@ -1480,7 +1423,6 @@ int dAttention_c::Run() {
     return 1;
 }
 
-/* 80072BD4-80072D80 06D514 01AC+00 0/0 1/1 0/0 .text            Draw__12dAttention_cFv */
 void dAttention_c::Draw() {
     if (mAttParam.CheckFlag(dAttParam_c::EFlag_ARROW_OFF)) {
         draw[0].field_0x173 = 3;
@@ -1549,15 +1491,12 @@ void dAttention_c::Draw() {
     }
 }
 
-/* 80072D80-80072DD8 06D6C0 0058+00 2/2 0/0 0/0 .text            lockSoundStart__12dAttention_cFUl
- */
 void dAttention_c::lockSoundStart(u32 i_sfxID) {
     if (!chkFlag(0x400000)) {
         mDoAud_seStart(i_sfxID, NULL, 0, 0);
     }
 }
 
-/* 80072DD8-80072FE8 06D718 0210+00 1/1 0/0 0/0 .text            setAnm__10dAttDraw_cFUcf */
 void dAttDraw_c::setAnm(u8 i_drawType, f32 i_anmSpeed) {
     mDrawType = i_drawType;
     mNoticeCursorBck[mDrawType].reset();
@@ -1579,7 +1518,6 @@ void dAttDraw_c::setAnm(u8 i_drawType, f32 i_anmSpeed) {
     }
 }
 
-/* 80072FE8-80073004 06D928 001C+00 1/1 0/0 0/0 .text            setAlphaAnm__10dAttDraw_cFUcUc */
 void dAttDraw_c::setAlphaAnm(u8 i_frameMax, u8 i_playDirection) {
     mAlphaAnmFrameMax = i_frameMax;
     mAlphaAnmFrame = 0;
@@ -1587,7 +1525,6 @@ void dAttDraw_c::setAlphaAnm(u8 i_frameMax, u8 i_playDirection) {
     mAlphaAnmPlayDirection = i_playDirection;
 }
 
-/* 80073004-800732AC 06D944 02A8+00 1/1 0/0 0/0 .text            alphaAnm__10dAttDraw_cFv */
 void dAttDraw_c::alphaAnm() {
     f32 anm_ratio = (f32)mAlphaAnmFrame / (f32)mAlphaAnmFrameMax;
     f32 alpha_ratio;
@@ -1634,7 +1571,6 @@ void dAttDraw_c::alphaAnm() {
     }
 }
 
-/* 800732B0-8007353C 06DBF0 028C+00 1/1 0/0 0/0 .text            draw__10dAttDraw_cFR4cXyzPA4_f */
 void dAttDraw_c::draw(cXyz& i_pos, Mtx i_mtx) {
     J3DModelData* modelData = mModel[mDrawType]->getModelData();
 
@@ -1678,8 +1614,6 @@ void dAttDraw_c::draw(cXyz& i_pos, Mtx i_mtx) {
     dComIfGd_setList();
 }
 
-/* 8007353C-800735DC 06DE7C 00A0+00 8/8 13/13 21/21 .text            LockonTarget__12dAttention_cFl
- */
 fopAc_ac_c* dAttention_c::LockonTarget(s32 i_no) {
     if (dComIfGp_checkPlayerStatus0(0, 0x36A02311) || dComIfGp_checkPlayerStatus1(0, 0x11)) {
         return NULL;
@@ -1702,7 +1636,6 @@ fopAc_ac_c* dAttention_c::LockonTarget(s32 i_no) {
     return actor;
 }
 
-/* 800735DC-800736CC 06DF1C 00F0+00 0/0 1/1 0/0 .text LockonReleaseDistanse__12dAttention_cFv */
 f32 dAttention_c::LockonReleaseDistanse() {
     if (!LockonTruth()) {
         return 0.0f;
@@ -1720,8 +1653,6 @@ f32 dAttention_c::LockonReleaseDistanse() {
     return distace_angle_adjust(dist_table[idx].mDistanceAdjust, angle, 1.0f) + dist_table[idx].mDistMaxRelease;
 }
 
-/* 800736CC-80073734 06E00C 0068+00 2/2 0/0 0/0 .text            LockonTargetPId__12dAttention_cFl
- */
 fpc_ProcID dAttention_c::LockonTargetPId(s32 i_no) {
     if (dComIfGp_checkPlayerStatus0(0, 0x36A02311) || dComIfGp_checkPlayerStatus1(0, 0x11)) {
         return fpcM_ERROR_PROCESS_ID_e;
@@ -1739,7 +1670,6 @@ fpc_ProcID dAttention_c::LockonTargetPId(s32 i_no) {
     return mLockOnList[listIdx].getPid();
 }
 
-/* 80073734-8007378C 06E074 0058+00 0/0 3/3 2/2 .text            ActionTarget__12dAttention_cFl */
 fopAc_ac_c* dAttention_c::ActionTarget(s32 i_no) {
     if (i_no >= mActionCount) {
         return NULL;
@@ -1753,8 +1683,6 @@ fopAc_ac_c* dAttention_c::ActionTarget(s32 i_no) {
     return mActionList[listIdx].getActor();
 }
 
-/* 8007378C-800737E4 06E0CC 0058+00 0/0 3/3 0/0 .text            CheckObjectTarget__12dAttention_cFl
- */
 fopAc_ac_c* dAttention_c::CheckObjectTarget(s32 i_no) {
     if (i_no >= mCheckObjectCount) {
         return NULL;
@@ -1768,40 +1696,31 @@ fopAc_ac_c* dAttention_c::CheckObjectTarget(s32 i_no) {
     return mCheckObjectList[listIdx].getActor();
 }
 
-/* 800737E4-80073838 06E124 0054+00 3/3 53/53 37/37 .text            LockonTruth__12dAttention_cFv
- */
 bool dAttention_c::LockonTruth() {
     return (mAttnStatus == EState_LOCK || mAttnStatus == EState_RELEASE) && LockonTarget(0) != NULL;
 }
 
-/* 80073838-80073864 06E178 002C+00 0/0 1/1 0/0 .text
- * checkDistance__12dAttention_cFP4cXyzsP4cXyzffff              */
 int dAttention_c::checkDistance(cXyz* i_pos, s16 i_angle, cXyz* i_attnPos, f32 i_distMax, f32 i_distAdjust,
                                 f32 i_max_y, f32 i_min_y) {
     return check_distace(i_pos, i_angle, i_attnPos, i_distMax, i_distAdjust, i_max_y, i_min_y);
 }
 
-/* 80073864-80073898 06E1A4 0034+00 11/11 3/3 8/8 .text            getActor__10dAttList_cFv */
 fopAc_ac_c* dAttList_c::getActor() {
     return fopAcM_SearchByID(mActorID);
 }
 
-/* 80073898-800738B4 06E1D8 001C+00 3/3 0/0 0/0 .text setActor__10dAttList_cFP10fopAc_ac_c */
 void dAttList_c::setActor(fopAc_ac_c* i_actor) {
     mActorID = fopAcM_GetID(i_actor);
 }
 
-/* 800738B4-800738CC 06E1F4 0018+00 1/1 0/0 0/0 .text            getPId__10dAttHint_cFPv */
 fpc_ProcID dAttHint_c::getPId(void* i_actor) {
     return fopAcM_GetID(i_actor);
 }
 
-/* 800738CC-800738FC 06E20C 0030+00 0/0 1/1 0/0 .text            convPId__10dAttHint_cFUi */
 fopAc_ac_c* dAttHint_c::convPId(fpc_ProcID i_id) {
     return fopAcM_SearchByID(i_id);
 }
 
-/* 800738FC-80073958 06E23C 005C+00 0/0 0/0 6/6 .text request__10dAttHint_cFP10fopAc_ac_ci */
 int dAttHint_c::request(fopAc_ac_c* i_actor, int i_priority) {
     if (i_priority < 0) {
         i_priority = 0x1FF;
@@ -1815,26 +1734,22 @@ int dAttHint_c::request(fopAc_ac_c* i_actor, int i_priority) {
     return 1;
 }
 
-/* 80073958-80073970 06E298 0018+00 1/1 0/0 0/0 .text            init__10dAttHint_cFv */
 void dAttHint_c::init() {
     mHintActorID = fpcM_ERROR_PROCESS_ID_e;
     field_0x8 = fpcM_ERROR_PROCESS_ID_e;
     mPriority = 0x200;
 }
 
-/* 80073970-8007398C 06E2B0 001C+00 1/1 0/0 0/0 .text            proc__10dAttHint_cFv */
 void dAttHint_c::proc() {
     field_0x8 = mHintActorID;
     mHintActorID = fpcM_ERROR_PROCESS_ID_e;
     mPriority = 0x200;
 }
 
-/* 8007398C-800739BC 06E2CC 0030+00 0/0 4/4 0/0 .text            convPId__11dAttCatch_cFUi */
 fopAc_ac_c* dAttCatch_c::convPId(fpc_ProcID i_id) {
     return fopAcM_SearchByID(i_id);
 }
 
-/* 800739BC-800739DC 06E2FC 0020+00 1/1 0/0 0/0 .text            init__11dAttCatch_cFv */
 void dAttCatch_c::init() {
     mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE;
     mRequestActorID = fpcM_ERROR_PROCESS_ID_e;
@@ -1842,7 +1757,6 @@ void dAttCatch_c::init() {
     field_0x4 = 3;
 }
 
-/* 800739DC-80073A08 06E31C 002C+00 1/1 0/0 0/0 .text            proc__11dAttCatch_cFv */
 void dAttCatch_c::proc() {
     mCatghTargetID = mRequestActorID;
     mChangeItem = mCatchItemNo;
@@ -1859,8 +1773,6 @@ inline fopAc_ac_c* dComIfGp_getPlayer_fakematch(int idx) {
     return player;
 }
 
-/* 80073A08-80073CA4 06E348 029C+00 0/0 0/0 10/10 .text
- * request__11dAttCatch_cFP10fopAc_ac_cUcfffsi                  */
 int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist,
                          f32 i_downDist, s16 i_angle, int param_7) {
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer_fakematch(0);
@@ -1903,26 +1815,22 @@ int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDi
     return 0;
 }
 
-/* 80073CA4-80073CD4 06E5E4 0030+00 0/0 1/1 0/0 .text            convPId__10dAttLook_cFUi */
 fopAc_ac_c* dAttLook_c::convPId(fpc_ProcID i_id) {
     return fopAcM_SearchByID(i_id);
 }
 
-/* 80073CD4-80073CEC 06E614 0018+00 1/1 0/0 0/0 .text            init__10dAttLook_cFv */
 void dAttLook_c::init() {
     mRequestActorID = fpcM_ERROR_PROCESS_ID_e;
     mLookTargetID = fpcM_ERROR_PROCESS_ID_e;
     field_0x4 = 3;
 }
 
-/* 80073CEC-80073D08 06E62C 001C+00 1/1 0/0 0/0 .text            proc__10dAttLook_cFv */
 void dAttLook_c::proc() {
     mLookTargetID = mRequestActorID;
     mRequestActorID = fpcM_ERROR_PROCESS_ID_e;
     field_0x4 = 3;
 }
 
-/* 80073D08-80073FC4 06E648 02BC+00 0/0 0/0 7/7 .text request__10dAttLook_cFP10fopAc_ac_cfffsi */
 int dAttLook_c::request(fopAc_ac_c* i_reqActor, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist,
                         s16 i_angle, int param_6) {
     fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0);
diff --git a/src/d/d_bg_plc.cpp b/src/d/d_bg_plc.cpp
index c7ee8061f5..00d3ef1eb3 100644
--- a/src/d/d_bg_plc.cpp
+++ b/src/d/d_bg_plc.cpp
@@ -3,20 +3,16 @@
 #include "d/d_bg_plc.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80074074-80074080 06E9B4 000C+00 0/0 1/1 0/0 .text            __ct__6dBgPlcFv */
 dBgPlc::dBgPlc() {
     m_base = NULL;
 }
 
-/* 80074080-800740BC 06E9C0 003C+00 0/0 1/1 0/0 .text            __dt__6dBgPlcFv */
 dBgPlc::~dBgPlc() {}
 
-/* 800740BC-800740C4 -00001 0008+00 0/0 0/0 0/0 .text            setBase__6dBgPlcFPv */
 void dBgPlc::setBase(void* pbase) {
     m_base = (sBgPlc*)pbase;
 }
 
-/* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text            getCode__6dBgPlcCFiPP5sBgPc */
 sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const {
     JUT_ASSERT(45, m_base != NULL);
     JUT_ASSERT(46, m_base->m_code_size == ZELDA_CODE_SIZE);
@@ -28,7 +24,6 @@ sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const {
     return code;
 }
 
-/* 800740DC-800740F4 06EA1C 0018+00 0/0 1/1 0/0 .text            getGrpCode__6dBgPlcCFi */
 u32 dBgPlc::getGrpCode(int index) const {
     JUT_ASSERT(62, m_base != NULL);
     JUT_ASSERT(63, m_base->m_code_size == ZELDA_CODE_SIZE);
diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp
index 58059a2d6d..2f429b9b51 100644
--- a/src/d/d_bg_s.cpp
+++ b/src/d/d_bg_s.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 800740F4-80074110 06EA34 001C+00 2/2 1/1 0/0 .text            Init__11cBgS_ChkElmFv */
 void cBgS_ChkElm::Init() {
     m_bgw_base_ptr = NULL;
     m_used = false;
@@ -19,7 +18,6 @@ void cBgS_ChkElm::Init() {
     m_actor_id = 0xFFFFFFFF;
 }
 
-/* 80074110-80074128 06EA50 0018+00 1/0 0/0 0/0 .text Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv */
 void cBgS_ChkElm::Regist2(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor) {
     m_used = true;
     m_bgw_base_ptr = p_data;
@@ -27,7 +25,6 @@ void cBgS_ChkElm::Regist2(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor)
     m_actor_ptr = (fopAc_ac_c*)p_actor;
 }
 
-/* 80074128-80074144 06EA68 001C+00 2/2 0/0 0/0 .text            Release__11cBgS_ChkElmFv */
 void cBgS_ChkElm::Release() {
     m_used = false;
     m_bgw_base_ptr = NULL;
@@ -35,11 +32,8 @@ void cBgS_ChkElm::Release() {
     m_actor_ptr = NULL;
 }
 
-/* ############################################################################################## */
-/* 80450F60-80450F68 000460 0004+04 2/2 0/0 0/0 .sbss            l_SetCounter */
 static int l_SetCounter;
 
-/* 80074144-80074250 06EA84 010C+00 1/1 0/0 0/0 .text            Regist__4cBgSFP9dBgW_BaseUiPv */
 bool cBgS::Regist(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor) {
     if (p_data == NULL) {
         return true;
@@ -71,7 +65,6 @@ bool cBgS::Regist(dBgW_Base* p_data, fpc_ProcID actor_id, void* p_actor) {
     return true;
 }
 
-/* 80074250-800742E4 06EB90 0094+00 0/0 2/2 187/187 .text            Release__4cBgSFP9dBgW_Base */
 bool cBgS::Release(dBgW_Base* p_data) {
     if (p_data == NULL) {
         return 1;
@@ -88,7 +81,6 @@ bool cBgS::Release(dBgW_Base* p_data) {
     return 0;
 }
 
-/* 800742E4-80074338 06EC24 0054+00 2/1 0/0 0/0 .text            Ct__4cBgSFv */
 void cBgS::Ct() {
     l_SetCounter = 0;
     for (int i = 0; i < 0x100; i++) {
@@ -96,7 +88,6 @@ void cBgS::Ct() {
     }
 }
 
-/* 80074338-800743B4 06EC78 007C+00 2/1 0/0 0/0 .text            Dt__4cBgSFv */
 void cBgS::Dt() {
     for (int i = 0; i < 0x100; i++) {
         if (m_chk_element[i].ChkUsed()) {
@@ -109,7 +100,6 @@ void cBgS::Dt() {
     }
 }
 
-/* 800743B4-800744A0 06ECF4 00EC+00 0/0 16/16 305/305 .text LineCross__4cBgSFP11cBgS_LinChk */
 bool cBgS::LineCross(cBgS_LinChk* p_line) {
     p_line->ClearPi();
     p_line->ClrHit();
@@ -129,7 +119,6 @@ bool cBgS::LineCross(cBgS_LinChk* p_line) {
     return p_line->ChkHit() ? true : false;
 }
 
-/* 800744A0-80074578 06EDE0 00D8+00 0/0 51/51 231/231 .text GroundCross__4cBgSFP11cBgS_GndChk */
 f32 cBgS::GroundCross(cBgS_GndChk* p_gnd) {
     p_gnd->SetNowY(-G_CM3D_F_INF);
     p_gnd->ClearPi();
@@ -183,7 +172,6 @@ struct cBgD_Grp_t_ {
     u8 data[0x30];
 };
 
-/* 80074578-80074618 06EEB8 00A0+00 0/0 1/1 0/0 .text            ConvDzb__4cBgSFPv */
 void* cBgS::ConvDzb(void* p_dzb) {
     cBgD_t_* pbgd = (cBgD_t_*)p_dzb;
 
@@ -211,13 +199,10 @@ void* cBgS::ConvDzb(void* p_dzb) {
     return p_dzb;
 }
 
-/* 80074618-80074628 06EF58 0010+00 0/0 9/9 13/13 .text            GetActorPointer__4cBgSCFi */
 fopAc_ac_c* cBgS::GetActorPointer(int actor_index) const {
     return m_chk_element[actor_index].m_actor_ptr;
 }
 
-/* 80074628-80074660 06EF68 0038+00 2/2 3/3 0/0 .text GetBgWBasePointer__4cBgSCFRC13cBgS_PolyInfo
- */
 dBgW_Base* cBgS::GetBgWBasePointer(cBgS_PolyInfo const& poly) const {
     int bg_index = poly.GetBgIndex();
 
@@ -227,7 +212,6 @@ dBgW_Base* cBgS::GetBgWBasePointer(cBgS_PolyInfo const& poly) const {
     return m_chk_element[bg_index].m_bgw_base_ptr;
 }
 
-/* 80074660-800746F4 06EFA0 0094+00 3/3 35/35 9/9 .text ChkPolySafe__4cBgSFRC13cBgS_PolyInfo */
 bool cBgS::ChkPolySafe(cBgS_PolyInfo const& poly) {
     if (!poly.ChkSetInfo()) {
         return false;
@@ -246,7 +230,6 @@ bool cBgS::ChkPolySafe(cBgS_PolyInfo const& poly) {
     }
 }
 
-/* 800746F4-80074744 06F034 0050+00 1/1 0/0 0/0 .text GetGrpRoomId__4cBgSCFRC13cBgS_PolyInfo */
 s32 cBgS::GetGrpRoomId(cBgS_PolyInfo const& poly) const {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -256,8 +239,6 @@ s32 cBgS::GetGrpRoomId(cBgS_PolyInfo const& poly) const {
     }
 }
 
-/* 80074744-800747F0 06F084 00AC+00 4/4 62/62 142/142 .text
- * GetTriPla__4cBgSCFRC13cBgS_PolyInfoP8cM3dGPla                */
 bool cBgS::GetTriPla(cBgS_PolyInfo const& poly, cM3dGPla* p_pla) const {
     int bg_index = poly.GetBgIndex();
     if (bg_index < 0 || bg_index >= 0x100 || !m_chk_element[bg_index].ChkUsed()) {
@@ -268,8 +249,6 @@ bool cBgS::GetTriPla(cBgS_PolyInfo const& poly, cM3dGPla* p_pla) const {
     return true;
 }
 
-/* 800747F0-80074840 06F130 0050+00 0/0 1/1 0/0 .text
- * GetTriPnt__4cBgSCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz        */
 bool cBgS::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* param_1, cXyz* param_2, cXyz* param_3) const {
     int id = poly.GetBgIndex();
     if (!m_chk_element[id].ChkUsed()) {
@@ -279,7 +258,6 @@ bool cBgS::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* param_1, cXyz* param_2, cX
     return m_chk_element[id].m_bgw_base_ptr->GetTriPnt(poly, param_1, param_2, param_3);
 }
 
-/* 80074840-800748AC 06F180 006C+00 0/0 1/1 0/0 .text            ShdwDraw__4cBgSFP13cBgS_ShdwDraw */
 void cBgS::ShdwDraw(cBgS_ShdwDraw* p_shdw) {
     cBgS_ChkElm* elm = m_chk_element;
     for (int i = 0; i < 0x100; i++) {
@@ -290,8 +268,6 @@ void cBgS::ShdwDraw(cBgS_ShdwDraw* p_shdw) {
     }
 }
 
-/* 800748AC-800748FC 06F1EC 0050+00 1/1 0/0 0/0 .text            GetGrpInf__4cBgSCFRC13cBgS_PolyInfo
- */
 u32 cBgS::GetGrpInf(cBgS_PolyInfo const& poly) const {
     int id = poly.GetBgIndex();
     if (!m_chk_element[id].ChkUsed()) {
@@ -301,17 +277,14 @@ u32 cBgS::GetGrpInf(cBgS_PolyInfo const& poly) const {
     return m_chk_element[id].m_bgw_base_ptr->GetGrpInf(poly);
 }
 
-/* 800748FC-8007491C 06F23C 0020+00 1/0 0/0 0/0 .text            Ct__4dBgSFv */
 void dBgS::Ct() {
     cBgS::Ct();
 }
 
-/* 8007491C-8007493C 06F25C 0020+00 1/0 0/0 0/0 .text            Dt__4dBgSFv */
 void dBgS::Dt() {
     cBgS::Dt();
 }
 
-/* 8007493C-800749A8 06F27C 006C+00 0/0 1/1 0/0 .text            ClrMoveFlag__4dBgSFv */
 void dBgS::ClrMoveFlag() {
     for (int i = 0; i < 0x100; i++) {
         if (m_chk_element[i].ChkUsed()) {
@@ -320,7 +293,6 @@ void dBgS::ClrMoveFlag() {
     }
 }
 
-/* 800749A8-80074A08 06F2E8 0060+00 0/0 1/1 0/0 .text            Move__4dBgSFv */
 void dBgS::Move() {
     cBgS_ChkElm* elm = m_chk_element;
     for (int i = 0; i < 0x100; i++) {
@@ -331,8 +303,6 @@ void dBgS::Move() {
     }
 }
 
-/* 80074A08-80074AB4 06F348 00AC+00 0/0 2/2 127/127 .text Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c
- */
 bool dBgS::Regist(dBgW_Base* pbgw, fopAc_ac_c* p_actor) {
     if (pbgw == NULL) {
         return true;
@@ -346,12 +316,10 @@ bool dBgS::Regist(dBgW_Base* pbgw, fopAc_ac_c* p_actor) {
     return cBgS::Regist(pbgw, fopAcM_GetID(p_actor), p_actor);
 }
 
-/* 80074AB4-80074ABC -00001 0008+00 0/0 0/0 0/0 .text            SetOldShapeAngleY__9dBgW_BaseFs */
 void dBgW_Base::SetOldShapeAngleY(s16 shape_angle) {
     m_old_ShapeAngleY = shape_angle;
 }
 
-/* 80074ABC-80074B40 06F3FC 0084+00 0/0 11/11 5/5 .text ChkMoveBG__4dBgSFRC13cBgS_PolyInfo */
 bool dBgS::ChkMoveBG(cBgS_PolyInfo const& poly) {
     dBgW_Base* base = dComIfG_Bgsp().GetBgWBasePointer(poly);
     if (base != NULL) {
@@ -367,7 +335,6 @@ bool dBgS::ChkMoveBG(cBgS_PolyInfo const& poly) {
     return false;
 }
 
-/* 80074B40-80074B98 06F480 0058+00 0/0 4/4 4/4 .text ChkMoveBG_NoDABg__4dBgSFRC13cBgS_PolyInfo */
 bool dBgS::ChkMoveBG_NoDABg(cBgS_PolyInfo const& poly) {
     dBgW_Base* base = dComIfG_Bgsp().GetBgWBasePointer(poly);
     if (base != NULL && base->ChkMoveBg()) {
@@ -377,8 +344,6 @@ bool dBgS::ChkMoveBG_NoDABg(cBgS_PolyInfo const& poly) {
     return false;
 }
 
-/* 80074B98-80074BE8 06F4D8 0050+00 0/0 4/4 1/1 .text            GetExitId__4dBgSFRC13cBgS_PolyInfo
- */
 s32 dBgS::GetExitId(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -388,7 +353,6 @@ s32 dBgS::GetExitId(cBgS_PolyInfo const& poly) {
     }
 }
 
-/* 80074BE8-80074C6C 06F528 0084+00 0/0 7/7 35/35 .text GetPolyColor__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetPolyColor(cBgS_PolyInfo const& poly) {
     if (!poly.ChkSetInfo()) {
         return 0xFF;
@@ -402,7 +366,6 @@ s32 dBgS::GetPolyColor(cBgS_PolyInfo const& poly) {
     return 0xFF;
 }
 
-/* 80074C6C-80074CBC 06F5AC 0050+00 0/0 1/1 2/2 .text GetHorseNoEntry__4dBgSFRC13cBgS_PolyInfo */
 BOOL dBgS::GetHorseNoEntry(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -412,7 +375,6 @@ BOOL dBgS::GetHorseNoEntry(cBgS_PolyInfo const& poly) {
     return false;
 }
 
-/* 80074CBC-80074D0C 06F5FC 0050+00 0/0 4/4 9/9 .text GetSpecialCode__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetSpecialCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -422,7 +384,6 @@ int dBgS::GetSpecialCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074D0C-80074D5C 06F64C 0050+00 0/0 2/2 2/2 .text GetMagnetCode__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetMagnetCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -432,8 +393,6 @@ int dBgS::GetMagnetCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074D5C-80074DAC 06F69C 0050+00 0/0 5/5 0/0 .text GetMonkeyBarsCode__4dBgSFRC13cBgS_PolyInfo
- */
 int dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -443,8 +402,6 @@ int dBgS::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074DAC-80074E00 06F6EC 0054+00 0/0 0/0 1/1 .text
- * GetUnderwaterRoofCode__4dBgSFRC13cBgS_PolyInfo               */
 u32 dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -454,7 +411,6 @@ u32 dBgS::GetUnderwaterRoofCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074E00-80074E50 06F740 0050+00 0/0 13/13 5/5 .text GetWallCode__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetWallCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -464,7 +420,6 @@ s32 dBgS::GetWallCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074E50-80074EA0 06F790 0050+00 0/0 29/29 28/28 .text GetPolyAtt0__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetPolyAtt0(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -474,7 +429,6 @@ int dBgS::GetPolyAtt0(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074EA0-80074EF0 06F7E0 0050+00 0/0 13/13 0/0 .text GetPolyAtt1__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetPolyAtt1(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -484,7 +438,6 @@ int dBgS::GetPolyAtt1(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074EF0-80074F40 06F830 0050+00 0/0 7/7 8/8 .text GetGroundCode__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetGroundCode(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -494,7 +447,6 @@ int dBgS::GetGroundCode(cBgS_PolyInfo const& poly) {
     return 0;
 }
 
-/* 80074F40-80074F90 06F880 0050+00 0/0 1/1 0/0 .text GetCamMoveBG__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetCamMoveBG(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -504,7 +456,6 @@ s32 dBgS::GetCamMoveBG(cBgS_PolyInfo const& poly) {
     return 0xFF;
 }
 
-/* 80074F90-80074FE0 06F8D0 0050+00 0/0 1/1 0/0 .text GetRoomCamId__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetRoomCamId(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -514,7 +465,6 @@ s32 dBgS::GetRoomCamId(cBgS_PolyInfo const& poly) {
     return 0xFF;
 }
 
-/* 80074FE0-80075030 06F920 0050+00 0/0 2/2 0/0 .text GetRoomPathId__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetRoomPathId(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -524,7 +474,6 @@ s32 dBgS::GetRoomPathId(cBgS_PolyInfo const& poly) {
     return 0xFF;
 }
 
-/* 80075030-80075080 06F970 0050+00 0/0 1/1 0/0 .text GetRoomPathPntNo__4dBgSFRC13cBgS_PolyInfo */
 s32 dBgS::GetRoomPathPntNo(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     if (m_chk_element[bg_index].ChkUsed()) {
@@ -534,7 +483,6 @@ s32 dBgS::GetRoomPathPntNo(cBgS_PolyInfo const& poly) {
     return 0xFF;
 }
 
-/* 80075080-800750D0 06F9C0 0050+00 0/0 2/2 0/0 .text GetGrpSoundId__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetGrpSoundId(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     JUT_ASSERT(1761, 0 <= bg_index && bg_index < 256);
@@ -545,13 +493,11 @@ int dBgS::GetGrpSoundId(cBgS_PolyInfo const& poly) {
     return r30->GetGrpSoundId(poly);
 }
 
-/* 800750D0-80075100 06FA10 0030+00 0/0 1/1 0/0 .text ChkGrpInf__4dBgSFRC13cBgS_PolyInfoUl */
 u32 dBgS::ChkGrpInf(cBgS_PolyInfo const& poly, u32 param_1) {
     u32 grp_inf = GetGrpInf(poly);
     return grp_inf & param_1;
 }
 
-/* 80075100-8007519C 06FA40 009C+00 0/0 16/16 60/60 .text GetRoomId__4dBgSFRC13cBgS_PolyInfo */
 int dBgS::GetRoomId(cBgS_PolyInfo const& poly) {
     if (!poly.ChkSetInfo()) {
         return -1;
@@ -573,8 +519,6 @@ int dBgS::GetRoomId(cBgS_PolyInfo const& poly) {
     return roomId;
 }
 
-/* 8007519C-800751F8 06FADC 005C+00 0/0 3/3 0/0 .text
- * GetPolyAttackThrough__4dBgSFRC13cBgS_PolyInfo                */
 bool dBgS::GetPolyAttackThrough(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     JUT_ASSERT(1894, 0 <= bg_index && bg_index < 256);
@@ -585,7 +529,6 @@ bool dBgS::GetPolyAttackThrough(cBgS_PolyInfo const& poly) {
     return r30->GetAttackThrough(poly.GetPolyIndex()) != 0;
 }
 
-/* 800751F8-8007524C 06FB38 0054+00 0/0 1/1 0/0 .text ChkPolyHSStick__4dBgSFRC13cBgS_PolyInfo */
 u32 dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) {
     int bg_index = poly.GetBgIndex();
     JUT_ASSERT(1912, 0 <= bg_index && bg_index < 256);
@@ -596,7 +539,6 @@ u32 dBgS::ChkPolyHSStick(cBgS_PolyInfo const& poly) {
     return r30->GetPolyHSStick(poly.GetPolyIndex());
 }
 
-/* 8007524C-80075374 06FB8C 0128+00 0/0 1/1 0/0 .text            WallCorrect__4dBgSFP9dBgS_Acch */
 void dBgS::WallCorrect(dBgS_Acch* p_acch) {
     p_acch->CalcWallRR();
     p_acch->CalcMovePosWork();
@@ -620,8 +562,6 @@ void dBgS::WallCorrect(dBgS_Acch* p_acch) {
     }
 }
 
-/* 80075374-8007549C 06FCB4 0128+00 0/0 1/1 0/0 .text            WallCorrectSort__4dBgSFP9dBgS_Acch
- */
 void dBgS::WallCorrectSort(dBgS_Acch* p_acch) {
     p_acch->CalcWallRR();
     p_acch->CalcMovePosWork();
@@ -645,7 +585,6 @@ void dBgS::WallCorrectSort(dBgS_Acch* p_acch) {
     }
 }
 
-/* 8007549C-80075564 06FDDC 00C8+00 0/0 17/17 1/1 .text            RoofChk__4dBgSFP12dBgS_RoofChk */
 f32 dBgS::RoofChk(dBgS_RoofChk* p_roof) {
     p_roof->Init();
 
@@ -666,8 +605,6 @@ f32 dBgS::RoofChk(dBgS_RoofChk* p_roof) {
     return p_roof->GetNowY();
 }
 
-/* 80075564-80075688 06FEA4 0124+00 0/0 2/2 3/3 .text            SplGrpChk__4dBgSFP14dBgS_SplGrpChk
- */
 bool dBgS::SplGrpChk(dBgS_SplGrpChk* p_grp) {
     bool ret = false;
     p_grp->Init();
@@ -693,7 +630,6 @@ bool dBgS::SplGrpChk(dBgS_SplGrpChk* p_grp) {
     return ret;
 }
 
-/* 80075688-80075774 06FFC8 00EC+00 0/0 1/1 1/1 .text            SphChk__4dBgSFP11dBgS_SphChkPv */
 bool dBgS::SphChk(dBgS_SphChk* p_sph, void* param_1) {
     if (p_sph->mCallback == NULL) {
         return false;
@@ -720,8 +656,6 @@ bool dBgS::SphChk(dBgS_SphChk* p_sph, void* param_1) {
     return ret;
 }
 
-/* 80075774-80075880 0700B4 010C+00 0/0 3/3 0/0 .text
- * MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb */
 void dBgS::MoveBgCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i_pos, csXyz* i_angle,
                         csXyz* i_shapeAngle, bool param_5, bool param_6) {
     if (!param_1 || !i_poly.ChkBgIndex()) {
@@ -741,8 +675,6 @@ void dBgS::MoveBgCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i_pos,
     }
 }
 
-/* 80075880-8007595C 0701C0 00DC+00 0/0 7/7 2/2 .text
- * MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 void dBgS::MoveBgTransPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i_pos, csXyz* i_angle,
                           csXyz* i_shapeAngle) {
     if (!param_1 || !i_poly.ChkBgIndex()) {
@@ -760,8 +692,6 @@ void dBgS::MoveBgTransPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i_pos
     }
 }
 
-/* 8007595C-80075A24 07029C 00C8+00 0/0 6/6 0/0 .text
- * MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i_pos,
                               csXyz* i_angle, csXyz* i_shapeAngle) {
     if (!param_1 || !i_poly.ChkBgIndex()) {
@@ -779,8 +709,6 @@ void dBgS::MoveBgMatrixCrrPos(cBgS_PolyInfo const& i_poly, bool param_1, cXyz* i
     }
 }
 
-/* 80075A24-80075AA4 070364 0080+00 1/1 0/0 46/46 .text
- * dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 void dBgS_MoveBGProc_Typical(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly,
                              bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) {
     Mtx m;
@@ -796,8 +724,6 @@ void dBgS_MoveBGProc_Typical(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const
     }
 }
 
-/* 80075AA4-80075AD8 0703E4 0034+00 1/1 0/0 0/0 .text
- * dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 static void dBgS_MoveBGProc_RotY(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly,
                                  bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) {
     if (i_shapeAngle != NULL) {
@@ -813,16 +739,12 @@ static void dBgS_MoveBGProc_RotY(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo c
     }
 }
 
-/* 80075AD8-80075B44 070418 006C+00 0/0 0/0 124/124 .text
- * dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 void dBgS_MoveBGProc_TypicalRotY(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly,
                                  bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) {
     dBgS_MoveBGProc_Typical(i_bgw, i_actor_ptr, i_poly, param_3, i_pos, i_angle, i_shapeAngle);
     dBgS_MoveBGProc_RotY(i_bgw, i_actor_ptr, i_poly, param_3, i_pos, i_angle, i_shapeAngle);
 }
 
-/* 80075B44-80075B84 070484 0040+00 0/0 0/0 10/10 .text
- * dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz */
 void dBgS_MoveBGProc_Trans(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const& i_poly,
                            bool param_3, cXyz* i_pos, csXyz* i_angle, csXyz* i_shapeAngle) {
     cXyz trans;
@@ -831,8 +753,6 @@ void dBgS_MoveBGProc_Trans(dBgW* i_bgw, void* i_actor_ptr, cBgS_PolyInfo const&
     VECAdd(i_pos, &trans, i_pos);
 }
 
-/* 80075B84-80075BF4 0704C4 0070+00 0/0 1/1 2/2 .text
- * RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c           */
 void dBgS::RideCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1) {
     int bg_index = poly.GetBgIndex();
     dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr;
@@ -841,8 +761,6 @@ void dBgS::RideCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1) {
     }
 }
 
-/* 80075BF4-80075C6C 070534 0078+00 0/0 0/0 2/2 .text
- * ArrowStickCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_cR4cXyz */
 void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1, cXyz& param_2) {
     int bg_index = poly.GetBgIndex();
     dBgW_Base* base = m_chk_element[bg_index].m_bgw_base_ptr;
@@ -851,8 +769,6 @@ void dBgS::ArrowStickCallBack(cBgS_PolyInfo const& poly, fopAc_ac_c* param_1, cX
     }
 }
 
-/* 80075C6C-80075D0C 0705AC 00A0+00 0/0 1/1 0/0 .text
- * PushPullCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
 fopAc_ac_c* dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* i_pushActor, s16 i_angle,
                             dBgW_Base::PushPullLabel i_label) {
     int bg_index = param_0.GetBgIndex();
@@ -873,7 +789,6 @@ fopAc_ac_c* dBgS::PushPullCallBack(cBgS_PolyInfo const& param_0, fopAc_ac_c* i_p
                                        i_label);
 }
 
-/* 80075D0C-80075D7C 07064C 0070+00 0/0 8/8 1/1 .text dBgS_CheckBWallPoly__FRC13cBgS_PolyInfo */
 bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& poly) {
     cM3dGPla pla;
 
@@ -884,7 +799,6 @@ bool dBgS_CheckBWallPoly(cBgS_PolyInfo const& poly) {
     return cBgW_CheckBWall(pla.mNormal.y);
 }
 
-/* 80075D7C-80075DEC 0706BC 0070+00 0/0 3/3 1/1 .text dBgS_CheckBGroundPoly__FRC13cBgS_PolyInfo */
 bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& poly) {
     cM3dGPla pla;
 
@@ -895,7 +809,6 @@ bool dBgS_CheckBGroundPoly(cBgS_PolyInfo const& poly) {
     return cBgW_CheckBGround(pla.mNormal.y);
 }
 
-/* 80075DEC-80075E5C 07072C 0070+00 0/0 0/0 1/1 .text dBgS_CheckBRoofPoly__FRC13cBgS_PolyInfo */
 bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& poly) {
     cM3dGPla pla;
 
@@ -906,7 +819,6 @@ bool dBgS_CheckBRoofPoly(cBgS_PolyInfo const& poly) {
     return cBgW_CheckBRoof(pla.mNormal.y);
 }
 
-/* 80075E5C-80075EAC 07079C 0050+00 0/0 1/1 0/0 .text            dBgS_GetNY__FRC13cBgS_PolyInfo */
 f32 dBgS_GetNY(cBgS_PolyInfo const& poly) {
     cM3dGPla pla;
 
diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp
index f5cd7691af..bc16cdade6 100644
--- a/src/d/d_bg_s_acch.cpp
+++ b/src/d/d_bg_s_acch.cpp
@@ -11,7 +11,6 @@
 #include "d/d_com_inf_game.h"
 #include "global.h"
 
-/* 80075EAC-80075F14 0707EC 0068+00 0/0 4/4 336/336 .text            __ct__12dBgS_AcchCirFv */
 dBgS_AcchCir::dBgS_AcchCir() {
     m_flags = 0;
     m_wall_rr = 0.0f;
@@ -22,38 +21,31 @@ dBgS_AcchCir::dBgS_AcchCir() {
     m_wall_h_direct = 0.0f;
 }
 
-/* 80075F14-80075F40 070854 002C+00 1/1 0/0 0/0 .text            ClrWallHit__12dBgS_AcchCirFv */
 void dBgS_AcchCir::ClrWallHit() {
     m_flags &= ~WALL_HIT;
     ClearPi();
 }
 
-/* 80075F40-80075F48 070880 0008+00 1/1 2/2 109/109 .text            SetWallR__12dBgS_AcchCirFf */
 void dBgS_AcchCir::SetWallR(f32 i_wall_r) {
     m_wall_r = i_wall_r;
 }
 
-/* 80075F48-80075F58 070888 0010+00 1/1 0/0 0/0 .text            CalcWallRR__12dBgS_AcchCirFv */
 void dBgS_AcchCir::CalcWallRR() {
     m_wall_rr = m_wall_r * m_wall_r;
 }
 
-/* 80075F58-80075F80 070898 0028+00 0/0 3/3 272/272 .text            SetWall__12dBgS_AcchCirFff */
 void dBgS_AcchCir::SetWall(f32 i_wall_h, f32 i_wall_r) {
     SetWallH(i_wall_h);
     SetWallR(i_wall_r);
 }
 
-/* 80075F80-80075F94 0708C0 0014+00 1/1 0/0 1/1 .text            SetWallHDirect__12dBgS_AcchCirFf */
 void dBgS_AcchCir::SetWallHDirect(f32 i_h_direct) {
     m_flags |= WALL_H_DIRECT;
     m_wall_h_direct = i_h_direct;
 }
 
-/* 80075F94-800760A0 0708D4 010C+00 3/2 6/6 468/468 .text            __dt__9dBgS_AcchFv */
 dBgS_Acch::~dBgS_Acch() {}
 
-/* 800760A0-800761CC 0709E0 012C+00 0/0 4/4 338/338 .text            __ct__9dBgS_AcchFv */
 dBgS_Acch::dBgS_Acch() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
@@ -89,7 +81,6 @@ dBgS_Acch::dBgS_Acch() {
     field_0xd8 = -G_CM3D_F_INF;
 }
 
-/* 800761CC-80076248 070B0C 007C+00 1/1 0/0 0/0 .text            Init__9dBgS_AcchFv */
 void dBgS_Acch::Init() {
     ClrWallHit();
     for (int i = 0; i < m_tbl_size; i++) {
@@ -98,8 +89,6 @@ void dBgS_Acch::Init() {
     }
 }
 
-/* 80076248-80076288 070B88 0040+00 0/0 2/2 314/314 .text
- * Set__9dBgS_AcchFP4cXyzP4cXyzP10fopAc_ac_ciP12dBgS_AcchCirP4cXyzP5csXyzP5csXyz */
 void dBgS_Acch::Set(cXyz* i_pos, cXyz* i_old_pos, fopAc_ac_c* i_actor, int i_tbl_size,
                     dBgS_AcchCir* i_acchcir, cXyz* i_speed, csXyz* i_angle, csXyz* i_shape_angle) {
     pm_pos = i_pos;
@@ -118,8 +107,6 @@ void dBgS_Acch::Set(cXyz* i_pos, cXyz* i_old_pos, fopAc_ac_c* i_actor, int i_tbl
     pm_shape_angle = i_shape_angle;
 }
 
-/* 80076288-800762D8 070BC8 0050+00 0/0 1/1 7/7 .text
- * Set__9dBgS_AcchFP10fopAc_ac_ciP12dBgS_AcchCir                */
 void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir) {
     m_tbl_size = i_tbl_size;
     pm_acch_cir = i_acchcir;
@@ -133,8 +120,6 @@ void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir
     pm_shape_angle = fopAcM_GetShapeAngle_p(i_actor);
 }
 
-/* 800762D8-80076350 070C18 0078+00 1/1 0/0 0/0 .text            GroundCheckInit__9dBgS_AcchFR4dBgS
- */
 void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) {
     if (!(m_flags & 2)) {
         i_bgs; // necessary to match
@@ -148,7 +133,6 @@ void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) {
     }
 }
 
-/* 80076350-8007654C 070C90 01FC+00 2/2 0/0 0/0 .text            GroundCheck__9dBgS_AcchFR4dBgS */
 void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
     if (!(m_flags & GRND_NONE)) {
         cXyz grnd_pos;
@@ -200,8 +184,6 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) {
     }
 }
 
-/* 8007654C-80076624 070E8C 00D8+00 1/1 0/0 0/0 .text            GroundRoofProc__9dBgS_AcchFR4dBgS
- */
 void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) {
     if (m_ground_h != -G_CM3D_F_INF) {
         if (field_0xbc < field_0xcc && field_0xcc < pm_pos->y) {
@@ -218,7 +200,6 @@ void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) {
     }
 }
 
-/* 80076624-80076AAC 070F64 0488+00 1/1 0/0 0/0 .text            LineCheck__9dBgS_AcchFR4dBgS */
 void dBgS_Acch::LineCheck(dBgS& i_bgs) {
     dBgS_RoofChk roof_chk;
     roof_chk.SetActorPid(m_gnd.GetActorPid());
@@ -321,7 +302,6 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) {
     }
 }
 
-/* 80076AAC-80076F84 0713EC 04D8+00 0/0 15/15 414/414 .text            CrrPos__9dBgS_AcchFR4dBgS */
 void dBgS_Acch::CrrPos(dBgS& i_bgs) {
     bool bvar9;
     if (!(m_flags & 1)) {
@@ -480,7 +460,6 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) {
     }
 }
 
-/* 80076F84-80076FC0 0718C4 003C+00 1/1 0/0 0/0 .text            GetWallAllR__9dBgS_AcchFv */
 f32 dBgS_Acch::GetWallAllR() {
     f32 ret = 0.0f;
 
@@ -493,14 +472,12 @@ f32 dBgS_Acch::GetWallAllR() {
     return ret;
 }
 
-/* 80076FC0-8007703C 071900 007C+00 1/1 0/0 0/0 .text            SetWallCir__9dBgS_AcchFv */
 void dBgS_Acch::SetWallCir() {
     for (int i = 0; i < m_tbl_size; i++) {
         pm_acch_cir[i].SetCir(*pm_pos);
     }
 }
 
-/* 8007703C-80077114 07197C 00D8+00 1/1 0/0 0/0 .text            CalcWallBmdCyl__9dBgS_AcchFv */
 void dBgS_Acch::CalcWallBmdCyl() {
     if (m_tbl_size <= 0) {
         m_wall_cyl.Set(*pm_pos, 0.0f, 0.0f);
@@ -533,13 +510,11 @@ void dBgS_Acch::CalcWallBmdCyl() {
     }
 }
 
-/* 80077114-80077128 071A54 0014+00 0/0 0/0 24/24 .text            SetGroundUpY__9dBgS_AcchFf */
 void dBgS_Acch::SetGroundUpY(f32 param_0) {
     field_0x94 = param_0 - field_0x90;
     field_0x90 = param_0;
 }
 
-/* 80077128-80077178 071A68 0050+00 1/1 0/0 0/0 .text            GetWallAllLowH__9dBgS_AcchFv */
 f32 dBgS_Acch::GetWallAllLowH() {
     if (m_tbl_size <= 0) {
         return 0.0f;
@@ -556,7 +531,6 @@ f32 dBgS_Acch::GetWallAllLowH() {
     return tmp;
 }
 
-/* 80077178-800771E4 071AB8 006C+00 1/1 0/0 0/0 .text            GetWallAllLowH_R__9dBgS_AcchFv */
 f32 dBgS_Acch::GetWallAllLowH_R() {
     if (m_tbl_size <= 0) {
         return 0.0f;
@@ -575,7 +549,6 @@ f32 dBgS_Acch::GetWallAllLowH_R() {
     return pm_acch_cir[index].GetWallR();
 }
 
-/* 800771E4-80077200 071B24 001C+00 1/1 4/4 0/0 .text            GetSpeedY__9dBgS_AcchFv */
 f32 dBgS_Acch::GetSpeedY() {
     if (pm_speed != NULL) {
         return pm_speed->y;
@@ -584,7 +557,6 @@ f32 dBgS_Acch::GetSpeedY() {
     return 0.0f;
 }
 
-/* 80077200-80077278 071B40 0078+00 0/0 4/4 0/0 .text            GetWallAddY__9dBgS_AcchFR3Vec */
 f32 dBgS_Acch::GetWallAddY(Vec& param_0) {
     if (!ChkGroundFind() || field_0xa0.mNormal.y < 0.5f) {
         return 0.0f;
@@ -601,75 +573,59 @@ f32 dBgS_Acch::GetWallAddY(Vec& param_0) {
     return 0.0f;
 }
 
-/* 80077278-80077288 071BB8 0010+00 0/0 2/2 0/0 .text            SetNowActorInfo__9dBgS_AcchFiPvUi
- */
 void dBgS_Acch::SetNowActorInfo(int bg_index, void* param_1, fpc_ProcID param_2) {
     m_bg_index = bg_index;
     field_0x7c = param_1;
     field_0x80 = param_2;
 }
 
-/* 80077288-800772E8 071BC8 0060+00 0/0 4/4 0/0 .text            SetWallPolyIndex__9dBgS_AcchFii */
 void dBgS_Acch::SetWallPolyIndex(int index, int poly_index) {
     pm_acch_cir[index].SetActorInfo(m_bg_index, field_0x7c, field_0x80);
     pm_acch_cir[index].SetPolyIndex(poly_index);
 }
 
-/* 800772E8-8007732C 071C28 0044+00 0/0 6/6 0/0 .text            CalcMovePosWork__9dBgS_AcchFv */
 void dBgS_Acch::CalcMovePosWork() {
     SetWallCir();
     SetLin();
     CalcWallBmdCyl();
 }
 
-/* 8007732C-80077388 071C6C 005C+00 0/0 2/2 0/0 .text            CalcWallRR__9dBgS_AcchFv */
 void dBgS_Acch::CalcWallRR() {
     for (int i = 0; i < m_tbl_size; i++) {
         pm_acch_cir[i].CalcWallRR();
     }
 }
 
-/* 80077388-800773A4 071CC8 001C+00 0/0 1/1 0/0 .text            SetMoveBGOnly__9dBgS_AcchFv */
 void dBgS_Acch::SetMoveBGOnly() {
     m_flags |= MOVE_BG_ONLY;
     m_wtr.OnMoveBGOnly();
 }
 
-/* 800773A4-800773C0 071CE4 001C+00 0/0 4/4 17/17 .text            ClrMoveBGOnly__9dBgS_AcchFv */
 void dBgS_Acch::ClrMoveBGOnly() {
     m_flags &= ~MOVE_BG_ONLY;
     m_wtr.OffMoveBGOnly();
 }
 
-/* 800773C0-800773D0 071D00 0010+00 0/0 1/1 2/2 .text            SetGndThinCellingOff__9dBgS_AcchFv
- */
 void dBgS_Acch::SetGndThinCellingOff() {
     m_flags |= GND_THIN_CELLING_OFF;
 }
 
-/* 800773D0-800773E0 071D10 0010+00 0/0 1/1 0/0 .text            ClrGndThinCellingOff__9dBgS_AcchFv
- */
 void dBgS_Acch::ClrGndThinCellingOff() {
     m_flags &= ~GND_THIN_CELLING_OFF;
 }
 
-/* 800773E0-800773EC 071D20 000C+00 1/1 0/0 0/0 .text            ChkGndThinCellingOff__9dBgS_AcchFv
- */
 bool dBgS_Acch::ChkGndThinCellingOff() {
     return m_flags & GND_THIN_CELLING_OFF;
 }
 
-/* 800773EC-800773FC 071D2C 0010+00 0/0 1/1 1/1 .text            OnWallSort__9dBgS_AcchFv */
 void dBgS_Acch::OnWallSort() {
     m_flags |= WALL_SORT;
 }
 
-/* 800773FC-80077408 071D3C 000C+00 1/1 0/0 0/0 .text            ChkWallSort__9dBgS_AcchFv */
 bool dBgS_Acch::ChkWallSort() {
     return m_flags & WALL_SORT;
 }
 
-/* 80077408-80077414 071D48 000C+00 1/1 0/0 0/0 .text            ChkLineDown__9dBgS_AcchFv */
 bool dBgS_Acch::ChkLineDown() {
     return m_flags & LINE_DOWN;
 }
diff --git a/src/d/d_bg_s_chk.cpp b/src/d/d_bg_s_chk.cpp
index 0abf4b4e5b..bb303e507e 100644
--- a/src/d/d_bg_s_chk.cpp
+++ b/src/d/d_bg_s_chk.cpp
@@ -7,18 +7,14 @@
 
 #include "d/d_bg_s_chk.h"
 
-/* 8007749C-800774E8 071DDC 004C+00 0/0 6/6 0/0 .text            __ct__8dBgS_ChkFv */
 dBgS_Chk::dBgS_Chk() {}
 
-/* 800774E8-80077560 071E28 0078+00 2/1 6/6 0/0 .text            __dt__8dBgS_ChkFv */
 dBgS_Chk::~dBgS_Chk() {}
 
-/* 80077560-80077564 071EA0 0004+00 0/0 6/6 0/0 .text            GetPolyPassChkInfo__8dBgS_ChkFv */
 cBgS_PolyPassChk* dBgS_Chk::GetPolyPassChkInfo() {
     return this;
 }
 
-/* 80077564-80077574 071EA4 0010+00 0/0 6/6 0/0 .text            GetGrpPassChkInfo__8dBgS_ChkFv */
 cBgS_GrpPassChk* dBgS_Chk::GetGrpPassChkInfo() {
     return this;
 }
diff --git a/src/d/d_bg_s_gnd_chk.cpp b/src/d/d_bg_s_gnd_chk.cpp
index a3a246dc32..9f9f402592 100644
--- a/src/d/d_bg_s_gnd_chk.cpp
+++ b/src/d/d_bg_s_gnd_chk.cpp
@@ -7,44 +7,34 @@
 
 #include "d/d_bg_s_gnd_chk.h"
 
-/* 8007757C-800775F0 071EBC 0074+00 3/3 15/15 289/289 .text            __ct__11dBgS_GndChkFv */
 dBgS_GndChk::dBgS_GndChk() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
 }
 
-/* 800775F0-80077678 071F30 0088+00 8/7 13/13 295/295 .text            __dt__11dBgS_GndChkFv */
 dBgS_GndChk::~dBgS_GndChk() {}
 
-/* 80077678-80077710 071FB8 0098+00 0/0 0/0 1/1 .text            __ct__18dBgS_ObjGndChk_WtrFv */
 dBgS_ObjGndChk_Wtr::dBgS_ObjGndChk_Wtr() {
     OffNormalGrp();
     OnWaterGrp();
 }
 
-/* 80077710-800777B0 072050 00A0+00 4/3 0/0 1/1 .text            __dt__18dBgS_ObjGndChk_WtrFv */
 dBgS_ObjGndChk_Wtr::~dBgS_ObjGndChk_Wtr() {}
 
-/* 800777B0-80077848 0720F0 0098+00 0/0 0/0 61/61 .text            __ct__18dBgS_ObjGndChk_SplFv */
 dBgS_ObjGndChk_Spl::dBgS_ObjGndChk_Spl() {
     OffNormalGrp();
     OnSpl();
 }
 
-/* 80077848-800778E8 072188 00A0+00 4/3 0/0 61/61 .text            __dt__18dBgS_ObjGndChk_SplFv */
 dBgS_ObjGndChk_Spl::~dBgS_ObjGndChk_Spl() {}
 
-/* 800778E8-80077988 072228 00A0+00 4/3 3/3 7/7 .text            __dt__18dBgS_ObjGndChk_AllFv */
 dBgS_ObjGndChk_All::~dBgS_ObjGndChk_All() {}
 
-/* 80077988-80077A00 0722C8 0078+00 5/4 2/2 0/0 .text            __dt__14dBgS_CamGndChkFv */
 dBgS_CamGndChk::~dBgS_CamGndChk() {}
 
-/* 80077A00-80077A98 072340 0098+00 0/0 5/5 1/1 .text            __ct__18dBgS_CamGndChk_WtrFv */
 dBgS_CamGndChk_Wtr::dBgS_CamGndChk_Wtr() {
     OffNormalGrp();
     OnWaterGrp();
 }
 
-/* 80077A98-80077B10 0723D8 0078+00 4/3 5/5 1/1 .text            __dt__18dBgS_CamGndChk_WtrFv */
 dBgS_CamGndChk_Wtr::~dBgS_CamGndChk_Wtr() {}
diff --git a/src/d/d_bg_s_grp_pass_chk.cpp b/src/d/d_bg_s_grp_pass_chk.cpp
index 96937bf69d..38bbeee33c 100644
--- a/src/d/d_bg_s_grp_pass_chk.cpp
+++ b/src/d/d_bg_s_grp_pass_chk.cpp
@@ -5,10 +5,8 @@
 
 #include "d/d_bg_s_grp_pass_chk.h"
 
-/* 80077BA0-80077BC4 0724E0 0024+00 0/0 1/1 0/0 .text            __ct__15dBgS_GrpPassChkFv */
 dBgS_GrpPassChk::dBgS_GrpPassChk() {
     mGrp = 1;
 }
 
-/* 80077BC4-80077C20 072504 005C+00 1/0 1/1 0/0 .text            __dt__15dBgS_GrpPassChkFv */
 dBgS_GrpPassChk::~dBgS_GrpPassChk() {}
diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp
index 5e8a7547fa..38ba87f05b 100644
--- a/src/d/d_bg_s_lin_chk.cpp
+++ b/src/d/d_bg_s_lin_chk.cpp
@@ -10,17 +10,13 @@
 
 #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
 
-/* 80077C68-80077CDC 0725A8 0074+00 8/8 3/3 388/388 .text            __ct__11dBgS_LinChkFv */
 dBgS_LinChk::dBgS_LinChk() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
 }
 
-/* 80077CDC-80077D64 07261C 0088+00 12/11 5/5 378/378 .text            __dt__11dBgS_LinChkFv */
 dBgS_LinChk::~dBgS_LinChk() {}
 
-/* 80077D64-80077DA4 0726A4 0040+00 0/0 15/15 307/307 .text
- * Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c              */
 void dBgS_LinChk::Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const* p_actor) {
     JUT_ASSERT(45, !isnan(pi_start->x));
     JUT_ASSERT(46, !isnan(pi_start->y));
@@ -51,76 +47,58 @@ void dBgS_LinChk::Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const
     Set2(pi_start, pi_end, id);
 }
 
-/* 80077DA4-80077E00 0726E4 005C+00 1/1 12/12 1/1 .text            __ct__14dBgS_CamLinChkFv */
 dBgS_CamLinChk::dBgS_CamLinChk() {
     SetCam();
 }
 
-/* 80077E00-80077E78 072740 0078+00 5/4 12/12 1/1 .text            __dt__14dBgS_CamLinChkFv */
 dBgS_CamLinChk::~dBgS_CamLinChk() {}
 
-/* 80077E78-80077EE4 0727B8 006C+00 0/0 0/0 1/1 .text            __ct__21dBgS_CamLinChk_NorWtrFv */
 dBgS_CamLinChk_NorWtr::dBgS_CamLinChk_NorWtr() {
     OnWaterGrp();
     OnNormalGrp();
 }
 
-/* 80077EE4-80077F5C 072824 0078+00 4/3 0/0 1/1 .text            __dt__21dBgS_CamLinChk_NorWtrFv */
 dBgS_CamLinChk_NorWtr::~dBgS_CamLinChk_NorWtr() {}
 
-/* 80077F5C-80077FB8 07289C 005C+00 0/0 4/4 9/9 .text            __ct__14dBgS_ObjLinChkFv */
 dBgS_ObjLinChk::dBgS_ObjLinChk() {
     SetObj();
 }
 
-/* 80077FB8-80078030 0728F8 0078+00 4/3 2/2 11/11 .text            __dt__14dBgS_ObjLinChkFv */
 dBgS_ObjLinChk::~dBgS_ObjLinChk() {}
 
-/* 80078030-8007808C 072970 005C+00 0/0 1/1 4/4 .text            __ct__15dBgS_LinkLinChkFv */
 dBgS_LinkLinChk::dBgS_LinkLinChk() {
     SetLink();
 }
 
-/* 8007808C-80078104 0729CC 0078+00 4/3 1/1 5/5 .text            __dt__15dBgS_LinkLinChkFv */
 dBgS_LinkLinChk::~dBgS_LinkLinChk() {}
 
-/* 80078104-80078160 072A44 005C+00 0/0 0/0 1/1 .text            __ct__15dBgS_BombLinChkFv */
 dBgS_BombLinChk::dBgS_BombLinChk() {
     SetBomb();
 }
 
-/* 80078160-800781D8 072AA0 0078+00 4/3 0/0 1/1 .text            __dt__15dBgS_BombLinChkFv */
 dBgS_BombLinChk::~dBgS_BombLinChk() {}
 
-/* 800781D8-80078240 072B18 0068+00 0/0 1/1 2/2 .text            __ct__16dBgS_ArrowLinChkFv */
 dBgS_ArrowLinChk::dBgS_ArrowLinChk() {
     SetArrow();
     OnNormalGrp();
 }
 
-/* 80078240-800782B8 072B80 0078+00 4/3 1/1 2/2 .text            __dt__16dBgS_ArrowLinChkFv */
 dBgS_ArrowLinChk::~dBgS_ArrowLinChk() {}
 
-/* 800782B8-80078314 072BF8 005C+00 0/0 1/1 1/1 .text            __ct__20dBgS_BoomerangLinChkFv */
 dBgS_BoomerangLinChk::dBgS_BoomerangLinChk() {
     SetBoomerang();
 }
 
-/* 80078314-8007838C 072C54 0078+00 4/3 1/1 1/1 .text            __dt__20dBgS_BoomerangLinChkFv */
 dBgS_BoomerangLinChk::~dBgS_BoomerangLinChk() {}
 
-/* 8007838C-800783E8 072CCC 005C+00 0/0 1/1 0/0 .text            __ct__15dBgS_RopeLinChkFv */
 dBgS_RopeLinChk::dBgS_RopeLinChk() {
     SetRope();
 }
 
-/* 800783E8-80078460 072D28 0078+00 4/3 1/1 0/0 .text            __dt__15dBgS_RopeLinChkFv */
 dBgS_RopeLinChk::~dBgS_RopeLinChk() {}
 
-/* 80078460-800784BC 072DA0 005C+00 0/0 0/0 1/1 .text            __ct__16dBgS_HorseLinChkFv */
 dBgS_HorseLinChk::dBgS_HorseLinChk() {
     SetHorse();
 }
 
-/* 800784BC-80078534 072DFC 0078+00 4/3 0/0 1/1 .text            __dt__16dBgS_HorseLinChkFv */
 dBgS_HorseLinChk::~dBgS_HorseLinChk() {}
diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp
index 77790534d2..e0bdabc811 100644
--- a/src/d/d_bg_s_movebg_actor.cpp
+++ b/src/d/d_bg_s_movebg_actor.cpp
@@ -10,67 +10,52 @@
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 
-/* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text            __ct__16dBgS_MoveBgActorFv */
 dBgS_MoveBgActor::dBgS_MoveBgActor() {
     mpBgW = NULL;
 }
 
-/* 80078668-80078688 072FA8 0020+00 1/1 0/0 0/0 .text            CheckCreateHeap__FP10fopAc_ac_c */
 static int CheckCreateHeap(fopAc_ac_c* p_actor) {
     return static_cast<dBgS_MoveBgActor*>(p_actor)->MoveBGCreateHeap();
 }
 
-/* 80078688-80078690 072FC8 0008+00 1/0 0/0 2/0 .text            CreateHeap__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::CreateHeap() {
     return 1;
 }
 
-/* 80078690-80078698 072FD0 0008+00 1/0 0/0 60/0 .text            Create__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::Create() {
     return 1;
 }
 
-/* 80078698-800786A0 072FD8 0008+00 1/0 0/0 3/0 .text Execute__16dBgS_MoveBgActorFPPA3_A4_f */
 int dBgS_MoveBgActor::Execute(Mtx**) {
     return 1;
 }
 
-/* 800786A0-800786A8 072FE0 0008+00 1/0 0/0 2/0 .text            Draw__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::Draw() {
     return 1;
 }
 
-/* 800786A8-800786B0 072FE8 0008+00 1/0 0/0 6/0 .text            Delete__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::Delete() {
     return 1;
 }
 
-/* 800786B0-800786B8 072FF0 0008+00 1/0 0/0 171/0 .text            IsDelete__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::IsDelete() {
     return 1;
 }
 
-/* 800786B8-800786C0 072FF8 0008+00 1/0 0/0 171/0 .text            ToFore__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::ToFore() {
     return 1;
 }
 
-/* 800786C0-800786C8 073000 0008+00 1/0 0/0 171/0 .text            ToBack__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::ToBack() {
     return 1;
 }
 
-/* ############################################################################################## */
-/* 80450F70-80450F74 000470 0004+00 2/2 0/0 0/0 .sbss            m_name__16dBgS_MoveBgActor */
 const char* dBgS_MoveBgActor::m_name;
 
-/* 80450F74-80450F78 000474 0004+00 2/2 0/0 0/0 .sbss            m_dzb_id__16dBgS_MoveBgActor */
 int dBgS_MoveBgActor::m_dzb_id;
 
-/* 80450F78-80450F80 000478 0004+04 2/2 0/0 1/1 .sbss            m_set_func__16dBgS_MoveBgActor */
 MoveBGActor_SetFunc dBgS_MoveBgActor::m_set_func;
 
-/* 800786C8-800787BC 073008 00F4+00 1/1 0/0 0/0 .text MoveBGCreateHeap__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::MoveBGCreateHeap() {
     if (!CreateHeap()) {
         return 0;
@@ -130,7 +115,6 @@ int dBgS_MoveBgActor::MoveBGCreate(char const* i_arcName, int i_dzb_id,
     return Create() ? 4 : 5;
 }
 
-/* 800788DC-80078950 07321C 0074+00 0/0 0/0 169/169 .text MoveBGDelete__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::MoveBGDelete() {
     int ret = Delete();
 
@@ -140,7 +124,6 @@ int dBgS_MoveBgActor::MoveBGDelete() {
     return ret;
 }
 
-/* 80078950-80078A14 073290 00C4+00 0/0 0/0 183/183 .text MoveBGExecute__16dBgS_MoveBgActorFv */
 int dBgS_MoveBgActor::MoveBGExecute() {
     Mtx* new_mtx = NULL;
 
diff --git a/src/d/d_bg_s_roof_chk.cpp b/src/d/d_bg_s_roof_chk.cpp
index 5dd9822e61..d3f62818ce 100644
--- a/src/d/d_bg_s_roof_chk.cpp
+++ b/src/d/d_bg_s_roof_chk.cpp
@@ -7,7 +7,6 @@
 
 #include "d/d_bg_s_roof_chk.h"
 
-/* 80078FF4-80079090 073934 009C+00 0/0 10/10 1/1 .text            __ct__12dBgS_RoofChkFv */
 dBgS_RoofChk::dBgS_RoofChk() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
@@ -18,10 +17,8 @@ dBgS_RoofChk::dBgS_RoofChk() {
     field_0x48 = 0;
 }
 
-/* 80079090-80079124 0739D0 0094+00 4/3 11/11 1/1 .text            __dt__12dBgS_RoofChkFv */
 dBgS_RoofChk::~dBgS_RoofChk() {}
 
-/* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text            Init__12dBgS_RoofChkFv */
 void dBgS_RoofChk::Init() {
     SetNowY(G_CM3D_F_INF);
     ClearPi();
diff --git a/src/d/d_bg_s_sph_chk.cpp b/src/d/d_bg_s_sph_chk.cpp
index e57c0ecdd2..e7c9c4c733 100644
--- a/src/d/d_bg_s_sph_chk.cpp
+++ b/src/d/d_bg_s_sph_chk.cpp
@@ -7,7 +7,6 @@
 
 #include "d/d_bg_s_sph_chk.h"
 
-/* 80078A14-80078AC0 073354 00AC+00 0/0 1/1 1/1 .text            __ct__11dBgS_SphChkFv */
 dBgS_SphChk::dBgS_SphChk() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
@@ -16,5 +15,4 @@ dBgS_SphChk::dBgS_SphChk() {
     mCallback = NULL;
 }
 
-/* 80078AC0-80078B70 073400 00B0+00 5/4 2/2 0/0 .text            __dt__11dBgS_SphChkFv */
 dBgS_SphChk::~dBgS_SphChk() {}
diff --git a/src/d/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp
index f67e11b17a..2915686a47 100644
--- a/src/d/d_bg_s_spl_grp_chk.cpp
+++ b/src/d/d_bg_s_spl_grp_chk.cpp
@@ -7,13 +7,11 @@
 
 #include "d/d_bg_s_spl_grp_chk.h"
 
-/* 80078B90-80078BB0 0734D0 0020+00 0/0 2/2 3/3 .text            Set__14dBgS_SplGrpChkFR4cXyzf */
 void dBgS_SplGrpChk::Set(cXyz& ground, f32 roof) {
     m_ground = ground;
     m_roof = roof;
 }
 
-/* 80078BB0-80078C78 0734F0 00C8+00 0/0 1/1 0/0 .text            __ct__14dBgS_SplGrpChkFv */
 dBgS_SplGrpChk::dBgS_SplGrpChk() {
     SetPolyPassChk(GetPolyPassChkInfo());
     SetGrpPassChk(GetGrpPassChkInfo());
@@ -30,10 +28,8 @@ dBgS_SplGrpChk::dBgS_SplGrpChk() {
     OffFind();
 }
 
-/* 80078C78-80078D0C 0735B8 0094+00 4/3 2/2 4/4 .text            __dt__14dBgS_SplGrpChkFv */
 dBgS_SplGrpChk::~dBgS_SplGrpChk() {}
 
-/* 80078D0C-80078D4C 07364C 0040+00 0/0 1/1 0/0 .text            Init__14dBgS_SplGrpChkFv */
 void dBgS_SplGrpChk::Init() {
     OffIn();
     OffFind();
diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp
index f6dbfc1e23..09a96ed166 100644
--- a/src/d/d_bg_w.cpp
+++ b/src/d/d_bg_w.cpp
@@ -14,19 +14,14 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_horse.h"
 
-/* 800791C4-800791D4 073B04 0010+00 1/1 0/0 0/0 .text            __ct__11cBgW_RwgElmFv */
 cBgW_RwgElm::cBgW_RwgElm() {}
 
-/* 800791D4-8007921C 073B14 0048+00 2/1 0/0 0/0 .text            __dt__11cBgW_RwgElmFv */
 cBgW_RwgElm::~cBgW_RwgElm() {}
 
-/* 8007921C-80079238 073B5C 001C+00 1/1 0/0 0/0 .text            __ct__13cBgW_NodeTreeFv */
 cBgW_NodeTree::cBgW_NodeTree() {}
 
-/* 80079238-80079294 073B78 005C+00 2/1 0/0 0/0 .text            __dt__13cBgW_NodeTreeFv */
 cBgW_NodeTree::~cBgW_NodeTree() {}
 
-/* 80079294-8007933C 073BD4 00A8+00 1/1 0/0 0/0 .text            __ct__4cBgWFv */
 cBgW::cBgW() {
     pm_bgd = NULL;
     mFlags = GLOBAL_e;
@@ -48,12 +43,10 @@ cBgW::cBgW() {
     field_0x91 = 0;
 }
 
-/* 8007933C-800793A4 073C7C 0068+00 2/1 1/1 5/5 .text            __dt__4cBgWFv */
 cBgW::~cBgW() {
     FreeArea();
 }
 
-/* 800793A4-800793C4 073CE4 0020+00 2/2 0/0 0/0 .text            FreeArea__4cBgWFv */
 void cBgW::FreeArea() {
     pm_tri = NULL;
     pm_rwg = NULL;
@@ -63,7 +56,6 @@ void cBgW::FreeArea() {
     pm_vtx_tbl = NULL;
 }
 
-/* 800793C4-80079484 073D04 00C0+00 2/2 0/0 1/1 .text            GlobalVtx__4cBgWFv */
 void cBgW::GlobalVtx() {
     if (pm_base != NULL) {
         if (!mNeedsFullTransform) {
@@ -79,7 +71,6 @@ void cBgW::GlobalVtx() {
     }
 }
 
-/* 80079484-80079564 073DC4 00E0+00 1/1 0/0 0/0 .text            SetVtx__4cBgWFv */
 bool cBgW::SetVtx() {
     if (mFlags & NO_VTX_TBL_e) {
         pm_vtx_tbl = NULL;
@@ -106,7 +97,6 @@ bool cBgW::SetVtx() {
     return false;
 }
 
-/* 80079564-80079668 073EA4 0104+00 2/0 1/0 0/0 .text            CalcPlane__4cBgWFv */
 void cBgW::CalcPlane() {
     cBgD_Tri_t* tri = pm_bgd->m_t_tbl;
 
@@ -125,7 +115,6 @@ void cBgW::CalcPlane() {
     }
 }
 
-/* 80079668-800796F8 073FA8 0090+00 1/1 0/0 0/0 .text            SetTri__4cBgWFv */
 bool cBgW::SetTri() {
     pm_tri = new cBgW_TriElm[pm_bgd->m_t_num];
 
@@ -137,13 +126,10 @@ bool cBgW::SetTri() {
     return false;
 }
 
-/* 800796F8-80079754 074038 005C+00 2/1 0/0 0/0 .text            __dt__11cBgW_TriElmFv */
 cBgW_TriElm::~cBgW_TriElm() {}
 
-/* 80079754-80079770 074094 001C+00 1/1 0/0 0/0 .text            __ct__11cBgW_TriElmFv */
 cBgW_TriElm::cBgW_TriElm() {}
 
-/* 80079770-800797BC 0740B0 004C+00 1/1 0/0 0/0 .text            BlckConnect__4cBgWFPUsPii */
 void cBgW::BlckConnect(u16* i_start_idx, int* i_prev_idx, int i_idx) {
     if (*i_start_idx == 0xFFFF) {
         *i_start_idx = i_idx;
@@ -157,7 +143,6 @@ void cBgW::BlckConnect(u16* i_start_idx, int* i_prev_idx, int i_idx) {
     pm_rwg[*i_prev_idx].m_next = 0xFFFF;
 }
 
-/* 800797BC-8007998C 0740FC 01D0+00 2/0 1/0 0/0 .text            ClassifyPlane__4cBgWFv */
 void cBgW::ClassifyPlane() {
     if (pm_vtx_tbl == NULL) {
         return;
@@ -199,14 +184,11 @@ void cBgW::ClassifyPlane() {
     }
 }
 
-/* 8007998C-800799E0 0742CC 0054+00 1/1 0/0 0/0 .text MakeBlckTransMinMax__4cBgWFP4cXyzP4cXyz */
 void cBgW::MakeBlckTransMinMax(cXyz* i_min, cXyz* i_max) {
     VECAdd(i_min, &mTransVel, i_min);
     VECAdd(i_max, &mTransVel, i_max);
 }
 
-/* 800799E0-80079A68 074320 0088+00 1/1 0/0 0/0 .text            MakeBlckMinMax__4cBgWFiP4cXyzP4cXyz
- */
 void cBgW::MakeBlckMinMax(int vtx_index, cXyz* i_min, cXyz* i_max) {
     Vec* vtx = &pm_vtx_tbl[vtx_index];
 
@@ -235,7 +217,6 @@ void cBgW::MakeBlckMinMax(int vtx_index, cXyz* i_min, cXyz* i_max) {
     }
 }
 
-/* 80079A68-80079BDC 0743A8 0174+00 1/1 0/0 0/0 .text            MakeBlckBnd__4cBgWFiP4cXyzP4cXyz */
 void cBgW::MakeBlckBnd(int i_blk_idx, cXyz* i_min, cXyz* i_max) {
     int start = pm_bgd->m_b_tbl[i_blk_idx].field_0x0;
     int max;
@@ -271,7 +252,6 @@ void cBgW::MakeBlckBnd(int i_blk_idx, cXyz* i_min, cXyz* i_max) {
     }
 }
 
-/* 80079BDC-80079CC4 07451C 00E8+00 1/1 0/0 0/0 .text            MakeNodeTreeRp__4cBgWFi */
 void cBgW::MakeNodeTreeRp(int i_tree_idx) {
     cBgD_Tree_t* tree_data = &pm_bgd->m_tree_tbl[i_tree_idx];
 
@@ -299,7 +279,6 @@ void cBgW::MakeNodeTreeRp(int i_tree_idx) {
     }
 }
 
-/* 80079CC4-80079DF0 074604 012C+00 1/1 0/0 0/0 .text            MakeNodeTreeGrpRp__4cBgWFi */
 void cBgW::MakeNodeTreeGrpRp(int i_grp_idx) {
     if (pm_bgd->m_g_tbl[i_grp_idx].m_tree_idx != 0xFFFF) {
         MakeNodeTreeRp(pm_bgd->m_g_tbl[i_grp_idx].m_tree_idx);
@@ -320,7 +299,6 @@ void cBgW::MakeNodeTreeGrpRp(int i_grp_idx) {
     }
 }
 
-/* 80079DF0-80079EEC 074730 00FC+00 2/2 0/0 0/0 .text            MakeNodeTree__4cBgWFv */
 void cBgW::MakeNodeTree() {
     if (pm_vtx_tbl == NULL) {
         for (int i = 0; i < pm_bgd->m_g_num; i++) {
@@ -344,7 +322,6 @@ void cBgW::MakeNodeTree() {
     }
 }
 
-/* 80079EEC-80079F38 07482C 004C+00 2/0 1/0 0/0 .text            ChkMemoryError__4cBgWFv */
 bool cBgW::ChkMemoryError() {
     if (pm_tri == NULL || pm_rwg == NULL || pm_blk == NULL || pm_node_tree == NULL ||
         pm_grp == NULL)
@@ -355,7 +332,6 @@ bool cBgW::ChkMemoryError() {
     return false;
 }
 
-/* 80079F38-8007A184 074878 024C+00 1/1 3/3 85/85 .text            Set__4cBgWFP6cBgD_tUlPA3_A4_f */
 bool cBgW::Set(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
     mFlags = GLOBAL_e;
     pm_vtx_tbl = NULL;
@@ -418,13 +394,10 @@ bool cBgW::Set(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
     return false;
 }
 
-/* 8007A184-8007A1E4 074AC4 0060+00 2/1 0/0 0/0 .text            __dt__11cBgW_GrpElmFv */
 cBgW_GrpElm::~cBgW_GrpElm() {}
 
-/* 8007A1E4-8007A200 074B24 001C+00 1/1 0/0 0/0 .text            __ct__11cBgW_GrpElmFv */
 cBgW_GrpElm::cBgW_GrpElm() {}
 
-/* 8007A200-8007A344 074B40 0144+00 1/1 0/0 0/0 .text RwgLineCheck__4cBgWFUsP11cBgS_LinChk */
 bool cBgW::RwgLineCheck(u16 i_poly_index, cBgS_LinChk* i_linchk) {
     bool chk = false;
     cM3dGTri tri;
@@ -455,8 +428,6 @@ bool cBgW::RwgLineCheck(u16 i_poly_index, cBgS_LinChk* i_linchk) {
     return chk;
 }
 
-/* 8007A3A0-8007A52C 074CE0 018C+00 1/1 0/0 0/0 .text            LineCheckRp__4cBgWFP11cBgS_LinChki
- */
 bool cBgW::LineCheckRp(cBgS_LinChk* i_linchk, int i_idx) {
     cBgW_NodeTree* node = &pm_node_tree[i_idx];
 
@@ -499,7 +470,6 @@ bool cBgW::LineCheckRp(cBgS_LinChk* i_linchk, int i_idx) {
     return chk;
 }
 
-/* 8007A52C-8007A658 074E6C 012C+00 1/1 0/0 0/0 .text LineCheckGrpRp__4cBgWFP11cBgS_LinChkii */
 bool cBgW::LineCheckGrpRp(cBgS_LinChk* i_linchk, int i_grp_idx, int depth) {
     cM3dGLin* pline = i_linchk->GetLinP();
     if (!pm_grp[i_grp_idx].m_aab.Cross(pline)) {
@@ -532,13 +502,10 @@ bool cBgW::LineCheckGrpRp(cBgS_LinChk* i_linchk, int i_grp_idx, int depth) {
     return chk;
 }
 
-/* 8007A658-8007A680 074F98 0028+00 2/0 1/0 0/0 .text            LineCheck__4cBgWFP11cBgS_LinChk */
 bool cBgW::LineCheck(cBgS_LinChk* i_linchk) {
     return LineCheckGrpRp(i_linchk, m_rootGrpIdx, 1);
 }
 
-/* 8007A680-8007A774 074FC0 00F4+00 2/2 0/0 0/0 .text
- * RwgGroundCheckCommon__4cBgWFfUsP11cBgS_GndChk                */
 bool cBgW::RwgGroundCheckCommon(f32 i_yPos, u16 i_poly_idx, cBgS_GndChk* i_gndchk) {
     if (i_yPos < i_gndchk->GetPointP().y && i_yPos > i_gndchk->GetNowY()) {
         cBgD_Tri_t* tri = &pm_bgd->m_t_tbl[i_poly_idx];
@@ -556,7 +523,6 @@ bool cBgW::RwgGroundCheckCommon(f32 i_yPos, u16 i_poly_idx, cBgS_GndChk* i_gndch
     return false;
 }
 
-/* 8007A774-8007A824 0750B4 00B0+00 1/1 0/0 0/0 .text RwgGroundCheckGnd__4cBgWFUsP11cBgS_GndChk */
 bool cBgW::RwgGroundCheckGnd(u16 i_poly_idx, cBgS_GndChk* i_gndchk) {
     bool chk = false;
     while (true) {
@@ -574,8 +540,6 @@ bool cBgW::RwgGroundCheckGnd(u16 i_poly_idx, cBgS_GndChk* i_gndchk) {
     return chk;
 }
 
-/* 8007A824-8007A8F4 075164 00D0+00 1/1 0/0 0/0 .text RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk
- */
 bool cBgW::RwgGroundCheckWall(u16 i_poly_idx, cBgS_GndChk* i_gndchk) {
     bool chk = false;
     while (true) {
@@ -596,7 +560,6 @@ bool cBgW::RwgGroundCheckWall(u16 i_poly_idx, cBgS_GndChk* i_gndchk) {
     return chk;
 }
 
-/* 8007A8F4-8007AA50 075234 015C+00 1/1 0/0 0/0 .text GroundCrossRp__4cBgWFP11cBgS_GndChki */
 bool cBgW::GroundCrossRp(cBgS_GndChk* i_gndchk, int i_idx) {
     bool chk = false;
     cBgD_Tree_t* tree = &pm_bgd->m_tree_tbl[i_idx];
@@ -633,7 +596,6 @@ bool cBgW::GroundCrossRp(cBgS_GndChk* i_gndchk, int i_idx) {
     return chk;
 }
 
-/* 8007AA50-8007AB9C 075390 014C+00 1/1 0/0 0/0 .text GroundCrossGrpRp__4cBgWFP11cBgS_GndChkii */
 bool cBgW::GroundCrossGrpRp(cBgS_GndChk* i_gndchk, int i_grp_idx, int i_depth) {
     cBgW_GrpElm* grp = &pm_grp[i_grp_idx];
     if (!grp->m_aab.CrossY(&i_gndchk->GetPointP()) ||
@@ -670,13 +632,10 @@ bool cBgW::GroundCrossGrpRp(cBgS_GndChk* i_gndchk, int i_grp_idx, int i_depth) {
     return chk;
 }
 
-/* 8007AB9C-8007ABC4 0754DC 0028+00 2/0 1/0 0/0 .text            GroundCross__4cBgWFP11cBgS_GndChk
- */
 bool cBgW::GroundCross(cBgS_GndChk* i_gndchk) {
     return GroundCrossGrpRp(i_gndchk, m_rootGrpIdx, 1);
 }
 
-/* 8007ABC4-8007AC10 075504 004C+00 1/1 0/0 0/0 .text            CopyOldMtx__4cBgWFv */
 void cBgW::CopyOldMtx() {
     if (pm_base != NULL) {
         MTXCopy(m_mtx, m_inv_mtx);
@@ -684,7 +643,6 @@ void cBgW::CopyOldMtx() {
     }
 }
 
-/* 8007AC10-8007ADF0 075550 01E0+00 1/1 0/0 0/0 .text            Move__4cBgWFv */
 void cBgW::Move() {
     if (!ChkLock() && (mFlags & MOVE_BG_e)) {
         if (!ChkNoCalcVtx()) {
@@ -724,7 +682,6 @@ void cBgW::Move() {
     }
 }
 
-/* 8007ADF0-8007AEA4 075730 00B4+00 1/1 0/0 0/0 .text RwgShdwDraw__4cBgWFiP13cBgS_ShdwDraw */
 void cBgW::RwgShdwDraw(int i_idx, cBgS_ShdwDraw* i_shdw) {
     while (true) {
         cBgW_RwgElm* rwg = &pm_rwg[i_idx];
@@ -740,8 +697,6 @@ void cBgW::RwgShdwDraw(int i_idx, cBgS_ShdwDraw* i_shdw) {
     }
 }
 
-/* 8007AEA4-8007AFC0 0757E4 011C+00 1/1 0/0 0/0 .text            ShdwDrawRp__4cBgWFP13cBgS_ShdwDrawi
- */
 void cBgW::ShdwDrawRp(cBgS_ShdwDraw* i_shdw, int i_idx) {
     if (pm_node_tree[i_idx].Cross(i_shdw->GetBndP())) {
         cBgD_Tree_t* tree = &pm_bgd->m_tree_tbl[i_idx];
@@ -765,7 +720,6 @@ void cBgW::ShdwDrawRp(cBgS_ShdwDraw* i_shdw, int i_idx) {
     }
 }
 
-/* 8007AFC0-8007B084 075900 00C4+00 1/1 0/0 0/0 .text ShdwDrawGrpRp__4cBgWFP13cBgS_ShdwDrawi */
 void cBgW::ShdwDrawGrpRp(cBgS_ShdwDraw* i_shdw, int i_idx) {
     if (pm_grp[i_idx].m_aab.Cross(i_shdw->GetBndP())) {
         if (pm_bgd->m_g_tbl[i_idx].m_tree_idx != 0xFFFF) {
@@ -783,29 +737,22 @@ void cBgW::ShdwDrawGrpRp(cBgS_ShdwDraw* i_shdw, int i_idx) {
     }
 }
 
-/* 8007B084-8007B0A8 0759C4 0024+00 2/0 1/0 0/0 .text            ShdwDraw__4cBgWFP13cBgS_ShdwDraw */
 void cBgW::ShdwDraw(cBgS_ShdwDraw* i_shdw) {
     ShdwDrawGrpRp(i_shdw, m_rootGrpIdx);
 }
 
-/* 8007B0A8-8007B0B0 0759E8 0008+00 1/0 0/0 0/0 .text ChkPolyThrough__4cBgWFiP16cBgS_PolyPassChk
- */
 bool cBgW::ChkPolyThrough(int param_0, cBgS_PolyPassChk* param_1) {
     return false;
 }
 
-/* 8007B0B0-8007B0DC 0759F0 002C+00 1/0 0/0 0/0 .text
- * ChkShdwDrawThrough__4cBgWFiP16cBgS_PolyPassChk               */
 bool cBgW::ChkShdwDrawThrough(int param_0, cBgS_PolyPassChk* param_1) {
     return ChkPolyThrough(param_0, param_1);
 }
 
-/* 8007B0DC-8007B0E4 075A1C 0008+00 1/0 0/0 0/0 .text ChkGrpThrough__4cBgWFiP15cBgS_GrpPassChki */
 bool cBgW::ChkGrpThrough(int param_0, cBgS_GrpPassChk* param_1, int param_2) {
     return false;
 }
 
-/* 8007B0E4-8007B164 075A24 0080+00 2/0 1/0 0/0 .text GetGrpRoomIndex__4cBgWCFRC13cBgS_PolyInfo */
 int cBgW::GetGrpRoomIndex(cBgS_PolyInfo const& poly) const {
     int grp_index = GetTriGrp(poly.GetPolyIndex());
 
@@ -823,12 +770,10 @@ int cBgW::GetGrpRoomIndex(cBgS_PolyInfo const& poly) const {
     return room_index;
 }
 
-/* 8007B164-8007B17C 075AA4 0018+00 2/0 1/0 0/0 .text            GetBnd__4cBgWCFv */
 cM3dGAab* cBgW::GetBnd() const {
     return &pm_grp[m_rootGrpIdx].m_aab;
 }
 
-/* 8007B17C-8007B1B4 075ABC 0038+00 0/0 1/1 0/0 .text            GetTrans__4cBgWCFP4cXyz */
 void cBgW::GetTrans(cXyz* o_trans) const {
     MtxP base = pm_base;
     o_trans->x = base[0][3] - m_inv_mtx[0][3];
@@ -836,8 +781,6 @@ void cBgW::GetTrans(cXyz* o_trans) const {
     o_trans->z = base[2][3] - m_inv_mtx[2][3];
 }
 
-/* 8007B1B4-8007B240 075AF4 008C+00 2/0 1/0 0/0 .text
- * GetTriPnt__4cBgWCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz        */
 bool cBgW::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* o_pntA, cXyz* o_pntB, cXyz* o_pntC) const {
     int poly_index = poly.GetPolyIndex();
     cBgD_Tri_t* tri = &pm_bgd->m_t_tbl[poly_index];
@@ -848,227 +791,179 @@ bool cBgW::GetTriPnt(cBgS_PolyInfo const& poly, cXyz* o_pntA, cXyz* o_pntB, cXyz
     return true;
 }
 
-/* 8007B240-8007B270 075B80 0030+00 2/0 1/0 0/0 .text            GetTopUnder__4cBgWCFPfPf */
 void cBgW::GetTopUnder(f32* o_top, f32* o_under) const {
     *o_under = pm_grp[m_rootGrpIdx].m_aab.GetMinP()->y;
     *o_top = pm_grp[m_rootGrpIdx].m_aab.GetMaxP()->y;
 }
 
-/* 8007B270-8007B2B0 075BB0 0040+00 2/0 1/0 0/0 .text            GetTriPla__4cBgWCFRC13cBgS_PolyInfo
- */
 cM3dGPla cBgW::GetTriPla(cBgS_PolyInfo const& poly) const {
     int poly_index = poly.GetPolyIndex();
     JUT_ASSERT(1956, 0 <= poly_index && poly_index < pm_bgd->m_t_num);
     return pm_tri[poly_index].m_plane;
 }
 
-/* 8007B2B0-8007B2F4 075BF0 0044+00 2/0 1/0 0/0 .text            GetGrpInf__4cBgWCFRC13cBgS_PolyInfo
- */
 u32 cBgW::GetGrpInf(cBgS_PolyInfo const& poly) const {
     int grp = GetTriGrp(poly.GetPolyIndex());
     return pm_bgd->m_g_tbl[grp].m_info;
 }
 
-/* 8007B2F4-8007B30C 075C34 0018+00 5/5 0/0 0/0 .text            GetPolyInfId__4cBgWCFi */
 int cBgW::GetPolyInfId(int poly_index) const {
     return pm_bgd->m_t_tbl[poly_index].m_id;
 }
 
-/* 8007B30C-8007B360 075C4C 0054+00 6/6 0/0 0/0 .text            GetPolyInf0__4cBgWCFiUlUl */
 u32 cBgW::GetPolyInf0(int poly_index, u32 mask, u32 shift) const {
     int id = GetPolyInfId(poly_index);
     return (pm_bgd->m_ti_tbl[id].m_info0 & mask) >> shift;
 }
 
-/* 8007B360-8007B3AC 075CA0 004C+00 10/10 0/0 0/0 .text GetMaskPolyInf0_NoShift__4cBgWCFiUl */
 u32 cBgW::GetMaskPolyInf0_NoShift(int poly_index, u32 mask) const {
     int id = GetPolyInfId(poly_index);
     return (pm_bgd->m_ti_tbl[id].m_info0 & mask);
 }
 
-/* 8007B3AC-8007B3D8 075CEC 002C+00 1/0 1/0 0/0 .text            GetExitId__4dBgWFRC13cBgS_PolyInfo
- */
 int dBgW::GetExitId(cBgS_PolyInfo const& poly) {
     return GetPolyInf0(poly.GetPolyIndex(), 0x3F, 0);
 }
 
-/* 8007B3D8-8007B404 075D18 002C+00 1/0 1/0 0/0 .text GetPolyColor__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetPolyColor(cBgS_PolyInfo const& poly) {
     return GetPolyInf0(poly.GetPolyIndex(), 0x3FC0, 6);
 }
 
-/* 8007B404-8007B430 075D44 002C+00 1/0 1/0 0/0 .text GetHorseNoEntry__4dBgWFRC13cBgS_PolyInfo */
 BOOL dBgW::GetHorseNoEntry(cBgS_PolyInfo const& poly) {
     return GetPolyInf0(poly.GetPolyIndex(), 0x200000, 21);
 }
 
-/* 8007B430-8007B460 075D70 0030+00 1/0 1/0 0/0 .text GetSpecialCode__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetSpecialCode(cBgS_PolyInfo const& poly) {
     return GetSpecialCode(poly.GetPolyIndex());
 }
 
-/* 8007B460-8007B488 075DA0 0028+00 1/0 1/0 0/0 .text            GetSpecialCode__4dBgWFi */
 int dBgW::GetSpecialCode(int poly_index) {
     return GetPolyInf0(poly_index, 0xF000000, 24);
 }
 
-/* 8007B488-8007B4B4 075DC8 002C+00 1/0 1/0 0/0 .text GetMagnetCode__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetMagnetCode(cBgS_PolyInfo const& poly) {
     return GetPolyInf0(poly.GetPolyIndex(), 0x30000000, 28);
 }
 
-/* 8007B4B4-8007B4E0 075DF4 002C+00 1/0 1/0 0/0 .text GetMonkeyBarsCode__4dBgWFRC13cBgS_PolyInfo
- */
 int dBgW::GetMonkeyBarsCode(cBgS_PolyInfo const& poly) {
     return GetPolyInf0(poly.GetPolyIndex(), 0x80000000, 31);
 }
 
-/* 8007B4E0-8007B504 075E20 0024+00 1/0 1/0 0/0 .text            GetPolyObjThrough__4dBgWFi */
 u32 dBgW::GetPolyObjThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x4000);
 }
 
-/* 8007B504-8007B52C 075E44 0028+00 1/0 1/0 0/0 .text            GetPolyCamThrough__4dBgWFi */
 u32 dBgW::GetPolyCamThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x8000);
 }
 
-/* 8007B52C-8007B550 075E6C 0024+00 1/0 1/0 0/0 .text            GetPolyLinkThrough__4dBgWFi */
 u32 dBgW::GetPolyLinkThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x10000);
 }
 
-/* 8007B550-8007B574 075E90 0024+00 1/0 1/0 0/0 .text            GetPolyArrowThrough__4dBgWFi */
 u32 dBgW::GetPolyArrowThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x20000);
 }
 
-/* 8007B574-8007B598 075EB4 0024+00 1/0 1/0 0/0 .text            GetPolyHSStick__4dBgWFi */
 u32 dBgW::GetPolyHSStick(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x40000);
 }
 
-/* 8007B598-8007B5BC 075ED8 0024+00 1/0 1/0 0/0 .text            GetPolyBoomerangThrough__4dBgWFi */
 u32 dBgW::GetPolyBoomerangThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x80000);
 }
 
-/* 8007B5BC-8007B5E0 075EFC 0024+00 1/0 1/0 0/0 .text            GetPolyRopeThrough__4dBgWFi */
 u32 dBgW::GetPolyRopeThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x100000);
 }
 
-/* 8007B5E0-8007B604 075F20 0024+00 1/0 1/0 0/0 .text            GetPolyBombThrough__4dBgWFi */
 u32 dBgW::GetPolyBombThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x800000);
 }
 
-/* 8007B604-8007B630 075F44 002C+00 1/0 1/0 0/0 .text            GetShdwThrough__4dBgWFi */
 bool dBgW::GetShdwThrough(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x400000) != 0;
 }
 
-/* 8007B630-8007B654 075F70 0024+00 1/0 1/0 0/0 .text            GetUnderwaterRoofCode__4dBgWFi */
 u32 dBgW::GetUnderwaterRoofCode(int poly_index) {
     return GetMaskPolyInf0_NoShift(poly_index, 0x40000000);
 }
 
-/* 8007B654-8007B6AC 075F94 0058+00 6/6 0/0 0/0 .text            GetPolyInf1__4cBgWCFiUlUl */
 u32 cBgW::GetPolyInf1(int poly_index, u32 mask, u32 shift) const {
     int id = GetPolyInfId(poly_index);
     return (pm_bgd->m_ti_tbl[id].m_info1 & mask) >> shift;
 }
 
-/* 8007B6AC-8007B6D8 075FEC 002C+00 1/0 1/0 0/0 .text            GetLinkNo__4dBgWFRC13cBgS_PolyInfo
- */
 int dBgW::GetLinkNo(cBgS_PolyInfo const& poly) {
     return GetPolyInf1(poly.GetPolyIndex(), 0xFF, 0);
 }
 
-/* 8007B6D8-8007B704 076018 002C+00 1/0 1/0 0/0 .text GetWallCode__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetWallCode(cBgS_PolyInfo const& poly) {
     return GetPolyInf1(poly.GetPolyIndex(), 0xF00, 8);
 }
 
-/* 8007B704-8007B734 076044 0030+00 1/0 1/0 0/0 .text GetPolyAtt0__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetPolyAtt0(cBgS_PolyInfo const& poly) {
     return GetPolyInf1(poly.GetPolyIndex(), 0xF000, 12);
 }
 
-/* 8007B734-8007B760 076074 002C+00 1/0 1/0 0/0 .text GetPolyAtt1__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetPolyAtt1(cBgS_PolyInfo const& poly) {
     return GetPolyInf1(poly.GetPolyIndex(), 0x70000, 16);
 }
 
-/* 8007B760-8007B78C 0760A0 002C+00 1/0 1/0 0/0 .text GetGroundCode__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetGroundCode(cBgS_PolyInfo const& poly) {
     return GetPolyInf1(poly.GetPolyIndex(), 0xF80000, 19);
 }
 
-/* 8007B78C-8007B7DC 0760CC 0050+00 2/2 0/0 0/0 .text            GetMaskPolyInf1_NoShift__4cBgWCFiUl
- */
 u32 cBgW::GetMaskPolyInf1_NoShift(int poly_index, u32 mask) const {
     int id = GetPolyInfId(poly_index);
     return (pm_bgd->m_ti_tbl[id].m_info1 & mask);
 }
 
-/* 8007B7DC-8007B800 07611C 0024+00 1/0 1/0 0/0 .text            GetIronBallThrough__4dBgWFi */
 u32 dBgW::GetIronBallThrough(int poly_index) {
     return GetMaskPolyInf1_NoShift(poly_index, 0x1000000);
 }
 
-/* 8007B800-8007B824 076140 0024+00 1/0 1/0 0/0 .text            GetAttackThrough__4dBgWFi */
 u32 dBgW::GetAttackThrough(int poly_index) {
     return GetMaskPolyInf1_NoShift(poly_index, 0x2000000);
 }
 
-/* 8007B824-8007B87C 076164 0058+00 4/4 0/0 0/0 .text            GetPolyInf2__4cBgWCFiUlUl */
 u32 cBgW::GetPolyInf2(int poly_index, u32 mask, u32 shift) const {
     int id = GetPolyInfId(poly_index);
     return (pm_bgd->m_ti_tbl[id].m_info2 & mask) >> shift;
 }
 
-/* 8007B87C-8007B8A8 0761BC 002C+00 1/0 1/0 0/0 .text GetCamMoveBG__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetCamMoveBG(cBgS_PolyInfo const& poly) {
     return GetPolyInf2(poly.GetPolyIndex(), 0xFF, 0);
 }
 
-/* 8007B8A8-8007B8D8 0761E8 0030+00 1/0 1/0 0/0 .text GetRoomCamId__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetRoomCamId(cBgS_PolyInfo const& poly) {
     return GetPolyInf2(poly.GetPolyIndex(), 0xFF00, 8);
 }
 
-/* 8007B8D8-8007B904 076218 002C+00 1/0 1/0 0/0 .text GetRoomPathId__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetRoomPathId(cBgS_PolyInfo const& poly) {
     return GetPolyInf2(poly.GetPolyIndex(), 0xFF0000, 16);
 }
 
-/* 8007B904-8007B930 076244 002C+00 1/0 1/0 0/0 .text GetRoomPathPntNo__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetRoomPathPntNo(cBgS_PolyInfo const& poly) {
     return GetPolyInf2(poly.GetPolyIndex(), 0xFF000000, 24);
 }
 
-/* 8007B930-8007B948 076270 0018+00 2/2 0/0 0/0 .text            GetTriGrp__4cBgWCFi */
 int cBgW::GetTriGrp(int poly_index) const {
     return pm_bgd->m_t_tbl[poly_index].m_grp;
 }
 
-/* 8007B948-8007B958 076288 0010+00 2/0 1/0 0/0 .text            ChkNotReady__4cBgWCFv */
 bool cBgW::ChkNotReady() const {
     return pm_vtx_tbl == NULL;
 }
 
-/* 8007B958-8007B964 076298 000C+00 2/0 1/0 0/0 .text            ChkLock__4cBgWCFv */
 bool cBgW::ChkLock() const {
     return mFlags & LOCK_e;
 }
 
-/* 8007B964-8007B970 0762A4 000C+00 2/0 1/0 0/0 .text            ChkMoveBg__4cBgWCFv */
 bool cBgW::ChkMoveBg() const {
     return mFlags & MOVE_BG_e;
 }
 
-/* 8007B970-8007B9C0 0762B0 0050+00 1/1 2/2 87/87 .text            __ct__4dBgWFv */
 dBgW::dBgW() {
     m_crr_func = NULL;
     m_ride_callback = NULL;
@@ -1076,14 +971,11 @@ dBgW::dBgW() {
     m_flags = 0;
 }
 
-/* 8007B9C0-8007B9EC 076300 002C+00 0/0 2/2 115/115 .text            Move__4dBgWFv */
 void dBgW::Move() {
     OnMoveFlag();
     cBgW::Move();
 }
 
-/* 8007B9EC-8007BA40 07632C 0054+00 2/2 0/0 0/0 .text
- * positionWallCorrect__4dBgWFP9dBgS_AcchfR8cM3dGPlaP4cXyzf     */
 void dBgW::positionWallCorrect(dBgS_Acch* i_acch, f32 i_dist, cM3dGPla& plane, cXyz* pupper_pos,
                                f32 speed) {
     i_acch->SetWallHit();
@@ -1098,8 +990,6 @@ void dBgW::positionWallCorrect(dBgS_Acch* i_acch, f32 i_dist, cM3dGPla& plane, c
     pupper_pos->z += move * plane.mNormal.z;
 }
 
-/* 8007BA40-8007C234 076380 07F4+00 1/1 0/0 0/0 .text            RwgWallCorrect__4dBgWFP9dBgS_AcchUs
- */
 bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
     bool correct = false;
 
@@ -1320,8 +1210,6 @@ bool dBgW::RwgWallCorrect(dBgS_Acch* pwi, u16 i_poly_idx) {
     return correct;
 }
 
-/* 8007C234-8007C360 076B74 012C+00 1/1 0/0 0/0 .text            WallCorrectRp__4dBgWFP9dBgS_Acchi
- */
 bool dBgW::WallCorrectRp(dBgS_Acch* i_acch, int i_idx) {
     if (!pm_node_tree[i_idx].Cross(i_acch->GetWallBmdCylP())) {
         return false;
@@ -1352,7 +1240,6 @@ bool dBgW::WallCorrectRp(dBgS_Acch* i_acch, int i_idx) {
     return chk;
 }
 
-/* 8007C360-8007C484 076CA0 0124+00 1/1 0/0 0/0 .text WallCorrectGrpRp__4dBgWFP9dBgS_Acchii */
 bool dBgW::WallCorrectGrpRp(dBgS_Acch* i_acch, int i_idx, int i_depth) {
     if (!pm_grp[i_idx].m_aab.Cross(i_acch->GetWallBmdCylP())) {
         return false;
@@ -1383,7 +1270,6 @@ bool dBgW::WallCorrectGrpRp(dBgS_Acch* i_acch, int i_idx, int i_depth) {
     return chk;
 }
 
-/* 8007C484-8007C4AC 076DC4 0028+00 1/0 1/0 0/0 .text            WallCorrect__4dBgWFP9dBgS_Acch */
 bool dBgW::WallCorrect(dBgS_Acch* pacch) {
     return WallCorrectGrpRp(pacch, m_rootGrpIdx, 1);
 }
@@ -1394,16 +1280,12 @@ struct wcs_data {
     /* 0x8 */ wcs_data* next;
 };
 
-/* 80424B80-80424F70 0518A0 03F0+00 1/1 0/0 0/0 .bss             l_wcsbuf */
 static wcs_data l_wcsbuf[84];
 
-/* 80450F80-80450F84 000480 0004+00 2/2 0/0 0/0 .sbss            l_start */
 static wcs_data* l_start;
 
-/* 80450F84-80450F88 000484 0004+00 2/2 0/0 0/0 .sbss            l_wcsbuf_num */
 static int l_wcsbuf_num;
 
-/* 8007C4AC-8007C714 076DEC 0268+00 1/1 0/0 0/0 .text RwgWallCorrectSort__4dBgWFP9dBgS_AcchUs */
 void dBgW::RwgWallCorrectSort(dBgS_Acch* i_acch, u16 i_poly_idx) {
     while (true) {
         cBgW_RwgElm* rwg_elm = &pm_rwg[i_poly_idx];
@@ -1489,7 +1371,6 @@ void dBgW::RwgWallCorrectSort(dBgS_Acch* i_acch, u16 i_poly_idx) {
     }
 }
 
-/* 8007C714-8007C808 077054 00F4+00 1/1 0/0 0/0 .text WallCorrectRpSort__4dBgWFP9dBgS_Acchi */
 void dBgW::WallCorrectRpSort(dBgS_Acch* i_acch, int i_idx) {
     if (!pm_node_tree[i_idx].Cross(i_acch->GetWallBmdCylP())) {
         return;
@@ -1513,7 +1394,6 @@ void dBgW::WallCorrectRpSort(dBgS_Acch* i_acch, int i_idx) {
     }
 }
 
-/* 8007C808-8007C910 077148 0108+00 1/1 0/0 0/0 .text WallCorrectGrpRpSort__4dBgWFP9dBgS_Acchii */
 bool dBgW::WallCorrectGrpRpSort(dBgS_Acch* i_acch, int i_idx, int i_depth) {
     if (!pm_grp[i_idx].m_aab.Cross(i_acch->GetWallBmdCylP())) {
         return false;
@@ -1539,8 +1419,6 @@ bool dBgW::WallCorrectGrpRpSort(dBgS_Acch* i_acch, int i_idx, int i_depth) {
     return false;
 }
 
-/* 8007C910-8007D0DC 077250 07CC+00 1/0 1/0 0/0 .text            WallCorrectSort__4dBgWFP9dBgS_Acch
- */
 bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
     l_start = NULL;
     l_wcsbuf_num = 0;
@@ -1752,8 +1630,6 @@ bool dBgW::WallCorrectSort(dBgS_Acch* pwi) {
     return correct;
 }
 
-/* 8007D0DC-8007D208 077A1C 012C+00 1/1 0/0 0/0 .text            RwgRoofChk__4dBgWFUsP12dBgS_RoofChk
- */
 bool dBgW::RwgRoofChk(u16 i_poly_idx, dBgS_RoofChk* i_roofchk) {
     bool chk = false;
     f32 crossY;
@@ -1782,8 +1658,6 @@ bool dBgW::RwgRoofChk(u16 i_poly_idx, dBgS_RoofChk* i_roofchk) {
     return chk;
 }
 
-/* 8007D208-8007D330 077B48 0128+00 1/1 0/0 0/0 .text            RoofChkRp__4dBgWFP12dBgS_RoofChki
- */
 bool dBgW::RoofChkRp(dBgS_RoofChk* i_roofchk, int i_idx) {
     cBgW_NodeTree* node = &pm_node_tree[i_idx];
     if (!node->CrossY(i_roofchk->GetPosP()) || !node->UnderPlaneYUnder(i_roofchk->GetNowY()) ||
@@ -1812,7 +1686,6 @@ bool dBgW::RoofChkRp(dBgS_RoofChk* i_roofchk, int i_idx) {
     return chk;
 }
 
-/* 8007D330-8007D470 077C70 0140+00 1/1 0/0 0/0 .text RoofChkGrpRp__4dBgWFP12dBgS_RoofChkii */
 bool dBgW::RoofChkGrpRp(dBgS_RoofChk* i_roofchk, int i_idx, int i_depth) {
     cBgW_GrpElm* grp = &pm_grp[i_idx];
     if (!grp->m_aab.CrossY(i_roofchk->GetPosP()) ||
@@ -1846,12 +1719,10 @@ bool dBgW::RoofChkGrpRp(dBgS_RoofChk* i_roofchk, int i_idx, int i_depth) {
     return chk;
 }
 
-/* 8007D470-8007D498 077DB0 0028+00 1/0 1/0 0/0 .text            RoofChk__4dBgWFP12dBgS_RoofChk */
 bool dBgW::RoofChk(dBgS_RoofChk* pchk) {
     return RoofChkGrpRp(pchk, m_rootGrpIdx, 1);
 }
 
-/* 8007D498-8007D5C4 077DD8 012C+00 1/1 0/0 0/0 .text RwgSplGrpChk__4dBgWFUsP14dBgS_SplGrpChk */
 bool dBgW::RwgSplGrpChk(u16 i_poly_idx, dBgS_SplGrpChk* i_splchk) {
     bool chk = false;
     f32 crossY;
@@ -1880,7 +1751,6 @@ bool dBgW::RwgSplGrpChk(u16 i_poly_idx, dBgS_SplGrpChk* i_splchk) {
     return chk;
 }
 
-/* 8007D5C4-8007D6F0 077F04 012C+00 1/1 0/0 0/0 .text SplGrpChkRp__4dBgWFP14dBgS_SplGrpChki */
 bool dBgW::SplGrpChkRp(dBgS_SplGrpChk* i_splchk, int i_idx) {
     cBgW_NodeTree* node = &pm_node_tree[i_idx];
     if (!node->CrossY(&i_splchk->GetPosP()) || !node->UnderPlaneYUnder(i_splchk->GetRoof()) ||
@@ -1909,7 +1779,6 @@ bool dBgW::SplGrpChkRp(dBgS_SplGrpChk* i_splchk, int i_idx) {
     return chk;
 }
 
-/* 8007D6F0-8007D830 078030 0140+00 1/1 0/0 0/0 .text SplGrpChkGrpRp__4dBgWFP14dBgS_SplGrpChkii */
 bool dBgW::SplGrpChkGrpRp(dBgS_SplGrpChk* i_splchk, int i_idx, int i_depth) {
     cBgW_GrpElm* grp = &pm_grp[i_idx];
     if (!grp->m_aab.CrossY(&i_splchk->GetPosP()) ||
@@ -1943,13 +1812,10 @@ bool dBgW::SplGrpChkGrpRp(dBgS_SplGrpChk* i_splchk, int i_idx, int i_depth) {
     return chk;
 }
 
-/* 8007D830-8007D858 078170 0028+00 1/0 1/0 0/0 .text            SplGrpChk__4dBgWFP14dBgS_SplGrpChk
- */
 bool dBgW::SplGrpChk(dBgS_SplGrpChk* pchk) {
     return SplGrpChkGrpRp(pchk, m_rootGrpIdx, 1);
 }
 
-/* 8007D858-8007D8E8 078198 0090+00 1/1 0/0 0/0 .text RwgCaptPoly__4dBgWFiR13dBgS_CaptPoly */
 void dBgW::RwgCaptPoly(int i_idx, dBgS_CaptPoly& i_captpoly) {
     while (true) {
         cBgW_RwgElm* rwg = &pm_rwg[i_idx];
@@ -1963,8 +1829,6 @@ void dBgW::RwgCaptPoly(int i_idx, dBgS_CaptPoly& i_captpoly) {
     }
 }
 
-/* 8007D8E8-8007DA04 078228 011C+00 1/1 0/0 0/0 .text            CaptPolyRp__4dBgWFR13dBgS_CaptPolyi
- */
 void dBgW::CaptPolyRp(dBgS_CaptPoly& i_captpoly, int i_idx) {
     if (!pm_node_tree[i_idx].Cross(i_captpoly.GetBndP())) {
         return;
@@ -1992,7 +1856,6 @@ void dBgW::CaptPolyRp(dBgS_CaptPoly& i_captpoly, int i_idx) {
     }
 }
 
-/* 8007DA04-8007DAF8 078344 00F4+00 1/1 0/0 0/0 .text CaptPolyGrpRp__4dBgWFR13dBgS_CaptPolyii */
 void dBgW::CaptPolyGrpRp(dBgS_CaptPoly& i_captpoly, int i_idx, int i_depth) {
     cBgW_GrpElm* grp = &pm_grp[i_idx];
     if (!grp->m_aab.Cross(i_captpoly.GetBndP())) {
@@ -2018,13 +1881,10 @@ void dBgW::CaptPolyGrpRp(dBgS_CaptPoly& i_captpoly, int i_idx, int i_depth) {
     }
 }
 
-/* 8007DAF8-8007DB20 078438 0028+00 1/0 1/0 0/0 .text            CaptPoly__4dBgWFR13dBgS_CaptPoly */
 void dBgW::CaptPoly(dBgS_CaptPoly& i_captpoly) {
     CaptPolyGrpRp(i_captpoly, m_rootGrpIdx, 1);
 }
 
-/* 8007DB20-8007DC70 078460 0150+00 1/1 0/0 0/0 .text            RwgSphChk__4dBgWFUsP11dBgS_SphChkPv
- */
 bool dBgW::RwgSphChk(u16 i_poly_idx, dBgS_SphChk* i_sphchk, void* i_data) {
     cM3dGTri tri;
     cBgW_RwgElm* rwg;
@@ -2054,8 +1914,6 @@ bool dBgW::RwgSphChk(u16 i_poly_idx, dBgS_SphChk* i_sphchk, void* i_data) {
     return chk;
 }
 
-/* 8007DC70-8007DDE0 0785B0 0170+00 1/1 0/0 0/0 .text            SphChkRp__4dBgWFP11dBgS_SphChkPvi
- */
 bool dBgW::SphChkRp(dBgS_SphChk* i_sphchk, void* i_data, int i_idx) {
     if (!pm_node_tree[i_idx].Cross(i_sphchk)) {
         return false;
@@ -2096,7 +1954,6 @@ bool dBgW::SphChkRp(dBgS_SphChk* i_sphchk, void* i_data, int i_idx) {
     return chk;
 }
 
-/* 8007DDE0-8007DF00 078720 0120+00 1/1 0/0 0/0 .text SphChkGrpRp__4dBgWFP11dBgS_SphChkPvii */
 bool dBgW::SphChkGrpRp(dBgS_SphChk* i_sphchk, void* i_data, int i_idx, int i_depth) {
     if (!pm_grp[i_idx].m_aab.Cross(i_sphchk)) {
         return false;
@@ -2126,24 +1983,18 @@ bool dBgW::SphChkGrpRp(dBgS_SphChk* i_sphchk, void* i_data, int i_idx, int i_dep
     return chk;
 }
 
-/* 8007DF00-8007DF28 078840 0028+00 1/0 1/0 0/0 .text            SphChk__4dBgWFP11dBgS_SphChkPv */
 bool dBgW::SphChk(dBgS_SphChk* pchk, void* i_data) {
     return SphChkGrpRp(pchk, i_data, m_rootGrpIdx, 1);
 }
 
-/* 8007DF28-8007DF58 078868 0030+00 1/0 1/0 0/0 .text GetPolyGrpRoomInfId__4dBgWFRC13cBgS_PolyInfo
- */
 u8 dBgW::GetPolyGrpRoomInfId(cBgS_PolyInfo const& poly) {
     return GetGrpInf(poly) & 0xFF;
 }
 
-/* 8007DF58-8007DF88 078898 0030+00 1/0 1/0 0/0 .text GetGrpSoundId__4dBgWFRC13cBgS_PolyInfo */
 int dBgW::GetGrpSoundId(cBgS_PolyInfo const& poly) {
     return (GetGrpInf(poly) >> 11) & 0xFF;
 }
 
-/* 8007DF88-8007DFC4 0788C8 003C+00 1/0 0/0 0/0 .text
- * CrrPos__4dBgWFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz       */
 void dBgW::CrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                   csXyz* i_angle, csXyz* i_shapeAngle) {
     if (m_crr_func) {
@@ -2151,8 +2002,6 @@ void dBgW::CrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2,
     }
 }
 
-/* 8007DFC4-8007E000 078904 003C+00 1/0 0/0 0/0 .text
- * TransPos__4dBgWFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz     */
 void dBgW::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                     csXyz* i_angle, csXyz* i_shapeAngle) {
     if (m_crr_func) {
@@ -2160,15 +2009,11 @@ void dBgW::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2
     }
 }
 
-/* 8007E000-8007E02C 078940 002C+00 1/0 0/0 0/0 .text
- * MatrixCrrPos__4dBgWFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
 void dBgW::MatrixCrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                         csXyz* i_angle, csXyz* i_shapeAngle) {
     CrrPos(i_poly, i_actor_ptr, param_2, i_pos, i_angle, i_shapeAngle);
 }
 
-/* 8007E02C-8007E360 07896C 0334+00 1/0 1/0 0/0 .text ChkPolyThrough__4dBgWFiP16cBgS_PolyPassChk
- */
 bool dBgW::ChkPolyThrough(int poly_index, cBgS_PolyPassChk* ppass_chk) {
     if (ppass_chk == NULL) {
         return false;
@@ -2238,8 +2083,6 @@ bool dBgW::ChkPolyThrough(int poly_index, cBgS_PolyPassChk* ppass_chk) {
     return false;
 }
 
-/* 8007E360-8007E3D8 078CA0 0078+00 1/0 1/0 0/0 .text
- * ChkShdwDrawThrough__4dBgWFiP16cBgS_PolyPassChk               */
 bool dBgW::ChkShdwDrawThrough(int poly_index, cBgS_PolyPassChk*) {
     if (GetShdwThrough(poly_index)) {
         return true;
@@ -2248,7 +2091,6 @@ bool dBgW::ChkShdwDrawThrough(int poly_index, cBgS_PolyPassChk*) {
     return GetPolyArrowThrough(poly_index);
 }
 
-/* 8007E3D8-8007E444 078D18 006C+00 1/0 1/0 0/0 .text ChkGrpThrough__4dBgWFiP15cBgS_GrpPassChki */
 bool dBgW::ChkGrpThrough(int i_grp_idx, cBgS_GrpPassChk* i_passChk, int i_depth) {
     if (i_depth != 2 || i_passChk == NULL) {
         return false;
@@ -2268,33 +2110,26 @@ bool dBgW::ChkGrpThrough(int i_grp_idx, cBgS_GrpPassChk* i_passChk, int i_depth)
     return true;
 }
 
-/* 8007E444-8007E474 078D84 0030+00 1/0 1/0 0/0 .text
- * CallRideCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_c           */
 void dBgW::CallRideCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1) {
     if (m_ride_callback != NULL) {
         m_ride_callback(this, param_0, param_1);
     }
 }
 
-/* 8007E474-8007E4A4 078DB4 0030+00 1/0 1/0 0/0 .text
- * CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz */
 void dBgW::CallArrowStickCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz& param_2) {
     if (m_arrow_stick_callback) {
         m_arrow_stick_callback(this, param_0, param_1, param_2);
     }
 }
 
-/* 8007E4A4-8007E4B4 078DE4 0010+00 1/0 1/0 0/0 .text            OffMoveFlag__4dBgWFv */
 void dBgW::OffMoveFlag() {
     m_flags &= ~1;
 }
 
-/* 8007E4B4-8007E4C0 078DF4 000C+00 1/0 1/0 0/0 .text            ChkMoveFlag__4dBgWCFv */
 u32 dBgW::ChkMoveFlag() const {
     return m_flags & 1;
 }
 
-/* 8007E4C0-8007E548 078E00 0088+00 0/0 0/0 1/1 .text            dBgW_NewSet__FP6cBgD_tUlPA3_A4_f */
 dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
     dBgW* nw = new dBgW();
 
@@ -2309,8 +2144,6 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) {
     return nw;
 }
 
-/* ############################################################################################## */
-/* 80450F88-80450F90 -00001 0008+00 0/0 4/4 0/0 .sbss            None */
 /* 80450F88 0001+00 data_80450F88 None */
 /* 80450F89 0001+00 data_80450F89 None */
 /* 80450F8A 0001+00 data_80450F8A None */
diff --git a/src/d/d_bg_w_base.cpp b/src/d/d_bg_w_base.cpp
index 8835d0d9a7..850f2c0e15 100644
--- a/src/d/d_bg_w_base.cpp
+++ b/src/d/d_bg_w_base.cpp
@@ -7,15 +7,12 @@
 
 #include "d/d_bg_w_base.h"
 
-/* 8007E5A8-8007E5F8 078EE8 0050+00 0/0 2/2 0/0 .text            __ct__9dBgW_BaseFv */
 dBgW_Base::dBgW_Base() {
     ClrDBgWBase();
 }
 
-/* 8007E640-8007E69C 078F80 005C+00 1/0 2/2 0/0 .text            __dt__9dBgW_BaseFv */
 dBgW_Base::~dBgW_Base() {}
 
-/* 8007E69C-8007E6D0 078FDC 0034+00 1/1 1/1 0/0 .text            ClrDBgWBase__9dBgW_BaseFv */
 void dBgW_Base::ClrDBgWBase() {
     m_roomId = 0xFF;
     m_priority = 2;
@@ -27,21 +24,14 @@ void dBgW_Base::ClrDBgWBase() {
     field_0xb = 0;
 }
 
-/* 8007E6D0-8007E6D8 079010 0008+00 1/0 1/0 0/0 .text            ChkMemoryError__9dBgW_BaseFv */
 bool dBgW_Base::ChkMemoryError() {
     return false;
 }
 
-/* 8007E6D8-8007E6DC 079018 0004+00 1/0 2/0 0/0 .text
- * CallRideCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_c      */
 void dBgW_Base::CallRideCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1) {}
 
-/* 8007E6DC-8007E6E0 07901C 0004+00 1/0 2/0 0/0 .text
- * CallArrowStickCallBack__9dBgW_BaseFP10fopAc_ac_cP10fopAc_ac_cR4cXyz */
 void dBgW_Base::CallArrowStickCallBack(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz& param_2) {}
 
-/* 8007E6E0-8007E6F4 079020 0014+00 0/0 1/1 0/0 .text            CalcDiffShapeAngleY__9dBgW_BaseFs
- */
 void dBgW_Base::CalcDiffShapeAngleY(s16 param_0) {
     m_diff_ShapeAngleY = param_0 - m_old_ShapeAngleY;
     m_old_ShapeAngleY = param_0;
diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp
index 6390c68d29..14da5ec83a 100644
--- a/src/d/d_bg_w_kcol.cpp
+++ b/src/d/d_bg_w_kcol.cpp
@@ -2,7 +2,6 @@
 
 #include "d/d_bg_w_kcol.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "d/actor/d_a_horse.h"
 #include "d/d_bg_s_cap_poly.h"
 
@@ -14,15 +13,12 @@
 
 #define MAX_DRAW_BIT 0x200
 
-/* 8007E6F4-8007E74C 079034 0058+00 0/0 0/0 1/1 .text            __ct__8dBgWKColFv */
 dBgWKCol::dBgWKCol() {
     m_pkc_head = NULL;
 }
 
-/* 8007E74C-8007E7D0 07908C 0084+00 1/0 0/0 0/0 .text            __dt__8dBgWKColFv */
 dBgWKCol::~dBgWKCol() {}
 
-/* 8007E7D0-8007E804 079110 0034+00 0/0 1/1 0/0 .text            initKCollision__8dBgWKColFPv */
 void* dBgWKCol::initKCollision(void* i_kclData) {
     ((KC_Header*)i_kclData)->m_pos_data = (Vec*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_pos_data);
     ((KC_Header*)i_kclData)->m_nrm_data = (Vec*)((uintptr_t)((KC_Header*)i_kclData) + (uintptr_t)((KC_Header*)i_kclData)->m_nrm_data);
@@ -32,7 +28,6 @@ void* dBgWKCol::initKCollision(void* i_kclData) {
     return i_kclData;
 }
 
-/* 8007E804-8007E850 079144 004C+00 0/0 0/0 1/1 .text            create__8dBgWKColFPvPv */
 void dBgWKCol::create(void* pprism, void* plc) {
     JUT_ASSERT(0x43, pprism != NULL);
     JUT_ASSERT(0x44, plc != NULL);
@@ -47,40 +42,32 @@ void dBgWKCol::create(void* pprism, void* plc) {
     m_code.setBase(plc);
 }
 
-/* 8007E850-8007E86C 079190 001C+00 1/1 0/0 0/0 .text getTriNrm__8dBgWKColCFP12KC_PrismDataPP3Vec
- */
 void dBgWKCol::getTriNrm(KC_PrismData* pkc, Vec** nrm) const {
     Vec* var_r31 = &m_pkc_head->m_nrm_data[pkc->fnrm_i];
     *nrm = var_r31;
 }
 
-/* 8007E86C-8007E87C 0791AC 0010+00 1/0 0/0 0/0 .text            ChkNotReady__8dBgWKColCFv */
 bool dBgWKCol::ChkNotReady() const {
     return m_pkc_head == NULL;
 }
 
-/* 8007E87C-8007E884 0791BC 0008+00 1/0 0/0 0/0 .text            ChkLock__8dBgWKColCFv */
 bool dBgWKCol::ChkLock() const {
     return false;
 }
 
-/* 8007E884-8007E88C 0791C4 0008+00 1/0 0/0 0/0 .text            ChkMoveBg__8dBgWKColCFv */
 bool dBgWKCol::ChkMoveBg() const {
     return false;
 }
 
-/* 8007E88C-8007E894 0791CC 0008+00 1/0 0/0 0/0 .text            ChkMoveFlag__8dBgWKColCFv */
 u32 dBgWKCol::ChkMoveFlag() const {
     return 0;
 }
 
-/* 8007E894-8007E8C0 0791D4 002C+00 1/0 0/0 0/0 .text GetTriPla__8dBgWKColCFRC13cBgS_PolyInfo */
 cM3dGPla dBgWKCol::GetTriPla(const cBgS_PolyInfo& poly) const {
     int poly_index = poly.GetPolyIndex();
     return GetTriPla(poly_index);
 }
 
-/* 8007E8C0-8007E980 079200 00C0+00 3/3 0/0 0/0 .text            GetTriPla__8dBgWKColCFi */
 cM3dGPla dBgWKCol::GetTriPla(int poly_index) const {
     KC_PrismData* pd = getPrismData(poly_index);
 
@@ -97,22 +84,17 @@ cM3dGPla dBgWKCol::GetTriPla(int poly_index) const {
     return plane;
 }
 
-/* 8007E980-8007E9A4 0792C0 0024+00 1/0 0/0 0/0 .text
- * GetTriPnt__8dBgWKColCFRC13cBgS_PolyInfoP4cXyzP4cXyzP4cXyz    */
 bool dBgWKCol::GetTriPnt(const cBgS_PolyInfo& poly, cXyz* ppos, cXyz* param_2,
                          cXyz* param_3) const {
     int poly_index = poly.GetPolyIndex();
     return GetTriPnt(poly_index, ppos, param_2, param_3);
 }
 
-/* 8007E9A4-8007E9D4 0792E4 0030+00 3/3 0/0 0/0 .text GetTriPnt__8dBgWKColCFiP3VecP3VecP3Vec */
 bool dBgWKCol::GetTriPnt(int poly_index, Vec* ppos, Vec* param_2, Vec* param_3) const {
     KC_PrismData* pd = getPrismData(poly_index);
     return GetTriPnt(pd, ppos, param_2, param_3);
 }
 
-/* 8007E9D4-8007EB28 079314 0154+00 3/3 0/0 0/0 .text
- * GetTriPnt__8dBgWKColCFPC12KC_PrismDataP3VecP3VecP3Vec        */
 bool dBgWKCol::GetTriPnt(KC_PrismData const* pd, Vec* ppos, Vec* param_3,
                          Vec* param_4) const {
     *ppos = m_pkc_head->m_pos_data[pd->pos_i];
@@ -147,12 +129,10 @@ bool dBgWKCol::GetTriPnt(KC_PrismData const* pd, Vec* ppos, Vec* param_3,
     return true;
 }
 
-/* 8007EB28-8007EB30 079468 0008+00 1/0 0/0 0/0 .text            GetBnd__8dBgWKColCFv */
 cM3dGAab* dBgWKCol::GetBnd() const {
     return (cM3dGAab*)&m_bnd;
 }
 
-/* 8007EB30-8007EB6C 079470 003C+00 1/0 0/0 0/0 .text GetGrpInf__8dBgWKColCFRC13cBgS_PolyInfo */
 u32 dBgWKCol::GetGrpInf(const cBgS_PolyInfo& poly) const {
     int poly_index = poly.GetPolyIndex();
     KC_PrismData* pd = getPrismData(poly_index);
@@ -160,11 +140,8 @@ u32 dBgWKCol::GetGrpInf(const cBgS_PolyInfo& poly) const {
     return m_code.getGrpCode(pd->attribute);
 }
 
-/* 8007EB6C-8007EB70 0794AC 0004+00 1/0 0/0 0/0 .text            OffMoveFlag__8dBgWKColFv */
 void dBgWKCol::OffMoveFlag() {}
 
-/* 8007EB70-8007EBC4 0794B0 0054+00 39/39 0/0 0/0 .text            getPolyCode__8dBgWKColCFiP5dBgPc
- */
 void dBgWKCol::getPolyCode(int poly_index, dBgPc* ppoly) const {
     KC_PrismData* pd = getPrismData(poly_index);
 
@@ -173,8 +150,6 @@ void dBgWKCol::getPolyCode(int poly_index, dBgPc* ppoly) const {
     ppoly->setCode(*code);
 }
 
-/* 8007EBC4-8007EE34 079504 0270+00 8/8 0/0 0/0 .text
- * chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz */
 bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* ppolypasschk,
                                   cBgS_GrpPassChk* pgrppasschk, cXyz& param_4) const {
     JUT_ASSERT(279, ppoly != NULL);
@@ -255,8 +230,6 @@ bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* ppolypasschk,
     return false;
 }
 
-/* 8007EE34-8007F628 079774 07F4+00 1/0 0/0 0/0 .text            LineCheck__8dBgWKColFP11cBgS_LinChk
- */
 bool dBgWKCol::LineCheck(cBgS_LinChk* plinchk) {
     cXyz* pstart = plinchk->GetStartP();
     cXyz* pcross = plinchk->GetCrossP();
@@ -548,7 +521,6 @@ bool dBgWKCol::LineCheck(cBgS_LinChk* plinchk) {
     return spB;
 }
 
-/* 8007F628-8007F9A4 079F68 037C+00 1/0 0/0 0/0 .text GroundCross__8dBgWKColFP11cBgS_GndChk */
 bool dBgWKCol::GroundCross(cBgS_GndChk* i_chk) {
     cXyz* point_p = (cXyz*)&i_chk->GetPointP();
     cXyz sp58;
@@ -641,7 +613,6 @@ bool dBgWKCol::GroundCross(cBgS_GndChk* i_chk) {
     return var_r24;
 }
 
-/* 8007F9A4-8007FF00 07A2E4 055C+00 1/0 0/0 0/0 .text ShdwDraw__8dBgWKColFP13cBgS_ShdwDraw */
 // NONMATCHING - stack
 void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) {
     dBgPc polyCode_sp108;
@@ -884,7 +855,6 @@ void dBgWKCol::ShdwDraw(cBgS_ShdwDraw* param_0) {
 }
 
 
-/* 8007FF00-8007FF1C 07A840 001C+00 1/1 0/0 0/0 .text ChkShdwDrawThrough__8dBgWKColFP5dBgPc */
 bool dBgWKCol::ChkShdwDrawThrough(dBgPc* pcode) {
     if (pcode->getShdwThrough()) {
         return true;
@@ -894,7 +864,6 @@ bool dBgWKCol::ChkShdwDrawThrough(dBgPc* pcode) {
     return false;
 }
 
-/* 8007FF1C-80080330 07A85C 0414+00 1/0 0/0 0/0 .text CaptPoly__8dBgWKColFR13dBgS_CaptPoly */
 void dBgWKCol::CaptPoly(dBgS_CaptPoly& i_captpoly) {
     const cM3dGAab* pbounds = i_captpoly.GetBndP();
     cXyz min(*pbounds->GetMinP());
@@ -1037,7 +1006,6 @@ void dBgWKCol::CaptPoly(dBgS_CaptPoly& i_captpoly) {
     }
 }
 
-/* 80424F94-80425384 051CB4 03F0+00 1/1 0/0 0/0 .bss             l_wcsbuf */
 struct wcs_data {
     /* 0x0 */ f32 _0;
     /* 0x4 */ u16 _4;
@@ -1047,13 +1015,11 @@ struct wcs_data {
 static wcs_data l_wcsbuf[84];
 
 #ifdef DEBUG
-/* 80452740-80452748 000D40 0008+00 2/2 0/0 0/0 .sdata2          @5300 */
-SECTION_SDATA2 static u8 lit_5300[8] = {
+static u8 lit_5300[8] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 #endif
 
-/* 80080330-800811A0 07AC70 0E70+00 1/0 0/0 0/0 .text WallCorrectSort__8dBgWKColFP9dBgS_Acch */
 // NONMATCHING - regalloc
 bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) {
     bool sp_10 = false;
@@ -1514,8 +1480,6 @@ bool dBgWKCol::WallCorrectSort(dBgS_Acch* pwi) {
     return sp_10;
 }
 
-/* 800811A0-80081E18 07BAE0 0C78+00 1/0 0/0 0/0 .text            WallCorrect__8dBgWKColFP9dBgS_Acch
- */
 // NONMATCHING - missing mr
 bool dBgWKCol::WallCorrect(dBgS_Acch* pwi) {
     bool sp10 = false;
@@ -1905,8 +1869,6 @@ bool dBgWKCol::WallCorrect(dBgS_Acch* pwi) {
     return sp10;
 }
 
-/* 80081E18-80082184 07C758 036C+00 1/0 0/0 0/0 .text            RoofChk__8dBgWKColFP12dBgS_RoofChk
- */
 bool dBgWKCol::RoofChk(dBgS_RoofChk* param_0) {
     KC_PrismData* local_94;
     dBgPc adStack_4c;
@@ -2031,7 +1993,6 @@ bool dBgWKCol::RoofChk(dBgS_RoofChk* param_0) {
     return sp0A;
 }
 
-/* 80082184-800824EC 07CAC4 0368+00 1/0 0/0 0/0 .text SplGrpChk__8dBgWKColFP14dBgS_SplGrpChk */
 bool dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) {
     Vec* sp3C = &param_0->GetPosP();
     cXyz sp54;
@@ -2146,8 +2107,6 @@ bool dBgWKCol::SplGrpChk(dBgS_SplGrpChk* param_0) {
     return sp09;
 }
 
-/* 800824EC-800829AC 07CE2C 04C0+00 1/0 0/0 0/0 .text            SphChk__8dBgWKColFP11dBgS_SphChkPv
- */
 bool dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) {
     static Vec vtx_tbl[3];
 
@@ -2304,14 +2263,11 @@ bool dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) {
     return sp0C;
 }
 
-/* 800829AC-800829F0 07D2EC 0044+00 1/0 0/0 0/0 .text            GetTopUnder__8dBgWKColCFPfPf */
 void dBgWKCol::GetTopUnder(f32* param_0, f32* param_1) const {
     *param_1 = m_pkc_head->m_area_min_pos.y;
     *param_0 = *param_1 + (f32)~m_pkc_head->m_area_y_width_mask;
 }
 
-/* 800829F0-80082A20 07D330 0030+00 1/0 0/0 0/0 .text
- * GetGrpRoomIndex__8dBgWKColCFRC13cBgS_PolyInfo                */
 int dBgWKCol::GetGrpRoomIndex(const cBgS_PolyInfo& poly) const {
     int poly_index = poly.GetPolyIndex();
 
@@ -2320,7 +2276,6 @@ int dBgWKCol::GetGrpRoomIndex(const cBgS_PolyInfo& poly) const {
     return bgpc.getRoom();
 }
 
-/* 80082A20-80082A50 07D360 0030+00 1/0 0/0 0/0 .text GetExitId__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetExitId(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2329,7 +2284,6 @@ int dBgWKCol::GetExitId(const cBgS_PolyInfo& poly) {
     return bgpc.getExit();
 }
 
-/* 80082A50-80082A80 07D390 0030+00 1/0 0/0 0/0 .text GetPolyColor__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetPolyColor(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2338,8 +2292,6 @@ int dBgWKCol::GetPolyColor(const cBgS_PolyInfo& poly) {
     return bgpc.getPolyCol();
 }
 
-/* 80082A80-80082AB0 07D3C0 0030+00 1/0 0/0 0/0 .text GetHorseNoEntry__8dBgWKColFRC13cBgS_PolyInfo
- */
 BOOL dBgWKCol::GetHorseNoEntry(const cBgS_PolyInfo& poly) {
     dBgPc bgpc;
 
@@ -2348,13 +2300,10 @@ BOOL dBgWKCol::GetHorseNoEntry(const cBgS_PolyInfo& poly) {
     return bgpc.getHorseNoEntry() != 0;
 }
 
-/* 80082AB0-80082AE0 07D3F0 0030+00 1/0 0/0 0/0 .text GetSpecialCode__8dBgWKColFRC13cBgS_PolyInfo
- */
 int dBgWKCol::GetSpecialCode(const cBgS_PolyInfo& poly) {
     return GetSpecialCode(poly.GetPolyIndex());
 }
 
-/* 80082AE0-80082B0C 07D420 002C+00 1/0 0/0 0/0 .text            GetSpecialCode__8dBgWKColFi */
 int dBgWKCol::GetSpecialCode(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2362,8 +2311,6 @@ int dBgWKCol::GetSpecialCode(int poly_index) {
     return bgpc.getSpl();
 }
 
-/* 80082B0C-80082B3C 07D44C 0030+00 1/0 0/0 0/0 .text GetMagnetCode__8dBgWKColFRC13cBgS_PolyInfo
- */
 int dBgWKCol::GetMagnetCode(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2372,8 +2319,6 @@ int dBgWKCol::GetMagnetCode(const cBgS_PolyInfo& poly) {
     return bgpc.getMagnet();
 }
 
-/* 80082B3C-80082B6C 07D47C 0030+00 1/0 0/0 0/0 .text
- * GetMonkeyBarsCode__8dBgWKColFRC13cBgS_PolyInfo               */
 int dBgWKCol::GetMonkeyBarsCode(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2382,7 +2327,6 @@ int dBgWKCol::GetMonkeyBarsCode(const cBgS_PolyInfo& poly) {
     return bgpc.getMonkeyBars();
 }
 
-/* 80082B6C-80082B98 07D4AC 002C+00 1/0 0/0 0/0 .text            GetPolyObjThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyObjThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2390,7 +2334,6 @@ u32 dBgWKCol::GetPolyObjThrough(int poly_index) {
     return bgpc.getObjThrough();
 }
 
-/* 80082B98-80082BC4 07D4D8 002C+00 1/0 0/0 0/0 .text            GetPolyCamThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyCamThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2398,7 +2341,6 @@ u32 dBgWKCol::GetPolyCamThrough(int poly_index) {
     return bgpc.getCamThrough();
 }
 
-/* 80082BC4-80082BF0 07D504 002C+00 1/0 0/0 0/0 .text            GetPolyLinkThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyLinkThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2406,7 +2348,6 @@ u32 dBgWKCol::GetPolyLinkThrough(int poly_index) {
     return bgpc.getLinkThrough();
 }
 
-/* 80082BF0-80082C1C 07D530 002C+00 1/0 0/0 0/0 .text            GetPolyArrowThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyArrowThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2414,7 +2355,6 @@ u32 dBgWKCol::GetPolyArrowThrough(int poly_index) {
     return bgpc.getArrowThrough();
 }
 
-/* 80082C1C-80082C48 07D55C 002C+00 1/0 0/0 0/0 .text            GetPolyHSStick__8dBgWKColFi */
 u32 dBgWKCol::GetPolyHSStick(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2422,7 +2362,6 @@ u32 dBgWKCol::GetPolyHSStick(int poly_index) {
     return bgpc.getHSStick();
 }
 
-/* 80082C48-80082C74 07D588 002C+00 1/0 0/0 0/0 .text GetPolyBoomerangThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyBoomerangThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2430,7 +2369,6 @@ u32 dBgWKCol::GetPolyBoomerangThrough(int poly_index) {
     return bgpc.getBoomerangThrough();
 }
 
-/* 80082C74-80082CA0 07D5B4 002C+00 1/0 0/0 0/0 .text            GetPolyRopeThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyRopeThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2438,7 +2376,6 @@ u32 dBgWKCol::GetPolyRopeThrough(int poly_index) {
     return bgpc.getRopeThrough();
 }
 
-/* 80082CA0-80082CCC 07D5E0 002C+00 1/0 0/0 0/0 .text            GetPolyBombThrough__8dBgWKColFi */
 u32 dBgWKCol::GetPolyBombThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2446,8 +2383,6 @@ u32 dBgWKCol::GetPolyBombThrough(int poly_index) {
     return bgpc.getBombThrough();
 }
 
-/* 80082CCC-80082CF8 07D60C 002C+00 1/0 0/0 0/0 .text            GetUnderwaterRoofCode__8dBgWKColFi
- */
 u32 dBgWKCol::GetUnderwaterRoofCode(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2455,7 +2390,6 @@ u32 dBgWKCol::GetUnderwaterRoofCode(int poly_index) {
     return bgpc.getUnderwaterRoof();
 }
 
-/* 80082CF8-80082D24 07D638 002C+00 1/0 0/0 0/0 .text            GetShdwThrough__8dBgWKColFi */
 bool dBgWKCol::GetShdwThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2463,7 +2397,6 @@ bool dBgWKCol::GetShdwThrough(int poly_index) {
     return bgpc.getShdwThrough();
 }
 
-/* 80082D24-80082D54 07D664 0030+00 1/0 0/0 0/0 .text GetLinkNo__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetLinkNo(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2472,7 +2405,6 @@ int dBgWKCol::GetLinkNo(const cBgS_PolyInfo& poly) {
     return bgpc.getLinkNo();
 }
 
-/* 80082D54-80082D84 07D694 0030+00 1/0 0/0 0/0 .text GetWallCode__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetWallCode(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2481,7 +2413,6 @@ int dBgWKCol::GetWallCode(const cBgS_PolyInfo& poly) {
     return bgpc.getWallCode();
 }
 
-/* 80082D84-80082DB4 07D6C4 0030+00 1/0 0/0 0/0 .text GetPolyAtt0__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetPolyAtt0(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2490,7 +2421,6 @@ int dBgWKCol::GetPolyAtt0(const cBgS_PolyInfo& poly) {
     return bgpc.getAtt0Code();
 }
 
-/* 80082DB4-80082DE4 07D6F4 0030+00 1/0 0/0 0/0 .text GetPolyAtt1__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetPolyAtt1(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2499,8 +2429,6 @@ int dBgWKCol::GetPolyAtt1(const cBgS_PolyInfo& poly) {
     return bgpc.getAtt1Code();
 }
 
-/* 80082DE4-80082E14 07D724 0030+00 1/0 0/0 0/0 .text GetGroundCode__8dBgWKColFRC13cBgS_PolyInfo
- */
 int dBgWKCol::GetGroundCode(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2509,7 +2437,6 @@ int dBgWKCol::GetGroundCode(const cBgS_PolyInfo& poly) {
     return bgpc.getGroundCode();
 }
 
-/* 80082E14-80082E40 07D754 002C+00 1/0 0/0 0/0 .text            GetIronBallThrough__8dBgWKColFi */
 u32 dBgWKCol::GetIronBallThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2517,7 +2444,6 @@ u32 dBgWKCol::GetIronBallThrough(int poly_index) {
     return bgpc.getIronBallThrough();
 }
 
-/* 80082E40-80082E6C 07D780 002C+00 1/0 0/0 0/0 .text            GetAttackThrough__8dBgWKColFi */
 u32 dBgWKCol::GetAttackThrough(int poly_index) {
     dBgPc bgpc;
     getPolyCode(poly_index, &bgpc);
@@ -2525,7 +2451,6 @@ u32 dBgWKCol::GetAttackThrough(int poly_index) {
     return bgpc.getAttackThrough();
 }
 
-/* 80082E6C-80082E9C 07D7AC 0030+00 1/0 0/0 0/0 .text GetCamMoveBG__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetCamMoveBG(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2534,7 +2459,6 @@ int dBgWKCol::GetCamMoveBG(const cBgS_PolyInfo& poly) {
     return bgpc.getCamMoveBG();
 }
 
-/* 80082E9C-80082ECC 07D7DC 0030+00 1/0 0/0 0/0 .text GetRoomCamId__8dBgWKColFRC13cBgS_PolyInfo */
 int dBgWKCol::GetRoomCamId(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2543,8 +2467,6 @@ int dBgWKCol::GetRoomCamId(const cBgS_PolyInfo& poly) {
     return bgpc.getRoomCam();
 }
 
-/* 80082ECC-80082EFC 07D80C 0030+00 1/0 0/0 0/0 .text GetRoomPathId__8dBgWKColFRC13cBgS_PolyInfo
- */
 int dBgWKCol::GetRoomPathId(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2553,8 +2475,6 @@ int dBgWKCol::GetRoomPathId(const cBgS_PolyInfo& poly) {
     return bgpc.getRoomPath();
 }
 
-/* 80082EFC-80082F2C 07D83C 0030+00 1/0 0/0 0/0 .text
- * GetRoomPathPntNo__8dBgWKColFRC13cBgS_PolyInfo                */
 int dBgWKCol::GetRoomPathPntNo(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2563,8 +2483,6 @@ int dBgWKCol::GetRoomPathPntNo(const cBgS_PolyInfo& poly) {
     return bgpc.getRoomPathPnt();
 }
 
-/* 80082F2C-80082F5C 07D86C 0030+00 1/0 0/0 0/0 .text
- * GetPolyGrpRoomInfId__8dBgWKColFRC13cBgS_PolyInfo             */
 u8 dBgWKCol::GetPolyGrpRoomInfId(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2573,8 +2491,6 @@ u8 dBgWKCol::GetPolyGrpRoomInfId(const cBgS_PolyInfo& poly) {
     return bgpc.getRoomInf();
 }
 
-/* 80082F5C-80082F8C 07D89C 0030+00 1/0 0/0 0/0 .text GetGrpSoundId__8dBgWKColFRC13cBgS_PolyInfo
- */
 int dBgWKCol::GetGrpSoundId(const cBgS_PolyInfo& poly) {
     int poly_index = poly.GetPolyIndex();
 
@@ -2583,17 +2499,11 @@ int dBgWKCol::GetGrpSoundId(const cBgS_PolyInfo& poly) {
     return bgpc.getSnd();
 }
 
-/* 80082F8C-80082F90 07D8CC 0004+00 1/0 0/0 0/0 .text
- * CrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz   */
 void dBgWKCol::CrrPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2, cXyz* param_3,
                       csXyz* param_4, csXyz* param_5) {}
 
-/* 80082F90-80082F94 07D8D0 0004+00 1/0 0/0 0/0 .text
- * TransPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
 void dBgWKCol::TransPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2, cXyz* param_3,
                         csXyz* param_4, csXyz* param_5) {}
 
-/* 80082F94-80082F98 07D8D4 0004+00 1/0 0/0 0/0 .text
- * MatrixCrrPos__8dBgWKColFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
 void dBgWKCol::MatrixCrrPos(const cBgS_PolyInfo& param_0, void* param_1, bool param_2,
                             cXyz* param_3, csXyz* param_4, csXyz* param_5) {}
diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp
index 70312ce6d7..e532d9224c 100644
--- a/src/d/d_bg_w_sv.cpp
+++ b/src/d/d_bg_w_sv.cpp
@@ -8,7 +8,6 @@
 #include "d/d_bg_w_sv.h"
 #include "SSystem/SComponent/c_bg_s_chk.h"
 
-/* 80082F98-80083020 07D8D8 0088+00 0/0 0/0 2/2 .text            Set__6dBgWSvFP6cBgD_tUl */
 u8 dBgWSv::Set(cBgD_t* pbgd, u32 param_1) {
     if (cBgW::Set(pbgd, 99, NULL)) {
         return 1;
@@ -23,7 +22,6 @@ u8 dBgWSv::Set(cBgD_t* pbgd, u32 param_1) {
     return field_0xc0 == NULL;
 }
 
-/* 80083020-8008308C 07D960 006C+00 0/0 0/0 3/3 .text            CopyBackVtx__6dBgWSvFv */
 void dBgWSv::CopyBackVtx() {
     if (field_0xc0 == NULL || pm_vtx_tbl == NULL) {
         return;
@@ -34,7 +32,6 @@ void dBgWSv::CopyBackVtx() {
     }
 }
 
-/* 8008308C-80083244 07D9CC 01B8+00 1/1 0/0 0/0 .text            CrrPosWork__6dBgWSvFP4cXyziii */
 bool dBgWSv::CrrPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) {
     cXyz sp34;
     cXyz sp28;
@@ -82,8 +79,6 @@ bool dBgWSv::CrrPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) {
     return 0;
 }
 
-/* 80083244-80083300 07DB84 00BC+00 1/0 0/0 0/0 .text
- * CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz     */
 void dBgWSv::CrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                     csXyz* i_angle, csXyz* i_shapeAngle) {
     if (!(field_0xc4 & 1) && param_2) {
@@ -98,7 +93,6 @@ void dBgWSv::CrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2
     }
 }
 
-/* 80083300-8008351C 07DC40 021C+00 1/1 0/0 0/0 .text            TransPosWork__6dBgWSvFP4cXyziii */
 bool dBgWSv::TransPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) {
     cXyz sp34;
     cXyz sp28;
@@ -154,8 +148,6 @@ bool dBgWSv::TransPosWork(cXyz* i_pos, int i_vtx0, int i_vtx1, int i_vtx2) {
     return 0;
 }
 
-/* 8008351C-800835D8 07DE5C 00BC+00 1/0 0/0 0/0 .text
- * TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz   */
 void dBgWSv::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                       csXyz* i_angle, csXyz* i_shapeAngle) {
     if (!(field_0xc4 & 1) && param_2) {
@@ -170,7 +162,5 @@ void dBgWSv::TransPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param
     }
 }
 
-/* 800835D8-800835DC 07DF18 0004+00 1/0 0/0 0/0 .text
- * MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz */
 void dBgWSv::MatrixCrrPos(cBgS_PolyInfo const& i_poly, void* i_actor_ptr, bool param_2, cXyz* i_pos,
                           csXyz* i_angle, csXyz* i_shapeAngle) {}
diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp
index 6a3a35bee2..75537717e1 100644
--- a/src/d/d_bright_check.cpp
+++ b/src/d/d_bright_check.cpp
@@ -11,7 +11,6 @@
 #include "d/d_msg_string.h"
 #include "m_Do/m_Do_controller_pad.h"
 
-/* 80192F10-80192F98 18D850 0088+00 0/0 1/1 0/0 .text __ct__14dBrightCheck_cFP10JKRArchive */
 dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) {
     mArchive = i_archive;
     mBrightCheck.mMsgString = new dMsgString_c();
@@ -22,13 +21,11 @@ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) {
     mMode = MODE_MOVE_e;
 }
 
-/* 80192F98-80193030 18D8D8 0098+00 1/0 0/0 0/0 .text            __dt__14dBrightCheck_cFv */
 dBrightCheck_c::~dBrightCheck_c() {
     delete mBrightCheck.Scr;
     delete mBrightCheck.mMsgString;
 }
 
-/* 80193030-801934D0 18D970 04A0+00 1/1 0/0 0/0 .text            screenSet__14dBrightCheck_cFv */
 void dBrightCheck_c::screenSet() {
     static u64 const tv_btnA[] = {
         'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at',
@@ -126,22 +123,18 @@ void dBrightCheck_c::screenSet() {
     }
 }
 
-/* 803BB5D4-803BB5EC 0186F4 0018+00 1/2 0/0 0/0 .data            brightChackProc */
 typedef void (dBrightCheck_c::*procFunc)();
 static procFunc brightChackProc[] = {
     &dBrightCheck_c::modeWait,
     &dBrightCheck_c::modeMove,
 };
 
-/* 801934D0-80193508 18DE10 0038+00 0/0 1/1 0/0 .text            _move__14dBrightCheck_cFv */
 void dBrightCheck_c::_move() {
     (this->*brightChackProc[mMode])();
 }
 
-/* 80193508-8019350C 18DE48 0004+00 1/0 0/0 0/0 .text            modeWait__14dBrightCheck_cFv */
 void dBrightCheck_c::modeWait() {}
 
-/* 8019350C-80193594 18DE4C 0088+00 1/0 0/0 0/0 .text            modeMove__14dBrightCheck_cFv */
 void dBrightCheck_c::modeMove() {
     if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigStart(PAD_1)) {
         mDoAud_seStart(Z2SE_ENTER_GAME, NULL, 0, 0);
@@ -150,12 +143,10 @@ void dBrightCheck_c::modeMove() {
     }
 }
 
-/* 80193594-801935D0 18DED4 003C+00 0/0 1/1 0/0 .text            _draw__14dBrightCheck_cFv */
 void dBrightCheck_c::_draw() {
     dComIfGd_set2DOpa(&mBrightCheck);
 }
 
-/* 801935D0-80193608 18DF10 0038+00 1/0 0/0 0/0 .text            draw__19dDlst_BrightCheck_cFv */
 void dDlst_BrightCheck_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     Scr->draw(0.0f, 0.0f, graf_ctx);
diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp
index 2ab36b4aca..d6b383a007 100644
--- a/src/d/d_cam_param.cpp
+++ b/src/d/d_cam_param.cpp
@@ -12,7 +12,6 @@
 #include "d/d_camera.h"
 #include "d/d_com_inf_game.h"
 
-/* 8008813C-80088284 082A7C 0148+00 0/0 12/12 0/0 .text            rationalBezierRatio__8dCamMathFff */
 f32 dCamMath::rationalBezierRatio(f32 param_0, f32 param_1) {
     f64 var_f31;
     f32 var_f1 = param_0;
@@ -57,7 +56,6 @@ static f32 dummy_literal1() {
     return 1.0f;
 }
 
-/* 80088284-800882E0 082BC4 005C+00 0/0 1/1 0/0 .text            zoomFovy__8dCamMathFff */
 f32 dCamMath::zoomFovy(f32 param_0, f32 param_1) {
     cDegree deg(param_0);
 
@@ -65,7 +63,6 @@ f32 dCamMath::zoomFovy(f32 param_0, f32 param_1) {
     return cAngle::r2d(radian);
 }
 
-/* 8008831C-80088384 082C5C 0068+00 0/0 1/1 0/0 .text xyzRotateX__8dCamMathFR4cXyz7cSAngle */
 cXyz dCamMath::xyzRotateX(cXyz& i_xyz, cSAngle i_angle) {
     Mtx m;
     cXyz rot_xyz;
@@ -76,7 +73,6 @@ cXyz dCamMath::xyzRotateX(cXyz& i_xyz, cSAngle i_angle) {
     return rot_xyz;
 }
 
-/* 80088384-800883EC 082CC4 0068+00 0/0 13/13 0/0 .text xyzRotateY__8dCamMathFR4cXyz7cSAngle */
 cXyz dCamMath::xyzRotateY(cXyz& i_xyz, cSAngle i_angle) {
     Mtx m;
     cXyz rot_xyz;
@@ -87,8 +83,6 @@ cXyz dCamMath::xyzRotateY(cXyz& i_xyz, cSAngle i_angle) {
     return rot_xyz;
 }
 
-/* 800883EC-80088434 082D2C 0048+00 0/0 9/9 0/0 .text
- * xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz                */
 f32 dCamMath::xyzHorizontalDistance(cXyz& i_posA, cXyz& i_posB) {
     f64 x = i_posA.x - i_posB.x;
     f64 z = i_posA.z - i_posB.z;
@@ -96,19 +90,16 @@ f32 dCamMath::xyzHorizontalDistance(cXyz& i_posA, cXyz& i_posB) {
     return sqrt((x * x) + (z * z));
 }
 
-/* 80088434-8008845C 082D74 0028+00 1/1 0/0 0/0 .text            __ct__9dCstick_cFv */
 dCstick_c::dCstick_c() {
     mThresholdLow = 0.2f;
     mThresholdHigh = 0.95f;
     mInputSpeed = 6;
 }
 
-/* 8008845C-80088464 082D9C 0008+00 0/0 1/1 0/0 .text            Shift__9dCstick_cFUl */
 bool dCstick_c::Shift(u32 param_0) {
     return false;
 }
 
-/* 80088464-800884F0 082DA4 008C+00 1/1 0/0 0/0 .text            __ct__11dCamBGChk_cFv */
 dCamBGChk_c::dCamBGChk_c() {
     mFloorMargin = 32.0f;
 
@@ -133,7 +124,6 @@ dCamBGChk_c::dCamBGChk_c() {
     mCornerAngleMax = 120.0f;
 }
 
-/* 800884F0-8008858C 082E30 009C+00 0/0 1/1 0/0 .text            __ct__11dCamParam_cFl */
 dCamParam_c::dCamParam_c(s32 i_styleID) {
     u8* cam_data = (u8*)dComIfG_getObjectRes(dComIfGp_getCameraParamFileName(0), "camstyle.dat");
 
@@ -147,10 +137,8 @@ dCamParam_c::dCamParam_c(s32 i_styleID) {
     mMapToolArg2 = -1;
 }
 
-/* 8008858C-800885D4 082ECC 0048+00 1/0 1/1 0/0 .text            __dt__11dCamParam_cFv */
 dCamParam_c::~dCamParam_c() {}
 
-/* 800885D4-80088620 082F14 004C+00 1/1 7/7 0/0 .text            Change__11dCamParam_cFl */
 int dCamParam_c::Change(s32 i_styleID) {
     if (i_styleID >= 0 && i_styleID < mStyleNum) {
         mStyleID = i_styleID;
@@ -163,7 +151,6 @@ int dCamParam_c::Change(s32 i_styleID) {
     return 0;
 }
 
-/* 80088620-80088668 082F60 0048+00 0/0 4/4 0/0 .text            SearchStyle__11dCamParam_cFUl */
 int dCamParam_c::SearchStyle(u32 param_0) {
     int styleID = -1;
 
@@ -181,7 +168,6 @@ static f32 dummy_literal2() {
     return 0.25f;
 }
 
-/* 80088668-800888B8 082FA8 0250+00 0/0 1/1 0/0 .text            __ct__11dCamSetup_cFv */
 dCamSetup_c::dCamSetup_c() {
     mDrawNear = 1.0f;
     mDrawFar = 100000.0f;
@@ -262,10 +248,8 @@ dCamSetup_c::dCamSetup_c() {
     dCam_getBody()->EventRecoverNotime();
 }
 
-/* 800888B8-80088918 0831F8 0060+00 1/0 1/1 0/0 .text            __dt__11dCamSetup_cFv */
 dCamSetup_c::~dCamSetup_c() {}
 
-/* 80088918-80088988 083258 0070+00 0/0 1/1 0/0 .text CheckLatitudeRange__11dCamSetup_cFPs */
 bool dCamSetup_c::CheckLatitudeRange(s16* param_0) {
     s16 temp0 = cAngle::d2s(field_0x60);
     s16 temp1 = cAngle::d2s(field_0x5c);
@@ -283,7 +267,6 @@ bool dCamSetup_c::CheckLatitudeRange(s16* param_0) {
     return true;
 }
 
-/* 80088988-800889B0 0832C8 0028+00 0/0 1/1 0/0 .text            PlayerHideDist__11dCamSetup_cFv */
 f32 dCamSetup_c::PlayerHideDist() {
     if (daPy_py_c::checkNowWolf()) {
         return 120.0f;
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index c9b82edca9..1381b17be0 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_camera
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_camera.h"
@@ -30,7 +25,6 @@
 
 namespace {
 
-/* 8015FA2C-8015FA4C 15A36C 0020+00 2/2 0/0 0/0 .text limitf__22@unnamed@d_camera_cpp@Ffff */
 static f32 limitf(f32 value, f32 min, f32 max) {
     if (value > max) {
         return max;
@@ -49,8 +43,6 @@ inline static bool is_player(fopAc_ac_c* actor) {
     return fopAcM_GetName(actor) == PROC_ALINK || fopAcM_GetName(actor) == PROC_ALINK;
 }
 
-/* 8015FA4C-8015FADC 15A38C 0090+00 1/1 0/0 0/0 .text
- * hideActor__22@unnamed@d_camera_cpp@FP10fopAc_ac_c            */
 static void hideActor(fopAc_ac_c* actor) {
     if (is_player(actor)) {
         dComIfGp_onCameraAttentionStatus(0, 2);
@@ -62,8 +54,6 @@ static void hideActor(fopAc_ac_c* actor) {
     }
 }
 
-/* 8015FADC-8015FB28 15A41C 004C+00 1/1 0/0 0/0 .text defaultRadius__22@unnamed@d_camera_cpp@FffPf
- */
 static bool defaultRadius(f32 param_0, f32 param_1, f32* param_2) {
     f32 var_f30;
     f32 var_f31;
@@ -89,8 +79,6 @@ static bool defaultRadius(f32 param_0, f32 param_1, f32* param_2) {
     return true;
 }
 
-/* 8015FB28-8015FBF8 15A468 00D0+00 1/1 0/0 0/0 .text
- * posInLine2D__22@unnamed@d_camera_cpp@FP4cXyzP4cXyzP4cXyz     */
 static bool posInLine2D(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
     if (param_0->x <= param_1->x) {
         if (param_2->x < param_0->x)
@@ -119,8 +107,6 @@ static bool posInLine2D(cXyz* param_0, cXyz* param_1, cXyz* param_2) {
     return true;
 }
 
-/* 8015FBF8-8015FEB8 15A538 02C0+00 1/1 0/0 0/0 .text
- * relationalPos2__22@unnamed@d_camera_cpp@FP10fopAc_ac_cP10fopAc_ac_cP4cXyzf7cSAngle */
 static cXyz relationalPos2(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* param_2, f32 param_3,
                            cSAngle param_4) {
     if (i_actor1 == NULL || i_actor2 == NULL) {
@@ -153,8 +139,6 @@ inline static cSAngle sAngleY(cXyz& i_vec) {
 
 }  // namespace
 
-/* 8015FEB8-8016008C 15A7F8 01D4+00 4/4 0/0 0/0 .text Set__15dCamMapToolDataFllP10fopAc_ac_cUsUc
- */
 int dCamMapToolData::Set(s32 param_0, s32 roomNo, fopAc_ac_c* param_2, u16 param_3, u8 param_4) {
     if ((param_3 & 0xFF) > mPriority) {
         return 0;
@@ -194,7 +178,6 @@ int dCamMapToolData::Set(s32 param_0, s32 roomNo, fopAc_ac_c* param_2, u16 param
     return 0;
 }
 
-/* 803BA25C-803BA34C 01737C 00F0+00 2/3 3/3 0/0 .data            engine_tbl__9dCamera_c */
 engine_fn dCamera_c::engine_tbl[] = {
     &dCamera_c::letCamera,        &dCamera_c::chaseCamera,    &dCamera_c::lockonCamera,
     &dCamera_c::talktoCamera,     &dCamera_c::subjectCamera,  &dCamera_c::fixedPositionCamera,
@@ -249,13 +232,11 @@ inline static f32 playerMaxSpeed() {
 
 }  // namespace
 
-/* 8016008C-801602C4 15A9CC 0238+00 1/1 0/0 0/0 .text            __ct__9dCamera_cFP12camera_class */
 dCamera_c::dCamera_c(camera_class* i_camera) : mCamParam(0) {
     initialize(i_camera, get_player_actor(i_camera), get_camera_id(i_camera),
                get_controller_id(i_camera));
 }
 
-/* 80160304-80160470 15AC44 016C+00 1/1 0/0 0/0 .text            __dt__9dCamera_cFv */
 dCamera_c::~dCamera_c() {
     if (!daPy_py_c::checkPeepEndSceneChange()) {
         dComIfGs_getTurnRestart().setCameraCtr(mCenter);
@@ -313,10 +294,8 @@ enum SpecialType {
 
 namespace {
 
-/* 8042C8F8-8042C9A0 059618 00A8+00 12/12 0/0 0/0 .bss specialType__22@unnamed@d_camera_cpp@ */
 static int specialType[42];
 
-/* 80451020-80451024 000520 0004+00 4/4 0/0 0/0 .sbss            Stage__22@unnamed@d_camera_cpp@ */
 static int Stage;
 
 static f32 WideTurnSaving = 0.86f + OREG_F(1);
@@ -355,8 +334,6 @@ inline static void setComZoomForcus(f32 param_0) {
 
 }  // namespace
 
-/* 80160470-801614AC 15ADB0 103C+00 1/1 0/0 0/0 .text
- * initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl      */
 void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_cameraID,
                            u32 i_padID) {
     char* type_data =
@@ -645,7 +622,6 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c
     field_0x95c = cXyz::Zero;
 }
 
-/* 801614AC-801614C4 15BDEC 0018+00 0/0 1/1 106/106 .text            Start__9dCamera_cFv */
 void dCamera_c::Start() {
     if (mCamSetup.CheckFlag(0x8000) && mCurState != 0 && mCurState != 2) {
         OS_REPORT("camera: start\n");
@@ -656,7 +632,6 @@ void dCamera_c::Start() {
     }
 }
 
-/* 801614C4-801614D0 15BE04 000C+00 0/0 1/1 0/0 .text            QuickStart__9dCamera_cFv */
 void dCamera_c::QuickStart() {
     if (mCamSetup.CheckFlag(0x8000) && mCurState != 0) {
         OS_REPORT("camera: quick start\n");
@@ -665,7 +640,6 @@ void dCamera_c::QuickStart() {
     mCurState = 0;
 }
 
-/* 801614D0-801614E8 15BE10 0018+00 0/0 2/2 98/98 .text            Stop__9dCamera_cFv */
 void dCamera_c::Stop() {
     clrFlag(0x200000);
 
@@ -676,12 +650,10 @@ void dCamera_c::Stop() {
     mCurState = 3;
 }
 
-/* 801614E8-801614F4 15BE28 000C+00 0/0 2/2 0/0 .text            Stay__9dCamera_cFv */
 void dCamera_c::Stay() {
     mCurState = 1;
 }
 
-/* 801614F4-80161550 15BE34 005C+00 2/2 4/4 0/0 .text            ChangeModeOK__9dCamera_cFl */
 bool dCamera_c::ChangeModeOK(s32 param_0) {
     if (dComIfGp_evmng_cameraPlay() || chkFlag(0x20000000)) {
         return 0;
@@ -690,7 +662,6 @@ bool dCamera_c::ChangeModeOK(s32 param_0) {
     return !(mCamTypeData[mCurType].field_0x18[mIsWolf][param_0] < 0);
 }
 
-/* 80161550-801617B0 15BE90 0260+00 1/1 0/0 0/0 .text            initPad__9dCamera_cFv */
 void dCamera_c::initPad() {
     if (chkFlag(0x1000000)) {
         mPadInfo.mMainStick.mLastPosX = 0.0f;
@@ -758,7 +729,6 @@ void dCamera_c::initPad() {
     mCameraInputActive = 0;
 }
 
-/* 801617B0-80161D84 15C0F0 05D4+00 1/1 0/0 0/0 .text            updatePad__9dCamera_cFv */
 void dCamera_c::updatePad() {
     dComIfGp_getAttention();
     int var_r30 = mCamParam.Algorythmn(mCamStyle);
@@ -925,7 +895,6 @@ void dCamera_c::updatePad() {
 }
 
 
-/* 80161D84-80161E34 15C6C4 00B0+00 1/1 0/0 0/0 .text            initMonitor__9dCamera_cFv */
 void dCamera_c::initMonitor() {
     if (mpPlayerActor != NULL) {
         mMonitor.field_0x0 = positionOf(mpPlayerActor);
@@ -941,7 +910,6 @@ void dCamera_c::initMonitor() {
     mMonitor.field_0x14 = cXyz::Zero;
 }
 
-/* 80161E34-80162088 15C774 0254+00 1/1 0/0 0/0 .text            updateMonitor__9dCamera_cFv */
 void dCamera_c::updateMonitor() {
     if (mpPlayerActor != NULL) {
         cXyz sp24 = positionOf(mpPlayerActor);
@@ -973,8 +941,6 @@ void dCamera_c::updateMonitor() {
     }
 }
 
-/* 80162088-801622B0 15C9C8 0228+00 1/1 0/0 0/0 .text            checkForceLockTarget__9dCamera_cFv
- */
 bool dCamera_c::checkForceLockTarget() {
     bool ret = true;
     if (mLockOnActorID != -1) {
@@ -994,7 +960,6 @@ bool dCamera_c::checkForceLockTarget() {
     return ret;
 }
 
-/* 801622B0-801622B4 15CBF0 0004+00 1/1 0/0 0/0 .text            infoReport__9dCamera_cFv */
 void dCamera_c::infoReport() {
 #if DEBUG
 #endif
@@ -1016,7 +981,6 @@ inline bool chkCornerCos(f32 param_0) {
 
 }  // namespace
 
-/* 801622B4-80162D38 15CBF4 0A84+00 1/1 0/0 0/0 .text            Run__9dCamera_cFv */
 bool dCamera_c::Run() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     daMidna_c* midna = daPy_py_c::getMidnaActor();
@@ -1248,7 +1212,6 @@ bool dCamera_c::Run() {
     return bVar9;
 }
 
-/* 80162D38-80162FB8 15D678 0280+00 1/1 0/0 0/0 .text            NotRun__9dCamera_cFv */
 bool dCamera_c::NotRun() {
     daAlink_c* link = daAlink_getAlinkActorClass();
     daMidna_c* midna = daPy_py_c::getMidnaActor();
@@ -1301,7 +1264,6 @@ bool dCamera_c::NotRun() {
     return true;
 }
 
-/* 80162FB8-80162FD4 15D8F8 001C+00 1/1 0/0 0/0 .text            V__9dCamera_cFv */
 s16 dCamera_c::V() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x24.V();
@@ -1310,7 +1272,6 @@ s16 dCamera_c::V() {
     }
 }
 
-/* 80162FD4-8016300C 15D914 0038+00 1/1 0/0 0/0 .text            U__9dCamera_cFv */
 s16 dCamera_c::U() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x24.U();
@@ -1319,20 +1280,17 @@ s16 dCamera_c::U() {
     }
 }
 
-/* 8016300C-80163028 15D94C 001C+00 1/1 1/1 135/135 .text            SetTrimSize__9dCamera_cFl */
 bool dCamera_c::SetTrimSize(s32 size) {
     bool rt = mTrimSize != size;
     mTrimSize = size;
     return rt;
 }
 
-/* 80163028-80163034 15D968 000C+00 1/1 2/2 4/4 .text            SetTrimTypeForce__9dCamera_cFl */
 bool dCamera_c::SetTrimTypeForce(s32 param_0) {
     mTrimTypeForce = param_0;
     return 1;
 }
 
-/* 80163034-80163154 15D974 0120+00 1/1 0/0 0/0 .text            CalcTrimSize__9dCamera_cFv */
 void dCamera_c::CalcTrimSize() {
     if (mCurState != 2) {
         switch (mTrimSize) {
@@ -1367,7 +1325,6 @@ void dCamera_c::CalcTrimSize() {
     mForcedMode = 11;
 }
 
-/* 80163154-8016317C 15DA94 0028+00 1/1 0/0 0/0 .text            Draw__9dCamera_cFv */
 int dCamera_c::Draw() {
 #if DEBUG
     debugDraw();
@@ -1376,8 +1333,6 @@ int dCamera_c::Draw() {
     return 1;
 }
 
-/* 8016317C-80163340 15DABC 01C4+00 1/1 0/0 0/0 .text            setStageMapToolData__9dCamera_cFv
- */
 void dCamera_c::setStageMapToolData() {
     int cameraIndex = 0xFF;
     int var_r27 = 0xFF;
@@ -1414,7 +1369,6 @@ void dCamera_c::setStageMapToolData() {
     }
 }
 
-/* 80163340-80163558 15DC80 0218+00 2/2 0/0 0/0 .text            setMapToolData__9dCamera_cFv */
 void dCamera_c::setMapToolData() {
     int room_no = dComIfGp_roomControl_getStayNo();
     stage_camera_class* camera = dComIfGp_getRoomCamera(room_no);
@@ -1446,7 +1400,6 @@ void dCamera_c::setMapToolData() {
     setRoomMapToolData(&mRoomMapTool, var_r29, room_no);
 }
 
-/* 80163558-801635AC 15DE98 0054+00 0/0 0/0 1/1 .text SetTagData__9dCamera_cFP10fopAc_ac_clUsUc */
 void dCamera_c::SetTagData(fopAc_ac_c* param_0, s32 param_1, u16 param_2, u8 param_3) {
     s32 room_no;
     if (param_0 != NULL) {
@@ -1458,13 +1411,10 @@ void dCamera_c::SetTagData(fopAc_ac_c* param_0, s32 param_1, u16 param_2, u8 par
     mTagCamTool.Set(param_1, room_no, param_0, param_2, param_3);
 }
 
-/* 801635AC-801635E4 15DEEC 0038+00 2/2 0/0 0/0 .text
- * setRoomMapToolData__9dCamera_cFP15dCamMapToolDatall          */
 void dCamera_c::setRoomMapToolData(dCamMapToolData* i_toolData, s32 param_1, s32 i_roomNo) {
     i_toolData->Set(param_1, i_roomNo, NULL, 0xFF, 0xFF);
 }
 
-/* 801635E4-80163C38 15DF24 0654+00 1/1 0/0 0/0 .text            nextMode__9dCamera_cFl */
 s32 dCamera_c::nextMode(s32 i_curMode) {
     dAttention_c* attn = dComIfGp_getAttention();
     s32 next_mode = i_curMode;
@@ -1578,7 +1528,6 @@ s32 dCamera_c::nextMode(s32 i_curMode) {
     return next_mode;
 }
 
-/* 80163C38-80163D50 15E578 0118+00 2/1 0/0 0/0 .text            onModeChange__9dCamera_cFll */
 bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) {
     field_0x160 = 0;
     field_0x164 = 0;
@@ -1625,13 +1574,11 @@ bool dCamera_c::onModeChange(s32 i_curMode, s32 i_nextMode) {
     return true;
 }
 
-/* 80163D50-80163D5C 15E690 000C+00 0/0 0/0 4/4 .text            ModeFix__9dCamera_cFl */
 int dCamera_c::ModeFix(s32 param_0) {
     mForcedMode = param_0;
     return 1;
 }
 
-/* 80163D5C-8016444C 15E69C 06F0+00 1/1 0/0 0/0 .text            nextType__9dCamera_cFl */
 s32 dCamera_c::nextType(s32 i_curType) {
     s32 next_type = i_curType;
 
@@ -1768,7 +1715,6 @@ s32 dCamera_c::nextType(s32 i_curType) {
     return next_type;
 }
 
-/* 8016444C-8016469C 15ED8C 0250+00 1/1 0/0 0/0 .text            onTypeChange__9dCamera_cFll */
 bool dCamera_c::onTypeChange(s32 i_curType, s32 i_nextType) {
     if (i_curType == specialType[CAM_TYPE_EVENT]) {
         if (mCamSetup.CheckFlag(0x4000)) {
@@ -1826,7 +1772,6 @@ bool dCamera_c::onTypeChange(s32 i_curType, s32 i_nextType) {
     return true;
 }
 
-/* 8016469C-801647B0 15EFDC 0114+00 2/1 0/0 0/0 .text            onStyleChange__9dCamera_cFll */
 bool dCamera_c::onStyleChange(s32 param_0, s32 param_1) {
     mCurCamStyleTimer = 0;
     mStyleSettle.mFinished = false;
@@ -1872,7 +1817,6 @@ bool dCamera_c::onStyleChange(s32 param_0, s32 param_1) {
 }
 
 
-/* 801647B0-80164878 15F0F0 00C8+00 1/1 0/0 0/0 .text            onRoomChange__9dCamera_cFl */
 int dCamera_c::onRoomChange(s32 i_roomNo) {
     mRoomCtx.mRoomNo = i_roomNo;
     setFlag(0x1000);
@@ -1895,8 +1839,6 @@ int dCamera_c::onRoomChange(s32 i_roomNo) {
     return 1;
 }
 
-/* 80164878-80164944 15F1B8 00CC+00 4/4 0/0 0/0 .text            getParamTargetActor__9dCamera_cFl
- */
 fopAc_ac_c* dCamera_c::getParamTargetActor(s32 param_0) {
     daAlink_c* player = daAlink_getAlinkActorClass();
 
@@ -1914,7 +1856,6 @@ fopAc_ac_c* dCamera_c::getParamTargetActor(s32 param_0) {
     return fopAcM_searchFromName4Event(&mCamTypeData[param_0].name[16], -1);
 }
 
-/* 80164944-80164B64 15F284 0220+00 0/0 1/1 0/0 .text GetCameraTypeFromMapToolID__9dCamera_cFll */
 int dCamera_c::GetCameraTypeFromMapToolID(s32 param_0, s32 i_roomNo) {
     dStage_dt_c& stage_dt = g_dComIfG_gameInfo.play.getStage();
 
@@ -1986,8 +1927,6 @@ int dCamera_c::GetCameraTypeFromMapToolID(s32 param_0, s32 i_roomNo) {
     return i;
 }
 
-/* 80164B64-80164C10 15F4A4 00AC+00 2/2 1/1 0/0 .text GetCameraTypeFromCameraName__9dCamera_cFPCc
- */
 int dCamera_c::GetCameraTypeFromCameraName(char const* i_name) {
     if (strcmp(i_name, mCamTypeData[mCurType].name) == 0) {
         return mCurType;
@@ -2010,8 +1949,6 @@ int dCamera_c::GetCameraTypeFromCameraName(char const* i_name) {
     return i;
 }
 
-/* 80164C10-80164C64 15F550 0054+00 2/2 0/0 0/0 .text
- * GetCameraTypeFromToolData__9dCamera_cFP24stage_camera2_data_class */
 int dCamera_c::GetCameraTypeFromToolData(stage_camera2_data_class* i_data) {
     if (i_data->field_0x16 != 0xFFFF) {
         return i_data->field_0x16;
@@ -2025,8 +1962,6 @@ int dCamera_c::GetCameraTypeFromToolData(stage_camera2_data_class* i_data) {
     return type;
 }
 
-/* 80164C64-80164CAC 15F5A4 0048+00 4/4 2/2 0/0 .text
- * pushInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_cs              */
 void dCamera_c::pushInfo(dCamera_c::dCamInfo_c* i_info, s16 param_1) {
     i_info->mCenter = mCenter;
     i_info->mEye = mEye;
@@ -2035,8 +1970,6 @@ void dCamera_c::pushInfo(dCamera_c::dCamInfo_c* i_info, s16 param_1) {
     i_info->field_0x1e = param_1;
 }
 
-/* 80164CAC-80164D2C 15F5EC 0080+00 2/2 0/0 0/0 .text
- * popInfo__9dCamera_cFPQ29dCamera_c10dCamInfo_c                */
 void dCamera_c::popInfo(dCamera_c::dCamInfo_c* i_info) {
     mCenter = mViewCache.mCenter = i_info->mCenter;
     mEye = mViewCache.mEye = i_info->mEye;
@@ -2045,8 +1978,6 @@ void dCamera_c::popInfo(dCamera_c::dCamInfo_c* i_info) {
     mBank = mViewCache.mBank;
 }
 
-/* 80164D2C-80164D6C 15F66C 0040+00 4/4 0/0 0/0 .text            heightOf__9dCamera_cFP10fopAc_ac_c
- */
 f32 dCamera_c::heightOf(fopAc_ac_c* i_actor) {
     if (is_player(i_actor)) {
         return ((daPy_py_c*)i_actor)->getHeight();
@@ -2055,8 +1986,6 @@ f32 dCamera_c::heightOf(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 80164D6C-80164E20 15F6AC 00B4+00 9/9 15/15 0/0 .text
- * relationalPos__9dCamera_cFP10fopAc_ac_cP4cXyz                */
 cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor, cXyz* i_offset) {
     if (i_actor == NULL) {
         return cXyz::Zero;
@@ -2066,8 +1995,6 @@ cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor, cXyz* i_offset) {
     return attentionPos(i_actor) + offset;
 }
 
-/* 80164E20-80165104 15F760 02E4+00 0/0 1/1 0/0 .text
- * relationalPos__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzf  */
 cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* i_offset,
                               f32 param_3) {
     if (i_actor1 == NULL) {
@@ -2098,19 +2025,16 @@ cXyz dCamera_c::relationalPos(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz*
     return ret;
 }
 
-/* 80165104-80165158 15FA44 0054+00 7/7 0/0 0/0 .text            setUSOAngle__9dCamera_cFv */
 void dCamera_c::setUSOAngle() {
     mFakeAngleSys.field_0x0 = 1;
     mFakeAngleSys.field_0x2 = mDirection.U().Inv();
     mFakeAngleSys.field_0x4 = mPadInfo.mMainStick.mAngle;
 }
 
-/* 80165158-8016517C 15FA98 0024+00 1/1 0/0 0/0 .text            getUSOAngle__9dCamera_cF7cSAngle */
 cSAngle dCamera_c::getUSOAngle(cSAngle param_0) {
     return mFakeAngleSys.field_0x2;
 }
 
-/* 8016517C-80165238 15FABC 00BC+00 1/1 2/2 0/0 .text            pointInSight__9dCamera_cFP4cXyz */
 bool dCamera_c::pointInSight(cXyz* i_point) {
     cXyz proj;
     dDlst_window_c* window = get_window(field_0x0);
@@ -2121,8 +2045,6 @@ bool dCamera_c::pointInSight(cXyz* i_point) {
     return (proj.x > 0.0f && proj.x < scissor_width) && (proj.y > 0.0f && proj.y < scissor_height);
 }
 
-/* 80165238-801657EC 15FB78 05B4+00 3/3 0/0 0/0 .text
- * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf */
 f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cXyz* i_center,
                                    cXyz* i_eye, f32 i_fovY, s16 i_bank, f32 param_6) {
     dDlst_window_c* window = get_window(field_0x0);
@@ -2221,7 +2143,6 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cX
     return ret;
 }
 
-/* 801657EC-801658C0 16012C 00D4+00 3/3 0/0 0/0 .text            groundHeight__9dCamera_cFP4cXyz */
 f32 dCamera_c::groundHeight(cXyz* param_0) {
     dBgS_GndChk gndchk;
     gndchk.SetPos(param_0);
@@ -2248,8 +2169,6 @@ f32 dCamera_c::groundHeight(cXyz* param_0) {
     return height_correct;
 }
 
-/* 801658C0-801659F4 160200 0134+00 12/12 0/0 0/0 .text
- * lineBGCheck__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl         */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linChk, u32 i_flags) {
     if (i_flags & 0x8000) {
         i_linChk->ClrCam();
@@ -2292,8 +2211,6 @@ bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linChk, u
     }
 }
 
-/* 801659F4-80165AF0 160334 00FC+00 4/4 4/4 0/0 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzP4cXyzUl
- */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, cXyz* o_cross, u32 i_flags) {
     dBgS_CamLinChk lin_chk;
     if (lineBGCheck(i_start, i_end, &lin_chk, i_flags)) {
@@ -2307,14 +2224,11 @@ bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, cXyz* o_cross, u32 i_fla
     }
 }
 
-/* 80165AF0-80165B60 160430 0070+00 3/3 13/13 0/0 .text lineBGCheck__9dCamera_cFP4cXyzP4cXyzUl */
 bool dCamera_c::lineBGCheck(cXyz* i_start, cXyz* i_end, u32 i_flags) {
     dBgS_CamLinChk lin_chk;
     return lineBGCheck(i_start, i_end, &lin_chk, i_flags);
 }
 
-/* 80165B60-80165C08 1604A0 00A8+00 1/1 0/0 0/0 .text
- * lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz              */
 u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
     u32 ret = 0;
     u32 result = dComIfG_Ccsp()->GetMassResultCam();
@@ -2335,8 +2249,6 @@ u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
     return ret;
 }
 
-/* 80165C08-80165CE0 160548 00D8+00 1/1 0/0 0/0 .text
- * sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */
 static void sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_vtxIdx0,
                              int i_vtxIdx1, int i_vtxIdx2, cM3dGPla* i_plane, void* i_data) {
     camSphChkdata* sph_chk_data = (camSphChkdata*)i_data;
@@ -2351,7 +2263,6 @@ static void sph_chk_callback(dBgS_SphChk* i_sphChk, cBgD_Vtx_t* i_vtxTbl, int i_
     }
 }
 
-/* 80165CE0-80165E74 160620 0194+00 1/1 0/0 0/0 .text compWallMargin__9dCamera_cFP4cXyzP4cXyzf */
 cXyz dCamera_c::compWallMargin(cXyz* i_center, cXyz* param_1, f32 i_radius) {
     dBgS_CamSphChk sph_chk;
     camSphChkdata sph_chk_data(i_center, param_1, i_radius);
@@ -2370,7 +2281,6 @@ cXyz dCamera_c::compWallMargin(cXyz* i_center, cXyz* param_1, f32 i_radius) {
     return sph_chk_data.field_0xc;
 }
 
-/* 80165EF4-80165FB4 160834 00C0+00 1/1 0/0 0/0 .text            defaultTriming__9dCamera_cFv */
 int dCamera_c::defaultTriming() {
     if (mTrimTypeForce >= 0) {
         SetTrimSize(mTrimTypeForce);
@@ -2401,7 +2311,6 @@ int dCamera_c::defaultTriming() {
     return mTrimSize;
 }
 
-/* 80165FB4-8016608C 1608F4 00D8+00 1/1 0/0 0/0 .text            setView__9dCamera_cFffff */
 void dCamera_c::setView(f32 i_xOrig, f32 i_yOrig, f32 i_width, f32 i_height) {
     dDlst_window_c* window = get_window(field_0x0);
     view_port_class* view_port = window->getViewPort();
@@ -2409,7 +2318,6 @@ void dCamera_c::setView(f32 i_xOrig, f32 i_yOrig, f32 i_width, f32 i_height) {
     window->setScissor(i_xOrig, i_yOrig, i_width, i_height);
 }
 
-/* 8016608C-80166764 1609CC 06D8+00 1/1 0/0 0/0 .text            forwardCheckAngle__9dCamera_cFv */
 cSAngle dCamera_c::forwardCheckAngle() {
     dBgS_CamLinChk lin_chk;
     cSAngle ret = cSAngle::_0;
@@ -2476,7 +2384,6 @@ cSAngle dCamera_c::forwardCheckAngle() {
     return ret;
 }
 
-/* 80166764-80167BBC 1610A4 1458+00 1/1 0/0 0/0 .text            bumpCheck__9dCamera_cFUl */
 bool dCamera_c::bumpCheck(u32 i_flags) {
     int uVar14 = 0;
     static int prev_plat1 = 0;
@@ -2886,8 +2793,6 @@ bool dCamera_c::bumpCheck(u32 i_flags) {
     return uVar13 != 0 ? true : false;
 }
 
-/* 80167BF8-80167C24 162538 002C+00 2/2 0/0 0/0 .text
- * lineBGCheckBoth__9dCamera_cFP4cXyzP4cXyzP11dBgS_LinChkUl     */
 bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linchk,
                                 u32 i_flags) {
     i_linchk->OnBackFlag();
@@ -2895,8 +2800,6 @@ bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linch
     return lineBGCheck(i_start, i_end, i_linchk, i_flags);
 }
 
-/* 80167C24-80167CB8 162564 0094+00 1/1 0/0 0/0 .text
- * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */
 f32 dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1,
                                        fopAc_ac_c* param_2) {
     f32 var_f31 = radiusActorInSight(param_0, param_1, &mViewCache.mCenter, &mViewCache.mEye, mFovy, mBank, 0.05f);
@@ -2912,7 +2815,6 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* param_0, fopAc_ac_c* param_1,
     return var_f29;
 }
 
-/* 80167CD8-80167E3C 162618 0164+00 2/2 0/0 0/0 .text            jutOutCheck__9dCamera_cFP4cXyzf */
 BOOL dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) {
     cXyz spB4 = attentionPos(mpPlayerActor);
     spB4 += (positionOf(mpPlayerActor) - spB4) * 0.5f;
@@ -2930,7 +2832,6 @@ BOOL dCamera_c::jutOutCheck(cXyz* param_0, f32 param_1) {
     return FALSE;
 }
 
-/* 80167E3C-80167EF4 16277C 00B8+00 1/1 0/0 0/0 .text            tooNearEscape__9dCamera_cFP4cXyz */
 void dCamera_c::tooNearEscape(cXyz* param_0) {
     cXyz sp2C = attentionPos(mpPlayerActor);
     cSGlobe sp58(*param_0 - sp2C);
@@ -2941,7 +2842,6 @@ void dCamera_c::tooNearEscape(cXyz* param_0) {
     }
 }
 
-/* 80167EF4-80167FEC 162834 00F8+00 2/2 0/0 0/0 .text getWaterSurfaceHeight__9dCamera_cFP4cXyz */
 f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) {
     f32 var_f31 = -G_CM3D_F_INF;
 
@@ -2966,7 +2866,6 @@ f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) {
     return var_f31;
 }
 
-/* 80167FEC-80168744 16292C 0758+00 3/3 0/0 0/0 .text            checkGroundInfo__9dCamera_cFv */
 void dCamera_c::checkGroundInfo() {
     daAlink_c* player = (daAlink_c*)mpPlayerActor;
     cXyz gnd_chk_pos = positionOf(mpPlayerActor);
@@ -3077,7 +2976,6 @@ void dCamera_c::checkGroundInfo() {
     }
 }
 
-/* 80168744-8016C25C 163084 3B18+00 3/2 0/0 0/0 .text            chaseCamera__9dCamera_cFl */
 bool dCamera_c::chaseCamera(s32 param_0) {
     static f32 JumpCushion = 0.9f;
     f32 charge_latitude = mCamSetup.ChargeLatitude();
@@ -4116,7 +4014,6 @@ bool dCamera_c::chaseCamera(s32 param_0) {
     return 1;
 }
 
-/* 8016C384-8016E410 166CC4 208C+00 1/0 0/0 0/0 .text            lockonCamera__9dCamera_cFl */
 bool dCamera_c::lockonCamera(s32 param_0) {
     f32 lockon_change_cushion = mCamSetup.LockonChangeCushion();
     cSAngle charge_latitude = cSAngle(mCamSetup.ChargeLatitude());
@@ -4692,7 +4589,6 @@ bool dCamera_c::lockonCamera(s32 param_0) {
     return true;
 }
 
-/* 8016E448-8016E4A4 168D88 005C+00 1/1 0/0 0/0 .text            getMsgCmdSpeaker__9dCamera_cFv */
 fopAc_ac_c* dCamera_c::getMsgCmdSpeaker() {
     dComIfG_MesgCamInfo_c* info = dComIfGp_getMesgCameraInfo();
     fopAc_ac_c* actor = NULL;
@@ -4710,7 +4606,6 @@ fopAc_ac_c* dCamera_c::getMsgCmdSpeaker() {
     return actor;
 }
 
-/* 8016E4A4-8016E4F4 168DE4 0050+00 1/1 0/0 0/0 .text            getMsgCmdCut__9dCamera_cFl */
 s32 dCamera_c::getMsgCmdCut(s32 param_0) {
     dComIfG_MesgCamInfo_c* info = dComIfGp_getMesgCameraInfo();
 
@@ -4725,7 +4620,6 @@ s32 dCamera_c::getMsgCmdCut(s32 param_0) {
     return param_0;
 }
 
-/* 8016E4F4-80174E18 168E34 6924+00 2/0 0/0 0/0 .text            talktoCamera__9dCamera_cFl */
 bool dCamera_c::talktoCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6161,13 +6055,10 @@ bool dCamera_c::talktoCamera(s32 param_0) {
     return uVar18;
 }
 
-/* 80174EA4-80174EAC 16F7E4 0008+00 0/0 1/1 0/0 .text            CalcSubjectAngle__9dCamera_cFPsPs
- */
 bool dCamera_c::CalcSubjectAngle(s16* param_0, s16* param_1) {
     return false;
 }
 
-/* 80174EAC-80174ED4 16F7EC 0028+00 0/0 0/0 1/1 .text            SaveZoomRatio__9dCamera_cFv */
 bool dCamera_c::SaveZoomRatio() {
     if (mCamParam.Algorythmn() != 4) {
         return false;
@@ -6179,7 +6070,6 @@ bool dCamera_c::SaveZoomRatio() {
     return true;
 }
 
-/* 80174ED4-80176074 16F814 11A0+00 1/0 0/0 0/0 .text            subjectCamera__9dCamera_cFl */
 bool dCamera_c::subjectCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6528,7 +6418,6 @@ bool dCamera_c::subjectCamera(s32 param_0) {
     return true;
 }
 
-/* 80176074-801767F8 1709B4 0784+00 1/0 0/0 0/0 .text            magneCamera__9dCamera_cFl */
 bool dCamera_c::magneCamera(s32 param_0) {
     f32 val5 = mCamParam.Val(param_0, 5);
     f32 val0 = mCamParam.Val(param_0, 0);
@@ -6639,7 +6528,6 @@ bool dCamera_c::magneCamera(s32 param_0) {
     return true;
 }
 
-/* 801767F8-80176DF0 171138 05F8+00 1/0 0/0 0/0 .text            colosseumCamera__9dCamera_cFl */
 bool dCamera_c::colosseumCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -6749,17 +6637,14 @@ bool dCamera_c::colosseumCamera(s32 param_0) {
     return true;
 }
 
-/* 80176DF0-80176DF8 171730 0008+00 1/0 0/0 0/0 .text            test1Camera__9dCamera_cFl */
 bool dCamera_c::test1Camera(s32 param_0) {
     return false;
 }
 
-/* 80176DF8-80176E00 171738 0008+00 1/0 0/0 0/0 .text            test2Camera__9dCamera_cFl */
 bool dCamera_c::test2Camera(s32 param_0) {
     return false;
 }
 
-/* 80176E00-80178E50 171740 2050+00 1/0 0/0 0/0 .text            towerCamera__9dCamera_cFl */
 bool dCamera_c::towerCamera(s32 param_0) {
     cSAngle stack_444 = cSAngle(mCamSetup.ChargeLatitude());
     cSAngle stack_448 = 80.0f;
@@ -7198,7 +7083,6 @@ bool dCamera_c::towerCamera(s32 param_0) {
     return true;
 }
 
-/* 80178E50-80179590 173790 0740+00 1/0 0/0 0/0 .text            hookshotCamera__9dCamera_cFl */
 bool dCamera_c::hookshotCamera(s32 param_0) {
     f32 val0 = mCamParam.Val(param_0, 0);
     f32 val2 = mCamParam.Val(param_0, 2);
@@ -7589,7 +7473,6 @@ bool dCamera_c::railCamera(s32 param_0) {
     return true;
 }
 
-/* 8017A2A0-8017ADC0 174BE0 0B20+00 1/0 0/0 0/0 .text            paraRailCamera__9dCamera_cFl */
 bool dCamera_c::paraRailCamera(s32 param_0) {
     int i;
 
@@ -7820,7 +7703,6 @@ bool dCamera_c::paraRailCamera(s32 param_0) {
     return true;
 }
 
-/* 8017ADC0-8017D934 175700 2B74+00 1/0 0/0 0/0 .text            rideCamera__9dCamera_cFl */
 bool dCamera_c::rideCamera(s32 param_0) {
     static cSAngle LatMin = -80.0f;
     static cSAngle LatMax = 80.0f;
@@ -8544,12 +8426,10 @@ bool dCamera_c::rideCamera(s32 param_0) {
     return true;
 }
 
-/* 8017D974-8017D97C 1782B4 0008+00 1/0 0/0 0/0 .text            manualCamera__9dCamera_cFl */
 bool dCamera_c::manualCamera(s32 param_0) {
     return true;
 }
 
-/* 8017D97C-8017DFAC 1782BC 0630+00 1/0 0/0 0/0 .text            observeCamera__9dCamera_cFl */
 bool dCamera_c::observeCamera(s32 param_0) {
 
     f32 dVar8 = mCamSetup.CurveWeight();
@@ -8660,7 +8540,6 @@ bool dCamera_c::observeCamera(s32 param_0) {
     return true;
 }
 
-/* 8017DFAC-8017E730 1788EC 0784+00 1/0 0/0 0/0 .text            fixedFrameCamera__9dCamera_cFl */
 bool dCamera_c::fixedFrameCamera(s32 param_0) {
     f32 val24 = mCamParam.Val(param_0, 24);
     f32 val17 = mCamParam.Val(param_0, 17);
@@ -8751,8 +8630,6 @@ bool dCamera_c::fixedFrameCamera(s32 param_0) {
     return true;
 }
 
-/* 8017E730-8017F25C 179070 0B2C+00 1/0 0/0 0/0 .text            fixedPositionCamera__9dCamera_cFl
- */
 bool dCamera_c::fixedPositionCamera(s32 param_0) {
     f32 focusOffsetX = mCamParam.Val(param_0, 0);
     f32 focusOffsetY = mCamParam.Val(param_0, 2);
@@ -8923,7 +8800,6 @@ bool dCamera_c::fixedPositionCamera(s32 param_0) {
     return true;
 }
 
-/* 8017F25C-8017F828 179B9C 05CC+00 1/0 0/0 0/0 .text            oneSideCamera__9dCamera_cFl */
 bool dCamera_c::oneSideCamera(s32 param_1) {
     f32 unkRatio;
 
@@ -9043,7 +8919,6 @@ bool dCamera_c::oneSideCamera(s32 param_1) {
     return true;
 }
 
-/* 8017F828-8018050C 17A168 0CE4+00 2/1 0/0 0/0 .text            eventCamera__9dCamera_cFl */
 bool dCamera_c::eventCamera(s32 param_0) {
     char sp90[12];
 
@@ -9416,7 +9291,6 @@ bool dCamera_c::eventCamera(s32 param_0) {
     return true;
 }
 
-/* 8018050C-801806D4 17AE4C 01C8+00 1/0 0/0 0/0 .text            currentEvCamera__9dCamera_cFv */
 bool dCamera_c::currentEvCamera() {
     int style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][0];
     if (style < 0) {
@@ -9458,20 +9332,15 @@ bool dCamera_c::currentEvCamera() {
     return true;
 }
 
-/* 801806D4-801806DC 17B014 0008+00 1/0 0/0 0/0 .text            letCamera__9dCamera_cFl */
 bool dCamera_c::letCamera(s32) {
     return true;
 }
 
-/* 801806DC-80180738 17B01C 005C+00 2/2 0/0 0/0 .text            setEventRecoveryTrans__9dCamera_cFs
- */
 void dCamera_c::setEventRecoveryTrans(s16 param_0) {
     pushInfo(&mRecovery.field_0x8, param_0);
     mRecovery.field_0x28 = positionOf(mpPlayerActor);
 }
 
-/* 80180738-80180A40 17B078 0308+00 1/1 0/0 0/0 .text            runEventRecoveryTrans__9dCamera_cFv
- */
 s16 dCamera_c::runEventRecoveryTrans() {
     if (mRecovery.field_0x8.field_0x1e > 0) {
         field_0x668++;
@@ -9504,20 +9373,17 @@ s16 dCamera_c::runEventRecoveryTrans() {
     return mRecovery.field_0x8.field_0x1e;
 }
 
-/* 80180A40-80180AA8 17B380 0068+00 0/0 3/3 0/0 .text            EventRecoverNotime__9dCamera_cFv */
 void dCamera_c::EventRecoverNotime() {
     mRecovery.field_0x4 = 1;
     Reset(mRecovery.field_0x8.mCenter, mRecovery.field_0x8.mEye, mRecovery.field_0x8.mFovy, mRecovery.field_0x8.mBank);
 }
 
-/* 80180AA8-80180AE0 17B3E8 0038+00 0/0 0/0 24/24 .text            Set__9dCamera_cF4cXyz4cXyz */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye) {
     mCenter = i_center;
     mEye = i_eye;
     return 1;
 }
 
-/* 80180AE0-80180B40 17B420 0060+00 0/0 2/2 93/93 .text            Set__9dCamera_cF4cXyz4cXyzfs */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9526,7 +9392,6 @@ int dCamera_c::Set(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     return 1;
 }
 
-/* 80180B40-80180BA0 17B480 0060+00 0/0 0/0 11/11 .text            Set__9dCamera_cF4cXyz4cXyzsf */
 int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9535,7 +9400,6 @@ int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) {
     return 1;
 }
 
-/* 80180BA0-80180C18 17B4E0 0078+00 1/1 1/1 18/18 .text            Reset__9dCamera_cF4cXyz4cXyzfs */
 void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     mCenter = i_center;
     mEye = i_eye;
@@ -9544,14 +9408,12 @@ void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
     Reset();
 }
 
-/* 80180C18-80180C68 17B558 0050+00 0/0 0/0 64/64 .text            Reset__9dCamera_cF4cXyz4cXyz */
 void dCamera_c::Reset(cXyz i_center, cXyz i_eye) {
     mCenter = i_center;
     mEye = i_eye;
     Reset();
 }
 
-/* 80180C68-80180D24 17B5A8 00BC+00 2/2 1/1 3/3 .text            Reset__9dCamera_cFv */
 int dCamera_c::Reset() {
     mViewCache.mCenter = mCenter;
     mViewCache.mEye = mEye;
@@ -9563,7 +9425,6 @@ int dCamera_c::Reset() {
     return 1;
 }
 
-/* 80180D24-80181000 17B664 02DC+00 2/2 0/0 0/0 .text            shakeCamera__9dCamera_cFv */
 // NONMATCHING - minor regalloc
 f32 dCamera_c::shakeCamera() {
     static f32 const wave[] = {0.4f, 0.9f, 2.1f, 3.2f};
@@ -9630,13 +9491,9 @@ f32 dCamera_c::shakeCamera() {
     return var_f31;
 }
 
-/* 80453914-80453918 001F14 0004+00 1/1 0/0 0/0 .sdata2
- * PatternLengthMax__Q29dCamera_c23@class$3669d_camera_cpp      */
 // supposed to be some anonymous static class member or something?
 static const int PatternLengthMax[] = {0x00000004};  // array to make it go in correct section
 
-/* 80181000-80181158 17B940 0158+00 0/0 1/1 0/0 .text            StartShake__9dCamera_cFlPUcl4cXyz
- */
 int dCamera_c::StartShake(s32 i_length, u8* i_pattern, s32 i_flags, cXyz i_pos) {
     if (i_length < 0 || i_length > (PatternLengthMax[0] << 3)) {
         i_length = (PatternLengthMax[0] << 3);
@@ -9674,7 +9531,6 @@ int dCamera_c::StartShake(s32 i_length, u8* i_pattern, s32 i_flags, cXyz i_pos)
     return 1;
 }
 
-/* 80181158-80181170 17BA98 0018+00 0/0 1/1 0/0 .text            StopShake__9dCamera_cFv */
 int dCamera_c::StopShake() {
     mShake.m_length = 0;
     mShake.field_0x10 = 0;
@@ -9682,7 +9538,6 @@ int dCamera_c::StopShake() {
     return 1;
 }
 
-/* 80181170-801811B8 17BAB0 0048+00 1/1 2/2 10/10 .text StartBlure__9dCamera_cFiP10fopAc_ac_cff */
 void dCamera_c::StartBlure(int param_0, fopAc_ac_c* i_actor, f32 i_alpha, f32 i_scale) {
     mBlure.field_0x14 = param_0;
     mBlure.mpActor = NULL;
@@ -9704,7 +9559,6 @@ void dCamera_c::StartBlure(int param_0, fopAc_ac_c* i_actor, f32 i_alpha, f32 i_
     mBlure.field_0x4 = param_0;
 }
 
-/* 801811B8-80181208 17BAF8 0050+00 0/0 0/0 1/1 .text            ResetBlure__9dCamera_cFv */
 void dCamera_c::ResetBlure() {
     mBlure.mpActor = NULL;
     mBlure.mAlpha = 0.75f;
@@ -9724,19 +9578,16 @@ void dCamera_c::ResetBlure() {
     mBlure.field_0x14 = 1;
 }
 
-/* 80181208-80181210 17BB48 0008+00 0/0 1/1 0/0 .text            SetBlureAlpha__9dCamera_cFf */
 void dCamera_c::SetBlureAlpha(f32 i_alpha) {
     mBlure.mAlpha = i_alpha;
 }
 
-/* 80181210-80181220 17BB50 0010+00 0/0 1/1 0/0 .text            SetBlureScale__9dCamera_cFfff */
 void dCamera_c::SetBlureScale(f32 i_scalex, f32 i_scaley, f32 i_scalez) {
     mBlure.mScale.x = i_scalex;
     mBlure.mScale.y = i_scaley;
     mBlure.mScale.z = i_scalez;
 }
 
-/* 80181220-80181278 17BB60 0058+00 0/0 1/1 0/0 .text            SetBlurePosition__9dCamera_cFfff */
 void dCamera_c::SetBlurePosition(f32 i_posx, f32 i_posy, f32 i_posz) {
     SetBlureActor(NULL);
     mBlure.mPosition.x = i_posx;
@@ -9744,12 +9595,10 @@ void dCamera_c::SetBlurePosition(f32 i_posx, f32 i_posy, f32 i_posz) {
     mBlure.mPosition.z = i_posz;
 }
 
-/* 80181278-80181280 -00001 0008+00 0/0 0/0 0/0 .text SetBlureActor__9dCamera_cFP10fopAc_ac_c */
 void dCamera_c::SetBlureActor(fopAc_ac_c* i_actor) {
     mBlure.mpActor = i_actor;
 }
 
-/* 80181280-80181490 17BBC0 0210+00 2/2 0/0 0/0 .text            blureCamera__9dCamera_cFv */
 int dCamera_c::blureCamera() {
     if (mBlure.field_0x4 > 0) {
         if (mBlure.mpActor != NULL) {
@@ -9790,19 +9639,15 @@ int dCamera_c::blureCamera() {
     return mBlure.field_0x4;
 }
 
-/* 80181490-80181500 17BDD0 0070+00 2/2 0/0 0/0 .text            onHorseDush__9dCamera_cFv */
 void dCamera_c::onHorseDush() {
     dComIfGp_getVibration().StartShock(VIBMODE_S_POWER2, 1, cXyz(0.0f, 1.0f, 0.0f));
     StartBlure(55, mpPlayerActor, 0.75f, 1.0f);
 }
 
-/* 80181500-80181534 17BE40 0034+00 1/1 1/1 5/5 .text            GetForceLockOnActor__9dCamera_cFv
- */
 fopAc_ac_c* dCamera_c::GetForceLockOnActor() {
     return fopAcM_SearchByID(mLockOnActorID);
 }
 
-/* 80181534-80181560 17BE74 002C+00 0/0 0/0 9/9 .text ForceLockOn__9dCamera_cFP10fopAc_ac_c */
 int dCamera_c::ForceLockOn(fopAc_ac_c* i_actor) {
     mForceLockTimer = 0;
     mpLockOnActor = i_actor;
@@ -9810,7 +9655,6 @@ int dCamera_c::ForceLockOn(fopAc_ac_c* i_actor) {
     return 1;
 }
 
-/* 80181560-8018159C 17BEA0 003C+00 1/1 0/0 0/0 .text            ForceLockOff__9dCamera_cFUi */
 int dCamera_c::ForceLockOff(fpc_ProcID i_id) {
     if (i_id == mLockOnActorID || i_id == fpcM_ERROR_PROCESS_ID_e) {
         mLockOnActorID = fpcM_ERROR_PROCESS_ID_e;
@@ -9822,7 +9666,6 @@ int dCamera_c::ForceLockOff(fpc_ProcID i_id) {
     return 0;
 }
 
-/* 8018159C-801815CC 17BEDC 0030+00 0/0 0/0 7/7 .text ForceLockOff__9dCamera_cFP10fopAc_ac_c */
 int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) {
     if (i_actor == mpLockOnActor) {
         mLockOnActorID = fpcM_ERROR_PROCESS_ID_e;
@@ -9834,32 +9677,26 @@ int dCamera_c::ForceLockOff(fopAc_ac_c* i_actor) {
     return 0;
 }
 
-/* 801815CC-801815F0 17BF0C 0024+00 0/0 0/0 5/5 .text            dCam_getAngleY__FP12camera_class */
 s16 dCam_getAngleY(camera_class* i_cam) {
     return i_cam->mCamera.U();
 }
 
-/* 801815F0-80181614 17BF30 0024+00 0/0 0/0 5/5 .text            dCam_getAngleX__FP12camera_class */
 s16 dCam_getAngleX(camera_class* i_cam) {
     return i_cam->mCamera.V();
 }
 
-/* 80181614-80181630 17BF54 001C+00 0/0 2/2 4/4 .text dCam_getControledAngleY__FP12camera_class */
 s16 dCam_getControledAngleY(camera_class* i_cam) {
     return i_cam->mCamera.U2();
 }
 
-/* 80181630-80181640 17BF70 0010+00 1/1 1/1 0/0 .text            dCam_getCamera__Fv */
 camera_class* dCam_getCamera() {
     return dComIfGp_getCamera(0);
 }
 
-/* 80181640-80181664 17BF80 0024+00 0/0 43/43 91/91 .text            dCam_getBody__Fv */
 dCamera_c* dCam_getBody() {
     return &dCam_getCamera()->mCamera;
 }
 
-/* 80181664-80181708 17BFA4 00A4+00 1/1 0/0 0/0 .text preparation__FP20camera_process_class */
 static void preparation(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dCamera_c* camera = &a_this->mCamera;
@@ -9877,7 +9714,6 @@ static void preparation(camera_process_class* i_this) {
     }
 }
 
-/* 80181708-80181804 17C048 00FC+00 2/2 0/0 0/0 .text view_setup__FP20camera_process_class */
 static void view_setup(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dDlst_window_c* window = get_window(a_this);
@@ -9905,7 +9741,6 @@ static void view_setup(camera_process_class* i_this) {
     mDoLib_clipper::setup(view->fovy, view->aspect, view->near, far);
 }
 
-/* 80181804-80181E20 17C144 061C+00 2/2 0/0 0/0 .text            store__FP20camera_process_class */
 static void store(camera_process_class* i_camera) {
     camera_class* a_camera = (camera_class*)i_camera;
     dCamera_c* dCamera = &a_camera->mCamera;
@@ -9991,7 +9826,6 @@ static void store(camera_process_class* i_camera) {
     fopCamM_SetAngleX(a_camera, globe.V());
 }
 
-/* 80181E20-80181E64 17C760 0044+00 1/1 0/0 0/0 .text            Up__9dCamera_cFv */
 cXyz dCamera_c::Up() {
     if (chkFlag(0x10)) {
         return mUpOverride.field_0x18;
@@ -10000,17 +9834,14 @@ cXyz dCamera_c::Up() {
     }
 }
 
-/* 80181E64-80181E98 17C7A4 0034+00 1/1 1/1 30/30 .text            Eye__9dCamera_cFv */
 cXyz dCamera_c::Eye() {
     return mEye + mShake.mEyeShake;
 }
 
-/* 80181E98-80181ECC 17C7D8 0034+00 1/1 1/1 25/25 .text            Center__9dCamera_cFv */
 cXyz dCamera_c::Center() {
     return mCenter + mShake.field_0x24;
 }
 
-/* 80181ECC-80181F70 17C80C 00A4+00 1/0 0/0 0/0 .text camera_execute__FP20camera_process_class */
 static int camera_execute(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     preparation(i_this);
@@ -10034,7 +9865,6 @@ static int camera_execute(camera_process_class* i_this) {
     return 1;
 }
 
-/* 80181F70-801821E0 17C8B0 0270+00 1/0 0/0 0/0 .text camera_draw__FP20camera_process_class */
 static int camera_draw(camera_process_class* i_this) {
     camera_class* a_this = (camera_class*)i_this;
     dCamera_c* body = &((camera_class*)i_this)->mCamera;
@@ -10089,7 +9919,6 @@ static int camera_draw(camera_process_class* i_this) {
     return 1;
 }
 
-/* 801821E0-80182260 17CB20 0080+00 1/0 0/0 0/0 .text            init_phase1__FP12camera_class */
 static int init_phase1(camera_class* i_this) {
     int camera_id = get_camera_id(i_this);
 
@@ -10105,7 +9934,6 @@ static int init_phase1(camera_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80182260-80182454 17CBA0 01F4+00 1/0 0/0 0/0 .text            init_phase2__FP12camera_class */
 static int init_phase2(camera_class* i_this) {
     camera_process_class* a_this = (camera_process_class*)i_this;
     dCamera_c* body = &i_this->mCamera;
@@ -10170,7 +9998,6 @@ static int init_phase2(camera_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80182454-80182484 17CD94 0030+00 1/0 0/0 0/0 .text            camera_create__FP12camera_class */
 static int camera_create(camera_class* i_this) {
     static request_of_phase_process_fn l_method[3] = {
         (request_of_phase_process_fn)init_phase1,
@@ -10181,7 +10008,6 @@ static int camera_create(camera_class* i_this) {
     return dComLbG_PhaseHandler(&i_this->phase_request, l_method, i_this);
 }
 
-/* 80182484-801824C0 17CDC4 003C+00 1/0 0/0 0/0 .text camera_delete__FP20camera_process_class */
 static int camera_delete(camera_process_class* i_this) {
     dCamera_c* camera = &((camera_class*)i_this)->mCamera;
 
@@ -10195,12 +10021,10 @@ static int camera_delete(camera_process_class* i_this) {
     return 1;
 }
 
-/* 801824C0-801824C8 17CE00 0008+00 1/0 0/0 0/0 .text            is_camera_delete__FPv */
 static int is_camera_delete(void* i_this) {
     return 1;
 }
 
-/* 801824C8-80182560 17CE08 0098+00 1/1 0/0 0/0 .text            Init__14dCamForcusLineFv */
 void dCamForcusLine::Init() {
     field_0x49 = 0;
     field_0x48 = 1;
@@ -10224,7 +10048,6 @@ void dCamForcusLine::Init() {
     field_0x64 = 60.0f;
 }
 
-/* 80182560-801825E4 17CEA0 0084+00 1/1 0/0 0/0 .text            Draw__14dCamForcusLineFv */
 void dCamForcusLine::Draw() {
     if (field_0x49) {
         if (field_0x48 == 0) {
@@ -10235,13 +10058,11 @@ void dCamForcusLine::Draw() {
     }
 }
 
-/* 801825E4-801825FC 17CF24 0018+00 2/2 0/0 0/0 .text            Off__14dCamForcusLineFv */
 bool dCamForcusLine::Off() {
     field_0x49 = 0;
     return field_0x49 == 0;
 }
 
-/* 803BA6E4-803BA6F8 -00001 0014+00 2/0 0/0 0/0 .data            method */
 static leafdraw_method_class method = {
     (process_method_func)camera_create,
     (process_method_func)camera_delete,
@@ -10250,7 +10071,6 @@ static leafdraw_method_class method = {
     (process_method_func)camera_draw,
 };
 
-/* 803BA6F8-803BA73C -00001 0044+00 0/0 0/0 1/0 .data            g_profile_CAMERA */
 extern camera_process_profile_definition g_profile_CAMERA = {
     fpcLy_CURRENT_e,
     11,
@@ -10272,7 +10092,6 @@ extern camera_process_profile_definition g_profile_CAMERA = {
     0,
 };
 
-/* 803BA73C-803BA798 -00001 0044+18 0/0 0/0 1/0 .data            g_profile_CAMERA2 */
 extern camera_process_profile_definition g_profile_CAMERA2 = {
     fpcLy_CURRENT_e,
     11,
diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp
index 7bc1ab527a..5a76e1b4c0 100644
--- a/src/d/d_cc_d.cpp
+++ b/src/d/d_cc_d.cpp
@@ -1,21 +1,14 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_cc_d
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_searcher.h"
 
-/* 8008364C-80083660 07DF8C 0014+00 3/3 0/0 0/0 .text ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv */
 void dCcD_GAtTgCoCommonBase::ClrActorInfo() {
     mApid = -1;
     mAc = NULL;
 }
 
-/* 80083660-80083678 07DFA0 0018+00 1/1 0/0 0/0 .text            ct__22dCcD_GAtTgCoCommonBaseFv */
 void dCcD_GAtTgCoCommonBase::ct() {
     mGFlag = 0;
     mRPrm = 0;
@@ -23,13 +16,11 @@ void dCcD_GAtTgCoCommonBase::ct() {
     mEffCounter = 0;
 }
 
-/* 80083678-80083688 07DFB8 0010+00 0/0 2/2 0/0 .text SetHitApid__22dCcD_GAtTgCoCommonBaseFUi */
 void dCcD_GAtTgCoCommonBase::SetHitApid(fpc_ProcID hitApid) {
     mApid = hitApid;
     mAc = NULL;
 }
 
-/* 80083688-80083704 07DFC8 007C+00 6/6 17/17 43/43 .text GetAc__22dCcD_GAtTgCoCommonBaseFv */
 fopAc_ac_c* dCcD_GAtTgCoCommonBase::GetAc() {
     if (mApid == -1) {
         return NULL;
@@ -43,21 +34,15 @@ fopAc_ac_c* dCcD_GAtTgCoCommonBase::GetAc() {
     return mAc;
 }
 
-/* 80083704-80083718 07E044 0014+00 3/3 0/0 0/0 .text
- * Set__22dCcD_GAtTgCoCommonBaseFRC25dCcD_SrcGAtTgCoCommonBase  */
 void dCcD_GAtTgCoCommonBase::Set(dCcD_SrcGAtTgCoCommonBase const& src) {
     mGFlag = src.mGFlag;
     mEffCounter = 0;
 }
 
-/* 80083718-80083724 07E058 000C+00 0/0 1/1 0/0 .text
- * SetEffCounterTimer__22dCcD_GAtTgCoCommonBaseFv               */
 void dCcD_GAtTgCoCommonBase::SetEffCounterTimer() {
     mEffCounter = 5;
 }
 
-/* 80083724-80083748 07E064 0024+00 3/3 0/0 0/0 .text
- * SubtractEffCounter__22dCcD_GAtTgCoCommonBaseFv               */
 void dCcD_GAtTgCoCommonBase::SubtractEffCounter() {
     mEffCounter--;
     if (mEffCounter < 0) {
@@ -65,12 +50,10 @@ void dCcD_GAtTgCoCommonBase::SubtractEffCounter() {
     }
 }
 
-/* 80083748-80083760 07E088 0018+00 0/0 1/1 0/0 .text ChkEffCounter__22dCcD_GAtTgCoCommonBaseFv */
 bool dCcD_GAtTgCoCommonBase::ChkEffCounter() {
     return mEffCounter > 0;
 }
 
-/* 80083760-800837B0 07E0A0 0050+00 0/0 3/3 446/446 .text            __ct__10dCcD_GSttsFv */
 dCcD_GStts::dCcD_GStts() {
     mAt = 0;
     mTg = 0;
@@ -83,7 +66,6 @@ dCcD_GStts::dCcD_GStts() {
     field_0x1C = 0;
 }
 
-/* 800837F8-80083830 07E138 0038+00 1/1 0/0 0/0 .text            Ct__10dCcD_GSttsFv */
 void dCcD_GStts::Ct() {
     mAt = 0;
     mTg = 0;
@@ -96,7 +78,6 @@ void dCcD_GStts::Ct() {
     field_0x1C = 0;
 }
 
-/* 80083830-80083850 07E170 0020+00 0/0 3/3 160/160 .text            Move__10dCcD_GSttsFv */
 void dCcD_GStts::Move() {
     mAtOldApid = mAtApid;
     mAtApid = 0;
@@ -104,12 +85,10 @@ void dCcD_GStts::Move() {
     mTgApid = 0;
 }
 
-/* 80083850-80083860 07E190 0010+00 1/0 0/0 0/0 .text            GetGStts__9dCcD_SttsFv */
 cCcD_GStts* dCcD_Stts::GetGStts() {
     return this;
 }
 
-/* 80083860-800838F4 07E1A0 0094+00 0/0 3/3 416/416 .text Init__9dCcD_SttsFiiP10fopAc_ac_c */
 void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) {
     u32 actorPid;
     if (pActor != NULL) {
@@ -135,25 +114,21 @@ void dCcD_Stts::Init(int param_0, int param_1, fopAc_ac_c* pActor) {
     }
 }
 
-/* 800838F4-80083928 07E234 0034+00 1/0 0/0 0/0 .text            Ct__9dCcD_SttsFv */
 void dCcD_Stts::Ct() {
     cCcD_Stts::Ct();
     dCcD_GStts::Ct();
 }
 
-/* 80083928-80083934 07E268 000C+00 1/0 0/0 0/0 .text            ClrAt__9dCcD_SttsFv */
 void dCcD_Stts::ClrAt() {
     cCcD_Stts::ClrAt();
     dCcD_GStts::ClrAt();
 }
 
-/* 80083934-80083944 07E274 0010+00 1/0 0/0 0/0 .text            ClrTg__9dCcD_SttsFv */
 void dCcD_Stts::ClrTg() {
     cCcD_Stts::ClrTg();
     dCcD_GStts::ClrTg();
 }
 
-/* 80083944-800839A0 07E284 005C+00 1/1 0/0 0/0 .text Set__11dCcD_GObjAtFRC14dCcD_SrcGObjAt */
 void dCcD_GObjAt::Set(dCcD_SrcGObjAt const& src) {
     dCcD_GAtTgCoCommonBase::Set(src.mBase);
     mSe = src.mSe;
@@ -162,7 +137,6 @@ void dCcD_GObjAt::Set(dCcD_SrcGObjAt const& src) {
     mSpl = src.mSpl;
 }
 
-/* 800839A0-80083A28 07E2E0 0088+00 1/1 0/0 0/0 .text Set__11dCcD_GObjTgFRC14dCcD_SrcGObjTg */
 void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& src) {
     dCcD_GAtTgCoCommonBase::Set(src.mBase);
     mSe = src.mSe;
@@ -174,7 +148,6 @@ void dCcD_GObjTg::Set(dCcD_SrcGObjTg const& src) {
     mShieldRange = 0x4000;
 }
 
-/* 80083A28-80083B8C 07E368 0164+00 0/0 4/4 496/496 .text            __ct__12dCcD_GObjInfFv */
 dCcD_GObjInf::dCcD_GObjInf() {}
 
 dCcD_GObjInf::~dCcD_GObjInf() {}
@@ -183,7 +156,6 @@ cCcD_GObjInf* dCcD_GObjInf::GetGObjInf() {
     return this;
 }
 
-/* 8008426C-800842C0 07EBAC 0054+00 5/0 0/0 0/0 .text            ClrAtHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ClrAtHit() {
     cCcD_ObjHitInf::ClrAtHit();
     mGObjAt.ClrHit();
@@ -192,7 +164,6 @@ void dCcD_GObjInf::ClrAtHit() {
     SubtractAtEffCounter();
 }
 
-/* 800842C0-80084318 07EC00 0058+00 0/0 12/12 78/78 .text            ChkAtHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkAtHit() {
     if (cCcD_ObjHitInf::ChkAtHit() == 0) {
         return 0;
@@ -203,13 +174,11 @@ u32 dCcD_GObjInf::ChkAtHit() {
     }
 }
 
-/* 80084318-80084358 07EC58 0040+00 0/0 10/10 7/7 .text            ResetAtHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ResetAtHit() {
     ClrAtHit();
     ClrAtEffCounter();
 }
 
-/* 80084358-800843A8 07EC98 0050+00 1/1 0/0 31/31 .text            GetAtHitObj__12dCcD_GObjInfFv */
 cCcD_Obj* dCcD_GObjInf::GetAtHitObj() {
     if (ChkAtHitNoActor() == 0 && GetAtHitAc() == NULL) {
         return NULL;
@@ -218,7 +187,6 @@ cCcD_Obj* dCcD_GObjInf::GetAtHitObj() {
     }
 }
 
-/* 800843A8-800843DC 07ECE8 0034+00 0/0 2/2 3/3 .text            GetAtHitGObj__12dCcD_GObjInfFv */
 cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() {
     cCcD_Obj* obj = GetAtHitObj();
     if (obj == NULL) {
@@ -228,12 +196,10 @@ cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() {
     }
 }
 
-/* 800843DC-800843FC 07ED1C 0020+00 0/0 1/1 0/0 .text            ChkAtNoGuard__12dCcD_GObjInfFv */
 u8 dCcD_GObjInf::ChkAtNoGuard() {
     return GetAtSpl() >= 12;
 }
 
-/* 800843FC-80084460 07ED3C 0064+00 5/0 0/0 0/0 .text            ClrTgHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ClrTgHit() {
     cCcD_ObjHitInf::ClrTgHit();
     mGObjTg.ClrHit();
@@ -243,7 +209,6 @@ void dCcD_GObjInf::ClrTgHit() {
     SubtractTgEffCounter();
 }
 
-/* 80084460-800844B8 07EDA0 0058+00 0/0 6/6 305/305 .text            ChkTgHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkTgHit() {
     if (cCcD_ObjHitInf::ChkTgHit() == 0) {
         return false;
@@ -254,14 +219,11 @@ u32 dCcD_GObjInf::ChkTgHit() {
     }
 }
 
-/* 800844B8-800844F8 07EDF8 0040+00 0/0 1/1 5/5 .text            ResetTgHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ResetTgHit() {
     ClrTgHit();
     ClrTgEffCounter();
 }
 
-/* 800844F8-80084548 07EE38 0050+00 1/1 3/3 228/228 .text            GetTgHitObj__12dCcD_GObjInfFv
- */
 cCcD_Obj* dCcD_GObjInf::GetTgHitObj() {
     if (ChkTgHitNoActor() == 0 && GetTgHitAc() == NULL) {
         return NULL;
@@ -270,7 +232,6 @@ cCcD_Obj* dCcD_GObjInf::GetTgHitObj() {
     }
 }
 
-/* 80084548-8008457C 07EE88 0034+00 1/1 5/5 63/63 .text            GetTgHitGObj__12dCcD_GObjInfFv */
 dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() {
     cCcD_Obj* obj = GetTgHitObj();
     if (obj == NULL) {
@@ -280,8 +241,6 @@ dCcD_GObjInf* dCcD_GObjInf::GetTgHitGObj() {
     }
 }
 
-/* 8008457C-800845B0 07EEBC 0034+00 0/0 2/2 18/18 .text            GetTgHitObjSe__12dCcD_GObjInfFv
- */
 u8 dCcD_GObjInf::GetTgHitObjSe() {
     dCcD_GObjInf* objInf = GetTgHitGObj();
     if (objInf == NULL) {
@@ -291,7 +250,6 @@ u8 dCcD_GObjInf::GetTgHitObjSe() {
     }
 }
 
-/* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata          m_hitSeID__12dCcD_GObjInf */
 Z2SoundID const dCcD_GObjInf::m_hitSeID[24] = {
     Z2SE_HIT_DUMMY_CANCEL,    Z2SE_HIT_SWORD,          Z2SE_HIT_SHIELD_ATTACK,
     Z2SE_HIT_WOLFKICK,        Z2SE_HIT_WOLFBITE,       Z2SE_HIT_WOOD_WEAPON,
@@ -303,7 +261,6 @@ Z2SoundID const dCcD_GObjInf::m_hitSeID[24] = {
     Z2SE_HIT_STATUE_HAMMER,   Z2SE_HIT_PACHINKO,       Z2SE_HIT_AL_ARROW_STICK,
 };
 
-/* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text            getHitSeID__12dCcD_GObjInfFUci */
 Z2SoundID dCcD_GObjInf::getHitSeID(u8 seIdx, int useRebound) {
     if (useRebound) {
         if (seIdx == 23) {
@@ -319,7 +276,6 @@ Z2SoundID dCcD_GObjInf::getHitSeID(u8 seIdx, int useRebound) {
     return m_hitSeID[seIdx];
 }
 
-/* 8008460C-80084658 07EF4C 004C+00 5/0 0/0 0/0 .text            ClrCoHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ClrCoHit() {
     cCcD_ObjHitInf::ClrCoHit();
     mGObjCo.ClrHit();
@@ -327,7 +283,6 @@ void dCcD_GObjInf::ClrCoHit() {
     SubtractCoEffCounter();
 }
 
-/* 80084658-800846B0 07EF98 0058+00 0/0 5/5 74/74 .text            ChkCoHit__12dCcD_GObjInfFv */
 u32 dCcD_GObjInf::ChkCoHit() {
     if (cCcD_ObjHitInf::ChkCoHit() == 0) {
         return false;
@@ -338,13 +293,11 @@ u32 dCcD_GObjInf::ChkCoHit() {
     }
 }
 
-/* 800846B0-800846F0 07EFF0 0040+00 0/0 1/1 2/2 .text            ResetCoHit__12dCcD_GObjInfFv */
 void dCcD_GObjInf::ResetCoHit() {
     ClrCoHit();
     ClrCoEffCounter();
 }
 
-/* 800846F0-80084740 07F030 0050+00 0/0 0/0 36/36 .text            GetCoHitObj__12dCcD_GObjInfFv */
 cCcD_Obj* dCcD_GObjInf::GetCoHitObj() {
     if (ChkCoHitNoActor() == 0 && GetCoHitAc() == NULL) {
         return NULL;
@@ -353,7 +306,6 @@ cCcD_Obj* dCcD_GObjInf::GetCoHitObj() {
     }
 }
 
-/* 80084740-8008479C 07F080 005C+00 4/4 0/0 0/0 .text Set__12dCcD_GObjInfFRC15dCcD_SrcGObjInf */
 void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& src) {
     cCcD_Obj::Set(src.mObj);
     mGObjAt.Set(src.mGObjAt);
@@ -361,7 +313,6 @@ void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& src) {
     mGObjCo.Set(src.mGObjCo);
 }
 
-/* 8008479C-800847C8 07F0DC 002C+00 2/2 1/1 3/3 .text            dCcD_GetGObjInf__FP8cCcD_Obj */
 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* p_obj) {
     return (dCcD_GObjInf*)p_obj->GetGObjInf();
 }
@@ -370,59 +321,48 @@ cCcD_ShapeAttr* dCcD_Pnt::GetShapeAttr() {
     return this;
 }
 
-/* 800847D0-80084814 07F110 0044+00 0/0 1/1 20/20 .text            Set__8dCcD_CpsFRC11dCcD_SrcCps */
 void dCcD_Cps::Set(dCcD_SrcCps const& src) {
     dCcD_GObjInf::Set(src.mObjInf);
     cCcD_CpsAttr::Set(src.mCpsAttr);
 }
 
-/* 80084814-80084824 07F154 0010+00 1/0 0/0 0/0 .text            GetShapeAttr__8dCcD_CpsFv */
 cCcD_ShapeAttr* dCcD_Cps::GetShapeAttr() {
     return this;
 }
 
-/* 80084824-80084854 07F164 0030+00 0/0 0/0 6/6 .text            CalcAtVec__8dCcD_CpsFv */
 void dCcD_Cps::CalcAtVec() {
     cXyz* dest = GetAtVecP();
     CalcVec(dest);
 }
 
-/* 80084854-80084884 07F194 0030+00 0/0 0/0 2/2 .text            CalcTgVec__8dCcD_CpsFv */
 void dCcD_Cps::CalcTgVec() {
     cXyz* dest = GetTgVecP();
     CalcVec(dest);
 }
 
-/* 80084884-800848A4 07F1C4 0020+00 0/0 0/0 5/5 .text            Set__8dCcD_TriFRC11dCcD_SrcTri */
 void dCcD_Tri::Set(dCcD_SrcTri const& src) {
     dCcD_GObjInf::Set(src.mObjInf);
 }
 
-/* 800848A4-800848B4 07F1E4 0010+00 1/0 0/0 0/0 .text            GetShapeAttr__8dCcD_TriFv */
 cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() {
     return this;
 }
 
-/* 800848B4-800848F8 07F1F4 0044+00 0/0 2/2 245/245 .text            Set__8dCcD_CylFRC11dCcD_SrcCyl
- */
 void dCcD_Cyl::Set(dCcD_SrcCyl const& src) {
     dCcD_GObjInf::Set(src.mObjInf);
     cCcD_CylAttr::Set(src.mCyl);
 }
 
-/* 800848F8-80084908 07F238 0010+00 1/0 0/0 0/0 .text            GetShapeAttr__8dCcD_CylFv */
 cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() {
     return this;
 }
 
-/* 80084908-80084954 07F248 004C+00 0/0 3/3 3/3 .text            StartCAt__8dCcD_CylFR4cXyz */
 void dCcD_Cyl::StartCAt(cXyz& pos) {
     cXyz zero(cXyz::Zero);
     SetAtVec(zero);
     SetC(pos);
 }
 
-/* 80084954-800849C4 07F294 0070+00 0/0 3/3 4/4 .text            MoveCAt__8dCcD_CylFR4cXyz */
 void dCcD_Cyl::MoveCAt(cXyz& pos) {
     const cXyz* center = GetCP();
     cXyz diff = pos - *center;
@@ -430,7 +370,6 @@ void dCcD_Cyl::MoveCAt(cXyz& pos) {
     SetC(pos);
 }
 
-/* 800849C4-80084A34 07F304 0070+00 0/0 0/0 1/1 .text            MoveCTg__8dCcD_CylFR4cXyz */
 void dCcD_Cyl::MoveCTg(cXyz& pos) {
     const cXyz* center = GetCP();
     cXyz diff = pos - *center;
@@ -438,21 +377,17 @@ void dCcD_Cyl::MoveCTg(cXyz& pos) {
     SetC(pos);
 }
 
-/* 80084A34-80084A78 07F374 0044+00 0/0 2/2 196/196 .text            Set__8dCcD_SphFRC11dCcD_SrcSph
- */
 void dCcD_Sph::Set(dCcD_SrcSph const& src) {
     dCcD_GObjInf::Set(src.mObjInf);
     cCcD_SphAttr::Set(src.mSphAttr);
 }
 
-/* 80084A78-80084AC4 07F3B8 004C+00 0/0 3/3 25/25 .text            StartCAt__8dCcD_SphFR4cXyz */
 void dCcD_Sph::StartCAt(cXyz& pos) {
     cXyz zero(cXyz::Zero);
     SetAtVec(zero);
     cM3dGSph::SetC(pos);
 }
 
-/* 80084AC4-80084B34 07F404 0070+00 0/0 2/2 23/23 .text            MoveCAt__8dCcD_SphFR4cXyz */
 void dCcD_Sph::MoveCAt(cXyz& pos) {
     const cXyz* center = GetCP();
     cXyz diff = pos - *center;
diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp
index a9453fbb4a..3a8ecdc7b2 100644
--- a/src/d/d_cc_mass_s.cpp
+++ b/src/d/d_cc_mass_s.cpp
@@ -10,15 +10,12 @@
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor.h"
 
-/* 800852E0-800852F0 07FC20 0010+00 1/1 0/0 0/0 .text
- * Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v    */
 void dCcMassS_Obj::Set(cCcD_Obj* p_obj, u8 priority, dCcMassS_ObjCallback callback) {
     mpObj = p_obj;
     mPriority = priority;
     mpCallback = callback;
 }
 
-/* 800852F0-80085334 07FC30 0044+00 1/1 0/0 0/0 .text            Clear__12dCcMassS_ObjFv */
 void dCcMassS_Obj::Clear() {
     mpObj = NULL;
     mPriority = 5;
@@ -26,8 +23,6 @@ void dCcMassS_Obj::Clear() {
     mDivideInfo.Set(0, 0, 0);
 }
 
-/* 80085334-80085350 07FC74 001C+00 1/1 0/0 0/0 .text            ClearPointer__15dCcMassS_HitInfFv
- */
 void dCcMassS_HitInf::ClearPointer() {
     mpArea = NULL;
     mpAtObj = NULL;
@@ -35,15 +30,12 @@ void dCcMassS_HitInf::ClearPointer() {
     mCoHitLen = 0.0f;
 }
 
-/* 80085350-80085450 07FC90 0100+00 0/0 1/1 0/0 .text            __ct__12dCcMassS_MngFv */
 dCcMassS_Mng::dCcMassS_Mng() {
     Ct();
 }
 
-/* 800855C8-800855E4 07FF08 001C+00 1/1 0/0 0/0 .text            __ct__12dCcMassS_ObjFv */
 dCcMassS_Obj::dCcMassS_Obj() {}
 
-/* 800855E4-80085630 07FF24 004C+00 1/1 1/1 0/0 .text            Ct__12dCcMassS_MngFv */
 void dCcMassS_Mng::Ct() {
     field_0x202 = 0;
     mResultCam = 0;
@@ -58,7 +50,6 @@ void dCcMassS_Mng::Ct() {
     Clear();
 }
 
-/* 80085630-80085690 07FF70 0060+00 0/0 0/0 2/2 .text            SetAttr__12dCcMassS_MngFffUcUc */
 void dCcMassS_Mng::SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3) {
     mCylAttr.SetR(radius);
     mCylAttr.SetH(height);
@@ -66,7 +57,6 @@ void dCcMassS_Mng::SetAttr(f32 radius, f32 height, u8 param_2, u8 param_3) {
     field_0x201 = param_3;
 }
 
-/* 80085690-800858AC 07FFD0 021C+00 0/0 1/1 1/1 .text            Prepare__12dCcMassS_MngFv */
 void dCcMassS_Mng::Prepare() {
     cM3dGAab aab;
     aab.ClearForMinMax();
@@ -116,8 +106,6 @@ void dCcMassS_Mng::Prepare() {
     mCamBottomDist = G_CM3D_F_INF;
 }
 
-/* 800858AC-80085CF0 0801EC 0444+00 0/0 0/0 2/2 .text
- * Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf   */
 u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitInf) {
     cCcD_DivideInfo divideInfo;
     u32 flagsMaybe = 0;
@@ -225,7 +213,6 @@ u32 dCcMassS_Mng::Chk(cXyz* p_xyz, fopAc_ac_c** p_actor, dCcMassS_HitInf* p_hitI
     return flagsMaybe;
 }
 
-/* 80085CF0-80085D98 080630 00A8+00 1/1 2/2 0/0 .text            Clear__12dCcMassS_MngFv */
 void dCcMassS_Mng::Clear() {
     mMassObjCount = 0;
     mMassAreaCount = 0;
@@ -244,7 +231,6 @@ void dCcMassS_Mng::Clear() {
     field_0x201 = 4;
 }
 
-/* 80085D98-80085E6C 0806D8 00D4+00 0/0 4/4 7/7 .text            Set__12dCcMassS_MngFP8cCcD_ObjUc */
 void dCcMassS_Mng::Set(cCcD_Obj* p_obj, u8 priority) {
     if (mMassObjCount >= ARRAY_SIZE(mMassObjs)) {
         for (int i = 0; i < ARRAY_SIZE(mMassObjs); ++i) {
@@ -260,21 +246,16 @@ void dCcMassS_Mng::Set(cCcD_Obj* p_obj, u8 priority) {
     }
 }
 
-/* 80085E6C-80085EB0 0807AC 0044+00 0/0 1/1 0/0 .text            SetCam__12dCcMassS_MngFRC8cM3dGCps
- */
 void dCcMassS_Mng::SetCam(cM3dGCps const& cps) {
     mCpsAttr.SetCps(cps);
     field_0x202 |= 1;
     mResultCam = 0;
 }
 
-/* 80085EB0-80085EB8 0807F0 0008+00 0/0 1/1 0/0 .text            GetResultCam__12dCcMassS_MngCFv */
 u32 dCcMassS_Mng::GetResultCam() const {
     return mResultCam;
 }
 
-/* 80085EB8-80085ED4 0807F8 001C+00 0/0 1/1 0/0 .text            GetCamTopPos__12dCcMassS_MngFP3Vec
- */
 void dCcMassS_Mng::GetCamTopPos(Vec* p_out) {
     *p_out = mCamTopPos;
 }
diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp
index 12fd2697e9..989cb3776c 100644
--- a/src/d/d_cc_s.cpp
+++ b/src/d/d_cc_s.cpp
@@ -10,19 +10,15 @@
 #include "d/d_jnt_col.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80085ED4-80085F08 080814 0034+00 0/0 1/1 0/0 .text            Ct__4dCcSFv */
 void dCcS::Ct() {
     cCcS::Ct();
     mMass_Mng.Ct();
 }
 
-/* 80085F08-80085F28 080848 0020+00 0/0 1/1 0/0 .text            Dt__4dCcSFv */
 void dCcS::Dt() {
     cCcS::Dt();
 }
 
-/* 80085F28-800860F8 080868 01D0+00 1/1 0/0 0/0 .text
- * ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz      */
 bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2,
                                cXyz const* i_hitPos) {
     dCcD_GObjInf* atObj = (dCcD_GObjInf*)i_atObj->GetGObjInf();
@@ -89,8 +85,6 @@ bool dCcS::ChkShieldFrontRange(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, int param_2
     return true;
 }
 
-/* 800860F8-800861B0 080A38 00B8+00 1/1 0/0 0/0 .text
- * ChkShield__4dCcSFP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfPC4cXyz */
 bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObjInf,
                      dCcD_GObjInf* i_tgObjInf, cXyz const* i_hitPos) {
     if (i_atObjInf->ChkAtNoGuard()) {
@@ -110,8 +104,6 @@ bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObj
     return false;
 }
 
-/* 800861B0-800861B4 080AF0 0004+00 1/0 0/0 0/0 .text
- * CalcTgPlusDmg__4dCcSFP8cCcD_ObjP8cCcD_ObjP9cCcD_SttsP9cCcD_Stts */
 void dCcS::CalcTgPlusDmg(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, cCcD_Stts* i_atStts,
                          cCcD_Stts* i_tgStts) {}
 
@@ -194,7 +186,6 @@ void dCcS::SetCoGObjInf(bool i_co1Set, bool i_co2Set, cCcD_GObjInf* i_co1Obj, cC
     }
 }
 
-/* 80086360-80086404 080CA0 00A4+00 1/1 0/0 0/0 .text            GetRank__4dCcSFUc */
 int dCcS::GetRank(u8 weight) {
     if (weight == 255) {
         return 10;
@@ -239,12 +230,10 @@ int dCcS::GetRank(u8 weight) {
     return 0;
 }
 
-/* 80086404-8008640C 080D44 0008+00 1/0 0/0 0/0 .text ChkNoHitGCo__4dCcSFP8cCcD_ObjP8cCcD_Obj */
 bool dCcS::ChkNoHitGCo(cCcD_Obj* i_co1Obj, cCcD_Obj* i_co2Obj) {
     return false;
 }
 
-/* 803AC328-803AC3A4 009448 0079+03 1/1 0/0 0/0 .data            rank_tbl */
 static u8 rank_tbl[11][11] = {
     0x00, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x32, 0x64, 0x64, 0x64,
     0x64, 0x64, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x32, 0x4B, 0x5A, 0x64, 0x64, 0x64, 0x64, 0x64,
@@ -256,8 +245,6 @@ static u8 rank_tbl[11][11] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 8008640C-80086754 080D4C 0348+00 1/0 0/0 0/0 .text
- * SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf       */
 void dCcS::SetPosCorrect(cCcD_Obj* i_co1Obj, cXyz* i_pos1, cCcD_Obj* i_co2Obj, cXyz* i_pos2,
                          f32 i_cross_len) {
     if (i_co1Obj->ChkCoNoCrr() || i_co2Obj->ChkCoNoCrr()) {
@@ -347,8 +334,6 @@ void dCcS::SetPosCorrect(cCcD_Obj* i_co1Obj, cXyz* i_pos1, cCcD_Obj* i_co2Obj, c
     *i_pos2 += co2_move;
 }
 
-/* 80086754-8008685C 081094 0108+00 1/0 0/0 0/0 .text
- * CalcParticleAngle__4dCcSFP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP5csXyz */
 void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts,
                              csXyz* o_angle) {
     cXyz vec(*i_atObjInf->GetAtVecP());
@@ -526,8 +511,6 @@ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* i_atObj, cCcD_Ob
     }
 }
 
-/* 80086D8C-80086FBC 0816CC 0230+00 0/0 2/2 0/0 .text
- * ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c */
 bool dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* param_3,
                      fopAc_ac_c* param_4, fopAc_ac_c* param_5) {
     if (mObjCoCount == 0) {
@@ -565,8 +548,6 @@ bool dCcS::ChkCamera(cXyz& param_0, cXyz& param_1, f32 param_2, fopAc_ac_c* para
     return false;
 }
 
-/* 80086FBC-8008721C 0818FC 0260+00 0/0 1/1 0/0 .text
- * chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c */
 bool dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, fopAc_ac_c* param_2,
                           fopAc_ac_c* param_3) {
     if (mObjCoCount == 0) {
@@ -610,30 +591,24 @@ bool dCcS::chkCameraPoint(cXyz const& param_0, cCcD_ShapeAttr::Shape* param_1, f
     return false;
 }
 
-/* 800872A8-800872AC 081BE8 0004+00 1/0 0/0 0/0 .text            MoveAfterCheck__4dCcSFv */
 void dCcS::MoveAfterCheck() {}
 
-/* 800872AC-800872B0 081BEC 0004+00 1/1 0/0 0/0 .text            DrawAfter__4dCcSFv */
 void dCcS::DrawAfter() {}
 
-/* 800872B0-800872D0 081BF0 0020+00 0/0 1/1 0/0 .text            Move__4dCcSFv */
 void dCcS::Move() {
     cCcS::Move();
 }
 
-/* 800872D0-8008730C 081C10 003C+00 0/0 1/1 0/0 .text            Draw__4dCcSFv */
 void dCcS::Draw() {
     DrawAfter();
     DrawClear();
     mMass_Mng.Clear();
 }
 
-/* 8008730C-80087330 081C4C 0024+00 0/0 0/0 1/1 .text            MassClear__4dCcSFv */
 void dCcS::MassClear() {
     mMass_Mng.Clear();
 }
 
-/* 803AC3A4-803AC3E4 0094C4 0040+00 1/1 0/0 0/0 .data            m_mtrl_hit_tbl__4dCcS */
 // clang-format off
 bool dCcS::m_mtrl_hit_tbl[64] = {
     true,  true,  true,  true,  true,  true,  true,  true, 
@@ -647,13 +622,10 @@ bool dCcS::m_mtrl_hit_tbl[64] = {
 };
 // clang-format on
 
-/* 80087330-8008734C 081C70 001C+00 1/1 0/0 0/0 .text            ChkAtTgMtrlHit__4dCcSFUcUc */
 BOOL dCcS::ChkAtTgMtrlHit(u8 i_atMtrl, u8 i_tgMtrl) {
     return m_mtrl_hit_tbl[i_atMtrl + i_tgMtrl * 8];
 }
 
-/* 8008734C-800873B0 081C8C 0064+00 1/0 0/0 0/0 .text
- * ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts */
 bool dCcS::ChkNoHitGAtTg(cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_tgObjInf,
                          cCcD_GStts*, cCcD_GStts*) {
     dCcD_GObjInf* atObjInf = (dCcD_GObjInf*)i_atObjInf;
diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp
index 459893edd5..abf801f34e 100644
--- a/src/d/d_cc_uty.cpp
+++ b/src/d/d_cc_uty.cpp
@@ -14,7 +14,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 803AC418-803AC500 009538 00E8+00 1/1 0/0 0/0 .data            plCutLRC */
 static int plCutLRC[58] = {
     0,  //
     0,  // CUT_VERTICAL
@@ -76,7 +75,6 @@ static int plCutLRC[58] = {
     0,  //
 };
 
-/* 800873B0-800873D4 081CF0 0024+00 0/0 0/0 3/3 .text            pl_cut_LRC__Fi */
 int pl_cut_LRC(int index) {
     if (index >= 58) {
         return 0;
@@ -85,7 +83,6 @@ int pl_cut_LRC(int index) {
     return plCutLRC[index];
 }
 
-/* 800873D4-800874C4 081D14 00F0+00 1/1 0/0 14/14 .text            cc_pl_cut_bit_get__Fv */
 u16 cc_pl_cut_bit_get() {
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
 
@@ -122,7 +119,6 @@ u16 cc_pl_cut_bit_get() {
     return bit;
 }
 
-/* 800874C4-800874F0 081E04 002C+00 1/1 0/0 0/0 .text            getMapInfo__FSc */
 static int getMapInfo(s8 param_0) {
     int map_info = 30;
     if (param_0 == 1) {
@@ -134,14 +130,11 @@ static int getMapInfo(s8 param_0) {
     return map_info;
 }
 
-/* 800874F0-80087514 081E30 0024+00 2/2 0/0 0/0 .text            getHitId__FP8cCcD_Obji */
 static u32 getHitId(cCcD_Obj* i_ccObj, int i_useReboundSe) {
     dCcD_GObjInf* dObj = static_cast<dCcD_GObjInf*>(i_ccObj);
     return dObj->getHitSeID(dObj->GetAtSe(), i_useReboundSe);
 }
 
-/* 80087514-80087594 081E54 0080+00 0/0 0/0 47/47 .text
- * def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c          */
 void def_se_set(Z2Creature* i_sound, cCcD_Obj* i_ccObj, u32 i_mapInfo, fopAc_ac_c* i_actor) {
     if (i_sound != NULL) {
         int useReboundSe;
@@ -154,7 +147,6 @@ void def_se_set(Z2Creature* i_sound, cCcD_Obj* i_ccObj, u32 i_mapInfo, fopAc_ac_
     }
 }
 
-/* 80087594-80087A58 081ED4 04C4+00 1/1 0/0 0/0 .text            at_power_get__FP11dCcU_AtInfo */
 static u8 at_power_get(dCcU_AtInfo* i_AtInfo) {
     u8 power = i_AtInfo->mpCollider->GetAtAtp();
 
@@ -314,8 +306,6 @@ static u8 at_power_get(dCcU_AtInfo* i_AtInfo) {
     return power;
 }
 
-/* 80087A58-80087C04 082398 01AC+00 1/1 0/0 38/38 .text            at_power_check__FP11dCcU_AtInfo
- */
 fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) {
     if (i_AtInfo->mpCollider == NULL) {
         return NULL;
@@ -374,8 +364,6 @@ fopAc_ac_c* at_power_check(dCcU_AtInfo* i_AtInfo) {
     return i_AtInfo->mpActor;
 }
 
-/* 80087C04-80088134 082544 0530+00 0/0 0/0 84/84 .text cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo
- */
 fopAc_ac_c* cc_at_check(fopAc_ac_c* i_enemy, dCcU_AtInfo* i_AtInfo) {
     daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0);
     i_AtInfo->mpActor = at_power_check(i_AtInfo);
diff --git a/src/d/d_com_inf_actor.cpp b/src/d/d_com_inf_actor.cpp
index cbfca57a8b..f3d2a98e6a 100644
--- a/src/d/d_com_inf_actor.cpp
+++ b/src/d/d_com_inf_actor.cpp
@@ -8,14 +8,11 @@
 #include "d/d_com_inf_actor.h"
 #include "dolphin/types.h"
 
-/* ############################################################################################## */
-/* 80450610-80450618 000090 0008+00 0/0 1/1 0/0 .sdata           g_dComIfAc_gameInfo */
 dComIfAc_info_c g_dComIfAc_gameInfo = {
     0,      // field_0x0
     false,  // mPause
 };
 
-/* 80450618-80450620 000098 0004+04 0/0 2/2 7/7 .sdata           g_dComIfGoat_gameInfo */
 dComIfGoat_info_c g_dComIfGoat_gameInfo = {
     NULL, // field_0x0
 };
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index 87505ab40f..623da54fcf 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -103,15 +103,12 @@ void dComIfG_play_c::setStartStage(dStage_startStage_c* i_startStage) {
     mStartStage = *i_startStage;
 }
 
-/* 8002B3F4-8002B434 025D34 0040+00 1/1 0/0 0/0 .text            dComIfG_get_timelayer__FPi */
 void dComIfG_get_timelayer(int* o_layer) {
     if (dKy_daynight_check()) {
         *o_layer += 1;
     }
 }
 
-/* 8002B434-8002C950 025D74 151C+00 1/1 1/1 0/0 .text
- * getLayerNo_common_common__14dComIfG_play_cFPCcii             */
 int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_roomNo, int o_layer) {
     if (o_layer < 0) {
         o_layer = -1;
@@ -832,7 +829,6 @@ int dComIfG_play_c::getLayerNo_common_common(const char* i_stageName, int i_room
     return o_layer;
 }
 
-/* 8002C950-8002C97C 027290 002C+00 1/1 3/3 0/0 .text getLayerNo_common__14dComIfG_play_cFPCcii */
 int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int i_layerOverride) {
     int layer = getLayerNo_common_common(i_stageName, i_roomID, i_layerOverride);
 
@@ -843,8 +839,6 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int
     return layer;
 }
 
-/* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text            getLayerNo__14dComIfG_play_cFi
- */
 int dComIfG_play_c::getLayerNo(int) {
     int roomNo = dComIfGp_roomControl_getStayNo();
 
@@ -855,13 +849,10 @@ int dComIfG_play_c::getLayerNo(int) {
     return getLayerNo_common(dComIfGp_getStartStageName(), roomNo, dComIfGp_getStartStageLayer());
 }
 
-/* 8002C9D8-8002CA1C 027318 0044+00 0/0 1/1 0/0 .text            createParticle__14dComIfG_play_cFv
- */
 void dComIfG_play_c::createParticle() {
     mParticle = new dPa_control_c();
 }
 
-/* 8002CA1C-8002CA70 02735C 0054+00 0/0 1/1 0/0 .text createSimpleModel__14dComIfG_play_cFv */
 dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() {
     if (mSimpleModel == NULL) {
         mSimpleModel = new dSmplMdl_draw_c();
@@ -869,7 +860,6 @@ dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() {
     return mSimpleModel;
 }
 
-/* 8002CA70-8002CAC4 0273B0 0054+00 0/0 1/1 0/0 .text deleteSimpleModel__14dComIfG_play_cFv */
 void dComIfG_play_c::deleteSimpleModel() {
     if (mSimpleModel != NULL) {
         delete mSimpleModel;
@@ -877,16 +867,12 @@ void dComIfG_play_c::deleteSimpleModel() {
     }
 }
 
-/* 8002CAC4-8002CAF0 027404 002C+00 0/0 1/1 0/0 .text            drawSimpleModel__14dComIfG_play_cFv
- */
 void dComIfG_play_c::drawSimpleModel() {
     if (mSimpleModel != NULL) {
         mSimpleModel->draw();
     }
 }
 
-/* 8002CAF0-8002CB30 027430 0040+00 0/0 0/0 16/16 .text
- * addSimpleModel__14dComIfG_play_cFP12J3DModelDataiUc          */
 int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int i_roomNo, u8 i_drawBG) {
     if (mSimpleModel != NULL && mSimpleModel->addModel(i_modelData, i_roomNo, i_drawBG)) {
         return 1;
@@ -895,8 +881,6 @@ int dComIfG_play_c::addSimpleModel(J3DModelData* i_modelData, int i_roomNo, u8 i
     return -1;
 }
 
-/* 8002CB30-8002CB68 027470 0038+00 0/0 0/0 16/16 .text
- * removeSimpleModel__14dComIfG_play_cFP12J3DModelDatai         */
 int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int i_roomNo) {
     if (mSimpleModel != NULL) {
         mSimpleModel->removeModel(i_modelData, i_roomNo);
@@ -906,8 +890,6 @@ int dComIfG_play_c::removeSimpleModel(J3DModelData* i_modelData, int i_roomNo) {
     return 0;
 }
 
-/* 8002CB68-8002CB94 0274A8 002C+00 0/0 0/0 16/16 .text
- * entrySimpleModel__14dComIfG_play_cFP8J3DModeli               */
 void dComIfG_play_c::entrySimpleModel(J3DModel* i_model, int i_roomNo) {
     if (mSimpleModel != NULL) {
         mSimpleModel->entry(i_model, i_roomNo);
@@ -946,13 +928,10 @@ u8 dComIfG_play_c::getTimerType() {
     return mTimerInfo.mTimerType;
 }
 
-/* 8002CBD4-8002CBDC -00001 0008+00 0/0 0/0 0/0 .text setTimerPtr__14dComIfG_play_cFP8dTimer_c */
 void dComIfG_play_c::setTimerPtr(dTimer_c* i_ptr) {
     mTimerInfo.mTimerPtr = i_ptr;
 }
 
-/* 8002CBDC-8002CBE4 02751C 0008+00 6/6 7/7 15/15 .text            getTimerPtr__14dComIfG_play_cFv
- */
 dTimer_c* dComIfG_play_c::getTimerPtr() {
     return mTimerInfo.mTimerPtr;
 }
@@ -971,14 +950,10 @@ void dComIfG_inf_c::ct() {
     field_0x1de0a = 0xFF;
 }
 
-/* 80450600-80450604 000080 0004+00 0/0 18/18 2/2 .sdata           g_clearColor */
 GXColor g_clearColor = {0, 0, 0, 0};
 
-/* 80450604-80450608 000084 0004+00 1/1 10/10 15/15 .sdata           g_blackColor */
 GXColor g_blackColor = {0, 0, 0, 255};
 
-/* 8002CC54-8002CD44 027594 00F0+00 1/1 1/1 0/0 .text dComIfG_changeOpeningScene__FP11scene_classs
- */
 int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
     dComIfGp_offEnableNextStage();
     dComIfGp_setNextStage("F_SP102", 100, 0, 10);
@@ -996,7 +971,6 @@ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) {
     return 1;
 }
 
-/* 8002CD44-8002CDB8 027684 0074+00 0/0 2/2 0/0 .text dComIfG_resetToOpening__FP11scene_class */
 BOOL dComIfG_resetToOpening(scene_class* i_scene) {
     if (mDoRst::isReturnToMenu() || !mDoRst::isReset() ||
         mDoGph_gInf_c::getFader()->getStatus() == 2)
@@ -1019,7 +993,6 @@ static int phase_1(char* i_arcName) {
     return cPhs_NEXT_e;
 }
 
-/* 8002CE38-8002CEB4 027778 007C+00 1/0 0/0 0/0 .text            phase_2__FPc */
 static int phase_2(char* i_arcName) {
     int syncStatus = dComIfG_syncObjectRes(i_arcName);
 
@@ -1035,13 +1008,10 @@ static int phase_2(char* i_arcName) {
     }
 }
 
-/* 8002CEB4-8002CEBC 0277F4 0008+00 1/0 0/0 0/0 .text            phase_3__FPc */
 static int phase_3(char*) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8002CEBC-8002CEFC 0277FC 0040+00 0/0 7/7 550/550 .text
- * dComIfG_resLoad__FP30request_of_phase_process_classPCc       */
 /**
  * Attempts to load a Resource Archive (*.arc) into the Resource Control.
  * The archive must be successfully loaded into the Resource Control before
@@ -1061,7 +1031,6 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_arcNa
     return dComLbG_PhaseHandler(i_phase, l_method, (void*)i_arcName);
 }
 
-/* 8002CEFC-8002CF5C 02783C 0060+00 1/0 0/0 0/0 .text            phase_01__FP12phaseParam_c */
 static int phase_01(phaseParam_c* i_phasePrm) {
     if (dComIfG_setObjectRes(i_phasePrm->mResName, (u8)0, i_phasePrm->mpHeap) == 0) {
         return cPhs_ERROR_e;
@@ -1070,7 +1039,6 @@ static int phase_01(phaseParam_c* i_phasePrm) {
     return cPhs_NEXT_e;
 }
 
-/* 8002CF5C-8002CFB8 02789C 005C+00 1/0 0/0 0/0 .text            phase_02__FP12phaseParam_c */
 static int phase_02(phaseParam_c* i_phasePrm) {
     int syncStatus = dComIfG_syncObjectRes(i_phasePrm->mResName);
     if (syncStatus < 0) {
@@ -1084,13 +1052,10 @@ static int phase_02(phaseParam_c* i_phasePrm) {
     }
 }
 
-/* 8002CFB8-8002CFC0 0278F8 0008+00 1/0 0/0 0/0 .text            phase_03__FP12phaseParam_c */
 static int phase_03(phaseParam_c*) {
     return cPhs_INIT_e;
 }
 
-/* 8002CFC0-8002D008 027900 0048+00 1/1 3/3 0/0 .text
- * dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap */
 /**
  * Attempts to load a Resource Archive (*.arc) into the Resource Control using a specified heap.
  * The archive must be successfully loaded into the Resource Control before
@@ -1113,8 +1078,6 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* i_resNa
     return dComLbG_PhaseHandler(i_phase, l_method, &param);
 }
 
-/* 8002D008-8002D06C 027948 0064+00 1/1 10/10 540/540 .text
- * dComIfG_resDelete__FP30request_of_phase_process_classPCc     */
 /**
  * Attempts to unload a Resource Archive (*.arc) from the Resource Control.
  * This should be called from a process' delete method to prevent a memory leak.
@@ -1136,8 +1099,6 @@ s8 dComIfGp_getReverb(int i_roomNo) {
     return dStage_roomRead_dt_c_GetReverbStage(*dComIfGp_getStageRoom(), i_roomNo);
 }
 
-/* 8002D0B4-8002D1AC 0279F4 00F8+00 0/0 3/3 34/34 .text
- * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */
 int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3,
                              s16 i_angle, f32 param_5, GXTexObj* i_tex) {
     if (param_3.ChkSetInfo() && -G_CM3D_F_INF != param_1) {
@@ -1151,7 +1112,6 @@ int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInf
     }
 }
 
-/* 8002D1AC-8002D25C 027AEC 00B0+00 0/0 0/0 1/1 .text            dComIfGp_getMapTrans__FiPfPfPs */
 bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_angle) {
     dStage_Multi_c* multi = dComIfGp_getMulti();
     if (multi == NULL) {
@@ -1172,7 +1132,6 @@ bool dComIfGp_getMapTrans(int i_roomNo, f32* o_transX, f32* o_transY, s16* o_ang
     return false;
 }
 
-/* 8002D25C-8002D2AC 027B9C 0050+00 0/0 3/3 3/3 .text            dComIfGp_getRoomCamera__Fi */
 stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) {
     dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
 
@@ -1183,7 +1142,6 @@ stage_camera_class* dComIfGp_getRoomCamera(int i_roomNo) {
     return room_dt->getCamera();
 }
 
-/* 8002D2AC-8002D2FC 027BEC 0050+00 0/0 3/3 3/3 .text            dComIfGp_getRoomArrow__Fi */
 stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) {
     dStage_roomDt_c* room_dt = dComIfGp_roomControl_getStatusRoomDt(i_roomNo);
 
@@ -1194,7 +1152,6 @@ stage_arrow_class* dComIfGp_getRoomArrow(int i_roomNo) {
     return room_dt->getArrow();
 }
 
-/* 8002D2FC-8002D554 027C3C 0258+00 2/2 7/7 4/4 .text dComIfGp_setNextStage__FPCcsScScfUliScsii */
 void dComIfGp_setNextStage(char const* i_stage, s16 i_point, s8 i_roomNo, s8 i_layer,
                            f32 i_lastSpeed, u32 i_lastMode, int i_setPoint, s8 i_wipe,
                            s16 i_lastAngle, int param_9, int i_wipeSpeedT) {
@@ -1340,7 +1297,6 @@ s8 dComIfGs_sense_type_change_Get() {
     return g_dComIfG_gameInfo.field_0x1ddfa;
 }
 
-/* 8002D94C-8002D9B0 02828C 0064+00 0/0 1/1 17/17 .text            dComIfGs_onZoneSwitch__Fii */
 void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1356,7 +1312,6 @@ void dComIfGs_onZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_onSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002D9CC-8002DA30 02830C 0064+00 0/0 1/1 1/1 .text            dComIfGs_offZoneSwitch__Fii */
 void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1372,7 +1327,6 @@ void dComIfGs_offZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_offSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DA30-8002DA9C 028370 006C+00 0/0 1/1 10/10 .text            dComIfGs_isZoneSwitch__Fii */
 BOOL dComIfGs_isZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1388,7 +1342,6 @@ BOOL dComIfGs_isZoneSwitch(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DA9C-8002DB00 0283DC 0064+00 0/0 1/1 51/51 .text            dComIfGs_onOneZoneSwitch__Fii */
 void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1404,7 +1357,6 @@ void dComIfGs_onOneZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_onSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DB00-8002DB64 028440 0064+00 0/0 1/1 17/17 .text            dComIfGs_offOneZoneSwitch__Fii */
 void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1420,7 +1372,6 @@ void dComIfGs_offOneZoneSwitch(int i_swBit, int i_roomNo) {
     dComIfGs_offSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DB64-8002DBD0 0284A4 006C+00 0/0 5/5 13/13 .text            dComIfGs_isOneZoneSwitch__Fii */
 BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1436,7 +1387,6 @@ BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvOneZoneSwitch(zone_no, i_swBit);
 }
 
-/* 8002DBD0-8002DC3C 028510 006C+00 0/0 1/1 0/0 .text            dComIfGs_isZoneItem__Fii */
 BOOL dComIfGs_isZoneItem(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1452,7 +1402,6 @@ BOOL dComIfGs_isZoneItem(int i_swBit, int i_roomNo) {
     return dComIfGs_isSvZoneItem(zone_no, i_swBit);
 }
 
-/* 8002DC3C-8002DCA8 02857C 006C+00 0/0 1/1 0/0 .text            dComIfGs_isOneZoneItem__Fii */
 BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo) {
     int room_no;
     if (i_roomNo >= 0) {
@@ -1489,7 +1438,6 @@ void dComIfGs_setMixItemIndex(int i_no, u8 i_slotNo) {
     g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setMixItemIndex(i_no, i_slotNo);
 }
 
-/* 8002DD3C-8002DDC8 02867C 008C+00 3/3 1/1 0/0 .text dComIfGs_getSelectMixItemNoArrowIndex__Fi */
 u8 dComIfGs_getSelectMixItemNoArrowIndex(int i_selmixItemIdx) {
     u8 sel_item_slotNo = dComIfGs_getSelectItemIndex(i_selmixItemIdx);
     u8 mix_item_slotNo = dComIfGs_getMixItemIndex(i_selmixItemIdx);
@@ -1509,7 +1457,6 @@ u8 dComIfGs_getMixItemIndex(int i_no) {
     return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getMixItemIndex(i_no);
 }
 
-/* 8002DDF4-8002DF1C 028734 0128+00 1/1 13/13 0/0 .text            dComIfGp_setSelectItem__Fi */
 void dComIfGp_setSelectItem(int i_selItemIdx) {
     if (i_selItemIdx == SELECT_ITEM_DOWN) {
         if (dComIfGs_getSelectItemIndex(i_selItemIdx) != 0xFF) {
@@ -1534,7 +1481,6 @@ void dComIfGp_setSelectItem(int i_selItemIdx) {
     }
 }
 
-/* 8002DF1C-8002E048 02885C 012C+00 4/4 19/19 0/0 .text            dComIfGp_getSelectItem__Fi */
 u8 dComIfGp_getSelectItem(int i_selItemIdx) {
     u8 playItem = g_dComIfG_gameInfo.play.getSelectItem(i_selItemIdx);
 
@@ -1592,7 +1538,6 @@ bool dComIfGp_checkMapShow() {
     return !dComIfGs_isEventBit(dSv_event_flag_c::MAP_VISIBLE);
 }
 
-/* 8002E0E0-8002E188 028A20 00A8+00 0/0 9/9 0/0 .text            dComIfGp_setHeapLockFlag__FUc */
 s32 dComIfGp_setHeapLockFlag(u8 flag) {
     if (flag == 7 || flag == 8) {
         if (!dComIfGp_isHeapLockFlag()) {
@@ -1740,7 +1685,6 @@ u8 dComIfGs_getBottleMax() {
     return 10;
 }
 
-/* 8002E5C0-8002E688 028F00 00C8+00 0/0 11/11 0/0 .text            dComIfGp_getSelectItemNum__Fi */
 s16 dComIfGp_getSelectItemNum(int i_selItemIdx) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
     s16 itemNum = 0;
@@ -1759,7 +1703,6 @@ s16 dComIfGp_getSelectItemNum(int i_selItemIdx) {
     return itemNum;
 }
 
-/* 8002E688-8002E714 028FC8 008C+00 0/0 5/5 0/0 .text            dComIfGp_getSelectItemMaxNum__Fi */
 int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
     int itemNum = 0;
@@ -1779,7 +1722,6 @@ int dComIfGp_getSelectItemMaxNum(int i_selItemIdx) {
     return itemNum;
 }
 
-/* 8002E714-8002E83C 029054 0128+00 0/0 2/2 0/0 .text            dComIfGp_setSelectItemNum__Fis */
 void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
 
@@ -1804,7 +1746,6 @@ void dComIfGp_setSelectItemNum(int i_selItemIdx, s16 i_num) {
     }
 }
 
-/* 8002E83C-8002E910 02917C 00D4+00 0/0 5/5 0/0 .text            dComIfGp_addSelectItemNum__Fis */
 void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
     u8 selectItem = dComIfGp_getSelectItem(i_selItemIdx);
 
@@ -1820,8 +1761,6 @@ void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) {
     }
 }
 
-/* 8002E910-8002E974 029250 0064+00 0/0 5/5 137/137 .text
- * dComIfGd_setShadow__FUlScP8J3DModelP4cXyzffffR13cBgS_PolyInfoP12dKy_tevstr_csfP9_GXTexObj */
 int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4,
                        f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8,
                        dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) {
@@ -1833,7 +1772,6 @@ int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3
     }
 }
 
-/* 8002E974-8002E9D4 0292B4 0060+00 0/0 1/1 0/0 .text            dComIfGs_gameStart__Fv */
 void dComIfGs_gameStart() {
     dComIfGp_offEnableNextStage();
 
@@ -2013,9 +1951,8 @@ struct field_data {
     /* 0x0A */ u8 field_0xa[0x14 - 0xA];
 };
 
-/* 8002E9F0-8002EC54 029330 0264+00 0/0 1/1 0/0 .text            dComIfGp_calcNowRegion__Fv */
 void dComIfGp_calcNowRegion() {
-    u8 buffer[0x800] ALIGN_DECL(32);
+    u8 buffer[0x800] ATTRIBUTE_ALIGN(32);
 
     dComIfGp_getFieldMapArchive2()->readResource(buffer, 0x800, "dat/field.dat");
     u8* entry_num_p = &buffer[((field_data_header*)buffer)->field_0x4];
@@ -2070,9 +2007,8 @@ void dComIfGp_calcNowRegion() {
     dComIfGp_getFieldMapArchive2()->removeResourceAll();
 }
 
-/* 8002EC54-8002EDE0 029594 018C+00 1/1 0/0 0/0 .text            dComIfG_getNowCalcRegion__Fv */
 u8 dComIfG_getNowCalcRegion() {
-    u8 buffer[0x800] ALIGN_DECL(32);
+    u8 buffer[0x800] ATTRIBUTE_ALIGN(32);
 
     dComIfGp_getFieldMapArchive2()->readResource(buffer, 0x800, "dat/field.dat");
     u8* entry_num_p = &buffer[((field_data_header*)buffer)->field_0x4];
@@ -2131,7 +2067,6 @@ bool dComIfGp_isLightDropMapVisible() {
     return false;
 }
 
-/* 8002EE60-8002EEB0 0297A0 0050+00 1/1 11/11 0/0 .text            dComIfGp_getNowLevel__Fv */
 u8 dComIfGp_getNowLevel() {
     int roomNo = -1;
     if (daPy_getLinkPlayerActorClass() != NULL) {
@@ -2150,8 +2085,6 @@ void dComIfGs_setSelectEquipClothes(u8 i_itemNo) {
                                                                           i_itemNo);
 }
 
-/* 8002EEC0-8002EF94 029800 00D4+00 0/0 4/4 1/1 .text            dComIfGs_setSelectEquipSword__FUc
- */
 void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_SWORD:
@@ -2171,8 +2104,6 @@ void dComIfGs_setSelectEquipSword(u8 i_itemNo) {
     g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().setSelectEquip(COLLECT_SWORD, i_itemNo);
 }
 
-/* 8002EF94-8002F040 0298D4 00AC+00 0/0 2/2 0/0 .text            dComIfGs_setSelectEquipShield__FUc
- */
 void dComIfGs_setSelectEquipShield(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_WOOD_SHIELD:
@@ -2201,8 +2132,6 @@ void dComIfGs_setKeyNum(int i_stageNo, u8 i_keyNum) {
     g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().setKeyNum(i_keyNum);
 }
 
-/* 8002F0E0-8002F128 029A20 0048+00 1/1 0/0 0/0 .text dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc
- */
 static void dComIfGs_setWarpItemData(int, char const* i_stage, cXyz i_pos, s16 i_angle, s8 i_roomNo,
                                      u8 param_5, u8 param_6) {
     g_dComIfG_gameInfo.play.setWarpItemData(i_stage, i_pos, i_angle, i_roomNo, param_5, param_6);
@@ -2234,7 +2163,6 @@ const char* dComIfGs_getWarpStageName() {
     return dComIfGs_getLastWarpMarkStageName();
 }
 
-/* 8002F2BC-8002F2CC 029BFC 0010+00 0/0 1/1 0/0 .text            dComIfGs_getWarpPlayerPos__Fv */
 cXyz& dComIfGs_getWarpPlayerPos() {
     return dComIfGs_getLastWarpMarkPlayerPos();
 }
@@ -2253,14 +2181,12 @@ bool dComIfGs_getWarpMarkFlag() {
 
 void dComIfGs_setWarpMarkFlag(u8) {}
 
-/* 8002F314-8002F328 029C54 0014+00 0/0 0/0 1/1 .text            __ct__19dComIfG_resLoader_cFv */
 dComIfG_resLoader_c::dComIfG_resLoader_c() {
     mResNameTable = NULL;
     mPhase.id = cPhs_INIT_e;
     mLoadIndex = 0;
 }
 
-/* 8002F328-8002F3B4 029C68 008C+00 0/0 0/0 1/1 .text            __dt__19dComIfG_resLoader_cFv */
 dComIfG_resLoader_c::~dComIfG_resLoader_c() {
     if (mResNameTable != NULL) {
         for (int i = mLoadIndex; i >= 0; i--) {
@@ -2270,7 +2196,6 @@ dComIfG_resLoader_c::~dComIfG_resLoader_c() {
     }
 }
 
-/* 8002F3B4-8002F434 029CF4 0080+00 0/0 0/0 1/1 .text load__19dComIfG_resLoader_cFPPCcP7JKRHeap */
 int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
     mResNameTable = i_resNameTbl;
 
@@ -2286,12 +2211,10 @@ int dComIfG_resLoader_c::load(char const** i_resNameTbl, JKRHeap* i_heap) {
     return phase_state;
 }
 
-/* 8002F434-8002F478 029D74 0044+00 0/0 12/12 12/12 .text            dComIfG_getStageRes__FPCc */
 void* dComIfG_getStageRes(char const* i_resName) {
     return dComIfG_getStageRes("Stg_00", i_resName);
 }
 
-/* 8002F478-8002F4BC 029DB8 0044+00 0/0 1/1 0/0 .text            dComIfG_getOldStageRes__FPCc */
 void* dComIfG_getOldStageRes(char const* i_resName) {
     return dComIfG_getStageRes("Xtg_00", i_resName);
 }
@@ -2302,7 +2225,6 @@ char* dComIfG_getRoomArcName(int i_roomNo) {
     return buf;
 }
 
-/* 8002F500-8002F504 029E40 0004+00 0/0 1/1 0/0 .text            dComIfGp_ret_wp_set__FSc */
 void dComIfGp_ret_wp_set(s8) {}
 
 void dComIfGp_world_dark_set(u8 param_0) {
@@ -2373,7 +2295,6 @@ int dComIfG_TimerEnd(int i_mode, int param_1) {
     return 0;
 }
 
-/* 8002F72C-8002F79C 02A06C 0070+00 0/0 0/0 2/2 .text            dComIfG_TimerDeleteCheck__Fi */
 int dComIfG_TimerDeleteCheck(int i_mode) {
     if (i_mode == dComIfG_getTimerMode()) {
         dTimer_c* timer = dComIfG_getTimerPtr();
@@ -2401,7 +2322,6 @@ int dComIfG_TimerDeleteRequest(int i_mode) {
     return 0;
 }
 
-/* 8002F810-8002F9F0 02A150 01E0+00 0/0 1/1 0/0 .text            dComIfGs_Wolf_Change_Check__Fv */
 BOOL dComIfGs_Wolf_Change_Check() {
     BOOL is_wolf = false;
 
@@ -2455,8 +2375,6 @@ int dComIfGs_shake_kandelaar_check() {
     return check;
 }
 
-/* 8002FA54-8002FA84 02A394 0030+00 0/0 4/4 96/96 .text            dComIfGs_wolfeye_effect_check__Fv
- */
 BOOL dComIfGs_wolfeye_effect_check() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     BOOL ret = false;
@@ -2497,8 +2415,6 @@ BOOL dComIfGp_TransportWarp_check() {
     return check;
 }
 
-/* 8002FB20-8002FB80 02A460 0060+00 2/2 6/6 0/0 .text
- * dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */
 int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler,
                          void* i_data) {
     int phase = cPhs_Handler(i_phaseReq, i_handler, i_data);
@@ -2514,7 +2430,6 @@ int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handl
     return phase;
 }
 
-/* 8002FB80-8002FC3C 02A4C0 00BC+00 0/0 1/1 1/1 .text            dComIfGs_onVisitedRoom__Fi */
 void dComIfGs_onVisitedRoom(int i_roomNo) {
     dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(i_roomNo);
 
@@ -2530,32 +2445,26 @@ void dComIfGs_onVisitedRoom(int i_roomNo) {
     }
 }
 
-/* 8002FC3C-8002FC98 02A57C 005C+00 0/0 0/0 1/1 .text            dComIfGs_offVisitedRoom__Fi */
 void dComIfGs_offVisitedRoom(int i_roomNo) {
     dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
 
     dComIfGs_offSaveVisitedRoom(list->field_0x13, i_roomNo);
 }
 
-/* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text            dComIfGs_isVisitedRoom__Fi */
 BOOL dComIfGs_isVisitedRoom(int param_0) {
     dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
 
     return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0);
 }
 
-/* 8002FCF4-8002FD08 02A634 0014+00 0/0 1/1 0/0 .text            dComIfGs_staffroll_next_go__Fv */
 void dComIfGs_staffroll_next_go() {
     g_env_light.staffroll_next_timer = true;
 }
 
-/* 8002FD08-8002FD18 02A648 0010+00 0/0 1/1 0/0 .text dComIfGs_staffroll_next_go_check__Fv */
 u8 dComIfGs_staffroll_next_go_check() {
     return g_env_light.staffroll_next_timer;
 }
 
-/* 80450608-8045060C 000088 0004+00 0/0 6/6 11/11 .sdata           g_whiteColor */
 GXColor g_whiteColor = {255, 255, 255, 255};
 
-/* 8045060C-80450610 00008C 0004+00 0/0 3/3 3/3 .sdata           g_saftyWhiteColor */
 GXColor g_saftyWhiteColor = {160, 160, 160, 255};
diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp
index 3f63771a17..540ea510db 100644
--- a/src/d/d_com_static.cpp
+++ b/src/d/d_com_static.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_com_static
-//
-
 #include "d/d_com_static.h"
 #include "d/d_demo.h"
 #include "d/actor/d_a_arrow.h"
@@ -19,8 +14,6 @@
 #include "d/actor/d_a_tag_stream.h"
 #include "stdio.h"
 
-/* 80030F14-80030FBC 02B854 00A8+00 1/1 0/0 0/0 .text
- * set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc                */
 void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3,
                           u8 param_4, u8 i_type) {
     mRoomNo = i_roomNo;
@@ -32,13 +25,11 @@ void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2,
     mType = i_type;
 }
 
-/* 80030FBC-80030FCC 02B8FC 0010+00 3/3 0/0 0/0 .text            reset__Q27daSus_c6data_cFv */
 daSus_c::data_c* daSus_c::data_c::reset() {
     mRoomNo = -1;
     return mpNext;
 }
 
-/* 80030FCC-80031038 02B90C 006C+00 2/2 0/0 0/0 .text            isSwitch__Q27daSus_c6data_cFv */
 u8 daSus_c::data_c::isSwitch() {
     if (field_0x1 & 1) {
         return dComIfGs_isSwitch(field_0x2, mRoomNo);
@@ -47,7 +38,6 @@ u8 daSus_c::data_c::isSwitch() {
     }
 }
 
-/* 80031038-800310C8 02B978 0090+00 2/2 0/0 0/0 .text            check__Q27daSus_c6data_cFRC4cXyz */
 bool daSus_c::data_c::check(cXyz const& i_pos) {
     if (field_0x3 != 0) {
         return false;
@@ -63,7 +53,6 @@ bool daSus_c::data_c::check(cXyz const& i_pos) {
     return false;
 }
 
-/* 800310C8-80031150 02BA08 0088+00 1/1 0/0 0/0 .text check__Q27daSus_c6data_cFP10fopAc_ac_c */
 u8 daSus_c::data_c::check(fopAc_ac_c* i_actor) {
     if (field_0x3) {
         return 0x80;
@@ -83,7 +72,6 @@ u8 daSus_c::data_c::check(fopAc_ac_c* i_actor) {
     return tmp;
 }
 
-/* 80031150-80031190 02BA90 0040+00 1/1 0/0 0/0 .text            execute__Q27daSus_c6data_cFv */
 void daSus_c::data_c::execute() {
     u8 sw = isSwitch();
     if (sw != field_0x3) {
@@ -91,7 +79,6 @@ void daSus_c::data_c::execute() {
     }
 }
 
-/* 80031190-800311FC 02BAD0 006C+00 1/1 0/0 0/0 .text add__Q27daSus_c6room_cFPQ27daSus_c6data_c */
 void daSus_c::room_c::add(daSus_c::data_c* i_data) {
     if (mpData == NULL) {
         mpData = i_data;
@@ -118,27 +105,22 @@ void daSus_c::room_c::add(daSus_c::data_c* i_data) {
     data1->setNext(i_data);
 }
 
-/* 800311FC-80031248 02BB3C 004C+00 0/0 0/0 1/1 .text            reset__Q27daSus_c6room_cFv */
 void daSus_c::room_c::reset() {
     while (mpData != NULL && mpData->getType() == 0) {
         mpData = mpData->reset();
     }
 }
 
-/* 80423FFC-8042447C 050D1C 0480+00 6/7 0/0 0/0 .bss             mData__7daSus_c */
 daSus_c::data_c daSus_c::mData[0x20];
 
-/* 8042447C-8042457C 05119C 0100+00 2/3 0/0 1/1 .bss             mRoom__7daSus_c */
 daSus_c::room_c daSus_c::mRoom[0x40];
 
-/* 80450D88-80450D8C -00001 0004+00 1/1 0/0 2/2 .sbss            None */
 /* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */
 s16 daArrow_c::m_count;
 
 /* 80450D8A 0002+00 data_80450D8A mSetTop__7daSus_c */
 s16 daSus_c::mSetTop;
 
-/* 80031248-800313BC 02BB88 0174+00 0/0 0/0 1/1 .text newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc */
 int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4,
                      u8 i_type) {
     s16 setTop = mSetTop;
@@ -166,7 +148,6 @@ int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 p
     return 0;
 }
 
-/* 800313BC-80031434 02BCFC 0078+00 0/0 1/1 0/0 .text            reset__7daSus_cFv */
 void daSus_c::reset() {
     daSus_c::data_c* pData = (daSus_c::data_c*)mData;
     for (int i = 0; i < 0x20; i++, pData++) {
@@ -179,7 +160,6 @@ void daSus_c::reset() {
     }
 }
 
-/* 80031434-800314D4 02BD74 00A0+00 0/0 4/4 0/0 .text            check__7daSus_cFScRC4cXyz */
 bool daSus_c::check(s8 i_roomNo, cXyz const& i_pos) {
     daSus_c::data_c* pData = (daSus_c::data_c*)mData;
     for (s16 i = 0; i < 0x20; pData++, i++) {
@@ -192,7 +172,6 @@ bool daSus_c::check(s8 i_roomNo, cXyz const& i_pos) {
     return false;
 }
 
-/* 800314D4-800315A4 02BE14 00D0+00 0/0 1/1 0/0 .text            check__7daSus_cFP10fopAc_ac_c */
 void daSus_c::check(fopAc_ac_c* i_actor) {
     if (fopAcM_GetGroup(i_actor) != 1 && fopAcM_GetGroup(i_actor) != 5) {
         daSus_c::data_c* pData = (daSus_c::data_c*)mData;
@@ -213,7 +192,6 @@ void daSus_c::check(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 800315A4-8003160C 02BEE4 0068+00 0/0 2/2 0/0 .text            execute__7daSus_cFv */
 void daSus_c::execute() {
     daSus_c::data_c* pData = (daSus_c::data_c*)mData;
     for (s16 i = 0; i < 0x20; pData++, i++) {
@@ -223,35 +201,28 @@ void daSus_c::execute() {
     }
 }
 
-/* 8003160C-80031648 02BF4C 003C+00 0/0 0/0 1/1 .text            daNpcMsg_setEvtNum__FUc */
 int daNpcMsg_setEvtNum(u8 iEvtNum) {
     dComIfGs_setTmpReg(0xFDFF, iEvtNum);
     return 1;
 }
 
-/* 80031648-800316A8 02BF88 0060+00 0/0 0/0 6/6 .text daNpcKakashi_chkSwdTutorialStage__Fv */
 u8 daNpcKakashi_chkSwdTutorialStage() {
     return strcmp(dComIfGp_getStartStageName(), "F_SP103") == 0 && dComIfG_play_c::getLayerNo(0) == 8;
 }
 
-/* 800316A8-800316E0 02BFE8 0038+00 0/0 0/0 3/3 .text daNpcKakashi_setSwdTutorialStep__FUc */
 void daNpcKakashi_setSwdTutorialStep(u8 iEvtNum) {
     dComIfGs_setTmpReg(0xFF0F, iEvtNum);
 }
 
-/* 800316E0-80031718 02C020 0038+00 0/0 1/1 4/4 .text            daNpcKakashi_getSwdTutorialStep__Fv
- */
 u8 daNpcKakashi_getSwdTutorialStep() {
     return dComIfGs_getTmpReg(0xFF0F) & 0xff;
 }
 
-/* 80031718-80031754 02C058 003C+00 0/0 1/1 0/0 .text daNpcKakashi_getSwdTutorialResult__Fv */
 bool daNpcKakashi_getSwdTutorialResult() {
            /* dSv_event_tmp_flag_c::T_0004 - Ordon Village - sword tutorial - outcome */
     return dComIfGs_isTmpBit(0x40);
 }
 
-/* 80031754-800317A4 02C094 0050+00 0/0 0/0 1/1 .text daNpcKakashi_setSwdTutorialResult__Fb */
 void daNpcKakashi_setSwdTutorialResult(bool param_0) {
     if (param_0) {
         /* dSv_event_tmp_flag_c::T_0004 - Ordon Village - sword tutorial - outcome */
@@ -262,24 +233,20 @@ void daNpcKakashi_setSwdTutorialResult(bool param_0) {
     }
 }
 
-/* 800317A4-800317DC 02C0E4 0038+00 0/0 1/1 1/1 .text            daNpcKakashi_getSuccessCount__Fv */
 u8 daNpcKakashi_getSuccessCount() {
     return dComIfGs_getTmpReg(0xFEFF) & 0xFF;
 }
 
-/* 800317DC-80031838 02C11C 005C+00 0/0 0/0 1/1 .text            daNpcKakashi_incSuccessCount__Fv */
 void daNpcKakashi_incSuccessCount() {
     int tmpReg = dComIfGs_getTmpReg(0xFEFF);
     tmpReg++;
     dComIfGs_setTmpReg(0xFEFF, tmpReg);
 }
 
-/* 80031838-80031870 02C178 0038+00 0/0 0/0 4/4 .text            daNpcKakashi_clrSuccessCount__Fv */
 void daNpcKakashi_clrSuccessCount() {
     dComIfGs_setTmpReg(0xFEFF, 0);
 }
 
-/* 80450D8C-80450D90 -00001 0004+00 0/0 1/1 3/3 .sbss            None */
 /* 80450D8C 0001+00 data_80450D8C None */
 bool daYkgr_c::m_flag;
 
@@ -289,17 +256,12 @@ bool daYkgr_c::m_alpha_flag;
 /* 80450D8E 0002+00 data_80450D8E None */
 u8 daYkgr_c::m_alpha;
 
-/* 80450D90-80450D94 000290 0004+00 0/0 0/0 1/1 .sbss            m_aim_rate__8daYkgr_c */
 f32 daYkgr_c::m_aim_rate;
 
-/* 80450D94-80450D98 000294 0004+00 0/0 0/0 2/2 .sbss            m_path__8daYkgr_c */
 dPath* daYkgr_c::m_path;
 
-/* 80450D98-80450D9C 000298 0004+00 0/0 1/1 2/2 .sbss            m_emitter__8daYkgr_c */
 JPABaseEmitter* daYkgr_c::m_emitter;
 
-/* 80031870-800318B4 02C1B0 0044+00 0/0 0/0 19/19 .text getArcName__12daSetBgObj_cFP10fopAc_ac_c
- */
 const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) {
     static char arcName[8];
 
@@ -307,9 +269,6 @@ const char* daSetBgObj_c::getArcName(fopAc_ac_c* i_this) {
     return arcName;
 }
 
-/* ############################################################################################## */
-/* 80451D28-80451D30 -00001 0008+00 0/0 0/0 3/3 .sdata2          M_dir_base__Q212daObjMovebox5Act_c
- */
 s16 const daObjMovebox::Act_c::M_dir_base[4] = {
     0x0000,
     0x4000,
@@ -317,35 +276,24 @@ s16 const daObjMovebox::Act_c::M_dir_base[4] = {
     0xC000,
 };
 
-/* 80451D30-80451D34 000330 0004+00 0/0 0/0 3/3 .sdata2          OPEN_SIZE__7daDsh_c */
 f32 const daDsh_c::OPEN_SIZE = 270.1f;
 
-/* 80451D34-80451D38 000334 0004+00 0/0 0/0 1/1 .sdata2          OPEN_ACCEL__7daDsh_c */
 f32 const daDsh_c::OPEN_ACCEL = 10.0f;
 
-/* 80451D38-80451D3C 000338 0004+00 0/0 0/0 1/1 .sdata2          OPEN_SPEED__7daDsh_c */
 f32 const daDsh_c::OPEN_SPEED = -40.0f;
 
-/* 80451D3C-80451D40 00033C 0004+00 0/0 0/0 1/1 .sdata2          OPEN_BOUND_SPEED__7daDsh_c */
 f32 const daDsh_c::OPEN_BOUND_SPEED = -30.0f;
 
-/* 80451D40-80451D44 000340 0004+00 0/0 0/0 1/1 .sdata2          OPEN_BOUND_RATIO__7daDsh_c */
 f32 const daDsh_c::OPEN_BOUND_RATIO = -0.4f;
 
-/* 80451D44-80451D48 000344 0004+00 0/0 0/0 1/1 .sdata2          CLOSE_ACCEL__7daDsh_c */
 f32 const daDsh_c::CLOSE_ACCEL = 10.0f;
 
-/* 80451D48-80451D4C 000348 0004+00 0/0 0/0 1/1 .sdata2          CLOSE_SPEED__7daDsh_c */
 f32 const daDsh_c::CLOSE_SPEED = 40.0f;
 
-/* 80451D4C-80451D50 00034C 0004+00 0/0 0/0 1/1 .sdata2          CLOSE_BOUND_SPEED__7daDsh_c */
 f32 const daDsh_c::CLOSE_BOUND_SPEED = 30.0f;
 
-/* 80451D50-80451D54 000350 0004+00 0/0 0/0 1/1 .sdata2          CLOSE_BOUND_RATIO__7daDsh_c */
 f32 const daDsh_c::CLOSE_BOUND_RATIO = -0.4f;
 
-/* 800318B4-8003194C 02C1F4 0098+00 0/0 1/1 0/0 .text            checkArea__13daTagStream_cFPC4cXyz
- */
 int daTagStream_c::checkArea(cXyz const* param_0) {
     cXyz relativePos;
     fpoAcM_relativePos(this, param_0, &relativePos);
@@ -357,17 +305,12 @@ int daTagStream_c::checkArea(cXyz const* param_0) {
     return 0;
 }
 
-/* ############################################################################################## */
-/* 8042457C-80424588 05129C 000C+00 1/2 0/0 1/1 .bss             m_entryModel__10daMirror_c */
 daMirror_c::entryModelFunc daMirror_c::m_entryModel = NULL;
 
-/* 80450DA4-80450DA8 0002A4 0004+00 0/0 1/1 2/2 .sbss            m_top__13daTagStream_c */
 daTagStream_c* daTagStream_c::m_top;
 
-/* 80450DA8-80450DAC 0002A8 0004+00 2/2 0/0 4/4 .sbss            m_myObj__10daMirror_c */
 daMirror_c* daMirror_c::m_myObj;
 
-/* 8003194C-80031990 02C28C 0044+00 0/0 1/1 9/9 .text            entry__10daMirror_cFP8J3DModel */
 int daMirror_c::entry(J3DModel* param_0) {
     if (m_myObj == NULL) {
         return 0;
@@ -375,7 +318,6 @@ int daMirror_c::entry(J3DModel* param_0) {
     return (m_myObj->*(daMirror_c::m_entryModel))(param_0);
 }
 
-/* 80031990-800319C8 02C2D0 0038+00 0/0 0/0 2/2 .text            remove__10daMirror_cFv */
 bool daMirror_c::remove() {
     if (m_myObj == NULL) {
         return false;
@@ -385,17 +327,12 @@ bool daMirror_c::remove() {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80424588-80424594 0512A8 000C+00 1/2 0/0 1/1 .bss             m_deleteRoom__15dGrass_packet_c */
 dGrass_packet_c::deleteFunc dGrass_packet_c::m_deleteRoom = NULL;
 
-/* 80450DAC-80450DB0 0002AC 0004+00 0/0 0/0 2/2 .sbss            m_myObj__9daGrass_c */
 daGrass_c* daGrass_c::m_myObj;
 
-/* 80450DB0-80450DB4 0002B0 0004+00 1/1 0/0 11/11 .sbss            m_grass__9daGrass_c */
 dGrass_packet_c* daGrass_c::m_grass;
 
-/* 800319C8-80031A20 02C308 0058+00 0/0 0/0 1/1 .text            deleteRoomGrass__9daGrass_cFi */
 void daGrass_c::deleteRoomGrass(int param_0) {
     if (m_grass != NULL) {
         dGrass_packet_c::deleteFunc delete_func = dGrass_packet_c::m_deleteRoom;
@@ -403,14 +340,10 @@ void daGrass_c::deleteRoomGrass(int param_0) {
     }
 }
 
-/* ############################################################################################## */
-/* 80424594-804245A0 0512B4 000C+00 1/2 0/0 1/1 .bss             m_deleteRoom__16dFlower_packet_c */
 dFlower_packet_c::deleteFunc dFlower_packet_c::m_deleteRoom = NULL;
 
-/* 80450DB4-80450DB8 0002B4 0004+00 1/1 0/0 9/9 .sbss            m_flower__9daGrass_c */
 dFlower_packet_c* daGrass_c::m_flower;
 
-/* 80031A20-80031A78 02C360 0058+00 0/0 0/0 1/1 .text            deleteRoomFlower__9daGrass_cFi */
 void daGrass_c::deleteRoomFlower(int param_0) {
     if (m_flower != NULL) {
         dFlower_packet_c::deleteFunc delete_func = dFlower_packet_c::m_deleteRoom;
@@ -418,21 +351,16 @@ void daGrass_c::deleteRoomFlower(int param_0) {
     }
 }
 
-/* ############################################################################################## */
-/* 80450DB8-80450DBC 0002B8 0004+00 4/4 0/0 2/2 .sbss            m_myObj__6daMP_c */
 daMP_c* daMP_c::m_myObj;
 
-/* 80031A78-80031AA4 02C3B8 002C+00 0/0 0/0 1/1 .text daMP_c_Get_MovieRestFrame__6daMP_cFv */
 u32 daMP_c::daMP_c_Get_MovieRestFrame() {
     return m_myObj->mpGetMovieRestFrame();
 }
 
-/* 80031AA4-80031AD0 02C3E4 002C+00 0/0 0/0 1/1 .text daMP_c_Set_PercentMovieVolume__6daMP_cFf */
 void daMP_c::daMP_c_Set_PercentMovieVolume(f32 i_volume) {
     m_myObj->mpSetPercentMovieVol(i_volume);
 }
 
-/* 80031AD0-80031B24 02C410 0054+00 0/0 1/1 1/1 .text            daMP_c_THPPlayerPlay__6daMP_cFv */
 int daMP_c::daMP_c_THPPlayerPlay() {
     if (m_myObj == NULL) {
         dDemo_c::onStatus(1);
@@ -443,17 +371,12 @@ int daMP_c::daMP_c_THPPlayerPlay() {
     }
 }
 
-/* 80031B24-80031B50 02C464 002C+00 0/0 0/0 1/1 .text            daMP_c_THPPlayerPause__6daMP_cFv */
 void daMP_c::daMP_c_THPPlayerPause() {
     m_myObj->mpTHPPause();
 }
 
-/* ############################################################################################## */
-/* 80450DBC-80450DC0 0002BC 0004+00 1/1 0/0 3/3 .sbss            mTagMagne__12daTagMagne_c */
 daTagMagne_c* daTagMagne_c::mTagMagne;
 
-/* 80031B50-80031BF4 02C490 00A4+00 0/0 4/4 0/0 .text
- * checkMagnetCode__12daTagMagne_cFR13cBgS_PolyInfo             */
 int daTagMagne_c::checkMagnetCode(cBgS_PolyInfo& poly) {
     if (mTagMagne == NULL) {
         return 0;
@@ -469,7 +392,6 @@ int daTagMagne_c::checkMagnetCode(cBgS_PolyInfo& poly) {
     return 0;
 }
 
-/* 80031BF4-80031C48 02C534 0054+00 1/1 0/0 0/0 .text            checkMagneA__12daTagMagne_cFv */
 int daTagMagne_c::checkMagneA() {
     if (mSwNo1 == 0xFF || fopAcM_isSwitch(this, mSwNo1)) {
         return 1;
@@ -478,7 +400,6 @@ int daTagMagne_c::checkMagneA() {
     return 0;
 }
 
-/* 80031C48-80031C9C 02C588 0054+00 1/1 0/0 0/0 .text            checkMagneB__12daTagMagne_cFv */
 int daTagMagne_c::checkMagneB() {
     if (mSwNo2 == 0xFF || fopAcM_isSwitch(this, mSwNo2)) {
         return 1;
@@ -487,7 +408,6 @@ int daTagMagne_c::checkMagneB() {
     return 0;
 }
 
-/* 80031C9C-80031CF0 02C5DC 0054+00 1/1 0/0 0/0 .text            checkMagneC__12daTagMagne_cFv */
 int daTagMagne_c::checkMagneC() {
     if (mSwNo3 == 0xFF || fopAcM_isSwitch(this, mSwNo3)) {
         return 1;
@@ -496,78 +416,60 @@ int daTagMagne_c::checkMagneC() {
     return 0;
 }
 
-/* ############################################################################################## */
-/* 80450DC0-80450DC4 -00001 0004+00 4/4 0/0 2/2 .sbss            None */
 /* 80450DC0 0001+00 data_80450DC0 None */
 u8 daTagMist_c::mPlayerNo;
 
 /* 80450DC1 0003+00 data_80450DC1 None */
 bool daObjCarry_c::mSaveFlag;
 
-/* 80031CF0-80031CF8 02C630 0008+00 0/0 1/1 0/0 .text            getPlayerNo__11daTagMist_cFv */
 u8 daTagMist_c::getPlayerNo() {
     return mPlayerNo;
 }
 
-/* 80031CF8-80031D04 02C638 000C+00 0/0 1/1 0/0 .text            clrSaveFlag__12daObjCarry_cFv */
 void daObjCarry_c::clrSaveFlag() {
     mSaveFlag = false;
 }
 
-/* 80031D04-80031D10 02C644 000C+00 0/0 1/1 0/0 .text            setSaveFlag__12daObjCarry_cFv */
 void daObjCarry_c::setSaveFlag() {
     mSaveFlag = true;
 }
 
-/* 80031D10-80031D24 02C650 0014+00 0/0 0/0 1/1 .text            chkSaveFlag__12daObjCarry_cFv */
 bool daObjCarry_c::chkSaveFlag() {
     return mSaveFlag == true;
 }
 
-/* 804245AC-804245E8 0512CC 003C+00 3/4 0/0 0/0 .bss             mPos__12daObjCarry_c */
 cXyz daObjCarry_c::mPos[5];
 
-/* 80031D24-80031D38 02C664 0014+00 0/0 0/0 1/1 .text            getPos__12daObjCarry_cFi */
 const cXyz& daObjCarry_c::getPos(int param_0) {
     return mPos[param_0];
 }
 
-/* 80031D38-80031D64 02C678 002C+00 0/0 0/0 2/2 .text            savePos__12daObjCarry_cFi4cXyz */
 void daObjCarry_c::savePos(int param_0, cXyz param_1) {
     mPos[param_0].x = param_1.x;
     mPos[param_0].y = param_1.y;
     mPos[param_0].z = param_1.z;
 }
 
-/* ############################################################################################## */
-/* 80450DC4-80450DCC 0002C4 0005+03 3/3 0/0 0/0 .sbss            mSttsFlag__12daObjCarry_c */
 u8 daObjCarry_c::mSttsFlag[5];
 
-/* 80031D64-80031D78 02C6A4 0014+00 0/0 0/0 1/1 .text            onSttsFlag__12daObjCarry_cFiUc */
 void daObjCarry_c::onSttsFlag(int idx, u8 flag) {
     mSttsFlag[idx] |= flag;
 }
 
-/* 80031D78-80031D8C 02C6B8 0014+00 0/0 0/0 1/1 .text            offSttsFlag__12daObjCarry_cFiUc */
 void daObjCarry_c::offSttsFlag(int idx, u8 flag) {
     mSttsFlag[idx] &= ~flag;
 }
 
-/* 80031D8C-80031DAC 02C6CC 0020+00 0/0 0/0 1/1 .text            chkSttsFlag__12daObjCarry_cFiUc */
 u8 daObjCarry_c::chkSttsFlag(int idx, u8 flag) {
     return (u8)(mSttsFlag[idx] & flag) ? 1 : 0;
 }
 
-/* ############################################################################################## */
-/* 80450DCC-80450DD4 0002CC 0005+03 2/2 0/0 0/0 .sbss            mRoomNo__12daObjCarry_c */
 s8 daObjCarry_c::mRoomNo[5];
 
-/* 80031DAC-80031DB8 02C6EC 000C+00 0/0 0/0 2/2 .text            setRoomNo__12daObjCarry_cFiSc */
 void daObjCarry_c::setRoomNo(int idx, s8 roomNo) {
     mRoomNo[idx] = roomNo;
 }
 
-/* 80031DB8-80031DC4 02C6F8 000C+00 0/0 0/0 1/1 .text            getRoomNo__12daObjCarry_cFi */
 s8 daObjCarry_c::getRoomNo(int idx) {
     return mRoomNo[idx];
 }
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index b2ce06b7fe..29c15637e5 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -9,12 +9,9 @@
 #include "JSystem/JGadget/pointer.h"
 #include "JSystem/JGadget/define.h"
 
-/* 80450620-80450628 0000A0 0002+06 3/3 1/1 0/0 .sdata           m_branchId__7dDemo_c */
 s16 dDemo_c::m_branchId = -1;
 
 namespace {
-/* 80037DE4-80037E44 032724 0060+00 1/0 0/0 0/0 .text
- * __dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv   */
 jstudio_tAdaptor_message::~jstudio_tAdaptor_message() {}
 
 /* 80037E44-80037E74 032784 0030+00 1/0 0/0 0/0 .text
@@ -41,8 +38,6 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData
     }
 }
 
-/* 80037E74-80037ED4 0327B4 0060+00 1/0 0/0 0/0 .text
- * __dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv */
 jstudio_tCreateObject_message::~jstudio_tCreateObject_message() {}
 
 /* 80037ED4-80038020 032814 014C+00 1/0 0/0 0/0 .text
@@ -79,7 +74,6 @@ jstudio_tCreateObject_message::create(JStudio::TObject** ppObject,
 
 };  // namespace
 
-/* 80038020-80038098 032960 0078+00 1/1 0/0 0/0 .text            __ct__13dDemo_actor_cFv */
 dDemo_actor_c::dDemo_actor_c() {
     mFlags = 0;
     mTrans.set(0.0f, 0.0f, 0.0f);
@@ -90,7 +84,6 @@ dDemo_actor_c::dDemo_actor_c() {
     mTexAnmFrameMax = FLT_MAX;
 }
 
-/* 80038098-80038128 0329D8 0090+00 1/0 0/0 0/0 .text            __dt__13dDemo_actor_cFv */
 dDemo_actor_c::~dDemo_actor_c() {
     fopAc_ac_c* actor = getActor();
     if (actor != NULL) {
@@ -110,12 +103,10 @@ dDemo_actor_c::~dDemo_actor_c() {
     #endif
 }
 
-/* 80038128-8003815C 032A68 0034+00 1/1 0/0 0/0 .text            getActor__13dDemo_actor_cFv */
 fopAc_ac_c* dDemo_actor_c::getActor() {
     return fopAcM_SearchByID(mActorId);
 }
 
-/* 8003815C-8003819C 032A9C 0040+00 1/1 1/1 0/0 .text setActor__13dDemo_actor_cFP10fopAc_ac_c */
 void dDemo_actor_c::setActor(fopAc_ac_c* pActor) {
     if (pActor == NULL) {
         mActorId = fpcM_ERROR_PROCESS_ID_e;
@@ -129,7 +120,6 @@ void dDemo_actor_c::setActor(fopAc_ac_c* pActor) {
     mBrkId = -1;
 }
 
-/* 8003819C-80038338 032ADC 019C+00 1/1 1/1 1/1 .text            getPrm_Morf__13dDemo_actor_cFv */
 f32 dDemo_actor_c::getPrm_Morf() {
     if (checkEnable(ENABLE_ANM_TRANSITION_e)) {
         return mAnmTransition;
@@ -172,63 +162,43 @@ f32 dDemo_actor_c::getPrm_Morf() {
     }
 }
 
-/* 80450E00-80450E04 000300 0004+00 2/2 0/0 0/0 .sbss            m_system__7dDemo_c */
 dDemo_system_c* dDemo_c::m_system;
 
-/* 80450E04-80450E08 000304 0004+00 6/6 3/3 0/0 .sbss            m_control__7dDemo_c */
 JStudio::TControl* dDemo_c::m_control;
 
-/* 80450E08-80450E0C 000308 0004+00 2/2 0/0 0/0 .sbss            m_stage__7dDemo_c */
 JStudio_JStage::TCreateObject* dDemo_c::m_stage;
 
-/* 80450E0C-80450E10 00030C 0004+00 2/2 0/0 0/0 .sbss            m_audio__7dDemo_c */
 JStudio_JAudio2::TCreateObject* dDemo_c::m_audio;
 
-/* 80450E10-80450E14 000310 0004+00 2/2 0/0 0/0 .sbss            m_particle__7dDemo_c */
 dDemo_particle_c* dDemo_c::m_particle;
 
-/* 80450E14-80450E18 000314 0004+00 2/2 0/0 0/0 .sbss            m_message__7dDemo_c */
 jstudio_tCreateObject_message* dDemo_c::m_message;
 
-/* 80450E18-80450E1C 000318 0004+00 2/2 0/0 0/0 .sbss            m_factory__7dDemo_c */
 JStudio::TFactory* dDemo_c::m_factory;
 
-/* 80450E1C-80450E20 00031C 0004+00 2/2 1/1 0/0 .sbss            m_mesgControl__7dDemo_c */
 jmessage_tControl* dDemo_c::m_mesgControl;
 
-/* 80450E20-80450E24 000320 0004+00 5/5 9/9 7/7 .sbss            m_object__7dDemo_c */
 dDemo_object_c* dDemo_c::m_object;
 
-/* 80450E24-80450E28 000324 0004+00 4/4 0/0 0/0 .sbss            m_data__7dDemo_c */
 const u8* dDemo_c::m_data;
 
-/* 80450E28-80450E2C 000328 0004+00 2/2 0/0 1/1 .sbss            m_frame__7dDemo_c */
 int dDemo_c::m_frame;
 
-/* 80450E2C-80450E30 00032C 0004+00 2/2 0/0 0/0 .sbss            m_translation__7dDemo_c */
 cXyz* dDemo_c::m_translation;
 
-/* 80450E30-80450E34 000330 0004+00 2/2 0/0 0/0 .sbss            m_rotationY__7dDemo_c */
 f32 dDemo_c::m_rotationY;
 
-/* 80450E34-80450E38 000334 0004+00 2/2 1/1 0/0 .sbss            m_frameNoMsg__7dDemo_c */
 u32 dDemo_c::m_frameNoMsg;
 
-/* 80450E38-80450E3C 000338 0004+00 4/4 4/4 0/0 .sbss            m_mode__7dDemo_c */
 s32 dDemo_c::m_mode;
 
-/* 80450E3C-80450E40 00033C 0004+00 2/2 1/1 0/0 .sbss            m_status__7dDemo_c */
 u32 dDemo_c::m_status;
 
-/* 80450E40-80450E44 000340 0002+02 2/2 0/0 0/0 .sbss            m_branchType__7dDemo_c */
 u16 dDemo_c::m_branchType;
 
-/* 80450E44-80450E48 000344 0004+00 5/5 0/0 0/0 .sbss            m_branchData__7dDemo_c */
 const u8* dDemo_c::m_branchData;
 
 
-/* 80038338-80038490 032C78 0158+00 0/0 1/1 5/5 .text getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc
- */
 int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16* param_3,
                                       u8* param_4) {
     JStudio::stb::TParseData_fixed<51, TValueIterator_misaligned<u32> > data(getPrm()->getData());
@@ -263,7 +233,6 @@ int dDemo_actor_c::getDemoIDData(int* param_0, int* param_1, int* param_2, u16*
 s16 dDemo_c::m_branchNum = 0;
 #endif
 
-/* 80038490-80038518 032DD0 0088+00 1/1 0/0 0/0 .text            dDemo_getJaiPointer__FPCcUliPUs */
 static void* dDemo_getJaiPointer(char const* arcName, u32 anmID, int param_2, u16* param_3) {
     if (param_2 <= 0 || param_3 == NULL) {
         return NULL;
@@ -280,8 +249,6 @@ static void* dDemo_getJaiPointer(char const* arcName, u32 anmID, int param_2, u1
     return NULL;
 }
 
-/* 80038518-800387A8 032E58 0290+00 0/0 0/0 2/2 .text
- * dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc */
 int dDemo_setDemoData(fopAc_ac_c* i_actor, u8 i_flags, mDoExt_McaMorf* i_morf, char const* i_arcName,
                       int param_4, u16* param_5, u32 param_6, s8 i_reverb) {
     dDemo_actor_c* demo_actor = dDemo_c::getActor(i_actor->demoActorID);
@@ -356,7 +323,6 @@ int dDemo_setDemoData(fopAc_ac_c* i_actor, u8 i_flags, mDoExt_McaMorf* i_morf, c
     return 1;
 }
 
-/* 800387A8-800387EC 0330E8 0044+00 1/1 0/0 0/0 .text            branchFile__FPCc */
 static void branchFile(char const* resName) {
     u8* branchData = (u8*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName);
     JUT_ASSERT(712, branchData != NULL);
@@ -364,7 +330,6 @@ static void branchFile(char const* resName) {
     dDemo_c::setBranchData(branchData);
 }
 
-/* 800387EC-80038920 03312C 0134+00 1/0 0/0 0/0 .text            JSGSetData__13dDemo_actor_cFUlPCvUl */
 void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) {
     if (id == ID_UNK_1) {
         JStudio::stb::TParseData_fixed<50, TValueIterator_misaligned<u16> > data(pdata);
@@ -419,7 +384,6 @@ void dDemo_actor_c::JSGSetData(u32 id, void const* pdata, u32 param_2) {
     }
 }
 
-/* 80038920-80038980 033260 0060+00 1/0 0/0 0/0 .text JSGSetTranslation__13dDemo_actor_cFRC3Vec */
 void dDemo_actor_c::JSGSetTranslation(Vec const& i_trans) {
     if (-1.0E+32f < i_trans.x && i_trans.x < 1.0E+32f && -1.0E+32f < i_trans.y && i_trans.y < 1.0E+32f && -1.0E+32f < i_trans.z && i_trans.z < 1.0E+32f) {
         mTrans.x = i_trans.x;
@@ -433,13 +397,11 @@ void dDemo_actor_c::JSGSetTranslation(Vec const& i_trans) {
     }
 }
 
-/* 80038980-800389A8 0332C0 0028+00 1/0 0/0 0/0 .text JSGSetScaling__13dDemo_actor_cFRC3Vec */
 void dDemo_actor_c::JSGSetScaling(Vec const& i_scale) {
     mScale = i_scale;
     onEnable(ENABLE_SCALE_e);
 }
 
-/* 800389A8-80038A0C 0332E8 0064+00 1/0 0/0 0/0 .text JSGSetRotation__13dDemo_actor_cFRC3Vec */
 void dDemo_actor_c::JSGSetRotation(Vec const& i_rotate) {
     mRotate.x = i_rotate.x * 182.04444885253906f;
     mRotate.y = i_rotate.y * 182.04444885253906f;
@@ -447,48 +409,37 @@ void dDemo_actor_c::JSGSetRotation(Vec const& i_rotate) {
     onEnable(ENABLE_ROTATE_e);
 }
 
-/* 80038A0C-80038A20 03334C 0014+00 1/0 0/0 0/0 .text            JSGSetShape__13dDemo_actor_cFUl */
 void dDemo_actor_c::JSGSetShape(u32 i_shape) {
     mShape = i_shape;
     onEnable(ENABLE_SHAPE_e);
 }
 
-/* 80038A20-80038A40 033360 0020+00 1/0 0/0 0/0 .text            JSGSetAnimation__13dDemo_actor_cFUl
- */
 void dDemo_actor_c::JSGSetAnimation(u32 i_anmID) {
     mAnmId = i_anmID;
     mAnmFrameMax = FLT_MAX;
     onEnable(ENABLE_ANM_e);
 }
 
-/* 80038A40-80038A54 033380 0014+00 1/0 0/0 0/0 .text JSGSetAnimationFrame__13dDemo_actor_cFf */
 void dDemo_actor_c::JSGSetAnimationFrame(f32 i_frame) {
     mAnmFrame = i_frame;
     onEnable(ENABLE_ANM_FRAME_e);
 }
 
-/* 80038A54-80038A68 033394 0014+00 1/0 0/0 0/0 .text JSGSetAnimationTransition__13dDemo_actor_cFf
- */
 void dDemo_actor_c::JSGSetAnimationTransition(f32 i_trans) {
     mAnmTransition = i_trans;
     onEnable(ENABLE_ANM_TRANSITION_e);
 }
 
-/* 80038A68-80038A7C 0333A8 0014+00 1/0 0/0 0/0 .text JSGSetTextureAnimation__13dDemo_actor_cFUl
- */
 void dDemo_actor_c::JSGSetTextureAnimation(u32 i_anm) {
     mTexAnm = i_anm;
     onEnable(ENABLE_TEX_ANM);
 }
 
-/* 80038A7C-80038A90 0333BC 0014+00 1/0 0/0 0/0 .text
- * JSGSetTextureAnimationFrame__13dDemo_actor_cFf               */
 void dDemo_actor_c::JSGSetTextureAnimationFrame(f32 i_frame) {
     mTexAnmFrame = i_frame;
     onEnable(ENABLE_TEX_ANM_FRAME_e);
 }
 
-/* 80038A90-80038AC4 0333D0 0034+00 8/8 0/0 0/0 .text            getView__Fv */
 static view_class* getView() {
     if (dComIfGp_getWindowNum() == 0) {
         return NULL;
@@ -498,7 +449,6 @@ static view_class* getView() {
     return dComIfGp_getCamera(camID);
 }
 
-/* 80038AC4-80038AF8 033404 0034+00 1/0 0/0 0/0 .text JSGGetProjectionNear__14dDemo_camera_cCFv */
 f32 dDemo_camera_c::JSGGetProjectionNear() const {
     view_class* view = getView();
     
@@ -509,13 +459,11 @@ f32 dDemo_camera_c::JSGGetProjectionNear() const {
     return view->near;
 }
 
-/* 80038AF8-80038B0C 033438 0014+00 1/0 0/0 0/0 .text JSGSetProjectionNear__14dDemo_camera_cFf */
 void dDemo_camera_c::JSGSetProjectionNear(f32 i_projNear) {
     mProjNear = i_projNear;
     onEnable(ENABLE_PROJ_NEAR_e);
 }
 
-/* 80038B0C-80038B40 03344C 0034+00 1/0 0/0 0/0 .text JSGGetProjectionFar__14dDemo_camera_cCFv */
 f32 dDemo_camera_c::JSGGetProjectionFar() const {
     view_class* view = getView();
     
@@ -526,13 +474,11 @@ f32 dDemo_camera_c::JSGGetProjectionFar() const {
     return view->far;
 }
 
-/* 80038B40-80038B54 033480 0014+00 1/0 0/0 0/0 .text JSGSetProjectionFar__14dDemo_camera_cFf */
 void dDemo_camera_c::JSGSetProjectionFar(f32 i_projFar) {
     mProjFar = i_projFar;
     onEnable(ENABLE_PROJ_FAR_e);
 }
 
-/* 80038B54-80038B88 033494 0034+00 1/0 0/0 0/0 .text JSGGetProjectionFovy__14dDemo_camera_cCFv */
 f32 dDemo_camera_c::JSGGetProjectionFovy() const {
     view_class* view = getView();
     
@@ -543,14 +489,11 @@ f32 dDemo_camera_c::JSGGetProjectionFovy() const {
     return view->fovy;
 }
 
-/* 80038B88-80038B9C 0334C8 0014+00 1/0 0/0 0/0 .text JSGSetProjectionFovy__14dDemo_camera_cFf */
 void dDemo_camera_c::JSGSetProjectionFovy(f32 i_projFovy) {
     mProjFovy = i_projFovy;
     onEnable(ENABLE_PROJ_FOVY_e);
 }
 
-/* 80038B9C-80038BD0 0334DC 0034+00 1/0 0/0 0/0 .text JSGGetProjectionAspect__14dDemo_camera_cCFv
- */
 f32 dDemo_camera_c::JSGGetProjectionAspect() const {
     view_class* view = getView();
     
@@ -561,15 +504,11 @@ f32 dDemo_camera_c::JSGGetProjectionAspect() const {
     return view->aspect;
 }
 
-/* 80038BD0-80038BE4 033510 0014+00 1/0 0/0 0/0 .text JSGSetProjectionAspect__14dDemo_camera_cFf
- */
 void dDemo_camera_c::JSGSetProjectionAspect(f32 i_aspect) {
     mProjAspect = i_aspect;
     onEnable(ENABLE_PROJ_ASPECT_e);
 }
 
-/* 80038BE4-80038C44 033524 0060+00 1/0 0/0 0/0 .text JSGGetViewPosition__14dDemo_camera_cCFP3Vec
- */
 void dDemo_camera_c::JSGGetViewPosition(Vec* o_position) const {
     view_class* view = getView();
     
@@ -582,15 +521,11 @@ void dDemo_camera_c::JSGGetViewPosition(Vec* o_position) const {
     }
 }
 
-/* 80038C44-80038C6C 033584 0028+00 1/0 0/0 0/0 .text JSGSetViewPosition__14dDemo_camera_cFRC3Vec
- */
 void dDemo_camera_c::JSGSetViewPosition(Vec const& i_position) {
     mViewPos = i_position;
     onEnable(ENABLE_VIEW_POS_e);
 }
 
-/* 80038C6C-80038CD0 0335AC 0064+00 1/0 0/0 0/0 .text JSGGetViewUpVector__14dDemo_camera_cCFP3Vec
- */
 void dDemo_camera_c::JSGGetViewUpVector(Vec* o_upVec) const {
     view_class* view = getView();
     
@@ -603,15 +538,11 @@ void dDemo_camera_c::JSGGetViewUpVector(Vec* o_upVec) const {
     }
 }
 
-/* 80038CD0-80038CF8 033610 0028+00 1/0 0/0 0/0 .text JSGSetViewUpVector__14dDemo_camera_cFRC3Vec
- */
 void dDemo_camera_c::JSGSetViewUpVector(Vec const& i_upVec) {
     mViewUpVector = i_upVec;
     onEnable(ENABLE_VIEW_UP_VEC_e);
 }
 
-/* 80038CF8-80038D5C 033638 0064+00 1/0 0/0 0/0 .text
- * JSGGetViewTargetPosition__14dDemo_camera_cCFP3Vec            */
 void dDemo_camera_c::JSGGetViewTargetPosition(Vec* o_targetPos) const {
     view_class* view = getView();
     
@@ -624,15 +555,11 @@ void dDemo_camera_c::JSGGetViewTargetPosition(Vec* o_targetPos) const {
     }
 }
 
-/* 80038D5C-80038D84 03369C 0028+00 1/0 0/0 0/0 .text
- * JSGSetViewTargetPosition__14dDemo_camera_cFRC3Vec            */
 void dDemo_camera_c::JSGSetViewTargetPosition(Vec const& i_targetPos) {
     mViewTargetVector = i_targetPos;
     onEnable(ENABLE_VIEW_TARG_POS_e);
 }
 
-/* 80038D84-80038DDC 0336C4 0058+00 1/0 0/0 0/0 .text            JSGGetViewRoll__14dDemo_camera_cCFv
- */
 f32 dDemo_camera_c::JSGGetViewRoll() const {
     view_class* view = getView();
     
@@ -643,40 +570,31 @@ f32 dDemo_camera_c::JSGGetViewRoll() const {
     return view->bank * 0.0054931640625f;
 }
 
-/* 80038DDC-80038DF0 03371C 0014+00 1/0 0/0 0/0 .text            JSGSetViewRoll__14dDemo_camera_cFf
- */
 void dDemo_camera_c::JSGSetViewRoll(f32 i_roll) {
     mViewRoll = i_roll;
     onEnable(ENABLE_VIEW_ROLL_e);
 }
 
-/* 80038DF0-80038E20 033730 0030+00 1/0 0/0 0/0 .text JSGSetColor__15dDemo_ambient_cF8_GXColor */
 void dDemo_ambient_c::JSGSetColor(GXColor i_color) {
     mColor = i_color;
     onEnable(ENABLE_COLOR_e);
 }
 
-/* 80038E20-80038E34 033760 0014+00 1/0 0/0 0/0 .text
- * JSGSetLightType__13dDemo_light_cFQ26JStage7TELight           */
 void dDemo_light_c::JSGSetLightType(JStage::TELight i_lightType) {
     mLightType = i_lightType;
     onEnable(ENABLE_LIGHT_TYPE_e);
 }
 
-/* 80038E34-80038E5C 033774 0028+00 1/0 0/0 0/0 .text JSGSetPosition__13dDemo_light_cFRC3Vec */
 void dDemo_light_c::JSGSetPosition(Vec const& i_pos) {
     mPosition = i_pos;
     onEnable(ENABLE_POSITION_e);
 }
 
-/* 80038E5C-80038E8C 03379C 0030+00 1/0 0/0 0/0 .text JSGSetColor__13dDemo_light_cF8_GXColor */
 void dDemo_light_c::JSGSetColor(GXColor i_color) {
     mColor = i_color;
     onEnable(ENABLE_COLOR_e);
 }
 
-/* 80038E8C-80038EA8 0337CC 001C+00 1/0 0/0 0/0 .text
- * JSGSetDistanceAttenuation__13dDemo_light_cFff13_GXDistAttnFn */
 void dDemo_light_c::JSGSetDistanceAttenuation(f32 param_0, f32 param_1, GXDistAttnFn i_distAttenFn) {
     field_0x24 = param_0;
     field_0x28 = param_1;
@@ -684,46 +602,37 @@ void dDemo_light_c::JSGSetDistanceAttenuation(f32 param_0, f32 param_1, GXDistAt
     onEnable(ENABLE_DIST_ATTEN_e);
 }
 
-/* 80038EA8-80038EC0 0337E8 0018+00 1/0 0/0 0/0 .text
- * JSGSetAngleAttenuation__13dDemo_light_cFf9_GXSpotFn          */
 void dDemo_light_c::JSGSetAngleAttenuation(f32 param_0, GXSpotFn i_spotFn) {
     field_0x2c = param_0;
     mSpotFn = i_spotFn;
     onEnable(ENABLE_ANGLE_ATTEN_e);
 }
 
-/* 80038EC0-80038EE8 033800 0028+00 1/0 0/0 0/0 .text JSGSetDirection__13dDemo_light_cFRC3Vec */
 void dDemo_light_c::JSGSetDirection(Vec const& i_direction) {
     mDirection = i_direction;
     onEnable(ENABLE_DIRECTION_e);
 }
 
-/* 80038EE8-80038EFC 033828 0014+00 1/0 0/0 0/0 .text
- * JSGSetFogFunction__11dDemo_fog_cF10_GXFogType                */
 void dDemo_fog_c::JSGSetFogFunction(GXFogType i_fogType) {
     mFogType = i_fogType;
     onEnable(ENABLE_FOG_FN_e);
 }
 
-/* 80038EFC-80038F10 03383C 0014+00 1/0 0/0 0/0 .text            JSGSetStartZ__11dDemo_fog_cFf */
 void dDemo_fog_c::JSGSetStartZ(f32 i_startZ) {
     mStartZ = i_startZ;
     onEnable(ENABLE_START_Z_e);
 }
 
-/* 80038F10-80038F24 033850 0014+00 1/0 0/0 0/0 .text            JSGSetEndZ__11dDemo_fog_cFf */
 void dDemo_fog_c::JSGSetEndZ(f32 i_endZ) {
     mEndZ = i_endZ;
     onEnable(ENABLE_END_Z_e);
 }
 
-/* 80038F24-80038F54 033864 0030+00 1/0 0/0 0/0 .text JSGSetColor__11dDemo_fog_cF8_GXColor */
 void dDemo_fog_c::JSGSetColor(GXColor i_color) {
     mColor = i_color;
     onEnable(ENABLE_COLOR_e);
 }
 
-/* 80038F54-80038F70 033894 001C+00 1/1 0/0 0/0 .text            __ct__14dDemo_object_cFv */
 dDemo_object_c::dDemo_object_c() {
     mActorNum = 0;
     mLightNum = 0;
@@ -732,13 +641,10 @@ dDemo_object_c::dDemo_object_c() {
     mpFog = NULL;
 }
 
-/* 80038F70-80038FC0 0338B0 0050+00 1/1 0/0 0/0 .text            __dt__14dDemo_object_cFv */
 dDemo_object_c::~dDemo_object_c() {
     remove();
 }
 
-/* 80038FC0-80039088 033900 00C8+00 1/1 0/0 0/0 .text appendActor__14dDemo_object_cFP10fopAc_ac_c
- */
 JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
     dDemo_actor_c* demoActor = dDemo_c::getActor(p_actor->demoActorID);
 
@@ -772,7 +678,6 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) {
     return demoActor;
 }
 
-/* 80039088-800390AC 0339C8 0024+00 2/2 6/6 7/7 .text            getActor__14dDemo_object_cFUc */
 dDemo_actor_c* dDemo_object_c::getActor(u8 actorId) {
     if (actorId == 0 || actorId > 32) {
         return NULL;
@@ -781,7 +686,6 @@ dDemo_actor_c* dDemo_object_c::getActor(u8 actorId) {
     return mpActors[actorId - 1];
 }
 
-/* 800390AC-80039128 0339EC 007C+00 1/1 0/0 0/0 .text            createCamera__14dDemo_object_cFv */
 JStage::TObject* dDemo_object_c::createCamera() {
     if (mpCamera != NULL) {
         // "2 demo cameras!!\n"
@@ -793,8 +697,6 @@ JStage::TObject* dDemo_object_c::createCamera() {
     return mpCamera;
 }
 
-/* 80039128-8003913C 033A68 0014+00 0/0 3/3 0/0 .text            getActiveCamera__14dDemo_object_cFv
- */
 dDemo_camera_c* dDemo_object_c::getActiveCamera() {
     if (mpCamera != NULL) {
         return mpCamera;
@@ -803,8 +705,6 @@ dDemo_camera_c* dDemo_object_c::getActiveCamera() {
     return NULL;
 }
 
-/* 8003913C-800391B8 033A7C 007C+00 1/1 0/0 0/0 .text            createAmbient__14dDemo_object_cFv
- */
 JStage::TObject* dDemo_object_c::createAmbient() {
     if (mpAmbient != NULL) {
         // "2 demo ambient lights!\n"
@@ -816,7 +716,6 @@ JStage::TObject* dDemo_object_c::createAmbient() {
     return mpAmbient;
 }
 
-/* 800391B8-80039258 033AF8 00A0+00 1/1 0/0 0/0 .text            appendLight__14dDemo_object_cFv */
 JStage::TObject* dDemo_object_c::appendLight() {
     if (mLightNum >= 8) {
         // "Too many Demo Lights!!\n"
@@ -838,7 +737,6 @@ JStage::TObject* dDemo_object_c::appendLight() {
     return demoLight;
 }
 
-/* 80039258-800392D4 033B98 007C+00 1/1 0/0 0/0 .text            createFog__14dDemo_object_cFv */
 JStage::TObject* dDemo_object_c::createFog() {
     if (mpFog != NULL) {
         // "2 demo fogs!\n"
@@ -850,7 +748,6 @@ JStage::TObject* dDemo_object_c::createFog() {
     return mpFog;
 }
 
-/* 800392D4-80039408 033C14 0134+00 2/2 0/0 0/0 .text            remove__14dDemo_object_cFv */
 void dDemo_object_c::remove() {
     while (mActorNum != 0) {
         delete mpActors[--mActorNum];
@@ -876,17 +773,12 @@ void dDemo_object_c::remove() {
     }
 }
 
-/* 80039408-80039468 033D48 0060+00 1/0 0/0 0/0 .text            __dt__11dDemo_fog_cFv */
 dDemo_fog_c::~dDemo_fog_c() {}
 
-/* 80039468-800394C8 033DA8 0060+00 1/0 0/0 0/0 .text            __dt__13dDemo_light_cFv */
 dDemo_light_c::~dDemo_light_c() {}
 
-/* 800394C8-80039528 033E08 0060+00 1/0 0/0 0/0 .text            __dt__15dDemo_ambient_cFv */
 dDemo_ambient_c::~dDemo_ambient_c() {}
 
-/* 80039528-80039678 033E68 0150+00 1/0 0/0 0/0 .text
- * JSGFindObject__14dDemo_system_cCFPPQ26JStage7TObjectPCcQ26JStage8TEObject */
 int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorName,
                                    JStage::TEObject objType) const {
     if (mpObject == NULL) {
@@ -936,7 +828,6 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam
     return *p_TObj == NULL ? TRUE : FALSE;
 }
 
-/* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text            create__7dDemo_cFv */
 void dDemo_c::create() {
     m_system = new dDemo_system_c();
     JUT_ASSERT(0, m_system != NULL);
@@ -979,7 +870,6 @@ void dDemo_c::create() {
     reset();
 }
 
-/* 80039910-80039AAC 034250 019C+00 0/0 1/1 0/0 .text            remove__7dDemo_cFv */
 void dDemo_c::remove() {
     end();
     
@@ -1029,13 +919,10 @@ void dDemo_c::remove() {
     }
 }
 
-/* 80039AAC-80039B0C 0343EC 0060+00 1/0 0/0 0/0 .text            __dt__14dDemo_system_cFv */
 dDemo_system_c::~dDemo_system_c() {}
 
-/* 80039B0C-80039B6C 03444C 0060+00 1/0 0/0 0/0 .text            __dt__17jmessage_tControlFv */
 jmessage_tControl::~jmessage_tControl() {}
 
-/* 80039B6C-80039CF8 0344AC 018C+00 1/1 1/1 0/0 .text            start__7dDemo_cFPCUcP4cXyzf */
 int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) {
     JUT_ASSERT(0, m_system != NULL);
 
@@ -1073,7 +960,6 @@ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) {
     return 1;
 }
 
-/* 80039CF8-80039D4C 034638 0054+00 1/1 2/2 0/0 .text            end__7dDemo_cFv */
 void dDemo_c::end() {
     JUT_ASSERT(0, m_system != NULL);
 
@@ -1083,7 +969,6 @@ void dDemo_c::end() {
     m_mode = 0;
 }
 
-/* 80039D4C-80039DA4 03468C 0058+00 1/1 0/0 0/0 .text            branch__7dDemo_cFv */
 void dDemo_c::branch() {
     JUT_ASSERT(0, m_system != NULL);
 
@@ -1095,7 +980,6 @@ void dDemo_c::branch() {
     JUT_ASSERT(0, rt);
 }
 
-/* 80039DA4-80039EDC 0346E4 0138+00 0/0 1/1 0/0 .text            update__7dDemo_cFv */
 int dDemo_c::update() {
     JUT_ASSERT(0, m_system != NULL);
 
@@ -1146,13 +1030,11 @@ int dDemo_c::update() {
     return 1;
 }
 
-/* 80039EDC-80039EEC 03481C 0010+00 1/1 0/0 0/0 .text            setBranchType__7dDemo_cFUs */
 void dDemo_c::setBranchType(u16 type) {
     m_branchType = type;
     m_branchId = -1;
 }
 
-/* 80039EEC-80039F04 03482C 0018+00 0/0 2/2 0/0 .text            setBranchId__7dDemo_cFUss */
 void dDemo_c::setBranchId(u16 param_0, s16 branchId) {
     if (param_0 != m_branchType) {
         return;
@@ -1161,7 +1043,6 @@ void dDemo_c::setBranchId(u16 param_0, s16 branchId) {
     m_branchId = branchId;
 }
 
-/* 80039F04-80039F1C 034844 0018+00 2/2 0/0 0/0 .text            reset__7dDemo_cFv */
 void dDemo_c::reset() {
     m_frame = 0;
     m_frameNoMsg = 0;
@@ -1169,17 +1050,14 @@ void dDemo_c::reset() {
     m_branchData = NULL;
 }
 
-/* 80039F1C-80039F9C 03485C 0080+00 1/0 0/0 0/0 .text emitter_create__16dDemo_particle_cFUl */
 JPABaseEmitter* dDemo_particle_c::emitter_create(u32 i_id) {
     cXyz pos(0.0f, 0.0f, 0.0f);
     return dComIfGp_particle_set(i_id, &pos, NULL, NULL, 0xFF, NULL,
                                  dComIfGp_roomControl_getStayNo(), NULL, NULL, NULL);
 }
 
-/* 80039F9C-80039FFC 0348DC 0060+00 1/0 0/0 0/0 .text            __dt__16dDemo_particle_cFv */
 dDemo_particle_c::~dDemo_particle_c() {}
 
-/* 80039FFC-8003A05C 03493C 0060+00 1/0 0/0 0/0 .text            __dt__14dDemo_camera_cFv */
 dDemo_camera_c::~dDemo_camera_c() {}
 
 static void dummyString2() {
diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp
index da58107bdb..ddd190f255 100644
--- a/src/d/d_door_param2.cpp
+++ b/src/d/d_door_param2.cpp
@@ -8,103 +8,74 @@
 #include "d/d_door_param2.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 8003A188-8003A194 034AC8 000C+00 0/0 0/0 17/17 .text getKind__13door_param2_cFP10fopAc_ac_c */
 int door_param2_c::getKind(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 0, 5);
 }
 
-/* 8003A194-8003A1A0 034AD4 000C+00 0/0 0/0 2/2 .text getDoorModel__13door_param2_cFP10fopAc_ac_c
- */
 u32 door_param2_c::getDoorModel(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 5, 3);
 }
 
-/* 8003A1A0-8003A1AC 034AE0 000C+00 0/0 0/0 17/17 .text
- * getFrontOption__13door_param2_cFP10fopAc_ac_c                */
 u8 door_param2_c::getFrontOption(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 8, 2);
 }
 
-/* 8003A1AC-8003A1B8 034AEC 000C+00 0/0 0/0 14/14 .text
- * getBackOption__13door_param2_cFP10fopAc_ac_c                 */
 u8 door_param2_c::getBackOption(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 10, 3);
 }
 
-/* 8003A1B8-8003A1C4 034AF8 000C+00 0/0 0/0 19/19 .text getFRoomNo__13door_param2_cFP10fopAc_ac_c
- */
 u8 door_param2_c::getFRoomNo(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 13, 6);
 }
 
-/* 8003A1C4-8003A1D0 034B04 000C+00 0/0 0/0 10/10 .text getBRoomNo__13door_param2_cFP10fopAc_ac_c
- */
 u8 door_param2_c::getBRoomNo(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 19, 6);
 }
 
-/* 8003A1D0-8003A1DC 034B10 000C+00 0/0 0/0 25/25 .text getSwbit__13door_param2_cFP10fopAc_ac_c */
 u8 door_param2_c::getSwbit(fopAc_ac_c* i_actor) {
     return i_actor->home.angle.z & 0xFF;
 }
 
-/* 8003A1DC-8003A1E8 034B1C 000C+00 0/0 0/0 12/12 .text getSwbit2__13door_param2_cFP10fopAc_ac_c
- */
 u8 door_param2_c::getSwbit2(fopAc_ac_c* i_actor) {
     return (i_actor->home.angle.z >> 8) & 0xFF;
 }
 
-/* 8003A1E8-8003A1F4 034B28 000C+00 0/0 0/0 3/3 .text getSwbit3__13door_param2_cFP10fopAc_ac_c */
 u8 door_param2_c::getSwbit3(fopAc_ac_c* i_actor) {
     return (i_actor->home.angle.x >> 8) & 0xFF;
 }
 
-/* 8003A1F4-8003A200 034B34 000C+00 0/0 0/0 4/4 .text isMsgDoor__13door_param2_cFP10fopAc_ac_c */
 int door_param2_c::isMsgDoor(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 31, 1);
 }
 
-/* 8003A200-8003A20C 034B40 000C+00 0/0 0/0 3/3 .text getEventNo__13door_param2_cFP10fopAc_ac_c */
 u8 door_param2_c::getEventNo(fopAc_ac_c* i_actor) {
     return i_actor->home.angle.x & 0xFF;
 }
 
-/* 8003A20C-8003A218 034B4C 000C+00 0/0 0/0 2/2 .text getEventNo2__13door_param2_cFP10fopAc_ac_c
- */
 u8 door_param2_c::getEventNo2(fopAc_ac_c* i_actor) {
     return (i_actor->home.angle.x >> 8) & 0xFF;
 }
 
-/* 8003A218-8003A224 034B58 000C+00 0/0 0/0 2/2 .text getMsgNo__13door_param2_cFP10fopAc_ac_c */
 u16 door_param2_c::getMsgNo(fopAc_ac_c* i_actor) {
     return i_actor->home.angle.x & 0xFFFF;
 }
 
-/* 8003A224-8003A230 034B64 000C+00 0/0 0/0 6/6 .text getExitNo__13door_param2_cFP10fopAc_ac_c */
 u8 door_param2_c::getExitNo(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 25, 6);
 }
 
-/* 8003A230-8003A23C 034B70 000C+00 0/0 0/0 1/1 .text getFLightInf__13door_param2_cFP10fopAc_ac_c
- */
 u32 door_param2_c::getFLightInf(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 25, 3) & 0xFF;
 }
 
-/* 8003A23C-8003A248 034B7C 000C+00 0/0 0/0 1/1 .text getBLightInf__13door_param2_cFP10fopAc_ac_c
- */
 u32 door_param2_c::getBLightInf(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 28, 3) & 0xFF;
 }
 
-/* 8003A248-8003A254 034B88 000C+00 0/0 0/0 1/1 .text getMFLightInf__13door_param2_cFP10fopAc_ac_c
- */
 u32 door_param2_c::getMFLightInf(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 19, 3) & 0xFF;
 }
 
-/* 8003A254-8003A260 034B94 000C+00 0/0 0/0 1/1 .text getMBLightInf__13door_param2_cFP10fopAc_ac_c
- */
 u32 door_param2_c::getMBLightInf(fopAc_ac_c* i_actor) {
     return fopAcM_GetParamBit(i_actor, 22, 3) & 0xFF;
 }
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 1934a687f1..7a64286c75 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_drawlist
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
@@ -14,14 +9,13 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_drawlist.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
 
 class dDlst_blo_c : public dDlst_base_c {
 public:
-    /* 80053B64 */ virtual void draw();
+    virtual void draw();
     bool create(JKRArchive* param_1, char* param_2) {
         return mScreen.setPriority(param_2,0x20000,param_1) != 0;
     }
@@ -47,7 +41,7 @@ public:
 
 class dDlst_2Dm_c {
 public:
-    /* 8005312C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -71,7 +65,7 @@ public:
 
 class dDlst_2DTri_c {
 public:
-    /* 80051AF0 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -84,7 +78,7 @@ public:
 class dDlst_2DT_c : public dDlst_base_c {
 public:
     dDlst_2DT_c() {}
-    /* 80051F98 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ u8* field_0x4;
     /* 0x08 */ u32 field_0x8;
@@ -104,7 +98,7 @@ public:
 
 class dDlst_2DPoint_c {
 public:
-    /* 80051E5C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -137,7 +131,7 @@ public:
 
 class dDlst_2DMt_c {
 public:
-    /* 8005364C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ u8 field_0x4;
     /* 0x08 */ dDlst_2DMt_tex_c* field_0x8;
@@ -149,7 +143,7 @@ public:
 
 class dDlst_2DM_c {
 public:
-    /* 80052C58 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -174,7 +168,7 @@ public:
 
 class ShdwDrawPoly_c : public cBgS_ShdwDraw {
 public:
-    /* 80054A6C */ virtual ~ShdwDrawPoly_c() {}
+    virtual ~ShdwDrawPoly_c() {}
 
     void setCenter(cXyz* center) { mCenter = center; }
     cXyz* getCenter() { return mCenter; }
@@ -188,7 +182,6 @@ public:
     /* 0x3c */ dDlst_shadowPoly_c* mPoly;
 };
 
-/* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */
 void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) {
     mViewport.x_orig = xOrig;
     mViewport.y_orig = yOrig;
@@ -198,8 +191,6 @@ void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f3
     mViewport.far_z = farZ;
 }
 
-/* 80051ADC-80051AF0 04C41C 0014+00 0/0 4/4 0/0 .text            setScissor__14dDlst_window_cFffff
- */
 void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
     mViewport.scissor.x_orig = xOrig;
     mViewport.scissor.y_orig = yOrig;
@@ -207,7 +198,6 @@ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
     mViewport.scissor.height = height;
 }
 
-/* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text            draw__13dDlst_2DTri_cFv */
 void dDlst_2DTri_c::draw() {
     f32 f4;
     f32 f5;
@@ -244,7 +234,6 @@ void dDlst_2DTri_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051CF0-80051E5C 04C630 016C+00 1/0 0/0 0/0 .text            draw__14dDlst_2DQuad_cFv */
 void dDlst_2DQuad_c::draw() {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -268,7 +257,6 @@ void dDlst_2DQuad_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051E5C-80051F98 04C79C 013C+00 1/0 0/0 0/0 .text            draw__15dDlst_2DPoint_cFv */
 void dDlst_2DPoint_c::draw() {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -290,7 +278,6 @@ void dDlst_2DPoint_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051F98-80052354 04C8D8 03BC+00 1/0 0/0 0/0 .text            draw__11dDlst_2DT_cFv */
 void dDlst_2DT_c::draw() {
     static GXColor l_color = {0xFF, 0xFF, 0xFF, 0xE0};
     f32 var5 = field_0xe;
@@ -349,7 +336,6 @@ void dDlst_2DT_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80052354-80052B00 04CC94 07AC+00 1/0 0/0 0/0 .text            draw__12dDlst_2DT2_cFv */
 void dDlst_2DT2_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA6, 0);
@@ -549,37 +535,32 @@ void dDlst_2DT2_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 803A87C0-803A8800 0058E0 003C+04 0/0 0/0 0/0 .data            l_frontZMat */
-static u8 l_frontZMat[] ALIGN_DECL(32) = {
+static u8 l_frontZMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x40, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8800-803A882C 005920 002A+02 0/0 0/0 0/0 .data            l_frontNoZSubMat */
-static u8 l_frontNoZSubMat[] ALIGN_DECL(32) = {
+static u8 l_frontNoZSubMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x09, 0x35, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A882C-803A88A0 00594C 0060+14 0/1 0/0 0/0 .data            l_shadowVolPos */
 static Vec l_shadowVolPos[] = {
     {-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, -300.0f}, {-1.0f, 1.0f, 0.0f}, {-1.0f, 1.0f, -300.0f},
     {1.0f, -1.0f, 0.0f},  {1.0f, -1.0f, -300.0f},  {1.0f, 1.0f, 0.0f},  {1.0f, 1.0f, -300.0f},
 };
 
-/* 803A88A0-803A88E0 0059C0 003B+05 0/0 0/0 0/0 .data            l_shadowVolDL */
-static u8 l_shadowVolDL[] ALIGN_DECL(32) = {
+static u8 l_shadowVolDL[] ATTRIBUTE_ALIGN(32) = {
     0x80, 0x00, 0x18, 0x06, 0x02, 0x03, 0x07, 0x00, 0x04, 0x05, 0x01, 0x06, 0x04, 0x00, 0x02,
     0x07, 0x05, 0x04, 0x06, 0x03, 0x01, 0x05, 0x07, 0x02, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A88E0-803A8940 005A00 005A+06 1/1 0/0 0/0 .data            l_shadowProjMat */
-static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
+static u8 l_shadowProjMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xE6, 0x70,
     0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x04, 0xAD,
     0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10,
@@ -588,8 +569,7 @@ static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8940-803A89A0 005A60 005A+06 0/0 0/0 0/0 .data            l_shadowVolMat */
-static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
+static u8 l_shadowVolMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, 0x08, 0xFF, 0x90,
     0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x0D, 0x61, 0x41, 0x00, 0x01, 0x35,
     0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
@@ -598,8 +578,7 @@ static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A89A0-803A8A00 005AC0 0055+0B 0/1 0/0 0/0 .data            l_clearMat */
-static u8 l_clearMat[] ALIGN_DECL(32) = {
+static u8 l_clearMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0xA0,
     0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x00, 0x14, 0x61, 0xF3, 0x7F, 0x00, 0x00,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -608,8 +587,7 @@ static u8 l_clearMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A00-803A8A60 005B20 0055+0B 0/1 0/0 0/0 .data            l_frontMat */
-static u8 l_frontMat[] ALIGN_DECL(32) = {
+static u8 l_frontMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0x90,
     0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x01, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -618,15 +596,13 @@ static u8 l_frontMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A60-803A8A9C 005B80 003C+00 0/1 0/0 0/0 .data            l_backSubMat */
-static u8 l_backSubMat[] ALIGN_DECL(32) = {
+static u8 l_backSubMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x41, 0x00, 0x09, 0x35, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A9C-803A8B60 005BBC 00A8+1C 0/1 0/0 0/0 .data            l_simpleShadowPos */
 static Vec l_simpleShadowPos[] = {
     {0.0f, -1.0f, 0.0f},   {0.0f, 0.0f, 0.0f},   {1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, -1.0f},
     {-1.0f, -1.0f, -1.0f}, {-1.0f, 0.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 0.0f, 1.0f},
@@ -634,8 +610,7 @@ static Vec l_simpleShadowPos[] = {
     {1.0f, 1.0f, 1.0f},    {-1.0f, 1.0f, 1.0f},
 };
 
-/* 803A8B60-803A8BC0 005C80 0058+08 0/1 0/0 0/0 .data            l_shadowVolumeDL */
-static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
+static u8 l_shadowVolumeDL[] ATTRIBUTE_ALIGN(32) = {
     0x98, 0x00, 0x05, 0x03, 0x09, 0x01, 0x07, 0x05, 0x98, 0x00, 0x05, 0x04, 0x06, 0x00, 0x08,
     0x02, 0x98, 0x00, 0x04, 0x04, 0x05, 0x06, 0x07, 0x98, 0x00, 0x04, 0x02, 0x03, 0x04, 0x05,
     0x98, 0x00, 0x04, 0x08, 0x09, 0x02, 0x03, 0x98, 0x00, 0x04, 0x06, 0x07, 0x08, 0x09, 0x98,
@@ -644,8 +619,7 @@ static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8BC0-803A8C20 005CE0 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTexDL */
-static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealTexDL[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
     0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -654,8 +628,7 @@ static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8C20-803A8C80 005D40 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTex2DL */
-static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealTex2DL[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
     0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -664,8 +637,7 @@ static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8C80-803A8D00 005DA0 0069+17 0/1 0/0 0/0 .data            l_shadowSealDL */
-static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealDL[] ATTRIBUTE_ALIGN(32) = {
     0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
     0x00, 0x05, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1,
     0x08, 0xFF, 0xB0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0xED, 0x10, 0x00,
@@ -675,13 +647,10 @@ static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80052B00-80052B4C 04D440 004C+00 1/1 0/0 0/0 .text            __ct__12dDlst_2DT2_cFv */
 dDlst_2DT2_c::dDlst_2DT2_c() {
     field_0x40 = (GXColor){0, 0, 0, 0};
 }
 
-/* 80052B4C-80052C58 04D48C 010C+00 1/1 0/0 0/0 .text init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff
- */
 void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                         u8 param_5, u8 param_6, u8 param_7, f32 i_scaleX, f32 i_scaleY) {
     mDoLib_setResTimgObj(i_timg, &mTexObj, 0, NULL);
@@ -706,7 +675,6 @@ void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3,
     field_0x46 = param_5;
 }
 
-/* 80052C58-8005312C 04D598 04D4+00 1/0 0/0 0/0 .text            draw__11dDlst_2DM_cFv */
 void dDlst_2DM_c::draw() {
     s16 r31 = field_0x22;
     s16 r30 = field_0x24;
@@ -770,7 +738,6 @@ void dDlst_2DM_c::draw() {
 }
 
 
-/* 8005312C-8005364C 04DA6C 0520+00 1/0 0/0 0/0 .text            draw__11dDlst_2Dm_cFv */
 void dDlst_2Dm_c::draw() {
     s16 r31 = field_0x48;
     s16 r30 = field_0x4a;
@@ -837,7 +804,6 @@ void dDlst_2Dm_c::draw() {
 }
 
 
-/* 8005364C-800539DC 04DF8C 0390+00 1/0 0/0 0/0 .text            draw__12dDlst_2DMt_cFv */
 void dDlst_2DMt_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
     GXClearVtxDesc();
@@ -914,8 +880,6 @@ JUTTexture* dummy_getTexture(J2DPicture* picture) {
     return picture->getTexture(0);
 }
 
-/* 80053A00-80053A9C 04E340 009C+00 0/0 1/1 0/0 .text            __ct__10dDlst_2D_cFP7ResTIMGssssUc
- */
 dDlst_2D_c::dDlst_2D_c(ResTIMG* i_timg, s16 i_posX, s16 i_posY, s16 i_sizeX, s16 i_sizeY,
                        u8 i_alpha) {
     mpPicture.initiate(i_timg, NULL);
@@ -926,13 +890,11 @@ dDlst_2D_c::dDlst_2D_c(ResTIMG* i_timg, s16 i_posX, s16 i_posY, s16 i_sizeX, s16
     mAlpha = i_alpha;
 }
 
-/* 80053A9C-80053B64 04E3DC 00C8+00 1/0 0/0 0/0 .text            draw__10dDlst_2D_cFv */
 void dDlst_2D_c::draw() {
     mpPicture.setAlpha(mAlpha);
     mpPicture.draw(mPosX, mPosY, mSizeX, mSizeY, false, false, false);
 }
 
-/* 80053B64-80053BA0 04E4A4 003C+00 1/0 0/0 0/0 .text            draw__11dDlst_blo_cFv */
 void dDlst_blo_c::draw() {
     mScreen.draw(field_0x120, field_0x124, dComIfGp_getCurrentGrafPort());
 }
@@ -952,14 +914,12 @@ static void dummy_misc() {
     screen->clearAnmTransform();
 }
 
-/* 80053CDC-80053CEC 04E61C 0010+00 0/0 2/2 0/0 .text            init__8cM_rnd_cFiii */
 void cM_rnd_c::init(int s0, int s1, int s2) {
     seed0 = s0;
     seed1 = s1;
     seed2 = s2;
 }
 
-/* 80053CEC-80053DE0 04E62C 00F4+00 2/2 0/0 0/0 .text            get__8cM_rnd_cFv */
 f32 cM_rnd_c::get() {
     seed0 = seed0 * 171 % 30269;
     seed1 = seed1 * 172 % 30307;
@@ -969,22 +929,18 @@ f32 cM_rnd_c::get() {
     return fabsf(fmodf(newSeed, 1.0));
 }
 
-/* 80053DE0-80053E18 04E720 0038+00 1/1 0/0 0/0 .text            getF__8cM_rnd_cFf */
 f32 cM_rnd_c::getF(f32 param_0) {
     return get() * param_0;
 }
 
-/* 80053E18-80053E60 04E758 0048+00 1/1 0/0 0/0 .text            getFX__8cM_rnd_cFf */
 f32 cM_rnd_c::getFX(f32 param_0) {
     return ((get() - 0.5f) * param_0) * 2.0f;
 }
 
-/* 80053E60-80053E9C 04E7A0 003C+00 1/1 0/0 0/0 .text            getValue__8cM_rnd_cFff */
 f32 cM_rnd_c::getValue(f32 param_0, f32 param_1) {
     return param_0 + getF(param_1);
 }
 
-/* 80053E9C-800541F4 04E7DC 0358+00 1/0 0/0 0/0 .text            draw__18dDlst_effectLine_cFv */
 void dDlst_effectLine_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
@@ -1030,8 +986,6 @@ void dDlst_effectLine_c::draw() {
     }
 }
 
-/* 800541F4-80054288 04EB34 0094+00 0/0 1/1 0/0 .text
- * update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff    */
 void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_2, u16 param_3,
                                 u16 param_4, u16 param_5, f32 param_6, f32 param_7, f32 param_8,
                                 f32 param_9) {
@@ -1049,8 +1003,6 @@ void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_
     dComIfGd_set2DOpa(this);
 }
 
-/* 80054288-800543B4 04EBC8 012C+00 1/1 0/0 0/0 .text
- * set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla      */
 int dDlst_shadowPoly_c::set(cBgD_Vtx_t* i_vtx, u16 param_1, u16 param_2, u16 param_3,
                             cM3dGPla* i_plane) {
     if (mCount >= getTriMax()) {
@@ -1076,7 +1028,6 @@ int dDlst_shadowPoly_c::set(cBgD_Vtx_t* i_vtx, u16 param_1, u16 param_2, u16 par
 }
 
 
-/* 800543B4-80054478 04ECF4 00C4+00 1/1 0/0 0/0 .text            draw__18dDlst_shadowPoly_cFv */
 void dDlst_shadowPoly_c::draw() {
     dDlst_shadowTri_c* tri = getTri();
 
@@ -1091,7 +1042,6 @@ void dDlst_shadowPoly_c::draw() {
     GXEnd();
 }
 
-/* 80054478-800544F0 04EDB8 0078+00 1/1 0/0 0/0 .text            J3DDrawBuffer__create__FUl */
 static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
     J3DDrawBuffer* buffer = new J3DDrawBuffer();
 
@@ -1105,13 +1055,11 @@ static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
     return NULL;
 }
 
-/* 800544F0-80054500 04EE30 0010+00 2/2 0/0 0/0 .text            reset__18dDlst_shadowReal_cFv */
 void dDlst_shadowReal_c::reset() {
     mState = 0;
     mModelNum = 0;
 }
 
-/* 80054500-800545D4 04EE40 00D4+00 1/1 0/0 0/0 .text imageDraw__18dDlst_shadowReal_cFPA4_f */
 void dDlst_shadowReal_c::imageDraw(Mtx param_0) {
     GXSetProjection(mRenderProjMtx, GX_ORTHOGRAPHIC);
     JUT_ASSERT(1916, mModelNum);
@@ -1136,7 +1084,6 @@ void dDlst_shadowReal_c::imageDraw(Mtx param_0) {
     }
 }
 
-/* 800545D4-80054688 04EF14 00B4+00 1/1 0/0 0/0 .text            draw__18dDlst_shadowReal_cFv */
 void dDlst_shadowReal_c::draw() {
     static GXColor l_color = {0, 0, 0, 64};
     l_color.a = field_0x1;
@@ -1152,8 +1099,6 @@ void dDlst_shadowReal_c::draw() {
     mShadowRealPoly.draw();
 }
 
-/* 80054688-80054854 04EFC8 01CC+00 1/1 0/0 0/0 .text
- * psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla */
 static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int param_2,
                                int param_3, int param_4, cM3dGPla* param_5) {
     ShdwDrawPoly_c* shdwDrawPoly = (ShdwDrawPoly_c*)param_0;
@@ -1181,8 +1126,6 @@ static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int para
     return 1;
 }
 
-/* 80054854-80054A6C 04F194 0218+00 1/1 0/0 0/0 .text
- * realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c       */
 static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                  dDlst_shadowPoly_c* param_4) {
     ShdwDrawPoly_c shdwDrawPoly;
@@ -1227,8 +1170,6 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
     return TRUE;
 }
 
-/* 80054ACC-80054BD0 04F40C 0104+00 2/2 0/0 0/0 .text            setkankyoShadow__FP12dKy_tevstr_cPf
- */
 static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -1260,8 +1201,6 @@ static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
     }
 }
 
-/* 80054BD0-80055028 04F510 0458+00 1/1 0/0 0/0 .text
- * setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c */
 u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 param_2, f32 param_3,
                                             f32 param_4, dKy_tevstr_c* param_5) {
     mShadowRealPoly.reset();
@@ -1319,8 +1258,6 @@ u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 param_
 }
 
 
-/* 80055028-800551D4 04F968 01AC+00 1/1 0/0 0/0 .text
- * set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff */
 u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 param_3, f32 param_4,
                             dKy_tevstr_c* param_5, f32 i_cameraZ, f32 param_7) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
@@ -1360,7 +1297,6 @@ u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 par
     return mKey;
 }
 
-/* 800551D4-8005520C 04FB14 0038+00 1/1 0/0 0/0 .text add__18dDlst_shadowReal_cFP8J3DModel */
 bool dDlst_shadowReal_c::add(J3DModel* i_model) {
     u8 cur_model_num = mModelNum;
 
@@ -1373,7 +1309,6 @@ bool dDlst_shadowReal_c::add(J3DModel* i_model) {
     return true;
 }
 
-/* 8005520C-800553EC 04FB4C 01E0+00 1/1 0/0 0/0 .text            draw__20dDlst_shadowSimple_cFv */
 void dDlst_shadowSimple_c::draw() {
     static GXColor l_color = {0, 0, 0, 64};
     l_color.a = mAlpha;
@@ -1417,8 +1352,6 @@ void dDlst_shadowSimple_c::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
 }
 
-/* 800553EC-80055684 04FD2C 0298+00 1/1 0/0 0/0 .text
- * set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj      */
 void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                    s16 param_4, f32 param_5, _GXTexObj* param_6) {
     if (param_5 < 0.0f) {
@@ -1471,7 +1404,6 @@ void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* pa
     mpTexObj = param_6;
 }
 
-/* 80055684-80055768 04FFC4 00E4+00 1/1 0/0 0/0 .text            init__21dDlst_shadowControl_cFv */
 void dDlst_shadowControl_c::init() {
     static u16 l_realImageSize[2] = {192, 64};
     for (int i = 0; i < 2; i++) {
@@ -1487,7 +1419,6 @@ void dDlst_shadowControl_c::init() {
 }
 
 
-/* 80055768-800557C8 0500A8 0060+00 1/1 0/0 0/0 .text            reset__21dDlst_shadowControl_cFv */
 void dDlst_shadowControl_c::reset() {
     dDlst_shadowReal_c* shadowReal = mReal;
 
@@ -1501,9 +1432,8 @@ void dDlst_shadowControl_c::reset() {
     field_0x4 = NULL;
 }
 
-/* 800557C8-80055A14 050108 024C+00 0/0 1/1 0/0 .text imageDraw__21dDlst_shadowControl_cFPA4_f */
 void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
-    static u8 l_matDL[] ALIGN_DECL(32) = {
+    static u8 l_matDL[] ATTRIBUTE_ALIGN(32) = {
         0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10,
         0x00, 0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xF2,
         0x61, 0xC1, 0x08, 0xFF, 0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00,
@@ -1571,8 +1501,6 @@ void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
     GXSetDither(GX_TRUE);
 }
 
-/* 80055A14-80055C74 050354 0260+00 0/0 1/1 0/0 .text            draw__21dDlst_shadowControl_cFPA4_f
- */
 void dDlst_shadowControl_c::draw(Mtx param_0) {
     static GXTevColorChan l_tevColorChan[4] = {
         GX_CH_RED,
@@ -1633,8 +1561,6 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
     GXSetAlphaUpdate(GX_DISABLE);
 }
 
-/* 80055C74-80055F1C 0505B4 02A8+00 0/0 1/1 1/1 .text
- * setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */
 int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, cXyz* param_4,
                                        f32 param_5, f32 param_6, dKy_tevstr_c* param_7) {
     static Mtx mtx_adj = {
@@ -1733,8 +1659,6 @@ int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, c
     return rv;
 }
 
-/* 80055F1C-80055F84 05085C 0068+00 0/0 1/1 45/45 .text
- * addReal__21dDlst_shadowControl_cFUlP8J3DModel                */
 bool dDlst_shadowControl_c::addReal(u32 i_key, J3DModel* param_1) {
     if (i_key == 0) {
         return false;
@@ -1749,8 +1673,6 @@ bool dDlst_shadowControl_c::addReal(u32 i_key, J3DModel* param_1) {
     return false;
 }
 
-/* 80055F84-80055FE8 0508C4 0064+00 0/0 1/1 10/10 .text
- * setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj */
 int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                      s16 param_4, f32 param_5, GXTexObj* param_6) {
     if (param_3 == NULL || mSimpleNum >= 128) {
@@ -1762,16 +1684,12 @@ int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cX
     return 1;
 }
 
-/* 804248D0-804248F0 0515F0 0020+00 1/1 6/6 173/173 .bss mSimpleTexObj__21dDlst_shadowControl_c */
 GXTexObj dDlst_shadowControl_c::mSimpleTexObj;
 
-/* 80055FE8-80056018 050928 0030+00 0/0 1/1 0/0 .text
- * setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG             */
 void dDlst_shadowControl_c::setSimpleTex(ResTIMG const* i_timg) {
     mDoLib_setResTimgObj(i_timg, &mSimpleTexObj, 0, NULL);
 }
 
-/* 80056018-80056080 050958 0068+00 0/0 3/3 9/9 .text            newData__13dDlst_peekZ_cFssPUl */
 int dDlst_peekZ_c::newData(s16 x, s16 y, u32* dst) {
     if (mCount >= 64 || x < 0 || x > 607 || y < 0 || y > 447) {
         return 0;
@@ -1785,7 +1703,6 @@ int dDlst_peekZ_c::newData(s16 x, s16 y, u32* dst) {
     return 1;
 }
 
-/* 80056080-800560F0 0509C0 0070+00 0/0 1/1 0/0 .text            peekData__13dDlst_peekZ_cFv */
 void dDlst_peekZ_c::peekData() {
     dDlst_peekZ_entry* entry = mEntries;
 
@@ -1797,7 +1714,6 @@ void dDlst_peekZ_c::peekData() {
     mCount = 0;
 }
 
-/* 800560F0-800561C8 050A30 00D8+00 0/0 1/1 0/0 .text            __ct__12dDlst_list_cFv */
 dDlst_list_c::dDlst_list_c() {
     mpCopy2DEnd = &mpCopy2DDrawLists[4];
     mp2DOpaTopEnd = &mp2DOpaTopDrawLists[16];
@@ -1811,27 +1727,21 @@ dDlst_list_c::dDlst_list_c() {
     }
 }
 
-/* 8005638C-80056390 050CCC 0004+00 1/1 0/0 0/0 .text            __ct__20dDlst_shadowSimple_cFv */
 dDlst_shadowSimple_c::dDlst_shadowSimple_c() {}
 
-/* ############################################################################################## */
-/* 8037A178-8037A1A4 0067D8 002A+02 1/1 0/0 0/0 .rodata          l_drawlistSize$5656 */
 static u16 const l_drawlistSize[21] = {
     0x0001, 0x0001, 0x0001, 0x0080, 0x0001, 0x0001, 0x0001, 0x0080, 0x0100, 0x0001, 0x0100,
     0x0001, 0x0020, 0x0010, 0x0010, 0x0020, 0x0020, 0x0100, 0x0001, 0x0004, 0x0004,
 };
 
-/* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata          l_nonSortId$5662 */
 static u8 const l_nonSortId[9] = {
     0x00, 0x01, 0x02, 0x04, 0x05, 0x06, 0x09, 0x12, 0x0D,
 };
 
-/* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2          l_zSortId$5668 */
 static const u8 l_zSortId[6] = {
     0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x11,
 };
 
-/* 80056390-8005648C 050CD0 00FC+00 0/0 1/1 0/0 .text            init__12dDlst_list_cFv */
 void dDlst_list_c::init() {
     J3DDrawBuffer** var_r30 = mDrawBuffers;
     const u16* var_r29 = l_drawlistSize;
@@ -1861,7 +1771,6 @@ void dDlst_list_c::init() {
     mShadowControl.init();
 }
 
-/* 8005648C-80056538 050DCC 00AC+00 0/0 1/1 0/0 .text            __dt__12dDlst_list_cFv */
 dDlst_list_c::~dDlst_list_c() {
     J3DDrawBuffer** buffer = mDrawBuffers;
     for (int i = 0; i < 21; i++) {
@@ -1872,7 +1781,6 @@ dDlst_list_c::~dDlst_list_c() {
     }
 }
 
-/* 80056538-800565EC 050E78 00B4+00 0/0 1/1 0/0 .text            reset__12dDlst_list_cFv */
 void dDlst_list_c::reset() {
     J3DDrawBuffer** buffer = mDrawBuffers;
     for (int i = 0; i < 21; i++) {
@@ -1896,8 +1804,6 @@ void dDlst_list_c::reset() {
     }
 }
 
-/* 800565EC-800566D4 050F2C 00E8+00 0/0 2/2 0/0 .text
- * entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz */
 void dDlst_list_c::entryZSortXluDrawList(J3DDrawBuffer* param_0, J3DPacket* param_1,
                                          cXyz& param_2) {
     f32 z_value = -J3DCalcZValue(j3dSys.getViewMtx(), param_2);
@@ -1921,36 +1827,26 @@ void dDlst_list_c::entryZSortXluDrawList(J3DDrawBuffer* param_0, J3DPacket* para
 }
 
 
-/* 800566D4-80056710 051014 003C+00 1/1 1/1 0/0 .text
- * drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer             */
 void dDlst_list_c::drawOpaDrawList(J3DDrawBuffer* pDrawBuf) {
     J3DShape::resetVcdVatCache();
     j3dSys.setDrawModeOpaTexEdge();
     pDrawBuf->draw();
 }
 
-/* 80056710-8005674C 051050 003C+00 1/1 1/1 0/0 .text
- * drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer             */
 void dDlst_list_c::drawXluDrawList(J3DDrawBuffer* pDrawBuf) {
     J3DShape::resetVcdVatCache();
     j3dSys.setDrawModeXlu();
     pDrawBuf->draw();
 }
 
-/* 8005674C-80056770 05108C 0024+00 0/0 1/1 0/0 .text            drawOpaListItem3d__12dDlst_list_cFv
- */
 void dDlst_list_c::drawOpaListItem3d() {
     drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_ITEM3D]);
 }
 
-/* 80056770-80056794 0510B0 0024+00 0/0 1/1 0/0 .text            drawXluListItem3d__12dDlst_list_cFv
- */
 void dDlst_list_c::drawXluListItem3d() {
     drawXluDrawList(mDrawBuffers[DB_XLU_LIST_ITEM3D]);
 }
 
-/* 80056794-800567C4 0510D4 0030+00 2/2 35/35 6/6 .text
- * set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c */
 int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base_c* p_newDlst) {
     if (p_start >= p_end) {
         return 0;
@@ -1960,8 +1856,6 @@ int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base
     return 1;
 }
 
-/* 800567C4-8005681C 051104 0058+00 0/0 1/1 0/0 .text
- * draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c        */
 void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     for (; p_start < p_end; p_start++) {
         dDlst_base_c* dlst = *p_start;
@@ -1969,23 +1863,16 @@ void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     }
 }
 
-/* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss             mWipeDlst__12dDlst_list_c */
 dDlst_2DT2_c dDlst_list_c::mWipeDlst;
 
-/* 8045065C-80450660 0000DC 0004+00 1/1 0/0 0/0 .sdata           mWipeColor__12dDlst_list_c */
 GXColor dDlst_list_c::mWipeColor = {0, 0, 0, 0};
 
-/* 80450ED0-80450ED4 0003D0 0004+00 2/2 1/1 0/0 .sbss            None */
 u8 dDlst_list_c::mWipe;
 
-/* 80450ED4-80450ED8 0003D4 0004+00 2/2 1/1 0/0 .sbss            mWipeRate__12dDlst_list_c */
 f32 dDlst_list_c::mWipeRate;
 
-/* 80450ED8-80450EE0 0003D8 0004+04 2/2 0/0 0/0 .sbss            mWipeSpeed__12dDlst_list_c */
 f32 dDlst_list_c::mWipeSpeed;
 
-/* 8005681C-800568D8 05115C 00BC+00 1/1 0/0 0/0 .text            wipeIn__12dDlst_list_cFfR8_GXColor
- */
 void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
     mWipe = true;
     mWipeSpeed = i_wipeSpeed;
@@ -2000,12 +1887,10 @@ void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
 }
 
 
-/* 800568D8-80056900 051218 0028+00 0/0 1/1 0/0 .text            wipeIn__12dDlst_list_cFf */
 void dDlst_list_c::wipeIn(f32 i_wipeSpeed) {
     wipeIn(-i_wipeSpeed, g_blackColor);
 }
 
-/* 80056900-800569A0 051240 00A0+00 0/0 1/1 0/0 .text            calcWipe__12dDlst_list_cFv */
 void dDlst_list_c::calcWipe() {
     if (mWipe) {
         mWipeRate += mWipeSpeed;
diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp
index b6f455ec3d..def0edfd65 100644
--- a/src/d/d_envse.cpp
+++ b/src/d/d_envse.cpp
@@ -11,13 +11,10 @@
 #include "f_op/f_op_camera_mng.h"
 #include "string.h"
 
-/* 80182DD4-80182DDC 17D714 0008+00 1/0 0/0 0/0 .text            dEnvSe_Draw__FP8dEnvSe_c */
 static int dEnvSe_Draw(dEnvSe_c* i_this) {
     return 1;
 }
 
-/* 80182DDC-80182FD8 17D71C 01FC+00 1/1 0/0 0/0 .text dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath
- */
 static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
     int var_r31 = 0;
     BOOL sp10[2] = {0, 0};
@@ -69,8 +66,6 @@ static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
     }
 }
 
-/* 80182FD8-80183480 17D918 04A8+00 1/1 0/0 0/0 .text
- * execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc         */
 int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 param_2) {
     int roomNo = dComIfGp_roomControl_getStayNo();
     int path_roomNo = dComIfGp_roomControl_getStayNo();
@@ -190,7 +185,6 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par
     return 1;
 }
 
-/* 80183480-801835A0 17DDC0 0120+00 1/1 0/0 0/0 .text            execute__8dEnvSe_cFv */
 int dEnvSe_c::execute() {
     int roomNo = dComIfGp_roomControl_getStayNo();
     dStage_roomDt_c* roomDt_p = dComIfGp_roomControl_getStatusRoomDt(roomNo);
@@ -213,22 +207,18 @@ int dEnvSe_c::execute() {
     return execute_common(dComIfGp_getStage()->getSoundInf(), &field_0xff, 0);
 }
 
-/* 801835A0-801835C0 17DEE0 0020+00 1/0 0/0 0/0 .text            dEnvSe_Execute__FP8dEnvSe_c */
 static int dEnvSe_Execute(dEnvSe_c* i_this) {
     return i_this->execute();
 }
 
-/* 801835C0-801835C8 17DF00 0008+00 1/0 0/0 0/0 .text            dEnvSe_IsDelete__FP8dEnvSe_c */
 static int dEnvSe_IsDelete(dEnvSe_c* i_this) {
     return 1;
 }
 
-/* 801835C8-801835D0 17DF08 0008+00 1/0 0/0 0/0 .text            dEnvSe_Delete__FP8dEnvSe_c */
 static int dEnvSe_Delete(dEnvSe_c* i_this) {
     return 1;
 }
 
-/* 801835D0-801835F8 17DF10 0028+00 1/0 0/0 0/0 .text            dEnvSe_Create__FP8dEnvSe_c */
 static int dEnvSe_Create(dEnvSe_c* i_this) {
     i_this->field_0xfc = 0;
     i_this->field_0xfd = 0;
@@ -240,14 +230,12 @@ static int dEnvSe_Create(dEnvSe_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 803BA808-803BA81C -00001 0014+00 1/0 0/0 0/0 .data            l_dEnvSe_Method */
 static leafdraw_method_class l_dEnvSe_Method = {
     (process_method_func)dEnvSe_Create,  (process_method_func)dEnvSe_Delete,
     (process_method_func)dEnvSe_Execute, (process_method_func)dEnvSe_IsDelete,
     (process_method_func)dEnvSe_Draw,
 };
 
-/* 803BA81C-803BA848 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_ENVSE */
 extern kankyo_process_profile_definition g_profile_ENVSE = {
     fpcLy_CURRENT_e,
     2,
diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp
index ed314e1247..13302cafd0 100644
--- a/src/d/d_error_msg.cpp
+++ b/src/d/d_error_msg.cpp
@@ -48,7 +48,6 @@ struct BMG_INF1 : JUTDataBlockHeader {
 #define CHAR_SPACE  1.0f
 #endif
 
-/* 8009CB88-8009D194 0974C8 060C+00 1/1 0/0 0/0 .text            messageSet__FUlb */
 static void messageSet(u32 status, bool i_drawBg) {
     BMG_INF1* inf1;
     const char* msg_p;
@@ -180,7 +179,6 @@ static void messageSet(u32 status, bool i_drawBg) {
     #endif
 }
 
-/* 8009D194-8009D354 097AD4 01C0+00 1/1 0/0 0/0 .text            draw__14dDvdErrorMsg_cFl */
 void dDvdErrorMsg_c::draw(s32 status) {
     JUtility::TColor backColor = g_clearColor;
     JFWDisplay::getManager()->setClearColor(backColor);
@@ -211,7 +209,6 @@ void dDvdErrorMsg_c::draw(s32 status) {
     JFWDisplay::getManager()->resetFader();
 }
 
-/* 8009D354-8009D410 097C94 00BC+00 0/0 1/1 0/0 .text            execute__14dDvdErrorMsg_cFv */
 u8 dDvdErrorMsg_c::execute() {
     static u8 l_dvdError;
 
@@ -239,7 +236,6 @@ u8 dDvdErrorMsg_c::execute() {
 
 static u8 l_captureAlpha = 0xFF;
 
-/* 8009D410-8009D790 097D50 0380+00 1/1 0/0 0/0 .text            drawCapture__FUc */
 static void drawCapture(u8 alpha) {
     static bool l_texCopied = false;
 
@@ -296,7 +292,6 @@ static void drawCapture(u8 alpha) {
     JFWDisplay::getManager()->resetFader();
 }
 
-/* 8009D790-8009D87C 0980D0 00EC+00 0/0 1/1 0/0 .text            execute__19dShutdownErrorMsg_cFv */
 bool dShutdownErrorMsg_c::execute() {
     if (!mDoRst::isShutdown() && !mDoRst::isReturnToMenu()) {
         return false;
diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp
index eecbadc672..3d73e1ef2e 100644
--- a/src/d/d_ev_camera.cpp
+++ b/src/d/d_ev_camera.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_ev_camera
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_ev_camera.h"
@@ -32,7 +27,6 @@ namespace {
     }
 } // namespace
 
-/* 80088A7C-80088BBC 0833BC 0140+00 0/0 15/15 2/2 .text            StartEventCamera__9dCamera_cFiie */
 int dCamera_c::StartEventCamera(int param_0, int param_1, ...) {
     if (chkFlag(0x20000000)) {
         return 0;
@@ -62,7 +56,6 @@ int dCamera_c::StartEventCamera(int param_0, int param_1, ...) {
     return 1;
 }
 
-/* 80088BBC-80088C24 0834FC 0068+00 0/0 3/3 4/4 .text            EndEventCamera__9dCamera_cFi */
 int dCamera_c::EndEventCamera(int param_1) {
     if (!chkFlag(0x20000000)) {
         return 0;
@@ -82,7 +75,6 @@ int dCamera_c::EndEventCamera(int param_1) {
     return 0;
 }
 
-/* 80088C24-80088CB0 083564 008C+00 10/10 0/0 0/0 .text            searchEventArgData__9dCamera_cFPc */
 int dCamera_c::searchEventArgData(char* i_eventName) {
     int i;
     bool found_event = false;
@@ -101,7 +93,6 @@ int dCamera_c::searchEventArgData(char* i_eventName) {
     return found_event ? i : -1;
 }
 
-/* 80088CB0-80088D90 0835F0 00E0+00 3/3 1/1 0/0 .text            getEvIntData__9dCamera_cFPiPc */
 bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -135,7 +126,6 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event) {
     return 1;
 }
 
-/* 80088D90-80088E58 0836D0 00C8+00 0/0 1/1 0/0 .text            getEvFloatData__9dCamera_cFPfPc */
 bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -165,7 +155,6 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event) {
     return 1;
 }
 
-/* 80088E58-80088F1C 083798 00C4+00 4/4 0/0 0/0 .text getEvFloatListData__9dCamera_cFPPfPc */
 int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
     int num = 0;
 
@@ -198,7 +187,6 @@ int dCamera_c::getEvFloatListData(f32** i_data, char* i_event) {
     return num;
 }
 
-/* 80088F1C-80088FE0 08385C 00C4+00 1/1 0/0 0/0 .text getEvXyzListData__9dCamera_cFPP4cXyzPc */
 int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
     int num = 0;
 
@@ -231,7 +219,6 @@ int dCamera_c::getEvXyzListData(cXyz** i_data, char* i_event) {
     return num;
 }
 
-/* 80088FE0-8008908C 083920 00AC+00 1/1 0/0 0/0 .text            getEvStringPntData__9dCamera_cFPc */
 char* dCamera_c::getEvStringPntData(char* i_event) {
     char* string = NULL;
 
@@ -263,7 +250,6 @@ char* dCamera_c::getEvStringPntData(char* i_event) {
     return string;
 }
 
-/* 8008908C-80089154 0839CC 00C8+00 20/20 5/5 0/0 .text            getEvIntData__9dCamera_cFPiPci */
 bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -293,7 +279,6 @@ bool dCamera_c::getEvIntData(int* i_data, char* i_event, int param_2) {
     return 1;
 }
 
-/* 80089154-8008922C 083A94 00D8+00 11/11 1/1 0/0 .text            getEvFloatData__9dCamera_cFPfPcf */
 bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -322,7 +307,6 @@ bool dCamera_c::getEvFloatData(f32* i_data, char* i_event, f32 param_2) {
     return 1;
 }
 
-/* 8008922C-8008933C 083B6C 0110+00 10/10 0/0 0/0 .text getEvXyzData__9dCamera_cFP4cXyzPc4cXyz */
 bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -351,7 +335,6 @@ bool dCamera_c::getEvXyzData(cXyz* i_data, char* i_event, cXyz param_2) {
     return 1;
 }
 
-/* 8008933C-8008941C 083C7C 00E0+00 7/7 1/1 0/0 .text            getEvStringData__9dCamera_cFPcPcPc */
 bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) {
     if (chkFlag(0x20000000)) {
         int index = searchEventArgData(i_event);
@@ -380,7 +363,6 @@ bool dCamera_c::getEvStringData(char* i_data, char* i_event, char* param_2) {
     return 1;
 }
 
-/* 8008941C-800894C4 083D5C 00A8+00 1/1 0/0 0/0 .text            getEvStringPntData__9dCamera_cFPcPc */
 char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
     char* string = NULL;
 
@@ -412,7 +394,6 @@ char* dCamera_c::getEvStringPntData(char* i_event, char* param_1) {
     return string;
 }
 
-/* 800894C4-800895F4 083E04 0130+00 7/7 1/1 0/0 .text            getEvActor__9dCamera_cFPc */
 fopAc_ac_c* dCamera_c::getEvActor(char* i_event) {
     char* string = getEvStringPntData(i_event);
     if (string == NULL) {
@@ -453,7 +434,6 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event) {
     return actor;
 }
 
-/* 800895F4-80089730 083F34 013C+00 8/8 1/1 0/0 .text            getEvActor__9dCamera_cFPcPc */
 fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
     char string[16];
     string[0] = 0;
@@ -494,7 +474,6 @@ fopAc_ac_c* dCamera_c::getEvActor(char* i_event, char* param_1) {
     return actor;
 }
 
-/* 80089730-800897E8 084070 00B8+00 0/0 3/0 0/0 .text            pauseEvCamera__9dCamera_cFv */
 bool dCamera_c::pauseEvCamera() {
     EventData* event = (EventData*)mWork;
 
@@ -521,7 +500,6 @@ namespace {
     static cXyz WolfAdditionVec(0.0f, -70.0f, 70.0f);
 }
 
-/* 800897E8-8008A510 084128 0D28+00 0/0 1/0 0/0 .text            fixedFrameEvCamera__9dCamera_cFv */
 bool dCamera_c::fixedFrameEvCamera() {
     FixedFrameEvData* fframe_p = (FixedFrameEvData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -656,7 +634,6 @@ bool dCamera_c::fixedFrameEvCamera() {
     return 1;
 }
 
-/* 8008A510-8008A974 084E50 0464+00 0/0 1/0 0/0 .text            stokerEvCamera__9dCamera_cFv */
 bool dCamera_c::stokerEvCamera() {
     StokerData* stoker_p = (StokerData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -726,7 +703,6 @@ bool dCamera_c::stokerEvCamera() {
     return 1;
 }
 
-/* 8008A974-8008B9B0 0852B4 103C+00 0/0 1/0 0/0 .text            rollingEvCamera__9dCamera_cFv */
 bool dCamera_c::rollingEvCamera() {
     struct RollingData* rolling_p = (RollingData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -873,7 +849,6 @@ namespace {
     }
 } // namespace
 
-/* 8008B9B0-8008BE2C 0862F0 047C+00 0/0 1/0 0/0 .text            fixedPositionEvCamera__9dCamera_cFv */
 bool dCamera_c::fixedPositionEvCamera() {
     static cXyz DefaultGap(cXyz::Zero);
     FixedPosData* fpos_p = (FixedPosData*)mWork;
@@ -945,17 +920,14 @@ bool dCamera_c::fixedPositionEvCamera() {
     return rv;
 }
 
-/* 8008BE2C-8008BE50 08676C 0024+00 0/0 1/0 0/0 .text            uniformTransEvCamera__9dCamera_cFv */
 bool dCamera_c::uniformTransEvCamera() {
     transEvCamera(1);
 }
 
-/* 8008BE50-8008BE74 086790 0024+00 0/0 1/0 0/0 .text            uniformBrakeEvCamera__9dCamera_cFv */
 bool dCamera_c::uniformBrakeEvCamera() {
     transEvCamera(2);
 }
 
-/* 8008BE74-8008BE98 0867B4 0024+00 0/0 1/0 0/0 .text            uniformAcceleEvCamera__9dCamera_cFv */
 bool dCamera_c::uniformAcceleEvCamera() {
     transEvCamera(3);
 }
@@ -972,7 +944,6 @@ f32 dummy_lit_3871(int val) {
     return my_vec[val];
 }
 
-/* 8008BE98-8008E750 0867D8 28B8+00 3/3 0/0 0/0 .text            transEvCamera__9dCamera_cFi */
 bool dCamera_c::transEvCamera(int param_1) {
     TransData* trans = (TransData*)mWork;
     f32 mid_val;
@@ -1439,7 +1410,6 @@ bool dCamera_c::transEvCamera(int param_1) {
     return rv;
 }
 
-/* 8008E938-8008FA58 089278 1120+00 0/0 1/0 0/0 .text            watchActorEvCamera__9dCamera_cFv */
 bool dCamera_c::watchActorEvCamera() {
     static cXyz DefaultGap(cXyz::Zero);
 
@@ -1743,7 +1713,6 @@ bool dCamera_c::watchActorEvCamera() {
     return 1;
 }
 
-/* 8008FAE8-80090174 08A428 068C+00 0/0 1/0 0/0 .text            restorePosEvCamera__9dCamera_cFv */
 bool dCamera_c::restorePosEvCamera() {
     static cXyz DefaultGap(cXyz::Zero);
     RestorePosData* restorePos = (RestorePosData*)mWork;
@@ -1855,7 +1824,6 @@ bool dCamera_c::restorePosEvCamera() {
     return 1;
 }
 
-/* 80090174-80090230 08AAB4 00BC+00 0/0 1/0 0/0 .text            talktoEvCamera__9dCamera_cFv */
 bool dCamera_c::talktoEvCamera() {
     fopAc_ac_c* r27 = (fopAc_ac_c*)dComIfGp_event_getPt1();
     s32 style = mCamTypeData[mEventData.field_0xc].field_0x18[mIsWolf][3];
@@ -1878,7 +1846,6 @@ bool dCamera_c::talktoEvCamera() {
     return (this->*engine_tbl[mCamParam.Algorythmn(style)])(style);
 }
 
-/* 80090230-80090478 08AB70 0248+00 0/0 1/0 0/0 .text            maptoolIdEvCamera__9dCamera_cFv */
 bool dCamera_c::maptoolIdEvCamera() {
     if (mCurCamStyleTimer == 0) {
         int id;
@@ -1956,7 +1923,6 @@ bool dCamera_c::maptoolIdEvCamera() {
     return false;
 }
 
-/* 80090478-80090514 08ADB8 009C+00 0/0 1/0 0/0 .text            styleEvCamera__9dCamera_cFv */
 bool dCamera_c::styleEvCamera() {
     if (mCurCamStyleTimer == 0) {
         mEventData.field_0x8 = 0;
@@ -1968,7 +1934,6 @@ bool dCamera_c::styleEvCamera() {
     return isModeOK();
 }
 
-/* 80090514-80091468 08AE54 0F54+00 0/0 1/0 0/0 .text            gameOverEvCamera__9dCamera_cFv */
 bool dCamera_c::gameOverEvCamera() {
     int i;
 
@@ -2309,7 +2274,6 @@ bool dCamera_c::gameOverEvCamera() {
     return 1;
 }
 
-/* 80091468-8009236C 08BDA8 0F04+00 1/0 1/0 0/0 .text            tactEvCamera__9dCamera_cFv */
 bool dCamera_c::tactEvCamera() {
     TactData* tact_p = (TactData*)mWork;
     cXyz sp58[6] = {
@@ -2588,12 +2552,10 @@ bool dCamera_c::tactEvCamera() {
     return 1;
 }
 
-/* 800923B8-800923C0 08CCF8 0008+00 0/0 1/0 0/0 .text            turnToActorEvCamera__9dCamera_cFv */
 bool dCamera_c::turnToActorEvCamera() {
     return true;
 }
 
-/* 800923C0-800924D0 08CD00 0110+00 0/0 1/0 0/0 .text            stbWaitEvCamera__9dCamera_cFv */
 bool dCamera_c::stbWaitEvCamera() {
     dDemo_camera_c* demo_cam = dDemo_c::getCamera();
 #if DEBUG
@@ -2648,7 +2610,6 @@ bool dCamera_c::stbWaitEvCamera() {
     return true;
 }
 
-/* 800924D0-8009258C 08CE10 00BC+00 0/0 1/0 0/0 .text            saveEvCamera__9dCamera_cFv */
 bool dCamera_c::saveEvCamera() {
     int slot;
     getEvIntData(&slot, "Slot", 0);
@@ -2663,7 +2624,6 @@ bool dCamera_c::saveEvCamera() {
     return true;
 }
 
-/* 8009258C-800929AC 08CECC 0420+00 0/0 1/0 0/0 .text            loadEvCamera__9dCamera_cFv */
 bool dCamera_c::loadEvCamera() {
     LoadData* load = (LoadData*)mWork;
     f32 local_58[6] = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f };
@@ -2729,7 +2689,6 @@ bool dCamera_c::loadEvCamera() {
     }
 }
 
-/* 800929AC-800937AC 08D2EC 0E00+00 0/0 1/0 0/0 .text            useItem0EvCamera__9dCamera_cFv */
 bool dCamera_c::useItem0EvCamera() {
     ItemData* item_p = (ItemData*)mWork;
     cXyz vec_1dc(10.0f, -15.0f, 20.0f);
@@ -2998,7 +2957,6 @@ bool dCamera_c::useItem0EvCamera() {
     return ret;
 }
 
-/* 800937AC-80094240 08E0EC 0A94+00 0/0 1/0 0/0 .text            useItem1EvCamera__9dCamera_cFv */
 bool dCamera_c::useItem1EvCamera() {
     ItemData* item_p = (ItemData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -3192,7 +3150,6 @@ bool dCamera_c::useItem1EvCamera() {
     return rv;
 }
 
-/* 80094240-80094A70 08EB80 0830+00 0/0 1/0 0/0 .text            getItemEvCamera__9dCamera_cFv */
 bool dCamera_c::getItemEvCamera() {
     GetItemData* gitem_p = (GetItemData*)mWork;
     cXyz cStack_90[8] = {
@@ -3318,7 +3275,6 @@ namespace {
     }
 }
 
-/* 80094A70-80095010 08F3B0 05A0+00 0/0 1/0 0/0 .text            possessedEvCamera__9dCamera_cFv */
 bool dCamera_c::possessedEvCamera() {
     PossessedData* possessed = (PossessedData*)mWork;
     cXyz vec_d8;
@@ -3417,7 +3373,6 @@ bool dCamera_c::possessedEvCamera() {
     return rv;
 }
 
-/* 80095010-8009544C 08F950 043C+00 0/0 1/0 0/0 .text            fixedFramesEvCamera__9dCamera_cFv */
 bool dCamera_c::fixedFramesEvCamera() {
     int const_1_val = 1;
     FixedFramesData* fframes_p = (FixedFramesData*)mWork;
@@ -3524,7 +3479,6 @@ bool dCamera_c::fixedFramesEvCamera() {
     return 1;
 }
 
-/* 8009544C-800956E4 08FD8C 0298+00 0/0 1/0 0/0 .text            bSplineEvCamera__9dCamera_cFv */
 bool dCamera_c::bSplineEvCamera() {
     BSplineData* bSpline = (BSplineData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -3592,7 +3546,6 @@ bool dCamera_c::bSplineEvCamera() {
     return bSpline->field_0x1c;
 }
 
-/* 800956E4-80095E7C 090024 0798+00 0/0 1/0 0/0 .text            twoActor0EvCamera__9dCamera_cFv */
 bool dCamera_c::twoActor0EvCamera() {
     static cXyz DefaultGap(0.0f, 0.0f, 0.0f);
     TwoActor0Data* twoact0_p = (TwoActor0Data*)mWork;
@@ -3711,7 +3664,6 @@ bool dCamera_c::twoActor0EvCamera() {
     return 1;
 }
 
-/* 80095E7C-80095FD0 0907BC 0154+00 0/0 1/0 0/0 .text            peepHoleEvCamera__9dCamera_cFv */
 bool dCamera_c::peepHoleEvCamera() {
     if (mCurCamStyleTimer == 0) {
         fopAc_ac_c* mPlayer = dComIfGp_getLinkPlayer();
@@ -3736,7 +3688,6 @@ bool dCamera_c::peepHoleEvCamera() {
     return 1;
 }
 
-/* 80095FD0-800965AC 090910 05DC+00 0/0 1/0 0/0 .text            digHoleEvCamera__9dCamera_cFv */
 bool dCamera_c::digHoleEvCamera() {
     DigHoleData* digHole = (DigHoleData*)mWork;
     if (mCurCamStyleTimer == 0) {
@@ -3841,7 +3792,6 @@ bool dCamera_c::digHoleEvCamera() {
     return 1;
 }
 
-/* 800965AC-80096EDC 090EEC 0930+00 0/0 1/0 0/0 .text            hintTalkEvCamera__9dCamera_cFv */
 bool dCamera_c::hintTalkEvCamera() {
     HintTalkData* hintTalk = (HintTalkData*)mWork;
     daAlink_c* link_p = (daAlink_c*)mpPlayerActor;
@@ -3978,7 +3928,6 @@ bool dCamera_c::hintTalkEvCamera() {
     return 1;
 }
 
-/* 80096EDC-80097694 09181C 07B8+00 0/0 1/0 0/0 .text            bspTransEvCamera__9dCamera_cFv */
 bool dCamera_c::bspTransEvCamera() {
     BspTransData* bspTrans = (BspTransData*)mWork;
     f32 local_7c[4] = { 0.0f, 0.0f, 1.0f, 1.0f };
@@ -4138,7 +4087,6 @@ bool dCamera_c::bspTransEvCamera() {
     return 1;
 }
 
-/* 80097694-8009769C 091FD4 0008+00 0/0 1/0 0/0 .text            portalWarpEvCamera__9dCamera_cFv */
 bool dCamera_c::portalWarpEvCamera() {
     return true;
 }
diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp
index f103b04166..458dc0c59f 100644
--- a/src/d/d_event.cpp
+++ b/src/d/d_event.cpp
@@ -12,7 +12,6 @@
 #include "d/d_event_debug.h"
 #include "SSystem/SComponent/c_counter.h"
 
-/* 80041480-80041488 03BDC0 0008+00 1/1 0/0 0/0 .text            event_debug_evnt__21@unnamed@d_event_cpp@Fv */
 namespace {
 static u8 event_debug_evnt() {
 #if DEBUG
@@ -23,7 +22,6 @@ static u8 event_debug_evnt() {
 #endif
 }
 
-/* 80041488-80041580 03BDC8 00F8+00 1/1 0/0 0/0 .text            clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv */
 static void clear_tmpflag_for_message() {
     dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11]);
     dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[12]);
@@ -44,7 +42,6 @@ dEvt_control_c::dEvt_control_c() {
 
 dEvt_order_c::dEvt_order_c() {}
 
-/* 800415D8-80041668 03BF18 0090+00 1/1 0/0 0/0 .text            orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv */
 s32 dEvt_control_c::orderOld(u16 type, u16 prio, u16 flag, u16 hind, void* requestActor,
                              void* targetActor, const void* eventName) {
     #if DEBUG
@@ -60,7 +57,6 @@ s32 dEvt_control_c::orderOld(u16 type, u16 prio, u16 flag, u16 hind, void* reque
     return order(type, prio, flag, hind, requestActor, targetActor, (s16)dComIfGp_getEventManager().getEventIdx((char*)eventName, -1, -1), 0xFF);
 }
 
-/* 80041668-80041804 03BFA8 019C+00 3/3 13/13 0/0 .text          order__14dEvt_control_cFUsUsUsUsPvPvsUc */
 s32 dEvt_control_c::order(u16 type, u16 prio, u16 flag, u16 hind, void* requestActor,
                           void* targetActor, s16 id, u8 mapToolId) {
     if (!(flag & 0x400) && mapToolId != 0xFF) {
@@ -153,8 +149,6 @@ s32 dEvt_control_c::order(u16 type, u16 prio, u16 flag, u16 hind, void* requestA
     return 1;
 }
 
-/* 80041804-80041934 03C144 0130+00 5/5 0/0 0/0 .text setParam__14dEvt_control_cFP12dEvt_order_c
- */
 void dEvt_control_c::setParam(dEvt_order_c* order) {
     setPt1(order->mpRequestActor);
     setPt2(order->mpTargetActor);
@@ -198,8 +192,6 @@ void dEvt_control_c::setParam(dEvt_order_c* order) {
     mEventFlag = 0;
 }
 
-/* 80041934-80041964 03C274 0030+00 2/2 0/0 0/0 .text
- * beforeFlagProc__14dEvt_control_cFP12dEvt_order_c             */
 s32 dEvt_control_c::beforeFlagProc(dEvt_order_c* order) {
     fopAc_ac_c* actor = order->mpTargetActor;
 
@@ -214,16 +206,12 @@ static char const* dummy1() {
     return "？？？";
 }
 
-/* 80041964-800419A8 03C2A4 0044+00 2/2 0/0 0/0 .text
- * afterFlagProc__14dEvt_control_cFP12dEvt_order_c              */
 void dEvt_control_c::afterFlagProc(dEvt_order_c* order) {
     if (order->mFlag & 2) {
         dComIfGp_getEventManager().issueStaff("ALL");
     }
 }
 
-/* 800419A8-80041A20 03C2E8 0078+00 4/4 0/0 0/0 .text
- * commonCheck__14dEvt_control_cFP12dEvt_order_cUsUs            */
 int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command) {
     fopAc_ac_c* actor1 = order->mpRequestActor;
     fopAc_ac_c* actor2 = order->mpTargetActor;
@@ -239,8 +227,6 @@ int dEvt_control_c::commonCheck(dEvt_order_c* order, u16 condition, u16 command)
     return 0;
 }
 
-/* 80041A20-80041B58 03C360 0138+00 1/1 0/0 0/0 .text talkCheck__14dEvt_control_cFP12dEvt_order_c
- */
 int dEvt_control_c::talkCheck(dEvt_order_c* order) {
     char* eventname = "DEFAULT_TALK";
     fopAc_ac_c* actor = order->mpTargetActor;
@@ -286,8 +272,6 @@ int dEvt_control_c::talkCheck(dEvt_order_c* order) {
     return 0;
 }
 
-/* 80041B58-80041C90 03C498 0138+00 1/1 0/0 0/0 .text
- * talkXyCheck__14dEvt_control_cFP12dEvt_order_c                */
 int dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
     const char* eventname = "DEFAULT_TALK_XY";
     fopAc_ac_c* targetActor = order->mpTargetActor;
@@ -351,8 +335,6 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) {
     return 0;
 }
 
-/* 80041C90-80041D34 03C5D0 00A4+00 1/1 0/0 0/0 .text catchCheck__14dEvt_control_cFP12dEvt_order_c
- */
 int dEvt_control_c::catchCheck(dEvt_order_c* order) {
     fopAc_ac_c* actor2 = order->mpTargetActor;
     fopAc_ac_c* actor1 = order->mpRequestActor;
@@ -381,7 +363,6 @@ int dEvt_control_c::catchCheck(dEvt_order_c* order) {
     return 1;
 }
 
-/* 80041D34-80041DDC 03C674 00A8+00 1/1 0/0 0/0 .text            talkEnd__14dEvt_control_cFv */
 int dEvt_control_c::talkEnd() {
     fopAc_ac_c* actor = getPt1();
     if (actor != NULL) {
@@ -406,8 +387,6 @@ int dEvt_control_c::talkEnd() {
     return 1;
 }
 
-/* 80041DDC-80041F18 03C71C 013C+00 1/1 0/0 0/0 .text demoCheck__14dEvt_control_cFP12dEvt_order_c
- */
 int dEvt_control_c::demoCheck(dEvt_order_c* order) {
     fopAc_ac_c* actor1 = order->mpRequestActor;
     fopAc_ac_c* actor2 = order->mpTargetActor;
@@ -454,7 +433,6 @@ int dEvt_control_c::demoCheck(dEvt_order_c* order) {
     return 1;
 }
 
-/* 80041F18-80041FA0 03C858 0088+00 1/1 0/0 0/0 .text            demoEnd__14dEvt_control_cFv */
 int dEvt_control_c::demoEnd() {
     fopAc_ac_c* actor = getPt1();
     if (actor != NULL) {
@@ -509,8 +487,6 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* order) {
     return 1;
 }
 
-/* 80042014-8004212C 03C954 0118+00 1/1 0/0 0/0 .text doorCheck__14dEvt_control_cFP12dEvt_order_c
- */
 int dEvt_control_c::doorCheck(dEvt_order_c* order) {
     // "door demo check start!!"
     OS_REPORT("ドアデモのチェック開始!!\n");
@@ -555,8 +531,6 @@ int dEvt_control_c::doorCheck(dEvt_order_c* order) {
     return 0;
 }
 
-/* 8004212C-800421C0 03CA6C 0094+00 1/1 0/0 0/0 .text itemCheck__14dEvt_control_cFP12dEvt_order_c
- */
 int dEvt_control_c::itemCheck(dEvt_order_c* order) {
     const char* eventname = "DEFAULT_GETITEM";
 
@@ -580,7 +554,6 @@ int dEvt_control_c::itemCheck(dEvt_order_c* order) {
     return 0;
 }
 
-/* 800421C0-80042254 03CB00 0094+00 1/1 0/0 0/0 .text            endProc__14dEvt_control_cFv */
 int dEvt_control_c::endProc() {
     #if DEBUG
     if (event_debug_evnt()) {
@@ -611,7 +584,6 @@ int dEvt_control_c::endProc() {
     return 1;
 }
 
-/* 80042254-800422C0 03CB94 006C+00 1/1 0/0 0/0 .text            change__14dEvt_control_cFv */
 int dEvt_control_c::change() {
     dEvt_order_c* order;
 
@@ -635,7 +607,6 @@ int dEvt_control_c::change() {
     return -1;
 }
 
-/* 800422C0-80042468 03CC00 01A8+00 2/1 0/0 0/0 .text            entry__14dEvt_control_cFv */
 int dEvt_control_c::entry() {
     if (mNum != 0) {
         // "%06d: event: %d event requests!!"
@@ -717,7 +688,6 @@ int dEvt_control_c::entry() {
     return 0;
 }
 
-/* 80042468-80042518 03CDA8 00B0+00 1/1 8/8 388/388 .text            reset__14dEvt_control_cFv */
 void dEvt_control_c::reset() {
     if (field_0xec != 0xFF) {
         fopAc_ac_c* pt1 = getPt1();
@@ -731,7 +701,6 @@ void dEvt_control_c::reset() {
     onEventFlag(8);
 }
 
-/* 80042518-800425B4 03CE58 009C+00 3/3 3/3 46/46 .text            reset__14dEvt_control_cFPv */
 void dEvt_control_c::reset(void* param_0) {
     if (field_0xec != 0xFF) {
         fopAc_ac_c* var_r29 = (fopAc_ac_c*)param_0;
@@ -756,7 +725,6 @@ void dEvt_control_c::clearSkipSystem() {
     mSkipEventName[0] = 0;
 }
 
-/* 800425E8-8004261C 03CF28 0034+00 0/0 2/2 5/5 .text            dEv_defaultSkipProc__FPvi */
 int dEv_defaultSkipProc(void* actor, int parameter) {
     // "%06d: event: skip event!!!"
     OS_REPORT("\x1b[34m%06d: event: スキップ event!!!\n\x1b[m", g_Counter.mCounter0);
@@ -766,7 +734,6 @@ int dEv_defaultSkipProc(void* actor, int parameter) {
     return 1;
 }
 
-/* 8004261C-80042778 03CF5C 015C+00 1/1 1/1 0/0 .text            dEv_defaultSkipZev__FPvi */
 int dEv_defaultSkipZev(void* actor, int parameter) {
     // "%06d: event: skip ZEV event!!!"
     OS_REPORT("\x1b[34m%06d: event: スキップ ZEV event!!!\n\x1b[m", g_Counter.mCounter0);
@@ -816,7 +783,6 @@ int dEv_defaultSkipZev(void* actor, int parameter) {
     }
 }
 
-/* 80042778-800428DC 03D0B8 0164+00 0/0 1/1 0/0 .text            dEv_defaultSkipStb__FPvi */
 int dEv_defaultSkipStb(void* actor, int parameter) {
     OS_REPORT("\x1b[34m%06d: event: スキップ STB event!!!\n\x1b[m", g_Counter.mCounter0);
     dEvt_control_c* event = &dComIfGp_getEvent();
@@ -867,7 +833,6 @@ int dEv_defaultSkipStb(void* actor, int parameter) {
     }
 }
 
-/* 800428DC-8004290C 03D21C 0030+00 0/0 1/1 33/33 .text            dEv_noFinishSkipProc__FPvi */
 int dEv_noFinishSkipProc(void* actor, int parameter) {
     dComIfGp_getEvent().offSkipFade();
     return 0;
@@ -900,7 +865,6 @@ void dEvt_control_c::offSkipFade() {
     mIsSkipFade = FALSE;
 }
 
-/* 800429D4-80042BBC 03D314 01E8+00 1/1 0/0 0/0 .text            skipper__14dEvt_control_cFv */
 bool dEvt_control_c::skipper() {
     bool doSkip = false;
     bool canSkip = false;
@@ -976,7 +940,6 @@ bool dEvt_control_c::skipper() {
     return doSkip;
 }
 
-/* 80042BBC-80042FA8 03D4FC 03EC+00 0/0 1/1 0/0 .text            Step__14dEvt_control_cFv */
 int dEvt_control_c::Step() {
     dEvent_manager_c* evtMng = &dComIfGp_getEventManager();
 
@@ -1167,8 +1130,6 @@ int dEvt_control_c::Step() {
     return 0;
 }
 
-/* 80042FA8-8004316C 03D8E8 01C4+00 0/0 2/2 0/0 .text            moveApproval__14dEvt_control_cFPv
- */
 int dEvt_control_c::moveApproval(void* param_0) {
     fopAc_ac_c* actor = (fopAc_ac_c*)param_0;
     if (fopAcM_CheckStatus(actor, 0x20000)) {
@@ -1237,7 +1198,6 @@ int dEvt_control_c::moveApproval(void* param_0) {
     return 0;
 }
 
-/* 8004316C-800431E8 03DAAC 007C+00 0/0 28/28 0/0 .text compulsory__14dEvt_control_cFPvPCcUs */
 BOOL dEvt_control_c::compulsory(void* param_0, const char* eventName, u16 hind) {
     if (!isOrderOK() || mCompulsory) {
         return 0;
@@ -1271,8 +1231,6 @@ void dEvt_control_c::remove() {
     mRoomNo = -1;
 }
 
-/* 80043278-80043280 03DBB8 0008+00 2/2 2/2 0/0 .text            getStageEventDt__14dEvt_control_cFv
- */
 dStage_MapEvent_dt_c* dEvt_control_c::getStageEventDt() {
     return mStageEventDt;
 }
@@ -1289,13 +1247,10 @@ fpc_ProcID dEvt_control_c::getPId(void* actor) {
     }
 }
 
-/* 800432EC-8004331C 03DC2C 0030+00 7/7 13/13 16/16 .text            convPId__14dEvt_control_cFUi */
 fopAc_ac_c* dEvt_control_c::convPId(fpc_ProcID id) {
     return fopAcM_SearchByID(id);
 }
 
-/* 8004331C-800433F0 03DC5C 00D4+00 0/0 1/1 0/0 .text            getStbDemoData__14dEvt_control_cFPc
- */
 void* dEvt_control_c::getStbDemoData(char* resName) {
     void* res = NULL;
     char* demoArcName = dStage_roomControl_c::getDemoArcName();
@@ -1349,7 +1304,6 @@ dEvt_info_c::dEvt_info_c() {
     mIndex = 0;
 }
 
-/* 80043428-80043480 03DD68 0058+00 0/0 0/0 4/4 .text            setEventName__11dEvt_info_cFPc */
 void dEvt_info_c::setEventName(char* name) {
     if (name == NULL) {
         mEventId = -1;
@@ -1358,7 +1312,6 @@ void dEvt_info_c::setEventName(char* name) {
     }
 }
 
-/* 80043480-800434CC 03DDC0 004C+00 1/1 0/0 0/0 .text            getEventName__11dEvt_info_cFv */
 char* dEvt_info_c::getEventName() {
     if (mEventId == -1) {
         return NULL;
@@ -1376,13 +1329,11 @@ void dEvt_info_c::beforeProc() {
     mCondition = dEvtCnd_CANDEMO_e;
 }
 
-/* 800434D8-80043500 03DE18 0028+00 0/0 4/4 1/1 .text searchMapEventData__14dEvt_control_cFUc */
 dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID) {
     s32 roomNo = dComIfGp_roomControl_getStayNo();
     return searchMapEventData(mapToolID, roomNo);
 }
 
-/* 80043500-8004360C 03DE40 010C+00 3/3 7/7 5/5 .text searchMapEventData__14dEvt_control_cFUcl */
 dStage_MapEvent_dt_c* dEvt_control_c::searchMapEventData(u8 mapToolID, s32 roomNo) {
     int i;
     if (mapToolID == 0xFF) {
diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp
index 365fdc7ae4..1286c63dea 100644
--- a/src/d/d_event_data.cpp
+++ b/src/d/d_event_data.cpp
@@ -29,7 +29,6 @@ struct TelopDataStruct {
     u16 type;
 };
 
-/* 803A7FB0-803A8238 0050D0 0288+00 2/2 0/0 0/0 .data            TelopData */
 static TelopDataStruct TelopData[] = {
     {'D05\0', 1101, 0x1069, 3},
     {'D05A', 1101, 0xFFFF, 0},
@@ -87,10 +86,8 @@ static TelopDataStruct TelopData[] = {
     {'F126', 1141, 0xFFFF, 1},
 };
 
-/* 80450640-80450648 0000C0 0004+04 2/2 0/0 0/0 .sdata           numTelopData */
 static int numTelopData = ARRAY_SIZE(TelopData);
 
-/* 8004372C-800437C4 03E06C 0098+00 2/2 0/0 0/0 .text            getTelopNo__FPCc */
 static u16 getTelopNo(char const* i_name) {
     int i;
     s32 name = ((i_name[3] == 'B' ? 'd' : i_name[0]) << 0x18 | i_name[4] << 0x10 | i_name[5] << 8 | i_name[6]);
@@ -103,12 +100,10 @@ static u16 getTelopNo(char const* i_name) {
     return 0xFFFF;
 }
 
-/* 800437C4-800437F0 03E104 002C+00 1/1 0/0 0/0 .text            getTelopNo__Fv */
 static u16 getTelopNo() {
     return getTelopNo(dComIfGp_getStartStageName());
 }
 
-/* 800437F0-80043A14 03E130 0224+00 1/1 0/0 0/0 .text            getStartTelopNo__Fv */
 static u16 getStartTelopNo() {
     int i;
     const char* startStageName = dComIfGp_getStartStageName();
@@ -186,7 +181,6 @@ s32 event_debug_evdt_sound_adjust() {
 }
 #endif
 
-/* 80043A14-80043D60 03E354 034C+00 1/1 0/0 0/0 .text            dEvDt_Next_Stage__Fii */
 static int dEvDt_Next_Stage(int i_staffId, int i_wipe) {
     char* stage;
     s16 start;
@@ -323,7 +317,6 @@ static int dEvDt_Next_Stage(int i_staffId, int i_wipe) {
     return 1;
 }
 
-/* 80043D60-80043DC8 03E6A0 0068+00 3/3 0/0 0/0 .text            flagCheck__11dEvDtFlag_cFi */
 BOOL dEvDtFlag_c::flagCheck(int flag) {
     if (flagMaxCheck(flag)) {
         return FALSE;
@@ -336,7 +329,6 @@ BOOL dEvDtFlag_c::flagCheck(int flag) {
     }
 }
 
-/* 80043DC8-80043E30 03E708 0068+00 2/2 1/1 0/0 .text            flagSet__11dEvDtFlag_cFi */
 BOOL dEvDtFlag_c::flagSet(int flag) {
     if (flagMaxCheck(flag)) {
         return FALSE;
@@ -367,7 +359,6 @@ void dEvDtFlag_c::init() {
     }
 }
 
-/* 80043E78-80043EFC 03E7B8 0084+00 0/0 1/1 0/0 .text            finishCheck__12dEvDtEvent_cFv */
 int dEvDtEvent_c::finishCheck() {
     int i;
     for (i = 0; i < 3; i++) {
@@ -383,7 +374,6 @@ int dEvDtEvent_c::finishCheck() {
     return 1;
 }
 
-/* 80043EFC-80043F70 03E83C 0074+00 0/0 1/1 0/0 .text            forceFinish__12dEvDtEvent_cFv */
 int dEvDtEvent_c::forceFinish() {
     int i;
     for (i = 0; i < 3; i++) {
@@ -397,8 +387,6 @@ int dEvDtEvent_c::forceFinish() {
     return 1;
 }
 
-/* 80043F70-80043FD8 03E8B0 0068+00 0/0 1/1 0/0 .text
- * specialStaffProc__12dEvDtEvent_cFP12dEvDtStaff_c             */
 void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* i_staffList) {
     int i;
     dEvDtStaff_c* staff;
@@ -409,7 +397,6 @@ void dEvDtEvent_c::specialStaffProc(dEvDtStaff_c* i_staffList) {
     }
 }
 
-/* 80043FD8-8004403C 03E918 0064+00 4/4 0/0 0/0 .text specialProc_WaitStart__12dEvDtStaff_cFi */
 void dEvDtStaff_c::specialProc_WaitStart(int i_staffId) {
     int* idata = dComIfGp_evmng_getMyIntegerP(i_staffId, "Timer");
     if (idata == NULL) {
@@ -419,7 +406,6 @@ void dEvDtStaff_c::specialProc_WaitStart(int i_staffId) {
     }
 }
 
-/* 8004403C-80044080 03E97C 0044+00 4/4 0/0 0/0 .text specialProc_WaitProc__12dEvDtStaff_cFi */
 void dEvDtStaff_c::specialProc_WaitProc(int i_staffId) {
     if (mWaitTimer > 0) {
         mWaitTimer--;
@@ -428,7 +414,6 @@ void dEvDtStaff_c::specialProc_WaitProc(int i_staffId) {
     }
 }
 
-/* 80044080-80044134 03E9C0 00B4+00 2/1 0/0 0/0 .text            specialProc__12dEvDtStaff_cFv */
 void dEvDtStaff_c::specialProc() {
     switch (mType) {
     case TYPE_PACKAGE:
@@ -462,7 +447,6 @@ void dEvDtStaff_c::specialProc() {
     }
 }
 
-/* 80044134-80044170 03EA74 003C+00 0/0 1/1 0/0 .text            init__12dEvDtStaff_cFv */
 void dEvDtStaff_c::init() {
     mCurrentCut = mStartCut;
     field_0x40 = true;
@@ -484,7 +468,6 @@ void dEvDtStaff_c::init() {
     }
 }
 
-/* 80044170-80044190 03EAB0 0020+00 1/1 0/0 0/0 .text            advanceCut__12dEvDtStaff_cFi */
 void dEvDtStaff_c::advanceCut(int i_cut) {
     mCurrentCut = i_cut;
     field_0x40 = true;
@@ -492,8 +475,6 @@ void dEvDtStaff_c::advanceCut(int i_cut) {
     field_0x3c = -1;
 }
 
-/* 80044190-80044324 03EAD0 0194+00 1/1 0/0 0/0 .text            specialProcLight__12dEvDtStaff_cFv
- */
 void dEvDtStaff_c::specialProcLight() {
     u8* data = mData;
 
@@ -543,7 +524,6 @@ void dEvDtStaff_c::specialProcLight() {
     dComIfGp_evmng_cutEnd(staffId);
 }
 
-/* 80044324-80044A58 03EC64 0734+00 1/1 0/0 0/0 .text specialProcMessage__12dEvDtStaff_cFv */
 void dEvDtStaff_c::specialProcMessage() {
     MessageData* data = (MessageData*)&mData;
     StaffWork* wk = (StaffWork*)&mWork;
@@ -745,8 +725,6 @@ void dEvDtStaff_c::specialProcMessage() {
     }
 }
 
-/* 80044A58-80044CB8 03F398 0260+00 1/1 0/0 0/0 .text            specialProcSound__12dEvDtStaff_cFv
- */
 void dEvDtStaff_c::specialProcSound() {
     SoundData* data = (SoundData*)&mData;
 
@@ -816,8 +794,6 @@ void dEvDtStaff_c::specialProcSound() {
     }
 }
 
-/* 80044CB8-80044EE4 03F5F8 022C+00 1/1 0/0 0/0 .text            specialProcCreate__12dEvDtStaff_cFv
- */
 void dEvDtStaff_c::specialProcCreate() {
     u8* data = mData;
 
@@ -887,7 +863,6 @@ void dEvDtStaff_c::specialProcCreate() {
     }
 }
 
-/* 80044EE4-80045878 03F824 0994+00 1/1 0/0 0/0 .text specialProcDirector__12dEvDtStaff_cFv */
 void dEvDtStaff_c::specialProcDirector() {
     DirectorData* data = (DirectorData*)mData;
     int* idata;
@@ -1243,7 +1218,6 @@ void dEvDtStaff_c::specialProcDirector() {
     }
 }
 
-/* 80045878-80045AFC 0401B8 0284+00 1/1 0/0 0/0 .text specialProcPackage__12dEvDtStaff_cFv */
 void dEvDtStaff_c::specialProcPackage() {
     u8* data = mData;
     char* sdata;
@@ -1335,7 +1309,6 @@ void dEvDtStaff_c::specialProcPackage() {
     }
 }
 
-/* 80045AFC-80045C34 04043C 0138+00 1/1 0/0 0/0 .text specialProcTimekeeper__12dEvDtStaff_cFv */
 void dEvDtStaff_c::specialProcTimekeeper() {
     TimerKeeperData* data = (TimerKeeperData*)&mData;
     int* idata;
@@ -1388,8 +1361,6 @@ void dEvDtStaff_c::specialProcTimekeeper() {
     }
 }
 
-/* 80045C34-800460A8 040574 0474+00 1/1 0/0 0/0 .text            specialProcEffect__12dEvDtStaff_cFv
- */
 void dEvDtStaff_c::specialProcEffect() {
     EffectData* data = (EffectData*)mData;
     int* idata;
@@ -1524,7 +1495,6 @@ void dEvDtStaff_c::specialProcEffect() {
     }
 }
 
-/* 800460A8-80046138 0409E8 0090+00 1/1 0/0 0/0 .text            startCheck__10dEvDtCut_cFv */
 int dEvDtCut_c::startCheck() {
     int i;
     int flag;
@@ -1547,7 +1517,6 @@ int dEvDtCut_c::startCheck() {
     return 1;
 }
 
-/* 80046138-8004616C 040A78 0034+00 1/1 7/7 0/0 .text            init__11dEvDtBase_cFv */
 int dEvDtBase_c::init() {
     mHeaderP = NULL;
     mEventP = NULL;
@@ -1561,7 +1530,6 @@ int dEvDtBase_c::init() {
     return 0;
 }
 
-/* 8004616C-8004628C 040AAC 0120+00 0/0 6/6 0/0 .text            init__11dEvDtBase_cFPci */
 int dEvDtBase_c::init(char* i_data, int i_roomNo) {
     init();
     if (i_data == NULL) {
@@ -1602,7 +1570,6 @@ int dEvDtBase_c::init(char* i_data, int i_roomNo) {
     return getEventNum();
 }
 
-/* 8004628C-800462FC 040BCC 0070+00 0/0 1/1 0/0 .text advanceCut__11dEvDtBase_cFP12dEvDtEvent_c */
 void dEvDtBase_c::advanceCut(dEvDtEvent_c* i_event) {
     int i;
     dEvDtStaff_c* staff;
@@ -1613,8 +1580,6 @@ void dEvDtBase_c::advanceCut(dEvDtEvent_c* i_event) {
     }
 }
 
-/* 800462FC-800463DC 040C3C 00E0+00 1/1 0/0 0/0 .text
- * advanceCutLocal__11dEvDtBase_cFP12dEvDtStaff_c               */
 BOOL dEvDtBase_c::advanceCutLocal(dEvDtStaff_c* i_staff) {
     dEvDtCut_c* cut = &mCutP[i_staff->getCurrentCut()];
 
diff --git a/src/d/d_event_lib.cpp b/src/d/d_event_lib.cpp
index c0518992a3..76b7547c48 100644
--- a/src/d/d_event_lib.cpp
+++ b/src/d/d_event_lib.cpp
@@ -9,7 +9,6 @@
 #include "d/d_com_inf_game.h"
 #include "f_op/f_op_actor.h"
 
-/* 8004886C-800488A4 0431AC 0038+00 0/0 0/0 23/23 .text eventUpdate__17dEvLib_callback_cFv */
 bool dEvLib_callback_c::eventUpdate() {
     if (mAction == NULL) {
         return FALSE;
@@ -19,16 +18,11 @@ bool dEvLib_callback_c::eventUpdate() {
     }
 }
 
-/* ############################################################################################## */
-/* 804246E0-804246F8 051400 0018+00 2/2 0/0 0/0 .bss             l_startAction */
 static action_class<dEvLib_callback_c> l_startAction(&dEvLib_callback_c::initStart,
                                                      &dEvLib_callback_c::executeStart);
-/* 804246F8-80424710 051418 0018+00 2/2 0/0 0/0 .bss             l_runAction */
 static action_class<dEvLib_callback_c> l_runAction(&dEvLib_callback_c::initRun,
                                                    &dEvLib_callback_c::executeRun);
 
-/* 800488A4-80048940 0431E4 009C+00 1/1 0/0 1/1 .text            setEvent__17dEvLib_callback_cFiii
- */
 bool dEvLib_callback_c::setEvent(int mapToolId, int eventIdx, int param_2) {
     if (mAction != NULL) {
         return FALSE;
@@ -43,13 +37,10 @@ bool dEvLib_callback_c::setEvent(int mapToolId, int eventIdx, int param_2) {
     }
 }
 
-/* 80048940-80048970 043280 0030+00 0/0 0/0 21/21 .text orderEvent__17dEvLib_callback_cFiii */
 void dEvLib_callback_c::orderEvent(int param_0, int param_1, int param_2) {
     setEvent(param_0, param_1, param_2 != 0 ? 0x101 : 1);
 }
 
-/* 80048970-800489A8 0432B0 0038+00 3/3 0/0 0/0 .text
- * setAction__17dEvLib_callback_cFP33action_class<17dEvLib_callback_c> */
 bool dEvLib_callback_c::setAction(action_class<dEvLib_callback_c>* action) {
     mAction = action;
     if (mAction == NULL) {
@@ -59,8 +50,6 @@ bool dEvLib_callback_c::setAction(action_class<dEvLib_callback_c>* action) {
     }
 }
 
-/* 800489A8-800489F8 0432E8 0050+00 1/1 0/0 0/0 .text            initAction__17dEvLib_callback_cFv
- */
 bool dEvLib_callback_c::initAction() {
     if (!mAction->getInit()) {
         return TRUE;
@@ -69,7 +58,6 @@ bool dEvLib_callback_c::initAction() {
     }
 }
 
-/* 800489F8-80048A50 043338 0058+00 1/1 0/0 0/0 .text executeAction__17dEvLib_callback_cFv */
 bool dEvLib_callback_c::executeAction() {
     if (!mAction->getExecute()) {
         return TRUE;
@@ -78,13 +66,10 @@ bool dEvLib_callback_c::executeAction() {
     }
 }
 
-/* 80048A50-80048A70 043390 0020+00 1/0 0/0 0/0 .text            initStart__17dEvLib_callback_cFv */
 bool dEvLib_callback_c::initStart() {
     return executeStart();
 }
 
-/* 80048A70-80048B1C 0433B0 00AC+00 2/1 0/0 0/0 .text            executeStart__17dEvLib_callback_cFv
- */
 bool dEvLib_callback_c::executeStart() {
     if (!mActor->eventInfo.checkCommandDemoAccrpt()) {
         if (mActor->eventInfo.getMapToolId() != 0xFF) {
@@ -101,13 +86,10 @@ bool dEvLib_callback_c::executeStart() {
     }
 }
 
-/* 80048B1C-80048B48 04345C 002C+00 1/0 0/0 0/0 .text            initRun__17dEvLib_callback_cFv */
 bool dEvLib_callback_c::initRun() {
     return eventStart();
 }
 
-/* 80048B48-80048BD8 043488 0090+00 1/0 0/0 0/0 .text            executeRun__17dEvLib_callback_cFv
- */
 bool dEvLib_callback_c::executeRun() {
     if (!dComIfGp_evmng_endCheck(mActor->eventInfo.getEventId())) {
         return eventRun();
diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp
index 46715d3c46..ef7a0572ae 100644
--- a/src/d/d_event_manager.cpp
+++ b/src/d/d_event_manager.cpp
@@ -51,7 +51,6 @@ void dEvent_exception_c::init() {
     mState = 0;
 }
 
-/* 800463F0-80046480 040D30 0090+00 0/0 2/2 0/0 .text setStartDemo__18dEvent_exception_cFi */
 int dEvent_exception_c::setStartDemo(int mapToolID) {
     int roomNo = dComIfGp_roomControl_getStayNo();
     dStage_MapEvent_dt_c* mapdata = dEvt_control_c::searchMapEventData(mapToolID, roomNo);
@@ -66,7 +65,6 @@ int dEvent_exception_c::setStartDemo(int mapToolID) {
     return mapToolID;
 }
 
-/* 80046480-800465E8 040DC0 0168+00 1/1 0/0 0/0 .text getEventName__18dEvent_exception_cFv */
 const char* dEvent_exception_c::getEventName() {
     static const char* soecial_names[14] = {
         "NORMAL_COMEBACK",
@@ -208,8 +206,6 @@ static void dummyStrings() {
 }
 #endif
 
-/* 800465E8-80046688 040F28 00A0+00 1/1 0/0 0/0 .text
- * getSubstance__16dEvent_manager_cFP11dEvDtData_ci             */
 void* dEvent_manager_c::getSubstance(dEvDtData_c* evData, int type) {
     if (evData->getIndex() < 0 || evData->getNumber() <= 0) {
         JUT_ASSERT(378, FALSE);
@@ -251,13 +247,10 @@ dEvent_manager_c::dEvent_manager_c() {
     mDataLoaded = false;
 }
 
-/* 80379F50-80379F60 0065B0 000F+01 6/6 0/0 0/0 .rodata
- * DataFileName__29@unnamed@d_event_manager_cpp@                */
 namespace {
 static char const DataFileName[] = "event_list.dat";
 };
 
-/* 80046710-80046800 041050 00F0+00 0/0 1/1 0/0 .text            create__16dEvent_manager_cFv */
 int dEvent_manager_c::create() {
     mCameraPlay = 0;
     mException.init();
@@ -335,7 +328,6 @@ int dEvent_manager_c::create() {
     return 1;
 }
 
-/* 80046800-80046888 041140 0088+00 0/0 8/8 24/24 .text setObjectArchive__16dEvent_manager_cFPc */
 bool dEvent_manager_c::setObjectArchive(char* arcname) {
     char* rt = NULL;
 
@@ -360,7 +352,6 @@ bool dEvent_manager_c::setObjectArchive(char* arcname) {
     return rt != NULL;
 }
 
-/* 80046888-80046904 0411C8 007C+00 0/0 1/1 0/0 .text            demoInit__16dEvent_manager_cFv */
 void dEvent_manager_c::demoInit() {
     if (!mDataLoaded) {
         // "event manager: init demo data!!"
@@ -389,7 +380,6 @@ void dEvent_manager_c::demoInit() {
     }
 }
 
-/* 80046904-800469EC 041244 00E8+00 0/0 1/1 0/0 .text            roomInit__16dEvent_manager_cFi */
 void dEvent_manager_c::roomInit(int roomNo) {
     // "event manager: room data init!! (%d)"
     OS_REPORT("event manager: \x1b[31m部屋データ初期化！！(%d)\n\x1b[m", roomNo);
@@ -448,7 +438,6 @@ void dEvent_manager_c::roomFinish(int roomNo) {
     }
 }
 
-/* 80046A58-80046C0C 041398 01B4+00 0/0 1/1 0/0 .text orderStartDemo__16dEvent_manager_cFv */
 int dEvent_manager_c::orderStartDemo() {
     BOOL success = FALSE;
     fopAc_ac_c* var_r26 = NULL;
@@ -506,19 +495,16 @@ void dEvent_manager_c::remove() {
 #endif
 }
 
-/* 80046C74-80046C88 0415B4 0014+00 1/1 0/0 0/0 .text extraOnObjectCallBack__FP10fopAc_ac_cPv */
 static void* extraOnObjectCallBack(fopAc_ac_c* actor, void* data) {
     fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800);
     return NULL;
 }
 
-/* 80046C88-80046C9C 0415C8 0014+00 1/1 0/0 0/0 .text extraOffObjectCallBack__FP10fopAc_ac_cPv */
 static void* extraOffObjectCallBack(fopAc_ac_c* actor, void* data) {
     fopAcM_OffStatus(actor, fopAcM_STATUS_UNK_0x800);
     return NULL;
 }
 
-/* 80046C9C-80046CB8 0415DC 001C+00 1/1 0/0 0/0 .text allOffObjectCallBack__FP10fopAc_ac_cPv */
 static void* allOffObjectCallBack(fopAc_ac_c* actor, void* data) {
     fopAc_ac_c* spC = (fopAc_ac_c*)data;
 
@@ -526,8 +512,6 @@ static void* allOffObjectCallBack(fopAc_ac_c* actor, void* data) {
     return NULL;
 }
 
-/* 80046CB8-80046DA0 0415F8 00E8+00 1/1 0/0 0/0 .text
- * startProc__16dEvent_manager_cFP12dEvDtEvent_c                */
 void dEvent_manager_c::startProc(dEvDtEvent_c* event) {
     #if DEBUG
     if (l_HIO.m_evm_debug) {
@@ -590,13 +574,10 @@ void dEvent_manager_c::startProc(dEvDtEvent_c* event) {
     mFlags.init();
 }
 
-/* 80046DA0-80046DAC 0416E0 000C+00 2/2 0/0 0/0 .text
- * closeProc__16dEvent_manager_cFP12dEvDtEvent_c                */
 void dEvent_manager_c::closeProc(dEvDtEvent_c* event) {
     event->mEventState = dEvDt_State_END_e;
 }
 
-/* 80046DAC-80046E64 0416EC 00B8+00 0/0 2/2 0/0 .text            endProc__16dEvent_manager_cFsi */
 void dEvent_manager_c::endProc(s16 evId, BOOL isClose) {
     #if DEBUG
     if (l_HIO.m_evm_debug) {
@@ -641,7 +622,6 @@ void dEvent_manager_c::endProc(s16 evId, BOOL isClose) {
     dComIfGp_getEvent().setPtI(NULL);
 }
 
-/* 80046E64-800473FC 0417A4 0598+00 0/0 1/1 0/0 .text            Sequencer__16dEvent_manager_cFv */
 void dEvent_manager_c::Sequencer() {
     dEvt_control_c& evtControl = dComIfGp_getEvent();
     dEvDtEvent_c* event = getEventData(mCurrentEvId);
@@ -809,7 +789,6 @@ void dEvent_manager_c::Sequencer() {
     }
 }
 
-/* 800473FC-80047454 041D3C 0058+00 0/0 1/1 0/0 .text            Experts__16dEvent_manager_cFv */
 void dEvent_manager_c::Experts() {
     dEvDtEvent_c* event = getEventData(mCurrentEvId);
     if (event != NULL && event->mEventState == dEvDt_State_START_e) {
@@ -817,8 +796,6 @@ void dEvent_manager_c::Experts() {
     }
 }
 
-/* 80047454-800474BC 041D94 0068+00 1/1 0/0 0/0 .text            getEventData__16dEvent_manager_cFsi
- */
 dEvDtEvent_c* dEvent_manager_c::getEventData(s16 evIdx, int evType) {
     if (evType <= 0 || evType > BASE_MAX) {
         return NULL;
@@ -836,8 +813,6 @@ dEvDtEvent_c* dEvent_manager_c::getEventData(s16 evIdx, int evType) {
     return NULL;
 }
 
-/* 800474BC-80047514 041DFC 0058+00 9/9 3/3 4/4 .text            getEventData__16dEvent_manager_cFs
- */
 dEvDtEvent_c* dEvent_manager_c::getEventData(s16 evCompositId) {
     if (evCompositId == -1) {
         return NULL;
@@ -847,7 +822,6 @@ dEvDtEvent_c* dEvent_manager_c::getEventData(s16 evCompositId) {
     }
 }
 
-/* 80047514-80047698 041E54 0184+00 3/3 8/8 3/3 .text getEventIdx__16dEvent_manager_cFPCcUcl */
 s16 dEvent_manager_c::getEventIdx(const char* eventName, u8 mapToolID, s32 roomNo) {
     static char map_tool_name[17];
 
@@ -892,8 +866,6 @@ s16 dEvent_manager_c::getEventIdx(const char* eventName, u8 mapToolID, s32 roomN
     return -1;
 }
 
-/* 80047698-80047758 041FD8 00C0+00 0/0 3/3 25/25 .text
- * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc              */
 s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, u8 mapToolID) {
     static char map_tool_name[17];
 
@@ -917,8 +889,6 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, u8 mapToolID) {
     return -1;
 }
 
-/* 80047758-80047930 042098 01D8+00 1/1 10/10 92/92 .text
- * getEventIdx__16dEvent_manager_cFP10fopAc_ac_cPCcUc           */
 s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, const char* eventName, u8 mapToolID) {
     static char map_tool_name[17];
     s32 actorRoomNo = fopAcM_GetRoomNo(actor);
@@ -972,7 +942,6 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, const char* eventName, u8 m
     return -1;
 }
 
-/* 80047930-80047984 042270 0054+00 0/0 0/0 1/1 .text isMapToolCamera__16dEvent_manager_cFUcl */
 BOOL dEvent_manager_c::isMapToolCamera(u8 mapToolID, s32 roomNo) {
     if (roomNo == -1) {
         roomNo = dComIfGp_roomControl_getStayNo();
@@ -986,7 +955,6 @@ BOOL dEvent_manager_c::isMapToolCamera(u8 mapToolID, s32 roomNo) {
     }
 }
 
-/* 80047984-800479F8 0422C4 0074+00 0/0 6/6 0/0 .text            order__16dEvent_manager_cFs */
 int dEvent_manager_c::order(s16 evCompositId) {
     dEvDtEvent_c* event = getEventData(evCompositId);
     if (event == NULL) {
@@ -1006,7 +974,6 @@ int dEvent_manager_c::order(s16 evCompositId) {
     return 1;
 }
 
-/* 800479F8-80047A38 042338 0040+00 1/1 0/0 9/9 .text            startCheck__16dEvent_manager_cFs */
 int dEvent_manager_c::startCheck(s16 evCompositId) {
     dEvDtEvent_c* event = getEventData(evCompositId);
     if (event == NULL) {
@@ -1020,14 +987,11 @@ int dEvent_manager_c::startCheck(s16 evCompositId) {
     }
 }
 
-/* 80047A38-80047A78 042378 0040+00 0/0 2/2 0/0 .text startCheckOld__16dEvent_manager_cFPCc */
 int dEvent_manager_c::startCheckOld(const char* eventname) {
     s16 evId = getEventIdx(eventname, 0xFF, -1);
     return startCheck(evId);
 }
 
-/* 80047A78-80047ADC 0423B8 0064+00 1/1 2/2 122/122 .text            endCheck__16dEvent_manager_cFs
- */
 int dEvent_manager_c::endCheck(s16 eventID) {
     s16 compositId = dComIfGp_getEvent().runningEventID(eventID);
     dEvDtEvent_c* event = getEventData(compositId);
@@ -1042,14 +1006,11 @@ int dEvent_manager_c::endCheck(s16 eventID) {
     }
 }
 
-/* 80047ADC-80047B1C 04241C 0040+00 0/0 2/2 10/10 .text endCheckOld__16dEvent_manager_cFPCc */
 int dEvent_manager_c::endCheckOld(const char* eventname) {
     s16 evId = getEventIdx(eventname, 0xFF, -1);
     return endCheck(evId);
 }
 
-/* 80047B1C-80047D4C 04245C 0230+00 1/1 10/10 210/210 .text
- * getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci           */
 int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int tagId) {
     int i;
     int staff_id;
@@ -1125,7 +1086,6 @@ int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int
     return -1;
 }
 
-/* 80047D4C-80047DAC 04268C 0060+00 0/0 9/9 417/417 .text getIsAddvance__16dEvent_manager_cFi */
 int dEvent_manager_c::getIsAddvance(int staffId) {
     if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) {
         if (OREG_F(8)) {
@@ -1142,7 +1102,6 @@ int dEvent_manager_c::getIsAddvance(int staffId) {
     }
 }
 
-/* 80047DAC-80047E10 0426EC 0064+00 1/1 0/0 0/0 .text            dEvmng_strcmp__FPCcPc */
 static int dEvmng_strcmp(const char* strA, char* strB) {
     u32 len = 0;
     while (strA[len] != '\0') {
@@ -1164,8 +1123,6 @@ static int dEvmng_strcmp(const char* strA, char* strB) {
     return 0;
 }
 
-/* 80047E10-80047F5C 042750 014C+00 1/1 1/1 118/118 .text
- * getMyActIdx__16dEvent_manager_cFiPCPCciii                    */
 int dEvent_manager_c::getMyActIdx(int staffId, const char* const* action, int n_action,
                                   BOOL param_3, BOOL param_4) {
     if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) {
@@ -1226,7 +1183,6 @@ int dEvent_manager_c::getMyActIdx(int staffId, const char* const* action, int n_
     return 0;
 }
 
-/* 80047F5C-80047FC8 04289C 006C+00 1/1 9/9 62/62 .text getMyNowCutName__16dEvent_manager_cFi */
 char* dEvent_manager_c::getMyNowCutName(int staffId) {
     dEvDtCut_c* cut;
     if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) {
@@ -1245,7 +1201,6 @@ char* dEvent_manager_c::getMyNowCutName(int staffId) {
     }
 }
 
-/* 80047FC8-800480EC 042908 0124+00 2/2 0/0 0/0 .text getMyDataP__16dEvent_manager_cFiPCci */
 dEvDtData_c* dEvent_manager_c::getMyDataP(int staffId, const char* dataname, BOOL isSeekStart) {
     dEvDtData_c* data;
     int index;
@@ -1281,8 +1236,6 @@ dEvDtData_c* dEvent_manager_c::getMyDataP(int staffId, const char* dataname, BOO
     }
 }
 
-/* 800480EC-80048144 042A2C 0058+00 0/0 22/22 355/355 .text
- * getMySubstanceP__16dEvent_manager_cFiPCci                    */
 void* dEvent_manager_c::getMySubstanceP(int staffId, const char* dataname, int datatype) {
     dEvDtData_c* data = getMyDataP(staffId, dataname, FALSE);
     if (data == NULL) {
@@ -1292,8 +1245,6 @@ void* dEvent_manager_c::getMySubstanceP(int staffId, const char* dataname, int d
     return getSubstance(data, datatype);
 }
 
-/* 80048144-8004817C 042A84 0038+00 0/0 12/12 0/0 .text getMySubstanceNum__16dEvent_manager_cFiPCc
- */
 int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) {
     dEvDtData_c* data = getMyDataP(staffId, dataname, FALSE);
     if (data == NULL) {
@@ -1303,8 +1254,6 @@ int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) {
     }
 }
 
-/* 8004817C-800481F4 042ABC 0078+00 1/1 78/78 182/182 .text            cutEnd__16dEvent_manager_cFi
- */
 void dEvent_manager_c::cutEnd(int staffId) {
     dEvDtCut_c* cut;
     if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) {
@@ -1323,8 +1272,6 @@ void dEvent_manager_c::cutEnd(int staffId) {
     }
 }
 
-/* 800481F4-800482CC 042B34 00D8+00 0/0 4/4 0/0 .text
- * getEventPrio__16dEvent_manager_cFP10fopAc_ac_cs              */
 int dEvent_manager_c::getEventPrio(fopAc_ac_c* actor, s16 evCompositId) {
     dEvDtEvent_c* event = NULL;
     dEvDtBase_c eventBase;
@@ -1349,8 +1296,6 @@ int dEvent_manager_c::getEventPrio(fopAc_ac_c* actor, s16 evCompositId) {
     }
 }
 
-/* 800482CC-80048348 042C0C 007C+00 1/1 1/1 0/0 .text            issueStaff__16dEvent_manager_cFPCc
- */
 void dEvent_manager_c::issueStaff(const char* staffname) {
     if (strcmp(staffname, "ALL") == 0) {
         fopAcM_Search((fopAcIt_JudgeFunc)extraOnObjectCallBack, NULL);
@@ -1362,8 +1307,6 @@ void dEvent_manager_c::issueStaff(const char* staffname) {
     }
 }
 
-/* 80048348-800483C4 042C88 007C+00 0/0 1/1 0/0 .text            cancelStaff__16dEvent_manager_cFPCc
- */
 void dEvent_manager_c::cancelStaff(const char* staffname) {
     if (!strcmp(staffname, "ALL")) {
         fopAcM_Search((fopAcIt_JudgeFunc)extraOffObjectCallBack, NULL);
@@ -1375,17 +1318,14 @@ void dEvent_manager_c::cancelStaff(const char* staffname) {
     }
 }
 
-/* 800483C4-800483E0 042D04 001C+00 1/1 2/2 38/38 .text setGoal__16dEvent_manager_cFP4cXyz */
 void dEvent_manager_c::setGoal(cXyz* pos) {
     mGoal.set(*pos);
 }
 
-/* 800483E0-800483E8 042D20 0008+00 0/0 1/1 1/1 .text            getGoal__16dEvent_manager_cFv */
 cXyz* dEvent_manager_c::getGoal() {
     return &mGoal;
 }
 
-/* 800483E8-8004846C 042D28 0084+00 0/0 5/5 27/27 .text getRunEventName__16dEvent_manager_cFv */
 const char* dEvent_manager_c::getRunEventName() {
     if (mCurrentEvId == -1) {
         return "NO DATA";
@@ -1414,7 +1354,6 @@ struct FindShtrCbPrms {
     fopAc_ac_c* actor;
 };
 
-/* 8004846C-80048520 042DAC 00B4+00 1/1 0/0 0/0 .text findShutterCallBack__FP10fopAc_ac_cPv */
 static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* actor, void* data) {
     FindShtrCbPrms* prms = (FindShtrCbPrms*)data;
     cXyz diff;
@@ -1431,8 +1370,6 @@ static fopAc_ac_c* findShutterCallBack(fopAc_ac_c* actor, void* data) {
     return NULL;
 }
 
-/* 80048520-80048618 042E60 00F8+00 1/1 0/0 0/0 .text specialCast_Shutter__16dEvent_manager_cFsi
- */
 fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) {
     fopAc_ac_c* shutterActor = NULL;
 
@@ -1460,7 +1397,6 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) {
     return shutterActor;
 }
 
-/* 80048618-80048748 042F58 0130+00 1/1 0/0 0/0 .text specialCast__16dEvent_manager_cFPCci */
 fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) {
     fopAc_ac_c* shutterActor = NULL;
     if (staffname == NULL) {
@@ -1497,7 +1433,6 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) {
     return shutterActor;
 }
 
-/* 80048748-800487F0 043088 00A8+00 1/1 0/0 0/0 .text            dEv_talkman_get_action__Fi */
 static int dEv_talkman_get_action(int param_0) {
     int staffId = dComIfGp_getEventManager().getMyStaffId("TALKMAN", NULL, -1);
     if (staffId == -1) {
@@ -1519,12 +1454,10 @@ static int dEv_talkman_get_action(int param_0) {
 
 }
 
-/* 800487F0-8004882C 043130 003C+00 0/0 0/0 108/108 .text ChkPresentEnd__16dEvent_manager_cFv */
 int dEvent_manager_c::ChkPresentEnd() {
     return dEv_talkman_get_action(0) >= 1;
 }
 
-/* 8004882C-8004886C 04316C 0040+00 0/0 2/2 2/2 .text checkStartDemo__16dEvent_manager_cFv */
 int dEvent_manager_c::checkStartDemo() {
     if (!dComIfGp_getEvent().runCheck()) {
         return FALSE;
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index 8af36ed8da..668e948ecf 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -10,8 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 
-/* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text            entry__8dEyeHL_cFP12J3DModelDataPCc
- */
 void dEyeHL_c::entry(J3DModelData* p_mData, char const* name) {
     J3DTexture* tex = p_mData->getTexture();
     JUTNameTab* tex_nametab = p_mData->getTextureName();
@@ -32,16 +30,12 @@ void dEyeHL_c::entry(J3DModelData* p_mData, char const* name) {
     OSReport_Error("目のハイライトテクスチャーがありません！\n");
 }
 
-/* 8009CA28-8009CA48 097368 0020+00 0/0 3/3 0/0 .text            remove__8dEyeHL_cFv */
 void dEyeHL_c::remove() {
     dEyeHL_mng_c::remove(this);
 }
 
-/* ############################################################################################## */
-/* 80450FA8-80450FB0 0004A8 0004+04 3/3 0/0 0/0 .sbss            m_obj__12dEyeHL_mng_c */
 dEyeHL_c* dEyeHL_mng_c::m_obj;
 
-/* 8009CA48-8009CB14 097388 00CC+00 0/0 1/1 0/0 .text            update__12dEyeHL_mng_cFv */
 void dEyeHL_mng_c::update() {
     dEyeHL_c* obj = m_obj;
 
@@ -59,7 +53,6 @@ void dEyeHL_mng_c::update() {
     }
 }
 
-/* 8009CB14-8009CB34 097454 0020+00 1/1 0/0 0/0 .text            entry__12dEyeHL_mng_cFP8dEyeHL_c */
 void dEyeHL_mng_c::entry(dEyeHL_c* i_obj) {
     if (m_obj != NULL) {
         m_obj->m_pre = i_obj;
@@ -68,8 +61,6 @@ void dEyeHL_mng_c::entry(dEyeHL_c* i_obj) {
     m_obj = i_obj;
 }
 
-/* 8009CB34-8009CB88 097474 0054+00 1/1 0/0 0/0 .text            remove__12dEyeHL_mng_cFP8dEyeHL_c
- */
 void dEyeHL_mng_c::remove(dEyeHL_c* i_obj) {
     if (i_obj->m_timg != NULL) {
         dEyeHL_c* prev = i_obj->m_pre;
diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp
index d51d63d446..97e27fcbe2 100644
--- a/src/d/d_file_sel_info.cpp
+++ b/src/d/d_file_sel_info.cpp
@@ -13,7 +13,6 @@
 #include "d/d_pane_class_alpha.h"
 #include "stdio.h"
 
-/* 80192434-801924A0 18CD74 006C+00 0/0 3/3 0/0 .text __ct__12dFile_info_cFP10JKRArchiveUc */
 dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) {
     mArchive = i_archive;
     field_0x22 = param_1;
@@ -22,7 +21,6 @@ dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) {
     field_0x20 = 0;
 }
 
-/* 801924A0-80192570 18CDE0 00D0+00 1/0 0/0 0/0 .text            __dt__12dFile_info_cFv */
 dFile_info_c::~dFile_info_c() {
     delete mFileInfo.Scr;
     delete mDatBase;
@@ -31,7 +29,6 @@ dFile_info_c::~dFile_info_c() {
     mDoExt_removeMesgFont();
 }
 
-/* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text            screenSet__12dFile_info_cFv */
 void dFile_info_c::screenSet() {
     mFileInfo.Scr = new J2DScreen();
     JUT_ASSERT(0, mFileInfo.Scr != NULL);
@@ -90,8 +87,6 @@ void dFile_info_c::screenSet() {
     mPlayTime = info_text[3]->getStringPtr();
 }
 
-/* 80192954-80192AA0 18D294 014C+00 0/0 3/3 0/0 .text setSaveData__12dFile_info_cFP10dSv_save_ciUc
- */
 int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_dataNo) {
     if (i_validChksum) {
         char* player_name = i_savedata->getPlayer().getPlayerInfo().getLinkName();
@@ -122,7 +117,6 @@ int dFile_info_c::setSaveData(dSv_save_c* i_savedata, BOOL i_validChksum, u8 i_d
     }
 }
 
-/* 80192AA0-80192C08 18D3E0 0168+00 1/1 0/0 0/0 .text setHeartCnt__12dFile_info_cFP10dSv_save_c */
 void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {
     static u64 l_htag[] = {
         'hear_20', 'hear_21', 'hear_22', 'hear_23', 'hear_24', 'hear_25', 'hear_26',
@@ -165,11 +159,9 @@ void dFile_info_c::setHeartCnt(dSv_save_c* i_savedata) {
     }
 }
 
-/* 803BB570-803BB588 018690 0018+00 0/1 0/0 0/0 .data            fileWarningProc */
 typedef void (dFile_info_c::*procFunc)();
 static procFunc fileWarningProc[] = {&dFile_info_c::modeWait, &dFile_info_c::modeMove};
 
-/* 80192C08-80192C70 18D548 0068+00 1/1 0/0 0/0 .text setSaveDate__12dFile_info_cFP10dSv_save_c */
 void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) {
     OSCalendarTime time;
     OSTicksToCalendarTime(i_savedata->getPlayer().getPlayerStatusB().getDateIpl(), &time);
@@ -191,7 +183,6 @@ void dFile_info_c::setSaveDate(dSv_save_c* i_savedata) {
     #endif
 }
 
-/* 80192C70-80192D58 18D5B0 00E8+00 1/1 0/0 0/0 .text setPlayTime__12dFile_info_cFP10dSv_save_c */
 void dFile_info_c::setPlayTime(dSv_save_c* i_savedata) {
     s64 time = i_savedata->getPlayer().getPlayerInfo().getTotalTime() / (OS_BUS_CLOCK / 4);
 
@@ -205,18 +196,14 @@ void dFile_info_c::setPlayTime(dSv_save_c* i_savedata) {
     }
 }
 
-/* 80192D58-80192D5C 18D698 0004+00 1/0 0/0 0/0 .text            modeWait__12dFile_info_cFv */
 void dFile_info_c::modeWait() {}
 
-/* 80192D5C-80192D60 18D69C 0004+00 1/0 0/0 0/0 .text            modeMove__12dFile_info_cFv */
 void dFile_info_c::modeMove() {}
 
-/* 80192D60-80192D9C 18D6A0 003C+00 0/0 2/2 0/0 .text            _draw__12dFile_info_cFv */
 void dFile_info_c::_draw() {
     dComIfGd_set2DOpa(&mFileInfo);
 }
 
-/* 80192D9C-80192E88 18D6DC 00EC+00 1/0 0/0 0/0 .text            draw__16dDlst_FileInfo_cFv */
 void dDlst_FileInfo_c::draw() {
     Mtx m;
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp
index c70d70079c..3063012ea0 100644
--- a/src/d/d_file_sel_warning.cpp
+++ b/src/d/d_file_sel_warning.cpp
@@ -2,11 +2,6 @@
  * This should match once the padding for dDlst_FileWarn_c's vtable can be figured out
  */
 
-//
-// Generated By: dol2asm
-// Translation Unit: d/file/d_file_sel_warning
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_file_sel_warning.h"
@@ -16,13 +11,10 @@
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 
-/* 803BB434-803BB44C 018554 0018+00 1/2 0/0 0/0 .data            fileWarningProc */
 typedef void (dFile_warning_c::*procFunc)();
 static procFunc fileWarningProc[] = {&dFile_warning_c::modeWait, &dFile_warning_c::modeMove};
 
-/* 80191BAC-80191C18 18C4EC 006C+00 0/0 3/3 0/0 .text __ct__15dFile_warning_cFP10JKRArchiveUc */
 dFile_warning_c::dFile_warning_c(JKRArchive* i_archive, u8 param_1) {
     mpArchive = i_archive;
     field_0x3e = param_1;
@@ -32,7 +24,6 @@ dFile_warning_c::dFile_warning_c(JKRArchive* i_archive, u8 param_1) {
     mPosY = 0.0f;
 }
 
-/* 80191C18-80191CF4 18C558 00DC+00 1/0 0/0 0/0 .text            __dt__15dFile_warning_cFv */
 dFile_warning_c::~dFile_warning_c() {
     delete mFileWarn.mMsgString;
     delete mFileWarn.Scr;
@@ -42,7 +33,6 @@ dFile_warning_c::~dFile_warning_c() {
     mDoExt_removeMesgFont();
 }
 
-/* 80191CF4-80191F18 18C634 0224+00 1/1 0/0 0/0 .text            screenSet__15dFile_warning_cFv */
 void dFile_warning_c::screenSet() {
     const char* blo_name[] = {
         "zelda_file_select_warning_window.blo",
@@ -90,7 +80,6 @@ void dFile_warning_c::screenSet() {
     mFileWarn.mMsgString->getString(0x53, field_0x20, NULL, mFileWarn.mFont, NULL, 0);
 }
 
-/* 80191F18-80191F90 18C858 0078+00 0/0 6/6 0/0 .text            _move__15dFile_warning_cFv */
 void dFile_warning_c::_move() {
     (this->*fileWarningProc[field_0x18])();
 
@@ -99,17 +88,14 @@ void dFile_warning_c::_move() {
     }
 }
 
-/* 80191F90-80191F94 18C8D0 0004+00 1/0 0/0 0/0 .text            modeWait__15dFile_warning_cFv */
 void dFile_warning_c::modeWait() {}
 
-/* 80191F94-80191FD4 18C8D4 0040+00 1/0 0/0 0/0 .text            modeMove__15dFile_warning_cFv */
 void dFile_warning_c::modeMove() {
     if (baseMoveAnm() == true) {
         field_0x18 = 0;
     }
 }
 
-/* 80191FD4-801920B8 18C914 00E4+00 1/1 0/0 0/0 .text            baseMoveAnm__15dFile_warning_cFv */
 bool dFile_warning_c::baseMoveAnm() {
     bool rt;
 
@@ -147,7 +133,6 @@ bool dFile_warning_c::baseMoveAnm() {
     return rt;
 }
 
-/* 801920B8-8019210C 18C9F8 0054+00 0/0 5/5 0/0 .text            openInit__15dFile_warning_cFv */
 void dFile_warning_c::openInit() {
     field_0x28 = 2849;
     field_0x2c = 2859;
@@ -157,7 +142,6 @@ void dFile_warning_c::openInit() {
     field_0x18 = 1;
 }
 
-/* 8019210C-80192160 18CA4C 0054+00 0/0 6/6 0/0 .text            closeInit__15dFile_warning_cFv */
 void dFile_warning_c::closeInit() {
     field_0x28 = 2859;
     field_0x2c = 2849;
@@ -167,36 +151,29 @@ void dFile_warning_c::closeInit() {
     field_0x18 = 1;
 }
 
-/* 80192160-80192190 18CAA0 0030+00 0/0 4/4 0/0 .text            init__15dFile_warning_cFv */
 void dFile_warning_c::init() {
     field_0x24->setFrame(2849.0f);
     mFileWarn.Scr->animation();
 }
 
-/* 80192190-801921CC 18CAD0 003C+00 0/0 2/2 0/0 .text            _draw__15dFile_warning_cFv */
 void dFile_warning_c::_draw() {
     dComIfGd_set2DOpa(&mFileWarn);
 }
 
-/* 801921CC-801921F8 18CB0C 002C+00 0/0 1/1 0/0 .text            drawSelf__15dFile_warning_cFv */
 void dFile_warning_c::drawSelf() {
     mFileWarn.draw();
 }
 
-/* 801921F8-80192240 18CB38 0048+00 0/0 1/1 0/0 .text            setText__15dFile_warning_cFUl */
 void dFile_warning_c::setText(u32 param_0) {
     mFileWarn.mMsgString->getString(param_0, field_0x20, NULL, mFileWarn.mFont, NULL, 0);
 }
 
-/* 80192240-8019230C 18CB80 00CC+00 0/0 1/1 0/0 .text
- * setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor */
 void dFile_warning_c::setFontColor(JUtility::TColor param_0, JUtility::TColor param_1) {
     field_0x20->setBlackWhite(param_0, param_1);
     field_0x20->setFontColor(JUtility::TColor(255, 255, 255, 255),
                              JUtility::TColor(255, 255, 255, 255));
 }
 
-/* 80192354-8019238C 18CC94 0038+00 1/0 0/0 0/0 .text            draw__16dDlst_FileWarn_cFv */
 void dDlst_FileWarn_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     Scr->draw(0.0f, 0.0f, graf_ctx);
diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index 2a523c5e5f..9fd7797404 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -22,52 +22,44 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 803BA854-803BA860 017974 000C+00 3/3 0/0 0/0 .data            SelStartFrameTbl */
 static s32 SelStartFrameTbl[3] = {
     0x0000003B, 
     0x00000063, 
     0x0000008B,
 };
 
-/* 803BA860-803BA86C 017980 000C+00 3/3 0/0 0/0 .data            SelEndFrameTbl */
 static s32 SelEndFrameTbl[3] = {
     0x00000045,
     0x0000006D,
     0x00000095,
 };
 
-/* 803BA86C-803BA878 01798C 000C+00 7/7 0/0 0/0 .data            SelOpenStartFrameTbl */
 static s32 SelOpenStartFrameTbl[3] = {
     0x000000F8,
     0x000001C0, 
     0x00000288,
 };
 
-/* 803BA878-803BA884 017998 000C+00 7/7 0/0 0/0 .data            SelOpenEndFrameTbl */
 static s32 SelOpenEndFrameTbl[3] = {
     0x00000103,
     0x000001CC, 
     0x00000293,
 };
 
-/* 803BA884-803BA890 0179A4 000C+00 5/5 0/0 0/0 .data            MenuSelStartFrameTbl */
 static s32 MenuSelStartFrameTbl[3] = {
     0x000007CD, 
     0x00000382, 
     0x00000390,
 };
 
-/* 803BA890-803BA8A0 0179B0 000C+04 3/3 0/0 0/0 .data            MenuSelEndFrameTbl */
 static s32 MenuSelEndFrameTbl[3] = {
     0x000007DB,
     0x0000038E,
     0x00000382,
 };
 
-/* 803BA8A0-803BA8B8 0179C0 0018+00 0/2 0/0 0/0 .data            l_tagName13 */
 static u64 l_tagName13[3] = {'w_dat_i0', 'w_dat_i1', 'w_dat_i2'};
 
-/* 801835F8-8018366C 17DF38 0074+00 1/1 0/0 0/0 .text            __ct__9dFs_HIO_cFv */
 dFs_HIO_c::dFs_HIO_c() {
     field_0x0006 = 5;
     field_0x0007 = 5;
@@ -90,13 +82,11 @@ dFs_HIO_c::dFs_HIO_c() {
     field_0x0022 = 0;
 }
 
-/* 8018366C-8018375C 17DFAC 00F0+00 0/0 1/1 0/0 .text __ct__14dFile_select_cFP10JKRArchive */
 dFile_select_c::dFile_select_c(JKRArchive* i_archiveP) {
     mpArchive = i_archiveP;
     mpFileSelect3d = new dFile_select3D_c();
 }
 
-/* 8018375C-801841EC 17E09C 0A90+00 1/0 0/0 0/0 .text            __dt__14dFile_select_cFv */
 dFile_select_c::~dFile_select_c() {
     for (int i = 0; i < 3; i = i + 1) {
         delete field_0x0164[i];
@@ -180,10 +170,8 @@ dFile_select_c::~dFile_select_c() {
     dComIfGp_getCollectResArchive()->removeResourceAll();
 }
 
-/* 8042C9EC-8042CA10 05970C 0024+00 35/35 0/0 0/0 .bss             g_fsHIO */
 static dFs_HIO_c g_fsHIO;
 
-/* 801843CC-801844FC 17ED0C 0130+00 0/0 1/1 0/0 .text            _create__14dFile_select_cFv */
 void dFile_select_c::_create() {
     mDoGph_gInf_c::setFadeColor(static_cast<JUtility::TColor&>(g_blackColor));
     mStick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000);
@@ -210,7 +198,6 @@ void dFile_select_c::_create() {
     displayInit();
 }
 
-/* 803BAAEC-803BAD20 017C0C 0234+00 1/2 0/0 0/0 .data            DataSelProc */
 typedef void (dFile_select_c::*DataSelProcFunc)(void);
 static DataSelProcFunc DataSelProc[47] = {
     &dFile_select_c::MemCardCheckMain,
@@ -262,7 +249,6 @@ static DataSelProcFunc DataSelProc[47] = {
     &dFile_select_c::nextModeWait,
 };
 
-/* 801844FC-80184664 17EE3C 0168+00 0/0 1/1 0/0 .text            _move__14dFile_select_cFv */
 void dFile_select_c::_move() {
     dMeter2Info_decMsgKeyWaitTimer();
 
@@ -306,8 +292,6 @@ void dFile_select_c::_move() {
     mDoMemCd_clearProbeStat();
 }
 
-/* 80184664-801848A0 17EFA4 023C+00 1/1 0/0 0/0 .text            selFileWakuAnm__14dFile_select_cFv
- */
 void dFile_select_c::selFileWakuAnm() {
     field_0x01cc += 2;
 
@@ -353,7 +337,6 @@ void dFile_select_c::selFileWakuAnm() {
     field_0x03a0->setFrame(field_0x03a4);
 }
 
-/* 801848A0-8018499C 17F1E0 00FC+00 1/1 0/0 0/0 .text            bookIconAnm__14dFile_select_cFv */
 void dFile_select_c::bookIconAnm() {
     field_0x01dc += 2;
 
@@ -375,7 +358,6 @@ void dFile_select_c::bookIconAnm() {
     field_0x01e8->setFrame(field_0x01ec);
 }
 
-/* 8018499C-80184A48 17F2DC 00AC+00 1/1 0/0 0/0 .text selCopyFileWakuAnm__14dFile_select_cFv */
 void dFile_select_c::selCopyFileWakuAnm() {
     field_0x02ec += 2;
 
@@ -391,8 +373,6 @@ void dFile_select_c::selCopyFileWakuAnm() {
     field_0x02f0->setFrame(field_0x02f4);
 }
 
-/* 80184A48-80184B44 17F388 00FC+00 1/1 0/0 0/0 .text            copyBookIconAnm__14dFile_select_cFv
- */
 void dFile_select_c::copyBookIconAnm() {
     field_0x02fc += 2;
 
@@ -414,8 +394,6 @@ void dFile_select_c::copyBookIconAnm() {
     field_0x0308->setFrame(field_0x030c);
 }
 
-/* 80184B44-80184BFC 17F484 00B8+00 1/1 0/0 0/0 .text            dataDelEffAnm__14dFile_select_cFv
- */
 void dFile_select_c::dataDelEffAnm() {
     if (field_0x0208 != 0) {
         field_0x0204 += 2;
@@ -433,8 +411,6 @@ void dFile_select_c::dataDelEffAnm() {
     }
 }
 
-/* 80184BFC-80184CB4 17F53C 00B8+00 1/1 0/0 0/0 .text            dataCopyEffAnm__14dFile_select_cFv
- */
 void dFile_select_c::dataCopyEffAnm() {
     if (field_0x0209 != 0) {
         field_0x0204 += 2;
@@ -452,8 +428,6 @@ void dFile_select_c::dataCopyEffAnm() {
     }
 }
 
-/* 80184CB4-80184D4C 17F5F4 0098+00 2/2 0/0 0/0 .text
- * selectDataBaseMoveAnmInitSet__14dFile_select_cFii            */
 void dFile_select_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) {
     field_0x00a4->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084);
     field_0x00b0 = param_0;
@@ -463,7 +437,6 @@ void dFile_select_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) {
     field_0x00b9 = 1;
 }
 
-/* 80184D4C-80184E38 17F68C 00EC+00 2/2 0/0 0/0 .text selectDataBaseMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::selectDataBaseMoveAnm() {
     if (field_0x00b0 != field_0x00b4) {
         if (field_0x00b0 < field_0x00b4) {
@@ -492,7 +465,6 @@ bool dFile_select_c::selectDataBaseMoveAnm() {
     }
 }
 
-/* 80184E38-80185040 17F778 0208+00 1/1 0/0 0/0 .text dataSelectInAnmSet__14dFile_select_cFv */
 void dFile_select_c::dataSelectInAnmSet() {
     setSaveData();
     dSv_save_c* pSave = (dSv_save_c*)mSave;
@@ -530,7 +502,6 @@ void dFile_select_c::dataSelectInAnmSet() {
     mDoAud_seStart(Z2SE_SY_FILE_MENU_SLIDE_IN,0,0,0);
 }
 
-/* 80185040-80185230 17F980 01F0+00 1/0 0/0 0/0 .text            dataSelectIn__14dFile_select_cFv */
 void dFile_select_c::dataSelectIn() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool selectDataBaseMove = selectDataBaseMoveAnm();
@@ -575,8 +546,6 @@ void dFile_select_c::dataSelectIn() {
     }
 }
 
-/* 80185230-801853C4 17FB70 0194+00 1/0 0/0 0/0 .text            dataSelectInit__14dFile_select_cFv
- */
 void dFile_select_c::dataSelectInit() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool alphaAnime = true;
@@ -609,7 +578,6 @@ void dFile_select_c::dataSelectInit() {
     }
 }
 
-/* 801853C4-80185508 17FD04 0144+00 1/0 0/0 0/0 .text            dataSelect__14dFile_select_cFv */
 // handles switching between quest logs
 void dFile_select_c::dataSelect() {
     mStick->checkTrigger();
@@ -640,27 +608,22 @@ void dFile_select_c::dataSelect() {
     }
 }
 
-/* 804506B0-804506B8 000130 0008+00 2/2 0/0 0/0 .sdata           YnSelStartFrameTbl */
 static s32 YnSelStartFrameTbl[2] = {
     0x000004E3, 
     0x000004D4,
 };
 
-/* 804506B8-804506C0 000138 0008+00 2/2 0/0 0/0 .sdata           YnSelEndFrameTbl */
 static s32 YnSelEndFrameTbl[2] = {
     0x000004D4, 
     0x000004E3,
 };
 
-/* 804506C0-804506C8 000140 0006+02 4/4 0/0 0/0 .sdata           msgTbl */
 static u16 msgTbl[3] = {
     0x0040,
     0x0041,
     0x0042,
 };
 
-/* 80185508-80185994 17FE48 048C+00 1/1 0/0 0/0 .text            dataSelectStart__14dFile_select_cFv
- */
 void dFile_select_c::dataSelectStart() {
     mSelIcon->setAlphaRate(0.0f);
     if (field_0x025b[mSelectNum] != 0) {
@@ -713,8 +676,6 @@ void dFile_select_c::dataSelectStart() {
     modoruTxtDispAnmInit(1);
 }
 
-/* 80185994-80185AAC 1802D4 0118+00 7/7 0/0 0/0 .text
- * selectDataMoveAnmInitSet__14dFile_select_cFii                */
 void dFile_select_c::selectDataMoveAnmInitSet(int param_0, int param_1) {
     field_0x00bc[0]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084);
     field_0x00bc[1]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084);
@@ -729,7 +690,6 @@ void dFile_select_c::selectDataMoveAnmInitSet(int param_0, int param_1) {
     mpPane->animationTransform();
 }
 
-/* 80185AAC-80185C2C 1803EC 0180+00 8/8 0/0 0/0 .text selectDataMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::selectDataMoveAnm() {
     if (field_0x00e0[mSelectNum] != field_0x00ec) {
         if (field_0x00e0[mSelectNum] < field_0x00ec) {
@@ -764,7 +724,6 @@ bool dFile_select_c::selectDataMoveAnm() {
     }
 }
 
-/* 80185C2C-80185DE0 18056C 01B4+00 1/1 0/0 0/0 .text dataSelectAnmSet__14dFile_select_cFv */
 void dFile_select_c::dataSelectAnmSet() {
     if (mSelectNum != 0xff) {
         field_0x00bc[mSelectNum]->getPanePtr()->setAnimation((J2DAnmTransform*)field_0x0084);
@@ -785,7 +744,6 @@ void dFile_select_c::dataSelectAnmSet() {
     }
 }
 
-/* 80185DE0-80186088 180720 02A8+00 1/0 0/0 0/0 .text dataSelectMoveAnime__14dFile_select_cFv */
 void dFile_select_c::dataSelectMoveAnime() {
     bool iVar7 = true;
     bool iVar6 = true;
@@ -838,7 +796,6 @@ void dFile_select_c::dataSelectMoveAnime() {
     }
 }
 
-/* 80186088-801864DC 1809C8 0454+00 2/2 0/0 0/0 .text            makeRecInfo__14dFile_select_cFUc */
 void dFile_select_c::makeRecInfo(u8 param_1) {
     dSv_save_c* pSave = (dSv_save_c*)&mSave[param_1];
     J2DPane* ken0 = mSelDt.ScrDt->search('ken_00');
@@ -930,7 +887,6 @@ void dFile_select_c::makeRecInfo(u8 param_1) {
     }
 }
 
-/* 801864DC-80186638 180E1C 015C+00 1/0 0/0 0/0 .text selectDataOpenMove__14dFile_select_cFv */
 void dFile_select_c::selectDataOpenMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool selectDataMove = selectDataMoveAnm();
@@ -950,7 +906,6 @@ void dFile_select_c::selectDataOpenMove() {
     }
 }
 
-/* 80186638-801866C8 180F78 0090+00 1/0 0/0 0/0 .text selectDataNameMove__14dFile_select_cFv */
 void dFile_select_c::selectDataNameMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool fileRecScale = fileRecScaleAnm2();
@@ -962,8 +917,6 @@ void dFile_select_c::selectDataNameMove() {
     }
 }
 
-/* 801866C8-80186774 181008 00AC+00 1/0 0/0 0/0 .text selectDataOpenEraseMove__14dFile_select_cFv
- */
 void dFile_select_c::selectDataOpenEraseMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool selectDataMove = selectDataMoveAnm();
@@ -978,7 +931,6 @@ void dFile_select_c::selectDataOpenEraseMove() {
     }
 }
 
-/* 80186774-801868EC 1810B4 0178+00 1/0 0/0 0/0 .text            menuSelect__14dFile_select_cFv */
 // Handles selecting between copy / start / delete menus in quest log
 void dFile_select_c::menuSelect() {
     mStick->checkTrigger();
@@ -1012,8 +964,6 @@ void dFile_select_c::menuSelect() {
     }
 }
 
-/* 801868EC-80186A80 18122C 0194+00 1/1 0/0 0/0 .text            menuSelectStart__14dFile_select_cFv
- */
 // Handles copy / start / delete actions depending on which menu is selected from menuSelect
 void dFile_select_c::menuSelectStart() {
     mDoAud_seStart(Z2SE_SY_CURSOR_OK,0,0,0);
@@ -1044,7 +994,6 @@ void dFile_select_c::menuSelectStart() {
     }
 }
 
-/* 80186A80-80186B48 1813C0 00C8+00 1/1 0/0 0/0 .text menuSelectCansel__14dFile_select_cFv */
 void dFile_select_c::menuSelectCansel() {
     mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL,0,0,0);
     int idx = mSelectNum;
@@ -1056,7 +1005,6 @@ void dFile_select_c::menuSelectCansel() {
     field_0x026f = 0xd;
 }
 
-/* 80186B48-80186C84 181488 013C+00 8/8 0/0 0/0 .text menuMoveAnmInitSet__14dFile_select_cFii */
 void dFile_select_c::menuMoveAnmInitSet(int param_0, int param_1) {
     if (param_0 == 799) {
         field_0x0283 = true;
@@ -1077,7 +1025,6 @@ void dFile_select_c::menuMoveAnmInitSet(int param_0, int param_1) {
     field_0x0118->animationTransform();
 }
 
-/* 80186CAC-80186E14 1815EC 0168+00 9/9 0/0 0/0 .text            menuMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::menuMoveAnm() {
     if (field_0x0358 != field_0x035c) {
         if (field_0x0358 < field_0x035c){
@@ -1114,7 +1061,6 @@ bool dFile_select_c::menuMoveAnm() {
     }
 }
 
-/* 80186E14-80186F98 181754 0184+00 1/1 0/0 0/0 .text menuSelectAnmSet__14dFile_select_cFv */
 void dFile_select_c::menuSelectAnmSet() {
     if (mSelectMenuNum != 0xFF) {
         field_0x0340[mSelectMenuNum]->getPanePtr()->setAnimation(field_0x0328);
@@ -1133,7 +1079,6 @@ void dFile_select_c::menuSelectAnmSet() {
     }
 }
 
-/* 80186F98-8018721C 1818D8 0284+00 1/0 0/0 0/0 .text menuSelectMoveAnm__14dFile_select_cFv */
 void dFile_select_c::menuSelectMoveAnm() {
     bool tmp1 = true;
     if (mSelectMenuNum != 0xFF && field_0x034c[mSelectMenuNum] != MenuSelStartFrameTbl[mSelectMenuNum]) {
@@ -1193,7 +1138,6 @@ void dFile_select_c::menuSelectMoveAnm() {
   }
 }
 
-/* 8018721C-801872C4 181B5C 00A8+00 1/0 0/0 0/0 .text            ToNameMove__14dFile_select_cFv */
 void dFile_select_c::ToNameMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool nameMove = nameMoveAnm();
@@ -1207,7 +1151,6 @@ void dFile_select_c::ToNameMove() {
     }
 }
 
-/* 801872C4-80187384 181C04 00C0+00 1/0 0/0 0/0 .text            ToNameMove2__14dFile_select_cFv */
 void dFile_select_c::ToNameMove2() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool nameMove = nameMoveAnm();
@@ -1222,14 +1165,11 @@ void dFile_select_c::ToNameMove2() {
     }
 }
 
-/* 80187384-801873BC 181CC4 0038+00 1/0 0/0 0/0 .text            nameInputWait__14dFile_select_cFv
- */
 void dFile_select_c::nameInputWait() {
     mpName->showIcon();
     field_0x026f = 16;
 }
 
-/* 801873BC-801874F8 181CFC 013C+00 1/0 0/0 0/0 .text            nameInput__14dFile_select_cFv */
 void dFile_select_c::nameInput() {
     mpName->_move();
     if (mpName->getCurPos() == 0) {
@@ -1265,7 +1205,6 @@ void dFile_select_c::nameInput() {
     }
 }
 
-/* 801874F8-8018759C 181E38 00A4+00 1/0 0/0 0/0 .text nameToDataSelectMove__14dFile_select_cFv */
 void dFile_select_c::nameToDataSelectMove() {
     bool headerTxtChange =  headerTxtChangeAnm();
     bool fileResScal = fileRecScaleAnm2();
@@ -1279,8 +1218,6 @@ void dFile_select_c::nameToDataSelectMove() {
     }
 }
 
-/* 8018759C-801876A0 181EDC 0104+00 1/0 0/0 0/0 .text            nameInputFade__14dFile_select_cFv
- */
 void dFile_select_c::nameInputFade() {
     char name[32];
     field_0x020a--;
@@ -1298,8 +1235,6 @@ void dFile_select_c::nameInputFade() {
     }
 }
 
-/* 801876A0-8018774C 181FE0 00AC+00 1/0 0/0 0/0 .text            nameInput2Move__14dFile_select_cFv
- */
 void dFile_select_c::nameInput2Move() {
     if (mDoRst::isReset() == 0) {
         field_0x020a--;
@@ -1314,7 +1249,6 @@ void dFile_select_c::nameInput2Move() {
     }
 }
 
-/* 8018774C-80187824 18208C 00D8+00 1/0 0/0 0/0 .text            nameInput2__14dFile_select_cFv */
 void dFile_select_c::nameInput2() {
     mpName->_move();
     if (mpName->getCurPos() == 0) {
@@ -1338,7 +1272,6 @@ void dFile_select_c::nameInput2() {
     }
 }
 
-/* 80187824-80187908 182164 00E4+00 1/0 0/0 0/0 .text backNameInputMove0__14dFile_select_cFv */
 void dFile_select_c::backNameInputMove0() {
     field_0x020a--;
     u8 alpha = (1.0f - (field_0x020a / 15.0f)) * 255.0f;
@@ -1354,7 +1287,6 @@ void dFile_select_c::backNameInputMove0() {
     }
 }
 
-/* 80187908-801879B8 182248 00B0+00 1/0 0/0 0/0 .text backNameInputMove__14dFile_select_cFv */
 void dFile_select_c::backNameInputMove() {
     if (mDoRst::isReset() == 0) {
         field_0x020a--;
@@ -1369,8 +1301,6 @@ void dFile_select_c::backNameInputMove() {
     }
 }
 
-/* 801879B8-80187ADC 1822F8 0124+00 1/0 0/0 0/0 .text            ToCopyPaneMove__14dFile_select_cFv
- */
 void dFile_select_c::ToCopyPaneMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool menuMove = menuMoveAnm();
@@ -1389,8 +1319,6 @@ void dFile_select_c::ToCopyPaneMove() {
     }
 }
 
-/* 80187ADC-80187B44 18241C 0068+00 1/0 0/0 0/0 .text            ToErasePaneMove__14dFile_select_cFv
- */
 void dFile_select_c::ToErasePaneMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool yesnoMenuMove = yesnoMenuMoveAnm();
@@ -1401,8 +1329,6 @@ void dFile_select_c::ToErasePaneMove() {
     }
 }
 
-/* 80187B44-80187BE8 182484 00A4+00 1/0 0/0 0/0 .text            backSelectMove__14dFile_select_cFv
- */
 void dFile_select_c::backSelectMove() {
     bool headerTxtChange = headerTxtChangeAnm();
     bool selectDataMove = selectDataMoveAnm();
@@ -1416,8 +1342,6 @@ void dFile_select_c::backSelectMove() {
     }
 }
 
-/* 80187BE8-80187DB8 182528 01D0+00 6/6 0/0 0/0 .text copySelMoveAnmInitSet__14dFile_select_cFii
- */
 void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) {
     if (param_0 == 0xd1f) {
         field_0x02c0[0]->setAlpha(0xff);
@@ -1448,7 +1372,6 @@ void dFile_select_c::copySelMoveAnmInitSet(int param_0, int param_1) {
     field_0x011c->animationTransform();
 }
 
-/* 80187DB8-80187ED4 1826F8 011C+00 1/1 0/0 0/0 .text setSaveDataForCopySel__14dFile_select_cFv */
 void dFile_select_c::setSaveDataForCopySel() {
     static u64 l_tagName101[2] = {'w_nun01', 'w_nun02'};
     static char* l_numTex[3] = {
@@ -1479,7 +1402,6 @@ void dFile_select_c::setSaveDataForCopySel() {
     }
 }
 
-/* 80187ED4-8018801C 182814 0148+00 1/0 0/0 0/0 .text copyDataToSelect__14dFile_select_cFv */
 void dFile_select_c::copyDataToSelect() {
     mStick->checkTrigger();
     if (mDoCPd_c::getTrigA(0) != 0) {
@@ -1507,7 +1429,6 @@ void dFile_select_c::copyDataToSelect() {
     }
 }
 
-/* 8018801C-80188234 18295C 0218+00 1/1 0/0 0/0 .text copyDataToSelectStart__14dFile_select_cFv */
 void dFile_select_c::copyDataToSelectStart() {
     mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0);
     field_0x026d = getCptoNum(field_0x026b);
@@ -1537,8 +1458,6 @@ void dFile_select_c::copyDataToSelectStart() {
     }
 }
 
-/* 80188234-8018832C 182B74 00F8+00 1/1 0/0 0/0 .text copyDataToSelectCansel__14dFile_select_cFv
- */
 void dFile_select_c::copyDataToSelectCansel() {
     mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0);
     selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectNum], SelOpenEndFrameTbl[mSelectNum]);
@@ -1550,8 +1469,6 @@ void dFile_select_c::copyDataToSelectCansel() {
     field_0x026f = 24;
 }
 
-/* 8018832C-801884D0 182C6C 01A4+00 1/1 0/0 0/0 .text
- * copyDataToSelectMoveAnmSet__14dFile_select_cFv               */
 void dFile_select_c::copyDataToSelectMoveAnmSet() {
     if (field_0x026b != 0xff) {
         field_0x02d8[field_0x026b]->alphaAnimeStart(0);
@@ -1571,8 +1488,6 @@ void dFile_select_c::copyDataToSelectMoveAnmSet() {
     }
 }
 
-/* 801884D0-80188834 182E10 0364+00 1/0 0/0 0/0 .text copyDataToSelectMoveAnm__14dFile_select_cFv
- */
 void dFile_select_c::copyDataToSelectMoveAnm() {
     bool iVar7 = true;
     bool iVar6 = true;
@@ -1623,8 +1538,6 @@ void dFile_select_c::copyDataToSelectMoveAnm() {
     }
 }
 
-/* 80188834-80188878 183174 0044+00 1/1 0/0 0/0 .text
- * copySelectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc        */
 void dFile_select_c::copySelectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     if (param_1 != 0xff) {
         field_0x02c0[param_1]->alphaAnimeStart(0);
@@ -1636,8 +1549,6 @@ void dFile_select_c::copySelectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param
     }
 }
 
-/* 80188878-80188950 1831B8 00D8+00 1/1 0/0 0/0 .text copySelectWakuAlpahAnm__14dFile_select_cFUc
- */
 bool dFile_select_c::copySelectWakuAlpahAnm(u8 param_1) {
     if (param_1 == 0xff) {
         return true;
@@ -1652,7 +1563,6 @@ bool dFile_select_c::copySelectWakuAlpahAnm(u8 param_1) {
     return rv;
 }
 
-/* 80188950-80188994 183290 0044+00 1/1 0/0 0/0 .text            getCptoNum__14dFile_select_cFUc */
 u8 dFile_select_c::getCptoNum(u8 param_0) {
     u8 cptoNum;
     switch (field_0x026a) {
@@ -1669,8 +1579,6 @@ u8 dFile_select_c::getCptoNum(u8 param_0) {
     return cptoNum;
 }
 
-/* 80188994-80188B54 1832D4 01C0+00 1/0 0/0 0/0 .text            copyToSelBack__14dFile_select_cFv
- */
 void dFile_select_c::copyToSelBack() {
     bool txtChanged = headerTxtChangeAnm();
     bool selectDataMoved = selectDataMoveAnm();
@@ -1696,7 +1604,6 @@ void dFile_select_c::copyToSelBack() {
     }
 }
 
-/* 80188B54-80188BBC 183494 0068+00 1/0 0/0 0/0 .text copyToSelPaneMove__14dFile_select_cFv */
 void dFile_select_c::copyToSelPaneMove() {
     bool txtChanged = headerTxtChangeAnm();
     bool menuMoved = yesnoMenuMoveAnm();
@@ -1706,8 +1613,6 @@ void dFile_select_c::copyToSelPaneMove() {
     }
 }
 
-/* 80188BBC-80188D38 1834FC 017C+00 14/14 0/0 0/0 .text
- * yesnoMenuMoveAnmInitSet__14dFile_select_cFii                 */
 bool dFile_select_c::yesnoMenuMoveAnmInitSet(int param_1, int param_2) {
     if (!field_0x0108) {
         field_0x0268 = false;
@@ -1728,7 +1633,6 @@ bool dFile_select_c::yesnoMenuMoveAnmInitSet(int param_1, int param_2) {
     field_0x00f0[1]->getPanePtr()->animationTransform();
 }
 
-/* 80188D38-80188ED0 183678 0198+00 15/15 0/0 0/0 .text yesnoMenuMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::yesnoMenuMoveAnm() {
     bool rv;
     if (field_0x0100 != field_0x0104) {
@@ -1766,7 +1670,6 @@ bool dFile_select_c::yesnoMenuMoveAnm() {
     return rv;
 }
 
-/* 80188ED0-8018912C 183810 025C+00 3/3 0/0 0/0 .text yesnoSelectMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::yesnoSelectMoveAnm() {
     bool rv = false;
     bool bVar1 = true;
@@ -1816,8 +1719,6 @@ bool dFile_select_c::yesnoSelectMoveAnm() {
     return rv;
 }
 
-/* 8018912C-8018929C 183A6C 0170+00 9/9 0/0 0/0 .text            yesnoCursorShow__14dFile_select_cFv
- */
 void dFile_select_c::yesnoCursorShow() {
     if (field_0x0268 == 0xff) {
         return;
@@ -1832,7 +1733,6 @@ void dFile_select_c::yesnoCursorShow() {
     mSelIcon->setParam(0.96f, 0.84f, 0.06f, 0.5f, 0.5f);
 }
 
-/* 8018929C-801893E4 183BDC 0148+00 1/0 0/0 0/0 .text            YesNoSelect__14dFile_select_cFv */
 void dFile_select_c::YesNoSelect() {
     mStick->checkTrigger();
     if (mDoCPd_c::getTrigA(0) != 0) {
@@ -1862,7 +1762,6 @@ void dFile_select_c::YesNoSelect() {
     }
 }
 
-/* 801893E4-8018978C 183D24 03A8+00 1/1 0/0 0/0 .text yesNoSelectStart__14dFile_select_cFv */
 void dFile_select_c::yesNoSelectStart() {
     if (field_0x0268 != 0) {
         mDoAud_seStart(Z2SE_SY_CURSOR_OK, 0, 0, 0);
@@ -1920,7 +1819,6 @@ void dFile_select_c::yesNoSelectStart() {
     }
 }
 
-/* 8018978C-80189904 1840CC 0178+00 3/3 0/0 0/0 .text yesnoSelectAnmSet__14dFile_select_cFv */
 void dFile_select_c::yesnoSelectAnmSet() {
     if (field_0x0269 != 0xff) {
         yesnoWakuAlpahAnmInit(field_0x0269, 0xff, 0, g_fsHIO.field_0x0008);
@@ -1938,7 +1836,6 @@ void dFile_select_c::yesnoSelectAnmSet() {
     }
 }
 
-/* 80189904-80189A24 184244 0120+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__14dFile_select_cFv */
 void dFile_select_c::yesnoCancelAnmSet() {
     mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, 0, 0, 0);
     mSelIcon->setAlphaRate(0.0f);
@@ -1958,8 +1855,6 @@ void dFile_select_c::yesnoCancelAnmSet() {
     field_0x026f = 27;
 }
 
-/* 80189A24-80189BA8 184364 0184+00 1/0 0/0 0/0 .text            YesNoCancelMove__14dFile_select_cFv
- */
 void dFile_select_c::YesNoCancelMove() {
     bool txtChanged = headerTxtChangeAnm();
     bool moveAnimated = yesnoMenuMoveAnm();
@@ -2000,7 +1895,6 @@ void dFile_select_c::YesNoCancelMove() {
     }
 }
 
-/* 80189BA8-80189C14 1844E8 006C+00 1/0 0/0 0/0 .text yesNoCursorMoveAnm__14dFile_select_cFv */
 void dFile_select_c::yesNoCursorMoveAnm() {
     bool moveAnimated = yesnoSelectMoveAnm();
     bool wakuAnimated = yesnoWakuAlpahAnm(field_0x0269);
@@ -2010,7 +1904,6 @@ void dFile_select_c::yesNoCursorMoveAnm() {
     }
 }
 
-/* 80189C14-80189E28 184554 0214+00 1/0 0/0 0/0 .text CmdExecPaneMove0__14dFile_select_cFv */
 void dFile_select_c::CmdExecPaneMove0() {
     int txtChanged = headerTxtChangeAnm();
     int unaff_r29;
@@ -2055,7 +1948,6 @@ void dFile_select_c::CmdExecPaneMove0() {
     }
 }
 
-/* 80189E28-80189F68 184768 0140+00 1/0 0/0 0/0 .text            CommandExec__14dFile_select_cFv */
 void dFile_select_c::CommandExec() {
     switch (field_0x026e) {
     case 1:
@@ -2078,8 +1970,6 @@ void dFile_select_c::CommandExec() {
     field_0x03ac = g_fsHIO.field_0x000c;
 }
 
-/* 80189F68-80189FFC 1848A8 0094+00 1/0 0/0 0/0 .text            DataEraseWait__14dFile_select_cFv
- */
 void dFile_select_c::DataEraseWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -2091,8 +1981,6 @@ void dFile_select_c::DataEraseWait() {
     }
 }
 
-/* 80189FFC-8018A194 18493C 0198+00 1/0 0/0 0/0 .text            DataEraseWait2__14dFile_select_cFv
- */
 void dFile_select_c::DataEraseWait2() {
     if (field_0x03ac != 0) {
         mDoAud_seStartLevel(Z2SE_SY_FILE_DELETE_LEVEL, 0, 0, 0);
@@ -2115,8 +2003,6 @@ void dFile_select_c::DataEraseWait2() {
     }
 }
 
-/* 8018A194-8018A2DC 184AD4 0148+00 1/0 0/0 0/0 .text            ErasePaneMoveOk__14dFile_select_cFv
- */
 void dFile_select_c::ErasePaneMoveOk() {
     int iVar1 = field_0x014c[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0);
     int iVar2;
@@ -2137,7 +2023,6 @@ void dFile_select_c::ErasePaneMoveOk() {
     }
 }
 
-/* 8018A2DC-8018A3B0 184C1C 00D4+00 1/0 0/0 0/0 .text ErasePaneMoveOk2__14dFile_select_cFv */
 void dFile_select_c::ErasePaneMoveOk2() {
     bool txtChanged = headerTxtChangeAnm();
     bool iVar2 =
@@ -2152,8 +2037,6 @@ void dFile_select_c::ErasePaneMoveOk2() {
     }
 }
 
-/* 8018A3B0-8018A444 184CF0 0094+00 1/0 0/0 0/0 .text eraseEndBackSelectWait__14dFile_select_cFv
- */
 void dFile_select_c::eraseEndBackSelectWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -2165,7 +2048,6 @@ void dFile_select_c::eraseEndBackSelectWait() {
     }
 }
 
-/* 8018A444-8018A4D0 184D84 008C+00 1/0 0/0 0/0 .text eraseEndBackSelect__14dFile_select_cFv */
 void dFile_select_c::eraseEndBackSelect() {
     bool txtChanged = headerTxtChangeAnm();
     bool dataMoved = selectDataMoveAnm();
@@ -2177,7 +2059,6 @@ void dFile_select_c::eraseEndBackSelect() {
     }
 }
 
-/* 8018A4D0-8018A564 184E10 0094+00 1/0 0/0 0/0 .text            DataCopyWait__14dFile_select_cFv */
 void dFile_select_c::DataCopyWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -2189,8 +2070,6 @@ void dFile_select_c::DataCopyWait() {
     }
 }
 
-/* 8018A564-8018A6F8 184EA4 0194+00 1/0 0/0 0/0 .text            DataCopyWait2__14dFile_select_cFv
- */
 void dFile_select_c::DataCopyWait2() {
     if (field_0x03ac != 0) {
         mDoAud_seStartLevel(Z2SE_SY_FILE_COPY_LEVEL, 0, 0, 0);
@@ -2216,8 +2095,6 @@ void dFile_select_c::DataCopyWait2() {
     }
 }
 
-/* 8018A6F8-8018A868 185038 0170+00 1/0 0/0 0/0 .text            copyPaneMoveOk__14dFile_select_cFv
- */
 void dFile_select_c::copyPaneMoveOk() {
     bool iVar1 = field_0x0158[field_0x026d]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0);
     bool iVar2 = field_0x0158[mSelectNum]->alphaAnime(g_fsHIO.field_0x0009, 0xff, 0, 0);
@@ -2238,8 +2115,6 @@ void dFile_select_c::copyPaneMoveOk() {
     }
 }
 
-/* 8018A868-8018A960 1851A8 00F8+00 1/0 0/0 0/0 .text            copyPaneMoveOk2__14dFile_select_cFv
- */
 void dFile_select_c::copyPaneMoveOk2() {
     bool iVar1 = headerTxtChangeAnm();
     bool iVar2;
@@ -2255,7 +2130,6 @@ void dFile_select_c::copyPaneMoveOk2() {
     }
 }
 
-/* 8018A960-8018AAC4 1852A0 0164+00 1/0 0/0 0/0 .text ErrorMsgPaneMove__14dFile_select_cFv */
 void dFile_select_c::ErrorMsgPaneMove() {
     int txtChanged = headerTxtChangeAnm();
     int unaff_r30;
@@ -2286,7 +2160,6 @@ void dFile_select_c::ErrorMsgPaneMove() {
     }
 }
 
-/* 8018AAC4-8018AC3C 185404 0178+00 1/0 0/0 0/0 .text backDatSelPaneMove__14dFile_select_cFv */
 void dFile_select_c::backDatSelPaneMove() {
     int headerTxtAnm = headerTxtChangeAnm();
     int menuMoved = menuMoveAnm();
@@ -2309,8 +2182,6 @@ void dFile_select_c::backDatSelPaneMove() {
     }
 }
 
-/* 8018AC3C-8018AD38 18557C 00FC+00 1/0 0/0 0/0 .text            backDatSelWait__14dFile_select_cFv
- */
 void dFile_select_c::backDatSelWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -2326,8 +2197,6 @@ void dFile_select_c::backDatSelWait() {
     }
 }
 
-/* 8018AD38-8018AD9C 185678 0064+00 1/0 0/0 0/0 .text            backDatSelWait2__14dFile_select_cFv
- */
 void dFile_select_c::backDatSelWait2() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -2338,12 +2207,10 @@ void dFile_select_c::backDatSelWait2() {
     }
 }
 
-/* 8018AD9C-8018ADA0 1856DC 0004+00 1/0 0/0 0/0 .text            nextModeWait__14dFile_select_cFv */
 void dFile_select_c::nextModeWait() {
     /* empty function */
 }
 
-/* 8018ADA0-8018BEE0 1856E0 1140+00 1/1 0/0 0/0 .text            screenSet__14dFile_select_cFv */
 void dFile_select_c::screenSet() {
     static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'};
     static u64 l_tagName3[3] = {'w_moyo00', 'w_moyo01', 'w_moyo02'};
@@ -2590,7 +2457,6 @@ void dFile_select_c::screenSet() {
     field_0x2378->setAlpha(0);
 }
 
-/* 8018BF2C-8018C524 18686C 05F8+00 1/1 0/0 0/0 .text screenSetCopySel__14dFile_select_cFv */
 void dFile_select_c::screenSetCopySel() {
     static u64 l_tagName000[2] = {'w_sel_01', 'w_sel_02'};
     static u64 l_tagName001[2] = {'w_moyo01', 'w_moyo02'};
@@ -2670,8 +2536,6 @@ void dFile_select_c::screenSetCopySel() {
     mCpSel.field_0x08 = false;
 }
 
-/* 8018C524-8018C8F4 186E64 03D0+00 1/1 0/0 0/0 .text            screenSetYesNo__14dFile_select_cFv
- */
 void dFile_select_c::screenSetYesNo() {
     static u64 l_tagName012[2] = {'w_no_n', 'w_yes_n'};
     static u64 l_tagName013[2] = {'w_no_t', 'w_yes_t'};
@@ -2729,8 +2593,6 @@ void dFile_select_c::screenSetYesNo() {
     }
 }
 
-/* 8018C8F4-8018CCD0 187234 03DC+00 1/1 0/0 0/0 .text            screenSet3Menu__14dFile_select_cFv
- */
 void dFile_select_c::screenSet3Menu() {
     static u64 l_tagName6[3] = {'w_sat_mo', 'w_del_mo', 'w_cop_mo'};
     static u64 l_tagName7[3] = {'w_sat_g', 'w_del_g', 'w_cop_g'};
@@ -2790,8 +2652,6 @@ void dFile_select_c::screenSet3Menu() {
     }
 }
 
-/* 8018CCD0-8018CE38 187610 0168+00 1/1 0/0 0/0 .text            screenSetDetail__14dFile_select_cFv
- */
 void dFile_select_c::screenSetDetail() {
     mSelDt.ScrDt = new J2DScreen();
     JUT_ASSERT(5622, mSelDt.ScrDt != NULL);
@@ -2808,7 +2668,6 @@ void dFile_select_c::screenSetDetail() {
     mSelDt.ScrDt->search('d_win_n')->setUserInfo('n_43');
 }
 
-/* 8018CE38-8018CF50 187778 0118+00 2/2 0/0 0/0 .text            setWakuAnm__14dFile_select_cFv */
 void dFile_select_c::setWakuAnm() {
     field_0x0098->setFrame(3000.0f);
     for (int i = 0; i < 3; i++) {
@@ -2824,7 +2683,6 @@ void dFile_select_c::setWakuAnm() {
     }
 }
 
-/* 8018CF50-8018D044 187890 00F4+00 1/1 0/0 0/0 .text            displayInit__14dFile_select_cFv */
 void dFile_select_c::displayInit() {
     field_0x03b1 = 0;
     mSelectEnd = false;
@@ -2851,7 +2709,6 @@ void dFile_select_c::displayInit() {
     field_0x0271 = 0;
 }
 
-/* 8018D044-8018D0E4 187984 00A0+00 3/3 0/0 0/0 .text            setSaveData__14dFile_select_cFv */
 void dFile_select_c::setSaveData() {
     dSv_save_c* pSave = (dSv_save_c*)mSave;
     for (int i = 0; i < 3; i++) {
@@ -2867,7 +2724,6 @@ void dFile_select_c::setSaveData() {
     }
 }
 
-/* 8018D0E4-8018D25C 187A24 0178+00 20/20 0/0 0/0 .text headerTxtSet__14dFile_select_cFUsUcUc */
 void dFile_select_c::headerTxtSet(u16 param_1, u8 param_2, u8 param_3) {
     static f32 fontsize[2] = {21.0f, 27.0f};
 #if VERSION == VERSION_GCN_JPN
@@ -2898,7 +2754,6 @@ void dFile_select_c::headerTxtSet(u16 param_1, u8 param_2, u8 param_3) {
     }
 }
 
-/* 8018D25C-8018D344 187B9C 00E8+00 21/21 0/0 0/0 .text headerTxtChangeAnm__14dFile_select_cFv */
 bool dFile_select_c::headerTxtChangeAnm() {
     if (field_0x021d != 0) {
         return true;
@@ -2920,7 +2775,6 @@ bool dFile_select_c::headerTxtChangeAnm() {
     }
 }
 
-/* 8018D344-8018D3A0 187C84 005C+00 7/7 0/0 0/0 .text modoruTxtChange__14dFile_select_cFUc */
 void dFile_select_c::modoruTxtChange(u8 param_1) {
     if (param_1 != 0) {
         fopMsgM_messageGet(field_0x0250, 981);
@@ -2931,8 +2785,6 @@ void dFile_select_c::modoruTxtChange(u8 param_1) {
     }
 }
 
-/* 8018D3A0-8018D41C 187CE0 007C+00 11/11 0/0 0/0 .text modoruTxtDispAnmInit__14dFile_select_cFUc
- */
 void dFile_select_c::modoruTxtDispAnmInit(u8 param_1) {
     field_0x024a = param_1;
     if ((param_1 != 0 || field_0x0240->getAlpha() != 0) &&
@@ -2946,7 +2798,6 @@ void dFile_select_c::modoruTxtDispAnmInit(u8 param_1) {
     }
 }
 
-/* 8018D41C-8018D4F8 187D5C 00DC+00 11/11 0/0 0/0 .text modoruTxtDispAnm__14dFile_select_cFv */
 bool dFile_select_c::modoruTxtDispAnm() {
     bool iVar1;
     bool iVar2;
@@ -2964,8 +2815,6 @@ bool dFile_select_c::modoruTxtDispAnm() {
     return false;
 }
 
-/* 8018D4F8-8018D574 187E38 007C+00 13/13 0/0 0/0 .text ketteiTxtDispAnmInit__14dFile_select_cFUc
- */
 void dFile_select_c::ketteiTxtDispAnmInit(u8 param_1) {
     field_0x024b = param_1;
     if ((param_1 != 0 || field_0x0244->getAlpha() != 0) &&
@@ -2979,7 +2828,6 @@ void dFile_select_c::ketteiTxtDispAnmInit(u8 param_1) {
     }
 }
 
-/* 8018D574-8018D650 187EB4 00DC+00 12/12 0/0 0/0 .text ketteiTxtDispAnm__14dFile_select_cFv */
 bool dFile_select_c::ketteiTxtDispAnm() {
     bool iVar1;
     bool iVar2;
@@ -2997,8 +2845,6 @@ bool dFile_select_c::ketteiTxtDispAnm() {
     return false;
 }
 
-/* 8018D650-8018D68C 187F90 003C+00 8/8 0/0 0/0 .text
- * selectWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc            */
 void dFile_select_c::selectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     field_0x0164[param_1]->alphaAnimeStart(0);
     field_0x0170[param_1]->alphaAnimeStart(0);
@@ -3008,7 +2854,6 @@ void dFile_select_c::selectWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3,
     field_0x019a[param_1] = param_4;
 }
 
-/* 8018D68C-8018D764 187FCC 00D8+00 8/8 0/0 0/0 .text selectWakuAlpahAnm__14dFile_select_cFUc */
 bool dFile_select_c::selectWakuAlpahAnm(u8 param_1) {
     if (param_1 == 0xff) {
         return true;
@@ -3023,7 +2868,6 @@ bool dFile_select_c::selectWakuAlpahAnm(u8 param_1) {
     return rv;
 }
 
-/* 8018D764-8018D884 1880A4 0120+00 6/6 0/0 0/0 .text selFileCursorShow__14dFile_select_cFv */
 void dFile_select_c::selFileCursorShow() {
     field_0x0164[mSelectNum]->setAlpha(0xff);
     field_0x0170[mSelectNum]->setAlpha(0xff);
@@ -3035,8 +2879,6 @@ void dFile_select_c::selFileCursorShow() {
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
 }
 
-/* 8018D884-8018D8C8 1881C4 0044+00 1/1 0/0 0/0 .text
- * menuWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc              */
 void dFile_select_c::menuWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) {
     mpPaneAlpha1[i_idx]->alphaAnimeStart(0);
     mpPaneAlpha2[i_idx]->alphaAnimeStart(0);
@@ -3047,7 +2889,6 @@ void dFile_select_c::menuWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 p
     mpPaneMgr2[i_idx]->colorAnimeStart(0);
 }
 
-/* 8018D8C8-8018DA10 188208 0148+00 1/1 0/0 0/0 .text menuWakuAlpahAnm__14dFile_select_cFUc */
 bool dFile_select_c::menuWakuAlpahAnm(u8 param_1) {
     bool rv = false;
     bool iVar1 = mpPaneAlpha1[param_1]->alphaAnime(field_0x038e[param_1], field_0x0388[param_1],
@@ -3066,8 +2907,6 @@ bool dFile_select_c::menuWakuAlpahAnm(u8 param_1) {
     return rv;
 }
 
-/* 8018DA10-8018DB80 188350 0170+00 4/4 0/0 0/0 .text            menuCursorShow__14dFile_select_cFv
- */
 void dFile_select_c::menuCursorShow() {
     if (mSelectMenuNum == 0xff) {
         return;
@@ -3084,8 +2923,6 @@ void dFile_select_c::menuCursorShow() {
 }
 
 
-/* 8018DB80-8018DBCC 1884C0 004C+00 2/2 0/0 0/0 .text
- * yesnoWakuAlpahAnmInit__14dFile_select_cFUcUcUcUc             */
 void dFile_select_c::yesnoWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u8 param_4) {
     if (param_1 != 0xff) {
         field_0x01a0[param_1]->alphaAnimeStart(0);
@@ -3098,7 +2935,6 @@ void dFile_select_c::yesnoWakuAlpahAnmInit(u8 param_1, u8 param_2, u8 param_3, u
     }
 }
 
-/* 8018DBCC-8018DD38 18850C 016C+00 4/4 0/0 0/0 .text yesnoWakuAlpahAnm__14dFile_select_cFUc */
 bool dFile_select_c::yesnoWakuAlpahAnm(u8 param_1) {
     bool rv = false;
     bool iVar5 = true;
@@ -3123,7 +2959,6 @@ bool dFile_select_c::yesnoWakuAlpahAnm(u8 param_1) {
     return rv;
 }
 
-/* 8018DD38-8018DEBC 188678 0184+00 0/0 1/1 0/0 .text            _draw__14dFile_select_cFv */
 void dFile_select_c::_draw() {
     if (!mHasDrawn) {
         dComIfGd_set2DOpa(&fileSel);
@@ -3158,13 +2993,11 @@ void dFile_select_c::_draw() {
     }
 }
 
-/* 8018DEBC-8018DEF4 1887FC 0038+00 1/0 0/0 0/0 .text            draw__15dDlst_FileSel_cFv */
 void dDlst_FileSel_c::draw() {
     J2DGrafContext* graf = dComIfGp_getCurrentGrafPort();
     Scr->draw(0.0f, 0.0f, graf);
 }
 
-/* 8018DEF4-8018DFFC 188834 0108+00 1/0 0/0 0/0 .text            draw__17dDlst_FileSelDt_cFv */
 void dDlst_FileSelDt_c::draw() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     MtxP local_98 = (MtxP)&mpPane->getGlbMtx()[0][0];
@@ -3179,7 +3012,6 @@ void dDlst_FileSelDt_c::draw() {
     ScrDt->draw(0.0f, 0.0f, grafContext);
 }
 
-/* 8018DFFC-8018E0C0 18893C 00C4+00 1/0 0/0 0/0 .text            draw__17dDlst_FileSelCp_cFv */
 void dDlst_FileSelCp_c::draw() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     MtxP local_98 = (MtxP)&mpPane1->getGlbMtx()[0][0];
@@ -3190,19 +3022,16 @@ void dDlst_FileSelCp_c::draw() {
     Scr->draw(0.0f, 0.0f, grafContext);
 }
 
-/* 8018E0C0-8018E0F8 188A00 0038+00 1/0 0/0 0/0 .text            draw__17dDlst_FileSelYn_cFv */
 void dDlst_FileSelYn_c::draw() {
     J2DGrafContext* graf = dComIfGp_getCurrentGrafPort();
     ScrYn->draw(0.0f, 0.0f, graf);
 }
 
-/* 8018E0F8-8018E130 188A38 0038+00 1/0 0/0 0/0 .text            draw__17dDlst_FileSel3m_cFv */
 void dDlst_FileSel3m_c::draw() {
     J2DGrafContext* graf = dComIfGp_getCurrentGrafPort();
     Scr3m->draw(0.0f, 0.0f, graf);
 }
 
-/* 8018E130-8018E1C0 188A70 0090+00 4/4 0/0 0/0 .text errorMoveAnmInitSet__14dFile_select_cFii */
 void dFile_select_c::errorMoveAnmInitSet(int param_1, int param_2) {
     field_0x012c->setAnimation(field_0x0090);
     field_0x0130 = param_1;
@@ -3212,7 +3041,6 @@ void dFile_select_c::errorMoveAnmInitSet(int param_1, int param_2) {
     field_0x014b = true;
 }
 
-/* 8018E1C0-8018E2B4 188B00 00F4+00 5/5 0/0 0/0 .text            errorMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::errorMoveAnm() {
     if (field_0x0130 != field_0x0134) {
         if (field_0x0130 < field_0x0134) {
@@ -3238,8 +3066,6 @@ bool dFile_select_c::errorMoveAnm() {
     }
 }
 
-/* 8018E2B4-8018E4CC 188BF4 0218+00 1/1 0/0 0/0 .text            errDispInitSet__14dFile_select_cFii
- */
 void dFile_select_c::errDispInitSet(int param_1, int param_2) {
     if (param_2 != 0) {
         headerTxtSet(0xffff, 0, 0);
@@ -3278,7 +3104,6 @@ void dFile_select_c::errDispInitSet(int param_1, int param_2) {
     field_0x0271 = 22;
 }
 
-/* 803BB12C-803BB270 01824C 0144+00 1/2 0/0 0/0 .data            MemCardCheckProc */
 typedef void (dFile_select_c::*MemCardCheckFuncT)();
 static MemCardCheckFuncT MemCardCheckProc[27] = {
     &dFile_select_c::MemCardStatCheck,
@@ -3310,12 +3135,10 @@ static MemCardCheckFuncT MemCardCheckProc[27] = {
     &dFile_select_c::MemCardSaveDataClear,
 };
 
-/* 8018E4CC-8018E504 188E0C 0038+00 1/0 0/0 0/0 .text MemCardCheckMain__14dFile_select_cFv */
 void dFile_select_c::MemCardCheckMain() {
     (this->*MemCardCheckProc[field_0x0271])();
 }
 
-/* 8018E504-8018E7C4 188E44 02C0+00 2/0 0/0 0/0 .text MemCardStatCheck__14dFile_select_cFv */
 void dFile_select_c::MemCardStatCheck() {
     u32 status = mDoMemCd_getStatus(0);
     if (status == 14) {
@@ -3381,8 +3204,6 @@ void dFile_select_c::MemCardStatCheck() {
     }
 }
 
-/* 8018E7C4-8018E93C 189104 0178+00 1/0 0/0 0/0 .text            MemCardLoadWait__14dFile_select_cFv
- */
 void dFile_select_c::MemCardLoadWait() {
     int loadRes = mDoMemCd_LoadSync(mSave, sizeof(mSave), 0);
     if (loadRes == 0) {
@@ -3419,7 +3240,6 @@ void dFile_select_c::MemCardLoadWait() {
     }
 }
 
-/* 8018E93C-8018E9B0 18927C 0074+00 1/0 0/0 0/0 .text MemCardErrMsgWaitKey__14dFile_select_cFv */
 void dFile_select_c::MemCardErrMsgWaitKey() {
     if (cAPICPad_ANY_BUTTON(0) != 0 && dMeter2Info_getMsgKeyWaitTimer() == 0) {
         if (field_0x0290 != NULL) {
@@ -3429,13 +3249,10 @@ void dFile_select_c::MemCardErrMsgWaitKey() {
     }
 }
 
-/* 8018E9B0-8018E9D4 1892F0 0024+00 1/0 0/0 0/0 .text noFileSpaceDispInit__14dFile_select_cFv */
 void dFile_select_c::noFileSpaceDispInit() {
     errorTxtSet(10);
 }
 
-/* 8018E9D4-8018EA3C 189314 0068+00 1/0 0/0 0/0 .text MemCardNoFileSpaceDisp__14dFile_select_cFv
- */
 void dFile_select_c::MemCardNoFileSpaceDisp() {
     if (errorTxtChangeAnm() == true) {
         field_0x0290 = &dFile_select_c::iplSelDispInit;
@@ -3444,8 +3261,6 @@ void dFile_select_c::MemCardNoFileSpaceDisp() {
     }
 }
 
-/* 8018EA3C-8018EA90 18937C 0054+00 1/0 0/0 0/0 .text            iplSelDispInit__14dFile_select_cFv
- */
 void dFile_select_c::iplSelDispInit() {
     errorTxtSet(18);
     ketteiTxtDispAnmInit(1);
@@ -3453,8 +3268,6 @@ void dFile_select_c::iplSelDispInit() {
     yesnoMenuMoveAnmInitSet(0x473, 0x47d);
 }
 
-/* 8018EA90-8018EB10 1893D0 0080+00 1/0 0/0 0/0 .text MemCardGotoIPLSelectDisp__14dFile_select_cFv
- */
 void dFile_select_c::MemCardGotoIPLSelectDisp() {
     bool txhChanged = errorTxtChangeAnm();
     bool yesNoMenuMoved = yesnoMenuMoveAnm();
@@ -3465,7 +3278,6 @@ void dFile_select_c::MemCardGotoIPLSelectDisp() {
     }
 }
 
-/* 8018EB10-8018EBCC 189450 00BC+00 1/0 0/0 0/0 .text MemCardGotoIPLSelect__14dFile_select_cFv */
 void dFile_select_c::MemCardGotoIPLSelect() {
     if (errYesNoSelect()) {
         if (field_0x0268) {
@@ -3482,8 +3294,6 @@ void dFile_select_c::MemCardGotoIPLSelect() {
     }
 }
 
-/* 8018EBCC-8018EC4C 18950C 0080+00 1/0 0/0 0/0 .text            MemCardGotoIPL__14dFile_select_cFv
- */
 void dFile_select_c::MemCardGotoIPL() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -3495,7 +3305,6 @@ void dFile_select_c::MemCardGotoIPL() {
     }
 }
 
-/* 8018EC4C-8018ECBC 18958C 0070+00 7/1 0/0 0/0 .text noSaveSelDispInit__14dFile_select_cFv */
 void dFile_select_c::noSaveSelDispInit() {
     errorTxtSet(19);
     field_0x0282 = false;
@@ -3507,7 +3316,6 @@ void dFile_select_c::noSaveSelDispInit() {
     }
 }
 
-/* 8018ECBC-8018ED80 1895FC 00C4+00 1/0 0/0 0/0 .text MemCardNoSaveSelDisp__14dFile_select_cFv */
 void dFile_select_c::MemCardNoSaveSelDisp() {
     bool iVar1 = errorTxtChangeAnm();
     bool iVar3 = true;
@@ -3528,8 +3336,6 @@ void dFile_select_c::MemCardNoSaveSelDisp() {
     }
 }
 
-/* 8018ED80-8018EF5C 1896C0 01DC+00 1/0 0/0 0/0 .text
- * MemCardErrMsgWaitNoSaveSel__14dFile_select_cFv               */
 void dFile_select_c::MemCardErrMsgWaitNoSaveSel() {
     if (!errYesNoSelect()) {
         return;
@@ -3569,8 +3375,6 @@ void dFile_select_c::MemCardErrMsgWaitNoSaveSel() {
     }
 }
 
-/* 8018EF5C-8018EFAC 18989C 0050+00 1/1 0/0 0/0 .text formatYesSelDispInitSet__14dFile_select_cFv
- */
 void dFile_select_c::formatYesSelDispInitSet() {
     errorTxtSet(14);
     field_0x0268 = 0;
@@ -3579,8 +3383,6 @@ void dFile_select_c::formatYesSelDispInitSet() {
     field_0x0271 = 6;
 }
 
-/* 8018EFAC-8018EFFC 1898EC 0050+00 2/2 0/0 0/0 .text formatNoSelDispInitSet__14dFile_select_cFv
- */
 void dFile_select_c::formatNoSelDispInitSet() {
     errorTxtSet(17);
     field_0x0280 = false;
@@ -3588,8 +3390,6 @@ void dFile_select_c::formatNoSelDispInitSet() {
     field_0x0271 = 7;
 }
 
-/* 8018EFFC-8018F080 18993C 0084+00 1/0 0/0 0/0 .text MemCardFormatYesSelDisp__14dFile_select_cFv
- */
 void dFile_select_c::MemCardFormatYesSelDisp() {
     bool iVar1 = errorTxtChangeAnm();
     bool iVar2 = yesnoSelectMoveAnm();
@@ -3600,8 +3400,6 @@ void dFile_select_c::MemCardFormatYesSelDisp() {
     }
 }
 
-/* 8018F080-8018F128 1899C0 00A8+00 1/0 0/0 0/0 .text MemCardFormatNoSelDisp__14dFile_select_cFv
- */
 void dFile_select_c::MemCardFormatNoSelDisp() {
     bool iVar1 = errorTxtChangeAnm();
     bool iVar2 = yesnoMenuMoveAnm();
@@ -3613,8 +3411,6 @@ void dFile_select_c::MemCardFormatNoSelDisp() {
     }
 }
 
-/* 8018F128-8018F17C 189A68 0054+00 1/0 0/0 0/0 .text
- * MemCardErrMsgWaitFormatSel__14dFile_select_cFv               */
 void dFile_select_c::MemCardErrMsgWaitFormatSel() {
     if (errYesNoSelect()) {
         if (field_0x0268) {
@@ -3625,8 +3421,6 @@ void dFile_select_c::MemCardErrMsgWaitFormatSel() {
     }
 }
 
-/* 8018F17C-8018F1CC 189ABC 0050+00 1/1 0/0 0/0 .text formatYesSel2DispInitSet__14dFile_select_cFv
- */
 void dFile_select_c::formatYesSel2DispInitSet() {
     errorTxtSet(13);
     field_0x0280 = false;
@@ -3634,8 +3428,6 @@ void dFile_select_c::formatYesSel2DispInitSet() {
     field_0x0271 = 9;
 }
 
-/* 8018F1CC-8018F228 189B0C 005C+00 1/0 0/0 0/0 .text
- * MemCardErrMsgWaitFormatSel2__14dFile_select_cFv              */
 void dFile_select_c::MemCardErrMsgWaitFormatSel2() {
     if (errYesNoSelect()) {
         if (field_0x0268) {
@@ -3647,8 +3439,6 @@ void dFile_select_c::MemCardErrMsgWaitFormatSel2() {
     }
 }
 
-/* 8018F228-8018F2A4 189B68 007C+00 1/0 0/0 0/0 .text MemCardFormatYesSel2Disp__14dFile_select_cFv
- */
 void dFile_select_c::MemCardFormatYesSel2Disp() {
     bool iVar1 = errorTxtChangeAnm();
     bool iVar2 = yesnoMenuMoveAnm();
@@ -3659,8 +3449,6 @@ void dFile_select_c::MemCardFormatYesSel2Disp() {
     }
 }
 
-/* 8018F2A4-8018F304 189BE4 0060+00 1/0 0/0 0/0 .text            MemCardFormat__14dFile_select_cFv
- */
 void dFile_select_c::MemCardFormat() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -3671,7 +3459,6 @@ void dFile_select_c::MemCardFormat() {
     }
 }
 
-/* 8018F304-8018F374 189C44 0070+00 1/0 0/0 0/0 .text MemCardFormatWait__14dFile_select_cFv */
 void dFile_select_c::MemCardFormatWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -3685,7 +3472,6 @@ void dFile_select_c::MemCardFormatWait() {
     }
 }
 
-/* 8018F374-8018F400 189CB4 008C+00 1/0 0/0 0/0 .text MemCardFormatCheck__14dFile_select_cFv */
 void dFile_select_c::MemCardFormatCheck() {
     if (errorTxtChangeAnm() == true) {
         field_0x0284 = NULL;
@@ -3697,8 +3483,6 @@ void dFile_select_c::MemCardFormatCheck() {
     }
 }
 
-/* 8018F400-8018F488 189D40 0088+00 1/0 0/0 0/0 .text MemCardMakeGameFileSel__14dFile_select_cFv
- */
 void dFile_select_c::MemCardMakeGameFileSel() {
     if (errYesNoSelect()) {
         if (field_0x0268 != 0) {
@@ -3713,8 +3497,6 @@ void dFile_select_c::MemCardMakeGameFileSel() {
     }
 }
 
-/* 8018F488-8018F580 189DC8 00F8+00 1/0 0/0 0/0 .text
- * MemCardMakeGameFileSelDisp__14dFile_select_cFv               */
 void dFile_select_c::MemCardMakeGameFileSelDisp() {
     bool iVar1 = errorTxtChangeAnm();
     bool iVar2 = yesnoMenuMoveAnm();
@@ -3734,7 +3516,6 @@ void dFile_select_c::MemCardMakeGameFileSelDisp() {
     }
 }
 
-/* 8018F580-8018F5E0 189EC0 0060+00 1/0 0/0 0/0 .text MemCardMakeGameFile__14dFile_select_cFv */
 void dFile_select_c::MemCardMakeGameFile() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -3745,8 +3526,6 @@ void dFile_select_c::MemCardMakeGameFile() {
     }
 }
 
-/* 8018F5E0-8018F650 189F20 0070+00 1/0 0/0 0/0 .text MemCardMakeGameFileWait__14dFile_select_cFv
- */
 void dFile_select_c::MemCardMakeGameFileWait() {
     if (field_0x03ac != 0) {
         field_0x03ac--;
@@ -3760,8 +3539,6 @@ void dFile_select_c::MemCardMakeGameFileWait() {
     }
 }
 
-/* 8018F650-8018F6DC 189F90 008C+00 1/0 0/0 0/0 .text MemCardMakeGameFileCheck__14dFile_select_cFv
- */
 void dFile_select_c::MemCardMakeGameFileCheck() {
     if (errorTxtChangeAnm() == 1) {
         field_0x0284 = NULL;
@@ -3773,8 +3550,6 @@ void dFile_select_c::MemCardMakeGameFileCheck() {
     }
 }
 
-/* 8018F6DC-8018F8D8 18A01C 01FC+00 1/0 0/0 0/0 .text MemCardMsgWindowInitOpen__14dFile_select_cFv
- */
 void dFile_select_c::MemCardMsgWindowInitOpen() {
     bool iVar1;
     if (field_0x021e == 0x0) {
@@ -3821,7 +3596,6 @@ void dFile_select_c::MemCardMsgWindowInitOpen() {
     }
 }
 
-/* 8018F8D8-8018F974 18A218 009C+00 1/0 0/0 0/0 .text MemCardMsgWindowOpen__14dFile_select_cFv */
 void dFile_select_c::MemCardMsgWindowOpen() {
     bool iVar1 = errorMoveAnm();
     bool iVar3 = true;
@@ -3837,7 +3611,6 @@ void dFile_select_c::MemCardMsgWindowOpen() {
     }
 }
 
-/* 8018F974-8018FA2C 18A2B4 00B8+00 1/0 0/0 0/0 .text MemCardMsgWindowClose__14dFile_select_cFv */
 void dFile_select_c::MemCardMsgWindowClose() {
     bool errorRes = errorMoveAnm();
     bool menuMoveRes = true;
@@ -3856,8 +3629,6 @@ void dFile_select_c::MemCardMsgWindowClose() {
     }
 }
 
-/* 8018FA2C-8018FB80 18A36C 0154+00 5/5 0/0 0/0 .text            errYesNoSelect__14dFile_select_cFv
- */
 bool dFile_select_c::errYesNoSelect() {
     bool rv = false;
     mStick->checkTrigger();
@@ -3885,7 +3656,6 @@ bool dFile_select_c::errYesNoSelect() {
     return rv;
 }
 
-/* 8018FB80-8018FBF8 18A4C0 0078+00 1/1 0/0 0/0 .text            errCurMove__14dFile_select_cFUc */
 void dFile_select_c::errCurMove(u8 param_1) {
     mDoAud_seStart(Z2SE_SY_MENU_CURSOR_COMMON, 0, param_1, 0);
     yesnoSelectAnmSet();
@@ -3893,8 +3663,6 @@ void dFile_select_c::errCurMove(u8 param_1) {
     field_0x0271 = 25;
 }
 
-/* 8018FBF8-8018FC64 18A538 006C+00 1/0 0/0 0/0 .text
- * MemCardErrYesNoCursorMoveAnm__14dFile_select_cFv             */
 void dFile_select_c::MemCardErrYesNoCursorMoveAnm() {
     bool moveRes = yesnoSelectMoveAnm();
     bool anmRes = yesnoWakuAlpahAnm(field_0x0269);
@@ -3904,7 +3672,6 @@ void dFile_select_c::MemCardErrYesNoCursorMoveAnm() {
     }
 }
 
-/* 8018FC64-8018FD30 18A5A4 00CC+00 9/9 0/0 0/0 .text            errorTxtSet__14dFile_select_cFUs */
 void dFile_select_c::errorTxtSet(u16 param_1) {
     if (param_1 == 0xffff) {
         strcpy(field_0x0140[field_0x0148 ^ 1], "");
@@ -3918,7 +3685,6 @@ void dFile_select_c::errorTxtSet(u16 param_1) {
     field_0x0149 = 0;
 }
 
-/* 8018FD30-8018FE18 18A670 00E8+00 9/9 0/0 0/0 .text errorTxtChangeAnm__14dFile_select_cFv */
 bool dFile_select_c::errorTxtChangeAnm() {
     if (field_0x0149) {
         return true;
@@ -3936,15 +3702,11 @@ bool dFile_select_c::errorTxtChangeAnm() {
     return rv;
 }
 
-/* 8018FE18-8018FE64 18A758 004C+00 1/1 0/0 0/0 .text            fileRecScaleAnm__14dFile_select_cFv
- */
 bool dFile_select_c::fileRecScaleAnm() {
     return field_0x00bc[mSelectNum]->scaleAnime(g_fsHIO.field_0x0005, field_0x00c8[0],
                                                 field_0x00d4[0], 0);
 }
 
-/* 8018FE64-8018FEF4 18A7A4 0090+00 2/2 0/0 0/0 .text fileRecScaleAnmInitSet2__14dFile_select_cFff
- */
 void dFile_select_c::fileRecScaleAnmInitSet2(f32 param_1, f32 param_2) {
     for (int i = 0; (int)i < 3; i++) {
         field_0x00c8[i] = param_1;
@@ -3961,7 +3723,6 @@ void dFile_select_c::fileRecScaleAnmInitSet2(f32 param_1, f32 param_2) {
     }
 }
 
-/* 8018FEF4-8018FF9C 18A834 00A8+00 2/2 0/0 0/0 .text fileRecScaleAnm2__14dFile_select_cFv */
 bool dFile_select_c::fileRecScaleAnm2() {
     bool scaleRes[3];
     for (int i = 0; i < 3; i++) {
@@ -3974,7 +3735,6 @@ bool dFile_select_c::fileRecScaleAnm2() {
     return false;
 }
 
-/* 8018FF9C-80190074 18A8DC 00D8+00 1/1 0/0 0/0 .text fileInfoScaleAnm__14dFile_select_cFv */
 bool dFile_select_c::fileInfoScaleAnm() {
     bool ret;
 
@@ -4004,7 +3764,6 @@ bool dFile_select_c::fileInfoScaleAnm() {
     return ret;
 }
 
-/* 80190074-80190124 18A9B4 00B0+00 5/5 0/0 0/0 .text nameMoveAnmInitSet__14dFile_select_cFii */
 void dFile_select_c::nameMoveAnmInitSet(int param_1, int param_2) {
     if (param_1 == 3359) {
         field_0x0128 = true;
@@ -4019,7 +3778,6 @@ void dFile_select_c::nameMoveAnmInitSet(int param_1, int param_2) {
     field_0x011c->animationTransform();
 }
 
-/* 80190124-80190208 18AA64 00E4+00 9/9 0/0 0/0 .text            nameMoveAnm__14dFile_select_cFv */
 bool dFile_select_c::nameMoveAnm() {
     if (field_0x0120 != field_0x0124) {
         if (field_0x0120 < field_0x0124) {
@@ -4049,7 +3807,6 @@ bool dFile_select_c::nameMoveAnm() {
     }
 }
 
-/* 80190208-80190254 18AB48 004C+00 1/0 0/0 0/0 .text MemCardSaveDataClear__14dFile_select_cFv */
 void dFile_select_c::MemCardSaveDataClear() {
     field_0x03b4 = mDoMemCd_SaveSync();
     if (field_0x03b4 != 0) {
@@ -4057,8 +3814,6 @@ void dFile_select_c::MemCardSaveDataClear() {
     }
 }
 
-/* 80190254-801902B8 18AB94 0064+00 2/2 0/0 0/0 .text            setInitSaveData__14dFile_select_cFv
- */
 void dFile_select_c::setInitSaveData() {
     for (int i = 0; i < 3; i++) {
         dComIfGs_setInitDataToCard((u8*)mSave, i);
@@ -4066,12 +3821,10 @@ void dFile_select_c::setInitSaveData() {
     }
 }
 
-/* 801902B8-801902F0 18ABF8 0038+00 2/2 0/0 0/0 .text            dataSave__14dFile_select_cFv */
 void dFile_select_c::dataSave() {
     mDoMemCd_save(mSave, sizeof(mSave), 0);
 }
 
-/* 801902F0-80190380 18AC30 0090+00 1/1 0/0 0/0 .text            __ct__16dFile_select3D_cFv */
 dFile_select3D_c::dFile_select3D_c() {
     mpHeap = NULL;
     mpModel = NULL;
@@ -4080,12 +3833,10 @@ dFile_select3D_c::dFile_select3D_c() {
     field_0x03b8.z = 1.0f;
 }
 
-/* 80190380-801903DC 18ACC0 005C+00 1/0 0/0 0/0 .text            __dt__16dFile_select3D_cFv */
 dFile_select3D_c::~dFile_select3D_c() {
     freeHeap();
 }
 
-/* 801903DC-8019049C 18AD1C 00C0+00 1/1 0/0 0/0 .text            _create__16dFile_select3D_cFUcUc */
 void dFile_select3D_c::_create(u8 i_mirrorIdx, u8 i_maskIdx) {
     JKRHeap* ppHeap;
 
@@ -4111,12 +3862,10 @@ void dFile_select3D_c::_create(u8 i_mirrorIdx, u8 i_maskIdx) {
     }
 }
 
-/* 8019049C-801904A0 18ADDC 0004+00 1/1 0/0 0/0 .text            _delete__16dFile_select3D_cFv */
 void dFile_select3D_c::_delete() {
     /* empty function */
 }
 
-/* 801904A0-801904E4 18ADE0 0044+00 2/2 0/0 0/0 .text            freeHeap__16dFile_select3D_cFv */
 void dFile_select3D_c::freeHeap() {
     if (mpHeap) {
         mDoExt_destroySolidHeap(mpHeap);
@@ -4125,7 +3874,6 @@ void dFile_select3D_c::freeHeap() {
     }
 }
 
-/* 801904E4-801905A8 18AE24 00C4+00 1/1 0/0 0/0 .text            _move__16dFile_select3D_cFv */
 void dFile_select3D_c::_move() {
     if (mpModel) {
         cXyz stack_20;
@@ -4138,7 +3886,6 @@ void dFile_select3D_c::_move() {
     }
 }
 
-/* 801905A8-8019065C 18AEE8 00B4+00 1/1 0/0 0/0 .text            draw__16dFile_select3D_cFv */
 void dFile_select3D_c::draw() {
     if (mpModel) {
         dComIfGd_setListItem3D();
@@ -4150,7 +3897,6 @@ void dFile_select3D_c::draw() {
     }
 }
 
-/* 8019065C-8019095C 18AF9C 0300+00 2/2 0/0 0/0 .text setJ3D__16dFile_select3D_cFPCcPCcPCc */
 void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char const* param_2) {
     JKRArchive* archive;
     J3DAnmBase* anmBase;
@@ -4199,7 +3945,6 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con
     }
 }
 
-/* 8019095C-80190A14 18B29C 00B8+00 2/2 0/0 0/0 .text            set_mtx__16dFile_select3D_cFv */
 void dFile_select3D_c::set_mtx() {
     cXyz stack_8;
     f32 tmp = mPane->getScaleX();
@@ -4213,7 +3958,6 @@ void dFile_select3D_c::set_mtx() {
     mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
 }
 
-/* 80190A14-80190B44 18B354 0130+00 1/1 0/0 0/0 .text            animePlay__16dFile_select3D_cFv */
 void dFile_select3D_c::animePlay() {
     if (mBrkAnm) {
         field_0x03c4 += 1.0f;
@@ -4233,7 +3977,6 @@ void dFile_select3D_c::animePlay() {
     }
 }
 
-/* 80190B44-80190BA8 18B484 0064+00 1/1 0/0 0/0 .text            animeEntry__16dFile_select3D_cFv */
 void dFile_select3D_c::animeEntry() {
     if (mBrkAnm) {
         mBrkAnm->entry(mpModel->getModelData());
@@ -4244,7 +3987,6 @@ void dFile_select3D_c::animeEntry() {
     }
 }
 
-/* 80190BA8-80190D68 18B4E8 01C0+00 1/1 0/0 0/0 .text createMaskModel__16dFile_select3D_cFv */
 void dFile_select3D_c::createMaskModel() {
     const static f32 m_kamen_offset_x[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
     const static f32 m_kamen_offset_y[5] = {0.0f, 0.0f, 0.0f, 5.0f, 5.0f};
@@ -4287,7 +4029,6 @@ void dFile_select3D_c::createMaskModel() {
     }
 }
 
-/* 80190D68-80190FE8 18B6A8 0280+00 1/1 0/0 0/0 .text createMirrorModel__16dFile_select3D_cFv */
 void dFile_select3D_c::createMirrorModel() {
     const static f32 m_mirror_offset_x[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
     const static f32 m_mirror_offset_y[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
@@ -4336,7 +4077,6 @@ void dFile_select3D_c::createMirrorModel() {
     }
 }
 
-/* 80190FE8-801910D4 18B928 00EC+00 1/1 0/0 0/0 .text toItem3Dpos__16dFile_select3D_cFfffP4cXyz */
 #pragma push
 #pragma optimization_level 2
 void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz* param_3) {
@@ -4355,7 +4095,6 @@ void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz*
 }
 #pragma pop
 
-/* 801910D4-80191130 18BA14 005C+00 1/1 0/0 0/0 .text calcViewMtx__16dFile_select3D_cFPA4_f */
 void dFile_select3D_c::calcViewMtx(Mtx param_0) {
     cMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0);
 }
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index 9a79e2c12f..881d1cc05b 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_gameover
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_gameover.h"
@@ -20,8 +15,8 @@
 
 class dGov_HIO_c : public mDoHIO_entry_c {
 public:
-    /* 8019AFE0 */ dGov_HIO_c();
-    /* 8019C06C */ virtual ~dGov_HIO_c() {}
+    dGov_HIO_c();
+    virtual ~dGov_HIO_c() {}
 
     void genMessage(JORMContext*);
 
@@ -33,11 +28,8 @@ public:
     /* 0x18 */ GXColor mWhite;
 };  // Size: 0x1C
 
-/* 8042CA2C-8042CA48 05974C 001C+00 2/2 0/0 0/0 .bss             l_HIO */
 static dGov_HIO_c l_HIO;
 
-/* 8019ACF8-8019AFE0 195638 02E8+00 1/0 0/0 0/0 .text            draw__24dDlst_Gameover_CAPTURE_cFv
- */
 void dDlst_Gameover_CAPTURE_c::draw() {
     GXTexObj tex_obj;
     Mtx44 m;
@@ -95,7 +87,6 @@ void dDlst_Gameover_CAPTURE_c::draw() {
     GXEnd();
 }
 
-/* 803BBBC8-803BBC34 018CE8 006C+00 2/3 0/0 0/0 .data            init_process */
 typedef void (dGameover_c::*initFunc)();
 static initFunc init_process[] = {
     &dGameover_c::playerAnmWait_init, &dGameover_c::dispFadeOut_init, &dGameover_c::dispWait_init,
@@ -103,7 +94,6 @@ static initFunc init_process[] = {
     &dGameover_c::saveMove_init,      &dGameover_c::saveClose_init,   &dGameover_c::deleteWait_init,
 };
 
-/* 803BBCA0-803BBD0C 018DC0 006C+00 1/2 0/0 0/0 .data            move_process */
 typedef void (dGameover_c::*moveFunc)();
 static moveFunc move_process[] = {
     &dGameover_c::playerAnmWait_proc, &dGameover_c::dispFadeOut_proc, &dGameover_c::dispWait_proc,
@@ -111,7 +101,6 @@ static moveFunc move_process[] = {
     &dGameover_c::saveMove_proc,      &dGameover_c::saveClose_proc,   &dGameover_c::deleteWait_proc,
 };
 
-/* 8019AFE0-8019B044 195920 0064+00 1/1 0/0 0/0 .text            __ct__10dGov_HIO_cFv */
 dGov_HIO_c::dGov_HIO_c() {
     mScale = 2.7f;
     mAlpha = 1.0f;
@@ -128,7 +117,6 @@ dGov_HIO_c::dGov_HIO_c() {
     mWhite.a = 255;
 }
 
-/* 8019B044-8019B2F4 195984 02B0+00 1/1 0/0 0/0 .text            _create__11dGameover_cFv */
 int dGameover_c::_create() {
     int phase = dComIfG_resLoad(&mPhase, "Gover");
 
@@ -201,7 +189,6 @@ int dGameover_c::_create() {
 }
 
 
-/* 8019B2F4-8019B384 195C34 0090+00 1/1 0/0 0/0 .text            _execute__11dGameover_cFv */
 int dGameover_c::_execute() {
     JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap);
     u8 old_proc = mProc;
@@ -216,27 +203,19 @@ int dGameover_c::_execute() {
 }
 
 
-/* 8019B384-8019B388 195CC4 0004+00 1/0 0/0 0/0 .text            playerAnmWait_init__11dGameover_cFv
- */
 void dGameover_c::playerAnmWait_init() {}
 
-/* 8019B388-8019B3A0 195CC8 0018+00 1/0 0/0 0/0 .text            playerAnmWait_proc__11dGameover_cFv
- */
 void dGameover_c::playerAnmWait_proc() {
     if (mIsDemoSave) {
         mProc = PROC_DISP_FADE_OUT;
     }
 }
 
-/* 8019B3A0-8019B3E8 195CE0 0048+00 1/0 0/0 0/0 .text            dispFadeOut_init__11dGameover_cFv
- */
 void dGameover_c::dispFadeOut_init() {
     mTimer = 30;
     mDoGph_gInf_c::startFadeOut(15);
 }
 
-/* 8019B3E8-8019B40C 195D28 0024+00 1/0 0/0 0/0 .text            dispFadeOut_proc__11dGameover_cFv
- */
 void dGameover_c::dispFadeOut_proc() {
     if (mTimer != 0) {
         mTimer--;
@@ -245,13 +224,11 @@ void dGameover_c::dispFadeOut_proc() {
     }
 }
 
-/* 8019B40C-8019B454 195D4C 0048+00 1/0 0/0 0/0 .text            dispWait_init__11dGameover_cFv */
 void dGameover_c::dispWait_init() {
     mTimer = 90;
     mDoGph_gInf_c::startFadeIn(30);
 }
 
-/* 8019B454-8019B478 195D94 0024+00 1/0 0/0 0/0 .text            dispWait_proc__11dGameover_cFv */
 void dGameover_c::dispWait_proc() {
     if (mTimer != 0) {
         mTimer--;
@@ -260,12 +237,10 @@ void dGameover_c::dispWait_proc() {
     }
 }
 
-/* 8019B478-8019B484 195DB8 000C+00 1/0 0/0 0/0 .text            demoFadeIn_init__11dGameover_cFv */
 void dGameover_c::demoFadeIn_init() {
     mTimer = 0;
 }
 
-/* 8019B484-8019B4D8 195DC4 0054+00 1/0 0/0 0/0 .text            demoFadeIn_proc__11dGameover_cFv */
 void dGameover_c::demoFadeIn_proc() {
     mTimer++;
     dgo_screen_c->setBackAlpha(1.0f);
@@ -275,14 +250,10 @@ void dGameover_c::demoFadeIn_proc() {
     }
 }
 
-/* 8019B4D8-8019B4E4 195E18 000C+00 1/0 0/0 0/0 .text            demoFadeOut_init__11dGameover_cFv
- */
 void dGameover_c::demoFadeOut_init() {
     mTimer = 30;
 }
 
-/* 8019B4E4-8019B560 195E24 007C+00 1/0 0/0 0/0 .text            demoFadeOut_proc__11dGameover_cFv
- */
 void dGameover_c::demoFadeOut_proc() {
     mTimer--;
     dgo_screen_c->setBackAlpha((mTimer * mTimer) / 900.0f);
@@ -292,20 +263,16 @@ void dGameover_c::demoFadeOut_proc() {
     }
 }
 
-/* 8019B560-8019B564 195EA0 0004+00 1/0 0/0 0/0 .text            saveOpen_init__11dGameover_cFv */
 void dGameover_c::saveOpen_init() {}
 
-/* 8019B564-8019B5A4 195EA4 0040+00 1/0 0/0 0/0 .text            saveOpen_proc__11dGameover_cFv */
 void dGameover_c::saveOpen_proc() {
     if (dMs_c->_open()) {
         mProc = PROC_SAVE_MOVE;
     }
 }
 
-/* 8019B5A4-8019B5A8 195EE4 0004+00 1/0 0/0 0/0 .text            saveMove_init__11dGameover_cFv */
 void dGameover_c::saveMove_init() {}
 
-/* 8019B5A8-8019B5F0 195EE8 0048+00 1/0 0/0 0/0 .text            saveMove_proc__11dGameover_cFv */
 void dGameover_c::saveMove_proc() {
     dMs_c->_move();
 
@@ -314,10 +281,8 @@ void dGameover_c::saveMove_proc() {
     }
 }
 
-/* 8019B5F0-8019B5F4 195F30 0004+00 1/0 0/0 0/0 .text            saveClose_init__11dGameover_cFv */
 void dGameover_c::saveClose_init() {}
 
-/* 8019B5F4-8019B7BC 195F34 01C8+00 1/0 0/0 0/0 .text            saveClose_proc__11dGameover_cFv */
 void dGameover_c::saveClose_proc() {
     if (dMs_c->getEndStatus() == 0) {
         dComIfGp_setGameoverStatus(3);
@@ -356,13 +321,10 @@ void dGameover_c::saveClose_proc() {
     }
 }
 
-/* 8019B7BC-8019B7C0 1960FC 0004+00 1/0 0/0 0/0 .text            deleteWait_init__11dGameover_cFv */
 void dGameover_c::deleteWait_init() {}
 
-/* 8019B7C0-8019B7C4 196100 0004+00 1/0 0/0 0/0 .text            deleteWait_proc__11dGameover_cFv */
 void dGameover_c::deleteWait_proc() {}
 
-/* 8019B7C4-8019B864 196104 00A0+00 1/1 0/0 0/0 .text            _draw__11dGameover_cFv */
 int dGameover_c::_draw() {
     if (dgo_capture_c != NULL && dComIfGp_isPauseFlag()) {
         dComIfGd_set2DOpa(dgo_capture_c);
@@ -378,7 +340,6 @@ int dGameover_c::_draw() {
     return 1;
 }
 
-/* 8019B864-8019B940 1961A4 00DC+00 1/1 0/0 0/0 .text            _delete__11dGameover_cFv */
 int dGameover_c::_delete() {
     JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap);
 
@@ -399,8 +360,6 @@ int dGameover_c::_delete() {
     return 1;
 }
 
-/* 8019B940-8019BBFC 196280 02BC+00 1/1 0/0 0/0 .text
- * __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive               */
 dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
     mpScreen = new J2DScreen();
     mpScreen->setPriority("zelda_game_over.blo", 0x100000, i_archive);
@@ -440,16 +399,12 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) {
 }
 
 
-/* 8019BBFC-8019BCB0 19653C 00B4+00 1/0 0/0 0/0 .text            __dt__24dDlst_GameOverScrnDraw_cFv
- */
 dDlst_GameOverScrnDraw_c::~dDlst_GameOverScrnDraw_c() {
     delete mpBackImg;
     delete mpScreen;
     dComIfGp_getMain2DArchive()->removeResourceAll();
 }
 
-/* 8019BCB0-8019BCF4 1965F0 0044+00 3/3 0/0 0/0 .text setBackAlpha__24dDlst_GameOverScrnDraw_cFf
- */
 void dDlst_GameOverScrnDraw_c::setBackAlpha(f32 i_alpha) {
     mpBackImg->setAlpha(i_alpha * 255.0f);
 }
@@ -498,41 +453,31 @@ void dDlst_GameOverScrnDraw_c::draw() {
 }
 
 
-/* 8019BF3C-8019BF5C 19687C 0020+00 1/0 0/0 0/0 .text            dGameover_Draw__FP11dGameover_c */
 static int dGameover_Draw(dGameover_c* i_this) {
     return i_this->_draw();
 }
 
-/* 8019BF5C-8019BF7C 19689C 0020+00 1/0 0/0 0/0 .text            dGameover_Execute__FP11dGameover_c
- */
 static int dGameover_Execute(dGameover_c* i_this) {
     return i_this->_execute();
 }
 
-/* 8019BF7C-8019BF84 1968BC 0008+00 1/0 0/0 0/0 .text            dGameover_IsDelete__FP11dGameover_c
- */
 static int dGameover_IsDelete(dGameover_c* i_this) {
     return 1;
 }
 
-/* 8019BF84-8019BFA4 1968C4 0020+00 1/0 0/0 0/0 .text            dGameover_Delete__FP11dGameover_c
- */
 static int dGameover_Delete(dGameover_c* i_this) {
     return i_this->_delete();
 }
 
-/* 8019BFA4-8019BFC4 1968E4 0020+00 1/0 0/0 0/0 .text            dGameover_Create__FP9msg_class */
 static int dGameover_Create(msg_class* i_this) {
     return static_cast<dGameover_c*>(i_this)->_create();
 }
 
-/* 8019BFC4-8019C008 196904 0044+00 0/0 2/2 0/0 .text            d_GameOver_Create__FUc */
 s32 d_GameOver_Create(u8 i_gameoverType) {
     dMeter2Info_setGameOverType(i_gameoverType);
     return fopMsgM_create(PROC_GAMEOVER, NULL, NULL, NULL, NULL, NULL);
 }
 
-/* 8019C008-8019C06C 196948 0064+00 0/0 1/1 0/0 .text            d_GameOver_Delete__FRUi */
 bool d_GameOver_Delete(fpc_ProcID& i_id) {
     if (i_id != fpcM_ERROR_PROCESS_ID_e) {
         fopMsgM_Delete(fopMsgM_SearchByID(i_id));
@@ -544,7 +489,6 @@ bool d_GameOver_Delete(fpc_ProcID& i_id) {
     return false;
 }
 
-/* 803BBD2C-803BBD40 -00001 0014+00 1/0 0/0 0/0 .data            l_dGameover_Method */
 static void* l_dGameover_Method[5] = {
     (void*)dGameover_Create,
     (void*)dGameover_Delete,
@@ -553,7 +497,6 @@ static void* l_dGameover_Method[5] = {
     (void*)dGameover_Draw,
 };
 
-/* 803BBD40-803BBD68 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_GAMEOVER */
 extern void* g_profile_GAMEOVER[10] = {
     (void*)0xFFFFFFFD, (void*)0x000CFFFD,
     (void*)0x03170000, (void*)&g_fpcLf_Method,
diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp
index 9bd64875a1..f69e648c67 100644
--- a/src/d/d_insect.cpp
+++ b/src/d/d_insect.cpp
@@ -10,9 +10,7 @@
 #include "d/d_menu_insect.h"
 #include "f_op/f_op_camera_mng.h"
 #include "m_Do/m_Do_lib.h"
-#include "dol2asm.h"
 
-/* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text            __ct__9dInsect_cFv */
 dInsect_c::dInsect_c() {
     m_itemId = -1;
     field_0x56c = 0;
@@ -23,8 +21,6 @@ dInsect_c::dInsect_c() {
     field_0x585 = 0;
 }
 
-/* 8015E078-8015E26C 1589B8 01F4+00 0/0 0/0 24/24 .text            Insect_GetDemoMain__9dInsect_cFv
- */
 void dInsect_c::Insect_GetDemoMain() {
     switch (m_mode) {
     case 0:
@@ -78,7 +74,6 @@ void dInsect_c::Insect_GetDemoMain() {
     }
 }
 
-/* 8015E26C-8015E3F8 158BAC 018C+00 0/0 0/0 3/3 .text            CalcZBuffer__9dInsect_cFf */
 void dInsect_c::CalcZBuffer(f32 param_0) {
     f32 camera_trim_height;
     cXyz pos_projected;
diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index 5904db9892..de029c6352 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -771,7 +771,6 @@ void item_func_HAWK_EYE() {
     dComIfGs_setItem(SLOT_5, fpcNm_ITEM_HAWK_EYE);
 }
 
-/* 800986C4-80098718 093004 0054+00 1/0 0/0 0/0 .text            item_func_WOOD_STICK__Fv */
 void item_func_WOOD_STICK() {
     dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD);
     dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK);
@@ -1481,7 +1480,6 @@ int item_getcheck_func_LIGHT_SWORD() {
     return dComIfGs_isCollectSword(COLLECT_LIGHT_SWORD);
 }
 
-/* 8009A0C8-8009A1FC 094A08 0134+00 7/6 0/0 0/0 .text item_getcheck_func_FISHING_ROD_1__Fv */
 int item_getcheck_func_FISHING_ROD_1() {
     return (dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_FISHING_ROD_1 ||
             dComIfGs_getItem(SLOT_20, true) == fpcNm_ITEM_BEE_ROD ||
@@ -2000,7 +1998,6 @@ int isArrow(u8 i_itemNo) {
     return is_arrow;
 }
 
-/* 8009B708-8009B77C 096048 0074+00 0/0 4/4 1/1 .text            isBottleItem__FUc */
 BOOL isBottleItem(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_OIL_BOTTLE3:
@@ -2127,7 +2124,6 @@ u8 check_itemno(int i_itemNo) {
     return i_itemNo;
 }
 
-/* 8009B940-8009BBD8 096280 0298+00 11/11 0/0 0/0 .text            addBombCount__FUcUc */
 int addBombCount(u8 i_bombType, u8 i_addNum) {
     u8 bombType[3];
     int bombNum[3];
@@ -2190,5 +2186,4 @@ int addBombCount(u8 i_bombType, u8 i_addNum) {
     return i_addNum;
 }
 
-/* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss            mData__12dEnemyItem_c */
 u8* dEnemyItem_c::mData;
diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp
index c347e59ce1..00f6acccda 100644
--- a/src/d/d_item_data.cpp
+++ b/src/d/d_item_data.cpp
@@ -2,7 +2,6 @@
 
 #include "d/d_item_data.h"
 
-/* 803AC5A0-803ADD88 -00001 17E8+00 0/0 10/10 2/2 .data            item_resource__10dItem_data */
 dItem_itemResource dItem_data::item_resource[] = {
     {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
     {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x3C, 0x0000},
@@ -261,7 +260,6 @@ dItem_itemResource dItem_data::item_resource[] = {
     {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000},
 };
 
-/* 803ADD88-803AED78 -00001 0FF0+00 0/0 3/3 14/14 .data            field_item_res__10dItem_data */
 dItem_fieldItemResource dItem_data::field_item_res[] = {
     {"Always", 0x0014, 0xFFFF, 0x0030, 0xFF, 0x1000},
     {"Always", 0x0017, 0xFFFF, 0x0031, 0x0, 0x1000},
@@ -520,7 +518,6 @@ dItem_fieldItemResource dItem_data::field_item_res[] = {
     {"T_g_key", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
 };
 
-/* 803AED78-803AF178 00BE98 03FC+04 0/0 9/9 9/9 .data            item_info__10dItem_data */
 dItem_itemInfo dItem_data::item_info[] = {
     {15, 40, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4},   {20, 70, 30, 4},    {20, 70, 30, 4},
     {20, 70, 30, 4}, {20, 70, 30, 4}, {20, 70, 30, 4},   {20, 40, 30, 4},    {20, 40, 30, 4},
diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp
index 26ba4d763e..0bda9f6962 100644
--- a/src/d/d_jnt_col.cpp
+++ b/src/d/d_jnt_col.cpp
@@ -10,15 +10,12 @@
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80035C8C-80035CA0 0305CC 0014+00 0/0 1/1 8/8 .text            __ct__9dJntCol_cFv */
 dJntCol_c::dJntCol_c() {
     mModel = 0;
     mData = 0;
     field_0x8 = 0;
 }
 
-/* 80035CA0-80035CC8 0305E0 0028+00 0/0 2/2 8/8 .text
- * init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli   */
 int dJntCol_c::init(fopAc_ac_c* i_actorP, dJntColData_c const* i_jntColP, J3DModel* i_modelP,
                     int param_3) {
     mData = i_jntColP;
@@ -33,8 +30,6 @@ int dJntCol_c::init(fopAc_ac_c* i_actorP, dJntColData_c const* i_jntColP, J3DMod
     return 1;
 }
 
-/* 80035CC8-80035DC8 030608 0100+00 2/2 0/0 0/0 .text
- * setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz       */
 void dJntCol_c::setNowLine(cM3dGLin* i_line, cXyz const* param_1, csXyz const* param_2,
                            cXyz* param_3) {
     if (param_2 != NULL) {
@@ -49,8 +44,6 @@ void dJntCol_c::setNowLine(cM3dGLin* i_line, cXyz const* param_1, csXyz const* p
     i_line->SetStartEnd(start_pos, end_pos);
 }
 
-/* 80035DC8-80036A5C 030708 0C94+00 2/2 0/0 0/0 .text
- * searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi         */
 int dJntCol_c::searchNearPos(cM3dGLin const* param_1, cXyz const* param_2, cXyz* param_3,
                               int param_4) const {
     const dJntColData_c* pcVar12 = mData;
@@ -215,8 +208,6 @@ int dJntCol_c::searchNearPos(cM3dGLin const* param_1, cXyz const* param_2, cXyz*
     return rv;
 }
 
-/* 80036AEC-80036C44 03142C 0158+00 0/0 0/0 1/1 .text
- * getArrowOffsetPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz */
 int dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_1, csXyz const* param_2,
                                               cXyz* param_3, cXyz* param_4) const {
     cM3dGLin acStack_34;
@@ -244,8 +235,6 @@ int dJntCol_c::getArrowOffsetPosAndAngle(cXyz const* param_1, csXyz const* param
     return jntColData->mJntNum;
 }
 
-/* 80036C44-80036FA8 031584 0364+00 0/0 3/3 0/0 .text
- * getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi */
 int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_1, csXyz const* param_2, cXyz* param_3,
                                          csXyz* param_4, int param_5) const {
     cM3dGLin acStack_54;
@@ -284,8 +273,6 @@ int dJntCol_c::getHitmarkPosAndAngle(cXyz const* param_1, csXyz const* param_2,
     return iVar3;
 }
 
-/* 80036FA8-80037038 0318E8 0090+00 0/0 0/0 1/1 .text
- * setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz */
 void dJntCol_c::setArrowPosAndAngle(cXyz const* param_0, cXyz const* i_srcPos, int i_anmMtxIdx,
                                     cXyz* param_3, csXyz* i_arrowPosP) {
     cXyz dst_pos;
diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp
index 45913a8cf5..f8167d974e 100644
--- a/src/d/d_k_wmark.cpp
+++ b/src/d/d_k_wmark.cpp
@@ -13,7 +13,6 @@
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 80451130-80451134 000630 0004+00 2/2 0/0 0/0 .sbss            m_nowID__9dkWmark_c */
 int dkWmark_c::m_nowID;
 
 int dkWmark_c::create() {
@@ -70,25 +69,21 @@ int dkWmark_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8026141C-80261640 25BD5C 0224+00 1/0 0/0 0/0 .text            dkWmark_Create__FP12kankyo_class */
 static int dkWmark_Create(kankyo_class* i_this) {
     return static_cast<dkWmark_c*>(i_this)->create();
 }
 
-/* 80261640-8026169C 25BF80 005C+00 1/1 0/0 0/0 .text            __dt__9dkWmark_cFv */
 dkWmark_c::~dkWmark_c() {
     if (mpHeap != NULL) {
         mDoExt_destroySolidHeap(mpHeap);
     }
 }
 
-/* 8026169C-802616C4 25BFDC 0028+00 1/0 0/0 0/0 .text            dkWmark_Delete__FP9dkWmark_c */
 static int dkWmark_Delete(dkWmark_c* i_this) {
     i_this->~dkWmark_c();
     return 1;
 }
 
-/* 802616C4-80261964 25C004 02A0+00 2/2 0/0 0/0 .text            setMatrix__9dkWmark_cFv */
 BOOL dkWmark_c::setMatrix() {
     cXyz chk_pos(pos.x, pos.y + 100.0f, pos.z);
 
@@ -135,7 +130,6 @@ int dkWmark_c::execute() {
     return 1;
 }
 
-/* 80261964-80261A18 25C2A4 00B4+00 1/0 0/0 0/0 .text            dkWmark_Execute__FP9dkWmark_c */
 static int dkWmark_Execute(dkWmark_c* i_this) {
     return i_this->execute();
 }
@@ -164,19 +158,16 @@ int dkWmark_c::draw() {
     return 1;
 }
 
-/* 80261A18-80261B54 25C358 013C+00 1/0 0/0 0/0 .text            dkWmark_Draw__FP9dkWmark_c */
 static int dkWmark_Draw(dkWmark_c* i_this) {
     return i_this->draw();
 }
 
-/* 803C3430-803C3444 -00001 0014+00 1/0 0/0 0/0 .data            l_dkWmark_Method */
 static leafdraw_method_class l_dkWmark_Method = {
     (process_method_func)dkWmark_Create,  (process_method_func)dkWmark_Delete,
     (process_method_func)dkWmark_Execute, (process_method_func)NULL,
     (process_method_func)dkWmark_Draw,
 };
 
-/* 803C3444-803C3470 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_WMARK */
 extern kankyo_process_profile_definition g_profile_WMARK = {
     fpcLy_CURRENT_e,
     9,
diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp
index a29045a718..f2d8cd5a3e 100644
--- a/src/d/d_k_wpillar.cpp
+++ b/src/d/d_k_wpillar.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_k_wpillar
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_k_wpillar.h"
@@ -10,10 +5,8 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
-/* 80454FF0-80454FF8 0035F0 0007+01 1/1 0/0 0/0 .sdata2          l_arcName */
 static const char l_arcName[] = "Always";
 
-/* 80261B54-80261F04 25C494 03B0+00 1/1 0/0 0/0 .text            create__11dkWpillar_cFv */
 int dkWpillar_c::create() {
     new (this) dkWpillar_c();
 
@@ -81,27 +74,21 @@ int dkWpillar_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 80261F04-80261F24 25C844 0020+00 1/0 0/0 0/0 .text            dkWpillar_Create__FP12kankyo_class
- */
 static int dkWpillar_Create(kankyo_class* i_this) {
     return static_cast<dkWpillar_c*>(i_this)->create();
 }
 
-/* 80261F24-80261FEC 25C864 00C8+00 1/1 0/0 0/0 .text            __dt__11dkWpillar_cFv */
 dkWpillar_c::~dkWpillar_c() {
     if (mpHeap != NULL) {
         mDoExt_destroySolidHeap(mpHeap);
     }
 }
 
-/* 80261FEC-80262014 25C92C 0028+00 1/0 0/0 0/0 .text            dkWpillar_Delete__FP11dkWpillar_c
- */
 static int dkWpillar_Delete(dkWpillar_c* i_this) {
     i_this->~dkWpillar_c();
     return 1;
 }
 
-/* 80262014-802620A8 25C954 0094+00 1/1 0/0 0/0 .text            execute__11dkWpillar_cFv */
 int dkWpillar_c::execute() {
     mBck.play();
 
@@ -118,13 +105,10 @@ int dkWpillar_c::execute() {
     return 1;
 }
 
-/* 802620A8-802620C8 25C9E8 0020+00 1/0 0/0 0/0 .text            dkWpillar_Execute__FP11dkWpillar_c
- */
 static int dkWpillar_Execute(dkWpillar_c* i_this) {
     return i_this->execute();
 }
 
-/* 802620C8-802621AC 25CA08 00E4+00 1/1 0/0 0/0 .text            draw__11dkWpillar_cFv */
 int dkWpillar_c::draw() {
     g_env_light.settingTevStruct(0x10, &pos, &mTevstr);
     g_env_light.setLightTevColorType_MAJI(mpModel, &mTevstr);
@@ -138,20 +122,16 @@ int dkWpillar_c::draw() {
     return 1;
 }
 
-/* 802621AC-802621CC 25CAEC 0020+00 1/0 0/0 0/0 .text            dkWpillar_Draw__FP11dkWpillar_c */
 static int dkWpillar_Draw(dkWpillar_c* i_this) {
     return i_this->draw();
 }
 
-/* ############################################################################################## */
-/* 803C3470-803C3484 -00001 0014+00 1/0 0/0 0/0 .data            l_dkWpillar_Method */
 static leafdraw_method_class l_dkWpillar_Method = {
     (process_method_func)dkWpillar_Create,  (process_method_func)dkWpillar_Delete,
     (process_method_func)dkWpillar_Execute, (process_method_func)NULL,
     (process_method_func)dkWpillar_Draw,
 };
 
-/* 803C3484-803C34B0 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_WPILLAR */
 extern kankyo_process_profile_definition g_profile_WPILLAR = {
     fpcLy_CURRENT_e,
     9,
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index c798f70c18..013995e0c1 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -37,7 +37,6 @@ inline float cosf(float x) {
     return cos(x);
 }
 
-/* 803BBDC4-803BBEAC 018EE4 00E8+00 1/1 0/0 0/0 .data            lightStatusBase */
 static LightStatus lightStatusBase = {
     {-36384.5f, 29096.699f, 17422.199f},
     {377.0f, 5207.3999f, 1220.4f},
@@ -97,31 +96,24 @@ static LightStatus lightStatusBase = {
     0.5f,
 };
 
-/* 803BBEAC-803BBEBC 018FCC 0010+00 4/4 0/0 0/0 .data            lightMaskData */
 static u16 lightMaskData[8] = {
     GX_LIGHT0, GX_LIGHT1, GX_LIGHT2, GX_LIGHT3, GX_LIGHT4, GX_LIGHT5, GX_LIGHT6, GX_LIGHT7,
 };
 
-/* 8042CA54-8042DD64 059774 1310+00 116/118 128/128 649/649 .bss             g_env_light */
 dScnKy_env_light_c g_env_light;
 
-/* 8042DD70-8042E07C 05AA90 030C+00 1/2 8/8 9/9 .bss             g_mEnvSeMgr */
 Z2EnvSeMgr g_mEnvSeMgr;
 
 #if DEBUG
 dKankyo_HIO_c g_kankyoHIO;
 #endif
 
-/* 8042E07C-8042E7BC 05AD9C 0740+00 5/4 0/0 0/0 .bss             lightStatusData */
 static LightStatus lightStatusData[8];
 
-/* 80450700-80450704 000180 0002+02 2/2 0/0 0/0 .sdata           lightMask */
 static u16 lightMask = 0x0001;
 
-/* 80450704-80450708 -00001 0004+00 3/3 0/0 0/0 .sdata           lightStatusPt */
 static LightStatus* lightStatusPt = lightStatusData;
 
-/* 8019C388-8019C3A4 196CC8 001C+00 2/2 0/0 0/0 .text dKy_WolfPowerup_AmbCol__FP11_GXColorS10 */
 void dKy_WolfPowerup_AmbCol(GXColorS10* in_col_p) {
     JUT_ASSERT(185, in_col_p != NULL);
 
@@ -130,7 +122,6 @@ void dKy_WolfPowerup_AmbCol(GXColorS10* in_col_p) {
     in_col_p->b = 49;
 }
 
-/* 8019C3A4-8019CB0C 196CE4 0768+00 2/2 0/0 0/0 .text            dKy_sense_pat_get__Fv */
 int dKy_sense_pat_get() {
     int pat = 0;
     if (dKy_Outdoor_check()) {
@@ -314,7 +305,6 @@ int dKy_sense_pat_get() {
     return pat;
 }
 
-/* 8019CB0C-8019CCDC 19744C 01D0+00 3/2 0/0 0/0 .text dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 */
 void dKy_WolfPowerup_BgAmbCol(GXColorS10* in_col_p) {
     int pattern = 0;
     JUT_ASSERT(374, in_col_p != NULL);
@@ -413,8 +403,6 @@ void dKy_WolfPowerup_BgAmbCol(GXColorS10* in_col_p) {
     #endif
 }
 
-/* 8019CCDC-8019CE5C 19761C 0180+00 4/3 0/0 0/0 .text            dKy_WolfPowerup_FogNearFar__FPfPf
- */
 void dKy_WolfPowerup_FogNearFar(f32* near_p, f32* far_p) {
     int pattern = 0;
     JUT_ASSERT(499, near_p != NULL);
@@ -498,7 +486,6 @@ void dKy_WolfPowerup_FogNearFar(f32* near_p, f32* far_p) {
     #endif
 }
 
-/* 8019CE5C-8019CFE4 19779C 0188+00 1/1 0/0 0/0 .text dKy_pos2_get_angle__FP4cXyzP4cXyzPsPs */
 void dKy_pos2_get_angle(cXyz* pos1_p, cXyz* pos2_p, s16* pitch_p, s16* yaw_p) {
     cXyz vec;
     vec = *pos1_p - *pos2_p;
@@ -507,7 +494,6 @@ void dKy_pos2_get_angle(cXyz* pos1_p, cXyz* pos2_p, s16* pitch_p, s16* yaw_p) {
     *yaw_p = cM_atan2s(vec.x, vec.z);
 }
 
-/* 8019CFE4-8019D1A0 197924 01BC+00 4/4 0/0 0/0 .text            dKy_twi_wolflight_set__Fi */
 void dKy_twi_wolflight_set(int light_id) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera_p = dComIfGp_getCamera(0);
@@ -564,7 +550,6 @@ void dKy_twi_wolflight_set(int light_id) {
     kankyo->field_0x0c18[light_id].mAngleY = cM_sht2d(-angle_y) + 90.0f;
 }
 
-/* 8019D1A0-8019D2C4 197AE0 0124+00 3/3 0/0 0/0 .text            dKy_lightdir_set__FffP3Vec */
 void dKy_lightdir_set(f32 angle_x, f32 angle_y, Vec* out_dir_p) {
     MtxP view_mtx = j3dSys.getViewMtx();
     Mtx inv;
@@ -585,7 +570,6 @@ void dKy_lightdir_set(f32 angle_x, f32 angle_y, Vec* out_dir_p) {
     out_dir_p->z = calc_dir.z;
 }
 
-/* 8019D2C4-8019D44C 197C04 0188+00 3/2 0/0 0/0 .text dKy_GXInitLightSpot__FP12J3DLightInfofUc */
 void dKy_GXInitLightSpot(J3DLightInfo* light_p, f32 cutoff, u8 spot_type) {
     if (cutoff <= 0.0f || cutoff > 90.0f) {
         spot_type = GX_SP_OFF;
@@ -644,8 +628,6 @@ void dKy_GXInitLightSpot(J3DLightInfo* light_p, f32 cutoff, u8 spot_type) {
     light_p->mCosAtten.z = z;
 }
 
-/* 8019D44C-8019D520 197D8C 00D4+00 2/2 0/0 0/0 .text
- * dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc                */
 void dKy_GXInitLightDistAttn(J3DLightInfo* light_p, f32 param_1, f32 param_2, u8 distattn_type) {
     f32 x;
     f32 y;
@@ -688,18 +670,14 @@ void dKy_GXInitLightDistAttn(J3DLightInfo* light_p, f32 param_1, f32 param_2, u8
     light_p->mDistAtten.z = z;
 }
 
-/* 8019D520-8019D56C 197E60 004C+00 1/1 0/0 0/0 .text            u8_data_ratio_set__FUcUcf */
 static s16 u8_data_ratio_set(u8 start, u8 end, f32 ratio) {
     return start + (int)(ratio * ((s16)end - (s16)start));
 }
 
-/* 8019D56C-8019D5BC 197EAC 0050+00 1/1 0/0 0/0 .text            s16_data_ratio_set__Fssf */
 static s16 s16_data_ratio_set(s16 start, s16 end, f32 ratio) {
     return start + (s16)(ratio * (end - start));
 }
 
-/* 8019D5BC-8019D61C 197EFC 0060+00 1/1 0/0 0/0 .text            kankyo_color_ratio_calc_common__Fsf
- */
 static u8 kankyo_color_ratio_calc_common(s16 color, f32 ratio) {
     s16 calc = color * ratio;
 
@@ -712,8 +690,6 @@ static u8 kankyo_color_ratio_calc_common(s16 color, f32 ratio) {
     return calc;
 }
 
-/* 8019D61C-8019D68C 197F5C 0070+00 1/1 0/0 0/0 .text
- * kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f           */
 static void kankyo_color_ratio_calc(GXColor* out_col_p, GXColorS10 color, f32 ratio) {
     GXColorS10 work_color;
     work_color = color;
@@ -723,7 +699,6 @@ static void kankyo_color_ratio_calc(GXColor* out_col_p, GXColorS10 color, f32 ra
     out_col_p->b = kankyo_color_ratio_calc_common(work_color.b, ratio);
 }
 
-/* 8019D68C-8019D790 197FCC 0104+00 2/2 0/0 0/0 .text kankyo_color_ratio_set__FUcUcfUcUcfsf */
 static s16 kankyo_color_ratio_set(u8 color_a_start, u8 color_a_end, f32 color_ratio,
                                   u8 color_b_start, u8 color_b_end, f32 blend_ratio, s16 add_color,
                                   f32 scale) {
@@ -747,12 +722,10 @@ static s16 kankyo_color_ratio_set(u8 color_a_start, u8 color_a_end, f32 color_ra
     return calc_color;
 }
 
-/* 8019D790-8019D7A0 1980D0 0010+00 1/1 0/0 0/0 .text            fl_data_ratio_set__Ffff */
 static f32 fl_data_ratio_set(f32 start, f32 end, f32 ratio) {
     return start + ratio * (end - start);
 }
 
-/* 8019D7A0-8019D878 1980E0 00D8+00 3/3 0/0 0/0 .text float_kankyo_color_ratio_set__Fffffffff */
 static f32 float_kankyo_color_ratio_set(f32 color_a_start, f32 color_a_end, f32 color_ratio,
                                         f32 color_b_start, f32 color_b_end, f32 blend_ratio,
                                         f32 param_6, f32 param_7) {
@@ -765,7 +738,6 @@ static f32 float_kankyo_color_ratio_set(f32 color_a_start, f32 color_a_end, f32
     return calc_color;
 }
 
-/* 8019D878-8019D8AC 1981B8 0034+00 3/3 0/0 0/0 .text            get_parcent__Ffff */
 static f32 get_parcent(f32 max, f32 min, f32 value) {
     f32 range = max - min;
 
@@ -780,13 +752,10 @@ static f32 get_parcent(f32 max, f32 min, f32 value) {
     return 1.0f;
 }
 
-/* 8019D8AC-8019D8CC 1981EC 0020+00 0/0 1/1 1/1 .text            dKy_get_parcent__Ffff */
 f32 dKy_get_parcent(f32 max, f32 min, f32 value) {
     return get_parcent(max, min, value);
 }
 
-/* 8019D8CC-8019DD4C 19820C 0480+00 1/1 0/0 0/0 .text dKy_FiveSenses_fullthrottle_dark_static1__Fv
- */
 static void dKy_FiveSenses_fullthrottle_dark_static1() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     BOOL init_mode_change = FALSE;
@@ -895,12 +864,10 @@ static void dKy_FiveSenses_fullthrottle_dark_static1() {
     }
 }
 
-/* 8019DD4C-8019DD6C 19868C 0020+00 0/0 1/1 0/0 .text dKy_FiveSenses_fullthrottle_dark__Fv */
 void dKy_FiveSenses_fullthrottle_dark() {
     dKy_FiveSenses_fullthrottle_dark_static1();
 }
 
-/* 8019DD6C-8019E13C 1986AC 03D0+00 3/3 0/0 0/0 .text            dKy_light_influence_id__F4cXyzi */
 int dKy_light_influence_id(cXyz position, int param_1) {
     f32 closest_plight_dist = 1000000.0f;
 
@@ -983,8 +950,6 @@ int dKy_light_influence_id(cXyz position, int param_1) {
     return spC;
 }
 
-/* 8019E13C-8019E404 198A7C 02C8+00 2/2 0/0 0/0 .text            dKy_eflight_influence_id__F4cXyzi
- */
 int dKy_eflight_influence_id(cXyz position, int param_1) {
     f32 var_f31 = 1000000.0f;
 
@@ -1022,12 +987,10 @@ int dKy_eflight_influence_id(cXyz position, int param_1) {
     return var_r26;
 }
 
-/* 8019E404-8019E430 198D44 002C+00 1/1 0/0 0/0 .text            dKy_light_influence_col__Fi */
 GXColorS10 dKy_light_influence_col(int light_id) {
     return g_env_light.pointlight[light_id >= 0 ? light_id : 0]->mColor;
 }
 
-/* 8019E430-8019E520 198D70 00F0+00 4/4 3/3 0/0 .text dKy_light_influence_col__FP8_GXColorf */
 GXColor dKy_light_influence_col(GXColor* in_col_p, f32 ratio) {
     GXColor out_col;
 
@@ -1055,22 +1018,18 @@ GXColor dKy_light_influence_col(GXColor* in_col_p, f32 ratio) {
     return out_col;
 }
 
-/* 8019E520-8019E548 198E60 0028+00 1/1 0/0 0/0 .text            dKy_light_influence_power__Fi */
 f32 dKy_light_influence_power(int light_id) {
     return g_env_light.pointlight[light_id >= 0 ? light_id : 0]->mPow;
 }
 
-/* 8019E548-8019E570 198E88 0028+00 1/1 0/0 0/0 .text            dKy_light_influence_yuragi__Fi */
 f32 dKy_light_influence_yuragi(int light_id) {
     return g_env_light.pointlight[light_id >= 0 ? light_id : 0]->mFluctuation;
 }
 
-/* 8019E570-8019E694 198EB0 0124+00 1/1 0/0 0/0 .text dKy_light_influence_distance__F4cXyzi */
 f32 dKy_light_influence_distance(cXyz position, int light_id) {
     return position.abs(g_env_light.pointlight[light_id >= 0 ? light_id : 0]->mPosition);
 }
 
-/* 8019E694-8019E708 198FD4 0074+00 2/2 0/0 0/0 .text            plight_init__Fv */
 static void plight_init() {
     g_env_light.mLightInfluence[0].mPow = 99999.9f;
 
@@ -1087,14 +1046,12 @@ static void plight_init() {
     g_env_light.mPlayerEfLightIdx = -1;
 }
 
-/* 8019E708-8019E734 199048 002C+00 1/1 0/0 0/0 .text            darkmist_init__Fv */
 static void darkmist_init() {
     for (int i = 0; i < 10; i++) {
         g_env_light.dalkmist_influence[i] = NULL;
     }
 }
 
-/* 8019E734-8019E854 199074 0120+00 1/1 0/0 0/0 .text            plight_set__Fv */
 static void plight_set() {
     int plight_no = 0;
 
@@ -1124,7 +1081,6 @@ static void plight_set() {
     }
 }
 
-/* 8019E854-8019E874 199194 0020+00 1/1 0/0 0/0 .text            bgparts_activelight_init__Fv */
 static void bgparts_activelight_init() {
     int i;
     for (i = 0; i < 2; i++) {
@@ -1160,7 +1116,6 @@ static void hostio_init() {
 }
 #endif
 
-/* 8019E874-8019EAA0 1991B4 022C+00 1/1 0/0 0/0 .text            dungeonlight_init__Fv */
 static void dungeonlight_init() {
     static Vec test_pos_tbl[] = {
         {0.0f, -99999.0f, 0.0f}, {0.0f, -99999.0f, 0.0f}, {0.0f, -99999.0f, 0.0f},
@@ -1215,7 +1170,6 @@ static void dungeonlight_init() {
     }
 }
 
-/* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text            undwater_init__Fv */
 static void undwater_init() {
     J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D);
     JUT_ASSERT(1867, modelData2 != NULL);
@@ -1245,7 +1199,6 @@ static void undwater_init() {
     }
 }
 
-/* 8019EBD0-8019EC98 199510 00C8+00 1/1 0/0 0/0 .text            dKy_light_size_get__FPCc */
 void dKy_light_size_get(char const* stageName) {
     dKydata_lightsizeInfo_c* size_tbl = dKyd_light_size_tbl_getp();
     dKydata_lightsizeInfo_c* tw_size_tbl = dKyd_light_tw_size_tbl_getp();
@@ -1269,7 +1222,6 @@ void dKy_light_size_get(char const* stageName) {
     }
 }
 
-/* 8019EC98-8019F264 1995D8 05CC+00 1/1 0/0 0/0 .text            envcolor_init__Fv */
 static void envcolor_init() {
     stage_palette_info_class* stage_palette_p = dComIfGp_getStagePaletteInfo();
     stage_pselect_info_class* stage_psel_p = dComIfGp_getStagePselectInfo();
@@ -1537,7 +1489,6 @@ static void envcolor_init() {
     #endif
 }
 
-/* 8019F264-8019F2E8 199BA4 0084+00 1/1 1/1 0/0 .text            dKy_clear_game_init__Fv */
 void dKy_clear_game_init() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
 
@@ -1562,13 +1513,10 @@ void dKy_clear_game_init() {
     kankyo->staffroll_next_timer = 0;
 }
 
-/* 8019F2E8-8019F400 199C28 0118+00 1/1 0/0 0/0 .text            __ct__18dScnKy_env_light_cFv */
 dScnKy_env_light_c::dScnKy_env_light_c() {
     dKy_clear_game_init();
 }
 
-/* 8019F4FC-8019F780 199E3C 0284+00 1/1 0/0 0/0 .text            setDaytime__18dScnKy_env_light_cFv
- */
 void dScnKy_env_light_c::setDaytime() {
     mDate = dComIfGs_getDate();
     daytime = dComIfGs_getTime();
@@ -1693,8 +1641,6 @@ void dScnKy_env_light_c::setDaytime() {
     g_env_light.using_time_control_tag = 0;
 }
 
-/* 8019F788-8019FA08 19A0C8 0280+00 1/1 0/0 0/0 .text            setSunpos__18dScnKy_env_light_cFv
- */
 void dScnKy_env_light_c::setSunpos() {
     camera_class* camera_p = dComIfGp_getCamera(0);
     cXyz pos;
@@ -1759,26 +1705,21 @@ void dScnKy_env_light_c::setSunpos() {
     }
 }
 
-/* 8019FA08-8019FA10 19A348 0008+00 3/3 5/5 1/1 .text            getDaytime__18dScnKy_env_light_cFv
- */
 f32 dScnKy_env_light_c::getDaytime() {
     return daytime;
 }
 
-/* 8019FA10-8019FA3C 19A350 002C+00 2/2 2/2 32/32 .text            dKy_getdaytime_hour__Fv */
 int dKy_getdaytime_hour() {
     f32 time = dComIfGs_getTime();
     return time / 15.0f;
 }
 
-/* 8019FA3C-8019FAB8 19A37C 007C+00 1/1 1/1 26/26 .text            dKy_getdaytime_minute__Fv */
 int dKy_getdaytime_minute() {
     f32 time = dComIfGs_getTime();
     f32 var_f30 = ((int)(time * 1000000.0f) % 15000000) / 1000000.0f;
     return var_f30 / 15.0f * 60.0f;
 }
 
-/* 8019FAB8-8019FAF4 19A3F8 003C+00 0/0 3/3 6/6 .text            dKy_daynight_check__Fv */
 BOOL dKy_daynight_check() {
     int hour = dKy_getdaytime_hour();
     if (hour >= 6 && hour < 19) {
@@ -1788,31 +1729,25 @@ BOOL dKy_daynight_check() {
     }
 }
 
-/* 8019FAF4-8019FB30 19A434 003C+00 0/0 0/0 22/22 .text            dKy_getDarktime_hour__Fv */
 int dKy_getDarktime_hour() {
     f32 time = g_env_light.getDarkDaytime();
     return time / 15.0f;
 }
 
-/* 8019FB30-8019FBBC 19A470 008C+00 0/0 0/0 19/19 .text            dKy_getDarktime_minute__Fv */
 int dKy_getDarktime_minute() {
     f32 time = g_env_light.getDarkDaytime();
     f32 temp_f30 = ((int)(time * 1000000.0f) % 15000000) / 1000000.0f;
     return 60.0f * (temp_f30 / 15.0f);
 }
 
-/* 8019FBBC-8019FBCC 19A4FC 0010+00 0/0 0/0 8/8 .text            dKy_getDarktime_week__Fv */
 u8 dKy_getDarktime_week() {
     return g_env_light.darktime_week;
 }
 
-/* 8019FBCC-8019FBD4 19A50C 0008+00 2/2 0/0 0/0 .text getDarkDaytime__18dScnKy_env_light_cFv */
 f32 dScnKy_env_light_c::getDarkDaytime() {
     return dark_daytime;
 }
 
-/* 8019FBD4-801A0340 19A514 076C+00 5/3 0/0 0/0 .text
- * setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc */
 /**
  * Gets stage environment color palette information based on given IDs.
  * This gets both previous and next palette information so that blending between
@@ -2316,7 +2251,6 @@ void dKy_calc_color_set(GXColorS10* out_color_p, color_RGB_class* color_a_start_
                                color_b_start_p->b, color_b_end_p->b, blend_ratio, add_col.b, scale);
 }
 
-/* 801A040C-801A133C 19AD4C 0F30+00 1/1 0/0 0/0 .text            setLight__18dScnKy_env_light_cFv */
 void dScnKy_env_light_c::setLight() {
     u8* init_timer = &g_env_light.light_init_timer;
     camera_class* camera_p = dComIfGp_getCamera(0);
@@ -2831,8 +2765,6 @@ void dScnKy_env_light_c::setLight() {
     }
 }
 
-/* 801A133C-801A16C0 19BC7C 0384+00 2/2 0/0 0/0 .text
- * setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf */
 void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* tevstr_p, GXColorS10* bg_col_p,
                                      GXColorS10* fog_col_p, f32* fog_near_p, f32* fog_far_p) {
     tevstr_p->wether_pat0 = g_env_light.wether_pat0;
@@ -2934,8 +2866,6 @@ void dScnKy_env_light_c::setLight_bg(dKy_tevstr_c* tevstr_p, GXColorS10* bg_col_
     }
 }
 
-/* 801A16C0-801A1D64 19C000 06A4+00 1/1 0/0 0/0 .text
- * setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf */
 void dScnKy_env_light_c::setLight_actor(dKy_tevstr_c* tevstr_p, GXColorS10* fog_col_p,
                                         f32* fog_near_p, f32* fog_far_p) {
     u8 prev_pal_start_id;
@@ -3180,8 +3110,6 @@ void dScnKy_env_light_c::settingTevStruct_colget_actor(cXyz* unused, dKy_tevstr_
     #endif
 }
 
-/* 801A1F58-801A2090 19C898 0138+00 1/1 0/0 0/0 .text
- * settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c */
 void dScnKy_env_light_c::settingTevStruct_colget_player(dKy_tevstr_c* tevstr_p) {
     if (tevstr_p->YukaCol != 0xFF) {
         f32 target = tevstr_p->YukaCol / 100.0f;
@@ -3223,7 +3151,6 @@ void dScnKy_env_light_c::settingTevStruct_colget_player(dKy_tevstr_c* tevstr_p)
     }
 }
 
-/* 801A2090-801A2128 19C9D0 0098+00 1/1 0/0 0/0 .text            cLib_addCalcU8__FPUcUcss */
 static void cLib_addCalcU8(u8* i_value, u8 i_target, s16 i_scale, s16 i_maxStep) {
     s16 step, value;
     value = *i_value;
@@ -3688,8 +3615,6 @@ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr
     }
 }
 
-/* 801A37C4-801A441C 19E104 0C58+00 2/1 14/14 515/515 .text
- * settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c */
 void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevstr_c* tevstr_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -4237,12 +4162,8 @@ void dScnKy_env_light_c::settingTevStruct(int tevstrType, cXyz* pos_p, dKy_tevst
     tevstr_p->mFogEndZ = fog_far;
 }
 
-/* 801A441C-801A4420 19ED5C 0004+00 0/0 0/0 2/2 .text
- * setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c */
 void dScnKy_env_light_c::setLightTevColorType(J3DModelData*, dKy_tevstr_c*) {}
 
-/* 801A4420-801A4C08 19ED60 07E8+00 2/2 0/0 0/0 .text
- * setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci */
 static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c* tevstr_p,
                                           int lightType) {
     int i;
@@ -4502,8 +4423,6 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* material_p, dKy_tevstr_c*
     }
 }
 
-/* 801A4C10-801A4DA0 19F550 0190+00 1/1 0/0 0/0 .text
- * dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci     */
 void dKy_cloudshadow_scroll(J3DModelData* modelData_p, dKy_tevstr_c* tevstr_p, int param_2) {
     JUTNameTab* mat_nametbl = modelData_p->getMaterialName();
 
@@ -4544,8 +4463,6 @@ void dKy_cloudshadow_scroll(J3DModelData* modelData_p, dKy_tevstr_c* tevstr_p, i
     }
 }
 
-/* 801A4DA0-801A4E90 19F6E0 00F0+00 0/0 18/18 536/536 .text
- * setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c */
 void dScnKy_env_light_c::setLightTevColorType_MAJI(J3DModelData* modelData_p,
                                                    dKy_tevstr_c* tevstr_p) {
     #if DEBUG
@@ -4588,7 +4505,6 @@ void dScnKy_env_light_c::setLightTevColorType_MAJI(J3DModelData* modelData_p,
     }
 }
 
-/* 801A4E90-801A4F24 19F7D0 0094+00 1/1 0/0 0/0 .text CalcTevColor__18dScnKy_env_light_cFv */
 void dScnKy_env_light_c::CalcTevColor() {
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
 
@@ -4598,7 +4514,6 @@ void dScnKy_env_light_c::CalcTevColor() {
     }
 }
 
-/* 801A4F24-801A4F64 19F864 0040+00 1/1 0/0 0/0 .text            Sndpos__18dScnKy_env_light_cFv */
 void dScnKy_env_light_c::Sndpos() {
     if (sound_influence.timer != 0) {
         sound_influence.timer--;
@@ -4608,8 +4523,6 @@ void dScnKy_env_light_c::Sndpos() {
     }
 }
 
-/* 801A4F64-801A516C 19F8A4 0208+00 1/1 0/0 0/0 .text Eflight_flush_proc__18dScnKy_env_light_cFv
- */
 void dScnKy_env_light_c::Eflight_flush_proc() {
     f32 power;
     f32 fluctuation;
@@ -4703,7 +4616,6 @@ void dScnKy_env_light_c::Eflight_flush_proc() {
     }
 }
 
-/* 801A516C-801A5288 19FAAC 011C+00 1/1 0/0 0/0 .text SetBaseLight__18dScnKy_env_light_cFv */
 void dScnKy_env_light_c::SetBaseLight() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -4730,8 +4642,6 @@ void dScnKy_env_light_c::SetBaseLight() {
     base_light.mFluctuation = 0.0f;
 }
 
-/* 801A5288-801A56DC 19FBC8 0454+00 1/1 0/0 0/0 .text            exeKankyo__18dScnKy_env_light_cFv
- */
 void dScnKy_env_light_c::exeKankyo() {
     int sp18 = 0;
 
@@ -5785,8 +5695,6 @@ void dKankyo_HIO_c::genMessage(JORMContext* mctx) {
 
 #endif
 
-/* 801A56DC-801A572C 1A001C 0050+00 1/1 0/0 0/0 .text            drawKankyo__18dScnKy_env_light_cFv
- */
 void dScnKy_env_light_c::drawKankyo() {
     setSunpos();
     SetBaseLight();
@@ -5794,7 +5702,6 @@ void dScnKy_env_light_c::drawKankyo() {
     dKy_setLight_nowroom(g_env_light.PrevCol);
 }
 
-/* 801A572C-801A5B6C 1A006C 0440+00 0/0 1/1 0/0 .text            dKy_undwater_filter_draw__Fv */
 void dKy_undwater_filter_draw() {
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
     cXyz size;
@@ -5855,7 +5762,6 @@ void dKy_undwater_filter_draw() {
     }
 }
 
-/* 801A5B6C-801A5B98 1A04AC 002C+00 1/0 0/0 0/0 .text            dKy_Draw__FP17sub_kankyo__class */
 static int dKy_Draw(sub_kankyo__class* i_this) {
     (void)i_this;
     g_env_light.drawKankyo();
@@ -5876,8 +5782,6 @@ static int dKy_Draw(sub_kankyo__class* i_this) {
     return 1;
 }
 
-/* 801A5B98-801A5BCC 1A04D8 0034+00 1/0 0/0 0/0 .text            dKy_Execute__FP17sub_kankyo__class
- */
 static int dKy_Execute(sub_kankyo__class* i_this) {
     (void)i_this;
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -5913,14 +5817,10 @@ static int dKy_Execute(sub_kankyo__class* i_this) {
     return 1;
 }
 
-/* 801A5BCC-801A5BD4 1A050C 0008+00 1/0 0/0 0/0 .text            dKy_IsDelete__FP17sub_kankyo__class
- */
 static int dKy_IsDelete(sub_kankyo__class* i_this) {
     return 1;
 }
 
-/* 801A5BD4-801A5C1C 1A0514 0048+00 1/0 0/0 0/0 .text            dKy_Delete__FP17sub_kankyo__class
- */
 static int dKy_Delete(sub_kankyo__class* i_this) {
     (void)i_this;
     plight_init();
@@ -5937,7 +5837,6 @@ static int dKy_Delete(sub_kankyo__class* i_this) {
     return 1;
 }
 
-/* 801A5C1C-801A5E54 1A055C 0238+00 1/0 0/0 0/0 .text            dKy_Create__FPv */
 static int dKy_Create(void* i_this) {
     (void)i_this;
     BOOL next_time_set = false;
@@ -6017,20 +5916,17 @@ static int dKy_Create(void* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 801A5E54-801A60BC 1A0794 0268+00 1/1 1/1 0/0 .text            dKy_setLight_init__Fv */
 void dKy_setLight_init() {
     for (int i = 0; i < 8; i++) {
         lightStatusData[i] = lightStatusBase;
     }
 }
 
-/* 801A60BC-801A60E0 1A09FC 0024+00 0/0 1/1 0/0 .text            dKy_setLight__Fv */
 void dKy_setLight() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->sun_light_pos = kankyo->sun_pos;
 }
 
-/* 801A60E0-801A61F4 1A0A20 0114+00 2/2 0/0 0/0 .text            dKy_GlobalLight_set__Fv */
 void dKy_GlobalLight_set() {
     MtxP view_mtx = j3dSys.getViewMtx();
 
@@ -6061,8 +5957,6 @@ inline int dLVI_getSWLight(stage_pure_lightvec_info_class* i_info) {
     return i_info->flags & 0x80;
 }
 
-/* 801A61F4-801A6278 1A0B34 0084+00 3/3 0/0 0/0 .text
- * dKy_lightswitch_check__FP30stage_pure_lightvec_info_classc   */
 BOOL dKy_lightswitch_check(stage_pure_lightvec_info_class* stage_light_info_p, char room_no) {
     BOOL is_switch = TRUE;
 
@@ -6079,7 +5973,6 @@ BOOL dKy_lightswitch_check(stage_pure_lightvec_info_class* stage_light_info_p, c
     return is_switch;
 }
 
-/* 801A6278-801A6C20 1A0BB8 09A8+00 2/2 0/0 0/0 .text            dKy_setLight_nowroom_common__Fcf */
 void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -6297,7 +6190,6 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) {
     }
 }
 
-/* 801A6C20-801A6C58 1A1560 0038+00 2/2 1/1 0/0 .text            dKy_setLight_nowroom__Fc */
 void dKy_setLight_nowroom(char room_no) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = dComIfGp_getCamera(0);
@@ -6309,7 +6201,6 @@ void dKy_setLight_nowroom(char room_no) {
     }
 }
 
-/* 801A6C58-801A6D4C 1A1598 00F4+00 0/0 1/1 2/2 .text            dKy_setLight_nowroom_grass__Fcf */
 void dKy_setLight_nowroom_grass(char room_no, f32 light_ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -6349,7 +6240,6 @@ void dKy_setLight_nowroom_grass(char room_no, f32 light_ratio) {
     }
 }
 
-/* 801A6D4C-801A6E9C 1A168C 0150+00 1/1 1/1 0/0 .text dKy_move_room_ratio__FP12dKy_tevstr_cPSc */
 f32 dKy_move_room_ratio(dKy_tevstr_c* tevstr_p, s8* room_no_p) {
     f32 ratio = 1.0f;
 
@@ -6378,8 +6268,6 @@ f32 dKy_move_room_ratio(dKy_tevstr_c* tevstr_p, s8* room_no_p) {
     return ratio;
 }
 
-/* 801A6E9C-801A75C0 1A17DC 0724+00 1/1 1/1 0/0 .text dKy_setLight_nowroom_actor__FP12dKy_tevstr_c
- */
 void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     Vec light_pos;
@@ -6557,12 +6445,10 @@ void dKy_setLight_nowroom_actor(dKy_tevstr_c* tevstr_p) {
     }
 }
 
-/* 801A75C0-801A75E0 1A1F00 0020+00 0/0 6/6 7/7 .text            dKy_setLight_again__Fv */
 void dKy_setLight_again() {
     dKy_GlobalLight_set();
 }
 
-/* 801A75E0-801A76D8 1A1F20 00F8+00 0/0 3/3 5/5 .text dKy_Global_amb_set__FP12dKy_tevstr_c */
 void dKy_Global_amb_set(dKy_tevstr_c* tevstr_p) {
     GXColor color;
     color.r = tevstr_p->AmbCol.r;
@@ -6596,7 +6482,6 @@ void dKy_Global_amb_set(dKy_tevstr_c* tevstr_p) {
     GXSetChanAmbColor(GX_COLOR0A0, color);
 }
 
-/* 801A76D8-801A7714 1A2018 003C+00 1/1 0/0 0/0 .text            dKy_light_influence_pos__Fi */
 cXyz dKy_light_influence_pos(int light_id) {
     if (light_id < 0) {
         light_id = 0;
@@ -6605,13 +6490,10 @@ cXyz dKy_light_influence_pos(int light_id) {
     return g_env_light.pointlight[light_id]->mPosition;
 }
 
-/* 801A7714-801A7738 1A2054 0024+00 0/0 1/1 0/0 .text            dKy_plight_near_pos__Fv */
 cXyz dKy_plight_near_pos() {
     return g_env_light.plight_near_pos;
 }
 
-/* 801A7738-801A7790 1A2078 0058+00 0/0 0/0 1/1 .text
- * dKy_mock_light_every_set__FP15LIGHT_INFLUENCE                */
 void dKy_mock_light_every_set(LIGHT_INFLUENCE* light_inf_p) {
     int i;
     BOOL var_r30 = 0;
@@ -6632,7 +6514,6 @@ void dKy_mock_light_every_set(LIGHT_INFLUENCE* light_inf_p) {
     #endif
 }
 
-/* 801A7790-801A7814 1A20D0 0084+00 1/1 1/1 18/18 .text dKy_plight_set__FP15LIGHT_INFLUENCE */
 void dKy_plight_set(LIGHT_INFLUENCE* light_inf_p) {
     int i;
     BOOL var_r30 = 0;
@@ -6659,8 +6540,6 @@ void dKy_plight_set(LIGHT_INFLUENCE* light_inf_p) {
     #endif
 }
 
-/* 801A7814-801A7868 1A2154 0054+00 0/0 0/0 4/4 .text dKy_dalkmist_inf_set__FP18DALKMIST_INFLUENCE
- */
 void dKy_dalkmist_inf_set(DALKMIST_INFLUENCE* dalkmist_inf_p) {
     int i;
     for (i = 0; i < 10; i++) {
@@ -6672,8 +6551,6 @@ void dKy_dalkmist_inf_set(DALKMIST_INFLUENCE* dalkmist_inf_p) {
     }
 }
 
-/* 801A7868-801A789C 1A21A8 0034+00 0/0 0/0 4/4 .text dKy_dalkmist_inf_cut__FP18DALKMIST_INFLUENCE
- */
 void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE* dalkmist_inf_p) {
     if (dalkmist_inf_p != NULL) {
         if (dalkmist_inf_p->mIndex < 10) {
@@ -6682,8 +6559,6 @@ void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE* dalkmist_inf_p) {
     }
 }
 
-/* 801A789C-801A792C 1A21DC 0090+00 0/0 0/0 1/1 .text dKy_plight_priority_set__FP15LIGHT_INFLUENCE
- */
 void dKy_plight_priority_set(LIGHT_INFLUENCE* light_inf_p) {
     int i = 0;
 
@@ -6700,7 +6575,6 @@ void dKy_plight_priority_set(LIGHT_INFLUENCE* light_inf_p) {
     }
 }
 
-/* 801A792C-801A797C 1A226C 0050+00 0/0 1/1 32/32 .text dKy_plight_cut__FP15LIGHT_INFLUENCE */
 void dKy_plight_cut(LIGHT_INFLUENCE* light_inf_p) {
     int idx;
     if (light_inf_p == NULL) {
@@ -6719,7 +6593,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE* light_inf_p) {
     }
 }
 
-/* 801A797C-801A7A00 1A22BC 0084+00 1/1 1/1 3/3 .text dKy_efplight_set__FP15LIGHT_INFLUENCE */
 void dKy_efplight_set(LIGHT_INFLUENCE* light_inf_p) {
     int i;
     for (i = 0; i < 5; i++) {
@@ -6743,7 +6616,6 @@ void dKy_efplight_set(LIGHT_INFLUENCE* light_inf_p) {
     #endif
 }
 
-/* 801A7A00-801A7A40 1A2340 0040+00 1/1 1/1 3/3 .text dKy_efplight_cut__FP15LIGHT_INFLUENCE */
 void dKy_efplight_cut(LIGHT_INFLUENCE* light_inf_p) {
     int idx;
     if (light_inf_p == NULL) {
@@ -6758,8 +6630,6 @@ void dKy_efplight_cut(LIGHT_INFLUENCE* light_inf_p) {
     }
 }
 
-/* 801A7A40-801A7AAC 1A2380 006C+00 1/1 0/0 0/0 .text
- * dKy_bgparts_activelight_set__FP15LIGHT_INFLUENCEi            */
 void dKy_bgparts_activelight_set(LIGHT_INFLUENCE* light_inf_p, int bgpart_id) {
     if (light_inf_p != NULL) {
         memcpy(&g_env_light.bgparts_active_light[bgpart_id], light_inf_p, sizeof(LIGHT_INFLUENCE));
@@ -6769,54 +6639,46 @@ void dKy_bgparts_activelight_set(LIGHT_INFLUENCE* light_inf_p, int bgpart_id) {
     }
 }
 
-/* 801A7AAC-801A7AC8 1A23EC 001C+00 1/1 0/0 0/0 .text            dKy_bgparts_activelight_cut__Fi */
 void dKy_bgparts_activelight_cut(int bgpart_id) {
     g_env_light.bgparts_active_light[bgpart_id].mIndex = 0;
 }
 
-/* 801A7AC8-801A7B68 1A2408 00A0+00 1/1 1/1 1/1 .text            dKy_actor_addcol_amb_set__Fsssf */
 void dKy_actor_addcol_amb_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.actor_addcol_amb.r = r * ratio;
     g_env_light.actor_addcol_amb.g = g * ratio;
     g_env_light.actor_addcol_amb.b = b * ratio;
 }
 
-/* 801A7B68-801A7C08 1A24A8 00A0+00 1/1 1/1 1/1 .text            dKy_bg_addcol_amb_set__Fsssf */
 void dKy_bg_addcol_amb_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.bg_addcol_amb.r = r * ratio;
     g_env_light.bg_addcol_amb.g = g * ratio;
     g_env_light.bg_addcol_amb.b = b * ratio;
 }
 
-/* 801A7C08-801A7CA8 1A2548 00A0+00 1/1 1/1 0/0 .text            dKy_bg1_addcol_amb_set__Fsssf */
 void dKy_bg1_addcol_amb_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.bg1_addcol_amb.r = r * ratio;
     g_env_light.bg1_addcol_amb.g = g * ratio;
     g_env_light.bg1_addcol_amb.b = b * ratio;
 }
 
-/* 801A7CA8-801A7D48 1A25E8 00A0+00 1/1 0/0 0/0 .text            dKy_bg2_addcol_amb_set__Fsssf */
 void dKy_bg2_addcol_amb_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.bg2_addcol_amb.r = r * ratio;
     g_env_light.bg2_addcol_amb.g = g * ratio;
     g_env_light.bg2_addcol_amb.b = b * ratio;
 }
 
-/* 801A7D48-801A7DE8 1A2688 00A0+00 1/1 0/0 0/0 .text            dKy_bg3_addcol_amb_set__Fsssf */
 void dKy_bg3_addcol_amb_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.bg3_addcol_amb.r = r * ratio;
     g_env_light.bg3_addcol_amb.g = g * ratio;
     g_env_light.bg3_addcol_amb.b = b * ratio;
 }
 
-/* 801A7DE8-801A7E88 1A2728 00A0+00 1/1 1/1 0/0 .text            dKy_addcol_fog_set__Fsssf */
 void dKy_addcol_fog_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.addcol_fog.r = r * ratio;
     g_env_light.addcol_fog.g = g * ratio;
     g_env_light.addcol_fog.b = b * ratio;
 }
 
-/* 801A7E88-801A7F20 1A27C8 0098+00 2/2 0/0 2/2 .text            dKy_actor_addcol_set__Fsssf */
 void dKy_actor_addcol_set(s16 r, s16 g, s16 b, f32 ratio) {
     dKy_actor_addcol_amb_set(r, g, b, ratio);
     dKy_bg_addcol_amb_set(r, g, b, ratio);
@@ -6825,29 +6687,24 @@ void dKy_actor_addcol_set(s16 r, s16 g, s16 b, f32 ratio) {
     dKy_bg3_addcol_amb_set(r, g, b, ratio);
 }
 
-/* 801A7F20-801A7FC0 1A2860 00A0+00 1/1 1/1 0/0 .text            dKy_vrbox_addcol_sky0_set__Fsssf */
 void dKy_vrbox_addcol_sky0_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.vrbox_addcol_sky0.r = r * ratio;
     g_env_light.vrbox_addcol_sky0.g = g * ratio;
     g_env_light.vrbox_addcol_sky0.b = b * ratio;
 }
 
-/* 801A7FC0-801A8060 1A2900 00A0+00 1/1 1/1 0/0 .text            dKy_vrbox_addcol_kasumi_set__Fsssf
- */
 void dKy_vrbox_addcol_kasumi_set(s16 r, s16 g, s16 b, f32 ratio) {
     g_env_light.vrbox_addcol_kasumi.r = r * ratio;
     g_env_light.vrbox_addcol_kasumi.g = g * ratio;
     g_env_light.vrbox_addcol_kasumi.b = b * ratio;
 }
 
-/* 801A8060-801A80D0 1A29A0 0070+00 1/1 0/0 0/0 .text            dKy_vrbox_addcol_set__Fsssf */
 void dKy_vrbox_addcol_set(s16 r, s16 g, s16 b, f32 ratio) {
     dKy_vrbox_addcol_sky0_set(r, g, b, ratio);
     dKy_vrbox_addcol_kasumi_set(r, g, b, ratio);
     dKy_addcol_fog_set(r, g, b, ratio);
 }
 
-/* 801A80D0-801A8168 1A2A10 0098+00 1/1 0/0 2/2 .text            dKy_fog_startendz_set__Ffff */
 void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 ratio) {
     if (ratio < 0.0f || ratio > 1.0f) {
         OSReport_Warning("\ndKy_fog_startendz_set ratio error!\n");
@@ -6863,7 +6720,6 @@ void dKy_fog_startendz_set(f32 param_0, f32 param_1, f32 ratio) {
     g_env_light.field_0x11f4 = ratio;
 }
 
-/* 801A8168-801A8190 1A2AA8 0028+00 0/0 1/1 0/0 .text            dKy_Itemgetcol_chg_on__Fv */
 void dKy_Itemgetcol_chg_on() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     OS_REPORT("\ndKy_Itemgetcol_chg_on[%d]", kankyo->Itemgetcol_chg);
@@ -6873,7 +6729,6 @@ void dKy_Itemgetcol_chg_on() {
     }
 }
 
-/* 801A8190-801A81C0 1A2AD0 0030+00 2/2 0/0 0/0 .text            dKy_Sound_init__Fv */
 void dKy_Sound_init() {
     g_env_light.sound_influence.position.x = 999999.9f;
     g_env_light.sound_influence.position.y = 999999.9f;
@@ -6883,7 +6738,6 @@ void dKy_Sound_init() {
     g_env_light.sound_influence.timer = 0;
 }
 
-/* 801A81C0-801A8474 1A2B00 02B4+00 0/0 5/5 27/27 .text            dKy_Sound_set__F4cXyziUii */
 void dKy_Sound_set(cXyz pos, int param_1, fpc_ProcID actor_id, int timer) {
     camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0);
     BOOL set_sound = FALSE;
@@ -6906,12 +6760,10 @@ void dKy_Sound_set(cXyz pos, int param_1, fpc_ProcID actor_id, int timer) {
     }
 }
 
-/* 801A8474-801A8484 1A2DB4 0010+00 0/0 1/1 8/8 .text            dKy_Sound_get__Fv */
 SND_INFLUENCE* dKy_Sound_get() {
     return &g_env_light.sound_influence;
 }
 
-/* 801A8484-801A8538 1A2DC4 00B4+00 0/0 2/2 0/0 .text            dKy_SordFlush_set__F4cXyzi */
 void dKy_SordFlush_set(cXyz light_pos, int light_type) {
     dScnKy_env_light_c* light = dKy_getEnvlight();
     EF_THUNDER* thunder = &light->mThunderEff;
@@ -6927,7 +6779,6 @@ void dKy_SordFlush_set(cXyz light_pos, int light_type) {
     }
 }
 
-/* 801A8538-801A85E8 1A2E78 00B0+00 1/1 0/0 0/0 .text            GxFogSet_Sub__FP8_GXColor */
 static void GxFogSet_Sub(GXColor* fog_col_p) {
     f32 near_z = 1.0f;
     f32 far_z = 160000.0f;
@@ -6946,7 +6797,6 @@ static void GxFogSet_Sub(GXColor* fog_col_p) {
     GXSetFog(GX_FOG_PERSP_LIN, g_env_light.mFogNear, g_env_light.mFogFar, near_z, far_z, color);
 }
 
-/* 801A85E8-801A862C 1A2F28 0044+00 1/1 0/0 0/0 .text            GxFog_set__Fv */
 static void GxFog_set() {
     GXColor color;
     color.r = g_env_light.fog_col.r;
@@ -6956,13 +6806,11 @@ static void GxFog_set() {
     GxFogSet_Sub(&color);
 }
 
-/* 801A862C-801A8650 1A2F6C 0024+00 0/0 7/7 2/2 .text            dKy_GxFog_set__Fv */
 void dKy_GxFog_set() {
     GxFog_set();
     GxXFog_set();
 }
 
-/* 801A8650-801A86F8 1A2F90 00A8+00 0/0 3/3 6/6 .text dKy_GxFog_tevstr_set__FP12dKy_tevstr_c */
 void dKy_GxFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
     f32 near_z = 1.0f;
     f32 far_z = 160000.0f;
@@ -6985,7 +6833,6 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
     GxXFog_set();
 }
 
-/* 801A86F8-801A87A0 1A3038 00A8+00 0/0 0/0 1/1 .text dKy_GfFog_tevstr_set__FP12dKy_tevstr_c */
 void dKy_GfFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
     f32 near_z = 1.0f;
     f32 far_z = 160000.0f;
@@ -7008,13 +6855,11 @@ void dKy_GfFog_tevstr_set(dKy_tevstr_c* tevstr_p) {
     GxXFog_set();
 }
 
-/* 801A87A0-801A87E4 1A30E0 0044+00 3/3 0/0 0/0 .text            GxXFog_set__Fv */
 static void GxXFog_set() {
     dKyd_xfog_table_set(g_env_light.mFogAdjTableType);
     GXSetFogRangeAdj(g_env_light.mFogAdjEnable, g_env_light.mFogAdjCenter, &g_env_light.mXFogTbl);
 }
 
-/* 801A87E4-801A880C 1A3124 0028+00 0/0 0/0 52/52 .text            dKy_change_colpat__FUc */
 void dKy_change_colpat(u8 colpat) {
     g_env_light.mColpatCurrGather = colpat;
     if (g_env_light.wether_pat1 != g_env_light.mColpatCurrGather) {
@@ -7022,7 +6867,6 @@ void dKy_change_colpat(u8 colpat) {
     }
 }
 
-/* 801A880C-801A8854 1A314C 0048+00 0/0 0/0 25/25 .text            dKy_custom_colset__FUcUcf */
 void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend) {
     #if DEBUG
     if (g_kankyoHIO.light.m_HOSTIO_setting) {
@@ -7043,8 +6887,6 @@ void dKy_custom_colset(u8 prevGather, u8 curGather, f32 blend) {
     }
 }
 
-/* 801A8854-801A88EC 1A3194 0098+00 0/0 0/0 2/2 .text            dKy_setLight_mine__FP12dKy_tevstr_c
- */
 void dKy_setLight_mine(dKy_tevstr_c* tevstr_p) {
     GXLightObj light;
     J3DLightInfo& info = tevstr_p->mLightObj.getLightInfo();
@@ -7059,7 +6901,6 @@ void dKy_setLight_mine(dKy_tevstr_c* tevstr_p) {
     GXLoadLightObjImm(&light, (GXLightID)*lightMaskData);
 }
 
-/* 801A88EC-801A8A34 1A322C 0148+00 2/2 5/5 11/11 .text dKy_tevstr_init__FP12dKy_tevstr_cScUc */
 void dKy_tevstr_init(dKy_tevstr_c* tevstr_p, s8 room_no, u8 floorCol) {
     J3DLightInfo* light_info;
     memset(tevstr_p, 0, sizeof(dKy_tevstr_c));
@@ -7117,55 +6958,46 @@ int dKy_get_schbit_timer() {
     return kankyo->schbit_timer;
 }
 
-/* 801A8A34-801A8A44 1A3374 0010+00 0/0 1/1 0/0 .text            dKy_rain_check__Fv */
 int dKy_rain_check() {
     return g_env_light.raincnt;
 }
 
-/* 801A8A44-801A8A54 1A3384 0010+00 0/0 0/0 5/5 .text            dKy_set_allcol_ratio__Ff */
 void dKy_set_allcol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->allcol_ratio = ratio;
 }
 
-/* 801A8A54-801A8A64 1A3394 0010+00 0/0 1/1 1/1 .text            dKy_set_actcol_ratio__Ff */
 void dKy_set_actcol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->actcol_ratio = ratio;
 }
 
-/* 801A8A64-801A8A74 1A33A4 0010+00 0/0 1/1 1/1 .text            dKy_set_bgcol_ratio__Ff */
 void dKy_set_bgcol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->bgcol_ratio = ratio;
 }
 
-/* 801A8A74-801A8A84 1A33B4 0010+00 0/0 1/1 1/1 .text            dKy_set_fogcol_ratio__Ff */
 void dKy_set_fogcol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     g_env_light.fogcol_ratio = ratio;
 }
 
-/* 801A8A84-801A8AB8 1A33C4 0034+00 0/0 1/1 0/0 .text            dKy_set_vrboxcol_ratio__Ff */
 void dKy_set_vrboxcol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     dKy_set_vrboxsoracol_ratio(ratio);
     dKy_set_vrboxkumocol_ratio(ratio);
 }
 
-/* 801A8AB8-801A8AC8 1A33F8 0010+00 1/1 0/0 0/0 .text            dKy_set_vrboxsoracol_ratio__Ff */
 void dKy_set_vrboxsoracol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->vrboxsoracol_ratio = ratio;
 }
 
-/* 801A8AC8-801A8AD8 1A3408 0010+00 1/1 0/0 0/0 .text            dKy_set_vrboxkumocol_ratio__Ff */
 void dKy_set_vrboxkumocol_ratio(f32 ratio) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     kankyo->vrboxkumocol_ratio = ratio;
 }
 
-/* 801A8AD8-801A8B38 1A3418 0060+00 0/0 1/1 0/0 .text            dKy_itudemo_se__Fv */
 void dKy_itudemo_se() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     int room_no = dComIfGp_roomControl_getStayNo();
@@ -7175,14 +7007,12 @@ void dKy_itudemo_se() {
     }
 }
 
-/* 801A8B38-801A8B58 1A3478 0020+00 1/1 2/2 11/11 .text            dKy_get_dayofweek__Fv */
 int dKy_get_dayofweek() {
     u16 date = dComIfGs_getDate();
     int day_of_week = date % 7;
     return day_of_week;
 }
 
-/* 801A8B58-801A8B68 1A3498 0010+00 0/0 3/3 0/0 .text            dKy_set_nexttime__Ff */
 void dKy_set_nexttime(f32 next_time) {
     OS_REPORT("\n\n\nnext_time=[%f]\n\n\n", next_time);
     #if DEBUG
@@ -7194,7 +7024,6 @@ void dKy_set_nexttime(f32 next_time) {
     g_env_light.nexttime = next_time;
 }
 
-/* 801A8B68-801A8BC8 1A34A8 0060+00 0/0 1/1 0/0 .text            dKy_instant_timechg__Ff */
 void dKy_instant_timechg(f32 timechg) {
     f32 time = g_env_light.getDaytime();
     if (timechg < time) {
@@ -7205,7 +7034,6 @@ void dKy_instant_timechg(f32 timechg) {
     dComIfGs_setTime(timechg);
 }
 
-/* 801A8BC8-801A8C04 1A3508 003C+00 0/0 1/1 0/0 .text            dKy_instant_rainchg__Fv */
 void dKy_instant_rainchg() {
     dKyw_rain_set(250);
     g_env_light.mColpatWeather = 1;
@@ -7213,7 +7041,6 @@ void dKy_instant_rainchg() {
     g_env_light.wether_pat1 = 1;
 }
 
-/* 801A8C04-801A8E20 1A3544 021C+00 3/3 0/0 0/0 .text            NewAmbColGet__FP11_GXColorS10 */
 static GXColor NewAmbColGet(GXColorS10* in_col_p) {
     GXColorS10 sp18, sp10;
     f32 temp_f31;
@@ -7253,14 +7080,12 @@ static GXColor NewAmbColGet(GXColorS10* in_col_p) {
     return amb_col;
 }
 
-/* 803BC0A0-803BC0B4 -00001 0014+00 1/0 0/0 0/0 .data            l_dKy_Method */
 static leafdraw_method_class l_dKy_Method = {
     (process_method_func)dKy_Create,  (process_method_func)dKy_Delete,
     (process_method_func)dKy_Execute, (process_method_func)dKy_IsDelete,
     (process_method_func)dKy_Draw,
 };
 
-/* 803BC0B4-803BC0DC -00001 0028+00 0/0 0/0 1/0 .data            g_profile_KANKYO */
 extern kankyo_process_profile_definition g_profile_KANKYO = {
     fpcLy_CURRENT_e,
     1,
@@ -7280,8 +7105,6 @@ static f32 dummy() {
     return 50.0f;
 }
 
-/* 801A8E20-801A9BE4 1A3760 0DC4+00 2/2 0/0 0/0 .text
- * dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf */
 void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* param_2,
                                 GXColor* param_3, GXColor* param_4, GXColor* param_5, f32 param_6) {
     GXColor sp70[3];
@@ -7519,8 +7342,6 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
 // large.
 static u8 dummy_padding_data_0x354[0x30] = {};
 
-/* 801A9BE4-801A9CBC 1A4524 00D8+00 0/0 3/3 0/0 .text
- * dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf */
 void dKy_ParticleColor_get_actor(cXyz* param_0, dKy_tevstr_c* tevstr_p, GXColor* param_2,
                                  GXColor* param_3, GXColor* param_4, GXColor* param_5,
                                  f32 param_6) {
@@ -7533,15 +7354,12 @@ void dKy_ParticleColor_get_actor(cXyz* param_0, dKy_tevstr_c* tevstr_p, GXColor*
     dKy_ParticleColor_get_base(param_0, tevstr_p, param_2, param_3, param_4, param_5, param_6);
 }
 
-/* 801A9CBC-801A9D60 1A45FC 00A4+00 0/0 6/6 0/0 .text
- * dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf */
 void dKy_ParticleColor_get_bg(cXyz* param_0, dKy_tevstr_c* tevstr_p, GXColor* param_2,
                               GXColor* param_3, GXColor* param_4, GXColor* param_5, f32 param_6) {
     *param_2 = NewAmbColGet(&g_env_light.bg_amb_col[0]);
     dKy_ParticleColor_get_base(param_0, tevstr_p, param_2, param_3, param_4, param_5, param_6);
 }
 
-/* 801A9D60-801AA664 1A46A0 0904+00 1/1 0/0 17/17 .text dKy_BossLight_set__FP4cXyzP8_GXColorfUc */
 int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -7648,8 +7466,6 @@ int dKy_BossLight_set(cXyz* pos_p, GXColor* color_p, f32 ref_dist, u8 param_3) {
     return sp10;
 }
 
-/* 801AA664-801AAC5C 1A4FA4 05F8+00 0/0 0/0 3/3 .text
- * dKy_BossSpotLight_set__FP4cXyzfffP8_GXColorfUcUc             */
 int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXColor* color_p,
                           f32 ref_dist, u8 spot_type, u8 distattn_type) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -7715,8 +7531,6 @@ int dKy_BossSpotLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXC
     return spC;
 }
 
-/* 801AAC5C-801AAD50 1A559C 00F4+00 0/0 1/1 0/0 .text
- * dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc              */
 int dKy_WolfEyeLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXColor* color_p,
                          f32 ref_dist, u8 spot_type, u8 distattn_type) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -7769,7 +7583,6 @@ int dKy_WolfEyeLight_set(cXyz* pos_p, f32 angle_x, f32 angle_y, f32 cutoff, GXCo
     return 1;
 }
 
-/* 801AAD50-801AB01C 1A5690 02CC+00 1/1 0/0 0/0 .text            dKy_twilight_camelight_set__Fv */
 void dKy_twilight_camelight_set() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     fopAc_ac_c* player_p = dComIfGp_getPlayer(0);
@@ -7847,7 +7660,6 @@ void dKy_twilight_camelight_set() {
     }
 }
 
-/* 801AB01C-801AB270 1A595C 0254+00 1/1 0/0 0/0 .text            dKy_WaterIn_Light_set__Fv */
 // NONMATCHING - direct g_env_light member loads instead of storing to temps. matches debug, not retail
 void dKy_WaterIn_Light_set() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
@@ -7990,18 +7802,14 @@ void dKy_WaterIn_Light_set() {
     }
 }
 
-/* 801AB270-801AB280 1A5BB0 0010+00 0/0 2/2 0/0 .text            dKy_camera_water_in_status_set__FUc
- */
 void dKy_camera_water_in_status_set(u8 status) {
     g_env_light.camera_water_in_status = status;
 }
 
-/* 801AB280-801AB290 1A5BC0 0010+00 3/3 1/1 5/5 .text dKy_camera_water_in_status_check__Fv */
 BOOL dKy_camera_water_in_status_check() {
     return g_env_light.camera_water_in_status;
 }
 
-/* 801AB290-801AB3A8 1A5BD0 0118+00 0/0 5/5 0/0 .text dKy_pol_efftype_get__FPC13cBgS_PolyInfo */
 u8 dKy_pol_efftype_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8032,7 +7840,6 @@ u8 dKy_pol_efftype_get(const cBgS_PolyInfo* polyinfo_p) {
     return efftype;
 }
 
-/* 801AB3A8-801AB4C0 1A5CE8 0118+00 0/0 2/2 0/0 .text dKy_pol_efftype2_get__FPC13cBgS_PolyInfo */
 u8 dKy_pol_efftype2_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8063,7 +7870,6 @@ u8 dKy_pol_efftype2_get(const cBgS_PolyInfo* polyinfo_p) {
     return efftype;
 }
 
-/* 801AB4C0-801AB59C 1A5E00 00DC+00 0/0 9/9 21/21 .text dKy_pol_sound_get__FPC13cBgS_PolyInfo */
 u8 dKy_pol_sound_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8092,7 +7898,6 @@ u8 dKy_pol_sound_get(const cBgS_PolyInfo* polyinfo_p) {
     return sound;
 }
 
-/* 801AB59C-801AB668 1A5EDC 00CC+00 0/0 5/5 0/0 .text dKy_pol_argument_get__FPC13cBgS_PolyInfo */
 u8 dKy_pol_argument_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8114,8 +7919,6 @@ u8 dKy_pol_argument_get(const cBgS_PolyInfo* polyinfo_p) {
     return 0;
 }
 
-/* 801AB668-801AB7D0 1A5FA8 0168+00 0/0 1/1 2/2 .text
- * dKy_pol_eff_prim_get__FPC13cBgS_PolyInfoP8_GXColor           */
 u8 dKy_pol_eff_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8153,8 +7956,6 @@ u8 dKy_pol_eff_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     return eff_id;
 }
 
-/* 801AB7D0-801AB93C 1A6110 016C+00 0/0 1/1 2/2 .text
- * dKy_pol_eff_env_get__FPC13cBgS_PolyInfoP8_GXColor            */
 u8 dKy_pol_eff_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8192,8 +7993,6 @@ u8 dKy_pol_eff_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     return eff_id;
 }
 
-/* 801AB93C-801ABAA4 1A627C 0168+00 0/0 1/1 2/2 .text
- * dKy_pol_eff2_prim_get__FPC13cBgS_PolyInfoP8_GXColor          */
 u8 dKy_pol_eff2_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8231,8 +8030,6 @@ u8 dKy_pol_eff2_prim_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p)
     return eff_id;
 }
 
-/* 801ABAA4-801ABC10 1A63E4 016C+00 0/0 1/1 2/2 .text
- * dKy_pol_eff2_env_get__FPC13cBgS_PolyInfoP8_GXColor           */
 u8 dKy_pol_eff2_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || out_color_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8270,7 +8067,6 @@ u8 dKy_pol_eff2_env_get(const cBgS_PolyInfo* polyinfo_p, GXColor* out_color_p) {
     return eff_id;
 }
 
-/* 801ABC10-801ABD4C 1A6550 013C+00 0/0 1/1 2/2 .text dKy_pol_eff_alpha_get__FPC13cBgS_PolyInfo */
 u8 dKy_pol_eff_alpha_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8306,7 +8102,6 @@ u8 dKy_pol_eff_alpha_get(const cBgS_PolyInfo* polyinfo_p) {
     return eff_id;
 }
 
-/* 801ABD4C-801ABEA8 1A668C 015C+00 0/0 1/1 2/2 .text dKy_pol_eff_ratio_get__FPC13cBgS_PolyInfo */
 f32 dKy_pol_eff_ratio_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     f32 ratio = 0.0f;
@@ -8345,8 +8140,6 @@ f32 dKy_pol_eff_ratio_get(const cBgS_PolyInfo* polyinfo_p) {
     return ratio;
 }
 
-/* 801ABEA8-801ABFE4 1A67E8 013C+00 0/0 1/1 2/2 .text dKy_pol_eff2_alpha_get__FPC13cBgS_PolyInfo
- */
 u8 dKy_pol_eff2_alpha_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     if (polyinfo_p == NULL || &dComIfG_Bgsp() == NULL) {
@@ -8382,8 +8175,6 @@ u8 dKy_pol_eff2_alpha_get(const cBgS_PolyInfo* polyinfo_p) {
     return var_r30;
 }
 
-/* 801ABFE4-801AC140 1A6924 015C+00 0/0 1/1 2/2 .text dKy_pol_eff2_ratio_get__FPC13cBgS_PolyInfo
- */
 f32 dKy_pol_eff2_ratio_get(const cBgS_PolyInfo* polyinfo_p) {
     dScnKy_env_light_c* kankyo = &g_env_light;
     f32 ratio = 0.0f;
@@ -8422,7 +8213,6 @@ f32 dKy_pol_eff2_ratio_get(const cBgS_PolyInfo* polyinfo_p) {
     return ratio;
 }
 
-/* 801AC140-801AC168 1A6A80 0028+00 0/0 2/2 0/0 .text            dKy_TeachWind_existence_chk__Fv */
 BOOL dKy_TeachWind_existence_chk() {
     if (g_env_light.TeachWind_existence == 0xFF) {
         return -1;
@@ -8431,7 +8221,6 @@ BOOL dKy_TeachWind_existence_chk() {
     return g_env_light.TeachWind_existence ? TRUE : FALSE;
 }
 
-/* 801AC168-801AC228 1A6AA8 00C0+00 4/4 0/0 2/2 .text            dKy_SunMoon_Light_Check__Fv */
 BOOL dKy_SunMoon_Light_Check() {
     BOOL check = false;
     if (g_env_light.mSunInitialized && !dKy_darkworld_check()) {
@@ -8447,7 +8236,6 @@ BOOL dKy_SunMoon_Light_Check() {
     return check;
 }
 
-/* 801AC228-801AC28C 1A6B68 0064+00 3/3 0/0 0/0 .text            dKy_Outdoor_check__Fv */
 BOOL dKy_Outdoor_check() {
     BOOL outdoors = false;
     u32 stage_type = ST_FIELD;
@@ -8463,7 +8251,6 @@ BOOL dKy_Outdoor_check() {
     return outdoors;
 }
 
-/* 801AC28C-801AC2E0 1A6BCC 0054+00 1/1 0/0 0/0 .text            dKy_Indoor_check__Fv */
 BOOL dKy_Indoor_check() {
     BOOL indoors = false;
 
@@ -8475,12 +8262,10 @@ BOOL dKy_Indoor_check() {
     return indoors;
 }
 
-/* 801AC2E0-801AC2E8 1A6C20 0008+00 0/0 1/1 0/0 .text            dKy_withwarp_capture_check__Fv */
 BOOL dKy_withwarp_capture_check() {
     return false;
 }
 
-/* 801AC2E8-801AC57C 1A6C28 0294+00 0/0 1/1 0/0 .text            dKy_depth_dist_set__FPv */
 void dKy_depth_dist_set(void* process_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     camera_class* camera_p = (camera_class*)dComIfGp_getCamera(0);
@@ -8516,7 +8301,6 @@ void dKy_depth_dist_set(void* process_p) {
     }
 }
 
-/* 801AC57C-801AC5BC 1A6EBC 0040+00 13/13 21/21 134/134 .text            dKy_darkworld_check__Fv */
 u8 dKy_darkworld_check() {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     u8 check = FALSE;
@@ -8541,7 +8325,6 @@ u8 dKy_darkworld_check() {
  * return of 1 means darkLv should be read from out_darkLv and 0 means it should be read from the
  * darkworld table.
  */
-/* 801AC5BC-801AC70C 1A6EFC 0150+00 3/3 0/0 0/0 .text            dKy_F_SP121Check__FPCciPUci */
 int dKy_F_SP121Check(char const* stageName, int roomNo, u8* out_darkLv, int tblIndex) {
     dKydata_darkworldInfo_c* darkworldTbl = dKyd_darkworld_tbl_getp();
     int result = 0;
@@ -8614,7 +8397,6 @@ int dKy_F_SP121Check(char const* stageName, int roomNo, u8* out_darkLv, int tblI
  * @return BOOL Returns TRUE if the room can be loaded as twilight and the player has not already
  * cleared it, else FALSE.
  */
-/* 801AC70C-801AC7E0 1A704C 00D4+00 0/0 2/2 0/0 .text            dKy_darkworld_stage_check__FPCci */
 u8 dKy_darkworld_stage_check(char const* stageName, int roomNo) {
     dKydata_darkworldInfo_c* darkworldTbl = dKyd_darkworld_tbl_getp();
     u8 result = FALSE;
@@ -8657,7 +8439,6 @@ u8 dKy_darkworld_stage_check(char const* stageName, int roomNo) {
  * @return BOOL Returns TRUE if a given room would be loaded in twilight. This function always
  * behaves as if the player has not cleared any twilights.
  */
-/* 801AC7E0-801AC870 1A7120 0090+00 0/0 1/1 0/0 .text            dKy_darkworld_spot_check__FPCci */
 BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo) {
     dKydata_darkworldInfo_c* darkworldTblPtr = dKyd_darkworld_tbl_getp();
     BOOL result = FALSE;
@@ -8675,7 +8456,6 @@ BOOL dKy_darkworld_spot_check(char const* stageName, int roomNo) {
     return result;
 }
 
-/* 801AC870-801AC918 1A71B0 00A8+00 0/0 1/1 0/0 .text            dKy_darkworld_Area_set__FPCci */
 void dKy_darkworld_Area_set(char const* stageName, int roomNo) {
     dKydata_darkworldInfo_c* darkworldTblPtr = dKyd_darkworld_tbl_getp();
     u8 darkLv[1];
@@ -8694,7 +8474,6 @@ void dKy_darkworld_Area_set(char const* stageName, int roomNo) {
     }
 }
 
-/* 801AC918-801ACCDC 1A7258 03C4+00 1/1 0/0 0/0 .text            dKy_murky_set__FP11J3DMaterial */
 void dKy_murky_set(J3DMaterial* material_p) {
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
@@ -8771,38 +8550,30 @@ void dKy_murky_set(J3DMaterial* material_p) {
     material_p->setTevKColor(3, &tev_kcol);
 }
 
-/* 801ACCDC-801ACCF4 1A761C 0018+00 2/2 1/1 0/0 .text            dKy_shadow_mode_set__FUc */
 void dKy_shadow_mode_set(u8 mode) {
     g_env_light.shadow_mode |= mode;
 }
 
-/* 801ACCF4-801ACD0C 1A7634 0018+00 2/2 1/1 0/0 .text            dKy_shadow_mode_reset__FUc */
 void dKy_shadow_mode_reset(u8 mode) {
     g_env_light.shadow_mode &= ~mode;
 }
 
-/* 801ACD0C-801ACD24 1A764C 0018+00 3/3 0/0 1/1 .text            dKy_shadow_mode_check__FUc */
 u8 dKy_shadow_mode_check(u8 mode) {
     return g_env_light.shadow_mode & mode;
 }
 
-/* 80450708-8045070C 000188 0004+00 1/1 0/0 0/0 .sdata           l_zmodeUpEnable */
 static J3DZModeInfo l_zmodeUpEnable = {1, 3, 1};
 
-/* 8045070C-80450710 00018C 0004+00 1/1 0/0 0/0 .sdata           l_zmodeUpDisable */
 static J3DZModeInfo l_zmodeUpDisable = {1, 3, 0};
 
-/* 80450710-80450718 000190 0008+00 1/1 0/0 0/0 .sdata           l_alphaCompInfoOPA */
 static J3DAlphaCompInfo l_alphaCompInfoOPA = {
     0x07, 0x00, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80450718-80450720 000198 0008+00 1/1 0/0 0/0 .sdata           l_alphaCompInfo */
 static J3DAlphaCompInfo l_alphaCompInfo = {
     0x04, 0x80, 0x00, 0x03, 0xFF, 0x00, 0x00, 0x00,
 };
 
-/* 801ACD24-801ADBBC 1A7664 0E98+00 0/0 0/0 7/7 .text            dKy_bg_MAxx_proc__FPv */
 void dKy_bg_MAxx_proc(void* bg_model_p) {
     dScnKy_env_light_c* kankyo = dKy_getEnvlight();
     J3DModel* model_p = (J3DModel*)bg_model_p;
diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp
index 625491f849..0bb6db6d57 100644
--- a/src/d/d_kankyo_data.cpp
+++ b/src/d/d_kankyo_data.cpp
@@ -9,7 +9,6 @@ struct dKyd_l_vr_box_data_struct {
     u8 data[21];
 };
 
-/* 803A8E98-803A9198 005FB8 0300+00 1/1 0/0 0/0 .data            l_kydata_BloomInf_tbl */
 static dKydata_BloomInfo_c l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
     {BLOOM_SOFT, 0xFF, 0x40, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00},
     {BLOOM_CLEAR, 0x28, 0x46, 0x87, 0xCF, 0xB1, 0x38, 0xD2, 0xFF, 0xFF, 0xFF, 0x60},  // Twilight
@@ -103,7 +102,6 @@ static dKydata_BloomInfo_c l_kydata_BloomInf_tbl[BLOOMINFO_MAX] = {
     {BLOOM_CLEAR, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},  // Empty
 };
 
-/* 803A9198-803A92A8 -00001 0110+00 1/1 0/0 0/0 .data            l_darkworld_tbl */
 static dKydata_darkworldInfo_c l_darkworld_tbl[34] = {
     {"R_SP30", KY_DARKLV_UNCLEARABLE},   // UNUSED - Unknown Room
     {"T_SP05", KY_DARKLV_TEST},          // UNUSED - E3 2005 Warp Test (Old)
@@ -141,7 +139,6 @@ static dKydata_darkworldInfo_c l_darkworld_tbl[34] = {
     {"D_SB10", KY_DARKLV_FARON},         // Faron Woods Cave
 };
 
-/* 803A92A8-803A93C8 -00001 0120+00 1/1 0/0 0/0 .data            l_light_size_tbl */
 static dKydata_lightsizeInfo_c l_light_size_tbl[36] = {
     {"R_SP01", 0},   // Ordon Interiors
     {"R_SP108", 0},  // Coro's Lantern Shop
@@ -181,7 +178,6 @@ static dKydata_lightsizeInfo_c l_light_size_tbl[36] = {
     {"D_SB10", 0},   // Faron Woods Cave
 };
 
-/* 803A93C8-803A9410 -00001 0048+00 1/1 0/0 0/0 .data            l_light_size_tbl_tw */
 static dKydata_lightsizeInfo_c l_light_size_tbl_tw[9] = {
     {"F_SP109", 2},  // Kakariko Village
     {"F_SP110", 2},  // Death Mountain
@@ -195,7 +191,6 @@ static dKydata_lightsizeInfo_c l_light_size_tbl_tw[9] = {
 };
 
 // Maple color. Used in Fishing Hole. Values are RGB. TODO: struct here?
-/* 803A9410-803A9434 006530 0024+00 1/1 0/0 0/0 .data            l_maple_col */
 static color_RGB_class l_maple_col[] = {
     // leaf color blend major
     {0x56, 0x4B, 0x39},  // spring
@@ -214,21 +209,18 @@ static color_RGB_class l_maple_col[] = {
     {0x5A, 0x5A, 0x6E},  // winter
 };
 
-/* 803A9434-803A94B8 006554 0084+00 1/1 0/0 0/0 .data            l_time_attribute */
 static dKyd_lightSchejule l_time_attribute[11] = {
     {0.0f, 75.0f, 5, 5},    {75.0f, 90.0f, 5, 0},   {90.0f, 105.0f, 0, 1},  {105.0f, 105.0f, 1, 1},
     {105.0f, 135.0f, 1, 2}, {135.0f, 240.0f, 2, 2}, {240.0f, 255.0f, 2, 3}, {255.0f, 270.0f, 3, 3},
     {270.0f, 285.0f, 3, 4}, {285.0f, 300.0f, 4, 5}, {300.0f, 360.0f, 5, 5},
 };
 
-/* 803A94B8-803A953C 0065D8 0084+00 1/1 0/0 0/0 .data            l_time_attribute_boss */
 static dKyd_lightSchejule l_time_attribute_boss[11] = {
     {0.0f, 45.0f, 0, 1},    {45.0f, 90.0f, 1, 2},   {90.0f, 180.0f, 2, 3},  {180.0f, 225.0f, 3, 4},
     {225.0f, 270.0f, 4, 5}, {270.0f, 360.0f, 5, 0}, {360.0f, 360.0f, 5, 5}, {360.0f, 360.0f, 5, 5},
     {360.0f, 360.0f, 5, 5}, {360.0f, 360.0f, 5, 5}, {360.0f, 360.0f, 5, 5},
 };
 
-/* 803A953C-803A987C 00665C 0340+00 1/1 0/0 0/0 .data            l_field_data */
 static stage_palette_info_class l_field_data[16] = {
     {
         {0x40, 0x40, 0x40},
@@ -680,12 +672,10 @@ static stage_palette_info_class l_field_data[16] = {
     },
 };
 
-/* 800569DC-800569E8 05131C 000C+00 0/0 1/1 0/0 .text            dKyd_dmpalet_getp__Fv */
 void* dKyd_dmpalet_getp() {
     return l_field_data;
 }
 
-/* 803A987C-803A9894 00699C 0018+00 1/1 0/0 0/0 .data            l_pselect_default */
 static stage_pselect_info_class l_pselect_default[2] = {
     {
         {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x00, 0x00},
@@ -697,12 +687,10 @@ static stage_pselect_info_class l_pselect_default[2] = {
     },
 };
 
-/* 800569E8-800569F4 051328 000C+00 0/0 1/1 0/0 .text            dKyd_dmpselect_getp__Fv */
 void* dKyd_dmpselect_getp() {
     return l_pselect_default;
 }
 
-/* 803A9894-803A9918 0069B4 0082+02 1/1 0/0 0/0 .data            l_envr_default */
 static stage_envr_info_class l_envr_default[2] = {
     {
         {0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -720,12 +708,10 @@ static stage_envr_info_class l_envr_default[2] = {
     },
 };
 
-/* 800569F4-80056A00 051334 000C+00 0/0 1/1 0/0 .text            dKyd_dmenvr_getp__Fv */
 void* dKyd_dmenvr_getp() {
     return l_envr_default;
 }
 
-/* 803A9918-803A9A94 006A38 017A+02 1/1 0/0 0/0 .data            l_vr_box_data */
 static dKyd_l_vr_box_data_struct l_vr_box_data[18] = {
     {{0x2F, 0x1A, 0x07, 0x44, 0x1E, 0x10, 0xF5, 0xA5, 0x6C, 0x9A, 0x5C,
       0x3B, 0xFF, 0x44, 0x1E, 0x10, 0xA3, 0xFF, 0x5B, 0x49, 0x72}},
@@ -765,22 +751,18 @@ static dKyd_l_vr_box_data_struct l_vr_box_data[18] = {
       0x50, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x61, 0x72, 0x9D, 0x78}},
 };
 
-/* 80056A00-80056A0C 051340 000C+00 0/0 1/1 0/0 .text            dKyd_dmvrbox_getp__Fv */
 void* dKyd_dmvrbox_getp() {
     return l_vr_box_data;
 }
 
-/* 80056A0C-80056A18 05134C 000C+00 0/0 1/1 0/0 .text            dKyd_schejule_getp__Fv */
 dKyd_lightSchejule* dKyd_schejule_getp() {
     return l_time_attribute;
 }
 
-/* 80056A18-80056A24 051358 000C+00 0/0 1/1 0/0 .text            dKyd_schejule_boss_getp__Fv */
 dKyd_lightSchejule* dKyd_schejule_boss_getp() {
     return l_time_attribute_boss;
 }
 
-/* 803A9A94-803A9AC0 006BB4 0028+04 1/1 0/0 0/0 .data            S_xfog_table_data */
 static GXFogAdjTable S_xfog_table_data[2] = {
     {
         {260, 260, 270, 280, 290, 300, 310, 320, 330, 340},
@@ -790,7 +772,6 @@ static GXFogAdjTable S_xfog_table_data[2] = {
     },
 };
 
-/* 80056A24-80056A64 051364 0040+00 0/0 2/2 0/0 .text            dKyd_xfog_table_set__FUc */
 void dKyd_xfog_table_set(u8 tblIdx) {
     #if DEBUG
     if (g_kankyoHIO.light.field_0x5 != 1) 
@@ -802,27 +783,22 @@ void dKyd_xfog_table_set(u8 tblIdx) {
     }
 }
 
-/* 80056A64-80056A70 0513A4 000C+00 0/0 1/1 0/0 .text            dKyd_maple_col_getp__Fv */
 color_RGB_class* dKyd_maple_col_getp() {
     return l_maple_col;
 }
 
-/* 80056A70-80056A7C 0513B0 000C+00 0/0 4/4 0/0 .text            dKyd_darkworld_tbl_getp__Fv */
 dKydata_darkworldInfo_c* dKyd_darkworld_tbl_getp() {
     return l_darkworld_tbl;
 }
 
-/* 80056A7C-80056A88 0513BC 000C+00 0/0 1/1 0/0 .text            dKyd_light_size_tbl_getp__Fv */
 dKydata_lightsizeInfo_c* dKyd_light_size_tbl_getp() {
     return l_light_size_tbl;
 }
 
-/* 80056A88-80056A94 0513C8 000C+00 0/0 1/1 0/0 .text            dKyd_light_tw_size_tbl_getp__Fv */
 dKydata_lightsizeInfo_c* dKyd_light_tw_size_tbl_getp() {
     return l_light_size_tbl_tw;
 }
 
-/* 80056A94-80056AA8 0513D4 0014+00 0/0 1/1 0/0 .text            dKyd_BloomInf_tbl_getp__Fi */
 dKydata_BloomInfo_c* dKyd_BloomInf_tbl_getp(int tblIdx) {
     #if DEBUG
     if (g_kankyoHIO.bloom.field_0x4) {
diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp
index 58ae8d335c..e030ea5553 100644
--- a/src/d/d_kankyo_rain.cpp
+++ b/src/d/d_kankyo_rain.cpp
@@ -12,8 +12,6 @@
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 8005B660-8005B708 055FA0 00A8+00 3/3 0/0 0/0 .text            vectle_calc__FP10DOUBLE_POSP4cXyz
- */
 static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) {
     double s = sqrt(i_pos->x * i_pos->x + i_pos->y * i_pos->y + i_pos->z * i_pos->z);
 
@@ -28,7 +26,6 @@ static void vectle_calc(DOUBLE_POS* i_pos, cXyz* o_out) {
     }
 }
 
-/* 8005B708-8005B760 056048 0058+00 7/7 0/0 0/0 .text get_vectle_calc__FP4cXyzP4cXyzP4cXyz */
 static void get_vectle_calc(cXyz* i_vecA, cXyz* i_vecB, cXyz* o_out) {
     DOUBLE_POS pos;
     pos.x = i_vecB->x - i_vecA->x;
@@ -38,14 +35,10 @@ static void get_vectle_calc(cXyz* i_vecA, cXyz* i_vecB, cXyz* o_out) {
     vectle_calc(&pos, o_out);
 }
 
-/* 8005B760-8005B780 0560A0 0020+00 8/8 7/7 11/11 .text dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz
- */
 void dKyr_get_vectle_calc(cXyz* i_vecA, cXyz* i_vecB, cXyz* o_out) {
     get_vectle_calc(i_vecA, i_vecB, o_out);
 }
 
-/* 8005B780-8005B830 0560C0 00B0+00 2/2 0/0 0/0 .text
- * dKy_set_eyevect_calc__FP12camera_classP3Vecff                */
 static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) {
     cXyz calc;
     get_vectle_calc(&i_camera->lookat.eye, &i_camera->lookat.center, &calc);
@@ -54,8 +47,6 @@ static void dKy_set_eyevect_calc(camera_class* i_camera, Vec* o_out, f32 param_2
     o_out->z = i_camera->lookat.eye.z + calc.z * param_2;
 }
 
-/* 8005B830-8005B92C 056170 00FC+00 6/6 0/0 0/0 .text
- * dKy_set_eyevect_calc2__FP12camera_classP3Vecff               */
 void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* o_out, f32 param_2, f32 param_3) {
     cXyz calc;
     DOUBLE_POS pos;
@@ -79,8 +70,6 @@ void dKy_set_eyevect_calc2(camera_class* i_camera, Vec* o_out, f32 param_2, f32
     }
 }
 
-/* 8005B92C-8005BA24 05626C 00F8+00 5/5 0/0 0/0 .text
- * dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID   */
 static void dKyr_set_btitex_common(GXTexObj* i_obj, ResTIMG* i_img, GXTexMapID i_mapID) {
     GXInitTexObj(i_obj, (&i_img->format + i_img->imageOffset), i_img->width, i_img->height,
                  (GXTexFmt)i_img->format, (GXTexWrapMode)i_img->wrapS, (GXTexWrapMode)i_img->wrapT,
@@ -94,12 +83,10 @@ static void dKyr_set_btitex_common(GXTexObj* i_obj, ResTIMG* i_img, GXTexMapID i
     GXLoadTexObj(i_obj, i_mapID);
 }
 
-/* 8005BA24-8005BA48 056364 0024+00 12/12 0/0 0/0 .text dKyr_set_btitex__FP9_GXTexObjP7ResTIMG */
 static void dKyr_set_btitex(GXTexObj* i_obj, ResTIMG* i_img) {
     dKyr_set_btitex_common(i_obj, i_img, GX_TEXMAP0);
 }
 
-/* 8005BA48-8005BED8 056388 0490+00 0/0 1/1 0/0 .text            dKyr_lenzflare_move__Fv */
 void dKyr_lenzflare_move() {
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
@@ -150,7 +137,6 @@ void dKyr_lenzflare_move() {
     }
 }
 
-/* 8005BED8-8005BF08 056818 0030+00 1/1 0/0 0/0 .text            dKyr_moon_arrival_check__Fv */
 static BOOL dKyr_moon_arrival_check() {
     BOOL rv = FALSE;
     if (g_env_light.daytime > 285.0f || g_env_light.daytime < 67.5f) {
@@ -159,7 +145,6 @@ static BOOL dKyr_moon_arrival_check() {
     return rv;
 }
 
-/* 8005BF08-8005CC5C 056848 0D54+00 0/0 1/1 0/0 .text            dKyr_sun_move__Fv */
 void dKyr_sun_move() {
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
@@ -429,7 +414,6 @@ void dKyr_sun_move() {
     }
 }
 
-/* 8005CC5C-8005CDA8 05759C 014C+00 0/0 1/1 0/0 .text            dKyr_rain_init__Fv */
 void dKyr_rain_init() {
     camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera;
     g_env_light.mpRainPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x4a);
@@ -453,12 +437,10 @@ void dKyr_rain_init() {
     g_env_light.mpRainPacket->raincnt = 0;
 }
 
-/* 8005CDA8-8005CDD0 0576E8 0028+00 1/1 0/0 0/0 .text rain_bg_chk__FP19dKankyo_rain_Packeti */
 static void rain_bg_chk(dKankyo_rain_Packet* i_packet, int i_idx) {
     i_packet->mRainEff[i_idx].field_0x30 = dComIfGp_getCamera(0)->lookat.center.y + -800.0f;
 }
 
-/* 8005CDD0-8005CF78 057710 01A8+00 1/1 0/0 0/0 .text            overhead_bg_chk__Fv */
 static BOOL overhead_bg_chk() {
     camera_class* camera = dComIfGp_getCamera(0);
     BOOL chk = false;
@@ -489,8 +471,6 @@ static BOOL overhead_bg_chk() {
     return chk;
 }
 
-/* 8005CF78-8005D18C 0578B8 0214+00 1/1 0/0 0/0 .text            forward_overhead_bg_chk__FP4cXyzf
- */
 static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) {
     camera_class* camera = dComIfGp_getCamera(0);
     BOOL chk = FALSE;
@@ -526,7 +506,6 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) {
     return chk;
 }
 
-/* 8005D18C-8005E8B0 057ACC 1724+00 0/0 1/1 0/0 .text            dKyr_rain_move__Fv */
 void dKyr_rain_move() {
     dKankyo_rain_Packet* rain_packet;
     camera_class* camera;
@@ -882,7 +861,6 @@ void dKyr_rain_move() {
     }
 }
 
-/* 8005E8B0-8005E8F8 0591F0 0048+00 1/1 0/0 0/0 .text            d_krain_cut_turn_check__Fv */
 static BOOL d_krain_cut_turn_check() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     BOOL ret = FALSE;
@@ -896,7 +874,6 @@ static BOOL d_krain_cut_turn_check() {
     return ret;
 }
 
-/* 8005E8F8-8005FBDC 059238 12E4+00 0/0 1/1 0/0 .text            dKyr_housi_move__Fv */
 void dKyr_housi_move() {
     dKankyo_housi_Packet* housi_packet = g_env_light.mpHousiPacket;
     HOUSI_EFF* effect;
@@ -1246,7 +1223,6 @@ void dKyr_housi_move() {
     }
 }
 
-/* 8005FBDC-8005FD48 05A51C 016C+00 0/0 1/1 0/0 .text            dKyr_snow_init__Fv */
 void dKyr_snow_init() {
     camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera;
     g_env_light.mpSnowPacket = new (32) dKankyo_snow_Packet();
@@ -1273,7 +1249,6 @@ void dKyr_snow_init() {
     g_env_light.mpSnowPacket->field_0x6d93 = 0;
 }
 
-/* 8005FD48-80061324 05A688 15DC+00 0/0 1/1 0/0 .text            dKyr_snow_move__Fv */
 void dKyr_snow_move() {
     dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -1542,7 +1517,6 @@ void dKyr_snow_move() {
     }
 }
 
-/* 80061324-8006140C 05BC64 00E8+00 0/0 1/1 0/0 .text            dKyr_star_init__Fv */
 void dKyr_star_init() {
     camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera;
     g_env_light.mpStarPacket = new (32) dKankyo_star_Packet();
@@ -1557,7 +1531,6 @@ void dKyr_star_init() {
 }
 
 
-/* 8006140C-80061438 05BD4C 002C+00 0/0 1/1 0/0 .text            dKyr_star_move__Fv */
 void dKyr_star_move() {
     dKankyo_star_Packet* packet = g_env_light.mpStarPacket;
     packet->mEffectNum = g_env_light.mStarCount;
@@ -1567,7 +1540,6 @@ void dKyr_star_move() {
     }
 }
 
-/* 80061438-800620AC 05BD78 0C74+00 0/0 1/1 0/0 .text            cloud_shadow_move__Fv */
 void cloud_shadow_move() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_cloud_Packet* packet = g_env_light.mpCloudPacket;
@@ -1828,7 +1800,6 @@ void cloud_shadow_move() {
     }
 }
 
-/* 800620AC-80062ADC 05C9EC 0A30+00 0/0 1/1 0/0 .text            vrkumo_move__Fv */
 void vrkumo_move() {
     cXyz wind_vecpow = dKyw_get_wind_vecpow();
     dKankyo_vrkumo_Packet* vrkumo_packet = g_env_light.mpVrkumoPacket;
@@ -2047,7 +2018,6 @@ void vrkumo_move() {
     }
 }
 
-/* 80062ADC-80062B4C 05D41C 0070+00 7/7 0/0 0/0 .text            dKr_cullVtx_Set__Fv */
 static void dKr_cullVtx_Set() {
     GXSetCullMode(GX_CULL_NONE);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGBA, GX_F32, 0);
@@ -2057,7 +2027,6 @@ static void dKr_cullVtx_Set() {
     GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
 }
 
-/* 80062B4C-80063670 05D48C 0B24+00 2/1 0/0 0/0 .text            dKyr_draw_rev_moon__FPA4_fPPUc */
 static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
@@ -2336,7 +2305,6 @@ static void dKyr_draw_rev_moon(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 80063670-8006444C 05DFB0 0DDC+00 1/0 1/1 0/0 .text dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc */
 void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     cXyz pos[4];
@@ -2704,8 +2672,6 @@ void dKyr_drawSun(Mtx drawMtx, cXyz* ppos, GXColor& unused, u8** tex) {
     }
 }
 
-/* 8006444C-8006562C 05ED8C 11E0+00 0/0 1/1 0/0 .text
- * dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc               */
 void dKyr_drawLenzflare(Mtx drawMtx, cXyz* ppos, GXColor& param_2, u8** tex) {
     dKankyo_sunlenz_Packet* lenz_packet = g_env_light.mpSunLenzPacket;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
@@ -3127,7 +3093,6 @@ void dKyr_drawLenzflare(Mtx drawMtx, cXyz* ppos, GXColor& param_2, u8** tex) {
     }
 }
 
-/* 8006562C-80066048 05FF6C 0A1C+00 0/0 1/1 0/0 .text            dKyr_drawRain__FPA4_fPPUc */
 void dKyr_drawRain(Mtx drawMtx, u8** tex) {
     dKankyo_rain_Packet* rain_packet = g_env_light.mpRainPacket;
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
@@ -3274,7 +3239,6 @@ void dKyr_drawRain(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 80066048-8006653C 060988 04F4+00 0/0 1/1 0/0 .text            dKyr_drawSibuki__FPA4_fPPUc */
 void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
     dKankyo_rain_Packet* rain_packet = g_env_light.mpRainPacket;
@@ -3406,7 +3370,6 @@ void dKyr_drawSibuki(Mtx drawMtx, u8** tex) {
     J3DShape::resetVcdVatCache();
 }
 
-/* 8006653C-80067488 060E7C 0F4C+00 0/0 1/1 0/0 .text            dKyr_drawHousi__FPA4_fPPUc */
 void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
     dKankyo_housi_Packet* housi_packet = g_env_light.mpHousiPacket;
     static f32 rot = 0.0f;
@@ -3767,7 +3730,6 @@ void dKyr_drawHousi(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 80067488-800685DC 061DC8 1154+00 0/0 1/1 0/0 .text            dKyr_drawSnow__FPA4_fPPUc */
 void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
     camera_class* camera = (camera_class*)dComIfGp_getCamera(0);
     dKankyo_snow_Packet* snow_packet = g_env_light.mpSnowPacket;
@@ -4064,7 +4026,6 @@ void dKyr_drawSnow(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 800685DC-8006950C 062F1C 0F30+00 0/0 1/1 0/0 .text            dKyr_drawStar__FPA4_fPPUc */
 void dKyr_drawStar(Mtx drawMtx, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_star_Packet* star_packet = g_env_light.mpStarPacket;
@@ -4336,7 +4297,6 @@ void dKyr_drawStar(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 8006950C-8006A090 063E4C 0B84+00 0/0 1/1 0/0 .text            drawCloudShadow__FPA4_fPPUc */
 void drawCloudShadow(Mtx drawMtx, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_cloud_Packet* cloud_packet = g_env_light.mpCloudPacket;
@@ -4578,7 +4538,6 @@ inline float cosf(float x) {
     return cos(x);
 }
 
-/* 8006A090-8006B190 0649D0 1100+00 0/0 1/1 0/0 .text            drawVrkumo__FPA4_fR8_GXColorPPUc */
 void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
@@ -5042,13 +5001,11 @@ void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) {
     J3DShape::resetVcdVatCache();
 }
 
-/* 8006B190-8006B1A8 065AD0 0018+00 0/0 1/1 0/0 .text            dKyr_thunder_init__Fv */
 void dKyr_thunder_init() {
     g_env_light.mThunderEff.mState = 0;
     g_env_light.mThunderEff.field_0x2 = 0;
 }
 
-/* 8006B1A8-8006B8DC 065AE8 0734+00 0/0 1/1 0/0 .text            dKyr_thunder_move__Fv */
 void dKyr_thunder_move() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     EF_THUNDER* effect = &envlight->mThunderEff;
@@ -5234,13 +5191,10 @@ void dKyr_thunder_move() {
     }
 }
 
-/* 8006B8DC-8006B8E0 06621C 0004+00 0/0 1/1 0/0 .text            dKyr_shstar_init__Fv */
 void dKyr_shstar_init() {}
 
-/* 8006B8E0-8006B8E4 066220 0004+00 0/0 1/1 0/0 .text            dKyr_shstar_move__Fv */
 void dKyr_shstar_move() {}
 
-/* 8006B8E4-8006B924 066224 0040+00 0/0 1/1 0/0 .text            dKyr_odour_init__Fv */
 void dKyr_odour_init() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_odour_Packet* odour_packet = envlight->mOdourData.mpOdourPacket;
@@ -5253,7 +5207,6 @@ void dKyr_odour_init() {
     }
 }
 
-/* 8006B924-8006BE0C 066264 04E8+00 0/0 1/1 0/0 .text            dKyr_odour_move__Fv */
 void dKyr_odour_move() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKy_Odour_Data* pOdourData = &envlight->mOdourData;
@@ -5342,7 +5295,6 @@ void dKyr_odour_move() {
     }
 }
 
-/* 8006BE0C-8006C790 06674C 0984+00 0/0 1/1 0/0 .text            dKyr_odour_draw__FPA4_fPPUc */
 void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_odour_Packet* odour_packet = envlight->mOdourData.mpOdourPacket;
@@ -5570,7 +5522,6 @@ void dKyr_odour_draw(Mtx drawMtx, u8** tex) {
     J3DShape::resetVcdVatCache();
 }
 
-/* 8006C790-8006C85C 0670D0 00CC+00 0/0 1/1 0/0 .text            dKyr_mud_init__Fv */
 void dKyr_mud_init() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     envlight->mpMudPacket->mpMoyaRes = (u8*)dComIfG_getObjectRes("Always", 0x53);
@@ -5588,7 +5539,6 @@ void dKyr_mud_init() {
     }
 }
 
-/* 8006C85C-8006D01C 06719C 07C0+00 0/0 1/1 0/0 .text            dKyr_mud_move__Fv */
 void dKyr_mud_move() {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_mud_Packet* mud_packet = g_env_light.mpMudPacket;
@@ -5729,7 +5679,6 @@ void dKyr_mud_move() {
     }
 }
 
-/* 8006D01C-8006D914 06795C 08F8+00 0/0 1/1 0/0 .text            dKyr_mud_draw__FPA4_fPPUc */
 void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
     dKankyo_mud_Packet* mud_packet = g_env_light.mpMudPacket;
     dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket;
@@ -5924,7 +5873,6 @@ void dKyr_mud_draw(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 8006D914-8006DA04 068254 00F0+00 0/0 1/1 1/1 .text            dKyr_evil_init__Fv */
 void dKyr_evil_init() {
     if (g_env_light.mpEvilPacket != NULL) {
         g_env_light.mpEvilPacket->mpMoyaRes = (u8*)dComIfG_getObjectRes("Always", 0x53);
@@ -5942,7 +5890,6 @@ void dKyr_evil_init() {
     }
 }
 
-/* 8006DA04-8006DA7C 068344 0078+00 0/0 1/1 0/0 .text            dKyr_evil_move__Fv */
 void dKyr_evil_move() {
     dKankyo_evil_Packet* evil_packet = g_env_light.mpEvilPacket;
     cXyz vec = dKyw_get_wind_vecpow();
@@ -5951,7 +5898,6 @@ void dKyr_evil_move() {
     for (int i = 0; i < evil_packet->mEffectNum; i++) {}
 }
 
-/* 8006DA7C-8006E448 0683BC 09CC+00 1/1 0/0 0/0 .text            dKyr_evil_draw2__FPA4_fPPUc */
 static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_evil_Packet* evil_packet = envlight->mpEvilPacket;
@@ -6160,8 +6106,6 @@ static void dKyr_evil_draw2(Mtx drawMtx, u8** tex) {
     }
 }
 
-/* 8006E448-8006E6B0 068D88 0268+00 1/1 0/0 0/0 .text            dKyr_near_bosslight_check__F4cXyz
- */
 static f32 dKyr_near_bosslight_check(cXyz pos) {
     f32 nearest_dist = 10000000.0f;
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
@@ -6177,7 +6121,6 @@ static f32 dKyr_near_bosslight_check(cXyz pos) {
     return nearest_dist;
 }
 
-/* 8006E6B0-8006F160 068FF0 0AB0+00 0/0 1/1 0/0 .text            dKyr_evil_draw__FPA4_fPPUc */
 void dKyr_evil_draw(Mtx drawMtx, u8** tex) {
     dScnKy_env_light_c* envlight = dKy_getEnvlight();
     dKankyo_evil_Packet* evil_packet = envlight->mpEvilPacket;
diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp
index 049294772a..bcdbb5412e 100644
--- a/src/d/d_kankyo_wether.cpp
+++ b/src/d/d_kankyo_wether.cpp
@@ -17,7 +17,6 @@
 
 static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind);
 
-/* 80056AA8-80056AF8 0513E8 0050+00 3/3 0/0 0/0 .text dKyw_setDrawPacketList__FP9J3DPacketi */
 static J3DPacket* dKyw_setDrawPacketList(J3DPacket* i_packet, int i_type) {
     if (i_packet == NULL) {
         return NULL;
@@ -27,8 +26,6 @@ static J3DPacket* dKyw_setDrawPacketList(J3DPacket* i_packet, int i_type) {
     }
 }
 
-/* 80056AF8-80056B48 051438 0050+00 3/3 0/0 0/0 .text
- * dKyw_setDrawPacketListIndScreen__FP9J3DPacketi               */
 static J3DPacket* dKyw_setDrawPacketListIndScreen(J3DPacket* i_packet, int i_type) {
     if (i_packet == NULL) {
         return NULL;
@@ -38,7 +35,6 @@ static J3DPacket* dKyw_setDrawPacketListIndScreen(J3DPacket* i_packet, int i_typ
     }
 }
 
-/* 80056B48-80056BD8 051488 0090+00 5/5 0/0 0/0 .text dKyw_setDrawPacketListSky__FP9J3DPacketi */
 static J3DPacket* dKyw_setDrawPacketListSky(J3DPacket* i_packet, int i_type) {
     if (i_packet == NULL) {
         return NULL;
@@ -50,8 +46,6 @@ static J3DPacket* dKyw_setDrawPacketListSky(J3DPacket* i_packet, int i_type) {
     }
 }
 
-/* 80056BD8-80056C60 051518 0088+00 2/2 0/0 0/0 .text dKyw_setDrawPacketListXluBg__FP9J3DPacketi
- */
 static J3DPacket* dKyw_setDrawPacketListXluBg(J3DPacket* i_packet, int i_type) {
     if (i_packet == NULL) {
         return NULL;
@@ -63,127 +57,95 @@ static J3DPacket* dKyw_setDrawPacketListXluBg(J3DPacket* i_packet, int i_type) {
     }
 }
 
-/* 80056C60-80056C98 0515A0 0038+00 1/0 0/0 0/0 .text            draw__18dKankyo_sun_PacketFv */
 void dKankyo_sun_Packet::draw() {
     dKyr_drawSun(j3dSys.getViewMtx(), mPos, mColor, &mpResMoon);
 }
 
-/* 80056C98-80056CD0 0515D8 0038+00 1/0 0/0 0/0 .text            draw__22dKankyo_sunlenz_PacketFv */
 void dKankyo_sunlenz_Packet::draw() {
     dKyr_drawLenzflare(j3dSys.getViewMtx(), mPositions, mColor, &mpResBall);
 }
 
-/* 80056CD0-80056D0C 051610 003C+00 2/2 0/0 0/0 .text            __dt__8RAIN_EFFFv */
 RAIN_EFF::~RAIN_EFF() {}
 
-/* 80056D0C-80056D10 05164C 0004+00 1/1 0/0 0/0 .text            __ct__8RAIN_EFFFv */
 RAIN_EFF::RAIN_EFF() {}
 
-/* 80056D10-80056D58 051650 0048+00 1/0 0/0 0/0 .text            draw__19dKankyo_rain_PacketFv */
 void dKankyo_rain_Packet::draw() {
     dKyr_drawSibuki(j3dSys.getViewMtx(), &mpTex);
     dKyr_drawRain(j3dSys.getViewMtx(), &mpTex);
 }
 
-/* 80056D58-80056D94 051698 003C+00 1/1 1/1 0/0 .text            __dt__8SNOW_EFFFv */
 SNOW_EFF::~SNOW_EFF() {}
 
-/* 80056D94-80056D98 0516D4 0004+00 0/0 1/1 0/0 .text            __ct__8SNOW_EFFFv */
 SNOW_EFF::SNOW_EFF() {}
 
-/* 80056D98-80056DC8 0516D8 0030+00 1/0 0/0 0/0 .text            draw__19dKankyo_snow_PacketFv */
 void dKankyo_snow_Packet::draw() {
     dKyr_drawSnow(j3dSys.getViewMtx(), &mpTex);
 }
 
-/* 80056DC8-80056E04 051708 003C+00 1/1 1/1 0/0 .text            __dt__8STAR_EFFFv */
 STAR_EFF::~STAR_EFF() {}
 
-/* 80056E04-80056E08 051744 0004+00 0/0 1/1 0/0 .text            __ct__8STAR_EFFFv */
 STAR_EFF::STAR_EFF() {}
 
-/* 80056E08-80056E38 051748 0030+00 1/0 0/0 0/0 .text            draw__19dKankyo_star_PacketFv */
 void dKankyo_star_Packet::draw() {
     dKyr_drawStar(j3dSys.getViewMtx(), &mpTex);
 }
 
-/* 80056E38-80056E74 051778 003C+00 2/2 0/0 0/0 .text            __dt__9CLOUD_EFFFv */
 CLOUD_EFF::~CLOUD_EFF() {}
 
-/* 80056E74-80056E78 0517B4 0004+00 1/1 0/0 0/0 .text            __ct__9CLOUD_EFFFv */
 CLOUD_EFF::CLOUD_EFF() {}
 
-/* 80056E78-80056EA8 0517B8 0030+00 1/0 0/0 0/0 .text            draw__20dKankyo_cloud_PacketFv */
 void dKankyo_cloud_Packet::draw() {
     drawCloudShadow(j3dSys.getViewMtx(), &mpResTex);
 }
 
-/* 80056EA8-80056EE4 0517E8 003C+00 2/2 0/0 0/0 .text            __dt__9HOUSI_EFFFv */
 HOUSI_EFF::~HOUSI_EFF() {}
 
-/* 80056EE4-80056EE8 051824 0004+00 1/1 0/0 0/0 .text            __ct__9HOUSI_EFFFv */
 HOUSI_EFF::HOUSI_EFF() {}
 
-/* 80056EE8-80056F18 051828 0030+00 1/0 0/0 0/0 .text            draw__20dKankyo_housi_PacketFv */
 void dKankyo_housi_Packet::draw() {
     dKyr_drawHousi(j3dSys.getViewMtx(), &mpResTex);
 }
 
-/* 80056F18-80056F54 051858 003C+00 2/2 0/0 0/0 .text            __dt__10VRKUMO_EFFFv */
 VRKUMO_EFF::~VRKUMO_EFF() {}
 
-/* 80056F54-80056F58 051894 0004+00 1/1 0/0 0/0 .text            __ct__10VRKUMO_EFFFv */
 VRKUMO_EFF::VRKUMO_EFF() {}
 
-/* 80056F58-80056F8C 051898 0034+00 1/0 0/0 0/0 .text            draw__21dKankyo_vrkumo_PacketFv */
 void dKankyo_vrkumo_Packet::draw() {
     drawVrkumo(j3dSys.getViewMtx(), mColor, &mpResCloudtx_01);
 }
 
-/* 80056F8C-80056FC8 0518CC 003C+00 2/2 0/0 0/0 .text            __dt__12EF_ODOUR_EFFFv */
 EF_ODOUR_EFF::~EF_ODOUR_EFF() {}
 
-/* 80056FC8-80056FCC 051908 0004+00 1/1 0/0 0/0 .text            __ct__12EF_ODOUR_EFFFv */
 EF_ODOUR_EFF::EF_ODOUR_EFF() {}
 
-/* 80056FCC-80056FFC 05190C 0030+00 1/0 0/0 0/0 .text            draw__20dKankyo_odour_PacketFv */
 void dKankyo_odour_Packet::draw() {
     dKyr_odour_draw(j3dSys.getViewMtx(), &mpResTex);
 }
 
-/* 80056FFC-80057038 05193C 003C+00 2/2 0/0 0/0 .text            __dt__10EF_MUD_EFFFv */
 EF_MUD_EFF::~EF_MUD_EFF() {}
 
-/* 80057038-8005703C 051978 0004+00 1/1 0/0 0/0 .text            __ct__10EF_MUD_EFFFv */
 EF_MUD_EFF::EF_MUD_EFF() {}
 
-/* 8005703C-8005706C 05197C 0030+00 1/0 0/0 0/0 .text            draw__18dKankyo_mud_PacketFv */
 void dKankyo_mud_Packet::draw() {
     dKyr_mud_draw(j3dSys.getViewMtx(), &mpMoyaRes);
 }
 
-/* 8005706C-800570A8 0519AC 003C+00 2/2 0/0 0/0 .text            __dt__11EF_EVIL_EFFFv */
 EF_EVIL_EFF::~EF_EVIL_EFF() {}
 
-/* 800570A8-800570AC 0519E8 0004+00 1/1 0/0 0/0 .text            __ct__11EF_EVIL_EFFFv */
 EF_EVIL_EFF::EF_EVIL_EFF() {}
 
-/* 800570AC-800570DC 0519EC 0030+00 1/0 0/0 0/0 .text            draw__19dKankyo_evil_PacketFv */
 void dKankyo_evil_Packet::draw() {
     dKyr_evil_draw(j3dSys.getViewMtx(), &mpMoyaRes);
 }
 
-/* 800570DC-8005710C 051A1C 0030+00 1/1 0/0 0/0 .text            dKyw_drawSun__Fi */
 static void dKyw_drawSun(int i_type) {
     dKyw_setDrawPacketListSky(g_env_light.mpSunPacket, i_type);
 }
 
-/* 8005710C-80057130 051A4C 0024+00 1/1 0/0 0/0 .text            dKyw_Sun_Draw__Fv */
 static void dKyw_Sun_Draw() {
     dKyw_drawSun(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057130-80057174 051A70 0044+00 1/1 0/0 0/0 .text            dKyw_drawSunlenz__Fi */
 static void dKyw_drawSunlenz(int i_type) {
     if (g_env_light.mpSunLenzPacket->mDrawLenzInSky == false) {
         dKyw_setDrawPacketListIndScreen(g_env_light.mpSunLenzPacket, i_type);
@@ -192,112 +154,90 @@ static void dKyw_drawSunlenz(int i_type) {
     }
 }
 
-/* 80057174-80057198 051AB4 0024+00 1/1 0/0 0/0 .text            dKyw_Sunlenz_Draw__Fv */
 static void dKyw_Sunlenz_Draw() {
     dKyw_drawSunlenz(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057198-800571C8 051AD8 0030+00 1/1 0/0 0/0 .text            dKyw_drawRain__Fi */
 static void dKyw_drawRain(int i_type) {
     dKyw_setDrawPacketList(g_env_light.mpRainPacket, i_type);
 }
 
-/* 800571C8-800571EC 051B08 0024+00 1/1 0/0 0/0 .text            dKyw_Rain_Draw__Fv */
 static void dKyw_Rain_Draw() {
     dKyw_drawRain(J3DSysDrawBuf_Xlu);
 }
 
-/* 800571EC-8005721C 051B2C 0030+00 1/1 0/0 0/0 .text            dKyw_drawSnow__Fi */
 static void dKyw_drawSnow(int i_type) {
     dKyw_setDrawPacketList(g_env_light.mpSnowPacket, i_type);
 }
 
-/* 8005721C-80057240 051B5C 0024+00 1/1 0/0 0/0 .text            dKyw_Snow_Draw__Fv */
 static void dKyw_Snow_Draw() {
     dKyw_drawSnow(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057240-80057270 051B80 0030+00 1/1 0/0 0/0 .text            dKyw_drawStar__Fi */
 static void dKyw_drawStar(int i_type) {
     dKyw_setDrawPacketListSky(g_env_light.mpStarPacket, i_type);
 }
 
-/* 80057270-80057294 051BB0 0024+00 1/1 0/0 0/0 .text            dKyw_Star_Draw__Fv */
 static void dKyw_Star_Draw() {
     dKyw_drawStar(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057294-800572C4 051BD4 0030+00 1/1 0/0 0/0 .text            dKyw_drawHousi__Fi */
 static void dKyw_drawHousi(int i_type) {
     dKyw_setDrawPacketList(g_env_light.mpHousiPacket, i_type);
 }
 
-/* 800572C4-800572E8 051C04 0024+00 1/1 0/0 0/0 .text            dKyw_Housi_Draw__Fv */
 static void dKyw_Housi_Draw() {
     dKyw_drawHousi(J3DSysDrawBuf_Xlu);
 }
 
-/* 800572E8-80057318 051C28 0030+00 1/1 0/0 0/0 .text            dKyw_drawCloud__Fi */
 static void dKyw_drawCloud(int i_type) {
     dKyw_setDrawPacketListIndScreen(g_env_light.mpCloudPacket, i_type);
 }
 
-/* 80057318-8005733C 051C58 0024+00 1/1 0/0 0/0 .text            dKyw_Cloud_Draw__Fv */
 static void dKyw_Cloud_Draw() {
     dKyw_drawCloud(J3DSysDrawBuf_Xlu);
 }
 
-/* 8005733C-8005736C 051C7C 0030+00 1/1 0/0 0/0 .text            dKyw_drawVrkumo__Fi */
 static void dKyw_drawVrkumo(int i_type) {
     dKyw_setDrawPacketListSky(g_env_light.mpVrkumoPacket, i_type);
 }
 
-/* 8005736C-80057390 051CAC 0024+00 1/1 0/0 0/0 .text            dKyw_Vrkumo_Draw__Fv */
 static void dKyw_Vrkumo_Draw() {
     dKyw_drawVrkumo(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057390-800573C0 051CD0 0030+00 1/1 0/0 0/0 .text            dKyw_shstar_packet__Fi */
 static void dKyw_shstar_packet(int i_type) {
     dKyw_setDrawPacketListSky(g_env_light.mpShstarPacket, i_type);
 }
 
-/* 800573C0-800573E4 051D00 0024+00 1/1 0/0 0/0 .text            dKyw_shstar_Draw__Fv */
 static void dKyw_shstar_Draw() {
     dKyw_shstar_packet(J3DSysDrawBuf_Xlu);
 }
 
-/* 800573E4-80057414 051D24 0030+00 1/1 0/0 0/0 .text            dKyw_odour_packet__Fi */
 static void dKyw_odour_packet(int i_type) {
     dKyw_setDrawPacketListIndScreen(g_env_light.mOdourData.mpOdourPacket, i_type);
 }
 
-/* 80057414-80057438 051D54 0024+00 1/1 0/0 0/0 .text            dKyw_Odour_Draw__Fv */
 static void dKyw_Odour_Draw() {
     dKyw_odour_packet(J3DSysDrawBuf_Xlu);
 }
 
-/* 80057438-80057468 051D78 0030+00 1/1 0/0 0/0 .text            dKyw_mud_packet__Fi */
 static void dKyw_mud_packet(int i_type) {
     dKyw_setDrawPacketListXluBg(g_env_light.mpMudPacket, i_type);
 }
 
-/* 80057468-8005748C 051DA8 0024+00 1/1 0/0 0/0 .text            dKyw_mud_Draw__Fv */
 static void dKyw_mud_Draw() {
     dKyw_mud_packet(J3DSysDrawBuf_Xlu);
 }
 
-/* 8005748C-800574BC 051DCC 0030+00 1/1 0/0 0/0 .text            dKyw_evil_packet__Fi */
 static void dKyw_evil_packet(int i_type) {
     dKyw_setDrawPacketListXluBg(g_env_light.mpEvilPacket, i_type);
 }
 
-/* 800574BC-800574E0 051DFC 0024+00 1/1 0/0 0/0 .text            dKyw_evil_Draw__Fv */
 static void dKyw_evil_Draw() {
     dKyw_evil_packet(J3DSysDrawBuf_Xlu);
 }
 
-/* 800574E0-800579EC 051E20 050C+00 0/0 1/1 0/0 .text            dKyw_wether_init__Fv */
 void dKyw_wether_init() {
     g_env_light.mSunInitialized = false;
     g_env_light.mThunderEff.mStatus = 0;
@@ -369,13 +309,11 @@ void dKyw_wether_init() {
     }
 }
 
-/* 800579EC-80057A04 05232C 0018+00 0/0 1/1 0/0 .text            dKyw_wether_init2__Fv */
 void dKyw_wether_init2() {
     g_env_light.mVrkumoStatus = 0;
     g_env_light.mVrkumoCount = 0;
 }
 
-/* 80057A04-80057C84 052344 0280+00 0/0 1/1 0/0 .text            dKyw_wether_delete__Fv */
 void dKyw_wether_delete() {
     if (g_env_light.mSunInitialized) {
         delete g_env_light.mpSunPacket;
@@ -426,37 +364,26 @@ void dKyw_wether_delete() {
     }
 }
 
-/* 80057C84-80057D08 0525C4 0084+00 1/0 0/0 0/0 .text            __dt__19dKankyo_evil_PacketFv */
 dKankyo_evil_Packet::~dKankyo_evil_Packet() {}
 
-/* 80057D08-80057D8C 052648 0084+00 1/0 0/0 0/0 .text            __dt__18dKankyo_mud_PacketFv */
 dKankyo_mud_Packet::~dKankyo_mud_Packet() {}
 
-/* 80057D8C-80057E10 0526CC 0084+00 1/0 0/0 0/0 .text            __dt__20dKankyo_odour_PacketFv */
 dKankyo_odour_Packet::~dKankyo_odour_Packet() {}
 
-/* 80057E10-80057E94 052750 0084+00 1/0 0/0 0/0 .text            __dt__20dKankyo_cloud_PacketFv */
 dKankyo_cloud_Packet::~dKankyo_cloud_Packet() {}
 
-/* 80057E94-80057F18 0527D4 0084+00 1/0 0/0 0/0 .text            __dt__20dKankyo_housi_PacketFv */
 dKankyo_housi_Packet::~dKankyo_housi_Packet() {}
 
-/* 80057F18-80057F9C 052858 0084+00 1/0 0/0 0/0 .text            __dt__19dKankyo_star_PacketFv */
 dKankyo_star_Packet::~dKankyo_star_Packet() {}
 
-/* 80057F9C-80058020 0528DC 0084+00 1/0 0/0 0/0 .text            __dt__19dKankyo_snow_PacketFv */
 dKankyo_snow_Packet::~dKankyo_snow_Packet() {}
 
-/* 80058020-800580A4 052960 0084+00 1/0 0/0 0/0 .text            __dt__19dKankyo_rain_PacketFv */
 dKankyo_rain_Packet::~dKankyo_rain_Packet() {}
 
-/* 800580A4-80058128 0529E4 0084+00 1/0 0/0 0/0 .text            __dt__22dKankyo_sunlenz_PacketFv */
 dKankyo_sunlenz_Packet::~dKankyo_sunlenz_Packet() {}
 
-/* 80058128-800581AC 052A68 0084+00 1/0 0/0 0/0 .text            __dt__18dKankyo_sun_PacketFv */
 dKankyo_sun_Packet::~dKankyo_sun_Packet() {}
 
-/* 800581AC-8005820C 052AEC 0060+00 0/0 1/1 0/0 .text            dKyw_wether_delete2__Fv */
 void dKyw_wether_delete2() {
     if (g_env_light.mVrkumoStatus != 0) {
         delete g_env_light.mpVrkumoPacket;
@@ -464,10 +391,8 @@ void dKyw_wether_delete2() {
     }
 }
 
-/* 8005820C-80058290 052B4C 0084+00 1/0 0/0 0/0 .text            __dt__21dKankyo_vrkumo_PacketFv */
 dKankyo_vrkumo_Packet::~dKankyo_vrkumo_Packet() {}
 
-/* 80058290-800582F8 052BD0 0068+00 1/1 0/0 0/0 .text            wether_move_thunder__Fv */
 static void wether_move_thunder() {
     switch (g_env_light.mThunderEff.mStatus) {
     case 0:
@@ -482,12 +407,10 @@ static void wether_move_thunder() {
     }
 }
 
-/* 800582F8-80058318 052C38 0020+00 0/0 1/1 0/0 .text            dKyw_wether_move__Fv */
 void dKyw_wether_move() {
     wether_move_thunder();
 }
 
-/* 80058318-80058894 052C58 057C+00 1/1 0/0 0/0 .text            wether_move_sun__Fv */
 static void wether_move_sun() {
     s32 sunVisible = false;
     if (dComIfGp_checkStatus(1) && !g_env_light.hide_vrbox) {
@@ -589,7 +512,6 @@ static void wether_move_sun() {
     }
 }
 
-/* 80058894-80058B00 0531D4 026C+00 1/1 0/0 0/0 .text            wether_move_rain__Fv */
 static void wether_move_rain() {
     switch (g_env_light.mRainInitialized) {
     case FALSE:
@@ -632,7 +554,6 @@ static void wether_move_rain() {
     }
 }
 
-/* 80058B00-80058B8C 053440 008C+00 1/1 0/0 0/0 .text            wether_move_snow__Fv */
 static void wether_move_snow() {
     switch (g_env_light.mSnowInitialized) {
     case FALSE:
@@ -650,7 +571,6 @@ static void wether_move_snow() {
     }
 }
 
-/* 80058B8C-80058F18 0534CC 038C+00 1/1 0/0 0/0 .text            wether_move_star__Fv */
 static void wether_move_star() {
     s32 starsVisible = false;
     // Stage is Hyrule Castle or Castle Throne Room
@@ -743,7 +663,6 @@ static void wether_move_star() {
     }
 }
 
-/* 80058F18-800593DC 053858 04C4+00 1/1 0/0 0/0 .text            wether_move_housi__Fv */
 static void wether_move_housi() {
     // Stage is Palace of Twilight or Zant Throne Room, or Phantom Zant arena
     // Room is not Entrance or Boss Key room
@@ -841,7 +760,6 @@ static void wether_move_housi() {
     }
 }
 
-/* 800593DC-80059580 053D1C 01A4+00 1/1 0/0 0/0 .text            wether_move_odour__Fv */
 static void wether_move_odour() {
     switch (g_env_light.mOdourData.mOdourPacketStatus) {
     case 0:
@@ -876,7 +794,6 @@ static void wether_move_odour() {
     }
 }
 
-/* 80059580-80059728 053EC0 01A8+00 1/1 0/0 0/0 .text            wether_move_moya__Fv */
 static void wether_move_moya() {
     switch (g_env_light.mCloudInitialized) {
     case 0:
@@ -912,7 +829,6 @@ static void wether_move_moya() {
     }
 }
 
-/* 80059728-80059E38 054068 0710+00 1/1 0/0 0/0 .text            wether_move_vrkumo__Fv */
 static void wether_move_vrkumo() {
     BOOL var_r31 = false;
     static cXyz r09o(-180000.0f, 750.0f, -200000.0f);
@@ -1044,7 +960,6 @@ static void wether_move_vrkumo() {
     }
 }
 
-/* 80059E38-80059F74 054778 013C+00 1/1 0/0 0/0 .text            wether_move_mud__Fv */
 static void wether_move_mud() {
     switch (g_env_light.mMudInitialized) {
     case 0:
@@ -1071,7 +986,6 @@ static void wether_move_mud() {
     }
 }
 
-/* 80059F74-8005A0B8 0548B4 0144+00 1/1 0/0 0/0 .text            wether_move_evil__Fv */
 static void wether_move_evil() {
     switch (g_env_light.mEvilInitialized & 0xF) {
     case 0:
@@ -1098,7 +1012,6 @@ static void wether_move_evil() {
     }
 }
 
-/* 8005A0B8-8005A154 0549F8 009C+00 0/0 1/1 0/0 .text            dKyw_wether_move_draw__Fv */
 void dKyw_wether_move_draw() {
     g_env_light.moya_se = 0;
 
@@ -1118,12 +1031,10 @@ void dKyw_wether_move_draw() {
     }
 }
 
-/* 8005A154-8005A174 054A94 0020+00 0/0 1/1 0/0 .text            dKyw_wether_move_draw2__Fv */
 void dKyw_wether_move_draw2() {
     wether_move_vrkumo();
 }
 
-/* 8005A174-8005A304 054AB4 0190+00 0/0 1/1 0/0 .text            dKyw_wether_draw__Fv */
 void dKyw_wether_draw() {
     if (strcmp(dComIfGp_getStartStageName(), "Name") && g_env_light.mCloudInitialized != 0) {
         dKyw_Cloud_Draw();
@@ -1172,14 +1083,12 @@ void dKyw_wether_draw() {
     }
 }
 
-/* 8005A304-8005A340 054C44 003C+00 0/0 1/1 0/0 .text            dKyw_wether_draw2__Fv */
 void dKyw_wether_draw2() {
     if (g_env_light.mVrkumoStatus != 0 && g_env_light.mVrkumoStatus < 99) {
         dKyw_Vrkumo_Draw();
     }
 }
 
-/* 8005A340-8005A57C 054C80 023C+00 0/0 1/1 0/0 .text            dKyw_wether_proc__Fv */
 void dKyw_wether_proc() {
     // Stage is Faron Woods or Fishing Pond or Hyrule Field
     if (!strcmp(dComIfGp_getStartStageName(), "F_SP108") ||
@@ -1227,7 +1136,6 @@ lbl1:
     squal_proc();
 }
 
-/* 8005A57C-8005A5C0 054EBC 0044+00 1/1 0/0 0/0 .text            dKyw_wind_init__Fv */
 static void dKyw_wind_init() {
     g_env_light.global_wind_influence.vec.x = -1.0f;
     g_env_light.global_wind_influence.vec.y = 0.0f;
@@ -1242,7 +1150,6 @@ static void dKyw_wind_init() {
     g_env_light.TeachWind_existence = 0;
 }
 
-/* 8005A5C0-8005AAE0 054F00 0520+00 0/0 2/2 0/0 .text            dKyw_wind_set__Fv */
 void dKyw_wind_set() {
     s16 var_r30;
     s16 var_r29;
@@ -1381,23 +1288,19 @@ void dKyw_wind_set() {
     }
 }
 
-/* 8005AAE0-8005AAF0 055420 0010+00 1/1 6/6 7/7 .text            dKyw_get_wind_vec__Fv */
 cXyz* dKyw_get_wind_vec() {
     return &g_env_light.global_wind_influence.vec;
 }
 
-/* 8005AAF0-8005AB00 055430 0010+00 1/1 6/6 8/8 .text            dKyw_get_wind_pow__Fv */
 f32 dKyw_get_wind_pow() {
     return g_env_light.global_wind_influence.pow;
 }
 
-/* 8005AB00-8005AB64 055440 0064+00 0/0 8/8 3/3 .text            dKyw_get_wind_vecpow__Fv */
 cXyz dKyw_get_wind_vecpow() {
     cXyz vec = g_env_light.global_wind_influence.vec * g_env_light.global_wind_influence.pow;
     return vec;
 }
 
-/* 8005AB64-8005AC30 0554A4 00CC+00 0/0 0/0 1/1 .text dKyw_plight_collision_set__FP4cXyzssfffff */
 void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 param_3, f32 param_4,
                                f32 param_5, f32 param_6, f32 param_7) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
@@ -1424,7 +1327,6 @@ void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 para
     }
 }
 
-/* 8005AC30-8005AD44 055570 0114+00 1/1 0/0 0/0 .text            squal_proc__Fv */
 static void squal_proc() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     WIND_INFLUENCE* influence;
@@ -1458,7 +1360,6 @@ static void squal_proc() {
     }
 }
 
-/* 8005AD44-8005AD98 055684 0054+00 1/1 0/0 0/0 .text            dKyw_pntwind_init__Fv */
 static void dKyw_pntwind_init() {
     for (int i = 0; i < 30; i++) {
         g_env_light.pntwind[i] = NULL;
@@ -1469,7 +1370,6 @@ static void dKyw_pntwind_init() {
     }
 }
 
-/* 8005AD98-8005ADFC 0556D8 0064+00 2/2 0/0 0/0 .text            pntwind_set__FP14WIND_INFLUENCE */
 static void pntwind_set(WIND_INFLUENCE* i_pntwind) {
     int i = 0;
     for (; i < 30; i++) {
@@ -1485,29 +1385,24 @@ static void pntwind_set(WIND_INFLUENCE* i_pntwind) {
     }
 }
 
-/* 8005ADFC-8005AE28 05573C 002C+00 0/0 0/0 5/5 .text dKyw_pntwind_set__FP14WIND_INFLUENCE */
 void dKyw_pntwind_set(WIND_INFLUENCE* i_pntwind) {
     i_pntwind->mConstant = 0;
     i_pntwind->field_0x29 = 0;
     pntwind_set(i_pntwind);
 }
 
-/* 8005AE28-8005AE58 055768 0030+00 1/1 0/0 0/0 .text dKyw_pntlight_set__FP14WIND_INFLUENCE */
 static void dKyw_pntlight_set(WIND_INFLUENCE* i_pntwind) {
     i_pntwind->mConstant = 0;
     i_pntwind->field_0x29 = 1;
     pntwind_set(i_pntwind);
 }
 
-/* 8005AE58-8005AE90 055798 0038+00 1/1 0/0 5/5 .text dKyw_pntwind_cut__FP14WIND_INFLUENCE */
 void dKyw_pntwind_cut(WIND_INFLUENCE* i_pntwind) {
     if (i_pntwind != NULL && i_pntwind->field_0x24 >= 0 && i_pntwind->field_0x24 < 30) {
         g_env_light.pntwind[i_pntwind->field_0x24] = NULL;
     }
 }
 
-/* 8005AE90-8005B23C 0557D0 03AC+00 2/2 0/0 0/0 .text            pntwind_get_info__FP4cXyzP4cXyzPfUc
- */
 static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_3) {
     i_dir->x = 0.0f;
     i_dir->y = 0.0f;
@@ -1569,18 +1464,14 @@ static void pntwind_get_info(cXyz* param_0, cXyz* i_dir, f32* i_power, u8 param_
     }
 }
 
-/* 8005B23C-8005B260 055B7C 0024+00 3/3 0/0 0/0 .text dKyw_pntwind_get_info__FP4cXyzP4cXyzPf */
 static void dKyw_pntwind_get_info(cXyz* param_0, cXyz* param_1, f32* param_2) {
     pntwind_get_info(param_0, param_1, param_2, 0);
 }
 
-/* 8005B260-8005B284 055BA0 0024+00 0/0 0/0 3/3 .text
- * dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf            */
 void dKyw_pntlight_collision_get_info(cXyz* param_0, cXyz* param_1, f32* param_2) {
     pntwind_get_info(param_0, param_1, param_2, 1);
 }
 
-/* 8005B284-8005B2F8 055BC4 0074+00 0/0 1/1 0/0 .text            dKyw_pntwind_get_vecpow__FP4cXyz */
 cXyz dKyw_pntwind_get_vecpow(cXyz* param_0) {
     cXyz direction;
     f32 power;
@@ -1590,7 +1481,6 @@ cXyz dKyw_pntwind_get_vecpow(cXyz* param_0) {
     return direction;
 }
 
-/* 8005B2F8-8005B530 055C38 0238+00 0/0 3/3 13/13 .text dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf */
 void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     dKyw_pntwind_get_info(i_position, i_direction, i_power);
@@ -1616,7 +1506,6 @@ void dKyw_get_AllWind_vec(cXyz* i_position, cXyz* i_direction, f32* i_power) {
     }
 }
 
-/* 8005B530-8005B60C 055E70 00DC+00 0/0 0/0 5/5 .text            dKyw_get_AllWind_vecpow__FP4cXyz */
 cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
     f32 sp8;
     cXyz spC;
@@ -1632,24 +1521,20 @@ cXyz dKyw_get_AllWind_vecpow(cXyz* param_0) {
     return spC;
 }
 
-/* 8005B60C-8005B61C 055F4C 0010+00 0/0 0/0 5/5 .text            dKyw_custom_windpower__Ff */
 void dKyw_custom_windpower(f32 pow) {
     g_env_light.custom_windpower = pow;
 }
 
-/* 8005B61C-8005B638 055F5C 001C+00 0/0 0/0 6/6 .text            dKyw_evt_wind_set__Fss */
 void dKyw_evt_wind_set(s16 angleX, s16 angleY) {
     g_env_light.evt_wind_go = 1;
     g_env_light.evt_wind_angle_x = angleX;
     g_env_light.evt_wind_angle_y = angleY;
 }
 
-/* 8005B638-8005B64C 055F78 0014+00 0/0 0/0 3/3 .text            dKyw_evt_wind_set_go__Fv */
 void dKyw_evt_wind_set_go() {
     g_env_light.evt_wind_go = 1;
 }
 
-/* 8005B64C-8005B660 055F8C 0014+00 0/0 1/1 5/5 .text            dKyw_rain_set__Fi */
 void dKyw_rain_set(int count) {
     g_env_light.raincnt = count;
     g_env_light.base_raincnt = count;
diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp
index dd1f387f33..431c4c0d30 100644
--- a/src/d/d_kantera_icon_meter.cpp
+++ b/src/d/d_kantera_icon_meter.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_kantera_icon_meter
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_kantera_icon_meter.h"
@@ -12,12 +7,10 @@
 #include "d/d_meter_HIO.h"
 #include "d/d_pane_class.h"
 
-/* 801AE938-801AE974 1A9278 003C+00 0/0 3/3 0/0 .text            __ct__15dKantera_icon_cFv */
 dKantera_icon_c::dKantera_icon_c() {
     initiate();
 }
 
-/* 801AE974-801AEA68 1A92B4 00F4+00 1/0 0/0 0/0 .text            __dt__15dKantera_icon_cFv */
 dKantera_icon_c::~dKantera_icon_c() {
     delete mpKanteraIcon->getScreen();
     delete mpKanteraIcon;
@@ -30,7 +23,6 @@ dKantera_icon_c::~dKantera_icon_c() {
     mpGauge = NULL;
 }
 
-/* 801AEA68-801AEB7C 1A93A8 0114+00 1/1 0/0 0/0 .text            initiate__15dKantera_icon_cFv */
 void dKantera_icon_c::initiate() {
     mpKanteraIcon = new dDlst_KanteraIcon_c();
 
@@ -44,34 +36,26 @@ void dKantera_icon_c::initiate() {
     mpGauge = new CPaneMgr(scrn, 'yellow_m', 0, NULL);
 }
 
-/* 801AEB7C-801AEBA0 1A94BC 0024+00 0/0 4/4 0/0 .text            setAlphaRate__15dKantera_icon_cFf
- */
 void dKantera_icon_c::setAlphaRate(f32 alphaRate) {
     mpParent->setAlphaRate(alphaRate);
 }
 
-/* 801AEBA0-801AEBF4 1A94E0 0054+00 0/0 3/3 0/0 .text            setPos__15dKantera_icon_cFff */
 void dKantera_icon_c::setPos(f32 x, f32 y) {
     mpParent->translate(x + g_drawHIO.mLanternIconMeterPosX, y + g_drawHIO.mLanternIconMeterPosY);
 }
 
-/* 801AEBF4-801AEC44 1A9534 0050+00 0/0 4/4 0/0 .text            setScale__15dKantera_icon_cFff */
 void dKantera_icon_c::setScale(f32 h, f32 v) {
     mpParent->scale(h * g_drawHIO.mLanternIconMeterSize, v * g_drawHIO.mLanternIconMeterSize);
 }
 
-/* 801AEC44-801AECB8 1A9584 0074+00 0/0 4/4 0/0 .text            setNowGauge__15dKantera_icon_cFUsUs
- */
 void dKantera_icon_c::setNowGauge(u16 h, u16 v) {
     mpGauge->scale((f32)v / (f32)h, 1.0f);
 }
 
-/* 801AECB8-801AED1C 1A95F8 0064+00 1/0 0/0 0/0 .text            draw__19dDlst_KanteraIcon_cFv */
 void dDlst_KanteraIcon_c::draw() {
     J2DGrafContext* curGraf = dComIfGp_getCurrentGrafPort();
     curGraf->setup2D();
     mp_scrn->draw(0.0f, 0.0f, curGraf);
 }
 
-/* 801AED1C-801AED64 1A965C 0048+00 1/0 0/0 0/0 .text            __dt__19dDlst_KanteraIcon_cFv */
 dDlst_KanteraIcon_c::~dDlst_KanteraIcon_c() {}
diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp
index f99c1d9514..6cf04ee9cc 100644
--- a/src/d/d_ky_thunder.cpp
+++ b/src/d/d_ky_thunder.cpp
@@ -18,7 +18,6 @@
 #define EF_THUNDER02_BMD 0x1F
 #define EF_THUNDER_BRK 0x2F
 
-/* 801ADF58-801ADFB4 1A8898 005C+00 1/1 0/0 0/0 .text            createHeap__10dThunder_cFv */
 int dThunder_c::createHeap() {
     if (mpHeap == NULL) {
         mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0x20);
@@ -31,7 +30,6 @@ int dThunder_c::createHeap() {
     return 1;
 }
 
-/* 801ADFB4-801AE000 1A88F4 004C+00 1/1 0/0 0/0 .text            adjustHeap__10dThunder_cFv */
 void dThunder_c::adjustHeap() {
     mDoExt_restoreCurrentHeap();
 
@@ -64,7 +62,6 @@ int dThunder_c::draw() {
     return 1;
 }
 
-/* 801AE000-801AE19C 1A8940 019C+00 1/0 0/0 0/0 .text            dThunder_Draw__FP10dThunder_c */
 static int dThunder_Draw(dThunder_c* i_this) {
     return i_this->draw();
 }
@@ -111,13 +108,10 @@ int dThunder_c::execute(dThunder_c* i_thunder) {
     return 1;
 }
 
-/* 801AE19C-801AE374 1A8ADC 01D8+00 1/0 0/0 0/0 .text            dThunder_Execute__FP10dThunder_c */
 static int dThunder_Execute(dThunder_c* i_this) {
     return i_this->execute(i_this);
 }
 
-/* 801AE374-801AE37C 1A8CB4 0008+00 1/0 0/0 0/0 .text            dThunder_IsDelete__FP10dThunder_c
- */
 static int dThunder_IsDelete(dThunder_c* i_this) {
     return 1;
 }
@@ -127,13 +121,10 @@ int dThunder_c::thunder_delete(dThunder_c* i_thunder) {
     return 1;
 }
 
-/* 801AE37C-801AE3FC 1A8CBC 0080+00 1/0 0/0 0/0 .text            dThunder_Delete__FP10dThunder_c */
 static int dThunder_Delete(dThunder_c* i_this) {
     return i_this->thunder_delete(i_this);
 }
 
-/* 801AE3FC-801AE458 1A8D3C 005C+00 1/0 0/0 0/0 .text            dThunder_Create__FP12kankyo_class
- */
 static int dThunder_Create(kankyo_class* i_this) {
     dThunder_c* this_ = (dThunder_c*)i_this;
 
@@ -147,7 +138,6 @@ static int dThunder_Create(kankyo_class* i_this) {
     return ret;
 }
 
-/* 801AE458-801AE938 1A8D98 04E0+00 1/1 0/0 0/0 .text            create__10dThunder_cFv */
 int dThunder_c::create() {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
     camera_class* camera_p = dComIfGp_getCamera(0);
@@ -233,8 +223,11 @@ int dThunder_c::create() {
 
     var_f29_2 = spB8.x * spB8.x + spB8.z * spB8.z;
     if (var_f29_2 > 0.0f) {
+        // fakematch?
+        #ifdef __MWERKS__
         f32 tmp = __frsqrtes(var_f29_2);
         var_f29_2 = tmp * var_f29_2;
+        #endif
     }
 
     s16 temp_r28 = cM_atan2s(spB8.x, spB8.z);
@@ -270,15 +263,12 @@ int dThunder_c::create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 803BC1D8-803BC1EC -00001 0014+00 1/0 0/0 0/0 .data            l_dThunder_Method */
 static leafdraw_method_class l_dThunder_Method = {
     (process_method_func)dThunder_Create,  (process_method_func)dThunder_Delete,
     (process_method_func)dThunder_Execute, (process_method_func)dThunder_IsDelete,
     (process_method_func)dThunder_Draw,
 };
 
-/* 803BC1EC-803BC218 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_KY_THUNDER */
 extern kankyo_process_profile_definition g_profile_KY_THUNDER = {
     fpcLy_CURRENT_e,
     7,
diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp
index 7e1db4ed0c..01cba3718b 100644
--- a/src/d/d_kyeff.cpp
+++ b/src/d/d_kyeff.cpp
@@ -14,7 +14,6 @@ static int dKyeff_Draw(dKyeff_c* i_this) {
     return 1;
 }
 
-/* 801ADD5C-801ADDB4 1A869C 0058+00 1/1 0/0 0/0 .text            execute__8dKyeff_cFv */
 int dKyeff_c::execute() {
     if (strcmp(dComIfGp_getStartStageName(), "Name")) {
         dKyw_wether_move();
@@ -52,7 +51,6 @@ static f32 dummyLiteralOrder3(s32 hours) {
     return hours;
 }
 
-/* 801ADE00-801ADEA0 1A8740 00A0+00 1/0 0/0 0/0 .text            dKyeff_Create__FP12kankyo_class */
 static int dKyeff_Create(kankyo_class* i_this) {
     OSCalendarTime time;
 
@@ -67,15 +65,12 @@ static int dKyeff_Create(kankyo_class* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 803BC158-803BC16C -00001 0014+00 1/0 0/0 0/0 .data            l_dKyeff_Method */
 static leafdraw_method_class l_dKyeff_Method = {
     (process_method_func)dKyeff_Create,  (process_method_func)dKyeff_Delete,
     (process_method_func)dKyeff_Execute, (process_method_func)dKyeff_IsDelete,
     (process_method_func)dKyeff_Draw,
 };
 
-/* 803BC16C-803BC198 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_KYEFF */
 extern kankyo_process_profile_definition g_profile_KYEFF = {
     fpcLy_CURRENT_e,
     12,
diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp
index bb3cf57b76..c9c914eaf9 100644
--- a/src/d/d_kyeff2.cpp
+++ b/src/d/d_kyeff2.cpp
@@ -37,15 +37,12 @@ static int dKyeff2_Create(kankyo_class* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 803BC198-803BC1AC -00001 0014+00 1/0 0/0 0/0 .data            l_dKyeff2_Method */
 static leafdraw_method_class l_dKyeff2_Method = {
     (process_method_func)dKyeff2_Create,  (process_method_func)dKyeff2_Delete,
     (process_method_func)dKyeff2_Execute, (process_method_func)dKyeff2_IsDelete,
     (process_method_func)dKyeff2_Draw,
 };
 
-/* 803BC1AC-803BC1D8 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_KYEFF2 */
 extern kankyo_process_profile_definition g_profile_KYEFF2 = {
     fpcLy_CURRENT_e,
     12,
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index 74d9181b05..7f6c0b09d4 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -14,7 +14,6 @@
 #include "f_op/f_op_actor.h"
 #include "m_Do/m_Do_controller_pad.h"
 
-/* 803A7240-803A7250 004360 0010+00 0/0 0/0 6/6 .data            ZeroQuat */
 Quaternion ZeroQuat = {
     0.0f,
     0.0f,
@@ -63,7 +62,6 @@ void STControl::Xinit() {
     field_0x2a = mFirstWaitTime;
 }
 
-/* 8003212C-8003215C 02CA6C 0030+00 1/1 0/0 0/0 .text            Yinit__9STControlFv */
 void STControl::Yinit() {
     field_0x10 = 0;
     mDirectionTrig &= ~0x0C;
@@ -88,7 +86,6 @@ s16 CSTControl::getAngleStick() {
     return mDoCPd_c::getSubStickAngle(PAD_1);
 }
 
-/* 8003219C-8003242C 02CADC 0290+00 0/0 24/24 0/0 .text            checkTrigger__9STControlFv */
 u8 STControl::checkTrigger() {
     field_0x0d = mDirectionTrig;
     f32 stickValue = getValueStick();
@@ -227,7 +224,6 @@ bool STControl::checkDownTrigger() {
     return false;
 }
 
-/* 8003261C-80032654 02CF5C 0038+00 0/0 0/0 1/1 .text            dLib_getEventSwitchNo__Fi */
 u8 dLib_getEventSwitchNo(int param_0) {
     dStage_MapEvent_dt_c* mapEvent = dEvt_control_c::searchMapEventData(param_0);
     if (mapEvent != NULL) {
@@ -236,8 +232,6 @@ u8 dLib_getEventSwitchNo(int param_0) {
     return 0xff;
 }
 
-/* 80032654-80032738 02CF94 00E4+00 0/0 0/0 8/8 .text
- * dLib_checkActorInRectangle__FP10fopAc_ac_cP10fopAc_ac_cPC4cXyzPC4cXyz */
 BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz const* param_2,
                                 cXyz const* param_3) {
     cXyz local_24 = param_0->current.pos - param_1->current.pos;
@@ -251,10 +245,8 @@ BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz c
     return FALSE;
 }
 
-/* 80032738-80032804 02D078 00CC+00 0/0 4/4 0/0 .text
- * dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc     */
 u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const* param_2) {
-    u8 header[32] __attribute__((aligned(32)));
+    u8 header[32] ATTRIBUTE_ALIGN(32);
     JUT_ASSERT(1252, i_aramArchive != NULL);
     u32 address = i_aramArchive->getAramAddress(param_2);
     if (address == 0) {
@@ -273,16 +265,12 @@ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const*
     return uVar5;
 }
 
-/* 80450DD8-80450DDC 0002D8 0004+00 2/2 0/0 0/0 .sbss            m_diffTime__11dLib_time_c */
 OSTime dLib_time_c::m_diffTime;
 
-/* 80450DE0-80450DE4 0002E0 0004+00 3/3 0/0 0/0 .sbss            m_stopTime__11dLib_time_c */
 OSTime dLib_time_c::m_stopTime;
 
-/* 80450DE8-80450DF0 0002E8 0008+00 3/3 0/0 0/0 .sbss            None */
 bool dLib_time_c::m_timeStopped;
 
-/* 80032804-80032880 02D144 007C+00 0/0 8/8 0/0 .text            getTime__11dLib_time_cFv */
 OSTime dLib_time_c::getTime() {
     if (!m_timeStopped) {
         return OSGetTime() - m_diffTime;
@@ -294,7 +282,6 @@ OSTime dLib_time_c::getTime() {
     return time - m_diffTime;
 }
 
-/* 80032880-800328BC 02D1C0 003C+00 0/0 1/1 0/0 .text            stopTime__11dLib_time_cFv */
 void dLib_time_c::stopTime() {
     if (!m_timeStopped) {
         m_stopTime = OSGetTime();
@@ -302,7 +289,6 @@ void dLib_time_c::stopTime() {
     }
 }
 
-/* 800328BC-80032918 02D1FC 005C+00 0/0 1/1 0/0 .text            startTime__11dLib_time_cFv */
 void dLib_time_c::startTime() {
     if (m_timeStopped) {
         m_diffTime += OSGetTime() - m_stopTime;
diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp
index c599eb4a70..996489f587 100644
--- a/src/d/d_map.cpp
+++ b/src/d/d_map.cpp
@@ -11,8 +11,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_com_inf_game.h"
 
-/* 800284BC-800284D0 022DFC 0014+00 2/0 0/0 0/0 .text            getIconSize__15renderingAmap_cCFUc
- */
 f32 renderingAmap_c::getIconSize(u8 i_icon) const {
     static f32 const l_iconSize[] = {
         0.12f, 0.12f, 0.08f, 0.12f, 0.08f, 0.16f, 0.12f, 0.0f,  0.12f,
@@ -22,15 +20,12 @@ f32 renderingAmap_c::getIconSize(u8 i_icon) const {
     return l_iconSize[i_icon];
 }
 
-/* 80450D80-80450D88 000280 0004+04 10/10 0/0 0/0 .sbss            m_res__22dMap_HIO_prm_res_dst_s
- */
 dMap_prm_res_s* dMap_HIO_prm_res_dst_s::m_res;
 
 inline u8 twoValueLineInterpolation(u8 param_0, u8 param_1, f32 param_2) {
     return ((f32)param_0 + (param_2 * ((f32)param_1 - (f32)param_0)));
 }
 
-/* 800284D0-800288C4 022E10 03F4+00 2/0 0/0 0/0 .text            draw__15renderingAmap_cFv */
 void renderingAmap_c::draw() {
     f32 tmp = ((f32)(g_Counter.mCounter0 % dMap_HIO_prm_res_dst_s::m_res->field_0x1aa) /
                (f32)dMap_HIO_prm_res_dst_s::m_res->field_0x1aa);
@@ -69,8 +64,6 @@ void renderingAmap_c::draw() {
     renderingDAmap_c::draw();
 }
 
-/* 800288C4-80028960 023204 009C+00 7/6 0/0 0/0 .text            getDispType__15renderingAmap_cCFv
- */
 int renderingAmap_c::getDispType() const {
     int disp_type;
 
@@ -105,8 +98,6 @@ int renderingAmap_c::getDispType() const {
     return disp_type;
 }
 
-/* 80028960-800289D0 0232A0 0070+00 2/0 0/0 0/0 .text            beforeDrawPath__15renderingAmap_cFv
- */
 void renderingAmap_c::beforeDrawPath() {
     if (isDrawOutSideTrim()) {
         field_0x38 = 0;
@@ -120,25 +111,18 @@ void renderingAmap_c::beforeDrawPath() {
     }
 }
 
-/* 800289D0-800289F0 023310 0020+00 2/0 0/0 0/0 .text            afterDrawPath__15renderingAmap_cFv
- */
 void renderingAmap_c::afterDrawPath() {
     renderingPlusDoorAndCursor_c::afterDrawPath();
 }
 
-/* 800289F0-80028A10 023330 0020+00 2/0 0/0 0/0 .text
- * rendering__15renderingAmap_cFPCQ211dDrawPath_c10room_class   */
 void renderingAmap_c::rendering(dDrawPath_c::room_class const* i_room) {
     dDrawPath_c::rendering(i_room);
 }
 
-/* 80028A10-80028A30 023350 0020+00 2/0 0/0 0/0 .text            drawPath__15renderingAmap_cFv */
 void renderingAmap_c::drawPath() {
     dDrawPath_c::drawPath();
 }
 
-/* 80028A30-80028B04 023370 00D4+00 2/0 0/0 0/0 .text
- * rendering__15renderingAmap_cFPCQ211dDrawPath_c10line_class   */
 void renderingAmap_c::rendering(dDrawPath_c::line_class const* i_line) {
     if (isDrawType(i_line->field_0x0)) {
         if (isDrawOutSideTrim() && field_0x38 != 2) {
@@ -158,25 +142,20 @@ void renderingAmap_c::rendering(dDrawPath_c::line_class const* i_line) {
     }
 }
 
-/* 80028B04-80028B10 023444 000C+00 2/0 0/0 0/0 .text getPlayerCursorSize__15renderingAmap_cFv */
 f32 renderingAmap_c::getPlayerCursorSize() {
     return dMap_HIO_prm_res_dst_s::m_res->cursor_size;
 }
 
-/* 80028B10-80028B3C 023450 002C+00 2/0 0/0 0/0 .text getRestartCursorSize__15renderingAmap_cFv */
 f32 renderingAmap_c::getRestartCursorSize() {
     return getPlayerCursorSize();
 }
 
-/* 80028B3C-80028BB4 02347C 0078+00 2/0 0/0 0/0 .text
- * rendering__15renderingAmap_cFPCQ211dDrawPath_c10poly_class   */
 void renderingAmap_c::rendering(dDrawPath_c::poly_class const* i_poly) {
     if (isDrawType(i_poly->field_0x0) && (!isDrawOutSideTrim() || field_0x38 == 2)) {
         dDrawPath_c::rendering(i_poly);
     }
 }
 
-/* 80028BB4-80028C4C 0234F4 0098+00 4/4 0/0 0/0 .text isDrawOutSideTrim__15renderingAmap_cFv */
 bool renderingAmap_c::isDrawOutSideTrim() {
     bool rt = false;
 
@@ -189,14 +168,11 @@ bool renderingAmap_c::isDrawOutSideTrim() {
     return rt;
 }
 
-/* 80028C4C-80028C60 02358C 0014+00 1/1 0/0 0/0 .text
- * getOutSideBlackLineNumber__15renderingAmap_cFv               */
 int renderingAmap_c::getOutSideBlackLineNumber() {
     m_outSideBlackLineCnt = 0;
     return dMap_HIO_prm_res_dst_s::m_res->field_0x1ae;
 }
 
-/* 80028C60-80028C90 0235A0 0030+00 1/1 0/0 0/0 .text isOutSideBlackLine__15renderingAmap_cFv */
 bool renderingAmap_c::isOutSideBlackLine() {
     bool rt = false;
     m_outSideBlackLineCnt++;
@@ -208,7 +184,6 @@ bool renderingAmap_c::isOutSideBlackLine() {
     return rt;
 }
 
-/* 80028C90-80028CF4 0235D0 0064+00 2/2 0/0 0/0 .text getLineWidthSub__15renderingAmap_cFi */
 int renderingAmap_c::getLineWidthSub(int i_no) {
     static const u8 l_lineWidthPatOff[] = {0x00, 0x00, 0x06, 0x00, 0x00};
     static const u8 l_lineWidthPatOn[] = {0x06, 0x06, 0x06, 0x00, 0x00};
@@ -225,8 +200,6 @@ int renderingAmap_c::getLineWidthSub(int i_no) {
     return pat[i_no];
 }
 
-/* 80028CF4-80028DD4 023634 00E0+00 2/0 0/0 0/0 .text getDecorationLineWidth__15renderingAmap_cFi
- */
 s32 renderingAmap_c::getDecorationLineWidth(int param_0) {
     int var_r31 = 0;
 
@@ -269,13 +242,10 @@ s32 renderingAmap_c::getDecorationLineWidth(int param_0) {
     return var_r31;
 }
 
-/* 80028DD4-80028DF4 023714 0020+00 2/0 0/0 0/0 .text            getLineWidth__15renderingAmap_cFi
- */
 int renderingAmap_c::getLineWidth(int i_no) {
     return getLineWidthSub(i_no);
 }
 
-/* 80028DF4-80028EE4 023734 00F0+00 1/0 0/0 0/0 .text            getColor__6dMap_cFi */
 const GXColor* dMap_c::getColor(int i_no) {
     static GXColor const l_dungeon_offColor[] = {
         {0x08, 0x00, 0x00, 0x00}, {0x0C, 0x00, 0x00, 0x00}, {0x10, 0x00, 0x00, 0x00},
@@ -318,8 +288,6 @@ const GXColor* dMap_c::getColor(int i_no) {
     return &color_tbl[i_no];
 }
 
-/* 80028EE4-80028FB4 023824 00D0+00 2/0 0/0 0/0 .text            getLineColor__15renderingAmap_cFii
- */
 GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
     static GXColor backColor = {0x04, 0x00, 0x00, 0x00};
     static const GXColor borderColor0 = {0xB4, 0x00, 0x00, 0x00};
@@ -346,7 +314,6 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) {
     return color;
 }
 
-/* 80028FB4-80029038 0238F4 0084+00 2/0 0/0 0/0 .text getDecoLineColor__15renderingAmap_cFii */
 const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
     static GXColor const colorTable[] = {
         {0xBC, 0x00, 0x00, 0x00},
@@ -366,65 +333,48 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
     return color;
 }
 
-/* 80029038-80029058 023978 0020+00 1/0 0/0 0/0 .text
- * getIconPosition__6dMap_cCFPQ27dTres_c15typeGroupData_c       */
 const Vec* dMap_c::getIconPosition(dTres_c::typeGroupData_c* i_data) const {
     return renderingPlusDoorAndCursor_c::getIconPosition(i_data);
 }
 
-/* 80029058-80029078 023998 0020+00 2/0 0/0 0/0 .text getIconGroupNumber__15renderingAmap_cCFUc */
 int renderingAmap_c::getIconGroupNumber(u8 param_0) const {
     return renderingDAmap_c::getIconGroupNumber(param_0);
 }
 
-/* 80029078-800290C0 0239B8 0048+00 2/0 0/0 0/0 .text            hasMap__15renderingAmap_cCFv */
 bool renderingAmap_c::hasMap() const {
     int stay_type = getStayType();
 
     return stay_type == 1 && dMapInfo_n::chkGetMap();
 }
 
-/* 800290C0-80029104 023A00 0044+00 2/0 0/0 0/0 .text            isRendDoor__15renderingAmap_cCFv */
 bool renderingAmap_c::isRendDoor() const {
     int disp_type = getDispType();
     return disp_type == 1 || disp_type == 2;
 }
 
-/* 80029104-8002910C 023A44 0008+00 2/0 0/0 0/0 .text            isCheckFloor__15renderingAmap_cCFv
- */
 bool renderingAmap_c::isCheckFloor() const {
     return true;
 }
 
-/* 8002910C-80029114 023A4C 0008+00 2/0 0/0 0/0 .text            isRendRestart__15renderingAmap_cCFv
- */
 bool renderingAmap_c::isRendRestart() const {
     return true;
 }
 
-/* 80029114-8002911C 023A54 0008+00 2/0 0/0 0/0 .text            isRendCursor__15renderingAmap_cCFv
- */
 bool renderingAmap_c::isRendCursor() const {
     return true;
 }
 
-/* 8002911C-80029160 023A5C 0044+00 3/2 0/0 0/0 .text            isRendAllRoom__15renderingAmap_cCFv
- */
 bool renderingAmap_c::isRendAllRoom() const {
     int disp_type = getDispType();
     return disp_type != 2 && disp_type != 3 && disp_type != 5;
 }
 
-/* 80029160-80029190 023AA0 0030+00 7/7 0/0 0/0 .text            getStayType__15renderingAmap_cCFv
- */
 int renderingAmap_c::getStayType() const {
     static int const l_stayType[] = {0, 1, 0, 0, 0, 0, 0};
 
     return l_stayType[getDispType()];
 }
 
-/* 80029190-800296EC 023AD0 055C+00 3/0 0/0 0/0 .text
- * isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */
 bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2,
                                         int param_3) const {
     JUT_ASSERT(0, i_data != NULL);
@@ -600,12 +550,10 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
     return var_r31;
 }
 
-/* 800296EC-800296F8 02402C 000C+00 1/0 0/0 0/0 .text            isDrawType__6dMap_cFi */
 bool dMap_c::isDrawType(int param_0) {
     return (param_0 & 0x80) == 0;
 }
 
-/* 800296F8-80029744 024038 004C+00 1/0 0/0 0/0 .text            isRendAllRoom__6dMap_cCFv */
 bool dMap_c::isRendAllRoom() const {
     bool rt = renderingAmap_c::isRendAllRoom();
     if (field_0x8e == 2 && field_0x8f >= 3 && field_0x8f <= 3) {
@@ -615,12 +563,10 @@ bool dMap_c::isRendAllRoom() const {
     return rt;
 }
 
-/* 80029744-8002974C 024084 0008+00 1/0 0/0 0/0 .text            isSpecialOutline__6dMap_cFv */
 bool dMap_c::isSpecialOutline() {
     return false;
 }
 
-/* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text            copyPalette__6dMap_cFv */
 void dMap_c::copyPalette() {
     JUT_ASSERT(0, m_res != NULL);
 
@@ -630,7 +576,6 @@ void dMap_c::copyPalette() {
     }
 }
 
-/* 800297A8-80029818 0240E8 0070+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFiif */
 void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) {
     int temp_r28 = (param_1 - param_0) + 1;
     int temp_r30 = param_0;
@@ -641,7 +586,6 @@ void dMap_c::setMapPaletteColorAlphaPer(int param_0, int param_1, f32 param_2) {
     }
 }
 
-/* 80029818-80029874 024158 005C+00 1/1 0/0 0/0 .text            resCopy__6dMap_cFv */
 void dMap_c::resCopy() {
     cLib_memCpy(m_res, m_res_src, sizeof(dMap_prm_res_s));
     if (getStayType() == 0) {
@@ -649,7 +593,6 @@ void dMap_c::resCopy() {
     }
 }
 
-/* 80029874-80029A1C 0241B4 01A8+00 0/0 1/1 0/0 .text            __ct__6dMap_cFiiii */
 dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
     m_res_src = NULL;
     m_res = NULL;
@@ -707,7 +650,6 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) {
     makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33);
 }
 
-/* 80029A1C-80029A8C 02435C 0070+00 1/1 0/0 0/0 .text            _remove__6dMap_cFv */
 void dMap_c::_remove() {
     if (mImage_p != NULL) {
         delete[] mImage_p;
@@ -725,8 +667,6 @@ void dMap_c::_remove() {
     }
 }
 
-/* 80029A8C-80029C10 0243CC 0184+00 3/3 0/0 0/0 .text            getMapMinMaxXZ__6dMap_cFiPfPfPfPf
- */
 void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param_3, f32* param_4) {
     f32 var_f0 = 0.0f;
     f32 var_f1 = 0.0f;
@@ -796,7 +736,6 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param
     }
 }
 
-/* 80029C10-80029D78 024550 0168+00 1/1 0/0 0/0 .text            getPack__6dMap_cFiPfPf */
 void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) {
     f32 var_f31 = 0.0f;
     f32 var_f30 = 0.0f;
@@ -837,7 +776,6 @@ void dMap_c::getPack(int param_0, f32* param_1, f32* param_2) {
     }
 }
 
-/* 80029D78-80029E1C 0246B8 00A4+00 1/1 0/0 0/0 .text            calcMapCenterXZ__6dMap_cFiPfPf */
 void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
     f32 var_f31 = 0.0f;
     f32 var_f30 = 0.0f;
@@ -864,7 +802,6 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) {
     }
 }
 
-/* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text            calcMapCmPerTexel__6dMap_cFiPf */
 void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
     JUT_ASSERT(0, i_roomNo >= 0);
     JUT_ASSERT(0, ip_cmPerTexel != NULL);
@@ -941,7 +878,6 @@ inline void getRGBA_RGB5A3(const dMpath_RGB5A3_palDt_s& palette, u8& r, u8& g, u
     a = t_a;
 }
 
-/* 80029F84-8002A064 0248C4 00E0+00 1/1 0/0 0/0 .text setMapPaletteColorAlphaPer__6dMap_cFif */
 void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
     JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
 
@@ -969,7 +905,6 @@ void dMap_c::setMapPaletteColorAlphaPer(int i_paletteNo, f32 param_1) {
                  sizeof(dMpath_RGB5A3_palDt_s));
 }
 
-/* 8002A064-8002A148 0249A4 00E4+00 2/2 0/0 0/0 .text            copyPalette__6dMap_cFiif */
 void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
     JUT_ASSERT(0, i_dstPaletteNo < renderingAmap_c::PALETTE_NUMBER);
     JUT_ASSERT(0, i_srcPaletteNo < renderingAmap_c::PALETTE_NUMBER);
@@ -998,7 +933,6 @@ void dMap_c::copyPalette(int i_dstPaletteNo, int i_srcPaletteNo, f32 param_2) {
                  sizeof(dMpath_RGB5A3_palDt_s));
 }
 
-/* 8002A148-8002A1BC 024A88 0074+00 1/0 0/0 0/0 .text setAmapPaletteColor__6dMap_cFiUcUcUcUc */
 void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_scaledA) {
     JUT_ASSERT(0, i_paletteNo < renderingAmap_c::PALETTE_NUMBER);
 
@@ -1019,12 +953,10 @@ void dMap_c::setAmapPaletteColor(int i_paletteNo, u8 i_r, u8 i_g, u8 i_b, u8 i_s
                  sizeof(dMpath_RGB5A3_palDt_s));
 }
 
-/* 8002A1BC-8002A1DC 024AFC 0020+00 2/2 0/0 0/0 .text            getDispType__6dMap_cCFv */
 int dMap_c::getDispType() const {
     return renderingAmap_c::getDispType();
 }
 
-/* 8002A1DC-8002A254 024B1C 0078+00 1/0 0/0 0/0 .text            isDrawRoom__6dMap_cCFii */
 bool dMap_c::isDrawRoom(int param_0, int param_1) const {
     if (field_0x8e == 2) {
         if (field_0x8f >= 3 && field_0x8f <= 3) {
@@ -1037,7 +969,6 @@ bool dMap_c::isDrawRoom(int param_0, int param_1) const {
     }
 }
 
-/* 8002A254-8002A294 024B94 0040+00 1/0 0/0 0/0 .text            getRoomNoSingle__6dMap_cFv */
 int dMap_c::getRoomNoSingle() {
     if (field_0x8e == 2 && field_0x8f <= 6) {
         return field_0x80;
@@ -1046,7 +977,6 @@ int dMap_c::getRoomNoSingle() {
     }
 }
 
-/* 8002A294-8002A32C 024BD4 0098+00 1/0 0/0 0/0 .text            isDrawRoomIcon__6dMap_cCFii */
 bool dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
     bool var_r30 = hasMap() || param_0 == param_1;
     if (renderingAmap_c::isRendAllRoom()) {
@@ -1056,7 +986,6 @@ bool dMap_c::isDrawRoomIcon(int param_0, int param_1) const {
     return var_r30;
 }
 
-/* 8002A32C-8002AB54 024C6C 0828+00 1/0 1/1 0/0 .text            _move__6dMap_cFffif */
 void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
     if (mStayRoomNo == -1) {
         mStayRoomNo = i_roomNo;
@@ -1283,7 +1212,6 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) {
     field_0x8d = 1;
 }
 
-/* 8002AB54-8002ABAC 025494 0058+00 0/0 1/1 0/0 .text            _draw__6dMap_cFv */
 void dMap_c::_draw() {
     if (mStayRoomNo >= 0 && field_0x8d != 0) {
         s8 floor_no = dMapInfo_c::getNowStayFloorNo();
@@ -1291,13 +1219,10 @@ void dMap_c::_draw() {
     }
 }
 
-/* 8002ABAC-8002ABCC 0254EC 0020+00 1/0 0/0 0/0 .text            getFirstData__6dMap_cFUc */
 dTres_c::typeGroupData_c* dMap_c::getFirstData(u8 param_0) {
     return renderingPlusDoorAndCursor_c::getFirstData(param_0);
 }
 
-/* 8002ABCC-8002ABEC 02550C 0020+00 1/0 0/0 0/0 .text
- * getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c            */
 dTres_c::typeGroupData_c* dMap_c::getNextData(dTres_c::typeGroupData_c* param_0) {
     return renderingPlusDoorAndCursor_c::getNextData(param_0);
 }
diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp
index e4de4822e1..ab55666b2f 100644
--- a/src/d/d_map_path.cpp
+++ b/src/d/d_map_path.cpp
@@ -11,7 +11,6 @@
 #include "d/d_map_path.h"
 #include "m_Do/m_Do_lib.h"
 
-/* 8003C85C-8003C8F4 03719C 0098+00 0/0 1/1 0/0 .text create__Q28dMpath_n18dTexObjAggregate_cFv */
 void dMpath_n::dTexObjAggregate_c::create() {
     static int const data[7] = {
         79, 80, 77, 78, 76, 81, 82,
@@ -25,7 +24,6 @@ void dMpath_n::dTexObjAggregate_c::create() {
     }
 }
 
-/* 8003C8F4-8003C94C 037234 0058+00 1/1 1/1 0/0 .text remove__Q28dMpath_n18dTexObjAggregate_cFv */
 void dMpath_n::dTexObjAggregate_c::remove() {
     for (int i = 0; i < 7; i++) {
         delete mp_texObj[i];
@@ -33,8 +31,6 @@ void dMpath_n::dTexObjAggregate_c::remove() {
     }
 }
 
-/* 8003C94C-8003CA40 03728C 00F4+00 2/0 9/2 0/0 .text
- * rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class       */
 void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
     if (isDrawType(p_line->field_0x0)) {
         int width = getLineWidth(p_line->field_0x1);
@@ -54,8 +50,6 @@ void dDrawPath_c::rendering(dDrawPath_c::line_class const* p_line) {
     }
 }
 
-/* 8003CA40-8003CB00 037380 00C0+00 2/0 9/1 0/0 .text
- * rendering__11dDrawPath_cFPCQ211dDrawPath_c10poly_class       */
 void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
     if (isDrawType(p_poly->field_0x0)) {
         GXSetTevColor(GX_TEVREG0, *getColor(p_poly->field_0x0 & 0x3F));
@@ -73,8 +67,6 @@ void dDrawPath_c::rendering(dDrawPath_c::poly_class const* p_poly) {
     }
 }
 
-/* 8003CB00-8003CBBC 037440 00BC+00 1/1 0/0 0/0 .text
- * rendering__11dDrawPath_cFPCQ211dDrawPath_c11group_class      */
 void dDrawPath_c::rendering(dDrawPath_c::group_class const* p_group) {
     if (isSwitch(p_group)) {
         poly_class* poly = p_group->mpPoly;
@@ -91,8 +83,6 @@ void dDrawPath_c::rendering(dDrawPath_c::group_class const* p_group) {
     }
 }
 
-/* 8003CBBC-8003CC24 0374FC 0068+00 1/1 0/0 0/0 .text
- * rendering__11dDrawPath_cFPCQ211dDrawPath_c11floor_class      */
 void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
     if (p_floor->mpGroup != NULL) {
         group_class* group = p_floor->mpGroup;
@@ -104,8 +94,6 @@ void dDrawPath_c::rendering(dDrawPath_c::floor_class const* p_floor) {
     }
 }
 
-/* 8003CC24-8003CCC4 037564 00A0+00 2/0 9/1 0/0 .text
- * rendering__11dDrawPath_cFPCQ211dDrawPath_c10room_class       */
 void dDrawPath_c::rendering(dDrawPath_c::room_class const* p_room) {
     if (p_room != NULL) {
         GXSetArray(GX_VA_POS, p_room->mpFloatData, 8);
@@ -122,7 +110,6 @@ void dDrawPath_c::rendering(dDrawPath_c::room_class const* p_room) {
     }
 }
 
-/* 8003CCC4-8003CD38 037604 0074+00 2/0 9/1 0/0 .text            drawPath__11dDrawPath_cFv */
 void dDrawPath_c::drawPath() {
     room_class* room = getFirstRoomPointer();
     while (room != NULL) {
@@ -131,8 +118,6 @@ void dDrawPath_c::drawPath() {
     }
 }
 
-/* 8003CD38-8003CDAC 037678 0074+00 0/0 3/3 0/0 .text
- * makeResTIMG__15dRenderingMap_cCFP7ResTIMGUsUsPUcPUcUs        */
 void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p_data,
                                   u8* p_palette, u16 param_5) const {
     p_image->format = GX_TF_C8;
@@ -158,8 +143,6 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p
     p_image->imageOffset = p_data - (u8*)p_image;
 }
 
-/* 8003CDAC-8003CE78 0376EC 00CC+00 0/0 2/2 0/0 .text            renderingMap__15dRenderingMap_cFv
- */
 void dRenderingMap_c::renderingMap() {
     preRenderingMap();
     if (isDrawPath()) {
@@ -172,8 +155,6 @@ void dRenderingMap_c::renderingMap() {
     postRenderingMap();
 }
 
-/* 8003CE78-8003CF40 0377B8 00C8+00 2/2 3/3 0/0 .text
- * setTevSettingNonTextureDirectColor__18dRenderingFDAmap_cCFv  */
 void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const {
     GXSetNumTevStages(1);
     GXSetNumChans(1);
@@ -186,8 +167,6 @@ void dRenderingFDAmap_c::setTevSettingNonTextureDirectColor() const {
     GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_OR, GX_ALWAYS, 0);
 }
 
-/* 8003CF40-8003D0AC 037880 016C+00 1/1 3/3 0/0 .text
- * setTevSettingIntensityTextureToCI__18dRenderingFDAmap_cCFv   */
 void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const {
     GXSetNumTevStages(2);
     GXSetNumChans(1);
@@ -208,8 +187,6 @@ void dRenderingFDAmap_c::setTevSettingIntensityTextureToCI() const {
     GXSetTevKColorSel(GX_TEVSTAGE0, GX_TEV_KCSEL_1_4);
 }
 
-/* 8003D0AC-8003D188 0379EC 00DC+00 1/1 0/0 0/0 .text            drawBack__18dRenderingFDAmap_cCFv
- */
 void dRenderingFDAmap_c::drawBack() const {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -223,7 +200,6 @@ void dRenderingFDAmap_c::drawBack() const {
     GXEnd();
 }
 
-/* 8003D188-8003D320 037AC8 0198+00 1/0 8/0 0/0 .text preRenderingMap__18dRenderingFDAmap_cFv */
 void dRenderingFDAmap_c::preRenderingMap() {
     GXSetViewport(0.0f, 0.0f, mTexWidth, mTexHeight, 0.0f, 1.0f);
     GXSetScissor(0, 0, mTexWidth, mTexHeight);
@@ -251,7 +227,6 @@ void dRenderingFDAmap_c::preRenderingMap() {
     drawBack();
 }
 
-/* 8003D320-8003D3C0 037C60 00A0+00 1/0 7/1 0/0 .text postRenderingMap__18dRenderingFDAmap_cFv */
 void dRenderingFDAmap_c::postRenderingMap() {
     GXSetCopyFilter(GX_FALSE, NULL, GX_FALSE, NULL);
     GXSetTexCopySrc(0, 0, mTexWidth, mTexHeight);
@@ -263,7 +238,6 @@ void dRenderingFDAmap_c::postRenderingMap() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80424684-804246A0 0513A4 001C+00 2/2 5/5 0/0 .bss             m_texObjAgg__8dMpath_n */
 dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg;
 
 /* Enabling the following definition will modify the following function to
@@ -272,8 +246,6 @@ dMpath_n::dTexObjAggregate_c dMpath_n::m_texObjAgg;
  */
 // #define HYRULE_FIELD_SPEEDHACK
 
-/* 8003D3C0-8003D68C 037D00 02CC+00 0/0 2/2 0/0 .text
- * renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class */
 void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_line) {
     s32 width = getDecorationLineWidth(p_line->field_0x1);
     if (width <= 0) {
@@ -330,13 +302,10 @@ void dRenderingFDAmap_c::renderingDecoration(dDrawPath_c::line_class const* p_li
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_CLR_RGB, GX_F32, 0);
 }
 
-/* 8003D68C-8003D6B8 037FCC 002C+00 1/0 6/0 0/0 .text getDecoLineColor__18dRenderingFDAmap_cFii */
 const GXColor* dRenderingFDAmap_c::getDecoLineColor(int param_0, int param_1) {
     return getLineColor(param_0, param_1);
 }
 
-/* 8003D6B8-8003D6E4 037FF8 002C+00 1/0 6/0 0/0 .text
- * getDecorationLineWidth__18dRenderingFDAmap_cFi               */
 s32 dRenderingFDAmap_c::getDecorationLineWidth(int param_0) {
     return getLineWidth(param_0);
 }
diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp
index 821c83717d..de6c6e2155 100644
--- a/src/d/d_map_path_dmap.cpp
+++ b/src/d/d_map_path_dmap.cpp
@@ -12,22 +12,18 @@
 #include "d/d_meter_HIO.h"
 #include "float.h"
 
-/* 8003ECA0-8003ECD8 0395E0 0038+00 0/0 3/3 0/0 .text            chkGetCompass__10dMapInfo_nFv */
 bool dMapInfo_n::chkGetCompass() {
     return dComIfGs_isDungeonItemCompass() ? true : false;
 }
 
-/* 8003ECD8-8003ED10 039618 0038+00 0/0 4/4 0/0 .text            chkGetMap__10dMapInfo_nFv */
 bool dMapInfo_n::chkGetMap() {
     return dComIfGs_isDungeonItemMap() ? true : false;
 }
 
-/* 8003ED10-8003ED60 039650 0050+00 2/2 7/7 0/0 .text            isVisitedRoom__10dMapInfo_nFi */
 bool dMapInfo_n::isVisitedRoom(int i_roomNo) {
     return g_fmapHIO.mAllRegionsUnlocked || dComIfGs_isVisitedRoom(i_roomNo);
 }
 
-/* 8003ED60-8003EDC0 0396A0 0060+00 1/1 2/2 0/0 .text correctionOriginPos__10dMapInfo_nFScP3Vec */
 void dMapInfo_n::correctionOriginPos(s8 i_roomNo, Vec* o_pos) {
     dStage_FileList2_dt_c* filelist = dStage_roomControl_c::getFileList2(i_roomNo);
 
@@ -37,8 +33,6 @@ void dMapInfo_n::correctionOriginPos(s8 i_roomNo, Vec* o_pos) {
     }
 }
 
-/* 8003EDC0-8003EDEC 039700 002C+00 3/3 0/0 0/0 .text
- * offsetPlus__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec      */
 void dMapInfo_n::offsetPlus(dStage_FileList2_dt_c const* filelist, Vec* o_pos) {
     if (filelist == NULL) {
         return;
@@ -48,8 +42,6 @@ void dMapInfo_n::offsetPlus(dStage_FileList2_dt_c const* filelist, Vec* o_pos) {
     o_pos->z += filelist->field_0x18;
 }
 
-/* 8003EDEC-8003EE5C 03972C 0070+00 3/3 0/0 0/0 .text
- * rotAngle__10dMapInfo_nFPC21dStage_FileList2_dt_cP3Vec        */
 void dMapInfo_n::rotAngle(dStage_FileList2_dt_c const* filelist, Vec* o_pos) {
     s16 rot = 0;
 
@@ -64,7 +56,6 @@ void dMapInfo_n::rotAngle(dStage_FileList2_dt_c const* filelist, Vec* o_pos) {
     *o_pos = mult;
 }
 
-/* 8003EE5C-8003EF20 03979C 00C4+00 1/1 6/6 0/0 .text            getMapPlayerPos__10dMapInfo_nFv */
 Vec dMapInfo_n::getMapPlayerPos() {
     Vec pos;
     fopAc_ac_c* player = daPy_getPlayerActorClass();
@@ -85,8 +76,6 @@ Vec dMapInfo_n::getMapPlayerPos() {
     return pos;
 }
 
-/* 8003EF20-8003EF70 039860 0050+00 1/1 1/1 0/0 .text            getMapPlayerAngleY__10dMapInfo_nFv
- */
 s16 dMapInfo_n::getMapPlayerAngleY() {
     s32 stayNo = dComIfGp_roomControl_getStayNo();
     s16 angle = 0;
@@ -104,8 +93,6 @@ s16 dMapInfo_n::getMapPlayerAngleY() {
     return angle;
 }
 
-/* 8003EF70-8003F02C 0398B0 00BC+00 2/2 0/0 0/0 .text getConstRestartIconPointer__10dMapInfo_nFv
- */
 const dTres_c::typeGroupData_c* dMapInfo_n::getConstRestartIconPointer() {
     int group_num = dTres_c::getTypeGroupNumber(7);
     const dTres_c::typeGroupData_c* group_data = dTres_c::getFirstData(7);
@@ -129,7 +116,6 @@ const dTres_c::typeGroupData_c* dMapInfo_n::getConstRestartIconPointer() {
     return group_data;
 }
 
-/* 8003F02C-8003F0F8 03996C 00CC+00 1/1 2/2 0/0 .text            getMapRestartPos__10dMapInfo_nFv */
 Vec dMapInfo_n::getMapRestartPos() {
     Vec pos;
     const dTres_c::typeGroupData_c* icon_data = getConstRestartIconPointer();
@@ -147,8 +133,6 @@ Vec dMapInfo_n::getMapRestartPos() {
     return pos;
 }
 
-/* 8003F0F8-8003F19C 039A38 00A4+00 1/1 1/1 0/0 .text            getMapRestartAngleY__10dMapInfo_nFv
- */
 s16 dMapInfo_n::getMapRestartAngleY() {
     int angle = dComIfGs_getRestartRoomAngleY();
 
@@ -176,8 +160,6 @@ s16 dMapInfo_n::getMapRestartAngleY() {
     return angle;
 }
 
-/* 8003F19C-8003F1F4 039ADC 0058+00 0/0 1/1 0/0 .text            getRoomCenter__10dMapInfo_nFiPfPf
- */
 void dMapInfo_n::getRoomCenter(int i_roomNo, f32* i_roomPosX, f32* i_roomPosZ) {
     dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo);
 
@@ -194,7 +176,6 @@ void dMapInfo_n::getRoomCenter(int i_roomNo, f32* i_roomPosX, f32* i_roomPosZ) {
     }
 }
 
-/* 8003F1F4-8003F24C 039B34 0058+00 1/1 2/2 0/0 .text getRoomMinMaxXZ__10dMapInfo_nFiPfPfPfPf */
 void dMapInfo_n::getRoomMinMaxXZ(int i_roomNo, f32* i_roomLeftX, f32* i_roomInnerZ,
                                  f32* i_roomRightX, f32* i_roomFrontZ) {
     dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo);
@@ -216,8 +197,6 @@ void dMapInfo_n::getRoomMinMaxXZ(int i_roomNo, f32* i_roomLeftX, f32* i_roomInne
     }
 }
 
-/* 8003F24C-8003F40C 039B8C 01C0+00 2/2 0/0 0/0 .text getFloorParameter__10dMapInfo_nFfPScPfPfPfPf
- */
 void dMapInfo_n::getFloorParameter(f32 param_0, s8* i_floorNo, f32* param_2, f32* param_3,
                                    f32* param_4, f32* param_5) {
     f32 gap_level = dStage_stagInfo_GetGapLevel(dComIfGp_getStageStagInfo());
@@ -247,17 +226,12 @@ void dMapInfo_n::getFloorParameter(f32 param_0, s8* i_floorNo, f32* param_2, f32
     }
 }
 
-/* ############################################################################################## */
-/* 80450E58-80450E5C 000358 0004+00 4/4 3/3 0/0 .sbss            None */
 s8 dMapInfo_c::mNowStayFloorNo;
 
-/* 80450E5C-80450E60 00035C 0004+00 4/4 0/0 0/0 .sbss            mNowStayRoomNo__10dMapInfo_c */
 int dMapInfo_c::mNowStayRoomNo;
 
-/* 80450E60-80450E64 000360 0004+00 4/4 3/3 0/0 .sbss            None */
 u8 dMapInfo_c::mNowStayFloorNoDecisionFlg;
 
-/* 8003F40C-8003F570 039D4C 0164+00 2/2 1/1 0/0 .text            calcFloorNo__10dMapInfo_cFfbi */
 s8 dMapInfo_c::calcFloorNo(f32 param_0, bool i_chkMinMax, int i_roomNo) {
     f32 sp10;
     f32 spC;
@@ -297,8 +271,6 @@ s8 dMapInfo_c::calcFloorNo(f32 param_0, bool i_chkMinMax, int i_roomNo) {
     return floorNo;
 }
 
-/* 8003F570-8003F6C8 039EB0 0158+00 1/1 1/1 0/0 .text            calcNowStayFloorNo__10dMapInfo_cFfb
- */
 s8 dMapInfo_c::calcNowStayFloorNo(f32 param_0, bool i_chkMinMax) {
     f32 sp10;
     f32 spC;
@@ -336,71 +308,53 @@ s8 dMapInfo_c::calcNowStayFloorNo(f32 param_0, bool i_chkMinMax) {
     return floorNo;
 }
 
-/* 8003F6C8-8003F6FC 03A008 0034+00 0/0 1/1 0/0 .text            move__10dMapInfo_cFif */
 void dMapInfo_c::move(int i_roomNo, f32 param_1) {
     mNowStayRoomNo = i_roomNo;
     mNowStayFloorNo = calcNowStayFloorNo(param_1, true);
     mNowStayFloorNoDecisionFlg = true;
 }
 
-/* 8003F6FC-8003F714 03A03C 0018+00 2/2 0/0 0/0 .text            init__10dMapInfo_cFv */
 void dMapInfo_c::init() {
     mNowStayFloorNo = 0;
     mNowStayFloorNoDecisionFlg = false;
     mNowStayRoomNo = -1;
 }
 
-/* 8003F714-8003F734 03A054 0020+00 1/1 0/0 0/0 .text            reset__10dMapInfo_cFv */
 void dMapInfo_c::reset() {
     init();
 }
 
-/* 8003F734-8003F754 03A074 0020+00 1/1 0/0 0/0 .text            create__10dMapInfo_cFv */
 void dMapInfo_c::create() {
     init();
 }
 
-/* 8003F754-8003F758 03A094 0004+00 1/1 0/0 0/0 .text            remove__10dMapInfo_cFv */
 void dMapInfo_c::remove() {}
 
-/* ############################################################################################## */
-/* 80450E64-80450E68 000364 0004+00 5/5 1/1 0/0 .sbss            mLayerList__8dMpath_c */
 dDrawPath_c::layer_data* dMpath_c::mLayerList;
 
-/* 80450E68-80450E6C 000368 0004+00 3/3 1/1 0/0 .sbss            mMinX__8dMpath_c */
 // these are needed for sinit, but its got reversed reg alloc?
 f32 dMpath_c::mMinX = FLT_MAX;
 
-/* 80450E6C-80450E70 00036C 0004+00 3/3 1/1 0/0 .sbss            mMaxX__8dMpath_c */
 f32 dMpath_c::mMaxX = -FLT_MAX;
 
-/* 80450E70-80450E74 000370 0004+00 3/3 2/2 0/0 .sbss            mMinZ__8dMpath_c */
 f32 dMpath_c::mMinZ = FLT_MAX;
 
-/* 80450E74-80450E78 000374 0004+00 3/3 1/1 0/0 .sbss            mMaxZ__8dMpath_c */
 f32 dMpath_c::mMaxZ = -FLT_MAX;
 
-/* 80450E78-80450E7C 000378 0004+00 1/1 2/2 0/0 .sbss            mAllCenterX__8dMpath_c */
 f32 dMpath_c::mAllCenterX;
 
-/* 80450E7C-80450E80 00037C 0004+00 1/1 2/2 0/0 .sbss            mAllCenterZ__8dMpath_c */
 f32 dMpath_c::mAllCenterZ;
 
-/* 80450E80-80450E84 000380 0004+00 1/1 4/4 0/0 .sbss            mAllSizeX__8dMpath_c */
 f32 dMpath_c::mAllSizeX;
 
-/* 80450E84-80450E88 000384 0004+00 1/1 4/4 0/0 .sbss            mAllSizeZ__8dMpath_c */
 f32 dMpath_c::mAllSizeZ;
 
-/* 80450E88-80450E90 000388 0008+00 4/3 0/0 0/0 .sbss            None */
 static bool data_80450E88;
 
-/* 8003F758-8003F760 -00001 0008+00 0/0 0/0 0/0 .text            isExistMapPathData__8dMpath_cFv */
 bool dMpath_c::isExistMapPathData() {
     return data_80450E88;
 }
 
-/* 80450630-80450634 0000B0 0004+00 0/0 1/1 2/2 .sdata           mNextRoomNo__10dMapInfo_c */
 int dMapInfo_c::mNextRoomNo = -1;
 
 /* 80450634 0001+00 data_80450634 None */
@@ -409,7 +363,6 @@ s8 dMpath_c::mBottomFloorNo = 127;
 /* 80450635 0001+00 data_80450635 None */
 s8 dMpath_c::mTopFloorNo = -128;
 
-/* 8003F760-8003F7E8 03A0A0 0088+00 0/0 1/1 0/0 .text getTopBottomFloorNo__8dMpath_cFPScPSc */
 int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) {
     if (isExistMapPathData()) {
         if (i_topFloorNo != NULL) {
@@ -432,14 +385,11 @@ int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) {
     return 1;
 }
 
-/* 8003F7E8-8003F810 03A128 0028+00 0/0 1/1 0/0 .text            createWork__8dMpath_cFv */
 void dMpath_c::createWork() {
     mLayerList = new dDrawPath_c::layer_data;
     JUT_ASSERT(1416, mLayerList!=NULL);
 }
 
-/* 8003F810-8003FA40 03A150 0230+00 1/1 1/1 0/0 .text
- * setPointer__8dMpath_cFPQ211dDrawPath_c10room_classPScPSc     */
 int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param_2) {
     int var_r6 = 0;
     if ((uintptr_t)i_room->mpFloor >= 0x80000000) {
@@ -514,7 +464,6 @@ int dMpath_c::setPointer(dDrawPath_c::room_class* i_room, s8* param_1, s8* param
     return var_r6;
 }
 
-/* 8003FA40-8003FB70 03A380 0130+00 0/0 2/2 0/0 .text            setPointer__8dMpath_cFScPvi */
 #pragma push
 #pragma optimization_level 2
 void dMpath_c::setPointer(s8 i_roomNo, void* i_data, int i_mapLayerNo) {
@@ -560,7 +509,6 @@ void dMpath_c::setPointer(s8 i_roomNo, void* i_data, int i_mapLayerNo) {
 }
 #pragma pop
 
-/* 8003FB70-8003FBD0 03A4B0 0060+00 0/0 1/1 0/0 .text            create__8dMpath_cFv */
 void dMpath_c::create() {
     stage_stag_info_class* p_stag = dComIfGp_getStage()->getStagInfo();
     if (dStage_stagInfo_GetSTType(p_stag) != ST_BOSS_ROOM) {
@@ -572,11 +520,8 @@ void dMpath_c::create() {
     dMapInfo_c::create();
 }
 
-/* ############################################################################################## */
-/* 80450636-80450638 0000B6 0002+00 2/2 0/0 0/0 .sdata           None */
 static u8 data_80450636 = 0x01;
 
-/* 8003FBD0-8003FC70 03A510 00A0+00 2/2 0/0 0/0 .text            reset__8dMpath_cFv */
 void dMpath_c::reset() {
     if (data_80450636) {
         for (int i = 0; i < 0x40; i++) {
@@ -596,20 +541,16 @@ void dMpath_c::reset() {
     }
 }
 
-/* 8003FC70-8003FCA4 03A5B0 0034+00 0/0 1/1 0/0 .text            remove__8dMpath_cFv */
 void dMpath_c::remove() {
     data_80450636 = 1;
     dMpath_n::m_texObjAgg.remove();
     dMapInfo_c::remove();
 }
 
-/* 8003FCA4-8003FCC8 03A5E4 0024+00 2/2 0/0 0/0 .text
- * calcFloorNoForObjectByMapPathRend__16renderingDAmap_cCFfi    */
 s8 renderingDAmap_c::calcFloorNoForObjectByMapPathRend(f32 param_0, int i_roomNo) const {
     return dMapInfo_c::calcFloorNo(param_0, true, i_roomNo);
 }
 
-/* 8003FCC8-8003FD08 03A608 0040+00 0/0 2/2 0/0 .text init__16renderingDAmap_cFPUcUsUsUsUs */
 void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_3, u16 param_4) {
     mIsDraw = false;
     field_0x4 = param_0;
@@ -626,7 +567,6 @@ void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_3,
     mRenderedFloor = 0;
 }
 
-/* 8003FD08-8003FD9C 03A648 0094+00 0/0 2/2 0/0 .text            entry__16renderingDAmap_cFfffiSc */
 void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 i_cmPerTexel, int i_roomNoSingle,
                              s8 param_4) {
     mPosX = param_0;
@@ -639,8 +579,6 @@ void renderingDAmap_c::entry(f32 param_0, f32 param_1, f32 i_cmPerTexel, int i_r
     dComIfGd_setCopy2D(this);
 }
 
-/* 8003FD9C-8003FE18 03A6DC 007C+00 3/0 3/0 0/0 .text
- * isSwitch__16renderingDAmap_cFPCQ211dDrawPath_c11group_class  */
 bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
     if (i_group->mSwbit == 0xFF) {
         return true;
@@ -651,30 +589,22 @@ bool renderingDAmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
     }
 }
 
-/* 8003FE18-8003FE4C 03A758 0034+00 3/0 2/1 0/0 .text            draw__16renderingDAmap_cFv */
 void renderingDAmap_c::draw() {
     renderingMap();
     mIsDraw = true;
 }
 
-/* 8003FE4C-8003FE54 03A78C 0008+00 3/0 3/0 0/0 .text            getBackColor__16renderingDAmap_cCFv
- */
 const GXColor* renderingDAmap_c::getBackColor() const {
     static const GXColor l_mapBaseColor = {4, 0, 0, 0};
     return &l_mapBaseColor;
 }
 
-/* 8003FE54-8003FE6C 03A794 0018+00 3/0 3/0 0/0 .text isRenderingFloor__16renderingDAmap_cFi */
 bool renderingDAmap_c::isRenderingFloor(int i_floorNo) {
     return i_floorNo == mRenderedFloor;
 }
 
-/* 8003FE6C-8003FE70 03A7AC 0004+00 2/2 0/0 0/0 .text setSingleRoomSetting__16renderingDAmap_cFv
- */
 void renderingDAmap_c::setSingleRoomSetting() {}
 
-/* 8003FE70-8003FF14 03A7B0 00A4+00 3/0 3/1 0/0 .text            isDrawRoom__16renderingDAmap_cCFii
- */
 bool renderingDAmap_c::isDrawRoom(int param_0, int param_1) const {
     bool rv = hasMap() || param_0 == param_1;
     if (isRendAllRoom()) {
@@ -683,8 +613,6 @@ bool renderingDAmap_c::isDrawRoom(int param_0, int param_1) const {
     return rv;
 }
 
-/* 8003FF14-8003FFC4 03A854 00B0+00 3/0 3/0 0/0 .text            preDrawPath__16renderingDAmap_cFv
- */
 void renderingDAmap_c::preDrawPath() {
     Mtx m;
     Vec sp20;
@@ -711,18 +639,14 @@ void renderingDAmap_c::preDrawPath() {
     GXSetMisc(GX_MT_XF_FLUSH, 8);
 }
 
-/* 8003FFC4-8003FFEC 03A904 0028+00 3/0 3/0 0/0 .text            postDrawPath__16renderingDAmap_cFv
- */
 void renderingDAmap_c::postDrawPath() {
     GXSetMisc(GX_MT_XF_FLUSH, 0);
 }
 
-/* 8003FFEC-8003FFF4 03A92C 0008+00 3/0 3/1 0/0 .text getRoomNoSingle__16renderingDAmap_cFv */
 int renderingDAmap_c::getRoomNoSingle() {
     return mRoomNoSingle;
 }
 
-/* 8003FFF4-80040094 03A934 00A0+00 2/2 0/0 0/0 .text getFirstDrawRoomNo__16renderingDAmap_cFv */
 int renderingDAmap_c::getFirstDrawRoomNo() {
     int roomNo = 0;
 
@@ -737,7 +661,6 @@ int renderingDAmap_c::getFirstDrawRoomNo() {
     return roomNo;
 }
 
-/* 80040094-80040134 03A9D4 00A0+00 2/2 0/0 0/0 .text getNextDrawRoomNo__16renderingDAmap_cFi */
 int renderingDAmap_c::getNextDrawRoomNo(int param_0) {
     int i = param_0 + 1;
 
@@ -760,7 +683,6 @@ int renderingDAmap_c::getNextDrawRoomNo(int param_0) {
     return i;
 }
 
-/* 80040134-800401E8 03AA74 00B4+00 3/0 3/0 0/0 .text getFirstRoomPointer__16renderingDAmap_cFv */
 dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() {
     dDrawPath_c::room_class* pRoomClass = NULL;
     mRoomNo = getFirstDrawRoomNo();
@@ -779,7 +701,6 @@ dDrawPath_c::room_class* renderingDAmap_c::getFirstRoomPointer() {
     return pRoomClass;
 }
 
-/* 800401E8-800402C0 03AB28 00D8+00 3/0 3/0 0/0 .text getNextRoomPointer__16renderingDAmap_cFv */
 dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() {
     dDrawPath_c::room_class* pRoomClass = NULL;
     bool bVar1 = false;
@@ -805,17 +726,14 @@ dDrawPath_c::room_class* renderingDAmap_c::getNextRoomPointer() {
     return pRoomClass;
 }
 
-/* 800402C0-800402E0 03AC00 0020+00 3/0 3/0 0/0 .text            isDrawPath__16renderingDAmap_cFv */
 bool renderingDAmap_c::isDrawPath() {
     return dMpath_c::isExistMapPathData();
 }
 
-/* 800402E0-800402E8 03AC20 0008+00 3/0 3/0 0/0 .text getFirstDrawLayerNo__16renderingDAmap_cFv */
 int renderingDAmap_c::getFirstDrawLayerNo() {
     return 0;
 }
 
-/* 800402E8-800402FC 03AC28 0014+00 3/0 3/0 0/0 .text getNextDrawLayerNo__16renderingDAmap_cFi */
 int renderingDAmap_c::getNextDrawLayerNo(int param_0) {
     int layerNo = param_0 + 1;
     if (layerNo >= 2) {
@@ -825,8 +743,6 @@ int renderingDAmap_c::getNextDrawLayerNo(int param_0) {
     return layerNo;
 }
 
-/* 800402FC-80040518 03AC3C 021C+00 1/0 1/1 0/0 .text
- * afterDrawPath__28renderingPlusDoorAndCursor_cFv              */
 void renderingPlusDoorAndCursor_c::afterDrawPath() {
     renderingPlusDoor_c::afterDrawPath();
     bool check_floor = isCheckFloor();
@@ -869,7 +785,6 @@ void renderingPlusDoorAndCursor_c::afterDrawPath() {
     }
 }
 
-/* 80040518-80040574 03AE58 005C+00 2/1 1/1 0/0 .text afterDrawPath__19renderingPlusDoor_cFv */
 void renderingPlusDoor_c::afterDrawPath() {
     if (mRoomNoSingle >= 0 && isRendDoor()) {
         drawDoor1();
@@ -877,34 +792,24 @@ void renderingPlusDoor_c::afterDrawPath() {
     }
 }
 
-/* 80040574-800405B8 03AEB4 0044+00 1/1 0/0 0/0 .text            drawDoor1__19renderingPlusDoor_cFv
- */
 void renderingPlusDoor_c::drawDoor1() {
     dStage_KeepDoorInfo* door_info = dStage_GetKeepDoorInfo();
     drawDoorCommon(door_info->mDrTgData, door_info->mNum, true);
 }
 
-/* 800405B8-800405FC 03AEF8 0044+00 1/1 0/0 0/0 .text            drawDoor2__19renderingPlusDoor_cFv
- */
 void renderingPlusDoor_c::drawDoor2() {
     dStage_KeepDoorInfo* door_info = dStage_GetRoomKeepDoorInfo();
     drawDoorCommon(door_info->mDrTgData, door_info->mNum, false);
 }
 
-/* 80451E58-80451E5C 000458 0004+00 1/1 0/0 0/0 .sdata2          l_doorWhite */
 static const GXColor l_doorWhite = {100, 0, 0, 0};
 
-/* 80451E5C-80451E60 00045C 0004+00 1/1 0/0 0/0 .sdata2          l_doorWhiteNoStay */
 static const GXColor l_doorWhiteNoStay = {108, 0, 0, 0};
 
-/* 80451E60-80451E64 000460 0004+00 1/1 0/0 0/0 .sdata2          l_doorWhite2 */
 static const GXColor l_doorWhite2 = {100, 0, 0, 0};
 
-/* 80451E64-80451E68 000464 0004+00 1/1 0/0 0/0 .sdata2          l_doorWhiteNoStay2 */
 static const GXColor l_doorWhiteNoStay2 = {108, 0, 0, 0};
 
-/* 800405FC-80040710 03AF3C 0114+00 2/2 0/0 0/0 .text
- * drawDoorCommon__19renderingPlusDoor_cFPC21stage_tgsc_data_classib */
 void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData, int i_dataNum,
                                          bool param_2) {
     static const u8 l_tex0[8] = {0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01};
@@ -933,7 +838,6 @@ void renderingPlusDoor_c::drawDoorCommon(stage_tgsc_data_class const* i_doorData
     setTevSettingNonTextureDirectColor();
 }
 
-/* 80040710-80040838 03B050 0128+00 1/1 0/0 0/0 .text checkDispDoorS__19renderingPlusDoor_cFiif */
 bool renderingPlusDoor_c::checkDispDoorS(int param_0, int param_1, f32 param_2) {
     if (isRendAllRoom()) {
         if (!hasMap() && (!dMapInfo_n::isVisitedRoom(param_0) && param_0 != mRoomNoSingle) &&
@@ -961,8 +865,6 @@ static Vec const l_100x100BoxVertexList[4] = {
     {-50.0f, 50.0f, 0.0f},
 };
 
-/* 80040838-800409B4 03B178 017C+00 1/1 0/0 0/0 .text
- * drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib */
 void renderingPlusDoor_c::drawNormalDoorS(stage_tgsc_data_class const* i_doorData, int i_roomNo,
                                           int param_2, bool param_3) {
     if (i_roomNo == dComIfGp_roomControl_getStayNo() || param_2 == dComIfGp_roomControl_getStayNo())
@@ -998,13 +900,10 @@ void renderingPlusDoor_c::drawNormalDoorS(stage_tgsc_data_class const* i_doorDat
     GXEnd();
 }
 
-/* 800409B4-800409E0 03B2F4 002C+00 3/0 2/0 0/0 .text isDrawRoomIcon__16renderingDAmap_cCFii */
 bool renderingDAmap_c::isDrawRoomIcon(int param_0, int param_1) const {
     return isDrawRoom(param_0, param_1);
 }
 
-/* 800409E0-80040A94 03B320 00B4+00 3/0 3/0 0/0 .text
- * isDrawIconSingle__16renderingDAmap_cCFPCQ27dTres_c6data_siiibPC3Vec */
 bool renderingDAmap_c::isDrawIconSingle(dTres_c::data_s const* data, int param_1, int param_2,
                                         bool param_3, bool param_4, Vec const* param_5) const {
     bool draw_room_icon = isDrawRoomIcon(data->mRoomNo, param_1);
@@ -1020,60 +919,42 @@ bool renderingDAmap_c::isDrawIconSingle(dTres_c::data_s const* data, int param_1
     return isDrawIconSingle2(data, tmp, draw_room_icon, param_1);
 }
 
-/* 80040A94-80040AB8 03B3D4 0024+00 1/0 2/1 0/0 .text
- * getFirstData__28renderingPlusDoorAndCursor_cFUc              */
 dTres_c::typeGroupData_c* renderingPlusDoorAndCursor_c::getFirstData(u8 param_0) {
     return dTres_c::getFirstData((int)param_0);
 }
 
-/* 80040AB8-80040ADC 03B3F8 0024+00 1/0 2/1 0/0 .text
- * getNextData__28renderingPlusDoorAndCursor_cFPQ27dTres_c15typeGroupData_c */
 dTres_c::typeGroupData_c*
 renderingPlusDoorAndCursor_c::getNextData(dTres_c::typeGroupData_c* param_0) {
     return dTres_c::getNextData(param_0);
 }
 
-/* 80040ADC-80040AE4 03B41C 0008+00 1/0 2/1 0/0 .text
- * getIconPosition__28renderingPlusDoorAndCursor_cCFPQ27dTres_c15typeGroupData_c */
 const Vec*
 renderingPlusDoorAndCursor_c::getIconPosition(dTres_c::typeGroupData_c* i_typeGroupData) const {
     return i_typeGroupData->getPos();
 }
 
-/* 80040AE4-80040B00 03B424 001C+00 3/0 2/1 0/0 .text getIconGroupNumber__16renderingDAmap_cCFUc
- */
 int renderingDAmap_c::getIconGroupNumber(u8 param_0) const {
     return dTres_c::getTypeGroupNumber(param_0);
 }
 
-/* 80451E74-80451E78 000474 0004+00 1/0 0/0 0/0 .sdata2          l_entranceStartColor */
 static const GXColor l_entranceStartColor = {148, 0, 0, 0};
 
-/* 80451E78-80451E7C 000478 0004+00 1/0 0/0 0/0 .sdata2          l_entranceLv8StartColor */
 static const GXColor l_entranceLv8StartColor = {156, 0, 0, 0};
 
-/* 80451E7C-80451E80 00047C 0004+00 3/2 0/0 0/0 .sdata2          l_treasureStartColor */
 static const GXColor l_treasureStartColor = {124, 0, 0, 0};
 
-/* 80451E80-80451E84 000480 0004+00 1/0 0/0 0/0 .sdata2          l_smallKeyStartColor */
 static const GXColor l_smallKeyStartColor = {132, 0, 0, 0};
 
-/* 80451E84-80451E88 000484 0004+00 1/0 0/0 0/0 .sdata2          l_bossStartColor */
 static const GXColor l_bossStartColor = {136, 0, 0, 0};
 
-/* 80451E88-80451E8C 000488 0004+00 1/0 0/0 0/0 .sdata2          l_npc0StartColor */
 static const GXColor l_npc0StartColor = {140, 0, 0, 0};
 
-/* 80451E8C-80451E90 00048C 0004+00 1/0 0/0 0/0 .sdata2          l_destinationStartColor */
 static const GXColor l_destinationStartColor = {144, 0, 0, 0};
 
-/* 80451E90-80451E94 000490 0004+00 1/0 0/0 0/0 .sdata2          l_npcYkmStartColor */
 static const GXColor l_npcYkmStartColor = {140, 0, 0, 0};
 
-/* 80451E94-80451E98 000494 0004+00 1/0 0/0 0/0 .sdata2          l_npcYkwStartColor */
 static const GXColor l_npcYkwStartColor = {140, 0, 0, 0};
 
-/* 80451E98-80451E9C 000498 0004+00 1/0 0/0 0/0 .sdata2          l_tksStartColor */
 static const GXColor l_tksStartColor = {164, 0, 0, 0};
 
 struct treasureDispData {
@@ -1082,8 +963,6 @@ struct treasureDispData {
     /* 0x8 */ const GXColor* field_0x8;
 };
 
-/* 80040B00-80040E84 03B440 0384+00 1/1 0/0 0/0 .text
- * drawTreasure__28renderingPlusDoorAndCursor_cFv               */
 void renderingPlusDoorAndCursor_c::drawTreasure() {
     static const u8 l_iconTex0[8] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00};
     static const GXColor tboxNotStayColor = {128, 0, 0, 0};
@@ -1158,8 +1037,6 @@ void renderingPlusDoorAndCursor_c::drawTreasure() {
     setTevSettingNonTextureDirectColor();
 }
 
-/* 80040E84-80041208 03B7C4 0384+00 1/1 0/0 0/0 .text
- * drawTreasureAfterPlayer__28renderingPlusDoorAndCursor_cFv    */
 void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
     static const treasureDispData l_treasureDispList[11] = {
         {16, 4, &l_tksStartColor},     {2, 4, &l_smallKeyStartColor}, {10, 4, &l_npc0StartColor},
@@ -1234,8 +1111,6 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() {
     setTevSettingNonTextureDirectColor();
 }
 
-/* 80041208-800412C0 03BB48 00B8+00 2/2 0/0 0/0 .text
- * drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff      */
 void renderingPlusDoorAndCursor_c::drawIconSingle(Vec const& param_0, f32 param_1, f32 param_2) {
     static f32 const l_iconPosData[4][2] = {
         {-50.0f, 50.0f},
@@ -1254,8 +1129,6 @@ void renderingPlusDoorAndCursor_c::drawIconSingle(Vec const& param_0, f32 param_
     GXEnd();
 }
 
-/* 800412C0-8004145C 03BC00 019C+00 1/1 0/0 0/0 .text
- * drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif         */
 void renderingPlusDoorAndCursor_c::drawCursor(Vec const& param_0, s16 param_1, int param_2,
                                               f32 param_3) {
     static Vec const l_offset[3] = {
@@ -1294,5 +1167,4 @@ void renderingPlusDoorAndCursor_c::drawCursor(Vec const& param_0, s16 param_1, i
     GXEnd();
 }
 
-/* 8004145C-80041460 03BD9C 0004+00 2/0 0/0 0/0 .text beforeDrawPath__19renderingPlusDoor_cFv */
 void renderingPlusDoor_c::beforeDrawPath() {}
diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp
index 4f52f83f37..f3fbef9441 100644
--- a/src/d/d_map_path_fmap.cpp
+++ b/src/d/d_map_path_fmap.cpp
@@ -1,15 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_map_path_fmap
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_com_inf_game.h"
 #include "d/d_map_path_fmap.h"
 
-/* 8003D790-8003D818 0380D0 0088+00 1/1 0/0 0/0 .text
- * addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s */
 void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo,
                                                   dTres_c::data_s const* i_tresData) {
     fmpTresTypeGroupData_c* next = mpNextData;
@@ -30,14 +23,11 @@ void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo,
     mpNextData = fmpTresTypeGroupData_p;
 }
 
-/* 8003D818-8003D868 038158 0050+00 1/1 1/1 0/0 .text isArrival__22dMenu_Fmap_room_data_cFv */
 bool dMenu_Fmap_room_data_c::isArrival() {
     u8 table_no = mp_parentStage->getStageArc()->mVisitedRoomSaveTableNo;
     return dComIfGs_isSaveVisitedRoom(table_no, m_roomNo) != false;
 }
 
-/* 8003D868-8003D92C 0381A8 00C4+00 1/1 0/0 0/0 .text
- * buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii             */
 void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex, int i_roomNo) {
     dTres_c::list_class* tresure_p = mp_fmapData->getTresure();
     if (tresure_p != NULL) {
@@ -57,8 +47,6 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex,
     }
 }
 
-/* 8003D92C-8003D95C 03826C 0030+00 1/1 0/0 0/0 .text
- * buildFmapRoomData__22dMenu_Fmap_room_data_cFiiffff           */
 void dMenu_Fmap_room_data_c::buildFmapRoomData(int i_stageNo, int i_index, f32 i_regionOffsetX,
                                                f32 i_regionOffsetZ, f32 i_stageOffsetX,
                                                f32 i_stageOffsetZ) {
@@ -69,7 +57,6 @@ void dMenu_Fmap_room_data_c::buildFmapRoomData(int i_stageNo, int i_index, f32 i
     }
 }
 
-/* 8003D95C-8003D9D8 03829C 007C+00 1/1 0/0 0/0 .text isArrival__23dMenu_Fmap_stage_data_cFv */
 bool dMenu_Fmap_stage_data_c::isArrival() {
     bool is_arrival = false;
     dMenu_Fmap_room_data_c* room = mp_roomTop;
@@ -82,8 +69,6 @@ bool dMenu_Fmap_stage_data_c::isArrival() {
     return is_arrival;
 }
 
-/* 8003D9D8-8003DB48 038318 0170+00 1/1 0/0 0/0 .text
- * buildFmapStageData__23dMenu_Fmap_stage_data_cFiff            */
 int dMenu_Fmap_stage_data_c::buildFmapStageData(int i_stageNo, f32 i_regionOffsetX,
                                                 f32 i_regionOffsetZ) {
     dMenu_Fmap_room_data_c* room = mp_roomTop;
@@ -133,8 +118,6 @@ int dMenu_Fmap_stage_data_c::buildFmapStageData(int i_stageNo, f32 i_regionOffse
     return room_no;
 }
 
-/* 8003DB48-8003DB70 038488 0028+00 0/0 1/1 0/0 .text
- * getMenuFmapStageData__24dMenu_Fmap_region_data_cFi           */
 dMenu_Fmap_stage_data_c* dMenu_Fmap_region_data_c::getMenuFmapStageData(int param_0) {
     dMenu_Fmap_stage_data_c* stage = mpMenuFmapStageDataTop;
     for (int i = 0; stage != NULL && i < param_0; i++) {
@@ -144,8 +127,6 @@ dMenu_Fmap_stage_data_c* dMenu_Fmap_region_data_c::getMenuFmapStageData(int para
     return stage;
 }
 
-/* 8003DB70-8003DEE0 0384B0 0370+00 0/0 1/1 0/0 .text
- * getPointStagePathInnerNo__24dMenu_Fmap_region_data_cFffiPiPi */
 int dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 i_pointX, f32 i_pointZ, int i_stageNo,
                                                        int* o_stageNo, int* o_roomNo) {
     int line_num, group_num, floor_num;
@@ -261,8 +242,6 @@ int dMenu_Fmap_region_data_c::getPointStagePathInnerNo(f32 i_pointX, f32 i_point
     return 1;
 }
 
-/* 8003DEE0-8003E028 038820 0148+00 0/0 1/1 0/0 .text
- * buildFmapRegionData__24dMenu_Fmap_region_data_cFi            */
 int dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) {
     f32 region_min_x = FLT_MAX;
     f32 region_min_z = FLT_MAX;
@@ -308,15 +287,11 @@ int dMenu_Fmap_region_data_c::buildFmapRegionData(int param_0) {
     return stage_no;
 }
 
-/* 8003E028-8003E04C 038968 0024+00 0/0 1/1 0/0 .text
- * create__23dMenu_Fmap_world_data_cFP24dMenu_Fmap_region_data_c */
 void dMenu_Fmap_world_data_c::create(dMenu_Fmap_region_data_c* i_regionData) {
     mp_fmapRegionData = i_regionData;
     buildFmapWorldData();
 }
 
-/* 8003E04C-8003E114 03898C 00C8+00 1/1 0/0 0/0 .text
- * buildFmapWorldData__23dMenu_Fmap_world_data_cFv              */
 int dMenu_Fmap_world_data_c::buildFmapWorldData() {
     f32 min_x = FLT_MAX;
     f32 min_z = FLT_MAX;
@@ -361,8 +336,6 @@ int dMenu_Fmap_world_data_c::buildFmapWorldData() {
     return region_no;
 }
 
-/* 8003E114-8003E1C0 038A54 00AC+00 0/0 3/3 0/0 .text
- * init__22dMenuFmapIconPointer_cFP24dMenu_Fmap_region_data_cP23dMenu_Fmap_stage_data_cUcii */
 bool dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* i_regionData,
                                  dMenu_Fmap_stage_data_c* i_stageData, u8 i_typeGroupNo,
                                  int i_stayStageNo, int i_stayRoomNo) {
@@ -383,7 +356,6 @@ bool dMenuFmapIconPointer_c::init(dMenu_Fmap_region_data_c* i_regionData,
     return true;
 }
 
-/* 8003E1C0-8003E2BC 038B00 00FC+00 2/2 0/0 0/0 .text getFirstData__22dMenuFmapIconPointer_cFv */
 bool dMenuFmapIconPointer_c::getFirstData() {
     bool ret = false;
     if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -415,8 +387,6 @@ bool dMenuFmapIconPointer_c::getFirstData() {
     return ret;
 }
 
-/* 8003E2BC-8003E350 038BFC 0094+00 1/1 0/0 0/0 .text            getData__22dMenuFmapIconPointer_cFv
- */
 bool dMenuFmapIconPointer_c::getData() {
     bool ret = false;
     if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -434,15 +404,11 @@ bool dMenuFmapIconPointer_c::getData() {
     return ret;
 }
 
-/* 8003E350-8003E37C 038C90 002C+00 2/2 0/0 0/0 .text getFirstRoomData__22dMenuFmapIconPointer_cFv
- */
 void dMenuFmapIconPointer_c::getFirstRoomData() {
     mpRoomData = mpStageData->getFmapRoomDataTop();
     getFirstData();
 }
 
-/* 8003E37C-8003E3A4 038CBC 0028+00 1/1 0/0 0/0 .text getNextRoomData__22dMenuFmapIconPointer_cFv
- */
 bool dMenuFmapIconPointer_c::getNextRoomData() {
     bool ret = false;
     mpRoomData = mpRoomData->getNextData();
@@ -452,8 +418,6 @@ bool dMenuFmapIconPointer_c::getNextRoomData() {
     return ret;
 }
 
-/* 8003E3A4-8003E3D8 038CE4 0034+00 1/1 0/0 0/0 .text getNextStageData__22dMenuFmapIconPointer_cFv
- */
 bool dMenuFmapIconPointer_c::getNextStageData() {
     bool ret = false;
     mStageNo++;
@@ -464,7 +428,6 @@ bool dMenuFmapIconPointer_c::getNextStageData() {
     return ret;
 }
 
-/* 8003E3D8-8003E490 038D18 00B8+00 1/1 0/0 0/0 .text getNextData__22dMenuFmapIconPointer_cFv */
 bool dMenuFmapIconPointer_c::getNextData() {
     bool ret = true;
     if (!strcmp(mpStageData->getStageName(), dComIfGp_getStartStageName())) {
@@ -489,7 +452,6 @@ bool dMenuFmapIconPointer_c::getNextData() {
     return ret;
 }
 
-/* 8003E490-8003E510 038DD0 0080+00 1/1 3/3 0/0 .text nextData__22dMenuFmapIconPointer_cFv */
 bool dMenuFmapIconPointer_c::nextData() {
     bool ret = false;
     if (getNextData()) {
@@ -506,7 +468,6 @@ bool dMenuFmapIconPointer_c::nextData() {
     return ret;
 }
 
-/* 8003E510-8003E578 038E50 0068+00 0/0 3/3 0/0 .text getValidData__22dMenuFmapIconPointer_cFv */
 bool dMenuFmapIconPointer_c::getValidData() {
     bool iVar1, iVar2 = false;
     do {
@@ -518,8 +479,6 @@ bool dMenuFmapIconPointer_c::getValidData() {
     return iVar2;
 }
 
-/* 8003E578-8003E6E8 038EB8 0170+00 0/0 3/3 0/0 .text
- * getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s */
 bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX, f32* o_posZ,
                                       dTres_c::data_s const** o_tresData) {
     f32 offset_x = mpRegionData->getRegionOffsetX() + mpStageData->getOffsetX();
@@ -567,8 +526,6 @@ bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX
     return false;
 }
 
-/* 8003E6E8-8003EB10 039028 0428+00 2/0 3/3 0/0 .text            isDrawDisp__19dMenuFmapIconDisp_cFv
- */
 bool dMenuFmapIconDisp_c::isDrawDisp() {
     dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc();
     if (stage_arc == NULL) {
diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp
index bf342bb5eb..72ec058eec 100644
--- a/src/d/d_menu_calibration.cpp
+++ b/src/d/d_menu_calibration.cpp
@@ -28,7 +28,6 @@ static dummy_child_class dummy() {
     return temp;
 }
 
-/* 803BC28C-803BC2D4 0193AC 0048+00 1/2 0/0 0/0 .data            map_init_process */
 typedef void (dMenu_Calibration_c::*initFunc)();
 static initFunc map_init_process[] = {
     &dMenu_Calibration_c::step1_wait_init, &dMenu_Calibration_c::step1_move_init,
@@ -36,7 +35,6 @@ static initFunc map_init_process[] = {
     &dMenu_Calibration_c::step3_wait_init, &dMenu_Calibration_c::step3_move_init,
 };
 
-/* 803BC31C-803BC364 01943C 0048+00 1/2 0/0 0/0 .data            map_move_process */
 typedef void (dMenu_Calibration_c::*moveFunc)();
 static moveFunc map_move_process[] = {
     &dMenu_Calibration_c::step1_wait_move, &dMenu_Calibration_c::step1_move_move,
@@ -44,10 +42,8 @@ static moveFunc map_move_process[] = {
     &dMenu_Calibration_c::step3_wait_move, &dMenu_Calibration_c::step3_move_move,
 };
 
-/* 801AED64-801AEDAC 1A96A4 0048+00 1/0 0/0 0/0 .text            __dt__19dMenu_Calibration_cFv */
 dMenu_Calibration_c::~dMenu_Calibration_c() {}
 
-/* 801AEDAC-801AEE2C 1A96EC 0080+00 0/0 1/1 0/0 .text            _move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::_move() {
     u8 last_process = mProcess;
     (this->*map_move_process[mProcess])();
@@ -59,10 +55,8 @@ void dMenu_Calibration_c::_move() {
     setHIO(false);
 }
 
-/* 801AEE2C-801AEE30 1A976C 0004+00 1/1 0/0 0/0 .text            _draw__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::_draw() {}
 
-/* 801AEE30-801AEF60 1A9770 0130+00 1/0 0/0 0/0 .text step1_wait_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step1_wait_init() {
     field_0xfa = 0;
     setAButtonString(0);
@@ -80,7 +74,6 @@ void dMenu_Calibration_c::step1_wait_init() {
     field_0x7c->setAlphaRate(0.0f);
 }
 
-/* 801AEF60-801AF084 1A98A0 0124+00 1/0 0/0 0/0 .text step1_wait_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step1_wait_move() {
     s16 open_frames = g_drawHIO.mCalibration.mOpenFrames;
     field_0xfa++;
@@ -105,13 +98,11 @@ void dMenu_Calibration_c::step1_wait_move() {
     }
 }
 
-/* 801AF084-801AF0C0 1A99C4 003C+00 1/0 0/0 0/0 .text step1_move_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step1_move_init() {
     setAButtonString(1032);  // "Next"
     setBButtonString(1377);  // "Cancel"
 }
 
-/* 801AF0C0-801AF188 1A9A00 00C8+00 1/0 0/0 0/0 .text step1_move_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step1_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1)) {
         mProcess = PROC_STEP2_WAIT;
@@ -126,7 +117,6 @@ void dMenu_Calibration_c::step1_move_move() {
     }
 }
 
-/* 801AF188-801AF1F4 1A9AC8 006C+00 1/0 0/0 0/0 .text step2_wait_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step2_wait_init() {
     field_0xfa = 0;
     setAButtonString(0);
@@ -137,7 +127,6 @@ void dMenu_Calibration_c::step2_wait_init() {
     mpSelectCursor->offPlayAnime(0);
 }
 
-/* 801AF1F4-801AF380 1A9B34 018C+00 1/0 0/0 0/0 .text step2_wait_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step2_wait_move() {
     s16 open_frames = g_drawHIO.mCalibration.mOpenFrames;
     field_0xfa++;
@@ -175,13 +164,11 @@ void dMenu_Calibration_c::step2_wait_move() {
     }
 }
 
-/* 801AF380-801AF3BC 1A9CC0 003C+00 1/0 0/0 0/0 .text step2_move_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step2_move_init() {
     setAButtonString(1032);  // "Next"
     setBButtonString(1017);  // "Back"
 }
 
-/* 801AF3BC-801AF488 1A9CFC 00CC+00 1/0 0/0 0/0 .text step2_move_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step2_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1)) {
         mProcess = PROC_STEP3_WAIT;
@@ -196,7 +183,6 @@ void dMenu_Calibration_c::step2_move_move() {
     }
 }
 
-/* 801AF488-801AF4F8 1A9DC8 0070+00 1/0 0/0 0/0 .text step3_wait_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step3_wait_init() {
     field_0xfa = 0;
     setAButtonString(0);
@@ -209,7 +195,6 @@ void dMenu_Calibration_c::step3_wait_init() {
     field_0x90->setAlphaRate(0.0f);
 }
 
-/* 801AF4F8-801AF5F4 1A9E38 00FC+00 1/0 0/0 0/0 .text step3_wait_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step3_wait_move() {
     s16 open_frames = g_drawHIO.mCalibration.mOpenFrames;
     field_0xfa++;
@@ -232,13 +217,11 @@ void dMenu_Calibration_c::step3_wait_move() {
     }
 }
 
-/* 801AF5F4-801AF630 1A9F34 003C+00 1/0 0/0 0/0 .text step3_move_init__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step3_move_init() {
     setAButtonString(1378);  // "End"
     setBButtonString(1017);  // "Back"
 }
 
-/* 801AF630-801AF710 1A9F70 00E0+00 1/0 0/0 0/0 .text step3_move_move__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::step3_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1)) {
         mStatus = 0;
@@ -254,8 +237,6 @@ void dMenu_Calibration_c::step3_move_move() {
     }
 }
 
-/* 801AF710-801AF738 1AA050 0028+00 1/1 0/0 0/0 .text setCalibrationValue__19dMenu_Calibration_cFv
- */
 void dMenu_Calibration_c::setCalibrationValue() {
     dComIfGs_setOptCalValue(mCalibrationValue);
     dComIfGs_setOptCalibrateDist(mCalibrateDist);
@@ -263,8 +244,6 @@ void dMenu_Calibration_c::setCalibrationValue() {
     field_0xf6 = mCalibrateDist;
 }
 
-/* 801AF738-801AF7E8 1AA078 00B0+00 6/6 0/0 0/0 .text setAButtonString__19dMenu_Calibration_cFUs
- */
 void dMenu_Calibration_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -277,8 +256,6 @@ void dMenu_Calibration_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801AF7E8-801AF898 1AA128 00B0+00 6/6 0/0 0/0 .text setBButtonString__19dMenu_Calibration_cFUs
- */
 void dMenu_Calibration_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -291,7 +268,6 @@ void dMenu_Calibration_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801AF898-801AF948 1AA1D8 00B0+00 3/3 0/0 0/0 .text setStepString__19dMenu_Calibration_cFUs */
 void dMenu_Calibration_c::setStepString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 3; i++) {
@@ -304,8 +280,6 @@ void dMenu_Calibration_c::setStepString(u16 i_stringID) {
     }
 }
 
-/* 801AF948-801AFA00 1AA288 00B8+00 3/3 0/0 0/0 .text setExplainString__19dMenu_Calibration_cFUs
- */
 void dMenu_Calibration_c::setExplainString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 3; i++) {
@@ -318,7 +292,6 @@ void dMenu_Calibration_c::setExplainString(u16 i_stringID) {
     }
 }
 
-/* 801AFA00-801AFBF4 1AA340 01F4+00 1/1 0/0 0/0 .text            setHIO__19dMenu_Calibration_cFb */
 void dMenu_Calibration_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mCalibration.mDebug) {
         field_0x7c->scale(g_drawHIO.mCalibration.mCircleScale, g_drawHIO.mCalibration.mCircleScale);
@@ -357,7 +330,6 @@ void dMenu_Calibration_c::setHIO(bool i_useHIO) {
     }
 }
 
-/* 801AFBF4-801AFC14 1AA534 0020+00 1/0 0/0 0/0 .text            draw__19dMenu_Calibration_cFv */
 void dMenu_Calibration_c::draw() {
     _draw();
 }
diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp
index f82896114b..f7e4a7e221 100644
--- a/src/d/d_menu_collect.cpp
+++ b/src/d/d_menu_collect.cpp
@@ -62,8 +62,6 @@ static processFunc process[] = {
     &dMenu_Collect2D_c::insect_close_proc,
 };
 
-/* 801AFD48-801AFE34 1AA688 00EC+00 1/1 0/0 0/0 .text
- * __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl */
 dMenu_Collect2D_c::dMenu_Collect2D_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) {
     mpHeap = param_0;
     mpStick = param_1;
@@ -89,7 +87,6 @@ dMenu_Collect2D_c::dMenu_Collect2D_c(JKRExpHeap* param_0, STControl* param_1, CS
 }
 
 
-/* 801AFE34-801AFEA4 1AA774 0070+00 1/0 0/0 0/0 .text            __dt__17dMenu_Collect2D_cFv */
 dMenu_Collect2D_c::~dMenu_Collect2D_c() {
     if (mpSubHeap) {
         mDoExt_destroyExpHeap(mpSubHeap);
@@ -97,7 +94,6 @@ dMenu_Collect2D_c::~dMenu_Collect2D_c() {
     }
 }
 
-/* 801AFEA4-801B0100 1AA7E4 025C+00 1/1 0/0 0/0 .text            _create__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::_create() {
     mpHeap->getTotalFreeSize();
     mpScreen = new J2DScreen();
@@ -132,7 +128,6 @@ void dMenu_Collect2D_c::_create() {
     setHIO(true);
 }
 
-/* 801B0100-801B0570 1AAA40 0470+00 1/1 0/0 0/0 .text            _delete__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::_delete() {
     mpHeap->getTotalFreeSize();
     dMeter2Info_setCollectCursorPosXY(mCursorX, mCursorY);
@@ -215,13 +210,10 @@ void dMenu_Collect2D_c::_delete() {
     dComIfGp_getCollectResArchive()->removeResourceAll();
 }
 
-/* 801B0570-801B05A8 1AAEB0 0038+00 1/1 0/0 0/0 .text            initialize__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::initialize() {
     (this->*init[mProcess])();
 }
 
-/* 801B05A8-801B061C 1AAEE8 0074+00 2/2 0/0 0/0 .text isFishIconVisible__17dMenu_Collect2D_cFv */
 bool dMenu_Collect2D_c::isFishIconVisible() {
     if (dComIfGs_getFishNum(0) || dComIfGs_getFishNum(1) || dComIfGs_getFishNum(2) ||
         dComIfGs_getFishNum(3) || dComIfGs_getFishNum(4) || dComIfGs_getFishNum(5) ||
@@ -232,7 +224,6 @@ bool dMenu_Collect2D_c::isFishIconVisible() {
     return false;
 }
 
-/* 801B061C-801B071C 1AAF5C 0100+00 2/2 0/0 0/0 .text isSkillIconVisible__17dMenu_Collect2D_cFv */
 bool dMenu_Collect2D_c::isSkillIconVisible() {
         /* dSv_event_flag_c::F_0338 - Secret techniques - Obtained 1 secret techinques - Shield attack */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[338]) ||
@@ -254,8 +245,6 @@ bool dMenu_Collect2D_c::isSkillIconVisible() {
     return false;
 }
 
-/* 801B071C-801B074C 1AB05C 0030+00 2/2 0/0 0/0 .text isInsectIconVisible__17dMenu_Collect2D_cFv
- */
 bool dMenu_Collect2D_c::isInsectIconVisible() {
     return dMenu_Insect_c::getGetInsectNum();
 }
@@ -264,7 +253,6 @@ static u8 const lit_3778[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 801B074C-801B1C3C 1AB08C 14F0+00 1/1 0/0 0/0 .text            screenSet__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::screenSet() {
     static const u64 text_sv[3] = {'sav_0', 'sav_1', 'sav_2'};
     static const u64 text_op[3] = {'opt_0', 'opt_1', 'opt_2',};
@@ -692,8 +680,6 @@ void dMenu_Collect2D_c::screenSet() {
     setPohMaxNum(dComIfGs_getPohSpiritNum());
 }
 
-/* 801B1C3C-801B1CE0 1AC57C 00A4+00 1/1 0/0 0/0 .text            animationSet__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::animationSet() {
     OSInitFastCast();
     void* resource =
@@ -705,8 +691,6 @@ void dMenu_Collect2D_c::animationSet() {
     field_0x3c = 0.0f;
 }
 
-/* 801B1CE0-801B1EDC 1AC620 01FC+00 1/1 0/0 0/0 .text
- * btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey    */
 void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* i_SRTKey) {
     if (i_SRTKey != NULL) {
         mFrame++;
@@ -725,8 +709,6 @@ void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* i_SRTKey) {
     static_cast<J2DTextBox*>(mpScreen->search('modelbg5'))->setAnimation(i_SRTKey);
 }
 
-/* 801B1EDC-801B1FAC 1AC81C 00D0+00 1/1 0/0 0/0 .text            setBackAlpha__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::setBackAlpha() {
     f32 alpha = mpBlackTex->getAlpha() / 150.0f;
 
@@ -770,8 +752,6 @@ void dMenu_Collect2D_c::setBackAlpha() {
     mpBlackTex->setAlpha(alpha * 150.0f);
 }
 
-/* 801B1FAC-801B27EC 1AC8EC 0840+00 1/1 0/0 0/0 .text            cursorMove__17dMenu_Collect2D_cFv
- */
 // Not sure if this works without gotos
 void dMenu_Collect2D_c::cursorMove() {
     u8 dVar1 = mCursorX;
@@ -993,8 +973,6 @@ LAB_802bab54:
     }
 }
 
-/* 801B27EC-801B2A74 1AD12C 0288+00 2/2 0/0 0/0 .text            cursorPosSet__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::cursorPosSet() {
     for (int i = 0; i < 7; i++) {
         for (int j = 0; j < 6; j++) {
@@ -1033,8 +1011,6 @@ void dMenu_Collect2D_c::cursorPosSet() {
     }
 }
 
-/* 801B2A74-801B2D00 1AD3B4 028C+00 1/1 0/0 0/0 .text            changeSword__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::changeSword() {
     switch (mCursorX) {
     case 3:
@@ -1079,8 +1055,6 @@ void dMenu_Collect2D_c::changeSword() {
     }
 }
 
-/* 801B2D00-801B2EE4 1AD640 01E4+00 1/1 0/0 0/0 .text            changeShield__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::changeShield() {
     switch (mCursorX) {
     case 3:
@@ -1116,8 +1090,6 @@ void dMenu_Collect2D_c::changeShield() {
     }
 }
 
-/* 801B2EE4-801B30C8 1AD824 01E4+00 1/1 0/0 0/0 .text            changeClothe__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::changeClothe() {
     switch (mCursorX) {
     case 3:
@@ -1150,7 +1122,6 @@ void dMenu_Collect2D_c::changeClothe() {
     }
 }
 
-/* 801B30C8-801B3340 1ADA08 0278+00 1/1 0/0 0/0 .text setArrowMaxNum__17dMenu_Collect2D_cFUc */
 void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) {
     switch (param_0) {
     case 0:
@@ -1176,7 +1147,6 @@ void dMenu_Collect2D_c::setArrowMaxNum(u8 param_0) {
     }
 }
 
-/* 801B3340-801B3524 1ADC80 01E4+00 1/1 0/0 0/0 .text setWalletMaxNum__17dMenu_Collect2D_cFUs */
 void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) {
     switch (i_walletSize) {
     case 300:
@@ -1197,8 +1167,6 @@ void dMenu_Collect2D_c::setWalletMaxNum(u16 i_walletSize) {
     }
 }
 
-/* 801B3524-801B3640 1ADE64 011C+00 1/1 0/0 0/0 .text            setSmellType__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::setSmellType() {
     static const u64 smell_tag[5] = {
         'wolf_med', 'wolf_chi', 'wolf_fis', 'wolf_iri', 'wolf_pou',
@@ -1230,7 +1198,6 @@ void dMenu_Collect2D_c::setSmellType() {
     }
 }
 
-/* 801B3640-801B370C 1ADF80 00CC+00 1/1 0/0 0/0 .text setHeartPiece__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::setHeartPiece() {
     static const u64 heart_tag[4] = {
         'heart_1n',
@@ -1248,7 +1215,6 @@ void dMenu_Collect2D_c::setHeartPiece() {
     }
 }
 
-/* 801B370C-801B39D0 1AE04C 02C4+00 1/1 0/0 0/0 .text setPohMaxNum__17dMenu_Collect2D_cFUc */
 void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) {
     if (i_pohNum > MAX_POH_NUM) {
         i_pohNum = MAX_POH_NUM;
@@ -1287,8 +1253,6 @@ void dMenu_Collect2D_c::setPohMaxNum(u8 i_pohNum) {
     }
 }
 
-/* 801B39D0-801B3CF4 1AE310 0324+00 2/2 0/0 0/0 .text
- * setEquipItemFrameColorSword__17dMenu_Collect2D_cFi           */
 void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) {
     static const u64 tag[2] = {
         'ken_g_0',
@@ -1346,8 +1310,6 @@ void dMenu_Collect2D_c::setEquipItemFrameColorSword(int i_frame) {
     }
 }
 
-/* 801B3CF4-801B3FDC 1AE634 02E8+00 2/2 0/0 0/0 .text
- * setEquipItemFrameColorShield__17dMenu_Collect2D_cFi          */
 void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) {
     static const u64 tag[2] = {
         'tate_g_0',
@@ -1396,8 +1358,6 @@ void dMenu_Collect2D_c::setEquipItemFrameColorShield(int i_frame) {
     }
 }
 
-/* 801B3FDC-801B42D8 1AE91C 02FC+00 2/2 0/0 0/0 .text
- * setEquipItemFrameColorClothes__17dMenu_Collect2D_cFi         */
 void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) {
     static const u64 tag[3] = {
         'fuku_g_0',
@@ -1450,7 +1410,6 @@ void dMenu_Collect2D_c::setEquipItemFrameColorClothes(int i_frame) {
     }
 }
 
-/* 801B42D8-801B46FC 1AEC18 0424+00 2/2 0/0 0/0 .text            setHIO__17dMenu_Collect2D_cFb */
 void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
     static const u64 kaz_n[9] = {
         'uzu_00', 'uzu_01', 'uzu_02', 'uzu_03', 'uzu_04', 'uzu_05', 'uzu_06', 'uzu_07', 'hishi',
@@ -1540,8 +1499,6 @@ void dMenu_Collect2D_c::setHIO(bool i_useHIO) {
     }
 }
 
-/* 801B46FC-801B473C 1AF03C 0040+00 3/3 0/0 0/0 .text            getItemTag__17dMenu_Collect2D_cFiib
- */
 u64 dMenu_Collect2D_c::getItemTag(int i_tag1, int i_tag2, bool param_3) {
     static const u64 itemTag[6][7] = {
         {0, 0, 0, 'ken_n0', 'ken_n1', 'heart_kn', 'kamen_n'},
@@ -1575,7 +1532,6 @@ u64 dMenu_Collect2D_c::getItemTag(int i_tag1, int i_tag2, bool param_3) {
     return itemTag[i_tag2][i_tag1];
 }
 
-/* 801B473C-801B48D0 1AF07C 0194+00 1/0 0/0 0/0 .text            wait_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::wait_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
 
@@ -1620,7 +1576,6 @@ void dMenu_Collect2D_c::wait_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B48D0-801B4E14 1AF210 0544+00 1/0 0/0 0/0 .text            wait_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::wait_proc() {
     if (dMw_A_TRIGGER()) {
         if (mCursorX == 0 && mCursorY == 5) {
@@ -1724,7 +1679,6 @@ void dMenu_Collect2D_c::wait_proc() {
 }
 
 
-/* 801B4E14-801B4EC0 1AF754 00AC+00 1/0 0/0 0/0 .text save_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpSaveScrn) {
@@ -1739,7 +1693,6 @@ void dMenu_Collect2D_c::save_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B4EC0-801B4F30 1AF800 0070+00 1/0 0/0 0/0 .text save_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSaveScrn->getSaveStatus() == 1) {
@@ -1751,13 +1704,11 @@ void dMenu_Collect2D_c::save_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B4F30-801B4F6C 1AF870 003C+00 1/0 0/0 0/0 .text save_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0);
 }
 
-/* 801B4F6C-801B4FDC 1AF8AC 0070+00 1/0 0/0 0/0 .text save_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSaveScrn->getSaveStatus() == 2) {
@@ -1769,13 +1720,11 @@ void dMenu_Collect2D_c::save_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B4FDC-801B5018 1AF91C 003C+00 1/0 0/0 0/0 .text save_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B5018-801B5094 1AF958 007C+00 1/0 0/0 0/0 .text save_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::save_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSaveScrn->getSaveStatus() == 3) {
@@ -1788,7 +1737,6 @@ void dMenu_Collect2D_c::save_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5094-801B513C 1AF9D4 00A8+00 1/0 0/0 0/0 .text option_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpOptionScrn) {
@@ -1801,7 +1749,6 @@ void dMenu_Collect2D_c::option_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B513C-801B51AC 1AFA7C 0070+00 1/0 0/0 0/0 .text option_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpOptionScrn->getQuitStatus() == 1) {
@@ -1813,13 +1760,11 @@ void dMenu_Collect2D_c::option_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B51AC-801B51E8 1AFAEC 003C+00 1/0 0/0 0/0 .text option_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0x03f9);
 }
 
-/* 801B51E8-801B5258 1AFB28 0070+00 1/0 0/0 0/0 .text option_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpOptionScrn->getQuitStatus() == 2) {
@@ -1831,13 +1776,11 @@ void dMenu_Collect2D_c::option_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5258-801B5294 1AFB98 003C+00 1/0 0/0 0/0 .text option_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B5294-801B5310 1AFBD4 007C+00 1/0 0/0 0/0 .text option_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::option_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpOptionScrn->getQuitStatus() == 3) {
@@ -1850,7 +1793,6 @@ void dMenu_Collect2D_c::option_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5310-801B53AC 1AFC50 009C+00 1/0 0/0 0/0 .text letter_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpLetterScrn) {
@@ -1862,7 +1804,6 @@ void dMenu_Collect2D_c::letter_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B53AC-801B541C 1AFCEC 0070+00 1/0 0/0 0/0 .text letter_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpLetterScrn->getStatus() == 1) {
@@ -1874,13 +1815,11 @@ void dMenu_Collect2D_c::letter_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B541C-801B5458 1AFD5C 003C+00 1/0 0/0 0/0 .text letter_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0x03f9);
 }
 
-/* 801B5458-801B54C8 1AFD98 0070+00 1/0 0/0 0/0 .text letter_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpLetterScrn->getStatus() == 2) {
@@ -1892,13 +1831,11 @@ void dMenu_Collect2D_c::letter_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B54C8-801B5504 1AFE08 003C+00 1/0 0/0 0/0 .text letter_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B5504-801B5580 1AFE44 007C+00 1/0 0/0 0/0 .text letter_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::letter_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpLetterScrn->getStatus() == 3) {
@@ -1911,7 +1848,6 @@ void dMenu_Collect2D_c::letter_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5580-801B561C 1AFEC0 009C+00 1/0 0/0 0/0 .text fishing_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpFishingScrn) {
@@ -1923,7 +1859,6 @@ void dMenu_Collect2D_c::fishing_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B561C-801B568C 1AFF5C 0070+00 1/0 0/0 0/0 .text fishing_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpFishingScrn->getStatus() == 1) {
@@ -1935,13 +1870,11 @@ void dMenu_Collect2D_c::fishing_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B568C-801B56C8 1AFFCC 003C+00 1/0 0/0 0/0 .text fishing_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0x03f9);
 }
 
-/* 801B56C8-801B5738 1B0008 0070+00 1/0 0/0 0/0 .text fishing_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpFishingScrn->getStatus() == 2) {
@@ -1953,13 +1886,11 @@ void dMenu_Collect2D_c::fishing_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5738-801B5774 1B0078 003C+00 1/0 0/0 0/0 .text fishing_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B5774-801B57F0 1B00B4 007C+00 1/0 0/0 0/0 .text fishing_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::fishing_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpFishingScrn->getStatus() == 3) {
@@ -1972,7 +1903,6 @@ void dMenu_Collect2D_c::fishing_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B57F0-801B588C 1B0130 009C+00 1/0 0/0 0/0 .text skill_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpSkillScrn) {
@@ -1984,7 +1914,6 @@ void dMenu_Collect2D_c::skill_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B588C-801B58FC 1B01CC 0070+00 1/0 0/0 0/0 .text skill_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSkillScrn->getStatus() == 1) {
@@ -1996,13 +1925,11 @@ void dMenu_Collect2D_c::skill_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B58FC-801B5938 1B023C 003C+00 1/0 0/0 0/0 .text skill_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0x03f9);
 }
 
-/* 801B5938-801B59A8 1B0278 0070+00 1/0 0/0 0/0 .text skill_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSkillScrn->getStatus() == 2) {
@@ -2014,13 +1941,11 @@ void dMenu_Collect2D_c::skill_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B59A8-801B59E4 1B02E8 003C+00 1/0 0/0 0/0 .text skill_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B59E4-801B5A60 1B0324 007C+00 1/0 0/0 0/0 .text skill_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::skill_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpSkillScrn->getStatus() == 3) {
@@ -2033,7 +1958,6 @@ void dMenu_Collect2D_c::skill_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5A60-801B5B00 1B03A0 00A0+00 1/0 0/0 0/0 .text insect_open_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_open_init() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (!mpInsectScrn) {
@@ -2045,7 +1969,6 @@ void dMenu_Collect2D_c::insect_open_init() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5B00-801B5B70 1B0440 0070+00 1/0 0/0 0/0 .text insect_open_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_open_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpInsectScrn->getStatus() == 1) {
@@ -2057,13 +1980,11 @@ void dMenu_Collect2D_c::insect_open_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5B70-801B5BAC 1B04B0 003C+00 1/0 0/0 0/0 .text insect_move_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_move_init() {
     setAButtonString(0x040c);
     setBButtonString(0x03f9);
 }
 
-/* 801B5BAC-801B5C1C 1B04EC 0070+00 1/0 0/0 0/0 .text insect_move_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_move_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpInsectScrn->getStatus() == 2) {
@@ -2075,13 +1996,11 @@ void dMenu_Collect2D_c::insect_move_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5C1C-801B5C58 1B055C 003C+00 1/0 0/0 0/0 .text insect_close_init__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_close_init() {
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801B5C58-801B5CD4 1B0598 007C+00 1/0 0/0 0/0 .text insect_close_proc__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::insect_close_proc() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     if (mpInsectScrn->getStatus() == 3) {
@@ -2094,7 +2013,6 @@ void dMenu_Collect2D_c::insect_close_proc() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801B5CD4-801B5D70 1B0614 009C+00 1/1 0/0 0/0 .text            _move__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::_move() {
     u8 last_process = mProcess;
     (this->*process[last_process])();
@@ -2108,7 +2026,6 @@ void dMenu_Collect2D_c::_move() {
 }
 
 
-/* 801B5D70-801B5F48 1B06B0 01D8+00 1/1 0/0 0/0 .text            _draw__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::_draw() {
     J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
     grafPort->setup2D();
@@ -2153,13 +2070,10 @@ void dMenu_Collect2D_c::_draw() {
     mpDrawCursor->draw();
 }
 
-/* 801B5F48-801B5F84 1B0888 003C+00 1/1 0/0 0/0 .text            drawTop__17dMenu_Collect2D_cFv */
 void dMenu_Collect2D_c::drawTop() {
     dComIfGd_set2DOpaTop(mpDraw2DTop);
 }
 
-/* 801B5F84-801B5FAC 1B08C4 0028+00 0/0 1/1 0/0 .text            isKeyCheck__17dMenu_Collect2D_cFv
- */
 bool dMenu_Collect2D_c::isKeyCheck() {
     if (mProcess || field_0x25f) {
         return true;
@@ -2167,14 +2081,10 @@ bool dMenu_Collect2D_c::isKeyCheck() {
     return false;
 }
 
-/* 801B5FAC-801B5FB4 1B08EC 0008+00 0/0 1/1 0/0 .text            isOutCheck__17dMenu_Collect2D_cFv
- */
 bool dMenu_Collect2D_c::isOutCheck() {
     return false;
 }
 
-/* 801B5FB4-801B60B8 1B08F4 0104+00 20/20 0/0 0/0 .text setAButtonString__17dMenu_Collect2D_cFUs
- */
 void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) {
     static const u64 text_a_tag[5] = {
         'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -2199,8 +2109,6 @@ void dMenu_Collect2D_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801B60B8-801B61BC 1B09F8 0104+00 20/20 0/0 0/0 .text setBButtonString__17dMenu_Collect2D_cFUs
- */
 void dMenu_Collect2D_c::setBButtonString(u16 i_stringID) {
     static const u64 text_b_tag[5] = {
         'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5',
@@ -2225,8 +2133,6 @@ void dMenu_Collect2D_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801B61BC-801B6344 1B0AFC 0188+00 2/2 0/0 0/0 .text setItemNameString__17dMenu_Collect2D_cFUcUc
- */
 void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) {
     if (field_0x22d[param_0][param_1] == 0) {
         setItemNameStringNull();
@@ -2262,8 +2168,6 @@ void dMenu_Collect2D_c::setItemNameString(u8 param_0, u8 param_1) {
     }
 }
 
-/* 801B6344-801B6454 1B0C84 0110+00 1/1 0/0 0/0 .text setItemNameStringNull__17dMenu_Collect2D_cFv
- */
 void dMenu_Collect2D_c::setItemNameStringNull() {
     mItemNameString = 0;
 #if REGION_JPN
@@ -2286,8 +2190,6 @@ void dMenu_Collect2D_c::setItemNameStringNull() {
     strcpy(textBox->getStringPtr(), "");
 }
 
-/* 801B6454-801B6538 1B0D94 00E4+00 1/1 0/0 0/0 .text
- * __ct__17dMenu_Collect3D_cFP10JKRExpHeapP17dMenu_Collect2D_cP10CSTControl */
 dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c* param_1,
                                      CSTControl* param_2) {
     mIsWolf = daPy_py_c::checkNowWolf();
@@ -2308,7 +2210,6 @@ dMenu_Collect3D_c::dMenu_Collect3D_c(JKRExpHeap* param_0, dMenu_Collect2D_c* par
 }
 
 
-/* 801B6538-801B65A8 1B0E78 0070+00 1/0 0/0 0/0 .text            __dt__17dMenu_Collect3D_cFv */
 dMenu_Collect3D_c::~dMenu_Collect3D_c() {
     if (mpSolidHeap) {
         mDoExt_destroySolidHeap(mpSolidHeap);
@@ -2317,7 +2218,6 @@ dMenu_Collect3D_c::~dMenu_Collect3D_c() {
 }
 
 
-/* 801B65A8-801B6694 1B0EE8 00EC+00 1/1 0/0 0/0 .text            _create__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::_create() {
     mpHeap->getTotalFreeSize();
     mpSolidHeap = mDoExt_createSolidHeapToCurrent(0x25800, mpHeap, 0x20);
@@ -2345,14 +2245,12 @@ void dMenu_Collect3D_c::_create() {
     _move(mpCollect2D->getCursorX(), mpCollect2D->getCursorY());
 }
 
-/* 801B6694-801B66C8 1B0FD4 0034+00 1/1 0/0 0/0 .text            _delete__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::_delete() {
     if (daAlink_getAlinkActorClass()) {
         daAlink_getAlinkActorClass()->resetStatusWindow();
     }
 }
 
-/* 801B66C8-801B696C 1B1008 02A4+00 2/2 0/0 0/0 .text            _move__17dMenu_Collect3D_cFUcUc */
 void dMenu_Collect3D_c::_move(u8 param_0, u8 param_1) {
     cXyz itemPos;
     Vec linkPos = mpCollect2D->getpLink()->getGlobalVtxCenter(false, 0);
@@ -2418,7 +2316,6 @@ void dMenu_Collect3D_c::_move(u8 param_0, u8 param_1) {
     }
 }
 
-/* 801B696C-801B6A30 1B12AC 00C4+00 1/1 0/0 0/0 .text            draw__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::draw() {
     dComIfGd_setListItem3D();
     if (daAlink_getAlinkActorClass()) {
@@ -2433,7 +2330,6 @@ void dMenu_Collect3D_c::draw() {
     dComIfGd_setList();
 }
 
-/* 801B6A30-801B6D30 1B1370 0300+00 2/2 0/0 0/0 .text setJ3D__17dMenu_Collect3D_cFPCcPCcPCc */
 void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const char* param_2) {
     JKRArchive* resArchive = dComIfGp_getCollectResArchive();
     J3DModelData* modelData = J3DModelLoaderDataBase::load(
@@ -2464,7 +2360,6 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c
     }
 }
 
-/* 801B6D30-801B6E70 1B1670 0140+00 2/2 0/0 0/0 .text            set_mtx__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::set_mtx() {
     f32 scale = 0.0f;
     if (getMaskMdlVisible() == 2) {
@@ -2496,7 +2391,6 @@ void dMenu_Collect3D_c::set_mtx() {
 }
 
 
-/* 801B6E70-801B6FB0 1B17B0 0140+00 1/1 0/0 0/0 .text            animePlay__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::animePlay() {
     if (mpBrkAnm != NULL) {
         mMaskMirrorAnmFrameBrk += g_drawHIO.mCollectScreen.mMaskMirrorAnimSpeed;
@@ -2517,8 +2411,6 @@ void dMenu_Collect3D_c::animePlay() {
 }
 
 
-/* 801B6FB0-801B7014 1B18F0 0064+00 1/1 0/0 0/0 .text            animeEntry__17dMenu_Collect3D_cFv
- */
 void dMenu_Collect3D_c::animeEntry() {
     if (mpBrkAnm != NULL) {
         mpBrkAnm->entry(mpModel->getModelData());
@@ -2528,7 +2420,6 @@ void dMenu_Collect3D_c::animeEntry() {
     }
 }
 
-/* 801B7014-801B71C4 1B1954 01B0+00 1/1 0/0 0/0 .text createMaskModel__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::createMaskModel() {
     static const f32 m_kamen_offset_x[5] = {-14.0f, -14.0f, -14.0f, 1.3f, 6.5f};
     static const f32 m_kamen_offset_y[5] = {0.0f, 0.0f, 0.0f, 22.0f, 30.0f};
@@ -2572,7 +2463,6 @@ void dMenu_Collect3D_c::createMaskModel() {
     }
 }
 
-/* 801B71C4-801B7434 1B1B04 0270+00 1/1 0/0 0/0 .text createMirrorModel__17dMenu_Collect3D_cFv */
 void dMenu_Collect3D_c::createMirrorModel() {
     static const f32 m_mirror_offset_x[5] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
     static const f32 m_mirror_offset_y[5] = {4.0f, 4.0f, 4.0f, 4.0f, 4.0f};
@@ -2622,7 +2512,6 @@ void dMenu_Collect3D_c::createMirrorModel() {
     }
 }
 
-/* 801B7434-801B749C 1B1D74 0068+00 5/5 0/0 0/0 .text getCrystalNum__17dMenu_Collect3D_cFv */
 u8 dMenu_Collect3D_c::getCrystalNum() {
     u8 count = 0;
     for (int i = 0; i < 4; i++) {
@@ -2634,8 +2523,6 @@ u8 dMenu_Collect3D_c::getCrystalNum() {
     return count;
 }
 
-/* 801B749C-801B7504 1B1DDC 0068+00 5/5 0/0 0/0 .text            getMirrorNum__17dMenu_Collect3D_cFv
- */
 u8 dMenu_Collect3D_c::getMirrorNum() {
     u8 count = 0;
     for (int i = 0; i < 4; i++) {
@@ -2647,7 +2534,6 @@ u8 dMenu_Collect3D_c::getMirrorNum() {
     return count;
 }
 
-/* 801B7504-801B75E8 1B1E44 00E4+00 4/4 0/0 0/0 .text getMaskMdlVisible__17dMenu_Collect3D_cFv */
 u8 dMenu_Collect3D_c::getMaskMdlVisible() {
     if ((getCrystalNum() == 0 && getMirrorNum() == 0) ||
          /* dSv_event_flag_c::M_071 - Cutscene - [cutscene: 20] Zant appears (during Midna's desperate hour) */
@@ -2663,11 +2549,8 @@ u8 dMenu_Collect3D_c::getMaskMdlVisible() {
     return 2;
 }
 
-/* 80450720-80450728 0001A0 0004+04 1/1 0/0 1/1 .sdata           mViewOffsetY__17dMenu_Collect3D_c
- */
 f32 dMenu_Collect3D_c::mViewOffsetY = -100.0f;
 
-/* 801B75E8-801B7660 1B1F28 0078+00 0/0 1/1 0/0 .text setupItem3D__17dMenu_Collect3D_cFPA4_f */
 void dMenu_Collect3D_c::setupItem3D(Mtx param_0) {
     GXSetViewport(0.0f, mViewOffsetY, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
     mViewOffsetY = -100.0f;
@@ -2677,8 +2560,6 @@ void dMenu_Collect3D_c::setupItem3D(Mtx param_0) {
     calcViewMtx(param_0);
 }
 
-/* 801B7660-801B774C 1B1FA0 00EC+00 1/1 0/0 0/0 .text toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz
- */
 #pragma push
 #pragma optimization_level 2
 void dMenu_Collect3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz* param_3) {
@@ -2697,13 +2578,11 @@ void dMenu_Collect3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cXyz*
 }
 #pragma pop
 
-/* 801B774C-801B77A4 1B208C 0058+00 2/2 0/0 0/0 .text calcViewMtx__17dMenu_Collect3D_cFPA4_f */
 void dMenu_Collect3D_c::calcViewMtx(Mtx param_0) {
     mDoMtx_lookAt(param_0, &cXyz(0.0f, 0.0f, -1000.0f), &cXyz::Zero, &cXyz(0.0f, 1.0f, 0.0f), 0);
 }
 
 
-/* 801B77A4-801B78C0 1B20E4 011C+00 1/0 0/0 0/0 .text            draw__20dMenu_Collect2DTop_cFv */
 void dMenu_Collect2DTop_c::draw() {
     J2DGrafContext* graf_port = dComIfGp_getCurrentGrafPort();
     graf_port->setup2D();
@@ -2733,14 +2612,11 @@ void dMenu_Collect2DTop_c::draw() {
     }
 }
 
-/* 801B78C0-801B795C 1B2200 009C+00 0/0 1/1 0/0 .text
- * __ct__15dMenu_Collect_cFP10JKRExpHeapP9STControlP10CSTControl */
 dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) {
     mpCollect2D = new dMenu_Collect2D_c(param_0, param_1, param_2);
     mpCollect3D = new dMenu_Collect3D_c(param_0, mpCollect2D, param_2);
 }
 
-/* 801B795C-801B7A0C 1B229C 00B0+00 1/0 0/0 0/0 .text            __dt__15dMenu_Collect_cFv */
 dMenu_Collect_c::~dMenu_Collect_c() {
     if (mpCollect2D) {
         delete mpCollect2D;
@@ -2753,25 +2629,21 @@ dMenu_Collect_c::~dMenu_Collect_c() {
 }
 
 
-/* 801B7A0C-801B7A44 1B234C 0038+00 0/0 1/1 0/0 .text            _create__15dMenu_Collect_cFv */
 void dMenu_Collect_c::_create() {
     mpCollect2D->_create();
     mpCollect3D->_create();
 }
 
-/* 801B7A44-801B7A7C 1B2384 0038+00 0/0 1/1 0/0 .text            _delete__15dMenu_Collect_cFv */
 void dMenu_Collect_c::_delete() {
     mpCollect2D->_delete();
     mpCollect3D->_delete();
 }
 
-/* 801B7A7C-801B7AC0 1B23BC 0044+00 0/0 1/1 0/0 .text            _move__15dMenu_Collect_cFv */
 void dMenu_Collect_c::_move() {
     mpCollect2D->_move();
     mpCollect3D->_move(mpCollect2D->getCursorX(), mpCollect2D->getCursorY());
 }
 
-/* 801B7AC0-801B7B14 1B2400 0054+00 0/0 1/1 0/0 .text            draw__15dMenu_Collect_cFv */
 void dMenu_Collect_c::draw() {
     dComIfGd_set2DOpa(mpCollect2D);
     mpCollect3D->draw();
diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp
index a66c8af4c8..4e22a4cb12 100644
--- a/src/d/d_menu_dmap.cpp
+++ b/src/d/d_menu_dmap.cpp
@@ -78,8 +78,6 @@ static ProcFunc map_move_process[3] = {
     &dMenu_Dmap_c::zoomOut_proc,
 };
 
-/* 801B7F20-801B8110 1B2860 01F0+00 1/1 0/0 0/0 .text
- * __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl              */
 dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) {
     mpHeap = i_heap;
     mpStick = i_stick;
@@ -136,8 +134,6 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) {
     field_0xdd0 = 0;
 }
 
-/* 801B8110-801B884C 1B2A50 073C+00 1/1 0/0 0/0 .text            mapScreenInit__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::mapScreenInit() {
     for (int i = 0; i < 2; i++) {
         mMapScreen[i] = new J2DScreen();
@@ -222,8 +218,6 @@ void dMenu_DmapBg_c::mapScreenInit() {
     }
 }
 
-/* 801B884C-801B88F4 1B318C 00A8+00 1/1 0/0 0/0 .text            mapScreenAnime__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::mapScreenAnime() {
     if (0.0f == field_0xd94 && 0.0f == field_0xd98) {
         for (int i = 0; i < 1; i++) {
@@ -237,7 +231,6 @@ void dMenu_DmapBg_c::mapScreenAnime() {
     }
 }
 
-/* 801B88F4-801B893C 1B3234 0048+00 1/1 0/0 0/0 .text mapIconScaleSet__14dMenu_DmapBg_cFUc */
 void dMenu_DmapBg_c::mapIconScaleSet(u8 param_1) {
     f32 fVar1;
     f32 fVar2;
@@ -252,7 +245,6 @@ void dMenu_DmapBg_c::mapIconScaleSet(u8 param_1) {
     iconScale(1, fVar1, fVar1, fVar2);
 }
 
-/* 801B893C-801B8954 1B327C 0018+00 2/2 0/0 0/0 .text iconScaleAnmInit__14dMenu_DmapBg_cFffUc */
 void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2) {
     field_0xdac = param_0;
     field_0xdb0 = param_1;
@@ -260,7 +252,6 @@ void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2) {
     field_0xdd2 = 0;
 }
 
-/* 801B8954-801B8A0C 1B3294 00B8+00 2/2 0/0 0/0 .text            iconScaleAnm__14dMenu_DmapBg_cFv */
 bool dMenu_DmapBg_c::iconScaleAnm() {
     bool rv = false;
     if (field_0xdd2 > field_0xdd1) {
@@ -289,7 +280,6 @@ bool dMenu_DmapBg_c::iconScaleAnm() {
     return rv;
 }
 
-/* 801B8A0C-801B8DE4 1B334C 03D8+00 1/1 0/0 0/0 .text buttonIconScreenInit__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::buttonIconScreenInit() {
     static u64 const cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
     static u64 const cont_bt[5] = {'cont_bt', 'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4'};
@@ -379,7 +369,6 @@ void dMenu_DmapBg_c::buttonIconScreenInit() {
     field_0xcf4->paneTrans(321.0f, 0.0f);
 }
 
-/* 801B8DE4-801B8EBC 1B3724 00D8+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_DmapBg_cFUl */
 void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
     static u64 const cont_at[5] = {
         #if VERSION == VERSION_GCN_JPN
@@ -397,7 +386,6 @@ void dMenu_DmapBg_c::setAButtonString(u32 i_msgNo) {
     }
 }
 
-/* 801B8EBC-801B8F94 1B37FC 00D8+00 8/8 0/0 0/0 .text setBButtonString__14dMenu_DmapBg_cFUl */
 void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) {
     static u64 const cont_bt[5] = {
         #if VERSION == VERSION_GCN_JPN
@@ -415,16 +403,12 @@ void dMenu_DmapBg_c::setBButtonString(u32 i_msgNo) {
     }
 }
 
-/* 80451078-8045107C 000578 0004+00 1/1 0/0 0/0 .sbss            player_px */
 static f32 player_px;
 
-/* 8045107C-80451080 00057C 0004+00 1/1 0/0 0/0 .sbss            player_py */
 static f32 player_py;
 
-/* 80451080-80451088 000580 0004+04 6/6 0/0 0/0 .sbss            myclass__12dMenu_Dmap_c */
 dMenu_Dmap_c* dMenu_Dmap_c::myclass;
 
-/* 801B8F94-801B90BC 1B38D4 0128+00 1/1 0/0 0/0 .text setCButtonString__14dMenu_DmapBg_cFUl */
 void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) {
     static u64 const c_tag[2] = {
         #if VERSION == VERSION_GCN_JPN
@@ -455,13 +439,10 @@ void dMenu_DmapBg_c::setCButtonString(u32 i_msgNo) {
     }
 }
 
-/* 801B90BC-801B90E0 1B39FC 0024+00 1/1 0/0 0/0 .text setJButtonString__14dMenu_DmapBg_cFUl */
 void dMenu_DmapBg_c::setJButtonString(u32 i_msgNo) {
     dMenu_Dmap_c::myclass->isMapMoveState();
 }
 
-/* 801B90E0-801B9164 1B3A20 0084+00 1/1 0/0 0/0 .text            createExplain__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::createExplain() {
     if (mpItemExplain == NULL) {
         JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap);
@@ -472,8 +453,6 @@ void dMenu_DmapBg_c::createExplain() {
     }
 }
 
-/* 801B9164-801B91DC 1B3AA4 0078+00 2/2 0/0 0/0 .text            deleteExplain__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::deleteExplain() {
     if (mpItemExplain != NULL) {
         JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap);
@@ -483,8 +462,6 @@ void dMenu_DmapBg_c::deleteExplain() {
     }
 }
 
-/* 801B91DC-801B944C 1B3B1C 0270+00 1/1 0/0 0/0 .text            baseScreenInit__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::baseScreenInit() {
     mBaseScreen = new J2DScreen();
     JUT_ASSERT(1336, mBaseScreen != NULL);
@@ -533,8 +510,6 @@ void dMenu_DmapBg_c::baseScreenInit() {
     }
 }
 
-/* 801B944C-801BA0B4 1B3D8C 0C68+00 1/1 0/0 0/0 .text            setFloorMessage__14dMenu_DmapBg_cFv
- */
 void dMenu_DmapBg_c::setFloorMessage() {
     int var_r26 = -5;
 
@@ -659,13 +634,11 @@ void dMenu_DmapBg_c::setFloorMessage() {
     }
 }
 
-/* 801BA0B4-801BA0BC 1B49F4 0008+00 1/1 0/0 0/0 .text dpdMove__14dMenu_DmapBg_cFScScScPUcUc */
 bool dMenu_DmapBg_c::dpdMove(s8 param_0, s8 param_1, s8 param_2, u8* param_3, u8 param_4) {
     bool var_r31 = false;
     return var_r31;
 }
 
-/* 801BA0BC-801BA60C 1B49FC 0550+00 2/1 0/0 0/0 .text            __dt__14dMenu_DmapBg_cFv */
 dMenu_DmapBg_c::~dMenu_DmapBg_c() {
     dComIfGp_getDmapResArchive()->removeResourceAll();
     delete mString;
@@ -788,7 +761,6 @@ dMenu_DmapBg_c::~dMenu_DmapBg_c() {
     }
 }
 
-/* 801BA60C-801BA700 1B4F4C 00F4+00 2/2 0/0 0/0 .text setAllAlphaRate__14dMenu_DmapBg_cFfb */
 void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
     field_0xd9c = i_rate;
 
@@ -821,7 +793,6 @@ void dMenu_DmapBg_c::setAllAlphaRate(f32 i_rate, bool param_2) {
     }
 }
 
-/* 801BA700-801BA7F0 1B5040 00F0+00 3/3 0/0 0/0 .text setGoldAnimation__14dMenu_DmapBg_cFb */
 void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
     J2DPane* gold0 = mMapScreen[0]->search('gold00_0');
     J2DPane* gold1 = mMapScreen[0]->search('gold00_1');
@@ -835,7 +806,6 @@ void dMenu_DmapBg_c::setGoldAnimation(bool param_1) {
     }
 }
 
-/* 801BA7F0-801BA974 1B5130 0184+00 3/3 0/0 0/0 .text setGoldFrameAlphaRate__14dMenu_DmapBg_cFf */
 void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) {
     if (0.0f == i_rate) {
         mMapScreen[0]->search('gold00_0')->hide();
@@ -848,7 +818,6 @@ void dMenu_DmapBg_c::setGoldFrameAlphaRate(f32 i_rate) {
     }
 }
 
-/* 801BA974-801BAA4C 1B52B4 00D8+00 1/1 0/0 0/0 .text addGoldFrameAlphaRate__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::addGoldFrameAlphaRate() {
     f32 rate;
     if (field_0xdd7 >= g_fmapHIO.mDisplayFrameNum) {
@@ -865,7 +834,6 @@ void dMenu_DmapBg_c::addGoldFrameAlphaRate() {
     setGoldFrameAlphaRate(rate);
 }
 
-/* 801BAA4C-801BAB10 1B538C 00C4+00 1/1 0/0 0/0 .text decGoldFrameAlphaRate__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::decGoldFrameAlphaRate() {
     f32 rate;
     setGoldAnimation(false);
@@ -885,7 +853,6 @@ void dMenu_DmapBg_c::decGoldFrameAlphaRate() {
     setGoldFrameAlphaRate(rate);
 }
 
-/* 801BAB10-801BB334 1B5450 0824+00 1/0 0/0 0/0 .text            draw__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::draw() {
     u32 scissor_left;
     u32 scissor_top;
@@ -987,7 +954,6 @@ void dMenu_DmapBg_c::draw() {
     grafContext->setup2D();
 }
 
-/* 801BB334-801BB464 1B5C74 0130+00 1/1 0/0 0/0 .text            update__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::update() {
     if (mpArchiveMount != NULL) {
         if (mpArchiveMount->sync() && mpArchive == NULL) {
@@ -1014,16 +980,12 @@ void dMenu_DmapBg_c::update() {
     }
 }
 
-/* 801BB464-801BB468 1B5DA4 0004+00 1/1 0/0 0/0 .text            calcCursor__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::calcCursor() {}
 
-/* 801BB468-801BB498 1B5DA8 0030+00 1/1 0/0 0/0 .text            drawCursor__14dMenu_DmapBg_cFv */
 void dMenu_DmapBg_c::drawCursor() {
     mpDrawCursor->draw();
 }
 
-/* 801BB498-801BB634 1B5DD8 019C+00 0/0 1/1 0/0 .text
- * __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc */
 dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl* param_3,
                            u8 param_4, u8 param_5) {
     dMeter2Info_setMapDrugFlag(0);
@@ -1097,7 +1059,6 @@ dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_1, STControl* param_2, CSTControl*
     mpDresArchive = 0;
 }
 
-/* 801BB634-801BC788 1B5F74 1154+00 1/1 0/0 0/0 .text            screenInit__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::screenInit() {
     static u64 const floor_tag[8] = {'floor7_n', 'floor0_n', 'floor1_n', 'floor2_n',
                                      'floor3_n', 'floor4_n', 'floor5_n', 'floor6_n'};
@@ -1312,7 +1273,6 @@ void dMenu_Dmap_c::screenInit() {
     field_0x98->hide();
 }
 
-/* 801BC788-801BC848 1B70C8 00C0+00 1/1 0/0 0/0 .text getPlayerIconPos__12dMenu_Dmap_cFScf */
 void dMenu_Dmap_c::getPlayerIconPos(s8 i_floorNo, f32 param_2) {
     if (i_floorNo == field_0x172) {
         f32 pos_x;
@@ -1325,7 +1285,6 @@ void dMenu_Dmap_c::getPlayerIconPos(s8 i_floorNo, f32 param_2) {
     }
 }
 
-/* 801BC848-801BCDF4 1B7188 05AC+00 2/2 0/0 0/0 .text            getIconPos__12dMenu_Dmap_cFScf */
 void dMenu_Dmap_c::getIconPos(s8 i_floorNo, f32 param_2) {
     f32 pos_x;
     f32 pos_y;
@@ -1443,7 +1402,6 @@ void dMenu_Dmap_c::getIconPos(s8 i_floorNo, f32 param_2) {
     getPlayerIconPos(i_floorNo, param_2);
 }
 
-/* 801BCDF4-801BD144 1B7734 0350+00 1/0 0/0 0/0 .text            __dt__12dMenu_Dmap_cFv */
 dMenu_Dmap_c::~dMenu_Dmap_c() {
     s32 iVar2 = field_0xe8->getTotalFreeSize();
     s32 iVar4 = field_0xe8->getTotalFreeSize();
@@ -1538,20 +1496,16 @@ dMenu_Dmap_c::~dMenu_Dmap_c() {
     dMenu_Dmap_c::myclass = NULL;
 }
 
-/* 801BD1D4-801BD1E8 1B7B14 0014+00 10/10 0/0 0/0 .text            getCurFloorPos__12dMenu_Dmap_cFv
- */
 s8 dMenu_Dmap_c::getCurFloorPos() {
     s8 i_floor = field_0x16c - mBottomFloor;
     JUT_ASSERT(3393, i_floor >= 0 && i_floor < (8));
     return i_floor;
 }
 
-/* 801BD1E8-801BD208 1B7B28 0020+00 4/4 0/0 0/0 .text getDefaultCurFloorPos__12dMenu_Dmap_cFv */
 s8 dMenu_Dmap_c::getDefaultCurFloorPos() {
     return getCurFloorPos();
 }
 
-/* 801BD208-801BD3B8 1B7B48 01B0+00 4/4 0/0 0/0 .text            iconMoveCalc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::iconMoveCalc() {
     s32 iVar7 = ((s16)field_0x172 - (s16)mBottomFloor);
     mStayIcon[0]->show();
@@ -1576,8 +1530,6 @@ void dMenu_Dmap_c::iconMoveCalc() {
     }
 }
 
-/* 801BD3B8-801BD524 1B7CF8 016C+00 1/1 0/0 0/0 .text
- * drawFloorScreenBack__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph */
 void dMenu_Dmap_c::drawFloorScreenBack(J2DScreen* i_screen, f32 i_transX, f32 i_transY,
                                        J2DOrthoGraph* i_ortho) {
     for (int i = 0; i < getFloorAll(); i++) {
@@ -1605,8 +1557,6 @@ void dMenu_Dmap_c::drawFloorScreenBack(J2DScreen* i_screen, f32 i_transX, f32 i_
     i_screen->draw(i_transX, i_transY, i_ortho);
 }
 
-/* 801BD524-801BD690 1B7E64 016C+00 1/1 0/0 0/0 .text
- * drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph */
 void dMenu_Dmap_c::drawFloorScreenTop(J2DScreen* i_screen, f32 i_transX, f32 i_transY,
                                       J2DOrthoGraph* i_ortho) {
     for (int i = 0; i < getFloorAll(); i++) {
@@ -1634,7 +1584,6 @@ void dMenu_Dmap_c::drawFloorScreenTop(J2DScreen* i_screen, f32 i_transX, f32 i_t
     i_screen->draw(i_transX, i_transY, i_ortho);
 }
 
-/* 801BD690-801BD6C4 1B7FD0 0034+00 3/3 0/0 0/0 .text            isMapMoveState__12dMenu_Dmap_cFv */
 bool dMenu_Dmap_c::isMapMoveState() {
     field_0x184 = true;
     if (mMapCtrl->getDisableZoomMoveFlgX() == true && mMapCtrl->getDisableZoomMoveFlgZ() == true) {
@@ -1644,8 +1593,6 @@ bool dMenu_Dmap_c::isMapMoveState() {
     return field_0x184;
 }
 
-/* 801BD6C4-801BD7C0 1B8004 00FC+00 1/1 0/0 0/0 .text            floorChangeMode__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::floorChangeMode() {
     if (field_0x16d > field_0x16c) {
         field_0x16e = field_0x16c;
@@ -1674,7 +1621,6 @@ void dMenu_Dmap_c::floorChangeMode() {
     }
 }
 
-/* 801BD7C0-801BDD40 1B8100 0580+00 1/1 0/0 0/0 .text            _create__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::_create() {
     u32 sp30 = field_0xe8->getTotalFreeSize();
     OS_REPORT("MenuDmap create前 最大===========> %d bytes max\n", field_0xe8->getFreeSize());
@@ -1798,7 +1744,6 @@ void dMenu_Dmap_c::_create() {
     (this->*map_init_process[field_0x17e])();
 }
 
-/* 801BDDA4-801BDEF8 1B86E4 0154+00 0/0 1/1 0/0 .text            _move__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::_move() {
     u8 prev_process = m_process;
     JKRHeap* prev_heap = mDoExt_setCurrentHeap(mDmapHeap);
@@ -1839,18 +1784,15 @@ void dMenu_Dmap_c::_move() {
     mDoExt_setCurrentHeap(prev_heap);
 }
 
-/* 801BDEF8-801BDF48 1B8838 0050+00 1/1 0/0 0/0 .text            setMapTexture__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::setMapTexture() {
     f32 mapBlendPer = mMapCtrl->getMapBlendPer();
     mpDrawBg->getMapPane()->setBlendRatio(mapBlendPer, 1.0f - mapBlendPer);
 }
 
-/* 801BDF48-801BDF6C 1B8888 0024+00 1/1 0/0 0/0 .text            mapBgAnime__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::mapBgAnime() {
     mpDrawBg->mapScreenAnime();
 }
 
-/* 801BDF6C-801BE328 1B88AC 03BC+00 1/1 0/0 0/0 .text            mapControl__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::mapControl() {
     u8 temp_r27 = field_0x17e;
     if (m_process == 0 || field_0x183 == 0) {
@@ -1931,7 +1873,6 @@ void dMenu_Dmap_c::mapControl() {
     }
 }
 
-/* 801BE328-801BE670 1B8C68 0348+00 0/0 1/1 0/0 .text            isOpen__12dMenu_Dmap_cFv */
 bool dMenu_Dmap_c::isOpen() {
     bool var_r28 = false;
     bool var_r27 = false;
@@ -2003,7 +1944,6 @@ bool dMenu_Dmap_c::isOpen() {
     return var_r28;
 }
 
-/* 801BE670-801BE7E0 1B8FB0 0170+00 0/0 1/1 0/0 .text            isClose__12dMenu_Dmap_cFv */
 bool dMenu_Dmap_c::isClose() {
     bool var_r30 = true;
     bool var_r29 = false;
@@ -2043,7 +1983,6 @@ bool dMenu_Dmap_c::isClose() {
     return var_r30;
 }
 
-/* 801BE7E0-801BEAFC 1B9120 031C+00 0/0 1/1 0/0 .text            _draw__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::_draw() {
     if (mMapCtrl != NULL) {
         mMapCtrl->draw();
@@ -2104,18 +2043,15 @@ void dMenu_Dmap_c::_draw() {
     }
 }
 
-/* 801BEAFC-801BEB0C 1B943C 0010+00 1/0 0/0 0/0 .text itemInfo_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::itemInfo_init_proc() {
     m_itemSubProcess = 0;
     field_0x185 = 0;
 }
 
-/* 801BEB0C-801BEB44 1B944C 0038+00 1/0 0/0 0/0 .text            itemInfo_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::itemInfo_proc() {
     (this->*itemInfo_subProcess[m_itemSubProcess])();
 }
 
-/* 801BEB44-801BEF28 1B9484 03E4+00 1/0 0/0 0/0 .text            itemSelect__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::itemSelect() {
     if (mpDrawBg->field_0xdd4 == -99 && mpDrawBg->field_0xdd5 == 0xFF) {
         mSelStick->checkTrigger();
@@ -2207,7 +2143,6 @@ void dMenu_Dmap_c::itemSelect() {
     }
 }
 
-/* 801BEF28-801BEFCC 1B9868 00A4+00 1/1 0/0 0/0 .text            getNextItem__12dMenu_Dmap_cFi */
 int dMenu_Dmap_c::getNextItem(int param_0) {
     if (!itemCarryCheck()) {
         return -1;
@@ -2232,8 +2167,6 @@ int dMenu_Dmap_c::getNextItem(int param_0) {
     return var_r28;
 }
 
-/* 801BEFCC-801BF030 1B990C 0064+00 1/1 0/0 0/0 .text            itemSelectAnmInit__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::itemSelectAnmInit() {
     field_0x94->hide();
     field_0x88[field_0x178]->scaleAnimeStart(0);
@@ -2241,7 +2174,6 @@ void dMenu_Dmap_c::itemSelectAnmInit() {
     m_itemSubProcess = 1;
 }
 
-/* 801BF030-801BF180 1B9970 0150+00 1/0 0/0 0/0 .text            itemSelectAnm__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::itemSelectAnm() {
     bool temp_r29 = field_0x88[field_0x178]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
     bool temp_r28 = field_0x88[field_0x177]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
@@ -2257,13 +2189,10 @@ void dMenu_Dmap_c::itemSelectAnm() {
     }
 }
 
-/* 801BF180-801BF18C 1B9AC0 000C+00 1/0 0/0 0/0 .text            itemInfoOpenAnm__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::itemInfoOpenAnm() {
     m_itemSubProcess = 3;
 }
 
-/* 801BF18C-801BF278 1B9ACC 00EC+00 1/0 0/0 0/0 .text            itemInfoWait__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::itemInfoWait() {
     mpDrawBg->getItemExplainPtr()->move();
 
@@ -2291,8 +2220,6 @@ void dMenu_Dmap_c::itemInfoWait() {
     }
 }
 
-/* 801BF278-801BF334 1B9BB8 00BC+00 1/0 0/0 0/0 .text            itemInfoCloseAnm__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::itemInfoCloseAnm() {
     bool var_r30 = false;
     mpDrawBg->getItemExplainPtr()->move();
@@ -2322,7 +2249,6 @@ void dMenu_Dmap_c::itemInfoCloseAnm() {
     }
 }
 
-/* 801BF334-801BF410 1B9C74 00DC+00 0/0 1/1 0/0 .text            getNextStatus__12dMenu_Dmap_cFv */
 u8 dMenu_Dmap_c::getNextStatus() {
     if (POINTER_OPT != 0) {
         if ((dMw_LEFT_TRIGGER() || (dMw_B_TRIGGER() && (!getZoomState() || (m_process == 0 && m_itemSubProcess == 0)))) && !isKeyCheck()) {
@@ -2347,7 +2273,6 @@ u8 dMenu_Dmap_c::getNextStatus() {
     return 0;
 }
 
-/* 801BF410-801BF464 1B9D50 0054+00 1/1 1/1 0/0 .text            isSync__12dMenu_Dmap_cFv */
 bool dMenu_Dmap_c::isSync() {
     if (mpDrawBg != NULL && (mpDrawBg->mpArchiveMount != NULL) && !mpDrawBg->mpArchiveMount->sync()) {
         return false;
@@ -2360,7 +2285,6 @@ bool dMenu_Dmap_c::isSync() {
     return true;
 }
 
-/* 801BF464-801BF4A4 1B9DA4 0040+00 1/1 0/0 0/0 .text            isKeyCheck__12dMenu_Dmap_cFv */
 bool dMenu_Dmap_c::isKeyCheck() {
     if (!isSync()) {
         return true;
@@ -2369,8 +2293,6 @@ bool dMenu_Dmap_c::isKeyCheck() {
     return field_0x185;
 }
 
-/* 801BF4A4-801BF528 1B9DE4 0084+00 1/0 0/0 0/0 .text infoModeChange_init_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::infoModeChange_init_proc() {
     field_0x10->hide();
     mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2378,7 +2300,6 @@ void dMenu_Dmap_c::infoModeChange_init_proc() {
     field_0x88[field_0x177]->scaleAnimeStart(0);
 }
 
-/* 801BF528-801BF688 1B9E68 0160+00 1/0 0/0 0/0 .text infoModeChange_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::infoModeChange_proc() {
     bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
     bool temp_r27 = mSelFloor[getCurFloorPos()]->alphaAnime(field_0x179, 0xFF, 0x80, 0);
@@ -2396,7 +2317,6 @@ void dMenu_Dmap_c::infoModeChange_proc() {
     iconMoveCalc();
 }
 
-/* 801BF688-801BF70C 1B9FC8 0084+00 1/0 0/0 0/0 .text mapModeChange_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::mapModeChange_init_proc() {
     field_0x94->hide();
     mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2404,7 +2324,6 @@ void dMenu_Dmap_c::mapModeChange_init_proc() {
     field_0x88[field_0x177]->scaleAnimeStart(0);
 }
 
-/* 801BF70C-801BF8A0 1BA04C 0194+00 1/0 0/0 0/0 .text mapModeChange_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::mapModeChange_proc() {
     bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
     bool temp_r27 = mSelFloor[getCurFloorPos()]->alphaAnime(field_0x179, 0x80, 0xFF, 0);
@@ -2424,14 +2343,12 @@ void dMenu_Dmap_c::mapModeChange_proc() {
     iconMoveCalc();
 }
 
-/* 801BF8A0-801BF8F8 1BA1E0 0058+00 1/0 0/0 0/0 .text lv5_talk_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::lv5_talk_init_proc() {
     field_0x185 = true;
     dMsgObject_setTalkHeap(mpDrawBg->mpTalkHeap);
     mpDrawBg->mMsgFlow.init(NULL, 0x202, 0, NULL);
 }
 
-/* 801BF8F8-801BF9D4 1BA238 00DC+00 1/0 0/0 0/0 .text            lv5_talk_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::lv5_talk_proc() {
     u16 msg_status = dMsgObject_c::getStatus();
     if (msg_status == 15 || msg_status == 16) {
@@ -2457,13 +2374,10 @@ void dMenu_Dmap_c::lv5_talk_proc() {
     }
 }
 
-/* 801BF9D4-801BF9E0 1BA314 000C+00 1/0 0/0 0/0 .text            mapMode_init_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::mapMode_init_proc() {
     field_0x185 = false;
 }
 
-/* 801BF9E0-801BFA84 1BA320 00A4+00 1/0 0/0 0/0 .text            mapMode_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::mapMode_proc() {
     u8 temp_r30 = field_0x17d;
     if (mpDrawBg->field_0xdd4 == -99 && mpDrawBg->field_0xdd5 == 0xFF) {
@@ -2477,11 +2391,8 @@ void dMenu_Dmap_c::mapMode_proc() {
     }
 }
 
-/* 801BFA84-801BFA88 1BA3C4 0004+00 1/0 0/0 0/0 .text floorSelect_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::floorSelect_init_proc() {}
 
-/* 801BFA88-801BFC78 1BA3C8 01F0+00 1/0 0/0 0/0 .text            floorSelect_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::floorSelect_proc() {
     if (field_0x16d != field_0x16c) {
         floorChangeMode();
@@ -2515,7 +2426,6 @@ void dMenu_Dmap_c::floorSelect_proc() {
     }
 }
 
-/* 801BFC78-801BFCAC 1BA5B8 0034+00 2/2 0/0 0/0 .text            itemCarryCheck__12dMenu_Dmap_cFv */
 int dMenu_Dmap_c::itemCarryCheck() {
     int var_r29 = 0;
     for (int i = 0; i < 3; i++) {
@@ -2527,7 +2437,6 @@ int dMenu_Dmap_c::itemCarryCheck() {
     return var_r29;
 }
 
-/* 801BFCAC-801BFD5C 1BA5EC 00B0+00 1/0 0/0 0/0 .text floorChange_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::floorChange_init_proc() {
     field_0x10->hide();
     mSelFloor[getCurFloorPos()]->scaleAnimeStart(0);
@@ -2536,8 +2445,6 @@ void dMenu_Dmap_c::floorChange_init_proc() {
     mSelFloor[getFloorPos(field_0x16e)]->alphaAnimeStart(0);
 }
 
-/* 801BFD5C-801BFF84 1BA69C 0228+00 1/0 0/0 0/0 .text            floorChange_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::floorChange_proc() {
     bool temp_r29 = mSelFloor[getCurFloorPos()]->scaleAnime(field_0x179, 0.9f, 1.0f, 0);
     bool temp_r28 = mSelFloor[getFloorPos(field_0x16e)]->scaleAnime(field_0x179, 1.0f, 0.9f, 0);
@@ -2557,10 +2464,8 @@ void dMenu_Dmap_c::floorChange_proc() {
     iconMoveCalc();
 }
 
-/* 801BFF84-801BFF88 1BA8C4 0004+00 1/0 0/0 0/0 .text zoomWait_init_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::zoomWait_init_proc() {}
 
-/* 801BFF88-801C008C 1BA8C8 0104+00 1/0 0/0 0/0 .text            zoomWait_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::zoomWait_proc() {
     if (m_process == 1) {
         if (mDoCPd_c::getTrigA(PAD_1) && (((POINTER_OPT == 1 && mpDrawBg->field_0xdd3 != 0xFF) || POINTER_OPT == 0) && !dMeter2Info_isTouchKeyCheck(0xC))) {
@@ -2580,8 +2485,6 @@ void dMenu_Dmap_c::zoomWait_proc() {
     }
 }
 
-/* 801C008C-801C01A0 1BA9CC 0114+00 1/0 0/0 0/0 .text            zoomIn_init_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::zoomIn_init_proc() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 
@@ -2609,7 +2512,6 @@ void dMenu_Dmap_c::zoomIn_init_proc() {
     mJMessageNum = 0;
 }
 
-/* 801C01A0-801C023C 1BAAE0 009C+00 1/0 0/0 0/0 .text            zoomIn_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::zoomIn_proc() {
     bool temp_r30 = mMapCtrl->isEndZoomIn();
     bool temp_r29 = mpDrawBg->iconScaleAnm();
@@ -2625,8 +2527,6 @@ void dMenu_Dmap_c::zoomIn_proc() {
     }
 }
 
-/* 801C023C-801C02F0 1BAB7C 00B4+00 1/0 0/0 0/0 .text            zoomOut_init_proc__12dMenu_Dmap_cFv
- */
 void dMenu_Dmap_c::zoomOut_init_proc() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     mMapCtrl->initZoomOut(10);
@@ -2641,7 +2541,6 @@ void dMenu_Dmap_c::zoomOut_init_proc() {
     mJMessageNum = 0;
 }
 
-/* 801C02F0-801C0380 1BAC30 0090+00 1/0 0/0 0/0 .text            zoomOut_proc__12dMenu_Dmap_cFv */
 void dMenu_Dmap_c::zoomOut_proc() {
     bool temp_r30 = mMapCtrl->isEndZoomOut();
     bool temp_r29 = mpDrawBg->iconScaleAnm();
diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp
index 09e59baa9c..c98d396a58 100644
--- a/src/d/d_menu_dmap_map.cpp
+++ b/src/d/d_menu_dmap_map.cpp
@@ -16,13 +16,10 @@ struct dMdm_HIO_prm_res_dst_s {
     static void* m_res;
 };
 
-/* 801C084C-801C086C 1BB18C 0020+00 1/0 0/0 0/0 .text            hasMap__15renderingDmap_cCFv */
 bool renderingDmap_c::hasMap() const {
     return dMapInfo_n::chkGetMap();
 }
 
-/* 801C086C-801C0B40 1BB1AC 02D4+00 2/0 0/0 0/0 .text
- * isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi */
 bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1,
                                         bool param_2, int param_3) const {
     JUT_ASSERT(995, i_data != NULL);
@@ -118,12 +115,10 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
     return rt;
 }
 
-/* 801C0B40-801C0B48 1BB480 0008+00 1/0 0/0 0/0 .text getPlayerCursorSize__15renderingDmap_cFv */
 f32 renderingDmap_c::getPlayerCursorSize() {
     return 0.0f;
 }
 
-/* 801C0B48-801C0BAC 1BB488 0064+00 1/1 0/0 0/0 .text getLineWidthZoomBig__15renderingDmap_cFi */
 int renderingDmap_c::getLineWidthZoomBig(int param_0) {
     static const u8 l_lineWidthPatOff[] = {0, 0, 6, 0, 0};
     static const u8 l_lineWidthPatOn[] = {6, 6, 12, 0, 0};
@@ -140,8 +135,6 @@ int renderingDmap_c::getLineWidthZoomBig(int param_0) {
     return var_r28[param_0];
 }
 
-/* 801C0BAC-801C0C10 1BB4EC 0064+00 1/1 0/0 0/0 .text getLineWidthZoomSmall__15renderingDmap_cFi
- */
 int renderingDmap_c::getLineWidthZoomSmall(int param_0) {
     static const u8 l_lineWidthPatOff[] = {0, 0, 6, 0, 0};
     static const u8 l_lineWidthPatOn[] = {0, 0, 6, 0, 0};
@@ -158,8 +151,6 @@ int renderingDmap_c::getLineWidthZoomSmall(int param_0) {
     return var_r28[param_0];
 }
 
-/* 801C0C10-801C0C48 1BB550 0038+00 1/0 0/0 0/0 .text            getLineWidth__15renderingDmap_cFi
- */
 int renderingDmap_c::getLineWidth(int param_0) {
     int var_r31;
     if (field_0x34 > 0.5f) {
@@ -171,8 +162,7 @@ int renderingDmap_c::getLineWidth(int param_0) {
     return var_r31;
 }
 
-/* 80395860-80395950 -00001 00F0+00 1/1 0/0 0/0 .rodata          l_paletteDmap_m */
-static u32 const l_paletteDmap_m[60] ALIGN_DECL(32) = {
+static u32 const l_paletteDmap_m[60] ATTRIBUTE_ALIGN(32) = {
     0x00000000,
     0x00000000,
     0x80008000,
@@ -235,7 +225,6 @@ static u32 const l_paletteDmap_m[60] ALIGN_DECL(32) = {
     0x00000000,
 };
 
-/* 801C0C48-801C0CB8 1BB588 0070+00 1/0 0/0 0/0 .text            getColor__15renderingDmap_cFi */
 const GXColor* renderingDmap_c::getColor(int param_0) {
     static const GXColor l_dungeon_offColor[] = {
         {0x08, 0x00, 0x00, 0x00},
@@ -285,16 +274,12 @@ const GXColor* renderingDmap_c::getColor(int param_0) {
     return &var_r28[param_0];
 }
 
-/* 801C0CB8-801C0CD8 1BB5F8 0020+00 1/0 0/0 0/0 .text            afterDrawPath__15renderingDmap_cFv
- */
 void renderingDmap_c::afterDrawPath() {
     renderingPlusDoor_c::afterDrawPath();
 }
 
-/* 80451088-8045108C 000588 0004+00 2/2 0/0 0/0 .sbss            m_res__22dMdm_HIO_prm_res_dst_s */
 void* dMdm_HIO_prm_res_dst_s::m_res;
 
-/* 801C0CD8-801C0D04 1BB618 002C+00 1/1 0/0 0/0 .text _create__15dMenu_DmapMap_cFUsUsUsUsPv */
 void dMenu_DmapMap_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3,
                               void* res) {
     JUT_ASSERT(1569, res != NULL);
@@ -303,7 +288,6 @@ void dMenu_DmapMap_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3
     setTexture(param_0, param_1, param_2, param_3);
 }
 
-/* 801C0D04-801C0D70 1BB644 006C+00 1/1 0/0 0/0 .text            _delete__15dMenu_DmapMap_cFv */
 void dMenu_DmapMap_c::_delete() {
     for (int i = 0; i < 2; i++) {
         if (mMapImage_p[i] != NULL) {
@@ -316,7 +300,6 @@ void dMenu_DmapMap_c::_delete() {
     }
 }
 
-/* 801C0D70-801C0E4C 1BB6B0 00DC+00 1/1 0/0 0/0 .text setTexture__15dMenu_DmapMap_cFUsUsUsUs */
 void dMenu_DmapMap_c::setTexture(u16 param_0, u16 param_1, u16 param_2, u16 param_3) {
     for (int lp1 = 0; lp1 < 2; lp1++) {
         u32 var_r27 = GXGetTexBufferSize(param_0, param_1, 9, 0, 0);
@@ -330,15 +313,12 @@ void dMenu_DmapMap_c::setTexture(u16 param_0, u16 param_1, u16 param_2, u16 para
     }
 }
 
-/* 801C0E4C-801C0EE0 1BB78C 0094+00 1/1 0/0 0/0 .text            setPos__15dMenu_DmapMap_cFiifffbf
- */
 void dMenu_DmapMap_c::setPos(int param_0, int param_1, f32 param_2, f32 param_3, f32 param_4,
                              bool param_5, f32 param_6) {
     mRend[0].entry(param_2, param_3, param_4, dComIfGp_roomControl_getStayNo(), param_0, param_6);
     mRend[1].entry(param_2, param_3, param_4, dComIfGp_roomControl_getStayNo(), param_1, param_6);
 }
 
-/* 801C0EE0-801C0F24 1BB820 0044+00 0/0 2/2 0/0 .text getMapBlendPer__20dMenu_StageMapCtrl_cCFv */
 f32 dMenu_StageMapCtrl_c::getMapBlendPer() const {
     f32 var_f31;
     if (field_0x90 == 0.0f) {
@@ -350,36 +330,26 @@ f32 dMenu_StageMapCtrl_c::getMapBlendPer() const {
     return var_f31;
 }
 
-/* 801C0F24-801C0F3C 1BB864 0018+00 0/0 1/1 0/0 .text
- * getPixelStageSizeX__20dMenu_StageMapCtrl_cCFv                */
 f32 dMenu_StageMapCtrl_c::getPixelStageSizeX() const {
     f32 var_f31 = dMpath_c::getSizeX();
     return var_f31 * (1.0f / field_0xbc);
 }
 
-/* 801C0F3C-801C0F54 1BB87C 0018+00 0/0 1/1 0/0 .text
- * getPixelStageSizeZ__20dMenu_StageMapCtrl_cCFv                */
 f32 dMenu_StageMapCtrl_c::getPixelStageSizeZ() const {
     f32 var_f31 = dMpath_c::getSizeZ();
     return var_f31 * (1.0f / field_0xbc);
 }
 
-/* 801C0F54-801C0F74 1BB894 0020+00 0/0 1/1 0/0 .text getPixelCenterX__20dMenu_StageMapCtrl_cCFv
- */
 f32 dMenu_StageMapCtrl_c::getPixelCenterX() const {
     f32 var_f31 = dMpath_c::getCenterX();
     return (1.0f / field_0xbc) * (field_0x9c - var_f31);
 }
 
-/* 801C0F74-801C0F94 1BB8B4 0020+00 0/0 1/1 0/0 .text getPixelCenterZ__20dMenu_StageMapCtrl_cCFv
- */
 f32 dMenu_StageMapCtrl_c::getPixelCenterZ() const {
     f32 var_f31 = dMpath_c::getCenterZ();
     return (1.0f / field_0xbc) * (field_0xa0 - var_f31);
 }
 
-/* 801C0F94-801C0FF8 1BB8D4 0064+00 0/0 1/1 0/0 .text
- * initGetTreasureList__20dMenu_StageMapCtrl_cFUcSc             */
 void dMenu_StageMapCtrl_c::initGetTreasureList(u8 param_0, s8 param_1) {
     field_0xf6 = param_0;
     field_0xf7 = param_1;
@@ -391,8 +361,6 @@ inline static s16 rightModeCnvRot(s16 param_0) {
     return param_0;
 }
 
-/* 801C0FF8-801C1128 1BB938 0130+00 0/0 1/1 0/0 .text
- * getTreasureList__20dMenu_StageMapCtrl_cFPfPfPScPUcPSc        */
 bool dMenu_StageMapCtrl_c::getTreasureList(f32* o_posX, f32* o_posY, s8* param_2, u8* o_swbit,
                                            s8* o_roomNo) {
     bool var_r30 = false;
@@ -430,8 +398,6 @@ inline static f32 rightModeCnvPos(f32 param_0) {
     return param_0;
 }
 
-/* 801C1128-801C1194 1BBA68 006C+00 3/3 0/0 0/0 .text
- * cnvPosTo2Dpos__20dMenu_StageMapCtrl_cCFffPfPf                */
 void dMenu_StageMapCtrl_c::cnvPosTo2Dpos(f32 param_0, f32 param_1, f32* param_2,
                                          f32* param_3) const {
     if (param_2 != NULL) {
@@ -443,8 +409,6 @@ void dMenu_StageMapCtrl_c::cnvPosTo2Dpos(f32 param_0, f32 param_1, f32* param_2,
     }
 }
 
-/* 801C1194-801C1218 1BBAD4 0084+00 0/0 1/1 0/0 .text
- * getPlayerDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs            */
 void dMenu_StageMapCtrl_c::getPlayerDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_rotY) const {
     JUT_ASSERT(2030, i_dispX != NULL);
     JUT_ASSERT(2031, i_dispX != NULL);
@@ -458,8 +422,6 @@ void dMenu_StageMapCtrl_c::getPlayerDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_
     }
 }
 
-/* 801C1218-801C12A8 1BBB58 0090+00 0/0 1/1 0/0 .text
- * getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs           */
 s8 dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_rotY) const {
     JUT_ASSERT(2057, i_dispX != NULL);
     JUT_ASSERT(2058, i_dispX != NULL);
@@ -476,15 +438,11 @@ s8 dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_r
     dMapInfo_c::calcNowStayFloorNo(sp10.y, true);
 }
 
-/* 801C12A8-801C12B4 1BBBE8 000C+00 0/0 2/2 0/0 .text
- * setPlusNowStayFloorNo__20dMenu_StageMapCtrl_cFScUc           */
 void dMenu_StageMapCtrl_c::setPlusNowStayFloorNo(s8 param_0, u8 param_1) {
     field_0xea = param_0;
     field_0xf0 = param_1;
 }
 
-/* 801C12B4-801C1878 1BBBF4 05C4+00 2/2 0/0 0/0 .text            moveFloor__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::moveFloor() {
     if ((field_0xf3 == 0) && (field_0xf1 == 0)) {
         if (field_0xea != 0) {
@@ -572,27 +530,20 @@ void dMenu_StageMapCtrl_c::moveFloor() {
     }
 }
 
-/* 801C1878-801C188C 1BC1B8 0014+00 1/0 0/0 0/0 .text wait_init_proc__20dMenu_StageMapCtrl_cFv */
 void dMenu_StageMapCtrl_c::wait_init_proc() {
     field_0x90 = 0.0f;
     field_0xe8 = field_0xe7;
 }
 
-/* 801C188C-801C18AC 1BC1CC 0020+00 1/0 0/0 0/0 .text            wait_proc__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::wait_proc() {
     moveFloor();
 }
 
-/* 801C18AC-801C18C0 1BC1EC 0014+00 1/0 0/0 0/0 .text zoomIn_init_proc__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::zoomIn_init_proc() {
     field_0xf4 = field_0xf2;
     field_0xd8 = 0.0f;
 }
 
-/* 801C18C0-801C1B14 1BC200 0254+00 1/0 0/0 0/0 .text
- * getZoomMinMaxCheck__19dMenu_DmapMapCtrl_cFPfPfPfPfPbPb       */
 void dMenu_DmapMapCtrl_c::getZoomMinMaxCheck(f32* param_0, f32* param_1, f32* param_2,
                                              f32* param_3, bool* param_4, bool* param_5) {
     f32 var_f31 = FLT_MAX;
@@ -669,8 +620,6 @@ void dMenu_DmapMapCtrl_c::getZoomMinMaxCheck(f32* param_0, f32* param_1, f32* pa
     }
 }
 
-/* 801C1B14-801C1BA4 1BC454 0090+00 1/0 0/0 0/0 .text calcZoomCenter__19dMenu_DmapMapCtrl_cFPfPf
- */
 void dMenu_DmapMapCtrl_c::calcZoomCenter(f32* param_0, f32* param_1) {
     f32 spC = 0.0f;
     f32 sp8 = 0.0f;
@@ -691,8 +640,6 @@ void dMenu_DmapMapCtrl_c::calcZoomCenter(f32* param_0, f32* param_1) {
     }
 }
 
-/* 801C1BA4-801C1C40 1BC4E4 009C+00 1/0 0/0 0/0 .text getZoomCmPerPixel__19dMenu_DmapMapCtrl_cFv
- */
 f32 dMenu_DmapMapCtrl_c::getZoomCmPerPixel() {
     f32 var_f30 = field_0x98 < field_0x94 ? field_0x98 : field_0x94;
 
@@ -716,8 +663,7 @@ f32 dMenu_DmapMapCtrl_c::getZoomCmPerPixel() {
     return var_f29;
 }
 
-/* 803BCBC0-803BCCB4 -00001 00F4+00 0/0 0/0 0/0 .data            l_data */
-static u32 l_data[61] ALIGN_DECL(32) = {
+static u32 l_data[61] ATTRIBUTE_ALIGN(32) = {
     0x80008000,
     0x80008000,
     0x00000000,
@@ -781,7 +727,6 @@ static u32 l_data[61] ALIGN_DECL(32) = {
     0x45610000,
 };
 
-/* 803BCCE4-803BCD14 019E04 0030+00 7/8 0/0 0/0 .data            init_process */
 typedef void (dMenu_StageMapCtrl_c::*process_fn)();
 static process_fn init_process[] = {
     &dMenu_StageMapCtrl_c::wait_init_proc,
@@ -790,7 +735,6 @@ static process_fn init_process[] = {
     &dMenu_StageMapCtrl_c::zoomOut_init_proc,
 };
 
-/* 801C1C40-801C1CEC 1BC580 00AC+00 0/0 1/1 0/0 .text initZoomIn__20dMenu_StageMapCtrl_cFUc */
 void dMenu_StageMapCtrl_c::initZoomIn(u8 param_0) {
     f32 sp10 = 0.0f;
     f32 spC = 0.0f;
@@ -805,7 +749,6 @@ void dMenu_StageMapCtrl_c::initZoomIn(u8 param_0) {
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C1CEC-801C1E00 1BC62C 0114+00 0/0 1/1 0/0 .text initZoomIn__20dMenu_StageMapCtrl_cFUcff */
 void dMenu_StageMapCtrl_c::initZoomIn(u8 param_0, f32 param_1, f32 param_2) {
     field_0xe0 = getZoomCmPerPixel();
     field_0xac = field_0xa4 + (field_0xdc * param_1);
@@ -829,8 +772,6 @@ void dMenu_StageMapCtrl_c::initZoomIn(u8 param_0, f32 param_1, f32 param_2) {
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C1E00-801C1E74 1BC740 0074+00 0/0 1/1 0/0 .text
- * initZoomInCenterHold__20dMenu_StageMapCtrl_cFUc              */
 void dMenu_StageMapCtrl_c::initZoomInCenterHold(u8 param_0) {
     field_0xe0 = getZoomCmPerPixel();
     field_0xf2 = param_0;
@@ -839,14 +780,12 @@ void dMenu_StageMapCtrl_c::initZoomInCenterHold(u8 param_0) {
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C1E74-801C1EC0 1BC7B4 004C+00 2/2 0/0 0/0 .text zoomCalcSet__20dMenu_StageMapCtrl_cFf */
 void dMenu_StageMapCtrl_c::zoomCalcSet(f32 param_0) {
     field_0x9c = field_0xa4 + (param_0 * (field_0xac - field_0xa4));
     field_0xa0 = field_0xa8 + (param_0 * (field_0xb0 - field_0xa8));
     field_0xbc = field_0xdc + (param_0 * (field_0xe0 - field_0xdc));
 }
 
-/* 801C1EC0-801C1F2C 1BC800 006C+00 1/0 0/0 0/0 .text zoomIn_proc__20dMenu_StageMapCtrl_cFv */
 void dMenu_StageMapCtrl_c::zoomIn_proc() {
     f32 temp_f1 = fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4);
     field_0xd8 = temp_f1;
@@ -858,7 +797,6 @@ void dMenu_StageMapCtrl_c::zoomIn_proc() {
     }
 }
 
-/* 801C1F2C-801C1F70 1BC86C 0044+00 0/0 1/1 0/0 .text initZoomOut__20dMenu_StageMapCtrl_cFUc */
 void dMenu_StageMapCtrl_c::initZoomOut(u8 param_0) {
     field_0xf2 = param_0;
     field_0xf5 = 3;
@@ -866,7 +804,6 @@ void dMenu_StageMapCtrl_c::initZoomOut(u8 param_0) {
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C1F70-801C2004 1BC8B0 0094+00 0/0 1/1 0/0 .text initZoomWait__20dMenu_StageMapCtrl_cFff */
 void dMenu_StageMapCtrl_c::initZoomWait(f32 param_0, f32 param_1) {
     field_0xac = param_0;
     field_0xb0 = param_1;
@@ -880,8 +817,6 @@ void dMenu_StageMapCtrl_c::initZoomWait(f32 param_0, f32 param_1) {
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C2004-801C2028 1BC944 0024+00 1/0 0/0 0/0 .text zoomWait_init_proc__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::zoomWait_init_proc() {
     field_0xb4 = 0.0f;
     field_0xb8 = 0.0f;
@@ -890,13 +825,10 @@ void dMenu_StageMapCtrl_c::zoomWait_init_proc() {
     field_0xe8 = field_0xe7;
 }
 
-/* 801C2028-801C205C 1BC968 0034+00 1/0 0/0 0/0 .text isEnableZoomMove__19dMenu_DmapMapCtrl_cCFv
- */
 bool dMenu_DmapMapCtrl_c::isEnableZoomMove() const {
     return field_0xf3 == 0 && (!getDisableZoomMoveFlgX() || !getDisableZoomMoveFlgZ());
 }
 
-/* 801C205C-801C2198 1BC99C 013C+00 1/0 0/0 0/0 .text zoomWait_proc__20dMenu_StageMapCtrl_cFv */
 void dMenu_StageMapCtrl_c::zoomWait_proc() {
     if (isEnableZoomMove()) {
         if (field_0xf8 == 0 && fabsf(field_0xb4) > 0.01f) {
@@ -932,14 +864,11 @@ void dMenu_StageMapCtrl_c::zoomWait_proc() {
     moveFloor();
 }
 
-/* 801C2198-801C21AC 1BCAD8 0014+00 1/0 0/0 0/0 .text zoomOut_init_proc__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::zoomOut_init_proc() {
     field_0xf4 = field_0xf2;
     field_0xd8 = 1.0f;
 }
 
-/* 801C21AC-801C2234 1BCAEC 0088+00 1/0 0/0 0/0 .text zoomOut_proc__20dMenu_StageMapCtrl_cFv */
 void dMenu_StageMapCtrl_c::zoomOut_proc() {
     f32 temp_f1 = fopMsgM_valueIncrease(field_0xf2, field_0xf2 - field_0xf4, 4);
     zoomCalcSet(1.0f - temp_f1);
@@ -951,7 +880,6 @@ void dMenu_StageMapCtrl_c::zoomOut_proc() {
     }
 }
 
-/* 803BCD44-803BCD74 019E64 0030+00 1/2 0/0 0/0 .data            move_process */
 static process_fn move_process[] = {
     &dMenu_StageMapCtrl_c::wait_proc,
     &dMenu_StageMapCtrl_c::zoomIn_proc,
@@ -959,7 +887,6 @@ static process_fn move_process[] = {
     &dMenu_StageMapCtrl_c::zoomOut_proc,
 };
 
-/* 801C2234-801C22A8 1BCB74 0074+00 0/0 1/1 0/0 .text            move__20dMenu_StageMapCtrl_cFv */
 void dMenu_StageMapCtrl_c::move() {
     u8 temp_r30 = field_0xf5;
     (this->*move_process[field_0xf5])();
@@ -969,15 +896,12 @@ void dMenu_StageMapCtrl_c::move() {
     }
 }
 
-/* 801C22A8-801C22F8 1BCBE8 0050+00 1/0 0/0 0/0 .text            draw__19dMenu_DmapMapCtrl_cFv */
 void dMenu_DmapMapCtrl_c::draw() {
     if (field_0xef != 0) {
         setPos(field_0xeb, field_0xec, field_0x9c, field_0xa0, field_0xbc, true, field_0xd8);
     }
 }
 
-/* 801C22F8-801C231C 1BCC38 0024+00 0/0 1/1 0/0 .text
- * getPlayerStayFloorNo__20dMenu_StageMapCtrl_cCFv              */
 s8 dMenu_StageMapCtrl_c::getPlayerStayFloorNo() const {
     s8 var_r31 = 0;
     if (dMapInfo_c::getNowStayFloorNoDecisionFlg()) {
@@ -987,8 +911,6 @@ s8 dMenu_StageMapCtrl_c::getPlayerStayFloorNo() const {
     return var_r31;
 }
 
-/* 801C231C-801C235C 1BCC5C 0040+00 0/0 1/1 0/0 .text _create__20dMenu_StageMapCtrl_cFUsUsUsUsPv
- */
 void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3,
                                    void* param_4) {
     s8 var_r31;
@@ -999,20 +921,14 @@ void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 pa
     _create(param_0, param_1, param_2, param_3, var_r31, param_4);
 }
 
-/* 8045108C-80451090 00058C 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinX__20dMenu_StageMapCtrl_c */
 f32 dMenu_StageMapCtrl_c::m_zoomCenterMinX;
 
-/* 80451090-80451094 000590 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMaxX__20dMenu_StageMapCtrl_c */
 f32 dMenu_StageMapCtrl_c::m_zoomCenterMaxX;
 
-/* 80451094-80451098 000594 0004+00 1/1 0/0 0/0 .sbss m_zoomCenterMinZ__20dMenu_StageMapCtrl_c */
 f32 dMenu_StageMapCtrl_c::m_zoomCenterMinZ;
 
-/* 80451098-804510A0 000598 0004+04 1/1 0/0 0/0 .sbss m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c */
 f32 dMenu_StageMapCtrl_c::m_zoomCenterMaxZ;
 
-/* 801C235C-801C2518 1BCC9C 01BC+00 1/1 1/1 0/0 .text _create__20dMenu_StageMapCtrl_cFUsUsUsUsScPv
- */
 void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3,
                                    s8 param_4, void* param_5) {
     field_0xe6 = dComIfGp_roomControl_getStayNo();
@@ -1050,13 +966,10 @@ void dMenu_StageMapCtrl_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 pa
     (this->*init_process[field_0xf5])();
 }
 
-/* 801C2518-801C2538 1BCE58 0020+00 0/0 1/1 0/0 .text            _delete__20dMenu_StageMapCtrl_cFv
- */
 void dMenu_StageMapCtrl_c::_delete() {
     dMenu_DmapMap_c::_delete();
 }
 
-/* 801C2538-801C2578 1BCE78 0040+00 0/0 1/1 0/0 .text isEnableZoomIn__20dMenu_StageMapCtrl_cFv */
 bool dMenu_StageMapCtrl_c::isEnableZoomIn() {
     bool var_r30 = 0;
     if (field_0xf3 == 0 && dStage_roomControl_c::getFileList2(field_0xe6) != NULL) {
@@ -1066,25 +979,18 @@ bool dMenu_StageMapCtrl_c::isEnableZoomIn() {
     return var_r30;
 }
 
-/* 801C2578-801C2588 1BCEB8 0010+00 0/0 1/1 0/0 .text isEnableZoomOut__20dMenu_StageMapCtrl_cFv */
 bool dMenu_StageMapCtrl_c::isEnableZoomOut() {
     return field_0xf3 == 0;
 }
 
-/* 801C2588-801C2590 1BCEC8 0008+00 0/0 1/1 0/0 .text setPlusZoomCenterX__20dMenu_StageMapCtrl_cFf
- */
 void dMenu_StageMapCtrl_c::setPlusZoomCenterX(f32 param_0) {
     field_0xb4 = param_0;
 }
 
-/* 801C2590-801C2598 1BCED0 0008+00 0/0 1/1 0/0 .text setPlusZoomCenterZ__20dMenu_StageMapCtrl_cFf
- */
 void dMenu_StageMapCtrl_c::setPlusZoomCenterZ(f32 param_0) {
     field_0xb8 = param_0;
 }
 
-/* 801C2598-801C25C0 1BCED8 0028+00 1/0 0/0 0/0 .text
- * getInitWholeMapScale__19dMenu_DmapMapCtrl_cFPfffff           */
 void dMenu_DmapMapCtrl_c::getInitWholeMapScale(f32* param_0, f32 param_1, f32 param_2,
                                                f32 param_3, f32 param_4) {
     if (param_0 != NULL) {
@@ -1102,8 +1008,6 @@ void dMenu_DmapMapCtrl_c::getInitWholeMapScale(f32* param_0, f32 param_1, f32 pa
     }
 }
 
-/* 801C25C0-801C25E4 1BCF00 0024+00 1/0 0/0 0/0 .text
- * getInitDispCenter__19dMenu_DmapMapCtrl_cFPfPf                */
 void dMenu_DmapMapCtrl_c::getInitDispCenter(f32* param_0, f32* param_1) {
     if (param_0 != NULL) {
         *param_0 = dMpath_c::getCenterX();
@@ -1114,45 +1018,32 @@ void dMenu_DmapMapCtrl_c::getInitDispCenter(f32* param_0, f32* param_1) {
     }
 }
 
-/* 801C25E4-801C25E8 1BCF24 0004+00 1/0 0/0 0/0 .text            beforeDrawPath__15renderingDmap_cFv
- */
 void renderingDmap_c::beforeDrawPath() {}
 
-/* 801C25E8-801C2614 1BCF28 002C+00 1/0 0/0 0/0 .text getRestartCursorSize__15renderingDmap_cFv */
 f32 renderingDmap_c::getRestartCursorSize() {
     return getPlayerCursorSize();
 }
 
-/* 801C2614-801C261C 1BCF54 0008+00 1/0 0/0 0/0 .text            isRendAllRoom__15renderingDmap_cCFv
- */
 bool renderingDmap_c::isRendAllRoom() const {
     return true;
 }
 
-/* 801C261C-801C2624 1BCF5C 0008+00 1/0 0/0 0/0 .text            isRendDoor__15renderingDmap_cCFv */
 bool renderingDmap_c::isRendDoor() const {
     return true;
 }
 
-/* 801C2624-801C262C 1BCF64 0008+00 1/0 0/0 0/0 .text            isCheckFloor__15renderingDmap_cCFv
- */
 bool renderingDmap_c::isCheckFloor() const {
     return true;
 }
 
-/* 801C262C-801C2634 1BCF6C 0008+00 1/0 0/0 0/0 .text            isRendRestart__15renderingDmap_cCFv
- */
 bool renderingDmap_c::isRendRestart() const {
     return true;
 }
 
-/* 801C2634-801C263C 1BCF74 0008+00 1/0 0/0 0/0 .text            isRendCursor__15renderingDmap_cCFv
- */
 bool renderingDmap_c::isRendCursor() const {
     return true;
 }
 
-/* 801C263C-801C2644 1BCF7C 0008+00 1/0 0/0 0/0 .text            isRendIcon__15renderingDmap_cCFv */
 bool renderingDmap_c::isRendIcon() const {
     return true;
 }
diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp
index dc4f8c4dc3..20142d9c6d 100644
--- a/src/d/d_menu_fishing.cpp
+++ b/src/d/d_menu_fishing.cpp
@@ -15,20 +15,16 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 803BD050-803BD05C 01A170 000C+00 2/3 0/0 0/0 .data            map_init_process */
 typedef void (dMenu_Fishing_c::*initFunc)();
 initFunc map_init_process[] = {
     &dMenu_Fishing_c::wait_init,
 };
 
-/* 803BD068-803BD074 01A188 000C+00 1/2 0/0 0/0 .data            map_move_process */
 typedef void (dMenu_Fishing_c::*moveFunc)();
 moveFunc map_move_process[] = {
     &dMenu_Fishing_c::wait_move,
 };
 
-/* 801C4D54-801C4D98 1BF694 0044+00 0/0 2/2 0/0 .text
- * __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl */
 dMenu_Fishing_c::dMenu_Fishing_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cStick) {
     mpHeap = i_heap;
     mpArchive = 0;
@@ -40,7 +36,6 @@ dMenu_Fishing_c::dMenu_Fishing_c(JKRExpHeap* i_heap, STControl* i_stick, CSTCont
     mFishListScreenFrames = 0;
 }
 
-/* 801C4D98-801C504C 1BF6D8 02B4+00 1/0 0/0 0/0 .text            __dt__15dMenu_Fishing_cFv */
 dMenu_Fishing_c::~dMenu_Fishing_c() {
     delete mpString;
     mpString = NULL;
@@ -95,7 +90,6 @@ dMenu_Fishing_c::~dMenu_Fishing_c() {
     }
 }
 
-/* 801C504C-801C50B4 1BF98C 0068+00 1/1 0/0 0/0 .text            _create__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::_create() {
     mpString = new dMsgString_c();
     screenSetBase();
@@ -104,7 +98,6 @@ void dMenu_Fishing_c::_create() {
     init();
 }
 
-/* 801C50B4-801C514C 1BF9F4 0098+00 0/0 2/2 0/0 .text            _move__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::_move() {
     JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
     u8 old_process = mProcess;
@@ -116,7 +109,6 @@ void dMenu_Fishing_c::_move() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801C514C-801C5204 1BFA8C 00B8+00 1/1 1/1 0/0 .text            _draw__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::_draw() {
     if (mpArchive) {
         J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
@@ -127,7 +119,6 @@ void dMenu_Fishing_c::_draw() {
     }
 }
 
-/* 801C5204-801C522C 1BFB44 0028+00 0/0 2/2 0/0 .text            isSync__15dMenu_Fishing_cFv */
 bool dMenu_Fishing_c::isSync() {
     if (mpMount != NULL && !mpMount->sync()) {
         return false;
@@ -135,7 +126,6 @@ bool dMenu_Fishing_c::isSync() {
     return true;
 }
 
-/* 801C522C-801C52E4 1BFB6C 00B8+00 1/1 0/0 0/0 .text            init__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::init() {
     #if VERSION == VERSION_GCN_PAL
     BOOL isEnglish = FALSE;
@@ -165,7 +155,6 @@ void dMenu_Fishing_c::init() {
     (this->*map_init_process[mProcess])();
 }
 
-/* 801C52E4-801C5470 1BFC24 018C+00 0/0 2/2 0/0 .text            _open__15dMenu_Fishing_cFv */
 int dMenu_Fishing_c::_open() {
     if (mpMount == NULL) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/fishres.arc", 0, NULL);
@@ -199,7 +188,6 @@ int dMenu_Fishing_c::_open() {
     }
 }
 
-/* 801C5470-801C556C 1BFDB0 00FC+00 0/0 1/1 0/0 .text            _close__15dMenu_Fishing_cFv */
 int dMenu_Fishing_c::_close() {
     s16 closeFrames = g_drawHIO.mFishListScreen.mCloseFrames;
     mFishListScreenFrames = 0;
@@ -217,22 +205,18 @@ int dMenu_Fishing_c::_close() {
     }
 }
 
-/* 801C556C-801C55A8 1BFEAC 003C+00 1/0 0/0 0/0 .text            wait_init__15dMenu_Fishing_cFv */
 // While the fishing menu is open, 
 void dMenu_Fishing_c::wait_init() {
     setAButtonString(0);
     setBButtonString(0x3F9); // "Back"
 }
 
-/* 801C55A8-801C55D8 1BFEE8 0030+00 1/0 0/0 0/0 .text            wait_move__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::wait_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1 && mDoCPd_c::getTrigB(PAD_1)) {
         mStatus = READY_CLOSE;
     }
 }
 
-/* 801C55D8-801C5D3C 1BFF18 0764+00 1/1 0/0 0/0 .text            screenSetBase__15dMenu_Fishing_cFv
- */
 void dMenu_Fishing_c::screenSetBase() {
     static const u64 fish_n[6] = {
         'fish_n_6', 'fish_n_5', 'fish_n_3', 'fish_n_1', 'fish_n_2', 'fish_n_4',
@@ -354,7 +338,6 @@ void dMenu_Fishing_c::screenSetBase() {
     dMeter2Info_getStringKanji(0x5a0, mpInfoNumCaughtString->getStringPtr(), NULL); // "No. Caught"
 }
 
-/* 801C5D3C-801C5EB8 1C067C 017C+00 1/1 0/0 0/0 .text screenSetDoIcon__15dMenu_Fishing_cFv */
 void dMenu_Fishing_c::screenSetDoIcon() {
     static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
     static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
@@ -376,7 +359,6 @@ void dMenu_Fishing_c::screenSetDoIcon() {
     }
 }
 
-/* 801C5EB8-801C5F68 1C07F8 00B0+00 1/1 0/0 0/0 .text setAButtonString__15dMenu_Fishing_cFUs */
 void dMenu_Fishing_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -389,7 +371,6 @@ void dMenu_Fishing_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801C5F68-801C6018 1C08A8 00B0+00 1/1 0/0 0/0 .text setBButtonString__15dMenu_Fishing_cFUs */
 void dMenu_Fishing_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -402,7 +383,6 @@ void dMenu_Fishing_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801C6018-801C605C 1C0958 0044+00 1/1 0/0 0/0 .text            getFigure__15dMenu_Fishing_cFi */
 u8 dMenu_Fishing_c::getFigure(int param_0) {
     if (param_0 < 0) {
         param_0 *= -1;
@@ -419,7 +399,6 @@ u8 dMenu_Fishing_c::getFigure(int param_0) {
     return 1;
 }
 
-/* 801C605C-801C6210 1C099C 01B4+00 1/1 0/0 0/0 .text setFishParam__15dMenu_Fishing_cFiUsUc */
 void dMenu_Fishing_c::setFishParam(int i_fishIdx, u16 i_fishCount, u8 i_fishSize) {
     u8 fishCountFigure = getFigure(i_fishCount);
     u8 fishSizeFigure = getFigure(i_fishSize);
@@ -456,7 +435,6 @@ void dMenu_Fishing_c::setFishParam(int i_fishIdx, u16 i_fishCount, u8 i_fishSize
     }
 }
 
-/* 801C6210-801C659C 1C0B50 038C+00 2/2 0/0 0/0 .text            setHIO__15dMenu_Fishing_cFb */
 void dMenu_Fishing_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mFishListScreen.mDebug) {
         for (int i = 0; i < MAX_FINDABLE_FISHES; i++) {
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp
index dfe8c9eba7..24616375ef 100644
--- a/src/d/d_menu_fmap.cpp
+++ b/src/d/d_menu_fmap.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_fmap
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_menu_fmap.h"
@@ -27,10 +22,8 @@
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_midna.h"
 
-/* 8042E82C-8042E840 05B54C 0014+00 2/2 0/0 0/0 .bss             g_fmHIO */
 static dMf_HIO_c g_fmHIO;
 
-/* 803BD204-803BD36C 01A324 0168+00 2/3 0/0 0/0 .data            init_process */
 static dMenu_Fmap_c::process init_process[30] = {
     &dMenu_Fmap_c::all_map_init,
     &dMenu_Fmap_c::portal_demo2_init,
@@ -64,7 +57,6 @@ static dMenu_Fmap_c::process init_process[30] = {
     &dMenu_Fmap_c::howl_demo3_init,
 };
 
-/* 803BD4D4-803BD63C 01A5F4 0168+00 1/2 0/0 0/0 .data            move_process */
 static dMenu_Fmap_c::process move_process[30] = {
     &dMenu_Fmap_c::all_map_proc,
     &dMenu_Fmap_c::portal_demo2_move,
@@ -98,10 +90,8 @@ static dMenu_Fmap_c::process move_process[30] = {
     &dMenu_Fmap_c::howl_demo3_move,
 };
 
-/* 804510A0-804510A4 0005A0 0004+00 1/1 0/0 0/0 .sbss            mMySelfPointer__9dMf_HIO_c */
 dMf_HIO_c* dMf_HIO_c::mMySelfPointer;
 
-/* 801C65F8-801C662C 1C0F38 0034+00 1/1 0/0 0/0 .text            __ct__9dMf_HIO_cFv */
 dMf_HIO_c::dMf_HIO_c() {
     mMySelfPointer = this;
     mBackAnimeStep = 0.2f;
@@ -110,7 +100,6 @@ dMf_HIO_c::dMf_HIO_c() {
     mMoyaAlpha = 95;
 }
 
-/* 801C662C-801C66E4 1C0F6C 00B8+00 5/5 2/2 0/0 .text            dMenuFmap_getStartStageName__FPv */
 const char* dMenuFmap_getStartStageName(void* i_fieldData) {
     static char virtual_stage[8];
     stage_stag_info_class* stag_info = dComIfGp_getStage()->getStagInfo();
@@ -130,11 +119,8 @@ const char* dMenuFmap_getStartStageName(void* i_fieldData) {
     return dComIfGp_getStartStageName();
 }
 
-/* 804510AC-804510B0 0005AC 0004+00 2/2 0/0 0/0 .sbss            MyClass__12dMenu_Fmap_c */
 dMenu_Fmap_c* dMenu_Fmap_c::MyClass;
 
-/* 801C66E4-801C6AC8 1C1024 03E4+00 0/0 1/1 0/0 .text
- * __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc */
 dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick,
                            u8 i_process, u8 i_regionCursor, u8 i_stageCursor, f32 i_stageTransX,
                            f32 i_stageTransZ, u8 i_panDirection) {
@@ -265,7 +251,6 @@ dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
     resetRoomDataBit();
 }
 
-/* 801C6AC8-801C6D64 1C1408 029C+00 1/0 0/0 0/0 .text            __dt__12dMenu_Fmap_cFv */
 dMenu_Fmap_c::~dMenu_Fmap_c() {
     mpHeap->getTotalFreeSize();
     if (mpFieldDat != NULL) {
@@ -335,7 +320,6 @@ dMenu_Fmap_c::~dMenu_Fmap_c() {
     }
 }
 
-/* 801C6D64-801C74A4 1C16A4 0740+00 1/1 0/0 0/0 .text            _create__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::_create() {
     mpHeap->getTotalFreeSize();
     mpDraw2DBack = new dMenu_Fmap2DBack_c();
@@ -479,12 +463,10 @@ void dMenu_Fmap_c::_create() {
     g_fmapHIO.field_0x2f9 = false;
 }
 
-/* 801C74A4-801C74A8 1C1DE4 0004+00 0/0 1/1 0/0 .text            _delete__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::_delete() {
     /* empty function */
 }
 
-/* 801C74A8-801C7650 1C1DE8 01A8+00 0/0 1/1 0/0 .text            _move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::_move() {
     u8 process = mProcess;
     field_0x310 = 0;
@@ -524,7 +506,6 @@ void dMenu_Fmap_c::_move() {
     }
 }
 
-/* 801C7650-801C77F0 1C1F90 01A0+00 0/0 1/1 0/0 .text            _draw__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::_draw() {
     if (mpDraw2DBack != NULL && mpDraw2DTop != NULL) {
         if (field_0x305) {
@@ -556,8 +537,6 @@ void dMenu_Fmap_c::_draw() {
     }
 }
 
-/* 801C77F0-801C7AFC 1C2130 030C+00 0/0 1/1 0/0 .text            getNextStatus__12dMenu_Fmap_cFPUc
- */
 u8 dMenu_Fmap_c::getNextStatus(u8* param_0) {
     u8 ret = 8;
     *param_0 = 0;
@@ -626,7 +605,6 @@ u8 dMenu_Fmap_c::getNextStatus(u8* param_0) {
     return ret;
 }
 
-/* 801C7AFC-801C7B24 1C243C 0028+00 1/1 1/1 0/0 .text            isSync__12dMenu_Fmap_cFv */
 bool dMenu_Fmap_c::isSync() {
     if (mpMountArchive != NULL && !mpMountArchive->sync()) {
         return false;
@@ -634,7 +612,6 @@ bool dMenu_Fmap_c::isSync() {
     return true;
 }
 
-/* 801C7B24-801C7C2C 1C2464 0108+00 1/0 0/0 0/0 .text            all_map_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::all_map_init() {
     if (mIsWarpMap == true) {
         setTitleName(0x525);
@@ -661,7 +638,6 @@ void dMenu_Fmap_c::all_map_init() {
     mpDraw2DTop->setCrossLRString(0x3f9);
 }
 
-/* 801C7C2C-801C8230 1C256C 0604+00 1/0 0/0 0/0 .text            all_map_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::all_map_proc() {
     mpStick->checkTrigger();
 
@@ -781,7 +757,6 @@ void dMenu_Fmap_c::all_map_proc() {
     }
 }
 
-/* 801C8230-801C8308 1C2B70 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::zoom_all_to_region_init() {
     if (!readWorldData(mpDraw2DBack->getRegionCursor() + 1)) {
         setProcess(PROC_ALL_MAP);
@@ -795,7 +770,6 @@ void dMenu_Fmap_c::zoom_all_to_region_init() {
     }
 }
 
-/* 801C8308-801C83E0 1C2C48 00D8+00 1/0 0/0 0/0 .text zoom_all_to_region_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::zoom_all_to_region_proc() {
     mZoomLevel++;
     mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f);
@@ -816,13 +790,11 @@ void dMenu_Fmap_c::zoom_all_to_region_proc() {
     }
 }
 
-/* 801C83E0-801C8438 1C2D20 0058+00 1/0 0/0 0/0 .text zoom_region_to_all_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::zoom_region_to_all_init() {
     mZoomLevel = 10;
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801C8438-801C8518 1C2D78 00E0+00 1/0 0/0 0/0 .text zoom_region_to_all_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::zoom_region_to_all_proc() {
     mZoomLevel--;
     mpDraw2DBack->zoomMapCalc((f32)mZoomLevel / 10.0f);
@@ -843,8 +815,6 @@ void dMenu_Fmap_c::zoom_region_to_all_proc() {
     }
 }
 
-/* 801C8518-801C8600 1C2E58 00E8+00 1/0 0/0 0/0 .text            region_map_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::region_map_init() {
     setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
     mResetAreaName = true;
@@ -865,8 +835,6 @@ void dMenu_Fmap_c::region_map_init() {
     mpDraw2DTop->setCrossLRString(0x3f9);
 }
 
-/* 801C8600-801C8B00 1C2F40 0500+00 1/0 0/0 0/0 .text            region_map_proc__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::region_map_proc() {
     bool r29 = false;
     mpDraw2DTop->setAButtonString(0x527, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
@@ -962,12 +930,10 @@ void dMenu_Fmap_c::region_map_proc() {
     }
 }
 
-/* 801C8B00-801C8B0C 1C3440 000C+00 1/0 0/0 0/0 .text to_portal_warp_map_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::to_portal_warp_map_init() {
     mZoomLevel = 10;
 }
 
-/* 801C8B0C-801C8B48 1C344C 003C+00 1/0 0/0 0/0 .text to_portal_warp_map_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::to_portal_warp_map_proc() {
     mZoomLevel--;
     if (mZoomLevel <= 0) {
@@ -975,7 +941,6 @@ void dMenu_Fmap_c::to_portal_warp_map_proc() {
     }
 }
 
-/* 801C8B48-801C8C0C 1C3488 00C4+00 1/0 0/0 0/0 .text portal_warp_map_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_map_init() {
     if (mPrevProcess != PROC_PORTAL_WARP_SELECT) {
         mPortalNo = 0xff;
@@ -993,7 +958,6 @@ void dMenu_Fmap_c::portal_warp_map_init() {
     mpDraw2DTop->set3DStickString(0x526);
 }
 
-/* 801C8C0C-801C90A4 1C354C 0498+00 1/0 0/0 0/0 .text portal_warp_map_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_map_proc() {
     mpStick->checkTrigger();
 
@@ -1074,12 +1038,10 @@ void dMenu_Fmap_c::portal_warp_map_proc() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801C90A4-801C90A8 1C39E4 0004+00 1/0 0/0 0/0 .text portal_warp_select_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_select_init() {
     /* empty function */
 }
 
-/* 801C90A8-801C91D8 1C39E8 0130+00 1/0 0/0 0/0 .text portal_warp_select_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_select_proc() {
     mpDraw2DTop->getScrnExplainPtr()->move();
 
@@ -1108,7 +1070,6 @@ void dMenu_Fmap_c::portal_warp_select_proc() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801C91D8-801C9238 1C3B18 0060+00 1/0 0/0 0/0 .text portal_warp_forbid_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_forbid_init() {
     mpDraw2DTop->setBButtonString(0x3f9, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
     mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
@@ -1116,7 +1077,6 @@ void dMenu_Fmap_c::portal_warp_forbid_init() {
     mpDraw2DTop->setCrossLRString(0);
 }
 
-/* 801C9238-801C92A4 1C3B78 006C+00 1/0 0/0 0/0 .text portal_warp_forbid_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::portal_warp_forbid_proc() {
     mpDraw2DTop->getScrnExplainPtr()->move();
     if (mpDraw2DTop->getScrnExplainPtr()->getStatus() == 0) {
@@ -1126,16 +1086,12 @@ void dMenu_Fmap_c::portal_warp_forbid_proc() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801C92A4-801C9304 1C3BE4 0060+00 1/0 0/0 0/0 .text zoom_region_to_spot_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::zoom_region_to_spot_init() {
     mZoomLevel = 0;
     field_0x1ec = 0.0f;
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801C9304-801C93CC 1C3C44 00C8+00 1/0 0/0 0/0 .text zoom_region_to_spot_proc__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::zoom_region_to_spot_proc() {
     mZoomLevel++;
     field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1153,16 +1109,12 @@ void dMenu_Fmap_c::zoom_region_to_spot_proc() {
     }
 }
 
-/* 801C93CC-801C9428 1C3D0C 005C+00 1/0 0/0 0/0 .text zoom_spot_to_region_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::zoom_spot_to_region_init() {
     mZoomLevel = 10;
     field_0x1ec = 1.0f;
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMOUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801C9428-801C950C 1C3D68 00E4+00 1/0 0/0 0/0 .text zoom_spot_to_region_proc__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::zoom_spot_to_region_proc() {
     mZoomLevel--;
     field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1184,7 +1136,6 @@ void dMenu_Fmap_c::zoom_spot_to_region_proc() {
     }
 }
 
-/* 801C950C-801C9618 1C3E4C 010C+00 1/0 0/0 0/0 .text            spot_map_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::spot_map_init() {
     field_0x1ec = 1.0f;
     setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1209,7 +1160,6 @@ void dMenu_Fmap_c::spot_map_init() {
     mpDraw2DTop->setCrossLRString(0x3f9);
 }
 
-/* 801C9618-801C9A4C 1C3F58 0434+00 1/0 0/0 0/0 .text            spot_map_proc__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::spot_map_proc() {
     if (dMw_B_TRIGGER() && !dMeter2Info_isTouchKeyCheck(0xc)
         && dMeter2Info_getMeterClass()->getMeterDrawPtr()->getInsideObjCheck() != 1)
@@ -1307,8 +1257,6 @@ void dMenu_Fmap_c::spot_map_proc() {
     }
 }
 
-/* 801C9A4C-801C9B64 1C438C 0118+00 1/0 0/0 0/0 .text            portal_demo1_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo1_init() {
     mpDraw2DBack->setRegionCursor(2);
     setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1327,8 +1275,6 @@ void dMenu_Fmap_c::portal_demo1_init() {
     mZoomLevel = 10;
 }
 
-/* 801C9B64-801C9C7C 1C44A4 0118+00 1/0 0/0 0/0 .text            portal_demo1_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo1_move() {
     talkButton();
     mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1350,15 +1296,11 @@ void dMenu_Fmap_c::portal_demo1_move() {
     }
 }
 
-/* 801C9C7C-801C9CC8 1C45BC 004C+00 1/0 0/0 0/0 .text            portal_demo2_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo2_init() {
     setTitleName(mAllTitleName);
     setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
 }
 
-/* 801C9CC8-801C9D60 1C4608 0098+00 1/0 0/0 0/0 .text            portal_demo2_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo2_move() {
     talkButton();
     mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1372,16 +1314,12 @@ void dMenu_Fmap_c::portal_demo2_move() {
     mpDraw2DBack->mapBlink();
 }
 
-/* 801C9D60-801C9DB4 1C46A0 0054+00 1/0 0/0 0/0 .text            portal_demo3_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo3_init() {
     setTitleName(mAllTitleName);
     setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
     mZoomLevel = 0;
 }
 
-/* 801C9DB4-801C9EB8 1C46F4 0104+00 1/0 0/0 0/0 .text            portal_demo3_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo3_move() {
     talkButton();
     mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1403,8 +1341,6 @@ void dMenu_Fmap_c::portal_demo3_move() {
     }
 }
 
-/* 801C9EB8-801C9F14 1C47F8 005C+00 1/0 0/0 0/0 .text            portal_demo4_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo4_init() {
     mPortalNo = 0xff;
     setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
@@ -1413,8 +1349,6 @@ void dMenu_Fmap_c::portal_demo4_init() {
     }
 }
 
-/* 801C9F14-801C9F7C 1C4854 0068+00 1/0 0/0 0/0 .text            portal_demo4_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo4_move() {
     talkButton();
     if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1423,15 +1357,11 @@ void dMenu_Fmap_c::portal_demo4_move() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801C9F7C-801C9FBC 1C48BC 0040+00 1/0 0/0 0/0 .text            portal_demo5_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo5_init() {
     mpDraw2DTop->set3DStickString(0x526);
     mpDraw2DBack->onArrowDrawFlag();
 }
 
-/* 801C9FBC-801CA158 1C48FC 019C+00 1/0 0/0 0/0 .text            portal_demo5_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo5_move() {
     mpStick->checkTrigger();
 
@@ -1462,14 +1392,10 @@ void dMenu_Fmap_c::portal_demo5_move() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801CA158-801CA15C 1C4A98 0004+00 1/0 0/0 0/0 .text            portal_demo6_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo6_init() {
     /* empty function */
 }
 
-/* 801CA15C-801CA1E8 1C4A9C 008C+00 1/0 0/0 0/0 .text            portal_demo6_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::portal_demo6_move() {
     if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) {
         dMsgObject_getMsgObjectClass()->setStatus(0x10);
@@ -1483,7 +1409,6 @@ void dMenu_Fmap_c::portal_demo6_move() {
     setFlash(mpDraw2DBack->getSpotCursor(), false);
 }
 
-/* 801CA1E8-801CA2F4 1C4B28 010C+00 1/0 0/0 0/0 .text yamiboss_demo1_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo1_init() {
     setTitleName(mTitleName[mpDraw2DBack->getRegionCursor()]);
     setAreaName(mAreaName[mpDraw2DBack->getSpotCursor()]);
@@ -1501,7 +1426,6 @@ void dMenu_Fmap_c::yamiboss_demo1_init() {
     mZoomLevel = 10;
 }
 
-/* 801CA2F4-801CA34C 1C4C34 0058+00 1/0 0/0 0/0 .text yamiboss_demo1_move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo1_move() {
     talkButton();
     mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1510,13 +1434,11 @@ void dMenu_Fmap_c::yamiboss_demo1_move() {
     }
 }
 
-/* 801CA34C-801CA35C 1C4C8C 0010+00 1/0 0/0 0/0 .text yamiboss_demo2_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo2_init() {
     mZoomLevel = 0;
     field_0x30b = false;
 }
 
-/* 801CA35C-801CA40C 1C4C9C 00B0+00 1/0 0/0 0/0 .text yamiboss_demo2_move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo2_move() {
     if (dMsgObject_getMsgObjectClass()->getStatus() == 0xe) {
         mZoomLevel++;
@@ -1535,12 +1457,10 @@ void dMenu_Fmap_c::yamiboss_demo2_move() {
     }
 }
 
-/* 801CA40C-801CA410 1C4D4C 0004+00 1/0 0/0 0/0 .text yamiboss_demo3_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo3_init() {
     /* empty function */
 }
 
-/* 801CA410-801CA468 1C4D50 0058+00 1/0 0/0 0/0 .text yamiboss_demo3_move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo3_move() {
     talkButton();
     mMsgFlow.doFlow(NULL, NULL, 0);
@@ -1549,13 +1469,11 @@ void dMenu_Fmap_c::yamiboss_demo3_move() {
     }
 }
 
-/* 801CA468-801CA4C0 1C4DA8 0058+00 1/0 0/0 0/0 .text yamiboss_demo4_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo4_init() {
     mZoomLevel = 0;
     Z2GetAudioMgr()->seStart(Z2SE_SY_MAP_ZOOMIN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801CA4C0-801CA544 1C4E00 0084+00 1/0 0/0 0/0 .text yamiboss_demo4_move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo4_move() {
     mZoomLevel++;
     field_0x1ec = (f32)mZoomLevel / 10.0f;
@@ -1565,12 +1483,10 @@ void dMenu_Fmap_c::yamiboss_demo4_move() {
     }
 }
 
-/* 801CA544-801CA548 1C4E84 0004+00 1/0 0/0 0/0 .text yamiboss_demo5_init__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo5_init() {
     /* empty function */
 }
 
-/* 801CA548-801CA5CC 1C4E88 0084+00 1/0 0/0 0/0 .text yamiboss_demo5_move__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamiboss_demo5_move() {
     if (field_0x30b && dMsgObject_getMessageID() >= 4018) {
         field_0x30b = false;
@@ -1582,8 +1498,6 @@ void dMenu_Fmap_c::yamiboss_demo5_move() {
     }
 }
 
-/* 801CA5CC-801CA7A4 1C4F0C 01D8+00 1/0 0/0 0/0 .text            light_demo1_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::light_demo1_init() {
     mpDraw2DBack->zoomMapCalc2(1.0f);
     mZoomLevel = -10;
@@ -1612,8 +1526,6 @@ void dMenu_Fmap_c::light_demo1_init() {
     mMsgFlow.init(NULL, 125, 0, NULL);
 }
 
-/* 801CA7A4-801CA7E0 1C50E4 003C+00 1/0 0/0 0/0 .text            light_demo1_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::light_demo1_move() {
     mZoomLevel++;
     if (mZoomLevel > 0) {
@@ -1621,14 +1533,10 @@ void dMenu_Fmap_c::light_demo1_move() {
     }
 }
 
-/* 801CA7E0-801CA814 1C5120 0034+00 1/0 0/0 0/0 .text            light_demo2_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::light_demo2_init() {
     mMsgFlow.init(NULL, 125, 0, NULL);
 }
 
-/* 801CA814-801CA874 1C5154 0060+00 1/0 0/0 0/0 .text            light_demo2_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::light_demo2_move() {
     talkButton();
     if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1637,8 +1545,6 @@ void dMenu_Fmap_c::light_demo2_move() {
     }
 }
 
-/* 801CA874-801CA9B4 1C51B4 0140+00 1/0 0/0 0/0 .text            table_demo1_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo1_init() {
     mZoomLevel = -10;
     mpDraw2DBack->setRegionCursor(dMeter2Info_getTableMapRegionNo());
@@ -1666,8 +1572,6 @@ void dMenu_Fmap_c::table_demo1_init() {
     }
 }
 
-/* 801CA9B4-801CAA78 1C52F4 00C4+00 1/0 0/0 0/0 .text            table_demo1_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo1_move() {
     mZoomLevel++;
     if (mZoomLevel == 1) {
@@ -1681,16 +1585,12 @@ void dMenu_Fmap_c::table_demo1_move() {
     }
 }
 
-/* 801CAA78-801CAABC 1C53B8 0044+00 1/0 0/0 0/0 .text            table_demo2_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo2_init() {
     mZoomLevel = -10;
     tableArrowPosInit(true);
     mpDraw2DBack->zoomMapCalc2(0.0f);
 }
 
-/* 801CAABC-801CAB88 1C53FC 00CC+00 1/0 0/0 0/0 .text            table_demo2_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo2_move() {
     mZoomLevel++;
     if (mZoomLevel == 1) {
@@ -1705,15 +1605,11 @@ void dMenu_Fmap_c::table_demo2_move() {
     }
 }
 
-/* 801CAB88-801CABD0 1C54C8 0048+00 1/0 0/0 0/0 .text            table_demo3_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo3_init() {
     dMsgObject_setTalkHeap(mpTalkHeap);
     mMsgFlow.init(NULL, 1089, 0, NULL);
 }
 
-/* 801CABD0-801CAC30 1C5510 0060+00 1/0 0/0 0/0 .text            table_demo3_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::table_demo3_move() {
     talkButton();
     if (mMsgFlow.doFlow(NULL, NULL, 0)) {
@@ -1722,16 +1618,12 @@ void dMenu_Fmap_c::table_demo3_move() {
     }
 }
 
-/* 801CAC30-801CAC7C 1C5570 004C+00 1/0 0/0 0/0 .text            howl_demo1_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo1_init() {
     mZoomLevel = -10;
     mpDraw2DTop->setAButtonString(0, dMenu_Fmap2DTop_c::ALPHA_DEFAULT);
     mpDraw2DBack->zoomMapCalc2(0.0f);
 }
 
-/* 801CAC7C-801CAD48 1C55BC 00CC+00 1/0 0/0 0/0 .text            howl_demo1_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo1_move() {
     mZoomLevel++;
     if (mZoomLevel == 1) {
@@ -1746,14 +1638,10 @@ void dMenu_Fmap_c::howl_demo1_move() {
     }
 }
 
-/* 801CAD48-801CAD54 1C5688 000C+00 1/0 0/0 0/0 .text            howl_demo2_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo2_init() {
     mZoomLevel = -10;
 }
 
-/* 801CAD54-801CAD9C 1C5694 0048+00 1/0 0/0 0/0 .text            howl_demo2_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo2_move() {
     mZoomLevel++;
     if (mZoomLevel > 0) {
@@ -1762,19 +1650,14 @@ void dMenu_Fmap_c::howl_demo2_move() {
     }
 }
 
-/* 801CAD9C-801CADA0 1C56DC 0004+00 1/0 0/0 0/0 .text            howl_demo3_init__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo3_init() {
     /* empty function */
 }
 
-/* 801CADA0-801CADC4 1C56E0 0024+00 1/0 0/0 0/0 .text            howl_demo3_move__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howl_demo3_move() {
     setProcess(PROC_REGION_MAP);
 }
 
-/* 801CADC4-801CB038 1C5704 0274+00 0/0 1/1 0/0 .text            isOpen__12dMenu_Fmap_cFv */
 bool dMenu_Fmap_c::isOpen() {
     bool ret = false;
     bool init = false;
@@ -1836,7 +1719,6 @@ bool dMenu_Fmap_c::isOpen() {
     return ret;
 }
 
-/* 801CB038-801CB1DC 1C5978 01A4+00 0/0 1/1 0/0 .text            isClose__12dMenu_Fmap_cFv */
 bool dMenu_Fmap_c::isClose() {
     bool ret = true;
     bool bVar2 = false;
@@ -1878,7 +1760,6 @@ bool dMenu_Fmap_c::isClose() {
     return ret;
 }
 
-/* 801CB1DC-801CB200 1C5B1C 0024+00 0/0 1/1 0/0 .text            getProcess__12dMenu_Fmap_cFv */
 u8 dMenu_Fmap_c::getProcess() {
     if (g_fmapHIO.field_0x2f9) {
         return mProcess;
@@ -1886,8 +1767,6 @@ u8 dMenu_Fmap_c::getProcess() {
     return PROC_REGION_MAP;
 }
 
-/* 801CB200-801CB230 1C5B40 0030+00 0/0 1/1 0/0 .text            getRegionCursor__12dMenu_Fmap_cFv
- */
 u8 dMenu_Fmap_c::getRegionCursor() {
     if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
         return mpDraw2DBack->getRegionCursor();
@@ -1895,7 +1774,6 @@ u8 dMenu_Fmap_c::getRegionCursor() {
     return 0;
 }
 
-/* 801CB230-801CB260 1C5B70 0030+00 0/0 1/1 0/0 .text            getStageCursor__12dMenu_Fmap_cFv */
 u8 dMenu_Fmap_c::getStageCursor() {
     if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
         return mpDraw2DBack->getSpotCursor();
@@ -1903,7 +1781,6 @@ u8 dMenu_Fmap_c::getStageCursor() {
     return 0;
 }
 
-/* 801CB260-801CB290 1C5BA0 0030+00 0/0 1/1 0/0 .text            getStageTransX__12dMenu_Fmap_cFv */
 f32 dMenu_Fmap_c::getStageTransX() {
     if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
         return mpDraw2DBack->getStageTransX();
@@ -1911,7 +1788,6 @@ f32 dMenu_Fmap_c::getStageTransX() {
     return 0.0f;
 }
 
-/* 801CB290-801CB2C0 1C5BD0 0030+00 0/0 1/1 0/0 .text            getStageTransZ__12dMenu_Fmap_cFv */
 f32 dMenu_Fmap_c::getStageTransZ() {
     if (mpDraw2DBack != NULL && g_fmapHIO.field_0x2f9) {
         return mpDraw2DBack->getStageTransZ();
@@ -1919,7 +1795,6 @@ f32 dMenu_Fmap_c::getStageTransZ() {
     return 0.0f;
 }
 
-/* 801CB2C0-801CB570 1C5C00 02B0+00 4/4 0/0 0/0 .text            isRoomCheck__12dMenu_Fmap_cFii */
 bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
     if (!field_0x305) {
         return false;
@@ -2013,8 +1888,6 @@ bool dMenu_Fmap_c::isRoomCheck(int i_stageNo, int i_roomNo) {
     return false;
 }
 
-/* 801CB570-801CB664 1C5EB0 00F4+00 2/2 0/0 0/0 .text            checkStRoomData__12dMenu_Fmap_cFv
- */
 u16 dMenu_Fmap_c::checkStRoomData() {
     dMenu_Fmap_field_room_data_c* room_data
         = (dMenu_Fmap_field_room_data_c*)((int)mpFieldDat + mpFieldDat->mRoomDataOffset);
@@ -2044,7 +1917,6 @@ u16 dMenu_Fmap_c::checkStRoomData() {
     return -1;
 }
 
-/* 801CB664-801CB6D0 1C5FA4 006C+00 10/10 0/0 0/0 .text            talkButton__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::talkButton() {
     u16 status = dMsgObject_c::getStatus();
     if (status == 5 || status == 0xf || status == 0x10) {
@@ -2054,13 +1926,11 @@ void dMenu_Fmap_c::talkButton() {
     }
 }
 
-/* 801CB6D0-801CB6E0 1C6010 0010+00 31/31 0/0 0/0 .text            setProcess__12dMenu_Fmap_cFUc */
 void dMenu_Fmap_c::setProcess(u8 i_process) {
     mPrevProcess = mProcess;
     mProcess = i_process;
 }
 
-/* 801CB6E0-801CB770 1C6020 0090+00 10/10 0/0 0/0 .text            setFlash__12dMenu_Fmap_cFUcb */
 void dMenu_Fmap_c::setFlash(u8 i_stageNo, bool param_1) {
     mpDraw2DBack->mapBlink(&field_0x210);
     if (param_1) {
@@ -2071,7 +1941,6 @@ void dMenu_Fmap_c::setFlash(u8 i_stageNo, bool param_1) {
     }
 }
 
-/* 801CB770-801CB938 1C60B0 01C8+00 6/6 0/0 0/0 .text            readWorldData__12dMenu_Fmap_cFUc */
 bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) {
     removeAreaData();
     bool ret = false;
@@ -2130,7 +1999,6 @@ bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) {
     return ret;
 }
 
-/* 801CB938-801CBF04 1C6278 05CC+00 1/1 0/0 0/0 .text            readAreaData__12dMenu_Fmap_cFUcb */
 bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) {
     if (field_0x305) {
         return false;
@@ -2293,8 +2161,6 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) {
     return true;
 }
 
-/* 801CBF04-801CC094 1C6844 0190+00 1/1 0/0 0/0 .text
- * readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc */
 bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c* i_stageData,
                                 void* o_roomData, int i_regionNo, u8 param_4) {
     dMenu_Fmap_room_data_c* prev_room_data = NULL;
@@ -2338,7 +2204,6 @@ bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c
     return true;
 }
 
-/* 801CC094-801CC284 1C69D4 01F0+00 3/3 0/0 0/0 .text readFieldMapData__12dMenu_Fmap_cFPPvPCcbb */
 bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool param_2,
                                     bool param_3) {
     u32 size;
@@ -2388,7 +2253,6 @@ bool dMenu_Fmap_c::readFieldMapData(void** o_data, char const* i_path, bool para
     }
 }
 
-/* 801CC2B0-801CC4EC 1C6BF0 023C+00 1/1 0/0 0/0 .text decodeFieldMapData__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::decodeFieldMapData() {
     int field_data = (int)mpFieldDat;
     dMenu_Fmap_field_region_data_c* region_data
@@ -2446,8 +2310,6 @@ void dMenu_Fmap_c::decodeFieldMapData() {
     setAreaName(mTitleName[mpDraw2DBack->getRegionCursor()]);
 }
 
-/* 801CC4EC-801CC51C 1C6E2C 0030+00 1/1 0/0 0/0 .text            decodePortalData__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::decodePortalData() {
     dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
     if (g_fmapHIO.mPortalDataTerminalOutput) {
@@ -2455,7 +2317,6 @@ void dMenu_Fmap_c::decodePortalData() {
     }
 }
 
-/* 801CC51C-801CC61C 1C6E5C 0100+00 1/1 0/0 0/0 .text readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc */
 bool dMenu_Fmap_c::readRoomDzsData(void** i_data, u32 param_1, char const* i_path) {
     void* res;
     char* path = const_cast<char*>(i_path);
@@ -2478,7 +2339,6 @@ bool dMenu_Fmap_c::readRoomDzsData(void** i_data, u32 param_1, char const* i_pat
     }
 }
 
-/* 801CC61C-801CC7A8 1C6F5C 018C+00 4/4 0/0 0/0 .text            removeAreaData__12dMenu_Fmap_cFv */
 bool dMenu_Fmap_c::removeAreaData() {
     if (!field_0x305) {
         return true;
@@ -2540,8 +2400,6 @@ bool dMenu_Fmap_c::removeAreaData() {
     return true;
 }
 
-/* 801CC7A8-801CC85C 1C70E8 00B4+00 1/1 0/0 0/0 .text
- * removeRoomData__12dMenu_Fmap_cFP23dMenu_Fmap_stage_data_c    */
 bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) {
     dMenu_Fmap_room_data_c* room_data = i_stageData->getFmapRoomDataTop();
     while (room_data != NULL) {
@@ -2560,27 +2418,20 @@ bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) {
     return true;
 }
 
-/* 801CC85C-801CC880 1C719C 0024+00 11/11 0/0 0/0 .text            setTitleName__12dMenu_Fmap_cFUl
- */
 void dMenu_Fmap_c::setTitleName(u32 i_msgIndex) {
     mpDraw2DTop->setTitleNameString(i_msgIndex);
 }
 
-/* 801CC880-801CC8AC 1C71C0 002C+00 13/13 0/0 0/0 .text            setAreaName__12dMenu_Fmap_cFUl */
 void dMenu_Fmap_c::setAreaName(u32 i_msgIndex) {
     mAreaNameSet = true;
     mpDraw2DTop->setAreaNameString(i_msgIndex);
 }
 
-/* 801CC8AC-801CC8DC 1C71EC 0030+00 8/8 0/0 0/0 .text            setAreaNameZero__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::setAreaNameZero() {
     mAreaNameSet = false;
     mpDraw2DTop->setAreaNameString(0);
 }
 
-/* 801CC8DC-801CCA70 1C721C 0194+00 2/2 0/0 0/0 .text
- * portalWarpMapMove__12dMenu_Fmap_cFP9STControl                */
 void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) {
     mpDraw2DBack->regionMapMove(i_stick);
     dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
@@ -2616,18 +2467,14 @@ void dMenu_Fmap_c::portalWarpMapMove(STControl* i_stick) {
     }
 }
 
-/* 801CCA70-801CCA98 1C73B0 0028+00 1/1 0/0 0/0 .text            onRoomDataBit__12dMenu_Fmap_cFi */
 void dMenu_Fmap_c::onRoomDataBit(int i_bit) {
     mRoomDataBits[i_bit >> 5] |= 1 << (i_bit & 0x1f);
 }
 
-/* 801CCA98-801CCAC4 1C73D8 002C+00 1/1 0/0 0/0 .text            isRoomDataBit__12dMenu_Fmap_cFi */
 BOOL dMenu_Fmap_c::isRoomDataBit(int i_bit) {
     return (mRoomDataBits[i_bit >> 5] & 1 << (i_bit & 0x1f)) ? TRUE : FALSE;
 }
 
-/* 801CCAC4-801CCB08 1C7404 0044+00 2/2 0/0 0/0 .text            resetRoomDataBit__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::resetRoomDataBit() {
     for (int i = 0; i < 2; i++) {
         mRoomDataBits[i] = 0;
@@ -2638,7 +2485,6 @@ void dMenu_Fmap_c::resetRoomDataBit() {
     }
 }
 
-/* 801CCB08-801CCD98 1C7448 0290+00 2/2 0/0 0/0 .text            drawIcon__12dMenu_Fmap_cFfb */
 void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) {
     if (mpDraw2DBack->getRegionCursor() + 1 == dComIfGp_getNowLevel()) {
         drawPlayEnterIcon();
@@ -2705,40 +2551,29 @@ void dMenu_Fmap_c::drawIcon(f32 param_0, bool param_1) {
     }
 }
 
-/* 801CCD98-801CCDDC 1C76D8 0044+00 1/1 0/0 0/0 .text            drawLightDropIcon__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::drawLightDropIcon() {
     if (isLightVesselGet()) {
         drawIcon(4, 5);
     }
 }
 
-/* 801CCDDC-801CCE04 1C771C 0028+00 1/1 0/0 0/0 .text            drawBatsumarkIcon__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::drawBatsumarkIcon() {
     drawIcon(5, 0x12);
 }
 
-/* 801CCE04-801CCE48 1C7744 0044+00 1/1 0/0 0/0 .text            drawSnowmanIcon__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::drawSnowmanIcon() {
     drawIcon(0xd, 9);
     drawIcon(0xe, 0xa);
 }
 
-/* 801CCE48-801CCE70 1C7788 0028+00 1/1 0/0 0/0 .text            drawGoldWolfIcon__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::drawGoldWolfIcon() {
     drawIcon(6, 0xb);
 }
 
-/* 801CCE70-801CCE98 1C77B0 0028+00 1/1 0/0 0/0 .text            drawCoachIcon__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::drawCoachIcon() {
     drawIcon(0xa, 0xd);
 }
 
-/* 801CCE98-801CCFB0 1C77D8 0118+00 1/1 0/0 0/0 .text            drawPlayEnterIcon__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::drawPlayEnterIcon() {
     cXyz pos;
     s16 angle;
@@ -2758,7 +2593,6 @@ void dMenu_Fmap_c::drawPlayEnterIcon() {
     }
 }
 
-/* 801CCFB0-801CD000 1C78F0 0050+00 3/3 0/0 0/0 .text checkDrawPortalIcon__12dMenu_Fmap_cFii */
 bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) {
     if (g_fmapHIO.mAllRegionsUnlocked) {
         return true;
@@ -2766,8 +2600,6 @@ bool dMenu_Fmap_c::checkDrawPortalIcon(int i_stageNo, int i_switchNo) {
     return dComIfGs_isStageSwitch(i_stageNo, i_switchNo);
 }
 
-/* 801CD000-801CD10C 1C7940 010C+00 3/3 0/0 0/0 .text            searchIcon__12dMenu_Fmap_cFUciPfPf
- */
 bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o_posZ) {
     dMenuFmapIconDisp_c icon;
     dMenu_Fmap_stage_data_c* stage_data;
@@ -2801,7 +2633,6 @@ bool dMenu_Fmap_c::searchIcon(u8 i_typeGroupNo, int i_swBit, f32* o_posX, f32* o
     return ret;
 }
 
-/* 801CD10C-801CD210 1C7A4C 0104+00 6/6 0/0 0/0 .text            drawIcon__12dMenu_Fmap_cFUci */
 void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) {
     dMenuFmapIconDisp_c icon;
     dMenu_Fmap_stage_data_c* stage_data;
@@ -2830,13 +2661,11 @@ void dMenu_Fmap_c::drawIcon(u8 i_typeGroupNo, int param_1) {
     }
 }
 
-/* 801CD210-801CD254 1C7B50 0044+00 1/1 0/0 0/0 .text            drawEnterIcon__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::drawEnterIcon() {
     drawIcon(1, 0x14);
     drawIcon(8, 0x16);
 }
 
-/* 801CD254-801CD2FC 1C7B94 00A8+00 1/1 0/0 0/0 .text            drawPortalIcon__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::drawPortalIcon() {
     if (mIsWarpMap == true && mpPortalDat != NULL) {
         dMenu_Fmap_portal_data_c* portal_dat = mpPortalDat;
@@ -2850,8 +2679,6 @@ void dMenu_Fmap_c::drawPortalIcon() {
     }
 }
 
-/* 801CD2FC-801CD350 1C7C3C 0054+00 1/1 0/0 0/0 .text            getRegionStageNum__12dMenu_Fmap_cFi
- */
 u8 dMenu_Fmap_c::getRegionStageNum(int param_0) {
     if (mpFieldDat != NULL) {
         dMenu_Fmap_field_region_data_c* region_data
@@ -2867,17 +2694,14 @@ u8 dMenu_Fmap_c::getRegionStageNum(int param_0) {
     return 0;
 }
 
-/* 801CD350-801CD368 1C7C90 0018+00 6/6 0/0 0/0 .text getNowFmapRegionData__12dMenu_Fmap_cFv */
 dMenu_Fmap_region_data_c* dMenu_Fmap_c::getNowFmapRegionData() {
     return mpRegionData[mpDraw2DBack->getRegionCursor()];
 }
 
-/* 801CD368-801CD380 1C7CA8 0018+00 2/2 0/0 0/0 .text getNowFmapStageData__12dMenu_Fmap_cFv */
 dMenu_Fmap_stage_data_c* dMenu_Fmap_c::getNowFmapStageData() {
     return mpStageData[mpDraw2DBack->getRegionCursor()];
 }
 
-/* 801CD380-801CD3F0 1C7CC0 0070+00 1/1 0/0 0/0 .text searchPortalStageID__12dMenu_Fmap_cFPc */
 u8 dMenu_Fmap_c::searchPortalStageID(char* param_0) {
     for (int i = 0; i < 20; i++) {
         if (!strcmp(param_0, mStageName[i])) {
@@ -2887,7 +2711,6 @@ u8 dMenu_Fmap_c::searchPortalStageID(char* param_0) {
     return 0xff;
 }
 
-/* 801CD3F0-801CD460 1C7D30 0070+00 1/1 0/0 0/0 .text            drawDebugStage__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::drawDebugStage() {
     if (mProcess != PROC_ALL_MAP) {
         mpDraw2DBack->setDebugData(mpMenuFmapMap, getNowFmapRegionData(), mStayStageNo);
@@ -2896,7 +2719,6 @@ void dMenu_Fmap_c::drawDebugStage() {
     }
 }
 
-/* 801CD460-801CD5CC 1C7DA0 016C+00 1/1 0/0 0/0 .text            arrowPosInit__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::arrowPosInit() {
     if (mProcess == PROC_TABLE_DEMO1) {
         tableArrowPosInit(false);
@@ -2930,8 +2752,6 @@ void dMenu_Fmap_c::arrowPosInit() {
     }
 }
 
-/* 801CD5CC-801CD770 1C7F0C 01A4+00 2/2 0/0 0/0 .text            tableArrowPosInit__12dMenu_Fmap_cFb
- */
 void dMenu_Fmap_c::tableArrowPosInit(bool param_0) {
     int iVar5 = -1;
     int swbit;
@@ -2980,7 +2800,6 @@ void dMenu_Fmap_c::tableArrowPosInit(bool param_0) {
     }
 }
 
-/* 801CD770-801CD814 1C80B0 00A4+00 1/1 0/0 0/0 .text yamibossArrowPosInit__12dMenu_Fmap_cFv */
 void dMenu_Fmap_c::yamibossArrowPosInit() {
     f32 pos1_x, pos2_x, pos1_z, pos2_z, icon_x, icon_z;
     if (!searchIcon(4, 0x75, &icon_x, &icon_z)) {
@@ -2992,8 +2811,6 @@ void dMenu_Fmap_c::yamibossArrowPosInit() {
     mpDraw2DBack->setArrowPosAxis(icon_x, icon_z + (pos1_z - pos2_z));
 }
 
-/* 801CD814-801CD8B4 1C8154 00A0+00 1/1 0/0 0/0 .text            howlArrowPosInit__12dMenu_Fmap_cFv
- */
 void dMenu_Fmap_c::howlArrowPosInit() {
     u8 type = dMeter2Info_getGoldWolfMapType();
     static char* stage_name[6] = {"F_SP104", "F_SP122", "F_SP122", "F_SP124", "F_SP111", "F_SP116"};
@@ -3006,8 +2823,6 @@ void dMenu_Fmap_c::howlArrowPosInit() {
     }
 }
 
-/* 801CD8B4-801CD92C 1C81F4 0078+00 1/1 0/0 0/0 .text            getHowlRegionID__12dMenu_Fmap_cFv
- */
 u8 dMenu_Fmap_c::getHowlRegionID() {
     switch (dMeter2Info_getGoldWolfMapType()) {
     case 2:
@@ -3027,13 +2842,10 @@ u8 dMenu_Fmap_c::getHowlRegionID() {
     }
 }
 
-/* 801CD92C-801CD95C 1C826C 0030+00 1/1 0/0 0/0 .text            isLightVesselGet__12dMenu_Fmap_cFv
- */
 bool dMenu_Fmap_c::isLightVesselGet() {
     return (bool)dComIfGp_isLightDropMapVisible();
 }
 
-/* 801CD95C-801CDA2C 1C829C 00D0+00 1/1 0/0 0/0 .text            getPlayerPos2D__12dMenu_Fmap_cFv */
 cXyz* dMenu_Fmap_c::getPlayerPos2D() {
     cXyz pos;
     char stage_name[8];
diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp
index 62def86a56..89bf756ad5 100644
--- a/src/d/d_menu_fmap2D.cpp
+++ b/src/d/d_menu_fmap2D.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_fmap2D
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_menu_fmap2D.h"
@@ -23,7 +18,6 @@
 #include "m_Do/m_Do_graphic.h"
 #include "d/actor/d_a_midna.h"
 
-/* 801CF56C-801CFCDC 1C9EAC 0770+00 0/0 1/1 0/0 .text            __ct__18dMenu_Fmap2DBack_cFv */
 dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
     dMeter2Info_setMapDrugFlag(0);
 
@@ -228,7 +222,6 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
     setDebugData(NULL, NULL, 0);
 }
 
-/* 801CFCDC-801CFF34 1CA61C 0258+00 2/1 0/0 0/0 .text            __dt__18dMenu_Fmap2DBack_cFv */
 dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() {
     delete mpBackScreen;
     mpBackScreen = NULL;
@@ -271,7 +264,6 @@ dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() {
     dMeter2Info_setMapDrugFlag(0);
 }
 
-/* 801CFF34-801D0804 1CA874 08D0+00 1/0 0/0 0/0 .text            draw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::draw() {
     calcBlink();
 
@@ -433,8 +425,6 @@ void dMenu_Fmap2DBack_c::draw() {
                     mDoGph_gInf_c::getHeightF(), false, false, false);
 }
 
-/* 801D0804-801D0AC8 1CB144 02C4+00 0/0 1/1 0/0 .text
- * setRegionTexData__18dMenu_Fmap2DBack_cFUcP7ResTIMGfffffffff  */
 void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_originX,
                                           f32 i_originZ, f32 i_posX, f32 i_posZ, f32 i_scale,
                                           f32 i_scrollMinX, f32 i_scrollMinZ, f32 i_scrollMaxX,
@@ -510,7 +500,6 @@ void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_
     }
 }
 
-/* 801D0AC8-801D0BF8 1CB408 0130+00 1/1 1/1 0/0 .text calcAllMapPos__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::calcAllMapPos() {
     bool set = false;
     calcAllMapScaleRate();
@@ -541,8 +530,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos() {
     }
 }
 
-/* 801D0BF8-801D0C6C 1CB538 0074+00 1/1 0/0 0/0 .text calcAllMapScaleRate__18dMenu_Fmap2DBack_cFv
- */
 f32 dMenu_Fmap2DBack_c::calcAllMapScaleRate() {
     f32 width = mTexMaxX - mTexMinX;
     f32 height = mTexMaxZ - mTexMinZ;
@@ -557,8 +544,6 @@ f32 dMenu_Fmap2DBack_c::calcAllMapScaleRate() {
     return mAllMapScaleRate;
 }
 
-/* 801D0C6C-801D0D18 1CB5AC 00AC+00 1/1 0/0 0/0 .text
- * calcAllMapPos2DFirst__18dMenu_Fmap2DBack_cFffPfPf            */
 void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 i_texPosX, f32 i_texPosZ, f32* o_posX,
                                               f32* o_posY) {
     f32 pos_x = (mAllMapScaleRate * (i_texPosX - (mTexMaxX + mTexMinX) * 0.5f));
@@ -568,15 +553,11 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2DFirst(f32 i_texPosX, f32 i_texPosZ, f32*
     *o_posY = pos_y + getMapAreaGlobalCenterPosY();
 }
 
-/* 801D0D18-801D0D50 1CB658 0038+00 13/13 1/1 0/0 .text
- * calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPf                 */
 void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* o_posX, f32* o_posY) {
     calcAllMapPos2D(param_0, param_1, o_posX, o_posY, field_0xf0c[mRegionCursor],
                     field_0xf2c[mRegionCursor], mZoom);
 }
 
-/* 801D0D50-801D0E00 1CB690 00B0+00 0/0 1/1 0/0 .text
- * calcAllMapPos2D__18dMenu_Fmap2DBack_cFPCcffPfPf              */
 void dMenu_Fmap2DBack_c::calcAllMapPos2D(char const* param_0, f32 param_1, f32 param_2,
                                          f32* o_posX, f32* o_posY) {
     f32 tmp1, tmp2;
@@ -585,8 +566,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2D(char const* param_0, f32 param_1, f32 p
                     field_0xf2c[mRegionCursor], mZoom);
 }
 
-/* 801D0E00-801D0F7C 1CB740 017C+00 3/3 0/0 0/0 .text
- * calcAllMapPos2D__18dMenu_Fmap2DBack_cFffPfPffff              */
 void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2, f32* param_3,
                                          f32 param_4, f32 param_5, f32 i_zoom) {
     getMapAreaSizeX();
@@ -605,8 +584,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPos2D(f32 param_0, f32 param_1, f32* param_2,
     *param_3 = tmp5 + tmp4;
 }
 
-/* 801D0F7C-801D1094 1CB8BC 0118+00 8/8 3/3 0/0 .text
- * calcAllMapPosWorld__18dMenu_Fmap2DBack_cFffPfPf              */
 void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param_2, f32* param_3) {
     f32 tmp1 = (mRegionTexData[mRegionCursor].mMinX + mRegionTexData[mRegionCursor].mMaxX) * 0.5f;
     f32 tmp2 = (mRegionTexData[mRegionCursor].mMinZ + mRegionTexData[mRegionCursor].mMaxZ) * 0.5f;
@@ -621,8 +598,6 @@ void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param
     *param_3 = tmp2 + (tmp4 * tmp5);
 }
 
-/* 801D1094-801D10F4 1CB9D4 0060+00 0/0 1/1 0/0 .text setSpotPane__18dMenu_Fmap2DBack_cFP7ResTIMG
- */
 void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) {
     if (mpSpotTexture == NULL) {
         mpSpotTexture = new J2DPicture(i_timg);
@@ -630,7 +605,6 @@ void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) {
     }
 }
 
-/* 801D10F4-801D1148 1CBA34 0054+00 1/1 1/1 0/0 .text deleteSpotPane__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::deleteSpotPane() {
     if (mpSpotTexture != NULL) {
         delete mpSpotTexture;
@@ -638,8 +612,6 @@ void dMenu_Fmap2DBack_c::deleteSpotPane() {
     }
 }
 
-/* 801D1148-801D1478 1CBA88 0330+00 0/0 8/8 0/0 .text            zoomMapCalc__18dMenu_Fmap2DBack_cFf
- */
 void dMenu_Fmap2DBack_c::zoomMapCalc(f32 i_zoom) {
     mMapZoomRate = i_zoom;
     field_0xfa8 = i_zoom;
@@ -702,7 +674,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalc(f32 i_zoom) {
          getMapAreaSizeX());
 }
 
-/* 801D1478-801D1858 1CBDB8 03E0+00 0/0 10/10 0/0 .text zoomMapCalc2__18dMenu_Fmap2DBack_cFf */
 void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) {
     f32 spotZoomRate = getSpotMapZoomRate();
     f32 regionZoomRate = getRegionMapZoomRate(mRegionCursor);
@@ -782,7 +753,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalc2(f32 param_0) {
     }
 }
 
-/* 801D1858-801D1AA4 1CC198 024C+00 0/0 1/1 0/0 .text zoomMapCalcHIO__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::zoomMapCalcHIO() {
     if (mZoom != getSpotMapZoomRate()) {
         f32 spotZoomRate = getSpotMapZoomRate();
@@ -829,8 +799,6 @@ void dMenu_Fmap2DBack_c::zoomMapCalcHIO() {
     }
 }
 
-/* 801D1AA4-801D1D50 1CC3E4 02AC+00 2/2 0/0 0/0 .text            scrollCalc__18dMenu_Fmap2DBack_cFf
- */
 void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) {
     f32 tmp1, tmp2;
     calcAllMapPos2D(mArrowPos3DX + control_xpos, mArrowPos3DZ + control_ypos, &tmp1, &tmp2,
@@ -892,8 +860,6 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) {
     calcRenderingPos();
 }
 
-/* 801D1D50-801D1D74 1CC690 0024+00 0/0 1/1 0/0 .text            mapBlink__18dMenu_Fmap2DBack_cFPs
- */
 void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) {
     *param_0 += 1;
     if (*param_0 >= 30) {
@@ -901,7 +867,6 @@ void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) {
     }
 }
 
-/* 801D1D74-801D1DC4 1CC6B4 0050+00 1/1 5/5 0/0 .text setSpotCursor__18dMenu_Fmap2DBack_cFUc */
 void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) {
     this->mSpotCursor = param_0;
 
@@ -910,8 +875,6 @@ void dMenu_Fmap2DBack_c::setSpotCursor(u8 param_0) {
     calcAllMapPos2D(tmp1, tmp2, &field_0x1184, &field_0x1188);
 }
 
-/* 801D1DC4-801D2100 1CC704 033C+00 0/0 1/1 0/0 .text
- * allmap_move2__18dMenu_Fmap2DBack_cFP9STControl               */
 void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) {
     f32 tmp1, tmp2;
     calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &tmp1, &tmp2);
@@ -986,8 +949,6 @@ void dMenu_Fmap2DBack_c::allmap_move2(STControl* param_0) {
     }
 }
 
-/* 801D2100-801D241C 1CCA40 031C+00 1/1 3/3 0/0 .text setIcon2DPos__18dMenu_Fmap2DBack_cFUcfffUcb
- */
 void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32 param_3, u8 param_4,
                                       bool param_5) {
     f32 local_68, local_6c;
@@ -1043,15 +1004,11 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, f32 param_1, f32 param_2, f32
     }
 }
 
-/* 801D241C-801D2454 1CCD5C 0038+00 0/0 2/2 0/0 .text
- * setIcon2DPos__18dMenu_Fmap2DBack_cFUcPCcfffUcb               */
 void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, char const* param_1, f32 param_2, f32 param_3,
                                       f32 param_4, u8 param_5, bool param_6) {
     setIcon2DPos(param_0, mRegionCursor, param_1, param_2, param_3, param_4, param_5, param_6);
 }
 
-/* 801D2454-801D2508 1CCD94 00B4+00 1/1 0/0 0/0 .text
- * setIcon2DPos__18dMenu_Fmap2DBack_cFUcUcPCcfffUcb             */
 void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, u8 param_1, char const* param_2, f32 param_3,
                                       f32 param_4, f32 param_5, u8 param_6, bool param_7) {
     f32 tmp1, tmp2;
@@ -1060,7 +1017,6 @@ void dMenu_Fmap2DBack_c::setIcon2DPos(u8 param_0, u8 param_1, char const* param_
     setIcon2DPos(param_0, param_3 + tmp1, param_4 + tmp2, param_5, param_6, param_7);
 }
 
-/* 801D2508-801D2658 1CCE48 0150+00 1/1 1/1 0/0 .text isShowRegion__18dMenu_Fmap2DBack_cFi */
 int dMenu_Fmap2DBack_c::isShowRegion(int param_0) {
     if (param_0 == 7) {
         return 1;
@@ -1094,58 +1050,42 @@ int dMenu_Fmap2DBack_c::isShowRegion(int param_0) {
     return 0;
 }
 
-/* 801D2658-801D2668 1CCF98 0010+00 2/2 0/0 0/0 .text getMapAreaGlobalPosX__18dMenu_Fmap2DBack_cFv
- */
 f32 dMenu_Fmap2DBack_c::getMapAreaGlobalPosX() {
     return g_fmapHIO.mMapTopLeftPosX;
 }
 
-/* 801D2668-801D2678 1CCFA8 0010+00 2/2 0/0 0/0 .text getMapAreaGlobalPosY__18dMenu_Fmap2DBack_cFv
- */
 f32 dMenu_Fmap2DBack_c::getMapAreaGlobalPosY() {
     return g_fmapHIO.mMapTopLeftPosY;
 }
 
-/* 801D2678-801D26C8 1CCFB8 0050+00 7/7 1/1 0/0 .text
- * getMapAreaGlobalCenterPosX__18dMenu_Fmap2DBack_cFv           */
 f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosX() {
     return getMapAreaGlobalPosX() + (getMapAreaSizeX() / 2.0f);
 }
 
-/* 801D26C8-801D2718 1CD008 0050+00 7/7 1/1 0/0 .text
- * getMapAreaGlobalCenterPosY__18dMenu_Fmap2DBack_cFv           */
 f32 dMenu_Fmap2DBack_c::getMapAreaGlobalCenterPosY() {
     return getMapAreaGlobalPosY() + (getMapAreaSizeY() / 2.0f);
 }
 
-/* 801D2718-801D2728 1CD058 0010+00 8/8 0/0 0/0 .text getMapAreaSizeX__18dMenu_Fmap2DBack_cFv */
 f32 dMenu_Fmap2DBack_c::getMapAreaSizeX() {
     return g_fmapHIO.mMapScale;
 }
 
-/* 801D2728-801D2738 1CD068 0010+00 6/6 0/0 0/0 .text getMapAreaSizeY__18dMenu_Fmap2DBack_cFv */
 f32 dMenu_Fmap2DBack_c::getMapAreaSizeY() {
     return g_fmapHIO.mMapScale;
 }
 
-/* 801D2738-801D2790 1CD078 0058+00 10/10 0/0 0/0 .text
- * getMapScissorAreaLX__18dMenu_Fmap2DBack_cFv                  */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaLX() {
     Mtx mtx;
     Vec vec = mpMapArea->getGlobalVtx(mpMapArea->getPanePtr(), &mtx, 0, false, 0);
     return vec.x;
 }
 
-/* 801D2790-801D27E8 1CD0D0 0058+00 9/9 0/0 0/0 .text getMapScissorAreaLY__18dMenu_Fmap2DBack_cFv
- */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaLY() {
     Mtx mtx;
     Vec vec = mpMapArea->getGlobalVtx(mpMapArea->getPanePtr(), &mtx, 0, false, 0);
     return vec.y;
 }
 
-/* 801D27E8-801D2860 1CD128 0078+00 2/2 0/0 0/0 .text
- * getMapScissorAreaSizeX__18dMenu_Fmap2DBack_cFv               */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeX() {
     f32 scale = mpMapArea->getScaleX();
 
@@ -1158,26 +1098,18 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeX() {
     return scale * mpMapArea->getSizeX();
 }
 
-/* 801D2860-801D2880 1CD1A0 0020+00 8/8 0/0 0/0 .text
- * getMapScissorAreaSizeRealX__18dMenu_Fmap2DBack_cFv           */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealX() {
     return getMapScissorAreaSizeX();
 }
 
-/* 801D2880-801D28D0 1CD1C0 0050+00 3/3 0/0 0/0 .text
- * getMapScissorAreaCenterPosX__18dMenu_Fmap2DBack_cFv          */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosX() {
     return getMapScissorAreaLX() + (getMapScissorAreaSizeRealX() / 2.0f);
 }
 
-/* 801D28D0-801D2920 1CD210 0050+00 3/3 0/0 0/0 .text
- * getMapScissorAreaCenterPosY__18dMenu_Fmap2DBack_cFv          */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaCenterPosY() {
     return getMapScissorAreaLY() + (getMapScissorAreaSizeRealY() / 2.0f);
 }
 
-/* 801D2920-801D2998 1CD260 0078+00 2/2 0/0 0/0 .text
- * getMapScissorAreaSizeY__18dMenu_Fmap2DBack_cFv               */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeY() {
     f32 scale = mpMapArea->getScaleY();
 
@@ -1190,13 +1122,10 @@ f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeY() {
     return scale * mpMapArea->getSizeY();
 }
 
-/* 801D2998-801D29B8 1CD2D8 0020+00 11/11 0/0 0/0 .text
- * getMapScissorAreaSizeRealY__18dMenu_Fmap2DBack_cFv           */
 f32 dMenu_Fmap2DBack_c::getMapScissorAreaSizeRealY() {
     return getMapScissorAreaSizeY();
 }
 
-/* 801D29B8-801D2A34 1CD2F8 007C+00 6/6 0/0 0/0 .text calcRenderingPos__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::calcRenderingPos() {
     calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &mRenderingPosX,
                        &mRenderingPosZ);
@@ -1205,8 +1134,6 @@ void dMenu_Fmap2DBack_c::calcRenderingPos() {
     mRenderingPosZ += mStageTransZ;
 }
 
-/* 801D2A34-801D2AC8 1CD374 0094+00 7/7 0/0 0/0 .text calcRenderingScale__18dMenu_Fmap2DBack_cFv
- */
 void dMenu_Fmap2DBack_c::calcRenderingScale() {
     f32 xScale = (mTexMaxX - mTexMinX) / getMapAreaSizeX();
     f32 yScale = (mTexMaxZ - mTexMinZ) / getMapAreaSizeY();
@@ -1220,7 +1147,6 @@ void dMenu_Fmap2DBack_c::calcRenderingScale() {
     field_0xf98 = mRenderingScale * getMapScissorAreaSizeRealY();
 }
 
-/* 801D2AC8-801D2B5C 1CD408 0094+00 1/1 0/0 0/0 .text getPathScale__18dMenu_Fmap2DBack_cFf */
 f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) {
     JUT_ASSERT(2204, i_zoom != 0.0f);
 
@@ -1235,13 +1161,10 @@ f32 dMenu_Fmap2DBack_c::getPathScale(f32 i_zoom) {
     return (scale * getMapScissorAreaSizeRealY()) / i_zoom;
 }
 
-/* 801D2B5C-801D2B64 1CD49C 0008+00 6/6 0/0 0/0 .text getAllMapZoomRate__18dMenu_Fmap2DBack_cFv */
 f32 dMenu_Fmap2DBack_c::getAllMapZoomRate() {
     return 1.0f;
 }
 
-/* 801D2B64-801D2C4C 1CD4A4 00E8+00 6/6 0/0 0/0 .text getRegionMapZoomRate__18dMenu_Fmap2DBack_cFi
- */
 f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int i_regionNo) {
     f32 tmp1, tmp2;
 
@@ -1265,8 +1188,6 @@ f32 dMenu_Fmap2DBack_c::getRegionMapZoomRate(int i_regionNo) {
     return tmp2;
 }
 
-/* 801D2C4C-801D2C88 1CD58C 003C+00 4/4 0/0 0/0 .text getSpotMapZoomRate__18dMenu_Fmap2DBack_cFv
- */
 f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() {
     f32 tmp1 = mTexMaxX - mTexMinX;
     f32 tmp2 = mTexMaxZ - mTexMinZ;
@@ -1279,8 +1200,6 @@ f32 dMenu_Fmap2DBack_c::getSpotMapZoomRate() {
     return tmp3 / g_fmapHIO.mRegionZoomRange;
 }
 
-/* 801D2C88-801D2CC8 1CD5C8 0040+00 1/1 0/0 0/0 .text
- * getStageOriginPath__18dMenu_Fmap2DBack_cFUcPfPf              */
 void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param_2) {
     for (int i = 0; i < 20; i++) {
         if (i == param_0) {
@@ -1291,8 +1210,6 @@ void dMenu_Fmap2DBack_c::getStageOriginPath(u8 param_0, f32* param_1, f32* param
     }
 }
 
-/* 801D2CC8-801D2DA8 1CD608 00E0+00 4/4 0/0 0/0 .text calcOffset__18dMenu_Fmap2DBack_cFUcPCcPfPf
- */
 void dMenu_Fmap2DBack_c::calcOffset(u8 i_regionNo, char const* i_stageName,
                                     f32* o_offsetX, f32* o_offsetZ) {
     if (mpStages != NULL) {
@@ -1310,7 +1227,6 @@ void dMenu_Fmap2DBack_c::calcOffset(u8 i_regionNo, char const* i_stageName,
     *o_offsetZ = mRegionOriginZ[i_regionNo];
 }
 
-/* 801D2DA8-801D3094 1CD6E8 02EC+00 1/1 0/0 0/0 .text regionTextureDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::regionTextureDraw() {
     f32 local_84, local_88;
     calcAllMapPosWorld(getMapScissorAreaCenterPosX(), getMapScissorAreaCenterPosY(), &local_84,
@@ -1372,7 +1288,6 @@ void dMenu_Fmap2DBack_c::regionTextureDraw() {
     }
 }
 
-/* 801D3094-801D31D0 1CD9D4 013C+00 1/1 0/0 0/0 .text stageTextureDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::stageTextureDraw() {
     if (mAllPathShowFlag) {
         mpSpotTexture->setAlpha(mAlphaRate * 255.0f * mSpotTextureFadeAlpha);
@@ -1386,7 +1301,6 @@ void dMenu_Fmap2DBack_c::stageTextureDraw() {
                         false);
 }
 
-/* 801D31D0-801D34DC 1CDB10 030C+00 1/1 0/0 0/0 .text worldGridDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::worldGridDraw() {
     f32 local_74, local_78;
 
@@ -1456,7 +1370,6 @@ void dMenu_Fmap2DBack_c::worldGridDraw() {
     }
 }
 
-/* 801D34DC-801D382C 1CDE1C 0350+00 1/1 0/0 0/0 .text regionGridDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::regionGridDraw() {
     f32 local_74, local_78;
 
@@ -1531,7 +1444,6 @@ static f32 dummy(int param_0) {
     return param_0;
 }
 
-/* 801D382C-801D38FC 1CE16C 00D0+00 1/1 0/0 0/0 .text worldOriginDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::worldOriginDraw() {
     f32 local_44, local_48;
     calcAllMapPos2D(-mStageTransX, -mStageTransZ, &local_44, &local_48);
@@ -1547,7 +1459,6 @@ void dMenu_Fmap2DBack_c::worldOriginDraw() {
                 JUtility::TColor(0, 255, 0, 255), 6);
 }
 
-/* 801D38FC-801D3AF8 1CE23C 01FC+00 1/1 0/0 0/0 .text scrollAreaDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::scrollAreaDraw() {
     for (int i = 0; i < 8; i++) {
         if (mMapZoomRate != 0.0f && i != mRegionCursor) {
@@ -1582,7 +1493,6 @@ void dMenu_Fmap2DBack_c::scrollAreaDraw() {
     }
 }
 
-/* 801D3AF8-801D3BBC 1CE438 00C4+00 1/1 0/0 0/0 .text regionOriginDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::regionOriginDraw() {
     for (int i = 0; i < 8; i++) {
         if (!mpAreaTex[i]) {
@@ -1596,7 +1506,6 @@ void dMenu_Fmap2DBack_c::regionOriginDraw() {
     }
 }
 
-/* 801D3BBC-801D3CB8 1CE4FC 00FC+00 1/1 0/0 0/0 .text stageOriginDraw__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::stageOriginDraw() {
     if (!mpStages) {
         return;
@@ -1618,8 +1527,6 @@ void dMenu_Fmap2DBack_c::stageOriginDraw() {
     }
 }
 
-/* 801D3CB8-801D4928 1CE5F8 0C70+00 1/1 0/0 0/0 .text            calcBlink__18dMenu_Fmap2DBack_cFv
- */
 void dMenu_Fmap2DBack_c::calcBlink() {
     f32 t;
     int i;
@@ -1782,7 +1689,6 @@ void dMenu_Fmap2DBack_c::calcBlink() {
     field_0x1214 = unselected_min + t_unselected * (unselected_max - unselected_min);
 }
 
-/* 801D4928-801D49E0 1CF268 00B8+00 0/0 1/1 0/0 .text calcBackAlpha__18dMenu_Fmap2DBack_cFb */
 void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) {
     if (param_0) {
         if (mBackAlpha != 1.0f) {
@@ -1801,7 +1707,6 @@ void dMenu_Fmap2DBack_c::calcBackAlpha(bool param_0) {
     }
 }
 
-/* 801D49E0-801D4AFC 1CF320 011C+00 0/0 1/1 0/0 .text btkAnimeLoop__18dMenu_Fmap2DBack_cFf */
 void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) {
     if (mpBaseAnm) {
         mAnmFrame += i_step;
@@ -1818,13 +1723,10 @@ void dMenu_Fmap2DBack_c::btkAnimeLoop(f32 i_step) {
     mpBaseScreen->animation();
 }
 
-/* 801D4AFC-801D4B2C 1CF43C 0030+00 0/0 1/1 0/0 .text setBaseBackAlpha__18dMenu_Fmap2DBack_cFUc */
 void dMenu_Fmap2DBack_c::setBaseBackAlpha(u8 param_0) {
     mpMapBlack->setAlpha(param_0);
 }
 
-/* 801D4B2C-801D4E80 1CF46C 0354+00 0/0 3/3 0/0 .text
- * regionMapMove__18dMenu_Fmap2DBack_cFP9STControl              */
 void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) {
     f32 min_x, min_y, max_x, max_y;
     calcAllMapPosWorld(getMapScissorAreaLX(), getMapScissorAreaLY(), &min_x, &min_y);
@@ -1887,8 +1789,6 @@ void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) {
     }
 }
 
-/* 801D4E80-801D5334 1CF7C0 04B4+00 0/0 1/1 0/0 .text
- * stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb            */
 void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param_2) {
     f32 min_x, min_y, max_x, max_y, center_x, center_y;
 
@@ -1979,7 +1879,6 @@ void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param
     mpMeterHaihai->_execute(0);
 }
 
-/* 801D5334-801D5388 1CFC74 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__18dMenu_Fmap2DBack_cFfb */
 void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 i_rate, bool i_init) {
     mAlphaRate = i_rate;
     if (i_init) {
@@ -1988,8 +1887,6 @@ void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 i_rate, bool i_init) {
     mpBaseRoot->setAlphaMorfRate(i_rate);
 }
 
-/* 801D5388-801D564C 1CFCC8 02C4+00 1/1 0/0 0/0 .text drawDebugStageArea__18dMenu_Fmap2DBack_cFv
- */
 void dMenu_Fmap2DBack_c::drawDebugStageArea() {
     JUtility::TColor colors[6] = {
         JUtility::TColor(255, 255, 0, 50),
@@ -2018,8 +1915,6 @@ void dMenu_Fmap2DBack_c::drawDebugStageArea() {
     }
 }
 
-/* 801D564C-801D58F8 1CFF8C 02AC+00 1/1 0/0 0/0 .text drawDebugRegionArea__18dMenu_Fmap2DBack_cFv
- */
 void dMenu_Fmap2DBack_c::drawDebugRegionArea() {
     getAllMapZoomRate();
 
@@ -2055,8 +1950,6 @@ void dMenu_Fmap2DBack_c::drawDebugRegionArea() {
     }
 }
 
-/* 801D58F8-801D59C0 1D0238 00C8+00 0/0 2/2 0/0 .text setArrowPos3D__18dMenu_Fmap2DBack_cFUcPCcff
- */
 void dMenu_Fmap2DBack_c::setArrowPos3D(u8 i_regionNo, char const* i_stageName, f32 i_posX,
                                        f32 i_posZ) {
     f32 offset_x = 0.0f;
@@ -2075,8 +1968,6 @@ void dMenu_Fmap2DBack_c::setArrowPos3D(u8 i_regionNo, char const* i_stageName, f
     control_ypos = 0.0f;
 }
 
-/* 801D59C0-801D5AC4 1D0300 0104+00 0/0 1/1 0/0 .text
- * setArrowPos3DOffset__18dMenu_Fmap2DBack_cFUcPCcfff           */
 void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 i_regionNo, char const* i_stageName, f32 i_posX,
                                              f32 i_posZ, f32 param_4) {
     f32 offset_x, offset_z, pos2d_x, pos2d_y;
@@ -2098,7 +1989,6 @@ void dMenu_Fmap2DBack_c::setArrowPos3DOffset(u8 i_regionNo, char const* i_stageN
     control_ypos = 0.0f;
 }
 
-/* 801D5AC4-801D5BB8 1D0404 00F4+00 0/0 2/2 0/0 .text calcDrawPriority__18dMenu_Fmap2DBack_cFv */
 void dMenu_Fmap2DBack_c::calcDrawPriority() {
     u8 region;
     u8 dVar2 = mRegionCursor;
@@ -2147,7 +2037,6 @@ void dMenu_Fmap2DBack_c::calcDrawPriority() {
     }
 }
 
-/* 801D5BB8-801D5BD0 1D04F8 0018+00 0/0 3/3 0/0 .text setArrowPosAxis__18dMenu_Fmap2DBack_cFff */
 void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 i_posX, f32 i_posZ) {
     mArrowPos3DX = i_posX;
     mArrowPos3DZ = i_posZ;
@@ -2155,8 +2044,6 @@ void dMenu_Fmap2DBack_c::setArrowPosAxis(f32 i_posX, f32 i_posZ) {
     control_ypos = 0.0f;
 }
 
-/* 801D5BD0-801D6700 1D0510 0B30+00 0/0 1/1 0/0 .text
- * __ct__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl           */
 dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
     mpHeap = i_heap;
     mTransX = 0.0f;
@@ -2347,7 +2234,6 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) {
     setHIO(true);
 }
 
-/* 801D6700-801D6A44 1D1040 0344+00 1/0 0/0 0/0 .text            __dt__17dMenu_Fmap2DTop_cFv */
 dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
     deleteExplain();
     delete mpTitleScreen;
@@ -2399,7 +2285,6 @@ dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() {
     mpAnm = NULL;
 }
 
-/* 801D6A44-801D6C44 1D1384 0200+00 0/0 1/1 0/0 .text            _execute__17dMenu_Fmap2DTop_cFv */
 void dMenu_Fmap2DTop_c::_execute() {
     switch (mAlphaButtonA) {
     case ALPHA_MIN:
@@ -2474,7 +2359,6 @@ void dMenu_Fmap2DTop_c::_execute() {
     setHIO(false);
 }
 
-/* 801D6C44-801D6C98 1D1584 0054+00 0/0 2/2 0/0 .text setAllAlphaRate__17dMenu_Fmap2DTop_cFfb */
 void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 i_rate, bool i_init) {
     mAlphaRate = i_rate;
     if (i_init) {
@@ -2483,7 +2367,6 @@ void dMenu_Fmap2DTop_c::setAllAlphaRate(f32 i_rate, bool i_init) {
     mpTitleRoot->setAlphaMorfRate(i_rate);
 }
 
-/* 801D6C98-801D6DF8 1D15D8 0160+00 1/0 0/0 0/0 .text            draw__17dMenu_Fmap2DTop_cFv */
 void dMenu_Fmap2DTop_c::draw() {
     u32 scissor_left, scissor_top, scissor_width, scissor_height;
     J2DOrthoGraph* ctx = static_cast<J2DOrthoGraph*>(dComIfGp_getCurrentGrafPort());
@@ -2499,8 +2382,6 @@ void dMenu_Fmap2DTop_c::draw() {
     }
 }
 
-/* 801D6DF8-801D6EDC 1D1738 00E4+00 0/0 1/1 0/0 .text
- * btkAnimeLoop__17dMenu_Fmap2DTop_cFP19J2DAnmTextureSRTKeyf    */
 void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) {
     if (i_anm) {
         mAnmFrame += i_delta;
@@ -2516,13 +2397,10 @@ void dMenu_Fmap2DTop_c::btkAnimeLoop(J2DAnmTextureSRTKey* i_anm, f32 i_delta) {
     mpTitleScreen->animation();
 }
 
-/* 801D6EDC-801D6F38 1D181C 005C+00 0/0 1/1 0/0 .text setMoyaAlpha__17dMenu_Fmap2DTop_cFUc */
 void dMenu_Fmap2DTop_c::setMoyaAlpha(u8 i_alpha) {
     mpTitleScreen->search('spot_0')->setAlpha(i_alpha);
 }
 
-/* 801D6F38-801D7010 1D1878 00D8+00 1/1 1/1 0/0 .text setTitleNameString__17dMenu_Fmap2DTop_cFUl
- */
 void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 sfont_name[7] = {
@@ -2546,7 +2424,6 @@ void dMenu_Fmap2DTop_c::setTitleNameString(u32 param_0) {
     }
 }
 
-/* 801D7010-801D70E8 1D1950 00D8+00 0/0 2/2 0/0 .text setAreaNameString__17dMenu_Fmap2DTop_cFUl */
 void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 iarea_name[3] = {'i_name_s', 'i_name', 'i_name1'};
@@ -2566,8 +2443,6 @@ void dMenu_Fmap2DTop_c::setAreaNameString(u32 param_0) {
     }
 }
 
-/* 801D70E8-801D7210 1D1A28 0128+00 1/1 12/12 0/0 .text setZButtonString__17dMenu_Fmap2DTop_cFUlUc
- */
 void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
     if (param_0 == 0x529 && ((daMidna_c*)daPy_py_c::getMidnaActor())->checkPortalObjRide()) {
         param_0 = 0x533;
@@ -2600,8 +2475,6 @@ void dMenu_Fmap2DTop_c::setZButtonString(u32 param_0, u8 i_alpha) {
     }
 }
 
-/* 801D7210-801D72D4 1D1B50 00C4+00 1/1 9/9 0/0 .text setBButtonString__17dMenu_Fmap2DTop_cFUlUc
- */
 void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 cont_bt[5] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'};
@@ -2626,8 +2499,6 @@ void dMenu_Fmap2DTop_c::setBButtonString(u32 param_0, u8 i_alpha) {
     }
 }
 
-/* 801D72D4-801D7398 1D1C14 00C4+00 1/1 14/14 0/0 .text setAButtonString__17dMenu_Fmap2DTop_cFUlUc
- */
 void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 cont_at[5] = {'cont_at', 'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4'};
@@ -2652,7 +2523,6 @@ void dMenu_Fmap2DTop_c::setAButtonString(u32 param_0, u8 i_alpha) {
     }
 }
 
-/* 801D7398-801D74EC 1D1CD8 0154+00 1/1 8/8 0/0 .text setCrossLRString__17dMenu_Fmap2DTop_cFUl */
 void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 juji_c[5] = {'juji_c00', 'juji_c01', 'juji_c02', 'juji_c03', 'juji_c04'};
@@ -2676,8 +2546,6 @@ void dMenu_Fmap2DTop_c::setCrossLRString(u32 param_0) {
     }
 }
 
-/* 801D74EC-801D7640 1D1E2C 0154+00 1/1 10/10 0/0 .text set3DStickString__17dMenu_Fmap2DTop_cFUl
- */
 void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) {
 #if VERSION == VERSION_GCN_JPN
     static const u64 ast_c[5] = {'ast_00', 'ast_01', 'ast_02', 'ast_03', 'ast_04'};
@@ -2701,8 +2569,6 @@ void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) {
     }
 }
 
-/* 801D7640-801D76C0 1D1F80 0080+00 0/0 5/5 0/0 .text
- * createExplain__17dMenu_Fmap2DTop_cFP10JKRExpHeapP9STControl  */
 void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) {
     if (!mpScrnExplain) {
         JKRHeap* heap = mDoExt_setCurrentHeap(i_heap);
@@ -2711,7 +2577,6 @@ void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) {
     }
 }
 
-/* 801D76C0-801D7714 1D2000 0054+00 1/1 2/2 0/0 .text deleteExplain__17dMenu_Fmap2DTop_cFv */
 void dMenu_Fmap2DTop_c::deleteExplain() {
     if (mpScrnExplain) {
         delete mpScrnExplain;
@@ -2719,8 +2584,6 @@ void dMenu_Fmap2DTop_c::deleteExplain() {
     }
 }
 
-/* 801D7714-801D77C4 1D2054 00B0+00 0/0 12/12 0/0 .text
- * setArrowAlphaRatio__17dMenu_Fmap2DTop_cFUcf                  */
 void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 i_mask, f32 i_rate) {
     if (i_mask & ARROW_LEFT) {
         for (int i = 0; i < 2; i++) {
@@ -2739,8 +2602,6 @@ void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 i_mask, f32 i_rate) {
     }
 }
 
-/* 801D77C4-801D7858 1D2104 0094+00 1/1 0/0 0/0 .text
- * setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha       */
 void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane) {
     s16 timer = i_pane->getAlphaTimer();
     if (timer > 0 || i_pane->getAlphaRate() != 0.0f) {
@@ -2753,8 +2614,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane) {
     }
 }
 
-/* 801D7858-801D78FC 1D2198 00A4+00 1/1 0/0 0/0 .text
- * setAlphaAnimeMid__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha       */
 void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* i_pane) {
     s16 timer = i_pane->getAlphaTimer();
     if (timer != 3 || i_pane->getAlphaRate() != 0.25f) {
@@ -2768,8 +2627,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMid(CPaneMgrAlpha* i_pane) {
     }
 }
 
-/* 801D78FC-801D7994 1D223C 0098+00 1/1 0/0 0/0 .text
- * setAlphaAnimeMax__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha       */
 void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane) {
     s16 timer = i_pane->getAlphaTimer();
     if (timer < 5 || i_pane->getAlphaRate() != 1.0f) {
@@ -2782,8 +2639,6 @@ void dMenu_Fmap2DTop_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane) {
     }
 }
 
-/* 801D7994-801D7A08 1D22D4 0074+00 1/1 3/3 0/0 .text checkPlayerWarpAccept__17dMenu_Fmap2DTop_cFv
- */
 bool dMenu_Fmap2DTop_c::checkPlayerWarpAccept() {
     bool ret;
     if (!checkWarpAcceptCannon()) {
@@ -2796,8 +2651,6 @@ bool dMenu_Fmap2DTop_c::checkPlayerWarpAccept() {
     return ret;
 }
 
-/* 801D7A08-801D7AB4 1D2348 00AC+00 1/1 0/0 0/0 .text checkWarpAcceptRegion__17dMenu_Fmap2DTop_cFi
- */
 bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int i_region) {
     if (g_fmapHIO.mAllRegionsUnlocked) {
         return true;
@@ -2818,8 +2671,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion(int i_region) {
     return false;
 }
 
-/* 801D7AB4-801D7B58 1D23F4 00A4+00 1/1 3/3 0/0 .text
- * checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv                */
 bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() {
     if (dComIfGp_getNowLevel() == 4 && !checkWarpAcceptRegion(3)) {
         return false;
@@ -2836,7 +2687,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptRegion4() {
     return true;
 }
 
-/* 801D7B58-801D7BCC 1D2498 0074+00 1/1 3/3 0/0 .text            checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv */
 bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() {
         /* dSv_event_flag_c::F_0786 - Kakariko Village - Forced conversation with Shad when he sees the sky cannon */
     if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[786])
@@ -2849,7 +2699,6 @@ bool dMenu_Fmap2DTop_c::checkWarpAcceptCannon() {
     return true;
 }
 
-/* 801D7BCC-801D8088 1D250C 04BC+00 2/2 0/0 0/0 .text            setHIO__17dMenu_Fmap2DTop_cFb */
 void dMenu_Fmap2DTop_c::setHIO(bool param_0) {
     if (mTitlePosX != g_fmapHIO.mTitlePosX || mTitlePosY != g_fmapHIO.mTitlePosY) {
         mTitlePosX = g_fmapHIO.mTitlePosX;
@@ -2928,7 +2777,6 @@ void dMenu_Fmap2DTop_c::setHIO(bool param_0) {
     }
 }
 
-/* 801D8088-801D810C 1D29C8 0084+00 1/1 3/3 0/0 .text            isWarpAccept__17dMenu_Fmap2DTop_cFv */
 bool dMenu_Fmap2DTop_c::isWarpAccept() {
          /* dSv_event_flag_c::M_021 - Main Event - First portal warp */
     if ((dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[54])
diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp
index 67e662224c..648ac30828 100644
--- a/src/d/d_menu_fmap_map.cpp
+++ b/src/d/d_menu_fmap_map.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_fmap_map
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/JUtility/JUTTexture.h"
@@ -11,14 +6,10 @@
 #include "d/d_menu_fmap_map.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 801CE068-801CE0CC 1C89A8 0064+00 1/1 0/0 0/0 .text            twoValueLineInterpolation__FUcUcf
- */
 static u8 twoValueLineInterpolation(u8 i_value1, u8 i_value2, f32 i_param) {
     return (u8)((f32)i_value1 + i_param * ((f32)i_value2 - (f32)i_value1));
 }
 
-/* 801CE0CC-801CE15C 1C8A0C 0090+00 2/2 0/0 0/0 .text
- * twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor */
 static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_color2,
                                       f32 i_param, GXColor& o_color) {
     o_color.r = twoValueLineInterpolation(i_color1.r, i_color2.r, i_param);
@@ -27,8 +18,6 @@ static void twoColorLineInterporation(GXColor const& i_color1, GXColor const& i_
     o_color.a = twoValueLineInterpolation(i_color1.a, i_color2.a, i_param);
 }
 
-/* 801CE15C-801CE188 1C8A9C 002C+00 1/1 0/0 0/0 .text            init__15renderingFmap_cFPUcUsUsUsUs
- */
 void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 param_3, u16 param_4) {
     field_0x4 = param_0;
     mTexWidth = i_texWidth;
@@ -40,8 +29,6 @@ void renderingFmap_c::init(u8* param_0, u16 i_texWidth, u16 i_texHeight, u16 par
     mDrawEnable = false;
 }
 
-/* 801CE188-801CE224 1C8AC8 009C+00 1/1 0/0 0/0 .text
- * entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff      */
 void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo,
                             f32 i_posX, f32 i_posY, f32 i_scale) {
     mpWorldData = i_worldData;
@@ -54,13 +41,10 @@ void renderingFmap_c::entry(dMenu_Fmap_world_data_c* i_worldData, int i_startSta
     dComIfGd_setCopy2D(this);
 }
 
-/* 801CE224-801CE288 1C8B64 0064+00 1/1 0/0 0/0 .text isSwitchSpecialOff__15renderingFmap_cFi */
 bool renderingFmap_c::isSwitchSpecialOff(int i_swbit) {
     return !strcmp(dComIfGp_getStartStageName(), "F_SP121") && i_swbit == 0xb2;
 }
 
-/* 801CE288-801CE3C0 1C8BC8 0138+00 2/0 0/0 0/0 .text
- * isSwitch__15renderingFmap_cFPCQ211dDrawPath_c11group_class   */
 bool renderingFmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
     if (i_group->mSwbit == 0xff) {
         return true;
@@ -95,8 +79,6 @@ bool renderingFmap_c::isSwitch(dDrawPath_c::group_class const* i_group) {
     }
 }
 
-/* 801CE3C0-801CE410 1C8D00 0050+00 0/0 3/3 0/0 .text
- * getPointStagePathInnerNo__15renderingFmap_cFP24dMenu_Fmap_region_data_cffiPiPi */
 int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_regionData,
                                                f32 i_offsetX, f32 i_offsetY, int i_stageNo,
                                                int* o_stageNo, int* o_roomNo) {
@@ -105,7 +87,6 @@ int renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* i_region
                                                   i_stageNo, o_stageNo, o_roomNo);
 }
 
-/* 801CE410-801CE4D4 1C8D50 00C4+00 2/0 0/0 0/0 .text            preDrawPath__15renderingFmap_cFv */
 void renderingFmap_c::preDrawPath() {
     mEye.x = mPosX;
     mEye.y = mPosZ;
@@ -125,34 +106,27 @@ void renderingFmap_c::preDrawPath() {
     GXSetMisc(GX_MT_XF_FLUSH, 8);
 }
 
-/* 801CE4D4-801CE4DC 1C8E14 0008+00 2/0 0/0 0/0 .text            isDrawPath__15renderingFmap_cFv */
 bool renderingFmap_c::isDrawPath() {
     return true;
 }
 
-/* 801CE4DC-801CE560 1C8E1C 0084+00 2/2 0/0 0/0 .text            isDrawRoom__15renderingFmap_cFv */
 bool renderingFmap_c::isDrawRoom() {
     return (bool)((mRegionNo == dComIfGp_getNowLevel() && mStageNo == mStartStageNo
             && mRoomNo == dComIfGp_roomControl_getStayNo())
         || mpRoomData->isArrival());
 }
 
-/* 801CE560-801CE5B8 1C8EA0 0058+00 2/0 0/0 0/0 .text            postDrawPath__15renderingFmap_cFv
- */
 void renderingFmap_c::postDrawPath() {
     GXSetMisc(GX_MT_XF_FLUSH, 0);
     mDoMtx_lookAt(mViewMtx, &mEye, &mCenter, &mUp, 0);
     GXLoadPosMtxImm(mViewMtx, GX_PNMTX0);
 }
 
-/* 801CE5B8-801CE5EC 1C8EF8 0034+00 2/0 0/0 0/0 .text postRenderingMap__15renderingFmap_cFv */
 void renderingFmap_c::postRenderingMap() {
     dRenderingFDAmap_c::postRenderingMap();
     mDrawEnable = true;
 }
 
-/* 801CE5EC-801CE6A8 1C8F2C 00BC+00 2/2 0/0 0/0 .text            roomSetteing__15renderingFmap_cFv
- */
 void renderingFmap_c::roomSetteing() {
     mRegionOffsetX = mpRegionData->getRegionOffsetX();
     mRegionOffsetZ = mpRegionData->getRegionOffsetZ();
@@ -173,7 +147,6 @@ void renderingFmap_c::roomSetteing() {
     GXLoadPosMtxImm(viewMtx, GX_PNMTX0);
 }
 
-/* 801CE6A8-801CE75C 1C8FE8 00B4+00 2/0 0/0 0/0 .text getFirstRoomPointer__15renderingFmap_cFv */
 dDrawPath_c::room_class* renderingFmap_c::getFirstRoomPointer() {
     dDrawPath_c::room_class* room = NULL;
     getFirstRegion();
@@ -197,8 +170,6 @@ dDrawPath_c::room_class* renderingFmap_c::getFirstRoomPointer() {
     return room;
 }
 
-/* 801CE75C-801CE7A8 1C909C 004C+00 1/1 0/0 0/0 .text            getFirstRegion__15renderingFmap_cFv
- */
 void renderingFmap_c::getFirstRegion() {
     mpStageData = NULL;
     mpRegionData = mpWorldData->getMenuFmapRegionTop();
@@ -209,8 +180,6 @@ void renderingFmap_c::getFirstRegion() {
     }
 }
 
-/* 801CE7A8-801CE80C 1C90E8 0064+00 2/2 0/0 0/0 .text            getFirstStage__15renderingFmap_cFv
- */
 void renderingFmap_c::getFirstStage() {
     mpRoomData = NULL;
     mpStageData = mpRegionData->getMenuFmapStageDataTop();
@@ -223,8 +192,6 @@ void renderingFmap_c::getFirstStage() {
     }
 }
 
-/* 801CE80C-801CE84C 1C914C 0040+00 2/2 0/0 0/0 .text            getFirstRoom__15renderingFmap_cFv
- */
 void renderingFmap_c::getFirstRoom() {
     mpFmapData = NULL;
     mpRoomData = mpStageData->getFmapRoomDataTop();
@@ -235,7 +202,6 @@ void renderingFmap_c::getFirstRoom() {
     }
 }
 
-/* 801CE84C-801CE8B8 1C918C 006C+00 1/1 0/0 0/0 .text            getNextRoom__15renderingFmap_cFv */
 bool renderingFmap_c::getNextRoom() {
     bool ret = false;
     mpRoomData = mpRoomData->getNextData();
@@ -249,8 +215,6 @@ bool renderingFmap_c::getNextRoom() {
     return ret;
 }
 
-/* 801CE8B8-801CE93C 1C91F8 0084+00 1/1 0/0 0/0 .text            getNextStage__15renderingFmap_cFv
- */
 bool renderingFmap_c::getNextStage() {
     bool ret = false;
     mpStageData = mpStageData->getNextData();
@@ -266,8 +230,6 @@ bool renderingFmap_c::getNextStage() {
     return ret;
 }
 
-/* 801CE93C-801CE9A4 1C927C 0068+00 1/1 0/0 0/0 .text            getNextRegion__15renderingFmap_cFv
- */
 bool renderingFmap_c::getNextRegion() {
     bool ret = false;
     mpRegionData = mpRegionData->getNextData();
@@ -281,7 +243,6 @@ bool renderingFmap_c::getNextRegion() {
     return ret;
 }
 
-/* 801CE9A4-801CEA38 1C92E4 0094+00 2/0 0/0 0/0 .text getNextRoomPointer__15renderingFmap_cFv */
 dDrawPath_c::room_class* renderingFmap_c::getNextRoomPointer() {
     room_class* room;
 
@@ -302,8 +263,6 @@ dDrawPath_c::room_class* renderingFmap_c::getNextRoomPointer() {
     return room;
 }
 
-/* 801CEA38-801CEAAC 1C9378 0074+00 1/1 0/0 0/0 .text
- * setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eUcUcUcUc */
 void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette, u8 i_r,
                                           u8 i_g, u8 i_b, u8 i_a) {
     int color;
@@ -321,14 +280,11 @@ void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette,
     DCStoreRange(&m_palette[i_palette], 8);
 }
 
-/* 801CEAAC-801CEAE0 1C93EC 0034+00 2/2 0/0 0/0 .text
- * setFmapPaletteColor__15dMenu_FmapMap_cFQ215renderingFmap_c9palette_eRC8_GXColor */
 void dMenu_FmapMap_c::setFmapPaletteColor(renderingFmap_c::palette_e i_palette,
                                           GXColor const& i_color) {
     setFmapPaletteColor(i_palette, i_color.r, i_color.g, i_color.b, i_color.a);
 }
 
-/* 801CEAE0-801CEB1C 1C9420 003C+00 1/1 0/0 0/0 .text isFlashRoomNoCheck__15dMenu_FmapMap_cCFi */
 bool dMenu_FmapMap_c::isFlashRoomNoCheck(int i_roomNo) const {
     bool ret = false;
     u8* ptr = mFlashRooms;
@@ -341,8 +297,6 @@ bool dMenu_FmapMap_c::isFlashRoomNoCheck(int i_roomNo) const {
     return ret;
 }
 
-/* 801CEB1C-801CEC24 1C945C 0108+00 1/1 0/0 0/0 .text            setPointColor__15dMenu_FmapMap_cFf
- */
 void dMenu_FmapMap_c::setPointColor(f32 i_param) {
     static const palette_e palNo[8] = {
         PALETTE_11,
@@ -369,7 +323,6 @@ void dMenu_FmapMap_c::setPointColor(f32 i_param) {
     }
 }
 
-/* 801CEC24-801CED38 1C9564 0114+00 0/0 1/1 0/0 .text            __ct__15dMenu_FmapMap_cFv */
 dMenu_FmapMap_c::dMenu_FmapMap_c() {
     mResTIMG = NULL;
     mMapImage_p = NULL;
@@ -389,12 +342,10 @@ dMenu_FmapMap_c::dMenu_FmapMap_c() {
 }
 
 
-/* 801CED38-801CEDE8 1C9678 00B0+00 1/0 0/0 0/0 .text            __dt__15dMenu_FmapMap_cFv */
 dMenu_FmapMap_c::~dMenu_FmapMap_c() {
     _delete();
 }
 
-/* 801CEDE8-801CEE3C 1C9728 0054+00 0/0 1/1 0/0 .text _create__15dMenu_FmapMap_cFUsUsUsUsPv */
 void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16 param_3, void* i_res) {
     m_res = (dMfm_prm_res_s*)i_res;
     m_palette = m_res->palette_data;
@@ -407,7 +358,6 @@ void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16
     setTexture(i_texWidth, i_texHeight, param_2, param_3);
 }
 
-/* 801CEE3C-801CEE94 1C977C 0058+00 1/1 1/1 0/0 .text            _delete__15dMenu_FmapMap_cFv */
 void dMenu_FmapMap_c::_delete() {
     if (mResTIMG != NULL) {
         delete mResTIMG;
@@ -419,11 +369,8 @@ void dMenu_FmapMap_c::_delete() {
     }
 }
 
-/* 80454194-80454198 002794 0001+03 2/2 0/0 0/0 .sdata2          m_other__22dMfm_HIO_prm_res_src_s
- */
 const dMfm_HIO_prm_res_src_s dMfm_HIO_prm_res_src_s::m_other = {30};
 
-/* 801CEE94-801CF0B4 1C97D4 0220+00 1/0 0/0 0/0 .text            draw__15dMenu_FmapMap_cFv */
 void dMenu_FmapMap_c::draw() {
     { int unused; }
 
@@ -454,8 +401,6 @@ void dMenu_FmapMap_c::draw() {
     renderingMap();
 }
 
-/* 801CF0B4-801CF12C 1C99F4 0078+00 1/0 0/0 0/0 .text
- * rendering__15dMenu_FmapMap_cFPCQ211dDrawPath_c10line_class   */
 void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) {
     if (i_line->field_0x1 == 4) {
         for (mLineNo = 0; mLineNo < 2; mLineNo++) {
@@ -466,8 +411,6 @@ void dMenu_FmapMap_c::rendering(dDrawPath_c::line_class const* i_line) {
     }
 }
 
-/* 801CF12C-801CF1D4 1C9A6C 00A8+00 1/0 0/0 0/0 .text            getLineWidth__15dMenu_FmapMap_cFi
- */
 int dMenu_FmapMap_c::getLineWidth(int param_0) {
     static u8 const l_lineWidthPatData[5] = {0, 6, 12, 0, 0};
     static u8 const l_lineWidthPatData2[5] = {0, 0, 6, 0, 0};
@@ -492,12 +435,10 @@ int dMenu_FmapMap_c::getLineWidth(int param_0) {
     }
 }
 
-/* 801CF1D4-801CF1E0 1C9B14 000C+00 1/0 0/0 0/0 .text            isDrawType__15dMenu_FmapMap_cFi */
  bool dMenu_FmapMap_c::isDrawType(int param_0) {
     return (param_0 >> 6) & 1 ? false : true;
 }
 
-/* 801CF1E0-801CF208 1C9B20 0028+00 0/0 1/1 0/0 .text setFlashOn__15dMenu_FmapMap_cFiiPUci */
 void dMenu_FmapMap_c::setFlashOn(int i_regionNo, int i_stageNo, u8* i_rooms, int i_roomCount) {
     mLastFlash = mFlash;
     mFlash = true;
@@ -507,8 +448,6 @@ void dMenu_FmapMap_c::setFlashOn(int i_regionNo, int i_stageNo, u8* i_rooms, int
     mFlashRoomCount = i_roomCount;
 }
 
-/* 801CF208-801CF298 1C9B48 0090+00 1/0 0/0 0/0 .text            getLineColor__15dMenu_FmapMap_cFii
- */
 const GXColor* dMenu_FmapMap_c::getLineColor(int param_0, int param_1) {
     static GXColor black = {0, 0, 0, 0};
     static const GXColor borderColor0 = {0x64, 0, 0, 0};
@@ -529,14 +468,11 @@ const GXColor* dMenu_FmapMap_c::getLineColor(int param_0, int param_1) {
     return color;
 }
 
-/* 801CF298-801CF2A0 1C9BD8 0008+00 1/0 0/0 0/0 .text            getBackColor__15dMenu_FmapMap_cCFv
- */
 const GXColor* dMenu_FmapMap_c::getBackColor() const {
     static const GXColor l_mapBaseColor = {0, 0, 0, 0};
     return &l_mapBaseColor;
 }
 
-/* 801CF2A0-801CF394 1C9BE0 00F4+00 1/0 0/0 0/0 .text            getColor__15dMenu_FmapMap_cFi */
 const GXColor* dMenu_FmapMap_c::getColor(int param_0) {
     static const GXColor l_dungeon_onColor[9] = {
         {0x04, 0, 0, 0},
@@ -590,7 +526,6 @@ const GXColor* dMenu_FmapMap_c::getColor(int param_0) {
     return &list[param_0];
 }
 
-/* 801CF394-801CF450 1C9CD4 00BC+00 1/1 0/0 0/0 .text setTexture__15dMenu_FmapMap_cFUsUsUsUs */
 void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 param_3) {
     mMapImage_p = NULL;
     mResTIMG = NULL;
@@ -601,8 +536,6 @@ void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 par
     makeResTIMG(mResTIMG, i_width, i_height, mMapImage_p, (u8*)m_palette, 0x1b);
 }
 
-/* 801CF450-801CF4D0 1C9D90 0080+00 0/0 1/1 0/0 .text
- * setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff */
 void dMenu_FmapMap_c::setRendering(dMenu_Fmap_world_data_c* i_worldData, int i_startStageNo,
                                    f32 i_posX, f32 i_posY, f32 i_scale, f32 i_zoomRate) {
     mZoomRate = i_zoomRate;
diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp
index 531ec43b5d..11de75c964 100644
--- a/src/d/d_menu_insect.cpp
+++ b/src/d/d_menu_insect.cpp
@@ -35,8 +35,6 @@ static moveFunc map_move_process[] = {
     &dMenu_Insect_c::explain_close_move,
 };
 
-/* 801D8114-801D82F4 1D2A54 01E0+00 0/0 2/2 0/0 .text
- * __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc */
 dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick,
                                u8 param_3) {
     mpHeap = i_heap;
@@ -68,7 +66,6 @@ dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro
     mpExpItemTex = (ResTIMG*)mpHeap->alloc(0xc00, 0x20);
 }
 
-/* 801D82F4-801D8658 1D2C34 0364+00 1/0 0/0 0/0 .text            __dt__14dMenu_Insect_cFv */
 dMenu_Insect_c::~dMenu_Insect_c() {
     delete mpBlackTex;
     mpBlackTex = NULL;
@@ -139,7 +136,6 @@ dMenu_Insect_c::~dMenu_Insect_c() {
     dComIfGp_getMsgArchive(0)->removeResourceAll();
 }
 
-/* 801D8658-801D86C8 1D2F98 0070+00 1/1 0/0 0/0 .text            _create__14dMenu_Insect_cFv */
 void dMenu_Insect_c::_create() {
     mpString = new dMsgString_c();
     screenSetBase();
@@ -149,7 +145,6 @@ void dMenu_Insect_c::_create() {
     init();
 }
 
-/* 801D86C8-801D8760 1D3008 0098+00 0/0 3/3 0/0 .text            _move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::_move() {
     JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
     u8 process = field_0xf3;
@@ -161,7 +156,6 @@ void dMenu_Insect_c::_move() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801D8760-801D88EC 1D30A0 018C+00 1/1 1/1 0/0 .text            _draw__14dMenu_Insect_cFv */
 void dMenu_Insect_c::_draw() {
     if (mpArchive != NULL) {
         J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
@@ -181,7 +175,6 @@ void dMenu_Insect_c::_draw() {
     }
 }
 
-/* 801D88EC-801D8914 1D322C 0028+00 0/0 3/3 0/0 .text            isSync__14dMenu_Insect_cFv */
 bool dMenu_Insect_c::isSync() {
     if (mpMount != NULL && mpMount->sync() == false) {
         return 0;
@@ -189,12 +182,10 @@ bool dMenu_Insect_c::isSync() {
     return 1;
 }
 
-/* 801D8914-801D894C 1D3254 0038+00 1/1 0/0 0/0 .text            init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::init() {
     (this->*map_init_process[field_0xf3])();
 }
 
-/* 801D894C-801D8B2C 1D328C 01E0+00 0/0 3/3 0/0 .text            _open__14dMenu_Insect_cFv */
 int dMenu_Insect_c::_open() {
     if (mpMount == NULL) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/insectRes.arc", 0, NULL);
@@ -236,7 +227,6 @@ int dMenu_Insect_c::_open() {
     }
 }
 
-/* 801D8B2C-801D8C68 1D346C 013C+00 0/0 1/1 0/0 .text            _close__14dMenu_Insect_cFv */
 int dMenu_Insect_c::_close() {
     s16 closeFrame = g_drawHIO.mInsectListScreen.mCloseFrame;
     field_0xf0 = 0;
@@ -261,7 +251,6 @@ int dMenu_Insect_c::_close() {
     return field_0xf0 <= 0;
 }
 
-/* 801D8C68-801D8CCC 1D35A8 0064+00 1/0 0/0 0/0 .text            wait_init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::wait_init() {
     if (isGetInsect(field_0xf4, field_0xf5) != 0) {
         setAButtonString(0x368);
@@ -271,7 +260,6 @@ void dMenu_Insect_c::wait_init() {
     setBButtonString(0x3f9);
 }
 
-/* 801D8CCC-801D8E00 1D360C 0134+00 1/0 0/0 0/0 .text            wait_move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::wait_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
         if (mDoCPd_c::getTrigB(PAD_1) || field_0xf7 == 0) {
@@ -295,7 +283,6 @@ void dMenu_Insect_c::wait_move() {
     }
 }
 
-/* 801D8E00-801D91E4 1D3740 03E4+00 1/0 0/0 0/0 .text explain_open_init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_open_init() {
     char local_78[32];
     char local_98[32];
@@ -363,7 +350,6 @@ void dMenu_Insect_c::explain_open_init() {
     mpExpParent->alphaAnimeStart(0);
 }
 
-/* 801D91E4-801D9264 1D3B24 0080+00 1/0 0/0 0/0 .text explain_open_move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_open_move() {
     if (mpExpParent->alphaAnime(10, 0, 0xff, 1)) {
         if (field_0xf6 == 1 && isGiveInsect(field_0xf4, field_0xf5) == 0) {
@@ -374,12 +360,10 @@ void dMenu_Insect_c::explain_open_move() {
     }
 }
 
-/* 801D9264-801D9268 1D3BA4 0004+00 1/0 0/0 0/0 .text explain_move_init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_move_init() {
     /* empty function */
 }
 
-/* 801D9268-801D9290 1D3BA8 0028+00 1/0 0/0 0/0 .text explain_move_move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1) == 0 && mDoCPd_c::getTrigB(PAD_1) == 0) {
         return;
@@ -387,14 +371,12 @@ void dMenu_Insect_c::explain_move_move() {
     field_0xf3 = 4;
 }
 
-/* 801D9290-801D92DC 1D3BD0 004C+00 1/0 0/0 0/0 .text select_move_init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::select_move_init() {
     dMeter2Info_setInsectSelectType(0xff);
     setAButtonString(0x40c);
     setBButtonString(0x3f9);
 }
 
-/* 801D92DC-801D9504 1D3C1C 0228+00 1/0 0/0 0/0 .text select_move_move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::select_move_move() {
     mpStick->checkTrigger();
     if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -432,7 +414,6 @@ void dMenu_Insect_c::select_move_move() {
     }
 }
 
-/* 801D9504-801D95AC 1D3E44 00A8+00 1/0 0/0 0/0 .text explain_close_init__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_close_init() {
     setAButtonString(0);
     setBButtonString(0x3f9);
@@ -444,7 +425,6 @@ void dMenu_Insect_c::explain_close_init() {
     mpExpParent->alphaAnimeStart(0);
 }
 
-/* 801D95AC-801D9644 1D3EEC 0098+00 1/0 0/0 0/0 .text explain_close_move__14dMenu_Insect_cFv */
 void dMenu_Insect_c::explain_close_move() {
     bool alphaAnime = mpExpParent->alphaAnime(10, 0xff, 0, 1);
     bool cVar2;
@@ -458,8 +438,6 @@ void dMenu_Insect_c::explain_close_move() {
     }
 }
 
-/* 801D9644-801D98F0 1D3F84 02AC+00 1/1 0/0 0/0 .text            screenSetBase__14dMenu_Insect_cFv
- */
 void dMenu_Insect_c::screenSetBase() {
     static const u64 insect_tag[MAX_INSECT_NUM] = {
         'ari_os',  'ari_ms',   'kag_os',  'kag_ms',   'kab_os', 'kab_ms',  'kam_os',  'kam_mes',
@@ -507,7 +485,6 @@ void dMenu_Insect_c::screenSetBase() {
     mpString->getString(0x5ba, textBox, NULL, NULL, NULL, 0);
 }
 
-/* 801D98F0-801D9BD0 1D4230 02E0+00 1/1 0/0 0/0 .text screenSetExplain__14dMenu_Insect_cFv */
 void dMenu_Insect_c::screenSetExplain() {
     mpExpScreen = new J2DScreen();
     mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive);
@@ -541,8 +518,6 @@ void dMenu_Insect_c::screenSetExplain() {
     field_0x5c->setString(0x100, "");
 }
 
-/* 801D9BD0-801D9D4C 1D4510 017C+00 1/1 0/0 0/0 .text            screenSetDoIcon__14dMenu_Insect_cFv
- */
 void dMenu_Insect_c::screenSetDoIcon() {
     static const u64 text_a_tag[5] = {
         'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -568,8 +543,6 @@ void dMenu_Insect_c::screenSetDoIcon() {
     }
 }
 
-/* 801D9D4C-801D9DCC 1D468C 0080+00 0/0 1/1 0/0 .text            getGetInsectNum__14dMenu_Insect_cFv
- */
 u8 dMenu_Insect_c::getGetInsectNum() {
     static u8 l_itemno[MAX_INSECT_NUM] = {
         fpcNm_ITEM_M_BEETLE,      fpcNm_ITEM_F_BEETLE,      fpcNm_ITEM_M_BUTTERFLY, fpcNm_ITEM_F_BUTTERFLY, fpcNm_ITEM_M_STAG_BEETLE, fpcNm_ITEM_F_STAG_BEETLE,
@@ -591,7 +564,6 @@ u8 dMenu_Insect_c::getGetInsectNum() {
     return insectNum;
 }
 
-/* 801D9DCC-801D9DE4 1D470C 0018+00 3/3 0/0 0/0 .text getInsectItemID__14dMenu_Insect_cFii */
 u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) {
     static u8 l_itemno[MAX_INSECT_NUM] = {
         fpcNm_ITEM_M_ANT,       fpcNm_ITEM_F_ANT,       fpcNm_ITEM_M_MAYFLY,      fpcNm_ITEM_F_MAYFLY,      fpcNm_ITEM_M_BEETLE,     fpcNm_ITEM_F_BEETLE,
@@ -604,12 +576,10 @@ u8 dMenu_Insect_c::getInsectItemID(int param_0, int param_1) {
     return l_itemno[index];
 }
 
-/* 801D9DE4-801D9E20 1D4724 003C+00 4/4 0/0 0/0 .text            isGetInsect__14dMenu_Insect_cFii */
 bool dMenu_Insect_c::isGetInsect(int param_0, int param_1) {
     return dComIfGs_isItemFirstBit(getInsectItemID(param_0, param_1)) != 0;
 }
 
-/* 801D9E20-801D9E7C 1D4760 005C+00 4/4 0/0 0/0 .text            isGiveInsect__14dMenu_Insect_cFii */
 bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) {
     static const u32 i_evtID[MAX_INSECT_NUM] = {
         0x1A5, /* dSv_event_flag_c::F_0421 - Misc. - Ant (M) */
@@ -641,7 +611,6 @@ bool dMenu_Insect_c::isGiveInsect(int param_0, int param_1) {
     return dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[i_evtID[param_0 + param_1 * 6]]) != 0;
 }
 
-/* 801D9E7C-801D9ED4 1D47BC 0058+00 1/1 0/0 0/0 .text            isCatchInsect__14dMenu_Insect_cFUc */
 bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) {
     if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) {
         return dComIfGs_isItemFirstBit(i_insectID);
@@ -649,7 +618,6 @@ bool dMenu_Insect_c::isCatchInsect(u8 i_insectID) {
     return false;
 }
 
-/* 801D9ED4-801D9F3C 1D4814 0068+00 1/1 0/0 0/0 .text            isGiveInsect__14dMenu_Insect_cFUc */
 bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) {
     if (i_insectID >= fpcNm_ITEM_M_BEETLE && i_insectID <= fpcNm_ITEM_F_MAYFLY) {
         int label = i_insectID + 0xd1;
@@ -658,8 +626,6 @@ bool dMenu_Insect_c::isGiveInsect(u8 i_insectID) {
     return false;
 }
 
-/* 801D9F3C-801D9F8C 1D487C 0050+00 0/0 1/1 12/12 .text isCatchNotGiveInsect__14dMenu_Insect_cFUc
- */
 bool dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) {
     if (isCatchInsect(param_0) != 0 && isGiveInsect(param_0) == 0) {
         return 1;
@@ -667,7 +633,6 @@ bool dMenu_Insect_c::isCatchNotGiveInsect(u8 param_0) {
     return 0;
 }
 
-/* 801D9F8C-801DA1EC 1D48CC 0260+00 1/1 0/0 0/0 .text            cursorMove__14dMenu_Insect_cFv */
 void dMenu_Insect_c::cursorMove() {
     u8 oldF4 = field_0xf4;
     u8 oldF5 = field_0xf5;
@@ -725,7 +690,6 @@ void dMenu_Insect_c::cursorMove() {
     }
 }
 
-/* 801DA1EC-801DA2FC 1D4B2C 0110+00 3/3 0/0 0/0 .text            setCursorPos__14dMenu_Insect_cFv */
 void dMenu_Insect_c::setCursorPos() {
     int index = field_0xf4 + field_0xf5 * 6;
     Vec pos = mpINSParent[index]->getGlobalVtxCenter(false, 0);
@@ -741,12 +705,10 @@ void dMenu_Insect_c::setCursorPos() {
     }
 }
 
-/* 801DA2FC-801DA304 1D4C3C 0008+00 1/1 0/0 0/0 .text            dpdMove__14dMenu_Insect_cFv */
 u8 dMenu_Insect_c::dpdMove() {
     return 0;
 }
 
-/* 801DA304-801DA3B4 1D4C44 00B0+00 5/5 0/0 0/0 .text setAButtonString__14dMenu_Insect_cFUs */
 void dMenu_Insect_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -759,7 +721,6 @@ void dMenu_Insect_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801DA3B4-801DA464 1D4CF4 00B0+00 4/4 0/0 0/0 .text setBButtonString__14dMenu_Insect_cFUs */
 void dMenu_Insect_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -772,7 +733,6 @@ void dMenu_Insect_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801DA464-801DA630 1D4DA4 01CC+00 2/2 0/0 0/0 .text            setHIO__14dMenu_Insect_cFb */
 void dMenu_Insect_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mInsectListScreen.mDebugON) {
         mpExpSubWin[0]->paneTrans(g_drawHIO.mInsectListScreen.mDescWindowPosX,
diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp
index 06eb60dd17..edf85dcd11 100644
--- a/src/d/d_menu_item_explain.cpp
+++ b/src/d/d_menu_item_explain.cpp
@@ -38,8 +38,6 @@ static moveFunc move_process[] = {
     &dMenu_ItemExplain_c::move_next_proc, &dMenu_ItemExplain_c::close_proc,
 };
 
-/* 801DA754-801DAFF0 1D5094 089C+00 0/0 2/2 0/0 .text
- * __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb */
 dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archive,
                                          STControl* i_stick, bool param_3) {
     static const u64 name_tag[4] = {
@@ -175,7 +173,6 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi
     }
 }
 
-/* 801DAFF0-801DB470 1D5930 0480+00 1/0 0/0 0/0 .text            __dt__19dMenu_ItemExplain_cFv */
 dMenu_ItemExplain_c::~dMenu_ItemExplain_c() {
     delete mpInfoString;
     mpInfoString = NULL;
@@ -286,7 +283,6 @@ dMenu_ItemExplain_c::~dMenu_ItemExplain_c() {
     mpArchive->removeResourceAll();
 }
 
-/* 801DB470-801DB514 1D5DB0 00A4+00 0/0 5/5 0/0 .text            move__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::move() {
     u8 status = mStatus;
     (this->*move_process[status])();
@@ -301,8 +297,6 @@ void dMenu_ItemExplain_c::move() {
     }
 }
 
-/* 801DB514-801DB744 1D5E54 0230+00 0/0 2/2 0/0 .text draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph
- */
 void dMenu_ItemExplain_c::draw(J2DOrthoGraph* i_graph) {
     if (mStatus != 0) {
         for (int i = 0; i < 2; i++) {
@@ -339,7 +333,6 @@ void dMenu_ItemExplain_c::draw(J2DOrthoGraph* i_graph) {
     }
 }
 
-/* 801DB744-801DB818 1D6084 00D4+00 1/1 0/0 0/0 .text drawKantera__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::drawKantera() {
     if (field_0xe1 == 0x48) {
         mpKanteraMeter->setPos(mpInfoIcon->getGlobalPosX() + 48.0f,
@@ -351,20 +344,14 @@ void dMenu_ItemExplain_c::drawKantera() {
     }
 }
 
-/* 801DB818-801DB81C 1D6158 0004+00 1/0 0/0 0/0 .text            wait_init__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::wait_init() {
     /* empty function */
 }
 
-/* 801DB81C-801DB820 1D615C 0004+00 1/0 0/0 0/0 .text            wait_proc__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::wait_proc() {
     /* empty function */
 }
 
-/* 801DB820-801DBAB4 1D6160 0294+00 3/2 0/0 0/0 .text            open_init__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::open_init() {
     field_0xc4 = field_0xc8;
     mEndButton = 0;
@@ -425,8 +412,6 @@ void dMenu_ItemExplain_c::open_init() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801DBAB4-801DBB50 1D63F4 009C+00 1/0 0/0 0/0 .text            open_proc__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::open_proc() {
     mAlphaRatio += 2.0f;
     if (mAlphaRatio >= 201.0f) {
@@ -438,16 +423,12 @@ void dMenu_ItemExplain_c::open_proc() {
     }
 }
 
-/* 801DBB50-801DBB7C 1D6490 002C+00 1/0 0/0 0/0 .text            move_init__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::move_init() {
     if (mpArrow != NULL) {
         mpArrow->arwAnimeInit();
     }
 }
 
-/* 801DBB7C-801DBCB4 1D64BC 0138+00 1/0 0/0 0/0 .text            move_proc__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::move_proc() {
     if (field_0xe1 == 0x25 && field_0xe5 == 2 && mpArrow != NULL) {
         mpArrow->arwAnimeMove();
@@ -476,7 +457,6 @@ void dMenu_ItemExplain_c::move_proc() {
     dMeter2Info_set2DVibration();
 }
 
-/* 801DBCB4-801DBF44 1D65F4 0290+00 1/0 0/0 0/0 .text move_select_init__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::move_select_init() {
     char local_88[8];
     char local_80[8];
@@ -533,7 +513,6 @@ void dMenu_ItemExplain_c::move_select_init() {
     }
 }
 
-/* 801DBF44-801DC1E0 1D6884 029C+00 1/0 0/0 0/0 .text move_select_proc__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::move_select_proc() {
     mpStick->checkTrigger();
     if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -584,7 +563,6 @@ void dMenu_ItemExplain_c::move_select_proc() {
     }
 }
 
-/* 801DC1E0-801DC214 1D6B20 0034+00 1/0 0/0 0/0 .text move_next_init__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::move_next_init() {
     field_0xc8 = 0x51d;
     if (mpArrow != NULL) {
@@ -592,7 +570,6 @@ void dMenu_ItemExplain_c::move_next_init() {
     }
 }
 
-/* 801DC214-801DC2E4 1D6B54 00D0+00 1/0 0/0 0/0 .text move_next_proc__19dMenu_ItemExplain_cFv */
 void dMenu_ItemExplain_c::move_next_proc() {
     if (mDoCPd_c::getTrigA(PAD_1) || mDoCPd_c::getTrigB(PAD_1)) {
         if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -614,14 +591,10 @@ void dMenu_ItemExplain_c::move_next_proc() {
     }
 }
 
-/* 801DC2E4-801DC2F0 1D6C24 000C+00 1/0 0/0 0/0 .text            close_init__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::close_init() {
     mAlphaRatio = 201.0f;
 }
 
-/* 801DC2F0-801DC340 1D6C30 0050+00 1/0 0/0 0/0 .text            close_proc__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::close_proc() {
     bool check;
     if (mpSelect_c != NULL) {
@@ -634,8 +607,6 @@ void dMenu_ItemExplain_c::close_proc() {
     }
 }
 
-/* 801DC340-801DC3C8 1D6C80 0088+00 0/0 2/2 0/0 .text openExplain__19dMenu_ItemExplain_cFUcUcUcb
- */
 u8 dMenu_ItemExplain_c::openExplain(u8 i_slotNo, u8 param_1, u8 param_2, bool param_3) {
     u8 item = dComIfGs_getItem(i_slotNo, false);
     if (item == 0xff) {
@@ -645,8 +616,6 @@ u8 dMenu_ItemExplain_c::openExplain(u8 i_slotNo, u8 param_1, u8 param_2, bool pa
     }
 }
 
-/* 801DC3C8-801DC738 1D6D08 0370+00 1/1 1/1 0/0 .text
- * openExplainDmap__19dMenu_ItemExplain_cFUcUcUcbUc             */
 u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool param_3,
                                         u8 param_4) {
     u8 itemNo = param_0;
@@ -734,7 +703,6 @@ u8 dMenu_ItemExplain_c::openExplainDmap(u8 param_0, u8 param_1, u8 param_2, bool
     return ret;
 }
 
-/* 801DC738-801DC7AC 1D7078 0074+00 0/0 1/1 0/0 .text openExplainTx__19dMenu_ItemExplain_cFUlUl */
 u8 dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) {
     u8 ret = 0;
     if (mStatus == 0) {
@@ -752,7 +720,6 @@ u8 dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) {
     return ret;
 }
 
-/* 801DC7AC-801DC7FC 1D70EC 0050+00 1/1 2/2 0/0 .text getAlphaRatio__19dMenu_ItemExplain_cFv */
 f32 dMenu_ItemExplain_c::getAlphaRatio() {
     switch (mStatus) {
     case 1:
@@ -765,8 +732,6 @@ f32 dMenu_ItemExplain_c::getAlphaRatio() {
     }
 }
 
-/* 801DC7FC-801DCB54 1D713C 0358+00 1/1 0/0 0/0 .text            setNumber__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::setNumber() {
     u8 temp = field_0xdf;
     if (temp == 0) {
@@ -819,7 +784,6 @@ void dMenu_ItemExplain_c::setNumber() {
     }
 }
 
-/* 801DCB54-801DCBBC 1D7494 0068+00 2/2 0/0 0/0 .text getWarpMarkFlag__19dMenu_ItemExplain_cFv */
 bool dMenu_ItemExplain_c::getWarpMarkFlag() {
     if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) {
         return dComIfGs_getWarpMarkFlag();
@@ -827,8 +791,6 @@ bool dMenu_ItemExplain_c::getWarpMarkFlag() {
     return dComIfGs_getLastWarpAcceptStage() < 0 ? 0 : 1;
 }
 
-/* 801DCBBC-801DCC8C 1D74FC 00D0+00 2/2 0/0 0/0 .text            setScale__19dMenu_ItemExplain_cFv
- */
 void dMenu_ItemExplain_c::setScale() {
     if (field_0xe1 != 0xff) {
         f32 scale =
diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp
index 277570ec79..3267f1c09a 100644
--- a/src/d/d_menu_letter.cpp
+++ b/src/d/d_menu_letter.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_letter
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_menu_letter.h"
@@ -15,7 +10,6 @@
 #include "d/d_meter2_info.h"
 #include "d/d_meter_HIO.h"
 #include "d/d_msg_string.h"
-#include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
@@ -52,8 +46,6 @@ static moveFunc map_move_process[] = {
     &dMenu_Letter_c::read_close_move,
 };
 
-/* 801DCDC0-801DCF34 1D7700 0174+00 0/0 2/2 0/0 .text
- * __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl */
 dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cstick) {
     mpHeap = i_heap;
     mpMount = NULL;
@@ -84,7 +76,6 @@ dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro
 }
 
 
-/* 801DCF34-801DD36C 1D7874 0438+00 1/0 0/0 0/0 .text            __dt__14dMenu_Letter_cFv */
 dMenu_Letter_c::~dMenu_Letter_c() {
     delete mpDrawCursor;
     mpDrawCursor = NULL;
@@ -170,7 +161,6 @@ dMenu_Letter_c::~dMenu_Letter_c() {
     dComIfGp_getMsgArchive(0)->removeResourceAll();
 }
 
-/* 801DD36C-801DD474 1D7CAC 0108+00 1/1 0/0 0/0 .text            _create__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_create() {
     mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL);
     JUT_ASSERT(231, mpDrawCursor != NULL);
@@ -199,7 +189,6 @@ void dMenu_Letter_c::_create() {
 }
 
 
-/* 801DD474-801DD50C 1D7DB4 0098+00 0/0 2/2 0/0 .text            _move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_move() {
     JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
     u8 process = mProcess;
@@ -211,7 +200,6 @@ void dMenu_Letter_c::_move() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801DD50C-801DD934 1D7E4C 0428+00 1/1 1/1 0/0 .text            _draw__14dMenu_Letter_cFv */
 void dMenu_Letter_c::_draw() {
     if (mpArchive == NULL) {
         return;
@@ -279,7 +267,6 @@ void dMenu_Letter_c::_draw() {
     mpIconScreen->draw(0.0f, 0.0f, grafContext);
 }
 
-/* 801DD934-801DD95C 1D8274 0028+00 0/0 2/2 0/0 .text            isSync__14dMenu_Letter_cFv */
 bool dMenu_Letter_c::isSync() {
     if (mpMount != NULL && mpMount->sync() == false) {
         return 0;
@@ -287,7 +274,6 @@ bool dMenu_Letter_c::isSync() {
     return 1;
 }
 
-/* 801DD95C-801DDA20 1D829C 00C4+00 1/1 0/0 0/0 .text letter_init_calc__14dMenu_Letter_cFv */
 void dMenu_Letter_c::letter_init_calc() {
     m_letter_num = getLetterNum();
     for (int i = 0; i < 54; i++) {
@@ -309,14 +295,12 @@ void dMenu_Letter_c::letter_init_calc() {
     }
 }
 
-/* 801DDA20-801DDA74 1D8360 0054+00 1/1 0/0 0/0 .text            init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::init() {
     setPageText();
     changeActiveColor();
     (this->*map_init_process[mProcess])();
 }
 
-/* 801DDA74-801DDC98 1D83B4 0224+00 0/0 2/2 0/0 .text            _open__14dMenu_Letter_cFv */
 int dMenu_Letter_c::_open() {
     if (mpMount == NULL) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/letres.arc", 0, NULL);
@@ -366,7 +350,6 @@ int dMenu_Letter_c::_open() {
     }
 }
 
-/* 801DDC98-801DDE18 1D85D8 0180+00 0/0 1/1 0/0 .text            _close__14dMenu_Letter_cFv */
 int dMenu_Letter_c::_close() {
     s16 closeWindowFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::WINDOW_FRAME];
@@ -396,13 +379,11 @@ int dMenu_Letter_c::_close() {
     }
 }
 
-/* 801DDE18-801DDE54 1D8758 003C+00 1/0 0/0 0/0 .text            wait_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::wait_init() {
     setAButtonString(0x40c);
     setBButtonString(0x3f9);
 }
 
-/* 801DDE54-801DE164 1D8794 0310+00 1/0 0/0 0/0 .text            wait_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::wait_move() {
     u8 oldIndex = mIndex;
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
@@ -462,7 +443,6 @@ void dMenu_Letter_c::wait_move() {
 }
 
 
-/* 801DE164-801DE1E8 1D8AA4 0084+00 1/0 0/0 0/0 .text slide_right_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::slide_right_init() {
     field_0x358 = -field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
@@ -472,7 +452,6 @@ void dMenu_Letter_c::slide_right_init() {
     setBButtonString(0);
 }
 
-/* 801DE1E8-801DE24C 1D8B28 0064+00 1/0 0/0 0/0 .text slide_right_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::slide_right_move() {
     cLib_addCalc2(&field_0x358, 0.0f, 0.5f, 50.0f);
     if (fabsf(field_0x358) < 0.1f) {
@@ -481,8 +460,6 @@ void dMenu_Letter_c::slide_right_move() {
     }
 }
 
-/* 801DE24C-801DE2D0 1D8B8C 0084+00 1/0 0/0 0/0 .text            slide_left_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::slide_left_init() {
     field_0x358 = field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
     field_0x35c = -field_0x1ec->getWidth() * mDoGph_gInf_c::getInvScale();
@@ -492,8 +469,6 @@ void dMenu_Letter_c::slide_left_init() {
     setBButtonString(0);
 }
 
-/* 801DE2D0-801DE334 1D8C10 0064+00 1/0 0/0 0/0 .text            slide_left_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::slide_left_move() {
     cLib_addCalc2(&field_0x358, 0.0f, 0.5f, 50.0f);
     if (fabsf(field_0x358) < 0.1f) {
@@ -502,8 +477,6 @@ void dMenu_Letter_c::slide_left_move() {
     }
 }
 
-/* 801DE334-801DE564 1D8C74 0230+00 1/0 0/0 0/0 .text            read_open_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_open_init() {
     field_0x36a = 0;
     u8 idx = field_0x3ac[field_0x36f * 6 + mIndex] - 1;
@@ -541,8 +514,6 @@ void dMenu_Letter_c::read_open_init() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801DE564-801DE70C 1D8EA4 01A8+00 1/0 0/0 0/0 .text            read_open_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_open_move() {
     s16 openLetterFrame =
         g_drawHIO.mLetterSelectScreen.mOpenFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -566,8 +537,6 @@ void dMenu_Letter_c::read_open_move() {
     }
 }
 
-/* 801DE70C-801DE824 1D904C 0118+00 1/0 0/0 0/0 .text            read_move_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_move_init() {
     mpArrow->arwAnimeInit();
     mpArrow->dotAnimeInit();
@@ -589,8 +558,6 @@ void dMenu_Letter_c::read_move_init() {
     }
 }
 
-/* 801DE824-801DEA48 1D9164 0224+00 1/0 0/0 0/0 .text            read_move_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1) != 0) {
         if (field_0x3e3 == field_0x3e2) {
@@ -629,16 +596,12 @@ void dMenu_Letter_c::read_move_move() {
     }
 }
 
-/* 801DEA48-801DEA94 1D9388 004C+00 1/0 0/0 0/0 .text read_next_fadeout_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_next_fadeout_init() {
     field_0x36a = g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801DEA94-801DEBD8 1D93D4 0144+00 1/0 0/0 0/0 .text read_next_fadeout_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_next_fadeout_move() {
     s16 closeWindowFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::WINDOW_FRAME];
@@ -668,7 +631,6 @@ void dMenu_Letter_c::read_next_fadeout_move() {
     }
 }
 
-/* 801DEBD8-801DED04 1D9518 012C+00 1/0 0/0 0/0 .text read_next_fadein_init__14dMenu_Letter_cFv */
 void dMenu_Letter_c::read_next_fadein_init() {
     field_0x36a = 0;
     u8 idx = field_0x3ac[field_0x36f * 6 + mIndex] - 1;
@@ -688,7 +650,6 @@ void dMenu_Letter_c::read_next_fadein_init() {
     }
 }
 
-/* 801DED04-801DEE20 1D9644 011C+00 1/0 0/0 0/0 .text read_next_fadein_move__14dMenu_Letter_cFv */
 void dMenu_Letter_c::read_next_fadein_move() {
     s16 openLetterFrame =
         g_drawHIO.mLetterSelectScreen.mOpenFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -712,16 +673,12 @@ void dMenu_Letter_c::read_next_fadein_move() {
     }
 }
 
-/* 801DEE20-801DEE6C 1D9760 004C+00 1/0 0/0 0/0 .text            read_close_init__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_close_init() {
     field_0x36a = g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
     setAButtonString(0);
     setBButtonString(0);
 }
 
-/* 801DEE6C-801DF010 1D97AC 01A4+00 1/0 0/0 0/0 .text            read_close_move__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::read_close_move() {
     s16 closeLetterFrame =
         g_drawHIO.mLetterSelectScreen.mCloseFrame[dMeter_drawLetterHIO_c::LETTER_FRAME];
@@ -744,8 +701,6 @@ void dMenu_Letter_c::read_close_move() {
     }
 }
 
-/* 801DF010-801DFA28 1D9950 0A18+00 1/1 0/0 0/0 .text            screenSetMenu__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetMenu() {
     static const u64 tag_sub0[6] = {
         'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s',
@@ -908,8 +863,6 @@ void dMenu_Letter_c::screenSetMenu() {
     }
 }
 
-/* 801DFA58-801E0330 1DA398 08D8+00 1/1 0/0 0/0 .text            screenSetBase__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetBase() {
     static const u64 tag_pip[9] = {
         'pi_00_n', 'pi_01_n', 'pi_02_n', 'pi_03_n', 'pi_04_n',
@@ -1011,8 +964,6 @@ void dMenu_Letter_c::screenSetBase() {
     }
 }
 
-/* 801E0330-801E03D8 1DAC70 00A8+00 1/1 0/0 0/0 .text            screenSetShadow__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetShadow() {
     mpSdwScreen = new J2DScreen();
     mpSdwScreen->setPriority("zelda_letter_select_shadow.blo", 0x20000, mpArchive);
@@ -1021,8 +972,6 @@ void dMenu_Letter_c::screenSetShadow() {
     mpParent[2]->setAlphaRate(0.0f);
 }
 
-/* 801E03D8-801E09A8 1DAD18 05D0+00 1/1 0/0 0/0 .text            screenSetLetter__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetLetter() {
     mpLetterScreen[0] = new J2DScreen();
     JUT_ASSERT(1507, mpLetterScreen[0] != NULL);
@@ -1159,8 +1108,6 @@ void dMenu_Letter_c::screenSetLetter() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801E09A8-801E0B24 1DB2E8 017C+00 1/1 0/0 0/0 .text            screenSetDoIcon__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::screenSetDoIcon() {
     static const u64 text_a_tag[5] = {
         'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -1187,13 +1134,11 @@ void dMenu_Letter_c::screenSetDoIcon() {
 }
 
 
-/* 801E0B24-801E0BB0 1DB464 008C+00 3/3 0/0 0/0 .text            setCursorPos__14dMenu_Letter_cFv */
 void dMenu_Letter_c::setCursorPos() {
     Vec pos = mpLetterParent[mIndex]->getGlobalVtxCenter(mpLetterParent[mIndex]->mPane, false, 0);
     mpDrawCursor->setPos(pos.x, pos.y, mpLetterParent[mIndex]->getPanePtr(), false);
 }
 
-/* 801E0BB0-801E0E34 1DB4F0 0284+00 3/3 0/0 0/0 .text changeActiveColor__14dMenu_Letter_cFv */
 void dMenu_Letter_c::changeActiveColor() {
     setCursorPos();
     for (int i = 0; (int)i < 6; i++) {
@@ -1215,8 +1160,6 @@ void dMenu_Letter_c::changeActiveColor() {
     }
 }
 
-/* 801E0E34-801E0E84 1DB774 0050+00 2/2 0/0 0/0 .text            changePageLight__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::changePageLight() {
     for (int i = 0; i < 9; i++) {
         if (i == field_0x36f) {
@@ -1227,7 +1170,6 @@ void dMenu_Letter_c::changePageLight() {
     }
 }
 
-/* 801E0E84-801E1038 1DB7C4 01B4+00 2/2 0/0 0/0 .text            setPageText__14dMenu_Letter_cFv */
 void dMenu_Letter_c::setPageText() {
     int dVar1 = field_0x36f * 6;
     for (int i = 0; i < field_0x373; i++) {
@@ -1251,8 +1193,6 @@ void dMenu_Letter_c::setPageText() {
     }
 }
 
-/* 801E1038-801E11EC 1DB978 01B4+00 1/1 0/0 0/0 .text            setDMYPageText__14dMenu_Letter_cFv
- */
 void dMenu_Letter_c::setDMYPageText() {
     int dVar1 = field_0x372 * 6;
     for (int i = 0; i < field_0x373; i++) {
@@ -1276,7 +1216,6 @@ void dMenu_Letter_c::setDMYPageText() {
     }
 }
 
-/* 801E11EC-801E1518 1DBB2C 032C+00 2/2 0/0 0/0 .text            copyDMYMenu__14dMenu_Letter_cFv */
 void dMenu_Letter_c::copyDMYMenu() {
     setDMYPageText();
     for (int i = 0; i < 6; i++) {
@@ -1319,7 +1258,6 @@ void dMenu_Letter_c::copyDMYMenu() {
     }
 }
 
-/* 801E1518-801E15C8 1DBE58 00B0+00 7/7 0/0 0/0 .text setAButtonString__14dMenu_Letter_cFUs */
 void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -1333,7 +1271,6 @@ void dMenu_Letter_c::setAButtonString(u16 i_stringID) {
 }
 
 
-/* 801E15C8-801E1678 1DBF08 00B0+00 7/7 0/0 0/0 .text setBButtonString__14dMenu_Letter_cFUs */
 void dMenu_Letter_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -1347,7 +1284,6 @@ void dMenu_Letter_c::setBButtonString(u16 i_stringID) {
 }
 
 
-/* 801E1678-801E1748 1DBFB8 00D0+00 1/1 0/0 0/0 .text            getLetterNum__14dMenu_Letter_cFv */
 u8 dMenu_Letter_c::getLetterNum() {
     u8 letterNum = 0;
     if (g_drawHIO.mLetterSelectScreen.mLetterNum > 0) {
@@ -1366,7 +1302,6 @@ u8 dMenu_Letter_c::getLetterNum() {
     return letterNum;
 }
 
-/* 801E1748-801E1D10 1DC088 05C8+00 2/2 0/0 0/0 .text            setHIO__14dMenu_Letter_cFb */
 void dMenu_Letter_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mLetterSelectScreen.mDebugON) {
         for (int i = 0; i < 3; i++) {
diff --git a/src/d/d_menu_map_common.cpp b/src/d/d_menu_map_common.cpp
index 4cf81a16ac..c0db6ddcd2 100644
--- a/src/d/d_menu_map_common.cpp
+++ b/src/d/d_menu_map_common.cpp
@@ -6,7 +6,6 @@
 #include "d/d_select_cursor.h"
 #include "global.h"
 
-/* 803BCF18-803BD02C 01A038 0114+00 2/2 0/0 0/0 .data            map_icon_size */
 struct map_icon_size_t {
     f32 size_x;
     f32 size_y;
@@ -39,7 +38,6 @@ static map_icon_size_t map_icon_size[] = {
     /* LV8 Warp       */ {40.0f, 40.0f, 22},
 };
 
-/* 801C2718-801C27B4 1BD058 009C+00 0/0 2/2 0/0 .text            __ct__16dMenuMapCommon_cFv */
 dMenuMapCommon_c::dMenuMapCommon_c() {
     for (int i = 0; i < ICON_MAX_e; i++) {
         mPictures[i] = NULL;
@@ -62,7 +60,6 @@ dMenuMapCommon_c::dMenuMapCommon_c() {
     clearIconInfo();
 }
 
-/* 801C27B4-801C28D8 1BD0F4 0124+00 1/0 2/2 0/0 .text            __dt__16dMenuMapCommon_cFv */
 dMenuMapCommon_c::~dMenuMapCommon_c() {
     for (int i = 0; i < ICON_MAX_e; i++) {
         if (mPictures[i] != NULL) {
@@ -87,8 +84,6 @@ dMenuMapCommon_c::~dMenuMapCommon_c() {
     }
 }
 
-/* 801C28D8-801C38E4 1BD218 100C+00 0/0 2/2 0/0 .text initiate__16dMenuMapCommon_cFP10JKRArchive
- */
 void dMenuMapCommon_c::initiate(JKRArchive* i_archive) {
     ResTIMG* mp_image;
 
@@ -301,8 +296,6 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) {
     }
 }
 
-/* 801C38E4-801C3EC4 1BE224 05E0+00 0/0 2/2 0/0 .text            drawIcon__16dMenuMapCommon_cFffff
- */
 void dMenuMapCommon_c::drawIcon(f32 i_posX, f32 i_posY, f32 param_3, f32 param_4) {
     s16 icon_draw_list[128];
     if (g_fmapHIO.mMapIconHIO.mIconDebug) {
@@ -419,8 +412,6 @@ void dMenuMapCommon_c::drawIcon(f32 i_posX, f32 i_posY, f32 param_3, f32 param_4
     }
 }
 
-/* 801C3EC4-801C43A8 1BE804 04E4+00 0/0 4/4 0/0 .text            iconScale__16dMenuMapCommon_cFifff
- */
 void dMenuMapCommon_c::iconScale(int param_1, f32 param_2, f32 param_3, f32 param_4) {
     _c88 = 1.0f + param_4;
 
@@ -528,7 +519,6 @@ void dMenuMapCommon_c::iconScale(int param_1, f32 param_2, f32 param_3, f32 para
     setBlendRatio(ICON_DESTINATION_e, param_3, param_4);
 }
 
-/* 801C43A8-801C443C 1BECE8 0094+00 1/1 3/3 0/0 .text setIconInfo__16dMenuMapCommon_cFUcfffffUc */
 bool dMenuMapCommon_c::setIconInfo(u8 i_iconNo, f32 i_posX, f32 i_posY, f32 i_alpharate, f32 i_rotation,
                                    f32 i_scale, u8 param_7) {
     if (mIconNum >= 128) {
@@ -546,8 +536,6 @@ bool dMenuMapCommon_c::setIconInfo(u8 i_iconNo, f32 i_posX, f32 i_posY, f32 i_al
     return true;
 }
 
-/* 801C443C-801C4494 1BED7C 0058+00 1/1 2/2 0/0 .text            clearIconInfo__16dMenuMapCommon_cFv
- */
 void dMenuMapCommon_c::clearIconInfo() {
     mIconNum = 0;
     for (int i = 0; i < 128; i++) {
@@ -563,7 +551,6 @@ void dMenuMapCommon_c::clearIconInfo() {
     }
 }
 
-/* 801C4494-801C452C 1BEDD4 0098+00 1/1 0/0 0/0 .text setBlendRatio__16dMenuMapCommon_cFUcff */
 void dMenuMapCommon_c::setBlendRatio(u8 i_iconNo, f32 param_2, f32 param_3) {
     if (mPictures[i_iconNo] != NULL) {
         mPictures[i_iconNo]->setBlendRatio(param_2, param_3);
@@ -574,7 +561,6 @@ void dMenuMapCommon_c::setBlendRatio(u8 i_iconNo, f32 param_2, f32 param_3) {
     }
 }
 
-/* 801C452C-801C4600 1BEE6C 00D4+00 0/0 1/1 0/0 .text            blinkMove__16dMenuMapCommon_cFs */
 void dMenuMapCommon_c::blinkMove(s16 param_1) {
     mBlinkTimer++;
     if (mBlinkTimer >= param_1) {
@@ -590,7 +576,6 @@ void dMenuMapCommon_c::blinkMove(s16 param_1) {
     }
 }
 
-/* 801C4600-801C4738 1BEF40 0138+00 0/0 1/1 0/0 .text moveLightDropAnime__16dMenuMapCommon_cFv */
 void dMenuMapCommon_c::moveLightDropAnime() {
     int bVar6 = 0;
     if (_c88 > 1.0f) {
@@ -619,8 +604,6 @@ void dMenuMapCommon_c::moveLightDropAnime() {
     _c7c = flash_start_scale + fVar7 * (flash_end_scale - flash_start_scale);
 }
 
-/* 801C4738-801C4778 1BF078 0040+00 1/1 0/0 0/0 .text            getIconSizeX__16dMenuMapCommon_cFUc
- */
 f32 dMenuMapCommon_c::getIconSizeX(u8 i_iconNo) {
     for (int i = 0; i < ARRAY_SIZEU(map_icon_size); i++) {
         if (map_icon_size[i].icon_no == i_iconNo) {
@@ -631,8 +614,6 @@ f32 dMenuMapCommon_c::getIconSizeX(u8 i_iconNo) {
     return 0.0f;
 }
 
-/* 801C4778-801C47C4 1BF0B8 004C+00 1/1 0/0 0/0 .text            getIconSizeY__16dMenuMapCommon_cFUc
- */
 f32 dMenuMapCommon_c::getIconSizeY(u8 i_iconNo) {
     for (int i = 0; i < ARRAY_SIZEU(map_icon_size); i++) {
         if (map_icon_size[i].icon_no == i_iconNo) {
@@ -643,7 +624,6 @@ f32 dMenuMapCommon_c::getIconSizeY(u8 i_iconNo) {
     return 0.0f;
 }
 
-/* 801C47C4-801C4D54 1BF104 0590+00 1/1 0/0 0/0 .text            debugIcon__16dMenuMapCommon_cFv */
 void dMenuMapCommon_c::debugIcon() {
     int link_icon_idx = -1;
     for (int i = 0; i < 128; i++) {
diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp
index 3351be53e8..75f7b52fbe 100644
--- a/src/d/d_menu_option.cpp
+++ b/src/d/d_menu_option.cpp
@@ -76,8 +76,6 @@ enum SelectType {
     SelectType8,
 };
 
-/* 801E1F10-801E2014 1DC850 0104+00 0/0 2/2 0/0 .text
- * __ct__14dMenu_Option_cFP10JKRArchiveP9STControl              */
 dMenu_Option_c::dMenu_Option_c(JKRArchive* i_archive, STControl* i_stick) {
     mUseFlag = 0;
     mBarScale[0] = g_drawHIO.mOptionScreen.mBarScale[0];
@@ -89,13 +87,10 @@ dMenu_Option_c::dMenu_Option_c(JKRArchive* i_archive, STControl* i_stick) {
     mpCalibration = NULL;
 }
 
-/* 801E2014-801E205C 1DC954 0048+00 1/0 0/0 0/0 .text            __dt__14dMenu_Option_cFv */
 dMenu_Option_c::~dMenu_Option_c() {}
 
-/* 80396EA8-80396EB8 023508 000C+04 4/4 0/0 0/0 .rodata          dMo_soundMode */
 static const u32 dMo_soundMode[3] = {0, 1, 2};
 
-/* 801E205C-801E2C1C 1DC99C 0BC0+00 1/1 0/0 0/0 .text            _create__14dMenu_Option_cFv */
 void dMenu_Option_c::_create() {
     static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
     static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
@@ -251,7 +246,6 @@ void dMenu_Option_c::_create() {
     setHIO(true);
 }
 
-/* 801E2C1C-801E3408 1DD55C 07EC+00 0/0 3/3 0/0 .text            _delete__14dMenu_Option_cFv */
 void dMenu_Option_c::_delete() {
     delete mpString;
     mpString = NULL;
@@ -429,7 +423,6 @@ void dMenu_Option_c::_delete() {
     dComIfGp_setOptionResArchive(NULL);
 }
 
-/* 801E3408-801E36CC 1DDD48 02C4+00 0/0 2/2 0/0 .text            _move__14dMenu_Option_cFv */
 void dMenu_Option_c::_move() {
     mpStick->checkTrigger();
     if (field_0x3ea != 0 && !isRumbleSupported()) {
@@ -492,7 +485,6 @@ skip:
     setHIO(false);
 }
 
-/* 801E36CC-801E38CC 1DE00C 0200+00 1/1 1/1 0/0 .text            _draw__14dMenu_Option_cFv */
 void dMenu_Option_c::_draw() {
     if (mpArchive != NULL) {
         J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
@@ -520,7 +512,6 @@ void dMenu_Option_c::_draw() {
     }
 }
 
-/* 801E38CC-801E3A7C 1DE20C 01B0+00 1/1 0/0 0/0 .text            drawHaihai__14dMenu_Option_cFv */
 void dMenu_Option_c::drawHaihai() {
     CPaneMgr pane;
     u8 selectType = getSelectType();
@@ -546,7 +537,6 @@ void dMenu_Option_c::drawHaihai() {
     }
 }
 
-/* 801E3A7C-801E3AA4 1DE3BC 0028+00 0/0 1/1 0/0 .text            isSync__14dMenu_Option_cFv */
 bool dMenu_Option_c::isSync() {
     if (mpMount != NULL && mpMount->sync() == false) {
         return 0;
@@ -554,17 +544,14 @@ bool dMenu_Option_c::isSync() {
     return 1;
 }
 
-/* 801E3AA4-801E3AC8 1DE3E4 0024+00 4/4 0/0 0/0 .text checkLeftTrigger__14dMenu_Option_cFv */
 bool dMenu_Option_c::checkLeftTrigger() {
     return mpStick->checkLeftTrigger();
 }
 
-/* 801E3AC8-801E3AEC 1DE408 0024+00 4/4 0/0 0/0 .text checkRightTrigger__14dMenu_Option_cFv */
 bool dMenu_Option_c::checkRightTrigger() {
     return mpStick->checkRightTrigger();
 }
 
-/* 801E3AEC-801E3B98 1DE42C 00AC+00 4/4 0/0 0/0 .text            setAnimation__14dMenu_Option_cFv */
 void dMenu_Option_c::setAnimation() {
     s16 frameMax;
 
@@ -583,7 +570,6 @@ void dMenu_Option_c::setAnimation() {
     field_0x30->setFrame(field_0x3c4);
 }
 
-/* 801E3B98-801E3DE0 1DE4D8 0248+00 0/0 2/2 0/0 .text            _open__14dMenu_Option_cFv */
 bool dMenu_Option_c::_open() {
     if (!mpMount) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/optres.arc", 0, NULL);
@@ -631,7 +617,6 @@ bool dMenu_Option_c::_open() {
     }
 }
 
-/* 801E3DE0-801E3F6C 1DE720 018C+00 0/0 1/1 0/0 .text            _close__14dMenu_Option_cFv */
 bool dMenu_Option_c::_close() {
     s16 closeFrame = g_drawHIO.mOptionScreen.mCloseFrames;
     mFrame = 0;
@@ -660,7 +645,6 @@ bool dMenu_Option_c::_close() {
     }
 }
 
-/* 801E3F6C-801E3FC4 1DE8AC 0058+00 2/1 0/0 0/0 .text            atten_init__14dMenu_Option_cFv */
 void dMenu_Option_c::atten_init() {
     mpDrawCursor->setAlphaRate(1.0f);
     setCursorPos(0);
@@ -668,7 +652,6 @@ void dMenu_Option_c::atten_init() {
     setBButtonString(0x3F9);
 }
 
-/* 801E3FC4-801E41A0 1DE904 01DC+00 1/0 0/0 0/0 .text            atten_move__14dMenu_Option_cFv */
 void dMenu_Option_c::atten_move() {
     bool downTrigger = mpStick->checkDownTrigger();
     bool leftTrigger = checkLeftTrigger();
@@ -757,7 +740,6 @@ void dMenu_Option_c::ruby_move() {
 }
 #endif
 
-/* 801E41A0-801E41F8 1DEAE0 0058+00 1/0 0/0 0/0 .text            vib_init__14dMenu_Option_cFv */
 void dMenu_Option_c::vib_init() {
     mpDrawCursor->setAlphaRate(1.0f);
     setCursorPos(SelectType1);
@@ -765,7 +747,6 @@ void dMenu_Option_c::vib_init() {
     setBButtonString(0x3F9);
 }
 
-/* 801E41F8-801E4488 1DEB38 0290+00 1/0 0/0 0/0 .text            vib_move__14dMenu_Option_cFv */
 void dMenu_Option_c::vib_move() {
     bool upTrigger = mpStick->checkUpTrigger();
     bool downTrigger = mpStick->checkDownTrigger();
@@ -815,7 +796,6 @@ void dMenu_Option_c::vib_move() {
     }
 }
 
-/* 801E4488-801E44E0 1DEDC8 0058+00 1/0 0/0 0/0 .text            sound_init__14dMenu_Option_cFv */
 void dMenu_Option_c::sound_init() {
     mpDrawCursor->setAlphaRate(1.0f);
     setCursorPos(SelectType2);
@@ -823,7 +803,6 @@ void dMenu_Option_c::sound_init() {
     setBButtonString(0x3F9);
 }
 
-/* 801E44E0-801E48AC 1DEE20 03CC+00 1/0 0/0 0/0 .text            sound_move__14dMenu_Option_cFv */
 void dMenu_Option_c::sound_move() {
     bool upTrigger = mpStick->checkUpTrigger();
     mpStick->checkDownTrigger();
@@ -892,13 +871,11 @@ void dMenu_Option_c::sound_move() {
     }
 }
 
-/* 801E48AC-801E48E8 1DF1EC 003C+00 1/0 0/0 0/0 .text            change_init__14dMenu_Option_cFv */
 void dMenu_Option_c::change_init() {
     setAButtonString(0x40C);
     setBButtonString(0x3F9);
 }
 
-/* 801E48E8-801E4B34 1DF228 024C+00 1/0 0/0 0/0 .text            change_move__14dMenu_Option_cFv */
 void dMenu_Option_c::change_move() {
     f32 x = 0.0f;
 
@@ -972,7 +949,6 @@ void dMenu_Option_c::change_move() {
     }
 }
 
-/* 801E4B34-801E4C10 1DF474 00DC+00 1/0 0/0 0/0 .text confirm_open_init__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_open_init() {
     if (field_0x3f7 == 1) {
         mpWarning->setText(0x55F);
@@ -989,7 +965,6 @@ void dMenu_Option_c::confirm_open_init() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_OPEN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801E4C10-801E4CE4 1DF550 00D4+00 1/0 0/0 0/0 .text confirm_open_move__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_open_move() {
     bool status = mpWarning->getStatus();
     bool yesNoMenuMove = yesnoMenuMoveAnm();
@@ -1008,13 +983,11 @@ void dMenu_Option_c::confirm_open_move() {
     setAnimation();
 }
 
-/* 801E4CE4-801E4D20 1DF624 003C+00 1/0 0/0 0/0 .text confirm_move_init__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_move_init() {
     setAButtonString(0x40C);
     setBButtonString(0x3F9);
 }
 
-/* 801E4D20-801E4E98 1DF660 0178+00 1/0 0/0 0/0 .text confirm_move_move__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_move_move() {
     bool leftTrigger = checkLeftTrigger();
     bool rightTrigger = checkRightTrigger();
@@ -1051,11 +1024,9 @@ void dMenu_Option_c::confirm_move_move() {
     setAnimation();
 }
 
-/* 801E4E98-801E4E9C 1DF7D8 0004+00 1/0 0/0 0/0 .text confirm_select_init__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_select_init() {
 }
 
-/* 801E4E9C-801E4F18 1DF7DC 007C+00 1/0 0/0 0/0 .text confirm_select_move__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_select_move() {
     u8 selectMoveAnm = yesnoSelectMoveAnm();
     u8 wakuAlphaAnm = yesnoWakuAlpahAnm(field_0x3fa);
@@ -1068,7 +1039,6 @@ void dMenu_Option_c::confirm_select_move() {
     setAnimation();
 }
 
-/* 801E4F18-801E4FB0 1DF858 0098+00 1/0 0/0 0/0 .text confirm_close_init__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_close_init() {
     mpWarning->closeInit();
     setSelectColor(field_0x403, false);
@@ -1078,7 +1048,6 @@ void dMenu_Option_c::confirm_close_init() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801E4FB0-801E51CC 1DF8F0 021C+00 1/0 0/0 0/0 .text confirm_close_move__14dMenu_Option_cFv */
 void dMenu_Option_c::confirm_close_move() {
     bool status = mpWarning->getStatus();
     yesnoMenuMoveAnm();
@@ -1128,8 +1097,6 @@ void dMenu_Option_c::confirm_close_move() {
     setAnimation();
 }
 
-/* 801E51CC-801E5244 1DFB0C 0078+00 1/0 0/0 0/0 .text            tv_open1_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::tv_open1_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         dMw_c::dMw_fade_in();
@@ -1141,15 +1108,12 @@ void dMenu_Option_c::tv_open1_move() {
     }
 }
 
-/* 801E5244-801E5260 1DFB84 001C+00 1/0 0/0 0/0 .text            tv_open2_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::tv_open2_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
         field_0x3f3 = 2;
     }
 }
 
-/* 801E5260-801E5300 1DFBA0 00A0+00 1/0 0/0 0/0 .text            tv_move_move__14dMenu_Option_cFv */
 void dMenu_Option_c::tv_move_move() {
     if (mDoCPd_c::getTrigZ(PAD_1) != 0 || mDoCPd_c::getTrigA(PAD_1) != 0) {
         Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1161,8 +1125,6 @@ void dMenu_Option_c::tv_move_move() {
     }
 }
 
-/* 801E5300-801E5364 1DFC40 0064+00 1/0 0/0 0/0 .text            tv_close1_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::tv_close1_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         dMw_c::dMw_fade_in();
@@ -1172,16 +1134,12 @@ void dMenu_Option_c::tv_close1_move() {
     }
 }
 
-/* 801E5364-801E5380 1DFCA4 001C+00 1/0 0/0 0/0 .text            tv_close2_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::tv_close2_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
         field_0x3f3 = 5;
     }
 }
 
-/* 801E5380-801E53C4 1DFCC0 0044+00 1/0 0/0 0/0 .text calibration_open1_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::calibration_open1_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         dMw_c::dMw_fade_in();
@@ -1189,15 +1147,12 @@ void dMenu_Option_c::calibration_open1_move() {
     }
 }
 
-/* 801E53C4-801E53E0 1DFD04 001C+00 1/0 0/0 0/0 .text calibration_open2_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::calibration_open2_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
         field_0x3f4 = 2;
     }
 }
 
-/* 801E53E0-801E5434 1DFD20 0054+00 1/0 0/0 0/0 .text calibration_move_move__14dMenu_Option_cFv */
 void dMenu_Option_c::calibration_move_move() {
     if (mpCalibration->mStatus == 0) {
         dMw_c::dMw_fade_out();
@@ -1207,8 +1162,6 @@ void dMenu_Option_c::calibration_move_move() {
     }
 }
 
-/* 801E5434-801E5478 1DFD74 0044+00 1/0 0/0 0/0 .text calibration_close1_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::calibration_close1_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         dMw_c::dMw_fade_in();
@@ -1216,15 +1169,12 @@ void dMenu_Option_c::calibration_close1_move() {
     }
 }
 
-/* 801E5478-801E5494 1DFDB8 001C+00 1/0 0/0 0/0 .text calibration_close2_move__14dMenu_Option_cFv
- */
 void dMenu_Option_c::calibration_close2_move() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
         field_0x3f4 = 5;
     }
 }
 
-/* 801E5494-801E54F8 1DFDD4 0064+00 1/1 0/0 0/0 .text            menuVisible__14dMenu_Option_cFv */
 void dMenu_Option_c::menuVisible() {
     for (int i = 0; i < 6; i++) {
         if (i < SelectType3) {
@@ -1235,7 +1185,6 @@ void dMenu_Option_c::menuVisible() {
     }
 }
 
-/* 801E54F8-801E55B8 1DFE38 00C0+00 1/1 0/0 0/0 .text            menuShow__14dMenu_Option_cFi */
 void dMenu_Option_c::menuShow(int index) {
     mpMenuNull[index]->show();
     mpMenuPane[index]->show();
@@ -1255,7 +1204,6 @@ void dMenu_Option_c::menuShow(int index) {
     }
 }
 
-/* 801E55B8-801E5678 1DFEF8 00C0+00 1/1 0/0 0/0 .text            menuHide__14dMenu_Option_cFi */
 void dMenu_Option_c::menuHide(int index) {
     mpMenuNull[index]->hide();
     mpMenuPane[index]->hide();
@@ -1275,7 +1223,6 @@ void dMenu_Option_c::menuHide(int index) {
     }
 }
 
-/* 801E5678-801E6FBC 1DFFB8 1944+00 1/1 0/0 0/0 .text            screenSet__14dMenu_Option_cFv */
 void dMenu_Option_c::screenSet() {
     static const u64 tag_frame[6] = {
         'flame_00', 'flame_01', 'flame_02', 'flame_03', 'flame_04', 'flame_05',
@@ -1744,8 +1691,6 @@ void dMenu_Option_c::screenSet() {
     }
 }
 
-/* 801E6FBC-801E7004 1E18FC 0048+00 2/2 0/0 0/0 .text            setSoundMode__14dMenu_Option_cFUl
- */
 void dMenu_Option_c::setSoundMode(u32 param_0) {
     switch (param_0) {
     case 0:
@@ -1758,8 +1703,6 @@ void dMenu_Option_c::setSoundMode(u32 param_0) {
     }
 }
 
-/* 801E7004-801E70E8 1E1944 00E4+00 2/2 0/0 0/0 .text            setAttenString__14dMenu_Option_cFv
- */
 void dMenu_Option_c::setAttenString() {
     u16 stringId1;
     u16 stringId2;
@@ -1806,7 +1749,6 @@ void dMenu_Option_c::setRubyString() {
 }
 #endif
 
-/* 801E70E8-801E71CC 1E1A28 00E4+00 2/2 0/0 0/0 .text            setVibString__14dMenu_Option_cFv */
 void dMenu_Option_c::setVibString() {
     u16 stringId1;
     u16 stringId2;
@@ -1834,8 +1776,6 @@ void dMenu_Option_c::setVibString() {
     }
 }
 
-/* 801E71CC-801E7314 1E1B0C 0148+00 2/2 0/0 0/0 .text            setSoundString__14dMenu_Option_cFv
- */
 void dMenu_Option_c::setSoundString() {
     u16 stringId1;
     u16 stringId2;
@@ -1873,8 +1813,6 @@ void dMenu_Option_c::setSoundString() {
     }
 }
 
-/* 801E7314-801E73D8 1E1C54 00C4+00 8/8 0/0 0/0 .text            setCursorPos__14dMenu_Option_cFUc
- */
 void dMenu_Option_c::setCursorPos(u8 i_index) {
 #if VERSION != VERSION_GCN_JPN
     if (i_index == 4) {
@@ -1889,7 +1827,6 @@ void dMenu_Option_c::setCursorPos(u8 i_index) {
     changeBarColor(false);
 }
 
-/* 801E73D8-801E76EC 1E1D18 0314+00 4/4 0/0 0/0 .text setSelectColor__14dMenu_Option_cFUcb */
 void dMenu_Option_c::setSelectColor(u8 param_0, bool param_1) {
     for (int i = 0; i < 6; i++) {
         if (i == param_0 || param_1) {
@@ -1930,8 +1867,6 @@ void dMenu_Option_c::setSelectColor(u8 param_0, bool param_1) {
     }
 }
 
-/* 801E76EC-801E7718 1E202C 002C+00 8/8 0/0 0/0 .text            getSelectType__14dMenu_Option_cFv
- */
 u8 dMenu_Option_c::getSelectType() {
     if (field_0x3ef < SelectType3) {
         return field_0x3ef;
@@ -1942,8 +1877,6 @@ u8 dMenu_Option_c::getSelectType() {
     return 0;
 }
 
-/* 801E7718-801E78B8 1E2058 01A0+00 3/3 0/0 0/0 .text            changeBarColor__14dMenu_Option_cFb
- */
 void dMenu_Option_c::changeBarColor(bool i_changeColor) {
     u8 selectType = getSelectType();
 
@@ -1964,7 +1897,6 @@ void dMenu_Option_c::changeBarColor(bool i_changeColor) {
     }
 }
 
-/* 801E78B8-801E7D18 1E21F8 0460+00 4/4 0/0 0/0 .text            setHIO__14dMenu_Option_cFb */
 void dMenu_Option_c::setHIO(bool i_useHIO) {
     if (field_0x378 != g_drawHIO.mOptionScreen.mWindowPosX ||
         field_0x37c != g_drawHIO.mOptionScreen.mWindowPosY)
@@ -2043,13 +1975,11 @@ void dMenu_Option_c::setHIO(bool i_useHIO) {
     }
 }
 
-/* 801E7D18-801E7D60 1E2658 0048+00 2/2 0/0 0/0 .text            cursorAnime__14dMenu_Option_cFf */
 void dMenu_Option_c::cursorAnime(f32 i_cursorValue) {
     mpDrawCursor->setAlphaRate(i_cursorValue);
     mpDrawCursor->setScale(i_cursorValue);
 }
 
-/* 801E7D60-801E7DF4 1E26A0 0094+00 3/3 0/0 0/0 .text setZButtonString__14dMenu_Option_cFUs */
 void dMenu_Option_c::setZButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 3; i++) {
@@ -2066,8 +1996,6 @@ void dMenu_Option_c::setZButtonString(u16 i_stringID) {
     }
 }
 
-/* 801E7DF4-801E7E98 1E2734 00A4+00 3/3 0/0 0/0 .text            changeTVCheck__14dMenu_Option_cFv
- */
 void dMenu_Option_c::changeTVCheck() {
     if (mDoCPd_c::getTrigZ(PAD_1) != 0) {
         Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_CHANGE_WINDOW, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f,
@@ -2089,7 +2017,6 @@ static void dummy() {
 #endif
 }
 
-/* 801E7E98-801E7F9C 1E27D8 0104+00 11/11 0/0 0/0 .text setAButtonString__14dMenu_Option_cFUs */
 void dMenu_Option_c::setAButtonString(u16 i_stringID) {
     static const u64 text_a_tag[5] = {'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5'};
     u32 stringId = i_stringID;
@@ -2109,7 +2036,6 @@ void dMenu_Option_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801E7F9C-801E80A0 1E28DC 0104+00 11/11 0/0 0/0 .text setBButtonString__14dMenu_Option_cFUs */
 void dMenu_Option_c::setBButtonString(u16 i_stringID) {
     static const u64 text_b_tag[5] = {'btext1_1', 'btext1_2', 'btext1_3', 'btext1_4', 'btext1_5'};
     u32 stringId = i_stringID;
@@ -2130,17 +2056,14 @@ void dMenu_Option_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801E80A0-801E80AC 1E29E0 000C+00 4/4 0/0 0/0 .text isRumbleSupported__14dMenu_Option_cFv */
 bool dMenu_Option_c::isRumbleSupported() {
     return JUTGamePad::sRumbleSupported >> 0x1f;
 }
 
-/* 801E80AC-801E80B4 1E29EC 0008+00 1/1 0/0 0/0 .text            dpdMenuMove__14dMenu_Option_cFv */
 bool dMenu_Option_c::dpdMenuMove() {
     return false;
 }
 
-/* 801E80B4-801E8210 1E29F4 015C+00 1/1 0/0 0/0 .text            paneResize__14dMenu_Option_cFUx */
 void dMenu_Option_c::paneResize(u64 i_tag) {
     f32 boundsY = mpClipScreen->search(i_tag)->getBounds().i.y;
     f32 boundsX = mpClipScreen->search(i_tag)->getBounds().i.x - 5.0f;
@@ -2154,7 +2077,6 @@ void dMenu_Option_c::paneResize(u64 i_tag) {
     mpClipScreen->search(i_tag)->resize(boundsX + 10.0f, boundsY);
 }
 
-/* 801E8210-801E82C4 1E2B50 00B4+00 1/1 1/1 0/0 .text            initialize__14dMenu_Option_cFv */
 void dMenu_Option_c::initialize() {
     field_0x3e4 = dComIfGs_getOptAttentionType();
 #if VERSION == VERSION_GCN_JPN
@@ -2185,8 +2107,6 @@ void dMenu_Option_c::initialize() {
     field_0x3da = 0;
 }
 
-/* 801E82C4-801E8438 1E2C04 0174+00 3/3 0/0 0/0 .text yesnoMenuMoveAnmInitSet__14dMenu_Option_cFii
- */
 void dMenu_Option_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) {
     if (field_0x3f8 == 0) {
         field_0x3f9 = 0;
@@ -2208,7 +2128,6 @@ void dMenu_Option_c::yesnoMenuMoveAnmInitSet(int param_0, int param_1) {
     mpYesNoSelBase_c[1]->getPanePtr()->animationTransform();
 }
 
-/* 801E8438-801E85D4 1E2D78 019C+00 2/2 0/0 0/0 .text yesnoMenuMoveAnm__14dMenu_Option_cFv */
 bool dMenu_Option_c::yesnoMenuMoveAnm() {
     bool ret;
     if (field_0x3c8[2] != field_0x3c8[3]) {
@@ -2246,13 +2165,10 @@ bool dMenu_Option_c::yesnoMenuMoveAnm() {
     return ret;
 }
 
-/* 80450730-80450738 0001B0 0008+00 2/2 0/0 0/0 .sdata           OptYnSelStartFrameTbl */
 static s32 OptYnSelStartFrameTbl[2] = {1251, 1236};
 
-/* 80450738-80450740 0001B8 0008+00 2/2 0/0 0/0 .sdata           OptYnSelEndFrameTbl */
 static s32 OptYnSelEndFrameTbl[2] = {1236, 1251};
 
-/* 801E85D4-801E8888 1E2F14 02B4+00 1/1 0/0 0/0 .text yesnoSelectMoveAnm__14dMenu_Option_cFv */
 u8 dMenu_Option_c::yesnoSelectMoveAnm() {
     u8 ret = 0;
     bool bVar1;
@@ -2318,8 +2234,6 @@ u8 dMenu_Option_c::yesnoSelectMoveAnm() {
     return ret;
 }
 
-/* 801E8888-801E89F8 1E31C8 0170+00 2/2 0/0 0/0 .text            yesnoCursorShow__14dMenu_Option_cFv
- */
 void dMenu_Option_c::yesnoCursorShow() {
     if (field_0x3f9 != 0xff) {
         ((J2DTextBox*)mpYesNoTxt_c[field_0x3f9]->getPanePtr())
@@ -2335,7 +2249,6 @@ void dMenu_Option_c::yesnoCursorShow() {
     }
 }
 
-/* 801E89F8-801E8AC8 1E3338 00D0+00 1/1 0/0 0/0 .text yesNoSelectStart__14dMenu_Option_cFv */
 void dMenu_Option_c::yesNoSelectStart() {
     if (field_0x3f9 != 0) {
         if (field_0x3f7 == 1) {
@@ -2350,7 +2263,6 @@ void dMenu_Option_c::yesNoSelectStart() {
     }
 }
 
-/* 801E8AC8-801E8C38 1E3408 0170+00 1/1 0/0 0/0 .text yesnoSelectAnmSet__14dMenu_Option_cFv */
 void dMenu_Option_c::yesnoSelectAnmSet() {
     if (field_0x3fa != 0xff) {
         yesnoWakuAlpahAnmInit(field_0x3fa, 0xff, 0, 5);
@@ -2368,15 +2280,12 @@ void dMenu_Option_c::yesnoSelectAnmSet() {
     }
 }
 
-/* 801E8C38-801E8CB0 1E3578 0078+00 2/2 0/0 0/0 .text yesnoCancelAnmSet__14dMenu_Option_cFv */
 void dMenu_Option_c::yesnoCancelAnmSet() {
     Z2GetAudioMgr()->seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     mpDrawCursor->setAlphaRate(0.0f);
     yesnoMenuMoveAnmInitSet(0x47D, 0x473);
 }
 
-/* 801E8CB0-801E8CFC 1E35F0 004C+00 1/1 0/0 0/0 .text
- * yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc             */
 void dMenu_Option_c::yesnoWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8 param_3) {
     if (i_idx != 0xff) {
         mpYesNoCurWaku_c[i_idx]->alphaAnimeStart(0);
@@ -2389,7 +2298,6 @@ void dMenu_Option_c::yesnoWakuAlpahAnmInit(u8 i_idx, u8 param_1, u8 param_2, u8
     }
 }
 
-/* 801E8CFC-801E8E6C 1E363C 0170+00 1/1 0/0 0/0 .text yesnoWakuAlpahAnm__14dMenu_Option_cFUc */
 u8 dMenu_Option_c::yesnoWakuAlpahAnm(u8 i_idx) {
     u8 ret = 0;
     bool wakuAnime;
diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp
index bb57b2116e..d1c1d452cb 100644
--- a/src/d/d_menu_ring.cpp
+++ b/src/d/d_menu_ring.cpp
@@ -29,7 +29,6 @@
 
 #include "stdio.h"
 
-/* 803BDEAC-803BDEDC 01AFCC 0030+00 3/4 0/0 0/0 .data            stick_init */
 typedef void (dMenu_Ring_c::*initFunc)();
 static initFunc stick_init[] = {
     /* STATUS_WAIT          */ &dMenu_Ring_c::stick_wait_init,
@@ -38,7 +37,6 @@ static initFunc stick_init[] = {
     /* STATUS_EXPLAIN_FORCE */ &dMenu_Ring_c::stick_explain_force_init,
 };
 
-/* 803BDF0C-803BDF3C 01B02C 0030+00 1/2 0/0 0/0 .data            stick_proc */
 typedef void (dMenu_Ring_c::*procFunc)();
 static procFunc stick_proc[] = {
     /* STATUS_WAIT          */ &dMenu_Ring_c::stick_wait_proc,
@@ -47,8 +45,6 @@ static procFunc stick_proc[] = {
     /* STATUS_EXPLAIN_FORCE */ &dMenu_Ring_c::stick_explain_force_proc,
 };
 
-/* 801E9118-801EA708 1E3A58 15F0+00 0/0 1/1 0/0 .text
- * __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc */
 dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i_cStick,
                            u8 i_ringOrigin) {
     static const u64 xy_text[5] = {
@@ -441,7 +437,6 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i
     }
 }
 
-/* 801EA708-801EAB7C 1E5048 0474+00 1/0 0/0 0/0 .text            __dt__12dMenu_Ring_cFv */
 dMenu_Ring_c::~dMenu_Ring_c() {
     mpHeap->getTotalFreeSize();
     dMeter2Info_setItemExplainWindowStatus(0);
@@ -537,7 +532,6 @@ dMenu_Ring_c::~dMenu_Ring_c() {
     dComIfGp_getRingResArchive()->removeResourceAll();
 }
 
-/* 801EAB7C-801EABE8 1E54BC 006C+00 0/0 1/1 0/0 .text            _create__12dMenu_Ring_cFv */
 /** @details
  * Initializes the very first status (which is STATUS_WAIT) after the ctor
  * and plays the item wheel opening sound
@@ -547,12 +541,10 @@ void dMenu_Ring_c::_create() {
     Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_IN, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801EABE8-801EABEC 1E5528 0004+00 0/0 1/1 0/0 .text            _delete__12dMenu_Ring_cFv */
 void dMenu_Ring_c::_delete() {
     /* empty function */
 }
 
-/* 801EABEC-801EACC8 1E552C 00DC+00 0/0 1/1 0/0 .text            _move__12dMenu_Ring_cFv */
 /** @details
  * This is the update function which runs every frame. 
  * It runs a process based on mStatus every frame or 
@@ -579,7 +571,6 @@ void dMenu_Ring_c::_move() {
     }
 }
 
-/* 801EACC8-801EB080 1E5608 03B8+00 1/1 0/0 0/0 .text            _draw__12dMenu_Ring_cFv */
 void dMenu_Ring_c::_draw() {
     J2DGrafContext* grafPort = dComIfGp_getCurrentGrafPort();
     grafPort->setup2D();
@@ -640,12 +631,10 @@ void dMenu_Ring_c::_draw() {
     }
 }
 
-/* 801EB080-801EB0A4 1E59C0 0024+00 2/2 0/0 0/0 .text            setKanteraPos__12dMenu_Ring_cFff */
 void dMenu_Ring_c::setKanteraPos(f32 i_posX, f32 i_posY) {
     mpKanteraMeter->setPos(i_posX, i_posY);
 }
 
-/* 801EB0A4-801EB2B4 1E59E4 0210+00 0/0 1/1 0/0 .text            isOpen__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::isOpen() {
     bool opened = false;
     if (mOpenCloseFrames == 0) {
@@ -686,7 +675,6 @@ bool dMenu_Ring_c::isOpen() {
     return opened;
 }
 
-/* 801EB2B4-801EB3CC 1E5BF4 0118+00 0/0 1/1 0/0 .text            isMoveEnd__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::isMoveEnd() {
     bool ret = 0;
     if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN) {
@@ -709,7 +697,6 @@ bool dMenu_Ring_c::isMoveEnd() {
     return ret;
 }
 
-/* 801EB3CC-801EB624 1E5D0C 0258+00 0/0 1/1 0/0 .text            isClose__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::isClose() {
     bool closed = true;
     if (field_0x674[0] != 0 || field_0x674[1] != 0 || field_0x674[2] != 0 || field_0x674[3] != 0) {
@@ -751,7 +738,6 @@ bool dMenu_Ring_c::isClose() {
     return closed;
 }
 
-/* 801EB624-801EB8C0 1E5F64 029C+00 1/1 0/0 0/0 .text getStickInfo__12dMenu_Ring_cFP9STControl */
 u8 dMenu_Ring_c::getStickInfo(STControl* i_stick) {
     field_0x6c2 = 0xff;
     if (i_stick->getValueStick() >= 0.75f) {
@@ -835,8 +821,6 @@ u8 dMenu_Ring_c::getStickInfo(STControl* i_stick) {
     return 0;
 }
 
-/* 801EB8C0-801EB960 1E6200 00A0+00 1/0 0/0 0/0 .text calcStickAngle__12dMenu_Ring_cFP9STControlUc
- */
 s16 dMenu_Ring_c::calcStickAngle(STControl* i_stick, u8 param_1) {
     s16 directionTrig = i_stick->getAngleStick();
     switch (param_1) {
@@ -870,7 +854,6 @@ s16 dMenu_Ring_c::calcStickAngle(STControl* i_stick, u8 param_1) {
     return directionTrig;
 }
 
-/* 801EB960-801EBA38 1E62A0 00D8+00 1/1 0/0 0/0 .text            setRotate__12dMenu_Ring_cFv */
 void dMenu_Ring_c::setRotate() {
     clacEllipsePlotAverage(mItemsTotal, g_ringHIO.mItemRingPosX + 304.0f,
                            g_ringHIO.mItemRingPosY + 224.0f);
@@ -880,7 +863,6 @@ void dMenu_Ring_c::setRotate() {
     }
 }
 
-/* 801EBA38-801EBAB8 1E6378 0080+00 1/1 0/0 0/0 .text            setItemScale__12dMenu_Ring_cFif */
 void dMenu_Ring_c::setItemScale(int i_idx, f32 i_scale) {
     for (int i = 0; i < 3; i++) {
         if (mpItemTex[i_idx][i] != NULL) {
@@ -889,8 +871,6 @@ void dMenu_Ring_c::setItemScale(int i_idx, f32 i_scale) {
     }
 }
 
-/* 801EBAB8-801EBB10 1E63F8 0058+00 2/2 0/0 0/0 .text            setButtonScale__12dMenu_Ring_cFif
- */
 void dMenu_Ring_c::setButtonScale(int i_idx, f32 i_scale) {
     i_idx += 8; // reach the offset in mpTextParent for the buttons
     if (mpTextParent[i_idx] != NULL) {
@@ -899,7 +879,6 @@ void dMenu_Ring_c::setButtonScale(int i_idx, f32 i_scale) {
     }
 }
 
-/* 801EBB10-801EBE58 1E6450 0348+00 1/1 0/0 0/0 .text            setItem__12dMenu_Ring_cFv */
 void dMenu_Ring_c::setItem() {
     u8 uVar1;
     u8 uVar2;
@@ -1010,7 +989,6 @@ void dMenu_Ring_c::setItem() {
     setJumpItem(true);
 }
 
-/* 801EBE58-801EC20C 1E6798 03B4+00 2/2 0/0 0/0 .text            setJumpItem__12dMenu_Ring_cFb */
 void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
     for (int i = 0; i < 4; i++) {
         if (i == 2) {
@@ -1079,7 +1057,6 @@ void dMenu_Ring_c::setJumpItem(bool i_useVibrationM) {
     }
 }
 
-/* 801EC20C-801EC3B0 1E6B4C 01A4+00 2/2 0/0 0/0 .text            setScale__12dMenu_Ring_cFv */
 void dMenu_Ring_c::setScale() {
     u32 itemId;
     for (int i = 0; i < mItemsTotal; i++) {
@@ -1122,7 +1099,6 @@ void dMenu_Ring_c::setScale() {
     }
 }
 
-/* 801EC3B0-801EC504 1E6CF0 0154+00 1/1 0/0 0/0 .text            setNameString__12dMenu_Ring_cFUl */
 void dMenu_Ring_c::setNameString(u32 i_stringID) {
     J2DTextBox* textBox[4];
 #if VERSION == VERSION_GCN_JPN
@@ -1148,8 +1124,6 @@ void dMenu_Ring_c::setNameString(u32 i_stringID) {
     }
 }
 
-/* 801EC504-801EC754 1E6E44 0250+00 1/1 0/0 0/0 .text            setActiveCursor__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::setActiveCursor() {
     u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
     if (mStatus == STATUS_WAIT && mOldStatus != STATUS_EXPLAIN_FORCE && mOldStatus != STATUS_EXPLAIN && mpItemExplain->getStatus() == 0) {
@@ -1189,7 +1163,6 @@ void dMenu_Ring_c::setActiveCursor() {
     }
 }
 
-/* 801EC754-801ECB14 1E7094 03C0+00 1/1 0/0 0/0 .text            setMixItem__12dMenu_Ring_cFv */
 void dMenu_Ring_c::setMixItem() {
     u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
     bool bVar1 = false;
@@ -1273,7 +1246,6 @@ void dMenu_Ring_c::setMixItem() {
     }
 }
 
-/* 801ECB14-801ECF9C 1E7454 0488+00 1/1 0/0 0/0 .text            drawItem__12dMenu_Ring_cFv */
 void dMenu_Ring_c::drawItem() {
     field_0x684++;
     if (field_0x684 >= g_ringHIO.mItemAlphaFlashDuration) {
@@ -1331,7 +1303,6 @@ void dMenu_Ring_c::drawItem() {
     }
 }
 
-/* 801ECF9C-801ED2BC 1E78DC 0320+00 1/1 0/0 0/0 .text            drawItem2__12dMenu_Ring_cFv */
 void dMenu_Ring_c::drawItem2() {
     s32 idx = mCurrentSlot;
     if (mStatus == STATUS_WAIT || mStatus == STATUS_EXPLAIN || mStatus == STATUS_EXPLAIN_FORCE) {
@@ -1373,8 +1344,6 @@ void dMenu_Ring_c::drawItem2() {
     }
 }
 
-/* 801ED2BC-801ED31C 1E7BFC 0060+00 1/0 0/0 0/0 .text            stick_wait_init__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_wait_init() {
     if (mDoCPd_c::getHoldL(PAD_1) != 0) {
         if (mDirectSelectActive) {
@@ -1389,8 +1358,6 @@ void dMenu_Ring_c::stick_wait_init() {
     mDirectSelectActive = false;
 }
 
-/* 801ED31C-801ED490 1E7C5C 0174+00 1/0 0/0 0/0 .text            stick_wait_proc__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_wait_proc() {
     u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
 
@@ -1418,8 +1385,6 @@ void dMenu_Ring_c::stick_wait_proc() {
     }
 }
 
-/* 801ED490-801ED53C 1E7DD0 00AC+00 1/0 0/0 0/0 .text            stick_move_init__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_move_init() {
     if (mCursorSpeed == 0) {
         mCursorSpeed = g_ringHIO.mCursorInitSpeed;
@@ -1433,8 +1398,6 @@ void dMenu_Ring_c::stick_move_init() {
     Z2GetAudioMgr()->seStart(Z2SE_ITEM_RING_ROLL, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
 }
 
-/* 801ED53C-801ED934 1E7E7C 03F8+00 1/0 0/0 0/0 .text            stick_move_proc__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_move_proc() {
     setDoStatus(0x24);
     if (mDirectSelectActive) {
@@ -1491,18 +1454,14 @@ void dMenu_Ring_c::stick_move_proc() {
     }
 }
 
-/* 801ED934-801ED938 1E8274 0004+00 1/0 0/0 0/0 .text stick_explain_init__12dMenu_Ring_cFv */
 void dMenu_Ring_c::stick_explain_init() {
     /* empty function */
 }
 
-/* 801ED938-801ED93C 1E8278 0004+00 1/0 0/0 0/0 .text stick_explain_force_init__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_explain_force_init() {
     /* empty function */
 }
 
-/* 801ED93C-801EDA0C 1E827C 00D0+00 1/0 0/0 0/0 .text stick_explain_proc__12dMenu_Ring_cFv */
 void dMenu_Ring_c::stick_explain_proc() {
     mpItemExplain->move();
     if (mpItemExplain->getStatus() == 0) {
@@ -1519,8 +1478,6 @@ void dMenu_Ring_c::stick_explain_proc() {
     mpBlackTex->setAlpha((1.0f - alphaRatio) * 150.0f);
 }
 
-/* 801EDA0C-801EDB14 1E834C 0108+00 1/0 0/0 0/0 .text stick_explain_force_proc__12dMenu_Ring_cFv
- */
 void dMenu_Ring_c::stick_explain_force_proc() {
     mpItemExplain->move();
     u8 endButton = mpItemExplain->checkEndButton();
@@ -1537,8 +1494,6 @@ void dMenu_Ring_c::stick_explain_force_proc() {
     mpBlackTex->setAlpha((1.0f - alphaRatio) * 150.0f);
 }
 
-/* 801EDB14-801EDC98 1E8454 0184+00 2/2 0/0 0/0 .text            setSelectItem__12dMenu_Ring_cFiUc
- */
 void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) {
     f32 texScale = 1.0f;
 
@@ -1560,7 +1515,6 @@ void dMenu_Ring_c::setSelectItem(int i_idx, u8 i_itemNo) {
         mpSelectItemTexBuf[i_idx][field_0x6be[i_idx]][0]->height / 48.0f * texScale;
 }
 
-/* 801EDC98-801EDF2C 1E85D8 0294+00 1/1 0/0 0/0 .text            drawSelectItem__12dMenu_Ring_cFv */
 void dMenu_Ring_c::drawSelectItem() {
     for (int i = 0; i < 4; i++) {
         if (field_0x674[i] != 0) {
@@ -1601,7 +1555,6 @@ void dMenu_Ring_c::drawSelectItem() {
     }
 }
 
-/* 801EDF2C-801EDFDC 1E886C 00B0+00 4/4 0/0 0/0 .text setSelectItemForce__12dMenu_Ring_cFi */
 void dMenu_Ring_c::setSelectItemForce(int i_idx) {
     if (i_idx == 2) {
         if (field_0x674[i_idx] != 0) {
@@ -1617,7 +1570,6 @@ void dMenu_Ring_c::setSelectItemForce(int i_idx) {
     }
 }
 
-/* 801EDFDC-801EE058 1E891C 007C+00 1/1 0/0 0/0 .text            getCursorPos__12dMenu_Ring_cFUc */
 u8 dMenu_Ring_c::getCursorPos(u8 i_slotNo) {
     for (s32 i = 0; i < mItemsTotal; i++) {
         if (i_slotNo == dComIfGs_getLineUpItem(i)) {
@@ -1627,7 +1579,6 @@ u8 dMenu_Ring_c::getCursorPos(u8 i_slotNo) {
     return 0xff;
 }
 
-/* 801EE058-801EE15C 1E8998 0104+00 4/4 0/0 0/0 .text            getItemNum__12dMenu_Ring_cFUc */
 /** @details
  * Returns current ammo depending on the current item slot the cursor is on
  * This can be:
@@ -1667,7 +1618,6 @@ u8 dMenu_Ring_c::getItemNum(u8 i_slotNo) {
     return ret;
 }
 
-/* 801EE15C-801EE228 1E8A9C 00CC+00 4/4 0/0 0/0 .text            getItemMaxNum__12dMenu_Ring_cFUc */
 /** @details
  * Returns maximum capacity obtained depending on the currently selected item slot
  * This can be:
@@ -1707,8 +1657,6 @@ u8 dMenu_Ring_c::getItemMaxNum(u8 i_slotNo) {
     return ret;
 }
 
-/* 801EE228-801EE63C 1E8B68 0414+00 1/1 0/0 0/0 .text            checkExplainForce__12dMenu_Ring_cFv
- */
 bool dMenu_Ring_c::checkExplainForce() {
     u8 local_18[4];
 
@@ -1822,18 +1770,14 @@ bool dMenu_Ring_c::checkExplainForce() {
     return 0;
 }
 
-/* 801EE63C-801EE644 1E8F7C 0008+00 1/1 0/0 0/0 .text            checkCombineBomb__12dMenu_Ring_cFi
- */
 bool dMenu_Ring_c::checkCombineBomb(int param_0) {
     return false;
 }
 
-/* 801EE644-801EE648 1E8F84 0004+00 1/1 0/0 0/0 .text            setCombineBomb__12dMenu_Ring_cFi */
 void dMenu_Ring_c::setCombineBomb(int param_0) {
     /* empty function */
 }
 
-/* 801EE648-801EEA84 1E8F88 043C+00 2/2 0/0 0/0 .text            drawNumber__12dMenu_Ring_cFiiff */
 void dMenu_Ring_c::drawNumber(int i_itemNum, int i_itemMaxNum, f32 i_posX, f32 i_posY) {
     if (i_itemNum > 100) {
         i_itemNum = 100;
@@ -1897,14 +1841,12 @@ void dMenu_Ring_c::drawNumber(int i_itemNum, int i_itemMaxNum, f32 i_posX, f32 i
     }
 }
 
-/* 801EEA84-801EEAE4 1E93C4 0060+00 1/1 0/0 0/0 .text            getItem__12dMenu_Ring_cFiUc */
 u8 dMenu_Ring_c::getItem(int i_slot_no, u8 i_slot_no2) {
     u8 item = dComIfGs_getItem(i_slot_no, 0);
     dComIfGs_getItem(i_slot_no2, 0);
     return item;
 }
 
-/* 801EEAE4-801EEB58 1E9424 0074+00 2/2 0/0 0/0 .text            setDoStatus__12dMenu_Ring_cFUc */
 void dMenu_Ring_c::setDoStatus(u8 i_doStatus) {
     if (i_doStatus == 0 && mDoStatus == 0x24) {
         if (field_0x68e > 0) {
@@ -1922,7 +1864,6 @@ void dMenu_Ring_c::setDoStatus(u8 i_doStatus) {
     dComIfGp_setDoStatusForce(mDoStatus, 0);
 }
 
-/* 801EEB58-801EEC98 1E9498 0140+00 1/1 0/0 0/0 .text            isMixItemOn__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::isMixItemOn() {
     if (!mPlayerIsWolf && dComIfGs_getItem(mItemSlots[mCurrentSlot], false) != fpcNm_ITEM_NONE) {
         u8 item = dComIfGs_getItem(mItemSlots[mCurrentSlot], false);
@@ -1947,7 +1888,6 @@ bool dMenu_Ring_c::isMixItemOn() {
     return false;
 }
 
-/* 801EEC98-801EED84 1E95D8 00EC+00 1/1 0/0 0/0 .text            isMixItemOff__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::isMixItemOff() {
     if ((!mPlayerIsWolf) && (dComIfGs_getItem(mItemSlots[mCurrentSlot], 0) != fpcNm_ITEM_NONE)) {
         if ((dComIfGs_getMixItemIndex(0) == SLOT_4) &&
@@ -1964,7 +1904,6 @@ bool dMenu_Ring_c::isMixItemOff() {
     return 0;
 }
 
-/* 801EED84-801EEF14 1E96C4 0190+00 1/1 0/0 0/0 .text            setMixMessage__12dMenu_Ring_cFv */
 void dMenu_Ring_c::setMixMessage() {
     if (mpTextParent[4] != NULL) {
         if (isMixItemOff()) {
@@ -1996,7 +1935,6 @@ void dMenu_Ring_c::setMixMessage() {
     }
 }
 
-/* 801EEF14-801EF11C 1E9854 0208+00 2/2 0/0 0/0 .text            textScaleHIO__12dMenu_Ring_cFv */
 void dMenu_Ring_c::textScaleHIO() {
     for (int i = 0; i < 10; i++) {
         if (mpTextParent[i] != NULL && i != 2) {
@@ -2038,25 +1976,19 @@ void dMenu_Ring_c::textScaleHIO() {
     }
 }
 
-/* 801EF11C-801EF13C 1E9A5C 0020+00 1/1 0/0 0/0 .text            textCentering__12dMenu_Ring_cFv */
 void dMenu_Ring_c::textCentering() {
     textScaleHIO();
 }
 
-/* 801EF13C-801EF174 1E9A7C 0038+00 1/1 0/0 0/0 .text clacEllipseFunction__12dMenu_Ring_cFfff */
 f32 dMenu_Ring_c::clacEllipseFunction(f32 param_0, f32 param_1, f32 param_2) {
     return -JMAFastSqrt(param_2 * param_2 * (1.0f - (param_0 * param_0) / (param_1 * param_1)));
 }
 
-/* 801EF174-801EF1A0 1E9AB4 002C+00 1/1 0/0 0/0 .text            calcDistance__12dMenu_Ring_cFffff
- */
 f32 dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     return JMAFastSqrt((param_2 - param_0) * (param_2 - param_0) +
                        (param_3 - param_1) * (param_3 - param_1));
 }
 
-/* 801EF1A0-801EF484 1E9AE0 02E4+00 1/1 0/0 0/0 .text clacEllipsePlotAverage__12dMenu_Ring_cFiff
- */
 void dMenu_Ring_c::clacEllipsePlotAverage(int param_0, f32 param_1, f32 param_2) {
     f32 ring_radius_h = mRingRadiusH;
     f32 ring_radius_v = mRingRadiusV;
@@ -2123,12 +2055,10 @@ void dMenu_Ring_c::clacEllipsePlotAverage(int param_0, f32 param_1, f32 param_2)
     operator delete[](ptr_01);
 }
 
-/* 801EF484-801EF48C 1E9DC4 0008+00 1/1 0/0 0/0 .text            dpdMove__12dMenu_Ring_cFv */
 bool dMenu_Ring_c::dpdMove() {
     return false;
 }
 
-/* 801EF48C-801EF560 1E9DCC 00D4+00 1/1 0/0 0/0 .text            openExplain__12dMenu_Ring_cFUc */
 u8 dMenu_Ring_c::openExplain(u8 param_0) {
     if (field_0x6cf == 0xff && field_0x6d0 == 0xff) {
         if (param_0 != 0xff) {
diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index 5b57b6cebd..32b4fa61b7 100644
--- a/src/d/d_menu_save.cpp
+++ b/src/d/d_menu_save.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_menu_save
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_menu_save.h"
@@ -25,47 +20,39 @@
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 803BDF84-803BDF90 01B0A4 000C+00 3/3 0/0 0/0 .data            SelStartFrameTbl */
 static int SelStartFrameTbl[3] = {
     59,
     99,
     139,
 };
 
-/* 803BDF90-803BDF9C 01B0B0 000C+00 3/3 0/0 0/0 .data            SelEndFrameTbl */
 static int SelEndFrameTbl[3] = {
     69,
     109,
     149,
 };
 
-/* 803BDF9C-803BDFA8 01B0BC 000C+00 2/2 0/0 0/0 .data            SelOpenStartFrameTbl */
 static int SelOpenStartFrameTbl[3] = {
     249,
     448,
     648,
 };
 
-/* 803BDFA8-803BDFB4 01B0C8 000C+00 2/2 0/0 0/0 .data            SelOpenEndFrameTbl */
 static int SelOpenEndFrameTbl[3] = {
     259,
     460,
     659,
 };
 
-/* 803BDFB4-803BDFC4 01B0D4 0010+00 2/2 0/0 0/0 .data            YnSelStartFrameTbl */
 static int YnSelStartFrameTbl[2][2] = {
     {2150, 3181},
     {2139, 3171},
 };
 
-/* 803BDFC4-803BDFD8 01B0E4 0010+04 2/2 0/0 0/0 .data            YnSelEndFrameTbl */
 static int YnSelEndFrameTbl[2][2] = {{2138, 3171}, {2150, 3181}};
 
-/* 8042E84C-8042E860 05B56C 0010+04 21/21 0/0 0/0 .bss             g_msHIO */
 static dMs_HIO_c g_msHIO;
 
-/* 801EF654-801EF6A0 1E9F94 004C+00 1/1 0/0 0/0 .text            __ct__9dMs_HIO_cFv */
 dMs_HIO_c::dMs_HIO_c() {
     mDisplayWaitFrames = 15;
     mCardWaitFrames = 90;
@@ -80,7 +67,6 @@ dMs_HIO_c::dMs_HIO_c() {
     field_0xf = 0;
 }
 
-/* 801EF6A0-801EF7AC 1E9FE0 010C+00 0/0 3/3 0/0 .text            __ct__12dMenu_save_cFv */
 dMenu_save_c::dMenu_save_c() {
     mpScrnExplain = NULL;
     mWarning = NULL;
@@ -127,7 +113,6 @@ dMenu_save_c::dMenu_save_c() {
     field_0x21a1 = 0;
 }
 
-/* 801EF7AC-801EF904 1EA0EC 0158+00 0/0 3/3 0/0 .text            _create__12dMenu_save_cFv */
 void dMenu_save_c::_create() {
     stick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000);
 
@@ -163,7 +148,6 @@ void dMenu_save_c::_create() {
     g_msHIO.field_0x4 = -1;
 }
 
-/* 801EF904-801F0938 1EA244 1034+00 1/1 0/0 0/0 .text            screenSet__12dMenu_save_cFv */
 void dMenu_save_c::screenSet() {
     static u64 l_tagName0[3] = {'w_sel_00', 'w_sel_01', 'w_sel_02'};
     static u64 l_tagName000[2] = {'w_no_t', 'w_yes_t'};
@@ -428,12 +412,10 @@ void dMenu_save_c::screenSet() {
 }
 
 
-/* 801F0938-801F0958 1EB278 0020+00 0/0 2/2 0/0 .text            initialize__12dMenu_save_cFv */
 void dMenu_save_c::initialize() {
     displayInit();
 }
 
-/* 801F0958-801F09AC 1EB298 0054+00 2/2 0/0 0/0 .text            displayInit__12dMenu_save_cFv */
 void dMenu_save_c::displayInit() {
     field_0x1bf = 1;
     field_0x1c0 = 0;
@@ -453,7 +435,6 @@ void dMenu_save_c::displayInit() {
     mEndStatus = 2;
 }
 
-/* 801F09AC-801F0B10 1EB2EC 0164+00 0/0 3/3 0/0 .text            _open__12dMenu_save_cFv */
 bool dMenu_save_c::_open() {
     field_0x1bf = 1;
 
@@ -504,14 +485,12 @@ bool dMenu_save_c::_open() {
     return true;
 }
 
-/* 801F0B10-801F0B28 1EB450 0018+00 0/0 1/1 0/0 .text            _close__12dMenu_save_cFv */
 int dMenu_save_c::_close() {
     mMenuProc = PROC_SAVE_WAIT;
     mSaveStatus = 0;
     return 1;
 }
 
-/* 801F0B28-801F1048 1EB468 0520+00 0/0 4/4 0/0 .text            _delete__12dMenu_save_cFv */
 void dMenu_save_c::_delete() {
     delete stick;
 
@@ -657,7 +636,6 @@ void dMenu_save_c::_delete() {
     }
 }
 
-/* 803BE424-803BE70C 01B544 02E8+00 1/2 0/0 0/0 .data            MenuSaveProc */
 typedef void (dMenu_save_c::*menuProcFunc)();
 menuProcFunc MenuSaveProc[62] = {
     &dMenu_save_c::saveQuestion,
@@ -723,7 +701,6 @@ menuProcFunc MenuSaveProc[62] = {
     &dMenu_save_c::errYesNoCursorMoveAnm,
 };
 
-/* 801F1048-801F1100 1EB988 00B8+00 0/0 4/4 0/0 .text            _move__12dMenu_save_cFv */
 void dMenu_save_c::_move() {
     if (!mDoRst::isReset() || field_0x21a0 != 0) {
         memCardWatch();
@@ -743,7 +720,6 @@ void dMenu_save_c::_move() {
     }
 }
 
-/* 801F1100-801F1148 1EBA40 0048+00 1/1 0/0 0/0 .text            saveSelAnm__12dMenu_save_cFv */
 void dMenu_save_c::saveSelAnm() {
     if (mDisplayMenu) {
         selFileWakuAnm();
@@ -752,7 +728,6 @@ void dMenu_save_c::saveSelAnm() {
     }
 }
 
-/* 801F1148-801F11F4 1EBA88 00AC+00 1/1 0/0 0/0 .text            selFileWakuAnm__12dMenu_save_cFv */
 void dMenu_save_c::selFileWakuAnm() {
     mFileWakuAnmFrame += 2;
     if (mFileWakuAnmFrame >= mpFileWakuAnm->getFrameMax()) {
@@ -767,7 +742,6 @@ void dMenu_save_c::selFileWakuAnm() {
     mpFileWakuRotAnm->setFrame(mFileWakuRotAnmFrame);
 }
 
-/* 801F11F4-801F12F0 1EBB34 00FC+00 1/1 0/0 0/0 .text            bookIconAnm__12dMenu_save_cFv */
 void dMenu_save_c::bookIconAnm() {
     field_0x154 += 2;
     if (field_0x154 >= field_0x150->getFrameMax()) {
@@ -788,7 +762,6 @@ void dMenu_save_c::bookIconAnm() {
     field_0x160->setFrame(field_0x164);
 }
 
-/* 801F12F0-801F1378 1EBC30 0088+00 1/1 0/0 0/0 .text            memCardWatch__12dMenu_save_cFv */
 void dMenu_save_c::memCardWatch() {
     if (mUseType == 2) {
         return;
@@ -815,7 +788,6 @@ void dMenu_save_c::memCardWatch() {
     g_mDoMemCd_control.mProbeStat = 2;
 }
 
-/* 801F1378-801F1558 1EBCB8 01E0+00 1/0 0/0 0/0 .text            saveQuestion__12dMenu_save_cFv */
 void dMenu_save_c::saveQuestion() {
     if (YesNoSelect()) {
         if (mYesNoCursor == CURSOR_YES) {
@@ -855,7 +827,6 @@ void dMenu_save_c::saveQuestion() {
     }
 }
 
-/* 801F1558-801F1620 1EBE98 00C8+00 1/0 0/0 0/0 .text            saveQuestion2__12dMenu_save_cFv */
 void dMenu_save_c::saveQuestion2() {
     if (mpScrnExplain != NULL && mpScrnExplain->getStatus() == 0) {
         if (mUseType == TYPE_BLACK_EVENT) {
@@ -871,7 +842,6 @@ void dMenu_save_c::saveQuestion2() {
     }
 }
 
-/* 801F1620-801F1644 1EBF60 0024+00 1/0 0/0 0/0 .text            saveQuestion21__12dMenu_save_cFv */
 void dMenu_save_c::saveQuestion21() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -881,7 +851,6 @@ void dMenu_save_c::saveQuestion21() {
     mMenuProc = PROC_SAVE_QUESTION3;
 }
 
-/* 801F1644-801F16B8 1EBF84 0074+00 1/0 0/0 0/0 .text            saveQuestion3__12dMenu_save_cFv */
 void dMenu_save_c::saveQuestion3() {
     mDisplayMenu = true;
     mWaitTimer = g_msHIO.mFadeOutTimer;
@@ -890,7 +859,6 @@ void dMenu_save_c::saveQuestion3() {
     mMenuProc = PROC_SAVE_QUESTION4;
 }
 
-/* 801F16B8-801F16F4 1EBFF8 003C+00 1/0 0/0 0/0 .text            saveQuestion4__12dMenu_save_cFv */
 void dMenu_save_c::saveQuestion4() {
     if (mDoRst::isReset()) {
         return;
@@ -905,7 +873,6 @@ void dMenu_save_c::saveQuestion4() {
     mMenuProc = PROC_MEMCARD_CHECK;
 }
 
-/* 801F16F4-801F1720 1EC034 002C+00 1/0 0/0 0/0 .text            saveGuide__12dMenu_save_cFv */
 void dMenu_save_c::saveGuide() {
     if (mpScrnExplain->getStatus() == 0) {
         mEndStatus = 1;
@@ -914,7 +881,6 @@ void dMenu_save_c::saveGuide() {
     }
 }
 
-/* 801F1720-801F191C 1EC060 01FC+00 2/0 0/0 0/0 .text            memCardCheck__12dMenu_save_cFv */
 void dMenu_save_c::memCardCheck() {
     u32 cardStatus = g_mDoMemCd_control.getStatus(0);
 
@@ -984,7 +950,6 @@ void dMenu_save_c::memCardCheck() {
     }
 }
 
-/* 801F191C-801F19A8 1EC25C 008C+00 1/0 0/0 0/0 .text memCardErrMsgWaitKey__12dMenu_save_cFv */
 void dMenu_save_c::memCardErrMsgWaitKey() {
     if (cAPICPad_ANY_BUTTON(PAD_1) && dMeter2Info_getMsgKeyWaitTimer() == 0) {
         if (mErrProc == 0x3D) {
@@ -998,15 +963,12 @@ void dMenu_save_c::memCardErrMsgWaitKey() {
     }
 }
 
-/* 801F19A8-801F19DC 1EC2E8 0034+00 1/1 0/0 0/0 .text backSaveQuestionInitSet__12dMenu_save_cFv */
 void dMenu_save_c::backSaveQuestionInitSet() {
     field_0x2190 = 1;
     mYesNoCursor = CURSOR_YES;
     msgTxtSet(0x3CE, true);  // Do you want to save?
 }
 
-/* 801F19DC-801F1A48 1EC31C 006C+00 1/0 0/0 0/0 .text            backSaveQuestion__12dMenu_save_cFv
- */
 void dMenu_save_c::backSaveQuestion() {
     mWaitTimer = g_msHIO.mFadeOutTimer;
     mDoGph_gInf_c::startFadeOut(mWaitTimer);
@@ -1014,8 +976,6 @@ void dMenu_save_c::backSaveQuestion() {
     mMenuProc = PROC_BACK_SAVE_QUESTION2;
 }
 
-/* 801F1A48-801F1B38 1EC388 00F0+00 1/0 0/0 0/0 .text            backSaveQuestion2__12dMenu_save_cFv
- */
 void dMenu_save_c::backSaveQuestion2() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1051,7 +1011,6 @@ void dMenu_save_c::backSaveQuestion2() {
     }
 }
 
-/* 801F1B38-801F1BF8 1EC478 00C0+00 5/5 0/0 0/0 .text            closeSelect__12dMenu_save_cFv */
 void dMenu_save_c::closeSelect() {
     mDoAud_seStart(Z2SE_SY_MENU_BACK, NULL, 0, 0);
     mSelIcon->setAlphaRate(0.0f);
@@ -1069,7 +1028,6 @@ void dMenu_save_c::closeSelect() {
     }
 }
 
-/* 801F1BF8-801F1C70 1EC538 0078+00 2/2 0/0 0/0 .text            closeSelect2__12dMenu_save_cFv */
 void dMenu_save_c::closeSelect2() {
     mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
     mSelIcon->setAlphaRate(0.0f);
@@ -1077,13 +1035,10 @@ void dMenu_save_c::closeSelect2() {
     mMenuProc = PROC_BACK_SAVE_QUESTION;
 }
 
-/* 801F1C70-801F1C94 1EC5B0 0024+00 1/0 0/0 0/0 .text            iplSelMsgInitSet__12dMenu_save_cFv
- */
 void dMenu_save_c::iplSelMsgInitSet() {
     errorTxtSet(0x3B5);  // Either insert a MemCard with free space or manage card contents
 }
 
-/* 801F1C94-801F1CEC 1EC5D4 0058+00 1/0 0/0 0/0 .text            iplSelInitSet__12dMenu_save_cFv */
 void dMenu_save_c::iplSelInitSet() {
     errorTxtSet(0x3C0);  // Would you like to manage the contents of your Memory Card?
     mYesNoCursor = CURSOR_NO;
@@ -1091,7 +1046,6 @@ void dMenu_save_c::iplSelInitSet() {
     yesnoMenuMoveAnmInitSet(2999, 3009, 0);
 }
 
-/* 801F1CEC-801F1D54 1EC62C 0068+00 1/0 0/0 0/0 .text            IPLSelectDisp1__12dMenu_save_cFv */
 void dMenu_save_c::IPLSelectDisp1() {
     if (errorTxtChangeAnm() == true) {
         mpErrFunc = &iplSelInitSet;
@@ -1100,7 +1054,6 @@ void dMenu_save_c::IPLSelectDisp1() {
     }
 }
 
-/* 801F1D54-801F1DD4 1EC694 0080+00 1/0 0/0 0/0 .text            IPLSelectDisp2__12dMenu_save_cFv */
 void dMenu_save_c::IPLSelectDisp2() {
     bool txtAnmComplete = errorTxtChangeAnm();
     bool moveAnmComplete = yesnoMenuMoveAnm();
@@ -1112,7 +1065,6 @@ void dMenu_save_c::IPLSelectDisp2() {
     }
 }
 
-/* 801F1DD4-801F1E58 1EC714 0084+00 1/0 0/0 0/0 .text memCardErrGoIPLSel__12dMenu_save_cFv */
 void dMenu_save_c::memCardErrGoIPLSel() {
     if (errYesNoSelect(1, 0)) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1127,7 +1079,6 @@ void dMenu_save_c::memCardErrGoIPLSel() {
     }
 }
 
-/* 801F1E58-801F1EE0 1EC798 0088+00 1/0 0/0 0/0 .text            IPLSelect2Disp__12dMenu_save_cFv */
 void dMenu_save_c::IPLSelect2Disp() {
     bool txtAnmComplete = errorTxtChangeAnm();
     bool moveAnmComplete = yesnoSelectMoveAnm(1);
@@ -1139,7 +1090,6 @@ void dMenu_save_c::IPLSelect2Disp() {
     }
 }
 
-/* 801F1EE0-801F1F80 1EC820 00A0+00 1/0 0/0 0/0 .text memCardErrGoIPLSel2__12dMenu_save_cFv */
 void dMenu_save_c::memCardErrGoIPLSel2() {
     if (errYesNoSelect(1, 0)) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1154,8 +1104,6 @@ void dMenu_save_c::memCardErrGoIPLSel2() {
     }
 }
 
-/* 801F1F80-801F2000 1EC8C0 0080+00 1/0 0/0 0/0 .text            memCardErrGotoIPL__12dMenu_save_cFv
- */
 void dMenu_save_c::memCardErrGotoIPL() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1168,8 +1116,6 @@ void dMenu_save_c::memCardErrGotoIPL() {
     mDoRst::onShutdown();
 }
 
-/* 801F2000-801F20AC 1EC940 00AC+00 1/0 0/0 0/0 .text memCardErrMsgWaitFormatSel__12dMenu_save_cFv
- */
 void dMenu_save_c::memCardErrMsgWaitFormatSel() {
     if (errYesNoSelect(1, 0)) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1187,7 +1133,6 @@ void dMenu_save_c::memCardErrMsgWaitFormatSel() {
     }
 }
 
-/* 801F20AC-801F2134 1EC9EC 0088+00 1/0 0/0 0/0 .text cardFormatYesSelDisp__12dMenu_save_cFv */
 void dMenu_save_c::cardFormatYesSelDisp() {
     bool txtChangeAnm = errorTxtChangeAnm();
     bool moveAnm = yesnoSelectMoveAnm(1);
@@ -1199,7 +1144,6 @@ void dMenu_save_c::cardFormatYesSelDisp() {
     }
 }
 
-/* 801F2134-801F219C 1ECA74 0068+00 1/0 0/0 0/0 .text cardFormatNoSelDisp__12dMenu_save_cFv */
 void dMenu_save_c::cardFormatNoSelDisp() {
     bool txtChangeAnm = errorTxtChangeAnm();
     bool moveAnm = yesnoMenuMoveAnm();
@@ -1210,8 +1154,6 @@ void dMenu_save_c::cardFormatNoSelDisp() {
     }
 }
 
-/* 801F219C-801F2250 1ECADC 00B4+00 1/0 0/0 0/0 .text
- * memCardErrMsgWaitFormatSel2__12dMenu_save_cFv                */
 void dMenu_save_c::memCardErrMsgWaitFormatSel2() {
     if (errYesNoSelect(1, 0)) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1229,7 +1171,6 @@ void dMenu_save_c::memCardErrMsgWaitFormatSel2() {
     }
 }
 
-/* 801F2250-801F22CC 1ECB90 007C+00 1/0 0/0 0/0 .text cardFormatYesSel2Disp__12dMenu_save_cFv */
 void dMenu_save_c::cardFormatYesSel2Disp() {
     bool txtChangeAnm = errorTxtChangeAnm();
     bool moveAnm = yesnoMenuMoveAnm();
@@ -1241,7 +1182,6 @@ void dMenu_save_c::cardFormatYesSel2Disp() {
     }
 }
 
-/* 801F22CC-801F232C 1ECC0C 0060+00 1/0 0/0 0/0 .text            memCardFormat__12dMenu_save_cFv */
 void dMenu_save_c::memCardFormat() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1254,8 +1194,6 @@ void dMenu_save_c::memCardFormat() {
     }
 }
 
-/* 801F232C-801F23A4 1ECC6C 0078+00 1/0 0/0 0/0 .text            memCardFormatWait__12dMenu_save_cFv
- */
 void dMenu_save_c::memCardFormatWait() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1271,7 +1209,6 @@ void dMenu_save_c::memCardFormatWait() {
     }
 }
 
-/* 801F23A4-801F23FC 1ECCE4 0058+00 1/0 0/0 0/0 .text gameFileMakeSelInitSet__12dMenu_save_cFv */
 void dMenu_save_c::gameFileMakeSelInitSet() {
     errorTxtSet(0x3C1);  // Create a save file on the Memory Card in Slot A?
     ketteiTxtDispAnmInit(1);
@@ -1279,7 +1216,6 @@ void dMenu_save_c::gameFileMakeSelInitSet() {
     yesnoMenuMoveAnmInitSet(2999, 3009, 0);
 }
 
-/* 801F23FC-801F247C 1ECD3C 0080+00 1/0 0/0 0/0 .text makeGameFileSelDisp__12dMenu_save_cFv */
 void dMenu_save_c::makeGameFileSelDisp() {
     bool txtChangeAnm = errorTxtChangeAnm();
     bool moveAnm = yesnoMenuMoveAnm();
@@ -1291,7 +1227,6 @@ void dMenu_save_c::makeGameFileSelDisp() {
     }
 }
 
-/* 801F247C-801F2514 1ECDBC 0098+00 1/0 0/0 0/0 .text memCardMakeGameFileSel__12dMenu_save_cFv */
 void dMenu_save_c::memCardMakeGameFileSel() {
     if (errYesNoSelect(1, 0)) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1307,8 +1242,6 @@ void dMenu_save_c::memCardMakeGameFileSel() {
     }
 }
 
-/* 801F2514-801F25AC 1ECE54 0098+00 1/0 0/0 0/0 .text            makeGameFileDisp__12dMenu_save_cFv
- */
 void dMenu_save_c::makeGameFileDisp() {
     bool txtChangeAnm = errorTxtChangeAnm();
     bool moveAnm = yesnoMenuMoveAnm();
@@ -1322,7 +1255,6 @@ void dMenu_save_c::makeGameFileDisp() {
     }
 }
 
-/* 801F25AC-801F260C 1ECEEC 0060+00 1/0 0/0 0/0 .text memCardMakeGameFile__12dMenu_save_cFv */
 void dMenu_save_c::memCardMakeGameFile() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1335,7 +1267,6 @@ void dMenu_save_c::memCardMakeGameFile() {
     }
 }
 
-/* 801F260C-801F2698 1ECF4C 008C+00 1/0 0/0 0/0 .text memCardMakeGameFileWait__12dMenu_save_cFv */
 void dMenu_save_c::memCardMakeGameFileWait() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1352,8 +1283,6 @@ void dMenu_save_c::memCardMakeGameFileWait() {
     }
 }
 
-/* 801F2698-801F2708 1ECFD8 0070+00 1/0 0/0 0/0 .text            memCardCommandEnd__12dMenu_save_cFv
- */
 void dMenu_save_c::memCardCommandEnd() {
     if (errorTxtChangeAnm() == true) {
         mpErrFunc = NULL;
@@ -1363,7 +1292,6 @@ void dMenu_save_c::memCardCommandEnd() {
     }
 }
 
-/* 801F2708-801F27CC 1ED048 00C4+00 1/0 0/0 0/0 .text memCardCommandEnd2__12dMenu_save_cFv */
 void dMenu_save_c::memCardCommandEnd2() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool ketteiDispAnm = ketteiTxtDispAnm();
@@ -1378,7 +1306,6 @@ void dMenu_save_c::memCardCommandEnd2() {
     }
 }
 
-/* 801F27CC-801F2840 1ED10C 0074+00 1/0 0/0 0/0 .text memCardDataLoadWait__12dMenu_save_cFv */
 void dMenu_save_c::memCardDataLoadWait() {
     int cardState = g_mDoMemCd_control.LoadSync(mSaveBuffer, sizeof(mSaveBuffer), 0);
     if (cardState != 0) {
@@ -1391,7 +1318,6 @@ void dMenu_save_c::memCardDataLoadWait() {
     }
 }
 
-/* 801F2840-801F28E4 1ED180 00A4+00 2/2 0/0 0/0 .text            dataWrite__12dMenu_save_cFv */
 void dMenu_save_c::dataWrite() {
     int stageNo = dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo());
 
@@ -1408,7 +1334,6 @@ void dMenu_save_c::dataWrite() {
     dataSave();
 }
 
-/* 801F28E4-801F298C 1ED224 00A8+00 1/0 0/0 0/0 .text memCardDataSaveWait__12dMenu_save_cFv */
 void dMenu_save_c::memCardDataSaveWait() {
     mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0);
 
@@ -1423,7 +1348,6 @@ void dMenu_save_c::memCardDataSaveWait() {
     }
 }
 
-/* 801F298C-801F2B5C 1ED2CC 01D0+00 1/0 0/0 0/0 .text memCardDataSaveWait2__12dMenu_save_cFv */
 void dMenu_save_c::memCardDataSaveWait2() {
     if (mWaitTimer != 0) {
         mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0);
@@ -1460,8 +1384,6 @@ void dMenu_save_c::memCardDataSaveWait2() {
     }
 }
 
-/* 801F2B5C-801F2BF8 1ED49C 009C+00 1/0 0/0 0/0 .text            gameContinueDisp__12dMenu_save_cFv
- */
 void dMenu_save_c::gameContinueDisp() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool moveAnm = yesnoMenuMoveAnm();
@@ -1474,7 +1396,6 @@ void dMenu_save_c::gameContinueDisp() {
     }
 }
 
-/* 801F2BF8-801F2D78 1ED538 0180+00 1/0 0/0 0/0 .text            gameContinue__12dMenu_save_cFv */
 void dMenu_save_c::gameContinue() {
     if (errYesNoSelect(0, 1)) {
         if (mYesNoCursor == CURSOR_YES) {
@@ -1522,7 +1443,6 @@ void dMenu_save_c::gameContinue() {
     }
 }
 
-/* 801F2D78-801F2DA0 1ED6B8 0028+00 1/0 0/0 0/0 .text            gameContinue2__12dMenu_save_cFv */
 void dMenu_save_c::gameContinue2() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1532,7 +1452,6 @@ void dMenu_save_c::gameContinue2() {
     mDoRst::onReset();
 }
 
-/* 801F2DA0-801F2DD4 1ED6E0 0034+00 1/0 0/0 0/0 .text            gameContinue3__12dMenu_save_cFv */
 void dMenu_save_c::gameContinue3() {
     if (mWaitTimer != 0) {
         mWaitTimer--;
@@ -1544,7 +1463,6 @@ void dMenu_save_c::gameContinue3() {
     mEndStatus = 0;
 }
 
-/* 801F2DD4-801F2E88 1ED714 00B4+00 1/0 0/0 0/0 .text            saveEnd__12dMenu_save_cFv */
 void dMenu_save_c::saveEnd() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool ketteiDispAnm = ketteiTxtDispAnm();
@@ -1563,7 +1481,6 @@ void dMenu_save_c::saveEnd() {
     }
 }
 
-/* 801F2E88-801F2F08 1ED7C8 0080+00 1/0 0/0 0/0 .text            endingNoSave__12dMenu_save_cFv */
 void dMenu_save_c::endingNoSave() {
     if (YesNoSelect()) {
         if (mYesNoCursor != CURSOR_NO) {
@@ -1579,7 +1496,6 @@ void dMenu_save_c::endingNoSave() {
     }
 }
 
-/* 801F2F08-801F2F38 1ED848 0030+00 1/0 0/0 0/0 .text            endingNoSave2__12dMenu_save_cFv */
 void dMenu_save_c::endingNoSave2() {
     if (mpScrnExplain != NULL && mpScrnExplain->getStatus() == 0) {
         field_0x2190 = 0;
@@ -1589,14 +1505,11 @@ void dMenu_save_c::endingNoSave2() {
     mMenuProc = PROC_SAVE_QUESTION;
 }
 
-/* 801F2F38-801F2F4C 1ED878 0014+00 1/0 0/0 0/0 .text            endingDataCheck__12dMenu_save_cFv
- */
 void dMenu_save_c::endingDataCheck() {
     mMenuProc = PROC_SAVE_WAIT;
     mSaveStatus = 3;
 }
 
-/* 801F2F4C-801F2FB4 1ED88C 0068+00 1/0 0/0 0/0 .text            retryQuestion0__12dMenu_save_cFv */
 void dMenu_save_c::retryQuestion0() {
     if (Z2GetAudioMgr()->checkBgmIDPlaying(Z2BGM_GAME_OVER) != true) {
         mYesNoCursor = CURSOR_YES;
@@ -1605,7 +1518,6 @@ void dMenu_save_c::retryQuestion0() {
     }
 }
 
-/* 801F2FB4-801F3040 1ED8F4 008C+00 1/0 0/0 0/0 .text            retryQuestion1__12dMenu_save_cFv */
 void dMenu_save_c::retryQuestion1() {
     if (YesNoSelect()) {
         if (mYesNoCursor == CURSOR_YES) {
@@ -1622,7 +1534,6 @@ void dMenu_save_c::retryQuestion1() {
     }
 }
 
-/* 801F3040-801F30B8 1ED980 0078+00 1/0 0/0 0/0 .text            retryQuestion2__12dMenu_save_cFv */
 void dMenu_save_c::retryQuestion2() {
     if (YesNoSelect()) {
         if (mYesNoCursor == CURSOR_YES) {
@@ -1637,7 +1548,6 @@ void dMenu_save_c::retryQuestion2() {
     }
 }
 
-/* 801F30B8-801F31B0 1ED9F8 00F8+00 2/2 0/0 0/0 .text            restartInit__12dMenu_save_cFv */
 void dMenu_save_c::restartInit() {
     // if monkey lantern sequence not completed
     if (!dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) {
@@ -1655,12 +1565,10 @@ void dMenu_save_c::restartInit() {
     }
 }
 
-/* 801F31B0-801F31B4 1EDAF0 0004+00 1/0 0/0 0/0 .text            saveWait__12dMenu_save_cFv */
 void dMenu_save_c::saveWait() {
     /* empty function */
 }
 
-/* 801F31B4-801F328C 1EDAF4 00D8+00 1/0 0/0 0/0 .text            messageChange__12dMenu_save_cFv */
 void dMenu_save_c::messageChange() {
     if (mpScrnExplain != NULL) {
         field_0x219d = mpScrnExplain->getStatus();
@@ -1689,7 +1597,6 @@ void dMenu_save_c::messageChange() {
     }
 }
 
-/* 801F328C-801F34BC 1EDBCC 0230+00 4/4 0/0 0/0 .text            YesNoSelect__12dMenu_save_cFv */
 int dMenu_save_c::YesNoSelect() {
     int ret = 0;
 
@@ -1742,7 +1649,6 @@ int dMenu_save_c::YesNoSelect() {
     return ret;
 }
 
-/* 801F34BC-801F3588 1EDDFC 00CC+00 8/8 0/0 0/0 .text            msgTxtSet__12dMenu_save_cFUsb */
 void dMenu_save_c::msgTxtSet(u16 msgID, bool param_1) {
     if (msgID != 0xFFFF) {
         bool check;
@@ -1767,7 +1673,6 @@ void dMenu_save_c::msgTxtSet(u16 msgID, bool param_1) {
     field_0x1b9 = 0;
 }
 
-/* 801F3588-801F36B4 1EDEC8 012C+00 1/0 0/0 0/0 .text            openSaveSelect__12dMenu_save_cFv */
 void dMenu_save_c::openSaveSelect() {
     bool headerTxtChanged = headerTxtChangeAnm();
 
@@ -1795,8 +1700,6 @@ void dMenu_save_c::openSaveSelect() {
     }
 }
 
-/* 801F36B4-801F37A0 1EDFF4 00EC+00 1/0 0/0 0/0 .text            openSaveSelect2__12dMenu_save_cFv
- */
 void dMenu_save_c::openSaveSelect2() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool dataMoveAnm = selectDataBaseMoveAnm();
@@ -1813,8 +1716,6 @@ void dMenu_save_c::openSaveSelect2() {
     }
 }
 
-/* 801F37A0-801F3934 1EE0E0 0194+00 1/0 0/0 0/0 .text            openSaveSelect3__12dMenu_save_cFv
- */
 void dMenu_save_c::openSaveSelect3() {
     bool modoruTxtDisp = modoruTxtDispAnm();
     bool var_r30 = true;
@@ -1847,7 +1748,6 @@ void dMenu_save_c::openSaveSelect3() {
     }
 }
 
-/* 801F3934-801F3A94 1EE274 0160+00 1/0 0/0 0/0 .text            saveSelect__12dMenu_save_cFv */
 void dMenu_save_c::saveSelect() {
     if (!mDoRst::isReset()) {
         stick->checkTrigger();
@@ -1876,8 +1776,6 @@ void dMenu_save_c::saveSelect() {
     }
 }
 
-/* 801F3A94-801F3BE0 1EE3D4 014C+00 1/1 0/0 0/0 .text            saveSelectStart__12dMenu_save_cFv
- */
 void dMenu_save_c::saveSelectStart() {
     mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
     selectDataMoveAnmInitSet(SelOpenStartFrameTbl[mSelectedFile],
@@ -1903,7 +1801,6 @@ void dMenu_save_c::saveSelectStart() {
     }
 }
 
-/* 801F3BE0-801F3C7C 1EE520 009C+00 1/0 0/0 0/0 .text selectDataOpenMove__12dMenu_save_cFv */
 void dMenu_save_c::selectDataOpenMove() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool selDataAnmComplete = selectDataMoveAnm();
@@ -1917,8 +1814,6 @@ void dMenu_save_c::selectDataOpenMove() {
     }
 }
 
-/* 801F3C7C-801F3E30 1EE5BC 01B4+00 1/1 0/0 0/0 .text            dataSelectAnmSet__12dMenu_save_cFv
- */
 void dMenu_save_c::dataSelectAnmSet() {
     if (mSelectedFile != 0xFF) {
         mpSelData[mSelectedFile]->getPanePtr()->setAnimation(field_0x40);
@@ -1939,7 +1834,6 @@ void dMenu_save_c::dataSelectAnmSet() {
     }
 }
 
-/* 801F3E30-801F40D8 1EE770 02A8+00 1/0 0/0 0/0 .text saveSelectMoveAnime__12dMenu_save_cFv */
 void dMenu_save_c::saveSelectMoveAnime() {
     bool bookWakuAnmComplete = true;
     bool selWakuAnmComplete = true;
@@ -1994,8 +1888,6 @@ void dMenu_save_c::saveSelectMoveAnime() {
     }
 }
 
-/* 801F40D8-801F4238 1EEA18 0160+00 1/0 0/0 0/0 .text            saveYesNoSelect__12dMenu_save_cFv
- */
 void dMenu_save_c::saveYesNoSelect() {
     if (!mDoRst::isReset()) {
         stick->checkTrigger();
@@ -2024,8 +1916,6 @@ void dMenu_save_c::saveYesNoSelect() {
     }
 }
 
-/* 801F4238-801F42FC 1EEB78 00C4+00 1/1 0/0 0/0 .text            yesnoSelectStart__12dMenu_save_cFv
- */
 void dMenu_save_c::yesnoSelectStart() {
     if (mYesNoCursor != CURSOR_NO) {
         mDoAud_seStart(Z2SE_SY_CURSOR_OK, NULL, 0, 0);
@@ -2041,7 +1931,6 @@ void dMenu_save_c::yesnoSelectStart() {
     }
 }
 
-/* 801F42FC-801F43F8 1EEC3C 00FC+00 1/0 0/0 0/0 .text            saveMoveDisp__12dMenu_save_cFv */
 void dMenu_save_c::saveMoveDisp() {
     mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0);
 
@@ -2059,7 +1948,6 @@ void dMenu_save_c::saveMoveDisp() {
     }
 }
 
-/* 801F43F8-801F4510 1EED38 0118+00 1/0 0/0 0/0 .text            saveMoveDisp2__12dMenu_save_cFv */
 void dMenu_save_c::saveMoveDisp2() {
     mDoAud_seStartLevel(Z2SE_SY_FILE_SAVE_LEVEL, NULL, 0, 0);
 
@@ -2078,7 +1966,6 @@ void dMenu_save_c::saveMoveDisp2() {
     }
 }
 
-/* 801F4510-801F46B4 1EEE50 01A4+00 4/4 0/0 0/0 .text yesnoSelectAnmSet__12dMenu_save_cFUc */
 void dMenu_save_c::yesnoSelectAnmSet(u8 param_0) {
     if (mYesNoPrevCursor != 0xFF) {
         yesnoWakuAlpahAnmInit(mYesNoPrevCursor, 255, 0, g_msHIO.mSelectFrames);
@@ -2097,7 +1984,6 @@ void dMenu_save_c::yesnoSelectAnmSet(u8 param_0) {
     }
 }
 
-/* 801F46B4-801F4724 1EEFF4 0070+00 1/0 0/0 0/0 .text yesNoCursorMoveAnm__12dMenu_save_cFv */
 void dMenu_save_c::yesNoCursorMoveAnm() {
     bool selAnmComplete = yesnoSelectMoveAnm(0);
     bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor);
@@ -2108,8 +1994,6 @@ void dMenu_save_c::yesNoCursorMoveAnm() {
     }
 }
 
-/* 801F4724-801F47DC 1EF064 00B8+00 2/2 0/0 0/0 .text            yesnoCancelAnmSet__12dMenu_save_cFv
- */
 void dMenu_save_c::yesnoCancelAnmSet() {
     mDoAud_seStart(Z2SE_SY_CURSOR_CANCEL, NULL, 0, 0);
     mSelIcon->setAlphaRate(0.0f);
@@ -2120,7 +2004,6 @@ void dMenu_save_c::yesnoCancelAnmSet() {
     mMenuProc = PROC_SAVE_YES_NO_CANCEL_MOVE;
 }
 
-/* 801F47DC-801F485C 1EF11C 0080+00 1/0 0/0 0/0 .text saveYesNoCancelMove__12dMenu_save_cFv */
 void dMenu_save_c::saveYesNoCancelMove() {
     bool headerTxtChanged = headerTxtChangeAnm();
     bool yesnoAnmComplete = yesnoMenuMoveAnm();
@@ -2132,7 +2015,6 @@ void dMenu_save_c::saveYesNoCancelMove() {
     }
 }
 
-/* 801F485C-801F4928 1EF19C 00CC+00 7/7 0/0 0/0 .text            headerTxtSet__12dMenu_save_cFUs */
 void dMenu_save_c::headerTxtSet(u16 msgID) {
     if (msgID == 0xFFFF) {
         strcpy(mpHeaderTxt[mHeaderTxtType ^ 1], "");
@@ -2147,7 +2029,6 @@ void dMenu_save_c::headerTxtSet(u16 msgID) {
     mHeaderAnmComplete = false;
 }
 
-/* 801F4928-801F4A10 1EF268 00E8+00 10/10 0/0 0/0 .text headerTxtChangeAnm__12dMenu_save_cFv */
 bool dMenu_save_c::headerTxtChangeAnm() {
     if (mHeaderAnmComplete) {
         return true;
@@ -2169,7 +2050,6 @@ bool dMenu_save_c::headerTxtChangeAnm() {
     return changed;
 }
 
-/* 801F4A10-801F4B84 1EF350 0174+00 1/1 0/0 0/0 .text            errDispInitSet__12dMenu_save_cFi */
 void dMenu_save_c::errDispInitSet(int param_0) {
     headerTxtSet(1);
     mpErrTxtPane[mErrTxtType]->setAlpha(255);
@@ -2197,8 +2077,6 @@ void dMenu_save_c::errDispInitSet(int param_0) {
     mMenuProc = PROC_MSG_WINDOW_INIT_OPEN;
 }
 
-/* 801F4B84-801F4D10 1EF4C4 018C+00 1/0 0/0 0/0 .text            msgWindowInitOpen__12dMenu_save_cFv
- */
 void dMenu_save_c::msgWindowInitOpen() {
     bool headerTxtChanged = true;
 
@@ -2242,7 +2120,6 @@ void dMenu_save_c::msgWindowInitOpen() {
     }
 }
 
-/* 801F4D10-801F4DAC 1EF650 009C+00 1/0 0/0 0/0 .text            msgWindowOpen__12dMenu_save_cFv */
 void dMenu_save_c::msgWindowOpen() {
     bool errorAnmComplete = errorMoveAnm();
     bool yesnoAnmComplete = true;
@@ -2262,7 +2139,6 @@ void dMenu_save_c::msgWindowOpen() {
     }
 }
 
-/* 801F4DAC-801F4E48 1EF6EC 009C+00 1/0 0/0 0/0 .text            msgWindowClose__12dMenu_save_cFv */
 void dMenu_save_c::msgWindowClose() {
     bool errorAnmComplete = errorMoveAnm();
     bool yenoAnmComplete = true;
@@ -2282,8 +2158,6 @@ void dMenu_save_c::msgWindowClose() {
     }
 }
 
-/* 801F4E48-801F4FB4 1EF788 016C+00 6/6 0/0 0/0 .text            errYesNoSelect__12dMenu_save_cFUcUc
- */
 bool dMenu_save_c::errYesNoSelect(u8 param_0, u8 param_1) {
     bool yesnoSelected = false;
 
@@ -2317,7 +2191,6 @@ bool dMenu_save_c::errYesNoSelect(u8 param_0, u8 param_1) {
     return yesnoSelected;
 }
 
-/* 801F4FB4-801F5054 1EF8F4 00A0+00 1/1 0/0 0/0 .text            errCurMove__12dMenu_save_cFUcUc */
 void dMenu_save_c::errCurMove(u8 param_0, u8 param_1) {
     mYesNoPrevCursor = mYesNoCursor;
     mYesNoCursor ^= 1;
@@ -2329,7 +2202,6 @@ void dMenu_save_c::errCurMove(u8 param_0, u8 param_1) {
     mMenuProc = PROC_ERR_YES_NO_CURSOR_MOVE_ANM;
 }
 
-/* 801F5054-801F50C4 1EF994 0070+00 1/0 0/0 0/0 .text errYesNoCursorMoveAnm__12dMenu_save_cFv */
 void dMenu_save_c::errYesNoCursorMoveAnm() {
     bool moveAnmComplete = yesnoSelectMoveAnm(field_0x2195);
     bool wakuAnmComplete = yesnoWakuAlpahAnm(mYesNoPrevCursor);
@@ -2340,7 +2212,6 @@ void dMenu_save_c::errYesNoCursorMoveAnm() {
     }
 }
 
-/* 801F50C4-801F5190 1EFA04 00CC+00 9/9 0/0 0/0 .text            errorTxtSet__12dMenu_save_cFUs */
 void dMenu_save_c::errorTxtSet(u16 msgID) {
     if (msgID == 0xFFFF) {
         strcpy(mpErrTxt[mErrTxtType ^ 1], "");
@@ -2354,8 +2225,6 @@ void dMenu_save_c::errorTxtSet(u16 msgID) {
     mErrTxtAnmComplete = false;
 }
 
-/* 801F5190-801F5278 1EFAD0 00E8+00 9/9 0/0 0/0 .text            errorTxtChangeAnm__12dMenu_save_cFv
- */
 bool dMenu_save_c::errorTxtChangeAnm() {
     if (mErrTxtAnmComplete) {
         return true;
@@ -2377,7 +2246,6 @@ bool dMenu_save_c::errorTxtChangeAnm() {
     return anmComplete;
 }
 
-/* 801F5278-801F533C 1EFBB8 00C4+00 1/1 0/0 0/0 .text saveSelectOpenInit__12dMenu_save_cFv */
 void dMenu_save_c::saveSelectOpenInit() {
     if (field_0x64 != 0 || field_0x65 != 0) {
         selectDataBaseMoveAnmInitSet(0x21, 1);
@@ -2397,8 +2265,6 @@ void dMenu_save_c::saveSelectOpenInit() {
     mMenuProc = PROC_OPEN_SAVE_SELECT;
 }
 
-/* 801F533C-801F53D4 1EFC7C 0098+00 3/3 0/0 0/0 .text
- * selectDataBaseMoveAnmInitSet__12dMenu_save_cFii              */
 void dMenu_save_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) {
     mpSelectMoveBase->getPanePtr()->setAnimation(field_0x40);
     mDataBaseMoveAnmFrame = param_0;
@@ -2409,7 +2275,6 @@ void dMenu_save_c::selectDataBaseMoveAnmInitSet(int param_0, int param_1) {
     field_0x65 = 1;
 }
 
-/* 801F53D4-801F54C0 1EFD14 00EC+00 3/3 0/0 0/0 .text selectDataBaseMoveAnm__12dMenu_save_cFv */
 bool dMenu_save_c::selectDataBaseMoveAnm() {
     if (mDataBaseMoveAnmFrame != mDataBaseMoveFrameMax) {
         if (mDataBaseMoveAnmFrame < mDataBaseMoveFrameMax) {
@@ -2451,7 +2316,6 @@ bool dMenu_save_c::selectDataBaseMoveAnm() {
     }
 }
 
-/* 801F54C0-801F5508 1EFE00 0048+00 1/1 0/0 0/0 .text saveSelectOpenAnmSet__12dMenu_save_cFv */
 void dMenu_save_c::saveSelectOpenAnmSet() {
     setSaveData();
 
@@ -2460,8 +2324,6 @@ void dMenu_save_c::saveSelectOpenAnmSet() {
     }
 }
 
-/* 801F5508-801F5600 1EFE48 00F8+00 2/2 0/0 0/0 .text selectDataMoveAnmInitSet__12dMenu_save_cFii
- */
 void dMenu_save_c::selectDataMoveAnmInitSet(int param_0, int param_1) {
     mpSelData[0]->getPanePtr()->setAnimation(field_0x40);
     mpSelData[1]->getPanePtr()->setAnimation(field_0x40);
@@ -2476,8 +2338,6 @@ void dMenu_save_c::selectDataMoveAnmInitSet(int param_0, int param_1) {
     mpSelData[2]->getPanePtr()->animationTransform();
 }
 
-/* 801F5600-801F5744 1EFF40 0144+00 3/3 0/0 0/0 .text            selectDataMoveAnm__12dMenu_save_cFv
- */
 bool dMenu_save_c::selectDataMoveAnm() {
     if (field_0x74[mSelectedFile] != field_0x80) {
         if (field_0x74[mSelectedFile] < field_0x80) {
@@ -2508,8 +2368,6 @@ bool dMenu_save_c::selectDataMoveAnm() {
     }
 }
 
-/* 801F5744-801F58C8 1F0084 0184+00 12/12 0/0 0/0 .text
- * yesnoMenuMoveAnmInitSet__12dMenu_save_cFiiUc                 */
 void dMenu_save_c::yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_2) {
     if (param_2 == 0 && field_0x9c == 0) {
         mYesNoCursor = CURSOR_NO;
@@ -2535,7 +2393,6 @@ void dMenu_save_c::yesnoMenuMoveAnmInitSet(int anmFrame, int frameMax, u8 param_
     field_0x9d = 1;
 }
 
-/* 801F58C8-801F5AE4 1F0208 021C+00 13/13 0/0 0/0 .text yesnoMenuMoveAnm__12dMenu_save_cFv */
 bool dMenu_save_c::yesnoMenuMoveAnm() {
     if (mYesNoMoveAnmFrame != mYesNoMoveAnmMax) {
         if (mYesNoMoveAnmFrame < mYesNoMoveAnmMax) {
@@ -2584,7 +2441,6 @@ bool dMenu_save_c::yesnoMenuMoveAnm() {
     }
 }
 
-/* 801F5AE4-801F5D84 1F0424 02A0+00 4/4 0/0 0/0 .text yesnoSelectMoveAnm__12dMenu_save_cFUc */
 bool dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) {
     bool ret = false;
     bool var_r30 = true;
@@ -2647,8 +2503,6 @@ bool dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) {
     return ret;
 }
 
-/* 801F5D84-801F5EF4 1F06C4 0170+00 9/9 0/0 0/0 .text            yesnoCursorShow__12dMenu_save_cFv
- */
 void dMenu_save_c::yesnoCursorShow() {
     if (mYesNoCursor != 0xFF) {
         ((J2DTextBox*)mpNoYesTxt[mYesNoCursor]->getPanePtr())
@@ -2665,7 +2519,6 @@ void dMenu_save_c::yesnoCursorShow() {
     }
 }
 
-/* 801F5EF4-801F5F84 1F0834 0090+00 3/3 0/0 0/0 .text errorMoveAnmInitSet__12dMenu_save_cFii */
 void dMenu_save_c::errorMoveAnmInitSet(int param_0, int param_1) {
     field_0xb4->setAnimation(field_0x4c);
     field_0xb8 = param_0;
@@ -2675,7 +2528,6 @@ void dMenu_save_c::errorMoveAnmInitSet(int param_0, int param_1) {
     field_0xd3 = 1;
 }
 
-/* 801F5F84-801F60A4 1F08C4 0120+00 4/4 0/0 0/0 .text            errorMoveAnm__12dMenu_save_cFv */
 bool dMenu_save_c::errorMoveAnm() {
     if (field_0xb8 != field_0xbc) {
         if (field_0xb8 < field_0xbc) {
@@ -2710,7 +2562,6 @@ bool dMenu_save_c::errorMoveAnm() {
     }
 }
 
-/* 801F60A4-801F6120 1F09E4 007C+00 5/5 0/0 0/0 .text modoruTxtDispAnmInit__12dMenu_save_cFUc */
 void dMenu_save_c::modoruTxtDispAnmInit(u8 param_0) {
     field_0x1a8 = param_0;
     if ((param_0 != 0 || mpBackTxt->getAlpha() != 0) &&
@@ -2724,8 +2575,6 @@ void dMenu_save_c::modoruTxtDispAnmInit(u8 param_0) {
     mpBBtnIcon->alphaAnimeStart(g_msHIO.mCharSwitchFrames);
 }
 
-/* 801F6120-801F61FC 1F0A60 00DC+00 5/5 0/0 0/0 .text            modoruTxtDispAnm__12dMenu_save_cFv
- */
 bool dMenu_save_c::modoruTxtDispAnm() {
     bool txtAnmComplete;
     bool btnAnmComplete;
@@ -2745,7 +2594,6 @@ bool dMenu_save_c::modoruTxtDispAnm() {
     return false;
 }
 
-/* 801F61FC-801F6278 1F0B3C 007C+00 9/9 0/0 0/0 .text ketteiTxtDispAnmInit__12dMenu_save_cFUc */
 void dMenu_save_c::ketteiTxtDispAnmInit(u8 param_0) {
     field_0x1a9 = param_0;
     if ((param_0 != 0 || mpConfirmTxt->getAlpha() != 0) &&
@@ -2759,7 +2607,6 @@ void dMenu_save_c::ketteiTxtDispAnmInit(u8 param_0) {
     mpABtnIcon->alphaAnimeStart(g_msHIO.mCharSwitchFrames);
 }
 
-/* 801F6278-801F6354 1F0BB8 00DC+00 11/11 0/0 0/0 .text ketteiTxtDispAnm__12dMenu_save_cFv */
 bool dMenu_save_c::ketteiTxtDispAnm() {
     bool txtAnmComplete;
     bool btnAnmComplete;
@@ -2779,8 +2626,6 @@ bool dMenu_save_c::ketteiTxtDispAnm() {
     return false;
 }
 
-/* 801F6354-801F6390 1F0C94 003C+00 2/2 0/0 0/0 .text
- * selectWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc              */
 void dMenu_save_c::selectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8 param_3) {
     mpSelWakuMoyo[param_0]->alphaAnimeStart(0);
     mpSelWakuGold[param_0]->alphaAnimeStart(0);
@@ -2790,7 +2635,6 @@ void dMenu_save_c::selectWakuAlpahAnmInit(u8 param_0, u8 param_1, u8 param_2, u8
     field_0x10a[param_0] = param_3;
 }
 
-/* 801F6390-801F6458 1F0CD0 00C8+00 3/3 0/0 0/0 .text selectWakuAlpahAnm__12dMenu_save_cFUc */
 bool dMenu_save_c::selectWakuAlpahAnm(u8 param_0) {
     bool anmComplete = false;
     bool moyoAnmComplete = mpSelWakuMoyo[param_0]->alphaAnime(
@@ -2807,8 +2651,6 @@ bool dMenu_save_c::selectWakuAlpahAnm(u8 param_0) {
     return anmComplete;
 }
 
-/* 801F6458-801F6608 1F0D98 01B0+00 3/3 0/0 0/0 .text            selFileCursorShow__12dMenu_save_cFv
- */
 void dMenu_save_c::selFileCursorShow() {
     mpSelWakuMoyo[mSelectedFile]->getPanePtr()->scale(1.0f, 1.0f);
     mpSelWakuGold[mSelectedFile]->getPanePtr()->scale(1.0f, 1.0f);
@@ -2824,8 +2666,6 @@ void dMenu_save_c::selFileCursorShow() {
     mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f);
 }
 
-/* 801F6608-801F6654 1F0F48 004C+00 1/1 0/0 0/0 .text
- * yesnoWakuAlpahAnmInit__12dMenu_save_cFUcUcUcUc               */
 void dMenu_save_c::yesnoWakuAlpahAnmInit(u8 yesnoIdx, u8 startAlpha, u8 endAlpha, u8 anmTimer) {
     if (yesnoIdx != 0xFF) {
         mNoYesBase[yesnoIdx]->alphaAnimeStart(0);
@@ -2838,7 +2678,6 @@ void dMenu_save_c::yesnoWakuAlpahAnmInit(u8 yesnoIdx, u8 startAlpha, u8 endAlpha
     }
 }
 
-/* 801F6654-801F67B8 1F0F94 0164+00 4/4 0/0 0/0 .text yesnoWakuAlpahAnm__12dMenu_save_cFUc */
 bool dMenu_save_c::yesnoWakuAlpahAnm(u8 yesnoIdx) {
     if (yesnoIdx == 0xFF) {
         return true;
@@ -2870,12 +2709,10 @@ bool dMenu_save_c::yesnoWakuAlpahAnm(u8 yesnoIdx) {
     return anmComplete;
 }
 
-/* 801F67B8-801F67F0 1F10F8 0038+00 2/2 0/0 0/0 .text            dataSave__12dMenu_save_cFv */
 void dMenu_save_c::dataSave() {
     g_mDoMemCd_control.save(mSaveBuffer, sizeof(mSaveBuffer), 0);
 }
 
-/* 801F67F0-801F6954 1F1130 0164+00 2/2 0/0 0/0 .text            setSaveData__12dMenu_save_cFv */
 void dMenu_save_c::setSaveData() {
     u8* save = mSaveBuffer;
 
@@ -2912,8 +2749,6 @@ void dMenu_save_c::setSaveData() {
     }
 }
 
-/* 801F6954-801F69B8 1F1294 0064+00 1/1 0/0 0/0 .text            setInitSaveData__12dMenu_save_cFv
- */
 void dMenu_save_c::setInitSaveData() {
     for (int i = 0; i < 3; i++) {
         dComIfGs_setInitDataToCard(mSaveBuffer, i);
@@ -2921,14 +2756,12 @@ void dMenu_save_c::setInitSaveData() {
     }
 }
 
-/* 801F69B8-801F69FC 1F12F8 0044+00 0/0 1/1 0/0 .text            _draw__12dMenu_save_cFv */
 void dMenu_save_c::_draw() {
     if (field_0x21a1 == 0 && mpScrnExplain != NULL) {
         mpScrnExplain->draw((J2DOrthoGraph*)dComIfGp_getCurrentGrafPort());
     }
 }
 
-/* 801F69FC-801F6ADC 1F133C 00E0+00 0/0 2/2 0/0 .text            _draw2__12dMenu_save_cFv */
 void dMenu_save_c::_draw2() {
     if (field_0x21a1 == 0) {
         if (mpScrnExplain != NULL) {
@@ -2950,14 +2783,11 @@ void dMenu_save_c::_draw2() {
     }
 }
 
-/* 801F6ADC-801F6B0C 1F141C 0030+00 1/0 0/0 0/0 .text            draw__23dDlst_MenuSaveExplain_cFv
- */
 void dDlst_MenuSaveExplain_c::draw() {
     mpScrn->draw((J2DOrthoGraph*)dComIfGp_getCurrentGrafPort());
 }
 
 
-/* 801F6B0C-801F6B44 1F144C 0038+00 1/0 0/0 0/0 .text            draw__16dDlst_MenuSave_cFv */
 void dDlst_MenuSave_c::draw() {
     Scr->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp
index ffd17c812b..8aaececff3 100644
--- a/src/d/d_menu_skill.cpp
+++ b/src/d/d_menu_skill.cpp
@@ -33,8 +33,6 @@ static moveFunc map_move_process[] = {
     &dMenu_Skill_c::read_close_move,
 };
 
-/* 801F7224-801F7348 1F1B64 0124+00 0/0 2/2 0/0 .text
- * __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl  */
 dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTControl* i_cstcontrol) {
     mpHeap = i_heap;
     mpArchive = NULL;
@@ -55,7 +53,6 @@ dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTCont
     mBarScale[0] = 1.0f;
 }
 
-/* 801F7348-801F763C 1F1C88 02F4+00 1/0 0/0 0/0 .text            __dt__13dMenu_Skill_cFv */
 dMenu_Skill_c::~dMenu_Skill_c() {
     delete mpDrawCursor;
     mpDrawCursor = NULL;
@@ -115,7 +112,6 @@ dMenu_Skill_c::~dMenu_Skill_c() {
     }
 }
 
-/* 801F763C-801F7718 1F1F7C 00DC+00 1/1 0/0 0/0 .text            _create__13dMenu_Skill_cFv */
 void dMenu_Skill_c::_create() {
     mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL);
     mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f);
@@ -130,7 +126,6 @@ void dMenu_Skill_c::_create() {
     init();
 }
 
-/* 801F7718-801F77B0 1F2058 0098+00 0/0 2/2 0/0 .text            _move__13dMenu_Skill_cFv */
 void dMenu_Skill_c::_move() {
     JKRHeap* heap = mDoExt_setCurrentHeap((JKRHeap*)mpHeap);
     u8 process = mProcess;
@@ -142,7 +137,6 @@ void dMenu_Skill_c::_move() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 801F77B0-801F7950 1F20F0 01A0+00 1/1 1/1 0/0 .text            _draw__13dMenu_Skill_cFv */
 void dMenu_Skill_c::_draw() {
     if (mpArchive != NULL) {
         J2DGrafContext* context = dComIfGp_getCurrentGrafPort();
@@ -165,7 +159,6 @@ void dMenu_Skill_c::_draw() {
     }
 }
 
-/* 801F7950-801F7978 1F2290 0028+00 0/0 2/2 0/0 .text            isSync__13dMenu_Skill_cFv */
 bool dMenu_Skill_c::isSync() {
     if (mpMount != NULL && mpMount->sync() == false) {
         return 0;
@@ -173,8 +166,6 @@ bool dMenu_Skill_c::isSync() {
     return 1;
 }
 
-/* 801F7978-801F79EC 1F22B8 0074+00 1/1 0/0 0/0 .text            skill_init_calc__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::skill_init_calc() {
     mTotalSkillNum = getSkillNum();
     if (mTotalSkillNum < 7) {
@@ -190,14 +181,12 @@ void dMenu_Skill_c::skill_init_calc() {
     }
 }
 
-/* 801F79EC-801F7A40 1F232C 0054+00 1/1 0/0 0/0 .text            init__13dMenu_Skill_cFv */
 void dMenu_Skill_c::init() {
     setPageText();
     changeActiveColor();
     (this->*map_init_process[mProcess])();
 }
 
-/* 801F7A40-801F7C1C 1F2380 01DC+00 0/0 2/2 0/0 .text            _open__13dMenu_Skill_cFv */
 int dMenu_Skill_c::_open() {
     if (!mpMount) {
         mpMount = mDoDvdThd_mountArchive_c::create("/res/Layout/skillres.arc", 0, NULL);
@@ -239,7 +228,6 @@ int dMenu_Skill_c::_open() {
     }
 }
 
-/* 801F7C1C-801F7D58 1F255C 013C+00 0/0 1/1 0/0 .text            _close__13dMenu_Skill_cFv */
 int dMenu_Skill_c::_close() {
     s16 closeFrame = g_drawHIO.mSkillListScreen.mCloseFrame[0];
     mFrame = 0;
@@ -264,13 +252,11 @@ int dMenu_Skill_c::_close() {
     return mFrame <= 0;
 }
 
-/* 801F7D58-801F7D94 1F2698 003C+00 1/0 0/0 0/0 .text            wait_init__13dMenu_Skill_cFv */
 void dMenu_Skill_c::wait_init() {
     setAButtonString(0x40C);
     setBButtonString(0x3f9);
 }
 
-/* 801F7D94-801F7F24 1F26D4 0190+00 1/0 0/0 0/0 .text            wait_move__13dMenu_Skill_cFv */
 void dMenu_Skill_c::wait_move() {
     u8 oldIndex = mIndex;
     if (mDoGph_gInf_c::getFader()->getStatus() == 1) {
@@ -298,8 +284,6 @@ void dMenu_Skill_c::wait_move() {
     }
 }
 
-/* 801F7F24-801F7FF8 1F2864 00D4+00 1/0 0/0 0/0 .text            read_open_init__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_open_init() {
     static const u32 i_id[7] = {
         1716, 1715, 1717, 1718, 1719, 1720, 1721,
@@ -319,8 +303,6 @@ void dMenu_Skill_c::read_open_init() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801F7FF8-801F8114 1F2938 011C+00 1/0 0/0 0/0 .text            read_open_move__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_open_move() {
     s16 openSkillDescFrame =
         g_drawHIO.mSkillListScreen.mOpenFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
@@ -336,15 +318,11 @@ void dMenu_Skill_c::read_open_move() {
     }
 }
 
-/* 801F8114-801F8150 1F2A54 003C+00 1/0 0/0 0/0 .text            read_move_init__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_move_init() {
     setAButtonString(0);
     setBButtonString(0x3f9);
 }
 
-/* 801F8150-801F8218 1F2A90 00C8+00 1/0 0/0 0/0 .text            read_move_move__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_move_move() {
     if (mDoCPd_c::getTrigA(PAD_1) != 0) {
         Z2GetAudioMgr()->seStart(Z2SE_SY_EXP_WIN_CLOSE, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -358,8 +336,6 @@ void dMenu_Skill_c::read_move_move() {
     }
 }
 
-/* 801F8218-801F826C 1F2B58 0054+00 1/0 0/0 0/0 .text            read_close_init__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_close_init() {
     mProcFrame = g_drawHIO.mSkillListScreen.mCloseFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
     mStringID = 0;
@@ -367,8 +343,6 @@ void dMenu_Skill_c::read_close_init() {
     setBButtonString(0);
 }
 
-/* 801F826C-801F8388 1F2BAC 011C+00 1/0 0/0 0/0 .text            read_close_move__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::read_close_move() {
     s16 closeSkillDescFrame =
         g_drawHIO.mSkillListScreen.mCloseFrame[dMeter_drawSkillHIO_c::SKILL_DESC];
@@ -384,7 +358,6 @@ void dMenu_Skill_c::read_close_move() {
     }
 }
 
-/* 801F8388-801F8A18 1F2CC8 0690+00 1/1 0/0 0/0 .text            screenSetMenu__13dMenu_Skill_cFv */
 void dMenu_Skill_c::screenSetMenu() {
     static const u64 tag_sub0[7] = {
         'menu_t0s', 'menu_t1s', 'menu_t2s', 'menu_t3s', 'menu_t4s', 'menu_t5s', 'menu_t51',
@@ -507,8 +480,6 @@ void dMenu_Skill_c::screenSetMenu() {
     mpString->getString(0x6a4, textBox, NULL, NULL, NULL, 0);
 }
 
-/* 801F8A18-801F8D20 1F3358 0308+00 1/1 0/0 0/0 .text            screenSetLetter__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::screenSetLetter() {
     static const u64 name_tag[4] = {
         'item_n04',
@@ -557,8 +528,6 @@ void dMenu_Skill_c::screenSetLetter() {
     mpBlackTex->setAlpha(0);
 }
 
-/* 801F8D20-801F8E9C 1F3660 017C+00 1/1 0/0 0/0 .text            screenSetDoIcon__13dMenu_Skill_cFv
- */
 void dMenu_Skill_c::screenSetDoIcon() {
     static const u64 text_a_tag[5] = {
         'atext1_1', 'atext1_2', 'atext1_3', 'atext1_4', 'atext1_5',
@@ -583,13 +552,11 @@ void dMenu_Skill_c::screenSetDoIcon() {
     }
 }
 
-/* 801F8E9C-801F8F28 1F37DC 008C+00 3/3 0/0 0/0 .text            setCursorPos__13dMenu_Skill_cFv */
 void dMenu_Skill_c::setCursorPos() {
     Vec pos = mpLetterParent[mIndex]->getGlobalVtxCenter(mpLetterParent[mIndex]->mPane, false, 0);
     mpDrawCursor->setPos(pos.x, pos.y, mpLetterParent[mIndex]->getPanePtr(), false);
 }
 
-/* 801F8F28-801F9144 1F3868 021C+00 2/2 0/0 0/0 .text changeActiveColor__13dMenu_Skill_cFv */
 void dMenu_Skill_c::changeActiveColor() {
     setCursorPos();
     for (int i = 0; i < 7; i++) {
@@ -609,7 +576,6 @@ void dMenu_Skill_c::changeActiveColor() {
     }
 }
 
-/* 801F9144-801F9260 1F3A84 011C+00 1/1 0/0 0/0 .text            setPageText__13dMenu_Skill_cFv */
 void dMenu_Skill_c::setPageText() {
     static const u32 i_id0[7] = {
         1701, 1702, 1703, 1704, 1705, 1706, 1707,
@@ -626,7 +592,6 @@ void dMenu_Skill_c::setPageText() {
     }
 }
 
-/* 801F9260-801F9310 1F3BA0 00B0+00 4/4 0/0 0/0 .text setAButtonString__13dMenu_Skill_cFUs */
 void dMenu_Skill_c::setAButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -639,7 +604,6 @@ void dMenu_Skill_c::setAButtonString(u16 i_stringID) {
     }
 }
 
-/* 801F9310-801F93C0 1F3C50 00B0+00 4/4 0/0 0/0 .text setBButtonString__13dMenu_Skill_cFUs */
 void dMenu_Skill_c::setBButtonString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 5; i++) {
@@ -652,8 +616,6 @@ void dMenu_Skill_c::setBButtonString(u16 i_stringID) {
     }
 }
 
-/* 801F93C0-801F9470 1F3D00 00B0+00 1/1 0/0 0/0 .text            setNameString__13dMenu_Skill_cFUs
- */
 void dMenu_Skill_c::setNameString(u16 i_stringID) {
     if (i_stringID == 0) {
         for (int i = 0; i < 4; i++) {
@@ -666,7 +628,6 @@ void dMenu_Skill_c::setNameString(u16 i_stringID) {
     }
 }
 
-/* 801F9470-801F9500 1F3DB0 0090+00 1/1 0/0 0/0 .text            getSkillNum__13dMenu_Skill_cFv */
 u8 dMenu_Skill_c::getSkillNum() {
     static u32 evt_id[7] = {
         339, /* dSv_event_flag_c::F_0339 - Secret techniques - Obtained 2 secret techinques */
@@ -687,7 +648,6 @@ u8 dMenu_Skill_c::getSkillNum() {
     return skillNum;
 }
 
-/* 801F9500-801F9A08 1F3E40 0508+00 2/2 0/0 0/0 .text            setHIO__13dMenu_Skill_cFb */
 void dMenu_Skill_c::setHIO(bool i_useHIO) {
     if (i_useHIO || g_drawHIO.mSkillListScreen.mDebug) {
         mSelectBlack[0].set(g_drawHIO.mSkillListScreen.mSelectBarBlack);
diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp
index ed974af35f..c47431df70 100644
--- a/src/d/d_menu_window.cpp
+++ b/src/d/d_menu_window.cpp
@@ -183,7 +183,6 @@ static BOOL dMw_isMenuRing() {
     return false;
 }
 
-/* 803BEAA8-803BEC4C 01BBC8 01A4+00 1/2 0/0 0/0 .data            init_proc */
 typedef void (dMw_c::*initFunc)(u8);
 initFunc init_proc[] = {
     &dMw_c::key_wait_init,
@@ -223,7 +222,6 @@ initFunc init_proc[] = {
     &dMw_c::insect_close_init,
 };
 
-/* 803BEDF0-803BEF94 01BF10 01A4+00 1/2 0/0 0/0 .data            move_proc */
 typedef void (dMw_c::*procFunc)();
 procFunc move_proc[] = {
     &dMw_c::key_wait_proc,
@@ -263,7 +261,6 @@ procFunc move_proc[] = {
     &dMw_c::insect_close_proc,
 };
 
-/* 801FA13C-801FA220 1F4A7C 00E4+00 2/0 0/0 0/0 .text            key_wait_init__5dMw_cFUc */
 void dMw_c::key_wait_init(u8 i_proc) {
     dMeter2Info_setWindowStatus(0);
     dMw_capture_delete();
@@ -307,7 +304,6 @@ static f32 dummy() {
     return 0.0f;
 }
 
-/* 801FA244-801FA2D0 1F4B84 008C+00 1/0 0/0 0/0 .text            collect_open_init__5dMw_cFUc */
 void dMw_c::collect_open_init(u8) {
     field_0x144 = 3;
     dMeter2Info_setWindowStatus(3);
@@ -317,7 +313,6 @@ void dMw_c::collect_open_init(u8) {
     field_0x153 = 0;
 }
 
-/* 801FA2D0-801FA46C 1F4C10 019C+00 2/0 0/0 0/0 .text            collect_move_init__5dMw_cFUc */
 void dMw_c::collect_move_init(u8 i_proc) {
     switch (i_proc) {
     case COLLECT_OPEN:
@@ -370,7 +365,6 @@ void dMw_c::collect_move_init(u8 i_proc) {
     }
 }
 
-/* 801FA46C-801FA538 1F4DAC 00CC+00 1/0 0/0 0/0 .text            collect_close_init__5dMw_cFUc */
 void dMw_c::collect_close_init(u8) {
     if (mpMenuCollect->getSubWindowOpenCheck() != 1 && mpMenuCollect->getSubWindowOpenCheck() != 2)
     {
@@ -391,32 +385,24 @@ void dMw_c::collect_close_init(u8) {
     dMw_fade_out();
 }
 
-/* 801FA538-801FA55C 1F4E78 0024+00 1/0 0/0 0/0 .text            fmap_open_init__5dMw_cFUc */
 void dMw_c::fmap_open_init(u8) {
     dMeter2Info_setWindowStatus(4);
     field_0x153 = 0;
 }
 
-/* 801FA55C-801FA560 1F4E9C 0004+00 1/0 0/0 0/0 .text            fmap_move_init__5dMw_cFUc */
 void dMw_c::fmap_move_init(u8) {}
 
-/* 801FA560-801FA564 1F4EA0 0004+00 1/0 0/0 0/0 .text            fmap_close_init__5dMw_cFUc */
 void dMw_c::fmap_close_init(u8) {}
 
-/* 801FA564-801FA588 1F4EA4 0024+00 1/0 0/0 0/0 .text            dmap_open_init__5dMw_cFUc */
 void dMw_c::dmap_open_init(u8) {
     dMeter2Info_setWindowStatus(5);
     field_0x153 = 0;
 }
 
-/* 801FA588-801FA58C 1F4EC8 0004+00 1/0 0/0 0/0 .text            dmap_move_init__5dMw_cFUc */
 void dMw_c::dmap_move_init(u8) {}
 
-/* 801FA58C-801FA590 1F4ECC 0004+00 1/0 0/0 0/0 .text            dmap_close_init__5dMw_cFUc */
 void dMw_c::dmap_close_init(u8) {}
 
-/* 801FA590-801FA5E4 1F4ED0 0054+00 1/0 0/0 0/0 .text            collect_save_open_init__5dMw_cFUc
- */
 void dMw_c::collect_save_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -424,18 +410,12 @@ void dMw_c::collect_save_open_init(u8) {
     dMw_save_create();
 }
 
-/* 801FA5E4-801FA5E8 1F4F24 0004+00 1/0 0/0 0/0 .text            collect_save_move_init__5dMw_cFUc
- */
 void dMw_c::collect_save_move_init(u8) {}
 
-/* 801FA5E8-801FA608 1F4F28 0020+00 1/0 0/0 0/0 .text            collect_save_close_init__5dMw_cFUc
- */
 void dMw_c::collect_save_close_init(u8) {
     dMw_fade_out();
 }
 
-/* 801FA608-801FA65C 1F4F48 0054+00 1/0 0/0 0/0 .text            collect_option_open_init__5dMw_cFUc
- */
 void dMw_c::collect_option_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -443,17 +423,12 @@ void dMw_c::collect_option_open_init(u8) {
     dMw_option_create();
 }
 
-/* 801FA65C-801FA660 1F4F9C 0004+00 1/0 0/0 0/0 .text            collect_option_move_init__5dMw_cFUc
- */
 void dMw_c::collect_option_move_init(u8) {}
 
-/* 801FA660-801FA680 1F4FA0 0020+00 1/0 0/0 0/0 .text collect_option_close_init__5dMw_cFUc */
 void dMw_c::collect_option_close_init(u8) {
     dMw_fade_out();
 }
 
-/* 801FA680-801FA6DC 1F4FC0 005C+00 1/0 0/0 0/0 .text            collect_letter_open_init__5dMw_cFUc
- */
 void dMw_c::collect_letter_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -462,18 +437,14 @@ void dMw_c::collect_letter_open_init(u8) {
     dMw_letter_create();
 }
 
-/* 801FA6DC-801FA6E0 1F501C 0004+00 1/0 0/0 0/0 .text            collect_letter_move_init__5dMw_cFUc
- */
 void dMw_c::collect_letter_move_init(u8) {}
 
-/* 801FA6E0-801FA738 1F5020 0058+00 1/0 0/0 0/0 .text collect_letter_close_init__5dMw_cFUc */
 void dMw_c::collect_letter_close_init(u8) {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     dMeter2Info_set2DVibration();
     dMw_fade_out();
 }
 
-/* 801FA738-801FA794 1F5078 005C+00 1/0 0/0 0/0 .text collect_fishing_open_init__5dMw_cFUc */
 void dMw_c::collect_fishing_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -482,18 +453,14 @@ void dMw_c::collect_fishing_open_init(u8) {
     dMw_fishing_create();
 }
 
-/* 801FA794-801FA798 1F50D4 0004+00 1/0 0/0 0/0 .text collect_fishing_move_init__5dMw_cFUc */
 void dMw_c::collect_fishing_move_init(u8) {}
 
-/* 801FA798-801FA7F0 1F50D8 0058+00 1/0 0/0 0/0 .text collect_fishing_close_init__5dMw_cFUc */
 void dMw_c::collect_fishing_close_init(u8) {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     dMeter2Info_set2DVibration();
     dMw_fade_out();
 }
 
-/* 801FA7F0-801FA84C 1F5130 005C+00 1/0 0/0 0/0 .text            collect_skill_open_init__5dMw_cFUc
- */
 void dMw_c::collect_skill_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -502,20 +469,14 @@ void dMw_c::collect_skill_open_init(u8) {
     dMw_skill_create();
 }
 
-/* 801FA84C-801FA850 1F518C 0004+00 1/0 0/0 0/0 .text            collect_skill_move_init__5dMw_cFUc
- */
 void dMw_c::collect_skill_move_init(u8) {}
 
-/* 801FA850-801FA8A8 1F5190 0058+00 1/0 0/0 0/0 .text            collect_skill_close_init__5dMw_cFUc
- */
 void dMw_c::collect_skill_close_init(u8) {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     dMeter2Info_set2DVibration();
     dMw_fade_out();
 }
 
-/* 801FA8A8-801FA908 1F51E8 0060+00 1/0 0/0 0/0 .text            collect_insect_open_init__5dMw_cFUc
- */
 void dMw_c::collect_insect_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -524,18 +485,14 @@ void dMw_c::collect_insect_open_init(u8) {
     dMw_insect_create(0);
 }
 
-/* 801FA908-801FA90C 1F5248 0004+00 1/0 0/0 0/0 .text            collect_insect_move_init__5dMw_cFUc
- */
 void dMw_c::collect_insect_move_init(u8) {}
 
-/* 801FA90C-801FA964 1F524C 0058+00 1/0 0/0 0/0 .text collect_insect_close_init__5dMw_cFUc */
 void dMw_c::collect_insect_close_init(u8) {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     dMeter2Info_set2DVibration();
     dMw_fade_out();
 }
 
-/* 801FA964-801FA9E8 1F52A4 0084+00 1/0 0/0 0/0 .text            insect_open_init__5dMw_cFUc */
 void dMw_c::insect_open_init(u8) {
     field_0x144 = 10;
     dMeter2Info_setWindowStatus(10);
@@ -544,20 +501,16 @@ void dMw_c::insect_open_init(u8) {
     dMw_capture_create();
 }
 
-/* 801FA9E8-801FA9EC 1F5328 0004+00 1/0 0/0 0/0 .text            insect_open2_init__5dMw_cFUc */
 void dMw_c::insect_open2_init(u8) {}
 
-/* 801FA9EC-801FA9F0 1F532C 0004+00 1/0 0/0 0/0 .text            insect_move_init__5dMw_cFUc */
 void dMw_c::insect_move_init(u8) {}
 
-/* 801FA9F0-801FAA48 1F5330 0058+00 1/0 0/0 0/0 .text            insect_close_init__5dMw_cFUc */
 void dMw_c::insect_close_init(u8) {
     Z2GetAudioMgr()->seStart(Z2SE_SY_MENU_SUB_OUT, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
     dMeter2Info_set2DVibration();
     dMw_fade_out();
 }
 
-/* 801FAA48-801FAFDC 1F5388 0594+00 1/0 0/0 0/0 .text            key_wait_proc__5dMw_cFv */
 void dMw_c::key_wait_proc() {
     if (field_0x14B != 0) {
         switch (field_0x14B) {
@@ -689,14 +642,12 @@ void dMw_c::key_wait_proc() {
     }
 }
 
-/* 801FAFDC-801FB01C 1F591C 0040+00 1/0 0/0 0/0 .text            ring_open_proc__5dMw_cFv */
 void dMw_c::ring_open_proc() {
     if (mpMenuRing->isOpen()) {
         mMenuProc = RING_MOVE;
     }
 }
 
-/* 801FB01C-801FB064 1F595C 0048+00 1/0 0/0 0/0 .text            ring_move_proc__5dMw_cFv */
 void dMw_c::ring_move_proc() {
     mpMenuRing->_move();
     if (mpMenuRing->isMoveEnd()) {
@@ -704,7 +655,6 @@ void dMw_c::ring_move_proc() {
     }
 }
 
-/* 801FB064-801FB0B8 1F59A4 0054+00 1/0 0/0 0/0 .text            ring_close_proc__5dMw_cFv */
 void dMw_c::ring_close_proc() {
     if (mpMenuRing->isClose()) {
         dMeter2Info_offMenuInForce(2);
@@ -712,7 +662,6 @@ void dMw_c::ring_close_proc() {
     }
 }
 
-/* 801FB0B8-801FB110 1F59F8 0058+00 1/0 0/0 0/0 .text            collect_open_proc__5dMw_cFv */
 void dMw_c::collect_open_proc() {
     if (field_0x153 == 0) {
         field_0x153 = 1;
@@ -724,7 +673,6 @@ void dMw_c::collect_open_proc() {
     }
 }
 
-/* 801FB110-801FB1A0 1F5A50 0090+00 1/0 0/0 0/0 .text            collect_move_proc__5dMw_cFv */
 void dMw_c::collect_move_proc() {
     if (mpMenuCollect->getSubWindowOpenCheck()) {
         mMenuProc = COLLECT_CLOSE;
@@ -735,7 +683,6 @@ void dMw_c::collect_move_proc() {
     }
 }
 
-/* 801FB1A0-801FB240 1F5AE0 00A0+00 1/0 0/0 0/0 .text            collect_close_proc__5dMw_cFv */
 void dMw_c::collect_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         if (mpMenuCollect->getSubWindowOpenCheck() == 1) {
@@ -756,7 +703,6 @@ void dMw_c::collect_close_proc() {
     }
 }
 
-/* 801FB240-801FB298 1F5B80 0058+00 1/0 0/0 0/0 .text            fmap_open_proc__5dMw_cFv */
 void dMw_c::fmap_open_proc() {
     if (field_0x153 == 0) {
         field_0x153 = 1;
@@ -768,7 +714,6 @@ void dMw_c::fmap_open_proc() {
     }
 }
 
-/* 801FB298-801FB36C 1F5BD8 00D4+00 1/0 0/0 0/0 .text            fmap_move_proc__5dMw_cFv */
 void dMw_c::fmap_move_proc() {
     mpMenuFmap->_move();
 
@@ -791,14 +736,12 @@ void dMw_c::fmap_move_proc() {
     }
 }
 
-/* 801FB36C-801FB3AC 1F5CAC 0040+00 1/0 0/0 0/0 .text            fmap_close_proc__5dMw_cFv */
 void dMw_c::fmap_close_proc() {
     if (mpMenuFmap->isClose()) {
         mMenuProc = NO_MENU;
     }
 }
 
-/* 801FB3AC-801FB404 1F5CEC 0058+00 1/0 0/0 0/0 .text            dmap_open_proc__5dMw_cFv */
 void dMw_c::dmap_open_proc() {
     if (field_0x153 == 0) {
         field_0x153 = 1;
@@ -810,7 +753,6 @@ void dMw_c::dmap_open_proc() {
     }
 }
 
-/* 801FB404-801FB5DC 1F5D44 01D8+00 1/0 0/0 0/0 .text            dmap_move_proc__5dMw_cFv */
 void dMw_c::dmap_move_proc() {
     u8 nextStatus = mpMenuDmap->getNextStatus();
     if (nextStatus == 1) {
@@ -850,14 +792,12 @@ void dMw_c::dmap_move_proc() {
     }
 }
 
-/* 801FB5DC-801FB61C 1F5F1C 0040+00 1/0 0/0 0/0 .text            dmap_close_proc__5dMw_cFv */
 void dMw_c::dmap_close_proc() {
     if (mpMenuDmap->isClose()) {
         mMenuProc = NO_MENU;
     }
 }
 
-/* 801FB61C-801FB67C 1F5F5C 0060+00 1/0 0/0 0/0 .text            collect_save_open_proc__5dMw_cFv */
 void dMw_c::collect_save_open_proc() {
     if (mpMenuSave->getSaveStatus() == 1 && mpMenuSave->_open()) {
         dMw_fade_in();
@@ -868,7 +808,6 @@ void dMw_c::collect_save_open_proc() {
     }
 }
 
-/* 801FB67C-801FB6D8 1F5FBC 005C+00 1/0 0/0 0/0 .text            collect_save_move_proc__5dMw_cFv */
 void dMw_c::collect_save_move_proc() {
     if (mpMenuSave->getSaveStatus() == 2) {
         mpMenuSave->_move();
@@ -879,8 +818,6 @@ void dMw_c::collect_save_move_proc() {
     }
 }
 
-/* 801FB6D8-801FB73C 1F6018 0064+00 1/0 0/0 0/0 .text            collect_save_close_proc__5dMw_cFv
- */
 void dMw_c::collect_save_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         mpMenuSave->_move();
@@ -893,8 +830,6 @@ void dMw_c::collect_save_close_proc() {
     }
 }
 
-/* 801FB73C-801FB7AC 1F607C 0070+00 1/0 0/0 0/0 .text            collect_option_open_proc__5dMw_cFv
- */
 void dMw_c::collect_option_open_proc() {
     if (mpMenuOption->getQuitStatus() == 1 && mpMenuOption->_open()) {
         dMw_fade_in();
@@ -905,8 +840,6 @@ void dMw_c::collect_option_open_proc() {
     }
 }
 
-/* 801FB7AC-801FB800 1F60EC 0054+00 1/0 0/0 0/0 .text            collect_option_move_proc__5dMw_cFv
- */
 void dMw_c::collect_option_move_proc() {
     if (mpMenuOption->getQuitStatus() == 2) {
         mpMenuOption->_move();
@@ -917,16 +850,12 @@ void dMw_c::collect_option_move_proc() {
     }
 }
 
-/* 801FB800-801FB81C 1F6140 001C+00 1/0 0/0 0/0 .text            collect_option_close_proc__5dMw_cFv
- */
 void dMw_c::collect_option_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == 0) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
-/* 801FB81C-801FB8AC 1F615C 0090+00 1/0 0/0 0/0 .text            collect_letter_open_proc__5dMw_cFv
- */
 void dMw_c::collect_letter_open_proc() {
     if (mpMenuLetter->getStatus() == 1) {
         mpMenuLetter->_open();
@@ -943,8 +872,6 @@ void dMw_c::collect_letter_open_proc() {
     }
 }
 
-/* 801FB8AC-801FB900 1F61EC 0054+00 1/0 0/0 0/0 .text            collect_letter_move_proc__5dMw_cFv
- */
 void dMw_c::collect_letter_move_proc() {
     if (mpMenuLetter->getStatus() == 2) {
         mpMenuLetter->_move();
@@ -955,16 +882,12 @@ void dMw_c::collect_letter_move_proc() {
     }
 }
 
-/* 801FB900-801FB91C 1F6240 001C+00 1/0 0/0 0/0 .text            collect_letter_close_proc__5dMw_cFv
- */
 void dMw_c::collect_letter_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
-/* 801FB91C-801FB9AC 1F625C 0090+00 1/0 0/0 0/0 .text            collect_fishing_open_proc__5dMw_cFv
- */
 void dMw_c::collect_fishing_open_proc() {
     if (mpMenuFishing->getStatus() == dMenu_Fishing_c::READY_OPEN) {
         mpMenuFishing->_open();
@@ -981,8 +904,6 @@ void dMw_c::collect_fishing_open_proc() {
     }
 }
 
-/* 801FB9AC-801FBA00 1F62EC 0054+00 1/0 0/0 0/0 .text            collect_fishing_move_proc__5dMw_cFv
- */
 void dMw_c::collect_fishing_move_proc() {
     if (mpMenuFishing->getStatus() == dMenu_Fishing_c::READY_MOVE) {
         mpMenuFishing->_move();
@@ -993,15 +914,12 @@ void dMw_c::collect_fishing_move_proc() {
     }
 }
 
-/* 801FBA00-801FBA1C 1F6340 001C+00 1/0 0/0 0/0 .text collect_fishing_close_proc__5dMw_cFv */
 void dMw_c::collect_fishing_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
-/* 801FBA1C-801FBAAC 1F635C 0090+00 1/0 0/0 0/0 .text            collect_skill_open_proc__5dMw_cFv
- */
 void dMw_c::collect_skill_open_proc() {
     if (mpMenuSkill->getStatus() == 1) {
         mpMenuSkill->_open();
@@ -1017,8 +935,6 @@ void dMw_c::collect_skill_open_proc() {
     }
 }
 
-/* 801FBAAC-801FBB00 1F63EC 0054+00 1/0 0/0 0/0 .text            collect_skill_move_proc__5dMw_cFv
- */
 void dMw_c::collect_skill_move_proc() {
     if (mpMenuSkill->getStatus() == 2) {
         mpMenuSkill->_move();
@@ -1029,16 +945,12 @@ void dMw_c::collect_skill_move_proc() {
     }
 }
 
-/* 801FBB00-801FBB1C 1F6440 001C+00 1/0 0/0 0/0 .text            collect_skill_close_proc__5dMw_cFv
- */
 void dMw_c::collect_skill_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
-/* 801FBB1C-801FBBAC 1F645C 0090+00 1/0 0/0 0/0 .text            collect_insect_open_proc__5dMw_cFv
- */
 void dMw_c::collect_insect_open_proc() {
     if (mpMenuInsect->getStatus() == 1) {
         mpMenuInsect->_open();
@@ -1054,8 +966,6 @@ void dMw_c::collect_insect_open_proc() {
     }
 }
 
-/* 801FBBAC-801FBC00 1F64EC 0054+00 1/0 0/0 0/0 .text            collect_insect_move_proc__5dMw_cFv
- */
 void dMw_c::collect_insect_move_proc() {
     if (mpMenuInsect->getStatus() == 2) {
         mpMenuInsect->_move();
@@ -1066,15 +976,12 @@ void dMw_c::collect_insect_move_proc() {
     }
 }
 
-/* 801FBC00-801FBC1C 1F6540 001C+00 1/0 0/0 0/0 .text            collect_insect_close_proc__5dMw_cFv
- */
 void dMw_c::collect_insect_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         mMenuProc = COLLECT_MOVE;
     }
 }
 
-/* 801FBC1C-801FBC78 1F655C 005C+00 1/0 0/0 0/0 .text            insect_open_proc__5dMw_cFv */
 void dMw_c::insect_open_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         field_0x152 = 0;
@@ -1084,7 +991,6 @@ void dMw_c::insect_open_proc() {
     }
 }
 
-/* 801FBC78-801FBD08 1F65B8 0090+00 1/0 0/0 0/0 .text            insect_open2_proc__5dMw_cFv */
 void dMw_c::insect_open2_proc() {
     if (mpMenuInsect->getStatus() == 1) {
         mpMenuInsect->_open();
@@ -1100,7 +1006,6 @@ void dMw_c::insect_open2_proc() {
     }
 }
 
-/* 801FBD08-801FBD64 1F6648 005C+00 1/0 0/0 0/0 .text            insect_move_proc__5dMw_cFv */
 void dMw_c::insect_move_proc() {
     if (mpMenuInsect != NULL) {
         if (mpMenuInsect->getStatus() == 2) {
@@ -1113,14 +1018,12 @@ void dMw_c::insect_move_proc() {
     }
 }
 
-/* 801FBD64-801FBD80 1F66A4 001C+00 1/0 0/0 0/0 .text            insect_close_proc__5dMw_cFv */
 void dMw_c::insect_close_proc() {
     if (mDoGph_gInf_c::getFader()->getStatus() == JUTFader::UNKSTATUS_0) {
         mMenuProc = NO_MENU;
     }
 }
 
-/* 801FBD80-801FBE14 1F66C0 0094+00 2/2 0/0 0/0 .text            dMw_capture_create__5dMw_cFv */
 void dMw_c::dMw_capture_create() {
     if (!dComIfGp_isPauseFlag() && mpCapture == NULL) {
         mpCapture = new dDlst_MENU_CAPTURE_c();
@@ -1129,7 +1032,6 @@ void dMw_c::dMw_capture_create() {
     }
 }
 
-/* 801FBE14-801FBE94 1F6754 0080+00 2/2 0/0 0/0 .text            dMw_capture_delete__5dMw_cFv */
 void dMw_c::dMw_capture_delete() {
     if (dComIfGp_isPauseFlag()) {
         if (mpCapture != NULL) {
@@ -1141,7 +1043,6 @@ void dMw_c::dMw_capture_delete() {
     }
 }
 
-/* 801FBE94-801FBF60 1F67D4 00CC+00 1/1 0/0 0/0 .text            dMw_ring_create__5dMw_cFUc */
 void dMw_c::dMw_ring_create(u8 i_origin) {
     markMemSize();
     dComIfGp_setHeapLockFlag(1);
@@ -1158,7 +1059,6 @@ void dMw_c::dMw_ring_create(u8 i_origin) {
     mpCapture->setCaptureFlag();
 }
 
-/* 801FBF60-801FBFF8 1F68A0 0098+00 2/2 0/0 0/0 .text            dMw_ring_delete__5dMw_cFv */
 bool dMw_c::dMw_ring_delete() {
     if (mpMenuRing != NULL) {
         mpMenuRing->_delete();
@@ -1175,7 +1075,6 @@ bool dMw_c::dMw_ring_delete() {
     return true;
 }
 
-/* 801FBFF8-801FC090 1F6938 0098+00 1/1 0/0 0/0 .text            dMw_collect_create__5dMw_cFv */
 void dMw_c::dMw_collect_create() {
     markMemSize();
 
@@ -1190,7 +1089,6 @@ void dMw_c::dMw_collect_create() {
     }
 }
 
-/* 801FC090-801FC0FC 1F69D0 006C+00 8/8 0/0 0/0 .text            dMw_collect_delete__5dMw_cFb */
 bool dMw_c::dMw_collect_delete(bool) {
     if (mpMenuCollect != NULL) {
         mpMenuCollect->_delete();
@@ -1201,7 +1099,6 @@ bool dMw_c::dMw_collect_delete(bool) {
     return true;
 }
 
-/* 801FC0FC-801FC264 1F6A3C 0168+00 1/1 0/0 0/0 .text            dMw_fmap_create__5dMw_cFv */
 void dMw_c::dMw_fmap_create() {
     markMemSize();
     dComIfGp_setHeapLockFlag(2);
@@ -1234,7 +1131,6 @@ void dMw_c::dMw_fmap_create() {
     dMeter2Info_resetWarpStatus();
 }
 
-/* 801FC264-801FC350 1F6BA4 00EC+00 2/2 0/0 0/0 .text            dMw_fmap_delete__5dMw_cFb */
 bool dMw_c::dMw_fmap_delete(bool param_0) {
     if (mpMenuFmap != NULL) {
         if (!mpMenuFmap->isSync()) {
@@ -1261,7 +1157,6 @@ bool dMw_c::dMw_fmap_delete(bool param_0) {
     return true;
 }
 
-/* 801FC350-801FC46C 1F6C90 011C+00 1/1 0/0 0/0 .text            dMw_dmap_create__5dMw_cFv */
 void dMw_c::dMw_dmap_create() {
     markMemSize();
     dComIfGp_setHeapLockFlag(3);
@@ -1290,7 +1185,6 @@ void dMw_c::dMw_dmap_create() {
     dMeter2Info_resetWarpStatus();
 }
 
-/* 801FC46C-801FC520 1F6DAC 00B4+00 2/2 0/0 0/0 .text            dMw_dmap_delete__5dMw_cFb */
 bool dMw_c::dMw_dmap_delete(bool param_0) {
     if (mpMenuDmap != NULL) {
         if (!mpMenuDmap->isSync()) {
@@ -1312,7 +1206,6 @@ bool dMw_c::dMw_dmap_delete(bool param_0) {
     return true;
 }
 
-/* 801FC520-801FC5D0 1F6E60 00B0+00 1/1 0/0 0/0 .text            dMw_save_create__5dMw_cFv */
 void dMw_c::dMw_save_create() {
     markMemSize();
 
@@ -1329,7 +1222,6 @@ void dMw_c::dMw_save_create() {
     }
 }
 
-/* 801FC5D0-801FC668 1F6F10 0098+00 3/3 0/0 0/0 .text            dMw_save_delete__5dMw_cFv */
 bool dMw_c::dMw_save_delete() {
     if (mpMenuSave != NULL) {
         mpMenuSave->_delete();
@@ -1346,7 +1238,6 @@ bool dMw_c::dMw_save_delete() {
     return true;
 }
 
-/* 801FC668-801FC70C 1F6FA8 00A4+00 1/1 0/0 0/0 .text            dMw_option_create__5dMw_cFv */
 void dMw_c::dMw_option_create() {
     markMemSize();
 
@@ -1359,7 +1250,6 @@ void dMw_c::dMw_option_create() {
     }
 }
 
-/* 801FC70C-801FC7BC 1F704C 00B0+00 2/2 0/0 0/0 .text            dMw_option_delete__5dMw_cFv */
 bool dMw_c::dMw_option_delete() {
     if (mpMenuOption != NULL) {
         if (!mpMenuOption->isSync()) {
@@ -1379,7 +1269,6 @@ bool dMw_c::dMw_option_delete() {
     return true;
 }
 
-/* 801FC7BC-801FC85C 1F70FC 00A0+00 1/1 0/0 0/0 .text            dMw_letter_create__5dMw_cFv */
 void dMw_c::dMw_letter_create() {
     markMemSize();
 
@@ -1392,7 +1281,6 @@ void dMw_c::dMw_letter_create() {
     }
 }
 
-/* 801FC85C-801FC904 1F719C 00A8+00 2/2 0/0 0/0 .text            dMw_letter_delete__5dMw_cFv */
 bool dMw_c::dMw_letter_delete() {
     if (mpMenuLetter != NULL) {
         if (!mpMenuLetter->isSync()) {
@@ -1411,7 +1299,6 @@ bool dMw_c::dMw_letter_delete() {
     return true;
 }
 
-/* 801FC904-801FC9A4 1F7244 00A0+00 1/1 0/0 0/0 .text            dMw_fishing_create__5dMw_cFv */
 void dMw_c::dMw_fishing_create() {
     markMemSize();
 
@@ -1424,7 +1311,6 @@ void dMw_c::dMw_fishing_create() {
     }
 }
 
-/* 801FC9A4-801FCA4C 1F72E4 00A8+00 2/2 0/0 0/0 .text            dMw_fishing_delete__5dMw_cFv */
 bool dMw_c::dMw_fishing_delete() {
     if (mpMenuFishing != NULL) {
         if (!mpMenuFishing->isSync()) {
@@ -1443,7 +1329,6 @@ bool dMw_c::dMw_fishing_delete() {
     return true;
 }
 
-/* 801FCA4C-801FCAEC 1F738C 00A0+00 1/1 0/0 0/0 .text            dMw_skill_create__5dMw_cFv */
 void dMw_c::dMw_skill_create() {
     markMemSize();
 
@@ -1456,7 +1341,6 @@ void dMw_c::dMw_skill_create() {
     }
 }
 
-/* 801FCAEC-801FCB94 1F742C 00A8+00 2/2 0/0 0/0 .text            dMw_skill_delete__5dMw_cFv */
 bool dMw_c::dMw_skill_delete() {
     if (mpMenuSkill != NULL) {
         if (!mpMenuSkill->isSync()) {
@@ -1475,7 +1359,6 @@ bool dMw_c::dMw_skill_delete() {
     return true;
 }
 
-/* 801FCB94-801FCC44 1F74D4 00B0+00 2/2 0/0 0/0 .text            dMw_insect_create__5dMw_cFUc */
 void dMw_c::dMw_insect_create(u8 param_0) {
     markMemSize();
 
@@ -1488,7 +1371,6 @@ void dMw_c::dMw_insect_create(u8 param_0) {
     }
 }
 
-/* 801FCC44-801FCCEC 1F7584 00A8+00 3/3 0/0 0/0 .text            dMw_insect_delete__5dMw_cFv */
 bool dMw_c::dMw_insect_delete() {
     if (mpMenuInsect != NULL) {
         if (!mpMenuInsect->isSync()) {
@@ -1507,22 +1389,18 @@ bool dMw_c::dMw_insect_delete() {
     return true;
 }
 
-/* 801FCCEC-801FCCFC 1F762C 0010+00 1/1 0/0 0/0 .text            dMw_onButtonBit__5dMw_cFUc */
 void dMw_c::dMw_onButtonBit(u8 i_bit) {
     mButtonBits |= i_bit;
 }
 
-/* 801FCCFC-801FCD0C 1F763C 0010+00 1/1 0/0 0/0 .text            dMw_offButtonBit__5dMw_cFUc */
 void dMw_c::dMw_offButtonBit(u8 i_bit) {
     mButtonBits &= ~i_bit;
 }
 
-/* 801FCD0C-801FCD24 1F764C 0018+00 1/1 0/0 0/0 .text            dMw_isButtonBit__5dMw_cFUc */
 BOOL dMw_c::dMw_isButtonBit(u8 i_bit) {
     return (mButtonBits & i_bit) ? TRUE : FALSE;
 }
 
-/* 801FCD24-801FCDD8 1F7664 00B4+00 1/1 0/0 0/0 .text            dMw_isPush_S_Button__5dMw_cFv */
 BOOL dMw_c::dMw_isPush_S_Button() {
     if (isFadeNowCheck()) {
         if (daPy_getLinkPlayerActorClass()->getClothesChangeWaitTimer() == 0 &&
@@ -1538,7 +1416,6 @@ BOOL dMw_c::dMw_isPush_S_Button() {
     return false;
 }
 
-/* 801FCDD8-801FCE08 1F7718 0030+00 1/1 0/0 0/0 .text            isPauseReady__5dMw_cFv */
 bool dMw_c::isPauseReady() {
     if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) {
         return false;
@@ -1547,19 +1424,16 @@ bool dMw_c::isPauseReady() {
     return true;
 }
 
-/* 801FCE08-801FCE78 1F7748 0070+00 10/10 3/3 0/0 .text            dMw_fade_out__5dMw_cFv */
 void dMw_c::dMw_fade_out() {
     mDoGph_gInf_c::startFadeOut(13);
     mDoGph_gInf_c::setFadeColor(static_cast<JUtility::TColor&>(g_blackColor));
 }
 
-/* 801FCE78-801FCEE8 1F77B8 0070+00 9/9 4/4 0/0 .text            dMw_fade_in__5dMw_cFv */
 void dMw_c::dMw_fade_in() {
     mDoGph_gInf_c::startFadeIn(13);
     mDoGph_gInf_c::setFadeColor(static_cast<JUtility::TColor&>(g_blackColor));
 }
 
-/* 801FCEE8-801FCF84 1F7828 009C+00 1/1 0/0 0/0 .text            checkCStickTrigger__5dMw_cFv */
 int dMw_c::checkCStickTrigger() {
     field_0x14A = 0;
     if (field_0x149 == 0) {
@@ -1576,7 +1450,6 @@ int dMw_c::checkCStickTrigger() {
     return 0;
 }
 
-/* 801FCF84-801FD094 1F78C4 0110+00 1/1 0/0 0/0 .text            isEventCheck__5dMw_cFv */
 bool dMw_c::isEventCheck() {
     if (field_0x151 != 0) {
         return true;
@@ -1602,7 +1475,6 @@ bool dMw_c::isEventCheck() {
     return field_0x148 > 0;
 }
 
-/* 801FD094-801FD0D4 1F79D4 0040+00 10/10 0/0 0/0 .text            markMemSize__5dMw_cFv */
 void dMw_c::markMemSize() {
     if (mMemSize == 0) {
         mMemSize = mpHeap->getTotalFreeSize();
@@ -1610,7 +1482,6 @@ void dMw_c::markMemSize() {
     }
 }
 
-/* 801FD0D4-801FD140 1F7A14 006C+00 10/10 0/0 0/0 .text            checkMemSize__5dMw_cFv */
 void dMw_c::checkMemSize() {
     if (mMemSize > 0) {
         s32 now_size = mpHeap->getTotalFreeSize();
@@ -1628,7 +1499,6 @@ void dMw_c::checkMemSize() {
     }
 }
 
-/* 801FD140-801FD2D8 1F7A80 0198+00 1/1 0/0 0/0 .text            _create__5dMw_cFv */
 int dMw_c::_create() {
     mpHeap = dComIfGp_getExpHeap2D();
 
@@ -1677,7 +1547,6 @@ int dMw_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 801FD2D8-801FD450 1F7C18 0178+00 1/1 0/0 0/0 .text            _execute__5dMw_cFv */
 int dMw_c::_execute() {
     if (field_0x151 != 0) {
         field_0x151--;
@@ -1717,7 +1586,6 @@ int dMw_c::_execute() {
     return 1;
 }
 
-/* 801FD450-801FD67C 1F7D90 022C+00 1/1 0/0 0/0 .text            _draw__5dMw_cFv */
 int dMw_c::_draw() {
     if (mpCapture != NULL && mpCapture->checkDraw() && mpCapture->getAlpha() != 0) {
         if (mpCapture->getTopFlag() != 0) {
@@ -1773,7 +1641,6 @@ int dMw_c::_draw() {
     return 1;
 }
 
-/* 801FD67C-801FD840 1F7FBC 01C4+00 1/1 0/0 0/0 .text            _delete__5dMw_cFv */
 int dMw_c::_delete() {
     JKRHeap* heap = mDoExt_getCurrentHeap();
 
@@ -1823,22 +1690,18 @@ int dMw_c::_delete() {
     }
 }
 
-/* 801FD840-801FD860 1F8180 0020+00 1/0 0/0 0/0 .text            dMw_Draw__FP5dMw_c */
 static int dMw_Draw(dMw_c* i_this) {
     return i_this->_draw();
 }
 
-/* 801FD860-801FD880 1F81A0 0020+00 1/0 0/0 0/0 .text            dMw_Execute__FP5dMw_c */
 static int dMw_Execute(dMw_c* i_this) {
     return i_this->_execute();
 }
 
-/* 801FD880-801FD888 1F81C0 0008+00 1/0 0/0 0/0 .text            dMw_IsDelete__FP5dMw_c */
 static int dMw_IsDelete(dMw_c* i_this) {
     return 1;
 }
 
-/* 801FD888-801FD8C0 1F81C8 0038+00 1/0 0/0 0/0 .text            dMw_Delete__FP5dMw_c */
 static int dMw_Delete(dMw_c* i_this) {
     int rt = i_this->_delete();
     if (rt != 0) {
@@ -1848,7 +1711,6 @@ static int dMw_Delete(dMw_c* i_this) {
     return rt;
 }
 
-/* 801FD8C0-801FD928 1F8200 0068+00 1/0 0/0 0/0 .text            dMw_Create__FP9msg_class */
 static int dMw_Create(msg_class* i_this) {
     dMeter2Info_setMenuWindowClass((dMw_c*)i_this);
     g_mwHIO.field_0x4 = -1;
@@ -1858,7 +1720,6 @@ static int dMw_Create(msg_class* i_this) {
     return ((dMw_c*)i_this)->_create();
 }
 
-/* 803BF080-803BF094 -00001 0014+00 1/0 0/0 0/0 .data            l_dMw_Method */
 static leafdraw_method_class l_dMw_Method = {
     (process_method_func)dMw_Create, 
     (process_method_func)dMw_Delete,
@@ -1867,7 +1728,6 @@ static leafdraw_method_class l_dMw_Method = {
     (process_method_func)dMw_Draw,
 };
 
-/* 803BF094-803BF0D4 -00001 0028+18 0/0 0/0 1/0 .data            g_profile_MENUWINDOW */
 extern msg_process_profile_definition g_profile_MENUWINDOW = {
     fpcLy_CURRENT_e,
     12,
diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp
index 05541a5488..7fe6ba153a 100644
--- a/src/d/d_menu_window_HIO.cpp
+++ b/src/d/d_menu_window_HIO.cpp
@@ -8,12 +8,10 @@
 #include "d/d_menu_window_HIO.h"
 #include "d/d_com_inf_game.h"
 
-/* 801F9AFC-801F9B38 1F443C 003C+00 1/1 0/0 0/0 .text            __ct__9dMw_HIO_cFv */
 dMw_HIO_c::dMw_HIO_c() {
     init();
 }
 
-/* 801F9B38-801F9E14 1F4478 02DC+00 1/1 0/0 0/0 .text            init__9dMw_HIO_cFv */
 void dMw_HIO_c::init() {
     static u8 m_cloth_item[3] = {fpcNm_ITEM_WEAR_KOKIRI, fpcNm_ITEM_ARMOR, fpcNm_ITEM_WEAR_ZORA};
     static u8 m_sword_item[4] = {fpcNm_ITEM_SWORD, fpcNm_ITEM_MASTER_SWORD, fpcNm_ITEM_LIGHT_SWORD, fpcNm_ITEM_WOOD_STICK};
@@ -132,22 +130,18 @@ void dMw_HIO_c::init() {
     }
 }
 
-/* 801F9E14-801F9E1C 1F4754 0008+00 0/0 1/1 0/0 .text            getBombFlag__9dMw_HIO_cFv */
 bool dMw_HIO_c::getBombFlag() {
     return false;
 }
 
-/* 801F9E1C-801F9E24 1F475C 0008+00 0/0 1/1 0/0 .text            getArrowFlag__9dMw_HIO_cFv */
 bool dMw_HIO_c::getArrowFlag() {
     return false;
 }
 
-/* 801F9E24-801F9E2C 1F4764 0008+00 0/0 1/1 0/0 .text            getPachinkoFlag__9dMw_HIO_cFv */
 bool dMw_HIO_c::getPachinkoFlag() {
     return false;
 }
 
-/* 801F9E2C-801F9E98 1F476C 006C+00 1/1 0/0 0/0 .text            __ct__10dMw_DHIO_cFv */
 dMw_DHIO_c::dMw_DHIO_c() {
     for (int i = 0; i < 32; i++) {
         mMap[i] = false;
@@ -169,8 +163,6 @@ dMw_DHIO_c::dMw_DHIO_c() {
     }
 }
 
-/* 8042E86C-8042E99C 05B58C 0130+00 0/1 4/4 0/0 .bss             g_mwHIO */
 dMw_HIO_c g_mwHIO;
 
-/* 8042E9A8-8042EBB0 05B6C8 0208+00 0/1 1/1 0/0 .bss             g_mwDHIO */
 dMw_DHIO_c g_mwDHIO;
diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp
index d9898f1348..5cec2cdb6d 100644
--- a/src/d/d_meter2.cpp
+++ b/src/d/d_meter2.cpp
@@ -20,11 +20,9 @@
 #include "d/d_meter_hakusha.h"
 #include "d/d_meter_map.h"
 #include "d/d_meter_string.h"
-#include "dol2asm.h"
 #include "f_op/f_op_msg_mng.h"
 #include "d/actor/d_a_horse.h"
 
-/* 8021EA14-8021F128 219354 0714+00 1/1 0/0 0/0 .text            _create__9dMeter2_cFv */
 int dMeter2_c::_create() {
     stage_stag_info_class* stag_info = dComIfGp_getStageStagInfo();
     if (dStage_stagInfo_GetUpButton(stag_info) == 1) {
@@ -244,7 +242,6 @@ int dMeter2_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8021F128-8021F370 219A68 0248+00 1/1 0/0 0/0 .text            _execute__9dMeter2_cFv */
 int dMeter2_c::_execute() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpHeap);
 
@@ -311,7 +308,6 @@ int dMeter2_c::_execute() {
     return 1;
 }
 
-/* 8021F370-8021F49C 219CB0 012C+00 1/1 0/0 0/0 .text            _draw__9dMeter2_cFv */
 int dMeter2_c::_draw() {
     if (mpMap != NULL) {
         mpMap->_draw();
@@ -344,7 +340,6 @@ int dMeter2_c::_draw() {
     return 1;
 }
 
-/* 8021F49C-8021F6EC 219DDC 0250+00 1/1 0/0 0/0 .text            _delete__9dMeter2_cFv */
 int dMeter2_c::_delete() {
     mpHeap->getTotalFreeSize();
     JKRHeap* heap = mDoExt_setCurrentHeap(mpHeap);
@@ -397,8 +392,6 @@ int dMeter2_c::_delete() {
     return 1;
 }
 
-/* 8021F6EC-8021F780 21A02C 0094+00 1/1 5/5 0/0 .text            emphasisButtonDelete__9dMeter2_cFv
- */
 int dMeter2_c::emphasisButtonDelete() {
     if (mpEmpButton != NULL) {
         JKRExpHeap* heap = dComIfGp_getSubHeap2D(8);
@@ -415,14 +408,12 @@ int dMeter2_c::emphasisButtonDelete() {
     return 1;
 }
 
-/* 8021F780-8021F7B0 21A0C0 0030+00 0/0 0/0 1/1 .text            setLifeZero__9dMeter2_cFv */
 void dMeter2_c::setLifeZero() {
     dComIfGs_setLife(1);
     setNowLifeGauge(1);
     dComIfGp_setItemLifeCount(-1.0f, 0);
 }
 
-/* 8021F7B0-8021FD60 21A0F0 05B0+00 2/1 0/0 0/0 .text            checkStatus__9dMeter2_cFv */
 void dMeter2_c::checkStatus() {
     mStatus = 0;
     field_0x12c = field_0x128;
@@ -556,7 +547,6 @@ void dMeter2_c::checkStatus() {
     }
 }
 
-/* 8021FD60-80220180 21A6A0 0420+00 1/1 0/0 0/0 .text            moveLife__9dMeter2_cFv */
 void dMeter2_c::moveLife() {
     s16 life_count = 0;
     bool draw_life = false;
@@ -680,7 +670,6 @@ void dMeter2_c::moveLife() {
     dComIfGp_setItemNowLife((u8)mNowLifeGauge);
 }
 
-/* 80220180-8022051C 21AAC0 039C+00 1/1 0/0 0/0 .text            moveKantera__9dMeter2_cFv */
 void dMeter2_c::moveKantera() {
     s32 var_r0;
     s32 var_r7;
@@ -802,7 +791,6 @@ void dMeter2_c::moveKantera() {
     dComIfGp_setItemNowOil(mNowOil);
 }
 
-/* 8022051C-80220888 21AE5C 036C+00 1/1 0/0 0/0 .text            moveOxygen__9dMeter2_cFv */
 void dMeter2_c::moveOxygen() {
     s32 var_r0;
     s32 var_r7;
@@ -924,7 +912,6 @@ void dMeter2_c::moveOxygen() {
     dComIfGp_setNowOxygen(mNowOxygen);
 }
 
-/* 80220888-80220C30 21B1C8 03A8+00 1/1 0/0 0/0 .text            moveLightDrop__9dMeter2_cFv */
 void dMeter2_c::moveLightDrop() {
     f32 scale;
     f32 alpha;
@@ -1019,7 +1006,6 @@ void dMeter2_c::moveLightDrop() {
     alphaAnimeLightDrop();
 }
 
-/* 80220C30-802210AC 21B570 047C+00 1/1 0/0 0/0 .text            moveRupee__9dMeter2_cFv */
 void dMeter2_c::moveRupee() {
     s16 temp_r5;
     s16 var_r6;
@@ -1169,7 +1155,6 @@ void dMeter2_c::moveRupee() {
     alphaAnimeRupee();
 }
 
-/* 802210AC-80221244 21B9EC 0198+00 1/1 0/0 0/0 .text            moveKey__9dMeter2_cFv */
 void dMeter2_c::moveKey() {
     s16 var_r5;
     bool draw_key;
@@ -1234,7 +1219,6 @@ void dMeter2_c::moveKey() {
     alphaAnimeKey();
 }
 
-/* 80221244-802217F4 21BB84 05B0+00 1/1 0/0 0/0 .text            moveButtonA__9dMeter2_cFv */
 void dMeter2_c::moveButtonA() {
     f32 var_f31;
     f32 pos_x[2];
@@ -1401,7 +1385,6 @@ void dMeter2_c::moveButtonA() {
     }
 }
 
-/* 802217F4-80221EC8 21C134 06D4+00 1/1 0/0 0/0 .text            moveButtonB__9dMeter2_cFv */
 void dMeter2_c::moveButtonB() {
     f32 var_f31;
     f32 pos_x[2];
@@ -1609,7 +1592,6 @@ void dMeter2_c::moveButtonB() {
     }
 }
 
-/* 80221EC8-80222000 21C808 0138+00 1/1 0/0 0/0 .text            moveButtonR__9dMeter2_cFv */
 void dMeter2_c::moveButtonR() {
     bool var_r7;
     bool draw_buttonR;
@@ -1652,7 +1634,6 @@ void dMeter2_c::moveButtonR() {
     }
 }
 
-/* 80222000-802222A0 21C940 02A0+00 1/1 0/0 0/0 .text            moveButtonZ__9dMeter2_cFv */
 void dMeter2_c::moveButtonZ() {
     bool draw_buttonZ = false;
 
@@ -1746,7 +1727,6 @@ void dMeter2_c::moveButtonZ() {
     }
 }
 
-/* 802222A0-80222364 21CBE0 00C4+00 1/1 0/0 0/0 .text            moveButton3D__9dMeter2_cFv */
 void dMeter2_c::moveButton3D() {
     u8 var_r6;
 
@@ -1771,7 +1751,6 @@ void dMeter2_c::moveButton3D() {
     }
 }
 
-/* 80222364-80222494 21CCA4 0130+00 1/1 0/0 0/0 .text            moveButtonC__9dMeter2_cFv */
 void dMeter2_c::moveButtonC() {
     if (dComIfGp_getCStickStatusForce()) {
         u8 setFlag = dComIfGp_getCStickSetFlagForce();
@@ -1797,7 +1776,6 @@ void dMeter2_c::moveButtonC() {
     mpMeterDraw->drawButtonC(mCStickStatus, field_0x128 == 0);
 }
 
-/* 80222494-80222518 21CDD4 0084+00 1/1 0/0 0/0 .text            moveButtonS__9dMeter2_cFv */
 void dMeter2_c::moveButtonS() {
     if (dComIfGp_getSButtonStatusForce()) {
         u8 setFlag = dComIfGp_getSButtonSetFlagForce();
@@ -1814,7 +1792,6 @@ void dMeter2_c::moveButtonS() {
     }
 }
 
-/* 80222518-80222E88 21CE58 0970+00 1/1 0/0 0/0 .text            moveButtonXY__9dMeter2_cFv */
 void dMeter2_c::moveButtonXY() {
     bool sp8[2];
     bool spC[2];
@@ -2107,7 +2084,6 @@ void dMeter2_c::moveButtonXY() {
     dMeter2Info_resetDirectUseItem();
 }
 
-/* 80222E88-802230F8 21D7C8 0270+00 1/1 0/0 0/0 .text            moveButtonCross__9dMeter2_cFv */
 void dMeter2_c::moveButtonCross() {
     f32 temp_f1;
     f32 temp_f30;
@@ -2190,10 +2166,8 @@ void dMeter2_c::moveButtonCross() {
     alphaAnimeButtonCross();
 }
 
-/* 802230F8-802230FC 21DA38 0004+00 1/1 0/0 0/0 .text            moveTouchSubMenu__9dMeter2_cFv */
 void dMeter2_c::moveTouchSubMenu() {}
 
-/* 802230FC-802231C8 21DA3C 00CC+00 1/1 0/0 0/0 .text            moveSubContents__9dMeter2_cFv */
 void dMeter2_c::moveSubContents() {
     JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap);
     checkSubContents();
@@ -2215,7 +2189,6 @@ void dMeter2_c::moveSubContents() {
     mDoExt_setCurrentHeap(heap);
 }
 
-/* 802231C8-802237D4 21DB08 060C+00 1/1 0/0 0/0 .text            move2DContents__9dMeter2_cFv */
 void dMeter2_c::move2DContents() {
     bool var_r19;
     bool var_r27;
@@ -2360,7 +2333,6 @@ void dMeter2_c::move2DContents() {
     }
 }
 
-/* 802237D4-80223BC4 21E114 03F0+00 1/1 0/0 0/0 .text            checkSubContents__9dMeter2_cFv */
 void dMeter2_c::checkSubContents() {
     if (mStatus & 0x80) {
         killSubContents(4);
@@ -2456,7 +2428,6 @@ void dMeter2_c::checkSubContents() {
     }
 }
 
-/* 80223BC4-80223E00 21E504 023C+00 1/1 0/0 0/0 .text            check2DContents__9dMeter2_cFv */
 void dMeter2_c::check2DContents() {
     if (mpEmpButton == NULL) {
         if ((dComIfGp_isHeapLockFlag() == 0 || dComIfGp_isHeapLockFlag() == 5) &&
@@ -2496,7 +2467,6 @@ void dMeter2_c::check2DContents() {
     }
 }
 
-/* 80223E00-80224258 21E740 0458+00 1/1 0/0 0/0 .text            moveBombNum__9dMeter2_cFv */
 void dMeter2_c::moveBombNum() {
     u8 temp_r28;
     u8 temp_r31;
@@ -2596,7 +2566,6 @@ void dMeter2_c::moveBombNum() {
     }
 }
 
-/* 80224258-80224354 21EB98 00FC+00 1/1 0/0 0/0 .text            moveBottleNum__9dMeter2_cFv */
 void dMeter2_c::moveBottleNum() {
     for (int i = 0; i < 4; i++) {
         if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_BEE_CHILD) {
@@ -2613,7 +2582,6 @@ void dMeter2_c::moveBottleNum() {
     }
 }
 
-/* 80224354-80224680 21EC94 032C+00 1/1 0/0 0/0 .text            moveArrowNum__9dMeter2_cFv */
 void dMeter2_c::moveArrowNum() {
     s16 var_r6;
     int var_r28;
@@ -2700,7 +2668,6 @@ void dMeter2_c::moveArrowNum() {
     }
 }
 
-/* 80224680-802248E4 21EFC0 0264+00 1/1 0/0 0/0 .text            movePachinkoNum__9dMeter2_cFv */
 void dMeter2_c::movePachinkoNum() {
     if (g_mwHIO.getPachinkoFlag()) {
         if (dComIfGs_getPachinkoNum() != dComIfGs_getPachinkoMax()) {
@@ -2763,7 +2730,6 @@ void dMeter2_c::movePachinkoNum() {
     }
 }
 
-/* 802248E4-80224A04 21F224 0120+00 1/1 0/0 0/0 .text            alphaAnimeLife__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeLife() {
     if ((mStatus & 0x4000) ||
         ((mStatus & 0x40) && dComIfGp_event_checkHind(0x10) &&
@@ -2782,7 +2748,6 @@ void dMeter2_c::alphaAnimeLife() {
     mpMeterDraw->setAlphaLifeChange(false);
 }
 
-/* 80224A04-80224BAC 21F344 01A8+00 1/1 0/0 0/0 .text            alphaAnimeKantera__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeKantera() {
     if (dComIfGs_getMaxOil() == 0 || dComIfGs_getItem(SLOT_1, true) != fpcNm_ITEM_KANTERA ||
         !daPy_getPlayerActorClass()->checkUseKandelaar(0) || (mStatus & 0x4000) ||
@@ -2802,7 +2767,6 @@ void dMeter2_c::alphaAnimeKantera() {
     mpMeterDraw->setAlphaKanteraChange(true);
 }
 
-/* 80224BAC-80224D6C 21F4EC 01C0+00 1/1 0/0 0/0 .text            alphaAnimeOxygen__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeOxygen() {
     if (!dComIfGp_getOxygenShowFlag() || (mStatus & 0x4000) ||
         ((mStatus & 0x40) && dComIfGp_event_checkHind(0x800)) ||
@@ -2834,8 +2798,6 @@ void dMeter2_c::alphaAnimeOxygen() {
     mpMeterDraw->setAlphaOxygenChange(false);
 }
 
-/* 80224D6C-80224DC0 21F6AC 0054+00 1/1 0/0 0/0 .text            alphaAnimeLightDrop__9dMeter2_cFv
- */
 void dMeter2_c::alphaAnimeLightDrop() {
     if (!isShowLightDrop()) {
         mpMeterDraw->setAlphaLightDropAnimeMin();
@@ -2847,7 +2809,6 @@ void dMeter2_c::alphaAnimeLightDrop() {
 }
 
 
-/* 80224DC0-80224F70 21F700 01B0+00 1/1 0/0 0/0 .text            alphaAnimeRupee__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeRupee() {
     if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x80)) ||
         daPy_getPlayerActorClass()->getSumouMode() ||
@@ -2867,7 +2828,6 @@ void dMeter2_c::alphaAnimeRupee() {
     mpMeterDraw->setAlphaRupeeChange(false);
 }
 
-/* 80224F70-802250F4 21F8B0 0184+00 1/1 0/0 0/0 .text            alphaAnimeKey__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeKey() {
     if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x40)) ||
         !isKeyVisible() || (mStatus & 0x40000000) || (mStatus & 0x1000) || (mStatus & 0x100000) ||
@@ -2886,7 +2846,6 @@ void dMeter2_c::alphaAnimeKey() {
     mpMeterDraw->setAlphaKeyChange(false);
 }
 
-/* 802250F4-802254C0 21FA34 03CC+00 1/1 0/0 0/0 .text            alphaAnimeButton__9dMeter2_cFv */
 void dMeter2_c::alphaAnimeButton() {
     u8 var_31;
     var_31 = 0;
@@ -2970,8 +2929,6 @@ void dMeter2_c::alphaAnimeButton() {
     mpMeterDraw->setAlphaButtonChange(false);
 }
 
-/* 802254C0-802256DC 21FE00 021C+00 1/1 0/0 0/0 .text            alphaAnimeButtonCross__9dMeter2_cFv
- */
 void dMeter2_c::alphaAnimeButtonCross() {
     if ((mStatus & 0x4000) || ((mStatus & 0x40) && dComIfGp_event_checkHind(0x100)) ||
         ((daPy_getPlayerActorClass()->getSumouMode() != 0) || (mStatus & 0x100) ||
@@ -3008,7 +2965,6 @@ void dMeter2_c::alphaAnimeButtonCross() {
     }
 }
 
-/* 802256DC-802258A0 22001C 01C4+00 3/3 0/0 0/0 .text            isShowLightDrop__9dMeter2_cFv */
 bool dMeter2_c::isShowLightDrop() {
     if (!g_drawHIO.mLightDrop.mAnimDebug) {
         if ((mStatus & 0x4000) || !dComIfGs_isLightDropGetFlag(dComIfGp_getStartStageDarkArea()) ||
@@ -3030,7 +2986,6 @@ bool dMeter2_c::isShowLightDrop() {
     return true;
 }
 
-/* 802258A0-80225960 2201E0 00C0+00 1/1 0/0 0/0 .text            killSubContents__9dMeter2_cFUc */
 void dMeter2_c::killSubContents(u8 param_0) {
     if (mSubContentType != param_0 && mSubContentType != 0) {
         bool free = false;
@@ -3056,7 +3011,6 @@ void dMeter2_c::killSubContents(u8 param_0) {
     }
 }
 
-/* 80225960-802259F8 2202A0 0098+00 1/1 0/0 0/0 .text            isKeyVisible__9dMeter2_cFv */
 u8 dMeter2_c::isKeyVisible() {
     if (dStage_stagInfo_ChkKeyDisp(dComIfGp_getStage()->getStagInfo())) {
         if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_FIELD) {
@@ -3069,7 +3023,6 @@ u8 dMeter2_c::isKeyVisible() {
     return false;
 }
 
-/* 802259F8-80225A64 220338 006C+00 2/2 0/0 0/0 .text            isArrowEquip__9dMeter2_cFv */
 int dMeter2_c::isArrowEquip() {
     for (int i = 0; i < 2; i++) {
         if (mItemStatus[i * 2] == fpcNm_ITEM_BOW || mItemStatus[i * 2] == fpcNm_ITEM_LIGHT_ARROW ||
@@ -3083,7 +3036,6 @@ int dMeter2_c::isArrowEquip() {
     return 0;
 }
 
-/* 80225A64-80225AA0 2203A4 003C+00 2/2 0/0 0/0 .text            isPachinkoEquip__9dMeter2_cFv */
 int dMeter2_c::isPachinkoEquip() {
     for (int i = 0; i < 2; i++) {
         if (mItemStatus[i * 2] == fpcNm_ITEM_PACHINKO) {
@@ -3094,27 +3046,22 @@ int dMeter2_c::isPachinkoEquip() {
     return 0;
 }
 
-/* 80225AA0-80225AC0 2203E0 0020+00 1/0 0/0 0/0 .text            dMeter2_Draw__FP9dMeter2_c */
 static int dMeter2_Draw(dMeter2_c* i_this) {
     return i_this->_draw();
 }
 
-/* 80225AC0-80225AE0 220400 0020+00 1/0 0/0 0/0 .text            dMeter2_Execute__FP9dMeter2_c */
 static int dMeter2_Execute(dMeter2_c* i_this) {
     return i_this->_execute();
 }
 
-/* 80225AE0-80225AE8 220420 0008+00 1/0 0/0 0/0 .text            dMeter2_IsDelete__FP9dMeter2_c */
 static int dMeter2_IsDelete(dMeter2_c* i_this) {
     return 1;
 }
 
-/* 80225AE8-80225B08 220428 0020+00 1/0 0/0 0/0 .text            dMeter2_Delete__FP9dMeter2_c */
 static int dMeter2_Delete(dMeter2_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80225B08-80225BB8 220448 00B0+00 1/0 0/0 0/0 .text            dMeter2_Create__FP9msg_class */
 static int dMeter2_Create(msg_class* i_this) {
     dMeter2Info_setMeterClass(static_cast<dMeter2_c*>(i_this));
     dComIfGp_2dShowOn();
@@ -3134,16 +3081,13 @@ static int dMeter2_Create(msg_class* i_this) {
     return static_cast<dMeter2_c*>(i_this)->_create();
 }
 
-/* ############################################################################################## */
-/* 803BFA54-803BFA68 -00001 0014+00 1/0 0/0 0/0 .data            l_dMeter2_Method */
-SECTION_DATA static leafdraw_method_class l_dMeter2_Method = {
+static leafdraw_method_class l_dMeter2_Method = {
     (process_method_func)dMeter2_Create,  (process_method_func)dMeter2_Delete,
     (process_method_func)dMeter2_Execute, (process_method_func)dMeter2_IsDelete,
     (process_method_func)dMeter2_Draw,
 };
 
-/* 803BFA68-803BFA90 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_METER2 */
-SECTION_DATA extern msg_process_profile_definition g_profile_METER2 = {
+extern msg_process_profile_definition g_profile_METER2 = {
     -3,
     12,
     -3,
diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp
index b11cc6c327..e953a2cbd2 100644
--- a/src/d/d_meter2_draw.cpp
+++ b/src/d/d_meter2_draw.cpp
@@ -22,8 +22,6 @@
 #include "d/d_pane_class.h"
 #include "cstring.h"
 
-/* 8020FAB4-802102F8 20A3F4 0844+00 0/0 1/1 0/0 .text            __ct__13dMeter2Draw_cFP10JKRExpHeap
- */
 dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n");
 
@@ -148,7 +146,6 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) {
     OS_REPORT("exit dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n");
 }
 
-/* 802102F8-80210FB0 20AC38 0CB8+00 1/0 0/0 0/0 .text            __dt__13dMeter2Draw_cFv */
 dMeter2Draw_c::~dMeter2Draw_c() {
     dComIfGp_getMsgDtArchive(0)->removeResource(dMeter2Info_getMsgResource());
     dComIfGp_getMsgDtArchive(0)->removeResource(dMeter2Info_getMsgUnitResource());
@@ -405,7 +402,6 @@ dMeter2Draw_c::~dMeter2Draw_c() {
     }
 }
 
-/* 80210FB0-8021135C 20B8F0 03AC+00 1/1 0/0 0/0 .text            init__13dMeter2Draw_cFv */
 void dMeter2Draw_c::init() {
     field_0x608 = 0.0f;
     field_0x60c = 0.0f;
@@ -538,7 +534,6 @@ void dMeter2Draw_c::init() {
     field_0x772 = 0;
 }
 
-/* 8021135C-8021151C 20BC9C 01C0+00 0/0 1/1 0/0 .text            exec__13dMeter2Draw_cFUl */
 void dMeter2Draw_c::exec(u32 i_status) {
     if (mParentScale != g_drawHIO.mParentScale) {
         mParentScale = g_drawHIO.mParentScale;
@@ -579,7 +574,6 @@ void dMeter2Draw_c::exec(u32 i_status) {
     }
 }
 
-/* 8021151C-80211BEC 20BE5C 06D0+00 1/0 0/0 0/0 .text            draw__13dMeter2Draw_cFv */
 void dMeter2Draw_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
@@ -718,7 +712,6 @@ void dMeter2Draw_c::draw() {
     }
 }
 
-/* 80211BEC-80211E64 20C52C 0278+00 1/1 0/0 0/0 .text            initLife__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initLife() {
     if (dComIfGs_getLife() > dComIfGs_getMaxLifeGauge()) {
         // "●●●●●●Heart Count adjust======>%d, %d\n"
@@ -794,7 +787,6 @@ void dMeter2Draw_c::initLife() {
     setAlphaLifeChange(true);
 }
 
-/* 80211E64-80212190 20C7A4 032C+00 1/1 0/0 0/0 .text            initMagic__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initMagic() {
     field_0x550 = 0.0f;
     field_0x554 = 0.0f;
@@ -858,7 +850,6 @@ void dMeter2Draw_c::initMagic() {
     setAlphaKanteraChange(true);
 }
 
-/* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text            initLightDrop__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initLightDrop() {
     mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL);
     JUT_ASSERT(0, mpLightDropParent != NULL);
@@ -915,7 +906,6 @@ void dMeter2Draw_c::initLightDrop() {
     setAlphaLightDropChange(true);
 }
 
-/* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text            initRupeeKey__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initRupeeKey() {
     mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL);
     JUT_ASSERT(0, mpRupeeKeyParent != NULL);
@@ -966,7 +956,6 @@ void dMeter2Draw_c::initRupeeKey() {
     setAlphaKeyChange(true);
 }
 
-/* 802126E4-8021350C 20D024 0E28+00 1/1 0/0 0/0 .text            initButton__13dMeter2Draw_cFv */
 void dMeter2Draw_c::initButton() {
     field_0x761 = 1;
     field_0x762 = 1;
@@ -1218,8 +1207,6 @@ void dMeter2Draw_c::initButton() {
     mpButtonParent->setAlphaRate(0.0f);
 }
 
-/* 8021350C-80213CEC 20DE4C 07E0+00 1/1 0/0 0/0 .text            initButtonCross__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::initButtonCross() {
     mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL);
     JUT_ASSERT(0, mpButtonCrossParent != NULL);
@@ -1274,7 +1261,6 @@ void dMeter2Draw_c::initButtonCross() {
     drawButtonCross(g_drawHIO.mButtonCrossOFFPosX, g_drawHIO.mButtonCrossOFFPosY);
 }
 
-/* 80213CEC-80213D6C 20E62C 0080+00 3/3 0/0 0/0 .text playPikariBckAnimation__13dMeter2Draw_cFf */
 void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) {
     mpPikariParent->getPanePtr()->setAnimation(mPikariBck);
     mPikariBck->setFrame(i_frame);
@@ -1282,15 +1268,12 @@ void dMeter2Draw_c::playPikariBckAnimation(f32 i_frame) {
     mpPikariParent->getPanePtr()->setAnimation((J2DAnmTransformKey*)NULL);
 }
 
-/* 80213D6C-80213E3C 20E6AC 00D0+00 1/1 0/0 0/0 .text
- * setPikariBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor        */
 void dMeter2Draw_c::setPikariBpkAnimation(J2DAnmColor* i_bpk) {
     mpPikariScreen->search('pika00')->setAnimation(i_bpk);
     mpPikariScreen->search('moya00')->setAnimation(i_bpk);
     mpPikariScreen->search('moyabs')->setAnimation(i_bpk);
 }
 
-/* 80213E3C-80213E94 20E77C 0058+00 3/3 0/0 0/0 .text playPikariBpkAnimation__13dMeter2Draw_cFf */
 void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) {
     setPikariBpkAnimation(mPikariBpk);
     mPikariBpk->setFrame(i_frame);
@@ -1298,8 +1281,6 @@ void dMeter2Draw_c::playPikariBpkAnimation(f32 i_frame) {
     setPikariBpkAnimation(NULL);
 }
 
-/* 80213E94-80213FF0 20E7D4 015C+00 1/1 0/0 0/0 .text
- * playOxygenBpkAnimation__13dMeter2Draw_cFP11J2DAnmColor       */
 void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) {
     if (i_bpk == NULL || mpMagicMeter->getAlpha() == 0) {
         mpKanteraScreen->search('mm_00')->setAnimation((J2DAnmColor*)NULL);
@@ -1426,7 +1407,6 @@ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i
     mpPikariScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
 
-/* 802147CC-802149F4 20F10C 0228+00 1/1 0/0 0/0 .text changeTextureLife__13dMeter2Draw_cFibUc */
 void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) {
     if (param_1) {
         if (i_quarterNum == 0xFF) {
@@ -1460,7 +1440,6 @@ void dMeter2Draw_c::changeTextureLife(int i_no, bool param_1, u8 i_quarterNum) {
     }
 }
 
-/* 802149F4-80214C20 20F334 022C+00 1/1 1/1 0/0 .text            drawLife__13dMeter2Draw_cFssff */
 void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY) {
     s16 max_heart_cnt = i_maxLife / 5;
     s16 heart_cnt = i_life / 4;
@@ -1509,7 +1488,6 @@ void dMeter2Draw_c::drawLife(s16 i_maxLife, s16 i_life, f32 i_posX, f32 i_posY)
     mpLifeParent->paneTrans(i_posX, i_posY);
 }
 
-/* 80214C20-80214DF4 20F560 01D4+00 1/1 1/1 0/0 .text setAlphaLifeChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaLifeChange(bool param_0) {
     bool var_r31 = false;
     bool var_r30 = false;
@@ -1558,7 +1536,6 @@ void dMeter2Draw_c::setAlphaLifeChange(bool param_0) {
     }
 }
 
-/* 80214DF4-80214E54 20F734 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMin__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaLifeAnimeMin() {
     if (mpLifeParent->getAlphaRate() != 0.0f) {
         mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha);
@@ -1566,7 +1543,6 @@ void dMeter2Draw_c::setAlphaLifeAnimeMin() {
     }
 }
 
-/* 80214E54-80214EB4 20F794 0060+00 0/0 1/1 0/0 .text setAlphaLifeAnimeMax__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaLifeAnimeMax() {
     if (mpLifeParent->getAlphaRate() != g_drawHIO.mParentAlpha) {
         mpLifeParent->setAlphaRate(g_drawHIO.mParentAlpha);
@@ -1574,7 +1550,6 @@ void dMeter2Draw_c::setAlphaLifeAnimeMax() {
     }
 }
 
-/* 80214EB4-80215290 20F7F4 03DC+00 1/1 0/0 0/0 .text drawKanteraScreen__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
 
@@ -1627,7 +1602,6 @@ void dMeter2Draw_c::drawKanteraScreen(u8 i_meterType) {
     mpKanteraScreen->draw(0.0f, 0.0f, graf_ctx);
 }
 
-/* 80215290-80215380 20FBD0 00F0+00 1/1 0/0 0/0 .text            drawMagic__13dMeter2Draw_cFssff */
 void dMeter2Draw_c::drawMagic(s16 i_max, s16 i_magic, f32 i_posX, f32 i_posY) {
     f32 temp_f30 = mpMagicFrameL->getInitPosX();
     f32 temp_f31 = mpMagicFrameR->getInitPosX() - temp_f30;
@@ -1648,7 +1622,6 @@ void dMeter2Draw_c::drawMagic(s16 i_max, s16 i_magic, f32 i_posX, f32 i_posY) {
     field_0x5f0[0] = i_posY;
 }
 
-/* 80215380-802154A8 20FCC0 0128+00 2/2 0/0 0/0 .text setAlphaMagicChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaMagicChange(bool i_forceSet) {
     bool meter_parent_alpha_set = false;
     bool meter_alpha_set = false;
@@ -1684,8 +1657,6 @@ static f32 dummyLiteralOrder() {
     return 5.0f;
 }
 
-/* 802154A8-802155B8 20FDE8 0110+00 1/1 1/1 0/0 .text            drawKantera__13dMeter2Draw_cFllff
- */
 void dMeter2Draw_c::drawKantera(s32 i_max, s32 i_oil, f32 i_posX, f32 i_posY) {
     f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX();
     f32 var_f7 = 0.0f;
@@ -1708,7 +1679,6 @@ void dMeter2Draw_c::drawKantera(s32 i_max, s32 i_oil, f32 i_posX, f32 i_posY) {
     field_0x5f0[1] = i_posY;
 }
 
-/* 802155B8-802156E0 20FEF8 0128+00 2/2 1/1 0/0 .text setAlphaKanteraChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) {
     bool meter_parent_alpha_set = false;
     bool meter_alpha_set = false;
@@ -1739,8 +1709,6 @@ void dMeter2Draw_c::setAlphaKanteraChange(bool i_forceSet) {
     }
 }
 
-/* 802156E0-8021575C 210020 007C+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMin__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaKanteraAnimeMin() {
     if (field_0x742[1] <= 0) {
         mMeterAlphaRate[1] = 0.0f;
@@ -1754,8 +1722,6 @@ void dMeter2Draw_c::setAlphaKanteraAnimeMin() {
     }
 }
 
-/* 8021575C-802157E0 21009C 0084+00 0/0 1/1 0/0 .text setAlphaKanteraAnimeMax__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaKanteraAnimeMax() {
     if (field_0x742[1] >= 5) {
         mMeterAlphaRate[1] = g_drawHIO.mParentAlpha;
@@ -1769,7 +1735,6 @@ void dMeter2Draw_c::setAlphaKanteraAnimeMax() {
     }
 }
 
-/* 802157E0-802158F0 210120 0110+00 0/0 1/1 0/0 .text            drawOxygen__13dMeter2Draw_cFllff */
 void dMeter2Draw_c::drawOxygen(s32 i_max, s32 i_oxygen, f32 i_posX, f32 i_posY) {
     f32 var_f6 = mpMagicFrameR->getInitPosX() - mpMagicFrameL->getInitPosX();
     f32 var_f7 = 0.0f;
@@ -1792,7 +1757,6 @@ void dMeter2Draw_c::drawOxygen(s32 i_max, s32 i_oxygen, f32 i_posX, f32 i_posY)
     field_0x5f0[2] = i_posY;
 }
 
-/* 802158F0-80215A18 210230 0128+00 1/1 1/1 0/0 .text setAlphaOxygenChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) {
     bool meter_parent_alpha_set = false;
     bool meter_alpha_set = false;
@@ -1823,7 +1787,6 @@ void dMeter2Draw_c::setAlphaOxygenChange(bool i_forceSet) {
     }
 }
 
-/* 80215A18-80215A94 210358 007C+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMin__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaOxygenAnimeMin() {
     if (field_0x742[2] <= 0) {
         mMeterAlphaRate[2] = 0.0f;
@@ -1837,7 +1800,6 @@ void dMeter2Draw_c::setAlphaOxygenAnimeMin() {
     }
 }
 
-/* 80215A94-80215B18 2103D4 0084+00 0/0 1/1 0/0 .text setAlphaOxygenAnimeMax__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaOxygenAnimeMax() {
     if (field_0x742[2] >= 5) {
         mMeterAlphaRate[2] = g_drawHIO.mParentAlpha;
@@ -1851,7 +1813,6 @@ void dMeter2Draw_c::setAlphaOxygenAnimeMax() {
     }
 }
 
-/* 80215B18-80215DA4 210458 028C+00 1/1 1/1 0/0 .text drawLightDrop__13dMeter2Draw_cFUcUcffffUc */
 void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY, f32 i_vesselScale,
                                   f32 param_5, u8 param_6) {
     for (int i = 0; i < 16; i++) {
@@ -1905,12 +1866,8 @@ void dMeter2Draw_c::drawLightDrop(u8 i_num, u8 i_needNum, f32 i_posX, f32 i_posY
     mpLightDropParent->paneTrans(i_posX, i_posY);
 }
 
-/* 80215DA4-80215DA8 2106E4 0004+00 1/1 1/1 0/0 .text setAlphaLightDropChange__13dMeter2Draw_cFb
- */
 void dMeter2Draw_c::setAlphaLightDropChange(bool unused) {}
 
-/* 80215DA8-80215E40 2106E8 0098+00 0/0 1/1 0/0 .text getNowLightDropRateCalc__13dMeter2Draw_cFv
- */
 f32 dMeter2Draw_c::getNowLightDropRateCalc() {
     f32 drop_num = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea());
     f32 need_drop_num = dComIfGp_getNeedLightDropNum();
@@ -1927,8 +1884,6 @@ f32 dMeter2Draw_c::getNowLightDropRateCalc() {
     return rate;
 }
 
-/* 80215E40-80215F88 210780 0148+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMin__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaLightDropAnimeMin() {
     if (mpLightDropParent->getAlphaRate() != 0.0f) {
         mpLightDropParent->setAlphaRate(g_drawHIO.mParentAlpha * field_0x6fc);
@@ -1951,8 +1906,6 @@ void dMeter2Draw_c::setAlphaLightDropAnimeMin() {
     }
 }
 
-/* 80215F88-8021632C 2108C8 03A4+00 0/0 1/1 0/0 .text setAlphaLightDropAnimeMax__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaLightDropAnimeMax() {
     f32 temp_f31 = g_drawHIO.mParentAlpha * field_0x6fc;
 
@@ -2018,7 +1971,6 @@ void dMeter2Draw_c::setAlphaLightDropAnimeMax() {
     }
 }
 
-/* 8021632C-80216684 210C6C 0358+00 1/1 1/1 0/0 .text            drawRupee__13dMeter2Draw_cFs */
 void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) {
     mpRupeeTexture[3][0]->hide();
     mpRupeeTexture[3][1]->hide();
@@ -2077,7 +2029,6 @@ void dMeter2Draw_c::drawRupee(s16 i_rupeeNum) {
     }
 }
 
-/* 80216684-802168D0 210FC4 024C+00 1/1 1/1 0/0 .text setAlphaRupeeChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) {
     bool set_parent = false;
     bool set_rupeekey = false;
@@ -2133,7 +2084,6 @@ void dMeter2Draw_c::setAlphaRupeeChange(bool param_0) {
     }
 }
 
-/* 802168D0-80216990 211210 00C0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMin__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaRupeeAnimeMin() {
     f32 alphas[3];
     alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha);
@@ -2148,7 +2098,6 @@ void dMeter2Draw_c::setAlphaRupeeAnimeMin() {
     }
 }
 
-/* 80216990-80216A40 2112D0 00B0+00 0/0 1/1 0/0 .text setAlphaRupeeAnimeMax__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaRupeeAnimeMax() {
     f32 alphas[3];
     alphas[0] = g_drawHIO.mRupeeAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha);
@@ -2163,7 +2112,6 @@ void dMeter2Draw_c::setAlphaRupeeAnimeMax() {
     }
 }
 
-/* 80216A40-80216B28 211380 00E8+00 1/1 1/1 0/0 .text            drawKey__13dMeter2Draw_cFs */
 void dMeter2Draw_c::drawKey(s16 i_keyNum) {
     if (i_keyNum > 5) {
         i_keyNum = 5;
@@ -2185,7 +2133,6 @@ void dMeter2Draw_c::drawKey(s16 i_keyNum) {
     mpKeyParent->paneTrans(g_drawHIO.mKeyPosX, g_drawHIO.mKeyPosY);
 }
 
-/* 80216B28-80216CA8 211468 0180+00 1/1 1/1 0/0 .text setAlphaKeyChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaKeyChange(bool param_0) {
     bool set_parent = false;
     bool set_rupeekey = false;
@@ -2223,7 +2170,6 @@ void dMeter2Draw_c::setAlphaKeyChange(bool param_0) {
     }
 }
 
-/* 80216CA8-80216D2C 2115E8 0084+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMin__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaKeyAnimeMin() {
     f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha);
 
@@ -2233,7 +2179,6 @@ void dMeter2Draw_c::setAlphaKeyAnimeMin() {
     }
 }
 
-/* 80216D2C-80216DAC 21166C 0080+00 0/0 1/1 0/0 .text setAlphaKeyAnimeMax__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaKeyAnimeMax() {
     f32 alpha = g_drawHIO.mKeyAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mRupeeKeyAlpha);
 
@@ -2243,7 +2188,6 @@ void dMeter2Draw_c::setAlphaKeyAnimeMax() {
     }
 }
 
-/* 80216DAC-802170E4 2116EC 0338+00 1/1 1/1 0/0 .text drawButtonA__13dMeter2Draw_cFUcfffffbb */
 void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textPosX, f32 i_textPosY,
                                 f32 i_scale, bool param_6, bool param_7) {
     char* mp_string = getActionString(i_action, 1, &field_0x761);
@@ -2308,7 +2252,6 @@ void dMeter2Draw_c::drawButtonA(u8 i_action, f32 i_posX, f32 i_posY, f32 i_textP
                        g_drawHIO.mButtonATextPosY + i_textPosY);
 }
 
-/* 802170E4-8021764C 211A24 0568+00 1/1 1/1 0/0 .text drawButtonB__13dMeter2Draw_cFUcbfffffb */
 void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_posY, f32 i_textPosX,
                                 f32 i_textPosY, f32 i_scale, bool param_7) {
     int var_r31 = 0;
@@ -2409,8 +2352,6 @@ void dMeter2Draw_c::drawButtonB(u8 i_action, bool param_1, f32 i_posX, f32 i_pos
                        g_drawHIO.mButtonBFontPosY + i_textPosY);
 }
 
-/* 8021764C-802176EC 211F8C 00A0+00 1/1 1/1 0/0 .text            drawButtonR__13dMeter2Draw_cFUcUcbb
- */
 void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unused2) {
     mpScreen->search('item_r_n')->hide();
     mpTextXY[2]->show();
@@ -2421,7 +2362,6 @@ void dMeter2Draw_c::drawButtonR(u8 unused0, u8 i_action, bool unused1, bool unus
     }
 }
 
-/* 802176EC-80217904 21202C 0218+00 1/1 1/1 0/0 .text            drawButtonZ__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::drawButtonZ(u8 i_action) {
     char* mp_string = getActionString(i_action, 1, &field_0x764);
 
@@ -2460,7 +2400,6 @@ void dMeter2Draw_c::drawButtonZ(u8 i_action) {
     mpTextXY[2]->paneTrans(g_drawHIO.mButtonZFontPosX, g_drawHIO.mButtonZFontPosY);
 }
 
-/* 80217904-80217954 212244 0050+00 1/1 1/1 0/0 .text            drawButton3D__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::drawButton3D(u8 i_action) {
     getActionString(i_action, 1, &field_0x765);
     if (i_action != 0) {
@@ -2468,7 +2407,6 @@ void dMeter2Draw_c::drawButton3D(u8 i_action) {
     }
 }
 
-/* 80217954-802179C0 212294 006C+00 1/1 1/1 0/0 .text            drawButtonC__13dMeter2Draw_cFUcb */
 void dMeter2Draw_c::drawButtonC(u8 i_action, bool unused) {
     getActionString(i_action, 1, &field_0x766);
     if (i_action != 0 && (dComIfGp_isCStickSetFlag(2) & 1 || dComIfGp_isCStickSetFlag(4))) {
@@ -2476,7 +2414,6 @@ void dMeter2Draw_c::drawButtonC(u8 i_action, bool unused) {
     }
 }
 
-/* 802179C0-80217A10 212300 0050+00 1/1 1/1 0/0 .text            drawButtonS__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::drawButtonS(u8 i_action) {
     getActionString(i_action, 1, &field_0x767);
     if (i_action != 0) {
@@ -2484,8 +2421,6 @@ void dMeter2Draw_c::drawButtonS(u8 i_action) {
     }
 }
 
-/* 80217A10-80217AB4 212350 00A4+00 0/0 1/1 0/0 .text            drawButtonBin__13dMeter2Draw_cFUc
- */
 void dMeter2Draw_c::drawButtonBin(u8 i_action) {
     int bottle_num = 0;
     for (int i = 0; i < 4; i++) {
@@ -2502,7 +2437,6 @@ void dMeter2Draw_c::drawButtonBin(u8 i_action) {
     }
 }
 
-/* 80217AB4-80218238 2123F4 0784+00 1/1 1/1 0/0 .text drawButtonXY__13dMeter2Draw_cFiUcUcbb */
 void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_3, bool param_4) {
     JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
@@ -2649,14 +2583,10 @@ void dMeter2Draw_c::drawButtonXY(int i_no, u8 i_itemNo, u8 i_action, bool param_
     }
 }
 
-/* 80218238-80218254 212B78 001C+00 0/0 1/1 0/0 .text
- * getButtonCrossParentInitTransY__13dMeter2Draw_cFv            */
 f32 dMeter2Draw_c::getButtonCrossParentInitTransY() {
     return mpButtonCrossParent->getInitCenterPosY();
 }
 
-/* 80218254-80218338 212B94 00E4+00 1/1 1/1 0/0 .text            drawButtonCross__13dMeter2Draw_cFff
- */
 void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
     mpButtonCrossParent->scale(g_drawHIO.mButtonCrossScale, g_drawHIO.mButtonCrossScale);
     mpTextI->scale(g_drawHIO.mButtonCrossTextScale, g_drawHIO.mButtonCrossTextScale);
@@ -2664,8 +2594,6 @@ void dMeter2Draw_c::drawButtonCross(f32 i_posX, f32 i_posY) {
     mpButtonCrossParent->paneTrans(i_posX, i_posY);
 }
 
-/* 80218338-802183A8 212C78 0070+00 0/0 1/1 0/0 .text
- * setAlphaButtonCrossAnimeMin__13dMeter2Draw_cFv               */
 void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() {
     if (mpButtonCrossParent->getAlphaRate() != 0.0f) {
         mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
@@ -2676,8 +2604,6 @@ void dMeter2Draw_c::setAlphaButtonCrossAnimeMin() {
     setAlphaButtonCrossMapAnimeMin();
 }
 
-/* 802183A8-80218448 212CE8 00A0+00 0/0 1/1 0/0 .text
- * setAlphaButtonCrossAnimeMax__13dMeter2Draw_cFv               */
 void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() {
     if (g_drawHIO.mParentAlpha != mpButtonCrossParent->getAlphaRate()) {
         mpButtonCrossParent->setAlphaRate(g_drawHIO.mParentAlpha);
@@ -2697,8 +2623,6 @@ void dMeter2Draw_c::setAlphaButtonCrossAnimeMax() {
     }
 }
 
-/* 80218448-80218524 212D88 00DC+00 2/2 0/0 0/0 .text
- * setAlphaButtonCrossItemAnimeMin__13dMeter2Draw_cFv           */
 void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() {
     if (mpTextI->getAlphaRate() != 0.0f) {
         mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
@@ -2713,8 +2637,6 @@ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMin() {
     }
 }
 
-/* 80218524-802185E8 212E64 00C4+00 1/1 0/0 0/0 .text
- * setAlphaButtonCrossItemAnimeMax__13dMeter2Draw_cFv           */
 void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() {
     if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha != mpTextI->getAlphaRate()) {
         mpTextI->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossITEMAlpha);
@@ -2729,8 +2651,6 @@ void dMeter2Draw_c::setAlphaButtonCrossItemAnimeMax() {
     }
 }
 
-/* 802185E8-802186C4 212F28 00DC+00 2/2 0/0 0/0 .text
- * setAlphaButtonCrossMapAnimeMin__13dMeter2Draw_cFv            */
 void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() {
     if (mpTextM->getAlphaRate() != 0.0f) {
         mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
@@ -2745,8 +2665,6 @@ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMin() {
     }
 }
 
-/* 802186C4-80218788 213004 00C4+00 1/1 0/0 0/0 .text
- * setAlphaButtonCrossMapAnimeMax__13dMeter2Draw_cFv            */
 void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() {
     if (g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha != mpTextM->getAlphaRate()) {
         mpTextM->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mButtonCrossMAPAlpha);
@@ -2761,7 +2679,6 @@ void dMeter2Draw_c::setAlphaButtonCrossMapAnimeMax() {
     }
 }
 
-/* 80218788-8021901C 2130C8 0894+00 1/1 1/1 0/0 .text setAlphaButtonChange__13dMeter2Draw_cFb */
 void dMeter2Draw_c::setAlphaButtonChange(bool param_0) {
     bool set_parent = false;
     bool set_buttonA = false;
@@ -2960,7 +2877,6 @@ void dMeter2Draw_c::setAlphaButtonChange(bool param_0) {
     }
 }
 
-/* 8021901C-802190A8 21395C 008C+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMin__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaButtonAnimeMin() {
     if (mpButtonParent->getAlphaRate() != 0.0f) {
         mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
@@ -2972,7 +2888,6 @@ void dMeter2Draw_c::setAlphaButtonAnimeMin() {
     }
 }
 
-/* 802190A8-80219174 2139E8 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAnimeMax__13dMeter2Draw_cFv */
 void dMeter2Draw_c::setAlphaButtonAnimeMax() {
     if (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha != mpButtonParent->getAlphaRate()) {
         mpButtonParent->setAlphaRate(g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha);
@@ -2990,8 +2905,6 @@ void dMeter2Draw_c::setAlphaButtonAnimeMax() {
     }
 }
 
-/* 80219174-80219258 213AB4 00E4+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMin__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaButtonAAnimeMin() {
     if (mpButtonA->getAlphaRate() != 0.0f) {
         mpButtonA->setAlphaRate(g_drawHIO.mButtonAAlpha *
@@ -3007,8 +2920,6 @@ void dMeter2Draw_c::setAlphaButtonAAnimeMin() {
     }
 }
 
-/* 80219258-80219324 213B98 00CC+00 0/0 1/1 0/0 .text setAlphaButtonAAnimeMax__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaButtonAAnimeMax() {
     if (g_drawHIO.mButtonAAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha) !=
         mpButtonA->getAlphaRate())
@@ -3026,8 +2937,6 @@ void dMeter2Draw_c::setAlphaButtonAAnimeMax() {
     }
 }
 
-/* 80219324-80219474 213C64 0150+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMin__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaButtonBAnimeMin() {
     if (mpButtonB->getAlphaRate() != 0.0f) {
         mpButtonB->setAlphaRate(g_drawHIO.mButtonBAlpha *
@@ -3052,8 +2961,6 @@ void dMeter2Draw_c::setAlphaButtonBAnimeMin() {
     }
 }
 
-/* 80219474-802195A4 213DB4 0130+00 0/0 1/1 0/0 .text setAlphaButtonBAnimeMax__13dMeter2Draw_cFv
- */
 void dMeter2Draw_c::setAlphaButtonBAnimeMax() {
     if (mpButtonB->getAlphaRate() !=
         g_drawHIO.mButtonBAlpha * (g_drawHIO.mParentAlpha * g_drawHIO.mMainHUDButtonsAlpha))
@@ -3080,8 +2987,6 @@ void dMeter2Draw_c::setAlphaButtonBAnimeMax() {
     }
 }
 
-/* 802195A4-80219788 213EE4 01E4+00 0/0 1/1 0/0 .text setButtonIconAAlpha__13dMeter2Draw_cFUcUlb
- */
 void dMeter2Draw_c::setButtonIconAAlpha(u8 unused0, u32 unused1, bool unused2) {
     if (mpButtonA->isVisible()) {
         u8 alpha = g_drawHIO.mButtonAAlpha *
@@ -3106,8 +3011,6 @@ void dMeter2Draw_c::setButtonIconAAlpha(u8 unused0, u32 unused1, bool unused2) {
     }
 }
 
-/* 80219788-80219A84 2140C8 02FC+00 0/0 1/1 0/0 .text setButtonIconBAlpha__13dMeter2Draw_cFUcUlb
- */
 void dMeter2Draw_c::setButtonIconBAlpha(u8 unused0, u32 unused1, bool param_2) {
     if (mpItemB->isVisible() || mpLightB->isVisible() || mpButtonB->isVisible()) {
         f32 temp_f30 =
@@ -3150,8 +3053,6 @@ void dMeter2Draw_c::setButtonIconBAlpha(u8 unused0, u32 unused1, bool param_2) {
     }
 }
 
-/* 80219A84-80219E98 2143C4 0414+00 0/0 1/1 0/0 .text setButtonIconMidonaAlpha__13dMeter2Draw_cFUl
- */
 void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) {
     mpButtonMidona->scale(g_drawHIO.mMidnaIconScale, g_drawHIO.mMidnaIconScale);
     mpButtonMidona->paneTrans(g_drawHIO.mMidnaIconPosX, g_drawHIO.mMidnaIconPosY);
@@ -3232,8 +3133,6 @@ void dMeter2Draw_c::setButtonIconMidonaAlpha(u32 param_0) {
     mpButtonXY[2]->setAlpha(255.0f * field_0x724 * temp_f30_2);
 }
 
-/* 80219E98-8021A29C 2147D8 0404+00 0/0 1/1 0/0 .text setButtonIconAlpha__13dMeter2Draw_cFiUcUlb
- */
 void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool unused2) {
     JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
@@ -3316,14 +3215,11 @@ void dMeter2Draw_c::setButtonIconAlpha(int i_no, u8 unused0, u32 unused1, bool u
     }
 }
 
-/* 8021A29C-8021A2F4 214BDC 0058+00 1/1 0/0 0/0 .text            getNumberTexture__13dMeter2Draw_cFi
- */
 ResTIMG* dMeter2Draw_c::getNumberTexture(int i) {
     return (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG',
                                                               dMeter2Info_getNumberTextureName(i));
 }
 
-/* 8021A2F4-8021A468 214C34 0174+00 9/9 1/1 0/0 .text getActionString__13dMeter2Draw_cFUcUcPUc */
 char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) {
     static u32 i_action_num[] = {
         0,    1001, 1002, 1003, 1004, 1005, 1006, 1007, 1387, 1009, 1010, 1011, 1012, 1013, 1014,
@@ -3383,7 +3279,6 @@ char* dMeter2Draw_c::getActionString(u8 i_action, u8 i_type, u8* param_2) {
     return i_text_buf;
 }
 
-/* 8021A468-8021A71C 214DA8 02B4+00 2/2 0/0 0/0 .text changeTextureItemB__13dMeter2Draw_cFUc */
 void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
     int var_r31 = 0;
     if (i_itemNo == fpcNm_ITEM_LURE_ROD) {
@@ -3428,7 +3323,6 @@ void dMeter2Draw_c::changeTextureItemB(u8 i_itemNo) {
     mpItemBPane->resize(field_0x6e4, field_0x6e8);
 }
 
-/* 8021A71C-8021A9C8 21505C 02AC+00 1/1 0/0 0/0 .text changeTextureItemXY__13dMeter2Draw_cFiUc */
 void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) {
     JUT_ASSERT(0, i_no < SELECT_MAX_e);
 
@@ -3481,8 +3375,6 @@ void dMeter2Draw_c::changeTextureItemXY(int i_no, u8 i_itemNo) {
     mpItemXYPane[i_no]->resize(field_0x6c4[i_no], field_0x6d0[i_no]);
 }
 
-/* 8021A9C8-8021AAA4 215308 00DC+00 10/10 2/2 0/0 .text
- * setAlphaAnimeMin__13dMeter2Draw_cFP13CPaneMgrAlphas          */
 void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane, s16 i_min) {
     f32 alpha_rate = i_pane->getAlphaRate();
     s16 alpha_timer = i_pane->getAlphaTimer();
@@ -3505,8 +3397,6 @@ void dMeter2Draw_c::setAlphaAnimeMin(CPaneMgrAlpha* i_pane, s16 i_min) {
     }
 }
 
-/* 8021AAA4-8021AB84 2153E4 00E0+00 10/10 23/23 0/0 .text
- * setAlphaAnimeMax__13dMeter2Draw_cFP13CPaneMgrAlphas          */
 void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) {
     f32 alpha_rate = i_pane->getAlphaRate();
     s16 alpha_timer = i_pane->getAlphaTimer();
@@ -3526,8 +3416,6 @@ void dMeter2Draw_c::setAlphaAnimeMax(CPaneMgrAlpha* i_pane, s16 i_max) {
     }
 }
 
-/* 8021AB84-8021AEC8 2154C4 0344+00 0/0 6/6 0/0 .text            setItemNum__13dMeter2Draw_cFUcUcUc
- */
 void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) {
     JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
@@ -3582,7 +3470,6 @@ void dMeter2Draw_c::setItemNum(u8 i_button, u8 i_num, u8 i_max) {
     }
 }
 
-/* 8021AEC8-8021AF78 215808 00B0+00 0/0 1/1 0/0 .text            drawItemNum__13dMeter2Draw_cFUcf */
 void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) {
     JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
@@ -3595,7 +3482,6 @@ void dMeter2Draw_c::drawItemNum(u8 i_button, f32 i_alpha) {
     }
 }
 
-/* 8021AF78-8021B0C8 2158B8 0150+00 0/0 1/1 0/0 .text drawKanteraMeter__13dMeter2Draw_cFUcf */
 void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
     JUT_ASSERT(0, i_button < SELECT_MAX_e);
 
@@ -3617,14 +3503,10 @@ void dMeter2Draw_c::drawKanteraMeter(u8 i_button, f32 i_alphaRate) {
     mpKanteraMeter[i_button]->setAlphaRate(i_alphaRate);
 }
 
-/* 8021B0C8-8021B104 215A08 003C+00 0/0 3/3 0/0 .text            isButtonVisible__13dMeter2Draw_cFv
- */
 u8 dMeter2Draw_c::isButtonVisible() {
     return (mpButtonParent->getAlphaRate() == 0.0f) ^ 1;
 }
 
-/* 8021B104-8021B364 215A44 0260+00 3/2 0/0 0/0 .text            setItemParamX__13dMeter2Draw_cFUc
- */
 void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
     if (g_drawHIO.mButtonDebug[0]) {
         mItemParams[SELECT_X_e].pos_x = g_drawHIO.mButtonXItemPosX;
@@ -3704,8 +3586,6 @@ void dMeter2Draw_c::setItemParamX(u8 i_itemNo) {
     }
 }
 
-/* 8021B364-8021B5B0 215CA4 024C+00 3/2 0/0 0/0 .text            setItemParamY__13dMeter2Draw_cFUc
- */
 void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
     if (g_drawHIO.mButtonDebug[1]) {
         mItemParams[SELECT_Y_e].pos_x = g_drawHIO.mButtonYItemPosX;
@@ -3785,8 +3665,6 @@ void dMeter2Draw_c::setItemParamY(u8 i_itemNo) {
     }
 }
 
-/* 8021B5B0-8021B810 215EF0 0260+00 3/2 0/0 0/0 .text            setItemParamZ__13dMeter2Draw_cFUc
- */
 void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
     if (g_drawHIO.mButtonDebug[2]) {
         mItemParams[SELECT_Z_e].pos_x = g_drawHIO.field_0x1cc;
@@ -3866,8 +3744,6 @@ void dMeter2Draw_c::setItemParamZ(u8 i_itemNo) {
     }
 }
 
-/* 8021B810-8021BB6C 216150 035C+00 3/2 0/0 0/0 .text            setItemParamB__13dMeter2Draw_cFUc
- */
 void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
     if (g_drawHIO.mButtonDebug[3]) {
         mItemParams[3].pos_x = g_drawHIO.mButtonBItemPosX[0];
@@ -3998,8 +3874,6 @@ void dMeter2Draw_c::setItemParamB(u8 i_itemNo) {
     }
 }
 
-/* 8021BB6C-8021BBB4 2164AC 0048+00 1/1 0/0 0/0 .text            getFishingType__13dMeter2Draw_cFv
- */
 bool dMeter2Draw_c::getFishingType() {
     if (dMeter2Info_isGameStatus(1) && getCanoeFishing()) {
         return true;
@@ -4012,8 +3886,6 @@ bool dMeter2Draw_c::getFishingType() {
 static const char* tex_name[] = {"tt_heart_00.bti", "tt_heart_01.bti", "tt_heart_02.bti",
                                  "tt_heart_03.bti"};
 
-/* 8021BBB4-8021BC24 2164F4 0070+00 2/2 1/1 0/0 .text            getCanoeFishing__13dMeter2Draw_cFv
- */
 bool dMeter2Draw_c::getCanoeFishing() {
     if (!strcmp(dComIfGp_getStartStageName(), "F_SP127") &&
         ((daPy_py_c*)dComIfGp_getPlayer(0))->checkCanoeRide())
@@ -4024,14 +3896,10 @@ bool dMeter2Draw_c::getCanoeFishing() {
     }
 }
 
-/* 8021BC24-8021BC54 216564 0030+00 0/0 1/1 0/0 .text            getCameraSubject__13dMeter2Draw_cFv
- */
 bool dMeter2Draw_c::getCameraSubject() {
     return dCam_getBody()->Mode() == 4 ? TRUE : FALSE;
 }
 
-/* 8021BC54-8021BCAC 216594 0058+00 0/0 1/1 0/0 .text            getItemSubject__13dMeter2Draw_cFv
- */
 bool dMeter2Draw_c::getItemSubject() {
     if (dCam_getBody()->Mode() != 4 && (dCam_getBody()->Mode() == 7 || dCam_getBody()->Mode() == 8))
     {
@@ -4041,13 +3909,10 @@ bool dMeter2Draw_c::getItemSubject() {
     return false;
 }
 
-/* 8021BCAC-8021BCC0 2165EC 0014+00 0/0 1/1 0/0 .text            getPlayerSubject__13dMeter2Draw_cFv
- */
 bool dMeter2Draw_c::getPlayerSubject() {
     return dComIfGp_checkPlayerStatus0(0, 0x8000000);
 }
 
-/* 8021BCC0-8021BDD0 216600 0110+00 2/2 2/2 0/0 .text            isBButtonShow__13dMeter2Draw_cFb */
 bool dMeter2Draw_c::isBButtonShow(bool param_0) {
     if (dMsgObject_getMsgObjectClass() == NULL) {
         return false;
@@ -4064,13 +3929,10 @@ bool dMeter2Draw_c::isBButtonShow(bool param_0) {
     return false;
 }
 
-/* 8021BDD0-8021BDDC 216710 000C+00 0/0 1/1 0/0 .text            getButtonTimer__13dMeter2Draw_cFv
- */
 s16 dMeter2Draw_c::getButtonTimer() {
     return mpButtonParent->getAlphaTimer();
 }
 
-/* 803988B8-803988D0 024F18 0018+00 0/0 0/0 0/0 .rodata          tag$7759 */
 // unused
 static u64 const tag_7759[] = {
     'item_x_n',
diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp
index f90c33566a..f62455b877 100644
--- a/src/d/d_meter2_info.cpp
+++ b/src/d/d_meter2_info.cpp
@@ -170,7 +170,6 @@ enum dMeter2_ItemType {
     ItemType_HAWK_ARROW,
 };
 
-/* 8021BDDC-8021BE20 21671C 0044+00 1/1 0/0 0/0 .text            __ct__13dMeter2Info_cFv */
 dMeter2Info_c::dMeter2Info_c() {
     init();
     mTempBits = 0;
@@ -178,7 +177,6 @@ dMeter2Info_c::dMeter2Info_c() {
 
 dMeter2Info_c::~dMeter2Info_c() {}
 
-/* 8021BE68-8021C0E0 2167A8 0278+00 1/1 1/1 0/0 .text            init__13dMeter2Info_cFv */
 void dMeter2Info_c::init() {
     mMsgResource = NULL;
     mStageMsgResource = NULL;
@@ -288,7 +286,6 @@ void dMeter2Info_c::init() {
 }
 
 
-/* 8021C0E0-8021C11C 216A20 003C+00 0/0 1/1 2/2 .text setFloatingMessage__13dMeter2Info_cFUssb */
 int dMeter2Info_c::setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVisible) {
     if (dComIfGp_event_runCheck()) {
         return 0;
@@ -301,7 +298,6 @@ int dMeter2Info_c::setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVi
     return 1;
 }
 
-/* 8021C11C-8021C1DC 216A5C 00C0+00 0/0 0/0 1/1 .text setFloatingFlow__13dMeter2Info_cFUssb */
 int dMeter2Info_c::setFloatingFlow(u16 i_flowID, s16 i_msgTimer, bool i_wakuVisible) {
     if (dComIfGp_event_runCheck()) {
         return 0;
@@ -320,8 +316,6 @@ int dMeter2Info_c::setFloatingFlow(u16 i_flowID, s16 i_msgTimer, bool i_wakuVisi
     return 1;
 }
 
-/* 8021C1DC-8021C1F0 216B1C 0014+00 0/0 4/4 0/0 .text isFloatingMessageVisible__13dMeter2Info_cFv
- */
 bool dMeter2Info_c::isFloatingMessageVisible() {
     if (mFloatingMessageTimer > 0) {
         return true;
@@ -330,8 +324,6 @@ bool dMeter2Info_c::isFloatingMessageVisible() {
     return false;
 }
 
-/* 8021C1F0-8021C218 216B30 0028+00 0/0 1/1 0/0 .text decFloatingMessageTimer__13dMeter2Info_cFv
- */
 s16 dMeter2Info_c::decFloatingMessageTimer() {
     if (mFloatingMessageTimer > 0) {
         mFloatingMessageTimer--;
@@ -342,7 +334,6 @@ s16 dMeter2Info_c::decFloatingMessageTimer() {
     return mFloatingMessageTimer;
 }
 
-/* 8021C218-8021C238 216B58 0020+00 0/0 3/3 0/0 .text resetFloatingMessage__13dMeter2Info_cFv */
 void dMeter2Info_c::resetFloatingMessage() {
     mFloatingFlowID = 0xFFFF;
     mFloatingMessageID = 0xFFFF;
@@ -350,15 +341,12 @@ void dMeter2Info_c::resetFloatingMessage() {
     mFloatingMessageWakuVisible = false;
 }
 
-/* 8021C238-8021C250 216B78 0018+00 0/0 2/2 0/0 .text decMsgKeyWaitTimer__13dMeter2Info_cFv */
 void dMeter2Info_c::decMsgKeyWaitTimer() {
     if (mMsgKeyWaitTimer > 0) {
         mMsgKeyWaitTimer--;
     }
 }
 
-/* 8021C250-8021C370 216B90 0120+00 0/0 16/16 0/0 .text
- * getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c             */
 void dMeter2Info_c::getString(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) {
     strcpy(o_string, "");
 
@@ -397,8 +385,6 @@ void dMeter2Info_c::getString(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_
     }
 }
 
-/* 8021C370-8021C544 216CB0 01D4+00 0/0 1/1 0/0 .text
- * getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c         */
 void dMeter2Info_c::getStringKana(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) {
     strcpy(o_string, "");
 
@@ -468,8 +454,6 @@ void dMeter2Info_c::getStringKana(u32 i_stringID, char* o_string, JMSMesgEntry_c
     }
 }
 
-/* 8021C544-8021C6A4 216E84 0160+00 0/0 32/32 1/1 .text
- * getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c        */
 void dMeter2Info_c::getStringKanji(u32 i_stringID, char* o_string, JMSMesgEntry_c* i_msgEntry) {
     strcpy(o_string, "");
 
@@ -523,8 +507,6 @@ void dMeter2Info_c::getStringKanji(u32 i_stringID, char* o_string, JMSMesgEntry_
     }
 }
 
-/* 8021C6A4-8021C7F4 216FE4 0150+00 0/0 1/1 0/0 .text
- * getStringLength__13dMeter2Info_cFP10J2DTextBoxPc             */
 f32 dMeter2Info_c::getStringLength(J2DTextBox* i_textbox, char* i_string) {
     f32 str_width = 0.0f;
     f32 str_len = 0.0f;
@@ -564,8 +546,6 @@ f32 dMeter2Info_c::getStringLength(J2DTextBox* i_textbox, char* i_string) {
     return str_len;
 }
 
-/* 8021C7FC-8021C934 21713C 0138+00 0/0 3/3 0/0 .text
- * getStringLength__13dMeter2Info_cFP7JUTFontffPc               */
 f32 dMeter2Info_c::getStringLength(JUTFont* i_font, f32 param_2, f32 param_3, char* i_string) {
     f32 str_width = 0.0f;
     f32 str_len = 0.0f;
@@ -598,21 +578,16 @@ f32 dMeter2Info_c::getStringLength(JUTFont* i_font, f32 param_2, f32 param_3, ch
     return str_len;
 }
 
-/* 8021C934-8021C950 217274 001C+00 0/0 2/2 0/0 .text            onDirectUseItem__13dMeter2Info_cFi
- */
 void dMeter2Info_c::onDirectUseItem(int param_0) {
     mDirectUseItem |= (u8)(1 << param_0);
 }
 
-/* 8021C950-8021C970 217290 0020+00 0/0 4/4 0/0 .text            isDirectUseItem__13dMeter2Info_cFi */
 BOOL dMeter2Info_c::isDirectUseItem(int param_0) {
     return (mDirectUseItem & (u8)(1 << param_0)) ? TRUE : FALSE;
 }
 
-/* 80430188-80430280 05CEA8 00F8+00 4/4 267/267 70/70 .bss             g_meter2_info */
 dMeter2Info_c g_meter2_info;
 
-/* 8021C970-8021C9DC 2172B0 006C+00 0/0 0/0 5/5 .text            setMeterString__13dMeter2Info_cFl */
 int dMeter2Info_c::setMeterString(s32 i_string) {
     if (mMeterString != 0) {
         return 0;
@@ -634,7 +609,6 @@ int dMeter2Info_c::setMeterString(s32 i_string) {
     return 0;
 }
 
-/* 8021C9DC-8021CA04 21731C 0028+00 1/1 3/3 0/0 .text            resetWarpStatus__13dMeter2Info_cFv */
 void dMeter2Info_c::resetWarpStatus() {
     if (mWarpStatus == 2) {
         dComIfGs_resetLastWarpAcceptStage();
@@ -643,7 +617,6 @@ void dMeter2Info_c::resetWarpStatus() {
     mWarpStatus = 0;
 }
 
-/* 8021CA04-8021CA70 217344 006C+00 0/0 2/2 3/3 .text            warpInProc__13dMeter2Info_cFv */
 void dMeter2Info_c::warpInProc() {
     dComIfGs_setWarpMarkFlag(0);
     dComIfGs_resetLastWarpAcceptStage();
@@ -653,7 +626,6 @@ void dMeter2Info_c::warpInProc() {
     }
 }
 
-/* 8021CA70-8021CC00 2173B0 0190+00 0/0 1/1 0/0 .text            warpOutProc__13dMeter2Info_cFv */
 void dMeter2Info_c::warpOutProc() {
     dComIfGs_setLastWarpAcceptStage(dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()));
 
@@ -684,14 +656,10 @@ void dMeter2Info_c::warpOutProc() {
     dComIfGs_setItem(SLOT_18, fpcNm_ITEM_DUNGEON_BACK);
 }
 
-/* 8021CC00-8021CC0C 217540 000C+00 0/0 1/1 1/1 .text            resetMeterString__13dMeter2Info_cFv
- */
 void dMeter2Info_c::resetMeterString() {
     mMeterString = 0;
 }
 
-/* 8021CC0C-8021CC80 21754C 0074+00 1/1 1/1 0/0 .text
- * setWarpInfo__13dMeter2Info_cFPCcRC4cXyzsUcUcUc               */
 void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position, s16 i_angle,
                                 u8 i_roomNo, u8 param_4, u8 i_warpPlayerNo) {
     strcpy(mWarpInfo.mStageName, i_stageName);
@@ -702,7 +670,6 @@ void dMeter2Info_c::setWarpInfo(const char* i_stageName, const cXyz& i_position,
     mWarpInfo.mPlayerNo = (u8)i_warpPlayerNo;
 }
 
-/* 8021CC80-8021CF08 2175C0 0288+00 2/2 0/0 0/0 .text            getItemType__13dMeter2Info_cFUc */
 u8 dMeter2Info_c::getItemType(u8 i_itemNo) {
     u8 type;
     switch (i_itemNo) {
@@ -928,8 +895,6 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p
     return tex_num;
 }
 
-/* 8021D36C-8021D44C 217CAC 00E0+00 0/0 2/2 0/0 .text
- * setItemColor__13dMeter2Info_cFUcP10J2DPictureP10J2DPictureP10J2DPictureP10J2DPicture */
 void dMeter2Info_c::setItemColor(u8 i_itemNo, J2DPicture* i_pic1, J2DPicture* i_pic2,
                                  J2DPicture* i_pic3, J2DPicture* i_pic4) {
     u8 itemType = getItemType(i_itemNo);
@@ -953,8 +918,6 @@ void dMeter2Info_c::setItemColor(u8 i_itemNo, J2DPicture* i_pic1, J2DPicture* i_
     }
 }
 
-/* 8021D44C-8021D4B8 217D8C 006C+00 2/1 0/0 0/0 .text            get2ndTexture__13dMeter2Info_cFUc
- */
 s16 dMeter2Info_c::get2ndTexture(u8 i_itemType) {
     switch (i_itemType) {
     case ItemType_GREEN_RUPEE:
@@ -1006,8 +969,6 @@ s16 dMeter2Info_c::get2ndTexture(u8 i_itemType) {
     }
 }
 
-/* 8021D4B8-8021D4FC 217DF8 0044+00 1/1 0/0 0/0 .text            get3rdTexture__13dMeter2Info_cFUc
- */
 s16 dMeter2Info_c::get3rdTexture(u8 i_itemType) {
     switch (i_itemType) {
     case ItemType_GREEN_RUPEE:
@@ -1028,8 +989,6 @@ s16 dMeter2Info_c::get3rdTexture(u8 i_itemType) {
     }
 }
 
-/* 8021D4FC-8021D524 217E3C 0028+00 1/1 0/0 0/0 .text            get4thTexture__13dMeter2Info_cFUc
- */
 s16 dMeter2Info_c::get4thTexture(u8 i_itemType) {
     switch (i_itemType) {
     case ItemType_GREEN_RUPEE:
@@ -1045,8 +1004,6 @@ s16 dMeter2Info_c::get4thTexture(u8 i_itemType) {
     }
 }
 
-/* 8021D524-8021D644 217E64 0120+00 2/2 0/0 0/0 .text set1stColor__13dMeter2Info_cFUcP10J2DPicture
- */
 void dMeter2Info_c::set1stColor(u8 i_itemType, J2DPicture* i_pic) {
     static GXColor const black_color[37] = {
         {0x00, 0x00, 0x00, 0x00}, {0x00, 0x60, 0x00, 0x00}, {0x00, 0x00, 0xC0, 0x00},
@@ -1152,8 +1109,6 @@ void dMeter2Info_c::set1stColor(u8 i_itemType, J2DPicture* i_pic) {
                             *(JUtility::TColor*)&vertex_color_rd[i_itemType]);
 }
 
-/* 8021D644-8021D764 217F84 0120+00 2/2 0/0 0/0 .text set2ndColor__13dMeter2Info_cFUcP10J2DPicture
- */
 void dMeter2Info_c::set2ndColor(u8 i_itemType, J2DPicture* i_pic) {
     static GXColor const black_color[37] = {
         {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00},
@@ -1259,8 +1214,6 @@ void dMeter2Info_c::set2ndColor(u8 i_itemType, J2DPicture* i_pic) {
                             *(JUtility::TColor*)&vertex_color_rd[i_itemType]);
 }
 
-/* 8021D764-8021DB64 2180A4 0400+00 2/2 0/0 0/0 .text set3rdColor__13dMeter2Info_cFUcP10J2DPicture
- */
 void dMeter2Info_c::set3rdColor(u8 i_itemType, J2DPicture* i_pic) {
     if (i_itemType == ItemType_POU_FIRE) {
         i_pic->setBlackWhite(JUtility::TColor(0, 0, 0, 0),
@@ -1283,8 +1236,6 @@ void dMeter2Info_c::set3rdColor(u8 i_itemType, J2DPicture* i_pic) {
     }
 }
 
-/* 8021DB64-8021DCC4 2184A4 0160+00 2/2 0/0 0/0 .text set4thColor__13dMeter2Info_cFUcP10J2DPicture
- */
 void dMeter2Info_c::set4thColor(u8 i_itemType, J2DPicture* i_pic) {
     i_pic->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0xff, 0xff, 0xff, 0xff));
     i_pic->setCornerColor(
@@ -1292,7 +1243,6 @@ void dMeter2Info_c::set4thColor(u8 i_itemType, J2DPicture* i_pic) {
         JUtility::TColor(0xff, 0xff, 0xff, 0xff), JUtility::TColor(0xff, 0xff, 0xff, 0xff));
 }
 
-/* 8021DCC4-8021DCE0 218604 001C+00 0/0 2/2 0/0 .text setHotSpringTimer__13dMeter2Info_cFUc */
 void dMeter2Info_c::setHotSpringTimer(u8 i_slotNo) {
     int i_bottleIdx = i_slotNo - 11;
     JUT_ASSERT(2699, i_bottleIdx >= 0 && i_bottleIdx <= dSv_player_item_c::BOTTLE_MAX);
@@ -1300,7 +1250,6 @@ void dMeter2Info_c::setHotSpringTimer(u8 i_slotNo) {
     mHotSpringTimer[i_bottleIdx] = 900;
 }
 
-/* 8021DCE0-8021DD5C 218620 007C+00 0/0 1/1 0/0 .text decHotSpringTimer__13dMeter2Info_cFv */
 void dMeter2Info_c::decHotSpringTimer() {
     for (int i = 0; i < 4; i++) {
         if (mHotSpringTimer[i] != 0) {
@@ -1312,7 +1261,6 @@ void dMeter2Info_c::decHotSpringTimer() {
     }
 }
 
-/* 8021DD5C-8021DE18 21869C 00BC+00 2/2 1/1 0/0 .text            changeWater__13dMeter2Info_cFUc */
 void dMeter2Info_c::changeWater(u8 i_slotNo) {
     int i_bottleIdx = i_slotNo - SLOT_11;
     JUT_ASSERT(2739, i_bottleIdx >= 0 && i_bottleIdx <= dSv_player_item_c::BOTTLE_MAX);
@@ -1330,8 +1278,6 @@ void dMeter2Info_c::changeWater(u8 i_slotNo) {
     }
 }
 
-/* 8021DE18-8021E0C4 218758 02AC+00 0/0 3/3 3/3 .text            setMiniGameItem__13dMeter2Info_cFUc
- */
 void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) {
     bool item_set = false;
     if (mMiniGameItemSetFlag != 0) {
@@ -1396,7 +1342,6 @@ void dMeter2Info_c::setMiniGameItem(u8 i_minigameFlag) {
     }
 }
 
-/* 8021E0C4-8021E268 218A04 01A4+00 0/0 3/3 4/4 .text resetMiniGameItem__13dMeter2Info_cFb */
 void dMeter2Info_c::resetMiniGameItem(bool i_saveItem) {
     if (mMiniGameItemSetFlag != 0) {
         if (i_saveItem) {
@@ -1432,7 +1377,6 @@ void dMeter2Info_c::resetMiniGameItem(bool i_saveItem) {
     }
 }
 
-/* 8021E268-8021E290 218BA8 0028+00 0/0 0/0 5/5 .text setMiniGameCount__13dMeter2Info_cFSc */
 void dMeter2Info_c::setMiniGameCount(s8 i_count) {
     if (i_count < -99) {
         i_count = -99;
@@ -1444,17 +1388,14 @@ void dMeter2Info_c::setMiniGameCount(s8 i_count) {
     mMiniGameCount = i_count;
 }
 
-/* 8021E290-8021E2B4 218BD0 0024+00 1/1 2/2 0/0 .text setSaveStageName__13dMeter2Info_cFPCc */
 void dMeter2Info_c::setSaveStageName(const char* i_stageName) {
     strcpy(mSaveStageName, i_stageName);
 }
 
-/* 8021E2B4-8021E2C8 218BF4 0014+00 0/0 0/0 1/1 .text            dMeter2Info_getNowLifeGauge__Fv */
 s16 dMeter2Info_getNowLifeGauge() {
     return dMeter2Info_getMeterClass()->getNowLifeGauge();
 }
 
-/* 8021E2C8-8021E2DC 218C08 0014+00 0/0 11/11 3/3 .text dMeter2Info_getNumberTextureName__Fi */
 const char* dMeter2Info_getNumberTextureName(int i_num) {
     static const char* tex_name[10] = {
         "im_font_number_32_32_ganshinkyo_0_02.bti", "im_font_number_32_32_ganshinkyo_1_02.bti",
@@ -1473,7 +1414,6 @@ const char* dMeter2Info_getPlusTextureName() {
     return tex_name;
 }
 
-/* 8021E308-8021E4B0 218C48 01A8+00 0/0 3/3 0/0 .text dMeter2Info_getPixel__FffffffPC7ResTIMG */
 bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32 i_sizeX,
                           f32 i_sizeY, ResTIMG const* i_resTimg) {
     f32 temp_f31 = i_posX - param_2;
@@ -1505,7 +1445,6 @@ bool dMeter2Info_getPixel(f32 i_posX, f32 i_posY, f32 param_2, f32 param_3, f32
     return var_r24 & 0x7000;
 }
 
-/* 8021E4B0-8021E530 218DF0 0080+00 0/0 2/2 1/1 .text            dMeter2Info_setCloth__FUcb */
 void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) {
     switch (i_clothId) {
     case fpcNm_ITEM_WEAR_CASUAL:
@@ -1527,7 +1466,6 @@ void dMeter2Info_setCloth(u8 i_clothId, bool i_offItemBit) {
     dComIfGp_setSelectEquipClothes(i_clothId);
 }
 
-/* 8021E530-8021E5D4 218E70 00A4+00 0/0 3/3 3/3 .text            dMeter2Info_setSword__FUcb */
 void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) {
     switch (i_itemId) {
     case fpcNm_ITEM_NONE:
@@ -1550,7 +1488,6 @@ void dMeter2Info_setSword(u8 i_itemId, bool i_offItemBit) {
     dComIfGp_setSelectEquipSword(i_itemId);
 }
 
-/* 8021E5D4-8021E660 218F14 008C+00 0/0 3/3 0/0 .text            dMeter2Info_setShield__FUcb */
 void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) {
     switch (i_itemId) {
     case fpcNm_ITEM_NONE:
@@ -1572,18 +1509,14 @@ void dMeter2Info_setShield(u8 i_itemId, bool i_offItemBit) {
     dComIfGp_setSelectEquipShield(i_itemId);
 }
 
-/* 8021E660-8021E668 218FA0 0008+00 0/0 1/1 0/0 .text            dMeter2Info_is2DActiveTouchArea__Fv
- */
 bool dMeter2Info_is2DActiveTouchArea() {
     return false;
 }
 
-/* 8021E668-8021E688 218FA8 0020+00 0/0 1/1 0/0 .text            dMeter2Info_isMapOpenCheck__Fv */
 bool dMeter2Info_isMapOpenCheck() {
     return dMeter2Info_getMeterMapClass()->isMapOpenCheck();
 }
 
-/* 8021E688-8021E6E4 218FC8 005C+00 0/0 2/2 0/0 .text            dMeter2Info_isItemOpenCheck__Fv */
 bool dMeter2Info_isItemOpenCheck() {
     if (daPy_getPlayerActorClass()->checkCanoeSlider() || daPy_getPlayerActorClass()->getSumouMode() || dMeter2Info_isSub2DStatus(1)) {
         return false;
@@ -1592,7 +1525,6 @@ bool dMeter2Info_isItemOpenCheck() {
     return true;
 }
 
-/* 803BF81C-803BFA1C 01C93C 0200+00 3/3 6/6 0/0 .data            letter_data__12dMenu_Letter */
 dMenu_LetterData dMenu_Letter::letter_data[64] = {
     {0x09C5, 0x0A29, 0x0A8D, 0x010B}, {0x09C6, 0x0A2A, 0x0A8E, 0x0237},
     {0x09C7, 0x0A2B, 0x0A8F, 0x0236}, {0x09C8, 0x0A2C, 0x0A90, 0x0037},
@@ -1628,8 +1560,6 @@ dMenu_LetterData dMenu_Letter::letter_data[64] = {
     {0x0000, 0x0000, 0x0000, 0x0000}, {0x0000, 0x0000, 0x0000, 0x0000},
 };
 
-/* 8021E6E4-8021E754 219024 0070+00 1/1 2/2 0/0 .text            dMeter2Info_getRecieveLetterNum__Fv
- */
 u8 dMeter2Info_getRecieveLetterNum() {
     u8 letterNum = 0;
 
@@ -1642,7 +1572,6 @@ u8 dMeter2Info_getRecieveLetterNum() {
     return letterNum;
 }
 
-/* 8021E754-8021E804 219094 00B0+00 0/0 4/4 2/2 .text            dMeter2Info_getNewLetterNum__Fv */
 u8 dMeter2Info_getNewLetterNum() {
     u8 letterNum = 0;
 
@@ -1658,8 +1587,6 @@ u8 dMeter2Info_getNewLetterNum() {
     return letterNum;
 }
 
-/* 8021E804-8021E8DC 219144 00D8+00 0/0 1/1 0/0 .text            dMeter2Info_setNewLetterSender__Fv
- */
 int dMeter2Info_setNewLetterSender() {
     u8 check = 0;
 
@@ -1682,7 +1609,6 @@ int dMeter2Info_setNewLetterSender() {
     return 0;
 }
 
-/* 8021E8DC-8021E9D0 21921C 00F4+00 0/0 1/1 0/0 .text            dMeter2Info_recieveLetter__Fv */
 int dMeter2Info_recieveLetter() {
     int rv = FALSE;
     u8 letterNum = dMeter2Info_getRecieveLetterNum();
@@ -1712,9 +1638,6 @@ int dMeter2Info_recieveLetter() {
     return rv;
 }
 
-/* 8021E9D0-8021E9D4 219310 0004+00 0/0 33/33 0/0 .text            dMeter2Info_set2DVibration__Fv */
 void dMeter2Info_set2DVibration() {}
 
-/* 8021E9D4-8021E9D8 219314 0004+00 0/0 12/12 0/0 .text            dMeter2Info_set2DVibrationM__Fv
- */
 void dMeter2Info_set2DVibrationM() {}
diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp
index 0a57e0d0d9..0970a754c1 100644
--- a/src/d/d_meter_HIO.cpp
+++ b/src/d/d_meter_HIO.cpp
@@ -5,7 +5,6 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 801FE330-801FE348 1F8C70 0018+00 1/1 0/0 0/0 .text            __ct__16dMeter_menuHIO_cFv */
 dMeter_menuHIO_c::dMeter_menuHIO_c() {
     mGameover = 70;
 }
@@ -16,8 +15,6 @@ void dMeter_menuHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE348-801FE4EC 1F8C88 01A4+00 1/1 0/0 0/0 .text            __ct__23dMeter_drawCollectHIO_cFv
- */
 dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() {
     mUnselectItemScale = 1.0f;
     mSelectItemScale = 1.5f;
@@ -64,7 +61,6 @@ void dMeter_drawCollectHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE4EC-801FE5CC 1F8E2C 00E0+00 1/1 0/0 0/0 .text            __ct__22dMeter_drawOptionHIO_cFv */
 dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c() {
     mBarScale[0] = 1.02f;
     mBarScale[1] = 0.98f;
@@ -100,7 +96,6 @@ void dMeter_drawOptionHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE5CC-801FE730 1F8F0C 0164+00 1/1 0/0 0/0 .text            __ct__22dMeter_drawLetterHIO_cFv */
 dMeter_drawLetterHIO_c::dMeter_drawLetterHIO_c() {
     for (int i = 0; i < 2; i++) {
         mOpenFrame[i] = 10;
@@ -144,8 +139,6 @@ void dMeter_drawLetterHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE730-801FE8DC 1F9070 01AC+00 1/1 0/0 0/0 .text            __ct__23dMeter_drawFishingHIO_cFv
- */
 dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() {
     static f32 const fipaScale[6] = {0.98f, 1.0f, 1.0f, 1.0f, 0.95f, 1.1f};
     static f32 const fipaPosX[6] = {1.3f, 6.6f, 0.0f, 3.96f, 4.0f, 27.5f};
@@ -243,7 +236,6 @@ void dMeter_drawFishingHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE8DC-801FE954 1F921C 0078+00 1/1 0/0 0/0 .text            __ct__22dMeter_drawInsectHIO_cFv */
 dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() {
     mOpenFrame = 10;
     mCloseFrame = 10;
@@ -276,7 +268,6 @@ void dMeter_drawInsectHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE954-801FE990 1F9294 003C+00 1/1 0/0 0/0 .text __ct__27dMeter_drawCalibrationHIO_cFv */
 dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c() {
     mOpenFrames = 10;
     mCloseFrames = 10;
@@ -292,7 +283,6 @@ void dMeter_drawCalibrationHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FE990-801FEAF0 1F92D0 0160+00 1/1 0/0 0/0 .text            __ct__21dMeter_drawSkillHIO_cFv */
 dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() {
     for (int i = 0; i < 2; i++) {
         mOpenFrame[i] = 10;
@@ -334,8 +324,6 @@ void dMeter_drawSkillHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FEAF0-801FEFF0 1F9430 0500+00 1/1 0/0 0/0 .text            __ct__25dMeter_drawEmpButtonHIO_cFv
- */
 dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() {
     mPikariScale = 2.5f;
 
@@ -562,8 +550,6 @@ void dMeter_drawEmpButtonHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FEFF0-801FF31C 1F9930 032C+00 1/1 0/0 0/0 .text            __ct__24dMeter_drawMiniGameHIO_cFv
- */
 dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() {
     field_0x8[0] = 1.0f;
     field_0x14[0] = 0.0f;
@@ -741,8 +727,6 @@ void dMeter_drawMiniGameHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FF31C-801FF5B8 1F9C5C 029C+00 1/1 0/0 0/0 .text            __ct__25dMeter_drawLightDropHIO_cFv
- */
 dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() {
     mVesselScale = 0.76f;
     mVesselPosX = -18.0f;
@@ -816,7 +800,6 @@ void dMeter_drawLightDropHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 801FF5B8-802001AC 1F9EF8 0BF4+00 1/1 0/0 0/0 .text            __ct__16dMeter_drawHIO_cFv */
 dMeter_drawHIO_c::dMeter_drawHIO_c() {
     #ifdef DEBUG
     field_0x8_debug = 0;
@@ -1478,7 +1461,6 @@ void dMeter_drawHIO_c::updateFMsgDebug() {
 }
 #endif
 
-/* 802001AC-802004B4 1FAAEC 0308+00 1/1 0/0 0/0 .text            __ct__16dMeter_ringHIO_cFv */
 dMeter_ringHIO_c::dMeter_ringHIO_c() {
     mRingRadiusH = 175.0f;
     mRingRadiusV = 160.0f;
@@ -1602,7 +1584,6 @@ void dMeter_ringHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 802004B4-802006C8 1FADF4 0214+00 1/1 0/0 0/0 .text            __ct__19dMeter_mapIconHIO_cFv */
 dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() {
     mPortalCursorScale = 0.5f;
     mPortalIconScale = 0.65f;
@@ -1716,7 +1697,6 @@ void dMeter_mapIconHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 802006C8-80200BCC 1FB008 0504+00 1/1 0/0 0/0 .text            __ct__16dMeter_fmapHIO_cFv */
 dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
     mpArcFile = NULL;
     mpDecompBuf = NULL;
@@ -1900,7 +1880,6 @@ dMeter_fmapHIO_c::dMeter_fmapHIO_c() {
     }
 }
 
-/* 80200BCC-80200CD4 1FB50C 0108+00 2/1 0/0 0/0 .text            __dt__16dMeter_fmapHIO_cFv */
 dMeter_fmapHIO_c::~dMeter_fmapHIO_c() {
     if (mpArcFile != NULL) {
         mDoExt_getGameHeap()->free(mpArcFile);
@@ -1948,7 +1927,6 @@ void dMeter_fmapHIO_c::update() {
 }
 #endif
 
-/* 80200CD4-80200D58 1FB614 0084+00 1/1 0/0 0/0 .text            __ct__18dMeter_cursorHIO_cFv */
 dMeter_cursorHIO_c::dMeter_cursorHIO_c() {
     mShopCursorScale = 1.05f;
     mShopCursorOffsetY = -30.0f;
@@ -1968,17 +1946,12 @@ void dMeter_cursorHIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 804510B0-804510B8 0005B0 0008+00 1/1 1/1 0/0 .sbss            g_menuHIO */
 dMeter_menuHIO_c g_menuHIO;
 
-/* 8042EBC8-8042FAF0 05B8E8 0F28+00 0/1 157/157 0/0 .bss             g_drawHIO */
 dMeter_drawHIO_c g_drawHIO;
 
-/* 8042FAFC-8042FC54 05C81C 0158+00 0/1 19/19 0/0 .bss             g_ringHIO */
 dMeter_ringHIO_c g_ringHIO;
 
-/* 8042FC60-80430104 05C980 04A4+00 0/1 54/54 0/0 .bss             g_fmapHIO */
 dMeter_fmapHIO_c g_fmapHIO;
 
-/* 80430110-80430158 05CE30 0044+04 0/1 6/6 1/1 .bss             g_cursorHIO */
 dMeter_cursorHIO_c g_cursorHIO;
diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp
index f15009ddf4..b98755a207 100644
--- a/src/d/d_meter_button.cpp
+++ b/src/d/d_meter_button.cpp
@@ -23,25 +23,20 @@
 #define STR_BUF_LEN 512
 #endif
 
-/* 80201328-80201370 1FBC68 0048+00 0/0 1/1 1/1 .text            __ct__14dMeterButton_cFv */
 dMeterButton_c::dMeterButton_c() {
     _create();
 }
 
-/* 80201370-802013CC 1FBCB0 005C+00 1/0 0/0 0/0 .text            __dt__14dMeterButton_cFv */
 dMeterButton_c::~dMeterButton_c() {
     _delete();
 }
 
-/* 802013CC-80201404 1FBD0C 0038+00 1/1 0/0 0/0 .text            _create__14dMeterButton_cFv */
 int dMeterButton_c::_create() {
     screenInitButton();
     screenInitText();
     return cPhs_COMPLEATE_e;
 }
 
-/* 80201404-80202240 1FBD44 0E3C+00 0/0 1/1 0/0 .text
- * _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb          */
 int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_drawR, bool i_drawZ,
                              bool i_draw3D, bool i_drawC, bool i_drawS, bool i_drawX, bool i_drawY,
                              bool i_drawNun, bool i_drawRemo, bool i_drawRemo2, bool i_drawAR,
@@ -245,7 +240,6 @@ int dMeterButton_c::_execute(u32 i_flags, bool i_drawA, bool i_drawB, bool i_dra
     return 1;
 }
 
-/* 80202240-80202A9C 1FCB80 085C+00 1/0 0/0 0/0 .text            draw__14dMeterButton_cFv */
 void dMeterButton_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
@@ -426,7 +420,6 @@ void dMeterButton_c::draw() {
     dMeter2Info_resetBlinkButton();
 }
 
-/* 80202A9C-802032C4 1FD3DC 0828+00 1/1 0/0 0/0 .text            _delete__14dMeterButton_cFv */
 int dMeterButton_c::_delete() {
     dMeter2Info_resetFloatingMessage();
 
@@ -619,7 +612,6 @@ int dMeterButton_c::_delete() {
     return 1;
 }
 
-/* 802032C4-8020339C 1FDC04 00D8+00 1/1 0/0 0/0 .text alphaAnimeButtonA__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonA(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_A_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -636,7 +628,6 @@ bool dMeterButton_c::alphaAnimeButtonA(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 8020339C-802034A8 1FDCDC 010C+00 1/1 0/0 0/0 .text alphaAnimeButtonB__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonB(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_B_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -654,7 +645,6 @@ bool dMeterButton_c::alphaAnimeButtonB(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802034A8-802035AC 1FDDE8 0104+00 1/1 0/0 0/0 .text alphaAnimeButtonR__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonR(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_R_e] > 0 || (i_flags & 0x40000000) ||
@@ -672,7 +662,6 @@ bool dMeterButton_c::alphaAnimeButtonR(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802035AC-802036C0 1FDEEC 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonZ__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonZ(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_Z_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -690,7 +679,6 @@ bool dMeterButton_c::alphaAnimeButtonZ(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802036C0-802037B8 1FE000 00F8+00 1/1 0/0 0/0 .text alphaAnimeButton3D__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButton3D(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_3D_e] > 0 || (i_flags & 8) || (i_flags & 0x10) || (i_flags & 0x20))
@@ -714,7 +702,6 @@ bool dMeterButton_c::alphaAnimeButton3D(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802037B8-80203878 1FE0F8 00C0+00 1/1 0/0 0/0 .text alphaAnimeButtonC__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonC(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_C_e] > 0 || (i_flags & 8) || (i_flags & 0x10) || (i_flags & 0x20))
@@ -730,7 +717,6 @@ bool dMeterButton_c::alphaAnimeButtonC(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203878-802038F4 1FE1B8 007C+00 1/1 0/0 0/0 .text alphaAnimeButtonS__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonS(u32 i_flags, bool i_drawButton) {
     if (!i_drawButton || (i_flags & 8) || (i_flags & 0x10) || (i_flags & 0x20)) {
         setAlphaButtonSAnimeMin();
@@ -744,7 +730,6 @@ bool dMeterButton_c::alphaAnimeButtonS(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802038F4-80203A08 1FE234 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonX__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonX(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_X_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -762,7 +747,6 @@ bool dMeterButton_c::alphaAnimeButtonX(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203A08-80203B1C 1FE348 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonY__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonY(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_Y_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -780,7 +764,6 @@ bool dMeterButton_c::alphaAnimeButtonY(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203B1C-80203C30 1FE45C 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonNun__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonNun(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_NUN_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -798,8 +781,6 @@ bool dMeterButton_c::alphaAnimeButtonNun(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203C30-80203D44 1FE570 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonRemo__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonRemo(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_REMO_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -817,8 +798,6 @@ bool dMeterButton_c::alphaAnimeButtonRemo(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203D44-80203E58 1FE684 0114+00 1/1 0/0 0/0 .text alphaAnimeButtonRemo2__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonRemo2(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         mButtonTimers[BUTTON_REMO2_e] > 0 || (i_flags & 0x80) || (i_flags & 0x40000000) ||
@@ -836,7 +815,6 @@ bool dMeterButton_c::alphaAnimeButtonRemo2(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203E58-80203F60 1FE798 0108+00 1/1 0/0 0/0 .text alphaAnimeButtonAR__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonAR(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -854,7 +832,6 @@ bool dMeterButton_c::alphaAnimeButtonAR(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80203F60-80204068 1FE8A0 0108+00 1/1 0/0 0/0 .text alphaAnimeButton3DB__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButton3DB(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -872,8 +849,6 @@ bool dMeterButton_c::alphaAnimeButton3DB(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204068-80204170 1FE9A8 0108+00 1/1 0/0 0/0 .text alphaAnimeButtonNURE__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonNURE(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -891,8 +866,6 @@ bool dMeterButton_c::alphaAnimeButtonNURE(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204170-80204278 1FEAB0 0108+00 1/1 0/0 0/0 .text alphaAnimeButtonReel__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonReel(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -910,8 +883,6 @@ bool dMeterButton_c::alphaAnimeButtonReel(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204278-80204368 1FEBB8 00F0+00 1/1 0/0 0/0 .text alphaAnimeButtonReel2__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonReel2(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -929,7 +900,6 @@ bool dMeterButton_c::alphaAnimeButtonReel2(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204368-80204458 1FECA8 00F0+00 1/1 0/0 0/0 .text alphaAnimeButtonAB__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonAB(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -947,8 +917,6 @@ bool dMeterButton_c::alphaAnimeButtonAB(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204458-80204548 1FED98 00F0+00 1/1 0/0 0/0 .text alphaAnimeButtonTate__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonTate(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -966,8 +934,6 @@ bool dMeterButton_c::alphaAnimeButtonTate(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204548-80204620 1FEE88 00D8+00 1/1 0/0 0/0 .text alphaAnimeButtonNunZ__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonNunZ(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         ((i_flags & 0x40) && dComIfGp_event_checkHind(1)) || (i_flags & 0x100) || (i_flags & 8) ||
@@ -984,8 +950,6 @@ bool dMeterButton_c::alphaAnimeButtonNunZ(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 80204620-802046F8 1FEF60 00D8+00 1/1 0/0 0/0 .text alphaAnimeButtonNunC__14dMeterButton_cFUlb
- */
 bool dMeterButton_c::alphaAnimeButtonNunC(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton ||
         ((i_flags & 0x40) && dComIfGp_event_checkHind(1)) || (i_flags & 0x100) || (i_flags & 8) ||
@@ -1002,7 +966,6 @@ bool dMeterButton_c::alphaAnimeButtonNunC(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802046F8-802047E8 1FF038 00F0+00 1/1 0/0 0/0 .text alphaAnimeButtonBin__14dMeterButton_cFUlb */
 bool dMeterButton_c::alphaAnimeButtonBin(u32 i_flags, bool i_drawButton) {
     if ((i_flags & 0x4000) || dMsgObject_isTalkNowCheck() || !i_drawButton || (i_flags & 0x80) ||
         (i_flags & 0x40000000) || (i_flags & 0x1000) ||
@@ -1020,7 +983,6 @@ bool dMeterButton_c::alphaAnimeButtonBin(u32 i_flags, bool i_drawButton) {
     return false;
 }
 
-/* 802047E8-80205834 1FF128 104C+00 1/1 0/0 0/0 .text screenInitButton__14dMeterButton_cFv */
 void dMeterButton_c::screenInitButton() {
     static u64 const text_tag[] = {
         'info_ar0', 'info_ar1', 'info_ar2', 'info_ar3', 'info_ar4',
@@ -1429,8 +1391,6 @@ void dMeterButton_c::screenInitButton() {
     OS_REPORT("exit dMeterButton_c::screenInitButton\n");
 }
 
-/* 80205834-80205CA0 200174 046C+00 1/1 0/0 0/0 .text            screenInitText__14dMeterButton_cFv
- */
 void dMeterButton_c::screenInitText() {
     mpScreen = new J2DScreen();
     JUT_ASSERT(0, mpScreen != NULL);
@@ -1550,7 +1510,6 @@ void dMeterButton_c::screenInitText() {
     OS_REPORT("exit dMeterButton_c::screenInitText(void)\n");
 }
 
-/* 80205CA0-80206978 2005E0 0CD8+00 2/2 0/0 0/0 .text            updateButton__14dMeterButton_cFv */
 void dMeterButton_c::updateButton() {
     f32 parent_x_offset = 0.0f;
     f32 parent_y_offset = 0.0f;
@@ -1881,7 +1840,6 @@ void dMeterButton_c::updateButton() {
     }
 }
 
-/* 80206978-80206CE0 2012B8 0368+00 1/1 0/0 0/0 .text            updateText__14dMeterButton_cFUl */
 void dMeterButton_c::updateText(u32 i_flags) {
     if (dMeter2Info_isFloatingMessageWakuVisible()) {
         mpFkAll_c->paneTrans(g_drawHIO.mFloatingMessagePosX, 0.0f);
@@ -1965,8 +1923,6 @@ void dMeterButton_c::updateText(u32 i_flags) {
     }
 }
 
-/* 80206CE0-80206D70 201620 0090+00 1/1 0/0 0/0 .text setAlphaButtonAAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonAAnimeMin() {
     if (mpButtonA->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_A_e] == 0) {
@@ -1983,7 +1939,6 @@ void dMeterButton_c::setAlphaButtonAAnimeMin() {
     }
 }
 
-/* 80206D70-80207060 2016B0 02F0+00 5/5 0/0 0/0 .text            isFastSet__14dMeterButton_cFi */
 bool dMeterButton_c::isFastSet(int param_0) {
     if ((dComIfGp_isDoSetFlag(1) && field_0x4be[param_0] == BUTTON_A_e) ||
         (dComIfGp_isASetFlag(1) && field_0x4be[param_0] == BUTTON_B_e) ||
@@ -2019,8 +1974,6 @@ bool dMeterButton_c::isFastSet(int param_0) {
     return false;
 }
 
-/* 80207060-8020714C 2019A0 00EC+00 1/1 0/0 0/0 .text setAlphaButtonAAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonAAnimeMax() {
     if (mpButtonA->getAlphaRate() != 1.0f) {
         if (dComIfGp_isDoSetFlag(1)) {
@@ -2038,8 +1991,6 @@ void dMeterButton_c::setAlphaButtonAAnimeMax() {
     }
 }
 
-/* 8020714C-802071DC 201A8C 0090+00 1/1 0/0 0/0 .text setAlphaButtonBAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonBAnimeMin() {
     if (mpButtonB->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_B_e] == 0) {
@@ -2056,8 +2007,6 @@ void dMeterButton_c::setAlphaButtonBAnimeMin() {
     }
 }
 
-/* 802071DC-802072C8 201B1C 00EC+00 1/1 0/0 0/0 .text setAlphaButtonBAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonBAnimeMax() {
     if (mpButtonB->getAlphaRate() != 1.0f) {
         if (dComIfGp_isASetFlag(1)) {
@@ -2075,8 +2024,6 @@ void dMeterButton_c::setAlphaButtonBAnimeMax() {
     }
 }
 
-/* 802072C8-80207358 201C08 0090+00 1/1 0/0 0/0 .text setAlphaButtonRAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonRAnimeMin() {
     if (mpButtonR->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_R_e] == 0) {
@@ -2093,8 +2040,6 @@ void dMeterButton_c::setAlphaButtonRAnimeMin() {
     }
 }
 
-/* 80207358-80207444 201C98 00EC+00 1/1 0/0 0/0 .text setAlphaButtonRAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonRAnimeMax() {
     if (mpButtonR->getAlphaRate() != 1.0f) {
         if (dComIfGp_isRSetFlag(1)) {
@@ -2112,8 +2057,6 @@ void dMeterButton_c::setAlphaButtonRAnimeMax() {
     }
 }
 
-/* 80207444-802074D4 201D84 0090+00 1/1 0/0 0/0 .text setAlphaButtonZAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonZAnimeMin() {
     if (mpButtonZ->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_Z_e] == 0) {
@@ -2130,8 +2073,6 @@ void dMeterButton_c::setAlphaButtonZAnimeMin() {
     }
 }
 
-/* 802074D4-802075C0 201E14 00EC+00 1/1 0/0 0/0 .text setAlphaButtonZAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonZAnimeMax() {
     if (mpButtonZ->getAlphaRate() != 1.0f) {
         if (dComIfGp_isZSetFlag(1)) {
@@ -2149,8 +2090,6 @@ void dMeterButton_c::setAlphaButtonZAnimeMax() {
     }
 }
 
-/* 802075C0-80207654 201F00 0094+00 1/1 0/0 0/0 .text setAlphaButton3DAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButton3DAnimeMin() {
     if (mpButton3D->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_3D_e] == 0) {
@@ -2168,8 +2107,6 @@ void dMeterButton_c::setAlphaButton3DAnimeMin() {
     }
 }
 
-/* 80207654-80207740 201F94 00EC+00 1/1 0/0 0/0 .text setAlphaButton3DAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButton3DAnimeMax() {
     if (mpButton3D->getAlphaRate() != 1.0f) {
         if (dComIfGp_is3DSetFlag(1)) {
@@ -2187,16 +2124,10 @@ void dMeterButton_c::setAlphaButton3DAnimeMax() {
     }
 }
 
-/* 80207740-80207744 202080 0004+00 1/1 0/0 0/0 .text
- * setAlphaButton3DVAnimeMin__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButton3DVAnimeMin() {}
 
-/* 80207744-80207748 202084 0004+00 1/1 0/0 0/0 .text
- * setAlphaButton3DVAnimeMax__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButton3DVAnimeMax() {}
 
-/* 80207748-802077EC 202088 00A4+00 1/1 0/0 0/0 .text setAlphaButtonCAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonCAnimeMin() {
     if (mpButtonC->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_C_e] == 0) {
@@ -2217,8 +2148,6 @@ void dMeterButton_c::setAlphaButtonCAnimeMin() {
     }
 }
 
-/* 802077EC-80207A28 20212C 023C+00 1/1 0/0 0/0 .text setAlphaButtonCAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonCAnimeMax() {
     if (mpButtonC->getAlphaRate() != 1.0f) {
         if (dComIfGp_isCStickSetFlag(1)) {
@@ -2265,8 +2194,6 @@ void dMeterButton_c::setAlphaButtonCAnimeMax() {
     }
 }
 
-/* 80207A28-80207AB8 202368 0090+00 1/1 0/0 0/0 .text setAlphaButtonSAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonSAnimeMin() {
     if (mpButtonS->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_S_e] == 0) {
@@ -2283,8 +2210,6 @@ void dMeterButton_c::setAlphaButtonSAnimeMin() {
     }
 }
 
-/* 80207AB8-80207BA4 2023F8 00EC+00 1/1 0/0 0/0 .text setAlphaButtonSAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonSAnimeMax() {
     if (mpButtonS->getAlphaRate() != 1.0f) {
         if (dComIfGp_isSButtonSetFlag(1)) {
@@ -2302,8 +2227,6 @@ void dMeterButton_c::setAlphaButtonSAnimeMax() {
     }
 }
 
-/* 80207BA4-80207C34 2024E4 0090+00 1/1 0/0 0/0 .text setAlphaButtonXAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonXAnimeMin() {
     if (mpButtonX->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_X_e] == 0) {
@@ -2320,8 +2243,6 @@ void dMeterButton_c::setAlphaButtonXAnimeMin() {
     }
 }
 
-/* 80207C34-80207D20 202574 00EC+00 1/1 0/0 0/0 .text setAlphaButtonXAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonXAnimeMax() {
     if (mpButtonX->getAlphaRate() != 1.0f) {
         if (dComIfGp_isXSetFlag(1)) {
@@ -2339,8 +2260,6 @@ void dMeterButton_c::setAlphaButtonXAnimeMax() {
     }
 }
 
-/* 80207D20-80207DB0 202660 0090+00 1/1 0/0 0/0 .text setAlphaButtonYAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonYAnimeMin() {
     if (mpButtonY->getAlphaRate() != 0.0f) {
         if (mButtonTimers[BUTTON_Y_e] == 0) {
@@ -2357,8 +2276,6 @@ void dMeterButton_c::setAlphaButtonYAnimeMin() {
     }
 }
 
-/* 80207DB0-80207E9C 2026F0 00EC+00 1/1 0/0 0/0 .text setAlphaButtonYAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonYAnimeMax() {
     if (mpButtonY->getAlphaRate() != 1.0f) {
         if (dComIfGp_isYSetFlag(1)) {
@@ -2376,8 +2293,6 @@ void dMeterButton_c::setAlphaButtonYAnimeMax() {
     }
 }
 
-/* 80207E9C-80207F34 2027DC 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunAnimeMin__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButtonNunAnimeMin() {
     if (mpButtonNun != NULL) {
         if (mpButtonNun->getAlphaRate() != 0.0f) {
@@ -2396,8 +2311,6 @@ void dMeterButton_c::setAlphaButtonNunAnimeMin() {
     }
 }
 
-/* 80207F34-80208028 202874 00F4+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunAnimeMax__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButtonNunAnimeMax() {
     if (mpButtonNun != NULL) {
         if (mpButtonNun->getAlphaRate() != 1.0f) {
@@ -2417,8 +2330,6 @@ void dMeterButton_c::setAlphaButtonNunAnimeMax() {
     }
 }
 
-/* 80208028-802080C0 202968 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonRemoAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonRemoAnimeMin() {
     if (mpButtonRemo != NULL) {
         if (mpButtonRemo->getAlphaRate() != 0.0f) {
@@ -2437,8 +2348,6 @@ void dMeterButton_c::setAlphaButtonRemoAnimeMin() {
     }
 }
 
-/* 802080C0-802081B4 202A00 00F4+00 1/1 0/0 0/0 .text
- * setAlphaButtonRemoAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonRemoAnimeMax() {
     if (mpButtonRemo != NULL) {
         if (mpButtonRemo->getAlphaRate() != 1.0f) {
@@ -2458,8 +2367,6 @@ void dMeterButton_c::setAlphaButtonRemoAnimeMax() {
     }
 }
 
-/* 802081B4-8020824C 202AF4 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonRemo2AnimeMin__14dMeterButton_cFv              */
 void dMeterButton_c::setAlphaButtonRemo2AnimeMin() {
     if (mpButtonRemo2 != NULL) {
         if (mpButtonRemo2->getAlphaRate() != 0.0f) {
@@ -2478,8 +2385,6 @@ void dMeterButton_c::setAlphaButtonRemo2AnimeMin() {
     }
 }
 
-/* 8020824C-80208340 202B8C 00F4+00 1/1 0/0 0/0 .text
- * setAlphaButtonRemo2AnimeMax__14dMeterButton_cFv              */
 void dMeterButton_c::setAlphaButtonRemo2AnimeMax() {
     if (mpButtonRemo2 != NULL) {
         if (mpButtonRemo2->getAlphaRate() != 1.0f) {
@@ -2499,8 +2404,6 @@ void dMeterButton_c::setAlphaButtonRemo2AnimeMax() {
     }
 }
 
-/* 80208340-802083D8 202C80 0098+00 1/1 0/0 0/0 .text setAlphaButtonARAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonARAnimeMin() {
     if (mpButtonAR != NULL) {
         if (mpButtonAR->getAlphaRate() != 0.0f) {
@@ -2519,8 +2422,6 @@ void dMeterButton_c::setAlphaButtonARAnimeMin() {
     }
 }
 
-/* 802083D8-802084D8 202D18 0100+00 1/1 0/0 0/0 .text setAlphaButtonARAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonARAnimeMax() {
     if (mpButtonAR != NULL) {
         if (mpButtonAR->getAlphaRate() != 1.0f) {
@@ -2540,8 +2441,6 @@ void dMeterButton_c::setAlphaButtonARAnimeMax() {
     }
 }
 
-/* 802084D8-80208570 202E18 0098+00 1/1 0/0 0/0 .text
- * setAlphaButton3DBAnimeMin__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButton3DBAnimeMin() {
     if (mpButton3DB != NULL) {
         if (mpButton3DB->getAlphaRate() != 0.0f) {
@@ -2560,8 +2459,6 @@ void dMeterButton_c::setAlphaButton3DBAnimeMin() {
     }
 }
 
-/* 80208570-80208670 202EB0 0100+00 1/1 0/0 0/0 .text
- * setAlphaButton3DBAnimeMax__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButton3DBAnimeMax() {
     if (mpButton3DB != NULL) {
         if (mpButton3DB->getAlphaRate() != 1.0f) {
@@ -2581,8 +2478,6 @@ void dMeterButton_c::setAlphaButton3DBAnimeMax() {
     }
 }
 
-/* 80208670-80208708 202FB0 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonNUREAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNUREAnimeMin() {
     if (mpButtonNURE != NULL) {
         if (mpButtonNURE->getAlphaRate() != 0.0f) {
@@ -2601,8 +2496,6 @@ void dMeterButton_c::setAlphaButtonNUREAnimeMin() {
     }
 }
 
-/* 80208708-80208808 203048 0100+00 1/1 0/0 0/0 .text
- * setAlphaButtonNUREAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNUREAnimeMax() {
     if (mpButtonNURE != NULL) {
         if (mpButtonNURE->getAlphaRate() != 1.0f) {
@@ -2622,8 +2515,6 @@ void dMeterButton_c::setAlphaButtonNUREAnimeMax() {
     }
 }
 
-/* 80208808-802088A0 203148 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonReelAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonReelAnimeMin() {
     if (mpButtonReel != NULL) {
         if (mpButtonReel->getAlphaRate() != 0.0f) {
@@ -2642,8 +2533,6 @@ void dMeterButton_c::setAlphaButtonReelAnimeMin() {
     }
 }
 
-/* 802088A0-802089A0 2031E0 0100+00 1/1 0/0 0/0 .text
- * setAlphaButtonReelAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonReelAnimeMax() {
     if (mpButtonReel != NULL) {
         if (mpButtonReel->getAlphaRate() != 1.0f) {
@@ -2663,8 +2552,6 @@ void dMeterButton_c::setAlphaButtonReelAnimeMax() {
     }
 }
 
-/* 802089A0-80208A38 2032E0 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonReel2AnimeMin__14dMeterButton_cFv              */
 void dMeterButton_c::setAlphaButtonReel2AnimeMin() {
     if (mpButtonReel2 != NULL) {
         if (mpButtonReel2->getAlphaRate() != 0.0f) {
@@ -2683,8 +2570,6 @@ void dMeterButton_c::setAlphaButtonReel2AnimeMin() {
     }
 }
 
-/* 80208A38-80208AEC 203378 00B4+00 1/1 0/0 0/0 .text
- * setAlphaButtonReel2AnimeMax__14dMeterButton_cFv              */
 void dMeterButton_c::setAlphaButtonReel2AnimeMax() {
     if (mpButtonReel2 != NULL) {
         if (mpButtonReel2->getAlphaRate() != 1.0f) {
@@ -2699,8 +2584,6 @@ void dMeterButton_c::setAlphaButtonReel2AnimeMax() {
     }
 }
 
-/* 80208AEC-80208B84 20342C 0098+00 1/1 0/0 0/0 .text setAlphaButtonABAnimeMin__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonABAnimeMin() {
     if (mpButtonAB != NULL) {
         if (mpButtonAB->getAlphaRate() != 0.0f) {
@@ -2719,8 +2602,6 @@ void dMeterButton_c::setAlphaButtonABAnimeMin() {
     }
 }
 
-/* 80208B84-80208C38 2034C4 00B4+00 1/1 0/0 0/0 .text setAlphaButtonABAnimeMax__14dMeterButton_cFv
- */
 void dMeterButton_c::setAlphaButtonABAnimeMax() {
     if (mpButtonAB != NULL) {
         if (mpButtonAB->getAlphaRate() != 1.0f) {
@@ -2735,8 +2616,6 @@ void dMeterButton_c::setAlphaButtonABAnimeMax() {
     }
 }
 
-/* 80208C38-80208CD0 203578 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonTateAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonTateAnimeMin() {
     if (mpButtonTate != NULL) {
         if (mpButtonTate->getAlphaRate() != 0.0f) {
@@ -2755,8 +2634,6 @@ void dMeterButton_c::setAlphaButtonTateAnimeMin() {
     }
 }
 
-/* 80208CD0-80208D84 203610 00B4+00 1/1 0/0 0/0 .text
- * setAlphaButtonTateAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonTateAnimeMax() {
     if (mpButtonTate != NULL) {
         if (mpButtonTate->getAlphaRate() != 1.0f) {
@@ -2771,8 +2648,6 @@ void dMeterButton_c::setAlphaButtonTateAnimeMax() {
     }
 }
 
-/* 80208D84-80208E1C 2036C4 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunZAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNunZAnimeMin() {
     if (mpButtonNunZ != NULL) {
         if (mpButtonNunZ->getAlphaRate() != 0.0f) {
@@ -2791,8 +2666,6 @@ void dMeterButton_c::setAlphaButtonNunZAnimeMin() {
     }
 }
 
-/* 80208E1C-80208F1C 20375C 0100+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunZAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNunZAnimeMax() {
     if (mpButtonNunZ != NULL) {
         if (mpButtonNunZ->getAlphaRate() != 1.0f) {
@@ -2812,8 +2685,6 @@ void dMeterButton_c::setAlphaButtonNunZAnimeMax() {
     }
 }
 
-/* 80208F1C-80208FB4 20385C 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunCAnimeMin__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNunCAnimeMin() {
     if (mpButtonNunC != NULL) {
         if (mpButtonNunC->getAlphaRate() != 0.0f) {
@@ -2832,8 +2703,6 @@ void dMeterButton_c::setAlphaButtonNunCAnimeMin() {
     }
 }
 
-/* 80208FB4-802090B4 2038F4 0100+00 1/1 0/0 0/0 .text
- * setAlphaButtonNunCAnimeMax__14dMeterButton_cFv               */
 void dMeterButton_c::setAlphaButtonNunCAnimeMax() {
     if (mpButtonNunC != NULL) {
         if (mpButtonNunC->getAlphaRate() != 1.0f) {
@@ -2853,8 +2722,6 @@ void dMeterButton_c::setAlphaButtonNunCAnimeMax() {
     }
 }
 
-/* 802090B4-8020914C 2039F4 0098+00 1/1 0/0 0/0 .text
- * setAlphaButtonBinAnimeMin__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButtonBinAnimeMin() {
     if (mpButtonBin != NULL) {
         if (mpButtonBin->getAlphaRate() != 0.0f) {
@@ -2873,8 +2740,6 @@ void dMeterButton_c::setAlphaButtonBinAnimeMin() {
     }
 }
 
-/* 8020914C-8020924C 203A8C 0100+00 1/1 0/0 0/0 .text
- * setAlphaButtonBinAnimeMax__14dMeterButton_cFv                */
 void dMeterButton_c::setAlphaButtonBinAnimeMax() {
     if (mpButtonBin != NULL) {
         if (mpButtonBin->getAlphaRate() != 1.0f) {
@@ -2894,8 +2759,6 @@ void dMeterButton_c::setAlphaButtonBinAnimeMax() {
     }
 }
 
-/* 8020924C-802092C0 203B8C 0074+00 1/1 0/0 0/0 .text setAlphaButtonOAnimeMin__14dMeterButton_cFi
- */
 void dMeterButton_c::setAlphaButtonOAnimeMin(int param_0) {
     if (mpText[param_0]->getAlphaRate() != 0.0f) {
         isFastSet(param_0);
@@ -2904,8 +2767,6 @@ void dMeterButton_c::setAlphaButtonOAnimeMin(int param_0) {
     }
 }
 
-/* 802092C0-80209368 203C00 00A8+00 1/1 0/0 0/0 .text setAlphaButtonOAnimeMax__14dMeterButton_cFi
- */
 void dMeterButton_c::setAlphaButtonOAnimeMax(int param_0) {
     if (mpText[param_0]->getAlphaRate() != 1.0f) {
         if (isFastSet(param_0)) {
@@ -2918,7 +2779,6 @@ void dMeterButton_c::setAlphaButtonOAnimeMax(int param_0) {
     }
 }
 
-/* 80209368-802093D8 203CA8 0070+00 1/1 0/0 0/0 .text setAlphaIconAnimeMin__14dMeterButton_cFv */
 void dMeterButton_c::setAlphaIconAnimeMin() {
     if (mpItem_c->getAlphaRate() != 0.0f) {
         if (field_0x4d9 != 0xFF) {
@@ -2931,7 +2791,6 @@ void dMeterButton_c::setAlphaIconAnimeMin() {
     }
 }
 
-/* 802093D8-80209474 203D18 009C+00 1/1 0/0 0/0 .text setAlphaIconAnimeMax__14dMeterButton_cFv */
 void dMeterButton_c::setAlphaIconAnimeMax() {
     if (mpItem_c->getAlphaRate() != 1.0f) {
         if (field_0x4d9 != 0xFF && isFastSet(field_0x4d9)) {
@@ -2944,7 +2803,6 @@ void dMeterButton_c::setAlphaIconAnimeMax() {
     }
 }
 
-/* 80209474-802095C0 203DB4 014C+00 0/0 1/1 0/0 .text            isClose__14dMeterButton_cFv */
 bool dMeterButton_c::isClose() {
     if (mpButtonA->getAlphaRate() == 0.0f && mpButtonB->getAlphaRate() == 0.0f &&
         mpButtonR->getAlphaRate() == 0.0f && mpButtonZ->getAlphaRate() == 0.0f &&
@@ -2960,7 +2818,6 @@ bool dMeterButton_c::isClose() {
     return false;
 }
 
-/* 802095C0-80209CEC 203F00 072C+00 0/0 1/1 0/0 .text setString__14dMeterButton_cFPcUcUcUc */
 void dMeterButton_c::setString(char* i_string, u8 i_button, u8 param_2, u8 param_3) {
     if (strcmp(mButtonText[param_2], i_string) != 0 || field_0x4be[param_2] != i_button) {
         if (param_2 == 0 && strcmp(mButtonText[1], i_string) == 0 &&
@@ -3080,7 +2937,6 @@ void dMeterButton_c::setString(char* i_string, u8 i_button, u8 param_2, u8 param
     }
 }
 
-/* 80209CEC-80209D7C 20462C 0090+00 0/0 1/1 0/0 .text            hideAll__14dMeterButton_cFv */
 void dMeterButton_c::hideAll() {
     mpButtonScreen->search('ROOT')->hide();
 
@@ -3092,7 +2948,6 @@ void dMeterButton_c::hideAll() {
     mpTmRoot_c->hide();
 }
 
-/* 80209D7C-8020A540 2046BC 07C4+00 2/1 0/0 0/0 .text getCenterPosCalc__14dMeterButton_cFUcPci */
 f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
     f32 temp_f0 = 1.0f;
     field_0x1e4[param_2] =
@@ -3224,8 +3079,6 @@ f32 dMeterButton_c::getCenterPosCalc(u8 i_button, char* i_string, int param_2) {
     return (var_f29 + var_f28) * 0.5f;
 }
 
-/* 8020A540-8020A94C 204E80 040C+00 2/1 0/0 0/0 .text            trans_button__14dMeterButton_cFif
- */
 void dMeterButton_c::trans_button(int param_0, f32 param_1) {
     u8 button = field_0x4be[param_0];
 
@@ -3320,8 +3173,6 @@ void dMeterButton_c::trans_button(int param_0, f32 param_1) {
     }
 }
 
-/* 8020A94C-8020AA84 20528C 0138+00 23/23 0/0 0/0 .text            hide_button__14dMeterButton_cFUc
- */
 void dMeterButton_c::hide_button(u8 i_button) {
     if (field_0x4be[0] == i_button) {
         if (field_0x4be[1] != BUTTON_NONE_e && field_0x4be[1] != BUTTON_B_e) {
@@ -3354,7 +3205,6 @@ void dMeterButton_c::hide_button(u8 i_button) {
     }
 }
 
-/* 8020AA84-8020AE68 2053C4 03E4+00 1/1 0/0 0/0 .text            pikariCheck__14dMeterButton_cFv */
 void dMeterButton_c::pikariCheck() {
     for (int i = 0; i < 2; i++) {
         if (field_0x4d7[i] != 0) {
@@ -3418,8 +3268,6 @@ void dMeterButton_c::pikariCheck() {
     }
 }
 
-/* 8020AE68-8020AE8C 2057A8 0024+00 3/3 0/0 0/0 .text paneTrans__14dMeterButton_cFP8CPaneMgrffUc
- */
 void dMeterButton_c::paneTrans(CPaneMgr* i_pane, f32 i_transX, f32 i_transY, u8 unused) {
     i_pane->paneTrans(i_transX, i_transY);
 }
diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp
index df8c3323a5..f1b647502a 100644
--- a/src/d/d_meter_haihai.cpp
+++ b/src/d/d_meter_haihai.cpp
@@ -12,18 +12,15 @@
 #include "d/d_meter_HIO.h"
 #include "d/d_pane_class.h"
 
-/* 8020AE8C-8020AEF0 2057CC 0064+00 0/0 4/4 0/0 .text            __ct__14dMeterHaihai_cFUc */
 dMeterHaihai_c::dMeterHaihai_c(u8 i_type) {
     mType = i_type;
     _create();
 }
 
-/* 8020AEF0-8020AF6C 205830 007C+00 1/0 0/0 0/0 .text            __dt__14dMeterHaihai_cFv */
 dMeterHaihai_c::~dMeterHaihai_c() {
     _delete();
 }
 
-/* 8020AF6C-8020B0F4 2058AC 0188+00 1/0 0/0 0/0 .text            _create__14dMeterHaihai_cFv */
 int dMeterHaihai_c::_create() {
     mpHaihaiScreen = new J2DScreen();
     JUT_ASSERT(0, mpHaihaiScreen != NULL);
@@ -56,7 +53,6 @@ int dMeterHaihai_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8020B0F4-8020B140 205A34 004C+00 1/0 0/0 0/0 .text            _execute__14dMeterHaihai_cFUl */
 int dMeterHaihai_c::_execute(u32 i_flags) {
     mFlags = i_flags;
     updateHaihai();
@@ -64,7 +60,6 @@ int dMeterHaihai_c::_execute(u32 i_flags) {
     return 1;
 }
 
-/* 8020B140-8020B518 205A80 03D8+00 1/0 0/0 0/0 .text            draw__14dMeterHaihai_cFv */
 void dMeterHaihai_c::draw() {
     if ((mFlags & 8) || (mFlags & 0x10) || (mFlags & 0x1000000) || (mFlags & 0x800000) ||
         (mFlags & 0x20) || (mFlags & 0x4000000))
@@ -132,7 +127,6 @@ void dMeterHaihai_c::draw() {
     }
 }
 
-/* 8020B518-8020B814 205E58 02FC+00 0/0 1/1 0/0 .text            drawHaihai__14dMeterHaihai_cFUc */
 void dMeterHaihai_c::drawHaihai(u8 i_direction) {
     f32 center_x = 304.0f;
     f32 center_y = 224.0f;
@@ -188,8 +182,6 @@ void dMeterHaihai_c::drawHaihai(u8 i_direction) {
     }
 }
 
-/* 8020B814-8020B9B0 206154 019C+00 0/0 2/2 0/0 .text            drawHaihai__14dMeterHaihai_cFUcffff
- */
 void dMeterHaihai_c::drawHaihai(u8 i_direction, f32 i_posX, f32 i_posY, f32 param_3, f32 param_4) {
     if (mType == 1) {
         i_posX += (3.0f + g_drawHIO.mScrollArrowCenterPosX);
@@ -216,8 +208,6 @@ void dMeterHaihai_c::drawHaihai(u8 i_direction, f32 i_posX, f32 i_posY, f32 para
     }
 }
 
-/* 8020B9B0-8020BA4C 2062F0 009C+00 2/2 0/0 0/0 .text            drawHaihaiLeft__14dMeterHaihai_cFff
- */
 void dMeterHaihai_c::drawHaihaiLeft(f32 i_transX, f32 i_transY) {
     mpParent->translate(i_transX, i_transY);
     mpParent->getPanePtr()->rotate(mpParent->getPanePtr()->getWidth() / 2,
@@ -225,7 +215,6 @@ void dMeterHaihai_c::drawHaihaiLeft(f32 i_transX, f32 i_transY) {
     mpHaihaiScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
 
-/* 8020BA4C-8020BAE8 20638C 009C+00 2/2 0/0 0/0 .text drawHaihaiRight__14dMeterHaihai_cFff */
 void dMeterHaihai_c::drawHaihaiRight(f32 i_transX, f32 i_transY) {
     mpParent->translate(i_transX, i_transY);
     mpParent->getPanePtr()->rotate(mpParent->getPanePtr()->getWidth() / 2,
@@ -233,8 +222,6 @@ void dMeterHaihai_c::drawHaihaiRight(f32 i_transX, f32 i_transY) {
     mpHaihaiScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
 
-/* 8020BAE8-8020BB84 206428 009C+00 2/2 0/0 0/0 .text            drawHaihaiTop__14dMeterHaihai_cFff
- */
 void dMeterHaihai_c::drawHaihaiTop(f32 i_transX, f32 i_transY) {
     mpParent->translate(i_transX, i_transY);
     mpParent->getPanePtr()->rotate(mpParent->getPanePtr()->getWidth() / 2,
@@ -242,7 +229,6 @@ void dMeterHaihai_c::drawHaihaiTop(f32 i_transX, f32 i_transY) {
     mpHaihaiScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
 
-/* 8020BB84-8020BC20 2064C4 009C+00 2/2 0/0 0/0 .text drawHaihaiBottom__14dMeterHaihai_cFff */
 void dMeterHaihai_c::drawHaihaiBottom(f32 i_transX, f32 i_transY) {
     mpParent->translate(i_transX, i_transY);
     mpParent->getPanePtr()->rotate(mpParent->getPanePtr()->getWidth() / 2,
@@ -250,7 +236,6 @@ void dMeterHaihai_c::drawHaihaiBottom(f32 i_transX, f32 i_transY) {
     mpHaihaiScreen->draw(0.0f, 0.0f, dComIfGp_getCurrentGrafPort());
 }
 
-/* 8020BC20-8020BDAC 206560 018C+00 1/1 1/1 0/0 .text            setScale__14dMeterHaihai_cFf */
 void dMeterHaihai_c::setScale(f32 i_scaleFactor) {
     if (mType == 1) {
         mpParent->scale(g_drawHIO.mScrollArrowScaleX * 0.6f * 0.8f * 0.8f * i_scaleFactor,
@@ -270,7 +255,6 @@ void dMeterHaihai_c::setScale(f32 i_scaleFactor) {
     }
 }
 
-/* 8020BDAC-8020BEA0 2066EC 00F4+00 1/0 0/0 0/0 .text            _delete__14dMeterHaihai_cFv */
 int dMeterHaihai_c::_delete() {
     delete mpHaihaiScreen;
     mpHaihaiScreen = NULL;
@@ -289,10 +273,8 @@ int dMeterHaihai_c::_delete() {
     return 1;
 }
 
-/* 8020BEA0-8020BEA4 2067E0 0004+00 1/1 0/0 0/0 .text alphaAnimeHaihai__14dMeterHaihai_cFUl */
 void dMeterHaihai_c::alphaAnimeHaihai(u32 i_flags) {}
 
-/* 8020BEA4-8020BF00 2067E4 005C+00 1/1 0/0 0/0 .text            updateHaihai__14dMeterHaihai_cFv */
 void dMeterHaihai_c::updateHaihai() {
     playBckAnime(mpCursorBck);
     playBtkAnime(mpCursorBtk);
@@ -301,8 +283,6 @@ void dMeterHaihai_c::updateHaihai() {
     setScale(1.0f);
 }
 
-/* 8020BF00-8020C078 206840 0178+00 1/1 0/0 0/0 .text
- * playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey         */
 void dMeterHaihai_c::playBckAnime(J2DAnmTransformKey* i_bck) {
     if (checkPlayAnime(1)) {
         if (i_bck != NULL) {
@@ -326,8 +306,6 @@ void dMeterHaihai_c::playBckAnime(J2DAnmTransformKey* i_bck) {
     }
 }
 
-/* 8020C078-8020C1CC 2069B8 0154+00 1/1 0/0 0/0 .text
- * playBtkAnime__14dMeterHaihai_cFP19J2DAnmTextureSRTKey        */
 void dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey* i_btk) {
     if (checkPlayAnime(2)) {
         if (i_btk != NULL) {
@@ -350,8 +328,6 @@ void dMeterHaihai_c::playBtkAnime(J2DAnmTextureSRTKey* i_btk) {
     }
 }
 
-/* 8020C1CC-8020C320 206B0C 0154+00 1/1 0/0 0/0 .text
- * playBpkAnime__14dMeterHaihai_cFP11J2DAnmColor                */
 void dMeterHaihai_c::playBpkAnime(J2DAnmColor* i_bpk) {
     if (checkPlayAnime(0)) {
         if (i_bpk != NULL) {
diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp
index 6415691b28..ab9a0fc833 100644
--- a/src/d/d_meter_hakusha.cpp
+++ b/src/d/d_meter_hakusha.cpp
@@ -14,18 +14,15 @@
 #include "d/d_meter_HIO.h"
 #include "d/d_pane_class.h"
 
-/* 8020C320-8020C384 206C60 0064+00 0/0 1/1 0/0 .text            __ct__15dMeterHakusha_cFPv */
 dMeterHakusha_c::dMeterHakusha_c(void* i_screen) {
     field_0x004 = (J2DScreen*)i_screen;
     _create();
 }
 
-/* 8020C384-8020C400 206CC4 007C+00 1/0 0/0 0/0 .text            __dt__15dMeterHakusha_cFv */
 dMeterHakusha_c::~dMeterHakusha_c() {
     _delete();
 }
 
-/* 8020C400-8020C808 206D40 0408+00 1/0 0/0 0/0 .text            _create__15dMeterHakusha_cFv */
 int dMeterHakusha_c::_create() {
     static u64 haku_tag[] = {
         'haku_n00', 'haku_n01', 'haku_n02', 'haku_n03', 'haku_n04', 'haku_n05',
@@ -103,14 +100,12 @@ int dMeterHakusha_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8020C808-8020C850 207148 0048+00 1/0 0/0 0/0 .text            _execute__15dMeterHakusha_cFUl */
 int dMeterHakusha_c::_execute(u32 i_flags) {
     updateHakusha();
     alphaAnimeHakusha(i_flags);
     return 1;
 }
 
-/* 8020C850-8020CABC 207190 026C+00 1/0 0/0 0/0 .text            draw__15dMeterHakusha_cFv */
 void dMeterHakusha_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
@@ -156,7 +151,6 @@ void dMeterHakusha_c::draw() {
     }
 }
 
-/* 8020CABC-8020CC58 2073FC 019C+00 1/0 0/0 0/0 .text            _delete__15dMeterHakusha_cFv */
 int dMeterHakusha_c::_delete() {
     for (int i = 0; i < 6; i++) {
         delete mpHakushaPos[i];
@@ -185,7 +179,6 @@ int dMeterHakusha_c::_delete() {
     return 1;
 }
 
-/* 8020CC58-8020CD6C 207598 0114+00 1/1 0/0 0/0 .text alphaAnimeHakusha__15dMeterHakusha_cFUl */
 void dMeterHakusha_c::alphaAnimeHakusha(u32 i_flags) {
     if ((i_flags & 0x4000) || (i_flags & 0x40) || (i_flags & 0x100000) || (i_flags & 0x1000) ||
         (i_flags & 8) || (i_flags & 0x10) || (i_flags & 0x20) || (i_flags & 0x04000000) ||
@@ -207,8 +200,6 @@ void dMeterHakusha_c::alphaAnimeHakusha(u32 i_flags) {
     }
 }
 
-/* 8020CD6C-8020D258 2076AC 04EC+00 1/1 0/0 0/0 .text            updateHakusha__15dMeterHakusha_cFv
- */
 void dMeterHakusha_c::updateHakusha() {
     Vec sp2C = mpHakushaPos[0]->getGlobalVtxCenter(false, 0);
     Vec sp20 = mpHakushaPos[5]->getGlobalVtxCenter(false, 0);
@@ -300,8 +291,6 @@ void dMeterHakusha_c::updateHakusha() {
     }
 }
 
-/* 8020D258-8020D308 207B98 00B0+00 1/1 0/0 0/0 .text setAlphaHakushaAnimeMin__15dMeterHakusha_cFv
- */
 void dMeterHakusha_c::setAlphaHakushaAnimeMin() {
     if (mpHakushaOn->getAlphaRate() != 0.0f) {
         mpHakushaOn->setAlphaRate(g_drawHIO.mSpurIconAlpha);
@@ -314,8 +303,6 @@ void dMeterHakusha_c::setAlphaHakushaAnimeMin() {
     }
 }
 
-/* 8020D308-8020D3B8 207C48 00B0+00 1/1 0/0 0/0 .text setAlphaHakushaAnimeMax__15dMeterHakusha_cFv
- */
 void dMeterHakusha_c::setAlphaHakushaAnimeMax() {
     if (mpHakushaOn->getAlphaRate() != g_drawHIO.mSpurIconAlpha) {
         mpHakushaOn->setAlphaRate(g_drawHIO.mSpurIconAlpha);
@@ -328,8 +315,6 @@ void dMeterHakusha_c::setAlphaHakushaAnimeMax() {
     }
 }
 
-/* 8020D3B8-8020D41C 207CF8 0064+00 1/1 0/0 0/0 .text setAlphaButtonAnimeMin__15dMeterHakusha_cFv
- */
 void dMeterHakusha_c::setAlphaButtonAnimeMin() {
     if (mpButtonA->getAlphaRate() != 0.0f) {
         mpButtonA->setAlphaRate(1.0f);
@@ -337,8 +322,6 @@ void dMeterHakusha_c::setAlphaButtonAnimeMin() {
     }
 }
 
-/* 8020D41C-8020D480 207D5C 0064+00 1/1 0/0 0/0 .text setAlphaButtonAnimeMax__15dMeterHakusha_cFv
- */
 void dMeterHakusha_c::setAlphaButtonAnimeMax() {
     if (mpButtonA->getAlphaRate() != 1.0f) {
         mpButtonA->setAlphaRate(1.0f);
@@ -346,8 +329,6 @@ void dMeterHakusha_c::setAlphaButtonAnimeMax() {
     }
 }
 
-/* 8020D480-8020D49C 207DC0 001C+00 2/2 0/0 0/0 .text            getHakushaNum__15dMeterHakusha_cFv
- */
 int dMeterHakusha_c::getHakushaNum() {
     int hakusha_num = g_drawHIO.mMaxSpurAmount;
     if (hakusha_num > 12) {
diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp
index 6c977833ba..ae82fb052f 100644
--- a/src/d/d_meter_map.cpp
+++ b/src/d/d_meter_map.cpp
@@ -15,7 +15,6 @@
 #include "f_op/f_op_overlap_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 
-/* 8020D49C-8020D528 207DDC 008C+00 1/1 0/0 0/0 .text            isEnableDispMap__11dMeterMap_cFv */
 bool dMeterMap_c::isEnableDispMap() {
     bool minimapEnable = false;
     stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
@@ -31,7 +30,6 @@ bool dMeterMap_c::isEnableDispMap() {
     return enableMap;
 }
 
-/* 8020D528-8020D650 207E68 0128+00 3/3 0/0 0/0 .text getMapDispSizeTypeNo__11dMeterMap_cFv */
 int dMeterMap_c::getMapDispSizeTypeNo() {
     int uvar6 = 7;
 
@@ -78,8 +76,6 @@ int dMeterMap_c::getMapDispSizeTypeNo() {
     return mapDispSizeType;
 }
 
-/* 8020D650-8020D690 207F90 0040+00 5/5 3/3 0/0 .text
- * isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv         */
 bool dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo() {
     if (isEnableDispMap() && getMapDispSizeTypeNo()) {
         return true;
@@ -88,13 +84,10 @@ bool dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo() {
     return false;
 }
 
-/* 8020D690-8020D698 207FD0 0008+00 2/2 0/0 0/0 .text
- * getMapDispEdgeBottomY_Layout__11dMeterMap_cFv                */
 f32 dMeterMap_c::getMapDispEdgeBottomY_Layout() {
     return 421.0f;
 }
 
-/* 8020D698-8020D72C 207FD8 0094+00 2/2 0/0 0/0 .text            isEventRunCheck__11dMeterMap_cFv */
 bool dMeterMap_c::isEventRunCheck() {
     if (dComIfGp_event_runCheck()) {
         return true;
@@ -105,14 +98,10 @@ bool dMeterMap_c::isEventRunCheck() {
     return dComIfGp_event_runCheck() != field_0x30 ? 1 : 0;
 }
 
-/* 8020D72C-8020D75C 20806C 0030+00 2/2 0/0 0/0 .text getMapDispEdgeLeftX_Layout__11dMeterMap_cFv
- */
 f32 dMeterMap_c::getMapDispEdgeLeftX_Layout() {
     return field_0x28 + 35;
 }
 
-/* 8020D75C-8020D7E4 20809C 0088+00 0/0 1/1 0/0 .text            getMapDispEdgeTop__11dMeterMap_cFv
- */
 f32 dMeterMap_c::getMapDispEdgeTop() {
     f32 tmp = 0.0f;
     if (mMap != NULL) {
@@ -123,13 +112,10 @@ f32 dMeterMap_c::getMapDispEdgeTop() {
     return getMapDispEdgeBottomY_Layout() - tmp;
 }
 
-/* 8020D7E4-8020D7EC 208124 0008+00 2/2 0/0 0/0 .text getDispPosInside_OffsetX__11dMeterMap_cFv */
 s16 dMeterMap_c::getDispPosInside_OffsetX() {
     return 0;
 }
 
-/* 8020D7EC-8020D874 20812C 0088+00 2/2 0/0 0/0 .text getDispPosOutSide_OffsetX__11dMeterMap_cFv
- */
 s16 dMeterMap_c::getDispPosOutSide_OffsetX() {
     f32 dvar3 = -36.0f - mSizeW;
     f32 offset = 0.0f;
@@ -141,8 +127,6 @@ s16 dMeterMap_c::getDispPosOutSide_OffsetX() {
     return dvar3 - getMapDispEdgeLeftX_Layout();
 }
 
-/* 8020D874-8020D8BC 2081B4 0048+00 2/2 2/2 0/0 .text setDispPosInsideFlg_SE_On__11dMeterMap_cFv
- */
 void dMeterMap_c::setDispPosInsideFlg_SE_On() {
     if (isEnableDispMapAndMapDispSizeTypeNo()) {
         dComIfGp_mapShow();
@@ -151,36 +135,28 @@ void dMeterMap_c::setDispPosInsideFlg_SE_On() {
     }
 }
 
-/* 8020D8BC-8020D8F8 2081FC 003C+00 1/1 2/2 0/0 .text setDispPosOutsideFlg_SE_On__11dMeterMap_cFv
- */
 void dMeterMap_c::setDispPosOutsideFlg_SE_On() {
     dComIfGp_mapHide();
     field_0x2d = 0;
     field_0x2e = 7;
 }
 
-/* 8020D8F8-8020D900 -00001 0008+00 0/0 0/0 0/0 .text            setMapAlpha__11dMeterMap_cFUc */
 void dMeterMap_c::setMapAlpha(u8 i_alpha) {
     mMapAlpha = i_alpha;
 }
 
-/* 8020D900-8020D948 208240 0048+00 3/3 1/1 0/0 .text            isMapOpenCheck__11dMeterMap_cFv */
 bool dMeterMap_c::isMapOpenCheck() {
     return dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 7 ? false : true;
 }
 
-/* 8020D948-8020D990 208288 0048+00 0/0 1/1 0/0 .text            __ct__11dMeterMap_cFP9J2DScreen */
 dMeterMap_c::dMeterMap_c(J2DScreen* i_scrn) {
     _create(i_scrn);
 }
 
-/* 8020D990-8020D9EC 2082D0 005C+00 1/0 0/0 0/0 .text            __dt__11dMeterMap_cFv */
 dMeterMap_c::~dMeterMap_c() {
     _delete();
 }
 
-/* 8020D9EC-8020DC50 20832C 0264+00 1/1 0/0 0/0 .text            _create__11dMeterMap_cFP9J2DScreen
- */
 void dMeterMap_c::_create(J2DScreen* unused) {
     s32 sizeX;
     s32 sizeY;
@@ -264,7 +240,6 @@ void dMeterMap_c::_create(J2DScreen* unused) {
     field_0x2b = dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118]);
 }
 
-/* 8020DC50-8020DCE4 208590 0094+00 1/1 0/0 0/0 .text            _delete__11dMeterMap_cFv */
 void dMeterMap_c::_delete() {
     if (mMapJ2DPicture != NULL) {
         delete mMapJ2DPicture;
@@ -283,7 +258,6 @@ void dMeterMap_c::_delete() {
     }
 }
 
-/* 8020DCE4-8020DF1C 208624 0238+00 0/0 1/1 0/0 .text            _move__11dMeterMap_cFUl */
 void dMeterMap_c::_move(u32 param_0) {
                        /* dSv_event_flag_c::M_085 - Twilight Hyrule Field - Midna dialogue right before Boss Bug's Tear of Light appears */
     if (!field_0x2b && dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[118])) {
@@ -326,13 +300,11 @@ void dMeterMap_c::_move(u32 param_0) {
     field_0x30 = dComIfGp_event_runCheck();
 }
 
-/* 8020DF1C-8020DF68 20885C 004C+00 0/0 1/1 0/0 .text            _draw__11dMeterMap_cFv */
 void dMeterMap_c::_draw() {
     mMap->_draw();
     dComIfGd_set2DOpa(this);
 }
 
-/* 8020DF68-8020E070 2088A8 0108+00 1/0 0/0 0/0 .text            draw__11dMeterMap_cFv */
 void dMeterMap_c::draw() {
     if (mMap != NULL && mMap->isDraw()) {
         dComIfGp_getCurrentGrafPort()->setup2D();
@@ -347,7 +319,6 @@ void dMeterMap_c::draw() {
     }
 }
 
-/* 8020E070-8020E45C 2089B0 03EC+00 2/1 0/0 0/0 .text            ctrlShowMap__11dMeterMap_cFv */
 void dMeterMap_c::ctrlShowMap() {
     if (!dMeter2Info_isGameStatus(1)) {
         if (!isMapOpenCheck() && !isEventRunCheck()) {
@@ -439,7 +410,6 @@ void dMeterMap_c::ctrlShowMap() {
     }
 }
 
-/* 8020E45C-8020E4C8 208D9C 006C+00 1/1 0/0 0/0 .text            checkMoveStatus__11dMeterMap_cFv */
 u8 dMeterMap_c::checkMoveStatus() {
     u8 rv;
     if (isShow(field_0x14)) {
@@ -458,7 +428,6 @@ u8 dMeterMap_c::checkMoveStatus() {
     return rv;
 }
 
-/* 8020E4C8-8020E620 208E08 0158+00 2/2 0/0 0/0 .text            isShow__11dMeterMap_cFUl */
 bool dMeterMap_c::isShow(u32 param_0) {
     if ((param_0 & 0x4000) || fopOvlpM_IsDoingReq() ||
         ((param_0 & 0x40) && dComIfGp_event_checkHind(0x100) &&
@@ -475,7 +444,6 @@ bool dMeterMap_c::isShow(u32 param_0) {
     return true;
 }
 
-/* 8020E620-8020E70C 208F60 00EC+00 3/3 0/0 0/0 .text            isFmapScreen__11dMeterMap_cFv */
 bool dMeterMap_c::isFmapScreen() {
     if (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 0 ||
         dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 5 ||
@@ -488,12 +456,10 @@ bool dMeterMap_c::isFmapScreen() {
     return false;
 }
 
-/* 8020E70C-8020E754 20904C 0048+00 3/3 0/0 0/0 .text            isDmapScreen__11dMeterMap_cFv */
 bool dMeterMap_c::isDmapScreen() {
     return dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo()) == 1 ? 1 : 0;
 }
 
-/* 8020E754-8020E9CC 209094 0278+00 0/0 1/1 0/0 .text            meter_map_move__11dMeterMap_cFUl */
 void dMeterMap_c::meter_map_move(u32 param_0) {
     if (isShow(param_0) && isMapOpenCheck()) {
         if (dMeter2Info_getPauseStatus() == 6) {
@@ -537,7 +503,6 @@ void dMeterMap_c::meter_map_move(u32 param_0) {
     }
 }
 
-/* 8020E9CC-8020ED60 20930C 0394+00 1/1 0/0 0/0 .text            keyCheck__11dMeterMap_cFv */
 void dMeterMap_c::keyCheck() {
     if (dMw_LEFT_TRIGGER() && !isEventRunCheck() &&
         (dMeter2Info_getMapStatus() == 0 || dMeter2Info_getMapStatus() == 1))
diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp
index 64db4a53b5..c416244d18 100644
--- a/src/d/d_meter_string.cpp
+++ b/src/d/d_meter_string.cpp
@@ -17,7 +17,6 @@
 #include "d/d_meter_HIO.h"
 #include "d/d_pane_class.h"
 
-/* 8020ED60-8020EDF4 2096A0 0094+00 0/0 1/1 0/0 .text            __ct__14dMeterString_cFi */
 dMeterString_c::dMeterString_c(int i_stringID) {
     mpMapArchive = dComIfGp_getAllMapArchive();
     field_0x28 = 0;
@@ -29,12 +28,10 @@ dMeterString_c::dMeterString_c(int i_stringID) {
     }
 }
 
-/* 8020EDF4-8020EE70 209734 007C+00 1/0 0/0 0/0 .text            __dt__14dMeterString_cFv */
 dMeterString_c::~dMeterString_c() {
     _delete();
 }
 
-/* 8020EE70-8020F150 2097B0 02E0+00 1/0 0/0 0/0 .text            _create__14dMeterString_cFv */
 int dMeterString_c::_create() {
     if (mpMapArchive == NULL) {
         if (field_0x28 == 0) {
@@ -84,7 +81,6 @@ int dMeterString_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8020F150-8020F1B0 209A90 0060+00 1/0 0/0 0/0 .text            _execute__14dMeterString_cFUl */
 int dMeterString_c::_execute(u32 unused) {
     if (mpMapArchive == NULL) {
         _create();
@@ -97,7 +93,6 @@ int dMeterString_c::_execute(u32 unused) {
     return 1;
 }
 
-/* 8020F1B0-8020F49C 209AF0 02EC+00 1/0 0/0 0/0 .text            draw__14dMeterString_cFv */
 void dMeterString_c::draw() {
     if (mpMapArchive != NULL && !dComIfGp_isPauseFlag()) {
         J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
@@ -144,7 +139,6 @@ void dMeterString_c::draw() {
     }
 }
 
-/* 8020F49C-8020F5A4 209DDC 0108+00 1/0 0/0 0/0 .text            _delete__14dMeterString_cFv */
 int dMeterString_c::_delete() {
     delete mpScreen;
     mpScreen = NULL;
@@ -168,7 +162,6 @@ int dMeterString_c::_delete() {
     return 1;
 }
 
-/* 8020F5A4-8020F66C 209EE4 00C8+00 2/2 1/1 0/0 .text            createString__14dMeterString_cFi */
 int dMeterString_c::createString(int i_stringID) {
     char str_buf[32];
     dMeter2Info_getString(i_stringID, str_buf, NULL);
@@ -183,7 +176,6 @@ int dMeterString_c::createString(int i_stringID) {
     return 1;
 }
 
-/* 8020F66C-8020F6EC 209FAC 0080+00 2/2 0/0 0/0 .text playBckAnimation__14dMeterString_cFf */
 void dMeterString_c::playBckAnimation(f32 i_frame) {
     mpParentPane->getPanePtr()->setAnimation(mpGetInBck);
     mpGetInBck->setFrame(i_frame);
@@ -191,7 +183,6 @@ void dMeterString_c::playBckAnimation(f32 i_frame) {
     mpParentPane->getPanePtr()->setAnimation((J2DAnmTransform*)NULL);
 }
 
-/* 8020F6EC-8020FA88 20A02C 039C+00 1/1 0/0 0/0 .text            drawPikari__14dMeterString_cFv */
 void dMeterString_c::drawPikari() {
     f32 anim_frame = mPikariAnimFrame;
     Vec center = mpTextPane->getGlobalVtxCenter(false, 0);
@@ -262,7 +253,6 @@ void dMeterString_c::drawPikari() {
     mPikariAnimFrame = frame;
 }
 
-/* 8020FA88-8020FAB4 20A3C8 002C+00 1/1 0/0 0/0 .text            isLeadByte__14dMeterString_cFi */
 bool dMeterString_c::isLeadByte(int c) {
     return (c >= 0x81 && c <= 0x9F) || (c >= 0xE0 && c <= 0xFC);
 }
diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp
index 9afd0f9b70..5d89bc2603 100644
--- a/src/d/d_model.cpp
+++ b/src/d/d_model.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_model
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_model.h"
@@ -10,7 +5,6 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "d/d_com_inf_game.h"
 
-/* 8009C4FC-8009C650 096E3C 0154+00 1/0 0/0 0/0 .text            draw__6dMdl_cFv */
 void dMdl_c::draw() {
     j3dSys.setVtxPos(mpModelData->getVtxPosArray());
     j3dSys.setVtxNrm(mpModelData->getVtxNrmArray());
@@ -40,8 +34,6 @@ void dMdl_c::draw() {
     field_0x1a = false;
 }
 
-/* 8009C650-8009C668 096F90 0018+00 1/1 0/0 1/1 .text
- * create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c             */
 void dMdl_c::create(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) {
     mpModelData = i_modelData;
     mMaterialId = i_materialId;
@@ -49,7 +41,6 @@ void dMdl_c::create(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i
     field_0x1a = false;
 }
 
-/* 8009C668-8009C6DC 096FA8 0074+00 0/0 0/0 5/5 .text            entryObj__6dMdl_cFP10dMdl_obj_c */
 void dMdl_c::entryObj(dMdl_obj_c* i_obj) {
     if (!field_0x1a) {
         dComIfGd_getListPacket()->entryImm(this, 0);
@@ -61,8 +52,6 @@ void dMdl_c::entryObj(dMdl_obj_c* i_obj) {
     mpModelObj = i_obj;
 }
 
-/* 8009C6DC-8009C724 09701C 0048+00 1/1 0/0 0/0 .text
- * search__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c        */
 dMdl_c* dMdl_mng_c::search(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) {
     dMdl_c* model = field_0x0;
     for (int i = field_0x80; i > 0; i--) {
@@ -75,8 +64,6 @@ dMdl_c* dMdl_mng_c::search(J3DModelData* i_modelData, u16 i_materialId, dKy_tevs
     return NULL;
 }
 
-/* 8009C724-8009C7AC 097064 0088+00 1/1 0/0 0/0 .text
- * entry__10dMdl_mng_cFP12J3DModelDataUsP12dKy_tevstr_c         */
 dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, dKy_tevstr_c* i_tevstr) {
     dMdl_c* model = search(i_modelData, i_materialId, i_tevstr);
 
@@ -93,19 +80,14 @@ dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, dKy_tevst
     return model;
 }
 
-/* ############################################################################################## */
-/* 80450FA0-80450FA8 0004A0 0004+04 4/4 0/0 0/0 .sbss            m_myObj__10dMdl_mng_c */
 dMdl_mng_c* dMdl_mng_c::m_myObj;
 
-/* 8009C7AC-8009C808 0970EC 005C+00 0/0 1/1 0/0 .text            create__10dMdl_mng_cFv */
 void dMdl_mng_c::create() {
     m_myObj = new dMdl_mng_c();
 }
 
-/* 8009C808-8009C864 097148 005C+00 3/2 0/0 0/0 .text            __dt__6dMdl_cFv */
 dMdl_c::~dMdl_c() {}
 
-/* 8009C864-8009C8C0 0971A4 005C+00 0/0 1/1 0/0 .text            remove__10dMdl_mng_cFv */
 void dMdl_mng_c::remove() {
     if (m_myObj != NULL) {
         delete m_myObj;
@@ -113,7 +95,6 @@ void dMdl_mng_c::remove() {
     }
 }
 
-/* 8009C8C0-8009C8D8 097200 0018+00 0/0 1/1 0/0 .text            reset__10dMdl_mng_cFv */
 void dMdl_mng_c::reset() {
     if (m_myObj == NULL) {
         return;
@@ -122,7 +103,6 @@ void dMdl_mng_c::reset() {
     m_myObj->field_0x80 = 0;
 }
 
-/* 8009C8D8-8009C930 097218 0058+00 0/0 0/0 4/4 .text entry__10dMdl_mng_cFP12J3DModelDataUsi */
 dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, int i_roomNo) {
     if (m_myObj == NULL) {
         return NULL;
diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp
index 2b27d8d714..11320c468c 100644
--- a/src/d/d_msg_class.cpp
+++ b/src/d/d_msg_class.cpp
@@ -31,7 +31,6 @@
 #define CHAR_CODE_THIN_DOWN_ARROW 0xBE
 #endif
 
-/* 80228578-802285CC 222EB8 0054+00 1/1 0/0 0/0 .text            checkCharInfoCharactor__Fi */
 static bool checkCharInfoCharactor(int c) {
     if (c != 0x8140 && c != 0x8141 && c != 0x8142 && c != 0x0020 && c != 0x0022 && c != 0x0027 &&
         c != 0x002C && c != 0x002E)
@@ -42,7 +41,6 @@ static bool checkCharInfoCharactor(int c) {
     return false;
 }
 
-/* 802285CC-80228608 222F0C 003C+00 3/3 0/0 0/0 .text            changeCodeToChar__FUs */
 static char* changeCodeToChar(u16 param_0) {
     static char mMoji[3];
 
@@ -58,7 +56,6 @@ static char* changeCodeToChar(u16 param_0) {
     return mMoji;
 }
 
-/* 80228608-80228838 222F48 0230+00 5/4 0/0 0/0 .text            change1ByteTo2Bytes__Fi */
 static u16 change1ByteTo2Bytes(int iCharacter) {
     static u16 char_table[] = {
         0x0000, 0x8142, 0x8175, 0x8176, 0x8141, 0x8145, 0x8392, 0x8340, 0x8342, 0x8344, 0x8346,
@@ -183,7 +180,6 @@ static u16 change1ByteTo2Bytes(int iCharacter) {
     return character2Bytes;
 }
 
-/* 80228838-802288A8 223178 0070+00 8/8 0/0 0/0 .text            changeKataToHira__Fi */
 static u16 changeKataToHira(int iCharacter) {
     u16 hiraCharacter = iCharacter;
 
@@ -198,7 +194,6 @@ static u16 changeKataToHira(int iCharacter) {
     return hiraCharacter;
 }
 
-/* 802288A8-802288FC 2231E8 0054+00 4/4 0/0 0/0 .text            isOutfontKanjiCode__Fi */
 static bool isOutfontKanjiCode(int iCharacter) {
     switch (iCharacter) {
     case '\\':
@@ -212,7 +207,6 @@ static bool isOutfontKanjiCode(int iCharacter) {
     }
 }
 
-/* 802288FC-802289A8 22323C 00AC+00 2/2 0/0 0/0 .text            getFontCCColorTable__FUcUc */
 static u32 getFontCCColorTable(u8 i_colorNo, u8 i_fukiKind) {
     static const u32 colorTable[9] = {
         0xFFFFFFFF, 0xF07878FF, 0xAADC8CFF, 0xA0B4DCFF, 0xDCDC82FF,
@@ -247,7 +241,6 @@ static u32 getFontCCColorTable(u8 i_colorNo, u8 i_fukiKind) {
     }
 }
 
-/* 802289A8-80228A54 2232E8 00AC+00 2/2 0/0 0/0 .text            getFontGCColorTable__FUcUc */
 static u32 getFontGCColorTable(u8 i_colorNo, u8 i_fukiKind) {
     static const u32 colorTable[9] = {
         0xFFFFFFFF, 0xF07878FF, 0xAADC8CFF, 0xA0B4DCFF, 0xDCDC82FF,
@@ -282,7 +275,6 @@ static u32 getFontGCColorTable(u8 i_colorNo, u8 i_fukiKind) {
     }
 }
 
-/* 80228A54-80228ACC 223394 0078+00 3/2 0/0 0/0 .text            getOutFontNumberType__Fi */
 static u8 getOutFontNumberType(int param_0) {
     switch (param_0) {
     case 0:
@@ -342,7 +334,6 @@ static void setHorseName(char* i_horse_name, u8 param_2) {
 }
 #endif
 
-/* 80228ACC-80228B04 22340C 0038+00 3/3 0/0 0/0 .text            getPohNum__Fv */
 static u8 getPohNum() {
     u8 num = 0;
 
@@ -355,7 +346,6 @@ static u8 getPohNum() {
     return num;
 }
 
-/* 80228B04-80228CB4 223444 01B0+00 0/0 1/1 0/0 .text            __ct__19jmessage_tReferenceFv */
 jmessage_tReference::jmessage_tReference() {
     mpStick = new STControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000);
     JUT_ASSERT(518, mpStick != NULL);
@@ -418,13 +408,11 @@ jmessage_tReference::jmessage_tReference() {
     mNowTagScale = 0;
 }
 
-/* 80228CB4-80228D28 2235F4 0074+00 1/0 0/0 0/0 .text            __dt__19jmessage_tReferenceFv */
 jmessage_tReference::~jmessage_tReference() {
     delete mpStick;
     mpStick = NULL;
 }
 
-/* 80228D28-80228DE0 223668 00B8+00 1/1 0/0 0/0 .text calcDistance__19jmessage_tReferenceFv */
 void jmessage_tReference::calcDistance() {
     if (mActorPos.x == 0.0f && mActorPos.y == 0.0f && mActorPos.z == 0.0f) {
         mDistanceScale = 1.0f;
@@ -435,8 +423,6 @@ void jmessage_tReference::calcDistance() {
     }
 }
 
-/* 80228DE0-80228E6C 223720 008C+00 5/5 0/0 0/0 .text            getLineMax__19jmessage_tReferenceFv
- */
 u8 jmessage_tReference::getLineMax() {
     int line_max;
 
@@ -469,8 +455,6 @@ u8 jmessage_tReference::getLineMax() {
     return line_max;
 }
 
-/* 80228E6C-80228EA0 2237AC 0034+00 2/2 0/0 0/0 .text            isKanban__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isKanban() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -479,7 +463,6 @@ bool jmessage_tReference::isKanban() {
     return getObjectPtr()->isKanbanMessage();
 }
 
-/* 80228EA0-80228ED4 2237E0 0034+00 2/2 0/0 0/0 .text isPlaceName__19jmessage_tReferenceFv */
 bool jmessage_tReference::isPlaceName() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -488,8 +471,6 @@ bool jmessage_tReference::isPlaceName() {
     return getObjectPtr()->isPlaceMessage();
 }
 
-/* 80228ED4-80228F08 223814 0034+00 2/2 0/0 0/0 .text            isBossName__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isBossName() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -498,8 +479,6 @@ bool jmessage_tReference::isBossName() {
     return getObjectPtr()->isBossMessage();
 }
 
-/* 80228F08-80228F3C 223848 0034+00 2/2 0/0 0/0 .text            isSaveSeq__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isSaveSeq() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -508,7 +487,6 @@ bool jmessage_tReference::isSaveSeq() {
     return getObjectPtr()->isSaveMessage();
 }
 
-/* 80228F3C-80228F70 22387C 0034+00 2/2 0/0 0/0 .text            isBook__19jmessage_tReferenceFv */
 bool jmessage_tReference::isBook() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -517,7 +495,6 @@ bool jmessage_tReference::isBook() {
     return getObjectPtr()->isBookMessage();
 }
 
-/* 80228F70-80228FA4 2238B0 0034+00 3/3 0/0 0/0 .text isStaffRoll__19jmessage_tReferenceFv */
 bool jmessage_tReference::isStaffRoll() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -526,7 +503,6 @@ bool jmessage_tReference::isStaffRoll() {
     return getObjectPtr()->isStaffMessage();
 }
 
-/* 80228FA4-80228FD8 2238E4 0034+00 1/1 0/0 0/0 .text            isHowl__19jmessage_tReferenceFv */
 bool jmessage_tReference::isHowl() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -535,8 +511,6 @@ bool jmessage_tReference::isHowl() {
     return getObjectPtr()->isHowlMessage();
 }
 
-/* 80228FD8-8022900C 223918 0034+00 2/2 0/0 0/0 .text            isMidona__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isMidona() {
     if (getObjectPtr() == NULL) {
         return false;
@@ -545,7 +519,6 @@ bool jmessage_tReference::isMidona() {
     return getObjectPtr()->isMidonaMessage();
 }
 
-/* 8022900C-80229034 22394C 0028+00 1/1 0/0 0/0 .text resetReference__19jmessage_tReferenceFv */
 void jmessage_tReference::resetReference() {
     mSendTimer = 0;
     mSendFlag = 0;
@@ -557,8 +530,6 @@ void jmessage_tReference::resetReference() {
     mSelectType = 0;
 }
 
-/* 80229034-80229168 223974 0134+00 0/0 1/1 0/0 .text            pageSend__19jmessage_tReferenceFv
- */
 void jmessage_tReference::pageSend() {
     field_0x5d2++;
     mLineCount = 0;
@@ -597,7 +568,6 @@ void jmessage_tReference::pageSend() {
     mTopTagScale = mNowTagScale;
 }
 
-/* 80229168-802294A8 223AA8 0340+00 0/0 2/2 0/0 .text selectMessage__19jmessage_tReferenceFv */
 void jmessage_tReference::selectMessage() {
     if (mSelectNum != 0) {
         mpStick->checkTrigger();
@@ -656,7 +626,6 @@ void jmessage_tReference::selectMessage() {
     }
 }
 
-/* 802294A8-80229730 223DE8 0288+00 0/0 1/1 0/0 .text inputNumber__19jmessage_tReferenceFv */
 void jmessage_tReference::inputNumber() {
     mpStick->checkTrigger();
 
@@ -733,7 +702,6 @@ void jmessage_tReference::inputNumber() {
     getObjectPtr()->setInputValue(new_input_val);
 }
 
-/* 80229730-80229744 224070 0014+00 5/5 0/0 0/0 .text            getWord__19jmessage_tReferenceFi */
 char* jmessage_tReference::getWord(int i_no) {
     if (i_no >= 10) {
         JUT_WARN(1093, "%s", "message stack over!!");
@@ -743,28 +711,23 @@ char* jmessage_tReference::getWord(int i_no) {
     return mWord[i_no];
 }
 
-/* 80229744-80229768 224084 0024+00 2/2 0/0 0/0 .text            resetWord__19jmessage_tReferenceFv
- */
 void jmessage_tReference::resetWord() {
     for (int i = 0; i < 10; i++) {
         mWord[i][0] = 0;
     }
 }
 
-/* 80229768-80229788 2240A8 0020+00 3/3 0/0 0/0 .text setCharactor__19jmessage_tReferenceFUs */
 void jmessage_tReference::setCharactor(u16 i_character) {
     mCharactor.data[mCharactor.field_0x40c] = i_character;
     mCharactor.field_0x40c++;
 }
 
-/* 80229788-802297B0 2240C8 0028+00 3/3 0/0 0/0 .text addCharactor__19jmessage_tReferenceFUs */
 void jmessage_tReference::addCharactor(u16 i_character) {
     if (i_character == mCharactor.data[mCharactor.field_0x40e]) {
         mCharactor.field_0x40e++;
     }
 }
 
-/* 802297B0-802297E4 2240F0 0034+00 3/3 0/0 0/0 .text resetCharactor__19jmessage_tReferenceFv */
 void jmessage_tReference::resetCharactor() {
     for (int i = 0; i < ARRAY_SIZE(mCharactor.data); i++) {
         mCharactor.data[i] = 0;
@@ -775,8 +738,6 @@ void jmessage_tReference::resetCharactor() {
     mCharactor.mCountBackUp = 0;
 }
 
-/* 802297E4-80229810 224124 002C+00 0/0 1/1 0/0 .text
- * shiftCharCountBuffer__19jmessage_tReferenceFv                */
 void jmessage_tReference::shiftCharCountBuffer() {
     for (int i = 30; i > 0; i--) {
         mCharCountBuffer[i] = mCharCountBuffer[i - 1];
@@ -785,8 +746,6 @@ void jmessage_tReference::shiftCharCountBuffer() {
     mCharCountBuffer[0] = getNowLightCount();
 }
 
-/* 80229810-80229848 224150 0038+00 1/1 5/5 0/0 .text
- * resetCharCountBuffer__19jmessage_tReferenceFv                */
 void jmessage_tReference::resetCharCountBuffer() {
     for (int i = 0; i < 31; i++) {
         mCharCountBuffer[i] = 0;
@@ -798,16 +757,12 @@ void jmessage_tReference::resetCharCountBuffer() {
     resetDrawLightCount();
 }
 
-/* 80229848-8022986C 224188 0024+00 1/1 0/0 0/0 .text
- * allsetCharCountBuffer__19jmessage_tReferenceFv               */
 void jmessage_tReference::allsetCharCountBuffer() {
     for (int i = 0; i < 31; i++) {
         mCharCountBuffer[i] = getNowLightCount();
     }
 }
 
-/* 8022986C-802298DC 2241AC 0070+00 2/2 0/0 0/0 .text            isCharSend__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isCharSend() {
     s16 delay_frame;
     s16 var_r5;
@@ -831,7 +786,6 @@ bool jmessage_tReference::isCharSend() {
     return true;
 }
 
-/* 802298DC-8022994C 22421C 0070+00 1/1 0/0 0/0 .text isLightSend__19jmessage_tReferenceFv */
 bool jmessage_tReference::isLightSend() {
     s16 delay_frame;
     s16 var_r5;
@@ -855,8 +809,6 @@ bool jmessage_tReference::isLightSend() {
     return true;
 }
 
-/* 8022994C-802299AC 22428C 0060+00 0/0 1/1 0/0 .text            isLightEnd__19jmessage_tReferenceFv
- */
 bool jmessage_tReference::isLightEnd() {
     s16 delay_frame;
 
@@ -877,8 +829,6 @@ bool jmessage_tReference::isLightEnd() {
     return false;
 }
 
-/* 802299AC-802299EC 2242EC 0040+00 2/2 0/0 0/0 .text
- * decideOutFontRupeeColor__19jmessage_tReferenceFi             */
 void jmessage_tReference::decideOutFontRupeeColor(int i_inputVal) {
     int price_diff = getObjectPtr()->getNowTotalPrice() - getObjectPtr()->getNowTotalPayment();
 
@@ -891,11 +841,8 @@ void jmessage_tReference::decideOutFontRupeeColor(int i_inputVal) {
     }
 }
 
-/* 802299EC-80229A28 22432C 003C+00 0/0 1/1 0/0 .text            __ct__17jmessage_tControlFv */
 jmessage_tControl::jmessage_tControl() {}
 
-/* 80229A28-80229AC4 224368 009C+00 1/1 0/0 0/0 .text
- * __ct__26jmessage_tMeasureProcessorFPC19jmessage_tReference   */
 jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const* pReference)
     : TRenderingProcessor(pReference) {
     jmessage_tReference* reference_p = (jmessage_tReference*)getReference();
@@ -917,8 +864,6 @@ jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const
     field_0x4d = 0;
 }
 
-/* 80229AC4-80229CB4 224404 01F0+00 1/0 0/0 0/0 .text
- * do_begin__26jmessage_tMeasureProcessorFPCvPCc                */
 void jmessage_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) {
     (void)pszText;
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
@@ -986,7 +931,6 @@ void jmessage_tMeasureProcessor::do_begin(void const* pEntry, char const* pszTex
     }
 }
 
-/* 80229CB4-80229E3C 2245F4 0188+00 1/0 0/0 0/0 .text do_end__26jmessage_tMeasureProcessorFv */
 void jmessage_tMeasureProcessor::do_end() {
     if (field_0x49 == 0) {
         field_0x3e++;
@@ -1009,8 +953,6 @@ void jmessage_tMeasureProcessor::do_end() {
     Z2GetSpeechMgr2()->setString(pReference->getCharSoundInfo().data, pReference->getCharSoundInfo().field_0x40c, mSeSpeaker, mSeMood);
 }
 
-/* 80229E3C-8022A268 22477C 042C+00 1/0 0/0 0/0 .text do_character__26jmessage_tMeasureProcessorFi
- */
 void jmessage_tMeasureProcessor::do_character(int iCharacter) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     JUTFont* font = pReference->getFont();
@@ -1096,8 +1038,6 @@ static void dummyString() {
     DEAD_STRING("s");
 }
 
-/* 8022A268-8022B0B0 224BA8 0E48+00 5/0 0/0 0/0 .text do_tag__26jmessage_tMeasureProcessorFUlPCvUl
- */
 bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -1622,7 +1562,6 @@ bool jmessage_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_siz
     return false;
 }
 
-/* 8022B0B0-8022B18C 2259F0 00DC+00 2/2 0/0 0/0 .text do_scale__26jmessage_tMeasureProcessorFf */
 void jmessage_tMeasureProcessor::do_scale(f32 i_scale) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     field_0x38 = i_scale * pReference->getDistanceScale();
@@ -1656,7 +1595,6 @@ void jmessage_tMeasureProcessor::do_scale(f32 i_scale) {
     }
 }
 
-/* 8022B18C-8022B3EC 225ACC 0260+00 2/1 0/0 0/0 .text do_space__26jmessage_tMeasureProcessorFUl */
 void jmessage_tMeasureProcessor::do_space(u32 i_tag) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     f32 var_f31 = field_0x38;
@@ -1786,8 +1724,6 @@ void jmessage_tMeasureProcessor::do_space(u32 i_tag) {
     }
 }
 
-/* 8022B3EC-8022B454 225D2C 0068+00 3/3 0/0 0/0 .text do_pageType__26jmessage_tMeasureProcessorFi
- */
 void jmessage_tMeasureProcessor::do_pageType(int param_0) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -1804,7 +1740,6 @@ void jmessage_tMeasureProcessor::do_pageType(int param_0) {
     }
 }
 
-/* 8022B454-8022B458 225D94 0004+00 1/1 0/0 0/0 .text do_name1__26jmessage_tMeasureProcessorFv */
 void jmessage_tMeasureProcessor::do_name1() {
     const char* name = dComIfGs_getPlayerName();
 #if REGION_JPN
@@ -1816,8 +1751,6 @@ void jmessage_tMeasureProcessor::do_name1() {
 #endif
 }
 
-/* 8022B458-8022B4E0 225D98 0088+00 1/1 0/0 0/0 .text
- * do_rubyset__26jmessage_tMeasureProcessorFPCvUl               */
 void jmessage_tMeasureProcessor::do_rubyset(void const* i_data, u32 i_size) {
     if (field_0x44 == 0) {
         u8 length = i_size - 1;
@@ -1839,8 +1772,6 @@ void jmessage_tMeasureProcessor::do_rubyset(void const* i_data, u32 i_size) {
     }
 }
 
-/* 8022B4E0-8022B558 225E20 0078+00 1/1 0/0 0/0 .text push_word__26jmessage_tMeasureProcessorFPc
- */
 void jmessage_tMeasureProcessor::push_word(char* i_word) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     strcpy(pReference->getWord(field_0x4b), i_word);
@@ -1848,8 +1779,6 @@ void jmessage_tMeasureProcessor::push_word(char* i_word) {
     field_0x4b++;
 }
 
-/* 8022B558-8022B5F4 225E98 009C+00 0/0 1/1 0/0 .text
- * __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl */
 jmessage_tSequenceProcessor::jmessage_tSequenceProcessor(jmessage_tReference const* pReference,
                                                          jmessage_tControl* pControl)
     : JMessage::TSequenceProcessor(pReference, pControl),
@@ -1871,11 +1800,8 @@ jmessage_tSequenceProcessor::jmessage_tSequenceProcessor(jmessage_tReference con
     field_0xb4 = 0;
 }
 
-/* 8022B654-8022B658 225F94 0004+00 1/0 0/0 0/0 .text do_reset__27jmessage_tSequenceProcessorFv */
 void jmessage_tSequenceProcessor::do_reset() {}
 
-/* 8022B658-8022BA3C 225F98 03E4+00 1/0 0/0 0/0 .text
- * do_begin__27jmessage_tSequenceProcessorFPCvPCc               */
 void jmessage_tSequenceProcessor::do_begin(void const* pEntry, char const* pszText) {
     mpEntry = pEntry;
     mpText = pszText;
@@ -1993,7 +1919,6 @@ void jmessage_tSequenceProcessor::do_begin(void const* pEntry, char const* pszTe
     field_0xb5 = 0;
 }
 
-/* 8022BA3C-8022BB7C 22637C 0140+00 1/0 0/0 0/0 .text do_end__27jmessage_tSequenceProcessorFv */
 void jmessage_tSequenceProcessor::do_end() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -2044,8 +1969,6 @@ void jmessage_tSequenceProcessor::do_end() {
     pReference->setNowLightCount(0xFF);
 }
 
-/* 8022BB7C-8022BFE0 2264BC 0464+00 2/0 0/0 0/0 .text do_isReady__27jmessage_tSequenceProcessorFv
- */
 bool jmessage_tSequenceProcessor::do_isReady() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     #ifdef DEBUG
@@ -2187,8 +2110,6 @@ bool jmessage_tSequenceProcessor::do_isReady() {
     return false;
 }
 
-/* 8022BFE0-8022C1A0 226920 01C0+00 1/0 0/0 0/0 .text
- * do_character__27jmessage_tSequenceProcessorFi                */
 void jmessage_tSequenceProcessor::do_character(int iCharacter) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -2229,8 +2150,6 @@ void jmessage_tSequenceProcessor::do_character(int iCharacter) {
     }
 }
 
-/* 8022C1A0-8022C8FC 226AE0 075C+00 2/0 0/0 0/0 .text
- * do_tag__27jmessage_tSequenceProcessorFUlPCvUl                */
 bool jmessage_tSequenceProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -2564,13 +2483,10 @@ bool jmessage_tSequenceProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_si
     return false;
 }
 
-/* 8022C8FC-8022C904 22723C 0008+00 1/0 0/0 0/0 .text
- * do_jump_isReady__27jmessage_tSequenceProcessorFv             */
 bool jmessage_tSequenceProcessor::do_jump_isReady() {
     return true;
 }
 
-/* 8022C904-8022C908 227244 0004+00 1/1 0/0 0/0 .text do_name1__27jmessage_tSequenceProcessorFv */
 void jmessage_tSequenceProcessor::do_name1() {
     const char* name = dComIfGs_getPlayerName();
 #if REGION_JPN
@@ -2582,8 +2498,6 @@ void jmessage_tSequenceProcessor::do_name1() {
 #endif
 }
 
-/* 8022C908-8022CA24 227248 011C+00 2/1 0/0 0/0 .text do_space__27jmessage_tSequenceProcessorFUl
- */
 void jmessage_tSequenceProcessor::do_space(u32 i_tag) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     pReference->addNowLightCount();
@@ -2662,8 +2576,6 @@ void jmessage_tSequenceProcessor::do_space(u32 i_tag) {
     }
 }
 
-/* 8022CA24-8022CAAC 227364 0088+00 1/1 0/0 0/0 .text
- * do_rubyset__27jmessage_tSequenceProcessorFPCvUl              */
 void jmessage_tSequenceProcessor::do_rubyset(void const* i_data, u32 i_size) {
     if (field_0xac == 0) {
         u8 length = i_size - 1;
@@ -2684,8 +2596,6 @@ void jmessage_tSequenceProcessor::do_rubyset(void const* i_data, u32 i_size) {
     }
 }
 
-/* 8022CAAC-8022CB10 2273EC 0064+00 1/1 0/0 0/0 .text push_word__27jmessage_tSequenceProcessorFv
- */
 void jmessage_tSequenceProcessor::push_word() {
     jmessage_tReference* pReference = (jmessage_tReference*)JMessage::TSequenceProcessor::getReference();
     JMessage::TSequenceProcessor::stack_pushCurrent(pReference->getWord(field_0xb5));
@@ -2693,8 +2603,6 @@ void jmessage_tSequenceProcessor::push_word() {
     pReference->setNowWordCount(field_0xb5);
 }
 
-/* 8022CB10-8022CBE4 227450 00D4+00 2/2 0/0 0/0 .text
- * messageSePlay__27jmessage_tSequenceProcessorFUcUcP4cXyz      */
 void jmessage_tSequenceProcessor::messageSePlay(u8 i_speaker, u8 i_mood, cXyz* i_pos) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     dMsgObject_c* pObject = pReference->getObjectPtr();
@@ -2720,12 +2628,8 @@ void jmessage_tSequenceProcessor::messageSePlay(u8 i_speaker, u8 i_mood, cXyz* i
     }
 }
 
-/* 8022CBE4-8022CBE8 227524 0004+00 1/0 0/0 0/0 .text
- * do_jump__27jmessage_tSequenceProcessorFPCvPCc                */
 void jmessage_tSequenceProcessor::do_jump(void const* pEntry, char const* pszText) {}
 
-/* 8022CBE8-8022CCB0 227528 00C8+00 2/2 0/0 0/0 .text
- * calcStringLength__27jmessage_tSequenceProcessorFv            */
 void jmessage_tSequenceProcessor::calcStringLength() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     pReference->onSelectSetCancelFlag();
@@ -2733,8 +2637,6 @@ void jmessage_tSequenceProcessor::calcStringLength() {
     pReference->offSelectSetCancelFlag();
 }
 
-/* 8022CCB0-8022CDC8 2275F0 0118+00 0/0 1/1 0/0 .text
- * __ct__28jmessage_tRenderingProcessorFPC19jmessage_tReference */
 jmessage_tRenderingProcessor::jmessage_tRenderingProcessor(jmessage_tReference const* pReference) : JMessage::TRenderingProcessor(pReference) {
     mpOutFont = NULL;
     mCharInfoPtr = NULL;
@@ -2779,16 +2681,12 @@ jmessage_tRenderingProcessor::jmessage_tRenderingProcessor(jmessage_tReference c
     }
 }
 
-/* 8022CDC8-8022CDCC 227708 0004+00 1/0 0/0 0/0 .text do_reset__28jmessage_tRenderingProcessorFv
- */
 void jmessage_tRenderingProcessor::do_reset() {}
 
 static void dummyString2() {
     DEAD_STRING("");
 }
 
-/* 8022CDCC-8022CFD8 22770C 020C+00 1/0 0/0 0/0 .text
- * do_begin__28jmessage_tRenderingProcessorFPCvPCc              */
 void jmessage_tRenderingProcessor::do_begin(void const* pEntry, char const* pszText) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -2858,7 +2756,6 @@ void jmessage_tRenderingProcessor::do_begin(void const* pEntry, char const* pszT
     }
 }
 
-/* 8022CFD8-8022D0A0 227918 00C8+00 1/0 0/0 0/0 .text do_end__28jmessage_tRenderingProcessorFv */
 void jmessage_tRenderingProcessor::do_end() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -2882,8 +2779,6 @@ void jmessage_tRenderingProcessor::do_end() {
     }
 }
 
-/* 8022D0A0-8022D74C 2279E0 06AC+00 1/0 0/0 0/0 .text
- * do_character__28jmessage_tRenderingProcessorFi               */
 void jmessage_tRenderingProcessor::do_character(int i_character) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     JUTFont* pFont = pReference->getFont();
@@ -2994,8 +2889,6 @@ void jmessage_tRenderingProcessor::do_character(int i_character) {
     }
 }
 
-/* 8022D74C-8022E12C 22808C 09E0+00 3/0 0/0 0/0 .text
- * do_tag__28jmessage_tRenderingProcessorFUlPCvUl               */
 bool jmessage_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3350,8 +3243,6 @@ bool jmessage_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_s
     return 0;
 }
 
-/* 8022E12C-8022E17C 228A6C 0050+00 0/0 2/2 0/0 .text
- * resetRendering__28jmessage_tRenderingProcessorFv             */
 void jmessage_tRenderingProcessor::resetRendering() {
     if (mCharInfoPtr == NULL) return;
 
@@ -3362,8 +3253,6 @@ void jmessage_tRenderingProcessor::resetRendering() {
     *mpCharInfoCnt = 0;
 }
 
-/* 8022E17C-8022E260 228ABC 00E4+00 2/2 0/0 0/0 .text
- * do_widthcenter__28jmessage_tRenderingProcessorFv             */
 void jmessage_tRenderingProcessor::do_widthcenter() {
     field_0x187 = 0;
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
@@ -3382,8 +3271,6 @@ void jmessage_tRenderingProcessor::do_widthcenter() {
     }
 }
 
-/* 8022E260-8022E318 228BA0 00B8+00 1/1 0/0 0/0 .text
- * do_selwidthcenter__28jmessage_tRenderingProcessorFi          */
 void jmessage_tRenderingProcessor::do_selwidthcenter(int param_1) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3396,8 +3283,6 @@ void jmessage_tRenderingProcessor::do_selwidthcenter(int param_1) {
     }
 }
 
-/* 8022E318-8022E7CC 228C58 04B4+00 3/2 0/0 0/0 .text
- * do_heightcenter__28jmessage_tRenderingProcessorFv            */
 void jmessage_tRenderingProcessor::do_heightcenter() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     field_0x138 = 0.0f;
@@ -3579,8 +3464,6 @@ void jmessage_tRenderingProcessor::do_heightcenter() {
     }
 }
 
-/* 8022E7CC-8022E860 22910C 0094+00 2/2 0/0 0/0 .text do_color__28jmessage_tRenderingProcessorFUc
- */
 void jmessage_tRenderingProcessor::do_color(u8 i_colorNo) {
     jmessage_tReference* reference_p = (jmessage_tReference*)getReference();
 
@@ -3598,8 +3481,6 @@ void jmessage_tRenderingProcessor::do_color(u8 i_colorNo) {
     do_strcat(buffer, false, false, false);
 }
 
-/* 8022E860-8022E960 2291A0 0100+00 2/2 0/0 0/0 .text do_scale__28jmessage_tRenderingProcessorFf
- */
 void jmessage_tRenderingProcessor::do_scale(f32 param_1) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3628,8 +3509,6 @@ void jmessage_tRenderingProcessor::do_scale(f32 param_1) {
     do_strcat(buffer, false, true, false);
 }
 
-/* 8022E960-8022E9C0 2292A0 0060+00 1/1 0/0 0/0 .text
- * do_linedown__28jmessage_tRenderingProcessorFs                */
 void jmessage_tRenderingProcessor::do_linedown(s16 param_0) {
     char buffer[16];
 
@@ -3637,8 +3516,6 @@ void jmessage_tRenderingProcessor::do_linedown(s16 param_0) {
     do_strcat(buffer, false, true, false);
 }
 
-/* 8022E9C0-8022EAE4 229300 0124+00 1/1 0/0 0/0 .text do_transY__28jmessage_tRenderingProcessorFsb
- */
 void jmessage_tRenderingProcessor::do_transY(s16 i_transY, bool unused) {
     if (i_transY != 0) {
         char buffer0[16];
@@ -3660,8 +3537,6 @@ void jmessage_tRenderingProcessor::do_transY(s16 i_transY, bool unused) {
     }
 }
 
-/* 8022EAE4-8022ED10 229424 022C+00 2/2 0/0 0/0 .text
- * do_outfont__28jmessage_tRenderingProcessorFUcUl              */
 void jmessage_tRenderingProcessor::do_outfont(u8 i_iconNo, u32 i_color) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     JUTFont* pFont = pReference->getFont();  // fakematch
@@ -3701,8 +3576,6 @@ void jmessage_tRenderingProcessor::do_outfont(u8 i_iconNo, u32 i_color) {
     do_strcat(buffer, false, true, false);
 }
 
-/* 8022ED10-8022EECC 229650 01BC+00 1/1 0/0 0/0 .text do_arrow2__28jmessage_tRenderingProcessorFv
- */
 void jmessage_tRenderingProcessor::do_arrow2() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     JUTFont* pFont = pReference->getFont();  // fakematch
@@ -3725,8 +3598,6 @@ void jmessage_tRenderingProcessor::do_arrow2() {
     field_0x14d++;
 }
 
-/* 8022EECC-8022EF00 22980C 0034+00 1/1 0/0 0/0 .text
- * getLineLength__28jmessage_tRenderingProcessorFi              */
 f32 jmessage_tRenderingProcessor::getLineLength(int i_lineNo) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3736,8 +3607,6 @@ f32 jmessage_tRenderingProcessor::getLineLength(int i_lineNo) {
     return var_f31 + var_f30;
 }
 
-/* 8022EF00-8022F148 229840 0248+00 10/10 0/0 0/0 .text
- * do_strcat__28jmessage_tRenderingProcessorFPcbbb              */
 void jmessage_tRenderingProcessor::do_strcat(char* i_str, bool param_2, bool param_3, bool param_4) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3811,8 +3680,6 @@ void jmessage_tRenderingProcessor::do_strcat(char* i_str, bool param_2, bool par
     }
 }
 
-/* 8022F148-8022F384 229A88 023C+00 1/1 0/0 0/0 .text
- * do_rubyset__28jmessage_tRenderingProcessorFPCvUl             */
 void jmessage_tRenderingProcessor::do_rubyset(void const* i_data, u32 i_size) {
     jmessage_tReference* pReference = (jmessage_tReference*) getReference();
     JUTFont* pFont = pReference->getFont();
@@ -3855,8 +3722,6 @@ void jmessage_tRenderingProcessor::do_rubyset(void const* i_data, u32 i_size) {
     }
 }
 
-/* 8022F384-8022F53C 229CC4 01B8+00 3/3 0/0 0/0 .text
- * do_rubystrcat__28jmessage_tRenderingProcessorFPcPcff         */
 void jmessage_tRenderingProcessor::do_rubystrcat(char* i_src, char* i_dst, f32 i_charSpace, f32 param_4) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     if (pReference->isCharSend()) {
@@ -3881,8 +3746,6 @@ void jmessage_tRenderingProcessor::do_rubystrcat(char* i_src, char* i_dst, f32 i
     }
 }
 
-/* 8022F53C-8022F540 229E7C 0004+00 1/1 0/0 0/0 .text do_name1__28jmessage_tRenderingProcessorFv
- */
 void jmessage_tRenderingProcessor::do_name1() {
     const char* name = dComIfGs_getPlayerName();
 #if REGION_JPN
@@ -3894,8 +3757,6 @@ void jmessage_tRenderingProcessor::do_name1() {
 #endif
 }
 
-/* 8022F540-8022F734 229E80 01F4+00 1/1 0/0 0/0 .text do_numset__28jmessage_tRenderingProcessorFs
- */
 void jmessage_tRenderingProcessor::do_numset(s16 i_num) {
     if (9999 < i_num) {
         i_num = 9999;
@@ -3932,16 +3793,12 @@ void jmessage_tRenderingProcessor::do_numset(s16 i_num) {
     }
 }
 
-/* 8022F734-8022F784 22A074 0050+00 1/1 0/0 0/0 .text push_word__28jmessage_tRenderingProcessorFv
- */
 void jmessage_tRenderingProcessor::push_word() {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     stack_pushCurrent(pReference->getWord(field_0x14f));
     field_0x14f++;
 }
 
-/* 8022F784-8022F8C0 22A0C4 013C+00 2/2 0/0 0/0 .text
- * getCharInfo__28jmessage_tRenderingProcessorFfffff            */
 void jmessage_tRenderingProcessor::getCharInfo(f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 param_5) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
 
@@ -3966,7 +3823,6 @@ void jmessage_tRenderingProcessor::getCharInfo(f32 param_1, f32 param_2, f32 par
     }
 }
 
-/* 8022F8C0-8022F94C 22A200 008C+00 0/0 1/1 0/0 .text __ct__26jmessage_string_tReferenceFv */
 jmessage_string_tReference::jmessage_string_tReference() {
     mPanePtr = NULL;
     mRubyPanePtr = NULL;
@@ -3983,8 +3839,6 @@ jmessage_string_tReference::jmessage_string_tReference() {
 jmessage_string_tReference::~jmessage_string_tReference() {
 }
 
-/* 8022F9AC-8022FA2C 22A2EC 0080+00 0/0 3/3 0/0 .text
- * init__26jmessage_string_tReferenceFP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */
 void jmessage_string_tReference::init(J2DTextBox* panePtr, J2DTextBox* runyPanePtr,
                                           JUTFont* font, COutFont_c* outFontPtr, u8 flags) {
     mPanePtr = panePtr;
@@ -4008,20 +3862,12 @@ void jmessage_string_tReference::init(J2DTextBox* panePtr, J2DTextBox* runyPaneP
     }
 }
 
-/* 8022FA2C-8022FA30 22A36C 0004+00 3/3 0/0 0/0 .text
- * setCharactor__26jmessage_string_tReferenceFUs                */
 void jmessage_string_tReference::setCharactor(u16 param_0) {}
 
-/* 8022FA30-8022FA34 22A370 0004+00 3/3 0/0 0/0 .text
- * addCharactor__26jmessage_string_tReferenceFUs                */
 void jmessage_string_tReference::addCharactor(u16 param_0) {}
 
-/* 8022FA34-8022FA38 22A374 0004+00 3/3 0/0 0/0 .text
- * resetCharactor__26jmessage_string_tReferenceFv               */
 void jmessage_string_tReference::resetCharactor() {}
 
-/* 8022FA38-8022FA6C 22A378 0034+00 2/2 1/1 0/0 .text
- * getLineLength__26jmessage_string_tReferenceFi                */
 f32 jmessage_string_tReference::getLineLength(int lineNo) {
     if (lineNo < 0) {
         return 0.0f;
@@ -4034,16 +3880,12 @@ f32 jmessage_string_tReference::getLineLength(int lineNo) {
     return 0.0f;
 }
 
-/* 8022FA6C-8022FA98 22A3AC 002C+00 2/2 0/0 0/0 .text
- * addLineLength__26jmessage_string_tReferenceFif               */
 void jmessage_string_tReference::addLineLength(int lineNo, f32 length) {
     if (lineNo >= 0 && lineNo < mLineMax)  {
         mLineLength[lineNo] += length;
     }
 }
 
-/* 8022FA98-8022FACC 22A3D8 0034+00 1/1 0/0 0/0 .text
- * getOutfontLength__26jmessage_string_tReferenceFi             */
 f32 jmessage_string_tReference::getOutfontLength(int param_0) {
     if (param_0 < 0) return 0.0f;
     if (param_0 < mLineMax) {
@@ -4052,16 +3894,12 @@ f32 jmessage_string_tReference::getOutfontLength(int param_0) {
     return 0.0f;
 }
 
-/* 8022FACC-8022FAF0 22A40C 0024+00 1/1 0/0 0/0 .text
- * setOutfontLength__26jmessage_string_tReferenceFif            */
 void jmessage_string_tReference::setOutfontLength(int param_0, f32 param_1) {
     if (param_0 < 0) return;
     if (param_0 >= mLineMax) return;
     mOutfontLength[param_0] = param_1;
 }
 
-/* 8022FAF0-8022FB24 22A430 0034+00 2/2 0/0 0/0 .text
- * clearOutfontLength__26jmessage_string_tReferenceFi           */
 void jmessage_string_tReference::clearOutfontLength(int param_0) {
     if (param_0 < 0) return;
     if (param_0 >= mLineMax) return;
@@ -4071,8 +3909,6 @@ void jmessage_string_tReference::clearOutfontLength(int param_0) {
     }
 }
 
-/* 8022FB24-8022FB5C 22A464 0038+00 4/4 0/0 0/0 .text
- * getLineCountNowPage__26jmessage_string_tReferenceFv          */
 s16 jmessage_string_tReference::getLineCountNowPage() {
     s16 rv = -1;
     s32 iVar4 = mNowPage * mLineMax;
@@ -4084,19 +3920,13 @@ s16 jmessage_string_tReference::getLineCountNowPage() {
     return rv;
 }
 
-/* 8022FB5C-8022FB98 22A49C 003C+00 0/0 1/1 0/0 .text            __ct__24jmessage_string_tControlFv
- */
 jmessage_string_tControl::jmessage_string_tControl() {}
 
-/* 8022FB98-8022FBE4 22A4D8 004C+00 1/1 0/0 0/0 .text
- * __ct__33jmessage_string_tMeasureProcessorFPC26jmessage_string_tReference */
 jmessage_string_tMeasureProcessor::jmessage_string_tMeasureProcessor(jmessage_string_tReference const* pReference) : JMessage::TRenderingProcessor(pReference) {
     mpReference = (jmessage_string_tReference*)getReference();
     mpReference->resetCharactor();
 }
 
-/* 8022FBE4-8022FC14 22A524 0030+00 1/0 0/0 0/0 .text
- * do_begin__33jmessage_string_tMeasureProcessorFPCvPCc         */
 void jmessage_string_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) {
     (void)pEntry;
     (void)pszText;
@@ -4104,14 +3934,10 @@ void jmessage_string_tMeasureProcessor::do_begin(void const* pEntry, char const*
     mpReference->resetCharactor();
 }
 
-/* 8022FC14-8022FC28 22A554 0014+00 1/0 0/0 0/0 .text
- * do_end__33jmessage_string_tMeasureProcessorFv                */
 void jmessage_string_tMeasureProcessor::do_end() {
     mpReference->addLineCount();
 }
 
-/* 8022FC28-8022FDF0 22A568 01C8+00 1/0 0/0 0/0 .text
- * do_character__33jmessage_string_tMeasureProcessorFi          */
 void jmessage_string_tMeasureProcessor::do_character(int iCharacter) {
     JUTFont* pFont = mpReference->getFont();
     if (JUTFont::isLeadByte_ShiftJIS(iCharacter)) {
@@ -4142,8 +3968,6 @@ void jmessage_string_tMeasureProcessor::do_character(int iCharacter) {
     }
 }
 
-/* 8022FDF0-8023098C 22A730 0B9C+00 5/0 0/0 0/0 .text
- * do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl          */
 bool jmessage_string_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     f32 var_f30;
     J2DTextBox::TFontSize fontsize;
@@ -4516,8 +4340,6 @@ bool jmessage_string_tMeasureProcessor::do_tag(u32 i_tag, void const* i_data, u3
     return true;
 }
 
-/* 8023098C-80230A08 22B2CC 007C+00 1/1 0/0 0/0 .text
- * do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl        */
 void jmessage_string_tMeasureProcessor::do_rubyset(void const* i_data, u32 i_size) {
     u8 len = i_size - 1;
     u8* pRuby = (u8*)i_data;
@@ -4544,33 +4366,21 @@ jmessage_string_tSequenceProcessor::jmessage_string_tSequenceProcessor(
     mMeasureProcessor(pReference)
     {}
 
-/* 80230ABC-80230AC0 22B3FC 0004+00 1/0 0/0 0/0 .text
- * do_reset__34jmessage_string_tSequenceProcessorFv             */
 void jmessage_string_tSequenceProcessor::do_reset() {}
 
-/* 80230AC0-80230B7C 22B400 00BC+00 1/0 0/0 0/0 .text
- * do_begin__34jmessage_string_tSequenceProcessorFPCvPCc        */
 void jmessage_string_tSequenceProcessor::do_begin(void const* pEntry, char const* pszText) {
     mpSeqReference = (jmessage_string_tReference*)JMessage::TSequenceProcessor::getReference();
     mMeasureProcessor.process_messageEntryText(this, pEntry, pszText);
 }
 
-/* 80230B7C-80230B80 22B4BC 0004+00 1/0 0/0 0/0 .text
- * do_end__34jmessage_string_tSequenceProcessorFv               */
 void jmessage_string_tSequenceProcessor::do_end() {}
 
-/* 80230B80-80230B88 22B4C0 0008+00 1/0 0/0 0/0 .text
- * do_isReady__34jmessage_string_tSequenceProcessorFv           */
 bool jmessage_string_tSequenceProcessor::do_isReady() {
     return true;
 }
 
-/* 80230B88-80230B8C 22B4C8 0004+00 1/0 0/0 0/0 .text
- * do_character__34jmessage_string_tSequenceProcessorFi         */
 void jmessage_string_tSequenceProcessor::do_character(int iCharacter) {}
 
-/* 80230B8C-80230BBC 22B4CC 0030+00 1/0 0/0 0/0 .text
- * do_tag__34jmessage_string_tSequenceProcessorFUlPCvUl         */
 bool jmessage_string_tSequenceProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     switch (i_tag & 0xFF0000) {
     case MSGTAG_GROUP(0):
@@ -4584,18 +4394,12 @@ bool jmessage_string_tSequenceProcessor::do_tag(u32 i_tag, void const* i_data, u
     return true;
 }
 
-/* 80230BBC-80230BC4 22B4FC 0008+00 1/0 0/0 0/0 .text
- * do_jump_isReady__34jmessage_string_tSequenceProcessorFv      */
 bool jmessage_string_tSequenceProcessor::do_jump_isReady() {
     return true;
 }
 
-/* 80230BC4-80230BC8 22B504 0004+00 1/0 0/0 0/0 .text
- * do_jump__34jmessage_string_tSequenceProcessorFPCvPCc         */
 void jmessage_string_tSequenceProcessor::do_jump(void const* pEntry, char const* pszText) {}
 
-/* 80230BC8-80230C20 22B508 0058+00 0/0 1/1 0/0 .text
- * __ct__35jmessage_string_tRenderingProcessorFPC26jmessage_string_tReference */
 jmessage_string_tRenderingProcessor::jmessage_string_tRenderingProcessor(
     jmessage_string_tReference const* pReference)
     : JMessage::TRenderingProcessor(pReference) {
@@ -4603,8 +4407,6 @@ jmessage_string_tRenderingProcessor::jmessage_string_tRenderingProcessor(
     do_reset();
 }
 
-/* 80230C20-80230C5C 22B560 003C+00 5/5 0/0 0/0 .text
- * getLineCountNowPage__35jmessage_string_tRenderingProcessorFv */
 s16 jmessage_string_tRenderingProcessor::getLineCountNowPage() {
     s16 rv = -1;
     s32 iVar4 = mpReference->getNowPage() * mpReference->getLineMax();
@@ -4615,8 +4417,6 @@ s16 jmessage_string_tRenderingProcessor::getLineCountNowPage() {
     return rv;
 }
 
-/* 80230C5C-80230CA0 22B59C 0044+00 1/0 0/0 0/0 .text
- * do_reset__35jmessage_string_tRenderingProcessorFv            */
 void jmessage_string_tRenderingProcessor::do_reset() {
     field_0x44 = 0.0f;
     field_0x3c = 0.0f;
@@ -4635,16 +4435,12 @@ void jmessage_string_tRenderingProcessor::do_reset() {
     field_0x486[0] = 0;
 }
 
-/* 80230CA0-80230CE8 22B5E0 0048+00 1/0 0/0 0/0 .text
- * do_begin__35jmessage_string_tRenderingProcessorFPCvPCc       */
 void jmessage_string_tRenderingProcessor::do_begin(void const* pEntry, char const* pszText) {
     do_reset();
     do_widthcenter();
     do_heightcenter();
 }
 
-/* 80230CE8-80230D48 22B628 0060+00 1/0 0/0 0/0 .text
- * do_end__35jmessage_string_tRenderingProcessorFv              */
 void jmessage_string_tRenderingProcessor::do_end() {
     if (mpReference->getPanePtr() != NULL) {
         strcpy(mpReference->getPanePtr()->getStringPtr(), field_0x54);
@@ -4655,8 +4451,6 @@ void jmessage_string_tRenderingProcessor::do_end() {
     }
 }
 
-/* 80230D48-80231110 22B688 03C8+00 1/0 0/0 0/0 .text
- * do_character__35jmessage_string_tRenderingProcessorFi        */
 void jmessage_string_tRenderingProcessor::do_character(int iCharacter) {
     JUTFont* pFont = mpReference->getFont();
     if (JUTFont::isLeadByte_ShiftJIS(iCharacter)) {
@@ -4736,8 +4530,6 @@ void jmessage_string_tRenderingProcessor::do_character(int iCharacter) {
     }
 }
 
-/* 80231110-80231D70 22BA50 0C60+00 6/0 0/0 0/0 .text
- * do_tag__35jmessage_string_tRenderingProcessorFUlPCvUl        */
 bool jmessage_string_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data, u32 i_size) {
     jmessage_tReference* pReference = (jmessage_tReference*)getReference();
     switch(i_tag & 0xFF0000) {
@@ -5185,8 +4977,6 @@ bool jmessage_string_tRenderingProcessor::do_tag(u32 i_tag, void const* i_data,
     return 1;
 }
 
-/* 80231D70-80231EF0 22C6B0 0180+00 2/2 0/0 0/0 .text
- * do_widthcenter__35jmessage_string_tRenderingProcessorFv      */
 void jmessage_string_tRenderingProcessor::do_widthcenter() {
     J2DPane* pane;
     f32 scale;
@@ -5235,8 +5025,6 @@ void jmessage_string_tRenderingProcessor::do_widthcenter() {
     }
 }
 
-/* 80231EF0-80232044 22C830 0154+00 1/1 0/0 0/0 .text
- * do_heightcenter__35jmessage_string_tRenderingProcessorFv     */
 void jmessage_string_tRenderingProcessor::do_heightcenter() {
     f32 height;
     J2DTextBox::TFontSize fontSize;
@@ -5268,8 +5056,6 @@ void jmessage_string_tRenderingProcessor::do_heightcenter() {
     }
 }
 
-/* 80232044-802320B0 22C984 006C+00 7/7 0/0 0/0 .text
- * do_strcat__35jmessage_string_tRenderingProcessorFPc          */
 void jmessage_string_tRenderingProcessor::do_strcat(char* i_str) {
     if (getLineCountNowPage() >= 0) {
         field_0x54e += strlen(i_str);
@@ -5281,8 +5067,6 @@ void jmessage_string_tRenderingProcessor::do_strcat(char* i_str) {
     }
 }
 
-/* 802320B0-80232260 22C9F0 01B0+00 1/1 0/0 0/0 .text
- * do_rubyset__35jmessage_string_tRenderingProcessorFPCvUl      */
 void jmessage_string_tRenderingProcessor::do_rubyset(void const* i_data, u32 i_size) {
     if (getLineCountNowPage() >= 0) {
         if (mpReference->getRubyPanePtr() != NULL) {
@@ -5321,8 +5105,6 @@ void jmessage_string_tRenderingProcessor::do_rubyset(void const* i_data, u32 i_s
     }
 }
 
-/* 80232260-802322CC 22CBA0 006C+00 2/2 0/0 0/0 .text
- * do_rubystrcat__35jmessage_string_tRenderingProcessorFPc      */
 void jmessage_string_tRenderingProcessor::do_rubystrcat(char* i_str) {
     if (getLineCountNowPage() >= 0) {
         field_0x550 += strlen(i_str);
@@ -5334,8 +5116,6 @@ void jmessage_string_tRenderingProcessor::do_rubystrcat(char* i_str) {
     }
 }
 
-/* 802322CC-8023256C 22CC0C 02A0+00 2/2 0/0 0/0 .text
- * do_outfont__35jmessage_string_tRenderingProcessorFUc         */
 void jmessage_string_tRenderingProcessor::do_outfont(u8 i_iconNo) {
     if (mpReference->getPanePtr() != NULL) {
         f32 charSpace = mpReference->getPanePtr()->getCharSpace();
@@ -5391,8 +5171,6 @@ void jmessage_string_tRenderingProcessor::do_outfont(u8 i_iconNo) {
     }
 }
 
-/* 8023256C-80232600 22CEAC 0094+00 1/1 0/0 0/0 .text
- * do_color__35jmessage_string_tRenderingProcessorFUc           */
 void jmessage_string_tRenderingProcessor::do_color(u8 i_colorNo) {
     u32 ccColor;
     u32 gcColor;
@@ -5409,8 +5187,6 @@ void jmessage_string_tRenderingProcessor::do_color(u8 i_colorNo) {
     do_strcat(buffer);
 }
 
-/* 80232600-80232690 22CF40 0090+00 1/1 0/0 0/0 .text
- * do_scale__35jmessage_string_tRenderingProcessorFf            */
 void jmessage_string_tRenderingProcessor::do_scale(f32 i_scale) {
     J2DTextBox::TFontSize fontSize;
     mpReference->getPanePtr()->getFontSize(fontSize);
@@ -5422,16 +5198,12 @@ void jmessage_string_tRenderingProcessor::do_scale(f32 i_scale) {
     do_strcat(buffer);
 }
 
-/* 80232690-802326E4 22CFD0 0054+00 1/1 0/0 0/0 .text
- * do_linedown__35jmessage_string_tRenderingProcessorFs         */
 void jmessage_string_tRenderingProcessor::do_linedown(s16 i_lineNo) {
     char buffer[16];
     sprintf(buffer, "\x1B" "CD[%d]", i_lineNo);
     do_strcat(buffer);
 }
 
-/* 802326E4-802327BC 22D024 00D8+00 1/1 0/0 0/0 .text
- * do_numset__35jmessage_string_tRenderingProcessorFs           */
 void jmessage_string_tRenderingProcessor::do_numset(s16 i_num) {
     if (9999 < i_num) {
         i_num = 9999;
@@ -5446,8 +5218,6 @@ void jmessage_string_tRenderingProcessor::do_numset(s16 i_num) {
     do_outfont(getOutFontNumberType(i_num % 10));
 }
 
-/* 802327BC-802327F8 22D0FC 003C+00 1/1 0/0 0/0 .text
- * push_word__35jmessage_string_tRenderingProcessorFPCc         */
 void jmessage_string_tRenderingProcessor::push_word(char const* i_word) {
     strcpy(field_0x486, i_word);
     stack_pushCurrent(field_0x486);
diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp
index f8f7ef1eda..2524fd337e 100644
--- a/src/d/d_msg_flow.cpp
+++ b/src/d/d_msg_flow.cpp
@@ -14,17 +14,13 @@
 #include "d/actor/d_a_obj_ss_base.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80249F00-80249F48 244840 0048+00 0/0 5/5 154/154 .text            __ct__10dMsgFlow_cFv */
 dMsgFlow_c::dMsgFlow_c() {
     mNonStopJunpFlowFlag = 0;
     setInitValue(1);
 }
 
-/* 80249F48-80249F90 244888 0048+00 1/0 7/7 111/111 .text            __dt__10dMsgFlow_cFv */
 dMsgFlow_c::~dMsgFlow_c() {}
 
-/* 80249F90-8024A13C 2448D0 01AC+00 0/0 10/10 86/86 .text
- * init__10dMsgFlow_cFP10fopAc_ac_ciiPP10fopAc_ac_c             */
 void dMsgFlow_c::init(fopAc_ac_c* i_partner, int i_flowID, int param_2, fopAc_ac_c** i_talkPartners) {
     if (!dMsgObject_isTalkNowCheck()) {
         if (i_talkPartners == NULL) {
@@ -93,8 +89,6 @@ void dMsgFlow_c::initWord(fopAc_ac_c* i_partner, const char* i_word, u8 i_output
     init(i_partner, flowID, param_3, param_4);
 }
 
-/* 8024A13C-8024A2D8 244A7C 019C+00 2/0 0/0 2/2 .text checkOpenDoor__10dMsgFlow_cFP10fopAc_ac_cPi
- */
 int dMsgFlow_c::checkOpenDoor(fopAc_ac_c* i_speaker_p, int* param_2) {
     if (dMsgObject_isTalkNowCheck()) {
         return 0;
@@ -175,8 +169,6 @@ int dMsgFlow_c::checkOpenDoor(fopAc_ac_c* i_speaker_p, int* param_2) {
     return var_r27;
 }
 
-/* 8024A2D8-8024A424 244C18 014C+00 0/0 21/21 78/78 .text
- * doFlow__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_ci            */
 int dMsgFlow_c::doFlow(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners, int i_flowID) {
     BOOL check = FALSE;
     int var_r26 = 0;
@@ -221,7 +213,6 @@ int dMsgFlow_c::doFlow(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners, int
     return var_r26 != 0 || check;
 }
 
-/* 8024A424-8024A4C4 244D64 00A0+00 0/0 2/2 1/1 .text checkEventRender__10dMsgFlow_cFPiPiPiPi */
 int dMsgFlow_c::checkEventRender(int* param_0, int* param_1, int* param_2, int* param_3) {
     if (field_0x47) {
         if (param_0 != NULL) {
@@ -244,7 +235,6 @@ int dMsgFlow_c::checkEventRender(int* param_0, int* param_1, int* param_2, int*
     return field_0x47 == 1;
 }
 
-/* 8024A4C4-8024A528 244E04 0064+00 0/0 0/0 10/10 .text            remove__10dMsgFlow_cFv */
 void dMsgFlow_c::remove() {
     field_0x27 = 0;
     field_0x26 = 1;
@@ -259,24 +249,20 @@ void dMsgFlow_c::remove() {
     daPy_py_c::setMidnaFaceNum(0);
 }
 
-/* 8024A528-8024A538 244E68 0010+00 0/0 2/2 66/66 .text            getEventId__10dMsgFlow_cFPi */
 u16 dMsgFlow_c::getEventId(int* oItemId_p) {
     JUT_ASSERT(555, NULL != oItemId_p);
     *oItemId_p = field_0x30;
     return mEventId;
 }
 
-/* 8024A538-8024A540 244E78 0008+00 0/0 3/3 4/4 .text            getMsgNo__10dMsgFlow_cFv */
 u32 dMsgFlow_c::getMsgNo() {
     return mMsgNo;
 }
 
-/* 8024A540-8024A548 244E80 0008+00 0/0 0/0 12/12 .text            getNowMsgNo__10dMsgFlow_cFv */
 u32 dMsgFlow_c::getNowMsgNo() {
     return mNowMsgNo;
 }
 
-/* 8024A548-8024A580 244E88 0038+00 0/0 2/2 4/4 .text            getMsg__10dMsgFlow_cFv */
 msg_class* dMsgFlow_c::getMsg() {
     if (mMsg != fpcM_ERROR_PROCESS_ID_e) {
         return fopMsgM_SearchByID(mMsg);
@@ -285,7 +271,6 @@ msg_class* dMsgFlow_c::getMsg() {
     return NULL;
 }
 
-/* 8024A580-8024A618 244EC0 0098+00 5/5 0/0 0/0 .text            setInitValue__10dMsgFlow_cFi */
 void dMsgFlow_c::setInitValue(int param_0) {
     if (param_0 != 0) {
         mFlow_p = NULL;
@@ -320,8 +305,6 @@ void dMsgFlow_c::setInitValue(int param_0) {
     field_0x47 = 0;
 }
 
-/* 8024A618-8024A6EC 244F58 00D4+00 1/1 0/0 0/0 .text
- * setInitValueGroupChange__10dMsgFlow_cFiPP10fopAc_ac_c        */
 void dMsgFlow_c::setInitValueGroupChange(int i_msgNo, fopAc_ac_c** i_talkPartners) {
     u8* labelInfoTBL = NULL;
     u16 var_r28 = i_msgNo;
@@ -344,8 +327,6 @@ void dMsgFlow_c::setInitValueGroupChange(int i_msgNo, fopAc_ac_c** i_talkPartner
     setNodeIndex(getInitNodeIndex(mFlow), i_talkPartners);
 }
 
-/* 8024A6EC-8024A784 24502C 0098+00 4/4 0/0 0/0 .text            getMsgDataBlock__10dMsgFlow_cFPCc
- */
 u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) {
     u8* block_p = NULL;
     u8* aMsgRes_p = NULL;
@@ -372,8 +353,6 @@ u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) {
     return NULL;
 }
 
-/* 8024A784-8024A7CC 2450C4 0048+00 5/5 0/0 0/0 .text            getInitNodeIndex__10dMsgFlow_cFUs
- */
 u16 dMsgFlow_c::getInitNodeIndex(u16 param_1) {
     u8* var_r30 = NULL;
     u16 var_r27 = -1;
@@ -392,8 +371,6 @@ u16 dMsgFlow_c::getInitNodeIndex(u16 param_1) {
     return var_r27;
 }
 
-/* 8024A7CC-8024A95C 24510C 0190+00 6/6 0/0 0/0 .text setNodeIndex__10dMsgFlow_cFUsPP10fopAc_ac_c
- */
 void dMsgFlow_c::setNodeIndex(u16 i_nodeIdx, fopAc_ac_c** i_talkPartners) {
     msg_class* aMsg_p = NULL;
     if (mMsg != fpcM_ERROR_PROCESS_ID_e) {
@@ -461,8 +438,6 @@ void dMsgFlow_c::setNodeIndex(u16 i_nodeIdx, fopAc_ac_c** i_talkPartners) {
     mNodeIdx = i_nodeIdx;
 }
 
-/* 8024A95C-8024AA50 24529C 00F4+00 1/1 0/0 0/0 .text
- * setSelectMsg__10dMsgFlow_cFP14mesg_flow_nodeP14mesg_flow_nodeP10fopAc_ac_c */
 int dMsgFlow_c::setSelectMsg(mesg_flow_node* i_flowNode_p, mesg_flow_node* param_2,
                              fopAc_ac_c* i_speaker_p) {
     u16* inf_p = NULL;
@@ -514,8 +489,6 @@ int dMsgFlow_c::setSelectMsg(mesg_flow_node* i_flowNode_p, mesg_flow_node* param
     return 1;
 }
 
-/* 8024AA50-8024AB30 245390 00E0+00 1/1 0/0 0/0 .text
- * setNormalMsg__10dMsgFlow_cFP14mesg_flow_nodeP10fopAc_ac_c    */
 int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16* inf_p = NULL;
     mesg_flow_node* var_r29 = NULL;
@@ -560,8 +533,6 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker
     return 1;
 }
 
-/* 8024AB30-8024AD54 245470 0224+00 2/1 0/0 0/0 .text
- * messageNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c    */
 int dMsgFlow_c::messageNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) {
     mesg_flow_node* flowNode_p = NULL;
     flowNode_p = &mFlowNodeTBL[mNodeIdx].message;
@@ -648,8 +619,6 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPart
     return 0;
 }
 
-/* 8024AD54-8024ADEC 245694 0098+00 1/1 0/0 0/0 .text
- * branchNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c     */
 int dMsgFlow_c::branchNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) {
     mesg_flow_node_branch* node = NULL;
     node = &mFlowNodeTBL[mNodeIdx].branch;
@@ -660,8 +629,6 @@ int dMsgFlow_c::branchNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartn
     return 1;
 }
 
-/* 8024ADEC-8024AFF8 24572C 020C+00 1/1 0/0 0/0 .text
- * eventNodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c      */
 int dMsgFlow_c::eventNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) {
     mesg_flow_node_event* node = NULL;
     node = &mFlowNodeTBL[mNodeIdx].event;
@@ -720,8 +687,6 @@ int dMsgFlow_c::eventNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartne
     return 1;
 }
 
-/* 8024AFF8-8024B0F0 245938 00F8+00 1/1 0/0 0/0 .text
- * nodeProc__10dMsgFlow_cFP10fopAc_ac_cPP10fopAc_ac_c           */
 int dMsgFlow_c::nodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) {
     fopAc_ac_c* aSpeaker_p = i_speaker_p;
     int proc_status = 1;
@@ -758,8 +723,6 @@ int dMsgFlow_c::nodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) {
     return 0;
 }
 
-/* 8024B0F0-8024B108 245A30 0018+00 16/16 0/0 0/0 .text            getParam__10dMsgFlow_cFPUsPUsPUc
- */
 int dMsgFlow_c::getParam(u16* prm0, u16* prm1, u8* params) {
     *prm0 = *(u16*)params;
     *prm1 = *(u16*)(params + 2);
@@ -767,7 +730,6 @@ int dMsgFlow_c::getParam(u16* prm0, u16* prm1, u8* params) {
     return *(int*)params;
 }
 
-/* 8024B108-8024B130 245A48 0028+00 3/3 0/0 0/0 .text            getParam__10dMsgFlow_cFPUcPUc */
 int dMsgFlow_c::getParam(u8* prm0, u8* params) {
     for (int i = 0; i < 4; i++) {
         prm0[i] = params[i];
@@ -776,12 +738,10 @@ int dMsgFlow_c::getParam(u8* prm0, u8* params) {
     return *(int*)params;
 }
 
-/* 8024B130-8024B138 245A70 0008+00 20/20 0/0 0/0 .text            getParam__10dMsgFlow_cFPUc */
 int dMsgFlow_c::getParam(u8* params) {
     return *(int*)params;
 }
 
-/* 803C184C-803C1AC8 01E96C 027C+00 2/3 0/0 0/0 .data            mQueryList__10dMsgFlow_c */
 queryFunc dMsgFlow_c::mQueryList[53] = {
     &dMsgFlow_c::query005, &dMsgFlow_c::query001, &dMsgFlow_c::query002, &dMsgFlow_c::query003,
     &dMsgFlow_c::query006, &dMsgFlow_c::query007, &dMsgFlow_c::query004, &dMsgFlow_c::query008,
@@ -803,8 +763,6 @@ queryFunc dMsgFlow_c::mQueryList[53] = {
 void dMsgFlow_c::dbgPrint() {}
 #endif
 
-/* 8024B138-8024B180 245A78 0048+00 1/0 0/0 0/0 .text
- * query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query001(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isEventBit((u16)dSv_event_flag_c::saveBitLabels[prm0]) == false;
@@ -818,8 +776,6 @@ u16 dMsgFlow_c::query001(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B180-8024B208 245AC0 0088+00 1/0 0/0 0/0 .text
- * query002__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query002(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u16 ret;
     if (daPy_py_c::checkNowWolf()) {
@@ -839,8 +795,6 @@ u16 dMsgFlow_c::query002(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B208-8024B250 245B48 0048+00 1/0 0/0 0/0 .text
- * query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query003(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret = cM_rndF(prm0);
@@ -855,8 +809,6 @@ u16 dMsgFlow_c::query003(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
 }
 
 
-/* 8024B250-8024B2C0 245B90 0070+00 1/0 0/0 0/0 .text
- * query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query004(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret;
@@ -876,8 +828,6 @@ u16 dMsgFlow_c::query004(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;    
 }
 
-/* 8024B2C0-8024B2F8 245C00 0038+00 2/1 1/1 1/1 .text
- * query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query005(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     msg_class* aMsg_p = fopMsgM_SearchByID(mMsg);
     JUT_ASSERT(1668, NULL != aMsg_p);
@@ -894,8 +844,6 @@ u16 dMsgFlow_c::query005(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B2F8-8024B32C 245C38 0034+00 1/0 0/0 0/0 .text
- * query006__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query006(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u16 ret = query005(i_flowNode_p, i_speaker_p, 0);
     mChoiceNo = ret;
@@ -909,8 +857,6 @@ u16 dMsgFlow_c::query006(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B32C-8024B45C 245C6C 0130+00 1/0 0/0 0/0 .text
- * query007__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query007(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret;
@@ -942,8 +888,6 @@ u16 dMsgFlow_c::query007(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B45C-8024B4A4 245D9C 0048+00 1/0 0/0 0/0 .text
- * query008__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query008(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret = daNpcKakashi_getSwdTutorialStep() - 1 != prm0;
@@ -957,8 +901,6 @@ u16 dMsgFlow_c::query008(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B4A4-8024B4D0 245DE4 002C+00 1/0 0/0 0/0 .text
- * query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query009(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u16 ret = daNpcKakashi_getSwdTutorialResult() == FALSE;
 
@@ -971,8 +913,6 @@ u16 dMsgFlow_c::query009(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B4D0-8024B504 245E10 0034+00 1/0 0/0 0/0 .text
- * query010__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query010(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u16 ret = daNpcKakashi_getSuccessCount() != 1;
 
@@ -985,8 +925,6 @@ u16 dMsgFlow_c::query010(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B504-8024B54C 245E44 0048+00 1/0 0/0 0/0 .text
- * query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query011(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isTmpBit((u16)dSv_event_tmp_flag_c::tempBitLabels[prm0]) == FALSE;
@@ -1000,8 +938,6 @@ u16 dMsgFlow_c::query011(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B54C-8024B584 245E8C 0038+00 1/0 0/0 0/0 .text
- * query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query012(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isTbox(prm0) == FALSE;
@@ -1015,8 +951,6 @@ u16 dMsgFlow_c::query012(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B584-8024B5BC 245EC4 0038+00 1/0 0/0 0/0 .text
- * query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query013(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isSaveSwitch(prm0) == FALSE;
@@ -1030,8 +964,6 @@ u16 dMsgFlow_c::query013(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B5BC-8024B5F4 245EFC 0038+00 1/0 0/0 0/0 .text
- * query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query014(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isSaveItem(prm0) == FALSE;
@@ -1045,8 +977,6 @@ u16 dMsgFlow_c::query014(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B5F4-8024B62C 245F34 0038+00 1/0 0/0 0/0 .text
- * query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query015(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isSaveDunSwitch(prm0) == FALSE;
@@ -1060,8 +990,6 @@ u16 dMsgFlow_c::query015(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B62C-8024B664 245F6C 0038+00 1/0 0/0 0/0 .text
- * query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query016(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_isSaveDunItem(prm0) == FALSE;
@@ -1075,8 +1003,6 @@ u16 dMsgFlow_c::query016(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B664-8024B6A8 245FA4 0044+00 1/0 0/0 0/0 .text
- * query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query017(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     int roomNo = -1;
@@ -1096,8 +1022,6 @@ u16 dMsgFlow_c::query017(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B6A8-8024B6EC 245FE8 0044+00 1/0 0/0 0/0 .text
- * query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query018(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     int roomNo = -1;
@@ -1117,8 +1041,6 @@ u16 dMsgFlow_c::query018(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B6EC-8024B730 24602C 0044+00 1/0 0/0 0/0 .text
- * query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query019(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     int roomNo = -1;
@@ -1138,8 +1060,6 @@ u16 dMsgFlow_c::query019(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B730-8024B774 246070 0044+00 1/0 0/0 0/0 .text
- * query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query020(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     int roomNo = -1;
@@ -1159,8 +1079,6 @@ u16 dMsgFlow_c::query020(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B774-8024B8E4 2460B4 0170+00 1/0 0/0 0/0 .text
- * query021__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query021(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u8 prm0 = i_flowNode_p->param;
     u16 ret = 0;
@@ -1209,8 +1127,6 @@ u16 dMsgFlow_c::query021(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B8E4-8024B918 246224 0034+00 1/0 0/0 0/0 .text
- * query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query022(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u8 prm0 = i_flowNode_p->param;
     u16 ret = checkItemGet(prm0 & 0xFF, 1) ? 0 : 1;
@@ -1224,8 +1140,6 @@ u16 dMsgFlow_c::query022(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B918-8024B954 246258 003C+00 1/0 0/0 0/0 .text
- * query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query023(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u8 prm0 = i_flowNode_p->param;
     int i_bagNum = 3 - dComIfGs_checkBombBag(fpcNm_ITEM_NONE);
@@ -1242,8 +1156,6 @@ u16 dMsgFlow_c::query023(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B954-8024B974 246294 0020+00 1/0 0/0 0/0 .text
- * query024__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query024(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u8 prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_getArrowNum() >= prm0 ? 0 : 1;
@@ -1257,8 +1169,6 @@ u16 dMsgFlow_c::query024(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B974-8024B9BC 2462B4 0048+00 1/0 0/0 0/0 .text
- * query025__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query025(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u8 prm0 = i_flowNode_p->param;
     u16 ret = dComIfGs_checkEmptyBottle() >= prm0 ? 0 : 1;
@@ -1272,8 +1182,6 @@ u16 dMsgFlow_c::query025(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B9BC-8024B9E8 2462FC 002C+00 1/0 0/0 0/0 .text
- * query026__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query026(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     dShopSystem_c* shop_ac = (dShopSystem_c*)i_speaker_p;
     const int prm0 = i_flowNode_p->param;
@@ -1288,8 +1196,6 @@ u16 dMsgFlow_c::query026(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024B9E8-8024BA4C 246328 0064+00 1/0 0/0 0/0 .text
- * query027__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query027(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 prm0 = i_flowNode_p->param & 0xFF;
     if (prm0 == 0) {
@@ -1307,8 +1213,6 @@ u16 dMsgFlow_c::query027(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BA4C-8024BAA0 24638C 0054+00 1/0 0/0 0/0 .text
- * query028__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query028(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const u16 prm0 = i_flowNode_p->param;
     u16 ret = dMeter2Info_getTimeMs() <= prm0 * 1000 + 999 ? 0 : 1;
@@ -1326,8 +1230,6 @@ u16 dMsgFlow_c::query028(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BAA0-8024BAE0 2463E0 0040+00 1/0 0/0 0/0 .text
- * query029__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query029(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 1;
     if (dComIfGs_getOil() == 0 || dComIfGs_getMaxOil() == 0) {
@@ -1345,8 +1247,6 @@ u16 dMsgFlow_c::query029(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BAE0-8024BB18 246420 0038+00 1/0 0/0 0/0 .text
- * query030__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query030(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = dComIfGs_getTmpReg(0xFBFF);
 
@@ -1359,8 +1259,6 @@ u16 dMsgFlow_c::query030(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BB18-8024BB74 246458 005C+00 1/0 0/0 0/0 .text
- * query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query031(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     int reg = dComIfGs_getEventReg(0xFF1F);
@@ -1382,8 +1280,6 @@ u16 dMsgFlow_c::query031(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BB74-8024BB9C 2464B4 0028+00 1/0 0/0 0/0 .text
- * query032__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query032(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
 
@@ -1401,8 +1297,6 @@ u16 dMsgFlow_c::query032(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BB9C-8024BBE4 2464DC 0048+00 1/0 0/0 0/0 .text
- * query033__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query033(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 1;
     if (daPy_getPlayerActorClass()->checkUseKandelaar(1)) {
@@ -1420,8 +1314,6 @@ u16 dMsgFlow_c::query033(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BBE4-8024BC14 246524 0030+00 1/0 0/0 0/0 .text
- * query034__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query034(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 0;
     ret = (int)(dComIfGs_getTime() * (1.0f / 15.0f)) & 0xFF;
@@ -1435,8 +1327,6 @@ u16 dMsgFlow_c::query034(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BC14-8024BC3C 246554 0028+00 1/0 0/0 0/0 .text
- * query035__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query035(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u8 ret = 0;
@@ -1453,8 +1343,6 @@ u16 dMsgFlow_c::query035(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BC3C-8024BC80 24657C 0044+00 1/0 0/0 0/0 .text
- * query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query036(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     msg_class* aMsg_p = fopMsgM_SearchByID(mMsg);
     JUT_ASSERT(2751, NULL != aMsg_p);
@@ -1473,8 +1361,6 @@ u16 dMsgFlow_c::query036(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BC80-8024BCC4 2465C0 0044+00 1/0 0/0 0/0 .text
- * query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query037(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     msg_class* aMsg_p = fopMsgM_SearchByID(mMsg);
     JUT_ASSERT(2789, NULL != aMsg_p);
@@ -1493,8 +1379,6 @@ u16 dMsgFlow_c::query037(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BCC4-8024BDB0 246604 00EC+00 1/0 0/0 0/0 .text
- * query038__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query038(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
 
@@ -1533,8 +1417,6 @@ u16 dMsgFlow_c::query038(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 } 
 
-/* 8024BDB0-8024BE4C 2466F0 009C+00 1/0 0/0 0/0 .text
- * query039__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query039(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
 
@@ -1558,8 +1440,6 @@ u16 dMsgFlow_c::query039(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BE4C-8024BF50 24678C 0104+00 1/0 0/0 0/0 .text
- * query040__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query040(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
 
@@ -1596,8 +1476,6 @@ u16 dMsgFlow_c::query040(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BF50-8024BFEC 246890 009C+00 1/0 0/0 0/0 .text
- * query041__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query041(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
 
@@ -1621,8 +1499,6 @@ u16 dMsgFlow_c::query041(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024BFEC-8024C0A8 24692C 00BC+00 1/0 0/0 0/0 .text
- * query042__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query042(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     daMidna_c* midna_p = daPy_py_c::getMidnaActor();
 
@@ -1646,8 +1522,6 @@ u16 dMsgFlow_c::query042(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C0A8-8024C144 2469E8 009C+00 1/0 0/0 0/0 .text
- * query043__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query043(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int prm0 = i_flowNode_p->param;
     u8 BombBag = dComIfGs_getTmpReg(0xFBFF) - 1;
@@ -1670,8 +1544,6 @@ u16 dMsgFlow_c::query043(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C144-8024C18C 246A84 0048+00 1/0 0/0 0/0 .text
- * query044__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query044(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret;
     if (daAlink_getAlinkActorClass()->checkAcceptDungeonWarpAlink(0)) {
@@ -1689,8 +1561,6 @@ u16 dMsgFlow_c::query044(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C18C-8024C218 246ACC 008C+00 1/0 0/0 0/0 .text
- * query045__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query045(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 insectNum = dComIfGs_checkGetInsectNum();
     u8 ret = 0;
@@ -1715,8 +1585,6 @@ u16 dMsgFlow_c::query045(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C218-8024C248 246B58 0030+00 1/0 0/0 0/0 .text
- * query046__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query046(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = dComIfGs_checkInsectBottle();
 
@@ -1729,8 +1597,6 @@ u16 dMsgFlow_c::query046(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C248-8024C250 246B88 0008+00 1/0 0/0 0/0 .text
- * query047__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query047(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 0;
 
@@ -1744,8 +1610,6 @@ u16 dMsgFlow_c::query047(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C250-8024C2A0 246B90 0050+00 1/0 0/0 0/0 .text
- * query048__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query048(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = dMeter2Info_getNewLetterNum();
 
@@ -1766,8 +1630,6 @@ u16 dMsgFlow_c::query048(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C2A0-8024C2FC 246BE0 005C+00 1/0 0/0 0/0 .text
- * query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query049(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 num = dComIfGs_getPohSpiritNum();
 
@@ -1793,8 +1655,6 @@ u16 dMsgFlow_c::query049(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C2FC-8024C340 246C3C 0044+00 1/0 0/0 0/0 .text
- * query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query050(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     const int num = i_flowNode_p->param;
     u8 ret;
@@ -1813,8 +1673,6 @@ u16 dMsgFlow_c::query050(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C340-8024C3A0 246C80 0060+00 1/0 0/0 0/0 .text
- * query051__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query051(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     int num = dComIfGp_getMessageCountNumber();
     u8 ret;
@@ -1839,8 +1697,6 @@ u16 dMsgFlow_c::query051(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C3A0-8024C3D4 246CE0 0034+00 1/0 0/0 0/0 .text
- * query052__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query052(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 0;
     if (daPy_getPlayerActorClass()->checkWaterInMove() || dComIfGp_checkPlayerStatus0(0, 0x100000)) {
@@ -1856,8 +1712,6 @@ u16 dMsgFlow_c::query052(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 8024C3D4-8024C3FC 246D14 0028+00 1/0 0/0 0/0 .text
- * query053__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */
 u16 dMsgFlow_c::query053(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) {
     u8 ret = 0;
     if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) {
@@ -1873,7 +1727,6 @@ u16 dMsgFlow_c::query053(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea
     return ret;
 }
 
-/* 803C1CCC-803C1ED0 01EDEC 0204+00 1/2 0/0 0/0 .data            mEventList__10dMsgFlow_c */
 eventFunc dMsgFlow_c::mEventList[43] = {
     &dMsgFlow_c::event000, &dMsgFlow_c::event001, &dMsgFlow_c::event002, &dMsgFlow_c::event003,
     &dMsgFlow_c::event004, &dMsgFlow_c::event005, &dMsgFlow_c::event006, &dMsgFlow_c::event007,
@@ -1888,8 +1741,6 @@ eventFunc dMsgFlow_c::mEventList[43] = {
     &dMsgFlow_c::event040, &dMsgFlow_c::event041, &dMsgFlow_c::event042,
 };
 
-/* 8024C3FC-8024C488 246D3C 008C+00 1/0 0/0 0/0 .text
- * event000__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event000(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -1910,8 +1761,6 @@ int dMsgFlow_c::event000(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C488-8024C514 246DC8 008C+00 1/0 0/0 0/0 .text
- * event001__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event001(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -1931,8 +1780,6 @@ int dMsgFlow_c::event001(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C514-8024C550 246E54 003C+00 1/0 0/0 0/0 .text
- * event002__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event002(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemRupeeCount(prm0);
@@ -1944,8 +1791,6 @@ int dMsgFlow_c::event002(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C550-8024C590 246E90 0040+00 1/0 0/0 0/0 .text
- * event003__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event003(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemRupeeCount(-prm0);
@@ -1957,8 +1802,6 @@ int dMsgFlow_c::event003(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C590-8024C5F0 246ED0 0060+00 1/0 0/0 0/0 .text
- * event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event004(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     f32 prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemLifeCount(prm0, 0);
@@ -1970,8 +1813,6 @@ int dMsgFlow_c::event004(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C5F0-8024C654 246F30 0064+00 1/0 0/0 0/0 .text
- * event005__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event005(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     f32 prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemLifeCount((f32)-prm0, 0);
@@ -1983,8 +1824,6 @@ int dMsgFlow_c::event005(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C654-8024C694 246F94 0040+00 1/0 0/0 0/0 .text
- * event006__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event006(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemMagicCount(prm0);
@@ -1996,8 +1835,6 @@ int dMsgFlow_c::event006(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C694-8024C6D8 246FD4 0044+00 1/0 0/0 0/0 .text
- * event007__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event007(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dComIfGp_setItemMagicCount(-prm0);
@@ -2009,8 +1846,6 @@ int dMsgFlow_c::event007(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C6D8-8024C744 247018 006C+00 1/0 0/0 0/0 .text
- * event008__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event008(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2032,8 +1867,6 @@ int dMsgFlow_c::event008(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C744-8024C76C 247084 0028+00 1/0 0/0 0/0 .text
- * event009__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event009(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm0 = getParam(i_flowNode_p->params);
 
@@ -2044,8 +1877,6 @@ int dMsgFlow_c::event009(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C76C-8024C7F8 2470AC 008C+00 1/0 0/0 0/0 .text
- * event010__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event010(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2066,8 +1897,6 @@ int dMsgFlow_c::event010(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C7F8-8024C884 247138 008C+00 1/0 0/0 0/0 .text
- * event011__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event011(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2088,8 +1917,6 @@ int dMsgFlow_c::event011(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C884-8024C88C 2471C4 0008+00 1/0 0/0 0/0 .text
- * event012__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event012(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     // "Door OPEN"
     OS_REPORT("\x1B[44;32mドアＯＰＥＮ　　　　　　　　　　　　\x1B[m|:");
@@ -2098,8 +1925,6 @@ int dMsgFlow_c::event012(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C88C-8024C8CC 2471CC 0040+00 1/0 0/0 0/0 .text
- * event013__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event013(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     mSelType = SELTYPE_VERTICAL_e;
     mSelectMessage = 1;
@@ -2114,8 +1939,6 @@ int dMsgFlow_c::event013(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C8CC-8024C994 24720C 00C8+00 1/0 0/0 0/0 .text
- * event014__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event014(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2148,8 +1971,6 @@ int dMsgFlow_c::event014(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024C994-8024CA5C 2472D4 00C8+00 1/0 0/0 0/0 .text
- * event015__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event015(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2182,8 +2003,6 @@ int dMsgFlow_c::event015(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CA5C-8024CA94 24739C 0038+00 1/0 0/0 0/0 .text
- * event016__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event016(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     dShopSystem_c* shop = (dShopSystem_c*)i_speaker_p;
     shop->setEventParam(*(u32*)i_flowNode_p->params);
@@ -2198,8 +2017,6 @@ int dMsgFlow_c::event016(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CA94-8024CBB0 2473D4 011C+00 1/0 0/0 0/0 .text
- * event017__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event017(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2237,8 +2054,6 @@ int dMsgFlow_c::event017(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CBB0-8024CCA4 2474F0 00F4+00 1/0 0/0 0/0 .text
- * event018__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event018(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u8 prm[4];
     getParam(prm, i_flowNode_p->params);
@@ -2272,14 +2087,10 @@ int dMsgFlow_c::event018(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CCA4-8024CCAC 2475E4 0008+00 1/0 0/0 0/0 .text
- * event019__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event019(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     return 1;
 }
 
-/* 8024CCAC-8024CD84 2475EC 00D8+00 1/0 0/0 0/0 .text
- * event020__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event020(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     daPy_py_c* player = daPy_getPlayerActorClass();
@@ -2300,8 +2111,6 @@ int dMsgFlow_c::event020(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CD84-8024CDAC 2476C4 0028+00 1/0 0/0 0/0 .text
- * event021__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event021(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     cLib_calcTimer(&mTimer);
 
@@ -2312,8 +2121,6 @@ int dMsgFlow_c::event021(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CDAC-8024CE40 2476EC 0094+00 1/0 0/0 0/0 .text
- * event022__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event022(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     if (prm0 == 0) {
@@ -2331,8 +2138,6 @@ int dMsgFlow_c::event022(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CE40-8024CF2C 247780 00EC+00 2/0 0/0 0/0 .text
- * event023__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event023(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
 
@@ -2367,8 +2172,6 @@ int dMsgFlow_c::event023(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CF2C-8024CF54 24786C 0028+00 1/0 0/0 0/0 .text
- * event024__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event024(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     dShopSystem_c* shop = (dShopSystem_c*)i_speaker_p;
     shop->setSoldOutFlag();
@@ -2380,8 +2183,6 @@ int dMsgFlow_c::event024(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CF54-8024CF9C 247894 0048+00 1/0 0/0 0/0 .text
- * event025__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event025(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     u8 value = prm0 & 0xFF;
@@ -2394,8 +2195,6 @@ int dMsgFlow_c::event025(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024CF9C-8024D004 2478DC 0068+00 1/0 0/0 0/0 .text
- * event026__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     fopAc_ac_c* speaker_p;
     if (fopAcM_GetName(i_speaker_p) == PROC_MYNA) {
@@ -2422,8 +2221,6 @@ int dMsgFlow_c::event026(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D004-8024D3C4 247944 03C0+00 2/0 0/0 0/0 .text
- * event027__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2510,8 +2307,6 @@ int dMsgFlow_c::event027(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D3C4-8024D500 247D04 013C+00 1/0 0/0 0/0 .text
- * event028__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event028(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u8 pos = dComIfGs_getTmpReg(0xFBFF) - 1;
     dMsgObject_setSelectCursorPos(pos);
@@ -2544,8 +2339,6 @@ int dMsgFlow_c::event028(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D500-8024D544 247E40 0044+00 1/0 0/0 0/0 .text
- * event029__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event029(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     mSelType = SELTYPE_HORIZONTAL_e;
     mSelectMessage = 1;
@@ -2561,8 +2354,6 @@ int dMsgFlow_c::event029(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D544-8024D5BC 247E84 0078+00 1/0 0/0 0/0 .text
- * event030__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event030(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2586,8 +2377,6 @@ int dMsgFlow_c::event030(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D5BC-8024D5EC 247EFC 0030+00 1/0 0/0 0/0 .text
- * event031__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event031(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     dMeter2Info_resetMiniGameItem(false);
 
@@ -2598,8 +2387,6 @@ int dMsgFlow_c::event031(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D5EC-8024D6BC 247F2C 00D0+00 1/0 0/0 0/0 .text
- * event032__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event032(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2629,8 +2416,6 @@ int dMsgFlow_c::event032(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D6BC-8024D788 247FFC 00CC+00 1/0 0/0 0/0 .text
- * event033__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event033(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2660,8 +2445,6 @@ int dMsgFlow_c::event033(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D788-8024D7C8 2480C8 0040+00 1/0 0/0 0/0 .text
- * event034__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event034(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dComIfGs_setWarashibeItem(prm0);
@@ -2673,8 +2456,6 @@ int dMsgFlow_c::event034(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D7C8-8024D870 248108 00A8+00 1/0 0/0 0/0 .text
- * event035__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event035(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
 
@@ -2693,8 +2474,6 @@ int dMsgFlow_c::event035(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D870-8024D8C4 2481B0 0054+00 1/0 0/0 0/0 .text
- * event036__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event036(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2709,8 +2488,6 @@ int dMsgFlow_c::event036(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D8C4-8024D918 248204 0054+00 1/0 0/0 0/0 .text
- * event037__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event037(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     u16 prm1;
     u16 prm0;
@@ -2725,8 +2502,6 @@ int dMsgFlow_c::event037(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D918-8024D93C 248258 0024+00 1/0 0/0 0/0 .text
- * event038__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event038(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     dMeter2Info_recieveLetter();
 
@@ -2737,8 +2512,6 @@ int dMsgFlow_c::event038(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D93C-8024D970 24827C 0034+00 1/0 0/0 0/0 .text
- * event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event039(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dMeter2Info_setTableMapRegionNo(prm0);
@@ -2750,8 +2523,6 @@ int dMsgFlow_c::event039(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024D970-8024DA78 2482B0 0108+00 2/0 0/0 0/0 .text
- * event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event040(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
 
@@ -2788,8 +2559,6 @@ int dMsgFlow_c::event040(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024DA78-8024DAA8 2483B8 0030+00 1/0 0/0 0/0 .text
- * event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event041(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     int prm0 = getParam(i_flowNode_p->params);
     dMsgObject_addOffering(prm0);
@@ -2801,8 +2570,6 @@ int dMsgFlow_c::event041(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speak
     return 1;
 }
 
-/* 8024DAA8-8024DAB0 2483E8 0008+00 1/0 0/0 0/0 .text
- * event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c  */
 int dMsgFlow_c::event042(mesg_flow_node_event* i_flowNode_p, fopAc_ac_c* i_speaker_p) {
     return 1;
 }
diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp
index 5bf59fdd7c..55e416ad75 100644
--- a/src/d/d_msg_object.cpp
+++ b/src/d/d_msg_object.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_msg_object
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #define DISABLE_MSG_OBJECT_EXTERN
@@ -33,20 +28,16 @@
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_lib.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "dol2asm.h"
 
 static void dMsgObject_addFundRaising(s16 param_0);
 static void dMsgObject_addTotalPayment(s16 param_0);
 
-/* 804510C8-804510D0 0005C8 0002+06 5/4 0/0 0/0 .sbss            s_groupID */
 static s16 s_groupID;
 
-/* 80232A3C-80232A44 -00001 0008+00 0/0 0/0 0/0 .text            dMsgObject_getGroupID__Fv */
 s16 dMsgObject_getGroupID() {
     return s_groupID;
 }
 
-/* 80232A44-80232AEC 22D384 00A8+00 1/1 0/0 0/0 .text            dMsgObject_searchSSItem__FPvPv */
 static int dMsgObject_searchSSItem(void* param_1, void* param_2) {
     daPy_py_c* player = daPy_getPlayerActorClass();
     if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_SSITEM) {
@@ -58,7 +49,6 @@ static int dMsgObject_searchSSItem(void* param_1, void* param_2) {
     return 0;
 }
 
-/* 80232AEC-80232D6C 22D42C 0280+00 1/1 0/0 0/0 .text            __ct__20dMsgObject_HowlHIO_cFv */
 dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() {
     mHighlightScale = 0.5f;
     mHighlightMoyaR0.set(255, 255, 255, 255);
@@ -106,7 +96,6 @@ dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() {
     mLineSpaceOffset = 2.2f;
 }
 
-/* 80232D6C-80233284 22D6AC 0518+00 1/1 0/0 0/0 .text            __ct__16dMsgObject_HIO_cFv */
 dMsgObject_HIO_c::dMsgObject_HIO_c() {
     mBoxMidna_fontSizeX = 23.0f;
     mBoxMidna_fontSizeY = 22.0f;
@@ -315,8 +304,6 @@ dMsgObject_HIO_c::dMsgObject_HIO_c() {
     mPikariAnmSpeed = 0.3f;
 }
 
-/* 80233284-80233590 22DBC4 030C+00 1/1 0/0 0/0 .text            _create__12dMsgObject_cFP9msg_class
- */
 int dMsgObject_c::_create(msg_class* param_1) {
     field_0x124 = NULL;
     field_0x100 = param_1;
@@ -429,10 +416,8 @@ static void dummyStrings() {
     DEAD_STRING("");
 }
 
-/* 8043028C-8043069C 05CFAC 0410+00 7/7 51/51 0/0 .bss             g_MsgObject_HIO_c */
 dMsgObject_HIO_c g_MsgObject_HIO_c;
 
-/* 80233590-802339BC 22DED0 042C+00 2/1 0/0 0/0 .text            _execute__12dMsgObject_cFv */
 int dMsgObject_c::_execute() {
     field_0x4c7 = 0;
     if (mpTalkHeap != NULL) {
@@ -537,7 +522,6 @@ int dMsgObject_c::_execute() {
     return 1;
 }
 
-/* 802339BC-80233AE8 22E2FC 012C+00 1/1 0/0 0/0 .text            _draw__12dMsgObject_cFv */
 int dMsgObject_c::_draw() {
     u16 sVar7 = getStatusLocal();
     if (sVar7 != 0 && sVar7 != 1 && sVar7 != 0xb) {
@@ -565,7 +549,6 @@ int dMsgObject_c::_draw() {
     return 1;
 }
 
-/* 80233AE8-80233D04 22E428 021C+00 1/1 0/0 0/0 .text            _delete__12dMsgObject_cFv */
 int dMsgObject_c::_delete() {
     mpResCont->destroyResource_all();
     if (mpScrnDraw != NULL) {
@@ -602,7 +585,6 @@ int dMsgObject_c::_delete() {
     return 1;
 }
 
-/* 80233D04-80233E70 22E644 016C+00 2/2 2/2 0/0 .text setMessageIndex__12dMsgObject_cFUlUlb */
 void dMsgObject_c::setMessageIndex(u32 revoIndex, u32 param_2, bool param_3) {
     field_0x158 = revoIndex;
     revoIndex = getRevoMessageIndex(revoIndex);
@@ -643,7 +625,6 @@ void dMsgObject_c::setMessageIndex(u32 revoIndex, u32 param_2, bool param_3) {
     }
 }
 
-/* 80233E70-80233F84 22E7B0 0114+00 1/1 1/1 0/0 .text setMessageIndexDemo__12dMsgObject_cFUlb */
 void dMsgObject_c::setMessageIndexDemo(u32 revoMsgIndex, bool param_2) {
     field_0x158 = revoMsgIndex;
     revoMsgIndex = getRevoMessageIndex(revoMsgIndex);
@@ -673,8 +654,6 @@ void dMsgObject_c::setMessageIndexDemo(u32 revoMsgIndex, bool param_2) {
     }
 }
 
-/* 80233F84-80233FD8 22E8C4 0054+00 4/4 0/0 0/0 .text            getMessageIndex__12dMsgObject_cFUl
- */
 u32 dMsgObject_c::getMessageIndex(u32 param_0) {
     u32 i = 0;
     JMSMesgInfo_c* pMsg = (JMSMesgInfo_c*)((char*)mpMsgDt + 0x20);
@@ -693,7 +672,6 @@ u32 dMsgObject_c::getMessageIndex(u32 param_0) {
     return 612;
 }
 
-/* 80233FD8-802340D4 22E918 00FC+00 2/2 0/0 0/0 .text getRevoMessageIndex__12dMsgObject_cFUl */
 u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
     if (!g_MsgObject_HIO_c.mMessageDisplay) {
         return param_1;
@@ -726,7 +704,6 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
     return rv;
 }
 
-/* 802340D4-80234128 22EA14 0054+00 3/3 0/0 0/0 .text getMessageIndexAlways__12dMsgObject_cFUl */
 u32 dMsgObject_c::getMessageIndexAlways(u32 param_0) {
     u32 i = 0;
     JMSMesgInfo_c* pMsg = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
@@ -745,13 +722,10 @@ u32 dMsgObject_c::getMessageIndexAlways(u32 param_0) {
     return 612;
 }
 
-/* 80234128-8023413C 22EA68 0014+00 1/1 0/0 0/0 .text getMessageIDAlways__12dMsgObject_cFUl */
 u32 dMsgObject_c::getMessageIDAlways(u32 param_0) {
     return ((JMSMesgInfo_c*)((u8*)mpMsgRes + 0x20))->entries[param_0].message_id;
 }
 
-/* 8023413C-80234150 22EA7C 0014+00 4/4 0/0 0/0 .text            getMessageGroup__12dMsgObject_cFUl
- */
 s16 dMsgObject_c::getMessageGroup(u32 param_0) {
     s16 messageGroup = 0;
     OS_REPORT("getMessgeGroup! msg no====>%d\n", param_0);
@@ -761,7 +735,6 @@ s16 dMsgObject_c::getMessageGroup(u32 param_0) {
     return messageGroup;
 }
 
-/* 80234150-80234318 22EA90 01C8+00 1/1 0/0 0/0 .text            waitProc__12dMsgObject_cFv */
 void dMsgObject_c::waitProc() {
     if (mNoDemoFlag || field_0x4cc) {
         if (isMidonaNormalTalkWait()) {
@@ -799,7 +772,6 @@ void dMsgObject_c::waitProc() {
     }
 }
 
-/* 80234318-802349D8 22EC58 06C0+00 1/1 0/0 0/0 .text            openProc__12dMsgObject_cFv */
 void dMsgObject_c::openProc() {
     if (isMidonaMessage()) {
         bool uVar12 = 0;
@@ -902,7 +874,6 @@ void dMsgObject_c::openProc() {
     }
 }
 
-/* 802349D8-80234CCC 22F318 02F4+00 1/1 0/0 0/0 .text            outnowProc__12dMsgObject_cFv */
 void dMsgObject_c::outnowProc() {
     mpRefer->shiftCharCountBuffer();
     if (isBookMessage() && field_0x16a > 0) {
@@ -969,7 +940,6 @@ void dMsgObject_c::outnowProc() {
     }
 }
 
-/* 80234CCC-80234FF0 22F60C 0324+00 1/1 0/0 0/0 .text            outwaitProc__12dMsgObject_cFv */
 void dMsgObject_c::outwaitProc() {
     jmessage_tReference* pRef =
         (jmessage_tReference*)mpRenProc->getReference();
@@ -1009,11 +979,9 @@ void dMsgObject_c::outwaitProc() {
     }
 }
 
-/* 80234FF0-80234FF4 22F930 0004+00 1/1 0/0 0/0 .text            stopProc__12dMsgObject_cFv */
 void dMsgObject_c::stopProc() {
 }
 
-/* 80234FF4-8023531C 22F934 0328+00 1/1 0/0 0/0 .text            continueProc__12dMsgObject_cFv */
 void dMsgObject_c::continueProc() {
     jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference();
     if (pRef->getSendFlag() != 1 && pRef->getSendFlag() != 3 && pRef->getSendFlag() != 4 &&
@@ -1055,7 +1023,6 @@ void dMsgObject_c::continueProc() {
     }
 }
 
-/* 8023531C-8023587C 22FC5C 0560+00 1/1 0/0 0/0 .text            selectProc__12dMsgObject_cFv */
 void dMsgObject_c::selectProc() {
     bool uVar7 = false;
     bool iVar8 = false;
@@ -1155,7 +1122,6 @@ void dMsgObject_c::selectProc() {
     }
 }
 
-/* 8023587C-802358D4 2301BC 0058+00 1/1 0/0 0/0 .text            selectEndProc__12dMsgObject_cFv */
 void dMsgObject_c::selectEndProc() {
     if (mpScrnDraw->selectAnimeEnd()) {
         field_0x199 = 1;
@@ -1163,7 +1129,6 @@ void dMsgObject_c::selectEndProc() {
     }
 }
 
-/* 802358D4-80235AD4 230214 0200+00 1/1 0/0 0/0 .text            inputProc__12dMsgObject_cFv */
 void dMsgObject_c::inputProc() {
     dMeter2Info_onShopTalkFlag();
     mpRefer->inputNumber();
@@ -1216,7 +1181,6 @@ void dMsgObject_c::inputProc() {
     }
 }
 
-/* 80235AD4-80235CC0 230414 01EC+00 1/1 0/0 0/0 .text            finishProc__12dMsgObject_cFv */
 void dMsgObject_c::finishProc() {
     if (field_0x168 != 0x10 && mNoDemoFlag && isTalkMessage() && mpRefer->getForm() != 1) {
         mDoAud_seStart(daAlink_c::WANM_FALL_LAND, 0, 0, 0);
@@ -1247,7 +1211,6 @@ void dMsgObject_c::finishProc() {
     }
 }
 
-/* 80235CC0-80235EBC 230600 01FC+00 1/1 0/0 0/0 .text            endProc__12dMsgObject_cFv */
 void dMsgObject_c::endProc() {
     field_0x16a++;
     s16 sVar4 = 5;
@@ -1281,7 +1244,6 @@ void dMsgObject_c::endProc() {
     }
 }
 
-/* 80235EBC-8023609C 2307FC 01E0+00 2/2 0/0 0/0 .text            deleteProc__12dMsgObject_cFv */
 void dMsgObject_c::deleteProc() {
     if (field_0x148 != NULL) {
         mDoExt_setCurrentHeap(field_0x148);
@@ -1338,11 +1300,9 @@ void dMsgObject_c::deleteProc() {
     setStatusLocal(1);
 }
 
-/* 8023609C-802360A0 2309DC 0004+00 1/1 0/0 0/0 .text            textmodeProc__12dMsgObject_cFv */
 void dMsgObject_c::textmodeProc() {
 }
 
-/* 802360A0-8023670C 2309E0 066C+00 1/0 1/1 0/0 .text            talkStartInit__12dMsgObject_cFv */
 void dMsgObject_c::talkStartInit() {
     f32 dVar19 = 0.0f;
     JUTFont* local_30 = mDoExt_getMesgFont();
@@ -1491,7 +1451,6 @@ void dMsgObject_c::talkStartInit() {
     }
 }
 
-/* 8023670C-802368E4 23104C 01D8+00 1/1 0/0 0/0 .text            fukiPosCalc__12dMsgObject_cFb */
 void dMsgObject_c::fukiPosCalc(bool param_1) {
     if (param_1) {
         mpRenProc->setTextInitOffsetPos(mpScrnDraw->getTextBoxPosOffsetY());
@@ -1541,18 +1500,14 @@ void dMsgObject_c::fukiPosCalc(bool param_1) {
     }
 }
 
-/* 802368E4-802368F8 231224 0014+00 15/15 0/0 0/0 .text            setStatusLocal__12dMsgObject_cFUs
- */
 void dMsgObject_c::setStatusLocal(u16 status) {
     ((jmessage_tReference*)mpRenProc->getReference())->setStatus(status);
 }
 
-/* 802368F8-8023690C 231238 0014+00 9/9 0/0 0/0 .text            getStatusLocal__12dMsgObject_cFv */
 u16 dMsgObject_c::getStatusLocal() {
     return ((jmessage_tReference*)mpRenProc->getReference())->getStatus();
 }
 
-/* 8023690C-802369D8 23124C 00CC+00 3/3 0/0 0/0 .text            delete_screen__12dMsgObject_cFb */
 void dMsgObject_c::delete_screen(bool param_1) {
     if (mpOutFont != NULL) {
         delete mpOutFont;
@@ -1571,7 +1526,6 @@ void dMsgObject_c::delete_screen(bool param_1) {
     }
 }
 
-/* 802369D8-80236BF8 231318 0220+00 5/5 0/0 0/0 .text            isSend__12dMsgObject_cFv */
 u8 dMsgObject_c::isSend() {
     dComIfGp_setDoStatusForce(0, 0);
     u8 mesgCancelButton = dComIfGp_checkMesgCancelButton();
@@ -1648,8 +1602,6 @@ u8 dMsgObject_c::isSend() {
     }
 }
 
-/* 80236BF8-80236C90 231538 0098+00 1/1 0/0 0/0 .text
- * readMessageGroupLocal__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c */
 void dMsgObject_c::readMessageGroupLocal(mDoDvdThd_mountXArchive_c** p_arcMount) {
     static char arcName[22];
 
@@ -1686,26 +1638,20 @@ void dMsgObject_c::readMessageGroupLocal(mDoDvdThd_mountXArchive_c** p_arcMount)
     s_groupID = msgGroup;
 }
 
-/* 80236C90-80236CD4 2315D0 0044+00 1/1 0/0 0/0 .text changeFlowGroupLocal__12dMsgObject_cFl */
 void dMsgObject_c::changeFlowGroupLocal(s32 param_0) {
     mFlowChk = 1;
     changeGroup(param_0 >= 3000 ? (s16)0 : s_groupID);
 }
 
-/* 80236CD4-80236D00 231614 002C+00 1/1 0/0 0/0 .text demoMessageGroupLocal__12dMsgObject_cFv */
 void dMsgObject_c::demoMessageGroupLocal() {
     mFlowChk = 0;
     changeGroup(0);
 }
 
-/* 80236D00-80236D0C 231640 000C+00 1/1 0/0 0/0 .text            endFlowGroupLocal__12dMsgObject_cFv
- */
 void dMsgObject_c::endFlowGroupLocal() {
     mFlowChk = 0;
 }
 
-/* 80236D0C-80236DE4 23164C 00D8+00 1/1 0/0 0/0 .text            changeGroupLocal__12dMsgObject_cFs
- */
 void dMsgObject_c::changeGroupLocal(s16 param_1) {
     JKRHeap* prevHeap = mDoExt_setCurrentHeap(dComIfGp_getMsgExpHeap());
     if (field_0x16c != param_1) {
@@ -1731,8 +1677,6 @@ void dMsgObject_c::changeGroupLocal(s16 param_1) {
     mDoExt_setCurrentHeap(prevHeap);
 }
 
-/* 80236DE4-802370A8 231724 02C4+00 1/1 0/0 0/0 .text
- * getStringLocal__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs */
 bool dMsgObject_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox* param_3,
                                   JUTFont* param_4, COutFont_c* param_5, char* param_6,
                                   char* param_7, char* param_8, s16* param_9) {
@@ -1801,14 +1745,10 @@ bool dMsgObject_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox*
     return false;
 }
 
-/* 802370A8-802370BC 2319E8 0014+00 0/0 1/1 0/0 .text            isGetItemMessage__12dMsgObject_cFv
- */
 u8 dMsgObject_c::isGetItemMessage() {
     return mFukiKind == 9;
 }
 
-/* 802370BC-802370E8 2319FC 002C+00 4/4 2/2 0/0 .text            isKanbanMessage__12dMsgObject_cFv
- */
 bool dMsgObject_c::isKanbanMessage() {
     if (mFukiKind == 2 || mFukiKind == 6 || mFukiKind == 15) {
         return true;
@@ -1816,7 +1756,6 @@ bool dMsgObject_c::isKanbanMessage() {
     return false;
 }
 
-/* 802370E8-802370FC 231A28 0014+00 6/6 3/3 0/0 .text            isHowlMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isHowlMessage() {
     if (mFukiKind == 17) {
         return true;
@@ -1824,8 +1763,6 @@ bool dMsgObject_c::isHowlMessage() {
     return false;
 }
 
-/* 802370FC-80237138 231A3C 003C+00 3/3 2/2 0/0 .text            isMidonaMessage__12dMsgObject_cFv
- */
 bool dMsgObject_c::isMidonaMessage() {
     if (mFukiKind == 13 && (mpRefer->getMsgID() == 0x7d3 || mpRefer->getMsgID() == 0x7f6 ||
                             mpRefer->getMsgID() == 0x7fa))
@@ -1835,7 +1772,6 @@ bool dMsgObject_c::isMidonaMessage() {
     return 0;
 }
 
-/* 80237138-802371B0 231A78 0078+00 1/1 0/0 0/0 .text isMidonaNormalTalkWait__12dMsgObject_cFv */
 bool dMsgObject_c::isMidonaNormalTalkWait() {
     if (mFukiKind == 13 && !isMidonaMessage()) {
         daMidna_c* midna = daPy_py_c::getMidnaActor();
@@ -1849,8 +1785,6 @@ bool dMsgObject_c::isMidonaNormalTalkWait() {
     return true;
 }
 
-/* 802371B0-802371E4 231AF0 0034+00 0/0 1/1 0/0 .text            isMidonaTalkWait__12dMsgObject_cFv
- */
 bool dMsgObject_c::isMidonaTalkWait() {
     daMidna_c* midna = daPy_py_c::getMidnaActor();
     if (midna != NULL) {
@@ -1859,32 +1793,26 @@ bool dMsgObject_c::isMidonaTalkWait() {
     return false;
 }
 
-/* 802371E4-802371F8 231B24 0014+00 4/4 3/3 2/2 .text            isPlaceMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isPlaceMessage() {
     return mFukiKind == 12 ? 1 : 0;
 }
 
-/* 802371F8-8023720C 231B38 0014+00 3/3 2/2 0/0 .text            isBossMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isBossMessage() {
     return mFukiKind == 19 ? 1 : 0;
 }
 
-/* 8023720C-80237214 231B4C 0008+00 6/6 2/2 0/0 .text            isBookMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isBookMessage() {
     return false;
 }
 
-/* 80237214-80237228 231B54 0014+00 3/3 2/2 0/0 .text            isStaffMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isStaffMessage() {
     return mFukiKind == 7 ? 1 : 0;
 }
 
-/* 80237228-8023723C 231B68 0014+00 0/0 1/1 0/0 .text            isSaveMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isSaveMessage() {
     return mFukiKind == 16 ? 1 : 0;
 }
 
-/* 8023723C-802372CC 231B7C 0090+00 4/4 0/0 0/0 .text            isTalkMessage__12dMsgObject_cFv */
 bool dMsgObject_c::isTalkMessage() {
     if (isKanbanMessage() || isPlaceMessage() || isBossMessage() || isBookMessage() ||
         isHowlMessage() || isStaffMessage()) {
@@ -1893,7 +1821,6 @@ bool dMsgObject_c::isTalkMessage() {
     return true;
 }
 
-/* 802372CC-80237334 231C0C 0068+00 0/0 5/5 0/0 .text            getSmellName__12dMsgObject_cFv */
 const char* dMsgObject_c::getSmellName() {
     JMSMesgInfo_c* info_header_p = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
     char* data_ptr = (char*)info_header_p + info_header_p->header.size;
@@ -1903,7 +1830,6 @@ const char* dMsgObject_c::getSmellName() {
     return data_ptr + msg_entry->string_offset + 8;
 }
 
-/* 80237334-8023738C 231C74 0058+00 0/0 5/5 0/0 .text            getPortalName__12dMsgObject_cFv */
 const char* dMsgObject_c::getPortalName() {
     JMSMesgInfo_c* info_header_p = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
     char* data_ptr = (char*)info_header_p + info_header_p->header.size;
@@ -1913,7 +1839,6 @@ const char* dMsgObject_c::getPortalName() {
     return data_ptr + msg_entry->string_offset + 8;
 }
 
-/* 8023738C-8023741C 231CCC 0090+00 0/0 5/5 0/0 .text            getBombName__12dMsgObject_cFv */
 const char* dMsgObject_c::getBombName() {
     u8 i_selectPos = getSelectCursorPos();
     JUT_ASSERT(4075, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX);
@@ -1932,7 +1857,6 @@ const char* dMsgObject_c::getBombName() {
     return data_ptr + msg_entry->string_offset + 8;
 }
 
-/* 8023741C-80237478 231D5C 005C+00 0/0 5/5 0/0 .text            getInsectName__12dMsgObject_cFv */
 const char* dMsgObject_c::getInsectName() {
     JMSMesgInfo_c* info_header_p = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
     char* data_ptr = (char*)info_header_p + info_header_p->header.size;
@@ -1942,7 +1866,6 @@ const char* dMsgObject_c::getInsectName() {
     return data_ptr + msg_entry->string_offset + 8;
 }
 
-/* 80237478-802374D0 231DB8 0058+00 0/0 5/5 0/0 .text            getLetterName__12dMsgObject_cFv */
 const char* dMsgObject_c::getLetterName() {
     JMSMesgInfo_c* info_header_p = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
     char* data_ptr = (char*)info_header_p + info_header_p->header.size;
@@ -1952,8 +1875,6 @@ const char* dMsgObject_c::getLetterName() {
     return data_ptr + msg_entry->string_offset + 8;
 }
 
-/* 802374D0-80237520 231E10 0050+00 1/1 5/5 0/0 .text            getSelectBombNum__12dMsgObject_cFv
- */
 u8 dMsgObject_c::getSelectBombNum() {
     u8 i_selectPos = getSelectCursorPos();
     JUT_ASSERT(4133, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX)
@@ -1963,45 +1884,35 @@ u8 dMsgObject_c::getSelectBombNum() {
     return getBombNumLocal(i_selectPos);
 }
 
-/* 80237520-80237530 231E60 0010+00 1/1 0/0 0/0 .text onMsgSendControlLocal__12dMsgObject_cFv */
 void dMsgObject_c::onMsgSendControlLocal() {
     mMsgSendControl |= 1;
 }
 
-/* 80237530-80237550 231E70 0020+00 1/1 0/0 0/0 .text offMsgSendControlLocal__12dMsgObject_cFv */
 void dMsgObject_c::offMsgSendControlLocal() {
     mMsgSendControl &= ~1;
     ((jmessage_tReference*)mpRenProc->getReference())->setSendFlag(0);
 }
 
-/* 80237550-8023755C 231E90 000C+00 1/1 0/0 0/0 .text isMsgSendControlLocal__12dMsgObject_cFv */
 int dMsgObject_c::isMsgSendControlLocal() {
     return (mMsgSendControl & 1) != 0;
 }
 
-/* 8023755C-8023756C 231E9C 0010+00 1/1 0/0 0/0 .text            onMsgSendLocal__12dMsgObject_cFv */
 void dMsgObject_c::onMsgSendLocal() {
     mMsgSendControl |= 2;
 }
 
-/* 8023756C-8023757C 231EAC 0010+00 1/1 0/0 0/0 .text            offMsgSendLocal__12dMsgObject_cFv
- */
 void dMsgObject_c::offMsgSendLocal() {
     mMsgSendControl &= ~2;
 }
 
-/* 8023757C-80237588 231EBC 000C+00 1/1 0/0 0/0 .text            isMsgSendLocal__12dMsgObject_cFv */
 int dMsgObject_c::isMsgSendLocal() {
     return (mMsgSendControl & 2) != 0;
 }
 
-/* 80237588-8023759C 231EC8 0014+00 1/1 0/0 0/0 .text            isMouthCheckLocal__12dMsgObject_cFv
- */
 bool dMsgObject_c::isMouthCheckLocal() {
     return mpSeqProc->getMouthCheck() != 0;
 }
 
-/* 8023759C-802375E4 231EDC 0048+00 1/1 0/0 0/0 .text getBombBuyPriceLocal__12dMsgObject_cFUc */
 int dMsgObject_c::getBombBuyPriceLocal(u8 param_0) {
     switch(param_0) {
     case 0x70:
@@ -2015,8 +1926,6 @@ int dMsgObject_c::getBombBuyPriceLocal(u8 param_0) {
     }
 }
 
-/* 802375E4-80237610 231F24 002C+00 0/0 1/1 0/0 .text            addSelectBomBag__12dMsgObject_cFUc
- */
 void dMsgObject_c::addSelectBomBag(u8 param_1) {
     if (param_1 == 0xff) {
         param_1 = field_0x193;
@@ -2026,8 +1935,6 @@ void dMsgObject_c::addSelectBomBag(u8 param_1) {
     OS_REPORT("addSelectBombBag ==> %d, %d\n", field_0x193, param_1);
 }
 
-/* 80237610-8023763C 231F50 002C+00 1/1 1/1 0/0 .text            resetSelectBomBag__12dMsgObject_cFv
- */
 void dMsgObject_c::resetSelectBomBag() {
     for (int i = 0; i < 3; i++) {
         mSelectBombBag[i] = 0;
@@ -2035,7 +1942,6 @@ void dMsgObject_c::resetSelectBomBag() {
     field_0x193 = 0;
 }
 
-/* 8023763C-8023768C 231F7C 0050+00 1/1 0/0 0/0 .text getSelectBombBagIDLocal__12dMsgObject_cFv */
 u8 dMsgObject_c::getSelectBombBagIDLocal() {
     u8 i_selectPos = getSelectCursorPos();
     JUT_ASSERT(4253, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX);
@@ -2045,7 +1951,6 @@ u8 dMsgObject_c::getSelectBombBagIDLocal() {
     return getBombBagIDLocal(i_selectPos);
 }
 
-/* 8023768C-8023773C 231FCC 00B0+00 1/1 0/0 0/0 .text getSelectBombPriceLocal__12dMsgObject_cFv */
 s16 dMsgObject_c::getSelectBombPriceLocal() {
     u8 i_selectPos = getSelectCursorPos();
     JUT_ASSERT(4276, i_selectPos >= 0 && i_selectPos < dSv_player_item_c::BOMB_BAG_MAX);
@@ -2055,13 +1960,10 @@ s16 dMsgObject_c::getSelectBombPriceLocal() {
     return (num * uVar1) / 10.0f;
 }
 
-/* 8023773C-80237748 23207C 000C+00 1/1 0/0 0/0 .text setEquipBombInfoLocal__12dMsgObject_cFv */
 void dMsgObject_c::setEquipBombInfoLocal() {
     mEquipBombInfo = 1;
 }
 
-/* 80237748-802378B8 232088 0170+00 3/3 0/0 0/0 .text updateEquipBombInfoLocal__12dMsgObject_cFv
- */
 void dMsgObject_c::updateEquipBombInfoLocal() {
     if (mEquipBombInfo == 0) {
         return;
@@ -2098,18 +2000,14 @@ void dMsgObject_c::updateEquipBombInfoLocal() {
     mEquipBombInfo = 0;
 }
 
-/* 802378B8-802378CC 2321F8 0014+00 0/0 1/1 0/0 .text            setShopWaitTimer__12dMsgObject_cFUc
- */
 void dMsgObject_c::setShopWaitTimer(u8 timer) {
     dMsgObject_getMsgObjectClass()->setShopWaitTimerLocal(timer);
 }
 
-/* 802378CC-802378D4 -00001 0008+00 0/0 0/0 0/0 .text setSelectWordFlagLocal__12dMsgObject_cFUc */
 void dMsgObject_c::setSelectWordFlagLocal(u8 param_0) {
     mSelectWordFlag = param_0;
 }
 
-/* 802378D4-80237934 232214 0060+00 1/1 0/0 0/0 .text isHowlHearingModeLocal__12dMsgObject_cFv */
 bool dMsgObject_c::isHowlHearingModeLocal() {
     bool rv = false;
     if (isHowlMessage() && mpScrnDraw != NULL && ((dMsgScrnHowl_c*)mpScrnDraw)->isHearingMode()) {
@@ -2118,39 +2016,30 @@ bool dMsgObject_c::isHowlHearingModeLocal() {
     return rv;
 }
 
-/* 80237934-80237950 232274 001C+00 1/1 0/0 0/0 .text isCameraCancelFlag__12dMsgObject_cFv */
 bool dMsgObject_c::isCameraCancelFlag() {
     return dMsgObject_getMsgObjectClass()->isCameraCancelFlagLocal() ? true : false;
 }
 
-/* 80237950-80237968 232290 0018+00 2/2 0/0 0/0 .text onCameraCancelFlag__12dMsgObject_cFv */
 void dMsgObject_c::onCameraCancelFlag() {
     dMsgObject_getMsgObjectClass()->onCameraCancelFlagLocal();
 }
 
-/* 80237968-80237980 2322A8 0018+00 1/1 0/0 0/0 .text offCameraCancelFlag__12dMsgObject_cFv */
 void dMsgObject_c::offCameraCancelFlag() {
     dMsgObject_getMsgObjectClass()->offCameraCancelFlagLocal();
 }
 
-/* 80237980-80237994 2322C0 0014+00 0/0 1/1 0/0 .text            isKillMessageFlag__12dMsgObject_cFv
- */
 bool dMsgObject_c::isKillMessageFlag() {
     return dMsgObject_getMsgObjectClass()->isKillMessageFlagLocal();
 }
 
-/* 80237994-802379AC 2322D4 0018+00 0/0 2/2 3/3 .text            onKillMessageFlag__12dMsgObject_cFv
- */
 void dMsgObject_c::onKillMessageFlag() {
     dMsgObject_getMsgObjectClass()->onKillMessageFlagLocal();
 }
 
-/* 802379AC-802379D8 2322EC 002C+00 0/0 2/2 0/0 .text setKillMessageFlag__12dMsgObject_cFv */
 void dMsgObject_c::setKillMessageFlag() {
     dMsgObject_getMsgObjectClass()->setKillMessageFlagLocal();
 }
 
-/* 802379D8-80237A74 232318 009C+00 1/1 0/0 0/0 .text setKillMessageFlagLocal__12dMsgObject_cFv */
 void dMsgObject_c::setKillMessageFlagLocal() {
     if (!dComIfGp_event_runCheck()) {
         if (getStatusLocal() != 1) {
@@ -2168,37 +2057,26 @@ void dMsgObject_c::setKillMessageFlagLocal() {
     }
 }
 
-/* 80237A74-80237A88 2323B4 0014+00 0/0 3/3 0/0 .text setTalkPartner__12dMsgObject_cFP10fopAc_ac_c
- */
 void dMsgObject_c::setTalkPartner(fopAc_ac_c* param_0) {
     dMsgObject_getMsgObjectClass()->setTalkPartnerLocal(param_0);
 }
 
-/* 80237A88-80237A9C 2323C8 0014+00 1/1 2/2 0/0 .text            setNowTalkFlowNo__12dMsgObject_cFs
- */
 void dMsgObject_c::setNowTalkFlowNo(s16 param_0) {
     dMsgObject_getMsgObjectClass()->setNowTalkFlowNoLocal(param_0);
 }
 
-/* 80237A9C-80237AB0 2323DC 0014+00 0/0 0/0 1/1 .text            getNowTalkFlowNo__12dMsgObject_cFv
- */
 s16 dMsgObject_c::getNowTalkFlowNo() {
     return dMsgObject_getMsgObjectClass()->getNowTalkFlowNoLocal();
 }
 
-/* 80237AB0-80237AE0 2323F0 0030+00 0/0 1/1 0/0 .text            setDemoMessage__12dMsgObject_cFUl
- */
 void dMsgObject_c::setDemoMessage(u32 param_0) {
     dMsgObject_getMsgObjectClass()->setDemoMessageLocal(param_0);
 }
 
-/* 80237AE0-80237B10 232420 0030+00 0/0 8/8 0/0 .text            setTalkHeap__12dMsgObject_cFPv */
 void dMsgObject_c::setTalkHeap(void* param_0) {
     dMsgObject_getMsgObjectClass()->setTalkHeapLocal(param_0);
 }
 
-/* 80237B10-80237B54 232450 0044+00 1/1 0/0 0/0 .text            setTalkHeapLocal__12dMsgObject_cFPv
- */
 void dMsgObject_c::setTalkHeapLocal(void* param_1) {
     if (param_1 == NULL) {
         delete_screen(true);
@@ -2206,12 +2084,10 @@ void dMsgObject_c::setTalkHeapLocal(void* param_1) {
     mpTalkHeap = (JKRExpHeap*)param_1;
 }
 
-/* 80237B54-80237B68 232494 0014+00 0/0 2/2 0/0 .text            getTalkHeap__12dMsgObject_cFv */
 void* dMsgObject_c::getTalkHeap() {
     return dMsgObject_getMsgObjectClass()->getTalkHeapLocal();
 }
 
-/* 80237B68-80237BFC 2324A8 0094+00 2/2 0/0 0/0 .text            isDraw__12dMsgObject_cFv */
 bool dMsgObject_c::isDraw() {
     if ((getStatusLocal() != 0 && getStatusLocal() != 1 && field_0x4c7 == 0) &&
         (getStatusLocal() != 11 && (getStatusLocal() != 6 || field_0x166 != 15)))
@@ -2221,7 +2097,6 @@ bool dMsgObject_c::isDraw() {
     return false;
 }
 
-/* 80237BFC-80237D88 23253C 018C+00 2/2 0/0 0/0 .text setButtonStatusLocal__12dMsgObject_cFv */
 void dMsgObject_c::setButtonStatusLocal() {
     jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference();
     if (field_0x168 == getStatusLocal() && (pRef->getSendFlag() != 1 && pRef->getSendFlag() != 3) &&
@@ -2247,15 +2122,12 @@ void dMsgObject_c::setButtonStatusLocal() {
     }
 }
 
-/* 80237D88-80237DD8 2326C8 0050+00 1/1 0/0 0/0 .text setDemoMessageLocal__12dMsgObject_cFUl */
 void dMsgObject_c::setDemoMessageLocal(u32 param_1) {
     field_0x4cc = 1;
     dMsgObject_onCameraCancelFlag();
     fopMsgM_messageSet(dMsgObject_getMsgObjectClass()->getMessageIDAlways(param_1), 1000);
 }
 
-/* 80237DD8-80237E04 232718 002C+00 1/1 0/0 0/0 .text getSmellTypeMessageIDLocal__12dMsgObject_cFv
- */
 u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
     u16 msgId = 0;
     int smell = dComIfGs_getCollectSmell();
@@ -2270,7 +2142,6 @@ u16 dMsgObject_c::getSmellTypeMessageIDLocal() {
     return msgId;
 }
 
-/* 80237E04-80237E58 232744 0054+00 1/1 0/0 0/0 .text setSmellTypeLocal__12dMsgObject_cFUc */
 void dMsgObject_c::setSmellTypeLocal(u8 smellType) {
     mSmellType = smellType;
     dComIfGs_onItemFirstBit(smellType);
@@ -2278,13 +2149,10 @@ void dMsgObject_c::setSmellTypeLocal(u8 smellType) {
     dComIfGs_setSelectItemIndex(2, mSmellType);
 }
 
-/* 80237E58-80237E68 232798 0010+00 3/3 0/0 0/0 .text getSelectCursorPosLocal__12dMsgObject_cFv */
 u8 dMsgObject_c::getSelectCursorPosLocal() {
     return ((jmessage_tReference*)mpRenProc->getReference())->getSelectPos();
 }
 
-/* 80237E68-80237F10 2327A8 00A8+00 3/3 0/0 0/0 .text setSelectCursorPosLocal__12dMsgObject_cFUc
- */
 void dMsgObject_c::setSelectCursorPosLocal(u8 param_1) {
     jmessage_tReference* pRef = (jmessage_tReference*)mpRenProc->getReference();
     if (!dComIfGp_isPauseFlag() && param_1 != 0xff && pRef->getSelectPos() != param_1) {
@@ -2294,35 +2162,26 @@ void dMsgObject_c::setSelectCursorPosLocal(u8 param_1) {
     pRef->setSelectPos(param_1);
 }
 
-/* 80237F10-80237F18 -00001 0008+00 0/0 0/0 0/0 .text
- * setTalkActorLocal__12dMsgObject_cFP10fopAc_ac_c              */
 void dMsgObject_c::setTalkActorLocal(fopAc_ac_c* actor) {
     mpTalkActor = actor;
 }
 
-/* 80237F18-80237F38 232858 0020+00 1/0 0/0 0/0 .text            dMsgObject_Draw__FP12dMsgObject_c
- */
 static int dMsgObject_Draw(dMsgObject_c* i_this) {
     return i_this->_draw();
 }
 
-/* 80237F38-80237F58 232878 0020+00 1/0 0/0 0/0 .text dMsgObject_Execute__FP12dMsgObject_c */
 static int dMsgObject_Execute(dMsgObject_c* i_this) {
     return i_this->_execute();
 }
 
-/* 80237F58-80237F60 232898 0008+00 1/0 0/0 0/0 .text dMsgObject_IsDelete__FP12dMsgObject_c */
 static int dMsgObject_IsDelete(dMsgObject_c* i_this) {
     return 1;
 }
 
-/* 80237F60-80237F80 2328A0 0020+00 1/0 0/0 0/0 .text            dMsgObject_Delete__FP12dMsgObject_c
- */
 static int dMsgObject_Delete(dMsgObject_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80237F80-8023800C 2328C0 008C+00 1/0 0/0 0/0 .text            dMsgObject_Create__FP9msg_class */
 int dMsgObject_Create(msg_class* param_1) {
     dMsgObject_c* obj = static_cast<dMsgObject_c*>(param_1);
     dComIfGp_setMsgObjectClass(obj);
@@ -2337,36 +2196,26 @@ int dMsgObject_Create(msg_class* param_1) {
     return rv;
 }
 
-/* 8023800C-8023803C 23294C 0030+00 0/0 1/1 0/0 .text
- * readMessageGroup__12dMsgObject_cFPP25mDoDvdThd_mountXArchive_c */
 void dMsgObject_c::readMessageGroup(mDoDvdThd_mountXArchive_c** p_arcMount) {
     dMsgObject_getMsgObjectClass()->readMessageGroupLocal(p_arcMount);
 }
 
-/* 8023803C-8023806C 23297C 0030+00 0/0 3/3 0/0 .text            changeFlowGroup__12dMsgObject_cFl
- */
 void dMsgObject_c::changeFlowGroup(s32 param_0) {
     dMsgObject_getMsgObjectClass()->changeFlowGroupLocal(param_0);
 }
 
-/* 8023806C-80238098 2329AC 002C+00 0/0 1/1 0/0 .text            demoMessageGroup__12dMsgObject_cFv
- */
 void dMsgObject_c::demoMessageGroup() {
     dMsgObject_getMsgObjectClass()->demoMessageGroupLocal();
 }
 
-/* 80238098-802380C4 2329D8 002C+00 0/0 3/3 4/4 .text            endFlowGroup__12dMsgObject_cFv */
 void dMsgObject_c::endFlowGroup() {
     dMsgObject_getMsgObjectClass()->endFlowGroupLocal();
 }
 
-/* 802380C4-802380F4 232A04 0030+00 7/7 0/0 0/0 .text            changeGroup__12dMsgObject_cFs */
 void dMsgObject_c::changeGroup(s16 param_0) {
     dMsgObject_getMsgObjectClass()->changeGroupLocal(param_0);
 }
 
-/* 802380F4-80238174 232A34 0080+00 0/0 2/2 0/0 .text
- * getString__12dMsgObject_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cPcPcPcPs */
 bool dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
                              JUTFont* param_3, COutFont_c* param_4, char* param_5, char* param_6,
                              char* param_7, s16* param_8) {
@@ -2374,17 +2223,14 @@ bool dMsgObject_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param
         param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8);
 }
 
-/* 80238174-80238188 232AB4 0014+00 0/0 1/1 0/0 .text            getMsgDtPtr__12dMsgObject_cFv */
 void* dMsgObject_c::getMsgDtPtr() {
     return dMsgObject_getMsgObjectClass()->getMsgDtPtrLocal();
 }
 
-/* 80238188-8023819C 232AC8 0014+00 0/0 0/0 1/1 .text            setProcessID__12dMsgObject_cFUi */
 void dMsgObject_c::setProcessID(fpc_ProcID id) {
     dMsgObject_getMsgObjectClass()->setProcessIDLocal(id);
 }
 
-/* 8023819C-802381C0 232ADC 0024+00 0/0 5/5 5/5 .text            getActor__12dMsgObject_cFv */
 msg_class* dMsgObject_c::getActor() {
     if (dMsgObject_getMsgObjectClass() == NULL) {
         return NULL;
@@ -2392,206 +2238,157 @@ msg_class* dMsgObject_c::getActor() {
     return dMsgObject_getMsgObjectClass()->getActorLocal();
 }
 
-/* 802381C0-802381D4 232B00 0014+00 0/0 0/0 3/3 .text            getpTalkActor__12dMsgObject_cFv */
 fopAc_ac_c* dMsgObject_c::getpTalkActor() {
     return dMsgObject_getMsgObjectClass()->getpTalkActorLocal();
 }
 
-/* 802381D4-802381E8 232B14 0014+00 0/0 0/0 1/1 .text            getIdx__12dMsgObject_cFv */
 int dMsgObject_c::getIdx() {
     return dMsgObject_getMsgObjectClass()->getIdxLocal();
 }
 
-/* 802381E8-802381FC 232B28 0014+00 0/0 0/0 1/1 .text            getNodeIdx__12dMsgObject_cFv */
 u16 dMsgObject_c::getNodeIdx() {
     return dMsgObject_getMsgObjectClass()->getNodeIdxLocal();
 }
 
-/* 802381FC-8023822C 232B3C 0030+00 0/0 1/1 3/3 .text            setStatus__12dMsgObject_cFUs */
 void dMsgObject_c::setStatus(u16 status) {
     dMsgObject_getMsgObjectClass()->setStatusLocal(status);
 }
 
-/* 8023822C-80238258 232B6C 002C+00 0/0 40/40 22/22 .text            getStatus__12dMsgObject_cFv */
 u16 dMsgObject_c::getStatus() {
     return dMsgObject_getMsgObjectClass()->getStatusLocal();
 }
 
-/* 80238258-8023826C 232B98 0014+00 0/0 1/1 0/0 .text            getScrnDrawPtr__12dMsgObject_cFv */
 dMsgScrnBase_c* dMsgObject_c::getScrnDrawPtr() {
     return dMsgObject_getMsgObjectClass()->getScrnDrawPtrLocal();
 }
 
-/* 8023826C-8023829C 232BAC 0030+00 0/0 1/1 0/0 .text setTalkActor__12dMsgObject_cFP10fopAc_ac_c
- */
 void dMsgObject_c::setTalkActor(fopAc_ac_c* actor) {
     dMsgObject_getMsgObjectClass()->setTalkActorLocal(actor);
 }
 
-/* 8023829C-802382C8 232BDC 002C+00 1/1 0/0 0/0 .text            onMsgSendControl__12dMsgObject_cFv
- */
 void dMsgObject_c::onMsgSendControl() {
     dMsgObject_getMsgObjectClass()->onMsgSendControlLocal();
 }
 
-/* 802382C8-802382F4 232C08 002C+00 2/2 2/2 2/2 .text            offMsgSendControl__12dMsgObject_cFv
- */
 void dMsgObject_c::offMsgSendControl() {
     dMsgObject_getMsgObjectClass()->offMsgSendControlLocal();
 }
 
-/* 802382F4-80238320 232C34 002C+00 0/0 3/3 3/3 .text            isMsgSendControl__12dMsgObject_cFv
- */
 int dMsgObject_c::isMsgSendControl() {
     return dMsgObject_getMsgObjectClass()->isMsgSendControlLocal();
 }
 
-/* 80238320-8023834C 232C60 002C+00 1/1 2/2 1/1 .text            onMsgSend__12dMsgObject_cFv */
 void dMsgObject_c::onMsgSend() {
     dMsgObject_getMsgObjectClass()->onMsgSendLocal();
 }
 
-/* 8023834C-80238378 232C8C 002C+00 2/2 0/0 0/0 .text            offMsgSend__12dMsgObject_cFv */
 void dMsgObject_c::offMsgSend() {
     dMsgObject_getMsgObjectClass()->offMsgSendLocal();
 }
 
-/* 80238378-802383A4 232CB8 002C+00 1/1 0/0 0/0 .text            isMsgSend__12dMsgObject_cFv */
 int dMsgObject_c::isMsgSend() {
     return dMsgObject_getMsgObjectClass()->isMsgSendLocal();
 }
 
-/* 802383A4-802383D0 232CE4 002C+00 0/0 2/2 6/6 .text            isMouthCheck__12dMsgObject_cFv */
 bool dMsgObject_c::isMouthCheck() {
     return dMsgObject_getMsgObjectClass()->isMouthCheckLocal();
 }
 
-/* 802383D0-802383E4 232D10 0014+00 0/0 9/9 0/0 .text            getMessageID__12dMsgObject_cFv */
 u32 dMsgObject_c::getMessageID() {
     return dMsgObject_getMsgObjectClass()->getMessageIDLocal();
 }
 
-/* 802383E4-80238410 232D24 002C+00 1/1 1/1 0/0 .text getSmellTypeMessageID__12dMsgObject_cFv */
 u16 dMsgObject_c::getSmellTypeMessageID() {
     return dMsgObject_getMsgObjectClass()->getSmellTypeMessageIDLocal();
 }
 
-/* 80238410-80238440 232D50 0030+00 0/0 1/1 0/0 .text            setSmellType__12dMsgObject_cFUc */
 void dMsgObject_c::setSmellType(u8 smellType) {
     dMsgObject_getMsgObjectClass()->setSmellTypeLocal(smellType);
 }
 
-/* 80238440-8023846C 232D80 002C+00 4/4 0/0 7/7 .text getSelectCursorPos__12dMsgObject_cFv */
 u8 dMsgObject_c::getSelectCursorPos() {
     return dMsgObject_getMsgObjectClass()->getSelectCursorPosLocal();
 }
 
-/* 8023846C-8023849C 232DAC 0030+00 0/0 1/1 0/0 .text setSelectCursorPos__12dMsgObject_cFUc */
 void dMsgObject_c::setSelectCursorPos(u8 pos) {
     dMsgObject_getMsgObjectClass()->setSelectCursorPosLocal(pos);
 }
 
-/* 8023849C-802384B0 232DDC 0014+00 0/0 2/2 0/0 .text setPortalMessageID__12dMsgObject_cFUs */
 void dMsgObject_c::setPortalMessageID(u16 msgID) {
     dMsgObject_getMsgObjectClass()->setPortalMessageIDLocal(msgID);
 }
 
-/* 802384B0-802384C4 232DF0 0014+00 0/0 0/0 1/1 .text            setInsectItemNo__12dMsgObject_cFUc
- */
 void dMsgObject_c::setInsectItemNo(u8 itemNo) {
     dMsgObject_getMsgObjectClass()->setInsectItemNoLocal(itemNo);
 }
 
-/* 802384C4-802384D8 232E04 0014+00 0/0 1/1 0/0 .text            setLetterNameID__12dMsgObject_cFUs
- */
 void dMsgObject_c::setLetterNameID(u16 nameID) {
     dMsgObject_getMsgObjectClass()->setLetterNameIDLocal(nameID);
 }
 
-/* 802384D8-802384EC 232E18 0014+00 0/0 1/1 0/0 .text            setArrowNum__12dMsgObject_cFUc */
 void dMsgObject_c::setArrowNum(u8 arrowNum) {
     dMsgObject_getMsgObjectClass()->setArrowNumLocal(arrowNum);
 }
 
-/* 802384EC-80238500 232E2C 0014+00 1/1 0/0 0/0 .text            setMsgOutputType__12dMsgObject_cFUc
- */
 void dMsgObject_c::setMsgOutputType(u8 outputType) {
     dMsgObject_getMsgObjectClass()->setMsgOutputTypeLocal(outputType);
 }
 
-/* 80238500-80238514 232E40 0014+00 0/0 1/1 0/0 .text            getMsgOutputType__12dMsgObject_cFv
- */
 u8 dMsgObject_c::getMsgOutputType() {
     return dMsgObject_getMsgObjectClass()->getMsgOutputTypeLocal();
 }
 
-/* 80238514-80238528 232E54 0014+00 0/0 5/5 0/0 .text            getWord__12dMsgObject_cFv */
 const char* dMsgObject_c::getWord() {
     return dMsgObject_getMsgObjectClass()->getWordLocal();
 }
 
-/* 80238528-80238544 232E68 001C+00 0/0 1/1 0/0 .text            getSelectWord__12dMsgObject_cFi */
 const char* dMsgObject_c::getSelectWord(int idx) {
     return dMsgObject_getMsgObjectClass()->getSelectWordLocal(idx);
 }
 
-/* 80238544-80238574 232E84 0030+00 0/0 1/1 0/0 .text setSelectWordFlag__12dMsgObject_cFUc */
 void dMsgObject_c::setSelectWordFlag(u8 flag) {
     dMsgObject_getMsgObjectClass()->setSelectWordFlagLocal(flag);
 }
 
-/* 80238574-80238588 232EB4 0014+00 0/0 3/3 0/0 .text            getSelectWordFlag__12dMsgObject_cFv
- */
 u8 dMsgObject_c::getSelectWordFlag() {
     return dMsgObject_getMsgObjectClass()->getSelectWordFlagLocal();
 }
 
-/* 80238588-802385B4 232EC8 002C+00 0/0 1/1 0/0 .text            isHowlHearingMode__12dMsgObject_cFv
- */
 bool dMsgObject_c::isHowlHearingMode() {
     return dMsgObject_getMsgObjectClass()->isHowlHearingModeLocal();
 }
 
-/* 802385B4-802385E0 232EF4 002C+00 0/0 1/1 0/0 .text getSelectBombBagID__12dMsgObject_cFv */
 u8 dMsgObject_c::getSelectBombBagID() {
     return dMsgObject_getMsgObjectClass()->getSelectBombBagIDLocal();
 }
 
-/* 802385E0-8023860C 232F20 002C+00 0/0 6/6 0/0 .text getSelectBombPrice__12dMsgObject_cFv */
 s16 dMsgObject_c::getSelectBombPrice() {
     return dMsgObject_getMsgObjectClass()->getSelectBombPriceLocal();
 }
 
-/* 8023860C-80238638 232F4C 002C+00 0/0 1/1 0/0 .text            setEquipBombInfo__12dMsgObject_cFv
- */
 void dMsgObject_c::setEquipBombInfo() {
     dMsgObject_getMsgObjectClass()->setEquipBombInfoLocal();
 }
 
-/* 80238638-8023864C 232F78 0014+00 0/0 2/2 0/0 .text getItemEquipButton__12dMsgObject_cFv */
 u8 dMsgObject_c::getItemEquipButton() {
     return dMsgObject_getMsgObjectClass()->getItemEquipButtonLocal();
 }
 
-/* 8023864C-80238660 232F8C 0014+00 0/0 2/2 0/0 .text setSelectCancelPos__12dMsgObject_cFUc */
 void dMsgObject_c::setSelectCancelPos(u8 pos) {
     dMsgObject_getMsgObjectClass()->setSelectCancelPosLocal(pos);
 }
 
-/* 80238660-802386C8 232FA0 0068+00 1/1 0/0 3/3 .text            dMsgObject_getTotalPrice__Fv */
 u16 dMsgObject_getTotalPrice() {
     u8 high = dComIfGs_getEventReg(0xfeff);
     u8 low = dComIfGs_getEventReg(0xfdff);
     return (high << 8) | low;
 }
 
-/* 802386C8-80238730 233008 0068+00 0/0 0/0 2/2 .text            dMsgObject_setTotalPrice__FUs */
 void dMsgObject_setTotalPrice(u16 price) {
     dComIfGs_setEventReg(0xfeff, (price & 0xff00) >> 8);
     dComIfGs_setEventReg(0xfdff, price & 0xff);
 }
 
-/* 80238730-802387C4 233070 0094+00 0/0 0/0 4/4 .text            dMsgObject_addTotalPrice__Fs */
 void dMsgObject_addTotalPrice(s16 price) {
     dMsgObject_getMsgObjectClass()->addNowTotalPrice(price);
     price += dMsgObject_getTotalPrice();
@@ -2602,20 +2399,17 @@ void dMsgObject_addTotalPrice(s16 price) {
     dComIfGs_setEventReg(0xfdff, (u16)price & 0xff);
 }
 
-/* 802387C4-8023882C 233104 0068+00 1/1 0/0 4/4 .text            dMsgObject_getTotalPayment__Fv */
 u16 dMsgObject_getTotalPayment() {
     u8 high = dComIfGs_getEventReg(0xfcff);
     u8 low = dComIfGs_getEventReg(0xfbff);
     return (high << 8) | low;
 }
 
-/* 8023882C-80238894 23316C 0068+00 0/0 0/0 2/2 .text            dMsgObject_setTotalPayment__FUs */
 void dMsgObject_setTotalPayment(u16 price) {
     dComIfGs_setEventReg(0xfcff, (price & 0xff00) >> 8);
     dComIfGs_setEventReg(0xfbff, price & 0xff);
 }
 
-/* 80238894-80238928 2331D4 0094+00 1/1 0/0 0/0 .text            dMsgObject_addTotalPayment__Fs */
 void dMsgObject_addTotalPayment(s16 price) {
     dMsgObject_getMsgObjectClass()->addNowTotalPayment(price);
     price += dMsgObject_getTotalPayment();
@@ -2626,20 +2420,17 @@ void dMsgObject_addTotalPayment(s16 price) {
     dComIfGs_setEventReg(0xfbff, (u16)price & 0xff);
 }
 
-/* 80238928-80238990 233268 0068+00 2/2 4/4 0/0 .text            dMsgObject_getFundRaising__Fv */
 u16 dMsgObject_getFundRaising() {
     u8 high = dComIfGs_getEventReg(0xf9ff);
     u8 low = dComIfGs_getEventReg(0xfaff);
     return (high << 8) | low;
 }
 
-/* 80238990-802389F8 2332D0 0068+00 1/1 1/1 0/0 .text            dMsgObject_setFundRaising__FUs */
 void dMsgObject_setFundRaising(u16 price) {
     dComIfGs_setEventReg(0xf9ff, (price & 0xff00) >> 8);
     dComIfGs_setEventReg(0xfaff, price & 0xff);
 }
 
-/* 802389F8-80238A74 233338 007C+00 1/1 0/0 0/0 .text            dMsgObject_addFundRaising__Fs */
 void dMsgObject_addFundRaising(s16 price) {
     price += dMsgObject_getFundRaising();
     if (price < 0) {
@@ -2649,14 +2440,12 @@ void dMsgObject_addFundRaising(s16 price) {
     dComIfGs_setEventReg(0xfaff, (u16)price & 0xff);
 }
 
-/* 80238A74-80238ADC 2333B4 0068+00 1/1 1/1 0/0 .text            dMsgObject_getOffering__Fv */
 u16 dMsgObject_getOffering() {
     u8 high = dComIfGs_getEventReg(0xf7ff);
     u8 low = dComIfGs_getEventReg(0xf8ff);
     return (high << 8) | low;
 }
 
-/* 80238ADC-80238B58 23341C 007C+00 0/0 1/1 0/0 .text            dMsgObject_addOffering__Fs */
 void dMsgObject_addOffering(s16 price) {
     s16 offering = price + dMsgObject_getOffering();
     if (offering < 0) {
@@ -2666,7 +2455,6 @@ void dMsgObject_addOffering(s16 price) {
     dComIfGs_setEventReg(0xf8ff, (u16)offering & 0xff);
 }
 
-/* 803C0B9C-803C0BB0 -00001 0014+00 1/0 0/0 0/0 .data            l_dMsgObject_Method */
 static leafdraw_method_class l_dMsgObject_Method = {
     (process_method_func)dMsgObject_Create,
     (process_method_func)dMsgObject_Delete,
@@ -2675,7 +2463,6 @@ static leafdraw_method_class l_dMsgObject_Method = {
     (process_method_func)dMsgObject_Draw,
 };
 
-/* 803C0BB0-803C0BD8 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_MSG_OBJECT */
 extern msg_process_profile_definition g_profile_MSG_OBJECT = {
   fpcLy_CURRENT_e,        // mLayerID
   12,                     // mListID
diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp
index 67d84b0260..70ade423bb 100644
--- a/src/d/d_msg_out_font.cpp
+++ b/src/d/d_msg_out_font.cpp
@@ -7,15 +7,12 @@
 #include "d/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 80225BB8-80225BF4 2204F8 003C+00 1/1 0/0 0/0 .text            __ct__13COutFontSet_cFv */
 COutFontSet_c::COutFontSet_c() {
     initialize();
 }
 
-/* 80225BF4-80225C3C 220534 0048+00 1/0 0/0 0/0 .text            __dt__13COutFontSet_cFv */
 COutFontSet_c::~COutFontSet_c() {}
 
-/* 80225C3C-80225C70 22057C 0034+00 2/2 0/0 0/0 .text            initialize__13COutFontSet_cFv */
 void COutFontSet_c::initialize() {
     mpTextBoxPtr = NULL;
     mPosX = 0.0f;
@@ -26,8 +23,6 @@ void COutFontSet_c::initialize() {
     mType = 0x47;
 }
 
-/* 80225C70-80225C94 2205B0 0024+00 1/1 0/0 0/0 .text
- * drawFont__13COutFontSet_cFP10J2DTextBoxUcffffUlUc            */
 void COutFontSet_c::drawFont(J2DTextBox* i_textbox, u8 i_type, f32 i_posX, f32 i_posY, f32 i_sizeX,
                              f32 i_sizeY, u32 i_color, u8 i_alpha) {
     mpTextBoxPtr = i_textbox;
@@ -40,7 +35,6 @@ void COutFontSet_c::drawFont(J2DTextBox* i_textbox, u8 i_type, f32 i_posX, f32 i
     mType = i_type;
 }
 
-/* 80225C94-80225D60 2205D4 00CC+00 0/0 5/5 0/0 .text            __ct__10COutFont_cFUc */
 COutFont_c::COutFont_c(u8 param_0) {
     field_0x242 = param_0;
 
@@ -60,7 +54,6 @@ COutFont_c::COutFont_c(u8 param_0) {
     mRupeeColor = 0;
 }
 
-/* 80225D60-80225E7C 2206A0 011C+00 1/0 0/0 0/0 .text            __dt__10COutFont_cFv */
 COutFont_c::~COutFont_c() {
     for (int i = 0; i < 35; i++) {
         delete mpOfs[i];
@@ -83,8 +76,6 @@ COutFont_c::~COutFont_c() {
     }
 }
 
-/* 80225E7C-80225EA8 2207BC 002C+00 1/0 0/0 0/0 .text            setPane__10COutFont_cFP10J2DPicture
- */
 void COutFont_c::setPane(J2DPicture* i_pic) {
     for (int i = 0; i < 70; i++) {
         mpPane[i] = i_pic;
@@ -94,7 +85,6 @@ void COutFont_c::setPane(J2DPicture* i_pic) {
     field_0x240 = false;
 }
 
-/* 80225EA8-80226CF8 2207E8 0E50+00 2/0 0/0 0/0 .text            createPane__10COutFont_cFv */
 void COutFont_c::createPane() {
     ResTIMG* img;
 
@@ -290,15 +280,12 @@ void COutFont_c::createPane() {
     field_0x240 = true;
 }
 
-/* 80226CF8-80226D4C 221638 0054+00 0/0 2/2 0/0 .text            initialize__10COutFont_cFv */
 void COutFont_c::initialize() {
     for (int i = 0; i < 35; i++) {
         mpOfs[i]->initialize();
     }
 }
 
-/* 80226D4C-80226DA8 22168C 005C+00 1/0 0/0 0/0 .text
- * drawFont__10COutFont_cFP10J2DTextBoxUcffffUlUc               */
 void COutFont_c::drawFont(J2DTextBox* i_textbox, u8 i_type, f32 i_posX, f32 i_posY, f32 i_sizeX,
                           f32 i_sizeY, u32 i_color, u8 i_alpha) {
 #if VERSION != VERSION_GCN_JPN
@@ -313,13 +300,10 @@ void COutFont_c::drawFont(J2DTextBox* i_textbox, u8 i_type, f32 i_posX, f32 i_po
     }
 }
 
-/* 80226DA8-80226DB0 2216E8 0008+00 1/0 0/0 0/0 .text            setAlphaRatio__10COutFont_cFf */
 void COutFont_c::setAlphaRatio(f32 i_ratio) {
     mAlphaRatio = i_ratio;
 }
 
-/* 80226DB0-80228448 2216F0 1698+00 2/0 0/0 0/0 .text            draw__10COutFont_cFP10J2DTextBoxfff
- */
 void COutFont_c::draw(J2DTextBox* i_textbox, f32 param_1, f32 param_2, f32 param_3) {
     s16 sp256[70];
 
@@ -677,8 +661,6 @@ void COutFont_c::draw(J2DTextBox* i_textbox, f32 param_1, f32 param_2, f32 param
     }
 }
 
-/* 80228448-80228490 222D88 0048+00 1/0 0/0 0/0 .text            reset__10COutFont_cFP10J2DTextBox
- */
 void COutFont_c::reset(J2DTextBox* i_textbox) {
     if (i_textbox != NULL) {
         for (int i = 0; i < 35; i++) {
@@ -690,8 +672,6 @@ void COutFont_c::reset(J2DTextBox* i_textbox) {
     }
 }
 
-/* 80228490-80228530 222DD0 00A0+00 1/1 0/0 0/0 .text setBlendAnime__10COutFont_cFP10J2DPictures
- */
 void COutFont_c::setBlendAnime(J2DPicture* i_pic, s16 param_1) {
     int i = param_1 % 20;
 
@@ -704,7 +684,6 @@ void COutFont_c::setBlendAnime(J2DPicture* i_pic, s16 param_1) {
     }
 }
 
-/* 80228530-80228578 222E70 0048+00 1/1 0/0 0/0 .text            getBtiName__10COutFont_cFi */
 const char* COutFont_c::getBtiName(int i_nameIdx) {
     static const char* mpIconName[] = {
         "font_00.bti",
diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp
index a19c96e4da..0c6ca29e81 100644
--- a/src/d/d_msg_scrn_3select.cpp
+++ b/src/d/d_msg_scrn_3select.cpp
@@ -16,14 +16,12 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-/* 803C0C54-803C0CA0 01DD74 0048+04 2/3 0/0 0/0 .data            process */
 typedef void (dMsgScrn3Select_c::*processFn)();
 processFn process[] = {
     &dMsgScrn3Select_c::open1Proc,  &dMsgScrn3Select_c::open2Proc,  &dMsgScrn3Select_c::waitProc,
     &dMsgScrn3Select_c::selectProc, &dMsgScrn3Select_c::changeProc, &dMsgScrn3Select_c::closeProc,
 };
 
-/* 802390B4-802398CC 2339F4 0818+00 0/0 4/4 0/0 .text            __ct__17dMsgScrn3Select_cFv */
 dMsgScrn3Select_c::dMsgScrn3Select_c() {
     static u64 const tag_name[3][12] = {
         // A
@@ -219,7 +217,6 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() {
     mSelMsgInactiveCol.set(0xFF, 0xFF, 0xFF, 0xFF);
 }
 
-/* 802398CC-80239BE0 23420C 0314+00 1/0 0/0 0/0 .text            __dt__17dMsgScrn3Select_cFv */
 dMsgScrn3Select_c::~dMsgScrn3Select_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -276,12 +273,10 @@ dMsgScrn3Select_c::~dMsgScrn3Select_c() {
     }
 }
 
-/* 80239C64-80239C78 2345A4 0014+00 0/0 5/5 0/0 .text            isSelect__17dMsgScrn3Select_cFv */
 bool dMsgScrn3Select_c::isSelect() {
     return mProcess == PROC_SELECT_e ? TRUE : FALSE;
 }
 
-/* 80239C78-80239D08 2345B8 0090+00 0/0 5/5 0/0 .text setString__17dMsgScrn3Select_cFPcPcPc */
 void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) {
     if (mpTmSel_c[0] != NULL) {
         JUT_ASSERT(0, ((J2DTextBox*)(mpTmSel_c[0]->getPanePtr()))->getStringAllocByte() >
@@ -311,7 +306,6 @@ void dMsgScrn3Select_c::setString(char* mpText0, char* mpText1, char* mpText2) {
     }
 }
 
-/* 80239D08-80239D98 234648 0090+00 0/0 5/5 0/0 .text setRubyString__17dMsgScrn3Select_cFPcPcPc */
 void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2) {
     if (mpTmrSel_c[0] != NULL) {
         JUT_ASSERT(0, ((J2DTextBox*)(mpTmrSel_c[0]->getPanePtr()))->getStringAllocByte() >
@@ -341,13 +335,10 @@ void dMsgScrn3Select_c::setRubyString(char* pText0, char* pText1, char* pText2)
     }
 }
 
-/* 80239D98-80239DD4 2346D8 003C+00 0/0 5/5 0/0 .text            translate__17dMsgScrn3Select_cFff
- */
 void dMsgScrn3Select_c::translate(f32 i_x, f32 i_y) {
     mpParent->translate(i_x, i_y);
 }
 
-/* 80239DD4-8023A094 234714 02C0+00 0/0 5/5 0/0 .text            draw__17dMsgScrn3Select_cFff */
 void dMsgScrn3Select_c::draw(f32 i_xPos, f32 i_yPos) {
     J2DGrafContext* port = dComIfGp_getCurrentGrafPort();
     port->setup2D();
@@ -394,8 +385,6 @@ void dMsgScrn3Select_c::draw(f32 i_xPos, f32 i_yPos) {
     }
 }
 
-/* 8023A094-8023A398 2349D4 0304+00 0/0 5/5 0/0 .text selAnimeInit__17dMsgScrn3Select_cFUcUcUcfUc
- */
 void dMsgScrn3Select_c::selAnimeInit(u8 i_selNum, u8 i_selNo, u8 param_2, f32 i_width, u8 param_4) {
     mSelNo = i_selNo;
     field_0x110 = i_selNo;
@@ -476,7 +465,6 @@ void dMsgScrn3Select_c::selAnimeInit(u8 i_selNum, u8 i_selNo, u8 param_2, f32 i_
     mProcess = PROC_OPEN1_e;
 }
 
-/* 8023A398-8023A680 234CD8 02E8+00 0/0 5/5 0/0 .text selAnimeMove__17dMsgScrn3Select_cFUcUcb */
 bool dMsgScrn3Select_c::selAnimeMove(u8 i_selNum, u8 param_1, bool param_2) {
     field_0x110 = param_1;
     mSelNum = i_selNum;
@@ -530,8 +518,6 @@ bool dMsgScrn3Select_c::selAnimeMove(u8 i_selNum, u8 param_1, bool param_2) {
     return mProcess == PROC_SELECT_e ? TRUE : FALSE;
 }
 
-/* 8023A680-8023A934 234FC0 02B4+00 0/0 9/9 0/0 .text            selAnimeEnd__17dMsgScrn3Select_cFv
- */
 bool dMsgScrn3Select_c::selAnimeEnd() {
     if (mProcess == PROC_MAX_e) {
         return true;
@@ -584,20 +570,16 @@ bool dMsgScrn3Select_c::selAnimeEnd() {
     return mProcess == PROC_MAX_e ? TRUE : FALSE;
 }
 
-/* 8023A934-8023A94C 235274 0018+00 0/0 5/5 0/0 .text getTextBoxWidth__17dMsgScrn3Select_cFv */
 f32 dMsgScrn3Select_c::getTextBoxWidth() {
     return mpTmSel_c[0]->getSizeX();
 }
 
-/* 8023A94C-8023A95C 23528C 0010+00 0/0 5/5 0/0 .text            getFontSize__17dMsgScrn3Select_cFv
- */
 f32 dMsgScrn3Select_c::getFontSize() {
     J2DTextBox::TFontSize font_size;
     ((J2DTextBox*)mpTmSel_c[0]->getPanePtr())->getFontSize(font_size);
     return font_size.mSizeX;
 }
 
-/* 8023A95C-8023A97C 23529C 0020+00 0/0 2/2 0/0 .text getRubyFontSize__17dMsgScrn3Select_cFv */
 f32 dMsgScrn3Select_c::getRubyFontSize() {
     if (mpTmrSel_c[0] != NULL) {
         J2DTextBox::TFontSize font_size;
@@ -608,13 +590,10 @@ f32 dMsgScrn3Select_c::getRubyFontSize() {
     return 0.0f;
 }
 
-/* 8023A97C-8023A98C 2352BC 0010+00 0/0 5/5 0/0 .text            getCharSpace__17dMsgScrn3Select_cFv
- */
 f32 dMsgScrn3Select_c::getCharSpace() {
     return ((J2DTextBox*)mpTmSel_c[0]->getPanePtr())->getCharSpace();
 }
 
-/* 8023A98C-8023A9AC 2352CC 0020+00 0/0 2/2 0/0 .text getRubyCharSpace__17dMsgScrn3Select_cFv */
 f32 dMsgScrn3Select_c::getRubyCharSpace() {
     if (mpTmrSel_c[0] != NULL) {
         return ((J2DTextBox*)mpTmrSel_c[0]->getPanePtr())->getCharSpace();
@@ -623,19 +602,14 @@ f32 dMsgScrn3Select_c::getRubyCharSpace() {
     return 0.0f;
 }
 
-/* 8023A9AC-8023A9D8 2352EC 002C+00 0/0 2/2 0/0 .text getTextBoxGlobalPosX__17dMsgScrn3Select_cFi
- */
 f32 dMsgScrn3Select_c::getTextBoxGlobalPosX(int i_sel) {
     return mpTmSel_c[i_sel]->getGlobalPosX();
 }
 
-/* 8023A9D8-8023AA04 235318 002C+00 0/0 2/2 0/0 .text getTextBoxGlobalPosY__17dMsgScrn3Select_cFi
- */
 f32 dMsgScrn3Select_c::getTextBoxGlobalPosY(int i_sel) {
     return mpTmSel_c[i_sel]->getGlobalPosY();
 }
 
-/* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text            open1Proc__17dMsgScrn3Select_cFv */
 void dMsgScrn3Select_c::open1Proc() {
     f32 sel_anm_frame[3] = {204.0f, 304.0f, 404.0f};
 
@@ -654,7 +628,6 @@ void dMsgScrn3Select_c::open1Proc() {
     mProcess = PROC_OPEN2_e;
 }
 
-/* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text            open2Proc__17dMsgScrn3Select_cFv */
 void dMsgScrn3Select_c::open2Proc() {
     f32 sel_anm_frame[3] = {204.0f, 304.0f, 404.0f};
 
@@ -679,7 +652,6 @@ void dMsgScrn3Select_c::open2Proc() {
     }
 }
 
-/* 8023AC14-8023AC44 235554 0030+00 1/0 0/0 0/0 .text            waitProc__17dMsgScrn3Select_cFv */
 void dMsgScrn3Select_c::waitProc() {
     mSelWaitTimer++;
 
@@ -688,8 +660,6 @@ void dMsgScrn3Select_c::waitProc() {
     }
 }
 
-/* 8023AC44-8023AE68 235584 0224+00 1/0 0/0 0/0 .text            selectProc__17dMsgScrn3Select_cFv
- */
 void dMsgScrn3Select_c::selectProc() {
     if (mSelNo != field_0x110) {
         mLastSelNo = mSelNo;
@@ -765,8 +735,6 @@ void dMsgScrn3Select_c::selectProc() {
     }
 }
 
-/* 8023AE68-8023B148 2357A8 02E0+00 1/0 0/0 0/0 .text            changeProc__17dMsgScrn3Select_cFv
- */
 void dMsgScrn3Select_c::changeProc() {
     if (mSelNo == 0xFF) {
         if (mLastSelNo == 0) {
@@ -868,7 +836,6 @@ void dMsgScrn3Select_c::changeProc() {
     }
 }
 
-/* 8023B148-8023B228 235A88 00E0+00 1/0 0/0 0/0 .text            closeProc__17dMsgScrn3Select_cFv */
 void dMsgScrn3Select_c::closeProc() {
     mpSelectCursor->setAlphaRate(0.0f);
     mBckFrame--;
@@ -886,8 +853,6 @@ void dMsgScrn3Select_c::closeProc() {
     }
 }
 
-/* 8023B228-8023B4AC 235B68 0284+00 1/1 0/0 0/0 .text            selectScale__17dMsgScrn3Select_cFv
- */
 void dMsgScrn3Select_c::selectScale() {
     if (mWidth != 1.0f) {
         for (int i = 0; i < 3; i++) {
@@ -936,8 +901,6 @@ void dMsgScrn3Select_c::selectScale() {
     }
 }
 
-/* 8023B4AC-8023B870 235DEC 03C4+00 3/3 0/0 0/0 .text            selectTrans__17dMsgScrn3Select_cFv
- */
 void dMsgScrn3Select_c::selectTrans() {
     static u64 tag_n[] = {'a_t', 'b_t', 'c_t'};
 
@@ -1021,8 +984,6 @@ void dMsgScrn3Select_c::selectTrans() {
     }
 }
 
-/* 8023B870-8023B914 2361B0 00A4+00 7/7 0/0 0/0 .text selectAnimeTransform__17dMsgScrn3Select_cFi
- */
 void dMsgScrn3Select_c::selectAnimeTransform(int i_sel) {
     mpAnmBck->setFrame(mBckFrame);
     mpSel_c[i_sel]->getPanePtr()->setAnimation(mpAnmBck);
diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp
index e1597d7d9f..1ad714f839 100644
--- a/src/d/d_msg_scrn_arrow.cpp
+++ b/src/d/d_msg_scrn_arrow.cpp
@@ -6,7 +6,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_pane_class.h"
 
-/* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */
 dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mpScreen = new J2DScreen();
     JUT_ASSERT(0, mpScreen != NULL);
@@ -45,7 +44,6 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() {
     mpScreen->search('yajiendl')->setAnimation(mpBpk);
 }
 
-/* 8023BC78-8023BDC0 2365B8 0148+00 1/0 0/0 0/0 .text __dt__15dMsgScrnArrow_cFv */
 dMsgScrnArrow_c::~dMsgScrnArrow_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -66,18 +64,15 @@ dMsgScrnArrow_c::~dMsgScrnArrow_c() {
     mpDot_c = NULL;
 }
 
-/* 8023BDC0-8023BDF8 236700 0038+00 0/0 5/5 0/0 .text draw__15dMsgScrnArrow_cFv */
 void dMsgScrnArrow_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     mpScreen->draw(0.0f, 0.0f, graf_ctx);
 }
 
-/* 8023BDF8-8023BE34 236738 003C+00 0/0 5/5 0/0 .text setPos__15dMsgScrnArrow_cFff */
 void dMsgScrnArrow_c::setPos(f32 i_posX, f32 i_posY) {
     mpParent_c->translate(i_posX, i_posY);
 }
 
-/* 8023BE34-8023BE90 236774 005C+00 0/0 9/9 0/0 .text arwAnimeInit__15dMsgScrnArrow_cFv */
 void dMsgScrnArrow_c::arwAnimeInit() {
     mpArw_c->hide();
 
@@ -90,7 +85,6 @@ void dMsgScrnArrow_c::arwAnimeInit() {
     mpScreen->animation();
 }
 
-/* 8023BE90-8023BFC4 2367D0 0134+00 0/0 4/4 0/0 .text arwAnimeMove__15dMsgScrnArrow_cFv */
 void dMsgScrnArrow_c::arwAnimeMove() {
     if (!mpArw_c->isVisible()) {
         mpArw_c->show();
@@ -115,7 +109,6 @@ void dMsgScrnArrow_c::arwAnimeMove() {
     mpScreen->animation();
 }
 
-/* 8023BFC4-8023C010 236904 004C+00 0/0 3/3 0/0 .text dotAnimeInit__15dMsgScrnArrow_cFv */
 void dMsgScrnArrow_c::dotAnimeInit() {
     mpDot_c->hide();
 
@@ -125,7 +118,6 @@ void dMsgScrnArrow_c::dotAnimeInit() {
     mpScreen->animation();
 }
 
-/* 8023C010-8023C0DC 236950 00CC+00 0/0 3/3 0/0 .text dotAnimeMove__15dMsgScrnArrow_cFv */
 void dMsgScrnArrow_c::dotAnimeMove() {
     if (mpArw_c->isVisible() == true) {
         mpArw_c->hide();
diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp
index a59cfa0859..ab1f4484ca 100644
--- a/src/d/d_msg_scrn_base.cpp
+++ b/src/d/d_msg_scrn_base.cpp
@@ -8,15 +8,12 @@
 #include "d/d_pane_class.h"
 #include "cstring.h"
 
-/* 8023C0DC-8023C124 236A1C 0048+00 0/0 9/9 0/0 .text            __ct__14dMsgScrnBase_cFv */
 dMsgScrnBase_c::dMsgScrnBase_c() {
     init();
 }
 
-/* 8023C124-8023C16C 236A64 0048+00 1/0 9/9 0/0 .text            __dt__14dMsgScrnBase_cFv */
 dMsgScrnBase_c::~dMsgScrnBase_c() {}
 
-/* 8023C16C-8023C234 236AAC 00C8+00 1/1 9/9 0/0 .text            init__14dMsgScrnBase_cFv */
 void dMsgScrnBase_c::init() {
     mpScreen = NULL;
     mpPmP_c = NULL;
@@ -59,14 +56,12 @@ void dMsgScrnBase_c::init() {
     mCharAlphaRate = 1.0f;
 }
 
-/* 8023C234-8023C274 236B74 0040+00 1/0 9/0 0/0 .text            multiDraw__14dMsgScrnBase_cFv */
 void dMsgScrnBase_c::multiDraw() {
     if (field_0x48 != NULL) {
         dComIfGd_set2DOpa(field_0x48);
     }
 }
 
-/* 8023C274-8023C300 236BB4 008C+00 1/0 7/0 0/0 .text            draw__14dMsgScrnBase_cFv */
 void dMsgScrnBase_c::draw() {
     J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
 
@@ -76,18 +71,14 @@ void dMsgScrnBase_c::draw() {
     ctx->setup2D();
 }
 
-/* 8023C300-8023C32C 236C40 002C+00 1/0 2/0 0/0 .text            drawSelf__14dMsgScrnBase_cFv */
 void dMsgScrnBase_c::drawSelf() {
     drawOutFont(0.0f, 0.0f, 1.0f);
 }
 
-/* 8023C32C-8023C360 236C6C 0034+00 1/1 6/6 0/0 .text            drawOutFont__14dMsgScrnBase_cFfff
- */
 void dMsgScrnBase_c::drawOutFont(f32 param_0, f32 param_1, f32 param_2) {
     mpOutFont->draw(NULL, param_0, param_1, param_2);
 }
 
-/* 8023C360-8023C3EC 236CA0 008C+00 0/0 2/2 0/0 .text            setString__14dMsgScrnBase_cFPcPc */
 void dMsgScrnBase_c::setString(char* mpText, char* i_stringB) {
     for (int i = 0; i < 7; i++) {
         if (mpTm_c[i] != NULL) {
@@ -101,8 +92,6 @@ void dMsgScrnBase_c::setString(char* mpText, char* i_stringB) {
     }
 }
 
-/* 8023C3EC-8023C458 236D2C 006C+00 0/0 2/2 0/0 .text            setRubyString__14dMsgScrnBase_cFPc
- */
 void dMsgScrnBase_c::setRubyString(char* mpText) {
     for (int i = 0; i < 3; i++) {
         if (mpTmr_c[i] != NULL) {
@@ -112,23 +101,19 @@ void dMsgScrnBase_c::setRubyString(char* mpText) {
     }
 }
 
-/* 8023C458-8023C480 236D98 0028+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnBase_cFf */
 void dMsgScrnBase_c::fukiScale(f32 i_scale) {
     mpPmP_c->paneScale(i_scale, i_scale);
 }
 
-/* 8023C480-8023C4A4 236DC0 0024+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnBase_cFff */
 void dMsgScrnBase_c::fukiTrans(f32 i_posX, f32 i_posY) {
     mpPmP_c->paneTrans(i_posX, i_posY);
 }
 
-/* 8023C4A4-8023C4F4 236DE4 0050+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnBase_cFf */
 void dMsgScrnBase_c::fukiAlpha(f32 i_alpha) {
     fontAlpha(i_alpha);
     mpPmP_c->setAlphaRate(i_alpha);
 }
 
-/* 8023C4F4-8023C574 236E34 0080+00 1/0 5/0 0/0 .text            fontAlpha__14dMsgScrnBase_cFf */
 void dMsgScrnBase_c::fontAlpha(f32 i_alpha) {
     for (int i = 0; i < 7; i++) {
         if (mpTm_c[i] != NULL) {
@@ -141,7 +126,6 @@ void dMsgScrnBase_c::fontAlpha(f32 i_alpha) {
     }
 }
 
-/* 8023C574-8023C5C8 236EB4 0054+00 1/0 8/8 0/0 .text            isTalkNow__14dMsgScrnBase_cFv */
 bool dMsgScrnBase_c::isTalkNow() {
     switch (dMsgObject_getMsgObjectClass()->getStatus()) {
     case 5:
diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp
index 7d8d7d5096..242fa4af22 100644
--- a/src/d/d_msg_scrn_boss.cpp
+++ b/src/d/d_msg_scrn_boss.cpp
@@ -6,7 +6,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-/* 8023C5C8-8023C928 236F08 0360+00 0/0 1/1 0/0 .text            __ct__14dMsgScrnBoss_cFv */
 dMsgScrnBoss_c::dMsgScrnBoss_c() {
     static u64 t_tag[7] = {
         'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00',
@@ -54,7 +53,6 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() {
     mTextBoxPosY = mpTm_c[0]->getGlobalPosY();
 }
 
-/* 8023C928-8023CA88 237268 0160+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnBoss_cFv */
 dMsgScrnBoss_c::~dMsgScrnBoss_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -76,7 +74,6 @@ dMsgScrnBoss_c::~dMsgScrnBoss_c() {
     dComIfGp_getMsgArchive(4)->removeResourceAll();
 }
 
-/* 8023CA88-8023CB98 2373C8 0110+00 1/0 0/0 0/0 .text            exec__14dMsgScrnBoss_cFv */
 void dMsgScrnBoss_c::exec() {
     mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY);
 
@@ -93,14 +90,12 @@ void dMsgScrnBoss_c::exec() {
     }
 }
 
-/* 8023CB98-8023CBF0 2374D8 0058+00 1/0 0/0 0/0 .text            drawSelf__14dMsgScrnBoss_cFv */
 void dMsgScrnBoss_c::drawSelf() {
     J2DGrafContext* ctx = dComIfGp_getCurrentGrafPort();
     ctx->setup2D();
     drawOutFont(0.0f, 0.0f, 1.0f);
 }
 
-/* 8023CBF0-8023CC7C 237530 008C+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnBoss_cFf */
 void dMsgScrnBoss_c::fukiAlpha(f32 i_alpha) {
     mpPmP_c->setAlphaRate(i_alpha);
     mpBaseParent->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mBossNameBaseAlpha);
@@ -110,11 +105,8 @@ void dMsgScrnBoss_c::fukiAlpha(f32 i_alpha) {
     }
 }
 
-/* 8023CC7C-8023CC80 2375BC 0004+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnBoss_cFf */
 void dMsgScrnBoss_c::fukiScale(f32) {}
 
-/* 8023CC80-8023CC84 2375C0 0004+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnBoss_cFff */
 void dMsgScrnBoss_c::fukiTrans(f32, f32) {}
 
-/* 8023CC84-8023CC88 2375C4 0004+00 1/0 0/0 0/0 .text            fontAlpha__14dMsgScrnBoss_cFf */
 void dMsgScrnBoss_c::fontAlpha(f32) {}
diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp
index 7d8da9e364..be5ce1f4a2 100644
--- a/src/d/d_msg_scrn_explain.cpp
+++ b/src/d/d_msg_scrn_explain.cpp
@@ -31,8 +31,6 @@ static dMsgScrnExplain_c::ProcFunc move_process[] = {
     &dMsgScrnExplain_c::move_select_proc, &dMsgScrnExplain_c::close_proc,
 };
 
-/* 8023CC88-8023D538 2375C8 08B0+00 0/0 2/2 0/0 .text __ct__17dMsgScrnExplain_cFP9STControlUcbUc
- */
 dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_2, u8 param_3) {
     mpStick = i_stick;
     field_0x54 = 0;
@@ -191,7 +189,6 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_
     mpMg_c[1]->translate(vtxCenter2.x + field_0x50, vtxCenter2.y);
 }
 
-/* 8023D538-8023D7D8 237E78 02A0+00 1/0 0/0 0/0 .text            __dt__17dMsgScrnExplain_cFv */
 dMsgScrnExplain_c::~dMsgScrnExplain_c() {
     delete mpString_c;
     mpString_c = NULL;
@@ -244,7 +241,6 @@ dMsgScrnExplain_c::~dMsgScrnExplain_c() {
     dComIfGp_getMsgCommonArchive()->removeResourceAll();
 }
 
-/* 8023D7D8-8023D918 238118 0140+00 0/0 4/4 0/0 .text            move__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::move() {
     u8 currentStatus = mStatus;
 
@@ -268,8 +264,6 @@ void dMsgScrnExplain_c::move() {
                                      g_MsgObject_HIO_c.mBoxTalkScaleY);
 }
 
-/* 8023D918-8023DAD0 238258 01B8+00 0/0 3/3 0/0 .text draw__17dMsgScrnExplain_cFP13J2DOrthoGraph
- */
 void dMsgScrnExplain_c::draw(J2DOrthoGraph* i_graf) {
     if (mStatus == 0 || mStatus == 1) {
         return;
@@ -312,16 +306,12 @@ void dMsgScrnExplain_c::draw(J2DOrthoGraph* i_graf) {
     }
 }
 
-/* 8023DAD0-8023DAD4 238410 0004+00 1/0 0/0 0/0 .text            wait_init__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::wait_init() {}
 
-/* 8023DAD4-8023DAD8 238414 0004+00 1/0 0/0 0/0 .text            wait_proc__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::wait_proc() {}
 
-/* 8023DAD8-8023DADC 238418 0004+00 2/1 0/0 0/0 .text open_request_init__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::open_request_init() {}
 
-/* 8023DADC-8023DBE4 23841C 0108+00 1/0 0/0 0/0 .text open_request_proc__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::open_request_proc() {
     J2DTextBox* uVar1;
     J2DTextBox* uVar6 = NULL;
@@ -354,7 +344,6 @@ void dMsgScrnExplain_c::open_request_proc() {
     }
 }
 
-/* 8023DBE4-8023DC7C 238524 0098+00 1/0 0/0 0/0 .text            open_init__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::open_init() {
     field_0x5a = 0;
     field_0x48 = 608.0f;
@@ -364,7 +353,6 @@ void dMsgScrnExplain_c::open_init() {
     mDoAud_seStart(Z2SE_SY_EXP_WIN_OPEN, 0, 0, 0);
 }
 
-/* 8023DC7C-8023DD90 2385BC 0114+00 1/0 0/0 0/0 .text            open_proc__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::open_proc() {
     field_0x5a++;
     if (field_0x5a >= 5) {
@@ -386,12 +374,10 @@ void dMsgScrnExplain_c::open_proc() {
     }
 }
 
-/* 8023DD90-8023DDB4 2386D0 0024+00 1/0 0/0 0/0 .text            move_init__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::move_init() {
     mpArrow_c->arwAnimeInit();
 }
 
-/* 8023DDB4-8023DE8C 2386F4 00D8+00 1/0 0/0 0/0 .text            move_proc__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::move_proc() {
     if (mKeyWaitTimer > 0) {
         mKeyWaitTimer--;
@@ -410,7 +396,6 @@ void dMsgScrnExplain_c::move_proc() {
     }
 }
 
-/* 8023DE8C-8023E0F4 2387CC 0268+00 1/0 0/0 0/0 .text move_select_init__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::move_select_init() {
     char msg_buf_yes[8];
     char msg_buf_no[8];
@@ -463,7 +448,6 @@ void dMsgScrnExplain_c::move_select_init() {
     mpArrow_c->arwAnimeInit();
 }
 
-/* 8023E0F4-8023E43C 238A34 0348+00 1/0 0/0 0/0 .text move_select_proc__17dMsgScrnExplain_cFv */
 void dMsgScrnExplain_c::move_select_proc() {
     if (mKeyWaitTimer > 0) {
         mKeyWaitTimer--;
@@ -520,14 +504,10 @@ void dMsgScrnExplain_c::move_select_proc() {
     }
 }
 
-/* 8023E43C-8023E448 238D7C 000C+00 1/0 0/0 0/0 .text            close_init__17dMsgScrnExplain_cFv
- */
 void dMsgScrnExplain_c::close_init() {
     field_0x5a = 5;
 }
 
-/* 8023E448-8023E558 238D88 0110+00 1/0 0/0 0/0 .text            close_proc__17dMsgScrnExplain_cFv
- */
 void dMsgScrnExplain_c::close_proc() {
     bool iVar1;
     if (mpSelect_c != NULL) {
@@ -554,8 +534,6 @@ void dMsgScrnExplain_c::close_proc() {
     }
 }
 
-/* 8023E558-8023E5CC 238E98 0074+00 0/0 7/7 0/0 .text openExplain__17dMsgScrnExplain_cFUlUcUcUcb
- */
 bool dMsgScrnExplain_c::openExplain(u32 param_0, u8 param_1, u8 param_2, u8 param_3, bool param_4) {
     bool rv = false;
 
@@ -578,7 +556,6 @@ bool dMsgScrnExplain_c::openExplain(u32 param_0, u8 param_1, u8 param_2, u8 para
     return rv;
 }
 
-/* 8023E5CC-8023E640 238F0C 0074+00 2/2 0/0 0/0 .text getAlphaRatio__17dMsgScrnExplain_cFv */
 f32 dMsgScrnExplain_c::getAlphaRatio() {
     switch (mStatus) {
     case 2:
@@ -591,12 +568,10 @@ f32 dMsgScrnExplain_c::getAlphaRatio() {
     }
 }
 
-/* 8023E640-8023E654 238F80 0014+00 1/1 0/0 0/0 .text checkTriggerA__17dMsgScrnExplain_cFv */
 bool dMsgScrnExplain_c::checkTriggerA() {
     return mDoCPd_c::getTrigA(PAD_1);
 }
 
-/* 8023E654-8023E668 238F94 0014+00 1/1 0/0 0/0 .text checkTriggerB__17dMsgScrnExplain_cFv */
 bool dMsgScrnExplain_c::checkTriggerB() {
     return mDoCPd_c::getTrigB(PAD_1);
 }
diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp
index 0faf01adb7..1790501930 100644
--- a/src/d/d_msg_scrn_howl.cpp
+++ b/src/d/d_msg_scrn_howl.cpp
@@ -37,7 +37,6 @@ static dMsgScrnHowl_cFunc process[5] = {
     &dMsgScrnHowl_c::guide_off_test_proc,
 };
 
-/* 8024096C-80241784 23B2AC 0E18+00 0/0 1/1 0/0 .text            __ct__14dMsgScrnHowl_cFv */
 dMsgScrnHowl_c::dMsgScrnHowl_c() {
     static u64 ylinen_tag[3] = {
         'ylinen00',
@@ -220,7 +219,6 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() {
     resetLine();
 }
 
-/* 80241784-80241A70 23C0C4 02EC+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnHowl_cFv */
 dMsgScrnHowl_c::~dMsgScrnHowl_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -261,7 +259,6 @@ dMsgScrnHowl_c::~dMsgScrnHowl_c() {
     dComIfGp_getMsgArchive(5)->removeResourceAll();;
 }
 
-/* 80241A70-80241C30 23C3B0 01C0+00 1/0 0/0 0/0 .text            exec__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::exec() {
     field_0x2799 = field_0x2798;
     (this->*process[field_0x2798])();
@@ -302,7 +299,6 @@ void dMsgScrnHowl_c::exec() {
     mpButtonText[1]->setAlphaRate(field_0x1998 * alphaRate);
 }
 
-/* 80241C30-80241D58 23C570 0128+00 1/0 0/0 0/0 .text            drawSelf__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::drawSelf() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     GXGetScissor(&field_0x2114, &field_0x2118, &field_0x211c, &field_0x2120);
@@ -320,13 +316,9 @@ void dMsgScrnHowl_c::drawSelf() {
     grafContext->setScissor();
 }
 
-/* 80241D58-80241D5C 23C698 0004+00 1/0 0/0 0/0 .text            guide_on_init__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_on_init() {
 }
 
-/* 80241D5C-80241DFC 23C69C 00A0+00 1/0 0/0 0/0 .text            guide_on_proc__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_on_proc() {
     if (daAlink_getAlinkActorClass()->getWolfHowlTimer() == 0) {
         if (field_0x2195 == 1) {
@@ -344,13 +336,9 @@ void dMsgScrnHowl_c::guide_on_proc() {
     }
 }
 
-/* 80241DFC-80241E00 23C73C 0004+00 1/0 0/0 0/0 .text            guide_off_init__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_off_init() {
 }
 
-/* 80241E00-80241E7C 23C740 007C+00 1/0 0/0 0/0 .text            guide_off_proc__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_off_proc() {
     calcMain();
     if (daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getReleaseTimer() != 30) {
@@ -362,13 +350,9 @@ void dMsgScrnHowl_c::guide_off_proc() {
     resetLine();
 }
 
-/* 80241E7C-80241E80 23C7BC 0004+00 1/0 0/0 0/0 .text            guide_stop_init__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_stop_init() {
 }
 
-/* 80241E80-80241F28 23C7C0 00A8+00 1/0 0/0 0/0 .text            guide_stop_proc__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::guide_stop_proc() {
     field_0x180[field_0x2124] =
         getNowPlotPitch(-daAlink_getAlinkActorClass()->getWolfHowlMgrP()->getNowInputValue());
@@ -383,12 +367,10 @@ void dMsgScrnHowl_c::guide_stop_proc() {
     }
 }
 
-/* 80241F28-80241F34 23C868 000C+00 1/0 0/0 0/0 .text guide_demo_play_init__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::guide_demo_play_init() {
     field_0x279a = 0;
 }
 
-/* 80241F34-8024202C 23C874 00F8+00 1/0 0/0 0/0 .text guide_demo_play_proc__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::guide_demo_play_proc() {
     if (mDoCPd_c::getHoldA(0) != 0) {
         if (daAlink_getAlinkActorClass()->getWolfHowlTimer() != 0) {
@@ -414,29 +396,23 @@ void dMsgScrnHowl_c::guide_demo_play_proc() {
     }
 }
 
-/* 8024202C-80242030 23C96C 0004+00 1/0 0/0 0/0 .text guide_off_test_init__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::guide_off_test_init() {
 }
 
-/* 80242030-80242034 23C970 0004+00 1/0 0/0 0/0 .text guide_off_test_proc__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::guide_off_test_proc() {
 }
 
-/* 80242034-80242038 23C974 0004+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnHowl_cFf */
 void dMsgScrnHowl_c::fukiScale(f32 param_0) {
 }
 
-/* 80242038-8024205C 23C978 0024+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnHowl_cFff */
 void dMsgScrnHowl_c::fukiTrans(f32 param_0, f32 param_1) {
     mpPmP_c->paneTrans(param_0, param_1);
 }
 
-/* 8024205C-80242080 23C99C 0024+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnHowl_cFf */
 void dMsgScrnHowl_c::fukiAlpha(f32 param_0) {
     mpPmP_c->setAlphaRate(param_0);
 }
 
-/* 80242080-802420D4 23C9C0 0054+00 0/0 1/1 0/0 .text            isKeyCheck__14dMsgScrnHowl_cFv */
 bool dMsgScrnHowl_c::isKeyCheck() {
     if (daAlink_getAlinkActorClass()->getWolfHowlTimer() == 0 && field_0x2799 == field_0x2798 &&
         (field_0x2798 == 3 || (field_0x2798 == 0 && field_0x2195 == 0)))
@@ -446,7 +422,6 @@ bool dMsgScrnHowl_c::isKeyCheck() {
     return false;
 }
 
-/* 802420D4-80242198 23CA14 00C4+00 5/5 0/0 0/0 .text            resetLine__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::resetLine() {
     field_0x2195 = 0;
     field_0x2128 = 0;
@@ -472,7 +447,6 @@ void dMsgScrnHowl_c::resetLine() {
     field_0x2138 = getGuideDataSize();
 }
 
-/* 80242198-802427A8 23CAD8 0610+00 1/1 0/0 0/0 .text            drawWave__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::drawWave() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     f32 local_e0 = mpLineH[0]->getGlobalPosX();
@@ -590,7 +564,6 @@ void dMsgScrnHowl_c::drawWave() {
     }
 }
 
-/* 802427A8-80242FE4 23D0E8 083C+00 1/1 0/0 0/0 .text            drawGuide__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::drawGuide() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     Vec local_b0 = field_0x128;
@@ -717,7 +690,6 @@ void dMsgScrnHowl_c::drawGuide() {
     }
 }
 
-/* 80242FE4-802435BC 23D924 05D8+00 1/1 0/0 0/0 .text            drawGuide2__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::drawGuide2() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     if (field_0x2798 == 3) {
@@ -828,7 +800,6 @@ void dMsgScrnHowl_c::drawGuide2() {
     }
 }
 
-/* 802435BC-80243838 23DEFC 027C+00 1/1 0/0 0/0 .text            drawEffect__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::drawEffect() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     Vec vec1 = field_0x128;
@@ -850,7 +821,6 @@ void dMsgScrnHowl_c::drawEffect() {
                     false, false, false);
 }
 
-/* 80243838-8024389C 23E178 0064+00 3/3 0/0 0/0 .text            calcMain__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::calcMain() {
     if (mPlotTime < field_0x2138 + 380) {
         mPlotTime++;
@@ -861,7 +831,6 @@ void dMsgScrnHowl_c::calcMain() {
     calcGuide();
 }
 
-/* 8024389C-80243A50 23E1DC 01B4+00 1/1 0/0 0/0 .text            calcWave__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::calcWave() {
     if (field_0x2128 < field_0x2136) {
         field_0x2132 = field_0x2128;
@@ -897,7 +866,6 @@ void dMsgScrnHowl_c::calcWave() {
     field_0x1b14[field_0x2132] = g_MsgObject_HIO_c.mHowlHIO.mWaveformDotLen;
 }
 
-/* 80243A50-80243BE0 23E390 0190+00 1/1 0/0 0/0 .text            calcGuide__14dMsgScrnHowl_cFv */
 void dMsgScrnHowl_c::calcGuide() {
     if (field_0x2138 != 0) {
         if ((daAlink_getAlinkActorClass()->getWolfHowlTimer() != 0) || (field_0x2798 == 3)) {
@@ -928,7 +896,6 @@ void dMsgScrnHowl_c::calcGuide() {
     }
 }
 
-/* 80243BE0-80243DCC 23E520 01EC+00 2/2 0/0 0/0 .text            moveLineV__14dMsgScrnHowl_cFb */
 void dMsgScrnHowl_c::moveLineV(bool param_0) {
     f32 dVar7 = (mpLineH[0]->getInitPosX() - mpLineV[0]->getInitCenterPosX());
     f32 fVar1;
@@ -963,8 +930,6 @@ void dMsgScrnHowl_c::moveLineV(bool param_0) {
     }
 }
 
-/* 80243DCC-80243EEC 23E70C 0120+00 2/2 0/0 0/0 .text            moveBaseLength__14dMsgScrnHowl_cFb
- */
 void dMsgScrnHowl_c::moveBaseLength(bool param_0) {
     if (param_0) {
         field_0x1990 = 0.0f;
@@ -982,7 +947,6 @@ void dMsgScrnHowl_c::moveBaseLength(bool param_0) {
     mpABase->move(dVar9 + mpABase->getInitPosX(), mpABase->getPosY());
 }
 
-/* 80243EEC-80243F58 23E82C 006C+00 2/2 0/0 0/0 .text            getOnLineNum__14dMsgScrnHowl_cFi */
 s8 dMsgScrnHowl_c::getOnLineNum(int param_0) {
     if (param_0 < 0) {
         return -1;
@@ -1000,7 +964,6 @@ s8 dMsgScrnHowl_c::getOnLineNum(int param_0) {
     return -1;
 }
 
-/* 80243F58-80243F7C 23E898 0024+00 2/2 0/0 0/0 .text            addCount__14dMsgScrnHowl_cFs */
 s16 dMsgScrnHowl_c::addCount(s16 param_0) {
     if (++param_0 >= field_0x2136) {
         param_0 -= field_0x2136;
@@ -1008,8 +971,6 @@ s16 dMsgScrnHowl_c::addCount(s16 param_0) {
     return param_0;
 }
 
-/* 80243F7C-80243F94 23E8BC 0018+00 2/2 0/0 0/0 .text            addCountGuide__14dMsgScrnHowl_cFs
- */
 s16 dMsgScrnHowl_c::addCountGuide(s16 param_0) {
     if (++param_0 >= 350) {
         param_0 -= 350;
@@ -1017,8 +978,6 @@ s16 dMsgScrnHowl_c::addCountGuide(s16 param_0) {
     return param_0;
 }
 
-/* 80243F94-80244108 23E8D4 0174+00 2/2 0/0 0/0 .text            getNowPlotPitch__14dMsgScrnHowl_cFf
- */
 f32 dMsgScrnHowl_c::getNowPlotPitch(f32 param_0) {
     if (param_0 < 0.0f) {
         param_0 *= -1.0f;
@@ -1027,7 +986,6 @@ f32 dMsgScrnHowl_c::getNowPlotPitch(f32 param_0) {
     return mpLineH[1]->getGlobalCenterPosY() + (param_0 * (mpLineH[2]->getGlobalCenterPosY() -  mpLineH[1]->getGlobalCenterPosY()));
 }
 
-/* 80244108-8024414C 23EA48 0044+00 2/2 0/0 0/0 .text            getPlotPitch__14dMsgScrnHowl_cFf */
 f32 dMsgScrnHowl_c::getPlotPitch(f32 param_0) {
     if (1.0f == param_0) {
         return field_0x1b08[0];
@@ -1041,16 +999,12 @@ f32 dMsgScrnHowl_c::getPlotPitch(f32 param_0) {
     return 0.0f;
 }
 
-/* 8024414C-802441FC 23EA8C 00B0+00 2/2 0/0 0/0 .text            calcPitchLevel__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::calcPitchLevel() {
     field_0x1b08[0] = mpLineH[0]->getGlobalCenterPosY();
     field_0x1b08[1] = mpLineH[1]->getGlobalCenterPosY();
     field_0x1b08[2] = mpLineH[2]->getGlobalCenterPosY();
 }
 
-/* 802441FC-80244304 23EB3C 0108+00 1/1 0/0 0/0 .text            initGuideData__14dMsgScrnHowl_cFv
- */
 void dMsgScrnHowl_c::initGuideData() {
     calcPitchLevel();
     for (int i = 0; i < 350; i++) {
@@ -1071,7 +1025,6 @@ void dMsgScrnHowl_c::initGuideData() {
     }
 }
 
-/* 80244304-8024438C 23EC44 0088+00 2/2 0/0 0/0 .text getGuideDataSize__14dMsgScrnHowl_cFv */
 u16 dMsgScrnHowl_c::getGuideDataSize() {
     u16 dataSize = field_0x2197;
     for (int i = 0; i < mCorrectLineMax; i++) {
@@ -1081,7 +1034,6 @@ u16 dMsgScrnHowl_c::getGuideDataSize() {
     return dataSize;
 }
 
-/* 8024438C-80244454 23ECCC 00C8+00 2/2 0/0 0/0 .text getGuideDataType__14dMsgScrnHowl_cFi */
 u8 dMsgScrnHowl_c::getGuideDataType(int param_0) {
     u16 uVar2 = field_0x2197;
     u16 uVar3 = field_0x2197;
diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp
index 8e29f2279a..4e16e8afd3 100644
--- a/src/d/d_msg_scrn_item.cpp
+++ b/src/d/d_msg_scrn_item.cpp
@@ -23,7 +23,6 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/JUTTexture.h"
 
-/* 8023E79C-8023F51C 2390DC 0D80+00 0/0 1/1 0/0 .text __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap */
 dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
     if (param_3 != NULL) {
         field_0x138 = param_3;
@@ -292,7 +291,6 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
 }
 
 
-/* 8023F51C-8023F888 239E5C 036C+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnItem_cFv */
 dMsgScrnItem_c::~dMsgScrnItem_c() {
     for (int i = 0; i < 3; i++) {
         if (mpItemTex[i] != NULL) {
@@ -347,7 +345,6 @@ dMsgScrnItem_c::~dMsgScrnItem_c() {
     dComIfGp_getMsgCommonArchive()->removeResourceAll();;
 }
 
-/* 8023F888-8023FB24 23A1C8 029C+00 1/0 0/0 0/0 .text            exec__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::exec() {
     f32 dVar12 = field_0x13c;
     if (!field_0x19d) {
@@ -397,7 +394,6 @@ void dMsgScrnItem_c::exec() {
     mpMg_c[1]->scale(g_MsgObject_HIO_c.mBoxItemTextSizeX, g_MsgObject_HIO_c.mBoxItemTextSizeY);
 }
 
-/* 8023FB24-8023FF30 23A464 040C+00 1/0 0/0 0/0 .text            drawSelf__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::drawSelf() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
@@ -491,68 +487,53 @@ void dMsgScrnItem_c::drawSelf() {
     }
 }
 
-/* 8023FF30-8023FF54 23A870 0024+00 1/0 0/0 0/0 .text            arwAnimeInit__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::arwAnimeInit() {
     mpArrow_c->arwAnimeInit();
 }
 
-/* 8023FF54-8023FF78 23A894 0024+00 1/0 0/0 0/0 .text            arwAnimeMove__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::arwAnimeMove() {
     mpArrow_c->arwAnimeMove();
 }
 
-/* 8023FF78-8023FF9C 23A8B8 0024+00 1/0 0/0 0/0 .text            dotAnimeInit__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::dotAnimeInit() {
     mpArrow_c->dotAnimeInit();
 }
 
-/* 8023FF9C-8023FFC0 23A8DC 0024+00 1/0 0/0 0/0 .text            dotAnimeMove__14dMsgScrnItem_cFv */
 void dMsgScrnItem_c::dotAnimeMove() {
     mpArrow_c->dotAnimeMove();
 }
 
-/* 8023FFC0-8023FFE4 23A900 0024+00 1/0 0/0 0/0 .text setSelectString__14dMsgScrnItem_cFPcPcPc */
 void dMsgScrnItem_c::setSelectString(char* param_0, char* param_1, char* param_2) {
     mpSelect_c->setString(param_0, param_1, param_2);
 }
 
-/* 8023FFE4-80240008 23A924 0024+00 1/0 0/0 0/0 .text setSelectRubyString__14dMsgScrnItem_cFPcPcPc
- */
 void dMsgScrnItem_c::setSelectRubyString(char* param_0, char* param_1, char* param_2) {
     mpSelect_c->setRubyString(param_0, param_1, param_2);
 }
 
-/* 80240008-8024002C 23A948 0024+00 1/0 0/0 0/0 .text            isSelect__14dMsgScrnItem_cFv */
 bool dMsgScrnItem_c::isSelect() {
     return mpSelect_c->isSelect();
 }
 
-/* 8024002C-8024005C 23A96C 0030+00 1/0 0/0 0/0 .text selectAnimeInit__14dMsgScrnItem_cFUcUcfUc */
 void dMsgScrnItem_c::selectAnimeInit(u8 param_0, u8 param_1, f32 param_2, u8 param_3) {
     mpSelect_c->selAnimeInit(param_0, param_1, field_0x19c, param_2, param_3);
 }
 
-/* 8024005C-80240080 23A99C 0024+00 1/0 0/0 0/0 .text selectAnimeMove__14dMsgScrnItem_cFUcUcb */
 bool dMsgScrnItem_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) {
     return mpSelect_c->selAnimeMove(param_0, param_1, param_2);
 }
 
-/* 80240080-802400A4 23A9C0 0024+00 1/0 0/0 0/0 .text            selectAnimeEnd__14dMsgScrnItem_cFv
- */
 bool dMsgScrnItem_c::selectAnimeEnd() {
     return mpSelect_c->selAnimeEnd();
 }
 
-/* 802400A4-802400A8 23A9E4 0004+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnItem_cFf */
 void dMsgScrnItem_c::fukiScale(f32 param_0) {
 }
 
-/* 802400A8-802400CC 23A9E8 0024+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnItem_cFff */
 void dMsgScrnItem_c::fukiTrans(f32 x, f32 y) {
     mpPmP_c->paneTrans(x, y);
 }
 
-/* 802400CC-80240174 23AA0C 00A8+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnItem_cFf */
 void dMsgScrnItem_c::fukiAlpha(f32 param_1) {
     field_0x13c = param_1;
     field_0x194 = param_1;
@@ -565,7 +546,6 @@ void dMsgScrnItem_c::fukiAlpha(f32 param_1) {
     }
 }
 
-/* 80240174-8024074C 23AAB4 05D8+00 1/0 0/0 0/0 .text            fukiPosCalc__14dMsgScrnItem_cFUc */
 void dMsgScrnItem_c::fukiPosCalc(u8 param_1) {
     msg_class* iVar6 = dMsgObject_c::getActor();
     if (mpPmP_c != NULL) {
@@ -658,26 +638,19 @@ void dMsgScrnItem_c::fukiPosCalc(u8 param_1) {
     }
 }
 
-/* 8024074C-802407E8 23B08C 009C+00 1/1 0/0 0/0 .text
- * setBtk0Animation__14dMsgScrnItem_cFP19J2DAnmTextureSRTKey    */
 void dMsgScrnItem_c::setBtk0Animation(J2DAnmTextureSRTKey* param_1) {
     mpScreen->search('gold00')->setAnimation(param_1);
     mpScreen->search('gold01')->setAnimation(param_1);
 }
 
-/* 802407E8-80240844 23B128 005C+00 1/1 0/0 0/0 .text
- * setBpk0Animation__14dMsgScrnItem_cFP11J2DAnmColor            */
 void dMsgScrnItem_c::setBpk0Animation(J2DAnmColor* param_0) {
     mpScreen->search('map0')->setAnimation(param_0);
 }
 
-/* 80240844-802408A4 23B184 0060+00 1/1 0/0 0/0 .text
- * setBpk1Animation__14dMsgScrnItem_cFP11J2DAnmColor            */
 void dMsgScrnItem_c::setBpk1Animation(J2DAnmColor* param_0) {
     mpScreen->search('moyou_1')->setAnimation(param_0);
 }
 
-/* 802408A4-8024096C 23B1E4 00C8+00 1/1 0/0 0/0 .text            isOugiID__14dMsgScrnItem_cFv */
 bool dMsgScrnItem_c::isOugiID() {
     switch(dMsgObject_getMessageID()) {
     case 0x17ed:
diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp
index 5991245e5b..0d921528e9 100644
--- a/src/d/d_msg_scrn_jimaku.cpp
+++ b/src/d/d_msg_scrn_jimaku.cpp
@@ -14,7 +14,6 @@
 #include "d/d_msg_scrn_light.h"
 #include "d/d_pane_class.h"
 
-/* 80244558-80244A74 23EE98 051C+00 0/0 1/1 0/0 .text __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap */
 dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
     if (i_heap != NULL) {
         heap = i_heap;
@@ -129,7 +128,6 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) {
     }
 }
 
-/* 80244A74-80244C2C 23F3B4 01B8+00 1/0 0/0 0/0 .text            __dt__16dMsgScrnJimaku_cFv */
 dMsgScrnJimaku_c::~dMsgScrnJimaku_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -160,7 +158,6 @@ dMsgScrnJimaku_c::~dMsgScrnJimaku_c() {
     dComIfGp_getMsgCommonArchive()->removeResourceAll();
 }
 
-/* 80244C2C-80244D34 23F56C 0108+00 1/0 0/0 0/0 .text            exec__16dMsgScrnJimaku_cFv */
 void dMsgScrnJimaku_c::exec() {
     if (isTalkNow()) {
         fukiAlpha(1.0f);
@@ -179,13 +176,11 @@ void dMsgScrnJimaku_c::exec() {
     }
 }
 
-/* 80244D34-80244D8C 23F674 0058+00 1/0 0/0 0/0 .text            drawSelf__16dMsgScrnJimaku_cFv */
 void dMsgScrnJimaku_c::drawSelf() {
     dComIfGp_getCurrentGrafPort()->setup2D();
     drawOutFont(0.0f, 0.0f, 1.0f);
 }
 
-/* 80244D8C-80244E2C 23F6CC 00A0+00 1/0 0/0 0/0 .text            fukiAlpha__16dMsgScrnJimaku_cFf */
 void dMsgScrnJimaku_c::fukiAlpha(f32 i_alpha) {
     mpPmP_c->setAlphaRate(i_alpha * g_MsgObject_HIO_c.mSubtitleAlphaP);
 
@@ -198,11 +193,8 @@ void dMsgScrnJimaku_c::fukiAlpha(f32 i_alpha) {
     }
 }
 
-/* 80244E2C-80244E30 23F76C 0004+00 1/0 0/0 0/0 .text            fukiScale__16dMsgScrnJimaku_cFf */
 void dMsgScrnJimaku_c::fukiScale(f32 i_scale) {}
 
-/* 80244E30-80244E34 23F770 0004+00 1/0 0/0 0/0 .text            fukiTrans__16dMsgScrnJimaku_cFff */
 void dMsgScrnJimaku_c::fukiTrans(f32 i_posX, f32 i_posY) {}
 
-/* 80244E34-80244E38 23F774 0004+00 1/0 0/0 0/0 .text            fontAlpha__16dMsgScrnJimaku_cFf */
 void dMsgScrnJimaku_c::fontAlpha(f32 i_alpha) {}
diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp
index 5c305efead..4a84e0f9e3 100644
--- a/src/d/d_msg_scrn_kanban.cpp
+++ b/src/d/d_msg_scrn_kanban.cpp
@@ -13,7 +13,6 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"
 
-/* 80244E38-8024534C 23F778 0514+00 0/0 1/1 0/0 .text __ct__16dMsgScrnKanban_cFP10JKRExpHeap */
 dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) {
     if (param_0 != NULL) {
         field_0xd4 = param_0;
@@ -129,7 +128,6 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) {
     OS_REPORT("remain ===> %d\n", uVar14 - field_0xd4->getTotalFreeSize());
 }
 
-/* 8024534C-80245528 23FC8C 01DC+00 1/0 0/0 0/0 .text            __dt__16dMsgScrnKanban_cFv */
 dMsgScrnKanban_c::~dMsgScrnKanban_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -161,7 +159,6 @@ dMsgScrnKanban_c::~dMsgScrnKanban_c() {
     dComIfGp_getMsgArchive(2)->removeResourceAll();
 }
 
-/* 80245528-80245618 23FE68 00F0+00 1/0 0/0 0/0 .text            exec__16dMsgScrnKanban_cFv */
 void dMsgScrnKanban_c::exec() {
     field_0xd8 += 1.0f;
     if (field_0xd8 >= field_0xd0->getFrameMax()) {
@@ -178,7 +175,6 @@ void dMsgScrnKanban_c::exec() {
     mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY);
 }
 
-/* 80245618-802456A0 23FF58 0088+00 1/0 0/0 0/0 .text            draw__16dMsgScrnKanban_cFv */
 void dMsgScrnKanban_c::draw() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
@@ -186,7 +182,6 @@ void dMsgScrnKanban_c::draw() {
     mpOutFont->draw(NULL, 0.0f, 0.0f, 1.0f);
 }
 
-/* 802456A0-80245754 23FFE0 00B4+00 1/0 0/0 0/0 .text            fukiAlpha__16dMsgScrnKanban_cFf */
 void dMsgScrnKanban_c::fukiAlpha(f32 param_0) {
     mpBack_c->setAlphaRate(param_0);
     mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxStoneAlphaP);
@@ -199,8 +194,6 @@ void dMsgScrnKanban_c::fukiAlpha(f32 param_0) {
         }
     }
 }
-/* 80245754-80245758 240094 0004+00 1/0 0/0 0/0 .text            fukiScale__16dMsgScrnKanban_cFf */
 void dMsgScrnKanban_c::fukiScale(f32 param_0) {}
 
-/* 80245758-8024575C 240098 0004+00 1/0 0/0 0/0 .text            fukiTrans__16dMsgScrnKanban_cFff */
 void dMsgScrnKanban_c::fukiTrans(f32 param_0, f32 param_1) {}
diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp
index 4c64f0e123..baa99036b5 100644
--- a/src/d/d_msg_scrn_light.cpp
+++ b/src/d/d_msg_scrn_light.cpp
@@ -9,9 +9,9 @@
 
 class dMsgScrnLight_HIO_c {
 public:
-    /* 8024575C */ dMsgScrnLight_HIO_c();
-    /* 802457C4 */ void updateColor(u8);
-    /* 80246348 */ virtual ~dMsgScrnLight_HIO_c() {}
+    dMsgScrnLight_HIO_c();
+    void updateColor(u8);
+    virtual ~dMsgScrnLight_HIO_c() {}
 
     enum {
         COLOR_DEFAULT_e,
@@ -38,7 +38,6 @@ public:
     /* 0x45 */ u8 mWhiteA[COLOR_MAX_e];
 };
 
-/* 8024575C-802457C4 24009C 0068+00 1/1 0/0 0/0 .text            __ct__19dMsgScrnLight_HIO_cFv */
 dMsgScrnLight_HIO_c::dMsgScrnLight_HIO_c() {
     mDebugON = false;
 
@@ -55,7 +54,6 @@ dMsgScrnLight_HIO_c::dMsgScrnLight_HIO_c() {
     }
 }
 
-/* 802457C4-80245934 240104 0170+00 1/1 0/0 0/0 .text updateColor__19dMsgScrnLight_HIO_cFUc */
 void dMsgScrnLight_HIO_c::updateColor(u8 i_colorType) {
     switch (i_colorType) {
     case 0:
@@ -113,12 +111,10 @@ void dMsgScrnLight_HIO_c::updateColor(u8 i_colorType) {
     }
 }
 
-/* 804306D4-80430728 05D3F4 0050+04 3/3 0/0 0/0 .bss             g_MsgScrnLight_HIO_c */
 static dMsgScrnLight_HIO_c g_MsgScrnLight_HIO_c;
 
 static u8 l_lightCount;
 
-/* 80245934-80245B00 240274 01CC+00 0/0 4/4 1/1 .text            __ct__15dMsgScrnLight_cFUcUc */
 dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) {
     mColorType = i_colorType;
     field_0x21 = param_1;
@@ -156,7 +152,6 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) {
     mAlpha = 0.0f;
 }
 
-/* 80245B00-80245C04 240440 0104+00 1/0 0/0 0/0 .text            __dt__15dMsgScrnLight_cFv */
 dMsgScrnLight_c::~dMsgScrnLight_c() {
     l_lightCount--;
 
@@ -173,8 +168,6 @@ dMsgScrnLight_c::~dMsgScrnLight_c() {
     mpParent_c = NULL;
 }
 
-/* 80245C04-80245F90 240544 038C+00 0/0 2/2 0/0 .text            draw__15dMsgScrnLight_cFPffffffUc
- */
 void dMsgScrnLight_c::draw(f32* i_anmFrame, f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_scaleY,
                            f32 i_alpha, u8 i_colorType) {
     if (g_MsgScrnLight_HIO_c.mDebugON) {
@@ -221,8 +214,6 @@ void dMsgScrnLight_c::draw(f32* i_anmFrame, f32 i_posX, f32 i_posY, f32 i_scaleX
     drawCommon(i_posX, i_posY, i_scaleX, i_scaleY, i_alpha);
 }
 
-/* 80245F90-802460DC 2408D0 014C+00 0/0 1/1 1/1 .text
- * draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor */
 void dMsgScrnLight_c::draw(f32* i_anmFrame, f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_scaleY,
                            f32 i_alpha, f32 i_anmRate, JUtility::TColor i_black,
                            JUtility::TColor i_white) {
@@ -242,8 +233,6 @@ void dMsgScrnLight_c::draw(f32* i_anmFrame, f32 i_posX, f32 i_posY, f32 i_scaleX
     drawCommon(i_posX, i_posY, i_scaleX, i_scaleY, i_alpha);
 }
 
-/* 802460DC-80246348 240A1C 026C+00 2/2 0/0 0/0 .text            drawCommon__15dMsgScrnLight_cFfffff
- */
 void dMsgScrnLight_c::drawCommon(f32 i_posX, f32 i_posY, f32 i_scaleX, f32 i_scaleY, f32 i_alpha) {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp
index f8adc8e044..dc2a337f8a 100644
--- a/src/d/d_msg_scrn_place.cpp
+++ b/src/d/d_msg_scrn_place.cpp
@@ -12,7 +12,6 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-/* 802463CC-802467C4 240D0C 03F8+00 0/0 1/1 0/0 .text            __ct__15dMsgScrnPlace_cFv */
 dMsgScrnPlace_c::dMsgScrnPlace_c() {
     static u64 t_tag[7] = {
         'sfontb0', 'sfontb1', 'sfontb2', 'sfontl0', 'sfontl1', 'sfontl2', 'sfont00',
@@ -76,7 +75,6 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() {
     mTextBoxPosY = mpTm_c[0]->getGlobalPosY();
 }
 
-/* 802467C4-80246924 241104 0160+00 1/0 0/0 0/0 .text            __dt__15dMsgScrnPlace_cFv */
 dMsgScrnPlace_c::~dMsgScrnPlace_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -98,7 +96,6 @@ dMsgScrnPlace_c::~dMsgScrnPlace_c() {
     dComIfGp_getMsgArchive(4)->removeResourceAll();
 }
 
-/* 80246924-80246A44 241264 0120+00 1/0 0/0 0/0 .text            exec__15dMsgScrnPlace_cFv */
 void dMsgScrnPlace_c::exec() {
     mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
 
@@ -117,14 +114,12 @@ void dMsgScrnPlace_c::exec() {
     }
 }
 
-/* 80246A44-80246A9C 241384 0058+00 1/0 0/0 0/0 .text            drawSelf__15dMsgScrnPlace_cFv */
 void dMsgScrnPlace_c::drawSelf() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
     drawOutFont(0.0f, 0.0f, 1.0f);
 }
 
-/* 80246A9C-80246B28 2413DC 008C+00 1/0 0/0 0/0 .text            fukiAlpha__15dMsgScrnPlace_cFf */
 void dMsgScrnPlace_c::fukiAlpha(f32 i_rate) {
     mpPmP_c->setAlphaRate(i_rate);
     mpBaseParent->setAlphaRate(i_rate * g_MsgObject_HIO_c.mStageTitleBaseAlpha);
@@ -134,11 +129,8 @@ void dMsgScrnPlace_c::fukiAlpha(f32 i_rate) {
     }
 }
 
-/* 80246B28-80246B2C 241468 0004+00 1/0 0/0 0/0 .text            fukiScale__15dMsgScrnPlace_cFf */
 void dMsgScrnPlace_c::fukiScale(f32) {}
 
-/* 80246B2C-80246B30 24146C 0004+00 1/0 0/0 0/0 .text            fukiTrans__15dMsgScrnPlace_cFff */
 void dMsgScrnPlace_c::fukiTrans(f32, f32) {}
 
-/* 80246B30-80246B34 241470 0004+00 1/0 0/0 0/0 .text            fontAlpha__15dMsgScrnPlace_cFf */
 void dMsgScrnPlace_c::fontAlpha(f32) {}
diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp
index 9ea453adda..aeeae95c0d 100644
--- a/src/d/d_msg_scrn_staff.cpp
+++ b/src/d/d_msg_scrn_staff.cpp
@@ -11,12 +11,10 @@
 #include "d/d_msg_object.h"
 #include "d/d_pane_class.h"
 
-/* 803C1340-803C1370 01E460 0030+00 1/1 0/0 0/0 .data            t_tag$3752 */
 static u64 t_tag[6] = {
     'right_s', 'right', 'center_s', 'center', 'left_s', 'left',
 };
 
-/* 80246B34-80246DD8 241474 02A4+00 0/0 1/1 0/0 .text            __ct__15dMsgScrnStaff_cFUc */
 dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
     init();
 
@@ -53,7 +51,6 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) {
     mTextBoxPosY = mpTm_c[0]->getGlobalPosY();
 }
 
-/* 80246DD8-80246EE8 241718 0110+00 1/0 0/0 0/0 .text            __dt__15dMsgScrnStaff_cFv */
 dMsgScrnStaff_c::~dMsgScrnStaff_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -69,7 +66,6 @@ dMsgScrnStaff_c::~dMsgScrnStaff_c() {
     dComIfGp_getMsgArchive(6)->removeResourceAll();
 }
 
-/* 80246EE8-80246F68 241828 0080+00 1/0 0/0 0/0 .text            exec__15dMsgScrnStaff_cFv */
 void dMsgScrnStaff_c::exec() {
     mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY);
     if (isTalkNow()) {
@@ -77,23 +73,18 @@ void dMsgScrnStaff_c::exec() {
     }
 }
 
-/* 80246F68-80246FC0 2418A8 0058+00 1/0 0/0 0/0 .text            drawSelf__15dMsgScrnStaff_cFv */
 void dMsgScrnStaff_c::drawSelf() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
     drawOutFont(0.0f, 0.0f, 1.0f);
 }
 
-/* 80246FC0-80246FE4 241900 0024+00 1/0 0/0 0/0 .text            fukiAlpha__15dMsgScrnStaff_cFf */
 void dMsgScrnStaff_c::fukiAlpha(f32 i_rate) {
     mpPmP_c->setAlphaRate(i_rate);
 }
 
-/* 80246FE4-80246FE8 241924 0004+00 1/0 0/0 0/0 .text            fukiScale__15dMsgScrnStaff_cFf */
 void dMsgScrnStaff_c::fukiScale(f32 param_0) {}
 
-/* 80246FE8-80246FEC 241928 0004+00 1/0 0/0 0/0 .text            fukiTrans__15dMsgScrnStaff_cFff */
 void dMsgScrnStaff_c::fukiTrans(f32 param_0, f32 param_1) {}
 
-/* 80246FEC-80246FF0 24192C 0004+00 1/0 0/0 0/0 .text            fontAlpha__15dMsgScrnStaff_cFf */
 void dMsgScrnStaff_c::fontAlpha(f32 param_0) {}
diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp
index cd9f5131cd..d45b67c219 100644
--- a/src/d/d_msg_scrn_talk.cpp
+++ b/src/d/d_msg_scrn_talk.cpp
@@ -19,7 +19,6 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 
-/* 80246FF0-80247A90 241930 0AA0+00 0/0 1/1 0/0 .text __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap */
 dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
     if (param_3 != NULL) {
         field_0xe4 = param_3;
@@ -244,7 +243,6 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) {
     }
 }
 
-/* 80247A90-80247D34 2423D0 02A4+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnTalk_cFv */
 dMsgScrnTalk_c::~dMsgScrnTalk_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -285,7 +283,6 @@ dMsgScrnTalk_c::~dMsgScrnTalk_c() {
     dComIfGp_getMsgCommonArchive()->removeResourceAll();
 }
 
-/* 80247D34-80247E4C 242674 0118+00 1/0 0/0 0/0 .text            exec__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::exec() {
     if (isTalkNow()) {
         fukiAlpha(1.0f);
@@ -304,7 +301,6 @@ void dMsgScrnTalk_c::exec() {
     }
 }
 
-/* 80247E4C-802480F0 24278C 02A4+00 1/0 0/0 0/0 .text            drawSelf__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::drawSelf() {
     J2DGrafContext* grafContext[1];
     grafContext[0] = dComIfGp_getCurrentGrafPort();
@@ -361,42 +357,34 @@ void dMsgScrnTalk_c::drawSelf() {
     mpArrow_c->draw();
 }
 
-/* 802480F0-80248114 242A30 0024+00 1/0 0/0 0/0 .text            arwAnimeInit__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::arwAnimeInit() {
     mpArrow_c->arwAnimeInit();
 }
 
-/* 80248114-80248138 242A54 0024+00 1/0 0/0 0/0 .text            arwAnimeMove__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::arwAnimeMove() {
     mpArrow_c->arwAnimeMove();
 }
 
-/* 80248138-8024815C 242A78 0024+00 1/0 0/0 0/0 .text            dotAnimeInit__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::dotAnimeInit() {
     mpArrow_c->dotAnimeInit();
 }
 
-/* 8024815C-80248180 242A9C 0024+00 1/0 0/0 0/0 .text            dotAnimeMove__14dMsgScrnTalk_cFv */
 void dMsgScrnTalk_c::dotAnimeMove() {
     mpArrow_c->dotAnimeMove();
 }
 
-/* 80248180-802481AC 242AC0 002C+00 1/0 0/0 0/0 .text setSelectString__14dMsgScrnTalk_cFPcPcPc */
 void dMsgScrnTalk_c::setSelectString(char* param_0, char* param_1, char* param_2) {
     if (mpSelect_c != NULL) {
         mpSelect_c->setString(param_0, param_1, param_2);
     }
 }
 
-/* 802481AC-802481D8 242AEC 002C+00 1/0 0/0 0/0 .text setSelectRubyString__14dMsgScrnTalk_cFPcPcPc
- */
 void dMsgScrnTalk_c::setSelectRubyString(char* param_0, char* param_1, char* param_2) {
     if (mpSelect_c != NULL) {
         mpSelect_c->setRubyString(param_0, param_1, param_2);
     }
 }
 
-/* 802481D8-8024820C 242B18 0034+00 1/0 0/0 0/0 .text            isSelect__14dMsgScrnTalk_cFv */
 bool dMsgScrnTalk_c::isSelect() {
     if (mpSelect_c != NULL) {
         return mpSelect_c->isSelect();
@@ -404,14 +392,12 @@ bool dMsgScrnTalk_c::isSelect() {
     return false;
 }
 
-/* 8024820C-80248244 242B4C 0038+00 1/0 0/0 0/0 .text selectAnimeInit__14dMsgScrnTalk_cFUcUcfUc */
 void dMsgScrnTalk_c::selectAnimeInit(u8 param_0, u8 param_1, f32 param_2, u8 param_3) {
     if (mpSelect_c != NULL) {
         mpSelect_c->selAnimeInit(param_0, param_1, field_0x488, param_2, param_3);
     }
 }
 
-/* 80248244-80248278 242B84 0034+00 1/0 0/0 0/0 .text selectAnimeMove__14dMsgScrnTalk_cFUcUcb */
 bool dMsgScrnTalk_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) {
     if (mpSelect_c != NULL) {
         return mpSelect_c->selAnimeMove(param_0, param_1, param_2);
@@ -419,8 +405,6 @@ bool dMsgScrnTalk_c::selectAnimeMove(u8 param_0, u8 param_1, bool param_2) {
     return false;
 }
 
-/* 80248278-802482AC 242BB8 0034+00 1/0 0/0 0/0 .text            selectAnimeEnd__14dMsgScrnTalk_cFv
- */
 bool dMsgScrnTalk_c::selectAnimeEnd() {
     if (mpSelect_c != NULL) {
         return mpSelect_c->selAnimeEnd();
@@ -428,15 +412,12 @@ bool dMsgScrnTalk_c::selectAnimeEnd() {
     return false;
 }
 
-/* 802482AC-802482B0 242BEC 0004+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnTalk_cFf */
 void dMsgScrnTalk_c::fukiScale(f32 param_0) {
 }
 
-/* 802482B0-802482B4 242BF0 0004+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnTalk_cFff */
 void dMsgScrnTalk_c::fukiTrans(f32 param_0, f32 param_1) {
 }
 
-/* 802482B4-8024835C 242BF4 00A8+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnTalk_cFf */
 void dMsgScrnTalk_c::fukiAlpha(f32 param_1) {
     mpPmP_c->setAlphaRate(param_1 * g_MsgObject_HIO_c.mBoxTalkAlphaP);
     for (int i = 0; i < 6; i = i + 1) {
@@ -449,7 +430,6 @@ void dMsgScrnTalk_c::fukiAlpha(f32 param_1) {
     }
 }
 
-/* 8024835C-80248954 242C9C 05F8+00 1/0 0/0 0/0 .text            fukiPosCalc__14dMsgScrnTalk_cFUc */
 void dMsgScrnTalk_c::fukiPosCalc(u8 param_1) {
     msg_class* msgActor = dMsgObject_c::getActor();
     if (mpPmP_c != 0) {
diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp
index d0f56782a2..15403b83b9 100644
--- a/src/d/d_msg_scrn_tree.cpp
+++ b/src/d/d_msg_scrn_tree.cpp
@@ -9,8 +9,6 @@
 #include "d/d_msg_out_font.h"
 #include "d/d_pane_class.h"
 
-/* 80248954-80248F14 243294 05C0+00 0/0 1/1 0/0 .text
- * __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap                */
 dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
     if (param_1 != NULL) {
         field_0xd8 = param_1;
@@ -133,7 +131,6 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) {
     }
 }
 
-/* 80248F14-80249118 243854 0204+00 1/0 0/0 0/0 .text            __dt__14dMsgScrnTree_cFv */
 dMsgScrnTree_c::~dMsgScrnTree_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -169,7 +166,6 @@ dMsgScrnTree_c::~dMsgScrnTree_c() {
     dComIfGp_getMsgArchive(2)->removeResourceAll();
 }
 
-/* 80249118-80249270 243A58 0158+00 1/0 0/0 0/0 .text            exec__14dMsgScrnTree_cFv */
 void dMsgScrnTree_c::exec() {
     field_0xdc += 1.0f;
     if (field_0xdc >= field_0xd0->getFrameMax()) {
@@ -190,7 +186,6 @@ void dMsgScrnTree_c::exec() {
     mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY);
 }
 
-/* 80249270-802492F8 243BB0 0088+00 1/0 0/0 0/0 .text            draw__14dMsgScrnTree_cFv */
 void dMsgScrnTree_c::draw() {
     J2DGrafContext* grafContext = dComIfGp_getCurrentGrafPort();
     grafContext->setup2D();
@@ -198,7 +193,6 @@ void dMsgScrnTree_c::draw() {
     mpOutFont->draw(NULL, 0.0f, 0.0f, 1.0f);
 }
 
-/* 802492F8-802493AC 243C38 00B4+00 1/0 0/0 0/0 .text            fukiAlpha__14dMsgScrnTree_cFf */
 void dMsgScrnTree_c::fukiAlpha(f32 param_0) {
     field_0xc4->setAlphaRate(param_0);
     mpPmP_c->setAlphaRate(param_0 * g_MsgObject_HIO_c.mBoxWoodAlphaP);
@@ -212,8 +206,6 @@ void dMsgScrnTree_c::fukiAlpha(f32 param_0) {
     }
 }
 
-/* 802493AC-802493B0 243CEC 0004+00 1/0 0/0 0/0 .text            fukiScale__14dMsgScrnTree_cFf */
 void dMsgScrnTree_c::fukiScale(f32 param_0) {}
 
-/* 802493B0-802493B4 243CF0 0004+00 1/0 0/0 0/0 .text            fukiTrans__14dMsgScrnTree_cFff */
 void dMsgScrnTree_c::fukiTrans(f32 param_0, f32 param_1) {}
diff --git a/src/d/d_msg_string.cpp b/src/d/d_msg_string.cpp
index e9182b8195..8d4e29dd40 100644
--- a/src/d/d_msg_string.cpp
+++ b/src/d/d_msg_string.cpp
@@ -1,16 +1,9 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_msg_string
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_msg_string.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/d_msg_out_font.h"
-#include "dol2asm.h"
 
-/* 80249C20-80249CA0 244560 0080+00 0/0 15/15 0/0 .text            __ct__12dMsgString_cFv */
 dMsgString_c::dMsgString_c() {
     field_0x28 = 0;
     mpOutFont = new COutFont_c(field_0x28);
@@ -18,7 +11,6 @@ dMsgString_c::dMsgString_c() {
     getResource();
 }
 
-/* 80249CA0-80249D28 2445E0 0088+00 0/0 1/1 0/0 .text            __ct__12dMsgString_cFUc */
 dMsgString_c::dMsgString_c(u8 param_0) {
     field_0x28 = param_0;
     mpOutFont = new COutFont_c(field_0x28);
@@ -26,20 +18,15 @@ dMsgString_c::dMsgString_c(u8 param_0) {
     getResource();
 }
 
-/* 80249D28-80249DB4 244668 008C+00 0/0 17/17 0/0 .text            __dt__12dMsgString_cFv */
 dMsgString_c::~dMsgString_c() {
     delete mpOutFont;
     mpOutFont = NULL;
 }
 
-/* 80249DB4-80249DE4 2446F4 0030+00 1/0 0/0 0/0 .text
- * resetStringLocal__12dMsgString_cFP10J2DTextBox               */
 void dMsgString_c::resetStringLocal(J2DTextBox* p_textBox) {
     mpOutFont->reset(p_textBox);
 }
 
-/* 80249DE4-80249ED0 244724 00EC+00 1/0 0/0 0/0 .text
- * drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf              */
 void dMsgString_c::drawOutFontLocal(J2DTextBox* p_textBox, f32 i_alpha) {
     Vec pos = p_textBox->getGlbVtx(0);
     f32 y = pos.y;
@@ -52,8 +39,6 @@ void dMsgString_c::drawOutFontLocal(J2DTextBox* p_textBox, f32 i_alpha) {
     mpOutFont->draw(p_textBox, pos.x, y, 1.0f);
 }
 
-/* 80249ED0-80249F00 244810 0030+00 1/0 0/0 0/0 .text
- * drawFontLocal__12dMsgString_cFP10J2DTextBoxUcffffUlUc        */
 void dMsgString_c::drawFontLocal(J2DTextBox* p_textBox, u8 type, f32 posX, f32 posY,
                               f32 sizeX, f32 sizeY, u32 color, u8 alpha) {
     mpOutFont->drawFont(p_textBox, type, posX, posY, sizeX, sizeY, color, alpha);
diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp
index cd1a506ab1..531f543144 100644
--- a/src/d/d_msg_string_base.cpp
+++ b/src/d/d_msg_string_base.cpp
@@ -11,7 +11,6 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 
-/* 802493B4-80249528 243CF4 0174+00 0/0 2/2 0/0 .text            __ct__16dMsgStringBase_cFv */
 dMsgStringBase_c::dMsgStringBase_c() {
     field_0x20 = 0;
     getResource();
@@ -35,7 +34,6 @@ dMsgStringBase_c::dMsgStringBase_c() {
     mpCtrl->resetResourceCache();
 }
 
-/* 80249528-80249700 243E68 01D8+00 0/0 1/1 0/0 .text            __dt__16dMsgStringBase_cFv */
 dMsgStringBase_c::~dMsgStringBase_c() {
     mpResCont->destroyResource_all();
     delete mpResCont;
@@ -57,8 +55,6 @@ dMsgStringBase_c::~dMsgStringBase_c() {
     }
 }
 
-/* 80249700-80249768 244040 0068+00 1/1 2/2 0/0 .text            getResource__16dMsgStringBase_cFv
- */
 void dMsgStringBase_c::getResource() {
     field_0x1c = dMeter2Info_getMsgResource();
     if (field_0x1c == NULL) {
@@ -66,8 +62,6 @@ void dMsgStringBase_c::getResource() {
     }
 }
 
-/* 80249768-802498D8 2440A8 0170+00 1/1 1/1 0/0 .text
- * getStringLocal__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */
 f32 dMsgStringBase_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBox* param_3,
                                           JUTFont* param_4, COutFont_c* param_5, u8 param_6) {
     if (dMeter2Info_getMsgResource() != NULL) {
@@ -125,7 +119,6 @@ f32 dMsgStringBase_c::getStringPageLocal(u32 param_1, u8 param_2, u8 param_3,
     return 0.0f;
 }
 
-/* 80249A48-80249A70 244388 0028+00 0/0 1/1 0/0 .text            getPageMax__16dMsgStringBase_cFi */
 u8 dMsgStringBase_c::getPageMax(int param_0) {
     s16 lineCount = mpRefer->getLineCount();
     u8 pageMax = (lineCount / param_0) & 0xff;
@@ -135,7 +128,6 @@ u8 dMsgStringBase_c::getPageMax(int param_0) {
     return pageMax;
 }
 
-/* 80249A70-80249BAC 2443B0 013C+00 1/1 0/0 0/0 .text getMessageLocal__16dMsgStringBase_cFUlPc */
 f32 dMsgStringBase_c::getMessageLocal(u32 param_1, char* param_2) {
     if (dMeter2Info_getMsgResource() != NULL) {
         if (param_1 > 5000) {
@@ -160,43 +152,29 @@ f32 dMsgStringBase_c::getMessageLocal(u32 param_1, char* param_2) {
     return 0.0f;
 }
 
-/* 80249BAC-80249BB0 2444EC 0004+00 1/0 0/0 0/0 .text
- * drawFontLocal__16dMsgStringBase_cFP10J2DTextBoxUcffffUlUc    */
 void dMsgStringBase_c::drawFontLocal(J2DTextBox* param_0, u8 param_1, f32 param_2, f32 param_3,
                                      f32 param_4, f32 param_5, u32 param_6, u8 param_7) {
 }
 
-/* 80249BB0-80249BD0 2444F0 0020+00 1/0 0/0 0/0 .text
- * getString__16dMsgStringBase_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */
 f32 dMsgStringBase_c::getString(u32 param_0, J2DTextBox* param_1, J2DTextBox* param_2,
                                      JUTFont* param_3, COutFont_c* param_4, u8 param_5) {
     return getStringLocal(param_0, param_1, param_2, param_3, param_4, param_5);
 }
 
-/* 80249BD0-80249BF8 244510 0028+00 1/0 0/0 0/0 .text
- * getStringPage__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc */
 f32 dMsgStringBase_c::getStringPage(u32 param_0, u8 param_1, u8 param_2, J2DTextBox* param_3,
                                          J2DTextBox* param_4, JUTFont* param_5, COutFont_c* param_6,
                                          u8 param_7) {
     return getStringPageLocal(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7);
 }
 
-/* 80249BF8-80249C18 244538 0020+00 1/0 1/0 0/0 .text            getMessage__16dMsgStringBase_cFUlPc
- */
 f32 dMsgStringBase_c::getMessage(u32 param_0, char* param_1) {
     return getMessageLocal(param_0, param_1);
 }
 
-/* 80249C18-80249C1C 244558 0004+00 1/0 0/0 0/0 .text
- * resetStringLocal__16dMsgStringBase_cFP10J2DTextBox           */
 void dMsgStringBase_c::resetStringLocal(J2DTextBox* param_0) {
 }
 
-/* 80249C1C-80249C20 24455C 0004+00 1/0 0/0 0/0 .text
- * drawOutFontLocal__16dMsgStringBase_cFP10J2DTextBoxf          */
 void dMsgStringBase_c::drawOutFontLocal(J2DTextBox* param_0, f32 param_1) {
 }
 
-/* ############################################################################################## */
-/* 80399CA3-80399CB0 026303 0008+05 0/0 0/0 0/0 .rodata          None */
 static char const* const stringBase_80399CA3 = "\x1B" "CR[%d]";
diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp
index 9708ad3316..5fb9236417 100644
--- a/src/d/d_msg_unit.cpp
+++ b/src/d/d_msg_unit.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_msg_unit
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_msg_unit.h"
@@ -41,13 +36,10 @@ typedef struct dMsgUnit_inf1_section_t {
     /* 0x0E */ dMsgUnit_inf1_entry entries[0];
 } dMsgUnit_inf1_section_t;
 
-/* 80238C94-80238CA4 2335D4 0010+00 1/1 0/0 0/0 .text            __ct__10dMsgUnit_cFv */
 dMsgUnit_c::dMsgUnit_c() {}
 
-/* 80238CA4-80238CEC 2335E4 0048+00 2/1 0/0 0/0 .text            __dt__10dMsgUnit_cFv */
 dMsgUnit_c::~dMsgUnit_c() {}
 
-/* 80238CEC-8023907C 23362C 0390+00 0/0 5/5 0/0 .text            setTag__10dMsgUnit_cFiiPcb */
 // NONMATCHING - regalloc
 #if REGION_JPN
 void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) {
@@ -364,5 +356,4 @@ void dMsgUnit_c::setTag(int i_type, int i_value, char* o_buffer, bool param_4) {
 }
 #endif
 
-/* 804510D0-804510D8 0005D0 0004+04 1/1 5/5 0/0 .sbss            g_msg_unit */
 dMsgUnit_c g_msg_unit;
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 74b8a49dec..7eaac1851b 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -1,22 +1,15 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_name
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_name.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_lib.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "stdio.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "f_op/f_op_msg_mng.h"
 
-/* 803C1F5C-803C2060 -00001 0104+00 0/3 0/0 0/0 .data            l_mojiHira */
 static const char* l_mojiHira[65] = {
     "あ", "い", "う", "え", "お", "か", "き", "く", "け", "こ", "さ", "し", "す",
     "せ", "そ", "た", "ち", "つ", "て", "と", "な", "に", "ぬ", "ね", "の", "は",
@@ -25,7 +18,6 @@ static const char* l_mojiHira[65] = {
     "ぅ", "ぇ", "ぉ", "ゃ", "　", "ゅ", "　", "ょ", "っ", "　", "ー", "゛", "゜",
 };
 
-/* 803C2060-803C2164 -00001 0104+00 0/1 0/0 0/0 .data            l_mojiHira2 */
 static const char* l_mojiHira2[65] = {
     "￥", "￥", "￥", "￥", "￥", "が", "ぎ", "ぐ", "げ", "ご", "ざ", "じ", "ず",
     "ぜ", "ぞ", "だ", "ぢ", "づ", "で", "ど", "￥", "￥", "￥", "￥", "￥", "ば",
@@ -34,7 +26,6 @@ static const char* l_mojiHira2[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2164-803C2268 -00001 0104+00 0/1 0/0 0/0 .data            l_mojiHira3 */
 static const char* l_mojiHira3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "ぱ",
@@ -43,7 +34,6 @@ static const char* l_mojiHira3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2268-803C236C -00001 0104+00 0/3 0/0 0/0 .data            l_mojikata */
 static const char* l_mojikata[65] = {
     "ア", "イ", "ウ", "エ", "オ", "カ", "キ", "ク", "ケ", "コ", "サ", "シ", "ス",
     "セ", "ソ", "タ", "チ", "ツ", "テ", "ト", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ",
@@ -52,7 +42,6 @@ static const char* l_mojikata[65] = {
     "ゥ", "ェ", "ォ", "ャ", "　", "ュ", "　", "ョ", "ッ", "　", "ー", "゛", "゜",
 };
 
-/* 803C236C-803C2470 -00001 0104+00 0/1 0/0 0/0 .data            l_mojikata2 */
 static const char* l_mojikata2[65] = {
     "￥", "￥", "ヴ", "￥", "￥", "ガ", "ギ", "グ", "ゲ", "ゴ", "ザ", "ジ", "ズ",
     "ゼ", "ゾ", "ダ", "ヂ", "ヅ", "デ", "ド", "￥", "￥", "￥", "￥", "￥", "バ",
@@ -61,7 +50,6 @@ static const char* l_mojikata2[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2470-803C2574 -00001 0104+00 0/1 0/0 0/0 .data            l_mojikata3 */
 static const char* l_mojikata3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "パ",
@@ -70,7 +58,6 @@ static const char* l_mojikata3[65] = {
     "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥", "￥",
 };
 
-/* 803C2574-803C2678 -00001 0104+00 0/3 0/0 0/0 .data            l_mojiEisu */
 static const char* l_mojiEisu[65] = {
     "A", "N", "a", "n", "1", "B", "O", "b", "o", "2", "C", "P", "c", "p", "3", "D", "Q",
     "d", "q", "4", "E", "R", "e", "r", "5", "F", "S", "f", "s", "6", "G", "T", "g", "t",
@@ -94,31 +81,27 @@ static char* l_mojiEisuPal_2[65] = {
 };
 #endif
 
-/* 80430734-80430748 05D454 0014+00 9/9 0/0 0/0 .bss             g_nmHIO */
 static dNm_HIO_c g_nmHIO;
 
-/* 803C26E4-803C2750 01F804 006C+00 1/2 0/0 0/0 .data            SelProc */
 typedef void (dName_c::*selProcFunc)(void);
-SECTION_DATA static selProcFunc SelProc[9] = {
+static selProcFunc SelProc[9] = {
     &dName_c::MojiSelect,     &dName_c::MojiSelectAnm,  &dName_c::MojiSelectAnm2,
     &dName_c::MojiSelectAnm3, &dName_c::MenuSelect,     &dName_c::MenuSelectAnm,
-    &dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait};
+    &dName_c::MenuSelectAnm2, &dName_c::MenuSelectAnm3, &dName_c::Wait
+};
 
-/* 8024E3E0-8024E408 248D20 0028+00 1/1 0/0 0/0 .text            __ct__9dNm_HIO_cFv */
 dNm_HIO_c::dNm_HIO_c() {
     mMenuScale = 1.3f;
     mSelCharScale = 1.4f;
     field_0x10 = 10;
 }
 
-/* 8024E408-8024E468 248D48 0060+00 0/0 1/1 0/0 .text            __ct__7dName_cFP7J2DPane */
 dName_c::dName_c(J2DPane* pane) {
     nameIn.field_0xc = pane;
     _create();
     init();
 }
 
-/* 8024E468-8024E62C 248DA8 01C4+00 1/0 0/0 0/0 .text            __dt__7dName_cFv */
 dName_c::~dName_c() {
     delete stick;
     delete nameIn.NameInScr;
@@ -144,7 +127,6 @@ dName_c::~dName_c() {
     archive->removeResourceAll();
 }
 
-/* 8024E62C-8024E6D4 248F6C 00A8+00 1/1 0/0 0/0 .text            _create__7dName_cFv */
 void dName_c::_create() {
     stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800);
     stick->setFirstWaitTime(5);
@@ -157,7 +139,6 @@ void dName_c::_create() {
     displayInit();
 }
 
-/* 8024E6D4-8024E7A4 249014 00D0+00 1/1 0/0 0/0 .text            init__7dName_cFv */
 void dName_c::init() {
     mCurPos = 0;
     mLastCurPos = 0;
@@ -197,7 +178,6 @@ void dName_c::init() {
     mojiListChange();
 }
 
-/* 8024E7A4-8024E7EC 2490E4 0048+00 0/0 4/4 0/0 .text            initial__7dName_cFv */
 void dName_c::initial() {
     displayInit();
 
@@ -218,7 +198,6 @@ void dName_c::initial() {
     #endif
 }
 
-/* 8024E7EC-8024E9A0 24912C 01B4+00 0/0 2/2 0/0 .text            showIcon__7dName_cFv */
 void dName_c::showIcon() {
     Vec pos;
 
@@ -246,7 +225,6 @@ void dName_c::showIcon() {
     }
 }
 
-/* 8024E9A0-8024EC10 2492E0 0270+00 0/0 2/2 0/0 .text            _move__7dName_cFv */
 void dName_c::_move() {
     stick->checkTrigger();
     (this->*SelProc[mSelProc])();
@@ -345,7 +323,6 @@ void dName_c::_move() {
     cursorAnm();
 }
 
-/* 8024EC10-8024EC4C 249550 003C+00 3/3 0/0 0/0 .text            nameCheck__7dName_cFv */
 int dName_c::nameCheck() {
     for (int i = 8, len = 7; i > 0; i--) {
         #if REGION_JPN
@@ -362,7 +339,6 @@ int dName_c::nameCheck() {
     return 0;
 }
 
-/* 8024EC4C-8024EC84 24958C 0038+00 1/1 0/0 0/0 .text            playNameSet__7dName_cFi */
 void dName_c::playNameSet(int nameLength) {
     char* str = mInputStr;
 
@@ -384,7 +360,6 @@ void dName_c::playNameSet(int nameLength) {
     *str = 0;
 }
 
-/* 8024EC84-8024ED48 2495C4 00C4+00 1/1 0/0 0/0 .text            cursorAnm__7dName_cFv */
 void dName_c::cursorAnm() {
     mCurColAnmF += 2;
     if (mCurColAnmF >= mCursorColorKey->getFrameMax()) {
@@ -401,10 +376,8 @@ void dName_c::cursorAnm() {
     nameIn.NameInScr->animation();
 }
 
-/* 8024ED48-8024ED4C 249688 0004+00 1/0 0/0 0/0 .text            Wait__7dName_cFv */
 void dName_c::Wait() {}
 
-/* 8024ED4C-8024F034 24968C 02E8+00 1/0 0/0 0/0 .text            MojiSelect__7dName_cFv */
 void dName_c::MojiSelect() {
     if (mDoCPd_c::getTrigA(PAD_1)) {
         selectMojiSet();
@@ -463,7 +436,6 @@ void dName_c::MojiSelect() {
     }
 }
 
-/* 8024F034-8024F0E0 249974 00AC+00 2/2 0/0 0/0 .text            MojiSelectAnmInit__7dName_cFv */
 void dName_c::MojiSelectAnmInit() {
     mSelIcon->setAlphaRate(0.0f);
     mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnimeStart(0);
@@ -471,7 +443,6 @@ void dName_c::MojiSelectAnmInit() {
         ->setWhite(JUtility::TColor(0x96, 0x96, 0x96, 0xFF));
 }
 
-/* 8024F0E0-8024F164 249A20 0084+00 1/0 0/0 0/0 .text            MojiSelectAnm__7dName_cFv */
 void dName_c::MojiSelectAnm() {
     if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
                                                           1.0f, 0) == 1)
@@ -482,7 +453,6 @@ void dName_c::MojiSelectAnm() {
     }
 }
 
-/* 8024F164-8024F1E8 249AA4 0084+00 1/0 0/0 0/0 .text            MojiSelectAnm2__7dName_cFv */
 void dName_c::MojiSelectAnm2() {
     if (mMojiIcon[mPrevRow + mPrevColumn * 5]->scaleAnime(mCursorDelay, g_nmHIO.mSelCharScale,
                                                           1.0f, 0) == 1)
@@ -493,10 +463,8 @@ void dName_c::MojiSelectAnm2() {
     }
 }
 
-/* 8024F1E8-8024F1EC 249B28 0004+00 1/0 0/0 0/0 .text            MojiSelectAnm3__7dName_cFv */
 void dName_c::MojiSelectAnm3() {}
 
-/* 8024F1EC-8024F55C 249B2C 0370+00 1/0 0/0 0/0 .text            mojiChange__7dName_cFUc */
 int dName_c::mojiChange(u8 idx) {
     if (mChrInfo[idx].field_0x3 == 0 || mChrInfo[idx].mMojiSet == MOJI_EIGO ||
         mChrInfo[idx].mCharacter == '　')
@@ -612,7 +580,6 @@ int dName_c::mojiChange(u8 idx) {
     return 1;
 }
 
-/* 8024F55C-8024F59C 249E9C 0040+00 1/1 0/0 0/0 .text            selectMojiSet__7dName_cFv */
 void dName_c::selectMojiSet() {
     #if REGION_JPN
     int moji = getMoji();
@@ -755,7 +722,6 @@ int dName_c::setDakuon(int param_1, u8 param_2) {
 }
 #endif
 
-/* 8024F59C-8024F634 249EDC 0098+00 1/1 0/0 0/0 .text            getMoji__7dName_cFv */
 int dName_c::getMoji() {
     int result = -1;
     const char* moji;
@@ -796,7 +762,6 @@ int dName_c::getMoji() {
     return result;
 }
 
-/* 8024F634-8024F88C 249F74 0258+00 1/1 0/0 0/0 .text            setMoji__7dName_cFi */
 void dName_c::setMoji(int moji) {
     if (mCurPos == 8 || nameCheck() == 8) {
         mDoAud_seStart(Z2SE_SYS_ERROR, NULL, 0, 0);
@@ -864,7 +829,6 @@ void dName_c::setMoji(int moji) {
 }
 
 
-/* 8024F88C-8024F914 24A1CC 0088+00 4/4 0/0 0/0 .text            setNameText__7dName_cFv */
 void dName_c::setNameText() {
     for (int i = 0; i < 8; i++) {
         //"\x1bCD\x1bCR\x1bCC[000000]\x1bGM[0]%c\x1bHM\x1bCC[ffffff]\x1bGM[0]%c"
@@ -906,7 +870,6 @@ void dName_c::setNameText() {
     }
 }
 
-/* 8024F914-8024F994 24A254 0080+00 5/5 0/0 0/0 .text            nameCursorMove__7dName_cFv */
 void dName_c::nameCursorMove() {
     if (mCurPos <= 8) {
         u8 position = mCurPos;
@@ -923,7 +886,6 @@ void dName_c::nameCursorMove() {
     }
 }
 
-/* 8024F994-8024FAF4 24A2D4 0160+00 3/3 0/0 0/0 .text            selectCursorMove__7dName_cFv */
 void dName_c::selectCursorMove() {
     int idx;
     #if REGION_PAL
@@ -961,7 +923,6 @@ void dName_c::selectCursorMove() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 8024FAF4-8024FB08 24A434 0014+00 1/1 0/0 0/0 .text            menuCursorPosSet__7dName_cFv */
 void dName_c::menuCursorPosSet() {
     mPrevSelMenu = mSelMenu;
     #if REGION_PAL
@@ -994,7 +955,6 @@ void dName_c::menuCursorPosSet() {
     #endif
 }
 
-/* 8024FB08-8024FDA0 24A448 0298+00 1/0 0/0 0/0 .text            MenuSelect__7dName_cFv */
 void dName_c::MenuSelect() {
     #if REGION_PAL || REGION_JPN
     if (stick->checkRightTrigger()) {
@@ -1072,7 +1032,6 @@ void dName_c::MenuSelect() {
     }
 }
 
-/* 8024FDA0-8024FDF4 24A6E0 0054+00 2/2 0/0 0/0 .text            MenuSelectAnmInit__7dName_cFv */
 void dName_c::MenuSelectAnmInit() {
     mSelIcon->setAlphaRate(0.0f);
 
@@ -1080,7 +1039,6 @@ void dName_c::MenuSelectAnmInit() {
     mMenuIcon[prevMenu_i]->scaleAnimeStart(0);
 }
 
-/* 8024FDF4-8024FEB4 24A734 00C0+00 1/0 0/0 0/0 .text            MenuSelectAnm__7dName_cFv */
 void dName_c::MenuSelectAnm() {
     int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
 
@@ -1092,7 +1050,6 @@ void dName_c::MenuSelectAnm() {
     }
 }
 
-/* 8024FEB4-8024FFA0 24A7F4 00EC+00 1/0 0/0 0/0 .text            MenuSelectAnm2__7dName_cFv */
 void dName_c::MenuSelectAnm2() {
     int prevMenu_i = getMenuPosIdx(mPrevSelMenu);
     int mojiSet_i = getMenuPosIdx(mMojiSet);
@@ -1116,10 +1073,8 @@ void dName_c::MenuSelectAnm2() {
     }
 }
 
-/* 8024FFA0-8024FFA4 24A8E0 0004+00 1/0 0/0 0/0 .text            MenuSelectAnm3__7dName_cFv */
 void dName_c::MenuSelectAnm3() {}
 
-/* 8024FFA4-80250074 24A8E4 00D0+00 1/1 0/0 0/0 .text            menuAbtnSelect__7dName_cFv */
 void dName_c::menuAbtnSelect() {
     switch (mSelMenu) {
     case MENU_HIRA:
@@ -1152,7 +1107,6 @@ void dName_c::menuAbtnSelect() {
     }
 }
 
-/* 80250074-802501B0 24A9B4 013C+00 1/1 0/0 0/0 .text            backSpace__7dName_cFv */
 void dName_c::backSpace() {
     if (mCurPos != 0) {
         mDoAud_seStart(Z2SE_SY_NAME_DELETE, NULL, 0, 0);
@@ -1204,7 +1158,6 @@ void dName_c::backSpace() {
     }
 }
 
-/* 802501B0-80250284 24AAF0 00D4+00 2/2 0/0 0/0 .text            mojiListChange__7dName_cFv */
 void dName_c::mojiListChange() {
     #if REGION_PAL
     char** mojiSet;
@@ -1266,7 +1219,6 @@ void dName_c::mojiListChange() {
     #endif
 }
 
-/* 80250284-80250380 24ABC4 00FC+00 1/1 0/0 0/0 .text            menuCursorMove__7dName_cFv */
 void dName_c::menuCursorMove() {
     int menu_i = getMenuPosIdx(mSelMenu);
     mMenuIcon[menu_i]->scale(g_nmHIO.mMenuScale, g_nmHIO.mMenuScale);
@@ -1277,7 +1229,6 @@ void dName_c::menuCursorMove() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 80250380-802504A0 24ACC0 0120+00 1/1 0/0 0/0 .text            menuCursorMove2__7dName_cFv */
 void dName_c::menuCursorMove2() {
     int menu_i = getMenuPosIdx(mSelMenu);
     int mojiSet_i = getMenuPosIdx(mMojiSet);
@@ -1296,7 +1247,6 @@ void dName_c::menuCursorMove2() {
     mSelIcon->setAlphaRate(1.0f);
 }
 
-/* 802504A0-80250560 24ADE0 00C0+00 1/1 0/0 0/0 .text            selectCursorPosSet__7dName_cFi */
 void dName_c::selectCursorPosSet(int row) {
     if (field_0x30c[mSelMenu][2] == 1) {
         mCharColumn = field_0x30c[mSelMenu][0];
@@ -1330,13 +1280,11 @@ void dName_c::selectCursorPosSet(int row) {
     }
 }
 
-/* 80250560-802505CC 24AEA0 006C+00 0/0 1/1 0/0 .text            _draw__7dName_cFv */
 void dName_c::_draw() {
     dComIfGd_set2DOpa(&nameIn);
     dComIfGd_set2DOpa(mSelIcon);
 }
 
-/* 802505CC-80250CEC 24AF0C 0720+00 1/1 0/0 0/0 .text            screenSet__7dName_cFv */
 void dName_c::screenSet() {
     static u64 l_cur0TagName[8] = {
         's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07',
@@ -1543,7 +1491,6 @@ void dName_c::screenSet() {
 }
 
 
-/* 80250CEC-80250E54 24B62C 0168+00 2/2 0/0 0/0 .text            displayInit__7dName_cFv */
 void dName_c::displayInit() {
     mSelIcon->setAlphaRate(0.0f);
     mCurColAnmF = 0;
@@ -1583,7 +1530,6 @@ void dName_c::displayInit() {
     mIsInputEnd = false;
 }
 
-/* 80250E54-80251048 24B794 01F4+00 1/1 0/0 0/0 .text            NameStrSet__7dName_cFv */
 void dName_c::NameStrSet() {
     char* moji = mNextNameStr;
 
@@ -1652,7 +1598,6 @@ void dName_c::NameStrSet() {
     nameCursorMove();
 }
 
-/* 80251048-80251094 24B988 004C+00 6/6 0/0 0/0 .text            getMenuPosIdx__7dName_cFUc */
 s32 dName_c::getMenuPosIdx(u8 selPos) {
     s32 result;
     switch (selPos) {
@@ -1679,7 +1624,6 @@ s32 dName_c::getMenuPosIdx(u8 selPos) {
     //!@bug UB: uninitialized default return
 }
 
-/* 80251094-8025115C 24B9D4 00C8+00 1/0 0/0 0/0 .text            draw__14dDlst_NameIN_cFv */
 void dDlst_NameIN_c::draw() {
     if (field_0xc != NULL) {
         Mtx m;
diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp
index 72230aed2d..d94816f794 100644
--- a/src/d/d_npc_lib.cpp
+++ b/src/d/d_npc_lib.cpp
@@ -3,11 +3,8 @@
 #include "d/d_npc_lib.h"
 #include "SSystem/SComponent/c_math.h"
 
-/* 80251314-8025140C 24BC54 00F8+00 0/0 0/0 4/4 .text            __ct__16dNpcLib_lookat_cFv */
 dNpcLib_lookat_c::dNpcLib_lookat_c() {}
 
-/* 8025140C-80251534 24BD4C 0128+00 0/0 0/0 2/2 .text
- * init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz          */
 void dNpcLib_lookat_c::init(J3DModel* i_mdl_p, int* param_1, csXyz* param_2, csXyz* param_3) {
     int i;
     for (i = 0; i < 4; i++) {
@@ -32,8 +29,6 @@ void dNpcLib_lookat_c::init(J3DModel* i_mdl_p, int* param_1, csXyz* param_2, csX
     }
 }
 
-/* 80251534-80251B60 24BE74 062C+00 0/0 0/0 2/2 .text
- * action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi     */
 // NONMATCHING - regswap, equivalent
 void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, Mtx param_3, int param_4) {
     cXyz sp90;
@@ -108,10 +103,8 @@ void dNpcLib_lookat_c::action(cXyz param_0, cXyz param_1, fopAc_ac_c* param_2, M
     }
 }
 
-/* 80251B60-80251B64 24C4A0 0004+00 0/0 0/0 2/2 .text            dbView__16dNpcLib_lookat_cFv */
 void dNpcLib_lookat_c::dbView() {}
 
-/* 80251B64-80251EF8 24C4A4 0394+00 1/1 0/0 0/0 .text            setPrm__16dNpcLib_lookat_cFv */
 void dNpcLib_lookat_c::setPrm() {
     cXyz sp14;
     int i;
@@ -133,7 +126,6 @@ void dNpcLib_lookat_c::setPrm() {
     }
 }
 
-/* 80251EF8-80252018 24C838 0120+00 1/1 0/0 0/0 .text            update__16dNpcLib_lookat_cFv */
 void dNpcLib_lookat_c::update() {
     cXyz sp50;
     csXyz sp58(csXyz::Zero);
@@ -157,7 +149,6 @@ void dNpcLib_lookat_c::update() {
 }
 
 
-/* 80252018-80252094 24C958 007C+00 1/1 0/0 0/0 .text   limitter__16dNpcLib_lookat_cFPssss */
 int dNpcLib_lookat_c::limitter(s16* o_value, s16 param_1, s16 param_2, s16 param_3) {
     int limit = param_1 + *o_value;
     BOOL rt = FALSE;
diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp
index 3d8e51ca8d..a605e8d4bd 100644
--- a/src/d/d_ovlp_fade.cpp
+++ b/src/d/d_ovlp_fade.cpp
@@ -18,12 +18,10 @@ public:
     /* 0xCC */ int field_0xd4;
 };
 
-/* 8025217C-80252184 24CABC 0008+00 1/0 0/0 0/0 .text            dOvlpFd_Draw__FP14overlap1_class */
 static int dOvlpFd_Draw(overlap1_class* i_this) {
     return 1;
 }
 
-/* 80252184-802521F4 24CAC4 0070+00 1/1 0/0 0/0 .text            dOvlpFd_startFadeIn__Fi */
 static void dOvlpFd_startFadeIn(int param_0) {
     JUTFader* fader = JFWDisplay::getManager()->getFader();
     JUT_ASSERT(0, fader != NULL);
@@ -33,8 +31,6 @@ static void dOvlpFd_startFadeIn(int param_0) {
     fader->startFadeIn(param_0);
 }
 
-/* 802521F4-802522C8 24CB34 00D4+00 1/1 0/0 0/0 .text            dOvlpFd_FadeOut__FP14overlap1_class
- */
 static int dOvlpFd_FadeOut(overlap1_class* i_this) {
     int var_r31 = i_this->field_0xd4;
 
@@ -66,10 +62,8 @@ static int dOvlpFd_FadeOut(overlap1_class* i_this) {
     return 1;
 }
 
-/* 804510E0-804510E8 0005E0 0004+04 4/4 0/0 0/0 .sbss            dOvlpFd_execute_f */
 static int (*dOvlpFd_execute_f)(overlap1_class*);
 
-/* 802522C8-80252300 24CC08 0038+00 1/1 0/0 0/0 .text            dOvlpFd_Wait__FP14overlap1_class */
 static int dOvlpFd_Wait(overlap1_class* i_this) {
     if (fopOvlpM_IsOutReq(i_this)) {
         dOvlpFd_execute_f = dOvlpFd_FadeOut;
@@ -78,8 +72,6 @@ static int dOvlpFd_Wait(overlap1_class* i_this) {
     return 1;
 }
 
-/* 80252300-8025242C 24CC40 012C+00 1/1 0/0 0/0 .text            dOvlpFd_FadeIn__FP14overlap1_class
- */
 static int dOvlpFd_FadeIn(overlap1_class* i_this) {
     int var_r30 = 30;
 
@@ -116,39 +108,30 @@ static int dOvlpFd_FadeIn(overlap1_class* i_this) {
     return 1;
 }
 
-/* 8025242C-80252458 24CD6C 002C+00 1/0 0/0 0/0 .text            dOvlpFd_Execute__FP14overlap1_class
- */
 static int dOvlpFd_Execute(overlap1_class* i_this) {
     dOvlpFd_execute_f(i_this);
     return 1;
 }
 
-/* 80252458-80252460 24CD98 0008+00 1/0 0/0 0/0 .text dOvlpFd_IsDelete__FP14overlap1_class */
 static int dOvlpFd_IsDelete(overlap1_class* i_this) {
     return 1;
 }
 
-/* 80252460-80252468 24CDA0 0008+00 1/0 0/0 0/0 .text            dOvlpFd_Delete__FP14overlap1_class
- */
 static int dOvlpFd_Delete(overlap1_class* i_this) {
     return 1;
 }
 
-/* 80252468-8025247C 24CDA8 0014+00 1/0 0/0 0/0 .text            dOvlpFd_Create__FPv */
 static int dOvlpFd_Create(void* i_this) {
     dOvlpFd_execute_f = dOvlpFd_FadeIn;
     return cPhs_COMPLEATE_e;
 }
 
-/* ############################################################################################## */
-/* 803C2B98-803C2BAC -00001 0014+00 8/0 0/0 0/0 .data            l_dOvlpFd_Method */
 static leafdraw_method_class l_dOvlpFd_Method = {
     (process_method_func)dOvlpFd_Create,  (process_method_func)dOvlpFd_Delete,
     (process_method_func)dOvlpFd_Execute, (process_method_func)dOvlpFd_IsDelete,
     (process_method_func)dOvlpFd_Draw,
 };
 
-/* 803C2BAC-803C2BD4 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP0 */
 extern overlap_process_profile_definition g_profile_OVERLAP0 = {
     fpcLy_ROOT_e,
     0,
@@ -163,7 +146,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP0 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2BD4-803C2BFC -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP1 */
 extern overlap_process_profile_definition g_profile_OVERLAP1 = {
     fpcLy_ROOT_e,
     0,
@@ -178,7 +160,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP1 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2BFC-803C2C24 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP6 */
 extern overlap_process_profile_definition g_profile_OVERLAP6 = {
     fpcLy_ROOT_e,
     0,
@@ -193,7 +174,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP6 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2C24-803C2C4C -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP7 */
 extern overlap_process_profile_definition g_profile_OVERLAP7 = {
     fpcLy_ROOT_e,
     0,
@@ -208,7 +188,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP7 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2C4C-803C2C74 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP8 */
 extern overlap_process_profile_definition g_profile_OVERLAP8 = {
     fpcLy_ROOT_e,
     0,
@@ -223,7 +202,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP8 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2C74-803C2C9C -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP9 */
 extern overlap_process_profile_definition g_profile_OVERLAP9 = {
     fpcLy_ROOT_e,
     0,
@@ -238,7 +216,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP9 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2C9C-803C2CC4 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP10 */
 extern overlap_process_profile_definition g_profile_OVERLAP10 = {
     fpcLy_ROOT_e,
     0,
@@ -253,7 +230,6 @@ extern overlap_process_profile_definition g_profile_OVERLAP10 = {
     &l_dOvlpFd_Method,
 };
 
-/* 803C2CC4-803C2CF0 -00001 0028+04 0/0 0/0 1/0 .data            g_profile_OVERLAP11 */
 extern overlap_process_profile_definition g_profile_OVERLAP11 = {
     fpcLy_ROOT_e,
     0,
diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp
index d0dc1bc253..2ecf5a5f16 100644
--- a/src/d/d_ovlp_fade2.cpp
+++ b/src/d/d_ovlp_fade2.cpp
@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 8025247C-80252990 24CDBC 0514+00 1/0 0/0 0/0 .text            draw__15dOvlpFd2_dlst_cFv */
 void dOvlpFd2_dlst_c::draw() {
     GXSetViewport(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
     GXSetScissor(0, 0, FB_WIDTH, FB_HEIGHT);
@@ -104,14 +103,12 @@ void dOvlpFd2_dlst_c::draw() {
     graf_ctx->setup2D();
 }
 
-/* 80252990-802529F4 24D2D0 0064+00 1/1 0/0 0/0 .text            __ct__10dOvlpFd2_cFv */
 dOvlpFd2_c::dOvlpFd2_c() {
     setExecute(&dOvlpFd2_c::execFirstSnap);
     dComIfGp_2dShowOff();
     mTimer = 2;
 }
 
-/* 802529F4-80252A78 24D334 0084+00 1/0 0/0 0/0 .text            execFirstSnap__10dOvlpFd2_cFv */
 void dOvlpFd2_c::execFirstSnap() {
     if (field_0x11c != 0) {
         if (cLib_calcTimer<s8>(&mTimer) == 0) {
@@ -124,7 +121,6 @@ void dOvlpFd2_c::execFirstSnap() {
     }
 }
 
-/* 80252A78-80252BC0 24D3B8 0148+00 1/0 0/0 0/0 .text            execFadeOut__10dOvlpFd2_cFv */
 void dOvlpFd2_c::execFadeOut() {
     dComIfGp_setWindowNum(0);
     cLib_chaseAngleS(&field_0x112, 2000, 100);
@@ -158,7 +154,6 @@ void dOvlpFd2_c::execFadeOut() {
     cLib_addCalc2(&field_0x118, TREG_F(1) + 1.0f, 1.0f, TREG_F(2) + 0.05f);
 }
 
-/* 80252BC0-80252C68 24D500 00A8+00 1/0 0/0 0/0 .text            execNextSnap__10dOvlpFd2_cFv */
 void dOvlpFd2_c::execNextSnap() {
     if (cLib_calcTimer<s8>(&mTimer) == 0) {
         if (!JFWDisplay::getManager()->getFader()->startFadeIn(16)) {
@@ -172,7 +167,6 @@ void dOvlpFd2_c::execNextSnap() {
     }
 }
 
-/* 80252C68-80252D0C 24D5A8 00A4+00 1/0 0/0 0/0 .text            execFadeIn__10dOvlpFd2_cFv */
 void dOvlpFd2_c::execFadeIn() {
     field_0x114 -= TREG_S(0) + 0x800;
 
@@ -209,7 +203,6 @@ void dOvlpFd2_c::draw() {
     mDoGph_gInf_c::offBlure();
 }
 
-/* 80252D0C-80252E08 24D64C 00FC+00 1/0 0/0 0/0 .text            dOvlpFd2_Draw__FP10dOvlpFd2_c */
 static int dOvlpFd2_Draw(dOvlpFd2_c* i_this) {
     i_this->draw();
     return 1;
@@ -219,37 +212,30 @@ void dOvlpFd2_c::execute() {
     (this->*mExecuteFn)();
 }
 
-/* 80252E08-80252E34 24D748 002C+00 1/0 0/0 0/0 .text            dOvlpFd2_Execute__FP10dOvlpFd2_c */
 static int dOvlpFd2_Execute(dOvlpFd2_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 80252E34-80252E3C 24D774 0008+00 1/0 0/0 0/0 .text            dOvlpFd2_IsDelete__FP10dOvlpFd2_c
- */
 static int dOvlpFd2_IsDelete(dOvlpFd2_c* i_this) {
     return 1;
 }
 
-/* 80252E3C-80252E44 24D77C 0008+00 1/0 0/0 0/0 .text            dOvlpFd2_Delete__FP10dOvlpFd2_c */
 static int dOvlpFd2_Delete(dOvlpFd2_c* i_this) {
     return 1;
 }
 
-/* 80252E44-80252E70 24D784 002C+00 1/0 0/0 0/0 .text            dOvlpFd2_Create__FPv */
 static int dOvlpFd2_Create(void* i_this) {
     new (i_this) dOvlpFd2_c();
     return cPhs_COMPLEATE_e;
 }
 
-/* 803C2D20-803C2D34 -00001 0014+00 1/0 0/0 0/0 .data            l_dOvlpFd2_Method */
 static leafdraw_method_class l_dOvlpFd2_Method = {
     (process_method_func)dOvlpFd2_Create,  (process_method_func)dOvlpFd2_Delete,
     (process_method_func)dOvlpFd2_Execute, (process_method_func)dOvlpFd2_IsDelete,
     (process_method_func)dOvlpFd2_Draw,
 };
 
-/* 803C2D34-803C2D5C -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP2 */
 extern overlap_process_profile_definition g_profile_OVERLAP2 = {
     fpcLy_ROOT_e,
     2,
diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp
index 592bfc85fb..cc180c6ca4 100644
--- a/src/d/d_ovlp_fade3.cpp
+++ b/src/d/d_ovlp_fade3.cpp
@@ -12,7 +12,6 @@
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80252ED4-80252F28 24D814 0054+00 1/0 0/0 0/0 .text            draw__16dDlst_snapShot_cFv */
 void dDlst_snapShot_c::draw() {
     GXSetTexCopySrc(0, 0, FB_WIDTH, FB_HEIGHT);
     GXSetTexCopyDst(FB_WIDTH / 2, FB_HEIGHT / 2, GX_TF_RGBA8, GX_TRUE);
@@ -20,7 +19,6 @@ void dDlst_snapShot_c::draw() {
     GXPixModeSync();
 }
 
-/* 80252F28-8025343C 24D868 0514+00 1/0 0/0 0/0 .text            draw__15dOvlpFd3_dlst_cFv */
 void dOvlpFd3_dlst_c::draw() {
     GXSetViewport(0.0f, 0.0f, FB_WIDTH, FB_HEIGHT, 0.0f, 1.0f);
     GXSetScissor(0, 0, FB_WIDTH, FB_HEIGHT);
@@ -113,7 +111,6 @@ void dOvlpFd3_dlst_c::draw() {
     graf_ctx->setup2D();
 }
 
-/* 8025343C-80253518 24DD7C 00DC+00 1/1 0/0 0/0 .text            __ct__10dOvlpFd3_cFv */
 dOvlpFd3_c::dOvlpFd3_c() {
     setExecute(&dOvlpFd3_c::execFirstSnap);
     dComIfGp_2dShowOff();
@@ -128,7 +125,6 @@ dOvlpFd3_c::dOvlpFd3_c() {
     mDoGph_gInf_c::startFadeOut(XREG_S(3) + (field_0x11f >> 1) + 90);
 }
 
-/* 80253518-802535AC 24DE58 0094+00 1/0 0/0 0/0 .text            execFirstSnap__10dOvlpFd3_cFv */
 void dOvlpFd3_c::execFirstSnap() {
     if (cLib_calcTimer(&field_0x11f) == 0 && field_0x11c != 0) {
         if (cLib_calcTimer(&mTimer) == 0) {
@@ -141,7 +137,6 @@ void dOvlpFd3_c::execFirstSnap() {
     }
 }
 
-/* 802535AC-8025368C 24DEEC 00E0+00 1/0 0/0 0/0 .text            execFadeOut__10dOvlpFd3_cFv */
 void dOvlpFd3_c::execFadeOut() {
     dComIfGp_setWindowNum(0);
 
@@ -165,7 +160,6 @@ void dOvlpFd3_c::execFadeOut() {
     }
 }
 
-/* 8025368C-80253730 24DFCC 00A4+00 1/0 0/0 0/0 .text            execNextSnap__10dOvlpFd3_cFv */
 void dOvlpFd3_c::execNextSnap() {
     if (cLib_calcTimer(&mTimer) == 0) {
         if (!JFWDisplay::getManager()->getFader()->startFadeIn(XREG_S(4) + 26)) {
@@ -178,7 +172,6 @@ void dOvlpFd3_c::execNextSnap() {
     }
 }
 
-/* 80253730-802537AC 24E070 007C+00 1/0 0/0 0/0 .text            execFadeIn__10dOvlpFd3_cFv */
 void dOvlpFd3_c::execFadeIn() {
     field_0x114 -= TREG_S(0) + 0x800;
 
@@ -208,7 +201,6 @@ void dOvlpFd3_c::draw() {
     }
 }
 
-/* 802537AC-80253880 24E0EC 00D4+00 1/0 0/0 0/0 .text            dOvlpFd3_Draw__FP10dOvlpFd3_c */
 static int dOvlpFd3_Draw(dOvlpFd3_c* i_this) {
     i_this->draw();
     return 1;
@@ -218,37 +210,30 @@ void dOvlpFd3_c::execute() {
     (this->*mExecuteFn)();
 }
 
-/* 80253880-802538AC 24E1C0 002C+00 1/0 0/0 0/0 .text            dOvlpFd3_Execute__FP10dOvlpFd3_c */
 static int dOvlpFd3_Execute(dOvlpFd3_c* i_this) {
     i_this->execute();
     return 1;
 }
 
-/* 802538AC-802538B4 24E1EC 0008+00 1/0 0/0 0/0 .text            dOvlpFd3_IsDelete__FP10dOvlpFd3_c
- */
 static int dOvlpFd3_IsDelete(dOvlpFd3_c* i_this) {
     return 1;
 }
 
-/* 802538B4-802538BC 24E1F4 0008+00 1/0 0/0 0/0 .text            dOvlpFd3_Delete__FP10dOvlpFd3_c */
 static int dOvlpFd3_Delete(dOvlpFd3_c* i_this) {
     return 1;
 }
 
-/* 802538BC-802538E8 24E1FC 002C+00 1/0 0/0 0/0 .text            dOvlpFd3_Create__FPv */
 static int dOvlpFd3_Create(void* i_this) {
     new (i_this) dOvlpFd3_c();
     return cPhs_COMPLEATE_e;
 }
 
-/* 803C2DA0-803C2DB4 -00001 0014+00 1/0 0/0 0/0 .data            l_dOvlpFd3_Method */
 static leafdraw_method_class l_dOvlpFd3_Method = {
     (process_method_func)dOvlpFd3_Create,  (process_method_func)dOvlpFd3_Delete,
     (process_method_func)dOvlpFd3_Execute, (process_method_func)dOvlpFd3_IsDelete,
     (process_method_func)dOvlpFd3_Draw,
 };
 
-/* 803C2DB4-803C2DDC -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OVERLAP3 */
 extern overlap_process_profile_definition g_profile_OVERLAP3 = {
     fpcLy_ROOT_e,
     0,
diff --git a/src/d/d_pane_class.cpp b/src/d/d_pane_class.cpp
index 031f1b3421..8b4e3543f6 100644
--- a/src/d/d_pane_class.cpp
+++ b/src/d/d_pane_class.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_pane_class
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
@@ -18,21 +13,17 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_graphic.h"
 
-/* 80253930-80253984 24E270 0054+00 0/0 11/11 0/0 .text            __ct__8CPaneMgrFv */
 CPaneMgr::CPaneMgr() {
     mpFirstStackAlpha = NULL;
     mpFirstStackSize = NULL;
 }
 
-/* 80253984-80253A18 24E2C4 0094+00 0/0 58/58 2/2 .text
- * __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap                 */
 CPaneMgr::CPaneMgr(J2DScreen* p_scrn, u64 tag, u8 flags, JKRExpHeap* p_heap) {
     J2DPane* pane = p_scrn->search(tag);
     mFlags = flags;
     initiate(pane, p_heap);
 }
 
-/* 80253A18-80253AB4 24E358 009C+00 1/0 11/11 0/0 .text            __dt__8CPaneMgrFv */
 CPaneMgr::~CPaneMgr() {
     if (mpFirstStackSize) {
         heap->free(mpFirstStackSize);
@@ -44,7 +35,6 @@ CPaneMgr::~CPaneMgr() {
     }
 }
 
-/* 80253AB4-80253B2C 24E3F4 0078+00 1/0 0/0 0/0 .text            setAlpha__8CPaneMgrFUc */
 void CPaneMgr::setAlpha(u8 alpha) {
     if (mFlags & 2) {
         field_0x10 = (u8*)mpFirstStackAlpha;
@@ -54,7 +44,6 @@ void CPaneMgr::setAlpha(u8 alpha) {
     getPanePtr()->setAlpha(alpha);
 }
 
-/* 80253B2C-80253C08 24E46C 00DC+00 0/0 3/3 0/0 .text            reinit__8CPaneMgrFv */
 void CPaneMgr::reinit() {
     mInitPos.x = getPanePtr()->getBounds().i.x;
     mInitPos.y = getPanePtr()->getBounds().i.y;
@@ -76,8 +65,6 @@ void CPaneMgr::reinit() {
     mRotateOffset.y = getPanePtr()->getRotOffsetY();
 }
 
-/* 80253C08-80254000 24E548 03F8+00 1/1 0/0 0/0 .text initiate__8CPaneMgrFP7J2DPaneP10JKRExpHeap
- */
 void CPaneMgr::initiate(J2DPane* p_pane, JKRExpHeap* p_heap) {
     mPane = p_pane;
 
@@ -161,17 +148,14 @@ void CPaneMgr::initiate(J2DPane* p_pane, JKRExpHeap* p_heap) {
     mInitBlack.set(0, 0, 0, 0);
 }
 
-/* 80254000-8025400C 24E940 000C+00 0/0 1/0 0/0 .text            getBlack__9J2DWindowCFv */
 JUtility::TColor J2DWindow::getBlack() const {
     return mBlack;
 }
 
-/* 8025400C-80254018 24E94C 000C+00 0/0 1/0 0/0 .text            getWhite__9J2DWindowCFv */
 JUtility::TColor J2DWindow::getWhite() const {
     return mWhite;
 }
 
-/* 80254018-80254134 24E958 011C+00 1/1 0/0 0/0 .text childPaneGetSize__8CPaneMgrFP7J2DPane */
 void CPaneMgr::childPaneGetSize(J2DPane* p_pane) {
     if (p_pane != NULL) {
         field_0x20[0] = p_pane->getBounds().i.x;
@@ -187,7 +171,6 @@ void CPaneMgr::childPaneGetSize(J2DPane* p_pane) {
     }
 }
 
-/* 80254134-802542E8 24EA74 01B4+00 1/1 0/0 0/0 .text childPaneSetSize__8CPaneMgrFP7J2DPaneff */
 void CPaneMgr::childPaneSetSize(J2DPane* p_pane, f32 param_1, f32 param_2) {
     if (p_pane != NULL) {
         p_pane->move(field_0x20[0] * param_1, field_0x20[1] * param_2);
@@ -204,7 +187,6 @@ void CPaneMgr::childPaneSetSize(J2DPane* p_pane, f32 param_1, f32 param_2) {
     }
 }
 
-/* 802542E8-80254364 24EC28 007C+00 2/2 18/18 0/0 .text            getGlobalPosX__8CPaneMgrFv */
 f32 CPaneMgr::getGlobalPosX() {
     f32 posX = getPosX();
     for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL;
@@ -214,7 +196,6 @@ f32 CPaneMgr::getGlobalPosX() {
     return posX;
 }
 
-/* 80254364-802543E0 24ECA4 007C+00 2/2 15/15 0/0 .text            getGlobalPosY__8CPaneMgrFv */
 f32 CPaneMgr::getGlobalPosY() {
     f32 posY = getPosY();
     for (J2DPane* pane = getPanePtr()->getParentPane(); pane != NULL;
@@ -224,26 +205,21 @@ f32 CPaneMgr::getGlobalPosY() {
     return posY;
 }
 
-/* 802543E0-80254408 24ED20 0028+00 0/0 1/0 0/0 .text setWhite__9J2DWindowFQ28JUtility6TColor */
 bool J2DWindow::setWhite(JUtility::TColor white) {
     mWhite = white;
     return true;
 }
 
-/* 80254408-80254430 24ED48 0028+00 0/0 1/0 0/0 .text setBlack__10J2DTextBoxFQ28JUtility6TColor */
 bool J2DTextBox::setBlack(JUtility::TColor black) {
     mBlackColor = black;
     return true;
 }
 
-/* 80254430-80254458 24ED70 0028+00 0/0 1/0 0/0 .text setBlack__9J2DWindowFQ28JUtility6TColor */
 bool J2DWindow::setBlack(JUtility::TColor black) {
     mBlack = black;
     return true;
 }
 
-/* 80254458-80254568 24ED98 0110+00 1/1 7/7 0/0 .text
- * setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor */
 void CPaneMgr::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
     switch (mPane->getKind()) {
     case 'WIN1':
@@ -261,22 +237,18 @@ void CPaneMgr::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
     }
 }
 
-/* 80254568-802545B0 24EEA8 0048+00 0/0 1/0 0/0 .text
- * setBlackWhite__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DWindow::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
     mBlack = black;
     mWhite = white;
     return true;
 }
 
-/* 802545B0-80254638 24EEF0 0088+00 0/0 51/51 3/3 .text            paneTrans__8CPaneMgrFff */
 void CPaneMgr::paneTrans(f32 x, f32 y) {
     f32 moveX = x + getInitCenterPosX() - getSizeX() * 0.5f;
     f32 moveY = y + getInitCenterPosY() - getSizeY() * 0.5f;
     getPanePtr()->move(moveX, moveY);
 }
 
-/* 80254638-802547CC 24EF78 0194+00 0/0 5/5 0/0 .text            paneScale__8CPaneMgrFff */
 void CPaneMgr::paneScale(f32 x, f32 y) {
     f32 moveX = getPosX() + getSizeX() * 0.5f;
     f32 moveY = getPosY() + getSizeY() * 0.5f;
@@ -297,7 +269,6 @@ void CPaneMgr::paneScale(f32 x, f32 y) {
     }
 }
 
-/* 802547CC-802548BC 24F10C 00F0+00 0/0 10/10 0/0 .text            scaleAnime__8CPaneMgrFsffUc */
 bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) {
     if (mScaleAnime < param_0 - 1) {
         mScaleAnime++;
@@ -383,8 +354,6 @@ bool CPaneMgr::colorAnime(s16 anmTimer, JUtility::TColor startBlack, JUtility::T
     return false;
 }
 
-/* 80254C90-80254EBC 24F5D0 022C+00 1/1 9/9 0/0 .text
- * getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs                */
 Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param_3,
                                 s16 param_4) {
     Mtx m;
@@ -423,8 +392,6 @@ Vec CPaneMgr::getGlobalVtx(J2DPane* p_pane, Mtx* param_1, u8 param_2, bool param
     }
 }
 
-/* 80254EBC-80254FB8 24F7FC 00FC+00 0/0 56/56 1/1 .text tCenter__8CPaneMgrFP7J2DPanebs
- */
 Vec CPaneMgr::getGlobalVtxCenter(J2DPane* p_pane, bool param_1, s16) {
     Mtx m;
     Vec vtxCenter;
@@ -438,11 +405,8 @@ Vec CPaneMgr::getGlobalVtxCenter(J2DPane* p_pane, bool param_1, s16) {
     return vtxCenter;
 }
 
-/* ############################################################################################## */
-/* 80430748-80430758 05D468 0010+00 2/2 0/0 0/0 .bss             static_mBounds */
 static JGeometry::TBox2<f32> static_mBounds(0.0f, 0.0f, 0.0f, 0.0f);
 
-/* 80254FB8-802550E8 24F8F8 0130+00 1/1 0/0 0/0 .text            getBounds__8CPaneMgrFP7J2DPane */
 JGeometry::TBox2<f32>* CPaneMgr::getBounds(J2DPane* p_pane) {
     JGeometry::TBox2<f32> bounds(p_pane->getBounds());
     
@@ -464,15 +428,12 @@ JGeometry::TBox2<f32>* CPaneMgr::getBounds(J2DPane* p_pane) {
     return &static_mBounds;
 }
 
-/* 802550E8-8025512C 24FA28 0044+00 0/0 54/54 3/3 .text dPaneClass_showNullPane__FP9J2DScreen */
 void dPaneClass_showNullPane(J2DScreen* p_scrn) {
     if (p_scrn) {
         dPaneClass_showNullPane(p_scrn->search('ROOT'));
     }
 }
 
-/* 8025512C-80255184 24FA6C 0058+00 1/1 0/0 0/0 .text            dPaneClass_showNullPane__FP7J2DPane
- */
 void dPaneClass_showNullPane(J2DPane* p_pane) {
     if (p_pane) {
         if (!p_pane->isVisible()) {
@@ -483,8 +444,6 @@ void dPaneClass_showNullPane(J2DPane* p_pane) {
     }
 }
 
-/* 80255184-802552B8 24FAC4 0134+00 0/0 1/1 0/0 .text
- * dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive */
 bool dPaneClass_setPriority(void** i_data, JKRHeap* p_heap, J2DScreen* p_screen,
                                 char const* resName, u32 param_4, JKRArchive* p_archive) {
     if (p_archive == NULL) {
diff --git a/src/d/d_pane_class_alpha.cpp b/src/d/d_pane_class_alpha.cpp
index 66e6cff567..31bc8bc9b4 100644
--- a/src/d/d_pane_class_alpha.cpp
+++ b/src/d/d_pane_class_alpha.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_pane_class_alpha
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_pane_class_alpha.h"
@@ -10,18 +5,14 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 802553EC-802553FC 24FD2C 0010+00 0/0 2/2 0/0 .text            __ct__13CPaneMgrAlphaFv */
 CPaneMgrAlpha::CPaneMgrAlpha() {}
 
-/* 802553FC-8025546C 24FD3C 0070+00 1/1 9/9 1/1 .text
- * __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap           */
 CPaneMgrAlpha::CPaneMgrAlpha(J2DScreen* p_screen, u64 tag, u8 flags, JKRExpHeap* p_heap) {
     J2DPane* pane = p_screen->search(tag);
     mFlags = flags;
     initiateAlpha(pane, p_heap);
 }
 
-/* 8025546C-802554E0 24FDAC 0074+00 2/1 1/1 0/0 .text            __dt__13CPaneMgrAlphaFv */
 CPaneMgrAlpha::~CPaneMgrAlpha() {
     if (mpFirstStackAlpha != NULL) {
         heap->free(mpFirstStackAlpha);
@@ -29,8 +20,6 @@ CPaneMgrAlpha::~CPaneMgrAlpha() {
     }
 }
 
-/* 802554E0-802555C8 24FE20 00E8+00 1/1 0/0 0/0 .text
- * initiateAlpha__13CPaneMgrAlphaFP7J2DPaneP10JKRExpHeap        */
 void CPaneMgrAlpha::initiateAlpha(J2DPane* p_pane, JKRExpHeap* p_heap) {
     mPane = p_pane;
 
@@ -63,26 +52,22 @@ void CPaneMgrAlpha::initiateAlpha(J2DPane* p_pane, JKRExpHeap* p_heap) {
     mAlphaTimer = 0;
 }
 
-/* 802555C8-80255608 24FF08 0040+00 0/0 40/40 2/2 .text            show__13CPaneMgrAlphaFv */
 void CPaneMgrAlpha::show() {
     if (!isVisible()) {
         mPane->show();
     }
 }
 
-/* 80255608-8025564C 24FF48 0044+00 0/0 46/46 2/2 .text            hide__13CPaneMgrAlphaFv */
 void CPaneMgrAlpha::hide() {
     if (isVisible() == true) {
         mPane->hide();
     }
 }
 
-/* 8025564C-80255658 24FF8C 000C+00 2/2 12/12 0/0 .text            isVisible__13CPaneMgrAlphaFv */
 bool CPaneMgrAlpha::isVisible() {
     return mPane->isVisible();
 }
 
-/* 80255658-80255758 24FF98 0100+00 2/2 2/2 0/0 .text            rateCalc__13CPaneMgrAlphaFssUc */
 f32 CPaneMgrAlpha::rateCalc(s16 maxTimer, s16 curTimer, u8 calcType) {
     if (maxTimer <= curTimer) {
         return 1.0f;
@@ -98,7 +83,6 @@ f32 CPaneMgrAlpha::rateCalc(s16 maxTimer, s16 curTimer, u8 calcType) {
     }
 }
 
-/* 80255758-802557D0 250098 0078+00 2/0 0/0 0/0 .text            setAlpha__13CPaneMgrAlphaFUc */
 void CPaneMgrAlpha::setAlpha(u8 alpha) {
     if (mFlags & 2) {
         field_0x10 = (u8*)mpFirstStackAlpha;
@@ -107,14 +91,10 @@ void CPaneMgrAlpha::setAlpha(u8 alpha) {
     mPane->setAlpha(alpha);
 }
 
-/* 802557D0-80255828 250110 0058+00 1/1 173/173 5/5 .text            setAlphaRate__13CPaneMgrAlphaFf
- */
 void CPaneMgrAlpha::setAlphaRate(f32 rate) {
     setAlpha(mInitAlpha * rate);
 }
 
-/* 80255828-80255878 250168 0050+00 0/0 107/107 2/2 .text            getAlphaRate__13CPaneMgrAlphaFv
- */
 f32 CPaneMgrAlpha::getAlphaRate() {
     f32 rate = 0.0f;
 
@@ -125,7 +105,6 @@ f32 CPaneMgrAlpha::getAlphaRate() {
     return rate;
 }
 
-/* 80255878-80255964 2501B8 00EC+00 0/0 31/31 1/1 .text alphaAnime__13CPaneMgrAlphaFsUcUcUc */
 bool CPaneMgrAlpha::alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcType) {
     if (mAlphaTimer < timer - 1) {
         mAlphaTimer++;
@@ -140,7 +119,6 @@ bool CPaneMgrAlpha::alphaAnime(s16 timer, u8 startAlpha, u8 endAlpha, u8 calcTyp
     return false;
 }
 
-/* 80255964-80255A60 2502A4 00FC+00 0/0 0/0 1/1 .text alphaAnimeLoop__13CPaneMgrAlphaFsUcUcUc */
 bool CPaneMgrAlpha::alphaAnimeLoop(s16 param_0, u8 param_1, u8 param_2, u8 param_3) {
     bool ret = false;
     s16 temp_r4 = param_0 / 2;
@@ -165,7 +143,6 @@ bool CPaneMgrAlpha::alphaAnimeLoop(s16 param_0, u8 param_1, u8 param_2, u8 param
     return ret;
 }
 
-/* 80255A60-80255ACC 2503A0 006C+00 1/1 1/1 0/0 .text childPaneCount__13CPaneMgrAlphaFP7J2DPane */
 void CPaneMgrAlpha::childPaneCount(J2DPane* p_pane) {
     if (p_pane != NULL) {
         mChildPaneCount++;
@@ -174,8 +151,6 @@ void CPaneMgrAlpha::childPaneCount(J2DPane* p_pane) {
     }
 }
 
-/* 80255ACC-80255B5C 25040C 0090+00 1/1 1/1 0/0 .text childPaneGetAlpha__13CPaneMgrAlphaFP7J2DPane
- */
 void CPaneMgrAlpha::childPaneGetAlpha(J2DPane* p_pane) {
     if (p_pane != NULL) {
         u8 alpha;
@@ -192,8 +167,6 @@ void CPaneMgrAlpha::childPaneGetAlpha(J2DPane* p_pane) {
     }
 }
 
-/* 80255B5C-80255C68 25049C 010C+00 1/1 1/1 0/0 .text
- * childPaneSetAlpha__13CPaneMgrAlphaFP7J2DPaneUc               */
 void CPaneMgrAlpha::childPaneSetAlpha(J2DPane* p_pane, u8 alpha) {
     if (p_pane != NULL) {
         if (!p_pane->mIsInfluencedAlpha) {
@@ -213,15 +186,12 @@ void CPaneMgrAlpha::childPaneSetAlpha(J2DPane* p_pane, u8 alpha) {
     }
 }
 
-/* 80255C68-80255CAC 2505A8 0044+00 0/0 5/5 0/0 .text
- * __ct__17CPaneMgrAlphaMorfFP9J2DScreenUxUcP10JKRExpHeap       */
 CPaneMgrAlphaMorf::CPaneMgrAlphaMorf(J2DScreen* p_screen, u64 tag, u8 flags,
                                          JKRExpHeap* p_heap)
     : CPaneMgrAlpha(p_screen, tag, flags, p_heap) {
     initiateAlphaMorf();
 }
 
-/* 80255CAC-80255D48 2505EC 009C+00 1/0 0/0 0/0 .text            __dt__17CPaneMgrAlphaMorfFv */
 CPaneMgrAlphaMorf::~CPaneMgrAlphaMorf() {
     if (mpFirstSaveAlpha != NULL) {
         heap->free(mpFirstSaveAlpha);
@@ -234,7 +204,6 @@ CPaneMgrAlphaMorf::~CPaneMgrAlphaMorf() {
     }
 }
 
-/* 80255D48-80255DD0 250688 0088+00 1/1 0/0 0/0 .text initiateAlphaMorf__17CPaneMgrAlphaMorfFv */
 void CPaneMgrAlphaMorf::initiateAlphaMorf() {
     mpFirstSaveAlpha = NULL;
     field_0x20 = NULL;
@@ -252,7 +221,6 @@ void CPaneMgrAlphaMorf::initiateAlphaMorf() {
     }
 }
 
-/* 80255DD0-80255E28 250710 0058+00 1/1 3/3 0/0 .text setBackupAlpha__17CPaneMgrAlphaMorfFv */
 void CPaneMgrAlphaMorf::setBackupAlpha() {
     if (mpFirstStackAlpha != NULL) {
         field_0x20 = (u8*)mpFirstSaveAlpha;
@@ -262,7 +230,6 @@ void CPaneMgrAlphaMorf::setBackupAlpha() {
     }
 }
 
-/* 80255E28-80255E98 250768 0070+00 0/0 3/3 0/0 .text setAlphaMorfRate__17CPaneMgrAlphaMorfFf */
 void CPaneMgrAlphaMorf::setAlphaMorfRate(f32 rate) {
     if (mpFirstStackAlpha != NULL) {
         field_0x20 = (u8*)mpFirstSaveAlpha;
@@ -274,8 +241,6 @@ void CPaneMgrAlphaMorf::setAlphaMorfRate(f32 rate) {
     }
 }
 
-/* 80255E98-80255F28 2507D8 0090+00 1/1 0/0 0/0 .text
- * childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane          */
 void CPaneMgrAlphaMorf::childPaneBackupAlpha(J2DPane* p_pane) {
     if (p_pane != NULL) {
         *field_0x20 = p_pane->getAlpha();
@@ -289,8 +254,6 @@ void CPaneMgrAlphaMorf::childPaneBackupAlpha(J2DPane* p_pane) {
     }
 }
 
-/* 80255F28-80256018 250868 00F0+00 1/1 0/0 0/0 .text
- * childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef        */
 void CPaneMgrAlphaMorf::childPaneSetAlphaMorf(J2DPane* p_pane, f32 morf) {
     if (p_pane != NULL) {
         if (*field_0x20 == *field_0x28) {
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp
index 1b6b7da3d4..6b8202aac4 100644
--- a/src/d/d_particle.cpp
+++ b/src/d/d_particle.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_particle
-//
-
 // d_particle is odd in that it doesn't appear to include dolzel.pch.
 // It uses ...data pooling, but weak data from the PCH (e.g. Z2Calc::cNullVec)
 // isn't present like would be expected for a TU using pooling.
@@ -31,7 +26,6 @@
 
 extern dPa_particleTracePcallBack_c JPTracePCB4;
 
-/* 80049420-80049580 043D60 0160+00 4/4 0/0 0/0 .text            dPa_cleanupGX__Fv */
 void dPa_cleanupGX() {
     GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
     GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
@@ -55,14 +49,12 @@ void dPa_cleanupGX() {
     GXSetNumChans(0);
 }
 
-/* 803A8308-803A8314 005428 000C+00 1/1 0/0 0/0 .data            l_lifeBallColor */
 static GXColor l_lifeBallColor[3] = {
     {0xEB, 0x20, 0x78, 0xFF},
     {0x20, 0xF1, 0x9B, 0xFF},
     {0xEB, 0xD7, 0x2F, 0xFF},
 };
 
-/* 80049580-800495BC 043EC0 003C+00 0/0 1/1 8/8 .text            __ct__19dPa_followEcallBackFUcUc */
 dPa_followEcallBack::dPa_followEcallBack(u8 param_0, u8 param_1) {
     field_0x11 = param_0;
     field_0x12 = param_1;
@@ -70,8 +62,6 @@ dPa_followEcallBack::dPa_followEcallBack(u8 param_0, u8 param_1) {
     mpEmitter = NULL;
 }
 
-/* 800495BC-800496B0 043EFC 00F4+00 1/0 0/0 0/0 .text
- * execute__19dPa_followEcallBackFP14JPABaseEmitter             */
 void dPa_followEcallBack::execute(JPABaseEmitter* param_0) {
     if ((field_0x12 == 0) && ((field_0x10 & 2) == 0)) {
         param_0->setGlobalTranslation(field_0x8->x, field_0x8->y, field_0x8->z);
@@ -94,12 +84,8 @@ void dPa_followEcallBack::execute(JPABaseEmitter* param_0) {
     }
 }
 
-/* 800496B0-800496B4 043FF0 0004+00 1/0 0/0 0/0 .text
- * draw__19dPa_followEcallBackFP14JPABaseEmitter                */
 void dPa_followEcallBack::draw(JPABaseEmitter*) {}
 
-/* 800496B4-8004974C 043FF4 0098+00 1/0 0/0 0/0 .text
- * setup__19dPa_followEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 void dPa_followEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1,
                                 csXyz const* param_2, s8) {
     remove();
@@ -119,7 +105,6 @@ void dPa_followEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1,
     }
 }
 
-/* 8004974C-8004979C 04408C 0050+00 1/0 0/0 0/0 .text            end__19dPa_followEcallBackFv */
 void dPa_followEcallBack::end() {
     if (mpEmitter != NULL) {
         mpEmitter->becomeInvalidEmitter();
@@ -130,25 +115,18 @@ void dPa_followEcallBack::end() {
     }
 }
 
-/* 80450E90-80450E94 000390 0004+00 2/2 1/1 11/11 .sbss            mEcallback__18dPa_modelEcallBack
- */
 dPa_modelEcallBack dPa_modelEcallBack::mEcallback;
 
-/* 80450E94-80450E98 000394 0004+00 2/2 0/0 0/0 .sbss            mPcallback__18dPa_modelEcallBack */
 dPa_modelPcallBack dPa_modelEcallBack::mPcallback;
 
-/* 80450E98-80450E9C 000398 0004+00 5/5 0/0 0/0 .sbss            mModel__18dPa_modelEcallBack */
 dPa_modelEcallBack::model_c* dPa_modelEcallBack::mModel;
 
-/* 80450E9C-80450EA0 -00001 0004+00 3/3 0/0 0/0 .sbss            None */
 /* 80450E9C 0001+00 data_80450E9C None */
 /* 80450E9D 0001+00 data_80450E9D None */
 /* 80450E9E 0002+00 data_80450E9E None */
 static u8 struct_80450E9C;
 static u8 struct_80450E9D;
 
-/* 8004979C-800497B0 0440DC 0014+00 1/0 0/0 0/0 .text
- * setup__19dPa_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 //
 void dPa_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
                                     csXyz const* param_2, s8 param_3) {
@@ -156,8 +134,6 @@ void dPa_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
     param_0->setParticleCallBackPtr(dPa_control_c::getLight8PcallBack());
 }
 
-/* 800497B0-800497CC 0440F0 001C+00 1/0 0/0 0/0 .text
- * setup__25dPa_gen_b_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 void dPa_gen_b_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
                                           csXyz const* param_2, s8 param_3) {
     param_0->setDrawTimes(2);
@@ -165,8 +141,6 @@ void dPa_gen_b_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param
     param_0->setUserWork(param_3);
 }
 
-/* 800497CC-800497E8 04410C 001C+00 1/0 0/0 0/0 .text
- * setup__25dPa_gen_d_light8EcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 void dPa_gen_d_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
                                           csXyz const* param_2, s8 param_3) {
     param_0->setDrawTimes(2);
@@ -174,7 +148,6 @@ void dPa_gen_d_light8EcallBack::setup(JPABaseEmitter* param_0, cXyz const* param
     param_0->setUserWork(param_3);
 }
 
-/* 800497E8-80049934 044128 014C+00 3/3 0/0 0/0 .text            dPa_group_id_change__FPUlPUc */
 static void dPa_group_id_change(u32* param_0, u8* param_1) {
     if (*param_1 >= 15) {
         return;
@@ -226,7 +199,6 @@ static void dPa_group_id_change(u32* param_0, u8* param_1) {
     }
 }
 
-/* 80049934-80049B30 044274 01FC+00 1/1 0/0 0/0 .text            initiateLighting8__FR8_GXColors */
 static void initiateLighting8(_GXColor& param_0, s16 param_1) {
     GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
@@ -263,8 +235,6 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) {
     GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
 }
 
-/* 80049B30-80049BC0 044470 0090+00 1/1 0/0 0/0 .text            initiate_b_Lighting8__FR8_GXColor
- */
 static void initiate_b_Lighting8(_GXColor& param_0) {
     GXSetChanCtrl(GX_COLOR0, true, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
     GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT);
@@ -272,7 +242,6 @@ static void initiate_b_Lighting8(_GXColor& param_0) {
     GXSetChanMatColor(GX_COLOR0A0, g_whiteColor);
 }
 
-/* 80049BC0-80049C20 044500 0060+00 1/1 0/0 0/0 .text            drawFirst__FP14JPABaseEmitter */
 static void drawFirst(JPABaseEmitter* param_0) {
     GXSetColorUpdate(false);
     GXSetAlphaCompare(GX_GEQUAL, param_0->getGlobalAlpha(), GX_AOP_OR, GX_GEQUAL, param_0->getGlobalAlpha());
@@ -280,12 +249,10 @@ static void drawFirst(JPABaseEmitter* param_0) {
     GXSetZCompLoc(false);
 }
 
-/* 80049C20-80049C44 044560 0024+00 2/2 0/0 0/0 .text            drawFirst_l8__FP14JPABaseEmitter */
 static void drawFirst_l8(JPABaseEmitter* param_0) {
     GXSetColorUpdate(false);
 }
 
-/* 80049C44-80049E40 044584 01FC+00 1/1 0/0 0/0 .text drawSecond_light8__FP14JPABaseEmitter */
 static void drawSecond_light8(JPABaseEmitter* param_0) {
     s16 sVar1 = (param_0->mGlobalPrmClr.r);
     s16 sVar2 = (sVar1 << 8);
@@ -318,7 +285,6 @@ static void drawSecond_light8(JPABaseEmitter* param_0) {
     GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, true, GX_TEVPREV);
 }
 
-/* 80049E40-80049FEC 044780 01AC+00 2/2 0/0 0/0 .text drawSecond_b_light8__FP14JPABaseEmitter */
 static void drawSecond_b_light8(JPABaseEmitter* param_0) {
     dScnKy_env_light_c* envLight = dKy_getEnvlight();
     dKy_setLight_nowroom(dComIfGp_roomControl_getStayNo());
@@ -350,8 +316,6 @@ static void drawSecond_b_light8(JPABaseEmitter* param_0) {
     GXSetTevAlphaOp(GX_TEVSTAGE1, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, true, GX_TEVPREV);
 }
 
-/* 80049FEC-8004A108 04492C 011C+00 1/1 0/0 0/0 .text static_light8EcallBack__FP14JPABaseEmitter
- */
 static void static_light8EcallBack(JPABaseEmitter* param_0) {
     GXFlush();
     GXLoadPosMtxImm(j3dSys.getViewMtx(), 0);
@@ -377,8 +341,6 @@ static void static_light8EcallBack(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004A108-8004A224 044A48 011C+00 1/1 0/0 0/0 .text
- * static_gen_b_light8EcallBack__FP14JPABaseEmitter             */
 static void static_gen_b_light8EcallBack(JPABaseEmitter* param_0) {
     GXFlush();
     Mtx identity;
@@ -406,8 +368,6 @@ static void static_gen_b_light8EcallBack(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004A224-8004A340 044B64 011C+00 1/1 0/0 0/0 .text
- * static_gen_d_light8EcallBack__FP14JPABaseEmitter             */
 static void static_gen_d_light8EcallBack(JPABaseEmitter* param_0) {
     GXFlush();
     GXLoadPosMtxImm(j3dSys.getViewMtx(), 0);
@@ -433,25 +393,18 @@ static void static_gen_d_light8EcallBack(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004A340-8004A364 044C80 0024+00 1/0 0/0 0/0 .text
- * draw__19dPa_light8EcallBackFP14JPABaseEmitter                */
 void dPa_light8EcallBack::draw(JPABaseEmitter* param_0) {
     static_light8EcallBack(param_0);
 }
 
-/* 8004A364-8004A388 044CA4 0024+00 1/0 0/0 0/0 .text
- * draw__25dPa_gen_b_light8EcallBackFP14JPABaseEmitter          */
 void dPa_gen_b_light8EcallBack::draw(JPABaseEmitter* param_0) {
     static_gen_b_light8EcallBack(param_0);
 }
 
-/* 8004A388-8004A3AC 044CC8 0024+00 1/0 0/0 0/0 .text
- * draw__25dPa_gen_d_light8EcallBackFP14JPABaseEmitter          */
 void dPa_gen_d_light8EcallBack::draw(JPABaseEmitter* param_0) {
     static_gen_d_light8EcallBack(param_0);
 }
 
-/* 8004A3AC-8004A460 044CEC 00B4+00 2/2 0/0 0/0 .text dPa_setWindPower__FP15JPABaseParticle */
 static void dPa_setWindPower(JPABaseParticle* param_0) {
     f32 local_58;
     JGeometry::TVec3<f32> aTStack_18;
@@ -467,8 +420,6 @@ static void dPa_setWindPower(JPABaseParticle* param_0) {
     param_0->setOffsetPosition(aTStack_24);
 }
 
-/* 8004A460-8004A608 044DA0 01A8+00 1/0 0/0 0/0 .text
- * draw__18dPa_modelPcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_modelPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     Mtx local_74;
     Mtx local_44;
@@ -510,8 +461,6 @@ void dPa_modelPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1)
     param_1->setInvisibleParticleFlag();
 }
 
-/* 8004A608-8004A7AC 044F48 01A4+00 1/1 0/0 0/0 .text
- * set__Q218dPa_modelEcallBack7model_cFP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc */
 bool dPa_modelEcallBack::model_c::set(J3DModelData* param_0, dKy_tevstr_c const& param_1,
                                           u8 rotAxis, void* param_3, u8 param_4, u8 param_5) {
     if (field_0x0 != NULL) {
@@ -570,7 +519,6 @@ bool dPa_modelEcallBack::model_c::set(J3DModelData* param_0, dKy_tevstr_c const&
     return true;
 }
 
-/* 8004A7AC-8004A88C 0450EC 00E0+00 1/1 0/0 0/0 .text setup__Q218dPa_modelEcallBack7model_cFv */
 void dPa_modelEcallBack::model_c::setup() {
     if (field_0x4 != NULL) {
         if (field_0x392 == 0) {
@@ -591,7 +539,6 @@ void dPa_modelEcallBack::model_c::setup() {
 }
 
 
-/* 8004A88C-8004A8DC 0451CC 0050+00 1/1 0/0 0/0 .text cleanup__Q218dPa_modelEcallBack7model_cFv */
 void dPa_modelEcallBack::model_c::cleanup() {
     if (field_0x4 == NULL) {
         return;
@@ -604,8 +551,6 @@ void dPa_modelEcallBack::model_c::cleanup() {
     }
 }
 
-/* 8004A8DC-8004AA34 04521C 0158+00 1/1 0/0 0/0 .text draw__Q218dPa_modelEcallBack7model_cFPA4_f
- */
 void dPa_modelEcallBack::model_c::draw(f32 (*param_0)[4]) {
     J3DJoint* joint = field_0x0->getJointNodePointer(0);
     for (J3DMaterial* material = joint->getMesh(); material != NULL; material = material->getNext())
@@ -629,8 +574,6 @@ void dPa_modelEcallBack::model_c::draw(f32 (*param_0)[4]) {
     }
 }
 
-/* 8004AA34-8004AAA8 045374 0074+00 1/0 0/0 0/0 .text draw__18dPa_modelEcallBackFP14JPABaseEmitter
- */
 void dPa_modelEcallBack::draw(JPABaseEmitter* param_0) {
     if (param_0->isEnableDeleteEmitter()) {
         param_0->quitImmortalEmitter();
@@ -642,8 +585,6 @@ void dPa_modelEcallBack::draw(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004AAA8-8004AB1C 0453E8 0074+00 1/0 0/0 0/0 .text
- * setup__18dPa_modelEcallBackFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 void dPa_modelEcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
                                    csXyz const* param_2, s8 param_3) {
     param_0->setEmitterCallBackPtr(NULL);
@@ -662,14 +603,12 @@ void dPa_modelEcallBack::setup(JPABaseEmitter* param_0, cXyz const* param_1,
     }
 }
 
-/* 8004AB1C-8004AB88 04545C 006C+00 1/1 0/0 0/0 .text            create__18dPa_modelEcallBackFUc */
 void dPa_modelEcallBack::create(u8 param_0) {
     mModel = new model_c[param_0];
     struct_80450E9C = param_0;
     struct_80450E9D = 0;
 }
 
-/* 8004ABC4-8004AC00 045504 003C+00 1/1 0/0 0/0 .text            remove__18dPa_modelEcallBackFv */
 void dPa_modelEcallBack::remove() {
     if (mModel != NULL) {
         delete [] mModel;
@@ -677,8 +616,6 @@ void dPa_modelEcallBack::remove() {
     }
 }
 
-/* 8004AC00-8004AC90 045540 0090+00 0/0 1/1 11/11 .text
- * setModel__18dPa_modelEcallBackFP14JPABaseEmitterP12J3DModelDataRC12dKy_tevstr_cUcPvUcUc */
 int dPa_modelEcallBack::setModel(JPABaseEmitter* param_0, J3DModelData* param_1,
                                       dKy_tevstr_c const& param_2, u8 param_3, void* param_4,
                                       u8 param_5, u8 param_6) {
@@ -692,8 +629,6 @@ int dPa_modelEcallBack::setModel(JPABaseEmitter* param_0, J3DModelData* param_1,
     return 0;
 }
 
-/* 8004AC90-8004ACC0 0455D0 0030+00 1/1 0/0 0/0 .text
- * resetModel__18dPa_modelEcallBackFP14JPABaseEmitter           */
 void dPa_modelEcallBack::resetModel(JPABaseEmitter* param_0) {
     model_c* pModel = getModel(param_0);
     if (pModel) {
@@ -701,8 +636,6 @@ void dPa_modelEcallBack::resetModel(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004ACC0-8004ACEC 045600 002C+00 1/1 0/0 0/0 .text
- * setupModel__18dPa_modelEcallBackFP14JPABaseEmitter           */
 void dPa_modelEcallBack::setupModel(JPABaseEmitter* param_0) {
     model_c* pModel = getModel(param_0);
     if (pModel) {
@@ -710,8 +643,6 @@ void dPa_modelEcallBack::setupModel(JPABaseEmitter* param_0) {
     }
 }
 
-/* 8004ACEC-8004AD28 04562C 003C+00 1/1 0/0 0/0 .text
- * drawModel__18dPa_modelEcallBackFP14JPABaseEmitterPA4_f       */
 void dPa_modelEcallBack::drawModel(JPABaseEmitter* param_0, f32 (*param_1)[4]) {
     model_c* pModel = getModel(param_0);
     if (pModel) {
@@ -719,8 +650,6 @@ void dPa_modelEcallBack::drawModel(JPABaseEmitter* param_0, f32 (*param_1)[4]) {
     }
 }
 
-/* 8004AD28-8004AD58 045668 0030+00 1/1 0/0 0/0 .text
- * cleanupModel__18dPa_modelEcallBackFP14JPABaseEmitter         */
 void dPa_modelEcallBack::cleanupModel(JPABaseEmitter* param_0) {
     model_c* pModel = getModel(param_0);
     if (pModel) {
@@ -729,8 +658,6 @@ void dPa_modelEcallBack::cleanupModel(JPABaseEmitter* param_0) {
     dPa_cleanupGX();
 }
 
-/* 8004AD58-8004AD90 045698 0038+00 6/6 0/0 0/0 .text
- * getModel__18dPa_modelEcallBackFP14JPABaseEmitter             */
 dPa_modelEcallBack::model_c* dPa_modelEcallBack::getModel(JPABaseEmitter* param_0) {
     if (mModel != NULL && param_0 != NULL && param_0->getUserWork() != 0xffffffff) {
         return mModel + param_0->getUserWork();
@@ -738,8 +665,6 @@ dPa_modelEcallBack::model_c* dPa_modelEcallBack::getModel(JPABaseEmitter* param_
     return NULL;
 }
 
-/* 8004AD90-8004ADC4 0456D0 0034+00 1/1 0/0 0/0 .text
- * getRotAxis__18dPa_modelEcallBackFP14JPABaseEmitter           */
 u8 dPa_modelEcallBack::getRotAxis(JPABaseEmitter* param_0) {
     model_c* pModel = getModel(param_0);
     if (pModel) {
@@ -748,20 +673,15 @@ u8 dPa_modelEcallBack::getRotAxis(JPABaseEmitter* param_0) {
     return 0;
 }
 
-/* 8004ADC4-8004ADF4 045704 0030+00 1/0 0/0 0/0 .text
- * draw__22dPa_selectTexEcallBackFP14JPABaseEmitter             */
 void dPa_selectTexEcallBack::draw(JPABaseEmitter* param_0) {
     param_0->loadTexture(field_0x4, GX_TEXMAP0);
 }
 
-/* 8004ADF4-8004AE1C 045734 0028+00 1/1 0/0 0/0 .text            __ct__19dPa_simpleEcallBackFv */
 dPa_simpleEcallBack::dPa_simpleEcallBack() {
     mEmitter = NULL;
     field_0xc = 0;
 }
 
-/* 8004AE1C-8004AF94 04575C 0178+00 1/0 0/0 0/0 .text
- * executeAfter__19dPa_simpleEcallBackFP14JPABaseEmitter        */
 void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* param_0) {
     int currentCreateNumber = param_0->getCurrentCreateNumber();
     if (currentCreateNumber <= 0) {
@@ -791,14 +711,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* param_0) {
     param_0->stopCreateParticle();
 }
 
-/* 8004AF94-8004AF98 0458D4 0004+00 1/0 0/0 0/0 .text
- * draw__19dPa_simpleEcallBackFP14JPABaseEmitter                */
 void dPa_simpleEcallBack::draw(JPABaseEmitter* param_0) {
     /* empty function */
 }
 
-/* 8004AF98-8004B024 0458D8 008C+00 1/1 0/0 1/1 .text
- * create__19dPa_simpleEcallBackFP17JPAEmitterManagerUsUc       */
 JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* param_0, u16 id, u8 param_2) {
     mEmitter = NULL;
     field_0xa = param_2;
@@ -809,16 +725,12 @@ JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* param_0, u16 id,
     return mEmitter;
 }
 
-/* 8004B024-8004B060 045964 003C+00 1/1 0/0 0/0 .text            __dt__16dPa_simpleData_cFv */
 dPa_simpleData_c::~dPa_simpleData_c() {}
 
-/* 8004B060-8004B064 0459A0 0004+00 1/1 0/0 0/0 .text            __ct__16dPa_simpleData_cFv */
 dPa_simpleData_c::dPa_simpleData_c() {
     /* empty function */
 }
 
-/* 8004B064-8004B168 0459A4 0104+00 2/2 0/0 0/0 .text
- * createEmitter__19dPa_simpleEcallBackFP17JPAEmitterManager    */
 JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
     JPAResourceManager* this_00 = param_0->getResourceManager(dPa_control_c::getRM_ID(mID));
     u32 uVar1 = this_00->getResUserWork(mID);
@@ -839,8 +751,6 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) {
     return mEmitter;
 }
 
-/* 8004B168-8004B4E0 045AA8 0378+00 1/1 0/0 0/0 .text
- * set__19dPa_simpleEcallBackFPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif */
 u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3,
                                   _GXColor const& param_4, _GXColor const& param_5, int param_6,
                                   f32 param_7) {
@@ -932,14 +842,10 @@ u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8
     return 1;
 }
 
-/* 8004B4E0-8004B504 045E20 0024+00 1/0 0/0 0/0 .text
- * execute__17dPa_windPcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_windPcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     dPa_setWindPower(param_1);
 }
 
-/* 8004B504-8004B544 045E44 0040+00 3/3 0/0 0/0 .text
- * onActive__Q313dPa_control_c7level_c9emitter_cFv              */
 void dPa_control_c::level_c::emitter_c::onActive() {
     mStatus |= 1;
 
@@ -950,8 +856,6 @@ void dPa_control_c::level_c::emitter_c::onActive() {
     }
 }
 
-/* 8004B544-8004B5AC 045E84 0068+00 1/1 0/0 0/0 .text
- * entry__Q313dPa_control_c7level_c9emitter_cFUlUsP14JPABaseEmitterP18dPa_levelEcallBack */
 void dPa_control_c::level_c::emitter_c::entry(u32 id, u16 name, JPABaseEmitter* i_emitter,
                                               dPa_levelEcallBack* p_callback) {
     mId = id;
@@ -964,8 +868,6 @@ void dPa_control_c::level_c::emitter_c::entry(u32 id, u16 name, JPABaseEmitter*
     mEmitter->becomeImmortalEmitter();
 }
 
-/* 8004B5AC-8004B688 045EEC 00DC+00 1/1 0/0 0/0 .text
- * cleanup__Q313dPa_control_c7level_c9emitter_cFv               */
 void dPa_control_c::level_c::emitter_c::cleanup() {
     JPAEmitterCallBack* pdVar1 = mEmitter->getEmitterCallBackPtr();
     if (mCallback != NULL) {
@@ -985,8 +887,6 @@ void dPa_control_c::level_c::emitter_c::cleanup() {
     mId = 0;
 }
 
-/* 8004B688-8004B6F8 045FC8 0070+00 1/1 0/0 0/0 .text            __ct__Q213dPa_control_c7level_cFv
- */
 dPa_control_c::level_c::level_c() {
     field_0x0 = 0;
     mFreeNo = 0;
@@ -996,8 +896,6 @@ dPa_control_c::level_c::level_c() {
     }
 }
 
-/* 8004B6F8-8004B7A8 046038 00B0+00 1/1 0/0 0/0 .text
- * execute__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c */
 void dPa_control_c::level_c::execute(dPa_control_c::level_c::emitter_c* i_emitter) {
     if (!i_emitter->isActive()) {
         if (i_emitter->isEventMove() || !dComIfGp_event_runCheck()) {
@@ -1012,7 +910,6 @@ void dPa_control_c::level_c::execute(dPa_control_c::level_c::emitter_c* i_emitte
     }
 }
 
-/* 8004B7A8-8004B808 0460E8 0060+00 1/1 0/0 0/0 .text execute__Q213dPa_control_c7level_cFv */
 void dPa_control_c::level_c::execute() {
     emitter_c* emitter = mEmitter;
     
@@ -1024,7 +921,6 @@ void dPa_control_c::level_c::execute() {
     }
 }
 
-/* 8004B808-8004B874 046148 006C+00 2/2 0/0 0/0 .text cleanup__Q213dPa_control_c7level_cFv */
 void dPa_control_c::level_c::cleanup() {
     emitter_c* emitter = mEmitter;
     
@@ -1038,8 +934,6 @@ void dPa_control_c::level_c::cleanup() {
     }
 }
 
-/* 8004B874-8004B8B4 0461B4 0040+00 4/4 0/0 0/0 .text            get__Q213dPa_control_c7level_cFUl
- */
 dPa_control_c::level_c::emitter_c* dPa_control_c::level_c::get(u32 id) {
     if (id == 0) {
         return NULL;
@@ -1054,8 +948,6 @@ dPa_control_c::level_c::emitter_c* dPa_control_c::level_c::get(u32 id) {
     return NULL;
 }
 
-/* 8004B8B4-8004B8E8 0461F4 0034+00 1/1 5/5 40/40 .text
- * forceOnEventMove__Q213dPa_control_c7level_cFUl               */
 void dPa_control_c::level_c::forceOnEventMove(u32 id) {
     emitter_c* emitter = get(id);
 
@@ -1064,8 +956,6 @@ void dPa_control_c::level_c::forceOnEventMove(u32 id) {
     }
 }
 
-/* 8004B8E8-8004B918 046228 0030+00 0/0 1/1 0/0 .text
- * allForceOnEventMove__Q213dPa_control_c7level_cFv             */
 void dPa_control_c::level_c::allForceOnEventMove() {
     emitter_c* emitter = mEmitter;
 
@@ -1077,8 +967,6 @@ void dPa_control_c::level_c::allForceOnEventMove() {
     }
 }
 
-/* 8004B918-8004B94C 046258 0034+00 1/1 22/22 181/181 .text
- * getEmitter__Q213dPa_control_c7level_cFUl                     */
 JPABaseEmitter* dPa_control_c::level_c::getEmitter(u32 id) {
     emitter_c* emitter = get(id);
     
@@ -1089,8 +977,6 @@ JPABaseEmitter* dPa_control_c::level_c::getEmitter(u32 id) {
     return emitter->getEmitter();
 }
 
-/* 8004B94C-8004BA40 04628C 00F4+00 1/1 0/0 0/0 .text
- * entry__Q213dPa_control_c7level_cFUsP14JPABaseEmitterP18dPa_levelEcallBack */
 u32 dPa_control_c::level_c::entry(u16 i_name, JPABaseEmitter* i_emitter,
                                        dPa_levelEcallBack* i_callback) {
     for (int i = 0; i < EMITTER_MAX; i++) {
@@ -1115,8 +1001,6 @@ u32 dPa_control_c::level_c::entry(u16 i_name, JPABaseEmitter* i_emitter,
     return 0;
 }
 
-/* 8004BA40-8004BA74 046380 0034+00 1/1 0/0 0/0 .text
- * addTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c */
 void dPa_control_c::level_c::addTable(dPa_control_c::level_c::emitter_c* i_emitter) {
     u32 id = i_emitter->getId() & 0xFF;
 
@@ -1130,8 +1014,6 @@ void dPa_control_c::level_c::addTable(dPa_control_c::level_c::emitter_c* i_emitt
     mTable[id] = i_emitter;
 }
 
-/* 8004BA74-8004BACC 0463B4 0058+00 3/3 0/0 0/0 .text
- * cutTable__Q213dPa_control_c7level_cFPQ313dPa_control_c7level_c9emitter_c */
 void dPa_control_c::level_c::cutTable(dPa_control_c::level_c::emitter_c* i_emitter) {
     emitter_c* pre = i_emitter->getPre();
     emitter_c* next = i_emitter->getNext();
@@ -1149,7 +1031,6 @@ void dPa_control_c::level_c::cutTable(dPa_control_c::level_c::emitter_c* i_emitt
     i_emitter->cleanup();
 }
 
-/* 80424794-804247D4 0514B4 0040+00 0/1 1/1 1/1 .bss             mTsubo__13dPa_control_c */
 dPa_selectTexEcallBack dPa_control_c::mTsubo[] = {
     dPa_selectTexEcallBack(0),
     dPa_selectTexEcallBack(1),
@@ -1161,53 +1042,36 @@ dPa_selectTexEcallBack dPa_control_c::mTsubo[] = {
     dPa_selectTexEcallBack(7),
 };
 
-/* 804247F8-80424810 051518 0018+00 0/1 0/0 0/0 .bss             mLifeBall__13dPa_control_c */
 dPa_setColorEcallBack dPa_control_c::mLifeBall[3] = {
     dPa_setColorEcallBack(l_lifeBallColor[0]),
     dPa_setColorEcallBack(l_lifeBallColor[1]),
     dPa_setColorEcallBack(l_lifeBallColor[2]),
 };
 
-/* 80450EA0-80450EA4 0003A0 0004+00 14/14 1/1 0/0 .sbss            mEmitterMng__13dPa_control_c */
 JPAEmitterManager* dPa_control_c::mEmitterMng;
 
-/* 80450EA4-80450EA8 0003A4 0004+00 1/1 1/1 0/0 .sbss mWaterBubblePcallBack__13dPa_control_c */
 dPa_wbPcallBack_c dPa_control_c::mWaterBubblePcallBack;
 
-/* 80450EA8-80450EAC 0003A8 0004+00 3/3 0/0 0/0 .sbss            mFsenthPcallBack__13dPa_control_c
- */
 dPa_fsenthPcallBack dPa_control_c::mFsenthPcallBack;
 
-/* 80450EAC-80450EB0 0003AC 0004+00 2/2 0/0 1/1 .sbss            mLight8EcallBack__13dPa_control_c
- */
 dPa_light8EcallBack dPa_control_c::mLight8EcallBack;
 
-/* 80450EB0-80450EB4 0003B0 0004+00 2/2 0/0 0/0 .sbss            mLight8PcallBack__13dPa_control_c
- */
 dPa_light8PcallBack dPa_control_c::mLight8PcallBack;
 
-/* 80450EB4-80450EB8 0003B4 0004+00 3/3 0/0 0/0 .sbss m_b_Light8EcallBack__13dPa_control_c */
 dPa_gen_b_light8EcallBack dPa_control_c::m_b_Light8EcallBack;
 
-/* 80450EB8-80450EBC 0003B8 0004+00 2/2 0/0 0/0 .sbss m_b_Light8PcallBack__13dPa_control_c */
 dPa_gen_b_light8PcallBack dPa_control_c::m_b_Light8PcallBack;
 
-/* 80450EBC-80450EC0 0003BC 0004+00 3/3 0/0 0/0 .sbss m_d_Light8EcallBack__13dPa_control_c */
 dPa_gen_d_light8EcallBack dPa_control_c::m_d_Light8EcallBack;
 
-/* 80450EC0-80450EC4 0003C0 0004+00 2/2 0/0 0/0 .sbss m_d_Light8PcallBack__13dPa_control_c */
 dPa_gen_d_light8PcallBack dPa_control_c::m_d_Light8PcallBack;
 
-/* 80450EC4-80450EC8 0003C4 0004+00 1/1 2/2 0/0 .sbss            None */
 u8 dPa_control_c::mStatus;
 
-/* 80424870-804248A0 051590 0030+00 1/1 0/0 0/0 .bss             mWindViewMatrix__13dPa_control_c */
 Mtx dPa_control_c::mWindViewMatrix;
 
-/* 80450EC8-80450ED0 0003C8 0004+04 2/2 1/1 17/17 .sbss mParticleTracePCB__13dPa_control_c */
 dPa_particleTracePcallBack_c dPa_control_c::mParticleTracePCB;
 
-/* 8004BACC-8004BB70 04640C 00A4+00 0/0 1/1 0/0 .text            __ct__13dPa_control_cFv */
 dPa_control_c::dPa_control_c() {
     m_resHeap = JKRCreateExpHeap(0x96000, mDoExt_getArchiveHeap(), false);
     mHeap = NULL;
@@ -1222,13 +1086,10 @@ dPa_control_c::dPa_control_c() {
     MTXIdentity(mWindViewMatrix);
 }
 
-/* 8004BB70-8004BB78 0464B0 0008+00 4/4 0/0 0/0 .text            getRM_ID__13dPa_control_cFUs */
 u8 dPa_control_c::getRM_ID(u16 param_0) {
     return (param_0 >> 15) & 1;
 }
 
-/* 8004BB78-8004BCDC 0464B8 0164+00 0/0 1/1 0/0 .text            createCommon__13dPa_control_cFPCv
- */
 void dPa_control_c::createCommon(void const* param_0) {
     mHeap = mDoExt_createSolidHeapFromSystem(0, 0);
     mCommonResMng = new (mHeap, 0) JPAResourceManager(param_0, mHeap);
@@ -1251,8 +1112,6 @@ void dPa_control_c::createCommon(void const* param_0) {
     mDoExt_adjustSolidHeap(mHeap);
 }
 
-/* 8004BCDC-8004BDFC 04661C 0120+00 1/1 0/0 0/0 .text            createRoomScene__13dPa_control_cFv
- */
 void dPa_control_c::createRoomScene() {
     m_sceneHeap = mDoExt_createSolidHeapFromGame(0, 0);
     mSceneResMng = new (m_sceneHeap, 0) JPAResourceManager(m_sceneRes, m_sceneHeap);
@@ -1273,8 +1132,6 @@ void dPa_control_c::createRoomScene() {
     mDoExt_adjustSolidHeap(m_sceneHeap);
 }
 
-/* 8004BDFC-8004BEB0 04673C 00B4+00 0/0 1/1 0/0 .text
- * readScene__13dPa_control_cFUcPP21mDoDvdThd_toMainRam_c       */
 bool dPa_control_c::readScene(u8 param_0, mDoDvdThd_toMainRam_c** param_1) {
     if (param_0 == 0xff || param_0 == field_0x18) {
         return 0;
@@ -1291,7 +1148,6 @@ bool dPa_control_c::readScene(u8 param_0, mDoDvdThd_toMainRam_c** param_1) {
     return 1;
 }
 
-/* 8004BEB0-8004BF3C 0467F0 008C+00 0/0 1/1 0/0 .text            createScene__13dPa_control_cFPCv */
 void dPa_control_c::createScene(void const* param_0) {
     for (int i = 0; i < field_0x1a; i++) {
         field_0x1c[i].createEmitter(mEmitterMng);
@@ -1305,8 +1161,6 @@ void dPa_control_c::createScene(void const* param_0) {
     dPa_modelEcallBack::create(0x80);
 }
 
-/* 8004BF3C-8004BFD4 04687C 0098+00 1/1 0/0 0/0 .text            removeRoomScene__13dPa_control_cFb
- */
 bool dPa_control_c::removeRoomScene(bool param_0) {
     if (m_sceneHeap == NULL) {
         return false;
@@ -1326,7 +1180,6 @@ bool dPa_control_c::removeRoomScene(bool param_0) {
     return true;
 }
 
-/* 8004BFD4-8004C054 046914 0080+00 0/0 1/1 0/0 .text            removeScene__13dPa_control_cFb */
 void dPa_control_c::removeScene(bool param_0) {
     field_0x210.cleanup();
     removeRoomScene(param_0);
@@ -1338,12 +1191,10 @@ void dPa_control_c::removeScene(bool param_0) {
     dPa_modelEcallBack::remove();
 }
 
-/* 8004C054-8004C078 046994 0024+00 0/0 2/2 0/0 .text            cleanup__13dPa_control_cFv */
 void dPa_control_c::cleanup() {
     field_0x210.cleanup();
 }
 
-/* 8004C078-8004C0EC 0469B8 0074+00 0/0 1/1 0/0 .text            calc3D__13dPa_control_cFv */
 void dPa_control_c::calc3D() {
     if (isStatus(2)) {
         offStatus(2);
@@ -1355,14 +1206,12 @@ void dPa_control_c::calc3D() {
     }
 }
 
-/* 8004C0EC-8004C134 046A2C 0048+00 0/0 1/1 0/0 .text            calc2D__13dPa_control_cFv */
 void dPa_control_c::calc2D() {
     for (u8 i = 14; i <= 16; i++) {
         mEmitterMng->calc(i);
     }
 }
 
-/* 8004C134-8004C188 046A74 0054+00 0/0 1/1 0/0 .text            calcMenu__13dPa_control_cFv */
 void dPa_control_c::calcMenu() {
     if (mEmitterMng != NULL) {
         for (u8 i = 17; i <= 18; i++) {
@@ -1371,7 +1220,6 @@ void dPa_control_c::calcMenu() {
     }
 }
 
-/* 8004C188-8004C218 046AC8 0090+00 0/0 1/1 0/0 .text draw__13dPa_control_cFP11JPADrawInfoUc */
 void dPa_control_c::draw(JPADrawInfo* param_0, u8 param_1) {
     if (mEmitterMng != NULL) {
         j3dSys.reinitGX();
@@ -1388,8 +1236,6 @@ void dPa_control_c::draw(JPADrawInfo* param_0, u8 param_1) {
     }
 }
 
-/* 8004C218-8004C838 046B58 0620+00 0/0 7/7 54/54 .text
- * setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl */
 void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* param_3,
                                csXyz const* param_4, cXyz const* param_5, u32 param_6) {
     cXyz cStack_34;
@@ -1450,8 +1296,6 @@ void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* par
     }
 }
 
-/* 8004C838-8004CA90 047178 0258+00 0/0 2/2 3/3 .text
- * setWaterRipple__13dPa_control_cFPUlR13cBgS_PolyInfoPC4cXyzfPC12dKy_tevstr_cPC4cXyzSc */
 void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz const* param_2,
                                        f32 param_3, dKy_tevstr_c const* param_4,
                                        cXyz const* param_5, s8 param_6) {
@@ -1605,8 +1449,6 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos,
     return this_00;
 }
 
-/* 8004CF90-8004D068 0478D0 00D8+00 4/4 1/1 0/0 .text
- * getPolyColor__13dPa_control_cFR13cBgS_PolyInfoiP8_GXColorP8_GXColorPUcPf */
 s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* param_2,
                                      _GXColor* param_3, u8* param_4, f32* param_5) {
     if (!dComIfG_Bgsp().ChkPolySafe(param_0)) {
@@ -1648,8 +1490,6 @@ JPABaseEmitter* dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz
     return NULL;
 }
 
-/* 8004D128-8004D1B8 047A68 0090+00 2/2 0/0 0/0 .text            newSimple__13dPa_control_cFUsUcPUl
- */
 bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
     if (field_0x19 >= 0x19) {
         OSReport("\x1B[43;30m１エミッター登録数オーバー！！\n");
@@ -1662,8 +1502,6 @@ bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) {
     return true;
 }
 
-/* 8004D1B8-8004D23C 047AF8 0084+00 0/0 0/0 9/9 .text
- * setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif */
 u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const* param_2,
                                   u8 param_3, _GXColor const& param_4, _GXColor const& param_5,
                                   int param_6, f32 param_7) {
@@ -1675,7 +1513,6 @@ u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const*
     return cb->set(i_pos, param_2, param_3, param_4, param_5, param_6, param_7);
 }
 
-/* 8004D23C-8004D278 047B7C 003C+00 1/1 0/0 0/0 .text            getSimple__13dPa_control_cFUs */
 dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
     dPa_simpleEcallBack* arr = field_0x1c;
     for (int i = 0; i < field_0x19; i++, arr++) {
@@ -1686,8 +1523,6 @@ dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) {
     return NULL;
 }
 
-/* 8004D278-8004D4CC 047BB8 0254+00 1/1 0/0 0/0 .text
- * dPa_kankyocolor_set__FfP14JPABaseEmitterPC12dKy_tevstr_cUlPC4cXyzPC8_GXColorPC8_GXColor */
 static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
                                     dKy_tevstr_c const* param_2, u32 param_3, cXyz const* param_4,
                                     _GXColor const* param_5, _GXColor const* param_6) {
@@ -1801,8 +1636,6 @@ u32 dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2,
     return 0;
 }
 
-/* 8004D770-8004D7C4 0480B0 0054+00 0/0 1/1 0/0 .text            setStopContinue__13dPa_control_cFUl
- */
 u32 dPa_control_c::setStopContinue(u32 param_0) {
     level_c::emitter_c* emitter = field_0x210.get(param_0);
     if (emitter != NULL) {
@@ -1940,8 +1773,6 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons
     return uVar5;
 }
 
-/* 8004DC28-8004DCA0 048568 0078+00 1/0 0/0 0/0 .text
- * execute__17dPa_wbPcallBack_cFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_wbPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     JGeometry::TVec3<f32> local_18;
     param_1->getGlobalPosition(local_18);
@@ -1952,8 +1783,6 @@ void dPa_wbPcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_
     }
 }
 
-/* 8004DCA0-8004DD0C 0485E0 006C+00 1/0 0/0 0/0 .text
- * execute__19dPa_fsenthPcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_fsenthPcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     if (g_env_light.now_senses_effect == 1 && g_env_light.senses_effect_strength > 0.0f) {
         param_0->setGlobalAlpha(255.0f * g_env_light.senses_effect_strength);
@@ -1964,32 +1793,22 @@ void dPa_fsenthPcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* para
     }
 }
 
-/* 8004DD0C-8004DD10 04864C 0004+00 1/0 0/0 0/0 .text
- * draw__19dPa_fsenthPcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_fsenthPcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     /* empty function */
 }
 
-/* 8004DD10-8004DD14 048650 0004+00 1/0 0/0 0/0 .text
- * execute__19dPa_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     /* empty function */
 }
 
-/* 8004DD14-8004DD18 048654 0004+00 1/0 0/0 0/0 .text
- * execute__25dPa_gen_b_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_gen_b_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     /* empty function */
 }
 
-/* 8004DD18-8004DD1C 048658 0004+00 1/0 0/0 0/0 .text
- * execute__25dPa_gen_d_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_gen_d_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     /* empty function */
 }
 
-/* 8004DD1C-8004E6A8 04865C 098C+00 1/0 0/0 0/0 .text
- * draw__19dPa_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2) {
     Mtx local_60;
     Mtx auStack_90;
@@ -2112,8 +1931,6 @@ void dPa_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2
     param_2->setInvisibleParticleFlag();
 }
 
-/* 8004E6A8-8004ED44 048FE8 069C+00 1/0 0/0 0/0 .text
- * draw__25dPa_gen_b_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2) {
     Mtx local_80;
     JGeometry::TVec3<f32> local_8c;
@@ -2202,8 +2019,6 @@ void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
     param_2->setInvisibleParticleFlag();
 }
 
-/* 8004ED44-8004F6B8 049684 0974+00 1/0 0/0 0/0 .text
- * draw__25dPa_gen_d_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_gen_d_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2) {
     Mtx local_60;
     Mtx auStack_90;
@@ -2322,15 +2137,11 @@ void dPa_gen_d_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p
     param_2->setInvisibleParticleFlag();
 }
 
-/* 8004F6B8-8004F6C4 049FF8 000C+00 0/0 2/2 3/3 .text
- * setOldPosP__22dPa_hermiteEcallBack_cFPC4cXyzPC4cXyz          */
 void dPa_hermiteEcallBack_c::setOldPosP(cXyz const* param_0, cXyz const* param_1) {
     field_0x10 = param_0;
     field_0x14 = param_1;
 }
 
-/* 8004F6C4-8004FABC 04A004 03F8+00 1/0 0/0 0/0 .text
- * executeAfter__22dPa_hermiteEcallBack_cFP14JPABaseEmitter     */
 void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) {
     JGeometry::TVec3<f32> aTStack_68;
     JGeometry::TVec3<f32> local_74;
@@ -2371,8 +2182,6 @@ void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) {
     }
 }
 
-/* 8004FABC-8004FAD4 04A3FC 0018+00 1/0 0/0 0/0 .text
- * setup__22dPa_hermiteEcallBack_cFP14JPABaseEmitterPC4cXyzPC5csXyzSc */
 void dPa_hermiteEcallBack_c::setup(JPABaseEmitter* param_0, cXyz const* param_1,
                                        csXyz const* param_2, s8 param_3) {
     field_0xc = param_1;
@@ -2380,8 +2189,6 @@ void dPa_hermiteEcallBack_c::setup(JPABaseEmitter* param_0, cXyz const* param_1,
     mMaxCnt = 0;
 }
 
-/* 8004FAD4-8004FB18 04A414 0044+00 1/0 0/0 0/0 .text
- * execute__28dPa_particleTracePcallBack_cFP14JPABaseEmitterP15JPABaseParticle */
 void dPa_particleTracePcallBack_c::execute(JPABaseEmitter* param_0, JPABaseParticle* param_1) {
     if (param_1->getAge() > 0) {
         Vec* vec = (Vec*)param_0->getUserWork();
diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp
index f1c355eb16..2076e2e5c4 100644
--- a/src/d/d_particle_copoly.cpp
+++ b/src/d/d_particle_copoly.cpp
@@ -8,7 +8,6 @@
 #include "d/d_particle_copoly.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 80050C9C-80050CC4 04B5DC 0028+00 0/0 2/2 27/27 .text            init__7dPaPo_cFP9dBgS_Acchff */
 void dPaPo_c::init(dBgS_Acch* param_0, f32 i_waterOffset, f32 i_rippleOffset) {
     field_0x28 = param_0;
     mWaterOffset = i_waterOffset;
@@ -18,8 +17,6 @@ void dPaPo_c::init(dBgS_Acch* param_0, f32 i_waterOffset, f32 i_rippleOffset) {
     field_0x37 = 1;
 }
 
-/* 80050CC4-80050E7C 04B604 01B8+00 1/1 0/0 0/0 .text
- * checkWaterIn__7dPaPo_cFP4cXyzPC4cXyzPC12dKy_tevstr_cUlScff   */
 int dPaPo_c::checkWaterIn(cXyz* param_0, cXyz const* param_1, dKy_tevstr_c const* param_2,
                           u32 param_3, s8 param_4, f32 param_5, f32 param_6) {
     if (field_0x28->ChkWaterHit() && dComIfG_Bgsp().ChkPolySafe(field_0x28->m_wtr) &&
@@ -61,8 +58,6 @@ int dPaPo_c::checkWaterIn(cXyz* param_0, cXyz const* param_1, dKy_tevstr_c const
     return 0;
 }
 
-/* 80050E7C-80051008 04B7BC 018C+00 3/3 0/0 0/0 .text
- * setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc */
 void dPaPo_c::setEffect(u32* param_0, int param_1, dKy_tevstr_c const* param_2, cXyz const* param_3,
                         u32 param_4, u32 param_5, cXyz const* param_6, csXyz const* param_7,
                         s8 param_8, u8* param_9, u8* param_10) {
@@ -112,8 +107,6 @@ void dPaPo_c::setEffect(u32* param_0, int param_1, dKy_tevstr_c const* param_2,
     }
 }
 
-/* 80051008-8005113C 04B948 0134+00 1/1 1/1 12/12 .text
- * setEffectCenter__7dPaPo_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzPC4cXyzScff */
 int dPaPo_c::setEffectCenter(dKy_tevstr_c const* param_0, cXyz const* param_1, u32 param_2,
                              u32 param_3, cXyz const* param_4, csXyz const* param_5,
                              cXyz const* param_6, s8 param_7, f32 param_8, f32 param_9) {
@@ -141,7 +134,6 @@ int dPaPo_c::setEffectCenter(dKy_tevstr_c const* param_0, cXyz const* param_1, u
     return rt;
 }
 
-/* 8005113C-8005115C 04BA7C 0020+00 2/2 0/0 0/0 .text            clearID__7dPaPo_cFPUlPUc */
 void dPaPo_c::clearID(u32* param_0, u8* param_1) {
     *param_1 = 0;
 
@@ -151,8 +143,6 @@ void dPaPo_c::clearID(u32* param_0, u8* param_1) {
     }
 }
 
-/* 8005115C-80051294 04BA9C 0138+00 1/1 1/1 2/2 .text
- * setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff */
 int dPaPoT_c::setEffectTwo(dKy_tevstr_c const* param_0, cXyz const* param_1, u32 param_2,
                            u32 param_3, cXyz const* param_4, cXyz const* param_5,
                            cXyz const* param_6, csXyz const* param_7, cXyz const* param_8,
@@ -182,7 +172,6 @@ int dPaPoT_c::setEffectTwo(dKy_tevstr_c const* param_0, cXyz const* param_1, u32
     return rt;
 }
 
-/* 80051294-800512E8 04BBD4 0054+00 1/1 0/0 0/0 .text            clearTwoAllID__8dPaPoT_cFv */
 void dPaPoT_c::clearTwoAllID() {
     clearLeftID();
     clearRightID();
@@ -222,34 +211,29 @@ int dPaPoF_c::setEffectFour(dKy_tevstr_c const* param_0, cXyz const* param_1, u3
     return rt;
 }
 
-/* 80051424-80051470 04BD64 004C+00 0/0 1/1 0/0 .text            clearFourAllID__8dPaPoF_cFv */
 void dPaPoF_c::clearFourAllID() {
     clearBLeftID();
     clearBRightID();
     clearTwoAllID();
 }
 
-/* 803A8628-803A864C 005748 0024+00 0/1 0/0 0/0 .data            m_typeTwoData__8dPaPoT_c */
 dPaPoT_c::effTypeFunc dPaPoT_c::m_typeTwoData[] = {
     &dPaPoT_c::getCenterEffType,
     &dPaPoT_c::getLeftEffType,
     &dPaPoT_c::getRightEffType,
 };
 
-/* 803A8670-803A8694 005790 0024+00 0/1 0/0 1/1 .data            m_emitterTwoData__8dPaPoT_c */
 dPaPoT_c::emitterFunc dPaPoT_c::m_emitterTwoData[] = {
     &dPaPoT_c::getCenterEmitter,
     &dPaPoT_c::getLeftEmitter,
     &dPaPoT_c::getRightEmitter,
 };
 
-/* 803A86D0-803A870C 0057F0 003C+00 0/1 5/5 1/1 .data            m_typeFourData__8dPaPoF_c */
 dPaPoF_c::effTypeFunc dPaPoF_c::m_typeFourData[] = {
     &dPaPoF_c::getCenterEffType,   &dPaPoF_c::getLeftEffType,      &dPaPoF_c::getRightEffType,
     &dPaPoF_c::getBackLeftEffType, &dPaPoF_c::getBackRightEffType,
 };
 
-/* 803A8748-803A87A0 005868 003C+1C 0/1 5/5 1/1 .data            m_emitterFourData__8dPaPoF_c */
 dPaPoF_c::emitterFunc dPaPoF_c::m_emitterFourData[] = {
     &dPaPoF_c::getCenterEmitter,   &dPaPoF_c::getLeftEmitter,      &dPaPoF_c::getRightEmitter,
     &dPaPoF_c::getBackLeftEmitter, &dPaPoF_c::getBackRightEmitter,
diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp
index d261097864..5cf1fdfa32 100644
--- a/src/d/d_particle_name.cpp
+++ b/src/d/d_particle_name.cpp
@@ -2,7 +2,6 @@
 
 #include "d/d_particle_name.h"
 
-/* 803A85D0-803A85DC 0056F0 000A+02 0/0 1/1 0/0 .data            j_o_id__8dPa_name */
 u16 dPa_name::j_o_id[5] = {
     ID_ZI_J_O_DIGTGA_A,
     ID_ZI_J_O_DIGTGA_B,
@@ -11,7 +10,6 @@ u16 dPa_name::j_o_id[5] = {
     ID_ZI_J_O_KAGEROU,
 };
 
-/* 803A85DC-803A85F8 0056FC 001C+00 0/0 1/1 0/0 .data            s_o_id__8dPa_name */
 u16 dPa_name::s_o_id[14] = {
     dPa_RM(ID_ZI_S_O_FIRE2_A),
     dPa_RM(ID_ZI_S_O_FIRE2_B),
diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp
index a3ddff6259..bbf549364f 100644
--- a/src/d/d_path.cpp
+++ b/src/d/d_path.cpp
@@ -8,7 +8,6 @@
 #include "d/d_path.h"
 #include "d/d_com_inf_game.h"
 
-/* 800517B0-800517EC 04C0F0 003C+00 0/0 7/7 63/63 .text            dPath_GetPnt__FPC5dPathi */
 dPnt* dPath_GetPnt(dPath const* path, int pnt_index) {
     if (path == NULL || path->m_points == NULL || pnt_index < 0 || pnt_index >= path->m_num) {
         return NULL;
@@ -17,7 +16,6 @@ dPnt* dPath_GetPnt(dPath const* path, int pnt_index) {
     return &path->m_points[pnt_index];
 }
 
-/* 800517EC-80051898 04C12C 00AC+00 1/1 12/12 82/82 .text            dPath_GetRoomPath__Fii */
 dPath* dPath_GetRoomPath(int path_index, int room_no) {
     dStage_dPath_c* path;
 
@@ -39,8 +37,6 @@ dPath* dPath_GetRoomPath(int path_index, int room_no) {
     return &path->m_path[path_index];
 }
 
-/* 80051898-8005195C 04C1D8 00C4+00 0/0 1/1 3/3 .text            dPath_GetNextRoomPath__FPC5dPathi
- */
 dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) {
     dStage_dPath_c* path;
 
@@ -67,8 +63,6 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) {
     return &path->m_path[next_id];
 }
 
-/* 8005195C-80051AC0 04C29C 0164+00 0/0 1/1 4/4 .text
- * dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi         */
 u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2) {
     int roomId = dComIfG_Bgsp().GetRoomId(poly);
     int roomPathId = dComIfG_Bgsp().GetRoomPathId(poly);
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 8fe21d8c7a..7e4f306339 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -16,7 +16,6 @@
 #include "m_Do/m_Do_graphic.h"
 #include <stdio.h>
 
-/* 8003A260-8003A280 034BA0 0020+00 0/0 1/1 0/0 .text            __ct__11dRes_info_cFv */
 dRes_info_c::dRes_info_c() {
     mCount = 0;
     mDMCommand = NULL;
@@ -26,7 +25,6 @@ dRes_info_c::dRes_info_c() {
     mRes = NULL;
 }
 
-/* 8003A280-8003A348 034BC0 00C8+00 3/3 1/1 0/0 .text            __dt__11dRes_info_cFv */
 dRes_info_c::~dRes_info_c() {
     if (mDMCommand != NULL) {
         delete mDMCommand;
@@ -43,7 +41,6 @@ dRes_info_c::~dRes_info_c() {
     }
 }
 
-/* 8003A348-8003A3F0 034C88 00A8+00 1/1 0/0 0/0 .text set__11dRes_info_cFPCcPCcUcP7JKRHeap */
 int dRes_info_c::set(char const* i_arcName, char const* i_path, u8 i_mountDirection, JKRHeap* i_heap) {
     char path[40];
 
@@ -62,7 +59,6 @@ int dRes_info_c::set(char const* i_arcName, char const* i_path, u8 i_mountDirect
     return true;
 }
 
-/* 8003A3F0-8003A490 034D30 00A0+00 1/1 0/0 0/0 .text            setAlpha__FP16J3DMaterialTable */
 static void setAlpha(J3DMaterialTable* i_matTable) {
     for (u16 i = 0; i < i_matTable->getMaterialNum(); i++) {
         J3DMaterial* mat = i_matTable->getMaterialNodePointer(i);
@@ -78,7 +74,6 @@ static void setAlpha(J3DMaterialTable* i_matTable) {
     }
 }
 
-/* 8003A490-8003A81C 034DD0 038C+00 1/1 0/0 0/0 .text            setIndirectTex__FP12J3DModelData */
 static void setIndirectTex(J3DModelData* i_modelData) {
     const char* textureName;
     J3DMaterialTable& materialTable = i_modelData->getMaterialTable();
@@ -104,12 +99,10 @@ static void setIndirectTex(J3DModelData* i_modelData) {
     }
 }
 
-/* 8003A81C-8003A840 03515C 0024+00 1/1 0/0 0/0 .text            setAlpha__FP12J3DModelData */
 static void setAlpha(J3DModelData* i_modelData) {
     setAlpha(&i_modelData->getMaterialTable());
 }
 
-/* 80379840-803798A4 005EA0 0064+00 2/2 0/0 0/0 .rodata          l_texMtxInfo */
 static const J3DTexMtxInfo l_texMtxInfo = {
     0x00,
     0x08, 0x00, 0x00,
@@ -123,8 +116,6 @@ static const J3DTexMtxInfo l_texMtxInfo = {
     },
 };
 
-/* 8003A840-8003AACC 035180 028C+00 1/1 0/0 0/0 .text            addWarpMaterial__FP12J3DModelData
- */
 // NONMATCHING l_alphaCompInfo needs to be placed in .sdata2, but the function breaks if it is declared const
 // Also see J3DAlphaComp::setAlphaCompInfo in J3DMatBlock.h
 static void addWarpMaterial(J3DModelData* i_modelData) {
@@ -181,8 +172,6 @@ static void addWarpMaterial(J3DModelData* i_modelData) {
     }
 }
 
-/* 8003AB30-8003AC1C 035470 00EC+00 0/0 2/1 0/0 .text
- * onWarpMaterial__11dRes_info_cFP12J3DModelData                */
 void dRes_info_c::onWarpMaterial(J3DModelData* i_modelData) {
     for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) {
         J3DMaterial* material = i_modelData->getMaterialNodePointer(i);
@@ -199,8 +188,6 @@ void dRes_info_c::onWarpMaterial(J3DModelData* i_modelData) {
     }
 }
 
-/* 8003AC1C-8003AD08 03555C 00EC+00 0/0 2/1 0/0 .text
- * offWarpMaterial__11dRes_info_cFP12J3DModelData               */
 void dRes_info_c::offWarpMaterial(J3DModelData* i_modelData) {
     for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) {
         J3DMaterial* material = i_modelData->getMaterialNodePointer(i);
@@ -216,8 +203,6 @@ void dRes_info_c::offWarpMaterial(J3DModelData* i_modelData) {
     }
 }
 
-/* 8003AD08-8003AE14 035648 010C+00 0/0 1/1 0/0 .text
- * setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff           */
 void dRes_info_c::setWarpSRT(J3DModelData* i_modelData, const cXyz& i_pos, f32 i_transX,
                              f32 i_transY) {
     J3DMaterial* material = i_modelData->getMaterialNodePointer(0);
@@ -234,8 +219,6 @@ void dRes_info_c::setWarpSRT(J3DModelData* i_modelData, const cXyz& i_pos, f32 i
     cMtx_concat(l_texMtxInfo.mEffectMtx, mDoMtx_stack_c::get(), texMtxInfo.mEffectMtx);
 }
 
-/* 8003AE14-8003B150 035754 033C+00 2/1 1/1 0/0 .text            loaderBasicBmd__11dRes_info_cFUlPv
- */
 J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) {
     u32 flags = 0x59020010;
     u16 i;
@@ -318,7 +301,6 @@ J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) {
     return (J3DModelData*)i_data;
 }
 
-/* 8003B30C-8003B8D0 035C4C 05C4+00 2/2 0/0 0/0 .text            loadResource__11dRes_info_cFv */
 int dRes_info_c::loadResource() {
     JUT_ASSERT(0x2C5, mRes == NULL);
 
@@ -497,8 +479,6 @@ int dRes_info_c::loadResource() {
     return 0;
 }
 
-/* 8003B998-8003BA9C 0362D8 0104+00 1/1 0/0 0/0 .text            deleteArchiveRes__11dRes_info_cFv
- */
 void dRes_info_c::deleteArchiveRes() {
     JUT_ASSERT(0x45E, mArchive != NULL);
 
@@ -527,7 +507,6 @@ void dRes_info_c::deleteArchiveRes() {
     }
 }
 
-/* 8003BA9C-8003BAC4 0363DC 0028+00 2/2 0/0 0/0 .text            getArcHeader__FP10JKRArchive */
 static SArcHeader* getArcHeader(JKRArchive* i_archive) {
     if (i_archive != NULL) {
         switch (i_archive->getMountMode()) {
@@ -539,8 +518,6 @@ static SArcHeader* getArcHeader(JKRArchive* i_archive) {
     return NULL;
 }
 
-/* 8003BAC4-8003BAF8 036404 0034+00 1/1 0/0 0/0 .text setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap
- */
 int dRes_info_c::setRes(JKRArchive* i_archive, JKRHeap* i_heap) {
     JUT_ASSERT(0x4AD, mArchive == NULL);
     mArchive = i_archive;
@@ -552,7 +529,6 @@ int dRes_info_c::setRes(JKRArchive* i_archive, JKRHeap* i_heap) {
     return rt >> 0x1F;
 }
 
-/* 8003BAF8-8003BC98 036438 01A0+00 2/2 0/0 0/0 .text            setRes__11dRes_info_cFv */
 int dRes_info_c::setRes() {
     if (mArchive == NULL) {
         if (mDMCommand == NULL) {
@@ -611,7 +587,6 @@ int dRes_info_c::setRes() {
     return 0;
 }
 
-/* 8003BC98-8003BD00 0365D8 0068+00 1/1 0/0 0/0 .text            myGetMemBlockSize__FPv */
 static s32 myGetMemBlockSize(void* i_data) {
     JKRHeap* heap = JKRHeap::findFromRoot(i_data);
     if (heap->getHeapType() == 'EXPH') {
@@ -621,7 +596,6 @@ static s32 myGetMemBlockSize(void* i_data) {
     return -1;
 }
 
-/* 8003BD00-8003BD2C 036640 002C+00 1/1 0/0 0/0 .text            myGetMemBlockSize0__FPv */
 static s32 myGetMemBlockSize0(void* i_data) {
     s32 size = myGetMemBlockSize(i_data);
     if (size < 0) {
@@ -636,7 +610,6 @@ f32 dummy(int x) {
     return x;
 }
 
-/* 8003BD2C-8003BE38 03666C 010C+00 1/1 0/0 0/0 .text dump_long__11dRes_info_cFP11dRes_info_ci */
 void dRes_info_c::dump_long(dRes_info_c* i_resInfo, int i_infoNum) {
     int i;
     void* header;
@@ -681,8 +654,6 @@ void dRes_info_c::dump_long(dRes_info_c* i_resInfo, int i_infoNum) {
     }
 }
 
-/* 8003BE38-8003BFB0 036778 0178+00 1/1 0/0 0/0 .text            dump__11dRes_info_cFP11dRes_info_ci
- */
 void dRes_info_c::dump(dRes_info_c* i_resInfo, int i_infoNum) {
     int totalArcHeaderSize;
     int totalHeapSize;
@@ -722,7 +693,6 @@ void dRes_info_c::dump(dRes_info_c* i_resInfo, int i_infoNum) {
                        totalHeapSize);
 }
 
-/* 8003BFB0-8003C078 0368F0 00C8+00 0/0 1/1 0/0 .text            __dt__14dRes_control_cFv */
 dRes_control_c::~dRes_control_c() {
     for (int i = 0; i < ARRAY_SIZE(mObjectInfo); i++) {
         mObjectInfo[i].~dRes_info_c();
@@ -733,8 +703,6 @@ dRes_control_c::~dRes_control_c() {
     }
 }
 
-/* 8003C078-8003C160 0369B8 00E8+00 2/2 8/8 0/0 .text
- * setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap    */
 int dRes_control_c::setRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum,
                            char const* i_path, u8 i_mountDirection, JKRHeap* i_heap) {
     dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum);
@@ -761,8 +729,6 @@ int dRes_control_c::setRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_
     return 1;
 }
 
-/* 8003C160-8003C194 036AA0 0034+00 0/0 10/10 1/1 .text
- * syncRes__14dRes_control_cFPCcP11dRes_info_ci                 */
 int dRes_control_c::syncRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum) {
     dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum);
 
@@ -785,8 +751,6 @@ int dRes_control_c::syncRes(char const* i_arcName, dRes_info_c* i_resInfo, int i
     }
 }
 
-/* 8003C194-8003C1E4 036AD4 0050+00 1/1 7/7 0/0 .text
- * deleteRes__14dRes_control_cFPCcP11dRes_info_ci               */
 int dRes_control_c::deleteRes(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum) {
     dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum);
 
@@ -806,8 +770,6 @@ int dRes_control_c::deleteRes(char const* i_arcName, dRes_info_c* i_resInfo, int
     return 1;
 }
 
-/* 8003C1E4-8003C260 036B24 007C+00 5/5 5/5 3/3 .text
- * getResInfo__14dRes_control_cFPCcP11dRes_info_ci              */
 dRes_info_c* dRes_control_c::getResInfo(char const* i_arcName, dRes_info_c* i_resInfo, int i_infoNum) {
     for (int i = 0; i < i_infoNum; i++) {
         if (i_resInfo->getCount() != 0) {
@@ -821,8 +783,6 @@ dRes_info_c* dRes_control_c::getResInfo(char const* i_arcName, dRes_info_c* i_re
     return NULL;
 }
 
-/* 8003C260-8003C288 036BA0 0028+00 1/1 0/0 0/0 .text newResInfo__14dRes_control_cFP11dRes_info_ci
- */
 dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* i_resInfo, int i_infoNum) {
     for (int i = 0; i < i_infoNum; i++) {
         if (i_resInfo->getCount() == 0) {
@@ -834,8 +794,6 @@ dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* i_resInfo, int i_infoNum) {
     return NULL;
 }
 
-/* 8003C288-8003C2EC 036BC8 0064+00 4/4 0/0 0/0 .text
- * getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci        */
 dRes_info_c* dRes_control_c::getResInfoLoaded(char const* i_arcName, dRes_info_c* i_resInfo,
                                               int i_infoNum) {
     dRes_info_c* resInfo = getResInfo(i_arcName, i_resInfo, i_infoNum);
@@ -855,8 +813,6 @@ dRes_info_c* dRes_control_c::getResInfoLoaded(char const* i_arcName, dRes_info_c
     return resInfo;
 }
 
-/* 8003C2EC-8003C37C 036C2C 0090+00 1/1 54/54 894/894 .text
- * getRes__14dRes_control_cFPCclP11dRes_info_ci                 */
 void* dRes_control_c::getRes(char const* i_arcName, s32 i_index, dRes_info_c* i_resInfo, int i_infoNum) {
     dRes_info_c* resInfo = getResInfoLoaded(i_arcName, i_resInfo, i_infoNum);
     if (resInfo == NULL) {
@@ -875,8 +831,6 @@ void* dRes_control_c::getRes(char const* i_arcName, s32 i_index, dRes_info_c* i_
     return resInfo->getRes(i_index);
 }
 
-/* 8003C37C-8003C400 036CBC 0084+00 0/0 18/18 109/109 .text
- * getRes__14dRes_control_cFPCcPCcP11dRes_info_ci               */
 void* dRes_control_c::getRes(char const* i_arcName, char const* i_resName, dRes_info_c* i_resInfo,
                              int i_infoNum) {
     dRes_info_c* resInfo = getResInfoLoaded(i_arcName, i_resInfo, i_infoNum);
@@ -895,8 +849,6 @@ void* dRes_control_c::getRes(char const* i_arcName, char const* i_resName, dRes_
     }
 }
 
-/* 8003C400-8003C470 036D40 0070+00 0/0 7/7 4/4 .text
- * getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci              */
 void* dRes_control_c::getIDRes(char const* i_arcName, u16 i_resID, dRes_info_c* i_resInfo, int i_infoNum) {
     dRes_info_c* resInfo = getResInfoLoaded(i_arcName, i_resInfo, i_infoNum);
     if (resInfo == NULL) {
@@ -912,8 +864,6 @@ void* dRes_control_c::getIDRes(char const* i_arcName, u16 i_resID, dRes_info_c*
     return resInfo->getRes(index);
 }
 
-/* 8003C470-8003C4E4 036DB0 0074+00 0/0 3/3 0/0 .text syncAllRes__14dRes_control_cFP11dRes_info_ci
- */
 int dRes_control_c::syncAllRes(dRes_info_c* i_resInfo, int i_infoNum) {
     for (int i = 0; i < i_infoNum; i++) {
         if (i_resInfo->getDMCommand() != NULL && i_resInfo->setRes() > 0) {
@@ -925,8 +875,6 @@ int dRes_control_c::syncAllRes(dRes_info_c* i_resInfo, int i_infoNum) {
     return 0;
 }
 
-/* 8003C4E4-8003C5BC 036E24 00D8+00 1/1 0/0 0/0 .text
- * setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap              */
 int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize,
                                  JKRHeap* i_heap) {
     JUT_ASSERT(0x7A3, i_archiveRes != NULL);
@@ -956,8 +904,6 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32
     return 0;
 }
 
-/* 8003C5BC-8003C638 036EFC 007C+00 0/0 2/2 0/0 .text setStageRes__14dRes_control_cFPCcP7JKRHeap
- */
 int dRes_control_c::setStageRes(char const* i_arcName, JKRHeap* i_heap) {
     char path[20];
 
@@ -965,7 +911,6 @@ int dRes_control_c::setStageRes(char const* i_arcName, JKRHeap* i_heap) {
     return setRes(i_arcName, mStageInfo, ARRAY_SIZEU(mStageInfo), path, mDoDvd_MOUNT_DIRECTION_TAIL, i_heap);
 }
 
-/* 8003C638-8003C6B8 036F78 0080+00 0/0 2/2 0/0 .text            dump__14dRes_control_cFv */
 void dRes_control_c::dump() {
     JUTReportConsole_f("\ndRes_control_c::dump mObjectInfo\n");
     dRes_info_c::dump(mObjectInfo, ARRAY_SIZEU(mObjectInfo));
@@ -976,8 +921,6 @@ void dRes_control_c::dump() {
     dRes_info_c::dump_long(mStageInfo, ARRAY_SIZEU(mStageInfo));
 }
 
-/* 8003C6B8-8003C734 036FF8 007C+00 0/0 0/0 32/32 .text
- * getObjectResName2Index__14dRes_control_cFPCcPCc              */
 int dRes_control_c::getObjectResName2Index(char const* i_arcName, char const* i_resName) {
     dRes_info_c* info = getResInfoLoaded(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo));
 
diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp
index 8e32ea4d3f..569098c43b 100644
--- a/src/d/d_s_logo.cpp
+++ b/src/d/d_s_logo.cpp
@@ -41,7 +41,6 @@
 #define PROGRESSIVE_MODE_ON  OS_PROGRESSIVE_MODE_ON
 #endif
 
-/* 804510E8-804510F0 0005E8 0008+00 1/1 0/0 0/0 .sbss            g_LogHIO */
 static dLog_HIO_c g_LogHIO;
 
 typedef void (dScnLogo_c::*execFunc)();
@@ -54,29 +53,22 @@ static execFunc l_execFunc[16] = {
     &dScnLogo_c::nextSceneChange,
 };
 
-/* 802560A4-802560B4 2509E4 0010+00 1/1 0/0 0/0 .text            __ct__10dLog_HIO_cFv */
 dLog_HIO_c::dLog_HIO_c() {}
 
-/* 802560B4-802560F8 2509F4 0044+00 1/1 0/0 0/0 .text            preLoad_dyl_create__10dScnLogo_cFv
- */
 void dScnLogo_c::preLoad_dyl_create() {
     m_preLoad_dylPhase = new request_of_phase_process_class[14];
     memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14);
 }
 
-/* 802560F8-8025611C 250A38 0024+00 1/1 0/0 0/0 .text            preLoad_dyl_remove__10dScnLogo_cFv
- */
 void dScnLogo_c::preLoad_dyl_remove() {
     delete[] m_preLoad_dylPhase;
 }
 
-/* 80399FE0-80399FFC 026640 001C+00 1/1 0/0 0/0 .rodata          l_preLoad_dylKeyTbl */
 static s16 const l_preLoad_dylKeyTbl[14] = {
     0x02DC, 0x02CE, 0x0221, 0x00F2, 0x021B, 0x02F4, 0x0139,
     0x015A, 0x02E4, 0x00FE, 0x0308, 0x030F, 0x00FF, 0x013F,
 };
 
-/* 8025611C-80256198 250A5C 007C+00 2/2 0/0 0/0 .text            preLoad_dyl__10dScnLogo_cFv */
 bool dScnLogo_c::preLoad_dyl() {
     bool ret = true;
 
@@ -91,7 +83,6 @@ bool dScnLogo_c::preLoad_dyl() {
     return ret;
 }
 
-/* 80256198-80256210 250AD8 0078+00 1/1 0/0 0/0 .text            checkProgSelect__10dScnLogo_cFv */
 void dScnLogo_c::checkProgSelect() {
     #if VERSION == VERSION_GCN_PAL
     if (mDoRst::getProgSeqFlag() == 0) {
@@ -113,14 +104,12 @@ void dScnLogo_c::checkProgSelect() {
     #endif
 }
 
-/* 80256210-80256264 250B50 0054+00 1/1 0/0 0/0 .text            draw__10dScnLogo_cFv */
 int dScnLogo_c::draw() {
     cLib_calcTimer<u16>(&mTimer);
     (this->*l_execFunc[mExecCommand])();
     return 1;
 }
 
-/* 80256264-8025631C 250BA4 00B8+00 1/0 0/0 0/0 .text            progInDraw__10dScnLogo_cFv */
 void dScnLogo_c::progInDraw() {
     dComIfGd_set2DOpa(mProgressiveChoice);
     dComIfGd_set2DOpa(mProgressiveYes);
@@ -136,7 +125,6 @@ void dScnLogo_c::progInDraw() {
     }
 }
 
-/* 8025631C-802568E0 250C5C 05C4+00 1/0 0/0 0/0 .text            progSelDraw__10dScnLogo_cFv */
 void dScnLogo_c::progSelDraw() {
     dComIfGd_set2DOpa(mProgressiveChoice);
     dComIfGd_set2DOpa(mProgressiveYes);
@@ -228,7 +216,6 @@ void dScnLogo_c::progSelDraw() {
     }
 }
 
-/* 802568E0-80256A3C 251220 015C+00 1/0 0/0 0/0 .text            progOutDraw__10dScnLogo_cFv */
 void dScnLogo_c::progOutDraw() {
     dComIfGd_set2DOpa(mProgressiveChoice);
     dComIfGd_set2DOpa(mProgressiveYes);
@@ -260,7 +247,6 @@ void dScnLogo_c::progOutDraw() {
     }
 }
 
-/* 80256A3C-80256AC0 25137C 0084+00 1/0 0/0 0/0 .text            progSetDraw__10dScnLogo_cFv */
 void dScnLogo_c::progSetDraw() {
     dComIfGd_set2DOpa(mProgressiveSel);
 
@@ -271,7 +257,6 @@ void dScnLogo_c::progSetDraw() {
     }
 }
 
-/* 80256AC0-80256B3C 251400 007C+00 1/0 0/0 0/0 .text            progSet2Draw__10dScnLogo_cFv */
 void dScnLogo_c::progSet2Draw() {
     dComIfGd_set2DOpa(mProgressiveSel);
 
@@ -286,7 +271,6 @@ void dScnLogo_c::progSet2Draw() {
     }
 }
 
-/* 80256B3C-80256BF4 25147C 00B8+00 1/0 0/0 0/0 .text            progChangeDraw__10dScnLogo_cFv */
 void dScnLogo_c::progChangeDraw() {
     if (getProgressiveMode() != 0 && mTimer == 90 && field_0x209 == 0) {
         setRenderMode();
@@ -305,7 +289,6 @@ void dScnLogo_c::progChangeDraw() {
     }
 }
 
-/* 80256BF4-80256C68 251534 0074+00 1/0 0/0 0/0 .text            warningInDraw__10dScnLogo_cFv */
 void dScnLogo_c::warningInDraw() {
     dComIfGd_set2DOpa(mWarning);
 
@@ -318,7 +301,6 @@ void dScnLogo_c::warningInDraw() {
     }
 }
 
-/* 80256C68-80256DC4 2515A8 015C+00 1/0 0/0 0/0 .text            warningDispDraw__10dScnLogo_cFv */
 void dScnLogo_c::warningDispDraw() {
     dComIfGd_set2DOpa(mWarning);
     dComIfGd_set2DOpa(mWarningStart);
@@ -348,7 +330,6 @@ void dScnLogo_c::warningDispDraw() {
     }
 }
 
-/* 80256DC4-80256E48 251704 0084+00 1/0 0/0 0/0 .text            warningOutDraw__10dScnLogo_cFv */
 void dScnLogo_c::warningOutDraw() {
     dComIfGd_set2DOpa(mWarning);
 
@@ -359,7 +340,6 @@ void dScnLogo_c::warningOutDraw() {
     }
 }
 
-/* 80256E48-80256ECC 251788 0084+00 1/0 0/0 0/0 .text            nintendoInDraw__10dScnLogo_cFv */
 void dScnLogo_c::nintendoInDraw() {
     dComIfGd_set2DOpa(mNintendoLogo);
 
@@ -370,7 +350,6 @@ void dScnLogo_c::nintendoInDraw() {
     }
 }
 
-/* 80256ECC-80256F50 25180C 0084+00 1/0 0/0 0/0 .text            nintendoOutDraw__10dScnLogo_cFv */
 void dScnLogo_c::nintendoOutDraw() {
     dComIfGd_set2DOpa(mNintendoLogo);
 
@@ -381,7 +360,6 @@ void dScnLogo_c::nintendoOutDraw() {
     }
 }
 
-/* 80256F50-80256FD4 251890 0084+00 1/0 0/0 0/0 .text            dolbyInDraw__10dScnLogo_cFv */
 void dScnLogo_c::dolbyInDraw() {
     dComIfGd_set2DOpa(mDolbyLogo);
 
@@ -392,7 +370,6 @@ void dScnLogo_c::dolbyInDraw() {
     }
 }
 
-/* 80256FD4-80257058 251914 0084+00 1/0 0/0 0/0 .text            dolbyOutDraw__10dScnLogo_cFv */
 void dScnLogo_c::dolbyOutDraw() {
     dComIfGd_set2DOpa(mDolbyLogo);
 
@@ -403,14 +380,12 @@ void dScnLogo_c::dolbyOutDraw() {
     }
 }
 
-/* 80257058-80257070 251998 0018+00 1/0 0/0 0/0 .text            dolbyOutDraw2__10dScnLogo_cFv */
 void dScnLogo_c::dolbyOutDraw2() {
     if (mTimer == 0) {
         mExecCommand = EXEC_DVD_WAIT;
     }
 }
 
-/* 80257070-80257284 2519B0 0214+00 1/0 0/0 0/0 .text            dvdWaitDraw__10dScnLogo_cFv */
 void dScnLogo_c::dvdWaitDraw() {
     if (!dComIfG_syncAllObjectRes()) {
         if (mpField0Command->sync() && mpAlAnmCommand->sync() && mpFmapResCommand->sync() &&
@@ -431,14 +406,12 @@ void dScnLogo_c::dvdWaitDraw() {
     }
 }
 
-/* 80257284-802572B8 251BC4 0034+00 1/0 0/0 0/0 .text            nextSceneChange__10dScnLogo_cFv */
 void dScnLogo_c::nextSceneChange() {
     if (!mDoRst::isReset()) {
         dComIfG_changeOpeningScene(this, PROC_OPENING_SCENE);
     }
 }
 
-/* 802572B8-80257910 251BF8 0658+00 1/1 0/0 0/0 .text            __dt__10dScnLogo_cFv */
 dScnLogo_c::~dScnLogo_c() {
     if (mDoRst::isReset()) {
         if (mDoAud_zelAudio_c::isInitFlag()) {
@@ -542,7 +515,6 @@ dScnLogo_c::~dScnLogo_c() {
     #endif
 }
 
-/* 80257910-802579BC 252250 00AC+00 1/0 0/0 0/0 .text            phase_0__FP10dScnLogo_c */
 static int phase_0(dScnLogo_c* i_this) {
     mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor);
     dComIfGp_particle_create();
@@ -576,7 +548,6 @@ static int phase_0(dScnLogo_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 802579BC-80257A70 2522FC 00B4+00 1/0 0/0 0/0 .text            phase_1__FP10dScnLogo_c */
 static int phase_1(dScnLogo_c* i_this) {
     if (!cDyl_InitAsyncIsDone()) {
         return cPhs_INIT_e;
@@ -602,7 +573,6 @@ static int phase_1(dScnLogo_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80257A70-80257AB4 2523B0 0044+00 1/0 0/0 0/0 .text            phase_2__FP10dScnLogo_c */
 static int phase_2(dScnLogo_c* i_this) {
     if (dComIfG_syncAllObjectRes()) {
         return cPhs_INIT_e;
@@ -611,8 +581,6 @@ static int phase_2(dScnLogo_c* i_this) {
     }
 }
 
-/* 80257AB4-80257AE0 2523F4 002C+00 1/1 0/0 0/0 .text
- * resLoad__FP30request_of_phase_process_classP10dScnLogo_c     */
 static int resLoad(request_of_phase_process_class* i_phase, dScnLogo_c* i_this) {
     static int (*l_method[3])(void*) = {(int (*)(void*))phase_0, (int (*)(void*))phase_1,
                                         (int (*)(void*))phase_2};
@@ -620,7 +588,6 @@ static int resLoad(request_of_phase_process_class* i_phase, dScnLogo_c* i_this)
     return dComLbG_PhaseHandler(i_phase, l_method, i_this);
 }
 
-/* 80257AE0-80257C64 252420 0184+00 1/1 0/0 0/0 .text            create__10dScnLogo_cFv */
 int dScnLogo_c::create() {
     int phase_state = resLoad(&field_0x1c4, this);
     if (phase_state != cPhs_COMPLEATE_e) {
@@ -666,7 +633,6 @@ int dScnLogo_c::create() {
     return phase_state;
 }
 
-/* 80257C64-80257FEC 2525A4 0388+00 1/1 0/0 0/0 .text            logoInitGC__10dScnLogo_cFv */
 void dScnLogo_c::logoInitGC() {
     ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 4);
     mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255);
@@ -785,7 +751,6 @@ void dScnLogo_c::logoInitGC() {
 #endif
 }
 
-/* 80257FEC-80258420 25292C 0434+00 1/1 0/0 0/0 .text            dvdDataLoad__10dScnLogo_cFv */
 void dScnLogo_c::dvdDataLoad() {
     dComIfG_setObjectRes("Always", (u8)0, NULL);
     archiveHeap->dump_sort();
@@ -887,12 +852,10 @@ void dScnLogo_c::dvdDataLoad() {
     preLoad_dyl();
 }
 
-/* 80258420-80258444 252D60 0024+00 1/0 0/0 0/0 .text            dScnLogo_Create__FP11scene_class */
 static int dScnLogo_Create(scene_class* i_this) {
     return (new (i_this) dScnLogo_c())->create();
 }
 
-/* 80258444-80258484 252D84 0040+00 1/0 0/0 0/0 .text            dScnLogo_Execute__FP10dScnLogo_c */
 static int dScnLogo_Execute(dScnLogo_c* i_this) {
     if (mDoRst::isReset()) {
         fopScnM_ChangeReq(i_this, PROC_LOGO_SCENE, 0, 5);
@@ -900,20 +863,16 @@ static int dScnLogo_Execute(dScnLogo_c* i_this) {
     return 1;
 }
 
-/* 80258484-802584A8 252DC4 0024+00 1/0 0/0 0/0 .text            dScnLogo_Draw__FP10dScnLogo_c */
 static int dScnLogo_Draw(dScnLogo_c* i_this) {
     i_this->draw();
     return 1;
 }
 
-/* 802584A8-802584D0 252DE8 0028+00 1/0 0/0 0/0 .text            dScnLogo_Delete__FP10dScnLogo_c */
 static int dScnLogo_Delete(dScnLogo_c* i_this) {
     i_this->~dScnLogo_c();
     return 1;
 }
 
-/* 802584D0-802584D8 252E10 0008+00 1/0 0/0 0/0 .text            dScnLogo_IsDelete__FP10dScnLogo_c
- */
 static int dScnLogo_IsDelete(dScnLogo_c* i_this) {
     return 1;
 }
@@ -946,8 +905,6 @@ u8 dScnLogo_c::getPalLanguage() {
 }
 #endif
 
-/* 802584D8-802584FC 252E18 0024+00 1/1 0/0 0/0 .text            setProgressiveMode__10dScnLogo_cFUc
- */
 void dScnLogo_c::setProgressiveMode(u8 mode) {
     #if VERSION == VERSION_GCN_PAL
     OSSetEuRgb60Mode(mode);
@@ -956,8 +913,6 @@ void dScnLogo_c::setProgressiveMode(u8 mode) {
     #endif
 }
 
-/* 802584FC-80258520 252E3C 0024+00 3/3 0/0 0/0 .text            getProgressiveMode__10dScnLogo_cFv
- */
 u8 dScnLogo_c::getProgressiveMode() {
     #if VERSION == VERSION_GCN_PAL
     return OSGetEuRgb60Mode();
@@ -966,8 +921,6 @@ u8 dScnLogo_c::getProgressiveMode() {
     #endif
 }
 
-/* 80258520-8025854C 252E60 002C+00 1/1 0/0 0/0 .text            isProgressiveMode__10dScnLogo_cFv
- */
 bool dScnLogo_c::isProgressiveMode() {
     #if VERSION == VERSION_GCN_PAL
     return OSGetEuRgb60Mode() == OS_EURGB60_ON;
@@ -976,15 +929,12 @@ bool dScnLogo_c::isProgressiveMode() {
     #endif
 }
 
-/* 8025854C-8025855C 252E8C 0010+00 1/1 0/0 0/0 .text            setRenderMode__10dScnLogo_cFv */
 void dScnLogo_c::setRenderMode() {
     mDoMch_render_c::setProgressiveMode();
 }
 
-/* 8025855C-802585A4 252E9C 0048+00 2/1 0/0 0/0 .text            __dt__10dLog_HIO_cFv */
 dLog_HIO_c::~dLog_HIO_c() {}
 
-/* 803C2FD0-803C2FE4 -00001 0014+00 1/0 0/0 0/0 .data            l_dScnLogo_Method */
 static dScnLogo_Method l_dScnLogo_Method[5] = {
     (dScnLogo_Method)dScnLogo_Create,
     dScnLogo_Delete,
@@ -993,7 +943,6 @@ static dScnLogo_Method l_dScnLogo_Method[5] = {
     dScnLogo_Draw,
 };
 
-/* 803C2FE4-803C300C -00001 0028+00 0/0 0/0 1/0 .data            g_profile_LOGO_SCENE */
 extern scene_process_profile_definition g_profile_LOGO_SCENE = {
     fpcLy_ROOT_e,
     1,
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp
index 7df243c21a..21a8bfb349 100644
--- a/src/d/d_s_menu.cpp
+++ b/src/d/d_s_menu.cpp
@@ -2005,7 +2005,6 @@ static leafdraw_method_class l_dScnMenu_Method = {
     (process_method_func)dScnMenu_Draw,
 };
 
-/* 803C3018-803C3040 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_MENU_SCENE */
 extern scene_process_profile_definition g_profile_MENU_SCENE = {
     fpcLy_ROOT_e,                               // mLayerID
     1,                                          // mListID
@@ -2019,7 +2018,6 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = {
     (process_method_class*)&l_dScnMenu_Method,  // mpMtd
 };
 #else
-/* 803C3018-803C3040 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_MENU_SCENE */
 extern scene_process_profile_definition g_profile_MENU_SCENE = {
     fpcLy_ROOT_e,           // mLayerID
     1,                      // mListID
diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp
index d7bc5e558b..660e2c71a9 100644
--- a/src/d/d_s_name.cpp
+++ b/src/d/d_s_name.cpp
@@ -16,26 +16,22 @@
 #include "m_Do/m_Do_mtx.h"
 #include "f_op/f_op_overlap_mng.h"
 
-/* 804510F0-804510F8 0005F0 0008+00 2/2 0/0 0/0 .sbss            g_snHIO */
 static dSn_HIO_c g_snHIO;
 
 #if VERSION == VERSION_GCN_PAL
 static int mBmgStatus;
 #endif
 
-/* 803C3094-803C30DC 0201B4 0048+00 1/2 0/0 0/0 .data            MainProc */
 typedef void (dScnName_c::*mainProcFunc)(void);
 static mainProcFunc MainProc[6] = {
     &dScnName_c::FileSelectOpen,  &dScnName_c::FileSelectMain, &dScnName_c::FileSelectClose,
     &dScnName_c::brightCheckOpen, &dScnName_c::brightCheck,    &dScnName_c::changeGameScene,
 };
 
-/* 8025878C-802587A4 2530CC 0018+00 1/1 0/0 0/0 .text            __ct__9dSn_HIO_cFv */
 dSn_HIO_c::dSn_HIO_c() {
     mFileSelWaitTime = 15;
 }
 
-/* 802587A4-80258820 2530E4 007C+00 1/0 0/0 0/0 .text            phase_1__FPc */
 static s32 phase_1(char* resName) {
     mDoAud_bgmStart(-1);
     if (dComIfG_setObjectRes(resName, (u8)0, NULL) == 0) {
@@ -45,7 +41,6 @@ static s32 phase_1(char* resName) {
     return cPhs_NEXT_e;
 }
 
-/* 80258820-80258878 253160 0058+00 1/0 0/0 0/0 .text            phase_2__FPc */
 static s32 phase_2(char* resName) {
     int syncStatus = dComIfG_syncObjectRes(resName);
 
@@ -60,8 +55,6 @@ static s32 phase_2(char* resName) {
     }
 }
 
-/* 80258878-802588A0 2531B8 0028+00 1/1 0/0 0/0 .text
- * resLoad__FP30request_of_phase_process_classPc                */
 static s32 resLoad(request_of_phase_process_class* i_phase, char* i_resName) {
     static request_of_phase_process_fn l_method[2] = {
         (request_of_phase_process_fn)phase_1, 
@@ -145,7 +138,6 @@ static const char* dummyString(int i) {
 }
 #endif
 
-/* 80258B2C-80258BC8 25346C 009C+00 1/1 0/0 0/0 .text            setView__10dScnName_cFv */
 void dScnName_c::setView() {
     C_MTXPerspective(mCamera.projMtx, mCamera.fovy, mCamera.aspect, mCamera.near,
                      mCamera.far);
@@ -170,7 +162,6 @@ void dScnName_c::bmg_data_set(){
 void dScnName_c::tex_data_set() {}
 #endif
 
-/* 80258BC8-80258C5C 253508 0094+00 1/1 0/0 0/0 .text            execute__10dScnName_cFv */
 s32 dScnName_c::execute() {
     if (fopOvlpM_IsPeek() == 0) {
         dComIfG_resetToOpening(this);
@@ -184,7 +175,6 @@ s32 dScnName_c::execute() {
     return 1;
 }
 
-/* 80258C5C-80258CC8 25359C 006C+00 1/1 0/0 0/0 .text            draw__10dScnName_cFv */
 s32 dScnName_c::draw() {
     dComIfGp_getVibration().Run();
 
@@ -200,7 +190,6 @@ s32 dScnName_c::draw() {
     return 1;
 }
 
-/* 80258CC8-80258DD0 253608 0108+00 1/1 0/0 0/0 .text            __dt__10dScnName_cFv */
 dScnName_c::~dScnName_c() {
     delete dFs_c;
     delete mBrightCheck;
@@ -215,7 +204,6 @@ dScnName_c::~dScnName_c() {
     dComIfGd_setView(NULL);
 }
 
-/* 80258DD0-80258E34 253710 0064+00 1/0 0/0 0/0 .text            FileSelectOpen__10dScnName_cFv */
 void dScnName_c::FileSelectOpen() {
     if (field_0x41e != 0) {
         field_0x41e--;
@@ -226,7 +214,6 @@ void dScnName_c::FileSelectOpen() {
     }
 }
 
-/* 80258E34-80258E78 253774 0044+00 1/0 0/0 0/0 .text            FileSelectMain__10dScnName_cFv */
 void dScnName_c::FileSelectMain() {
     dFs_c->_move();
 
@@ -235,7 +222,6 @@ void dScnName_c::FileSelectMain() {
     }
 }
 
-/* 80258E78-80258F20 2537B8 00A8+00 1/1 0/0 0/0 .text FileSelectMainNormal__10dScnName_cFv */
 void dScnName_c::FileSelectMainNormal() {
     switch(dFs_c->isSelectEnd()) {
     case 1:
@@ -248,7 +234,6 @@ void dScnName_c::FileSelectMainNormal() {
     }
 }
 
-/* 80258F20-80258FD4 253860 00B4+00 1/0 0/0 0/0 .text            FileSelectClose__10dScnName_cFv */
 void dScnName_c::FileSelectClose() {
     field_0x41e--;
 
@@ -262,7 +247,6 @@ void dScnName_c::FileSelectClose() {
     }
 }
 
-/* 80258FD4-80259008 253914 0034+00 1/0 0/0 0/0 .text            brightCheckOpen__10dScnName_cFv */
 void dScnName_c::brightCheckOpen() {
     if (!mDoRst::isReset()) {
         field_0x41e--;
@@ -272,7 +256,6 @@ void dScnName_c::brightCheckOpen() {
     }
 }
 
-/* 80259008-802590F8 253948 00F0+00 1/0 0/0 0/0 .text            brightCheck__10dScnName_cFv */
 void dScnName_c::brightCheck() {
     mBrightCheck->_move();
 
@@ -294,7 +277,6 @@ void dScnName_c::brightCheck() {
     }
 }
 
-/* 802590F8-802591C0 253A38 00C8+00 1/0 0/0 0/0 .text            changeGameScene__10dScnName_cFv */
 void dScnName_c::changeGameScene() {
     if (!mDoRst::isReset() && !fopOvlpM_IsPeek()) {
         dComIfGs_gameStart();
@@ -311,24 +293,19 @@ void dScnName_c::changeGameScene() {
     }
 }
 
-/* 802591C0-802591E0 253B00 0020+00 1/0 0/0 0/0 .text            dScnName_Draw__FP10dScnName_c */
 static int dScnName_Draw(dScnName_c* i_this) {
     return i_this->draw();
 }
 
-/* 802591E0-80259200 253B20 0020+00 1/0 0/0 0/0 .text            dScnName_Execute__FP10dScnName_c */
 static int dScnName_Execute(dScnName_c* i_this) {
     return i_this->execute();
 }
 
-/* 80259200-80259230 253B40 0030+00 1/0 0/0 0/0 .text            dScnName_IsDelete__FP10dScnName_c
- */
 static int dScnName_IsDelete(dScnName_c*) {
     dComIfGp_particle_cleanup();
     return 1;
 }
 
-/* 80259230-80259258 253B70 0028+00 1/0 0/0 0/0 .text            dScnName_Delete__FP10dScnName_c */
 static int dScnName_Delete(dScnName_c* i_this) {
     #if VERSION == VERSION_GCN_PAL
     i_this->bmg_data_set();
@@ -340,20 +317,17 @@ static int dScnName_Delete(dScnName_c* i_this) {
     return 1;
 }
 
-/* 80259258-80259294 253B98 003C+00 1/0 0/0 0/0 .text            dScnName_Create__FP11scene_class */
 static int dScnName_Create(scene_class* i_this) {
     new (i_this) dScnName_c();
     return static_cast<dScnName_c*>(i_this)->create();
 }
 
-/* 803C30DC-803C30F0 -00001 0014+00 2/0 0/0 0/0 .data            l_dScnName_Method */
 static leafdraw_method_class l_dScnName_Method = {
     (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete,
     (process_method_func)dScnName_Execute, (process_method_func)dScnName_IsDelete,
     (process_method_func)dScnName_Draw,
 };
 
-/* 803C30F0-803C3118 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_NAME_SCENE */
 extern scene_process_profile_definition g_profile_NAME_SCENE = {
     fpcLy_ROOT_e,
     1,
@@ -368,7 +342,6 @@ extern scene_process_profile_definition g_profile_NAME_SCENE = {
     NULL,
 };
 
-/* 803C3118-803C3140 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_NAMEEX_SCENE */
 extern scene_process_profile_definition g_profile_NAMEEX_SCENE = {
     fpcLy_ROOT_e,
     1,
diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp
index 9934e58114..2e9979d20e 100644
--- a/src/d/d_s_play.cpp
+++ b/src/d/d_s_play.cpp
@@ -49,22 +49,16 @@ static int phase_5(dScnPly_c*);
 static int phase_6(dScnPly_c*);
 static int phase_compleate(void*);
 
-/* 804510F8-80451100 0005F8 0008+00 2/2 0/0 0/0 .sbss            resPhase */
 static request_of_phase_process_class resPhase[1];
 
-/* 80451100-80451108 000600 0008+00 2/2 0/0 0/0 .sbss            dylPhase */
 static request_of_phase_process_class dylPhase[1];
 
-/* 80451108-8045110C 000608 0004+00 1/1 0/0 0/0 .sbss            dylPreLoadTime1 */
 static OSTime dylPreLoadTime1;
 
-/* 80451110-80451114 000610 0004+00 1/1 0/0 0/0 .sbss            resPreLoadTime0 */
 static OSTime resPreLoadTime0;
 
-/* 80451118-8045111C 000618 0004+00 1/1 0/0 0/0 .sbss            resPreLoadTime1 */
 static OSTime resPreLoadTime1;
 
-/* 80451120-80451124 000620 0004+00 1/1 0/0 0/0 .sbss            g_preLoadHIO */
 static dScnPly_preLoad_HIO_c g_preLoadHIO;
 
 /* 80451124 0001+00 data_80451124 None */
@@ -73,7 +67,6 @@ s8 dScnPly_c::pauseTimer;
 /* 80451125 0003+00 nextPauseTimer__9dScnPly_c None */
 s8 dScnPly_c::nextPauseTimer;
 
-/* 80259400-80259440 253D40 0040+00 1/1 0/0 0/0 .text            calcPauseTimer__9dScnPly_cFv */
 s8 dScnPly_c::calcPauseTimer() {
     if (nextPauseTimer != 0) {
         pauseTimer = nextPauseTimer;
@@ -84,12 +77,10 @@ s8 dScnPly_c::calcPauseTimer() {
     }
 }
 
-/* 80454F18-80454F1C 003518 0002+02 1/0 0/0 0/0 .sdata2          T_JOINT_dylKeyTbl */
 static const s16 T_JOINT_dylKeyTbl[1] = {
     0x0106,
 };
 
-/* 80259440-80259468 253D80 0028+00 1/1 0/0 0/0 .text            __ct__22dScnPly_env_otherHIO_cFv */
 dScnPly_env_otherHIO_c::dScnPly_env_otherHIO_c() {
     mShadowDensity = 255.0f;
     mAdjustLODBias = 1;
@@ -99,7 +90,6 @@ dScnPly_env_otherHIO_c::dScnPly_env_otherHIO_c() {
 void dScnPly_env_otherHIO_c::genMessage(JORMContext* ctx) {
 }
 
-/* 80259468-802594AC 253DA8 0044+00 1/1 0/0 0/0 .text            __ct__22dScnPly_env_debugHIO_cFv */
 dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() {
     mBoxCullMinSize.set(-100.0f, -100.0f, -100.0f);
     mBoxCullMaxSize.set(100.0f, 100.0f, 100.0f);
@@ -110,7 +100,6 @@ dScnPly_env_debugHIO_c::dScnPly_env_debugHIO_c() {
 void dScnPly_env_debugHIO_c::genMessage(JORMContext* ctx) {
 }
 
-/* 802594AC-802597B8 253DEC 030C+00 1/0 0/0 0/0 .text            dScnPly_Draw__FP9dScnPly_c */
 static int dScnPly_Draw(dScnPly_c* i_this) {
     static s16 l_wipeType[] = {
         0x0000, 0x0000, 0x0011, 0x0002, 0x0002, 0x0001, 0x0003, 0x0001, 0x0004, 0x0004, 0x0005, 0x0005,
@@ -182,7 +171,6 @@ static int dScnPly_Draw(dScnPly_c* i_this) {
     return 1;
 }
 
-/* 802597B8-8025987C 2540F8 00C4+00 1/0 0/0 0/0 .text            dScnPly_Execute__FP9dScnPly_c */
 static int dScnPly_Execute(dScnPly_c* i_this) {
     i_this->offReset();
     dStage_roomControl_c::offNoChangeRoom();
@@ -209,7 +197,6 @@ static int dScnPly_Execute(dScnPly_c* i_this) {
     return 1;
 }
 
-/* 8025987C-802598AC 2541BC 0030+00 1/0 0/0 0/0 .text            dScnPly_IsDelete__F9dScnPly_c */
 static int dScnPly_IsDelete(dScnPly_c i_this) {
     dComIfGp_particle_cleanup();
     return 1;
@@ -223,10 +210,8 @@ struct PreLoadInfo {
     u8 resNameNum;
 };
 
-/* 80450760-80450764 -00001 0004+00 1/0 0/0 0/0 .sdata           T_JOINT_resName */
 static const char* T_JOINT_resName[1] = {"Always"};
 
-/* 8039A2C8-8039A2D8 -00001 0010+00 4/4 0/0 0/0 .rodata          PreLoadInfoT */
 static PreLoadInfo const PreLoadInfoT[1] = {
     {
         "T_JOINT",
@@ -237,12 +222,10 @@ static PreLoadInfo const PreLoadInfoT[1] = {
     },
 };
 
-/* 80450764-80450768 -00001 0004+00 4/4 0/0 0/0 .sdata           None */
 static s8 preLoadNo = -1;
 
 static u8 doPreLoad = 1;
 
-/* 802598AC-80259AC4 2541EC 0218+00 1/0 0/0 0/0 .text            dScnPly_Delete__FP9dScnPly_c */
 static int dScnPly_Delete(dScnPly_c* i_this) {
     daSus_c::reset();
     dMpath_c::remove();
@@ -306,7 +289,6 @@ static int dScnPly_Delete(dScnPly_c* i_this) {
     return 1;
 }
 
-/* 80259AC4-80259BFC 254404 0138+00 1/1 0/0 0/0 .text            resetGame__9dScnPly_cFv */
 bool dScnPly_c::resetGame() {
     if (fpcM_GetName(this) == PROC_OPENING_SCENE) {
         if (!dStage_roomControl_c::resetArchiveBank(0)) {
@@ -338,7 +320,6 @@ bool dScnPly_c::resetGame() {
     return true;
 }
 
-/* 80259BFC-80259C70 25453C 0074+00 1/1 0/0 0/0 .text            offReset__9dScnPly_cFv */
 void dScnPly_c::offReset() {
     if (field_0x1d4 != 0 && !fopOvlpM_IsPeek()) {
         mDoRst::offReset();
@@ -349,7 +330,6 @@ void dScnPly_c::offReset() {
     }
 }
 
-/* 80259C70-80259CAC 2545B0 003C+00 1/0 0/0 0/0 .text            phase_00__FP9dScnPly_c */
 static int phase_00(dScnPly_c* i_this) {
     if (!i_this->resetGame()) {
         return cPhs_INIT_e;
@@ -363,7 +343,6 @@ static int phase_00(dScnPly_c* i_this) {
     }
 }
 
-/* 80259CAC-80259D7C 2545EC 00D0+00 1/0 0/0 0/0 .text            phase_01__FP9dScnPly_c */
 static int phase_01(dScnPly_c* i_this) {
     mDoAud_setHour(dKy_getdaytime_hour());
     mDoAud_setMinute(dKy_getdaytime_minute());
@@ -387,12 +366,10 @@ static int phase_01(dScnPly_c* i_this) {
     }
 }
 
-/* 80259D7C-80259D84 2546BC 0008+00 1/0 0/0 0/0 .text            phase_0__FP9dScnPly_c */
 static int phase_0(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80259D84-8025A438 2546C4 06B4+00 1/0 0/0 0/0 .text            phase_1__FP9dScnPly_c */
 static int phase_1(dScnPly_c* i_this) {
     u32 id = fopScnM_GetID(i_this);
     dStage_roomControl_c::setProcID(id);
@@ -542,7 +519,6 @@ static int phase_1(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025A438-8025A4F8 254D78 00C0+00 1/0 0/0 0/0 .text            phase_1_0__FP9dScnPly_c */
 static int phase_1_0(dScnPly_c* i_this) {
     static char camparamarc[10] = "CamParam";
 
@@ -557,7 +533,6 @@ static int phase_1_0(dScnPly_c* i_this) {
     }
 }
 
-/* 8025A4F8-8025A5D4 254E38 00DC+00 1/0 0/0 0/0 .text            phase_2__FP9dScnPly_c */
 static int phase_2(dScnPly_c* i_this) {
     int tmp = dComIfG_syncAllObjectRes();
     if (tmp >= 0 && tmp != 0) {
@@ -575,7 +550,6 @@ static int phase_2(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025A5D4-8025A654 254F14 0080+00 1/0 0/0 0/0 .text            phase_3__FP9dScnPly_c */
 static int phase_3(dScnPly_c* i_this) {
     if ((i_this->sceneCommand != NULL && !i_this->sceneCommand->sync()) || mDoAud_check1stDynamicWave()) {
         return cPhs_INIT_e;
@@ -588,17 +562,14 @@ static int phase_3(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 80451128-80451130 000628 0004+04 1/1 0/0 0/0 .sbss            g_regHIO */
 dScnPly_reg_HIO_c g_regHIO;
 
-/* 8043079C-804307E0 05D4BC 0044+00 1/2 3/3 0/0 .bss             g_envHIO */
 dScnPly_env_HIO_c g_envHIO;
 
 #ifdef DEBUG
 dScnPly_preset_HIO_c g_presetHIO;
 #endif
 
-/* 8025A654-8025A9F4 254F94 03A0+00 1/0 0/0 0/0 .text            phase_4__FP9dScnPly_c */
 static int phase_4(dScnPly_c* i_this) {
     if (i_this->sceneCommand) {
         dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress());
@@ -684,7 +655,6 @@ static int phase_4(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025A9F4-8025AAC0 255334 00CC+00 1/0 0/0 0/0 .text            phase_5__FP9dScnPly_c */
 static int phase_5(dScnPly_c* i_this) {
     if (preLoadNo >= 0) {
         int phase_state = cPhs_NEXT_e;
@@ -715,7 +685,6 @@ static int phase_5(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025AAC0-8025AB8C 255400 00CC+00 1/0 0/0 0/0 .text            phase_6__FP9dScnPly_c */
 static int phase_6(dScnPly_c* i_this) {
     if (preLoadNo >= 0) {
         int phase_state = cPhs_NEXT_e;
@@ -746,12 +715,10 @@ static int phase_6(dScnPly_c* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025AB8C-8025AB94 2554CC 0008+00 1/0 0/0 0/0 .text            phase_compleate__FPv */
 static int phase_compleate(void* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8025AB94-8025ABC4 2554D4 0030+00 1/0 0/0 0/0 .text            dScnPly_Create__FP11scene_class */
 static void dScnPly_Create(scene_class* i_this) {
     static request_of_phase_process_fn l_method[] = {
         (request_of_phase_process_fn)phase_00,        (request_of_phase_process_fn)phase_1,
@@ -765,14 +732,12 @@ static void dScnPly_Create(scene_class* i_this) {
     dComLbG_PhaseHandler(&static_cast<dScnPly_c*>(i_this)->field_0x1c4, l_method, i_this);
 }
 
-/* 803C31C0-803C31D4 -00001 0014+00 2/0 0/0 0/0 .data            l_dScnPly_Method */
 static leafdraw_method_class l_dScnPly_Method = {
     (process_method_func)dScnPly_Create,  (process_method_func)dScnPly_Delete,
     (process_method_func)dScnPly_Execute, (process_method_func)dScnPly_IsDelete,
     (process_method_func)dScnPly_Draw,
 };
 
-/* 803C31D4-803C31FC -00001 0028+00 0/0 0/0 1/0 .data            g_profile_PLAY_SCENE */
 scene_process_profile_definition g_profile_PLAY_SCENE = {
     fpcLy_ROOT_e,                              // mLayerID
     1,                                         // mListID
@@ -786,7 +751,6 @@ scene_process_profile_definition g_profile_PLAY_SCENE = {
     (process_method_class*)&l_dScnPly_Method,  // mpMtd
 };
 
-/* 803C31FC-803C3224 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_OPENING_SCENE */
 scene_process_profile_definition g_profile_OPENING_SCENE = {
     fpcLy_ROOT_e,                              // mLayerID
     1,                                         // mListID
diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp
index 69cf2ce18a..84f8bf1204 100644
--- a/src/d/d_s_room.cpp
+++ b/src/d/d_s_room.cpp
@@ -12,12 +12,10 @@
 #include "m_Do/m_Do_Reset.h"
 #include "stdio.h"
 
-/* 8025AE1C-8025AE24 25575C 0008+00 1/0 0/0 0/0 .text dScnRoom_Draw__FP19room_of_scene_class */
 static int dScnRoom_Draw(room_of_scene_class* i_this) {
     return 1;
 }
 
-/* 8025AE24-8025AF24 255764 0100+00 2/2 0/0 0/0 .text            getResetArchiveBank__FiPPCUc */
 static int getResetArchiveBank(int param_1, u8 const** param_2) {
     dStage_roomControl_c::nameData* arcBankName = dStage_roomControl_c::getArcBankName();
     int local_30 = 0;
@@ -56,13 +54,11 @@ static int getResetArchiveBank(int param_1, u8 const** param_2) {
     return local_30;
 }
 
-/* 8025AF24-8025AF4C 255864 0028+00 1/1 0/0 0/0 .text            resetArchiveBank__Fi */
 static bool resetArchiveBank(int param_0) {
     const u8* tmp;
     return dStage_roomControl_c::resetArchiveBank(getResetArchiveBank(param_0, &tmp));
 }
 
-/* 8025AF4C-8025B0F0 25588C 01A4+00 1/1 0/0 0/0 .text            setArchiveBank__Fi */
 static bool setArchiveBank(int param_0) {
     u8* arr[4];
     int bank_no = getResetArchiveBank(param_0, (u8 const**)&arr);
@@ -104,7 +100,6 @@ static bool setArchiveBank(int param_0) {
     return true;
 }
 
-/* 8025B0F0-8025B150 255A30 0060+00 1/1 0/0 0/0 .text            objectDeleteJugge__FPvPv */
 static int objectDeleteJugge(void* i_obj, void*) {
     if (fpcM_GetProfName(i_obj) != PROC_BG) {
         if (fopAcM_IsActor(i_obj) && !fopAcM_CheckCondition((fopAc_ac_c*)i_obj, 4)) {
@@ -116,13 +111,11 @@ static int objectDeleteJugge(void* i_obj, void*) {
     return 0;
 }
 
-/* 8025B150-8025B174 255A90 0024+00 1/1 0/0 0/0 .text            deleteJugge__FPvPv */
 static int deleteJugge(void* i_obj, void*) {
     fpcM_Delete(i_obj);
     return 0;
 }
 
-/* 8025B174-8025B194 255AB4 0020+00 1/1 0/0 0/0 .text isCreatingCallback__FP10create_tagPUi */
 static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) {
     create_request* create_req = (create_request*)param_1->base.mpTagData;
     if (create_req->layer->layer_id == *param_2) {
@@ -132,12 +125,10 @@ static void* isCreatingCallback(create_tag* param_1, fpc_ProcID* param_2) {
     return NULL;
 }
 
-/* 8025B194-8025B1D0 255AD4 003C+00 2/2 0/0 0/0 .text            isCreating__FUi */
 static bool isCreating(fpc_ProcID param_0) {
     return fpcCtIt_Judge((fpcCtIt_JudgeFunc)isCreatingCallback, &param_0);
 }
 
-/* 8025B1D0-8025B2EC 255B10 011C+00 1/1 0/0 0/0 .text            loadDemoArchive__Fi */
 static int loadDemoArchive(int room_no) {
     if (*dStage_roomControl_c::getDemoArcName() == 0) {
         dStage_Lbnk_c* lbnk = dComIfGp_roomControl_getStatusRoomDt(room_no)->getLbnk();
@@ -169,7 +160,6 @@ static int loadDemoArchive(int room_no) {
     return 0;
 }
 
-/* 8025B2EC-8025B564 255C2C 0278+00 3/3 0/0 0/0 .text objectSetCheck__FP19room_of_scene_class */
 static bool objectSetCheck(room_of_scene_class* i_this) {
     int roomNo = fopScnM_GetParam(i_this);
     BOOL status_flag_8 = dComIfGp_roomControl_checkStatusFlag(roomNo, 8);
@@ -232,7 +222,6 @@ static bool objectSetCheck(room_of_scene_class* i_this) {
     return 1;
 }
 
-/* 8025B564-8025B674 255EA4 0110+00 1/0 0/0 0/0 .text dScnRoom_Execute__FP19room_of_scene_class */
 static int dScnRoom_Execute(room_of_scene_class* i_this) {
     int roomNo = fopScnM_GetParam(i_this);
 
@@ -258,13 +247,10 @@ static int dScnRoom_Execute(room_of_scene_class* i_this) {
     return 1;
 }
 
-/* 8025B674-8025B67C 255FB4 0008+00 1/0 0/0 0/0 .text dScnRoom_IsDelete__FP19room_of_scene_class
- */
 static int dScnRoom_IsDelete(room_of_scene_class*) {
     return 1;
 }
 
-/* 8025B67C-8025B73C 255FBC 00C0+00 1/1 0/0 0/0 .text            isReadRoom__Fi */
 static bool isReadRoom(int param_0) {
     roomRead_class* room = dComIfGp_getStageRoom();
 
@@ -295,7 +281,6 @@ inline const char* setArcName(room_of_scene_class* i_room) {
     return dComIfG_getRoomArcName(fopAcM_GetParam(i_room));
 }
 
-/* 8025B73C-8025B870 25607C 0134+00 1/0 0/0 0/0 .text dScnRoom_Delete__FP19room_of_scene_class */
 static int dScnRoom_Delete(room_of_scene_class* i_this) {
     int roomNo = fopScnM_GetParam(i_this);
     dComIfGp_roomControl_setStatusFlag(roomNo, 0);
@@ -318,14 +303,12 @@ static int dScnRoom_Delete(room_of_scene_class* i_this) {
     return 1;
 }
 
-/* 8025B870-8025B8A4 2561B0 0034+00 1/0 0/0 0/0 .text            phase_0__FP19room_of_scene_class */
 static int phase_0(room_of_scene_class* i_this) {
     int roomNo = fopScnM_GetParam(i_this);
     dStage_roomControl_c::setStatusProcID(roomNo, fopScnM_GetID(i_this));
     return cPhs_NEXT_e;
 }
 
-/* 8025B8A4-8025B980 2561E4 00DC+00 1/0 0/0 0/0 .text            phase_1__FP19room_of_scene_class */
 static int phase_1(room_of_scene_class* i_this) {
     i_this->field_0x1d8 = 1;
 
@@ -358,7 +341,6 @@ static int phase_1(room_of_scene_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025B980-8025BAAC 2562C0 012C+00 1/0 0/0 0/0 .text            phase_2__FP19room_of_scene_class */
 static int phase_2(room_of_scene_class* i_this) {
     const char* arcName = setArcName(i_this);
     int phase = dComIfG_syncStageRes(arcName);
@@ -401,12 +383,10 @@ static int phase_2(room_of_scene_class* i_this) {
     return cPhs_NEXT_e;
 }
 
-/* 8025BAAC-8025BAC4 2563EC 0018+00 1/1 0/0 0/0 .text setZoneNo__20dStage_roomControl_cFii */
 void dStage_roomControl_c::setZoneNo(int i_roomNo, int i_zoneNo) {
     mStatus[i_roomNo].mZoneNo = i_zoneNo;
 }
 
-/* 8025BAC4-8025BAF8 256404 0034+00 1/0 0/0 0/0 .text            phase_3__FP19room_of_scene_class */
 static int phase_3(room_of_scene_class* i_this) {
     if (objectSetCheck(i_this)) {
         return cPhs_NEXT_e;
@@ -415,7 +395,6 @@ static int phase_3(room_of_scene_class* i_this) {
     }
 }
 
-/* 8025BAF8-8025BB48 256438 0050+00 1/0 0/0 0/0 .text            phase_4__FP19room_of_scene_class */
 static int phase_4(room_of_scene_class* i_this) {
     if (dComIfGp_getPlayer(0) == NULL) {
         return cPhs_INIT_e;
@@ -428,7 +407,6 @@ static int phase_4(room_of_scene_class* i_this) {
     }
 }
 
-/* 8025BB48-8025BB78 256488 0030+00 1/0 0/0 0/0 .text            dScnRoom_Create__FP11scene_class */
 static int dScnRoom_Create(scene_class* i_this) {
     static int (*l_method[5])(void*) = {
         (int (*)(void*))phase_0, (int (*)(void*))phase_1, (int (*)(void*))phase_2,
@@ -439,14 +417,12 @@ static int dScnRoom_Create(scene_class* i_this) {
     return dComLbG_PhaseHandler(&room->field_0x1c4, l_method, i_this);
 }
 
-/* 803C3274-803C3288 -00001 0014+00 1/0 0/0 0/0 .data            l_dScnRoom_Method */
 static leafdraw_method_class l_dScnRoom_Method = {
     (process_method_func)dScnRoom_Create,  (process_method_func)dScnRoom_Delete,
     (process_method_func)dScnRoom_Execute, (process_method_func)dScnRoom_IsDelete,
     (process_method_func)dScnRoom_Draw,
 };
 
-/* 803C3288-803C32B0 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_ROOM_SCENE */
 scene_process_profile_definition g_profile_ROOM_SCENE = {
     fpcLy_CURRENT_e,                            // mLayerID
     0,                                          // mListID
diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp
index 82e6b1006a..c4d6fd1dc7 100644
--- a/src/d/d_s_title.cpp
+++ b/src/d/d_s_title.cpp
@@ -9,7 +9,6 @@
 #include "f_op/f_op_scene.h"
 #include "f_pc/f_pc_leaf.h"
 
-/* 803C32B0-803C32D8 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_WARNING_SCENE */
 extern scene_process_profile_definition g_profile_WARNING_SCENE = {
     fpcLy_ROOT_e,           // mLayerID     
     1,                      // mListID
@@ -23,7 +22,6 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = {
     NULL,                   // mpMtd
 };
 
-/* 803C32D8-803C3300 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_WARNING2_SCENE */
 extern scene_process_profile_definition g_profile_WARNING2_SCENE = {
     fpcLy_ROOT_e,           // mLayerID          
     1,                      // mListID   
diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index 947259da5e..f1da8b4daa 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -19,7 +19,6 @@
 #include "lingcod/lingcod.h"
 #endif
 
-/* 80032918-80032958 02D258 0040+00 4/4 0/0 0/0 .text            dSv_item_rename__FUc */
 static u8 dSv_item_rename(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_OIL_BOTTLE_2:
@@ -33,7 +32,6 @@ static u8 dSv_item_rename(u8 i_itemNo) {
     }
 }
 
-/* 80032958-80032A48 02D298 00F0+00 1/1 0/0 0/0 .text            init__21dSv_player_status_a_cFv */
 void dSv_player_status_a_c::init() {
     mMaxLife = 15;
     mLife = 12;
@@ -69,8 +67,6 @@ void dSv_player_status_a_c::init() {
     }
 }
 
-/* 80032A48-80032A5C 02D388 0014+00 0/0 1/1 0/0 .text
- * setSelectItemIndex__21dSv_player_status_a_cFiUc              */
 void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 i_slotNo) {
     JUT_ASSERT(107, (i_no >= 0) && (i_no < ITEM_XY_MAX_DUMMY/2));
 
@@ -79,8 +75,6 @@ void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 i_slotNo) {
     }
 }
 
-/* 80032A5C-80032A78 02D39C 001C+00 7/7 20/20 0/0 .text
- * getSelectItemIndex__21dSv_player_status_a_cCFi               */
 u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const {
     JUT_ASSERT(124, (i_no >= 0) && (i_no < ITEM_XY_MAX_DUMMY/2));
 
@@ -90,8 +84,6 @@ u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const {
     return 0;
 }
 
-/* 80032A78-80032A8C 02D3B8 0014+00 0/0 1/1 0/0 .text setMixItemIndex__21dSv_player_status_a_cFiUc
- */
 void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 i_slotNo) {
     JUT_ASSERT(143, (i_no >= 0) && (i_no < ITEM_XY_MAX_DUMMY/2));
 
@@ -100,8 +92,6 @@ void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 i_slotNo) {
     }
 }
 
-/* 80032A8C-80032AA8 02D3CC 001C+00 0/0 1/1 0/0 .text getMixItemIndex__21dSv_player_status_a_cCFi
- */
 u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const {
     JUT_ASSERT(160, (i_no >= 0) && (i_no < ITEM_XY_MAX_DUMMY/2));
 
@@ -111,7 +101,6 @@ u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const {
     return 0;
 }
 
-/* 80032AA8-80032AF8 02D3E8 0050+00 0/0 4/4 0/0 .text getRupeeMax__21dSv_player_status_a_cCFv */
 u16 dSv_player_status_a_c::getRupeeMax() const {
     if (mWalletSize < 3) {  // if you make this a default, it wont match. Compiler, pls.
         switch (mWalletSize) {
@@ -147,7 +136,6 @@ void dSv_player_status_a_c::offMagicFlag(u8 i_magic) {
     mMagicFlag &= (u8)~(u8)(1 << i_magic);
 }
 
-/* 80032AF8-80032B50 02D438 0058+00 0/0 1/1 0/0 .text isMagicFlag__21dSv_player_status_a_cCFUc */
 BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
     JUT_ASSERT(241, 0 <= i_magic && i_magic < 8);
     if (i_magic == 0) {
@@ -158,7 +146,6 @@ BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const {
     return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE;
 }
 
-/* 80032B50-80032B94 02D490 0044+00 1/1 0/0 0/0 .text            init__21dSv_player_status_b_cFv */
 void dSv_player_status_b_c::init() {
     mDateIpl = 0;
     mTransformLevelFlag = 0;
@@ -172,7 +159,6 @@ void dSv_player_status_b_c::init() {
     }
 }
 
-/* 80032B94-80032BB0 02D4D4 001C+00 0/0 1/1 0/0 .text onDarkClearLV__21dSv_player_status_b_cFi */
 void dSv_player_status_b_c::onDarkClearLV(int i_no) {
     JUT_ASSERT(281, (i_no >= 0) && (i_no < 8));
     mDarkClearLevelFlag |= (u8)(1 << i_no);
@@ -183,13 +169,11 @@ void dSv_player_status_b_c::offDarkClearLV(int i_no) {
     mDarkClearLevelFlag &= (u8)~(u8)(1 << i_no);
 }
 
-/* 80032BB0-80032BD0 02D4F0 0020+00 0/0 4/4 8/8 .text isDarkClearLV__21dSv_player_status_b_cCFi */
 BOOL dSv_player_status_b_c::isDarkClearLV(int i_no) const {
     JUT_ASSERT(311, (i_no >= 0) && (i_no < 8));
     return mDarkClearLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
-/* 80032BD0-80032BEC 02D510 001C+00 0/0 1/1 0/0 .text onTransformLV__21dSv_player_status_b_cFi */
 void dSv_player_status_b_c::onTransformLV(int i_no) {
     JUT_ASSERT(326, (i_no >= 0) && (i_no < 8));
     mTransformLevelFlag |= (u8)(1 << i_no);
@@ -200,13 +184,11 @@ void dSv_player_status_b_c::offTransformLV(int i_no) {
     mTransformLevelFlag &= (u8)~(u8)(1 << i_no);
 }
 
-/* 80032BEC-80032C0C 02D52C 0020+00 0/0 8/8 9/9 .text isTransformLV__21dSv_player_status_b_cCFi */
 BOOL dSv_player_status_b_c::isTransformLV(int i_no) const {
     JUT_ASSERT(356, (i_no >= 0) && (i_no < 8));
     return mTransformLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
-/* 80032C0C-80032C64 02D54C 0058+00 1/1 0/0 0/0 .text            init__17dSv_horse_place_cFv */
 void dSv_horse_place_c::init() {
     strcpy(mName, "");
     mPos.set(0.0f, 0.0f, 0.0f);
@@ -215,7 +197,6 @@ void dSv_horse_place_c::init() {
     mRoomNo = 0;
 }
 
-/* 80032C64-80032CC8 02D5A4 0064+00 0/0 0/0 1/1 .text set__17dSv_horse_place_cFPCcRC4cXyzsSc */
 void dSv_horse_place_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo) {
     JUT_ASSERT(391, strlen(i_name) <= 7);
     strcpy(mName, i_name);
@@ -224,8 +205,6 @@ void dSv_horse_place_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle,
     mRoomNo = i_roomNo;
 }
 
-/* 80032CC8-80032D1C 02D608 0054+00 1/1 0/0 0/0 .text            init__25dSv_player_return_place_cFv
- */
 void dSv_player_return_place_c::init() {
     strcpy(mName, "F_SP108");
     mRoomNo = 1;
@@ -234,7 +213,6 @@ void dSv_player_return_place_c::init() {
     unk11 = 0;
 }
 
-/* 80032D1C-80032D60 02D65C 0044+00 0/0 0/0 1/1 .text set__25dSv_player_return_place_cFPCcScUc */
 void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status) {
     JUT_ASSERT(426, strlen(i_name) <= 7);
     strcpy(mName, i_name);
@@ -242,8 +220,6 @@ void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status
     mPlayerStatus = i_status;
 }
 
-/* 80032D60-80032DE0 02D6A0 0080+00 1/1 0/0 0/0 .text init__33dSv_player_field_last_stay_info_cFv
- */
 void dSv_player_field_last_stay_info_c::init() {
     strcpy(mName, "");
     mPos.set(0.0f, 0.0f, 0.0f);
@@ -258,7 +234,6 @@ void dSv_player_field_last_stay_info_c::init() {
     }
 }
 
-/* 80032DE0-80032E4C 02D720 006C+00 0/0 2/2 0/0 .text           set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc */
 void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle,
                                             s8 i_spawn, u8 i_regionNo) {
     JUT_ASSERT(468, strlen(i_name) <= 7);
@@ -269,7 +244,6 @@ void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_po
     mRegionNo = i_regionNo;
 }
 
-/* 80032E4C-80032E78 02D78C 002C+00 0/0 1/1 0/0 .text            onRegionBit__33dSv_player_field_last_stay_info_cFi */
 void dSv_player_field_last_stay_info_c::onRegionBit(int i_region) {
     if (i_region >= 0 && i_region < 8) {
         mRegion |= (u8)(1 << i_region);
@@ -278,7 +252,6 @@ void dSv_player_field_last_stay_info_c::onRegionBit(int i_region) {
     }
 }
 
-/* 80032E78-80032EB0 02D7B8 0038+00 0/0 2/2 0/0 .text           isRegionBit__33dSv_player_field_last_stay_info_cCFi */
 BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region) const {
     if (i_region >= 0 && i_region < 8) {
         return (mRegion & (u8)(1 << i_region)) ? TRUE : FALSE;
@@ -288,7 +261,6 @@ BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region) const {
     }
 }
 
-/* 80032EB0-80032F2C 02D7F0 007C+00 1/1 0/0 0/0 .text init__27dSv_player_last_mark_info_cFv */
 void dSv_player_last_mark_info_c::init() {
     strcpy(mName, "");
     mPos.set(0.0f, 0.0f, 0.0f);
@@ -302,8 +274,6 @@ void dSv_player_last_mark_info_c::init() {
     }
 }
 
-/* 80032F2C-80032F90 02D86C 0064+00 0/0 1/1 0/0 .text
- * setWarpItemData__27dSv_player_last_mark_info_cFPCcRC4cXyzsScUcUc */
 void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz& i_pos,
                                                   s16 i_angle, s8 i_roomNo, u8 unk_4, u8 unk_5) {
     strcpy(mName, i_name);
@@ -315,7 +285,6 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz
     (void)unk_5;
 }
 
-/* 80032F90-80032FB8 02D8D0 0028+00 1/1 0/0 0/0 .text            init__17dSv_player_item_cFv */
 void dSv_player_item_c::init() {
     for (int i = 0; i < MAX_ITEM_SLOTS; i++) {
         mItems[i] = fpcNm_ITEM_NONE;
@@ -323,7 +292,6 @@ void dSv_player_item_c::init() {
     }
 }
 
-/* 80032FB8-80033030 02D8F8 0078+00 11/11 45/45 2/2 .text setItem__17dSv_player_item_cFiUc */
 void dSv_player_item_c::setItem(int i_slotNo, u8 i_itemNo) {
     if (i_slotNo < MAX_ITEM_SLOTS) {
         mItems[i_slotNo] = i_itemNo;
@@ -337,8 +305,6 @@ void dSv_player_item_c::setItem(int i_slotNo, u8 i_itemNo) {
     }
 }
 
-/* 80033030-800332F8 02D970 02C8+00 7/7 70/70 2/2 .text            getItem__17dSv_player_item_cCFib
- */
 u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const {
     if (i_slotNo < MAX_ITEM_SLOTS) {
         if (i_checkCombo) {
@@ -415,7 +381,6 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const {
     return fpcNm_ITEM_NONE;
 }
 
-/* 800332F8-80033354 02DC38 005C+00 2/2 0/0 0/0 .text setLineUpItem__17dSv_player_item_cFv */
 void dSv_player_item_c::setLineUpItem() {
     static u8 i_item_lst[23] = {
         10, 8,  6,  2,  9,  4,  3,
@@ -439,7 +404,6 @@ void dSv_player_item_c::setLineUpItem() {
     }
 }
 
-/* 80033354-80033370 02DC94 001C+00 0/0 2/2 0/0 .text getLineUpItem__17dSv_player_item_cCFi */
 u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const {
     if (i_slotNo < MAX_ITEM_SLOTS) {
         return mItemSlots[i_slotNo];
@@ -448,7 +412,6 @@ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const {
     return fpcNm_ITEM_NONE;
 }
 
-/* 80033370-80033450 02DCB0 00E0+00 1/1 2/2 0/0 .text setBottleItemIn__17dSv_player_item_cFUcUc */
 void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) {
     curItemIn = dSv_item_rename(curItemIn);
     newItemIn = dSv_item_rename(newItemIn);
@@ -470,14 +433,11 @@ void dSv_player_item_c::setBottleItemIn(u8 curItemIn, u8 newItemIn) {
     }
 }
 
-/* 80033450-80033494 02DD90 0044+00 0/0 26/26 0/0 .text
- * setEmptyBottleItemIn__17dSv_player_item_cFUc                 */
 void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) {
     i_itemNo = dSv_item_rename(i_itemNo);
     setBottleItemIn(fpcNm_ITEM_EMPTY_BOTTLE, i_itemNo);
 }
 
-/* 80033494-80033514 02DDD4 0080+00 0/0 1/1 1/1 .text setEmptyBottle__17dSv_player_item_cFv */
 void dSv_player_item_c::setEmptyBottle() {
     for (int i = 0; i < 4; i++) {
         if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) {
@@ -487,7 +447,6 @@ void dSv_player_item_c::setEmptyBottle() {
     }
 }
 
-/* 80033514-80033598 02DE54 0084+00 0/0 3/3 0/0 .text setEmptyBottle__17dSv_player_item_cFUc */
 void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) {
     for (int i = 0; i < 4; i++) {
         if (dComIfGs_getItem((u8)(i + SLOT_11), true) == fpcNm_ITEM_NONE) {
@@ -497,8 +456,6 @@ void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) {
     }
 }
 
-/* 80033598-800336BC 02DED8 0124+00 1/1 3/3 0/0 .text
- * setEquipBottleItemIn__17dSv_player_item_cFUcUc               */
 void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) {
     newItemIn = dSv_item_rename(newItemIn);
 
@@ -515,13 +472,10 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) {
     }
 }
 
-/* 800336BC-800336E0 02DFFC 0024+00 0/0 4/4 0/0 .text
- * setEquipBottleItemEmpty__17dSv_player_item_cFUc              */
 void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) {
     setEquipBottleItemIn(curItemIn, fpcNm_ITEM_EMPTY_BOTTLE);
 }
 
-/* 800336E0-80033754 02E020 0074+00 0/0 30/30 0/0 .text checkBottle__17dSv_player_item_cFUc */
 u8 dSv_player_item_c::checkBottle(u8 i_itemNo) {
     u8 num_bottles = 0;
     i_itemNo = dSv_item_rename(i_itemNo);
@@ -534,7 +488,6 @@ u8 dSv_player_item_c::checkBottle(u8 i_itemNo) {
     return num_bottles;
 }
 
-/* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */
 BOOL dSv_player_item_c::checkInsectBottle() {
     for (int i = 0; i < 24; i++) {
         if (dComIfGs_isItemFirstBit(fpcNm_ITEM_M_BEETLE + i) &&
@@ -545,7 +498,6 @@ BOOL dSv_player_item_c::checkInsectBottle() {
     return FALSE;
 }
 
-/* 800337EC-80033828 02E12C 003C+00 0/0 1/1 1/1 .text checkEmptyBottle__17dSv_player_item_cFv */
 u8 dSv_player_item_c::checkEmptyBottle() {
     u8 bottleNum = 0;
 
@@ -557,8 +509,6 @@ u8 dSv_player_item_c::checkEmptyBottle() {
     return bottleNum;
 }
 
-/* 80033828-80033910 02E168 00E8+00 1/1 0/0 0/0 .text setBombBagItemIn__17dSv_player_item_cFUcUcb
- */
 void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setNum) {
     for (int i = 0; i < 3; i++) {
         if (i_curBomb == mItems[i + SLOT_15]) {
@@ -578,8 +528,6 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN
     }
 }
 
-/* 80033910-80033A20 02E250 0110+00 1/1 0/0 0/0 .text
- * setBombBagItemIn__17dSv_player_item_cFUcUcUcb                */
 void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNum, bool i_setNum) {
     for (int i = 0; i < 3; i++) {
         if (i_curBomb == mItems[i + SLOT_15]) {
@@ -602,19 +550,14 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu
     }
 }
 
-/* 80033A20-80033A50 02E360 0030+00 0/0 2/2 0/0 .text
- * setEmptyBombBagItemIn__17dSv_player_item_cFUcb               */
 void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) {
     setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_setNum);
 }
 
-/* 80033A50-80033A88 02E390 0038+00 0/0 1/1 1/1 .text
- * setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb             */
 void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) {
     setBombBagItemIn(fpcNm_ITEM_BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum);
 }
 
-/* 80033A88-80033B08 02E3C8 0080+00 0/0 2/2 0/0 .text setEmptyBombBag__17dSv_player_item_cFv */
 void dSv_player_item_c::setEmptyBombBag() {
     for (int i = 0; i < 3; i++) {
         if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) {
@@ -624,7 +567,6 @@ void dSv_player_item_c::setEmptyBombBag() {
     }
 }
 
-/* 80033B08-80033BEC 02E448 00E4+00 0/0 3/3 0/0 .text setEmptyBombBag__17dSv_player_item_cFUcUc */
 void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) {
     for (int i = 0; i < 3; i++) {
         if (dComIfGs_getItem((u8)(i + SLOT_15), true) == fpcNm_ITEM_NONE) {
@@ -642,7 +584,6 @@ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) {
     }
 }
 
-/* 80033BEC-80033C2C 02E52C 0040+00 0/0 1/1 0/0 .text checkBombBag__17dSv_player_item_cFUc */
 u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) {
     u8 bombBags = 0;
 
@@ -654,7 +595,6 @@ u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) {
     return bombBags;
 }
 
-/* 80033C2C-80033CBC 02E56C 0090+00 0/0 2/2 1/1 .text setWarashibeItem__17dSv_player_item_cFUc */
 void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) {
     dComIfGs_setItem(SLOT_21, i_itemNo);
     dComIfGp_setItem(SLOT_21, i_itemNo);
@@ -666,7 +606,6 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) {
     }
 }
 
-/* 80033CBC-80033D40 02E5FC 0084+00 0/0 1/1 0/0 .text setRodTypeLevelUp__17dSv_player_item_cFv */
 void dSv_player_item_c::setRodTypeLevelUp() {
     switch (mItems[SLOT_20]) {
     case fpcNm_ITEM_BEE_ROD: {
@@ -688,7 +627,6 @@ void dSv_player_item_c::setRodTypeLevelUp() {
     }
 }
 
-/* 80033D40-80033E40 02E680 0100+00 0/0 2/2 0/0 .text            setBaitItem__17dSv_player_item_cFUc */
 void dSv_player_item_c::setBaitItem(u8 i_itemNo) {
     switch (i_itemNo) {
     case fpcNm_ITEM_BEE_CHILD: {
@@ -722,14 +660,12 @@ void dSv_player_item_c::setBaitItem(u8 i_itemNo) {
     }
 }
 
-/* 80033E40-80033E60 02E780 0020+00 1/1 0/0 0/0 .text            init__21dSv_player_get_item_cFv */
 void dSv_player_get_item_c::init() {
     for (int i = 0; i < 8; i++) {
         mItemFlags[i] = 0;
     }
 }
 
-/* 80033E60-80033E94 02E7A0 0034+00 0/0 3/3 1/1 .text onFirstBit__21dSv_player_get_item_cFUc */
 void dSv_player_get_item_c::onFirstBit(u8 i_itemno) {
     JUT_ASSERT(1563, 0 <= i_itemno && i_itemno < ITEM_BIT_MAX);
 
@@ -738,7 +674,6 @@ void dSv_player_get_item_c::onFirstBit(u8 i_itemno) {
     mItemFlags[index] |= (1 << bit);
 }
 
-/* 80033E94-80033EC8 02E7D4 0034+00 0/0 7/7 1/1 .text offFirstBit__21dSv_player_get_item_cFUc */
 void dSv_player_get_item_c::offFirstBit(u8 i_itemno) {
     JUT_ASSERT(1581, 0 <= i_itemno && i_itemno < ITEM_BIT_MAX);
 
@@ -747,7 +682,6 @@ void dSv_player_get_item_c::offFirstBit(u8 i_itemno) {
     mItemFlags[index] &= ~(1 << bit);
 }
 
-/* 80033EC8-80033F00 02E808 0038+00 4/4 87/87 2/2 .text isFirstBit__21dSv_player_get_item_cCFUc */
 BOOL dSv_player_get_item_c::isFirstBit(u8 i_itemno) const {
     JUT_ASSERT(1599, 0 <= i_itemno && i_itemno < ITEM_BIT_MAX);
 
@@ -756,7 +690,6 @@ BOOL dSv_player_get_item_c::isFirstBit(u8 i_itemno) const {
     return mItemFlags[index] & (1 << bit) ? TRUE : FALSE;
 }
 
-/* 80033F00-80033F6C 02E840 006C+00 1/1 0/0 0/0 .text            init__24dSv_player_item_record_cFv */
 void dSv_player_item_record_c::init() {
     mArrowNum = 0;
 
@@ -775,8 +708,6 @@ void dSv_player_item_record_c::init() {
     }
 }
 
-/* 80033F6C-80033F7C 02E8AC 0010+00 3/3 5/5 0/0 .text setBombNum__24dSv_player_item_record_cFUcUc
- */
 void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) {
 #if VERSION == VERSION_SHIELD_DEBUG
     if (i_bagIdx == 8) {
@@ -788,22 +719,16 @@ void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) {
     mBombNum[i_bagIdx] = i_bombNum;
 }
 
-/* 80033F7C-80033F8C 02E8BC 0010+00 0/0 13/13 2/2 .text getBombNum__24dSv_player_item_record_cCFUc
- */
 u8 dSv_player_item_record_c::getBombNum(u8 i_bagIdx) const {
     JUT_ASSERT(1718, 0 <= i_bagIdx && i_bagIdx < dSv_player_item_c::BOMB_BAG_MAX);
     return mBombNum[i_bagIdx];
 }
 
-/* 80033F8C-80033F9C 02E8CC 0010+00 0/0 2/2 0/0 .text
- * setBottleNum__24dSv_player_item_record_cFUcUc                */
 void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 i_bottleNum) {
     JUT_ASSERT(1733, 0 <= i_bottleIdx && i_bottleIdx < dSv_player_item_c::BOTTLE_MAX);
     mBottleNum[i_bottleIdx] = i_bottleNum;
 }
 
-/* 80033F9C-80034030 02E8DC 0094+00 0/0 1/1 0/0 .text addBottleNum__24dSv_player_item_record_cFUcs
- */
 u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 i_no) {
     JUT_ASSERT(1748, 0 <= i_bottleIdx && i_bottleIdx < dSv_player_item_c::BOTTLE_MAX);
     int bottleNum = mBottleNum[i_bottleIdx] + i_no;
@@ -821,14 +746,11 @@ u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 i_no) {
     return mBottleNum[i_bottleIdx];
 }
 
-/* 80034030-80034040 02E970 0010+00 0/0 4/4 0/0 .text getBottleNum__24dSv_player_item_record_cCFUc
- */
 u8 dSv_player_item_record_c::getBottleNum(u8 i_bottleIdx) const {
     JUT_ASSERT(1776, 0 <= i_bottleIdx && i_bottleIdx < dSv_player_item_c::BOTTLE_MAX);
     return mBottleNum[i_bottleIdx];
 }
 
-/* 80034040-800340B8 02E980 0078+00 1/1 0/0 0/0 .text            init__21dSv_player_item_max_cFv */
 void dSv_player_item_max_c::init() {
     for (int i = 0; i < 7; i++) {
         mItemMax[i] = 30;
@@ -839,7 +761,6 @@ void dSv_player_item_max_c::init() {
     mItemMax[7] = 0;
 }
 
-/* 800340B8-800340F8 02E9F8 0040+00 1/1 0/0 0/0 .text setBombNum__21dSv_player_item_max_cFUcUc */
 void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) {
     switch (i_bombType) {
     case fpcNm_ITEM_NORMAL_BOMB:
@@ -853,7 +774,6 @@ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) {
     }
 }
 
-/* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */
 u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const {
     u8 lv_multiplier = 1;
     if (dComIfGs_isItemFirstBit(fpcNm_ITEM_BOMB_BAG_LV2)) {
@@ -872,7 +792,6 @@ u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const {
     }
 }
 
-/* 800341AC-800341E8 02EAEC 003C+00 1/1 0/0 0/0 .text            init__20dSv_player_collect_cFv */
 void dSv_player_collect_c::init() {
     for (int i = 0; i < 8; i++) {
         mItem[i] = 0;
@@ -885,7 +804,6 @@ void dSv_player_collect_c::init() {
     mPohNum = 0;
 }
 
-/* 800341E8-80034208 02EB28 0020+00 0/0 8/8 0/0 .text setCollect__20dSv_player_collect_cFiUc */
 void dSv_player_collect_c::setCollect(int i_item_type, u8 i_item) {
     JUT_ASSERT(1894, 0 <= i_item && i_item < 8);
     mItem[i_item_type] |= (u8)(1 << i_item);
@@ -896,14 +814,11 @@ void dSv_player_collect_c::offCollect(int i_item_type, u8 i_item) {
     mItem[i_item_type] &= (u8)~(u8)(1 << i_item);
 }
 
-/* 80034208-8003422C 02EB48 0024+00 0/0 4/4 4/4 .text isCollect__20dSv_player_collect_cCFiUc */
 BOOL dSv_player_collect_c::isCollect(int i_item_type, u8 i_item) const {
     JUT_ASSERT(1924, 0 <= i_item && i_item < 8);
     return mItem[i_item_type] & (u8)(1 << i_item) ? TRUE : FALSE;
 }
 
-/* 8003422C-8003424C 02EB6C 0020+00 0/0 1/1 1/1 .text onCollectCrystal__20dSv_player_collect_cFUc
- */
 void dSv_player_collect_c::onCollectCrystal(u8 i_item) {
     JUT_ASSERT(1956, 0 <= i_item && i_item < 8);
     mCrystal |= (u8)(1 << i_item);
@@ -914,15 +829,11 @@ void dSv_player_collect_c::offCollectCrystal(u8 i_item) {
     mCrystal &= (u8)~(u8)(1 << i_item);
 }
 
-/* 8003424C-80034270 02EB8C 0024+00 0/0 4/4 0/0 .text isCollectCrystal__20dSv_player_collect_cCFUc
- */
 BOOL dSv_player_collect_c::isCollectCrystal(u8 i_item) const {
     JUT_ASSERT(1986, 0 <= i_item && i_item < 8);
     return mCrystal & (u8)(1 << i_item) ? TRUE : FALSE;
 }
 
-/* 80034270-80034290 02EBB0 0020+00 0/0 1/1 1/1 .text onCollectMirror__20dSv_player_collect_cFUc
- */
 void dSv_player_collect_c::onCollectMirror(u8 i_item) {
     JUT_ASSERT(2001, 0 <= i_item && i_item < 8);
     mMirror |= (u8)(1 << i_item);
@@ -933,14 +844,11 @@ void dSv_player_collect_c::offCollectMirror(u8 i_item) {
     mMirror &= (u8)~(u8)(1 << i_item);
 }
 
-/* 80034290-800342B4 02EBD0 0024+00 0/0 4/4 0/0 .text isCollectMirror__20dSv_player_collect_cCFUc
- */
 BOOL dSv_player_collect_c::isCollectMirror(u8 i_item) const {
     JUT_ASSERT(2031, 0 <= i_item && i_item < 8);
     return mMirror & (u8)(1 << i_item) ? TRUE : FALSE;
 }
 
-/* 800342B4-800342DC 02EBF4 0028+00 1/1 0/0 0/0 .text            init__17dSv_player_wolf_cFv */
 void dSv_player_wolf_c::init() {
     for (int i = 0; i < 3; i++) {
         unk0[i] = 0;
@@ -949,7 +857,6 @@ void dSv_player_wolf_c::init() {
     unk3 = 0;
 }
 
-/* 800342DC-80034320 02EC1C 0044+00 1/1 0/0 0/0 .text            init__16dSv_light_drop_cFv */
 void dSv_light_drop_c::init() {
     for (int i = 0; i < 4; i++) {
         mLightDropNum[i] = 0;
@@ -962,7 +869,6 @@ void dSv_light_drop_c::init() {
     }
 }
 
-/* 80034320-80034340 02EC60 0020+00 0/0 0/0 1/1 .text setLightDropNum__16dSv_light_drop_cFUcUc */
 void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 i_dropNum) {
     if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) {
         JUT_ASSERT(2089, (i_nowLevel >= 0) && (i_nowLevel < LIGHT_DROP_STAGE));
@@ -970,7 +876,6 @@ void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 i_dropNum) {
     }
 }
 
-/* 80034340-80034368 02EC80 0028+00 0/0 11/11 4/4 .text getLightDropNum__16dSv_light_drop_cCFUc */
 u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const {
     if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) {
         return 0;
@@ -980,7 +885,6 @@ u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const {
     return mLightDropNum[i_nowLevel];
 }
 
-/* 80034368-8003439C 02ECA8 0034+00 0/0 4/4 0/0 .text onLightDropGetFlag__16dSv_light_drop_cFUc */
 void dSv_light_drop_c::onLightDropGetFlag(u8 i_nowLevel) {
     if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) {
         JUT_ASSERT(2208, (i_nowLevel >= 0) && (i_nowLevel < LIGHT_DROP_STAGE));
@@ -995,8 +899,6 @@ void dSv_light_drop_c::offLightDropGetFlag(u8 i_nowLevel) {
     }
 }
 
-/* 8003439C-800343DC 02ECDC 0040+00 0/0 8/8 2/2 .text isLightDropGetFlag__16dSv_light_drop_cCFUc
- */
 BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const {
     if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) {
         return 0;
@@ -1006,7 +908,6 @@ BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const {
     return mLightDropGetFlag & (u8)(1 << i_nowLevel) ? TRUE : FALSE;
 }
 
-/* 800343DC-80034428 02ED1C 004C+00 1/1 0/0 0/0 .text            init__17dSv_letter_info_cFv */
 void dSv_letter_info_c::init() {
     for (int i = 0; i < 2; i++) {
         mLetterGetFlags[i] = 0;
@@ -1018,31 +919,26 @@ void dSv_letter_info_c::init() {
     }
 }
 
-/* 80034428-8003444C 02ED68 0024+00 0/0 2/2 0/0 .text onLetterGetFlag__17dSv_letter_info_cFi */
 void dSv_letter_info_c::onLetterGetFlag(int i_no) {
     JUT_ASSERT(2281, (i_no >= 0) && (i_no < LETTER_INFO_BIT));
     mLetterGetFlags[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 8003444C-80034474 02ED8C 0028+00 0/0 4/4 0/0 .text isLetterGetFlag__17dSv_letter_info_cCFi */
 BOOL dSv_letter_info_c::isLetterGetFlag(int i_no) const {
     JUT_ASSERT(2311, (i_no >= 0) && (i_no < LETTER_INFO_BIT));
     return mLetterGetFlags[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
-/* 80034474-8003449C 02EDB4 0028+00 0/0 1/1 0/0 .text onLetterReadFlag__17dSv_letter_info_cFi */
 void dSv_letter_info_c::onLetterReadFlag(int i_no) {
     JUT_ASSERT(2326, (i_no >= 0) && (i_no < LETTER_INFO_BIT));
     mLetterReadFlags[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 8003449C-800344C8 02EDDC 002C+00 0/0 3/3 0/0 .text isLetterReadFlag__17dSv_letter_info_cCFi */
 BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const {
     JUT_ASSERT(2356, (i_no >= 0) && (i_no < LETTER_INFO_BIT));
     return mLetterReadFlags[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE;
 }
 
-/* 800344C8-800344FC 02EE08 0034+00 1/1 0/0 0/0 .text            init__18dSv_fishing_info_cFv */
 void dSv_fishing_info_c::init() {
     for (int i = 0; i < 16; i++) {
         mFishCount[i] = 0;
@@ -1050,14 +946,12 @@ void dSv_fishing_info_c::init() {
     }
 }
 
-/* 800344FC-80034518 02EE3C 001C+00 0/0 0/0 1/1 .text addFishCount__18dSv_fishing_info_cFUc */
 void dSv_fishing_info_c::addFishCount(u8 i_fishIdx) {
     if (mFishCount[i_fishIdx] < 999) {
         mFishCount[i_fishIdx]++;
     }
 }
 
-/* 80034518-800345AC 02EE58 0094+00 1/1 0/0 0/0 .text            init__17dSv_player_info_cFv */
 void dSv_player_info_c::init() {
     dMeter2Info_getString(0x382, mPlayerName, NULL);  // Link
     dMeter2Info_getString(0x383, mHorseName, NULL);   // Epona
@@ -1075,7 +969,6 @@ void dSv_player_info_c::init() {
 
 extern "C" u8 SCGetLanguage();
 
-/* 800345AC-80034644 02EEEC 0098+00 1/1 0/0 0/0 .text            init__19dSv_player_config_cFv */
 void dSv_player_config_c::init() {
 #if VERSION == VERSION_GCN_JPN
     unk0 = 0;
@@ -1112,7 +1005,6 @@ void dSv_player_config_c::init() {
     mPointer = 1;
 }
 
-/* 80034644-80034684 02EF84 0040+00 0/0 4/4 0/0 .text checkVibration__19dSv_player_config_cCFv */
 u32 dSv_player_config_c::checkVibration() const {
 #if PLATFORM_GCN
     return JUTGamePad::sRumbleSupported & 0x80000000 ? dComIfGp_getNowVibration() : 0;
@@ -1121,24 +1013,18 @@ u32 dSv_player_config_c::checkVibration() const {
 #endif
 }
 
-/* 80034684-8003468C 02EFC4 0008+00 1/1 2/2 0/0 .text            getSound__19dSv_player_config_cFv
- */
 u8 dSv_player_config_c::getSound() {
     return mSoundMode;
 }
 
-/* 8003468C-80034694 -00001 0008+00 0/0 0/0 0/0 .text            setSound__19dSv_player_config_cFUc
- */
 void dSv_player_config_c::setSound(u8 i_mode) {
     mSoundMode = i_mode;
 }
 
-/* 80034694-8003469C 02EFD4 0008+00 1/1 1/1 0/0 .text getVibration__19dSv_player_config_cFv */
 u8 dSv_player_config_c::getVibration() {
     return mVibration;
 }
 
-/* 8003469C-800346A4 -00001 0008+00 0/0 0/0 0/0 .text setVibration__19dSv_player_config_cFUc */
 void dSv_player_config_c::setVibration(u8 i_status) {
     mVibration = i_status;
 }
@@ -1171,7 +1057,6 @@ u8 dSv_player_config_c::getPalLanguage() const {
     return 0;
 }
 
-/* 800346A4-80034750 02EFE4 00AC+00 1/1 0/0 0/0 .text            init__12dSv_player_cFv */
 void dSv_player_c::init() {
     mPlayerStatusA.init();
     mPlayerStatusB.init();
@@ -1192,7 +1077,6 @@ void dSv_player_c::init() {
     mConfig.init();
 }
 
-/* 80034750-800347A0 02F090 0050+00 1/1 0/0 0/0 .text            init__12dSv_memBit_cFv */
 void dSv_memBit_c::init() {
     for (int i = 0; i < 2; i++) {
         mTbox[i] = 0;
@@ -1210,43 +1094,36 @@ void dSv_memBit_c::init() {
     mDungeonItem = 0;
 }
 
-/* 800347A0-800347C4 02F0E0 0024+00 0/0 0/0 15/15 .text            onTbox__12dSv_memBit_cFi */
 void dSv_memBit_c::onTbox(int i_no) {
     JUT_ASSERT(2726, 0 <= i_no && i_no < TBOX_MAX);
     mTbox[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 800347C4-800347E8 02F104 0024+00 0/0 0/0 5/5 .text            offTbox__12dSv_memBit_cFi */
 void dSv_memBit_c::offTbox(int i_no) {
     JUT_ASSERT(2740, 0 <= i_no && i_no < TBOX_MAX);
     mTbox[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
-/* 800347E8-80034810 02F128 0028+00 0/0 6/6 7/7 .text            isTbox__12dSv_memBit_cCFi */
 BOOL dSv_memBit_c::isTbox(int i_no) const {
     JUT_ASSERT(2754, 0 <= i_no && i_no < TBOX_MAX);
     return 1 << (i_no & 0x1f) & mTbox[i_no >> 5] ? TRUE : FALSE;
 }
 
-/* 80034810-80034838 02F150 0028+00 1/1 5/5 18/18 .text            onSwitch__12dSv_memBit_cFi */
 void dSv_memBit_c::onSwitch(int i_no) {
     JUT_ASSERT(2786, 0 <= i_no && i_no < 128);
     mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 80034838-80034860 02F178 0028+00 1/1 3/3 3/3 .text            offSwitch__12dSv_memBit_cFi */
 void dSv_memBit_c::offSwitch(int i_no) {
     JUT_ASSERT(2800, 0 <= i_no && i_no < 128);
     mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
-/* 80034860-8003488C 02F1A0 002C+00 1/1 11/11 23/23 .text            isSwitch__12dSv_memBit_cCFi */
 BOOL dSv_memBit_c::isSwitch(int i_no) const {
     JUT_ASSERT(2814, 0 <= i_no && i_no < 128);
     return (mSwitch[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
-/* 8003488C-800348C4 02F1CC 0038+00 1/1 0/0 0/0 .text            revSwitch__12dSv_memBit_cFi */
 BOOL dSv_memBit_c::revSwitch(int i_no) {
     JUT_ASSERT(2828, 0 <= i_no && i_no < 128);
 
@@ -1256,7 +1133,6 @@ BOOL dSv_memBit_c::revSwitch(int i_no) {
     return mSwitch[switchInd] & tmp ? TRUE : FALSE;
 }
 
-/* 800348C4-800348EC 02F204 0028+00 1/1 0/0 0/0 .text            onItem__12dSv_memBit_cFi */
 void dSv_memBit_c::onItem(int i_no) {
     JUT_ASSERT(2847, 0 <= i_no && i_no < 64);
     mItem[i_no >> 5] |= 1 << (i_no & 0x1F);
@@ -1267,14 +1143,11 @@ void dSv_memBit_c::offItem(int i_no) {
     mItem[i_no >> 5] |= ~(1 << (i_no & 0x1F));
 }
 
-/* 800348EC-80034918 02F22C 002C+00 1/1 2/2 1/1 .text            isItem__12dSv_memBit_cCFi */
 BOOL dSv_memBit_c::isItem(int i_no) const {
     JUT_ASSERT(2875, 0 <= i_no && i_no < 64);
     return (mItem[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
-/* 80034918-80034934 02F258 001C+00 0/0 8/8 18/18 .text            onDungeonItem__12dSv_memBit_cFi
- */
 void dSv_memBit_c::onDungeonItem(int i_no) {
     JUT_ASSERT(2969, 0 <= i_no && i_no < DSV_MEMBIT_ENUM_MAX);
     mDungeonItem |= (u8)(1 << i_no);
@@ -1285,13 +1158,11 @@ void dSv_memBit_c::offDungeonItem(int i_no) {
     mDungeonItem &= (u8)~(u8)(1 << i_no);
 }
 
-/* 80034934-80034954 02F274 0020+00 0/0 27/27 47/47 .text isDungeonItem__12dSv_memBit_cCFi */
 s32 dSv_memBit_c::isDungeonItem(int i_no) const {
     JUT_ASSERT(2998, 0 <= i_no && i_no < DSV_MEMBIT_ENUM_MAX);
     return mDungeonItem & (u8)(1 << i_no) ? TRUE : FALSE;
 }
 
-/* 80034954-8003498C 02F294 0038+00 2/2 0/0 0/0 .text            init__11dSv_event_cFv */
 void dSv_event_c::init() {
     int i;
     for (i = 0; i < MAX_EVENTS; i++) {
@@ -1301,33 +1172,27 @@ void dSv_event_c::init() {
     setInitEventBit();
 }
 
-/* 8003498C-800349A4 02F2CC 0018+00 1/1 27/27 58/58 .text            onEventBit__11dSv_event_cFUs */
 void dSv_event_c::onEventBit(u16 i_no) {
     mEvent[i_no >> 8] |= (u8)i_no;
 }
 
-/* 800349A4-800349BC 02F2E4 0018+00 1/1 14/14 23/23 .text            offEventBit__11dSv_event_cFUs */
 void dSv_event_c::offEventBit(u16 i_no) {
     mEvent[i_no >> 8] &= ~(u8)i_no;
 }
 
-/* 800349BC-800349E0 02F2FC 0024+00 3/3 77/77 153/153 .text            isEventBit__11dSv_event_cCFUs */
 BOOL dSv_event_c::isEventBit(const u16 i_no) const {
     return mEvent[i_no >> 8] & (i_no & 0xFF) ? TRUE : FALSE;
 }
 
-/* 800349E0-80034A04 02F320 0024+00 0/0 12/12 17/17 .text            setEventReg__11dSv_event_cFUsUc */
 void dSv_event_c::setEventReg(u16 i_reg, u8 i_no) {
     mEvent[i_reg >> 8] &= ~(u8)i_reg;
     mEvent[i_reg >> 8] |= i_no;
 }
 
-/* 80034A04-80034A1C 02F344 0018+00 0/0 19/19 20/20 .text            getEventReg__11dSv_event_cCFUs */
 u8 dSv_event_c::getEventReg(u16 i_reg) const {
     return (u8)i_reg & mEvent[i_reg >> 8];
 }
 
-/* 80034A1C-80034A64 02F35C 0048+00 1/1 0/0 0/0 .text            init__14dSv_MiniGame_cFv */
 void dSv_MiniGame_c::init() {
     for (int i = 0; i < 1; i++) {
         unk0[i][0] = 0;
@@ -1343,38 +1208,31 @@ void dSv_MiniGame_c::init() {
     unk20 = 0;
 }
 
-/* 80034A64-80034A84 02F3A4 0020+00 2/2 2/2 0/0 .text            init__12dSv_memory_cFv */
 void dSv_memory_c::init() {
     mBit.init();
 }
 
-/* 80034A84-80034AA4 02F3C4 0020+00 1/1 1/1 0/0 .text            init__13dSv_memory2_cFv */
 void dSv_memory2_c::init() {
     for (int i = 0; i < 2; i++) {
         mVisitedRoom[i] = 0;
     }
 }
 
-/* 80034AA4-80034AC8 02F3E4 0024+00 0/0 1/1 1/1 .text            onVisitedRoom__13dSv_memory2_cFi */
 void dSv_memory2_c::onVisitedRoom(int i_no) {
     JUT_ASSERT(3279, 0 <= i_no && i_no < 64);
     mVisitedRoom[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 80034AC8-80034AEC 02F408 0024+00 0/0 1/1 1/1 .text            offVisitedRoom__13dSv_memory2_cFi
- */
 void dSv_memory2_c::offVisitedRoom(int i_no) {
     JUT_ASSERT(3293, 0 <= i_no && i_no < 64);
     mVisitedRoom[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
-/* 80034AEC-80034B14 02F42C 0028+00 0/0 4/4 0/0 .text            isVisitedRoom__13dSv_memory2_cFi */
 BOOL dSv_memory2_c::isVisitedRoom(int i_no) {
     JUT_ASSERT(3307, 0 <= i_no && i_no < 64);
     return (1 << (i_no & 0x1F) & mVisitedRoom[i_no >> 5]) ? TRUE : FALSE;
 }
 
-/* 80034B14-80034B98 02F454 0084+00 1/1 1/1 0/0 .text            init__12dSv_danBit_cFSc */
 bool dSv_danBit_c::init(s8 i_stageNo) {
     OS_REPORT("\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
     OS_REPORT("\n!!! dSv_danBit_c::init i_stage=[%d] mStageNo=[%d]", i_stageNo, mStageNo);
@@ -1402,25 +1260,21 @@ bool dSv_danBit_c::init(s8 i_stageNo) {
     }
 }
 
-/* 80034B98-80034BC0 02F4D8 0028+00 1/1 2/2 26/26 .text            onSwitch__12dSv_danBit_cFi */
 void dSv_danBit_c::onSwitch(int i_no) {
     JUT_ASSERT(3384, 0 <= i_no && i_no < 64);
     mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F);
 }
 
-/* 80034BC0-80034BE8 02F500 0028+00 1/1 1/1 10/10 .text            offSwitch__12dSv_danBit_cFi */
 void dSv_danBit_c::offSwitch(int i_no) {
     JUT_ASSERT(3398, 0 <= i_no && i_no < 64);
     mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
-/* 80034BE8-80034C14 02F528 002C+00 1/1 6/6 14/14 .text            isSwitch__12dSv_danBit_cCFi */
 BOOL dSv_danBit_c::isSwitch(int i_no) const {
     JUT_ASSERT(3412, 0 <= i_no && i_no < 64);
     return mSwitch[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE;
 }
 
-/* 80034C14-80034C4C 02F554 0038+00 1/1 0/0 0/0 .text            revSwitch__12dSv_danBit_cFi */
 BOOL dSv_danBit_c::revSwitch(int i_no) {
     JUT_ASSERT(3426, 0 <= i_no && i_no < 64);
 
@@ -1429,7 +1283,6 @@ BOOL dSv_danBit_c::revSwitch(int i_no) {
     return mSwitch[i_no >> 5] & uVar1 ? TRUE : FALSE;
 }
 
-/* 80034C4C-80034C74 02F58C 0028+00 1/1 0/0 0/0 .text            onItem__12dSv_danBit_cFi */
 void dSv_danBit_c::onItem(int i_no) {
     JUT_ASSERT(3444, 0 <= i_no && i_no < ITEM_MAX_DAN);
     mItem[i_no >> 5] |= 1 << (i_no & 0x1F);
@@ -1440,7 +1293,6 @@ void dSv_danBit_c::offItem(int i_no) {
     mItem[i_no >> 5] &= ~(1 << (i_no & 0x1F));
 }
 
-/* 80034C74-80034CA0 02F5B4 002C+00 1/1 2/2 0/0 .text            isItem__12dSv_danBit_cCFi */
 BOOL dSv_danBit_c::isItem(int i_no) const {
     JUT_ASSERT(3472, 0 <= i_no && i_no < ITEM_MAX_DAN);
     return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE;
@@ -1452,7 +1304,6 @@ static void dummyString() {
 }
 #endif
 
-/* 80034CA0-80034CEC 02F5E0 004C+00 1/1 0/0 0/0 .text            init__13dSv_zoneBit_cFv */
 void dSv_zoneBit_c::init() {
     for (int i = 0; i < 2; i++) {
         mSwitch[i] = 0;
@@ -1466,36 +1317,29 @@ void dSv_zoneBit_c::init() {
     mRoomItem = 0;
 }
 
-/* 80034CEC-80034CF8 02F62C 000C+00 0/0 3/3 0/0 .text            clearRoomSwitch__13dSv_zoneBit_cFv
- */
 void dSv_zoneBit_c::clearRoomSwitch() {
     mRoomSwitch = 0;
 }
 
-/* 80034CF8-80034D04 02F638 000C+00 0/0 3/3 0/0 .text            clearRoomItem__13dSv_zoneBit_cFv */
 void dSv_zoneBit_c::clearRoomItem() {
     mRoomItem = 0;
 }
 
-/* 80034D04-80034D2C 02F644 0028+00 1/1 1/1 0/0 .text            onSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onSwitch(int i_no) {
     JUT_ASSERT(3587, 0 <= i_no && i_no < SWITCH_ZONE_MAX);
     mSwitch[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
 }
 
-/* 80034D2C-80034D50 02F66C 0024+00 1/1 1/1 0/0 .text            offSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::offSwitch(int i_no) {
     JUT_ASSERT(3601, 0 <= i_no && i_no < SWITCH_ZONE_MAX);
     mSwitch[i_no >> 4] &= ~(1 << (i_no & 0xF));
 }
 
-/* 80034D50-80034D78 02F690 0028+00 1/1 1/1 0/0 .text            isSwitch__13dSv_zoneBit_cCFi */
 BOOL dSv_zoneBit_c::isSwitch(int i_no) const {
     JUT_ASSERT(3615, 0 <= i_no && i_no < SWITCH_ZONE_MAX);
     return mSwitch[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
 }
 
-/* 80034D78-80034DAC 02F6B8 0034+00 1/1 0/0 0/0 .text            revSwitch__13dSv_zoneBit_cFi */
 BOOL dSv_zoneBit_c::revSwitch(int i_no) {
     JUT_ASSERT(3629, 0 <= i_no && i_no < SWITCH_ZONE_MAX);
 
@@ -1505,25 +1349,21 @@ BOOL dSv_zoneBit_c::revSwitch(int i_no) {
     return mSwitch[switchInd] & uVar1 ? TRUE : FALSE;
 }
 
-/* 80034DAC-80034DC8 02F6EC 001C+00 1/1 1/1 0/0 .text            onOneSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onOneSwitch(int i_no) {
     JUT_ASSERT(3649, 0 <= i_no && i_no < SWITCH_ONE_ZONE_MAX);
     mRoomSwitch |= (u16)(1 << i_no);
 }
 
-/* 80034DC8-80034DE0 02F708 0018+00 1/1 1/1 0/0 .text            offOneSwitch__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::offOneSwitch(int i_no) {
     JUT_ASSERT(3663, 0 <= i_no && i_no < SWITCH_ONE_ZONE_MAX);
     mRoomSwitch &= ~(1 << i_no);
 }
 
-/* 80034DE0-80034DFC 02F720 001C+00 1/1 1/1 0/0 .text            isOneSwitch__13dSv_zoneBit_cCFi */
 BOOL dSv_zoneBit_c::isOneSwitch(int i_no) const {
     JUT_ASSERT(3677, 0 <= i_no && i_no < SWITCH_ONE_ZONE_MAX);
     return mRoomSwitch & 1 << i_no ? TRUE : FALSE;
 }
 
-/* 80034DFC-80034E24 02F73C 0028+00 1/1 0/0 0/0 .text            revOneSwitch__13dSv_zoneBit_cFi */
 BOOL dSv_zoneBit_c::revOneSwitch(int i_no) {
     JUT_ASSERT(3691, 0 <= i_no && i_no < SWITCH_ONE_ZONE_MAX);
 
@@ -1532,7 +1372,6 @@ BOOL dSv_zoneBit_c::revOneSwitch(int i_no) {
     return mRoomSwitch & iVar1 ? TRUE : FALSE;
 }
 
-/* 80034E24-80034E50 02F764 002C+00 1/1 0/0 0/0 .text            onItem__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onItem(int i_no) {
     JUT_ASSERT(3711, 0 <= i_no && i_no < ITEM_ZONE_MAX);
     mItem[i_no >> 4] |= (u16)(1 << (i_no & 0xF));
@@ -1543,13 +1382,11 @@ void dSv_zoneBit_c::offItem(int i_no) {
     mItem[i_no >> 4] &= (u16)~(1 << (i_no & 0xF));
 }
 
-/* 80034E50-80034E7C 02F790 002C+00 1/1 1/1 0/0 .text            isItem__13dSv_zoneBit_cCFi */
 BOOL dSv_zoneBit_c::isItem(int i_no) const {
     JUT_ASSERT(3745, 0 <= i_no && i_no < ITEM_ZONE_MAX);
     return mItem[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE;
 }
 
-/* 80034E7C-80034E98 02F7BC 001C+00 1/1 0/0 0/0 .text            onOneItem__13dSv_zoneBit_cFi */
 void dSv_zoneBit_c::onOneItem(int i_no) {
     JUT_ASSERT(3783, 0 <= i_no && i_no < ITEM_ONE_ZONE_MAX);
     mRoomItem |= (u16)(1 << i_no);
@@ -1560,52 +1397,44 @@ void dSv_zoneBit_c::offOneItem(int i_no) {
     mRoomItem &= (u16)~(1 << i_no);
 }
 
-/* 80034E98-80034EB4 02F7D8 001C+00 1/1 1/1 0/0 .text            isOneItem__13dSv_zoneBit_cCFi */
 BOOL dSv_zoneBit_c::isOneItem(int i_no) const {
     JUT_ASSERT(3811, 0 <= i_no && i_no < ITEM_ONE_ZONE_MAX);
     return mRoomItem & 1 << i_no ? TRUE : FALSE;
 }
 
-/* 80034EB4-80034ED4 02F7F4 0020+00 1/1 0/0 0/0 .text            init__15dSv_zoneActor_cFv */
 void dSv_zoneActor_c::init() {
     for (int i = 0; i < 4; i++) {
         mActorFlags[i] = 0;
     }
 }
 
-/* 80034ED4-80034EF8 02F814 0024+00 1/1 0/0 0/0 .text            on__15dSv_zoneActor_cFi */
 void dSv_zoneActor_c::on(int i_id) {
     JUT_ASSERT(3856, 0 <= i_id && i_id < ACTOR_MAX);
     mActorFlags[i_id >> 5] |= 1 << (i_id & 0x1F);
 }
 
-/* 80034EF8-80034F1C 02F838 0024+00 1/1 0/0 0/0 .text            off__15dSv_zoneActor_cFi */
 void dSv_zoneActor_c::off(int i_id) {
     JUT_ASSERT(3870, 0 <= i_id && i_id < ACTOR_MAX);
     mActorFlags[i_id >> 5] &= ~(1 << (i_id & 0x1F));
 }
 
-/* 80034F1C-80034F44 02F85C 0028+00 1/1 0/0 0/0 .text            is__15dSv_zoneActor_cCFi */
 BOOL dSv_zoneActor_c::is(int i_id) const {
     JUT_ASSERT(3884, 0 <= i_id && i_id < ACTOR_MAX);
     return mActorFlags[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE;
 }
 
-/* 80034F44-80034F80 02F884 003C+00 2/2 0/0 0/0 .text            init__10dSv_zone_cFi */
 void dSv_zone_c::init(int i_roomNo) {
     mRoomNo = i_roomNo;
     mBit.init();
     mActor.init();
 }
 
-/* 80034F80-80034FA4 02F8C0 0024+00 0/0 3/3 14/14 .text setRoom__13dSv_restart_cFRC4cXyzsSc */
 void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo) {
     mRoomNo = i_roomNo;
     mRoomPos = i_position;
     mRoomAngleY = i_angleY;
 }
 
-/* 80034FA4-80034FCC 02F8E4 0028+00 0/0 2/2 0/0 .text set__17dSv_turnRestart_cFRC4cXyzsScUl */
 void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u32 i_param) {
     mPosition = i_position;
     mAngleY = i_angleY;
@@ -1613,7 +1442,6 @@ void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u3
     mParam = i_param;
 }
 
-/* 80034FCC-8003501C 02F90C 0050+00 0/0 2/2 0/0 .text            init__10dSv_info_cFv */
 void dSv_info_c::init() {
     mSavedata.init();
     mMemory.init();
@@ -1627,7 +1455,6 @@ void dSv_info_c::init() {
 #endif
 }
 
-/* 8003501C-800350A8 02F95C 008C+00 2/2 0/0 0/0 .text            init__10dSv_save_cFv */
 void dSv_save_c::init() {
     mPlayer.init();
     for (int i = 0; i < STAGE_MAX; i++) {
@@ -1642,32 +1469,27 @@ void dSv_save_c::init() {
     mMiniGame.init();
 }
 
-/* 800350A8-800350BC 02F9E8 0014+00 0/0 6/6 1/1 .text            getSave2__10dSv_save_cFi */
 dSv_memory2_c* dSv_save_c::getSave2(int i_stage2No) {
     JUT_ASSERT(4117, 0 <= i_stage2No && i_stage2No < STAGE2_MAX);
     return &mSave2[i_stage2No];
 }
 
-/* 800350BC-800350F0 02F9FC 0034+00 0/0 1/1 0/0 .text            getSave__10dSv_info_cFi */
 void dSv_info_c::getSave(int i_stageNo) {
     JUT_ASSERT(4133, 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
     mMemory = mSavedata.getSave(i_stageNo);
 }
 
-/* 800350F0-8003514C 02FA30 005C+00 0/0 2/2 0/0 .text            putSave__10dSv_info_cFi */
 void dSv_info_c::putSave(int i_stageNo) {
     JUT_ASSERT(4149, 0 <= i_stageNo && i_stageNo < dSv_save_c::STAGE_MAX);
     mSavedata.putSave(i_stageNo, mMemory);
 }
 
-/* 8003514C-800351A4 02FA8C 0058+00 1/1 1/1 0/0 .text            initZone__10dSv_info_cFv */
 void dSv_info_c::initZone() {
     for (int i = 0; i < 0x20; i++) {
         mZone[i].init(-1);
     }
 }
 
-/* 800351A4-80035200 02FAE4 005C+00 0/0 1/1 0/0 .text            createZone__10dSv_info_cFi */
 u32 dSv_info_c::createZone(int i_roomNo) {
     dSv_zone_c* zone = mZone;
     for (int i = 0; i < 0x20; zone++, i++) {
@@ -1679,7 +1501,6 @@ u32 dSv_info_c::createZone(int i_roomNo) {
     return -1;
 }
 
-/* 80035200-800352B0 02FB40 00B0+00 0/0 8/8 352/352 .text            onSwitch__10dSv_info_cFii */
 void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
     JUT_ASSERT(4210, (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
@@ -1704,7 +1525,6 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) {
     }
 }
 
-/* 800352B0-80035360 02FBF0 00B0+00 0/0 2/2 93/93 .text            offSwitch__10dSv_info_cFii */
 void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
     JUT_ASSERT(4256, (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
@@ -1729,7 +1549,6 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) {
     }
 }
 
-/* 80035360-8003542C 02FCA0 00CC+00 0/0 27/27 734/734 .text            isSwitch__10dSv_info_cCFii */
 BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
     if (!((0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255)) {
         OS_REPORT("i_no = %d\n", i_no);
@@ -1761,7 +1580,6 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const {
     }
 }
 
-/* 8003542C-800354E0 02FD6C 00B4+00 0/0 0/0 2/2 .text            revSwitch__10dSv_info_cFii */
 BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
     JUT_ASSERT(4356, (0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255);
 
@@ -1787,7 +1605,6 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) {
     }
 }
 
-/* 800354E0-80035590 02FE20 00B0+00 0/0 1/1 3/3 .text            onItem__10dSv_info_cFii */
 void dSv_info_c::onItem(int i_no, int i_roomNo) {
     JUT_ASSERT(4398, (0 <= i_no && i_no < (MEMORY_ITEM+ DAN_ITEM+ ZONE_ITEM+ ONEZONE_ITEM)) || i_no == -1 || i_no == 255);
 
@@ -1812,7 +1629,6 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) {
     }
 }
 
-/* 80035590-80035644 02FED0 00B4+00 0/0 1/1 3/3 .text            isItem__10dSv_info_cCFii */
 BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
     JUT_ASSERT(4488, (0 <= i_no && i_no < (MEMORY_ITEM+ DAN_ITEM+ ZONE_ITEM+ ONEZONE_ITEM)) || i_no == -1 || i_no == 255);
 
@@ -1837,7 +1653,6 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const {
     }
 }
 
-/* 80035644-800356B4 02FF84 0070+00 0/0 1/1 4/4 .text            onActor__10dSv_info_cFii */
 void dSv_info_c::onActor(int i_id, int i_roomNo) {
     if (i_id == -1 || i_id == 0xFFFF || i_roomNo == -1) {
         return;
@@ -1849,7 +1664,6 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) {
     mZone[zoneNo].getActor().on(i_id);
 }
 
-/* 800356B4-80035724 02FFF4 0070+00 0/0 0/0 2/2 .text            offActor__10dSv_info_cFii */
 void dSv_info_c::offActor(int i_id, int i_roomNo) {
     if (i_id == -1 || i_id == 0xFFFF || i_roomNo == -1) {
         return;
@@ -1861,7 +1675,6 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
     mZone[zoneNo].getActor().off(i_id);
 }
 
-/* 80035724-80035798 030064 0074+00 0/0 3/3 0/0 .text            isActor__10dSv_info_cCFii */
 BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
     if (i_id == -1 || i_id == 0xFFFF || i_roomNo == -1) {
         return FALSE;
@@ -1878,7 +1691,6 @@ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
     return mZone[zoneNo].getActor().is(i_id);
 }
 
-/* 80035798-80035A04 0300D8 026C+00 0/0 1/1 0/0 .text            memory_to_card__10dSv_info_cFPci */
 int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
     BOOL lantern_stolen;
     BOOL lantern_dropped;
@@ -1975,7 +1787,6 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) {
     return 0;
 }
 
-/* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text            card_to_memory__10dSv_info_cFPci */
 int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
     i_cardPtr = i_cardPtr + i_dataNum * QUEST_LOG_SIZE;
     char* var_r30 = i_cardPtr;
@@ -2025,8 +1836,6 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) {
     return 0;
 }
 
-/* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text            initdata_to_card__10dSv_info_cFPci
- */
 int dSv_info_c::initdata_to_card(char* i_cardPtr, int i_dataNum) {
     i_cardPtr = i_cardPtr + (i_dataNum * QUEST_LOG_SIZE);
     char* var_r30 = i_cardPtr;
@@ -2202,7 +2011,6 @@ BOOL flagFile_c::check_flag(u16 i_flag) {
 }
 #endif
 
-/* 803A7288-803A78F8 0043A8 066C+04 2/2 45/45 148/148 .data saveBitLabels__16dSv_event_flag_c */
 #if VERSION > VERSION_GCN_JPN
 const
 #endif
@@ -2281,7 +2089,6 @@ u16 dSv_event_flag_c::saveBitLabels[822] = {
     F_0816, F_0817, F_0818, F_0819, F_0820, KORO2_ALLCLEAR,
 };
 
-/* 803790C0-80379234 005720 0172+02 0/0 17/17 7/7 .rodata tempBitLabels__20dSv_event_tmp_flag_c */
 u16 const dSv_event_tmp_flag_c::tempBitLabels[185] = {
     UNUSED, UNUSED, T_0002, T_0003, T_0004, T_0005, T_0006, T_0007, T_0001, T_0008, T_0009, T_0010,
     T_0011, T_0012, T_0013, T_0014, T_0015, T_0016, T_0017, T_0018, T_0019, T_0020, T_0021, T_0022,
diff --git a/src/d/d_save_HIO.cpp b/src/d/d_save_HIO.cpp
index 2ecf7b542d..013bc709bd 100644
--- a/src/d/d_save_HIO.cpp
+++ b/src/d/d_save_HIO.cpp
@@ -1,14 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_save_HIO
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_save_HIO.h"
 #include "d/d_com_inf_game.h"
 
-/* 8025BB78-8025BBAC 2564B8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childSwPerfectionHIO_cFv */
 dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     for (int i = 0; i < 0x80; i++) {
         field_0x5[i] = 0;
@@ -16,7 +10,6 @@ dSvBit_childSwPerfectionHIO_c::dSvBit_childSwPerfectionHIO_c() {
     }
 }
 
-/* 8025BBAC-8025BC14 2564EC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childSwPerfectionHIO_cFv */
 void dSvBit_childSwPerfectionHIO_c::init() {
     for (int i = 0; i < 0x80; i++) {
         field_0x5[i] = dComIfGs_isSaveSwitch(i);
@@ -24,7 +17,6 @@ void dSvBit_childSwPerfectionHIO_c::init() {
     }
 }
 
-/* 8025BC14-8025BC48 256554 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwDungeonHIO_cFv */
 dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() {
     for (int i = 0; i < 0x40; i++) {
         field_0x5[i] = 0;
@@ -32,7 +24,6 @@ dSvBit_childSwDungeonHIO_c::dSvBit_childSwDungeonHIO_c() {
     }
 }
 
-/* 8025BC48-8025BCB0 256588 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childSwDungeonHIO_cFv */
 void dSvBit_childSwDungeonHIO_c::init() {
     for (int i = 0; i < 0x40; i++) {
         field_0x5[i] = dComIfGs_isSaveDunSwitch(i);
@@ -40,8 +31,6 @@ void dSvBit_childSwDungeonHIO_c::init() {
     }
 }
 
-/* 8025BCB0-8025BCE4 2565F0 0034+00 1/1 0/0 0/0 .text            __ct__23dSvBit_childSwZoneHIO_cFv
- */
 dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = 0;
@@ -49,8 +38,6 @@ dSvBit_childSwZoneHIO_c::dSvBit_childSwZoneHIO_c() {
     }
 }
 
-/* 8025BCE4-8025BD10 256624 002C+00 1/1 0/0 0/0 .text            init__23dSvBit_childSwZoneHIO_cFv
- */
 void dSvBit_childSwZoneHIO_c::init() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = 0;
@@ -58,7 +45,6 @@ void dSvBit_childSwZoneHIO_c::init() {
     }
 }
 
-/* 8025BD10-8025BD44 256650 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childSwOneZoneHIO_cFv */
 dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() {
     for (int i = 0; i < 0x10; i++) {
         field_0x5[i] = 0;
@@ -66,7 +52,6 @@ dSvBit_childSwOneZoneHIO_c::dSvBit_childSwOneZoneHIO_c() {
     }
 }
 
-/* 8025BD44-8025BD70 256684 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childSwOneZoneHIO_cFv */
 void dSvBit_childSwOneZoneHIO_c::init() {
     for (int i = 0; i < 0x10; i++) {
         field_0x5[i] = 0;
@@ -74,7 +59,6 @@ void dSvBit_childSwOneZoneHIO_c::init() {
     }
 }
 
-/* 8025BD70-8025BDA4 2566B0 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childItPerfectionHIO_cFv */
 dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = 0;
@@ -82,7 +66,6 @@ dSvBit_childItPerfectionHIO_c::dSvBit_childItPerfectionHIO_c() {
     }
 }
 
-/* 8025BDA4-8025BE0C 2566E4 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childItPerfectionHIO_cFv */
 void dSvBit_childItPerfectionHIO_c::init() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = dComIfGs_isSaveItem(i);
@@ -90,7 +73,6 @@ void dSvBit_childItPerfectionHIO_c::init() {
     }
 }
 
-/* 8025BE0C-8025BE40 25674C 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItDungeonHIO_cFv */
 dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() {
     for (int i = 0; i < 0x80; i++) {
         field_0x5[i] = 0;
@@ -98,7 +80,6 @@ dSvBit_childItDungeonHIO_c::dSvBit_childItDungeonHIO_c() {
     }
 }
 
-/* 8025BE40-8025BEA8 256780 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childItDungeonHIO_cFv */
 void dSvBit_childItDungeonHIO_c::init() {
     for (int i = 0; i < 0x80; i++) {
         field_0x5[i] = dComIfGs_isSaveDunItem(i);
@@ -106,8 +87,6 @@ void dSvBit_childItDungeonHIO_c::init() {
     }
 }
 
-/* 8025BEA8-8025BEDC 2567E8 0034+00 1/1 0/0 0/0 .text            __ct__23dSvBit_childItZoneHIO_cFv
- */
 dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = 0;
@@ -115,8 +94,6 @@ dSvBit_childItZoneHIO_c::dSvBit_childItZoneHIO_c() {
     }
 }
 
-/* 8025BEDC-8025BF08 25681C 002C+00 1/1 0/0 0/0 .text            init__23dSvBit_childItZoneHIO_cFv
- */
 void dSvBit_childItZoneHIO_c::init() {
     for (int i = 0; i < 0x20; i++) {
         field_0x5[i] = 0;
@@ -124,7 +101,6 @@ void dSvBit_childItZoneHIO_c::init() {
     }
 }
 
-/* 8025BF08-8025BF3C 256848 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childItOneZoneHIO_cFv */
 dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() {
     for (int i = 0; i < 0x10; i++) {
         field_0x5[i] = 0;
@@ -132,7 +108,6 @@ dSvBit_childItOneZoneHIO_c::dSvBit_childItOneZoneHIO_c() {
     }
 }
 
-/* 8025BF3C-8025BF68 25687C 002C+00 1/1 0/0 0/0 .text init__26dSvBit_childItOneZoneHIO_cFv */
 void dSvBit_childItOneZoneHIO_c::init() {
     for (int i = 0; i < 0x10; i++) {
         field_0x5[i] = 0;
@@ -140,7 +115,6 @@ void dSvBit_childItOneZoneHIO_c::init() {
     }
 }
 
-/* 8025BF68-8025BF9C 2568A8 0034+00 1/1 0/0 0/0 .text __ct__29dSvBit_childTbPerfectionHIO_cFv */
 dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() {
     for (int i = 0; i < 0x40; i++) {
         field_0x5[i] = 0;
@@ -148,7 +122,6 @@ dSvBit_childTbPerfectionHIO_c::dSvBit_childTbPerfectionHIO_c() {
     }
 }
 
-/* 8025BF9C-8025C004 2568DC 0068+00 1/1 0/0 0/0 .text init__29dSvBit_childTbPerfectionHIO_cFv */
 void dSvBit_childTbPerfectionHIO_c::init() {
     for (int i = 0; i < 0x40; i++) {
         field_0x5[i] = dComIfGs_isTbox(i);
@@ -156,8 +129,6 @@ void dSvBit_childTbPerfectionHIO_c::init() {
     }
 }
 
-/* 8025C004-8025C038 256944 0034+00 1/1 0/0 0/0 .text            __ct__25dSvBit_childDarknessHIO_cFv
- */
 dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() {
     for (int i = 0; i < 6; i++) {
         TW[i] = 0;
@@ -165,8 +136,6 @@ dSvBit_childDarknessHIO_c::dSvBit_childDarknessHIO_c() {
     }
 }
 
-/* 8025C038-8025C0A0 256978 0068+00 1/1 0/0 0/0 .text            init__25dSvBit_childDarknessHIO_cFv
- */
 void dSvBit_childDarknessHIO_c::init() {
     for (int i = 0; i < 6; i++) {
         TW[i] = dComIfGs_isDarkClearLV(i);
@@ -174,7 +143,6 @@ void dSvBit_childDarknessHIO_c::init() {
     }
 }
 
-/* 8025C0A0-8025C0D4 2569E0 0034+00 1/1 0/0 0/0 .text __ct__26dSvBit_childTransformHIO_cFv */
 dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() {
     for (int i = 0; i < 4; i++) {
         WF[i] = 0;
@@ -182,7 +150,6 @@ dSvBit_childTransformHIO_c::dSvBit_childTransformHIO_c() {
     }
 }
 
-/* 8025C0D4-8025C13C 256A14 0068+00 1/1 0/0 0/0 .text init__26dSvBit_childTransformHIO_cFv */
 void dSvBit_childTransformHIO_c::init() {
     for (int i = 0; i < 4; i++) {
         WF[i] = dComIfGs_isTransformLV(i);
@@ -190,7 +157,6 @@ void dSvBit_childTransformHIO_c::init() {
     }
 }
 
-/* 8025C13C-8025C178 256A7C 003C+00 1/1 0/0 0/0 .text            __ct__22dSvBit_childOtherHIO_cFv */
 dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() {
     mDropNum = 0;
     field_0x6 = 0;
@@ -200,7 +166,6 @@ dSvBit_childOtherHIO_c::dSvBit_childOtherHIO_c() {
     }
 }
 
-/* 8025C178-8025C1F8 256AB8 0080+00 1/1 0/0 0/0 .text            init__22dSvBit_childOtherHIO_cFv */
 void dSvBit_childOtherHIO_c::init() {
     mDropNum = dComIfGs_getLightDropNum(dComIfGp_getStartStageDarkArea());
     field_0x6 = mDropNum;
@@ -210,7 +175,6 @@ void dSvBit_childOtherHIO_c::init() {
     }
 }
 
-/* 8025C1F8-8025C29C 256B38 00A4+00 0/0 1/1 0/0 .text            init__12dSvBit_HIO_cFv */
 void dSvBit_HIO_c::init() {
     mSwitch.init();
     mItem.init();
@@ -222,5 +186,4 @@ void dSvBit_HIO_c::init() {
     mTransformFlag = field_0x49d = dComIfGs_isEventBit(dSv_event_flag_c::M_077);
 }
 
-/* 804307EC-80430C90 05D50C 04A0+04 1/1 2/2 0/0 .bss             g_save_bit_HIO */
 dSvBit_HIO_c g_save_bit_HIO;
diff --git a/src/d/d_save_init.cpp b/src/d/d_save_init.cpp
index 000c069381..e100e24675 100644
--- a/src/d/d_save_init.cpp
+++ b/src/d/d_save_init.cpp
@@ -7,5 +7,4 @@
 
 #include "d/d_save_init.h"
 
-/* 80035C88-80035C8C 0305C8 0004+00 0/0 1/1 0/0 .text            setInitEventBit__Fv */
 void setInitEventBit() {}
diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp
index 0ad5b572e8..c81267f174 100644
--- a/src/d/d_scope.cpp
+++ b/src/d/d_scope.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_scope
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_scope.h"
@@ -14,7 +9,6 @@
 #include "m_Do/m_Do_graphic.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 
-/* 803BB648-803BB66C 018768 0024+00 2/3 0/0 0/0 .data            init_process */
 typedef void (dScope_c::*initFunc)();
 initFunc init_process[] = {
     &dScope_c::open_init,
@@ -22,7 +16,6 @@ initFunc init_process[] = {
     &dScope_c::close_init,
 };
 
-/* 803BB690-803BB6B4 0187B0 0024+00 1/2 0/0 0/0 .data            move_process */
 typedef void (dScope_c::*moveFunc)();
 moveFunc move_process[] = {
     &dScope_c::open_proc,
@@ -30,7 +23,6 @@ moveFunc move_process[] = {
     &dScope_c::close_proc,
 };
 
-/* 80193690-80193960 18DFD0 02D0+00 0/0 1/1 0/0 .text            __ct__8dScope_cFUc */
 dScope_c::dScope_c(u8 param_0) : field_0x58(-1), field_0x5c(-1) {
     field_0x8d = param_0;
     ResTIMG* mp_image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "wipe_00.bti");
@@ -67,7 +59,6 @@ dScope_c::dScope_c(u8 param_0) : field_0x58(-1), field_0x5c(-1) {
     (this->*init_process[mProcess])();
 }
 
-/* 8019396C-80193B90 18E2AC 0224+00 1/0 0/0 0/0 .text            __dt__8dScope_cFv */
 dScope_c::~dScope_c() {
     if (mHawkEyeScrn != NULL) {
         delete mHawkEyeScrn;
@@ -114,7 +105,6 @@ dScope_c::~dScope_c() {
     dMeter2Info_setScopeZoomPointer(0);
 }
 
-/* 80193B90-80193C68 18E4D0 00D8+00 1/0 0/0 0/0 .text            _execute__8dScope_cFUl */
 int dScope_c::_execute(u32) {
     u8 old_proc = mProcess;
     (this->*move_process[mProcess])();
@@ -138,7 +128,6 @@ int dScope_c::_execute(u32) {
     return 1;
 }
 
-/* 80193C68-80193FA0 18E5A8 0338+00 1/0 0/0 0/0 .text            draw__8dScope_cFv */
 void dScope_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
     f32 temp_f1 = mScale;
@@ -178,19 +167,16 @@ void dScope_c::draw() {
 }
 
 
-/* 80193FA0-80193FB4 18E8E0 0014+00 1/0 0/0 0/0 .text            isDead__8dScope_cFv */
 bool dScope_c::isDead() {
     return mIsDead != false ? 1 : 0;
 }
 
-/* 80193FB4-80193FD0 18E8F4 001C+00 1/0 0/0 0/0 .text            open_init__8dScope_cFv */
 void dScope_c::open_init() {
     mScale = 3.0f;
     mAlpha = 0.0f;
     mOpenTimer = 0;
 }
 
-/* 80193FD0-80194048 18E910 0078+00 1/0 0/0 0/0 .text            open_proc__8dScope_cFv */
 void dScope_c::open_proc() {
     mOpenTimer++;
     mScale = 3.0f - (mOpenTimer / 5.0f) * 1.5f;
@@ -203,16 +189,12 @@ void dScope_c::open_proc() {
     }
 }
 
-/* 80194048-8019404C 18E988 0004+00 1/0 0/0 0/0 .text            move_init__8dScope_cFv */
 void dScope_c::move_init() {}
 
-/* 8019404C-80194050 18E98C 0004+00 1/0 0/0 0/0 .text            move_proc__8dScope_cFv */
 void dScope_c::move_proc() {}
 
-/* 80194050-80194054 18E990 0004+00 1/0 0/0 0/0 .text            close_init__8dScope_cFv */
 void dScope_c::close_init() {}
 
-/* 80194054-801940D4 18E994 0080+00 1/0 0/0 0/0 .text            close_proc__8dScope_cFv */
 void dScope_c::close_proc() {
     if (mOpenTimer > 0) {
         mOpenTimer--;
diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp
index 158c11590c..c2fc86ab0d 100644
--- a/src/d/d_select_cursor.cpp
+++ b/src/d/d_select_cursor.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_select_cursor
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_select_cursor.h"
@@ -11,7 +6,6 @@
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 
-/* 801941E4-80194220 18EB24 003C+00 1/1 0/0 0/0 .text            __ct__19dSelect_cursorHIO_cFv */
 dSelect_cursorHIO_c::dSelect_cursorHIO_c() {
     field_0x8 = 1.0f;
     mXAxisExpansion = 1.0f;
@@ -23,8 +17,6 @@ dSelect_cursorHIO_c::dSelect_cursorHIO_c() {
     mDebugON = false;
 }
 
-/* 80194220-801949EC 18EB60 07CC+00 0/0 14/14 0/0 .text __ct__16dSelect_cursor_cFUcfP10JKRArchive
- */
 dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) {
     static char* blo_name[4] = {
         "zelda_select_cursor_4parts.blo",
@@ -204,7 +196,6 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2)
 }
 
 
-/* 801949EC-80194C30 18F32C 0244+00 1/0 0/0 0/0 .text            __dt__16dSelect_cursor_cFv */
 dSelect_cursor_c::~dSelect_cursor_c() {
     delete mpScreen;
     mpScreen = NULL;
@@ -250,7 +241,6 @@ dSelect_cursor_c::~dSelect_cursor_c() {
     }
 }
 
-/* 80194C30-80194CC0 18F570 0090+00 1/0 0/0 0/0 .text            draw__16dSelect_cursor_cFv */
 void dSelect_cursor_c::draw() {
     mpPaneMgr->getAlphaRate();
     update();
@@ -262,7 +252,6 @@ void dSelect_cursor_c::draw() {
     }
 }
 
-/* 80194CC0-801950F4 18F600 0434+00 1/1 0/0 0/0 .text            update__16dSelect_cursor_cFv */
 void dSelect_cursor_c::update() {
     f32 fVar1 = 1.0f;
     if (field_0xb6 == 3) {
@@ -355,7 +344,6 @@ void dSelect_cursor_c::update() {
     }
 }
 
-/* 801950F4-801951B0 18FA34 00BC+00 0/0 30/30 0/0 .text setPos__16dSelect_cursor_cFffP7J2DPaneb */
 void dSelect_cursor_c::setPos(f32 i_posX, f32 i_posY, J2DPane* i_pane, bool i_scaleBounds) {
     mpPane = i_pane;
     setPos(i_posX,i_posY);
@@ -391,7 +379,6 @@ void dSelect_cursor_c::setPos(f32 i_posX, f32 i_posY, J2DPane* i_pane, bool i_sc
 
 }
 
-/* 801951B0-801951C8 18FAF0 0018+00 0/0 24/24 0/0 .text setParam__16dSelect_cursor_cFfffff */
 void dSelect_cursor_c::setParam(f32 i_param1, f32 i_param2, f32 i_param3, f32 i_param4,
                                     f32 i_param5) {
     mParam1 = i_param1;
@@ -401,7 +388,6 @@ void dSelect_cursor_c::setParam(f32 i_param1, f32 i_param2, f32 i_param3, f32 i_
     mParam5 = i_param5;
 }
 
-/* 801951C8-801952A0 18FB08 00D8+00 0/0 14/14 0/0 .text            setScale__16dSelect_cursor_cFf */
 void dSelect_cursor_c::setScale(f32 i_scale) {
     J2DPane* pane = mpPaneMgr->getPanePtr();
     pane->scale(i_scale,i_scale);
@@ -420,7 +406,6 @@ void dSelect_cursor_c::setScale(f32 i_scale) {
     }
 }
 
-/* 801952A0-80195330 18FBE0 0090+00 0/0 77/77 0/0 .text setAlphaRate__16dSelect_cursor_cFf */
 void dSelect_cursor_c::setAlphaRate(f32 i_alphaRate) {
     if (i_alphaRate > 0.0f) {
         if (mpPaneMgr->isVisible() == 0) {
@@ -436,7 +421,6 @@ void dSelect_cursor_c::setAlphaRate(f32 i_alphaRate) {
     mpPaneMgr->setAlphaRate(i_alphaRate);
 }
 
-/* 80195330-801953CC 18FC70 009C+00 0/0 1/1 0/0 .text            addAlpha__16dSelect_cursor_cFv */
 int dSelect_cursor_c::addAlpha() {
     s16 alpha_timer = mpPaneMgr->getAlphaTimer();
 
@@ -455,7 +439,6 @@ int dSelect_cursor_c::addAlpha() {
     return 0;
 }
 
-/* 801953CC-80195460 18FD0C 0094+00 0/0 1/1 0/0 .text            decAlpha__16dSelect_cursor_cFv */
 int dSelect_cursor_c::decAlpha() {
     s16 alpha_timer = mpPaneMgr->getAlphaTimer();
 
@@ -473,8 +456,6 @@ int dSelect_cursor_c::decAlpha() {
     return 0;
 }
 
-/* 80195460-801955F0 18FDA0 0190+00 1/1 0/0 0/0 .text
- * setBpkAnimation__16dSelect_cursor_cFP11J2DAnmColor           */
 void dSelect_cursor_c::setBpkAnimation(J2DAnmColor* param_0) {
     switch (mNameIdx) {
     case 0: {
@@ -497,8 +478,6 @@ void dSelect_cursor_c::setBpkAnimation(J2DAnmColor* param_0) {
     }
 }
 
-/* 801955F0-80195724 18FF30 0134+00 1/1 0/0 0/0 .text
- * setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey  */
 void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) {
     switch (mNameIdx) {
     case 0: {
@@ -523,7 +502,6 @@ void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) {
     }
 }
 
-/* 80195724-801958E0 190064 01BC+00 1/1 0/0 0/0 .text setCursorAnimation__16dSelect_cursor_cFv */
 void dSelect_cursor_c::setCursorAnimation() {
     f32 fVar1 = 1.0f;
     if (field_0xb6 == 3) {
@@ -555,14 +533,10 @@ void dSelect_cursor_c::setCursorAnimation() {
 }
 
 
-/* 801958E0-80195940 190220 0060+00 1/1 0/0 0/0 .text
- * setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey    */
 void dSelect_cursor_c::setBckAnimation(J2DAnmTransformKey* param_0) {
     mpScreen->search('ssel_ico')->setAnimation((J2DAnmTransform*)param_0);
 }
 
-/* 80195940-80195978 190280 0038+00 1/1 0/0 0/0 .text moveCenter__16dSelect_cursor_cFP7J2DPaneff
- */
 void dSelect_cursor_c::moveCenter(J2DPane* i_pane, f32 i_x, f32 i_y) {
     i_pane->translate(i_x,i_y);
 }
diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp
index bfdfcaf6a8..449e38e449 100644
--- a/src/d/d_shop_camera.cpp
+++ b/src/d/d_shop_camera.cpp
@@ -20,33 +20,27 @@ struct SeiraCam {
     /* 0x18 */ f32 field_0x34;
 };
 
-/* 803BB7C8-803BB800 0188E8 0038+00 1/0 0/0 0/0 .data            cam_seira_shop */
 static SeiraCam cam_seira_shop = {
     {0.0f, 115.0f, 0.0f},      {0.0f, 115.0f, 150.0f}, 45.0f,
     {100.0f, 155.0f, -175.0f}, {100.0f, 155.0f, 0.0f}, 45.0f,
 };
 
-/* 803BB800-803BB838 018920 0038+00 1/0 0/0 0/0 .data            cam_seira_evnt_before */
 static SeiraCam cam_seira_evnt_before = {
     {-50.0f, 115.0f, 0.0f},    {-50.0f, 115.0f, 150.0f}, 45.0f,
     {100.0f, 155.0f, -175.0f}, {100.0f, 155.0f, 0.0f},   45.0f,
 };
 
-/* 803BB838-803BB870 018958 0038+00 1/0 0/0 0/0 .data            cam_seira_evnt_after */
 static SeiraCam cam_seira_evnt_after = {
     {0.0f, 115.0f, 0.0f},      {0.0f, 115.0f, 150.0f}, 45.0f,
     {100.0f, 155.0f, -175.0f}, {100.0f, 155.0f, 0.0f}, 45.0f,
 };
 
-/* 803BB870-803BB87C -00001 000C+00 2/2 0/0 0/0 .data            shop_cam_data_tbl */
 static SeiraCam* shop_cam_data_tbl[3] = {
     &cam_seira_shop,
     &cam_seira_evnt_before,
     &cam_seira_evnt_after,
 };
 
-/* 80195C9C-80195E18 1905DC 017C+00 0/0 0/0 9/9 .text shop_cam_action_init__16ShopCam_action_cFv
- */
 int ShopCam_action_c::shop_cam_action_init() {
     Save();
 
@@ -72,7 +66,6 @@ int ShopCam_action_c::shop_cam_action_init() {
     return 1;
 }
 
-/* 80195E18-8019630C 190758 04F4+00 1/0 0/0 0/0 .text shop_cam_action__16ShopCam_action_cFv */
 int ShopCam_action_c::shop_cam_action() {
     camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
     camera->mCamera.Stay();
@@ -137,7 +130,6 @@ int ShopCam_action_c::shop_cam_action() {
     return 1;
 }
 
-/* 8019630C-8019635C 190C4C 0050+00 1/1 0/0 12/12 .text            Save__16ShopCam_action_cFv */
 void ShopCam_action_c::Save() {
     camera_class* camera = dComIfGp_getCamera(0);
     if (camera != NULL) {
@@ -147,7 +139,6 @@ void ShopCam_action_c::Save() {
     }
 }
 
-/* 8019635C-801963B4 190C9C 0058+00 0/0 0/0 9/9 .text EventRecoverNotime__16ShopCam_action_cFv */
 void ShopCam_action_c::EventRecoverNotime() {
     dComIfGp_getPlayer(0);
     field_0xd8 = 2;
@@ -155,7 +146,6 @@ void ShopCam_action_c::EventRecoverNotime() {
     mCamAction = NULL;
 }
 
-/* 801963B4-801964C8 190CF4 0114+00 0/0 0/0 9/9 .text            Reset__16ShopCam_action_cFv */
 void ShopCam_action_c::Reset() {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
     player->offPlayerNoDraw();
@@ -168,7 +158,6 @@ void ShopCam_action_c::Reset() {
     mCamAction = NULL;
 }
 
-/* 801964C8-80196544 190E08 007C+00 0/0 0/0 9/9 .text            move__16ShopCam_action_cFv */
 void ShopCam_action_c::move() {
     if (mCamAction != NULL) {
         (this->*mCamAction)();
@@ -251,7 +240,6 @@ void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2,
     _debugSetCamera();
 }
 
-/* 801966D4-801968B8 191014 01E4+00 2/2 0/0 0/0 .text _debugSetCamera__16ShopCam_action_cFv */
 void ShopCam_action_c::_debugSetCamera() {
     field_0x38.x = field_0xb0.x;
     field_0x38.y = field_0xb0.y;
@@ -295,8 +283,6 @@ void ShopCam_action_c::_debugSetCamera() {
     }
 }
 
-/* 801968B8-80196914 1911F8 005C+00 0/0 1/1 3/3 .text
- * setMasterCamCtrPos__16ShopCam_action_cFP4cXyz                */
 void ShopCam_action_c::setMasterCamCtrPos(cXyz* param_0) {
     if (param_0 == NULL) {
         field_0xb0.set(field_0x18->eyePos);
diff --git a/src/d/d_shop_item_ctrl.cpp b/src/d/d_shop_item_ctrl.cpp
index 9a0b49c5c8..9afe53fc0b 100644
--- a/src/d/d_shop_item_ctrl.cpp
+++ b/src/d/d_shop_item_ctrl.cpp
@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_lib.h"
 #include "d/d_a_shop_item_static.h"
 
-/* 80196914-80196958 191254 0044+00 0/0 0/0 10/10 .text            __ct__15dShopItemCtrl_cFv */
 dShopItemCtrl_c::dShopItemCtrl_c() {
     for (int i = 0; i < 7; i++) {
         mItemIndex[i] = -1;
@@ -16,11 +15,8 @@ dShopItemCtrl_c::dShopItemCtrl_c() {
     }
 }
 
-/* 80196958-801969A0 191298 0048+00 1/0 1/1 0/0 .text            __dt__15dShopItemCtrl_cFv */
 dShopItemCtrl_c::~dShopItemCtrl_c() {}
 
-/* 801969A0-80196A3C 1912E0 009C+00 0/0 3/3 3/3 .text            getCurrentPos__15dShopItemCtrl_cFi
- */
 cXyz dShopItemCtrl_c::getCurrentPos(int i_itemIdx) {
     cXyz item_pos(0.0f, 0.0f, 0.0f);
 
@@ -34,7 +30,6 @@ cXyz dShopItemCtrl_c::getCurrentPos(int i_itemIdx) {
     return item_pos;
 }
 
-/* 80196A3C-80196AF0 19137C 00B4+00 0/0 2/2 0/0 .text            isHomePos__15dShopItemCtrl_cFi */
 bool dShopItemCtrl_c::isHomePos(int i_itemIdx) {
     if (i_itemIdx >= 0 && i_itemIdx < 7 && mItemIndex[i_itemIdx] != -1) {
         daShopItem_c* item = (daShopItem_c*)fopAcM_SearchByID(mItemIndex[i_itemIdx]);
@@ -53,8 +48,6 @@ bool dShopItemCtrl_c::isHomePos(int i_itemIdx) {
     return false;
 }
 
-/* 80196AF0-80196BA4 191430 00B4+00 0/0 1/1 0/0 .text            setRotateAnime__15dShopItemCtrl_cFi
- */
 void dShopItemCtrl_c::setRotateAnime(int i_itemIdx) {
     for (int i = 0; i < 7; i++) {
         if (mItemIndex[i] != -1) {
@@ -72,7 +65,6 @@ void dShopItemCtrl_c::setRotateAnime(int i_itemIdx) {
     }
 }
 
-/* 80196BA4-80197098 1914E4 04F4+00 0/0 1/1 0/0 .text setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb */
 void dShopItemCtrl_c::setZoomAnime(int param_1, cXyz* param_2, s16 param_3, bool param_4) {
     for (int i = 0; i < 7; i++) {
         if (mItemIndex[i] == -1) {
diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp
index 2f40ea1fac..155e010da1 100644
--- a/src/d/d_shop_system.cpp
+++ b/src/d/d_shop_system.cpp
@@ -19,27 +19,20 @@
 #include "d/actor/d_a_tag_shop_item.h"
 
 
-/* 803BB8A4-803BB8C0 0189C4 001C+00 6/6 0/0 0/0 .data            dShopSystem_itemActor */
 static daTag_ShopItem_c* dShopSystem_itemActor[7] = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
-/* 804506E8-804506F0 000168 0007+01 7/7 0/0 0/0 .sdata           dShopSystem_itemNo */
 static u8 dShopSystem_itemNo[7] = {
     fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE, fpcNm_ITEM_NONE,
 };
 
-/* 80451058-8045105C 000558 0004+00 9/9 0/0 0/0 .sbss            None */
 static u8 dShopSystem_sellItemMax;
 
-/* 8045105C-80451060 00055C 0004+00 6/6 0/0 0/0 .sbss            dShopSystem_item_count */
 static int dShopSystem_item_count;
 
-/* 80451060-80451064 000560 0004+00 4/4 0/0 0/0 .sbss            None */
 static u8 data_80451060;
 
-/* 80197098-80197270 1919D8 01D8+00 1/1 0/0 0/0 .text            dShopSystem_searchItemActor__FPvPv
- */
 static int dShopSystem_searchItemActor(void* i_actor, void* param_1) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPITM) {
         if ((fopAcM_GetParam(param_1) & 0xF0000000) == (fopAcM_GetParam(i_actor) & 0xF0000000) &&
@@ -83,13 +76,10 @@ static int dShopSystem_searchItemActor(void* i_actor, void* param_1) {
     return 0;
 }
 
-/* 804506F0-804506F8 000170 0008+00 6/6 0/0 0/0 .sdata           dShopSystem_cameraActor */
 static fopAc_ac_c* dShopSystem_cameraActor[2] = {NULL, NULL};
 
-/* 80451064-80451068 000564 0004+00 5/5 0/0 0/0 .sbss            dShopSystem_camera_count */
 static int dShopSystem_camera_count;
 
-/* 80197270-80197338 191BB0 00C8+00 1/1 0/0 0/0 .text dShopSystem_searchCameraActor__FPvPv */
 static int dShopSystem_searchCameraActor(void* i_actor, void* param_1) {
     if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_TAG_SHOPCAM) {
         if ((fopAcM_GetParam(param_1) & 0xf0000000) == (fopAcM_GetParam(i_actor) & 0xf0000000) &&
@@ -116,8 +106,6 @@ static int dShopSystem_searchCameraActor(void* i_actor, void* param_1) {
     return 0;
 }
 
-/* 80197338-801974E4 191C78 01AC+00 0/0 0/0 19/19 .text            initShopSystem__13dShopSystem_cFv
- */
 void dShopSystem_c::initShopSystem() {
     dShopSystem_sellItemMax = 3;
     data_80451060 = 0;
@@ -168,7 +156,6 @@ struct shop_item_data {
     Vec mItemPos[3];
 };
 
-/* 803BB8C0-803BB8E4 0189E0 0024+00 1/0 0/0 0/0 .data            item_seira_shop */
 static shop_item_data item_seira_shop = {
     {
         {110.0f, 150.0f, -115.0f},
@@ -186,7 +173,6 @@ static processFunc process[] = {
     &dShopSystem_c::seq_finish,      (processFunc)&dShopSystem_c::seq_event,
 };
 
-/* 801974E4-801975C0 191E24 00DC+00 1/0 0/0 10/10 .text            __dt__13dShopSystem_cFv */
 dShopSystem_c::~dShopSystem_c() {
     deleteObject();
     dShopSystem_sellItemMax = 0;
@@ -204,38 +190,30 @@ dShopSystem_c::~dShopSystem_c() {
     dShopSystem_camera_count = 0;
 }
 
-/* 801975C0-801975DC 191F00 001C+00 6/6 0/0 0/0 .text            onFlag__13dShopSystem_cFi */
 void dShopSystem_c::onFlag(int i_flag) {
     mFlag |= (u16)(1 << i_flag);
 }
 
-/* 801975DC-801975F8 191F1C 001C+00 7/7 0/0 0/0 .text            offFlag__13dShopSystem_cFi */
 void dShopSystem_c::offFlag(int i_flag) {
     mFlag &= ~(u16)(1 << i_flag);
 }
 
-/* 801975F8-80197618 191F38 0020+00 8/8 1/1 0/0 .text            isFlag__13dShopSystem_cFi */
 BOOL dShopSystem_c::isFlag(int i_flag) {
     return mFlag & (u16)(1 << i_flag) ? TRUE : FALSE;
 }
 
-/* 80197618-80197634 191F58 001C+00 1/1 0/0 0/0 .text onSoldOutItemFlag__13dShopSystem_cFi */
 void dShopSystem_c::onSoldOutItemFlag(int i_flag) {
     mSoldOutItemFlags |= (u8)(1 << i_flag);
 }
 
-/* 80197634-80197650 191F74 001C+00 1/1 0/0 0/0 .text offSoldOutItemFlag__13dShopSystem_cFi */
 void dShopSystem_c::offSoldOutItemFlag(int i_flag) {
     mSoldOutItemFlags &= ~(u8)(1 << i_flag);
 }
 
-/* 80197650-80197670 191F90 0020+00 2/2 0/0 0/0 .text isSoldOutItemFlag__13dShopSystem_cFi */
 BOOL dShopSystem_c::isSoldOutItemFlag(int i_flag) {
     return mSoldOutItemFlags & (u8)(1 << i_flag) ? TRUE : FALSE;
 }
 
-/* 80197670-80197808 191FB0 0198+00 3/3 0/0 0/0 .text
- * checkController__13dShopSystem_cFUcP10dMsgFlow_c             */
 int dShopSystem_c::checkController(u8 i_seq, dMsgFlow_c* i_flow) {
     if (mWaitTimer != 0) {
         if (mDoCPd_c::getTrigA(PAD_1)) {
@@ -288,7 +266,6 @@ int dShopSystem_c::checkController(u8 i_seq, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 80197808-80197DD0 192148 05C8+00 1/1 0/0 0/0 .text            chooseItem3__13dShopSystem_cFUc */
 int dShopSystem_c::chooseItem3(u8 i_seq) {
     u8 old_cursor = mLastCursorPos;
     if (checkLeftTrigger(mpStick) && i_seq != SEQ_SELECT_WAIT) {
@@ -426,7 +403,6 @@ int dShopSystem_c::chooseItem3(u8 i_seq) {
     return 0;
 }
 
-/* 80197DD0-80198250 192710 0480+00 1/1 0/0 0/0 .text            chooseItem5__13dShopSystem_cFUc */
 int dShopSystem_c::chooseItem5(u8 i_seq) {
     u8 old_cursor = mLastCursorPos;
     if (checkLeftTrigger(mpStick) && i_seq != SEQ_SELECT_WAIT) {
@@ -541,7 +517,6 @@ int dShopSystem_c::chooseItem5(u8 i_seq) {
     return 0;
 }
 
-/* 80198250-80198444 192B90 01F4+00 1/1 0/0 0/0 .text            chooseItem4__13dShopSystem_cFUc */
 int dShopSystem_c::chooseItem4(u8 i_seq) {
     u8 old_cursor = mLastCursorPos;
     if (checkLeftTrigger(mpStick) && i_seq != SEQ_SELECT_WAIT && mCursorPos != 0) {
@@ -584,7 +559,6 @@ int dShopSystem_c::chooseItem4(u8 i_seq) {
     return 0;
 }
 
-/* 80198444-80198488 192D84 0044+00 5/5 0/0 0/0 .text            moveCursor__13dShopSystem_cFiUc */
 int dShopSystem_c::moveCursor(int control_status, u8 param_1) {
     int cursor_status;
     if (field_0xf60 >= 0) {
@@ -597,7 +571,6 @@ int dShopSystem_c::moveCursor(int control_status, u8 param_1) {
     return cursor_status;
 }
 
-/* 80198488-80198708 192DC8 0280+00 1/1 0/0 0/0 .text            moveCursor0__13dShopSystem_cFiUc */
 int dShopSystem_c::moveCursor0(int control_status, u8 param_1) {
     offFlag(7);
 
@@ -652,7 +625,6 @@ int dShopSystem_c::moveCursor0(int control_status, u8 param_1) {
     return 0;
 }
 
-/* 80198708-80198878 193048 0170+00 1/1 0/0 0/0 .text            moveCursor1__13dShopSystem_cFiUc */
 int dShopSystem_c::moveCursor1(int control_status, u8 param_1) {
     offFlag(7);
 
@@ -694,7 +666,6 @@ int dShopSystem_c::moveCursor1(int control_status, u8 param_1) {
     }
 }
 
-/* 80198878-80198950 1931B8 00D8+00 0/0 0/0 9/9 .text            drawCursor__13dShopSystem_cFv */
 int dShopSystem_c::drawCursor() {
     if ((mSeq == 4 || mSeq == 5 ||
          ((mSeq == 6 || mSeq == SEQ_SELECT_WAIT) && isFlag(mCursorPos - 1))) &&
@@ -713,7 +684,6 @@ int dShopSystem_c::drawCursor() {
     return 1;
 }
 
-/* 80198950-80198A2C 193290 00DC+00 0/0 0/0 9/9 .text            itemRotate__13dShopSystem_cFv */
 int dShopSystem_c::itemRotate() {
     u8 item_index = 0;
     u8 cursor_pos = mCursorPos;
@@ -747,7 +717,6 @@ int dShopSystem_c::itemRotate() {
     return 1;
 }
 
-/* 80198A2C-801990B0 19336C 0684+00 0/0 0/0 9/9 .text            itemZoom__13dShopSystem_cFP4cXyz */
 int dShopSystem_c::itemZoom(cXyz* param_0) {
     cXyz local_1c;
 
@@ -880,8 +849,6 @@ int dShopSystem_c::itemZoom(cXyz* param_0) {
     return 1;
 }
 
-/* 801990B0-801990B8 1939F0 0008+00 1/0 0/0 0/0 .text
- * seq_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c         */
 int dShopSystem_c::seq_wait(fopAc_ac_c* param_0, dMsgFlow_c* param_1) {
     return 0;
 }
@@ -890,8 +857,6 @@ inline void pos3Dto2D(Vec* a, Vec* b) {
     mDoLib_project(a, b);
 }
 
-/* 801990B8-8019936C 1939F8 02B4+00 1/0 0/0 0/0 .text
- * seq_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c        */
 int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     if (field_0xf79 != 0) {
         dComIfGp_setDoStatusForce(0, 0);
@@ -960,8 +925,6 @@ int dShopSystem_c::seq_start(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 8019936C-801993C4 193CAC 0058+00 1/0 0/0 0/0 .text
- * seq_select_wait__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c  */
 int dShopSystem_c::seq_select_wait(fopAc_ac_c*, dMsgFlow_c*) {
     if (mItemCtrl.isHomePos(mCursorPos - 1)) {
         setSoldOut();
@@ -971,8 +934,6 @@ int dShopSystem_c::seq_select_wait(fopAc_ac_c*, dMsgFlow_c*) {
     return 0;
 }
 
-/* 801993C4-8019959C 193D04 01D8+00 1/0 0/0 0/0 .text
- * seq_select_start__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */
 int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) {
     if (field_0xf60 < 0 && field_0xf76 == 0 && dShopSystem_item_count != -1) {
         if (dShopSystem_item_count != dShopSystem_sellItemMax) {
@@ -1023,8 +984,6 @@ int dShopSystem_c::seq_select_start(fopAc_ac_c*, dMsgFlow_c*) {
     return 0;
 }
 
-/* 8019959C-80199A18 193EDC 047C+00 1/0 0/0 0/0 .text
- * seq_select__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c       */
 int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     if (chkSpMode() && !beforeSelectSeqAction(i_flow, field_0xf5c)) {
         return 0;
@@ -1130,8 +1089,6 @@ int dShopSystem_c::seq_select(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 80199A18-80199BF8 194358 01E0+00 1/0 0/0 0/0 .text
- * seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c       */
 int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) {
     field_0xf68++;
 
@@ -1176,8 +1133,6 @@ int dShopSystem_c::seq_moving(fopAc_ac_c*, dMsgFlow_c*) {
     return 0;
 }
 
-/* 80199BF8-80199D14 194538 011C+00 1/0 0/0 0/0 .text
- * seq_decide__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c       */
 int dShopSystem_c::seq_decide(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     int control_status = checkController(SEQ_SELECT_WAIT, i_flow);
 
@@ -1205,8 +1160,6 @@ int dShopSystem_c::seq_decide(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 80199D14-80199E28 194654 0114+00 1/0 0/0 0/0 .text
- * seq_choose__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c       */
 int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     dComIfGp_setDoStatusForce(0x22, 0);
     if (!i_flow->isSelectMessage()) {
@@ -1231,8 +1184,6 @@ int dShopSystem_c::seq_choose(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 80199E28-80199FA4 194768 017C+00 1/0 0/0 0/0 .text
- * seq_decide_yes__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c   */
 int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     if (dMsgObject_getMessageID() == 0x1B82) {
         mShopCamAction.SetSelectIdx(0);
@@ -1274,8 +1225,6 @@ int dShopSystem_c::seq_decide_yes(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 80199FA4-8019A020 1948E4 007C+00 1/0 0/0 0/0 .text
- * seq_decide_no__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c    */
 int dShopSystem_c::seq_decide_no(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     if (i_flow->doFlow(actor, NULL, moveCursor(field_0xf58, 2))) {
         offFlag(8);
@@ -1285,8 +1234,6 @@ int dShopSystem_c::seq_decide_no(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 8019A020-8019A0C0 194960 00A0+00 1/0 0/0 0/0 .text
- * seq_finish__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c       */
 int dShopSystem_c::seq_finish(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     if (chkSpMode() && !beforeStartSeqAction(i_flow, field_0xf5c)) {
         return 0;
@@ -1298,13 +1245,10 @@ int dShopSystem_c::seq_finish(fopAc_ac_c* actor, dMsgFlow_c* i_flow) {
     return 0;
 }
 
-/* 8019A0C0-8019A0D0 194A00 0010+00 1/0 0/0 0/0 .text
- * seq_event__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c        */
 bool dShopSystem_c::seq_event(fopAc_ac_c*, dMsgFlow_c*) {
     return mEvtNo == 0;
 }
 
-/* 8019A0D0-8019A158 194A10 0088+00 0/0 0/0 9/9 .text            shop_init__13dShopSystem_cFb */
 int dShopSystem_c::shop_init(bool param_0) {
     if (param_0) {
         setSeq(SEQ_SELECT_START);
@@ -1320,8 +1264,6 @@ int dShopSystem_c::shop_init(bool param_0) {
     }
 }
 
-/* 8019A158-8019A238 194A98 00E0+00 0/0 0/0 9/9 .text
- * shop_process__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c     */
 int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) {
     int iVar1;
     iVar1 = (this->*process[mSeq])(param_0, param_1);
@@ -1350,11 +1292,8 @@ int dShopSystem_c::shop_process(fopAc_ac_c* param_0, dMsgFlow_c* param_1) {
     return iVar1;
 }
 
-/* 804506F8-80450700 -00001 0004+04 1/1 0/0 0/0 .sdata           shop_item_pos_data_tbl */
 static shop_item_data* shop_item_pos_data_tbl = &item_seira_shop;
 
-/* 8019A238-8019A344 194B78 010C+00 0/0 0/0 1/1 .text            createShopItem__13dShopSystem_cFi
- */
 void dShopSystem_c::createShopItem(int itemType) {
     static const u8 item_no[6] = {
         fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_PACHINKO, fpcNm_ITEM_MILK_BOTTLE, fpcNm_ITEM_BEE_CHILD, fpcNm_ITEM_NONE,
@@ -1385,19 +1324,15 @@ void dShopSystem_c::createShopItem(int itemType) {
     }
 }
 
-/* 8019A344-8019A354 194C84 0010+00 12/12 0/0 0/0 .text            setSeq__13dShopSystem_cFUc */
 void dShopSystem_c::setSeq(u8 i_seq) {
     mSeq = i_seq;
     mWaitTimer = 2;
 }
 
-/* 8019A354-8019A364 194C94 0010+00 0/0 1/1 0/0 .text            setSoldOutFlag__13dShopSystem_cFv
- */
 void dShopSystem_c::setSoldOutFlag() {
     mSoldOutFlag = mCursorPos - 1;
 }
 
-/* 8019A364-8019A4F4 194CA4 0190+00 2/2 0/0 0/0 .text            setSoldOut__13dShopSystem_cFv */
 void dShopSystem_c::setSoldOut() {
     if (mSoldOutFlag != 0xFF) {
         if (field_0xf60 < 0) {
@@ -1438,7 +1373,6 @@ void dShopSystem_c::setSoldOut() {
     }
 }
 
-/* 8019A4F4-8019A564 194E34 0070+00 1/1 0/0 0/0 .text setSoldOutItemHide__13dShopSystem_cFv */
 void dShopSystem_c::setSoldOutItemHide() {
     if (field_0xf60 < 0) {
         fopAcM_delete(mItemCtrl.getItemIndex(mSoldOutFlag));
@@ -1451,8 +1385,6 @@ void dShopSystem_c::setSoldOutItemHide() {
     }
 }
 
-/* 8019A564-8019A5D0 194EA4 006C+00 1/1 0/0 10/10 .text            deleteObject__13dShopSystem_cFv
- */
 void dShopSystem_c::deleteObject() {
     if (mpStick != NULL) {
         delete mpStick;
@@ -1465,8 +1397,6 @@ void dShopSystem_c::deleteObject() {
     }
 }
 
-/* 8019A5D0-8019AB00 194F10 0530+00 1/1 0/0 8/8 .text            searchItemActor__13dShopSystem_cFv
- */
 bool dShopSystem_c::searchItemActor() {
     u8 temp_data;
     if ((dShopSystem_item_count != -1 &&
@@ -1604,8 +1534,6 @@ bool dShopSystem_c::searchItemActor() {
     return 1;
 }
 
-/* 8019AB00-8019AB1C 195440 001C+00 1/1 0/0 0/0 .text            getFlowNodeNum__13dShopSystem_cFv
- */
 int dShopSystem_c::getFlowNodeNum() {
     u16 num = home.angle.x;
     if (num == 0xFFFF) {
@@ -1621,13 +1549,10 @@ static void dummy() {
     static const char* btk_str = ".btk";
 }
 
-/* 8019AB1C-8019AB24 19545C 0008+00 0/0 0/0 8/8 .text            setSellItemMax__13dShopSystem_cFUc
- */
 void dShopSystem_c::setSellItemMax(u8 i_max) {
     dShopSystem_sellItemMax = i_max;
 }
 
-/* 8019AB24-8019AB60 195464 003C+00 0/0 0/0 9/9 .text            checkShopOpen__13dShopSystem_cFv */
 BOOL dShopSystem_c::checkShopOpen() {
     for (int i = 0; i < 2; i++) {
         if (dShopSystem_cameraActor[i] != NULL) {
@@ -1642,19 +1567,14 @@ BOOL dShopSystem_c::checkShopOpen() {
     }
 }
 
-/* 8019AB60-8019AB84 1954A0 0024+00 3/3 0/0 0/0 .text
- * checkLeftTrigger__13dShopSystem_cFP9STControl                */
 bool dShopSystem_c::checkLeftTrigger(STControl* i_stick) {
     return i_stick->checkLeftTrigger();
 }
 
-/* 8019AB84-8019ABA8 1954C4 0024+00 3/3 0/0 0/0 .text
- * checkRightTrigger__13dShopSystem_cFP9STControl               */
 bool dShopSystem_c::checkRightTrigger(STControl* i_stick) {
     return i_stick->checkRightTrigger();
 }
 
-/* 8019ABA8-8019ABB0 1954E8 0008+00 1/1 0/0 0/0 .text            dpdMove__13dShopSystem_cFv */
 bool dShopSystem_c::dpdMove() {
     return false;
 }
diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp
index 0db7de5c86..e6bc481551 100644
--- a/src/d/d_simple_model.cpp
+++ b/src/d/d_simple_model.cpp
@@ -1,15 +1,8 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_simple_model
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_simple_model.h"
 #include "d/d_com_inf_game.h"
 
-/* 80048C54-80048CB4 043594 0060+00 1/1 0/0 0/0 .text            dSmplMdl_modelUpdateDL__FP8J3DModel
- */
 static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
     JUT_ASSERT(61, i_model != NULL);
     J3DModelData* modelData = i_model->getModelData();
@@ -22,7 +15,6 @@ static void dSmplMdl_modelUpdateDL(J3DModel* i_model) {
     i_model->viewCalc();
 }
 
-/* 80048CB4-80048D60 0435F4 00AC+00 0/0 1/1 0/0 .text            __ct__15dSmplMdl_draw_cFv */
 dSmplMdl_draw_c::dSmplMdl_draw_c() {
     for (int i = 0; i < 8; i++) {
         mModel[i].init();
@@ -35,7 +27,6 @@ dSmplMdl_draw_c::dSmplMdl_draw_c() {
     mListCount = 0;
 }
 
-/* 80048D60-80048D80 0436A0 0020+00 1/1 0/0 0/0 .text            __ct__12diff_model_cFv */
 diff_model_c::diff_model_c() {
     mpHeap = NULL;
     mpModel = NULL;
@@ -44,7 +35,6 @@ diff_model_c::diff_model_c() {
     mRoomNo = 63;
 }
 
-/* 80048D80-80048E0C 0436C0 008C+00 1/0 0/0 0/0 .text            __dt__15dSmplMdl_draw_cFv */
 dSmplMdl_draw_c::~dSmplMdl_draw_c() {
     for (int i = 0; i < 8; i++) {
         if (mModel[i].getModel() != NULL) {
@@ -55,7 +45,6 @@ dSmplMdl_draw_c::~dSmplMdl_draw_c() {
     }
 }
 
-/* 80048E0C-80048EBC 04374C 00B0+00 0/0 1/1 0/0 .text            draw__15dSmplMdl_draw_cFv */
 void dSmplMdl_draw_c::draw() {
     for (int i = 0; i < 8; i++) {
         if (mModel[i].getModel() != NULL) {
@@ -73,7 +62,6 @@ void dSmplMdl_draw_c::draw() {
     }
 }
 
-/* 80048EBC-80048F70 0437FC 00B4+00 0/0 1/1 0/0 .text entry__15dSmplMdl_draw_cFP8J3DModeli */
 void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) {
     if (i_model != NULL && mListCount < 500) {
         mList[mListCount].set(i_model);
@@ -90,8 +78,6 @@ void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) {
     }
 }
 
-/* 80048F70-80049058 0438B0 00E8+00 0/0 1/1 0/0 .text
- * addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc               */
 BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
     JUT_ASSERT(307, i_modelData != NULL);
     if (roomNo == -1) {
@@ -122,8 +108,6 @@ BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG)
     return 0;
 }
 
-/* 80049058-800490EC 043998 0094+00 0/0 1/1 0/0 .text
- * removeModel__15dSmplMdl_draw_cFP12J3DModelDatai              */
 int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) {
     if (i_modelData == NULL) {
         return 0;
@@ -140,7 +124,6 @@ int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) {
     return 0;
 }
 
-/* 800490EC-800491F4 043A2C 0108+00 1/1 0/0 0/0 .text create__12diff_model_cFP12J3DModelDataiUc */
 BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
     JUT_ASSERT(397, i_modelData != NULL);
     if (mpHeap == NULL) {
@@ -175,7 +158,6 @@ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) {
     return 0;
 }
 
-/* 800491F4-80049210 043B34 001C+00 2/2 0/0 0/0 .text            getModelData__12diff_model_cFv */
 J3DModelData* diff_model_c::getModelData() {
     if (mpModel != NULL) {
         return mpModel->getModelData();
@@ -183,7 +165,6 @@ J3DModelData* diff_model_c::getModelData() {
     return NULL;
 }
 
-/* 80049210-80049270 043B50 0060+00 3/3 0/0 0/0 .text            remove__12diff_model_cFi */
 void diff_model_c::remove(int param_0) {
     mCreateNum--;
 
@@ -201,7 +182,6 @@ void diff_model_c::remove(int param_0) {
     }
 }
 
-/* 80049270-80049368 043BB0 00F8+00 1/1 0/0 0/0 .text            draw__12diff_model_cFv */
 void diff_model_c::draw() {
     modelList_c* list = mpList;
     if (list != NULL && dComIfGp_roomControl_checkStatusFlag(getRoomNo(), 0x10)) {
@@ -226,7 +206,6 @@ void diff_model_c::draw() {
     }
 }
 
-/* 80049368-80049388 043CA8 0020+00 2/2 0/0 0/0 .text            init__12diff_model_cFv */
 void diff_model_c::init() {
     mpModel = NULL;
     mpHeap = NULL;
@@ -235,7 +214,6 @@ void diff_model_c::init() {
     mRoomNo = 63;
 }
 
-/* 80049388-800493FC 043CC8 0074+00 3/3 0/0 0/0 .text isSame__12diff_model_cFP12J3DModelDatai */
 BOOL diff_model_c::isSame(J3DModelData* i_modelData, int roomNo) {
     if (mpModel != NULL) {
         return getModelData() == i_modelData && roomNo == getRoomNo();
@@ -244,12 +222,10 @@ BOOL diff_model_c::isSame(J3DModelData* i_modelData, int roomNo) {
     return FALSE;
 }
 
-/* 800493FC-80049408 043D3C 000C+00 2/2 0/0 0/0 .text            getRoomNo__12diff_model_cFv */
 s32 diff_model_c::getRoomNo() {
     return mRoomNo;
 }
 
-/* 80049408-80049420 043D48 0018+00 2/2 0/0 0/0 .text insert__12diff_model_cFP11modelList_c */
 void diff_model_c::insert(modelList_c* list) {
     modelList_c* prev = mpList;
     mpList = list;
diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp
index 5c9c226c06..40b0b61300 100644
--- a/src/d/d_spline_path.cpp
+++ b/src/d/d_spline_path.cpp
@@ -9,7 +9,6 @@
 #include "d/d_path.h"
 #include "d/d_stage.h"
 
-/* 80097878-80097904 0921B8 008C+00 0/0 7/7 0/0 .text            Init__14d2DBSplinePathFll */
 void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
     s32 tmp;
     s32 tmp2;
@@ -26,7 +25,6 @@ void d2DBSplinePath::Init(s32 param_0, s32 param_1) {
     field_0x2c = 0;
 }
 
-/* 80097904-80097A6C 092244 0168+00 0/0 5/5 0/0 .text            Step__14d2DBSplinePathFv */
 bool d2DBSplinePath::Step() {
     if (field_0x00 >= field_0x0c) {
         field_0x08 = 0;
@@ -58,7 +56,6 @@ bool d2DBSplinePath::Step() {
     return field_0x08 == 2 || field_0x08 == 3;
 }
 
-/* 80097A6C-80097B20 0923AC 00B4+00 0/0 1/1 0/0 .text            Calc__14d2DBSplinePathFP4cXyz */
 cXyz d2DBSplinePath::Calc(cXyz* v) {
     cXyz ret;
     ret.x = mCurveWeight[0] * v[mCurveKey[0]].x + mCurveWeight[1] * v[mCurveKey[1]].x + mCurveWeight[2] * v[mCurveKey[2]].x;
@@ -67,14 +64,12 @@ cXyz d2DBSplinePath::Calc(cXyz* v) {
     return ret;
 }
 
-/* 80097B20-80097B68 092460 0048+00 0/0 5/5 0/0 .text            Calc__14d2DBSplinePathFPf */
 f32 d2DBSplinePath::Calc(f32* param_0) {
     return mCurveWeight[0] * param_0[mCurveKey[0]] +
            mCurveWeight[1] * param_0[mCurveKey[1]] +
            mCurveWeight[2] * param_0[mCurveKey[2]];
 }
 
-/* 80097B68-80097C5C 0924A8 00F4+00 0/0 1/1 0/0 .text            Spot__14d2DBSplinePathFPff */
 f32 d2DBSplinePath::Spot(f32* param_1, f32 param_2) {
     int uVar10;
     if (field_0x04 < 2) {
@@ -94,14 +89,12 @@ f32 d2DBSplinePath::Spot(f32* param_1, f32 param_2) {
            fVar5 * fVar5 * 0.5f * param_1[iVar7];
 }
 
-/* 80097C5C-80097C74 09259C 0018+00 0/0 0/0 1/1 .text            Init__10dPathCurveFP5dPath */
 void dPathCurve::Init(dPath* i_path) {
     mpPath = i_path;
     field_0x00 = 1;
     field_0x04 = 0;
 }
 
-/* 80097C74-80097E8C 0925B4 0218+00 0/0 0/0 1/1 .text            bSpline2__10dPathCurveFf */
 cXyz dPathCurve::bSpline2(f32 param_0) {
     cXyz local_7c;
     int uVar12 = mpPath->m_num;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 52f4377eaf..e055c19bb6 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_stage
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/JKernel/JKRAramArchive.h"
@@ -47,7 +42,6 @@ void dStage_SetErrorStage() {
     OSReport_Error("ステージ情報が、多分ですが壊れています。\n変換し直してみてください。");
 }
 
-/* 803F4E74-803F5778 021B94 0904+00 3/4 0/0 0/0 .bss             DoorInfo */
 static dStage_KeepDoorInfo DoorInfo;
 
 dStage_KeepDoorInfo* dStage_GetKeepDoorInfo() {
@@ -64,15 +58,12 @@ static u8 dStage_isBossStage(dStage_dt_c* i_stage) {
     return dStage_stagInfo_GetSTType(pstag) == ST_BOSS_ROOM;
 }
 
-/* 80023F50-80023F84 01E890 0034+00 1/1 0/0 0/1 .text dStage_KeepDoorInfoInit__FP11dStage_dt_c */
 static void dStage_KeepDoorInfoInit(dStage_dt_c* i_stage) {
     if (dStage_isBossStage(i_stage) == 0) {
         DoorInfo.mNum = 0;
     }
 }
 
-/* 80023F84-8002405C 01E8C4 00D8+00 1/1 0/0 0/3 .text
- * dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class  */
 static void dStage_KeepDoorInfoProc(dStage_dt_c* i_stage, stage_tgsc_class* i_drtg) {
     if (i_drtg == NULL) {
         DoorInfo.mNum = 0;
@@ -93,7 +84,6 @@ static void dStage_KeepDoorInfoProc(dStage_dt_c* i_stage, stage_tgsc_class* i_dr
     }
 }
 
-/* 803F5784-803F6088 0224A4 0904+00 3/4 0/0 0/0 .bss             l_RoomKeepDoorInfo */
 static dStage_KeepDoorInfo l_RoomKeepDoorInfo;
 
 dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo() {
@@ -104,8 +94,6 @@ static void dStage_initRoomKeepDoorInfo() {
     l_RoomKeepDoorInfo.mNum = 0;
 }
 
-/* 80024078-80024174 01E9B8 00FC+00 1/1 0/0 0/0 .text
- * dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class */
 static void dStage_RoomKeepDoorInfoProc(dStage_dt_c* i_stage, stage_tgsc_class* param_2) {
     if (param_2 == NULL || param_2->num + l_RoomKeepDoorInfo.mNum >= 0x40 || param_2->num < 0) {
         return;
@@ -127,8 +115,6 @@ static void dStage_RoomKeepDoorInfoProc(dStage_dt_c* i_stage, stage_tgsc_class*
     l_RoomKeepDoorInfo.mNum += iVar3;
 }
 
-/* 80024174-8002419C 01EAB4 0028+00 2/0 0/0 0/0 .text
- * dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv                */
 static int dStage_RoomKeepDoorInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     dStage_RoomKeepDoorInfoProc(i_stage, (stage_tgsc_class*)((char*)i_data + 4));
@@ -142,10 +128,8 @@ void dStage_startStage_c::set(const char* i_Name, s8 i_RoomNo, s16 i_Point, s8 i
     mLayer = i_Layer;
 }
 
-/* 803F6094-80406194 022DB4 10100+00 12/12 31/31 16/16 .bss mStatus__20dStage_roomControl_c */
 dStage_roomStatus_c dStage_roomControl_c::mStatus[0x40];
 
-/* 800241E8-80024338 01EB28 0150+00 1/1 0/0 0/4 .text            init__20dStage_roomControl_cFv */
 void dStage_roomControl_c::init() {
     mStayNo = -1;
     mOldStayNo = -1;
@@ -182,8 +166,6 @@ void dStage_roomControl_c::init() {
     }
 }
 
-/* 80024338-80024384 01EC78 004C+00 1/1 1/1 0/7 .text            initZone__20dStage_roomControl_cFv
- */
 void dStage_roomControl_c::initZone() {
     dComIfGs_initZone();
 
@@ -194,8 +176,6 @@ void dStage_roomControl_c::initZone() {
     }
 }
 
-/* 80024384-800243B0 01ECC4 002C+00 2/2 27/27 6/6 .text getStatusRoomDt__20dStage_roomControl_cFi
- */
 dStage_roomDt_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) {
     if (i_statusIdx < 0 || i_statusIdx >= 0x40) {
         return NULL;
@@ -207,8 +187,6 @@ dStage_roomDt_c* dStage_roomControl_c::getStatusRoomDt(int i_statusIdx) {
 #define OBJNAME(name, proc, sub)                                                                   \
     { name, proc, sub }
 
-/* ############################################################################################## */
-/* 803A3B18-803A65CC 000C38 2AB4+00 2/2 0/0 0/0 .data            l_objectName */
 static dStage_objectNameInf l_objectName[] = {
     OBJNAME("Grass",   PROC_GRASS,             0xFF),
     OBJNAME("kusax1",  PROC_GRASS,             0xFF),
@@ -1134,7 +1112,6 @@ static dStage_objectNameInf l_objectName[] = {
 };
 // clang-format on
 
-/* 800243B0-800243E8 01ECF0 0038+00 0/0 3/3 1/1 .text getMemoryBlock__20dStage_roomControl_cFi */
 JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int i_roomNo) {
     int blockId = getMemoryBlockID(i_roomNo);
 
@@ -1144,8 +1121,6 @@ JKRExpHeap* dStage_roomControl_c::getMemoryBlock(int i_roomNo) {
     return mMemoryBlock[blockId];
 }
 
-/* 800243E8-80024424 01ED28 003C+00 2/2 0/0 0/0 .text            setStayNo__20dStage_roomControl_cFi
- */
 void dStage_roomControl_c::setStayNo(int i_roomNo) {
     mOldStayNo = mStayNo;
     mStayNo = i_roomNo;
@@ -1158,7 +1133,6 @@ void dStage_roomControl_c::setStayNo(int i_roomNo) {
     onStatusDraw(mStayNo);
 }
 
-/* 80024424-8002442C 01ED64 0008+00 0/0 0/0 1/1 .text setNextStayNo__20dStage_roomControl_cFi */
 void dStage_roomControl_c::setNextStayNo(int nextStayNo) {
     mNextStayNo = nextStayNo;
 }
@@ -1173,7 +1147,6 @@ static int stayRoomCheck(int param_0, u8* param_1, int param_2) {
     return 0;
 }
 
-/* 80024460-800244E8 01EDA0 0088+00 1/1 0/0 0/0 .text            createRoomScene__Fi */
 static int createRoomScene(int param_0) {
     int* ptr = (int*)JKRHeap::alloc(4, -4, NULL);
 
@@ -1190,7 +1163,6 @@ static int createRoomScene(int param_0) {
     return 1;
 }
 
-/* 800244E8-8002451C 01EE28 0034+00 0/0 0/0 8/13 .text checkRoomDisp__20dStage_roomControl_cCFi */
 BOOL dStage_roomControl_c::checkRoomDisp(int i_roomNo) const {
     if (checkStatusFlag(i_roomNo, 8)) {
         return 0;
@@ -1199,7 +1171,6 @@ BOOL dStage_roomControl_c::checkRoomDisp(int i_roomNo) const {
     return checkStatusFlag(i_roomNo, 16) ? 1 : 0;
 }
 
-/* 8002451C-8002471C 01EE5C 0200+00 2/2 0/0 0/2 .text loadRoom__20dStage_roomControl_cFiPUcb */
 int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms, bool param_2) {
     if (mRoomReadId < 0 && mNoChangeRoom != 0) {
         return 0;
@@ -1262,7 +1233,6 @@ int dStage_roomControl_c::loadRoom(int roomCount, u8* rooms, bool param_2) {
     return TRUE;
 }
 
-/* 8002471C-8002483C 01F05C 0120+00 1/1 0/0 0/3 .text zoneCountCheck__20dStage_roomControl_cCFi */
 void dStage_roomControl_c::zoneCountCheck(int i_roomNo) const {
     dStage_roomStatus_c* status = mStatus;
     for (int i = 0; i < 0x40; i++) {
@@ -1306,20 +1276,16 @@ void dStage_roomControl_c::destroyMemoryBlock() {
     }
 }
 
-/* 8002490C-80024940 01F24C 0034+00 1/1 1/1 0/2 .text setArcBank__20dStage_roomControl_cFiPCc */
 void dStage_roomControl_c::setArcBank(int i_bank, char const* bankName) {
     JUT_ASSERT(1053, 0 <= i_bank && i_bank < 32);
     strncpy(&mArcBank[i_bank][0], bankName, 9);
 }
 
-/* 80024940-80024954 01F280 0014+00 1/1 1/1 0/1 .text getArcBank__20dStage_roomControl_cFi */
 char* dStage_roomControl_c::getArcBank(int i_bank) {
     JUT_ASSERT(1067, 0 <= i_bank && i_bank < 32);
     return mArcBank[i_bank];
 }
 
-/* 80024954-80024A34 01F294 00E0+00 0/0 2/2 0/2 .text resetArchiveBank__20dStage_roomControl_cFi
- */
 bool dStage_roomControl_c::resetArchiveBank(int i_bank) {
     for (int i = i_bank; i < 32; i++) {
         char* bank = getArcBank(i);
@@ -1341,8 +1307,6 @@ bool dStage_roomControl_c::resetArchiveBank(int i_bank) {
     return 1;
 }
 
-/* 80024A34-80024ABC 01F374 0088+00 1/1 0/0 0/2 .text
- * create__Q220dStage_roomControl_c9roomDzs_cFUc                */
 void dStage_roomControl_c::roomDzs_c::create(u8 i_num) {
     JUT_ASSERT(1112, !m_num && 0 < i_num && i_num < 64);
     m_dzs = new (mDoExt_getArchiveHeap(), -4) void*[i_num];
@@ -1358,8 +1322,6 @@ void dStage_roomControl_c::roomDzs_c::create(u8 i_num) {
     }
 }
 
-/* 80024ABC-80024B44 01F3FC 0088+00 1/1 0/0 0/0 .text remove__Q220dStage_roomControl_c9roomDzs_cFv
- */
 void dStage_roomControl_c::roomDzs_c::remove() {
     if (m_num != 0) {
         u32** dzs = (u32**)m_dzs;
@@ -1374,8 +1336,6 @@ void dStage_roomControl_c::roomDzs_c::remove() {
     }
 }
 
-/* 80024B44-80024C1C 01F484 00D8+00 1/1 0/0 0/1 .text add__Q220dStage_roomControl_c9roomDzs_cFUcUc
- */
 void* dStage_roomControl_c::roomDzs_c::add(u8 i_no, u8 roomNo) {
     if (m_num == 0) {
         return NULL;
@@ -1477,7 +1437,6 @@ void dStage_roomDt_c::init() {
 #endif
 }
 
-/* 80024D10-80024DB0 01F650 00A0+00 1/1 0/0 0/0 .text            dStage_roomInit__Fi */
 static int dStage_roomInit(int i_roomNo) {
     dComIfGp_roomControl_setStayNo(i_roomNo);
 
@@ -1540,10 +1499,8 @@ const char* dStage_getName2(s16 procName, s8 argument) {
     return dStage_getName(procName, argument);
 }
 
-/* 80450D60-80450D64 000260 0004+00 1/1 3/3 1/1 .sbss            mProcID__20dStage_roomControl_c */
 u32 dStage_roomControl_c::mProcID;
 
-/* 80450D64-80450D68 -00001 0004+00 6/6 94/94 101/101 .sbss            None */
 /* 80450D64 0001+00 data_80450D64 None */
 s8 dStage_roomControl_c::mStayNo;
 
@@ -1556,20 +1513,14 @@ s8 dStage_roomControl_c::mNextStayNo;
 /* 80450D67 0001+00 data_80450D67 None */
 u8 dStage_roomControl_c::m_time_pass;
 
-/* 80450D68-80450D6C 000268 0004+00 2/2 2/2 1/1 .sbss            None */
 u8 dStage_roomControl_c::mNoChangeRoom;
 
-/* 80450D6C-80450D70 00026C 0004+00 1/1 2/2 0/0 .sbss mArcBankName__20dStage_roomControl_c */
 dStage_roomControl_c::nameData* dStage_roomControl_c::mArcBankName;
 
-/* 80450D70-80450D74 000270 0004+00 1/1 1/1 0/0 .sbss mArcBankData__20dStage_roomControl_c */
 dStage_roomControl_c::bankData* dStage_roomControl_c::mArcBankData;
 
-/* 804505F0-804505F8 0008+00 s=0 e=5 z=1  None .sdata     None */
 s8 dStage_roomControl_c::mRoomReadId = 0xFF;
 
-/* 80024EFC-80024F98 01F83C 009C+00 7/7 0/0 0/0 .text
- * dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class */
 static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_class* i_actorPrm) {
     dStage_objectNameInf* actorInf = dStage_searchName(i_actorData->name);
 
@@ -1591,8 +1542,6 @@ static void dStage_actorCreate(stage_actor_data_class* i_actorData, fopAcM_prm_c
     }
 }
 
-/* 80024F98-80025004 01F8D8 006C+00 1/1 0/0 0/0 .text
- * dStage_cameraCreate__FP24stage_camera2_data_classii          */
 static int dStage_cameraCreate(stage_camera2_data_class* i_cameraData, int i_cameraIdx,
                                int param_2) {
     s16 procname = PROC_CAMERA;
@@ -1620,7 +1569,6 @@ static void dummy2() {
     dComIfGp_roomControl_getStatusRoomDt(0)->getPlayer();
 }
 
-/* 80025014-800252B8 01F954 02A4+00 2/0 0/0 0/0 .text dStage_playerInit__FP11dStage_dt_cPviPv */
 static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* param_3) {
     stage_actor_class* player = (stage_actor_class*)((int*)i_data + 1);
     stage_actor_data_class* player_data = player->m_entries;
@@ -1696,7 +1644,6 @@ static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void*
     return 1;
 }
 
-/* 800252B8-80025308 01FBF8 0050+00 1/0 0/0 0/0 .text dStage_cameraInit__FP11dStage_dt_cPviPv */
 static int dStage_cameraInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     stage_camera_class* camera = (stage_camera_class*)((char*)i_data + 4);
     i_stage->setCamera(camera);
@@ -1704,21 +1651,16 @@ static int dStage_cameraInit(dStage_dt_c* i_stage, void* i_data, int param_2, vo
     return 1;
 }
 
-/* 80025308-8002533C 01FC48 0034+00 1/0 0/0 0/0 .text dStage_RoomCameraInit__FP11dStage_dt_cPviPv
- */
 static int dStage_RoomCameraInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     i_stage->setCamera((stage_camera_class*)((char*)i_data + 4));
     return 1;
 }
 
-/* 8002533C-80025370 01FC7C 0034+00 2/0 0/0 0/0 .text dStage_arrowInit__FP11dStage_dt_cPviPv */
 static int dStage_arrowInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     i_stage->setArrow((stage_arrow_class*)((char*)i_data + 4));
     return 1;
 }
 
-/* 80025370-800253FC 01FCB0 008C+00 1/0 0/0 0/0 .text            getMapInfo2__15dStage_roomDt_cCFi
- */
 stage_map_info_class* dStage_roomDt_c::getMapInfo2(int param_0) const {
     stage_map_info_dummy_class* map_info_p = getMapInfoBase();
 
@@ -1743,8 +1685,6 @@ static void dummy3() {
     dComIfGp_roomControl_getStatusRoomDt(0)->getMapInfoBase();
 }
 
-/* 80025404-80025490 01FD44 008C+00 1/0 0/0 0/0 .text            getMapInfo2__16dStage_stageDt_cCFi
- */
 stage_map_info_class* dStage_stageDt_c::getMapInfo2(int param_0) const {
     stage_map_info_dummy_class* map_info_p = getMapInfoBase();
 
@@ -1769,31 +1709,24 @@ static void dummy4() {
     ((dStage_stageDt_c*)dComIfGp_getStage())->getMapInfoBase();
 }
 
-/* 80025498-800254CC 01FDD8 0034+00 1/0 0/0 0/0 .text dStage_paletteInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_paletteInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     dStage_nodeHeader* pal_info = (dStage_nodeHeader*)(i_data);
     i_stage->setPaletteInfo((stage_palette_info_class*)pal_info->m_offset);
     return 1;
 }
 
-/* 800254CC-80025500 01FE0C 0034+00 1/0 0/0 0/1 .text dStage_pselectInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_pselectInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     dStage_nodeHeader* psel_info = (dStage_nodeHeader*)(i_data);
     i_stage->setPselectInfo((stage_pselect_info_class*)psel_info->m_offset);
     return 1;
 }
 
-/* 80025500-80025534 01FE40 0034+00 1/0 0/0 0/1 .text dStage_envrInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_envrInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     dStage_nodeHeader* envr_info = (dStage_nodeHeader*)(i_data);
     i_stage->setEnvrInfo((stage_envr_info_class*)envr_info->m_offset);
     return 1;
 }
 
-/* 80025534-8002556C 01FE74 0038+00 1/0 0/0 0/2 .text dStage_filiInfo2Init__FP11dStage_dt_cPviPv
- */
 static int dStage_filiInfo2Init(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     if (entryNum == 0) {
         return 1;
@@ -1804,8 +1737,6 @@ static int dStage_filiInfo2Init(dStage_dt_c* i_stage, void* i_data, int entryNum
     return 1;
 }
 
-/* 8002556C-8002558C 01FEAC 0020+00 1/0 0/0 0/0 .text
- * dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv           */
 static int dStage_fieldMapFiliInfo2Init(dStage_dt_c* i_stage, void* i_data, int i_entryNum,
                                         void* param_3) {
     if (i_entryNum == 0) {
@@ -1818,7 +1749,6 @@ static int dStage_fieldMapFiliInfo2Init(dStage_dt_c* i_stage, void* i_data, int
     return 1;
 }
 
-/* 8002558C-800255E0 01FECC 0054+00 2/0 0/0 0/0 .text dStage_filiInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_filiInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     if (entryNum == 0) {
         i_stage->setFileListInfo(NULL);
@@ -1830,16 +1760,12 @@ static int dStage_filiInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 800255E0-80025614 01FF20 0034+00 2/0 0/0 0/0 .text dStage_vrboxInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_vrboxInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     dStage_nodeHeader* vrbox_info = (dStage_nodeHeader*)(i_data);
     i_stage->setVrboxInfo((stage_vrbox_info_class*)vrbox_info->m_offset);
     return 1;
 }
 
-/* 80025614-80025648 01FF54 0034+00 1/0 0/0 0/0 .text
- * dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv                */
 static int dStage_vrboxcolInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     dStage_nodeHeader* vrcol_info = (dStage_nodeHeader*)(i_data);
@@ -1847,8 +1773,6 @@ static int dStage_vrboxcolInfoInit(dStage_dt_c* i_stage, void* i_data, int entry
     return 1;
 }
 
-/* 80025648-800256AC 01FF88 0064+00 2/0 0/0 0/0 .text dStage_plightInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_plightInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     dStage_nodeHeader* plight_info = (dStage_nodeHeader*)(i_data);
     i_stage->setPlightInfo((stage_plight_info_class*)plight_info->m_offset);
@@ -1856,7 +1780,6 @@ static int dStage_plightInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNu
     return 1;
 }
 
-/* 800256AC-80025738 01FFEC 008C+00 1/0 0/0 0/0 .text dStage_lgtvInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_lgtvInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setLightVecInfoNum(entryNum);
 
@@ -1870,14 +1793,11 @@ static int dStage_lgtvInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80025738-80025744 020078 000C+00 0/0 1/1 0/0 .text
- * dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi    */
 u32 dStage_stagInfo_GetParticleNo(stage_stag_info_class* p_info, int layer) {
     JUT_ASSERT(2220, 0 <= layer && layer < 15);
     return p_info->mParticleNo[layer];
 }
 
-/* 80025744-8002582C 020084 00E8+00 1/0 0/0 0/0 .text dStage_stagInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_stagInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     dStage_nodeHeader* stag_info = (dStage_nodeHeader*)(i_data);
     i_stage->setStagInfo((stage_stag_info_class*)stag_info->m_offset);
@@ -1895,20 +1815,15 @@ static int dStage_stagInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 8002582C-80025838 02016C 000C+00 1/0 0/0 0/0 .text            resetOldMulti__16dStage_stageDt_cFv
- */
 void dStage_stageDt_c::resetOldMulti() {
     mOldMulti = NULL;
 }
 
-/* 80025838-8002586C 020178 0034+00 2/0 0/0 0/0 .text dStage_sclsInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_sclsInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setSclsInfo((stage_scls_info_dummy_class*)((char*)i_data + 4));
     return 1;
 }
 
-/* 8002586C-80025958 0201AC 00EC+00 1/0 0/0 0/0 .text
- * dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv            */
 static int dStage_actorCommonLayerInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                        void* param_3) {
     stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1);
@@ -1932,8 +1847,6 @@ static int dStage_actorCommonLayerInit(dStage_dt_c* i_stage, void* i_data, int e
     return 1;
 }
 
-/* 80025958-80025A38 020298 00E0+00 1/0 0/0 0/0 .text
- * dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv             */
 static int dStage_tgscCommonLayerInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                       void* param_3) {
     stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1);
@@ -1957,7 +1870,6 @@ static int dStage_tgscCommonLayerInit(dStage_dt_c* i_stage, void* i_data, int en
     return 1;
 }
 
-/* 80025A38-80025B24 020378 00EC+00 3/2 0/0 0/0 .text dStage_actorInit__FP11dStage_dt_cPviPv */
 static int dStage_actorInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1);
     stage_actor_data_class* actor_data = actor->m_entries;
@@ -1980,8 +1892,6 @@ static int dStage_actorInit(dStage_dt_c* i_stage, void* i_data, int entryNum, vo
     return 1;
 }
 
-/* 80025B24-80025BFC 020464 00D8+00 1/0 0/0 0/0 .text
- * dStage_actorInit_always__FP11dStage_dt_cPviPv                */
 static int dStage_actorInit_always(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     stage_actor_class* actor = (stage_actor_class*)((int*)i_data + 1);
@@ -2003,7 +1913,6 @@ static int dStage_actorInit_always(dStage_dt_c* i_stage, void* i_data, int entry
     return 1;
 }
 
-/* 80025BFC-80025CDC 02053C 00E0+00 4/1 0/0 0/0 .text dStage_tgscInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_tgscInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1);
     stage_tgsc_data_class* tgsc_data = actor->m_entries;
@@ -2026,7 +1935,6 @@ static int dStage_tgscInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80025CDC-80025DA8 02061C 00CC+00 1/1 0/0 0/0 .text dStage_doorInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_doorInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     stage_tgsc_class* actor = (stage_tgsc_class*)((int*)i_data + 1);
     stage_tgsc_data_class* tgsc_data = actor->m_entries;
@@ -2047,7 +1955,6 @@ static int dStage_doorInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80025DA8-80025E40 0206E8 0098+00 2/0 0/0 0/0 .text dStage_roomReadInit__FP11dStage_dt_cPviPv */
 static int dStage_roomReadInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     roomRead_class* p_node = (roomRead_class*)((int*)i_data + 1);
     roomRead_data_class** rtbl = p_node->m_entries;
@@ -2064,8 +1971,6 @@ static int dStage_roomReadInit(dStage_dt_c* i_stage, void* i_data, int param_2,
     return 1;
 }
 
-/* 80025E40-80025E70 020780 0030+00 0/0 1/1 0/0 .text
- * dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi     */
 s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) {
     if (index < 0 || index >= room.num) {
         index = 0;
@@ -2074,13 +1979,11 @@ s8 dStage_roomRead_dt_c_GetReverbStage(roomRead_class& room, int index) {
     return dStage_roomRead_dt_c_GetReverb(*room.m_entries[index]);
 }
 
-/* 80025E70-80025EA4 0207B0 0034+00 1/0 0/0 0/0 .text dStage_ppntInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_ppntInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setPntInfo((dStage_dPnt_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 80025EA4-80025F44 0207E4 00A0+00 1/0 0/0 0/0 .text dStage_pathInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_pathInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     dStage_dPath_c* path_c = (dStage_dPath_c*)((char*)i_data + 4);
     dPath* path = path_c->m_path;
@@ -2097,13 +2000,11 @@ static int dStage_pathInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80025F44-80025F78 020884 0034+00 2/0 0/0 0/0 .text dStage_rppnInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_rppnInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setPnt2Info((dStage_dPnt_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 80025F78-80026018 0208B8 00A0+00 2/0 0/0 0/0 .text dStage_rpatInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* param_3) {
     (void)i_num;
     (void)param_3;
@@ -2120,21 +2021,16 @@ static int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, vo
     return 1;
 }
 
-/* 80026018-8002604C 020958 0034+00 1/0 0/0 0/0 .text dStage_soundInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_soundInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setSoundInf((dStage_SoundInfo_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 8002604C-80026080 02098C 0034+00 2/0 0/0 0/0 .text dStage_soundInfoInitCL__FP11dStage_dt_cPviPv
- */
 static int dStage_soundInfoInitCL(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setSoundInfCL((dStage_SoundInfo_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 80026080-800260B4 0209C0 0034+00 3/3 0/0 0/0 .text dStage_setLayerTagName__FP9FuncTableii */
 static void dStage_setLayerTagName(FuncTable* funcTbl, int tblSize, int i_layerNo) {
     char layerTag;
     if (i_layerNo < 10) {
@@ -2150,8 +2046,6 @@ static void dStage_setLayerTagName(FuncTable* funcTbl, int tblSize, int i_layerN
     }
 }
 
-/* 800260B4-8002617C 0209F4 00C8+00 9/9 0/0 0/0 .text
- * dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei            */
 static void dStage_dt_c_decode(void* i_data, dStage_dt_c* i_stage, FuncTable* funcTbl,
                                int tblSize) {
     if (i_data != NULL) {
@@ -2176,29 +2070,22 @@ static void dStage_dt_c_decode(void* i_data, dStage_dt_c* i_stage, FuncTable* fu
     }
 }
 
-/* 8002617C-800261B0 020ABC 0034+00 1/0 0/0 0/0 .text dStage_stEventInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_stEventInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setMapEventInfo((dStage_MapEventInfo_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 800261B0-800261E4 020AF0 0034+00 1/0 0/0 0/0 .text
- * dStage_mapEventInfoInit__FP11dStage_dt_cPviPv                */
 static int dStage_mapEventInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     i_stage->setMapEventInfo((dStage_MapEventInfo_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 800261E4-80026218 020B24 0034+00 2/0 0/0 0/0 .text dStage_floorInfoInit__FP11dStage_dt_cPviPv
- */
 static int dStage_floorInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setFloorInfo((dStage_FloorInfo_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 80026218-80026298 020B58 0080+00 1/0 0/0 0/9 .text dStage_memaInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     (void)param_2;
     (void)param_3;
@@ -2221,7 +2108,6 @@ static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2,
     return 1;
 }
 
-/* 80026298-8002631C 020BD8 0084+00 1/0 0/0 0/0 .text dStage_mecoInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_mecoInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     (void)param_2;
     (void)param_3;
@@ -2240,8 +2126,6 @@ static int dStage_mecoInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2,
     return 1;
 }
 
-/* 8002631C-8002634C 020C5C 0030+00 2/0 0/0 0/0 .text
- * dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv            */
 static int dStage_stageKeepTresureInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                        void* param_3) {
     dTres_c::list_class* tresure_p = (dTres_c::list_class*)((char*)i_data + 4);
@@ -2249,8 +2133,6 @@ static int dStage_stageKeepTresureInit(dStage_dt_c* i_stage, void* i_data, int e
     return 1;
 }
 
-/* 8002634C-8002635C 020C8C 0010+00 1/0 0/0 0/0 .text
- * dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv             */
 static int dStage_fieldMapTresureInit(dStage_dt_c* i_stage, void* i_data, int i_entryNum,
                                       void* param_3) {
     dMenu_Fmap_data_c* data = (dMenu_Fmap_data_c*)i_stage;
@@ -2258,7 +2140,6 @@ static int dStage_fieldMapTresureInit(dStage_dt_c* i_stage, void* i_data, int i_
     return 1;
 }
 
-/* 8002635C-800263A0 020C9C 0044+00 4/4 0/0 0/0 .text            dStage_dt_c_offsetToPtr__FPv */
 static void dStage_dt_c_offsetToPtr(void* i_data) {
     dStage_fileHeader* file = (dStage_fileHeader*)i_data;
     dStage_nodeHeader* p_tno = file->m_nodes;
@@ -2272,15 +2153,12 @@ static void dStage_dt_c_offsetToPtr(void* i_data) {
     }
 }
 
-/* 800263A0-800263D0 020CE0 0030+00 1/0 0/0 0/0 .text dStage_mapPathInit__FP11dStage_dt_cPviPv */
 static int dStage_mapPathInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     dStage_nodeHeader* map_path = (dStage_nodeHeader*)((int*)i_data + 1);
     dMpath_c::setPointer(i_stage->getRoomNo(), map_path, 0);
     return 1;
 }
 
-/* 800263D0-80026400 020D10 0030+00 1/0 0/0 0/0 .text
- * dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv          */
 static int dStage_mapPathInitCommonLayer(dStage_dt_c* i_stage, void* i_data, int param_2,
                                          void* param_3) {
     map_path_class* map_path = (map_path_class*)((int*)i_data + 1);
@@ -2288,8 +2166,6 @@ static int dStage_mapPathInitCommonLayer(dStage_dt_c* i_stage, void* i_data, int
     return 1;
 }
 
-/* 80026400-8002645C 020D40 005C+00 1/0 0/0 0/0 .text
- * dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv             */
 static int dStage_fieldMapMapPathInit(dStage_dt_c* i_stage, void* i_data, int param_2,
                                          void* param_3) {
     map_path_class* map_path = (map_path_class*)((int*)i_data + 1);
@@ -2305,12 +2181,8 @@ static int dStage_fieldMapMapPathInit(dStage_dt_c* i_stage, void* i_data, int pa
     return 1;
 }
 
-/* 80450D74-80450D7C 000274 0008+00 3/3 0/0 0/0 .sbss            m_roomDzs__20dStage_roomControl_c
- */
 dStage_roomControl_c::roomDzs_c dStage_roomControl_c::m_roomDzs;
 
-/* 8002645C-800265DC 020D9C 0180+00 1/1 0/0 0/0 .text readMult__FP11dStage_dt_cP14dStage_Multi_cb
- */
 static void readMult(dStage_dt_c* i_stage, dStage_Multi_c* multi, bool useOldRes) {
     static FuncTable l_roomFuncTable[] = {
         {"TRES", dStage_stageKeepTresureInit},
@@ -2362,7 +2234,6 @@ static void readMult(dStage_dt_c* i_stage, dStage_Multi_c* multi, bool useOldRes
     }
 }
 
-/* 800265DC-80026670 020F1C 0094+00 1/0 0/0 0/0 .text dStage_multInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_multInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setMulti((dStage_Multi_c*)((char*)i_data + 4));
     dStage_initRoomKeepDoorInfo();
@@ -2374,14 +2245,11 @@ static int dStage_multInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80026670-800266A4 020FB0 0034+00 1/0 0/0 0/0 .text dStage_lbnkInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_lbnkInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     i_stage->setLbnk((dStage_Lbnk_c*)((char*)i_data + 4));
     return 1;
 }
 
-/* 800266A4-8002670C 020FE4 0068+00 1/0 0/0 0/0 .text dStage_roomTresureInit__FP11dStage_dt_cPviPv
- */
 static int dStage_roomTresureInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     stage_tresure_class* tresure_p = (stage_tresure_class*)((char*)i_data + 4);
     i_stage->setTresure(tresure_p);
@@ -2389,15 +2257,12 @@ static int dStage_roomTresureInit(dStage_dt_c* i_stage, void* i_data, int entryN
     return 1;
 }
 
-/* 8002670C-80026730 02104C 0024+00 1/0 0/0 0/0 .text
- * dStage_layerTresureInit__FP11dStage_dt_cPviPv                */
 static int dStage_layerTresureInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     dStage_actorInit(i_stage, i_data, entryNum, param_3);
     return 1;
 }
 
-/* 80026730-80026764 021070 0034+00 1/0 0/0 0/0 .text dStage_dmapInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_dmapInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) {
     (void)entryNum;
     (void)param_3;
@@ -2406,8 +2271,6 @@ static int dStage_dmapInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
     return 1;
 }
 
-/* 80026764-800267DC 0210A4 0078+00 1/0 0/0 0/0 .text
- * dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv               */
 static int dStage_stageDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                     void* param_3) {
     i_stage->setDrTg((stage_tgsc_class*)((char*)i_data + 4));
@@ -2416,8 +2279,6 @@ static int dStage_stageDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int entr
     return 1;
 }
 
-/* 800267DC-80026844 02111C 0068+00 2/0 0/0 0/0 .text
- * dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv                */
 static int dStage_roomDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum,
                                    void* param_3) {
     i_stage->setDrTg((stage_tgsc_class*)((char*)i_data + 4));
@@ -2425,7 +2286,6 @@ static int dStage_roomDrtgInfoInit(dStage_dt_c* i_stage, void* i_data, int entry
     return 1;
 }
 
-/* 80026844-80026898 021184 0054+00 1/0 0/0 0/0 .text dStage_elstInfoInit__FP11dStage_dt_cPviPv */
 static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) {
     dStage_Elst_c* elst = (dStage_Elst_c*)((char*)i_data + 4);
 
@@ -2438,7 +2298,6 @@ static int dStage_elstInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2,
     return 1;
 }
 
-/* 80026898-80026914 0211D8 007C+00 1/1 0/0 0/0 .text            dKankyo_create__Fv */
 static void dKankyo_create() {
     fopKyM_fastCreate(PROC_KANKYO, NULL, NULL, NULL, NULL);
     fopKyM_fastCreate(PROC_KYEFF, NULL, NULL, NULL, NULL);
@@ -2446,7 +2305,6 @@ static void dKankyo_create() {
     fopKyM_fastCreate(PROC_ENVSE, NULL, NULL, NULL, NULL);
 }
 
-/* 80026914-80026940 021254 002C+00 1/1 0/0 0/0 .text layerMemoryInfoLoader__FPvP11dStage_dt_ci */
 static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     static FuncTable l_layerFuncTable[] = {
         {"MEM0", dStage_memaInfoInit},
@@ -2456,8 +2314,6 @@ static void layerMemoryInfoLoader(void* i_data, dStage_dt_c* i_stage, int param_
     dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable));
 }
 
-/* 80026940-800269B4 021280 0074+00 1/1 0/0 0/0 .text
- * dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c               */
 static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
     static FuncTable l_funcTable[] = {"STAG", dStage_stagInfoInit};
 
@@ -2467,7 +2323,6 @@ static void dStage_dt_c_stageInitLoader(void* i_data, dStage_dt_c* i_stage) {
     layerMemoryInfoLoader(i_data, i_stage, -1);
 }
 
-/* 800269B4-80026AE8 0212F4 0134+00 2/2 0/0 0/0 .text layerTableLoader__FPvP11dStage_dt_ci */
 static void layerTableLoader(void* i_data, dStage_dt_c* i_stage, int roomNo) {
     static FuncTable l_layerFuncTableA[] = {"SON0", dStage_soundInfoInit};
 
@@ -2503,7 +2358,6 @@ static void layerTableLoader(void* i_data, dStage_dt_c* i_stage, int roomNo) {
 
 dStage_Elst_c* dStage_stageDt_c::getElst(void) { return mElst; }
 
-/* 80026AF0-80026B58 021430 0068+00 2/2 0/0 0/0 .text layerActorLoader__FPvP11dStage_dt_ci */
 static void layerActorLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     static FuncTable l_layerFuncTable[] = {
         {"Doo0", dStage_roomDrtgInfoInit},
@@ -2516,8 +2370,6 @@ static void layerActorLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     dStage_dt_c_decode(i_data, i_stage, l_layerFuncTable, ARRAY_SIZEU(l_layerFuncTable));
 }
 
-/* 80026B58-80026BBC 021498 0064+00 1/1 0/0 0/0 .text dStage_dt_c_stageLoader__FPvP11dStage_dt_c
- */
 static void dStage_dt_c_stageLoader(void* i_data, dStage_dt_c* i_stage) {
     static FuncTable l_funcTable[] = {
         {"EVLY", dStage_elstInfoInit},      {"RPPN", dStage_rppnInfoInit},
@@ -2540,8 +2392,6 @@ static void dStage_dt_c_stageLoader(void* i_data, dStage_dt_c* i_stage) {
     layerActorLoader(i_data, i_stage, -1);
 }
 
-/* 80026BBC-80026C34 0214FC 0078+00 0/0 1/1 0/0 .text dStage_dt_c_roomLoader__FPvP11dStage_dt_ci
- */
 void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     static FuncTable l_funcTable[] = {
         {"PLYR", dStage_playerInit},   {"RCAM", dStage_RoomCameraInit},
@@ -2559,8 +2409,6 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     layerTableLoader(i_data, i_stage, param_2);
 }
 
-/* 80026C34-80026C8C 021574 0058+00 0/0 1/1 0/0 .text dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci
- */
 void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     static FuncTable l_funcTable[] = {
         {"Door", dStage_roomDrtgInfoInit},     {"ACTR", dStage_actorCommonLayerInit},
@@ -2573,8 +2421,6 @@ void dStage_dt_c_roomReLoader(void* i_data, dStage_dt_c* i_stage, int param_2) {
     layerActorLoader(i_data, i_stage, param_2);
 }
 
-/* 80026C8C-80026CDC 0215CC 0050+00 0/0 1/1 0/0 .text
- * dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c                */
 void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage) {
     static FuncTable l_funcTable[] = {
         {"TRES", dStage_fieldMapTresureInit},
@@ -2588,17 +2434,13 @@ void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage) {
     dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable));
 }
 
-/* ############################################################################################## */
-/* 803A6920-803A696C 003A40 004C+00 3/3 0/0 0/0 .data mMemoryBlock__20dStage_roomControl_c */
 JKRExpHeap* dStage_roomControl_c::mMemoryBlock[MEMORY_BLOCK_MAX] = {
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
-/* 803A696C-803A6AAC 003A8C 0140+00 2/2 0/0 0/0 .data            mArcBank__20dStage_roomControl_c */
 char dStage_roomControl_c::mArcBank[32][10] = {0};
 
-/* 80026CDC-80026D38 02161C 005C+00 0/0 1/1 0/0 .text            dStage_infoCreate__Fv */
 void dStage_infoCreate() {
     OS_REPORT("dStage_Create\n");
     void* stageRsrc = dComIfG_getStageRes("stage.dzs");
@@ -2608,10 +2450,8 @@ void dStage_infoCreate() {
     dStage_dt_c_stageInitLoader(stageRsrc, dComIfGp_getStage());
 }
 
-/* 80406194-804061A0 032EB4 000A+02 2/2 14/14 7/7 .bss mDemoArcName__20dStage_roomControl_c */
 char dStage_roomControl_c::mDemoArcName[10];
 
-/* 80026D38-80026DF8 021678 00C0+00 0/0 1/1 0/0 .text            dStage_Create__Fv */
 void dStage_Create() {
     void* stageRsrc = dComIfG_getStageRes("stage.dzs");
     JUT_ASSERT(4451, stageRsrc != NULL);
@@ -2634,7 +2474,6 @@ void dStage_Create() {
     dComIfGp_evmng_create();
 }
 
-/* 80026DF8-80026FDC 021738 01E4+00 0/0 1/1 0/7 .text            dStage_Delete__Fv */
 void dStage_Delete() {
     OS_REPORT("dStage_Delete\n");
 
@@ -2672,14 +2511,10 @@ void dStage_Delete() {
     dComIfGp_getStage()->init();
 }
 
-/* 80026FDC-80026FE8 02191C 000C+00 1/0 0/0 0/0 .text            setOldMulti__16dStage_stageDt_cFv
- */
 void dStage_stageDt_c::setOldMulti() {
     mOldMulti = mMulti;
 }
 
-/* 80026FE8-800270FC 021928 0114+00 0/0 1/1 1/1 .text            dStage_RoomCheck__FP11cBgS_GndChk
- */
 int dStage_RoomCheck(cBgS_GndChk* gndChk) {
     int roomReadId = dStage_roomControl_c::getRoomReadId();
     int roomId;
@@ -2714,15 +2549,11 @@ int dStage_RoomCheck(cBgS_GndChk* gndChk) {
     return 1;
 }
 
-/* 800270FC-80027170 021A3C 0074+00 0/0 1/1 0/0 .text
- * dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs            */
 int dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 speed, u32 mode, s8 roomNo, s16 angle) {
     s32 exit_id = dComIfG_Bgsp().GetExitId(param_0);
     return dStage_changeScene(exit_id, speed, mode, roomNo, angle, -1);
 }
 
-/* 80027170-800272E0 021AB0 0170+00 1/1 10/10 63/63 .text            dStage_changeScene__FifUlScsi
- */
 int dStage_changeScene(int i_exitId, f32 speed, u32 mode, s8 room_no, s16 angle, int param_5) {
     stage_scls_info_dummy_class* scls;
 
@@ -2768,7 +2599,6 @@ static void dummy5() {
     ((dStage_stageDt_c*)dComIfGp_getStage())->getSclsInfo();
 }
 
-/* 800272F0-800274B0 021C30 01C0+00 0/0 1/1 0/0 .text dStage_changeScene4Event__FiScibfUlsi */
 int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3, f32 speed,
                              u32 mode, s16 angle, int param_7) {
     stage_scls_info_dummy_class* scls;
@@ -2814,7 +2644,6 @@ int dStage_changeScene4Event(int i_exitId, s8 room_no, int i_wipe, bool param_3,
     return 1;
 }
 
-/* 800274B0-80027524 021DF0 0074+00 0/0 1/1 0/0 .text            dStage_restartRoom__FUlUli */
 void dStage_restartRoom(u32 roomParam, u32 mode, int param_2) {
     dComIfGp_setNextStage(dComIfGp_getStartStageName(), -1, dComIfGs_getRestartRoomNo(), -1, 0.0f,
                           mode, 0, 0, 0, param_2, 0);
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index bfa4fee4f3..1a6ab89e9a 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -24,7 +24,6 @@
 
 static int dTimer_createStart2D(s32 param_0, u16 param_1);
 
-/* 8025CA0C-8025CF04 25734C 04F8+00 1/1 0/0 0/0 .text            _create__8dTimer_cFv */
 int dTimer_c::_create() {
     int phase_state = dComIfG_resLoad(&m_phase, "Timer");
 
@@ -158,7 +157,6 @@ int dTimer_c::_create() {
     return cPhs_COMPLEATE_e;
 }
 
-/* 8025CF04-8025D33C 257844 0438+00 1/1 0/0 0/0 .text            _execute__8dTimer_cFv */
 int dTimer_c::_execute() {
     if (m_timer_mode == 6 && dComIfGs_getLife() == 0) {
         fopMsgM_Delete(this);
@@ -285,7 +283,6 @@ static f32 dummyLiteralOrder2() {
     return -1.0f;
 }
 
-/* 8025D33C-8025D3BC 257C7C 0080+00 1/1 0/0 0/0 .text            _draw__8dTimer_cFv */
 int dTimer_c::_draw() {
     if (dComIfGp_isPauseFlag() || dMsgObject_isTalkNowCheck()) {
         return 1;
@@ -295,7 +292,6 @@ int dTimer_c::_draw() {
     return 1;
 }
 
-/* 8025D3BC-8025D524 257CFC 0168+00 1/1 0/0 0/0 .text            _delete__8dTimer_cFv */
 int dTimer_c::_delete() {
     if (mp_heap != NULL) {
         JKRHeap* prev_heap = mDoExt_setCurrentHeap(mp_heap);
@@ -326,12 +322,10 @@ int dTimer_c::_delete() {
     return 1;
 }
 
-/* 8025D524-8025D538 257E64 0014+00 0/0 1/1 0/0 .text            deleteCheck__8dTimer_cFv */
 int dTimer_c::deleteCheck() {
     return m_mode == 7;
 }
 
-/* 8025D538-8025D618 257E78 00E0+00 1/1 1/1 0/0 .text            start__8dTimer_cFi */
 int dTimer_c::start(int i_timer_mode) {
     if (m_mode == 0 || m_mode == 1) {
         m_mode = 4;
@@ -355,7 +349,6 @@ int dTimer_c::start(int i_timer_mode) {
     return 0;
 }
 
-/* 8025D618-8025D708 257F58 00F0+00 0/0 1/1 0/0 .text            start__8dTimer_cFis */
 int dTimer_c::start(int i_timer_mode, s16 param_1) {
     if (param_1 == -1) {
         if (m_mode == 0) {
@@ -384,7 +377,6 @@ int dTimer_c::start(int i_timer_mode, s16 param_1) {
     return 0;
 }
 
-/* 8025D708-8025D7C0 258048 00B8+00 1/1 0/0 0/0 .text            stock_start__8dTimer_cFv */
 bool dTimer_c::stock_start() {
     if (m_mode == 5) {
         m_mode = 4;
@@ -400,7 +392,6 @@ bool dTimer_c::stock_start() {
     return false;
 }
 
-/* 8025D7C0-8025D7E8 258100 0028+00 1/1 0/0 0/0 .text            stock_start__8dTimer_cFs */
 int dTimer_c::stock_start(s16 param_0) {
     if (m_mode == 0) {
         field_0x168 = param_0;
@@ -411,7 +402,6 @@ int dTimer_c::stock_start(s16 param_0) {
     return 0;
 }
 
-/* 8025D7E8-8025D86C 258128 0084+00 3/3 1/1 0/0 .text            stop__8dTimer_cFUc */
 int dTimer_c::stop(u8 param_0) {
     if (field_0x16A == 1 || field_0x16B != 0) {
         return 0;
@@ -425,7 +415,6 @@ int dTimer_c::stop(u8 param_0) {
     }
 }
 
-/* 8025D86C-8025D920 2581AC 00B4+00 1/1 1/1 0/0 .text            restart__8dTimer_cFUc */
 int dTimer_c::restart(u8 param_0) {
     if (field_0x16A != 1 || field_0x16B != param_0) {
         return 0;
@@ -440,7 +429,6 @@ int dTimer_c::restart(u8 param_0) {
     }
 }
 
-/* 8025D920-8025D9E0 258260 00C0+00 0/0 1/1 0/0 .text            end__8dTimer_cFi */
 int dTimer_c::end(int param_0) {
     if (m_mode != 4) {
         return 0;
@@ -457,29 +445,24 @@ int dTimer_c::end(int param_0) {
     return 1;
 }
 
-/* 8025D9E0-8025D9F0 258320 0010+00 0/0 1/1 0/0 .text            deleteRequest__8dTimer_cFv */
 int dTimer_c::deleteRequest() {
     m_mode = 8;
     return 1;
 }
 
-/* 8025D9F0-8025DA54 258330 0064+00 3/3 0/0 0/0 .text            getTimeMs__8dTimer_cFv */
 int dTimer_c::getTimeMs() {
     return OSTicksToMilliseconds(m_time - m_start_time - field_0x138);
 }
-/* 8025DA54-8025DA9C 258394 0048+00 3/3 0/0 0/0 .text            getLimitTimeMs__8dTimer_cFv */
 int dTimer_c::getLimitTimeMs() {
     return OSTicksToMilliseconds(mLimitTime);
 }
 
-/* 8025DA9C-8025DB10 2583DC 0074+00 2/2 0/0 1/1 .text            getRestTimeMs__8dTimer_cFv */
 int dTimer_c::getRestTimeMs() {
     OSTime step0 = m_time - m_start_time - field_0x138;
     step0 = mLimitTime - step0;
     return OSTicksToMilliseconds(step0);
 }
 
-/* 8025DB10-8025DB38 258450 0028+00 1/1 0/0 4/4 .text            isStart__8dTimer_cFv */
 bool dTimer_c::isStart() {
     if (field_0x16A != 1 && m_mode == 4) {
         return true;
@@ -488,7 +471,6 @@ bool dTimer_c::isStart() {
     return false;
 }
 
-/* 8025DB38-8025DBE0 258478 00A8+00 1/1 0/0 0/0 .text            __ct__21dDlst_TimerScrnDraw_cFv */
 dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() {
     field_0x3e2 = 0;
     mHIOType = 0;
@@ -508,8 +490,6 @@ dDlst_TimerScrnDraw_c::dDlst_TimerScrnDraw_c() {
     show();
 }
 
-/* 8025DBE0-8025DFBC 258520 03DC+00 1/1 0/0 0/0 .text            setHIO__21dDlst_TimerScrnDraw_cFv
- */
 void dDlst_TimerScrnDraw_c::setHIO() {
     bool var_r31 = false;
 
@@ -597,8 +577,6 @@ void dDlst_TimerScrnDraw_c::setHIO() {
     }
 }
 
-/* 8025DFBC-8025E240 2588FC 0284+00 1/1 0/0 0/0 .text
- * setScreen__21dDlst_TimerScrnDraw_cFlP10JKRArchive            */
 void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
     field_0x3C8 = param_0;
     mpArchive = i_archive;
@@ -651,7 +629,6 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) {
     mTimerTransX = 0.0f;
 }
 
-/* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::setScreenBase() {
     mpScreen = new J2DScreen();
     JUT_ASSERT(0, mpScreen != NULL);
@@ -698,8 +675,6 @@ void dDlst_TimerScrnDraw_c::setScreenBase() {
     mTimerText[5][1] = mpScreen->search('t_n_1_s');
 }
 
-/* 8025E66C-8025E8B8 258FAC 024C+00 1/1 0/0 0/0 .text setScreenBoatRace__21dDlst_TimerScrnDraw_cFv
- */
 void dDlst_TimerScrnDraw_c::setScreenBoatRace() {
     mpScreen = new J2DScreen();
     JUT_ASSERT(0, mpScreen != NULL);
@@ -742,7 +717,6 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() {
     }
 }
 
-/* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::setScreenRider() {
     mpScreen = new J2DScreen();
     JUT_ASSERT(0, mpScreen != NULL);
@@ -780,8 +754,6 @@ void dDlst_TimerScrnDraw_c::setScreenRider() {
     }
 }
 
-/* 8025EB20-8025EC5C 259460 013C+00 1/1 0/0 0/0 .text hideDenominator__21dDlst_TimerScrnDraw_cFv
- */
 void dDlst_TimerScrnDraw_c::hideDenominator() {
     for (int i = 0; i < 2; i++) {
         for (int j = 0; j < 2; j++) {
@@ -808,7 +780,6 @@ void dDlst_TimerScrnDraw_c::hideDenominator() {
     }
 }
 
-/* 8025EC5C-8025EE24 25959C 01C8+00 1/1 0/0 0/0 .text deleteScreen__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::deleteScreen() {
     delete mpScreen;
     mpScreen = NULL;
@@ -849,8 +820,6 @@ void dDlst_TimerScrnDraw_c::deleteScreen() {
     mpGetInText = NULL;
 }
 
-/* 8025EE24-8025EECC 259764 00A8+00 2/2 0/0 0/0 .text
- * changeNumberTexture__21dDlst_TimerScrnDraw_cFP7J2DPanei      */
 void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* i_pane, int i_num) {
     if (i_num < 0 || i_num >= 10) {
         i_num = 0;
@@ -860,13 +829,10 @@ void dDlst_TimerScrnDraw_c::changeNumberTexture(J2DPane* i_pane, int i_num) {
     static_cast<J2DPicture*>(i_pane)->changeTexture(getNumber(i_num), 0);
 }
 
-/* 8025EECC-8025EEF0 25980C 0024+00 1/1 0/0 0/0 .text getNumber__21dDlst_TimerScrnDraw_cFi */
 const char* dDlst_TimerScrnDraw_c::getNumber(int i_num) {
     return dMeter2Info_getNumberTextureName(i_num);
 }
 
-/* 8025EEF0-8025F180 259830 0290+00 1/1 0/0 0/0 .text            setTimer__21dDlst_TimerScrnDraw_cFi
- */
 void dDlst_TimerScrnDraw_c::setTimer(int i_time) {
     int min;
     int sec;
@@ -931,7 +897,6 @@ void dDlst_TimerScrnDraw_c::setTimer(int i_time) {
     }
 }
 
-/* 8025F180-8025FA00 259AC0 0880+00 1/1 0/0 0/0 .text setCounter__21dDlst_TimerScrnDraw_cFUcUc */
 void dDlst_TimerScrnDraw_c::setCounter(u8 i_count, u8 i_max) {
     bool var_r30 = false;
 
@@ -1085,35 +1050,30 @@ void dDlst_TimerScrnDraw_c::setCounter(u8 i_count, u8 i_max) {
     }
 }
 
-/* 8025FA00-8025FA2C 25A340 002C+00 1/1 0/0 0/0 .text setParentPos__21dDlst_TimerScrnDraw_cFff */
 void dDlst_TimerScrnDraw_c::setParentPos(f32 i_posX, f32 i_posY) {
     if (mpParent != NULL) {
         mpParent->paneTrans(i_posX, i_posY);
     }
 }
 
-/* 8025FA2C-8025FA6C 25A36C 0040+00 4/4 0/0 0/0 .text setTimerPos__21dDlst_TimerScrnDraw_cFff */
 void dDlst_TimerScrnDraw_c::setTimerPos(f32 i_posX, f32 i_posY) {
     if (mpTimeParent != NULL) {
         mpTimeParent->paneTrans(i_posX + mTimerTransX, i_posY + mTimerTransY);
     }
 }
 
-/* 8025FA6C-8025FA98 25A3AC 002C+00 4/4 0/0 0/0 .text setCounterPos__21dDlst_TimerScrnDraw_cFff */
 void dDlst_TimerScrnDraw_c::setCounterPos(f32 i_posX, f32 i_posY) {
     if (mpCowParent != NULL) {
         mpCowParent->paneTrans(i_posX, i_posY);
     }
 }
 
-/* 8025FA98-8025FAC4 25A3D8 002C+00 4/4 0/0 0/0 .text setImagePos__21dDlst_TimerScrnDraw_cFff */
 void dDlst_TimerScrnDraw_c::setImagePos(f32 i_posX, f32 i_posY) {
     if (mpImageParent != NULL) {
         mpImageParent->paneTrans(i_posX, i_posY);
     }
 }
 
-/* 8025FAC4-8025FB74 25A404 00B0+00 2/2 0/0 0/0 .text setShowType__21dDlst_TimerScrnDraw_cFUc */
 void dDlst_TimerScrnDraw_c::setShowType(u8 i_type) {
     dComIfG_setTimerType(i_type);
 
@@ -1144,7 +1104,6 @@ void dDlst_TimerScrnDraw_c::setShowType(u8 i_type) {
     }
 }
 
-/* 8025FB74-8025FF98 25A4B4 0424+00 1/1 0/0 0/0 .text            anime__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::anime() {
     static const s16 animeFrame[] = {7, 15, 22};
 
@@ -1214,7 +1173,6 @@ void dDlst_TimerScrnDraw_c::anime() {
     }
 }
 
-/* 8025FF98-802601E4 25A8D8 024C+00 1/1 0/0 0/0 .text closeAnime__21dDlst_TimerScrnDraw_cFv */
 BOOL dDlst_TimerScrnDraw_c::closeAnime() {
     BOOL var_r31 = false;
     field_0x3D8++;
@@ -1259,8 +1217,6 @@ BOOL dDlst_TimerScrnDraw_c::closeAnime() {
     return var_r31;
 }
 
-/* 802601E4-80260574 25AB24 0390+00 2/1 0/0 0/0 .text createGetIn__21dDlst_TimerScrnDraw_cF4cXyz
- */
 int dDlst_TimerScrnDraw_c::createGetIn(cXyz i_pos) {
     char string[104];
     dMeter2Info_getString(0x3E4, string, NULL);  // "GOAT IN!"
@@ -1350,7 +1306,6 @@ int dDlst_TimerScrnDraw_c::createGetIn(cXyz i_pos) {
     return 0;
 }
 
-/* 80260574-80260690 25AEB4 011C+00 3/3 0/0 0/0 .text createStart__21dDlst_TimerScrnDraw_cFUs */
 s32 dDlst_TimerScrnDraw_c::createStart(u16 i_messageID) {
     char string[112];
     dMeter2Info_getString(i_messageID, string, NULL);
@@ -1370,7 +1325,6 @@ s32 dDlst_TimerScrnDraw_c::createStart(u16 i_messageID) {
     return 0;
 }
 
-/* 80260690-80260AA8 25AFD0 0418+00 1/0 0/0 0/0 .text            draw__21dDlst_TimerScrnDraw_cFv */
 void dDlst_TimerScrnDraw_c::draw() {
     J2DGrafContext* graf_ctx = dComIfGp_getCurrentGrafPort();
     graf_ctx->setup2D();
@@ -1442,8 +1396,6 @@ void dDlst_TimerScrnDraw_c::draw() {
     }
 }
 
-/* 80260AA8-80260AD4 25B3E8 002C+00 1/1 0/0 0/0 .text
- * checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv                */
 bool dDlst_TimerScrnDraw_c::checkStartAnimeEnd() {
     if (m_getin_info[0].field_0xc == 1 && m_getin_info[0].pikari_frame == 0.0f) {
         return true;
@@ -1452,8 +1404,6 @@ bool dDlst_TimerScrnDraw_c::checkStartAnimeEnd() {
     return false;
 }
 
-/* 80260AD4-80260B54 25B414 0080+00 2/2 0/0 0/0 .text playBckAnimation__21dDlst_TimerScrnDraw_cFf
- */
 void dDlst_TimerScrnDraw_c::playBckAnimation(f32 i_frame) {
     mpGetInParent->getPanePtr()->setAnimation(mpGetInBck);
     mpGetInBck->setFrame(i_frame);
@@ -1468,7 +1418,6 @@ bool dDlst_TimerScrnDraw_c::isLeadByte(int i_char) {
 }
 #endif
 
-/* 80260B54-80260F04 25B494 03B0+00 1/1 0/0 0/0 .text drawPikari__21dDlst_TimerScrnDraw_cFi */
 void dDlst_TimerScrnDraw_c::drawPikari(int i_no) {
     f32 temp_f28;
     f32 anim_frame;
@@ -1566,32 +1515,26 @@ void dDlst_TimerScrnDraw_c::drawPikari(int i_no) {
     m_getin_info[i_no].pikari_frame = frame;
 }
 
-/* 80260F04-80260F24 25B844 0020+00 1/0 0/0 0/0 .text            dTimer_Draw__FP8dTimer_c */
 static int dTimer_Draw(dTimer_c* i_this) {
     return i_this->_draw();
 }
 
-/* 80260F24-80260F44 25B864 0020+00 1/0 0/0 0/0 .text            dTimer_Execute__FP8dTimer_c */
 static int dTimer_Execute(dTimer_c* i_this) {
     return i_this->_execute();
 }
 
-/* 80260F44-80260F4C 25B884 0008+00 1/0 0/0 0/0 .text            dTimer_IsDelete__FP8dTimer_c */
 static int dTimer_IsDelete(dTimer_c* i_this) {
     return 1;
 }
 
-/* 80260F4C-80260F6C 25B88C 0020+00 1/0 0/0 0/0 .text            dTimer_Delete__FP8dTimer_c */
 static int dTimer_Delete(dTimer_c* i_this) {
     return i_this->_delete();
 }
 
-/* 80260F6C-80260F8C 25B8AC 0020+00 1/0 0/0 0/0 .text            dTimer_Create__FP9msg_class */
 static int dTimer_Create(msg_class* i_this) {
     return static_cast<dTimer_c*>(i_this)->_create();
 }
 
-/* 80260F8C-80261034 25B8CC 00A8+00 0/0 1/1 9/9 .text            dTimer_createTimer__FlUlUcUcffff */
 fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3, f32 param_4, f32 param_5,
                        f32 param_6, f32 param_7) {
     if (dComIfG_getTimerMode() == -1) {
@@ -1602,7 +1545,6 @@ fpc_ProcID dTimer_createTimer(s32 i_mode, u32 i_limitMs, u8 i_type, u8 param_3,
     return -1;
 }
 
-/* 80261034-80261100 25B974 00CC+00 0/0 1/1 0/0 .text            dTimer_createStockTimer__Fv */
 s32 dTimer_createStockTimer() {
     if (dComIfG_getTimerMode() != -1) {
         if ((dComIfG_getTimerMode() == 3 || dComIfG_getTimerMode() == 4) &&
@@ -1620,7 +1562,6 @@ s32 dTimer_createStockTimer() {
     }
 }
 
-/* 80261100-80261188 25BA40 0088+00 0/0 0/0 1/1 .text            dTimer_createGetIn2D__Fl4cXyz */
 u32 dTimer_createGetIn2D(s32 param_0, cXyz i_pos) {
     if (dComIfG_getTimerPtr() != NULL) {
         cXyz proj_pos;
@@ -1633,7 +1574,6 @@ u32 dTimer_createGetIn2D(s32 param_0, cXyz i_pos) {
     return param_0;
 }
 
-/* 80261188-802611F0 25BAC8 0068+00 1/1 0/0 0/0 .text            dTimer_createStart2D__FlUs */
 static int dTimer_createStart2D(s32 param_0, u16 param_1) {
     if (dComIfG_getTimerPtr() != NULL) {
         param_0 = dComIfG_getTimerPtr()->createStart(param_1);
@@ -1644,7 +1584,6 @@ static int dTimer_createStart2D(s32 param_0, u16 param_1) {
     return param_0;
 }
 
-/* 802611F0-80261244 25BB30 0054+00 0/0 0/0 5/5 .text            dTimer_isStart__Fv */
 bool dTimer_isStart() {
     if (dComIfG_getTimerPtr() != NULL) {
         return dComIfG_getTimerPtr()->isStart();
@@ -1653,7 +1592,6 @@ bool dTimer_isStart() {
     return false;
 }
 
-/* 80261244-80261298 25BB84 0054+00 0/0 0/0 2/2 .text            dTimer_getRestTimeMs__Fv */
 int dTimer_getRestTimeMs() {
     if (dComIfG_getTimerPtr() != NULL) {
         return dComIfG_getTimerPtr()->getRestTimeMs();
@@ -1662,21 +1600,18 @@ int dTimer_getRestTimeMs() {
     return 0;
 }
 
-/* 80261298-802612EC 25BBD8 0054+00 0/0 0/0 2/2 .text            dTimer_show__Fv */
 void dTimer_show() {
     if (dComIfG_getTimerPtr() != NULL) {
         dComIfG_getTimerPtr()->show();
     }
 }
 
-/* 802612EC-80261340 25BC2C 0054+00 0/0 0/0 2/2 .text            dTimer_hide__Fv */
 void dTimer_hide() {
     if (dComIfG_getTimerPtr() != NULL) {
         dComIfG_getTimerPtr()->hide();
     }
 }
 
-/* 80261340-80261394 25BC80 0054+00 0/0 0/0 1/1 .text            dTimer_isReadyFlag__Fv */
 u8 dTimer_isReadyFlag() {
     if (dComIfG_getTimerPtr() != NULL) {
         return dComIfG_getTimerPtr()->isReadyFlag();
@@ -1685,22 +1620,18 @@ u8 dTimer_isReadyFlag() {
     return 0;
 }
 
-/* 80261394-802613DC 25BCD4 0048+00 1/0 0/0 0/0 .text            __dt__21dDlst_TimerScrnDraw_cFv */
 dDlst_TimerScrnDraw_c::~dDlst_TimerScrnDraw_c() {}
 
-/* 802613DC-8026141C 25BD1C 0040+00 1/1 0/0 0/0 .text            createGetIn__8dTimer_cF4cXyz */
 int dTimer_c::createGetIn(cXyz i_pos) {
     return mp_tm_scrn->createGetIn(i_pos);
 }
 
-/* 803C33E4-803C33F8 -00001 0014+00 1/0 0/0 0/0 .data            l_dTimer_Method */
 static leafdraw_method_class l_dTimer_Method = {
     (process_method_func)dTimer_Create,  (process_method_func)dTimer_Delete,
     (process_method_func)dTimer_Execute, (process_method_func)dTimer_IsDelete,
     (process_method_func)dTimer_Draw,
 };
 
-/* 803C33F8-803C3420 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_TIMER */
 extern msg_process_profile_definition g_profile_TIMER = {
     fpcLy_CURRENT_e,
     12,
diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp
index 1eb4573bcf..bf4150d3ce 100644
--- a/src/d/d_tresure.cpp
+++ b/src/d/d_tresure.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_tresure
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_tresure.h"
@@ -13,34 +8,27 @@
 
 static bool data_80450680 = true;
 
-/* 80450F98-80450F9C 000498 0004+00 2/2 0/0 0/0 .sbss            mTypeGroupData__7dTres_c */
 dTres_c::typeGroupData_c* dTres_c::mTypeGroupData;
 
-/* 8009BBD8-8009BC18 096518 0040+00 0/0 1/1 0/0 .text            createWork__7dTres_cFv */
 int dTres_c::createWork() {
     mTypeGroupData = new dTres_c::typeGroupData_c[0x40];
     return 1;
 }
 
-/* 8009BC18-8009BC60 096558 0048+00 0/0 1/1 0/0 .text            create__7dTres_cFv */
 void dTres_c::create() {
     if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) {
         reset();
     }
 }
 
-/* 8009BC60-8009BC6C 0965A0 000C+00 0/0 1/1 0/0 .text            remove__7dTres_cFv */
 void dTres_c::remove() {
     data_80450680 = true;
 }
 
-/* 80425438-80425508 052158 00CC+04 6/6 3/3 0/0 .bss             mTypeGroupListAll__7dTres_c */
 dTres_c::type_group_list dTres_c::mTypeGroupListAll[17];
 
-/* 80450F9C-80450FA0 00049C 0002+02 2/2 0/0 0/0 .sbss            mNum__7dTres_c */
 u16 dTres_c::mNum;
 
-/* 8009BC6C-8009BCB4 0965AC 0048+00 2/2 0/0 0/0 .text            reset__7dTres_cFv */
 void dTres_c::reset() {
     if (data_80450680) {
         mNum = 0;
@@ -54,8 +42,6 @@ void dTres_c::reset() {
     }
 }
 
-/* 8009BCB4-8009BE28 0965F4 0174+00 0/0 1/1 0/0 .text addData__7dTres_cFPQ27dTres_c10list_classSc
- */
 void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) {
     if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) != ST_BOSS_ROOM) {
         reset();
@@ -93,8 +79,6 @@ void dTres_c::addData(dTres_c::list_class* p_list, s8 roomNo) {
     }
 }
 
-/* 8009BE28-8009C168 096768 0340+00 1/1 0/0 0/0 .text
- * checkTreasureBox__7dTres_cFPQ27dTres_c6data_s                */
 void dTres_c::checkTreasureBox(dTres_c::data_s* param_0) {
     if (param_0->mSwBit != 0xff && param_0->mArg1 != 0xff){
         dPath* path = dPath_GetRoomPath(param_0->mArg1, -1);
@@ -141,7 +125,6 @@ void dTres_c::checkTreasureBox(dTres_c::data_s* param_0) {
     }
 }
 
-/* 8009C168-8009C1F0 096AA8 0088+00 0/0 0/0 3/3 .text            onStatus__7dTres_cFUcii */
 void dTres_c::onStatus(u8 listIdx, int param_1, int flag) {
     typeGroupData_c* groupData = getFirstData(listIdx);
     int typeGroupNo = getTypeGroupNumber(listIdx);
@@ -157,7 +140,6 @@ void dTres_c::onStatus(u8 listIdx, int param_1, int flag) {
     }
 }
 
-/* 8009C1F0-8009C27C 096B30 008C+00 0/0 0/0 3/3 .text            offStatus__7dTres_cFUcii */
 void dTres_c::offStatus(u8 listIdx, int param_1, int flag) {
     typeGroupData_c* groupData = getFirstData(listIdx);
     s32 typeGroupNo = getTypeGroupNumber(listIdx);
@@ -173,7 +155,6 @@ void dTres_c::offStatus(u8 listIdx, int param_1, int flag) {
     }
 }
 
-/* 8009C27C-8009C360 096BBC 00E4+00 0/0 1/1 0/0 .text            getBossIconFloorNo__7dTres_cFPi */
 bool dTres_c::getBossIconFloorNo(int* o_floorNo) {
     bool ret;
 
@@ -199,7 +180,6 @@ bool dTres_c::getBossIconFloorNo(int* o_floorNo) {
     return ret;
 }
 
-/* 8009C360-8009C39C 096CA0 003C+00 4/4 4/4 0/0 .text            getFirstData__7dTres_cFUc */
 dTres_c::typeGroupData_c* dTres_c::getFirstData(u8 listIdx) {
     if (mTypeGroupListAll + listIdx == NULL) {
         return NULL;
@@ -212,8 +192,6 @@ dTres_c::typeGroupData_c* dTres_c::getFirstData(u8 listIdx) {
     return mTypeGroupListAll[listIdx].field_0x0;
 }
 
-/* 8009C39C-8009C3B4 096CDC 0018+00 2/2 3/3 0/0 .text
- * getNextData__7dTres_cFPQ27dTres_c15typeGroupData_c           */
 dTres_c::typeGroupData_c* dTres_c::getNextData(dTres_c::typeGroupData_c* p_data) {
     if (p_data == NULL) {
         return NULL;
@@ -222,8 +200,6 @@ dTres_c::typeGroupData_c* dTres_c::getNextData(dTres_c::typeGroupData_c* p_data)
     return p_data->getNextDataPointer();
 }
 
-/* 8009C3B4-8009C3CC 096CF4 0018+00 0/0 1/1 0/0 .text
- * getNextData__7dTres_cFPCQ27dTres_c15typeGroupData_c          */
 dTres_c::typeGroupData_c* dTres_c::getNextData(dTres_c::typeGroupData_c const* p_data) {
     if (p_data == NULL) {
         return NULL;
@@ -232,8 +208,6 @@ dTres_c::typeGroupData_c* dTres_c::getNextData(dTres_c::typeGroupData_c const* p
     return p_data->getNextDataPointer();
 }
 
-/* 8009C3CC-8009C49C 096D0C 00D0+00 0/0 0/0 14/14 .text            setPosition__7dTres_cFiUcPC3Veci
- */
 void dTres_c::setPosition(int dataNo, u8 listIdx, Vec const* i_pos, int i_roomNo) {
     typeGroupData_c* groupData = getFirstData(listIdx);
 
@@ -255,21 +229,16 @@ void dTres_c::setPosition(int dataNo, u8 listIdx, Vec const* i_pos, int i_roomNo
     }
 }
 
-/* 8037B0D8-8037B100 007738 0022+06 2/2 0/0 0/0 .rodata          typeToTypeGroup__7dTres_c */
 u8 const dTres_c::typeToTypeGroup[17][2] = {
     {0xFF, 0x00}, {0x00, 0x01}, {0x01, 0x02}, {0x02, 0x03}, {0x03, 0x04}, {0x04, 0x05},
     {0x05, 0x06}, {0x06, 0x07}, {0x07, 0x08}, {0x80, 0x09}, {0x81, 0x0A}, {0x82, 0x0B},
     {0x83, 0x0C}, {0x84, 0x0D}, {0x85, 0x0E}, {0x87, 0x0F}, {0x88, 0x10},
 };
 
-/* 8009C49C-8009C4B0 096DDC 0014+00 0/0 1/1 0/0 .text            getTypeGroupNoToType__7dTres_cFUc
- */
 int dTres_c::getTypeGroupNoToType(u8 i_typeGroupNo) {
     return typeToTypeGroup[i_typeGroupNo][0];
 }
 
-/* 8009C4B0-8009C4FC 096DF0 004C+00 1/1 3/3 0/0 .text            getTypeToTypeGroupNo__7dTres_cFUc
- */
 u8 dTres_c::getTypeToTypeGroupNo(u8 i_type) {
     int groupNo = 17;
     for (int i = 0; i < 17; i++) {
diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp
index 4504d0b632..b0d80c85b8 100644
--- a/src/d/d_vibration.cpp
+++ b/src/d/d_vibration.cpp
@@ -16,8 +16,6 @@
 #define FLAG_MOTOR_VIB  0x1
 
 namespace {
-/* 8006F168-8006F184 069AA8 001C+00 1/1 0/0 0/0 .text makedata__25@unnamed@d_vibration_cpp@FPUsUll
- */
 u16* makedata(u16* data, u32 pattern, s32 length) {
     data[0] = length;
     data[1] = pattern >> 16;
@@ -26,15 +24,11 @@ u16* makedata(u16* data, u32 pattern, s32 length) {
     return data;
 }
 
-/* 8006F184-8006F1A4 069AC4 0020+00 1/1 0/0 0/0 .text rollshift__25@unnamed@d_vibration_cpp@FUlll
- */
 s32 rollshift(u32 pattern, s32 length, s32 index) {
     index %= length;
     return (pattern >> index) | (pattern << (length - index));
 }
 
-/* 8006F1A4-8006F1D8 069AE4 0034+00 2/2 0/0 0/0 .text makebits__25@unnamed@d_vibration_cpp@FUlll
- */
 u32 makebits(u32 bits, s32 length, s32 numbits) {
     s32 i;
     u32 mask = bits & (-1 << (32 - length));
@@ -47,7 +41,6 @@ u32 makebits(u32 bits, s32 length, s32 numbits) {
     return bits;
 }
 
-/* 8006F1D8-8006F268 069B18 0090+00 1/1 0/0 0/0 .text randombit__25@unnamed@d_vibration_cpp@Fll */
 u32 randombit(s32 rounds, s32 length) {
     u32 value = 0;
     
@@ -58,7 +51,6 @@ u32 randombit(s32 rounds, s32 length) {
 }
 };
 
-/* 8006F268-8006FA24 069BA8 07BC+00 0/0 2/2 0/0 .text            Run__12dVibration_cFv */
 int dVibration_c::Run() {
     mMode = MODE_RUN;
 
@@ -277,7 +269,6 @@ int dVibration_c::Run() {
     return 1;
 }
 
-/* 8006FA24-8006FB10 06A364 00EC+00 0/0 62/62 298/298 .text StartShock__12dVibration_cFii4cXyz */
 bool dVibration_c::StartShock(int i_vibmode, int i_flags, cXyz i_pos) {
     bool ret = false;
     if (i_flags & FLAG_CAMERA_VIB) {
@@ -304,7 +295,6 @@ bool dVibration_c::StartShock(int i_vibmode, int i_flags, cXyz i_pos) {
     return ret;
 }
 
-/* 8006FB10-8006FC0C 06A450 00FC+00 0/0 8/8 67/67 .text StartQuake__12dVibration_cFii4cXyz */
 bool dVibration_c::StartQuake(int i_vibmode, int i_flags, cXyz i_pos) {
     bool ret = false;
     if (i_flags & FLAG_CAMERA_VIB) {
@@ -330,7 +320,6 @@ bool dVibration_c::StartQuake(int i_vibmode, int i_flags, cXyz i_pos) {
     return ret;
 }
 
-/* 8006FC0C-8006FD94 06A54C 0188+00 0/0 2/2 2/2 .text StartQuake__12dVibration_cFPCUcii4cXyz */
 bool dVibration_c::StartQuake(const u8* i_pattern, int i_rounds, int i_flags, cXyz i_pos) {
     bool ret = false;
 
@@ -363,7 +352,6 @@ bool dVibration_c::StartQuake(const u8* i_pattern, int i_rounds, int i_flags, cX
     return ret;
 }
 
-/* 8006FD94-8006FE00 06A6D4 006C+00 0/0 6/6 82/82 .text            StopQuake__12dVibration_cFi */
 int dVibration_c::StopQuake(int i_flags) {
     int ret = FALSE;
     if (i_flags & FLAG_CAMERA_VIB) {
@@ -384,19 +372,16 @@ int dVibration_c::StopQuake(int i_flags) {
     return ret;
 }
 
-/* 8006FE00-8006FE5C 06A740 005C+00 2/2 0/0 0/0 .text            Kill__12dVibration_cFv */
 void dVibration_c::Kill() {
     mDoCPd_c::stopMotorWaveHard(PAD_1);
     mDoCPd_c::stopMotorHard(PAD_1);
     setDefault();
 }   
 
-/* 8006FE5C-8006FE84 06A79C 0028+00 0/0 0/0 10/10 .text            CheckQuake__12dVibration_cFv */
 bool dVibration_c::CheckQuake() {
     return mCamera.mQuake.mVibMode != VIBMODE_Q_NONE || mMotor.mQuake.mVibMode != VIBMODE_Q_NONE;
 }
 
-/* 8006FE84-8006FF04 06A7C4 0080+00 2/2 0/0 0/0 .text            setDefault__12dVibration_cFv */
 void dVibration_c::setDefault() {
     mMotor.mShock.mVibMode = VIBMODE_S_NONE;
     mCamera.mShock.mVibMode = VIBMODE_S_NONE;
@@ -428,13 +413,11 @@ void dVibration_c::setDefault() {
     mFrame = 0;
 }
 
-/* 8006FF04-8006FF38 06A844 0034+00 0/0 2/2 0/0 .text            Init__12dVibration_cFv */
 void dVibration_c::Init() {
     Kill();
     setDefault();
 }
 
-/* 8006FF38-8006FFF8 06A878 00C0+00 0/0 1/1 0/0 .text            Pause__12dVibration_cFv */
 void dVibration_c::Pause() {
     if (mMode != MODE_PAUSE) {
         if (mMotor.mShock.mVibMode != VIBMODE_S_NONE || mMotor.mQuake.mVibMode != VIBMODE_Q_NONE) {
@@ -458,7 +441,6 @@ void dVibration_c::Pause() {
     }
 }
 
-/* 8006FFF8-80070018 06A938 0020+00 0/0 1/1 0/0 .text            Remove__12dVibration_cFv */
 void dVibration_c::Remove() {
     Kill();
 }
diff --git a/src/dolphin/amcnotstub/amcnotstub.c b/src/dolphin/amcnotstub/amcnotstub.c
index f1a59e7c88..0c38a4aa35 100644
--- a/src/dolphin/amcnotstub/amcnotstub.c
+++ b/src/dolphin/amcnotstub/amcnotstub.c
@@ -1,8 +1,8 @@
 #include <dolphin.h>
 
 // this file is a stub.
-__declspec(weak) int AMC_IsStub(void);
+DECL_WEAK int AMC_IsStub(void);
 
-__declspec(weak) int AMC_IsStub(void) {
+DECL_WEAK int AMC_IsStub(void) {
     return 0;
 }
diff --git a/src/dolphin/dsp/__dsp.h b/src/dolphin/dsp/__dsp.h
index 0e56af8ab8..1abf71b838 100644
--- a/src/dolphin/dsp/__dsp.h
+++ b/src/dolphin/dsp/__dsp.h
@@ -12,7 +12,7 @@ extern DSPTaskInfo* __DSP_last_task;
 extern DSPTaskInfo* __DSP_curr_task;
 extern DSPTaskInfo* __DSP_tmp_task;
 
-__declspec(weak) void __DSPHandler(__OSInterrupt, OSContext*);
+DECL_WEAK void __DSPHandler(__OSInterrupt, OSContext*);
 void __DSP_exec_task(DSPTaskInfo*, DSPTaskInfo*);
 void __DSP_boot_task(DSPTaskInfo*);
 void __DSP_insert_task(DSPTaskInfo*);
diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c
index 02fba28223..681952d13f 100644
--- a/src/dolphin/gx/GXInit.c
+++ b/src/dolphin/gx/GXInit.c
@@ -43,7 +43,7 @@ void* __piReg;
 GXBool __GXinBegin;
 #endif
 
-static u16 DefaultTexData[] __attribute__((aligned(32))) = {
+static u16 DefaultTexData[] ATTRIBUTE_ALIGN(32) = {
     0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
     0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF,
 };
diff --git a/src/dolphin/odemustubs/odemustubs.c b/src/dolphin/odemustubs/odemustubs.c
index ddc413833f..ed3c2bbb1c 100644
--- a/src/dolphin/odemustubs/odemustubs.c
+++ b/src/dolphin/odemustubs/odemustubs.c
@@ -1,7 +1,7 @@
 #include <dolphin.h>
 
 // prototypes
-__declspec(weak) int Hu_IsStub();
+DECL_WEAK int Hu_IsStub();
 void DBInitInterrupts();
 s32 DBQueryData();
 u32 DBRead();
@@ -9,7 +9,7 @@ u32 DBWrite();
 void DBOpen();
 void DBClose();
 
-__declspec(weak) int Hu_IsStub() {
+DECL_WEAK int Hu_IsStub() {
     return 1;
 }
 
diff --git a/src/dolphin/odenotstub/odenotstub.c b/src/dolphin/odenotstub/odenotstub.c
index fd35d7ad32..987b74e9c7 100644
--- a/src/dolphin/odenotstub/odenotstub.c
+++ b/src/dolphin/odenotstub/odenotstub.c
@@ -1,8 +1,8 @@
 #include <dolphin.h>
 
 // prototypes
-__declspec(weak) int Hu_IsStub();
+DECL_WEAK int Hu_IsStub();
 
-__declspec(weak) int Hu_IsStub() {
+DECL_WEAK int Hu_IsStub() {
     return 0;
 }
diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c
index dcf25a36d1..e4f2362c90 100644
--- a/src/dolphin/os/OSThread.c
+++ b/src/dolphin/os/OSThread.c
@@ -874,7 +874,6 @@ void* OSGetThreadSpecific(s32 index) {
     return NULL;
 }
 
-/* 804516D0-804516D8 000BD0 0008+00 0/0 2/1 0/0 .sbss            None */
 #include "global.h"
 extern u8 Debug_BBA_804516D0;
-u8 Debug_BBA_804516D0 ALIGN_DECL(8);
+u8 Debug_BBA_804516D0 ATTRIBUTE_ALIGN(8);
diff --git a/src/dolphin/os/__os.h b/src/dolphin/os/__os.h
index 452dd20c80..3ba03f3e8d 100644
--- a/src/dolphin/os/__os.h
+++ b/src/dolphin/os/__os.h
@@ -108,7 +108,7 @@ void __init_user(void);
 void _ExitProcess(void);
 
 // start
-__declspec(weak) void InitMetroTRK_BBA();
+DECL_WEAK void InitMetroTRK_BBA();
 
 __declspec(section ".init") void __start(void);
 
diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c
index 1a90be2a73..3e4d27b501 100644
--- a/src/dolphin/os/__ppc_eabi_init.c
+++ b/src/dolphin/os/__ppc_eabi_init.c
@@ -69,12 +69,12 @@ static void __fini_cpp(void) {
     }
 }
 
-__declspec(weak)
+DECL_WEAK
 void abort(void) {
     _ExitProcess();
 }
 
-__declspec(weak)
+DECL_WEAK
 void exit(int status) {
     __fini_cpp();
     _ExitProcess();
diff --git a/src/dolphin/os/__ppc_eabi_init.cpp b/src/dolphin/os/__ppc_eabi_init.cpp
index a9008920b7..7ca9e181d9 100644
--- a/src/dolphin/os/__ppc_eabi_init.cpp
+++ b/src/dolphin/os/__ppc_eabi_init.cpp
@@ -2,34 +2,23 @@
 // __ppc_eabi_init
 //
 
-#include "dol2asm.h"
 #include "dolphin/base/PPCArch.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-//
-// Forward References:
-//
-
 void __init_user();
 void __init_cpp();
 void _ExitProcess();
 
-//
-// External References:
-//
-
 typedef void (*voidfunctionptr)(); // pointer to function returning void
 extern voidfunctionptr _ctors[];
 
-/* 80342B78-80342B98 33D4B8 0020+00 0/0 1/1 0/0 .text            __init_user */
 void __init_user(void) {
     __init_cpp();
 }
 
-/* 80342B98-80342BEC 33D4D8 0054+00 1/1 0/0 0/0 .text            __init_cpp */
 #pragma peephole off
 void __init_cpp(void) {
     /**
@@ -42,7 +31,6 @@ void __init_cpp(void) {
 }
 #pragma peephole reset
 
-/* 80342BEC-80342C0C 33D52C 0020+00 0/0 2/2 0/0 .text            _ExitProcess */
 void _ExitProcess(void) {
     PPCHalt();
 }
diff --git a/src/dolphin/os/__start.c b/src/dolphin/os/__start.c
index 479c3a4840..c9172e44f5 100644
--- a/src/dolphin/os/__start.c
+++ b/src/dolphin/os/__start.c
@@ -1,4 +1,3 @@
-#include "dol2asm.h"
 #include <dolphin.h>
 #include "__ppc_eabi_linker.h"
 
@@ -9,36 +8,32 @@ extern void __init_user(void);
 extern void InitMetroTRK_BBA(void);
 extern void DBInit();
 
-SECTION_INIT extern void __check_pad3(void);
-SECTION_INIT extern void __set_debug_bba(void);
-SECTION_INIT extern u8 __get_debug_bba(void);
-SECTION_INIT extern void __start(void);
-SECTION_INIT extern void __init_registers(void);
-SECTION_INIT extern void __init_data(void);
-SECTION_INIT extern void __init_hardware(void);
-SECTION_INIT extern void __flush_cache(void* addr, u32 size);
+__declspec(section ".init") extern void __check_pad3(void);
+__declspec(section ".init") extern void __set_debug_bba(void);
+__declspec(section ".init") extern u8 __get_debug_bba(void);
+__declspec(section ".init") extern void __start(void);
+__declspec(section ".init") extern void __init_registers(void);
+__declspec(section ".init") extern void __init_data(void);
+__declspec(section ".init") extern void __init_hardware(void);
+__declspec(section ".init") extern void __flush_cache(void* addr, u32 size);
 
 extern u8 Debug_BBA_804516D0;
 
-/* 80003100-80003140 000000 0040+00 1/1 0/0 0/0 .init            __check_pad3 */
-SECTION_INIT void __check_pad3(void) {
+__declspec(section ".init") void __check_pad3(void) {
     if ((*(u16*)0x800030E4 & 0xEEF) == 0xEEF) {
         OSResetSystem(0, 0, 0);
     }
 }
 
-/* 80003140-8000314C 000040 000C+00 1/1 0/0 0/0 .init            __set_debug_bba */
 void __set_debug_bba(void) {
     Debug_BBA_804516D0 = 1;
 }
 
-/* 8000314C-80003154 -00001 0008+00 0/0 0/0 0/0 .init            __get_debug_bba */
-SECTION_INIT u8 __get_debug_bba(void) {
+__declspec(section ".init") u8 __get_debug_bba(void) {
     return Debug_BBA_804516D0;
 }
 
-/* 80003154-800032B0 000054 015C+00 0/0 1/0 0/0 .init            __start */
-SECTION_INIT asm void __start(void) {
+__declspec(section ".init") asm void __start(void) {
     // clang-format off
     nofralloc
 
@@ -152,8 +147,7 @@ lbl_8000329C:
     // clang-format on
 }
 
-/* 800032B0-80003340 0001B0 0090+00 1/1 0/0 0/0 .init            __init_registers */
-SECTION_INIT asm void __init_registers(void) {
+__declspec(section ".init") asm void __init_registers(void) {
     // clang-format off
     nofralloc
 
@@ -211,8 +205,7 @@ inline static void __init_bss_section(void* dst, u32 size)
     }
 }
 
-/* 80003340-80003400 000240 00C0+00 1/1 0/0 1/1 .init            __init_data */
-SECTION_INIT void __init_data() {
+__declspec(section ".init") void __init_data() {
     __rom_copy_info* dci;
     __bss_init_info* bii;
 
@@ -233,8 +226,7 @@ SECTION_INIT void __init_data() {
     }
 }
 
-/* 80003400-80003424 000300 0024+00 1/1 0/0 0/0 .init            __init_hardware */
-SECTION_INIT asm void __init_hardware() {
+__declspec(section ".init") asm void __init_hardware() {
     // clang-format off
     nofralloc
 
@@ -250,8 +242,7 @@ SECTION_INIT asm void __init_hardware() {
     // clang-format on
 }
 
-/* 80003424-80003458 000324 0034+00 1/1 0/0 0/0 .init            __flush_cache */
-SECTION_INIT asm void __flush_cache() {
+__declspec(section ".init") asm void __flush_cache() {
     // clang-format off
     nofralloc
 
diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c
index 7ad66a7dd8..08442222a1 100644
--- a/src/dolphin/perf/perf.c
+++ b/src/dolphin/perf/perf.c
@@ -42,7 +42,7 @@ void PERFSetEventColor(u8 id, GXColor color);
 void PERFStartFrame(void);
 void PERFEndFrame(void);
 void PERFEventStart(u8 id);
-__declspec(weak) s32 PERFGetNewSample(void);
+DECL_WEAK s32 PERFGetNewSample(void);
 void PERFEventEnd(u8 id);
 static void PERFStartAutoSample(void);
 static void PERFEndAutoSample(void);
@@ -331,7 +331,7 @@ void PERFEventStart(u8 id) {
 }
 
 #if DEBUG
-__declspec(weak) s32 PERFGetNewSample(void) {
+DECL_WEAK s32 PERFGetNewSample(void) {
     if (PERFCurrSample >= (PERFNumSamples - 1)) {
         PERFCurrSample = PERFNumSamples - 1;
         return PERFCurrSample;
diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c
index 036e9182b3..621d1815e2 100644
--- a/src/dolphin/perf/perfdraw.c
+++ b/src/dolphin/perf/perfdraw.c
@@ -4,8 +4,8 @@
 
 #include "__perf.h"
 
-__declspec(weak) f32 HEIGHT(u32 a, f32 f);
-__declspec(weak) f32 COORD(u32 a);
+DECL_WEAK f32 HEIGHT(u32 a, f32 f);
+DECL_WEAK f32 COORD(u32 a);
 
 // internal macro for Perfdraw.
 #define DRAW_RECT(x1, x2, y1, y2, color)       \
@@ -299,11 +299,11 @@ static void DrawBWBar(PerfSample* s) {
 }
 
 #if DEBUG
-__declspec(weak) f32 HEIGHT(u32 a, f32 f) {
+DECL_WEAK f32 HEIGHT(u32 a, f32 f) {
     return 140.0f * ((f32) a / ((f32) MaxBusTransactions * f));
 }
 
-__declspec(weak) f32 COORD(u32 a) {
+DECL_WEAK f32 COORD(u32 a) {
     return 616.0f * ((f32) a / (f32) DrawFrameMax);
 }
 #endif
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index cfe339885c..5fae08c7fc 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -199,24 +199,18 @@ void fopac_HIO_c::genMessage(JORMContext* mctx) {
 }
 #endif
 
-/* 80018B64-80018BD0 0134A4 006C+00 0/0 7/7 562/562 .text            __ct__10fopAc_ac_cFv */
 fopAc_ac_c::fopAc_ac_c() {}
 
-/* 80018C8C-80018CE0 0135CC 0054+00 0/0 5/5 270/270 .text            __dt__10fopAc_ac_cFv */
 fopAc_ac_c::~fopAc_ac_c() {}
 
-/* 80450CB8-80450CBC 0001B8 0004+00 2/2 0/0 0/0 .sbss            g_fopAc_type */
 int g_fopAc_type;
 
-/* 80018CE0-80018D0C 013620 002C+00 0/0 12/12 391/391 .text            fopAc_IsActor__FPv */
 BOOL fopAc_IsActor(void* i_actor) {
     return fpcM_IsJustType(g_fopAc_type, ((fopAc_ac_c*)i_actor)->actor_type);
 }
 
-/* 80450CBC-80450CC0 0001BC 0004+00 2/2 1/1 0/0 .sbss            stopStatus__10fopAc_ac_c */
 u32 fopAc_ac_c::stopStatus;
 
-/* 80018D0C-80018DD8 01364C 00CC+00 1/0 0/0 0/0 .text            fopAc_Draw__FPv */
 static int fopAc_Draw(void* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int ret = 1;
@@ -287,7 +281,6 @@ static int fopAc_Draw(void* i_this) {
     return ret;
 }
 
-/* 80018DD8-80018F78 013718 01A0+00 1/0 0/0 0/0 .text            fopAc_Execute__FPv */
 static int fopAc_Execute(void* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int ret = 1;
@@ -383,7 +376,6 @@ static int fopAc_Execute(void* i_this) {
     return ret;
 }
 
-/* 80018F78-80018FCC 0138B8 0054+00 1/0 0/0 0/0 .text            fopAc_IsDelete__FPv */
 static int fopAc_IsDelete(void* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int ret;
@@ -406,7 +398,6 @@ static int fopAc_IsDelete(void* i_this) {
     return ret;
 }
 
-/* 80018FCC-8001904C 01390C 0080+00 1/0 0/0 0/0 .text            fopAc_Delete__FPv */
 static int fopAc_Delete(void* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int ret;
@@ -444,7 +435,6 @@ static int fopAc_Delete(void* i_this) {
     return ret;
 }
 
-/* 8001904C-800193FC 01398C 03B0+00 1/0 0/0 0/0 .text            fopAc_Create__FPv */
 static int fopAc_Create(void* i_this) {
     fopAc_ac_c* actor = (fopAc_ac_c*)i_this;
     int ret;
@@ -564,7 +554,6 @@ static int fopAc_Create(void* i_this) {
     return ret;
 }
 
-/* 80019404-800194FC 013D44 00F8+00 0/0 0/0 2/2 .text            initBallModel__13fopEn_enemy_cFv */
 BOOL fopEn_enemy_c::initBallModel() {
     mBallModel = mDoExt_J3DModel__create((J3DModelData*)dComIfG_getObjectRes("Alink", daAlink_c::getBallModelIdx()), 0x80000, 0x11000284);
 
@@ -582,13 +571,10 @@ BOOL fopEn_enemy_c::initBallModel() {
 
     return true;
 }
-/* 800194FC-80019520 013E3C 0024+00 2/2 0/0 2/2 .text checkBallModelDraw__13fopEn_enemy_cFv */
 bool fopEn_enemy_c::checkBallModelDraw() {
     return (mFlags & fopEn_flag_Down) && !(mFlags & (fopEn_flag_WolfDownPullEnd | fopEn_flag_WolfDownPull | fopEn_flag_CutDownHit));
 }
 
-/* 80019520-800196A0 013E60 0180+00 0/0 0/0 2/2 .text
- * setBallModelEffect__13fopEn_enemy_cFP12dKy_tevstr_c          */
 void fopEn_enemy_c::setBallModelEffect(dKy_tevstr_c* i_tevstr) {
     if (mBallModel) {
         mAnmFrame += 1.0f;
@@ -608,8 +594,6 @@ void fopEn_enemy_c::setBallModelEffect(dKy_tevstr_c* i_tevstr) {
     }
 }
 
-/* 800196A0-800197BC 013FE0 011C+00 0/0 0/0 2/2 .text
- * drawBallModel__13fopEn_enemy_cFP12dKy_tevstr_c               */
 void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) {
     f32 scale_target;
 
@@ -644,15 +628,12 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) {
     }
 }
 
-/* 803A35B0-803A35D0 -00001 0020+00 0/0 3/0 756/0 .data            g_fopAc_Method */
 extern actor_method_class g_fopAc_Method = {
     (process_method_func)fopAc_Create,  (process_method_func)fopAc_Delete,
     (process_method_func)fopAc_Execute, (process_method_func)fopAc_IsDelete,
     (process_method_func)fopAc_Draw,
 };
 
-/* 80450CC0-80450CC8 0001C0 0004+04 0/0 9/9 0/0 .sbss
- * sInstance__35JASGlobalInstance<14JAUSectionHeap>             */
 class JAUSectionHeap;
 template<>
 JAUSectionHeap* JASGlobalInstance<JAUSectionHeap>::sInstance;
diff --git a/src/f_op/f_op_actor_iter.cpp b/src/f_op/f_op_actor_iter.cpp
index bf31c4e6e6..6c9d012456 100644
--- a/src/f_op/f_op_actor_iter.cpp
+++ b/src/f_op/f_op_actor_iter.cpp
@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_tag_iter.h"
 #include "f_op/f_op_actor_tag.h"
 
-/* 800197BC-800197F8 0140FC 003C+00 0/0 5/5 3/3 .text            fopAcIt_Executor__FPFPvPv_iPv */
 int fopAcIt_Executor(fopAcIt_ExecutorFunc i_execFunc, void* i_data) {
     struct {
         fopAcIt_ExecutorFunc func;
@@ -20,8 +19,6 @@ int fopAcIt_Executor(fopAcIt_ExecutorFunc i_execFunc, void* i_data) {
     return cLsIt_Method(&g_fopAcTg_Queue, (cNdIt_MethodFunc)cTgIt_MethodCall, &userData);
 }
 
-/* 800197F8-80019834 014138 003C+00 0/0 67/67 388/388 .text            fopAcIt_Judge__FPFPvPv_PvPv
- */
 void* fopAcIt_Judge(fopAcIt_JudgeFunc i_judgeFunc, void* i_data) {
     struct {
         fopAcIt_JudgeFunc func;
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index 11af19bbcb..eb5aac665b 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -33,7 +33,7 @@ extern u8 HeapDummyCreate;
 
 class l_HIO : public JORReflexible {
 public:
-    /* 8001E098 */ ~l_HIO() {
+    ~l_HIO() {
         #if DEBUG
         erase();
         #endif
@@ -99,13 +99,11 @@ void l_HIO::listenPropertyEvent(const JORPropertyEvent* property) {
 }
 #endif
 
-/* 800198A4-800198C4 0141E4 0020+00 0/0 1/1 0/0 .text            fopAcM_FastCreate__FsPFPv_iPvPv */
 fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData,
                               void* i_append) {
     return (fopAc_ac_c*)fpcM_FastCreate(i_procName, i_createFunc, i_createData, i_append);
 }
 
-/* 800198C4-80019934 014204 0070+00 1/1 5/5 18/18 .text            fopAcM_setStageLayer__FPv */
 void fopAcM_setStageLayer(void* i_proc) {
     scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
     JUT_ASSERT(0, stageProc != NULL);
@@ -113,7 +111,6 @@ void fopAcM_setStageLayer(void* i_proc) {
     fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(stageProc));
 }
 
-/* 80019934-800199BC 014274 0088+00 1/1 0/0 2/2 .text            fopAcM_setRoomLayer__FPvi */
 void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) {
     if (i_roomNo >= 0) {
         scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(i_roomNo));
@@ -123,7 +120,6 @@ void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) {
     }
 }
 
-/* 800199BC-80019A2C 0142FC 0070+00 0/0 4/4 114/114 .text fopAcM_SearchByID__FUiPP10fopAc_ac_c */
 s32 fopAcM_SearchByID(fpc_ProcID i_actorID, fopAc_ac_c** i_outActor) {
     if (fpcM_IsCreating(i_actorID)) {
         *i_outActor = NULL;
@@ -136,7 +132,6 @@ s32 fopAcM_SearchByID(fpc_ProcID i_actorID, fopAc_ac_c** i_outActor) {
     return 1;
 }
 
-/* 80019A2C-80019AA8 01436C 007C+00 0/0 0/0 28/28 .text fopAcM_SearchByName__FsPP10fopAc_ac_c */
 s32 fopAcM_SearchByName(s16 i_procName, fopAc_ac_c** i_outActor) {
     *i_outActor = (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeForPName, &i_procName);
     if (*i_outActor == NULL) {
@@ -149,7 +144,6 @@ s32 fopAcM_SearchByName(s16 i_procName, fopAc_ac_c** i_outActor) {
     }
 }
 
-/* 80019AA8-80019B1C 0143E8 0074+00 1/1 7/7 0/0 .text            fopAcM_CreateAppend__Fv */
 fopAcM_prm_class* fopAcM_CreateAppend() {
     fopAcM_prm_class* append = (fopAcM_prm_class*)cMl::memalignB(-4, sizeof(fopAcM_prm_class));
     if (append != NULL) {
@@ -165,8 +159,6 @@ fopAcM_prm_class* fopAcM_CreateAppend() {
     return append;
 }
 
-/* 80019B1C-80019C78 01445C 015C+00 4/4 0/0 0/0 .text
- * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi               */
 fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
                                const csXyz* i_angle, const cXyz* i_scale, s8 i_argument,
                                fpc_ProcID i_parentId) {
@@ -208,18 +200,14 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos,
     return append;
 }
 
-/* 80019C78-80019C7C 0145B8 0004+00 3/3 0/0 0/0 .text            fopAcM_Log__FPC10fopAc_ac_cPCc */
 void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) {}
 
-/* 80019C7C-80019CB8 0145BC 003C+00 0/0 10/10 483/483 .text            fopAcM_delete__FP10fopAc_ac_c
- */
 s32 fopAcM_delete(fopAc_ac_c* i_actor) {
     // "Deleting Actor"
     fopAcM_Log(i_actor, "アクターの削除");
     return fpcM_Delete(i_actor);
 }
 
-/* 80019CB8-80019D18 0145F8 0060+00 0/0 3/3 12/12 .text            fopAcM_delete__FUi */
 s32 fopAcM_delete(fpc_ProcID i_actorID) {
     void* actor = fopAcM_SearchByID(i_actorID);
 
@@ -232,8 +220,6 @@ s32 fopAcM_delete(fpc_ProcID i_actorID) {
     }
 }
 
-/* 80019D18-80019D98 014658 0080+00 2/2 0/0 0/0 .text
- * fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i         */
 fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cXyz* i_pos,
                          int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, s8 i_argument,
                          createFunc i_createFunc) {
@@ -246,16 +232,12 @@ fpc_ProcID fopAcM_create(s16 i_procName, u16 i_setId, u32 i_parameters, const cX
     return fpcM_Create(i_procName, i_createFunc, append);
 }
 
-/* 80019D98-80019E04 0146D8 006C+00 3/3 11/11 70/70 .text
- * fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc                 */
 fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
                          const csXyz* i_angle, const cXyz* i_scale, s8 i_argument) {
     return fopAcM_create(i_procName, 0xFFFF, i_parameters, i_pos, i_roomNo, i_angle, i_scale,
                          i_argument, NULL);
 }
 
-/* 80019E04-80019E6C 014744 0068+00 5/5 6/6 18/18 .text
- * fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv     */
 fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_pos, int i_roomNo,
                               const csXyz* i_angle, const cXyz* i_scale, s8 i_argument,
                               createFunc i_createFunc, void* i_createFuncData) {
@@ -268,8 +250,6 @@ fopAc_ac_c* fopAcM_fastCreate(s16 i_procName, u32 i_parameters, const cXyz* i_po
     return (fopAc_ac_c*)fpcM_FastCreate(i_procName, i_createFunc, i_createFuncData, append);
 }
 
-/* 80019E6C-80019EF0 0147AC 0084+00 0/0 1/1 0/0 .text
- * fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv     */
 fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const cXyz* i_pos,
                               int i_roomNo, const csXyz* i_angle, const cXyz* i_scale,
                               createFunc i_createFunc, void* i_createFuncData) {
@@ -282,8 +262,6 @@ fopAc_ac_c* fopAcM_fastCreate(const char* i_actorname, u32 i_parameters, const c
                              nameInfo->argument, i_createFunc, i_createFuncData);
 }
 
-/* 80019EF0-80019F78 014830 0088+00 0/0 1/1 105/105 .text
- * fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i    */
 fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters,
                               const cXyz* i_pos, int i_roomNo, const csXyz* i_angle,
                               const cXyz* i_scale, s8 i_argument, createFunc i_createFunc) {
@@ -296,8 +274,6 @@ fpc_ProcID fopAcM_createChild(s16 i_procName, fpc_ProcID i_parentID, u32 i_param
     return fpcM_Create(i_procName, i_createFunc, append);
 }
 
-/* 80019F78-8001A138 0148B8 01C0+00 0/0 0/0 6/6 .text
- * fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i */
 fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u32 i_parameters,
                                         const cXyz* i_pos, int i_roomNo, const csXyz* i_angle,
                                         const cXyz* i_scale, s8 i_argument,
@@ -355,8 +331,6 @@ BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) {
     return TRUE;
 }
 
-/* 8001A138-8001A188 014A78 0050+00 0/0 1/1 1/1 .text            fopAcM_DeleteHeap__FP10fopAc_ac_c
- */
 void fopAcM_DeleteHeap(fopAc_ac_c* i_actor) {
     // "Destroying actor's heap"
     fopAcM_Log(i_actor, "アクターのヒープの破壊");
@@ -366,8 +340,6 @@ void fopAcM_DeleteHeap(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8001A188-8001A1E8 014AC8 0060+00 1/1 0/0 0/0 .text
- * fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap */
 s32 fopAcM_callCallback(fopAc_ac_c* i_actor, heapCallbackFunc i_callback, JKRHeap* i_heap) {
     JKRHeap* oldHeap = mDoExt_setCurrentHeap(i_heap);
     s32 ret = i_callback(i_actor);
@@ -375,15 +347,12 @@ s32 fopAcM_callCallback(fopAc_ac_c* i_actor, heapCallbackFunc i_callback, JKRHea
     return ret;
 }
 
-/* 80450CC8-80450CCC -00001 0004+00 2/2 0/0 0/0 .sbss            None */
 u8 fopAcM::HeapAdjustEntry;
 u8 fopAcM::HeapAdjustUnk;
 u8 fopAcM::HeapAdjustVerbose;
 u8 fopAcM::HeapAdjustQuiet;
 u8 fopAcM::HeapDummyCreate;
 
-/* 8001A1E8-8001A4B0 014B28 02C8+00 1/1 0/0 0/0 .text
- * fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl    */
 bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) {
     const char* procNameString = fopAcM_getProcNameString(i_actor);
     JKRSolidHeap* heap00 = NULL;
@@ -500,8 +469,6 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback
     return false;
 }
 
-/* 8001A4B0-8001A528 014DF0 0078+00 0/0 4/4 446/446 .text
- * fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl     */
 bool fopAcM_entrySolidHeap(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) {
     u8 var_r31 = fopAcM::HeapAdjustUnk;
     if (i_size & 0x80000000) {
@@ -521,22 +488,18 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback,
     return result;
 }
 
-/* 8001A528-8001A538 014E68 0010+00 0/0 0/0 136/136 .text fopAcM_SetMin__FP10fopAc_ac_cfff */
 void fopAcM_SetMin(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ) {
     i_actor->cull.box.min.x = i_minX;
     i_actor->cull.box.min.y = i_minY;
     i_actor->cull.box.min.z = i_minZ;
 }
 
-/* 8001A538-8001A548 014E78 0010+00 0/0 0/0 136/136 .text fopAcM_SetMax__FP10fopAc_ac_cfff */
 void fopAcM_SetMax(fopAc_ac_c* i_actor, f32 i_maxX, f32 i_maxY, f32 i_maxZ) {
     i_actor->cull.box.max.x = i_maxX;
     i_actor->cull.box.max.y = i_maxY;
     i_actor->cull.box.max.z = i_maxZ;
 }
 
-/* 8001A548-8001A564 014E88 001C+00 1/1 0/0 260/260 .text
- * fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff                  */
 void fopAcM_setCullSizeBox(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ, f32 i_maxX,
                            f32 i_maxY, f32 i_maxZ) {
     i_actor->cull.box.min.x = i_minX;
@@ -548,8 +511,6 @@ void fopAcM_setCullSizeBox(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_mi
     i_actor->cull.box.max.z = i_maxZ;
 }
 
-/* 8001A564-8001A578 014EA4 0014+00 0/0 0/0 4/4 .text fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff
- */
 void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i_minZ, f32 radius) {
     i_actor->cull.sphere.center.x = i_minX;
     i_actor->cull.sphere.center.y = i_minY;
@@ -557,8 +518,6 @@ void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i
     i_actor->cull.sphere.radius = radius;
 }
 
-/* 8001A578-8001A5DC 014EB8 0064+00 0/0 0/0 123/123 .text
- * fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData        */
 void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData) {
     J3DJoint* jointNode = i_modelData->getJointNodePointer(0);
 
@@ -572,13 +531,10 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData) {
     fopAcM_setCullSizeBox(i_actor, minX, minY, minZ, maxX, maxY, maxZ);
 }
 
-/* 8001A5DC-8001A60C 014F1C 0030+00 0/0 0/0 1/1 .text            fopAcM_addAngleY__FP10fopAc_ac_css
- */
 bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step) {
     return cLib_chaseAngleS(&fopAcM_GetAngle_p(i_actor)->y, i_target, i_step);
 }
 
-/* 8001A60C-8001A660 014F4C 0054+00 1/1 0/0 8/8 .text            fopAcM_calcSpeed__FP10fopAc_ac_c */
 void fopAcM_calcSpeed(fopAc_ac_c* i_actor) {
     f32 speedF = fopAcM_GetSpeedF(i_actor);
     f32 gravity = fopAcM_GetGravity(i_actor);
@@ -594,7 +550,6 @@ void fopAcM_calcSpeed(fopAc_ac_c* i_actor) {
     fopAcM_SetSpeed(i_actor, xSpeed, ySpeed, zSpeed);
 }
 
-/* 8001A660-8001A6CC 014FA0 006C+00 1/1 1/1 17/17 .text fopAcM_posMove__FP10fopAc_ac_cPC4cXyz */
 void fopAcM_posMove(fopAc_ac_c* i_actor, const cXyz* i_movePos) {
     cXyz* pos = fopAcM_GetPosition_p(i_actor);
     cXyz* speed = fopAcM_GetSpeed_p(i_actor);
@@ -609,21 +564,15 @@ void fopAcM_posMove(fopAc_ac_c* i_actor, const cXyz* i_movePos) {
     }
 }
 
-/* 8001A6CC-8001A710 01500C 0044+00 0/0 5/5 137/137 .text fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz
- */
 void fopAcM_posMoveF(fopAc_ac_c* i_actor, const cXyz* i_movePos) {
     fopAcM_calcSpeed(i_actor);
     fopAcM_posMove(i_actor, i_movePos);
 }
 
-/* 8001A710-8001A738 015050 0028+00 1/1 26/26 596/596 .text
- * fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c      */
 s16 fopAcM_searchActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     return cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB));
 }
 
-/* 8001A738-8001A79C 015078 0064+00 0/0 0/0 13/13 .text
- * fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c      */
 s16 fopAcM_searchActorAngleX(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     const cXyz* posA = fopAcM_GetPosition_p(i_actorA);
     const cXyz* posB = fopAcM_GetPosition_p(i_actorB);
@@ -633,46 +582,34 @@ s16 fopAcM_searchActorAngleX(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_act
     return cM_atan2s(posB->y - posA->y, JMAFastSqrt(x_dist * x_dist + z_dist * z_dist));
 }
 
-/* 8001A79C-8001A7E0 0150DC 0044+00 0/0 3/3 15/15 .text
- * fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c        */
 s32 fopAcM_seenActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     s16 target_angle =
         cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB));
     return abs((s16)(target_angle - i_actorA->shape_angle.y));
 }
 
-/* 8001A7E0-8001A914 015120 0134+00 0/0 5/5 188/188 .text
- * fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c    */
 f32 fopAcM_searchActorDistance(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     cXyz dist = (*fopAcM_GetPosition_p(i_actorB) - *fopAcM_GetPosition_p(i_actorA));
     return dist.abs();
 }
 
-/* 8001A914-8001A964 015254 0050+00 0/0 0/0 2/2 .text
- * fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c   */
 f32 fopAcM_searchActorDistance2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     cXyz dist = (*fopAcM_GetPosition_p(i_actorB) - *fopAcM_GetPosition_p(i_actorA));
     return dist.abs2();
 }
 
-/* 8001A964-8001AA94 0152A4 0130+00 0/0 3/3 125/125 .text
- * fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c  */
 f32 fopAcM_searchActorDistanceXZ(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     const cXyz* posA = fopAcM_GetPosition_p(i_actorA);
     const cXyz* posB = fopAcM_GetPosition_p(i_actorB);
     return (*posB - *posA).absXZ();
 }
 
-/* 8001AA94-8001AAE0 0153D4 004C+00 1/1 4/4 30/30 .text
- * fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c */
 f32 fopAcM_searchActorDistanceXZ2(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) {
     const cXyz* posA = fopAcM_GetPosition_p(i_actorA);
     const cXyz* posB = fopAcM_GetPosition_p(i_actorB);
     return (*posB - *posA).abs2XZ();
 }
 
-/* 8001AAE0-8001AC40 015420 0160+00 0/0 0/0 2/2 .text
- * fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif               */
 BOOL fopAcM_rollPlayerCrash(fopAc_ac_c const* i_crashActor, f32 i_range, u32 i_flag, f32 i_max_y,
                             f32 i_min_y, BOOL param_5, f32 param_6) {
     daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
@@ -699,7 +636,6 @@ BOOL fopAcM_rollPlayerCrash(fopAc_ac_c const* i_crashActor, f32 i_range, u32 i_f
     return FALSE;
 }
 
-/* 8001AC40-8001ACEC 015580 00AC+00 0/0 0/0 2/2 .text fopAcM_checkCullingBox__FPA4_fffffff */
 bool fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z2) {
     Vec tmp1 = {x1, y1, z1};
     Vec tmp2 = {x2, y2, z2};
@@ -712,7 +648,6 @@ bool fopAcM_checkCullingBox(Mtx m, f32 x1, f32 y1, f32 z1, f32 x2, f32 y2, f32 z
         return false;
 }
 
-/* 803A35F0-803A3740 000710 0150+00 1/1 0/0 0/0 .data            l_cullSizeBox */
 static cull_box l_cullSizeBox[] = {
     {
         {-40.0f, 0.0f, -40.0f},
@@ -778,7 +713,6 @@ static cull_box l_cullSizeBox[] = {
 #endif
 };
 
-/* 803A3740-803A37C0 000860 0080+00 1/1 0/0 0/0 .data            l_cullSizeSphere */
 static cull_sphere l_cullSizeSphere[] = {
     {
         {0.0f, 0.0f, 0.0f},
@@ -820,7 +754,6 @@ static cull_sphere l_cullSizeSphere[] = {
 #endif
 };
 
-/* 8001ACEC-8001B058 01562C 036C+00 0/0 1/1 1/1 .text fopAcM_cullingCheck__FPC10fopAc_ac_c */
 s32 fopAcM_cullingCheck(fopAc_ac_c const* i_actor) {
     MtxP mtx_p;
     if (fopAcM_GetMtx(i_actor) == NULL) {
@@ -886,13 +819,10 @@ s32 fopAcM_cullingCheck(fopAc_ac_c const* i_actor) {
     }
 }
 
-/* 8001B058-8001B068 015998 0010+00 5/5 0/0 0/0 .text            event_second_actor__FUs */
 void* event_second_actor(u16) {
     return dComIfGp_getPlayer(0);
 }
 
-/* 8001B068-8001B0FC 0159A8 0094+00 0/0 3/3 0/0 .text
- * fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs       */
 s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA)))
@@ -908,8 +838,6 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio
                                 -1);
 }
 
-/* 8001B0FC-8001B19C 015A3C 00A0+00 0/0 1/1 0/0 .text
- * fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs */
 s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB,
                                  u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -925,8 +853,6 @@ s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac
     return dComIfGp_event_order(i_eventType, i_priority, i_flag, 0x14F, i_actorA, i_actorB, -1, -1);
 }
 
-/* 8001B19C-8001B244 015ADC 00A8+00 0/0 3/3 16/16 .text fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs
- */
 s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor)))
@@ -942,8 +868,6 @@ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
                                 i_actor, -1, -1);
 }
 
-/* 8001B244-8001B334 015B84 00F0+00 0/0 2/2 0/0 .text
- * fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs       */
 s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA)))
@@ -966,8 +890,6 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio
                                 toolID);
 }
 
-/* 8001B334-8001B3CC 015C74 0098+00 0/0 1/1 0/0 .text
- * fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs      */
 s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA)))
@@ -982,8 +904,6 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_pri
     return dComIfGp_event_order(dEvt_type_CATCH_e, i_priority, i_flag, -1, i_actorA, i_actorB, -1, -1);
 }
 
-/* 8001B3CC-8001B4E0 015D0C 0114+00 0/0 2/2 6/6 .text
- * fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs              */
 s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 param_2, u16 i_flag,
                            u16 i_priority) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -1010,8 +930,6 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 par
                                 event_second_actor(i_flag), eventIdx, -1);
 }
 
-/* 8001B4E0-8001B5E4 015E20 0104+00 0/0 1/1 2/2 .text
- * fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs */
 s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char const* i_eventName,
                            u16 param_3, u16 i_flag, u16 i_priority) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -1038,8 +956,6 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char cons
                                 eventIdx, -1);
 }
 
-/* 8001B5E4-8001B67C 015F24 0098+00 0/0 2/2 41/41 .text
- * fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs               */
 s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u16 param_3) {
     u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, i_eventID);
     if (eventPrio == 0) {
@@ -1050,8 +966,6 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u1
                                 event_second_actor(i_flag), i_eventID, -1);
 }
 
-/* 8001B67C-8001B7B4 015FBC 0138+00 0/0 10/10 101/101 .text
- * fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs            */
 s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, u16 param_3,
                              u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -1086,8 +1000,6 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID,
                                 event_second_actor(i_flag), i_eventID, i_mapToolID);
 }
 
-/* 8001B7B4-8001B8E0 0160F4 012C+00 1/1 1/1 4/4 .text
- * fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs            */
 s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3,
                              u16 i_flag, u16 param_5) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -1123,15 +1035,11 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16
                                 event_second_actor(i_flag), i_eventID, param_1);
 }
 
-/* 8001B8E0-8001B908 016220 0028+00 0/0 1/1 1/1 .text
- * fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs    */
 s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3,
                                      u16 i_flag, u16 param_5) {
     return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, i_flag | 0x100, param_5);
 }
 
-/* 8001B908-8001B9D0 016248 00C8+00 0/0 0/0 106/106 .text
- * fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs             */
 s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor)))
@@ -1147,8 +1055,6 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16
                                 event_second_actor(i_flag), -1, -1);
 }
 
-/* 8001B9D0-8001BA7C 016310 00AC+00 0/0 3/3 12/12 .text fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs
- */
 s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
         (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor)))
@@ -1164,8 +1070,6 @@ s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) {
                                 i_actor, -1, -1);
 }
 
-/* 8001BA7C-8001BB14 0163BC 0098+00 0/0 1/1 0/0 .text
- * fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs   */
 s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority,
                               u16 i_flag) {
     if (!dComIfGp_getEvent().isOrderOK() &&
@@ -1182,19 +1086,14 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_
                                 -1);
 }
 
-/* 8001BB14-8001BB44 016454 0030+00 0/0 11/11 10/10 .text
- * fopAcM_getTalkEventPartner__FPC10fopAc_ac_c                  */
 fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const*) {
     return (fopAc_ac_c*)dComIfGp_event_getTalkPartner();
 }
 
-/* 8001BB44-8001BB74 016484 0030+00 0/0 5/5 0/0 .text fopAcM_getItemEventPartner__FPC10fopAc_ac_c
- */
 fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) {
     return (fopAc_ac_c*)dComIfGp_event_getItemPartner();
 }
 
-/* 8001BB74-8001BBE8 0164B4 0074+00 0/0 1/1 0/0 .text fopAcM_getEventPartner__FPC10fopAc_ac_c */
 fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* i_actor) {
     if (dComIfGp_event_getPt1() != i_actor) {
         return (fopAc_ac_c*)dComIfGp_event_getPt1();
@@ -1203,8 +1102,6 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* i_actor) {
     return (fopAc_ac_c*)dComIfGp_event_getPt2();
 }
 
-/* 8001BBE8-8001BC74 016528 008C+00 0/0 5/5 43/43 .text
- * fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz */
 fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 param_2,
                                            int i_itemBitNo, int i_roomNo, csXyz const* i_angle,
                                            cXyz const* i_scale) {
@@ -1217,8 +1114,6 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p
     return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, param_2);
 }
 
-/* 8001BC74-8001BCFC 0165B4 0088+00 0/0 2/2 10/10 .text
- * fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz    */
 fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_itemBitNo,
                                          int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) {
     dComIfGp_event_setGtItm(i_itemNo);
@@ -1237,7 +1132,6 @@ struct ItemTableList {
     /* 0x10 */ u8 mTables[255][16];
 };
 
-/* 8001BCFC-8001BE14 01663C 0118+00 2/2 0/0 0/0 .text            fopAcM_getItemNoFromTableNo__FUc */
 u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) {
     u8 tableNo = i_tableNo;
     ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable();
@@ -1292,8 +1186,6 @@ struct EnemyTable {
     /* 0x2 */ char mStage[8];
 };
 
-/* 8001BE14-8001BF64 016754 0150+00 0/0 0/0 9/9 .text
- * fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf */
 fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitNo,
                                         int i_roomNo, csXyz const* i_angle, cXyz const* i_scale,
                                         f32* i_speedF, f32* i_speedY) {
@@ -1325,8 +1217,6 @@ fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_i
                                       i_speedF, i_speedY, false);
 }
 
-/* 8001BF64-8001C078 0168A4 0114+00 1/1 0/0 11/11 .text
- * fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb */
 fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_itemBitNo,
                                       int i_roomNo, csXyz const* i_angle, int param_5,
                                       cXyz const* i_scale, f32* i_speedF, f32* i_speedY,
@@ -1370,8 +1260,6 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite
     return fopAcM_GetID(create_actor);
 }
 
-/* 8001C078-8001C0D4 0169B8 005C+00 2/2 0/0 0/0 .text
- * fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc          */
 fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo,
                                  const csXyz* i_angle, int i_roomNo, const cXyz* scale,
                                  u8 param_7) {
@@ -1388,8 +1276,6 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN
                          i_roomNo, i_angle, scale, -1);
 }
 
-/* 8001C0D4-8001C174 016A14 00A0+00 0/0 0/0 18/18 .text
- * fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi       */
 fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo,
                                     const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF,
                                     f32 i_speedY, int param_8) {
@@ -1404,8 +1290,6 @@ fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomN
     return fopAcM_GetID(actor);
 }
 
-/* 8001C174-8001C1B8 016AB4 0044+00 0/0 0/0 2/2 .text
- * fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii     */
 fpc_ProcID fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo,
                                        const csXyz* i_angle, const cXyz* i_scale, int param_6,
                                        int param_7) {
@@ -1413,8 +1297,6 @@ fpc_ProcID fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_ro
     return fopAcM_createItem(i_pos, i_itemNo, param_7, i_roomNo, &angle, i_scale, 0x6);
 }
 
-/* 8001C1B8-8001C1FC 016AF8 0044+00 2/2 0/0 1/1 .text
- * fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff   */
 fopAc_ac_c* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i_roomNo,
                                           const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF,
                                           f32 i_speedY) {
@@ -1422,8 +1304,6 @@ fopAc_ac_c* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i
                                  0x7, NULL);
 }
 
-/* 8001C1FC-8001C240 016B3C 0044+00 0/0 2/2 3/3 .text
- * fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff  */
 fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_roomNo,
                                            const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF,
                                            f32 i_speedY) {
@@ -1431,8 +1311,6 @@ fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int
                                  0x4, NULL);
 }
 
-/* 8001C240-8001C3E0 016B80 01A0+00 1/1 1/1 17/17 .text
- * fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi               */
 fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
                              const csXyz* i_angle, const cXyz* i_scale, int param_7) {
     // clang-format off
@@ -1487,8 +1365,6 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i
     }
 }
 
-/* 8001C3E0-8001C5B0 016D20 01D0+00 1/1 0/0 0/0 .text
- * fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz          */
 fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo,
                                    int param_5, const csXyz* i_angle, const cXyz* i_scale) {
     // clang-format off
@@ -1548,8 +1424,6 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi
     }
 }
 
-/* 8001C5B0-8001C870 016EF0 02C0+00 3/3 0/0 4/4 .text
- * fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i */
 fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo,
                                   const csXyz* i_angle, const cXyz* i_scale, f32* i_speedF,
                                   f32* i_speedY, int i_itemBitNo, int param_9,
@@ -1644,8 +1518,6 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo,
     }
 }
 
-/* 8001C870-8001C95C 0171B0 00EC+00 0/0 0/0 1/1 .text fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii
- */
 fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, int i_itemBit,
                                 int i_roomNo, const cXyz* param_6, int i_itemType, int param_8) {
     csXyz params_ex(0, 0, 0);
@@ -1660,8 +1532,6 @@ fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, in
     return fopAcM_create(PROC_Obj_Carry, i_setId, params, i_pos, i_roomNo, &params_ex, NULL, -1, NULL);
 }
 
-/* 8001C95C-8001C9CC 01729C 0070+00 0/0 0/0 12/12 .text
- * fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc               */
 fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_roomNo, u8 param_4,
                                  u8 param_5, u8 param_6) {
     if (param_6 == 0xFF) {
@@ -1672,7 +1542,6 @@ fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_
     return fopAcM_create(PROC_Obj_BossWarp, actorParams, i_pos, i_roomNo, i_angle, NULL, -1);
 }
 
-/* 8001C9CC-8001CA1C 01730C 0050+00 1/1 0/0 0/0 .text            enemySearchJugge__FPvPv */
 void* enemySearchJugge(void* i_actor, void* i_data) {
     if (i_actor != NULL && fopAc_IsActor(i_actor) && ((fopAc_ac_c*)i_actor)->group == fopAc_ENEMY_e)
     {
@@ -1682,7 +1551,6 @@ void* enemySearchJugge(void* i_actor, void* i_data) {
     }
 }
 
-/* 8001CA1C-8001CAD8 01735C 00BC+00 0/0 0/0 6/6 .text            fopAcM_myRoomSearchEnemy__FSc */
 fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) {
     JUT_ASSERT(0, roomNo >= 0);
 
@@ -1700,8 +1568,6 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) {
     return (fopAc_ac_c*)fpcM_JudgeInLayer(fpcM_LayerID(roomProc), enemySearchJugge, NULL);
 }
 
-/* 8001CAD8-8001CB48 017418 0070+00 0/0 0/0 81/81 .text
- * fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc         */
 fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size,
                                   u8 i_type, u8 i_enemyID) {
     return fopAcM_GetID(fopAcM_fastCreate(
@@ -1709,8 +1575,6 @@ fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos,
         fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, NULL, NULL));
 }
 
-/* 8001CB48-8001CBA0 017488 0058+00 0/0 6/6 7/7 .text            fopAcM_setCarryNow__FP10fopAc_ac_ci
- */
 void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) {
     i_actor->actor_status |= 0x2000;
 
@@ -1720,7 +1584,6 @@ void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) {
     }
 }
 
-/* 8001CBA0-8001CC5C 0174E0 00BC+00 0/0 5/5 21/21 .text fopAcM_cancelCarryNow__FP10fopAc_ac_c */
 void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) {
     if (fopAcM_checkCarryNow(i_actor)) {
         i_actor->actor_status &= ~0x2000;
@@ -1744,8 +1607,6 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) {
     }
 }
 
-/* 8001CC5C-8001CDFC 01759C 01A0+00 0/0 0/0 9/9 .text            fopAcM_otoCheck__FPC10fopAc_ac_cf
- */
 BOOL fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) {
     SND_INFLUENCE* sound = dKy_Sound_get();
 
@@ -1760,8 +1621,6 @@ BOOL fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) {
     return FALSE;
 }
 
-/* 8001CDFC-8001CED0 01773C 00D4+00 0/0 0/0 49/49 .text
- * fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c           */
 BOOL fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) {
     dBgS_LinChk linChk;
     cXyz start;
@@ -1782,7 +1641,6 @@ BOOL fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) {
     return FALSE;
 }
 
-/* 8001CED0-8001CFD8 017810 0108+00 0/0 0/0 18/18 .text fopAcM_wayBgCheck__FPC10fopAc_ac_cff */
 BOOL fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) {
     dBgS_LinChk linChk;
     cXyz offset;
@@ -1809,7 +1667,6 @@ BOOL fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) {
     return FALSE;
 }
 
-/* 8001CFD8-8001D020 017918 0048+00 0/0 0/0 2/2 .text fopAcM_plAngleCheck__FPC10fopAc_ac_cs */
 BOOL fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) {
     s16 angle = i_actor->shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y;
     if (angle <= i_angle && angle >= (s16)-i_angle) {
@@ -1819,7 +1676,6 @@ BOOL fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) {
     return TRUE;
 }
 
-/* 80450CCC-80450CD0 0001CC 0001+03 1/1 0/0 0/0 .sbss            l_hio */
 static l_HIO l_hio;
 
 static fopAcM_lc_c l_actorLC;
@@ -1834,17 +1690,12 @@ void fopAcM_GetRealMax(const fopAc_ac_c*) {
     static cXyz max;
 }
 
-/* 803F1C48-803F1CB8 01E968 0070+00 1/2 4/4 9/9 .bss             mLineCheck__11fopAcM_lc_c */
 dBgS_ObjLinChk fopAcM_lc_c::mLineCheck;
 
-/* 803F1CC4-803F1D18 01E9E4 0054+00 2/3 6/6 26/26 .bss             mGndCheck__11fopAcM_gc_c */
 dBgS_ObjGndChk fopAcM_gc_c::mGndCheck;
 
-/* 80450CD0-80450CD4 0001D0 0004+00 2/2 7/7 103/103 .sbss            mGroundY__11fopAcM_gc_c */
 f32 fopAcM_gc_c::mGroundY;
 
-/* 8001D020-8001D10C 017960 00EC+00 0/0 0/0 96/96 .text
- * fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci */
 void fopAcM_effSmokeSet1(u32* param_0, u32* param_1, cXyz const* param_2, csXyz const* param_3,
                          f32 param_4, dKy_tevstr_c const* param_5, int param_6) {
     cXyz p2(param_2->x, param_2->y + 100.0f, param_2->z);
@@ -1857,8 +1708,6 @@ void fopAcM_effSmokeSet1(u32* param_0, u32* param_1, cXyz const* param_2, csXyz
     }
 }
 
-/* 8001D10C-8001D1F4 017A4C 00E8+00 0/0 1/1 41/41 .text            fopAcM_effHamonSet__FPUlPC4cXyzff
- */
 void fopAcM_effHamonSet(u32* param_0, cXyz const* param_1, f32 param_2, f32 emitRate) {
     cXyz tmp(param_2, param_2, param_2);
     static u16 const hamon_name[2] = {0x01B2, 0x01B3};
@@ -1874,12 +1723,10 @@ void fopAcM_effHamonSet(u32* param_0, cXyz const* param_1, f32 param_2, f32 emit
     }
 }
 
-/* 8001D1F4-8001D1FC 017B34 0008+00 0/0 0/0 7/7 .text            fopAcM_riverStream__FP4cXyzPsPff */
 s32 fopAcM_riverStream(cXyz* param_0, s16* param_1, f32* param_2, f32 param_3) {
     return 0;
 }
 
-/* 8001D1FC-8001D32C 017B3C 0130+00 0/0 0/0 12/12 .text fopAcM_carryOffRevise__FP10fopAc_ac_c */
 s32 fopAcM_carryOffRevise(fopAc_ac_c* param_0) {
     fopAc_ac_c* player = dComIfGp_getPlayer(0);
     dBgS_LinChk linChk;
@@ -1911,8 +1758,6 @@ s32 fopAcM_carryOffRevise(fopAc_ac_c* param_0) {
     return 0;
 }
 
-/* 8001D32C-8001D3D4 017C6C 00A8+00 1/1 0/0 0/0 .text            vectle_calc__FPC10DOUBLE_POSP4cXyz
- */
 static void vectle_calc(const DOUBLE_POS* pDpos, cXyz* pOut) {
     f64 len = sqrt(pDpos->x * pDpos->x + pDpos->y * pDpos->y + pDpos->z * pDpos->z);
     if (len != 0.0) {
@@ -1926,7 +1771,6 @@ static void vectle_calc(const DOUBLE_POS* pDpos, cXyz* pOut) {
     }
 }
 
-/* 8001D3D4-8001D42C 017D14 0058+00 1/1 0/0 0/0 .text get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz */
 static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) {
     DOUBLE_POS dPos;
     dPos.x = pXyzB->x - pXyzA->x;
@@ -1935,8 +1779,6 @@ static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) {
     vectle_calc(&dPos, pOut);
 }
 
-/* 8001D42C-8001D5A4 017D6C 0178+00 0/0 3/3 40/40 .text
- * fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData         */
 void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) {
     const cXyz* pEyePos = &i_actor->eyePos;
     camera_class* camera = dCam_getCamera();
@@ -1977,14 +1819,12 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat
     }
 }
 
-/* 8001D5A4-8001D5EC 017EE4 0048+00 1/1 0/0 0/0 .text fopAcM_getProcNameString__FPC10fopAc_ac_c */
 const char* fopAcM_getProcNameString(const fopAc_ac_c* i_actor) {
     s16 prof_name = fopAcM_GetProfName(i_actor);
     const char* name = dStage_getName2(prof_name, i_actor->argument);
     return name != NULL ? name : "UNKOWN";
 }
 
-/* 8001D5EC-8001D698 017F2C 00AC+00 1/1 0/0 0/0 .text fopAcM_findObjectCB__FPC10fopAc_ac_cPv */
 static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_data) {
     fopAcM_search_prm* prm = (fopAcM_search_prm*)i_data;
 
@@ -2001,7 +1841,6 @@ static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_
     return NULL;
 }
 
-/* 8001D698-8001D6F0 017FD8 0058+00 0/0 1/1 1/1 .text            fopAcM_searchFromName__FPCcUlUl */
 fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1) {
     fopAcM_search_prm prm;
     prm.prm0 = param0;
@@ -2017,8 +1856,6 @@ fopAc_ac_c* fopAcM_searchFromName(char const* name, u32 param0, u32 param1) {
     return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObjectCB, &prm);
 }
 
-/* 8001D6F0-8001D7A0 018030 00B0+00 1/1 0/0 0/0 .text fopAcM_findObject4EventCB__FP10fopAc_ac_cPv
- */
 fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) {
     if (i_data == NULL || !fopAcM_IsExecuting(fopAcM_GetID(i_actor))) {
         return NULL;
@@ -2035,8 +1872,6 @@ fopAc_ac_c* fopAcM_findObject4EventCB(fopAc_ac_c* i_actor, void* i_data) {
     return NULL;
 }
 
-/* 8001D7A0-8001D890 0180E0 00F0+00 0/0 7/7 0/0 .text            fopAcM_searchFromName4Event__FPCcs
- */
 fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) {
     fopAcM_search4ev_prm prm;
     prm.event_id = i_eventID;
@@ -2067,19 +1902,14 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) {
     return fopAcM_Search((fopAcIt_JudgeFunc)fopAcM_findObject4EventCB, &prm);
 }
 
-/* 803F1D24-803F1D74 01EA44 0050+00 1/2 1/1 1/1 .bss             mRoofCheck__11fopAcM_rc_c */
 dBgS_ObjRoofChk fopAcM_rc_c::mRoofCheck;
 
-/* 803F1D80-803F1DD8 01EAA0 0054+04 2/3 3/3 4/4 .bss             mWaterCheck__11fopAcM_wt_c */
 dBgS_WtrChk fopAcM_wt_c::mWaterCheck;
 
-/* 80450CD4-80450CD8 0001D4 0004+00 1/1 0/0 3/3 .sbss            mRoofY__11fopAcM_rc_c */
 f32 fopAcM_rc_c::mRoofY;
 
-/* 80450CD8-80450CE0 0001D8 0004+04 2/2 4/4 19/19 .sbss            mWaterY__11fopAcM_wt_c */
 f32 fopAcM_wt_c::mWaterY;
 
-/* 8001D890-8001D900 0181D0 0070+00 0/0 2/2 19/19 .text            fopAcM_getWaterY__FPC4cXyzPf */
 s32 fopAcM_getWaterY(cXyz const* param_0, f32* o_waterY) {
     if (fopAcM_wt_c::waterCheck(param_0) && fopAcM_wt_c::getPolyAtt0() != 6) {
         *o_waterY = fopAcM_wt_c::getWaterY();
@@ -2090,8 +1920,6 @@ s32 fopAcM_getWaterY(cXyz const* param_0, f32* o_waterY) {
     }
 }
 
-/* 8001D900-8001D9A8 018240 00A8+00 0/0 2/2 2/2 .text
- * fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz             */
 void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_pos) {
     s16 angle = -i_actor->shape_angle.y;
     cXyz pos = *i_pos - i_actor->current.pos;
@@ -2101,8 +1929,6 @@ void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_po
     o_pos->z = (pos.z * cM_scos(angle)) - (pos.x * cM_ssin(angle));
 }
 
-/* 8001D9A8-8001DAE4 0182E8 013C+00 0/0 1/1 9/9 .text
- * fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii    */
 s32 fopAcM_getWaterStream(cXyz const* pos, cBgS_PolyInfo const& polyinfo, cXyz* speed,
                           int* power, BOOL param_4) {
     daTagStream_c* stream = daTagStream_c::getTop();
@@ -2135,8 +1961,6 @@ s32 fopAcM_getWaterStream(cXyz const* pos, cBgS_PolyInfo const& polyinfo, cXyz*
     return 0;
 }
 
-/* 8001DAE4-8001DB90 018424 00AC+00 0/0 2/2 8/8 .text fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos
- */
 s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) {
     if (!dComIfG_Bgsp().ChkPolySafe(poly)) {
         return 0;
@@ -2150,7 +1974,6 @@ s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) {
     return fopAcM_getPolygonAngle(&plane, param_1);
 }
 
-/* 8001DBD8-8001DC68 018518 0090+00 1/1 5/5 18/18 .text fopAcM_getPolygonAngle__FPC8cM3dGPlas */
 s16 fopAcM_getPolygonAngle(cM3dGPla const* p_plane, s16 param_1) {
     if (p_plane == NULL) {
         return 0;
@@ -2163,29 +1986,23 @@ s16 fopAcM_getPolygonAngle(cM3dGPla const* p_plane, s16 param_1) {
     return cM_atan2s(xz, p_plane->mNormal.y);
 }
 
-/* 8001DC68-8001DCBC 0185A8 0054+00 0/0 5/5 21/21 .text
- * lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c        */
 bool fopAcM_lc_c::lineCheck(cXyz const* i_start, cXyz const* i_end, fopAc_ac_c const* i_actor) {
     mLineCheck.Set(i_start, i_end, i_actor);
     return dComIfG_Bgsp().LineCross(&mLineCheck);
 }
 
-/* 8001DCBC-8001DD1C 0185FC 0060+00 1/1 10/10 108/108 .text gndCheck__11fopAcM_gc_cFPC4cXyz */
 bool fopAcM_gc_c::gndCheck(cXyz const* i_pos) {
     mGndCheck.SetPos(i_pos);
     mGroundY = (f32)dComIfG_Bgsp().GroundCross(&mGndCheck);
     return -G_CM3D_F_INF != mGroundY;
 }
 
-/* 8001DD1C-8001DD84 01865C 0068+00 0/0 0/0 3/3 .text            roofCheck__11fopAcM_rc_cFPC4cXyz */
 bool fopAcM_rc_c::roofCheck(cXyz const* i_pos) {
     mRoofCheck.SetPos(*i_pos);
     mRoofY = dComIfG_Bgsp().RoofChk(&mRoofCheck);
     return G_CM3D_F_INF != mRoofY;
 }
 
-/* 8001DD84-8001DE10 0186C4 008C+00 1/1 4/4 22/22 .text            waterCheck__11fopAcM_wt_cFPC4cXyz
- */
 bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) {
     cXyz pos(i_pos->x, i_pos->y - 500.0f, i_pos->z);
     mWaterCheck.Set(pos, i_pos->y + 500.0f);
@@ -2198,5 +2015,4 @@ bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) {
     return false;
 }
 
-/* 8001DE10-8001DE14 018750 0004+00 0/0 1/1 0/0 .text            fopAcM_initManager__Fv */
 void fopAcM_initManager() {}
diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp
index 5c7ebd895e..b4a95012e5 100644
--- a/src/f_op/f_op_actor_tag.cpp
+++ b/src/f_op/f_op_actor_tag.cpp
@@ -6,20 +6,16 @@
 #include "f_op/f_op_actor_tag.h"
 #include "SSystem/SComponent/c_list.h"
 
-/* 803A35E0-803A35F0 000700 000C+04 1/1 2/2 0/0 .data            g_fopAcTg_Queue */
 node_list_class g_fopAcTg_Queue = {NULL, NULL, 0};
 
-/* 80019834-80019860 014174 002C+00 0/0 1/1 0/0 .text fopAcTg_ToActorQ__FP16create_tag_class */
 int fopAcTg_ToActorQ(create_tag_class* i_createTag) {
     return cTg_Addition(&g_fopAcTg_Queue, i_createTag);
 }
 
-/* 80019860-80019880 0141A0 0020+00 0/0 1/1 0/0 .text fopAcTg_ActorQTo__FP16create_tag_class */
 int fopAcTg_ActorQTo(create_tag_class* i_createTag) {
     return cTg_SingleCutFromTree(i_createTag);
 }
 
-/* 80019880-800198A4 0141C0 0024+00 0/0 1/1 0/0 .text fopAcTg_Init__FP16create_tag_classPv */
 int fopAcTg_Init(create_tag_class* i_createTag, void* i_data) {
     cTg_Create(i_createTag, i_data);
     return 1;
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index 66f7d7c9cb..3d17f6d4fa 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -9,7 +9,6 @@
 #include "d/d_s_play.h"
 #include "f_op/f_op_draw_tag.h"
 
-/* 8001E140-8001E180 018A80 0040+00 1/0 0/0 0/0 .text            fopCam_Draw__FP12camera_class */
 static s32 fopCam_Draw(camera_class* i_this) {
     s32 ret = 1;
     if (!dComIfGp_isPauseFlag()) {
@@ -19,7 +18,6 @@ static s32 fopCam_Draw(camera_class* i_this) {
     return ret;
 }
 
-/* 8001E180-8001E1C8 018AC0 0048+00 1/0 0/0 0/0 .text            fopCam_Execute__FP12camera_class */
 static int fopCam_Execute(camera_class* i_this) {
     int ret;
 
@@ -30,8 +28,6 @@ static int fopCam_Execute(camera_class* i_this) {
     return ret;
 }
 
-/* 8001E1C8-8001E21C 018B08 0054+00 1/0 0/0 0/0 .text            fopCam_IsDelete__FP12camera_class
- */
 int fopCam_IsDelete(camera_class* i_this) {
     int ret = fpcMtd_IsDelete((process_method_class*)i_this->submethod, i_this);
     if (ret == 1) {
@@ -41,7 +37,6 @@ int fopCam_IsDelete(camera_class* i_this) {
     return ret;
 }
 
-/* 8001E21C-8001E270 018B5C 0054+00 1/0 0/0 0/0 .text            fopCam_Delete__FP12camera_class */
 int fopCam_Delete(camera_class* i_this) {
     int ret = fpcMtd_Delete((process_method_class*)i_this->submethod, i_this);
     if (ret == 1) {
@@ -51,7 +46,6 @@ int fopCam_Delete(camera_class* i_this) {
     return ret;
 }
 
-/* 8001E270-8001E308 018BB0 0098+00 1/0 0/0 0/0 .text            fopCam_Create__FPv */
 static int fopCam_Create(void* i_this) {
     camera_class* a_this = (camera_class*)i_this;
 
@@ -76,7 +70,6 @@ static int fopCam_Create(void* i_this) {
     return ret;
 }
 
-/* 803A3860-803A3878 -00001 0014+04 0/0 2/0 0/0 .data            g_fopCam_Method */
 leafdraw_method_class g_fopCam_Method = {
     (process_method_func)fopCam_Create,  (process_method_func)fopCam_Delete,
     (process_method_func)fopCam_Execute, (process_method_func)fopCam_IsDelete,
diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp
index 8da922981d..ea40325226 100644
--- a/src/f_op/f_op_camera_mng.cpp
+++ b/src/f_op/f_op_camera_mng.cpp
@@ -7,22 +7,17 @@
 #include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_stdcreate_req.h"
 
-/* 803F1DD8-803F1DE8 01EAF8 0010+00 1/1 0/0 0/0 .bss             l_fopCamM_id */
 static fpc_ProcID l_fopCamM_id[4];
 
-/* 8001E308-8001E310 018C48 0008+00 0/0 12/12 2/2 .text fopCamM_GetParam__FP12camera_class */
 u32 fopCamM_GetParam(camera_class* i_this) {
     return fpcM_GetParam(i_this);
 }
 
-/* 8001E310-8001E374 018C50 0064+00 0/0 1/1 0/0 .text            fopCamM_Create__FisPv */
 fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append) {
     l_fopCamM_id[i_cameraIdx] = fpcM_Create(i_procName, NULL, i_append);
     return l_fopCamM_id[i_cameraIdx];
 }
 
-/* 8001E374-8001E378 018CB4 0004+00 0/0 1/1 0/0 .text            fopCamM_Management__Fv */
 void fopCamM_Management() {}
 
-/* 8001E378-8001E37C 018CB8 0004+00 0/0 1/1 0/0 .text            fopCamM_Init__Fv */
 void fopCamM_Init() {}
diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp
index 6b113257fa..8f9150acfa 100644
--- a/src/f_op/f_op_draw_iter.cpp
+++ b/src/f_op/f_op_draw_iter.cpp
@@ -8,10 +8,8 @@
 #include "SSystem/SComponent/c_tag.h"
 #include "f_op/f_op_draw_tag.h"
 
-/* 80450CF8-80450D00 0001F8 0004+04 2/2 0/0 0/0 .sbss            l_fopDwTg_id */
 static int l_fopDwTg_id;
 
-/* 80020400-80020444 01AD40 0044+00 2/2 0/0 0/0 .text            fopDwIt_GetTag__Fv */
 create_tag_class* fopDwIt_GetTag() {
     while (l_fopDwTg_id + 1 < g_fopDwTg_Queue.mNumLists) {
         l_fopDwTg_id++;
@@ -25,7 +23,6 @@ create_tag_class* fopDwIt_GetTag() {
     return NULL;
 }
 
-/* 80020444-80020480 01AD84 003C+00 0/0 1/1 0/0 .text            fopDwIt_Begin__Fv */
 create_tag_class* fopDwIt_Begin() {
     create_tag_class* tag = (create_tag_class*)g_fopDwTg_Queue.mpLists->mpHead;
     l_fopDwTg_id = 0;
@@ -36,8 +33,6 @@ create_tag_class* fopDwIt_Begin() {
     return tag = fopDwIt_GetTag();
 }
 
-/* 80020480-800204AC 01ADC0 002C+00 0/0 1/1 0/0 .text            fopDwIt_Next__FP16create_tag_class
- */
 create_tag_class* fopDwIt_Next(create_tag_class* i_createTag) {
     create_tag_class* tag = (create_tag_class*)i_createTag->mpNode.mpNextNode;
     if (tag == NULL) {
diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp
index 319c0e7361..d158723fd2 100644
--- a/src/f_op/f_op_draw_tag.cpp
+++ b/src/f_op/f_op_draw_tag.cpp
@@ -8,26 +8,21 @@
 #include "SSystem/SComponent/c_tag.h"
 #include "global.h"
 
-/* 804505D0-804505D8 000050 0008+00 2/2 2/2 0/0 .sdata           g_fopDwTg_Queue */
 node_lists_tree_class g_fopDwTg_Queue = {NULL, 0};
 
-/* 800204AC-800204D4 01ADEC 0028+00 0/0 4/4 2/2 .text fopDwTg_ToDrawQ__FP16create_tag_classi */
 void fopDwTg_ToDrawQ(create_tag_class* i_createTag, int i_priority) {
     cTg_AdditionToTree(&g_fopDwTg_Queue, i_priority, i_createTag);
 }
 
-/* 800204D4-800204F4 01AE14 0020+00 0/0 8/8 3/3 .text fopDwTg_DrawQTo__FP16create_tag_class */
 void fopDwTg_DrawQTo(create_tag_class* i_createTag) {
     cTg_SingleCutFromTree(i_createTag);
 }
 
-/* 800204F4-80020518 01AE34 0024+00 0/0 4/4 0/0 .text fopDwTg_Init__FP16create_tag_classPv */
 bool fopDwTg_Init(create_tag_class* i_createTag, void* i_process) {
     cTg_Create(i_createTag, i_process);
     return true;
 }
 
-/* 80020518-80020548 01AE58 0030+00 0/0 1/1 0/0 .text            fopDwTg_CreateQueue__Fv */
 void fopDwTg_CreateQueue() {
     static node_list_class lists[1000];
 
diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index 58f8b26df6..7a9b170786 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -9,7 +9,6 @@
 #include "f_op/f_op_draw_tag.h"
 #include "f_op/f_op_kankyo_mng.h"
 
-/* 8001F284-8001F2C0 019BC4 003C+00 1/0 0/0 0/0 .text            fopKy_Draw__FPv */
 static int fopKy_Draw(void* i_this) {
     int ret;
     kankyo_class* a_this = (kankyo_class*)i_this;
@@ -21,7 +20,6 @@ static int fopKy_Draw(void* i_this) {
     return ret;
 }
 
-/* 8001F2C0-8001F314 019C00 0054+00 1/0 0/0 0/0 .text            fopKy_Execute__FPv */
 static int fopKy_Execute(void* i_this) {
     int ret;
     kankyo_class* a_this = (kankyo_class*)i_this;
@@ -33,7 +31,6 @@ static int fopKy_Execute(void* i_this) {
     return ret;
 }
 
-/* 8001F314-8001F368 019C54 0054+00 1/0 0/0 0/0 .text            fopKy_IsDelete__FPv */
 static int fopKy_IsDelete(void* i_this) {
     int ret;
     kankyo_class* a_this = (kankyo_class*)i_this;
@@ -46,7 +43,6 @@ static int fopKy_IsDelete(void* i_this) {
     return ret;
 }
 
-/* 8001F368-8001F3B4 019CA8 004C+00 1/0 0/0 0/0 .text            fopKy_Delete__FPv */
 static int fopKy_Delete(void* i_this) {
     kankyo_class* a_this = (kankyo_class*)i_this;
 
@@ -56,10 +52,8 @@ static int fopKy_Delete(void* i_this) {
     return ret;
 }
 
-/* 80450CE8-80450CF0 0001E8 0004+04 1/1 0/0 0/0 .sbss            fopKy_KANKYO_TYPE */
 static int fopKy_KANKYO_TYPE;
 
-/* 8001F3B4-8001F488 019CF4 00D4+00 1/0 0/0 0/0 .text            fopKy_Create__FPv */
 static int fopKy_Create(void* i_this) {
     kankyo_class* a_this = (kankyo_class*)i_this;
 
@@ -88,7 +82,6 @@ static int fopKy_Create(void* i_this) {
     return ret;
 }
 
-/* 803A3940-803A3958 -00001 0014+04 0/0 7/0 0/0 .data            g_fopKy_Method */
 leafdraw_method_class g_fopKy_Method = {
     (process_method_func)fopKy_Create,  (process_method_func)fopKy_Delete,
     (process_method_func)fopKy_Execute, (process_method_func)fopKy_IsDelete,
diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp
index 89f328965d..d09a6be0df 100644
--- a/src/f_op/f_op_kankyo_mng.cpp
+++ b/src/f_op/f_op_kankyo_mng.cpp
@@ -7,7 +7,6 @@
 #include "SSystem/SComponent/c_malloc.h"
 #include "d/d_com_inf_game.h"
 
-/* 8001F660-8001F6B8 019FA0 0058+00 2/2 0/0 0/0 .text            fopKyM_CreateAppend__Fv */
 fopKyM_prm_class* fopKyM_CreateAppend() {
     fopKyM_prm_class* append = (fopKyM_prm_class*)cMl::memalignB(-4, sizeof(fopKyM_prm_class));
 
@@ -18,7 +17,6 @@ fopKyM_prm_class* fopKyM_CreateAppend() {
     return append;
 }
 
-/* 8001F6B8-8001F748 019FF8 0090+00 2/2 0/0 0/0 .text            createAppend__FiP4cXyzP4cXyz */
 static fopKyM_prm_class* createAppend(int i_param, cXyz* i_pos, cXyz* i_scale) {
     fopKyM_prm_class* append = fopKyM_CreateAppend();
     if (append == NULL) {
@@ -38,17 +36,14 @@ static fopKyM_prm_class* createAppend(int i_param, cXyz* i_pos, cXyz* i_scale) {
     return append;
 }
 
-/* 8001F748-8001F768 01A088 0020+00 0/0 3/3 1/1 .text            fopKyM_Delete__FPv */
 void fopKyM_Delete(void* i_process) {
     fpcM_Delete(i_process);
 }
 
-/* 8001F768-8001F7B8 01A0A8 0050+00 2/2 0/0 0/0 .text            fopKyM_Create__FsPFPv_iPv */
 fpc_ProcID fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_append) {
     return fpcM_Create(i_procName, i_createFunc, i_append);
 }
 
-/* 8001F7B8-8001F818 01A0F8 0060+00 0/0 3/3 1/1 .text fopKyM_create__FsiP4cXyzP4cXyzPFPv_i */
 fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale,
                          fopKyM_CreateFunc i_createFunc) {
     fopKyM_prm_class* append = createAppend(i_param, i_pos, i_scale);
@@ -59,7 +54,6 @@ fpc_ProcID fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale
     return fopKyM_Create(i_procName, i_createFunc, append);
 }
 
-/* 8001F818-8001F87C 01A158 0064+00 0/0 1/1 0/0 .text fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i */
 base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale,
                                       fopKyM_CreateFunc i_createFunc) {
     fopKyM_prm_class* append = createAppend(i_param, i_pos, i_scale);
@@ -70,8 +64,6 @@ base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos,
     return fpcM_FastCreate(i_procName, i_createFunc, NULL, append);
 }
 
-/* 8001F87C-8001F90C 01A1BC 0090+00 0/0 6/6 37/37 .text            fopKyM_createWpillar__FPC4cXyzfi
- */
 fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) {
     fopKyM_prm_class* append = fopKyM_CreateAppend();
     if (append == NULL) {
@@ -87,7 +79,6 @@ fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) {
     return fopKyM_Create(PROC_WPILLAR, NULL, append);
 }
 
-/* 8001F90C-8001F9B4 01A24C 00A8+00 0/0 0/0 3/3 .text            fopKyM_createMpillar__FPC4cXyzf */
 fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) {
     static u16 m_name[2] = {
         0x8757,
diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp
index 70826ba864..4b9ad8afe6 100644
--- a/src/f_op/f_op_msg.cpp
+++ b/src/f_op/f_op_msg.cpp
@@ -9,13 +9,11 @@
 #include "f_op/f_op_msg_mng.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 8001F488-8001F4B0 019DC8 0028+00 1/0 0/0 0/0 .text            fopMsg_Draw__FPv */
 static int fopMsg_Draw(void* i_this) {
     msg_class* a_this = (msg_class*)i_this;
     return fpcLf_DrawMethod(a_this->sub_method, i_this);
 }
 
-/* 8001F4B0-8001F4E8 019DF0 0038+00 1/0 0/0 0/0 .text            fopMsg_Execute__FPv */
 static int fopMsg_Execute(void* i_this) {
     msg_class* a_this = (msg_class*)i_this;
 
@@ -27,7 +25,6 @@ static int fopMsg_Execute(void* i_this) {
     return ret;
 }
 
-/* 8001F4E8-8001F53C 019E28 0054+00 1/0 0/0 0/0 .text            fopMsg_IsDelete__FPv */
 static int fopMsg_IsDelete(void* i_this) {
     msg_class* a_this = (msg_class*)i_this;
 
@@ -39,7 +36,6 @@ static int fopMsg_IsDelete(void* i_this) {
     return ret;
 }
 
-/* 8001F53C-8001F588 019E7C 004C+00 1/0 0/0 0/0 .text            fopMsg_Delete__FPv */
 static int fopMsg_Delete(void* i_this) {
     msg_class* a_this = (msg_class*)i_this;
 
@@ -53,10 +49,8 @@ static int fopMsg_Delete(void* i_this) {
 u8 fopMsg::MemCheck;
 #endif
 
-/* 80450CF0-80450CF8 0001F0 0004+04 1/1 0/0 0/0 .sbss            fopMsg_MSG_TYPE */
 static int fopMsg_MSG_TYPE;
 
-/* 8001F588-8001F660 019EC8 00D8+00 1/0 0/0 0/0 .text            fopMsg_Create__FPv */
 int fopMsg_Create(void* i_this) {
     msg_class* a_this = (msg_class*)i_this;
 
@@ -86,7 +80,6 @@ int fopMsg_Create(void* i_this) {
     return ret;
 }
 
-/* 803A3958-803A3970 -00001 0014+04 0/0 5/0 0/0 .data            g_fopMsg_Method */
 leafdraw_method_class g_fopMsg_Method = {
     (process_method_func)fopMsg_Create,  (process_method_func)fopMsg_Delete,
     (process_method_func)fopMsg_Execute, (process_method_func)fopMsg_IsDelete,
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index ef3df380c7..6bcb675acd 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: f_op/f_op_msg_mng
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/JKernel/JKRExpHeap.h"
@@ -14,7 +9,6 @@
 #include "f_op/f_op_msg_mng.h"
 #include "f_op/f_op_scene_mng.h"
 
-/* 8001F9B4-8001FA24 01A2F4 0070+00 0/0 3/3 0/0 .text            fopMsgM_setStageLayer__FPv */
 s32 fopMsgM_setStageLayer(void* i_process) {
     scene_class* scn = fopScnM_SearchByID(dStage_roomControl_c::getProcID());
 
@@ -22,23 +16,18 @@ s32 fopMsgM_setStageLayer(void* i_process) {
     return fpcM_ChangeLayerID(i_process, id);
 }
 
-/* 8001FA24-8001FA44 01A364 0020+00 3/3 14/14 4/4 .text            fopMsgM_SearchByID__FUi */
 msg_class* fopMsgM_SearchByID(fpc_ProcID i_id) {
     return (msg_class*)fpcEx_SearchByID(i_id);
 }
 
-/* 8001FA44-8001FA4C 01A384 0008+00 0/0 2/2 0/0 .text            fopMsgM_GetAppend__FPv */
 fopMsg_prm_class* fopMsgM_GetAppend(void* i_msg) {
     return (fopMsg_prm_class*)fpcM_GetAppend(i_msg);
 }
 
-/* 8001FA4C-8001FA6C 01A38C 0020+00 0/0 2/2 0/0 .text            fopMsgM_Delete__FPv */
 void fopMsgM_Delete(void* i_this) {
     fpcM_Delete(i_this);
 }
 
-/* 8001FA6C-8001FB50 01A3AC 00E4+00 1/1 0/0 0/0 .text createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi
- */
 static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_3,
                                       fpc_ProcID param_4) {
     fopMsg_prm_class* append = (fopMsg_prm_class*)cMl::memalignB(-4, sizeof(fopMsg_prm_class));
@@ -68,8 +57,6 @@ static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32*
     return append;
 }
 
-/* 8001FB50-8001FC4C 01A490 00FC+00 1/1 0/0 0/0 .text            createTimerAppend__FiUlUcUcffffUi
- */
 static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, u8 param_3,
                                            f32 param_4, f32 param_5, f32 param_6, f32 param_7,
                                            fpc_ProcID param_8) {
@@ -94,8 +81,6 @@ static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type,
     return appen;
 }
 
-/* 8001FC4C-8001FCC0 01A58C 0074+00 0/0 1/1 0/0 .text
- * fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i            */
 fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_4,
                    fopMsgCreateFunc createFunc) {
     fopMsg_prm_class* append = createAppend(i_talkActor, i_pos, i_msgIdx, param_4, fpcM_ERROR_PROCESS_ID_e);
@@ -106,7 +91,6 @@ fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos,
     return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)createFunc, NULL, append);
 }
 
-/* 8001FCC0-8001FD34 01A600 0074+00 0/0 2/2 0/0 .text fop_Timer_create__FsUcUlUcUcffffPFPv_i */
 fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5,
                      f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc i_createFunc) {
     fopMsg_prm_timer* append = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5,
@@ -119,10 +103,8 @@ fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type,
                             append);
 }
 
-/* 804505C8-804505D0 000048 0004+04 4/4 0/0 0/0 .sdata           i_msgID */
 static fpc_ProcID i_msgID = fpcM_ERROR_PROCESS_ID_e;
 
-/* 8001FD34-8001FE84 01A674 0150+00 0/0 2/2 1/1 .text fopMsgM_messageSet__FUlP10fopAc_ac_cUl */
 fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2) {
     if (dComIfGp_isHeapLockFlag() == 8) {
         dMeter2Info_getMeterClass()->emphasisButtonDelete();
@@ -164,7 +146,6 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2
     return 0;
 }
 
-/* 8001FE84-8001FFC4 01A7C4 0140+00 0/0 6/6 4/4 .text            fopMsgM_messageSet__FUlUl */
 fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) {
     if (dComIfGp_isHeapLockFlag() == 8) {
         dMeter2Info_getMeterClass()->emphasisButtonDelete();
@@ -204,7 +185,6 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) {
     return 0;
 }
 
-/* 8001FFC4-800200C0 01A904 00FC+00 0/0 1/1 13/13 .text            fopMsgM_messageSetDemo__FUl */
 fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) {
     dMsgObject_endFlowGroup();
     if (dComIfGp_isHeapLockFlag() == 8) {
@@ -236,18 +216,15 @@ fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) {
     return 0;
 }
 
-/* 800200C0-80020100 01AA00 0040+00 0/0 7/7 1/1 .text            fopMsgM_messageGet__FPcUl */
 char* fopMsgM_messageGet(char* i_stringBuf, u32 i_msgId) {
     dMeter2Info_getString(i_msgId, i_stringBuf, NULL);
     return i_stringBuf;
 }
 
-/* 80020100-80020108 01AA40 0008+00 0/0 1/1 0/0 .text            fopMsgM_setMessageID__FUi */
 void fopMsgM_setMessageID(fpc_ProcID msg_id) {
     i_msgID = msg_id;
 }
 
-/* 80020108-80020158 01AA48 0050+00 0/0 2/2 0/0 .text            fopMsgM_Create__FsPFPv_iPv */
 fpc_ProcID fopMsgM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_append) {
     return fpcM_Create(i_procName, i_createFunc, i_append);
 }
@@ -261,7 +238,6 @@ u8 fopMsgM_itemNumIdx(u8 i_no) {
     return itemicon[i_no] & 0xFF;
 }
 
-/* 80020158-80020160 -00001 0008+00 0/0 0/0 0/0 .text            setAlpha__7J2DPaneFUc */
 void J2DPane::setAlpha(u8 alpha) {
     mAlpha = alpha;
 }
@@ -270,7 +246,6 @@ f32 dummy() {
     return 0.5f;
 }
 
-/* 80020160-800202CC 01AAA0 016C+00 1/0 4/4 2/2 .text            fopMsgM_valueIncrease__FiiUc */
 f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 i_type) {
     if (param_0 <= 0) {
         return 1.0f;
@@ -321,8 +296,6 @@ static void dummyVirtual(J2DPicture* picture, f32 param_1, f32 param_2, const ch
     picture->setBlendRatio(param_1, param_2);
 }
 
-/* 8002039C-800203E0 01ACDC 0044+00 0/0 3/3 0/0 .text            fopMsgM_createExpHeap__FUlP7JKRHeap
- */
 JKRExpHeap* fopMsgM_createExpHeap(u32 i_heapSize, JKRHeap* i_heap) {
     if (i_heap == NULL) {
         i_heap = mDoExt_getGameHeap();
@@ -331,7 +304,6 @@ JKRExpHeap* fopMsgM_createExpHeap(u32 i_heapSize, JKRHeap* i_heap) {
     return JKRExpHeap::create(i_heapSize, i_heap, false);
 }
 
-/* 800203E0-80020400 01AD20 0020+00 0/0 3/3 0/0 .text fopMsgM_destroyExpHeap__FP10JKRExpHeap */
 void fopMsgM_destroyExpHeap(JKRExpHeap* i_heap) {
     i_heap->destroy();
 }
diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp
index 7653d3e95b..6625931ac9 100644
--- a/src/f_op/f_op_overlap.cpp
+++ b/src/f_op/f_op_overlap.cpp
@@ -6,31 +6,26 @@
 #include "f_op/f_op_overlap.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 8001E37C-8001E3A4 018CBC 0028+00 1/0 0/0 0/0 .text            fopOvlp_Draw__FPv */
 static s32 fopOvlp_Draw(void* i_this) {
     overlap_task_class* a_this = (overlap_task_class*)i_this;
     return fpcLf_DrawMethod(a_this->submethod, i_this);
 }
 
-/* 8001E3A4-8001E3CC 018CE4 0028+00 1/0 0/0 0/0 .text            fopOvlp_Execute__FPv */
 static s32 fopOvlp_Execute(void* i_this) {
     overlap_task_class* a_this = (overlap_task_class*)i_this;
     return fpcMtd_Execute(&a_this->submethod->base, i_this);
 }
 
-/* 8001E3CC-8001E3F4 018D0C 0028+00 1/0 0/0 0/0 .text            fopOvlp_IsDelete__FPv */
 static s32 fopOvlp_IsDelete(void* i_this) {
     overlap_task_class* a_this = (overlap_task_class*)i_this;
     return fpcMtd_IsDelete(&a_this->submethod->base, i_this);
 }
 
-/* 8001E3F4-8001E41C 018D34 0028+00 1/0 0/0 0/0 .text            fopOvlp_Delete__FPv */
 static s32 fopOvlp_Delete(void* i_this) {
     overlap_task_class* a_this = (overlap_task_class*)i_this;
     return fpcMtd_Delete(&a_this->submethod->base, i_this);
 }
 
-/* 8001E41C-8001E484 018D5C 0068+00 1/0 0/0 0/0 .text            fopOvlp_Create__FPv */
 static s32 fopOvlp_Create(void* i_this) {
     overlap_task_class* a_this = (overlap_task_class*)i_this;
 
@@ -46,7 +41,6 @@ static s32 fopOvlp_Create(void* i_this) {
     return fpcMtd_Create(&a_this->submethod->base, a_this);
 }
 
-/* 803A3878-803A3890 -00001 0014+04 0/0 10/0 0/0 .data            g_fopOvlp_Method */
 leafdraw_method_class g_fopOvlp_Method = {
     (process_method_func)fopOvlp_Create,  (process_method_func)fopOvlp_Delete,
     (process_method_func)fopOvlp_Execute, (process_method_func)fopOvlp_IsDelete,
diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp
index e174378246..5ed2a95de8 100644
--- a/src/f_op/f_op_overlap_mng.cpp
+++ b/src/f_op/f_op_overlap_mng.cpp
@@ -9,11 +9,9 @@
 #include "f_op/f_op_scene_pause.h"
 #include "f_pc/f_pc_executor.h"
 
-/* 804505B0-804505B8 000030 0004+04 10/10 0/0 0/0 .sdata           l_fopOvlpM_overlap */
 // making it not an array put it in .bss
 static overlap_request_class* l_fopOvlpM_overlap[1] = {NULL};
 
-/* 8001E484-8001E4C4 018DC4 0040+00 0/0 1/1 0/0 .text            fopOvlpM_SceneIsStop__Fv */
 int fopOvlpM_SceneIsStop() {
     if (l_fopOvlpM_overlap[0] != NULL) {
         return fopScnPause_Enable(
@@ -23,7 +21,6 @@ int fopOvlpM_SceneIsStop() {
     return 0;
 }
 
-/* 8001E4C4-8001E504 018E04 0040+00 0/0 5/5 0/0 .text            fopOvlpM_SceneIsStart__Fv */
 int fopOvlpM_SceneIsStart() {
     if (l_fopOvlpM_overlap[0] != NULL) {
         return fopScnPause_Disable(
@@ -33,34 +30,28 @@ int fopOvlpM_SceneIsStart() {
     return 0;
 }
 
-/* 8001E504-8001E51C 018E44 0018+00 0/0 3/3 0/0 .text fopOvlpM_IsOutReq__FP18overlap_task_class */
 int fopOvlpM_IsOutReq(overlap_task_class* i_overlap_task) {
     return i_overlap_task->request.flag2 == 2;
 }
 
-/* 8001E51C-8001E540 018E5C 0024+00 0/0 6/6 0/0 .text fopOvlpM_Done__FP18overlap_task_class */
 void fopOvlpM_Done(overlap_task_class* i_overlap_task) {
     cReq_Done(&i_overlap_task->request);
 }
 
-/* 8001E540-8001E558 018E80 0018+00 0/0 1/1 0/0 .text            fopOvlpM_ToldAboutID__FUi */
 void fopOvlpM_ToldAboutID(fpc_ProcID i_sceneId) {
     if (l_fopOvlpM_overlap[0] != NULL) {
         l_fopOvlpM_overlap[0]->overlap_task->scene_id = i_sceneId;
     }
 }
 
-/* 8001E558-8001E574 018E98 001C+00 0/0 6/6 7/7 .text            fopOvlpM_IsPeek__Fv */
 int fopOvlpM_IsPeek() {
     return l_fopOvlpM_overlap[0] != NULL ? l_fopOvlpM_overlap[0]->field_0x8 : FALSE;
 }
 
-/* 8001E574-8001E5A8 018EB4 0034+00 0/0 1/1 0/0 .text            fopOvlpM_IsDone__Fv */
 int fopOvlpM_IsDone() {
     return l_fopOvlpM_overlap[0] != NULL ? cReq_Is_Done(&l_fopOvlpM_overlap[0]->base) : FALSE;
 }
 
-/* 8001E5A8-8001E5D0 018EE8 0028+00 0/0 3/3 1/1 .text            fopOvlpM_IsDoingReq__Fv */
 int fopOvlpM_IsDoingReq() {
     if (l_fopOvlpM_overlap[0] != NULL && l_fopOvlpM_overlap[0]->field_0x4 == 1) {
         return 1;
@@ -69,15 +60,12 @@ int fopOvlpM_IsDoingReq() {
     return 0;
 }
 
-/* 8001E5D0-8001E604 018F10 0034+00 0/0 1/1 0/0 .text            fopOvlpM_ClearOfReq__Fv */
 int fopOvlpM_ClearOfReq() {
     return l_fopOvlpM_overlap[0] != NULL ? fopOvlpReq_OverlapClr(l_fopOvlpM_overlap[0]) : 0;
 }
 
-/* 803F1DE8-803F1E10 01EB08 0028+00 1/1 0/0 0/0 .bss             l_fopOvlpM_Request */
 static overlap_request_class l_fopOvlpM_Request;
 
-/* 8001E604-8001E650 018F44 004C+00 0/0 1/1 0/0 .text            fopOvlpM_Request__FsUs */
 overlap_request_class* fopOvlpM_Request(s16 i_procname, u16 i_peektime) {
     if (l_fopOvlpM_overlap[0] == NULL) {
         l_fopOvlpM_overlap[0] = fopOvlpReq_Request(&l_fopOvlpM_Request, i_procname, i_peektime);
@@ -87,7 +75,6 @@ overlap_request_class* fopOvlpM_Request(s16 i_procname, u16 i_peektime) {
     return NULL;
 }
 
-/* 8001E650-8001E698 018F90 0048+00 0/0 1/1 0/0 .text            fopOvlpM_Management__Fv */
 void fopOvlpM_Management() {
     if (l_fopOvlpM_overlap[0] != NULL) {
         switch (fopOvlpReq_Handler(l_fopOvlpM_overlap[0])) {
@@ -100,7 +87,6 @@ void fopOvlpM_Management() {
     }
 }
 
-/* 8001E698-8001E6E8 018FD8 0050+00 0/0 1/1 0/0 .text            fopOvlpM_Cancel__Fv */
 int fopOvlpM_Cancel() {
     if (l_fopOvlpM_overlap[0] == NULL) {
         return 1;
@@ -114,5 +100,4 @@ int fopOvlpM_Cancel() {
     return 0;
 }
 
-/* 8001E6E8-8001E6EC 019028 0004+00 0/0 1/1 0/0 .text            fopOvlpM_Init__Fv */
 void fopOvlpM_Init() {}
diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp
index 414b9f0abf..112809a706 100644
--- a/src/f_op/f_op_overlap_req.cpp
+++ b/src/f_op/f_op_overlap_req.cpp
@@ -9,8 +9,6 @@
 
 void fopOvlpReq_SetPeektime(overlap_request_class*, u16);
 
-/* 8001E6EC-8001E748 01902C 005C+00 2/1 0/0 0/0 .text
- * fopOvlpReq_phase_Done__FP21overlap_request_class             */
 static int fopOvlpReq_phase_Done(overlap_request_class* i_overlapReq) {
     if (fpcM_Delete(i_overlapReq->overlap_task) == 1) {
         i_overlapReq->overlap_task = NULL;
@@ -24,8 +22,6 @@ static int fopOvlpReq_phase_Done(overlap_request_class* i_overlapReq) {
     return cPhs_INIT_e;
 }
 
-/* 8001E748-8001E794 019088 004C+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_IsDone__FP21overlap_request_class           */
 static s32 fopOvlpReq_phase_IsDone(overlap_request_class* i_overlapReq) {
     cReq_Done(&i_overlapReq->base);
     if (i_overlapReq->field_0x2-- <= 0) {
@@ -35,8 +31,6 @@ static s32 fopOvlpReq_phase_IsDone(overlap_request_class* i_overlapReq) {
     return cPhs_INIT_e;
 }
 
-/* 8001E794-8001E7E4 0190D4 0050+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class  */
 static int fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_overlapReq) {
     if (cReq_Is_Done(&i_overlapReq->overlap_task->request)) {
         i_overlapReq->field_0x8 = 0;
@@ -46,8 +40,6 @@ static int fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_overlapReq)
     return cPhs_INIT_e;
 }
 
-/* 8001E7E4-8001E854 019124 0070+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class    */
 static int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_overlapReq) {
     if (i_overlapReq->peektime) {
         i_overlapReq->peektime--;
@@ -62,8 +54,6 @@ static int fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_overlapReq) {
     return cPhs_INIT_e;
 }
 
-/* 8001E854-8001E8A4 019194 0050+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_IsComplete__FP21overlap_request_class       */
 static int fopOvlpReq_phase_IsComplete(overlap_request_class* i_overlapReq) {
     if (cReq_Is_Done(&i_overlapReq->overlap_task->request)) {
         cReq_Done(&i_overlapReq->base);
@@ -73,8 +63,6 @@ static int fopOvlpReq_phase_IsComplete(overlap_request_class* i_overlapReq) {
     return cPhs_INIT_e;
 }
 
-/* 8001E8A4-8001E904 0191E4 0060+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_IsCreated__FP21overlap_request_class        */
 static int fopOvlpReq_phase_IsCreated(overlap_request_class* i_overlapReq) {
     if (fpcM_IsCreating(i_overlapReq->request_id) == 0) {
         overlap_task_class* process = (overlap_task_class*)fpcM_SearchByID(i_overlapReq->request_id);
@@ -89,8 +77,6 @@ static int fopOvlpReq_phase_IsCreated(overlap_request_class* i_overlapReq) {
     return cPhs_INIT_e;
 }
 
-/* 8001E904-8001E954 019244 0050+00 1/0 0/0 0/0 .text
- * fopOvlpReq_phase_Create__FP21overlap_request_class           */
 static int fopOvlpReq_phase_Create(overlap_request_class* i_overlapReq) {
     fpcLy_SetCurrentLayer(i_overlapReq->layer);
     i_overlapReq->request_id =
@@ -98,8 +84,6 @@ static int fopOvlpReq_phase_Create(overlap_request_class* i_overlapReq) {
     return cPhs_NEXT_e;
 }
 
-/* 8001E954-8001E9F0 019294 009C+00 0/0 1/1 0/0 .text
- * fopOvlpReq_Request__FP21overlap_request_classsUs             */
 overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s16 i_procname,
                                        u16 i_peektime) {
     static cPhs__Handler phaseMethod[8] = {
@@ -131,8 +115,6 @@ overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s
     return i_overlapReq;
 }
 
-/* 8001E9F0-8001EA88 019330 0098+00 0/0 1/1 0/0 .text
- * fopOvlpReq_Handler__FP21overlap_request_class                */
 int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) {
     int phase_state = cPhs_Do(&i_overlapReq->phase_req, i_overlapReq);
 
@@ -153,28 +135,20 @@ int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) {
     }
 }
 
-/* 8001EA88-8001EAB4 0193C8 002C+00 0/0 1/1 0/0 .text fopOvlpReq_Cancel__FP21overlap_request_class
- */
 int fopOvlpReq_Cancel(overlap_request_class* i_overlapReq) {
     return fopOvlpReq_phase_Done(i_overlapReq) == cPhs_NEXT_e ? TRUE : FALSE;
 }
 
-/* 8001EAB4-8001EAC4 0193F4 0010+00 1/1 0/0 0/0 .text
- * fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class       */
 int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* i_overlapReq) {
     return i_overlapReq->peektime == 0 ? TRUE : FALSE;
 }
 
-/* 8001EAC4-8001EAD8 019404 0014+00 1/1 0/0 0/0 .text
- * fopOvlpReq_SetPeektime__FP21overlap_request_classUs          */
 void fopOvlpReq_SetPeektime(overlap_request_class* i_overlapReq, u16 i_peektime) {
     if (i_peektime <= 0x7FFF) {
         i_overlapReq->peektime = i_peektime;
     }
 }
 
-/* 8001EAD8-8001EB34 019418 005C+00 0/0 1/1 0/0 .text
- * fopOvlpReq_OverlapClr__FP21overlap_request_class             */
 int fopOvlpReq_OverlapClr(overlap_request_class* i_overlapReq) {
     if (i_overlapReq->base.flag0 == 1 || !fopOvlpReq_Is_PeektimeLimit(i_overlapReq))
     {
diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp
index 27f35c2b41..9b37639502 100644
--- a/src/f_op/f_op_scene.cpp
+++ b/src/f_op/f_op_scene.cpp
@@ -6,22 +6,18 @@
 #include "f_op/f_op_scene.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 8001EB34-8001EB5C 019474 0028+00 1/0 0/0 0/0 .text            fopScn_Draw__FP11scene_class */
 static int fopScn_Draw(scene_class* i_this) {
     return fpcNd_DrawMethod((nodedraw_method_class*)i_this->submethod, i_this);
 }
 
-/* 8001EB5C-8001EB84 01949C 0028+00 1/0 0/0 0/0 .text            fopScn_Execute__FP11scene_class */
 static int fopScn_Execute(scene_class* i_this) {
     return fpcMtd_Execute(i_this->submethod, i_this);
 }
 
-/* 8001EB84-8001EBAC 0194C4 0028+00 1/0 0/0 0/0 .text            fopScn_IsDelete__FPv */
 static int fopScn_IsDelete(void* i_this) {
     return fpcMtd_IsDelete(static_cast<scene_class*>(i_this)->submethod, i_this);
 }
 
-/* 8001EBAC-8001EC00 0194EC 0054+00 1/0 0/0 0/0 .text            fopScn_Delete__FPv */
 static int fopScn_Delete(void* i_this) {
     scene_class* scene = (scene_class*)i_this;
     int ret = fpcMtd_Delete(scene->submethod, scene);
@@ -31,7 +27,6 @@ static int fopScn_Delete(void* i_this) {
     return ret;
 }
 
-/* 8001EC00-8001EC74 019540 0074+00 1/0 0/0 0/0 .text            fopScn_Create__FPv */
 static int fopScn_Create(void* i_this) {
     scene_class* scene = (scene_class*)i_this;
     if (fpcM_IsFirstCreating(i_this)) {
@@ -50,7 +45,6 @@ static int fopScn_Create(void* i_this) {
     return fpcMtd_Create(scene->submethod, i_this);
 }
 
-/* 803A38B0-803A38C8 -00001 0014+04 0/0 9/0 0/0 .data            g_fopScn_Method */
 leafdraw_method_class g_fopScn_Method = {
     (process_method_func)fopScn_Create,  
     (process_method_func)fopScn_Delete,
diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp
index 62c4728a9e..69b2d61616 100644
--- a/src/f_op/f_op_scene_iter.cpp
+++ b/src/f_op/f_op_scene_iter.cpp
@@ -8,7 +8,6 @@
 #include "SSystem/SComponent/c_tag_iter.h"
 #include "f_op/f_op_scene_tag.h"
 
-/* 8001EC74-8001ECB0 0195B4 003C+00 0/0 1/1 0/0 .text            fopScnIt_Judge__FPFPvPv_PvPv */
 void* fopScnIt_Judge(fop_ScnItFunc i_judgeFunc, void* i_data) {
     struct {
         fop_ScnItFunc func;
diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp
index 9ff8b8a5f4..b547549200 100644
--- a/src/f_op/f_op_scene_mng.cpp
+++ b/src/f_op/f_op_scene_mng.cpp
@@ -7,15 +7,12 @@
 #include "f_op/f_op_scene_iter.h"
 #include "f_op/f_op_scene_req.h"
 
-/* 8001ECB0-8001ECE0 0195F0 0030+00 0/0 7/7 1/1 .text            fopScnM_SearchByID__FUi */
 scene_class* fopScnM_SearchByID(fpc_ProcID id) {
     return (scene_class*)fopScnIt_Judge((fop_ScnItFunc)fpcSch_JudgeByID, &id);
 }
 
-/* 804505B8-804505C0 000038 0004+04 2/2 0/0 0/0 .sdata           l_scnRqID */
 static fpc_ProcID l_scnRqID = fpcM_ERROR_PROCESS_ID_e;
 
-/* 8001ECE0-8001ED3C 019620 005C+00 0/0 4/4 1/1 .text fopScnM_ChangeReq__FP11scene_classssUs */
 int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 param_4) {
     fpc_ProcID request_id = fopScnRq_Request(2, i_scene, i_procName, NULL, param_3, param_4);
     if (request_id == fpcM_ERROR_PROCESS_ID_e) {
@@ -26,20 +23,16 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 par
     return 1;
 }
 
-/* 8001ED3C-8001ED84 01967C 0048+00 0/0 1/1 0/0 .text            fopScnM_DeleteReq__FP11scene_class
- */
 fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) {
     fpc_ProcID request_id = fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0);
     return request_id != fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 8001ED84-8001EDCC 0196C4 0048+00 0/0 2/2 0/0 .text            fopScnM_CreateReq__FssUsUl */
 int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data) {
     fpc_ProcID request_id = fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3);
     return request_id != fpcM_ERROR_PROCESS_ID_e;
 }
 
-/* 8001EDCC-8001EE10 01970C 0044+00 0/0 1/1 0/0 .text            fopScnM_ReRequest__FsUl */
 u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) {
     if (l_scnRqID == fpcM_ERROR_PROCESS_ID_e) {
         return 0;
@@ -48,10 +41,8 @@ u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) {
     return fopScnRq_ReRequest(l_scnRqID, i_procName, (void*)i_data);
 }
 
-/* 8001EE10-8001EE30 019750 0020+00 0/0 1/1 0/0 .text            fopScnM_Management__Fv */
 void fopScnM_Management() {
     fopScnRq_Handler();
 }
 
-/* 8001EE30-8001EE34 019770 0004+00 0/0 1/1 0/0 .text            fopScnM_Init__Fv */
 void fopScnM_Init() {}
diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp
index ae589b2c2d..3628f188e8 100644
--- a/src/f_op/f_op_scene_pause.cpp
+++ b/src/f_op/f_op_scene_pause.cpp
@@ -7,8 +7,6 @@
 #include "f_op/f_op_scene.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 80020548-80020594 01AE88 004C+00 0/0 2/2 0/0 .text            fopScnPause_Enable__FP11scene_class
- */
 int fopScnPause_Enable(scene_class* i_scene) {
     if (i_scene != NULL) {
         fpcM_PauseEnable(i_scene, 1);
@@ -19,7 +17,6 @@ int fopScnPause_Enable(scene_class* i_scene) {
     return 0;
 }
 
-/* 80020594-8002064C 01AED4 00B8+00 0/0 2/2 0/0 .text fopScnPause_Disable__FP11scene_class */
 int fopScnPause_Disable(scene_class* i_scene) {
     if (i_scene != NULL) {
         process_node_class* process_node = i_scene->base.base.layer_tag.layer->process_node;
diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp
index 931c406e7d..8bf1afd91f 100644
--- a/src/f_op/f_op_scene_req.cpp
+++ b/src/f_op/f_op_scene_req.cpp
@@ -10,8 +10,6 @@
 #include "f_pc/f_pc_executor.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 8001EE34-8001EE64 019774 0030+00 1/0 0/0 0/0 .text
- * fopScnRq_phase_ClearOverlap__FP19scene_request_class         */
 static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) {
     if (fopOvlpM_ClearOfReq() == 1) {
         return cPhs_NEXT_e;
@@ -20,14 +18,10 @@ static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) {
     }
 }
 
-/* 8001EE64-8001EE84 0197A4 0020+00 2/0 0/0 0/0 .text
- * fopScnRq_phase_Execute__FP19scene_request_class              */
 static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) {
     return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->create_request);
 }
 
-/* 8001EE84-8001EEB4 0197C4 0030+00 1/0 0/0 0/0 .text
- * fopScnRq_phase_IsDoingOverlap__FP19scene_request_class       */
 static cPhs__Step fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq) {
     if (fopOvlpM_IsDoingReq() == 1) {
         return cPhs_NEXT_e;
@@ -36,8 +30,6 @@ static cPhs__Step fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq)
     }
 }
 
-/* 8001EEB4-8001EEE4 0197F4 0030+00 1/0 0/0 0/0 .text
- * fopScnRq_phase_IsDoneOverlap__FP19scene_request_class        */
 static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) {
     if (fopOvlpM_IsDone() == 1) {
         return cPhs_NEXT_e;
@@ -46,11 +38,8 @@ static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq)
     }
 }
 
-/* 80450CE0-80450CE8 0001E0 0004+04 2/2 0/0 0/0 .sbss            l_fopScnRq_IsUsingOfOverlap */
 static BOOL l_fopScnRq_IsUsingOfOverlap;
 
-/* 8001EEE4-8001EF24 019824 0040+00 2/0 0/0 0/0 .text fopScnRq_phase_Done__FP19scene_request_class
- */
 static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) {
     if (i_sceneReq->create_request.parameters != 1) {
         fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->create_request.creating_id));
@@ -60,7 +49,6 @@ static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) {
     return cPhs_NEXT_e;
 }
 
-/* 8001EF24-8001EF6C 019864 0048+00 1/0 0/0 0/0 .text fopScnRq_Execute__FP19scene_request_class */
 static void fopScnRq_Execute(scene_request_class* i_sceneReq) {
     int phase_state = cPhs_Do(&i_sceneReq->phase_request, i_sceneReq);
 
@@ -70,8 +58,6 @@ static void fopScnRq_Execute(scene_request_class* i_sceneReq) {
     }
 }
 
-/* 8001EF6C-8001EFB0 0198AC 0044+00 1/0 0/0 0/0 .text
- * fopScnRq_PostMethod__FPvP19scene_request_class               */
 static int fopScnRq_PostMethod(void* i_scene, scene_request_class* i_sceneReq) {
     if (i_sceneReq->fade_request != NULL) {
         fopScnPause_Enable((scene_class*)i_scene);
@@ -80,7 +66,6 @@ static int fopScnRq_PostMethod(void* i_scene, scene_request_class* i_sceneReq) {
     return 1;
 }
 
-/* 8001EFB0-8001EFF0 0198F0 0040+00 1/0 0/0 0/0 .text fopScnRq_Cancel__FP19scene_request_class */
 static int fopScnRq_Cancel(scene_request_class* i_sceneReq) {
     if (i_sceneReq->fade_request != NULL && !fopOvlpM_Cancel()) {
         return 0;
@@ -89,7 +74,6 @@ static int fopScnRq_Cancel(scene_request_class* i_sceneReq) {
     }
 }
 
-/* 8001EFF0-8001F034 019930 0044+00 1/1 0/0 0/0 .text            fopScnRq_FadeRequest__FsUs */
 static scene_request_class* fopScnRq_FadeRequest(s16 i_procname, u16 i_peektime) {
     overlap_request_class* req = NULL;
 
@@ -101,7 +85,6 @@ static scene_request_class* fopScnRq_FadeRequest(s16 i_procname, u16 i_peektime)
     return (scene_request_class*)req;
 }
 
-/* 8001F034-8001F0FC 019974 00C8+00 0/0 3/3 0/0 .text fopScnRq_Request__FiP11scene_classsPvsUs */
 fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 i_fadename,
                      u16 i_peektime) {
     static node_create_request_method_class submethod = {
@@ -158,12 +141,10 @@ fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName,
     return req->create_request.request_id;
 }
 
-/* 8001F0FC-8001F11C 019A3C 0020+00 0/0 1/1 0/0 .text            fopScnRq_ReRequest__FUisPv */
 s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) {
     return fpcNdRq_ReRequest(i_requestId, i_procName, i_data);
 }
 
-/* 8001F11C-8001F13C 019A5C 0020+00 0/0 1/1 0/0 .text            fopScnRq_Handler__Fv */
 void fopScnRq_Handler() {
     fpcNdRq_Handler();
 }
diff --git a/src/f_op/f_op_scene_tag.cpp b/src/f_op/f_op_scene_tag.cpp
index c55ecd8465..632f9fd159 100644
--- a/src/f_op/f_op_scene_tag.cpp
+++ b/src/f_op/f_op_scene_tag.cpp
@@ -5,20 +5,16 @@
 
 #include "f_op/f_op_scene_tag.h"
 
-/* 8001F13C-8001F15C 019A7C 0020+00 0/0 1/1 0/0 .text fopScnTg_QueueTo__FP15scene_tag_class */
 void fopScnTg_QueueTo(scene_tag_class* i_sceneTag) {
     cTg_SingleCut(&i_sceneTag->base);
 }
 
-/* 803A3918-803A3928 000A38 000C+04 1/1 1/1 0/0 .data            g_fopScnTg_SceneList */
 node_list_class g_fopScnTg_SceneList = {NULL, NULL, 0};
 
-/* 8001F15C-8001F188 019A9C 002C+00 0/0 1/1 0/0 .text fopScnTg_ToQueue__FP15scene_tag_class */
 void fopScnTg_ToQueue(scene_tag_class* i_sceneTag) {
     cTg_Addition(&g_fopScnTg_SceneList, &i_sceneTag->base);
 }
 
-/* 8001F188-8001F1A8 019AC8 0020+00 0/0 1/1 0/0 .text fopScnTg_Init__FP15scene_tag_classPv */
 void fopScnTg_Init(scene_tag_class* i_sceneTag, void* i_data) {
     cTg_Create(&i_sceneTag->base, i_data);
 }
diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp
index bb16d92e63..0265048740 100644
--- a/src/f_op/f_op_view.cpp
+++ b/src/f_op/f_op_view.cpp
@@ -6,28 +6,23 @@
 #include "f_op/f_op_view.h"
 #include "f_pc/f_pc_manager.h"
 
-/* 8001F1A8-8001F1D0 019AE8 0028+00 1/0 0/0 0/0 .text            fopVw_Draw__FP10view_class */
 void fopVw_Draw(view_class* i_this) {
     fpcLf_DrawMethod(i_this->sub_method, i_this);
 }
 
-/* 8001F1D0-8001F1F8 019B10 0028+00 1/0 0/0 0/0 .text            fopVw_Execute__FP10view_class */
 void fopVw_Execute(view_class* i_this) {
     fpcMtd_Execute(&i_this->sub_method->base, i_this);
 }
 
-/* 8001F1F8-8001F220 019B38 0028+00 1/0 0/0 0/0 .text            fopVw_IsDelete__FPv */
 s32 fopVw_IsDelete(void* i_this) {
     view_class* a_this = (view_class*)i_this;
     return fpcMtd_IsDelete(&a_this->sub_method->base, a_this);
 }
 
-/* 8001F220-8001F248 019B60 0028+00 1/0 0/0 0/0 .text            fopVw_Delete__FP10view_class */
 s32 fopVw_Delete(view_class* i_this) {
     return fpcMtd_Delete(&i_this->sub_method->base, i_this);
 }
 
-/* 8001F248-8001F284 019B88 003C+00 1/0 0/0 0/0 .text            fopVw_Create__FPv */
 s32 fopVw_Create(void* i_this) {
     view_class* a_this = (view_class*)i_this;
 
@@ -38,7 +33,6 @@ s32 fopVw_Create(void* i_this) {
     return fpcMtd_Create(&a_this->sub_method->base, a_this);
 }
 
-/* 803A3928-803A3940 -00001 0014+04 0/0 2/0 0/0 .data            g_fopVw_Method */
 leafdraw_method_class g_fopVw_Method = {
     (process_method_func)fopVw_Create,  (process_method_func)fopVw_Delete,
     (process_method_func)fopVw_Execute, (process_method_func)fopVw_IsDelete,
diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp
index f9f73276aa..e10cd007e0 100644
--- a/src/f_pc/f_pc_base.cpp
+++ b/src/f_pc/f_pc_base.cpp
@@ -18,7 +18,6 @@
 #include "Z2AudioLib/Z2AudioMgr.h"
 #endif
 
-/* 8002064C-8002065C 0010+00 s=0 e=14 z=0  None .text      fpcBs_Is_JustOfType__Fii */
 BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB) {
     if (i_typeB == i_typeA) {
         return TRUE;
@@ -27,10 +26,8 @@ BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB) {
     }
 }
 
-/* 80450D00-80450D04 0004+00 s=1 e=0 z=0  None .sbss      g_fpcBs_type */
 int g_fpcBs_type;
 
-/* 8002065C-8002069C 0040+00 s=1 e=5 z=0  None .text      fpcBs_MakeOfType__FPi */
 int fpcBs_MakeOfType(int* i_type) {
     static int t_type = 0x9130000;
     if (*i_type == 0) {
@@ -39,13 +36,11 @@ int fpcBs_MakeOfType(int* i_type) {
     return *i_type;
 }
 
-/* 8002069C-800206C4 0028+00 s=0 e=2 z=0  None .text      fpcBs_MakeOfId__Fv */
 int fpcBs_MakeOfId() {
     static int process_id = 1;
     return process_id++;
 }
 
-/* 800206C4-80020720 005C+00 s=0 e=1 z=0  None .text      fpcBs_Execute__FP18base_process_class */
 int fpcBs_Execute(base_process_class* i_proc) {
     int result = 1;
 
@@ -71,8 +66,6 @@ int fpcBs_Execute(base_process_class* i_proc) {
     return result;
 }
 
-/* 80020720-80020760 0040+00 s=2 e=0 z=0  None .text      fpcBs_DeleteAppend__FP18base_process_class
- */
 void fpcBs_DeleteAppend(base_process_class* i_proc) {
     if (i_proc->append != NULL) {
         cMl::free(i_proc->append);
@@ -80,7 +73,6 @@ void fpcBs_DeleteAppend(base_process_class* i_proc) {
     }
 }
 
-/* 80020760-800207BC 005C+00 s=0 e=1 z=0  None .text      fpcBs_IsDelete__FP18base_process_class */
 int fpcBs_IsDelete(base_process_class* i_proc) {
     int result;
     layer_class* save_layer = fpcLy_CurrentLayer();
@@ -92,7 +84,6 @@ int fpcBs_IsDelete(base_process_class* i_proc) {
     return result;
 }
 
-/* 800207BC-80020820 0064+00 s=0 e=2 z=0  None .text      fpcBs_Delete__FP18base_process_class */
 int fpcBs_Delete(base_process_class* i_proc) {
     BOOL result = TRUE;
     if (result == TRUE) {
@@ -124,7 +115,6 @@ int fpcBs_Delete(base_process_class* i_proc) {
     return result;
 }
 
-/* 80020820-8002091C 00FC+00 s=0 e=2 z=0  None .text      fpcBs_Create__FsUiPv */
 base_process_class* fpcBs_Create(s16 i_profname, fpc_ProcID i_procID, void* i_append) {
     process_profile_definition* pprofile;
     base_process_class* pprocess;
diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp
index 2c0e6bdb21..481ff33598 100644
--- a/src/f_pc/f_pc_create_iter.cpp
+++ b/src/f_pc/f_pc_create_iter.cpp
@@ -9,7 +9,6 @@
 #include "f_pc/f_pc_create_req.h"
 #include "f_pc/f_pc_layer.h"
 
-/* 800209C8-80020A04 003C+00 s=0 e=1 z=0  None .text      fpcCtIt_Method__FPFPvPv_iPv */
 int fpcCtIt_Method(fpcCtIt_MethodFunc i_method, void* i_data) {
     node_method_data iter;
     iter.method = i_method;
@@ -17,7 +16,6 @@ int fpcCtIt_Method(fpcCtIt_MethodFunc i_method, void* i_data) {
     return cLsIt_Method(&g_fpcCtTg_Queue, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter);
 }
 
-/* 80020A04-80020A40 003C+00 s=1 e=2 z=0  None .text      fpcCtIt_Judge__FPFPvPv_PvPv */
 void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judge, void* i_data) {
     node_judge_data iter;
     iter.method = i_judge;
@@ -25,8 +23,6 @@ void* fpcCtIt_Judge(fpcCtIt_JudgeFunc i_judge, void* i_data) {
     return cLsIt_Judge(&g_fpcCtTg_Queue, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter);
 }
 
-/* 80020A40-80020A94 0054+00 s=1 e=0 z=0  None .text
- * fpcCtIt_filter_JudgeInLayer__FP10create_tagP16fpcCtIt_jilprm_c */
 void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_iterData) {
     create_request* create_req = (create_request*)i_createTag->base.mpTagData;
 
@@ -37,7 +33,6 @@ void* fpcCtIt_filter_JudgeInLayer(create_tag* i_createTag, fpcCtIt_jilprm_c* i_i
     }
 }
 
-/* 80020A94-80020ACC 0038+00 s=0 e=1 z=0  None .text      fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv */
 void* fpcCtIt_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_method, void* i_data) {
     fpcCtIt_jilprm_c data;
     data.layer_id = i_layerID;
diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp
index d2b5e8f45f..9e4c14a57f 100644
--- a/src/f_pc/f_pc_create_req.cpp
+++ b/src/f_pc/f_pc_create_req.cpp
@@ -12,8 +12,6 @@
 #include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0  None .text      fpcCtRq_isCreatingByID__FP10create_tagPUi
- */
 BOOL fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) {
     create_request* req = (create_request*)i_createTag->base.mpTagData;
     if (req->id == *i_id) {
@@ -23,7 +21,6 @@ BOOL fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) {
     }
 }
 
-/* 80020AE8-80020B20 0038+00 s=0 e=2 z=0  None .text      fpcCtRq_IsCreatingByID__FUi */
 BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) {
     if (fpcCtIt_Judge((fpcLyIt_JudgeFunc)fpcCtRq_isCreatingByID, &i_id) != NULL) {
         return TRUE;
@@ -32,21 +29,18 @@ BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) {
     }
 }
 
-/* 80020B20-80020B5C 003C+00 s=1 e=0 z=0  None .text      fpcCtRq_CreateQTo__FP14create_request */
 void fpcCtRq_CreateQTo(create_request* i_request) {
     fpcCtTg_CreateQTo(&i_request->base);
     fpcLy_CreatedMesg(i_request->layer);
     fpcLy_CancelQTo(&i_request->method_tag);
 }
 
-/* 80020B5C-80020BA0 0044+00 s=1 e=0 z=0  None .text      fpcCtRq_ToCreateQ__FP14create_request */
 void fpcCtRq_ToCreateQ(create_request* i_request) {
     fpcLy_CreatingMesg(i_request->layer);
     fpcLy_ToCancelQ(i_request->layer, &i_request->method_tag);
     fpcCtTg_ToCreateQ(&i_request->base);
 }
 
-/* 80020BA0-80020C14 0074+00 s=2 e=0 z=0  None .text      fpcCtRq_Delete__FP14create_request */
 BOOL fpcCtRq_Delete(create_request* i_request) {
     fpcCtRq_CreateQTo(i_request);
     if (i_request->methods != NULL && fpcMtd_Method(i_request->methods->delete_method, i_request) == 0) {
@@ -61,7 +55,6 @@ BOOL fpcCtRq_Delete(create_request* i_request) {
     return TRUE;
 }
 
-/* 80020C14-80020CAC 0098+00 s=2 e=2 z=0  None .text      fpcCtRq_Cancel__FP14create_request */
 BOOL fpcCtRq_Cancel(create_request* i_request) {
     if (i_request != NULL && !i_request->is_cancel) {
         i_request->is_cancel = TRUE;
@@ -78,7 +71,6 @@ BOOL fpcCtRq_Cancel(create_request* i_request) {
     return TRUE;
 }
 
-/* 80020CAC-80020CC8 001C+00 s=0 e=1 z=0  None .text      fpcCtRq_IsDoing__FP14create_request */
 BOOL fpcCtRq_IsDoing(create_request* i_request) {
     if (i_request != NULL)
         return i_request->is_doing;
@@ -86,7 +78,6 @@ BOOL fpcCtRq_IsDoing(create_request* i_request) {
         return FALSE;
 }
 
-/* 80020CC8-80020D84 00BC+00 s=1 e=0 z=0  None .text      fpcCtRq_Do__FP14create_request */
 BOOL fpcCtRq_Do(create_request* i_request) {
     int phase = cPhs_COMPLEATE_e;
 
@@ -120,7 +111,6 @@ BOOL fpcCtRq_Do(create_request* i_request) {
     return 1;
 }
 
-/* 80020D84-80020DB0 002C+00 s=0 e=1 z=0  None .text      fpcCtRq_Handler__Fv */
 int fpcCtRq_Handler() {
 #ifdef DEBUG
     if (g_fpcDbSv_service[3] != NULL) {
@@ -130,8 +120,6 @@ int fpcCtRq_Handler() {
     return fpcCtIt_Method((fpcCtIt_MethodFunc)fpcCtRq_Do, NULL);
 }
 
-/* 80020DB0-80020E38 0088+00 s=0 e=2 z=0  None .text
- * fpcCtRq_Create__FP11layer_classUlP27create_request_method_class */
 create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_method_class* i_methods) {
     create_request* req = (create_request*)cMl::memalignB(-4, i_size);
 
diff --git a/src/f_pc/f_pc_create_tag.cpp b/src/f_pc/f_pc_create_tag.cpp
index 5b09ece6f2..f25096cc17 100644
--- a/src/f_pc/f_pc_create_tag.cpp
+++ b/src/f_pc/f_pc_create_tag.cpp
@@ -5,20 +5,16 @@
 
 #include "f_pc/f_pc_create_tag.h"
 
-/* 803A3990-803A39A0 000C+04 s=1 e=2 z=0  None .data      g_fpcCtTg_Queue */
 node_list_class g_fpcCtTg_Queue = {NULL, NULL, 0};
 
-/* 80020E38-80020E64 002C+00 s=0 e=1 z=0  None .text      fpcCtTg_ToCreateQ__FP10create_tag */
 void fpcCtTg_ToCreateQ(create_tag* i_createTag) {
     cTg_Addition(&g_fpcCtTg_Queue, &i_createTag->base);
 }
 
-/* 80020E64-80020E84 0020+00 s=0 e=1 z=0  None .text      fpcCtTg_CreateQTo__FP10create_tag */
 void fpcCtTg_CreateQTo(create_tag* i_createTag) {
     cTg_SingleCut(&i_createTag->base);
 }
 
-/* 80020E84-80020EA8 0024+00 s=0 e=1 z=0  None .text      fpcCtTg_Init__FP10create_tagPv */
 s32 fpcCtTg_Init(create_tag* i_createTag, void* i_data) {
     cTg_Create(&i_createTag->base, i_data);
     return 1;
diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp
index 1aadd9aff1..cdc0af04b1 100644
--- a/src/f_pc/f_pc_creator.cpp
+++ b/src/f_pc/f_pc_creator.cpp
@@ -7,22 +7,18 @@
 #include "f_pc/f_pc_base.h"
 #include "f_pc/f_pc_create_req.h"
 
-/* 80020EA8-80020EC8 0020+00 s=0 e=1 z=0  None .text      fpcCt_IsCreatingByID__FUi */
 BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) {
     return fpcCtRq_IsCreatingByID(i_id);
 }
 
-/* 80020EC8-80020EEC 0024+00 s=0 e=1 z=0  None .text      fpcCt_IsDoing__FP18base_process_class */
 BOOL fpcCt_IsDoing(base_process_class* i_proc) {
     return fpcCtRq_IsDoing(i_proc->create_req);
 }
 
-/* 80020EEC-80020F10 0024+00 s=0 e=1 z=0  None .text      fpcCt_Abort__FP18base_process_class */
 BOOL fpcCt_Abort(base_process_class* i_proc) {
     return fpcCtRq_Cancel(i_proc->create_req);
 }
 
-/* 80020F10-80020F30 0020+00 s=0 e=1 z=0  None .text      fpcCt_Handler__Fv */
 int fpcCt_Handler() {
     return fpcCtRq_Handler();
 }
diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp
index 6fc016bac5..cb5e4c026c 100644
--- a/src/f_pc/f_pc_delete_tag.cpp
+++ b/src/f_pc/f_pc_delete_tag.cpp
@@ -7,10 +7,8 @@
 #include "f_pc/f_pc_delete_tag.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 803A39A0-803A39B0 000C+04 s=2 e=1 z=0  None .data      g_fpcDtTg_Queue */
 node_list_class g_fpcDtTg_Queue = {NULL, NULL, 0};
 
-/* 80020F30-80020F48 0018+00 s=0 e=1 z=0  None .text      fpcDtTg_IsEmpty__Fv */
 BOOL fpcDtTg_IsEmpty() {
     if (g_fpcDtTg_Queue.mSize == 0) {
         return TRUE;
@@ -19,18 +17,15 @@ BOOL fpcDtTg_IsEmpty() {
     }
 }
 
-/* 80020F48-80020F7C 0034+00 s=1 e=1 z=0  None .text      fpcDtTg_ToDeleteQ__FP16delete_tag_class */
 void fpcDtTg_ToDeleteQ(delete_tag_class* i_deleteTag) {
     i_deleteTag->timer = 1;
     cTg_Addition(&g_fpcDtTg_Queue, &i_deleteTag->base);
 }
 
-/* 80020F7C-80020F9C 0020+00 s=1 e=0 z=0  None .text      fpcDtTg_DeleteQTo__FP16delete_tag_class */
 void fpcDtTg_DeleteQTo(delete_tag_class* i_deleteTag) {
     cTg_SingleCut(&i_deleteTag->base);
 }
 
-/* 80020F9C-8002101C 0080+00 s=0 e=1 z=0  None .text      fpcDtTg_Do__FP16delete_tag_classPFPv_i */
 s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
     if (i_deleteTag->timer <= 0) {
         fpcDtTg_DeleteQTo(i_deleteTag);
@@ -55,7 +50,6 @@ s32 fpcDtTg_Do(delete_tag_class* i_deleteTag, delete_tag_func i_func) {
     }
 }
 
-/* 8002101C-80021040 0024+00 s=0 e=1 z=0  None .text      fpcDtTg_Init__FP16delete_tag_classPv */
 s32 fpcDtTg_Init(delete_tag_class* i_deleteTag, void* i_data) {
     cTg_Create(&i_deleteTag->base, i_data);
     return 1;
diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp
index 9f9dbe8049..36612f8f0c 100644
--- a/src/f_pc/f_pc_deletor.cpp
+++ b/src/f_pc/f_pc_deletor.cpp
@@ -12,13 +12,10 @@
 #include "f_pc/f_pc_debug_sv.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
-/* 80021040-80021060 0020+00 s=0 e=1 z=0  None .text      fpcDt_IsComplete__Fv */
 BOOL fpcDt_IsComplete() {
     return fpcDtTg_IsEmpty();
 }
 
-/* 80021060-800210D4 0074+00 s=1 e=0 z=0  None .text      fpcDt_deleteMethod__FP18base_process_class
- */
 s32 fpcDt_deleteMethod(base_process_class* i_proc) {
     fpc_ProcID id = i_proc->id;
     layer_class* layer = i_proc->delete_tag.layer;
@@ -36,7 +33,6 @@ s32 fpcDt_deleteMethod(base_process_class* i_proc) {
     return 0;
 }
 
-/* 800210D4-8002110C 0038+00 s=0 e=1 z=0  None .text      fpcDt_Handler__Fv */
 void fpcDt_Handler() {
 #ifdef DEBUG
     if (g_fpcDbSv_service[6] != NULL) {
@@ -46,7 +42,6 @@ void fpcDt_Handler() {
     cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, fpcDt_deleteMethod);
 }
 
-/* 8002110C-80021188 007C+00 s=1 e=0 z=0  None .text      fpcDt_ToQueue__FP18base_process_class */
 s32 fpcDt_ToQueue(base_process_class* i_proc) {
     if (i_proc->unk_0xA != 1 && fpcBs_IsDelete(i_proc) == 1) {
         if (fpcPi_IsInQueue(&i_proc->priority) == 1) {
@@ -62,7 +57,6 @@ s32 fpcDt_ToQueue(base_process_class* i_proc) {
     return 0;
 }
 
-/* 80021188-800212A4 011C+00 s=1 e=0 z=0  None .text      fpcDt_ToDeleteQ__FP18base_process_class */
 s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
     if (i_proc->unk_0xA == 1) {
         return 0;
@@ -107,7 +101,6 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) {
     return 0;
 }
 
-/* 800212A4-80021308 0064+00 s=0 e=3 z=0  None .text      fpcDt_Delete__FPv */
 s32 fpcDt_Delete(void* i_proc) {
     base_process_class* proc = (base_process_class*)i_proc;
     
diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp
index 04d2826e6b..6ea0b429f8 100644
--- a/src/f_pc/f_pc_draw.cpp
+++ b/src/f_pc/f_pc_draw.cpp
@@ -9,7 +9,6 @@
 #include "f_pc/f_pc_node.h"
 #include "f_pc/f_pc_pause.h"
 
-/* 80023954-800239F4 00A0+00 s=0 e=1 z=0  None .text      fpcDw_Execute__FP18base_process_class */
 s32 fpcDw_Execute(base_process_class* i_proc) {
     if (!fpcPause_IsEnable(i_proc, 2)) {
         layer_class* save_layer;
@@ -32,7 +31,6 @@ s32 fpcDw_Execute(base_process_class* i_proc) {
     return 0;
 }
 
-/* 800239F4-80023A48 0054+00 s=0 e=2 z=10  None .text      fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i */
 s32 fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) {
     s32 ret;
     cAPIGph_BeforeOfDraw();
diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp
index 73f96690bd..d85d9169c8 100644
--- a/src/f_pc/f_pc_draw_priority.cpp
+++ b/src/f_pc/f_pc_draw_priority.cpp
@@ -5,17 +5,14 @@
 
 #include "f_pc/f_pc_draw_priority.h"
 
-/* 80021308-80021310 0008+00 s=0 e=1 z=0  None .text      fpcDwPi_Get__FPC19draw_priority_class */
 s16 fpcDwPi_Get(const draw_priority_class* i_drawpriority) {
     return i_drawpriority->priority;
 }
 
-/* 80021310-80021318 0008+00 s=1 e=0 z=0  None .text      fpcDwPi_Set__FP19draw_priority_classs */
 void fpcDwPi_Set(draw_priority_class* i_drawpriority, s16 i_priority) {
     i_drawpriority->priority = i_priority;
 }
 
-/* 80021318-80021338 0020+00 s=0 e=1 z=0  None .text      fpcDwPi_Init__FP19draw_priority_classs */
 void fpcDwPi_Init(draw_priority_class* i_drawpriority, s16 i_priority) {
     fpcDwPi_Set(i_drawpriority, i_priority);
 }
diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp
index f6a981ba06..86ee24a1aa 100644
--- a/src/f_pc/f_pc_executor.cpp
+++ b/src/f_pc/f_pc_executor.cpp
@@ -9,12 +9,10 @@
 #include "f_pc/f_pc_searcher.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 80021338-80021358 0020+00 s=1 e=9 z=291  None .text      fpcEx_Search__FPFPvPv_PvPv */
 base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) {
     return (base_process_class*)fpcLyIt_AllJudge(i_judgeFunc, i_data);
 }
 
-/* 80021358-8002139C 0044+00 s=1 e=5 z=30  None .text      fpcEx_SearchByID__FUi */
 base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
     if (i_id + 2 <= 1)
         return NULL;
@@ -22,7 +20,6 @@ base_process_class* fpcEx_SearchByID(fpc_ProcID i_id) {
     return fpcEx_Search(fpcSch_JudgeByID, &i_id);
 }
 
-/* 8002139C-800213C4 0028+00 s=0 e=7 z=42  None .text      fpcEx_IsExist__FUi */
 BOOL fpcEx_IsExist(fpc_ProcID i_id) {
     if (fpcEx_SearchByID(i_id) != NULL) {
         return TRUE;
@@ -31,7 +28,6 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) {
     }
 }
 
-/* 800213C4-80021418 0054+00 s=0 e=1 z=0  None .text      fpcEx_Execute__FP18base_process_class */
 s32 fpcEx_Execute(base_process_class* i_proc) {
     if (i_proc->state.init_state != 2 || fpcPause_IsEnable(i_proc, 1) == TRUE)
         return 0;
@@ -39,7 +35,6 @@ s32 fpcEx_Execute(base_process_class* i_proc) {
     return fpcBs_Execute(i_proc);
 }
 
-/* 80021418-800214C4 00AC+00 s=1 e=0 z=0  None .text      fpcEx_ToLineQ__FP18base_process_class */
 s32 fpcEx_ToLineQ(base_process_class* i_proc) {
     base_process_class* process = &i_proc->layer_tag.layer->process_node->base;
 
@@ -67,8 +62,6 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) {
     return 0;
 }
 
-/* 800214C4-80021510 004C+00 s=0 e=1 z=0  None .text      fpcEx_ExecuteQTo__FP18base_process_class
- */
 s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
     if (fpcLyTg_QueueTo(&i_proc->layer_tag) == 1) {
         i_proc->state.init_state = 3;
@@ -78,8 +71,6 @@ s32 fpcEx_ExecuteQTo(base_process_class* i_proc) {
     return 0;
 }
 
-/* 80021510-80021568 0058+00 s=0 e=1 z=0  None .text      fpcEx_ToExecuteQ__FP18base_process_class
- */
 s32 fpcEx_ToExecuteQ(base_process_class* i_proc) {
     process_priority_class* priority = &i_proc->priority;
     if (fpcLyTg_ToQueue(&i_proc->layer_tag, priority->current_info.layer_id, priority->current_info.list_id, priority->current_info.list_priority) == 1) {
@@ -90,7 +81,6 @@ s32 fpcEx_ToExecuteQ(base_process_class* i_proc) {
     return 0;
 }
 
-/* 80021568-80021588 0020+00 s=0 e=1 z=0  None .text      fpcEx_Handler__FPFPvPv_i */
 void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc) {
     fpcLnIt_Queue(i_queueFunc);
 }
diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp
index 3d0703d218..5757d9900f 100644
--- a/src/f_pc/f_pc_fstcreate_req.cpp
+++ b/src/f_pc/f_pc_fstcreate_req.cpp
@@ -8,7 +8,6 @@
 #include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_load.h"
 
-/* 80023A48-80023A98 0050+00 s=1 e=3 z=52  None .text      fpcFCtRq_Do__FP19fast_create_request */
 s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
     if (i_createReq->create_func != NULL &&
         i_createReq->create_func(i_createReq->base.process, i_createReq->data) == 0)
@@ -19,14 +18,10 @@ s32 fpcFCtRq_Do(fast_create_request* i_createReq) {
     }
 }
 
-/* 80023A98-80023AA0 0008+00 s=1 e=0 z=0  None .text      fpcFCtRq_Delete__FP19fast_create_request
- */
 s32 fpcFCtRq_Delete(fast_create_request* i_createReq) {
     return 1;
 }
 
-/* 80023AA0-80023B70 00D0+00 s=0 e=3 z=43  None .text
- * fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv               */
 base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procname,
                                      fstCreateFunc i_createFunc, void* i_createData, void* i_append) {
     static create_request_method_class submethod = {(cPhs__Handler)fpcFCtRq_Do, NULL,
diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp
index b25c1d56bf..d376a64904 100644
--- a/src/f_pc/f_pc_layer.cpp
+++ b/src/f_pc/f_pc_layer.cpp
@@ -7,20 +7,14 @@
 #include "f_pc/f_pc_method_iter.h"
 #include "f_pc/f_pc_method_tag.h"
 
-/* 80021588-800215A8 0020+00 s=0 e=4 z=0  None .text fpcLy_CancelQTo__FP24process_method_tag_class
- */
 void fpcLy_CancelQTo(process_method_tag_class* i_methods) {
     fpcMtdTg_MethodQTo(i_methods);
 }
 
-/* 800215A8-800215CC 0024+00 s=0 e=3 z=0  None .text
- * fpcLy_ToCancelQ__FP11layer_classP24process_method_tag_class  */
 s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) {
     return fpcMtdTg_ToMethodQ(&i_layer->cancel_list, i_methods);
 }
 
-/* 800215CC-800215F8 002C+00 s=1 e=0 z=0  None .text
- * fpcLy_CancelMethod__FP24process_method_tag_class             */
 BOOL fpcLy_CancelMethod(process_method_tag_class* i_layer) {
     if (fpcMtdTg_Do(i_layer) == 1) {
         return TRUE;
@@ -29,22 +23,16 @@ BOOL fpcLy_CancelMethod(process_method_tag_class* i_layer) {
     }
 }
 
-/* 800215F8-8002161C 0024+00 s=0 e=1 z=0  None .text
- * fpcLy_IntoQueue__FP11layer_classiP16create_tag_classi        */
 s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) {
     int ret = cTg_InsertToTree(&i_layer->node_tree, i_treeListNo, i_createTag, i_no);
     return ret;
 }
 
-/* 8002161C-80021640 0024+00 s=0 e=1 z=0  None .text
- * fpcLy_ToQueue__FP11layer_classiP16create_tag_class           */
 s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) {
     int ret = cTg_AdditionToTree(&i_layer->node_tree, i_treeListNo, i_createTag);
     return ret;
 }
 
-/* 80021640-80021664 0024+00 s=0 e=1 z=0  None .text
- * fpcLy_QueueTo__FP11layer_classP16create_tag_class            */
 s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
     i_layer;
 
@@ -52,7 +40,6 @@ s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) {
     return ret;
 }
 
-/* 80021664-80021678 0014+00 s=0 e=1 z=0  None .text      fpcLy_IsDeletingMesg__FP11layer_class */
 BOOL fpcLy_IsDeletingMesg(layer_class* i_layer) {
     BOOL ret;
     if (i_layer->counts.delete_count > 0) {
@@ -64,19 +51,16 @@ BOOL fpcLy_IsDeletingMesg(layer_class* i_layer) {
     return ret;
 }
 
-/* 80021678-80021688 0010+00 s=0 e=1 z=0  None .text      fpcLy_DeletingMesg__FP11layer_class */
 void fpcLy_DeletingMesg(layer_class* i_layer) {
     i_layer->counts.delete_count++;
 }
 
-/* 80021688-800216A0 0018+00 s=0 e=1 z=0  None .text      fpcLy_DeletedMesg__FP11layer_class */
 void fpcLy_DeletedMesg(layer_class* i_layer) {
     if (i_layer->counts.delete_count > 0) {
         i_layer->counts.delete_count--;
     }
 }
 
-/* 800216A0-800216B4 0014+00 s=0 e=2 z=0  None .text      fpcLy_IsCreatingMesg__FP11layer_class */
 BOOL fpcLy_IsCreatingMesg(layer_class* i_layer) {
     BOOL ret;
     if (i_layer->counts.create_count > 0) {
@@ -88,49 +72,40 @@ BOOL fpcLy_IsCreatingMesg(layer_class* i_layer) {
     return ret;
 }
 
-/* 800216B4-800216C4 0010+00 s=0 e=2 z=0  None .text      fpcLy_CreatingMesg__FP11layer_class */
 void fpcLy_CreatingMesg(layer_class* i_layer) {
     i_layer->counts.create_count++;
 }
 
-/* 800216C4-800216DC 0018+00 s=0 e=2 z=0  None .text      fpcLy_CreatedMesg__FP11layer_class */
 void fpcLy_CreatedMesg(layer_class* i_layer) {
     if (i_layer->counts.create_count > 0) {
         i_layer->counts.create_count--;
     }
 }
 
-/* 803A39B0-803A39DC 002C+00 s=2 e=0 z=0  None .data      l_fpcLy_Crear */
 layer_class l_fpcLy_Crear = {
     NULL, NULL, 0, 0xFFFFFFFF, NULL, 0, NULL, NULL, NULL, 0, 0, 0,
 };
 
-/* 803A39DC-803A39E8 000C+00 s=3 e=0 z=0  None .data      l_fpcLy_LayerList */
 static node_list_class l_fpcLy_LayerList = {
     NULL,
     NULL,
     0,
 };
 
-/* 800216DC-800216EC 0010+00 s=2 e=3 z=0  None .text      fpcLy_RootLayer__Fv */
 layer_class* fpcLy_RootLayer() {
     return (layer_class*)l_fpcLy_LayerList.mpHead;
 }
 
-/* 80450D18-80450D1C 0004+00 s=2 e=0 z=0  None .sbss      l_fpcLy_CurrLayer_p */
 static layer_class* l_fpcLy_CurrLayer_p;
 
-/* 800216EC-800216F4 0008+00 s=1 e=13 z=0  None .text      fpcLy_SetCurrentLayer__FP11layer_class */
 void fpcLy_SetCurrentLayer(layer_class* i_layer) {
     l_fpcLy_CurrLayer_p = i_layer;
 }
 
-/* 800216F4-800216FC 0008+00 s=1 e=21 z=0  None .text      fpcLy_CurrentLayer__Fv */
 layer_class* fpcLy_CurrentLayer() {
     return l_fpcLy_CurrLayer_p;
 }
 
-/* 800216FC-8002174C 0050+00 s=1 e=0 z=0  None .text      fpcLy_Search__FUi */
 layer_class* fpcLy_Search(fpc_ProcID i_id) {
     layer_class* layer_p = fpcLy_RootLayer();
     while (layer_p != NULL) {
@@ -143,7 +118,6 @@ layer_class* fpcLy_Search(fpc_ProcID i_id) {
     return NULL;
 }
 
-/* 8002174C-800217BC 0070+00 s=0 e=5 z=0  None .text      fpcLy_Layer__FUi */
 layer_class* fpcLy_Layer(fpc_ProcID i_id) {
     if (i_id == 0 || fpcLy_RootLayer()->layer_id == i_id) {
         return fpcLy_RootLayer();
@@ -154,12 +128,10 @@ layer_class* fpcLy_Layer(fpc_ProcID i_id) {
     }
 }
 
-/* 800217BC-800217E8 002C+00 s=1 e=0 z=0  None .text      fpcLy_Regist__FP11layer_class */
 void fpcLy_Regist(layer_class* i_layer) {
     cLs_Addition(&l_fpcLy_LayerList, (node_class*)i_layer);
 }
 
-/* 800217E8-8002189C 00B4+00 s=0 e=1 z=0  None .text      fpcLy_Delete__FP11layer_class */
 s32 fpcLy_Delete(layer_class* i_layer) {
     if (i_layer->node_tree.mpLists->mSize == 0 && i_layer->cancel_list.mSize == 0) {
         cLs_SingleCut((node_class*)i_layer);
@@ -170,13 +142,10 @@ s32 fpcLy_Delete(layer_class* i_layer) {
     return 0;
 }
 
-/* 8002189C-800218C8 002C+00 s=0 e=1 z=0  None .text      fpcLy_Cancel__FP11layer_class */
 int fpcLy_Cancel(layer_class* i_layer) {
     return fpcMtdIt_Method(&i_layer->cancel_list, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod);
 }
 
-/* 800218C8-80021A00 0138+00 s=0 e=2 z=0  None .text
- * fpcLy_Create__FP11layer_classPvP15node_list_classi           */
 void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists) {
     static BOOL IsInitOfLayerList = TRUE;
     static fpc_ProcID layer_id = 0;
diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp
index 7e92cc3081..df8344aa20 100644
--- a/src/f_pc/f_pc_layer_iter.cpp
+++ b/src/f_pc/f_pc_layer_iter.cpp
@@ -8,8 +8,6 @@
 #include "SSystem/SComponent/c_tree_iter.h"
 #include "f_pc/f_pc_layer.h"
 
-/* 80021B88-80021BC0 0038+00 s=1 e=4 z=0  None .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv
- */
 s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
     layer_iter iter;
     iter.func = i_func;
@@ -17,8 +15,6 @@ s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_
     return cTrIt_Method(&i_layer->node_tree, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter);
 }
 
-/* 80021BC0-80021C28 0068+00 s=0 e=1 z=0  None .text fpcLyIt_OnlyHereLY__FP11layer_classPFPvPv_iPv
- */
 s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
     s32 result;
     layer_class* save_layer = fpcLy_CurrentLayer();
@@ -47,8 +43,6 @@ s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
     return ret;
 }
 
-/* 80021C28-80021C60 0038+00 s=0 e=3 z=0  None .text      fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv
- */
 void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data) {
     layer_iter iter;
     iter.func = i_func;
@@ -56,7 +50,6 @@ void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data
     return cTrIt_Judge(&i_layer->node_tree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter);
 }
 
-/* 80021C60-80021CD4 0074+00 s=0 e=1 z=4  None .text      fpcLyIt_AllJudge__FPFPvPv_PvPv */
 void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data) {
     void* ret;
 
diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp
index 1bf427a03f..76fd5249eb 100644
--- a/src/f_pc/f_pc_layer_tag.cpp
+++ b/src/f_pc/f_pc_layer_tag.cpp
@@ -6,8 +6,6 @@
 #include "f_pc/f_pc_layer_tag.h"
 #include "f_pc/f_pc_layer.h"
 
-/* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0  None .text
- * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs        */
 s32 fpcLyTg_ToQueue(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
                     u16 i_listPriority) {
     if (i_layer_tag->layer == NULL && i_layerID == fpcLy_NONE_e) {
@@ -47,8 +45,6 @@ s32 fpcLyTg_QueueTo(layer_management_tag_class* i_layer_tag) {
     return 0;
 }
 
-/* 80021E2C-80021EB0 0084+00 s=0 e=1 z=0  None .text
- * fpcLyTg_Move__FP26layer_management_tag_classUiUsUs           */
 s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID, u16 i_listID,
                  u16 i_listPriority) {
     layer_class* layer = fpcLy_Layer(i_layerID);
@@ -62,8 +58,6 @@ s32 fpcLyTg_Move(layer_management_tag_class* i_layer_tag, fpc_ProcID i_layerID,
     }
 }
 
-/* 80021EB0-80021F64 00B4+00 s=0 e=1 z=0  None .text
- * fpcLyTg_Init__FP26layer_management_tag_classUiPv             */
 s32 fpcLyTg_Init(layer_management_tag_class* i_layer_tag, fpc_ProcID i_id, void* i_data) {
     static layer_management_tag_class crear = {
         NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF,
diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp
index bb343afd34..9a6ce532d8 100644
--- a/src/f_pc/f_pc_leaf.cpp
+++ b/src/f_pc/f_pc_leaf.cpp
@@ -6,18 +6,14 @@
 #include "f_pc/f_pc_leaf.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 80021A00-80021A24 0024+00 s=0 e=4 z=2  None .text      fpcLf_GetPriority__FPC14leafdraw_class */
 s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) {
     return fpcDwPi_Get(&i_leaf->draw_priority);
 }
 
-/* 80021A24-80021A48 0024+00 s=1 e=6 z=0  None .text fpcLf_DrawMethod__FP21leafdraw_method_classPv
- */
 s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_process) {
     return fpcMtd_Method(i_methods->draw_method, i_process);
 }
 
-/* 80021A48-80021A80 0038+00 s=1 e=0 z=0  None .text      fpcLf_Draw__FP14leafdraw_class */
 s32 fpcLf_Draw(leafdraw_class* i_leaf) {
     s32 ret = 0;
     if (i_leaf->unk_0xBC == 0)
@@ -25,7 +21,6 @@ s32 fpcLf_Draw(leafdraw_class* i_leaf) {
     return ret;
 }
 
-/* 80021A80-80021AA8 0028+00 s=1 e=0 z=0  None .text      fpcLf_Execute__FP14leafdraw_class */
 s32 fpcLf_Execute(leafdraw_class* i_leaf) {
 #ifdef DEBUG
     if (fpcBs_Is_JustOfType(g_fpcLf_type, i_leaf->base.subtype) == 0) {
@@ -38,12 +33,10 @@ s32 fpcLf_Execute(leafdraw_class* i_leaf) {
     return fpcMtd_Execute(&i_leaf->leaf_methods->base, i_leaf);
 }
 
-/* 80021AA8-80021AD0 0028+00 s=1 e=0 z=0  None .text      fpcLf_IsDelete__FP14leafdraw_class */
 s32 fpcLf_IsDelete(leafdraw_class* i_leaf) {
     return fpcMtd_IsDelete(&i_leaf->leaf_methods->base, i_leaf);
 }
 
-/* 80021AD0-80021B14 0044+00 s=1 e=0 z=0  None .text      fpcLf_Delete__FP14leafdraw_class */
 s32 fpcLf_Delete(leafdraw_class* i_leaf) {
     s32 ret = fpcMtd_Delete(&i_leaf->leaf_methods->base, i_leaf);
     if (ret == 1) {
@@ -52,10 +45,8 @@ s32 fpcLf_Delete(leafdraw_class* i_leaf) {
     return ret;
 }
 
-/* 80450D30-80450D38 0004+04 s=1 e=1 z=0  None .sbss      g_fpcLf_type */
 int g_fpcLf_type;
 
-/* 80021B14-80021B88 0074+00 s=1 e=0 z=0  None .text      fpcLf_Create__FP14leafdraw_class */
 s32 fpcLf_Create(leafdraw_class* i_leaf) {
     if (i_leaf->base.state.init_state == 0) {
         leaf_process_profile_definition* pprofile = (leaf_process_profile_definition*)i_leaf->base.profile;
@@ -69,7 +60,6 @@ s32 fpcLf_Create(leafdraw_class* i_leaf) {
     return ret;
 }
 
-/* 803A39E8-803A3A00 0014+04 s=0 e=27 z=756  None .data      g_fpcLf_Method */
 leafdraw_method_class g_fpcLf_Method = {
     (process_method_func)fpcLf_Create,  (process_method_func)fpcLf_Delete,
     (process_method_func)fpcLf_Execute, (process_method_func)fpcLf_IsDelete,
diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp
index 91e9b8a705..f61da64924 100644
--- a/src/f_pc/f_pc_line.cpp
+++ b/src/f_pc/f_pc_line.cpp
@@ -7,10 +7,8 @@
 #include "f_pc/f_pc_node.h"
 #include "global.h"
 
-/* 803F4CF0-803F4DB0 00C0+00 s=2 e=0 z=0  None .bss       l_fpcLn_Line */
 static node_list_class l_fpcLn_Line[16];
 
-/* 80021F64-80021FB8 0054+00 s=0 e=1 z=0  None .text      fpcLn_Create__Fv */
 void fpcLn_Create() {
     s32 i = ARRAY_SIZEU(l_fpcLn_Line);
     node_list_class* line_node = l_fpcLn_Line;
@@ -18,7 +16,6 @@ void fpcLn_Create() {
         cLs_Create(line_node++);
 }
 
-/* 804505D8-804505E0 0008+00 s=0 e=2 z=0  None .sdata     g_fpcLn_Queue */
 node_lists_tree_class g_fpcLn_Queue = {
     l_fpcLn_Line,
     ARRAY_SIZEU(l_fpcLn_Line),
diff --git a/src/f_pc/f_pc_line_iter.cpp b/src/f_pc/f_pc_line_iter.cpp
index 660d3dec1b..d81c1a9617 100644
--- a/src/f_pc/f_pc_line_iter.cpp
+++ b/src/f_pc/f_pc_line_iter.cpp
@@ -11,8 +11,6 @@
 #include "f_pc/f_pc_line.h"
 
 
-/* 800236C0-80023728 0068+00 s=1 e=0 z=0  None .text
- * fpcLnIt_MethodCall__FP16create_tag_classP13method_filter     */
 static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) {
     layer_class* layer = static_cast<base_process_class*>(i_createTag->mpTagData)->layer_tag.layer;
     layer_class* save_layer = fpcLy_CurrentLayer();
@@ -25,7 +23,6 @@ static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_fi
     return ret;
 }
 
-/* 80023728-80023764 003C+00 s=0 e=1 z=0  None .text      fpcLnIt_Queue__FPFPvPv_i */
 void fpcLnIt_Queue(fpcLnIt_QueueFunc i_queueFunc) {
     method_filter filter;
     filter.mpMethodFunc = (cNdIt_MethodFunc)i_queueFunc;
diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp
index 0745775989..b17c4493bf 100644
--- a/src/f_pc/f_pc_line_tag.cpp
+++ b/src/f_pc/f_pc_line_tag.cpp
@@ -7,7 +7,6 @@
 #include "f_pc/f_pc_line.h"
 
 
-/* 800235A8-80023600 0058+00 s=0 e=1 z=0  None .text      fpcLnTg_Move__FP8line_tagi */
 s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
     if (i_lineTag->list_id != i_newListID) {
         fpcLnTg_QueueTo(i_lineTag);
@@ -17,13 +16,11 @@ s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) {
     return 1;
 }
 
-/* 80023600-80023634 0034+00 s=1 e=1 z=1  None .text      fpcLnTg_QueueTo__FP8line_tag */
 void fpcLnTg_QueueTo(line_tag* i_lineTag) {
     cTg_SingleCutFromTree(&i_lineTag->base);
     i_lineTag->list_id = -1;
 }
 
-/* 80023634-8002368C 0058+00 s=1 e=1 z=1  None .text      fpcLnTg_ToQueue__FP8line_tagi */
 s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
     if (cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->base)) {
         i_lineTag->list_id = lineListID;
@@ -33,7 +30,6 @@ s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) {
     }
 }
 
-/* 8002368C-800236C0 0034+00 s=0 e=1 z=0  None .text      fpcLnTg_Init__FP8line_tagPv */
 void fpcLnTg_Init(line_tag* i_lineTag, void* i_data) {
     cTg_Create(&i_lineTag->base, i_data);
     i_lineTag->list_id = -1;
diff --git a/src/f_pc/f_pc_load.cpp b/src/f_pc/f_pc_load.cpp
index 5f845b00cd..e7f9b10cd7 100644
--- a/src/f_pc/f_pc_load.cpp
+++ b/src/f_pc/f_pc_load.cpp
@@ -7,24 +7,20 @@
 #include "c/c_dylink.h"
 #include "SSystem/SComponent/c_phase.h"
 
-/* 80021FB8-80022008 0050+00 s=0 e=1 z=0  None .text      fpcLd_Use__Fs */
 BOOL fpcLd_Use(s16 i_procName) {
     if (fpcLd_IsLoaded(i_procName) == TRUE && fpcLd_Load(i_procName) == cPhs_COMPLEATE_e)
         return TRUE;
     return FALSE;
 }
 
-/* 80022008-8002202C 0024+00 s=1 e=0 z=0  None .text      fpcLd_IsLoaded__Fs */
 BOOL fpcLd_IsLoaded(s16 i_procName) {
     return cDyl_IsLinked((s16)i_procName);
 }
 
-/* 8002202C-80022050 0024+00 s=0 e=2 z=0  None .text      fpcLd_Free__Fs */
 void fpcLd_Free(s16 i_procName) {
     cDyl_Unlink((s16)i_procName);
 }
 
-/* 80022050-800220A0 0050+00 s=1 e=1 z=0  None .text      fpcLd_Load__Fs */
 s32 fpcLd_Load(s16 i_procName) {
     switch (cDyl_LinkASync((s16)i_procName)) {
     case cPhs_COMPLEATE_e:
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index 75203aaa29..4e49170d59 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -17,32 +17,26 @@
 #include "f_pc/f_pc_profile.h"
 #include "m_Do/m_Do_controller_pad.h"
 
-/* 800220A0-800220C0 0020+00 s=1 e=1 z=0  None .text      fpcM_Draw__FPv */
 void fpcM_Draw(void* i_proc) {
     fpcDw_Execute((base_process_class*)i_proc);
 }
 
-/* 800220C0-800220F8 0038+00 s=1 e=0 z=0  None .text      fpcM_DrawIterater__FPFPvPv_i */
 s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) {
     return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (fpcLyIt_OnlyHereFunc)i_drawIterFunc, NULL);
 }
 
-/* 800220F8-80022118 0020+00 s=1 e=0 z=1  None .text      fpcM_Execute__FPv */
 s32 fpcM_Execute(void* i_proc) {
     return fpcEx_Execute((base_process_class*)i_proc);
 }
 
-/* 80022118-80022138 0020+00 s=0 e=7 z=0  None .text      fpcM_Delete__FPv */
 s32 fpcM_Delete(void* i_proc) {
     return fpcDt_Delete((base_process_class*)i_proc);
 }
 
-/* 80022138-80022158 0020+00 s=0 e=6 z=43  None .text      fpcM_IsCreating__FUi */
 BOOL fpcM_IsCreating(fpc_ProcID i_id) {
     return fpcCt_IsCreatingByID(i_id);
 }
 
-/* 80022158-800222B8 0160+00 s=0 e=1 z=0  None .text      fpcM_Management__FPFv_vPFv_v */
 void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_postExecuteFn) {
     MtxInit();
     dComIfGd_peekZdata();
@@ -94,7 +88,6 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p
     }
 }
 
-/* 800222B8-800222F4 003C+00 s=0 e=1 z=0  None .text      fpcM_Init__Fv */
 void fpcM_Init() {
     static layer_class rootlayer;
     static node_list_class queue[10];
@@ -103,29 +96,24 @@ void fpcM_Init() {
     fpcLn_Create();
 }
 
-/* 800222F4-80022348 0054+00 s=0 e=3 z=0  None .text      fpcM_FastCreate__FsPFPv_iPvPv */
 base_process_class* fpcM_FastCreate(s16 i_procname, FastCreateReqFunc i_createReqFunc,
                                     void* i_createData, void* i_append) {
     return fpcFCtRq_Request(fpcLy_CurrentLayer(), i_procname, (fstCreateFunc)i_createReqFunc,
                             i_createData, i_append);
 }
 
-/* 80022348-8002236C 0024+00 s=0 e=1 z=0  None .text      fpcM_IsPause__FPvUc */
 s32 fpcM_IsPause(void* i_proc, u8 i_flag) {
     return fpcPause_IsEnable((base_process_class*)i_proc, i_flag & 0xFF);
 }
 
-/* 8002236C-80022390 0024+00 s=0 e=1 z=0  None .text      fpcM_PauseEnable__FPvUc */
 void fpcM_PauseEnable(void* i_proc, u8 i_flag) {
     fpcPause_Enable((process_node_class*)i_proc, i_flag & 0xFF);
 }
 
-/* 80022390-800223B4 0024+00 s=0 e=1 z=0  None .text      fpcM_PauseDisable__FPvUc */
 void fpcM_PauseDisable(void* i_proc, u8 i_flag) {
     fpcPause_Disable((process_node_class*)i_proc, i_flag & 0xFF);
 }
 
-/* 800223B4-80022428 0074+00 s=0 e=1 z=0  None .text      fpcM_JudgeInLayer__FUiPFPvPv_PvPv */
 void* fpcM_JudgeInLayer(fpc_ProcID i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data) {
     layer_class* layer = fpcLy_Layer(i_layerID);
     if (layer != NULL) {
diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp
index 54c5c5e0f6..e2fc39e220 100644
--- a/src/f_pc/f_pc_method.cpp
+++ b/src/f_pc/f_pc_method.cpp
@@ -5,7 +5,6 @@
 
 #include "f_pc/f_pc_method.h"
 
-/* 80022428-80022460 0038+00 s=4 e=6 z=0  None .text      fpcMtd_Method__FPFPv_iPv */
 s32 fpcMtd_Method(process_method_func i_method, void* i_process) {
     if (i_method != NULL)
         return i_method(i_process);
@@ -13,26 +12,18 @@ s32 fpcMtd_Method(process_method_func i_method, void* i_process) {
         return 1;
 }
 
-/* 80022460-80022484 0024+00 s=0 e=10 z=0  None .text fpcMtd_Execute__FP20process_method_classPv
- */
 s32 fpcMtd_Execute(process_method_class* i_methods, void* i_process) {
     return fpcMtd_Method(i_methods->execute_method, i_process);
 }
 
-/* 80022484-800224A8 0024+00 s=0 e=10 z=0  None .text fpcMtd_IsDelete__FP20process_method_classPv
- */
 s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_process) {
     return fpcMtd_Method(i_methods->is_delete_method, i_process);
 }
 
-/* 800224A8-800224CC 0024+00 s=0 e=10 z=0  None .text      fpcMtd_Delete__FP20process_method_classPv
- */
 s32 fpcMtd_Delete(process_method_class* i_methods, void* i_process) {
     return fpcMtd_Method(i_methods->delete_method, i_process);
 }
 
-/* 800224CC-800224F0 0024+00 s=0 e=10 z=0  None .text      fpcMtd_Create__FP20process_method_classPv
- */
 s32 fpcMtd_Create(process_method_class* i_methods, void* i_process) {
     return fpcMtd_Method(i_methods->create_method, i_process);
 }
diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp
index 5f21b50e5c..e3cbd16945 100644
--- a/src/f_pc/f_pc_method_iter.cpp
+++ b/src/f_pc/f_pc_method_iter.cpp
@@ -6,8 +6,6 @@
 #include "SSystem/SComponent/c_list_iter.h"
 #include "f_pc/f_pc_method_iter.h"
 
-/* 80023764-80023788 0024+00 s=0 e=1 z=0  None .text      fpcMtdIt_Method__FP15node_list_classPFPv_i
- */
 int fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) {
     return cLsIt_Method(i_nodeList, (cNdIt_MethodFunc)i_methods, NULL);
 }
diff --git a/src/f_pc/f_pc_method_tag.cpp b/src/f_pc/f_pc_method_tag.cpp
index 6bd58d5c89..c92bc1cb55 100644
--- a/src/f_pc/f_pc_method_tag.cpp
+++ b/src/f_pc/f_pc_method_tag.cpp
@@ -5,26 +5,18 @@
 
 #include "f_pc/f_pc_method_tag.h"
 
-/* 80023788-800237B8 0030+00 s=0 e=1 z=0  None .text      fpcMtdTg_Do__FP24process_method_tag_class
- */
 s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) {
     return i_methodTag->method(i_methodTag->data);
 }
 
-/* 800237B8-800237D8 0020+00 s=0 e=1 z=0  None .text
- * fpcMtdTg_ToMethodQ__FP15node_list_classP24process_method_tag_class */
 s32 fpcMtdTg_ToMethodQ(node_list_class* i_nodelist, process_method_tag_class* i_methodTag) {
     return cTg_Addition(i_nodelist, &i_methodTag->create_tag);
 }
 
-/* 800237D8-800237F8 0020+00 s=0 e=1 z=0  None .text
- * fpcMtdTg_MethodQTo__FP24process_method_tag_class             */
 void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag) {
     cTg_SingleCut(&i_methodTag->create_tag);
 }
 
-/* 800237F8-80023844 004C+00 s=0 e=3 z=0  None .text
- * fpcMtdTg_Init__FP24process_method_tag_classPFPv_iPv          */
 s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_method, void* i_data) {
     cTg_Create(&i_methodTag->create_tag, i_methodTag);
     i_methodTag->method = i_method;
diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp
index f5c326d20e..0982b64a94 100644
--- a/src/f_pc/f_pc_node.cpp
+++ b/src/f_pc/f_pc_node.cpp
@@ -7,13 +7,10 @@
 #include "f_pc/f_pc_layer_iter.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 800224F0-80022514 0024+00 s=1 e=1 z=0  None .text fpcNd_DrawMethod__FP21nodedraw_method_classPv
- */
 s32 fpcNd_DrawMethod(nodedraw_method_class* i_method_class, void* i_data) {
     return fpcMtd_Method(i_method_class->draw_method, i_data);
 }
 
-/* 80022514-80022580 006C+00 s=1 e=0 z=0  None .text      fpcNd_Draw__FP18process_node_class */
 s32 fpcNd_Draw(process_node_class* i_procNode) {
     s32 ret = 0;
     process_node_class* var_r28 = i_procNode;
@@ -28,7 +25,6 @@ s32 fpcNd_Draw(process_node_class* i_procNode) {
     return ret;
 }
 
-/* 80022580-800225DC 005C+00 s=1 e=0 z=0  None .text      fpcNd_Execute__FP18process_node_class */
 s32 fpcNd_Execute(process_node_class* i_procNode) {
     s32 ret = 0;
     layer_class* save_layer = fpcLy_CurrentLayer();
@@ -48,10 +44,8 @@ s32 fpcNd_Execute(process_node_class* i_procNode) {
     return ret;
 }
 
-/* 80450D40-80450D48 0004+04 s=2 e=11 z=0  None .sbss      g_fpcNd_type */
 int g_fpcNd_type;
 
-/* 800225DC-8002265C 0080+00 s=1 e=0 z=0  None .text      fpcNd_IsCreatingFromUnder__FPv */
 void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
     layer_class* layer;
     process_node_class* procnode = (process_node_class*)i_procNode;
@@ -69,11 +63,8 @@ void* fpcNd_IsCreatingFromUnder(void* i_procNode) {
     return NULL;
 }
 
-/* 804505E0-804505E8 0004+04 s=1 e=0 z=0  None .sdata     g_fpcNd_IsCheckOfDeleteTiming */
 BOOL g_fpcNd_IsCheckOfDeleteTiming = TRUE;
 
-/* 8002265C-8002269C 0040+00 s=0 e=2 z=0  None .text fpcNd_IsDeleteTiming__FP18process_node_class
- */
 s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
     if (g_fpcNd_IsCheckOfDeleteTiming == TRUE && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) {
         return 0;
@@ -82,12 +73,10 @@ s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) {
     return 1;
 }
 
-/* 8002269C-800226C4 0028+00 s=1 e=0 z=0  None .text      fpcNd_IsDelete__FP18process_node_class */
 s32 fpcNd_IsDelete(process_node_class* i_procNode) {
     return fpcMtd_IsDelete(&i_procNode->nodedraw_method->base, i_procNode);
 }
 
-/* 800226C4-80022728 0064+00 s=1 e=0 z=0  None .text      fpcNd_Delete__FP18process_node_class */
 s32 fpcNd_Delete(process_node_class* i_procNode) {
     if (!fpcLy_IsDeletingMesg(&i_procNode->layer) &&
         fpcMtd_Delete(&i_procNode->nodedraw_method->base, i_procNode) == 1)
@@ -99,7 +88,6 @@ s32 fpcNd_Delete(process_node_class* i_procNode) {
     return 0;
 }
 
-/* 80022728-800227C4 009C+00 s=1 e=0 z=0  None .text      fpcNd_Create__FP18process_node_class */
 s32 fpcNd_Create(process_node_class* i_procNode) {
     process_node_class* procnode = (process_node_class*)i_procNode;
     layer_class* save_layer;
@@ -120,7 +108,6 @@ s32 fpcNd_Create(process_node_class* i_procNode) {
     return ret;
 }
 
-/* 803A3A20-803A3A38 0014+04 s=0 e=9 z=0  None .data      g_fpcNd_Method */
 nodedraw_method_class g_fpcNd_Method = {
     (process_method_func)fpcNd_Create, (process_method_func)fpcNd_Delete,
     (process_method_func)fpcNd_Execute, (process_method_func)fpcNd_IsDelete,
diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index b608828d59..6c15f5180c 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -13,27 +13,20 @@
 #include "f_pc/f_pc_manager.h"
 #include "f_pc/f_pc_debug_sv.h"
 
-/* 800227C4-80022804 0040+00 s=1 e=0 z=0  None .text fpcNdRq_RequestQTo__FP19node_create_request
- */
 void fpcNdRq_RequestQTo(node_create_request* i_request) {
     fpcLy_CreatedMesg(i_request->layer);
     fpcLy_CancelQTo(&i_request->method_tag);
     cTg_SingleCut(&i_request->create_tag);
 }
 
-/* 803A3A38-803A3A44 000C+00 s=5 e=0 z=0  None .data      l_fpcNdRq_Queue */
 static node_list_class l_fpcNdRq_Queue = {NULL, NULL, 0};
 
-/* 80022804-80022850 004C+00 s=1 e=0 z=0  None .text fpcNdRq_ToRequestQ__FP19node_create_request
- */
 void fpcNdRq_ToRequestQ(node_create_request* i_request) {
     cTg_Addition(&l_fpcNdRq_Queue, &i_request->create_tag);
     fpcLy_ToCancelQ(i_request->layer, &i_request->method_tag);
     fpcLy_CreatingMesg(i_request->layer);
 }
 
-/* 80022850-800228A8 0058+00 s=2 e=0 z=0  None .text
- * fpcNdRq_phase_IsCreated__FP19node_create_request             */
 s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
     if (fpcCtRq_IsCreatingByID(i_request->creating_id) == TRUE) {
 #ifdef DEBUG
@@ -53,8 +46,6 @@ s32 fpcNdRq_phase_IsCreated(node_create_request* i_request) {
     }
 }
 
-/* 800228A8-80022904 005C+00 s=2 e=0 z=0  None .text fpcNdRq_phase_Create__FP19node_create_request
- */
 s32 fpcNdRq_phase_Create(node_create_request* i_request) {
     i_request->creating_id =
         fpcSCtRq_Request(i_request->layer, i_request->name,
@@ -67,14 +58,10 @@ s32 fpcNdRq_phase_Create(node_create_request* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 80022904-8002290C 0008+00 s=2 e=0 z=0  None .text
- * fpcNdRq_phase_IsDeleteTiming__FP19node_create_request        */
 s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 8002290C-8002293C 0030+00 s=2 e=0 z=0  None .text
- * fpcNdRq_phase_IsDeleted__FP19node_create_request             */
 s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
     if (fpcDt_IsComplete() == FALSE) {
 #ifdef DEBUG
@@ -91,8 +78,6 @@ s32 fpcNdRq_phase_IsDeleted(node_create_request* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 8002293C-80022990 0054+00 s=2 e=0 z=0  None .text fpcNdRq_phase_Delete__FP19node_create_request
- */
 s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
     if (i_request->node_proc.node != NULL) {
         if (fpcDt_Delete(&i_request->node_proc.node->base) == 0) {
@@ -104,8 +89,6 @@ s32 fpcNdRq_phase_Delete(node_create_request* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 80022990-800229D8 0048+00 s=1 e=0 z=0  None .text      fpcNdRq_DoPhase__FP19node_create_request
- */
 s32 fpcNdRq_DoPhase(node_create_request* i_request) {
     s32 result = cPhs_Handler(&i_request->phase_request, i_request->phase_handler, i_request);
     if (result == cPhs_NEXT_e) {
@@ -114,8 +97,6 @@ s32 fpcNdRq_DoPhase(node_create_request* i_request) {
     return result;
 }
 
-/* 800229D8-80022A3C 0064+00 s=0 e=1 z=0  None .text      fpcNdRq_Execute__FP19node_create_request
- */
 s32 fpcNdRq_Execute(node_create_request* i_request) {
     s32 result = fpcNdRq_DoPhase(i_request);
     switch (result) {
@@ -132,7 +113,6 @@ s32 fpcNdRq_Execute(node_create_request* i_request) {
     }
 }
 
-/* 80022A3C-80022AA4 0068+00 s=2 e=1 z=0  None .text      fpcNdRq_Delete__FP19node_create_request */
 s32 fpcNdRq_Delete(node_create_request* i_request) {
     fpcNdRq_RequestQTo(i_request);
     if (i_request->create_req_methods != NULL && i_request->create_req_methods->delete_method != NULL &&
@@ -145,7 +125,6 @@ s32 fpcNdRq_Delete(node_create_request* i_request) {
     return 1;
 }
 
-/* 80022AA4-80022AFC 0058+00 s=2 e=0 z=0  None .text      fpcNdRq_Cancel__FP19node_create_request */
 s32 fpcNdRq_Cancel(node_create_request* i_request) {
     if (i_request->create_req_methods != NULL &&
         fpcMtd_Method(i_request->create_req_methods->cancel_method, i_request) == 0)
@@ -158,7 +137,6 @@ s32 fpcNdRq_Cancel(node_create_request* i_request) {
 
 #define NODE_GET_NEXT(pNode) (pNode ? pNode->mpNextNode : NULL)
 
-/* 80022AFC-80022BE4 00E8+00 s=0 e=1 z=0  None .text      fpcNdRq_Handler__Fv */
 s32 fpcNdRq_Handler() {
     node_class* node = l_fpcNdRq_Queue.mpHead;
 
@@ -192,8 +170,6 @@ s32 fpcNdRq_Handler() {
     return 1;
 }
 
-/* 80022BE4-80022C50 006C+00 s=3 e=0 z=0  None .text
- * fpcNdRq_IsPossibleTarget__FP18process_node_class             */
 s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
     fpc_ProcID id = i_procNode->base.id;
     request_node_class* req_node = (request_node_class*)l_fpcNdRq_Queue.mpHead;
@@ -211,7 +187,6 @@ s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) {
     return 1;
 }
 
-/* 80022C50-80022C9C 004C+00 s=2 e=0 z=0  None .text      fpcNdRq_IsIng__FP18process_node_class */
 s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
     request_node_class* req_node;
     node_create_request* create_req;
@@ -228,7 +203,6 @@ s32 fpcNdRq_IsIng(process_node_class* i_procNode) {
     return 0;
 }
 
-/* 80022C9C-80022E14 0178+00 s=3 e=0 z=0  None .text      fpcNdRq_Create__FUl */
 node_create_request* fpcNdRq_Create(u32 i_requestSize) {
     static node_create_request clear = {
         NULL, NULL,       NULL, NULL,       0,      NULL, NULL,   NULL, NULL,
@@ -253,8 +227,6 @@ node_create_request* fpcNdRq_Create(u32 i_requestSize) {
     return req;
 }
 
-/* 80022E14-80022EB0 009C+00 s=1 e=0 z=0  None .text
- * fpcNdRq_ChangeNode__FUlP18process_node_classsPv              */
 node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i_procNode,
                                         s16 i_procName, void* i_data) {
     static cPhs__Handler methods[6] = {
@@ -279,8 +251,6 @@ node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i
     return NULL;
 }
 
-/* 80022EB0-80022F3C 008C+00 s=1 e=0 z=0  None .text fpcNdRq_DeleteNode__FUlP18process_node_class
- */
 node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i_procNode) {
     static cPhs__Handler methods[4] = {
         (cPhs__Handler)fpcNdRq_phase_IsDeleteTiming,
@@ -303,7 +273,6 @@ node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i
     return NULL;
 }
 
-/* 80022F3C-80022FE8 00AC+00 s=1 e=0 z=0  None .text      fpcNdRq_CreateNode__FUlsPv */
 node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void* i_data) {
     static cPhs__Handler methods[3] = {
         (cPhs__Handler)fpcNdRq_phase_Create,
@@ -332,8 +301,6 @@ node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void*
     return req;
 }
 
-/* 80022FE8-80023098 00B0+00 s=0 e=1 z=0  None .text
- * fpcNdRq_Request__FUliP18process_node_classsPvP32node_create_request_method_class */
 node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
                                      process_node_class* i_procNode, s16 i_procName, void* i_data,
                                      node_create_request_method_class* i_create_req_methods) {
@@ -361,7 +328,6 @@ node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType,
     return req;
 }
 
-/* 80023098-80023110 0078+00 s=1 e=0 z=0  None .text      fpcNdRq_ReChangeNode__FUisPv */
 s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
     request_node_class* req_node;
 
@@ -382,7 +348,6 @@ s32 fpcNdRq_ReChangeNode(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
     return 0;
 }
 
-/* 80023110-80023130 0020+00 s=0 e=1 z=0  None .text      fpcNdRq_ReRequest__FUisPv */
 s32 fpcNdRq_ReRequest(fpc_ProcID i_requestID, s16 i_procName, void* i_data) {
     return fpcNdRq_ReChangeNode(i_requestID, i_procName, i_data);
 }
diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp
index cef059600f..5a807e3447 100644
--- a/src/f_pc/f_pc_pause.cpp
+++ b/src/f_pc/f_pc_pause.cpp
@@ -7,7 +7,6 @@
 #include "f_pc/f_pc_node.h"
 #include "f_pc/f_pc_layer_iter.h"
 
-/* 80023844-80023868 0024+00 s=0 e=3 z=0  None .text      fpcPause_IsEnable__FPvUc */
 s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
     if ((((base_process_class*)i_proc)->pause_flag & i_flag) == i_flag) {
         return 1;
@@ -16,7 +15,6 @@ s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) {
     }
 }
 
-/* 80023868-800238D4 006C+00 s=0 e=1 z=0  None .text      fpcPause_Enable__FPvUc */
 s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
     ((base_process_class*)i_proc)->pause_flag |= i_flag;
 
@@ -27,7 +25,6 @@ s32 fpcPause_Enable(void* i_proc, u8 i_flag) {
     return 1;
 }
 
-/* 800238D4-80023948 0074+00 s=0 e=1 z=0  None .text      fpcPause_Disable__FPvUc */
 s32 fpcPause_Disable(void* i_proc, u8 i_flag) {
     u8 var_r31 = 0xFF - i_flag;
     ((base_process_class*)i_proc)->pause_flag &= var_r31;
@@ -39,7 +36,6 @@ s32 fpcPause_Disable(void* i_proc, u8 i_flag) {
     return 1;
 }
 
-/* 80023948-80023954 000C+00 s=0 e=1 z=0  None .text      fpcPause_Init__FPv */
 void fpcPause_Init(void* i_proc) {
     ((base_process_class*)i_proc)->pause_flag = 0;
 }
diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp
index 896a28b028..71b4800056 100644
--- a/src/f_pc/f_pc_priority.cpp
+++ b/src/f_pc/f_pc_priority.cpp
@@ -7,25 +7,18 @@
 #include "f_pc/f_pc_base.h"
 #include "f_pc/f_pc_layer.h"
 
-/* 80023130-80023150 0020+00 s=0 e=1 z=0  None .text fpcPi_IsInQueue__FP22process_priority_class
- */
 s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) {
     return cTg_IsUse(&i_procPriority->base);
 }
 
-/* 80023150-80023188 0038+00 s=1 e=0 z=0  None .text      fpcPi_QueueTo__FP22process_priority_class
- */
 s32 fpcPi_QueueTo(process_priority_class* i_procPriority) {
     cTg_SingleCut(&i_procPriority->base);
     fpcLy_CancelQTo(&i_procPriority->method_tag);
     return 1;
 }
 
-/* 803F4E58-803F4E68 000C+04 s=2 e=0 z=0  None .bss       l_fpcPi_Queue */
 static node_list_class l_fpcPi_Queue;
 
-/* 80023188-80023214 008C+00 s=1 e=0 z=0  None .text      fpcPi_ToQueue__FP22process_priority_class
- */
 s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
     fpc_ProcID layer = i_procPriority->queue_info.layer_id;
 
@@ -44,7 +37,6 @@ s32 fpcPi_ToQueue(process_priority_class* i_procPriority) {
     return 0;
 }
 
-/* 80023214-80023268 0054+00 s=1 e=0 z=0  None .text      fpcPi_GetFromQueue__Fv */
 process_priority_class* fpcPi_GetFromQueue() {
     process_priority_class* i_procPriority = (process_priority_class*)cTg_GetFirst(&l_fpcPi_Queue);
 
@@ -57,8 +49,6 @@ process_priority_class* fpcPi_GetFromQueue() {
     return NULL;
 }
 
-/* 80023268-800232B4 004C+00 s=1 e=1 z=0  None .text      fpcPi_Delete__FP22process_priority_class
- */
 s32 fpcPi_Delete(process_priority_class* i_procPriority) {
     static priority_id crear = {
         fpcLy_NONE_e,
@@ -71,7 +61,6 @@ s32 fpcPi_Delete(process_priority_class* i_procPriority) {
     return 1;
 }
 
-/* 800232B4-800232E8 0034+00 s=2 e=0 z=0  None .text      fpcPi_IsNormal__FUiUsUs */
 s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
     if ((i_layerID < fpcLy_SPECIAL_e) && (i_listID < 0xFFFE) && (i_priority < fpcPi_SPECIAL_e))
         return 1;
@@ -79,8 +68,6 @@ s32 fpcPi_IsNormal(fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
     return 0;
 }
 
-/* 800232E8-80023428 0140+00 s=0 e=3 z=0  None .text
- * fpcPi_Change__FP22process_priority_classUiUsUs               */
 s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u16 i_listID, u16 i_priority) {
     base_process_class* process = (base_process_class*)i_procPriority->base.mpTagData;
     BOOL changed = FALSE;
@@ -121,7 +108,6 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, fpc_ProcID i_layerID, u
     return 0;
 }
 
-/* 80023428-800234BC 0094+00 s=0 e=1 z=0  None .text      fpcPi_Handler__Fv */
 s32 fpcPi_Handler() {
     process_priority_class* i_procPriority;
     while (i_procPriority = fpcPi_GetFromQueue()) {
@@ -142,8 +128,6 @@ s32 fpcPi_Handler() {
     return 1;
 }
 
-/* 800234BC-80023564 00A8+00 s=0 e=1 z=0  None .text
- * fpcPi_Init__FP22process_priority_classPvUiUsUs               */
 s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, fpc_ProcID i_layerID, u16 i_listID,
                u16 i_priority) {
     if (!fpcPi_IsNormal(i_layerID, i_listID, i_priority))
diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp
index 33cc127328..4a4f9a1d8b 100644
--- a/src/f_pc/f_pc_profile.cpp
+++ b/src/f_pc/f_pc_profile.cpp
@@ -5,10 +5,8 @@
 
 #include "f_pc/f_pc_profile.h"
 
-/* 80450D50-80450D58 0004+04 s=1 e=0 z=2  None .sbss      g_fpcPf_ProfileList_p */
 process_profile_definition** g_fpcPf_ProfileList_p;
 
-/* 80023564-80023578 0014+00 s=0 e=1 z=0  None .text      fpcPf_Get__Fs */
 process_profile_definition* fpcPf_Get(s16 i_profname) {
     int index = i_profname;
     return g_fpcPf_ProfileList_p[index];
diff --git a/src/f_pc/f_pc_profile_lst.cpp b/src/f_pc/f_pc_profile_lst.cpp
index 5d23481728..2ccc40684d 100644
--- a/src/f_pc/f_pc_profile_lst.cpp
+++ b/src/f_pc/f_pc_profile_lst.cpp
@@ -5,7 +5,6 @@
 
 #include "f_pc/f_pc_profile_lst.h"
 
-/* 80456C84-804578E8 -00001 0C64+00 1/1 0/0 0/0 .data            g_fpcPfLst_ProfileList */
 process_profile_definition* g_fpcPfLst_ProfileList[] = {
     &g_profile_OVERLAP0,
     &g_profile_OVERLAP1,
@@ -802,12 +801,10 @@ process_profile_definition* g_fpcPfLst_ProfileList[] = {
     NULL,
 };
 
-/* 80456C58-80456C6C 000078 0014+00 0/0 1/1 0/0 .text            ModuleProlog */
 extern "C" void ModuleProlog() {
     g_fpcPf_ProfileList_p = g_fpcPfLst_ProfileList;
 }
 
-/* 80456C6C-80456C7C 00008C 0010+00 0/0 1/1 0/0 .text            ModuleEpilog */
 extern "C" void ModuleEpilog() {
     g_fpcPf_ProfileList_p = NULL;
 }
diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp
index 094dc6e187..0efeaf0a9f 100644
--- a/src/f_pc/f_pc_searcher.cpp
+++ b/src/f_pc/f_pc_searcher.cpp
@@ -5,7 +5,6 @@
 
 #include "f_pc/f_pc_searcher.h"
 
-/* 80023578-80023590 0018+00 s=0 e=3 z=77  None .text      fpcSch_JudgeForPName__FPvPv */
 void* fpcSch_JudgeForPName(void* i_proc, void* i_data) {
     if (((base_process_class*)i_proc)->name == *(s16*)i_data)
         return i_proc;
@@ -13,7 +12,6 @@ void* fpcSch_JudgeForPName(void* i_proc, void* i_data) {
     return NULL;
 }
 
-/* 80023590-800235A8 0018+00 s=0 e=44 z=270  None .text      fpcSch_JudgeByID__FPvPv */
 void* fpcSch_JudgeByID(void* i_proc, void* i_data) {
     if (((base_process_class*)i_proc)->id == *(fpc_ProcID*)i_data)
         return i_proc;
diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp
index 80191840e6..de1d54cde4 100644
--- a/src/f_pc/f_pc_stdcreate_req.cpp
+++ b/src/f_pc/f_pc_stdcreate_req.cpp
@@ -10,8 +10,6 @@
 #include "f_pc/f_pc_debug_sv.h"
 #include <dolphin.h>
 
-/* 80023B70-80023BC4 0054+00 s=1 e=0 z=5  None .text
- * fpcSCtRq_phase_Load__FP29standard_create_request_class       */
 s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
     int ret = fpcLd_Load(i_request->process_name);
 
@@ -27,8 +25,6 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
     }
 }
 
-/* 80023BC4-80023C2C 0068+00 s=1 e=0 z=9  None .text
- * fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
     fpcLy_SetCurrentLayer(i_request->base.layer);
     i_request->base.process =
@@ -44,8 +40,6 @@ s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_request) {
     }
 }
 
-/* 80023C2C-80023C64 0038+00 s=1 e=0 z=3  None .text
- * fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
     fpcLy_SetCurrentLayer(i_request->base.layer);
     int ret = fpcBs_SubCreate(i_request->base.process);
@@ -62,8 +56,6 @@ s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_request) {
     return ret;
 }
 
-/* 80023C64-80023CBC 0058+00 s=1 e=0 z=14  None .text
- * fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
     process_node_class* procNode = (process_node_class*)i_request->base.process;
     if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.subtype) == TRUE) {
@@ -74,8 +66,6 @@ s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 80023CBC-80023D0C 0050+00 s=1 e=0 z=5  None .text
- * fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */
 s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
     stdCreateFunc create_func = i_request->create_post_method;
 
@@ -89,14 +79,10 @@ s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 80023D0C-80023D14 0008+00 s=1 e=0 z=0  None .text
- * fpcSCtRq_phase_Done__FP29standard_create_request_class       */
 s32 fpcSCtRq_phase_Done(standard_create_request_class* i_request) {
     return cPhs_NEXT_e;
 }
 
-/* 80023D14-80023D84 0070+00 s=1 e=0 z=2  None .text
- * fpcSCtRq_Handler__FP29standard_create_request_class          */
 s32 fpcSCtRq_Handler(standard_create_request_class* i_request) {
     s32 phase_state = cPhs_Do(&i_request->phase_request, i_request);
 
@@ -112,20 +98,14 @@ s32 fpcSCtRq_Handler(standard_create_request_class* i_request) {
     }
 }
 
-/* 80023D84-80023D8C 0008+00 s=1 e=0 z=0  None .text
- * fpcSCtRq_Delete__FP29standard_create_request_class           */
 s32 fpcSCtRq_Delete(standard_create_request_class* i_request) {
     return 1;
 }
 
-/* 80023D8C-80023D94 0008+00 s=1 e=0 z=1  None .text
- * fpcSCtRq_Cancel__FP29standard_create_request_class           */
 s32 fpcSCtRq_Cancel(standard_create_request_class* i_request) {
     return 1;
 }
 
-/* 80023D94-80023E28 0094+00 s=0 e=12 z=1  None .text
- * fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv               */
 fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc,
                      void* param_4, void* i_append) {
     static create_request_method_class submethod = {
diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp
index b6f2dd9508..6bd81a52ef 100644
--- a/src/m_Do/m_Do_DVDError.cpp
+++ b/src/m_Do/m_Do_DVDError.cpp
@@ -10,22 +10,17 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_Reset.h"
 
-/* 80450C88-80450C90 000188 0008+00 0/0 2/2 0/0 .sbss            None */
 bool mDoDvdErr_initialized;
 
-/* 803DECC0-803DEFE0 00B9E0 0318+08 4/4 0/0 0/0 .bss             DvdErr_thread */
 static OSThread DvdErr_thread;
 
-/* 803DEFE0-803DFBE0 00BD00 0C00+00 0/1 0/0 0/0 .bss             DvdErr_stack */
 #pragma push
 #pragma force_active on
-static u8 DvdErr_stack[3072] ALIGN_DECL(16);
+static u8 DvdErr_stack[3072] ATTRIBUTE_ALIGN(16);
 #pragma pop
 
-/* 803DFBE0-803DFC20 00C900 0028+18 1/2 0/0 0/0 .bss             Alarm */
 static OSAlarm Alarm;
 
-/* 8001659C-8001665C 010EDC 00C0+00 0/0 1/1 0/0 .text            mDoDvdErr_ThdInit__Fv */
 void mDoDvdErr_ThdInit() {
     if (!mDoDvdErr_initialized) {
         OSTime time = OSGetTime();
@@ -42,7 +37,6 @@ void mDoDvdErr_ThdInit() {
     }
 }
 
-/* 8001665C-800166A4 010F9C 0048+00 0/0 1/1 0/0 .text            mDoDvdErr_ThdCleanup__Fv */
 void mDoDvdErr_ThdCleanup() {
     if (mDoDvdErr_initialized) {
         OSCancelThread(&DvdErr_thread);
@@ -51,7 +45,6 @@ void mDoDvdErr_ThdCleanup() {
     }
 }
 
-/* 800166A4-80016704 010FE4 0060+00 1/1 0/0 0/0 .text            mDoDvdErr_Watch__FPv */
 static void mDoDvdErr_Watch(void*) {
     OSDisableInterrupts();
     { JKRThread thread(OSGetCurrentThread(), 0); }
@@ -66,8 +59,6 @@ static void mDoDvdErr_Watch(void*) {
     } while (true);
 }
 
-/* 80016704-8001672C 011044 0028+00 1/1 0/0 0/0 .text            AlarmHandler__FP7OSAlarmP9OSContext
- */
 static void AlarmHandler(OSAlarm*, OSContext*) {
     OSResumeThread(&DvdErr_thread);
 }
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 2e207e1569..29248e5b69 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -17,16 +17,12 @@
 #define CHECKSPACE_RESULT_NOENT    2
 #define CHECKSPACE_RESULT_ERROR    3
 
-/* 8001672C-80016730 01106C 0004+00 1/1 0/0 0/0 .text            __ct__15mDoMemCd_Ctrl_cFv */
 mDoMemCd_Ctrl_c::mDoMemCd_Ctrl_c() {}
 
-/* 803DFC20-803E0C20 00C940 1000+00 1/1 0/0 0/0 .bss             MemCardStack */
 static u8 MemCardStack[0x1000];
 
-/* 803E0C20-803E0F40 00D940 0318+08 1/1 0/0 0/0 .bss             MemCardThread */
 static OSThread MemCardThread;
 
-/* 80016730-800167D0 011070 00A0+00 0/0 1/1 0/0 .text            ThdInit__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::ThdInit() {
     CARDInit();
     mCopyToPos = 0;
@@ -47,7 +43,6 @@ void mDoMemCd_Ctrl_c::ThdInit() {
     OS_REPORT("メモリーカードスレッド起動\n");
 }
 
-/* 800167D0-80016894 011110 00C4+00 1/1 0/0 0/0 .text            main__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::main() {
     do {
         OSLockMutex(&mMutex);
@@ -80,7 +75,6 @@ void mDoMemCd_Ctrl_c::main() {
     } while (true);
 }
 
-/* 80016894-800169B4 0111D4 0120+00 0/0 1/1 0/0 .text            update__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::update() {
     if (mDoRst::isReset()) {
         OSLockMutex(&mMutex);
@@ -107,7 +101,6 @@ void mDoMemCd_Ctrl_c::update() {
     }
 }
 
-/* 800169B4-80016A0C 0112F4 0058+00 0/0 2/2 0/0 .text            load__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::load() {
     if (OSTryLockMutex(&mMutex)) {
         field_0x1fc8 = 0;
@@ -117,7 +110,6 @@ void mDoMemCd_Ctrl_c::load() {
     }
 }
 
-/* 80016A0C-80016AB0 01134C 00A4+00 1/1 0/0 0/0 .text            restore__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::restore() {
     CARDFileInfo file;
     field_0x1fc8 = 0;
@@ -140,8 +132,6 @@ void mDoMemCd_Ctrl_c::restore() {
     field_0x1fc8 = 1;
 }
 
-/* 80016AB0-80016B58 0113F0 00A8+00 0/0 2/2 0/0 .text            LoadSync__15mDoMemCd_Ctrl_cFPvUlUl
- */
 s32 mDoMemCd_Ctrl_c::LoadSync(void* i_buffer, u32 i_size, u32 i_position) {
     int ret = 0;
 
@@ -164,7 +154,6 @@ s32 mDoMemCd_Ctrl_c::LoadSync(void* i_buffer, u32 i_size, u32 i_position) {
     return ret;
 }
 
-/* 80016B58-80016BD4 011498 007C+00 0/0 2/2 0/0 .text            save__15mDoMemCd_Ctrl_cFPvUlUl */
 void mDoMemCd_Ctrl_c::save(void* i_buffer, u32 i_size, u32 i_position) {
     if (OSTryLockMutex(&mMutex)) {
         memcpy(&mData[i_position], i_buffer, i_size);
@@ -175,7 +164,6 @@ void mDoMemCd_Ctrl_c::save(void* i_buffer, u32 i_size, u32 i_position) {
     }
 }
 
-/* 80016BD4-80016CE0 011514 010C+00 1/1 0/0 0/0 .text            store__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::store() {
     CARDFileInfo file;
     s32 ret;
@@ -212,7 +200,6 @@ void mDoMemCd_Ctrl_c::store() {
     field_0x1fc8 = 1;
 }
 
-/* 80016CE0-80016D74 011620 0094+00 0/0 6/6 0/0 .text            SaveSync__15mDoMemCd_Ctrl_cFv */
 s32 mDoMemCd_Ctrl_c::SaveSync() {
     int ret = 0;
 
@@ -237,7 +224,6 @@ s32 mDoMemCd_Ctrl_c::SaveSync() {
     return ret;
 }
 
-/* 80016D74-80016E58 0116B4 00E4+00 2/1 2/2 0/0 .text            getStatus__15mDoMemCd_Ctrl_cFUl */
 u32 mDoMemCd_Ctrl_c::getStatus(u32) {
     u32 status;
     if (OSTryLockMutex(&mMutex)) {
@@ -293,8 +279,6 @@ u32 mDoMemCd_Ctrl_c::getStatus(u32) {
     return 14;
 }
 
-/* 80016E58-80016EA8 011798 0050+00 0/0 2/2 0/0 .text            command_format__15mDoMemCd_Ctrl_cFv
- */
 void mDoMemCd_Ctrl_c::command_format() {
     if (OSTryLockMutex(&mMutex)) {
         mCardCommand = COMM_FORMAT_e;
@@ -303,7 +287,6 @@ void mDoMemCd_Ctrl_c::command_format() {
     }
 }
 
-/* 80016EA8-80016F2C 0117E8 0084+00 1/1 0/0 0/0 .text            format__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::format() {
     field_0x1fc8 = 0;
 
@@ -320,7 +303,6 @@ void mDoMemCd_Ctrl_c::format() {
     }
 }
 
-/* 80016F2C-80016FB8 01186C 008C+00 0/0 2/2 0/0 .text            FormatSync__15mDoMemCd_Ctrl_cFv */
 s32 mDoMemCd_Ctrl_c::FormatSync() {
     int ret = 0;
 
@@ -343,7 +325,6 @@ s32 mDoMemCd_Ctrl_c::FormatSync() {
     return ret;
 }
 
-/* 80016FB8-800170B8 0118F8 0100+00 1/1 0/0 0/0 .text            attach__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::attach() {
     s32 mem_size;
     s32 sector_size;
@@ -380,8 +361,6 @@ void mDoMemCd_Ctrl_c::attach() {
     }
 }
 
-/* 800170B8-80017110 0119F8 0058+00 0/0 1/1 0/0 .text            command_attach__15mDoMemCd_Ctrl_cFv
- */
 void mDoMemCd_Ctrl_c::command_attach() {
     if (OSTryLockMutex(&mMutex)) {
         mCardState = CARD_STATE_13_e;
@@ -391,16 +370,13 @@ void mDoMemCd_Ctrl_c::command_attach() {
     }
 }
 
-/* 80017110-80017148 011A50 0038+00 1/1 0/0 0/0 .text            detach__15mDoMemCd_Ctrl_cFv */
 void mDoMemCd_Ctrl_c::detach() {
     CARDUnmount(mChannel);
     mCardState = CARD_STATE_NO_CARD_e;
 }
 
-/* 803E0F40-803EAF40 00DC60 A000+00 1/1 0/0 0/0 .bss             MemCardWorkArea0 */
-static u8 MemCardWorkArea0[CARD_WORKAREA_SIZE] ALIGN_DECL(32);
+static u8 MemCardWorkArea0[CARD_WORKAREA_SIZE] ATTRIBUTE_ALIGN(32);
 
-/* 80017148-80017274 011A88 012C+00 2/1 0/0 0/0 .text            mount__15mDoMemCd_Ctrl_cFv */
 s32 mDoMemCd_Ctrl_c::mount() {
     s32 result = CARDMount(mChannel, MemCardWorkArea0, NULL);
 
@@ -439,7 +415,6 @@ s32 mDoMemCd_Ctrl_c::mount() {
     return FALSE;
 }
 
-/* 80017274-800172D4 011BB4 0060+00 1/1 0/0 0/0 .text            loadfile__15mDoMemCd_Ctrl_cFv */
 s32 mDoMemCd_Ctrl_c::loadfile() {
     CARDFileInfo file;
 
@@ -453,7 +428,6 @@ s32 mDoMemCd_Ctrl_c::loadfile() {
     }
 }
 
-/* 800172D4-80017360 011C14 008C+00 1/1 0/0 0/0 .text            checkspace__15mDoMemCd_Ctrl_cFv */
 // 
 s32 mDoMemCd_Ctrl_c::checkspace() {
     s32 bytesNotUsed, filesNotUsed;
@@ -475,8 +449,6 @@ s32 mDoMemCd_Ctrl_c::checkspace() {
     return CHECKSPACE_RESULT_READY;
 }
 
-/* 80017360-8001741C 011CA0 00BC+00 5/5 0/0 0/0 .text            setCardState__15mDoMemCd_Ctrl_cFl
- */
 void mDoMemCd_Ctrl_c::setCardState(s32 i_result) {
     switch (i_result) {
     case CARD_RESULT_IOERROR:
@@ -501,10 +473,8 @@ void mDoMemCd_Ctrl_c::setCardState(s32 i_result) {
     }
 }
 
-/* 803EAF40-803ECF40 017C60 2000+00 2/2 27/27 0/0 .bss             g_mDoMemCd_control */
 mDoMemCd_Ctrl_c g_mDoMemCd_control;
 
-/* 8001741C-80017470 011D5C 0054+00 1/1 0/0 0/0 .text            mDoMemCd_main__FPv */
 static int mDoMemCd_main(void*) {
     { JKRThread thread(OSGetCurrentThread(), 0); }
 
diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp
index 6fed29460f..5c2c33e693 100644
--- a/src/m_Do/m_Do_MemCardRWmng.cpp
+++ b/src/m_Do/m_Do_MemCardRWmng.cpp
@@ -25,10 +25,8 @@ struct data_s {
     u32 checksum;
 };
 
-/* 803ECF40-803F0F40 019C60 4000+00 2/2 0/0 0/0 .bss             sTmpBuf */
 static u8 sTmpBuf[SECTOR_SIZE * 2];
 
-/* 80017498-8001769C 011DD8 0204+00 0/0 1/1 0/0 .text mDoMemCdRWm_Store__FP12CARDFileInfoPvUl */
 s32 mDoMemCdRWm_Store(CARDFileInfo* file, void* data, u32 length) {
     mDoMemCdRWm_BuildHeader((mDoMemCdRWm_HeaderData*)sTmpBuf);
 
@@ -93,7 +91,6 @@ s32 mDoMemCdRWm_Store(CARDFileInfo* file, void* data, u32 length) {
     return ret;
 }
 
-/* 8001769C-8001787C 011FDC 01E0+00 0/0 1/1 0/0 .text mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl */
 s32 mDoMemCdRWm_Restore(CARDFileInfo* file, void* data, u32 length) {
     BOOL rewrite = FALSE;
 
@@ -156,8 +153,6 @@ s32 mDoMemCdRWm_Restore(CARDFileInfo* file, void* data, u32 length) {
     return CARD_RESULT_READY;
 }
 
-/* 8001787C-800179E4 0121BC 0168+00 1/1 0/0 0/0 .text
- * mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData          */
 static void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
     snprintf(header->mTitle, sizeof(header->mTitle), HEADER_TITLE);
 
@@ -199,7 +194,6 @@ static void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData* header) {
     dComIfGp_getCardIconResArchive()->removeResourceAll();
 }
 
-/* 800179E4-80017B4C 012324 0168+00 1/1 0/0 0/0 .text mDoMemCdRWm_SetCardStat__FP12CARDFileInfo */
 static void mDoMemCdRWm_SetCardStat(CARDFileInfo* file) {
     CARDStat stat;
     mDoMemCd_getCardStatus(file->fileNo, &stat);
@@ -228,8 +222,6 @@ static void mDoMemCdRWm_SetCardStat(CARDFileInfo* file) {
     mDoMemCd_setCardStatus(file->fileNo, &stat);
 }
 
-/* 80017B4C-80017C74 01248C 0128+00 2/2 0/0 0/0 .text mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo
- */
 static BOOL mDoMemCdRWm_CheckCardStat(CARDFileInfo* file) {
     CARDStat stat;
     mDoMemCd_getCardStatus(file->fileNo, &stat);
@@ -260,7 +252,6 @@ static BOOL mDoMemCdRWm_CheckCardStat(CARDFileInfo* file) {
     return TRUE;
 }
 
-/* 80017C74-80017CB4 0125B4 0040+00 1/1 0/0 0/0 .text            mDoMemCdRWm_CalcCheckSum__FPvUl */
 static u32 mDoMemCdRWm_CalcCheckSum(void* data, u32 size) {
     u16 high;
     u16 low;
@@ -278,7 +269,6 @@ static u32 mDoMemCdRWm_CalcCheckSum(void* data, u32 size) {
     return high << 16 | low;
 }
 
-/* 80017CB4-80017CEC 0125F4 0038+00 2/2 0/0 0/0 .text mDoMemCdRWm_CalcCheckSumGameData__FPvUl */
 static u64 mDoMemCdRWm_CalcCheckSumGameData(void* data, u32 size) {
     u32 high;
     u32 low;
@@ -296,13 +286,11 @@ static u64 mDoMemCdRWm_CalcCheckSumGameData(void* data, u32 size) {
     return (u64)high << 32 | low;
 }
 
-/* 80017CEC-80017D38 01262C 004C+00 1/1 4/4 0/0 .text mDoMemCdRWm_TestCheckSumGameData__FPv */
 BOOL mDoMemCdRWm_TestCheckSumGameData(void* data) {
     u64 checksum = mDoMemCdRWm_CalcCheckSumGameData(data, (SAVEDATA_SIZE - sizeof(u64)));
     return checksum == *(u64*)((u8*)data + (SAVEDATA_SIZE - sizeof(u64)));
 }
 
-/* 80017D38-80017D7C 012678 0044+00 0/0 4/4 0/0 .text mDoMemCdRWm_SetCheckSumGameData__FPUcUc */
 void mDoMemCdRWm_SetCheckSumGameData(u8* data, u8 dataNum) {
     u8* file_ptr = data + (dataNum * SAVEDATA_SIZE);
     *(u64*)(file_ptr + (SAVEDATA_SIZE - sizeof(u64))) = mDoMemCdRWm_CalcCheckSumGameData(file_ptr, (SAVEDATA_SIZE - sizeof(u64)));
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index 8d3c8e67ec..988faa319e 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -24,10 +24,8 @@ static void destroyVideo() {
     return;
 }
 
-/* 80450C78-80450C80 000178 0004+04 3/2 42/42 2/2 .sbss            mResetData__6mDoRst */
 mDoRstData* mDoRst::mResetData;
 
-/* 80015614-8001574C 00FF54 0138+00 0/0 3/3 0/0 .text            mDoRst_reset__FiUli */
 void mDoRst_reset(int param_0, u32 param_1, int param_2) {
     JUTXfb::getManager()->clearIndex();
     mDoDvdErr_ThdCleanup();
@@ -86,7 +84,6 @@ void mDoRst_reset(int param_0, u32 param_1, int param_2) {
     } while (true);
 }
 
-/* 8001574C-800157F4 01008C 00A8+00 0/0 3/3 0/0 .text            mDoRst_resetCallBack__FiPv */
 void mDoRst_resetCallBack(int port, void*) {
     if (!mDoRst::isReset()) {
         if (port == -1) {
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index eed29aab92..1e45660cc3 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -9,7 +9,6 @@
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
 
-/* 80450BB8-80450BBC -00001 0004+00 5/5 6/6 0/0 .sbss            None */
 /* 80450BB8 0001+00 data_80450BB8 None */
 /* 80450BB9 0001+00 data_80450BB9 None */
 /* 80450BBA 0002+00 data_80450BBA None */
@@ -19,24 +18,18 @@ bool mDoAud_zelAudio_c::mResetFlag;
 
 bool mDoAud_zelAudio_c::mBgmSet;
 
-/* 80006FB4-80006FC0 0018F4 000C+00 1/1 0/0 0/0 .text            reset__17mDoAud_zelAudio_cFv */
 void mDoAud_zelAudio_c::reset() {
     mBgmSet = false;
 }
 
-/* 803DBF4C-803DD2D8 008C6C 138C+00 3/3 0/0 0/0 .bss             g_mDoAud_zelAudio */
 static mDoAud_zelAudio_c g_mDoAud_zelAudio;
 
-/* 80450BBC-80450BC0 0000BC 0004+00 1/1 1/1 0/0 .sbss            g_mDoAud_audioHeap */
 JKRSolidHeap* g_mDoAud_audioHeap;
 
-/* 80450BC0-80450BC4 0000C0 0004+00 1/1 0/0 0/0 .sbss            l_affCommand */
 static mDoDvdThd_toMainRam_c* l_affCommand;
 
-/* 80450BC4-80450BC8 0000C4 0004+00 1/1 0/0 0/0 .sbss            l_arcCommand */
 static mDoDvdThd_mountXArchive_c* l_arcCommand;
 
-/* 80006FC0-80007164 001900 01A4+00 1/1 0/0 0/0 .text            mDoAud_Create__Fv */
 static void mDoAud_Create() {
     if (l_affCommand == NULL) {
         l_affCommand = mDoDvdThd_toMainRam_c::create("/Audiores/Z2Sound.baa", 2, NULL);
@@ -83,7 +76,6 @@ static void mDoAud_Create() {
     }
 }
 
-/* 80007164-800071BC 001AA4 0058+00 0/0 1/1 0/0 .text            mDoAud_Execute__Fv */
 void mDoAud_Execute() {
     if (!mDoAud_zelAudio_c::isInitFlag()) {
         if (!mDoRst::isShutdown() && !mDoRst::isReturnToMenu()) {
@@ -94,28 +86,23 @@ void mDoAud_Execute() {
     }
 }
 
-/* 800071BC-800071F8 001AFC 003C+00 0/0 3/3 0/0 .text            mDoAud_setSceneName__FPCcll */
 void mDoAud_setSceneName(char const* spot, s32 room, s32 layer) {
     Z2AudioMgr::getInterface()->setSceneName((char*)spot, room, layer);
 }
 
-/* 800071F8-80007224 001B38 002C+00 0/0 1/1 0/0 .text            mDoAud_load1stDynamicWave__Fv */
 s32 mDoAud_load1stDynamicWave() {
     Z2AudioMgr::getInterface()->load1stDynamicWave();
     return 1;
 }
 
-/* 80007224-80007254 001B64 0030+00 0/0 2/2 0/0 .text            mDoAud_setFadeOutStart__FUc */
 void mDoAud_setFadeOutStart(u8 param_0) {
     Z2AudioMgr::getInterface()->setFadeOutStart((u8)param_0);
 }
 
-/* 80007254-80007284 001B94 0030+00 0/0 2/2 1/1 .text            mDoAud_setFadeInStart__FUc */
 void mDoAud_setFadeInStart(u8 param_0) {
     Z2AudioMgr::getInterface()->setFadeInStart((u8)param_0);
 }
 
-/* 80007284-800072C4 001BC4 0040+00 0/0 1/1 0/0 .text            mDoAud_resetProcess__Fv */
 void mDoAud_resetProcess() {
     if (!mDoAud_zelAudio_c::isResetFlag()) {
         Z2AudioMgr::getInterface()->resetProcess(0x1E, false);
@@ -123,7 +110,6 @@ void mDoAud_resetProcess() {
     }
 }
 
-/* 800072C4-80007318 001C04 0054+00 0/0 2/2 0/0 .text            mDoAud_resetRecover__Fv */
 bool mDoAud_resetRecover() {
     if (mDoAud_zelAudio_c::isResetFlag()) {
         if (!Z2AudioMgr::getInterface()->hasReset()) {
diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp
index 5821edc511..3893d9b965 100644
--- a/src/m_Do/m_Do_controller_pad.cpp
+++ b/src/m_Do/m_Do_controller_pad.cpp
@@ -9,13 +9,10 @@
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_main.h"
 
-/* 803DD2D8-803DD2E8 009FF8 0010+00 2/2 6/6 0/0 .bss             m_gamePad__8mDoCPd_c */
 JUTGamePad* mDoCPd_c::m_gamePad[4];
 
-/* 803DD2E8-803DD3E8 00A008 0100+00 2/2 84/84 37/37 .bss             m_cpadInfo__8mDoCPd_c */
 interface_of_controller_pad mDoCPd_c::m_cpadInfo[4];
 
-/* 80007954-80007A94 002294 0140+00 0/0 1/1 0/0 .text            create__8mDoCPd_cFv */
 void mDoCPd_c::create() {
     #if PLATFORM_GCN || PLATFORM_SHIELD
     JUTGamePad* pad = new JUTGamePad(JUTGamePad::EPort1);
@@ -58,7 +55,6 @@ void mDoCPd_c::create() {
     }
 }
 
-/* 80007A94-80007B7C 0023D4 00E8+00 0/0 1/1 0/0 .text            read__8mDoCPd_cFv */
 void mDoCPd_c::read() {
     JUTGamePad::read();
 
@@ -86,8 +82,6 @@ void mDoCPd_c::read() {
     }
 }
 
-/* 80007B7C-80007CD0 0024BC 0154+00 1/1 0/0 0/0 .text
- * convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad */
 void mDoCPd_c::convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad) {
     pInterface->mButtonFlags = pPad->getButton();
     pInterface->mPressedButtonFlags = pPad->getTrigger();
@@ -108,8 +102,6 @@ void mDoCPd_c::convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad
     pInterface->mGamepadErrorFlags = pPad->getErrorStatus();
 }
 
-/* 80007CD0-80007D74 002610 00A4+00 1/1 0/0 0/0 .text
- * LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad        */
 void mDoCPd_c::LRlockCheck(interface_of_controller_pad* interface) {
     f32 trig_left = interface->mTriggerLeft;
     interface->mTrigLockL = false;
diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp
index 68dd3c8ff6..3a17914eec 100644
--- a/src/m_Do/m_Do_dvd_thread.cpp
+++ b/src/m_Do/m_Do_dvd_thread.cpp
@@ -9,11 +9,9 @@
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_ext.h"
 
-/* 800157FC-80015858 01013C 005C+00 1/1 0/1 0/0 .text            main__9mDoDvdThdFPv */
 s32 mDoDvdThd::main(void* param_0) {
     { JKRThread jkrThread(OSGetCurrentThread(), 0); }
     mDoExt_getAssertHeap()->becomeCurrentHeap();
@@ -21,13 +19,10 @@ s32 mDoDvdThd::main(void* param_0) {
     return 0;
 }
 
-/* 803DD940-803DDC60 00A660 0318+08 2/2 0/0 0/0 .bss             l_thread__9mDoDvdThd */
 OSThread mDoDvdThd::l_thread;
 
-/* 803DDC60-803DEC60 00A980 1000+00 0/1 0/0 0/0 .bss             l_threadStack__9mDoDvdThd */
 mDoDvdThdStack mDoDvdThd::l_threadStack;
 
-/* 803DEC60-803DECC0 00B980 0048+18 5/6 0/0 0/0 .bss             l_param__9mDoDvdThd */
 mDoDvdThd_param_c mDoDvdThd::l_param;
 
 #if DEBUG
@@ -46,52 +41,40 @@ u8 sDefaultDirection;
 static u8 padding[0x18];
 #pragma pop
 
-/* 80015858-800158B4 010198 005C+00 0/0 1/1 0/0 .text            create__9mDoDvdThdFl */
 void mDoDvdThd::create(s32 param_0) {
     OSCreateThread(&l_thread, (void*(*)(void*))mDoDvdThd::main, &l_param,
                    l_threadStack.stack + sizeof(l_threadStack), sizeof(l_threadStack), param_0, 1);
     OSResumeThread(&l_thread);
 }
 
-/* 800158B4-800158DC 0101F4 0028+00 0/0 1/1 0/0 .text            suspend__9mDoDvdThdFv */
 void mDoDvdThd::suspend() {
     OSSuspendThread(&l_thread);
 }
 
-/* 800158DC-800158FC 01021C 0020+00 3/3 0/0 0/0 .text            my_DVDConvertPathToEntrynum__FPCc
- */
 static s32 my_DVDConvertPathToEntrynum(char const* param_0) {
     return DVDConvertPathToEntrynum(param_0);
 }
 
-/* 800158FC-80015944 01023C 0048+00 5/4 0/0 0/0 .text            __dt__19mDoDvdThd_command_cFv */
 mDoDvdThd_command_c::~mDoDvdThd_command_c() {}
 
-/* 80015944-8001598C 010284 0048+00 1/1 0/0 0/0 .text            __ct__17mDoDvdThd_param_cFv */
 mDoDvdThd_param_c::mDoDvdThd_param_c() {
     OSInitMessageQueue(&mMessageQueue, &mMessageQueueMessages, 1);
     OSInitMutex(&mMutext);
     cLs_Create(&mNodeList);
 }
 
-/* 8001598C-800159B4 0102CC 0028+00 2/2 0/0 0/0 .text            kick__17mDoDvdThd_param_cFv */
 void mDoDvdThd_param_c::kick() {
     OSSendMessage(&mMessageQueue, NULL, OS_MESSAGE_NOBLOCK);
 }
 
-/* 800159B4-800159DC 0102F4 0028+00 1/1 0/0 0/0 .text            waitForKick__17mDoDvdThd_param_cFv
- */
 s32 mDoDvdThd_param_c::waitForKick() {
     return OSReceiveMessage(&mMessageQueue, NULL, OS_MESSAGE_BLOCK);
 }
 
-/* 800159DC-800159E4 01031C 0008+00 1/1 0/0 0/0 .text getFirstCommand__17mDoDvdThd_param_cFv */
 mDoDvdThd_command_c* mDoDvdThd_param_c::getFirstCommand() {
     return (mDoDvdThd_command_c*)mNodeList.mpHead;
 }
 
-/* 800159E4-80015A3C 010324 0058+00 4/4 0/0 0/0 .text
- * addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c         */
 void mDoDvdThd_param_c::addition(mDoDvdThd_command_c* pCommand) {
     OSLockMutex(&mMutext);
     cLs_Addition(&mNodeList, pCommand);
@@ -99,8 +82,6 @@ void mDoDvdThd_param_c::addition(mDoDvdThd_command_c* pCommand) {
     this->kick();
 }
 
-/* 80015A3C-80015A90 01037C 0054+00 1/1 0/0 0/0 .text
- * cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c              */
 void mDoDvdThd_param_c::cut(mDoDvdThd_command_c* param_0) {
     OSLockMutex(&mMutext);
     cLs_SingleCut(param_0);
@@ -108,7 +89,6 @@ void mDoDvdThd_param_c::cut(mDoDvdThd_command_c* param_0) {
     this->kick();
 }
 
-/* 80015A90-80015AD8 0103D0 0048+00 1/1 0/0 0/0 .text            cb__FPv */
 static void cb(void* param_0) {
     mDoDvdThd_command_c** pCmd = (mDoDvdThd_command_c**)param_0;
     s32 result = (*pCmd)->execute();
@@ -117,7 +97,6 @@ static void cb(void* param_0) {
     }
 }
 
-/* 80015AD8-80015B74 010418 009C+00 1/1 0/0 0/0 .text            mainLoop__17mDoDvdThd_param_cFv */
 void mDoDvdThd_param_c::mainLoop() {
     while (this->waitForKick() != 0) {
         while (mDoDvdThd_command_c* command = this->getFirstCommand()) {
@@ -131,23 +110,19 @@ void mDoDvdThd_param_c::mainLoop() {
     }
 }
 
-/* 80015B74-80015BB8 0104B4 0044+00 4/4 0/0 0/0 .text            __ct__19mDoDvdThd_command_cFv */
 mDoDvdThd_command_c::mDoDvdThd_command_c() {
     mIsDone = false;
     cNd_ForcedClear(this);
 }
 
-/* 80015BB8-80015C18 0104F8 0060+00 1/0 0/0 0/0 .text            __dt__20mDoDvdThd_callback_cFv */
 mDoDvdThd_callback_c::~mDoDvdThd_callback_c() {}
 
-/* 80015C18-80015C74 010558 005C+00 1/1 0/0 0/0 .text __ct__20mDoDvdThd_callback_cFPFPv_PvPv */
 mDoDvdThd_callback_c::mDoDvdThd_callback_c(mDoDvdThd_callback_func pFunc, void* pData) {
     mFunction = pFunc;
     mData = pData;
     mResult = NULL;
 }
 
-/* 80015C74-80015CF0 0105B4 007C+00 0/0 3/3 0/0 .text create__20mDoDvdThd_callback_cFPFPv_PvPv */
 mDoDvdThd_callback_c* mDoDvdThd_callback_c::create(mDoDvdThd_callback_func pFunc, void* pData) {
     mDoDvdThd_callback_c* callCmd =
         new (mDoExt_getCommandHeap(), -4) mDoDvdThd_callback_c(pFunc, pData);
@@ -157,20 +132,14 @@ mDoDvdThd_callback_c* mDoDvdThd_callback_c::create(mDoDvdThd_callback_func pFunc
     return callCmd;
 }
 
-/* 80015CF0-80015D44 010630 0054+00 1/0 0/0 0/0 .text            execute__20mDoDvdThd_callback_cFv
- */
 s32 mDoDvdThd_callback_c::execute() {
     mResult = mFunction(mData);
     mIsDone = true;
     return mResult != NULL;
 }
 
-/* 80015D44-80015DA4 010684 0060+00 1/0 0/0 0/0 .text            __dt__24mDoDvdThd_mountArchive_cFv
- */
 mDoDvdThd_mountArchive_c::~mDoDvdThd_mountArchive_c() {}
 
-/* 80015DA4-80015E14 0106E4 0070+00 1/1 0/0 0/0 .text            __ct__24mDoDvdThd_mountArchive_cFUc
- */
 mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8 param_0) {
     mMountDirection = param_0;
     mEntryNumber = -1;
@@ -181,8 +150,6 @@ mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8 param_0) {
     }
 }
 
-/* 80015E14-80015EDC 010754 00C8+00 0/0 10/10 1/1 .text
- * create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap            */
 mDoDvdThd_mountArchive_c* mDoDvdThd_mountArchive_c::create(char const* pArchivePath,
                                                            u8 mountDirection, JKRHeap* pHeap) {
     mDoDvdThd_mountArchive_c* mountArcCmd =
@@ -201,7 +168,6 @@ mDoDvdThd_mountArchive_c* mDoDvdThd_mountArchive_c::create(char const* pArchiveP
     return mountArcCmd;
 }
 
-/* 80015EDC-80016108 01081C 022C+00 1/0 0/0 0/0 .text execute__24mDoDvdThd_mountArchive_cFv */
 s32 mDoDvdThd_mountArchive_c::execute() {
     bool isZeldaHeap = false;
     bool isGameHeap = false;
@@ -255,12 +221,8 @@ s32 mDoDvdThd_mountArchive_c::execute() {
     return mArchive != NULL;
 }
 
-/* 80016108-80016168 010A48 0060+00 1/0 0/0 0/0 .text            __dt__25mDoDvdThd_mountXArchive_cFv
- */
 mDoDvdThd_mountXArchive_c::~mDoDvdThd_mountXArchive_c() {}
 
-/* 80016168-800161E0 010AA8 0078+00 1/1 0/0 0/0 .text
- * __ct__25mDoDvdThd_mountXArchive_cFUcQ210JKRArchive10EMountMode */
 mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode) {
     mMountDirection = mountDirection;
     mEntryNum = -1;
@@ -272,8 +234,6 @@ mDoDvdThd_mountXArchive_c::mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchi
     }
 }
 
-/* 800161E0-800162B0 010B20 00D0+00 0/0 3/3 0/0 .text
- * create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap */
 mDoDvdThd_mountXArchive_c* mDoDvdThd_mountXArchive_c::create(char const* pArchivePath,
                                                              u8 mountDirection,
                                                              JKRArchive::EMountMode mountMode,
@@ -294,7 +254,6 @@ mDoDvdThd_mountXArchive_c* mDoDvdThd_mountXArchive_c::create(char const* pArchiv
     return mountXArcCmd;
 }
 
-/* 800162B0-80016338 010BF0 0088+00 1/0 0/0 0/0 .text execute__25mDoDvdThd_mountXArchive_cFv */
 s32 mDoDvdThd_mountXArchive_c::execute() {
     JKRArchive::EMountDirection mountDirection =
         mMountDirection == 0 ? JKRArchive::MOUNT_DIRECTION_HEAD : JKRArchive::MOUNT_DIRECTION_TAIL;
@@ -305,7 +264,6 @@ s32 mDoDvdThd_mountXArchive_c::execute() {
     return result;
 }
 
-/* 80016338-80016394 010C78 005C+00 1/1 0/0 0/0 .text            __ct__21mDoDvdThd_toMainRam_cFUc */
 mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8 param_0) {
     mMountDirection = param_0;
     if (param_0 == 0) {
@@ -313,8 +271,6 @@ mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8 param_0) {
     }
 }
 
-/* 80016394-8001645C 010CD4 00C8+00 0/0 3/3 0/0 .text
- * create__21mDoDvdThd_toMainRam_cFPCcUcP7JKRHeap               */
 mDoDvdThd_toMainRam_c* mDoDvdThd_toMainRam_c::create(char const* pArchivePath, u8 mountDirection,
                                                      JKRHeap* pHeap) {
     mDoDvdThd_toMainRam_c* toMainRAMCmd =
@@ -333,11 +289,8 @@ mDoDvdThd_toMainRam_c* mDoDvdThd_toMainRam_c::create(char const* pArchivePath, u
     return toMainRAMCmd;
 }
 
-/* 8001645C-800164BC 010D9C 0060+00 1/0 0/0 0/0 .text            __dt__21mDoDvdThd_toMainRam_cFv */
 mDoDvdThd_toMainRam_c::~mDoDvdThd_toMainRam_c() {}
 
-/* 800164BC-80016574 010DFC 00B8+00 1/0 0/0 0/0 .text            execute__21mDoDvdThd_toMainRam_cFv
- */
 s32 mDoDvdThd_toMainRam_c::execute() {
     JKRHeap* heap;
     if (mHeap != NULL) {
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 87d1dfdd13..e7ca3efa65 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -18,14 +18,11 @@
 #include "JSystem/JUtility/JUTResFont.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "d/d_com_inf_game.h"
-#include "dol2asm.h"
 #include "global.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 #include "stdio.h"
 
-/* 8000D0AC-8000D320 0079EC 0274+00 5/5 0/0 0/0 .text
- * mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs              */
 static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 param_2) {
     bool local_28;
     if (cM3d_IsZero(transformInfo->mScale.x - 1.0f) && cM3d_IsZero(transformInfo->mScale.y - 1.0f) && cM3d_IsZero(transformInfo->mScale.z - 1.0f)) {
@@ -80,7 +77,6 @@ static BOOL isCurrentSolidHeap() {
     return TRUE;
 }
 
-/* 8000D320-8000D428 007C60 0108+00 6/6 0/0 0/0 .text            initPlay__14mDoExt_baseAnmFsifss */
 int mDoExt_baseAnm::initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
                              s16 i_endF) {
     mFrameCtrl.setStart(i_startF);
@@ -105,14 +101,11 @@ int mDoExt_baseAnm::initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_
     return 1;
 }
 
-/* 8000D428-8000D47C 007D68 0054+00 0/0 12/12 198/198 .text            play__14mDoExt_baseAnmFv */
 int mDoExt_baseAnm::play() {
     mFrameCtrl.update();
     return isStop();
 }
 
-/* 8000D47C-8000D518 007DBC 009C+00 0/0 3/3 6/6 .text
- * init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss */
 int mDoExt_bpkAnm::init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay,
                         int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) {
     mpAnm = i_bpk;
@@ -132,15 +125,11 @@ int mDoExt_bpkAnm::init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_
     return 1;
 }
 
-/* 8000D518-8000D54C 007E58 0034+00 0/0 3/3 6/6 .text entry__13mDoExt_bpkAnmFP16J3DMaterialTablef
- */
 void mDoExt_bpkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) {
     mpAnm->setFrame(i_frame);
     i_matTable->entryMatColorAnimator(mpAnm);
 }
 
-/* 8000D54C-8000D5E8 007E8C 009C+00 0/0 5/5 28/28 .text
- * init__13mDoExt_btpAnmFP16J3DMaterialTableP16J3DAnmTexPatterniifss */
 int mDoExt_btpAnm::init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btp, int i_anmPlay,
                         int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) {
     mpAnm = i_btp;
@@ -160,15 +149,11 @@ int mDoExt_btpAnm::init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btp, i
     return 1;
 }
 
-/* 8000D5E8-8000D63C 007F28 0054+00 0/0 5/5 28/28 .text
- * entry__13mDoExt_btpAnmFP16J3DMaterialTables                  */
 void mDoExt_btpAnm::entry(J3DMaterialTable* i_matTable, s16 i_frame) {
     mpAnm->setFrame(i_frame);
     i_matTable->entryTexNoAnimator(mpAnm);
 }
 
-/* 8000D63C-8000D6D8 007F7C 009C+00 0/0 6/6 137/137 .text
- * init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss */
 int mDoExt_btkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
                         int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) {
     mpAnm = i_btk;
@@ -188,15 +173,11 @@ int mDoExt_btkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk
     return 1;
 }
 
-/* 8000D6D8-8000D70C 008018 0034+00 0/0 7/7 117/117 .text
- * entry__13mDoExt_btkAnmFP16J3DMaterialTablef                  */
 void mDoExt_btkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) {
     mpAnm->setFrame(i_frame);
     i_matTable->entryTexMtxAnimator(mpAnm);
 }
 
-/* 8000D70C-8000D7A8 00804C 009C+00 0/0 8/8 112/112 .text
- * init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss */
 int mDoExt_brkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
                         int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) {
     mpAnm = i_brk;
@@ -216,13 +197,11 @@ int mDoExt_brkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, in
     return 1;
 }
 
-/* 8000D7A8-8000D7DC 0080E8 0034+00 0/0 8/8 96/96 .text          entry__13mDoExt_brkAnmFP16J3DMaterialTablef */
 void mDoExt_brkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) {
     mpAnm->setFrame(i_frame);
     i_matTable->entryTevRegAnimator(mpAnm);
 }
 
-/* 8000D7DC-8000D8E4 00811C 0108+00 0/0 18/18 85/85 .text        init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb */
 int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate,
                         s16 i_startF, s16 i_endF, bool i_modify) {
     JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != NULL);
@@ -242,25 +221,21 @@ int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_ra
     return 1;
 }
 
-/* 8000D990-8000D9CC 0082D0 003C+00 0/0 5/5 31/31 .text          changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform */
 void mDoExt_bckAnm::changeBckOnly(J3DAnmTransform* i_bck) {
     mAnm = i_bck;
     mpMtxCalc->setAnmTransform(mAnm);
 }
 
-/* 8000D9CC-8000D9E8 00830C 001C+00 0/0 11/11 59/59 .text        entry__13mDoExt_bckAnmFP12J3DModelDataf */
 void mDoExt_bckAnm::entry(J3DModelData* i_modelData, f32 i_frame) {
     mAnm->setFrame(i_frame);
     i_modelData->getJointNodePointer(0)->setMtxCalc(mpMtxCalc);
 }
 
-/* 8000D9E8-8000DA08 008328 0020+00 0/0 1/1 1/1 .text            entryJoint__13mDoExt_bckAnmFP12J3DModelDataUsf */
 void mDoExt_bckAnm::entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame) {
     mAnm->setFrame(i_frame);
     i_modelData->getJointNodePointer(i_jntNo)->setMtxCalc(mpMtxCalc);
 }
 
-/* 8000DA08-8000DAA8 008348 00A0+00 0/0 1/1 3/3 .text            init__13mDoExt_blkAnmFP13J3DDeformDataP13J3DAnmClusteriifss */
 int mDoExt_blkAnm::init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay,
                         int i_attribute, f32 i_rate, s16 i_start, s16 param_6) {
     mpAnm = i_blk;
@@ -280,7 +255,6 @@ int mDoExt_blkAnm::init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i
     return 1;
 }
 
-/* 8000DAA8-8000DB10 0083E8 0068+00 3/3 0/0 0/0 .text            mDoExt_changeMaterial__FP8J3DModel */
 static void mDoExt_changeMaterial(J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
 
@@ -289,7 +263,6 @@ static void mDoExt_changeMaterial(J3DModel* i_model) {
     }
 }
 
-/* 8000DB10-8000DBC8 008450 00B8+00 0/0 0/0 1/1 .text mDoExt_modelTexturePatch__FP12J3DModelData */
 void mDoExt_modelTexturePatch(J3DModelData* i_modelData) {
     j3dSys.setTexture(i_modelData->getTexture());
 
@@ -314,14 +287,12 @@ static void dummy1() {
     ((J3DPEBlock*)NULL)->patch();
 }
 
-/* 8000DBD8-8000DC2C 008518 0054+00 3/3 0/0 0/0 .text            mDoExt_modelDiff__FP8J3DModel */
 static void mDoExt_modelDiff(J3DModel* i_model) {
     i_model->calcMaterial();
     i_model->diff();
     i_model->entry();
 }
 
-/* 8000DC2C-8000DCC4 00856C 0098+00 0/0 0/0 8/8 .text            mDoExt_modelUpdate__FP8J3DModel */
 void mDoExt_modelUpdate(J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
 
@@ -338,7 +309,6 @@ void mDoExt_modelUpdate(J3DModel* i_model) {
     i_model->viewCalc();
 }
 
-/* 8000DCC4-8000DD64 008604 00A0+00 1/1 12/12 414/414 .text mDoExt_modelUpdateDL__FP8J3DModel */
 void mDoExt_modelUpdateDL(J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
 
@@ -356,7 +326,6 @@ void mDoExt_modelUpdateDL(J3DModel* i_model) {
     i_model->viewCalc();
 }
 
-/* 8000DD64-8000DDF0 0086A4 008C+00 4/4 3/3 10/10 .text            mDoExt_modelEntryDL__FP8J3DModel */
 void mDoExt_modelEntryDL(J3DModel* i_model) {
     J3DModelData* model_data = i_model->getModelData();
 
@@ -373,7 +342,6 @@ void mDoExt_modelEntryDL(J3DModel* i_model) {
     i_model->viewCalc();
 }
 
-/* 8000DDF0-8000DE8C 008730 009C+00 0/0 0/0 14/14 .text          mDoExt_btkAnmRemove__FP12J3DModelData */
 void mDoExt_btkAnmRemove(J3DModelData* i_modelData) {
     for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) {
         J3DMaterialAnm* matAnm = i_modelData->getMaterialNodePointer(i)->getMaterialAnm();
@@ -386,7 +354,6 @@ void mDoExt_btkAnmRemove(J3DModelData* i_modelData) {
     }
 }
 
-/* 8000DE8C-8000DF3C 0087CC 00B0+00 0/0 0/0 7/7 .text            mDoExt_brkAnmRemove__FP12J3DModelData */
 void mDoExt_brkAnmRemove(J3DModelData* i_modelData) {
     for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) {
         J3DMaterialAnm* matAnm = i_modelData->getMaterialNodePointer(i)->getMaterialAnm();
@@ -504,7 +471,6 @@ static void dummy2() {
     peBlock->getZCompLoc();
 }
 
-/* 8000E53C-8000E5F8 008E7C 00BC+00 0/0 0/0 19/19 .text          create__21mDoExt_invisibleModelFP8J3DModelUc */
 int mDoExt_invisibleModel::create(J3DModel* i_model, u8 param_1) {
     J3DModelData* model_data = i_model->getModelData();
 
@@ -524,8 +490,6 @@ int mDoExt_invisibleModel::create(J3DModel* i_model, u8 param_1) {
     return 1;
 }
 
-/* 8000E6C8-8000E7C0 009008 00F8+00 1/1 0/0 0/0 .text            entryJoint__21mDoExt_invisibleModelFP4cXyz
- */
 void mDoExt_invisibleModel::entryJoint(cXyz* param_0) {
     J3DModelData* modelData = mModel->getModelData();
     mDoExt_invJntPacket* packet = mpPackets;
@@ -546,7 +510,6 @@ void mDoExt_invisibleModel::entryJoint(cXyz* param_0) {
     }
 }
 
-/* 8000E7C0-8000E834 009100 0074+00 0/0 0/0 17/17 .text entryDL__21mDoExt_invisibleModelFP4cXyz */
 void mDoExt_invisibleModel::entryDL(cXyz* param_0) {
     J3DDrawBuffer* buffer0 = j3dSys.getDrawBuffer(0);
     J3DDrawBuffer* buffer1 = j3dSys.getDrawBuffer(1);
@@ -557,8 +520,6 @@ void mDoExt_invisibleModel::entryDL(cXyz* param_0) {
     j3dSys.setDrawBuffer(buffer1, 1);
 }
 
-/* 8000E834-8000EA80 009174 024C+00 0/0 0/0 7/7 .text
- * mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData    */
 void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareModelData) {
     JUT_ASSERT(1547, i_modelData != NULL && i_shareModelData != NULL);
     J3DTexture* texture = i_modelData->getTexture();
@@ -614,8 +575,6 @@ static const char* dummy3() {
         "\xAA\x82\xC8\x81\x49\x0A";
 }
 
-/* 8000EA80-8000ECC0 0093C0 0240+00 0/0 0/0 6/6 .text mDoExt_setupStageTexture__FP12J3DModelData
- */
 void mDoExt_setupStageTexture(J3DModelData* i_modelData) {
     J3DTexture* texture_p = i_modelData->getTexture();
 
@@ -664,58 +623,44 @@ void mDoExt_setupStageTexture(J3DModelData* i_modelData) {
     }
 }
 
-/* 80450C20-80450C24 000120 0004+00 2/1 0/0 0/0 .sbss            AssertHeap */
 static JKRAssertHeap* AssertHeap;
 
-/* 8000ECC0-8000ECE4 009600 0024+00 0/0 1/1 0/0 .text            mDoExt_createAssertHeap__FP7JKRHeap
- */
 JKRAssertHeap* mDoExt_createAssertHeap(JKRHeap* i_heap) {
     return AssertHeap = JKRAssertHeap::create(i_heap);
 }
 
-/* 8000ECE4-8000ECEC -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getAssertHeap__Fv */
 JKRAssertHeap* mDoExt_getAssertHeap() {
     return AssertHeap;
 }
 
-/* 80450C24-80450C28 000124 0004+00 2/1 0/0 0/0 .sbss            DbPrintHeap */
 static JKRExpHeap* DbPrintHeap;
 
-/* 8000ECEC-8000ED14 00962C 0028+00 0/0 1/1 0/0 .text mDoExt_createDbPrintHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createDbPrintHeap(u32 heapSize, JKRHeap* i_heap) {
     return DbPrintHeap = JKRExpHeap::create(heapSize, i_heap, true);
 }
 
-/* 8000ED14-8000ED1C -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getDbPrintHeap__Fv */
 JKRExpHeap* mDoExt_getDbPrintHeap() {
     return DbPrintHeap;
 }
 
-/* 80450C28-80450C2C 000128 0004+00 2/1 3/3 0/0 .sbss            gameHeap */
 JKRExpHeap* gameHeap;
 
-/* 8000ED1C-8000ED50 00965C 0034+00 0/0 1/1 0/0 .text            mDoExt_createGameHeap__FUlP7JKRHeap
- */
 JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* i_heap) {
     gameHeap = JKRExpHeap::create(heapSize, i_heap, true);
     gameHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1);
     return gameHeap;
 }
 
-/* 8000ED50-8000ED58 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getGameHeap__Fv */
 JKRExpHeap* mDoExt_getGameHeap() {
     return gameHeap;
 }
 
-/* 80450C2C-80450C30 00012C 0004+00 2/1 3/3 0/0 .sbss            zeldaHeap */
 JKRExpHeap* zeldaHeap;
 
-/* 8000ED58-8000ED80 009698 0028+00 0/0 1/1 0/0 .text mDoExt_createZeldaHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* i_heap) {
     return zeldaHeap = JKRExpHeap::create(heapSize, i_heap, true);
 }
 
-/* 8000ED80-8000ED88 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getZeldaHeap__Fv */
 JKRExpHeap* mDoExt_getZeldaHeap() {
     return zeldaHeap;
 }
@@ -728,59 +673,46 @@ s32 mDoExt_getSafeZeldaHeapSize() {
 }
 #endif
 
-/* 80450C30-80450C34 000130 0004+00 2/1 1/1 0/0 .sbss            commandHeap */
 JKRExpHeap* commandHeap;
 
-/* 8000ED88-8000EDB0 0096C8 0028+00 0/0 1/1 0/0 .text mDoExt_createCommandHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* i_heap) {
     return commandHeap = JKRExpHeap::create(heapSize, i_heap, true);
 }
 
-/* 8000EDB0-8000EDB8 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getCommandHeap__Fv */
 JKRExpHeap* mDoExt_getCommandHeap() {
     return commandHeap;
 }
 
-/* 80450C34-80450C38 000134 0004+00 3/1 5/5 0/0 .sbss            archiveHeap */
 JKRExpHeap* archiveHeap;
 
-/* 8000EDB8-8000EDEC 0096F8 0034+00 0/0 1/1 0/0 .text mDoExt_createArchiveHeap__FUlP7JKRHeap */
 JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* i_heap) {
     archiveHeap = JKRExpHeap::create(heapSize, i_heap, true);
     archiveHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1);
     return archiveHeap;
 }
 
-/* 8000EDEC-8000EDF4 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getArchiveHeap__Fv */
 JKRExpHeap* mDoExt_getArchiveHeap() {
     return archiveHeap;
 }
 
-/* 8000EDF4-8000EDFC -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getArchiveHeapPtr__Fv */
 JKRExpHeap* mDoExt_getArchiveHeapPtr() {
     return archiveHeap;
 }
 
-/* 80450C38-80450C3C 000138 0004+00 2/1 0/0 0/0 .sbss            j2dHeap */
 static JKRExpHeap* j2dHeap;
 
-/* 8000EDFC-8000EE30 00973C 0034+00 0/0 1/1 0/0 .text            mDoExt_createJ2dHeap__FUlP7JKRHeap
- */
 JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* i_heap) {
     j2dHeap = JKRExpHeap::create(heapSize, i_heap, true);
     j2dHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1);
     return j2dHeap;
 }
 
-/* 8000EE30-8000EE38 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getJ2dHeap__Fv */
 JKRExpHeap* mDoExt_getJ2dHeap() {
     return j2dHeap;
 }
 
-/* 80450C3C-80450C40 00013C 0004+00 1/0 0/0 0/0 .sbss            HostIOHeap */
 static JKRExpHeap* HostIOHeap;
 
-/* 8000EE38-8000EE40 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getHostIOHeap__Fv */
 JKRExpHeap* mDoExt_getHostIOHeap() {
     return HostIOHeap;
 }
@@ -789,7 +721,6 @@ JKRExpHeap* mDoExt_getHostIOHeap() {
 extern u8 lbl_8074C3B9[1];
 #endif
 
-/* 8000EE40-8000EED8 009780 0098+00 3/3 0/0 0/0 .text mDoExt_createSolidHeap__FUlP7JKRHeapUl */
 static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignment) {
     if (i_heap == NULL) {
         i_heap = JKRGetCurrentHeap();
@@ -850,18 +781,14 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a
     return createdHeap;
 }
 
-/* 8000EED8-8000EF20 009818 0048+00 0/0 2/2 0/0 .text mDoExt_createSolidHeapFromGame__FUlUl */
 JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment) {
     return mDoExt_createSolidHeap(i_size, mDoExt_getGameHeap(), i_alignment);
 }
 
-/* 8000EF20-8000EF68 009860 0048+00 0/0 1/1 0/0 .text mDoExt_createSolidHeapFromSystem__FUlUl */
 JKRSolidHeap* mDoExt_createSolidHeapFromSystem(u32 i_size, u32 i_alignment) {
     return mDoExt_createSolidHeap(i_size, mDoExt_getZeldaHeap(), i_alignment);
 }
 
-/* 8000EF68-8000EFBC 0098A8 0054+00 2/2 0/0 0/0 .text
- * mDoExt_createSolidHeapToCurrent__FPP7JKRHeapUlP7JKRHeapUl    */
 JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRHeap* i_parent,
                                               u32 i_alignment) {
     if (o_heap != NULL) {
@@ -876,30 +803,21 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRH
     return resultHeap;
 }
 
-/* 80450C40-80450C44 000140 0004+00 2/2 0/0 0/0 .sbss            mDoExt_SaveCurrentHeap */
 static JKRHeap* mDoExt_SaveCurrentHeap;
 
-/* 8000EFBC-8000EFF4 0098FC 0038+00 1/1 3/3 0/0 .text
- * mDoExt_createSolidHeapToCurrent__FUlP7JKRHeapUl              */
 JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32 i_size, JKRHeap* i_parent, u32 i_alignment) {
     return mDoExt_createSolidHeapToCurrent(&mDoExt_SaveCurrentHeap, i_size, i_parent, i_alignment);
 }
 
-/* 8000EFF4-8000F044 009934 0050+00 0/0 2/2 0/0 .text
- * mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl     */
 JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap** o_heap, u32 i_size,
                                                       u32 i_alignment) {
     return mDoExt_createSolidHeapToCurrent(o_heap, i_size, mDoExt_getGameHeap(), i_alignment);
 }
 
-/* 8000F044-8000F08C 009984 0048+00 0/0 7/7 0/0 .text
- * mDoExt_createSolidHeapFromGameToCurrent__FUlUl               */
 JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32 i_size, u32 i_alignment) {
     return mDoExt_createSolidHeapToCurrent(i_size, mDoExt_getGameHeap(), i_alignment);
 }
 
-/* 8000F08C-8000F158 0099CC 00CC+00 1/1 11/11 0/0 .text mDoExt_adjustSolidHeap__FP12JKRSolidHeap
- */
 u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) {
     if (i_heap == NULL) {
         return -1;
@@ -929,43 +847,33 @@ u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) {
     return result;
 }
 
-/* 8000F158-8000F18C 009A98 0034+00 0/0 1/1 0/0 .text
- * mDoExt_adjustSolidHeapToSystem__FP12JKRSolidHeap             */
 u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* i_heap) {
     u32 result = mDoExt_adjustSolidHeap(i_heap);
     mDoExt_restoreCurrentHeap();
     return result;
 }
 
-/* 8000F18C-8000F1AC 009ACC 0020+00 0/0 13/13 0/0 .text mDoExt_destroySolidHeap__FP12JKRSolidHeap
- */
 void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap) {
     i_heap->destroy();
 }
 
-/* 8000F1AC-8000F1CC 009AEC 0020+00 0/0 7/7 0/0 .text mDoExt_destroyExpHeap__FP10JKRExpHeap */
 void mDoExt_destroyExpHeap(JKRExpHeap* i_heap) {
     i_heap->destroy();
 }
 
-/* 8000F1CC-8000F1EC 009B0C 0020+00 1/1 78/78 2/2 .text            mDoExt_setCurrentHeap__FP7JKRHeap
- */
 JKRHeap* mDoExt_setCurrentHeap(JKRHeap* heap) {
     return heap->becomeCurrentHeap();
 }
 
-/* 8000F1EC-8000F1F4 -00001 0008+00 0/0 0/0 0/0 .text            mDoExt_getCurrentHeap__Fv */
 JKRHeap* mDoExt_getCurrentHeap() {
     return JKRHeap::getCurrentHeap();
 }
 
-/* 8000F1F4-8000F220 009B34 002C+00 1/1 9/9 0/0 .text            mDoExt_restoreCurrentHeap__Fv */
 void mDoExt_restoreCurrentHeap() {
     mDoExt_SaveCurrentHeap->becomeCurrentHeap();
     mDoExt_SaveCurrentHeap = NULL;
 }
 
-/* 8000F220-8000F26C 009B60 004C+00 0/0 1/1 0/0 .text mDoExt_resIDToIndex__FP10JKRArchiveUs */
 int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id) {
     JKRArchive::SDIFileEntry* res = p_archive->findIdResource(id);
 
@@ -976,8 +884,6 @@ int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id) {
     return res - p_archive->mFiles;
 }
 
-/* 8000F26C-8000F4B0 009BAC 0244+00 1/0 0/0 0/0 .text            calc__25mDoExt_MtxCalcAnmBlendTblFv
- */
 void mDoExt_MtxCalcAnmBlendTbl::calc() {
     u16 jntNo = getJoint()->getJntNo();
     j3dSys.setCurrentMtxCalc(this);
@@ -1018,7 +924,6 @@ void mDoExt_MtxCalcAnmBlendTbl::calc() {
 }
 
 
-/* 8000F4B0-8000F848 009DF0 0398+00 1/0 0/0 0/0 .text calc__28mDoExt_MtxCalcAnmBlendTblOldFv */
 void mDoExt_MtxCalcAnmBlendTblOld::calc() {
     u16 jntNo = getJoint()->getJntNo();
     j3dSys.setCurrentMtxCalc(this);
@@ -1076,8 +981,6 @@ void mDoExt_MtxCalcAnmBlendTblOld::calc() {
     }
 }
 
-/* 8000F848-8000F8CC 00A188 0084+00 0/0 26/26 8/8 .text
- * initOldFrameMorf__22mDoExt_MtxCalcOldFrameFfUsUs             */
 void mDoExt_MtxCalcOldFrame::initOldFrameMorf(f32 param_0, u16 frameStartJoint, u16 frameEndJoint) {
     if (param_0 > 0.0f) {
         mOldFrameMorfCounter = param_0;
@@ -1098,8 +1001,6 @@ void mDoExt_MtxCalcOldFrame::initOldFrameMorf(f32 param_0, u16 frameStartJoint,
     mOldFrameEndJoint = frameEndJoint;
 }
 
-/* 8000F8CC-8000F950 00A20C 0084+00 2/2 0/0 0/0 .text
- * decOldFrameMorfCounter__22mDoExt_MtxCalcOldFrameFv           */
 void mDoExt_MtxCalcOldFrame::decOldFrameMorfCounter() {
     if (mOldFrameMorfCounter > 0.0f) {
 
@@ -1121,7 +1022,6 @@ void mDoExt_MtxCalcOldFrame::decOldFrameMorfCounter() {
     }
 }
 
-/* 8000F950-8000F9D8 00A290 0088+00 3/3 0/0 0/0 .text            __ct__13mDoExt_morf_cFv */
 mDoExt_morf_c::mDoExt_morf_c() {
     mpModel = NULL;
     mpAnm = NULL;
@@ -1129,12 +1029,10 @@ mDoExt_morf_c::mDoExt_morf_c() {
     mpQuat = NULL;
 }
 
-/* 8000FAE8-8000FB7C 00A428 0094+00 4/3 0/0 0/0 .text            __dt__13mDoExt_morf_cFv */
 mDoExt_morf_c::~mDoExt_morf_c() {
     /* empty function */
 }
 
-/* 8000FB7C-8000FBC0 00A4BC 0044+00 3/3 4/4 20/20 .text            setMorf__13mDoExt_morf_cFf */
 void mDoExt_morf_c::setMorf(f32 i_morf) {
     if (mPrevMorf < 0.0f || i_morf == 0.0f) {
         mCurMorf = 1.0f;
@@ -1147,7 +1045,6 @@ void mDoExt_morf_c::setMorf(f32 i_morf) {
     mPrevMorf = mCurMorf;
 }
 
-/* 8000FBC0-8000FC4C 00A500 008C+00 3/3 0/0 0/0 .text            frameUpdate__13mDoExt_morf_cFv */
 void mDoExt_morf_c::frameUpdate() {
     if (mCurMorf < 1.0f) {
         mPrevMorf = mCurMorf;
@@ -1176,7 +1073,6 @@ mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_
     create(modelData, callback1, callback2, anmTransform, param_4, param_5, param_6, param_7, param_8, param_9, param_10, param_11);
 }
 
-/* 8000FD10-8000FD94 00A650 0084+00 1/0 0/0 0/0 .text            __dt__14mDoExt_McaMorfFv */
 mDoExt_McaMorf::~mDoExt_McaMorf() {
     if (field_0x50 && mpSound != NULL) {
         mpSound->stopAnime();
@@ -1267,7 +1163,6 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c
     return 0;
 }
 
-/* 80010074-8001037C 00A9B4 0308+00 1/0 0/0 0/0 .text            calc__14mDoExt_McaMorfFv */
 void mDoExt_McaMorf::calc() {
     if (mpModel == NULL) {
         return;
@@ -1344,8 +1239,6 @@ void mDoExt_McaMorf::calc() {
     }
 }
 
-/* 8001037C-800105C8 00ACBC 024C+00 1/1 1/1 29/29 .text
- * setAnm__14mDoExt_McaMorfFP15J3DAnmTransformiffffPv           */
 void mDoExt_McaMorf::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2, f32 param_3,
                                 f32 param_4, f32 param_5, void* param_6) {
     mpAnm = param_0;
@@ -1384,8 +1277,6 @@ void mDoExt_McaMorf::setAnm(J3DAnmTransform* param_0, int param_1, f32 param_2,
     }
 }
 
-/* 800105C8-80010680 00AF08 00B8+00 0/0 1/1 37/37 .text            play__14mDoExt_McaMorfFP3VecUlSc
- */
 u32 mDoExt_McaMorf::play(Vec* param_0, u32 param_1, s8 param_2) {
     frameUpdate();
     if (mpSound != NULL && mpSound->field_0x48 != NULL && param_0 != NULL) {
@@ -1396,14 +1287,12 @@ u32 mDoExt_McaMorf::play(Vec* param_0, u32 param_1, s8 param_2) {
     return isStop();
 }
 
-/* 80010680-800106AC 00AFC0 002C+00 0/0 0/0 33/33 .text            entryDL__14mDoExt_McaMorfFv */
 void mDoExt_McaMorf::entryDL() {
     if (mpModel != NULL) {
         mDoExt_modelEntryDL(mpModel);
     }
 }
 
-/* 800106AC-80010710 00AFEC 0064+00 0/0 0/0 37/37 .text            modelCalc__14mDoExt_McaMorfFv */
 void mDoExt_McaMorf::modelCalc() {
     if (mpModel != NULL) {
         if (mpAnm != NULL) {
@@ -1415,8 +1304,6 @@ void mDoExt_McaMorf::modelCalc() {
     }
 }
 
-/* 80010710-800107D0 00B050 00C0+00 1/1 0/0 0/0 .text
- * getTransform__14mDoExt_McaMorfFUsP16J3DTransformInfo         */
 void mDoExt_McaMorf::getTransform(u16 param_0, J3DTransformInfo* param_1) {
     mpAnm->getTransform(param_0, param_1);
     if (field_0x51) {
@@ -1446,7 +1333,6 @@ mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData* param_0, mDoExt_McaMorfCallBack
            i_modelFlag, i_differedDlistFlag);
 }
 
-/* 80010888-800108F0 00B1C8 0068+00 1/0 0/0 0/0 .text            __dt__16mDoExt_McaMorfSOFv */
 mDoExt_McaMorfSO::~mDoExt_McaMorfSO() {
     stopZelAnime();
 }
@@ -1537,7 +1423,6 @@ int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_
     return 0;
 }
 
-/* 80010B68-80010E70 00B4A8 0308+00 1/0 0/0 0/0 .text            calc__16mDoExt_McaMorfSOFv */
 void mDoExt_McaMorfSO::calc() {
     if (mpModel != NULL) {
         u16 jnt_no = getJoint()->getJntNo();
@@ -1624,8 +1509,6 @@ void mDoExt_McaMorfSO::calc() {
     }
 }
 
-/* 80010E70-800110B0 00B7B0 0240+00 1/1 5/5 208/208 .text
- * setAnm__16mDoExt_McaMorfSOFP15J3DAnmTransformiffff           */
 void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
                               f32 i_start, f32 i_end) {
     mpAnm = i_anm;
@@ -1670,8 +1553,6 @@ void mDoExt_McaMorfSO::setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f3
     }
 }
 
-/* 800110B0-80011154 00B9F0 00A4+00 0/0 5/5 143/143 .text            play__16mDoExt_McaMorfSOFUlSc
- */
 int mDoExt_McaMorfSO::play(u32 param_0, s8 param_1) {
     frameUpdate();
 
@@ -1686,7 +1567,6 @@ int mDoExt_McaMorfSO::play(u32 param_0, s8 param_1) {
     return isStop();
 }
 
-/* 80011154-800111C0 00BA94 006C+00 0/0 0/0 4/4 .text            updateDL__16mDoExt_McaMorfSOFv */
 void mDoExt_McaMorfSO::updateDL() {
     if (mpModel != NULL) {
         if (mpAnm != NULL) {
@@ -1699,16 +1579,12 @@ void mDoExt_McaMorfSO::updateDL() {
     }
 }
 
-/* 800111C0-800111EC 00BB00 002C+00 0/0 5/5 137/137 .text            entryDL__16mDoExt_McaMorfSOFv
- */
 void mDoExt_McaMorfSO::entryDL() {
     if (mpModel != NULL) {
         mDoExt_modelEntryDL(mpModel);
     }
 }
 
-/* 800111EC-80011250 00BB2C 0064+00 0/0 4/4 174/174 .text            modelCalc__16mDoExt_McaMorfSOFv
- */
 void mDoExt_McaMorfSO::modelCalc() {
     if (mpModel != NULL) {
         if (mpAnm != NULL) {
@@ -1720,8 +1596,6 @@ void mDoExt_McaMorfSO::modelCalc() {
     }
 }
 
-/* 80011250-80011310 00BB90 00C0+00 1/1 0/0 1/1 .text
- * getTransform__16mDoExt_McaMorfSOFUsP16J3DTransformInfo       */
 void mDoExt_McaMorfSO::getTransform(u16 param_0, J3DTransformInfo* param_1) {
     mpAnm->getTransform(param_0, param_1);
     if (mTranslate) {
@@ -1738,7 +1612,6 @@ void mDoExt_McaMorfSO::getTransform(u16 param_0, J3DTransformInfo* param_1) {
     }
 }
 
-/* 80011310-80011348 00BC50 0038+00 1/1 2/2 260/260 .text stopZelAnime__16mDoExt_McaMorfSOFv */
 void mDoExt_McaMorfSO::stopZelAnime() {
     if (mpSound != NULL) {
         mpSound->deleteObject();
@@ -1756,7 +1629,6 @@ mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData* param_0, mDoExt_McaMorfCallBack1_
            param_10, param_11);
 }
 
-/* 800113FC-80011464 00BD3C 0068+00 1/0 0/0 0/0 .text            __dt__15mDoExt_McaMorf2Fv */
 mDoExt_McaMorf2::~mDoExt_McaMorf2() {
     stopZelAnime();
 }
@@ -1832,7 +1704,6 @@ mDoExt_McaMorf2::~mDoExt_McaMorf2() {
     return 1;
 }
 
-/* 800116B4-800116F4 00BFF4 0040+00 1/1 0/0 0/0 .text            ERROR_EXIT__15mDoExt_McaMorf2Fv */
 void mDoExt_McaMorf2::ERROR_EXIT() {
     if (mpTransformInfo != NULL) {
         mpTransformInfo = NULL;
@@ -1847,7 +1718,6 @@ void mDoExt_McaMorf2::ERROR_EXIT() {
     }
 }
 
-/* 800116F4-80011D70 00C034 067C+00 1/0 0/0 0/0 .text            calc__15mDoExt_McaMorf2Fv */
 void mDoExt_McaMorf2::calc() {
     if (mpModel != NULL) {
         u16 jnt_no = J3DMtxCalc::getJoint()->getJntNo();
@@ -2013,8 +1883,6 @@ void mDoExt_McaMorf2::calc() {
     }
 }
 
-/* 80011D70-80011FCC 00C6B0 025C+00 1/1 0/0 2/2 .text
- * setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff */
 void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1, f32 param_2,
                              int i_attr, f32 i_morf, f32 i_speed, f32 i_start, f32 i_end) {
     mpAnm = param_0;
@@ -2062,7 +1930,6 @@ void mDoExt_McaMorf2::setAnm(J3DAnmTransform* param_0, J3DAnmTransform* param_1,
     }
 }
 
-/* 80011FCC-800120A0 00C90C 00D4+00 0/0 0/0 2/2 .text            setAnmRate__15mDoExt_McaMorf2Ff */
 void mDoExt_McaMorf2::setAnmRate(f32 param_0) {
     void* pBas = NULL;
     mAnmRate = param_0;
@@ -2085,7 +1952,6 @@ void mDoExt_McaMorf2::setAnmRate(f32 param_0) {
     }
 }
 
-/* 800120A0-80012144 00C9E0 00A4+00 0/0 0/0 1/1 .text            play__15mDoExt_McaMorf2FUlSc */
 int mDoExt_McaMorf2::play(u32 param_0, s8 param_1) {
     frameUpdate();
 
@@ -2100,14 +1966,12 @@ int mDoExt_McaMorf2::play(u32 param_0, s8 param_1) {
     return isStop();
 }
 
-/* 80012144-80012170 00CA84 002C+00 0/0 0/0 1/1 .text            entryDL__15mDoExt_McaMorf2Fv */
 void mDoExt_McaMorf2::entryDL() {
     if (mpModel != NULL) {
         mDoExt_modelEntryDL(mpModel);
     }
 }
 
-/* 80012170-800121E8 00CAB0 0078+00 0/0 0/0 1/1 .text            modelCalc__15mDoExt_McaMorf2Fv */
 void mDoExt_McaMorf2::modelCalc() {
     if (mpModel != NULL) {
         if (mpAnm != NULL) {
@@ -2123,15 +1987,12 @@ void mDoExt_McaMorf2::modelCalc() {
     }
 }
 
-/* 800121E8-80012220 00CB28 0038+00 1/1 0/0 1/1 .text            stopZelAnime__15mDoExt_McaMorf2Fv
- */
 void mDoExt_McaMorf2::stopZelAnime() {
     if (mpSound != NULL) {
         mpSound->deleteObject();
     }
 }
 
-/* 80012220-800123D0 00CB60 01B0+00 1/0 0/0 0/0 .text            draw__19mDoExt_invJntPacketFv */
 void mDoExt_invJntPacket::draw() {
     J3DShape::resetVcdVatCache();
 
@@ -2163,7 +2024,7 @@ void mDoExt_invJntPacket::draw() {
             } while (shapePkt != NULL);
         }
     } else {
-        static u8 l_invisibleMat[] ALIGN_DECL(32) = {
+        static u8 l_invisibleMat[] ATTRIBUTE_ALIGN(32) = {
             0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
             0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1,
             0x08, 0xFF, 0xF0, 0x61, 0xF3, 0x7F, 0x00, 0x00, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40,
@@ -2196,7 +2057,6 @@ void mDoExt_invJntPacket::draw() {
     GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 1, 0, 1);
 }
 
-/* 800123D0-800125DC 00CD10 020C+00 2/2 0/0 0/0 .text            init__15mDoExt_3Dline_cFUsii */
 int mDoExt_3Dline_c::init(u16 param_0, int param_1, BOOL param_2) {
     field_0x0 = new cXyz[param_0];
     if (field_0x0 == NULL) {
@@ -2259,8 +2119,6 @@ int mDoExt_3Dline_c::init(u16 param_0, int param_1, BOOL param_2) {
     return 1;
 }
 
-/* 800125E0-800126BC 00CF20 00DC+00 0/0 0/0 12/12 .text            init__19mDoExt_3DlineMat0_cFUsUsi
- */
 int mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) {
     field_0x10 = param_0;
     field_0x12 = param_1;
@@ -2281,8 +2139,7 @@ int mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) {
     return 1;
 }
 
-/* 803A30C0-803A3160 0001E0 0084+1C 1/1 0/0 0/0 .data            l_matDL */
-static u8 l_matDL[132] ALIGN_DECL(32) = {
+static u8 l_matDL[132] ATTRIBUTE_ALIGN(32) = {
     0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00,
     0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x7F, 0x32, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
     0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF, 0xFF, 0xFF, 0xFF, 0x61, 0x28, 0x38,
@@ -2294,8 +2151,7 @@ static u8 l_matDL[132] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A3160-803A31F0 000280 008D+03 1/1 0/0 0/0 .data            l_mat1DL */
-static u8 l_mat1DL[141] ALIGN_DECL(32) = {
+static u8 l_mat1DL[141] ATTRIBUTE_ALIGN(32) = {
     0x10, 0x00, 0x00, 0x10, 0x40, 0xFF, 0xFF, 0x42, 0x80, 0x08, 0x30, 0x3C, 0xF3, 0xCF, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x18, 0x3C, 0xF3, 0xCF, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x7F,
     0x32, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x0C, 0xFF,
@@ -2307,7 +2163,6 @@ static u8 l_mat1DL[141] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 800126C0-80012774 00D000 00B4+00 1/0 0/0 0/0 .text setMaterial__19mDoExt_3DlineMat0_cFv */
 void mDoExt_3DlineMat0_c::setMaterial() {
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
@@ -2323,7 +2178,6 @@ void mDoExt_3DlineMat0_c::setMaterial() {
     GXLoadNrmMtxImm(cMtx_getIdentity(), GX_PNMTX0);
 }
 
-/* 80012774-80012874 00D0B4 0100+00 1/0 0/0 0/0 .text            draw__19mDoExt_3DlineMat0_cFv */
 void mDoExt_3DlineMat0_c::draw() {
     GXSetTevColor(GX_TEVREG2, field_0x8);
 
@@ -2353,8 +2207,6 @@ void mDoExt_3DlineMat0_c::draw() {
     field_0x16 ^= (u8)1;
 }
 
-/* 80012874-80012E3C 00D1B4 05C8+00 0/0 0/0 2/2 .text
- * update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c  */
 void mDoExt_3DlineMat0_c::update(int param_0, f32 param_1, GXColor& param_2, u16 param_3,
                                      dKy_tevstr_c* param_4) {
     field_0x8 = param_2;
@@ -2474,8 +2326,6 @@ void mDoExt_3DlineMat0_c::update(int param_0, f32 param_1, GXColor& param_2, u16
     }
 }
 
-/* 80012E3C-80013360 00D77C 0524+00 0/0 0/0 9/9 .text
- * update__19mDoExt_3DlineMat0_cFiR8_GXColorP12dKy_tevstr_c     */
 void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* param_4) {
     field_0x8 = param_2;
     field_0xc = param_4;
@@ -2588,8 +2438,6 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa
     }
 }
 
-/* 80013360-800134F8 00DCA0 0198+00 0/0 0/0 19/19 .text init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi
- */
 int mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int param_3) {
     mNumLines = param_0;
     field_0x32 = param_1;
@@ -2618,7 +2466,6 @@ int mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int pa
     return 1;
 }
 
-/* 800134F8-800135D0 00DE38 00D8+00 1/0 0/0 0/0 .text setMaterial__19mDoExt_3DlineMat1_cFv */
 void mDoExt_3DlineMat1_c::setMaterial() {
     j3dSys.reinitGX();
     GXSetNumIndStages(0);
@@ -2636,7 +2483,6 @@ void mDoExt_3DlineMat1_c::setMaterial() {
     GXLoadNrmMtxImm(g_mDoMtx_identity, GX_PNMTX0);
 }
 
-/* 800135D0-8001373C 00DF10 016C+00 1/0 0/0 0/0 .text            draw__19mDoExt_3DlineMat1_cFv */
 void mDoExt_3DlineMat1_c::draw() {
     GXLoadTexObj(&mTextureObject, GX_TEXMAP0);
     GXSetTexCoordScaleManually(GX_TEXCOORD0, 1, GXGetTexObjWidth(&mTextureObject), GXGetTexObjHeight(&mTextureObject));
@@ -2669,8 +2515,6 @@ void mDoExt_3DlineMat1_c::draw() {
     mIsDrawn ^= (u8)1;
 }
 
-/* 8001373C-80013FB0 00E07C 0874+00 0/0 0/0 6/6 .text
- * update__19mDoExt_3DlineMat1_cFifR8_GXColorUsP12dKy_tevstr_c  */
 void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u16 param_3,
                                      dKy_tevstr_c* param_4) {
     mColor = param_2;
@@ -2831,8 +2675,6 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1
     }
 }
 
-/* 80013FB0-80014738 00E8F0 0788+00 0/0 0/0 14/14 .text
- * update__19mDoExt_3DlineMat1_cFiR8_GXColorP12dKy_tevstr_c     */
 void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* param_4) {
     mColor = param_2;
     this->mpTevStr = param_4;
@@ -2947,8 +2789,6 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p
     }
 }
 
-/* 80014738-8001479C 00F078 0064+00 0/0 0/0 29/29 .text
- * setMat__26mDoExt_3DlineMatSortPacketFP18mDoExt_3DlineMat_c   */
 void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* i_3DlineMat) {
     if (mp3DlineMat == NULL) {
         dComIfGd_getListPacket()->entryImm(this, 0);
@@ -2957,7 +2797,6 @@ void mDoExt_3DlineMatSortPacket::setMat(mDoExt_3DlineMat_c* i_3DlineMat) {
     mp3DlineMat = i_3DlineMat;
 }
 
-/* 8001479C-80014804 00F0DC 0068+00 1/0 0/0 0/0 .text draw__26mDoExt_3DlineMatSortPacketFv */
 void mDoExt_3DlineMatSortPacket::draw() {
     mp3DlineMat->setMaterial();
     mDoExt_3DlineMat_c* lineMat = mp3DlineMat;
@@ -3509,8 +3348,6 @@ void mDoExt_cylinderMPacket::draw() {
 }
 #endif
 
-/* 80014804-8001494C 00F144 0148+00 3/3 0/0 0/0 .text
- * mDoExt_initFontCommon__FPP7JUTFontPP7ResFONTP7JKRHeapPCcP10JKRArchiveUcUlUl */
 static void mDoExt_initFontCommon(JUTFont** mDoExt_font, ResFONT** mDoExt_resfont, JKRHeap* param_2,
                                   char const* param_3, JKRArchive* param_4, u8 param_5,
                                   u32 param_6, u32 param_7) {
@@ -3540,16 +3377,12 @@ static void mDoExt_initFontCommon(JUTFont** mDoExt_font, ResFONT** mDoExt_resfon
     JUT_ASSERT(7183, mDoExt_font != NULL);
 }
 
-/* 80450C44-80450C48 000144 0004+00 3/3 0/0 0/0 .sbss            mDoExt_font0 */
 static JUTFont* mDoExt_font0;
 
-/* 80450C48-80450C4C 000148 0004+00 2/2 0/0 0/0 .sbss            mDoExt_font0_getCount */
 static int mDoExt_font0_getCount;
 
-/* 80450C4C-80450C50 00014C 0004+00 2/2 0/0 0/0 .sbss            mDoExt_resfont0 */
 static ResFONT* mDoExt_resfont0;
 
-/* 80014994-800149F0 00F2D4 005C+00 1/1 0/0 0/0 .text            mDoExt_initFont0__Fv */
 static void mDoExt_initFont0() {
     static char const fontdata[] = "rodan_b_24_22.bfn";
 #if REGION_JPN
@@ -3561,7 +3394,6 @@ static void mDoExt_initFont0() {
 #endif
 }
 
-/* 800149F0-80014A2C 00F330 003C+00 0/0 51/51 2/2 .text            mDoExt_getMesgFont__Fv */
 JUTFont* mDoExt_getMesgFont() {
     if (mDoExt_font0 == NULL) {
         mDoExt_initFont0();
@@ -3571,7 +3403,6 @@ JUTFont* mDoExt_getMesgFont() {
     return mDoExt_font0;
 }
 
-/* 80014A2C-80014AA4 00F36C 0078+00 0/0 6/6 0/0 .text            mDoExt_removeMesgFont__Fv */
 void mDoExt_removeMesgFont() {
     JUT_ASSERT(7238, mDoExt_font0_getCount > 0);
     if (mDoExt_font0_getCount > 0) {
@@ -3592,23 +3423,18 @@ void mDoExt_removeMesgFont() {
     }
 }
 
-/* 80450C50-80450C54 000150 0004+00 2/2 0/0 0/0 .sbss            mDoExt_font1 */
 static JUTFont* mDoExt_font1;
 
-/* 80450C54-80450C58 000154 0004+00 1/1 0/0 0/0 .sbss            mDoExt_font1_getCount */
 static int mDoExt_font1_getCount;
 
-/* 80450C58-80450C5C 000158 0004+00 1/1 0/0 0/0 .sbss            mDoExt_resfont1 */
 static ResFONT* mDoExt_resfont1;
 
-/* 80014AA4-80014B04 00F3E4 0060+00 1/1 0/0 0/0 .text            mDoExt_initFont1__Fv */
 static void mDoExt_initFont1() {
     static char const fontdata[] = "reishotai_24_22.bfn";
     mDoExt_initFontCommon(&mDoExt_font1, &mDoExt_resfont1, mDoExt_getZeldaHeap(),
                           fontdata, dComIfGp_getRubyArchive(), 1, 1, 0x8000);
 }
 
-/* 80014B04-80014B40 00F444 003C+00 0/0 8/8 0/0 .text            mDoExt_getRubyFont__Fv */
 JUTFont* mDoExt_getRubyFont() {
     if (mDoExt_font1 == NULL) {
         mDoExt_initFont1();
@@ -3618,23 +3444,18 @@ JUTFont* mDoExt_getRubyFont() {
     return mDoExt_font1;
 }
 
-/* 80450C5C-80450C60 00015C 0004+00 3/3 0/0 0/0 .sbss            mDoExt_font2 */
 static JUTFont* mDoExt_font2;
 
-/* 80450C60-80450C64 000160 0004+00 2/2 0/0 0/0 .sbss            mDoExt_font2_getCount */
 static int mDoExt_font2_getCount;
 
-/* 80450C64-80450C68 000164 0004+00 2/2 0/0 0/0 .sbss            mDoExt_resfont2 */
 static ResFONT* mDoExt_resfont2;
 
-/* 80014B40-80014BA0 00F480 0060+00 1/1 0/0 0/0 .text            mDoExt_initFont2__Fv */
 static void mDoExt_initFont2() {
     static char const fontdata[] = "reishotai_24_22.bfn";
     mDoExt_initFontCommon(&mDoExt_font2, &mDoExt_resfont2, mDoExt_getZeldaHeap(),
                           fontdata, dComIfGp_getRubyArchive(), 1, 1, 0x8000);
 }
 
-/* 80014BA0-80014BDC 00F4E0 003C+00 0/0 11/11 0/0 .text            mDoExt_getSubFont__Fv */
 JUTFont* mDoExt_getSubFont() {
     if (mDoExt_font2 == NULL) {
         mDoExt_initFont2();
@@ -3644,7 +3465,6 @@ JUTFont* mDoExt_getSubFont() {
     return mDoExt_font2;
 }
 
-/* 80014BDC-80014C54 00F51C 0078+00 0/0 2/2 0/0 .text            mDoExt_removeSubFont__Fv */
 void mDoExt_removeSubFont() {
     JUT_ASSERT(7354, mDoExt_font2_getCount > 0);
     if (mDoExt_font2_getCount > 0) {
@@ -3661,8 +3481,6 @@ void mDoExt_removeSubFont() {
     }
 }
 
-/* 80014C54-80014D5C 00F594 0108+00 3/3 14/14 445/445 .text
- * mDoExt_J3DModel__create__FP12J3DModelDataUlUl                */
 J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag) {
     if (i_modelData != NULL) {
         J3DModel* model = new J3DModel();
@@ -3696,16 +3514,12 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3
     return NULL;
 }
 
-/* 80450C68-80450C70 000168 0004+04 1/1 0/0 0/0 .sbss            aram_cache_size */
 u32 aram_cache_size;
 
-/* 80014D5C-80014D64 00F69C 0008+00 0/0 1/1 0/0 .text            mDoExt_setAraCacheSize__FUl */
 void mDoExt_setAraCacheSize(u32 size) {
     aram_cache_size = size;
 }
 
-/* 80014D64-80014D9C 00F6A4 0038+00 0/0 2/2 0/0 .text            mDoExt_GetCurrentRunningThread__Fv
- */
 OSThread* mDoExt_GetCurrentRunningThread() {
     OSThread* thread = OSGetCurrentThread();
     if (thread != NULL && thread->state != 2) {
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index e9ac262f8a..2765a65c99 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -215,7 +215,6 @@ static void drawHeapMap() {
 
 #endif
 
-/* 80007D9C-80007E44 0026DC 00A8+00 1/1 0/0 0/0 .text            createTimg__FUsUsUl */
 static ResTIMG* createTimg(u16 width, u16 height, u32 format) {
     u32 bufferSize = GXGetTexBufferSize(width, height, format, GX_FALSE, 0) + 0x20;
     ResTIMG* timg;
@@ -242,7 +241,6 @@ static ResTIMG* createTimg(u16 width, u16 height, u32 format) {
     return timg;
 }
 
-/* 80450BC8-80450BCC 0000C8 0004+00 2/2 38/38 1/1 .sbss            mFader__13mDoGph_gInf_c */
 JUTFader* mDoGph_gInf_c::mFader;
 
 #if PLATFORM_WII || PLATFORM_SHIELD
@@ -250,32 +248,22 @@ ResTIMG* mDoGph_gInf_c::m_fullFrameBufferTimg;
 void* mDoGph_gInf_c::m_fullFrameBufferTex;
 #endif
 
-/* 80450BCC-80450BD0 0000CC 0004+00 3/3 8/8 1/1 .sbss            mFrameBufferTimg__13mDoGph_gInf_c
- */
 ResTIMG* mDoGph_gInf_c::mFrameBufferTimg;
 
-/* 80450BD0-80450BD4 0000D0 0004+00 3/3 6/6 0/0 .sbss            mFrameBufferTex__13mDoGph_gInf_c */
 void* mDoGph_gInf_c::mFrameBufferTex;
 
-/* 80450BD4-80450BD8 0000D4 0004+00 1/1 1/1 0/0 .sbss            mZbufferTimg__13mDoGph_gInf_c */
 ResTIMG* mDoGph_gInf_c::mZbufferTimg;
 
-/* 80450BD8-80450BDC 0000D8 0004+00 3/3 1/1 0/0 .sbss            mZbufferTex__13mDoGph_gInf_c */
 void* mDoGph_gInf_c::mZbufferTex;
 
-/* 80450BDC-80450BE0 0000DC 0004+00 3/3 3/3 1/1 .sbss            mFadeRate__13mDoGph_gInf_c */
 f32 mDoGph_gInf_c::mFadeRate;
 
-/* 80450BE0-80450BE4 0000E0 0004+00 3/3 0/0 0/0 .sbss            mFadeSpeed__13mDoGph_gInf_c */
 f32 mDoGph_gInf_c::mFadeSpeed;
 
-/* 80450590-80450594 000010 0004+00 2/2 1/1 0/0 .sdata           mBackColor__13mDoGph_gInf_c */
 GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0};
 
-/* 80450594-80450598 000014 0004+00 4/4 3/3 0/0 .sdata           mFadeColor__13mDoGph_gInf_c */
 GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0};
 
-/* 80450BE4-80450BE8 -00001 0004+00 8/8 9/9 11/11 .sbss            None */
 /* 80450BE4 0001+00 data_80450BE4 None */
 /* 80450BE5 0001+00 data_80450BE5 None */
 /* 80450BE6 0001+00 mFade__13mDoGph_gInf_c None */
@@ -288,7 +276,6 @@ u8 mDoGph_gInf_c::mFade;
 
 bool mDoGph_gInf_c::mAutoForcus;
 
-/* 80007E44-80007F90 002784 014C+00 1/1 0/0 0/0 .text            create__13mDoGph_gInf_cFv */
 void mDoGph_gInf_c::create() {
     #if PLATFORM_WII || PLATFORM_SHIELD
     VISetTrapFilter(0);
@@ -344,10 +331,8 @@ void mDoGph_gInf_c::create() {
     VISetBlack(TRUE);
 }
 
-/* 80450BE8-80450BF0 0000E8 0008+00 1/1 0/0 0/0 .sbss            None */
 static bool data_80450BE8;
 
-/* 80007F90-80007FD8 0028D0 0048+00 1/1 2/2 0/0 .text            beginRender__13mDoGph_gInf_cFv */
 void mDoGph_gInf_c::beginRender() {
     #if PLATFORM_WII || PLATFORM_SHIELD
     VISetTrapFilter(fapGmHIO_getTrapFilter() ? 1 : 0);
@@ -371,7 +356,6 @@ void mDoGph_gInf_c::resetDimming() {
 }
 #endif
 
-/* 80007FD8-80008028 002918 0050+00 1/1 6/4 15/15 .text fadeOut__13mDoGph_gInf_cFfR8_GXColor */
 void mDoGph_gInf_c::fadeOut(f32 fadeSpeed, GXColor& fadeColor) {
     mFade = 1;
     mFadeSpeed = fadeSpeed;
@@ -379,7 +363,6 @@ void mDoGph_gInf_c::fadeOut(f32 fadeSpeed, GXColor& fadeColor) {
     mFadeRate = fadeSpeed >= 0.0f ? 0.0f : 1.0f;
 }
 
-/* 80008028-80008078 002968 0050+00 0/0 0/0 2/2 .text fadeOut_f__13mDoGph_gInf_cFfR8_GXColor */
 void mDoGph_gInf_c::fadeOut_f(f32 fadeSpeed, GXColor& fadeColor) {
     mFade = 129;
     mFadeSpeed = fadeSpeed;
@@ -387,7 +370,6 @@ void mDoGph_gInf_c::fadeOut_f(f32 fadeSpeed, GXColor& fadeColor) {
     mFadeRate = fadeSpeed >= 0.0f ? 0.0f : 1.0f;
 }
 
-/* 80008078-800080A0 0029B8 0028+00 0/0 1/1 8/8 .text            onBlure__13mDoGph_gInf_cFv */
 void mDoGph_gInf_c::onBlure() {
     onBlure(cMtx_getIdentity());
 }
@@ -396,31 +378,23 @@ void mDoGph_gInf_c::onBlure() {
 GXTexObj mDoGph_gInf_c::m_fullFrameBufferTexObj;
 #endif
 
-/* 803DD3E8-803DD408 00A108 0020+00 3/3 3/3 0/0 .bss             mFrameBufferTexObj__13mDoGph_gInf_c
- */
 GXTexObj mDoGph_gInf_c::mFrameBufferTexObj;
 
-/* 803DD408-803DD428 00A128 0020+00 1/1 0/0 0/0 .bss             mZbufferTexObj__13mDoGph_gInf_c */
 GXTexObj mDoGph_gInf_c::mZbufferTexObj;
 
-/* 803DD428-803DD43C 00A148 0014+00 2/2 3/3 0/0 .bss             m_bloom__13mDoGph_gInf_c */
 mDoGph_gInf_c::bloom_c mDoGph_gInf_c::m_bloom;
 
-/* 803DD43C-803DD470 00A15C 0030+04 2/2 0/0 0/0 .bss             mBlureMtx__13mDoGph_gInf_c */
 Mtx mDoGph_gInf_c::mBlureMtx;
 
-/* 800080A0-800080D0 0029E0 0030+00 1/1 1/1 0/0 .text            onBlure__13mDoGph_gInf_cFPA4_Cf */
 void mDoGph_gInf_c::onBlure(const Mtx m) {
     mBlureFlag = true;
     setBlureMtx(m);
 }
 
-/* 800080D0-800080F4 002A10 0024+00 0/0 3/3 7/7 .text            fadeOut__13mDoGph_gInf_cFf */
 void mDoGph_gInf_c::fadeOut(f32 fadeSpeed) {
     fadeOut(fadeSpeed, g_clearColor);
 }
 
-/* 800080F4-80008330 002A34 023C+00 1/1 0/0 0/0 .text            darwFilter__F8_GXColor */
 void darwFilter(GXColor matColor) {
     GXSetNumChans(1);
     GXSetChanCtrl(GX_COLOR0A0, GX_FALSE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT_NULL, GX_DF_NONE,
@@ -459,7 +433,6 @@ void darwFilter(GXColor matColor) {
     GXEnd();
 }
 
-/* 80008330-8000841C 002C70 00EC+00 1/1 0/0 0/0 .text            calcFade__13mDoGph_gInf_cFv */
 void mDoGph_gInf_c::calcFade() {
     if (mDoGph_gInf_c::mFade != 0) {
         mFadeRate += mFadeSpeed;
@@ -688,13 +661,10 @@ void mDoGph_gInf_c::entryBaseCsr(mDoGph_gInf_c::csr_c* i_entry) {
 }
 #endif
 
-/* 8000841C-80008420 002D5C 0004+00 0/0 1/0 0/0 .text            mDoGph_BlankingON__Fv */
 void mDoGph_BlankingON() {}
 
-/* 80008420-80008424 002D60 0004+00 0/0 1/0 0/0 .text            mDoGph_BlankingOFF__Fv */
 void mDoGph_BlankingOFF() {}
 
-/* 80008424-80008450 002D64 002C+00 1/1 0/0 0/0 .text            dScnPly_BeforeOfPaint__Fv */
 static void dScnPly_BeforeOfPaint() {
     dComIfGd_reset();
 
@@ -703,13 +673,11 @@ static void dScnPly_BeforeOfPaint() {
     #endif
 }
 
-/* 80008450-80008474 002D90 0024+00 0/0 1/0 0/0 .text            mDoGph_BeforeOfDraw__Fv */
 int mDoGph_BeforeOfDraw() {
     dScnPly_BeforeOfPaint();
     return 1;
 }
 
-/* 80008474-80008630 002DB4 01BC+00 0/0 1/0 0/0 .text            mDoGph_AfterOfDraw__Fv */
 int mDoGph_AfterOfDraw() {
     if (fapGmHIO_isMenu()) {
         JUTProcBar::getManager()->setVisible(false);
@@ -793,8 +761,6 @@ void drawFilterQuad(s8 param_0, s8 param_1) {
 #define mDoGph_drawFilterQuad drawFilterQuad
 #endif
 
-/* 80008630-80009184 002F70 0B54+00 1/1 0/0 0/0 .text
- * drawDepth2__FP10view_classP15view_port_classi                */
 static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_2) {
     static GXColorS10 l_tevColor0 = {0, 0, 0, 0};
 
@@ -1038,8 +1004,6 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_
     }
 }
 
-/* 800091C0-800094B4 003B00 02F4+00 1/1 0/0 0/0 .text trimming__FP10view_classP15view_port_class
- */
 static void trimming(view_class* param_0, view_port_class* param_1) {
     (void)param_0;
 
@@ -1090,7 +1054,6 @@ static void trimming(view_class* param_0, view_port_class* param_1) {
                  param_1->scissor.height);
 }
 
-/* 800094B4-80009544 003DF4 0090+00 2/2 1/1 0/0 .text            mDoGph_drawFilterQuad__FScSc */
 #if !PLATFORM_WII
 void mDoGph_drawFilterQuad(s8 param_0, s8 param_1) {
     GXBegin(GX_QUADS, GX_VTXFMT0, 4);
@@ -1106,8 +1069,6 @@ void mDoGph_drawFilterQuad(s8 param_0, s8 param_1) {
 }
 #endif
 
-/* 80009544-800095F8 003E84 00B4+00 0/0 1/1 0/0 .text            create__Q213mDoGph_gInf_c7bloom_cFv
- */
 void mDoGph_gInf_c::bloom_c::create() {
     if (m_buffer == NULL) {
         u32 size = GXGetTexBufferSize(FB_WIDTH / 2, FB_HEIGHT / 2, 6, GX_FALSE, 0);
@@ -1123,8 +1084,6 @@ void mDoGph_gInf_c::bloom_c::create() {
     }
 }
 
-/* 800095F8-80009650 003F38 0058+00 0/0 1/1 0/0 .text            remove__Q213mDoGph_gInf_c7bloom_cFv
- */
 void mDoGph_gInf_c::bloom_c::remove() {
     if (m_buffer != NULL) {
         mDoExt_getArchiveHeap()->free(m_buffer);
@@ -1133,8 +1092,6 @@ void mDoGph_gInf_c::bloom_c::remove() {
     mMonoColor.a = 0;
 }
 
-/* 80009650-8000A160 003F90 0B10+00 1/1 0/0 0/0 .text            draw__Q213mDoGph_gInf_c7bloom_cFv
- */
 void mDoGph_gInf_c::bloom_c::draw() {
     bool enabled = mEnable && m_buffer != NULL;
     if (mMonoColor.a != 0 || enabled) {
@@ -1316,8 +1273,6 @@ void mDoGph_gInf_c::bloom_c::draw() {
     }
 }
 
-/* 8000A160-8000A290 004AA0 0130+00 1/1 0/0 0/0 .text
- * retry_captue_frame__FP10view_classP15view_port_classi        */
 static void retry_captue_frame(view_class* param_0, view_port_class* param_1, int param_2) {
     (void)param_0;
     (void)param_2;
@@ -1350,7 +1305,6 @@ static void retry_captue_frame(view_class* param_0, view_port_class* param_1, in
     }
 }
 
-/* 8000A290-8000A504 004BD0 0274+00 1/1 0/0 0/0 .text            motionBlure__FP10view_class */
 static void motionBlure(view_class* param_0) {
     if (g_env_light.is_blure) {
         GXLoadTexObj(mDoGph_gInf_c::getFrameBufferTexObj(), GX_TEXMAP0);
@@ -1398,7 +1352,6 @@ static void motionBlure(view_class* param_0) {
     }
 }
 
-/* 8000A504-8000A58C 004E44 0088+00 1/1 0/0 0/0 .text            setLight__Fv */
 static void setLight() {
     GXLightObj obj;
 
@@ -1427,7 +1380,6 @@ static void captureScreenPerspDrawInfo(JPADrawInfo&) {
     // DEBUG NONMATCHING
 }
 
-/* 8000A58C-8000A604 004ECC 0078+00 1/1 0/0 0/0 .text            drawItem3D__Fv */
 static void drawItem3D() {
     Mtx item_mtx;
     dMenu_Collect3D_c::setupItem3D(item_mtx);
@@ -1444,7 +1396,6 @@ static void drawItem3D() {
     j3dSys.reinitGX();
 }
 
-/* 8000A604-8000B118 004F44 0B14+00 0/0 1/0 0/0 .text            mDoGph_Painter__Fv */
 int mDoGph_Painter() {
     #if DEBUG
     drawHeapMap();
@@ -2056,7 +2007,6 @@ int mDoGph_Painter() {
 mDoGph_HIO_c mDoGph_HIO;
 #endif
 
-/* 8000B174-8000B1D0 005AB4 005C+00 0/0 2/1 0/0 .text            mDoGph_Create__Fv */
 int mDoGph_Create() {
     JKRSolidHeap* heap = mDoExt_createSolidHeapToCurrent(0, NULL, 0);
     mDoGph_gInf_c::create();
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
index 500df9a52f..fb592da49f 100644
--- a/src/m_Do/m_Do_lib.cpp
+++ b/src/m_Do/m_Do_lib.cpp
@@ -10,8 +10,6 @@
 #include "d/d_com_inf_game.h"
 #include "dolphin/types.h"
 
-/* 8001513C-8001528C 00FA7C 0150+00 0/0 3/3 2/2 .text
- * mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj  */
 u32 mDoLib_setResTimgObj(ResTIMG const* i_img, GXTexObj* o_texObj, u32 tlut_name,
                         GXTlutObj* o_tlutObj) {
     if (i_img->indexTexture) {
@@ -34,16 +32,12 @@ u32 mDoLib_setResTimgObj(ResTIMG const* i_img, GXTexObj* o_texObj, u32 tlut_name
     return i_img->indexTexture;
 }
 
-/* 803DD8E4-803DD940 00A604 005C+00 2/2 5/5 5/5 .bss             mClipper__14mDoLib_clipper */
 J3DUClipper mDoLib_clipper::mClipper;
 
-/* 80450C70-80450C74 000170 0004+00 1/1 2/2 4/4 .sbss            mSystemFar__14mDoLib_clipper */
 f32 mDoLib_clipper::mSystemFar;
 
-/* 80450C74-80450C78 000174 0004+00 1/1 1/1 0/0 .sbss            mFovyRate__14mDoLib_clipper */
 f32 mDoLib_clipper::mFovyRate;
 
-/* 8001528C-80015310 00FBCC 0084+00 0/0 1/1 0/0 .text            setup__14mDoLib_clipperFffff */
 void mDoLib_clipper::setup(f32 fovy, f32 aspect, f32 near, f32 far) {
     mClipper.setFovy(fovy);
     mClipper.setAspect(aspect);
@@ -57,7 +51,6 @@ void mDoLib_clipper::setup(f32 fovy, f32 aspect, f32 near, f32 far) {
     mFovyRate = cM_scos(tmp) / cM_ssin(tmp);
 }
 
-/* 80015310-800154EC 00FC50 01DC+00 0/0 21/21 23/23 .text            mDoLib_project__FP3VecP3Vec */
 void mDoLib_project(Vec* src, Vec* dst) {
     if (dComIfGd_getView() == NULL) {
         dst->x = 0.0f;
@@ -115,7 +108,6 @@ void mDoLib_project(Vec* src, Vec* dst) {
     dst->y = ((0.5f + (multVec.y * (-calcFloat))) * ySize) + yOffset;
 }
 
-/* 800154EC-80015544 00FE2C 0058+00 0/0 2/2 9/9 .text            mDoLib_pos2camera__FP3VecP3Vec */
 void mDoLib_pos2camera(Vec* src, Vec* dst) {
     if (dComIfGd_getView() == NULL) {
         dst->x = 0.0f;
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index a3c53ef74b..54caefa88e 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -26,7 +26,6 @@
 #include "m_Do/m_Do_main.h"
 #include "DynamicLink.h"
 
-/* 80450BF0-80450BF4 0000F0 0004+00 1/1 0/0 0/0 .sbss            None */
 #if DEBUG
 u8 mDoMch::mDebugFill = true;
 u8 mDoMch::mDebugFillNotUse = 0xDD;
@@ -42,29 +41,21 @@ u8 mDoMch::GXWarningExecuteFrame;
 u8 mDoMch::mDebugFill;
 #endif
 
-/* 80450BF4-80450BF8 0000F4 0004+00 1/1 0/0 0/0 .sbss            solidHeapErrors */
 static int solidHeapErrors;
 
-/* 80450BF8-80450BFC 0000F8 0004+00 1/1 0/0 0/0 .sbss            gameHeapErrors */
 static int gameHeapErrors;
 
-/* 80450BFC-80450C00 0000FC 0004+00 1/1 0/0 0/0 .sbss            zeldaHeapErrors */
 static int zeldaHeapErrors;
 
-/* 80450C00-80450C04 000100 0004+00 1/1 0/0 0/0 .sbss            commandHeapErrors */
 static int commandHeapErrors;
 
-/* 80450C04-80450C08 000104 0004+00 1/1 0/0 0/0 .sbss            archiveHeapErrors */
 static int archiveHeapErrors;
 
-/* 80450C08-80450C0C 000108 0004+00 1/1 0/0 0/0 .sbss            unknownHeapErrors */
 static int unknownHeapErrors;
 
-/* 80450C0C-80450C10 00010C 0004+00 1/1 0/0 0/0 .sbss            heapErrors */
 static u32 heapErrors;
 
 #if VERSION == VERSION_GCN_USA || VERSION == VERSION_GCN_JPN
-/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data            g_ntscZeldaIntDf */
 GXRenderModeObj g_ntscZeldaIntDf = {
     VI_TVMODE_NTSC_INT,
     608,
@@ -92,7 +83,6 @@ GXRenderModeObj g_ntscZeldaIntDf = {
     {8, 8, 10, 12, 10, 8, 8},
 };
 
-/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data            g_ntscZeldaProg */
 GXRenderModeObj g_ntscZeldaProg = {
     VI_TVMODE_NTSC_PROG,
     608,
@@ -120,7 +110,6 @@ GXRenderModeObj g_ntscZeldaProg = {
     {0, 0, 21, 22, 21, 0, 0},
 };
 #elif VERSION == VERSION_GCN_PAL
-/* 803A2F60-803A2F9C 000080 003C+00 1/0 0/0 0/0 .data            g_ntscZeldaIntDf */
 GXRenderModeObj g_ntscZeldaIntDf = {
     VI_TVMODE_PAL_INT,
     608,
@@ -148,7 +137,6 @@ GXRenderModeObj g_ntscZeldaIntDf = {
     {8, 8, 10, 12, 10, 8, 8},
 };
 
-/* 803A2F9C-803A2FD8 0000BC 003C+00 1/1 1/1 0/0 .data            g_ntscZeldaProg */
 GXRenderModeObj g_ntscZeldaProg = {
     VI_TVMODE_EURGB60_INT,
     608,
@@ -254,12 +242,8 @@ GXRenderModeObj g_palZeldaProg60 = {
 };
 #endif
 
-/* 804505A0-804505A8 -00001 0004+04 1/1 3/3 0/0 .sdata           mRenderModeObj__15mDoMch_render_c
- */
 GXRenderModeObj* mDoMch_render_c::mRenderModeObj = &g_ntscZeldaIntDf;
 
-/* 8000B1EC-8000B3EC 005B2C 0200+00 2/2 0/0 0/0 .text            myGetHeapTypeByString__FP7JKRHeap
- */
 static const char* myGetHeapTypeByString(JKRHeap* p_heap) {
     static char tmpString[5];
 
@@ -318,7 +302,6 @@ static const char* myGetHeapTypeByString(JKRHeap* p_heap) {
     }
 }
 
-/* 8000B3EC-8000B5C8 005D2C 01DC+00 1/1 0/0 0/0 .text            myMemoryErrorRoutine__FPvUli */
 static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) {
     JKRHeap* heap = (JKRHeap*)p_heap;
 
@@ -363,7 +346,6 @@ static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) {
     }
 }
 
-/* 8000B5C8-8000B668 005F08 00A0+00 1/1 0/0 0/0 .text            myHeapCheckRecursive__FP7JKRHeap */
 void myHeapCheckRecursive(JKRHeap* p_heap) {
     if (!p_heap->check()) {
         const char* type = myGetHeapTypeByString(p_heap);
@@ -376,12 +358,10 @@ void myHeapCheckRecursive(JKRHeap* p_heap) {
     }
 }
 
-/* 8000B668-8000B68C 005FA8 0024+00 0/0 2/2 0/0 .text            mDoMch_HeapCheckAll__Fv */
 void mDoMch_HeapCheckAll() {
     myHeapCheckRecursive(JKRHeap::sRootHeap);
 }
 
-/* 8000B68C-8000B73C 005FCC 00B0+00 1/1 0/0 0/0 .text            developKeyCheck__FUlUl */
 static int developKeyCheck(u32 btnTrig, u32 btnHold) {
     static u8 key_link;
     static u8 key_ganon;
@@ -413,17 +393,14 @@ static int developKeyCheck(u32 btnTrig, u32 btnHold) {
     return mDoMain::developmentMode;
 }
 
-/* 8000B73C-8000B768 00607C 002C+00 1/1 0/0 0/0 .text            mDoMch_IsProgressiveMode__Fv */
 BOOL mDoMch_IsProgressiveMode() {
     return OSGetProgressiveMode() == true;
 }
 
-/* 8000B768-8000B798 0060A8 0030+00 2/2 0/0 0/0 .text            exceptionReadPad__FPUlPUl */
 bool exceptionReadPad(u32* p_btnTrig, u32* p_btnHold) {
     return JUTException::getManager()->readPad(p_btnTrig, p_btnHold);
 }
 
-/* 8000B798-8000B7C8 0060D8 0030+00 1/1 0/0 0/0 .text            exceptionRestart__Fv */
 void exceptionRestart() {
     mDoRst_reset(0, 0, 0);
     OSResetSystem(0, 0, 0);
@@ -431,7 +408,6 @@ void exceptionRestart() {
     } while (true);
 }
 
-/* 8000B7C8-8000B95C 006108 0194+00 1/1 0/0 0/0 .text myExceptionCallback__FUsP9OSContextUlUl */
 void myExceptionCallback(u16, OSContext*, u32, u32) {
     u32 btnHold;
     u32 btnTrig;
@@ -488,7 +464,6 @@ void myExceptionCallback(u16, OSContext*, u32, u32) {
     VIFlush();
 }
 
-/* 8000B95C-8000BCF4 00629C 0398+00 1/1 0/0 0/0 .text fault_callback_scroll__FUsP9OSContextUlUl */
 static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) {
     JUTException* manager = JUTException::getManager();
     JUTConsole* exConsole = manager->getConsole();
@@ -610,19 +585,16 @@ static void dummy_string() {
     DEAD_STRING("\x1B[32m%-24s = size=%d KB\n\x1B[m");
 }
 
-/* 8000BCF4-8000BCF8 006634 0004+00 1/1 0/0 0/0 .text            my_PrintHeap__FPCcUl */
 static void my_PrintHeap(char const* heapName, u32 heapSize) {
     OS_REPORT("\x1b[32m%-24s = size=%d KB\n\x1b[m", heapName, heapSize / 1024);
 }
 
-/* 8000BCF8-8000BD44 006638 004C+00 1/1 0/0 0/0 .text            my_SysPrintHeap__FPCcPvUl */
 void my_SysPrintHeap(char const* message, void* start, u32 size) {
     uintptr_t end = (uintptr_t)start + size;
     OSReport_System("\x1b[32m%-24s = %08x-%08x size=%d KB\n\x1b[m", message, start,
                     end, size / 1024);
 }
 
-/* 8000BD44-8000C0CC 006684 0388+00 0/0 2/1 0/0 .text            mDoMch_Create__Fv */
 int mDoMch_Create() {
     if (mDoMain::developmentMode == 0 || !(OSGetConsoleType() & 0x10000000)) {
         OSReportDisable();
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index bcb4f604df..d7b36128cc 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -45,7 +45,6 @@ public:
     void genMessage(JORMContext*);
 };
 
-/* 800056C0-80005728 000000 0068+00 1/1 0/0 0/0 .text            version_check__Fv */
 void version_check() {
 #if !PLATFORM_SHIELD
     if (!strcmp("20Apr2004", "20Apr2004") && !strcmp("Patch2", "Patch2")) {
@@ -59,42 +58,32 @@ void version_check() {
 #endif
 }
 
-/* 803A2EE0-803A2EF4 000000 0012+02 2/2 1/1 0/0 .data            COPYDATE_STRING__7mDoMain */
 char mDoMain::COPYDATE_STRING[18] = "??/??/?? ??:??:??";
 
-/* 803D32E0-803D3308 000000 0028+00 3/2 0/0 0/0 .bss             RootHeapCheck */
 // static HeapCheck RootHeapCheck;
 static HeapCheck RootHeapCheck = HeapCheck(0,"Root","ルート");
 
-/* 803D3308-803D3330 000028 0028+00 1/2 0/0 0/0 .bss             SystemHeapCheck */
 // static HeapCheck SystemHeapCheck;
 static HeapCheck SystemHeapCheck = HeapCheck(0,"System","システム");
 
-/* 803D3330-803D3358 000050 0028+00 1/2 0/0 0/0 .bss             ZeldaHeapCheck */
 // static HeapCheck ZeldaHeapCheck;
 static HeapCheck ZeldaHeapCheck = HeapCheck(0,"Zelda","ゼルダ");
 
-/* 803D3358-803D3380 000078 0028+00 1/2 0/0 0/0 .bss             GameHeapCheck */
 // static HeapCheck GameHeapCheck;
 static HeapCheck GameHeapCheck = HeapCheck(0,"Game","ゲーム");
 
-/* 803D3380-803D33A8 0000A0 0028+00 1/2 0/0 0/0 .bss             ArchiveHeapCheck */
 // static HeapCheck ArchiveHeapCheck;
 static HeapCheck ArchiveHeapCheck = HeapCheck(0,"Archive","アーカイブ");
 
-/* 803D33A8-803D33D0 0000C8 0028+00 1/2 0/0 0/0 .bss             J2dHeapCheck */
 // static HeapCheck J2dHeapCheck;
 static HeapCheck J2dHeapCheck = HeapCheck(0,"J2d","J2D");
 
-/* 803D33D0-803D33F8 0000F0 0028+00 1/2 0/0 0/0 .bss             HostioHeapCheck */
 // static HeapCheck HostioHeapCheck;
 static HeapCheck HostioHeapCheck = HeapCheck(0,"Hostio","ホストIO");
 
-/* 803D33F8-803D3420 000118 0028+00 1/2 0/0 0/0 .bss             CommandHeapCheck */
 // static HeapCheck CommandHeapCheck;
 static HeapCheck CommandHeapCheck = HeapCheck(0,"Command","コマンド");
 
-/* 803A2EF4-803A2F14 -00001 0020+00 1/2 0/0 0/0 .data            HeapCheckTable */
 static HeapCheck* HeapCheckTable[8] = {
     &RootHeapCheck,    &SystemHeapCheck, &ZeldaHeapCheck,  &GameHeapCheck,
     &ArchiveHeapCheck, &J2dHeapCheck,    &HostioHeapCheck, &CommandHeapCheck,
@@ -116,7 +105,6 @@ void printFrameLine() {
               calendar.hour, calendar.min, calendar.sec, calendar.msec, calendar.usec);
 }
 
-/* 80005728-8000578C 000068 0064+00 1/1 0/0 0/0 .text            CheckHeap1__9HeapCheckFv */
 void HeapCheck::CheckHeap1() {
     s32 totalUsedSize = mHeap->getTotalUsedSize();
     s32 freeSize = mHeap->getFreeSize();
@@ -128,7 +116,6 @@ void HeapCheck::CheckHeap1() {
         mMaxTotalFreeSize = freeSize;
 }
 
-/* 8000578C-80005848 0000CC 00BC+00 1/1 0/0 0/0 .text            CheckHeap__FUl */
 void CheckHeap(u32 i_padNo) {
     mDoMch_HeapCheckAll();
     OSCheckActiveThreads();
@@ -143,7 +130,6 @@ void CheckHeap(u32 i_padNo) {
     }
 }
 
-/* 80005848-800058A0 000188 0058+00 2/2 0/0 0/0 .text            countUsed__FP10JKRExpHeap */
 static int countUsed(JKRExpHeap* heap) {
     OSDisableScheduler();
 
@@ -158,12 +144,10 @@ static int countUsed(JKRExpHeap* heap) {
     return counter;
 }
 
-/* 800058A0-800058C4 0001E0 0024+00 2/2 0/0 0/0 .text            getUsedCount__9HeapCheckCFv */
 s32 HeapCheck::getUsedCount() const {
     return countUsed(mHeap);
 }
 
-/* 800058C4-80005AD8 000204 0214+00 1/1 0/0 0/0 .text            heapDisplay__9HeapCheckCFv */
 void HeapCheck::heapDisplay() const {
     s32 heap_size = mHeap->getHeapSize();
     s32 used_count = heap_size - getTargetHeapSize();
@@ -190,7 +174,6 @@ void HeapCheck::heapDisplay() const {
 int mDoMain::argument = -1;
 #endif
 
-/* 80450580-80450584 000000 0004+00 3/3 6/6 0/0 .sdata           None */
 s8 mDoMain::developmentMode = -1;
 
 #ifdef DEBUG
@@ -198,30 +181,24 @@ u32 mDoMain::gameHeapSize = 0xFFFFFFFF;
 u32 mDoMain::archiveHeapSize = 0xFFFFFFFF;
 #endif
 
-/* 80450584-80450588 000004 0004+00 0/0 1/1 0/0 .sdata           memMargin__7mDoMain */
 u32 mDoMain::memMargin = 0xFFFFFFFF;
 
 #ifdef DEBUG
 int mDoMain::e3menu_no = -1;
 #endif
 
-/* 80450588-80450590 000008 0008+00 2/2 0/0 0/0 .sdata           None */
 u8 mHeapBriefType = 4;
 
 #if DEBUG
 static u8 memorycheck_check_frame;
 #endif
 
-/* 80450B00-80450B08 000000 0008+00 1/1 0/0 0/0 .sbss            None */
 static u8 fillcheck_check_frame;
 
-/* 80450B08-80450B0C 000008 0004+00 1/1 1/1 0/0 .sbss            sPowerOnTime__7mDoMain */
 OSTime mDoMain::sPowerOnTime;
 
-/* 80450B10-80450B14 000010 0004+00 0/0 2/2 0/0 .sbss            sHungUpTime__7mDoMain */
 OSTime mDoMain::sHungUpTime;
 
-/* 80450B18-80450B1C -00001 0004+00 3/3 0/0 0/0 .sbss            None */
 /* 80450B18 0001+00 data_80450B18 None */
 static u8 mDisplayHeapSize;
 
@@ -240,7 +217,6 @@ static u8 mPrintFrameLine;
 /* 80450B1A 0002+00 data_80450B1A None */
 static u8 mCheckHeap;
 
-/* 80005AD8-80005D4C 000418 0274+00 1/1 0/0 0/0 .text            debugDisplay__Fv */
 void debugDisplay() {
     static const char* desc1[5] = {
         "", "TotalFree", "MaxUsed  ", "Used     ", "RelUsed  ",
@@ -510,7 +486,6 @@ void mDoMain_HIO_c::listenPropertyEvent(const JORPropertyEvent* property) {
 }
 #endif
 
-/* 80005D4C-8000614C 00068C 0400+00 1/1 0/0 0/0 .text            Debug_console__FUl */
 bool Debug_console(u32 i_padNo) {
     JUTConsole* console = JFWSystem::getSystemConsole();
     if (console != NULL) {
@@ -615,9 +590,8 @@ bool Debug_console(u32 i_padNo) {
 #define COPYDATE_PATH "/str/RVL/Debug/COPYDATE"
 #endif
 
-/* 8000614C-800061C8 000A8C 007C+00 1/1 0/0 0/0 .text            LOAD_COPYDATE__FPv */
 s32 LOAD_COPYDATE(void*) {
-    DVDFileInfo ALIGN_DECL(32) fileInfo;
+    DVDFileInfo ATTRIBUTE_ALIGN(32) fileInfo;
     u8 buffer[32];
 
     BOOL status = DVDOpen(COPYDATE_PATH, &fileInfo);
@@ -631,7 +605,6 @@ s32 LOAD_COPYDATE(void*) {
     return status;
 }
 
-/* 800061C8-8000628C 000B08 00C4+00 1/1 0/0 0/0 .text            debug__Fv */
 static void debug() {
     #if DEBUG
     if (mPrintFrameLine) {
@@ -690,7 +663,6 @@ static void debug() {
     }
 }
 
-/* 8000628C-80006454 000BCC 01C8+00 1/1 0/0 0/0 .text            main01__Fv */
 void main01(void) {
     OS_REPORT("\x1b[m");
 
@@ -891,13 +863,10 @@ void parse_args(int argc, const char* argv[]) {
 }
 #endif
 
-/* 803D3420-803DB420 000140 8000+00 1/1 0/0 0/0 .bss             mainThreadStack */
 static u8 mainThreadStack[32768];
 
-/* 803DB420-803DB740 008140 0318+08 1/1 0/0 0/0 .bss             mainThread */
 static OSThread mainThread;
 
-/* 80006454-800065D8 000D94 0184+00 0/0 1/1 0/0 .text            main */
 void main(int argc, const char* argv[]) {
     OSThread* current_thread = OSGetCurrentThread();
     u8* stack = mainThreadStack;
@@ -969,122 +938,75 @@ void main(int argc, const char* argv[]) {
     OSSuspendThread(current_thread);
 }
 
-/* 800065D8-800065E0 000F18 0008+00 0/0 2/0 0/0 .text            dump_sort__7JKRHeapFv */
 bool JKRHeap::dump_sort() {
     return true;
 }
 
-/* ############################################################################################## */
-/* 80450B38-80450B3C 000038 0004+00 0/0 2/2 0/0 .sbss
- * sInstance__34JASGlobalInstance<13Z2WolfHowlMgr>              */
 template<>
 Z2WolfHowlMgr* JASGlobalInstance<Z2WolfHowlMgr>::sInstance;
 
-/* 80450B3C-80450B40 00003C 0004+00 0/0 6/6 0/0 .sbss sInstance__31JASGlobalInstance<10Z2EnvSeMgr>
- */
 template<>
 Z2EnvSeMgr* JASGlobalInstance<Z2EnvSeMgr>::sInstance;
 
-/* 80450B40-80450B44 000040 0004+00 0/0 6/6 0/0 .sbss
- * sInstance__32JASGlobalInstance<11Z2FxLineMgr>                */
 template<>
 Z2FxLineMgr* JASGlobalInstance<Z2FxLineMgr>::sInstance;
 
-/* 80450B44-80450B48 000044 0004+00 0/0 18/18 0/0 .sbss
- * sInstance__31JASGlobalInstance<10Z2Audience>                 */
 template<>
 Z2Audience* JASGlobalInstance<Z2Audience>::sInstance;
 
-/* 80450B48-80450B4C 000048 0004+00 0/0 17/17 0/0 .sbss
- * sInstance__34JASGlobalInstance<13Z2SoundObjMgr>              */
 template<>
 Z2SoundObjMgr* JASGlobalInstance<Z2SoundObjMgr>::sInstance;
 
-/* 80450B4C-80450B50 00004C 0004+00 0/0 10/10 0/0 .sbss
- * sInstance__32JASGlobalInstance<11Z2SoundInfo>                */
 template<>
 Z2SoundInfo* JASGlobalInstance<Z2SoundInfo>::sInstance;
 
-/* 80450B50-80450B54 000050 0004+00 0/0 5/5 0/0 .sbss
- * sInstance__33JASGlobalInstance<12JAUSoundInfo>               */
 template<>
 JAUSoundInfo* JASGlobalInstance<JAUSoundInfo>::sInstance;
 
-/* 80450B54-80450B58 000054 0004+00 0/0 2/2 0/0 .sbss
- * sInstance__38JASGlobalInstance<17JAUSoundNameTable>          */
 template<>
 JAUSoundNameTable* JASGlobalInstance<JAUSoundNameTable>::sInstance;
 
-/* 80450B58-80450B5C 000058 0004+00 0/0 12/12 0/0 .sbss
- * sInstance__34JASGlobalInstance<13JAUSoundTable>              */
 template<>
 JAUSoundTable* JASGlobalInstance<JAUSoundTable>::sInstance;
 
-/* 80450B5C-80450B60 00005C 0004+00 0/0 6/6 0/0 .sbss
- * sInstance__33JASGlobalInstance<12JAISoundInfo>               */
 template<>
 JAISoundInfo* JASGlobalInstance<JAISoundInfo>::sInstance;
 
-/* 80450B60-80450B64 000060 0004+00 0/0 29/29 0/0 .sbss
- * sInstance__31JASGlobalInstance<10Z2SoundMgr>                 */
 template<>
 Z2SoundMgr* JASGlobalInstance<Z2SoundMgr>::sInstance;
 
-/* 80450B64-80450B68 000064 0004+00 0/0 2/2 0/0 .sbss
- * sInstance__33JASGlobalInstance<12JAIStreamMgr>               */
 template<>
 JAIStreamMgr* JASGlobalInstance<JAIStreamMgr>::sInstance;
 
-/* 80450B68-80450B6C 000068 0004+00 0/0 3/3 0/0 .sbss sInstance__29JASGlobalInstance<9JAISeqMgr>
- */
 template<>
 JAISeqMgr* JASGlobalInstance<JAISeqMgr>::sInstance;
 
-/* 80450B6C-80450B70 00006C 0004+00 0/0 4/4 0/0 .sbss sInstance__28JASGlobalInstance<8JAISeMgr> */
 template<>
 JAISeMgr* JASGlobalInstance<JAISeMgr>::sInstance;
 
-/* 80450B70-80450B74 000070 0004+00 0/0 9/9 0/0 .sbss
- * sInstance__33JASGlobalInstance<12Z2SpeechMgr2>               */
 template<>
 Z2SpeechMgr2* JASGlobalInstance<Z2SpeechMgr2>::sInstance;
 
-/* 80450B74-80450B78 000074 0004+00 0/0 22/22 0/0 .sbss
- * sInstance__35JASGlobalInstance<14Z2SoundStarter>             */
 template<>
 Z2SoundStarter* JASGlobalInstance<Z2SoundStarter>::sInstance;
 
-/* 80450B78-80450B7C 000078 0004+00 0/0 2/2 0/0 .sbss
- * sInstance__36JASGlobalInstance<15JAISoundStarter>            */
 template<>
 JAISoundStarter* JASGlobalInstance<JAISoundStarter>::sInstance;
 
-/* 80450B7C-80450B80 00007C 0004+00 0/0 34/34 0/0 .sbss
- * sInstance__32JASGlobalInstance<11Z2StatusMgr>                */
 template<>
 Z2StatusMgr* JASGlobalInstance<Z2StatusMgr>::sInstance;
 
-/* 80450B80-80450B84 000080 0004+00 0/0 46/46 0/0 .sbss
- * sInstance__31JASGlobalInstance<10Z2SceneMgr>                 */
 template<>
 Z2SceneMgr* JASGlobalInstance<Z2SceneMgr>::sInstance;
 
-/* 80450B84-80450B88 000084 0004+00 0/0 38/38 0/0 .sbss sInstance__28JASGlobalInstance<8Z2SeqMgr>
- */
 template<>
 Z2SeqMgr* JASGlobalInstance<Z2SeqMgr>::sInstance;
 
-/* 80450B88-80450B8C 000088 0004+00 0/0 25/25 0/0 .sbss sInstance__27JASGlobalInstance<7Z2SeMgr>
- */
 template<>
 Z2SeMgr* JASGlobalInstance<Z2SeMgr>::sInstance;
 
-/* 80450B8C-80450B90 00008C 0004+00 0/0 6/6 0/0 .sbss
- * sInstance__35JASGlobalInstance<14JASAudioThread>             */
 template<>
 JASAudioThread* JASGlobalInstance<JASAudioThread>::sInstance;
 
-/* 80450B90-80450B98 000090 0004+04 0/0 4/4 0/0 .sbss
- * sInstance__40JASGlobalInstance<19JASDefaultBankTable>        */
 template<>
 JASDefaultBankTable* JASGlobalInstance<JASDefaultBankTable>::sInstance;
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index 6ec8f41758..379e7f2a80 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -11,28 +11,18 @@
 #include "SSystem/SComponent/c_math.h"
 #include "global.h"
 
-/* ############################################################################################## */
-/* 803DD470-803DD4A0 00A190 0030+00 12/12 142/142 1820/1820 .bss             now__14mDoMtx_stack_c
- */
 Mtx mDoMtx_stack_c::now;
 
-/* 803DD4A0-803DD7A0 00A1C0 0300+00 2/2 0/0 0/0 .bss             buffer__14mDoMtx_stack_c */
 Mtx mDoMtx_stack_c::buffer[16];
 
-/* 804505A8-804505AC -00001 0004+00 3/3 0/0 0/0 .sdata           next__14mDoMtx_stack_c */
 Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer;
 
-/* 804505AC-804505B0 -00001 0004+00 2/2 0/0 0/0 .sdata           end__14mDoMtx_stack_c */
 Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + 16;
 
-/* 80450C18-80450C20 000118 0001+07 1/1 0/0 0/0 .sbss            mDoMtx_stack */
 static mDoMtx_stack_c mDoMtx_stack;
 
-/* 803DD7B8-803DD8D8 00A4D8 011C+04 0/1 0/0 0/0 .bss             mDoMtx_quatStack */
 static mDoMtx_quatStack_c mDoMtx_quatStack;
 
-/* ############################################################################################## */
-/* 803A2FD8-803A3020 0000F8 0030+18 0/0 23/23 4/4 .data            g_mDoMtx_identity */
 extern Mtx g_mDoMtx_identity = {
     {1.0f, 0.0f, 0.0f, 0.0f},
     {0.0f, 1.0f, 0.0f, 0.0f},
@@ -45,7 +35,6 @@ static void dummy() {
 }
 #endif
 
-/* 8000C0CC-8000C164 006A0C 0098+00 1/1 0/0 0/0 .text            mDoMtx_XYZrotS__FPA4_fsss */
 void mDoMtx_XYZrotS(Mtx mtx, s16 x, s16 y, s16 z) {
     Mtx tmp;
     if (z != 0) {
@@ -65,7 +54,6 @@ void mDoMtx_XYZrotS(Mtx mtx, s16 x, s16 y, s16 z) {
     }
 }
 
-/* 8000C164-8000C208 006AA4 00A4+00 1/1 8/8 13/13 .text            mDoMtx_XYZrotM__FPA4_fsss */
 void mDoMtx_XYZrotM(Mtx mtx, s16 x, s16 y, s16 z) {
     Mtx tmp;
     if (z != 0) {
@@ -84,7 +72,6 @@ void mDoMtx_XYZrotM(Mtx mtx, s16 x, s16 y, s16 z) {
     }
 }
 
-/* 8000C208-8000C2A0 006B48 0098+00 1/1 10/10 37/37 .text            mDoMtx_ZXYrotS__FPA4_fsss */
 void mDoMtx_ZXYrotS(Mtx mtx, s16 x, s16 y, s16 z) {
     Mtx tmp;
     if (y != 0) {
@@ -104,7 +91,6 @@ void mDoMtx_ZXYrotS(Mtx mtx, s16 x, s16 y, s16 z) {
     }
 }
 
-/* 8000C2A0-8000C344 006BE0 00A4+00 1/1 19/19 149/149 .text            mDoMtx_ZXYrotM__FPA4_fsss */
 void mDoMtx_ZXYrotM(Mtx mtx, s16 x, s16 y, s16 z) {
     Mtx tmp;
     if (y != 0) {
@@ -123,7 +109,6 @@ void mDoMtx_ZXYrotM(Mtx mtx, s16 x, s16 y, s16 z) {
     }
 }
 
-/* 8000C344-8000C39C 006C84 0058+00 5/5 7/7 38/38 .text            mDoMtx_XrotS__FPA4_fs */
 void mDoMtx_XrotS(Mtx mtx, s16 x) {
     f32 l_cos = JMASCos(x);
     f32 l_sin = JMASSin(x);
@@ -144,14 +129,12 @@ void mDoMtx_XrotS(Mtx mtx, s16 x) {
     mtx[2][3] = 0.0f;
 }
 
-/* 8000C39C-8000C3DC 006CDC 0040+00 0/0 11/11 425/425 .text            mDoMtx_XrotM__FPA4_fs */
 void mDoMtx_XrotM(Mtx mtx, s16 x) {
     Mtx tmp;
     mDoMtx_XrotS(tmp, x);
     mDoMtx_concat(mtx, tmp, mtx);
 }
 
-/* 8000C3DC-8000C434 006D1C 0058+00 5/5 24/24 809/809 .text            mDoMtx_YrotS__FPA4_fs */
 /**
  * @brief Sets the given matrix to a rotation transformation around the Y-axis.
  *
@@ -186,14 +169,12 @@ void mDoMtx_YrotS(Mtx mtx, s16 y) {
     mtx[2][3] = 0.0f;
 }
 
-/* 8000C434-8000C474 006D74 0040+00 0/0 44/44 775/775 .text            mDoMtx_YrotM__FPA4_fs */
 void mDoMtx_YrotM(Mtx mtx, s16 y) {
     Mtx tmp;
     mDoMtx_YrotS(tmp, y);
     mDoMtx_concat(mtx, tmp, mtx);
 }
 
-/* 8000C474-8000C4CC 006DB4 0058+00 7/7 1/1 6/6 .text            mDoMtx_ZrotS__FPA4_fs */
 void mDoMtx_ZrotS(Mtx mtx, s16 z) {
     f32 l_cos = JMASCos(z);
     f32 l_sin = JMASSin(z);
@@ -214,15 +195,12 @@ void mDoMtx_ZrotS(Mtx mtx, s16 z) {
     mtx[2][3] = 0.0f;
 }
 
-/* 8000C4CC-8000C50C 006E0C 0040+00 0/0 9/9 302/302 .text            mDoMtx_ZrotM__FPA4_fs */
 void mDoMtx_ZrotM(Mtx mtx, s16 z) {
     Mtx tmp;
     mDoMtx_ZrotS(tmp, z);
     mDoMtx_concat(mtx, tmp, mtx);
 }
 
-/* 8000C50C-8000C710 006E4C 0204+00 0/0 3/3 0/0 .text            mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs
- */
 void mDoMtx_lookAt(Mtx mtx, Vec const* param_1, Vec const* param_2, s16 param_3) {
     cXyz stack_48(*(cXyz*)param_1);
     cXyz local_54;
@@ -263,8 +241,6 @@ void mDoMtx_lookAt(Mtx mtx, Vec const* param_1, Vec const* param_2, s16 param_3)
     mDoMtx_concat(tmp, mtx, mtx);
 }
 
-/* 8000C710-8000C8D0 007050 01C0+00 0/0 10/10 1/1 .text mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs
- */
 void mDoMtx_lookAt(Mtx mtx, Vec const* i_eye, Vec const* i_center, Vec const* i_up, s16 i_bank) {
     cXyz eye = *i_eye;
     cXyz center = *i_center;
@@ -293,7 +269,6 @@ void mDoMtx_lookAt(Mtx mtx, Vec const* i_eye, Vec const* i_center, Vec const* i_
     }
 }
 
-/* 8000C8D0-8000C9B0 007210 00E0+00 0/0 2/2 0/0 .text mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f */
 void mDoMtx_concatProjView(const Mtx a, const Mtx b, Mtx c) {
     mDoMtx_concat(a, b, c);
     c[3][0] = a[3][0] * b[0][0] + a[3][1] * b[1][0] + a[3][2] * b[2][0];
@@ -302,7 +277,6 @@ void mDoMtx_concatProjView(const Mtx a, const Mtx b, Mtx c) {
     c[3][3] = a[3][0] * b[0][3] + a[3][1] * b[1][3] + a[3][2] * b[2][3] + a[3][3];
 }
 
-/* 8000C9B0-8000CB5C 0072F0 01AC+00 0/0 1/1 1/1 .text mDoMtx_inverseTranspose__FPA4_CfPA4_f */
 bool mDoMtx_inverseTranspose(const Mtx a, Mtx b) {
     f32 f31 = a[0][0] * a[1][1] * a[2][2] + a[0][1] * a[1][2] * a[2][0] +
                a[0][2] * a[1][0] * a[2][1] - a[2][0] * a[1][1] * a[0][2] -
@@ -338,8 +312,6 @@ bool mDoMtx_inverseTranspose(const Mtx a, Mtx b) {
     return true;
 }
 
-/* 8000CB5C-8000CC00 00749C 00A4+00 0/0 2/2 2/2 .text
- * mDoMtx_QuatConcat__FPC10QuaternionPC10QuaternionP10Quaternion */
 void mDoMtx_QuatConcat(const Quaternion* a, const Quaternion* b, Quaternion* c) {
     c->w = (a->w * b->w) - (a->x * b->x) - (a->y * b->y) - (a->z * b->z);
     c->x = (a->w * b->x) + (a->x * b->w) + (a->y * b->z) - (a->z * b->y);
@@ -347,8 +319,6 @@ void mDoMtx_QuatConcat(const Quaternion* a, const Quaternion* b, Quaternion* c)
     c->z = (a->w * b->z) + (a->z * b->w) + (a->x * b->y) - (a->y * b->x);
 }
 
-/* 8000CC00-8000CCC8 007540 00C8+00 0/0 11/11 26/26 .text            mDoMtx_MtxToRot__FPA4_CfP5csXyz
- */
 void mDoMtx_MtxToRot(CMtxP m, csXyz* o_rot) {
     f32 f31 = m[0][2];
     f31 *= f31;
@@ -367,7 +337,6 @@ void mDoMtx_MtxToRot(CMtxP m, csXyz* o_rot) {
     }
 }
 
-/* 8000CCC8-8000CD14 007608 004C+00 0/0 0/0 24/24 .text            push__14mDoMtx_stack_cFv */
 bool mDoMtx_stack_c::push() {
     if (next >= end) {
         JUT_ASSERT(729, next < end)
@@ -378,7 +347,6 @@ bool mDoMtx_stack_c::push() {
     return true;
 }
 
-/* 8000CD14-8000CD64 007654 0050+00 0/0 0/0 24/24 .text            pop__14mDoMtx_stack_cFv */
 bool mDoMtx_stack_c::pop() {
     if (next <= buffer) {
         JUT_ASSERT(751, next > buffer);
@@ -389,67 +357,50 @@ bool mDoMtx_stack_c::pop() {
     return true;
 }
 
-/* 8000CD64-8000CD9C 0076A4 0038+00 0/0 50/50 484/484 .text transS__14mDoMtx_stack_cFRC4cXyz */
 void mDoMtx_stack_c::transS(cXyz const& param_0) {
     transS(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CD9C-8000CDD4 0076DC 0038+00 1/1 29/29 285/285 .text            transM__14mDoMtx_stack_cFfff
- */
 void mDoMtx_stack_c::transM(f32 x, f32 y, f32 z) {
     Mtx tmp;
     mDoMtx_trans(tmp, x, y, z);
     mDoMtx_concat(now, tmp, now);
 }
 
-/* 8000CDD4-8000CE00 007714 002C+00 0/0 3/3 40/40 .text            transM__14mDoMtx_stack_cFRC4cXyz
- */
 void mDoMtx_stack_c::transM(cXyz const& param_0) {
     transM(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CE00-8000CE38 007740 0038+00 0/0 0/0 2/2 .text            scaleS__14mDoMtx_stack_cFRC4cXyz */
 void mDoMtx_stack_c::scaleS(cXyz const& param_0) {
     scaleS(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CE38-8000CE70 007778 0038+00 1/1 13/13 219/219 .text            scaleM__14mDoMtx_stack_cFfff
- */
 void mDoMtx_stack_c::scaleM(f32 x, f32 y, f32 z) {
     Mtx tmp;
     mDoMtx_scale(tmp, x, y, z);
     mDoMtx_concat(now, tmp, now);
 }
 
-/* 8000CE70-8000CE9C 0077B0 002C+00 0/0 7/7 79/79 .text            scaleM__14mDoMtx_stack_cFRC4cXyz
- */
 void mDoMtx_stack_c::scaleM(cXyz const& param_0) {
     scaleM(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CE9C-8000CED4 0077DC 0038+00 0/0 3/3 0/0 .text            XYZrotS__14mDoMtx_stack_cFRC5csXyz
- */
 void mDoMtx_stack_c::XYZrotS(csXyz const& param_0) {
     XYZrotS(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CED4-8000CF0C 007814 0038+00 0/0 1/1 4/4 .text            XYZrotM__14mDoMtx_stack_cFRC5csXyz
- */
 void mDoMtx_stack_c::XYZrotM(csXyz const& param_0) {
     XYZrotM(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CF0C-8000CF44 00784C 0038+00 0/0 5/5 43/43 .text ZXYrotS__14mDoMtx_stack_cFRC5csXyz */
 void mDoMtx_stack_c::ZXYrotS(csXyz const& param_0) {
     ZXYrotS(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CF44-8000CF7C 007884 0038+00 0/0 24/24 250/250 .text ZXYrotM__14mDoMtx_stack_cFRC5csXyz */
 void mDoMtx_stack_c::ZXYrotM(csXyz const& param_0) {
     ZXYrotM(param_0.x, param_0.y, param_0.z);
 }
 
-/* 8000CF7C-8000CFB8 0078BC 003C+00 0/0 1/1 6/6 .text quatM__14mDoMtx_stack_cFPC10Quaternion */
 void mDoMtx_stack_c::quatM(Quaternion const* param_0) {
     Mtx tmp;
     mDoMtx_quat(tmp, param_0);
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index e61eb7a2b5..a9cedd3dfa 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -8,7 +8,6 @@
 #include <dolphin/base/PPCArch.h>
 #include "m_Do/m_Do_ext.h"
 
-/* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss            None */
 u8 __OSReport_disable;
 
 u8 __OSReport_Error_disable;
@@ -17,10 +16,8 @@ u8 __OSReport_Warning_disable;
 
 u8 __OSReport_System_disable;
 
-/* 80450B9C-80450BA0 00009C 0004+00 0/0 3/3 0/0 .sbss            None */
 u8 __OSReport_enable;
 
-/* 80006798-800067C8 0010D8 0030+00 1/1 0/0 0/0 .text            OSSwitchFiberEx__FUlUlUlUlUlUl */
 #ifdef __GEKKO__
 asm void OSSwitchFiberEx(register u32 param_0, register u32 param_1, register u32 param_2, register u32 param_3, register u32 code, register u32 stack) {
     nofralloc
@@ -49,17 +46,14 @@ asm void OSSwitchFiberEx(register u32 param_0, register u32 param_1, register u3
 }
 #endif
 
-/* 800067C8-800067F4 001108 002C+00 3/3 0/0 0/0 .text            my_PutString__FPCc */
 void my_PutString(const char* string) {
     fputs(string, stdout);
 }
 
-/* 800067F4-80006814 001134 0020+00 3/3 0/0 0/0 .text OSVAttention__FPCcP16__va_list_struct */
 void OSVAttention(const char* fmt, va_list args) {
     mDoPrintf_vprintf(fmt, args);
 }
 
-/* 80006814-80006894 001154 0080+00 1/1 1/1 0/0 .text            OSAttention */
 void OSAttention(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -67,27 +61,22 @@ void OSAttention(const char* fmt, ...) {
     va_end(args);
 }
 
-/* 80006894-800068A0 0011D4 000C+00 0/0 1/1 0/0 .text            OSReportDisable */
 void OSReportDisable() {
     __OSReport_disable = true;
 }
 
-/* 800068A0-800068AC 0011E0 000C+00 0/0 1/1 0/0 .text            OSReportEnable */
 void OSReportEnable() {
     __OSReport_disable = false;
 }
 
-/* 800068AC-800068B8 0011EC 000C+00 4/4 0/0 0/0 .text            OSReportForceEnableOn */
 void OSReportForceEnableOn() {
     __OSReport_enable = true;
 }
 
-/* 800068B8-800068C4 0011F8 000C+00 4/4 0/0 0/0 .text            OSReportForceEnableOff */
 void OSReportForceEnableOff() {
     __OSReport_enable = false;
 }
 
-/* 80450BA0-80450BA4 0000A0 0004+00 1/1 0/0 0/0 .sbss            __OSReport_MonopolyThread */
 static OSThread* __OSReport_MonopolyThread;
 
 #if DEBUG
@@ -99,24 +88,18 @@ u8 print_callerPC;
 u8 print_callerPCLevel = 3;
 #endif
 
-/* 80450BA4-80450BA8 0000A4 0004+00 1/1 0/0 0/0 .sbss            print_counts */
 u32 print_counts;
 
-/* 80450BA8-80450BAC 0000A8 0004+00 2/2 0/0 0/0 .sbss            print_errors */
 u32 print_errors;
 
-/* 80450BAC-80450BB0 0000AC 0004+00 1/1 0/0 0/0 .sbss            print_warings */
 u32 print_warings;
 
-/* 80450BB0-80450BB4 0000B0 0004+00 1/1 0/0 0/0 .sbss            print_systems */
 u32 print_systems;
 
-/* 80450BB4-80450BB8 -00001 0004+00 3/3 0/0 0/0 .sbss            None */
 u8 print_initialized;
 
 static bool data_80450BB5;
 
-/* 800068C4-800068DC 001204 0018+00 1/1 1/1 0/0 .text            OSReportInit__Fv */
 void OSReportInit() {
     BOOL enabled;
 
@@ -135,11 +118,8 @@ void OSReportInit() {
     }
 }
 
-/* 803DB740-803DBF40 008460 0800+00 1/1 0/0 0/0 .bss             mDoPrintf_FiberStack */
-static u8 mDoPrintf_FiberStack[2048] ALIGN_DECL(32);
+static u8 mDoPrintf_FiberStack[2048] ATTRIBUTE_ALIGN(32);
 
-/* 800068DC-80006964 00121C 0088+00 1/1 0/0 0/0 .text
- * mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct         */
 void mDoPrintf_vprintf_Interrupt(char const* fmt, va_list args) {
     BOOL interruptStatus = OSDisableInterrupts();
     if (!data_80450BB5) {
@@ -152,8 +132,6 @@ void mDoPrintf_vprintf_Interrupt(char const* fmt, va_list args) {
     OSRestoreInterrupts(interruptStatus);
 }
 
-/* 80006964-80006984 0012A4 0020+00 1/1 0/0 0/0 .text
- * mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct            */
 void mDoPrintf_vprintf_Thread(char const* fmt, va_list args) {
     #if DEBUG
     OSLockMutex(&print_mutex);
@@ -177,8 +155,6 @@ void mDoPrintf_vprintf_Thread(char const* fmt, va_list args) {
     #endif
 }
 
-/* 80006984-80006A10 0012C4 008C+00 4/4 0/0 0/0 .text mDoPrintf_vprintf__FPCcP16__va_list_struct
- */
 void mDoPrintf_vprintf(char const* fmt, va_list args) {
     OSThread* currentThread = mDoExt_GetCurrentRunningThread();
     if (currentThread == NULL) {
@@ -197,7 +173,6 @@ void mDoPrintf_vprintf(char const* fmt, va_list args) {
     }
 }
 
-/* 80006A10-80006A9C 001350 008C+00 1/1 0/0 0/0 .text            mDoPrintf_VReport */
 void mDoPrintf_VReport(const char* fmt, va_list args) {
     if (!print_initialized) {
         OSReportInit();
@@ -211,12 +186,10 @@ void mDoPrintf_VReport(const char* fmt, va_list args) {
     }
 }
 
-/* 80006A9C-80006ABC 0013DC 0020+00 2/2 0/0 0/0 .text            OSVReport */
 void OSVReport(const char* fmt, va_list args) {
     mDoPrintf_VReport(fmt, args);
 }
 
-/* 80006ABC-80006B3C 0013FC 0080+00 0/0 97/97 10/10 .text            OSReport */
 void OSReport(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -224,7 +197,6 @@ void OSReport(const char* fmt, ...) {
     va_end(args);
 }
 
-/* 80006B3C-80006C0C 00147C 00D0+00 0/0 2/2 0/0 .text            OSReport_FatalError */
 void OSReport_FatalError(const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
@@ -240,7 +212,6 @@ void OSReport_FatalError(const char* fmt, ...) {
     va_end(args);
 }
 
-/* 80006C0C-80006CEC 00154C 00E0+00 0/0 31/31 10/10 .text            OSReport_Error */
 void OSReport_Error(const char* fmt, ...) {
     print_errors++;
     if (!__OSReport_Error_disable) {
@@ -269,7 +240,6 @@ void OSReport_Error(const char* fmt, ...) {
     }
 }
 
-/* 80006CEC-80006DCC 00162C 00E0+00 0/0 6/6 0/0 .text            OSReport_Warning */
 void OSReport_Warning(const char* fmt, ...) {
     print_warings++;
     if (!__OSReport_Warning_disable) {
@@ -285,7 +255,6 @@ void OSReport_Warning(const char* fmt, ...) {
     }
 }
 
-/* 80006DCC-80006E7C 00170C 00B0+00 0/0 1/1 0/0 .text            OSReport_System */
 void OSReport_System(const char* fmt, ...) {
     print_systems++;
     if (!__OSReport_System_disable) {
@@ -298,7 +267,6 @@ void OSReport_System(const char* fmt, ...) {
     }
 }
 
-/* 80006E7C-80006FB4 0017BC 0138+00 0/0 9/9 0/0 .text            OSPanic */
 void OSPanic(const char* file, int line, const char* fmt, ...) {
     va_list args;
     u32 i;
diff --git a/src/odemuexi2/DebuggerDriver.c b/src/odemuexi2/DebuggerDriver.c
index 86a05180ca..d1c96b98b8 100644
--- a/src/odemuexi2/DebuggerDriver.c
+++ b/src/odemuexi2/DebuggerDriver.c
@@ -3,19 +3,14 @@
 
 typedef void (*MTRCallbackType)(int);
 
-/* 804519D0-804519D4 000ED0 0004+00 2/2 0/0 0/0 .sbss            MTRCallback */
 static MTRCallbackType MTRCallback;
 
-/* 804519D4-804519D8 000ED4 0004+00 2/2 0/0 0/0 .sbss            DBGCallback */
 static void (*DBGCallback)(u32, OSContext*);
 
-/* 804519D8-804519DC 000ED8 0004+00 2/2 0/0 0/0 .sbss            SendMailData */
 static u32 SendMailData;
 
-/* 804519DC-804519E0 000EDC 0004+00 2/2 0/0 0/0 .sbss            RecvDataLeng */
 static s32 RecvDataLeng;
 
-/* 804519E0-804519E4 000EE0 0004+00 1/1 0/0 0/0 .sbss            pEXIInputFlag */
 static u8* pEXIInputFlag;
 
 static u8 EXIInputFlag;
@@ -51,7 +46,6 @@ static BOOL DBGEXISync() {
     return TRUE;
 }
 
-/* 80373514-803737AC 36DE54 0298+00 5/5 0/0 0/0 .text            DBGEXIImm */
 static BOOL DBGEXIImm(void* buffer, s32 bytecounter, u32 write) {
     u8* tempPointer;
     u32 writeOutValue;
@@ -96,7 +90,6 @@ static BOOL DBGWriteMailbox(u32 p1) {
     return IS_FALSE(total);
 }
 
-/* 80373468-80373514 36DDA8 00AC+00 1/1 0/0 0/0 .text            DBGReadMailbox */
 #pragma dont_inline on
 static BOOL DBGReadMailbox(u32* p1) {
     BOOL total = FALSE;
@@ -117,7 +110,6 @@ static BOOL DBGReadMailbox(u32* p1) {
 }
 #pragma dont_inline reset
 
-/* 8037338C-80373468 36DCCC 00DC+00 1/1 0/0 0/0 .text            DBGRead */
 static BOOL DBGRead(u32 count, u32* buffer, s32 param3) {
     BOOL total = FALSE;
     u32* buf_p = (u32*)buffer;
@@ -146,7 +138,6 @@ static BOOL DBGRead(u32 count, u32* buffer, s32 param3) {
     return IS_FALSE(total);
 }
 
-/* 803732B0-8037338C 36DBF0 00DC+00 1/1 0/0 0/0 .text            DBGWrite */
 static BOOL DBGWrite(u32 count, void* buffer, s32 param3) {
     BOOL total = FALSE;
     u32* buf_p = (u32*)buffer;
@@ -175,7 +166,6 @@ static BOOL DBGWrite(u32 count, void* buffer, s32 param3) {
     return IS_FALSE(total);
 }
 
-/* 80373204-803732B0 36DB44 00AC+00 1/1 0/0 0/0 .text            DBGReadStatus */
 inline static BOOL _DBGReadStatus(u32* p1) {
     BOOL total = FALSE;
     u32 v;
@@ -199,7 +189,6 @@ static BOOL DBGReadStatus(u32* p1) {
 }
 #pragma dont_inline reset
 
-/* 803731C8-80373204 36DB08 003C+00 1/1 0/0 0/0 .text            MWCallback */
 static void MWCallback(u32 a, OSContext* b) {
     EXIInputFlag = TRUE;
     if (MTRCallback) {
@@ -207,7 +196,6 @@ static void MWCallback(u32 a, OSContext* b) {
     }
 }
 
-/* 80373188-803731C8 36DAC8 0040+00 1/1 0/0 0/0 .text            DBGHandler */
 static void DBGHandler(s16 a, OSContext* b) {
     *__PIRegs = 0x1000;
     if (DBGCallback) {
@@ -215,7 +203,6 @@ static void DBGHandler(s16 a, OSContext* b) {
     }
 }
 
-/* 80373110-80373188 36DA50 0078+00 0/0 1/1 0/0 .text            DBInitComm */
 void DBInitComm(u8** a, MTRCallbackType b) {
     BOOL interrupts = OSDisableInterrupts();
     {
@@ -231,7 +218,6 @@ void DBInitComm(u8** a, MTRCallbackType b) {
     OSRestoreInterrupts(interrupts);
 }
 
-/* 803730BC-80373110 36D9FC 0054+00 0/0 1/1 0/0 .text            DBInitInterrupts */
 void DBInitInterrupts(void) {
     __OSMaskInterrupts(0x18000);
     __OSMaskInterrupts(0x40);
@@ -255,7 +241,6 @@ static void CheckMailBox(void) {
     }
 }
 
-/* 80373020-803730BC 36D960 009C+00 0/0 2/2 0/0 .text            DBQueryData */
 u32 DBQueryData(void) {
     EXIInputFlag = 0;
     if (!RecvDataLeng) {
@@ -266,7 +251,6 @@ u32 DBQueryData(void) {
     return RecvDataLeng;
 }
 
-/* 80372F94-80373020 36D8D4 008C+00 0/0 2/2 0/0 .text            DBRead */
 BOOL DBRead(u32* buffer, s32 count) {
     u32 interrupts = OSDisableInterrupts();
     u32 v = SendMailData & 0x10000 ? 0x1000 : 0;
@@ -281,7 +265,6 @@ BOOL DBRead(u32* buffer, s32 count) {
     return 0;
 }
 
-/* 80372D34-80372F94 36D674 0260+00 0/0 1/1 0/0 .text            DBWrite */
 BOOL DBWrite(void* src, u32 size) {
     u32 v;
     u32 busyFlag;
@@ -315,8 +298,6 @@ BOOL DBWrite(void* src, u32 size) {
     return 0;
 }
 
-/* 80372D30-80372D34 36D670 0004+00 0/0 1/1 0/0 .text            DBOpen */
 void DBOpen(void) {}
 
-/* 80372D2C-80372D30 36D66C 0004+00 0/0 1/1 0/0 .text            DBClose */
 void DBClose(void) {}
diff --git a/src/odenotstub/odenotstub.c b/src/odenotstub/odenotstub.c
index c3f0a7e4bb..ca91654dbd 100644
--- a/src/odenotstub/odenotstub.c
+++ b/src/odenotstub/odenotstub.c
@@ -1,6 +1,5 @@
 #include <dolphin.h>
 
-/* 803737AC-803737B4 36E0EC 0008+00 0/0 1/1 0/0 .text            Hu_IsStub */
 u8 Hu_IsStub() {
     return 0;
-}
\ No newline at end of file
+}
diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c
index 4c9cb76097..6a24724002 100644
--- a/src/revolution/os/OS.c
+++ b/src/revolution/os/OS.c
@@ -23,14 +23,22 @@ extern BOOL __DVDCheckDevice(void);
 
 #ifdef SDK_AUG2010
 #define BUILD_DATE "Aug 23 2010"
+#if DEBUG
 #define BUILD_TIME "17:27:45"
+#else
+#define BUILD_TIME "17:33:06"
+#endif
 #elif SDK_SEP2006
 #define BUILD_DATE  "Sep 21 2006"
 #define BUILD_TIME "14:32:13"
 #endif
 
 #ifdef SDK_AUG2010
+#if DEBUG
 const char* __OSVersion = "<< RVL_SDK - OS \tdebug build: "BUILD_DATE" "BUILD_TIME" (0x4302_145) >>";
+#else
+const char* __OSVersion = "<< RVL_SDK - OS \trelease build: "BUILD_DATE" "BUILD_TIME" (0x4302_145) >>";
+#endif
 #elif SDK_SEP2006
 const char* __OSVersion = "<< RVL_SDK - OS \trelease build: "BUILD_DATE" "BUILD_TIME" (0x4200_60422) >>";
 #endif
@@ -621,10 +629,14 @@ void OSInit(void) {
             EnableMetroTRKInterrupts();
         }
 
+        #ifdef SDK_AUG2010
         if (!__OSInNandBoot && !__OSInReboot) {
+        #endif
             ClearArena();
             ClearMEM2Arena();
+        #ifdef SDK_AUG2010
         }
+        #endif
 
         OSEnableInterrupts();
         IPCCltInit();
@@ -637,7 +649,9 @@ void OSInit(void) {
             /* do nothing until SC is not busy */
             while (SCCheckStatus() == 1) {}
 
+            #ifdef SDK_AUG2010
             __OSInitNet();
+            #endif
         }
 
         if (!__OSInIPL) {
@@ -654,16 +668,20 @@ void OSInit(void) {
                 DVDInquiryAsync(&DriveBlock, &DriveInfo, InquiryCallback);
             }
 
+            #ifdef SDK_AUG2010
             if (OSGetAppType() == 0x80 && !__OSInReboot) {
                 if (!__DVDCheckDevice()) {
                     OSReturnToMenu();
                 }
             }
+            #endif
         }
 
+        #ifdef SDK_AUG2010
         if (!__OSInIPL && !__OSInNandBoot) {
             __OSInitPlayTime();
         }
+        #endif
 
         if (!__OSInIPL && !__OSInNandBoot && !__OSInReboot) {
             __OSStartPlayRecord();
@@ -723,6 +741,9 @@ static void OSExceptionInit(void) {
     destAddr = (void*)OSPhysicalToCached(OS_DBJUMPPOINT_ADDR);
     if (*(u32*)destAddr == 0) // Lomem should be zero cleared only once by BS2
     {
+        #ifdef SDK_SEP2006
+        DBPrintf("Installing OSDBIntegrator\n");
+        #endif
         memcpy(destAddr, (void*)__OSDBINTSTART, (u32)__OSDBINTEND - (u32)__OSDBINTSTART);
         DCFlushRangeNoSync(destAddr, (u32)__OSDBINTEND - (u32)__OSDBINTSTART);
         __sync();
@@ -732,7 +753,14 @@ static void OSExceptionInit(void) {
     // Copy the right vector into the table
     for (exception = 0; exception < __OS_EXCEPTION_MAX; exception++) {
         if (BI2DebugFlag && (*BI2DebugFlag >= 2)) {
+            #ifdef SDK_SEP2006
+            if (__DBIsExceptionMarked(exception)) {
+                DBPrintf(">>> OSINIT: exception %d commandeered by TRK\n", exception);
+                continue;
+            }
+            #else
             continue;
+            #endif
         }
         
         // Modify the copy of code in text before transferring
@@ -740,8 +768,14 @@ static void OSExceptionInit(void) {
         *opCodeAddr = oldOpCode | exception;
         
         // Modify opcodes at __DBVECTOR if necessary
-        // make sure the opcodes are still nop
+        #ifdef SDK_SEP2006
+        if (__DBIsExceptionMarked(exception)) {
+            DBPrintf(">>> OSINIT: exception %d vectored to debugger\n", exception);
+            memcpy((void*)__DBVECTOR, (void*)__OSDBJUMPSTART, (u32)__OSDBJUMPEND - (u32)__OSDBJUMPSTART);
+        } else
+        #endif
         {
+            // make sure the opcodes are still nop
             u32* ops = (u32*)__DBVECTOR;
             int cb;
             
@@ -768,6 +802,10 @@ static void OSExceptionInit(void) {
     // restore the old opcode, so that we can re-start an application without
     // downloading the text segments
     *opCodeAddr = oldOpCode;
+
+    #ifdef SDK_SEP2006
+    DBPrintf("Exceptions initialized...\n");
+    #endif
 }
 
 #ifdef __GEKKO__
diff --git a/src/revolution/os/OSCache.c b/src/revolution/os/OSCache.c
index dbdd1281c6..9cfbfd701f 100644
--- a/src/revolution/os/OSCache.c
+++ b/src/revolution/os/OSCache.c
@@ -567,7 +567,9 @@ void L2GlobalInvalidate(void) {
 
     PPCMtl2cr(PPCMfl2cr() & ~0x00200000);
     while (PPCMfl2cr() & 0x00000001u) {
-
+        #ifdef SDK_SEP2006
+        DBPrintf(">>> L2 INVALIDATE : SHOULD NEVER HAPPEN\n");
+        #endif
     }
 }
 
@@ -624,16 +626,28 @@ void DMAErrorHandler(OSError error, OSContext* context, ...) {
 void __OSCacheInit() {
     if (!(PPCMfhid0() & HID0_ICE)) {
         ICEnable();
+        #ifdef SDK_SEP2006
+        DBPrintf("L1 i-caches initialized\n");
+        #endif
     }
 
     if (!(PPCMfhid0() & HID0_DCE)) {
         DCEnable();
+        #ifdef SDK_SEP2006
+        DBPrintf("L1 d-caches initialized\n");
+        #endif
     }
 
     if (!(PPCMfl2cr() & L2CR_L2E)) {
         L2Init();
         L2Enable();
+        #ifdef SDK_SEP2006
+        DBPrintf("L2 cache initialized\n");
+        #endif
     }
 
     OSSetErrorHandler(OS_ERROR_MACHINE_CHECK, DMAErrorHandler);
+    #ifdef SDK_SEP2006
+    DBPrintf("Locked cache machine check handler installed\n");
+    #endif
 }
diff --git a/src/revolution/os/OSContext.c b/src/revolution/os/OSContext.c
index 887215ab60..57e670f4f3 100644
--- a/src/revolution/os/OSContext.c
+++ b/src/revolution/os/OSContext.c
@@ -562,6 +562,10 @@ _restoreAndExit:
 void __OSContextInit(void) {
     __OSSetExceptionHandler(__OS_EXCEPTION_FLOATING_POINT, OSSwitchFPUContext);
     __OSFPUContext = NULL;
+
+    #ifdef SDK_SEP2006
+    DBPrintf("FPU-unavailable handler installed\n");
+    #endif
 }
 
 #ifdef __GEKKO__
diff --git a/src/revolution/os/OSError.c b/src/revolution/os/OSError.c
index fd26236fba..c3698d1533 100644
--- a/src/revolution/os/OSError.c
+++ b/src/revolution/os/OSError.c
@@ -9,18 +9,18 @@ OSErrorHandler __OSErrorTable[17];
 #define FPSCR_ENABLE (FPSCR_VE | FPSCR_OE | FPSCR_UE | FPSCR_ZE | FPSCR_XE)
 u32 __OSFpscrEnableBits = FPSCR_ENABLE;
 
-__declspec(weak) void OSReport(const char* msg, ...) {
+DECL_WEAK void OSReport(const char* msg, ...) {
     va_list marker;
     va_start(marker, msg);
     vprintf(msg, marker);
     va_end(marker);
 }
 
-__declspec(weak) void OSVReport(const char* msg, va_list list) {
+DECL_WEAK void OSVReport(const char* msg, va_list list) {
     vprintf(msg, list);
 }
 
-__declspec(weak) void OSPanic(const char* file, int line, const char* msg, ...) {
+DECL_WEAK void OSPanic(const char* file, int line, const char* msg, ...) {
     va_list marker;
     u32 i;
     u32* p;
diff --git a/src/revolution/os/OSFatal.c b/src/revolution/os/OSFatal.c
index c7224af4de..0f7dae7555 100644
--- a/src/revolution/os/OSFatal.c
+++ b/src/revolution/os/OSFatal.c
@@ -124,11 +124,14 @@ static void ConfigureVideo(u16 xfbW, u16 xfbH) {
         }
         break;
     case 5:
+        #ifdef SDK_AUG2010
         if (__VIRegs[54] & 1) {
             mode.viTVmode = 22;
             mode.viYOrigin = 0;
             mode.xFBmode = 0;
-        } else {
+        } else
+        #endif
+        {
             mode.viTVmode = 20;
             mode.viYOrigin = 0;
             mode.xFBmode = 1;
@@ -206,9 +209,12 @@ void OSFatal(GXColor fg, GXColor bg, const char* msg) {
     GXAbortFrame();
     OSSetArenaLo((void*)0x81400000);
     
+    #ifdef SDK_AUG2010
     if (!bootInfo->FSTLocation) {
         OSSetArenaHi(*(void**)OSPhysicalToCached(0x3110));
-    } else {
+    } else
+    #endif
+    {
         OSSetArenaHi(bootInfo->FSTLocation);
     }
 
diff --git a/src/revolution/os/OSLaunch.c b/src/revolution/os/OSLaunch.c
index 163f00d515..ce81619f6b 100644
--- a/src/revolution/os/OSLaunch.c
+++ b/src/revolution/os/OSLaunch.c
@@ -7,7 +7,7 @@ void __OSRelaunchTitle(u32 resetCode) {
     s32 rc = 0;
     u32 ticketCnt = 1;
     ESTicketView* tik = NULL;
-    ESTitleId titleId __attribute__ ((aligned (32)));
+    ESTitleId titleId ATTRIBUTE_ALIGN(32);
     __OSPlayTimeType type = OSPLAYTIME_PERMANENT;
     u32 remain = 0;
     u8* bi2 = NULL;
diff --git a/src/revolution/os/OSLink.c b/src/revolution/os/OSLink.c
index 9791335090..7ec245ae58 100644
--- a/src/revolution/os/OSLink.c
+++ b/src/revolution/os/OSLink.c
@@ -118,9 +118,11 @@ void OSNotifyLink(OSModuleInfo* module) {}
 
 void OSNotifyUnlink(OSModuleInfo* module) {}
 
+#if SDK_AUG2010
 void OSNotifyPreLink(OSModuleHeader* newModule, OSModuleHeader* module) {}
 
 void OSNotifyPostLink(OSModuleHeader* newModule, OSModuleHeader* module) {}
+#endif
 #pragma dont_inline reset
 
 void OSSetStringTable(void* stringTable) {
@@ -148,7 +150,9 @@ static BOOL Relocate(OSModuleHeader* newModule, OSModuleHeader* module) {
     return FALSE;
 
 Found:
+    #if SDK_AUG2010
     OSNotifyPreLink(newModule, module);
+    #endif
 
     siFlush = 0;
     for (rel = (OSRel*)imp->offset; rel->type != R_DOLPHIN_END; rel++) {
@@ -227,7 +231,9 @@ Found:
         ICInvalidateRange((void*)offset, siFlush->size);
     }
 
+    #if SDK_AUG2010
     OSNotifyPostLink(newModule, module);
+    #endif
     return TRUE;
 }
 
@@ -362,7 +368,10 @@ static BOOL Undo(OSModuleHeader* newModule, OSModuleHeader* module) {
     return FALSE;
 
 Found:
+    #if SDK_AUG2010
     OSNotifyPreLink(newModule, module);
+    #endif
+
     siFlush = 0;
     for (rel = (OSRel*)imp->offset; rel->type != R_DOLPHIN_END; rel++) {
         (u8*)p += rel->offset;
@@ -430,7 +439,9 @@ Found:
         ICInvalidateRange((void*)offset, siFlush->size);
     }
 
+    #if SDK_AUG2010
     OSNotifyPostLink(newModule, module);
+    #endif
     return TRUE;
 }
 
diff --git a/src/revolution/os/OSNet.c b/src/revolution/os/OSNet.c
index a795b33093..be1f33f184 100644
--- a/src/revolution/os/OSNet.c
+++ b/src/revolution/os/OSNet.c
@@ -98,7 +98,7 @@ NWC24Err NWC24iSynchronizeRtcCounter(BOOL param_0) {
 }
 
 NWC24Err NWC24SuspendScheduler(void) {
-    static u8 susResult[0x20] __attribute__ ((aligned(32)));
+    static u8 susResult[0x20] ATTRIBUTE_ALIGN(32);
     NWC24Err rt = NWC24_OK;
     NWC24Err closeRt = NWC24_OK;
     IOSFd fd;
diff --git a/src/revolution/os/OSPlayRecord.c b/src/revolution/os/OSPlayRecord.c
index d530121869..a1499e71b7 100644
--- a/src/revolution/os/OSPlayRecord.c
+++ b/src/revolution/os/OSPlayRecord.c
@@ -2,7 +2,7 @@
 #include <revolution/nand.h>
 
 static BOOL PlayRecordGet = FALSE;
-static OSPlayRecord PlayRecord __attribute__ ((aligned(32)));
+static OSPlayRecord PlayRecord ATTRIBUTE_ALIGN(32);
 static NANDFileInfo FileInfo;
 static NANDCommandBlock Block;
 static s32 PlayRecordState = 9;
diff --git a/src/revolution/os/OSPlayTime.c b/src/revolution/os/OSPlayTime.c
index be0879a96c..9eddeb8b48 100644
--- a/src/revolution/os/OSPlayTime.c
+++ b/src/revolution/os/OSPlayTime.c
@@ -99,7 +99,7 @@ BOOL __OSWriteExpiredFlag(void) {
     s32 rv = 0;
     NANDFileInfo nInfo;
     BOOL openNInfo = FALSE;
-    u8 titleId[32] __attribute__ ((aligned(32)));
+    u8 titleId[32] ATTRIBUTE_ALIGN(32);
 
     rv = NANDPrivateCreate("/shared2/expired", 63, 0);
 
@@ -158,7 +158,7 @@ BOOL __OSWriteExpiredFlagIfSet(void) {
 void* __OSPlayTimeRebootThread(void* args) {
     BOOL enabled;
     u32 frames, fadeShift = 1;
-    __OSExpireAIFadeStruct aiFade __attribute__ ((aligned(32)));
+    __OSExpireAIFadeStruct aiFade ATTRIBUTE_ALIGN(32);
 
     __OSExpireAIFade = &aiFade;
     memset(__OSExpireAIFade, 0, sizeof(__OSExpireAIFadeStruct));
@@ -223,9 +223,9 @@ out:
 s32 __OSGetPlayTime(ESTicketView* ticket, __OSPlayTimeType* type, u32* playTime) {
 	s32 rv;
 	u32 i;
-	ESLpEntry lpEntry[8] __attribute__ ((aligned(32)));
+	ESLpEntry lpEntry[8] ATTRIBUTE_ALIGN(32);
 	u32 numCc = 0, seenOther = 0;
-	ESTicketView ticketAligned __attribute__ ((aligned(32)));
+	ESTicketView ticketAligned ATTRIBUTE_ALIGN(32);
 
     ASSERTLINE(601, ticket && type && playTime);
 
@@ -284,7 +284,7 @@ out:
 
 s32 __OSGetPlayTimeCurrent(__OSPlayTimeType* type, u32* playTime) {
     s32 rv;
-    ESTicketView ticket __attribute__ ((aligned(32)));
+    ESTicketView ticket ATTRIBUTE_ALIGN(32);
 
     ASSERTLINE(676, type && playTime);
 
diff --git a/src/revolution/os/OSStateFlags.c b/src/revolution/os/OSStateFlags.c
index bf99843907..5bb81fbcd6 100644
--- a/src/revolution/os/OSStateFlags.c
+++ b/src/revolution/os/OSStateFlags.c
@@ -2,7 +2,7 @@
 #include <revolution/nand.h>
 #include <stdio.h>
 
-static OSStateFlags StateFlags __attribute__ ((aligned(32)));
+static OSStateFlags StateFlags ATTRIBUTE_ALIGN(32);
 
 static u32 CheckSum(OSStateFlags* flags) {
     u32* ptr, i, sum;
diff --git a/src/revolution/os/OSStateTM.c b/src/revolution/os/OSStateTM.c
index 53d4bdc2d1..1b4e491e67 100644
--- a/src/revolution/os/OSStateTM.c
+++ b/src/revolution/os/OSStateTM.c
@@ -4,14 +4,14 @@
 
 #include <revolution/private/iosrestypes.h>
 
-static u32 StmImInBuf[8] __attribute__((align(32)));
-static u32 StmImOutBuf[8] __attribute__((align(32)));
+static u32 StmImInBuf[8] ATTRIBUTE_ALIGN(32);
+static u32 StmImOutBuf[8] ATTRIBUTE_ALIGN(32);
 
-static u32 StmVdInBuf[8] __attribute__((align(32)));
-static u32 StmVdOutBuf[8] __attribute__((align(32)));
+static u32 StmVdInBuf[8] ATTRIBUTE_ALIGN(32);
+static u32 StmVdOutBuf[8] ATTRIBUTE_ALIGN(32);
 
-static u32 StmEhInBuf[8]__attribute__((align(32)));
-static u32 StmEhOutBuf[8] __attribute__((align(32)));
+static u32 StmEhInBuf[8] ATTRIBUTE_ALIGN(32);
+static u32 StmEhOutBuf[8] ATTRIBUTE_ALIGN(32);
 
 static OSResetCallback ResetCallback;
 static OSPowerCallback PowerCallback;
diff --git a/src/revolution/os/OSThread.c b/src/revolution/os/OSThread.c
index 5635fb8eca..a9d12f7a5b 100644
--- a/src/revolution/os/OSThread.c
+++ b/src/revolution/os/OSThread.c
@@ -871,7 +871,6 @@ void* OSGetThreadSpecific(s32 index) {
     return NULL;
 }
 
-/* 804516D0-804516D8 000BD0 0008+00 0/0 2/1 0/0 .sbss            None */
 #include "global.h"
 extern u8 Debug_BBA_804516D0;
-u8 Debug_BBA_804516D0 ALIGN_DECL(8);
+u8 Debug_BBA_804516D0 ATTRIBUTE_ALIGN(8);
diff --git a/src/revolution/os/__os.h b/src/revolution/os/__os.h
index 2b4c354c59..571a97bea7 100644
--- a/src/revolution/os/__os.h
+++ b/src/revolution/os/__os.h
@@ -122,7 +122,7 @@ void __init_user(void);
 void _ExitProcess(void);
 
 // start
-__declspec(weak) void InitMetroTRK_BBA();
+DECL_WEAK void InitMetroTRK_BBA();
 
 __declspec(section ".init") void __start(void);
 
diff --git a/tools/converters/matDL_dis.py b/tools/converters/matDL_dis.py
index 2b9fb460c0..e712018e12 100755
--- a/tools/converters/matDL_dis.py
+++ b/tools/converters/matDL_dis.py
@@ -336,7 +336,7 @@ def convert_binary_to_matDL_c_source(src_path, dest_path, symbol_name, scope):
             var_def_prefix = ""
         
         write_macro_line(f"#define {macro_name}(TEX_NAME)")
-        write_macro_line(f"{var_def_prefix}u8 {symbol_name}[] ALIGN_DECL(32) = {{")
+        write_macro_line(f"{var_def_prefix}u8 {symbol_name}[] ATTRIBUTE_ALIGN(32) = {{")
         
         while True:
             try: